diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..122af01
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,25 @@
+# Libraries
+*.lai filter=lfs diff=lfs merge=lfs -text
+*.la filter=lfs diff=lfs merge=lfs -text
+*.a filter=lfs diff=lfs merge=lfs -text
+*.dll filter=lfs diff=lfs merge=lfs -text
+*.dylib filter=lfs diff=lfs merge=lfs -text
+*.so filter=lfs diff=lfs merge=lfs -text
+*.so.* filter=lfs diff=lfs merge=lfs -text
+*.lib filter=lfs diff=lfs merge=lfs -text
+
+# UE Assets
+*.uasset filter=lfs diff=lfs merge=lfs -text
+*.umap filter=lfs diff=lfs merge=lfs -text
+
+# Executables
+*.exe filter=lfs diff=lfs merge=lfs -text
+*.app filter=lfs diff=lfs merge=lfs -text
+
+# Archives
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.rar filter=lfs diff=lfs merge=lfs -text
+*.tar filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..560ae9d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+Binaries/
+Intermediate/
+Scripts/__pycache__
+VERSION
+Docs/
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d7cd3bb
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Source/SodaSimProto"]
+	path = Source/SodaSimProto
+	url = ../SodaSimProto
diff --git a/Binaries/Linux/libresolv.so b/Binaries/Linux/libresolv.so
new file mode 100644
index 0000000..9eeeac7
--- /dev/null
+++ b/Binaries/Linux/libresolv.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c8add4b629e8c0fad598e1d6a9e84282edb947d90aa28b3678895aadd8a5290
+size 106184
diff --git a/Binaries/Linux/libzmq.so b/Binaries/Linux/libzmq.so
new file mode 100644
index 0000000..baa9eea
--- /dev/null
+++ b/Binaries/Linux/libzmq.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cda5558ea9c7e4a26912bdafa4f5e7a3c13c1fcb950ffd1f5729bbafe5d3a5d
+size 11436944
diff --git a/Binaries/Linux/libzmq.so.5 b/Binaries/Linux/libzmq.so.5
new file mode 100644
index 0000000..baa9eea
--- /dev/null
+++ b/Binaries/Linux/libzmq.so.5
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cda5558ea9c7e4a26912bdafa4f5e7a3c13c1fcb950ffd1f5729bbafe5d3a5d
+size 11436944
diff --git a/Binaries/Linux/libzmq.so.5.2.4 b/Binaries/Linux/libzmq.so.5.2.4
new file mode 100644
index 0000000..baa9eea
--- /dev/null
+++ b/Binaries/Linux/libzmq.so.5.2.4
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cda5558ea9c7e4a26912bdafa4f5e7a3c13c1fcb950ffd1f5729bbafe5d3a5d
+size 11436944
diff --git a/Binaries/Mac/libzmq.5.dylib b/Binaries/Mac/libzmq.5.dylib
new file mode 100644
index 0000000..63b8ea5
--- /dev/null
+++ b/Binaries/Mac/libzmq.5.dylib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4680fa60dddb0b9cb7e54d504b5c2a7a45932280b220254cbb1aba2e544d38c
+size 592940
diff --git a/Binaries/Win64/SDL2.dll b/Binaries/Win64/SDL2.dll
new file mode 100644
index 0000000..125b00b
--- /dev/null
+++ b/Binaries/Win64/SDL2.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d66bd7c48a61ff952475ec3492fcad67a81e626d849f00824d2b6442adf8d2f
+size 1401344
diff --git a/Binaries/Win64/concrt140.dll b/Binaries/Win64/concrt140.dll
new file mode 100644
index 0000000..2d434c8
--- /dev/null
+++ b/Binaries/Win64/concrt140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:573229a07f38ab9d2fc2e1a5b98e9243b9b39100323180c83ad7ddaf98eee46a
+size 317864
diff --git a/Binaries/Win64/libsodium.dll b/Binaries/Win64/libsodium.dll
new file mode 100644
index 0000000..d0be4d3
--- /dev/null
+++ b/Binaries/Win64/libsodium.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92ee6bf7bb8afc45d9584fe223f54753af68d2135393ad3a85df1966ae92fd15
+size 307712
diff --git a/Binaries/Win64/libzmq-v141-mt-4_3_2.dll b/Binaries/Win64/libzmq-v141-mt-4_3_2.dll
new file mode 100644
index 0000000..c9353dd
--- /dev/null
+++ b/Binaries/Win64/libzmq-v141-mt-4_3_2.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd92fa5b724ae83cb33e98c74cc238a36349d3b357b7162f2b704b07d1438c80
+size 475136
diff --git a/Binaries/Win64/msvcp140.dll b/Binaries/Win64/msvcp140.dll
new file mode 100644
index 0000000..94d67d2
--- /dev/null
+++ b/Binaries/Win64/msvcp140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fee6f36547d6f6ea7ca0338655555dba6bb0f798bc60334d29b94d1547da4da
+size 566704
diff --git a/Binaries/Win64/msvcp140_1.dll b/Binaries/Win64/msvcp140_1.dll
new file mode 100644
index 0000000..25d6b60
--- /dev/null
+++ b/Binaries/Win64/msvcp140_1.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8731a93e519c2595c9fd489e6d9ac07e964448c0da1c8ee9ee500a7989482617
+size 23944
diff --git a/Binaries/Win64/msvcp140_2.dll b/Binaries/Win64/msvcp140_2.dll
new file mode 100644
index 0000000..7a954db
--- /dev/null
+++ b/Binaries/Win64/msvcp140_2.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:366af8e071f004da5d95a832a46b2e8821a8e0294340a93f7c95cf48c441067e
+size 186800
diff --git a/Binaries/Win64/msvcp140_atomic_wait.dll b/Binaries/Win64/msvcp140_atomic_wait.dll
new file mode 100644
index 0000000..369db8b
--- /dev/null
+++ b/Binaries/Win64/msvcp140_atomic_wait.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c61a28711f8c6e9bfd4879cf5f53b013d653badad308abe3e887c694b223d6f0
+size 57264
diff --git a/Binaries/Win64/msvcp140_codecvt_ids.dll b/Binaries/Win64/msvcp140_codecvt_ids.dll
new file mode 100644
index 0000000..777f11c
--- /dev/null
+++ b/Binaries/Win64/msvcp140_codecvt_ids.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b45fd069bd0076d8abfeb7c3c30a1f5c5fc8e7124017853a93d831a346c3d21
+size 21424
diff --git a/Binaries/Win64/vcruntime140.dll b/Binaries/Win64/vcruntime140.dll
new file mode 100644
index 0000000..6dca581
--- /dev/null
+++ b/Binaries/Win64/vcruntime140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d2b40f0395cc5d1b4d5ea17b84970c29971d448c37104676db577586d4ad1b1
+size 98224
diff --git a/Binaries/Win64/vcruntime140_1.dll b/Binaries/Win64/vcruntime140_1.dll
new file mode 100644
index 0000000..283fa93
--- /dev/null
+++ b/Binaries/Win64/vcruntime140_1.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34048abaa070ecc13b318cea31425f4ca3edd133d350318ac65259e6058c8b32
+size 37256
diff --git a/Config/FilterPlugin.ini b/Config/FilterPlugin.ini
new file mode 100644
index 0000000..a3cfefa
--- /dev/null
+++ b/Config/FilterPlugin.ini
@@ -0,0 +1,15 @@
+[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
+
+/Binaries/Win64/*.dll
+/Binaries/Linux/*.so*
+/Binaries/Mac/*.dylib
+/Scripts/...
+/Install/...
+/ReleaseNotes
diff --git a/Content/ActorsLibrery/EMirrorsView/Box_Brush3_StaticMesh2.uasset b/Content/ActorsLibrery/EMirrorsView/Box_Brush3_StaticMesh2.uasset
new file mode 100644
index 0000000..1577ab3
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/Box_Brush3_StaticMesh2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c627d4b5f220cdcce3d6c02ba876473b38ed4cd2fe87ea10a1582fad1fbf1cc
+size 14749
diff --git a/Content/ActorsLibrery/EMirrorsView/Box_Brush3_StaticMesh3.uasset b/Content/ActorsLibrery/EMirrorsView/Box_Brush3_StaticMesh3.uasset
new file mode 100644
index 0000000..f4ebfa4
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/Box_Brush3_StaticMesh3.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1243767c745c83046b5cc5ae7966c7ab078a199c882c512b32ce8d056a63b555
+size 13728
diff --git a/Content/ActorsLibrery/EMirrorsView/EMirrorViewFar.uasset b/Content/ActorsLibrery/EMirrorsView/EMirrorViewFar.uasset
new file mode 100644
index 0000000..31ad658
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/EMirrorViewFar.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcc966550faf148dec1810f26c3308bf4d17821e37903eeecd5bab536127a5d3
+size 37813
diff --git a/Content/ActorsLibrery/EMirrorsView/EMirrorViewMiddle.uasset b/Content/ActorsLibrery/EMirrorsView/EMirrorViewMiddle.uasset
new file mode 100644
index 0000000..93a3127
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/EMirrorViewMiddle.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:226bd86cf16d8e0c7151dbdf7809ceda5562acad8a2f32f8c53fd2c4f1f2d135
+size 38390
diff --git a/Content/ActorsLibrery/EMirrorsView/EMirrorViewNear.uasset b/Content/ActorsLibrery/EMirrorsView/EMirrorViewNear.uasset
new file mode 100644
index 0000000..0016481
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/EMirrorViewNear.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cbe54bef7dca0f2da9032cecbf371340be1d238a8a8199a02c413028d09206c
+size 38852
diff --git a/Content/ActorsLibrery/EMirrorsView/EMirrorView_StaticMesh1.uasset b/Content/ActorsLibrery/EMirrorsView/EMirrorView_StaticMesh1.uasset
new file mode 100644
index 0000000..3a3ef4a
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/EMirrorView_StaticMesh1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee888ac8db7aa8f82b2961fc0fa99a45d68a0abc7d36f946563d9815012c2167
+size 14205
diff --git a/Content/ActorsLibrery/EMirrorsView/New/Box_Brush3_StaticMesh2.uasset b/Content/ActorsLibrery/EMirrorsView/New/Box_Brush3_StaticMesh2.uasset
new file mode 100644
index 0000000..0f87e0c
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/New/Box_Brush3_StaticMesh2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcbe4869c0359c616b7a9480f661907235f407c8ed2c0564bd01d25deaf59862
+size 15558
diff --git a/Content/ActorsLibrery/EMirrorsView/New/Box_Brush3_StaticMesh3.uasset b/Content/ActorsLibrery/EMirrorsView/New/Box_Brush3_StaticMesh3.uasset
new file mode 100644
index 0000000..cea5d1a
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/New/Box_Brush3_StaticMesh3.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd081708410db743f8089989ef73564c4e44a89425dd9d75f502eb9582054b45
+size 14852
diff --git a/Content/ActorsLibrery/EMirrorsView/New/EMirrorView_StaticMesh1.uasset b/Content/ActorsLibrery/EMirrorsView/New/EMirrorView_StaticMesh1.uasset
new file mode 100644
index 0000000..3b37d7f
--- /dev/null
+++ b/Content/ActorsLibrery/EMirrorsView/New/EMirrorView_StaticMesh1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00e532edc8a82316bb6fb697ca1c5cb2d7d48474e2f995227ceac1a21387c9ae
+size 15682
diff --git a/Content/ActorsLibrery/Markers/ArUCO_VerticalPole.uasset b/Content/ActorsLibrery/Markers/ArUCO_VerticalPole.uasset
new file mode 100644
index 0000000..d3862cc
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/ArUCO_VerticalPole.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6379909283d02855fd8fa0714797aa23a79d4a0cfc7a242a4228cb004d6e36a4
+size 102089
diff --git a/Content/ActorsLibrery/Markers/ArUCO_mat.uasset b/Content/ActorsLibrery/Markers/ArUCO_mat.uasset
new file mode 100644
index 0000000..987a528
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/ArUCO_mat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c580fb3ec42c64183343226735097f8c35881604ea83598e591eaa00af52030
+size 111950
diff --git a/Content/ActorsLibrery/Markers/ArUCO_pattern_base.uasset b/Content/ActorsLibrery/Markers/ArUCO_pattern_base.uasset
new file mode 100644
index 0000000..d2ba6de
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/ArUCO_pattern_base.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:217af6f5ff4c6c33a74f2aece79b0ccf757adf34333c640fbca4beb0ac2aa3e0
+size 123433
diff --git a/Content/ActorsLibrery/Markers/ArUCO_pattern_dict8.uasset b/Content/ActorsLibrery/Markers/ArUCO_pattern_dict8.uasset
new file mode 100644
index 0000000..cf15c60
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/ArUCO_pattern_dict8.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0b51f699500135b26ade70527169873d0a350e950672fee748d03e7b778d736
+size 43755
diff --git a/Content/ActorsLibrery/Markers/ArUCO_pattern_dict_4x4_100.uasset b/Content/ActorsLibrery/Markers/ArUCO_pattern_dict_4x4_100.uasset
new file mode 100644
index 0000000..ee78058
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/ArUCO_pattern_dict_4x4_100.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ca68035b482f363308cd325161b1c4d6776751ba6d47092f154224deb648741c
+size 46596
diff --git a/Content/ActorsLibrery/Markers/Chess_Prattern+_length_120_8cm.uasset b/Content/ActorsLibrery/Markers/Chess_Prattern+_length_120_8cm.uasset
new file mode 100644
index 0000000..241303a
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Chess_Prattern+_length_120_8cm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72659697d40ca74e84c9209020b30004ad5b872f4647263e90f13d096ddb0860
+size 76214
diff --git a/Content/ActorsLibrery/Markers/Circle_Pattern_step_25cm.uasset b/Content/ActorsLibrery/Markers/Circle_Pattern_step_25cm.uasset
new file mode 100644
index 0000000..9bf3083
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Circle_Pattern_step_25cm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59294f7ce5d92002a20fe7b4133d68e04b5c16d0cd86e394d65bfd48a1a07333
+size 72666
diff --git a/Content/ActorsLibrery/Markers/ColorPattern.uasset b/Content/ActorsLibrery/Markers/ColorPattern.uasset
new file mode 100644
index 0000000..eccfce6
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/ColorPattern.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8efc61937266acf23cf61538671a9ad97e5f8cc8f20b4493bc864c04253c3f58
+size 75284
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_0.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_0.uasset
new file mode 100644
index 0000000..d886254
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_0.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fef95c3c761daa0be264b79e91809da9b928bd17bbb88abfd5f954fcc277a2b
+size 7997
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_1.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_1.uasset
new file mode 100644
index 0000000..31090f6
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:00dbdaa9b35c1d232ed09fd0be76cecb878772f1b53aedd13c36bbb9790962e9
+size 7845
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_10.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_10.uasset
new file mode 100644
index 0000000..b4c84ae
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_10.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19ae07bc06e3cf89a90eb16aa02e8d67ec1f500f641d8d1c56b0c0f47127672b
+size 7589
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_11.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_11.uasset
new file mode 100644
index 0000000..90ebfb2
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_11.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e7966ae4f135f7df12778ef3a0196b158faef8e68bf9101d671a236e61b1be4
+size 7681
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_12.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_12.uasset
new file mode 100644
index 0000000..e849abd
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_12.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b6f78c6b003a058dae27f967704fd10a142f408f8e8aabe1b9bbb834e68a612
+size 7354
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_13.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_13.uasset
new file mode 100644
index 0000000..1cdd37e
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_13.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5538cb193867c637d985c8e699efb11f717786a2f38c54604c4047da158863a
+size 7883
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_14.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_14.uasset
new file mode 100644
index 0000000..081bf0d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_14.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:460e5f6fc6cde77ef999dcac49685e6caa9e3464431f598a5717f9faa710df4a
+size 7653
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_15.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_15.uasset
new file mode 100644
index 0000000..af3431b
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_15.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd3944e337a3a5a56b062e1886cfb2161e682fd5e9edfb74fefbb25db82428a6
+size 7465
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_16.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_16.uasset
new file mode 100644
index 0000000..ec1dcf2
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_16.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9da5fd87e50b00ce42bf1d85ec794e154e9e2be5f76b5a70feb57379db1eeeff
+size 7213
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_17.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_17.uasset
new file mode 100644
index 0000000..b495169
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_17.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed247b41217efe96ef4b0bd2839d6ac5495bfd6efec604a76697dfffb931cd75
+size 6333
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_18.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_18.uasset
new file mode 100644
index 0000000..67a3e3f
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_18.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbbf33e6f5ab0771ee57e7eb53a9452c4e3ba125c2de846e96518e5eab03ad0a
+size 7796
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_19.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_19.uasset
new file mode 100644
index 0000000..4e68ff7
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_19.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b40ec7aeca658542b04599dedf364079f570ef5e43e41167da4a3f05b3b07893
+size 7824
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_2.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_2.uasset
new file mode 100644
index 0000000..562f37f
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:910c8fbfe7bea773f2c8742633e2c508cd24082e16c324709a49adf1c8c9f363
+size 7585
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_20.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_20.uasset
new file mode 100644
index 0000000..53a98a8
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_20.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e201bf535f8ae86540f7d620e57cb02e868f080c7f769ed3dad8c9108360d16
+size 7866
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_21.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_21.uasset
new file mode 100644
index 0000000..034a347
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_21.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c97242c85f0060867d27b32a2d8e84fef8f8e9187b33422a5d50d60dc21dc72
+size 7917
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_22.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_22.uasset
new file mode 100644
index 0000000..5bb1cf3
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_22.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcf753e0881c44ad21e067c207274e876944d9b83eae192c1dffdfae45f4caa7
+size 7543
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_23.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_23.uasset
new file mode 100644
index 0000000..3629e4d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_23.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6fe504942e8ba06440283705f1330e01860680316a787b16fd36a29aa24428b
+size 7963
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_24.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_24.uasset
new file mode 100644
index 0000000..9da8163
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_24.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a5daf4a44c1973c72816f089b1f0fe09695e4f0ac7537eb0073c7a011043407
+size 7667
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_25.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_25.uasset
new file mode 100644
index 0000000..8dce5b9
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_25.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f75033b286a281f0a1c0f77bf7abd06be96438b368c633652dfe0064c63fcc6
+size 7696
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_26.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_26.uasset
new file mode 100644
index 0000000..7513e42
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_26.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:849267293056c1b870a463371332a3e76437b3397d9f39a1a8b301db2e8e476e
+size 7477
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_27.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_27.uasset
new file mode 100644
index 0000000..0249736
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_27.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9dd9ca5cc58a8c31e98fe0f0a0be1d1273ff9d6ea2444389d68a462ba619a7e9
+size 7791
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_28.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_28.uasset
new file mode 100644
index 0000000..c489b9c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_28.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96e8113a7636c7efa0ee5290847d03ea43a2f2d0fb43e0bc13cc979e4bdf8e5f
+size 7313
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_29.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_29.uasset
new file mode 100644
index 0000000..7376b61
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_29.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f811ca7ed5ac6632cef9f60e6e1c30448065d14716391487984d7ccf69c872d
+size 7596
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_3.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_3.uasset
new file mode 100644
index 0000000..8f1b0d9
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_3.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cd129c5474a3ec5718a7e44eacd33c973967d52530a3cdd851f2d1d7c0ce5b9
+size 7740
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_30.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_30.uasset
new file mode 100644
index 0000000..88eb2d0
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_30.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7683bc857eb4d781256cd357fad6bd4439a4b70b70dd4f7bc0f4368d33fabba
+size 7364
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_31.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_31.uasset
new file mode 100644
index 0000000..af6ef26
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_31.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9208db2cb160df31c97123ea3eff1b3ed17abb4405679c73dbe7f4e41ddd4aa6
+size 7729
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_32.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_32.uasset
new file mode 100644
index 0000000..0df4bf5
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_32.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7af2da9c9b6972ad8d9a3d18c3ea2dadc1dace834f6badda116b07ba48070b61
+size 7883
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_33.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_33.uasset
new file mode 100644
index 0000000..765b687
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_33.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a13b86af94c9b921bea049a6ef97025a477b0f0f9b330d0e678f7ec7fe0318cc
+size 7935
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_34.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_34.uasset
new file mode 100644
index 0000000..ee15bb4
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_34.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9acff28ad80fc7928f8b94acba99c3cdeeb737e04d2be8e2e9cb670c85c65c8f
+size 7274
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_35.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_35.uasset
new file mode 100644
index 0000000..10adbfa
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_35.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:96890a75c32836e1c94d3145007eb4327f55d6b547cef287e4e4edeb5f96dd73
+size 7667
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_36.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_36.uasset
new file mode 100644
index 0000000..be8e740
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_36.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6ea40a8a7547f20445f5c92f358bb4ff4359fdc6c8dc5550c6a9e06a96da393
+size 7699
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_37.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_37.uasset
new file mode 100644
index 0000000..9883115
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_37.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8477a4db3a3783bd56a6eee1598b3ba3b0315cef3a869833a0a20bb3030ed9ef
+size 7027
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_38.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_38.uasset
new file mode 100644
index 0000000..8c5463e
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_38.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de57bc420cfa6cd694d1ac3342f5191dbf39db96f74c3a3167efe0ca58fb9cc7
+size 7209
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_39.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_39.uasset
new file mode 100644
index 0000000..34fecf4
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_39.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c25ca8427c7305b0632074ba7552f90fd562c8987b653619eee07e552ee2a4a
+size 8006
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_4.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_4.uasset
new file mode 100644
index 0000000..f59b109
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_4.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7dc51326ff2a046d1029c7d83fcbf971b6c871aba5272a1c0bb20242c8063dd0
+size 8050
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_40.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_40.uasset
new file mode 100644
index 0000000..b791108
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_40.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:085b57cbc967cdbf592b208c86453ec1d1c44e2a67e0d8ca983ac4da275431c4
+size 7411
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_41.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_41.uasset
new file mode 100644
index 0000000..37b8e5c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_41.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1d20e9b87f9f1de0c3053743dcb22522fd4935f6b120bffb9b8576fb24db2a0
+size 7319
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_42.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_42.uasset
new file mode 100644
index 0000000..1fd5fa8
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_42.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fe39cd59f7ffe2671333530da7d19c93120adc874458dce1b50d58f8cf4b2ca
+size 7355
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_43.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_43.uasset
new file mode 100644
index 0000000..77eaae2
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_43.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d058199db8200a92776f21924da8d2f6ab78f235a2f7e9be6a37be4b332d22e
+size 7735
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_44.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_44.uasset
new file mode 100644
index 0000000..a5b5e8d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_44.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c161c2fe496306b56eb531c8e098d9a3e67f6d630819df7af51d1f6926287323
+size 7346
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_45.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_45.uasset
new file mode 100644
index 0000000..c96d6b2
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_45.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9565f66a243977c79fd1a60a9399844f080aa2017c0384875e038bf101ac905
+size 7639
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_46.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_46.uasset
new file mode 100644
index 0000000..77b5216
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_46.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12c08fa23b2b355c2a961f28b31ceef97b679550727d3cfeb190673b70c6ead8
+size 7961
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_47.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_47.uasset
new file mode 100644
index 0000000..e6400fb
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_47.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcf1aa6274aab797e53b8ae8ece4b554e7a5b3e23d3ad3fd5c6c78cf6b0ee205
+size 7606
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_48.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_48.uasset
new file mode 100644
index 0000000..5df6301
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_48.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7380efc209bbb78ecc9e669983d77ef080361de89fe1a6279de9d1472da2652f
+size 7425
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_49.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_49.uasset
new file mode 100644
index 0000000..0b26061
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_49.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5084b228cff1ae804cd42ef353228abce17ebeb6b1538c8c895bd28140e43118
+size 7560
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_5.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_5.uasset
new file mode 100644
index 0000000..04aca80
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_5.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f01d24a6d63001049b7bbd4378b07043f8657cafb9fa3a9bf42362a8f6cbe0bd
+size 8047
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_50.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_50.uasset
new file mode 100644
index 0000000..ded8951
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_50.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7636bf53e2eef4eb69b086c387ac7daf3f7ae4f64667c92a086f7d15de732f8
+size 8038
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_51.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_51.uasset
new file mode 100644
index 0000000..cace596
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_51.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05bf75a386913d4bc7fb902067fe507baad6a3277b033f49a8be9d9124652bdc
+size 7634
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_52.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_52.uasset
new file mode 100644
index 0000000..31666a1
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_52.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c0a9dcfc7e049dfdc914678d100f0118f03a22d1261ade529da299102a4b327
+size 7839
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_53.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_53.uasset
new file mode 100644
index 0000000..54464b7
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_53.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41e197d6023a5cc488367da9339a636cdeb0804c368886e85642b3e789e07d41
+size 8050
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_54.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_54.uasset
new file mode 100644
index 0000000..4b97384
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_54.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa5104fccf2d06cd8e556632862315686a49bd70f2f0e3f69b90b73e16e10467
+size 7053
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_55.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_55.uasset
new file mode 100644
index 0000000..5cc5f99
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_55.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab2ea714223c2c3403629efd3b1678468e8fe0e82f84ff8d82089d64226309b4
+size 7624
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_56.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_56.uasset
new file mode 100644
index 0000000..d0cb0b0
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_56.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e41a9efd99b90d43c02f4d69e69bcc623291d52d36392cb3e62ca0a9e538790c
+size 7459
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_57.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_57.uasset
new file mode 100644
index 0000000..ce31e52
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_57.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94ea8762282f08f0407c7a4e90d589588c5b60989a037fe46f5ff764de5a4fec
+size 8025
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_58.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_58.uasset
new file mode 100644
index 0000000..b89f7fb
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_58.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f75c7c7259877ed312e9b8af55252abb77a1ef888b6380f48dc4578fe7903c9a
+size 7675
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_59.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_59.uasset
new file mode 100644
index 0000000..61977f9
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_59.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ee4691a2cf33830d68d494396d143ad31614cdace10eda46ed035e788d51225
+size 7646
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_6.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_6.uasset
new file mode 100644
index 0000000..dacc79b
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_6.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f315c4c14b18b8cf8c3e3bc5970d3a26ffe79edd2c556823debfd88f2d18aab3
+size 7833
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_60.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_60.uasset
new file mode 100644
index 0000000..956c2a6
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_60.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94ec9a5afac82fcd0e9da2f9a4a1cd66cd65c8288223a4be4145e66bbe4fd664
+size 7682
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_61.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_61.uasset
new file mode 100644
index 0000000..3832e4f
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_61.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ecdcde2bc7ef4b6f0d2df63309a1dd47aee6c1bf8152b349e12d19feb3621f4f
+size 8078
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_62.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_62.uasset
new file mode 100644
index 0000000..a48768c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_62.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b910824d490b793a6ebee8bff7a18339d6fe17001c3428fcb3ec6ab022f0d2d5
+size 6897
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_63.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_63.uasset
new file mode 100644
index 0000000..3c865ac
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_63.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bb1bf028454a08c3bf56fab44a940524e3d69a18a07c3313119915b47ac8054
+size 7280
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_64.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_64.uasset
new file mode 100644
index 0000000..4992eb2
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_64.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ff407c3cf805c615912071defe78d2393892371f1436bab1a050dfcf5cd1cb6
+size 7582
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_65.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_65.uasset
new file mode 100644
index 0000000..1d7f7d0
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_65.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0b03449cf17af43f55e9d7a0ad5375fde6234067f4652be2b46d5e8be4e09b2
+size 7856
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_66.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_66.uasset
new file mode 100644
index 0000000..50265a8
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_66.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88082b8eb84da345cc310f6b8a3da76d020109d947b8115d0495a0dd05703c83
+size 7359
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_67.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_67.uasset
new file mode 100644
index 0000000..62ccd6a
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_67.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28227b45c4d7ce926753b7ee7a97d27eff2e2fc65c19f1191c99d9ccf1559a85
+size 7865
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_68.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_68.uasset
new file mode 100644
index 0000000..51fd627
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_68.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e0c39b096bf9a11bad53bd0299a9321a714d5933bf9ee5a97fe18fe64f31a5d
+size 7940
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_69.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_69.uasset
new file mode 100644
index 0000000..741c572
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_69.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad374e17ce93a32d3447b285e97eff5bf37fa120accf9a92a9882438b471723c
+size 7824
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_7.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_7.uasset
new file mode 100644
index 0000000..aa5c33d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_7.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e08cc72ba746083ea1dbc10556dc9b1ebeb4e0cf69ac74bfa38a37eb4b788a0d
+size 7589
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_70.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_70.uasset
new file mode 100644
index 0000000..ee025a8
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_70.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e1f3ec9eb1087144df0e779ef7ee3787bc2b24c0064184e6f761d5aa9683ba0
+size 7874
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_71.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_71.uasset
new file mode 100644
index 0000000..b07ab22
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_71.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b2f32e83b6b11476a4bf829526dc25fc663caf1965fab73bbdbcc1d0d5ccb8f
+size 7958
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_72.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_72.uasset
new file mode 100644
index 0000000..64ff55d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_72.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f7ca5185b800f0528be80684604e3985d8a637d22757bc72b7beca9a17af3ad
+size 7466
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_73.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_73.uasset
new file mode 100644
index 0000000..9f8f0db
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_73.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7820aabf90938bab0824ed49092bfebc2ecc406d546365da14e9a0f9722d616
+size 8376
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_74.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_74.uasset
new file mode 100644
index 0000000..826fb44
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_74.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a91db1a19705294c5fa7cc027cc20323397cc0c54519dd7bed18ccf8801eae8d
+size 7578
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_75.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_75.uasset
new file mode 100644
index 0000000..ed3930e
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_75.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26affc8be5abbc256ec6122bc78409be0d578bb41d85cc050922869c12491f94
+size 8348
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_76.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_76.uasset
new file mode 100644
index 0000000..0918563
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_76.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8d413a40991fbb4a43d4bffe80e8bc6b7ecaba6991294b9ed7f585881eaa89e
+size 8024
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_77.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_77.uasset
new file mode 100644
index 0000000..fa1a7c1
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_77.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b68d243f3ef3de245529a1f87e7a137b128db9812220aca688a5eeda011a639c
+size 7683
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_78.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_78.uasset
new file mode 100644
index 0000000..7d20583
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_78.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3d0037622a20f061a7e3d78e362ee46d11f02f8827449b476d5c9f78ff251bc
+size 8186
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_79.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_79.uasset
new file mode 100644
index 0000000..edc2870
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_79.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:411e59b1ffabe59bfac79d3add4f3d91aa95c344d95d471fc4f1914be3aae2f3
+size 8347
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_8.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_8.uasset
new file mode 100644
index 0000000..6d2ebfc
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_8.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b23c1c013e0ba7e52983aeeda6a02fb4ef86b778f348a5b4f5dac59a7c0a0b2
+size 8007
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_80.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_80.uasset
new file mode 100644
index 0000000..6a26300
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_80.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44746b3d1418e6b899f9627adc2dc5a8bcd7a4669d5342a267326e08d79f8513
+size 7413
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_81.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_81.uasset
new file mode 100644
index 0000000..6716b29
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_81.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7857da2092bf3db60ca609a016232b43754a75a28b0cba56ff44182a63167c10
+size 7666
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_82.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_82.uasset
new file mode 100644
index 0000000..4d5e73b
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_82.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:14818a55b91c16ae558b0eb2c7929cb262e6d500918c3f8abcbaecd128641ed8
+size 7637
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_83.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_83.uasset
new file mode 100644
index 0000000..151c61f
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_83.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cb625ad420cf80d42a8337a79c2f32a7b3d80c64d68ec4f8c2a39ea39a3a534
+size 8239
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_84.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_84.uasset
new file mode 100644
index 0000000..ec9ef69
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_84.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d122c8275fae3341e0097b03b837927eb83c5f23261316da4544cd72ec4f3b56
+size 8256
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_85.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_85.uasset
new file mode 100644
index 0000000..d3f3135
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_85.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed3034290903c77c0b4baafd08e9138540d0962f5a4eeabc76568ae29eaed65d
+size 7799
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_86.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_86.uasset
new file mode 100644
index 0000000..f0f95c5
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_86.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1674735863a0d46e5f75192389920571752629caee8c08dddd9e393d1896eaa
+size 7403
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_87.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_87.uasset
new file mode 100644
index 0000000..166efd5
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_87.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f139a7c9f2608b6b98b10f89cf10641e001bc1adcdd88e126ce034b2a8a354a9
+size 7871
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_88.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_88.uasset
new file mode 100644
index 0000000..637e0dd
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_88.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f71b2a54b89deda1c7ea9cc3799d24ed46cba907788718ad22ec5f690f918825
+size 7745
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_89.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_89.uasset
new file mode 100644
index 0000000..3787465
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_89.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:696cad940d2ef984fa7a3c21b51321079cdaeab01036ec5f3eec726ac26838c3
+size 8047
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_9.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_9.uasset
new file mode 100644
index 0000000..c975f31
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_9.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2ec68ff0e49171ca51196b3adeea7ddfe8d64613c615e75e35c723b59e16b978
+size 7625
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_90.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_90.uasset
new file mode 100644
index 0000000..da91706
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_90.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99192dbae670a89df13c8a22469b3dc571cdba48d386ea8f34311f2a375cda16
+size 7605
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_91.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_91.uasset
new file mode 100644
index 0000000..636825a
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_91.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4724e60f0c293c738ecb1c5854905d30515b99cc9826a3f3f9c8d49d3345b326
+size 7650
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_92.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_92.uasset
new file mode 100644
index 0000000..a426a65
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_92.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8440abfce39e12ba34339d1d80eba4b96f11cab8596b58175f2e99bb60b54272
+size 7369
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_93.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_93.uasset
new file mode 100644
index 0000000..591439a
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_93.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7f9d8201a09813e0f481162d2eeed1ef1989c3d48ef8de179e17c526c45c5e6
+size 7728
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_94.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_94.uasset
new file mode 100644
index 0000000..a548675
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_94.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c38d730f4f74267851e30fdd4fbc0bb828800258dda0e35249d92692b11d1fb
+size 7752
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_95.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_95.uasset
new file mode 100644
index 0000000..e02a8b1
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_95.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a13742d944d341d4233893a5b1d9367849892770531cb0e0182e52b7fa6de9b
+size 7510
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_96.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_96.uasset
new file mode 100644
index 0000000..371cb6f
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_96.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12e6c5b72030fee930699e80234e191b4db902c5a87fa18cc70bdf4e99e257cb
+size 7457
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_97.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_97.uasset
new file mode 100644
index 0000000..e3bd2b3
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_97.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a826fbf1778dc2a9d5eb63c1439fd3980714e527759beb48e45b86faae3a2763
+size 7679
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_98.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_98.uasset
new file mode 100644
index 0000000..f50e322
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_98.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2ec2c16326e68b618b5be85d9f6d9e778ee8325da08bf7a6c235d39445cb1fa
+size 7819
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_99.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_99.uasset
new file mode 100644
index 0000000..615389c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_DICT_4X4_100/marker_99.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41e96beccf65bfa8ef138a555e3e5d0b43808db137be84a1d6b267ac1d5f387f
+size 7664
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_0.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_0.uasset
new file mode 100644
index 0000000..ebf307b
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_0.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b4c7cb8345e7ddd42c4ae68d0d1a296437773b05345c4acdc45815840d58dd3
+size 6461
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_1.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_1.uasset
new file mode 100644
index 0000000..518ff7a
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd604f9ea52e798f075a89da62d769effae7eb0292deeb92e01537636938d8f6
+size 7022
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_10.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_10.uasset
new file mode 100644
index 0000000..6ebacb2
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_10.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c28a12d0b2684b4dded6c12fd3466098d6798cf3101b77430830d1018baae9c3
+size 6597
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_11.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_11.uasset
new file mode 100644
index 0000000..952aaef
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_11.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db8cd945931070c3ed6c5f07fa13715196f2880e56ac0f2a9cdd127e37f8f255
+size 6476
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_12.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_12.uasset
new file mode 100644
index 0000000..e4ccd2e
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_12.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12a305b1a8051c6d627735876b18dfee6ffaf0afe5d74b8670081604c585899a
+size 6298
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_13.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_13.uasset
new file mode 100644
index 0000000..fc98c37
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_13.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb3e43c2668ae882ec909743d0cc844675f0f5d90f72f673d8c81f7330c075fb
+size 6676
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_14.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_14.uasset
new file mode 100644
index 0000000..8f91b41
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_14.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:99ac8e4e278c5df006d6db3963f71e90fb00a4e6e483b39bbf1e46aa801defca
+size 6486
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_15.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_15.uasset
new file mode 100644
index 0000000..a0e92c6
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_15.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9fa4c8351a67fab941b67f66e0a32b63d3768a76ad1e8183a605a40b881e3ac
+size 6688
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_16.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_16.uasset
new file mode 100644
index 0000000..5a77b86
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_16.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:494e909e267e181face3750b1ff1d9ee6e7bf57c68a6a1a8e408d2d554abc225
+size 6922
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_17.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_17.uasset
new file mode 100644
index 0000000..a22d29c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_17.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34a956ed2125ce443e9c0af89c474866d2a1ae24f86b47c296b056d7d5fa7fc6
+size 6590
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_18.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_18.uasset
new file mode 100644
index 0000000..ca5eae3
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_18.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:459e2fbc557b6f4fc7ecd08af59ca4867f5047ee917434f0adaf0ac28d5cca83
+size 6696
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_19.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_19.uasset
new file mode 100644
index 0000000..28f8172
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_19.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76c4bdb6a77185b9fbbbe878b6c4f1f1e5c37e9e6144ea805d2333644758a430
+size 6648
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_2.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_2.uasset
new file mode 100644
index 0000000..8476e0e
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ab2012b0cae99f924d095a49b4663f2cebae67053a5c1d92323096a1eabc5da
+size 6590
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_20.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_20.uasset
new file mode 100644
index 0000000..7085f85
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_20.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:535701257c774fead7f4aa2bd6d026aff9c10d25c27c2c8a8b239a8ef3908195
+size 6360
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_21.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_21.uasset
new file mode 100644
index 0000000..7c51bf3
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_21.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58c43b8d66b0102517f97e2de32b018c3c838794ea0e654895f96072ae31b79d
+size 6508
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_22.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_22.uasset
new file mode 100644
index 0000000..26e7ba8
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_22.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64cf9165e7de993173589032f66f0b27133521c620b8d97db9842663b65e3742
+size 6639
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_23.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_23.uasset
new file mode 100644
index 0000000..315424b
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_23.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:260da31504a18b554b996d76dfd1290fa2c6be788e6ae154c867c8175d331464
+size 6262
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_24.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_24.uasset
new file mode 100644
index 0000000..6b92f36
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_24.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9830dcae42473f739ae7433bba5e627ae44e6a34e83d1bafe0dc5b2ed0cfad2d
+size 6632
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_25.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_25.uasset
new file mode 100644
index 0000000..733f3f2
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_25.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42180e7b49ff869a0d2ecb1f7b20a3cd7e212fc81add31b2ad84ca8750020074
+size 6518
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_26.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_26.uasset
new file mode 100644
index 0000000..9bd50b8
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_26.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af319136371500c7f663bcb8c2f3642e24f0ee2a8a998575fc616872bdfe9c1e
+size 6398
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_27.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_27.uasset
new file mode 100644
index 0000000..0214e25
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_27.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bed5e5e1ada7d5ebf39a9a5dc1594f3ab9d3c5becbd4b1a33d4f99644065c29a
+size 6327
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_28.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_28.uasset
new file mode 100644
index 0000000..25cc51c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_28.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3eae643ac49c1aa0a22e8350c42b755de1968f539ada86acd896cea15a654fd
+size 6328
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_29.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_29.uasset
new file mode 100644
index 0000000..d754e19
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_29.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb88b0ccbb8da8cf1cc075136f4b99da9d581e69af57b9fa2649c5cf8d37b441
+size 6896
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_3.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_3.uasset
new file mode 100644
index 0000000..3a0abb9
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_3.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:720a14719a2fb8ee65996dd620e3ca5b3a5723a240f6329c66408d33f9ad28b9
+size 6743
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_30.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_30.uasset
new file mode 100644
index 0000000..fe20dfa
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_30.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e92ca2914ac649ba92a2f591906083d670b48d261e6a6e826b573c978e4587cf
+size 6713
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_31.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_31.uasset
new file mode 100644
index 0000000..034d68d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_31.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:73b1345f25b3e7c70be1c3e4e2c24eed292d5c12cd9cd6ebe5ab41031bd0d895
+size 6391
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_32.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_32.uasset
new file mode 100644
index 0000000..bd91926
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_32.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d0a06a286fbb541ffcec3c4cc424d5988b70f701b5db9e43bbb93e1a35883fb
+size 6496
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_33.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_33.uasset
new file mode 100644
index 0000000..7cc8416
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_33.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ab3c6a2c93382b02b2bf5e0b5fd51a95faa26da1d401b226669840634992735
+size 6572
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_34.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_34.uasset
new file mode 100644
index 0000000..2dd1669
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_34.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6af589f520576d1fa1cd4d4cb4dd7376b257d3265b11e9e30dc24b150806bb3c
+size 6901
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_35.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_35.uasset
new file mode 100644
index 0000000..6278f33
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_35.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d9425cf452f69739cf9f310793f54a9179f5bec8698bce236fb91d9b1aba7e1
+size 6851
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_36.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_36.uasset
new file mode 100644
index 0000000..1e57d25
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_36.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58d3b064d70fd05a58a92a709b3f490a4eac21eecff63db0b7b38e556e71af40
+size 6511
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_37.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_37.uasset
new file mode 100644
index 0000000..b5b8117
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_37.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8c2b40a2afa8a0d0294d0919cad0c721cb26d1ebba42c71b7da79b82f81156ea
+size 6763
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_38.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_38.uasset
new file mode 100644
index 0000000..0fddc7d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_38.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b1cdb6374feb09dfe3666f6cfaaca93a1f72ef004edfa73918e50723dd4b569
+size 6673
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_39.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_39.uasset
new file mode 100644
index 0000000..c655106
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_39.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1031de27281ca7452dbc251b189c9258a3a3eae459e05eb6440752a163bfef91
+size 6417
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_4.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_4.uasset
new file mode 100644
index 0000000..e8fe08c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_4.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8ec5cdd694564deffd5fcd118fc407352ff26697fb5ec24a3c8f9959e8bb7a1e
+size 6633
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_40.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_40.uasset
new file mode 100644
index 0000000..91a7bb4
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_40.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e520adb005415a01ce533bd8315981fc8b3ca5bbeb1053785362d961bd57cce
+size 6477
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_41.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_41.uasset
new file mode 100644
index 0000000..9a1af73
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_41.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec035266f2a27a7b209ce812dba4f4116ec41b54699fefba32aebd0d500f2b4f
+size 6400
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_42.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_42.uasset
new file mode 100644
index 0000000..19b950d
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_42.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bbbcd5e6fea90b0d4b561105cac1b468dce4cbea9d4da303a566800359c66726
+size 6374
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_43.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_43.uasset
new file mode 100644
index 0000000..7a47aa7
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_43.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb653dd065a87a654a77e3036328a83710e883da3e59139ac780da08e3d0a033
+size 6757
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_44.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_44.uasset
new file mode 100644
index 0000000..2b3827e
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_44.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c93d679d3c2a47ed11d26cd58b6e3426aeff3202f57aeb0755ae07c9f4779e5c
+size 6651
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_45.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_45.uasset
new file mode 100644
index 0000000..230bb37
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_45.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0858fef371efb47642f72e6ed02947256b3222ac698dcad51d1148c24f1f397
+size 6541
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_46.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_46.uasset
new file mode 100644
index 0000000..ce61857
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_46.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cfda9b016523371a35c154eeedb6d302a609ffda528ae4d9f92bfe733d220e2
+size 6387
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_47.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_47.uasset
new file mode 100644
index 0000000..9e4c79c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_47.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6589357b8bc2de3fd1f4280f87e76d1ba958dbf82d95d0114f35994174885453
+size 6476
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_48.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_48.uasset
new file mode 100644
index 0000000..372761f
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_48.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5138729a874867c5e2aabaa131cee30ead1f3e664909e2fcff20fcc333157a9c
+size 6626
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_49.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_49.uasset
new file mode 100644
index 0000000..8d6b988
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_49.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:13c2b2b4be3f292d1f4c0c4b993c4cba653a031cd0309652db65adb4fb8e075f
+size 6522
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_5.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_5.uasset
new file mode 100644
index 0000000..098926c
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_5.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a3c4cacf1bbae1e42bfca63fafabee5b98c06b93945278e9c19925818f21447
+size 6843
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_6.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_6.uasset
new file mode 100644
index 0000000..b01e301
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_6.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:18a78c06d7c719c4ac1a085fa3f4e9c368723ce69f744bf6a0d9f34e31e54b70
+size 6461
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_7.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_7.uasset
new file mode 100644
index 0000000..b1d19ea
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_7.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:989e656285b145335927a471ba2c2b8e2b713565e3457c2405c77d14dca9dd5f
+size 6622
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_8.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_8.uasset
new file mode 100644
index 0000000..ec22cf5
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_8.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:131180f385760508b27eca1310b26cfc1d2a9a8defa4b1e86219996f6b02d2a8
+size 6637
diff --git a/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_9.uasset b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_9.uasset
new file mode 100644
index 0000000..8bd333e
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/ArUCO_Dict8/marker_9.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdbc8905170dc41e55449a9e18bc692b81a7011b6494e417e81a495237104774
+size 6788
diff --git a/Content/ActorsLibrery/Markers/Textures/chess_grid.uasset b/Content/ActorsLibrery/Markers/Textures/chess_grid.uasset
new file mode 100644
index 0000000..da6dbae
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/chess_grid.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9f3e356c409412655de5406d9e7e25fb727a286679316b9b166b252e0711426
+size 13898
diff --git a/Content/ActorsLibrery/Markers/Textures/circle_grid.uasset b/Content/ActorsLibrery/Markers/Textures/circle_grid.uasset
new file mode 100644
index 0000000..7a47e45
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/circle_grid.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d8745444b6f07e8131088513904f21bef04267a54f7a6089f9dbf674e6d0ae9e
+size 174335
diff --git a/Content/ActorsLibrery/Markers/Textures/color_pattern.uasset b/Content/ActorsLibrery/Markers/Textures/color_pattern.uasset
new file mode 100644
index 0000000..ceeddaf
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/Textures/color_pattern.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:caef74e396b2ce4cad76e522dd19cb648ed54050ea5bfba3841ff813affa3ebe
+size 57795
diff --git a/Content/ActorsLibrery/Markers/TwistCalib.uasset b/Content/ActorsLibrery/Markers/TwistCalib.uasset
new file mode 100644
index 0000000..0e713ec
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/TwistCalib.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52ed3907530719c068ae9de05a78e30bf102731f86120de956a6ac5f866289e0
+size 129818
diff --git a/Content/ActorsLibrery/Markers/chess_grid_mat.uasset b/Content/ActorsLibrery/Markers/chess_grid_mat.uasset
new file mode 100644
index 0000000..8cdd0dc
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/chess_grid_mat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c40c9d171dd22efeddf373d514397117d8ddfb7be56c014ada60c8a33d6a6bba
+size 88889
diff --git a/Content/ActorsLibrery/Markers/circle_grid_mat.uasset b/Content/ActorsLibrery/Markers/circle_grid_mat.uasset
new file mode 100644
index 0000000..58ebb7a
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/circle_grid_mat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:753873cdafbd9bd16916abd2cdd861328b6b8688f8098e23f3b2701678ec5a56
+size 88671
diff --git a/Content/ActorsLibrery/Markers/color_pattern_mat.uasset b/Content/ActorsLibrery/Markers/color_pattern_mat.uasset
new file mode 100644
index 0000000..f918bf6
--- /dev/null
+++ b/Content/ActorsLibrery/Markers/color_pattern_mat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d253eb2de70d17958b3e77a9fa7cb570c48ffd6abf35166c3d5a0dfb350690bf
+size 15656
diff --git a/Content/Assets/CPP/ActorSprites/Finish.uasset b/Content/Assets/CPP/ActorSprites/Finish.uasset
new file mode 100644
index 0000000..6028f07
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/Finish.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4a6eaf61a05a622ff4dad39ce27c85b8a6341071b6441f74d99ab1d51df078a
+size 18674
diff --git a/Content/Assets/CPP/ActorSprites/RoadMark.uasset b/Content/Assets/CPP/ActorSprites/RoadMark.uasset
new file mode 100644
index 0000000..9f28284
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/RoadMark.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e888bd5ff1926131115757c2f2632e9602acd2f8ae873d7fd3267d68d9dec8ae
+size 26318
diff --git a/Content/Assets/CPP/ActorSprites/S_Emitter.uasset b/Content/Assets/CPP/ActorSprites/S_Emitter.uasset
new file mode 100644
index 0000000..93b1e34
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_Emitter.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84e423a46517fe0504df196fe14606b404238f1b32c1c328c3b0a82cd6c97b85
+size 29098
diff --git a/Content/Assets/CPP/ActorSprites/S_LevelSequence.uasset b/Content/Assets/CPP/ActorSprites/S_LevelSequence.uasset
new file mode 100644
index 0000000..134b461
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_LevelSequence.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:beed1dd3fbfc280ce12c76145ba90c7993032c59a413eacb6b5b0fcc317f9662
+size 19565
diff --git a/Content/Assets/CPP/ActorSprites/S_RadForce.uasset b/Content/Assets/CPP/ActorSprites/S_RadForce.uasset
new file mode 100644
index 0000000..b2436fd
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_RadForce.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0e5c87efea0bc2ebe078f3f001f65cae8044d29cb379fbd042413b8ecb9e185
+size 25731
diff --git a/Content/Assets/CPP/ActorSprites/S_TargetPoint.uasset b/Content/Assets/CPP/ActorSprites/S_TargetPoint.uasset
new file mode 100644
index 0000000..ce99fac
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_TargetPoint.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34143a0c9ec4aec06534c6c1d9db20fb6696e52a312cb3acbf6ddbd5415853b3
+size 26554
diff --git a/Content/Assets/CPP/ActorSprites/S_Trigger.uasset b/Content/Assets/CPP/ActorSprites/S_Trigger.uasset
new file mode 100644
index 0000000..78e8b7a
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_Trigger.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2e516736938264c49a134dba2f8165bc59b4d130f9fd9419240f534f0521f43
+size 27583
diff --git a/Content/Assets/CPP/ActorSprites/S_TriggerBox.uasset b/Content/Assets/CPP/ActorSprites/S_TriggerBox.uasset
new file mode 100644
index 0000000..4ffeaad
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_TriggerBox.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9144d946940366afb03392dbddce6c3572a75fb2e0387f3cd9101a07099456e9
+size 23542
diff --git a/Content/Assets/CPP/ActorSprites/S_TriggerCapsule.uasset b/Content/Assets/CPP/ActorSprites/S_TriggerCapsule.uasset
new file mode 100644
index 0000000..b468644
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_TriggerCapsule.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eead5f4daaf5bebb2f1c4894d1a58a1d2de33d362c8e2e7e4999f601596747ec
+size 25158
diff --git a/Content/Assets/CPP/ActorSprites/S_TriggerSphere.uasset b/Content/Assets/CPP/ActorSprites/S_TriggerSphere.uasset
new file mode 100644
index 0000000..a3c45b3
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/S_TriggerSphere.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc97967112410a543f890500a04c94b443743e8d7037d729fcd5eb86e31846eb
+size 35796
diff --git a/Content/Assets/CPP/ActorSprites/Spawn_Point.uasset b/Content/Assets/CPP/ActorSprites/Spawn_Point.uasset
new file mode 100644
index 0000000..67c440c
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/Spawn_Point.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2bc5a50c40f33fef41d8f2f2adb5224c18bb3cac825a5be259ce3899431d100
+size 30134
diff --git a/Content/Assets/CPP/ActorSprites/Waypoint.uasset b/Content/Assets/CPP/ActorSprites/Waypoint.uasset
new file mode 100644
index 0000000..eb47334
--- /dev/null
+++ b/Content/Assets/CPP/ActorSprites/Waypoint.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f8415a4d3a7c26a4c9073ddc4df990b85feddbd90a194b6b5eb771c1995e5fe
+size 24984
diff --git a/Content/Assets/CPP/AxesMatDense.uasset b/Content/Assets/CPP/AxesMatDense.uasset
new file mode 100644
index 0000000..3f560f2
--- /dev/null
+++ b/Content/Assets/CPP/AxesMatDense.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e8df86f7fc4ed9c4bd8870f6bda37546ac4c4f3f7daf1cab52e5c9a767189338
+size 105503
diff --git a/Content/Assets/CPP/AxesMatOpacity.uasset b/Content/Assets/CPP/AxesMatOpacity.uasset
new file mode 100644
index 0000000..62ff46c
--- /dev/null
+++ b/Content/Assets/CPP/AxesMatOpacity.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:67413b0dfaf5a5727fa544c1fada3a457f16066d4fd5cbe3210608b8dc716855
+size 10901
diff --git a/Content/Assets/CPP/CameraPostProcess/CFA.uasset b/Content/Assets/CPP/CameraPostProcess/CFA.uasset
new file mode 100644
index 0000000..4783eb3
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/CFA.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c431be8e1d6df95318e4dfd95426b33f540fef748f80eeb2cc5304aa30a4e0cb
+size 12500
diff --git a/Content/Assets/CPP/CameraPostProcess/CameraDepthAbs.uasset b/Content/Assets/CPP/CameraPostProcess/CameraDepthAbs.uasset
new file mode 100644
index 0000000..2b63fa6
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/CameraDepthAbs.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:074d85fd99a96fc908a4c73c5e456421bc0848c0d3099598b17843c26136a26c
+size 87792
diff --git a/Content/Assets/CPP/CameraPostProcess/CameraDepthAbsEnc.uasset b/Content/Assets/CPP/CameraPostProcess/CameraDepthAbsEnc.uasset
new file mode 100644
index 0000000..a0a2253
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/CameraDepthAbsEnc.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fda3d2a762642e09d0428a667e9d8a8010fb4cd532cf25889134e7edd65f544
+size 96055
diff --git a/Content/Assets/CPP/CameraPostProcess/CameraDepthNorm.uasset b/Content/Assets/CPP/CameraPostProcess/CameraDepthNorm.uasset
new file mode 100644
index 0000000..b45d609
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/CameraDepthNorm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c5b1d3dec61102fbdc6d37f1bdbdd68d20418ebb108036f43f44e1471c2d252
+size 90321
diff --git a/Content/Assets/CPP/CameraPostProcess/CameraDepthNormEnc.uasset b/Content/Assets/CPP/CameraPostProcess/CameraDepthNormEnc.uasset
new file mode 100644
index 0000000..091e405
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/CameraDepthNormEnc.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7146373285a7c09bfeed3f84e455d1c464b1e14a74a81795f6119f02bfbf1aa8
+size 98448
diff --git a/Content/Assets/CPP/CameraPostProcess/CameraSegm.uasset b/Content/Assets/CPP/CameraPostProcess/CameraSegm.uasset
new file mode 100644
index 0000000..86e089b
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/CameraSegm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97f3de0ce286f04832285d2572d78695b262c32cdbf4dd62baeadc9c8b3b832c
+size 87835
diff --git a/Content/Assets/CPP/CameraPostProcess/CameraSegmColor.uasset b/Content/Assets/CPP/CameraPostProcess/CameraSegmColor.uasset
new file mode 100644
index 0000000..52dc0be
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/CameraSegmColor.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61c00ab5b9f0a6baa1b55894716dcf9febe229863c215f399cfd8b1ecba2cd3c
+size 91632
diff --git a/Content/Assets/CPP/CameraPostProcess/texture_1d.uasset b/Content/Assets/CPP/CameraPostProcess/texture_1d.uasset
new file mode 100644
index 0000000..de0210e
--- /dev/null
+++ b/Content/Assets/CPP/CameraPostProcess/texture_1d.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d15f9c6357ad3de4c06944038c498a6e271425032bbef06c8d50b57091ade5c3
+size 5690
diff --git a/Content/Assets/CPP/Curves/ElectricEngine/Engine_100Hm.uasset b/Content/Assets/CPP/Curves/ElectricEngine/Engine_100Hm.uasset
new file mode 100644
index 0000000..03b83b3
--- /dev/null
+++ b/Content/Assets/CPP/Curves/ElectricEngine/Engine_100Hm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c0f7f75bcd7f54f970415a92d7f0faa7a773a2680af1f0188ae0d44aa4508b63
+size 4281
diff --git a/Content/Assets/CPP/Curves/ElectricEngine/Engine_180Hm.uasset b/Content/Assets/CPP/Curves/ElectricEngine/Engine_180Hm.uasset
new file mode 100644
index 0000000..57d412b
--- /dev/null
+++ b/Content/Assets/CPP/Curves/ElectricEngine/Engine_180Hm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de0c46bc241110f39a28788e244c12de3f01b3de570919c48e435664d28eabd3
+size 4281
diff --git a/Content/Assets/CPP/Curves/ElectricEngine/Engine_200Hm.uasset b/Content/Assets/CPP/Curves/ElectricEngine/Engine_200Hm.uasset
new file mode 100644
index 0000000..7e73bf9
--- /dev/null
+++ b/Content/Assets/CPP/Curves/ElectricEngine/Engine_200Hm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6931d8eceeb1ccefa17f8a9b611bb37a3b306f8fdcd03a4771a9c67bd0b2ffa
+size 4281
diff --git a/Content/Assets/CPP/Curves/ElectricEngine/Engine_290Hm.uasset b/Content/Assets/CPP/Curves/ElectricEngine/Engine_290Hm.uasset
new file mode 100644
index 0000000..a8a43a3
--- /dev/null
+++ b/Content/Assets/CPP/Curves/ElectricEngine/Engine_290Hm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5647a2a19b3b4273a89de69d7cce31221b55d67f9b1a964dce5995c9e2f7c2b4
+size 4281
diff --git a/Content/Assets/CPP/Curves/ElectricEngine/Engine_400Hm.uasset b/Content/Assets/CPP/Curves/ElectricEngine/Engine_400Hm.uasset
new file mode 100644
index 0000000..9af5873
--- /dev/null
+++ b/Content/Assets/CPP/Curves/ElectricEngine/Engine_400Hm.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e424fa80c5f4820505940a1e723b6c11ba2c88adfe3c5cda8b4b44e768a5e68
+size 4281
diff --git a/Content/Assets/CPP/Curves/JoyInput/FeedbackAutocenterCurve.uasset b/Content/Assets/CPP/Curves/JoyInput/FeedbackAutocenterCurve.uasset
new file mode 100644
index 0000000..ba67f41
--- /dev/null
+++ b/Content/Assets/CPP/Curves/JoyInput/FeedbackAutocenterCurve.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:973a66758570832cfc2071029f13714671177de547bc1e8d9a7a6bb769b2aa1c
+size 4445
diff --git a/Content/Assets/CPP/Curves/JoyInput/FeedbackDiffCurve.uasset b/Content/Assets/CPP/Curves/JoyInput/FeedbackDiffCurve.uasset
new file mode 100644
index 0000000..ee82a0c
--- /dev/null
+++ b/Content/Assets/CPP/Curves/JoyInput/FeedbackDiffCurve.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe1ed4659bdbb4bd7c24ffaaa968a84717a8cc17f905bb4a51903cd55113b289
+size 4442
diff --git a/Content/Assets/CPP/Curves/JoyInput/FeedbackResistionCurve.uasset b/Content/Assets/CPP/Curves/JoyInput/FeedbackResistionCurve.uasset
new file mode 100644
index 0000000..98eac3a
--- /dev/null
+++ b/Content/Assets/CPP/Curves/JoyInput/FeedbackResistionCurve.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcffcde7e5e18105e6a6ebe01e37b59c74458e22d1a8d2c41f2ea681d5f0cf02
+size 4852
diff --git a/Content/Assets/CPP/Curves/KeyboardInput/KeyInputMaxSteeringAngel.uasset b/Content/Assets/CPP/Curves/KeyboardInput/KeyInputMaxSteeringAngel.uasset
new file mode 100644
index 0000000..27530d5
--- /dev/null
+++ b/Content/Assets/CPP/Curves/KeyboardInput/KeyInputMaxSteeringAngel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:477479f3dd07b9c262772a5bee16bab640dc27351cea02ab93df0d8ba7d4799c
+size 4501
diff --git a/Content/Assets/CPP/Curves/KeyboardInput/KeyInputSteeringSpeed.uasset b/Content/Assets/CPP/Curves/KeyboardInput/KeyInputSteeringSpeed.uasset
new file mode 100644
index 0000000..6f1c3bd
--- /dev/null
+++ b/Content/Assets/CPP/Curves/KeyboardInput/KeyInputSteeringSpeed.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d462a9d6b6e822f62fe82955a7a143d668c5c9a9275cd31d644793851a151806
+size 4486
diff --git a/Content/Assets/CPP/Curves/SteeringRack_SteerSpeed.uasset b/Content/Assets/CPP/Curves/SteeringRack_SteerSpeed.uasset
new file mode 100644
index 0000000..2d0ce87
--- /dev/null
+++ b/Content/Assets/CPP/Curves/SteeringRack_SteerSpeed.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2b4ef9495f74a120f9ca47a428e4f6c33da0a5c55c75a66580cf5614eadc70a
+size 4481
diff --git a/Content/Assets/CPP/EditorMaterials/GizmoMaterial.uasset b/Content/Assets/CPP/EditorMaterials/GizmoMaterial.uasset
new file mode 100644
index 0000000..4e42f72
--- /dev/null
+++ b/Content/Assets/CPP/EditorMaterials/GizmoMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f60454f3c43e0af7b4666a165599e68ab6af7155f9b1a26ce78b2343cdf4304a
+size 15725
diff --git a/Content/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial.uasset b/Content/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial.uasset
new file mode 100644
index 0000000..65297ea
--- /dev/null
+++ b/Content/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:773a052226b4ead12b46dc24af7cfa9f4258cb05bd2e014a11ed77d0649be373
+size 19850
diff --git a/Content/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial_Ma.uasset b/Content/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial_Ma.uasset
new file mode 100644
index 0000000..80788ed
--- /dev/null
+++ b/Content/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial_Ma.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd0d360d09726d3a9e8da457f222acb3f89402b64f350273a9d9e0be13c21b10
+size 21724
diff --git a/Content/Assets/CPP/EditorMaterials/WidgetVertexColorMaterial.uasset b/Content/Assets/CPP/EditorMaterials/WidgetVertexColorMaterial.uasset
new file mode 100644
index 0000000..df093bb
--- /dev/null
+++ b/Content/Assets/CPP/EditorMaterials/WidgetVertexColorMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb7a3f6d76033fd1361638754fcf999549c63230c6346394fd9790fb70c40b79
+size 11896
diff --git a/Content/Assets/CPP/FisheyeCamera/FisheyeMat1.uasset b/Content/Assets/CPP/FisheyeCamera/FisheyeMat1.uasset
new file mode 100644
index 0000000..cdf1364
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/FisheyeMat1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b88b2fbbe0a04a8e21150c2e68a1741c73f6af8eaa2ac7f6a65be0aa49d120c
+size 96141
diff --git a/Content/Assets/CPP/FisheyeCamera/FisheyeMat2.uasset b/Content/Assets/CPP/FisheyeCamera/FisheyeMat2.uasset
new file mode 100644
index 0000000..ed1dbc4
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/FisheyeMat2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc490131af0586380f02cd45a063ba85a501a60809251864183691a434e77bf9
+size 92740
diff --git a/Content/Assets/CPP/FisheyeCamera/FisheyeMat3.uasset b/Content/Assets/CPP/FisheyeCamera/FisheyeMat3.uasset
new file mode 100644
index 0000000..f44a8ab
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/FisheyeMat3.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a2b2caa75ecddd78ad381574690587f6f440851967755a9fc0eb2f4e5c5d5b3e
+size 92582
diff --git a/Content/Assets/CPP/FisheyeCamera/FisheyeMat4.uasset b/Content/Assets/CPP/FisheyeCamera/FisheyeMat4.uasset
new file mode 100644
index 0000000..ded9ece
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/FisheyeMat4.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27b14b32e4c2e1a2505b927c839c4f5f2338cdfcbe67c0e4fc19dfa12e997ed2
+size 93781
diff --git a/Content/Assets/CPP/FisheyeCamera/FisheyeMat5.uasset b/Content/Assets/CPP/FisheyeCamera/FisheyeMat5.uasset
new file mode 100644
index 0000000..dc43d0f
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/FisheyeMat5.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fac0a182c346b87c9f16f5e07f123046301a30786c8d3eddf684e11d34fd03a5
+size 92691
diff --git a/Content/Assets/CPP/FisheyeCamera/Fisheye_FrontMesh.uasset b/Content/Assets/CPP/FisheyeCamera/Fisheye_FrontMesh.uasset
new file mode 100644
index 0000000..f429884
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/Fisheye_FrontMesh.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7896ed7ca11c054312d3d6bf05afcf0a605bd6c623ae3dfcfe669e96b6545d93
+size 153481
diff --git a/Content/Assets/CPP/FisheyeCamera/Fisheye_MaskMat.uasset b/Content/Assets/CPP/FisheyeCamera/Fisheye_MaskMat.uasset
new file mode 100644
index 0000000..30f0f02
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/Fisheye_MaskMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a253543daf286bf8e9d5e9e58ebcb572b653f3e51076cd2e8c54ee7648488b45
+size 88775
diff --git a/Content/Assets/CPP/FisheyeCamera/Fisheye_MaskMesh.uasset b/Content/Assets/CPP/FisheyeCamera/Fisheye_MaskMesh.uasset
new file mode 100644
index 0000000..2edfb07
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/Fisheye_MaskMesh.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57affc40d92fe3b5da544e4fd9d8cee4e8c9aa515fd941a6dfbbad9f316f1ca0
+size 15958
diff --git a/Content/Assets/CPP/FisheyeCamera/Fisheye_MeshMat.uasset b/Content/Assets/CPP/FisheyeCamera/Fisheye_MeshMat.uasset
new file mode 100644
index 0000000..b768a22
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/Fisheye_MeshMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e07edec50e6185f21231b9fc183127c01b94ff3df7962a0bed6ac9a140dacbcd
+size 103804
diff --git a/Content/Assets/CPP/FisheyeCamera/Fisheye_SideMesh.uasset b/Content/Assets/CPP/FisheyeCamera/Fisheye_SideMesh.uasset
new file mode 100644
index 0000000..a05d888
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/Fisheye_SideMesh.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7137bf8e87e25a80b011523f85220b90b73d6ee06323c142bb2eec2c4ee4be5
+size 161850
diff --git a/Content/Assets/CPP/FisheyeCamera/Mask_alpha.uasset b/Content/Assets/CPP/FisheyeCamera/Mask_alpha.uasset
new file mode 100644
index 0000000..15032ad
--- /dev/null
+++ b/Content/Assets/CPP/FisheyeCamera/Mask_alpha.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:802e97c0ecf4cee4e8ce82fbc1e289d51dd2ef06f3d20c09a858a9232b18d17a
+size 1352415
diff --git a/Content/Assets/CPP/LaneMat.uasset b/Content/Assets/CPP/LaneMat.uasset
new file mode 100644
index 0000000..03a300b
--- /dev/null
+++ b/Content/Assets/CPP/LaneMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:20ae196a30532a48681529616f3b4101e897d299bd40728a07aa63c325d8e94f
+size 84568
diff --git a/Content/Assets/CPP/Lidar/DepthMapLidar.uasset b/Content/Assets/CPP/Lidar/DepthMapLidar.uasset
new file mode 100644
index 0000000..43960ca
--- /dev/null
+++ b/Content/Assets/CPP/Lidar/DepthMapLidar.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aee57bed7aed20ac3bf7fa4cd9ca86672fc5d581f66c5af33b484bd484988da7
+size 107218
diff --git a/Content/Assets/CPP/Lidar/DepthMapLidar_Debug.uasset b/Content/Assets/CPP/Lidar/DepthMapLidar_Debug.uasset
new file mode 100644
index 0000000..5aa808e
--- /dev/null
+++ b/Content/Assets/CPP/Lidar/DepthMapLidar_Debug.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17913195fde531cb7083371b6f21c7a2252c6aed689b7d23a7a0638a09b39dd9
+size 95441
diff --git a/Content/Assets/CPP/RouteMat.uasset b/Content/Assets/CPP/RouteMat.uasset
new file mode 100644
index 0000000..c97e53e
--- /dev/null
+++ b/Content/Assets/CPP/RouteMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a10cb8282fac40fb44fa5a07d4366245477792daa18be66decc073a527a3b7d2
+size 17169
diff --git a/Content/Assets/CPP/ScreenLoading/Logo.uasset b/Content/Assets/CPP/ScreenLoading/Logo.uasset
new file mode 100644
index 0000000..eff7b9d
--- /dev/null
+++ b/Content/Assets/CPP/ScreenLoading/Logo.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:701b87919f64a345d98c4bc2e438f04bd29699e330d736e51a1afb79fefc7dc7
+size 25793
diff --git a/Content/Assets/CPP/SensorFOVMaterial.uasset b/Content/Assets/CPP/SensorFOVMaterial.uasset
new file mode 100644
index 0000000..1dfd01d
--- /dev/null
+++ b/Content/Assets/CPP/SensorFOVMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7deab76cb485459ddbdda4e4ba245bbb9dbf4630b2b26eca26826ff068676add
+size 32055
diff --git a/Content/Assets/CPP/UnlitText.uasset b/Content/Assets/CPP/UnlitText.uasset
new file mode 100644
index 0000000..34d4c55
--- /dev/null
+++ b/Content/Assets/CPP/UnlitText.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:513c48a0795902d23325a7040a8de65f8357891d9b21782e40878c180c088f96
+size 25343
diff --git a/Content/Assets/CPP/V2X/BoxCollectableMat.uasset b/Content/Assets/CPP/V2X/BoxCollectableMat.uasset
new file mode 100644
index 0000000..88833cb
--- /dev/null
+++ b/Content/Assets/CPP/V2X/BoxCollectableMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a704a41b4bd06d8294dcb7b64fc46f2eac35de847ddaafb6a4b86fae4452e827
+size 97352
diff --git a/Content/Assets/CPP/V2X/BoxObstacleMat.uasset b/Content/Assets/CPP/V2X/BoxObstacleMat.uasset
new file mode 100644
index 0000000..8ab4029
--- /dev/null
+++ b/Content/Assets/CPP/V2X/BoxObstacleMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d12a9101a3e74fa11e8fc240265596ec7e2d1bff3e22a2b3bcd53fb5f54c198
+size 90039
diff --git a/Content/Assets/CPP/V2X/BoxUndefMat.uasset b/Content/Assets/CPP/V2X/BoxUndefMat.uasset
new file mode 100644
index 0000000..e7baf7e
--- /dev/null
+++ b/Content/Assets/CPP/V2X/BoxUndefMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5eb64086ebed6a2905f2a58c3fb61d2ad2087e60fba36986423bbe634345ccf4
+size 78563
diff --git a/Content/Assets/CalibrationMat/CalibrationImage.uasset b/Content/Assets/CalibrationMat/CalibrationImage.uasset
new file mode 100644
index 0000000..12ee953
--- /dev/null
+++ b/Content/Assets/CalibrationMat/CalibrationImage.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9679bf8d375dcc8c9bb6f9af104075fae6d348e436a1ae956809c0e40e6af24
+size 262691
diff --git a/Content/Assets/CalibrationMat/CalibrationMat.uasset b/Content/Assets/CalibrationMat/CalibrationMat.uasset
new file mode 100644
index 0000000..2042800
--- /dev/null
+++ b/Content/Assets/CalibrationMat/CalibrationMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dddbaa1147076a0c9d3774c808bd45c20c632716184b57884c6a852d8208e9ea
+size 133571
diff --git a/Content/Assets/Effects/Skid/M_Skid_Road.uasset b/Content/Assets/Effects/Skid/M_Skid_Road.uasset
new file mode 100644
index 0000000..d49ae52
--- /dev/null
+++ b/Content/Assets/Effects/Skid/M_Skid_Road.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:384d910e7f6f49e0f9523a150626e6a7899f44441384acf0e9de703362cd0b6a
+size 90119
diff --git a/Content/Assets/Effects/Skid/M_Smoke.uasset b/Content/Assets/Effects/Skid/M_Smoke.uasset
new file mode 100644
index 0000000..8669632
--- /dev/null
+++ b/Content/Assets/Effects/Skid/M_Smoke.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:594682961c49b2054345c4b37218433033446b1466fe625db3868546db08ef07
+size 77287
diff --git a/Content/Assets/Effects/Skid/PS_Mark.uasset b/Content/Assets/Effects/Skid/PS_Mark.uasset
new file mode 100644
index 0000000..ea1845f
--- /dev/null
+++ b/Content/Assets/Effects/Skid/PS_Mark.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92ffcabc4b59e56f2fab12e5c5e2d5f67d7ba9277ddc0466e6123557099e90b2
+size 186028
diff --git a/Content/Assets/Effects/Skid/PS_Smoke.uasset b/Content/Assets/Effects/Skid/PS_Smoke.uasset
new file mode 100644
index 0000000..6527410
--- /dev/null
+++ b/Content/Assets/Effects/Skid/PS_Smoke.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7e503be92f1da45172c7eff176d8bb2733567e2b14b36371ff6712f5e4fdb7a
+size 202635
diff --git a/Content/Assets/Effects/Skid/T_Smoke.uasset b/Content/Assets/Effects/Skid/T_Smoke.uasset
new file mode 100644
index 0000000..1ad5dc3
--- /dev/null
+++ b/Content/Assets/Effects/Skid/T_Smoke.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abe4f35b5e16deb21b4d68182be56a978fb6cca16d91b4574689e2b6a93e8bdf
+size 88802
diff --git a/Content/Assets/Effects/Skid/drift.uasset b/Content/Assets/Effects/Skid/drift.uasset
new file mode 100644
index 0000000..e58d0e6
--- /dev/null
+++ b/Content/Assets/Effects/Skid/drift.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dec0604c27f1b88fc186dacfd6a7cb1d33e6e3202a1fce4241f6e32a8146b9ac
+size 194424
diff --git a/Content/Assets/Effects/Skid/drift2.uasset b/Content/Assets/Effects/Skid/drift2.uasset
new file mode 100644
index 0000000..5f3e9ce
--- /dev/null
+++ b/Content/Assets/Effects/Skid/drift2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a492c8ae2b8f2b31dc9463101d143ccc0d1c2d7e70fbd9f68c2d7ad202f9bb4
+size 17859
diff --git a/Content/Assets/GridMat2/WidgetGridVertexColorMaterial.uasset b/Content/Assets/GridMat2/WidgetGridVertexColorMaterial.uasset
new file mode 100644
index 0000000..d40108c
--- /dev/null
+++ b/Content/Assets/GridMat2/WidgetGridVertexColorMaterial.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74e288c6e74ccdf9e475396c18e98916ef5f11a9586a2a27125d79665cc7b7ff
+size 19729
diff --git a/Content/Assets/GridMat2/blue.uasset b/Content/Assets/GridMat2/blue.uasset
new file mode 100644
index 0000000..ef8152e
--- /dev/null
+++ b/Content/Assets/GridMat2/blue.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bb647be581ac817608a081ca02f65c6e837291b54381dd31c553993bd8accfb
+size 119344
diff --git a/Content/Assets/GridMat2/green.uasset b/Content/Assets/GridMat2/green.uasset
new file mode 100644
index 0000000..99aff5d
--- /dev/null
+++ b/Content/Assets/GridMat2/green.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9117f0e035f5948623f747794045f51082f0e780ac42af07d3643fa4eecba56
+size 120993
diff --git a/Content/Assets/GridMat2/red.uasset b/Content/Assets/GridMat2/red.uasset
new file mode 100644
index 0000000..1393471
--- /dev/null
+++ b/Content/Assets/GridMat2/red.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c38a49bea1d8bbd2c3c563984167dc4387ce394d3d46bcfba0702a65f46c8405
+size 118905
diff --git a/Content/Assets/LevelPrototypingMat/Materials/MF_ProcGrid.uasset b/Content/Assets/LevelPrototypingMat/Materials/MF_ProcGrid.uasset
new file mode 100644
index 0000000..5b0dcf0
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Materials/MF_ProcGrid.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc995354c41e2168e36080205254c8cccc31ec0b86e9ac938cf49e818ac3fb51
+size 48354
diff --git a/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_Gray.uasset b/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_Gray.uasset
new file mode 100644
index 0000000..bed9889
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_Gray.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a009360ff6f8068a440b4411b24e61649e94229902fa654fe9eeaa393703a44
+size 13214
diff --git a/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_Gray_02.uasset b/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_Gray_02.uasset
new file mode 100644
index 0000000..57ff886
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_Gray_02.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc47b50a20ae22fd088c564df9096f068af775ce7a077d7590d694a90156a650
+size 12389
diff --git a/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_TopDark.uasset b/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_TopDark.uasset
new file mode 100644
index 0000000..a31f41f
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Materials/MI_PrototypeGrid_TopDark.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:144abff7e7c5855513539a92be36f41098f197df71e742cdb90cb73fa3e6d776
+size 12424
diff --git a/Content/Assets/LevelPrototypingMat/Materials/MI_Solid_Blue.uasset b/Content/Assets/LevelPrototypingMat/Materials/MI_Solid_Blue.uasset
new file mode 100644
index 0000000..2f9cab5
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Materials/MI_Solid_Blue.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a6f868ccf87c367f4452b8e9e89c08daefb028e3c9f08a924e3a6d769fb35c4
+size 9096
diff --git a/Content/Assets/LevelPrototypingMat/Materials/M_PrototypeGrid.uasset b/Content/Assets/LevelPrototypingMat/Materials/M_PrototypeGrid.uasset
new file mode 100644
index 0000000..aea2163
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Materials/M_PrototypeGrid.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5f0bcf4c3a376b889da6f24fcb77ef2a858d0a99da2acaac7fcff2d94552300f
+size 42274
diff --git a/Content/Assets/LevelPrototypingMat/Materials/M_Solid.uasset b/Content/Assets/LevelPrototypingMat/Materials/M_Solid.uasset
new file mode 100644
index 0000000..c9c2005
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Materials/M_Solid.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b37d2922e771b2cba137f5f2afa740be0fd2de00959d59e03633042078a478a6
+size 11294
diff --git a/Content/Assets/LevelPrototypingMat/Textures/T_GridChecker_A.uasset b/Content/Assets/LevelPrototypingMat/Textures/T_GridChecker_A.uasset
new file mode 100644
index 0000000..1597323
--- /dev/null
+++ b/Content/Assets/LevelPrototypingMat/Textures/T_GridChecker_A.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce5e45c99fc1e3f9e281f2b1af8b00b38ba64eac62af7f8db95beada72a9c7b7
+size 9727
diff --git a/Content/Assets/SimpleMat/AtopMat.uasset b/Content/Assets/SimpleMat/AtopMat.uasset
new file mode 100644
index 0000000..20262a7
--- /dev/null
+++ b/Content/Assets/SimpleMat/AtopMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b6c4baf649581268f9fe3434dd76d825834902b794fa79923f89512d16ba4df
+size 97722
diff --git a/Content/Assets/SimpleMat/M_Outline.uasset b/Content/Assets/SimpleMat/M_Outline.uasset
new file mode 100644
index 0000000..d0dc9a0
--- /dev/null
+++ b/Content/Assets/SimpleMat/M_Outline.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:070022de3000dbc99ecf44ad8b648549c477fb8fa7e49158b74845f6993c9b7d
+size 13261
diff --git a/Content/Assets/SimpleMat/OpacityMat.uasset b/Content/Assets/SimpleMat/OpacityMat.uasset
new file mode 100644
index 0000000..acfd8ad
--- /dev/null
+++ b/Content/Assets/SimpleMat/OpacityMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e4c51397e4522e74d5a16553369c4c566ecdc7c640ad0696aad2506ff635948
+size 97571
diff --git a/Content/Assets/SimpleMat/SolidBlue.uasset b/Content/Assets/SimpleMat/SolidBlue.uasset
new file mode 100644
index 0000000..b0cdcc7
--- /dev/null
+++ b/Content/Assets/SimpleMat/SolidBlue.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c896d585f7689b40bbf8df77defc5885529a3408ea38833b3da733d3deef979e
+size 9027
diff --git a/Content/Assets/SimpleMat/SolidGreen.uasset b/Content/Assets/SimpleMat/SolidGreen.uasset
new file mode 100644
index 0000000..4c8bd43
--- /dev/null
+++ b/Content/Assets/SimpleMat/SolidGreen.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c1a12fa69919f56b7b9444b551219aa185dd86f2b2f87ff653923628ec63047
+size 9458
diff --git a/Content/Assets/SimpleMat/SolidMat.uasset b/Content/Assets/SimpleMat/SolidMat.uasset
new file mode 100644
index 0000000..4730a42
--- /dev/null
+++ b/Content/Assets/SimpleMat/SolidMat.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c2d9624fe8093560fbaf28128156c2333b4fa1ca242266214f23b6ea5cfd06a
+size 10244
diff --git a/Content/Assets/SimpleMat/SolidRed.uasset b/Content/Assets/SimpleMat/SolidRed.uasset
new file mode 100644
index 0000000..d0cda42
--- /dev/null
+++ b/Content/Assets/SimpleMat/SolidRed.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:615720314bedbf701d85d7d73e23e5e4ccf917c93cc4f14ddd6ea876dbcd6c75
+size 8455
diff --git a/Content/GhostPedestrians/GhostManny.uasset b/Content/GhostPedestrians/GhostManny.uasset
new file mode 100644
index 0000000..5a52a93
--- /dev/null
+++ b/Content/GhostPedestrians/GhostManny.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5c6adc22c0c0097b8ec0ff7a5a7a1c39fa1a2dc0165e4d439d91221d05774ed
+size 32712
diff --git a/Content/GhostPedestrians/GhostPedestrian_BP.uasset b/Content/GhostPedestrians/GhostPedestrian_BP.uasset
new file mode 100644
index 0000000..f100fe8
--- /dev/null
+++ b/Content/GhostPedestrians/GhostPedestrian_BP.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ddea4a591d9e38814080455c3ebca399b9f45a9e90fc1d9d1b21e8927faf2a6
+size 111381
diff --git a/Content/GhostPedestrians/GhostQuinn.uasset b/Content/GhostPedestrians/GhostQuinn.uasset
new file mode 100644
index 0000000..21db22f
--- /dev/null
+++ b/Content/GhostPedestrians/GhostQuinn.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42edbcfd983a32c2de7d102982619ab8896f8eb12ca0c5cfe5cb74bb679609ea
+size 31789
diff --git a/Content/GhostPedestrians/Mannequins/Animations/ABP_Manny.uasset b/Content/GhostPedestrians/Mannequins/Animations/ABP_Manny.uasset
new file mode 100644
index 0000000..4edc731
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/ABP_Manny.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3e473b1e694b5e0f4bf8ebe000c9fdecbd25811a065a2be4d98f24f750d61bc
+size 347879
diff --git a/Content/GhostPedestrians/Mannequins/Animations/ABP_Quinn.uasset b/Content/GhostPedestrians/Mannequins/Animations/ABP_Quinn.uasset
new file mode 100644
index 0000000..e36a84b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/ABP_Quinn.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:53db2e64315b12c6c477d6b79ec5566fdda7ccfb8045f318e044b8efbfaece5b
+size 40003
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/BS_MM_WalkRun.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/BS_MM_WalkRun.uasset
new file mode 100644
index 0000000..fc4810c
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/BS_MM_WalkRun.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e8c88fc793ae550f2f97330497a6c499fe1d8bfc3a905e593a7073c18e25fa08
+size 9173
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Fall_Loop.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Fall_Loop.uasset
new file mode 100644
index 0000000..d876b3f
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Fall_Loop.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28e531956124479767192bac9f3bcf05c67a451f1ca535d7e76a2d704187405d
+size 973465
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Idle.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Idle.uasset
new file mode 100644
index 0000000..c09f32b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Idle.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1ca308efe799c547d150a050e19376f4bdccf1204ebe763a58d538dada362e23
+size 1464469
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Jump.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Jump.uasset
new file mode 100644
index 0000000..e2b254b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Jump.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:23c9cd89431aed9c3ec241018f1618a33ecfb0694209e7331c49b90332d6be9d
+size 451749
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Land.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Land.uasset
new file mode 100644
index 0000000..51c2098
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Land.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b211828514499a55403d65897f1a25f3540d40a72d2feaebfbf7fad93c613a65
+size 457666
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Run_Fwd.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Run_Fwd.uasset
new file mode 100644
index 0000000..846cae7
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Run_Fwd.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb5bbb66b19745b048f7d27e5d26e7a8fd028fe983cef42b1d70dc67555c9c7f
+size 510079
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_T_Pose.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_T_Pose.uasset
new file mode 100644
index 0000000..fccfe26
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_T_Pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38cd065edd371bfdd40730daf70506162f48287d1f3e9af44450b7581e173819
+size 117564
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Walk_Fwd.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Walk_Fwd.uasset
new file mode 100644
index 0000000..7f50c78
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Walk_Fwd.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f5679ce5464b0d102f13ce985625559afd99e6d8bbb1affd388af769040f684
+size 576834
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Walk_InPlace.uasset b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Walk_InPlace.uasset
new file mode 100644
index 0000000..6e13897
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Manny/MM_Walk_InPlace.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e502a49d2a27eedab44fd5d339d338eb8cfc1b370bf22aac7772d2f788892869
+size 762634
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Quinn/BS_MF_Unarmed_WalkRun.uasset b/Content/GhostPedestrians/Mannequins/Animations/Quinn/BS_MF_Unarmed_WalkRun.uasset
new file mode 100644
index 0000000..f50a318
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Quinn/BS_MF_Unarmed_WalkRun.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f80b3e7ace1b2347c0c3530fd190b97cae2fc80ba02b8a1255e6483d0023c42
+size 9213
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Idle.uasset b/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Idle.uasset
new file mode 100644
index 0000000..883e3f9
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Idle.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db043018304ea32563a1985ff847775fc248ea5aa47e795cc9f1b835a4ea6250
+size 1000281
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Run_Fwd.uasset b/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Run_Fwd.uasset
new file mode 100644
index 0000000..5b4ec86
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Run_Fwd.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:595b8e3a88d09d84a05b28bfec60db77bbf73e4da3baa53111a3feaeb4200494
+size 550639
diff --git a/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Walk_Fwd.uasset b/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Walk_Fwd.uasset
new file mode 100644
index 0000000..63ca3dd
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Animations/Quinn/MF_Walk_Fwd.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d547eab0a551f21e1a36e383c87ac45be77f987045f5eeeeff71947a30f707f
+size 567296
diff --git a/Content/GhostPedestrians/Mannequins/Meshes/M_GhostPedestrian.uasset b/Content/GhostPedestrians/Mannequins/Meshes/M_GhostPedestrian.uasset
new file mode 100644
index 0000000..ca6b433
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Meshes/M_GhostPedestrian.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:333cadc5722c0d4d34a26e45089b6cc816d309c741640110df7469fd21ac7ffe
+size 10547
diff --git a/Content/GhostPedestrians/Mannequins/Meshes/SKM_Manny_Simple.uasset b/Content/GhostPedestrians/Mannequins/Meshes/SKM_Manny_Simple.uasset
new file mode 100644
index 0000000..fc0a486
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Meshes/SKM_Manny_Simple.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:edbed674ad60a82d02524eaa8d5bd65d1ed37ea87ee0dbaacae13e6c24ec2fb8
+size 8818182
diff --git a/Content/GhostPedestrians/Mannequins/Meshes/SKM_Quinn_Simple.uasset b/Content/GhostPedestrians/Mannequins/Meshes/SKM_Quinn_Simple.uasset
new file mode 100644
index 0000000..a89ac6d
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Meshes/SKM_Quinn_Simple.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2076b955f12b717f3b3ca51be70f1d9655cdadd1cd44f228ed4b995cf1f8a2af
+size 8433152
diff --git a/Content/GhostPedestrians/Mannequins/Meshes/SK_Mannequin.uasset b/Content/GhostPedestrians/Mannequins/Meshes/SK_Mannequin.uasset
new file mode 100644
index 0000000..09609e0
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Meshes/SK_Mannequin.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35b97929dc59458268040f558fb88e8818f3b007235594ba1a91ed9ad47f532a
+size 191213
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/ABP_Manny_PostProcess.uasset b/Content/GhostPedestrians/Mannequins/Rigs/ABP_Manny_PostProcess.uasset
new file mode 100644
index 0000000..e5564c3
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/ABP_Manny_PostProcess.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3e4579791dfb0dccea7547486cb1906b2f6dc43a317f1c2ab8196bec31b73b1
+size 411679
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/ABP_Quinn_PostProcess.uasset b/Content/GhostPedestrians/Mannequins/Rigs/ABP_Quinn_PostProcess.uasset
new file mode 100644
index 0000000..8155ca1
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/ABP_Quinn_PostProcess.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8770a3eba1d14238e4855a552dc60c509342f431bbf6be35410b011a598aa501
+size 411441
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset b/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset
new file mode 100644
index 0000000..3f7a482
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_BasicFootIK.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e373beb182a46d03896da964474992f40a6bfac3c7ca62ede55b4bf66fa8d2e
+size 460284
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_Body.uasset b/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_Body.uasset
new file mode 100644
index 0000000..10a9d02
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_Body.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a618406658f3dcddaa9d8e4e8e76e2811989c5937f953eae4aa01719262a1ea6
+size 11632933
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_Procedural.uasset b/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_Procedural.uasset
new file mode 100644
index 0000000..f640424
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/CR_Mannequin_Procedural.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:866925245eb4ce62d0f8ba3bafc5a0116bfa9182cf960109d7d2655ee8640ce3
+size 1325869
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/IK_Mannequin.uasset b/Content/GhostPedestrians/Mannequins/Rigs/IK_Mannequin.uasset
new file mode 100644
index 0000000..4481407
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/IK_Mannequin.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91ac859d746d562655ed6fcb73d7278bae14dca5aa9c1f219b9c0a75d9ed6938
+size 94087
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/PA_Mannequin.uasset b/Content/GhostPedestrians/Mannequins/Rigs/PA_Mannequin.uasset
new file mode 100644
index 0000000..b050e2c
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/PA_Mannequin.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58083ff95d4115e61a3afaa500db832b7e58887196816108bdc5d27154994643
+size 290967
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset
new file mode 100644
index 0000000..7127f98
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9aa6b1b9e672ace22b271670ea6d524d6665cb10b1f5aa6472e98155df127afa
+size 237427
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_l_pose.uasset
new file mode 100644
index 0000000..5dd92b6
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a98e5d63e656893a9027d47c6e239424965d8d66a30b5f5c5f90fbbab34c9ce
+size 207512
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset
new file mode 100644
index 0000000..4ece068
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3683f48247ac8d82b4321e4fe66f85f4cb486b65a24a95cb7ab719b41f1cd57d
+size 237437
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_r_pose.uasset
new file mode 100644
index 0000000..f515a4a
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_calf_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:479c7c47e1cb3baf0ea86614a16536f7949a3f1b9a3e820373815989cb357916
+size 207512
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset
new file mode 100644
index 0000000..e279759
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51cfab557340ad04311390fed0c4d9c0e7d36956d612688b6966f7cc709c2c66
+size 236983
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_pose.uasset
new file mode 100644
index 0000000..e707d33
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4b56288e30b1b097a9c244807c02b609dec06f87df5ad6829cca9f61f1fd2cba
+size 205818
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset
new file mode 100644
index 0000000..b799418
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f352338f724a8920a7fb7c75a7a7dfc490a4fe31491d7052609565694868743d
+size 236825
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_pose.uasset
new file mode 100644
index 0000000..c3599c5
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea68270b19ecb81309fca9b4d14c2ec4a780db6fc91c7e2daf47b976fab3f666
+size 206420
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset
new file mode 100644
index 0000000..e5201a4
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:096724cdc8e819c82deb09f17610b88bc758ce976c9f329cf94ba4faf6b6ac81
+size 233083
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_l_pose.uasset
new file mode 100644
index 0000000..755b1c9
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4360068bf246fb5baf81a17310784f962fd5e5c218ab3ba6135ca9243cb058f2
+size 132258
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset
new file mode 100644
index 0000000..9748cae
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f2e32071240596f77fcd106a1af80cf50752635437c4a9a66b7d1b1d8e9cc397
+size 233181
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_r_pose.uasset
new file mode 100644
index 0000000..2af7a8a
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_foot_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8052955ec09a137138b6d5676d64e5d579bd6a9a8ddb6843d126e979547d92b
+size 132258
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset
new file mode 100644
index 0000000..b1ae168
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2b4d2eda228acafadc7ae2f8b11a9189b02905603b9ea3c1b779cc5582737a3
+size 234331
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_l_pose.uasset
new file mode 100644
index 0000000..3ba596f
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9dc23a3d64ac879e4abd7d559755cef674f8bd2fe0c284ec1c9f90f89bb6bf10
+size 169288
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset
new file mode 100644
index 0000000..c17cdfc
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e064c67037b4ad5cd687e4b6b80bbd17e6ce8d48bff2d074686b4d8d59f4ca9a
+size 234333
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_r_pose.uasset
new file mode 100644
index 0000000..c136853
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_hand_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fafbc0136897905b435427000641586a67039c805718a8ae0acd48b1bb223b8
+size 169288
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset
new file mode 100644
index 0000000..793ecd2
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:302730a55e9f0ac2c7c4c197e787ccd695eab1872c109dc331912a26da77477e
+size 281438
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_pose.uasset
new file mode 100644
index 0000000..57150b7
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0941ba1c60b1d9374323306f91dbe5b1584ff812a5d4e9bbda82addaff9b1311
+size 361730
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset
new file mode 100644
index 0000000..bdf3e9b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4767033d6961f2109177d44816f7213ef6427c0b6604c9ebdc96d0f9487b319f
+size 243001
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_pose.uasset
new file mode 100644
index 0000000..c80c8e6
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29a90b44c6fb760c330fbacbd180e7eb9cf85079bf8509ac2eee468eaf34732e
+size 361730
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset
new file mode 100644
index 0000000..71e1fa1
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df081824b62b8248f1e91ca4af361e8185bae561d10d0e77dd074481b087c1c0
+size 260005
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_pose.uasset
new file mode 100644
index 0000000..592a84c
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bcf83b72ea937e6b3e46579f1337ff1fee9f71e260ecc02a4f5d2f6447b0147
+size 558055
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset
new file mode 100644
index 0000000..301ca48
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:da292181128b0562a416daefd378d2f3fa97281aa53016ebfccbdf8dd82f5925
+size 260007
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_pose.uasset
new file mode 100644
index 0000000..4e009e1
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a080fd0af580c906e08ac9a517dc8c6f0b6d0bc3fd9199e01e27b7ec995cc36
+size 558055
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset
new file mode 100644
index 0000000..f50c49b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:76d5216068598fe8c7420b6092a77a72fa83cf6b83617eb58277e4c2c3609fe3
+size 264698
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_pose.uasset
new file mode 100644
index 0000000..dcea24d
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7552ad75e59519a77ebf123030b1f2d081d128b477bf65187262883b06640b86
+size 641719
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset
new file mode 100644
index 0000000..74b63e0
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93a80b02a713382af63f9734a42f9dd36d55242ddb40b817cd8721ed3ec695fd
+size 265212
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_pose.uasset
new file mode 100644
index 0000000..0a24010
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b753c7541ce140977796e7f89bcf20895f7907bfa9671076e54bbfc384af90d
+size 630281
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_anim.uasset
new file mode 100644
index 0000000..95a22a5
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac3db0be075ab2f52563d3e327d9bd6ac7febcd4446001e0a75229a50804bb8f
+size 281212
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_pose.uasset
new file mode 100644
index 0000000..7454789
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:12ea4e32a5a82cd5d8ab5870f131876ee7c6e8c7d564fe6826fc3fe1f77bb2dd
+size 245291
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_anim.uasset
new file mode 100644
index 0000000..70fa56b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b211a8db5ea3b5b80b61453390adf36e116f9dcf1b451002d850e833a01066d5
+size 319076
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_pose.uasset
new file mode 100644
index 0000000..b4716f7
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_calf_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e66a925b08faf36dcba9e0e214560cab1f25de70efd3d31cc5d004ad06cf925
+size 245372
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_anim.uasset
new file mode 100644
index 0000000..7464617
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9ae0d3488fdefb4b57bebd4c119cc218a9d925bef7519de786771cc981ab1cc
+size 317556
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_pose.uasset
new file mode 100644
index 0000000..2fb6dca
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:46346f09422395bb02086d4fd9647d319fd085b7ec883e16c1a715fb904c456b
+size 206043
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_anim.uasset
new file mode 100644
index 0000000..6766c26
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:954d5b4c0950d3b02472d48a3015051004d193b4c5b8e7c41645598f8aec39e0
+size 278968
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_pose.uasset
new file mode 100644
index 0000000..7f56eff
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_clavicle_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac003235f275b6a78f593e1e2bc2a5b94c39899f08600b2b8417010e96e0aa2f
+size 206126
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_anim.uasset
new file mode 100644
index 0000000..ebca489
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4e4c4e9321a79e8ebd635e75c90bc01f17ddbd1e4dda9d4e5d96c8c444b1adf
+size 275322
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_pose.uasset
new file mode 100644
index 0000000..21afcef
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:959a37642bf5c805a1bded019ba6ee3910a64d7842c460a5b10cf26814710098
+size 132265
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_anim.uasset
new file mode 100644
index 0000000..f3bb486
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35821255706bb7c30d53a9ce29d213a78eaf986b218786e822d87d96874d4862
+size 275324
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_pose.uasset
new file mode 100644
index 0000000..8f99b90
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_foot_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe7186dcc85ae59c8ff9bcf8729932d7ac647724de0df3757d49c8331a5dcf50
+size 132265
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_anim.uasset
new file mode 100644
index 0000000..92cd23f
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac13fdb335932c3777f7a086cae9cb0a37ce57ab42962101a21a436b7b0428a9
+size 276474
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_pose.uasset
new file mode 100644
index 0000000..2f456fc
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35d0c8d0d3ea1b96bfe4148bae17a3b90ed1bed3ab54af13a20bdd05109dd15c
+size 169295
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_anim.uasset
new file mode 100644
index 0000000..25128e2
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81ef8f7e755051f71022131a9fff894422f3cb3ccb143f1d7e4b2b1277d9c970
+size 257374
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_pose.uasset
new file mode 100644
index 0000000..a2cb68e
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_hand_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:911ee57c3e16ed5a979d884ad143bd513eb2d1b003e4e3b3f63f435949545dae
+size 169295
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_anim.uasset
new file mode 100644
index 0000000..95a8a9b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:84c393f2338cc5e2e4f5c5615733d52d2c6734f306121ed1fb12ea8982d6395a
+size 265146
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_pose.uasset
new file mode 100644
index 0000000..4e5f29c
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dbee9ae19556cde2fdb36eef6b71284e4b5f7804a6ee308381b20e208c09137
+size 399675
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_anim.uasset
new file mode 100644
index 0000000..d5f51bc
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abaa43379fe693bfbbf24828650745d9ce2b0ef299d2fcda4bb2d0cf386259da
+size 264828
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_pose.uasset
new file mode 100644
index 0000000..782f6cb
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_lowerarm_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:150871e92020ba9d86e9a4e0b572b95880a623fc47d532206e7f77ea3dc4dbbd
+size 399675
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_anim.uasset
new file mode 100644
index 0000000..539138f
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd125bc85a4965280e42cd141a28aa25acc521df5b2f26530c92defb2d4b23f3
+size 279910
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_pose.uasset
new file mode 100644
index 0000000..f32fd6a
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc87651b3588a38f5804486316a94c88cb2dd65c7343aa25deff426e98bca73b
+size 557761
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_anim.uasset
new file mode 100644
index 0000000..fa074dd
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a779cb0f712ef8c098253e8d417ec34c93bc9cec0c94c585d768d69123757768
+size 279912
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_pose.uasset
new file mode 100644
index 0000000..640e7c8
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_thigh_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3fe2619af2bc899660c15ee9058823f6b5d29123f82bb2d470a4c37376d29ea3
+size 557761
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_anim.uasset
new file mode 100644
index 0000000..cdce93a
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff4c755f2d5738b574fb064847d101f4dfa61ac53e64b4ab0a5523867b8becb7
+size 274683
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_pose.uasset
new file mode 100644
index 0000000..d307a7d
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_l_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d72124199512c38e38634144d97b45bcfa2d20bdab9a60dd3bf66c2ac269a77
+size 485586
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_anim.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_anim.uasset
new file mode 100644
index 0000000..38a055b
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_anim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee381475c8e33e0b6ef3e2fad330918dc59dfa41523b5c0dfa9449e900eb7226
+size 270845
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_pose.uasset b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_pose.uasset
new file mode 100644
index 0000000..079e507
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/Poses/Quinn/Quinn_upperarm_r_pose.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b65f29624102f02a9bd56d671222ecbd0a28d09b6fd8466d73db6af470c90bf
+size 488596
diff --git a/Content/GhostPedestrians/Mannequins/Rigs/RTG_Mannequin.uasset b/Content/GhostPedestrians/Mannequins/Rigs/RTG_Mannequin.uasset
new file mode 100644
index 0000000..e21185c
--- /dev/null
+++ b/Content/GhostPedestrians/Mannequins/Rigs/RTG_Mannequin.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e10552461c92e8d20d0dc55d20f8870f367290e3a1584397806d54d09a616eb6
+size 28789
diff --git a/Content/GhostVehicles/GhostPickup.uasset b/Content/GhostVehicles/GhostPickup.uasset
new file mode 100644
index 0000000..14b5790
--- /dev/null
+++ b/Content/GhostVehicles/GhostPickup.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:15042ec7e7878cdf80e7adbde502f4c5720e6dfc8106e5333cc3b9551c06a6bf
+size 36311
diff --git a/Content/GhostVehicles/GhostSUV.uasset b/Content/GhostVehicles/GhostSUV.uasset
new file mode 100644
index 0000000..d739f43
--- /dev/null
+++ b/Content/GhostVehicles/GhostSUV.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27d1290c972ce6ff75cd358ae98776594ec76866d9117efa11e738a423010c7c
+size 36929
diff --git a/Content/GhostVehicles/GhostSedan.uasset b/Content/GhostVehicles/GhostSedan.uasset
new file mode 100644
index 0000000..c8a0d5f
--- /dev/null
+++ b/Content/GhostVehicles/GhostSedan.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f618eff5868941bdfab440b8e20349243bb863823b3996ee37aa77c929206f99
+size 36063
diff --git a/Content/GhostVehicles/GhostSport.uasset b/Content/GhostVehicles/GhostSport.uasset
new file mode 100644
index 0000000..fe1a658
--- /dev/null
+++ b/Content/GhostVehicles/GhostSport.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91bc6df41d9aeb4e8e4a710a42d0350cb7cf2b09d9b7177f8e40611871ab0dd6
+size 37300
diff --git a/Content/GhostVehicles/GhostTowtruck.uasset b/Content/GhostVehicles/GhostTowtruck.uasset
new file mode 100644
index 0000000..a34e35f
--- /dev/null
+++ b/Content/GhostVehicles/GhostTowtruck.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be45376d62fae86345414e77bde853b73bca000102f432b557d56afee9a07aa9
+size 37365
diff --git a/Content/GhostVehicles/GhostVehicleAnim_BP.uasset b/Content/GhostVehicles/GhostVehicleAnim_BP.uasset
new file mode 100644
index 0000000..8736f69
--- /dev/null
+++ b/Content/GhostVehicles/GhostVehicleAnim_BP.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b038718266a9bb48e2507af2ead9babf7a760492a560f442d187d77181295e7
+size 43815
diff --git a/Content/GhostVehicles/GhostVehicle_BP.uasset b/Content/GhostVehicles/GhostVehicle_BP.uasset
new file mode 100644
index 0000000..ace41c9
--- /dev/null
+++ b/Content/GhostVehicles/GhostVehicle_BP.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:991f9878d5f6b85d4de3e1d7b629033f64f6fad66567c5633dbdaab0ff43fd4e
+size 116470
diff --git a/Content/GhostVehicles/Materials/M_GhostVehicleBody.uasset b/Content/GhostVehicles/Materials/M_GhostVehicleBody.uasset
new file mode 100644
index 0000000..2ebda49
--- /dev/null
+++ b/Content/GhostVehicles/Materials/M_GhostVehicleBody.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94141f86940c33b8cd02399e6ae245199d00c1b44419fbf4417b14c91e6b35e1
+size 9232
diff --git a/Content/GhostVehicles/Meshes/LICENSE.txt b/Content/GhostVehicles/Meshes/LICENSE.txt
new file mode 100644
index 0000000..a093369
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/LICENSE.txt
@@ -0,0 +1,4 @@
+"Generic passenger car pack" (https://skfb.ly/6sUFy) by Comrade1280 is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+
+"Generic civil service vehicles pack" (https://skfb.ly/orDHz) by Comrade1280 is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
+
diff --git a/Content/GhostVehicles/Meshes/Pickup/Body.uasset b/Content/GhostVehicles/Meshes/Pickup/Body.uasset
new file mode 100644
index 0000000..1e629c5
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Pickup/Body.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1a71d35b82f96a0cff9e57b6af4331823a888ae77483344f1906a77c44c20d30
+size 9134
diff --git a/Content/GhostVehicles/Meshes/Pickup/Glass.uasset b/Content/GhostVehicles/Meshes/Pickup/Glass.uasset
new file mode 100644
index 0000000..839db5f
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Pickup/Glass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aba5b04f5a275939172492ace15f4822fb6325782ecbd2686e4f4eca9375587
+size 9120
diff --git a/Content/GhostVehicles/Meshes/Pickup/Optics.uasset b/Content/GhostVehicles/Meshes/Pickup/Optics.uasset
new file mode 100644
index 0000000..4b6cb80
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Pickup/Optics.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5593aa2ad8ec18c9fa93c09791291f05ccb1a8b57191a51d6287d25329d61eb
+size 9098
diff --git a/Content/GhostVehicles/Meshes/Pickup/Pickup.uasset b/Content/GhostVehicles/Meshes/Pickup/Pickup.uasset
new file mode 100644
index 0000000..f19cfc5
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Pickup/Pickup.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2116bf101d49095ac510780196512739516a1a1ba87c6507935449965f58acb1
+size 1816089
diff --git a/Content/GhostVehicles/Meshes/Pickup/Pickup_PhysicsAsset.uasset b/Content/GhostVehicles/Meshes/Pickup/Pickup_PhysicsAsset.uasset
new file mode 100644
index 0000000..debdc0e
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Pickup/Pickup_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:10e16e4fffa446b16b59968018e75e57552044b6d99d716ccbb0e0bd8af1c9f7
+size 9935
diff --git a/Content/GhostVehicles/Meshes/Pickup/Pickup_Skeleton.uasset b/Content/GhostVehicles/Meshes/Pickup/Pickup_Skeleton.uasset
new file mode 100644
index 0000000..638f4df
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Pickup/Pickup_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8687c0db8e7701f622667a855fe33c7feddded55f8e611e68a5c0ece2305507b
+size 9830
diff --git a/Content/GhostVehicles/Meshes/Pickup/Wheel.uasset b/Content/GhostVehicles/Meshes/Pickup/Wheel.uasset
new file mode 100644
index 0000000..fee5d60
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Pickup/Wheel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a74cd754105e8af619c97edd8940d72820fbf7e2354015a4f76b931cac8fe3f
+size 9093
diff --git a/Content/GhostVehicles/Meshes/SUV/Body.uasset b/Content/GhostVehicles/Meshes/SUV/Body.uasset
new file mode 100644
index 0000000..ef67e72
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/SUV/Body.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:27b951a70872d891d11d61af822dc4d855c0bc1052851bc4cb527ca50f8b6697
+size 9044
diff --git a/Content/GhostVehicles/Meshes/SUV/Glass.uasset b/Content/GhostVehicles/Meshes/SUV/Glass.uasset
new file mode 100644
index 0000000..7730b16
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/SUV/Glass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9055731298fed5ca10659ca926b7b23542c4e8616339ffc85f75035890258bc8
+size 9017
diff --git a/Content/GhostVehicles/Meshes/SUV/Optics.uasset b/Content/GhostVehicles/Meshes/SUV/Optics.uasset
new file mode 100644
index 0000000..b3f15cb
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/SUV/Optics.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af2e98be3da7f50847911ea608045af1f3f24170e770fbd2643f93ee049eb3d4
+size 9088
diff --git a/Content/GhostVehicles/Meshes/SUV/SUV.uasset b/Content/GhostVehicles/Meshes/SUV/SUV.uasset
new file mode 100644
index 0000000..b422a4a
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/SUV/SUV.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:947b563469ed1801ea98ab2cfa3a7791f075f4c6a1e164afe93cb3929bfdfd91
+size 3673877
diff --git a/Content/GhostVehicles/Meshes/SUV/SUV_PhysicsAsset.uasset b/Content/GhostVehicles/Meshes/SUV/SUV_PhysicsAsset.uasset
new file mode 100644
index 0000000..37baf3e
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/SUV/SUV_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3631369df16f16610203380331f1d3b0db16b54d04df93febad7908c3831d8f
+size 10197
diff --git a/Content/GhostVehicles/Meshes/SUV/SUV_Skeleton.uasset b/Content/GhostVehicles/Meshes/SUV/SUV_Skeleton.uasset
new file mode 100644
index 0000000..5bd0253
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/SUV/SUV_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea2d90e4f4ebe7064c33fd32d0f0bec8666f3cb05e312dd24fcafe32b363001b
+size 9399
diff --git a/Content/GhostVehicles/Meshes/SUV/Wheel.uasset b/Content/GhostVehicles/Meshes/SUV/Wheel.uasset
new file mode 100644
index 0000000..d651074
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/SUV/Wheel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:186f50aef53e010c68d64e5d9ff1567e2cd079b277833f89ab8bd74330ca927d
+size 9037
diff --git a/Content/GhostVehicles/Meshes/Sedan/Body.uasset b/Content/GhostVehicles/Meshes/Sedan/Body.uasset
new file mode 100644
index 0000000..a05b462
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sedan/Body.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1880bb14f3ce6b069bc531a1a4e603e9cd96000cbf44cd37463593c83d72f40
+size 9081
diff --git a/Content/GhostVehicles/Meshes/Sedan/Glass.uasset b/Content/GhostVehicles/Meshes/Sedan/Glass.uasset
new file mode 100644
index 0000000..8b30757
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sedan/Glass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4eb86752c4a2d5b76628e4ce42b3de557d6f08213f009eeabbed9d24c7eab61d
+size 9069
diff --git a/Content/GhostVehicles/Meshes/Sedan/Optics.uasset b/Content/GhostVehicles/Meshes/Sedan/Optics.uasset
new file mode 100644
index 0000000..d5c7cab
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sedan/Optics.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:965c2760ac064c151173a4eb5d5d56f0b73e2facab820404f2e875df815ac6e4
+size 9159
diff --git a/Content/GhostVehicles/Meshes/Sedan/Sedan.uasset b/Content/GhostVehicles/Meshes/Sedan/Sedan.uasset
new file mode 100644
index 0000000..c8d15ab
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sedan/Sedan.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91ac67eb5a28ab96624323b1e3cc45bcf39a15889cafced08db4e7c9d67baa15
+size 3361138
diff --git a/Content/GhostVehicles/Meshes/Sedan/Sedan_PhysicsAsset.uasset b/Content/GhostVehicles/Meshes/Sedan/Sedan_PhysicsAsset.uasset
new file mode 100644
index 0000000..c47ca84
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sedan/Sedan_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:877b112e5db417466e3446f1c88c4f9a72193f932d259c54597faccc712ecc88
+size 9915
diff --git a/Content/GhostVehicles/Meshes/Sedan/Sedan_Skeleton.uasset b/Content/GhostVehicles/Meshes/Sedan/Sedan_Skeleton.uasset
new file mode 100644
index 0000000..83e3c27
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sedan/Sedan_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:71064809ee299f19e474fd9c1067a87040739c0a9dd7e082cc7dcf7aff14de30
+size 9085
diff --git a/Content/GhostVehicles/Meshes/Sedan/Wheel.uasset b/Content/GhostVehicles/Meshes/Sedan/Wheel.uasset
new file mode 100644
index 0000000..4006573
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sedan/Wheel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6615c257d1b884c11028d0b9131c92c4fc25047e0b11e6ce2814dc3480a82066
+size 9157
diff --git a/Content/GhostVehicles/Meshes/Sport/Body.uasset b/Content/GhostVehicles/Meshes/Sport/Body.uasset
new file mode 100644
index 0000000..f05beb2
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sport/Body.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1f544a768e011a1ad4ccce9df65faeae20aed94509e4cdbbfd9ae3ae94cc4a9
+size 9102
diff --git a/Content/GhostVehicles/Meshes/Sport/Glass.uasset b/Content/GhostVehicles/Meshes/Sport/Glass.uasset
new file mode 100644
index 0000000..bd8c31e
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sport/Glass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cfbd44c9779fa02d09be276b9ecfb194b4f8d4c2550d33b5ddd2694f05779805
+size 9168
diff --git a/Content/GhostVehicles/Meshes/Sport/Optics.uasset b/Content/GhostVehicles/Meshes/Sport/Optics.uasset
new file mode 100644
index 0000000..024154c
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sport/Optics.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cf061386a5eb52f41b175040c85649b153a4ef091d9f989fe6ba24cd8a32386
+size 9072
diff --git a/Content/GhostVehicles/Meshes/Sport/Sport.uasset b/Content/GhostVehicles/Meshes/Sport/Sport.uasset
new file mode 100644
index 0000000..b4c0806
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sport/Sport.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2678e9424249caa2eceaf91e6406d478d25d60b8b3813424ee10814ae05f963
+size 2891199
diff --git a/Content/GhostVehicles/Meshes/Sport/Sport_PhysicsAsset.uasset b/Content/GhostVehicles/Meshes/Sport/Sport_PhysicsAsset.uasset
new file mode 100644
index 0000000..0f56a47
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sport/Sport_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c9f78ac3caf91355f94bb6e84e28aef5f4cb1969d742869773e6bbe344e586fa
+size 10124
diff --git a/Content/GhostVehicles/Meshes/Sport/Sport_Skeleton.uasset b/Content/GhostVehicles/Meshes/Sport/Sport_Skeleton.uasset
new file mode 100644
index 0000000..bff9ed7
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sport/Sport_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f9db5cdfdd5ef9525c4e4d78576793703117a7f86e6eca813fcbf746b59e973d
+size 9215
diff --git a/Content/GhostVehicles/Meshes/Sport/Wheel.uasset b/Content/GhostVehicles/Meshes/Sport/Wheel.uasset
new file mode 100644
index 0000000..f16969f
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Sport/Wheel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45cced7bdc7d21b0856ab2490140df2b90f648e99dd2561c15fdceea7354ee18
+size 9152
diff --git a/Content/GhostVehicles/Meshes/Towtruck/Towtruck.uasset b/Content/GhostVehicles/Meshes/Towtruck/Towtruck.uasset
new file mode 100644
index 0000000..3799bc5
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Towtruck/Towtruck.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28cfe43e606d6dd87d7f3783bd6804bad5e944ec4bcd91841e67eb0512608968
+size 2110526
diff --git a/Content/GhostVehicles/Meshes/Towtruck/Towtruck_PhysicsAsset.uasset b/Content/GhostVehicles/Meshes/Towtruck/Towtruck_PhysicsAsset.uasset
new file mode 100644
index 0000000..37b069d
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Towtruck/Towtruck_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3541f4f411c530a6a69d4fe56071310cdda4ad7a3d7df541d2878d7dae9dffdd
+size 10277
diff --git a/Content/GhostVehicles/Meshes/Towtruck/Towtruck_Skeleton.uasset b/Content/GhostVehicles/Meshes/Towtruck/Towtruck_Skeleton.uasset
new file mode 100644
index 0000000..a4b04ca
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Towtruck/Towtruck_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:125873b9342abcbfcf7887c3a37d77113931ba324d75188b7c58aa4213468ea5
+size 9264
diff --git a/Content/GhostVehicles/Meshes/Towtruck/optics_tex.uasset b/Content/GhostVehicles/Meshes/Towtruck/optics_tex.uasset
new file mode 100644
index 0000000..910c4f0
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Towtruck/optics_tex.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cea600b908b7c071e7ebd5ec6ab3baf32bb1098f6f6c3ad1fa9608b16f9f198
+size 9092
diff --git a/Content/GhostVehicles/Meshes/Towtruck/towtruck1.uasset b/Content/GhostVehicles/Meshes/Towtruck/towtruck1.uasset
new file mode 100644
index 0000000..d74745a
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Towtruck/towtruck1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba1ec777adc4560fa93cc428816f608f7ab2747e24d9459bc01c9bb3dad1defd
+size 9134
diff --git a/Content/GhostVehicles/Meshes/Towtruck/towtruck_glass.uasset b/Content/GhostVehicles/Meshes/Towtruck/towtruck_glass.uasset
new file mode 100644
index 0000000..fd3633a
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Towtruck/towtruck_glass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c64bdc6d4092c0cbb0e841fe2907fb382c3d912f4bcf2631edb4974f14385fd
+size 9191
diff --git a/Content/GhostVehicles/Meshes/Towtruck/towtruck_glass_ncl1_1.uasset b/Content/GhostVehicles/Meshes/Towtruck/towtruck_glass_ncl1_1.uasset
new file mode 100644
index 0000000..9c28117
--- /dev/null
+++ b/Content/GhostVehicles/Meshes/Towtruck/towtruck_glass_ncl1_1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f726d2c15538091382357d82387a68f907364498325d05caeb56654c33fd83d2
+size 9157
diff --git a/Content/MainMenu.umap b/Content/MainMenu.umap
new file mode 100644
index 0000000..7a29b8d
--- /dev/null
+++ b/Content/MainMenu.umap
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3040e1ef11bc037b17e6c6fb7a8da78033fd43aeb31b4a872e5ed76a827ba530
+size 582374
diff --git a/Content/MainMenu_BuiltData.uasset b/Content/MainMenu_BuiltData.uasset
new file mode 100644
index 0000000..f1225ab
--- /dev/null
+++ b/Content/MainMenu_BuiltData.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac3d5972c76032c6b27eb6d64d860399da02cc412295e11f1ef0feb197c87d0a
+size 34009
diff --git a/Content/MetadataAsset.uasset b/Content/MetadataAsset.uasset
new file mode 100644
index 0000000..2935c83
--- /dev/null
+++ b/Content/MetadataAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09d7773a33e62a163edc96ca7432dbaad1b9290217b561dfc1e2019e69f61757
+size 6337
diff --git a/Content/SensorsPreset/BarajaDepth.uasset b/Content/SensorsPreset/BarajaDepth.uasset
new file mode 100644
index 0000000..2de1f64
--- /dev/null
+++ b/Content/SensorsPreset/BarajaDepth.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3816c56dcfe6f13127a70dd25cab0b60285b82ba3b89a1bdc2755648acfaa88
+size 14774
diff --git a/Content/SensorsPreset/BarajaRayTrace.uasset b/Content/SensorsPreset/BarajaRayTrace.uasset
new file mode 100644
index 0000000..40a263c
--- /dev/null
+++ b/Content/SensorsPreset/BarajaRayTrace.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d51b087e50a79b69c5166be58c3b8e450260d8610072b391eb2902f846576505
+size 14751
diff --git a/Content/SensorsPreset/InnovizeDepth.uasset b/Content/SensorsPreset/InnovizeDepth.uasset
new file mode 100644
index 0000000..e4decc1
--- /dev/null
+++ b/Content/SensorsPreset/InnovizeDepth.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b3d5d252521c85daf2cd1b873480002a79fe3ca09f2b8258929e55f7122852f
+size 14802
diff --git a/Content/SensorsPreset/InnovizeRayTrace.uasset b/Content/SensorsPreset/InnovizeRayTrace.uasset
new file mode 100644
index 0000000..f311f4e
--- /dev/null
+++ b/Content/SensorsPreset/InnovizeRayTrace.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:389ae542cbac26055395c35462abadfd22dc30576d70fa0ff718058b4dfd98b3
+size 14779
diff --git a/Content/SensorsPreset/RDACM41-43.uasset b/Content/SensorsPreset/RDACM41-43.uasset
new file mode 100644
index 0000000..76fe0a5
--- /dev/null
+++ b/Content/SensorsPreset/RDACM41-43.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:135ac167f8bb67d843222af06fcabfebe4941f04ed8815eb2d0aaa6fb2169c0a
+size 14979
diff --git a/Content/SensorsPreset/RDACM41-68.uasset b/Content/SensorsPreset/RDACM41-68.uasset
new file mode 100644
index 0000000..90074e3
--- /dev/null
+++ b/Content/SensorsPreset/RDACM41-68.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fad7ad1bb095028eb630f9ddbf7b108ff54980b76074e9ec7fe2211b3e4d000e
+size 14477
diff --git a/Content/SensorsPreset/RDACM41-93.uasset b/Content/SensorsPreset/RDACM41-93.uasset
new file mode 100644
index 0000000..12a761d
--- /dev/null
+++ b/Content/SensorsPreset/RDACM41-93.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd89b66d5d31cca4516f069e9c5542a1cf8137f6f68f33ac0affcb8fc02b1881
+size 15127
diff --git a/Content/SensorsPreset/Seconix190.uasset b/Content/SensorsPreset/Seconix190.uasset
new file mode 100644
index 0000000..209736e
--- /dev/null
+++ b/Content/SensorsPreset/Seconix190.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cf0c2133054763df4955361171cdd1b59c523b44672c4ca5f6be34e907eff12
+size 14365
diff --git a/Content/SensorsPreset/Sekonix60.uasset b/Content/SensorsPreset/Sekonix60.uasset
new file mode 100644
index 0000000..a08207f
--- /dev/null
+++ b/Content/SensorsPreset/Sekonix60.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:778909344e96269f34378fd10e165f859bdb96727b6c27fd1e553add13dfb7c7
+size 14464
diff --git a/Content/SensorsPreset/SimCamera190.uasset b/Content/SensorsPreset/SimCamera190.uasset
new file mode 100644
index 0000000..eccfee9
--- /dev/null
+++ b/Content/SensorsPreset/SimCamera190.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8757130c103bcd0f951bffc5be28b08e9369a20d45a3f3d081acae82f5b8c60
+size 15045
diff --git a/Content/SensorsPreset/SimCamera90.uasset b/Content/SensorsPreset/SimCamera90.uasset
new file mode 100644
index 0000000..2916ffe
--- /dev/null
+++ b/Content/SensorsPreset/SimCamera90.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a40410f4aff9aed65cd39c6ba31b9582e7ae60d8a152a42bac59903bfe5ab28c
+size 14424
diff --git a/Content/SensorsPreset/iBeo.uasset b/Content/SensorsPreset/iBeo.uasset
new file mode 100644
index 0000000..d2686ca
--- /dev/null
+++ b/Content/SensorsPreset/iBeo.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93eb986b13721e2761c921d9dffba059b29cdbb662712d68da000771503ff420
+size 14759
diff --git a/Content/Slate/Common/ArrayDropShadow.png b/Content/Slate/Common/ArrayDropShadow.png
new file mode 100644
index 0000000..add2b0f
Binary files /dev/null and b/Content/Slate/Common/ArrayDropShadow.png differ
diff --git a/Content/Slate/Common/AssetBackground.png b/Content/Slate/Common/AssetBackground.png
new file mode 100644
index 0000000..e5ce8b7
Binary files /dev/null and b/Content/Slate/Common/AssetBackground.png differ
diff --git a/Content/Slate/Common/Button.png b/Content/Slate/Common/Button.png
new file mode 100644
index 0000000..6382b46
Binary files /dev/null and b/Content/Slate/Common/Button.png differ
diff --git a/Content/Slate/Common/Button/simple_round_hovered.png b/Content/Slate/Common/Button/simple_round_hovered.png
new file mode 100644
index 0000000..dc8a8b8
Binary files /dev/null and b/Content/Slate/Common/Button/simple_round_hovered.png differ
diff --git a/Content/Slate/Common/Button/simple_round_normal.png b/Content/Slate/Common/Button/simple_round_normal.png
new file mode 100644
index 0000000..923be56
Binary files /dev/null and b/Content/Slate/Common/Button/simple_round_normal.png differ
diff --git a/Content/Slate/Common/Button/simple_sharp_hovered.png b/Content/Slate/Common/Button/simple_sharp_hovered.png
new file mode 100644
index 0000000..5c3ab3e
Binary files /dev/null and b/Content/Slate/Common/Button/simple_sharp_hovered.png differ
diff --git a/Content/Slate/Common/Button/simple_sharp_normal.png b/Content/Slate/Common/Button/simple_sharp_normal.png
new file mode 100644
index 0000000..d8e4c8a
Binary files /dev/null and b/Content/Slate/Common/Button/simple_sharp_normal.png differ
diff --git a/Content/Slate/Common/ButtonHoverHint.png b/Content/Slate/Common/ButtonHoverHint.png
new file mode 100644
index 0000000..ed731d4
Binary files /dev/null and b/Content/Slate/Common/ButtonHoverHint.png differ
diff --git a/Content/Slate/Common/Button_Disabled.png b/Content/Slate/Common/Button_Disabled.png
new file mode 100644
index 0000000..1899ca4
Binary files /dev/null and b/Content/Slate/Common/Button_Disabled.png differ
diff --git a/Content/Slate/Common/Button_Hovered.png b/Content/Slate/Common/Button_Hovered.png
new file mode 100644
index 0000000..9afd4dc
Binary files /dev/null and b/Content/Slate/Common/Button_Hovered.png differ
diff --git a/Content/Slate/Common/Button_Pressed.png b/Content/Slate/Common/Button_Pressed.png
new file mode 100644
index 0000000..870795a
Binary files /dev/null and b/Content/Slate/Common/Button_Pressed.png differ
diff --git a/Content/Slate/Common/CellBorder.png b/Content/Slate/Common/CellBorder.png
new file mode 100644
index 0000000..d438f70
Binary files /dev/null and b/Content/Slate/Common/CellBorder.png differ
diff --git a/Content/Slate/Common/Check.png b/Content/Slate/Common/Check.png
new file mode 100644
index 0000000..d83a2db
Binary files /dev/null and b/Content/Slate/Common/Check.png differ
diff --git a/Content/Slate/Common/CheckBox.png b/Content/Slate/Common/CheckBox.png
new file mode 100644
index 0000000..4c10a22
Binary files /dev/null and b/Content/Slate/Common/CheckBox.png differ
diff --git a/Content/Slate/Common/CheckBox_Checked.png b/Content/Slate/Common/CheckBox_Checked.png
new file mode 100644
index 0000000..b6f94e1
Binary files /dev/null and b/Content/Slate/Common/CheckBox_Checked.png differ
diff --git a/Content/Slate/Common/CheckBox_Checked_Hovered.png b/Content/Slate/Common/CheckBox_Checked_Hovered.png
new file mode 100644
index 0000000..1284ebc
Binary files /dev/null and b/Content/Slate/Common/CheckBox_Checked_Hovered.png differ
diff --git a/Content/Slate/Common/CheckBox_Hovered.png b/Content/Slate/Common/CheckBox_Hovered.png
new file mode 100644
index 0000000..6b7fa80
Binary files /dev/null and b/Content/Slate/Common/CheckBox_Hovered.png differ
diff --git a/Content/Slate/Common/CheckBox_Undetermined.png b/Content/Slate/Common/CheckBox_Undetermined.png
new file mode 100644
index 0000000..6dac987
Binary files /dev/null and b/Content/Slate/Common/CheckBox_Undetermined.png differ
diff --git a/Content/Slate/Common/CheckBox_Undetermined_Hovered.png b/Content/Slate/Common/CheckBox_Undetermined_Hovered.png
new file mode 100644
index 0000000..893a2ba
Binary files /dev/null and b/Content/Slate/Common/CheckBox_Undetermined_Hovered.png differ
diff --git a/Content/Slate/Common/ClassBackground_64x.png b/Content/Slate/Common/ClassBackground_64x.png
new file mode 100644
index 0000000..023193a
Binary files /dev/null and b/Content/Slate/Common/ClassBackground_64x.png differ
diff --git a/Content/Slate/Common/ColumnBorder.png b/Content/Slate/Common/ColumnBorder.png
new file mode 100644
index 0000000..d438f70
Binary files /dev/null and b/Content/Slate/Common/ColumnBorder.png differ
diff --git a/Content/Slate/Common/ColumnHeader.png b/Content/Slate/Common/ColumnHeader.png
new file mode 100644
index 0000000..272350e
Binary files /dev/null and b/Content/Slate/Common/ColumnHeader.png differ
diff --git a/Content/Slate/Common/ColumnHeaderMenuButton_Hovered.png b/Content/Slate/Common/ColumnHeaderMenuButton_Hovered.png
new file mode 100644
index 0000000..ef92dd5
Binary files /dev/null and b/Content/Slate/Common/ColumnHeaderMenuButton_Hovered.png differ
diff --git a/Content/Slate/Common/ColumnHeaderMenuButton_Normal.png b/Content/Slate/Common/ColumnHeaderMenuButton_Normal.png
new file mode 100644
index 0000000..91bc867
Binary files /dev/null and b/Content/Slate/Common/ColumnHeaderMenuButton_Normal.png differ
diff --git a/Content/Slate/Common/ColumnHeader_Arrow.png b/Content/Slate/Common/ColumnHeader_Arrow.png
new file mode 100644
index 0000000..8516295
Binary files /dev/null and b/Content/Slate/Common/ColumnHeader_Arrow.png differ
diff --git a/Content/Slate/Common/ColumnHeader_Hovered.png b/Content/Slate/Common/ColumnHeader_Hovered.png
new file mode 100644
index 0000000..eeae193
Binary files /dev/null and b/Content/Slate/Common/ColumnHeader_Hovered.png differ
diff --git a/Content/Slate/Common/ComboArrow.png b/Content/Slate/Common/ComboArrow.png
new file mode 100644
index 0000000..402eeaf
Binary files /dev/null and b/Content/Slate/Common/ComboArrow.png differ
diff --git a/Content/Slate/Common/CurrentCellBorder.png b/Content/Slate/Common/CurrentCellBorder.png
new file mode 100644
index 0000000..182f48d
Binary files /dev/null and b/Content/Slate/Common/CurrentCellBorder.png differ
diff --git a/Content/Slate/Common/Cursor.png b/Content/Slate/Common/Cursor.png
new file mode 100644
index 0000000..78c6196
Binary files /dev/null and b/Content/Slate/Common/Cursor.png differ
diff --git a/Content/Slate/Common/DarkGroupBorder.png b/Content/Slate/Common/DarkGroupBorder.png
new file mode 100644
index 0000000..3d1c124
Binary files /dev/null and b/Content/Slate/Common/DarkGroupBorder.png differ
diff --git a/Content/Slate/Common/DataOnlyBPAssetBackground_64x.png b/Content/Slate/Common/DataOnlyBPAssetBackground_64x.png
new file mode 100644
index 0000000..1ecbc03
Binary files /dev/null and b/Content/Slate/Common/DataOnlyBPAssetBackground_64x.png differ
diff --git a/Content/Slate/Common/Delimiter.png b/Content/Slate/Common/Delimiter.png
new file mode 100644
index 0000000..3d49c4a
Binary files /dev/null and b/Content/Slate/Common/Delimiter.png differ
diff --git a/Content/Slate/Common/DiagonalGradient.png b/Content/Slate/Common/DiagonalGradient.png
new file mode 100644
index 0000000..32d79e2
Binary files /dev/null and b/Content/Slate/Common/DiagonalGradient.png differ
diff --git a/Content/Slate/Common/DownArrow.png b/Content/Slate/Common/DownArrow.png
new file mode 100644
index 0000000..402eeaf
Binary files /dev/null and b/Content/Slate/Common/DownArrow.png differ
diff --git a/Content/Slate/Common/DownArrow2.png b/Content/Slate/Common/DownArrow2.png
new file mode 100644
index 0000000..726b417
Binary files /dev/null and b/Content/Slate/Common/DownArrow2.png differ
diff --git a/Content/Slate/Common/DropZoneIndicator_Above.png b/Content/Slate/Common/DropZoneIndicator_Above.png
new file mode 100644
index 0000000..43d9113
Binary files /dev/null and b/Content/Slate/Common/DropZoneIndicator_Above.png differ
diff --git a/Content/Slate/Common/DropZoneIndicator_Below.png b/Content/Slate/Common/DropZoneIndicator_Below.png
new file mode 100644
index 0000000..275225f
Binary files /dev/null and b/Content/Slate/Common/DropZoneIndicator_Below.png differ
diff --git a/Content/Slate/Common/DropZoneIndicator_Onto.png b/Content/Slate/Common/DropZoneIndicator_Onto.png
new file mode 100644
index 0000000..5121e25
Binary files /dev/null and b/Content/Slate/Common/DropZoneIndicator_Onto.png differ
diff --git a/Content/Slate/Common/EditableTextSelectionBackground.png b/Content/Slate/Common/EditableTextSelectionBackground.png
new file mode 100644
index 0000000..8533753
Binary files /dev/null and b/Content/Slate/Common/EditableTextSelectionBackground.png differ
diff --git a/Content/Slate/Common/FlatButton.png b/Content/Slate/Common/FlatButton.png
new file mode 100644
index 0000000..27e7ec8
Binary files /dev/null and b/Content/Slate/Common/FlatButton.png differ
diff --git a/Content/Slate/Common/FlatColorSquare.png b/Content/Slate/Common/FlatColorSquare.png
new file mode 100644
index 0000000..20c4387
Binary files /dev/null and b/Content/Slate/Common/FlatColorSquare.png differ
diff --git a/Content/Slate/Common/GoToSource.png b/Content/Slate/Common/GoToSource.png
new file mode 100644
index 0000000..6ec8af1
Binary files /dev/null and b/Content/Slate/Common/GoToSource.png differ
diff --git a/Content/Slate/Common/GroupBorder.png b/Content/Slate/Common/GroupBorder.png
new file mode 100644
index 0000000..62dd3fc
Binary files /dev/null and b/Content/Slate/Common/GroupBorder.png differ
diff --git a/Content/Slate/Common/GroupBorderLight.png b/Content/Slate/Common/GroupBorderLight.png
new file mode 100644
index 0000000..7e7dc9f
Binary files /dev/null and b/Content/Slate/Common/GroupBorderLight.png differ
diff --git a/Content/Slate/Common/GroupBorder_FlatTop.png b/Content/Slate/Common/GroupBorder_FlatTop.png
new file mode 100644
index 0000000..69a3990
Binary files /dev/null and b/Content/Slate/Common/GroupBorder_FlatTop.png differ
diff --git a/Content/Slate/Common/HeaderSplitterGrip.PNG b/Content/Slate/Common/HeaderSplitterGrip.PNG
new file mode 100644
index 0000000..cb5daae
Binary files /dev/null and b/Content/Slate/Common/HeaderSplitterGrip.PNG differ
diff --git a/Content/Slate/Common/HorizontalDottedLine_16x1px.png b/Content/Slate/Common/HorizontalDottedLine_16x1px.png
new file mode 100644
index 0000000..ce17c73
Binary files /dev/null and b/Content/Slate/Common/HorizontalDottedLine_16x1px.png differ
diff --git a/Content/Slate/Common/HorizontalTabButton.png b/Content/Slate/Common/HorizontalTabButton.png
new file mode 100644
index 0000000..cad5ffa
Binary files /dev/null and b/Content/Slate/Common/HorizontalTabButton.png differ
diff --git a/Content/Slate/Common/Key.png b/Content/Slate/Common/Key.png
new file mode 100644
index 0000000..bf31e4c
Binary files /dev/null and b/Content/Slate/Common/Key.png differ
diff --git a/Content/Slate/Common/KeyLeft.png b/Content/Slate/Common/KeyLeft.png
new file mode 100644
index 0000000..c9d6d08
Binary files /dev/null and b/Content/Slate/Common/KeyLeft.png differ
diff --git a/Content/Slate/Common/KeyRight.png b/Content/Slate/Common/KeyRight.png
new file mode 100644
index 0000000..1f46330
Binary files /dev/null and b/Content/Slate/Common/KeyRight.png differ
diff --git a/Content/Slate/Common/KeyboardKey.png b/Content/Slate/Common/KeyboardKey.png
new file mode 100644
index 0000000..53611a8
Binary files /dev/null and b/Content/Slate/Common/KeyboardKey.png differ
diff --git a/Content/Slate/Common/KeyboardKey_16x.png b/Content/Slate/Common/KeyboardKey_16x.png
new file mode 100644
index 0000000..8e722cb
Binary files /dev/null and b/Content/Slate/Common/KeyboardKey_16x.png differ
diff --git a/Content/Slate/Common/LastColumnHeader_Hovered.png b/Content/Slate/Common/LastColumnHeader_Hovered.png
new file mode 100644
index 0000000..3158797
Binary files /dev/null and b/Content/Slate/Common/LastColumnHeader_Hovered.png differ
diff --git a/Content/Slate/Common/LeftArrow.png b/Content/Slate/Common/LeftArrow.png
new file mode 100644
index 0000000..1de4745
Binary files /dev/null and b/Content/Slate/Common/LeftArrow.png differ
diff --git a/Content/Slate/Common/LightGroupBorder.png b/Content/Slate/Common/LightGroupBorder.png
new file mode 100644
index 0000000..2741dab
Binary files /dev/null and b/Content/Slate/Common/LightGroupBorder.png differ
diff --git a/Content/Slate/Common/MenuBarBorder.png b/Content/Slate/Common/MenuBarBorder.png
new file mode 100644
index 0000000..738b87c
Binary files /dev/null and b/Content/Slate/Common/MenuBarBorder.png differ
diff --git a/Content/Slate/Common/MenuItemRadioButton_Off.png b/Content/Slate/Common/MenuItemRadioButton_Off.png
new file mode 100644
index 0000000..4b1efc3
Binary files /dev/null and b/Content/Slate/Common/MenuItemRadioButton_Off.png differ
diff --git a/Content/Slate/Common/MenuItemRadioButton_On.png b/Content/Slate/Common/MenuItemRadioButton_On.png
new file mode 100644
index 0000000..d1f5cd0
Binary files /dev/null and b/Content/Slate/Common/MenuItemRadioButton_On.png differ
diff --git a/Content/Slate/Common/MenuItemRadioButton_On_Pressed.png b/Content/Slate/Common/MenuItemRadioButton_On_Pressed.png
new file mode 100644
index 0000000..98c94bc
Binary files /dev/null and b/Content/Slate/Common/MenuItemRadioButton_On_Pressed.png differ
diff --git a/Content/Slate/Common/MouseCursor.png b/Content/Slate/Common/MouseCursor.png
new file mode 100644
index 0000000..3f58c9a
Binary files /dev/null and b/Content/Slate/Common/MouseCursor.png differ
diff --git a/Content/Slate/Common/NoiseBackground.png b/Content/Slate/Common/NoiseBackground.png
new file mode 100644
index 0000000..113a2e0
Binary files /dev/null and b/Content/Slate/Common/NoiseBackground.png differ
diff --git a/Content/Slate/Common/PlainBorder.png b/Content/Slate/Common/PlainBorder.png
new file mode 100644
index 0000000..a99df0e
Binary files /dev/null and b/Content/Slate/Common/PlainBorder.png differ
diff --git a/Content/Slate/Common/ProgressBar_Background.png b/Content/Slate/Common/ProgressBar_Background.png
new file mode 100644
index 0000000..5776663
Binary files /dev/null and b/Content/Slate/Common/ProgressBar_Background.png differ
diff --git a/Content/Slate/Common/ProgressBar_Fill.png b/Content/Slate/Common/ProgressBar_Fill.png
new file mode 100644
index 0000000..a4cd77e
Binary files /dev/null and b/Content/Slate/Common/ProgressBar_Fill.png differ
diff --git a/Content/Slate/Common/ProgressBar_Marquee.PNG b/Content/Slate/Common/ProgressBar_Marquee.PNG
new file mode 100644
index 0000000..89462e3
Binary files /dev/null and b/Content/Slate/Common/ProgressBar_Marquee.PNG differ
diff --git a/Content/Slate/Common/ProgressBar_NeutralFill.png b/Content/Slate/Common/ProgressBar_NeutralFill.png
new file mode 100644
index 0000000..a6b8f52
Binary files /dev/null and b/Content/Slate/Common/ProgressBar_NeutralFill.png differ
diff --git a/Content/Slate/Common/ProgressBar_Thin_Background.png b/Content/Slate/Common/ProgressBar_Thin_Background.png
new file mode 100644
index 0000000..fc80964
Binary files /dev/null and b/Content/Slate/Common/ProgressBar_Thin_Background.png differ
diff --git a/Content/Slate/Common/ProgressBar_Thin_Fill.png b/Content/Slate/Common/ProgressBar_Thin_Fill.png
new file mode 100644
index 0000000..5af7201
Binary files /dev/null and b/Content/Slate/Common/ProgressBar_Thin_Fill.png differ
diff --git a/Content/Slate/Common/PushPin_Down.png b/Content/Slate/Common/PushPin_Down.png
new file mode 100644
index 0000000..cb7dc01
Binary files /dev/null and b/Content/Slate/Common/PushPin_Down.png differ
diff --git a/Content/Slate/Common/PushPin_Down_VR.png b/Content/Slate/Common/PushPin_Down_VR.png
new file mode 100644
index 0000000..11d8e4f
Binary files /dev/null and b/Content/Slate/Common/PushPin_Down_VR.png differ
diff --git a/Content/Slate/Common/PushPin_Up.png b/Content/Slate/Common/PushPin_Up.png
new file mode 100644
index 0000000..b5b24aa
Binary files /dev/null and b/Content/Slate/Common/PushPin_Up.png differ
diff --git a/Content/Slate/Common/PushPin_Up_VR.png b/Content/Slate/Common/PushPin_Up_VR.png
new file mode 100644
index 0000000..c638aa5
Binary files /dev/null and b/Content/Slate/Common/PushPin_Up_VR.png differ
diff --git a/Content/Slate/Common/RadioButton_SelectedBack_16x.png b/Content/Slate/Common/RadioButton_SelectedBack_16x.png
new file mode 100644
index 0000000..c27fc89
Binary files /dev/null and b/Content/Slate/Common/RadioButton_SelectedBack_16x.png differ
diff --git a/Content/Slate/Common/RadioButton_Selected_16x.png b/Content/Slate/Common/RadioButton_Selected_16x.png
new file mode 100644
index 0000000..8518fff
Binary files /dev/null and b/Content/Slate/Common/RadioButton_Selected_16x.png differ
diff --git a/Content/Slate/Common/RadioButton_Unselected_16x.png b/Content/Slate/Common/RadioButton_Unselected_16x.png
new file mode 100644
index 0000000..4017781
Binary files /dev/null and b/Content/Slate/Common/RadioButton_Unselected_16x.png differ
diff --git a/Content/Slate/Common/ReadOnlyCellBorder.png b/Content/Slate/Common/ReadOnlyCellBorder.png
new file mode 100644
index 0000000..d438f70
Binary files /dev/null and b/Content/Slate/Common/ReadOnlyCellBorder.png differ
diff --git a/Content/Slate/Common/ReadOnlyCurrentCellBorder.png b/Content/Slate/Common/ReadOnlyCurrentCellBorder.png
new file mode 100644
index 0000000..af16b75
Binary files /dev/null and b/Content/Slate/Common/ReadOnlyCurrentCellBorder.png differ
diff --git a/Content/Slate/Common/ReadOnlyEditModeCellBorder.png b/Content/Slate/Common/ReadOnlyEditModeCellBorder.png
new file mode 100644
index 0000000..efdd509
Binary files /dev/null and b/Content/Slate/Common/ReadOnlyEditModeCellBorder.png differ
diff --git a/Content/Slate/Common/ReadOnlySelectedCellBorder.png b/Content/Slate/Common/ReadOnlySelectedCellBorder.png
new file mode 100644
index 0000000..f9df7b3
Binary files /dev/null and b/Content/Slate/Common/ReadOnlySelectedCellBorder.png differ
diff --git a/Content/Slate/Common/RoundedSelection_16x.PNG b/Content/Slate/Common/RoundedSelection_16x.PNG
new file mode 100644
index 0000000..0589dc9
Binary files /dev/null and b/Content/Slate/Common/RoundedSelection_16x.PNG differ
diff --git a/Content/Slate/Common/ScreenAttach_VR.png b/Content/Slate/Common/ScreenAttach_VR.png
new file mode 100644
index 0000000..3b73d6e
Binary files /dev/null and b/Content/Slate/Common/ScreenAttach_VR.png differ
diff --git a/Content/Slate/Common/ScreenDetach_VR.png b/Content/Slate/Common/ScreenDetach_VR.png
new file mode 100644
index 0000000..6c811f3
Binary files /dev/null and b/Content/Slate/Common/ScreenDetach_VR.png differ
diff --git a/Content/Slate/Common/ScrollBorderShadowBottom.png b/Content/Slate/Common/ScrollBorderShadowBottom.png
new file mode 100644
index 0000000..2c9a04d
Binary files /dev/null and b/Content/Slate/Common/ScrollBorderShadowBottom.png differ
diff --git a/Content/Slate/Common/ScrollBorderShadowTop.png b/Content/Slate/Common/ScrollBorderShadowTop.png
new file mode 100644
index 0000000..e204a53
Binary files /dev/null and b/Content/Slate/Common/ScrollBorderShadowTop.png differ
diff --git a/Content/Slate/Common/ScrollBoxShadowBottom.png b/Content/Slate/Common/ScrollBoxShadowBottom.png
new file mode 100644
index 0000000..2c9a04d
Binary files /dev/null and b/Content/Slate/Common/ScrollBoxShadowBottom.png differ
diff --git a/Content/Slate/Common/ScrollBoxShadowTop.png b/Content/Slate/Common/ScrollBoxShadowTop.png
new file mode 100644
index 0000000..e204a53
Binary files /dev/null and b/Content/Slate/Common/ScrollBoxShadowTop.png differ
diff --git a/Content/Slate/Common/Scrollbar_Background_Horizontal.png b/Content/Slate/Common/Scrollbar_Background_Horizontal.png
new file mode 100644
index 0000000..97fedcd
Binary files /dev/null and b/Content/Slate/Common/Scrollbar_Background_Horizontal.png differ
diff --git a/Content/Slate/Common/Scrollbar_Background_Vertical.png b/Content/Slate/Common/Scrollbar_Background_Vertical.png
new file mode 100644
index 0000000..d16f729
Binary files /dev/null and b/Content/Slate/Common/Scrollbar_Background_Vertical.png differ
diff --git a/Content/Slate/Common/Scrollbar_Thumb.png b/Content/Slate/Common/Scrollbar_Thumb.png
new file mode 100644
index 0000000..3884e2f
Binary files /dev/null and b/Content/Slate/Common/Scrollbar_Thumb.png differ
diff --git a/Content/Slate/Common/SearchActiveBorder.png b/Content/Slate/Common/SearchActiveBorder.png
new file mode 100644
index 0000000..cc22a3d
Binary files /dev/null and b/Content/Slate/Common/SearchActiveBorder.png differ
diff --git a/Content/Slate/Common/SearchGlass.PNG b/Content/Slate/Common/SearchGlass.PNG
new file mode 100644
index 0000000..a7baf25
Binary files /dev/null and b/Content/Slate/Common/SearchGlass.PNG differ
diff --git a/Content/Slate/Common/SearchPseudoTab.png b/Content/Slate/Common/SearchPseudoTab.png
new file mode 100644
index 0000000..e34475b
Binary files /dev/null and b/Content/Slate/Common/SearchPseudoTab.png differ
diff --git a/Content/Slate/Common/Selection.png b/Content/Slate/Common/Selection.png
new file mode 100644
index 0000000..dcd1865
Binary files /dev/null and b/Content/Slate/Common/Selection.png differ
diff --git a/Content/Slate/Common/Selector.png b/Content/Slate/Common/Selector.png
new file mode 100644
index 0000000..221e92d
Binary files /dev/null and b/Content/Slate/Common/Selector.png differ
diff --git a/Content/Slate/Common/Separator.png b/Content/Slate/Common/Separator.png
new file mode 100644
index 0000000..c0093c9
Binary files /dev/null and b/Content/Slate/Common/Separator.png differ
diff --git a/Content/Slate/Common/ShadowComboArrow.png b/Content/Slate/Common/ShadowComboArrow.png
new file mode 100644
index 0000000..9eb50ea
Binary files /dev/null and b/Content/Slate/Common/ShadowComboArrow.png differ
diff --git a/Content/Slate/Common/SmallArrowRight.png b/Content/Slate/Common/SmallArrowRight.png
new file mode 100644
index 0000000..f56a8fd
Binary files /dev/null and b/Content/Slate/Common/SmallArrowRight.png differ
diff --git a/Content/Slate/Common/SmallCheck.png b/Content/Slate/Common/SmallCheck.png
new file mode 100644
index 0000000..5ac0457
Binary files /dev/null and b/Content/Slate/Common/SmallCheck.png differ
diff --git a/Content/Slate/Common/SmallCheckBox.png b/Content/Slate/Common/SmallCheckBox.png
new file mode 100644
index 0000000..91b3952
Binary files /dev/null and b/Content/Slate/Common/SmallCheckBox.png differ
diff --git a/Content/Slate/Common/SmallCheckBox_Checked.png b/Content/Slate/Common/SmallCheckBox_Checked.png
new file mode 100644
index 0000000..3fce484
Binary files /dev/null and b/Content/Slate/Common/SmallCheckBox_Checked.png differ
diff --git a/Content/Slate/Common/SmallCheckBox_Checked_Hovered.png b/Content/Slate/Common/SmallCheckBox_Checked_Hovered.png
new file mode 100644
index 0000000..5cea5fe
Binary files /dev/null and b/Content/Slate/Common/SmallCheckBox_Checked_Hovered.png differ
diff --git a/Content/Slate/Common/SmallCheckBox_Hovered.png b/Content/Slate/Common/SmallCheckBox_Hovered.png
new file mode 100644
index 0000000..0440c6f
Binary files /dev/null and b/Content/Slate/Common/SmallCheckBox_Hovered.png differ
diff --git a/Content/Slate/Common/SmallCheckBox_Undetermined.png b/Content/Slate/Common/SmallCheckBox_Undetermined.png
new file mode 100644
index 0000000..32dfe3d
Binary files /dev/null and b/Content/Slate/Common/SmallCheckBox_Undetermined.png differ
diff --git a/Content/Slate/Common/SmallCheckBox_Undetermined_Hovered.png b/Content/Slate/Common/SmallCheckBox_Undetermined_Hovered.png
new file mode 100644
index 0000000..8bfeba2
Binary files /dev/null and b/Content/Slate/Common/SmallCheckBox_Undetermined_Hovered.png differ
diff --git a/Content/Slate/Common/SmallRoundedButton.png b/Content/Slate/Common/SmallRoundedButton.png
new file mode 100644
index 0000000..b188fa9
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedButton.png differ
diff --git a/Content/Slate/Common/SmallRoundedButtonBottom.png b/Content/Slate/Common/SmallRoundedButtonBottom.png
new file mode 100644
index 0000000..2817099
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedButtonBottom.png differ
diff --git a/Content/Slate/Common/SmallRoundedButtonCentre.png b/Content/Slate/Common/SmallRoundedButtonCentre.png
new file mode 100644
index 0000000..c6258e9
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedButtonCentre.png differ
diff --git a/Content/Slate/Common/SmallRoundedButtonLeft.png b/Content/Slate/Common/SmallRoundedButtonLeft.png
new file mode 100644
index 0000000..accce18
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedButtonLeft.png differ
diff --git a/Content/Slate/Common/SmallRoundedButtonRight.png b/Content/Slate/Common/SmallRoundedButtonRight.png
new file mode 100644
index 0000000..638eea6
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedButtonRight.png differ
diff --git a/Content/Slate/Common/SmallRoundedButtonTop.png b/Content/Slate/Common/SmallRoundedButtonTop.png
new file mode 100644
index 0000000..7eb4433
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedButtonTop.png differ
diff --git a/Content/Slate/Common/SmallRoundedToggle.png b/Content/Slate/Common/SmallRoundedToggle.png
new file mode 100644
index 0000000..a8e5411
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedToggle.png differ
diff --git a/Content/Slate/Common/SmallRoundedToggleCenter.png b/Content/Slate/Common/SmallRoundedToggleCenter.png
new file mode 100644
index 0000000..38c9d35
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedToggleCenter.png differ
diff --git a/Content/Slate/Common/SmallRoundedToggleLeft.png b/Content/Slate/Common/SmallRoundedToggleLeft.png
new file mode 100644
index 0000000..cb26316
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedToggleLeft.png differ
diff --git a/Content/Slate/Common/SmallRoundedToggleRight.png b/Content/Slate/Common/SmallRoundedToggleRight.png
new file mode 100644
index 0000000..aecb54c
Binary files /dev/null and b/Content/Slate/Common/SmallRoundedToggleRight.png differ
diff --git a/Content/Slate/Common/SortDownArrow.png b/Content/Slate/Common/SortDownArrow.png
new file mode 100644
index 0000000..9910f60
Binary files /dev/null and b/Content/Slate/Common/SortDownArrow.png differ
diff --git a/Content/Slate/Common/SortDownArrows.png b/Content/Slate/Common/SortDownArrows.png
new file mode 100644
index 0000000..6a43276
Binary files /dev/null and b/Content/Slate/Common/SortDownArrows.png differ
diff --git a/Content/Slate/Common/SortUpArrow.png b/Content/Slate/Common/SortUpArrow.png
new file mode 100644
index 0000000..46b72e1
Binary files /dev/null and b/Content/Slate/Common/SortUpArrow.png differ
diff --git a/Content/Slate/Common/SortUpArrows.png b/Content/Slate/Common/SortUpArrows.png
new file mode 100644
index 0000000..e28734b
Binary files /dev/null and b/Content/Slate/Common/SortUpArrows.png differ
diff --git a/Content/Slate/Common/SpinArrows.png b/Content/Slate/Common/SpinArrows.png
new file mode 100644
index 0000000..4aa5968
Binary files /dev/null and b/Content/Slate/Common/SpinArrows.png differ
diff --git a/Content/Slate/Common/Spinbox.PNG b/Content/Slate/Common/Spinbox.PNG
new file mode 100644
index 0000000..285a168
Binary files /dev/null and b/Content/Slate/Common/Spinbox.PNG differ
diff --git a/Content/Slate/Common/Spinbox_Fill.png b/Content/Slate/Common/Spinbox_Fill.png
new file mode 100644
index 0000000..10b756f
Binary files /dev/null and b/Content/Slate/Common/Spinbox_Fill.png differ
diff --git a/Content/Slate/Common/Spinbox_Fill_Hovered.png b/Content/Slate/Common/Spinbox_Fill_Hovered.png
new file mode 100644
index 0000000..54123da
Binary files /dev/null and b/Content/Slate/Common/Spinbox_Fill_Hovered.png differ
diff --git a/Content/Slate/Common/Spinbox_Hovered.png b/Content/Slate/Common/Spinbox_Hovered.png
new file mode 100644
index 0000000..c467eb4
Binary files /dev/null and b/Content/Slate/Common/Spinbox_Hovered.png differ
diff --git a/Content/Slate/Common/SplitterHandleHighlight.png b/Content/Slate/Common/SplitterHandleHighlight.png
new file mode 100644
index 0000000..c8ba7b5
Binary files /dev/null and b/Content/Slate/Common/SplitterHandleHighlight.png differ
diff --git a/Content/Slate/Common/SubmenuArrow.png b/Content/Slate/Common/SubmenuArrow.png
new file mode 100644
index 0000000..53e3a9a
Binary files /dev/null and b/Content/Slate/Common/SubmenuArrow.png differ
diff --git a/Content/Slate/Common/TableViewHeader.png b/Content/Slate/Common/TableViewHeader.png
new file mode 100644
index 0000000..a7ee671
Binary files /dev/null and b/Content/Slate/Common/TableViewHeader.png differ
diff --git a/Content/Slate/Common/TableViewMajorColumn.png b/Content/Slate/Common/TableViewMajorColumn.png
new file mode 100644
index 0000000..a709354
Binary files /dev/null and b/Content/Slate/Common/TableViewMajorColumn.png differ
diff --git a/Content/Slate/Common/Tangent.png b/Content/Slate/Common/Tangent.png
new file mode 100644
index 0000000..59244c8
Binary files /dev/null and b/Content/Slate/Common/Tangent.png differ
diff --git a/Content/Slate/Common/TaskGraph_Mono.png b/Content/Slate/Common/TaskGraph_Mono.png
new file mode 100644
index 0000000..e4a009b
Binary files /dev/null and b/Content/Slate/Common/TaskGraph_Mono.png differ
diff --git a/Content/Slate/Common/TaskGraph_Normal.png b/Content/Slate/Common/TaskGraph_Normal.png
new file mode 100644
index 0000000..ccf88ab
Binary files /dev/null and b/Content/Slate/Common/TaskGraph_Normal.png differ
diff --git a/Content/Slate/Common/TaskGraph_Selected.png b/Content/Slate/Common/TaskGraph_Selected.png
new file mode 100644
index 0000000..08bc811
Binary files /dev/null and b/Content/Slate/Common/TaskGraph_Selected.png differ
diff --git a/Content/Slate/Common/TextBlockHighlightShape.png b/Content/Slate/Common/TextBlockHighlightShape.png
new file mode 100644
index 0000000..01f956a
Binary files /dev/null and b/Content/Slate/Common/TextBlockHighlightShape.png differ
diff --git a/Content/Slate/Common/TextBlockHighlightShape_Empty.png b/Content/Slate/Common/TextBlockHighlightShape_Empty.png
new file mode 100644
index 0000000..6b99ce9
Binary files /dev/null and b/Content/Slate/Common/TextBlockHighlightShape_Empty.png differ
diff --git a/Content/Slate/Common/TextBox.png b/Content/Slate/Common/TextBox.png
new file mode 100644
index 0000000..02bc70e
Binary files /dev/null and b/Content/Slate/Common/TextBox.png differ
diff --git a/Content/Slate/Common/TextBoxLabelBorder.PNG b/Content/Slate/Common/TextBoxLabelBorder.PNG
new file mode 100644
index 0000000..53300ee
Binary files /dev/null and b/Content/Slate/Common/TextBoxLabelBorder.PNG differ
diff --git a/Content/Slate/Common/TextBox_Hovered.png b/Content/Slate/Common/TextBox_Hovered.png
new file mode 100644
index 0000000..e26ec40
Binary files /dev/null and b/Content/Slate/Common/TextBox_Hovered.png differ
diff --git a/Content/Slate/Common/TextBox_ReadOnly.png b/Content/Slate/Common/TextBox_ReadOnly.png
new file mode 100644
index 0000000..8a9139e
Binary files /dev/null and b/Content/Slate/Common/TextBox_ReadOnly.png differ
diff --git a/Content/Slate/Common/TextBox_Special.png b/Content/Slate/Common/TextBox_Special.png
new file mode 100644
index 0000000..75cf5f2
Binary files /dev/null and b/Content/Slate/Common/TextBox_Special.png differ
diff --git a/Content/Slate/Common/TextBox_Special_Active.png b/Content/Slate/Common/TextBox_Special_Active.png
new file mode 100644
index 0000000..b6913fa
Binary files /dev/null and b/Content/Slate/Common/TextBox_Special_Active.png differ
diff --git a/Content/Slate/Common/TextBox_Special_Hovered.png b/Content/Slate/Common/TextBox_Special_Hovered.png
new file mode 100644
index 0000000..5641dff
Binary files /dev/null and b/Content/Slate/Common/TextBox_Special_Hovered.png differ
diff --git a/Content/Slate/Common/ThinDash_Horizontal.png b/Content/Slate/Common/ThinDash_Horizontal.png
new file mode 100644
index 0000000..407707d
Binary files /dev/null and b/Content/Slate/Common/ThinDash_Horizontal.png differ
diff --git a/Content/Slate/Common/ThinDash_Vertical.png b/Content/Slate/Common/ThinDash_Vertical.png
new file mode 100644
index 0000000..cf3906b
Binary files /dev/null and b/Content/Slate/Common/ThinDash_Vertical.png differ
diff --git a/Content/Slate/Common/ThinLine_Horizontal.png b/Content/Slate/Common/ThinLine_Horizontal.png
new file mode 100644
index 0000000..23ef1e9
Binary files /dev/null and b/Content/Slate/Common/ThinLine_Horizontal.png differ
diff --git a/Content/Slate/Common/ThrobberPiece_Small.png b/Content/Slate/Common/ThrobberPiece_Small.png
new file mode 100644
index 0000000..4c7ba67
Binary files /dev/null and b/Content/Slate/Common/ThrobberPiece_Small.png differ
diff --git a/Content/Slate/Common/TinyChalkArrow.png b/Content/Slate/Common/TinyChalkArrow.png
new file mode 100644
index 0000000..1923b6e
Binary files /dev/null and b/Content/Slate/Common/TinyChalkArrow.png differ
diff --git a/Content/Slate/Common/TreeArrow_Collapsed.png b/Content/Slate/Common/TreeArrow_Collapsed.png
new file mode 100644
index 0000000..934367d
Binary files /dev/null and b/Content/Slate/Common/TreeArrow_Collapsed.png differ
diff --git a/Content/Slate/Common/TreeArrow_Collapsed_Hovered.png b/Content/Slate/Common/TreeArrow_Collapsed_Hovered.png
new file mode 100644
index 0000000..f534e09
Binary files /dev/null and b/Content/Slate/Common/TreeArrow_Collapsed_Hovered.png differ
diff --git a/Content/Slate/Common/TreeArrow_Expanded.png b/Content/Slate/Common/TreeArrow_Expanded.png
new file mode 100644
index 0000000..21d0054
Binary files /dev/null and b/Content/Slate/Common/TreeArrow_Expanded.png differ
diff --git a/Content/Slate/Common/TreeArrow_Expanded_Hovered.png b/Content/Slate/Common/TreeArrow_Expanded_Hovered.png
new file mode 100644
index 0000000..8d74df3
Binary files /dev/null and b/Content/Slate/Common/TreeArrow_Expanded_Hovered.png differ
diff --git a/Content/Slate/Common/UniformShadow.png b/Content/Slate/Common/UniformShadow.png
new file mode 100644
index 0000000..68d5ef4
Binary files /dev/null and b/Content/Slate/Common/UniformShadow.png differ
diff --git a/Content/Slate/Common/UniformShadow_Tint.png b/Content/Slate/Common/UniformShadow_Tint.png
new file mode 100644
index 0000000..03f7306
Binary files /dev/null and b/Content/Slate/Common/UniformShadow_Tint.png differ
diff --git a/Content/Slate/Common/UnsavedChange.png b/Content/Slate/Common/UnsavedChange.png
new file mode 100644
index 0000000..0e9ddfc
Binary files /dev/null and b/Content/Slate/Common/UnsavedChange.png differ
diff --git a/Content/Slate/Common/UpArrow.png b/Content/Slate/Common/UpArrow.png
new file mode 100644
index 0000000..bc08b13
Binary files /dev/null and b/Content/Slate/Common/UpArrow.png differ
diff --git a/Content/Slate/Common/UpArrow2.png b/Content/Slate/Common/UpArrow2.png
new file mode 100644
index 0000000..6964568
Binary files /dev/null and b/Content/Slate/Common/UpArrow2.png differ
diff --git a/Content/Slate/Common/VerticalBoxDropZoneIndicator_Above.png b/Content/Slate/Common/VerticalBoxDropZoneIndicator_Above.png
new file mode 100644
index 0000000..5f6e1e0
Binary files /dev/null and b/Content/Slate/Common/VerticalBoxDropZoneIndicator_Above.png differ
diff --git a/Content/Slate/Common/VerticalBoxDropZoneIndicator_Below.png b/Content/Slate/Common/VerticalBoxDropZoneIndicator_Below.png
new file mode 100644
index 0000000..9f24c8d
Binary files /dev/null and b/Content/Slate/Common/VerticalBoxDropZoneIndicator_Below.png differ
diff --git a/Content/Slate/Common/VerticalDottedLine_1x16px.png b/Content/Slate/Common/VerticalDottedLine_1x16px.png
new file mode 100644
index 0000000..451b0ee
Binary files /dev/null and b/Content/Slate/Common/VerticalDottedLine_1x16px.png differ
diff --git a/Content/Slate/Common/VerticalPipe.PNG b/Content/Slate/Common/VerticalPipe.PNG
new file mode 100644
index 0000000..c03fc7d
Binary files /dev/null and b/Content/Slate/Common/VerticalPipe.PNG differ
diff --git a/Content/Slate/Common/VolumeControl_High.png b/Content/Slate/Common/VolumeControl_High.png
new file mode 100644
index 0000000..77866a2
Binary files /dev/null and b/Content/Slate/Common/VolumeControl_High.png differ
diff --git a/Content/Slate/Common/VolumeControl_Low.png b/Content/Slate/Common/VolumeControl_Low.png
new file mode 100644
index 0000000..f0241ca
Binary files /dev/null and b/Content/Slate/Common/VolumeControl_Low.png differ
diff --git a/Content/Slate/Common/VolumeControl_Mid.png b/Content/Slate/Common/VolumeControl_Mid.png
new file mode 100644
index 0000000..2e3c85e
Binary files /dev/null and b/Content/Slate/Common/VolumeControl_Mid.png differ
diff --git a/Content/Slate/Common/VolumeControl_Muted.png b/Content/Slate/Common/VolumeControl_Muted.png
new file mode 100644
index 0000000..a280f62
Binary files /dev/null and b/Content/Slate/Common/VolumeControl_Muted.png differ
diff --git a/Content/Slate/Common/VolumeControl_Off.png b/Content/Slate/Common/VolumeControl_Off.png
new file mode 100644
index 0000000..123c654
Binary files /dev/null and b/Content/Slate/Common/VolumeControl_Off.png differ
diff --git a/Content/Slate/Common/WarningStripe.png b/Content/Slate/Common/WarningStripe.png
new file mode 100644
index 0000000..8d4b313
Binary files /dev/null and b/Content/Slate/Common/WarningStripe.png differ
diff --git a/Content/Slate/Common/WhiteGroupBorder.png b/Content/Slate/Common/WhiteGroupBorder.png
new file mode 100644
index 0000000..4a2f489
Binary files /dev/null and b/Content/Slate/Common/WhiteGroupBorder.png differ
diff --git a/Content/Slate/Common/WideDash_Horizontal.png b/Content/Slate/Common/WideDash_Horizontal.png
new file mode 100644
index 0000000..8bc1c17
Binary files /dev/null and b/Content/Slate/Common/WideDash_Horizontal.png differ
diff --git a/Content/Slate/Common/WideDash_Vertical.png b/Content/Slate/Common/WideDash_Vertical.png
new file mode 100644
index 0000000..95bc946
Binary files /dev/null and b/Content/Slate/Common/WideDash_Vertical.png differ
diff --git a/Content/Slate/Common/WorkingBar_Marquee.PNG b/Content/Slate/Common/WorkingBar_Marquee.PNG
new file mode 100644
index 0000000..3363632
Binary files /dev/null and b/Content/Slate/Common/WorkingBar_Marquee.PNG differ
diff --git a/Content/Slate/Common/WorkingFrame_Marquee.PNG b/Content/Slate/Common/WorkingFrame_Marquee.PNG
new file mode 100644
index 0000000..261119e
Binary files /dev/null and b/Content/Slate/Common/WorkingFrame_Marquee.PNG differ
diff --git a/Content/Slate/Common/WorkingFrame_Marquee_Vert.PNG b/Content/Slate/Common/WorkingFrame_Marquee_Vert.PNG
new file mode 100644
index 0000000..6a72925
Binary files /dev/null and b/Content/Slate/Common/WorkingFrame_Marquee_Vert.PNG differ
diff --git a/Content/Slate/Common/X.PNG b/Content/Slate/Common/X.PNG
new file mode 100644
index 0000000..0b3a12c
Binary files /dev/null and b/Content/Slate/Common/X.PNG differ
diff --git a/Content/Slate/Common/icon_Help_Default_16x.png b/Content/Slate/Common/icon_Help_Default_16x.png
new file mode 100644
index 0000000..afc781d
Binary files /dev/null and b/Content/Slate/Common/icon_Help_Default_16x.png differ
diff --git a/Content/Slate/Common/icon_Help_Hover_16x.png b/Content/Slate/Common/icon_Help_Hover_16x.png
new file mode 100644
index 0000000..95480f3
Binary files /dev/null and b/Content/Slate/Common/icon_Help_Hover_16x.png differ
diff --git a/Content/Slate/Common/icon_Help_Pressed_16x.png b/Content/Slate/Common/icon_Help_Pressed_16x.png
new file mode 100644
index 0000000..03dd3df
Binary files /dev/null and b/Content/Slate/Common/icon_Help_Pressed_16x.png differ
diff --git a/Content/Slate/Common/link.png b/Content/Slate/Common/link.png
new file mode 100644
index 0000000..4f3851a
Binary files /dev/null and b/Content/Slate/Common/link.png differ
diff --git a/Content/Slate/Common/tutorial_home_20x.png b/Content/Slate/Common/tutorial_home_20x.png
new file mode 100644
index 0000000..3b163de
Binary files /dev/null and b/Content/Slate/Common/tutorial_home_20x.png differ
diff --git a/Content/Slate/Common/tutorial_next_20x.png b/Content/Slate/Common/tutorial_next_20x.png
new file mode 100644
index 0000000..26ee3a2
Binary files /dev/null and b/Content/Slate/Common/tutorial_next_20x.png differ
diff --git a/Content/Slate/Common/tutorial_previous_20x.png b/Content/Slate/Common/tutorial_previous_20x.png
new file mode 100644
index 0000000..c0d0291
Binary files /dev/null and b/Content/Slate/Common/tutorial_previous_20x.png differ
diff --git a/Content/Slate/Common/tutorial_refresh_20x.png b/Content/Slate/Common/tutorial_refresh_20x.png
new file mode 100644
index 0000000..5d35773
Binary files /dev/null and b/Content/Slate/Common/tutorial_refresh_20x.png differ
diff --git a/Content/Slate/Docking/AppTabContentArea.png b/Content/Slate/Docking/AppTabContentArea.png
new file mode 100644
index 0000000..2defb0b
Binary files /dev/null and b/Content/Slate/Docking/AppTabContentArea.png differ
diff --git a/Content/Slate/Docking/AppTabWellSeparator.png b/Content/Slate/Docking/AppTabWellSeparator.png
new file mode 100644
index 0000000..8f7a7e6
Binary files /dev/null and b/Content/Slate/Docking/AppTabWellSeparator.png differ
diff --git a/Content/Slate/Docking/AppTab_Active.png b/Content/Slate/Docking/AppTab_Active.png
new file mode 100644
index 0000000..85ee87f
Binary files /dev/null and b/Content/Slate/Docking/AppTab_Active.png differ
diff --git a/Content/Slate/Docking/AppTab_ColorOverlay.png b/Content/Slate/Docking/AppTab_ColorOverlay.png
new file mode 100644
index 0000000..dad7aaa
Binary files /dev/null and b/Content/Slate/Docking/AppTab_ColorOverlay.png differ
diff --git a/Content/Slate/Docking/AppTab_ColorOverlayIcon.png b/Content/Slate/Docking/AppTab_ColorOverlayIcon.png
new file mode 100644
index 0000000..c250b9f
Binary files /dev/null and b/Content/Slate/Docking/AppTab_ColorOverlayIcon.png differ
diff --git a/Content/Slate/Docking/AppTab_Foreground.png b/Content/Slate/Docking/AppTab_Foreground.png
new file mode 100644
index 0000000..85ee87f
Binary files /dev/null and b/Content/Slate/Docking/AppTab_Foreground.png differ
diff --git a/Content/Slate/Docking/AppTab_Hovered.png b/Content/Slate/Docking/AppTab_Hovered.png
new file mode 100644
index 0000000..42c3f8d
Binary files /dev/null and b/Content/Slate/Docking/AppTab_Hovered.png differ
diff --git a/Content/Slate/Docking/AppTab_Inactive.png b/Content/Slate/Docking/AppTab_Inactive.png
new file mode 100644
index 0000000..1953c4d
Binary files /dev/null and b/Content/Slate/Docking/AppTab_Inactive.png differ
diff --git a/Content/Slate/Docking/CloseApp_Hovered.png b/Content/Slate/Docking/CloseApp_Hovered.png
new file mode 100644
index 0000000..4cebf76
Binary files /dev/null and b/Content/Slate/Docking/CloseApp_Hovered.png differ
diff --git a/Content/Slate/Docking/CloseApp_Normal.png b/Content/Slate/Docking/CloseApp_Normal.png
new file mode 100644
index 0000000..a2682f9
Binary files /dev/null and b/Content/Slate/Docking/CloseApp_Normal.png differ
diff --git a/Content/Slate/Docking/CloseApp_Pressed.png b/Content/Slate/Docking/CloseApp_Pressed.png
new file mode 100644
index 0000000..3a4114c
Binary files /dev/null and b/Content/Slate/Docking/CloseApp_Pressed.png differ
diff --git a/Content/Slate/Docking/DockingIndicator_Center.png b/Content/Slate/Docking/DockingIndicator_Center.png
new file mode 100644
index 0000000..a4385ea
Binary files /dev/null and b/Content/Slate/Docking/DockingIndicator_Center.png differ
diff --git a/Content/Slate/Docking/OuterDockingIndicator.png b/Content/Slate/Docking/OuterDockingIndicator.png
new file mode 100644
index 0000000..752f201
Binary files /dev/null and b/Content/Slate/Docking/OuterDockingIndicator.png differ
diff --git a/Content/Slate/Docking/ShowTabwellButton_Hovered.png b/Content/Slate/Docking/ShowTabwellButton_Hovered.png
new file mode 100644
index 0000000..b99b907
Binary files /dev/null and b/Content/Slate/Docking/ShowTabwellButton_Hovered.png differ
diff --git a/Content/Slate/Docking/ShowTabwellButton_Normal.png b/Content/Slate/Docking/ShowTabwellButton_Normal.png
new file mode 100644
index 0000000..44086de
Binary files /dev/null and b/Content/Slate/Docking/ShowTabwellButton_Normal.png differ
diff --git a/Content/Slate/Docking/ShowTabwellButton_Pressed.png b/Content/Slate/Docking/ShowTabwellButton_Pressed.png
new file mode 100644
index 0000000..9e3caac
Binary files /dev/null and b/Content/Slate/Docking/ShowTabwellButton_Pressed.png differ
diff --git a/Content/Slate/Docking/TabContentArea.png b/Content/Slate/Docking/TabContentArea.png
new file mode 100644
index 0000000..9a17ead
Binary files /dev/null and b/Content/Slate/Docking/TabContentArea.png differ
diff --git a/Content/Slate/Docking/TabContextButton.png b/Content/Slate/Docking/TabContextButton.png
new file mode 100644
index 0000000..85d97dc
Binary files /dev/null and b/Content/Slate/Docking/TabContextButton.png differ
diff --git a/Content/Slate/Docking/TabWellSeparator.png b/Content/Slate/Docking/TabWellSeparator.png
new file mode 100644
index 0000000..5a55e50
Binary files /dev/null and b/Content/Slate/Docking/TabWellSeparator.png differ
diff --git a/Content/Slate/Docking/Tab_Active.png b/Content/Slate/Docking/Tab_Active.png
new file mode 100644
index 0000000..c890439
Binary files /dev/null and b/Content/Slate/Docking/Tab_Active.png differ
diff --git a/Content/Slate/Docking/Tab_ColorOverlay.png b/Content/Slate/Docking/Tab_ColorOverlay.png
new file mode 100644
index 0000000..58c0677
Binary files /dev/null and b/Content/Slate/Docking/Tab_ColorOverlay.png differ
diff --git a/Content/Slate/Docking/Tab_ColorOverlayIcon.png b/Content/Slate/Docking/Tab_ColorOverlayIcon.png
new file mode 100644
index 0000000..c250b9f
Binary files /dev/null and b/Content/Slate/Docking/Tab_ColorOverlayIcon.png differ
diff --git a/Content/Slate/Docking/Tab_Foreground.png b/Content/Slate/Docking/Tab_Foreground.png
new file mode 100644
index 0000000..2f42ba1
Binary files /dev/null and b/Content/Slate/Docking/Tab_Foreground.png differ
diff --git a/Content/Slate/Docking/Tab_Hovered.png b/Content/Slate/Docking/Tab_Hovered.png
new file mode 100644
index 0000000..8830026
Binary files /dev/null and b/Content/Slate/Docking/Tab_Hovered.png differ
diff --git a/Content/Slate/Docking/Tab_Inactive.png b/Content/Slate/Docking/Tab_Inactive.png
new file mode 100644
index 0000000..bd025c5
Binary files /dev/null and b/Content/Slate/Docking/Tab_Inactive.png differ
diff --git a/Content/Slate/Fonts/FontAwesome.ttf b/Content/Slate/Fonts/FontAwesome.ttf
new file mode 100644
index 0000000..26dea79
Binary files /dev/null and b/Content/Slate/Fonts/FontAwesome.ttf differ
diff --git a/Content/Slate/Fonts/FontAwesome4.5.tps b/Content/Slate/Fonts/FontAwesome4.5.tps
new file mode 100644
index 0000000..e954abc
--- /dev/null
+++ b/Content/Slate/Fonts/FontAwesome4.5.tps
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Name>Font Awesome 4.5</Name>
+  <Location>/Engine/Content/Editor/Slate/Fonts/</Location>
+  <Date>2016-06-09T17:35:19.106115-04:00</Date>
+  <Function>font</Function>
+  <Justification />
+  <Eula>http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=OFL</Eula>
+  <RedistributeTo>
+    <EndUserGroup>Licensees</EndUserGroup>
+    <EndUserGroup>Git</EndUserGroup>
+    <EndUserGroup>P4</EndUserGroup>
+  </RedistributeTo>
+  <LicenseFolder>/Engine/Source/ThirdParty/Licenses/FontAwesome_License.txt</LicenseFolder>
+</TpsData>
\ No newline at end of file
diff --git a/Content/Slate/Graph/Animation/AnimationNode_FastPath.png b/Content/Slate/Graph/Animation/AnimationNode_FastPath.png
new file mode 100644
index 0000000..c95338e
Binary files /dev/null and b/Content/Slate/Graph/Animation/AnimationNode_FastPath.png differ
diff --git a/Content/Slate/Graph/Animation/AnimationNode_Result_128x.png b/Content/Slate/Graph/Animation/AnimationNode_Result_128x.png
new file mode 100644
index 0000000..ca28499
Binary files /dev/null and b/Content/Slate/Graph/Animation/AnimationNode_Result_128x.png differ
diff --git a/Content/Slate/Graph/Animation/PosePin_Connected_10x28.png b/Content/Slate/Graph/Animation/PosePin_Connected_10x28.png
new file mode 100644
index 0000000..c783e4c
Binary files /dev/null and b/Content/Slate/Graph/Animation/PosePin_Connected_10x28.png differ
diff --git a/Content/Slate/Graph/Animation/PosePin_Connected_15x28.png b/Content/Slate/Graph/Animation/PosePin_Connected_15x28.png
new file mode 100644
index 0000000..386659f
Binary files /dev/null and b/Content/Slate/Graph/Animation/PosePin_Connected_15x28.png differ
diff --git a/Content/Slate/Graph/Animation/PosePin_Disconnected_10x28.png b/Content/Slate/Graph/Animation/PosePin_Disconnected_10x28.png
new file mode 100644
index 0000000..690f134
Binary files /dev/null and b/Content/Slate/Graph/Animation/PosePin_Disconnected_10x28.png differ
diff --git a/Content/Slate/Graph/Animation/PosePin_Disconnected_15x28.png b/Content/Slate/Graph/Animation/PosePin_Disconnected_15x28.png
new file mode 100644
index 0000000..8ed1d81
Binary files /dev/null and b/Content/Slate/Graph/Animation/PosePin_Disconnected_15x28.png differ
diff --git a/Content/Slate/Graph/AnimationPoseResultNodeIcon.png b/Content/Slate/Graph/AnimationPoseResultNodeIcon.png
new file mode 100644
index 0000000..b88333d
Binary files /dev/null and b/Content/Slate/Graph/AnimationPoseResultNodeIcon.png differ
diff --git a/Content/Slate/Graph/ArrayPin_connected.png b/Content/Slate/Graph/ArrayPin_connected.png
new file mode 100644
index 0000000..cdd8ccd
Binary files /dev/null and b/Content/Slate/Graph/ArrayPin_connected.png differ
diff --git a/Content/Slate/Graph/ArrayPin_connected_VarA.png b/Content/Slate/Graph/ArrayPin_connected_VarA.png
new file mode 100644
index 0000000..ce682a7
Binary files /dev/null and b/Content/Slate/Graph/ArrayPin_connected_VarA.png differ
diff --git a/Content/Slate/Graph/ArrayPin_disconnected.png b/Content/Slate/Graph/ArrayPin_disconnected.png
new file mode 100644
index 0000000..b143f5a
Binary files /dev/null and b/Content/Slate/Graph/ArrayPin_disconnected.png differ
diff --git a/Content/Slate/Graph/ArrayPin_disconnected_VarA.png b/Content/Slate/Graph/ArrayPin_disconnected_VarA.png
new file mode 100644
index 0000000..df560da
Binary files /dev/null and b/Content/Slate/Graph/ArrayPin_disconnected_VarA.png differ
diff --git a/Content/Slate/Graph/AuthorityOnly.png b/Content/Slate/Graph/AuthorityOnly.png
new file mode 100644
index 0000000..6d3f6a9
Binary files /dev/null and b/Content/Slate/Graph/AuthorityOnly.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_Body.png b/Content/Slate/Graph/BlackGlass_ExitNode_Body.png
new file mode 100644
index 0000000..dfb859d
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_Body.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_Bottom.png b/Content/Slate/Graph/BlackGlass_ExitNode_Bottom.png
new file mode 100644
index 0000000..da26c7d
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_Bottom.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_ColorSplash.png b/Content/Slate/Graph/BlackGlass_ExitNode_ColorSplash.png
new file mode 100644
index 0000000..95246e1
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_ColorSplash.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_Shadow.png b/Content/Slate/Graph/BlackGlass_ExitNode_Shadow.png
new file mode 100644
index 0000000..802aec8
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_Shadow.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_ShadowSelected.png b/Content/Slate/Graph/BlackGlass_ExitNode_ShadowSelected.png
new file mode 100644
index 0000000..9d82cd2
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_ShadowSelected.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_TitleGloss.png b/Content/Slate/Graph/BlackGlass_ExitNode_TitleGloss.png
new file mode 100644
index 0000000..c5aee46
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_TitleGloss.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_TitleHighlight.png b/Content/Slate/Graph/BlackGlass_ExitNode_TitleHighlight.png
new file mode 100644
index 0000000..5faaaf1
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_TitleHighlight.png differ
diff --git a/Content/Slate/Graph/BlackGlass_ExitNode_Top.png b/Content/Slate/Graph/BlackGlass_ExitNode_Top.png
new file mode 100644
index 0000000..36aaa73
Binary files /dev/null and b/Content/Slate/Graph/BlackGlass_ExitNode_Top.png differ
diff --git a/Content/Slate/Graph/ClientEvent.png b/Content/Slate/Graph/ClientEvent.png
new file mode 100644
index 0000000..bc95c41
Binary files /dev/null and b/Content/Slate/Graph/ClientEvent.png differ
diff --git a/Content/Slate/Graph/CollapsedNode_Body_ColorSpill.png b/Content/Slate/Graph/CollapsedNode_Body_ColorSpill.png
new file mode 100644
index 0000000..a050879
Binary files /dev/null and b/Content/Slate/Graph/CollapsedNode_Body_ColorSpill.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/CheckBox.png b/Content/Slate/Graph/CommonWidgets/CheckBox.png
new file mode 100644
index 0000000..6cba038
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/CheckBox.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/CheckBox_Checked.png b/Content/Slate/Graph/CommonWidgets/CheckBox_Checked.png
new file mode 100644
index 0000000..5b42c6d
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/CheckBox_Checked.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/CheckBox_Checked_Hovered.png b/Content/Slate/Graph/CommonWidgets/CheckBox_Checked_Hovered.png
new file mode 100644
index 0000000..30ead59
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/CheckBox_Checked_Hovered.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/CheckBox_Hovered.png b/Content/Slate/Graph/CommonWidgets/CheckBox_Hovered.png
new file mode 100644
index 0000000..ece7e78
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/CheckBox_Hovered.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/CheckBox_Undetermined.png b/Content/Slate/Graph/CommonWidgets/CheckBox_Undetermined.png
new file mode 100644
index 0000000..579b5a1
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/CheckBox_Undetermined.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/CheckBox_Undetermined_Hovered.png b/Content/Slate/Graph/CommonWidgets/CheckBox_Undetermined_Hovered.png
new file mode 100644
index 0000000..19f3dfc
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/CheckBox_Undetermined_Hovered.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/TextBox.png b/Content/Slate/Graph/CommonWidgets/TextBox.png
new file mode 100644
index 0000000..382f38f
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/TextBox.png differ
diff --git a/Content/Slate/Graph/CommonWidgets/TextBox_Hovered.png b/Content/Slate/Graph/CommonWidgets/TextBox_Hovered.png
new file mode 100644
index 0000000..9d61814
Binary files /dev/null and b/Content/Slate/Graph/CommonWidgets/TextBox_Hovered.png differ
diff --git a/Content/Slate/Graph/ConstantPin_connected_VarA.png b/Content/Slate/Graph/ConstantPin_connected_VarA.png
new file mode 100644
index 0000000..c486776
Binary files /dev/null and b/Content/Slate/Graph/ConstantPin_connected_VarA.png differ
diff --git a/Content/Slate/Graph/ConstantPin_disconnected_VarA.png b/Content/Slate/Graph/ConstantPin_disconnected_VarA.png
new file mode 100644
index 0000000..838e6d9
Binary files /dev/null and b/Content/Slate/Graph/ConstantPin_disconnected_VarA.png differ
diff --git a/Content/Slate/Graph/CopyNodePinLeft_Connected.png b/Content/Slate/Graph/CopyNodePinLeft_Connected.png
new file mode 100644
index 0000000..707472f
Binary files /dev/null and b/Content/Slate/Graph/CopyNodePinLeft_Connected.png differ
diff --git a/Content/Slate/Graph/CopyNodePinLeft_Disconnected.png b/Content/Slate/Graph/CopyNodePinLeft_Disconnected.png
new file mode 100644
index 0000000..a5ddf98
Binary files /dev/null and b/Content/Slate/Graph/CopyNodePinLeft_Disconnected.png differ
diff --git a/Content/Slate/Graph/CopyNodePinRight_Connected.png b/Content/Slate/Graph/CopyNodePinRight_Connected.png
new file mode 100644
index 0000000..84c4fb9
Binary files /dev/null and b/Content/Slate/Graph/CopyNodePinRight_Connected.png differ
diff --git a/Content/Slate/Graph/CopyNodePinRight_Disconnected.png b/Content/Slate/Graph/CopyNodePinRight_Disconnected.png
new file mode 100644
index 0000000..52d74be
Binary files /dev/null and b/Content/Slate/Graph/CopyNodePinRight_Disconnected.png differ
diff --git a/Content/Slate/Graph/DelegatePin_Connected.png b/Content/Slate/Graph/DelegatePin_Connected.png
new file mode 100644
index 0000000..6082d67
Binary files /dev/null and b/Content/Slate/Graph/DelegatePin_Connected.png differ
diff --git a/Content/Slate/Graph/DelegatePin_Disconnected.png b/Content/Slate/Graph/DelegatePin_Disconnected.png
new file mode 100644
index 0000000..7253b20
Binary files /dev/null and b/Content/Slate/Graph/DelegatePin_Disconnected.png differ
diff --git a/Content/Slate/Graph/EditorOnly.png b/Content/Slate/Graph/EditorOnly.png
new file mode 100644
index 0000000..95c390c
Binary files /dev/null and b/Content/Slate/Graph/EditorOnly.png differ
diff --git a/Content/Slate/Graph/EventPin_Connected.png b/Content/Slate/Graph/EventPin_Connected.png
new file mode 100644
index 0000000..47536c4
Binary files /dev/null and b/Content/Slate/Graph/EventPin_Connected.png differ
diff --git a/Content/Slate/Graph/EventPin_Disconnected.png b/Content/Slate/Graph/EventPin_Disconnected.png
new file mode 100644
index 0000000..b4c2035
Binary files /dev/null and b/Content/Slate/Graph/EventPin_Disconnected.png differ
diff --git a/Content/Slate/Graph/Feedback_ShowNode.png b/Content/Slate/Graph/Feedback_ShowNode.png
new file mode 100644
index 0000000..e811e22
Binary files /dev/null and b/Content/Slate/Graph/Feedback_ShowNode.png differ
diff --git a/Content/Slate/Graph/GraphPanel_SolidBackground.PNG b/Content/Slate/Graph/GraphPanel_SolidBackground.PNG
new file mode 100644
index 0000000..af71a36
Binary files /dev/null and b/Content/Slate/Graph/GraphPanel_SolidBackground.PNG differ
diff --git a/Content/Slate/Graph/GraphPanel_StripesBackground.png b/Content/Slate/Graph/GraphPanel_StripesBackground.png
new file mode 100644
index 0000000..d7197f1
Binary files /dev/null and b/Content/Slate/Graph/GraphPanel_StripesBackground.png differ
diff --git a/Content/Slate/Graph/Graph_readonly_border.png b/Content/Slate/Graph/Graph_readonly_border.png
new file mode 100644
index 0000000..a780ded
Binary files /dev/null and b/Content/Slate/Graph/Graph_readonly_border.png differ
diff --git a/Content/Slate/Graph/Icons/ArrayPin.png b/Content/Slate/Graph/Icons/ArrayPin.png
new file mode 100644
index 0000000..e9854fc
Binary files /dev/null and b/Content/Slate/Graph/Icons/ArrayPin.png differ
diff --git a/Content/Slate/Graph/Icons/Enum.png b/Content/Slate/Graph/Icons/Enum.png
new file mode 100644
index 0000000..fd65599
Binary files /dev/null and b/Content/Slate/Graph/Icons/Enum.png differ
diff --git a/Content/Slate/Graph/Icons/Event.png b/Content/Slate/Graph/Icons/Event.png
new file mode 100644
index 0000000..7dada27
Binary files /dev/null and b/Content/Slate/Graph/Icons/Event.png differ
diff --git a/Content/Slate/Graph/Icons/EventGraph.png b/Content/Slate/Graph/Icons/EventGraph.png
new file mode 100644
index 0000000..d05f1f0
Binary files /dev/null and b/Content/Slate/Graph/Icons/EventGraph.png differ
diff --git a/Content/Slate/Graph/Icons/Event_Custom.png b/Content/Slate/Graph/Icons/Event_Custom.png
new file mode 100644
index 0000000..6c1702c
Binary files /dev/null and b/Content/Slate/Graph/Icons/Event_Custom.png differ
diff --git a/Content/Slate/Graph/Icons/Event_Disconnected.png b/Content/Slate/Graph/Icons/Event_Disconnected.png
new file mode 100644
index 0000000..06a5f9a
Binary files /dev/null and b/Content/Slate/Graph/Icons/Event_Disconnected.png differ
diff --git a/Content/Slate/Graph/Icons/FIB_CallFunction.png b/Content/Slate/Graph/Icons/FIB_CallFunction.png
new file mode 100644
index 0000000..a8748cd
Binary files /dev/null and b/Content/Slate/Graph/Icons/FIB_CallFunction.png differ
diff --git a/Content/Slate/Graph/Icons/FIB_Event.png b/Content/Slate/Graph/Icons/FIB_Event.png
new file mode 100644
index 0000000..7dada27
Binary files /dev/null and b/Content/Slate/Graph/Icons/FIB_Event.png differ
diff --git a/Content/Slate/Graph/Icons/FIB_MacroInstance.png b/Content/Slate/Graph/Icons/FIB_MacroInstance.png
new file mode 100644
index 0000000..925ce73
Binary files /dev/null and b/Content/Slate/Graph/Icons/FIB_MacroInstance.png differ
diff --git a/Content/Slate/Graph/Icons/FIB_VarGet.png b/Content/Slate/Graph/Icons/FIB_VarGet.png
new file mode 100644
index 0000000..7137b82
Binary files /dev/null and b/Content/Slate/Graph/Icons/FIB_VarGet.png differ
diff --git a/Content/Slate/Graph/Icons/FIB_VarSet.png b/Content/Slate/Graph/Icons/FIB_VarSet.png
new file mode 100644
index 0000000..75648d2
Binary files /dev/null and b/Content/Slate/Graph/Icons/FIB_VarSet.png differ
diff --git a/Content/Slate/Graph/Icons/Func16.png b/Content/Slate/Graph/Icons/Func16.png
new file mode 100644
index 0000000..2be9b20
Binary files /dev/null and b/Content/Slate/Graph/Icons/Func16.png differ
diff --git a/Content/Slate/Graph/Icons/Function.png b/Content/Slate/Graph/Icons/Function.png
new file mode 100644
index 0000000..a8748cd
Binary files /dev/null and b/Content/Slate/Graph/Icons/Function.png differ
diff --git a/Content/Slate/Graph/Icons/Hammer.PNG b/Content/Slate/Graph/Icons/Hammer.PNG
new file mode 100644
index 0000000..b9a4fde
Binary files /dev/null and b/Content/Slate/Graph/Icons/Hammer.PNG differ
diff --git a/Content/Slate/Graph/Icons/Macro.png b/Content/Slate/Graph/Icons/Macro.png
new file mode 100644
index 0000000..6e33fc3
Binary files /dev/null and b/Content/Slate/Graph/Icons/Macro.png differ
diff --git a/Content/Slate/Graph/Icons/Node.png b/Content/Slate/Graph/Icons/Node.png
new file mode 100644
index 0000000..87e61e9
Binary files /dev/null and b/Content/Slate/Graph/Icons/Node.png differ
diff --git a/Content/Slate/Graph/Icons/Overlay_Autoplay.png b/Content/Slate/Graph/Icons/Overlay_Autoplay.png
new file mode 100644
index 0000000..08aefca
Binary files /dev/null and b/Content/Slate/Graph/Icons/Overlay_Autoplay.png differ
diff --git a/Content/Slate/Graph/Icons/Overlay_Interface.png b/Content/Slate/Graph/Icons/Overlay_Interface.png
new file mode 100644
index 0000000..e7de1b9
Binary files /dev/null and b/Content/Slate/Graph/Icons/Overlay_Interface.png differ
diff --git a/Content/Slate/Graph/Icons/Overlay_Loop.png b/Content/Slate/Graph/Icons/Overlay_Loop.png
new file mode 100644
index 0000000..0936d4a
Binary files /dev/null and b/Content/Slate/Graph/Icons/Overlay_Loop.png differ
diff --git a/Content/Slate/Graph/Icons/Overlay_New.png b/Content/Slate/Graph/Icons/Overlay_New.png
new file mode 100644
index 0000000..aeb2c6e
Binary files /dev/null and b/Content/Slate/Graph/Icons/Overlay_New.png differ
diff --git a/Content/Slate/Graph/Icons/Overlay_Override.png b/Content/Slate/Graph/Icons/Overlay_Override.png
new file mode 100644
index 0000000..51819dd
Binary files /dev/null and b/Content/Slate/Graph/Icons/Overlay_Override.png differ
diff --git a/Content/Slate/Graph/Icons/Overlay_PotentialOverride.png b/Content/Slate/Graph/Icons/Overlay_PotentialOverride.png
new file mode 100644
index 0000000..17a9991
Binary files /dev/null and b/Content/Slate/Graph/Icons/Overlay_PotentialOverride.png differ
diff --git a/Content/Slate/Graph/Icons/Pin.png b/Content/Slate/Graph/Icons/Pin.png
new file mode 100644
index 0000000..4f2cd4c
Binary files /dev/null and b/Content/Slate/Graph/Icons/Pin.png differ
diff --git a/Content/Slate/Graph/Icons/RefPin.png b/Content/Slate/Graph/Icons/RefPin.png
new file mode 100644
index 0000000..37bb1b9
Binary files /dev/null and b/Content/Slate/Graph/Icons/RefPin.png differ
diff --git a/Content/Slate/Graph/Icons/Robot.png b/Content/Slate/Graph/Icons/Robot.png
new file mode 100644
index 0000000..e8492ca
Binary files /dev/null and b/Content/Slate/Graph/Icons/Robot.png differ
diff --git a/Content/Slate/Graph/Icons/Struct.png b/Content/Slate/Graph/Icons/Struct.png
new file mode 100644
index 0000000..06c8c90
Binary files /dev/null and b/Content/Slate/Graph/Icons/Struct.png differ
diff --git a/Content/Slate/Graph/Icons/Subgraph.png b/Content/Slate/Graph/Icons/Subgraph.png
new file mode 100644
index 0000000..3efedaf
Binary files /dev/null and b/Content/Slate/Graph/Icons/Subgraph.png differ
diff --git a/Content/Slate/Graph/Icons/Timeline.png b/Content/Slate/Graph/Icons/Timeline.png
new file mode 100644
index 0000000..6faa774
Binary files /dev/null and b/Content/Slate/Graph/Icons/Timeline.png differ
diff --git a/Content/Slate/Graph/IndicatorOverlay_color_spill.png b/Content/Slate/Graph/IndicatorOverlay_color_spill.png
new file mode 100644
index 0000000..e9c787b
Binary files /dev/null and b/Content/Slate/Graph/IndicatorOverlay_color_spill.png differ
diff --git a/Content/Slate/Graph/InterfaceEventIcon.png b/Content/Slate/Graph/InterfaceEventIcon.png
new file mode 100644
index 0000000..a7d42b5
Binary files /dev/null and b/Content/Slate/Graph/InterfaceEventIcon.png differ
diff --git a/Content/Slate/Graph/LatentIcon.png b/Content/Slate/Graph/LatentIcon.png
new file mode 100644
index 0000000..747faf2
Binary files /dev/null and b/Content/Slate/Graph/LatentIcon.png differ
diff --git a/Content/Slate/Graph/Linear_VarNode_Background.png b/Content/Slate/Graph/Linear_VarNode_Background.png
new file mode 100644
index 0000000..b148ebd
Binary files /dev/null and b/Content/Slate/Graph/Linear_VarNode_Background.png differ
diff --git a/Content/Slate/Graph/Linear_VarNode_Gloss.png b/Content/Slate/Graph/Linear_VarNode_Gloss.png
new file mode 100644
index 0000000..f8e6cf6
Binary files /dev/null and b/Content/Slate/Graph/Linear_VarNode_Gloss.png differ
diff --git a/Content/Slate/Graph/MathNode_heat_display.png b/Content/Slate/Graph/MathNode_heat_display.png
new file mode 100644
index 0000000..1c57778
Binary files /dev/null and b/Content/Slate/Graph/MathNode_heat_display.png differ
diff --git a/Content/Slate/Graph/MathNode_shadow_selected.png b/Content/Slate/Graph/MathNode_shadow_selected.png
new file mode 100644
index 0000000..d89e4c5
Binary files /dev/null and b/Content/Slate/Graph/MathNode_shadow_selected.png differ
diff --git a/Content/Slate/Graph/MessageIcon.png b/Content/Slate/Graph/MessageIcon.png
new file mode 100644
index 0000000..7441d57
Binary files /dev/null and b/Content/Slate/Graph/MessageIcon.png differ
diff --git a/Content/Slate/Graph/PinSeparator.png b/Content/Slate/Graph/PinSeparator.png
new file mode 100644
index 0000000..f038a0c
Binary files /dev/null and b/Content/Slate/Graph/PinSeparator.png differ
diff --git a/Content/Slate/Graph/Pin_connected.PNG b/Content/Slate/Graph/Pin_connected.PNG
new file mode 100644
index 0000000..f261a94
Binary files /dev/null and b/Content/Slate/Graph/Pin_connected.PNG differ
diff --git a/Content/Slate/Graph/Pin_connected_VarA.png b/Content/Slate/Graph/Pin_connected_VarA.png
new file mode 100644
index 0000000..572b65d
Binary files /dev/null and b/Content/Slate/Graph/Pin_connected_VarA.png differ
diff --git a/Content/Slate/Graph/Pin_disconnected.PNG b/Content/Slate/Graph/Pin_disconnected.PNG
new file mode 100644
index 0000000..a9fa142
Binary files /dev/null and b/Content/Slate/Graph/Pin_disconnected.PNG differ
diff --git a/Content/Slate/Graph/Pin_disconnected_VarA.png b/Content/Slate/Graph/Pin_disconnected_VarA.png
new file mode 100644
index 0000000..4189a4a
Binary files /dev/null and b/Content/Slate/Graph/Pin_disconnected_VarA.png differ
diff --git a/Content/Slate/Graph/Pin_hover_cue.png b/Content/Slate/Graph/Pin_hover_cue.png
new file mode 100644
index 0000000..e85271a
Binary files /dev/null and b/Content/Slate/Graph/Pin_hover_cue.png differ
diff --git a/Content/Slate/Graph/RefPin_connected.png b/Content/Slate/Graph/RefPin_connected.png
new file mode 100644
index 0000000..97bb2e1
Binary files /dev/null and b/Content/Slate/Graph/RefPin_connected.png differ
diff --git a/Content/Slate/Graph/RefPin_connected_VarA.png b/Content/Slate/Graph/RefPin_connected_VarA.png
new file mode 100644
index 0000000..1e46054
Binary files /dev/null and b/Content/Slate/Graph/RefPin_connected_VarA.png differ
diff --git a/Content/Slate/Graph/RefPin_disconnected.png b/Content/Slate/Graph/RefPin_disconnected.png
new file mode 100644
index 0000000..231b66e
Binary files /dev/null and b/Content/Slate/Graph/RefPin_disconnected.png differ
diff --git a/Content/Slate/Graph/RefPin_disconnected_VarA.png b/Content/Slate/Graph/RefPin_disconnected_VarA.png
new file mode 100644
index 0000000..59ae900
Binary files /dev/null and b/Content/Slate/Graph/RefPin_disconnected_VarA.png differ
diff --git a/Content/Slate/Graph/RegularNode_body.png b/Content/Slate/Graph/RegularNode_body.png
new file mode 100644
index 0000000..fb00093
Binary files /dev/null and b/Content/Slate/Graph/RegularNode_body.png differ
diff --git a/Content/Slate/Graph/RegularNode_color_spill.png b/Content/Slate/Graph/RegularNode_color_spill.png
new file mode 100644
index 0000000..cf40da7
Binary files /dev/null and b/Content/Slate/Graph/RegularNode_color_spill.png differ
diff --git a/Content/Slate/Graph/RegularNode_heat_display.png b/Content/Slate/Graph/RegularNode_heat_display.png
new file mode 100644
index 0000000..6d62cbf
Binary files /dev/null and b/Content/Slate/Graph/RegularNode_heat_display.png differ
diff --git a/Content/Slate/Graph/RegularNode_shadow.png b/Content/Slate/Graph/RegularNode_shadow.png
new file mode 100644
index 0000000..44e1711
Binary files /dev/null and b/Content/Slate/Graph/RegularNode_shadow.png differ
diff --git a/Content/Slate/Graph/RegularNode_shadow_selected.png b/Content/Slate/Graph/RegularNode_shadow_selected.png
new file mode 100644
index 0000000..2ca6cd5
Binary files /dev/null and b/Content/Slate/Graph/RegularNode_shadow_selected.png differ
diff --git a/Content/Slate/Graph/RegularNode_title_gloss.png b/Content/Slate/Graph/RegularNode_title_gloss.png
new file mode 100644
index 0000000..95db946
Binary files /dev/null and b/Content/Slate/Graph/RegularNode_title_gloss.png differ
diff --git a/Content/Slate/Graph/RegularNode_title_highlight.png b/Content/Slate/Graph/RegularNode_title_highlight.png
new file mode 100644
index 0000000..5faaaf1
Binary files /dev/null and b/Content/Slate/Graph/RegularNode_title_highlight.png differ
diff --git a/Content/Slate/Graph/Replicated.png b/Content/Slate/Graph/Replicated.png
new file mode 100644
index 0000000..f2c9273
Binary files /dev/null and b/Content/Slate/Graph/Replicated.png differ
diff --git a/Content/Slate/Graph/RerouteNode_shadow.png b/Content/Slate/Graph/RerouteNode_shadow.png
new file mode 100644
index 0000000..9eb01ca
Binary files /dev/null and b/Content/Slate/Graph/RerouteNode_shadow.png differ
diff --git a/Content/Slate/Graph/RerouteNode_shadow_selected.png b/Content/Slate/Graph/RerouteNode_shadow_selected.png
new file mode 100644
index 0000000..83c3e33
Binary files /dev/null and b/Content/Slate/Graph/RerouteNode_shadow_selected.png differ
diff --git a/Content/Slate/Graph/SoundCue_SpeakerIcon.png b/Content/Slate/Graph/SoundCue_SpeakerIcon.png
new file mode 100644
index 0000000..b90cc46
Binary files /dev/null and b/Content/Slate/Graph/SoundCue_SpeakerIcon.png differ
diff --git a/Content/Slate/Graph/TintedNode_body.png b/Content/Slate/Graph/TintedNode_body.png
new file mode 100644
index 0000000..435fa49
Binary files /dev/null and b/Content/Slate/Graph/TintedNode_body.png differ
diff --git a/Content/Slate/Graph/TransNode_color_spill.png b/Content/Slate/Graph/TransNode_color_spill.png
new file mode 100644
index 0000000..75a7972
Binary files /dev/null and b/Content/Slate/Graph/TransNode_color_spill.png differ
diff --git a/Content/Slate/Graph/VarNode_body.png b/Content/Slate/Graph/VarNode_body.png
new file mode 100644
index 0000000..eebe325
Binary files /dev/null and b/Content/Slate/Graph/VarNode_body.png differ
diff --git a/Content/Slate/Graph/VarNode_color_spill.png b/Content/Slate/Graph/VarNode_color_spill.png
new file mode 100644
index 0000000..ebb1e46
Binary files /dev/null and b/Content/Slate/Graph/VarNode_color_spill.png differ
diff --git a/Content/Slate/Graph/VarNode_gloss.png b/Content/Slate/Graph/VarNode_gloss.png
new file mode 100644
index 0000000..cdb34ad
Binary files /dev/null and b/Content/Slate/Graph/VarNode_gloss.png differ
diff --git a/Content/Slate/Graph/VarNode_heat_display.png b/Content/Slate/Graph/VarNode_heat_display.png
new file mode 100644
index 0000000..1b27e9c
Binary files /dev/null and b/Content/Slate/Graph/VarNode_heat_display.png differ
diff --git a/Content/Slate/Graph/VarNode_shadow.png b/Content/Slate/Graph/VarNode_shadow.png
new file mode 100644
index 0000000..92b17db
Binary files /dev/null and b/Content/Slate/Graph/VarNode_shadow.png differ
diff --git a/Content/Slate/Graph/VarNode_shadow_selected.png b/Content/Slate/Graph/VarNode_shadow_selected.png
new file mode 100644
index 0000000..d74b298
Binary files /dev/null and b/Content/Slate/Graph/VarNode_shadow_selected.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Arrow_16px.png b/Content/Slate/Icons/ActorIcons/Arrow_16px.png
new file mode 100644
index 0000000..edcbfd1
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Arrow_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Brush_16x.png b/Content/Slate/Icons/ActorIcons/Brush_16x.png
new file mode 100644
index 0000000..ed50ec4
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Brush_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Brush_Add_16x.png b/Content/Slate/Icons/ActorIcons/Brush_Add_16x.png
new file mode 100644
index 0000000..e8df24a
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Brush_Add_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Brush_Subtract_16x.png b/Content/Slate/Icons/ActorIcons/Brush_Subtract_16x.png
new file mode 100644
index 0000000..cf8241c
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Brush_Subtract_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Capsule_16px.png b/Content/Slate/Icons/ActorIcons/Capsule_16px.png
new file mode 100644
index 0000000..47bfb52
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Capsule_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/ChildActorComponent_16px.png b/Content/Slate/Icons/ActorIcons/ChildActorComponent_16px.png
new file mode 100644
index 0000000..2f1e114
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/ChildActorComponent_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/ComponentMobilityHeader_7x16.png b/Content/Slate/Icons/ActorIcons/ComponentMobilityHeader_7x16.png
new file mode 100644
index 0000000..936af94
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/ComponentMobilityHeader_7x16.png differ
diff --git a/Content/Slate/Icons/ActorIcons/ComponentMobilityMovable_7x16px.png b/Content/Slate/Icons/ActorIcons/ComponentMobilityMovable_7x16px.png
new file mode 100644
index 0000000..f7b2c1e
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/ComponentMobilityMovable_7x16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/ComponentMobilityStationary_7x16px.png b/Content/Slate/Icons/ActorIcons/ComponentMobilityStationary_7x16px.png
new file mode 100644
index 0000000..4f2c58b
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/ComponentMobilityStationary_7x16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/DeletedActor_16px.png b/Content/Slate/Icons/ActorIcons/DeletedActor_16px.png
new file mode 100644
index 0000000..1907ee7
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/DeletedActor_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Emitter_16x.png b/Content/Slate/Icons/ActorIcons/Emitter_16x.png
new file mode 100644
index 0000000..812f899
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Emitter_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/GroupActor_16x.png b/Content/Slate/Icons/ActorIcons/GroupActor_16x.png
new file mode 100644
index 0000000..c16e810
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/GroupActor_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/InstancedStaticMesh_16px.png b/Content/Slate/Icons/ActorIcons/InstancedStaticMesh_16px.png
new file mode 100644
index 0000000..3b90ce8
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/InstancedStaticMesh_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Landscape_16x.png b/Content/Slate/Icons/ActorIcons/Landscape_16x.png
new file mode 100644
index 0000000..b4f009d
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Landscape_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/LightActor_16x.png b/Content/Slate/Icons/ActorIcons/LightActor_16x.png
new file mode 100644
index 0000000..90bd93b
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/LightActor_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Light_Adjustable_16x.png b/Content/Slate/Icons/ActorIcons/Light_Adjustable_16x.png
new file mode 100644
index 0000000..8eb7ded
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Light_Adjustable_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Light_Movable_16x.png b/Content/Slate/Icons/ActorIcons/Light_Movable_16x.png
new file mode 100644
index 0000000..c937ce4
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Light_Movable_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/MaterialSprite_16px.png b/Content/Slate/Icons/ActorIcons/MaterialSprite_16px.png
new file mode 100644
index 0000000..5757581
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/MaterialSprite_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/ProjectileMovementComponent_16px.png b/Content/Slate/Icons/ActorIcons/ProjectileMovementComponent_16px.png
new file mode 100644
index 0000000..d5f72f3
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/ProjectileMovementComponent_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/RotatingMovementComponent_16px.png b/Content/Slate/Icons/ActorIcons/RotatingMovementComponent_16px.png
new file mode 100644
index 0000000..c0befa8
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/RotatingMovementComponent_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/SceneCapture_16px.png b/Content/Slate/Icons/ActorIcons/SceneCapture_16px.png
new file mode 100644
index 0000000..b22ae4f
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/SceneCapture_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Scene_16px.png b/Content/Slate/Icons/ActorIcons/Scene_16px.png
new file mode 100644
index 0000000..2a7d907
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Scene_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/SoundActor_16x.png b/Content/Slate/Icons/ActorIcons/SoundActor_16x.png
new file mode 100644
index 0000000..a1892bb
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/SoundActor_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Sphere_16px.png b/Content/Slate/Icons/ActorIcons/Sphere_16px.png
new file mode 100644
index 0000000..bbf7dc4
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Sphere_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Spline_16px.png b/Content/Slate/Icons/ActorIcons/Spline_16px.png
new file mode 100644
index 0000000..2914a87
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Spline_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/SpringArmComponent_16px.png b/Content/Slate/Icons/ActorIcons/SpringArmComponent_16px.png
new file mode 100644
index 0000000..4552d7f
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/SpringArmComponent_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/SpriteComponent_16px.png b/Content/Slate/Icons/ActorIcons/SpriteComponent_16px.png
new file mode 100644
index 0000000..bed195b
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/SpriteComponent_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/TimelineComponent_16px.png b/Content/Slate/Icons/ActorIcons/TimelineComponent_16px.png
new file mode 100644
index 0000000..119034d
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/TimelineComponent_16px.png differ
diff --git a/Content/Slate/Icons/ActorIcons/VectorFieldVolume_16x.png b/Content/Slate/Icons/ActorIcons/VectorFieldVolume_16x.png
new file mode 100644
index 0000000..22842c8
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/VectorFieldVolume_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/Volume_16x.png b/Content/Slate/Icons/ActorIcons/Volume_16x.png
new file mode 100644
index 0000000..b70f1f1
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/Volume_16x.png differ
diff --git a/Content/Slate/Icons/ActorIcons/box_16px.png b/Content/Slate/Icons/ActorIcons/box_16px.png
new file mode 100644
index 0000000..8336e2b
Binary files /dev/null and b/Content/Slate/Icons/ActorIcons/box_16px.png differ
diff --git a/Content/Slate/Icons/ArrowDown_12x.png b/Content/Slate/Icons/ArrowDown_12x.png
new file mode 100644
index 0000000..16c5229
Binary files /dev/null and b/Content/Slate/Icons/ArrowDown_12x.png differ
diff --git a/Content/Slate/Icons/ArrowUp_12x.png b/Content/Slate/Icons/ArrowUp_12x.png
new file mode 100644
index 0000000..4a103ca
Binary files /dev/null and b/Content/Slate/Icons/ArrowUp_12x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AIController_16x.png b/Content/Slate/Icons/AssetIcons/AIController_16x.png
new file mode 100644
index 0000000..4099173
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AIController_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AIPerceptionComponent_16x.png b/Content/Slate/Icons/AssetIcons/AIPerceptionComponent_16x.png
new file mode 100644
index 0000000..66d3093
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AIPerceptionComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AbilitySystemComponent_16x.png b/Content/Slate/Icons/AssetIcons/AbilitySystemComponent_16x.png
new file mode 100644
index 0000000..fd3d6e5
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AbilitySystemComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ActorComponent_16x.png b/Content/Slate/Icons/AssetIcons/ActorComponent_16x.png
new file mode 100644
index 0000000..f98db7f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ActorComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Actor_16x.png b/Content/Slate/Icons/AssetIcons/Actor_16x.png
new file mode 100644
index 0000000..a0562e4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Actor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AimOffsetBlendSpace1D_16x.png b/Content/Slate/Icons/AssetIcons/AimOffsetBlendSpace1D_16x.png
new file mode 100644
index 0000000..1737445
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AimOffsetBlendSpace1D_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AimOffsetBlendSpace_16x.png b/Content/Slate/Icons/AssetIcons/AimOffsetBlendSpace_16x.png
new file mode 100644
index 0000000..6a2f695
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AimOffsetBlendSpace_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AmbientSound_16x.png b/Content/Slate/Icons/AssetIcons/AmbientSound_16x.png
new file mode 100644
index 0000000..90b9746
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AmbientSound_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimBlueprint_16x.png b/Content/Slate/Icons/AssetIcons/AnimBlueprint_16x.png
new file mode 100644
index 0000000..d96c4a0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimBlueprint_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimComposite_16x.png b/Content/Slate/Icons/AssetIcons/AnimComposite_16x.png
new file mode 100644
index 0000000..1d973f8
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimComposite_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimInstance_16x.png b/Content/Slate/Icons/AssetIcons/AnimInstance_16x.png
new file mode 100644
index 0000000..d96c4a0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimInstance_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimLayerInterface_16x.png b/Content/Slate/Icons/AssetIcons/AnimLayerInterface_16x.png
new file mode 100644
index 0000000..4c6b44d
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimLayerInterface_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimMontage_16x.png b/Content/Slate/Icons/AssetIcons/AnimMontage_16x.png
new file mode 100644
index 0000000..978a793
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimMontage_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimSequence_16x.png b/Content/Slate/Icons/AssetIcons/AnimSequence_16x.png
new file mode 100644
index 0000000..5fd56ac
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimSequence_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimationModifier_16x.png b/Content/Slate/Icons/AssetIcons/AnimationModifier_16x.png
new file mode 100644
index 0000000..98da144
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimationModifier_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AnimationSharingSetup_16x.png b/Content/Slate/Icons/AssetIcons/AnimationSharingSetup_16x.png
new file mode 100644
index 0000000..459ee11
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AnimationSharingSetup_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ApplicationLifecycleComponent_16x.png b/Content/Slate/Icons/AssetIcons/ApplicationLifecycleComponent_16x.png
new file mode 100644
index 0000000..ad7d9e9
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ApplicationLifecycleComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AtmosphericFog_16x.png b/Content/Slate/Icons/AssetIcons/AtmosphericFog_16x.png
new file mode 100644
index 0000000..d93d25f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AtmosphericFog_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/AudioVolume_16x.png b/Content/Slate/Icons/AssetIcons/AudioVolume_16x.png
new file mode 100644
index 0000000..7e68458
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/AudioVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BehaviorTree_16x.png b/Content/Slate/Icons/AssetIcons/BehaviorTree_16x.png
new file mode 100644
index 0000000..764b885
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BehaviorTree_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlackboardData_16x.png b/Content/Slate/Icons/AssetIcons/BlackboardData_16x.png
new file mode 100644
index 0000000..f3f235f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlackboardData_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlendSpace1D_16x.png b/Content/Slate/Icons/AssetIcons/BlendSpace1D_16x.png
new file mode 100644
index 0000000..67193c6
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlendSpace1D_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlendSpace_16x.png b/Content/Slate/Icons/AssetIcons/BlendSpace_16x.png
new file mode 100644
index 0000000..f668efd
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlendSpace_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlockingVolume_16x.png b/Content/Slate/Icons/AssetIcons/BlockingVolume_16x.png
new file mode 100644
index 0000000..596782b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlockingVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlueprintFunctionLibrary_16x.png b/Content/Slate/Icons/AssetIcons/BlueprintFunctionLibrary_16x.png
new file mode 100644
index 0000000..be8d467
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlueprintFunctionLibrary_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlueprintGeneratedClass_16x.png b/Content/Slate/Icons/AssetIcons/BlueprintGeneratedClass_16x.png
new file mode 100644
index 0000000..fcce4f4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlueprintGeneratedClass_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlueprintInterface_16x.png b/Content/Slate/Icons/AssetIcons/BlueprintInterface_16x.png
new file mode 100644
index 0000000..4c6b44d
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlueprintInterface_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BlueprintMacroLibrary_16x.png b/Content/Slate/Icons/AssetIcons/BlueprintMacroLibrary_16x.png
new file mode 100644
index 0000000..5ccf560
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BlueprintMacroLibrary_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Blueprint_16x.png b/Content/Slate/Icons/AssetIcons/Blueprint_16x.png
new file mode 100644
index 0000000..fcce4f4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Blueprint_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/BoxReflectionCapture_16x.png b/Content/Slate/Icons/AssetIcons/BoxReflectionCapture_16x.png
new file mode 100644
index 0000000..45459c4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/BoxReflectionCapture_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ButtonStyleAsset_16x.png b/Content/Slate/Icons/AssetIcons/ButtonStyleAsset_16x.png
new file mode 100644
index 0000000..9dbd31b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ButtonStyleAsset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CableActor_16x.png b/Content/Slate/Icons/AssetIcons/CableActor_16x.png
new file mode 100644
index 0000000..7a993c8
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CableActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CableComponent_16x.png b/Content/Slate/Icons/AssetIcons/CableComponent_16x.png
new file mode 100644
index 0000000..1b7be3a
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CableComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CameraActor_16x.png b/Content/Slate/Icons/AssetIcons/CameraActor_16x.png
new file mode 100644
index 0000000..e41c856
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CameraActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CameraAnim_16x.png b/Content/Slate/Icons/AssetIcons/CameraAnim_16x.png
new file mode 100644
index 0000000..658b1ad
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CameraAnim_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CameraBlockingVolume_16x.png b/Content/Slate/Icons/AssetIcons/CameraBlockingVolume_16x.png
new file mode 100644
index 0000000..5888758
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CameraBlockingVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CameraRig_Crane_16x.png b/Content/Slate/Icons/AssetIcons/CameraRig_Crane_16x.png
new file mode 100644
index 0000000..e06e81b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CameraRig_Crane_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CameraRig_Rail_16x.png b/Content/Slate/Icons/AssetIcons/CameraRig_Rail_16x.png
new file mode 100644
index 0000000..71c7b42
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CameraRig_Rail_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CharacterMovementComponent_16x.png b/Content/Slate/Icons/AssetIcons/CharacterMovementComponent_16x.png
new file mode 100644
index 0000000..19606a9
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CharacterMovementComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Character_16x.png b/Content/Slate/Icons/AssetIcons/Character_16x.png
new file mode 100644
index 0000000..e406375
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Character_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CineCameraActor_16x.png b/Content/Slate/Icons/AssetIcons/CineCameraActor_16x.png
new file mode 100644
index 0000000..3e389ee
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CineCameraActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Class_16x.png b/Content/Slate/Icons/AssetIcons/Class_16x.png
new file mode 100644
index 0000000..d0ee6cc
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Class_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Cone_16x.png b/Content/Slate/Icons/AssetIcons/Cone_16x.png
new file mode 100644
index 0000000..d3d230e
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Cone_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Cube_16x.png b/Content/Slate/Icons/AssetIcons/Cube_16x.png
new file mode 100644
index 0000000..81502ce
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Cube_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CullDistanceVolume_16x.png b/Content/Slate/Icons/AssetIcons/CullDistanceVolume_16x.png
new file mode 100644
index 0000000..1cf8bbb
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CullDistanceVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/CurveBase_16x.png b/Content/Slate/Icons/AssetIcons/CurveBase_16x.png
new file mode 100644
index 0000000..3a3678d
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/CurveBase_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Cylinder_16x.png b/Content/Slate/Icons/AssetIcons/Cylinder_16x.png
new file mode 100644
index 0000000..6bb8daf
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Cylinder_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DataAsset_16x.png b/Content/Slate/Icons/AssetIcons/DataAsset_16x.png
new file mode 100644
index 0000000..9997dc7
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DataAsset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DataTable_16x.png b/Content/Slate/Icons/AssetIcons/DataTable_16x.png
new file mode 100644
index 0000000..4aed05d
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DataTable_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DecalActor_16x.png b/Content/Slate/Icons/AssetIcons/DecalActor_16x.png
new file mode 100644
index 0000000..fedc761
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DecalActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DefaultPawn_16x.png b/Content/Slate/Icons/AssetIcons/DefaultPawn_16x.png
new file mode 100644
index 0000000..6873ff5
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DefaultPawn_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Default_16x.png b/Content/Slate/Icons/AssetIcons/Default_16x.png
new file mode 100644
index 0000000..1c1abba
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Default_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DialogueVoice_16x.png b/Content/Slate/Icons/AssetIcons/DialogueVoice_16x.png
new file mode 100644
index 0000000..dcc0a10
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DialogueVoice_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DialogueWave_16x.png b/Content/Slate/Icons/AssetIcons/DialogueWave_16x.png
new file mode 100644
index 0000000..c3dcdc5
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DialogueWave_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DirectionalLightMovable_16x.png b/Content/Slate/Icons/AssetIcons/DirectionalLightMovable_16x.png
new file mode 100644
index 0000000..2f71896
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DirectionalLightMovable_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DirectionalLightStatic_16x.png b/Content/Slate/Icons/AssetIcons/DirectionalLightStatic_16x.png
new file mode 100644
index 0000000..4321eda
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DirectionalLightStatic_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DirectionalLightStationary_16x.png b/Content/Slate/Icons/AssetIcons/DirectionalLightStationary_16x.png
new file mode 100644
index 0000000..834ed6b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DirectionalLightStationary_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DirectionalLight_16x.png b/Content/Slate/Icons/AssetIcons/DirectionalLight_16x.png
new file mode 100644
index 0000000..89dd6de
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DirectionalLight_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/DocumentationActor_16x.png b/Content/Slate/Icons/AssetIcons/DocumentationActor_16x.png
new file mode 100644
index 0000000..4aa85ec
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/DocumentationActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/EditorTutorial_16x.png b/Content/Slate/Icons/AssetIcons/EditorTutorial_16x.png
new file mode 100644
index 0000000..247533a
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/EditorTutorial_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/EnvQuery_16x.png b/Content/Slate/Icons/AssetIcons/EnvQuery_16x.png
new file mode 100644
index 0000000..ef4fbad
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/EnvQuery_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ExponentialHeightFog_16x.png b/Content/Slate/Icons/AssetIcons/ExponentialHeightFog_16x.png
new file mode 100644
index 0000000..a667bb9
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ExponentialHeightFog_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/FileMediaSource_16x.png b/Content/Slate/Icons/AssetIcons/FileMediaSource_16x.png
new file mode 100644
index 0000000..6b35296
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/FileMediaSource_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/FoliageType_Actor_16x.png b/Content/Slate/Icons/AssetIcons/FoliageType_Actor_16x.png
new file mode 100644
index 0000000..a0562e4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/FoliageType_Actor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/FontFace_16x.png b/Content/Slate/Icons/AssetIcons/FontFace_16x.png
new file mode 100644
index 0000000..d7bda68
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/FontFace_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Font_16x.png b/Content/Slate/Icons/AssetIcons/Font_16x.png
new file mode 100644
index 0000000..d7bda68
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Font_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ForceFeedbackEffect_16x.png b/Content/Slate/Icons/AssetIcons/ForceFeedbackEffect_16x.png
new file mode 100644
index 0000000..4787983
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ForceFeedbackEffect_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/GameModeBase_16x.png b/Content/Slate/Icons/AssetIcons/GameModeBase_16x.png
new file mode 100644
index 0000000..fd4f041
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/GameModeBase_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/GameStateBase_16x.png b/Content/Slate/Icons/AssetIcons/GameStateBase_16x.png
new file mode 100644
index 0000000..85ecdcc
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/GameStateBase_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/HUD_16x.png b/Content/Slate/Icons/AssetIcons/HUD_16x.png
new file mode 100644
index 0000000..dd430c1
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/HUD_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Interface_16x.png b/Content/Slate/Icons/AssetIcons/Interface_16x.png
new file mode 100644
index 0000000..6f80e6c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Interface_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/InterpData_16x.png b/Content/Slate/Icons/AssetIcons/InterpData_16x.png
new file mode 100644
index 0000000..937e324
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/InterpData_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/KillZVolume_16x.png b/Content/Slate/Icons/AssetIcons/KillZVolume_16x.png
new file mode 100644
index 0000000..a46650b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/KillZVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LandscapeBlueprintBrushBase_16x.png b/Content/Slate/Icons/AssetIcons/LandscapeBlueprintBrushBase_16x.png
new file mode 100644
index 0000000..25bd0e2
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LandscapeBlueprintBrushBase_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Landscape_16x.png b/Content/Slate/Icons/AssetIcons/Landscape_16x.png
new file mode 100644
index 0000000..5e1313b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Landscape_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LevelBounds_16x.png b/Content/Slate/Icons/AssetIcons/LevelBounds_16x.png
new file mode 100644
index 0000000..c048550
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LevelBounds_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LevelInstance_16x.png b/Content/Slate/Icons/AssetIcons/LevelInstance_16x.png
new file mode 100644
index 0000000..2a944f4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LevelInstance_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LevelSequenceActor_16x.png b/Content/Slate/Icons/AssetIcons/LevelSequenceActor_16x.png
new file mode 100644
index 0000000..e734c5f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LevelSequenceActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LevelSequence_16x.png b/Content/Slate/Icons/AssetIcons/LevelSequence_16x.png
new file mode 100644
index 0000000..e734c5f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LevelSequence_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LevelStreamingVolume_16x.png b/Content/Slate/Icons/AssetIcons/LevelStreamingVolume_16x.png
new file mode 100644
index 0000000..c0fa192
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LevelStreamingVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LightmassCharacterIndirectDetailVolume_16x.png b/Content/Slate/Icons/AssetIcons/LightmassCharacterIndirectDetailVolume_16x.png
new file mode 100644
index 0000000..6272147
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LightmassCharacterIndirectDetailVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/LightmassImportanceVolume_16x.png b/Content/Slate/Icons/AssetIcons/LightmassImportanceVolume_16x.png
new file mode 100644
index 0000000..44dac8c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/LightmassImportanceVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MassiveLODOverrideVolume_16x.png b/Content/Slate/Icons/AssetIcons/MassiveLODOverrideVolume_16x.png
new file mode 100644
index 0000000..18621df
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MassiveLODOverrideVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MaterialFunction_16x.png b/Content/Slate/Icons/AssetIcons/MaterialFunction_16x.png
new file mode 100644
index 0000000..a526f3f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MaterialFunction_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MaterialInstanceActor_16x.png b/Content/Slate/Icons/AssetIcons/MaterialInstanceActor_16x.png
new file mode 100644
index 0000000..6d67345
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MaterialInstanceActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MaterialInstanceConstant_16x.png b/Content/Slate/Icons/AssetIcons/MaterialInstanceConstant_16x.png
new file mode 100644
index 0000000..ba1e97b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MaterialInstanceConstant_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MaterialParameterCollection_16x.png b/Content/Slate/Icons/AssetIcons/MaterialParameterCollection_16x.png
new file mode 100644
index 0000000..5408c71
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MaterialParameterCollection_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Material_16x.png b/Content/Slate/Icons/AssetIcons/Material_16x.png
new file mode 100644
index 0000000..fb06f6c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Material_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MediaPlayer_16x.png b/Content/Slate/Icons/AssetIcons/MediaPlayer_16x.png
new file mode 100644
index 0000000..49c15bd
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MediaPlayer_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MediaTexture_16x.png b/Content/Slate/Icons/AssetIcons/MediaTexture_16x.png
new file mode 100644
index 0000000..7ed5b26
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MediaTexture_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/MultiFont_16x.png b/Content/Slate/Icons/AssetIcons/MultiFont_16x.png
new file mode 100644
index 0000000..733bb1b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/MultiFont_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/NavLinkProxy_16x.png b/Content/Slate/Icons/AssetIcons/NavLinkProxy_16x.png
new file mode 100644
index 0000000..6021289
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/NavLinkProxy_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/NavMeshBoundsVolume_16x.png b/Content/Slate/Icons/AssetIcons/NavMeshBoundsVolume_16x.png
new file mode 100644
index 0000000..de22f27
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/NavMeshBoundsVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/NavModifierComponent_16x.png b/Content/Slate/Icons/AssetIcons/NavModifierComponent_16x.png
new file mode 100644
index 0000000..9baef89
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/NavModifierComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/NavModifierVolume_16x.png b/Content/Slate/Icons/AssetIcons/NavModifierVolume_16x.png
new file mode 100644
index 0000000..5bc0cff
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/NavModifierVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/NavigationTrainingActor_16x.png b/Content/Slate/Icons/AssetIcons/NavigationTrainingActor_16x.png
new file mode 100644
index 0000000..3c2a93f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/NavigationTrainingActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/NiagaraActor_16x.png b/Content/Slate/Icons/AssetIcons/NiagaraActor_16x.png
new file mode 100644
index 0000000..8a71565
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/NiagaraActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Note_16x.png b/Content/Slate/Icons/AssetIcons/Note_16x.png
new file mode 100644
index 0000000..9be6e00
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Note_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ObjectLibrary_16x.png b/Content/Slate/Icons/AssetIcons/ObjectLibrary_16x.png
new file mode 100644
index 0000000..ae85b29
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ObjectLibrary_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PainCausingVolume_16x.png b/Content/Slate/Icons/AssetIcons/PainCausingVolume_16x.png
new file mode 100644
index 0000000..3b2e880
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PainCausingVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ParticleSystem_16x.png b/Content/Slate/Icons/AssetIcons/ParticleSystem_16x.png
new file mode 100644
index 0000000..44b9bbe
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ParticleSystem_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PawnNoiseEmitterComponent_16x.png b/Content/Slate/Icons/AssetIcons/PawnNoiseEmitterComponent_16x.png
new file mode 100644
index 0000000..3784309
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PawnNoiseEmitterComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PawnSensingComponent_16x.png b/Content/Slate/Icons/AssetIcons/PawnSensingComponent_16x.png
new file mode 100644
index 0000000..5f080c8
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PawnSensingComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Pawn_16x.png b/Content/Slate/Icons/AssetIcons/Pawn_16x.png
new file mode 100644
index 0000000..ed6a0fc
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Pawn_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicalMaterial_16x.png b/Content/Slate/Icons/AssetIcons/PhysicalMaterial_16x.png
new file mode 100644
index 0000000..c37fbac
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicalMaterial_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicsAsset_16x.png b/Content/Slate/Icons/AssetIcons/PhysicsAsset_16x.png
new file mode 100644
index 0000000..18e90a6
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicsAsset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicsConstraintActor_16x.png b/Content/Slate/Icons/AssetIcons/PhysicsConstraintActor_16x.png
new file mode 100644
index 0000000..fb9edea
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicsConstraintActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicsConstraintComponent_16x.png b/Content/Slate/Icons/AssetIcons/PhysicsConstraintComponent_16x.png
new file mode 100644
index 0000000..20f84fe
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicsConstraintComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicsHandleComponent_16x.png b/Content/Slate/Icons/AssetIcons/PhysicsHandleComponent_16x.png
new file mode 100644
index 0000000..a0a480e
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicsHandleComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicsThrusterComponent_16x.png b/Content/Slate/Icons/AssetIcons/PhysicsThrusterComponent_16x.png
new file mode 100644
index 0000000..4a5b93c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicsThrusterComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicsThruster_16x.png b/Content/Slate/Icons/AssetIcons/PhysicsThruster_16x.png
new file mode 100644
index 0000000..cfcf9d5
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicsThruster_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PhysicsVolume_16x.png b/Content/Slate/Icons/AssetIcons/PhysicsVolume_16x.png
new file mode 100644
index 0000000..90fefa8
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PhysicsVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PlaneReflectionCapture_16x.png b/Content/Slate/Icons/AssetIcons/PlaneReflectionCapture_16x.png
new file mode 100644
index 0000000..55355a4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PlaneReflectionCapture_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Plane_16x.png b/Content/Slate/Icons/AssetIcons/Plane_16x.png
new file mode 100644
index 0000000..0f33297
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Plane_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PlatformMediaSource_16x.png b/Content/Slate/Icons/AssetIcons/PlatformMediaSource_16x.png
new file mode 100644
index 0000000..cdca4f0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PlatformMediaSource_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PlayerController_16x.png b/Content/Slate/Icons/AssetIcons/PlayerController_16x.png
new file mode 100644
index 0000000..364fd45
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PlayerController_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PlayerStart_16x.png b/Content/Slate/Icons/AssetIcons/PlayerStart_16x.png
new file mode 100644
index 0000000..929fabc
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PlayerStart_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PointLight_16x.png b/Content/Slate/Icons/AssetIcons/PointLight_16x.png
new file mode 100644
index 0000000..755dc7c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PointLight_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PoseAsset_16x.png b/Content/Slate/Icons/AssetIcons/PoseAsset_16x.png
new file mode 100644
index 0000000..64b56ff
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PoseAsset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PostProcessVolume_16x.png b/Content/Slate/Icons/AssetIcons/PostProcessVolume_16x.png
new file mode 100644
index 0000000..9b7c4b1
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PostProcessVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PrecomputedVisibilityOverrideVolume_16x.png b/Content/Slate/Icons/AssetIcons/PrecomputedVisibilityOverrideVolume_16x.png
new file mode 100644
index 0000000..73abf35
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PrecomputedVisibilityOverrideVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/PrecomputedVisibilityVolume_16x.png b/Content/Slate/Icons/AssetIcons/PrecomputedVisibilityVolume_16x.png
new file mode 100644
index 0000000..955ca3b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/PrecomputedVisibilityVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ProceduralFoliageBlockingVolume_16x.png b/Content/Slate/Icons/AssetIcons/ProceduralFoliageBlockingVolume_16x.png
new file mode 100644
index 0000000..7a068e5
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ProceduralFoliageBlockingVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ProceduralFoliageVolume_16x.png b/Content/Slate/Icons/AssetIcons/ProceduralFoliageVolume_16x.png
new file mode 100644
index 0000000..f728922
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ProceduralFoliageVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Procedural_Foliage_Spawner_16x.png b/Content/Slate/Icons/AssetIcons/Procedural_Foliage_Spawner_16x.png
new file mode 100644
index 0000000..6f473b0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Procedural_Foliage_Spawner_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ProjectileMovementComponent_16x.png b/Content/Slate/Icons/AssetIcons/ProjectileMovementComponent_16x.png
new file mode 100644
index 0000000..61bca11
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ProjectileMovementComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/RadialForceActor_16x.png b/Content/Slate/Icons/AssetIcons/RadialForceActor_16x.png
new file mode 100644
index 0000000..edf626f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/RadialForceActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/RadialForceComponent_16x.png b/Content/Slate/Icons/AssetIcons/RadialForceComponent_16x.png
new file mode 100644
index 0000000..56bc27c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/RadialForceComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ReflectionCapture_16x.png b/Content/Slate/Icons/AssetIcons/ReflectionCapture_16x.png
new file mode 100644
index 0000000..5624ccd
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ReflectionCapture_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/ReverbEffect_16x.png b/Content/Slate/Icons/AssetIcons/ReverbEffect_16x.png
new file mode 100644
index 0000000..28cb17e
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/ReverbEffect_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/RotatingMovementComponent_16x.png b/Content/Slate/Icons/AssetIcons/RotatingMovementComponent_16x.png
new file mode 100644
index 0000000..852e2a7
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/RotatingMovementComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SceneCapture2D_16x.png b/Content/Slate/Icons/AssetIcons/SceneCapture2D_16x.png
new file mode 100644
index 0000000..8050e4e
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SceneCapture2D_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SceneCaptureCube_16x.png b/Content/Slate/Icons/AssetIcons/SceneCaptureCube_16x.png
new file mode 100644
index 0000000..5b71b27
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SceneCaptureCube_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SceneComponent_16x.png b/Content/Slate/Icons/AssetIcons/SceneComponent_16x.png
new file mode 100644
index 0000000..81127fa
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SceneComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SkeletalMeshNeedSkinning_16x.png b/Content/Slate/Icons/AssetIcons/SkeletalMeshNeedSkinning_16x.png
new file mode 100644
index 0000000..a6df39b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SkeletalMeshNeedSkinning_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SkeletalMesh_16x.png b/Content/Slate/Icons/AssetIcons/SkeletalMesh_16x.png
new file mode 100644
index 0000000..80a40c4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SkeletalMesh_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Skeleton_16x.png b/Content/Slate/Icons/AssetIcons/Skeleton_16x.png
new file mode 100644
index 0000000..3e7fef4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Skeleton_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SkyAtmosphere_16x.png b/Content/Slate/Icons/AssetIcons/SkyAtmosphere_16x.png
new file mode 100644
index 0000000..24c1cad
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SkyAtmosphere_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SkyLightComponent_16x.png b/Content/Slate/Icons/AssetIcons/SkyLightComponent_16x.png
new file mode 100644
index 0000000..0cb6f5f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SkyLightComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SkyLight_16x.png b/Content/Slate/Icons/AssetIcons/SkyLight_16x.png
new file mode 100644
index 0000000..299cfbc
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SkyLight_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SlateBrushAsset_16x.png b/Content/Slate/Icons/AssetIcons/SlateBrushAsset_16x.png
new file mode 100644
index 0000000..ef2e547
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SlateBrushAsset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SlateWidgetStyleAsset_16x.png b/Content/Slate/Icons/AssetIcons/SlateWidgetStyleAsset_16x.png
new file mode 100644
index 0000000..268aaff
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SlateWidgetStyleAsset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundAttenuation_16x.png b/Content/Slate/Icons/AssetIcons/SoundAttenuation_16x.png
new file mode 100644
index 0000000..88043f6
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundAttenuation_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundClass_16x.png b/Content/Slate/Icons/AssetIcons/SoundClass_16x.png
new file mode 100644
index 0000000..e736bf1
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundClass_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundConcurrency_16x.png b/Content/Slate/Icons/AssetIcons/SoundConcurrency_16x.png
new file mode 100644
index 0000000..850b4f3
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundConcurrency_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundCue_16x.png b/Content/Slate/Icons/AssetIcons/SoundCue_16x.png
new file mode 100644
index 0000000..92df11d
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundCue_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundGenericIcon_1_16x.png b/Content/Slate/Icons/AssetIcons/SoundGenericIcon_1_16x.png
new file mode 100644
index 0000000..eb4fc88
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundGenericIcon_1_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundGenericIcon_2_16x.png b/Content/Slate/Icons/AssetIcons/SoundGenericIcon_2_16x.png
new file mode 100644
index 0000000..7404de4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundGenericIcon_2_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundMix_16x.png b/Content/Slate/Icons/AssetIcons/SoundMix_16x.png
new file mode 100644
index 0000000..0f6b946
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundMix_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundSourceBus_16x.png b/Content/Slate/Icons/AssetIcons/SoundSourceBus_16x.png
new file mode 100644
index 0000000..8e66812
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundSourceBus_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SoundSubmix_16x.png b/Content/Slate/Icons/AssetIcons/SoundSubmix_16x.png
new file mode 100644
index 0000000..50fe0d3
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SoundSubmix_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SourceEffectPresetChain_1_16x.png b/Content/Slate/Icons/AssetIcons/SourceEffectPresetChain_1_16x.png
new file mode 100644
index 0000000..d011cc4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SourceEffectPresetChain_1_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SourceEffectPresetChain_2_16x.png b/Content/Slate/Icons/AssetIcons/SourceEffectPresetChain_2_16x.png
new file mode 100644
index 0000000..4abee5e
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SourceEffectPresetChain_2_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SourceEffectPreset_16x.png b/Content/Slate/Icons/AssetIcons/SourceEffectPreset_16x.png
new file mode 100644
index 0000000..56989e3
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SourceEffectPreset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SpectatorPawn_16x.png b/Content/Slate/Icons/AssetIcons/SpectatorPawn_16x.png
new file mode 100644
index 0000000..78319b0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SpectatorPawn_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SphereReflectionCapture_16x.png b/Content/Slate/Icons/AssetIcons/SphereReflectionCapture_16x.png
new file mode 100644
index 0000000..5c9c7ad
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SphereReflectionCapture_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Sphere_16x.png b/Content/Slate/Icons/AssetIcons/Sphere_16x.png
new file mode 100644
index 0000000..a37d4c2
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Sphere_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SpotLightMovable_16x.png b/Content/Slate/Icons/AssetIcons/SpotLightMovable_16x.png
new file mode 100644
index 0000000..72b6ea1
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SpotLightMovable_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SpotLightStatic_16x.png b/Content/Slate/Icons/AssetIcons/SpotLightStatic_16x.png
new file mode 100644
index 0000000..8b87adc
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SpotLightStatic_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SpotLightStationary_16x.png b/Content/Slate/Icons/AssetIcons/SpotLightStationary_16x.png
new file mode 100644
index 0000000..15bac0e
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SpotLightStationary_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SpotLight_16x.png b/Content/Slate/Icons/AssetIcons/SpotLight_16x.png
new file mode 100644
index 0000000..2f0ed42
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SpotLight_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SpringArmComponent_16x.png b/Content/Slate/Icons/AssetIcons/SpringArmComponent_16x.png
new file mode 100644
index 0000000..44b459f
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SpringArmComponent_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/StaticMesh_16x.png b/Content/Slate/Icons/AssetIcons/StaticMesh_16x.png
new file mode 100644
index 0000000..490e866
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/StaticMesh_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/StreamMediaSource_16x.png b/Content/Slate/Icons/AssetIcons/StreamMediaSource_16x.png
new file mode 100644
index 0000000..536909b
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/StreamMediaSource_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/StringTable_16x.png b/Content/Slate/Icons/AssetIcons/StringTable_16x.png
new file mode 100644
index 0000000..e571d4c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/StringTable_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SubmixEffectPreset_16x.png b/Content/Slate/Icons/AssetIcons/SubmixEffectPreset_16x.png
new file mode 100644
index 0000000..9d77238
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SubmixEffectPreset_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/SubsurfaceProfile_16x.png b/Content/Slate/Icons/AssetIcons/SubsurfaceProfile_16x.png
new file mode 100644
index 0000000..2fd20d0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/SubsurfaceProfile_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TargetPoint_16x.png b/Content/Slate/Icons/AssetIcons/TargetPoint_16x.png
new file mode 100644
index 0000000..614b955
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TargetPoint_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TextRenderActor_16x.png b/Content/Slate/Icons/AssetIcons/TextRenderActor_16x.png
new file mode 100644
index 0000000..95a1c51
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TextRenderActor_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/Texture2D_16x.png b/Content/Slate/Icons/AssetIcons/Texture2D_16x.png
new file mode 100644
index 0000000..287b272
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/Texture2D_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TextureRenderTarget2D_16x.png b/Content/Slate/Icons/AssetIcons/TextureRenderTarget2D_16x.png
new file mode 100644
index 0000000..d7c2c50
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TextureRenderTarget2D_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TextureRenderTargetCube_16x.png b/Content/Slate/Icons/AssetIcons/TextureRenderTargetCube_16x.png
new file mode 100644
index 0000000..61a1bcf
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TextureRenderTargetCube_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TouchInterface_16x.png b/Content/Slate/Icons/AssetIcons/TouchInterface_16x.png
new file mode 100644
index 0000000..2a7a0b6
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TouchInterface_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TriggerBase_16x.png b/Content/Slate/Icons/AssetIcons/TriggerBase_16x.png
new file mode 100644
index 0000000..7c22c4c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TriggerBase_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TriggerBox_16x.png b/Content/Slate/Icons/AssetIcons/TriggerBox_16x.png
new file mode 100644
index 0000000..7c5a9fc
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TriggerBox_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TriggerCapsule_16x.png b/Content/Slate/Icons/AssetIcons/TriggerCapsule_16x.png
new file mode 100644
index 0000000..a6f33f9
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TriggerCapsule_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TriggerSphere_16x.png b/Content/Slate/Icons/AssetIcons/TriggerSphere_16x.png
new file mode 100644
index 0000000..6e445b4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TriggerSphere_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/TriggerVolume_16x.png b/Content/Slate/Icons/AssetIcons/TriggerVolume_16x.png
new file mode 100644
index 0000000..ba736ce
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/TriggerVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/UserDefinedCaptureProtocol_16x.png b/Content/Slate/Icons/AssetIcons/UserDefinedCaptureProtocol_16x.png
new file mode 100644
index 0000000..a229e0d
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/UserDefinedCaptureProtocol_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/UserDefinedEnum_16x.png b/Content/Slate/Icons/AssetIcons/UserDefinedEnum_16x.png
new file mode 100644
index 0000000..e571d4c
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/UserDefinedEnum_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/UserDefinedStruct_16x.png b/Content/Slate/Icons/AssetIcons/UserDefinedStruct_16x.png
new file mode 100644
index 0000000..e2e75f4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/UserDefinedStruct_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/UserWidget_16x.png b/Content/Slate/Icons/AssetIcons/UserWidget_16x.png
new file mode 100644
index 0000000..8f78cc0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/UserWidget_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/VolumetricCloud_16x.png b/Content/Slate/Icons/AssetIcons/VolumetricCloud_16x.png
new file mode 100644
index 0000000..3bd6494
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/VolumetricCloud_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/VolumetricLightmapDensityVolume_16x.png b/Content/Slate/Icons/AssetIcons/VolumetricLightmapDensityVolume_16x.png
new file mode 100644
index 0000000..6272147
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/VolumetricLightmapDensityVolume_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/WidgetBlueprintGeneratedClass_16x.png b/Content/Slate/Icons/AssetIcons/WidgetBlueprintGeneratedClass_16x.png
new file mode 100644
index 0000000..8f78cc0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/WidgetBlueprintGeneratedClass_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/WidgetBlueprint_16x.png b/Content/Slate/Icons/AssetIcons/WidgetBlueprint_16x.png
new file mode 100644
index 0000000..8f78cc0
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/WidgetBlueprint_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/WindDirectionalSource_16x.png b/Content/Slate/Icons/AssetIcons/WindDirectionalSource_16x.png
new file mode 100644
index 0000000..57378d2
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/WindDirectionalSource_16x.png differ
diff --git a/Content/Slate/Icons/AssetIcons/World_16x.png b/Content/Slate/Icons/AssetIcons/World_16x.png
new file mode 100644
index 0000000..2a944f4
Binary files /dev/null and b/Content/Slate/Icons/AssetIcons/World_16x.png differ
diff --git a/Content/Slate/Icons/Cross_12x.png b/Content/Slate/Icons/Cross_12x.png
new file mode 100644
index 0000000..c6f9186
Binary files /dev/null and b/Content/Slate/Icons/Cross_12x.png differ
diff --git a/Content/Slate/Icons/EmptyStar_16x.png b/Content/Slate/Icons/EmptyStar_16x.png
new file mode 100644
index 0000000..23f807d
Binary files /dev/null and b/Content/Slate/Icons/EmptyStar_16x.png differ
diff --git a/Content/Slate/Icons/Mobility/Adjustable_16x.png b/Content/Slate/Icons/Mobility/Adjustable_16x.png
new file mode 100644
index 0000000..8eb7ded
Binary files /dev/null and b/Content/Slate/Icons/Mobility/Adjustable_16x.png differ
diff --git a/Content/Slate/Icons/Mobility/Movable_16x.png b/Content/Slate/Icons/Mobility/Movable_16x.png
new file mode 100644
index 0000000..c937ce4
Binary files /dev/null and b/Content/Slate/Icons/Mobility/Movable_16x.png differ
diff --git a/Content/Slate/Icons/Mobility/Static_16x.png b/Content/Slate/Icons/Mobility/Static_16x.png
new file mode 100644
index 0000000..1aca2d5
Binary files /dev/null and b/Content/Slate/Icons/Mobility/Static_16x.png differ
diff --git a/Content/Slate/Icons/PlusSymbol_12x.png b/Content/Slate/Icons/PlusSymbol_12x.png
new file mode 100644
index 0000000..aa574f1
Binary files /dev/null and b/Content/Slate/Icons/PlusSymbol_12x.png differ
diff --git a/Content/Slate/Icons/StatusInfo_16x.png b/Content/Slate/Icons/StatusInfo_16x.png
new file mode 100644
index 0000000..cd1a365
Binary files /dev/null and b/Content/Slate/Icons/StatusInfo_16x.png differ
diff --git a/Content/Slate/Icons/ellipsis_12x.png b/Content/Slate/Icons/ellipsis_12x.png
new file mode 100644
index 0000000..ccdc227
Binary files /dev/null and b/Content/Slate/Icons/ellipsis_12x.png differ
diff --git a/Content/Slate/Icons/icon_Blueprint_Enum_16x.png b/Content/Slate/Icons/icon_Blueprint_Enum_16x.png
new file mode 100644
index 0000000..284ed66
Binary files /dev/null and b/Content/Slate/Icons/icon_Blueprint_Enum_16x.png differ
diff --git a/Content/Slate/Icons/icon_Docs_16x.png b/Content/Slate/Icons/icon_Docs_16x.png
new file mode 100644
index 0000000..042893a
Binary files /dev/null and b/Content/Slate/Icons/icon_Docs_16x.png differ
diff --git a/Content/Slate/Icons/icon_PropertyMatrix_16px.png b/Content/Slate/Icons/icon_PropertyMatrix_16px.png
new file mode 100644
index 0000000..8f8e045
Binary files /dev/null and b/Content/Slate/Icons/icon_PropertyMatrix_16px.png differ
diff --git a/Content/Slate/Icons/icon_RestoreFromImmersive_16px.png b/Content/Slate/Icons/icon_RestoreFromImmersive_16px.png
new file mode 100644
index 0000000..a6bb65e
Binary files /dev/null and b/Content/Slate/Icons/icon_RestoreFromImmersive_16px.png differ
diff --git a/Content/Slate/Icons/icon_file_choosepackages_16px.png b/Content/Slate/Icons/icon_file_choosepackages_16px.png
new file mode 100644
index 0000000..e4e3671
Binary files /dev/null and b/Content/Slate/Icons/icon_file_choosepackages_16px.png differ
diff --git a/Content/Slate/Icons/icon_tab_SelectionDetails_16x.png b/Content/Slate/Icons/icon_tab_SelectionDetails_16x.png
new file mode 100644
index 0000000..bc43245
Binary files /dev/null and b/Content/Slate/Icons/icon_tab_SelectionDetails_16x.png differ
diff --git a/Content/Slate/Icons/icon_world_16x.png b/Content/Slate/Icons/icon_world_16x.png
new file mode 100644
index 0000000..f5bf1ff
Binary files /dev/null and b/Content/Slate/Icons/icon_world_16x.png differ
diff --git a/Content/Slate/Icons/levels_16x.png b/Content/Slate/Icons/levels_16x.png
new file mode 100644
index 0000000..2019058
Binary files /dev/null and b/Content/Slate/Icons/levels_16x.png differ
diff --git a/Content/Slate/Icons/pillarray_12x.png b/Content/Slate/Icons/pillarray_12x.png
new file mode 100644
index 0000000..20481fc
Binary files /dev/null and b/Content/Slate/Icons/pillarray_12x.png differ
diff --git a/Content/Slate/Icons/toolbar_expand_16x.png b/Content/Slate/Icons/toolbar_expand_16x.png
new file mode 100644
index 0000000..e8a953b
Binary files /dev/null and b/Content/Slate/Icons/toolbar_expand_16x.png differ
diff --git a/Content/Slate/Old/Border.PNG b/Content/Slate/Old/Border.PNG
new file mode 100644
index 0000000..5f47b39
Binary files /dev/null and b/Content/Slate/Old/Border.PNG differ
diff --git a/Content/Slate/Old/Button.png b/Content/Slate/Old/Button.png
new file mode 100644
index 0000000..66340c8
Binary files /dev/null and b/Content/Slate/Old/Button.png differ
diff --git a/Content/Slate/Old/Button_Hovered.png b/Content/Slate/Old/Button_Hovered.png
new file mode 100644
index 0000000..e6921e7
Binary files /dev/null and b/Content/Slate/Old/Button_Hovered.png differ
diff --git a/Content/Slate/Old/Button_Pressed.png b/Content/Slate/Old/Button_Pressed.png
new file mode 100644
index 0000000..aa781b8
Binary files /dev/null and b/Content/Slate/Old/Button_Pressed.png differ
diff --git a/Content/Slate/Old/DashedBorder.png b/Content/Slate/Old/DashedBorder.png
new file mode 100644
index 0000000..46e9f23
Binary files /dev/null and b/Content/Slate/Old/DashedBorder.png differ
diff --git a/Content/Slate/Old/DebugBorder.PNG b/Content/Slate/Old/DebugBorder.PNG
new file mode 100644
index 0000000..b59edec
Binary files /dev/null and b/Content/Slate/Old/DebugBorder.PNG differ
diff --git a/Content/Slate/Old/Default.png b/Content/Slate/Old/Default.png
new file mode 100644
index 0000000..213e58a
Binary files /dev/null and b/Content/Slate/Old/Default.png differ
diff --git a/Content/Slate/Old/FilledBorder.PNG b/Content/Slate/Old/FilledBorder.PNG
new file mode 100644
index 0000000..cc272b9
Binary files /dev/null and b/Content/Slate/Old/FilledBorder.PNG differ
diff --git a/Content/Slate/Old/FilterCancel.png b/Content/Slate/Old/FilterCancel.png
new file mode 100644
index 0000000..25640a8
Binary files /dev/null and b/Content/Slate/Old/FilterCancel.png differ
diff --git a/Content/Slate/Old/FilterSearch.png b/Content/Slate/Old/FilterSearch.png
new file mode 100644
index 0000000..4a661e0
Binary files /dev/null and b/Content/Slate/Old/FilterSearch.png differ
diff --git a/Content/Slate/Old/Graph/Anim.png b/Content/Slate/Old/Graph/Anim.png
new file mode 100644
index 0000000..bc4a992
Binary files /dev/null and b/Content/Slate/Old/Graph/Anim.png differ
diff --git a/Content/Slate/Old/Graph/Arrow.PNG b/Content/Slate/Old/Graph/Arrow.PNG
new file mode 100644
index 0000000..fb3fa5d
Binary files /dev/null and b/Content/Slate/Old/Graph/Arrow.PNG differ
diff --git a/Content/Slate/Old/Graph/CommentBubble.png b/Content/Slate/Old/Graph/CommentBubble.png
new file mode 100644
index 0000000..f8be505
Binary files /dev/null and b/Content/Slate/Old/Graph/CommentBubble.png differ
diff --git a/Content/Slate/Old/Graph/CommentBubbleArrow.png b/Content/Slate/Old/Graph/CommentBubbleArrow.png
new file mode 100644
index 0000000..caa0aca
Binary files /dev/null and b/Content/Slate/Old/Graph/CommentBubbleArrow.png differ
diff --git a/Content/Slate/Old/Graph/ConvertIcon.png b/Content/Slate/Old/Graph/ConvertIcon.png
new file mode 100644
index 0000000..eab8d6f
Binary files /dev/null and b/Content/Slate/Old/Graph/ConvertIcon.png differ
diff --git a/Content/Slate/Old/Graph/ExecPin_Connected.png b/Content/Slate/Old/Graph/ExecPin_Connected.png
new file mode 100644
index 0000000..f7b66d0
Binary files /dev/null and b/Content/Slate/Old/Graph/ExecPin_Connected.png differ
diff --git a/Content/Slate/Old/Graph/ExecPin_Disconnected.png b/Content/Slate/Old/Graph/ExecPin_Disconnected.png
new file mode 100644
index 0000000..c4fe799
Binary files /dev/null and b/Content/Slate/Old/Graph/ExecPin_Disconnected.png differ
diff --git a/Content/Slate/Old/Graph/ExecutionBubble.png b/Content/Slate/Old/Graph/ExecutionBubble.png
new file mode 100644
index 0000000..1c09c3a
Binary files /dev/null and b/Content/Slate/Old/Graph/ExecutionBubble.png differ
diff --git a/Content/Slate/Old/Graph/Feedback_ConnectViaCast.png b/Content/Slate/Old/Graph/Feedback_ConnectViaCast.png
new file mode 100644
index 0000000..6dd4cff
Binary files /dev/null and b/Content/Slate/Old/Graph/Feedback_ConnectViaCast.png differ
diff --git a/Content/Slate/Old/Graph/Feedback_Error.png b/Content/Slate/Old/Graph/Feedback_Error.png
new file mode 100644
index 0000000..d465c4c
Binary files /dev/null and b/Content/Slate/Old/Graph/Feedback_Error.png differ
diff --git a/Content/Slate/Old/Graph/Feedback_NewNode.png b/Content/Slate/Old/Graph/Feedback_NewNode.png
new file mode 100644
index 0000000..9ce2af2
Binary files /dev/null and b/Content/Slate/Old/Graph/Feedback_NewNode.png differ
diff --git a/Content/Slate/Old/Graph/Feedback_OK.png b/Content/Slate/Old/Graph/Feedback_OK.png
new file mode 100644
index 0000000..a5d633b
Binary files /dev/null and b/Content/Slate/Old/Graph/Feedback_OK.png differ
diff --git a/Content/Slate/Old/Graph/Feedback_OKWarn.png b/Content/Slate/Old/Graph/Feedback_OKWarn.png
new file mode 100644
index 0000000..456c850
Binary files /dev/null and b/Content/Slate/Old/Graph/Feedback_OKWarn.png differ
diff --git a/Content/Slate/Old/Graph/GraphBackground.PNG b/Content/Slate/Old/Graph/GraphBackground.PNG
new file mode 100644
index 0000000..31f8f9a
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphBackground.PNG differ
diff --git a/Content/Slate/Old/Graph/GraphBackground_Slate.PNG b/Content/Slate/Old/Graph/GraphBackground_Slate.PNG
new file mode 100644
index 0000000..7d30ff1
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphBackground_Slate.PNG differ
diff --git a/Content/Slate/Old/Graph/GraphBackground_Stone.PNG b/Content/Slate/Old/Graph/GraphBackground_Stone.PNG
new file mode 100644
index 0000000..7c1c4a1
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphBackground_Stone.PNG differ
diff --git a/Content/Slate/Old/Graph/GraphTitleBackground.png b/Content/Slate/Old/Graph/GraphTitleBackground.png
new file mode 100644
index 0000000..8d33024
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphTitleBackground.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Animation.png b/Content/Slate/Old/Graph/GraphType_Animation.png
new file mode 100644
index 0000000..420b270
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Animation.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Event.png b/Content/Slate/Old/Graph/GraphType_Event.png
new file mode 100644
index 0000000..f4d30fd
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Event.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Function.png b/Content/Slate/Old/Graph/GraphType_Function.png
new file mode 100644
index 0000000..036e36d
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Function.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_FunctionOL_Interface.png b/Content/Slate/Old/Graph/GraphType_FunctionOL_Interface.png
new file mode 100644
index 0000000..259c37e
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_FunctionOL_Interface.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_FunctionOL_New.png b/Content/Slate/Old/Graph/GraphType_FunctionOL_New.png
new file mode 100644
index 0000000..0ed05a4
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_FunctionOL_New.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_FunctionOL_Override.png b/Content/Slate/Old/Graph/GraphType_FunctionOL_Override.png
new file mode 100644
index 0000000..02e6ce3
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_FunctionOL_Override.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_FunctionOL_PotOverride.png b/Content/Slate/Old/Graph/GraphType_FunctionOL_PotOverride.png
new file mode 100644
index 0000000..6aa65ab
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_FunctionOL_PotOverride.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Macro.png b/Content/Slate/Old/Graph/GraphType_Macro.png
new file mode 100644
index 0000000..04a8005
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Macro.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Node.png b/Content/Slate/Old/Graph/GraphType_Node.png
new file mode 100644
index 0000000..eeb9d09
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Node.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_SCS.png b/Content/Slate/Old/Graph/GraphType_SCS.png
new file mode 100644
index 0000000..9bd9f43
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_SCS.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Subgraph.png b/Content/Slate/Old/Graph/GraphType_Subgraph.png
new file mode 100644
index 0000000..facd3f0
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Subgraph.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Timeline.png b/Content/Slate/Old/Graph/GraphType_Timeline.png
new file mode 100644
index 0000000..b6c8c74
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Timeline.png differ
diff --git a/Content/Slate/Old/Graph/GraphType_Ubergraph.png b/Content/Slate/Old/Graph/GraphType_Ubergraph.png
new file mode 100644
index 0000000..6b09ff6
Binary files /dev/null and b/Content/Slate/Old/Graph/GraphType_Ubergraph.png differ
diff --git a/Content/Slate/Old/Graph/Literal_Connected.png b/Content/Slate/Old/Graph/Literal_Connected.png
new file mode 100644
index 0000000..8de095f
Binary files /dev/null and b/Content/Slate/Old/Graph/Literal_Connected.png differ
diff --git a/Content/Slate/Old/Graph/Literal_Disconnected.png b/Content/Slate/Old/Graph/Literal_Disconnected.png
new file mode 100644
index 0000000..23ad4c7
Binary files /dev/null and b/Content/Slate/Old/Graph/Literal_Disconnected.png differ
diff --git a/Content/Slate/Old/Graph/NodeBackground.PNG b/Content/Slate/Old/Graph/NodeBackground.PNG
new file mode 100644
index 0000000..3c8af3f
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeBackground.PNG differ
diff --git a/Content/Slate/Old/Graph/NodeEntryBottom.png b/Content/Slate/Old/Graph/NodeEntryBottom.png
new file mode 100644
index 0000000..f0ba6df
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeEntryBottom.png differ
diff --git a/Content/Slate/Old/Graph/NodeEntryShadow.png b/Content/Slate/Old/Graph/NodeEntryShadow.png
new file mode 100644
index 0000000..8d34bd6
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeEntryShadow.png differ
diff --git a/Content/Slate/Old/Graph/NodeEntryShadowSelected.png b/Content/Slate/Old/Graph/NodeEntryShadowSelected.png
new file mode 100644
index 0000000..a5baa5e
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeEntryShadowSelected.png differ
diff --git a/Content/Slate/Old/Graph/NodeEntryTop.png b/Content/Slate/Old/Graph/NodeEntryTop.png
new file mode 100644
index 0000000..ff297e0
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeEntryTop.png differ
diff --git a/Content/Slate/Old/Graph/NodeExitBottom.png b/Content/Slate/Old/Graph/NodeExitBottom.png
new file mode 100644
index 0000000..8c24662
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeExitBottom.png differ
diff --git a/Content/Slate/Old/Graph/NodeExitShadow.png b/Content/Slate/Old/Graph/NodeExitShadow.png
new file mode 100644
index 0000000..80aca2d
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeExitShadow.png differ
diff --git a/Content/Slate/Old/Graph/NodeExitShadowSelected.png b/Content/Slate/Old/Graph/NodeExitShadowSelected.png
new file mode 100644
index 0000000..c56d0fa
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeExitShadowSelected.png differ
diff --git a/Content/Slate/Old/Graph/NodeExitTop.png b/Content/Slate/Old/Graph/NodeExitTop.png
new file mode 100644
index 0000000..88bfbd1
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeExitTop.png differ
diff --git a/Content/Slate/Old/Graph/NodeShadow.png b/Content/Slate/Old/Graph/NodeShadow.png
new file mode 100644
index 0000000..6f0b5b8
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeShadow.png differ
diff --git a/Content/Slate/Old/Graph/NodeShadowSelected.PNG b/Content/Slate/Old/Graph/NodeShadowSelected.PNG
new file mode 100644
index 0000000..10822eb
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeShadowSelected.PNG differ
diff --git a/Content/Slate/Old/Graph/NodeTitleBackground.png b/Content/Slate/Old/Graph/NodeTitleBackground.png
new file mode 100644
index 0000000..0b5d830
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeTitleBackground.png differ
diff --git a/Content/Slate/Old/Graph/NodeVerticalSeparator.png b/Content/Slate/Old/Graph/NodeVerticalSeparator.png
new file mode 100644
index 0000000..da97758
Binary files /dev/null and b/Content/Slate/Old/Graph/NodeVerticalSeparator.png differ
diff --git a/Content/Slate/Old/Graph/PinBackgroundHover.png b/Content/Slate/Old/Graph/PinBackgroundHover.png
new file mode 100644
index 0000000..e8a620f
Binary files /dev/null and b/Content/Slate/Old/Graph/PinBackgroundHover.png differ
diff --git a/Content/Slate/Old/Graph/Pin_Connected.png b/Content/Slate/Old/Graph/Pin_Connected.png
new file mode 100644
index 0000000..c98b595
Binary files /dev/null and b/Content/Slate/Old/Graph/Pin_Connected.png differ
diff --git a/Content/Slate/Old/Graph/Pin_Disconnected.png b/Content/Slate/Old/Graph/Pin_Disconnected.png
new file mode 100644
index 0000000..8c5b830
Binary files /dev/null and b/Content/Slate/Old/Graph/Pin_Disconnected.png differ
diff --git a/Content/Slate/Old/Graph/Pin_ObjectEmpty.png b/Content/Slate/Old/Graph/Pin_ObjectEmpty.png
new file mode 100644
index 0000000..d63421c
Binary files /dev/null and b/Content/Slate/Old/Graph/Pin_ObjectEmpty.png differ
diff --git a/Content/Slate/Old/Graph/Pin_ObjectSet.png b/Content/Slate/Old/Graph/Pin_ObjectSet.png
new file mode 100644
index 0000000..eaa0322
Binary files /dev/null and b/Content/Slate/Old/Graph/Pin_ObjectSet.png differ
diff --git a/Content/Slate/Old/Graph/PosePin_Connected.png b/Content/Slate/Old/Graph/PosePin_Connected.png
new file mode 100644
index 0000000..f7b66d0
Binary files /dev/null and b/Content/Slate/Old/Graph/PosePin_Connected.png differ
diff --git a/Content/Slate/Old/Graph/PosePin_Disconnected.png b/Content/Slate/Old/Graph/PosePin_Disconnected.png
new file mode 100644
index 0000000..c4fe799
Binary files /dev/null and b/Content/Slate/Old/Graph/PosePin_Disconnected.png differ
diff --git a/Content/Slate/Old/Graph/VarNodeBackground.png b/Content/Slate/Old/Graph/VarNodeBackground.png
new file mode 100644
index 0000000..ddc513d
Binary files /dev/null and b/Content/Slate/Old/Graph/VarNodeBackground.png differ
diff --git a/Content/Slate/Old/Graph/VarNodeBorder.png b/Content/Slate/Old/Graph/VarNodeBorder.png
new file mode 100644
index 0000000..a947275
Binary files /dev/null and b/Content/Slate/Old/Graph/VarNodeBorder.png differ
diff --git a/Content/Slate/Old/Graph/VarNodeShadow.png b/Content/Slate/Old/Graph/VarNodeShadow.png
new file mode 100644
index 0000000..2801362
Binary files /dev/null and b/Content/Slate/Old/Graph/VarNodeShadow.png differ
diff --git a/Content/Slate/Old/Graph/VarNodeShadowSelected.png b/Content/Slate/Old/Graph/VarNodeShadowSelected.png
new file mode 100644
index 0000000..319ed21
Binary files /dev/null and b/Content/Slate/Old/Graph/VarNodeShadowSelected.png differ
diff --git a/Content/Slate/Old/Graph/VariableTypeIcon.png b/Content/Slate/Old/Graph/VariableTypeIcon.png
new file mode 100644
index 0000000..cf53280
Binary files /dev/null and b/Content/Slate/Old/Graph/VariableTypeIcon.png differ
diff --git a/Content/Slate/Old/Graph/WatchedPinIcon.png b/Content/Slate/Old/Graph/WatchedPinIcon.png
new file mode 100644
index 0000000..7d5c39a
Binary files /dev/null and b/Content/Slate/Old/Graph/WatchedPinIcon.png differ
diff --git a/Content/Slate/Old/Graph/WatchedPinIcon_Pinned.png b/Content/Slate/Old/Graph/WatchedPinIcon_Pinned.png
new file mode 100644
index 0000000..6fb2bfd
Binary files /dev/null and b/Content/Slate/Old/Graph/WatchedPinIcon_Pinned.png differ
diff --git a/Content/Slate/Old/Graph/map.PNG b/Content/Slate/Old/Graph/map.PNG
new file mode 100644
index 0000000..10f8ae2
Binary files /dev/null and b/Content/Slate/Old/Graph/map.PNG differ
diff --git a/Content/Slate/Old/GridButton.png b/Content/Slate/Old/GridButton.png
new file mode 100644
index 0000000..987be10
Binary files /dev/null and b/Content/Slate/Old/GridButton.png differ
diff --git a/Content/Slate/Old/HyperlinkDotted.png b/Content/Slate/Old/HyperlinkDotted.png
new file mode 100644
index 0000000..bd1795a
Binary files /dev/null and b/Content/Slate/Old/HyperlinkDotted.png differ
diff --git a/Content/Slate/Old/HyperlinkUnderline.png b/Content/Slate/Old/HyperlinkUnderline.png
new file mode 100644
index 0000000..5987faf
Binary files /dev/null and b/Content/Slate/Old/HyperlinkUnderline.png differ
diff --git a/Content/Slate/Old/MenuBar_Background.png b/Content/Slate/Old/MenuBar_Background.png
new file mode 100644
index 0000000..7cd9503
Binary files /dev/null and b/Content/Slate/Old/MenuBar_Background.png differ
diff --git a/Content/Slate/Old/Menu_Background.png b/Content/Slate/Old/Menu_Background.png
new file mode 100644
index 0000000..81b3dab
Binary files /dev/null and b/Content/Slate/Old/Menu_Background.png differ
diff --git a/Content/Slate/Old/White.png b/Content/Slate/Old/White.png
new file mode 100644
index 0000000..5800230
Binary files /dev/null and b/Content/Slate/Old/White.png differ
diff --git a/Content/Slate/Old/Window/ViewportDebugBorder.png b/Content/Slate/Old/Window/ViewportDebugBorder.png
new file mode 100644
index 0000000..7614bb6
Binary files /dev/null and b/Content/Slate/Old/Window/ViewportDebugBorder.png differ
diff --git a/Content/Slate/Old/Window/WindowBackground.png b/Content/Slate/Old/Window/WindowBackground.png
new file mode 100644
index 0000000..3e6d7b4
Binary files /dev/null and b/Content/Slate/Old/Window/WindowBackground.png differ
diff --git a/Content/Slate/Old/Window/WindowBorder.png b/Content/Slate/Old/Window/WindowBorder.png
new file mode 100644
index 0000000..e69f5ff
Binary files /dev/null and b/Content/Slate/Old/Window/WindowBorder.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Close_Hovered.png b/Content/Slate/Old/Window/WindowButton_Close_Hovered.png
new file mode 100644
index 0000000..00f495a
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Close_Hovered.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Close_Normal.png b/Content/Slate/Old/Window/WindowButton_Close_Normal.png
new file mode 100644
index 0000000..8ad24ab
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Close_Normal.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Close_Pressed.png b/Content/Slate/Old/Window/WindowButton_Close_Pressed.png
new file mode 100644
index 0000000..e48fd4a
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Close_Pressed.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Maximize_Disabled.png b/Content/Slate/Old/Window/WindowButton_Maximize_Disabled.png
new file mode 100644
index 0000000..ea96433
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Maximize_Disabled.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Maximize_Hovered.png b/Content/Slate/Old/Window/WindowButton_Maximize_Hovered.png
new file mode 100644
index 0000000..f83a02b
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Maximize_Hovered.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Maximize_Normal.png b/Content/Slate/Old/Window/WindowButton_Maximize_Normal.png
new file mode 100644
index 0000000..70c038e
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Maximize_Normal.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Maximize_Pressed.png b/Content/Slate/Old/Window/WindowButton_Maximize_Pressed.png
new file mode 100644
index 0000000..d1726a8
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Maximize_Pressed.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Minimize_Disabled.png b/Content/Slate/Old/Window/WindowButton_Minimize_Disabled.png
new file mode 100644
index 0000000..4dcf40f
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Minimize_Disabled.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Minimize_Hovered.png b/Content/Slate/Old/Window/WindowButton_Minimize_Hovered.png
new file mode 100644
index 0000000..6a71b38
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Minimize_Hovered.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Minimize_Normal.png b/Content/Slate/Old/Window/WindowButton_Minimize_Normal.png
new file mode 100644
index 0000000..ff2d87a
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Minimize_Normal.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Minimize_Pressed.png b/Content/Slate/Old/Window/WindowButton_Minimize_Pressed.png
new file mode 100644
index 0000000..2bf4d3f
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Minimize_Pressed.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Restore_Hovered.png b/Content/Slate/Old/Window/WindowButton_Restore_Hovered.png
new file mode 100644
index 0000000..f2fe51f
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Restore_Hovered.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Restore_Normal.png b/Content/Slate/Old/Window/WindowButton_Restore_Normal.png
new file mode 100644
index 0000000..f600b3a
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Restore_Normal.png differ
diff --git a/Content/Slate/Old/Window/WindowButton_Restore_Pressed.png b/Content/Slate/Old/Window/WindowButton_Restore_Pressed.png
new file mode 100644
index 0000000..3bb3cd7
Binary files /dev/null and b/Content/Slate/Old/Window/WindowButton_Restore_Pressed.png differ
diff --git a/Content/Slate/Old/Window/WindowOutline.png b/Content/Slate/Old/Window/WindowOutline.png
new file mode 100644
index 0000000..8548d69
Binary files /dev/null and b/Content/Slate/Old/Window/WindowOutline.png differ
diff --git a/Content/Slate/Old/Window/WindowTitle.png b/Content/Slate/Old/Window/WindowTitle.png
new file mode 100644
index 0000000..08c5b6d
Binary files /dev/null and b/Content/Slate/Old/Window/WindowTitle.png differ
diff --git a/Content/Slate/Old/Window/WindowTitle_Flashing.png b/Content/Slate/Old/Window/WindowTitle_Flashing.png
new file mode 100644
index 0000000..22adfa9
Binary files /dev/null and b/Content/Slate/Old/Window/WindowTitle_Flashing.png differ
diff --git a/Content/Slate/Old/Window/WindowTitle_Inactive.png b/Content/Slate/Old/Window/WindowTitle_Inactive.png
new file mode 100644
index 0000000..93cb717
Binary files /dev/null and b/Content/Slate/Old/Window/WindowTitle_Inactive.png differ
diff --git a/Content/Slate/PropertyView/AdvancedButton_Down.png b/Content/Slate/PropertyView/AdvancedButton_Down.png
new file mode 100644
index 0000000..5ed07fb
Binary files /dev/null and b/Content/Slate/PropertyView/AdvancedButton_Down.png differ
diff --git a/Content/Slate/PropertyView/AdvancedButton_Down_Hovered.png b/Content/Slate/PropertyView/AdvancedButton_Down_Hovered.png
new file mode 100644
index 0000000..1b2dcbc
Binary files /dev/null and b/Content/Slate/PropertyView/AdvancedButton_Down_Hovered.png differ
diff --git a/Content/Slate/PropertyView/AdvancedButton_Up.png b/Content/Slate/PropertyView/AdvancedButton_Up.png
new file mode 100644
index 0000000..3f68772
Binary files /dev/null and b/Content/Slate/PropertyView/AdvancedButton_Up.png differ
diff --git a/Content/Slate/PropertyView/AdvancedButton_Up_Hovered.png b/Content/Slate/PropertyView/AdvancedButton_Up_Hovered.png
new file mode 100644
index 0000000..bf4a9d8
Binary files /dev/null and b/Content/Slate/PropertyView/AdvancedButton_Up_Hovered.png differ
diff --git a/Content/Slate/PropertyView/CategoryBackground.png b/Content/Slate/PropertyView/CategoryBackground.png
new file mode 100644
index 0000000..02bceec
Binary files /dev/null and b/Content/Slate/PropertyView/CategoryBackground.png differ
diff --git a/Content/Slate/PropertyView/DetailCategoryAdvanced.png b/Content/Slate/PropertyView/DetailCategoryAdvanced.png
new file mode 100644
index 0000000..add6e1e
Binary files /dev/null and b/Content/Slate/PropertyView/DetailCategoryAdvanced.png differ
diff --git a/Content/Slate/PropertyView/DetailCategoryBottom.png b/Content/Slate/PropertyView/DetailCategoryBottom.png
new file mode 100644
index 0000000..682e908
Binary files /dev/null and b/Content/Slate/PropertyView/DetailCategoryBottom.png differ
diff --git a/Content/Slate/PropertyView/DetailCategoryMiddle.png b/Content/Slate/PropertyView/DetailCategoryMiddle.png
new file mode 100644
index 0000000..95e97a7
Binary files /dev/null and b/Content/Slate/PropertyView/DetailCategoryMiddle.png differ
diff --git a/Content/Slate/PropertyView/DetailCategoryMiddle_Hovered.png b/Content/Slate/PropertyView/DetailCategoryMiddle_Hovered.png
new file mode 100644
index 0000000..d86efd4
Binary files /dev/null and b/Content/Slate/PropertyView/DetailCategoryMiddle_Hovered.png differ
diff --git a/Content/Slate/PropertyView/DetailCategoryTop.png b/Content/Slate/PropertyView/DetailCategoryTop.png
new file mode 100644
index 0000000..fd4042b
Binary files /dev/null and b/Content/Slate/PropertyView/DetailCategoryTop.png differ
diff --git a/Content/Slate/PropertyView/DiffersFromDefault_8x8.png b/Content/Slate/PropertyView/DiffersFromDefault_8x8.png
new file mode 100644
index 0000000..d54ed3e
Binary files /dev/null and b/Content/Slate/PropertyView/DiffersFromDefault_8x8.png differ
diff --git a/Content/Slate/PropertyView/EarlyAccessClassWarning.png b/Content/Slate/PropertyView/EarlyAccessClassWarning.png
new file mode 100644
index 0000000..9fa58e0
Binary files /dev/null and b/Content/Slate/PropertyView/EarlyAccessClassWarning.png differ
diff --git a/Content/Slate/PropertyView/ExperimentalClassWarning.png b/Content/Slate/PropertyView/ExperimentalClassWarning.png
new file mode 100644
index 0000000..83032b7
Binary files /dev/null and b/Content/Slate/PropertyView/ExperimentalClassWarning.png differ
diff --git a/Content/Slate/PropertyView/Favorites_Disabled.png b/Content/Slate/PropertyView/Favorites_Disabled.png
new file mode 100644
index 0000000..12e44fd
Binary files /dev/null and b/Content/Slate/PropertyView/Favorites_Disabled.png differ
diff --git a/Content/Slate/PropertyView/Favorites_Enabled.png b/Content/Slate/PropertyView/Favorites_Enabled.png
new file mode 100644
index 0000000..4e461fc
Binary files /dev/null and b/Content/Slate/PropertyView/Favorites_Enabled.png differ
diff --git a/Content/Slate/PropertyView/HazardTape.png b/Content/Slate/PropertyView/HazardTape.png
new file mode 100644
index 0000000..8d4b313
Binary files /dev/null and b/Content/Slate/PropertyView/HazardTape.png differ
diff --git a/Content/Slate/PropertyView/NoFavoritesSystem.png b/Content/Slate/PropertyView/NoFavoritesSystem.png
new file mode 100644
index 0000000..8cae924
Binary files /dev/null and b/Content/Slate/PropertyView/NoFavoritesSystem.png differ
diff --git a/Content/Slate/PropertyView/SlateBrushPreview_32px.png b/Content/Slate/PropertyView/SlateBrushPreview_32px.png
new file mode 100644
index 0000000..de6aa22
Binary files /dev/null and b/Content/Slate/PropertyView/SlateBrushPreview_32px.png differ
diff --git a/Content/Slate/PropertyView/SpeakerToTarget.png b/Content/Slate/PropertyView/SpeakerToTarget.png
new file mode 100644
index 0000000..4bb1ca3
Binary files /dev/null and b/Content/Slate/PropertyView/SpeakerToTarget.png differ
diff --git a/Content/Slate/SodaIcons/action.svg b/Content/Slate/SodaIcons/action.svg
new file mode 100644
index 0000000..673aba1
--- /dev/null
+++ b/Content/Slate/SodaIcons/action.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg4"
+   sodipodi:docname="Action.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#3b3f3e"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="361.06353"
+     inkscape:cy="508.90792"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 125.9475,174.43157 H 48.568294 v -63.83722 c 0,-16.933286 6.831819,-33.167396 18.990314,-45.142043 C 79.72192,53.482767 96.212679,46.75712 113.41327,46.75712 h 142.22665 z m 151.30494,0 L 406.94239,46.75712 H 317.02773 L 187.33778,174.43157 Z m 151.30494,0 L 558.24733,46.75712 H 468.33267 L 338.64272,174.43157 Z M 614.22399,52.082968 489.94396,174.43157 H 653.7856 V 110.59435 C 653.73249,98.098055 649.95468,85.896026 642.92499,75.493598 635.8953,65.091536 625.91708,56.950405 614.23263,52.076889 Z M 48.565823,216.98971 H 653.7856 v 361.74427 c 0,16.93328 -6.83182,33.16739 -18.99032,45.14203 -12.16331,11.96954 -28.65406,18.69519 -45.85466,18.69519 H 113.4108 c -17.200591,0 -33.69098,-6.72565 -45.854662,-18.69519 C 55.397643,611.90173 48.565823,595.66726 48.565823,578.73398 Z M 264.71574,476.59442 c 0,11.28545 4.55459,22.11078 12.66021,30.09469 8.11044,7.97965 19.10642,12.46346 30.56978,12.46346 8.11525,-0.0379 16.05685,-2.3227 22.91312,-6.59749 L 441.3127,444.67605 c 12.71826,-7.76114 20.45643,-21.44566 20.45643,-36.17442 0,-14.72877 -7.73891,-28.41304 -20.45643,-36.17443 L 330.85885,304.44817 c -8.75209,-5.38628 -19.17311,-7.50945 -29.3828,-5.98951 -10.20438,1.51993 -19.52143,6.58326 -26.2616,14.27765 -6.74499,7.69463 -10.46981,17.51207 -10.49871,27.67252 z"
+     id="path2"
+     style="fill:#ffffff;stroke-width:1.22551" />
+  <path
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:2.88168;stroke-dasharray:2.88168, 8.64507"
+     d="m 300.3182,517.54277 c -13.81467,-2.63992 -26.7308,-13.36365 -31.85768,-26.45014 -2.59802,-6.63151 -2.76753,-11.74875 -2.76753,-83.54797 v -76.48379 l 4.05168,-8.12244 c 4.40054,-8.8218 10.72596,-15.07437 20.31258,-20.07871 4.85735,-2.53559 8.54525,-3.20577 17.74872,-3.22539 10.2321,-0.0218 12.56975,0.49149 19.60432,4.30453 20.92058,11.33985 115.918,70.65597 120.94109,75.51529 8.48281,8.20622 11.87385,16.64246 11.866,29.52012 -0.006,8.82508 -0.6901,12.00942 -3.87017,17.99874 -2.12499,4.00218 -6.09624,9.2065 -8.82499,11.56515 -6.19678,5.35629 -115.82603,72.94463 -123.74236,76.28933 -7.53818,3.18491 -15.92482,4.15553 -23.46166,2.71528 z"
+     id="path835" />
+</svg>
diff --git a/Content/Slate/SodaIcons/ai.svg b/Content/Slate/SodaIcons/ai.svg
new file mode 100644
index 0000000..8d61f34
--- /dev/null
+++ b/Content/Slate/SodaIcons/ai.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg166"
+   sodipodi:docname="AI.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata170">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#100e66"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview168"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="0.90214285"
+     inkscape:cx="464.31768"
+     inkscape:cy="380.72411"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg166"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v16.422h9.25v3.9844h-14.5z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h6.6875l4.6562 10.922 4.6719-10.922h6.6875v20.406h-4.9844v-14.938l-4.7031 11.016h-3.3281l-4.7031-11.016v14.938h-4.9844z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="m 74.886895,441.32722 c 3.827364,10.71329 21.427119,18.36747 55.098305,26.01728 3.05869,0.76333 4.59071,3.05869 4.59071,5.35937 -0.76333,42.85288 0.76332,115.55203 8.41807,127.79746 9.94994,16.8356 92.59849,41.321 123.20593,32.9032 l 12.2453,-3.82736 h 0.76333 c 88.77086,-27.54915 129.32933,-70.40339 137.74576,-102.5427 0.76333,-3.0587 3.82737,-4.59071 6.88606,-4.59071 3.0587,0.76333 4.59071,3.82737 3.82737,6.88606 -11.47663,44.38475 -63.51611,84.94322 -142.3373,109.42862 l -5.35937,51.27204 H 547.04479 C 517.19988,549.2237 543.21743,479.58556 571.53566,406.12115 589.13514,364.0308 602.1431,320.41404 609.79838,275.25994 620.51166,204.09403 608.26636,145.16808 572.29955,100.78197 511.07784,23.498118 397.05633,15.080321 396.29107,15.080321 c -0.76333,0 -203.55763,-19.1313558 -259.42119,135.451379 0,0.76332 -29.84492,116.32001 3.05869,162.2339 0.76333,1.53201 1.53201,3.82736 0.76333,5.35937 -13.00864,32.14068 -30.60744,62.75359 -52.034556,89.53475 C 76.417376,422.96344 71.827217,433.677 74.885501,441.33228 Z M 231.76402,234.70857 c -3.0587,0 -6.12272,-2.29535 -6.12272,-6.12272 0,-3.82736 2.29535,-6.12271 6.12272,-6.12271 h 22.18964 v -49.7388 h -22.18964 c -3.0587,0 -6.12272,-2.29535 -6.12272,-6.12271 0,-3.82737 2.29535,-6.12272 6.12272,-6.12272 h 22.18964 v -6.12272 c 0,-22.95899 18.36747,-41.321 41.32099,-41.321 h 6.12272 l 0.005,-20.663231 c 0,-3.058694 2.29535,-6.122717 6.12271,-6.122717 3.82737,0 6.12272,3.058694 6.12272,6.122717 V 114.5616 h 49.7388 V 92.371959 c 0,-3.058694 2.29535,-6.122717 6.12271,-6.122717 3.82737,0 5.35405,3.058694 5.35405,6.122717 V 114.5616 h 49.73879 l 0.005,-22.189641 c 0,-3.058694 2.29535,-6.122717 6.12272,-6.122717 3.82736,0 6.12271,2.295353 6.12271,6.122717 V 114.5616 h 6.12272 c 22.959,0 41.321,18.36747 41.321,41.321 v 6.12272 h 22.18964 c 3.05869,0 6.12272,2.29535 6.12272,6.12271 0,3.82737 -2.29536,6.12272 -6.12272,6.12272 h -22.959 v 49.7388 h 22.18964 c 3.0587,0 6.12272,2.29535 6.12272,6.12271 0,3.82737 -2.29535,6.12272 -6.12272,6.12272 h -22.18964 v 49.73879 h 22.18964 c 3.0587,0 6.12272,2.29536 6.12272,6.12272 0,3.82737 -2.29535,6.12272 -6.12272,6.12272 h -22.18964 v 6.12272 c 0,22.95899 -18.36746,41.32099 -41.32099,41.32099 h -6.12272 v 22.18964 c 0,3.0587 -2.29535,6.12272 -6.12272,6.12272 -3.82736,0 -6.12271,-2.29535 -6.12271,-6.12272 V 345.66292 H 374.099 v 22.18964 c 0,3.0587 -2.29535,6.12272 -6.12272,6.12272 -3.82736,0 -6.12271,-2.29535 -6.12271,-6.12272 v -22.18964 l -48.20692,0.005 v 22.18964 c 0,3.05869 -2.29535,6.12272 -6.12272,6.12272 -3.82736,0 -6.12272,-2.29536 -6.12272,-6.12272 v -22.18964 h -6.12271 c -22.959,0 -41.321,-18.36747 -41.321,-41.321 v -6.12272 h -22.95899 c -3.0587,0 -6.12272,-2.29535 -6.12272,-6.12271 0,-3.82737 2.29535,-6.12272 6.12272,-6.12272 h 22.18964 v -49.73879 z"
+     id="path70"
+     style="fill:#ffffff;stroke-width:1.36653" />
+  <path
+     d="m 295.28012,331.89586 h 146.16356 c 16.8356,0 29.84492,-13.77184 29.84492,-29.84491 V 155.88738 c 0,-16.83559 -13.77185,-29.84492 -29.84492,-29.84492 H 295.28012 c -16.83559,0 -29.84492,13.77185 -29.84492,29.84492 v 146.16357 c 0,16.83559 13.77185,29.84491 29.84492,29.84491 z"
+     id="path72"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.36653" />
+</svg>
diff --git a/Content/Slate/SodaIcons/aruco.svg b/Content/Slate/SodaIcons/aruco.svg
new file mode 100644
index 0000000..ccc3b95
--- /dev/null
+++ b/Content/Slate/SodaIcons/aruco.svg
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg146"
+   sodipodi:docname="ArUco.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata150">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview148"
+     showgrid="false"
+     inkscape:zoom="0.90214286"
+     inkscape:cx="679.8584"
+     inkscape:cy="460.93817"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg146" />
+  <defs
+     id="defs62">
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m19.547-1.1719c-1.0117 0.52344-2.0625 0.91406-3.1562 1.1719-1.0938 0.26953-2.2344 0.40625-3.4219 0.40625-3.543 0-6.3516-0.98828-8.4219-2.9688-2.0625-1.9766-3.0938-4.6602-3.0938-8.0469 0-3.4062 1.0312-6.0977 3.0938-8.0781 2.0703-1.9766 4.8789-2.9688 8.4219-2.9688 1.1875 0 2.3281 0.13672 3.4219 0.40625 1.0938 0.26172 2.1445 0.65625 3.1562 1.1875v4.3906c-1.0234-0.6875-2.0273-1.1914-3.0156-1.5156-0.98047-0.32031-2.0156-0.48438-3.1094-0.48438-1.9609 0-3.5 0.625-4.625 1.875-1.1172 1.25-1.6719 2.9805-1.6719 5.1875 0 2.1875 0.55469 3.9141 1.6719 5.1719 1.125 1.25 2.6641 1.875 4.625 1.875 1.0938 0 2.1289-0.16016 3.1094-0.48438 0.98828-0.32031 1.9922-0.82812 3.0156-1.5156z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m14.297-11.609c-0.44922-0.20703-0.89062-0.35938-1.3281-0.45312-0.4375-0.10156-0.88281-0.15625-1.3281-0.15625-1.3125 0-2.3242 0.42188-3.0312 1.2656-0.71094 0.83594-1.0625 2.0391-1.0625 3.6094v7.3438h-5.0938v-15.953h5.0938v2.625c0.65625-1.0508 1.4062-1.8164 2.25-2.2969 0.85156-0.47656 1.875-0.71875 3.0625-0.71875 0.17578 0 0.36328 0.011719 0.5625 0.03125 0.19531 0.011719 0.48438 0.042969 0.85938 0.09375z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m18.375-8.0156v1.4531h-11.922c0.125 1.1992 0.55469 2.0938 1.2969 2.6875 0.73828 0.59375 1.7734 0.89062 3.1094 0.89062 1.0703 0 2.1719-0.15625 3.2969-0.46875 1.125-0.32031 2.2812-0.80469 3.4688-1.4531v3.9375c-1.2109 0.46094-2.418 0.80469-3.625 1.0312-1.2109 0.22656-2.4141 0.34375-3.6094 0.34375-2.8984 0-5.1484-0.72656-6.75-2.1875-1.5938-1.4688-2.3906-3.5312-2.3906-6.1875 0-2.5938 0.78516-4.6328 2.3594-6.125 1.5703-1.5 3.7344-2.25 6.4844-2.25 2.5078 0 4.5156 0.75781 6.0156 2.2656 1.5078 1.5117 2.2656 3.5312 2.2656 6.0625zm-5.2344-1.7031c0-0.96875-0.28906-1.75-0.85938-2.3438-0.5625-0.59375-1.2969-0.89062-2.2031-0.89062-0.99219 0-1.7969 0.28125-2.4219 0.84375-0.61719 0.55469-0.99609 1.3516-1.1406 2.3906z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m9.5938-7.1719c-1.0625 0-1.8672 0.18359-2.4062 0.54688-0.53125 0.35547-0.79688 0.88281-0.79688 1.5781 0 0.64844 0.21094 1.1523 0.64062 1.5156 0.4375 0.36719 1.0391 0.54688 1.8125 0.54688 0.95703 0 1.7656-0.34375 2.4219-1.0312s0.98438-1.5469 0.98438-2.5781v-0.57812zm7.7969-1.9375v9.1094h-5.1406v-2.3594c-0.6875 0.96875-1.4609 1.6719-2.3125 2.1094-0.85547 0.4375-1.8906 0.65625-3.1094 0.65625-1.6562 0-3-0.47656-4.0312-1.4375-1.0312-0.96875-1.5469-2.2188-1.5469-3.75 0-1.875 0.64062-3.25 1.9219-4.125 1.2891-0.875 3.3164-1.3125 6.0781-1.3125h3v-0.39062c0-0.8125-0.32031-1.4062-0.95312-1.7812-0.63672-0.375-1.6328-0.5625-2.9844-0.5625-1.0859 0-2.1016 0.10938-3.0469 0.32812-0.9375 0.21875-1.8086 0.54688-2.6094 0.98438v-3.8906c1.082-0.25781 2.1758-0.45703 3.2812-0.59375 1.1016-0.14453 2.207-0.21875 3.3125-0.21875 2.875 0 4.9453 0.57031 6.2188 1.7031 1.2812 1.1367 1.9219 2.9805 1.9219 5.5312z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m8.0156-20.484v4.5312h5.2656v3.6406h-5.2656v6.7656c0 0.74219 0.14453 1.2461 0.4375 1.5156 0.30078 0.26172 0.89062 0.39062 1.7656 0.39062h2.6094v3.6406h-4.3594c-2.0234 0-3.4531-0.41406-4.2969-1.25-0.83594-0.84375-1.25-2.2734-1.25-4.2969v-6.7656h-2.5312v-3.6406h2.5312v-4.5312z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m13.297-13.625v-8.5312h5.1406v22.156h-5.1406v-2.3125c-0.69922 0.94922-1.4688 1.6406-2.3125 2.0781-0.84375 0.42578-1.8242 0.64062-2.9375 0.64062-1.9688 0-3.5859-0.77344-4.8438-2.3281-1.2617-1.5625-1.8906-3.5781-1.8906-6.0469 0-2.457 0.62891-4.4688 1.8906-6.0312 1.2578-1.5625 2.875-2.3438 4.8438-2.3438 1.1016 0 2.0781 0.22656 2.9219 0.67188 0.85156 0.4375 1.6289 1.1211 2.3281 2.0469zm-3.3594 10.328c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031-1.0859 0-1.9141 0.40234-2.4844 1.2031-0.57422 0.80469-0.85938 1.9609-0.85938 3.4688 0 1.5234 0.28516 2.6836 0.85938 3.4844 0.57031 0.79297 1.3984 1.1875 2.4844 1.1875z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.938-3.2969c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031s-1.9336 0.40234-2.5156 1.2031c-0.58594 0.80469-0.875 1.9609-0.875 3.4688 0 1.5117 0.28906 2.668 0.875 3.4688 0.58203 0.80469 1.4219 1.2031 2.5156 1.2031zm-3.3906-10.328c0.70703-0.92578 1.4883-1.6094 2.3438-2.0469 0.85156-0.44531 1.832-0.67188 2.9375-0.67188 1.9688 0 3.582 0.78125 4.8438 2.3438 1.2695 1.5625 1.9062 3.5742 1.9062 6.0312 0 2.4688-0.63672 4.4844-1.9062 6.0469-1.2617 1.5547-2.875 2.3281-4.8438 2.3281-1.1055 0-2.0859-0.21875-2.9375-0.65625-0.85547-0.4375-1.6367-1.125-2.3438-2.0625v2.3125h-5.0938v-22.156h5.0938z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m0.35938-15.953h5.0938l4.2969 10.828 3.6406-10.828h5.0938l-6.7031 17.469c-0.67969 1.7695-1.4648 3.0078-2.3594 3.7188-0.89844 0.70703-2.0781 1.0625-3.5469 1.0625h-2.9531v-3.3438h1.5938c0.86328 0 1.4922-0.14062 1.8906-0.42188 0.39453-0.27344 0.70312-0.76562 0.92188-1.4844l0.14062-0.4375z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h6.125l7.7344 14.578v-14.578h5.2031v21.266h-6.125l-7.7344-14.594v14.594h-5.2031z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m10.047-12.688c-1.1367 0-2 0.40625-2.5938 1.2188s-0.89062 1.9805-0.89062 3.5c0 1.5312 0.29688 2.7031 0.89062 3.5156s1.457 1.2188 2.5938 1.2188c1.1016 0 1.9453-0.40625 2.5312-1.2188 0.59375-0.8125 0.89062-1.9844 0.89062-3.5156 0-1.5195-0.29688-2.6875-0.89062-3.5-0.58594-0.8125-1.4297-1.2188-2.5312-1.2188zm0-3.6562c2.7383 0 4.8789 0.74609 6.4219 2.2344 1.5391 1.4805 2.3125 3.5273 2.3125 6.1406 0 2.625-0.77344 4.6797-2.3125 6.1562-1.543 1.4805-3.6836 2.2188-6.4219 2.2188-2.7617 0-4.918-0.73828-6.4688-2.2188-1.5547-1.4766-2.3281-3.5312-2.3281-6.1562 0-2.6133 0.77344-4.6602 2.3281-6.1406 1.5508-1.4883 3.707-2.2344 6.4688-2.2344z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m15.344-15.453v4.1562c-0.69922-0.46875-1.3984-0.81641-2.0938-1.0469-0.69922-0.22656-1.4219-0.34375-2.1719-0.34375-1.4297 0-2.5391 0.41797-3.3281 1.25-0.79297 0.82422-1.1875 1.9805-1.1875 3.4688 0 1.5 0.39453 2.668 1.1875 3.5 0.78906 0.82422 1.8984 1.2344 3.3281 1.2344 0.80078 0 1.5547-0.11719 2.2656-0.35938 0.71875-0.23828 1.3828-0.58594 2-1.0469v4.1719c-0.80469 0.29297-1.6172 0.50781-2.4375 0.65625-0.8125 0.14453-1.6367 0.21875-2.4688 0.21875-2.875 0-5.125-0.73438-6.75-2.2031-1.625-1.4766-2.4375-3.5352-2.4375-6.1719 0-2.625 0.8125-4.6758 2.4375-6.1562 1.625-1.4766 3.875-2.2188 6.75-2.2188 0.83203 0 1.6562 0.078125 2.4688 0.23438 0.8125 0.14844 1.625 0.36719 2.4375 0.65625z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.4531-15.953h5.0938v15.953h-5.0938zm0-6.2031h5.0938v4.1562h-5.0938z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4375c0-1.375-0.03125-2.3203-0.09375-2.8438-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-15.953h5.0938v2.3281c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m14.906-15.453v3.875c-1.0859-0.45703-2.1367-0.80078-3.1562-1.0312-1.0117-0.22656-1.9688-0.34375-2.875-0.34375-0.96875 0-1.6875 0.125-2.1562 0.375-0.46875 0.24219-0.70312 0.60938-0.70312 1.1094 0 0.40625 0.17578 0.71875 0.53125 0.9375 0.35156 0.21875 0.99219 0.38281 1.9219 0.48438l0.89062 0.14062c2.6133 0.32422 4.3672 0.86719 5.2656 1.625 0.90625 0.76172 1.3594 1.9531 1.3594 3.5781 0 1.6992-0.63281 2.9766-1.8906 3.8281-1.25 0.85547-3.1211 1.2812-5.6094 1.2812-1.0547 0-2.1406-0.085938-3.2656-0.25-1.125-0.15625-2.2812-0.39844-3.4688-0.73438v-3.875c1.0195 0.49219 2.0625 0.85938 3.125 1.1094 1.0703 0.24219 2.1602 0.35938 3.2656 0.35938 0.98828 0 1.7344-0.13281 2.2344-0.40625 0.50781-0.26953 0.76562-0.67578 0.76562-1.2188 0-0.45703-0.17969-0.79688-0.53125-1.0156-0.34375-0.22656-1.0312-0.40625-2.0625-0.53125l-0.89062-0.10938c-2.2734-0.28125-3.8672-0.80469-4.7812-1.5781-0.90625-0.76953-1.3594-1.9414-1.3594-3.5156 0-1.6875 0.57812-2.9375 1.7344-3.75 1.1562-0.82031 2.9297-1.2344 5.3281-1.2344 0.9375 0 1.9219 0.074219 2.9531 0.21875 1.0391 0.14844 2.1641 0.37109 3.375 0.67188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.953-22.156v3.3438h-2.8281c-0.71875 0-1.2266 0.13281-1.5156 0.39062-0.28125 0.26172-0.42188 0.71484-0.42188 1.3594v1.1094h4.3594v3.6406h-4.3594v12.312h-5.0938v-12.312h-2.5312v-3.6406h2.5312v-1.1094c0-1.7383 0.48438-3.0195 1.4531-3.8438 0.96875-0.83203 2.4688-1.25 4.5-1.25z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.234-13.297c0.64453-0.98828 1.4102-1.7422 2.2969-2.2656 0.89453-0.51953 1.875-0.78125 2.9375-0.78125 1.832 0 3.2266 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219v9.7188h-5.125v-8.3125-0.39062c0.007812-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.1328-0.16797-1.9531-0.5-2.4531-0.32422-0.50781-0.85938-0.76562-1.6094-0.76562-0.96875 0-1.7188 0.40234-2.25 1.2031-0.52344 0.79297-0.79297 1.9453-0.8125 3.4531v7.8281h-5.125v-8.3125c0-1.7695-0.15234-2.9062-0.45312-3.4062-0.30469-0.50781-0.84375-0.76562-1.625-0.76562-0.98047 0-1.7344 0.40234-2.2656 1.2031-0.53125 0.80469-0.79688 1.9492-0.79688 3.4375v7.8438h-5.125v-15.953h5.125v2.3281c0.625-0.89453 1.3438-1.5703 2.1562-2.0312 0.8125-0.45703 1.707-0.6875 2.6875-0.6875 1.1016 0 2.0781 0.26562 2.9219 0.79688s1.4844 1.2812 1.9219 2.25z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4062c0-1.3945-0.03125-2.3516-0.09375-2.875-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-22.156h5.0938v8.5312c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.2812-6.2031v-9.75h5.125v1.5938c0 0.86719-0.007812 1.9531-0.015625 3.2656-0.011719 1.3047-0.015625 2.1719-0.015625 2.6094 0 1.2812 0.03125 2.2031 0.09375 2.7656 0.070312 0.5625 0.1875 0.97656 0.34375 1.2344 0.21875 0.33594 0.49219 0.58984 0.82812 0.76562 0.33203 0.17969 0.71875 0.26562 1.1562 0.26562 1.0625 0 1.8945-0.40625 2.5-1.2188 0.61328-0.8125 0.92188-1.9453 0.92188-3.4062v-7.875h5.0938v15.953h-5.0938v-2.3125c-0.77344 0.9375-1.5898 1.625-2.4531 2.0625-0.85547 0.4375-1.7969 0.65625-2.8281 0.65625-1.8438 0-3.25-0.5625-4.2188-1.6875-0.96094-1.1328-1.4375-2.7734-1.4375-4.9219z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h9.1094c2.707 0 4.7852 0.60547 6.2344 1.8125 1.4453 1.1992 2.1719 2.9062 2.1719 5.125 0 2.2305-0.72656 3.9492-2.1719 5.1562-1.4492 1.1992-3.5273 1.7969-6.2344 1.7969h-3.625v7.375h-5.4844zm5.4844 3.9688v5.9375h3.0469c1.0625 0 1.8789-0.25391 2.4531-0.76562 0.58203-0.51953 0.875-1.2539 0.875-2.2031 0-0.94531-0.29297-1.6758-0.875-2.1875-0.57422-0.51953-1.3906-0.78125-2.4531-0.78125z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.4531-15.953h5.0938v15.672c0 2.1328-0.51562 3.7656-1.5469 4.8906-1.0234 1.125-2.5078 1.6875-4.4531 1.6875h-2.5156v-3.3438h0.89062c0.96875 0 1.6289-0.21875 1.9844-0.65625 0.36328-0.4375 0.54688-1.2969 0.54688-2.5781zm0-6.2031h5.0938v4.1562h-5.0938z"
+         id="path59" />
+    </symbol>
+  </defs>
+  <path
+     d="M 635.12377,47.499355 H 75.683833 c -3.903991,-0.0049 -7.650121,1.547817 -10.410474,4.30817 -2.760353,2.760353 -4.313091,6.506483 -4.308169,10.410474 V 621.65793 c -0.005,3.90399 1.547816,7.65012 4.308169,10.41048 2.760353,2.76035 6.506483,4.31309 10.410474,4.30817 H 635.12377 c 3.904,0.005 7.65013,-1.54782 10.41048,-4.30817 2.76035,-2.76036 4.31309,-6.50649 4.30817,-10.41048 V 62.217999 c 0.005,-3.903991 -1.54782,-7.650121 -4.30817,-10.410474 -2.76035,-2.760353 -6.50648,-4.313091 -10.41048,-4.30817 z M 620.40021,341.93279 H 487.90327 V 474.42973 H 620.40021 V 606.92667 H 487.90327 V 474.42973 H 355.40633 V 606.92667 H 222.90939 V 474.42973 H 90.412445 V 341.93279 H 222.90939 V 209.43585 H 90.412445 V 76.938914 H 222.90939 V 209.43585 H 355.40633 V 76.938914 H 487.90327 V 209.43585 h 132.49694 z"
+     id="path64"
+     style="stroke-width:1.26188;fill:#ffffff" />
+  <path
+     d="M 487.90327,209.43585 H 620.40021 V 341.93279 H 487.90327 Z"
+     id="path66"
+     style="stroke-width:1.26188;fill:#ffffff" />
+  <path
+     d="M 222.90939,209.43585 H 355.40633 V 341.93279 H 222.90939 Z"
+     id="path68"
+     style="stroke-width:1.26188;fill:#ffffff" />
+</svg>
diff --git a/Content/Slate/SodaIcons/bike.svg b/Content/Slate/SodaIcons/bike.svg
new file mode 100644
index 0000000..eab540c
--- /dev/null
+++ b/Content/Slate/SodaIcons/bike.svg
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg146"
+   sodipodi:docname="bike.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata150">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#363638"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview148"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="353.48361"
+     inkscape:cy="608.66943"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg146" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m14.953-3.7188h-8.2188l-1.3125 3.7188h-5.2812l7.5625-20.406h6.2656l7.5625 20.406h-5.2812zm-6.9062-3.7812h5.5781l-2.7812-8.125z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v21.281h-4.8906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m0.82812-20.406h5.0469l3.5312 14.828 3.5-14.828h5.0781l3.5 14.828 3.5156-14.828h5.0156l-4.8125 20.406h-6.0781l-3.7031-15.516-3.6562 15.516h-6.0781z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="m 463.15558,118.67658 c -0.95394,-0.0113 -1.90795,0.0607 -2.84527,0.22057 l -58.02064,0.23159 c -4.24038,-0.0552 -8.32633,1.59359 -11.34269,4.57678 -3.01072,2.98318 -4.69803,7.05262 -4.68152,11.293 0.0165,4.24038 1.73701,8.29881 4.77525,11.25997 3.03824,2.96117 7.13534,4.57678 11.37573,4.48304 l 49.67652,-0.19851 21.91266,57.12143 H 279.24363 v -13.29469 h 26.01061 l -0.006,0.006 c 4.24038,0.0717 8.33183,-1.56056 11.35921,-4.53259 3.02723,-2.97218 4.7312,-7.03611 4.7312,-11.27649 0,-4.24038 -1.70383,-8.30431 -4.7312,-11.282 -3.02723,-2.97218 -7.11883,-4.6043 -11.35921,-4.52708 h -39.23896 c -1.69282,-0.28122 -3.42432,-0.28122 -5.12265,0 h -39.27707 c -4.24039,-0.0772 -8.33184,1.55505 -11.35921,4.52708 -3.02723,2.97769 -4.73121,7.04162 -4.73121,11.282 0,4.24038 1.70383,8.30431 4.73121,11.27649 3.02723,2.97217 7.11882,4.6043 11.35921,4.53259 h 26.01061 v 22.82881 l -49.13728,44.6596 c -19.91098,-13.11274 -43.65028,-20.75514 -69.14142,-20.75514 -70.19591,0 -127.1677103,57.89924 -127.1677103,128.56805 0,70.74079 56.9774463,128.65132 127.1677103,128.65132 64.88537,0 118.46645,-49.48453 126.20216,-112.84253 h 79.55216 v 0.006 c 6.77143,1.03667 13.43797,-2.39864 16.52026,-8.5138 l 140.66567,-127.85093 7.17388,14.13319 c -33.74632,23.18172 -55.9639,62.31057 -55.9639,106.42387 0,70.75209 57.04379,128.65133 127.16771,128.65133 70.19591,0 127.16771,-57.90912 127.16771,-128.65133 0,-70.6688 -56.9718,-128.56804 -127.16771,-128.56804 -15.12557,0 -29.64414,2.69649 -43.11528,7.63153 L 511.4643,217.05811 478.62706,131.46136 c -0.82712,-3.92601 -3.10995,-7.38901 -6.39635,-9.68841 -0.20955,-0.1544 -0.42459,-0.30327 -0.64516,-0.44665 -0.0717,-0.044 -0.14336,-0.0882 -0.21505,-0.13227 -2.45382,-1.58257 -5.2991,-2.45383 -8.22159,-2.51439 z M 289.80795,239.28306 H 456.09746 L 341.80518,343.15894 Z m -30.39371,9.91991 52.39531,104.66922 h -56.27163 c -3.3361,-27.29519 -15.20321,-52.02122 -32.82595,-71.30968 l 36.70227,-33.3553 z M 129.33576,272.7263 c 16.21675,0 31.46372,4.05843 44.82476,11.23782 L 92.726659,357.9813 v 0.006 c -4.830442,4.38931 -6.462563,11.30402 -4.108113,17.39688 2.354592,6.08763 8.21058,10.10752 14.744434,10.10752 h 120.27474 c -7.38902,46.2745 -46.6994,81.22353 -94.29801,81.22353 -52.886554,0 -95.550116,-43.14211 -95.550116,-97.03233 0,-53.79564 42.663562,-96.95045 95.550116,-96.95045 z m 441.31653,0 c 52.88655,0 95.55012,43.1534 95.55012,96.95045 0,53.89023 -42.66357,97.03233 -95.55012,97.03233 -52.79762,0 -95.55012,-43.1534 -95.55012,-97.03233 0,-32.10319 15.23568,-60.42463 38.74771,-78.04172 l 43.17599,85.11115 0.006,0.006 c 1.85827,3.81026 5.16684,6.71073 9.18108,8.05615 4.01438,1.34545 8.40354,1.02563 12.18077,-0.88779 3.77723,-1.91896 6.6225,-5.26606 7.91287,-9.30233 1.28481,-4.0364 0.89329,-8.42006 -1.08077,-12.16426 l -43.26915,-85.29324 c 9.05981,-2.87845 18.69839,-4.42785 28.69553,-4.42785 z m -371.18697,30.9626 c 12.45647,13.63094 21.08122,30.92872 24.1628,50.17906 h -79.37148 z"
+     fill-rule="evenodd"
+     id="path70"
+     style="stroke-width:1.41163;fill:#ffffff" />
+</svg>
diff --git a/Content/Slate/SodaIcons/braking.svg b/Content/Slate/SodaIcons/braking.svg
new file mode 100644
index 0000000..ceff2da
--- /dev/null
+++ b/Content/Slate/SodaIcons/braking.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg157"
+   sodipodi:docname="braking.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata161">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#0024ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview159"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="513.70151"
+     inkscape:cy="449.37823"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg157"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs65">
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v20.406h-5.25z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v11.594l5.625-5.625h5.6875l-7.4688 7.0312 8.0625 8.2812h-5.9375l-5.9688-6.3906v6.3906h-4.8906z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     id="path67"
+     style="fill:#ffffff;stroke-width:1.75351"
+     d="m 466.31299,85.009883 c -267.69519,0 -447.857872,229.878357 -447.857872,417.978397 0,230.63786 187.606232,418.2461 418.226562,418.2461 227.93787,0 420.22459,-145.61776 420.22459,-443.30665 -51.45068,0 -15.99131,0.57618 -166.72658,0.57618 C 678.80929,359.24487 585.196,263.82175 466.27539,250.10938 c 0,-122.83394 0.0376,-125.79995 0.0376,-165.099497 z M 436.71094,305.05664 c 109.16238,0 197.95312,88.7995 197.95312,197.95313 0,109.13434 -88.77846,197.95312 -197.95312,197.95312 -109.14136,0 -197.95313,-88.80651 -197.95313,-197.95312 -0.007,-109.15538 88.7995,-197.95313 197.95313,-197.95313 z"
+     transform="scale(0.75000002)"
+     sodipodi:nodetypes="cccccccsscss" />
+  <path
+     d="m 327.53288,465.79845 c 48.82987,0 88.55404,-39.72502 88.55404,-88.55404 0,-48.82902 -39.72503,-88.55404 -88.55404,-88.55404 -48.82903,0 -88.55404,39.72502 -88.55404,88.55404 -0.007,48.82987 39.72501,88.55404 88.55404,88.55404 z"
+     id="path73"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:0.848462"
+     sodipodi:nodetypes="ssscs" />
+  <path
+     style="opacity:0.52809;fill:#ffffff;fill-opacity:0.5;stroke-width:1.17572;stroke-dasharray:1.17572, 3.52714"
+     d="m 517.22917,354.40193 c -0.97072,-10.7123 -4.67812,-26.87919 -9.09259,-39.65016 -22.50333,-65.10174 -78.31015,-113.0397 -146.04406,-125.45158 -4.46718,-0.81858 -8.88253,-1.48834 -9.81189,-1.48834 -0.92936,0 -1.84341,-0.24865 -2.03123,-0.55254 0,-48.99734 0.35351,-101.784564 0.35351,-155.096881 41.6516,2.029173 100.31892,20.445668 131.59834,35.798874 24.9866,12.463211 46.92853,26.800557 67.60344,44.173577 68.23288,57.33571 111.44538,138.19422 121.02628,226.46203 0.6317,5.81978 1.3093,12.76383 1.5058,15.43122 l 0.3573,4.84981 h -77.52963 -77.52966 z"
+     id="path875"
+     sodipodi:nodetypes="sssscccssscccs" />
+</svg>
diff --git a/Content/Slate/SodaIcons/bus.svg b/Content/Slate/SodaIcons/bus.svg
new file mode 100644
index 0000000..4a943b6
--- /dev/null
+++ b/Content/Slate/SodaIcons/bus.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg159"
+   sodipodi:docname="bus.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata163">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#363636"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview161"
+     showgrid="false"
+     inkscape:zoom="0.90214286"
+     inkscape:cx="466.66667"
+     inkscape:cy="466.66667"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg159" />
+  <defs
+     id="defs71">
+    <symbol
+       id="w"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m16.781-19.766v4.3125c-1.125-0.5-2.2266-0.875-3.2969-1.125-1.0625-0.25781-2.0703-0.39062-3.0156-0.39062-1.25 0-2.1797 0.17969-2.7812 0.53125-0.60547 0.34375-0.90625 0.88281-0.90625 1.6094 0 0.54297 0.20312 0.96875 0.60938 1.2812 0.40625 0.30469 1.1406 0.5625 2.2031 0.78125l2.25 0.45312c2.2695 0.44922 3.8789 1.1406 4.8281 2.0781 0.95703 0.92969 1.4375 2.2461 1.4375 3.9531 0 2.25-0.66797 3.9297-2 5.0312-1.3359 1.0938-3.3711 1.6406-6.1094 1.6406-1.3047 0-2.6055-0.125-3.9062-0.375-1.3047-0.23828-2.6055-0.59766-3.9062-1.0781v-4.4531c1.3008 0.69922 2.5625 1.2266 3.7812 1.5781 1.2188 0.34375 2.3906 0.51562 3.5156 0.51562 1.1562 0 2.0352-0.1875 2.6406-0.5625 0.61328-0.38281 0.92188-0.9375 0.92188-1.6562 0-0.63281-0.21094-1.125-0.625-1.4688-0.41797-0.34375-1.2461-0.65625-2.4844-0.9375l-2.0312-0.4375c-2.043-0.4375-3.5391-1.1328-4.4844-2.0938-0.9375-0.95703-1.4062-2.25-1.4062-3.875 0-2.0312 0.65625-3.5938 1.9688-4.6875s3.1953-1.6406 5.6562-1.6406c1.125 0 2.2734 0.085938 3.4531 0.25 1.1875 0.16797 2.4141 0.42188 3.6875 0.76562z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m14.953-3.7188h-8.2188l-1.3125 3.7188h-5.2812l7.5625-20.406h6.2656l7.5625 20.406h-5.2812zm-6.9062-3.7812h5.5781l-2.7812-8.125z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m0.82812-20.406h5.0469l3.5312 14.828 3.5-14.828h5.0781l3.5 14.828 3.5156-14.828h5.0156l-4.8125 20.406h-6.0781l-3.7031-15.516-3.6562 15.516h-6.0781z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m0.98438-15.312h4.7656l2.5625 10.547 2.5781-10.547h4.0938l2.5781 10.438 2.5781-10.438h4.75l-4.0312 15.312h-5.3438l-2.5781-10.531-2.5781 10.531h-5.3438z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path65" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path68" />
+    </symbol>
+  </defs>
+  <path
+     d="m 690.30427,152.34376 v 258.16726 c 0,25.92359 -21.0201,46.93531 -46.93532,46.93531 0,-45.29872 -36.8517,-82.14203 -82.14203,-82.14203 -45.29871,0 -82.14203,36.8517 -82.14203,82.14203 H 220.91763 c 0,-45.29872 -36.8517,-82.14203 -82.14203,-82.14203 -45.298714,0 -82.142032,36.8517 -82.142032,82.14203 H 33.165913 c -12.96599,0 -23.4676556,-10.51843 -23.4676556,-23.46766 V 175.81141 c 0,-25.92359 21.0200956,-46.93531 46.9353106,-46.93531 H 666.84709 c 12.96599,0 23.46765,10.50209 23.46765,23.46766 z M 173.96975,175.81141 H 56.620995 v 176.02314 c 117.348755,0 117.348755,-70.41345 117.348755,-70.41345 z m 140.81641,0 h -82.14203 v 93.8811 h 82.14203 z m 105.61807,0 h -82.14204 v 93.8811 h 82.14204 z m 105.60968,0 h -82.14203 v 93.8811 h 82.14203 z m 105.60969,0 h -82.14203 v 93.8811 h 82.14203 z"
+     id="path73"
+     style="fill:#ffffff;stroke-width:2.09551"
+     sodipodi:nodetypes="cscsccscsssssccccccccccccccccccccccccccc" />
+  <path
+     d="m 621.38852,460.00941 c 0,32.39873 -26.27564,58.67438 -58.67437,58.67438 -32.39874,0 -58.67438,-26.27565 -58.67438,-58.67438 0,-32.39873 26.27564,-58.67438 58.67438,-58.67438 32.39873,0 58.67437,26.27565 58.67437,58.67438 z m -481.1299,-58.67438 c -32.39873,0 -58.674366,26.27565 -58.674366,58.67438 0,32.39873 26.275636,58.67438 58.674366,58.67438 32.39874,0 58.67438,-26.27565 58.67438,-58.67438 0,-32.39873 -26.27564,-58.67438 -58.67438,-58.67438 z"
+     id="path73-9"
+     style="fill:#ffffff;stroke-width:2.09551;fill-opacity:0.5"
+     sodipodi:nodetypes="ssssssssss" />
+</svg>
diff --git a/Content/Slate/SodaIcons/camera.svg b/Content/Slate/SodaIcons/camera.svg
new file mode 100644
index 0000000..e384d5b
--- /dev/null
+++ b/Content/Slate/SodaIcons/camera.svg
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg134"
+   sodipodi:docname="Camera.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata138">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#321aff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview136"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="416.61996"
+     inkscape:cy="469.88068"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg134"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs62">
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m19.547-1.1719c-1.0117 0.52344-2.0625 0.91406-3.1562 1.1719-1.0938 0.26953-2.2344 0.40625-3.4219 0.40625-3.543 0-6.3516-0.98828-8.4219-2.9688-2.0625-1.9766-3.0938-4.6602-3.0938-8.0469 0-3.4062 1.0312-6.0977 3.0938-8.0781 2.0703-1.9766 4.8789-2.9688 8.4219-2.9688 1.1875 0 2.3281 0.13672 3.4219 0.40625 1.0938 0.26172 2.1445 0.65625 3.1562 1.1875v4.3906c-1.0234-0.6875-2.0273-1.1914-3.0156-1.5156-0.98047-0.32031-2.0156-0.48438-3.1094-0.48438-1.9609 0-3.5 0.625-4.625 1.875-1.1172 1.25-1.6719 2.9805-1.6719 5.1875 0 2.1875 0.55469 3.9141 1.6719 5.1719 1.125 1.25 2.6641 1.875 4.625 1.875 1.0938 0 2.1289-0.16016 3.1094-0.48438 0.98828-0.32031 1.9922-0.82812 3.0156-1.5156z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m14.297-11.609c-0.44922-0.20703-0.89062-0.35938-1.3281-0.45312-0.4375-0.10156-0.88281-0.15625-1.3281-0.15625-1.3125 0-2.3242 0.42188-3.0312 1.2656-0.71094 0.83594-1.0625 2.0391-1.0625 3.6094v7.3438h-5.0938v-15.953h5.0938v2.625c0.65625-1.0508 1.4062-1.8164 2.25-2.2969 0.85156-0.47656 1.875-0.71875 3.0625-0.71875 0.17578 0 0.36328 0.011719 0.5625 0.03125 0.19531 0.011719 0.48438 0.042969 0.85938 0.09375z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m18.375-8.0156v1.4531h-11.922c0.125 1.1992 0.55469 2.0938 1.2969 2.6875 0.73828 0.59375 1.7734 0.89062 3.1094 0.89062 1.0703 0 2.1719-0.15625 3.2969-0.46875 1.125-0.32031 2.2812-0.80469 3.4688-1.4531v3.9375c-1.2109 0.46094-2.418 0.80469-3.625 1.0312-1.2109 0.22656-2.4141 0.34375-3.6094 0.34375-2.8984 0-5.1484-0.72656-6.75-2.1875-1.5938-1.4688-2.3906-3.5312-2.3906-6.1875 0-2.5938 0.78516-4.6328 2.3594-6.125 1.5703-1.5 3.7344-2.25 6.4844-2.25 2.5078 0 4.5156 0.75781 6.0156 2.2656 1.5078 1.5117 2.2656 3.5312 2.2656 6.0625zm-5.2344-1.7031c0-0.96875-0.28906-1.75-0.85938-2.3438-0.5625-0.59375-1.2969-0.89062-2.2031-0.89062-0.99219 0-1.7969 0.28125-2.4219 0.84375-0.61719 0.55469-0.99609 1.3516-1.1406 2.3906z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m9.5938-7.1719c-1.0625 0-1.8672 0.18359-2.4062 0.54688-0.53125 0.35547-0.79688 0.88281-0.79688 1.5781 0 0.64844 0.21094 1.1523 0.64062 1.5156 0.4375 0.36719 1.0391 0.54688 1.8125 0.54688 0.95703 0 1.7656-0.34375 2.4219-1.0312s0.98438-1.5469 0.98438-2.5781v-0.57812zm7.7969-1.9375v9.1094h-5.1406v-2.3594c-0.6875 0.96875-1.4609 1.6719-2.3125 2.1094-0.85547 0.4375-1.8906 0.65625-3.1094 0.65625-1.6562 0-3-0.47656-4.0312-1.4375-1.0312-0.96875-1.5469-2.2188-1.5469-3.75 0-1.875 0.64062-3.25 1.9219-4.125 1.2891-0.875 3.3164-1.3125 6.0781-1.3125h3v-0.39062c0-0.8125-0.32031-1.4062-0.95312-1.7812-0.63672-0.375-1.6328-0.5625-2.9844-0.5625-1.0859 0-2.1016 0.10938-3.0469 0.32812-0.9375 0.21875-1.8086 0.54688-2.6094 0.98438v-3.8906c1.082-0.25781 2.1758-0.45703 3.2812-0.59375 1.1016-0.14453 2.207-0.21875 3.3125-0.21875 2.875 0 4.9453 0.57031 6.2188 1.7031 1.2812 1.1367 1.9219 2.9805 1.9219 5.5312z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m8.0156-20.484v4.5312h5.2656v3.6406h-5.2656v6.7656c0 0.74219 0.14453 1.2461 0.4375 1.5156 0.30078 0.26172 0.89062 0.39062 1.7656 0.39062h2.6094v3.6406h-4.3594c-2.0234 0-3.4531-0.41406-4.2969-1.25-0.83594-0.84375-1.25-2.2734-1.25-4.2969v-6.7656h-2.5312v-3.6406h2.5312v-4.5312z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m13.297-13.625v-8.5312h5.1406v22.156h-5.1406v-2.3125c-0.69922 0.94922-1.4688 1.6406-2.3125 2.0781-0.84375 0.42578-1.8242 0.64062-2.9375 0.64062-1.9688 0-3.5859-0.77344-4.8438-2.3281-1.2617-1.5625-1.8906-3.5781-1.8906-6.0469 0-2.457 0.62891-4.4688 1.8906-6.0312 1.2578-1.5625 2.875-2.3438 4.8438-2.3438 1.1016 0 2.0781 0.22656 2.9219 0.67188 0.85156 0.4375 1.6289 1.1211 2.3281 2.0469zm-3.3594 10.328c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031-1.0859 0-1.9141 0.40234-2.4844 1.2031-0.57422 0.80469-0.85938 1.9609-0.85938 3.4688 0 1.5234 0.28516 2.6836 0.85938 3.4844 0.57031 0.79297 1.3984 1.1875 2.4844 1.1875z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m10.938-3.2969c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031s-1.9336 0.40234-2.5156 1.2031c-0.58594 0.80469-0.875 1.9609-0.875 3.4688 0 1.5117 0.28906 2.668 0.875 3.4688 0.58203 0.80469 1.4219 1.2031 2.5156 1.2031zm-3.3906-10.328c0.70703-0.92578 1.4883-1.6094 2.3438-2.0469 0.85156-0.44531 1.832-0.67188 2.9375-0.67188 1.9688 0 3.582 0.78125 4.8438 2.3438 1.2695 1.5625 1.9062 3.5742 1.9062 6.0312 0 2.4688-0.63672 4.4844-1.9062 6.0469-1.2617 1.5547-2.875 2.3281-4.8438 2.3281-1.1055 0-2.0859-0.21875-2.9375-0.65625-0.85547-0.4375-1.6367-1.125-2.3438-2.0625v2.3125h-5.0938v-22.156h5.0938z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.35938-15.953h5.0938l4.2969 10.828 3.6406-10.828h5.0938l-6.7031 17.469c-0.67969 1.7695-1.4648 3.0078-2.3594 3.7188-0.89844 0.70703-2.0781 1.0625-3.5469 1.0625h-2.9531v-3.3438h1.5938c0.86328 0 1.4922-0.14062 1.8906-0.42188 0.39453-0.27344 0.70312-0.76562 0.92188-1.4844l0.14062-0.4375z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h14.812v4.1406h-9.3281v3.9688h8.7656v4.1406h-8.7656v9.0156h-5.4844z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m2.2812-6.2031v-9.75h5.125v1.5938c0 0.86719-0.007812 1.9531-0.015625 3.2656-0.011719 1.3047-0.015625 2.1719-0.015625 2.6094 0 1.2812 0.03125 2.2031 0.09375 2.7656 0.070312 0.5625 0.1875 0.97656 0.34375 1.2344 0.21875 0.33594 0.49219 0.58984 0.82812 0.76562 0.33203 0.17969 0.71875 0.26562 1.1562 0.26562 1.0625 0 1.8945-0.40625 2.5-1.2188 0.61328-0.8125 0.92188-1.9453 0.92188-3.4062v-7.875h5.0938v15.953h-5.0938v-2.3125c-0.77344 0.9375-1.5898 1.625-2.4531 2.0625-0.85547 0.4375-1.7969 0.65625-2.8281 0.65625-1.8438 0-3.25-0.5625-4.2188-1.6875-0.96094-1.1328-1.4375-2.7734-1.4375-4.9219z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4375c0-1.375-0.03125-2.3203-0.09375-2.8438-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-15.953h5.0938v2.3281c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m2.4531-22.156h5.0938v12.062l5.875-5.8594h5.9219l-7.7969 7.3281 8.4062 8.625h-6.1719l-6.2344-6.6562v6.6562h-5.0938z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.953-22.156v3.3438h-2.8281c-0.71875 0-1.2266 0.13281-1.5156 0.39062-0.28125 0.26172-0.42188 0.71484-0.42188 1.3594v1.1094h4.3594v3.6406h-4.3594v12.312h-5.0938v-12.312h-2.5312v-3.6406h2.5312v-1.1094c0-1.7383 0.48438-3.0195 1.4531-3.8438 0.96875-0.83203 2.4688-1.25 4.5-1.25z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m10.047-12.688c-1.1367 0-2 0.40625-2.5938 1.2188s-0.89062 1.9805-0.89062 3.5c0 1.5312 0.29688 2.7031 0.89062 3.5156s1.457 1.2188 2.5938 1.2188c1.1016 0 1.9453-0.40625 2.5312-1.2188 0.59375-0.8125 0.89062-1.9844 0.89062-3.5156 0-1.5195-0.29688-2.6875-0.89062-3.5-0.58594-0.8125-1.4297-1.2188-2.5312-1.2188zm0-3.6562c2.7383 0 4.8789 0.74609 6.4219 2.2344 1.5391 1.4805 2.3125 3.5273 2.3125 6.1406 0 2.625-0.77344 4.6797-2.3125 6.1562-1.543 1.4805-3.6836 2.2188-6.4219 2.2188-2.7617 0-4.918-0.73828-6.4688-2.2188-1.5547-1.4766-2.3281-3.5312-2.3281-6.1562 0-2.6133 0.77344-4.6602 2.3281-6.1406 1.5508-1.4883 3.707-2.2344 6.4688-2.2344z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.234-13.297c0.64453-0.98828 1.4102-1.7422 2.2969-2.2656 0.89453-0.51953 1.875-0.78125 2.9375-0.78125 1.832 0 3.2266 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219v9.7188h-5.125v-8.3125-0.39062c0.007812-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.1328-0.16797-1.9531-0.5-2.4531-0.32422-0.50781-0.85938-0.76562-1.6094-0.76562-0.96875 0-1.7188 0.40234-2.25 1.2031-0.52344 0.79297-0.79297 1.9453-0.8125 3.4531v7.8281h-5.125v-8.3125c0-1.7695-0.15234-2.9062-0.45312-3.4062-0.30469-0.50781-0.84375-0.76562-1.625-0.76562-0.98047 0-1.7344 0.40234-2.2656 1.2031-0.53125 0.80469-0.79688 1.9492-0.79688 3.4375v7.8438h-5.125v-15.953h5.125v2.3281c0.625-0.89453 1.3438-1.5703 2.1562-2.0312 0.8125-0.45703 1.707-0.6875 2.6875-0.6875 1.1016 0 2.0781 0.26562 2.9219 0.79688s1.4844 1.2812 1.9219 2.25z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4062c0-1.3945-0.03125-2.3516-0.09375-2.875-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-22.156h5.0938v8.5312c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h6.125l7.7344 14.578v-14.578h5.2031v21.266h-6.125l-7.7344-14.594v14.594h-5.2031z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h9.1094c2.707 0 4.7852 0.60547 6.2344 1.8125 1.4453 1.1992 2.1719 2.9062 2.1719 5.125 0 2.2305-0.72656 3.9492-2.1719 5.1562-1.4492 1.1992-3.5273 1.7969-6.2344 1.7969h-3.625v7.375h-5.4844zm5.4844 3.9688v5.9375h3.0469c1.0625 0 1.8789-0.25391 2.4531-0.76562 0.58203-0.51953 0.875-1.2539 0.875-2.2031 0-0.94531-0.29297-1.6758-0.875-2.1875-0.57422-0.51953-1.3906-0.78125-2.4531-0.78125z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.4531-15.953h5.0938v15.672c0 2.1328-0.51562 3.7656-1.5469 4.8906-1.0234 1.125-2.5078 1.6875-4.4531 1.6875h-2.5156v-3.3438h0.89062c0.96875 0 1.6289-0.21875 1.9844-0.65625 0.36328-0.4375 0.54688-1.2969 0.54688-2.5781zm0-6.2031h5.0938v4.1562h-5.0938z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m15.344-15.453v4.1562c-0.69922-0.46875-1.3984-0.81641-2.0938-1.0469-0.69922-0.22656-1.4219-0.34375-2.1719-0.34375-1.4297 0-2.5391 0.41797-3.3281 1.25-0.79297 0.82422-1.1875 1.9805-1.1875 3.4688 0 1.5 0.39453 2.668 1.1875 3.5 0.78906 0.82422 1.8984 1.2344 3.3281 1.2344 0.80078 0 1.5547-0.11719 2.2656-0.35938 0.71875-0.23828 1.3828-0.58594 2-1.0469v4.1719c-0.80469 0.29297-1.6172 0.50781-2.4375 0.65625-0.8125 0.14453-1.6367 0.21875-2.4688 0.21875-2.875 0-5.125-0.73438-6.75-2.2031-1.625-1.4766-2.4375-3.5352-2.4375-6.1719 0-2.625 0.8125-4.6758 2.4375-6.1562 1.625-1.4766 3.875-2.2188 6.75-2.2188 0.83203 0 1.6562 0.078125 2.4688 0.23438 0.8125 0.14844 1.625 0.36719 2.4375 0.65625z"
+         id="path59" />
+    </symbol>
+  </defs>
+  <path
+     d="M 437.30174,514.6269 H 62.634571 c -30.010165,0 -53.6566166,-24.55377 -53.6566166,-53.65662 v -265.5393 c 0,-30.01016 24.5537716,-53.65662 53.6566166,-53.65662 H 436.39754 c 30.01016,0 53.65662,24.55378 53.65662,53.65662 v 264.6351 c 0.90736,30.01016 -23.64646,54.56394 -52.7493,54.56394 z"
+     id="path64"
+     style="fill:#ffffff;stroke-width:1.55897" />
+  <path
+     d="m 527.33224,247.2636 v 161.86782 l 150.05083,84.58034 c 6.36371,3.63552 13.64098,-0.90737 13.64098,-8.18459 V 170.86474 c 0,-7.27727 -7.27727,-10.91279 -13.64098,-8.18459 z"
+     id="path66"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.55897" />
+</svg>
diff --git a/Content/Slate/SodaIcons/can.svg b/Content/Slate/SodaIcons/can.svg
new file mode 100644
index 0000000..db0a465
--- /dev/null
+++ b/Content/Slate/SodaIcons/can.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg46"
+   sodipodi:docname="can - Copy.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#1718ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     id="namedview48"
+     showgrid="false"
+     inkscape:zoom="0.90214286"
+     inkscape:cx="532.06651"
+     inkscape:cy="270.46714"
+     inkscape:window-x="2549"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg46"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#1718ff"
+     inkscape:document-units="pt" />
+  <defs
+     id="defs20">
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m39.078-2.3281c-2.0117 1.043-4.1094 1.8281-6.2969 2.3594s-4.4648 0.79688-6.8281 0.79688c-7.0859 0-12.699-1.9766-16.844-5.9375-4.1367-3.957-6.2031-9.3281-6.2031-16.109 0-6.7891 2.0664-12.164 6.2031-16.125 4.1445-3.9688 9.7578-5.9531 16.844-5.9531 2.3633 0 4.6406 0.26562 6.8281 0.79688s4.2852 1.3242 6.2969 2.375v8.7969c-2.0312-1.3828-4.0391-2.3984-6.0156-3.0469-1.9688-0.64453-4.0469-0.96875-6.2344-0.96875-3.9062 0-6.9844 1.2578-9.2344 3.7656-2.2422 2.5-3.3594 5.9531-3.3594 10.359 0 4.3867 1.1172 7.8359 3.3594 10.344 2.25 2.5 5.3281 3.75 9.2344 3.75 2.1875 0 4.2656-0.32031 6.2344-0.96875 1.9766-0.64453 3.9844-1.6602 6.0156-3.0469z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m16.031-40.953v9.0625h10.516v7.2812h-10.516v13.531c0 1.4805 0.28906 2.4805 0.875 3 0.59375 0.52344 1.7656 0.78125 3.5156 0.78125h5.2344v7.2969h-8.7344c-4.0312 0-6.8867-0.83594-8.5625-2.5156-1.6797-1.6875-2.5156-4.5391-2.5156-8.5625v-13.531h-5.0781v-7.2812h5.0781v-9.0625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m26.594-27.234v-17.078h10.266v44.312h-10.266v-4.6094c-1.3984 1.875-2.9453 3.25-4.6406 4.125-1.6875 0.875-3.6406 1.3125-5.8594 1.3125-3.9297 0-7.1562-1.5625-9.6875-4.6875-2.5234-3.125-3.7812-7.1445-3.7812-12.062 0-4.9141 1.2578-8.9375 3.7812-12.062 2.5312-3.125 5.7578-4.6875 9.6875-4.6875 2.1953 0 4.1445 0.44531 5.8438 1.3281 1.707 0.88672 3.2578 2.2578 4.6562 4.1094zm-6.7188 20.656c2.1875 0 3.8516-0.79688 5-2.3906 1.1445-1.5938 1.7188-3.9102 1.7188-6.9531 0-3.0391-0.57422-5.3594-1.7188-6.9531-1.1484-1.5938-2.8125-2.3906-5-2.3906-2.168 0-3.8242 0.79688-4.9688 2.3906-1.1484 1.5938-1.7188 3.9141-1.7188 6.9531 0 3.043 0.57031 5.3594 1.7188 6.9531 1.1445 1.5938 2.8008 2.3906 4.9688 2.3906z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m21.875-6.5781c2.1758 0 3.8359-0.79688 4.9844-2.3906 1.1562-1.5938 1.7344-3.9102 1.7344-6.9531 0-3.0391-0.57812-5.3594-1.7344-6.9531-1.1484-1.5938-2.8086-2.3906-4.9844-2.3906-2.1875 0-3.8672 0.80469-5.0312 2.4062-1.168 1.6055-1.75 3.918-1.75 6.9375 0 3.0234 0.58203 5.3359 1.75 6.9375 1.1641 1.6055 2.8438 2.4062 5.0312 2.4062zm-6.7812-20.656c1.4062-1.8516 2.9609-3.2227 4.6719-4.1094 1.707-0.88281 3.6719-1.3281 5.8906-1.3281 3.9375 0 7.1641 1.5625 9.6875 4.6875 2.5195 3.125 3.7812 7.1484 3.7812 12.062 0 4.918-1.2617 8.9375-3.7812 12.062-2.5234 3.125-5.75 4.6875-9.6875 4.6875-2.2188 0-4.1836-0.44531-5.8906-1.3281-1.7109-0.88281-3.2656-2.2539-4.6719-4.1094v4.6094h-10.188v-44.312h10.188z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m4.9062-31.891h10.188v31.328c0 4.2695-1.0273 7.5312-3.0781 9.7812-2.0547 2.25-5.0234 3.375-8.9062 3.375h-5.0469v-6.7031h1.7656c1.9375 0 3.2656-0.4375 3.9844-1.3125 0.72656-0.86719 1.0938-2.5781 1.0938-5.1406zm0-12.422h10.188v8.3125h-10.188z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m36.969-19.422v19.422h-10.25v-14.812c0-2.7891-0.0625-4.707-0.1875-5.75-0.125-1.0391-0.33984-1.8125-0.64062-2.3125-0.39844-0.65625-0.9375-1.1719-1.625-1.5469s-1.4648-0.5625-2.3281-0.5625c-2.1367 0-3.8125 0.82422-5.0312 2.4688-1.2109 1.6484-1.8125 3.9219-1.8125 6.8281v15.688h-10.188v-44.312h10.188v17.078c1.5391-1.8516 3.1719-3.2227 4.8906-4.1094 1.7266-0.88281 3.6406-1.3281 5.7344-1.3281 3.6875 0 6.4844 1.1328 8.3906 3.3906 1.9062 2.2617 2.8594 5.5469 2.8594 9.8594z"
+         id="path17" />
+    </symbol>
+  </defs>
+  <circle
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.75"
+     id="path355"
+     cx="602.74945"
+     cy="223.3266"
+     r="91.448929" />
+  <circle
+     style="fill:#ffffff;fill-opacity:1;stroke-width:0.75"
+     id="path355-6"
+     cx="98.84919"
+     cy="456.04639"
+     r="91.448929" />
+  <path
+     id="path570"
+     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:0.75"
+     d="M 203.78174,222.27246 411.3457,436.15576 H 99.218262 v 44.89307 c 113.588718,0 270.423808,0.009 388.876748,0.01 12.80508,0 18.776,-11.24542 8.44161,-21.57981 L 289.37988,246.01468 h 313.02539 v -44.89307 l -387.33621,-0.0247 c -15.30496,0 -20.13254,12.33035 -11.28732,21.17557 z m 59.6748,288.01611 c -0.34607,4.6e-4 -0.62649,0.28089 -0.62695,0.62696 -3.5e-4,0.34664 0.28031,0.62796 0.62695,0.62842 0.34721,3.5e-4 0.62877,-0.28121 0.62842,-0.62842 -4.6e-4,-0.34664 -0.28178,-0.62731 -0.62842,-0.62696 z"
+     sodipodi:nodetypes="sccccccccccscscsc" />
+</svg>
diff --git a/Content/Slate/SodaIcons/car.svg b/Content/Slate/SodaIcons/car.svg
new file mode 100644
index 0000000..0b590a5
--- /dev/null
+++ b/Content/Slate/SodaIcons/car.svg
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg93"
+   sodipodi:docname="car.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata97">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#311e36"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview95"
+     showgrid="false"
+     inkscape:zoom="0.90214286"
+     inkscape:cx="466.66667"
+     inkscape:cy="466.66667"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g91" />
+  <defs
+     id="defs47">
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m36.078-2.1562c-1.8672 0.96875-3.8086 1.6992-5.8281 2.1875-2.0117 0.48828-4.1094 0.73438-6.2969 0.73438-6.543 0-11.727-1.8281-15.547-5.4844-3.8125-3.6562-5.7188-8.6133-5.7188-14.875 0-6.2695 1.9062-11.234 5.7188-14.891 3.8203-3.6562 9.0039-5.4844 15.547-5.4844 2.1875 0 4.2852 0.25 6.2969 0.75 2.0195 0.49219 3.9609 1.2148 5.8281 2.1719v8.125c-1.875-1.2812-3.7266-2.2188-5.5469-2.8125-1.8242-0.59375-3.7461-0.89062-5.7656-0.89062-3.6172 0-6.4609 1.1562-8.5312 3.4688-2.0625 2.3125-3.0938 5.5-3.0938 9.5625 0 4.0547 1.0312 7.2344 3.0938 9.5469 2.0703 2.3125 4.9141 3.4688 8.5312 3.4688 2.0195 0 3.9414-0.29688 5.7656-0.89062 1.8203-0.59375 3.6719-1.5312 5.5469-2.8125z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m26.391-21.422c-0.82422-0.38281-1.6406-0.67188-2.4531-0.85938s-1.6328-0.28125-2.4531-0.28125c-2.4297 0-4.293 0.77734-5.5938 2.3281-1.3047 1.5547-1.9531 3.7773-1.9531 6.6719v13.562h-9.4219v-29.453h9.4219v4.8438c1.207-1.9258 2.5938-3.332 4.1562-4.2188 1.5703-0.88281 3.4531-1.3281 5.6406-1.3281 0.32031 0 0.66406 0.015625 1.0312 0.046875 0.36328 0.023437 0.89844 0.074219 1.6094 0.15625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m33.922-14.797v2.6719h-22.016c0.22656 2.2109 1.0234 3.8672 2.3906 4.9688 1.375 1.1055 3.2852 1.6562 5.7344 1.6562 1.9766 0 4.0039-0.28906 6.0781-0.875 2.082-0.58203 4.2188-1.4727 6.4062-2.6719v7.2656c-2.2188 0.83594-4.4453 1.4648-6.6719 1.8906-2.2305 0.4375-4.4531 0.65625-6.6719 0.65625-5.3359 0-9.4805-1.3516-12.438-4.0625-2.9492-2.707-4.4219-6.5078-4.4219-11.406 0-4.8008 1.4453-8.5781 4.3438-11.328 2.9062-2.75 6.8984-4.125 11.984-4.125 4.625 0 8.3281 1.3984 11.109 4.1875 2.7812 2.7812 4.1719 6.5078 4.1719 11.172zm-9.6875-3.1406c0-1.7812-0.52344-3.2188-1.5625-4.3125-1.043-1.0938-2.4023-1.6406-4.0781-1.6406-1.8242 0-3.3086 0.51172-4.4531 1.5312-1.1367 1.0234-1.8438 2.4961-2.125 4.4219z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m17.719-13.25c-1.9609 0-3.4375 0.33594-4.4375 1-0.99219 0.66797-1.4844 1.6484-1.4844 2.9375 0 1.1992 0.39844 2.1367 1.2031 2.8125 0.80078 0.66797 1.9102 1 3.3281 1 1.7695 0 3.2578-0.63281 4.4688-1.9062 1.207-1.2695 1.8125-2.8594 1.8125-4.7656v-1.0781zm14.375-3.5469v16.797h-9.4844v-4.3594c-1.2617 1.7812-2.6836 3.0859-4.2656 3.9062-1.5742 0.8125-3.4922 1.2188-5.75 1.2188-3.0547 0-5.5312-0.89062-7.4375-2.6719-1.8984-1.7812-2.8438-4.0859-2.8438-6.9219 0-3.457 1.1875-5.9883 3.5625-7.5938 2.375-1.6133 6.1016-2.4219 11.188-2.4219h5.5469v-0.75c0-1.4883-0.58984-2.5781-1.7656-3.2656-1.168-0.6875-2.9961-1.0312-5.4844-1.0312-2.0234 0-3.9023 0.20312-5.6406 0.60938-1.7305 0.39844-3.3398 0.99609-4.8281 1.7969v-7.1719c2.0078-0.48828 4.0312-0.85938 6.0625-1.1094 2.0391-0.25781 4.0781-0.39062 6.1094-0.39062 5.3125 0 9.1445 1.0469 11.5 3.1406 2.3516 2.0938 3.5312 5.5 3.5312 10.219z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m14.797-37.812v8.3594h9.7031v6.7344h-9.7031v12.484c0 1.375 0.26953 2.3047 0.8125 2.7812 0.55078 0.48047 1.6289 0.71875 3.2344 0.71875h4.8438v6.7344h-8.0781c-3.7109 0-6.3398-0.77344-7.8906-2.3281-1.5547-1.5508-2.3281-4.1875-2.3281-7.9062v-12.484h-4.6875v-6.7344h4.6875v-8.3594z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m24.562-25.141v-15.766h9.4531v40.906h-9.4531v-4.2656c-1.3047 1.7422-2.7344 3.0156-4.2969 3.8281-1.5547 0.80078-3.3555 1.2031-5.4062 1.2031-3.6367 0-6.6211-1.4414-8.9531-4.3281-2.3242-2.8828-3.4844-6.5977-3.4844-11.141 0-4.5312 1.1602-8.2383 3.4844-11.125 2.332-2.8828 5.3164-4.3281 8.9531-4.3281 2.0312 0 3.8281 0.41406 5.3906 1.2344 1.5703 0.8125 3.0078 2.0742 4.3125 3.7812zm-6.2188 19.062c2.0195 0 3.5625-0.73438 4.625-2.2031s1.5938-3.6094 1.5938-6.4219c0-2.8008-0.53125-4.9375-1.5938-6.4062s-2.6055-2.2031-4.625-2.2031c-1.9922 0-3.5156 0.73438-4.5781 2.2031s-1.5938 3.6055-1.5938 6.4062c0 2.8125 0.53125 4.9531 1.5938 6.4219s2.5859 2.2031 4.5781 2.2031z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m20.188-6.0781c2.0195 0 3.5547-0.73438 4.6094-2.2031 1.0625-1.4688 1.5938-3.6094 1.5938-6.4219 0-2.8008-0.53125-4.9375-1.5938-6.4062-1.0547-1.4688-2.5898-2.2031-4.6094-2.2031-2.0117 0-3.5586 0.74219-4.6406 2.2188-1.0742 1.4805-1.6094 3.6094-1.6094 6.3906 0 2.793 0.53516 4.9297 1.6094 6.4062 1.082 1.4805 2.6289 2.2188 4.6406 2.2188zm-6.25-19.062c1.2891-1.707 2.7227-2.9688 4.2969-3.7812 1.582-0.82031 3.3984-1.2344 5.4531-1.2344 3.625 0 6.6016 1.4453 8.9375 4.3281 2.332 2.8867 3.5 6.5938 3.5 11.125 0 4.543-1.168 8.2578-3.5 11.141-2.3359 2.8867-5.3125 4.3281-8.9375 4.3281-2.0547 0-3.8711-0.40625-5.4531-1.2188-1.5742-0.82031-3.0078-2.0938-4.2969-3.8125v4.2656h-9.4219v-40.906h9.4219z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.65625-29.453h9.4062l7.9219 19.984 6.7344-19.984h9.4062l-12.375 32.234c-1.25 3.2812-2.7031 5.5703-4.3594 6.875-1.6562 1.3125-3.8438 1.9688-6.5625 1.9688h-5.4375v-6.1875h2.9375c1.6016 0 2.7656-0.25781 3.4844-0.76562 0.72656-0.5 1.2969-1.4062 1.7031-2.7188l0.26562-0.82812z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m15.062-31.609v23.953h3.625c4.1328 0 7.2891-1.0195 9.4688-3.0625 2.1875-2.0508 3.2812-5.0352 3.2812-8.9531 0-3.8828-1.0898-6.8438-3.2656-8.875-2.168-2.0391-5.3281-3.0625-9.4844-3.0625zm-10.125-7.6406h10.672c5.9688 0 10.41 0.42969 13.328 1.2812 2.9141 0.84375 5.4141 2.2812 7.5 4.3125 1.8438 1.7734 3.207 3.8125 4.0938 6.125 0.89453 2.3125 1.3438 4.9336 1.3438 7.8594 0 2.9688-0.44922 5.6172-1.3438 7.9375-0.88672 2.3242-2.25 4.3711-4.0938 6.1406-2.1055 2.0312-4.6328 3.4766-7.5781 4.3281-2.9375 0.84375-7.3555 1.2656-13.25 1.2656h-10.672z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m4.5156-29.453h9.4219v29.453h-9.4219zm0-11.453h9.4219v7.6719h-9.4219z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m34.125-17.938v17.938h-9.4688v-13.719c0-2.5391-0.058594-4.2891-0.17188-5.25-0.11719-0.96875-0.3125-1.6797-0.59375-2.1406-0.36719-0.61328-0.86719-1.0938-1.5-1.4375-0.625-0.34375-1.3398-0.51562-2.1406-0.51562-1.9688 0-3.5156 0.76172-4.6406 2.2812-1.1172 1.5117-1.6719 3.6094-1.6719 6.2969v14.484h-9.4219v-29.453h9.4219v4.3125c1.4141-1.707 2.9219-2.9688 4.5156-3.7812 1.5938-0.82031 3.3516-1.2344 5.2812-1.2344 3.4062 0 5.9883 1.0469 7.75 3.1406 1.7578 2.0859 2.6406 5.1094 2.6406 9.0781z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m18.531-23.422c-2.0859 0-3.6719 0.75-4.7656 2.25s-1.6406 3.6562-1.6406 6.4688c0 2.8242 0.54688 4.9844 1.6406 6.4844s2.6797 2.25 4.7656 2.25c2.0508 0 3.6172-0.75 4.7031-2.25 1.0938-1.5 1.6406-3.6602 1.6406-6.4844 0-2.8125-0.54688-4.9688-1.6406-6.4688-1.0859-1.5-2.6523-2.25-4.7031-2.25zm0-6.7344c5.0703 0 9.0312 1.3711 11.875 4.1094 2.8438 2.7305 4.2656 6.5117 4.2656 11.344 0 4.8438-1.4219 8.6367-4.2656 11.375-2.8438 2.7305-6.8047 4.0938-11.875 4.0938-5.0859 0-9.0586-1.3633-11.922-4.0938-2.8672-2.7383-4.2969-6.5312-4.2969-11.375 0-4.832 1.4297-8.6133 4.2969-11.344 2.8633-2.7383 6.8359-4.1094 11.922-4.1094z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m27.531-28.531v7.1562c-2.0234-0.84375-3.9688-1.4727-5.8438-1.8906-1.875-0.41406-3.6484-0.625-5.3125-0.625-1.7812 0-3.1094 0.22656-3.9844 0.67188-0.86719 0.4375-1.2969 1.1211-1.2969 2.0469 0 0.76172 0.32812 1.3438 0.98438 1.75 0.65625 0.39844 1.832 0.69531 3.5312 0.89062l1.6562 0.23438c4.8203 0.61719 8.0664 1.625 9.7344 3.0312 1.6641 1.3984 2.5 3.5938 2.5 6.5938 0 3.1367-1.1562 5.4961-3.4688 7.0781-2.3125 1.5742-5.7656 2.3594-10.359 2.3594-1.9492 0-3.9648-0.15625-6.0469-0.46875-2.0742-0.30078-4.2031-0.75781-6.3906-1.375v-7.1562c1.875 0.91797 3.7969 1.6055 5.7656 2.0625 1.9766 0.44922 3.9844 0.67188 6.0156 0.67188 1.832 0 3.2109-0.25 4.1406-0.75 0.9375-0.50781 1.4062-1.2656 1.4062-2.2656 0-0.84375-0.32422-1.4688-0.96875-1.875-0.63672-0.41406-1.9062-0.73828-3.8125-0.96875l-1.6562-0.20312c-4.1992-0.53125-7.1406-1.5039-8.8281-2.9219-1.6797-1.4141-2.5156-3.5703-2.5156-6.4688 0-3.125 1.0664-5.4375 3.2031-6.9375 2.1445-1.5078 5.4258-2.2656 9.8438-2.2656 1.7383 0 3.5625 0.13672 5.4688 0.40625 1.9062 0.26172 3.9844 0.66797 6.2344 1.2188z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m23.891-40.906v6.1719h-5.2031c-1.3359 0-2.2617 0.24609-2.7812 0.73438-0.52344 0.48047-0.78125 1.3125-0.78125 2.5v2.0469h8.0312v6.7344h-8.0312v22.719h-9.4219v-22.719h-4.6719v-6.7344h4.6719v-2.0469c0-3.207 0.89062-5.5781 2.6719-7.1094 1.7891-1.5312 4.5625-2.2969 8.3125-2.2969z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m4.9375-39.25h10.125v31.594h17.781v7.6562h-27.906z"
+         id="path44" />
+    </symbol>
+  </defs>
+  <g
+     id="g91">
+    <path
+       d="m 221.90677,435.90492 c 0,39.30332 -31.86374,71.16309 -71.16838,71.16309 -39.30464,0 -71.168376,-31.85845 -71.168376,-71.16309 0,-39.30332 31.863736,-71.16838 71.168376,-71.16838 39.30464,0 71.16838,31.86374 71.16838,71.16838"
+       id="path49"
+       style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.32165" />
+    <path
+       d="m 634.65905,435.90492 c 0,39.30332 -31.85845,71.16309 -71.1631,71.16309 -39.30332,0 -71.16837,-31.85845 -71.16837,-71.16309 0,-39.30332 31.86373,-71.16838 71.16837,-71.16838 39.30333,0 71.1631,31.86374 71.1631,71.16838"
+       id="path51"
+       style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.32165" />
+    <path
+       d="m 687.89523,353.48663 -20.06798,-52.2357 -21.92094,-86.39778 c -1.42487,-6.1178 -6.8303,-10.53199 -13.23767,-10.67645 l -259.1894,-10.24281 c -63.6257,0 -126.10421,22.91746 -175.92525,64.62223 -25.90176,21.49272 -55.22528,32.87612 -84.82899,32.87612 h -5.54988 c -54.512907,0 -98.7777137,46.82617 -98.7777137,104.61149 v 25.47751 c 0,15.65894 12.3801897,28.60718 27.6106557,28.60718 h 16.216684 c -0.671149,-4.66187 -1.135802,-9.38585 -1.135802,-14.23421 0,-54.93054 44.698309,-99.63017 99.630176,-99.63017 54.93187,0 99.63018,44.69831 99.63018,99.63017 0,4.84267 -0.46464,9.57168 -1.1358,14.23421 h 215.77309 c -0.67115,-4.66187 -1.1358,-9.38585 -1.1358,-14.23421 0,-54.93054 44.69831,-99.63017 99.63018,-99.63017 54.93187,0 99.63018,44.69831 99.63018,99.63017 0,4.74976 -0.44916,9.38586 -1.09449,13.95931 16.56163,-1.3888 29.57727,-15.58626 29.57727,-33.03076 v -42.98412 c 0,-6.96961 -1.1358,-13.80467 -3.70168,-20.35082 z M 591.97229,307.79708 H 278.84623 c -7.86793,0 -14.2342,-6.36561 -14.2342,-14.2342 0,-7.8686 6.36561,-14.23421 14.2342,-14.23421 h 313.12606 c 7.86794,0 14.23421,6.36561 14.23421,14.23421 0,7.86859 -6.36561,14.2342 -14.23421,14.2342 z"
+       id="path53"
+       style="fill:#ffffff;stroke-width:1.32165" />
+  </g>
+</svg>
diff --git a/Content/Slate/SodaIcons/chassis.svg b/Content/Slate/SodaIcons/chassis.svg
new file mode 100644
index 0000000..e187361
--- /dev/null
+++ b/Content/Slate/SodaIcons/chassis.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 85 85"
+   x="0px"
+   y="0px"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="chassis.svg"
+   width="85"
+   height="85"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#bf0707"
+     bordercolor="#3e9159"
+     borderopacity="0.24705882"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="7.8530447"
+     inkscape:cx="62.268842"
+     inkscape:cy="55.519867"
+     inkscape:window-width="2560"
+     inkscape:window-height="1334"
+     inkscape:window-x="2549"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     fill="#000000"
+     fill-rule="evenodd"
+     d="m 14.260769,62.309322 h 11.498676 c 1.411233,0 2.555262,1.080398 2.555262,2.413136 v 16.89195 c 0,1.332738 -1.144029,2.413136 -2.555262,2.413136 H 14.260769 c -1.411232,0 -2.555261,-1.080398 -2.555261,-2.413136 v -16.89195 c 0,-1.332738 1.144029,-2.413136 2.555261,-2.413136 z m 44.717074,0 h 11.498676 c 1.411232,0 2.555261,1.080398 2.555261,2.413136 v 16.89195 c 0,1.332738 -1.144029,2.413136 -2.555261,2.413136 H 58.977843 c -1.411233,0 -2.555262,-1.080398 -2.555262,-2.413136 v -16.89195 c 0,-1.332738 1.144029,-2.413136 2.555262,-2.413136 z M 14.260769,1.9809322 h 11.498676 c 1.411233,0 2.555262,1.080397 2.555262,2.4131356 V 21.286018 c 0,1.332738 -1.144029,2.413136 -2.555262,2.413136 H 14.260769 c -1.411232,0 -2.555261,-1.080398 -2.555261,-2.413136 V 4.3940678 c 0,-1.3327386 1.144029,-2.4131356 2.555261,-2.4131356 z m 44.717074,0 h 11.498676 c 1.411232,0 2.555261,1.080397 2.555261,2.4131356 V 21.286018 c 0,1.332738 -1.144029,2.413136 -2.555261,2.413136 H 58.977843 c -1.411233,0 -2.555262,-1.080398 -2.555262,-2.413136 V 4.3940678 c 0,-1.3327386 1.144029,-2.4131356 2.555262,-2.4131356 z"
+     id="path2"
+     style="stroke-width:1.2416;fill:#ffffff;fill-opacity:1"
+     sodipodi:nodetypes="ssssssssssssssssssssssssssssssssssss" />
+  <path
+     fill="#000000"
+     fill-rule="evenodd"
+     d="m 52.752315,11.171816 v 2.390526 c 0,0.682941 -0.57252,1.217873 -1.27874,1.217873 h -17.8846 c -0.71067,0 -1.27875,-0.54526 -1.27875,-1.217873 v -2.390526 c 0,-0.682941 0.57252,-1.217873 1.27875,-1.217873 h 17.8846 c 0.71067,0 1.27874,0.54526 1.27874,1.217873 z m -20.44209,62.718918 v -2.39053 c 0,-0.682939 0.57252,-1.21787 1.27875,-1.21787 h 17.8846 c 0.71067,0 1.27874,0.545259 1.27874,1.21787 v 2.39053 c 0,0.68294 -0.57252,1.21787 -1.27874,1.21787 h -17.8846 c -0.71067,0 -1.27875,-0.54526 -1.27875,-1.21787 z m 8.95539,-54.284248 h 2.53131 c 0.72317,0 1.28961,0.538516 1.28961,1.202791 v 43.443982 c 0,0.655951 -0.57738,1.202803 -1.28961,1.202803 h -2.53131 c -0.72317,0 -1.28961,-0.538516 -1.28961,-1.202803 V 20.809277 c 0,-0.655938 0.57738,-1.202791 1.28961,-1.202791 z"
+     id="path2-5"
+     style="stroke-width:1.2416;fill:#ffffff;fill-opacity:0.75"
+     sodipodi:nodetypes="sssssssssssssssssssssssssss" />
+</svg>
diff --git a/Content/Slate/SodaIcons/chess-board.svg b/Content/Slate/SodaIcons/chess-board.svg
new file mode 100644
index 0000000..74280c0
--- /dev/null
+++ b/Content/Slate/SodaIcons/chess-board.svg
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg156"
+   sodipodi:docname="chess-board.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata160">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#503c2f"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview158"
+     showgrid="false"
+     inkscape:zoom="0.90214286"
+     inkscape:cx="466.66667"
+     inkscape:cy="466.66667"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg156" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m11.484-0.6875c-0.59375 0.3125-1.2148 0.54688-1.8594 0.70312-0.63672 0.15625-1.3047 0.23438-2 0.23438-2.0859 0-3.7344-0.58203-4.9531-1.75-1.2109-1.1641-1.8125-2.7422-1.8125-4.7344 0-2 0.60156-3.5781 1.8125-4.7344 1.2188-1.1641 2.8672-1.75 4.9531-1.75 0.69531 0 1.3633 0.078125 2 0.23438 0.64453 0.15625 1.2656 0.38672 1.8594 0.6875v2.5938c-0.59375-0.40625-1.1836-0.70312-1.7656-0.89062-0.58594-0.19531-1.1953-0.29688-1.8281-0.29688-1.1562 0-2.0625 0.37109-2.7188 1.1094-0.65625 0.74219-0.98438 1.7578-0.98438 3.0469 0 1.293 0.32812 2.3086 0.98438 3.0469 0.65625 0.73047 1.5625 1.0938 2.7188 1.0938 0.63281 0 1.2422-0.09375 1.8281-0.28125 0.58203-0.1875 1.1719-0.48438 1.7656-0.89062z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m8.4062-6.8281c-0.26172-0.11328-0.52344-0.20312-0.78125-0.26562-0.26172-0.0625-0.52344-0.09375-0.78125-0.09375-0.77344 0-1.3672 0.25-1.7812 0.75-0.41797 0.49219-0.625 1.1992-0.625 2.125v4.3125h-3v-9.375h3v1.5469c0.38281-0.61328 0.82812-1.0625 1.3281-1.3438s1.0977-0.42188 1.7969-0.42188c0.09375 0 0.19531 0.007812 0.3125 0.015625 0.125 0 0.29688 0.015625 0.51562 0.046875z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m10.797-4.7188v0.85938h-7c0.070313 0.71094 0.32031 1.2422 0.75 1.5938 0.4375 0.34375 1.0469 0.51562 1.8281 0.51562 0.63281 0 1.2812-0.09375 1.9375-0.28125 0.66406-0.1875 1.3477-0.46875 2.0469-0.84375v2.3125c-0.71094 0.26172-1.418 0.46094-2.125 0.59375-0.71094 0.14453-1.4219 0.21875-2.1406 0.21875-1.6875 0-3.0078-0.42969-3.9531-1.2969-0.9375-0.86328-1.4062-2.0703-1.4062-3.625 0-1.5312 0.45703-2.7344 1.375-3.6094 0.92578-0.875 2.2031-1.3125 3.8281-1.3125 1.4688 0 2.6445 0.44531 3.5312 1.3281 0.88281 0.88672 1.3281 2.0703 1.3281 3.5469zm-3.0781-0.98438c0-0.57031-0.16797-1.0312-0.5-1.375-0.33594-0.35156-0.76562-0.53125-1.2969-0.53125-0.58594 0-1.0586 0.16797-1.4219 0.5-0.36719 0.32422-0.58984 0.79297-0.67188 1.4062z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m5.6406-4.2188c-0.625 0-1.0938 0.10938-1.4062 0.32812-0.3125 0.21094-0.46875 0.51562-0.46875 0.92188 0 0.38672 0.125 0.6875 0.375 0.90625 0.25 0.21094 0.60156 0.3125 1.0625 0.3125 0.5625 0 1.0352-0.20312 1.4219-0.60938 0.38281-0.40625 0.57812-0.91016 0.57812-1.5156v-0.34375zm4.5781-1.125v5.3438h-3.0156v-1.3906c-0.40625 0.57422-0.85938 0.99219-1.3594 1.25s-1.1094 0.39062-1.8281 0.39062c-0.98047 0-1.7734-0.28125-2.375-0.84375-0.60547-0.57031-0.90625-1.3125-0.90625-2.2188 0-1.0938 0.375-1.8945 1.125-2.4062 0.75781-0.51953 1.9531-0.78125 3.5781-0.78125h1.7656v-0.23438c0-0.47656-0.1875-0.82812-0.5625-1.0469s-0.96094-0.32812-1.75-0.32812c-0.64844 0-1.2461 0.070313-1.7969 0.20312-0.55469 0.125-1.0625 0.3125-1.5312 0.5625v-2.2812c0.63281-0.15625 1.2734-0.26953 1.9219-0.34375 0.64453-0.082031 1.2969-0.125 1.9531-0.125 1.6875 0 2.9062 0.33594 3.6562 1 0.75 0.66797 1.125 1.75 1.125 3.25z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m4.7188-12.031v2.6562h3.0781v2.1406h-3.0781v3.9844c0 0.42969 0.082031 0.71875 0.25 0.875 0.17578 0.15625 0.51953 0.23438 1.0312 0.23438h1.5469v2.1406h-2.5781c-1.1797 0-2.0156-0.24219-2.5156-0.73438-0.49219-0.5-0.73438-1.3359-0.73438-2.5156v-3.9844h-1.5v-2.1406h1.5v-2.6562z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m7.8125-8v-5.0156h3.0156v13.016h-3.0156v-1.3594c-0.40625 0.55469-0.85938 0.96094-1.3594 1.2188s-1.0742 0.39062-1.7188 0.39062c-1.1562 0-2.1094-0.45703-2.8594-1.375-0.74219-0.92578-1.1094-2.1094-1.1094-3.5469 0-1.4453 0.36719-2.6289 1.1094-3.5469 0.75-0.91406 1.7031-1.375 2.8594-1.375 0.64453 0 1.2188 0.13281 1.7188 0.39062 0.5 0.25 0.95312 0.65234 1.3594 1.2031zm-1.9688 6.0625c0.63281 0 1.1172-0.23438 1.4531-0.70312 0.34375-0.46875 0.51562-1.1445 0.51562-2.0312 0-0.89453-0.17188-1.5781-0.51562-2.0469-0.33594-0.46875-0.82031-0.70312-1.4531-0.70312-0.63672 0-1.125 0.23438-1.4688 0.70312-0.33594 0.46875-0.5 1.1523-0.5 2.0469 0 0.88672 0.16406 1.5625 0.5 2.0312 0.34375 0.46875 0.83203 0.70312 1.4688 0.70312z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m6.4219-1.9375c0.64453 0 1.1328-0.23438 1.4688-0.70312 0.34375-0.46875 0.51562-1.1445 0.51562-2.0312 0-0.89453-0.17188-1.5781-0.51562-2.0469-0.33594-0.46875-0.82422-0.70312-1.4688-0.70312-0.63672 0-1.125 0.23438-1.4688 0.70312s-0.51562 1.1523-0.51562 2.0469c0 0.88672 0.17188 1.5625 0.51562 2.0312s0.83203 0.70312 1.4688 0.70312zm-1.9844-6.0625c0.41406-0.55078 0.875-0.95312 1.375-1.2031 0.5-0.25781 1.0781-0.39062 1.7344-0.39062 1.1445 0 2.0859 0.46094 2.8281 1.375 0.75 0.91797 1.125 2.1016 1.125 3.5469 0 1.4375-0.375 2.6211-1.125 3.5469-0.74219 0.91797-1.6836 1.375-2.8281 1.375-0.65625 0-1.2344-0.13281-1.7344-0.39062s-0.96094-0.66406-1.375-1.2188v1.3594h-3v-13.016h3z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m0.20312-9.375h3l2.5156 6.3594 2.1562-6.3594h2.9844l-3.9375 10.266c-0.39844 1.0391-0.85938 1.7695-1.3906 2.1875-0.52344 0.41406-1.2148 0.625-2.0781 0.625h-1.7344v-1.9688h0.9375c0.50781 0 0.87891-0.085937 1.1094-0.25 0.22656-0.15625 0.40625-0.44531 0.53125-0.85938l0.09375-0.26562z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.0156-9.0781v2.4375c-0.40625-0.28125-0.82031-0.48438-1.2344-0.60938-0.40625-0.13281-0.82812-0.20312-1.2656-0.20312-0.84375 0-1.5 0.24609-1.9688 0.73438-0.46094 0.48047-0.6875 1.1641-0.6875 2.0469 0 0.875 0.22656 1.5586 0.6875 2.0469 0.46875 0.48047 1.125 0.71875 1.9688 0.71875 0.46875 0 0.91016-0.066406 1.3281-0.20312 0.42578-0.13281 0.81641-0.34375 1.1719-0.625v2.4531c-0.46875 0.17969-0.94922 0.30469-1.4375 0.39062-0.48047 0.09375-0.96094 0.14062-1.4375 0.14062-1.6992 0-3.0273-0.42969-3.9844-1.2969-0.94922-0.875-1.4219-2.082-1.4219-3.625 0-1.5508 0.47266-2.7578 1.4219-3.625 0.95703-0.86328 2.2852-1.2969 3.9844-1.2969 0.48828 0 0.96875 0.042969 1.4375 0.125 0.47656 0.085938 0.95703 0.21484 1.4375 0.39062z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m5.9062-7.4531c-0.66797 0-1.1797 0.24219-1.5312 0.71875-0.34375 0.46875-0.51562 1.1562-0.51562 2.0625 0 0.89844 0.17188 1.5859 0.51562 2.0625 0.35156 0.46875 0.86328 0.70312 1.5312 0.70312 0.64453 0 1.1406-0.23438 1.4844-0.70312 0.35156-0.47656 0.53125-1.1641 0.53125-2.0625 0-0.90625-0.17969-1.5938-0.53125-2.0625-0.34375-0.47656-0.83984-0.71875-1.4844-0.71875zm0-2.1406c1.6016 0 2.8594 0.4375 3.7656 1.3125 0.91406 0.86719 1.375 2.0703 1.375 3.6094 0 1.5312-0.46094 2.7344-1.375 3.6094-0.90625 0.875-2.1641 1.3125-3.7656 1.3125-1.625 0-2.8984-0.4375-3.8125-1.3125-0.90625-0.875-1.3594-2.0781-1.3594-3.6094 0-1.5391 0.45312-2.7422 1.3594-3.6094 0.91406-0.875 2.1875-1.3125 3.8125-1.3125z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m4.4375-1.3594v4.9219h-3v-12.938h3v1.375c0.41406-0.55078 0.875-0.95312 1.375-1.2031 0.5-0.25781 1.0781-0.39062 1.7344-0.39062 1.1445 0 2.0859 0.46094 2.8281 1.375 0.75 0.91797 1.125 2.1016 1.125 3.5469 0 1.4375-0.375 2.6211-1.125 3.5469-0.74219 0.91797-1.6836 1.375-2.8281 1.375-0.65625 0-1.2344-0.13281-1.7344-0.39062s-0.96094-0.66406-1.375-1.2188zm1.9844-6.0625c-0.63672 0-1.125 0.23438-1.4688 0.70312s-0.51562 1.1523-0.51562 2.0469c0 0.88672 0.17188 1.5625 0.51562 2.0312s0.83203 0.70312 1.4688 0.70312c0.64453 0 1.1328-0.23438 1.4688-0.70312 0.34375-0.46875 0.51562-1.1445 0.51562-2.0312 0-0.89453-0.17188-1.5781-0.51562-2.0469-0.33594-0.46875-0.82422-0.70312-1.4688-0.70312z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m1.3438-3.6562v-5.7188h3.0156v0.9375c0 0.51172-0.007813 1.1523-0.015625 1.9219-0.011719 0.76172-0.015625 1.2734-0.015625 1.5312 0 0.75 0.019531 1.293 0.0625 1.625 0.039063 0.33594 0.10938 0.57422 0.20312 0.71875 0.125 0.19922 0.28516 0.35156 0.48438 0.45312 0.19531 0.10547 0.42578 0.15625 0.6875 0.15625 0.625 0 1.1133-0.23828 1.4688-0.71875 0.35156-0.47656 0.53125-1.1445 0.53125-2v-4.625h3v9.375h-3v-1.3594c-0.44922 0.55469-0.92969 0.96094-1.4375 1.2188-0.5 0.25781-1.0586 0.39062-1.6719 0.39062-1.0859 0-1.9062-0.33203-2.4688-1-0.5625-0.66406-0.84375-1.6328-0.84375-2.9062z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m8.7656-9.0781v2.2812c-0.64844-0.26953-1.2656-0.47266-1.8594-0.60938-0.59375-0.13281-1.1562-0.20312-1.6875-0.20312-0.57422 0-1 0.074219-1.2812 0.21875-0.27344 0.13672-0.40625 0.35547-0.40625 0.65625 0 0.24219 0.10156 0.42188 0.3125 0.54688 0.20703 0.125 0.58203 0.21875 1.125 0.28125l0.53125 0.078125c1.5312 0.19922 2.5625 0.52344 3.0938 0.96875 0.53125 0.44922 0.79688 1.1484 0.79688 2.0938 0 1-0.37109 1.7578-1.1094 2.2656-0.73047 0.5-1.8281 0.75-3.2969 0.75-0.61719 0-1.2578-0.054688-1.9219-0.15625-0.65625-0.09375-1.3359-0.23828-2.0312-0.4375v-2.2812c0.59375 0.29297 1.2031 0.51172 1.8281 0.65625 0.63281 0.14844 1.2734 0.21875 1.9219 0.21875 0.58203 0 1.0195-0.078125 1.3125-0.23438 0.30078-0.16406 0.45312-0.41016 0.45312-0.73438 0-0.25781-0.10547-0.45312-0.3125-0.57812-0.19922-0.13281-0.60547-0.23828-1.2188-0.3125l-0.51562-0.078125c-1.3359-0.16406-2.2734-0.47266-2.8125-0.92188-0.53125-0.45703-0.79688-1.1445-0.79688-2.0625 0-0.98828 0.33594-1.7227 1.0156-2.2031 0.67578-0.47656 1.7188-0.71875 3.125-0.71875 0.55078 0 1.1289 0.042969 1.7344 0.125 0.61328 0.085938 1.2812 0.21484 2 0.39062z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m1.4375-13.016h3v13.016h-3z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m1.4375-9.375h3v9.375h-3zm0-3.6406h3v2.4375h-3z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m7.6094-13.016v1.9531h-1.6562c-0.42969 0-0.72656 0.078125-0.89062 0.23438-0.16797 0.15625-0.25 0.42188-0.25 0.79688v0.65625h2.5625v2.1406h-2.5625v7.2344h-3v-7.2344h-1.4844v-2.1406h1.4844v-0.65625c0-1.0195 0.28516-1.7695 0.85938-2.25 0.57031-0.48828 1.4531-0.73438 2.6406-0.73438z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m10.125-7.8125c0.38281-0.58203 0.83594-1.0234 1.3594-1.3281 0.51953-0.30078 1.0938-0.45312 1.7188-0.45312 1.0703 0 1.8906 0.33594 2.4531 1 0.5625 0.65625 0.84375 1.6211 0.84375 2.8906v5.7031h-3.0156v-4.8906c0.007813-0.070313 0.015625-0.14453 0.015625-0.21875 0.007812-0.082031 0.015625-0.19531 0.015625-0.34375 0-0.65625-0.10156-1.1328-0.29688-1.4375-0.19922-0.30078-0.51562-0.45312-0.95312-0.45312-0.5625 0-1 0.23438-1.3125 0.70312s-0.47656 1.1484-0.48438 2.0312v4.6094h-3.0156v-4.8906c0-1.0312-0.089844-1.6953-0.26562-2-0.17969-0.30078-0.49609-0.45312-0.95312-0.45312-0.57422 0-1.0156 0.24219-1.3281 0.71875-0.3125 0.46875-0.46875 1.1406-0.46875 2.0156v4.6094h-3.0156v-9.375h3.0156v1.375c0.36328-0.53125 0.78516-0.92578 1.2656-1.1875 0.47656-0.26953 1.0039-0.40625 1.5781-0.40625 0.64453 0 1.2109 0.15625 1.7031 0.46875 0.5 0.3125 0.87891 0.75 1.1406 1.3125z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m10.859-5.7031v5.7031h-3.0156v-4.3594c0-0.8125-0.023438-1.3672-0.0625-1.6719-0.03125-0.3125-0.089844-0.53906-0.17188-0.6875-0.11719-0.19531-0.27734-0.34766-0.48438-0.45312-0.19922-0.11328-0.42969-0.17188-0.6875-0.17188-0.625 0-1.1172 0.24609-1.4688 0.73438-0.35547 0.48047-0.53125 1.1484-0.53125 2v4.6094h-3v-13.016h3v5.0156c0.44531-0.55078 0.92578-0.95312 1.4375-1.2031 0.50781-0.25781 1.0703-0.39062 1.6875-0.39062 1.082 0 1.8984 0.33594 2.4531 1 0.5625 0.65625 0.84375 1.6211 0.84375 2.8906z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m1.5781-12.5h3.5938l4.5469 8.5781v-8.5781h3.0469v12.5h-3.5938l-4.5469-8.5781v8.5781h-3.0469z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m10.859-5.7031v5.7031h-3.0156v-4.375c0-0.80078-0.023438-1.3516-0.0625-1.6562-0.03125-0.3125-0.089844-0.53906-0.17188-0.6875-0.11719-0.19531-0.27734-0.34766-0.48438-0.45312-0.19922-0.11328-0.42969-0.17188-0.6875-0.17188-0.625 0-1.1172 0.24609-1.4688 0.73438-0.35547 0.48047-0.53125 1.1484-0.53125 2v4.6094h-3v-9.375h3v1.375c0.44531-0.55078 0.92578-0.95312 1.4375-1.2031 0.50781-0.25781 1.0703-0.39062 1.6875-0.39062 1.082 0 1.8984 0.33594 2.4531 1 0.5625 0.65625 0.84375 1.6211 0.84375 2.8906z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m1.5781-12.5h5.3438c1.5938 0 2.8125 0.35547 3.6562 1.0625 0.85156 0.71094 1.2812 1.7148 1.2812 3.0156 0 1.3125-0.42969 2.3242-1.2812 3.0312-0.84375 0.71094-2.0625 1.0625-3.6562 1.0625h-2.125v4.3281h-3.2188zm3.2188 2.3438v3.4844h1.7812c0.625 0 1.1016-0.14844 1.4375-0.45312 0.34375-0.30078 0.51562-0.73438 0.51562-1.2969 0-0.55078-0.17188-0.97656-0.51562-1.2812-0.33594-0.30078-0.8125-0.45312-1.4375-0.45312z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m1.4375-9.375h3v9.2031c0 1.2578-0.30469 2.2188-0.90625 2.875-0.60547 0.66406-1.4805 1-2.625 1h-1.4688v-1.9688h0.51562c0.5625 0 0.94531-0.13281 1.1562-0.39062 0.21875-0.25 0.32812-0.75781 0.32812-1.5156zm0-3.6406h3v2.4375h-3z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="M 249.60754,250.93265 H 451.5301 V 445.17088 H 249.60754 Z"
+     id="path70"
+     style="stroke-width:1.40851;fill:#ffffff" />
+  <path
+     d="M 681.09854,29.994766 C 673.71027,22.888169 663.68523,18.90049 653.24012,18.90049 h -0.0116 L 47.661969,19.089356 C 25.907182,19.094725 8.2741432,36.065343 8.2741432,56.986601 V 639.68749 c 0,10.05285 4.1513328,19.69596 11.5453458,26.80187 7.393871,7.10121 17.413308,11.09428 27.858421,11.09428 h 0.01681 l 605.56665,-0.18886 c 21.75048,-0.006 39.38208,-16.97599 39.38208,-37.89725 l -0.006,-582.714713 c 0,-10.052841 -4.15133,-19.690433 -11.54535,-26.796339 z M 249.60754,639.4257 V 445.18746 H 47.684977 V 250.93541 H 249.60754 V 56.932008 l 201.93693,-0.06475 V 250.93973 H 653.23725 V 445.19177 H 451.54447 v 194.23825"
+     id="path72"
+     style="stroke-width:1.40851;fill:#ffffff" />
+</svg>
diff --git a/Content/Slate/SodaIcons/circle-board.svg b/Content/Slate/SodaIcons/circle-board.svg
new file mode 100644
index 0000000..b60a79e
--- /dev/null
+++ b/Content/Slate/SodaIcons/circle-board.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg146"
+   sodipodi:docname="CircleBoard.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata150">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#4d4d3b"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview148"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="1029.857"
+     inkscape:cy="620.99191"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg146"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs62">
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m19.547-1.1719c-1.0117 0.52344-2.0625 0.91406-3.1562 1.1719-1.0938 0.26953-2.2344 0.40625-3.4219 0.40625-3.543 0-6.3516-0.98828-8.4219-2.9688-2.0625-1.9766-3.0938-4.6602-3.0938-8.0469 0-3.4062 1.0312-6.0977 3.0938-8.0781 2.0703-1.9766 4.8789-2.9688 8.4219-2.9688 1.1875 0 2.3281 0.13672 3.4219 0.40625 1.0938 0.26172 2.1445 0.65625 3.1562 1.1875v4.3906c-1.0234-0.6875-2.0273-1.1914-3.0156-1.5156-0.98047-0.32031-2.0156-0.48438-3.1094-0.48438-1.9609 0-3.5 0.625-4.625 1.875-1.1172 1.25-1.6719 2.9805-1.6719 5.1875 0 2.1875 0.55469 3.9141 1.6719 5.1719 1.125 1.25 2.6641 1.875 4.625 1.875 1.0938 0 2.1289-0.16016 3.1094-0.48438 0.98828-0.32031 1.9922-0.82812 3.0156-1.5156z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m14.297-11.609c-0.44922-0.20703-0.89062-0.35938-1.3281-0.45312-0.4375-0.10156-0.88281-0.15625-1.3281-0.15625-1.3125 0-2.3242 0.42188-3.0312 1.2656-0.71094 0.83594-1.0625 2.0391-1.0625 3.6094v7.3438h-5.0938v-15.953h5.0938v2.625c0.65625-1.0508 1.4062-1.8164 2.25-2.2969 0.85156-0.47656 1.875-0.71875 3.0625-0.71875 0.17578 0 0.36328 0.011719 0.5625 0.03125 0.19531 0.011719 0.48438 0.042969 0.85938 0.09375z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m18.375-8.0156v1.4531h-11.922c0.125 1.1992 0.55469 2.0938 1.2969 2.6875 0.73828 0.59375 1.7734 0.89062 3.1094 0.89062 1.0703 0 2.1719-0.15625 3.2969-0.46875 1.125-0.32031 2.2812-0.80469 3.4688-1.4531v3.9375c-1.2109 0.46094-2.418 0.80469-3.625 1.0312-1.2109 0.22656-2.4141 0.34375-3.6094 0.34375-2.8984 0-5.1484-0.72656-6.75-2.1875-1.5938-1.4688-2.3906-3.5312-2.3906-6.1875 0-2.5938 0.78516-4.6328 2.3594-6.125 1.5703-1.5 3.7344-2.25 6.4844-2.25 2.5078 0 4.5156 0.75781 6.0156 2.2656 1.5078 1.5117 2.2656 3.5312 2.2656 6.0625zm-5.2344-1.7031c0-0.96875-0.28906-1.75-0.85938-2.3438-0.5625-0.59375-1.2969-0.89062-2.2031-0.89062-0.99219 0-1.7969 0.28125-2.4219 0.84375-0.61719 0.55469-0.99609 1.3516-1.1406 2.3906z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m9.5938-7.1719c-1.0625 0-1.8672 0.18359-2.4062 0.54688-0.53125 0.35547-0.79688 0.88281-0.79688 1.5781 0 0.64844 0.21094 1.1523 0.64062 1.5156 0.4375 0.36719 1.0391 0.54688 1.8125 0.54688 0.95703 0 1.7656-0.34375 2.4219-1.0312s0.98438-1.5469 0.98438-2.5781v-0.57812zm7.7969-1.9375v9.1094h-5.1406v-2.3594c-0.6875 0.96875-1.4609 1.6719-2.3125 2.1094-0.85547 0.4375-1.8906 0.65625-3.1094 0.65625-1.6562 0-3-0.47656-4.0312-1.4375-1.0312-0.96875-1.5469-2.2188-1.5469-3.75 0-1.875 0.64062-3.25 1.9219-4.125 1.2891-0.875 3.3164-1.3125 6.0781-1.3125h3v-0.39062c0-0.8125-0.32031-1.4062-0.95312-1.7812-0.63672-0.375-1.6328-0.5625-2.9844-0.5625-1.0859 0-2.1016 0.10938-3.0469 0.32812-0.9375 0.21875-1.8086 0.54688-2.6094 0.98438v-3.8906c1.082-0.25781 2.1758-0.45703 3.2812-0.59375 1.1016-0.14453 2.207-0.21875 3.3125-0.21875 2.875 0 4.9453 0.57031 6.2188 1.7031 1.2812 1.1367 1.9219 2.9805 1.9219 5.5312z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m8.0156-20.484v4.5312h5.2656v3.6406h-5.2656v6.7656c0 0.74219 0.14453 1.2461 0.4375 1.5156 0.30078 0.26172 0.89062 0.39062 1.7656 0.39062h2.6094v3.6406h-4.3594c-2.0234 0-3.4531-0.41406-4.2969-1.25-0.83594-0.84375-1.25-2.2734-1.25-4.2969v-6.7656h-2.5312v-3.6406h2.5312v-4.5312z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m13.297-13.625v-8.5312h5.1406v22.156h-5.1406v-2.3125c-0.69922 0.94922-1.4688 1.6406-2.3125 2.0781-0.84375 0.42578-1.8242 0.64062-2.9375 0.64062-1.9688 0-3.5859-0.77344-4.8438-2.3281-1.2617-1.5625-1.8906-3.5781-1.8906-6.0469 0-2.457 0.62891-4.4688 1.8906-6.0312 1.2578-1.5625 2.875-2.3438 4.8438-2.3438 1.1016 0 2.0781 0.22656 2.9219 0.67188 0.85156 0.4375 1.6289 1.1211 2.3281 2.0469zm-3.3594 10.328c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031-1.0859 0-1.9141 0.40234-2.4844 1.2031-0.57422 0.80469-0.85938 1.9609-0.85938 3.4688 0 1.5234 0.28516 2.6836 0.85938 3.4844 0.57031 0.79297 1.3984 1.1875 2.4844 1.1875z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.938-3.2969c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031s-1.9336 0.40234-2.5156 1.2031c-0.58594 0.80469-0.875 1.9609-0.875 3.4688 0 1.5117 0.28906 2.668 0.875 3.4688 0.58203 0.80469 1.4219 1.2031 2.5156 1.2031zm-3.3906-10.328c0.70703-0.92578 1.4883-1.6094 2.3438-2.0469 0.85156-0.44531 1.832-0.67188 2.9375-0.67188 1.9688 0 3.582 0.78125 4.8438 2.3438 1.2695 1.5625 1.9062 3.5742 1.9062 6.0312 0 2.4688-0.63672 4.4844-1.9062 6.0469-1.2617 1.5547-2.875 2.3281-4.8438 2.3281-1.1055 0-2.0859-0.21875-2.9375-0.65625-0.85547-0.4375-1.6367-1.125-2.3438-2.0625v2.3125h-5.0938v-22.156h5.0938z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m0.35938-15.953h5.0938l4.2969 10.828 3.6406-10.828h5.0938l-6.7031 17.469c-0.67969 1.7695-1.4648 3.0078-2.3594 3.7188-0.89844 0.70703-2.0781 1.0625-3.5469 1.0625h-2.9531v-3.3438h1.5938c0.86328 0 1.4922-0.14062 1.8906-0.42188 0.39453-0.27344 0.70312-0.76562 0.92188-1.4844l0.14062-0.4375z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h6.125l7.7344 14.578v-14.578h5.2031v21.266h-6.125l-7.7344-14.594v14.594h-5.2031z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m10.047-12.688c-1.1367 0-2 0.40625-2.5938 1.2188s-0.89062 1.9805-0.89062 3.5c0 1.5312 0.29688 2.7031 0.89062 3.5156s1.457 1.2188 2.5938 1.2188c1.1016 0 1.9453-0.40625 2.5312-1.2188 0.59375-0.8125 0.89062-1.9844 0.89062-3.5156 0-1.5195-0.29688-2.6875-0.89062-3.5-0.58594-0.8125-1.4297-1.2188-2.5312-1.2188zm0-3.6562c2.7383 0 4.8789 0.74609 6.4219 2.2344 1.5391 1.4805 2.3125 3.5273 2.3125 6.1406 0 2.625-0.77344 4.6797-2.3125 6.1562-1.543 1.4805-3.6836 2.2188-6.4219 2.2188-2.7617 0-4.918-0.73828-6.4688-2.2188-1.5547-1.4766-2.3281-3.5312-2.3281-6.1562 0-2.6133 0.77344-4.6602 2.3281-6.1406 1.5508-1.4883 3.707-2.2344 6.4688-2.2344z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m15.344-15.453v4.1562c-0.69922-0.46875-1.3984-0.81641-2.0938-1.0469-0.69922-0.22656-1.4219-0.34375-2.1719-0.34375-1.4297 0-2.5391 0.41797-3.3281 1.25-0.79297 0.82422-1.1875 1.9805-1.1875 3.4688 0 1.5 0.39453 2.668 1.1875 3.5 0.78906 0.82422 1.8984 1.2344 3.3281 1.2344 0.80078 0 1.5547-0.11719 2.2656-0.35938 0.71875-0.23828 1.3828-0.58594 2-1.0469v4.1719c-0.80469 0.29297-1.6172 0.50781-2.4375 0.65625-0.8125 0.14453-1.6367 0.21875-2.4688 0.21875-2.875 0-5.125-0.73438-6.75-2.2031-1.625-1.4766-2.4375-3.5352-2.4375-6.1719 0-2.625 0.8125-4.6758 2.4375-6.1562 1.625-1.4766 3.875-2.2188 6.75-2.2188 0.83203 0 1.6562 0.078125 2.4688 0.23438 0.8125 0.14844 1.625 0.36719 2.4375 0.65625z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.4531-15.953h5.0938v15.953h-5.0938zm0-6.2031h5.0938v4.1562h-5.0938z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4375c0-1.375-0.03125-2.3203-0.09375-2.8438-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-15.953h5.0938v2.3281c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m14.906-15.453v3.875c-1.0859-0.45703-2.1367-0.80078-3.1562-1.0312-1.0117-0.22656-1.9688-0.34375-2.875-0.34375-0.96875 0-1.6875 0.125-2.1562 0.375-0.46875 0.24219-0.70312 0.60938-0.70312 1.1094 0 0.40625 0.17578 0.71875 0.53125 0.9375 0.35156 0.21875 0.99219 0.38281 1.9219 0.48438l0.89062 0.14062c2.6133 0.32422 4.3672 0.86719 5.2656 1.625 0.90625 0.76172 1.3594 1.9531 1.3594 3.5781 0 1.6992-0.63281 2.9766-1.8906 3.8281-1.25 0.85547-3.1211 1.2812-5.6094 1.2812-1.0547 0-2.1406-0.085938-3.2656-0.25-1.125-0.15625-2.2812-0.39844-3.4688-0.73438v-3.875c1.0195 0.49219 2.0625 0.85938 3.125 1.1094 1.0703 0.24219 2.1602 0.35938 3.2656 0.35938 0.98828 0 1.7344-0.13281 2.2344-0.40625 0.50781-0.26953 0.76562-0.67578 0.76562-1.2188 0-0.45703-0.17969-0.79688-0.53125-1.0156-0.34375-0.22656-1.0312-0.40625-2.0625-0.53125l-0.89062-0.10938c-2.2734-0.28125-3.8672-0.80469-4.7812-1.5781-0.90625-0.76953-1.3594-1.9414-1.3594-3.5156 0-1.6875 0.57812-2.9375 1.7344-3.75 1.1562-0.82031 2.9297-1.2344 5.3281-1.2344 0.9375 0 1.9219 0.074219 2.9531 0.21875 1.0391 0.14844 2.1641 0.37109 3.375 0.67188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.953-22.156v3.3438h-2.8281c-0.71875 0-1.2266 0.13281-1.5156 0.39062-0.28125 0.26172-0.42188 0.71484-0.42188 1.3594v1.1094h4.3594v3.6406h-4.3594v12.312h-5.0938v-12.312h-2.5312v-3.6406h2.5312v-1.1094c0-1.7383 0.48438-3.0195 1.4531-3.8438 0.96875-0.83203 2.4688-1.25 4.5-1.25z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.234-13.297c0.64453-0.98828 1.4102-1.7422 2.2969-2.2656 0.89453-0.51953 1.875-0.78125 2.9375-0.78125 1.832 0 3.2266 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219v9.7188h-5.125v-8.3125-0.39062c0.007812-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.1328-0.16797-1.9531-0.5-2.4531-0.32422-0.50781-0.85938-0.76562-1.6094-0.76562-0.96875 0-1.7188 0.40234-2.25 1.2031-0.52344 0.79297-0.79297 1.9453-0.8125 3.4531v7.8281h-5.125v-8.3125c0-1.7695-0.15234-2.9062-0.45312-3.4062-0.30469-0.50781-0.84375-0.76562-1.625-0.76562-0.98047 0-1.7344 0.40234-2.2656 1.2031-0.53125 0.80469-0.79688 1.9492-0.79688 3.4375v7.8438h-5.125v-15.953h5.125v2.3281c0.625-0.89453 1.3438-1.5703 2.1562-2.0312 0.8125-0.45703 1.707-0.6875 2.6875-0.6875 1.1016 0 2.0781 0.26562 2.9219 0.79688s1.4844 1.2812 1.9219 2.25z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4062c0-1.3945-0.03125-2.3516-0.09375-2.875-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-22.156h5.0938v8.5312c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.2812-6.2031v-9.75h5.125v1.5938c0 0.86719-0.007812 1.9531-0.015625 3.2656-0.011719 1.3047-0.015625 2.1719-0.015625 2.6094 0 1.2812 0.03125 2.2031 0.09375 2.7656 0.070312 0.5625 0.1875 0.97656 0.34375 1.2344 0.21875 0.33594 0.49219 0.58984 0.82812 0.76562 0.33203 0.17969 0.71875 0.26562 1.1562 0.26562 1.0625 0 1.8945-0.40625 2.5-1.2188 0.61328-0.8125 0.92188-1.9453 0.92188-3.4062v-7.875h5.0938v15.953h-5.0938v-2.3125c-0.77344 0.9375-1.5898 1.625-2.4531 2.0625-0.85547 0.4375-1.7969 0.65625-2.8281 0.65625-1.8438 0-3.25-0.5625-4.2188-1.6875-0.96094-1.1328-1.4375-2.7734-1.4375-4.9219z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h9.1094c2.707 0 4.7852 0.60547 6.2344 1.8125 1.4453 1.1992 2.1719 2.9062 2.1719 5.125 0 2.2305-0.72656 3.9492-2.1719 5.1562-1.4492 1.1992-3.5273 1.7969-6.2344 1.7969h-3.625v7.375h-5.4844zm5.4844 3.9688v5.9375h3.0469c1.0625 0 1.8789-0.25391 2.4531-0.76562 0.58203-0.51953 0.875-1.2539 0.875-2.2031 0-0.94531-0.29297-1.6758-0.875-2.1875-0.57422-0.51953-1.3906-0.78125-2.4531-0.78125z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.4531-15.953h5.0938v15.672c0 2.1328-0.51562 3.7656-1.5469 4.8906-1.0234 1.125-2.5078 1.6875-4.4531 1.6875h-2.5156v-3.3438h0.89062c0.96875 0 1.6289-0.21875 1.9844-0.65625 0.36328-0.4375 0.54688-1.2969 0.54688-2.5781zm0-6.2031h5.0938v4.1562h-5.0938z"
+         id="path59" />
+    </symbol>
+  </defs>
+  <path
+     id="path64"
+     style="fill:#ffffff;stroke-width:1.68251"
+     d="M 100.91211 63.332031 C 95.70678 63.325498 90.711721 65.395701 87.03125 69.076172 C 83.350779 72.756642 81.280547 77.75171 81.287109 82.957031 L 81.287109 828.87695 C 81.280443 834.08227 83.350779 839.07733 87.03125 842.75781 C 90.711721 846.43828 95.70678 848.50851 100.91211 848.50195 L 846.83203 848.50195 C 852.03736 848.50862 857.03242 846.43828 860.71289 842.75781 C 864.39336 839.07733 866.46359 834.08227 866.45703 828.87695 L 866.45703 82.957031 C 866.4637 77.75171 864.39336 72.756642 860.71289 69.076172 C 857.03242 65.395701 852.03736 63.32547 846.83203 63.332031 L 100.91211 63.332031 z M 702.05664 113.65039 A 89.351235 89.351235 0 0 1 702.51367 113.65039 A 89.351235 89.351235 0 0 1 791.86523 203 A 89.351235 89.351235 0 0 1 702.51367 292.35156 A 89.351235 89.351235 0 0 1 613.16211 203 A 89.351235 89.351235 0 0 1 702.05664 113.65039 z M 221.25977 113.70703 A 89.351235 89.351235 0 0 1 310.61133 203.05859 A 89.351235 89.351235 0 0 1 221.25977 292.41016 A 89.351235 89.351235 0 0 1 131.9082 203.05859 A 89.351235 89.351235 0 0 1 221.25977 113.70703 z M 463.27734 113.76953 A 89.351235 89.351235 0 0 1 463.73438 113.76953 A 89.351235 89.351235 0 0 1 553.08594 203.11914 A 89.351235 89.351235 0 0 1 463.73438 292.4707 A 89.351235 89.351235 0 0 1 374.38281 203.11914 A 89.351235 89.351235 0 0 1 463.27734 113.76953 z M 701.75195 356.7168 A 89.351235 89.351235 0 0 1 791.10352 446.06836 A 89.351235 89.351235 0 0 1 701.75195 535.41992 A 89.351235 89.351235 0 0 1 612.40039 446.06836 A 89.351235 89.351235 0 0 1 701.75195 356.7168 z M 220.49609 356.77539 A 89.351235 89.351235 0 0 1 309.84766 446.12695 A 89.351235 89.351235 0 0 1 220.49609 535.47852 A 89.351235 89.351235 0 0 1 131.14648 446.12695 A 89.351235 89.351235 0 0 1 220.49609 356.77539 z M 462.97266 356.83594 A 89.351235 89.351235 0 0 1 552.32422 446.1875 A 89.351235 89.351235 0 0 1 462.97266 535.53906 A 89.351235 89.351235 0 0 1 373.62109 446.1875 A 89.351235 89.351235 0 0 1 462.97266 356.83594 z M 701.96875 607.71289 A 89.351235 89.351235 0 0 1 791.32031 697.06445 A 89.351235 89.351235 0 0 1 701.96875 786.41602 A 89.351235 89.351235 0 0 1 612.61719 697.06445 A 89.351235 89.351235 0 0 1 701.96875 607.71289 z M 220.71484 607.77148 A 89.351235 89.351235 0 0 1 310.06445 697.12305 A 89.351235 89.351235 0 0 1 220.71484 786.47461 A 89.351235 89.351235 0 0 1 131.36328 697.12305 A 89.351235 89.351235 0 0 1 220.71484 607.77148 z M 463.18945 607.83203 A 89.351235 89.351235 0 0 1 552.54102 697.18359 A 89.351235 89.351235 0 0 1 463.18945 786.53516 A 89.351235 89.351235 0 0 1 373.83789 697.18359 A 89.351235 89.351235 0 0 1 463.18945 607.83203 z "
+     transform="scale(0.75000002)" />
+</svg>
diff --git a/Content/Slate/SodaIcons/compass.svg b/Content/Slate/SodaIcons/compass.svg
new file mode 100644
index 0000000..e986eb3
--- /dev/null
+++ b/Content/Slate/SodaIcons/compass.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg137"
+   sodipodi:docname="compass.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata141">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#362c27"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview139"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="415.70167"
+     inkscape:cy="450.59662"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg137"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs59">
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path56" />
+    </symbol>
+  </defs>
+  <path
+     d="m 350.45833,7.292761 c -6.63581,0.201085 -13.02174,4.369518 -15.82604,11.929289 l -58.18975,189.18904 -95.446,-49.9129 c -15.71753,-8.6358 -30.77696,11.41298 -23.13037,23.37524 l 50.15777,94.22861 -188.201221,57.94488 c -17.4997782,7.93473 -12.206436,29.11436 0,32.86948 l 188.938611,58.18975 -50.15778,94.95626 c -8.53256,16.80969 9.40214,30.05487 23.62011,23.13037 l 94.46653,-50.15777 57.94488,188.68817 c 7.94015,16.94604 27.35297,12.73903 32.86948,0 l 58.18975,-189.18904 95.20113,49.9129 c 17.77665,7.19024 28.34218,-10.12491 23.13037,-23.37524 L 493.86802,424.84319 682.5562,366.89831 c 18.29839,-7.80436 12.39677,-28.18497 0,-32.86948 l -189.42556,-57.94488 50.15777,-95.20113 c 7.03261,-16.46187 -9.92929,-30.54322 -23.62011,-23.13037 L 425.68456,207.91022 367.49481,19.22205 C 363.9296,10.852542 357.08718,7.091579 350.45138,7.292761 Z m 0.73461,279.515669 c 35.02182,0 63.79391,28.55366 63.79391,63.54904 0,34.99538 -28.63018,64.03182 -63.79391,64.03182 -35.35295,0 -64.03183,-29.03783 -64.03183,-64.03182 0,-34.99399 28.81523,-63.54904 64.03183,-63.54904 z"
+     fill-rule="evenodd"
+     id="path61"
+     style="fill:#ffffff;stroke-width:1.3913"
+     sodipodi:nodetypes="cccccccccccccccccccccccccccsssss" />
+  <path
+     style="opacity:0.52809;fill:#ffffff;fill-opacity:0.5;stroke-width:3.13523;stroke-dasharray:3.13523, 9.4057"
+     d="m 452.54065,550.21846 c -39.83281,-8.60337 -68.1913,-42.79336 -68.1913,-82.21383 0,-30.26301 13.52179,-54.77744 39.46242,-71.54368 26.41426,-17.07236 62.4279,-17.15409 88.41136,-0.20065 24.60275,16.05258 37.80415,38.22076 39.47028,66.27962 0.9548,16.07968 -1.07049,26.15119 -8.31627,41.35565 -13.26351,27.83204 -40.30483,45.70353 -71.24129,47.08305 -7.32861,0.3268 -16.14645,-0.0157 -19.5952,-0.76016 z"
+     id="path1003"
+     transform="scale(0.75000002)" />
+</svg>
diff --git a/Content/Slate/SodaIcons/critical.svg b/Content/Slate/SodaIcons/critical.svg
new file mode 100644
index 0000000..1403300
--- /dev/null
+++ b/Content/Slate/SodaIcons/critical.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg4"
+   sodipodi:docname="critical.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#554d45"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="389.9896"
+     inkscape:cy="515.33594"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 2.1332147,212.56822 v 275.69621 c 0,8.29374 3.4545707,16.58303 10.3635883,22.80197 L 208.73628,687.27187 c 5.52924,5.52924 13.12833,8.98368 21.42231,8.98368 h 235.62818 c 6.90914,0 14.51293,-2.76462 20.03772,-8.29373 L 682.06397,511.75635 c 6.90914,-5.52924 11.74831,-13.81877 11.74831,-23.49241 V 212.56773 c 0,-8.29374 -3.45457,-16.58303 -10.36359,-22.80197 L 487.20921,13.560295 C 481.67997,8.031055 474.08088,4.576608 465.7869,4.576608 H 230.15872 c -7.59897,0 -14.51293,2.76462 -20.73187,7.598969 L 13.879052,188.38104 C 6.2800829,194.60023 2.1307444,202.89397 2.1307444,212.5676 Z M 217.72738,285.12298 c -12.43789,-11.74831 -12.43789,-31.78517 0,-43.53384 l 21.42231,-21.42232 c 11.74831,-12.43789 31.78516,-12.43789 43.53384,0 l 64.95122,64.95122 65.64536,-64.95122 c 11.74831,-12.43789 31.09596,-12.43789 43.53385,0 l 21.42231,21.42232 c 11.74831,11.7483 11.74831,31.78516 0,43.53384 l -64.95121,64.95121 64.95121,65.64537 c 11.74831,11.74831 11.74831,31.09595 0,43.53384 l -21.42231,21.42232 c -12.43789,11.7483 -31.78517,11.7483 -43.53385,0 l -65.64536,-64.95122 -64.95122,64.95122 c -11.7483,11.7483 -31.78516,11.7483 -43.53384,0 L 217.72738,459.2534 c -12.43789,-12.43789 -12.43789,-31.78516 0,-43.53384 l 64.95121,-65.64537 z"
+     fill-rule="evenodd"
+     id="path2"
+     style="fill:#ffffff;stroke-width:1.23514" />
+</svg>
diff --git a/Content/Slate/SodaIcons/device.svg b/Content/Slate/SodaIcons/device.svg
new file mode 100644
index 0000000..63e7ef5
--- /dev/null
+++ b/Content/Slate/SodaIcons/device.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg95"
+   sodipodi:docname="device.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata99">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#272aff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview97"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="960.53726"
+     inkscape:cy="856.1052"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg95"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs47">
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m36.078-2.1562c-1.8672 0.96875-3.8086 1.6992-5.8281 2.1875-2.0117 0.48828-4.1094 0.73438-6.2969 0.73438-6.543 0-11.727-1.8281-15.547-5.4844-3.8125-3.6562-5.7188-8.6133-5.7188-14.875 0-6.2695 1.9062-11.234 5.7188-14.891 3.8203-3.6562 9.0039-5.4844 15.547-5.4844 2.1875 0 4.2852 0.25 6.2969 0.75 2.0195 0.49219 3.9609 1.2148 5.8281 2.1719v8.125c-1.875-1.2812-3.7266-2.2188-5.5469-2.8125-1.8242-0.59375-3.7461-0.89062-5.7656-0.89062-3.6172 0-6.4609 1.1562-8.5312 3.4688-2.0625 2.3125-3.0938 5.5-3.0938 9.5625 0 4.0547 1.0312 7.2344 3.0938 9.5469 2.0703 2.3125 4.9141 3.4688 8.5312 3.4688 2.0195 0 3.9414-0.29688 5.7656-0.89062 1.8203-0.59375 3.6719-1.5312 5.5469-2.8125z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m26.391-21.422c-0.82422-0.38281-1.6406-0.67188-2.4531-0.85938s-1.6328-0.28125-2.4531-0.28125c-2.4297 0-4.293 0.77734-5.5938 2.3281-1.3047 1.5547-1.9531 3.7773-1.9531 6.6719v13.562h-9.4219v-29.453h9.4219v4.8438c1.207-1.9258 2.5938-3.332 4.1562-4.2188 1.5703-0.88281 3.4531-1.3281 5.6406-1.3281 0.32031 0 0.66406 0.015625 1.0312 0.046875 0.36328 0.023437 0.89844 0.074219 1.6094 0.15625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m33.922-14.797v2.6719h-22.016c0.22656 2.2109 1.0234 3.8672 2.3906 4.9688 1.375 1.1055 3.2852 1.6562 5.7344 1.6562 1.9766 0 4.0039-0.28906 6.0781-0.875 2.082-0.58203 4.2188-1.4727 6.4062-2.6719v7.2656c-2.2188 0.83594-4.4453 1.4648-6.6719 1.8906-2.2305 0.4375-4.4531 0.65625-6.6719 0.65625-5.3359 0-9.4805-1.3516-12.438-4.0625-2.9492-2.707-4.4219-6.5078-4.4219-11.406 0-4.8008 1.4453-8.5781 4.3438-11.328 2.9062-2.75 6.8984-4.125 11.984-4.125 4.625 0 8.3281 1.3984 11.109 4.1875 2.7812 2.7812 4.1719 6.5078 4.1719 11.172zm-9.6875-3.1406c0-1.7812-0.52344-3.2188-1.5625-4.3125-1.043-1.0938-2.4023-1.6406-4.0781-1.6406-1.8242 0-3.3086 0.51172-4.4531 1.5312-1.1367 1.0234-1.8438 2.4961-2.125 4.4219z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m17.719-13.25c-1.9609 0-3.4375 0.33594-4.4375 1-0.99219 0.66797-1.4844 1.6484-1.4844 2.9375 0 1.1992 0.39844 2.1367 1.2031 2.8125 0.80078 0.66797 1.9102 1 3.3281 1 1.7695 0 3.2578-0.63281 4.4688-1.9062 1.207-1.2695 1.8125-2.8594 1.8125-4.7656v-1.0781zm14.375-3.5469v16.797h-9.4844v-4.3594c-1.2617 1.7812-2.6836 3.0859-4.2656 3.9062-1.5742 0.8125-3.4922 1.2188-5.75 1.2188-3.0547 0-5.5312-0.89062-7.4375-2.6719-1.8984-1.7812-2.8438-4.0859-2.8438-6.9219 0-3.457 1.1875-5.9883 3.5625-7.5938 2.375-1.6133 6.1016-2.4219 11.188-2.4219h5.5469v-0.75c0-1.4883-0.58984-2.5781-1.7656-3.2656-1.168-0.6875-2.9961-1.0312-5.4844-1.0312-2.0234 0-3.9023 0.20312-5.6406 0.60938-1.7305 0.39844-3.3398 0.99609-4.8281 1.7969v-7.1719c2.0078-0.48828 4.0312-0.85938 6.0625-1.1094 2.0391-0.25781 4.0781-0.39062 6.1094-0.39062 5.3125 0 9.1445 1.0469 11.5 3.1406 2.3516 2.0938 3.5312 5.5 3.5312 10.219z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m14.797-37.812v8.3594h9.7031v6.7344h-9.7031v12.484c0 1.375 0.26953 2.3047 0.8125 2.7812 0.55078 0.48047 1.6289 0.71875 3.2344 0.71875h4.8438v6.7344h-8.0781c-3.7109 0-6.3398-0.77344-7.8906-2.3281-1.5547-1.5508-2.3281-4.1875-2.3281-7.9062v-12.484h-4.6875v-6.7344h4.6875v-8.3594z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m24.562-25.141v-15.766h9.4531v40.906h-9.4531v-4.2656c-1.3047 1.7422-2.7344 3.0156-4.2969 3.8281-1.5547 0.80078-3.3555 1.2031-5.4062 1.2031-3.6367 0-6.6211-1.4414-8.9531-4.3281-2.3242-2.8828-3.4844-6.5977-3.4844-11.141 0-4.5312 1.1602-8.2383 3.4844-11.125 2.332-2.8828 5.3164-4.3281 8.9531-4.3281 2.0312 0 3.8281 0.41406 5.3906 1.2344 1.5703 0.8125 3.0078 2.0742 4.3125 3.7812zm-6.2188 19.062c2.0195 0 3.5625-0.73438 4.625-2.2031s1.5938-3.6094 1.5938-6.4219c0-2.8008-0.53125-4.9375-1.5938-6.4062s-2.6055-2.2031-4.625-2.2031c-1.9922 0-3.5156 0.73438-4.5781 2.2031s-1.5938 3.6055-1.5938 6.4062c0 2.8125 0.53125 4.9531 1.5938 6.4219s2.5859 2.2031 4.5781 2.2031z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m20.188-6.0781c2.0195 0 3.5547-0.73438 4.6094-2.2031 1.0625-1.4688 1.5938-3.6094 1.5938-6.4219 0-2.8008-0.53125-4.9375-1.5938-6.4062-1.0547-1.4688-2.5898-2.2031-4.6094-2.2031-2.0117 0-3.5586 0.74219-4.6406 2.2188-1.0742 1.4805-1.6094 3.6094-1.6094 6.3906 0 2.793 0.53516 4.9297 1.6094 6.4062 1.082 1.4805 2.6289 2.2188 4.6406 2.2188zm-6.25-19.062c1.2891-1.707 2.7227-2.9688 4.2969-3.7812 1.582-0.82031 3.3984-1.2344 5.4531-1.2344 3.625 0 6.6016 1.4453 8.9375 4.3281 2.332 2.8867 3.5 6.5938 3.5 11.125 0 4.543-1.168 8.2578-3.5 11.141-2.3359 2.8867-5.3125 4.3281-8.9375 4.3281-2.0547 0-3.8711-0.40625-5.4531-1.2188-1.5742-0.82031-3.0078-2.0938-4.2969-3.8125v4.2656h-9.4219v-40.906h9.4219z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.65625-29.453h9.4062l7.9219 19.984 6.7344-19.984h9.4062l-12.375 32.234c-1.25 3.2812-2.7031 5.5703-4.3594 6.875-1.6562 1.3125-3.8438 1.9688-6.5625 1.9688h-5.4375v-6.1875h2.9375c1.6016 0 2.7656-0.25781 3.4844-0.76562 0.72656-0.5 1.2969-1.4062 1.7031-2.7188l0.26562-0.82812z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m15.062-31.609v23.953h3.625c4.1328 0 7.2891-1.0195 9.4688-3.0625 2.1875-2.0508 3.2812-5.0352 3.2812-8.9531 0-3.8828-1.0898-6.8438-3.2656-8.875-2.168-2.0391-5.3281-3.0625-9.4844-3.0625zm-10.125-7.6406h10.672c5.9688 0 10.41 0.42969 13.328 1.2812 2.9141 0.84375 5.4141 2.2812 7.5 4.3125 1.8438 1.7734 3.207 3.8125 4.0938 6.125 0.89453 2.3125 1.3438 4.9336 1.3438 7.8594 0 2.9688-0.44922 5.6172-1.3438 7.9375-0.88672 2.3242-2.25 4.3711-4.0938 6.1406-2.1055 2.0312-4.6328 3.4766-7.5781 4.3281-2.9375 0.84375-7.3555 1.2656-13.25 1.2656h-10.672z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m4.5156-29.453h9.4219v29.453h-9.4219zm0-11.453h9.4219v7.6719h-9.4219z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m34.125-17.938v17.938h-9.4688v-13.719c0-2.5391-0.058594-4.2891-0.17188-5.25-0.11719-0.96875-0.3125-1.6797-0.59375-2.1406-0.36719-0.61328-0.86719-1.0938-1.5-1.4375-0.625-0.34375-1.3398-0.51562-2.1406-0.51562-1.9688 0-3.5156 0.76172-4.6406 2.2812-1.1172 1.5117-1.6719 3.6094-1.6719 6.2969v14.484h-9.4219v-29.453h9.4219v4.3125c1.4141-1.707 2.9219-2.9688 4.5156-3.7812 1.5938-0.82031 3.3516-1.2344 5.2812-1.2344 3.4062 0 5.9883 1.0469 7.75 3.1406 1.7578 2.0859 2.6406 5.1094 2.6406 9.0781z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m18.531-23.422c-2.0859 0-3.6719 0.75-4.7656 2.25s-1.6406 3.6562-1.6406 6.4688c0 2.8242 0.54688 4.9844 1.6406 6.4844s2.6797 2.25 4.7656 2.25c2.0508 0 3.6172-0.75 4.7031-2.25 1.0938-1.5 1.6406-3.6602 1.6406-6.4844 0-2.8125-0.54688-4.9688-1.6406-6.4688-1.0859-1.5-2.6523-2.25-4.7031-2.25zm0-6.7344c5.0703 0 9.0312 1.3711 11.875 4.1094 2.8438 2.7305 4.2656 6.5117 4.2656 11.344 0 4.8438-1.4219 8.6367-4.2656 11.375-2.8438 2.7305-6.8047 4.0938-11.875 4.0938-5.0859 0-9.0586-1.3633-11.922-4.0938-2.8672-2.7383-4.2969-6.5312-4.2969-11.375 0-4.832 1.4297-8.6133 4.2969-11.344 2.8633-2.7383 6.8359-4.1094 11.922-4.1094z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m27.531-28.531v7.1562c-2.0234-0.84375-3.9688-1.4727-5.8438-1.8906-1.875-0.41406-3.6484-0.625-5.3125-0.625-1.7812 0-3.1094 0.22656-3.9844 0.67188-0.86719 0.4375-1.2969 1.1211-1.2969 2.0469 0 0.76172 0.32812 1.3438 0.98438 1.75 0.65625 0.39844 1.832 0.69531 3.5312 0.89062l1.6562 0.23438c4.8203 0.61719 8.0664 1.625 9.7344 3.0312 1.6641 1.3984 2.5 3.5938 2.5 6.5938 0 3.1367-1.1562 5.4961-3.4688 7.0781-2.3125 1.5742-5.7656 2.3594-10.359 2.3594-1.9492 0-3.9648-0.15625-6.0469-0.46875-2.0742-0.30078-4.2031-0.75781-6.3906-1.375v-7.1562c1.875 0.91797 3.7969 1.6055 5.7656 2.0625 1.9766 0.44922 3.9844 0.67188 6.0156 0.67188 1.832 0 3.2109-0.25 4.1406-0.75 0.9375-0.50781 1.4062-1.2656 1.4062-2.2656 0-0.84375-0.32422-1.4688-0.96875-1.875-0.63672-0.41406-1.9062-0.73828-3.8125-0.96875l-1.6562-0.20312c-4.1992-0.53125-7.1406-1.5039-8.8281-2.9219-1.6797-1.4141-2.5156-3.5703-2.5156-6.4688 0-3.125 1.0664-5.4375 3.2031-6.9375 2.1445-1.5078 5.4258-2.2656 9.8438-2.2656 1.7383 0 3.5625 0.13672 5.4688 0.40625 1.9062 0.26172 3.9844 0.66797 6.2344 1.2188z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m23.891-40.906v6.1719h-5.2031c-1.3359 0-2.2617 0.24609-2.7812 0.73438-0.52344 0.48047-0.78125 1.3125-0.78125 2.5v2.0469h8.0312v6.7344h-8.0312v22.719h-9.4219v-22.719h-4.6719v-6.7344h4.6719v-2.0469c0-3.207 0.89062-5.5781 2.6719-7.1094 1.7891-1.5312 4.5625-2.2969 8.3125-2.2969z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m4.9375-39.25h10.125v31.594h17.781v7.6562h-27.906z"
+         id="path44" />
+    </symbol>
+  </defs>
+  <path
+     d="m 296.15621,329.94421 h 401.11602 v -57.52039 c 0,-23.71438 -19.25709,-43.11693 -43.11694,-43.11693 -528.0712,-2.74489 -324.35195,0.005 -603.615746,-0.005 -23.714381,0 -43.1169302,19.40255 -43.1169302,43.11694 v 143.71422 c 0,23.85984 19.4025492,43.11693 43.1169302,43.11693 H 654.15529 c 23.85451,0 43.11694,-19.25709 43.11694,-43.11693 v -57.45767 l -401.12936,0.005 c -8.62739,0 -15.61786,-6.43277 -15.61786,-14.37275 0,-7.93932 6.9906,-14.37276 15.61786,-14.37276 z M 122.44203,369.18839 H 93.69785 c -7.939313,0 -14.372757,-16.93278 -14.372757,-24.87276 0,-7.93931 6.432777,-26.37275 14.372757,-26.37275 h 28.74418 c 7.93931,0 14.37276,18.43277 14.37276,26.37275 0,7.93411 -6.43278,24.87276 -14.37276,24.87276 z m 100.60529,0 h -28.74418 c -7.93931,0 -14.37275,-16.93278 -14.37275,-24.87276 0,-7.93931 6.43277,-26.37275 14.37275,-26.37275 h 28.74418 c 7.93932,0 14.37276,18.43277 14.37276,26.37275 0,7.93411 -6.43798,24.87276 -14.37276,24.87276 z"
+     id="path55"
+     sodipodi:nodetypes="ccsccsssssccsccssssssssssssss"
+     style="fill:#ffffff;stroke-width:1.33452" />
+</svg>
diff --git a/Content/Slate/SodaIcons/differential.svg b/Content/Slate/SodaIcons/differential.svg
new file mode 100644
index 0000000..d5549f8
--- /dev/null
+++ b/Content/Slate/SodaIcons/differential.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg38"
+   sodipodi:docname="differential.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata42">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#282c25"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview40"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="783.07078"
+     inkscape:cy="733.28087"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg38"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs14">
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m39.078-2.3281c-2.0117 1.043-4.1094 1.8281-6.2969 2.3594s-4.4648 0.79688-6.8281 0.79688c-7.0859 0-12.699-1.9766-16.844-5.9375-4.1367-3.957-6.2031-9.3281-6.2031-16.109 0-6.7891 2.0664-12.164 6.2031-16.125 4.1445-3.9688 9.7578-5.9531 16.844-5.9531 2.3633 0 4.6406 0.26562 6.8281 0.79688s4.2852 1.3242 6.2969 2.375v8.7969c-2.0312-1.3828-4.0391-2.3984-6.0156-3.0469-1.9688-0.64453-4.0469-0.96875-6.2344-0.96875-3.9062 0-6.9844 1.2578-9.2344 3.7656-2.2422 2.5-3.3594 5.9531-3.3594 10.359 0 4.3867 1.1172 7.8359 3.3594 10.344 2.25 2.5 5.3281 3.75 9.2344 3.75 2.1875 0 4.2656-0.32031 6.2344-0.96875 1.9766-0.64453 3.9844-1.6602 6.0156-3.0469z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m16.031-40.953v9.0625h10.516v7.2812h-10.516v13.531c0 1.4805 0.28906 2.4805 0.875 3 0.59375 0.52344 1.7656 0.78125 3.5156 0.78125h5.2344v7.2969h-8.7344c-4.0312 0-6.8867-0.83594-8.5625-2.5156-1.6797-1.6875-2.5156-4.5391-2.5156-8.5625v-13.531h-5.0781v-7.2812h5.0781v-9.0625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m26.594-27.234v-17.078h10.266v44.312h-10.266v-4.6094c-1.3984 1.875-2.9453 3.25-4.6406 4.125-1.6875 0.875-3.6406 1.3125-5.8594 1.3125-3.9297 0-7.1562-1.5625-9.6875-4.6875-2.5234-3.125-3.7812-7.1445-3.7812-12.062 0-4.9141 1.2578-8.9375 3.7812-12.062 2.5312-3.125 5.7578-4.6875 9.6875-4.6875 2.1953 0 4.1445 0.44531 5.8438 1.3281 1.707 0.88672 3.2578 2.2578 4.6562 4.1094zm-6.7188 20.656c2.1875 0 3.8516-0.79688 5-2.3906 1.1445-1.5938 1.7188-3.9102 1.7188-6.9531 0-3.0391-0.57422-5.3594-1.7188-6.9531-1.1484-1.5938-2.8125-2.3906-5-2.3906-2.168 0-3.8242 0.79688-4.9688 2.3906-1.1484 1.5938-1.7188 3.9141-1.7188 6.9531 0 3.043 0.57031 5.3594 1.7188 6.9531 1.1445 1.5938 2.8008 2.3906 4.9688 2.3906z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m21.875-6.5781c2.1758 0 3.8359-0.79688 4.9844-2.3906 1.1562-1.5938 1.7344-3.9102 1.7344-6.9531 0-3.0391-0.57812-5.3594-1.7344-6.9531-1.1484-1.5938-2.8086-2.3906-4.9844-2.3906-2.1875 0-3.8672 0.80469-5.0312 2.4062-1.168 1.6055-1.75 3.918-1.75 6.9375 0 3.0234 0.58203 5.3359 1.75 6.9375 1.1641 1.6055 2.8438 2.4062 5.0312 2.4062zm-6.7812-20.656c1.4062-1.8516 2.9609-3.2227 4.6719-4.1094 1.707-0.88281 3.6719-1.3281 5.8906-1.3281 3.9375 0 7.1641 1.5625 9.6875 4.6875 2.5195 3.125 3.7812 7.1484 3.7812 12.062 0 4.918-1.2617 8.9375-3.7812 12.062-2.5234 3.125-5.75 4.6875-9.6875 4.6875-2.2188 0-4.1836-0.44531-5.8906-1.3281-1.7109-0.88281-3.2656-2.2539-4.6719-4.1094v4.6094h-10.188v-44.312h10.188z"
+         id="path11" />
+    </symbol>
+  </defs>
+  <path
+     d="M 671.89711,286.13344 H 569.47487 v -43.89453 c 0,-7.75993 -3.08139,-15.2013 -8.5731,-20.68812 -5.48682,-5.4917 -12.92882,-8.5731 -20.68812,-8.5731 v 263.36716 c 7.75993,0 15.2013,-3.0814 20.68812,-8.5731 5.49171,-5.48682 8.5731,-12.92882 8.5731,-20.68812 V 403.1891 h 102.42224 c 3.88002,0 7.59826,-1.5432 10.34656,-4.28661 2.74341,-2.74341 4.28173,-6.46654 4.28173,-10.34657 v -87.78905 c 0,-3.88003 -1.53832,-7.60316 -4.28173,-10.34657 -2.7483,-2.74341 -6.46654,-4.28661 -10.34656,-4.28661 z"
+     id="path16"
+     style="fill:#ffffff;stroke-width:1.25413;fill-opacity:0.5" />
+  <path
+     d="m 481.68331,139.82671 h -87.78905 c -7.75993,0 -15.20632,3.0814 -20.69313,8.56821 -5.48682,5.48682 -8.56822,12.93258 -8.56822,20.69313 0,124.37732 0,263.94763 0,351.15622 0,7.75992 3.0814,15.20631 8.56822,20.69313 5.48681,5.48682 12.93258,8.56821 20.69313,8.56821 h 87.78905 c 7.75993,0 15.20632,-3.08139 20.69314,-8.56821 5.48681,-5.48682 8.56821,-12.93258 8.56821,-20.69313 0,-118.54959 0,-245.61153 0,-351.15622 0,-7.75992 -3.0814,-15.20631 -8.56821,-20.69313 -5.48682,-5.48681 -12.93259,-8.56821 -20.69314,-8.56821 z"
+     id="path18"
+     style="fill:#ffffff;stroke-width:1.25413"
+     sodipodi:nodetypes="sssccssssccss" />
+  <path
+     d="M 28.104868,286.13344 H 159.78845 v 117.05039 l -131.683582,0.005 c -8.078349,0 -14.628165,-6.55483 -14.628165,-14.63318 V 300.7666 c 0,-8.07835 6.549941,-14.63318 14.628165,-14.63318 z"
+     id="path20"
+     style="fill:#ffffff;stroke-width:1.25413;fill-opacity:0.5" />
+  <path
+     d="M 335.36404,242.23891 V 447.08839 H 218.31365 c -7.75993,0 -15.20632,-3.08628 -20.69314,-8.5731 -5.48681,-5.48681 -8.56821,-12.92882 -8.56821,-20.69313 V 271.51543 c 0,-7.76482 3.0814,-15.20632 8.56821,-20.69313 5.48682,-5.48682 12.93258,-8.57311 20.69314,-8.57311 z"
+     id="path22"
+     style="fill:#ffffff;stroke-width:1.25413" />
+</svg>
diff --git a/Content/Slate/SodaIcons/down-stream.svg b/Content/Slate/SodaIcons/down-stream.svg
new file mode 100644
index 0000000..baf3c37
--- /dev/null
+++ b/Content/Slate/SodaIcons/down-stream.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg139"
+   sodipodi:docname="down-stream.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview141"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="pt"
+     showgrid="false"
+     inkscape:zoom="0.715188"
+     inkscape:cx="489.38181"
+     inkscape:cy="594.94846"
+     inkscape:window-width="2560"
+     inkscape:window-height="1511"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg139" />
+  <defs
+     id="defs65">
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h6.6875l4.6562 10.922 4.6719-10.922h6.6875v20.406h-4.9844v-14.938l-4.7031 11.016h-3.3281l-4.7031-11.016v14.938h-4.9844z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v11.594l5.625-5.625h5.6875l-7.4688 7.0312 8.0625 8.2812h-5.9375l-5.9688-6.3906v6.3906h-4.8906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     d="M 686.30632,343.34609 653.8055,304.79675 c -6.04784,-7.56112 -16.62971,-8.32039 -24.19137,-2.27255 L 369.58598,520.97809 c -10.58228,9.06913 -27.9668,9.06913 -38.54934,0 L 70.252592,302.5242 c -6.801847,-6.04784 -17.384254,-5.29383 -23.43142,2.26729 l -32.50082,38.54933 c -6.0478419,6.80185 -5.2938359,17.38426 2.267282,23.43142 L 331.04028,630.57988 c 10.58228,9.06913 27.9668,9.06913 38.54934,0 L 684.04228,366.77224 c 6.79658,-5.28857 8.30972,-16.6243 2.26201,-23.42602 z"
+     id="path67"
+     style="stroke-width:1.34981;fill:#ffffff" />
+  <path
+     d="M 686.30632,132.45115 653.8055,93.901817 C 647.75766,87.09997 637.17579,85.586693 630.37408,91.634535 L 369.59003,310.84432 c -10.58228,9.06913 -27.9668,9.06913 -38.54934,0 L 70.256641,91.634535 c -6.801847,-6.047842 -17.384253,-5.293836 -23.43142,2.267282 l -32.50082,38.549333 c -6.0478415,6.80185 -5.2938354,17.38426 2.267283,23.43142 L 331.04433,419.69021 c 10.58228,9.06913 27.9668,9.06913 38.54934,0 L 684.04633,155.88257 c 6.79658,-5.28857 8.30972,-15.87111 2.26201,-23.43142 z"
+     id="path69"
+     style="stroke-width:1.34981;fill:#ffffff" />
+</svg>
diff --git a/Content/Slate/SodaIcons/external.svg b/Content/Slate/SodaIcons/external.svg
new file mode 100644
index 0000000..d37a47f
--- /dev/null
+++ b/Content/Slate/SodaIcons/external.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg134"
+   sodipodi:docname="External.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata138">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview136"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="158.68527"
+     inkscape:cy="346.99033"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg134"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs62">
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m10.859-0.65625c-0.5625 0.29297-1.1484 0.51172-1.75 0.65625-0.60547 0.15625-1.2422 0.23438-1.9062 0.23438-1.9688 0-3.5273-0.54688-4.6719-1.6406-1.1484-1.1016-1.7188-2.5977-1.7188-4.4844 0-1.8945 0.57031-3.3906 1.7188-4.4844 1.1445-1.1016 2.7031-1.6562 4.6719-1.6562 0.66406 0 1.3008 0.078125 1.9062 0.23438 0.60156 0.14844 1.1875 0.36719 1.75 0.65625v2.4375c-0.5625-0.38281-1.1211-0.66406-1.6719-0.84375-0.55469-0.17578-1.1328-0.26562-1.7344-0.26562-1.0859 0-1.9375 0.35156-2.5625 1.0469-0.625 0.6875-0.9375 1.6484-0.9375 2.875 0 1.2188 0.3125 2.1797 0.9375 2.875 0.625 0.6875 1.4766 1.0312 2.5625 1.0312 0.60156 0 1.1797-0.085937 1.7344-0.26562 0.55078-0.17578 1.1094-0.45703 1.6719-0.84375z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m7.9375-6.4531c-0.24219-0.11328-0.48438-0.19531-0.73438-0.25-0.25-0.050781-0.49609-0.078125-0.73438-0.078125-0.73047 0-1.293 0.23438-1.6875 0.70312-0.39844 0.46094-0.59375 1.125-0.59375 2v4.0781h-2.8281v-8.8594h2.8281v1.4531c0.36328-0.58203 0.78125-1.0039 1.25-1.2656 0.47656-0.26953 1.0469-0.40625 1.7031-0.40625 0.09375 0 0.19531 0.007813 0.3125 0.015625 0.11328 0.011719 0.27344 0.027344 0.48438 0.046875z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m10.203-4.4531v0.8125h-6.625c0.070313 0.65625 0.3125 1.1523 0.71875 1.4844 0.41406 0.33594 0.99219 0.5 1.7344 0.5 0.59375 0 1.2031-0.085938 1.8281-0.26562 0.625-0.17578 1.2656-0.44141 1.9219-0.79688v2.1875c-0.66797 0.25-1.3398 0.4375-2.0156 0.5625-0.66797 0.13281-1.3359 0.20312-2 0.20312-1.6055 0-2.8516-0.40625-3.7344-1.2188-0.88672-0.82031-1.3281-1.9688-1.3281-3.4375 0-1.4453 0.42969-2.582 1.2969-3.4062 0.875-0.83203 2.0781-1.25 3.6094-1.25 1.3945 0 2.5078 0.42188 3.3438 1.2656 0.83203 0.83594 1.25 1.9531 1.25 3.3594zm-2.9062-0.9375c0-0.53906-0.15625-0.97266-0.46875-1.2969-0.3125-0.33203-0.72656-0.5-1.2344-0.5-0.55469 0-1 0.15625-1.3438 0.46875-0.33594 0.30469-0.54688 0.74609-0.64062 1.3281z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m5.3281-3.9844c-0.58594 0-1.0273 0.10156-1.3281 0.29688-0.30469 0.19922-0.45312 0.49609-0.45312 0.89062 0 0.35547 0.11719 0.63672 0.35938 0.84375 0.23828 0.19922 0.57031 0.29688 1 0.29688 0.53906 0 0.98828-0.1875 1.3438-0.5625 0.36328-0.38281 0.54688-0.86328 0.54688-1.4375v-0.32812zm4.3281-1.0781v5.0625h-2.8594v-1.3125c-0.375 0.54297-0.80469 0.9375-1.2812 1.1875-0.46875 0.23828-1.043 0.35938-1.7188 0.35938-0.92969 0-1.6797-0.26562-2.25-0.79688-0.5625-0.53906-0.84375-1.2383-0.84375-2.0938 0-1.0391 0.35156-1.8008 1.0625-2.2812 0.71875-0.48828 1.8438-0.73438 3.375-0.73438h1.6562v-0.21875c0-0.44531-0.17969-0.77344-0.53125-0.98438-0.34375-0.20703-0.89062-0.3125-1.6406-0.3125-0.61719 0-1.1836 0.0625-1.7031 0.1875-0.52344 0.11719-1.0078 0.29297-1.4531 0.53125v-2.1562c0.60156-0.14453 1.2109-0.25391 1.8281-0.32812 0.61328-0.082031 1.2266-0.125 1.8438-0.125 1.5938 0 2.7422 0.32031 3.4531 0.95312 0.70703 0.625 1.0625 1.6484 1.0625 3.0625z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m4.4531-11.375v2.5156h2.9219v2.0312h-2.9219v3.75c0 0.41797 0.078125 0.69922 0.23438 0.84375 0.16406 0.13672 0.49219 0.20312 0.98438 0.20312h1.4531v2.0312h-2.4219c-1.125 0-1.9219-0.23438-2.3906-0.70312-0.46094-0.46875-0.6875-1.2578-0.6875-2.375v-3.75h-1.4062v-2.0312h1.4062v-2.5156z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m7.3906-7.5625v-4.75h2.8438v12.312h-2.8438v-1.2812c-0.39844 0.52344-0.82812 0.90625-1.2969 1.1562-0.46875 0.23828-1.0117 0.35938-1.625 0.35938-1.0938 0-1.9922-0.42969-2.6875-1.2969-0.69922-0.875-1.0469-1.9922-1.0469-3.3594 0-1.3633 0.34766-2.4766 1.0469-3.3438 0.69531-0.875 1.5938-1.3125 2.6875-1.3125 0.61328 0 1.1562 0.125 1.625 0.375 0.46875 0.24219 0.89844 0.62109 1.2969 1.1406zm-1.875 5.7344c0.61328 0 1.0781-0.21875 1.3906-0.65625 0.32031-0.44531 0.48438-1.0938 0.48438-1.9375s-0.16406-1.4844-0.48438-1.9219c-0.3125-0.44531-0.77734-0.67188-1.3906-0.67188-0.59375 0-1.0547 0.22656-1.375 0.67188-0.32422 0.4375-0.48438 1.0781-0.48438 1.9219s0.16016 1.4922 0.48438 1.9375c0.32031 0.4375 0.78125 0.65625 1.375 0.65625z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m6.0781-1.8281c0.60156 0 1.0625-0.21875 1.375-0.65625 0.32031-0.44531 0.48438-1.0938 0.48438-1.9375s-0.16406-1.4844-0.48438-1.9219c-0.3125-0.44531-0.77344-0.67188-1.375-0.67188-0.60547 0-1.0742 0.22656-1.4062 0.67188-0.32422 0.4375-0.48438 1.0781-0.48438 1.9219 0 0.83594 0.16016 1.4766 0.48438 1.9219 0.33203 0.44922 0.80078 0.67188 1.4062 0.67188zm-1.8906-5.7344c0.39453-0.51953 0.82812-0.89844 1.2969-1.1406 0.47656-0.25 1.0234-0.375 1.6406-0.375 1.0938 0 1.9883 0.4375 2.6875 1.3125 0.70703 0.86719 1.0625 1.9805 1.0625 3.3438 0 1.3672-0.35547 2.4844-1.0625 3.3594-0.69922 0.86719-1.5938 1.2969-2.6875 1.2969-0.61719 0-1.1641-0.12109-1.6406-0.35938-0.46875-0.25-0.90234-0.63281-1.2969-1.1562v1.2812h-2.8281v-12.312h2.8281z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m0.20312-8.8594h2.8281l2.375 6.0156 2.0312-6.0156h2.8281l-3.7188 9.7031c-0.375 0.97656-0.8125 1.6641-1.3125 2.0625-0.5 0.39453-1.1562 0.59375-1.9688 0.59375h-1.6406v-1.8594h0.89062c0.47656 0 0.82812-0.078125 1.0469-0.23438s0.38281-0.43359 0.5-0.82812l0.078125-0.23438z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.90625-11.812h9.9375v1.8438l-6.3438 7.6719h6.5156v2.2969h-10.281v-1.8438l6.3281-7.6719h-6.1562z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m1.6562-3.0625h2.8438v3.0625h-2.8438z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m10.266-5.3906v5.3906h-2.8438v-4.1094c0-0.78125-0.023437-1.3125-0.0625-1.5938-0.03125-0.28906-0.089844-0.50781-0.17188-0.65625-0.10547-0.17578-0.25781-0.31641-0.45312-0.42188-0.1875-0.10156-0.40234-0.15625-0.64062-0.15625-0.59375 0-1.0625 0.23047-1.4062 0.6875-0.33594 0.46094-0.5 1.0898-0.5 1.8906v4.3594h-2.8281v-12.312h2.8281v4.75c0.42578-0.51953 0.87891-0.89844 1.3594-1.1406 0.48828-0.25 1.0195-0.375 1.5938-0.375 1.0195 0 1.7969 0.32031 2.3281 0.95312 0.53125 0.625 0.79688 1.5391 0.79688 2.7344z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m5.5781-7.0469c-0.625 0-1.1055 0.22656-1.4375 0.67188-0.33594 0.44922-0.5 1.1016-0.5 1.9531 0 0.84375 0.16406 1.4961 0.5 1.9531 0.33203 0.44922 0.8125 0.67188 1.4375 0.67188 0.61328 0 1.082-0.22266 1.4062-0.67188 0.33203-0.45703 0.5-1.1094 0.5-1.9531 0-0.85156-0.16797-1.5039-0.5-1.9531-0.32422-0.44531-0.79297-0.67188-1.4062-0.67188zm0-2.0312c1.5195 0 2.707 0.41406 3.5625 1.2344 0.86328 0.82422 1.2969 1.9648 1.2969 3.4219 0 1.4609-0.43359 2.6016-1.2969 3.4219-0.85547 0.82422-2.043 1.2344-3.5625 1.2344-1.5312 0-2.7305-0.41016-3.5938-1.2344-0.85547-0.82031-1.2812-1.9609-1.2812-3.4219 0-1.457 0.42578-2.5977 1.2812-3.4219 0.86328-0.82031 2.0625-1.2344 3.5938-1.2344z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m1.2656-3.4531v-5.4062h2.8438v0.89062c0 0.48047-0.007813 1.0859-0.015625 1.8125v1.4375c0 0.71875 0.015625 1.2344 0.046875 1.5469 0.039063 0.3125 0.10938 0.54297 0.20312 0.6875 0.11328 0.17969 0.26562 0.32031 0.45312 0.42188 0.1875 0.09375 0.39844 0.14062 0.64062 0.14062 0.59375 0 1.0547-0.22266 1.3906-0.67188 0.34375-0.45703 0.51562-1.0859 0.51562-1.8906v-4.375h2.8281v8.8594h-2.8281v-1.2812c-0.42969 0.52344-0.88281 0.90625-1.3594 1.1562-0.48047 0.23828-1.0078 0.35938-1.5781 0.35938-1.0234 0-1.8047-0.3125-2.3438-0.9375-0.53125-0.63281-0.79688-1.5508-0.79688-2.75z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m7.1875-12.312v1.8594h-1.5625c-0.39844 0-0.67969 0.074219-0.84375 0.21875-0.15625 0.14844-0.23438 0.39844-0.23438 0.75v0.625h2.4219v2.0312h-2.4219v6.8281h-2.8281v-6.8281h-1.4062v-2.0312h1.4062v-0.625c0-0.95703 0.26562-1.6641 0.79688-2.125 0.53906-0.46875 1.3789-0.70312 2.5156-0.70312z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m9.5781-7.3906c0.35156-0.55078 0.77344-0.96875 1.2656-1.25 0.5-0.28906 1.0469-0.4375 1.6406-0.4375 1.0078 0 1.7812 0.32031 2.3125 0.95312 0.53906 0.625 0.8125 1.5391 0.8125 2.7344v5.3906h-2.8594v-4.625c0.007812-0.0625 0.015625-0.12891 0.015625-0.20312v-0.32812c0-0.625-0.09375-1.0781-0.28125-1.3594-0.17969-0.28125-0.47656-0.42188-0.89062-0.42188-0.53125 0-0.94922 0.22656-1.25 0.67188-0.29297 0.4375-0.44531 1.0781-0.45312 1.9219v4.3438h-2.8438v-4.625c0-0.97656-0.085937-1.6094-0.25-1.8906-0.16797-0.28125-0.46875-0.42188-0.90625-0.42188-0.54297 0-0.96484 0.22656-1.2656 0.67188-0.29297 0.44922-0.4375 1.0859-0.4375 1.9062v4.3594h-2.8438v-8.8594h2.8438v1.2969c0.35156-0.5 0.75391-0.875 1.2031-1.125 0.44531-0.25781 0.94531-0.39062 1.5-0.39062 0.60156 0 1.1406 0.15234 1.6094 0.45312 0.46875 0.29297 0.82812 0.70312 1.0781 1.2344z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m1.4844-11.812h3.4062l4.2969 8.1094v-8.1094h2.8906v11.812h-3.4062l-4.2969-8.1094v8.1094h-2.8906z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m10.266-5.3906v5.3906h-2.8438v-4.125c0-0.76953-0.023437-1.2969-0.0625-1.5781-0.03125-0.28906-0.089844-0.50781-0.17188-0.65625-0.10547-0.17578-0.25781-0.31641-0.45312-0.42188-0.1875-0.10156-0.40234-0.15625-0.64062-0.15625-0.59375 0-1.0625 0.23047-1.4062 0.6875-0.33594 0.46094-0.5 1.0898-0.5 1.8906v4.3594h-2.8281v-8.8594h2.8281v1.2969c0.42578-0.51953 0.87891-0.89844 1.3594-1.1406 0.48828-0.25 1.0195-0.375 1.5938-0.375 1.0195 0 1.7969 0.32031 2.3281 0.95312 0.53125 0.625 0.79688 1.5391 0.79688 2.7344z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m1.4844-11.812h5.0625c1.5 0 2.6484 0.33594 3.4531 1 0.80078 0.66797 1.2031 1.6211 1.2031 2.8594 0 1.2422-0.40234 2.1953-1.2031 2.8594-0.80469 0.66797-1.9531 1-3.4531 1h-2.0156v4.0938h-3.0469zm3.0469 2.2031v3.2969h1.6875c0.59375 0 1.0469-0.14062 1.3594-0.42188 0.32031-0.28906 0.48438-0.69531 0.48438-1.2188 0-0.53125-0.16406-0.9375-0.48438-1.2188-0.3125-0.28906-0.76562-0.4375-1.3594-0.4375z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m1.3594-8.8594h2.8281v8.7031c0 1.1875-0.28906 2.0938-0.85938 2.7188-0.5625 0.625-1.3867 0.9375-2.4688 0.9375h-1.3906v-1.8594h0.48438c0.53906 0 0.91016-0.125 1.1094-0.375 0.19531-0.24219 0.29688-0.71484 0.29688-1.4219zm0-3.4531h2.8281v2.3125h-2.8281z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m8.5156-8.5781v2.2969c-0.38672-0.25781-0.77344-0.45312-1.1562-0.57812-0.38672-0.125-0.78906-0.1875-1.2031-0.1875-0.79297 0-1.4141 0.23047-1.8594 0.6875-0.4375 0.46094-0.65625 1.1055-0.65625 1.9375 0 0.82422 0.21875 1.4688 0.65625 1.9375 0.44531 0.46094 1.0664 0.6875 1.8594 0.6875 0.4375 0 0.85156-0.0625 1.25-0.1875 0.40625-0.13281 0.77344-0.33203 1.1094-0.59375v2.3125c-0.4375 0.16797-0.88672 0.28906-1.3438 0.375-0.46094 0.082031-0.91797 0.125-1.375 0.125-1.5938 0-2.8438-0.41016-3.75-1.2344-0.89844-0.82031-1.3438-1.9609-1.3438-3.4219 0-1.457 0.44531-2.5977 1.3438-3.4219 0.90625-0.82031 2.1562-1.2344 3.75-1.2344 0.46875 0 0.92578 0.042969 1.375 0.125 0.44531 0.085937 0.89453 0.21094 1.3438 0.375z"
+         id="path59" />
+    </symbol>
+  </defs>
+  <path
+     d="M 653.09568,43.79516 C 627.98861,18.68133 597.73583,6.120194 562.36267,6.120194 H 134.30791 c -35.371475,0 -65.617496,12.560292 -90.73808,37.674966 C 18.456001,68.915744 5.8948637,99.161772 5.8948637,134.53325 V 562.588 c 0,35.37148 12.5602923,65.61751 37.6749663,90.73809 25.120584,25.12059 55.366605,37.68003 90.73808,37.68003 h 428.05476 c 35.37147,0 65.61749,-12.56029 90.73301,-37.68003 25.12059,-25.12058 37.68004,-55.36661 37.68004,-90.73809 l -0.007,-428.05475 c 0,-35.371478 -12.56029,-65.624261 -37.67496,-90.73809 z m -76.46959,319.02721 c 0,12.48108 -5.79859,21.24821 -17.38935,26.30779 -3.86578,1.48429 -7.59292,2.2297 -11.14865,2.2297 -8.02169,0 -14.71078,-2.83006 -20.061,-8.47024 L 463.81973,318.68224 225.71881,556.80005 c -5.65353,5.64694 -12.33603,8.47025 -20.06776,8.47025 -7.73174,0 -14.42066,-2.82348 -20.06776,-8.47025 l -45.47881,-45.48556 c -5.64694,-5.64019 -8.47025,-12.34261 -8.47025,-20.06101 0,-7.72481 2.82348,-14.41406 8.47025,-20.061 L 378.22229,233.07467 314.01492,168.86731 c -9.21567,-8.62207 -11.29371,-19.01903 -6.24714,-31.20864 5.05317,-11.5906 13.82688,-17.39611 26.3078,-17.39611 l 214.01894,-0.0135 c 7.72481,0 14.41406,2.83005 20.06775,8.47682 5.64019,5.64019 8.46366,12.33603 8.46366,20.06101 z"
+     id="path64"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:1.68878" />
+</svg>
diff --git a/Content/Slate/SodaIcons/forever.svg b/Content/Slate/SodaIcons/forever.svg
new file mode 100644
index 0000000..4322108
--- /dev/null
+++ b/Content/Slate/SodaIcons/forever.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg157"
+   sodipodi:docname="forever.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata161">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#323134"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview159"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="171.67182"
+     inkscape:cy="193.52043"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg157" />
+  <defs
+     id="defs71">
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m7.8281-16.438v12.453h1.8906c2.1562 0 3.8008-0.53125 4.9375-1.5938 1.1328-1.0625 1.7031-2.6133 1.7031-4.6562 0-2.0195-0.57031-3.5547-1.7031-4.6094-1.125-1.0625-2.7734-1.5938-4.9375-1.5938zm-5.25-3.9688h5.5469c3.0938 0 5.3984 0.21875 6.9219 0.65625 1.5195 0.4375 2.8203 1.1875 3.9062 2.25 0.95703 0.91797 1.6641 1.9805 2.125 3.1875 0.46875 1.1992 0.70312 2.5586 0.70312 4.0781 0 1.543-0.23438 2.918-0.70312 4.125-0.46094 1.2109-1.168 2.2773-2.125 3.2031-1.0938 1.0547-2.4062 1.8047-3.9375 2.25-1.5312 0.4375-3.8281 0.65625-6.8906 0.65625h-5.5469z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="w"
+       overflow="visible">
+      <path
+         d="m12.766-2.5938c-0.66797 0.88672-1.4062 1.543-2.2188 1.9688-0.8125 0.41797-1.7578 0.625-2.8281 0.625-1.8672 0-3.4062-0.73438-4.625-2.2031-1.2188-1.4766-1.8281-3.3516-1.8281-5.625 0-2.2891 0.60938-4.1641 1.8281-5.625 1.2188-1.4688 2.7578-2.2031 4.625-2.2031 1.0703 0 2.0156 0.21484 2.8281 0.64062 0.8125 0.41797 1.5508 1.0742 2.2188 1.9688v-2.2656h4.9219v13.766c0 2.457-0.77734 4.3359-2.3281 5.6406-1.5547 1.3008-3.8086 1.9531-6.7656 1.9531-0.94922 0-1.8711-0.074219-2.7656-0.21875-0.89844-0.14844-1.7969-0.37109-2.7031-0.67188v-3.8125c0.86328 0.48828 1.7031 0.85156 2.5156 1.0938 0.82031 0.23828 1.6484 0.35938 2.4844 0.35938 1.6016 0 2.7734-0.35156 3.5156-1.0469 0.75-0.69922 1.125-1.7969 1.125-3.2969zm-3.2188-9.5312c-1.0117 0-1.8047 0.375-2.375 1.125-0.5625 0.74219-0.84375 1.7969-0.84375 3.1719 0 1.3984 0.26953 2.4609 0.8125 3.1875 0.55078 0.71875 1.3516 1.0781 2.4062 1.0781 1.0195 0 1.8125-0.36719 2.375-1.1094 0.5625-0.75 0.84375-1.8008 0.84375-3.1562 0-1.375-0.28125-2.4297-0.84375-3.1719-0.5625-0.75-1.3555-1.125-2.375-1.125z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v12.234c0 1.6875 0.27344 2.8984 0.82812 3.625 0.55078 0.71875 1.4531 1.0781 2.7031 1.0781 1.2578 0 2.1641-0.35938 2.7188-1.0781 0.55078-0.72656 0.82812-1.9375 0.82812-3.625v-12.234h5.2656v12.234c0 2.8867-0.73047 5.0391-2.1875 6.4531-1.4492 1.4062-3.6562 2.1094-6.625 2.1094-2.9609 0-5.1641-0.70312-6.6094-2.1094-1.4492-1.4141-2.1719-3.5664-2.1719-6.4531z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m1.5781-20.406h17.156v3.1719l-10.953 13.25h11.266v3.9844h-17.781v-3.1875l10.938-13.25h-10.625z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h14.203v3.9688h-8.9531v3.7969h8.4219v3.9844h-8.4219v4.6719h9.25v3.9844h-14.5z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path65" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path68" />
+    </symbol>
+  </defs>
+  <path
+     d="m 501.95462,150.83514 c -60.73972,-0.0237 -117.52709,30.11124 -151.56026,80.42088 -29.50575,-43.55351 -76.32095,-72.31535 -128.5094,-78.9589 -52.18845,-6.63792 -104.70854,9.4785 -144.191035,44.24875 -39.476406,34.77556 -62.099768,84.84331 -62.099768,137.45316 0,52.60986 22.623362,102.67608 62.099768,137.45317 39.482495,34.76948 92.004105,50.88621 144.191035,44.24875 52.18845,-6.64386 99.00365,-35.40539 128.5094,-78.9589 36.05347,53.21077 97.35151,83.63083 161.53243,80.15464 64.17483,-3.4704 121.83542,-40.32073 151.94057,-97.10809 30.09907,-56.78736 28.23851,-125.19295 -4.90865,-180.25972 -33.14776,-55.06372 -92.73433,-88.72264 -156.99892,-88.69374 z M 198.83411,423.45343 c -23.72935,0 -46.47746,-9.42496 -63.25292,-26.20148 -16.77545,-16.77545 -26.20147,-39.52965 -26.20147,-63.25292 0,-23.72327 9.42495,-46.47746 26.20147,-63.25292 16.77546,-16.77545 39.52357,-26.20147 63.25292,-26.20147 23.72327,0 46.47747,9.42495 63.25292,26.20147 16.77546,16.77546 26.1954,39.52965 26.1954,63.25292 -0.0415,23.7111 -9.47851,46.43487 -26.24864,63.20576 -16.76481,16.76481 -39.48858,26.20148 -63.19968,26.24864 z m 303.12051,0 c -23.71719,-0.0237 -46.45921,-9.46664 -63.21793,-26.25472 -16.75873,-16.78155 -26.16497,-39.53574 -26.14824,-63.25901 0.0122,-23.71718 9.44869,-46.45921 26.23039,-63.22401 16.77545,-16.76481 39.52965,-26.17714 63.24683,-26.17105 23.72327,0.006 46.46529,9.43682 63.23466,26.21212 16.76938,16.77546 26.18931,39.52357 26.18931,63.24075 -0.0237,23.73544 -9.46664,46.48355 -26.25472,63.25901 -16.78763,16.76937 -39.54791,26.19539 -63.28335,26.19539 z"
+     id="path73"
+     style="fill:#ffffff;stroke-width:1.52131" />
+</svg>
diff --git a/Content/Slate/SodaIcons/gear-box.svg b/Content/Slate/SodaIcons/gear-box.svg
new file mode 100644
index 0000000..93e8e66
--- /dev/null
+++ b/Content/Slate/SodaIcons/gear-box.svg
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg166"
+   sodipodi:docname="ai.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata170">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#100e66"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1334"
+     id="namedview168"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="427.95917"
+     inkscape:cy="365.25453"
+     inkscape:window-x="2549"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg166"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#100e66"
+     inkscape:document-units="pt" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v16.422h9.25v3.9844h-14.5z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h6.6875l4.6562 10.922 4.6719-10.922h6.6875v20.406h-4.9844v-14.938l-4.7031 11.016h-3.3281l-4.7031-11.016v14.938h-4.9844z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <g
+     id="g187"
+     transform="matrix(1.4546593,0,0,1.4546593,-18.351095,-20.280708)"
+     style="fill:#ffffff">
+    <g
+       id="g185"
+       style="fill:#ffffff">
+      <polygon
+         points="315.519,321.103 291.68,321.103 218.422,321.103 197.419,321.103 197.419,359.633 315.519,359.633 "
+         id="polygon175"
+         style="fill:#ffffff;fill-opacity:0.5" />
+      <path
+         d="m 230.324,174.219 c -0.305,-0.096 -0.603,-0.209 -0.906,-0.308 -0.951,-0.312 -1.901,-0.624 -2.836,-0.97 -1.146,-0.42 -2.278,-0.874 -3.403,-1.345 -0.074,-0.031 -0.149,-0.058 -0.223,-0.089 -0.177,-0.074 -0.358,-0.138 -0.534,-0.214 v 141.809 h 65.257 V 171.295 c -0.063,0.026 -0.127,0.049 -0.189,0.075 -9.956,4.272 -20.912,6.646 -32.413,6.646 -8.62,0.001 -16.934,-1.333 -24.753,-3.797 z"
+         id="path177"
+         style="fill:#ffffff" />
+      <path
+         d="m 229.662,165.548 c 1.038,0.378 2.087,0.735 3.146,1.067 0.204,0.063 0.41,0.12 0.614,0.182 0.767,0.233 1.54,0.451 2.317,0.66 0.407,0.108 0.814,0.22 1.223,0.321 0.845,0.212 1.696,0.408 2.553,0.591 0.47,0.101 0.941,0.191 1.412,0.282 0.625,0.121 1.253,0.233 1.884,0.338 0.57,0.095 1.141,0.185 1.713,0.267 0.753,0.107 1.51,0.205 2.271,0.289 0.372,0.042 0.744,0.084 1.117,0.12 1.004,0.096 2.013,0.175 3.028,0.23 0.254,0.015 0.508,0.023 0.763,0.035 1.12,0.051 2.243,0.086 3.375,0.086 1.188,0 2.368,-0.034 3.543,-0.09 0.153,-0.007 0.307,-0.013 0.461,-0.021 1.19,-0.063 2.375,-0.152 3.551,-0.271 0.041,-0.004 0.084,-0.009 0.125,-0.013 37.5,-3.86 66.849,-35.665 66.849,-74.202 0,-41.13 -33.434,-74.591 -74.529,-74.591 -41.11,0 -74.555,33.461 -74.555,74.591 0,32.082 20.348,59.496 48.808,70.008 0.11,0.042 0.22,0.081 0.331,0.121 z"
+         id="path179"
+         style="fill:#ffffff" />
+      <polygon
+         points="142.357,414.11 51.938,414.11 51.938,492.124 460.999,492.124 460.999,414.11 370.607,414.11 "
+         id="polygon181"
+         style="fill:#ffffff;fill-opacity:0.5" />
+      <polygon
+         points="366.607,367.633 319.519,367.633 193.419,367.633 146.357,367.633 146.357,406.11 366.607,406.11 "
+         id="polygon183"
+         style="fill:#ffffff;fill-opacity:0.5" />
+    </g>
+  </g>
+</svg>
diff --git a/Content/Slate/SodaIcons/gps.svg b/Content/Slate/SodaIcons/gps.svg
new file mode 100644
index 0000000..d098d9b
--- /dev/null
+++ b/Content/Slate/SodaIcons/gps.svg
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg129"
+   sodipodi:docname="GPS.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata133">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#7a66ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview131"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="428.09856"
+     inkscape:cy="372.02004"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg129"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs59">
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m5.625-0.34375c-0.28125 0.15625-0.58594 0.27344-0.90625 0.34375-0.3125 0.082031-0.64062 0.125-0.98438 0.125-1.0234 0-1.8281-0.28516-2.4219-0.85938-0.59375-0.57031-0.89062-1.3477-0.89062-2.3281 0-0.97656 0.29688-1.75 0.89062-2.3125 0.59375-0.57031 1.3984-0.85938 2.4219-0.85938 0.34375 0 0.67188 0.039063 0.98438 0.10938 0.32031 0.074219 0.625 0.1875 0.90625 0.34375v1.2656c-0.29297-0.19531-0.57812-0.34375-0.85938-0.4375s-0.58594-0.14062-0.90625-0.14062c-0.5625 0-1.0078 0.18359-1.3281 0.54688-0.32422 0.35547-0.48438 0.85156-0.48438 1.4844 0 0.63672 0.16016 1.1367 0.48438 1.5 0.32031 0.35547 0.76562 0.53125 1.3281 0.53125 0.32031 0 0.625-0.046875 0.90625-0.14062s0.56641-0.23828 0.85938-0.4375z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m4.125-3.3438c-0.13672-0.0625-0.26562-0.10156-0.39062-0.125-0.125-0.03125-0.25-0.046875-0.375-0.046875-0.38672 0-0.68359 0.12109-0.89062 0.35938-0.19922 0.24219-0.29688 0.58594-0.29688 1.0312v2.125h-1.4688v-4.5938h1.4688v0.75c0.1875-0.30078 0.39844-0.51953 0.64062-0.65625 0.25-0.13281 0.54688-0.20312 0.89062-0.20312h0.15625c0.0625 0 0.14453 0.011719 0.25 0.03125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m5.2969-2.3125v0.42188h-3.4375c0.03125 0.34375 0.14844 0.60547 0.35938 0.78125 0.21875 0.16797 0.51953 0.25 0.90625 0.25 0.3125 0 0.62891-0.046875 0.95312-0.14062 0.32031-0.09375 0.65625-0.22656 1-0.40625v1.125c-0.34375 0.13672-0.69531 0.23438-1.0469 0.29688-0.34375 0.070312-0.6875 0.10938-1.0312 0.10938-0.83594 0-1.4844-0.21094-1.9531-0.64062-0.46094-0.42578-0.6875-1.0195-0.6875-1.7812 0-0.75 0.22266-1.3359 0.67188-1.7656 0.45703-0.42578 1.082-0.64062 1.875-0.64062 0.72656 0 1.3047 0.21875 1.7344 0.65625 0.4375 0.42969 0.65625 1.0078 0.65625 1.7344zm-1.5156-0.48438c0-0.28125-0.085938-0.50391-0.25-0.67188-0.15625-0.17578-0.36719-0.26562-0.625-0.26562-0.29297 0-0.52734 0.085937-0.70312 0.25-0.17969 0.15625-0.28906 0.38672-0.32812 0.6875z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m2.7656-2.0625c-0.30469 0-0.53125 0.054688-0.6875 0.15625-0.15625 0.10547-0.23438 0.25781-0.23438 0.45312 0 0.1875 0.0625 0.33594 0.1875 0.4375 0.125 0.10547 0.29688 0.15625 0.51562 0.15625 0.28125 0 0.51562-0.097656 0.70312-0.29688 0.1875-0.19531 0.28125-0.44531 0.28125-0.75v-0.15625zm2.25-0.5625v2.625h-1.4844v-0.6875c-0.19922 0.28125-0.42188 0.49219-0.67188 0.625-0.24219 0.125-0.53906 0.1875-0.89062 0.1875-0.48047 0-0.87109-0.14062-1.1719-0.42188-0.29297-0.28125-0.4375-0.64062-0.4375-1.0781 0-0.53906 0.17969-0.9375 0.54688-1.1875 0.375-0.25 0.95703-0.375 1.75-0.375h0.875v-0.125c0-0.22656-0.09375-0.39453-0.28125-0.5-0.17969-0.11328-0.46484-0.17188-0.85938-0.17188-0.3125 0-0.60547 0.03125-0.875 0.09375-0.27344 0.0625-0.52344 0.15625-0.75 0.28125v-1.1094c0.3125-0.082031 0.625-0.14062 0.9375-0.17188 0.32031-0.039063 0.64062-0.0625 0.95312-0.0625 0.83203 0 1.4297 0.16406 1.7969 0.48438 0.375 0.32422 0.5625 0.85547 0.5625 1.5938z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m2.3125-5.9062v1.3125h1.5156v1.0469h-1.5156v1.9531c0 0.21094 0.039062 0.35547 0.125 0.4375 0.082031 0.074219 0.25 0.10938 0.5 0.10938h0.76562v1.0469h-1.2656c-0.58594 0-0.99609-0.11719-1.2344-0.35938-0.24219-0.23828-0.35938-0.64844-0.35938-1.2344v-1.9531h-0.73438v-1.0469h0.73438v-1.3125z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m3.8281-3.9219v-2.4688h1.4844v6.3906h-1.4844v-0.67188c-0.19922 0.27344-0.42188 0.47656-0.67188 0.60938-0.24219 0.125-0.52344 0.1875-0.84375 0.1875-0.5625 0-1.0273-0.22266-1.3906-0.67188-0.36719-0.45703-0.54688-1.0391-0.54688-1.75 0-0.70703 0.17969-1.2852 0.54688-1.7344 0.36328-0.44531 0.82812-0.67188 1.3906-0.67188 0.32031 0 0.60156 0.0625 0.84375 0.1875 0.25 0.125 0.47266 0.32422 0.67188 0.59375zm-0.96875 2.9688c0.32031 0 0.5625-0.11328 0.71875-0.34375 0.16406-0.22656 0.25-0.5625 0.25-1s-0.085937-0.76953-0.25-1c-0.15625-0.22656-0.39844-0.34375-0.71875-0.34375-0.3125 0-0.55469 0.11719-0.71875 0.34375-0.15625 0.23047-0.23438 0.5625-0.23438 1s0.078125 0.77344 0.23438 1c0.16406 0.23047 0.40625 0.34375 0.71875 0.34375z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m3.1562-0.95312c0.3125 0 0.55078-0.11328 0.71875-0.34375 0.16406-0.22656 0.25-0.5625 0.25-1s-0.085938-0.76953-0.25-1c-0.16797-0.22656-0.40625-0.34375-0.71875-0.34375s-0.55859 0.11719-0.73438 0.34375c-0.16797 0.23047-0.25 0.5625-0.25 1s0.082031 0.77344 0.25 1c0.17578 0.23047 0.42188 0.34375 0.73438 0.34375zm-0.98438-2.9688c0.20703-0.26953 0.42969-0.46875 0.67188-0.59375 0.25-0.125 0.53516-0.1875 0.85938-0.1875 0.5625 0 1.0234 0.22656 1.3906 0.67188 0.36328 0.44922 0.54688 1.0273 0.54688 1.7344 0 0.71094-0.18359 1.293-0.54688 1.75-0.36719 0.44922-0.82812 0.67188-1.3906 0.67188-0.32422 0-0.60938-0.0625-0.85938-0.1875-0.24219-0.13281-0.46484-0.33594-0.67188-0.60938v0.67188h-1.4688v-6.3906h1.4688z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m0.10938-4.5938h1.4688l1.2344 3.1094 1.0469-3.1094h1.4688l-1.9375 5.0312c-0.1875 0.50781-0.41406 0.86328-0.67188 1.0625-0.26172 0.20703-0.60547 0.3125-1.0312 0.3125h-0.84375v-0.96875h0.45312c0.25 0 0.42969-0.042969 0.54688-0.125 0.11328-0.074219 0.20312-0.21484 0.26562-0.42188l0.046875-0.125z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m4.9688-3.8281c0.1875-0.28906 0.40625-0.50781 0.65625-0.65625 0.25781-0.14453 0.53906-0.21875 0.84375-0.21875 0.53125 0 0.92969 0.16406 1.2031 0.48438 0.28125 0.32422 0.42188 0.79688 0.42188 1.4219v2.7969h-1.4844v-2.3906c0.007813-0.039063 0.015625-0.078125 0.015625-0.10938v-0.17188c0-0.32031-0.046875-0.55469-0.14062-0.70312-0.09375-0.14453-0.25-0.21875-0.46875-0.21875-0.28125 0-0.5 0.11719-0.65625 0.34375-0.14844 0.23047-0.21875 0.5625-0.21875 1v2.25h-1.4844v-2.3906c0-0.50781-0.046875-0.83594-0.14062-0.98438-0.085937-0.14453-0.23438-0.21875-0.45312-0.21875-0.28125 0-0.5 0.11719-0.65625 0.34375-0.15625 0.23047-0.23438 0.55859-0.23438 0.98438v2.2656h-1.4688v-4.5938h1.4688v0.67188c0.1875-0.25781 0.39453-0.45312 0.625-0.57812 0.22656-0.13281 0.48828-0.20312 0.78125-0.20312 0.3125 0 0.58594 0.078125 0.82812 0.23438 0.25 0.14844 0.4375 0.35938 0.5625 0.64062z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m2.8906-3.6562c-0.32422 0-0.57422 0.12109-0.75 0.35938-0.16797 0.23047-0.25 0.5625-0.25 1s0.082031 0.77734 0.25 1.0156c0.17578 0.23047 0.42578 0.34375 0.75 0.34375 0.32031 0 0.56641-0.11328 0.73438-0.34375 0.17578-0.23828 0.26562-0.57812 0.26562-1.0156s-0.089844-0.76953-0.26562-1c-0.16797-0.23828-0.41406-0.35938-0.73438-0.35938zm0-1.0469c0.78906 0 1.4062 0.21484 1.8438 0.64062 0.44531 0.42969 0.67188 1.0156 0.67188 1.7656 0 0.76172-0.22656 1.3555-0.67188 1.7812-0.4375 0.42969-1.0547 0.64062-1.8438 0.64062-0.79297 0-1.4141-0.21094-1.8594-0.64062-0.44922-0.42578-0.67188-1.0195-0.67188-1.7812 0-0.75 0.22266-1.3359 0.67188-1.7656 0.44531-0.42578 1.0664-0.64062 1.8594-0.64062z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.65625-1.7969v-2.7969h1.4844v0.45312c0 0.25-0.007813 0.5625-0.015625 0.9375v0.75c0 0.375 0.007812 0.64844 0.03125 0.8125 0.019531 0.15625 0.050781 0.27344 0.09375 0.34375 0.0625 0.09375 0.14062 0.16797 0.23438 0.21875 0.10156 0.054687 0.21875 0.078125 0.34375 0.078125 0.30078 0 0.53906-0.11328 0.71875-0.34375 0.17578-0.23828 0.26562-0.56641 0.26562-0.98438v-2.2656h1.4688v4.5938h-1.4688v-0.67188c-0.21875 0.27344-0.45312 0.47656-0.70312 0.60938-0.25 0.125-0.52734 0.1875-0.82812 0.1875-0.53125 0-0.9375-0.16016-1.2188-0.48438-0.27344-0.33203-0.40625-0.8125-0.40625-1.4375z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m4.2969-4.4531v1.1094c-0.3125-0.125-0.61719-0.21875-0.90625-0.28125-0.29297-0.070312-0.57031-0.10938-0.82812-0.10938-0.28125 0-0.49219 0.039063-0.625 0.10938-0.13672 0.074219-0.20312 0.18359-0.20312 0.32812 0 0.11719 0.050781 0.20312 0.15625 0.26562 0.10156 0.0625 0.28516 0.10938 0.54688 0.14062l0.26562 0.03125c0.75 0.09375 1.2539 0.25 1.5156 0.46875 0.25781 0.21875 0.39062 0.5625 0.39062 1.0312 0 0.49219-0.18359 0.85938-0.54688 1.1094-0.36719 0.25-0.90234 0.375-1.6094 0.375-0.3125 0-0.63281-0.027344-0.95312-0.078125-0.32422-0.050781-0.65625-0.125-1-0.21875v-1.1094c0.28906 0.13672 0.59375 0.24219 0.90625 0.3125 0.3125 0.074219 0.625 0.10938 0.9375 0.10938 0.28906 0 0.50391-0.035156 0.64062-0.10938 0.14453-0.082031 0.21875-0.20312 0.21875-0.35938 0-0.13281-0.054687-0.23438-0.15625-0.29688-0.09375-0.0625-0.28906-0.10938-0.57812-0.14062l-0.26562-0.046875c-0.65625-0.070312-1.1172-0.21875-1.375-0.4375-0.26172-0.22656-0.39062-0.56641-0.39062-1.0156 0-0.48828 0.16406-0.84766 0.5-1.0781 0.33203-0.23828 0.84375-0.35938 1.5312-0.35938 0.26953 0 0.55078 0.023437 0.84375 0.0625 0.30078 0.042969 0.62891 0.10547 0.98438 0.1875z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m3.7344-6.3906v0.96875h-0.8125c-0.21094 0-0.35547 0.039063-0.4375 0.10938-0.085937 0.074219-0.125 0.20312-0.125 0.39062v0.32812h1.25v1.0469h-1.25v3.5469h-1.4688v-3.5469h-0.73438v-1.0469h0.73438v-0.32812c0-0.5 0.14062-0.86719 0.42188-1.1094 0.28125-0.23828 0.71094-0.35938 1.2969-0.35938z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m5.3281-2.7969v2.7969h-1.4844v-2.1406c0-0.39453-0.011719-0.66406-0.03125-0.8125-0.011719-0.15625-0.039062-0.26953-0.078125-0.34375-0.0625-0.09375-0.14844-0.16406-0.25-0.21875-0.09375-0.050781-0.20312-0.078125-0.32812-0.078125-0.30469 0-0.54297 0.12109-0.71875 0.35938-0.17969 0.23047-0.26562 0.55469-0.26562 0.96875v2.2656h-1.4688v-6.3906h1.4688v2.4688c0.22656-0.26953 0.46094-0.46875 0.70312-0.59375 0.25-0.125 0.52344-0.1875 0.82812-0.1875 0.53125 0 0.92969 0.16406 1.2031 0.48438 0.28125 0.32422 0.42188 0.79688 0.42188 1.4219z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m0.76562-6.125h1.7656l2.2344 4.2031v-4.2031h1.5v6.125h-1.7656l-2.2344-4.2031v4.2031h-1.5z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m5.3281-2.7969v2.7969h-1.4844v-2.1406c0-0.39453-0.011719-0.66406-0.03125-0.8125-0.011719-0.15625-0.039062-0.26953-0.078125-0.34375-0.0625-0.09375-0.14844-0.16406-0.25-0.21875-0.09375-0.050781-0.20312-0.078125-0.32812-0.078125-0.30469 0-0.54297 0.12109-0.71875 0.35938-0.17969 0.23047-0.26562 0.55469-0.26562 0.96875v2.2656h-1.4688v-4.5938h1.4688v0.67188c0.22656-0.26953 0.46094-0.46875 0.70312-0.59375 0.25-0.125 0.52344-0.1875 0.82812-0.1875 0.53125 0 0.92969 0.16406 1.2031 0.48438 0.28125 0.32422 0.42188 0.79688 0.42188 1.4219z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m0.76562-6.125h2.625c0.78125 0 1.3789 0.17188 1.7969 0.51562 0.41406 0.34375 0.625 0.83984 0.625 1.4844 0 0.63672-0.21094 1.1328-0.625 1.4844-0.41797 0.34375-1.0156 0.51562-1.7969 0.51562h-1.0312v2.125h-1.5938zm1.5938 1.1406v1.7188h0.85938c0.3125 0 0.55078-0.070313 0.71875-0.21875 0.16406-0.15625 0.25-0.36719 0.25-0.64062 0-0.28125-0.085938-0.49219-0.25-0.64062-0.16797-0.14453-0.40625-0.21875-0.71875-0.21875z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m0.70312-4.5938h1.4688v4.5156c0 0.61328-0.15234 1.082-0.45312 1.4062-0.29297 0.32031-0.71484 0.48438-1.2656 0.48438h-0.73438v-0.96875h0.25c0.28125 0 0.47266-0.0625 0.57812-0.1875 0.10156-0.125 0.15625-0.37109 0.15625-0.73438zm0-1.7969h1.4688v1.2031h-1.4688z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m4.4219-4.4531v1.2031c-0.19922-0.13281-0.40234-0.23438-0.60938-0.29688-0.19922-0.070313-0.40625-0.10938-0.625-0.10938-0.40625 0-0.72656 0.12109-0.95312 0.35938-0.23047 0.24219-0.34375 0.57422-0.34375 1 0 0.42969 0.11328 0.76172 0.34375 1 0.22656 0.24219 0.54688 0.35938 0.95312 0.35938 0.22656 0 0.44531-0.03125 0.65625-0.09375 0.20703-0.070312 0.39844-0.17578 0.57812-0.3125v1.2031c-0.23047 0.085938-0.46484 0.14453-0.70312 0.1875-0.24219 0.050781-0.47656 0.078125-0.70312 0.078125-0.83594 0-1.4844-0.21094-1.9531-0.64062-0.46875-0.42578-0.70312-1.0195-0.70312-1.7812 0-0.75781 0.23438-1.3477 0.70312-1.7656 0.46875-0.42578 1.1172-0.64062 1.9531-0.64062 0.23828 0 0.47266 0.023437 0.70312 0.0625 0.23828 0.042969 0.47266 0.10547 0.70312 0.1875z"
+         id="path56" />
+    </symbol>
+  </defs>
+  <path
+     d="m 159.17278,340.82926 c -11.70388,0 -18.72158,9.36093 -18.72158,21.06508 0,109.99292 91.27134,201.2573 201.2573,201.2573 11.70387,0 21.06508,-7.02341 21.06508,-18.72158 v -56.16473 c 0,-11.70387 -9.36093,-18.72158 -21.06508,-18.72158 -58.50823,0 -107.64942,-49.14674 -107.64942,-107.64941 0,-11.70387 -7.02341,-21.06508 -18.72157,-21.06508 z M 7.0497026,364.23228 c 0,180.20196 147.4430274,320.61726 325.2931374,320.61726 9.36093,0 18.72158,-9.36093 18.72158,-18.72158 v -58.50823 c 0,-11.70387 -9.36093,-18.72157 -21.06508,-18.72157 -124.03445,-2.34295 -227.00243,-98.28933 -227.00243,-224.66449 0,-9.36093 -7.023406,-18.72158 -18.721573,-18.72158 H 25.767104 c -9.360927,0 -18.7215763,9.36093 -18.7215763,18.72158 z"
+     id="path61"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.39163"
+     sodipodi:nodetypes="ssssssssscssscssscc" />
+  <path
+     d="m 268.17977,288.47308 51.48468,4.68047 -16.38364,16.38364 c -7.02341,7.02341 -7.02341,18.72158 0,28.08306 l 74.88631,74.88629 c 9.36092,7.02341 21.06506,7.02341 28.08304,0 l 16.38364,-16.38364 2.34295,51.48469 c 2.34295,4.68046 2.34295,9.36092 7.02341,14.04153 44.4667,44.4667 88.92784,91.27134 133.39454,135.73804 7.02341,7.02341 18.72158,7.02341 28.08306,0 l 95.9514,-98.28932 c 7.02341,-9.36093 7.02341,-21.06508 0,-28.08306 L 556.03461,335.27675 c -2.34295,-2.34295 -7.02341,-4.68047 -11.70388,-7.02341 l -51.48468,-2.34295 14.04153,-16.38364 c 9.36093,-7.02341 9.36093,-18.72158 0,-28.08306 l -72.54976,-72.54976 c -9.36093,-9.36093 -21.06508,-9.36093 -28.08306,0 l -16.38363,14.04153 -2.34295,-53.82819 c -2.34294,-4.68046 -4.68046,-9.36093 -7.02341,-11.70387 L 247.11023,21.665371 c -7.0234,-7.02341 -18.72157,-7.02341 -28.08306,0 -30.42517,32.763093 -63.18828,65.5262 -95.95138,98.289309 -7.02341,7.02341 -7.02341,18.72158 0,28.08306 l 133.39454,135.73804 c 2.34294,2.34295 7.02341,4.68047 11.70387,4.68047 z m 152.11888,-39.78665 46.80464,46.80464 -74.88629,74.88629 -46.80464,-46.80462 z"
+     id="path61-8"
+     style="fill:#ffffff;stroke-width:1.39163"
+     sodipodi:nodetypes="ccsccccccsccccccccsccccccsccccccccc" />
+</svg>
diff --git a/Content/Slate/SodaIcons/hive.svg b/Content/Slate/SodaIcons/hive.svg
new file mode 100644
index 0000000..e5bd534
--- /dev/null
+++ b/Content/Slate/SodaIcons/hive.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 80 80"
+   x="0px"
+   y="0px"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="hive.svg"
+   width="80"
+   height="80"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     id="namedview12"
+     pagecolor="#32ff65"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="11.8"
+     inkscape:cx="69.576271"
+     inkscape:cy="48.559322"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     inkscape:window-x="2549"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10" />
+  <g
+     data-name="Layer 45"
+     id="g4"
+     transform="matrix(0.9150038,0,0,0.93179326,-14.006051,13.749404)"
+     style="fill:#ffffff">
+    <path
+       id="path2"
+       d="M 30,26.839841 18.140625,33.68945 c -1.449635,0.850092 -2.015326,1.652748 -2,3.470703 V 52 c 7.32e-4,0.713795 0.381835,1.37357 1,1.730469 l 13.859375,8 c 0.618799,0.357263 1.381201,0.357263 2,0 l 13.859375,-8 c 0.618165,-0.356899 0.999268,-1.016674 1,-1.730469 V 37.160156 c -0.0023,-1.526639 -0.490679,-2.525584 -2,-3.470703 L 34,26.839844 c -1.196138,-0.609188 -2.867643,-0.588266 -4,-3e-6 z"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:#ffffff" />
+  </g>
+  <g
+     data-name="Layer 45"
+     id="g4-3"
+     transform="matrix(0.9150038,0,0,0.93179326,18.668509,13.729035)"
+     style="fill:#ffffff">
+    <path
+       id="path2-5"
+       d="M 30,26.839841 18.140625,33.68945 c -1.449635,0.850092 -2.015326,1.652748 -2,3.470703 V 52 c 7.32e-4,0.713795 0.381835,1.37357 1,1.730469 l 13.859375,8 c 0.618799,0.357263 1.381201,0.357263 2,0 l 13.859375,-8 c 0.618165,-0.356899 0.999268,-1.016674 1,-1.730469 V 37.160156 c -0.0023,-1.526639 -0.490679,-2.525584 -2,-3.470703 L 34,26.839844 c -1.196138,-0.609188 -2.867643,-0.588266 -4,-3e-6 z"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:#ffffff" />
+  </g>
+  <g
+     data-name="Layer 45"
+     id="g4-5"
+     transform="matrix(0.9150038,0,0,0.93179326,2.3136778,-15.589479)"
+     style="fill:#ffffff">
+    <path
+       id="path2-4"
+       d="M 30,26.839841 18.140625,33.68945 c -1.449635,0.850092 -2.015326,1.652748 -2,3.470703 V 52 c 7.32e-4,0.713795 0.381835,1.37357 1,1.730469 l 13.859375,8 c 0.618799,0.357263 1.381201,0.357263 2,0 l 13.859375,-8 c 0.618165,-0.356899 0.999268,-1.016674 1,-1.730469 V 37.160156 c -0.0023,-1.526639 -0.490679,-2.525584 -2,-3.470703 L 34,26.839844 c -1.196138,-0.609188 -2.867643,-0.588266 -4,-3e-6 z"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:#ffffff" />
+  </g>
+  <g
+     data-name="Layer 45"
+     id="g4-2"
+     transform="matrix(0.9150038,0,0,0.93179326,31.392188,-11.783338)"
+     style="fill:#ffffff;fill-opacity:0.5">
+    <path
+       id="path2-55"
+       d="M 34,22.839841 22.140625,29.68945 c -1.449635,0.850092 -2.015326,1.652748 -2,3.470703 V 48 c 7.32e-4,0.713795 0.381835,1.37357 1,1.730469 l 13.859375,8 c 0.618799,0.357263 1.381201,0.357263 2,0 l 13.859375,-8 c 0.618165,-0.356899 0.999268,-1.016674 1,-1.730469 V 33.160156 c -0.0023,-1.526639 -0.490679,-2.525584 -2,-3.470703 L 38,22.839844 c -1.196138,-0.609188 -2.867643,-0.588266 -4,-3e-6 z"
+       sodipodi:nodetypes="ccccccccccccc"
+       style="fill:#ffffff;fill-opacity:0.5" />
+  </g>
+</svg>
diff --git a/Content/Slate/SodaIcons/hourglass.svg b/Content/Slate/SodaIcons/hourglass.svg
new file mode 100644
index 0000000..d6dd956
--- /dev/null
+++ b/Content/Slate/SodaIcons/hourglass.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg148"
+   sodipodi:docname="hourglass.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata152">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#382e28"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview150"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="240.71494"
+     inkscape:cy="463.49776"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg148" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m0.14062-20.406h18.812v3.9688h-6.7656v16.438h-5.2656v-16.438h-6.7812z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v7.4375l7.5938-7.4375h6.1094l-9.8281 9.6562 10.844 10.75h-6.5938l-8.125-8.0469v8.0469h-5.25z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m7.25-2.2188v8.0469h-4.8906v-21.141h4.8906v2.2344c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844zm3.25-9.9062c-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562 1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="M 439.98423,304.31998 C 497.85543,255.62415 561.3462,209.68895 561.3462,129.59781 V 78.251412 h 46.67704 V 12.905224 H 94.57582 v 65.346188 h 46.67704 v 51.346398 c 0,80.08947 63.49077,126.03134 121.36197,174.72217 9.25339,7.78822 18.66915,25.9891 18.66915,44.65825 0,18.66915 -10.458,30.89853 -18.66915,37.3383 -59.47322,46.73538 -121.36197,94.63102 -121.36197,174.72215 v 68.00345 H 94.57582 v 65.34618 H 608.02324 V 629.04213 H 561.3462 v -67.99678 c 0,-80.08947 -61.88208,-127.99011 -121.36197,-174.72216 -8.21799,-6.44026 -18.66914,-18.66915 -18.66914,-37.33829 0,-18.67582 9.42259,-36.88319 18.66914,-44.66492 z M 496.00002,78.253081 v 51.346399 c -19.83116,78.70188 -101.45803,123.56873 -139.55024,184.12657 -3.88124,4.95602 -18.88249,0.29393 -18.88249,0.29393 C 299.29896,249.47425 220.6419,205.59616 206.60238,129.59948 V 78.253081 Z m 0,482.790609 v 49.78273 H 206.59905 v -49.78273 c 0,-45.31674 36.01633,-75.91521 94.79273,-122.09046 l 1.55632,-1.22425 c 22.30996,-17.49722 36.77818,-41.85763 41.68926,-68.70693 4.39549,0.98328 8.91482,0.98328 13.3103,0 4.89041,26.84263 19.3793,51.20304 41.66259,68.68026 l 1.58888,1.25027 c 58.78306,46.17527 94.7994,76.76873 94.7994,122.09047 z"
+     id="path70"
+     style="fill:#ffffff;stroke-width:1.66704"
+     sodipodi:nodetypes="csccccccscscsccccccscscccccccccccscccccccc" />
+  <path
+     d="M 496.00002,610.82642 386.09226,567.93355 c -19.13759,-7.46916 -50.4412,-7.46916 -69.57879,0 l -109.91442,42.89287 c 107.75273,0 225.08776,0 289.40097,0 z"
+     id="path70-3"
+     style="fill:#ffffff;stroke-width:1.66704;fill-opacity:0.5"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     id="path1095"
+     style="opacity:0.52809;fill:#ffffff;fill-opacity:0.5;stroke-width:1.56762;stroke-dasharray:1.56762, 4.70285"
+     d="M 312.26367 253.95312 C 326.00536 273.65119 341.44689 291.27446 378.34766 330.13281 C 414.30935 368.00227 431.00854 387.99035 445.23633 410.19336 L 450.57422 418.52344 L 455.02344 419.38672 C 457.47024 419.86159 460.17687 420.39253 461.03906 420.56641 C 464.08937 421.18155 468.1316 421.04567 471.07422 420.22852 C 473.47144 419.56284 474.60496 418.52862 476.87305 414.94141 C 481.54226 407.5566 494.44668 390.69686 503.07617 380.70703 C 512.93344 369.29586 523.77501 357.99324 560.5918 320.73828 C 576.14169 305.00333 592.41877 288.07281 596.76367 283.11523 C 605.66059 272.96376 613.47989 263.31418 620.4043 253.95312 L 312.26367 253.95312 z "
+     transform="scale(0.75000002)" />
+</svg>
diff --git a/Content/Slate/SodaIcons/imu.svg b/Content/Slate/SodaIcons/imu.svg
new file mode 100644
index 0000000..edf42b6
--- /dev/null
+++ b/Content/Slate/SodaIcons/imu.svg
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg159"
+   sodipodi:docname="IMU.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata163">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#31a0ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview161"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="698.99358"
+     inkscape:cy="548.85346"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg159"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs65">
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m14.953-3.7188h-8.2188l-1.3125 3.7188h-5.2812l7.5625-20.406h6.2656l7.5625 20.406h-5.2812zm-6.9062-3.7812h5.5781l-2.7812-8.125z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m9.5469-12.125c-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406 1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562zm3.2188 9.9062c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2891 1.8125-5.7812 1.207-1.4883 2.7539-2.2344 4.6406-2.2344 1.0703 0 2.0156 0.21484 2.8281 0.64062 0.8125 0.41797 1.5508 1.0742 2.2188 1.9688v-2.2656h4.9219v21.141h-4.9219z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     d="m 314.05523,385.87362 c 60.87648,18.61898 125.32868,-15.75561 143.94894,-76.63209 18.62026,-60.8765 -15.7556,-125.32869 -76.6321,-143.94895 -60.87648,-18.61898 -125.32867,15.75561 -143.94894,76.63209 -18.61899,60.8765 15.76072,125.32869 76.6321,143.94895 z"
+     id="path67"
+     style="fill:#ffffff;stroke-width:1.27887" />
+  <path
+     d="m 152.91835,160.99816 54.42717,16.47049 c 1.43374,0.71435 3.58185,0.71435 5.01558,0.71435 7.16368,0 14.322,-5.01557 16.4705,-12.17414 2.86248,-9.31167 -2.14811,-18.61898 -11.45978,-21.48619 l -54.42717,-16.4705 c -9.31167,-2.86248 -18.61899,2.14811 -21.4862,11.45978 -2.86249,9.31166 2.15309,19.3377 11.45977,21.48619 z"
+     id="path69"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.27887" />
+  <path
+     d="m 176.55176,277.73288 -54.42718,-16.4705 c -9.31166,-2.86249 -18.61898,2.14811 -21.4862,11.45978 -2.862479,9.31166 2.14811,18.61897 11.45978,21.48619 l 54.42718,16.47049 c 1.43372,0.71436 3.58183,0.71436 5.01557,0.71436 7.16369,0 14.322,-5.01558 16.47049,-12.17414 2.86248,-8.59743 -2.86746,-18.62283 -11.45977,-21.4862 z"
+     id="path71"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.27887" />
+  <path
+     d="m 94.909072,216.14278 91.668978,27.93038 c 1.43373,0.71437 3.58184,0.71437 5.01558,0.71437 7.16369,0 14.322,-5.01558 16.47049,-12.17415 2.86248,-9.31167 -2.14811,-18.61899 -11.45977,-21.4862 L 104.93537,183.1968 c -9.31167,-2.86249 -18.618987,2.1481 -21.4862,11.45977 -2.148108,9.31167 2.867469,18.62282 11.459773,21.48619 z"
+     id="path73"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.27887" />
+  <path
+     d="m 689.32511,367.96952 -31.51249,-59.44161 c -4.29622,-8.59243 -15.04199,-11.45977 -22.9198,-7.16367 -8.59243,4.29621 -11.45977,15.042 -7.16369,22.91979 l 12.17415,22.19981 -126.04357,-38.6703 c -9.31167,-2.86248 -18.61898,2.14811 -21.48619,11.45978 -2.86248,9.31166 2.1481,18.61898 11.45977,21.48619 l 126.04357,38.6703 -22.1998,12.17414 c -8.59243,4.29622 -11.45978,15.04201 -7.16369,22.9198 2.86249,5.72996 9.31166,9.31167 15.042,9.31167 2.86248,0 5.72995,-0.71436 7.87806,-2.14811 l 59.44161,-31.51248 c 7.88304,-2.86748 10.7454,-13.6084 6.4493,-22.20493 z"
+     id="path75"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.27887" />
+  <path
+     d="M 673.56951,526.24175 30.454322,328.5805 c -7.878058,-2.1481 -16.47049,2.14811 -18.618982,10.02605 -2.1481081,7.87806 2.148108,16.47049 10.026038,18.61898 L 664.97656,554.88677 c 1.43374,0.71436 2.86249,0.71436 4.29622,0.71436 6.44432,0 12.17415,-4.29622 14.322,-10.74041 2.1481,-7.87806 -2.14811,-16.47049 -10.02604,-18.61898 z"
+     id="path77"
+     style="fill:#ffffff;stroke-width:1.27887" />
+</svg>
diff --git a/Content/Slate/SodaIcons/joystick.svg b/Content/Slate/SodaIcons/joystick.svg
new file mode 100644
index 0000000..ef8cb72
--- /dev/null
+++ b/Content/Slate/SodaIcons/joystick.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg146"
+   sodipodi:docname="Joystick.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata150">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2e1853"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview148"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="0.90214288"
+     inkscape:cx="622.45372"
+     inkscape:cy="497.06847"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg146"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m20.922-1.5156c-1.3125 0.63672-2.6797 1.1172-4.0938 1.4375-1.4062 0.3125-2.8672 0.46875-4.375 0.46875-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2891 1.0078-5.8789 3.0312-7.7656 2.0312-1.8828 4.8047-2.8281 8.3281-2.8281 1.3516 0 2.6484 0.13281 3.8906 0.39062 1.25 0.25 2.4258 0.625 3.5312 1.125v4.2188c-1.1484-0.64453-2.2812-1.125-3.4062-1.4375-1.125-0.32031-2.25-0.48438-3.375-0.48438-2.1055 0-3.7266 0.58984-4.8594 1.7656-1.125 1.168-1.6875 2.8398-1.6875 5.0156 0 2.1562 0.54688 3.8242 1.6406 5 1.0938 1.1797 2.6445 1.7656 4.6562 1.7656 0.53906 0 1.0469-0.03125 1.5156-0.09375 0.47656-0.070313 0.89844-0.17969 1.2656-0.32812v-3.9688h-3.2031v-3.5156h8.2031z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v7.7656h7.7656v-7.7656h5.2656v20.406h-5.2656v-8.6562h-7.7656v8.6562h-5.25z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v21.281h-4.8906z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="m 450.30114,7.5968076 c -8.06223,0.6327565 -14.31355,7.3095444 -14.41688,15.3985834 -0.4364,18.202642 -0.68733,28.599168 -1.95279,31.277547 -0.63276,1.341898 -0.8946,2.051096 -4.15666,3.911159 -3.26195,1.854617 -9.53506,4.314731 -19.05866,6.60043 -17.10085,4.085715 -30.16039,10.096986 -40.07653,18.574097 -9.92243,8.476831 -16.04235,19.392416 -18.81987,30.301436 -4.42939,17.4276 -2.50383,34.49634 -1.71288,51.3193 -20.66317,3.84566 -37.5783,20.33081 -38.85465,41.54419 -12.08789,0 -24.07748,0.20183 -36.1651,0.24002 V 194.2992 c -0.005,-8.63506 -7.00399,-15.63878 -15.64435,-15.63878 h -77.70929 c -8.63506,0 -15.63878,7.00401 -15.63878,15.63878 v 13.19527 c -6.66034,0.0764 -13.12978,-0.0764 -19.79598,0 -5.89132,-0.47457 -39.1116,-2.10011 -71.59986,18.08254 -35.778281,22.22301 -68.8572373,71.36107 -66.7123,166.1768 L 6.2736821,598.49728 c -0.2345605,27.96658 8.0787049,50.18958 22.2397609,65.49042 14.161055,15.30083 33.187878,23.15023 52.049643,25.41388 18.863157,2.26922 37.966504,-0.61642 54.493424,-7.33133 16.5283,-6.7095 31.00524,-17.24888 38.85464,-32.74521 19.2011,-37.87854 31.82914,-84.90518 51.07354,-142.71654 17.75577,0.48549 49.81952,-2.39463 72.33717,-25.90542 h 106.06407 c 22.47996,23.52169 54.58698,26.39557 72.33718,25.90542 19.31003,57.81556 31.94924,104.8422 51.07353,142.71654 7.86589,15.49214 22.32076,26.03669 38.85464,32.74521 16.5339,6.71493 35.63725,9.60055 54.49343,7.33133 18.85758,-2.26923 37.90087,-10.11333 52.04964,-25.41388 14.15017,-15.30084 22.47437,-37.52943 22.23976,-65.49042 l -1.71287,-206.74347 c 2.14381,-94.81573 -31.1798,-143.95937 -66.95808,-166.1768 -27.87441,-17.3131 -56.19569,-18.38278 -67.44962,-18.08254 V 194.2992 h 0.005 c 0,-8.63506 -7.00399,-15.63878 -15.63877,-15.63878 h -77.4705 c -8.63504,0 -15.63877,7.00401 -15.63877,15.63878 v 12.46437 c -9.61145,-0.0764 -19.23321,0 -28.83935,0 -1.24917,-21.38234 -18.44284,-38.07543 -39.34619,-41.78997 -0.46367,-18.39396 -1.77279,-33.63474 0.73639,-43.49643 1.53832,-6.06028 3.8729,-10.21149 8.79872,-14.41688 4.92567,-4.20567 13.20072,-8.651384 27.12731,-11.973383 11.0516,-2.651009 19.69265,-5.542206 27.12731,-9.775106 7.43494,-4.232899 13.70261,-10.380603 17.10643,-17.597982 6.80767,-14.43364 4.48929,-27.317232 4.88756,-43.987976 0.13085,-4.189331 -1.42368,-8.258708 -4.32032,-11.291503 -2.8965,-3.0329362 -6.88405,-4.7730447 -11.07883,-4.8383982 -0.48548,-0.021827 -0.97641,-0.021827 -1.46193,0 z M 539.00743,260.52067 c 16.79502,0 30.5472,13.75176 30.5472,30.54721 0,16.79544 -13.84448,30.79298 -30.5472,30.79298 -16.69729,0 -30.79298,-14.09571 -30.79298,-30.79298 0,-16.69728 13.99655,-30.54721 30.79298,-30.54721 z m -374.38654,17.83677 0.005,0.005 c 0.49093,-0.0218 0.97642,-0.0218 1.46737,0 4.23291,-0.0655 8.31318,1.58733 11.30254,4.57656 2.99468,2.99467 4.64751,7.07494 4.58201,11.30798 v 45.45564 h 45.45564 c 4.18389,-0.0601 8.22044,1.56011 11.19878,4.50031 2.98378,2.94022 4.66384,6.94955 4.66384,11.13888 0,4.18389 -1.68006,8.19866 -4.66384,11.13887 -2.97834,2.94022 -7.01489,4.56023 -11.19878,4.50032 h -45.45564 v 45.20986 c 0.0601,4.18389 -1.56555,8.22045 -4.50032,11.20423 -2.94021,2.97834 -6.95499,4.65839 -11.13887,4.65839 -4.18932,0 -8.19865,-1.68005 -11.13887,-4.65839 -2.94021,-2.98378 -4.56022,-7.02034 -4.50577,-11.20423 V 370.981 h -45.45563 0.005 c -4.18934,0.0601 -8.225895,-1.5601 -11.204229,-4.50032 -2.983781,-2.94021 -4.658397,-6.95498 -4.658397,-11.13887 0,-4.18933 1.674616,-8.19866 4.658397,-11.13888 2.978334,-2.9402 7.014889,-4.56022 11.204229,-4.50031 h 45.45564 v -45.45564 h -0.005 c -0.16909,-8.10593 5.87485,-15.00059 13.93177,-15.88454 z m 309.14469,47.89942 c 16.79502,0 30.5472,14.09012 30.5472,30.79298 0,16.69727 -13.84993,30.5472 -30.5472,30.5472 -16.69728,0 -30.5472,-13.84993 -30.5472,-30.5472 0,-16.69728 13.75719,-30.79298 30.5472,-30.79298 z m 130.49625,0 c 16.79503,0 30.54721,13.99656 30.54721,30.79298 0,16.79642 -13.84992,30.5472 -30.54721,30.5472 -16.69727,0 -30.79297,-13.75175 -30.79297,-30.5472 0,-16.79545 13.99655,-30.79298 30.79297,-30.79298 z m -65.25161,63.78396 c 16.70286,0 30.5472,13.99656 30.5472,30.79298 0,16.79642 -13.75176,30.5472 -30.5472,30.5472 -16.78944,0 -30.79299,-13.84993 -30.79299,-30.5472 0,-16.69728 14.09571,-30.79298 30.79299,-30.79298 z m -232.8849,39.10042 h 88.4675 v 20.28055 h -88.4675 z"
+     fill-rule="evenodd"
+     id="path70"
+     style="fill:#ffffff;stroke-width:1.39644" />
+  <path
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.64182;stroke-dasharray:1.64182, 4.92545"
+     d="m 466.97936,386.22932 c -9.24536,-2.54525 -16.54112,-8.5459 -20.35128,-16.73862 -3.07319,-6.60804 -3.48844,-15.94467 -1.00358,-22.565 4.80715,-12.80756 17.88882,-21.34093 30.66805,-20.00524 10.42082,1.0892 20.43898,8.36805 24.87603,18.07407 1.93452,4.23174 2.29088,6.09672 2.29088,11.98899 0,5.92287 -0.35288,7.74992 -2.33428,12.08572 -3.96451,8.67537 -12.34123,15.38908 -21.66739,17.36583 -5.36246,1.13661 -7.74517,1.09732 -12.47843,-0.20575 z"
+     id="path877" />
+  <path
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.64182;stroke-dasharray:1.64182, 4.92545"
+     d="m 532.02001,320.45386 c -6.02131,-1.67968 -8.84487,-3.27915 -13.53757,-7.6686 -5.98153,-5.59503 -9.00887,-12.08341 -9.44495,-20.243 -0.28503,-5.33305 -0.0162,-7.45467 1.43003,-11.28919 8.04925,-21.34065 35.45128,-27.03569 50.35027,-10.46442 6.09499,6.77909 7.50566,10.54875 7.52612,20.1118 0.0159,7.42816 -0.21042,8.67337 -2.37884,13.08981 -6.27331,12.77677 -21.20341,20.01797 -33.94506,16.4636 z"
+     id="path879" />
+</svg>
diff --git a/Content/Slate/SodaIcons/keyboard.svg b/Content/Slate/SodaIcons/keyboard.svg
new file mode 100644
index 0000000..427cfe4
--- /dev/null
+++ b/Content/Slate/SodaIcons/keyboard.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg4"
+   sodipodi:docname="Keyboard.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#2a3881"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview6"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="0.90214285"
+     inkscape:cx="422.32808"
+     inkscape:cy="557.08656"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4"
+     inkscape:document-rotation="0" />
+  <path
+     d="m 548.98218,21.821851 v 49.370547 c 0,27.781512 -21.59467,49.370542 -49.37054,49.370542 H 203.38836 c -54.27516,0 -98.7411,44.46594 -98.7411,98.74111 H 55.27672 c -27.352694,0 -49.3705476,22.01785 -49.3705476,49.37054 v 345.59383 c 0,27.35269 22.0178536,49.37055 49.3705476,49.37055 h 592.44656 c 27.3527,0 49.37055,-22.01786 49.37055,-49.37055 V 268.67459 c 0,-27.35269 -22.01785,-49.37054 -49.37055,-49.37054 H 154.01782 c 0,-27.77588 21.59467,-49.37055 49.37054,-49.37055 h 296.22328 c 54.27516,0 98.7411,-44.46171 98.7411,-98.741102 V 21.821851 Z M 55.27672,268.67459 h 49.37054 v 24.68527 H 55.27672 Z m 98.7411,0 h 98.74109 v 24.68527 h -98.74109 z m 148.11163,0 h 98.7411 v 24.68527 h -98.7411 z m 148.11164,0 h 98.74109 v 24.68527 h -98.74109 z m 148.11165,0 h 49.37054 v 24.68527 H 598.35274 Z M 55.27672,367.41568 h 49.37054 v 49.37055 H 55.27672 Z m 98.7411,0 h 49.37054 v 49.37055 h -49.37054 z m 98.74109,0 h 49.37054 v 49.37055 h -49.37054 z m 98.74109,0 h 49.37055 v 49.37055 H 351.5 Z m 98.74109,0 h 49.37055 v 49.37055 h -49.37055 z m 98.74109,0 h 49.37056 v 49.37055 H 548.98218 Z M 55.27672,466.15677 h 49.37054 v 49.37055 H 55.27672 Z m 98.7411,0 h 49.37054 v 49.37055 h -49.37054 z m 98.74109,0 h 49.37054 v 49.37055 h -49.37054 z m 98.74109,0 h 49.37055 v 49.37055 H 351.5 Z m 98.74109,0 h 49.37055 v 49.37055 h -49.37055 z m 98.74109,49.37055 h 49.37056 v 49.37055 h 49.37054 v 49.37055 H 499.61164 v -49.37055 h 49.37054 z M 55.27672,564.89787 h 49.37054 v 49.37055 H 55.27672 Z m 98.7411,0 h 246.85273 v 49.37055 H 154.01782 Z"
+     id="path2"
+     style="fill:#ffffff;stroke:none;stroke-width:1.41059" />
+  <path
+     style="fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:1.1727;stroke-dasharray:1.1727, 3.5181"
+     d="M 500.02528,589.48126 V 565.1478 h 24.62664 24.62664 v -24.62664 -24.62664 h 24.33346 24.33346 v 24.62664 24.62664 h 24.62665 24.62663 v 24.33346 24.33346 h -73.58674 -73.58674 z"
+     id="path844" />
+</svg>
diff --git a/Content/Slate/SodaIcons/lap-count.svg b/Content/Slate/SodaIcons/lap-count.svg
new file mode 100644
index 0000000..36c46f5
--- /dev/null
+++ b/Content/Slate/SodaIcons/lap-count.svg
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg153"
+   sodipodi:docname="lap-count.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata157">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#312427"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview155"
+     showgrid="false"
+     inkscape:zoom="0.31895567"
+     inkscape:cx="244.6172"
+     inkscape:cy="618.36049"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg153" />
+  <defs
+     id="defs71">
+    <symbol
+       id="w"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v11.594l5.625-5.625h5.6875l-7.4688 7.0312 8.0625 8.2812h-5.9375l-5.9688-6.3906v6.3906h-4.8906z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v21.281h-4.8906z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m10.75-12.516c0.82031 0 1.4453-0.17969 1.875-0.54688 0.4375-0.36328 0.65625-0.89844 0.65625-1.6094 0-0.69531-0.21875-1.2266-0.65625-1.5938-0.42969-0.375-1.0547-0.5625-1.875-0.5625h-2.9219v4.3125zm0.17188 8.9375c1.0625 0 1.8594-0.22266 2.3906-0.67188 0.53125-0.44531 0.79688-1.125 0.79688-2.0312 0-0.88281-0.26562-1.5469-0.79688-1.9844-0.52344-0.4375-1.3203-0.65625-2.3906-0.65625h-3.0938v5.3438zm4.8906-7.3438c1.1328 0.32422 2.0078 0.92969 2.625 1.8125 0.625 0.88672 0.9375 1.9688 0.9375 3.25 0 1.9688-0.66797 3.4375-2 4.4062-1.3359 0.96875-3.3555 1.4531-6.0625 1.4531h-8.7344v-20.406h7.8906c2.832 0 4.8828 0.42969 6.1562 1.2812 1.2812 0.85547 1.9219 2.2266 1.9219 4.1094 0 1-0.23438 1.8516-0.70312 2.5469-0.46875 0.6875-1.1484 1.2031-2.0312 1.5469z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m7.25-2.2188v8.0469h-4.8906v-21.141h4.8906v2.2344c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844zm3.25-9.9062c-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562 1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path65" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path68" />
+    </symbol>
+  </defs>
+  <path
+     d="m 227.51997,34.380838 c 0,-13.440431 10.89484,-24.335055 24.32636,-24.335055 h 133.81131 c 13.43196,0 24.32637,10.894841 24.32637,24.335055 0,13.431961 -10.89484,24.326367 -24.32637,24.326367 H 251.84633 c -13.43196,0 -24.32636,-10.894841 -24.32636,-24.326367 z m 91.23202,169.202812 c -12.16775,0 -16.41873,5.95658 -17.7594,19.33749 l -13.38113,172.49369 c 0.71276,15.63804 13.5423,27.98433 29.19642,28.09512 h 3.76744 c 15.70603,-0.0424 28.60341,-12.41364 29.31589,-28.09512 l -13.38113,-172.485 c -1.34065,-13.26231 -5.59165,-19.34596 -17.7594,-19.34596 z m 54.73704,435.11157 C 306.72891,653.8241 236.67575,640.84195 179.76435,602.78673 122.85512,564.73864 84.09454,504.96211 72.571067,437.47865 61.039774,369.99737 77.763906,300.75009 118.81484,245.96092 c 41.05007,-54.78917 102.81414,-90.28059 170.82327,-98.17216 68.00044,-7.89114 136.25502,12.52398 188.75905,56.4509 52.5062,43.92821 84.63942,107.51475 88.86433,175.83668 1.48489,12.28634 11.95553,21.50121 24.33506,21.4165 6.7288,0.009 13.17738,-2.76607 17.78481,-7.67913 4.60744,-4.91285 6.97469,-11.51435 6.54199,-18.23446 -3.98792,-61.58596 -27.07636,-120.38717 -66.05633,-168.23402 l 16.54602,-16.54601 v 0.009 c 4.68367,-4.68368 7.30573,-11.02213 7.30573,-17.64058 0,-6.61845 -2.62184,-12.96537 -7.30573,-17.64058 l -0.9758,-0.84852 c -9.77485,-9.75792 -25.61664,-9.75792 -35.3915,0 l -16.66483,15.93498 C 435.12338,102.5715 327.12422,80.102352 228.21567,111.28633 129.32234,142.46161 53.736607,222.8066 28.654318,323.43118 3.5720282,424.04706 32.591414,530.46704 105.2827,604.4258 c 72.69237,73.95659 178.59537,104.80822 279.62614,81.46585 11.3106,-2.54559 19.26125,-12.72773 18.97279,-24.32636 -0.20354,-7.40761 -3.77592,-14.30584 -9.6984,-18.76057 -5.91423,-4.44625 -13.54231,-5.96505 -20.71228,-4.10674 z"
+     fill-rule="evenodd"
+     id="path73"
+     style="fill:#ffffff;stroke-width:2.17219"
+     sodipodi:nodetypes="sssssssccccccccccccccccccccccscccccccccccc" />
+  <path
+     d="m 656.35035,432.84326 h -194.6326 l 0.01,-0.009 c -10.0294,0 -18.1836,8.09489 -18.2429,18.12433 v 207.52895 c 0,10.07181 8.1626,18.24293 18.2429,18.24293 10.0803,0 18.2429,-8.17112 18.2429,-18.24293 v -79.80196 h 176.7534 c 9.9275,-0.19506 17.8782,-8.30688 17.8782,-18.24293 V 450.9602 c 0,-9.93604 -7.9507,-18.04787 -17.8782,-18.24293 z"
+     fill-rule="evenodd"
+     id="path73-2"
+     style="fill:#ffffff;stroke-width:2.17219;fill-opacity:0.5"
+     sodipodi:nodetypes="ccccsssccsscc" />
+</svg>
diff --git a/Content/Slate/SodaIcons/lidar.svg b/Content/Slate/SodaIcons/lidar.svg
new file mode 100644
index 0000000..11a8f53
--- /dev/null
+++ b/Content/Slate/SodaIcons/lidar.svg
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg95"
+   sodipodi:docname="Lidar.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata99">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview97"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="299.5894"
+     inkscape:cy="599.94801"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg95"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs47">
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m31.266-1.875c-1.6172 0.84375-3.2969 1.4766-5.0469 1.8906-1.7422 0.42578-3.5586 0.64062-5.4531 0.64062-5.668 0-10.156-1.582-13.469-4.75-3.3125-3.1641-4.9688-7.4609-4.9688-12.891 0-5.4375 1.6562-9.7383 4.9688-12.906 3.3125-3.1641 7.8008-4.75 13.469-4.75 1.8945 0 3.7109 0.21484 5.4531 0.64062 1.75 0.42969 3.4297 1.0586 5.0469 1.8906v7.0469c-1.625-1.1133-3.2305-1.9258-4.8125-2.4375-1.5742-0.51953-3.2344-0.78125-4.9844-0.78125-3.1367 0-5.6016 1.0078-7.3906 3.0156-1.793 2-2.6875 4.7617-2.6875 8.2812 0 3.5117 0.89453 6.2734 2.6875 8.2812 1.7891 2 4.2539 3 7.3906 3 1.75 0 3.4102-0.25391 4.9844-0.76562 1.582-0.51953 3.1875-1.332 4.8125-2.4375z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m22.875-18.578c-0.71094-0.33203-1.418-0.57812-2.125-0.73438-0.71094-0.15625-1.418-0.23438-2.125-0.23438-2.1055 0-3.7266 0.67188-4.8594 2.0156-1.125 1.3438-1.6875 3.2656-1.6875 5.7656v11.766h-8.1562v-25.531h8.1562v4.2031c1.0508-1.6758 2.2539-2.8945 3.6094-3.6562 1.3633-0.76953 2.9922-1.1562 4.8906-1.1562 0.26953 0 0.56641 0.011719 0.89062 0.03125 0.32031 0.023437 0.78516 0.074219 1.3906 0.15625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m29.391-12.828v2.3281h-19.062c0.19531 1.9062 0.88281 3.3398 2.0625 4.2969 1.1875 0.96094 2.8438 1.4375 4.9688 1.4375 1.7188 0 3.4766-0.25391 5.2812-0.76562 1.8008-0.50781 3.6484-1.2812 5.5469-2.3125v6.2969c-1.9297 0.73047-3.8594 1.2773-5.7969 1.6406-1.9297 0.375-3.8555 0.5625-5.7812 0.5625-4.6172 0-8.2031-1.1719-10.766-3.5156s-3.8438-5.6328-3.8438-9.875c0-4.1641 1.2539-7.4414 3.7656-9.8281 2.5195-2.3828 5.9844-3.5781 10.391-3.5781 4.0078 0 7.2188 1.2109 9.625 3.625 2.4062 2.418 3.6094 5.6484 3.6094 9.6875zm-8.375-2.7188c0-1.5391-0.45312-2.7852-1.3594-3.7344-0.90625-0.95703-2.0898-1.4375-3.5469-1.4375-1.5859 0-2.8711 0.44922-3.8594 1.3438-0.98047 0.88672-1.5898 2.1641-1.8281 3.8281z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m15.359-11.484c-1.6992 0-2.9805 0.29297-3.8438 0.875-0.85547 0.57422-1.2812 1.4219-1.2812 2.5469 0 1.0312 0.34375 1.8398 1.0312 2.4219 0.69531 0.58594 1.6602 0.875 2.8906 0.875 1.5312 0 2.8164-0.54688 3.8594-1.6406 1.0508-1.1016 1.5781-2.4844 1.5781-4.1406v-0.9375zm12.469-3.0781v14.562h-8.2344v-3.7812c-1.0938 1.5547-2.3242 2.6836-3.6875 3.3906-1.3672 0.69531-3.0273 1.0469-4.9844 1.0469-2.6484 0-4.7969-0.76953-6.4531-2.3125-1.6484-1.5391-2.4688-3.5391-2.4688-6 0-2.9883 1.0312-5.1797 3.0938-6.5781 2.0625-1.4062 5.2969-2.1094 9.7031-2.1094h4.7969v-0.64062c0-1.2891-0.51172-2.2344-1.5312-2.8281-1.0117-0.60156-2.5938-0.90625-4.75-0.90625-1.75 0-3.3828 0.17969-4.8906 0.53125-1.5 0.34375-2.8984 0.86719-4.1875 1.5625v-6.2188c1.75-0.42578 3.5039-0.75 5.2656-0.96875 1.7578-0.21875 3.5234-0.32812 5.2969-0.32812 4.5938 0 7.9102 0.91406 9.9531 2.7344 2.0508 1.8125 3.0781 4.7617 3.0781 8.8438z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m12.828-32.766v7.2344h8.4062v5.8438h-8.4062v10.828c0 1.1797 0.23438 1.9805 0.70312 2.4062 0.47656 0.41797 1.4141 0.625 2.8125 0.625h4.1875v5.8281h-7c-3.2188 0-5.5-0.67188-6.8438-2.0156s-2.0156-3.625-2.0156-6.8438v-10.828h-4.0625v-5.8438h4.0625v-7.2344z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m21.281-21.781v-13.672h8.2031v35.453h-8.2031v-3.6875c-1.125 1.5-2.3672 2.6016-3.7188 3.2969-1.3438 0.69531-2.9062 1.0469-4.6875 1.0469-3.1484 0-5.7305-1.25-7.75-3.75-2.0234-2.5-3.0312-5.7109-3.0312-9.6406 0-3.9375 1.0078-7.1562 3.0312-9.6562 2.0195-2.5 4.6016-3.75 7.75-3.75 1.7578 0 3.3164 0.35547 4.6719 1.0625 1.3633 0.71094 2.6094 1.8086 3.7344 3.2969zm-5.375 16.516c1.75 0 3.082-0.63281 4-1.9062 0.91406-1.2812 1.375-3.1328 1.375-5.5625 0-2.4375-0.46094-4.2891-1.375-5.5625-0.91797-1.2812-2.25-1.9219-4-1.9219-1.7305 0-3.0586 0.64062-3.9844 1.9219-0.91797 1.2734-1.375 3.125-1.375 5.5625 0 2.4297 0.45703 4.2812 1.375 5.5625 0.92578 1.2734 2.2539 1.9062 3.9844 1.9062z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.5-5.2656c1.75 0 3.082-0.63281 4-1.9062 0.91406-1.2812 1.375-3.1328 1.375-5.5625 0-2.4375-0.46094-4.2891-1.375-5.5625-0.91797-1.2812-2.25-1.9219-4-1.9219s-3.0938 0.64844-4.0312 1.9375c-0.92969 1.2812-1.3906 3.1328-1.3906 5.5469 0 2.418 0.46094 4.2656 1.3906 5.5469 0.9375 1.2812 2.2812 1.9219 4.0312 1.9219zm-5.4219-16.516c1.125-1.4883 2.3672-2.5859 3.7344-3.2969 1.3633-0.70703 2.9375-1.0625 4.7188-1.0625 3.1445 0 5.7266 1.25 7.75 3.75 2.0195 2.5 3.0312 5.7188 3.0312 9.6562 0 3.9297-1.0117 7.1406-3.0312 9.6406-2.0234 2.5-4.6055 3.75-7.75 3.75-1.7812 0-3.3555-0.35156-4.7188-1.0469-1.3672-0.70703-2.6094-1.8047-3.7344-3.2969v3.6875h-8.1562v-35.453h8.1562z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.5625-25.531h8.1719l6.8594 17.328 5.8281-17.328h8.1562l-10.734 27.953c-1.0742 2.832-2.3281 4.8164-3.7656 5.9531-1.4375 1.1328-3.3359 1.7031-5.6875 1.7031h-4.7188v-5.3594h2.5469c1.3828 0 2.3906-0.22656 3.0156-0.67188 0.63281-0.4375 1.1289-1.2266 1.4844-2.3594l0.21875-0.70312z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m24.938-6.2031h-13.719l-2.1719 6.2031h-8.8125l12.594-34.031h10.469l12.594 34.031h-8.8125zm-11.531-6.3125h9.3125l-4.6406-13.531z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m29.578-15.547v15.547h-8.2031v-11.891c0-2.207-0.054688-3.7266-0.15625-4.5625-0.09375-0.83203-0.26172-1.4453-0.5-1.8438-0.32422-0.53125-0.76172-0.94141-1.3125-1.2344-0.54297-0.30078-1.1641-0.45312-1.8594-0.45312-1.6992 0-3.0391 0.65625-4.0156 1.9688-0.96875 1.3125-1.4531 3.1328-1.4531 5.4531v12.562h-8.1562v-25.531h8.1562v3.75c1.2266-1.4883 2.5352-2.5859 3.9219-3.2969 1.3828-0.70703 2.9102-1.0625 4.5781-1.0625 2.9453 0 5.1797 0.90625 6.7031 2.7188 1.5312 1.8047 2.2969 4.4297 2.2969 7.875z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m3.9219-25.531h8.1562v25.078c0 3.4141-0.82422 6.0234-2.4688 7.8281-1.6367 1.8008-4.0117 2.7031-7.125 2.7031h-4.0312v-5.3594h1.4062c1.5508 0 2.6133-0.35156 3.1875-1.0469 0.58203-0.69922 0.875-2.0742 0.875-4.125zm0-9.9219h8.1562v6.6406h-8.1562z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m23.859-24.719v6.1875c-1.75-0.72656-3.4375-1.2734-5.0625-1.6406-1.625-0.36328-3.1562-0.54688-4.5938-0.54688-1.5547 0-2.7109 0.19922-3.4688 0.59375-0.75 0.38672-1.125 0.98047-1.125 1.7812 0 0.65625 0.28516 1.1641 0.85938 1.5156 0.57031 0.34375 1.5938 0.60156 3.0625 0.76562l1.4375 0.20312c4.1758 0.53125 6.9844 1.4062 8.4219 2.625 1.4453 1.2109 2.1719 3.1172 2.1719 5.7188 0 2.7188-1.0078 4.7617-3.0156 6.125-2 1.3672-4.9922 2.0469-8.9688 2.0469-1.6875 0-3.4336-0.13672-5.2344-0.40625-1.793-0.25781-3.6406-0.65625-5.5469-1.1875v-6.2031c1.625 0.79297 3.2891 1.3867 5 1.7812 1.7188 0.39844 3.457 0.59375 5.2188 0.59375 1.5938 0 2.7891-0.21875 3.5938-0.65625 0.8125-0.4375 1.2188-1.0938 1.2188-1.9688 0-0.72656-0.28125-1.2695-0.84375-1.625-0.55469-0.35156-1.6562-0.62891-3.3125-0.82812l-1.4375-0.1875c-3.625-0.44531-6.168-1.2852-7.625-2.5156-1.4609-1.2383-2.1875-3.1094-2.1875-5.6094 0-2.707 0.92188-4.7109 2.7656-6.0156 1.8516-1.3125 4.6953-1.9688 8.5312-1.9688 1.5 0 3.0781 0.11719 4.7344 0.34375 1.6562 0.23047 3.457 0.58984 5.4062 1.0781z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m4.2812-34.031h8.7812v12.422l12.641-12.422h10.188l-16.391 16.125 18.078 17.906h-10.984l-13.531-13.406v13.406h-8.7812z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m3.9219-25.531h8.1562v25.531h-8.1562zm0-9.9219h8.1562v6.6406h-8.1562z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m27.578-21.281c1.0312-1.582 2.2539-2.7852 3.6719-3.6094 1.4258-0.83203 2.9883-1.25 4.6875-1.25 2.9375 0 5.1719 0.90625 6.7031 2.7188 1.5312 1.8047 2.2969 4.4297 2.2969 7.875v15.547h-8.2031v-13.312c0.019531-0.19531 0.03125-0.39844 0.03125-0.60938 0.007813-0.21875 0.015625-0.51953 0.015625-0.90625 0-1.8125-0.26562-3.125-0.79688-3.9375s-1.3906-1.2188-2.5781-1.2188c-1.5547 0-2.75 0.64062-3.5938 1.9219-0.84375 1.2734-1.2773 3.1172-1.2969 5.5312v12.531h-8.2031v-13.312c0-2.8203-0.24609-4.6406-0.73438-5.4531-0.49219-0.8125-1.3555-1.2188-2.5938-1.2188-1.5742 0-2.7891 0.64062-3.6406 1.9219-0.84375 1.2812-1.2656 3.1172-1.2656 5.5v12.562h-8.2031v-25.531h8.2031v3.75c1-1.4453 2.1484-2.5352 3.4531-3.2656 1.3008-0.72656 2.7344-1.0938 4.2969-1.0938 1.7578 0 3.3164 0.42969 4.6719 1.2812 1.3516 0.84375 2.3789 2.0391 3.0781 3.5781z"
+         id="path44" />
+    </symbol>
+  </defs>
+  <path
+     d="m 391.65591,406.78119 c -20.9395,0 -38.93345,-12.60507 -46.81052,-30.6373 H 13.798402 c -5.6418587,0 -10.2109745,-4.57339 -10.2109745,-10.21525 v -20.42195 c 0,-5.64185 4.5691158,-10.21524 10.2109745,-10.21524 H 344.84539 c 7.87729,-18.03224 25.87211,-30.6373 46.81052,-30.6373 28.20054,0 51.06363,22.86309 51.06363,51.06363 0,28.20054 -22.86309,51.06362 -51.06363,51.06362 z"
+     fill-rule="evenodd"
+     id="path49"
+     sodipodi:nodetypes="ccsssscsscc"
+     style="fill:#ffffff;stroke-width:1.09419" />
+  <path
+     d="M 268.77534,254.6299 89.186048,75.040603 c -3.987773,-3.987773 -3.987773,-10.454651 0,-14.442205 L 103.62826,46.156193 c 3.98777,-3.987774 10.45464,-3.987774 14.4422,0 L 297.6707,225.74549 c 3.98778,3.98778 3.98778,10.45465 0,14.44221 l -14.44659,14.4422 c -3.98777,3.98778 -10.45038,3.98778 -14.4422,0 z m 398.28495,398.28492 -179.5893,-179.5893 c -3.98777,-3.98776 -3.98777,-10.45464 0,-14.4422 l 14.44221,-14.44221 c 3.98777,-3.98777 10.45465,-3.98777 14.4422,0 l 179.60024,179.5893 c 3.98778,3.98778 3.98778,10.45466 0,14.44221 l -14.44658,14.4422 c -3.98777,3.98778 -10.45038,3.98778 -14.4422,0 z M 412.98732,196.34243 c 0,5.64187 -4.57339,10.21098 -10.21098,10.21098 h -20.42633 c -5.64185,0 -10.21097,-4.56911 -10.21097,-10.21098 V 53.364713 c 0,-5.637593 4.56912,-10.210976 10.21097,-10.210976 h 20.42633 c 5.63759,0 10.21098,4.573383 10.21098,10.210976 z m 0,449.35074 c 0,5.6376 -4.57339,10.21098 -10.21098,10.21098 h -20.42633 c -5.64185,0 -10.21097,-4.57338 -10.21097,-10.21098 V 502.71545 c 0,-5.64185 4.56912,-10.21097 10.21097,-10.21097 h 20.42633 c 5.63759,0 10.21098,4.56912 10.21098,10.21097 z M 545.74533,369.95746 c -5.63759,0 -10.21097,-4.57338 -10.21097,-10.21524 v -20.42195 c 0,-5.64186 4.57338,-10.21524 10.21097,-10.21524 h 142.97772 c 5.64187,0 10.21098,4.57338 10.21098,10.21524 v 20.42195 c 0,5.64186 -4.56911,10.21524 -10.21098,10.21524 z M 516.34775,254.6299 c -3.98777,3.98778 -10.45466,3.98778 -14.44221,0 l -14.4422,-14.4422 c -3.98777,-3.98777 -3.98777,-10.45466 0,-14.44221 L 667.05264,46.156193 c 3.99204,-3.987774 10.45465,-3.987774 14.4422,0 l 14.44658,14.442205 c 3.98778,3.987774 3.98778,10.454651 0,14.442205 z M 118.0628,652.91482 c -3.98778,3.98778 -10.45465,3.98778 -14.44221,0 l -14.442202,-14.4422 c -3.987773,-3.98777 -3.987773,-10.45465 0,-14.44221 L 268.76769,444.44111 c 3.99203,-3.98777 10.45465,-3.98777 14.4422,0 l 14.44658,14.44221 c 3.98778,3.98777 3.98778,10.45466 0,14.4422 z"
+     fill-rule="evenodd"
+     id="path49-5"
+     sodipodi:nodetypes="cscscccccccscsccccccsssssssssssssssssssssssssssccsccccccccscccccc"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.09419" />
+</svg>
diff --git a/Content/Slate/SodaIcons/mechanics.svg b/Content/Slate/SodaIcons/mechanics.svg
new file mode 100644
index 0000000..29be4ee
--- /dev/null
+++ b/Content/Slate/SodaIcons/mechanics.svg
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg154"
+   sodipodi:docname="mechanics.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata158">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2e4f28"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview156"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="366.57325"
+     inkscape:cy="464.83009"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg154" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m15.625-0.9375c-0.80469 0.41797-1.6406 0.73047-2.5156 0.9375-0.875 0.21875-1.7891 0.32812-2.7344 0.32812-2.8359 0-5.0781-0.78906-6.7344-2.375-1.6562-1.582-2.4844-3.7266-2.4844-6.4375 0-2.7188 0.82812-4.8672 2.4844-6.4531 1.6562-1.582 3.8984-2.375 6.7344-2.375 0.94531 0 1.8594 0.10938 2.7344 0.32812 0.875 0.21094 1.7109 0.52344 2.5156 0.9375v3.5156c-0.8125-0.55078-1.6172-0.95703-2.4062-1.2188-0.78125-0.25781-1.6094-0.39062-2.4844-0.39062-1.5625 0-2.793 0.50781-3.6875 1.5156-0.89844 1-1.3438 2.3828-1.3438 4.1406 0 1.75 0.44531 3.1328 1.3438 4.1406 0.89453 1 2.125 1.5 3.6875 1.5 0.875 0 1.7031-0.12891 2.4844-0.39062 0.78906-0.25781 1.5938-0.66406 2.4062-1.2188z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m11.438-9.2812c-0.35547-0.16406-0.71094-0.28516-1.0625-0.35938-0.35547-0.082031-0.71094-0.125-1.0625-0.125-1.0547 0-1.8672 0.33984-2.4375 1.0156-0.5625 0.66797-0.84375 1.625-0.84375 2.875v5.875h-4.0781v-12.75h4.0781v2.0938c0.53125-0.84375 1.1328-1.4531 1.8125-1.8281 0.67578-0.38281 1.4883-0.57812 2.4375-0.57812 0.13281 0 0.28125 0.007812 0.4375 0.015625 0.16406 0.011719 0.39844 0.039063 0.70312 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m14.688-6.4062v1.1562h-9.5312c0.10156 0.96094 0.44531 1.6797 1.0312 2.1562 0.59375 0.48047 1.4258 0.71875 2.5 0.71875 0.85156 0 1.7266-0.125 2.625-0.375 0.90625-0.25781 1.832-0.64844 2.7812-1.1719v3.1406c-0.96875 0.36719-1.9375 0.64062-2.9062 0.82812-0.96094 0.1875-1.9219 0.28125-2.8906 0.28125-2.3047 0-4.0938-0.58203-5.375-1.75-1.2812-1.1758-1.9219-2.8281-1.9219-4.9531 0-2.0703 0.625-3.7031 1.875-4.8906 1.2578-1.1953 2.9922-1.7969 5.2031-1.7969 2 0 3.5977 0.60547 4.7969 1.8125 1.207 1.2109 1.8125 2.8242 1.8125 4.8438zm-4.1875-1.3594c0-0.78125-0.23047-1.4062-0.6875-1.875-0.44922-0.47656-1.0391-0.71875-1.7656-0.71875-0.78125 0-1.4219 0.22656-1.9219 0.67188-0.49219 0.44922-0.79688 1.0898-0.92188 1.9219z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m7.6719-5.7344c-0.84375 0-1.4844 0.14844-1.9219 0.4375-0.42969 0.28125-0.64062 0.70312-0.64062 1.2656 0 0.52344 0.17188 0.92969 0.51562 1.2188 0.35156 0.29297 0.83594 0.4375 1.4531 0.4375 0.75781 0 1.3984-0.27344 1.9219-0.82812 0.53125-0.55078 0.79688-1.2422 0.79688-2.0781v-0.45312zm6.2344-1.5469v7.2812h-4.1094v-1.8906c-0.55469 0.77344-1.1719 1.3359-1.8594 1.6875-0.67969 0.35156-1.5078 0.53125-2.4844 0.53125-1.3242 0-2.3984-0.38281-3.2188-1.1562-0.82422-0.76953-1.2344-1.7695-1.2344-3 0-1.5 0.51562-2.5977 1.5469-3.2969 1.0312-0.69531 2.6445-1.0469 4.8438-1.0469h2.4062v-0.3125c0-0.64453-0.25781-1.1172-0.76562-1.4219-0.51172-0.30078-1.3047-0.45312-2.375-0.45312-0.875 0-1.6875 0.089844-2.4375 0.26562-0.75 0.17969-1.4492 0.4375-2.0938 0.78125v-3.1094c0.86328-0.20703 1.7383-0.36328 2.625-0.46875 0.88281-0.11328 1.7656-0.17188 2.6406-0.17188 2.3008 0 3.9609 0.45312 4.9844 1.3594 1.0195 0.90625 1.5312 2.3828 1.5312 4.4219z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m6.4062-16.375v3.625h4.2031v2.9062h-4.2031v5.4062c0 0.59375 0.11719 0.99609 0.35938 1.2031 0.23828 0.21094 0.70703 0.3125 1.4062 0.3125h2.0938v2.9219h-3.5c-1.6172 0-2.7617-0.33203-3.4375-1-0.66797-0.67578-1-1.8203-1-3.4375v-5.4062h-2.0156v-2.9062h2.0156v-3.625z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.641-10.891v-6.8281h4.0938v17.719h-4.0938v-1.8438c-0.5625 0.75-1.1836 1.3047-1.8594 1.6562-0.67969 0.34375-1.4609 0.51562-2.3438 0.51562-1.5742 0-2.8672-0.625-3.875-1.875-1.0117-1.25-1.5156-2.8594-1.5156-4.8281 0-1.957 0.50391-3.5625 1.5156-4.8125 1.0078-1.25 2.3008-1.875 3.875-1.875 0.875 0 1.6484 0.17969 2.3281 0.53125 0.6875 0.35547 1.3125 0.90234 1.875 1.6406zm-2.6875 8.2656c0.875 0 1.5391-0.31641 2-0.95312 0.45703-0.64453 0.6875-1.5781 0.6875-2.7969 0-1.207-0.23047-2.1289-0.6875-2.7656-0.46094-0.64453-1.125-0.96875-2-0.96875-0.86719 0-1.5273 0.32422-1.9844 0.96875-0.46094 0.63672-0.6875 1.5586-0.6875 2.7656 0 1.2188 0.22656 2.1523 0.6875 2.7969 0.45703 0.63672 1.1172 0.95312 1.9844 0.95312z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m8.75-2.625c0.875 0 1.5391-0.31641 2-0.95312 0.45703-0.64453 0.6875-1.5781 0.6875-2.7969 0-1.207-0.23047-2.1289-0.6875-2.7656-0.46094-0.64453-1.125-0.96875-2-0.96875s-1.5469 0.32422-2.0156 0.96875c-0.46875 0.64844-0.70312 1.5703-0.70312 2.7656 0 1.2109 0.23438 2.1367 0.70312 2.7812 0.46875 0.64844 1.1406 0.96875 2.0156 0.96875zm-2.7188-8.2656c0.5625-0.73828 1.1875-1.2852 1.875-1.6406 0.6875-0.35156 1.4727-0.53125 2.3594-0.53125 1.5703 0 2.8633 0.625 3.875 1.875 1.0078 1.25 1.5156 2.8555 1.5156 4.8125 0 1.9688-0.50781 3.5781-1.5156 4.8281-1.0117 1.25-2.3047 1.875-3.875 1.875-0.88672 0-1.6719-0.17969-2.3594-0.53125s-1.3125-0.89844-1.875-1.6406v1.8438h-4.0781v-17.719h4.0781z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.28125-12.75h4.0781l3.4375 8.6562 2.9062-8.6562h4.0781l-5.3594 13.953c-0.54297 1.4258-1.1719 2.4219-1.8906 2.9844s-1.668 0.84375-2.8438 0.84375h-2.3594v-2.6719h1.2812c0.6875 0 1.1875-0.10938 1.5-0.32812 0.32031-0.21875 0.57031-0.61719 0.75-1.1875l0.10938-0.35938z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.1406-17h5.5781l3.875 9.0938 3.8906-9.0938h5.5781v17h-4.1406v-12.438l-3.9219 9.1719h-2.7812l-3.9219-9.1719v12.438h-4.1562z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m1.3281-12.75h11.141v2.8438l-6.7344 6.9844h6.7344v2.9219h-11.422v-2.8438l6.7188-7h-6.4375z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m17.422-1.2656c-1.0938 0.53125-2.2305 0.93359-3.4062 1.2031-1.1797 0.25781-2.3906 0.39062-3.6406 0.39062-2.8359 0-5.0781-0.78906-6.7344-2.375-1.6562-1.582-2.4844-3.7266-2.4844-6.4375 0-2.7383 0.84375-4.8945 2.5312-6.4688 1.6875-1.5703 3.9922-2.3594 6.9219-2.3594 1.1328 0 2.2188 0.10938 3.25 0.32812 1.0391 0.21094 2.0195 0.52344 2.9375 0.9375v3.5156c-0.94922-0.53906-1.8906-0.94141-2.8281-1.2031-0.9375-0.26953-1.875-0.40625-2.8125-0.40625-1.75 0-3.1016 0.49219-4.0469 1.4688-0.9375 0.98047-1.4062 2.375-1.4062 4.1875 0 1.8047 0.45312 3.1953 1.3594 4.1719 0.90625 0.98047 2.2031 1.4688 3.8906 1.4688 0.44531 0 0.86328-0.023438 1.25-0.078125 0.39453-0.0625 0.75-0.15625 1.0625-0.28125v-3.2969h-2.6719v-2.9375h6.8281z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m1.9531-17.719h4.0781v17.719h-4.0781z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m10.359-17.719v2.6719h-2.2656c-0.57422 0-0.97656 0.10547-1.2031 0.3125-0.23047 0.21094-0.34375 0.57422-0.34375 1.0938v0.89062h3.4844v2.9062h-3.4844v9.8438h-4.0781v-9.8438h-2.0312v-2.9062h2.0312v-0.89062c0-1.3945 0.38281-2.4219 1.1562-3.0781 0.78125-0.66406 1.9844-1 3.6094-1z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m8.0312-10.156c-0.90625 0-1.6016 0.32812-2.0781 0.98438-0.46875 0.64844-0.70312 1.5781-0.70312 2.7969 0 1.2305 0.23438 2.1719 0.70312 2.8281 0.47656 0.64844 1.1719 0.96875 2.0781 0.96875 0.88281 0 1.5625-0.32031 2.0312-0.96875 0.47656-0.65625 0.71875-1.5977 0.71875-2.8281 0-1.2188-0.24219-2.1484-0.71875-2.7969-0.46875-0.65625-1.1484-0.98438-2.0312-0.98438zm0-2.9062c2.1953 0 3.9102 0.59375 5.1406 1.7812 1.2383 1.1797 1.8594 2.8125 1.8594 4.9062 0 2.1055-0.62109 3.75-1.8594 4.9375-1.2305 1.1797-2.9453 1.7656-5.1406 1.7656-2.1992 0-3.9219-0.58594-5.1719-1.7656-1.2422-1.1875-1.8594-2.832-1.8594-4.9375 0-2.0938 0.61719-3.7266 1.8594-4.9062 1.25-1.1875 2.9727-1.7812 5.1719-1.7812z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m13.781-10.641c0.51953-0.78906 1.1328-1.3906 1.8438-1.7969 0.70703-0.41406 1.4883-0.625 2.3438-0.625 1.457 0 2.5703 0.45312 3.3438 1.3594 0.76953 0.89844 1.1562 2.2109 1.1562 3.9375v7.7656h-4.1094v-6.6562c0.007813-0.09375 0.015625-0.19141 0.015625-0.29688 0.007812-0.11328 0.015625-0.26953 0.015625-0.46875 0-0.89453-0.13672-1.5469-0.40625-1.9531-0.26172-0.40625-0.6875-0.60938-1.2812-0.60938-0.78125 0-1.3867 0.32031-1.8125 0.95312-0.41797 0.63672-0.63281 1.5586-0.64062 2.7656v6.2656h-4.0938v-6.6562c0-1.4062-0.125-2.3125-0.375-2.7188-0.24219-0.40625-0.67188-0.60938-1.2969-0.60938-0.78125 0-1.3867 0.32422-1.8125 0.96875-0.42969 0.63672-0.64062 1.5469-0.64062 2.7344v6.2812h-4.0938v-12.75h4.0938v1.8594c0.5-0.71875 1.0703-1.2578 1.7188-1.625 0.65625-0.36328 1.375-0.54688 2.1562-0.54688 0.88281 0 1.6641 0.21484 2.3438 0.64062 0.67578 0.41797 1.1875 1.0117 1.5312 1.7812z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m14.781-7.7656v7.7656h-4.0938v-5.9219c0-1.1133-0.027344-1.8789-0.078125-2.2969-0.054687-0.41406-0.13672-0.72266-0.25-0.92188-0.16797-0.26953-0.38672-0.47656-0.65625-0.625-0.27344-0.14453-0.58594-0.21875-0.9375-0.21875-0.84375 0-1.5117 0.32812-2 0.98438-0.49219 0.65625-0.73438 1.5625-0.73438 2.7188v6.2812h-4.0781v-17.719h4.0781v6.8281c0.61328-0.73828 1.2656-1.2852 1.9531-1.6406 0.69531-0.35156 1.4609-0.53125 2.2969-0.53125 1.4766 0 2.5977 0.45312 3.3594 1.3594 0.75781 0.89844 1.1406 2.2109 1.1406 3.9375z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.1406-17h4.9062l6.1719 11.656v-11.656h4.1562v17h-4.8906l-6.1875-11.672v11.672h-4.1562z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m1.8281-4.9688v-7.7812h4.0938v1.2656c0 0.69922-0.007813 1.5703-0.015625 2.6094v2.0938c0 1.0234 0.023438 1.7617 0.078125 2.2188 0.050781 0.44922 0.14062 0.77344 0.26562 0.96875 0.16406 0.27344 0.38281 0.48047 0.65625 0.625 0.26953 0.14844 0.58203 0.21875 0.9375 0.21875 0.84375 0 1.5078-0.32812 2-0.98438 0.48828-0.65625 0.73438-1.5625 0.73438-2.7188v-6.2969h4.0625v12.75h-4.0625v-1.8438c-0.625 0.74219-1.2812 1.2891-1.9688 1.6406-0.67969 0.35156-1.4336 0.53125-2.2656 0.53125-1.4688 0-2.5898-0.44531-3.3594-1.3438-0.77344-0.90625-1.1562-2.2227-1.1562-3.9531z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m14.781-7.7656v7.7656h-4.0938v-5.9531c0-1.0938-0.027344-1.8477-0.078125-2.2656-0.054687-0.41406-0.13672-0.72266-0.25-0.92188-0.16797-0.26953-0.38672-0.47656-0.65625-0.625-0.27344-0.14453-0.58594-0.21875-0.9375-0.21875-0.84375 0-1.5117 0.32812-2 0.98438-0.49219 0.65625-0.73438 1.5625-0.73438 2.7188v6.2812h-4.0781v-12.75h4.0781v1.8594c0.61328-0.73828 1.2656-1.2852 1.9531-1.6406 0.69531-0.35156 1.4609-0.53125 2.2969-0.53125 1.4766 0 2.5977 0.45312 3.3594 1.3594 0.75781 0.89844 1.1406 2.2109 1.1406 3.9375z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.1406-17h7.2812c2.1641 0 3.8281 0.48047 4.9844 1.4375 1.1562 0.96094 1.7344 2.3281 1.7344 4.1094s-0.57812 3.1523-1.7344 4.1094c-1.1562 0.96094-2.8203 1.4375-4.9844 1.4375h-2.8906v5.9062h-4.3906zm4.3906 3.1719v4.75h2.4219c0.85156 0 1.5078-0.20312 1.9688-0.60938 0.46875-0.41406 0.70312-1.0039 0.70312-1.7656 0-0.75781-0.23438-1.3438-0.70312-1.75-0.46094-0.41406-1.1172-0.625-1.9688-0.625z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m1.9531-12.75h4.0781v12.516c0 1.707-0.41406 3.0078-1.2344 3.9062-0.8125 0.90625-2 1.3594-3.5625 1.3594h-2.0156v-2.6719h0.71875c0.76953 0 1.2969-0.17969 1.5781-0.53125 0.28906-0.34375 0.4375-1.0312 0.4375-2.0625zm0-4.9688h4.0781v3.3281h-4.0781z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.266-12.359v3.3281c-0.55469-0.38281-1.1094-0.66406-1.6719-0.84375-0.55469-0.1875-1.1328-0.28125-1.7344-0.28125-1.1367 0-2.0234 0.33594-2.6562 1-0.63672 0.66797-0.95312 1.5938-0.95312 2.7812 0 1.1992 0.31641 2.1328 0.95312 2.7969 0.63281 0.66797 1.5195 1 2.6562 1 0.63281 0 1.2383-0.09375 1.8125-0.28125 0.57031-0.19531 1.1016-0.48438 1.5938-0.85938v3.3438c-0.63672 0.24219-1.2812 0.41406-1.9375 0.53125-0.65625 0.11328-1.3203 0.17188-1.9844 0.17188-2.3047 0-4.1055-0.58594-5.4062-1.7656-1.293-1.1875-1.9375-2.832-1.9375-4.9375 0-2.0938 0.64453-3.7266 1.9375-4.9062 1.3008-1.1875 3.1016-1.7812 5.4062-1.7812 0.67578 0 1.3359 0.058594 1.9844 0.17188 0.64453 0.11719 1.2891 0.29297 1.9375 0.53125z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="m 201.98532,135.11701 c -51.86899,0 -93.91779,42.0488 -93.91779,93.91189 0,51.869 42.0488,93.91779 93.91779,93.91779 51.86901,0 93.9119,-42.04879 93.9119,-93.91779 0,-51.86309 -42.04289,-93.91189 -93.9119,-93.91189 z m -38.7414,93.91189 c 0,-21.3946 17.3409,-38.74141 38.7414,-38.74141 21.3946,0 38.74142,17.34681 38.74142,38.74141 0,21.39903 -17.34682,38.74141 -38.74142,38.74141 -21.39902,0 -38.7414,-17.3409 -38.7414,-38.74141 z"
+     fill-rule="evenodd"
+     id="path70"
+     style="stroke-width:1.47783;fill:#ffffff;fill-opacity:0.5" />
+  <path
+     d="m 456.66038,380.37826 c -51.18772,8.38213 -85.88134,56.67196 -77.49464,107.85821 8.38213,51.18772 56.67196,85.88133 107.85821,77.49907 51.18772,-8.38789 85.88133,-56.67787 77.49463,-107.86411 -8.38212,-51.18181 -56.67196,-85.88134 -107.8582,-77.49464 z m -23.05125,98.93948 c -3.45783,-21.11676 10.85292,-41.03944 31.96997,-44.49609 21.11676,-3.45784 41.03944,10.85292 44.49609,31.96997 3.45784,21.11677 -10.85291,41.03944 -31.96997,44.49609 -21.11676,3.45784 -41.03944,-10.85291 -44.49609,-31.96997 z"
+     fill-rule="evenodd"
+     id="path72"
+     style="stroke-width:1.47783;fill:#ffffff;fill-opacity:0.5" />
+  <path
+     d="m 193.84247,12.029735 c -34.27835,0 -62.06901,29.111843 -62.06901,65.058662 -5.95745,2.770943 -11.72454,5.876762 -17.27292,9.294242 C 82.935489,67.200359 44.851719,78.254558 27.707376,107.94423 l -14.951242,25.902 c -17.0010013,29.4473 -7.135131,67.03304 22.0005,84.36951 -0.519546,7.63744 -0.519546,15.45962 0,23.09706 -29.135488,17.33055 -39.0015013,54.91629 -22.0005,84.36951 l 14.951242,25.902 c 17.145819,29.68967 57.110874,38.7015 86.793164,21.56159 5.54764,3.41748 11.31459,6.5233 17.27292,9.29424 0,34.27834 27.79066,65.05866 62.06901,65.05866 h 29.90839 c 16.16898,0 30.89559,-6.18266 41.93944,-16.30789 -0.17895,24.97243 14.84188,48.58377 39.37687,58.21925 0.7216,7.62 1.98592,15.33844 3.72917,22.79115 -25.94928,21.81578 -29.60839,60.50398 -8.0703,86.81681 l 18.94583,23.14288 c 21.71085,26.52563 62.61136,28.96258 89.137,7.25054 6.02676,2.47656 12.21518,4.6067 18.54237,6.37892 5.54188,33.82909 37.93895,59.70743 71.76656,54.17147 l 29.52268,-4.83178 c 33.82909,-5.54764 56.75768,-37.46604 51.21579,-71.29364 l -1.50664,-9.19612 c 3.30207,-2.6728 6.49433,-5.46103 9.5771,-8.35892 l 9.15562,3.45784 c 32.0616,12.11704 67.88872,-4.05828 79.99365,-36.12565 l 10.57567,-27.98129 c 12.11706,-32.06751 -4.06404,-67.88281 -36.12564,-79.99957 l -12.12282,-4.58365 c -0.42142,-3.05956 -0.92364,-6.13641 -1.50664,-9.17291 l 10.03315,-8.20893 c 26.51972,-21.71085 30.42268,-60.81579 8.70533,-87.34291 l -18.93991,-23.14879 c -21.71677,-26.52563 -60.82173,-30.42268 -87.34735,-8.71109 l -7.5739,6.19996 c -3.83897,-1.76646 -7.75863,-3.38867 -11.73607,-4.8665 l -1.50665,-9.20188 c -5.54188,-33.82909 -37.46012,-56.75768 -71.28773,-51.2158 l -29.51677,4.83753 c -7.851,1.28157 -15.1079,3.98898 -21.5616,7.80474 -5.21276,-11.00291 -13.70454,-20.58621 -25.04188,-27.13155 l -11.22238,-6.48281 c 0.0809,-3.08838 0.0809,-6.20572 0,-9.29424 l 11.22238,-6.47705 c 29.68376,-17.13991 39.8616,-55.10102 22.71577,-84.79069 l -14.95124,-25.902 C 372.74781,78.254558 334.7867,68.082635 305.09703,85.222549 l -8.4745,4.895314 c -3.50985,-2.361134 -7.11207,-4.595166 -10.80088,-6.696356 v -9.323054 c 0,-34.278354 -27.78476,-62.069013 -62.06902,-62.069013 z m -6.89853,62.069004 c 0,-3.810002 3.08837,-6.898523 6.89853,-6.898523 h 29.90839 c 3.81,0 6.89852,3.088378 6.89852,6.898523 v 21.815786 c 0,13.952815 8.29553,25.879815 20.0084,31.374405 8.1801,3.83896 15.84089,8.63617 22.81922,14.25296 10.73159,8.62449 26.21381,10.51228 39.08722,3.07685 l 20.11775,-11.61488 c 3.29631,-1.90507 7.51611,-0.77355 9.42119,2.52843 l 14.95715,25.90198 c 1.89931,3.29631 0.77356,7.51612 -2.52843,9.42119 l -22.30641,12.87903 c -12.33651,7.12359 -18.50248,20.64977 -17.09262,33.78179 0.86014,8.02419 0.86014,16.46454 0,24.49361 -1.40856,13.13307 4.75685,26.65865 17.09262,33.7818 l 22.30641,12.87902 c 3.30208,1.90508 4.42774,6.11912 2.52843,9.42119 l -14.95715,25.902 c -1.90508,3.30206 -6.12488,4.42772 -9.42119,2.52841 l -20.11775,-11.61488 c -12.87326,-7.43527 -28.35667,-5.54764 -39.08131,3.07685 -6.98512,5.61695 -14.64562,10.41415 -22.82513,14.25296 -11.71302,5.49577 -20.0084,17.42218 -20.0084,31.37442 v 21.81577 c 0,3.81 -3.08837,6.89852 -6.89852,6.89852 h -29.90839 c -3.81,0 -6.89853,-3.08837 -6.89853,-6.89852 v -16.72316 c 0,-15.17145 -9.74454,-27.79657 -22.91233,-32.58179 -10.12553,-3.67731 -19.59312,-8.76888 -28.15421,-15.04436 -10.67395,-7.82217 -25.49854,-9.25951 -37.85766,-2.13014 l -13.110008,7.57389 c -3.296318,1.89931 -7.516118,0.77356 -9.42119,-2.52843 L 60.5373,298.09146 c -1.905084,-3.30207 -0.779325,-7.51612 2.522655,-9.42119 l 10.899024,-6.29232 c 12.855968,-7.42374 18.963561,-21.75223 16.885731,-35.32909 -1.714584,-11.24543 -1.714584,-23.33351 0,-34.57392 2.07812,-13.57759 -4.029465,-27.90593 -16.885731,-35.32908 l -10.899024,-6.29232 c -3.302068,-1.90508 -4.427739,-6.12488 -2.522655,-9.42119 l 14.951242,-25.90199 c 1.905072,-3.30207 6.124872,-4.4335 9.42119,-2.52842 l 13.110008,7.56813 c 12.35956,7.13512 27.18475,5.69779 37.85766,-2.12439 8.56109,-6.27502 18.02809,-11.3666 28.15421,-15.05025 13.16779,-4.78567 22.91233,-17.41036 22.91233,-32.575885 z M 431.95396,322.58167 c -0.61769,-3.75813 1.93389,-7.30257 5.69202,-7.92029 l 29.51677,-4.83179 c 3.75813,-0.61768 7.30834,1.92813 7.9203,5.68626 l 3.52715,21.53204 c 2.25709,13.76809 12.37109,24.19361 24.81726,27.72712 8.6938,2.46502 17.02464,5.96335 24.82907,10.37941 11.97859,6.77143 27.56456,6.13065 39.07097,-3.28478 l 17.97045,-14.71479 c 2.94991,-2.40724 7.29105,-1.97424 9.70405,0.96982 l 18.94583,23.14879 c 2.413,2.94415 1.98,7.29104 -0.96405,9.70405 l -19.93302,16.3138 c -11.0202,9.02292 -14.92316,23.36751 -11.40711,36.10348 2.14745,7.78168 3.51563,16.11134 3.96016,24.16997 0.73313,13.19084 9.00563,25.53844 22.32859,30.57341 l 24.09607,9.10376 c 3.56188,1.35083 5.36291,5.32832 4.01202,8.89005 l -10.56991,27.9813 c -1.34506,3.56763 -5.32256,5.36291 -8.89005,4.01793 l -21.72267,-8.20891 c -13.91247,-5.25327 -28.88722,-0.88901 -38.07787,9.35187 -5.9864,6.67331 -12.76937,12.64818 -20.22267,17.75765 -10.66818,7.31986 -16.92563,20.42366 -14.66868,34.19854 l 3.52715,21.52613 c 0.61191,3.75813 -1.93389,7.30257 -5.69202,7.92607 l -29.51677,4.83177 c -3.7639,0.61191 -7.30834,-1.92813 -7.92607,-5.68626 l -2.70163,-16.51036 c -2.4535,-14.96898 -14.10872,-25.85026 -27.87637,-28.44239 -10.58735,-1.99743 -20.75322,-5.48984 -30.22022,-10.29872 -11.79385,-5.99217 -26.65864,-5.0165 -37.69658,4.01794 l -11.71877,9.58863 c -2.94415,2.413 -7.29105,1.97999 -9.70405,-0.96405 l -18.94583,-23.14879 c -2.41301,-2.94415 -1.97999,-7.29104 0.96984,-9.70404 l 9.73862,-7.97218 c 11.4878,-9.40389 15.19952,-24.52909 10.9568,-37.59757 -3.51562,-10.81242 -5.47256,-22.74533 -5.59389,-34.11135 -0.14439,-13.73927 -8.48602,-26.88918 -22.37588,-32.13697 l -11.77064,-4.45079 c -3.56764,-1.34507 -5.36291,-5.32256 -4.01794,-8.88429 l 10.57567,-27.98721 c 1.34507,-3.56188 5.32256,-5.35714 8.88429,-4.01202 l 14.1606,5.35138 c 13.35252,5.03971 27.74929,1.22382 37.01531,-8.22045 7.43526,-7.57965 15.95025,-14.13178 25.34779,-19.40247 12.22671,-6.85228 19.80002,-20.88622 17.34681,-35.84929 z"
+     fill-rule="evenodd"
+     id="path74"
+     style="stroke-width:1.47783;fill:#ffffff" />
+</svg>
diff --git a/Content/Slate/SodaIcons/modem.svg b/Content/Slate/SodaIcons/modem.svg
new file mode 100644
index 0000000..dbe1c3d
--- /dev/null
+++ b/Content/Slate/SodaIcons/modem.svg
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg153"
+   sodipodi:docname="Modem.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata157">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#201b70"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview155"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="229.462"
+     inkscape:cy="551.52859"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg153"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs65">
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m14.953-3.7188h-8.2188l-1.3125 3.7188h-5.2812l7.5625-20.406h6.2656l7.5625 20.406h-5.2812zm-6.9062-3.7812h5.5781l-2.7812-8.125z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v20.406h-5.25z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m0.98438-15.312h4.7656l2.5625 10.547 2.5781-10.547h4.0938l2.5781 10.438 2.5781-10.438h4.75l-4.0312 15.312h-5.3438l-2.5781-10.531-2.5781 10.531h-5.3438z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     d="m 258.46225,227.42741 c 11.96758,-13.19596 18.57083,-30.15996 18.57083,-47.77322 0,-17.60752 -6.57952,-34.57726 -18.54136,-47.75602 -9.0433,-9.97115 -8.07629,-25.18802 2.20472,-33.989626 10.22338,-8.756331 25.8462,-7.854956 34.92972,2.127516 19.94573,21.98613 30.91699,50.25849 30.91699,79.6187 0,29.34301 -11.00043,57.63832 -30.94647,79.63016 -9.10091,10.01043 -24.72328,10.9062 -34.92972,2.12753 -10.27526,-8.80664 -11.24801,-24.01274 -2.20471,-33.98389 z"
+     id="path67"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.4533" />
+  <path
+     d="m 352.90793,263.93239 c 15.1505,-25.49042 23.15828,-54.63134 23.15828,-84.27676 0,-29.59957 -8.00718,-58.73046 -23.16417,-84.203688 -6.83859,-11.510747 -2.78033,-26.245749 9.07202,-32.897481 11.80063,-6.684839 26.96323,-2.715299 33.8245,8.79545 19.48007,32.808619 29.77787,70.246649 29.77787,108.305279 0,38.09303 -10.32123,75.57549 -29.82945,108.37837 -6.81559,11.52766 -21.98379,15.44045 -33.82449,8.79545 -11.81787,-6.66793 -15.88733,-21.38702 -9.01456,-32.89748 z"
+     id="path69"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.4533" />
+  <path
+     d="m 438.60018,47.24731 c -6.86746,-11.510751 -2.8033,-26.245748 9.02031,-32.89748 11.77763,-6.6848402 26.96322,-2.737801 33.8245,8.773091 28.24086,47.426375 43.15558,101.553209 43.15558,156.525679 0,55.00112 -14.89704,109.11793 -43.06422,156.52567 -6.83859,11.4828 -21.98378,15.45765 -33.84218,8.79545 -11.82361,-6.65115 -15.88732,-21.39275 -9.0433,-32.89748 23.83763,-40.07521 36.43284,-85.87198 36.43284,-132.41977 0,-46.51913 -12.61805,-92.298699 -36.48441,-132.408313 z"
+     id="path71"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.4533" />
+  <path
+     d="M 648.38779,492.67973 H 54.215543 c -27.349318,0 -49.517308,21.56044 -49.517308,48.16021 v 96.31322 c 0,26.59977 22.16799,48.16021 49.517308,48.16021 H 648.38779 c 27.3493,0 49.51729,-21.56044 49.51729,-48.16021 l -0.006,-96.31896 c 0,-26.59976 -22.16209,-48.15447 -49.5114,-48.15447 z M 178.00142,613.07306 h -74.26859 c -13.68305,0 -24.758644,-10.77734 -24.758644,-24.0801 0,-13.29672 11.075294,-24.08009 24.758644,-24.08009 h 74.26859 c 13.68305,0 24.75864,10.77735 24.75864,24.08009 0,13.29674 -11.07529,24.0801 -24.75864,24.0801 z m 297.08613,0 c 0,13.29674 -11.07531,24.0801 -24.75865,24.0801 -13.68307,0 -24.75866,-10.77734 -24.75866,-24.0801 v -48.16019 c 0,-13.29673 11.07531,-24.0801 24.75866,-24.0801 13.68305,0 24.75865,10.77735 24.75865,24.0801 z m 99.02724,0 c 0,13.29674 -11.07531,24.0801 -24.75866,24.0801 -13.68306,0 -24.75865,-10.77734 -24.75865,-24.0801 v -48.16019 c 0,-13.29673 11.0753,-24.0801 24.75865,-24.0801 13.68305,0 24.75866,10.77735 24.75866,24.0801 z"
+     id="path73"
+     style="fill:#ffffff;stroke-width:1.4533" />
+  <path
+     d="M 178.00142,221.13543 V 444.5224 h -49.51731 l 0.006,-223.38697 c -14.73642,-8.34197 -24.75866,-23.69886 -24.75866,-41.4798 0,-26.59977 22.16799,-48.16022 49.51731,-48.16022 27.34932,0 49.5173,21.56045 49.5173,48.16022 -0.006,17.78094 -10.02194,33.14399 -24.76454,41.4798 z"
+     id="path75"
+     style="fill:#ffffff;stroke-width:1.4533" />
+</svg>
diff --git a/Content/Slate/SodaIcons/motor.svg b/Content/Slate/SodaIcons/motor.svg
new file mode 100644
index 0000000..972f08f
--- /dev/null
+++ b/Content/Slate/SodaIcons/motor.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg93"
+   sodipodi:docname="motor.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata97">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#42383f"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview95"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="567.54761"
+     inkscape:cy="569.48711"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg93"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs41">
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m33.5-2c-1.7305 0.89844-3.5312 1.5703-5.4062 2.0156-1.8672 0.45703-3.8203 0.6875-5.8594 0.6875-6.0625 0-10.871-1.6914-14.422-5.0781-3.5547-3.3945-5.3281-8-5.3281-13.812 0-5.8203 1.7734-10.43 5.3281-13.828 3.5508-3.3945 8.3594-5.0938 14.422-5.0938 2.0391 0 3.9922 0.23047 5.8594 0.6875 1.875 0.44922 3.6758 1.1211 5.4062 2.0156v7.5469c-1.7422-1.1875-3.4609-2.0547-5.1562-2.6094-1.6875-0.55078-3.4688-0.82812-5.3438-0.82812-3.3555 0-5.9961 1.0742-7.9219 3.2188-1.918 2.1484-2.875 5.1094-2.875 8.8906 0 3.7617 0.95703 6.7148 2.875 8.8594 1.9258 2.1484 4.5664 3.2188 7.9219 3.2188 1.875 0 3.6562-0.27344 5.3438-0.82812 1.6953-0.55078 3.4141-1.4219 5.1562-2.6094z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m24.516-19.891c-0.77344-0.36328-1.5391-0.62891-2.2969-0.79688-0.75-0.17578-1.5078-0.26562-2.2656-0.26562-2.25 0-3.9844 0.72656-5.2031 2.1719-1.2109 1.4375-1.8125 3.5-1.8125 6.1875v12.594h-8.7344v-27.344h8.7344v4.4844c1.125-1.7812 2.4141-3.082 3.875-3.9062 1.457-0.82031 3.2031-1.2344 5.2344-1.2344 0.28906 0 0.60938 0.011719 0.95312 0.03125 0.34375 0.023438 0.83594 0.074219 1.4844 0.15625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m31.5-13.75v2.5h-20.438c0.20703 2.0547 0.94531 3.5898 2.2188 4.6094 1.2695 1.0234 3.0469 1.5312 5.3281 1.5312 1.832 0 3.7109-0.26953 5.6406-0.8125 1.9375-0.53906 3.9219-1.3672 5.9531-2.4844v6.75c-2.0742 0.78125-4.1406 1.3711-6.2031 1.7656s-4.1328 0.59375-6.2031 0.59375c-4.9492 0-8.793-1.2539-11.531-3.7656-2.7422-2.5195-4.1094-6.0469-4.1094-10.578 0-4.4688 1.3438-7.9766 4.0312-10.531 2.6953-2.5508 6.4062-3.8281 11.125-3.8281 4.2891 0 7.7266 1.2969 10.312 3.8906 2.582 2.5859 3.875 6.0391 3.875 10.359zm-8.9844-2.9062c0-1.6562-0.48438-2.9883-1.4531-4-0.96875-1.0195-2.2344-1.5312-3.7969-1.5312-1.6992 0-3.0781 0.47656-4.1406 1.4219-1.0547 0.94922-1.7109 2.3203-1.9688 4.1094z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m16.453-12.312c-1.8242 0-3.1953 0.3125-4.1094 0.9375-0.91797 0.61719-1.375 1.5273-1.375 2.7344 0 1.1055 0.36719 1.9688 1.1094 2.5938 0.73828 0.625 1.7656 0.9375 3.0781 0.9375 1.6445 0 3.0312-0.58594 4.1562-1.7656 1.125-1.1758 1.6875-2.6484 1.6875-4.4219v-1.0156zm13.359-3.2812v15.594h-8.8125v-4.0469c-1.1797 1.6562-2.5 2.8672-3.9688 3.625-1.4609 0.75-3.2422 1.125-5.3438 1.125-2.8242 0-5.1211-0.82031-6.8906-2.4688-1.7617-1.6562-2.6406-3.8008-2.6406-6.4375 0-3.207 1.0977-5.5547 3.2969-7.0469 2.207-1.5 5.6719-2.25 10.391-2.25h5.1562v-0.6875c0-1.3828-0.54688-2.3945-1.6406-3.0312-1.0938-0.64453-2.793-0.96875-5.0938-0.96875-1.875 0-3.6211 0.1875-5.2344 0.5625-1.6172 0.375-3.1094 0.93359-4.4844 1.6719v-6.6562c1.8633-0.45703 3.7383-0.80078 5.625-1.0312 1.8945-0.23828 3.7852-0.35938 5.6719-0.35938 4.9375 0 8.5 0.97656 10.688 2.9219 2.1875 1.9375 3.2812 5.1016 3.2812 9.4844z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m13.75-35.109v7.7656h9v6.25h-9v11.594c0 1.2734 0.25 2.1328 0.75 2.5781 0.50781 0.44922 1.5078 0.67188 3 0.67188h4.5v6.25h-7.5c-3.4492 0-5.8984-0.71875-7.3438-2.1562-1.4375-1.4453-2.1562-3.8945-2.1562-7.3438v-11.594h-4.3438v-6.25h4.3438v-7.7656z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m22.797-23.344v-14.641h8.7969v37.984h-8.7969v-3.9531c-1.1992 1.6172-2.5234 2.7969-3.9688 3.5469-1.4492 0.73828-3.125 1.1094-5.0312 1.1094-3.375 0-6.1484-1.3359-8.3125-4.0156-2.1562-2.6758-3.2344-6.1172-3.2344-10.328 0-4.2188 1.0781-7.6641 3.2344-10.344 2.1641-2.6758 4.9375-4.0156 8.3125-4.0156 1.8828 0 3.5547 0.38281 5.0156 1.1406 1.457 0.75 2.7852 1.9219 3.9844 3.5156zm-5.75 17.703c1.8633 0 3.2852-0.67969 4.2656-2.0469 0.98828-1.3633 1.4844-3.3477 1.4844-5.9531 0-2.6016-0.49609-4.5859-1.4844-5.9531-0.98047-1.375-2.4023-2.0625-4.2656-2.0625-1.8555 0-3.2773 0.6875-4.2656 2.0625-0.99219 1.3672-1.4844 3.3516-1.4844 5.9531 0 2.6055 0.49219 4.5898 1.4844 5.9531 0.98828 1.3672 2.4102 2.0469 4.2656 2.0469z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m18.75-5.6406c1.875 0 3.3008-0.67969 4.2812-2.0469 0.98828-1.3633 1.4844-3.3477 1.4844-5.9531 0-2.6016-0.49609-4.5859-1.4844-5.9531-0.98047-1.375-2.4062-2.0625-4.2812-2.0625s-3.3125 0.6875-4.3125 2.0625-1.5 3.3594-1.5 5.9531c0 2.5859 0.5 4.5625 1.5 5.9375s2.4375 2.0625 4.3125 2.0625zm-5.8125-17.703c1.207-1.5938 2.5391-2.7656 4-3.5156 1.4688-0.75781 3.1562-1.1406 5.0625-1.1406 3.3633 0 6.1289 1.3398 8.2969 4.0156 2.1641 2.6797 3.25 6.125 3.25 10.344 0 4.2109-1.0859 7.6523-3.25 10.328-2.168 2.6797-4.9336 4.0156-8.2969 4.0156-1.9062 0-3.5938-0.375-5.0625-1.125-1.4609-0.75781-2.793-1.9375-4-3.5312v3.9531h-8.7344v-37.984h8.7344z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m0.60938-27.344h8.7344l7.3594 18.547 6.25-18.547h8.7344l-11.5 29.938c-1.1562 3.0391-2.5078 5.1641-4.0469 6.375-1.5312 1.2188-3.5586 1.8281-6.0781 1.8281h-5.0625v-5.75h2.7344c1.4883 0 2.5664-0.23438 3.2344-0.70312 0.67578-0.46875 1.2031-1.3125 1.5781-2.5312l0.25-0.76562z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.25-36.453h9.4375l9.6719 26.906 9.6406-26.906h9.4531l-13.5 36.453h-11.203z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m26.297-26.484v7.125c-1.1875-0.8125-2.3828-1.4102-3.5781-1.7969-1.1992-0.39453-2.4375-0.59375-3.7188-0.59375-2.4492 0-4.3555 0.71484-5.7188 2.1406-1.3555 1.418-2.0312 3.4062-2.0312 5.9688 0 2.5547 0.67578 4.543 2.0312 5.9688 1.3633 1.418 3.2695 2.125 5.7188 2.125 1.3633 0 2.6602-0.20312 3.8906-0.60938 1.2266-0.40625 2.3633-1.0039 3.4062-1.7969v7.1406c-1.3672 0.51172-2.7578 0.89062-4.1719 1.1406-1.4062 0.25-2.8203 0.375-4.2344 0.375-4.9297 0-8.7812-1.2656-11.562-3.7969s-4.1719-6.0469-4.1719-10.547c0-4.5078 1.3906-8.0312 4.1719-10.562s6.6328-3.7969 11.562-3.7969c1.4375 0 2.8477 0.125 4.2344 0.375 1.3945 0.25 2.7852 0.63281 4.1719 1.1406z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m17.219-21.75c-1.9375 0-3.418 0.69922-4.4375 2.0938-1.0234 1.3867-1.5312 3.3906-1.5312 6.0156 0 2.6172 0.50781 4.6211 1.5312 6.0156 1.0195 1.3867 2.5 2.0781 4.4375 2.0781 1.8945 0 3.3477-0.69141 4.3594-2.0781 1.0078-1.3945 1.5156-3.3984 1.5156-6.0156 0-2.625-0.50781-4.6289-1.5156-6.0156-1.0117-1.3945-2.4648-2.0938-4.3594-2.0938zm0-6.25c4.6953 0 8.3672 1.2734 11.016 3.8125 2.6445 2.5312 3.9688 6.0469 3.9688 10.547 0 4.4922-1.3242 8.0078-3.9688 10.547-2.6484 2.5312-6.3203 3.7969-11.016 3.7969-4.7305 0-8.4219-1.2656-11.078-3.7969-2.6562-2.5391-3.9844-6.0547-3.9844-10.547 0-4.5 1.3281-8.0156 3.9844-10.547 2.6562-2.5391 6.3477-3.8125 11.078-3.8125z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m25.562-26.484v6.6406c-1.875-0.78125-3.6836-1.3633-5.4219-1.75-1.7422-0.39453-3.3867-0.59375-4.9375-0.59375-1.6562 0-2.8906 0.21094-3.7031 0.625-0.80469 0.40625-1.2031 1.043-1.2031 1.9062 0 0.69922 0.30469 1.2344 0.92188 1.6094 0.61328 0.375 1.707 0.65234 3.2812 0.82812l1.5469 0.21875c4.4688 0.57422 7.4727 1.5117 9.0156 2.8125 1.5508 1.3047 2.3281 3.3438 2.3281 6.125 0 2.918-1.0742 5.1094-3.2188 6.5781-2.1484 1.4609-5.3555 2.1875-9.625 2.1875-1.8047 0-3.668-0.14062-5.5938-0.42188-1.9297-0.28125-3.9141-0.70703-5.9531-1.2812v-6.6406c1.7383 0.84375 3.5234 1.4805 5.3594 1.9062 1.832 0.41797 3.6914 0.625 5.5781 0.625 1.707 0 2.9922-0.23438 3.8594-0.70312 0.86328-0.46875 1.2969-1.1641 1.2969-2.0938 0-0.78125-0.29688-1.3633-0.89062-1.75-0.59375-0.38281-1.7773-0.67969-3.5469-0.89062l-1.5469-0.20312c-3.8867-0.47656-6.6094-1.3789-8.1719-2.7031-1.5625-1.3203-2.3438-3.3203-2.3438-6 0-2.8945 0.98828-5.0391 2.9688-6.4375 1.9883-1.4062 5.0352-2.1094 9.1406-2.1094 1.6016 0 3.2891 0.125 5.0625 0.375 1.7812 0.24219 3.7109 0.62109 5.7969 1.1406z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m4.2031-37.984h8.7344v37.984h-8.7344z"
+         id="path38" />
+    </symbol>
+  </defs>
+  <path
+     d="m 695.76248,313.40737 c 0,47.04132 -3.32095,91.04597 -9.38202,123.90252 -5.19852,28.80087 -15.3028,67.01726 -41.57102,67.01726 h -55.2832 c -8.08529,0 -14.43388,-6.51341 -14.43388,-14.47425 V 136.82576 c 0,-7.96084 6.34859,-14.47426 14.43388,-14.47426 h 55.2832 c 44.31056,0 50.95304,119.70066 50.95304,191.0602 z"
+     id="path43"
+     style="fill:#ffffff;stroke-width:1.4454" />
+  <path
+     d="m 546.2275,136.82141 c 0,-1.73575 0.14658,-3.4715 0.43413,-5.06599 H 283.67637 v 363.15912 h 262.98526 c -0.28755,-1.73575 -0.43413,-3.33024 -0.43413,-5.06599 z m -35.92737,285.43236 h -195.7234 c -7.93864,0 -14.43387,-6.36635 -14.43387,-14.47425 0,-7.96085 6.49523,-14.47427 14.43387,-14.47427 h 195.7234 c 7.93863,0 14.43388,6.51342 14.43388,14.47427 -0.006,8.1079 -6.50087,14.47425 -14.43966,14.47425 z m 0,-98.96302 h -195.7234 c -7.93864,0 -14.43387,-6.36635 -14.43387,-14.47425 0,-7.96084 6.49523,-14.47427 14.43387,-14.47427 h 195.7234 c 7.93863,0 14.43388,6.51343 14.43388,14.47427 -0.006,8.1079 -6.50087,14.47425 -14.43966,14.47425 z m 0,-89.92603 h -195.7234 c -7.93864,0 -14.43387,-6.51342 -14.43387,-14.47427 0,-7.96082 6.49523,-14.47425 14.43387,-14.47425 h 195.7234 c 7.93863,0 14.43388,6.51343 14.43388,14.47425 -0.006,7.96085 -6.50087,14.47427 -14.43966,14.47427 z"
+     id="path45"
+     style="fill:#ffffff;stroke-width:1.4454"
+     sodipodi:nodetypes="sccccsscssssccccssssccccssssccc" />
+  <path
+     d="m 610.02524,571.19387 c 0,8.1079 -6.49526,14.47426 -14.43389,14.47426 H 234.7444 c -8.08528,0 -14.43388,-6.36636 -14.43388,-14.47426 0,-7.96083 6.3486,-14.47425 14.43388,-14.47425 h 74.76893 v -76.27789 h 211.16765 v 76.27789 h 74.90893 c 7.93863,0 14.43388,6.51342 14.43388,14.47425 z"
+     id="path47"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.4454" />
+  <path
+     d="m 200.82477,494.91454 c -7.93863,0 -14.43386,-6.36636 -14.43386,-14.47425 v -17.36912 h -53.9856 c -8.08529,0 -14.43388,-6.51341 -14.43388,-14.47425 V 359.86828 H 49.410509 c -25.546521,0 -46.4756446,-20.84583 -46.4756446,-46.60566 0,-12.15606 4.9052095,-23.88252 13.5655366,-32.71472 8.94785,-8.97288 20.641889,-13.75054 32.910686,-13.75054 H 117.972 v -88.72865 c 0,-7.96083 6.3486,-14.47425 14.43388,-14.47425 h 53.9856 v -17.36911 c 0,-7.96085 6.49525,-14.47427 14.43389,-14.47427 h 53.97982 V 494.9102 Z"
+     id="path49"
+     style="fill:#ffffff;stroke-width:1.4454" />
+</svg>
diff --git a/Content/Slate/SodaIcons/motorbike.svg b/Content/Slate/SodaIcons/motorbike.svg
new file mode 100644
index 0000000..3deca0e
--- /dev/null
+++ b/Content/Slate/SodaIcons/motorbike.svg
@@ -0,0 +1,234 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg167"
+   sodipodi:docname="motorbike.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata171">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#3b2727"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview169"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="419.85794"
+     inkscape:cy="610.60929"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg167" />
+  <defs
+     id="defs71">
+    <symbol
+       id="w"
+       overflow="visible">
+      <path
+         d="m26.797-1.6094c-1.375 0.71875-2.8125 1.2617-4.3125 1.625s-3.0625 0.54688-4.6875 0.54688c-4.8555 0-8.7031-1.3516-11.547-4.0625-2.8359-2.7188-4.25-6.3984-4.25-11.047 0-4.6641 1.4141-8.3516 4.25-11.062 2.8438-2.7188 6.6914-4.0781 11.547-4.0781 1.625 0 3.1875 0.18359 4.6875 0.54688 1.5 0.36719 2.9375 0.90625 4.3125 1.625v6.0312c-1.3984-0.94531-2.7734-1.6406-4.125-2.0781-1.3555-0.44531-2.7773-0.67188-4.2656-0.67188-2.6875 0-4.8047 0.85938-6.3438 2.5781-1.5312 1.7188-2.2969 4.0898-2.2969 7.1094 0 3 0.76562 5.3594 2.2969 7.0781 1.5391 1.7188 3.6562 2.5781 6.3438 2.5781 1.4883 0 2.9102-0.21875 4.2656-0.65625 1.3516-0.44531 2.7266-1.1445 4.125-2.0938z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m19.609-15.922c-0.61719-0.28125-1.2266-0.48828-1.8281-0.625-0.60547-0.14453-1.2148-0.21875-1.8281-0.21875-1.793 0-3.1719 0.57812-4.1406 1.7344s-1.4531 2.8086-1.4531 4.9531v10.078h-7v-21.875h7v3.5938c0.89453-1.4375 1.9258-2.4844 3.0938-3.1406 1.1641-0.65625 2.5625-0.98438 4.1875-0.98438 0.22656 0 0.47656 0.011719 0.75 0.03125 0.28125 0.023438 0.67969 0.0625 1.2031 0.125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m25.203-11v2h-16.359c0.17578 1.6367 0.76953 2.8672 1.7812 3.6875 1.0195 0.82422 2.4414 1.2344 4.2656 1.2344 1.4688 0 2.9727-0.21875 4.5156-0.65625 1.5391-0.4375 3.125-1.0977 4.75-1.9844v5.3906c-1.6484 0.625-3.2969 1.0938-4.9531 1.4062-1.6562 0.32031-3.3125 0.48438-4.9688 0.48438-3.9609 0-7.0391-1.0039-9.2344-3.0156-2.1875-2.0078-3.2812-4.832-3.2812-8.4688 0-3.5625 1.0781-6.3633 3.2344-8.4062 2.1562-2.0508 5.1172-3.0781 8.8906-3.0781 3.4375 0 6.1875 1.0391 8.25 3.1094 2.0703 2.0742 3.1094 4.8398 3.1094 8.2969zm-7.1875-2.3281c0-1.3203-0.39062-2.3906-1.1719-3.2031-0.77344-0.8125-1.7812-1.2188-3.0312-1.2188-1.3555 0-2.4609 0.38281-3.3125 1.1406-0.84375 0.76172-1.3711 1.8555-1.5781 3.2812z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m13.172-9.8438c-1.4609 0-2.5586 0.25-3.2969 0.75-0.74219 0.49219-1.1094 1.2148-1.1094 2.1719 0 0.88672 0.29688 1.5859 0.89062 2.0938 0.59375 0.5 1.4141 0.75 2.4688 0.75 1.3203 0 2.4297-0.47266 3.3281-1.4219 0.89453-0.94531 1.3438-2.1289 1.3438-3.5469v-0.79688zm10.672-2.6406v12.484h-7.0469v-3.25c-0.9375 1.3359-1.9961 2.3047-3.1719 2.9062-1.168 0.60156-2.5898 0.90625-4.2656 0.90625-2.2734 0-4.1172-0.66016-5.5312-1.9844-1.4062-1.3203-2.1094-3.0352-2.1094-5.1406 0-2.5625 0.87891-4.4414 2.6406-5.6406 1.7695-1.1953 4.5391-1.7969 8.3125-1.7969h4.125v-0.54688c0-1.1133-0.4375-1.9258-1.3125-2.4375-0.86719-0.50781-2.2266-0.76562-4.0781-0.76562-1.5 0-2.8984 0.15234-4.1875 0.45312-1.2812 0.29297-2.4766 0.74219-3.5781 1.3438v-5.3438c1.4883-0.36328 2.9883-0.64062 4.5-0.82812 1.5078-0.1875 3.0195-0.28125 4.5312-0.28125 3.9453 0 6.7969 0.78125 8.5469 2.3438 1.75 1.5547 2.625 4.0781 2.625 7.5781z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m11-28.094v6.2188h7.2031v5h-7.2031v9.2812c0 1.0117 0.19531 1.6992 0.59375 2.0625 0.40625 0.35547 1.207 0.53125 2.4062 0.53125h3.5938v5h-5.9844c-2.7617 0-4.7188-0.57031-5.875-1.7188-1.1562-1.1562-1.7344-3.1133-1.7344-5.875v-9.2812h-3.4688v-5h3.4688v-6.2188z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m18.25-18.672v-11.719h7.0312v30.391h-7.0312v-3.1719c-0.96875 1.293-2.0312 2.2422-3.1875 2.8438-1.1562 0.59375-2.5 0.89062-4.0312 0.89062-2.6875 0-4.9023-1.0664-6.6406-3.2031-1.7305-2.1445-2.5938-4.9062-2.5938-8.2812s0.86328-6.1289 2.5938-8.2656c1.7383-2.1445 3.9531-3.2188 6.6406-3.2188 1.5078 0 2.8477 0.30469 4.0156 0.90625 1.1641 0.60547 2.2344 1.5469 3.2031 2.8281zm-4.6094 14.156c1.4883 0 2.6289-0.54688 3.4219-1.6406 0.78906-1.0938 1.1875-2.6797 1.1875-4.7656 0-2.082-0.39844-3.6719-1.1875-4.7656-0.79297-1.0938-1.9336-1.6406-3.4219-1.6406-1.4922 0-2.6328 0.54688-3.4219 1.6406-0.78125 1.0938-1.1719 2.6836-1.1719 4.7656 0 2.0859 0.39062 3.6719 1.1719 4.7656 0.78906 1.0938 1.9297 1.6406 3.4219 1.6406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m15-4.5156c1.5 0 2.6406-0.54688 3.4219-1.6406 0.78906-1.0938 1.1875-2.6797 1.1875-4.7656 0-2.082-0.39844-3.6719-1.1875-4.7656-0.78125-1.0938-1.9219-1.6406-3.4219-1.6406s-2.6523 0.55469-3.4531 1.6562c-0.79297 1.0938-1.1875 2.6797-1.1875 4.75 0 2.0742 0.39453 3.6641 1.1875 4.7656 0.80078 1.0938 1.9531 1.6406 3.4531 1.6406zm-4.6406-14.156c0.95703-1.2812 2.0195-2.2227 3.1875-2.8281 1.1758-0.60156 2.5234-0.90625 4.0469-0.90625 2.6953 0 4.9102 1.0742 6.6406 3.2188 1.7383 2.1367 2.6094 4.8906 2.6094 8.2656s-0.87109 6.1367-2.6094 8.2812c-1.7305 2.1367-3.9453 3.2031-6.6406 3.2031-1.5234 0-2.8711-0.30469-4.0469-0.90625-1.168-0.60156-2.2305-1.5469-3.1875-2.8281v3.1719h-7v-30.391h7z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m0.48438-21.875h7l5.875 14.844 5-14.844h7l-9.2031 23.953c-0.92969 2.4258-2.0078 4.125-3.2344 5.0938-1.2305 0.97656-2.8555 1.4688-4.875 1.4688h-4.0469v-4.5938h2.1875c1.1875 0 2.0508-0.19531 2.5938-0.57812 0.53906-0.375 0.96094-1.0469 1.2656-2.0156l0.1875-0.60938z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m11.188-23.484v17.797h2.7031c3.0703 0 5.4141-0.75781 7.0312-2.2812 1.625-1.5195 2.4375-3.7344 2.4375-6.6406 0-2.8945-0.80859-5.0977-2.4219-6.6094-1.6172-1.5078-3.9648-2.2656-7.0469-2.2656zm-7.5156-5.6719h7.9375c4.4258 0 7.7227 0.32031 9.8906 0.95312 2.1641 0.625 4.0234 1.6953 5.5781 3.2031 1.3633 1.3125 2.375 2.8281 3.0312 4.5469 0.66406 1.7188 1 3.668 1 5.8438 0 2.1992-0.33594 4.1641-1 5.8906-0.65625 1.7188-1.668 3.2422-3.0312 4.5625-1.5625 1.5117-3.4375 2.5859-5.625 3.2188-2.1875 0.625-5.4688 0.9375-9.8438 0.9375h-7.9375z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m20.453-21.188v5.3125c-1.5-0.625-2.9492-1.0938-4.3438-1.4062-1.3867-0.3125-2.6992-0.46875-3.9375-0.46875-1.3359 0-2.3242 0.16797-2.9688 0.5-0.63672 0.32422-0.95312 0.83594-0.95312 1.5312 0 0.55469 0.23828 0.98047 0.71875 1.2812 0.48828 0.30469 1.3672 0.52734 2.6406 0.67188l1.2188 0.17188c3.582 0.46094 5.9922 1.2109 7.2344 2.25 1.2383 1.043 1.8594 2.6719 1.8594 4.8906 0 2.3359-0.85938 4.0898-2.5781 5.2656-1.7188 1.168-4.2891 1.75-7.7031 1.75-1.4492 0-2.9453-0.11719-4.4844-0.34375-1.543-0.22656-3.125-0.56641-4.75-1.0156v-5.3125c1.3945 0.67969 2.8203 1.1875 4.2812 1.5312 1.4688 0.33594 2.957 0.5 4.4688 0.5 1.3633 0 2.3906-0.1875 3.0781-0.5625 0.69531-0.38281 1.0469-0.94531 1.0469-1.6875 0-0.625-0.24219-1.0859-0.71875-1.3906-0.48047-0.3125-1.4297-0.55078-2.8438-0.71875l-1.2344-0.15625c-3.1055-0.39453-5.2812-1.1172-6.5312-2.1719-1.25-1.0508-1.875-2.6484-1.875-4.7969 0-2.3203 0.78906-4.0391 2.375-5.1562 1.5938-1.125 4.0312-1.6875 7.3125-1.6875 1.2812 0 2.6289 0.10156 4.0469 0.29688 1.4258 0.19922 2.9727 0.50781 4.6406 0.92188z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m3.3594-21.875h7v21.875h-7zm0-8.5156h7v5.7031h-7z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m18.25-3.7188c-0.96875 1.2812-2.0312 2.2266-3.1875 2.8281-1.1562 0.59375-2.5 0.89062-4.0312 0.89062-2.668 0-4.875-1.0508-6.625-3.1562-1.7422-2.1016-2.6094-4.7812-2.6094-8.0312 0-3.2695 0.86719-5.9453 2.6094-8.0312 1.75-2.0938 3.957-3.1406 6.625-3.1406 1.5312 0 2.875 0.30469 4.0312 0.90625 1.1562 0.59375 2.2188 1.5312 3.1875 2.8125v-3.2344h7.0312v19.672c0 3.5078-1.1172 6.1914-3.3438 8.0469-2.2188 1.8633-5.4375 2.7969-9.6562 2.7969-1.3672 0-2.6875-0.10547-3.9688-0.3125-1.2734-0.21094-2.5547-0.53125-3.8438-0.96875v-5.4375c1.2266 0.69531 2.4258 1.2188 3.5938 1.5625 1.1758 0.34375 2.3594 0.51562 3.5469 0.51562 2.2891 0 3.9688-0.5 5.0312-1.5 1.0703-1 1.6094-2.5664 1.6094-4.7031zm-4.6094-13.609c-1.4492 0-2.5781 0.53906-3.3906 1.6094-0.80469 1.0625-1.2031 2.5742-1.2031 4.5312 0 2 0.39062 3.5234 1.1719 4.5625 0.78125 1.0312 1.9219 1.5469 3.4219 1.5469 1.457 0 2.5859-0.53125 3.3906-1.5938 0.8125-1.0703 1.2188-2.5781 1.2188-4.5156 0-1.957-0.40625-3.4688-1.2188-4.5312-0.80469-1.0703-1.9336-1.6094-3.3906-1.6094z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m25.359-13.328v13.328h-7.0312v-10.203c0-1.8828-0.046875-3.1797-0.14062-3.8906-0.085938-0.71875-0.23047-1.25-0.4375-1.5938-0.27344-0.45703-0.64062-0.8125-1.1094-1.0625s-1-0.375-1.5938-0.375c-1.4609 0-2.6055 0.5625-3.4375 1.6875-0.83594 1.125-1.25 2.6836-1.25 4.6719v10.766h-7v-21.875h7v3.2031c1.0508-1.2812 2.1641-2.2227 3.3438-2.8281 1.1875-0.60156 2.5-0.90625 3.9375-0.90625 2.5195 0 4.4375 0.77734 5.75 2.3281 1.3125 1.5547 1.9688 3.8047 1.9688 6.75z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m15.359-17.875c1.1758 0 2.0703-0.25781 2.6875-0.78125 0.61328-0.51953 0.92188-1.2852 0.92188-2.2969 0-1.0078-0.30859-1.7734-0.92188-2.2969-0.61719-0.53125-1.5117-0.79688-2.6875-0.79688h-4.1719v6.1719zm0.25 12.75c1.5078 0 2.6445-0.31641 3.4062-0.95312 0.75781-0.63281 1.1406-1.5977 1.1406-2.8906 0-1.2578-0.38281-2.2031-1.1406-2.8281-0.75-0.63281-1.8867-0.95312-3.4062-0.95312h-4.4219v7.625zm6.9844-10.484c1.6133 0.46875 2.8633 1.3398 3.75 2.6094 0.88281 1.2617 1.3281 2.8086 1.3281 4.6406 0 2.8125-0.95312 4.9141-2.8594 6.2969-1.8984 1.375-4.7812 2.0625-8.6562 2.0625h-12.484v-29.156h11.297c4.0391 0 6.9688 0.61719 8.7812 1.8438 1.8203 1.2188 2.7344 3.1719 2.7344 5.8594 0 1.4297-0.33594 2.6406-1 3.6406-0.65625 0.99219-1.6211 1.7266-2.8906 2.2031z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.766-17.406c-1.543 0-2.7266 0.55859-3.5469 1.6719-0.8125 1.1172-1.2188 2.7188-1.2188 4.8125s0.40625 3.6992 1.2188 4.8125c0.82031 1.1172 2.0039 1.6719 3.5469 1.6719 1.5312 0 2.6953-0.55469 3.5-1.6719 0.8125-1.1133 1.2188-2.7188 1.2188-4.8125s-0.40625-3.6953-1.2188-4.8125c-0.80469-1.1133-1.9688-1.6719-3.5-1.6719zm0-5c3.7695 0 6.7109 1.0156 8.8281 3.0469 2.1133 2.0312 3.1719 4.8438 3.1719 8.4375s-1.0586 6.4062-3.1719 8.4375c-2.1172 2.0312-5.0586 3.0469-8.8281 3.0469-3.7734 0-6.7266-1.0156-8.8594-3.0469-2.125-2.0312-3.1875-4.8438-3.1875-8.4375s1.0625-6.4062 3.1875-8.4375c2.1328-2.0312 5.0859-3.0469 8.8594-3.0469z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m25.359-13.328v13.328h-7.0312v-10.156c0-1.9141-0.046875-3.2266-0.14062-3.9375-0.085938-0.71875-0.23047-1.25-0.4375-1.5938-0.27344-0.45703-0.64062-0.8125-1.1094-1.0625s-1-0.375-1.5938-0.375c-1.4609 0-2.6055 0.5625-3.4375 1.6875-0.83594 1.125-1.25 2.6836-1.25 4.6719v10.766h-7v-30.391h7v11.719c1.0508-1.2812 2.1641-2.2227 3.3438-2.8281 1.1875-0.60156 2.5-0.90625 3.9375-0.90625 2.5195 0 4.4375 0.77734 5.75 2.3281 1.3125 1.5547 1.9688 3.8047 1.9688 6.75z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m17.75-30.391v4.5938h-3.8594c-0.99219 0-1.6836 0.17969-2.0781 0.53125-0.38672 0.35547-0.57812 0.97656-0.57812 1.8594v1.5312h5.9688v5h-5.9688v16.875h-7v-16.875h-3.4688v-5h3.4688v-1.5312c0-2.375 0.66016-4.1289 1.9844-5.2656 1.332-1.1445 3.3945-1.7188 6.1875-1.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m23.641-18.25c0.88281-1.3516 1.9297-2.3828 3.1406-3.0938 1.2188-0.70703 2.5547-1.0625 4.0156-1.0625 2.5195 0 4.4375 0.77734 5.75 2.3281 1.3125 1.5547 1.9688 3.8047 1.9688 6.75v13.328h-7.0312v-11.406c0.007813-0.16406 0.019531-0.33594 0.03125-0.51562 0.007813-0.1875 0.015625-0.45312 0.015625-0.79688 0-1.5508-0.23047-2.6719-0.6875-3.3594-0.46094-0.69531-1.1953-1.0469-2.2031-1.0469-1.3359 0-2.3672 0.54688-3.0938 1.6406-0.71875 1.0938-1.0898 2.6719-1.1094 4.7344v10.75h-7.0312v-11.406c0-2.4258-0.21094-3.9844-0.625-4.6719-0.41797-0.69531-1.1641-1.0469-2.2344-1.0469-1.3359 0-2.3672 0.55469-3.0938 1.6562-0.73047 1.0938-1.0938 2.6641-1.0938 4.7031v10.766h-7.0312v-21.875h7.0312v3.2031c0.85156-1.2383 1.8359-2.1719 2.9531-2.7969 1.1133-0.625 2.3438-0.9375 3.6875-0.9375 1.5078 0 2.8438 0.36719 4 1.0938 1.1562 0.73047 2.0352 1.75 2.6406 3.0625z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m3.6719-29.156h8.4062l10.594 20v-20h7.1406v29.156h-8.4062l-10.609-20v20h-7.125z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m3.125-8.5156v-13.359h7.0312v2.1875c0 1.1875-0.007812 2.6797-0.015625 4.4688-0.011719 1.7812-0.015625 2.9766-0.015625 3.5781 0 1.7617 0.039062 3.0273 0.125 3.7969 0.09375 0.77344 0.25 1.3359 0.46875 1.6875 0.28906 0.46094 0.66406 0.8125 1.125 1.0625 0.46875 0.24219 1 0.35938 1.5938 0.35938 1.457 0 2.6016-0.55469 3.4375-1.6719 0.83203-1.125 1.25-2.6797 1.25-4.6719v-10.797h7v21.875h-7v-3.1719c-1.0547 1.2812-2.168 2.2266-3.3438 2.8281-1.1797 0.60156-2.4805 0.90625-3.9062 0.90625-2.5234 0-4.4453-0.76953-5.7656-2.3125-1.3242-1.5508-1.9844-3.8047-1.9844-6.7656z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m3.6719-29.156h12.484c3.707 0 6.5508 0.82422 8.5312 2.4688 1.9883 1.6484 2.9844 3.9922 2.9844 7.0312 0 3.0625-0.99609 5.418-2.9844 7.0625-1.9805 1.6484-4.8242 2.4688-8.5312 2.4688h-4.9688v10.125h-7.5156zm7.5156 5.4375v8.1562h4.1719c1.457 0 2.582-0.35156 3.375-1.0625 0.78906-0.71875 1.1875-1.7266 1.1875-3.0312 0-1.3008-0.39844-2.3008-1.1875-3-0.79297-0.70703-1.918-1.0625-3.375-1.0625z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m3.3594-21.875h7v21.484c0 2.9258-0.70312 5.1602-2.1094 6.7031-1.4062 1.5508-3.4492 2.3281-6.125 2.3281h-3.4531v-4.5938h1.2031c1.332 0 2.2422-0.30469 2.7344-0.90625 0.5-0.59375 0.75-1.7734 0.75-3.5312zm0-8.5156h7v5.7031h-7z"
+         id="path65" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m21.031-21.188v5.7031c-0.94922-0.65625-1.9023-1.1406-2.8594-1.4531-0.96094-0.3125-1.9492-0.46875-2.9688-0.46875-1.9609 0-3.4844 0.57422-4.5781 1.7188-1.0859 1.1367-1.625 2.7266-1.625 4.7656 0 2.043 0.53906 3.6367 1.625 4.7812 1.0938 1.1367 2.6172 1.7031 4.5781 1.7031 1.0938 0 2.1289-0.16016 3.1094-0.48438 0.97656-0.32031 1.8828-0.80469 2.7188-1.4531v5.7344c-1.0938 0.39844-2.2031 0.69141-3.3281 0.89062-1.125 0.20703-2.2578 0.3125-3.3906 0.3125-3.9375 0-7.0234-1.0078-9.25-3.0312-2.2305-2.0312-3.3438-4.8477-3.3438-8.4531 0-3.6016 1.1133-6.4141 3.3438-8.4375 2.2266-2.0312 5.3125-3.0469 9.25-3.0469 1.1445 0 2.2734 0.10547 3.3906 0.3125 1.1133 0.19922 2.2227 0.5 3.3281 0.90625z"
+         id="path68" />
+    </symbol>
+  </defs>
+  <path
+     d="m 578.51352,286.66763 c -65.45939,-10e-4 -114.9627,50.38581 -114.83984,115.87261 0,63.68521 52.19993,115.88514 115.88514,115.88514 63.68521,0 115.88514,-52.19993 115.88514,-115.88514 0,-63.67477 -53.24523,-115.8747 -116.93044,-115.8747 z"
+     id="path73"
+     sodipodi:nodetypes="ccsscc"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.305" />
+  <path
+     d="m 95.142218,429.69542 c -9.394943,-9.39494 -14.614674,-21.92527 -14.614674,-35.49464 0,-22.97058 15.659977,-42.80524 36.539946,-48.02523 l 87.69457,-24.00936 C 183.88209,301.28622 154.65274,287.71685 122.28748,287.71685 57.556967,286.66673 5.357043,338.86625 5.357043,403.59677 c 0,64.73051 52.199924,115.88513 115.885137,115.88513 50.10932,0 92.91456,-32.36525 109.61984,-77.25458 l -101.27046,2.085 c -12.52498,0 -25.05466,-5.22 -34.449342,-14.61468 z"
+     id="path75"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.305" />
+  <path
+     d="m 229.81802,349.30754 c -1.04501,-4.17495 -3.12991,-7.31008 -6.26503,-11.48503 l -101.27047,28.19057 c -12.53007,3.12991 -21.92527,15.65998 -21.92527,28.19057 0,8.3499 3.12991,15.65998 8.3499,20.87997 5.21999,5.21999 12.53007,8.3499 20.87997,8.3499 h 1.04502 l 135.7198,-3.12991 -35.49464,-66.81459 c 0.005,-1.04502 -1.03993,-2.09009 -1.03993,-4.18004 z"
+     id="path77"
+     style="fill:#ffffff;stroke-width:1.305" />
+  <path
+     d="m 555.54555,230.29171 109.61984,13.56937 c 5.21999,1.04502 9.39494,-2.09008 11.48503,-7.31007 1.04501,-5.22 -1.04502,-10.43999 -5.21999,-12.53007 L 558.67598,170.78093 c -2.09009,-1.04502 -4.17495,-1.04502 -6.26504,-1.04502 l -49.07053,10.43999 27.14526,56.37461 z"
+     id="path79"
+     style="fill:#ffffff;stroke-width:1.305" />
+  <path
+     d="m 512.74161,251.17168 -65.76929,-135.7198 c -4.17495,-9.39494 -12.53007,-15.659977 -21.92528,-17.750584 -9.39494,-2.090085 -19.83466,0 -27.14526,6.265034 -6.26504,5.21999 -9.39494,12.53007 -8.3499,20.87997 1.04502,6.26504 4.17495,11.48503 8.3499,15.65998 l 8.3499,27.14526 c -20.87997,9.39495 -82.47458,34.44934 -173.30375,21.92528 h -2.09009 -2.09008 c -124.23451,-24.00936 -203.579705,6.26503 -206.7117,7.31007 -5.219993,2.09009 -7.310078,7.31008 -6.265035,12.53007 1.045016,5.22 6.265035,8.3499 11.485027,8.3499 31.319955,-3.1299 65.769295,5.22 89.785178,12.53007 -4.17495,2.09009 -6.26504,6.26504 -5.22,11.48503 l 4.17495,19.83467 c 1.04502,4.17495 5.22,7.31008 9.39495,8.3499 59.51052,5.21999 109.61984,35.49464 124.23451,74.12519 v 1.04502 l 36.53995,69.95051 c 2.09008,3.12991 5.21999,5.21999 9.39494,5.21999 h 60.5493 2.09009 c 49.07054,-9.39494 57.41991,-58.46522 55.32931,-87.69457 l 2.09008,-2.09008 c 21.92528,-27.14527 50.10932,-48.02524 82.47458,-60.5493 l 17.75058,36.53994 c 6.26504,-4.17495 12.53007,-7.31007 18.78937,-9.39494 z"
+     id="path81"
+     style="fill:#ffffff;stroke-width:1.305" />
+</svg>
diff --git a/Content/Slate/SodaIcons/net.svg b/Content/Slate/SodaIcons/net.svg
new file mode 100644
index 0000000..935328e
--- /dev/null
+++ b/Content/Slate/SodaIcons/net.svg
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg46"
+   sodipodi:docname="CAN.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata50">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#1718ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview48"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="272.96696"
+     inkscape:cy="703.92948"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg46"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs20">
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m39.078-2.3281c-2.0117 1.043-4.1094 1.8281-6.2969 2.3594s-4.4648 0.79688-6.8281 0.79688c-7.0859 0-12.699-1.9766-16.844-5.9375-4.1367-3.957-6.2031-9.3281-6.2031-16.109 0-6.7891 2.0664-12.164 6.2031-16.125 4.1445-3.9688 9.7578-5.9531 16.844-5.9531 2.3633 0 4.6406 0.26562 6.8281 0.79688s4.2852 1.3242 6.2969 2.375v8.7969c-2.0312-1.3828-4.0391-2.3984-6.0156-3.0469-1.9688-0.64453-4.0469-0.96875-6.2344-0.96875-3.9062 0-6.9844 1.2578-9.2344 3.7656-2.2422 2.5-3.3594 5.9531-3.3594 10.359 0 4.3867 1.1172 7.8359 3.3594 10.344 2.25 2.5 5.3281 3.75 9.2344 3.75 2.1875 0 4.2656-0.32031 6.2344-0.96875 1.9766-0.64453 3.9844-1.6602 6.0156-3.0469z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m16.031-40.953v9.0625h10.516v7.2812h-10.516v13.531c0 1.4805 0.28906 2.4805 0.875 3 0.59375 0.52344 1.7656 0.78125 3.5156 0.78125h5.2344v7.2969h-8.7344c-4.0312 0-6.8867-0.83594-8.5625-2.5156-1.6797-1.6875-2.5156-4.5391-2.5156-8.5625v-13.531h-5.0781v-7.2812h5.0781v-9.0625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m26.594-27.234v-17.078h10.266v44.312h-10.266v-4.6094c-1.3984 1.875-2.9453 3.25-4.6406 4.125-1.6875 0.875-3.6406 1.3125-5.8594 1.3125-3.9297 0-7.1562-1.5625-9.6875-4.6875-2.5234-3.125-3.7812-7.1445-3.7812-12.062 0-4.9141 1.2578-8.9375 3.7812-12.062 2.5312-3.125 5.7578-4.6875 9.6875-4.6875 2.1953 0 4.1445 0.44531 5.8438 1.3281 1.707 0.88672 3.2578 2.2578 4.6562 4.1094zm-6.7188 20.656c2.1875 0 3.8516-0.79688 5-2.3906 1.1445-1.5938 1.7188-3.9102 1.7188-6.9531 0-3.0391-0.57422-5.3594-1.7188-6.9531-1.1484-1.5938-2.8125-2.3906-5-2.3906-2.168 0-3.8242 0.79688-4.9688 2.3906-1.1484 1.5938-1.7188 3.9141-1.7188 6.9531 0 3.043 0.57031 5.3594 1.7188 6.9531 1.1445 1.5938 2.8008 2.3906 4.9688 2.3906z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m21.875-6.5781c2.1758 0 3.8359-0.79688 4.9844-2.3906 1.1562-1.5938 1.7344-3.9102 1.7344-6.9531 0-3.0391-0.57812-5.3594-1.7344-6.9531-1.1484-1.5938-2.8086-2.3906-4.9844-2.3906-2.1875 0-3.8672 0.80469-5.0312 2.4062-1.168 1.6055-1.75 3.918-1.75 6.9375 0 3.0234 0.58203 5.3359 1.75 6.9375 1.1641 1.6055 2.8438 2.4062 5.0312 2.4062zm-6.7812-20.656c1.4062-1.8516 2.9609-3.2227 4.6719-4.1094 1.707-0.88281 3.6719-1.3281 5.8906-1.3281 3.9375 0 7.1641 1.5625 9.6875 4.6875 2.5195 3.125 3.7812 7.1484 3.7812 12.062 0 4.918-1.2617 8.9375-3.7812 12.062-2.5234 3.125-5.75 4.6875-9.6875 4.6875-2.2188 0-4.1836-0.44531-5.8906-1.3281-1.7109-0.88281-3.2656-2.2539-4.6719-4.1094v4.6094h-10.188v-44.312h10.188z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m4.9062-31.891h10.188v31.328c0 4.2695-1.0273 7.5312-3.0781 9.7812-2.0547 2.25-5.0234 3.375-8.9062 3.375h-5.0469v-6.7031h1.7656c1.9375 0 3.2656-0.4375 3.9844-1.3125 0.72656-0.86719 1.0938-2.5781 1.0938-5.1406zm0-12.422h10.188v8.3125h-10.188z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m36.969-19.422v19.422h-10.25v-14.812c0-2.7891-0.0625-4.707-0.1875-5.75-0.125-1.0391-0.33984-1.8125-0.64062-2.3125-0.39844-0.65625-0.9375-1.1719-1.625-1.5469s-1.4648-0.5625-2.3281-0.5625c-2.1367 0-3.8125 0.82422-5.0312 2.4688-1.2109 1.6484-1.8125 3.9219-1.8125 6.8281v15.688h-10.188v-44.312h10.188v17.078c1.5391-1.8516 3.1719-3.2227 4.8906-4.1094 1.7266-0.88281 3.6406-1.3281 5.7344-1.3281 3.6875 0 6.4844 1.1328 8.3906 3.3906 1.9062 2.2617 2.8594 5.5469 2.8594 9.8594z"
+         id="path17" />
+    </symbol>
+  </defs>
+  <path
+     d="M 439.71425,226.63754 V 100.51555 c 0,-13.0857 -10.5625,-23.648206 -23.6482,-23.648206 H 289.94406 c -13.0857,0 -23.64821,10.562506 -23.64821,23.648206 v 126.12199 c 0,13.0857 10.56251,23.64821 23.64821,23.64821 h 126.12739 c 13.08043,0 23.6428,-10.56251 23.6428,-23.64821 z"
+     id="path22"
+     style="fill:#ffffff;stroke-width:1.35133"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     d="M 37.694692,597.13066 H 163.81667 c 13.08571,0 23.64821,-10.56251 23.64821,-23.64821 V 447.36046 c 0,-13.0857 -10.5625,-23.64821 -23.64821,-23.64821 H 37.694692 c -13.085703,0 -23.648209,10.56251 -23.648209,23.64821 v 126.12199 c 0,13.0857 10.562506,23.64821 23.648209,23.64821 z"
+     id="path24"
+     style="fill:#ffffff;stroke-width:1.35133"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     d="m 542.18533,597.13066 h 126.12198 c 13.0857,0 23.64821,-10.56251 23.64821,-23.64821 V 447.36046 c 0,-13.0857 -10.56251,-23.64821 -23.64821,-23.64821 H 542.18533 c -13.08571,0 -23.64821,10.56251 -23.64821,23.64821 v 126.12199 c 0,13.0857 10.5625,23.64821 23.64821,23.64821 z"
+     id="path26"
+     style="fill:#ffffff;stroke-width:1.35133"
+     sodipodi:nodetypes="sssssssss" />
+  <path
+     d="m 211.11039,534.06426 c 5.04639,0 10.24576,-1.57835 14.50514,-5.04639 l 127.38412,-99.00627 127.38412,99.00627 c 4.25452,3.30967 9.45928,5.04639 14.50514,5.04639 7.09446,0 14.03082,-3.15129 18.76046,-9.14253 8.03931,-10.24576 6.14961,-25.22656 -4.10155,-33.1075 l -132.74618,-103.26565 0.005,-114.61408 c 0,-13.08571 -10.5625,-23.64821 -23.64821,-23.64821 -13.0857,0 -23.6482,10.5625 -23.6482,23.64821 V 388.54858 L 196.76444,491.81423 c -10.24575,8.03931 -12.14085,22.86174 -4.10154,33.1075 4.41816,5.99124 11.35424,9.14253 18.4483,9.14253 z"
+     id="path28"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.35133" />
+</svg>
diff --git a/Content/Slate/SodaIcons/path.svg b/Content/Slate/SodaIcons/path.svg
new file mode 100644
index 0000000..6d51c75
--- /dev/null
+++ b/Content/Slate/SodaIcons/path.svg
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg142"
+   sodipodi:docname="path.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata146">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#352e2e"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview144"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="409.7328"
+     inkscape:cy="517.63166"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg142" />
+  <defs
+     id="defs62">
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v21.281h-4.8906z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m1.5938-15.312h13.359v3.4219l-8.0625 8.3906h8.0625v3.5h-13.688v-3.4219l8.0625-8.3906h-7.7344z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path59" />
+    </symbol>
+  </defs>
+  <path
+     d="m 679.94889,361.31417 -79.95854,-89.74016 c -14.70703,-16.51225 -38.5888,-16.51225 -53.29582,0 -14.72319,16.52432 -14.72319,43.3095 0,59.82174 l 15.61696,17.52745 h -60.36263 c -55.48856,0 -98.98238,-22.23638 -145.41466,-74.33832 -0.006,-0.006 -0.0158,-0.006 -0.021,-0.0177 -61.072,-68.52501 -122.34995,-99.08247 -198.69164,-99.08247 H 49.668481 c -20.811405,0 -37.68962,18.943 -37.68962,42.30034 0,23.35734 16.878215,42.30033 37.68962,42.30033 H 157.82156 c 55.48856,0 98.96623,22.2243 145.4012,74.32019 0.006,0.006 0.006,0.0177 0.0158,0.0177 61.08816,68.53711 122.36476,99.10062 198.7051,99.10062 h 60.35725 l -15.61697,17.52745 c -14.71241,16.52433 -14.71241,43.29742 0.006,59.82174 7.36657,8.25582 17.00476,12.38675 26.64791,12.38675 9.6433,0 19.29709,-4.13093 26.6533,-12.39264 l 79.94912,-89.72959 c 7.06681,-7.92542 11.04185,-18.69524 11.04185,-29.9139 0,-11.21865 -3.96454,-21.97049 -11.0366,-29.90784 z"
+     id="path64"
+     style="stroke-width:1.42602;fill:#ffffff" />
+</svg>
diff --git a/Content/Slate/SodaIcons/point.svg b/Content/Slate/SodaIcons/point.svg
new file mode 100644
index 0000000..ca91908
--- /dev/null
+++ b/Content/Slate/SodaIcons/point.svg
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg139"
+   sodipodi:docname="point.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata143">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#392c34"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview141"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="229.462"
+     inkscape:cy="713.21121"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg139" />
+  <defs
+     id="defs65">
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m0.14062-20.406h5.2812l5.4219 15.062 5.4062-15.062h5.2812l-7.5625 20.406h-6.2656z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v21.281h-4.8906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     d="m 361.27791,13.03563 c -151.54041,0 -274.333919,122.80556 -274.333919,274.32053 0,151.51362 274.333919,400.50154 274.333919,400.50154 0,0 274.33392,-248.98792 274.33392,-400.50154 0,-151.51362 -122.80557,-274.32053 -274.33392,-274.32053 z m 0,459.60204 c -108.44283,0 -196.30092,-87.87817 -196.30092,-196.30092 0,-108.40134 87.85138,-196.314318 196.30092,-196.314318 108.44283,0.0052 196.30092,87.925028 196.30092,196.327698 0,108.42276 -87.8621,196.30093 -196.30092,196.30093 z"
+     id="path67"
+     style="fill:#ffffff;stroke-width:1.33894" />
+  <path
+     style="opacity:0.52809;fill:#ffffff;fill-opacity:0.5;stroke-width:4.43389;stroke-dasharray:4.43389, 13.3017"
+     d="M 458.91568,627.86761 C 381.22844,620.81274 308.87361,578.15453 266.44987,514.39558 199.61118,413.94322 207.50398,288.20871 286.40234,196.54744 c 52.54115,-61.04042 138.43038,-95.45557 218.02775,-87.36203 61.73452,6.27722 112.24355,29.16916 155.85924,70.63926 73.43637,69.82381 99.85272,173.50653 68.68125,269.57023 -29.00523,89.38786 -108.34368,158.66063 -200.22117,174.8191 -25.03595,4.40305 -48.22248,5.61613 -69.83373,3.65361 z"
+     id="path1003"
+     transform="scale(0.75000002)" />
+</svg>
diff --git a/Content/Slate/SodaIcons/race-track.svg b/Content/Slate/SodaIcons/race-track.svg
new file mode 100644
index 0000000..b6bbbde
--- /dev/null
+++ b/Content/Slate/SodaIcons/race-track.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg84"
+   sodipodi:docname="race-track.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata88">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#343435"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview86"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="406.05965"
+     inkscape:cy="492.37874"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg84" />
+  <defs
+     id="defs38">
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m29.312-1.75c-1.5117 0.78125-3.0898 1.3711-4.7344 1.7656-1.6367 0.40625-3.3398 0.60938-5.1094 0.60938-5.3125 0-9.5273-1.4844-12.641-4.4531-3.1055-2.9688-4.6562-7-4.6562-12.094s1.5508-9.125 4.6562-12.094c3.1133-2.9688 7.3281-4.4531 12.641-4.4531 1.7695 0 3.4727 0.19922 5.1094 0.59375 1.6445 0.39844 3.2227 0.99219 4.7344 1.7812v6.5938c-1.5312-1.0391-3.0391-1.8008-4.5156-2.2812-1.4805-0.48828-3.0391-0.73438-4.6719-0.73438-2.9375 0-5.2461 0.94531-6.9219 2.8281-1.6797 1.875-2.5156 4.4648-2.5156 7.7656 0 3.293 0.83594 5.8828 2.5156 7.7656 1.6758 1.875 3.9844 2.8125 6.9219 2.8125 1.6328 0 3.1914-0.23828 4.6719-0.71875 1.4766-0.48828 2.9844-1.2539 4.5156-2.2969z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m21.453-17.406c-0.67969-0.3125-1.3516-0.53906-2.0156-0.6875-0.65625-0.15625-1.3203-0.23438-1.9844-0.23438-1.9688 0-3.4844 0.63281-4.5469 1.8906-1.0547 1.2617-1.5781 3.0703-1.5781 5.4219v11.016h-7.6562v-23.922h7.6562v3.9219c0.97656-1.5625 2.1016-2.7031 3.375-3.4219 1.2812-0.71875 2.8125-1.0781 4.5938-1.0781 0.25 0 0.52344 0.011719 0.82812 0.03125 0.30078 0.023438 0.73438 0.070312 1.2969 0.14062z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m27.562-12.031v2.1875h-17.891c0.1875 1.793 0.83203 3.1367 1.9375 4.0312 1.1133 0.89844 2.6719 1.3438 4.6719 1.3438 1.6016 0 3.25-0.23438 4.9375-0.70312 1.6875-0.47656 3.4219-1.2031 5.2031-2.1719v5.8906c-1.8047 0.6875-3.6094 1.2031-5.4219 1.5469-1.8125 0.35156-3.6211 0.53125-5.4219 0.53125-4.3359 0-7.7031-1.0977-10.109-3.2969-2.3984-2.207-3.5938-5.2969-3.5938-9.2656 0-3.9062 1.1758-6.9727 3.5312-9.2031 2.3633-2.2383 5.6094-3.3594 9.7344-3.3594 3.7578 0 6.7695 1.1367 9.0312 3.4062 2.2578 2.2617 3.3906 5.2812 3.3906 9.0625zm-7.8594-2.5312c0-1.457-0.42969-2.6289-1.2812-3.5156-0.84375-0.89453-1.9492-1.3438-3.3125-1.3438-1.4922 0-2.6992 0.41797-3.625 1.25-0.91797 0.83594-1.4922 2.0391-1.7188 3.6094z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m14.391-10.766c-1.5938 0-2.793 0.27344-3.5938 0.8125-0.80469 0.54297-1.2031 1.3398-1.2031 2.3906 0 0.96875 0.32031 1.7305 0.96875 2.2812 0.64453 0.54297 1.5469 0.8125 2.7031 0.8125 1.4375 0 2.6445-0.51562 3.625-1.5469 0.98828-1.0312 1.4844-2.3203 1.4844-3.875v-0.875zm11.688-2.8906v13.656h-7.7031v-3.5469c-1.0312 1.4492-2.1875 2.5078-3.4688 3.1719s-2.8398 1-4.6719 1c-2.4805 0-4.4961-0.72266-6.0469-2.1719-1.543-1.4453-2.3125-3.3203-2.3125-5.625 0-2.8125 0.96094-4.8672 2.8906-6.1719 1.9375-1.3125 4.9688-1.9688 9.0938-1.9688h4.5156v-0.60938c0-1.207-0.48047-2.0938-1.4375-2.6562-0.94922-0.5625-2.4375-0.84375-4.4688-0.84375-1.6367 0-3.1562 0.16797-4.5625 0.5-1.4062 0.32422-2.7188 0.8125-3.9375 1.4688v-5.8281c1.6445-0.40625 3.2891-0.70703 4.9375-0.90625 1.6562-0.20703 3.3047-0.3125 4.9531-0.3125 4.3203 0 7.4375 0.85547 9.3438 2.5625 1.9141 1.6992 2.875 4.4609 2.875 8.2812z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m12.031-30.719v6.7969h7.875v5.4688h-7.875v10.141c0 1.1172 0.21875 1.8711 0.65625 2.2656 0.4375 0.38672 1.3125 0.57812 2.625 0.57812h3.9375v5.4688h-6.5625c-3.0234 0-5.1641-0.62891-6.4219-1.8906-1.2617-1.2578-1.8906-3.3984-1.8906-6.4219v-10.141h-3.7969v-5.4688h3.7969v-6.7969z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m19.953-20.422v-12.812h7.6875v33.234h-7.6875v-3.4531c-1.0547 1.4062-2.2148 2.4375-3.4844 3.0938-1.2734 0.65625-2.7422 0.98438-4.4062 0.98438-2.9492 0-5.3711-1.1719-7.2656-3.5156-1.8867-2.3438-2.8281-5.3594-2.8281-9.0469s0.94141-6.7031 2.8281-9.0469c1.8945-2.3438 4.3164-3.5156 7.2656-3.5156 1.6562 0 3.1172 0.33594 4.3906 1 1.2812 0.65625 2.4453 1.6836 3.5 3.0781zm-5.0469 15.484c1.6445 0 2.8945-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.85547-1.1953-2.1055-1.7969-3.75-1.7969-1.625 0-2.8711 0.60156-3.7344 1.7969-0.85547 1.1992-1.2812 2.9375-1.2812 5.2188 0 2.2734 0.42578 4.0078 1.2812 5.2031 0.86328 1.1992 2.1094 1.7969 3.7344 1.7969z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m16.406-4.9375c1.6328 0 2.8828-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.86719-1.1953-2.1172-1.7969-3.75-1.7969-1.6367 0-2.8906 0.60547-3.7656 1.8125-0.875 1.1992-1.3125 2.9336-1.3125 5.2031 0 2.2617 0.4375 3.9961 1.3125 5.2031 0.875 1.1992 2.1289 1.7969 3.7656 1.7969zm-5.0781-15.484c1.0508-1.3945 2.2188-2.4219 3.5-3.0781 1.2812-0.66406 2.7539-1 4.4219-1 2.9453 0 5.3672 1.1719 7.2656 3.5156 1.8945 2.3438 2.8438 5.3594 2.8438 9.0469s-0.94922 6.7031-2.8438 9.0469c-1.8984 2.3438-4.3203 3.5156-7.2656 3.5156-1.668 0-3.1406-0.33594-4.4219-1s-2.4492-1.6914-3.5-3.0781v3.4531h-7.6562v-33.234h7.6562z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m0.53125-23.922h7.6562l6.4219 16.234 5.4688-16.234h7.6562l-10.062 26.188c-1.0117 2.6641-2.1953 4.5234-3.5469 5.5781-1.3438 1.0625-3.1211 1.5938-5.3281 1.5938h-4.4219v-5.0156h2.3906c1.3008 0 2.2422-0.21094 2.8281-0.625 0.59375-0.40625 1.0547-1.1484 1.3906-2.2188l0.20312-0.65625z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m23.375-5.8125h-12.859l-2.0312 5.8125h-8.2656l11.812-31.891h9.7969l11.812 31.891h-8.2656zm-10.812-5.9219h8.7344l-4.3594-12.688z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m27.734-14.562v14.562h-7.7031v-11.156c0-2.0625-0.046875-3.4844-0.14062-4.2656-0.085937-0.78125-0.24219-1.3594-0.46875-1.7344-0.30469-0.5-0.71094-0.88281-1.2188-1.1562-0.51172-0.28125-1.0938-0.42188-1.75-0.42188-1.5938 0-2.8516 0.61719-3.7656 1.8438-0.90625 1.2305-1.3594 2.9375-1.3594 5.125v11.766h-7.6562v-23.922h7.6562v3.5c1.1445-1.3945 2.3633-2.4219 3.6562-3.0781 1.3008-0.66406 2.7383-1 4.3125-1 2.7578 0 4.8516 0.85156 6.2812 2.5469 1.4375 1.6875 2.1562 4.1523 2.1562 7.3906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m16.797-19.547c1.2891 0 2.2695-0.28125 2.9375-0.84375 0.67578-0.57031 1.0156-1.4141 1.0156-2.5312 0-1.0938-0.33984-1.9258-1.0156-2.5-0.66797-0.58203-1.6484-0.875-2.9375-0.875h-4.5625v6.75zm0.26562 13.953c1.6562 0 2.8984-0.34766 3.7344-1.0469 0.83203-0.69531 1.25-1.7539 1.25-3.1719 0-1.375-0.41797-2.4062-1.25-3.0938-0.82422-0.69531-2.0703-1.0469-3.7344-1.0469h-4.8281v8.3594zm7.6562-11.469c1.7578 0.51172 3.125 1.4609 4.0938 2.8438 0.96875 1.375 1.4531 3.0703 1.4531 5.0781 0 3.0742-1.043 5.3672-3.125 6.875-2.0742 1.5117-5.2305 2.2656-9.4688 2.2656h-13.656v-31.891h12.344c4.4258 0 7.6328 0.67188 9.625 2.0156 1.9883 1.3359 2.9844 3.4766 2.9844 6.4219 0 1.5547-0.36719 2.875-1.0938 3.9688-0.73047 1.0859-1.7812 1.8906-3.1562 2.4219z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m3.4219-9.3125v-14.609h7.6875v2.3906c0 1.293-0.011719 2.918-0.03125 4.875-0.011719 1.9609-0.015625 3.2656-0.015625 3.9219 0 1.9297 0.046875 3.3125 0.14062 4.1562 0.10156 0.84375 0.28125 1.4609 0.53125 1.8438 0.3125 0.5 0.71875 0.88672 1.2188 1.1562 0.50781 0.27344 1.0938 0.40625 1.75 0.40625 1.5938 0 2.8438-0.60938 3.75-1.8281 0.91406-1.2266 1.375-2.9297 1.375-5.1094v-11.812h7.6406v23.922h-7.6406v-3.4531c-1.1562 1.3867-2.3828 2.4141-3.6719 3.0781-1.2812 0.66406-2.6992 1-4.25 1-2.7734 0-4.8828-0.84766-6.3281-2.5469-1.4375-1.6953-2.1562-4.1602-2.1562-7.3906z"
+         id="path35" />
+    </symbol>
+  </defs>
+  <path
+     d="m 101.0285,304.01839 c 16.6137,0 30.45845,6.92238 41.53425,16.6137 11.0758,11.07581 16.6137,24.92056 16.6137,41.53426 v 80.29956 c 0,76.14614 60.91691,137.06305 137.06305,137.06305 h 191.05758 c 29.07397,0 55.379,-12.46028 74.76166,-31.84293 h -2.76895 c -33.22741,0 -63.68586,-9.69133 -88.60642,-26.30503 H 296.2395 c -42.91873,0 -78.91509,-34.61188 -78.91509,-78.91509 v -80.29956 c 0,-65.07033 -52.61006,-116.29592 -116.29591,-116.29592 -17.99818,0 -31.842932,-13.84475 -31.842932,-31.84293 0,-17.99817 13.844752,-31.84293 31.842932,-31.84293 h 386.26066 c 24.92056,0 44.30321,19.38266 44.30321,44.30321 v 2.76895 c 9.69133,-1.38447 19.38265,-2.76895 27.6895,-2.76895 11.07581,0 20.76713,1.38448 30.45846,2.76895 v -2.76895 c 0,-56.76348 -45.68768,-103.83564 -103.83564,-103.83564 h -384.8841 c -49.841111,0 -91.375367,41.53426 -91.375367,91.37536 0,24.92056 9.691326,48.45664 26.305029,65.07034 16.613702,15.22923 40.149781,24.92055 65.070338,24.92055 z"
+     id="path40"
+     style="stroke-width:1.58226;fill:#ffffff" />
+  <path
+     d="m 560.67426,254.17728 c -73.37718,0 -132.90962,59.53244 -132.90962,132.90962 0,73.37719 59.53244,132.90962 132.90962,132.90962 73.37719,0 132.90962,-59.53243 132.90962,-132.90962 0,-73.37718 -59.53243,-132.90962 -132.90962,-132.90962 z m 66.45481,145.3699 c 0,4.15343 -2.76895,9.69133 -6.92237,11.0758 -4.15343,2.76895 -8.30686,2.76895 -13.84476,1.38448 0,0 -19.38265,-8.30685 -35.99635,0 -9.69133,5.5379 -19.38266,6.92237 -27.68951,6.92237 h -6.92237 v 34.61188 c 0,8.30686 -5.5379,13.84476 -13.84475,13.84476 -8.30686,0 -13.84476,-5.5379 -13.84476,-13.84476 v -105.22011 -1.38448 -2.76895 c 0,-1.38447 0,-1.38447 1.38448,-2.76895 v -1.38447 c 0,0 0,-1.38448 1.38447,-1.38448 l 1.38448,-1.38447 c 0,0 1.38447,-1.38448 2.76895,-1.38448 0,0 1.38447,-1.38447 2.76895,-1.38447 h 2.76895 1.38448 1.38447 2.76895 c 1.38448,0 1.38448,0 2.76895,1.38447 h 1.38448 c 0,0 12.46027,6.92238 27.6895,0 27.68951,-13.84475 58.14796,-1.38447 59.53243,0 5.53791,2.76895 8.30686,6.92238 8.30686,12.46028 v 51.22558 z"
+     id="path42"
+     style="stroke-width:1.58226;fill:#ffffff;fill-opacity:0.5" />
+</svg>
diff --git a/Content/Slate/SodaIcons/radar.svg b/Content/Slate/SodaIcons/radar.svg
new file mode 100644
index 0000000..c7a263e
--- /dev/null
+++ b/Content/Slate/SodaIcons/radar.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg8"
+   sodipodi:docname="Radar.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview10"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="394.58104"
+     inkscape:cy="514.41765"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     inkscape:document-rotation="0" />
+  <path
+     d="m 412.84867,350.54237 c 0,23.95397 -19.42294,43.37691 -43.37691,43.37691 -23.95396,0 -43.3769,-19.42294 -43.3769,-43.37691 0,-23.95396 19.42294,-43.3769 43.3769,-43.3769 23.95397,0 43.37691,19.42294 43.37691,43.3769"
+     id="path2"
+     style="fill:#ffffff;stroke-width:1.23934" />
+  <path
+     d="m 369.47176,697.55761 c -191.34172,0 -347.015239,-155.67351 -347.015239,-347.01524 0,-191.34172 155.673519,-347.015234 347.015239,-347.015234 92.69893,0 179.86544,36.110654 245.36456,101.654394 8.4818,8.4818 8.4818,22.21145 0,30.66871 -8.48179,8.4818 -22.18666,8.4818 -30.66871,0 C 526.84317,78.482426 450.59153,46.907758 369.47672,46.907758 c -167.43485,0 -303.638331,136.203482 -303.638331,303.638332 0,167.43485 136.203481,303.63833 303.638331,303.63833 41.55632,0 81.78654,-8.22029 119.6112,-24.4435 10.99431,-4.79278 23.77054,0.34856 28.47632,11.3671 4.72981,11.01848 -0.39214,23.77055 -11.36711,28.47632 -43.24677,18.56532 -89.27091,27.97686 -136.724,27.97686 z m 202.42143,-70.6176 c -6.37579,0 -12.70819,-2.79818 -16.98268,-8.17679 -7.46021,-9.36768 -5.90136,-23.03438 3.44685,-30.47042 9.04334,-7.19883 17.71885,-14.9452 25.80802,-23.03438 8.4818,-8.48179 22.18667,-8.48179 30.66871,0 8.48205,8.4818 8.4818,22.18667 0,30.66871 -9.23692,9.26122 -19.17135,18.08693 -29.45415,26.30748 -3.98919,3.16614 -8.76251,4.70565 -13.4927,4.70565 z M 369.47176,589.11535 c -131.54356,0 -238.57297,-107.03313 -238.57297,-238.57298 0,-131.53984 107.03313,-238.57297 238.57297,-238.57297 63.71944,0 123.64401,24.81159 168.68659,69.88267 8.4818,8.48179 8.4818,22.18667 0,30.66871 -8.4818,8.48204 -22.18667,8.4818 -30.66871,0 -36.87037,-36.87037 -85.88751,-57.16952 -138.02531,-57.16952 -107.61934,0 -195.19607,87.57673 -195.19607,195.19607 0,107.63917 87.57673,195.19607 195.19607,195.19607 24.4435,0 48.3008,-4.46844 70.8791,-13.24978 11.12506,-4.35703 23.72717,1.17156 28.0884,12.32077 4.3377,11.16856 -1.17156,23.75072 -12.32077,28.08841 -27.63357,10.7571 -56.78161,16.22296 -86.64723,16.22296 z m 151.21189,-61.37584 c -5.65932,0 -11.29931,-2.21247 -15.57354,-6.59366 -8.35105,-8.58826 -8.13317,-22.31804 0.45507,-30.66871 l 1.71376,-1.6896 c 8.32688,-8.56892 22.09991,-8.80613 30.66871,-0.4357 8.58826,8.35105 8.78184,22.08008 0.4357,30.66871 l -2.60459,2.58031 c -4.20694,4.10048 -9.65335,6.13857 -15.09517,6.13857 z M 369.47176,480.67309 c -71.76523,0 -130.13071,-58.36549 -130.13071,-130.13072 0,-71.76523 58.36548,-130.13071 130.13071,-130.13071 34.78828,0 67.42754,13.53607 92.00118,38.10475 8.4818,8.4818 8.4818,22.21145 0,30.68854 -8.4818,8.45751 -22.18667,8.45751 -30.66871,0 -16.37292,-16.39647 -38.17292,-25.42134 -61.33247,-25.42134 -47.84472,0 -86.75381,38.90908 -86.75381,86.75381 0,47.84472 38.90909,86.7538 86.75381,86.7538 23.16451,0 44.95955,-9.02388 61.33247,-25.42134 8.43817,-8.4818 22.18667,-8.4818 30.66871,0 8.4818,8.45751 8.4818,22.18667 0,30.66871 -24.55009,24.59347 -57.2129,38.12954 -92.00118,38.12954 z m 0,-108.44226 c -5.55286,0 -11.1056,-2.12523 -15.33187,-6.35646 -8.4818,-8.48179 -8.4818,-22.18666 0,-30.66871 L 636.08977,53.255782 c 8.48179,-8.481796 22.18667,-8.481796 30.66871,0 8.48204,8.481796 8.4818,22.186667 0,30.668711 L 384.8086,365.87437 c -4.23123,4.23123 -9.77914,6.35646 -15.33188,6.35646 z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.23934" />
+</svg>
diff --git a/Content/Slate/SodaIcons/region.svg b/Content/Slate/SodaIcons/region.svg
new file mode 100644
index 0000000..be950e7
--- /dev/null
+++ b/Content/Slate/SodaIcons/region.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg146"
+   sodipodi:docname="Region.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata150">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#644849"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview148"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="455.94733"
+     inkscape:cy="594.99409"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg146"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs62">
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m19.547-1.1719c-1.0117 0.52344-2.0625 0.91406-3.1562 1.1719-1.0938 0.26953-2.2344 0.40625-3.4219 0.40625-3.543 0-6.3516-0.98828-8.4219-2.9688-2.0625-1.9766-3.0938-4.6602-3.0938-8.0469 0-3.4062 1.0312-6.0977 3.0938-8.0781 2.0703-1.9766 4.8789-2.9688 8.4219-2.9688 1.1875 0 2.3281 0.13672 3.4219 0.40625 1.0938 0.26172 2.1445 0.65625 3.1562 1.1875v4.3906c-1.0234-0.6875-2.0273-1.1914-3.0156-1.5156-0.98047-0.32031-2.0156-0.48438-3.1094-0.48438-1.9609 0-3.5 0.625-4.625 1.875-1.1172 1.25-1.6719 2.9805-1.6719 5.1875 0 2.1875 0.55469 3.9141 1.6719 5.1719 1.125 1.25 2.6641 1.875 4.625 1.875 1.0938 0 2.1289-0.16016 3.1094-0.48438 0.98828-0.32031 1.9922-0.82812 3.0156-1.5156z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m14.297-11.609c-0.44922-0.20703-0.89062-0.35938-1.3281-0.45312-0.4375-0.10156-0.88281-0.15625-1.3281-0.15625-1.3125 0-2.3242 0.42188-3.0312 1.2656-0.71094 0.83594-1.0625 2.0391-1.0625 3.6094v7.3438h-5.0938v-15.953h5.0938v2.625c0.65625-1.0508 1.4062-1.8164 2.25-2.2969 0.85156-0.47656 1.875-0.71875 3.0625-0.71875 0.17578 0 0.36328 0.011719 0.5625 0.03125 0.19531 0.011719 0.48438 0.042969 0.85938 0.09375z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m18.375-8.0156v1.4531h-11.922c0.125 1.1992 0.55469 2.0938 1.2969 2.6875 0.73828 0.59375 1.7734 0.89062 3.1094 0.89062 1.0703 0 2.1719-0.15625 3.2969-0.46875 1.125-0.32031 2.2812-0.80469 3.4688-1.4531v3.9375c-1.2109 0.46094-2.418 0.80469-3.625 1.0312-1.2109 0.22656-2.4141 0.34375-3.6094 0.34375-2.8984 0-5.1484-0.72656-6.75-2.1875-1.5938-1.4688-2.3906-3.5312-2.3906-6.1875 0-2.5938 0.78516-4.6328 2.3594-6.125 1.5703-1.5 3.7344-2.25 6.4844-2.25 2.5078 0 4.5156 0.75781 6.0156 2.2656 1.5078 1.5117 2.2656 3.5312 2.2656 6.0625zm-5.2344-1.7031c0-0.96875-0.28906-1.75-0.85938-2.3438-0.5625-0.59375-1.2969-0.89062-2.2031-0.89062-0.99219 0-1.7969 0.28125-2.4219 0.84375-0.61719 0.55469-0.99609 1.3516-1.1406 2.3906z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m9.5938-7.1719c-1.0625 0-1.8672 0.18359-2.4062 0.54688-0.53125 0.35547-0.79688 0.88281-0.79688 1.5781 0 0.64844 0.21094 1.1523 0.64062 1.5156 0.4375 0.36719 1.0391 0.54688 1.8125 0.54688 0.95703 0 1.7656-0.34375 2.4219-1.0312s0.98438-1.5469 0.98438-2.5781v-0.57812zm7.7969-1.9375v9.1094h-5.1406v-2.3594c-0.6875 0.96875-1.4609 1.6719-2.3125 2.1094-0.85547 0.4375-1.8906 0.65625-3.1094 0.65625-1.6562 0-3-0.47656-4.0312-1.4375-1.0312-0.96875-1.5469-2.2188-1.5469-3.75 0-1.875 0.64062-3.25 1.9219-4.125 1.2891-0.875 3.3164-1.3125 6.0781-1.3125h3v-0.39062c0-0.8125-0.32031-1.4062-0.95312-1.7812-0.63672-0.375-1.6328-0.5625-2.9844-0.5625-1.0859 0-2.1016 0.10938-3.0469 0.32812-0.9375 0.21875-1.8086 0.54688-2.6094 0.98438v-3.8906c1.082-0.25781 2.1758-0.45703 3.2812-0.59375 1.1016-0.14453 2.207-0.21875 3.3125-0.21875 2.875 0 4.9453 0.57031 6.2188 1.7031 1.2812 1.1367 1.9219 2.9805 1.9219 5.5312z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m8.0156-20.484v4.5312h5.2656v3.6406h-5.2656v6.7656c0 0.74219 0.14453 1.2461 0.4375 1.5156 0.30078 0.26172 0.89062 0.39062 1.7656 0.39062h2.6094v3.6406h-4.3594c-2.0234 0-3.4531-0.41406-4.2969-1.25-0.83594-0.84375-1.25-2.2734-1.25-4.2969v-6.7656h-2.5312v-3.6406h2.5312v-4.5312z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m13.297-13.625v-8.5312h5.1406v22.156h-5.1406v-2.3125c-0.69922 0.94922-1.4688 1.6406-2.3125 2.0781-0.84375 0.42578-1.8242 0.64062-2.9375 0.64062-1.9688 0-3.5859-0.77344-4.8438-2.3281-1.2617-1.5625-1.8906-3.5781-1.8906-6.0469 0-2.457 0.62891-4.4688 1.8906-6.0312 1.2578-1.5625 2.875-2.3438 4.8438-2.3438 1.1016 0 2.0781 0.22656 2.9219 0.67188 0.85156 0.4375 1.6289 1.1211 2.3281 2.0469zm-3.3594 10.328c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031-1.0859 0-1.9141 0.40234-2.4844 1.2031-0.57422 0.80469-0.85938 1.9609-0.85938 3.4688 0 1.5234 0.28516 2.6836 0.85938 3.4844 0.57031 0.79297 1.3984 1.1875 2.4844 1.1875z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.938-3.2969c1.0938 0 1.9258-0.39453 2.5-1.1875 0.57031-0.80078 0.85938-1.9609 0.85938-3.4844 0-1.5078-0.28906-2.6641-0.85938-3.4688-0.57422-0.80078-1.4062-1.2031-2.5-1.2031s-1.9336 0.40234-2.5156 1.2031c-0.58594 0.80469-0.875 1.9609-0.875 3.4688 0 1.5117 0.28906 2.668 0.875 3.4688 0.58203 0.80469 1.4219 1.2031 2.5156 1.2031zm-3.3906-10.328c0.70703-0.92578 1.4883-1.6094 2.3438-2.0469 0.85156-0.44531 1.832-0.67188 2.9375-0.67188 1.9688 0 3.582 0.78125 4.8438 2.3438 1.2695 1.5625 1.9062 3.5742 1.9062 6.0312 0 2.4688-0.63672 4.4844-1.9062 6.0469-1.2617 1.5547-2.875 2.3281-4.8438 2.3281-1.1055 0-2.0859-0.21875-2.9375-0.65625-0.85547-0.4375-1.6367-1.125-2.3438-2.0625v2.3125h-5.0938v-22.156h5.0938z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m0.35938-15.953h5.0938l4.2969 10.828 3.6406-10.828h5.0938l-6.7031 17.469c-0.67969 1.7695-1.4648 3.0078-2.3594 3.7188-0.89844 0.70703-2.0781 1.0625-3.5469 1.0625h-2.9531v-3.3438h1.5938c0.86328 0 1.4922-0.14062 1.8906-0.42188 0.39453-0.27344 0.70312-0.76562 0.92188-1.4844l0.14062-0.4375z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h6.125l7.7344 14.578v-14.578h5.2031v21.266h-6.125l-7.7344-14.594v14.594h-5.2031z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m10.047-12.688c-1.1367 0-2 0.40625-2.5938 1.2188s-0.89062 1.9805-0.89062 3.5c0 1.5312 0.29688 2.7031 0.89062 3.5156s1.457 1.2188 2.5938 1.2188c1.1016 0 1.9453-0.40625 2.5312-1.2188 0.59375-0.8125 0.89062-1.9844 0.89062-3.5156 0-1.5195-0.29688-2.6875-0.89062-3.5-0.58594-0.8125-1.4297-1.2188-2.5312-1.2188zm0-3.6562c2.7383 0 4.8789 0.74609 6.4219 2.2344 1.5391 1.4805 2.3125 3.5273 2.3125 6.1406 0 2.625-0.77344 4.6797-2.3125 6.1562-1.543 1.4805-3.6836 2.2188-6.4219 2.2188-2.7617 0-4.918-0.73828-6.4688-2.2188-1.5547-1.4766-2.3281-3.5312-2.3281-6.1562 0-2.6133 0.77344-4.6602 2.3281-6.1406 1.5508-1.4883 3.707-2.2344 6.4688-2.2344z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m15.344-15.453v4.1562c-0.69922-0.46875-1.3984-0.81641-2.0938-1.0469-0.69922-0.22656-1.4219-0.34375-2.1719-0.34375-1.4297 0-2.5391 0.41797-3.3281 1.25-0.79297 0.82422-1.1875 1.9805-1.1875 3.4688 0 1.5 0.39453 2.668 1.1875 3.5 0.78906 0.82422 1.8984 1.2344 3.3281 1.2344 0.80078 0 1.5547-0.11719 2.2656-0.35938 0.71875-0.23828 1.3828-0.58594 2-1.0469v4.1719c-0.80469 0.29297-1.6172 0.50781-2.4375 0.65625-0.8125 0.14453-1.6367 0.21875-2.4688 0.21875-2.875 0-5.125-0.73438-6.75-2.2031-1.625-1.4766-2.4375-3.5352-2.4375-6.1719 0-2.625 0.8125-4.6758 2.4375-6.1562 1.625-1.4766 3.875-2.2188 6.75-2.2188 0.83203 0 1.6562 0.078125 2.4688 0.23438 0.8125 0.14844 1.625 0.36719 2.4375 0.65625z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.4531-15.953h5.0938v15.953h-5.0938zm0-6.2031h5.0938v4.1562h-5.0938z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4375c0-1.375-0.03125-2.3203-0.09375-2.8438-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-15.953h5.0938v2.3281c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m14.906-15.453v3.875c-1.0859-0.45703-2.1367-0.80078-3.1562-1.0312-1.0117-0.22656-1.9688-0.34375-2.875-0.34375-0.96875 0-1.6875 0.125-2.1562 0.375-0.46875 0.24219-0.70312 0.60938-0.70312 1.1094 0 0.40625 0.17578 0.71875 0.53125 0.9375 0.35156 0.21875 0.99219 0.38281 1.9219 0.48438l0.89062 0.14062c2.6133 0.32422 4.3672 0.86719 5.2656 1.625 0.90625 0.76172 1.3594 1.9531 1.3594 3.5781 0 1.6992-0.63281 2.9766-1.8906 3.8281-1.25 0.85547-3.1211 1.2812-5.6094 1.2812-1.0547 0-2.1406-0.085938-3.2656-0.25-1.125-0.15625-2.2812-0.39844-3.4688-0.73438v-3.875c1.0195 0.49219 2.0625 0.85938 3.125 1.1094 1.0703 0.24219 2.1602 0.35938 3.2656 0.35938 0.98828 0 1.7344-0.13281 2.2344-0.40625 0.50781-0.26953 0.76562-0.67578 0.76562-1.2188 0-0.45703-0.17969-0.79688-0.53125-1.0156-0.34375-0.22656-1.0312-0.40625-2.0625-0.53125l-0.89062-0.10938c-2.2734-0.28125-3.8672-0.80469-4.7812-1.5781-0.90625-0.76953-1.3594-1.9414-1.3594-3.5156 0-1.6875 0.57812-2.9375 1.7344-3.75 1.1562-0.82031 2.9297-1.2344 5.3281-1.2344 0.9375 0 1.9219 0.074219 2.9531 0.21875 1.0391 0.14844 2.1641 0.37109 3.375 0.67188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.953-22.156v3.3438h-2.8281c-0.71875 0-1.2266 0.13281-1.5156 0.39062-0.28125 0.26172-0.42188 0.71484-0.42188 1.3594v1.1094h4.3594v3.6406h-4.3594v12.312h-5.0938v-12.312h-2.5312v-3.6406h2.5312v-1.1094c0-1.7383 0.48438-3.0195 1.4531-3.8438 0.96875-0.83203 2.4688-1.25 4.5-1.25z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.234-13.297c0.64453-0.98828 1.4102-1.7422 2.2969-2.2656 0.89453-0.51953 1.875-0.78125 2.9375-0.78125 1.832 0 3.2266 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219v9.7188h-5.125v-8.3125-0.39062c0.007812-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.1328-0.16797-1.9531-0.5-2.4531-0.32422-0.50781-0.85938-0.76562-1.6094-0.76562-0.96875 0-1.7188 0.40234-2.25 1.2031-0.52344 0.79297-0.79297 1.9453-0.8125 3.4531v7.8281h-5.125v-8.3125c0-1.7695-0.15234-2.9062-0.45312-3.4062-0.30469-0.50781-0.84375-0.76562-1.625-0.76562-0.98047 0-1.7344 0.40234-2.2656 1.2031-0.53125 0.80469-0.79688 1.9492-0.79688 3.4375v7.8438h-5.125v-15.953h5.125v2.3281c0.625-0.89453 1.3438-1.5703 2.1562-2.0312 0.8125-0.45703 1.707-0.6875 2.6875-0.6875 1.1016 0 2.0781 0.26562 2.9219 0.79688s1.4844 1.2812 1.9219 2.25z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m18.484-9.7188v9.7188h-5.125v-7.4062c0-1.3945-0.03125-2.3516-0.09375-2.875-0.0625-0.51953-0.16797-0.90625-0.3125-1.1562-0.19922-0.33203-0.46875-0.58594-0.8125-0.76562-0.34375-0.1875-0.73438-0.28125-1.1719-0.28125-1.0625 0-1.9023 0.41406-2.5156 1.2344-0.60547 0.8125-0.90625 1.9492-0.90625 3.4062v7.8438h-5.0938v-22.156h5.0938v8.5312c0.76953-0.92578 1.5859-1.6094 2.4531-2.0469 0.86328-0.44531 1.8164-0.67188 2.8594-0.67188 1.8438 0 3.2383 0.57031 4.1875 1.7031 0.95703 1.125 1.4375 2.7656 1.4375 4.9219z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.2812-6.2031v-9.75h5.125v1.5938c0 0.86719-0.007812 1.9531-0.015625 3.2656-0.011719 1.3047-0.015625 2.1719-0.015625 2.6094 0 1.2812 0.03125 2.2031 0.09375 2.7656 0.070312 0.5625 0.1875 0.97656 0.34375 1.2344 0.21875 0.33594 0.49219 0.58984 0.82812 0.76562 0.33203 0.17969 0.71875 0.26562 1.1562 0.26562 1.0625 0 1.8945-0.40625 2.5-1.2188 0.61328-0.8125 0.92188-1.9453 0.92188-3.4062v-7.875h5.0938v15.953h-5.0938v-2.3125c-0.77344 0.9375-1.5898 1.625-2.4531 2.0625-0.85547 0.4375-1.7969 0.65625-2.8281 0.65625-1.8438 0-3.25-0.5625-4.2188-1.6875-0.96094-1.1328-1.4375-2.7734-1.4375-4.9219z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.6719-21.266h9.1094c2.707 0 4.7852 0.60547 6.2344 1.8125 1.4453 1.1992 2.1719 2.9062 2.1719 5.125 0 2.2305-0.72656 3.9492-2.1719 5.1562-1.4492 1.1992-3.5273 1.7969-6.2344 1.7969h-3.625v7.375h-5.4844zm5.4844 3.9688v5.9375h3.0469c1.0625 0 1.8789-0.25391 2.4531-0.76562 0.58203-0.51953 0.875-1.2539 0.875-2.2031 0-0.94531-0.29297-1.6758-0.875-2.1875-0.57422-0.51953-1.3906-0.78125-2.4531-0.78125z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.4531-15.953h5.0938v15.672c0 2.1328-0.51562 3.7656-1.5469 4.8906-1.0234 1.125-2.5078 1.6875-4.4531 1.6875h-2.5156v-3.3438h0.89062c0.96875 0 1.6289-0.21875 1.9844-0.65625 0.36328-0.4375 0.54688-1.2969 0.54688-2.5781zm0-6.2031h5.0938v4.1562h-5.0938z"
+         id="path59" />
+    </symbol>
+  </defs>
+  <path
+     id="rect872"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:1.5;stroke-dasharray:1.5, 4.5"
+     d="M 52.218422,39.122776 H 223.70954 l 439.49409,407.386894 1.76358,221.29474 -348.57925,1.17571 -150.73335,-92.19196 z"
+     sodipodi:nodetypes="ccccccc" />
+</svg>
diff --git a/Content/Slate/SodaIcons/road-sign.svg b/Content/Slate/SodaIcons/road-sign.svg
new file mode 100644
index 0000000..a2471fe
--- /dev/null
+++ b/Content/Slate/SodaIcons/road-sign.svg
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg145"
+   sodipodi:docname="road-sign.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata149">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#25272a"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview147"
+     showgrid="false"
+     inkscape:zoom="0.90214286"
+     inkscape:cx="466.66667"
+     inkscape:cy="466.66667"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg145" />
+  <defs
+     id="defs65">
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v20.406h-5.25z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v21.281h-4.8906z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     d="M 422.12433,424.1292 V 347.96534 H 298.24074 V 455.14892 H 231.74588 V 281.4759 H 422.1284 V 205.30662 L 531.54308,314.7213 Z M 660.19403,274.10066 426.41021,40.303276 c -42.13453,-42.1291 -110.68553,-42.119606 -152.79971,0 L 39.81312,274.10066 c -42.1250312,42.1291 -42.1250312,110.6706 0.0054,152.7997 l 233.78385,233.78383 v 0.005 c 21.06455,21.06455 48.73152,31.5975 76.39714,31.5975 27.67646,0 55.34344,-10.53241 76.40799,-31.60292 L 660.20488,426.90036 c 42.12503,-42.13452 42.12503,-110.67603 -0.005,-152.7997 z"
+     fill-rule="evenodd"
+     id="path67"
+     style="fill:#ffffff;stroke-width:1.35629"
+     sodipodi:nodetypes="cccccccccccccccccscccc" />
+</svg>
diff --git a/Content/Slate/SodaIcons/road.svg b/Content/Slate/SodaIcons/road.svg
new file mode 100644
index 0000000..19ae046
--- /dev/null
+++ b/Content/Slate/SodaIcons/road.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg4"
+   sodipodi:docname="road.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#363636"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="288.51876"
+     inkscape:cy="479.5227"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 374.73625,17 v 119.4122 c 0,13.18338 -10.69906,23.88244 -23.88244,23.88244 -13.18338,0 -23.88244,-10.69906 -23.88244,-23.88244 V 17 H 183.67673 c -11.13086,0 -20.78045,7.665854 -23.26423,18.508209 L 17.11786,656.45166 c -1.64721,7.09541 0.048,14.54236 4.56332,20.25231 4.53657,5.6828 11.41349,9.00396 18.70063,9.00396 H 326.9711 V 614.0606 c 0,-13.18338 10.69906,-23.88244 23.88244,-23.88244 13.18338,0 23.88244,10.69906 23.88244,23.88244 v 71.64733 h 286.58929 c 7.28196,0 14.16433,-3.32116 18.70063,-9.00396 4.51528,-5.7094 6.21053,-13.15663 4.56332,-20.25231 L 541.29458,35.508209 C 538.81039,24.665172 529.16148,17 518.03035,17 Z m -47.76488,406.00149 v 95.52976 c 0,13.18338 10.69906,23.88244 23.88244,23.88244 13.18338,0 23.88244,-10.69906 23.88244,-23.88244 v -95.52976 c 0,-13.18338 -10.69906,-23.88244 -23.88244,-23.88244 -13.18338,0 -23.88244,10.69906 -23.88244,23.88244 z m 0,-191.05953 v 95.52977 c 0,13.18338 10.69906,23.88244 23.88244,23.88244 13.18338,0 23.88244,-10.69906 23.88244,-23.88244 v -95.52977 c 0,-13.18338 -10.69906,-23.88244 -23.88244,-23.88244 -13.18338,0 -23.88244,10.69906 -23.88244,23.88244 z"
+     fill-rule="evenodd"
+     id="path2"
+     style="fill:#ffffff;stroke-width:1.36471" />
+</svg>
diff --git a/Content/Slate/SodaIcons/route.svg b/Content/Slate/SodaIcons/route.svg
new file mode 100644
index 0000000..21ff873
--- /dev/null
+++ b/Content/Slate/SodaIcons/route.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg4"
+   sodipodi:docname="route.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#453932"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="229.462"
+     inkscape:cy="480.10253"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="M 529.62614,612.441 H 298.70753 v -71.05189 h 230.91861 c 49.73505,0 88.81486,-39.0798 88.81486,-88.81485 0,-49.73505 -39.07981,-88.81485 -88.81486,-88.81485 H 209.89267 c -85.26098,0 -159.86673,-74.60575 -159.86673,-159.86674 0,-85.26098 74.60575,-159.866729 159.86673,-159.866729 H 476.33723 V 115.07782 H 209.89267 c -49.73504,0 -88.81485,39.07981 -88.81485,88.81485 0,49.73505 39.07981,88.81486 88.81485,88.81486 h 319.73347 c 85.26099,0 159.86674,74.60574 159.86674,159.86673 0,85.26099 -74.60575,159.86674 -159.86674,159.86674 z"
+     id="path2"
+     style="fill:#ffffff;stroke-width:1.26878"
+     sodipodi:nodetypes="sccssssssccssssss" />
+  <path
+     d="m 124.73816,687.67697 c 60.39664,0 106.57783,-46.18119 106.57783,-106.57783 0,-60.39663 -46.18119,-106.57782 -106.57783,-106.57782 -60.396631,0 -106.577821,46.18119 -106.577821,106.57782 0,60.39664 46.18119,106.57783 106.577821,106.57783 z M 622.10134,154.78785 c 39.0798,0 71.0519,-31.97207 71.0519,-71.051882 0,-39.0798 -31.9721,-71.051879 -71.0519,-71.051879 -39.0798,0 -71.0519,31.972079 -71.0519,71.051879 0,39.079812 31.9721,71.051882 71.0519,71.051882 z"
+     id="path2-6"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.26878"
+     sodipodi:nodetypes="ssssssssss" />
+</svg>
diff --git a/Content/Slate/SodaIcons/sensor.svg b/Content/Slate/SodaIcons/sensor.svg
new file mode 100644
index 0000000..ec68978
--- /dev/null
+++ b/Content/Slate/SodaIcons/sensor.svg
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg137"
+   sodipodi:docname="Sensor.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata141">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#614c4c"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0.28627451"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview139"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="293.74545"
+     inkscape:cy="474.81889"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg137" />
+  <defs
+     id="defs65">
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m23.453-1.4062c-1.2109 0.625-2.4688 1.1016-3.7812 1.4219s-2.6836 0.48438-4.1094 0.48438c-4.25 0-7.6172-1.1875-10.094-3.5625-2.4805-2.375-3.7188-5.5977-3.7188-9.6719 0-4.0703 1.2383-7.2969 3.7188-9.6719 2.4766-2.3828 5.8438-3.5781 10.094-3.5781 1.4258 0 2.7969 0.16406 4.1094 0.48438 1.3125 0.32422 2.5703 0.79688 3.7812 1.4219v5.2812c-1.2188-0.83203-2.4219-1.4414-3.6094-1.8281-1.1875-0.38281-2.4375-0.57812-3.75-0.57812-2.3438 0-4.1875 0.75-5.5312 2.25s-2.0156 3.5742-2.0156 6.2188c0 2.6367 0.67188 4.7109 2.0156 6.2188 1.3438 1.5 3.1875 2.25 5.5312 2.25 1.3125 0 2.5625-0.19141 3.75-0.57812 1.1875-0.39453 2.3906-1.0078 3.6094-1.8438z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m17.156-13.922c-0.53125-0.25-1.0625-0.42969-1.5938-0.54688-0.53125-0.125-1.0625-0.1875-1.5938-0.1875-1.5742 0-2.7891 0.50781-3.6406 1.5156-0.84375 1-1.2656 2.4453-1.2656 4.3281v8.8125h-6.125v-19.141h6.125v3.1406c0.78125-1.25 1.6797-2.1602 2.7031-2.7344 1.0195-0.58203 2.2422-0.875 3.6719-0.875 0.19531 0 0.41406 0.011719 0.65625 0.03125 0.23828 0.023437 0.58594 0.058594 1.0469 0.10938z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m22.047-9.625v1.75h-14.312c0.15625 1.4375 0.67578 2.5156 1.5625 3.2344 0.88281 0.71094 2.125 1.0625 3.7188 1.0625 1.2891 0 2.6094-0.1875 3.9531-0.5625 1.3516-0.38281 2.7422-0.96094 4.1719-1.7344v4.7188c-1.4492 0.54297-2.8984 0.95312-4.3438 1.2344-1.4492 0.28125-2.8984 0.42188-4.3438 0.42188-3.4609 0-6.1523-0.87891-8.0781-2.6406-1.918-1.7578-2.875-4.2266-2.875-7.4062 0-3.125 0.94141-5.582 2.8281-7.375 1.8828-1.7891 4.4766-2.6875 7.7812-2.6875 3.0078 0 5.4141 0.90625 7.2188 2.7188 1.8125 1.8125 2.7188 4.2344 2.7188 7.2656zm-6.2969-2.0312c0-1.1641-0.33984-2.1016-1.0156-2.8125-0.67969-0.70703-1.5625-1.0625-2.6562-1.0625-1.1797 0-2.1406 0.33594-2.8906 1-0.74219 0.66797-1.1992 1.625-1.375 2.875z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m11.516-8.6094c-1.2734 0-2.2305 0.21875-2.875 0.65625-0.64844 0.42969-0.96875 1.0625-0.96875 1.9062 0 0.77344 0.25781 1.375 0.78125 1.8125 0.51953 0.4375 1.2383 0.65625 2.1562 0.65625 1.1562 0 2.125-0.41016 2.9062-1.2344 0.78906-0.82031 1.1875-1.8516 1.1875-3.0938v-0.70312zm9.3438-2.3125v10.922h-6.1562v-2.8438c-0.82422 1.168-1.75 2.0156-2.7812 2.5469-1.0234 0.53125-2.2656 0.79688-3.7344 0.79688-1.9805 0-3.5898-0.57812-4.8281-1.7344-1.2422-1.1562-1.8594-2.6602-1.8594-4.5156 0-2.2383 0.76953-3.8789 2.3125-4.9219 1.5508-1.0508 3.9766-1.5781 7.2812-1.5781h3.6094v-0.48438c0-0.96875-0.38672-1.6758-1.1562-2.125-0.76172-0.44531-1.9492-0.67188-3.5625-0.67188-1.3125 0-2.5391 0.13281-3.6719 0.39062-1.125 0.26172-2.1719 0.65234-3.1406 1.1719v-4.6562c1.3125-0.32031 2.6289-0.56641 3.9531-0.73438 1.3203-0.16406 2.6445-0.25 3.9688-0.25 3.4453 0 5.9375 0.68359 7.4688 2.0469 1.5312 1.3672 2.2969 3.5781 2.2969 6.6406z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m9.625-24.578v5.4375h6.2969v4.375h-6.2969v8.125c0 0.88672 0.17578 1.4844 0.53125 1.7969 0.35156 0.3125 1.0508 0.46875 2.0938 0.46875h3.1406v4.375h-5.2344c-2.418 0-4.1328-0.50391-5.1406-1.5156-1.0117-1.0078-1.5156-2.7188-1.5156-5.125v-8.125h-3.0312v-4.375h3.0312v-5.4375z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m15.969-16.344v-10.25h6.1406v26.594h-6.1406v-2.7656c-0.84375 1.125-1.7773 1.9531-2.7969 2.4844-1.0117 0.51953-2.1836 0.78125-3.5156 0.78125-2.3555 0-4.293-0.9375-5.8125-2.8125-1.5117-1.875-2.2656-4.2852-2.2656-7.2344 0-2.957 0.75391-5.375 2.2656-7.25 1.5195-1.875 3.457-2.8125 5.8125-2.8125 1.3203 0 2.4922 0.26562 3.5156 0.79688 1.0195 0.53125 1.9531 1.3555 2.7969 2.4688zm-4.0469 12.391c1.3125 0 2.3125-0.47266 3-1.4219 0.69531-0.95703 1.0469-2.3477 1.0469-4.1719 0-1.8203-0.35156-3.2109-1.0469-4.1719-0.6875-0.95703-1.6875-1.4375-3-1.4375-1.293 0-2.2891 0.48047-2.9844 1.4375-0.6875 0.96094-1.0312 2.3516-1.0312 4.1719 0 1.8242 0.34375 3.2148 1.0312 4.1719 0.69531 0.94922 1.6914 1.4219 2.9844 1.4219z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m13.125-3.9531c1.3125 0 2.3125-0.47266 3-1.4219 0.6875-0.95703 1.0312-2.3477 1.0312-4.1719 0-1.8203-0.34375-3.2109-1.0312-4.1719-0.6875-0.95703-1.6875-1.4375-3-1.4375s-2.3203 0.48438-3.0156 1.4531c-0.69922 0.96094-1.0469 2.3438-1.0469 4.1562 0 1.8047 0.34766 3.1875 1.0469 4.1562 0.69531 0.96094 1.7031 1.4375 3.0156 1.4375zm-4.0625-12.391c0.84375-1.1133 1.7734-1.9375 2.7969-2.4688 1.0312-0.53125 2.207-0.79688 3.5312-0.79688 2.3633 0 4.3008 0.9375 5.8125 2.8125 1.5195 1.875 2.2812 4.293 2.2812 7.25 0 2.9492-0.76172 5.3594-2.2812 7.2344-1.5117 1.875-3.4492 2.8125-5.8125 2.8125-1.3242 0-2.5-0.26562-3.5312-0.79688-1.0234-0.53125-1.9531-1.3516-2.7969-2.4688v2.7656h-6.125v-26.594h6.125z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m0.42188-19.141h6.125l5.1406 12.984 4.375-12.984h6.125l-8.0469 20.953c-0.8125 2.125-1.7617 3.6094-2.8438 4.4531-1.0742 0.85156-2.4922 1.2812-4.25 1.2812h-3.5469v-4.0156h1.9219c1.0312 0 1.7812-0.16797 2.25-0.5 0.47656-0.32422 0.84766-0.91406 1.1094-1.7656l0.17188-0.53125z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m2.9375-26.594h6.125v26.594h-6.125z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.9375-19.141h6.125v19.141h-6.125zm0-7.4531h6.125v4.9844h-6.125z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m17.891-18.547v4.6562c-1.3125-0.55078-2.5781-0.96094-3.7969-1.2344-1.2188-0.26953-2.3711-0.40625-3.4531-0.40625-1.1562 0-2.0156 0.14844-2.5781 0.4375-0.5625 0.29297-0.84375 0.74219-0.84375 1.3438 0 0.49219 0.21094 0.86719 0.64062 1.125 0.42578 0.26172 1.1914 0.45312 2.2969 0.57812l1.0781 0.15625c3.125 0.39844 5.2266 1.0547 6.3125 1.9688 1.082 0.90625 1.625 2.3359 1.625 4.2812 0 2.043-0.75781 3.5781-2.2656 4.6094-1.5 1.0234-3.7422 1.5312-6.7188 1.5312-1.2734 0-2.5859-0.10547-3.9375-0.3125-1.3438-0.19531-2.7266-0.49219-4.1406-0.89062v-4.6406c1.2188 0.59375 2.4688 1.0391 3.75 1.3281 1.2812 0.29297 2.582 0.4375 3.9062 0.4375 1.1875 0 2.082-0.16016 2.6875-0.48438 0.60156-0.33203 0.90625-0.82031 0.90625-1.4688 0-0.55078-0.21094-0.95703-0.625-1.2188-0.41797-0.26953-1.2461-0.48438-2.4844-0.64062l-1.0781-0.125c-2.7188-0.34375-4.625-0.97266-5.7188-1.8906-1.0938-0.92578-1.6406-2.332-1.6406-4.2188 0-2.0195 0.69141-3.5195 2.0781-4.5 1.3945-0.98828 3.5234-1.4844 6.3906-1.4844 1.1328 0 2.3203 0.089844 3.5625 0.26562 1.2383 0.16797 2.5859 0.43359 4.0469 0.79688z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m12.047-15.234c-1.3555 0-2.3906 0.49219-3.1094 1.4688-0.71094 0.96875-1.0625 2.375-1.0625 4.2188 0 1.8359 0.35156 3.2422 1.0625 4.2188 0.71875 0.96875 1.7539 1.4531 3.1094 1.4531 1.332 0 2.3516-0.48438 3.0625-1.4531 0.70703-0.97656 1.0625-2.3828 1.0625-4.2188 0-1.8438-0.35547-3.25-1.0625-4.2188-0.71094-0.97656-1.7305-1.4688-3.0625-1.4688zm0-4.375c3.2891 0 5.8633 0.89062 7.7188 2.6719 1.8516 1.7812 2.7812 4.2461 2.7812 7.3906 0 3.1367-0.92969 5.5938-2.7812 7.375-1.8555 1.7812-4.4297 2.6719-7.7188 2.6719-3.3047 0-5.8867-0.89062-7.75-2.6719-1.8672-1.7812-2.7969-4.2383-2.7969-7.375 0-3.1445 0.92969-5.6094 2.7969-7.3906 1.8633-1.7812 4.4453-2.6719 7.75-2.6719z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m22.188-11.656v11.656h-6.1562v-8.9219c0-1.6562-0.039062-2.7969-0.10938-3.4219-0.074219-0.625-0.20312-1.082-0.39062-1.375-0.24219-0.40625-0.5625-0.71875-0.96875-0.9375s-0.875-0.32812-1.4062-0.32812c-1.2734 0-2.2734 0.49609-3 1.4844-0.73047 0.98047-1.0938 2.3398-1.0938 4.0781v9.4219h-6.125v-19.141h6.125v2.7969c0.91406-1.1133 1.8906-1.9375 2.9219-2.4688 1.0391-0.53125 2.1914-0.79688 3.4531-0.79688 2.207 0 3.8828 0.68359 5.0312 2.0469 1.1445 1.3555 1.7188 3.3242 1.7188 5.9062z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m15.531-26.594v4.0156h-3.375c-0.86719 0-1.4688 0.15625-1.8125 0.46875s-0.51562 0.85938-0.51562 1.6406v1.3281h5.2344v4.375h-5.2344v14.766h-6.125v-14.766h-3.0312v-4.375h3.0312v-1.3281c0-2.082 0.57812-3.625 1.7344-4.625 1.1641-1 2.9727-1.5 5.4219-1.5z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m20.672-15.969c0.78125-1.1758 1.7031-2.0781 2.7656-2.7031s2.2344-0.9375 3.5156-0.9375c2.1953 0 3.8672 0.68359 5.0156 2.0469 1.1562 1.3555 1.7344 3.3242 1.7344 5.9062v11.656h-6.1562v-9.9844c0.007813-0.14453 0.015625-0.29688 0.015625-0.45312 0.007812-0.16406 0.015625-0.39453 0.015625-0.6875 0-1.3516-0.19922-2.332-0.59375-2.9375-0.39844-0.61328-1.043-0.92188-1.9375-0.92188-1.1562 0-2.0547 0.48047-2.6875 1.4375-0.63672 0.96094-0.96484 2.3398-0.98438 4.1406v9.4062h-6.1406v-9.9844c0-2.1133-0.18359-3.4727-0.54688-4.0781-0.36719-0.61328-1.0156-0.92188-1.9531-0.92188-1.1797 0-2.0859 0.48438-2.7188 1.4531-0.63672 0.96094-0.95312 2.3281-0.95312 4.1094v9.4219h-6.1562v-19.141h6.1562v2.7969c0.75-1.082 1.6094-1.8945 2.5781-2.4375 0.97656-0.55078 2.0547-0.82812 3.2344-0.82812 1.3125 0 2.4727 0.32422 3.4844 0.96875 1.0195 0.63672 1.7891 1.5273 2.3125 2.6719z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m22.188-11.656v11.656h-6.1562v-8.8906c0-1.6758-0.039062-2.8281-0.10938-3.4531-0.074219-0.625-0.20312-1.082-0.39062-1.375-0.24219-0.40625-0.5625-0.71875-0.96875-0.9375s-0.875-0.32812-1.4062-0.32812c-1.2734 0-2.2734 0.49609-3 1.4844-0.73047 0.98047-1.0938 2.3398-1.0938 4.0781v9.4219h-6.125v-26.594h6.125v10.25c0.91406-1.1133 1.8906-1.9375 2.9219-2.4688 1.0391-0.53125 2.1914-0.79688 3.4531-0.79688 2.207 0 3.8828 0.68359 5.0312 2.0469 1.1445 1.3555 1.7188 3.3242 1.7188 5.9062z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m3.2188-25.516h7.3438l9.2812 17.5v-17.5h6.2344v25.516h-7.3438l-9.2812-17.5v17.5h-6.2344z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.7344-7.4531v-11.688h6.1562v1.9062c0 1.043-0.007813 2.3516-0.015625 3.9219-0.011719 1.5625-0.015625 2.6055-0.015625 3.125 0 1.543 0.035156 2.6523 0.10938 3.3281 0.082031 0.67969 0.21875 1.168 0.40625 1.4688 0.25781 0.40625 0.58594 0.71875 0.98438 0.9375 0.40625 0.21094 0.875 0.3125 1.4062 0.3125 1.2695 0 2.2695-0.48828 3-1.4688 0.72656-0.97656 1.0938-2.3359 1.0938-4.0781v-9.4531h6.125v19.141h-6.125v-2.7656c-0.92969 1.1172-1.9062 1.9375-2.9375 2.4688s-2.168 0.79688-3.4062 0.79688c-2.2109 0-3.8906-0.67578-5.0469-2.0312-1.1562-1.3633-1.7344-3.3359-1.7344-5.9219z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m3.2188-25.516h10.922c3.2383 0 5.7266 0.72656 7.4688 2.1719 1.7383 1.4375 2.6094 3.4922 2.6094 6.1562 0 2.6797-0.87109 4.7344-2.6094 6.1719-1.7422 1.4375-4.2305 2.1562-7.4688 2.1562h-4.3438v8.8594h-6.5781zm6.5781 4.7656v7.125h3.6406c1.2695 0 2.2539-0.30469 2.9531-0.92188 0.69531-0.625 1.0469-1.5039 1.0469-2.6406 0-1.1445-0.35156-2.0234-1.0469-2.6406-0.69922-0.61328-1.6836-0.92188-2.9531-0.92188z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.9375-19.141h6.125v18.797c0 2.5625-0.62109 4.5156-1.8594 5.8594-1.2305 1.3516-3.0117 2.0312-5.3438 2.0312h-3.0156v-4.0156h1.0469c1.1641 0 1.9609-0.26172 2.3906-0.78125 0.4375-0.52344 0.65625-1.5547 0.65625-3.0938zm0-7.4531h6.125v4.9844h-6.125z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m18.406-18.547v5c-0.83594-0.57031-1.6719-0.99219-2.5156-1.2656-0.83594-0.28125-1.6992-0.42188-2.5938-0.42188-1.7109 0-3.043 0.5-4 1.5-0.94922 1-1.4219 2.3984-1.4219 4.1875 0 1.7812 0.47266 3.1719 1.4219 4.1719 0.95703 1 2.2891 1.5 4 1.5 0.95703 0 1.8633-0.14062 2.7188-0.42188 0.86328-0.28906 1.6602-0.71875 2.3906-1.2812v5.0156c-0.96094 0.35547-1.9336 0.61719-2.9219 0.79688-0.98047 0.17578-1.9648 0.26562-2.9531 0.26562-3.4609 0-6.1641-0.88281-8.1094-2.6562-1.9492-1.7695-2.9219-4.2344-2.9219-7.3906s0.97266-5.6172 2.9219-7.3906c1.9453-1.7812 4.6484-2.6719 8.1094-2.6719 1 0 1.9844 0.089844 2.9531 0.26562 0.97656 0.17969 1.9531 0.44531 2.9219 0.79688z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     d="m 126.79649,115.30425 c -5.6387,0.005 -11.124,2.33816 -15.04787,6.40566 -61.086353,73.09846 -92.724353,142.99338 -93.295564,231.13851 0,45.90877 9.241257,90.46568 27.463392,132.44975 15.930862,36.70513 38.080792,69.91396 65.832172,98.68876 3.92339,4.06286 9.40394,6.39638 15.06095,6.40567 5.68975,0 11.00773,-2.25915 14.96814,-6.35927 l 29.58283,-30.59672 c 7.80489,-8.07919 7.87926,-20.72309 0.15804,-28.80693 -20.3518,-21.29906 -36.62063,-45.81595 -48.35427,-72.86165 -13.60199,-31.33573 -20.50057,-64.61476 -20.50057,-98.9208 0,-34.30604 6.89846,-67.58984 20.50057,-98.92081 11.74221,-27.0457 27.99771,-51.56139 48.33999,-72.86165 7.7166,-8.08383 7.65615,-20.73261 -0.14876,-28.80693 l -29.58282,-30.59672 c -3.96052,-4.09999 -9.26922,-6.35925 -14.98241,-6.35925 z m 449.71036,0 c -5.68975,0 -11.00773,2.25914 -14.96814,6.35925 l -29.58282,30.59672 c -7.8049,8.0792 -7.87927,20.72309 -0.15805,28.80694 20.35181,21.29906 36.62064,45.8207 48.35428,72.86163 13.60674,31.3405 20.50056,64.61478 20.50056,98.92082 0,34.30603 -6.89846,67.58983 -20.50056,98.92081 -11.74221,27.04568 -28.00247,51.56139 -48.35428,72.86165 -7.71659,8.08383 -7.64222,20.73261 0.15805,28.80692 l 29.58282,30.59673 c 3.96052,4.1 9.27851,6.35926 14.96814,6.35926 5.65261,0 11.13792,-2.33352 15.06096,-6.40567 27.76089,-28.7748 49.91558,-61.98363 65.84644,-98.68876 18.21333,-41.97574 27.44911,-86.54217 27.44911,-132.44976 0,-45.90758 -9.24125,-90.46567 -27.46339,-132.44975 -15.9261,-36.70512 -38.08079,-69.91396 -65.83693,-98.68875 -3.9234,-4.07215 -9.40857,-6.40567 -15.06096,-6.40567 z M 216.78616,208.4094 c -5.80601,0 -11.37497,2.44514 -15.2942,6.70317 -34.61306,37.60717 -53.66774,86.51361 -53.66774,137.73347 0,51.21985 19.05468,100.12987 53.66774,137.73346 3.91875,4.25803 9.48771,6.70317 15.2942,6.70317 5.70378,0 11.04021,-2.25913 15.00502,-6.36389 l 29.6209,-30.65741 c 7.5306,-7.78169 7.82811,-20.17926 0.67869,-28.23096 -19.37955,-21.80602 -30.05764,-49.93464 -30.05764,-79.18782 0,-29.25795 10.66833,-57.37229 30.05764,-79.18782 7.14479,-8.04195 6.85193,-20.44463 -0.67869,-28.23096 l -29.6209,-30.65742 c -3.96516,-4.10464 -9.30171,-6.3639 -15.00502,-6.3639 z m 269.99282,0 c -5.71307,-0.0651 -11.29132,2.2545 -15.26563,6.36389 l -29.62092,30.64314 c -7.53059,7.79097 -7.82345,20.19353 -0.67868,28.24405 19.38432,21.81077 30.05765,49.93463 30.05765,79.18781 0,29.25795 -10.66833,57.38657 -30.05765,79.18782 -7.14478,8.05124 -6.84264,20.43988 0.67868,28.23096 l 29.62092,30.65742 c 3.92338,4.05822 9.37144,6.3639 15.00502,6.3639 h 0.24637 c 5.70378,-0.0744 11.19361,-2.51952 15.04786,-6.70317 33.8324,-44.8449 53.38808,-86.05308 53.66774,-137.73347 0,-51.22224 -19.05469,-100.12987 -53.66774,-137.73347 -3.85365,-4.19294 -9.32956,-6.62879 -15.03359,-6.70317 z"
+     id="path67"
+     style="fill:#ffffff;stroke-width:1.19003;fill-opacity:0.5"
+     sodipodi:nodetypes="cccsccccccscccccccccccsccccsccsccccccscscccscccccccccscccscccccc" />
+  <path
+     d="m 353.98753,260.29857 c -51.75181,0 -93.85845,42.10189 -93.85845,93.85845 0,51.75179 42.10189,93.85844 93.85845,93.85844 51.75179,0 93.85844,-42.10189 93.85844,-93.85844 0,-51.7518 -42.10188,-93.85845 -93.85844,-93.85845 z"
+     id="path67-0"
+     style="fill:#ffffff;stroke-width:1.19003"
+     sodipodi:nodetypes="sssss" />
+</svg>
diff --git a/Content/Slate/SodaIcons/soda-full.svg b/Content/Slate/SodaIcons/soda-full.svg
new file mode 100644
index 0000000..0f1b534
--- /dev/null
+++ b/Content/Slate/SodaIcons/soda-full.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="1392"
+   height="600"
+   viewBox="0 0 1392 600"
+   fill="none"
+   version="1.1"
+   id="svg19"
+   sodipodi:docname="SodaFull.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview21"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="0.78666667"
+     inkscape:cx="973.72881"
+     inkscape:cy="139.19492"
+     inkscape:window-width="2560"
+     inkscape:window-height="1351"
+     inkscape:window-x="2551"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g12" />
+  <g
+     clip-path="url(#clip0_209_11)"
+     id="g12">
+    <path
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       d="m 20.746559,279.96833 c 12.620145,11.59271 28.656968,21.98442 48.063248,31.15726 l 0.959785,0.45053 1.951476,0.8998 1.994871,0.8998 c 1.679623,0.75047 3.405193,1.50222 5.174158,2.25396 l 2.144199,0.90108 2.18887,0.90362 2.229712,0.90235 c 1.126981,0.45182 2.269278,0.90363 3.42689,1.35672 l 2.338198,0.90363 2.380317,0.90618 2.424987,0.9049 2.467105,0.90618 2.509225,0.90745 c 0.42246,0.15061 0.84619,0.30249 1.2712,0.45309 l 2.57432,0.90874 2.61771,0.90873 2.6611,0.90873 2.70323,0.91001 2.74661,0.91001 2.79001,0.91128 2.83213,0.91129 2.87553,0.91256 2.91892,0.91256 2.96231,0.91384 c 0.49776,0.15315 0.9968,0.30503 1.49711,0.45691 l 4.55643,1.37331 3.09122,0.91512 3.13589,0.91639 3.17673,0.91766 5.53535,1.57752 2.28077,0.65858 2.24503,0.65602 3.30308,0.9802 c 0.36247,0.10849 0.72495,0.21825 1.08359,0.32674 l 2.14292,0.65092 3.14738,0.97254 3.06952,0.96872 2.00253,0.64326 1.96807,0.64199 2.88829,0.9585 1.88128,0.63688 1.84682,0.6356 1.81108,0.63305 2.65345,0.94575 1.72429,0.62794 1.68983,0.62667 1.65538,0.62412 1.62091,0.62156 1.58518,0.62028 1.55071,0.61774 1.51498,0.61646 c 0.25016,0.1021 0.49776,0.20421 0.74409,0.30631 l 1.46392,0.6139 1.42692,0.61008 1.39373,0.6088 1.35799,0.60625 1.32226,0.60369 1.28779,0.60114 1.25334,0.59987 1.21632,0.59731 1.18314,0.59604 1.1474,0.5922 c 0.18762,0.0983 0.37524,0.19783 0.5603,0.29611 l 1.0938,0.58838 1.05933,0.5871 c 0.17358,0.0983 0.34588,0.19527 0.51691,0.29355 l 1.00573,0.58327 c 0.16465,0.097 0.32801,0.194 0.4901,0.291 l 0.95341,0.57945 0.91766,0.57816 c 0.30121,0.19145 0.59476,0.38417 0.88321,0.57562 11.04518,7.32729 16.42099,17.55563 16.42099,31.35381 0,12.40317 -5.29285,21.77894 -16.31506,28.77056 -11.58378,7.34771 -28.09539,10.6559 -49.5744,10.70313 l -145.670258,0.001 -0.0013,-66.8352 z M 293.02924,163.85994 v 69.43121 72.3629 c -19.79045,-14.61757 -46.61847,-27.43809 -80.5032,-38.53177 l -2.96359,-0.95979 c -0.49648,-0.15826 -0.99424,-0.3178 -1.49456,-0.47606 l -3.01592,-0.94702 c -0.50541,-0.15699 -1.01338,-0.31397 -1.52136,-0.46968 l -3.06952,-0.93426 -3.10526,-0.92533 -3.141,-0.91639 -3.17673,-0.90745 c -1.06444,-0.30121 -2.13526,-0.60114 -3.21119,-0.89852 l -3.24821,-0.89087 -3.28267,-0.88193 -3.01336,-0.79897 -2.68536,-0.72366 -2.64323,-0.7275 -2.60112,-0.73005 -2.559,-0.7326 c -0.42374,-0.12253 -0.84492,-0.24505 -1.26355,-0.36758 l -2.49646,-0.73643 c -0.82449,-0.24632 -1.64261,-0.49265 -2.45434,-0.74026 l -2.41095,-0.74281 c -0.39821,-0.1238 -0.79514,-0.24888 -1.19079,-0.37268 l -2.34841,-0.74664 c -0.388,-0.12508 -0.77345,-0.25016 -1.15889,-0.37524 l -2.28459,-0.75047 -2.24376,-0.75429 -2.20035,-0.75686 -2.15824,-0.76068 -2.1174,-0.76195 -2.074,-0.76451 -2.03188,-0.76834 -1.98977,-0.77089 -1.94637,-0.77217 -1.90553,-0.77599 c -2.82575,-1.16655 -5.50855,-2.34075 -8.04841,-3.52389 l -1.67196,-0.79004 c -2.75045,-1.31843 -5.32476,-2.64706 -7.72167,-3.98719 l -1.4167,-0.80535 c -0.23357,-0.13401 -0.46458,-0.26802 -0.69304,-0.40331 -13.48548,-7.9195 -19.808318,-17.12679 -19.808318,-27.96266 0,-12.04453 5.423038,-21.5709 16.751558,-29.12665 11.85436,-7.90673 28.90202,-12.02538 51.20552,-12.02538 z"
+       fill="#000000"
+       id="path4"
+       style="stroke-width:1.27631;fill:#ffffff" />
+    <circle
+       cx="517.6571"
+       cy="300"
+       fill="#000000"
+       id="circle6"
+       r="142.94662"
+       style="stroke-width:1.27631;fill:#ffffff" />
+    <path
+       fill-rule="evenodd"
+       clip-rule="evenodd"
+       d="m 878.42627,438.86243 c 75.18865,0 136.14003,-60.95142 136.14003,-136.14006 0,-75.18737 -60.95138,-136.13879 -136.14003,-136.13879 H 742.28749 v 136.13879 136.14006 z"
+       fill="#000000"
+       id="path8"
+       style="stroke-width:1.27631;fill:#ffffff" />
+    <path
+       d="m 1214.4491,163.85994 156.8073,273.64067 h -313.6197 z"
+       fill="#000000"
+       id="path10"
+       style="stroke-width:1.27631;fill:#ffffff" />
+  </g>
+  <defs
+     id="defs17">
+    <clipPath
+       id="clip0_209_11">
+      <rect
+         width="1392"
+         height="600"
+         fill="white"
+         id="rect14" />
+    </clipPath>
+  </defs>
+</svg>
diff --git a/Content/Slate/SodaIcons/soda.svg b/Content/Slate/SodaIcons/soda.svg
new file mode 100644
index 0000000..88be53b
--- /dev/null
+++ b/Content/Slate/SodaIcons/soda.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg166"
+   sodipodi:docname="soda.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <metadata
+     id="metadata170">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#100e66"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1334"
+     id="namedview168"
+     showgrid="false"
+     inkscape:pagecheckerboard="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="854.35071"
+     inkscape:cy="619.20832"
+     inkscape:window-x="2549"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg166"
+     inkscape:document-rotation="0"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#100e66"
+     inkscape:document-units="pt" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.25v16.422h9.25v3.9844h-14.5z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h6.6875l4.6562 10.922 4.6719-10.922h6.6875v20.406h-4.9844v-14.938l-4.7031 11.016h-3.3281l-4.7031-11.016v14.938h-4.9844z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="m 28.39803,302.15711 c 29.627673,27.21567 67.276527,51.6118 112.83572,73.14645 l 2.25343,1.05769 4.58137,2.11242 4.6831,2.11242 c 3.94343,1.76184 7.99423,3.52671 12.14739,5.29152 l 5.03368,2.11542 5.13886,2.12138 5.23433,2.11842 c 2.64596,1.06071 5.32761,2.12141 8.04525,3.18511 l 5.48945,2.12141 5.58804,2.12741 5.6929,2.12437 5.79213,2.12742 5.89074,2.13035 c 0.99164,0.35359 1.98642,0.71015 2.98433,1.06371 l 6.04349,2.13342 6.14553,2.13336 6.24726,2.13339 6.3465,2.1364 6.44791,2.13639 6.54995,2.13934 6.64887,2.1394 6.75091,2.14238 6.85265,2.14237 6.95437,2.14538 c 1.16851,0.35954 2.34014,0.7161 3.5146,1.07269 l 10.69685,3.22405 7.25738,2.14839 7.36193,2.15136 7.45771,2.15436 12.99505,3.70344 5.35452,1.54613 5.27064,1.5401 7.75446,2.30117 c 0.8511,0.25479 1.70189,0.51238 2.54392,0.76708 l 5.03086,1.52814 7.38885,2.28317 7.20636,2.27422 4.70126,1.51017 4.62018,1.50716 6.78065,2.25024 4.41672,1.49517 4.33565,1.49217 4.25175,1.48616 6.22942,2.22032 4.04799,1.47417 3.96722,1.4712 3.88615,1.46524 3.80539,1.45918 3.7215,1.45624 3.64043,1.45022 3.55685,1.44725 c 0.58723,0.23977 1.1685,0.47939 1.74665,0.7191 l 3.43697,1.44121 3.34994,1.43226 3.27201,1.42925 3.1878,1.42327 3.10422,1.41726 3.02347,1.41126 2.94239,1.40828 2.85537,1.4023 2.77775,1.39929 2.69354,1.39028 c 0.44042,0.2307 0.88115,0.46443 1.31562,0.69516 l 2.56771,1.3813 2.48695,1.37832 c 0.40755,0.2307 0.81197,0.45842 1.21358,0.68915 l 2.36111,1.3693 c 0.38658,0.22788 0.77003,0.45545 1.15067,0.68317 l 2.23809,1.36036 2.15452,1.35732 c 0.70712,0.44946 1.39607,0.9019 2.07345,1.35137 25.93031,17.20192 38.55067,41.21453 38.55067,73.60787 0,29.11835 -12.42566,51.12942 -38.30213,67.54331 -27.1946,17.2499 -65.95812,25.01638 -116.38353,25.12725 l -341.983291,0.002 -0.003,-156.90591 z M 667.62347,29.574791 V 192.57524 362.45829 C 621.16246,328.14129 558.1796,298.04315 478.62979,271.99903 l -6.9575,-2.25325 c -1.16538,-0.37155 -2.3342,-0.74608 -3.50865,-1.11764 l -7.08021,-2.22326 c -1.18666,-0.36858 -2.37927,-0.7371 -3.57188,-1.10264 l -7.20604,-2.19334 -7.28994,-2.17233 -7.37414,-2.15139 -7.45771,-2.13035 c -2.49916,-0.70715 -5.01302,-1.41129 -7.53879,-2.10942 l -7.6258,-2.09148 -7.70657,-2.07047 -7.07426,-1.87568 -6.30423,-1.69892 -6.20532,-1.7079 -6.10672,-1.71391 -6.00749,-1.71989 c -0.99478,-0.28767 -1.98361,-0.5753 -2.96649,-0.86294 l -5.86069,-1.7289 c -1.93571,-0.57828 -3.85641,-1.15658 -5.76208,-1.73786 l -5.66003,-1.74387 c -0.935,-0.2908 -1.86686,-0.58429 -2.79559,-0.87493 l -5.51323,-1.75285 c -0.91089,-0.29361 -1.81583,-0.58729 -2.72077,-0.88093 l -5.3633,-1.76184 -5.26751,-1.77082 -5.16577,-1.77686 -5.06687,-1.78578 -4.97076,-1.78882 -4.86904,-1.79479 -4.77012,-1.80382 -4.67151,-1.80976 -4.56948,-1.81279 -4.47337,-1.82175 c -6.63385,-2.73868 -12.93213,-5.49526 -18.89486,-8.27288 l -3.92528,-1.85474 c -6.45699,-3.09521 -12.50047,-6.2144 -18.12764,-9.36054 l -3.32616,-1.8907 c -0.5481,-0.31459 -1.09056,-0.6292 -1.62677,-0.94683 -31.6592,-18.59223 -46.50326,-40.20776 -46.50326,-65.64663 0,-28.27639 12.73148,-50.641017 39.32696,-68.379294 27.83002,-18.562273 67.85189,-28.231445 120.21271,-28.231445 z"
+     fill="#000000"
+     id="path4"
+     style="fill:#ffffff;stroke-width:2.99633" />
+</svg>
diff --git a/Content/Slate/SodaIcons/steering.svg b/Content/Slate/SodaIcons/steering.svg
new file mode 100644
index 0000000..8d67481
--- /dev/null
+++ b/Content/Slate/SodaIcons/steering.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg93"
+   sodipodi:docname="Steering.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata97">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#6156ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0.2627451"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview95"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="365.19582"
+     inkscape:cy="430.39428"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg93"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs47">
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m29.312-1.75c-1.5117 0.78125-3.0898 1.3711-4.7344 1.7656-1.6367 0.40625-3.3398 0.60938-5.1094 0.60938-5.3125 0-9.5273-1.4844-12.641-4.4531-3.1055-2.9688-4.6562-7-4.6562-12.094s1.5508-9.125 4.6562-12.094c3.1133-2.9688 7.3281-4.4531 12.641-4.4531 1.7695 0 3.4727 0.19922 5.1094 0.59375 1.6445 0.39844 3.2227 0.99219 4.7344 1.7812v6.5938c-1.5312-1.0391-3.0391-1.8008-4.5156-2.2812-1.4805-0.48828-3.0391-0.73438-4.6719-0.73438-2.9375 0-5.2461 0.94531-6.9219 2.8281-1.6797 1.875-2.5156 4.4648-2.5156 7.7656 0 3.293 0.83594 5.8828 2.5156 7.7656 1.6758 1.875 3.9844 2.8125 6.9219 2.8125 1.6328 0 3.1914-0.23828 4.6719-0.71875 1.4766-0.48828 2.9844-1.2539 4.5156-2.2969z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m21.453-17.406c-0.67969-0.3125-1.3516-0.53906-2.0156-0.6875-0.65625-0.15625-1.3203-0.23438-1.9844-0.23438-1.9688 0-3.4844 0.63281-4.5469 1.8906-1.0547 1.2617-1.5781 3.0703-1.5781 5.4219v11.016h-7.6562v-23.922h7.6562v3.9219c0.97656-1.5625 2.1016-2.7031 3.375-3.4219 1.2812-0.71875 2.8125-1.0781 4.5938-1.0781 0.25 0 0.52344 0.011719 0.82812 0.03125 0.30078 0.023438 0.73438 0.070312 1.2969 0.14062z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m27.562-12.031v2.1875h-17.891c0.1875 1.793 0.83203 3.1367 1.9375 4.0312 1.1133 0.89844 2.6719 1.3438 4.6719 1.3438 1.6016 0 3.25-0.23438 4.9375-0.70312 1.6875-0.47656 3.4219-1.2031 5.2031-2.1719v5.8906c-1.8047 0.6875-3.6094 1.2031-5.4219 1.5469-1.8125 0.35156-3.6211 0.53125-5.4219 0.53125-4.3359 0-7.7031-1.0977-10.109-3.2969-2.3984-2.207-3.5938-5.2969-3.5938-9.2656 0-3.9062 1.1758-6.9727 3.5312-9.2031 2.3633-2.2383 5.6094-3.3594 9.7344-3.3594 3.7578 0 6.7695 1.1367 9.0312 3.4062 2.2578 2.2617 3.3906 5.2812 3.3906 9.0625zm-7.8594-2.5312c0-1.457-0.42969-2.6289-1.2812-3.5156-0.84375-0.89453-1.9492-1.3438-3.3125-1.3438-1.4922 0-2.6992 0.41797-3.625 1.25-0.91797 0.83594-1.4922 2.0391-1.7188 3.6094z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m14.391-10.766c-1.5938 0-2.793 0.27344-3.5938 0.8125-0.80469 0.54297-1.2031 1.3398-1.2031 2.3906 0 0.96875 0.32031 1.7305 0.96875 2.2812 0.64453 0.54297 1.5469 0.8125 2.7031 0.8125 1.4375 0 2.6445-0.51562 3.625-1.5469 0.98828-1.0312 1.4844-2.3203 1.4844-3.875v-0.875zm11.688-2.8906v13.656h-7.7031v-3.5469c-1.0312 1.4492-2.1875 2.5078-3.4688 3.1719s-2.8398 1-4.6719 1c-2.4805 0-4.4961-0.72266-6.0469-2.1719-1.543-1.4453-2.3125-3.3203-2.3125-5.625 0-2.8125 0.96094-4.8672 2.8906-6.1719 1.9375-1.3125 4.9688-1.9688 9.0938-1.9688h4.5156v-0.60938c0-1.207-0.48047-2.0938-1.4375-2.6562-0.94922-0.5625-2.4375-0.84375-4.4688-0.84375-1.6367 0-3.1562 0.16797-4.5625 0.5-1.4062 0.32422-2.7188 0.8125-3.9375 1.4688v-5.8281c1.6445-0.40625 3.2891-0.70703 4.9375-0.90625 1.6562-0.20703 3.3047-0.3125 4.9531-0.3125 4.3203 0 7.4375 0.85547 9.3438 2.5625 1.9141 1.6992 2.875 4.4609 2.875 8.2812z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m12.031-30.719v6.7969h7.875v5.4688h-7.875v10.141c0 1.1172 0.21875 1.8711 0.65625 2.2656 0.4375 0.38672 1.3125 0.57812 2.625 0.57812h3.9375v5.4688h-6.5625c-3.0234 0-5.1641-0.62891-6.4219-1.8906-1.2617-1.2578-1.8906-3.3984-1.8906-6.4219v-10.141h-3.7969v-5.4688h3.7969v-6.7969z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m19.953-20.422v-12.812h7.6875v33.234h-7.6875v-3.4531c-1.0547 1.4062-2.2148 2.4375-3.4844 3.0938-1.2734 0.65625-2.7422 0.98438-4.4062 0.98438-2.9492 0-5.3711-1.1719-7.2656-3.5156-1.8867-2.3438-2.8281-5.3594-2.8281-9.0469s0.94141-6.7031 2.8281-9.0469c1.8945-2.3438 4.3164-3.5156 7.2656-3.5156 1.6562 0 3.1172 0.33594 4.3906 1 1.2812 0.65625 2.4453 1.6836 3.5 3.0781zm-5.0469 15.484c1.6445 0 2.8945-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.85547-1.1953-2.1055-1.7969-3.75-1.7969-1.625 0-2.8711 0.60156-3.7344 1.7969-0.85547 1.1992-1.2812 2.9375-1.2812 5.2188 0 2.2734 0.42578 4.0078 1.2812 5.2031 0.86328 1.1992 2.1094 1.7969 3.7344 1.7969z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m16.406-4.9375c1.6328 0 2.8828-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.86719-1.1953-2.1172-1.7969-3.75-1.7969-1.6367 0-2.8906 0.60547-3.7656 1.8125-0.875 1.1992-1.3125 2.9336-1.3125 5.2031 0 2.2617 0.4375 3.9961 1.3125 5.2031 0.875 1.1992 2.1289 1.7969 3.7656 1.7969zm-5.0781-15.484c1.0508-1.3945 2.2188-2.4219 3.5-3.0781 1.2812-0.66406 2.7539-1 4.4219-1 2.9453 0 5.3672 1.1719 7.2656 3.5156 1.8945 2.3438 2.8438 5.3594 2.8438 9.0469s-0.94922 6.7031-2.8438 9.0469c-1.8984 2.3438-4.3203 3.5156-7.2656 3.5156-1.668 0-3.1406-0.33594-4.4219-1s-2.4492-1.6914-3.5-3.0781v3.4531h-7.6562v-33.234h7.6562z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m0.53125-23.922h7.6562l6.4219 16.234 5.4688-16.234h7.6562l-10.062 26.188c-1.0117 2.6641-2.1953 4.5234-3.5469 5.5781-1.3438 1.0625-3.1211 1.5938-5.3281 1.5938h-4.4219v-5.0156h2.3906c1.3008 0 2.2422-0.21094 2.8281-0.625 0.59375-0.40625 1.0547-1.1484 1.3906-2.2188l0.20312-0.65625z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m12.234-25.672v19.453h2.9531c3.3633 0 5.9297-0.83203 7.7031-2.5 1.7695-1.6641 2.6562-4.0859 2.6562-7.2656 0-3.1562-0.88672-5.5547-2.6562-7.2031-1.7617-1.6562-4.3281-2.4844-7.7031-2.4844zm-8.2188-6.2188h8.6719c4.8438 0 8.4453 0.34375 10.812 1.0312 2.375 0.6875 4.4102 1.8594 6.1094 3.5156 1.4883 1.4375 2.5977 3.1016 3.3281 4.9844 0.72656 1.875 1.0938 4 1.0938 6.375 0 2.4062-0.36719 4.5586-1.0938 6.4531-0.73047 1.8867-1.8398 3.5469-3.3281 4.9844-1.7109 1.6484-3.7617 2.8203-6.1562 3.5156-2.3984 0.6875-5.9844 1.0312-10.766 1.0312h-8.6719z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m3.6719-23.922h7.6562v23.922h-7.6562zm0-9.3125h7.6562v6.2344h-7.6562z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m27.734-14.562v14.562h-7.7031v-11.156c0-2.0625-0.046875-3.4844-0.14062-4.2656-0.085937-0.78125-0.24219-1.3594-0.46875-1.7344-0.30469-0.5-0.71094-0.88281-1.2188-1.1562-0.51172-0.28125-1.0938-0.42188-1.75-0.42188-1.5938 0-2.8516 0.61719-3.7656 1.8438-0.90625 1.2305-1.3594 2.9375-1.3594 5.125v11.766h-7.6562v-23.922h7.6562v3.5c1.1445-1.3945 2.3633-2.4219 3.6562-3.0781 1.3008-0.66406 2.7383-1 4.3125-1 2.7578 0 4.8516 0.85156 6.2812 2.5469 1.4375 1.6875 2.1562 4.1523 2.1562 7.3906z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m15.062-19.031c-1.6992 0-2.9961 0.60938-3.8906 1.8281-0.88672 1.2188-1.3281 2.9766-1.3281 5.2656 0 2.293 0.44141 4.0469 1.3281 5.2656 0.89453 1.2188 2.1914 1.8281 3.8906 1.8281 1.6641 0 2.9375-0.60938 3.8125-1.8281 0.88281-1.2188 1.3281-2.9727 1.3281-5.2656 0-2.2891-0.44531-4.0469-1.3281-5.2656-0.875-1.2188-2.1484-1.8281-3.8125-1.8281zm0-5.4688c4.1133 0 7.3281 1.1094 9.6406 3.3281s3.4688 5.2969 3.4688 9.2344c0 3.9297-1.1562 7.0078-3.4688 9.2344-2.3125 2.2188-5.5273 3.3281-9.6406 3.3281-4.1367 0-7.3711-1.1094-9.7031-3.3281-2.3242-2.2266-3.4844-5.3047-3.4844-9.2344 0-3.9375 1.1602-7.0156 3.4844-9.2344 2.332-2.2188 5.5664-3.3281 9.7031-3.3281z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m22.359-23.172v5.7969c-1.6367-0.67578-3.2148-1.1875-4.7344-1.5312-1.5234-0.34375-2.9609-0.51562-4.3125-0.51562-1.4609 0-2.543 0.18359-3.25 0.54688-0.69922 0.36719-1.0469 0.92188-1.0469 1.6719 0 0.61719 0.26562 1.0898 0.79688 1.4219 0.53125 0.32422 1.4883 0.5625 2.875 0.71875l1.3438 0.1875c3.9141 0.5 6.5508 1.3242 7.9062 2.4688 1.3516 1.1367 2.0312 2.9219 2.0312 5.3594 0 2.5547-0.94531 4.4688-2.8281 5.75-1.875 1.2812-4.6797 1.9219-8.4062 1.9219-1.5859 0-3.2188-0.125-4.9062-0.375s-3.4219-0.625-5.2031-1.125v-5.8125c1.5195 0.74219 3.082 1.2969 4.6875 1.6719 1.6016 0.36719 3.2344 0.54688 4.8906 0.54688 1.4883 0 2.6094-0.20312 3.3594-0.60938 0.75781-0.41406 1.1406-1.0312 1.1406-1.8438 0-0.6875-0.26172-1.1953-0.78125-1.5312-0.52344-0.33203-1.5586-0.59375-3.1094-0.78125l-1.3438-0.17188c-3.4062-0.42578-5.793-1.2109-7.1562-2.3594-1.3672-1.1562-2.0469-2.9102-2.0469-5.2656 0-2.5312 0.86719-4.4062 2.6094-5.625 1.7383-1.2266 4.3984-1.8438 7.9844-1.8438 1.4062 0 2.8828 0.10938 4.4375 0.32812 1.5508 0.21094 3.2383 0.54297 5.0625 1z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m19.422-33.234v5.0156h-4.2344c-1.0859 0-1.8398 0.19922-2.2656 0.59375-0.42969 0.38672-0.64062 1.0625-0.64062 2.0312v1.6719h6.5312v5.4688h-6.5312v18.453h-7.6406v-18.453h-3.8125v-5.4688h3.8125v-1.6719c0-2.6016 0.72266-4.5234 2.1719-5.7656 1.457-1.25 3.707-1.875 6.75-1.875z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m4.0156-31.891h8.2188v25.672h14.453v6.2188h-22.672z"
+         id="path44" />
+    </symbol>
+  </defs>
+  <path
+     d="m 350.52714,10.933703 c -90.21847,0 -176.73966,35.839843 -240.54554,99.634627 -63.7948,63.7948 -99.63465,150.31916 -99.63465,240.54556 0,90.2264 35.83985,176.73965 99.63465,240.54554 63.79478,63.7948 150.31914,99.63464 240.54554,99.63464 90.2264,0 176.73965,-35.83984 240.54554,-99.63464 63.7948,-63.79479 99.63465,-150.31914 99.63465,-240.54554 C 690.60815,260.92558 654.73736,174.45358 590.96161,110.67942 527.19062,46.903665 440.72179,11.032086 350.52714,10.933703 Z m 0,68.72821 c 57.49037,-0.241738 113.55577,17.883415 160.03046,51.720697 46.47628,33.83729 80.93401,81.62744 98.35725,136.41705 -1.02894,5.95675 -11.93825,11.66564 -11.93825,11.66564 -0.41531,0.27894 -14.29992,7.50025 -16.3823,8.19449 v -0.006 c -10.178,5.7584 -22.26462,7.11593 -33.46596,3.75014 -2.91324,-0.27893 -17.07733,-2.21901 -20.96343,-3.0559 -29.36881,-6.84316 -59.07243,-12.13042 -88.99822,-15.82485 -63.99314,-7.70478 -128.69877,-7.28317 -192.57607,1.24591 -25.12882,3.19219 -50.31955,7.59323 -75.67211,12.77513 -16.99006,2.28106 -34.19115,2.51035 -51.23673,0.69424 -5.6221,0.12395 -11.14485,-1.48764 -15.81866,-4.61794 C 97.18946,279.49021 93.600567,274.99015 91.579747,269.7462 109.13312,214.77067 143.64162,166.76469 190.16074,132.6164 236.67986,98.468104 292.81985,79.935682 350.52443,79.662751 Z M 87.543995,418.30447 C 123.3775,397.0316 176.40574,406.08726 176.40574,406.08726 v -0.006 c 22.9533,4.00417 44.52925,13.69249 62.76018,28.19139 27.24248,24.06884 43.27726,58.35201 44.2944,94.68852 0,2.21901 0.27894,85.25491 0.27894,85.25491 C 236.48227,602.14122 193.33355,577.5827 158.82028,543.11862 124.30702,508.64821 99.69232,465.54392 87.543657,418.30597 Z m 262.983145,15.47764 c -14.03969,0 -27.50271,-5.57241 -37.42666,-15.5024 -9.92379,-9.92379 -15.50241,-23.3865 -15.50241,-37.42665 0,-14.03349 5.57862,-27.49636 15.50241,-37.42666 9.9238,-9.92379 23.3865,-15.50242 37.42666,-15.50242 14.04015,0 27.5027,5.57863 37.42665,15.50242 9.9238,9.92998 15.50241,23.39285 15.50241,37.42666 -0.0128,14.03349 -5.59716,27.49 -15.52096,37.41396 -9.92379,9.91761 -23.37382,15.5024 -37.40762,15.51478 z m 65.3943,180.7067 v -79.00603 c 0.0128,-16.13474 2.78312,-32.14572 8.19448,-47.34426 7.14068,-20.82696 19.63686,-39.41018 36.23655,-53.87083 0.94217,-0.61985 1.8223,-1.31407 2.64062,-2.0827 2.91323,-2.219 24.4338,-15.40941 26.24436,-16.10303 v -0.006 c 11.46729,-4.72952 23.43728,-8.13244 35.67799,-10.13452 1.95877,-0.19215 13.3702,-1.38847 22.63118,-1.25211 h 0.006 c 10.43825,-0.48348 20.88886,0.68803 30.96197,3.47118 11.57885,2.27485 22.92158,5.62209 33.87537,9.99821 0.33472,0.11156 0.66323,0.25415 0.97316,0.4153 -12.20483,47.41884 -36.99187,90.65325 -71.74792,125.14113 -34.75446,34.48152 -78.18246,58.93596 -125.69335,70.77519 z"
+     id="path49"
+     style="fill:#ffffff;stroke-width:1.58682" />
+</svg>
diff --git a/Content/Slate/SodaIcons/terminal.svg b/Content/Slate/SodaIcons/terminal.svg
new file mode 100644
index 0000000..b371e75
--- /dev/null
+++ b/Content/Slate/SodaIcons/terminal.svg
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg156"
+   sodipodi:docname="terminal.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata160">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#281d22"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview158"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="345.91177"
+     inkscape:cy="457.94293"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg156" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m7.8281-16.438v12.453h1.8906c2.1562 0 3.8008-0.53125 4.9375-1.5938 1.1328-1.0625 1.7031-2.6133 1.7031-4.6562 0-2.0195-0.57031-3.5547-1.7031-4.6094-1.125-1.0625-2.7734-1.5938-4.9375-1.5938zm-5.25-3.9688h5.5469c3.0938 0 5.3984 0.21875 6.9219 0.65625 1.5195 0.4375 2.8203 1.1875 3.9062 2.25 0.95703 0.91797 1.6641 1.9805 2.125 3.1875 0.46875 1.1992 0.70312 2.5586 0.70312 4.0781 0 1.543-0.23438 2.918-0.70312 4.125-0.46094 1.2109-1.168 2.2773-2.125 3.2031-1.0938 1.0547-2.4062 1.8047-3.9375 2.25-1.5312 0.4375-3.8281 0.65625-6.8906 0.65625h-5.5469z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.3594-21.281h4.8906v21.281h-4.8906z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="m 628.54522,129.39169 v 390.8655 c 0,61.59565 -49.28052,111.66903 -109.90085,111.66903 H 133.96781 c 0,30.7066 24.74623,55.84049 54.95632,55.84049 h 439.60932 c 30.22038,0 54.95632,-25.13389 54.95632,-55.84049 V 185.24414 c 0,-30.69462 -24.73594,-55.84049 -54.95632,-55.84049 z"
+     id="path70"
+     style="stroke-width:1.48374;fill:#ffffff;fill-opacity:0.5" />
+  <path
+     d="m 24.078719,157.32987 v 362.92732 c 0,30.69463 24.735937,55.8405 54.956318,55.8405 H 518.64437 c 30.2086,0 54.95631,-25.14437 54.95631,-55.8405 V 157.32987 Z m 225.501071,229.11414 -104.20887,105.90341 -38.85624,-39.4814 84.78663,-86.15074 -84.78663,-86.16122 38.85624,-39.47691 104.20887,105.89744 c 10.74059,10.90173 10.706,28.57383 0,39.47091 z m 241.60408,91.9403 H 298.84559 v -55.84049 h 192.33828 z"
+     id="path72"
+     style="stroke-width:1.48374;fill:#ffffff" />
+  <path
+     d="M 573.61246,101.4834 V 73.569135 c 0,-30.706588 -24.74624,-55.840496 -54.95632,-55.840496 H 79.046814 c -30.220384,0 -54.956319,25.133908 -54.956319,55.840496 V 101.4834 Z"
+     id="path74"
+     style="stroke-width:1.48374;fill:#ffffff" />
+</svg>
diff --git a/Content/Slate/SodaIcons/tire.svg b/Content/Slate/SodaIcons/tire.svg
new file mode 100644
index 0000000..bbe1456
--- /dev/null
+++ b/Content/Slate/SodaIcons/tire.svg
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg160"
+   sodipodi:docname="tire.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata164">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2b3232"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview162"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="743.10951"
+     inkscape:cy="414.57512"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m20.609-1.2344c-1.0625 0.55469-2.1719 0.96875-3.3281 1.25-1.1484 0.28125-2.3438 0.42188-3.5938 0.42188-3.7422 0-6.7031-1.0391-8.8906-3.125-2.1797-2.0938-3.2656-4.9258-3.2656-8.5 0-3.582 1.0859-6.4141 3.2656-8.5 2.1875-2.0938 5.1484-3.1406 8.8906-3.1406 1.25 0 2.4453 0.14062 3.5938 0.42188 1.1562 0.27344 2.2656 0.68359 3.3281 1.2344v4.6406c-1.0742-0.72656-2.1328-1.2578-3.1719-1.5938-1.043-0.34375-2.1367-0.51562-3.2812-0.51562-2.0625 0-3.6875 0.66406-4.875 1.9844-1.1797 1.3242-1.7656 3.1484-1.7656 5.4688 0 2.3125 0.58594 4.1328 1.7656 5.4531 1.1875 1.3242 2.8125 1.9844 4.875 1.9844 1.1445 0 2.2383-0.17188 3.2812-0.51562 1.0391-0.34375 2.0977-0.87891 3.1719-1.6094z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m15.078-12.25c-0.46875-0.21875-0.9375-0.37891-1.4062-0.48438-0.46094-0.10156-0.92969-0.15625-1.4062-0.15625-1.375 0-2.4375 0.44531-3.1875 1.3281-0.74219 0.88672-1.1094 2.1562-1.1094 3.8125v7.75h-5.3906v-16.828h5.3906v2.7656c0.6875-1.1016 1.4766-1.9062 2.375-2.4062 0.89453-0.50781 1.9688-0.76562 3.2188-0.76562 0.17578 0 0.36719 0.011719 0.57812 0.03125 0.21875 0.011719 0.52344 0.042969 0.92188 0.09375z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m19.375-8.4531v1.5312h-12.562c0.125 1.2617 0.57812 2.2109 1.3594 2.8438 0.78125 0.625 1.875 0.9375 3.2812 0.9375 1.125 0 2.2812-0.16406 3.4688-0.5 1.1875-0.33203 2.4062-0.84375 3.6562-1.5312v4.1562c-1.2734 0.48047-2.543 0.83984-3.8125 1.0781-1.2734 0.25-2.543 0.375-3.8125 0.375-3.043 0-5.4062-0.76953-7.0938-2.3125-1.6875-1.5508-2.5312-3.7227-2.5312-6.5156 0-2.75 0.82812-4.9102 2.4844-6.4844 1.6562-1.5703 3.9375-2.3594 6.8438-2.3594 2.6328 0 4.7422 0.79688 6.3281 2.3906 1.5938 1.5938 2.3906 3.7266 2.3906 6.3906zm-5.5312-1.7969c0-1.0195-0.29688-1.8438-0.89062-2.4688s-1.3711-0.9375-2.3281-0.9375c-1.043 0-1.8906 0.29688-2.5469 0.89062-0.64844 0.58594-1.0547 1.4219-1.2188 2.5156z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m10.125-7.5781c-1.125 0-1.9688 0.19531-2.5312 0.57812-0.5625 0.38672-0.84375 0.94922-0.84375 1.6875 0 0.67969 0.22266 1.2109 0.67188 1.5938 0.45703 0.38672 1.0938 0.57812 1.9062 0.57812 1.0078 0 1.8594-0.35938 2.5469-1.0781 0.69531-0.72656 1.0469-1.6406 1.0469-2.7344v-0.625zm8.2188-2.0156v9.5938h-5.4219v-2.5c-0.71875 1.0234-1.5312 1.7656-2.4375 2.2344-0.89844 0.46875-1.9922 0.70312-3.2812 0.70312-1.75 0-3.168-0.50391-4.25-1.5156-1.0859-1.0195-1.625-2.3438-1.625-3.9688 0-1.9688 0.67578-3.4102 2.0312-4.3281 1.3516-0.92578 3.4844-1.3906 6.3906-1.3906h3.1719v-0.42188c0-0.85156-0.33984-1.4766-1.0156-1.875-0.66797-0.39453-1.7148-0.59375-3.1406-0.59375-1.1484 0-2.2148 0.11719-3.2031 0.34375-0.99219 0.23047-1.9141 0.57812-2.7656 1.0469v-4.1094c1.1445-0.28125 2.2969-0.49219 3.4531-0.64062 1.1641-0.14453 2.332-0.21875 3.5-0.21875 3.0312 0 5.2188 0.60156 6.5625 1.7969 1.3516 1.1992 2.0312 3.1484 2.0312 5.8438z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m8.4531-21.609v4.7812h5.5469v3.8438h-5.5469v7.1406c0 0.78125 0.15625 1.3125 0.46875 1.5938 0.3125 0.27344 0.92578 0.40625 1.8438 0.40625h2.7656v3.8438h-4.6094c-2.125 0-3.6328-0.44141-4.5156-1.3281-0.88672-0.88281-1.3281-2.3906-1.3281-4.5156v-7.1406h-2.6719v-3.8438h2.6719v-4.7812z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m14.031-14.359v-9.0156h5.4062v23.375h-5.4062v-2.4375c-0.74219 0.99219-1.5586 1.7188-2.4531 2.1875-0.88672 0.45703-1.918 0.6875-3.0938 0.6875-2.0742 0-3.7773-0.82031-5.1094-2.4688-1.3359-1.6445-2-3.7656-2-6.3594s0.66406-4.7109 2-6.3594c1.332-1.6562 3.0352-2.4844 5.1094-2.4844 1.1641 0 2.1953 0.23438 3.0938 0.70312 0.89453 0.46875 1.7109 1.1953 2.4531 2.1719zm-3.5469 10.891c1.1562 0 2.0352-0.42188 2.6406-1.2656 0.60156-0.84375 0.90625-2.0625 0.90625-3.6562 0-1.6016-0.30469-2.8281-0.90625-3.6719-0.60547-0.84375-1.4844-1.2656-2.6406-1.2656-1.1484 0-2.0234 0.42188-2.625 1.2656-0.60547 0.84375-0.90625 2.0703-0.90625 3.6719 0 1.5938 0.30078 2.8125 0.90625 3.6562 0.60156 0.84375 1.4766 1.2656 2.625 1.2656z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m11.531-3.4688c1.1562 0 2.0352-0.42188 2.6406-1.2656 0.60156-0.84375 0.90625-2.0625 0.90625-3.6562 0-1.6016-0.30469-2.8281-0.90625-3.6719-0.60547-0.84375-1.4844-1.2656-2.6406-1.2656-1.1484 0-2.0273 0.42969-2.6406 1.2812-0.61719 0.84375-0.92188 2.0625-0.92188 3.6562 0 1.5859 0.30469 2.8047 0.92188 3.6562 0.61328 0.84375 1.4922 1.2656 2.6406 1.2656zm-3.5625-10.891c0.73828-0.97656 1.5547-1.7031 2.4531-2.1719 0.90625-0.46875 1.9414-0.70312 3.1094-0.70312 2.0703 0 3.7734 0.82812 5.1094 2.4844 1.332 1.6484 2 3.7656 2 6.3594s-0.66797 4.7148-2 6.3594c-1.3359 1.6484-3.0391 2.4688-5.1094 2.4688-1.168 0-2.2031-0.23438-3.1094-0.70312-0.89844-0.46875-1.7148-1.1914-2.4531-2.1719v2.4375h-5.3906v-23.375h5.3906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.375-16.828h5.375l4.5312 11.422 3.8438-11.422h5.375l-7.0781 18.422c-0.71094 1.875-1.5391 3.1797-2.4844 3.9219-0.94922 0.75-2.1992 1.125-3.75 1.125h-3.1094v-3.5312h1.6875c0.90625 0 1.5664-0.14844 1.9844-0.4375 0.41406-0.29297 0.73828-0.8125 0.96875-1.5625l0.15625-0.46875z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m11.812-13.75c0.90625 0 1.5938-0.19531 2.0625-0.59375 0.47656-0.40625 0.71875-1 0.71875-1.7812 0-0.76953-0.24219-1.3594-0.71875-1.7656-0.46875-0.40625-1.1562-0.60938-2.0625-0.60938h-3.2031v4.75zm0.1875 9.8125c1.1641 0 2.0391-0.24219 2.625-0.73438 0.58203-0.48828 0.875-1.2266 0.875-2.2188 0-0.97656-0.29297-1.707-0.875-2.1875-0.57422-0.48828-1.4492-0.73438-2.625-0.73438h-3.3906v5.875zm5.375-8.0625c1.25 0.35547 2.2109 1.0234 2.8906 2 0.67578 0.96875 1.0156 2.1641 1.0156 3.5781 0 2.1562-0.73047 3.7656-2.1875 4.8281-1.4609 1.0625-3.6836 1.5938-6.6719 1.5938h-9.5938v-22.422h8.6719c3.1133 0 5.3672 0.46875 6.7656 1.4062 1.4062 0.9375 2.1094 2.4453 2.1094 4.5156 0 1.0938-0.25781 2.0273-0.76562 2.7969-0.51172 0.76172-1.2578 1.3281-2.2344 1.7031z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m10.594-13.391c-1.1992 0-2.1094 0.43359-2.7344 1.2969-0.625 0.85547-0.9375 2.0898-0.9375 3.7031 0 1.6055 0.3125 2.8398 0.9375 3.7031 0.625 0.85547 1.5352 1.2812 2.7344 1.2812 1.1641 0 2.0625-0.42578 2.6875-1.2812 0.625-0.86328 0.9375-2.0977 0.9375-3.7031 0-1.6133-0.3125-2.8477-0.9375-3.7031-0.625-0.86328-1.5234-1.2969-2.6875-1.2969zm0-3.8438c2.8945 0 5.1562 0.78125 6.7812 2.3438s2.4375 3.7305 2.4375 6.5c0 2.7617-0.8125 4.9219-2.4375 6.4844s-3.8867 2.3438-6.7812 2.3438c-2.9062 0-5.1797-0.78125-6.8125-2.3438-1.6367-1.5625-2.4531-3.7227-2.4531-6.4844 0-2.7695 0.81641-4.9375 2.4531-6.5 1.6328-1.5625 3.9062-2.3438 6.8125-2.3438z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m18.172-14.031c0.6875-1.0391 1.4922-1.832 2.4219-2.375 0.9375-0.55078 1.9688-0.82812 3.0938-0.82812 1.9375 0 3.4102 0.60156 4.4219 1.7969 1.0078 1.1875 1.5156 2.918 1.5156 5.1875v10.25h-5.4062v-8.7656c0.007812-0.13281 0.015625-0.26953 0.015625-0.40625 0.007813-0.14453 0.015625-0.34766 0.015625-0.60938 0-1.1875-0.17969-2.0469-0.53125-2.5781-0.35547-0.53906-0.92188-0.8125-1.7031-0.8125-1.0234 0-1.8086 0.42188-2.3594 1.2656-0.55469 0.83594-0.83984 2.0469-0.85938 3.6406v8.2656h-5.4062v-8.7656c0-1.8633-0.16406-3.0625-0.48438-3.5938-0.32422-0.53906-0.89844-0.8125-1.7188-0.8125-1.0312 0-1.8281 0.42188-2.3906 1.2656-0.55469 0.84375-0.82812 2.0547-0.82812 3.625v8.2812h-5.4219v-16.828h5.4219v2.4688c0.65625-0.94531 1.4102-1.6602 2.2656-2.1406 0.85156-0.48828 1.7969-0.73438 2.8281-0.73438 1.1641 0 2.1914 0.28125 3.0781 0.84375 0.89453 0.5625 1.5703 1.3516 2.0312 2.3594z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m18.438-21.719v4.75c-1.2422-0.55078-2.4492-0.96875-3.625-1.25-1.168-0.28125-2.2734-0.42188-3.3125-0.42188-1.375 0-2.3984 0.19531-3.0625 0.57812-0.65625 0.375-0.98438 0.96484-0.98438 1.7656 0 0.60547 0.21875 1.0742 0.65625 1.4062 0.44531 0.33594 1.2578 0.62109 2.4375 0.85938l2.4688 0.5c2.4883 0.5 4.2578 1.2617 5.3125 2.2812 1.0508 1.0234 1.5781 2.4766 1.5781 4.3594 0 2.4688-0.73438 4.3086-2.2031 5.5156-1.4688 1.2109-3.7109 1.8125-6.7188 1.8125-1.4297 0-2.8594-0.13672-4.2969-0.40625-1.4297-0.26953-2.8555-0.67188-4.2812-1.2031v-4.875c1.4258 0.76172 2.8047 1.3359 4.1406 1.7188 1.3438 0.38672 2.6328 0.57812 3.875 0.57812 1.2578 0 2.2227-0.20703 2.8906-0.625 0.67578-0.42578 1.0156-1.0312 1.0156-1.8125 0-0.69531-0.23047-1.2344-0.6875-1.6094-0.44922-0.38281-1.3555-0.72656-2.7188-1.0312l-2.2344-0.5c-2.25-0.47656-3.8984-1.2422-4.9375-2.2969-1.0312-1.0508-1.5469-2.4688-1.5469-4.25 0-2.2383 0.71875-3.957 2.1562-5.1562 1.4453-1.1953 3.5234-1.7969 6.2344-1.7969 1.2266 0 2.4922 0.09375 3.7969 0.28125 1.3008 0.17969 2.6484 0.45312 4.0469 0.82812z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m2.5781-23.375h5.3906v23.375h-5.3906z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m15.734-16.297v4.0781c-1.1562-0.47656-2.2734-0.83594-3.3438-1.0781-1.0742-0.23828-2.0859-0.35938-3.0312-0.35938-1.0234 0-1.7812 0.13281-2.2812 0.39062-0.49219 0.25-0.73438 0.64062-0.73438 1.1719 0 0.42969 0.1875 0.76172 0.5625 1 0.375 0.23047 1.0469 0.39844 2.0156 0.5l0.95312 0.14062c2.75 0.34375 4.5977 0.91797 5.5469 1.7188 0.95703 0.80469 1.4375 2.0625 1.4375 3.7812 0 1.793-0.66406 3.1406-1.9844 4.0469-1.3242 0.89844-3.2969 1.3438-5.9219 1.3438-1.1172 0-2.2656-0.089844-3.4531-0.26562-1.1875-0.17578-2.4062-0.4375-3.6562-0.78125v-4.0938c1.0703 0.52344 2.1719 0.91406 3.2969 1.1719 1.125 0.26172 2.2695 0.39062 3.4375 0.39062 1.0508 0 1.8438-0.14453 2.375-0.4375 0.53125-0.28906 0.79688-0.72266 0.79688-1.2969 0-0.47656-0.18359-0.83203-0.54688-1.0625-0.36719-0.23828-1.0938-0.42188-2.1875-0.54688l-0.95312-0.125c-2.3867-0.30078-4.0625-0.85938-5.0312-1.6719-0.96094-0.8125-1.4375-2.0391-1.4375-3.6875 0-1.7812 0.60938-3.1016 1.8281-3.9688 1.2188-0.86328 3.0938-1.2969 5.625-1.2969 0.98828 0 2.0312 0.078125 3.125 0.23438 1.0938 0.14844 2.2812 0.38281 3.5625 0.70312z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m13.656-23.375v3.5312h-2.9688c-0.76172 0-1.293 0.14062-1.5938 0.42188-0.30469 0.27344-0.45312 0.74609-0.45312 1.4219v1.1719h4.5938v3.8438h-4.5938v12.984h-5.375v-12.984h-2.6875v-3.8438h2.6875v-1.1719c0-1.832 0.50781-3.1875 1.5312-4.0625 1.0195-0.875 2.6016-1.3125 4.75-1.3125z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m19.5-10.25v10.25h-5.4062v-7.8125c0-1.4688-0.039062-2.4766-0.10938-3.0312-0.0625-0.55078-0.17188-0.95703-0.32812-1.2188-0.21094-0.35156-0.49609-0.625-0.85938-0.8125-0.35547-0.19531-0.76562-0.29688-1.2344-0.29688-1.1172 0-1.9961 0.43359-2.6406 1.2969-0.63672 0.86719-0.95312 2.0625-0.95312 3.5938v8.2812h-5.3906v-23.375h5.3906v9.0156c0.80078-0.97656 1.6562-1.7031 2.5625-2.1719 0.91406-0.46875 1.9258-0.70312 3.0312-0.70312 1.9453 0 3.4219 0.60156 4.4219 1.7969 1.0078 1.1875 1.5156 2.918 1.5156 5.1875z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.8281-22.422h6.4531l8.1562 15.375v-15.375h5.4844v22.422h-6.4531l-8.1562-15.391v15.391h-5.4844z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.4062-6.5469v-10.281h5.4062v1.6875c0 0.90625-0.007812 2.0547-0.015625 3.4375-0.011719 1.375-0.015625 2.293-0.015625 2.75 0 1.3555 0.03125 2.3281 0.09375 2.9219 0.070312 0.59375 0.19531 1.0273 0.375 1.2969 0.21875 0.35547 0.50391 0.625 0.85938 0.8125 0.35156 0.1875 0.75781 0.28125 1.2188 0.28125 1.125 0 2.0039-0.42578 2.6406-1.2812 0.64453-0.86328 0.96875-2.0625 0.96875-3.5938v-8.3125h5.375v16.828h-5.375v-2.4375c-0.8125 0.98047-1.6719 1.7031-2.5781 2.1719s-1.9023 0.70312-2.9844 0.70312c-1.9492 0-3.4336-0.59375-4.4531-1.7812-1.0117-1.1953-1.5156-2.9297-1.5156-5.2031z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m19.5-10.25v10.25h-5.4062v-7.8438c0-1.4453-0.039062-2.4453-0.10938-3-0.0625-0.55078-0.17188-0.95703-0.32812-1.2188-0.21094-0.35156-0.49609-0.625-0.85938-0.8125-0.35547-0.19531-0.76562-0.29688-1.2344-0.29688-1.1172 0-1.9961 0.43359-2.6406 1.2969-0.63672 0.86719-0.95312 2.0625-0.95312 3.5938v8.2812h-5.3906v-16.828h5.3906v2.4688c0.80078-0.97656 1.6562-1.7031 2.5625-2.1719 0.91406-0.46875 1.9258-0.70312 3.0312-0.70312 1.9453 0 3.4219 0.60156 4.4219 1.7969 1.0078 1.1875 1.5156 2.918 1.5156 5.1875z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.8281-22.422h9.5938c2.8516 0 5.0391 0.63672 6.5625 1.9062 1.5312 1.2617 2.2969 3.0625 2.2969 5.4062 0 2.3555-0.76562 4.168-2.2969 5.4375-1.5234 1.2617-3.7109 1.8906-6.5625 1.8906h-3.8125v7.7812h-5.7812zm5.7812 4.1875v6.2656h3.2031c1.1133 0 1.9766-0.26953 2.5938-0.8125 0.61328-0.55078 0.92188-1.3281 0.92188-2.3281s-0.30859-1.7695-0.92188-2.3125c-0.61719-0.53906-1.4805-0.8125-2.5938-0.8125z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m2.5781-16.828h5.3906v16.531c0 2.25-0.54297 3.9688-1.625 5.1562-1.0859 1.1875-2.6523 1.7812-4.7031 1.7812h-2.6562v-3.5312h0.92188c1.0195 0 1.7188-0.23047 2.0938-0.6875 0.38281-0.46094 0.57812-1.3672 0.57812-2.7188zm0-6.5469h5.3906v4.3906h-5.3906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m16.172-16.297v4.3906c-0.73047-0.5-1.4648-0.86719-2.2031-1.1094-0.73047-0.25-1.4922-0.375-2.2812-0.375-1.5 0-2.6719 0.44531-3.5156 1.3281-0.83594 0.875-1.25 2.1016-1.25 3.6719 0 1.5742 0.41406 2.7969 1.25 3.6719 0.84375 0.875 2.0156 1.3125 3.5156 1.3125 0.84375 0 1.6406-0.125 2.3906-0.375 0.75781-0.25 1.457-0.61719 2.0938-1.1094v4.3906c-0.83594 0.3125-1.6875 0.54688-2.5625 0.70312-0.86719 0.15625-1.7305 0.23438-2.5938 0.23438-3.043 0-5.418-0.77344-7.125-2.3281-1.7109-1.5625-2.5625-3.7266-2.5625-6.5 0-2.7812 0.85156-4.9453 2.5625-6.5 1.707-1.5625 4.082-2.3438 7.125-2.3438 0.875 0 1.7383 0.078125 2.5938 0.23438 0.86328 0.15625 1.7188 0.39062 2.5625 0.70312z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="m 422.21827,343.6016 c 0.009,-0.009 0.0247,-0.009 0.034,-0.0247 -0.11733,-0.40448 -0.20378,-0.82749 -0.32111,-1.22578 -0.0154,-0.009 -0.034,-0.0185 -0.0679,-0.0278 l -63.84419,-28.97978 c -0.68235,5.09755 -1.16405,10.26275 -1.16405,15.55221 0,27.39578 9.60197,52.54679 25.53752,72.40596 z"
+     id="path70"
+     style="fill:#ffffff;stroke-width:0.790415" />
+  <path
+     d="m 472.29106,381.53361 c -1.60865,-0.0278 -3.19565,-0.0926 -4.76098,-0.24391 l -49.57404,49.70999 c 16.32997,8.8147 35.01301,13.83226 54.82871,13.83226 15.32062,0 29.92432,-3.05978 43.3187,-8.48116 l -43.80954,-54.79788 c -0.003,-0.009 -0.003,-0.0185 -0.003,-0.0185 z"
+     id="path72"
+     style="fill:#ffffff;stroke-width:0.790415" />
+  <path
+     d="m 439.91566,328.89988 c 0,18.12738 14.74915,32.8702 32.86072,32.8702 18.11473,0 32.86071,-14.74282 32.86071,-32.8702 0,-18.10841 -14.74282,-32.85123 -32.86071,-32.85123 -18.1179,-0.003 -32.86072,14.73966 -32.86072,32.85123 z"
+     id="path74"
+     style="fill:#ffffff;stroke-width:0.790415" />
+  <path
+     d="m 441.40164,286.73124 c 0.63295,-0.48166 1.25044,-0.9911 1.91739,-1.43879 v -0.0247 l 6.30791,-69.95489 c -32.40069,6.59506 -59.81861,26.80613 -76.28453,54.30704 l 67.95751,17.08324 c 0.0278,-0.003 0.0617,0.0154 0.10189,0.0278 z"
+     id="path76"
+     style="fill:#ffffff;stroke-width:0.790415" />
+  <path
+     d="m 521.42326,349.00804 c 0,0.009 0.009,0.009 0.0185,0.0278 l 33.29939,61.76935 c 20.97367,-20.99817 33.96018,-49.95976 33.96018,-81.91071 0,-3.5507 -0.21304,-7.04892 -0.52488,-10.522 l -65.11676,26.15799 c -0.47857,1.54068 -1.02817,3.01962 -1.63639,4.47699 z"
+     id="path78"
+     style="fill:#ffffff;stroke-width:0.790415" />
+  <path
+     d="m 502.23988,285.29268 c 1.30292,0.87689 2.56269,1.834 3.78538,2.83127 0.0154,0 0.0278,-0.0185 0.0494,-0.0185 l 68.77875,-14.101 c -16.08652,-29.76703 -44.7944,-51.75084 -78.91503,-58.70096 l 6.30482,69.95489 c -0.003,0.009 -0.003,0.0185 -0.003,0.034 z"
+     id="path80"
+     style="fill:#ffffff;stroke-width:0.790415" />
+  <path
+     d="m 472.78112,545.22855 c 119.28943,0 216.33658,-97.04715 216.33658,-216.33658 -0.006,-119.28152 -97.05506,-216.32867 -216.33658,-216.32867 -119.29733,0 -216.33658,97.04715 -216.33658,216.33658 0,119.28152 97.03925,216.33658 216.33658,216.33658 z m 0,-352.04292 c 74.83333,0 135.71425,60.8746 135.71425,135.70634 0,74.83649 -60.88962,135.72216 -135.71425,135.72216 -74.83017,0 -135.70635,-60.88962 -135.70635,-135.71425 -0.003,-74.83017 60.87144,-135.71425 135.70635,-135.71425 z"
+     id="path82"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:0.790415" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.5, 4.5;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="m 285.31711,526.77082 c 0,6.33833 -6.37713,16.40879 -17.78034,16.40879 -33.14464,0 -208.835213,0.42024 -237.241103,0.48039 -16.9089,-0.0887 -21.9952002,-9.51962 -21.9952002,-16.88918 0,-7.94089 5.5219502,-16.37784 22.4310602,-16.37784 27.21531,0 205.555003,-8.1e-4 234.197003,-8.1e-4 14.14821,0.11377 20.38858,9.28755 20.38858,16.37865 z"
+     id="path1035"
+     sodipodi:nodetypes="sccsccs" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.5, 4.5;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+     d="m 217.97744,429.95377 c 0,6.33834 -6.37713,16.40879 -17.78034,16.40879 -33.14464,0 -87.33521,0.42024 -115.741101,0.48039 -16.90889,-0.0887 -21.9952,-9.51962 -21.9952,-16.88918 0,-7.94088 5.52195,-16.37784 22.43106,-16.37784 27.215311,0 84.055001,-8.1e-4 112.697001,-8.1e-4 14.14821,0.11378 20.38858,9.28756 20.38858,16.37865 z"
+     id="path1035-3"
+     sodipodi:nodetypes="sccsccs" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:0.5;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.5, 4.5;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000"
+     d="m 204.54871,332.66754 c 0,6.33833 -6.37713,16.40879 -17.78034,16.40879 -33.14464,0 -43.83521,0.42024 -72.24111,0.48039 -16.908885,-0.0887 -21.995195,-9.51962 -21.995195,-16.88918 0,-7.94089 5.52195,-16.37784 22.431065,-16.37784 27.21531,0 40.555,-8.1e-4 69.197,-8.1e-4 14.14821,0.11377 20.38858,9.28755 20.38858,16.37865 z"
+     id="path1035-5"
+     sodipodi:nodetypes="sccsccs" />
+</svg>
diff --git a/Content/Slate/SodaIcons/tool.svg b/Content/Slate/SodaIcons/tool.svg
new file mode 100644
index 0000000..aae3c7f
--- /dev/null
+++ b/Content/Slate/SodaIcons/tool.svg
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg160"
+   sodipodi:docname="Tool.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata164">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview162"
+     showgrid="false"
+     inkscape:pagecheckerboard="true"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="412.02852"
+     inkscape:cy="531.00978"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg160"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs68">
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m14.312-14.828v3.7188c-1.043-0.4375-2.0547-0.76562-3.0312-0.98438-0.98047-0.21875-1.9023-0.32812-2.7656-0.32812-0.92969 0-1.6211 0.11719-2.0781 0.34375-0.44922 0.23047-0.67188 0.58984-0.67188 1.0781 0 0.38672 0.17188 0.68359 0.51562 0.89062 0.34375 0.21094 0.95703 0.36719 1.8438 0.46875l0.85938 0.125c2.5078 0.32422 4.1953 0.85156 5.0625 1.5781 0.86328 0.73047 1.2969 1.8711 1.2969 3.4219 0 1.6367-0.60547 2.8672-1.8125 3.6875-1.1992 0.8125-2.9922 1.2188-5.375 1.2188-1.0234 0-2.0742-0.078125-3.1562-0.23438-1.0742-0.15625-2.1797-0.39453-3.3125-0.71875v-3.7188c0.96875 0.48047 1.9609 0.83984 2.9844 1.0781 1.0312 0.23047 2.0781 0.34375 3.1406 0.34375 0.95703 0 1.6758-0.12891 2.1562-0.39062 0.47656-0.26953 0.71875-0.66406 0.71875-1.1875 0-0.4375-0.16797-0.75781-0.5-0.96875-0.33594-0.21875-0.99609-0.38281-1.9844-0.5l-0.85938-0.10938c-2.1797-0.26953-3.7031-0.77344-4.5781-1.5156-0.875-0.73828-1.3125-1.8594-1.3125-3.3594 0-1.625 0.55078-2.8281 1.6562-3.6094 1.1133-0.78906 2.8203-1.1875 5.125-1.1875 0.89453 0 1.8359 0.074219 2.8281 0.21875 1 0.13672 2.082 0.35156 3.25 0.64062z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.8594-5.2969h4.9219v5.2969h-4.9219z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m12.766-2.5938c-0.66797 0.88672-1.4062 1.543-2.2188 1.9688-0.8125 0.41797-1.7578 0.625-2.8281 0.625-1.8672 0-3.4062-0.73438-4.625-2.2031-1.2188-1.4766-1.8281-3.3516-1.8281-5.625 0-2.2891 0.60938-4.1641 1.8281-5.625 1.2188-1.4688 2.7578-2.2031 4.625-2.2031 1.0703 0 2.0156 0.21484 2.8281 0.64062 0.8125 0.41797 1.5508 1.0742 2.2188 1.9688v-2.2656h4.9219v13.766c0 2.457-0.77734 4.3359-2.3281 5.6406-1.5547 1.3008-3.8086 1.9531-6.7656 1.9531-0.94922 0-1.8711-0.074219-2.7656-0.21875-0.89844-0.14844-1.7969-0.37109-2.7031-0.67188v-3.8125c0.86328 0.48828 1.7031 0.85156 2.5156 1.0938 0.82031 0.23828 1.6484 0.35938 2.4844 0.35938 1.6016 0 2.7734-0.35156 3.5156-1.0469 0.75-0.69922 1.125-1.7969 1.125-3.2969zm-3.2188-9.5312c-1.0117 0-1.8047 0.375-2.375 1.125-0.5625 0.74219-0.84375 1.7969-0.84375 3.1719 0 1.3984 0.26953 2.4609 0.8125 3.1875 0.55078 0.71875 1.3516 1.0781 2.4062 1.0781 1.0195 0 1.8125-0.36719 2.375-1.1094 0.5625-0.75 0.84375-1.8008 0.84375-3.1562 0-1.375-0.28125-2.4297-0.84375-3.1719-0.5625-0.75-1.3555-1.125-2.375-1.125z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path65" />
+    </symbol>
+  </defs>
+  <path
+     d="m 314.38317,270.81672 h 68.36573 c 11.49084,-25.13371 17.99202,-53.15894 17.99202,-82.8007 0,-81.27979 -48.33663,-150.856777 -116.9437,-179.9384511 V 210.93665 H 140.65198 V 8.0957835 C 72.04492,37.204779 23.69917,106.74534 23.69917,188.02512 c 0,75.33959 41.569966,140.54739 102.26969,172.87806 l -0.009,333.57521 h 172.5478 v -22.0477 L 190.50044,485.33168 Z"
+     id="path70"
+     style="fill:#ffffff;stroke-width:2.27681" />
+  <path
+     d="M 562.73744,287.48295 H 329.06859 L 212.22278,489.87072 329.06859,692.24029 H 562.71467 L 679.57869,489.87072 Z M 445.91667,572.94919 c -45.89135,0 -83.07618,-37.19395 -83.07618,-83.0944 0,-45.87314 37.19394,-83.10351 83.07618,-83.10351 45.89136,0 83.0944,37.23037 83.0944,83.10351 -0.009,45.90045 -37.21215,83.0944 -83.0944,83.0944 z"
+     id="path72"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:2.27681" />
+</svg>
diff --git a/Content/Slate/SodaIcons/ultrasonic.svg b/Content/Slate/SodaIcons/ultrasonic.svg
new file mode 100644
index 0000000..8781f91
--- /dev/null
+++ b/Content/Slate/SodaIcons/ultrasonic.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg12"
+   sodipodi:docname="Ultrasonic.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#555a3c"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2560"
+     inkscape:window-height="1369"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="252.74663"
+     inkscape:cy="405.02588"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12"
+     inkscape:document-rotation="0" />
+  <path
+     d="m 549.24391,139.69162 c -6.20671,0 -12.44111,-2.29117 -17.25057,-6.92268 -99.6287,-95.706755 -261.69198,-95.706755 -361.32491,0 -9.80159,9.42669 -25.45673,9.19207 -34.97614,-0.47461 -9.51999,-9.69399 -9.30455,-25.16018 0.48041,-34.558943 118.66752,-113.987551 311.64979,-113.987551 430.31026,0 9.78502,9.404903 10.00033,24.871103 0.4804,34.558943 -4.84833,4.91515 -11.27599,7.39737 -17.72556,7.39737 z"
+     id="path2"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.40507" />
+  <path
+     d="m 475.02811,213.01034 c -6.27851,0 -12.58459,-2.36213 -17.39477,-7.06459 -58.61068,-57.32963 -153.98717,-57.32963 -212.59644,0 -9.68566,9.47585 -25.34082,9.44849 -34.98179,-0.19092 -9.61386,-9.56859 -9.51999,-25.06104 0.19327,-34.55896 77.78805,-76.08946 204.38323,-76.08946 282.17552,0 9.71323,9.49764 9.80709,24.99121 0.19327,34.55896 -4.85937,4.84434 -11.2097,7.25547 -17.58702,7.25547 z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.40507" />
+  <path
+     d="m 400.81232,286.32903 c -6.57114,0 -13.14242,-2.58038 -17.99556,-7.68645 -17.00745,-17.80597 -45.94878,-17.80597 -62.95621,0 -9.37083,9.83044 -25.05384,10.31043 -34.95918,1.02558 -9.95071,-9.25757 -10.41452,-24.72306 -1.03814,-34.53659 17.92489,-18.80451 41.89023,-29.16409 67.47276,-29.16409 25.58255,0 49.54929,10.35958 67.47277,29.16409 9.37084,9.8085 8.91805,25.2747 -1.03814,34.53659 -4.75449,4.46239 -10.86732,6.66084 -16.95796,6.66084 z"
+     id="path6"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.40507" />
+  <path
+     d="m 351.36339,696.49485 c -7.51545,0 -14.9308,-3.36596 -19.78522,-9.7377 l -63.53579,-83.43809 -57.32994,18.83104 c -10.5084,3.40952 -22.1771,-0.4746 -28.36034,-9.6176 C 165.27258,587.30807 113.28336,510.47565 61.149938,500.21382 L 24.91425,493.07831 C 13.334614,490.80891 5.0018053,480.76035 5.0018053,469.11356 c 0,-56.46798 59.0192197,-96.2095 144.1058647,-97.51808 l 45.58971,-15.86896 c 7.48788,-2.62396 15.92034,-1.47837 22.51919,3.1041 6.54357,4.57691 10.43107,12.02344 10.43107,19.94968 0,28.15997 24.47283,65.89467 49.4772,65.89467 h 2.29716 c 6.97981,-35.84657 29.95632,-65.96449 71.91863,-65.96449 41.79551,0 64.77272,29.90565 71.82534,65.1084 h 2.39102 c 25.48924,0 49.4772,-36.63701 49.4772,-65.03718 0,-7.85013 3.81568,-15.25309 10.29296,-19.83515 6.42765,-4.60429 14.71027,-5.8972 22.29724,-3.3386 l 45.7551,15.133 c 85.18843,1.23834 144.30378,41.0012 144.30378,97.51807 0,11.64692 -8.33266,21.69534 -19.90679,23.96474 l -36.23568,7.13552 c -52.13342,10.2614 -104.12264,87.08725 -121.20218,112.31867 -6.20669,9.14305 -17.87964,13.00534 -28.36033,9.6176 l -57.32993,-18.83104 -60.87958,79.95231 c -1.66765,3.50771 -4.2023,6.68276 -7.53749,9.16484 -4.47288,3.3168 -9.69118,4.91515 -14.86578,4.91515 z"
+     id="path8"
+     style="fill:#ffffff;stroke-width:1.40507"
+     sodipodi:nodetypes="cccccccscccsscscsscccsccccccccc" />
+</svg>
diff --git a/Content/Slate/SodaIcons/van.svg b/Content/Slate/SodaIcons/van.svg
new file mode 100644
index 0000000..9361f2c
--- /dev/null
+++ b/Content/Slate/SodaIcons/van.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg96"
+   sodipodi:docname="van.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata100">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2b2525"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview98"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="306.08268"
+     inkscape:cy="553.47657"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg96" />
+  <defs
+     id="defs44">
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m29.312-1.75c-1.5117 0.78125-3.0898 1.3711-4.7344 1.7656-1.6367 0.40625-3.3398 0.60938-5.1094 0.60938-5.3125 0-9.5273-1.4844-12.641-4.4531-3.1055-2.9688-4.6562-7-4.6562-12.094s1.5508-9.125 4.6562-12.094c3.1133-2.9688 7.3281-4.4531 12.641-4.4531 1.7695 0 3.4727 0.19922 5.1094 0.59375 1.6445 0.39844 3.2227 0.99219 4.7344 1.7812v6.5938c-1.5312-1.0391-3.0391-1.8008-4.5156-2.2812-1.4805-0.48828-3.0391-0.73438-4.6719-0.73438-2.9375 0-5.2461 0.94531-6.9219 2.8281-1.6797 1.875-2.5156 4.4648-2.5156 7.7656 0 3.293 0.83594 5.8828 2.5156 7.7656 1.6758 1.875 3.9844 2.8125 6.9219 2.8125 1.6328 0 3.1914-0.23828 4.6719-0.71875 1.4766-0.48828 2.9844-1.2539 4.5156-2.2969z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m21.453-17.406c-0.67969-0.3125-1.3516-0.53906-2.0156-0.6875-0.65625-0.15625-1.3203-0.23438-1.9844-0.23438-1.9688 0-3.4844 0.63281-4.5469 1.8906-1.0547 1.2617-1.5781 3.0703-1.5781 5.4219v11.016h-7.6562v-23.922h7.6562v3.9219c0.97656-1.5625 2.1016-2.7031 3.375-3.4219 1.2812-0.71875 2.8125-1.0781 4.5938-1.0781 0.25 0 0.52344 0.011719 0.82812 0.03125 0.30078 0.023438 0.73438 0.070312 1.2969 0.14062z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m27.562-12.031v2.1875h-17.891c0.1875 1.793 0.83203 3.1367 1.9375 4.0312 1.1133 0.89844 2.6719 1.3438 4.6719 1.3438 1.6016 0 3.25-0.23438 4.9375-0.70312 1.6875-0.47656 3.4219-1.2031 5.2031-2.1719v5.8906c-1.8047 0.6875-3.6094 1.2031-5.4219 1.5469-1.8125 0.35156-3.6211 0.53125-5.4219 0.53125-4.3359 0-7.7031-1.0977-10.109-3.2969-2.3984-2.207-3.5938-5.2969-3.5938-9.2656 0-3.9062 1.1758-6.9727 3.5312-9.2031 2.3633-2.2383 5.6094-3.3594 9.7344-3.3594 3.7578 0 6.7695 1.1367 9.0312 3.4062 2.2578 2.2617 3.3906 5.2812 3.3906 9.0625zm-7.8594-2.5312c0-1.457-0.42969-2.6289-1.2812-3.5156-0.84375-0.89453-1.9492-1.3438-3.3125-1.3438-1.4922 0-2.6992 0.41797-3.625 1.25-0.91797 0.83594-1.4922 2.0391-1.7188 3.6094z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m14.391-10.766c-1.5938 0-2.793 0.27344-3.5938 0.8125-0.80469 0.54297-1.2031 1.3398-1.2031 2.3906 0 0.96875 0.32031 1.7305 0.96875 2.2812 0.64453 0.54297 1.5469 0.8125 2.7031 0.8125 1.4375 0 2.6445-0.51562 3.625-1.5469 0.98828-1.0312 1.4844-2.3203 1.4844-3.875v-0.875zm11.688-2.8906v13.656h-7.7031v-3.5469c-1.0312 1.4492-2.1875 2.5078-3.4688 3.1719s-2.8398 1-4.6719 1c-2.4805 0-4.4961-0.72266-6.0469-2.1719-1.543-1.4453-2.3125-3.3203-2.3125-5.625 0-2.8125 0.96094-4.8672 2.8906-6.1719 1.9375-1.3125 4.9688-1.9688 9.0938-1.9688h4.5156v-0.60938c0-1.207-0.48047-2.0938-1.4375-2.6562-0.94922-0.5625-2.4375-0.84375-4.4688-0.84375-1.6367 0-3.1562 0.16797-4.5625 0.5-1.4062 0.32422-2.7188 0.8125-3.9375 1.4688v-5.8281c1.6445-0.40625 3.2891-0.70703 4.9375-0.90625 1.6562-0.20703 3.3047-0.3125 4.9531-0.3125 4.3203 0 7.4375 0.85547 9.3438 2.5625 1.9141 1.6992 2.875 4.4609 2.875 8.2812z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m12.031-30.719v6.7969h7.875v5.4688h-7.875v10.141c0 1.1172 0.21875 1.8711 0.65625 2.2656 0.4375 0.38672 1.3125 0.57812 2.625 0.57812h3.9375v5.4688h-6.5625c-3.0234 0-5.1641-0.62891-6.4219-1.8906-1.2617-1.2578-1.8906-3.3984-1.8906-6.4219v-10.141h-3.7969v-5.4688h3.7969v-6.7969z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m19.953-20.422v-12.812h7.6875v33.234h-7.6875v-3.4531c-1.0547 1.4062-2.2148 2.4375-3.4844 3.0938-1.2734 0.65625-2.7422 0.98438-4.4062 0.98438-2.9492 0-5.3711-1.1719-7.2656-3.5156-1.8867-2.3438-2.8281-5.3594-2.8281-9.0469s0.94141-6.7031 2.8281-9.0469c1.8945-2.3438 4.3164-3.5156 7.2656-3.5156 1.6562 0 3.1172 0.33594 4.3906 1 1.2812 0.65625 2.4453 1.6836 3.5 3.0781zm-5.0469 15.484c1.6445 0 2.8945-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.85547-1.1953-2.1055-1.7969-3.75-1.7969-1.625 0-2.8711 0.60156-3.7344 1.7969-0.85547 1.1992-1.2812 2.9375-1.2812 5.2188 0 2.2734 0.42578 4.0078 1.2812 5.2031 0.86328 1.1992 2.1094 1.7969 3.7344 1.7969z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m16.406-4.9375c1.6328 0 2.8828-0.59766 3.75-1.7969 0.86328-1.1953 1.2969-2.9297 1.2969-5.2031 0-2.2812-0.43359-4.0195-1.2969-5.2188-0.86719-1.1953-2.1172-1.7969-3.75-1.7969-1.6367 0-2.8906 0.60547-3.7656 1.8125-0.875 1.1992-1.3125 2.9336-1.3125 5.2031 0 2.2617 0.4375 3.9961 1.3125 5.2031 0.875 1.1992 2.1289 1.7969 3.7656 1.7969zm-5.0781-15.484c1.0508-1.3945 2.2188-2.4219 3.5-3.0781 1.2812-0.66406 2.7539-1 4.4219-1 2.9453 0 5.3672 1.1719 7.2656 3.5156 1.8945 2.3438 2.8438 5.3594 2.8438 9.0469s-0.94922 6.7031-2.8438 9.0469c-1.8984 2.3438-4.3203 3.5156-7.2656 3.5156-1.668 0-3.1406-0.33594-4.4219-1s-2.4492-1.6914-3.5-3.0781v3.4531h-7.6562v-33.234h7.6562z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m0.53125-23.922h7.6562l6.4219 16.234 5.4688-16.234h7.6562l-10.062 26.188c-1.0117 2.6641-2.1953 4.5234-3.5469 5.5781-1.3438 1.0625-3.1211 1.5938-5.3281 1.5938h-4.4219v-5.0156h2.3906c1.3008 0 2.2422-0.21094 2.8281-0.625 0.59375-0.40625 1.0547-1.1484 1.3906-2.2188l0.20312-0.65625z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m0.21875-31.891h8.2656l8.4531 23.531 8.4375-23.531h8.2656l-11.812 31.891h-9.7969z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m23-23.172v6.2344c-1.0312-0.71875-2.0742-1.2422-3.125-1.5781-1.043-0.34375-2.125-0.51562-3.25-0.51562-2.1367 0-3.8047 0.625-5 1.875-1.1875 1.2422-1.7812 2.9805-1.7812 5.2188 0 2.2305 0.59375 3.9688 1.7812 5.2188 1.1953 1.25 2.8633 1.875 5 1.875 1.1953 0 2.332-0.17578 3.4062-0.53125 1.0703-0.36328 2.0625-0.89453 2.9688-1.5938v6.2656c-1.1875 0.4375-2.4023 0.76562-3.6406 0.98438-1.2305 0.22656-2.4648 0.34375-3.7031 0.34375-4.3125 0-7.6875-1.1094-10.125-3.3281s-3.6562-5.2969-3.6562-9.2344c0-3.9453 1.2188-7.0234 3.6562-9.2344 2.4375-2.2188 5.8125-3.3281 10.125-3.3281 1.25 0 2.4844 0.10938 3.7031 0.32812s2.4297 0.55469 3.6406 1z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m15.062-19.031c-1.6992 0-2.9961 0.60938-3.8906 1.8281-0.88672 1.2188-1.3281 2.9766-1.3281 5.2656 0 2.293 0.44141 4.0469 1.3281 5.2656 0.89453 1.2188 2.1914 1.8281 3.8906 1.8281 1.6641 0 2.9375-0.60938 3.8125-1.8281 0.88281-1.2188 1.3281-2.9727 1.3281-5.2656 0-2.2891-0.44531-4.0469-1.3281-5.2656-0.875-1.2188-2.1484-1.8281-3.8125-1.8281zm0-5.4688c4.1133 0 7.3281 1.1094 9.6406 3.3281s3.4688 5.2969 3.4688 9.2344c0 3.9297-1.1562 7.0078-3.4688 9.2344-2.3125 2.2188-5.5273 3.3281-9.6406 3.3281-4.1367 0-7.3711-1.1094-9.7031-3.3281-2.3242-2.2266-3.4844-5.3047-3.4844-9.2344 0-3.9375 1.1602-7.0156 3.4844-9.2344 2.332-2.2188 5.5664-3.3281 9.7031-3.3281z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m22.359-23.172v5.7969c-1.6367-0.67578-3.2148-1.1875-4.7344-1.5312-1.5234-0.34375-2.9609-0.51562-4.3125-0.51562-1.4609 0-2.543 0.18359-3.25 0.54688-0.69922 0.36719-1.0469 0.92188-1.0469 1.6719 0 0.61719 0.26562 1.0898 0.79688 1.4219 0.53125 0.32422 1.4883 0.5625 2.875 0.71875l1.3438 0.1875c3.9141 0.5 6.5508 1.3242 7.9062 2.4688 1.3516 1.1367 2.0312 2.9219 2.0312 5.3594 0 2.5547-0.94531 4.4688-2.8281 5.75-1.875 1.2812-4.6797 1.9219-8.4062 1.9219-1.5859 0-3.2188-0.125-4.9062-0.375s-3.4219-0.625-5.2031-1.125v-5.8125c1.5195 0.74219 3.082 1.2969 4.6875 1.6719 1.6016 0.36719 3.2344 0.54688 4.8906 0.54688 1.4883 0 2.6094-0.20312 3.3594-0.60938 0.75781-0.41406 1.1406-1.0312 1.1406-1.8438 0-0.6875-0.26172-1.1953-0.78125-1.5312-0.52344-0.33203-1.5586-0.59375-3.1094-0.78125l-1.3438-0.17188c-3.4062-0.42578-5.793-1.2109-7.1562-2.3594-1.3672-1.1562-2.0469-2.9102-2.0469-5.2656 0-2.5312 0.86719-4.4062 2.6094-5.625 1.7383-1.2266 4.3984-1.8438 7.9844-1.8438 1.4062 0 2.8828 0.10938 4.4375 0.32812 1.5508 0.21094 3.2383 0.54297 5.0625 1z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m4.0156-31.891h10.469l7.2656 17.062 7.2969-17.062h10.453v31.891h-7.7812v-23.328l-7.3438 17.203h-5.2188l-7.3438-17.203v23.328h-7.7969z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m3.6719-33.234h7.6562v18.094l8.7969-8.7812h8.8906l-11.688 10.969 12.594 12.953h-9.2656l-9.3281-9.9688v9.9688h-7.6562z"
+         id="path41" />
+    </symbol>
+  </defs>
+  <path
+     d="m 550.41854,423.58856 c -34.17834,0 -61.79327,27.61492 -61.79327,61.79325 0,34.17835 27.60526,61.79327 61.79327,61.79327 34.188,0 61.79325,-27.60526 61.79325,-61.79327 -0.009,-34.18799 -27.61491,-61.79325 -61.79325,-61.79325 z m 0,83.36896 c -11.93217,0 -21.58054,-9.64861 -21.58054,-21.58053 0,-11.93217 9.64861,-21.58054 21.58054,-21.58054 11.93215,0 21.58053,9.64861 21.58053,21.58054 -0.009,11.92745 -9.65803,21.58053 -21.58053,21.58053 z"
+     id="path46"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.20784" />
+  <path
+     d="m 149.4629,423.58856 c -34.04185,0 -61.783585,27.61492 -61.783585,61.79325 0,34.17835 27.742945,61.79327 61.783585,61.79327 34.17834,0 61.9213,-27.60526 61.9213,-61.79327 0,-34.18799 -27.74296,-61.79325 -61.9213,-61.79325 z m 0,83.36896 c -11.93216,0 -21.58053,-9.64861 -21.58053,-21.58053 0,-11.93217 9.64862,-21.58054 21.58053,-21.58054 11.93192,0 21.71702,9.64861 21.71702,21.58054 -0.009,11.92745 -9.79488,21.58053 -21.71702,21.58053 z"
+     id="path48"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.20784" />
+  <path
+     d="m 656.97446,385.38448 c -9.28058,0 -16.80592,-7.52547 -16.80592,-16.70689 0,-9.28059 7.53488,-16.80593 16.80592,-16.80593 h 29.57284 c -4.13312,-17.26853 -15.60775,-32.32913 -31.86652,-40.5944 -12.30069,-6.34118 -22.13253,-16.52813 -27.82751,-29.10661 L 588.7446,199.52277 c -16.4327,-35.81496 -52.25371,-58.77365 -91.55572,-58.77365 l -464.99547,0.005 c -11.299977,-0.0145 -20.387186,9.1717 -20.387186,20.37226 v 307.19077 c 0,11.29997 9.087088,20.38718 20.387186,20.38718 h 28.832423 c -0.179295,-1.01439 -0.179295,-2.29297 -0.179295,-3.30743 0,-48.94181 39.853992,-88.61584 88.615832,-88.61584 48.9418,0 88.71488,39.67524 88.71488,88.61584 0,1.01439 0,2.29296 -0.0943,3.30743 h 223.83751 c -0.0943,-1.01439 -0.0943,-2.29297 -0.0943,-3.30743 0,-48.94181 39.76944,-88.61584 88.61583,-88.61584 48.86088,0 88.52162,39.67524 88.52162,88.61584 0,1.01439 0,2.29296 -0.0943,3.30743 h 23.87423 c 14.04601,0 25.43959,-11.38018 25.43959,-25.43959 V 385.38689 Z M 410.03092,293.82875 V 180.96667 h 87.1483 c 23.60005,0 45.18059,13.86605 55.00881,35.26782 l 35.07939,76.49512 c 0.27364,0.27366 0.36801,0.73132 0.64639,1.09934 z"
+     id="path50"
+     style="fill:#ffffff;stroke-width:1.20784" />
+</svg>
diff --git a/Content/Slate/SodaIcons/walking.svg b/Content/Slate/SodaIcons/walking.svg
new file mode 100644
index 0000000..26ae2d9
--- /dev/null
+++ b/Content/Slate/SodaIcons/walking.svg
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg151"
+   sodipodi:docname="walking.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata155">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2b2b28"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview153"
+     showgrid="false"
+     inkscape:zoom="0.45107143"
+     inkscape:cx="137.25745"
+     inkscape:cy="476.85589"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg151" />
+  <defs
+     id="defs65">
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m18.766-1.125c-0.96875 0.5-1.9805 0.875-3.0312 1.125-1.043 0.25781-2.1367 0.39062-3.2812 0.39062-3.3984 0-6.0898-0.94531-8.0781-2.8438-1.9922-1.9062-2.9844-4.4844-2.9844-7.7344 0-3.2578 0.99219-5.8359 2.9844-7.7344 1.9883-1.9062 4.6797-2.8594 8.0781-2.8594 1.1445 0 2.2383 0.13281 3.2812 0.39062 1.0508 0.25 2.0625 0.625 3.0312 1.125v4.2188c-0.98047-0.65625-1.9453-1.1406-2.8906-1.4531-0.94922-0.3125-1.9492-0.46875-3-0.46875-1.875 0-3.3516 0.60547-4.4219 1.8125-1.0742 1.1992-1.6094 2.8555-1.6094 4.9688 0 2.1055 0.53516 3.7617 1.6094 4.9688 1.0703 1.1992 2.5469 1.7969 4.4219 1.7969 1.0508 0 2.0508-0.14844 3-0.45312 0.94531-0.3125 1.9102-0.80078 2.8906-1.4688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m13.734-11.141c-0.4375-0.19531-0.87109-0.34375-1.2969-0.4375-0.41797-0.10156-0.83984-0.15625-1.2656-0.15625-1.2617 0-2.2305 0.40625-2.9062 1.2188-0.67969 0.80469-1.0156 1.9531-1.0156 3.4531v7.0625h-4.8906v-15.312h4.8906v2.5156c0.625-1 1.3438-1.7266 2.1562-2.1875 0.82031-0.46875 1.8008-0.70312 2.9375-0.70312 0.16406 0 0.34375 0.011719 0.53125 0.03125 0.19531 0.011719 0.47656 0.039062 0.84375 0.078125z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m17.641-7.7031v1.4062h-11.453c0.125 1.1484 0.53906 2.0078 1.25 2.5781 0.70703 0.57422 1.7031 0.85938 2.9844 0.85938 1.0312 0 2.082-0.14844 3.1562-0.45312 1.082-0.3125 2.1914-0.77344 3.3281-1.3906v3.7656c-1.1562 0.4375-2.3125 0.76562-3.4688 0.98438-1.1562 0.22656-2.3125 0.34375-3.4688 0.34375-2.7734 0-4.9297-0.70312-6.4688-2.1094-1.5312-1.4062-2.2969-3.3789-2.2969-5.9219 0-2.5 0.75391-4.4609 2.2656-5.8906 1.5078-1.4375 3.582-2.1562 6.2188-2.1562 2.4062 0 4.332 0.73047 5.7812 2.1875 1.4453 1.4492 2.1719 3.3828 2.1719 5.7969zm-5.0312-1.625c0-0.92578-0.27344-1.6719-0.8125-2.2344-0.54297-0.57031-1.25-0.85938-2.125-0.85938-0.94922 0-1.7188 0.26562-2.3125 0.79688s-0.96484 1.2969-1.1094 2.2969z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m9.2188-6.8906c-1.0234 0-1.793 0.17188-2.3125 0.51562-0.51172 0.34375-0.76562 0.85547-0.76562 1.5312 0 0.625 0.20703 1.1172 0.625 1.4688 0.41406 0.34375 0.98828 0.51562 1.7188 0.51562 0.92578 0 1.7031-0.32812 2.3281-0.98438 0.63281-0.66406 0.95312-1.4922 0.95312-2.4844v-0.5625zm7.4688-1.8438v8.7344h-4.9219v-2.2656c-0.65625 0.92969-1.3984 1.6055-2.2188 2.0312-0.82422 0.41406-1.8242 0.625-3 0.625-1.5859 0-2.8711-0.45703-3.8594-1.375-0.99219-0.92578-1.4844-2.1289-1.4844-3.6094 0-1.7891 0.61328-3.1016 1.8438-3.9375 1.2383-0.84375 3.1797-1.2656 5.8281-1.2656h2.8906v-0.39062c0-0.76953-0.30859-1.332-0.92188-1.6875-0.61719-0.36328-1.5703-0.54688-2.8594-0.54688-1.0547 0-2.0312 0.10547-2.9375 0.3125-0.89844 0.21094-1.7305 0.52344-2.5 0.9375v-3.7344c1.0391-0.25 2.0859-0.44141 3.1406-0.57812 1.0625-0.13281 2.125-0.20312 3.1875-0.20312 2.7578 0 4.75 0.54688 5.9688 1.6406 1.2266 1.0859 1.8438 2.8555 1.8438 5.3125z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m7.7031-19.656v4.3438h5.0469v3.5h-5.0469v6.5c0 0.71094 0.14062 1.1875 0.42188 1.4375s0.83594 0.375 1.6719 0.375h2.5156v3.5h-4.1875c-1.9375 0-3.3125-0.39844-4.125-1.2031-0.80469-0.8125-1.2031-2.1797-1.2031-4.1094v-6.5h-2.4219v-3.5h2.4219v-4.3438z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m12.766-13.078v-8.2031h4.9219v21.281h-4.9219v-2.2188c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2969 1.8125-5.7969 1.207-1.5 2.7539-2.25 4.6406-2.25 1.0625 0 2 0.21484 2.8125 0.64062 0.82031 0.42969 1.5664 1.0859 2.2344 1.9688zm-3.2188 9.9219c1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m10.5-3.1562c1.0508 0 1.8516-0.37891 2.4062-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3555-1.1562-2.4062-1.1562-1.0547 0-1.8594 0.38672-2.4219 1.1562-0.55469 0.77344-0.82812 1.8828-0.82812 3.3281 0 1.4492 0.27344 2.5586 0.82812 3.3281 0.5625 0.77344 1.3672 1.1562 2.4219 1.1562zm-3.25-9.9219c0.67578-0.88281 1.4219-1.5391 2.2344-1.9688 0.82031-0.42578 1.7656-0.64062 2.8281-0.64062 1.8945 0 3.4453 0.75 4.6562 2.25 1.207 1.5 1.8125 3.4336 1.8125 5.7969 0 2.3555-0.60547 4.2812-1.8125 5.7812-1.2109 1.5-2.7617 2.25-4.6562 2.25-1.0625 0-2.0078-0.21094-2.8281-0.625-0.8125-0.42578-1.5586-1.0859-2.2344-1.9844v2.2188h-4.8906v-21.281h4.8906z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m0.34375-15.312h4.8906l4.125 10.391 3.5-10.391h4.8906l-6.4375 16.766c-0.64844 1.6953-1.4023 2.8828-2.2656 3.5625-0.86719 0.6875-2 1.0312-3.4062 1.0312h-2.8438v-3.2188h1.5312c0.83203 0 1.4375-0.13672 1.8125-0.40625 0.38281-0.26172 0.67969-0.73047 0.89062-1.4062l0.14062-0.42188z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m14.953-3.7188h-8.2188l-1.3125 3.7188h-5.2812l7.5625-20.406h6.2656l7.5625 20.406h-5.2812zm-6.9062-3.7812h5.5781l-2.7812-8.125z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.312h-4.8906zm0-5.9688h4.8906v4h-4.8906z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1406c0-1.3203-0.03125-2.2344-0.09375-2.7344s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-15.312h4.8906v2.2344c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m9.6406-12.188c-1.0859 0-1.9141 0.39062-2.4844 1.1719-0.57422 0.78125-0.85938 1.9062-0.85938 3.375s0.28516 2.5938 0.85938 3.375c0.57031 0.77344 1.3984 1.1562 2.4844 1.1562 1.0625 0 1.875-0.38281 2.4375-1.1562 0.57031-0.78125 0.85938-1.9062 0.85938-3.375s-0.28906-2.5938-0.85938-3.375c-0.5625-0.78125-1.375-1.1719-2.4375-1.1719zm0-3.5c2.6328 0 4.6914 0.71484 6.1719 2.1406 1.4766 1.418 2.2188 3.3867 2.2188 5.9062 0 2.5117-0.74219 4.4805-2.2188 5.9062-1.4805 1.418-3.5391 2.125-6.1719 2.125-2.6484 0-4.7148-0.70703-6.2031-2.125-1.4922-1.4258-2.2344-3.3945-2.2344-5.9062 0-2.5195 0.74219-4.4883 2.2344-5.9062 1.4883-1.4258 3.5547-2.1406 6.2031-2.1406z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m9.5469-12.125c-1.043 0-1.8398 0.38672-2.3906 1.1562-0.55469 0.76172-0.82812 1.8711-0.82812 3.3281 0 1.4609 0.27344 2.5742 0.82812 3.3438 0.55078 0.76172 1.3477 1.1406 2.3906 1.1406 1.0391 0 1.8359-0.37891 2.3906-1.1406 0.55078-0.76953 0.82812-1.8828 0.82812-3.3438 0-1.457-0.27734-2.5664-0.82812-3.3281-0.55469-0.76953-1.3516-1.1562-2.3906-1.1562zm3.2188 9.9062c-0.66797 0.90625-1.4062 1.5703-2.2188 1.9844s-1.7578 0.625-2.8281 0.625c-1.8867 0-3.4336-0.75-4.6406-2.25-1.2109-1.5-1.8125-3.4258-1.8125-5.7812 0-2.3633 0.60156-4.2891 1.8125-5.7812 1.207-1.4883 2.7539-2.2344 4.6406-2.2344 1.0703 0 2.0156 0.21484 2.8281 0.64062 0.8125 0.41797 1.5508 1.0742 2.2188 1.9688v-2.2656h4.9219v21.141h-4.9219z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m2.1875-5.9688v-9.3438h4.9219v1.5312c0 0.83594-0.007813 1.875-0.015625 3.125-0.011719 1.25-0.015625 2.0859-0.015625 2.5 0 1.2422 0.03125 2.1328 0.09375 2.6719 0.070313 0.54297 0.17969 0.93359 0.32812 1.1719 0.20703 0.32422 0.47266 0.57422 0.79688 0.75 0.32031 0.16797 0.69141 0.25 1.1094 0.25 1.0195 0 1.8203-0.39062 2.4062-1.1719 0.58203-0.78125 0.875-1.8672 0.875-3.2656v-7.5625h4.8906v15.312h-4.8906v-2.2188c-0.74219 0.89844-1.5234 1.5586-2.3438 1.9844-0.82422 0.41406-1.7344 0.625-2.7344 0.625-1.7617 0-3.1055-0.53906-4.0312-1.625-0.92969-1.082-1.3906-2.6602-1.3906-4.7344z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m12.422-21.281v3.2188h-2.7031c-0.6875 0-1.1719 0.125-1.4531 0.375-0.27344 0.25-0.40625 0.6875-0.40625 1.3125v1.0625h4.1875v3.5h-4.1875v11.812h-4.8906v-11.812h-2.4375v-3.5h2.4375v-1.0625c0-1.6641 0.46094-2.8984 1.3906-3.7031 0.92578-0.80078 2.3672-1.2031 4.3281-1.2031z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m16.547-12.766c0.61328-0.94531 1.3477-1.6719 2.2031-2.1719 0.85156-0.5 1.7891-0.75 2.8125-0.75 1.7578 0 3.0977 0.54688 4.0156 1.6406 0.92578 1.0859 1.3906 2.6562 1.3906 4.7188v9.3281h-4.9219v-7.9844-0.35938c0.007813-0.13281 0.015625-0.32031 0.015625-0.5625 0-1.082-0.16406-1.8633-0.48438-2.3438-0.3125-0.48828-0.82422-0.73438-1.5312-0.73438-0.92969 0-1.6484 0.38672-2.1562 1.1562-0.51172 0.76172-0.77344 1.8672-0.78125 3.3125v7.5156h-4.9219v-7.9844c0-1.6953-0.14844-2.7852-0.4375-3.2656-0.29297-0.48828-0.8125-0.73438-1.5625-0.73438-0.9375 0-1.6641 0.38672-2.1719 1.1562-0.51172 0.76172-0.76562 1.8594-0.76562 3.2969v7.5312h-4.9219v-15.312h4.9219v2.2344c0.60156-0.86328 1.2891-1.5156 2.0625-1.9531 0.78125-0.4375 1.6406-0.65625 2.5781-0.65625 1.0625 0 2 0.25781 2.8125 0.76562 0.8125 0.51172 1.4258 1.2305 1.8438 2.1562z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m17.75-9.3281v9.3281h-4.9219v-7.1094c0-1.3438-0.03125-2.2656-0.09375-2.7656s-0.16797-0.86719-0.3125-1.1094c-0.1875-0.3125-0.44922-0.55469-0.78125-0.73438-0.32422-0.17578-0.69531-0.26562-1.1094-0.26562-1.0234 0-1.8242 0.39844-2.4062 1.1875-0.58594 0.78125-0.875 1.8711-0.875 3.2656v7.5312h-4.8906v-21.281h4.8906v8.2031c0.73828-0.88281 1.5195-1.5391 2.3438-1.9688 0.83203-0.42578 1.75-0.64062 2.75-0.64062 1.7695 0 3.1133 0.54688 4.0312 1.6406 0.91406 1.0859 1.375 2.6562 1.375 4.7188z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h5.875l7.4219 14v-14h4.9844v20.406h-5.875l-7.4219-14v14h-4.9844z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m2.5781-20.406h8.7344c2.5938 0 4.582 0.57812 5.9688 1.7344 1.3945 1.1484 2.0938 2.7891 2.0938 4.9219 0 2.1367-0.69922 3.7812-2.0938 4.9375-1.3867 1.1562-3.375 1.7344-5.9688 1.7344h-3.4844v7.0781h-5.25zm5.25 3.8125v5.7031h2.9219c1.0195 0 1.8047-0.25 2.3594-0.75 0.5625-0.5 0.84375-1.2031 0.84375-2.1094 0-0.91406-0.28125-1.6172-0.84375-2.1094-0.55469-0.48828-1.3398-0.73438-2.3594-0.73438z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m2.3594-15.312h4.8906v15.031c0 2.0508-0.49609 3.6172-1.4844 4.7031-0.98047 1.082-2.4062 1.625-4.2812 1.625h-2.4219v-3.2188h0.85938c0.92578 0 1.5625-0.21094 1.9062-0.625 0.35156-0.41797 0.53125-1.2461 0.53125-2.4844zm0-5.9688h4.8906v4h-4.8906z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m14.719-14.828v3.9844c-0.65625-0.45703-1.3242-0.79688-2-1.0156-0.66797-0.21875-1.3594-0.32812-2.0781-0.32812-1.3672 0-2.4336 0.40234-3.2031 1.2031-0.76172 0.79297-1.1406 1.9062-1.1406 3.3438 0 1.4297 0.37891 2.543 1.1406 3.3438 0.76953 0.79297 1.8359 1.1875 3.2031 1.1875 0.75781 0 1.4844-0.10938 2.1719-0.32812 0.6875-0.22656 1.3203-0.56641 1.9062-1.0156v4c-0.76172 0.28125-1.5391 0.48828-2.3281 0.625-0.78125 0.14453-1.5742 0.21875-2.375 0.21875-2.7617 0-4.9219-0.70703-6.4844-2.125-1.5547-1.4141-2.3281-3.3828-2.3281-5.9062 0-2.5312 0.77344-4.5039 2.3281-5.9219 1.5625-1.4141 3.7227-2.125 6.4844-2.125 0.80078 0 1.5938 0.074219 2.375 0.21875 0.78125 0.13672 1.5547 0.35156 2.3281 0.64062z"
+         id="path62" />
+    </symbol>
+  </defs>
+  <path
+     d="m 575.9802,308.7352 -35.256,-70.51201 c -8.45993,-16.92414 -23.26896,-30.31765 -40.89697,-37.37136 -77.56572,-30.31765 -87.43615,-29.61505 -95.19373,-28.91119 l -52.884,3.52661 c -16.21651,0.70335 -27.49969,4.93823 -81.79519,84.61315 -2.11499,2.81834 -4.93824,4.93824 -9.16808,5.64159 l -64.87104,9.87143 c -17.62801,2.81834 -29.61505,19.0395 -26.79583,36.66751 2.81834,17.628 19.0395,29.61504 36.66751,26.79582 l 64.87105,-9.87143 c 21.15486,-3.52661 40.19436,-14.81004 52.18014,-32.43804 2.81834,-4.22997 5.64159,-7.75658 7.75657,-11.28306 l 41.60083,131.85746 -57.82237,57.82237 c -8.45993,8.45993 -15.51264,19.74336 -19.74336,31.02654 l -44.42382,129.7421 c -6.34495,19.0395 3.5266,40.19436 22.56636,46.53918 4.22996,1.41163 7.75657,2.11498 11.98641,2.11498 15.51264,0 29.61504,-9.87143 34.55214,-24.68172 l 44.42383,-129.7421 c 0.70334,-1.41162 1.41162,-2.11498 2.11498,-3.5266 l 33.14065,-33.14065 61.34418,166.40834 c 5.6416,14.81004 19.74337,23.97283 34.55215,23.97283 4.22996,0 8.45993,-0.70335 12.68964,-2.11498 19.0395,-7.05322 28.91118,-28.20229 21.85747,-47.24305 l -71.91848,-198.84387 12.68965,-12.68964 c 14.81004,-14.81004 20.44596,-35.256 16.2165,-54.99937 L 460.33321,254.44171 c 4.93823,2.11498 9.87143,4.22996 16.2165,6.34495 2.81834,1.41162 5.64159,3.5266 7.05321,6.34494 l 35.25601,70.51201 c 5.64159,11.28306 16.92414,17.62801 28.91118,17.62801 4.93823,0 9.87143,-1.41163 14.10114,-3.52661 15.51768,-7.75658 21.8625,-27.49969 14.10618,-43.01233 z"
+     id="path67"
+     style="fill:#ffffff;stroke-width:1.25914" />
+  <path
+     d="m 438.77139,77.532617 c 4.25452,39.102683 -23.99297,74.250403 -63.0944,78.505053 -39.09765,4.25451 -74.24537,-23.99297 -78.50001,-63.089365 -4.25943,-39.102686 23.98793,-74.250405 63.08936,-78.505049 39.10269,-4.254518 74.24537,23.99297 78.50505,63.089361"
+     id="path69"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.25914" />
+</svg>
diff --git a/Content/Slate/SodaIcons/weather.svg b/Content/Slate/SodaIcons/weather.svg
new file mode 100644
index 0000000..d17ec4a
--- /dev/null
+++ b/Content/Slate/SodaIcons/weather.svg
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg177"
+   sodipodi:docname="weather.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata181">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#2c2e28"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview179"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="395.49933"
+     inkscape:cy="576.86125"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg177" />
+  <defs
+     id="defs71">
+    <symbol
+       id="w"
+       overflow="visible">
+      <path
+         d="m3.6562-0.21875c-0.1875 0.09375-0.38672 0.16797-0.59375 0.21875-0.19922 0.050781-0.40625 0.078125-0.625 0.078125-0.66797 0-1.1992-0.17969-1.5938-0.54688-0.38672-0.375-0.57812-0.87891-0.57812-1.5156 0-0.64453 0.19141-1.1484 0.57812-1.5156 0.39453-0.375 0.92578-0.5625 1.5938-0.5625 0.21875 0 0.42578 0.027344 0.625 0.078125 0.20703 0.054687 0.40625 0.125 0.59375 0.21875v0.82812c-0.1875-0.125-0.375-0.21875-0.5625-0.28125-0.17969-0.0625-0.37109-0.09375-0.57812-0.09375-0.36719 0-0.65625 0.12109-0.875 0.35938-0.21094 0.23047-0.3125 0.55469-0.3125 0.96875 0 0.40625 0.10156 0.73047 0.3125 0.96875 0.21875 0.23047 0.50781 0.34375 0.875 0.34375 0.20703 0 0.39844-0.023437 0.57812-0.078125 0.1875-0.0625 0.375-0.16016 0.5625-0.29688z"
+         id="path2" />
+    </symbol>
+    <symbol
+       id="c"
+       overflow="visible">
+      <path
+         d="m2.6875-2.1719c-0.085938-0.039063-0.16797-0.070313-0.25-0.09375-0.085938-0.019531-0.16797-0.03125-0.25-0.03125-0.25 0-0.44531 0.085937-0.57812 0.25-0.125 0.15625-0.1875 0.38281-0.1875 0.67188v1.375h-0.96875v-2.9844h0.96875v0.48438c0.11328-0.19531 0.25-0.33594 0.40625-0.42188 0.16406-0.09375 0.35938-0.14062 0.57812-0.14062h0.10938c0.039063 0 0.09375 0.007812 0.15625 0.015625z"
+         id="path5" />
+    </symbol>
+    <symbol
+       id="b"
+       overflow="visible">
+      <path
+         d="m3.4375-1.5v0.26562h-2.2344c0.03125 0.23047 0.11328 0.40234 0.25 0.51562 0.13281 0.10547 0.32812 0.15625 0.57812 0.15625 0.20703 0 0.41406-0.023438 0.625-0.078125 0.20703-0.0625 0.42188-0.15625 0.64062-0.28125v0.73438c-0.21875 0.09375-0.44531 0.16406-0.67188 0.20312-0.23047 0.039062-0.45312 0.0625-0.67188 0.0625-0.54297 0-0.96484-0.13281-1.2656-0.40625-0.30469-0.28125-0.45312-0.67188-0.45312-1.1719 0-0.47656 0.14453-0.85938 0.4375-1.1406 0.30078-0.28125 0.70703-0.42188 1.2188-0.42188 0.46875 0 0.84375 0.14062 1.125 0.42188s0.42188 0.66406 0.42188 1.1406zm-0.96875-0.32812c0-0.17578-0.058594-0.31641-0.17188-0.42188-0.10547-0.11328-0.24219-0.17188-0.40625-0.17188-0.1875 0-0.33984 0.054687-0.45312 0.15625-0.11719 0.10547-0.1875 0.25-0.21875 0.4375z"
+         id="path8" />
+    </symbol>
+    <symbol
+       id="k"
+       overflow="visible">
+      <path
+         d="m1.7969-1.3438c-0.19922 0-0.35156 0.039062-0.45312 0.10938-0.09375 0.0625-0.14062 0.16406-0.14062 0.29688 0 0.11719 0.035156 0.21094 0.10938 0.28125 0.082031 0.0625 0.19531 0.09375 0.34375 0.09375 0.17578 0 0.32812-0.0625 0.45312-0.1875s0.1875-0.28516 0.1875-0.48438v-0.10938zm1.4688-0.35938v1.7031h-0.96875v-0.4375c-0.125 0.17969-0.27344 0.30859-0.4375 0.39062-0.15625 0.082031-0.35156 0.125-0.57812 0.125-0.3125 0-0.57031-0.085938-0.76562-0.26562-0.1875-0.1875-0.28125-0.42188-0.28125-0.70312 0-0.35156 0.11719-0.61328 0.35938-0.78125 0.23828-0.16406 0.61719-0.25 1.1406-0.25h0.5625v-0.0625c0-0.15625-0.0625-0.26562-0.1875-0.32812-0.11719-0.070312-0.29688-0.10938-0.54688-0.10938-0.21094 0-0.40234 0.023437-0.57812 0.0625-0.17969 0.042969-0.33984 0.10156-0.48438 0.17188v-0.71875c0.19531-0.050781 0.39844-0.085938 0.60938-0.10938 0.20703-0.03125 0.41406-0.046875 0.625-0.046875 0.53906 0 0.92969 0.10938 1.1719 0.32812 0.23828 0.21094 0.35938 0.55469 0.35938 1.0312z"
+         id="path11" />
+    </symbol>
+    <symbol
+       id="d"
+       overflow="visible">
+      <path
+         d="m1.5-3.8438v0.85938h0.98438v0.67188h-0.98438v1.2812c0 0.13672 0.023438 0.23047 0.078125 0.28125 0.0625 0.042969 0.17578 0.0625 0.34375 0.0625h0.48438v0.6875h-0.8125c-0.38672 0-0.65625-0.078125-0.8125-0.23438s-0.23438-0.42188-0.23438-0.79688v-1.2812h-0.46875v-0.67188h0.46875v-0.85938z"
+         id="path14" />
+    </symbol>
+    <symbol
+       id="j"
+       overflow="visible">
+      <path
+         d="m2.5-2.5469v-1.6094h0.95312v4.1562h-0.95312v-0.4375c-0.13672 0.17969-0.28125 0.30859-0.4375 0.39062-0.15625 0.082031-0.33984 0.125-0.54688 0.125-0.375 0-0.68359-0.14453-0.92188-0.4375-0.23047-0.28906-0.34375-0.67188-0.34375-1.1406 0-0.45703 0.11328-0.83203 0.34375-1.125 0.23828-0.28906 0.54688-0.4375 0.92188-0.4375 0.19531 0 0.375 0.042969 0.53125 0.125 0.16406 0.085938 0.31641 0.21484 0.45312 0.39062zm-0.64062 1.9375c0.20703 0 0.36328-0.070313 0.46875-0.21875 0.11328-0.15625 0.17188-0.37891 0.17188-0.67188 0-0.28125-0.058594-0.49219-0.17188-0.64062-0.10547-0.15625-0.26172-0.23438-0.46875-0.23438-0.19922 0-0.35547 0.078125-0.46875 0.23438-0.10547 0.14844-0.15625 0.35938-0.15625 0.64062 0 0.29297 0.050781 0.51562 0.15625 0.67188 0.11328 0.14844 0.26953 0.21875 0.46875 0.21875z"
+         id="path17" />
+    </symbol>
+    <symbol
+       id="i"
+       overflow="visible">
+      <path
+         d="m2.0469-0.60938c0.20703 0 0.36328-0.070313 0.46875-0.21875 0.11328-0.15625 0.17188-0.37891 0.17188-0.67188 0-0.28125-0.058594-0.49219-0.17188-0.64062-0.10547-0.15625-0.26172-0.23438-0.46875-0.23438-0.19922 0-0.35547 0.078125-0.46875 0.23438-0.10547 0.14844-0.15625 0.35938-0.15625 0.64062 0 0.29297 0.050781 0.51562 0.15625 0.67188 0.11328 0.14844 0.26953 0.21875 0.46875 0.21875zm-0.625-1.9375c0.125-0.17578 0.26562-0.30469 0.42188-0.39062 0.16406-0.082031 0.35156-0.125 0.5625-0.125 0.36328 0 0.66406 0.14844 0.90625 0.4375 0.23828 0.29297 0.35938 0.66797 0.35938 1.125 0 0.46875-0.12109 0.85156-0.35938 1.1406-0.24219 0.29297-0.54297 0.4375-0.90625 0.4375-0.21094 0-0.39844-0.042969-0.5625-0.125-0.15625-0.082031-0.29688-0.21094-0.42188-0.39062v0.4375h-0.96875v-4.1562h0.96875z"
+         id="path20" />
+    </symbol>
+    <symbol
+       id="h"
+       overflow="visible">
+      <path
+         d="m0.0625-2.9844h0.95312l0.8125 2.0156 0.6875-2.0156h0.95312l-1.2656 3.2656c-0.125 0.33203-0.27344 0.56641-0.4375 0.70312-0.16797 0.13281-0.39062 0.20312-0.67188 0.20312h-0.54688v-0.64062h0.29688c0.16406 0 0.28516-0.027344 0.35938-0.078125 0.070313-0.054688 0.12891-0.14062 0.17188-0.26562l0.03125-0.09375z"
+         id="path23" />
+    </symbol>
+    <symbol
+       id="g"
+       overflow="visible">
+      <path
+         d="m2.0938-2.4375c0.16406 0 0.28906-0.035156 0.375-0.10938 0.082031-0.070313 0.125-0.17578 0.125-0.3125 0-0.14453-0.042969-0.25-0.125-0.3125-0.085938-0.070313-0.21094-0.10938-0.375-0.10938h-0.5625v0.84375zm0.046875 1.7344c0.19531 0 0.34766-0.039063 0.45312-0.125 0.10156-0.09375 0.15625-0.22266 0.15625-0.39062 0-0.17578-0.054688-0.30469-0.15625-0.39062-0.09375-0.09375-0.24609-0.14062-0.45312-0.14062h-0.60938v1.0469zm0.95312-1.4375c0.21875 0.074219 0.38281 0.19922 0.5 0.375 0.125 0.16797 0.1875 0.375 0.1875 0.625 0 0.38672-0.13281 0.67188-0.39062 0.85938-0.26172 0.1875-0.65625 0.28125-1.1875 0.28125h-1.7031v-3.9844h1.5469c0.55078 0 0.95312 0.085937 1.2031 0.25 0.25 0.16797 0.375 0.43359 0.375 0.79688 0 0.19922-0.046875 0.36719-0.14062 0.5-0.09375 0.13672-0.22656 0.23438-0.39062 0.29688z"
+         id="path26" />
+    </symbol>
+    <symbol
+       id="a"
+       overflow="visible">
+      <path
+         d="m1.875-2.375c-0.21094 0-0.37109 0.078125-0.48438 0.23438-0.10547 0.14844-0.15625 0.35938-0.15625 0.64062 0 0.29297 0.050781 0.51562 0.15625 0.67188 0.11328 0.14844 0.27344 0.21875 0.48438 0.21875 0.20703 0 0.36719-0.070313 0.48438-0.21875 0.11328-0.15625 0.17188-0.37891 0.17188-0.67188 0-0.28125-0.058594-0.49219-0.17188-0.64062-0.11719-0.15625-0.27734-0.23438-0.48438-0.23438zm0-0.6875c0.51953 0 0.92188 0.14062 1.2031 0.42188 0.28906 0.27344 0.4375 0.65234 0.4375 1.1406 0 0.5-0.14844 0.89062-0.4375 1.1719-0.28125 0.27344-0.68359 0.40625-1.2031 0.40625-0.51172 0-0.91406-0.13281-1.2031-0.40625-0.29297-0.28125-0.4375-0.67188-0.4375-1.1719 0-0.48828 0.14453-0.86719 0.4375-1.1406 0.28906-0.28125 0.69141-0.42188 1.2031-0.42188z"
+         id="path29" />
+    </symbol>
+    <symbol
+       id="v"
+       overflow="visible">
+      <path
+         d="m0.1875-2.9844h0.9375l0.5 2.0625 0.5-2.0625h0.79688l0.5 2.0312 0.51562-2.0312h0.92188l-0.78125 2.9844h-1.0469l-0.5-2.0625-0.5 2.0625h-1.0469z"
+         id="path32" />
+    </symbol>
+    <symbol
+       id="f"
+       overflow="visible">
+      <path
+         d="m3.4688-1.8281v1.8281h-0.96875v-1.3906c0-0.25781-0.007812-0.4375-0.015625-0.53125-0.011719-0.10156-0.03125-0.17578-0.0625-0.21875-0.03125-0.0625-0.085937-0.10938-0.15625-0.14062-0.0625-0.039062-0.13281-0.0625-0.20312-0.0625-0.21094 0-0.37109 0.078125-0.48438 0.23438-0.10547 0.15625-0.15625 0.37109-0.15625 0.64062v1.4688h-0.96875v-2.9844h0.96875v0.4375c0.13281-0.17578 0.28516-0.30469 0.45312-0.39062 0.16406-0.082031 0.34375-0.125 0.53125-0.125 0.34375 0 0.60156 0.10938 0.78125 0.32812 0.1875 0.21094 0.28125 0.51172 0.28125 0.90625z"
+         id="path35" />
+    </symbol>
+    <symbol
+       id="u"
+       overflow="visible">
+      <path
+         d="m2.7344 0.78125v0.51562h-2.7344v-0.51562z"
+         id="path38" />
+    </symbol>
+    <symbol
+       id="t"
+       overflow="visible">
+      <path
+         d="m0.5-3.9844h1.0312v3.9844h-1.0312z"
+         id="path41" />
+    </symbol>
+    <symbol
+       id="e"
+       overflow="visible">
+      <path
+         d="m2.875-2.8906v0.76562c-0.125-0.082031-0.25781-0.14453-0.39062-0.1875-0.13672-0.039062-0.27344-0.0625-0.40625-0.0625-0.27344 0-0.48047 0.078125-0.625 0.23438-0.14844 0.15625-0.21875 0.37109-0.21875 0.64062 0 0.28125 0.070313 0.5 0.21875 0.65625 0.14453 0.15625 0.35156 0.23438 0.625 0.23438 0.14453 0 0.28516-0.019531 0.42188-0.0625 0.13281-0.039063 0.25781-0.10938 0.375-0.20312v0.78125c-0.14844 0.0625-0.29688 0.10156-0.45312 0.125-0.15625 0.03125-0.3125 0.046875-0.46875 0.046875-0.54297 0-0.96484-0.13281-1.2656-0.40625-0.30469-0.28125-0.45312-0.67188-0.45312-1.1719 0-0.48828 0.14844-0.86719 0.45312-1.1406 0.30078-0.28125 0.72266-0.42188 1.2656-0.42188 0.15625 0 0.3125 0.015625 0.46875 0.046875 0.15625 0.023437 0.30469 0.0625 0.45312 0.125z"
+         id="path44" />
+    </symbol>
+    <symbol
+       id="s"
+       overflow="visible">
+      <path
+         d="m0.45312-2.9844h0.96875v2.9844h-0.96875zm0-1.1719h0.96875v0.78125h-0.96875z"
+         id="path47" />
+    </symbol>
+    <symbol
+       id="r"
+       overflow="visible">
+      <path
+         d="m2.4219-4.1562v0.625h-0.51562c-0.13672 0-0.23438 0.027344-0.29688 0.078125-0.054687 0.054687-0.078125 0.13672-0.078125 0.25v0.21875h0.82812v0.67188h-0.82812v2.3125h-0.95312v-2.3125h-0.46875v-0.67188h0.46875v-0.21875c0-0.32031 0.085937-0.5625 0.26562-0.71875 0.1875-0.15625 0.47266-0.23438 0.85938-0.23438z"
+         id="path50" />
+    </symbol>
+    <symbol
+       id="q"
+       overflow="visible">
+      <path
+         d="m3.2344-2.5c0.11328-0.17578 0.25391-0.3125 0.42188-0.40625 0.16406-0.10156 0.35156-0.15625 0.5625-0.15625 0.33203 0 0.58594 0.10938 0.76562 0.32812 0.1875 0.21094 0.28125 0.51172 0.28125 0.90625v1.8281h-0.96875v-1.5625c0.007813-0.019531 0.015625-0.039062 0.015625-0.0625v-0.10938c0-0.21875-0.03125-0.375-0.09375-0.46875s-0.16406-0.14062-0.29688-0.14062c-0.1875 0-0.33594 0.078125-0.4375 0.23438-0.09375 0.14844-0.14062 0.35938-0.14062 0.64062v1.4688h-0.96875v-1.5625c0-0.33203-0.03125-0.54688-0.09375-0.64062-0.054688-0.09375-0.15234-0.14062-0.29688-0.14062-0.17969 0-0.32031 0.078125-0.42188 0.23438-0.09375 0.14844-0.14062 0.35938-0.14062 0.64062v1.4688h-0.96875v-2.9844h0.96875v0.4375c0.11328-0.17578 0.24219-0.30469 0.39062-0.39062 0.15625-0.082031 0.32812-0.125 0.51562-0.125 0.20703 0 0.39062 0.054688 0.54688 0.15625 0.15625 0.09375 0.27344 0.23047 0.35938 0.40625z"
+         id="path53" />
+    </symbol>
+    <symbol
+       id="p"
+       overflow="visible">
+      <path
+         d="m3.4688-1.8281v1.8281h-0.96875v-1.3906c0-0.25781-0.007812-0.4375-0.015625-0.53125-0.011719-0.10156-0.03125-0.17578-0.0625-0.21875-0.03125-0.0625-0.085937-0.10938-0.15625-0.14062-0.0625-0.039062-0.13281-0.0625-0.20312-0.0625-0.21094 0-0.37109 0.078125-0.48438 0.23438-0.10547 0.15625-0.15625 0.37109-0.15625 0.64062v1.4688h-0.96875v-4.1562h0.96875v1.6094c0.13281-0.17578 0.28516-0.30469 0.45312-0.39062 0.16406-0.082031 0.34375-0.125 0.53125-0.125 0.34375 0 0.60156 0.10938 0.78125 0.32812 0.1875 0.21094 0.28125 0.51172 0.28125 0.90625z"
+         id="path56" />
+    </symbol>
+    <symbol
+       id="o"
+       overflow="visible">
+      <path
+         d="m0.5-3.9844h1.1562l1.4375 2.7344v-2.7344h0.98438v3.9844h-1.1562l-1.4375-2.7344v2.7344h-0.98438z"
+         id="path59" />
+    </symbol>
+    <symbol
+       id="n"
+       overflow="visible">
+      <path
+         d="m0.42188-1.1719v-1.8125h0.96875v0.29688 0.60938 0.48438c0 0.24219 0.003906 0.41797 0.015625 0.53125 0.007812 0.10547 0.03125 0.17969 0.0625 0.21875 0.039062 0.0625 0.09375 0.11719 0.15625 0.15625 0.0625 0.03125 0.13281 0.046875 0.21875 0.046875 0.19531 0 0.35156-0.078125 0.46875-0.23438 0.11328-0.15625 0.17188-0.36719 0.17188-0.64062v-1.4688h0.95312v2.9844h-0.95312v-0.4375c-0.14844 0.17969-0.30469 0.30859-0.46875 0.39062-0.15625 0.082031-0.33594 0.125-0.53125 0.125-0.34375 0-0.60938-0.10156-0.79688-0.3125-0.17969-0.21875-0.26562-0.53125-0.26562-0.9375z"
+         id="path62" />
+    </symbol>
+    <symbol
+       id="m"
+       overflow="visible">
+      <path
+         d="m0.5-3.9844h1.7031c0.50781 0 0.89844 0.11719 1.1719 0.34375 0.26953 0.21875 0.40625 0.53906 0.40625 0.95312 0 0.41797-0.13672 0.74219-0.40625 0.96875-0.27344 0.21875-0.66406 0.32812-1.1719 0.32812h-0.67188v1.3906h-1.0312zm1.0312 0.75v1.1094h0.5625c0.19531 0 0.34766-0.046875 0.45312-0.14062 0.11328-0.10156 0.17188-0.24219 0.17188-0.42188 0-0.17578-0.058594-0.3125-0.17188-0.40625-0.10547-0.09375-0.25781-0.14062-0.45312-0.14062z"
+         id="path65" />
+    </symbol>
+    <symbol
+       id="l"
+       overflow="visible">
+      <path
+         d="m0.45312-2.9844h0.96875v2.9375c0 0.39453-0.10156 0.69531-0.29688 0.90625-0.1875 0.21875-0.46484 0.32812-0.82812 0.32812h-0.48438v-0.64062h0.17188c0.17578 0 0.29688-0.042969 0.35938-0.125 0.070312-0.074219 0.10938-0.23047 0.10938-0.46875zm0-1.1719h0.96875v0.78125h-0.96875z"
+         id="path68" />
+    </symbol>
+  </defs>
+  <path
+     d="m 693.34564,539.91479 c -5.54412,-34.15952 -21.1843,-69.46713 -45.24803,-102.11518 -3.78527,-5.14296 -7.7043,-10.08026 -11.649,-14.57491 -50.21167,-57.78219 -130.85421,-76.20424 -200.58598,-45.78785 -30.58097,13.43341 -56.80526,35.14699 -75.71578,62.68263 -0.41659,0.64802 -1.59942,3.02413 -2.46351,4.76759 -5.29726,10.68721 -11.34552,22.86561 -22.44957,22.64969 l -50.51449,-1.78467 c -42.38835,0.0823 -83.01902,16.96192 -112.98645,46.93988 -29.96874,29.98323 -46.82666,70.61917 -46.88854,113.00752 v 14.54463 c 0,0.7663 0.30344,1.49659 0.84345,2.03666 0.54001,0.54008 1.27032,0.84345 2.03667,0.84345 h 548.36928 c 1.10575,0.0105 2.11896,-0.61716 2.60756,-1.61495 15.53735,-31.76329 20.41803,-65.92281 14.64205,-101.59512 z"
+     id="path73"
+     style="fill:#ffffff;stroke-width:1.31661" />
+  <path
+     d="m 124.84535,381.43409 c -0.0617,40.20278 10.79517,79.67615 31.4078,114.19511 34.21087,-33.91859 80.44768,-52.93706 128.62123,-52.91204 h 0.39088 l 46.48302,1.65603 c 1.72805,-2.67957 3.99091,-7.20029 5.21497,-9.70488 1.20861,-2.60756 2.58175,-5.13782 4.10415,-7.57566 6.93275,-10.10093 14.76054,-19.54907 23.40016,-28.23477 17.83089,-18.02179 38.93224,-32.4782 62.16914,-42.61481 38.43852,-16.83289 81.29032,-20.78273 122.15667,-11.25809 6.96369,1.60982 13.8297,3.59501 20.57734,5.9453 -7.74024,-49.89305 -31.74749,-95.83494 -68.2835,-130.68437 -41.84854,-40.08955 -96.12327,-62.16915 -152.79293,-62.16915 -123.19547,0.005 -223.45554,100.20083 -223.45554,223.35022 z"
+     id="path75"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 309.06583,113.70085 c 3.05493,0 5.98651,-1.21376 8.14654,-3.37382 2.16004,-2.16003 3.37382,-5.0916 3.37382,-8.14654 V 48.394218 c 0,-6.361873 -5.15335,-11.520363 -11.52036,-11.520363 -6.36188,0 -11.52037,5.15849 -11.52037,11.520363 v 53.786272 c 0,3.05494 1.21376,5.98651 3.37383,8.14654 2.16517,2.16004 5.0916,3.37382 8.14654,3.37382 z"
+     id="path77"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 422.24187,121.58736 c 1.34743,0.54516 2.79267,0.82289 4.24819,0.82289 4.70584,0.0154 8.94888,-2.83888 10.71288,-7.2003 L 457.0759,65.208945 c 2.35042,-5.909353 -0.54002,-12.61065 -6.45443,-14.960672 -5.90936,-2.350418 -12.61065,0.540022 -14.96068,6.454431 l -19.87295,50.010226 c -2.2938,5.88881 0.5863,12.52836 6.45443,14.87378 z"
+     id="path79"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 86.531911,486.77629 -48.242014,23.72932 c -2.833746,1.29089 -5.029856,3.67216 -6.079065,6.60873 -1.049183,2.93157 -0.864027,6.16649 0.514295,8.96429 1.373228,2.79267 3.821206,4.91163 6.78872,5.87328 2.962379,0.96175 6.192162,0.67889 8.943751,-0.78174 l 48.298629,-23.72009 c 5.708703,-2.82348 8.048853,-9.74083 5.225373,-15.44914 -2.823476,-5.7087 -9.740829,-8.04885 -15.449136,-5.22537 z"
+     id="path81"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 81.028469,402.89488 c -0.277726,-3.04467 -1.758863,-5.85274 -4.10928,-7.80712 -2.355552,-1.95438 -5.384684,-2.89036 -8.429351,-2.60755 l -53.58483,4.9527 c -6.3618732,0.29316 -11.2837673,5.68303 -10.9958241,12.05004 0.2880091,6.36187 5.683028,11.28377 12.0449021,10.99069 h 1.0646 l 53.673042,-5.0504 c 6.305391,-0.62231 10.923806,-6.2231 10.337518,-12.52836 z"
+     id="path83"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 20.094307,308.96772 53.482133,5.65735 c 0.406294,0.0257 0.817735,0.0257 1.224042,0 6.361874,0.3343 11.787767,-4.55667 12.11692,-10.91867 0.329154,-6.36701 -4.556665,-11.78777 -10.923805,-12.12206 l -53.513733,-5.64708 0.0053,0.005 c -3.054942,-0.34972 -6.115014,0.53487 -8.511645,2.45324 -2.39663,1.92344 -3.929299,4.72124 -4.2533177,7.77618 -0.3240053,3.05494 0.5863007,6.10987 2.5252637,8.4911 1.938976,2.38123 4.747048,3.88809 7.801985,4.19157 z"
+     id="path85"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="M 120.81651,200.82113 77.368285,169.14079 c -2.463514,-1.80521 -5.54926,-2.55094 -8.568253,-2.08288 -3.018994,0.47316 -5.724238,2.11895 -7.529446,4.5876 -3.754454,5.13782 -2.633226,12.34838 2.504593,16.10218 l 43.458761,31.68034 h 0.005 c 2.45838,1.8875 5.5802,2.70524 8.65055,2.26299 3.07547,-0.4423 5.83733,-2.10355 7.66821,-4.61328 1.82575,-2.50459 2.57148,-5.64708 2.05208,-8.70715 -0.5143,-3.06007 -2.24233,-5.78072 -4.79326,-7.54999 z"
+     id="path87"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 186.77882,139.71712 c 3.19897,5.41563 10.15227,7.26191 15.61898,4.14523 5.46697,-3.11155 7.42649,-10.03918 4.39722,-15.55183 L 180.13888,81.565491 c -1.48633,-2.705245 -3.99619,-4.700703 -6.9637,-5.538991 -2.97265,-0.838313 -6.15622,-0.452585 -8.83566,1.074896 -2.6847,1.527535 -4.63895,4.068071 -5.43103,7.051121 -0.79202,2.982918 -0.35486,6.161353 1.21376,8.820253 z"
+     id="path89"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 523.22609,161.01992 c 2.27326,2.0418 5.26131,3.10128 8.31625,2.93671 3.0498,-0.15943 5.91449,-1.52754 7.95629,-3.80067 l 36.00147,-40.00265 v -0.005 c 2.12922,-2.25259 3.25558,-5.27672 3.12695,-8.37287 -0.12337,-3.10128 -1.49659,-6.01732 -3.80067,-8.08993 -2.3092,-2.07774 -5.35387,-3.13208 -8.45002,-2.9367 -3.09101,0.20058 -5.97623,1.64063 -7.99737,3.99091 l -36.00146,40.00266 v 0.005 c -2.04694,2.26812 -3.10642,5.26131 -2.94698,8.31111 0.15943,3.04981 1.52227,5.91449 3.79554,7.96143 z"
+     id="path91"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 575.9301,235.92203 c 1.39377,2.72065 3.81094,4.77786 6.72197,5.71384 2.90576,0.93603 6.06879,0.67887 8.78944,-0.71488 l 47.88127,-24.4811 c 5.66248,-2.90063 7.89967,-9.84893 4.99391,-15.51102 -2.90063,-5.66249 -9.84379,-7.89968 -15.50575,-4.99391 l -47.88126,24.53771 c -5.63155,2.90063 -7.86374,9.80258 -4.99905,15.44914 z"
+     id="path93"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+  <path
+     d="m 607.83163,329.30938 c 1.40404,4.95784 5.93503,8.38314 11.08838,8.37801 1.05947,0 2.11896,-0.14915 3.13723,-0.43201 l 51.84163,-14.68813 c 6.03786,-1.80521 9.50437,-8.12087 7.78145,-14.18387 -1.72292,-6.05853 -7.9871,-9.61233 -14.07196,-7.97683 l -51.76922,14.67365 c -2.95211,0.82288 -5.4567,2.78239 -6.95856,5.45156 -1.50173,2.66917 -1.88236,5.82707 -1.04918,8.77918 z"
+     id="path95"
+     style="fill:#ffffff;fill-opacity:0.5;stroke-width:1.31661" />
+</svg>
diff --git a/Content/Slate/SodaIcons/wtf.svg b/Content/Slate/SodaIcons/wtf.svg
new file mode 100644
index 0000000..04cc5e0
--- /dev/null
+++ b/Content/Slate/SodaIcons/wtf.svg
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="700pt"
+   height="700pt"
+   version="1.1"
+   viewBox="0 0 700 700"
+   id="svg16"
+   sodipodi:docname="wtf.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata22">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs20" />
+  <sodipodi:namedview
+     pagecolor="#3e3532"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="0.63791133"
+     inkscape:cx="401.00906"
+     inkscape:cy="526.81454"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <path
+     d="m 349.99999,47.418858 c 166.30045,0 301.58113,135.280682 301.58113,301.581132 0,166.30045 -135.28068,301.58113 -301.58113,301.58113 -166.30045,0 -301.581134,-135.28068 -301.581134,-301.58113 0,-166.30045 135.280684,-301.581132 301.581134,-301.581132 m 0,-43.0830189 c -190.3654,0 -344.664153,154.2987509 -344.664153,344.6641509 0,190.3654 154.298753,344.66415 344.664153,344.66415 190.3654,0 344.66415,-154.29875 344.66415,-344.66415 0,-190.3654 -154.29875,-344.6641509 -344.66415,-344.6641509 z"
+     id="path2"
+     style="fill:#ffffff;stroke-width:1.23094" />
+  <path
+     style="opacity:0.52809;fill:#ffffff;fill-opacity:0.5;stroke-width:3.13523;stroke-dasharray:3.13523, 9.4057"
+     d="M 419.362,863.91091 C 328.96722,852.46833 247.50287,812.61193 183.31679,748.42584 121.7671,686.87616 82.973319,610.02247 69.474816,522.8955 68.072245,513.84252 66.528831,492.6797 66.045005,475.86702 64.044714,406.35799 78.436175,343.38861 110.47096,281.48264 130.37576,243.01741 152.90925,212.58664 185.3422,180.37141 278.29287,88.044706 410.16571,47.023891 538.07756,70.648349 644.89938,90.377623 737.21519,150.81329 799.06727,241.50843 c 71.33236,104.59634 88.40354,239.89364 45.2949,358.98406 -13.68744,37.81245 -38.93082,82.93062 -64.02635,114.43597 -5.49419,6.89751 -17.08057,19.85763 -25.74748,28.80027 -62.38779,64.37255 -139.085,104.11668 -228.95381,118.64276 -21.66034,3.50111 -83.67846,4.39948 -106.27253,1.53942 z"
+     id="path868"
+     transform="scale(0.75000002)" />
+  <path
+     d="m 289.97944,261.32837 c 0,33.13454 -26.85918,59.99372 -59.99372,59.99372 -33.12961,0 -59.98879,-26.85918 -59.98879,-59.99372 0,-33.13453 26.85918,-59.99372 59.98879,-59.99372 33.13454,0 59.99372,26.85919 59.99372,59.99372"
+     id="path4"
+     style="fill:#ffffff;stroke-width:1.23094" />
+  <path
+     d="m 532.79534,261.32837 c 0,33.13454 -26.85919,59.99372 -59.99372,59.99372 -33.13454,0 -59.99372,-26.85918 -59.99372,-59.99372 0,-33.13453 26.85918,-59.99372 59.99372,-59.99372 33.13453,0 59.99372,26.85919 59.99372,59.99372"
+     id="path6"
+     style="fill:#ffffff;stroke-width:1.23094" />
+  <path
+     d="M 142.91863,179.79068 H 317.03558 V 222.8737 H 142.91863 Z"
+     id="path8"
+     style="fill:#ffffff;stroke-width:1.23094" />
+  <path
+     d="m 551.35796,174.28836 11.15063,41.61204 -174.11695,46.6503 -11.15062,-41.61204 z"
+     id="path10"
+     style="fill:#ffffff;stroke-width:1.23094" />
+  <path
+     d="m 507.36405,531.13885 c 0,-85.77706 -69.53353,-155.32043 -155.32044,-155.32043 -85.77706,0 -155.32044,69.53353 -155.32044,155.32043 z"
+     id="path12"
+     style="fill:#ffffff;stroke-width:1.23094" />
+</svg>
diff --git a/Content/Slate/Starship/Actors/attach.svg b/Content/Slate/Starship/Actors/attach.svg
new file mode 100644
index 0000000..64d2975
--- /dev/null
+++ b/Content/Slate/Starship/Actors/attach.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 12.1801V2.86005C4 2.17844 4.27072 1.52475 4.75269 1.04279C5.23465 0.560817 5.88846 0.290039 6.57007 0.290039C7.25167 0.290039 7.90524 0.560817 8.38721 1.04279C8.86918 1.52475 9.13989 2.17844 9.13989 2.86005V10.5701H7.86011V2.86005C7.81168 2.54856 7.65644 2.2636 7.42114 2.05383C7.18584 1.84407 6.88505 1.72257 6.57007 1.71008C6.25259 1.71067 5.94637 1.82829 5.71021 2.04047C5.47404 2.25264 5.32449 2.54444 5.29004 2.86005V11.86C5.29004 13.12 6.80995 14.29 8.44995 14.29C10.09 14.29 11.71 13.12 11.71 11.86V5.43005H13V12.1801C13 13.9401 11 15.7101 8.44995 15.7101C5.89995 15.7101 4 13.9401 4 12.1801Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Actors/detach.svg b/Content/Slate/Starship/Actors/detach.svg
new file mode 100644
index 0000000..efb3229
--- /dev/null
+++ b/Content/Slate/Starship/Actors/detach.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.1046 2.09014L1.09082 14.1039L1.9252 14.9383L13.9389 2.92453L13.1046 2.09014Z" fill="white"/>
+<path d="M10.71 8.29001V11.86C10.71 13.12 9.07995 14.29 7.44995 14.29C6.70603 14.2841 5.98133 14.0541 5.37012 13.63L4.37012 14.63C5.25909 15.32 6.35469 15.6899 7.47998 15.68C10.05 15.68 12.03 13.91 12.03 12.15V7L10.71 8.29001Z" fill="white"/>
+<path d="M4.29004 8.71002V2.86002C4.32449 2.54441 4.47404 2.25261 4.71021 2.04044C4.94637 1.82826 5.25259 1.71061 5.57007 1.71002C5.88505 1.7225 6.18584 1.84404 6.42114 2.0538C6.65644 2.26357 6.81168 2.54853 6.86011 2.86002V6.14005L8.13989 4.86002V2.86002C8.13989 2.52252 8.07349 2.18833 7.94434 1.87653C7.81518 1.56472 7.62585 1.2814 7.38721 1.04276C7.14856 0.804109 6.86527 0.614811 6.55347 0.485657C6.24166 0.356502 5.90757 0.290039 5.57007 0.290039C5.23257 0.290039 4.89823 0.356502 4.58643 0.485657C4.27462 0.614811 3.99133 0.804109 3.75269 1.04276C3.51404 1.2814 3.32471 1.56472 3.19556 1.87653C3.0664 2.18833 3 2.52252 3 2.86002V10L4.29004 8.71002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Actors/go-here.svg b/Content/Slate/Starship/Actors/go-here.svg
new file mode 100644
index 0000000..183e2fd
--- /dev/null
+++ b/Content/Slate/Starship/Actors/go-here.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9998 8L12.4598 12.2L8.89978 8H11.2798C11.2798 4.06 11.3498 1 7.00977 0C12.6898 0 13.6498 3.95 13.6498 8H15.9998Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.31978 0C8.11258 0.207354 8.85449 0.574987 9.49978 1.08008C8.10492 0.708767 6.62259 0.85799 5.32979 1.5C2.20979 3.27 2.49978 8 2.49978 8C2.49978 8 0.919784 0 7.31978 0Z" fill="white"/>
+<path d="M12.5 15.75C14.1569 15.75 15.5 15.1904 15.5 14.5C15.5 13.8096 14.1569 13.25 12.5 13.25C10.8431 13.25 9.5 13.8096 9.5 14.5C9.5 15.1904 10.8431 15.75 12.5 15.75Z" fill="white"/>
+<path opacity="0.5" d="M2.49992 10.88C3.78675 10.88 4.82992 10.486 4.82992 10C4.82992 9.51398 3.78675 9.12 2.49992 9.12C1.2131 9.12 0.169922 9.51398 0.169922 10C0.169922 10.486 1.2131 10.88 2.49992 10.88Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Actors/paste-here.svg b/Content/Slate/Starship/Actors/paste-here.svg
new file mode 100644
index 0000000..77d138a
--- /dev/null
+++ b/Content/Slate/Starship/Actors/paste-here.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M0 0V10V11H5V10H1V1H9V5H10V1V0H0Z" fill="white"/>
+<path d="M6 6V16H11L8 12H10V8H12V12H14L11 16H16V6H6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Actors/scripted-actor-actions.svg b/Content/Slate/Starship/Actors/scripted-actor-actions.svg
new file mode 100644
index 0000000..a4baccd
--- /dev/null
+++ b/Content/Slate/Starship/Actors/scripted-actor-actions.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8 11L6 14V15H13.5C14.163 15 14.7989 14.7366 15.2678 14.2678C15.7366 13.7989 16 13.163 16 12.5V11H8Z" fill="white"/>
+<path d="M10 1H2C3.66 1 4 2.34 4 4V12.5C4 13.0304 4.21071 13.5391 4.58578 13.9142C4.96086 14.2893 5.46957 14.5 6 14.5C6.53043 14.5 7.03914 14.2893 7.41422 13.9142C7.78929 13.5391 8 13.0304 8 12.5V11H13V4C13 3.20435 12.6839 2.44129 12.1213 1.87868C11.5587 1.31607 10.7956 1 10 1ZM11 10H6V9H11V10ZM11 8H6V7H11V8ZM11 6H6V5H11V6Z" fill="white"/>
+<path opacity="0.5" d="M9 5V1H2.5C1.83696 1 1.20108 1.2634 0.732239 1.73224C0.263398 2.20108 0 2.83696 0 3.5V5H9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Actors/snap-object-to-view.svg b/Content/Slate/Starship/Actors/snap-object-to-view.svg
new file mode 100644
index 0000000..fce2f2a
--- /dev/null
+++ b/Content/Slate/Starship/Actors/snap-object-to-view.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 16V14.25H9.39999V16H8ZM10.1 10.75H11C12.75 10.75 13.63 11.33 13.63 12.5C13.63 13.67 12.75 14.25 11 14.25H10.13V16H11C13.63 16 15.38 14.73 15.38 12.5C15.38 10.27 13.6 9 11 9H10.13L10.1 10.75ZM9.39999 9H8V10.75H9.39999V9Z" fill="white"/>
+<path d="M4.85 0.349976L0 1.38998V7.61998L4.85 8.64997V0.349976Z" fill="white"/>
+<path opacity="0.5" d="M9.0001 7.61998L4.8501 8.64997V0.349976L9.0001 1.38998V7.61998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Actors/snap-view-to-object.svg b/Content/Slate/Starship/Actors/snap-view-to-object.svg
new file mode 100644
index 0000000..c205429
--- /dev/null
+++ b/Content/Slate/Starship/Actors/snap-view-to-object.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 16V14.25H9.39999V16H8ZM10.1 10.75H11C12.75 10.75 13.63 11.33 13.63 12.5C13.63 13.67 12.75 14.25 11 14.25H10.13V16H11C13.63 16 15.38 14.73 15.38 12.5C15.38 10.27 13.6 9 11 9H10.13L10.1 10.75ZM9.39999 9H8V10.75H9.39999V9Z" fill="white"/>
+<path d="M7 1.10999C4 1.10999 1 4.49998 1 4.49998C1 4.49998 4 7.88998 7 7.88998C10 7.88998 13 4.49998 13 4.49998C13 4.49998 10 1.10999 7 1.10999ZM7 7.36999C6.23883 7.36999 5.50884 7.06761 4.97061 6.52938C4.43238 5.99115 4.13 5.26116 4.13 4.49998C4.13264 3.73962 4.43585 3.01116 4.97351 2.4735C5.51117 1.93584 6.23964 1.63262 7 1.62999C7.76117 1.62999 8.49116 1.93236 9.02939 2.47059C9.56762 3.00882 9.87 3.73881 9.87 4.49998C9.87132 4.87725 9.798 5.25105 9.65424 5.59985C9.51047 5.94865 9.29912 6.26556 9.03235 6.53233C8.76558 6.7991 8.44865 7.01045 8.09985 7.15421C7.75105 7.29797 7.37726 7.37131 7 7.36999Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.71011 2.79999C5.82126 2.79866 5.93157 2.81942 6.03464 2.86104C6.13771 2.90266 6.23151 2.96432 6.31058 3.04245C6.38964 3.12059 6.4524 3.21364 6.49524 3.31621C6.53808 3.41878 6.56013 3.52883 6.56012 3.63999C6.56012 3.86542 6.47056 4.08162 6.31116 4.24103C6.15175 4.40043 5.93555 4.48999 5.71011 4.48999C5.48642 4.48735 5.27279 4.39664 5.11554 4.23752C4.95829 4.0784 4.8701 3.8637 4.87012 3.63999C4.87012 3.4172 4.95862 3.20355 5.11615 3.04602C5.27368 2.88849 5.48733 2.79999 5.71011 2.79999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Actors/take-recorder.svg b/Content/Slate/Starship/Actors/take-recorder.svg
new file mode 100644
index 0000000..a746593
--- /dev/null
+++ b/Content/Slate/Starship/Actors/take-recorder.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8449:15210)">
+<path d="M12 1C12.5933 1 13.1734 1.17597 13.6667 1.50562C14.1601 1.83526 14.5446 2.30375 14.7716 2.85193C14.9987 3.40011 15.0581 4.00332 14.9424 4.58527C14.8266 5.16721 14.5409 5.70178 14.1213 6.12134C13.7018 6.5409 13.1672 6.82663 12.5853 6.94238C12.0033 7.05814 11.4001 6.99873 10.852 6.77167C10.3038 6.5446 9.83524 6.16003 9.50559 5.66669C9.17595 5.17334 9 4.59334 9 4C9 3.20435 9.31607 2.44127 9.87868 1.87866C10.4413 1.31605 11.2044 1 12 1V1ZM12 0C11.2089 0 10.4355 0.234608 9.77772 0.674133C9.11992 1.11366 8.60723 1.73833 8.30448 2.46924C8.00173 3.20014 7.92252 4.00441 8.07686 4.78033C8.2312 5.55626 8.61216 6.26902 9.17157 6.82843C9.73098 7.38784 10.4437 7.76882 11.2196 7.92316C11.9956 8.0775 12.7998 7.99825 13.5307 7.6955C14.2616 7.39275 14.8864 6.88009 15.3259 6.22229C15.7654 5.56449 16 4.79113 16 4C16 2.93913 15.5786 1.92172 14.8284 1.17157C14.0783 0.421424 13.0609 0 12 0Z" fill="white"/>
+<path d="M12 5.75C12.9665 5.75 13.75 4.9665 13.75 4C13.75 3.0335 12.9665 2.25 12 2.25C11.0335 2.25 10.25 3.0335 10.25 4C10.25 4.9665 11.0335 5.75 12 5.75Z" fill="white"/>
+<path opacity="0.5" d="M8 8H2C1.44772 8 1 8.44772 1 9V15C1 15.5523 1.44772 16 2 16H8C8.55228 16 9 15.5523 9 15V9C9 8.44772 8.55228 8 8 8Z" fill="white"/>
+<path opacity="0.5" d="M9.93018 11.4299V12.5699L14.0002 15.4299V8.56995L9.93018 11.4299Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_8449:15210">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Animation/BlendSpace.svg b/Content/Slate/Starship/Animation/BlendSpace.svg
new file mode 100644
index 0000000..b99a259
--- /dev/null
+++ b/Content/Slate/Starship/Animation/BlendSpace.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10H11C10.4 10 10 9.6 10 9V6C10 5.4 10.4 5 11 5H12C12.6 5 13 5.4 13 6V9C13 9.6 12.6 10 12 10Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.6004 3.1L13.0004 5.8C12.8004 6 12.5004 6 12.3004 5.8C12.1004 5.6 12.1004 5.3 12.3004 5.1L15.0004 2.4C15.2004 2.2 15.5004 2.2 15.7004 2.4C15.8004 2.6 15.8004 2.9 15.6004 3.1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1001 5.89961L7.5001 3.19961C7.3001 2.99961 7.3001 2.69961 7.5001 2.49961C7.7001 2.29961 8.0001 2.29961 8.2001 2.49961L10.9001 5.19961C11.1001 5.39961 11.1001 5.69961 10.9001 5.89961C10.6001 6.09961 10.3001 6.09961 10.1001 5.89961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 8.5V14.5C11 14.8 10.8 15 10.5 15C10.2 15 10 14.8 10 14.5V8.5C10 8.2 10.2 8 10.5 8C10.8 8 11 8.2 11 8.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 8.5V14.5C13 14.8 12.8 15 12.5 15C12.2 15 12 14.8 12 14.5V8.5C12 8.2 12.2 8 12.5 8C12.8 8 13 8.2 13 8.5Z" fill="white"/>
+<path d="M11.4998 4.4C12.4387 4.4 13.1998 3.63888 13.1998 2.7C13.1998 1.76112 12.4387 1 11.4998 1C10.5609 1 9.7998 1.76112 9.7998 2.7C9.7998 3.63888 10.5609 4.4 11.4998 4.4Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.6001 7.9L5.9001 5.2C5.8001 5.1 5.6001 5.1 5.4001 5.1C5.3001 5 5.2001 5 5.0001 5H4.0001C3.9001 5 3.8001 5 3.7001 5.1C3.5001 5 3.3001 5 3.1001 5.2L0.500098 7.8C0.300098 8 0.300098 8.3 0.500098 8.5C0.700098 8.7 1.0001 8.7 1.2001 8.5L3.0001 6.8V8.6V9V14.5C3.0001 14.8 3.2001 15 3.5001 15C3.8001 15 4.0001 14.8 4.0001 14.5V10H5.0001V14.5C5.0001 14.8 5.2001 15 5.5001 15C5.8001 15 6.0001 14.8 6.0001 14.5V9V8.5V6.8L7.9001 8.7C8.1001 8.9 8.4001 8.9 8.6001 8.7C8.8001 8.5 8.8001 8.1 8.6001 7.9Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M4.4998 4.4C5.3998 4.4 6.1998 3.6 6.1998 2.7C6.1998 1.8 5.3998 1 4.4998 1C3.5998 1 2.7998 1.8 2.7998 2.7C2.7998 3.6 3.5998 4.4 4.4998 4.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Animation/Bone.svg b/Content/Slate/Starship/Animation/Bone.svg
new file mode 100644
index 0000000..5f36691
--- /dev/null
+++ b/Content/Slate/Starship/Animation/Bone.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.6801 3.29002C12.1601 2.77002 13.2201 0.61002 10.9701 0.47002C9.7001 0.40002 9.83011 2.68002 10.2301 3.80002L3.78015 10.25C2.67015 9.87002 0.420125 9.75002 0.500125 11C0.640125 13.25 2.80013 12.19 3.32013 12.71C3.84013 13.23 2.78015 15.39 5.03015 15.53C6.30015 15.6 6.17014 13.32 5.77014 12.2L12.2201 5.75002C13.3301 6.13002 15.5801 6.25002 15.5001 5.00002C15.3601 2.75002 13.2001 3.81002 12.6801 3.29002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Animation/BoneNonWeighted.svg b/Content/Slate/Starship/Animation/BoneNonWeighted.svg
new file mode 100644
index 0000000..2a91345
--- /dev/null
+++ b/Content/Slate/Starship/Animation/BoneNonWeighted.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8734:15428)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.6599 3.29998C12.1499 2.78998 13.1999 0.639976 10.9599 0.499976C9.69991 0.419976 9.82986 2.69998 10.2199 3.81998L3.79988 10.24C2.68988 9.85998 0.449919 9.73998 0.529919 10.99C0.669919 13.23 2.81992 12.18 3.33992 12.7C3.85992 13.22 2.79987 15.36 5.03987 15.5C6.29987 15.58 6.16992 13.3 5.77992 12.18L12.1999 5.75998C13.3099 6.13998 15.5499 6.25998 15.4699 5.00998C15.3299 2.76998 13.1799 3.81998 12.6599 3.29998Z" stroke="white" stroke-miterlimit="10"/>
+</g>
+<defs>
+<clipPath id="clip0_8734:15428">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationAlias.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationAlias.svg
new file mode 100644
index 0000000..f28cbcf
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationAlias.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0V5H1V7H15L8 0Z" fill="white"/>
+<path opacity="0.5" d="M15 9H1L8 16V11H15V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationConduit.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationConduit.svg
new file mode 100644
index 0000000..0c32309
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationConduit.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 7H1V9H15V7Z" fill="white"/>
+<path opacity="0.5" d="M8 0V2C8 2.26522 7.89469 2.51956 7.70715 2.70709C7.51962 2.89463 7.26522 3 7 3H1V5H7C7.79565 5 8.55873 4.68395 9.12134 4.12134C9.68395 3.55873 10 2.79565 10 2V0H8Z" fill="white"/>
+<path opacity="0.5" d="M1 11V13H10C10.2652 13 10.5196 13.1054 10.7072 13.2929C10.8947 13.4804 11 13.7348 11 14V16H13V14C13 13.2044 12.6839 12.4413 12.1213 11.8787C11.5587 11.3161 10.7956 11 10 11H1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphAttributes.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphAttributes.svg
new file mode 100644
index 0000000..ff9eddd
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphAttributes.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 9H7V6H14V9ZM5 6H2V9H5V6ZM14 1H7V4H14V1ZM5 1H2V4H5V1ZM14 11H7V14H14V11ZM5 11H2V14H5V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphCurves.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphCurves.svg
new file mode 100644
index 0000000..3e8c5d4
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphCurves.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 2C5.5 2 10.67 14 0 14" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphInertialBlending.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphInertialBlending.svg
new file mode 100644
index 0000000..b0eae86
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphInertialBlending.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 11C6.65685 11 8 9.65685 8 8C8 6.34315 6.65685 5 5 5C3.34315 5 2 6.34315 2 8C2 9.65685 3.34315 11 5 11Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0001 13.54L8.72006 10.27C8.37663 10.8515 7.89155 11.3365 7.31006 11.6799L10.58 14.96C10.673 15.0537 10.7836 15.1282 10.9055 15.179C11.0273 15.2297 11.1581 15.2559 11.2901 15.2559C11.4221 15.2559 11.5528 15.2297 11.6747 15.179C11.7965 15.1282 11.9071 15.0537 12.0001 14.96C12.0938 14.867 12.1682 14.7564 12.219 14.6345C12.2697 14.5127 12.2959 14.382 12.2959 14.25C12.2959 14.118 12.2697 13.9873 12.219 13.8655C12.1682 13.7436 12.0938 13.633 12.0001 13.54Z" fill="white"/>
+<path d="M14.6399 6.55999C14.2662 4.58774 13.1263 2.84376 11.4699 1.70989C9.88436 0.638759 7.94164 0.233096 6.05991 0.58001C4.27057 0.92156 2.68891 1.95672 1.65991 3.45989C2.80645 2.1697 4.41717 1.38599 6.13992 1.27996C7.77207 1.19359 9.37311 1.75005 10.5999 2.83001C11.1704 3.33641 11.6355 3.95027 11.9684 4.63665C12.3012 5.32303 12.4955 6.06845 12.5399 6.83001C12.6247 8.00413 12.2439 9.1644 11.4799 10.06L13.5499 12.1298L13.7499 11.83C13.905 11.5957 14.0453 11.3519 14.1699 11.1C14.3728 10.62 14.5269 10.1209 14.6299 9.61004C14.8369 8.60424 14.8403 7.56713 14.6399 6.55999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphPose.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphPose.svg
new file mode 100644
index 0000000..3d5f2ff
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphPose.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{fill:#fff;fill-rule:evenodd;}.cls-2{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_2-2" data-name="Layer 2"><path class="cls-1" d="M19,7a1,1,0,0,1-1,1H13V19a1,1,0,0,1-2,0V13H9v6a1,1,0,0,1-2,0V8H2A1,1,0,0,1,2,6H18A1,1,0,0,1,19,7ZM10,.62A2.38,2.38,0,1,0,12.38,3,2.39,2.39,0,0,0,10,.62Z"/><rect class="cls-2" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphPoseDisconnected.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphPoseDisconnected.svg
new file mode 100644
index 0000000..2d01909
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphPoseDisconnected.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_2-2" data-name="Layer 2"><path class="cls-1" d="M10,1a2,2,0,0,1,2,2,2,2,0,0,1-.52,1.33L10,6,8.52,4.33A2,2,0,0,1,8,3a2,2,0,0,1,2-2m7.82,5a1.17,1.17,0,0,1,.18.5,1.17,1.17,0,0,1-.18.5H13V18.82a1.17,1.17,0,0,1-.5.18,1.17,1.17,0,0,1-.5-.18V12H8v6.82a1.17,1.17,0,0,1-.5.18,1.17,1.17,0,0,1-.5-.18V7H2.18A1.17,1.17,0,0,1,2,6.5,1.17,1.17,0,0,1,2.18,6H17.82M10,0A3,3,0,0,0,7.78,5H2C1.45,5,1,6,1,6.5S1.45,8,2,8H6V19c0,.55,1,1,1.5,1S9,19.55,9,19V13h2v6c0,.55.95,1,1.5,1s1.5-.45,1.5-1V8h4c.55,0,1-1,1-1.5S18.55,5,18,5H12.22A3,3,0,0,0,10,0Z"/><rect class="cls-2" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphRootMotionDelta.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphRootMotionDelta.svg
new file mode 100644
index 0000000..468e735
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphRootMotionDelta.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 12.4999L8.99998 8.99988V10.9999L7.28999 11.08C6.71999 11.08 5.92998 11.1698 5.67998 11.1398C5.2619 11.1001 4.85805 10.9674 4.49809 10.7511C4.13814 10.5348 3.83125 10.2403 3.59999 9.88977C3.40312 9.5327 3.31287 9.1267 3.33998 8.71985C3.34848 8.30082 3.48839 7.89514 3.73997 7.55994C4.03675 7.17811 4.41336 6.86575 4.84346 6.64466C5.27356 6.42356 5.74678 6.29904 6.23 6.27991C7.38 6.18991 8.87998 6.32996 10.15 5.32996C10.4462 5.07311 10.6776 4.74978 10.8253 4.3866C10.973 4.02342 11.0329 3.63056 11 3.23987C10.9826 2.86453 10.8754 2.49884 10.6875 2.17346C10.4996 1.84809 10.2364 1.57265 9.91998 1.37C8.77692 0.747252 7.47778 0.469314 6.17998 0.569948C4.94998 0.569948 3.71998 0.64987 2.49998 0.73987C3.72998 0.73987 4.95 0.839841 6.17 0.959841C7.33279 0.976255 8.46691 1.32308 9.43999 1.95984C9.63161 2.10422 9.78412 2.29428 9.88367 2.51258C9.98321 2.73087 10.0266 2.97049 10.01 3.20984C10.0114 3.43344 9.95838 3.65408 9.85561 3.85266C9.75283 4.05125 9.60333 4.22198 9.41998 4.34998C8.98759 4.59646 8.49768 4.72399 7.99998 4.71985C7.46998 4.71985 6.85 4.71979 6.23 4.65979H5.70998C5.52233 4.66925 5.33537 4.68934 5.14998 4.71985C4.78624 4.77858 4.43054 4.8793 4.08998 5.0199C3.37669 5.28229 2.73823 5.71481 2.23 6.27991C1.69014 6.88892 1.34224 7.64377 1.23 8.44983C1.10062 9.26628 1.20821 10.1029 1.53999 10.86C1.87614 11.6159 2.41201 12.2658 3.08998 12.7399C3.73043 13.2172 4.46228 13.5576 5.23997 13.7399C5.45159 13.781 5.66523 13.8112 5.87999 13.83H6.39H7.30998L9.01999 13.9098V15.9098L15 12.4999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphSync.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphSync.svg
new file mode 100644
index 0000000..d43e815
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationGraphSync.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15C6.14348 15 4.36302 14.2625 3.05026 12.9497C1.73751 11.637 1 9.85652 1 8C1 6.14348 1.73751 4.36305 3.05026 3.05029C4.36302 1.73754 6.14348 1 8 1C9.85652 1 11.637 1.73754 12.9497 3.05029C14.2625 4.36305 15 6.14348 15 8C15 9.85652 14.2625 11.637 12.9497 12.9497C11.637 14.2625 9.85652 15 8 15Z" stroke="white" stroke-width="1.75" stroke-miterlimit="10"/>
+<path d="M8 4V8L10.5 10.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/AnimationBlueprintEditor/AnimationState.svg b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationState.svg
new file mode 100644
index 0000000..3d11e77
--- /dev/null
+++ b/Content/Slate/Starship/AnimationBlueprintEditor/AnimationState.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8 2.00002C8.78824 1.99686 9.56922 2.15089 10.2972 2.45309C11.0253 2.75528 11.6857 3.19959 12.24 3.76003C12.8004 4.31433 13.2448 4.97476 13.547 5.70278C13.8492 6.4308 14.0032 7.21178 14 8.00002C14.0032 8.78826 13.8492 9.56924 13.547 10.2973C13.2448 11.0253 12.8004 11.6857 12.24 12.24C11.6857 12.8005 11.0253 13.2448 10.2972 13.547C9.56922 13.8492 8.78824 14.0032 8 14C7.21176 14.0032 6.43078 13.8492 5.70276 13.547C4.97474 13.2448 4.3143 12.8005 3.76001 12.24C3.19957 11.6857 2.7552 11.0253 2.453 10.2973C2.15081 9.56924 1.99684 8.78826 2 8.00002C1.99684 7.21178 2.15081 6.4308 2.453 5.70278C2.7552 4.97476 3.19957 4.31433 3.76001 3.76003C4.3143 3.19959 4.97474 2.75528 5.70276 2.45309C6.43078 2.15089 7.21176 1.99686 8 2.00002V2.00002ZM8 0.500023C7.01492 0.497598 6.03921 0.690846 5.12939 1.0685C4.21958 1.44616 3.39374 2.00072 2.69995 2.70003C2.00331 3.39568 1.45068 4.22182 1.07361 5.13125C0.696533 6.04067 0.502441 7.01552 0.502441 8.00002C0.502441 8.98452 0.696533 9.95937 1.07361 10.8688C1.45068 11.7782 2.00331 12.6044 2.69995 13.3C3.39374 13.9993 4.21958 14.5539 5.12939 14.9315C6.03921 15.3092 7.01492 15.5024 8 15.5C8.98508 15.5024 9.96079 15.3092 10.8706 14.9315C11.7804 14.5539 12.6063 13.9993 13.3 13.3C13.9967 12.6044 14.5493 11.7782 14.9264 10.8688C15.3035 9.95937 15.4976 8.98452 15.4976 8.00002C15.4976 7.01552 15.3035 6.04067 14.9264 5.13125C14.5493 4.22182 13.9967 3.39568 13.3 2.70003C12.6063 2.00072 11.7804 1.44616 10.8706 1.0685C9.96079 0.690846 8.98508 0.497598 8 0.500023V0.500023Z" fill="white"/>
+<path d="M13.78 3.21997L3.21997 13.78C4.65874 14.9683 6.48884 15.5776 8.35278 15.4888C10.2167 15.4001 11.9807 14.6196 13.3 13.3C14.6197 11.9806 15.4001 10.2167 15.4889 8.35278C15.5777 6.48884 14.9683 4.65874 13.78 3.21997V3.21997Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetActions/remove-vertex-colors.svg b/Content/Slate/Starship/AssetActions/remove-vertex-colors.svg
new file mode 100644
index 0000000..080e5af
--- /dev/null
+++ b/Content/Slate/Starship/AssetActions/remove-vertex-colors.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4.49976 0C2.78976 3.43 0.219727 5.36 0.219727 7.72C0.219727 8.85513 0.670733 9.94376 1.47339 10.7464C2.27604 11.5491 3.36463 12 4.49976 12C5.63488 12 6.72347 11.5491 7.52612 10.7464C8.32878 9.94376 8.77979 8.85513 8.77979 7.72C8.77979 5.36 6.20976 3.43 4.49976 0Z" fill="white"/>
+<path d="M14.5 9.5L9.5 14.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="square"/>
+<path d="M9.5 9.5L14.5 14.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="square"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetActions/volume-texture.svg b/Content/Slate/Starship/AssetActions/volume-texture.svg
new file mode 100644
index 0000000..8ea26d3
--- /dev/null
+++ b/Content/Slate/Starship/AssetActions/volume-texture.svg
@@ -0,0 +1,14 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M6 4H3V7H6V4Z" fill="white"/>
+<path d="M6 10H3V13H6V10Z" fill="white"/>
+<path d="M9 7H6V10H9V7Z" fill="white"/>
+<path d="M12 4H9V7H12V4Z" fill="white"/>
+<path d="M12 10H9V13H12V10Z" fill="white"/>
+<g opacity="0.5">
+<g opacity="0.5">
+<path opacity="0.5" d="M11 5V12H4V5H11ZM12 4H3V13H12V4Z" fill="white"/>
+</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetEditors/SaveThumbnail.svg b/Content/Slate/Starship/AssetEditors/SaveThumbnail.svg
new file mode 100644
index 0000000..b643672
--- /dev/null
+++ b/Content/Slate/Starship/AssetEditors/SaveThumbnail.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 1V19H18V1H2ZM17 15H3V2H17V15Z" fill="white"/>
+<path opacity="0.5" d="M10.3 15H16.7L13.5 9.40002L10.3 15Z" fill="white"/>
+<path opacity="0.5" d="M3.30005 14.9999H7.90005L10 11.7999L7.50005 7.69995L3.30005 14.9999Z" fill="white"/>
+<path opacity="0.5" d="M12 7.79993C12.9941 7.79993 13.8 6.99405 13.8 5.99994C13.8 5.00583 12.9941 4.19995 12 4.19995C11.0058 4.19995 10.2 5.00583 10.2 5.99994C10.2 6.99405 11.0058 7.79993 12 7.79993Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AIController_16-1.svg b/Content/Slate/Starship/AssetIcons/AIController_16-1.svg
new file mode 100644
index 0000000..b9b2387
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AIController_16-1.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 10C9.65685 10 11 8.65685 11 7C11 5.34315 9.65685 4 8 4C6.34315 4 5 5.34315 5 7C5 8.65685 6.34315 10 8 10Z" fill="white"/>
+<path d="M10.5 16H5.5L7.5 11H8.5L10.5 16Z" fill="white"/>
+<path opacity="0.5" d="M8.0001 0.599609C4.5001 0.599609 1.6001 3.49951 1.6001 6.99951C1.6001 9.39951 2.9001 11.4996 4.9001 12.5996L5.5001 11.1995C4.1001 10.2995 3.2001 8.79961 3.2001 7.09961C3.2001 4.39961 5.4001 2.29956 8.0001 2.29956C10.6001 2.29956 12.8001 4.49961 12.8001 7.09961C12.8001 8.79961 11.9001 10.3995 10.5001 11.1995L11.1001 12.5996C13.0001 11.4996 14.4001 9.39951 14.4001 6.99951C14.4001 3.49951 11.5001 0.599609 8.0001 0.599609Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AIController_16.svg b/Content/Slate/Starship/AssetIcons/AIController_16.svg
new file mode 100644
index 0000000..8446cb7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AIController_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 10C9.65685 10 11 8.65685 11 7C11 5.34315 9.65685 4 8 4C6.34315 4 5 5.34315 5 7C5 8.65685 6.34315 10 8 10Z" fill="white"/>
+<path d="M10.5 16H5.5L7.5 11H8.5L10.5 16Z" fill="white"/>
+<path opacity="0.5" d="M8.0001 0.599609C4.5001 0.599609 1.6001 3.49961 1.6001 6.99961C1.6001 9.39961 2.9001 11.4996 4.9001 12.5996L5.5001 11.1996C4.1001 10.2996 3.2001 8.69961 3.2001 6.99961C3.2001 4.29961 5.4001 2.19961 8.0001 2.19961C10.6001 2.19961 12.8001 4.39961 12.8001 6.99961C12.8001 8.69961 11.9001 10.2996 10.5001 11.0996L11.1001 12.4996C13.0001 11.3996 14.4001 9.29961 14.4001 6.89961C14.4001 3.49961 11.5001 0.599609 8.0001 0.599609Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AIController_64.svg b/Content/Slate/Starship/AssetIcons/AIController_64.svg
new file mode 100644
index 0000000..cf96c1c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AIController_64.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AiController_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{opacity:0.5;fill:url(#SVGID_3_);enable-background:new    ;}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<radialGradient id="SVGID_1_" cx="31.935" cy="33.7693" r="16.2969" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.3452" style="stop-color:#F2F2F2"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</radialGradient>
+<path class="st1" d="M32,37.6c5.5,0,9.9-4.4,9.9-9.9s-4.4-9.9-9.9-9.9s-9.9,4.4-9.9,9.9S26.5,37.6,32,37.6z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.2301" y1="41.6766" x2="31.913" y2="62.4461">
+	<stop  offset="0.3452" style="stop-color:#F2F2F2"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</linearGradient>
+<path class="st2" d="M39.2,57.5H24.8c-0.5,0-0.9-0.5-0.7-1l6-15.1c0.1-0.3,0.4-0.5,0.7-0.5h2.3c0.3,0,0.6,0.2,0.7,0.5l6,15.1
+	C40.1,57,39.7,57.5,39.2,57.5z"/>
+<radialGradient id="SVGID_3_" cx="32" cy="26.3691" r="20.5473" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.7208" style="stop-color:#F2F2F2"/>
+	<stop  offset="1" style="stop-color:#999999"/>
+</radialGradient>
+<path class="st3" d="M32,6.5c-11.6,0-21.2,9.6-21.2,21.2c0,7.9,4.3,14.9,10.9,18.5l2-4.6c-4.6-3-7.6-7.9-7.6-13.6
+	c0-8.9,7.3-15.9,15.9-15.9c8.6,0,15.9,7.3,15.9,15.9c0,5.6-3,10.9-7.6,13.6l2,4.6c6.3-3.6,10.9-10.6,10.9-18.5
+	C53.2,16.1,43.6,6.5,32,6.5z"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ActorComponent_16.svg b/Content/Slate/Starship/AssetIcons/ActorComponent_16.svg
new file mode 100644
index 0000000..46cdf10
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ActorComponent_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 1V5C11.9918 5.14874 11.9504 5.29375 11.879 5.42446C11.8075 5.55517 11.7078 5.66827 11.587 5.75549C11.4663 5.8427 11.3275 5.90183 11.181 5.92857C11.0344 5.9553 10.8838 5.94896 10.74 5.91C9.60001 5.63 9.12 5.06 7.5 5.06H7.38C6.75891 5.14584 6.18531 5.43986 5.75299 5.89397C5.32067 6.34809 5.05521 6.93544 5 7.56V8.5C5.05696 9.12394 5.32301 9.71034 5.755 10.1641C6.187 10.6179 6.75962 10.9124 7.38 11H7.5C9.12 11 9.60001 10.42 10.74 10.14C10.88 10.1015 11.0266 10.0939 11.1698 10.1177C11.313 10.1416 11.4493 10.1963 11.5692 10.2782C11.6891 10.36 11.7897 10.467 11.8641 10.5916C11.9385 10.7163 11.9849 10.8556 12 11V15H15V1H12Z" fill="#C0C0C0"/>
+<path d="M10 12.43C9.08649 12.9428 8.04612 13.1855 7 13.13C6.00776 13.0579 5.07 12.6487 4.34241 11.9702C3.61481 11.2917 3.14114 10.3848 3 9.4V6.6C3.14114 5.61521 3.61481 4.7083 4.34241 4.02982C5.07 3.35133 6.00776 2.94208 7 2.87C8.04612 2.81447 9.08649 3.05722 10 3.57V1H1V15H10V12.43Z" fill="#C0C0C0"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ActorComponent_64.svg b/Content/Slate/Starship/AssetIcons/ActorComponent_64.svg
new file mode 100644
index 0000000..2632e17
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ActorComponent_64.svg
@@ -0,0 +1,11 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M54.29 8C54.7427 8.00262 55.1762 8.18363 55.4963 8.50375C55.8164 8.82387 55.9974 9.25728 56 9.70999V54.29C55.9974 54.7427 55.8164 55.1761 55.4963 55.4962C55.1762 55.8164 54.7427 55.9974 54.29 56H45V43C45.0321 42.4663 44.9506 41.932 44.7609 41.4321C44.5713 40.9323 44.2777 40.4783 43.8997 40.1003C43.5216 39.7223 43.0677 39.4287 42.5679 39.2391C42.068 39.0494 41.5337 38.9679 41 39C37 39 35 44 29 44C23 44 19.29 39.54 19.29 32C19.29 24.46 23 20 29 20C35 20 36 25 40 25C42.47 25 45 23.32 45 21V8H54.29ZM40 47C40 45.75 39 44 37 46C34.8328 48.015 31.9578 49.0931 29 49C22.14 49 15 43 15 32C15 21 22.14 15 29 15C31.9578 14.9069 34.8328 15.985 37 18C39 20 40 18.25 40 17V8H9.71002C9.25731 8.00262 8.82384 8.18363 8.50372 8.50375C8.1836 8.82387 8.00262 9.25728 8 9.70999V54.29C8.00262 54.7427 8.1836 55.1761 8.50372 55.4962C8.82384 55.8164 9.25731 55.9974 9.71002 56H40V47Z" fill="url(#paint0_linear_6488_8043)"/>
+<path opacity="0.1" d="M54.29 9.5C54.3449 9.50244 54.3969 9.52534 54.4358 9.56421C54.4747 9.60307 54.4976 9.65508 54.5 9.70999V54.29C54.4976 54.3449 54.4747 54.3969 54.4358 54.4358C54.3969 54.4747 54.3449 54.4976 54.29 54.5H46.5V43C46.5342 42.2687 46.4154 41.5382 46.1511 40.8554C45.8868 40.1727 45.4829 39.5526 44.9651 39.0349C44.4474 38.5172 43.8273 38.1132 43.1445 37.8489C42.4618 37.5846 41.7313 37.4658 41 37.5C38.72 37.5 37 38.72 35.39 39.91C33.55 41.24 31.82 42.5 29 42.5C23.78 42.5 20.79 38.67 20.79 32C20.79 25.33 23.79 21.5 29 21.5C31.75 21.5 33.2 22.72 34.73 24.02C36.1 25.18 37.65 26.5 40 26.5C43.14 26.5 46.5 24.29 46.5 21V9.5H54.29ZM38.5 9.5V17C38.5104 17.0964 38.5104 17.1936 38.5 17.29C38.3595 17.1818 38.2259 17.0649 38.1 16.94C36.8849 15.7949 35.4554 14.9014 33.8936 14.311C32.3318 13.7206 30.6687 13.445 29 13.5C21.49 13.5 13.5 19.98 13.5 32C13.5 44.02 21.5 50.5 29 50.5C30.6621 50.5497 32.3177 50.2715 33.8722 49.6812C35.4267 49.091 36.8497 48.2003 38.06 47.06C38.1832 46.9322 38.317 46.8151 38.46 46.71C38.4704 46.8064 38.4704 46.9036 38.46 47V54.5H9.66998C9.61507 54.4976 9.5631 54.4747 9.52423 54.4358C9.48537 54.3969 9.46247 54.3449 9.46002 54.29V9.70999C9.46247 9.65508 9.48537 9.60307 9.52423 9.56421C9.5631 9.52534 9.61507 9.50244 9.66998 9.5H38.46H38.5ZM54.25 8H45V21C45 23.32 42.47 25 40 25C36 25 35 20 29 20C23 20 19.29 24.46 19.29 32C19.29 39.54 23 44 29 44C35 44 37 39 41 39C41.5337 38.9679 42.068 39.0494 42.5679 39.2391C43.0677 39.4287 43.5216 39.7223 43.8997 40.1003C44.2777 40.4783 44.5713 40.9323 44.7609 41.4321C44.9506 41.932 45.0321 42.4663 45 43V56H54.29C54.7427 55.9974 55.1762 55.8164 55.4963 55.4962C55.8164 55.1761 55.9974 54.7427 56 54.29V9.70999C55.9974 9.25728 55.8164 8.82387 55.4963 8.50375C55.1762 8.18363 54.7427 8.00262 54.29 8H54.25ZM40 8H9.71002C9.25731 8.00262 8.82384 8.18363 8.50372 8.50375C8.1836 8.82387 8.00262 9.25728 8 9.70999V54.29C8.00262 54.7427 8.1836 55.1761 8.50372 55.4962C8.82384 55.8164 9.25731 55.9974 9.71002 56H40V47C40 46.16 39.55 45.09 38.64 45.09C37.9953 45.167 37.4065 45.4937 37 46C34.8328 48.015 31.9578 49.0931 29 49C22.14 49 15 43 15 32C15 21 22.14 15 29 15C31.9578 14.9069 34.8328 15.985 37 18C37.4065 18.5063 37.9953 18.833 38.64 18.91C39.55 18.91 40 17.84 40 17V8Z" fill="white"/>
+<path opacity="0.1" d="M54.29 9.5C54.3449 9.50244 54.3969 9.52534 54.4358 9.56421C54.4747 9.60307 54.4976 9.65508 54.5 9.70999V54.29C54.4976 54.3449 54.4747 54.3969 54.4358 54.4358C54.3969 54.4747 54.3449 54.4976 54.29 54.5H46.5V43C46.5342 42.2687 46.4154 41.5382 46.1511 40.8554C45.8868 40.1727 45.4829 39.5526 44.9651 39.0349C44.4474 38.5172 43.8273 38.1132 43.1445 37.8489C42.4618 37.5846 41.7313 37.4658 41 37.5C38.72 37.5 37 38.72 35.39 39.91C33.55 41.24 31.82 42.5 29 42.5C23.78 42.5 20.79 38.67 20.79 32C20.79 25.33 23.79 21.5 29 21.5C31.75 21.5 33.2 22.72 34.73 24.02C36.1 25.18 37.65 26.5 40 26.5C43.14 26.5 46.5 24.29 46.5 21V9.5H54.29ZM38.5 9.5V17C38.5104 17.0964 38.5104 17.1936 38.5 17.29C38.3595 17.1818 38.2259 17.0649 38.1 16.94C36.8849 15.7949 35.4554 14.9014 33.8936 14.311C32.3318 13.7206 30.6687 13.445 29 13.5C21.49 13.5 13.5 19.98 13.5 32C13.5 44.02 21.5 50.5 29 50.5C30.6621 50.5497 32.3177 50.2715 33.8722 49.6812C35.4267 49.091 36.8497 48.2003 38.06 47.06C38.1832 46.9322 38.317 46.8151 38.46 46.71C38.4704 46.8064 38.4704 46.9036 38.46 47V54.5H9.66998C9.61507 54.4976 9.5631 54.4747 9.52423 54.4358C9.48537 54.3969 9.46247 54.3449 9.46002 54.29V9.70999C9.46247 9.65508 9.48537 9.60307 9.52423 9.56421C9.5631 9.52534 9.61507 9.50244 9.66998 9.5H38.46H38.5ZM54.25 8H45V21C45 23.32 42.47 25 40 25C36 25 35 20 29 20C23 20 19.29 24.46 19.29 32C19.29 39.54 23 44 29 44C35 44 37 39 41 39C41.5337 38.9679 42.068 39.0494 42.5679 39.2391C43.0677 39.4287 43.5216 39.7223 43.8997 40.1003C44.2777 40.4783 44.5713 40.9323 44.7609 41.4321C44.9506 41.932 45.0321 42.4663 45 43V56H54.29C54.7427 55.9974 55.1762 55.8164 55.4963 55.4962C55.8164 55.1761 55.9974 54.7427 56 54.29V9.70999C55.9974 9.25728 55.8164 8.82387 55.4963 8.50375C55.1762 8.18363 54.7427 8.00262 54.29 8H54.25ZM40 8H9.71002C9.25731 8.00262 8.82384 8.18363 8.50372 8.50375C8.1836 8.82387 8.00262 9.25728 8 9.70999V54.29C8.00262 54.7427 8.1836 55.1761 8.50372 55.4962C8.82384 55.8164 9.25731 55.9974 9.71002 56H40V47C40 46.16 39.55 45.09 38.64 45.09C37.9953 45.167 37.4065 45.4937 37 46C34.8328 48.015 31.9578 49.0931 29 49C22.14 49 15 43 15 32C15 21 22.14 15 29 15C31.9578 14.9069 34.8328 15.985 37 18C37.4065 18.5063 37.9953 18.833 38.64 18.91C39.55 18.91 40 17.84 40 17V8Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_6488_8043" x1="48.08" y1="4.15" x2="15.92" y2="59.85" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#4F4F4F"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Actor_16.svg b/Content/Slate/Starship/AssetIcons/Actor_16.svg
new file mode 100644
index 0000000..e008ca4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Actor_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M14 14L13 10L16 14V16H0V14L3 10L2 14H4H11H14Z" fill="white"/>
+<path opacity="0.5" d="M8 0C6.4087 0 4.8826 0.632136 3.75739 1.75735C2.63217 2.88257 2 4.4087 2 6C2 7.5913 2.63217 9.11743 3.75739 10.2426C4.8826 11.3679 6.4087 12 8 12C9.5913 12 11.1174 11.3679 12.2426 10.2426C13.3679 9.11743 14 7.5913 14 6C14 4.4087 13.3679 2.88257 12.2426 1.75735C11.1174 0.632136 9.5913 0 8 0V0Z" fill="white"/>
+<path d="M8.43005 10.3301C7.16762 10.3301 5.95688 9.82856 5.06421 8.93588C4.17154 8.04321 3.67004 6.8325 3.67004 5.57007C3.66885 4.34319 4.14145 3.16323 4.9892 2.27635C5.83694 1.38948 6.99435 0.864185 8.22003 0.810059H8.00006C6.62094 0.810059 5.29831 1.35791 4.32312 2.3331C3.34793 3.30829 2.80005 4.63093 2.80005 6.01006C2.80005 7.38918 3.34793 8.71182 4.32312 9.68701C5.29831 10.6622 6.62094 11.2101 8.00006 11.2101C9.37919 11.2101 10.7018 10.6622 11.677 9.68701C12.6522 8.71182 13.2001 7.38918 13.2001 6.01006C13.2001 5.94006 13.2001 5.87005 13.2001 5.79005C13.1434 7.0157 12.6156 8.17211 11.7268 9.01801C10.8381 9.8639 9.657 10.334 8.43005 10.3301V10.3301Z" fill="white"/>
+<path d="M10.0401 5.16001C10.7028 5.16001 11.2401 4.62275 11.2401 3.96001C11.2401 3.29727 10.7028 2.76001 10.0401 2.76001C9.37735 2.76001 8.84009 3.29727 8.84009 3.96001C8.84009 4.62275 9.37735 5.16001 10.0401 5.16001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Actor_64.svg b/Content/Slate/Starship/AssetIcons/Actor_64.svg
new file mode 100644
index 0000000..7cc063a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Actor_64.svg
@@ -0,0 +1,18 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.7 51.1799L50.7 36.1799L59 52.4299V58.9999H6V52.4099L14.3 35.9199L9.29999 51.1799H55.7Z" fill="url(#paint0_linear_6488_8137)"/>
+<path d="M58.88 52.4099H6V58.9999H58.88V52.4099Z" fill="#BFBFBF"/>
+<path d="M32.5 47.4501C38.3348 47.4501 43.9305 45.1322 48.0563 41.0064C52.1821 36.8806 54.5 31.2848 54.5 25.4501C54.4736 19.6327 52.1441 14.0625 48.0211 9.95831C43.8982 5.85412 38.3175 3.54999 32.5 3.55005C26.6825 3.54999 21.1018 5.85412 16.9789 9.95831C12.8559 14.0625 10.5264 19.6327 10.5 25.4501C10.5158 31.28 12.8387 36.8665 16.9611 40.9889C21.0835 45.1113 26.6701 47.4342 32.5 47.4501V47.4501Z" fill="url(#paint1_radial_6488_8137)"/>
+<defs>
+<linearGradient id="paint0_linear_6488_8137" x1="32.51" y1="58.5699" x2="32.45" y2="36.0299" gradientUnits="userSpaceOnUse">
+<stop offset="0.39" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#404040"/>
+</linearGradient>
+<radialGradient id="paint1_radial_6488_8137" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(35.0917 21.0742) scale(31.3017)">
+<stop stop-color="white"/>
+<stop offset="0.31" stop-color="#B3B3B3"/>
+<stop offset="0.64" stop-color="#6A6A6A"/>
+<stop offset="0.79" stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#666666"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace1D_16.svg b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace1D_16.svg
new file mode 100644
index 0000000..71aa847
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace1D_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 8H8V1H7V8H0V9H7V16H8V9H15V8Z" fill="white"/>
+<path opacity="0.5" d="M7.5 13.5C10.2614 13.5 12.5 11.2614 12.5 8.5C12.5 5.73858 10.2614 3.5 7.5 3.5C4.73858 3.5 2.5 5.73858 2.5 8.5C2.5 11.2614 4.73858 13.5 7.5 13.5Z" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M13.2 2.8C12.4 2 11.4 1.4 10.4 1L10 1.9C10.9 2.2 11.8 2.8 12.5 3.5C13.2 4.2 13.8 5.1 14.1 6L15 5.6C14.6 4.6 14 3.6 13.2 2.8Z" fill="white"/>
+<path opacity="0.5" d="M14.9002 1.1C14.4002 0.6 13.8002 0.2 13.1002 0L12.7002 0.9C13.2002 1.1 13.7002 1.4 14.2002 1.8C14.7002 2.2 14.9002 2.7 15.1002 3.3L16.0002 2.9C15.8002 2.3 15.4002 1.7 14.9002 1.1Z" fill="white"/>
+<path d="M12.9999 15.9996H12.5999V13.4996L11.8999 13.7996V13.4996L12.8999 13.0996H12.9999V15.9996Z" fill="white"/>
+<path d="M14 16V13H14.8C15 13 15.3 13.1 15.4 13.2C15.6 13.3 15.7 13.5 15.8 13.7C15.9 13.9 16 14.2 16 14.4V14.6C16 14.9 15.9 15.1 15.8 15.3C15.7 15.5 15.6 15.7 15.4 15.8C15.2 15.9 15 16 14.8 16H14ZM14.4 13.3V15.7H14.8C15.1 15.7 15.3 15.6 15.5 15.4C15.7 15.2 15.7 14.9 15.7 14.6V14.4C15.7 14.1 15.6 13.8 15.5 13.6C15.4 13.4 15.1 13.3 14.9 13.3H14.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace1D_64.svg b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace1D_64.svg
new file mode 100644
index 0000000..ca08865
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace1D_64.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AimOffsetBlendSpace1D_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;enable-background:new    ;}
+	.st3{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st4{fill:none;stroke:#B2B2B2;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:#FFFFFF;stroke:#333333;stroke-width:0.5;stroke-miterlimit:10;}
+	.st6{font-family:'Roboto-Black';}
+	.st7{font-size:15.784px;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<radialGradient id="SVGID_1_" cx="31.9667" cy="32.0333" r="19.9193" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<circle class="st1" cx="32" cy="32" r="19.9"/>
+		<g>
+			<path class="st2" d="M54.7,31.1H32.9V9.3l-0.9-2l-0.9,2v21.8H9.3l-2,0.9l2,0.9h21.8v21.8l0.9,2l0.9-2V32.9h21.8l2-0.9L54.7,31.1z
+				"/>
+			<path class="st3" d="M29.5,50.7v-5c-5.5-1-10.1-5.5-11.1-11.1h-5C14.3,43.1,20.9,49.7,29.5,50.7z"/>
+			<path class="st3" d="M13.3,29.5h5c1-5.5,5.5-10.1,11.1-11.1v-5C20.9,14.3,14.3,20.9,13.3,29.5z"/>
+			<path class="st3" d="M50.7,34.5h-5c-1,5.5-5.5,10.1-11.1,11.1v5C43.1,49.7,49.7,43.1,50.7,34.5z"/>
+			<path class="st3" d="M34.5,13.3v5c5.5,1,10.1,5.5,11.1,11.1h5C49.7,20.9,43.1,14.3,34.5,13.3z"/>
+		</g>
+	</g>
+	<path class="st4" d="M35.7,7.3c0,0,16.9,0.3,21,19"/>
+	<path class="st4" d="M45.5,4.7c0,0,8.8,1.7,12.7,11.7"/>
+	<g>
+		<text transform="matrix(1 0 0 1 38.7442 56.6943)" class="st5 st6 st7">1D</text>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace_16.svg b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace_16.svg
new file mode 100644
index 0000000..85da892
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 8H8V1H7V8H0V9H7V16H8V9H15V8Z" fill="white"/>
+<path opacity="0.5" d="M7.5 13.5C10.2614 13.5 12.5 11.2614 12.5 8.5C12.5 5.73858 10.2614 3.5 7.5 3.5C4.73858 3.5 2.5 5.73858 2.5 8.5C2.5 11.2614 4.73858 13.5 7.5 13.5Z" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M13.2 2.8C12.4 2 11.4 1.4 10.4 1L10 1.9C10.9 2.2 11.8 2.8 12.5 3.5C13.2 4.2 13.8 5.1 14.1 6L15 5.6C14.6 4.6 14 3.6 13.2 2.8Z" fill="white"/>
+<path opacity="0.5" d="M14.9002 1.1C14.4002 0.6 13.8002 0.2 13.1002 0L12.7002 0.9C13.2002 1.1 13.7002 1.4 14.2002 1.8C14.7002 2.2 14.9002 2.7 15.1002 3.3L16.0002 2.9C15.8002 2.3 15.4002 1.7 14.9002 1.1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace_64.svg b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace_64.svg
new file mode 100644
index 0000000..db164bb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AimOffsetBlendSpace_64.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AimOffsetBlendSpace_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;enable-background:new    ;}
+	.st3{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st4{fill:none;stroke:#B2B2B2;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<radialGradient id="SVGID_1_" cx="31.9667" cy="32.0333" r="19.9193" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<circle class="st1" cx="32" cy="32" r="19.9"/>
+		<g>
+			<path class="st2" d="M54.7,31.1H32.9V9.3l-0.9-2l-0.9,2v21.8H9.3l-2,0.9l2,0.9h21.8v21.8l0.9,2l0.9-2V32.9h21.8l2-0.9L54.7,31.1z
+				"/>
+			<path class="st3" d="M29.5,50.7v-5c-5.5-1-10.1-5.5-11.1-11.1h-5C14.3,43.1,20.9,49.7,29.5,50.7z"/>
+			<path class="st3" d="M13.3,29.5h5c1-5.5,5.5-10.1,11.1-11.1v-5C20.9,14.3,14.3,20.9,13.3,29.5z"/>
+			<path class="st3" d="M50.7,34.5h-5c-1,5.5-5.5,10.1-11.1,11.1v5C43.1,49.7,49.7,43.1,50.7,34.5z"/>
+			<path class="st3" d="M34.5,13.3v5c5.5,1,10.1,5.5,11.1,11.1h5C49.7,20.9,43.1,14.3,34.5,13.3z"/>
+		</g>
+	</g>
+	<path class="st4" d="M35.7,7.3c0,0,16.9,0.3,21,19"/>
+	<path class="st4" d="M45.5,4.7c0,0,8.8,1.7,12.7,11.7"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AmbientSound_16.svg b/Content/Slate/Starship/AssetIcons/AmbientSound_16.svg
new file mode 100644
index 0000000..7f4f2c6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AmbientSound_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 5H3L7 1V15L3 11H0V5Z" fill="white"/>
+<path opacity="0.5" d="M9 1C13 2.7 15 5.4 15 8C15 10.6 13 13.3 9 15C11.5 12.8 12.7 10.4 12.7 8C12.7 5.6 11.5 3.2 9 1Z" fill="white"/>
+<path opacity="0.5" d="M9 5C10.3 5.7 11 6.9 11 8C11 9.1 10.3 10.3 9 11C9.8 10 9.8 6 9 5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AmbientSound_64.svg b/Content/Slate/Starship/AssetIcons/AmbientSound_64.svg
new file mode 100644
index 0000000..9fc512f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AmbientSound_64.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AmbientSound_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:#7F7F7F;enable-background:new    ;}
+	.st4{fill:#BFBFBF;enable-background:new    ;}
+	.st5{fill:none;}
+</style>
+<g>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="33.6151" y1="25.2336" x2="33.6497" y2="45.4798" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st0" d="M23.2,41.3h-6.8c-2.8,0-5-2.3-5-5V26.1c0-2.8,2.3-5,5-5h6.8V41.3z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="47.0329" y1="14.7645" x2="46.8819" y2="55.5358" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M35.8,51.2l-12.6-9.9V21.1l12.6-9.9c0.9-0.7,2.2-0.1,2.2,1.1v38C38,51.3,36.7,51.9,35.8,51.2z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="34.9581" y1="35.3524" x2="39.5344" y2="35.3524" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="18.6" y="21.1" class="st2" width="4.6" height="20.2"/>
+	</g>
+	<g>
+		<path class="st3" d="M42.4,13.5c6.7,4.2,10.2,11,10.2,17.7c0,6.6-3.5,13.5-10.2,17.7c4.2-5.7,6.3-11.6,6.3-17.7
+			C48.7,25.1,46.6,19.1,42.4,13.5z"/>
+		<path class="st4" d="M40.3,22.1c2.7,2.2,4.1,5.7,4.1,9.1c0,3.4-1.4,6.9-4.1,9.1C42,37.4,42,25,40.3,22.1z"/>
+	</g>
+	<rect x="0" class="st5" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimBlueprint_16.svg b/Content/Slate/Starship/AssetIcons/AnimBlueprint_16.svg
new file mode 100644
index 0000000..3861e50
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimBlueprint_16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 10H13V12H15V10Z" fill="white"/>
+<path d="M15 14H13V16H15V14Z" fill="white"/>
+<path d="M10 12H8V14H10V12Z" fill="white"/>
+<path opacity="0.5" d="M14 11V10H11V13H9V14H11V16H14V15H12V11H14Z" fill="white"/>
+<path opacity="0.5" d="M12.0002 5.19961H10.0002L9.1002 3.59961C9.1002 3.59961 9.3002 4.19961 9.1002 4.59961L8.7002 5.19961L9.2002 5.99961C9.3002 6.19961 9.5002 6.29961 9.8002 6.29961H12.0002C12.3002 6.29961 12.6002 5.99961 12.6002 5.69961C12.6002 5.49961 12.3002 5.19961 12.0002 5.19961Z" fill="white"/>
+<path opacity="0.5" d="M5.2001 7.49922C4.9001 7.29922 4.7001 6.99922 4.6001 6.69922L3.7001 8.19922H1.7001C1.4001 8.19922 1.1001 8.49922 1.1001 8.79922C1.1001 9.09922 1.4001 9.39922 1.7001 9.39922H4.0001C4.2001 9.39922 4.4001 9.29922 4.6001 9.09922L5.4001 7.69922L5.2001 7.49922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.09993 4.10017L5.39993 2.70017L6.59993 3.30017L4.99993 6.00017C4.89993 6.40017 5.09993 6.90017 5.49993 7.10017L5.59993 7.20017L7.89993 8.50017V10.4002C7.89993 10.7002 8.19993 11.0002 8.49993 11.0002C8.79993 11.0002 8.99993 10.7002 8.99993 10.4002V8.20017C8.99993 8.00017 8.89993 7.90017 8.79993 7.80017C8.79993 7.80017 8.79993 7.80017 8.69993 7.80017C8.69993 7.80017 8.69993 7.80017 8.59994 7.80017L7.29993 6.90017L8.49993 4.80017L8.79993 4.20017C8.99993 3.80017 8.89993 3.40017 8.69993 3.20017L7.79993 2.70017L7.59993 2.60017C7.49993 2.60017 7.49993 2.60017 7.49993 2.50017L5.49993 1.50017C5.19993 1.40017 4.89993 1.50017 4.69993 1.70017L3.19993 3.40017C2.99993 3.60017 2.99993 3.90017 3.29993 4.10017C3.49993 4.40017 3.79993 4.30017 4.09993 4.10017Z" fill="white"/>
+<path d="M9.7998 3C10.6282 3 11.2998 2.32843 11.2998 1.5C11.2998 0.671573 10.6282 0 9.7998 0C8.97138 0 8.2998 0.671573 8.2998 1.5C8.2998 2.32843 8.97138 3 9.7998 3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimBlueprint_64.svg b/Content/Slate/Starship/AssetIcons/AnimBlueprint_64.svg
new file mode 100644
index 0000000..4f46982
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimBlueprint_64.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimBlueprint_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:#CCCCCC;}
+	.st2{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_3_);enable-background:new    ;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="34.8292" y1="48.3098" x2="50.4967" y2="48.3098">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="0.5964" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st0" d="M50.5,42.6v-1.4c0-0.5-0.4-0.9-0.9-0.9H42c-0.5,0-0.9,0.4-0.9,0.9V46c0,0.5-0.4,0.9-0.9,0.9h-4.5
+		c-0.5,0-0.9,0.4-0.9,0.9v1.4c0,0.5,0.4,0.9,0.9,0.9h4.5c0.5,0,0.9,0.4,0.9,0.9v4.5c0,0.5,0.4,0.9,0.9,0.9h7.6
+		c0.5,0,0.9-0.4,0.9-0.9V54c0-0.5-0.4-0.9-0.9-0.9h-4.5c-0.5,0-0.9-0.4-0.9-0.9v-7.9c0-0.5,0.4-0.9,0.9-0.9h4.5
+		C50.1,43.5,50.5,43.1,50.5,42.6z"/>
+	<path class="st1" d="M52.8,38.8h-4.7c-0.4,0-0.8,0.4-0.8,0.8v4.7c0,0.4,0.4,0.8,0.8,0.8h4.7c0.4,0,0.8-0.4,0.8-0.8v-4.7
+		C53.6,39.2,53.3,38.8,52.8,38.8z"/>
+	<path class="st1" d="M52.8,51.6h-4.7c-0.4,0-0.8,0.4-0.8,0.8v4.7c0,0.4,0.4,0.8,0.8,0.8h4.7c0.4,0,0.8-0.4,0.8-0.8v-4.7
+		C53.6,51.9,53.3,51.6,52.8,51.6z"/>
+	<path class="st1" d="M37.2,45.2h-4.7c-0.4,0-0.8,0.4-0.8,0.8v4.7c0,0.4,0.4,0.8,0.8,0.8h4.7c0.4,0,0.8-0.4,0.8-0.8V46
+		C38,45.5,37.6,45.2,37.2,45.2z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="33.5192" y1="19.6419" x2="47.5108" y2="28.9696">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="0.1624" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st2" d="M45.9,25c0,0.5-0.4,0.8-0.9,0.8h-7.7c-0.9,0-1.6-0.3-1.9-0.9l-2.8-4.1v-1.9c0.6-1.3,1.3-2.7,1.3-2.7l4.1,6.3
+		l7.2,0.8c0.5,0.1,0.8,0.5,0.8,0.9L45.9,25z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="24.1083" y1="28.562" x2="7.5136" y2="35.9374">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="0.1624" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st3" d="M10.4,34.6c0,0.5,0.4,1,1,1h7.8c0.6,0,1.3-0.3,1.9-0.9l3.8-6.3l-1.1-1.2c-0.9-0.6-0.7-2-1-3l-4.5,7.7l-7,1
+		c-0.5,0.1-0.9,0.5-0.9,1V34.6z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="18.3048" y1="29.5954" x2="35.6657" y2="22.4346">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<path class="st4" d="M32.9,40.2c0.9,0.4,1.9-0.3,1.9-1.3l0-7.1c0-0.6-0.3-0.9-0.6-1.3l-0.6-0.4L30,27.5c-0.1-0.1-0.2-0.3-0.1-0.4
+		l3.3-5.8c0,0,0,0,0,0l0.9-1.9c0.6-1.2,0.3-2.5-0.3-3.1c0,0-0.1-0.1-0.1-0.1l-2.8-1.5l-7.2-3.8c-0.9-0.3-1.9,0-2.5,0.6l-4.9,6.4
+		c-0.4,0.5-0.3,1.2,0.2,1.6l0,0c0.4,0.4,1.1,0.4,1.6,0l5.2-4.7c0.1-0.1,0.3-0.1,0.4-0.1l3.2,1.6c0.2,0.1,0.2,0.3,0.1,0.5l-4.8,8.1
+		c0,0,0,0.1,0,0.1c-0.3,1.2,0.2,2.9,1.5,3.5l0.4,0.2l7,4c0.1,0.1,0.2,0.2,0.2,0.3l0.6,6.1C32,39.6,32.4,40.1,32.9,40.2L32.9,40.2z"
+		/>
+	<radialGradient id="SVGID_5_" cx="37.336" cy="10.8356" r="4.7003" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</radialGradient>
+	<path class="st5" d="M37.3,15.5c2.6,0,4.7-2.1,4.7-4.7c0-2.6-2.1-4.7-4.7-4.7c-2.6,0-4.7,2.1-4.7,4.7
+		C32.6,13.4,34.7,15.5,37.3,15.5z"/>
+</g>
+<rect x="0" class="st6" width="64" height="64"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimComposite_16.svg b/Content/Slate/Starship/AssetIcons/AnimComposite_16.svg
new file mode 100644
index 0000000..3388503
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimComposite_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10.1002 5.59922C10.1002 5.89922 9.90019 6.09922 9.60019 6.09922H7.60019C7.30019 6.09922 7.20019 5.99922 7.10019 5.79922L6.7002 5.09922L7.00019 4.59922C7.20019 4.19922 7.00019 3.69922 7.00019 3.69922L7.80019 5.09922H9.60019C9.90019 5.09922 10.1002 5.39922 10.1002 5.59922ZM3.60019 7.09922C3.30019 6.89922 3.20019 6.69922 3.10019 6.49922L2.4002 7.79922H0.700195C0.400195 7.79922 0.200195 7.99922 0.200195 8.29922C0.200195 8.59922 0.400195 8.79922 0.700195 8.79922H2.7002C2.9002 8.79922 3.1002 8.69922 3.2002 8.49922L3.9002 7.29922L3.60019 7.09922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.9 4.19961C1.7 3.99961 1.7 3.69961 1.9 3.49961L3.2 1.99961C3.4 1.79961 3.6 1.69961 3.9 1.79961L5.7 2.69961H5.8L6 2.79961L6.8 3.19961C7 3.39961 7.1 3.79961 6.9 4.09961L6.6 4.59961L5.5 6.39961L6.8 7.09961C6.9 7.49961 7 7.59961 7 7.79961V9.79961C7 10.0996 6.8 10.2996 6.5 10.2996C6.2 10.2996 6 10.0996 6 9.79961V7.99961L4 6.79961H3.9C3.5 6.59961 3.4 6.19961 3.4 5.79961L4.8 3.39961L3.7 2.89961L2.6 4.09961C2.4 4.39961 2.1 4.39961 1.9 4.19961ZM7.6 0.599609C6.9 0.599609 6.3 1.19961 6.3 1.89961C6.3 2.59961 6.9 3.19961 7.6 3.19961C8.3 3.19961 8.9 2.59961 8.9 1.89961C8.9 1.19961 8.3 0.599609 7.6 0.599609Z" fill="white"/>
+<path d="M7.5 13.2998C7.5 13.2998 11 15.2998 11.5 15.4998L15.5 13.2998L14.6 12.7998L11.5 14.4998L8.4 12.7998L7.5 13.2998Z" fill="white"/>
+<path d="M7.5 11.0996C7.5 11.0996 11 13.0996 11.5 13.2996L15.5 11.0996L14.6 10.5996L11.5 12.2996L8.4 10.5996C8.4 10.5996 7.5 11.0996 7.5 11.0996Z" fill="white"/>
+<path d="M7.5 9C7.5 9 11 11 11.5 11.2L15.5 9L11.5 7.5L7.5 9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimComposite_64.svg b/Content/Slate/Starship/AssetIcons/AnimComposite_64.svg
new file mode 100644
index 0000000..8151fb6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimComposite_64.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimComposite_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:#FFFFFF;}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.5676" y1="22.1659" x2="44.8725" y2="31.7025">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st0" d="M43.2,27.7c0,0.5-0.4,0.8-0.9,0.8h-7.8c-1,0-1.6-0.3-1.9-1l-2.9-4.2v-2c0.6-1.3,1.3-2.8,1.3-2.8l4.2,6.4
+			l7.3,0.8c0.5,0.1,0.8,0.5,0.8,1L43.2,27.7z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="20.946" y1="31.2857" x2="3.9798" y2="38.8263">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st1" d="M6.9,37.5c0,0.6,0.5,1,1,1h8c0.6,0,1.3-0.3,1.9-1l3.9-6.5l-1.1-1.2c-1-0.6-0.7-2.1-1-3.1l-4.6,7.9l-7.2,1
+			c-0.5,0.1-0.9,0.5-0.9,1V37.5z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="15.0126" y1="32.3423" x2="32.7622" y2="25.0212">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st2" d="M29.9,43.2c1,0.4,2-0.3,2-1.4l0-7.2c0-0.6-0.3-1-0.6-1.3l-0.6-0.5L27,30.2c-0.1-0.1-0.2-0.3-0.1-0.5l3.4-5.9
+			c0,0,0,0,0,0l1-1.9c0.6-1.3,0.3-2.5-0.3-3.2c0,0-0.1-0.1-0.1-0.1L28.1,17l-7.4-3.8c-1-0.3-1.9,0-2.6,0.6l-5,6.5
+			c-0.4,0.5-0.3,1.2,0.2,1.6l0,0c0.5,0.4,1.1,0.4,1.6,0l5.3-4.8c0.1-0.1,0.3-0.1,0.4-0.1l3.3,1.6c0.2,0.1,0.3,0.3,0.1,0.5l-4.9,8.3
+			c0,0,0,0.1,0,0.1c-0.3,1.3,0.3,2.9,1.5,3.5l0.4,0.2l7.2,4.1c0.1,0.1,0.2,0.2,0.2,0.3L29,42C29.1,42.6,29.4,43,29.9,43.2L29.9,43.2
+			z"/>
+		<radialGradient id="SVGID_4_" cx="34.4699" cy="13.1625" r="4.8055" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</radialGradient>
+		<path class="st3" d="M34.5,18c2.7,0,4.8-2.2,4.8-4.8c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8C29.7,15.8,31.8,18,34.5,18z"/>
+	</g>
+	<g>
+		<g>
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="46.8018" y1="43.9809" x2="46.3647" y2="55.4913">
+				<stop  offset="0" style="stop-color:#4D4D4D"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<path class="st4" d="M35.4,49.3c0,0,10,5.5,11.2,6.1l11.2-6.1l-11.2-4.2L35.4,49.3z"/>
+		</g>
+		<g>
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="46.7548" y1="42.0561" x2="46.3177" y2="50.7982">
+				<stop  offset="0" style="stop-color:#999999"/>
+				<stop  offset="1" style="stop-color:#E6E6E6"/>
+			</linearGradient>
+			<path class="st5" d="M35.4,45.1c0,0,10,5.5,11.2,6.1l11.2-6.1l-11.2-4.2L35.4,45.1z"/>
+		</g>
+		<g>
+			<path class="st6" d="M35.4,40.5c0,0,10,5.5,11.2,6.1l11.2-6.1l-11.2-4.2L35.4,40.5z"/>
+		</g>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimInstance_16.svg b/Content/Slate/Starship/AssetIcons/AnimInstance_16.svg
new file mode 100644
index 0000000..a5f88fd
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimInstance_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9.9002 5.49961C9.9002 5.79961 9.60019 5.99961 9.4002 5.99961H7.4002C7.2002 5.99961 7.0002 5.89961 6.9002 5.69961L6.5002 4.99961L6.8002 4.49961C7.0002 4.09961 6.8002 3.59961 6.8002 3.59961L7.6002 4.99961H9.3002C9.6002 4.99961 9.9002 5.19961 9.9002 5.49961ZM3.4002 6.89961C3.2002 6.79961 3.0002 6.59961 2.9002 6.29961L2.2002 7.49961H0.600195C0.400195 7.49961 0.200195 7.79961 0.200195 7.99961C0.200195 8.29961 0.400195 8.49961 0.700195 8.49961H2.5002C2.7002 8.49961 2.9002 8.39961 3.0002 8.19961L3.6002 6.99961L3.4002 6.89961Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M1.7999 4.09961C1.5999 3.89961 1.5999 3.59961 1.7999 3.39961L3.0999 1.99961C3.2999 1.79961 3.4999 1.69961 3.6999 1.79961L5.3999 2.69961H5.4999L5.6999 2.79961L6.4999 3.19961C6.6999 3.39961 6.7999 3.79961 6.5999 4.09961L6.2999 4.59961L5.2999 6.39961L6.4999 7.09961C6.5999 7.19961 6.6999 7.29961 6.6999 7.49961V9.39961C6.6999 9.69961 6.4999 9.89961 6.1999 9.89961C5.9999 9.99961 5.7999 9.79961 5.7999 9.49961V7.89961L3.7999 6.79961H3.6999C3.2999 6.59961 3.1999 6.19961 3.2999 5.79961L4.6999 3.49961L3.5999 2.79961L2.4999 3.99961C2.2999 4.19961 1.9999 4.29961 1.7999 4.09961ZM7.5999 0.599609C6.8999 0.599609 6.2999 1.19961 6.2999 1.89961C6.2999 2.59961 6.8999 3.19961 7.5999 3.19961C8.2999 3.19961 8.8999 2.59961 8.8999 1.89961C8.8999 1.19961 8.2999 0.599609 7.5999 0.599609Z" fill="white"/>
+<path opacity="0.5" d="M15.9 11.4996C15.9 11.7996 15.7 11.9996 15.4 11.9996H13.5C13.2 11.9996 13.1 11.8996 13 11.6996L12.5 10.9996L12.8 10.4996C13 10.0996 12.8 9.59961 12.8 9.59961L13.6 10.9996H15.3C15.6 10.9996 15.9 11.1996 15.9 11.4996ZM9.4 12.8996C9.1 12.7996 9 12.4996 8.9 12.2996L8.2 13.4996H6.5C6.2 13.4996 6 13.7996 6 13.9996C6 14.2996 6.2 14.4996 6.5 14.4996H8.4C8.6 14.4996 8.8 14.3996 8.9 14.1996L9.6 12.9996L9.4 12.8996Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.7999 10.0996C7.5999 9.89961 7.5999 9.59961 7.7999 9.39961L9.0999 7.99961C9.2999 7.79961 9.4999 7.69961 9.6999 7.79961L11.3999 8.69961H11.4999L11.6999 8.79961L12.4999 9.19961C12.6999 9.39961 12.7999 9.79961 12.5999 10.0996L12.2999 10.5996L11.2999 12.3996L12.4999 13.0996C12.5999 13.1996 12.6999 13.2996 12.6999 13.4996V15.3996C12.6999 15.6996 12.4999 15.8996 12.1999 15.8996C11.8999 15.8996 11.6999 15.6996 11.6999 15.3996V13.6996L9.6999 12.5996H9.5999C9.1999 12.3996 9.0999 11.9996 9.1999 11.5996L10.5999 9.29961L9.5999 8.79961L8.4999 9.99961C8.2999 10.1996 7.9999 10.2996 7.7999 10.0996ZM13.5999 6.59961C12.8999 6.59961 12.2999 7.19961 12.2999 7.89961C12.2999 8.59961 12.8999 9.19961 13.5999 9.19961C14.2999 9.19961 14.8999 8.59961 14.8999 7.89961C14.8999 7.19961 14.2999 6.59961 13.5999 6.59961Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimInstance_64.svg b/Content/Slate/Starship/AssetIcons/AnimInstance_64.svg
new file mode 100644
index 0000000..3966777
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimInstance_64.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimInstance_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);enable-background:new    ;}
+	.st5{fill:url(#SVGID_6_);enable-background:new    ;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
+	.st7{fill:url(#SVGID_8_);}
+	.st8{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="43.7928" y1="37.8016" x2="54.4218" y2="44.8876">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st0" d="M53.2,41.9c0,0.4-0.3,0.6-0.7,0.6h-5.8c-0.7,0-1.2-0.2-1.4-0.7l-2.1-3.1v-1.5c0.5-1,1-2,1-2l3.1,4.8l5.5,0.6
+			c0.4,0,0.6,0.4,0.6,0.7L53.2,41.9z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="36.6437" y1="44.5779" x2="24.0372" y2="50.1808">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st1" d="M26.2,49.2c0,0.4,0.3,0.8,0.8,0.8h5.9c0.5,0,1-0.2,1.4-0.7l2.9-4.8l-0.8-0.9c-0.7-0.5-0.5-1.6-0.7-2.3
+			l-3.5,5.8l-5.3,0.8c-0.4,0.1-0.6,0.4-0.6,0.7V49.2z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32.2349" y1="45.3629" x2="45.4235" y2="39.9231">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st2" d="M43.3,53.5c0.7,0.3,1.5-0.2,1.5-1l0-5.4c0-0.5-0.2-0.7-0.5-1l-0.4-0.3l-2.7-2c-0.1-0.1-0.1-0.2-0.1-0.3
+			l2.5-4.4c0,0,0,0,0,0l0.7-1.4c0.5-0.9,0.2-1.9-0.2-2.3c0,0,0,0-0.1-0.1L41.9,34l-5.5-2.9c-0.7-0.2-1.4,0-1.9,0.5l-3.7,4.9
+			c-0.3,0.4-0.2,0.9,0.1,1.2l0,0c0.3,0.3,0.8,0.3,1.2,0l3.9-3.6c0.1-0.1,0.2-0.1,0.3,0l2.4,1.2c0.1,0.1,0.2,0.2,0.1,0.4l-3.6,6.1
+			c0,0,0,0.1,0,0.1c-0.2,0.9,0.2,2.2,1.1,2.6l0.3,0.2l5.4,3c0.1,0,0.1,0.1,0.1,0.2l0.4,4.6C42.7,53,42.9,53.3,43.3,53.5L43.3,53.5z"
+			/>
+		<radialGradient id="SVGID_4_" cx="46.6923" cy="31.1117" r="3.5706" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</radialGradient>
+		<path class="st3" d="M46.7,34.7c2,0,3.6-1.6,3.6-3.6c0-2-1.6-3.6-3.6-3.6c-2,0-3.6,1.6-3.6,3.6C43.1,33.1,44.7,34.7,46.7,34.7z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="28.3631" y1="20.7322" x2="38.9922" y2="27.8182">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<path class="st4" d="M37.7,24.8c0,0.4-0.3,0.6-0.7,0.6h-5.8c-0.7,0-1.2-0.2-1.4-0.7l-2.1-3.1v-1.5c0.5-1,1-2,1-2l3.1,4.8l5.5,0.6
+			c0.4,0,0.6,0.4,0.6,0.7L37.7,24.8z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="21.214" y1="27.5085" x2="8.6075" y2="33.1114">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st5" d="M10.8,32.1c0,0.4,0.3,0.8,0.8,0.8h5.9c0.5,0,1-0.2,1.4-0.7l2.9-4.8l-0.8-0.9c-0.7-0.5-0.5-1.6-0.7-2.3
+			L16.7,30l-5.3,0.8c-0.4,0.1-0.6,0.4-0.6,0.7V32.1z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="16.8052" y1="28.2936" x2="29.9938" y2="22.8538">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st6" d="M27.9,36.4c0.7,0.3,1.5-0.2,1.5-1l0-5.4c0-0.5-0.2-0.7-0.5-1l-0.4-0.3l-2.7-2c-0.1-0.1-0.1-0.2-0.1-0.3
+			l2.5-4.4c0,0,0,0,0,0l0.7-1.4c0.5-0.9,0.2-1.9-0.2-2.3c0,0,0,0-0.1-0.1l-2.1-1.2L21,14c-0.7-0.2-1.4,0-1.9,0.5l-3.7,4.9
+			c-0.3,0.4-0.2,0.9,0.1,1.2l0,0c0.3,0.3,0.8,0.3,1.2,0l3.9-3.6c0.1-0.1,0.2-0.1,0.3,0l2.4,1.2c0.1,0.1,0.2,0.2,0.1,0.4l-3.6,6.1
+			c0,0,0,0.1,0,0.1C19.6,25.7,20,27,21,27.4l0.3,0.2l5.4,3c0.1,0,0.1,0.1,0.1,0.2l0.4,4.6C27.2,35.9,27.5,36.2,27.9,36.4L27.9,36.4z
+			"/>
+		<radialGradient id="SVGID_8_" cx="31.2626" cy="14.0423" r="3.5706" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</radialGradient>
+		<path class="st7" d="M31.3,17.6c2,0,3.6-1.6,3.6-3.6c0-2-1.6-3.6-3.6-3.6c-2,0-3.6,1.6-3.6,3.6C27.7,16,29.3,17.6,31.3,17.6z"/>
+	</g>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimLayerInterface_16.svg b/Content/Slate/Starship/AssetIcons/AnimLayerInterface_16.svg
new file mode 100644
index 0000000..1a5d05b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimLayerInterface_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.7 12.6L5.8 9.5L6.5 10.2L3.4 13.3L4.8 14.7L1 15L1.3 11.2L2.7 12.6Z" fill="white"/>
+<path d="M11.7 12.4L14.8 15.5L15.5 14.8L12.4 11.7L13.8 10.3L10 10L10.3 13.8L11.7 12.4Z" fill="white"/>
+<path opacity="0.5" d="M12.1001 5.59922C12.1001 5.89922 11.9001 6.09922 11.6001 6.09922H9.6001C9.4001 6.09922 9.2001 5.99922 9.1001 5.89922L8.7001 5.09922L9.0001 4.59922C9.2001 4.19922 9.0001 3.69922 9.0001 3.69922L9.8001 5.09922H11.6001C11.9001 5.09922 12.1001 5.39922 12.1001 5.59922ZM5.6001 7.09922C5.3001 6.99922 5.2001 6.69922 5.1001 6.49922L4.3001 7.69922H2.6001C2.3001 7.69922 2.1001 7.89922 2.1001 8.19922C2.1001 8.49922 2.3001 8.69922 2.6001 8.69922H4.6001C4.8001 8.69922 5.0001 8.59922 5.1001 8.39922L5.8001 7.19922L5.6001 7.09922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.9 4.19961C3.7 3.99961 3.7 3.69961 3.9 3.49961L5.2 1.99961C5.4 1.79961 5.6 1.69961 5.9 1.79961L7.7 2.69961H7.8L8 2.79961L8.8 3.19961C8.9 3.49961 9 3.89961 8.8 4.29961L8.5 4.79961L7.4 6.59961L8.7 7.29961C8.9 7.49961 9 7.59961 9 7.79961V9.79961C9 10.0996 8.8 10.2996 8.5 10.2996C8.2 10.1996 8 9.99961 8 9.69961V7.99961L6 6.89961H5.9C5.5 6.69961 5.4 6.29961 5.4 5.89961L6.8 3.49961L5.7 2.89961L4.6 4.19961C4.4 4.39961 4.1 4.39961 3.9 4.19961ZM9.6 0.599609C8.9 0.599609 8.3 1.19961 8.3 1.89961C8.3 2.59961 8.9 3.19961 9.6 3.19961C10.3 3.19961 10.9 2.59961 10.9 1.89961C10.9 1.19961 10.3 0.599609 9.6 0.599609Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimLayerInterface_64.svg b/Content/Slate/Starship/AssetIcons/AnimLayerInterface_64.svg
new file mode 100644
index 0000000..ea19d96
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimLayerInterface_64.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimLayerInterface_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="35.9653" y1="18.1826" x2="46.5943" y2="25.2686">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st0" d="M45.4,22.3c0,0.4-0.3,0.6-0.7,0.6h-5.8c-0.7,0-1.2-0.2-1.4-0.7l-2.1-3.1v-1.5c0.5-1,1-2,1-2l3.1,4.8l5.5,0.6
+			c0.4,0,0.6,0.4,0.6,0.7L45.4,22.3z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="28.8161" y1="24.959" x2="16.2096" y2="30.5619">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st1" d="M18.4,29.5c0,0.4,0.3,0.8,0.8,0.8h5.9c0.5,0,1-0.2,1.4-0.7l2.9-4.8l-0.8-0.9c-0.7-0.5-0.5-1.6-0.7-2.3
+			l-3.5,5.8L19,28.2c-0.4,0.1-0.6,0.4-0.6,0.7V29.5z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="24.4073" y1="25.744" x2="37.5959" y2="20.3042">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st2" d="M35.5,33.8c0.7,0.3,1.5-0.2,1.5-1l0-5.4c0-0.5-0.2-0.7-0.5-1L36,26.2l-2.7-2c-0.1-0.1-0.1-0.2-0.1-0.3
+			l2.5-4.4c0,0,0,0,0,0l0.7-1.4c0.5-0.9,0.2-1.9-0.2-2.3c0,0,0,0-0.1-0.1l-2.1-1.2l-5.5-2.9c-0.7-0.2-1.4,0-1.9,0.5L23,16.8
+			c-0.3,0.4-0.2,0.9,0.1,1.2l0,0c0.3,0.3,0.8,0.3,1.2,0l3.9-3.6c0.1-0.1,0.2-0.1,0.3,0l2.4,1.2c0.1,0.1,0.2,0.2,0.1,0.4l-3.6,6.1
+			c0,0,0,0.1,0,0.1c-0.2,0.9,0.2,2.2,1.1,2.6l0.3,0.2l5.4,3c0.1,0,0.1,0.1,0.1,0.2l0.4,4.6C34.8,33.3,35.1,33.7,35.5,33.8L35.5,33.8
+			z"/>
+		<radialGradient id="SVGID_4_" cx="38.8648" cy="11.4927" r="3.5706" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</radialGradient>
+		<path class="st3" d="M38.9,15.1c2,0,3.6-1.6,3.6-3.6c0-2-1.6-3.6-3.6-3.6c-2,0-3.6,1.6-3.6,3.6C35.3,13.5,36.9,15.1,38.9,15.1z"/>
+	</g>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="85.6462" y1="12.2464" x2="56.7714" y2="12.1235" gradientTransform="matrix(-0.7005 0.7137 -0.7137 -0.7005 80.6571 -0.2943)">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#7E7E7E"/>
+	</linearGradient>
+	<path class="st4" d="M10.9,53.7l11-2.8c0.3-0.1,0.4-0.4,0.2-0.6L19.7,48c-0.1-0.1-0.1-0.4,0-0.5l9.3-9.6c0.1-0.1,0.1-0.4,0-0.5
+		l-2.6-2.5c-0.1-0.1-0.4-0.1-0.5,0l-9.3,9.6c-0.1,0.1-0.4,0.1-0.5,0l-2.4-2.3c-0.2-0.2-0.5-0.1-0.6,0.2l-2.6,11
+		C10.4,53.6,10.7,53.8,10.9,53.7z"/>
+	
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="126.8977" y1="34.8274" x2="98.0228" y2="34.7046" gradientTransform="matrix(-0.7137 -0.7005 0.7005 -0.7137 102.1438 152.6376)">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#7E7E7E"/>
+	</linearGradient>
+	<path class="st5" d="M34.5,37.9l2.8,11c0.1,0.3,0.4,0.4,0.6,0.2l2.3-2.4c0.1-0.1,0.4-0.1,0.5,0l9.6,9.3c0.1,0.1,0.4,0.1,0.5,0
+		l2.5-2.6c0.1-0.1,0.1-0.4,0-0.5l-9.6-9.3c-0.1-0.1-0.1-0.4,0-0.5l2.3-2.4c0.2-0.2,0.1-0.5-0.2-0.6l-11-2.6
+		C34.7,37.4,34.4,37.6,34.5,37.9z"/>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimMontage_16.svg b/Content/Slate/Starship/AssetIcons/AnimMontage_16.svg
new file mode 100644
index 0000000..f6e1aea
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimMontage_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16 14H12V11H16V14ZM4 14H0V11H4V14ZM10 14H6V11H10V14Z" fill="white"/>
+<path d="M16 15H0V16H16V15Z" fill="white"/>
+<path opacity="0.5" d="M12.6002 5.09922H10.8002L10.0002 3.69922C10.0002 3.69922 10.2002 4.19922 10.0002 4.59922L9.7002 5.09922L10.1002 5.79922C10.2002 5.99922 10.4002 6.09922 10.6002 6.09922H12.6002C12.9002 6.09922 13.1002 5.89922 13.1002 5.59922C13.1002 5.39922 12.9002 5.09922 12.6002 5.09922Z" fill="white"/>
+<path opacity="0.5" d="M6.6001 7.1C6.3001 7 6.2001 6.7 6.1001 6.5L5.3001 7.7H3.6001C3.3001 7.7 3.1001 7.9 3.1001 8.2C3.1001 8.5 3.3001 8.7 3.6001 8.7H5.6001C5.8001 8.7 6.0001 8.6 6.1001 8.4L6.8001 7.2L6.6001 7.1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.6 4.20056L6.7 3.00056L7.8 3.50056L6.4 5.80056C6.3 6.20056 6.5 6.60056 6.9 6.80056H7L9 8.00056V9.70056C9 10.0006 9.2 10.2006 9.5 10.2006C9.8 10.2006 10 10.0006 10 9.70056V7.70056C10 7.60056 9.9 7.40056 9.8 7.30056L8.4 6.60056L9.5 4.80056L9.8 4.30056C10 3.90056 9.9 3.50056 9.7 3.40056L8.9 2.90056L8.7 2.80056H8.6L6.9 1.90056C6.7 1.80056 6.4 1.90056 6.2 2.10056L4.9 3.50056C4.7 3.70056 4.7 4.00056 4.9 4.20056C5.1 4.40056 5.4 4.40056 5.6 4.20056Z" fill="white"/>
+<path d="M10.5998 3.19961C11.3178 3.19961 11.8998 2.61758 11.8998 1.89961C11.8998 1.18164 11.3178 0.599609 10.5998 0.599609C9.88183 0.599609 9.2998 1.18164 9.2998 1.89961C9.2998 2.61758 9.88183 3.19961 10.5998 3.19961Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimMontage_64.svg b/Content/Slate/Starship/AssetIcons/AnimMontage_64.svg
new file mode 100644
index 0000000..c4f2640
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimMontage_64.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimMontage_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#333333;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
+	.st8{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="36.4746" y1="21.2996" x2="48.1374" y2="29.0748">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st0" d="M46.8,25.8c0,0.4-0.3,0.7-0.7,0.7h-6.4c-0.8,0-1.3-0.3-1.6-0.8l-2.4-3.4v-1.6c0.5-1,1-2.2,1-2.2l3.4,5.2
+			l6,0.7c0.4,0,0.7,0.4,0.7,0.8L46.8,25.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="28.6301" y1="28.735" x2="14.7975" y2="34.8828">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st1" d="M17.2,33.8c0,0.5,0.4,0.8,0.8,0.8h6.5c0.5,0,1-0.3,1.6-0.8l3.2-5.3l-0.9-1c-0.8-0.5-0.6-1.7-0.8-2.5l-3.8,6.4
+			l-5.8,0.8c-0.4,0.1-0.7,0.4-0.7,0.8V33.8z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="23.7926" y1="29.5964" x2="38.2639" y2="23.6275">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st2" d="M36,38.5c0.8,0.3,1.6-0.3,1.6-1.1l0-5.9c0-0.5-0.3-0.8-0.5-1L36.6,30l-3-2.2c-0.1-0.1-0.2-0.2-0.1-0.4
+			l2.8-4.9c0,0,0,0,0,0L37,21c0.5-1,0.3-2-0.2-2.6c0,0-0.1,0-0.1-0.1l-2.3-1.3l-6-3.1c-0.8-0.3-1.6,0-2.1,0.5l-4.1,5.3
+			c-0.3,0.4-0.3,1,0.1,1.3l0,0c0.4,0.3,0.9,0.3,1.3,0l4.3-3.9c0.1-0.1,0.2-0.1,0.3,0l2.7,1.3c0.1,0.1,0.2,0.3,0.1,0.4l-4,6.7
+			c0,0,0,0.1,0,0.1c-0.2,1,0.2,2.4,1.2,2.9l0.3,0.2l5.9,3.3c0.1,0,0.1,0.1,0.1,0.2l0.5,5.1C35.2,37.9,35.5,38.3,36,38.5L36,38.5z"/>
+		<radialGradient id="SVGID_4_" cx="39.6561" cy="13.959" r="3.9179" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</radialGradient>
+		<path class="st3" d="M39.7,17.9c2.2,0,3.9-1.8,3.9-3.9c0-2.2-1.8-3.9-3.9-3.9c-2.2,0-3.9,1.8-3.9,3.9
+			C35.7,16.1,37.5,17.9,39.7,17.9z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="90.9233" y1="89.1949" x2="70.8436" y2="56.2984" gradientTransform="matrix(-4.901923e-07 1 -1 -4.901923e-07 109.3102 -36.5949)">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st4" d="M54.1,54l0-13.8H9.9l0,13.8L54.1,54z"/>
+		<path class="st5" d="M45.7,51.8v-5c0-0.2,0.2-0.4,0.4-0.4l5,0c0.2,0,0.4,0.2,0.4,0.4l0,5c0,0.2-0.2,0.4-0.4,0.4l-5,0
+			C45.9,52.2,45.7,52,45.7,51.8z"/>
+		
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="84.6097" y1="91.1514" x2="74.3612" y2="85.5241" gradientTransform="matrix(-4.901923e-07 1 -1 -4.901923e-07 109.3102 -36.5949)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st6" d="M12.4,44.2l0-4h17.8l0,4c0,0.2-0.2,0.4-0.4,0.4l-17,0C12.6,44.6,12.4,44.4,12.4,44.2z"/>
+		<path class="st5" d="M37.4,51.8v-5c0-0.2,0.2-0.4,0.4-0.4l5,0c0.2,0,0.4,0.2,0.4,0.4l0,5c0,0.2-0.2,0.4-0.4,0.4h-5
+			C37.6,52.2,37.4,52,37.4,51.8z"/>
+		<path class="st5" d="M29.1,51.8l0-5c0-0.2,0.2-0.4,0.4-0.4l5,0c0.2,0,0.4,0.2,0.4,0.4l0,5c0,0.2-0.2,0.4-0.4,0.4h-5
+			C29.2,52.2,29.1,52,29.1,51.8z"/>
+		<path class="st5" d="M20.7,51.8l0-5c0-0.2,0.2-0.4,0.4-0.4l5,0c0.2,0,0.4,0.2,0.4,0.4l0,5c0,0.2-0.2,0.4-0.4,0.4h-5
+			C20.9,52.2,20.7,52,20.7,51.8z"/>
+		<path class="st5" d="M12.4,51.8l0-5c0-0.2,0.2-0.4,0.4-0.4l5,0c0.2,0,0.4,0.2,0.4,0.4l0,5c0,0.2-0.2,0.4-0.4,0.4h-5
+			C12.6,52.2,12.4,52,12.4,51.8z"/>
+		
+			<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="84.4496" y1="69.7761" x2="74.33" y2="64.2195" gradientTransform="matrix(-4.901923e-07 1 -1 -4.901923e-07 109.3102 -36.5949)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st7" d="M33.8,44l0-3.8h17.8l0,3.8c0,0.2-0.2,0.4-0.4,0.4l-17,0C33.9,44.4,33.8,44.2,33.8,44z"/>
+	</g>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimSequence_16.svg b/Content/Slate/Starship/AssetIcons/AnimSequence_16.svg
new file mode 100644
index 0000000..9f7821e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimSequence_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9 11H16V15H9V11Z" fill="white"/>
+<path d="M16 11H9V15H16V11Z" fill="white"/>
+<path d="M14.9292 7.07184L8.44531 9.43164L8.95831 10.8412L15.4422 8.48139L14.9292 7.07184Z" fill="white"/>
+<path opacity="0.5" d="M10.1001 5.59922C10.1001 5.89922 9.9001 6.09922 9.6001 6.09922H7.6001C7.4001 6.09922 7.2001 5.99922 7.1001 5.89922L6.7001 5.09922L7.0001 4.59922C7.2001 4.19922 7.0001 3.69922 7.0001 3.69922L7.8001 5.09922H9.6001C9.9001 5.09922 10.1001 5.39922 10.1001 5.59922ZM3.6001 7.09922C3.3001 6.99922 3.2001 6.69922 3.1001 6.49922L2.3001 7.69922H0.600098C0.300098 7.69922 0.100098 7.89922 0.100098 8.19922C0.100098 8.49922 0.300098 8.69922 0.600098 8.69922H2.6001C2.8001 8.69922 3.0001 8.59922 3.1001 8.39922L3.8001 7.19922L3.6001 7.09922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.9 4.19961C1.7 3.99961 1.7 3.69961 1.9 3.49961L3.2 1.99961C3.4 1.79961 3.6 1.69961 3.9 1.79961L5.7 2.69961H5.8L6 2.79961L6.8 3.19961C6.9 3.49961 7 3.89961 6.8 4.29961L6.5 4.79961L5.4 6.59961L6.7 7.29961C6.9 7.49961 7 7.59961 7 7.79961V9.79961C7 10.0996 6.8 10.2996 6.5 10.2996C6.2 10.1996 6 9.99961 6 9.69961V7.99961L4 6.89961H3.9C3.5 6.69961 3.4 6.29961 3.4 5.89961L4.8 3.49961L3.7 2.89961L2.6 4.19961C2.4 4.39961 2.1 4.39961 1.9 4.19961ZM7.6 0.599609C6.9 0.599609 6.3 1.19961 6.3 1.89961C6.3 2.59961 6.9 3.19961 7.6 3.19961C8.3 3.19961 8.9 2.59961 8.9 1.89961C8.9 1.19961 8.3 0.599609 7.6 0.599609Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimSequence_64.svg b/Content/Slate/Starship/AssetIcons/AnimSequence_64.svg
new file mode 100644
index 0000000..165c2c8
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimSequence_64.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimSequence_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:#7F7F7F;}
+	.st5{fill:#FFFFFF;}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="30.5676" y1="22.1659" x2="44.8725" y2="31.7025">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st0" d="M43.2,27.7c0,0.5-0.4,0.8-0.9,0.8h-7.8c-1,0-1.6-0.3-1.9-1l-2.9-4.2v-2c0.6-1.3,1.3-2.8,1.3-2.8l4.2,6.4
+			l7.3,0.8c0.5,0.1,0.8,0.5,0.8,1L43.2,27.7z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="20.946" y1="31.2857" x2="3.9798" y2="38.8263">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st1" d="M6.9,37.5c0,0.6,0.5,1,1,1h8c0.6,0,1.3-0.3,1.9-1l3.9-6.5l-1.1-1.2c-1-0.6-0.7-2.1-1-3.1l-4.6,7.9l-7.2,1
+			c-0.5,0.1-0.9,0.5-0.9,1V37.5z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="15.0126" y1="32.3423" x2="32.7622" y2="25.0212">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st2" d="M29.9,43.2c1,0.4,2-0.3,2-1.4l0-7.2c0-0.6-0.3-1-0.6-1.3l-0.6-0.5L27,30.2c-0.1-0.1-0.2-0.3-0.1-0.5l3.4-5.9
+			c0,0,0,0,0,0l1-1.9c0.6-1.3,0.3-2.5-0.3-3.2c0,0-0.1-0.1-0.1-0.1L28.1,17l-7.4-3.8c-1-0.3-1.9,0-2.6,0.6l-5,6.5
+			c-0.4,0.5-0.3,1.2,0.2,1.6l0,0c0.5,0.4,1.1,0.4,1.6,0l5.3-4.8c0.1-0.1,0.3-0.1,0.4-0.1l3.3,1.6c0.2,0.1,0.3,0.3,0.1,0.5l-4.9,8.3
+			c0,0,0,0.1,0,0.1c-0.3,1.3,0.3,2.9,1.5,3.5l0.4,0.2l7.2,4.1c0.1,0.1,0.2,0.2,0.2,0.3L29,42C29.1,42.6,29.4,43,29.9,43.2L29.9,43.2
+			z"/>
+		<radialGradient id="SVGID_4_" cx="34.4699" cy="13.1625" r="4.8055" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</radialGradient>
+		<path class="st3" d="M34.5,18c2.7,0,4.8-2.2,4.8-4.8c0-2.7-2.2-4.8-4.8-4.8c-2.7,0-4.8,2.2-4.8,4.8C29.7,15.8,31.8,18,34.5,18z"/>
+	</g>
+	<g>
+		<path class="st4" d="M37.9,55.4h17.4c0.4,0,0.8-0.3,0.8-0.8v-8.1c0-0.4-0.3-0.8-0.8-0.8H37.9c-0.4,0-0.8,0.3-0.8,0.8v8.1
+			C37.2,55.1,37.5,55.4,37.9,55.4z"/>
+		<g>
+			<g>
+				<rect x="37.4" y="44.2" class="st4" width="18.5" height="2.4"/>
+				<path class="st5" d="M55.6,44.5v1.9h-18v-1.9H55.6 M56.1,44h-19v2.9h19V44L56.1,44z"/>
+			</g>
+			<polygon class="st5" points="41.2,46.7 38.8,46.7 40.3,44.1 42.8,44.1 			"/>
+			<polygon class="st5" points="45.5,46.7 43.1,46.7 44.7,44.1 47.1,44.1 			"/>
+			<polygon class="st5" points="49.8,46.7 47.4,46.7 49,44.1 51.4,44.1 			"/>
+			<polygon class="st5" points="54.3,46.7 51.8,46.7 53.4,44.1 55.8,44.1 			"/>
+		</g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="46.6721" y1="48.2751" x2="46.65" y2="54.0357">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#C2C2C2"/>
+		</linearGradient>
+		<path class="st6" d="M41.3,54H52c0.6,0,1.1-0.5,1.1-1.1v-3.4c0-0.6-0.5-1.1-1.1-1.1H41.3c-0.6,0-1.1,0.5-1.1,1.1v3.4
+			C40.1,53.5,40.6,54,41.3,54z"/>
+		<g>
+			<g>
+				
+					<rect x="36.7" y="38.7" transform="matrix(0.9639 -0.2662 0.2662 0.9639 -8.9824 13.6591)" class="st4" width="18.5" height="2.4"/>
+				<path class="st5" d="M54.3,36.6l0.5,1.9l-17.3,4.8L37,41.4L54.3,36.6 M54.6,36l-18.3,5l0.8,2.8l18.3-5L54.6,36L54.6,36z"/>
+			</g>
+			<polygon class="st5" points="40.3,40.2 38,40.8 40.2,42.9 42.5,42.3 			"/>
+			<polygon class="st5" points="44.5,39 42.1,39.7 44.3,41.8 46.7,41.1 			"/>
+			<polygon class="st5" points="48.6,37.9 46.3,38.5 48.5,40.6 50.8,40 			"/>
+			<polygon class="st5" points="52.9,36.7 50.5,37.3 52.7,39.4 55.1,38.8 			"/>
+		</g>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimationModifier_16.svg b/Content/Slate/Starship/AssetIcons/AnimationModifier_16.svg
new file mode 100644
index 0000000..e733815
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimationModifier_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15.2002 9.49922H13.1002L12.1002 7.69922C12.1002 7.69922 12.3002 8.39922 12.1002 8.79922L11.7002 9.49922L12.2002 10.3992C12.3002 10.5992 12.5002 10.6992 12.9002 10.6992H15.3002C15.6002 10.6992 15.9002 10.3992 15.9002 10.0992C15.8002 9.79922 15.6002 9.49922 15.2002 9.49922Z" fill="white"/>
+<path opacity="0.5" d="M7.7002 11.9992C7.4002 11.7992 7.1002 11.4992 7.0002 11.1992L6.0002 12.7992H3.8002C3.5002 12.7992 3.2002 13.0992 3.2002 13.3992C3.2002 13.6992 3.5002 13.9992 3.8002 13.9992H6.3002C6.5002 13.9992 6.8002 13.8992 6.9002 13.6992L7.8002 12.0992L7.7002 11.9992Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.4001 8.29964L7.8001 6.69964L9.2001 7.39964L7.4001 10.3996C7.3001 10.8996 7.5001 11.3996 8.0001 11.6996L8.1001 11.7996L10.7001 13.2996V15.2996C10.7001 15.5996 11.0001 15.8996 11.3001 15.8996C11.6001 15.8996 11.9001 15.5996 11.9001 15.2996V12.8996C11.9001 12.6996 11.8001 12.4996 11.7001 12.3996C11.7001 12.3996 11.7001 12.3996 11.6001 12.3996C11.6001 12.3996 11.6001 12.3996 11.5001 12.3996L10.0001 11.3996L11.4001 8.99964L11.8001 8.29964C12.0001 7.99964 11.9001 7.49964 11.6001 7.19964L10.6001 6.59964L10.4001 6.49964C10.3001 6.49964 10.3001 6.39964 10.3001 6.39964L8.0001 5.29964C7.7001 5.09964 7.4001 5.29964 7.2001 5.49964L5.5001 7.39964C5.3001 7.69964 5.3001 8.09964 5.5001 8.29964C5.8001 8.49964 6.2001 8.49964 6.4001 8.29964Z" fill="white"/>
+<path d="M12.8001 6.99961C13.739 6.99961 14.5001 6.23849 14.5001 5.29961C14.5001 4.36073 13.739 3.59961 12.8001 3.59961C11.8612 3.59961 11.1001 4.36073 11.1001 5.29961C11.1001 6.23849 11.8612 6.99961 12.8001 6.99961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 3.9C6.5 3.8 6.5 3.7 6.5 3.5C6.5 3.4 6.5 3.3 6.5 3.1L5.5 3C5.5 2.8 5.4 2.6 5.3 2.4L5.9 1.6C5.7 1.5 5.5 1.3 5.3 1.1L4.6 1.7C4.4 1.6 4.2 1.5 4 1.5L3.9 0.5C3.8 0.5 3.7 0.5 3.5 0.5C3.4 0.5 3.2 0.5 3.1 0.5L3 1.5C2.8 1.5 2.6 1.6 2.4 1.7L1.7 1.1C1.5 1.3 1.3 1.5 1.1 1.7L1.7 2.5C1.6 2.6 1.5 2.8 1.5 3L0.5 3.1C0.5 3.2 0.5 3.3 0.5 3.5C0.5 3.6 0.5 3.7 0.5 3.9L1.5 4C1.6 4.2 1.6 4.4 1.7 4.6L1.1 5.3C1.3 5.5 1.4 5.7 1.6 5.8L2.4 5.2C2.6 5.4 2.8 5.5 3 5.5L3.1 6.4C3.2 6.4 3.3 6.4 3.5 6.4C3.6 6.4 3.7 6.4 3.9 6.4L4 5.5C4.2 5.4 4.4 5.4 4.6 5.3L5.4 5.9C5.6 5.7 5.8 5.6 5.9 5.4L5.3 4.6C5.4 4.4 5.5 4.2 5.5 4L6.5 3.9ZM3.5 4.8C2.8 4.8 2.2 4.2 2.2 3.5C2.2 2.8 2.8 2.2 3.5 2.2C4.2 2.2 4.8 2.8 4.8 3.5C4.8 4.2 4.2 4.8 3.5 4.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimationModifier_64.svg b/Content/Slate/Starship/AssetIcons/AnimationModifier_64.svg
new file mode 100644
index 0000000..7e5f292
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimationModifier_64.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimationModifier_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{opacity:0.3;}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="42.4129" y1="33.5883" x2="58.2662" y2="44.1572">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st0" d="M56.4,39.7c0,0.5-0.5,0.9-1,0.9h-8.7c-1.1,0-1.8-0.4-2.1-1.1l-3.2-4.7v-2.2c0.7-1.4,1.4-3.1,1.4-3.1l4.6,7.1
+			l8.1,0.9c0.5,0.1,0.9,0.5,0.9,1.1L56.4,39.7z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.7499" y1="43.6953" x2="12.9472" y2="52.052">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st1" d="M16.2,50.5c0,0.6,0.5,1.1,1.1,1.1h8.8c0.7,0,1.4-0.4,2.1-1.1l4.3-7.2l-1.2-1.3c-1.1-0.7-0.7-2.3-1.1-3.4
+			l-5.1,8.7l-7.9,1.1c-0.6,0.1-1,0.6-1,1.1V50.5z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="25.1742" y1="44.8662" x2="44.8451" y2="36.7527">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st2" d="M41.7,56.9c1.1,0.4,2.2-0.4,2.2-1.5l0-8c0-0.7-0.4-1.1-0.7-1.4l-0.7-0.5l-4.1-3c-0.2-0.1-0.2-0.3-0.1-0.5
+			l3.8-6.6c0,0,0,0,0,0l1.1-2.1c0.7-1.4,0.4-2.8-0.3-3.5c0,0-0.1-0.1-0.1-0.1l-3.1-1.7l-8.2-4.3c-1.1-0.4-2.1,0-2.8,0.7l-5.5,7.3
+			c-0.4,0.6-0.3,1.4,0.2,1.8l0,0c0.5,0.4,1.3,0.4,1.8,0l5.8-5.3c0.1-0.1,0.3-0.1,0.4-0.1l3.6,1.8c0.2,0.1,0.3,0.4,0.2,0.6l-5.4,9.2
+			c0,0,0,0.1-0.1,0.1c-0.3,1.4,0.3,3.2,1.7,3.9l0.5,0.3l8,4.5c0.1,0.1,0.2,0.2,0.2,0.3l0.7,6.9C40.7,56.2,41.1,56.7,41.7,56.9
+			L41.7,56.9z"/>
+		<radialGradient id="SVGID_4_" cx="46.7376" cy="23.6103" r="5.3256" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</radialGradient>
+		<path class="st3" d="M46.7,28.9c2.9,0,5.3-2.4,5.3-5.3c0-2.9-2.4-5.3-5.3-5.3c-2.9,0-5.3,2.4-5.3,5.3
+			C41.4,26.6,43.8,28.9,46.7,28.9z"/>
+	</g>
+	<g>
+		<g class="st4">
+			<path d="M18,22.5c-3.3,0-5.9-2.7-5.9-5.9s2.7-5.9,5.9-5.9s5.9,2.7,5.9,5.9S21.3,22.5,18,22.5z M18,13c-2,0-3.6,1.6-3.6,3.6
+				c0,2,1.6,3.6,3.6,3.6c2,0,3.6-1.6,3.6-3.6C21.7,14.6,20,13,18,13z"/>
+			<polygon points="19.5,11.5 16.6,11.5 17.1,7.8 18.9,7.8 			"/>
+			<polygon points="16.6,22.2 19.5,22.2 18.9,25.9 17.1,25.9 			"/>
+			<polygon points="23.4,18.3 23.4,15.4 27,16 27,17.7 			"/>
+			<polygon points="12.6,15.4 12.6,18.3 9,17.7 9,16 			"/>
+			<polygon points="22.8,13.9 20.8,11.8 23.8,9.6 25,10.9 			"/>
+			<polygon points="13.2,19.4 15.2,21.4 12.2,23.6 11,22.4 			"/>
+			<polygon points="20.8,21.4 22.8,19.4 25,22.4 23.8,23.6 			"/>
+			<polygon points="15.2,11.8 13.2,13.9 11,10.9 12.2,9.6 			"/>
+		</g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="17.7342" y1="25.0331" x2="18.2845" y2="6.9367">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st5" d="M27,16.9v-1.8l-3.2-0.5c-0.1-0.7-0.4-1.3-0.8-1.9l2-2.7l-1.2-1.2l-2.7,2c-0.5-0.3-1.1-0.6-1.7-0.7L18.9,7
+			h-1.8L16.7,10c-0.6,0.1-1.2,0.4-1.7,0.7l-2.7-2L11,10l2,2.7c-0.4,0.6-0.6,1.2-0.8,1.9L9,15.1v1.8l3.3,0.5c0.1,0.5,0.4,1,0.6,1.5
+			l-2,2.7l1.2,1.2l2.7-2c0.5,0.3,1.1,0.5,1.7,0.7l0.5,3.5h1.8l0.5-3.5c0.6-0.1,1.1-0.4,1.7-0.7l2.7,2l1.2-1.2l-2-2.7
+			c0.3-0.5,0.5-1,0.6-1.5L27,16.9z M18,19.4c-2,0-3.6-1.6-3.6-3.6c0-2,1.6-3.6,3.6-3.6s3.6,1.6,3.6,3.6C21.7,17.8,20,19.4,18,19.4z"
+			/>
+	</g>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimationSharingSetup_16.svg b/Content/Slate/Starship/AssetIcons/AnimationSharingSetup_16.svg
new file mode 100644
index 0000000..ba48ccb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimationSharingSetup_16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12.0002 5.19961H10.0002L9.1002 3.59961C9.1002 3.59961 9.3002 4.19961 9.1002 4.59961L8.7002 5.19961L9.2002 5.99961C9.3002 6.19961 9.5002 6.29961 9.8002 6.29961H12.0002C12.3002 6.29961 12.6002 5.99961 12.6002 5.69961C12.6002 5.49961 12.3002 5.19961 12.0002 5.19961Z" fill="white"/>
+<path opacity="0.5" d="M5.2001 7.49922C4.9001 7.29922 4.7001 6.99922 4.6001 6.69922L3.7001 8.19922H1.7001C1.4001 8.19922 1.1001 8.49922 1.1001 8.79922C1.1001 9.09922 1.4001 9.39922 1.7001 9.39922H4.0001C4.2001 9.39922 4.4001 9.29922 4.6001 9.09922L5.4001 7.69922L5.2001 7.49922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.09993 4.10017L5.39993 2.70017L6.59993 3.30017L4.99993 6.00017C4.89993 6.40017 5.09993 6.90017 5.49993 7.10017L5.59993 7.20017L7.89993 8.50017V10.4002C7.89993 10.7002 8.19993 11.0002 8.49993 11.0002C8.79993 11.0002 8.99993 10.7002 8.99993 10.4002V8.20017C8.99993 8.00017 8.89993 7.90017 8.79993 7.80017C8.79993 7.80017 8.79993 7.80017 8.69993 7.80017C8.69993 7.80017 8.69993 7.80017 8.59994 7.80017L7.29993 6.90017L8.49993 4.80017L8.79993 4.20017C8.99993 3.80017 8.89993 3.40017 8.69993 3.20017L7.79993 2.70017L7.59993 2.60017C7.49993 2.60017 7.49993 2.60017 7.49993 2.50017L5.49993 1.50017C5.19993 1.40017 4.89993 1.50017 4.69993 1.70017L3.19993 3.40017C2.99993 3.60017 2.99993 3.90017 3.29993 4.10017C3.49993 4.40017 3.79993 4.30017 4.09993 4.10017Z" fill="white"/>
+<path d="M9.7998 3C10.6282 3 11.2998 2.32843 11.2998 1.5C11.2998 0.671573 10.6282 0 9.7998 0C8.97138 0 8.2998 0.671573 8.2998 1.5C8.2998 2.32843 8.97138 3 9.7998 3Z" fill="white"/>
+<path opacity="0.5" d="M4 14H0V16H4V14Z" fill="white"/>
+<path opacity="0.5" d="M10 14H6V16H10V14Z" fill="white"/>
+<path opacity="0.5" d="M16 14H12V16H16V14Z" fill="white"/>
+<path opacity="0.5" d="M9 11H8H2V12V14H3V12H8V14H9V12H14V14H15V12V11H9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AnimationSharingSetup_64.svg b/Content/Slate/Starship/AssetIcons/AnimationSharingSetup_64.svg
new file mode 100644
index 0000000..5d19b7c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AnimationSharingSetup_64.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AnimationSharingSetup_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:#7F7F7F;}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:url(#SVGID_8_);}
+	.st9{fill:url(#SVGID_9_);}
+	.st10{fill:url(#SVGID_10_);}
+	.st11{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.7022" y1="18.297" x2="44.006" y2="25.8328">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st0" d="M42.7,22.7c0,0.4-0.3,0.7-0.7,0.7h-6.2c-0.8,0-1.3-0.3-1.5-0.8L32,19.2v-1.6c0.5-1,1-2.2,1-2.2l3.3,5.1
+			l5.8,0.7c0.4,0,0.7,0.4,0.6,0.8L42.7,22.7z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.0992" y1="25.5035" x2="11.6924" y2="31.4621">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.1624" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st1" d="M14,30.4c0,0.4,0.4,0.8,0.8,0.8h6.3c0.5,0,1-0.3,1.5-0.8l3.1-5.1l-0.9-1c-0.8-0.5-0.5-1.7-0.8-2.4l-3.7,6.2
+			L14.7,29C14.3,29,14,29.3,14,29.7V30.4z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="20.4106" y1="26.3384" x2="34.4364" y2="20.5532">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st2" d="M32.2,34.9c0.8,0.3,1.6-0.3,1.6-1.1l0-5.7c0-0.5-0.3-0.8-0.5-1l-0.5-0.4l-2.9-2.2c-0.1-0.1-0.1-0.2-0.1-0.4
+			l2.7-4.7c0,0,0,0,0,0l0.8-1.5c0.5-1,0.3-2-0.2-2.5c0,0,0,0-0.1-0.1l-2.2-1.2l-5.8-3c-0.8-0.3-1.5,0-2,0.5l-3.9,5.2
+			c-0.3,0.4-0.2,1,0.1,1.3l0,0c0.4,0.3,0.9,0.3,1.3,0l4.2-3.8c0.1-0.1,0.2-0.1,0.3,0l2.6,1.3c0.1,0.1,0.2,0.3,0.1,0.4l-3.9,6.5
+			c0,0,0,0.1,0,0.1c-0.2,1,0.2,2.3,1.2,2.8l0.3,0.2l5.7,3.2c0.1,0,0.1,0.1,0.1,0.2l0.5,4.9C31.5,34.4,31.8,34.8,32.2,34.9L32.2,34.9
+			z"/>
+		<radialGradient id="SVGID_4_" cx="35.7858" cy="11.1824" r="3.7973" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</radialGradient>
+		<path class="st3" d="M35.8,15c2.1,0,3.8-1.7,3.8-3.8c0-2.1-1.7-3.8-3.8-3.8c-2.1,0-3.8,1.7-3.8,3.8C32,13.3,33.7,15,35.8,15z"/>
+	</g>
+	<g>
+		<g>
+			<rect x="11.5" y="35.9" class="st4" width="42.2" height="3.1"/>
+			
+				<rect x="44.3" y="42.8" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 96.4937 -7.8315)" class="st4" width="15.7" height="3.1"/>
+			
+				<rect x="24.7" y="42.8" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 76.9213 11.7409)" class="st4" width="15.7" height="3.1"/>
+			
+				<rect x="5.2" y="42.8" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 57.3488 31.3134)" class="st4" width="15.7" height="3.1"/>
+		</g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="13.0177" y1="47.9946" x2="13.0177" y2="41.2609">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.5736" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st5" points="11.5,48 11.5,41.3 14.6,41.3 14.6,48 		"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="32.5902" y1="47.9946" x2="32.5902" y2="41.2609">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.5736" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st6" points="31,48 31,41.3 34.1,41.3 34.1,48 		"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="13.0177" y1="56.2813" x2="13.0177" y2="47.5582">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st7" d="M19.2,47.6H6.9c-0.8,0-1.5,0.7-1.5,1.5v5.8c0,0.8,0.7,1.5,1.5,1.5h12.3c0.8,0,1.5-0.7,1.5-1.5V49
+			C20.6,48.2,20,47.6,19.2,47.6z"/>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="52.1626" y1="47.9946" x2="52.1626" y2="41.2609">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="0.5736" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st8" points="50.6,48 50.6,41.3 53.7,41.3 53.7,48 		"/>
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="32.5902" y1="56.2813" x2="32.5902" y2="47.5582">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st9" d="M38.8,47.6H26.4c-0.8,0-1.5,0.7-1.5,1.5v5.8c0,0.8,0.7,1.5,1.5,1.5h12.3c0.8,0,1.5-0.7,1.5-1.5V49
+			C40.2,48.2,39.6,47.6,38.8,47.6z"/>
+		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="52.1626" y1="56.2813" x2="52.1626" y2="47.5582">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st10" d="M58.3,47.6H46c-0.8,0-1.5,0.7-1.5,1.5v5.8c0,0.8,0.7,1.5,1.5,1.5h12.3c0.8,0,1.5-0.7,1.5-1.5V49
+			C59.8,48.2,59.1,47.6,58.3,47.6z"/>
+	</g>
+	<rect x="0" class="st11" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ApplicationLifecycleComponent_16.svg b/Content/Slate/Starship/AssetIcons/ApplicationLifecycleComponent_16.svg
new file mode 100644
index 0000000..78db2ad
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ApplicationLifecycleComponent_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.6999 8C13.6999 9.5 13.0999 10.9 11.8999 12L9.8999 10V15H14.8999L12.8999 13C14.2999 11.6 15.0999 9.9 15.0999 8H13.6999Z" fill="white"/>
+<path d="M8 0.900391V2.30039C9.5 2.30039 10.9 2.90039 12 4.10039L10 6.10039H15V1.00039L13 3.00039C11.6 1.60039 9.9 0.900391 8 0.900391Z" fill="white"/>
+<path opacity="0.5" d="M8 13.7004C6.5 13.7004 5.1 13.1004 4 11.9004L6 9.90039H1V14.9004L3 12.9004C4.4 14.3004 6.1 15.1004 8 15.1004V13.7004Z" fill="white"/>
+<path opacity="0.5" d="M2.2999 8C2.2999 6.5 2.8999 5.1 4.0999 4L6.0999 6V1H0.999902L2.9999 3C1.5999 4.4 0.899902 6.1 0.899902 8H2.2999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ApplicationLifecycleComponent_64.svg b/Content/Slate/Starship/AssetIcons/ApplicationLifecycleComponent_64.svg
new file mode 100644
index 0000000..c4e97bb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ApplicationLifecycleComponent_64.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ApplicationLifecycleComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="37.3697" y1="42.3236" x2="52.0575" y2="42.3236">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st0" d="M48.1,33c-0.1,3.9-1.7,7.5-4.7,10.4c-0.2,0.2-0.6,0.2-0.8,0L38.3,39c-0.3-0.3-0.9-0.1-0.9,0.4v12.3
+		c0,0.3,0.2,0.5,0.5,0.5h12.3c0.5,0,0.7-0.6,0.4-0.9l-4.3-4.3c-0.2-0.2-0.2-0.5,0-0.8c3.6-3.7,5.7-8.2,5.8-13.2
+		c0-0.3-0.2-0.6-0.6-0.6h-2.9C48.3,32.4,48.1,32.7,48.1,33z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="33.4944" y1="13.1061" x2="52.1891" y2="24.6008">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<path class="st1" d="M32,12.9v2.9c0,0.3,0.2,0.5,0.5,0.5C36.4,16.5,40,18,42.9,21c0.2,0.2,0.2,0.6,0,0.8l-4.3,4.3
+		c-0.3,0.3-0.1,0.9,0.4,0.9h12.3c0.3,0,0.5-0.2,0.5-0.5V14c0-0.5-0.6-0.7-0.9-0.4l-4.3,4.3c-0.2,0.2-0.5,0.2-0.8,0
+		c-3.7-3.6-8.2-5.4-13.2-5.6C32.3,12.4,32,12.6,32,12.9z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.2168" y1="45.1467" x2="32" y2="45.1467">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st2" d="M31.5,48.5c-3.9-0.1-7.5-1.7-10.4-4.7c-0.2-0.2-0.2-0.6,0-0.8l4.3-4.3c0.3-0.3,0.1-0.9-0.4-0.9H12.8
+		c-0.3,0-0.5,0.2-0.5,0.5v12.3c0,0.5,0.6,0.7,0.9,0.4l4.3-4.3c0.2-0.2,0.5-0.2,0.8,0c3.7,3.6,8.2,5.7,13.2,5.8
+		c0.3,0,0.6-0.2,0.6-0.6v-2.9C32,48.8,31.8,48.5,31.5,48.5z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="23.5278" y1="12.4823" x2="16.3278" y2="25.7454">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st3" d="M15.9,31.9c0.1-3.9,1.7-7.5,4.7-10.4c0.2-0.2,0.6-0.2,0.8,0l4.3,4.3c0.3,0.3,0.9,0.1,0.9-0.4V13.2
+		c0-0.3-0.2-0.5-0.5-0.5H13.5c-0.5,0-0.7,0.6-0.4,0.9l4.3,4.3c0.2,0.2,0.2,0.5,0,0.8c-3.6,3.7-5.4,8.2-5.6,13.2
+		c0,0.3,0.2,0.6,0.6,0.6h2.9C15.7,32.4,15.9,32.2,15.9,31.9z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AssetPalette.svg b/Content/Slate/Starship/AssetIcons/AssetPalette.svg
new file mode 100644
index 0000000..b6e4baf
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AssetPalette.svg
@@ -0,0 +1,39 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M31.5106 11.2C33.3306 22.64 32.5106 25.1999 20.3306 32.2599C23.669 29.827 26.4103 26.6668 28.3472 23.0182C30.2841 19.3696 31.3658 15.3283 31.5106 11.2Z" fill="url(#paint0_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.6508 5.8999C31.5408 23.5799 22.4508 29.1799 18.5508 32.4099C18.8108 31.8599 24.5308 27.2199 14.6508 5.8999Z" fill="url(#paint1_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.6001 26.0001C18.8101 27.9001 17.8201 32.2401 17.8201 32.2401C16.2601 26.5201 16.5201 22.8801 6.12012 15.0801C18.6001 18.0001 18.3901 24.1201 18.6001 26.0001Z" fill="#7F7F7F"/>
+<path d="M47.81 33.9302V58.1002L34.71 53.1002V39.0002L47.81 33.9302Z" fill="url(#paint2_linear)"/>
+<path d="M57.881 52.0502L47.811 58.1002V33.9302L57.881 40.1402V52.0502Z" fill="url(#paint3_linear)"/>
+<g opacity="0.3">
+<path opacity="0.3" d="M29.5005 39.9999L27.4305 37.9199C27.1965 37.6898 27.0574 37.3802 27.0408 37.0524C27.0241 36.7246 27.1311 36.4026 27.3405 36.1499C29.0205 34.1499 33.1505 29.1499 35.8205 26.4699C39.2505 23.0499 54.0005 11.7599 54.0005 11.7599C54.2536 11.5909 54.5512 11.5007 54.8555 11.5007C55.1598 11.5007 55.4574 11.5909 55.7105 11.7599C55.8847 12.011 55.978 12.3093 55.978 12.6149C55.978 12.9205 55.8847 13.2188 55.7105 13.4699C55.7105 13.4699 44.3805 28.1899 41.0005 31.6099C38.3305 34.2799 33.3605 38.4099 31.3105 40.0999C31.0531 40.3175 30.7222 40.4283 30.3856 40.4097C30.0491 40.3911 29.7324 40.2445 29.5005 39.9999Z" fill="#050505"/>
+<path opacity="0.3" d="M27.0006 41.5701L25.4206 40.0001C25.0383 39.6367 24.528 39.4391 24.0006 39.4501C22.2106 39.5201 18.2606 40.4501 16.7006 46.6701C15.3306 51.4601 8.14062 54.8902 8.14062 54.8902H17.0006C19.0019 54.8119 20.9458 54.1993 22.6304 53.1161C24.315 52.0329 25.6789 50.5185 26.5806 48.7301C27.6664 46.8082 27.981 44.5454 27.4606 42.4002C27.3761 42.0906 27.2183 41.8059 27.0006 41.5701Z" fill="#050505"/>
+</g>
+<path d="M28.9408 38.1298L26.8708 36.0598C26.6389 35.8286 26.5012 35.5193 26.4846 35.1922C26.468 34.8651 26.5736 34.5435 26.7808 34.2898C28.4608 32.2898 32.5908 27.2898 35.2608 24.5998C38.6908 21.1798 53.4108 9.87984 53.4108 9.87984C53.6635 9.7096 53.9612 9.61865 54.2658 9.61865C54.5705 9.61865 54.8682 9.7096 55.1208 9.87984C55.2907 10.1345 55.3813 10.4337 55.3813 10.7398C55.3813 11.0459 55.2907 11.3452 55.1208 11.5998C55.1208 11.5998 43.8208 26.3098 40.4008 29.7398C37.7308 32.4098 32.7608 36.5398 30.7108 38.2198C30.4572 38.4271 30.1356 38.5327 29.8085 38.5161C29.4814 38.4994 29.1721 38.3618 28.9408 38.1298Z" fill="url(#paint4_linear)"/>
+<path d="M26.4005 39.7001L24.8605 38.1601C24.6709 37.9693 24.4448 37.8187 24.1957 37.7173C23.9465 37.6159 23.6795 37.5659 23.4105 37.5701C21.6105 37.6401 17.6605 38.5701 16.1005 44.8001C14.7305 49.5901 7.54053 53.0001 7.54053 53.0001H16.4405C18.4376 52.9203 20.377 52.308 22.0579 51.2267C23.7387 50.1454 25.1 48.6343 26.0005 46.8501C27.0921 44.9301 27.407 42.665 26.8805 40.5201C26.791 40.2112 26.626 39.9294 26.4005 39.7001Z" fill="url(#paint5_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="32.4606" y1="15.92" x2="22.2306" y2="29.57" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="18.9108" y1="8.6299" x2="21.3708" y2="29.0799" gradientUnits="userSpaceOnUse">
+<stop offset="0.6" stop-color="white"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="34.71" y1="46.0102" x2="47.81" y2="46.0102" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="47.811" y1="46.0102" x2="57.881" y2="46.0102" gradientUnits="userSpaceOnUse">
+<stop stop-color="#B3B3B3"/>
+<stop offset="1" stop-color="#666666"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="26.9408" y1="37.0598" x2="58.2308" y2="8.71984" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="25.4405" y1="41.2701" x2="9.14053" y2="54.9501" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#CCCCCC"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AtmosphericFog_16.svg b/Content/Slate/Starship/AssetIcons/AtmosphericFog_16.svg
new file mode 100644
index 0000000..45666c4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AtmosphericFog_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3002 8C12.2002 8 11.6002 8 11.5002 8H6.1002C6.1002 8 2.6002 8 2.5002 8C1.9002 8 1.2002 7.79998 1.2002 7.09998C1.2002 6.59998 1.8002 5.79998 3.2002 6.09998C1.3002 2.99998 5.4002 1.2 7.3002 4.5C6.2002 2.1 7.6002 0 9.7002 0C11.4002 0 13.2002 1.90002 11.9002 3.90002C13.2002 3.60002 14.6002 4.50002 14.6002 5.90002C14.7002 7.30002 13.7002 8 12.3002 8Z" fill="white"/>
+<path opacity="0.5" d="M1 10.5H15" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M1 12.5H15" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M1 14.5H15" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AtmosphericFog_64.svg b/Content/Slate/Starship/AssetIcons/AtmosphericFog_64.svg
new file mode 100644
index 0000000..2bfd2de
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AtmosphericFog_64.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:url(#SVGID_4_);}
+</style>
+<g id="AtmosphericFog_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<path class="st1" d="M57.9,27c0-5.4-4.5-8.8-9.7-7.6c5.2-7.7-2.4-14.9-9.2-14.9c-8.3,0-15.2,6.2-10.9,15.4
+			c-7.5-12.7-22.5-3.8-15,8.1C7.7,26.8,6,29.7,6,31.6c0,2.7,2.1,3.6,4.5,3.6c0.4,0,0,0,0,0h38.9c0.4,0-0.4,0,0,0
+			C55,35.3,58.3,32.4,57.9,27z"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.4728" y1="229.4411" x2="31.4277" y2="233.4143" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.5615" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M53.8,39.7H9.2c-0.8,0-1.4,0.6-1.4,1.4v0.7c0,0.8,0.6,1.4,1.4,1.4h44.5c0.8,0,1.4-0.6,1.4-1.4v-0.7
+			C55.2,40.3,54.5,39.7,53.8,39.7z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.4732" y1="237.2092" x2="31.4281" y2="241.1824" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.5615" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M53.8,47.5H9.2c-0.8,0-1.4,0.6-1.4,1.4v0.7c0,0.8,0.6,1.4,1.4,1.4h44.5c0.8,0,1.4-0.6,1.4-1.4v-0.7
+			C55.2,48.1,54.5,47.5,53.8,47.5z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.4729" y1="244.8301" x2="31.4278" y2="248.8032" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.5615" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M53.8,55.1H9.2c-0.8,0-1.4,0.6-1.4,1.4v0.7c0,0.8,0.6,1.4,1.4,1.4h44.5c0.8,0,1.4-0.6,1.4-1.4v-0.7
+			C55.2,55.7,54.5,55.1,53.8,55.1z"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="32.1436" y1="195.8249" x2="31.803" y2="225.7971" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.5615" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st5" d="M57.2,27.8c0-5.2-5.3-8.5-10.2-7.4c4.9-7.4-1.9-14.5-8.3-14.5c-7.9,0-13.2,7.8-9.1,16.7
+			C22.4,10.4,6.9,17,14.1,28.5c-5.3-1.1-7.6,1.9-7.6,3.7c0,2.6,2.6,3.3,4.9,3.3c0.4,0,0,0,0,0h37.1c0.4,0-0.4,0,0,0
+			C53.8,35.6,57.6,33,57.2,27.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AudioVolume_16.svg b/Content/Slate/Starship/AssetIcons/AudioVolume_16.svg
new file mode 100644
index 0000000..154c584
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AudioVolume_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M2 7H4L7 4V14L4 11H2V7Z" fill="white"/>
+<path opacity="0.5" d="M8 4C10.8 5.2 12.2 7.1 12.2 9C12.2 10.9 10.8 12.8 8 14C9.8 12.4 10.6 10.7 10.6 9C10.6 7.3 9.8 5.6 8 4Z" fill="white"/>
+<path opacity="0.5" d="M8 6.90039C8.9 7.40039 9.4 8.20039 9.4 9.00039C9.4 9.80039 8.9 10.6004 8 11.1004C8.6 10.4004 8.6 7.60039 8 6.90039Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/AudioVolume_64.svg b/Content/Slate/Starship/AssetIcons/AudioVolume_64.svg
new file mode 100644
index 0000000..64d2d6f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/AudioVolume_64.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="AudioVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:#7F7F7F;enable-background:new    ;}
+	.st9{fill:#BFBFBF;enable-background:new    ;}
+	.st10{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="36.2663" y1="34.8821" x2="36.2853" y2="45.9746" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st5" d="M23.2,41.8h-1.4c-2.8,0-5-2.3-5-5v-1c0-2.8,2.3-5,5-5h1.4V41.8z"/>
+			
+				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="43.6183" y1="29.1404" x2="43.5356" y2="51.486" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+				<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st6" d="M30.1,47.3l-6.9-5.4V30.7l6.9-5.4c0.5-0.4,1.2,0,1.2,0.6v20.8C31.3,47.3,30.6,47.6,30.1,47.3z"/>
+			
+				<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="37.0005" y1="40.424" x2="39.5086" y2="40.424" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+				<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+			</linearGradient>
+			<rect x="20.7" y="30.7" class="st7" width="2.5" height="11.1"/>
+		</g>
+		<g>
+			<path class="st8" d="M33.7,26.6c3.7,2.3,5.6,6.1,5.6,9.7c0,3.6-1.9,7.4-5.6,9.7c2.3-3.1,3.4-6.4,3.4-9.7
+				C37.1,33,36,29.7,33.7,26.6z"/>
+			<path class="st9" d="M32.6,31.3c1.5,1.2,2.2,3.1,2.2,5c0,1.9-0.8,3.8-2.2,5C33.5,39.7,33.5,32.9,32.6,31.3z"/>
+		</g>
+	</g>
+	<rect x="0" class="st10" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Audio_16.svg b/Content/Slate/Starship/AssetIcons/Audio_16.svg
new file mode 100644
index 0000000..7f4f2c6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Audio_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 5H3L7 1V15L3 11H0V5Z" fill="white"/>
+<path opacity="0.5" d="M9 1C13 2.7 15 5.4 15 8C15 10.6 13 13.3 9 15C11.5 12.8 12.7 10.4 12.7 8C12.7 5.6 11.5 3.2 9 1Z" fill="white"/>
+<path opacity="0.5" d="M9 5C10.3 5.7 11 6.9 11 8C11 9.1 10.3 10.3 9 11C9.8 10 9.8 6 9 5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BehaviorTree_16.svg b/Content/Slate/Starship/AssetIcons/BehaviorTree_16.svg
new file mode 100644
index 0000000..764cfcf
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BehaviorTree_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 13H11V15H14V13Z" fill="white"/>
+<path d="M4 13H1V15H4V13Z" fill="white"/>
+<path d="M9 13H6V15H9V13Z" fill="white"/>
+<path d="M10 7H5V9H10V7Z" fill="white"/>
+<path d="M12 1H3V5H12V1Z" fill="white"/>
+<path opacity="0.5" d="M8 4H7V7H8V4Z" fill="white"/>
+<path opacity="0.5" d="M7.5 8.5L2.5 13.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M7.5 8.5L12.5 13.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M7.5 9V13.5" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BehaviorTree_64.svg b/Content/Slate/Starship/AssetIcons/BehaviorTree_64.svg
new file mode 100644
index 0000000..69655cc
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BehaviorTree_64.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BehaviorTree_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st2{fill:none;stroke:url(#SVGID_2_);stroke-width:2;stroke-miterlimit:10;enable-background:new    ;}
+	.st3{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-miterlimit:10;enable-background:new    ;}
+	.st4{fill:none;stroke:url(#SVGID_4_);stroke-width:2;stroke-miterlimit:10;enable-background:new    ;}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:url(#SVGID_8_);}
+	.st9{fill:url(#SVGID_9_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.8975" y1="28.6536" x2="32.1025" y2="20.6553">
+		<stop  offset="0.5076" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st1" d="M33.7,20.7h-3.4v7.9h3.4V20.7z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="23.2917" y1="51.5298" x2="23.7721" y2="32.7937">
+		<stop  offset="0.5076" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st2" d="M32,33.7L15.1,50.6"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="40.2381" y1="51.132" x2="40.6981" y2="33.1914">
+		<stop  offset="0.5076" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st3" d="M32,33.7l16.9,16.9"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.7607" y1="50.6493" x2="32.2393" y2="31.9805">
+		<stop  offset="0.5076" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st4" d="M32,32v18.6"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="31.9586" y1="20.529" x2="32.0479" y2="8.7389">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st5" d="M46.6,8.3H17.4c-0.3,0-0.6,0.3-0.6,0.6v12.3c0,0.3,0.3,0.6,0.6,0.6h29.3c0.3,0,0.6-0.3,0.6-0.6V8.9
+		C47.2,8.6,47,8.3,46.6,8.3z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="48.9362" y1="56.1921" x2="48.9362" y2="49.4039">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st6" d="M53.4,48.9h-9c-0.3,0-0.6,0.3-0.6,0.6v5.6c0,0.3,0.3,0.6,0.6,0.6h9c0.3,0,0.6-0.3,0.6-0.6v-5.6
+		C54,49.2,53.7,48.9,53.4,48.9z"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="14.9734" y1="55.8484" x2="15.152" y2="48.8815">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st7" d="M19.5,48.9h-9c-0.3,0-0.6,0.3-0.6,0.6v5.6c0,0.3,0.3,0.6,0.6,0.6h9c0.3,0,0.6-0.3,0.6-0.6v-5.6
+		C20.1,49.2,19.9,48.9,19.5,48.9z"/>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="32.0895" y1="55.6332" x2="31.9108" y2="49.0236">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st8" d="M36.5,48.9h-9c-0.3,0-0.6,0.3-0.6,0.6v5.6c0,0.3,0.3,0.6,0.6,0.6h9c0.3,0,0.6-0.3,0.6-0.6v-5.6
+		C37.1,49.2,36.8,48.9,36.5,48.9z"/>
+	<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="32.0495" y1="35.3637" x2="31.9601" y2="29.29">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st9" d="M39.9,28.6H24.1c-0.3,0-0.6,0.3-0.6,0.6v5.6c0,0.3,0.3,0.6,0.6,0.6h15.7c0.3,0,0.6-0.3,0.6-0.6v-5.6
+		C40.5,28.9,40.2,28.6,39.9,28.6z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlackboardData_16.svg b/Content/Slate/Starship/AssetIcons/BlackboardData_16.svg
new file mode 100644
index 0000000..ce3309f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlackboardData_16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 3V11H1V3H15ZM16 2H0V12H16V2Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.6001 15.6004L5.3001 13.4004H5.9001L5.2001 15.6004H4.6001Z" fill="white"/>
+<path d="M6.5 13H5L4 16H5.5L6.5 13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.8001 15.6004L10.1001 13.4004H10.7001L11.4001 15.6004H10.8001Z" fill="white"/>
+<path d="M11 13H9.5L10.5 16H12L11 13Z" fill="white"/>
+<path d="M4.5 8.5L5.5 5.5L7.5 9.5L8.5 4.5L10.5 9.5L11.5 6.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M9 0H7V1H9V0Z" fill="white"/>
+<path d="M13 13H3V14H13V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlackboardData_64.svg b/Content/Slate/Starship/AssetIcons/BlackboardData_64.svg
new file mode 100644
index 0000000..8c2f66b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlackboardData_64.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BlackboardData_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.2223" y1="44.6382" x2="31.7466" y2="10.7456">
+		<stop  offset="5.076142e-03" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st1" d="M34.1,10h-3.7l-1,35.7h5.7L34.1,10z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.237" y1="15.6013" x2="32.237" y2="44.154">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st2" d="M55.1,15.6H9.4v28.6h45.7V15.6z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="24.4901" y1="55.7743" x2="24.4901" y2="49.1422">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st3" d="M28.1,47.1h-4.3l-2.9,8.6h2.3L28.1,47.1z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="40.1551" y1="55.7937" x2="40.2221" y2="48.2238">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st4" d="M40.9,47.1h-4.3l4.9,8.6h2.3L40.9,47.1z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="32.2398" y1="48.7394" x2="32.1945" y2="45.5121">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st5" d="M44.5,45.7H20l-2,2.9h28.6L44.5,45.7z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="32.237" y1="19.4153" x2="32.237" y2="42.2775">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#000000"/>
+	</linearGradient>
+	<path class="st6" d="M52.9,17.5H11.5v24.8h41.4V17.5z"/>
+	<g>
+		<path class="st7" d="M21,33.5c0.4-1.5,0.9-2.9,1.3-4.4l0.7-2.2c0.2-0.7,0.5-1.5,0.8-2.2l0,0c0.1-0.3,0.4-0.4,0.7-0.3
+			c0.1,0,0.2,0.1,0.3,0.2l6.4,11.4l-0.9,0.1l3.2-14.3c0.1-0.3,0.3-0.4,0.6-0.4c0.2,0,0.3,0.1,0.3,0.3l6.4,14.3l-0.9,0
+			c0.2-0.7,0.5-1.4,0.8-2.1l0.9-2.1c0.6-1.4,1.2-2.8,1.9-4.2c-0.4,1.5-0.9,2.9-1.3,4.4l-0.7,2.2c-0.2,0.7-0.5,1.5-0.8,2.2l0,0
+			c-0.1,0.3-0.4,0.4-0.7,0.3c-0.1-0.1-0.2-0.1-0.3-0.3l-6.4-14.3l0.9-0.1l-3.2,14.3c-0.1,0.3-0.3,0.4-0.6,0.4
+			c-0.1,0-0.3-0.1-0.3-0.2l-6.4-11.4l0.9-0.1c-0.2,0.7-0.5,1.4-0.8,2.1l-0.9,2.1C22.3,30.7,21.7,32.1,21,33.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlendSpace1D_16.svg b/Content/Slate/Starship/AssetIcons/BlendSpace1D_16.svg
new file mode 100644
index 0000000..b52c5de
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlendSpace1D_16.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10H11C10.4 10 10 9.6 10 9V6C10 5.4 10.4 5 11 5H12C12.6 5 13 5.4 13 6V9C13 9.6 12.6 10 12 10Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.6004 3.1L13.0004 5.8C12.8004 6 12.5004 6 12.3004 5.8C12.1004 5.6 12.1004 5.3 12.3004 5.1L15.0004 2.4C15.2004 2.2 15.5004 2.2 15.7004 2.4C15.8004 2.6 15.8004 2.9 15.6004 3.1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1001 5.89961L7.5001 3.19961C7.3001 2.99961 7.3001 2.69961 7.5001 2.49961C7.7001 2.29961 8.0001 2.29961 8.2001 2.49961L10.9001 5.19961C11.1001 5.39961 11.1001 5.69961 10.9001 5.89961C10.6001 6.09961 10.3001 6.09961 10.1001 5.89961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 8.5V14.5C11 14.8 10.8 15 10.5 15C10.2 15 10 14.8 10 14.5V8.5C10 8.2 10.2 8 10.5 8C10.8 8 11 8.2 11 8.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 8.5V12H12V8.5C12 8.2 12.2 8 12.5 8C12.8 8 13 8.2 13 8.5Z" fill="white"/>
+<path d="M11.4998 4.4C12.4387 4.4 13.1998 3.63888 13.1998 2.7C13.1998 1.76112 12.4387 1 11.4998 1C10.5609 1 9.7998 1.76112 9.7998 2.7C9.7998 3.63888 10.5609 4.4 11.4998 4.4Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.6001 7.9L5.9001 5.2C5.8001 5.1 5.6001 5.1 5.4001 5.1C5.3001 5 5.2001 5 5.0001 5H4.0001C3.9001 5 3.8001 5 3.7001 5.1C3.5001 5 3.3001 5 3.1001 5.2L0.500098 7.8C0.300098 8 0.300098 8.3 0.500098 8.5C0.700098 8.7 1.0001 8.7 1.2001 8.5L3.0001 6.8V8.6V9V14.5C3.0001 14.8 3.2001 15 3.5001 15C3.8001 15 4.0001 14.8 4.0001 14.5V10H5.0001V14.5C5.0001 14.8 5.2001 15 5.5001 15C5.8001 15 6.0001 14.8 6.0001 14.5V9V8.5V6.8L7.9001 8.7C8.1001 8.9 8.4001 8.9 8.6001 8.7C8.8001 8.5 8.8001 8.1 8.6001 7.9Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M4.4998 4.4C5.3998 4.4 6.1998 3.6 6.1998 2.7C6.1998 1.8 5.3998 1 4.4998 1C3.5998 1 2.7998 1.8 2.7998 2.7C2.7998 3.6 3.5998 4.4 4.4998 4.4Z" fill="white"/>
+<path d="M12.9999 15.9996H12.5999V13.4996L11.8999 13.7996V13.4996L12.8999 13.0996H12.9999V15.9996Z" fill="white"/>
+<path d="M14 16V13H14.8C15 13 15.3 13.1 15.4 13.2C15.6 13.3 15.7 13.5 15.8 13.7C15.9 13.9 16 14.2 16 14.4V14.6C16 14.9 15.9 15.1 15.8 15.3C15.7 15.5 15.6 15.7 15.4 15.8C15.2 15.9 15 16 14.8 16H14ZM14.4 13.3V15.7H14.8C15.1 15.7 15.3 15.6 15.5 15.4C15.7 15.2 15.7 14.9 15.7 14.6V14.4C15.7 14.1 15.6 13.8 15.5 13.6C15.4 13.4 15.1 13.3 14.9 13.3H14.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlendSpace1D_64.svg b/Content/Slate/Starship/AssetIcons/BlendSpace1D_64.svg
new file mode 100644
index 0000000..601f494
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlendSpace1D_64.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BlendSpace1D_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:#FFFFFF;stroke:#333333;stroke-width:0.5;stroke-miterlimit:10;}
+	.st5{font-family:'Roboto-Black';}
+	.st6{font-size:15.784px;}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="42.6498" y1="50.0407" x2="42.301" y2="22.4053">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="0.591" style="stop-color:#C9C9C9"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st0" d="M54.3,15.7c-0.6-0.6-1.5-0.6-2,0l-7.8,7.8c-0.3-0.1-0.6-0.2-1-0.2h-2.9c-0.3,0-0.5,0-0.8,0.1L32.4,16
+			c-0.6-0.6-1.5-0.6-2,0c-0.6,0.6-0.6,1.5,0,2l7.4,7.6c0,0.2,0,0.4,0,0.5v7.3V35V51c0,0.9,0.6,1.5,1.5,1.5s1.5-0.6,1.5-1.5V37.9h2.9
+			V51c0,0.9,0.6,1.5,1.5,1.5s1.5-0.6,1.5-1.5V35v-1.5v-7.3c0-0.2,0-0.4,0-0.6c0,0,0,0,0,0l7.6-7.9C54.6,17.1,54.6,16.3,54.3,15.7z"
+			/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="21.7475" y1="23.1544" x2="21.7475" y2="50.7898">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<path class="st1" d="M23.1,23.3h-2.9c0,0-1.9-0.1-2.6,0.6l-7.6,7.6c-0.6,0.6-0.6,1.5,0,2c0.6,0.6,1.5,0.6,2,0l5.3-5v5.3V35V51
+			c0,0.9,0.6,1.5,1.5,1.5c0.9,0,1.5-0.6,1.5-1.5V37.9h2.9V51c0,0.9,0.6,1.5,1.5,1.5S26,51.9,26,51V35v-1.5v-5l5.6,5.6
+			c0.6,0.6,1.5,0.6,2,0c0.6-0.6,0.6-1.8,0-2.3l-7.9-7.9C25.2,23,23.1,23.3,23.1,23.3z"/>
+		<radialGradient id="SVGID_3_" cx="22.9025" cy="14.4039" r="7.1661" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.3203" style="stop-color:#9D9D9D"/>
+			<stop  offset="0.7861" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</radialGradient>
+		<path class="st2" d="M21.7,21.6c2.8,0,5-2.3,5-5s-2.3-5-5-5s-5,2.3-5,5S19,21.6,21.7,21.6z"/>
+		<radialGradient id="SVGID_4_" cx="43.3845" cy="14.4039" r="7.1661" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="0.1771" style="stop-color:#E9E9E9"/>
+			<stop  offset="0.7861" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</radialGradient>
+		<path class="st3" d="M42.2,21.6c2.8,0,5-2.3,5-5s-2.3-5-5-5s-5,2.3-5,5S39.4,21.6,42.2,21.6z"/>
+	</g>
+	<g>
+		<text transform="matrix(1 0 0 1 38.9993 56.6948)" class="st4 st5 st6">1D</text>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlendSpace_16.svg b/Content/Slate/Starship/AssetIcons/BlendSpace_16.svg
new file mode 100644
index 0000000..b99a259
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlendSpace_16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10H11C10.4 10 10 9.6 10 9V6C10 5.4 10.4 5 11 5H12C12.6 5 13 5.4 13 6V9C13 9.6 12.6 10 12 10Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.6004 3.1L13.0004 5.8C12.8004 6 12.5004 6 12.3004 5.8C12.1004 5.6 12.1004 5.3 12.3004 5.1L15.0004 2.4C15.2004 2.2 15.5004 2.2 15.7004 2.4C15.8004 2.6 15.8004 2.9 15.6004 3.1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1001 5.89961L7.5001 3.19961C7.3001 2.99961 7.3001 2.69961 7.5001 2.49961C7.7001 2.29961 8.0001 2.29961 8.2001 2.49961L10.9001 5.19961C11.1001 5.39961 11.1001 5.69961 10.9001 5.89961C10.6001 6.09961 10.3001 6.09961 10.1001 5.89961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 8.5V14.5C11 14.8 10.8 15 10.5 15C10.2 15 10 14.8 10 14.5V8.5C10 8.2 10.2 8 10.5 8C10.8 8 11 8.2 11 8.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 8.5V14.5C13 14.8 12.8 15 12.5 15C12.2 15 12 14.8 12 14.5V8.5C12 8.2 12.2 8 12.5 8C12.8 8 13 8.2 13 8.5Z" fill="white"/>
+<path d="M11.4998 4.4C12.4387 4.4 13.1998 3.63888 13.1998 2.7C13.1998 1.76112 12.4387 1 11.4998 1C10.5609 1 9.7998 1.76112 9.7998 2.7C9.7998 3.63888 10.5609 4.4 11.4998 4.4Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.6001 7.9L5.9001 5.2C5.8001 5.1 5.6001 5.1 5.4001 5.1C5.3001 5 5.2001 5 5.0001 5H4.0001C3.9001 5 3.8001 5 3.7001 5.1C3.5001 5 3.3001 5 3.1001 5.2L0.500098 7.8C0.300098 8 0.300098 8.3 0.500098 8.5C0.700098 8.7 1.0001 8.7 1.2001 8.5L3.0001 6.8V8.6V9V14.5C3.0001 14.8 3.2001 15 3.5001 15C3.8001 15 4.0001 14.8 4.0001 14.5V10H5.0001V14.5C5.0001 14.8 5.2001 15 5.5001 15C5.8001 15 6.0001 14.8 6.0001 14.5V9V8.5V6.8L7.9001 8.7C8.1001 8.9 8.4001 8.9 8.6001 8.7C8.8001 8.5 8.8001 8.1 8.6001 7.9Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M4.4998 4.4C5.3998 4.4 6.1998 3.6 6.1998 2.7C6.1998 1.8 5.3998 1 4.4998 1C3.5998 1 2.7998 1.8 2.7998 2.7C2.7998 3.6 3.5998 4.4 4.4998 4.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlendSpace_64.svg b/Content/Slate/Starship/AssetIcons/BlendSpace_64.svg
new file mode 100644
index 0000000..ff1e660
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlendSpace_64.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BlendSpace_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="42.6498" y1="50.0407" x2="42.301" y2="22.4053">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="0.591" style="stop-color:#C9C9C9"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st0" d="M54.3,15.7c-0.6-0.6-1.5-0.6-2,0l-7.8,7.8c-0.3-0.1-0.6-0.2-1-0.2h-2.9c-0.3,0-0.5,0-0.8,0.1L32.4,16
+		c-0.6-0.6-1.5-0.6-2,0c-0.6,0.6-0.6,1.5,0,2l7.4,7.6c0,0.2,0,0.4,0,0.5v7.3V35V51c0,0.9,0.6,1.5,1.5,1.5s1.5-0.6,1.5-1.5V37.9h2.9
+		V51c0,0.9,0.6,1.5,1.5,1.5s1.5-0.6,1.5-1.5V35v-1.5v-7.3c0-0.2,0-0.4,0-0.6c0,0,0,0,0,0l7.6-7.9C54.6,17.1,54.6,16.3,54.3,15.7z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="21.7475" y1="23.1544" x2="21.7475" y2="50.7898">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st1" d="M23.1,23.3h-2.9c0,0-1.9-0.1-2.6,0.6l-7.6,7.6c-0.6,0.6-0.6,1.5,0,2c0.6,0.6,1.5,0.6,2,0l5.3-5v5.3V35V51
+		c0,0.9,0.6,1.5,1.5,1.5c0.9,0,1.5-0.6,1.5-1.5V37.9h2.9V51c0,0.9,0.6,1.5,1.5,1.5S26,51.9,26,51V35v-1.5v-5l5.6,5.6
+		c0.6,0.6,1.5,0.6,2,0c0.6-0.6,0.6-1.8,0-2.3l-7.9-7.9C25.2,23,23.1,23.3,23.1,23.3z"/>
+	<radialGradient id="SVGID_3_" cx="22.9025" cy="14.4039" r="7.1661" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.3203" style="stop-color:#9D9D9D"/>
+		<stop  offset="0.7861" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st2" d="M21.7,21.6c2.8,0,5-2.3,5-5s-2.3-5-5-5s-5,2.3-5,5S19,21.6,21.7,21.6z"/>
+	<radialGradient id="SVGID_4_" cx="43.3845" cy="14.4039" r="7.1661" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="0.1771" style="stop-color:#E9E9E9"/>
+		<stop  offset="0.7861" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</radialGradient>
+	<path class="st3" d="M42.2,21.6c2.8,0,5-2.3,5-5s-2.3-5-5-5s-5,2.3-5,5S39.4,21.6,42.2,21.6z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlockingVolume_16.svg b/Content/Slate/Starship/AssetIcons/BlockingVolume_16.svg
new file mode 100644
index 0000000..90233e1
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlockingVolume_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M11.7 8.40002C11.2 8.10002 10.9 8.5 10.9 8.5L9.5 10.8H9V5C9 5 9 4.5 8.5 4.5C8 4.5 8 5 8 5V9.20001C8 9.20001 7.8 9.70001 7.5 9.70001C7.2 9.70001 7 9.20001 7 9.20001V5C7 5 7 4.5 6.5 4.5C6 4.5 6 5 6 5V9.20001C6 9.20001 5.8 9.70001 5.5 9.70001C5.2 9.70001 5 9.20001 5 9.20001V5C5 5 5 4.5 4.5 4.5C4 4.5 4 5 4 5V9.5V12C4 12.9 4.8 14 5.7 14H7.6C8.7 14 9.2 13.7 10.1 12.4C11 10.8 11.9 9.20001 11.9 9.20001C11.9 9.20001 12.1 8.70002 11.7 8.40002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlockingVolume_64.svg b/Content/Slate/Starship/AssetIcons/BlockingVolume_64.svg
new file mode 100644
index 0000000..0211233
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlockingVolume_64.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BlockingVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="28.4214" y1="23.8451" x2="28.2667" y2="48.1431">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</linearGradient>
+		<path class="st5" d="M37.9,34.4c-1.3-0.7-2.3,0.6-2.3,0.6l-2.8,4.2c-0.3-0.4-0.3-2.1-0.3-2.8V26.1c0,0,0-1.2-1.3-1.2
+			c-1.3,0-1.3,1.2-1.3,1.2v10.3c-0.4,0.5-0.9,0.4-1.4,0V25.1c0,0,0-1.2-1.3-1.2c-1.3,0-1.3,1.2-1.3,1.2v11.3c-0.4,0.7-0.9,0.7-1.4,0
+			V26.1c0,0,0-1.2-1.3-1.2S22,26.1,22,26.1v10.3c-0.4,0.7-0.8,0.8-1.3,0v-8.7c0,0,0-1.2-1.3-1.2s-1.3,1.2-1.3,1.2v9.4v4.6
+			c0,3.5,3,6.4,6.7,6.4h2.5c2.8,0,4.1-0.7,6.3-3.9c0,0,0.1-0.1,0.1-0.1c2.3-3.9,4.6-7.8,4.6-7.8S38.9,35.1,37.9,34.4z"/>
+	</g>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BluePrintInterface_64.svg b/Content/Slate/Starship/AssetIcons/BluePrintInterface_64.svg
new file mode 100644
index 0000000..e46972c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BluePrintInterface_64.svg
@@ -0,0 +1,23 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M41.7 23V20.2H31.4C29.7 20.2 28.6 21.6 28.6 23V31.5H23.1V34.2999H28.6V42.7999C28.6 44.5 30 45.5999 31.4 45.5999H41.7V42.7999H33.1C32.3 42.7999 31.4 41.9999 31.4 41.0999V24.7C31.4 23.9 32.2 23 33.1 23H41.7Z" fill="#7F7F7F"/>
+<path d="M25.9 31.5H22.9V34.3H25.9V31.5Z" fill="url(#paint0_linear)"/>
+<path d="M22.4 28.9V36.7999C22.4 37.4238 21.8238 38 21.2 38H10.5C9.87613 38 9.29999 37.4238 9.29999 36.7999V28.9C9.29999 28.2761 9.87613 27.7 10.5 27.7H21.2C21.5802 27.7 21.8739 27.831 22.0714 28.0285C22.269 28.226 22.4 28.5197 22.4 28.9Z" stroke="white"/>
+<path d="M41.1 20.2101L38.1 20.2001V23H41.1V20.2101Z" fill="url(#paint1_linear)"/>
+<path d="M41.1 42.8H38.1V45.6H41.1V42.8Z" fill="url(#paint2_linear)"/>
+<path d="M54.6 17.6V25.5C54.6 26.1239 54.0239 26.7 53.4 26.7H42.7C42.0761 26.7 41.5 26.1239 41.5 25.5V17.6C41.5 16.9762 42.0761 16.4 42.7 16.4H53.4C54.1048 16.4 54.6 16.9567 54.6 17.6Z" stroke="white"/>
+<path d="M54.6 40.1V48C54.6 48.6239 54.0239 49.2 53.4 49.2H42.7C42.0761 49.2 41.5 48.6239 41.5 48V40.1C41.5 39.4762 42.0761 38.9 42.7 38.9H53.3737C54.1495 38.987 54.6 39.5064 54.6 40.1Z" stroke="white"/>
+<defs>
+<linearGradient id="paint0_linear" x1="22.9844" y1="32.8171" x2="25.9927" y2="32.8371" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="41.0156" y1="21.5625" x2="38.0073" y2="21.5425" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="41.0156" y1="44.1106" x2="38.0073" y2="44.0905" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlueprintFunctionLibrary_16.svg b/Content/Slate/Starship/AssetIcons/BlueprintFunctionLibrary_16.svg
new file mode 100644
index 0000000..296f6e4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlueprintFunctionLibrary_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.9998 6.5C14.0998 6.3 14.1998 6.2 14.2998 6.2C14.3998 6.3 14.3998 6.4 14.4998 6.4C14.5998 6.5 14.5998 6.6 14.6998 6.7C14.7998 6.8 14.8998 6.9 14.9998 6.9C15.0998 7 15.1998 7 15.2998 7C15.4998 7 15.6998 6.9 15.7998 6.8C15.8998 6.6 15.9998 6.5 15.9998 6.3C15.9998 6.1 15.8998 6 15.8998 5.9C15.8998 5.8 15.7998 5.8 15.7998 5.7C15.7998 5.7 15.6998 5.7 15.6998 5.6C15.6998 5.6 15.5998 5.6 15.4998 5.5C15.4998 5.5 15.4998 5.5 15.3998 5.5C15.2998 5.5 15.1998 5.5 15.0998 5.5C14.7998 5.5 14.5998 5.6 14.2998 5.7C13.9998 5.8 13.7998 6 13.5998 6.2C13.3998 6.4 13.1998 6.7 12.9998 7C12.7998 7.3 12.6998 7.7 12.5998 8L12.4998 8.3H10.4998L10.3998 8.8H12.3998L11.4998 13.1C11.3998 13.7 11.1998 14.2 10.9998 14.5C10.7998 14.8 10.5998 15 10.2998 15C10.2998 14.9 10.1998 14.9 10.1998 14.8C10.1998 14.7 10.0998 14.5 10.0998 14.4C9.9998 14.2 9.9998 14.1 9.8998 14C9.7998 14.1 9.6998 14 9.4998 14C9.3998 13.9 9.1998 13.9 9.0998 13.9C8.7998 13.9 8.6998 14 8.4998 14.2C8.3998 14.4 8.2998 14.6 8.2998 14.8C8.2998 15.1 8.3998 15.3 8.5998 15.4C8.7998 15.6 9.0998 15.7 9.5998 15.7C9.6998 15.7 9.6998 15.7 9.6998 15.7H9.7998C10.2998 15.7 10.8998 15.5 11.3998 15C11.8998 14.5 12.1998 13.9 12.3998 13.2L13.2998 9.1H15.5998L15.6998 8.6H13.3998L13.4998 8.1C13.6998 7.3 13.7998 6.8 13.9998 6.5Z" fill="white"/>
+<path d="M16 1V3C16 3.6 15.6 4 15 4H12C11.4 4 11 3.6 11 3V1C11 0.4 11.4 0 12 0H15C15.6 0 16 0.4 16 1Z" fill="white"/>
+<path d="M5 5V7C5 7.6 4.6 8 4 8H1C0.4 8 0 7.6 0 7V5C0 4.4 0.4 4 1 4H4C4.6 4 5 4.4 5 5Z" fill="white"/>
+<path opacity="0.5" d="M12 3V2H8C7.5 2 7 2.5 7 3V6H4V7H7V10C7 10.6 7.5 11 8 11H10V10H8.6C8.3 10 8 9.7 8 9.4V3.6C8 3.3 8.3 3 8.6 3H12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlueprintFunctionLibrary_64.svg b/Content/Slate/Starship/AssetIcons/BlueprintFunctionLibrary_64.svg
new file mode 100644
index 0000000..47424be
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlueprintFunctionLibrary_64.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BlueprintFunctionLibrary_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#7F7F7F;enable-background:new    ;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:#FFFFFF;}
+	.st8{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M42.7,22.9v-2.8H31.4c-1.7,0-2.8,1.4-2.8,2.8v8.5h-8.5v2.8h8.5v8.5c0,1.7,1.4,2.8,2.8,2.8h11.3v-2.8h-9.6
+		c-0.8,0-1.7-0.8-1.7-1.7V24.6c0-0.8,0.8-1.7,1.7-1.7H42.7z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.9844" y1="32.7338" x2="25.9927" y2="32.7538">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<rect x="22.9" y="31.3" class="st1" width="3" height="2.8"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15.939" y1="38.7476" x2="15.8709" y2="27.2964">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st2" d="M22.9,28.8v7.9c0,0.9-0.8,1.7-1.7,1.7H10.5c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C22.2,27.1,22.9,27.9,22.9,28.8z"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="58.1279" y1="23.1242" x2="61.1362" y2="23.1442" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st3" points="41.1,20.1 38.1,20.1 38.1,22.9 41.1,22.9 	"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="58.1279" y1="0.5761" x2="61.1362" y2="0.5962" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st4" points="41.1,42.6 38.1,42.6 38.1,45.4 41.1,45.4 	"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="48.1325" y1="27.4736" x2="48.0643" y2="16.0224">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st5" d="M55.1,17.5v7.9c0,0.9-0.8,1.7-1.7,1.7H42.7c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C54.4,15.8,55.1,16.6,55.1,17.5z"/>
+	<g>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="45.5221" y1="51.4355" x2="45.3799" y2="36.071">
+			<stop  offset="0" style="stop-color:#1A1A1A"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st6" d="M52.1,51.8H38.8c-1.7,0-3-1.4-3-3v-9.4c0-1.7,1.4-3,3-3h13.3c1.7,0,3,1.4,3,3v9.4
+			C55.1,50.4,53.8,51.8,52.1,51.8z"/>
+		<g>
+			<path class="st7" d="M49.6,37.9c0,0-1.3-0.1-1.9,3.3l-1.4,6.4c0,0-0.8,4.1-5.6,3.2l0.8-0.7c0,0,2.1,0.4,3.3-2.6l1.5-7.2
+				c0,0,0.7-2.5,2.4-3c0,0,0.9-0.4,1.8,0.1"/>
+			<polygon class="st7" points="47.3,41.5 42.7,41.5 42.9,40.8 47.6,40.8 			"/>
+			<polygon class="st7" points="50.8,42.3 46.1,42.3 46.4,41.6 51.1,41.6 			"/>
+			<circle class="st7" cx="50" cy="38.3" r="1.1"/>
+			<circle class="st7" cx="40.9" cy="49.6" r="1.2"/>
+		</g>
+	</g>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlueprintGeneratedClass_16.svg b/Content/Slate/Starship/AssetIcons/BlueprintGeneratedClass_16.svg
new file mode 100644
index 0000000..5a915b6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlueprintGeneratedClass_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 5V4H8C7.4 4 7 4.5 7 5V8H4V9H7V12C7 12.6 7.5 13 8 13H12V12H8.60001C8.30001 12 8 11.7 8 11.4V5.6C8 5.3 8.30001 5 8.60001 5H12Z" fill="white"/>
+<path d="M16 3V5C16 5.6 15.6 6 15 6H12C11.4 6 11 5.6 11 5V3C11 2.4 11.4 2 12 2H15C15.6 2 16 2.4 16 3Z" fill="white"/>
+<path d="M16 11V13C16 13.6 15.6 14 15 14H12C11.4 14 11 13.6 11 13V11C11 10.4 11.4 10 12 10H15C15.6 10 16 10.4 16 11Z" fill="white"/>
+<path d="M5 7V9C5 9.6 4.6 10 4 10H1C0.4 10 0 9.6 0 9V7C0 6.4 0.4 6 1 6H4C4.6 6 5 6.4 5 7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlueprintGeneratedClass_64.svg b/Content/Slate/Starship/AssetIcons/BlueprintGeneratedClass_64.svg
new file mode 100644
index 0000000..0e0006f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlueprintGeneratedClass_64.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BluePrint_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#7F7F7F;enable-background:new    ;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M42.7,23v-2.8H31.4c-1.7,0-2.8,1.4-2.8,2.8v8.5h-8.5v2.8h8.5v8.5c0,1.7,1.4,2.8,2.8,2.8h11.3v-2.8h-9.6
+		c-0.8,0-1.7-0.8-1.7-1.7V24.7c0-0.8,0.8-1.7,1.7-1.7H42.7z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.9844" y1="32.8171" x2="25.9927" y2="32.8371">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<rect x="22.9" y="31.4" class="st1" width="3" height="2.8"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15.939" y1="38.8309" x2="15.8709" y2="27.3797">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st2" d="M22.9,28.9v7.9c0,0.9-0.8,1.7-1.7,1.7H10.5c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C22.2,27.2,22.9,27.9,22.9,28.9z"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="58.1279" y1="23.0409" x2="61.1362" y2="23.0609" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st3" points="41.1,20.1 38.1,20.1 38.1,23 41.1,23 	"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="58.1279" y1="0.4928" x2="61.1362" y2="0.5129" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st4" points="41.1,42.7 38.1,42.7 38.1,45.5 41.1,45.5 	"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="48.1325" y1="27.5569" x2="48.0643" y2="16.1057">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st5" d="M55.1,17.6v7.9c0,0.9-0.8,1.7-1.7,1.7H42.7c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C54.4,15.9,55.1,16.7,55.1,17.6z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="48.1325" y1="50.1049" x2="48.0643" y2="38.6537">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st6" d="M55.1,40.1v7.9c0,0.9-0.8,1.7-1.7,1.7H42.7c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C54.4,38.5,55.1,39.2,55.1,40.1z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlueprintInterface_16.svg b/Content/Slate/Starship/AssetIcons/BlueprintInterface_16.svg
new file mode 100644
index 0000000..03009ea
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlueprintInterface_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 5V4H8C7.4 4 7 4.5 7 5V8H4V9H7V12C7 12.6 7.5 13 8 13H12V12H8.60001C8.30001 12 8 11.7 8 11.4V5.6C8 5.3 8.30001 5 8.60001 5H12Z" fill="white"/>
+<path d="M15.5 3V5C15.5 5.18638 15.4401 5.30284 15.3714 5.37145C15.3028 5.44006 15.1864 5.5 15 5.5H12C11.8136 5.5 11.6972 5.44006 11.6286 5.37145C11.5599 5.30284 11.5 5.18638 11.5 5V3C11.5 2.81362 11.5599 2.69716 11.6286 2.62855C11.6972 2.55994 11.8136 2.5 12 2.5H15C15.1864 2.5 15.3028 2.55994 15.3714 2.62855C15.4401 2.69716 15.5 2.81362 15.5 3Z" stroke="white"/>
+<path d="M15.5 11V13C15.5 13.1864 15.4401 13.3028 15.3714 13.3714C15.3028 13.4401 15.1864 13.5 15 13.5H12C11.8136 13.5 11.6972 13.4401 11.6286 13.3714C11.5599 13.3028 11.5 13.1864 11.5 13V11C11.5 10.8136 11.5599 10.6972 11.6286 10.6286C11.6972 10.5599 11.8136 10.5 12 10.5H15C15.1864 10.5 15.3028 10.5599 15.3714 10.6286C15.4401 10.6972 15.5 10.8136 15.5 11Z" stroke="white"/>
+<path d="M4.5 7V9C4.5 9.18638 4.44006 9.30284 4.37145 9.37145C4.30284 9.44006 4.18638 9.5 4 9.5H1C0.813624 9.5 0.697164 9.44006 0.628553 9.37145C0.559943 9.30284 0.5 9.18638 0.5 9V7C0.5 6.81362 0.559943 6.69716 0.628553 6.62855C0.697164 6.55994 0.813624 6.5 1 6.5H4C4.18638 6.5 4.30284 6.55994 4.37145 6.62855C4.44006 6.69716 4.5 6.81362 4.5 7Z" stroke="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlueprintMacroLibrary_16.svg b/Content/Slate/Starship/AssetIcons/BlueprintMacroLibrary_16.svg
new file mode 100644
index 0000000..27255da
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlueprintMacroLibrary_16.svg
@@ -0,0 +1,6 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.9375 7.5175L11.0625 12.7881L13.6219 7.34312C13.6849 7.23957 13.7731 7.15374 13.8784 7.09372C13.9837 7.03369 14.1026 7.00144 14.2238 7H16.125L15.9338 7.50063C15.9338 7.50063 15.0956 7.585 15.0619 7.91688C15.0281 8.24875 14.4375 14.5037 14.3981 14.9481C14.3588 15.3925 15.1856 15.5106 15.1856 15.5106L15.0956 15.9944H13.2225C13.1573 15.9867 13.0943 15.9662 13.0371 15.934C12.9799 15.9017 12.9296 15.8585 12.8893 15.8066C12.849 15.7548 12.8194 15.6955 12.8023 15.6321C12.7851 15.5687 12.7807 15.5026 12.7894 15.4375L13.5544 8.98L11.0625 14.0706C10.95 14.3294 10.5394 14.7175 10.2919 14.7119H9.79688L8.84063 8.60875L7.42875 15.6569C7.41717 15.7476 7.37434 15.8315 7.30761 15.8942C7.24089 15.9568 7.15444 15.9942 7.06313 16H6L6.06188 15.4881C6.06188 15.4881 6.68062 15.4881 6.73125 15.2631C6.78187 15.0381 8.41875 7.99 8.48062 7.7425C8.5425 7.495 7.79438 7.45562 7.79438 7.45562L7.94625 7H9.16125C9.42562 7 9.8925 7.21375 9.9375 7.5175Z" fill="white"/>
+<path d="M16 1V3C16 3.6 15.6 4 15 4H12C11.4 4 11 3.6 11 3V1C11 0.4 11.4 0 12 0H15C15.6 0 16 0.4 16 1Z" fill="white"/>
+<path d="M5 5V7C5 7.6 4.6 8 4 8H1C0.4 8 0 7.6 0 7V5C0 4.4 0.4 4 1 4H4C4.6 4 5 4.4 5 5Z" fill="white"/>
+<path opacity="0.5" d="M12 3V2H8C7.5 2 7 2.5 7 3V6H4V7H7L8 6V3.6C8 3.3 8.3 3 8.6 3H12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BlueprintMacroLibrary_64.svg b/Content/Slate/Starship/AssetIcons/BlueprintMacroLibrary_64.svg
new file mode 100644
index 0000000..a825989
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BlueprintMacroLibrary_64.svg
@@ -0,0 +1,36 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M42.7001 22.9001V20.1001H31.4001C29.7001 20.1001 28.6001 21.5001 28.6001 22.9001V31.4001H20.1001V34.2001H28.6001V42.7001C28.6001 44.4001 30.0001 45.5001 31.4001 45.5001H42.7001V42.7001H33.1001C32.3001 42.7001 31.4001 41.9001 31.4001 41.0001V24.6001C31.4001 23.8001 32.2001 22.9001 33.1001 22.9001H42.7001Z" fill="#7F7F7F"/>
+<path d="M25.9 31.4H22.9V34.2H25.9V31.4Z" fill="url(#paint0_linear)"/>
+<path d="M22.9 28.8001V36.7001C22.9 37.6001 22.1 38.4001 21.2 38.4001H10.5C9.60005 38.4001 8.80005 37.6001 8.80005 36.7001V28.8001C8.80005 27.9001 9.60005 27.1001 10.5 27.1001H21.2C22.2 27.1001 22.9 27.9001 22.9 28.8001Z" fill="url(#paint1_linear)"/>
+<path d="M41.1001 20.1001H38.1001V22.9001H41.1001V20.1001Z" fill="url(#paint2_linear)"/>
+<path d="M41.1001 42.6001H38.1001V45.4001H41.1001V42.6001Z" fill="url(#paint3_linear)"/>
+<path d="M55.1 17.5V25.4C55.1 26.3 54.3 27.1 53.4 27.1H42.7C41.8 27.1 41 26.3 41 25.4V17.5C41 16.6 41.8 15.8 42.7 15.8H53.4C54.4 15.8 55.1 16.6 55.1 17.5Z" fill="url(#paint4_linear)"/>
+<path d="M52.1 51.8H38.8C37.1 51.8 35.8 50.4 35.8 48.8V39.4C35.8 37.7 37.2 36.4 38.8 36.4H52.1C53.8 36.4 55.1 37.8 55.1 39.4V48.8C55.1 50.4 53.8 51.8 52.1 51.8Z" fill="url(#paint5_linear)"/>
+<path d="M44.3516 38.6947L45.8611 45.7187L49.2916 38.4545C49.3838 38.3118 49.5111 38.1952 49.6612 38.1156C49.8114 38.036 49.9794 37.9962 50.1492 38H52.7221L52.4649 38.669C52.4649 38.669 51.3242 38.7804 51.2813 39.2178C51.2384 39.6552 50.4237 48.0086 50.3808 48.6518C50.3379 49.295 51.4443 49.4065 51.4443 49.4065L51.3328 50.0498H48.7599C48.6676 50.0406 48.5782 50.0124 48.4974 49.9669C48.4165 49.9214 48.3461 49.8596 48.2904 49.7854C48.2348 49.7112 48.1952 49.6263 48.1741 49.5359C48.1531 49.4456 48.151 49.3519 48.1681 49.2607L49.1973 40.6844L45.8611 47.434C45.7067 47.777 45.1492 48.2916 44.8233 48.2916H44.1458L42.8508 40.1441L40.9383 49.5781C40.9206 49.6996 40.8614 49.8113 40.7707 49.8942C40.6801 49.977 40.5635 50.026 40.4408 50.0326H39L39.0772 49.3465C39.0772 49.3465 39.9348 49.3465 39.9949 49.0463C40.0549 48.7462 42.2504 39.3208 42.3619 38.9863C42.4734 38.6518 41.4357 38.6089 41.4357 38.6089L41.6415 38H43.2882C43.6398 38 44.2744 38.2916 44.3516 38.6947Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear" x1="22.9844" y1="32.7338" x2="25.9927" y2="32.7538" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="15.939" y1="38.7477" x2="15.8709" y2="27.2965" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#E6E6E6"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="41.0157" y1="21.4793" x2="38.0074" y2="21.4593" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="41.0157" y1="44.0274" x2="38.0074" y2="44.0073" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="48.1325" y1="27.4736" x2="48.0643" y2="16.0224" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#E6E6E6"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="45.5221" y1="51.4355" x2="45.3799" y2="36.071" gradientUnits="userSpaceOnUse">
+<stop stop-color="#1A1A1A"/>
+<stop offset="1" stop-color="#333333"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Blueprint_16.svg b/Content/Slate/Starship/AssetIcons/Blueprint_16.svg
new file mode 100644
index 0000000..5a915b6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Blueprint_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 5V4H8C7.4 4 7 4.5 7 5V8H4V9H7V12C7 12.6 7.5 13 8 13H12V12H8.60001C8.30001 12 8 11.7 8 11.4V5.6C8 5.3 8.30001 5 8.60001 5H12Z" fill="white"/>
+<path d="M16 3V5C16 5.6 15.6 6 15 6H12C11.4 6 11 5.6 11 5V3C11 2.4 11.4 2 12 2H15C15.6 2 16 2.4 16 3Z" fill="white"/>
+<path d="M16 11V13C16 13.6 15.6 14 15 14H12C11.4 14 11 13.6 11 13V11C11 10.4 11.4 10 12 10H15C15.6 10 16 10.4 16 11Z" fill="white"/>
+<path d="M5 7V9C5 9.6 4.6 10 4 10H1C0.4 10 0 9.6 0 9V7C0 6.4 0.4 6 1 6H4C4.6 6 5 6.4 5 7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Blueprint_64.svg b/Content/Slate/Starship/AssetIcons/Blueprint_64.svg
new file mode 100644
index 0000000..0e0006f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Blueprint_64.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BluePrint_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#7F7F7F;enable-background:new    ;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M42.7,23v-2.8H31.4c-1.7,0-2.8,1.4-2.8,2.8v8.5h-8.5v2.8h8.5v8.5c0,1.7,1.4,2.8,2.8,2.8h11.3v-2.8h-9.6
+		c-0.8,0-1.7-0.8-1.7-1.7V24.7c0-0.8,0.8-1.7,1.7-1.7H42.7z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.9844" y1="32.8171" x2="25.9927" y2="32.8371">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<rect x="22.9" y="31.4" class="st1" width="3" height="2.8"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="15.939" y1="38.8309" x2="15.8709" y2="27.3797">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st2" d="M22.9,28.9v7.9c0,0.9-0.8,1.7-1.7,1.7H10.5c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C22.2,27.2,22.9,27.9,22.9,28.9z"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="58.1279" y1="23.0409" x2="61.1362" y2="23.0609" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st3" points="41.1,20.1 38.1,20.1 38.1,23 41.1,23 	"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="58.1279" y1="0.4928" x2="61.1362" y2="0.5129" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st4" points="41.1,42.7 38.1,42.7 38.1,45.5 41.1,45.5 	"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="48.1325" y1="27.5569" x2="48.0643" y2="16.1057">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st5" d="M55.1,17.6v7.9c0,0.9-0.8,1.7-1.7,1.7H42.7c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C54.4,15.9,55.1,16.7,55.1,17.6z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="48.1325" y1="50.1049" x2="48.0643" y2="38.6537">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st6" d="M55.1,40.1v7.9c0,0.9-0.8,1.7-1.7,1.7H42.7c-0.9,0-1.7-0.8-1.7-1.7v-7.9c0-0.9,0.8-1.7,1.7-1.7h10.7
+		C54.4,38.5,55.1,39.2,55.1,40.1z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BoxCollision_16.svg b/Content/Slate/Starship/AssetIcons/BoxCollision_16.svg
new file mode 100644
index 0000000..a7a6418
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BoxCollision_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11.7 5.2L15.8 6L11.2 7.9L15.2 11.5L9.5 10.5L8 16L5.6 11.8L0 14L3.15756 9.44837L4.96199 10.3506L9.01038 7.51237V4.53973L14.5 0.199997L11.7 5.2Z" fill="white"/>
+<path d="M4.83192 0.200012L0.0797119 2.44742V7.3168L4.83192 9.18964V0.200012Z" fill="white"/>
+<path opacity="0.5" d="M8.00004 7.16701L4.83191 9.18964V0.200012L8.00004 2.44742V7.16701Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BoxReflectionCapture_16.svg b/Content/Slate/Starship/AssetIcons/BoxReflectionCapture_16.svg
new file mode 100644
index 0000000..ccb50fa
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BoxReflectionCapture_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 4H0V0H4V1H1V4ZM15 1V4H16V0H12V1H15ZM15 15H12V16H16V12H15V15ZM1 15V12H0V16H4V15H1Z" fill="white"/>
+<path d="M9.5 13H2V5.5L9.5 13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 7L6 3H10V7Z" fill="white"/>
+<path opacity="0.5" d="M10 8L5 3H2L10 11V8Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M14 11L11 13V3L14 5V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/BoxReflectionCapture_64.svg b/Content/Slate/Starship/AssetIcons/BoxReflectionCapture_64.svg
new file mode 100644
index 0000000..6d9860f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/BoxReflectionCapture_64.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="BoxReflectionCapture_x5F_64_1_"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st1{fill:#3F3F3F;}
+	.st2{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M9.7,53.9v-8.7c0-0.2-0.2-0.4-0.4-0.4H7c-0.2,0-0.4,0.2-0.4,0.4V57c0,0.2,0.2,0.4,0.4,0.4h11.9
+		c0.2,0,0.4-0.2,0.4-0.4v-2.3c0-0.2-0.2-0.4-0.4-0.4h-8.7C9.9,54.3,9.7,54.1,9.7,53.9z"/>
+	<path class="st0" d="M10.1,9.7h8.7c0.2,0,0.4-0.2,0.4-0.4V7c0-0.2-0.2-0.4-0.4-0.4H7C6.7,6.5,6.5,6.7,6.5,7v11.9
+		c0,0.2,0.2,0.4,0.4,0.4h2.3c0.2,0,0.4-0.2,0.4-0.4v-8.7C9.7,9.9,9.9,9.7,10.1,9.7z"/>
+	<path class="st0" d="M54.3,10.1v8.7c0,0.2,0.2,0.4,0.4,0.4H57c0.2,0,0.4-0.2,0.4-0.4V7c0-0.2-0.2-0.4-0.4-0.4H45.1
+		c-0.2,0-0.4,0.2-0.4,0.4v2.3c0,0.2,0.2,0.4,0.4,0.4h8.7C54.1,9.7,54.3,9.9,54.3,10.1z"/>
+	<path class="st0" d="M53.9,54.3h-8.7c-0.2,0-0.4,0.2-0.4,0.4V57c0,0.2,0.2,0.4,0.4,0.4H57c0.2,0,0.4-0.2,0.4-0.4V45.1
+		c0-0.2-0.2-0.4-0.4-0.4h-2.3c-0.2,0-0.4,0.2-0.4,0.4v8.7C54.3,54.1,54.1,54.3,53.9,54.3z"/>
+	<g>
+		<g>
+			<g>
+				<rect x="13" y="15.5" class="st1" width="31.5" height="34.3"/>
+			</g>
+			<g>
+				<g>
+					<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.2868" y1="49.1802" x2="29.4556" y2="32.0114">
+						<stop  offset="0" style="stop-color:#E6E6E6"/>
+						<stop  offset="1" style="stop-color:#808080"/>
+					</linearGradient>
+					<path class="st2" d="M44.5,49.9H13V15.5L44.5,49.9z"/>
+					<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="36.2764" y1="24.4852" x2="44.8608" y2="15.9008">
+						<stop  offset="0" style="stop-color:#CCCCCC"/>
+						<stop  offset="1" style="stop-color:#E6E6E6"/>
+					</linearGradient>
+					<path class="st3" d="M44.5,32.7L28.8,15.5h15.8V32.7z"/>
+				</g>
+			</g>
+		</g>
+		<polygon class="st0" points="44.5,15.5 51.1,24.1 51.1,43.1 44.5,49.9 		"/>
+	</g>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Brush_16.svg b/Content/Slate/Starship/AssetIcons/Brush_16.svg
new file mode 100644
index 0000000..e788404
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Brush_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 16L0 12V7L9 10.5V16Z" fill="white"/>
+<path opacity="0.5" d="M16 7L9 10.5V16L16 12V7Z" fill="white"/>
+<path opacity="0.5" d="M16 2.5L8.5 0L0 2.5V7L0.9 7.3V2.8L8.1 5.8V10.9L8.9 11.1V5.7L15.1 2.8V7.3L16 7V2.5ZM8.5 5.2L2.3 2.6L8.5 0.799999L14 2.6L8.5 5.2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Brush_64.svg b/Content/Slate/Starship/AssetIcons/Brush_64.svg
new file mode 100644
index 0000000..5bb8f99
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Brush_64.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#595959;stroke:#BFBFBF;stroke-width:3;stroke-miterlimit:10;}
+	.st2{fill:none;stroke:#BFBFBF;stroke-width:3;stroke-miterlimit:10;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:url(#SVGID_2_);}
+</style>
+<g id="Brush_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<polygon class="st1" points="5.7,45.1 5.7,13.4 32.1,3.9 58.3,13.4 58.3,45.1 32.1,58.2 		"/>
+		<polyline class="st2" points="5.7,13.4 32.1,24.5 58.3,13.4 		"/>
+		<line class="st2" x1="32.1" y1="58.2" x2="32.1" y2="24.5"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="45.7999" y1="218.4847" x2="45.9919" y2="249.9758" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st3" points="32.1,39.8 59.7,28.4 59.9,46.1 32,60.1 		"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="18.0112" y1="218.3793" x2="18.2048" y2="250.1481" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0.4118" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</linearGradient>
+		<polygon class="st4" points="32.1,39.8 4.1,28.5 4.1,46.1 32,60.1 		"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ButtonStyleAsset_16.svg b/Content/Slate/Starship/AssetIcons/ButtonStyleAsset_16.svg
new file mode 100644
index 0000000..a3f3872
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ButtonStyleAsset_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M7 7.88V4.12C6.5 3.59 5.79 3.25 5 3.25C3.48 3.25 2.25 4.48 2.25 6C2.25 7.52 3.48 8.75 5 8.75C5.79 8.75 6.5 8.41 7 7.88Z" fill="white"/>
+<path d="M5 11C5.71 11 6.39 10.85 7 10.58V9.44C6.41 9.79 5.73 10 5 10C2.79 10 1 8.21 1 6C1 3.79 2.79 2 5 2C6.1 2 7.1 2.45 7.83 3.17L8 3L9.23 3.35C8.34 1.94 6.79 1 5 1C2.24 1 0 3.24 0 6C0 8.76 2.24 11 5 11Z" fill="white"/>
+<path d="M15.98 10.83L8 4L8.1 14.51L10.43 11.29L12.69 16L14.37 15.19L12.13 10.52L15.98 10.83Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ButtonStyleAsset_64.svg b/Content/Slate/Starship/AssetIcons/ButtonStyleAsset_64.svg
new file mode 100644
index 0000000..2482d7e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ButtonStyleAsset_64.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ButtonStyleAseet_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{opacity:0.29;enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<radialGradient id="SVGID_1_" cx="23.5475" cy="24.9327" r="14.1346" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</radialGradient>
+	<circle class="st1" cx="23.5" cy="24.9" r="14.1"/>
+	<path class="st2" d="M29.2,31.4V20.7c-1.4-1.5-3.4-2.5-5.7-2.5c-4.3,0-7.8,3.5-7.8,7.8s3.5,7.8,7.8,7.8
+		C25.8,33.8,27.8,32.9,29.2,31.4z"/>
+	<path class="st2" d="M24.1,39.1c2,0,3.4-0.4,5.1-1.2v-3.2c-1.7,0.9-3.1,1.7-5.1,1.7c-6.2,0-11.3-4.9-11.3-10.9s5.1-10.9,11.3-10.9
+		c3.1,0,5.4,1.3,7.5,3.2l0.9-0.7l3.6,1.1c-2-3.8-6.9-6.4-12-6.4c-7.8,0-14.1,6.1-14.1,13.6S16.3,39.1,24.1,39.1z"/>
+	<path class="st2" d="M32.2,36.1c-0.3,0.3-0.3,0.3-0.7,0.5l0-16.5c0-0.6,0.3-0.7,0.8-0.5L32.2,36.1z"/>
+	<g>
+		<radialGradient id="SVGID_2_" cx="22.4874" cy="24.9327" r="7.2634" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</radialGradient>
+		<path class="st3" d="M29.2,30.2V19.6c-1.4-1.5-3.4-2.5-5.7-2.5c-4.3,0-7.8,3.5-7.8,7.8s3.5,7.8,7.8,7.8
+			C25.8,32.7,27.8,31.7,29.2,30.2z"/>
+		<radialGradient id="SVGID_3_" cx="22.4591" cy="24.9327" r="13.6013" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</radialGradient>
+		<path class="st4" d="M23.5,39.1c2,0,3.9-0.4,5.7-1.2v-3.2c-1.7,1-3.6,1.6-5.7,1.6c-6.2,0-11.3-5.1-11.3-11.3s5.1-11.3,11.3-11.3
+			c3.1,0,5.9,1.3,8,3.3l0.5-0.5l3.5,1c-2.5-4-6.9-6.6-12-6.6c-7.8,0-14.1,6.3-14.1,14.1S15.7,39.1,23.5,39.1z"/>
+		<path class="st5" d="M53.9,38L32.5,19.7c-0.2-0.2-0.5,0-0.5,0.2l0.3,28.2c0,0.3,0.3,0.4,0.5,0.2l5.8-8c0.1-0.2,0.4-0.1,0.5,0
+			l6.1,12.6c0.1,0.1,0.2,0.2,0.4,0.1l4.2-2c0.1-0.1,0.2-0.2,0.1-0.4l-6-12.5c-0.1-0.2,0.1-0.4,0.3-0.4l9.5,0.8
+			C54,38.5,54.1,38.2,53.9,38z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CableActor_16.svg b/Content/Slate/Starship/AssetIcons/CableActor_16.svg
new file mode 100644
index 0000000..c8b22c6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CableActor_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.1 10.5C3.3 11.3 3.6 12.2 4.2 12.8C5 13.4 6 13.6 7 13.3C7.9 12.9 8.6 12.2 9.1 11.5C10 10.1 10.6 8.7 11.1 7.2V2H10.8C10.6 3.5 10.3 5.1 9.9 6.6C9.5 8.1 9 9.7 8.2 11C7.8 11.6 7.3 12.2 6.7 12.5C6.1 12.7 5.4 12.7 4.8 12.3C4.2 11.9 3.8 11.2 3.6 10.5C3.2 9.6 3.1 8.8 3 8V9.4C3 9.8 3.1 10.1 3.1 10.5Z" fill="white"/>
+<path opacity="0.5" d="M0 7V8H2V16H3V8H5V7H0Z" fill="white"/>
+<path opacity="0.5" d="M8 0V2H11V16H13V2H16V0H8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CableActor_64.svg b/Content/Slate/Starship/AssetIcons/CableActor_64.svg
new file mode 100644
index 0000000..d8e2e5f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CableActor_64.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="CableActor_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_3_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="13.1347" y1="32.0189" x2="13.1342" y2="31.9811">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st1" d="M14.7,32h-3.1"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.4548" y1="56.7169" x2="13.1273" y2="29.8588">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st2" d="M5.4,28.9V32h6.2v24.8h3.1V32h6.2v-3.1H5.4z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="46.3108" y1="56.9326" x2="46.2016" y2="7.0376">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.9492" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st3" d="M33.8,7.2v6.2h9.3v43.5h6.2V13.4h9.3V7.2H33.8z"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="35.3395" y1="30.3501" x2="10.4993" y2="30.0282">
+		<stop  offset="0" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<path class="st4" d="M26,47.3c-12.6,0.8-13.6-15.3-13.6-15.3h1.5c1.9,15.4,12,13.2,12,13.2c11.5-1.6,16.6-31.8,16.6-31.8h0.6
+		l0,11.3C43.1,24.7,36.8,46.5,26,47.3z"/>
+</g>
+<g id="Layer_79">
+</g>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="46.179" y1="20.1733" x2="46.2355" y2="13.3304">
+	<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+	<stop  offset="0.9239" style="stop-color:#4D4D4D"/>
+	<stop  offset="0.9892" style="stop-color:#4D4D4D;stop-opacity:0.1413"/>
+	<stop  offset="1" style="stop-color:#4D4D4D;stop-opacity:0"/>
+</linearGradient>
+<rect x="43.1" y="12.8" class="st5" width="6.2" height="7.7"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraActor_16.svg b/Content/Slate/Starship/AssetIcons/CameraActor_16.svg
new file mode 100644
index 0000000..0a870d7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraActor_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 13H1C0.4 13 0 12.6 0 12V4C0 3.4 0.4 3 1 3H9C9.6 3 10 3.4 10 4V12C10 12.6 9.6 13 9 13Z" fill="white"/>
+<path d="M11 7.2998V8.69983L16 12.1998V3.7998L11 7.2998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraActor_64.svg b/Content/Slate/Starship/AssetIcons/CameraActor_64.svg
new file mode 100644
index 0000000..943ae77
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraActor_64.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#DDDDDD;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:none;stroke:url(#SVGID_4_);stroke-miterlimit:10;}
+	.st6{fill:none;stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:url(#SVGID_7_);}
+</style>
+<g id="CameraActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<path class="st1" d="M36.4,47.5H9.7c-2,0-3.3-1.3-3.3-3.2V18.6c0-1.9,1.3-3.2,3.3-3.2h26.7c2,0,3.3,1.3,3.3,3.2v25.7
+			C39.8,46.2,38.4,47.5,36.4,47.5z"/>
+		<path class="st1" d="M41.9,29.4v3.2c0,0.6,0.2,1.1,0.6,1.4l12.7,10c1,0.8,2.4,0,2.4-1.4V19.4c0-1.4-1.4-2.2-2.4-1.4L42.5,28
+			C42.1,28.3,41.9,28.8,41.9,29.4z"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.1461" y1="205.8856" x2="22.9588" y2="239.4246" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st2" d="M36.4,48.6H9.7c-2,0-3.3-1.3-3.3-3.2V19.7c0-1.9,1.3-3.2,3.3-3.2h26.7c2,0,3.3,1.3,3.3,3.2v25.7
+			C39.8,47.3,38.4,48.6,36.4,48.6z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="62.031" y1="222.3828" x2="24.115" y2="222.4924" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.5936" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st3" d="M41.9,30.8V34c0,0.6,0.2,1.1,0.6,1.4l12.7,10c1,0.8,2.4,0,2.4-1.4V20.8c0-1.4-1.4-2.2-2.4-1.4l-12.7,10
+			C42.1,29.7,41.9,30.3,41.9,30.8z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="23.1157" y1="231.0841" x2="23.0846" y2="236.6453" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
+			<stop  offset="0.2075" style="stop-color:#000000;stop-opacity:0.3609"/>
+			<stop  offset="0.2299" style="stop-color:#000000;stop-opacity:0.4"/>
+			<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st4" d="M38.5,46.6H7.7c-0.7,0-1.3-0.6-1.3-1.3v-2.8c0-0.7,0.6-1.3,1.3-1.3h30.8c0.7,0,1.3,0.6,1.3,1.3v2.8
+			C39.8,46,39.2,46.6,38.5,46.6z"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="57" y1="232.9" x2="57" y2="232.9" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st5" d="M57,42.9"/>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="57" y1="209.1" x2="57" y2="209.1" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st6" d="M57,19.1"/>
+		
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="57.1804" y1="208.9644" x2="57.2196" y2="232.9673" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#DDDDDD"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<rect x="56.8" y="19" class="st7" width="0.8" height="23.9"/>
+		
+			<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="39.3785" y1="206.9107" x2="39.4194" y2="231.9362" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#DDDDDD"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<polygon class="st8" points="39.8,41.9 39,41.9 39,17 39.8,18.2 		"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraBlockingVolume_16.svg b/Content/Slate/Starship/AssetIcons/CameraBlockingVolume_16.svg
new file mode 100644
index 0000000..d63b362
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraBlockingVolume_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 14H3C2.4 14 2 13.6 2 13V9C2 8.4 2.4 8 3 8H7C7.6 8 8 8.4 8 9V13C8 13.6 7.6 14 7 14Z" fill="white"/>
+<path d="M8.90039 10.6V11.4L12.0004 13.6V10H9.70039L8.90039 10.6Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M15.7 3.40018C15.2 3.10018 14.9 3.50018 14.9 3.50018L13.5 5.80017H13V0.700195C13 0.700195 13 0.200195 12.5 0.200195C12 0.200195 12 0.700195 12 0.700195V4.40018C12 4.40018 11.8 4.90018 11.5 4.90018C11.2 4.90018 11 4.40018 11 4.40018V0.800171C11 0.800171 11 0.300171 10.5 0.300171C10 0.300171 10 0.800171 10 0.800171V4.40018C10 4.40018 9.8 4.90018 9.5 4.90018C9.2 4.90018 9 4.40018 9 4.40018V0.800171C9 0.800171 9 0.300171 8.5 0.300171C8 0.300171 8 0.800171 8 0.800171V4.7002V7.2002C8 8.1002 8.8 9.2002 9.7 9.2002H11.6C12.7 9.2002 13.2 8.90019 14.1 7.60019C15 6.00019 15.9 4.40018 15.9 4.40018C15.9 4.40018 16.1 3.70018 15.7 3.40018Z" fill="white"/>
+<path opacity="0.5" d="M7 0.100006V0H3L0 3H7V0.100006Z" fill="white"/>
+<path opacity="0.5" d="M14 0V2.79999L14.1 2.70001V2.60001C14.3 2.30001 14.8 2 15.3 2C15.5 2 15.8 2.10001 16 2.20001V0H14Z" fill="white"/>
+<path opacity="0.5" d="M13 9.7998V15.9998L16 12.9998V6.2998L14.9 8.19983C14.3 9.19983 13.7 9.5998 13 9.7998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraBlockingVolume_64.svg b/Content/Slate/Starship/AssetIcons/CameraBlockingVolume_64.svg
new file mode 100644
index 0000000..c8c4705
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraBlockingVolume_64.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="CameraBlockingVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:#DDDDDD;}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{fill:url(#SVGID_5_);}
+	.st8{fill:url(#SVGID_6_);}
+	.st9{fill:none;stroke:url(#SVGID_7_);stroke-miterlimit:10;}
+	.st10{fill:none;stroke:url(#SVGID_8_);stroke-miterlimit:10;}
+	.st11{fill:url(#SVGID_9_);}
+	.st12{fill:url(#SVGID_10_);}
+	.st13{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<g>
+			<path class="st5" d="M29.7,45H16.7c-1,0-1.6-0.6-1.6-1.6V31c0-0.9,0.6-1.6,1.6-1.6h12.9c1,0,1.6,0.6,1.6,1.6v12.4
+				C31.3,44.4,30.6,45,29.7,45z"/>
+			<path class="st5" d="M32.3,36.2v1.5c0,0.3,0.1,0.5,0.3,0.7l6.2,4.9c0.5,0.4,1.2,0,1.2-0.7V31.4c0-0.7-0.7-1.1-1.2-0.7l-6.2,4.9
+				C32.4,35.7,32.3,36,32.3,36.2z"/>
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="23.2456" y1="29.6992" x2="23.1549" y2="45.9487">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st6" d="M29.7,45.6H16.7c-1,0-1.6-0.6-1.6-1.6V31.6c0-0.9,0.6-1.6,1.6-1.6h12.9c1,0,1.6,0.6,1.6,1.6V44
+				C31.3,44.9,30.6,45.6,29.7,45.6z"/>
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="42.0707" y1="37.7003" x2="23.7005" y2="37.7534">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="0.5936" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st7" d="M32.3,36.9v1.5c0,0.3,0.1,0.5,0.3,0.7l6.2,4.9c0.5,0.4,1.2,0,1.2-0.7V32.1c0-0.7-0.7-1.1-1.2-0.7l-6.2,4.9
+				C32.4,36.4,32.3,36.7,32.3,36.9z"/>
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="23.208" y1="41.9113" x2="23.193" y2="44.5982">
+				<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
+				<stop  offset="0.2075" style="stop-color:#000000;stop-opacity:0.3609"/>
+				<stop  offset="0.2299" style="stop-color:#000000;stop-opacity:0.4"/>
+				<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st8" d="M30,44.6H16.4c-0.7,0-1.3-0.6-1.3-1.3v0c0-0.7,0.6-1.3,1.3-1.3H30c0.7,0,1.3,0.6,1.3,1.3v0
+				C31.3,44,30.7,44.6,30,44.6z"/>
+			<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="39.6282" y1="42.7807" x2="39.6282" y2="42.7807">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st9" d="M39.6,42.8"/>
+			<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="39.6282" y1="31.2511" x2="39.6282" y2="31.2511">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st10" d="M39.6,31.3"/>
+			<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="39.731" y1="31.1908" x2="39.7501" y2="42.8201">
+				<stop  offset="0" style="stop-color:#DDDDDD"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<rect x="39.6" y="31.2" class="st11" width="0.4" height="11.6"/>
+			<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="31.0899" y1="30.1957" x2="31.1098" y2="42.3205">
+				<stop  offset="0" style="stop-color:#DDDDDD"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<polygon class="st12" points="31.3,42.3 30.9,42.3 30.9,30.2 31.3,30.8 			"/>
+		</g>
+	</g>
+	<rect x="0" class="st13" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraRig_Crane_16.svg b/Content/Slate/Starship/AssetIcons/CameraRig_Crane_16.svg
new file mode 100644
index 0000000..a1fdf74
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraRig_Crane_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10.5 7V2" stroke="white" stroke-miterlimit="10"/>
+<path d="M16 2L0 3V0L16 1V2Z" fill="white"/>
+<path opacity="0.5" d="M5 16H2L2.8 2H4.2L5 16Z" fill="white"/>
+<path d="M11 13H7C6.4 13 6 12.6 6 12V8C6 7.4 6.4 7 7 7H11C11.6 7 12 7.4 12 8V12C12 12.6 11.6 13 11 13Z" fill="white"/>
+<path d="M12.9004 9.6004V10.4004L16.0004 12.6004V7.40039L12.9004 9.6004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraRig_Crane_64.svg b/Content/Slate/Starship/AssetIcons/CameraRig_Crane_64.svg
new file mode 100644
index 0000000..2ecedfb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraRig_Crane_64.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#BFBFBF;}
+	.st3{opacity:0.5;fill:url(#SVGID_2_);enable-background:new    ;}
+	.st4{fill:#FFFFFF;}
+	.st5{fill:url(#SVGID_3_);}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{fill:url(#SVGID_5_);}
+	.st8{fill:none;stroke:url(#SVGID_6_);stroke-miterlimit:10;}
+	.st9{fill:none;stroke:url(#SVGID_7_);stroke-miterlimit:10;}
+	.st10{fill:url(#SVGID_8_);}
+	.st11{fill:url(#SVGID_9_);}
+	.st12{fill:#7F7F7F;}
+</style>
+<g id="CameraRig_x5F_Crane_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.8621" y1="212.05" x2="34.5919" y2="212.05" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<rect x="33.1" y="14.5" class="st1" width="2.2" height="15.1"/>
+		<path class="st2" d="M37.7,30.5c0-1.5-1.6-2.7-3.5-2.7c-2,0-3.5,1.2-3.5,2.7H37.7z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.6089" y1="243.2098" x2="13.9814" y2="202.9866" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st3" d="M16.3,56.3h-5.4c-1.2,0-2.2-1.1-2.1-2.3l2.4-43.5c0.1-1.2,1-2.1,2.1-2.1h0.6c1.1,0,2.1,0.9,2.1,2.1L18.4,54
+			C18.5,55.2,17.5,56.3,16.3,56.3z"/>
+		<g>
+			<path class="st4" d="M42.2,48.9H26.1c-1.2,0-2-0.8-2-1.9V31.5c0-1.2,0.8-1.9,2-1.9h16.1c1.2,0,2,0.8,2,1.9V47
+				C44.2,48.2,43.4,48.9,42.2,48.9z"/>
+			<path class="st4" d="M45.5,38v1.9c0,0.3,0.1,0.7,0.4,0.8l7.7,6.1c0.6,0.5,1.4,0,1.4-0.8V32c0-0.8-0.8-1.3-1.4-0.8l-7.7,6.1
+				C45.6,37.4,45.5,37.7,45.5,38z"/>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="34.2063" y1="219.8665" x2="34.0932" y2="240.1119" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0.5187" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st5" d="M42.2,49.6H26.1c-1.2,0-2-0.8-2-1.9V32.2c0-1.2,0.8-1.9,2-1.9h16.1c1.2,0,2,0.8,2,1.9v15.5
+				C44.2,48.8,43.4,49.6,42.2,49.6z"/>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="57.665" y1="229.8898" x2="34.7774" y2="229.956" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0.3583" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st6" d="M45.5,38.9v1.9c0,0.3,0.1,0.7,0.4,0.8l7.7,6.1c0.6,0.5,1.4,0,1.4-0.8v-14c0-0.8-0.8-1.3-1.4-0.8L45.9,38
+				C45.6,38.2,45.5,38.5,45.5,38.9z"/>
+			
+				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="34.2096" y1="235.0803" x2="34.1909" y2="238.4315" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
+				<stop  offset="0.2075" style="stop-color:#000000;stop-opacity:0.3609"/>
+				<stop  offset="0.2299" style="stop-color:#000000;stop-opacity:0.4"/>
+				<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st7" d="M42.9,48.4H25.4c-0.7,0-1.3-0.6-1.3-1.3v-0.6c0-0.7,0.6-1.3,1.3-1.3H43c0.7,0,1.3,0.6,1.3,1.3v0.6
+				C44.2,47.8,43.7,48.4,42.9,48.4z"/>
+			
+				<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="54.6" y1="236.2" x2="54.6" y2="236.2" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st8" d="M54.6,46.2"/>
+			
+				<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="54.6" y1="221.8" x2="54.6" y2="221.8" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st9" d="M54.6,31.8"/>
+			
+				<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="54.7381" y1="221.7249" x2="54.7618" y2="236.214" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<rect x="54.5" y="31.8" class="st10" width="0.5" height="14.4"/>
+			
+				<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="43.9871" y1="220.4997" x2="44.0118" y2="235.6003" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<polygon class="st11" points="44.2,45.6 43.8,45.6 43.8,30.5 44.2,31.2 			"/>
+		</g>
+		<path class="st4" d="M58.5,12.8L8.3,15.9c-0.7,0-1.4-0.5-1.4-1.3V7.5c0-0.8,0.6-1.3,1.4-1.3l50.3,3.1c0.7,0,1.2,0.6,1.2,1.3v0.9
+			C59.7,12.2,59.2,12.7,58.5,12.8z"/>
+		<path class="st2" d="M58.5,13.5L8.3,16.7c-0.7,0-1.4-0.5-1.4-1.3V8.2c0-0.8,0.6-1.3,1.4-1.3L58.6,10c0.7,0,1.2,0.6,1.2,1.3v0.9
+			C59.7,12.9,59.2,13.5,58.5,13.5z"/>
+		<path class="st12" d="M20.6,56.9c0-2.6-3.1-4.6-7-4.6s-7,2.1-7,4.6H20.6z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraRig_Rail_16.svg b/Content/Slate/Starship/AssetIcons/CameraRig_Rail_16.svg
new file mode 100644
index 0000000..b628d51
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraRig_Rail_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 12C1.9 12 1 12.9 1 14C1 15.1 1.9 16 3 16C4.1 16 5 15.1 5 14C5 12.8 4.1 12 3 12ZM3 14.8C2.5 14.8 2.1 14.4 2.1 13.9C2.1 13.4 2.5 13 3 13C3.5 13 3.9 13.4 3.9 13.9C3.9 14.4 3.5 14.8 3 14.8Z" fill="white"/>
+<path opacity="0.5" d="M12 12C10.9 12 10 12.9 10 14C10 15.1 10.9 16 12 16C13.1 16 14 15.1 14 14C14 12.8 13.1 12 12 12ZM12 14.8C11.5 14.8 11.1 14.4 11.1 13.9C11.1 13.4 11.5 13 12 13C12.5 13 12.9 13.4 12.9 13.9C12.9 14.4 12.5 14.8 12 14.8Z" fill="white"/>
+<path d="M8 9H2C1.4 9 1 8.6 1 8V2C1 1.4 1.4 1 2 1H8C8.6 1 9 1.4 9 2V8C9 8.6 8.6 9 8 9Z" fill="white"/>
+<path d="M10 4.3996V5.59961L14 8.3996V1.59961L10 4.3996Z" fill="white"/>
+<path d="M14 10H1V11H14V10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CameraRig_Rail_64.svg b/Content/Slate/Starship/AssetIcons/CameraRig_Rail_64.svg
new file mode 100644
index 0000000..1defbb5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CameraRig_Rail_64.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#666666;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill:url(#SVGID_3_);}
+	.st6{fill:none;stroke:url(#SVGID_4_);stroke-miterlimit:10;}
+	.st7{fill:none;stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+	.st8{fill:url(#SVGID_6_);}
+	.st9{fill:url(#SVGID_7_);}
+	.st10{fill:url(#SVGID_8_);}
+	.st11{fill:url(#SVGID_9_);}
+	.st12{fill:url(#SVGID_10_);}
+	.st13{fill:url(#SVGID_11_);}
+	.st14{fill:url(#SVGID_12_);}
+</style>
+<g id="CameraRig_x5F_Rail_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<path class="st1" d="M29.7,40.5H19.5c-1.3,0-2.3-1-2.3-2.3l0,0c0-1.3,1-2.3,2.3-2.3h10.2c1.3,0,2.3,1,2.3,2.3l0,0
+			C32,39.5,31,40.5,29.7,40.5z"/>
+		<g>
+			<path class="st2" d="M36,35H14.2c-1.6,0-2.7-1-2.7-2.6v-21c0-1.6,1.1-2.6,2.7-2.6H36c1.6,0,2.7,1,2.7,2.6v21
+				C38.7,33.9,37.6,35,36,35z"/>
+			<path class="st2" d="M40.4,20.2v2.6c0,0.5,0.2,0.9,0.5,1.1l10.4,8.2c0.8,0.6,1.9,0,1.9-1.1V12c0-1.1-1.1-1.8-1.9-1.1L41,19.1
+				C40.6,19.3,40.4,19.7,40.4,20.2z"/>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="25.1762" y1="199.1635" x2="25.0231" y2="226.5679" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0.5187" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st3" d="M36,35.9H14.2c-1.6,0-2.7-1-2.7-2.6v-21c0-1.6,1.1-2.6,2.7-2.6H36c1.6,0,2.7,1,2.7,2.6v21
+				C38.7,34.8,37.6,35.9,36,35.9z"/>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="56.9119" y1="212.6641" x2="25.931" y2="212.7536" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0.3583" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st4" d="M40.4,21.4V24c0,0.5,0.2,0.9,0.5,1.1l10.4,8.2c0.8,0.6,1.9,0,1.9-1.1v-19c0-1.1-1.1-1.8-1.9-1.1L41,20.2
+				C40.6,20.5,40.4,20.9,40.4,21.4z"/>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="25.0625" y1="219.7538" x2="25.0372" y2="224.2914" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
+				<stop  offset="0.2075" style="stop-color:#000000;stop-opacity:0.3609"/>
+				<stop  offset="0.2299" style="stop-color:#000000;stop-opacity:0.4"/>
+				<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st5" d="M37.4,34.2H12.7c-0.7,0-1.3-0.6-1.3-1.3v-1.8c0-0.7,0.6-1.3,1.3-1.3h24.7c0.7,0,1.3,0.6,1.3,1.3v1.8
+				C38.7,33.6,38.1,34.2,37.4,34.2z"/>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="52.8" y1="221.2" x2="52.8" y2="221.2" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st6" d="M52.8,31.2"/>
+			
+				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="52.8" y1="201.8" x2="52.8" y2="201.8" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st7" d="M52.8,11.8"/>
+			
+				<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="52.984" y1="201.6789" x2="53.0161" y2="221.2915" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<rect x="52.7" y="11.7" class="st8" width="0.6" height="19.5"/>
+			
+				<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="38.3825" y1="200.0008" x2="38.416" y2="220.449" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<polygon class="st9" points="38.7,30.4 38.1,30.4 38.1,10.1 38.7,11 			"/>
+		</g>
+		<path class="st1" d="M42.7,43.5H19.8c-0.4,0-0.7-0.3-0.7-0.7v-2c0-0.4,0.3-0.7,0.7-0.7h22.9c0.4,0,0.7,0.3,0.7,0.7v2
+			C43.4,43.2,43.1,43.5,42.7,43.5z"/>
+		<path class="st1" d="M48.4,47.8h-0.3c-0.9,0-1.5-0.7-1.5-1.5v-3.8c0-0.9,0.7-1.5,1.5-1.5h0.3c0.9,0,1.5,0.7,1.5,1.5v3.8
+			C49.9,47.1,49.3,47.8,48.4,47.8z"/>
+		<path class="st1" d="M14.4,47.1h-0.3c-0.9,0-1.5-0.7-1.5-1.5v-3.8c0-0.9,0.7-1.5,1.5-1.5h0.3c0.9,0,1.5,0.7,1.5,1.5v3.8
+			C15.9,46.5,15.3,47.1,14.4,47.1z"/>
+		
+			<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="32" y1="228.0728" x2="32" y2="232.0247" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="0.3825" style="stop-color:#BDBDBD"/>
+			<stop  offset="0.5203" style="stop-color:#B7B7B7"/>
+			<stop  offset="0.6185" style="stop-color:#ABABAB"/>
+			<stop  offset="0.6979" style="stop-color:#9A9A9A"/>
+			<stop  offset="0.7659" style="stop-color:#848484"/>
+			<stop  offset="0.8261" style="stop-color:#696969"/>
+			<stop  offset="0.8792" style="stop-color:#494949"/>
+			<stop  offset="0.893" style="stop-color:#404040"/>
+		</linearGradient>
+		<path class="st10" d="M55.4,42.4H8.6c-0.9,0-1.5-0.7-1.5-1.5v-1.2c0-0.9,0.7-1.5,1.5-1.5h46.8c0.9,0,1.5,0.7,1.5,1.5v1.2
+			C56.9,41.7,56.2,42.4,55.4,42.4z"/>
+		
+			<radialGradient id="SVGID_9_" cx="14.2726" cy="239.2566" r="5.9807" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#878787"/>
+		</radialGradient>
+		<circle class="st11" cx="14.3" cy="49.3" r="6"/>
+		
+			<radialGradient id="SVGID_10_" cx="14.2726" cy="239.2566" r="3.4624" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.4188" style="stop-color:#7D7D7D"/>
+			<stop  offset="0.6152" style="stop-color:#767676"/>
+			<stop  offset="0.7652" style="stop-color:#696969"/>
+			<stop  offset="0.8909" style="stop-color:#575757"/>
+			<stop  offset="1" style="stop-color:#404040"/>
+		</radialGradient>
+		<circle class="st12" cx="14.3" cy="49.3" r="3.5"/>
+		
+			<radialGradient id="SVGID_11_" cx="48.2786" cy="239.2566" r="5.9807" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#878787"/>
+		</radialGradient>
+		<circle class="st13" cx="48.3" cy="49.3" r="6"/>
+		
+			<radialGradient id="SVGID_12_" cx="48.2786" cy="239.2566" r="3.4624" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.4188" style="stop-color:#7D7D7D"/>
+			<stop  offset="0.6152" style="stop-color:#767676"/>
+			<stop  offset="0.7652" style="stop-color:#696969"/>
+			<stop  offset="0.8909" style="stop-color:#575757"/>
+			<stop  offset="1" style="stop-color:#404040"/>
+		</radialGradient>
+		<circle class="st14" cx="48.3" cy="49.3" r="3.5"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Camera_16.svg b/Content/Slate/Starship/AssetIcons/Camera_16.svg
new file mode 100644
index 0000000..66cc442
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Camera_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 13H1C0.4 13 0 12.6 0 12V4C0 3.4 0.4 3 1 3H9C9.6 3 10 3.4 10 4V12C10 12.6 9.6 13 9 13Z" fill="white"/>
+<path d="M11 7.30078V8.70078L16 12.2008V3.80078L11 7.30078Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CapsuleCollision_16.svg b/Content/Slate/Starship/AssetIcons/CapsuleCollision_16.svg
new file mode 100644
index 0000000..c42efd6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CapsuleCollision_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11.7 5.2L15.8 6L11.2 7.9L15.2 11.5L9.5 10.5L8 16L5.6 11.8L0 14L3.23839 9.35951C3.23839 9.35951 3.84256 10.0266 5.00054 10.0266H7.11512C9.75834 9.77487 9.75834 7.5596 9.75834 7.5596V3.60735L14.5 0.199997L11.7 5.2Z" fill="white"/>
+<path d="M6.86349 9.25773H5.44822C4.24524 9.25773 3.32532 8.27647 3.32532 6.9933V2.84185C3.32532 1.40771 4.45753 0.200012 5.80204 0.200012H6.50967C7.85417 0.200012 8.98639 1.40771 8.98639 2.84185V6.9933C8.98639 8.27647 8.06646 9.25773 6.86349 9.25773Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CharacterMovementComponent_16.svg b/Content/Slate/Starship/AssetIcons/CharacterMovementComponent_16.svg
new file mode 100644
index 0000000..ced6972
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CharacterMovementComponent_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.25 8.9L5.55 6.2C5.45 6.1 5.25 6.1 5.05 6.1C4.95 6 4.85 6 4.65 6H3.65C3.55 6 3.45 6 3.35 6.1C3.15 6 2.95 6 2.75 6.2L0.15 8.8C-0.05 9 -0.05 9.3 0.15 9.5C0.35 9.7 0.65 9.7 0.85 9.5L2.65 7.8V9.6V10V15.5C2.65 15.8 2.85 16 3.15 16C3.45 16 3.65 15.8 3.65 15.5V11H4.65V15.5C4.65 15.8 4.85 16 5.15 16C5.45 16 5.65 15.8 5.65 15.5V10V9.5V7.8L7.55 9.7C7.75 9.9 8.05 9.9 8.25 9.7C8.45 9.5 8.45 9.1 8.25 8.9Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.14995 5.4C5.04995 5.4 5.84995 4.6 5.84995 3.7C5.84995 2.8 5.04995 2 4.14995 2C3.24995 2 2.44995 2.8 2.44995 3.7C2.44995 4.6 3.24995 5.4 4.14995 5.4Z" fill="white"/>
+<path d="M12 0L10.5 2H13.5L12 0Z" fill="white"/>
+<path d="M12 8L10.5 6H13.5L12 8Z" fill="white"/>
+<path d="M16 4L14 2.5V5.5L16 4Z" fill="white"/>
+<path d="M8 4L10 2.5V5.5L8 4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CharacterMovementComponent_64.svg b/Content/Slate/Starship/AssetIcons/CharacterMovementComponent_64.svg
new file mode 100644
index 0000000..82cc5f0
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CharacterMovementComponent_64.svg
@@ -0,0 +1,35 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M50.3 1.90002L45.8 8.00002H54.9001L50.3 1.90002Z" fill="url(#paint0_linear)"/>
+<path d="M50.3001 25.2L45.7001 19.1H54.8001L50.3001 25.2Z" fill="url(#paint1_linear)"/>
+<path d="M62 13.6L55.9 9V18.1L62 13.6Z" fill="url(#paint2_linear)"/>
+<path d="M38.7001 13.6L44.8001 9V18.1L38.7001 13.6Z" fill="url(#paint3_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.9 23.5H20.2C20.2 23.5 17.7 23.4 16.9 24.2L7.30002 33.7C6.60002 34.4 6.60002 35.6 7.30002 36.3C8.00002 37 9.20002 37 9.90002 36.3L16.5 30.1V58.4C16.4 59.4 17.2 60.2 18.1 60.2C18.2 60.2 18.2 60.2 18.3 60.2C19.3 60.3 20.1 59.5 20.1 58.6C20.1 58.5 20.1 58.5 20.1 58.4V41.8H23.8V58.4C23.8 59.4 24.6 60.2 25.6 60.2C26.6 60.2 27.4 59.4 27.4 58.4V30.1L34.4 37.1C35.1 37.8 36.2 37.8 36.9 37.2C36.9 37.2 36.9 37.2 37 37.1C37.7 36.3 37.7 35 37 34.2L27.1 24.3C26.5 23.2 23.9 23.5 23.9 23.5Z" fill="url(#paint4_linear)"/>
+<path d="M22.2 21.4C25.7 21.4 28.5 18.6 28.5 15.1C28.5 11.6 25.7 8.80005 22.2 8.80005C18.7 8.80005 15.9 11.6 15.9 15.1C15.8 18.5 18.7 21.3 22.2 21.4Z" fill="url(#paint5_radial)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="50.3201" y1="8.02002" x2="50.3201" y2="1.93002" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="50.3201" y1="25.25" x2="50.3201" y2="19.16" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#E6E6E6"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="56.0303" y1="13.572" x2="63.1603" y2="13.672" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="45.4797" y1="13.552" x2="37.7797" y2="13.742" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="22.2154" y1="23.33" x2="22.2154" y2="58.09" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<radialGradient id="paint5_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(23.65 12.32) scale(9.01)">
+<stop stop-color="#F2F2F2"/>
+<stop offset="0.64" stop-color="#B6B6B6"/>
+<stop offset="1" stop-color="#999999"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Character_16.svg b/Content/Slate/Starship/AssetIcons/Character_16.svg
new file mode 100644
index 0000000..91b8b69
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Character_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15.1401 13.84C14.2601 12.6 12.0501 12.4 11.0101 11.47C10.8101 11.29 10.6601 11.06 10.5301 10.8C9.92012 11.53 9.05012 12.24 8.59012 12.24H7.42012C6.95012 12.24 6.09012 11.52 5.47012 10.79C5.34012 11.04 5.19012 11.28 4.99012 11.46C3.95012 12.38 1.74012 12.58 0.860119 13.83C-0.0198809 15.08 0.260119 16 0.260119 16C1.27012 16 5.06012 16 7.32012 16C7.56012 16 7.80012 16 8.00012 16C8.20012 16 8.44012 16 8.68012 16C10.9401 16 14.7301 16 15.7401 16C15.7401 16 16.0201 15.08 15.1401 13.84Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9301 5.29C11.8301 5.29 11.7201 5.35 11.7201 5.35L11.7801 3.52C11.7901 1.58 10.5001 0 8.00008 0C5.50008 0 4.21008 1.58 4.21008 3.51L4.28008 5.34C4.28008 5.34 4.17008 5.28 4.08008 5.28C3.65008 5.28 3.33008 5.42 3.33008 5.94C3.33008 7.11 3.99008 7.62 4.46008 7.84L4.60008 7.88L5.07008 9.26C5.07008 9.26 6.50008 11.25 7.75008 11.25H8.25008C9.50008 11.25 10.9201 9.27 10.9201 9.27L11.3901 7.89L11.5201 7.85C12.0001 7.63 12.6501 7.12 12.6501 5.95C12.6601 5.43 12.3101 5.29 11.9301 5.29ZM7.34008 7.94C7.42008 7.89 7.53008 7.92 7.58008 8C7.59008 8.01 7.74008 8.24 8.01008 8.24C8.28008 8.24 8.44008 8 8.44008 8C8.49008 7.92 8.60008 7.89 8.68008 7.94C8.76008 7.99 8.79008 8.1 8.73008 8.18C8.72008 8.2 8.47008 8.58 8.01008 8.58C7.55008 8.58 7.30008 8.2 7.29008 8.18C7.24008 8.1 7.26008 7.99 7.34008 7.94ZM10.8701 5.4C10.8701 5.4 10.4401 5.3 10.0401 5.33C9.67008 5.35 9.73008 5.35 9.25008 5.39C9.18008 5.39 9.01008 5.36 9.00008 5.3C8.98008 5.08 9.22008 5.06 9.22008 5.06C9.24008 5.05 9.57008 5.03 10.0201 5C10.4901 4.97 10.9701 5.18 10.9901 5.18C11.0601 5.21 11.0801 5.28 11.0501 5.34C11.0401 5.36 11.0201 5.38 10.9901 5.39C10.9601 5.42 10.9101 5.42 10.8701 5.4ZM5.01008 5.4C4.98008 5.39 4.96008 5.37 4.95008 5.34C4.92008 5.28 4.95008 5.21 5.01008 5.18C5.03008 5.18 5.52008 4.97 5.98008 5C6.42008 5.03 6.76008 5.05 6.77008 5.06C6.77008 5.06 7.01008 5.08 6.99008 5.29C6.98008 5.36 6.81008 5.39 6.74008 5.38C6.27008 5.35 6.33008 5.35 5.96008 5.33C5.56008 5.3 5.13008 5.4 5.13008 5.4C5.09008 5.42 5.04008 5.42 5.01008 5.4ZM7.29008 6.21C7.25008 6.29 7.15008 6.32 7.07008 6.27C7.07008 6.27 6.96008 6.21 6.75008 6.17C6.79008 6.23 6.81008 6.3 6.81008 6.38C6.81008 6.61 6.62008 6.8 6.39008 6.8C6.16008 6.8 5.98008 6.61 5.98008 6.38C5.98008 6.29 6.01008 6.21 6.06008 6.15C5.72008 6.21 5.49008 6.35 5.48008 6.35C5.45008 6.37 5.42008 6.38 5.39008 6.38C5.34008 6.38 5.28008 6.35 5.25008 6.31C5.21008 6.23 5.23008 6.13 5.30008 6.08C5.32008 6.07 5.73008 5.8 6.31008 5.8C6.89008 5.8 7.21008 5.98 7.23008 5.99C7.31008 6.03 7.34008 6.13 7.29008 6.21ZM9.10008 9.48C9.08008 9.49 8.70008 9.79 8.00008 9.79C7.30008 9.79 6.92008 9.49 6.90008 9.48C6.84008 9.43 6.83008 9.33 6.88008 9.27C6.93008 9.2 7.01008 9.23 7.09008 9.24C7.42008 9.29 8.57008 9.29 8.91008 9.24C8.99008 9.23 9.07008 9.2 9.12008 9.27C9.17008 9.33 9.16008 9.43 9.10008 9.48ZM10.7401 6.31C10.7101 6.36 10.6601 6.38 10.6001 6.38C10.5701 6.38 10.5401 6.37 10.5101 6.35C10.5101 6.35 10.2801 6.2 9.93008 6.15C9.98008 6.22 10.0101 6.29 10.0101 6.38C10.0101 6.61 9.82008 6.8 9.59008 6.8C9.36008 6.8 9.19008 6.61 9.19008 6.38C9.19008 6.3 9.22008 6.23 9.26008 6.17C9.05008 6.21 8.94008 6.27 8.94008 6.27C8.85008 6.32 8.75008 6.29 8.71008 6.21C8.66008 6.13 8.69008 6.03 8.77008 5.99C8.78008 5.98 9.11008 5.8 9.69008 5.8C10.2801 5.8 10.6801 6.07 10.7001 6.08C10.7701 6.13 10.7901 6.23 10.7401 6.31Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Character_64.svg b/Content/Slate/Starship/AssetIcons/Character_64.svg
new file mode 100644
index 0000000..451cde6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Character_64.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Character_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#4C4C4C;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32" y1="40.0211" x2="32" y2="58.0162">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st0" d="M55.5,51.2c-2.9-4.1-10.2-4.8-13.6-7.8c-0.7-0.6-1.2-1.4-1.6-2.2c-2,2.4-4.9,4.8-6.4,4.8h-3.8
+		c-1.5,0-4.4-2.4-6.4-4.8c-0.4,0.8-0.9,1.6-1.6,2.2c-3.4,3-10.7,3.7-13.6,7.8c-2.9,4.1-2,7.1-2,7.1c3.3,0,15.8,0,23.3,0
+		c0.8,0,1.6,0,2.2,0c0.7,0,1.4,0,2.2,0c7.5,0,19.9,0,23.3,0C57.5,58.4,58.4,55.3,55.5,51.2z"/>
+	<polygon class="st1" points="39.5,38.6 24.4,38.6 21.1,18.6 42.8,18.6 	"/>
+	<radialGradient id="SVGID_2_" cx="32.0043" cy="24.1769" r="17.0189" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</radialGradient>
+	<path class="st2" d="M45,23.1c-0.3,0-0.7,0.2-0.7,0.2l0.2-6c0-6.4-4.2-11.6-12.5-11.6s-12.5,5.2-12.5,11.6l0.2,6
+		c0,0-0.4-0.2-0.7-0.2c-1.4,0-2.5,0.5-2.5,2.2c0,3.8,2.2,5.5,3.7,6.2l0.5,0.1l1.5,4.5c0,0,4.7,6.6,8.8,6.6h1.6
+		c4.1,0,8.8-6.5,8.8-6.5l1.6-4.6l0.4-0.1c1.6-0.7,3.7-2.4,3.7-6.2C47.4,23.5,46.2,23.1,45,23.1z M29.8,31.8c0.3-0.2,0.6-0.1,0.8,0.2
+		c0,0,0.5,0.8,1.4,0.8c0.9,0,1.4-0.8,1.4-0.8c0.2-0.3,0.5-0.3,0.8-0.2c0.3,0.2,0.3,0.5,0.2,0.8c0,0.1-0.8,1.3-2.4,1.3
+		c-1.5,0-2.3-1.3-2.4-1.3C29.5,32.3,29.6,32,29.8,31.8z M41.5,23.4c0,0-1.4-0.3-2.7-0.2c-1.2,0.1-1,0.1-2.6,0.2
+		c-0.2,0-0.8-0.1-0.8-0.3c-0.1-0.7,0.7-0.8,0.7-0.8c0.1,0,1.2-0.1,2.6-0.2c1.5-0.1,3.1,0.6,3.2,0.6c0.2,0.1,0.3,0.3,0.2,0.5
+		c0,0.1-0.1,0.1-0.2,0.2C41.7,23.5,41.6,23.5,41.5,23.4z M22.1,23.4c-0.1,0-0.1-0.1-0.2-0.2c-0.1-0.2,0-0.4,0.2-0.5
+		c0.1,0,1.7-0.7,3.2-0.6c1.5,0.1,2.6,0.2,2.6,0.2c0,0,0.8,0.1,0.7,0.8c0,0.2-0.6,0.3-0.8,0.3c-1.6-0.1-1.4-0.1-2.6-0.2
+		c-1.3-0.1-2.7,0.2-2.7,0.2C22.4,23.5,22.3,23.5,22.1,23.4z M29.7,26.1c-0.1,0.3-0.5,0.3-0.7,0.2c0,0-0.4-0.2-1.1-0.3
+		c0.1,0.2,0.2,0.4,0.2,0.7c0,0.8-0.6,1.4-1.4,1.4c-0.8,0-1.4-0.6-1.4-1.4c0-0.3,0.1-0.5,0.3-0.8c-1.1,0.2-1.9,0.7-1.9,0.7
+		c-0.1,0.1-0.2,0.1-0.3,0.1c-0.2,0-0.3-0.1-0.5-0.2c-0.2-0.2-0.1-0.6,0.1-0.7c0.1,0,1.4-0.9,3.3-0.9c1.9,0,3,0.6,3,0.6
+		C29.7,25.5,29.8,25.8,29.7,26.1z M35.6,36.9c0,0-1.3,1-3.6,1c-2.3,0-3.6-1-3.6-1c-0.2-0.2-0.3-0.5-0.1-0.7c0.2-0.2,0.4-0.1,0.7-0.1
+		c1.1,0.2,4.9,0.2,6,0c0.3,0,0.5-0.1,0.7,0.1C35.9,36.4,35.8,36.7,35.6,36.9z M41,26.4c-0.1,0.2-0.3,0.2-0.4,0.2
+		c-0.1,0-0.2,0-0.3-0.1c0,0-0.8-0.5-1.9-0.7c0.2,0.2,0.3,0.5,0.3,0.8c0,0.8-0.6,1.4-1.4,1.4s-1.4-0.6-1.4-1.4c0-0.3,0.1-0.5,0.2-0.7
+		c-0.7,0.1-1,0.3-1.1,0.3c-0.3,0.1-0.6,0-0.7-0.2c-0.1-0.3-0.1-0.6,0.2-0.7c0,0,1.1-0.6,3-0.6c1.9,0,3.3,0.9,3.3,0.9
+		C41.1,25.8,41.2,26.2,41,26.4z"/>
+	<rect x="0" class="st3" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CineCameraActor_16.svg b/Content/Slate/Starship/AssetIcons/CineCameraActor_16.svg
new file mode 100644
index 0000000..815ddf0
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CineCameraActor_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 15H1C0.4 15 0 14.5 0 14V9C0 8.5 0.4 8 1 8H10C10.5 8 11 8.5 11 9V14C11 14.5 10.5 15 10 15Z" fill="white"/>
+<path d="M2.5 2C1.1 2 0 3.1 0 4.5C0 5.9 1.1 7 2.5 7C3.9 7 5 5.9 5 4.5C5 3.1 3.9 2 2.5 2Z" fill="white"/>
+<path d="M8.5 2C7.1 2 6 3.1 6 4.5C6 5.9 7.1 7 8.5 7C9.9 7 11 5.9 11 4.5C11 3.1 9.9 2 8.5 2Z" fill="white"/>
+<path d="M11 11.5L16 8V15L11 11.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CineCameraActor_64.svg b/Content/Slate/Starship/AssetIcons/CineCameraActor_64.svg
new file mode 100644
index 0000000..634eef3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CineCameraActor_64.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#666666;}
+	.st2{fill:url(#SVGID_1_);stroke:#BFBFBF;stroke-miterlimit:10;}
+	.st3{opacity:0.8;fill:#E5E5E5;stroke:#7F7F7F;stroke-miterlimit:10;enable-background:new    ;}
+	.st4{fill:url(#SVGID_2_);stroke:#BFBFBF;stroke-miterlimit:10;}
+	.st5{fill:#FFFFFF;}
+	.st6{fill:url(#SVGID_3_);}
+	.st7{fill:url(#SVGID_4_);}
+	.st8{fill:url(#SVGID_5_);}
+	.st9{fill:none;stroke:url(#SVGID_6_);stroke-miterlimit:10;}
+	.st10{fill:none;stroke:url(#SVGID_7_);stroke-miterlimit:10;}
+	.st11{fill:url(#SVGID_8_);}
+	.st12{fill:url(#SVGID_9_);}
+</style>
+<g id="CineCameraActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<rect x="16.3" y="18" class="st1" width="21.2" height="12.2"/>
+		<g>
+			
+				<radialGradient id="SVGID_1_" cx="37.4525" cy="208" r="9.1824" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+				<stop  offset="0" style="stop-color:#D9D9D9"/>
+				<stop  offset="0.4337" style="stop-color:#D7D7D7"/>
+				<stop  offset="0.6048" style="stop-color:#D0D0D0"/>
+				<stop  offset="0.7294" style="stop-color:#C4C4C4"/>
+				<stop  offset="0.8316" style="stop-color:#B2B2B2"/>
+				<stop  offset="0.919" style="stop-color:#9C9C9C"/>
+				<stop  offset="0.9967" style="stop-color:#818181"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</radialGradient>
+			<circle class="st2" cx="37.5" cy="18" r="9.2"/>
+			<circle class="st3" cx="37.5" cy="18" r="3.6"/>
+		</g>
+		<g>
+			
+				<radialGradient id="SVGID_2_" cx="16.2573" cy="208" r="9.1824" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+				<stop  offset="0" style="stop-color:#D9D9D9"/>
+				<stop  offset="0.4337" style="stop-color:#D7D7D7"/>
+				<stop  offset="0.6048" style="stop-color:#D0D0D0"/>
+				<stop  offset="0.7294" style="stop-color:#C4C4C4"/>
+				<stop  offset="0.8316" style="stop-color:#B2B2B2"/>
+				<stop  offset="0.919" style="stop-color:#9C9C9C"/>
+				<stop  offset="0.9967" style="stop-color:#818181"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</radialGradient>
+			<circle class="st4" cx="16.3" cy="18" r="9.2"/>
+			<circle class="st3" cx="16.3" cy="18" r="3.6"/>
+		</g>
+		<g>
+			<path class="st5" d="M41,52.7H13.2c-1.5,0-2.5-1-2.5-2.4V31c0-1.4,1-2.4,2.5-2.4H41c1.5,0,2.5,1,2.5,2.4v19.3
+				C43.5,51.7,42.5,52.7,41,52.7z"/>
+			<path class="st5" d="M45.1,39.1v2.4c0,0.4,0.2,0.8,0.5,1.1l9.6,7.6c0.8,0.6,1.8,0,1.8-1.1V31.5c0-1-1-1.6-1.8-1.1L45.6,38
+				C45.3,38.3,45.1,38.7,45.1,39.1z"/>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="27.17" y1="218.912" x2="27.0288" y2="244.1948" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0.5187" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st6" d="M41,53.6H13.2c-1.5,0-2.5-1-2.5-2.4V31.8c0-1.4,1-2.4,2.5-2.4H41c1.5,0,2.5,1,2.5,2.4v19.3
+				C43.5,52.6,42.5,53.6,41,53.6z"/>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="60.247" y1="231.4161" x2="31.7151" y2="231.4986" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0.3583" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st7" d="M45.1,40.2v2.4c0,0.4,0.2,0.8,0.5,1.1l9.6,7.6c0.8,0.6,1.8,0,1.8-1.1V32.6c0-1-1-1.6-1.8-1.1l-9.6,7.6
+				C45.3,39.4,45.1,39.8,45.1,40.2z"/>
+			
+				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="27.1119" y1="237.8763" x2="27.0883" y2="242.1004" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
+				<stop  offset="0.2075" style="stop-color:#000000;stop-opacity:0.3609"/>
+				<stop  offset="0.2299" style="stop-color:#000000;stop-opacity:0.4"/>
+				<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st8" d="M42.2,52H12c-0.7,0-1.3-0.6-1.3-1.3v-1.4c0-0.7,0.6-1.3,1.3-1.3h30.2c0.7,0,1.3,0.6,1.3,1.3v1.4
+				C43.5,51.4,42.9,52,42.2,52z"/>
+			
+				<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="56.5" y1="239.3" x2="56.5" y2="239.3" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st9" d="M56.5,49.3"/>
+			
+				<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="56.5" y1="221.3" x2="56.5" y2="221.3" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+			</linearGradient>
+			<path class="st10" d="M56.5,31.3"/>
+			
+				<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="56.5852" y1="221.2509" x2="56.6148" y2="239.3131" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<rect x="56.3" y="31.3" class="st11" width="0.6" height="18"/>
+			
+				<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="43.1838" y1="219.7054" x2="43.2146" y2="238.5372" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			</linearGradient>
+			<polygon class="st12" points="43.5,48.5 42.9,48.5 42.9,29.8 43.5,30.7 			"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Class_16.svg b/Content/Slate/Starship/AssetIcons/Class_16.svg
new file mode 100644
index 0000000..89527ee
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Class_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 0V4H14L10 0Z" fill="white"/>
+<path d="M9 5V0H2V16H14V5H9ZM8 12.5C9 12.5 9.9 11.9 10.3 11H12C11.6 12.8 9.9 14.1 8 14.1C5.7 14.1 3.9 12.3 3.9 10C3.9 7.7 5.7 5.9 8 5.9C9.9 5.9 11.5 7.2 12 9H10.3C9.9 8.1 9 7.5 8 7.5C6.6 7.5 5.5 8.6 5.5 10C5.5 11.4 6.6 12.5 8 12.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Class_64.svg b/Content/Slate/Starship/AssetIcons/Class_64.svg
new file mode 100644
index 0000000..c322c34
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Class_64.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Class_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.3;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.5805" y1="11.162" x2="32.1305" y2="53.9036">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<polyline class="st0" points="49.3,22 49.3,54.4 14.5,54.4 14.5,9.6 38.4,9.6 	"/>
+	<polygon class="st1" points="38.4,9.6 37.8,22.5 49.3,22 	"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="38.2232" y1="21.2956" x2="44.0656" y2="15.6285">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st2" points="38.4,9.6 38.4,22 49.3,22 	"/>
+	<g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.1252" y1="24.1103" x2="31.2307" y2="48.3711">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<path class="st3" d="M37.6,38.9l5.2,1.5c-0.8,2.7-2.1,4.6-4,5.9s-4.2,1.9-7.1,1.9c-3.6,0-6.5-1.1-8.8-3.3c-2.3-2.2-3.4-5.2-3.4-9
+			c0-4,1.2-7.2,3.5-9.4s5.3-3.4,9.1-3.4c3.3,0,5.9,0.9,8,2.6c1.2,1,2.1,2.5,2.7,4.5l-5.4,1.2c-0.3-1.3-1-2.3-2-3
+			c-1-0.7-2.2-1.1-3.7-1.1c-2,0-3.6,0.6-4.8,1.9c-1.2,1.3-1.9,3.4-1.9,6.3c0,3.1,0.6,5.3,1.8,6.6s2.8,2,4.8,2c1.4,0,2.7-0.4,3.7-1.2
+			C36.4,41.9,37.2,40.6,37.6,38.9z"/>
+	</g>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CompositingElement_16.svg b/Content/Slate/Starship/AssetIcons/CompositingElement_16.svg
new file mode 100644
index 0000000..1cb5d18
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CompositingElement_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 10.9001C1 10.9001 7.7 14.6002 8.5 15.0002L16 10.9001L14.3 10.0002L8.5 13.2001L2.7 10.0002C2.6 9.90019 1 10.9001 1 10.9001Z" fill="white"/>
+<path opacity="0.5" d="M1 6.80054C1 6.80054 7.7 10.5004 8.5 10.9004L16 6.80054L14.3 5.90039L8.5 9.10059L2.7 5.90039C2.6 5.90039 1 6.80054 1 6.80054Z" fill="white"/>
+<path d="M1 2.80005C1 2.80005 7.7 6.4999 8.5 6.8999L16 2.80005L8.5 0L1 2.80005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CompositingElement_64.svg b/Content/Slate/Starship/AssetIcons/CompositingElement_64.svg
new file mode 100644
index 0000000..bbc75aa
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CompositingElement_64.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:#FFFFFF;}
+</style>
+<g id="CompositingElement_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<g>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="33.0132" y1="218.1187" x2="32.1137" y2="241.806" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#4D4D4D"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<path class="st1" d="M9.5,39c0,0,20.7,11.4,23.1,12.6L55.7,39l-23.1-8.6L9.5,39z"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.9171" y1="214.1575" x2="32.0176" y2="232.1478" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#999999"/>
+				<stop  offset="1" style="stop-color:#E6E6E6"/>
+			</linearGradient>
+			<path class="st2" d="M9.5,30.5c0,0,20.7,11.4,23.1,12.6l23.1-12.6l-23.1-8.6L9.5,30.5z"/>
+		</g>
+		<g>
+			<path class="st3" d="M9.5,21c0,0,20.7,11.4,23.1,12.6L55.8,21l-23.1-8.6L9.5,21z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CullDistanceVolume_16.svg b/Content/Slate/Starship/AssetIcons/CullDistanceVolume_16.svg
new file mode 100644
index 0000000..ed8f89b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CullDistanceVolume_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path opacity="0.5" d="M5.6002 11.5996H8.4002L11.8002 14.9996H2.2002L5.6002 11.5996Z" fill="white"/>
+<path d="M6.9998 4.2998C3.8998 4.2998 1.7998 7.3998 1.7998 7.3998C1.7998 7.3998 3.8998 10.4998 6.9998 10.4998C10.0998 10.4998 12.1998 7.3998 12.1998 7.3998C12.1998 7.3998 10.0998 4.2998 6.9998 4.2998ZM6.9998 10.1998C5.4998 10.1998 4.1998 8.9998 4.1998 7.3998C4.1998 5.7998 5.4998 4.6998 6.9998 4.6998C8.4998 4.6998 9.7998 5.8998 9.7998 7.4998C9.7998 9.0998 8.4998 10.1998 6.9998 10.1998Z" fill="white"/>
+<path d="M7.7 7.49961C8.0866 7.49961 8.4 7.18621 8.4 6.79961C8.4 6.41301 8.0866 6.09961 7.7 6.09961C7.3134 6.09961 7 6.41301 7 6.79961C7 7.18621 7.3134 7.49961 7.7 7.49961Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CullDistanceVolume_64.svg b/Content/Slate/Starship/AssetIcons/CullDistanceVolume_64.svg
new file mode 100644
index 0000000..1324e19
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CullDistanceVolume_64.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="CullDistanceVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{opacity:0.5;fill:url(#SVGID_4_);enable-background:new    ;}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:#FFFFFF;}
+	.st8{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="27.4681" y1="43.7328" x2="27.3608" y2="52.967">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.6193" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st5" d="M23.6,43.8h7.4l9,9H14.6L23.6,43.8z"/>
+		<radialGradient id="SVGID_5_" cx="27.3625" cy="32.6032" r="11.3863" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</radialGradient>
+		<path class="st6" d="M27.4,24.4c-8.2,0-13.8,8.2-13.8,8.2s5.6,8.2,13.8,8.2c8.2,0,13.8-8.2,13.8-8.2S35.6,24.4,27.4,24.4z
+			 M27.4,40.1c-4,0-7.4-3.2-7.4-7.4s3.5-7.2,7.4-7.2s7.4,3.2,7.4,7.4S31.4,40.1,27.4,40.1z"/>
+		<path class="st7" d="M29.2,32.9c1,0,1.9-0.8,1.9-1.9s-0.8-1.9-1.9-1.9c-1,0-1.9,0.8-1.9,1.9S28.2,32.9,29.2,32.9z"/>
+	</g>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CurveBase_16.svg b/Content/Slate/Starship/AssetIcons/CurveBase_16.svg
new file mode 100644
index 0000000..33c79c9
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CurveBase_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4.09961 15.0996C3.19961 15.9996 1.79961 15.9996 0.899609 15.0996C-0.000390649 14.1996 -0.000390649 12.7996 0.899609 11.8996C1.79961 10.9996 3.19961 10.9996 4.09961 11.8996C4.99961 12.7996 4.99961 14.1996 4.09961 15.0996Z" fill="white"/>
+<path opacity="0.5" d="M15.0996 4.09961C14.1996 4.99961 12.7996 4.99961 11.8996 4.09961C10.9996 3.19961 10.9996 1.79961 11.8996 0.899609C12.7996 -0.000390649 14.1996 -0.000390649 15.0996 0.899609C15.9996 1.79961 15.9996 3.19961 15.0996 4.09961Z" fill="white"/>
+<path opacity="0.5" d="M10 1.5H1.5V10" stroke="white" stroke-miterlimit="10"/>
+<path d="M14.4002 5.59961C14.5002 6.29961 14.4002 7.09961 14.2002 7.79961C13.8002 9.29961 13.0002 10.6996 11.9002 11.7996C10.8002 12.8996 9.4002 13.6996 7.9002 14.0996C7.2002 14.2996 6.4002 14.3996 5.7002 14.2996" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/CurveBase_64.svg b/Content/Slate/Starship/AssetIcons/CurveBase_64.svg
new file mode 100644
index 0000000..967cc63
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/CurveBase_64.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="CurveBase_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;stroke:#7F7F7F;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10;enable-background:new    ;}
+	.st1{fill:none;stroke:#FFFFFF;stroke-width:3;stroke-miterlimit:10;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M38.6,12.3H12.4v26.3"/>
+	<path class="st1" d="M49.4,26.1c0,0,1.5,23.2-23.9,23.3"/>
+	<radialGradient id="SVGID_1_" cx="51.0523" cy="12.4183" r="10.0002" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st2" d="M49.4,22.4c3.9,0,7-3.1,7-7s-3.1-7-7-7s-7,3.1-7,7S45.6,22.4,49.4,22.4z"/>
+	<radialGradient id="SVGID_2_" cx="17.0613" cy="46.4093" r="10.0002" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st3" d="M15.4,56.4c3.9,0,7-3.1,7-7s-3.1-7-7-7s-7,3.1-7,7S11.6,56.4,15.4,56.4z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DataAsset_16.svg b/Content/Slate/Starship/AssetIcons/DataAsset_16.svg
new file mode 100644
index 0000000..a46396a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DataAsset_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.6994 13.5992C14.0994 12.3992 14.8994 10.7992 15.1994 9.0992L7.69935 7.8992L11.4994 1.3992C8.79935 -0.200802 5.19935 0.0991981 2.69935 2.2992C-0.400649 4.9992 -0.700649 9.7992 1.99935 12.8992C4.79935 15.9992 9.49935 16.2992 12.6994 13.5992Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M13.9998 3.00078C13.7998 2.70078 13.4998 2.50078 13.2998 2.30078L9.7998 7.10078L15.5998 7.30078C15.5998 5.80078 15.0998 4.20078 13.9998 3.00078Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DataAsset_64.svg b/Content/Slate/Starship/AssetIcons/DataAsset_64.svg
new file mode 100644
index 0000000..72d85c0
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DataAsset_64.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="DataAsset_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st2{opacity:0.3;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
+	.st3{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="49.5518" y1="23.4382" x2="34.2247" y2="30.6026">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<circle class="st0" cx="32.6" cy="31.4" r="20.2"/>
+	<g>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.1242" y1="31.3812" x2="52.3216" y2="31.3812">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="0.591" style="stop-color:#C9C9C9"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st1" d="M45.7,46.6c3.6-3.1,5.7-7.2,6.6-11.5c0.1-0.3-0.1-0.5-0.4-0.6l-18.9-3c-0.3-0.1-0.5-0.4-0.3-0.7l9.6-16.4
+			c0.1-0.2,0.1-0.5-0.2-0.7c-7.2-4-16.6-3.1-23.1,2.7c-8.3,7.2-9.1,20.1-1.9,28.4C24.6,53,37.1,53.8,45.7,46.6z"/>
+	</g>
+	<path class="st2" d="M46.4,19c-0.4-0.7-1.1-1.2-1.6-1.6c-0.2-0.2-0.5-0.1-0.6,0.1l-8.9,12.2c-0.2,0.3,0,0.6,0.3,0.6l14.7,0.5
+		c0.2,0,0.4-0.2,0.4-0.4C50.7,26.4,49.3,22.2,46.4,19z"/>
+	<rect x="0" class="st3" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DataTable_16.svg b/Content/Slate/Starship/AssetIcons/DataTable_16.svg
new file mode 100644
index 0000000..51c3a15
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DataTable_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 2V14H2V2H14ZM15 1H1V15H15V1Z" fill="white"/>
+<path d="M6 9H4V13H6V9Z" fill="white" fill-opacity="0.5"/>
+<path d="M9 3H7V13H9V3Z" fill="white"/>
+<path d="M12 6H10V13H12V6Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DataTable_64.svg b/Content/Slate/Starship/AssetIcons/DataTable_64.svg
new file mode 100644
index 0000000..64f9033
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DataTable_64.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="DataTable_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);stroke:#CCCCCC;stroke-miterlimit:10;}
+	.st2{opacity:0.9;fill:#FFFFFF;fill-opacity:0.5;}
+	.st3{opacity:0.9;fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.112" y1="7.2207" x2="32.3179" y2="56.4317">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st1" d="M57.3,6.9H7.1v50.2h50.2V6.9z"/>
+	<path class="st2" d="M22.8,36.4h-7.8c-0.3,0-0.5,0.2-0.5,0.5v16.6c0,0.3,0.2,0.5,0.5,0.5h7.8c0.3,0,0.5-0.2,0.5-0.5V37
+		C23.4,36.7,23.1,36.4,22.8,36.4z"/>
+	<path class="st3" d="M36.1,9.9h-7.8c-0.3,0-0.5,0.2-0.5,0.5v43.2c0,0.3,0.2,0.5,0.5,0.5h7.8c0.3,0,0.5-0.2,0.5-0.5V10.4
+		C36.6,10.1,36.4,9.9,36.1,9.9z"/>
+	<path class="st2" d="M49.4,23.1h-7.8c-0.3,0-0.5,0.2-0.5,0.5v29.9c0,0.3,0.2,0.5,0.5,0.5h7.8c0.3,0,0.5-0.2,0.5-0.5V23.7
+		C49.9,23.4,49.7,23.1,49.4,23.1z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DecalActor_16.svg b/Content/Slate/Starship/AssetIcons/DecalActor_16.svg
new file mode 100644
index 0000000..1de6457
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DecalActor_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 8.80035L10.4 16.0004L0 11.2004L7.2 6.40039L16 8.80035Z" fill="white"/>
+<path d="M6 0.299805L14.2 4.09979C14.2 4.09979 12.7 8.19982 8 9.99982C3.9 11.4998 0 11.0998 0 11.0998C0 11.0998 2.4 10.0998 4.1 7.7998C6.2 4.9998 6 0.299805 6 0.299805Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DecalActor_64.svg b/Content/Slate/Starship/AssetIcons/DecalActor_64.svg
new file mode 100644
index 0000000..8aa5a0f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DecalActor_64.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+</style>
+<g id="DecalActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.1833" y1="218.8982" x2="43.5808" y2="245.9717" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</linearGradient>
+		<path class="st1" d="M57.6,34.1l-17.9,23L6.4,41.8l23.1-15.4L57.6,34.1z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="29.15" y1="231.6048" x2="29.15" y2="196.8541" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st2" d="M25.6,6.9L51.9,19c0,0-4.8,13.1-19.9,18.9c-13.1,4.8-25.6,3.5-25.6,3.5s7.7-3.2,13.1-10.6
+			C26.2,21.9,25.6,6.9,25.6,6.9z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DefaultPawn_16.svg b/Content/Slate/Starship/AssetIcons/DefaultPawn_16.svg
new file mode 100644
index 0000000..af651e7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DefaultPawn_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9.50039 9.39984V6.2998H6.50039V9.39984C6.50039 11.0998 5.10039 12.4998 3.40039 12.4998H12.7004C10.9004 12.4998 9.50039 11.0998 9.50039 9.39984Z" fill="white"/>
+<path d="M10.3004 7.80017H5.70039C5.30039 7.80017 4.90039 7.50018 4.90039 7.00018C4.90039 6.60018 5.20039 6.2002 5.70039 6.2002H10.3004C10.7004 6.2002 11.1004 6.50018 11.1004 7.00018C11.1004 7.50018 10.8004 7.80017 10.3004 7.80017Z" fill="white"/>
+<path d="M12.6004 14H3.40039V13.5C3.40039 12.9 3.80039 12.5 4.40039 12.5H11.7004C12.3004 12.5 12.7004 12.9 12.7004 13.5V14H12.6004Z" fill="white"/>
+<path d="M8.00059 5.79999C9.04993 5.79999 9.90059 4.94937 9.90059 3.90002C9.90059 2.85068 9.04993 2 8.00059 2C6.95124 2 6.10059 2.85068 6.10059 3.90002C6.10059 4.94937 6.95124 5.79999 8.00059 5.79999Z" fill="white"/>
+<path opacity="0.5" d="M14 1V15H2V1H14ZM15 0H1V16H15V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DefaultPawn_64.svg b/Content/Slate/Starship/AssetIcons/DefaultPawn_64.svg
new file mode 100644
index 0000000..8931393
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DefaultPawn_64.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="DefaultPawn_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);stroke:#808080;stroke-width:2;stroke-miterlimit:10;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:none;stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+	.st5{fill:none;stroke:url(#SVGID_6_);stroke-miterlimit:10;}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.7618" y1="6.7267" x2="32.0636" y2="56.2193">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#1A1A1A"/>
+	</linearGradient>
+	<rect x="10.9" y="6.9" class="st0" width="42.1" height="49.2"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.9127" y1="25.6575" x2="31.9127" y2="46.335">
+		<stop  offset="0.2807" style="stop-color:#242424"/>
+		<stop  offset="0.3899" style="stop-color:#595959"/>
+		<stop  offset="1" style="stop-color:#8A8A8A"/>
+	</linearGradient>
+	<path class="st1" d="M37.1,36V25.7H26.7V36c0,5.7-2.6,10.3-8.2,10.3h26.8C39.6,46.3,37.1,41.7,37.1,36z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.9127" y1="25.0853" x2="31.9127" y2="30.3719">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.8342" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4A4A4A"/>
+	</linearGradient>
+	<path class="st2" d="M39.7,30.8H24.2c-1.6,0-2.6-1-2.6-2.6s1-2.6,2.6-2.6h15.5c1.6,0,2.6,1,2.6,2.6S41.2,30.8,39.7,30.8z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.9127" y1="46.335" x2="31.9127" y2="51.5043">
+		<stop  offset="0" style="stop-color:#BFBFBF"/>
+		<stop  offset="0.7005" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st3" d="M47.4,51.5h-31v-2.6c0-1.6,1-2.6,2.6-2.6h25.8c1.6,0,2.6,1,2.6,2.6V51.5z"/>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-96.382" y1="46.7837" x2="-73.7274" y2="46.7837" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st4" x1="17.4" y1="46.8" x2="46.3" y2="46.8"/>
+	
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-91.3577" y1="25.9934" x2="-78.3" y2="25.9934" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st5" x1="23.8" y1="26" x2="40.5" y2="26"/>
+	<radialGradient id="SVGID_7_" cx="33.535" cy="14.6538" r="9.524" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.2421" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.6136" style="stop-color:#838383"/>
+		<stop  offset="0.7861" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</radialGradient>
+	<path class="st6" d="M32,24.2c3.7,0,6.7-3,6.7-6.7s-3-6.7-6.7-6.7c-3.7,0-6.7,3-6.7,6.7S28.3,24.2,32,24.2z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DestructibleActor_16.svg b/Content/Slate/Starship/AssetIcons/DestructibleActor_16.svg
new file mode 100644
index 0000000..f029c6e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DestructibleActor_16.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.2998 7.7002L7.9998 11.2002L10.1998 11.3003L11.2998 10.4001L9.0998 7.2002L6.2998 7.7002Z" fill="white"/>
+<path d="M4.2 3.3999L5 1H1V4.5L4.2 3.3999Z" fill="white"/>
+<path d="M10.1001 6.59985L12.4001 9.99976L15.0001 9.2998V7.2998L11.5001 5.2998L10.1001 6.59985Z" fill="white"/>
+<path d="M14.9999 5.69995L11.8999 3.8999L12.1999 3.19995L11.9999 1H14.9999V5.69995Z" fill="white"/>
+<path d="M4.3 4.7998L1 5.89966V9.2998L4.9 6.49976L4.3 4.7998Z" fill="white"/>
+<path d="M5.6001 4L5.9001 6.5L9.4001 6L11.0001 4.1001L10.9001 3.19995L10.7001 1H8.6001H6.5001L5.6001 4Z" fill="white"/>
+<path d="M5.8998 12.7L6.7998 11.6001L5.2998 8L1.7998 10.3999L1.9998 11L5.8998 12.7Z" fill="white"/>
+<path d="M5.4 13.9995L1.6 12.0996L1 12.1995V14.9995H5.5L5.4 13.9995Z" fill="white"/>
+<path d="M15.0001 14.9998H11.2001L11.1001 12.0999L12.3001 11.1997L15.0001 10.2998V14.9998Z" fill="white"/>
+<path d="M10.0002 12.2002H7.9002L6.8002 13.7002L6.7002 15.0002H10.2002L10.0002 12.2002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DestructibleActor_64.svg b/Content/Slate/Starship/AssetIcons/DestructibleActor_64.svg
new file mode 100644
index 0000000..a2ae18f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DestructibleActor_64.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="DestructibleActor_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#848484;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill:url(#SVGID_8_);}
+	.st10{fill:url(#SVGID_9_);}
+	.st11{fill:url(#SVGID_10_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.7724" y1="29.0738" x2="41.2646" y2="43.566">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st1" points="31.7,43.7 25.3,30.6 36.1,28.6 44.3,40.5 39.9,44.1 		"/>
+		<path class="st2" d="M35.9,29.2l7.7,11.3l-3.9,3.2L32,43.3l-6-12.3L35.9,29.2 M36.3,28.1l-0.6,0.1L25.8,30l-1.3,0.2l0.6,1.2
+			l6,12.3l0.3,0.5l0.6,0l7.7,0.4l0.4,0l0.3-0.2l3.9-3.2l0.7-0.6l-0.5-0.8l-7.7-11.3L36.3,28.1L36.3,28.1z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="7.3001" y1="6.4236" x2="18.0496" y2="17.1731">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st3" points="6.9,6.9 22.1,6.9 19,16.2 6.9,20.4 		"/>
+		<path class="st2" d="M21.4,7.4l-2.8,8.4L7.4,19.7V7.4H21.4 M22.8,6.4h-1.4H7.4h-1v1v12.3v1.4l1.3-0.5L19,16.8l0.5-0.2l0.2-0.5
+			l2.8-8.4L22.8,6.4L22.8,6.4z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="41.7549" y1="23.9804" x2="55.9353" y2="38.1609">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st4" points="38.7,27 44.2,21.9 57.1,29.2 57.1,37 47.3,39.6 		"/>
+		<path class="st2" d="M44.3,22.5l12.3,7v7L47.5,39l-8.1-12L44.3,22.5 M44.2,21.3l-0.5,0.5l-4.9,4.6l-0.6,0.6l0.5,0.7l8.1,12
+			l0.4,0.6l0.7-0.2l9.2-2.5l0.7-0.2v-0.8v-7V29l-0.5-0.3l-12.3-7L44.2,21.3L44.2,21.3z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="45.594" y1="6.799" x2="60.3528" y2="21.5578">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st5" points="45.1,17.8 46.3,15 45.5,6.9 57.1,6.9 57.1,24.8 		"/>
+		<path class="st2" d="M56.6,7.4v16.5l-10.9-6.3l1.1-2.5l-0.7-7.7H56.6 M57.6,6.4h-1H46.1H45l0.1,1.1l0.7,7.5l-1,2.2L44.5,18
+			l0.8,0.4l10.9,6.3l1.5,0.9v-1.7V7.4V6.4L57.6,6.4z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="7.6773" y1="23.4326" x2="16.4187" y2="32.174">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st6" points="6.9,24.2 19.3,20.1 21.7,26.9 6.9,37.6 		"/>
+		<path class="st2" d="M19,20.7l2.1,6L7.4,36.6v-12L19,20.7 M19.6,19.5l-0.9,0.3L7,23.7l-0.7,0.2v0.7v12v1.9l1.6-1.1l13.7-9.9
+			l0.6-0.4L22,26.4l-2.1-6L19.6,19.5L19.6,19.5z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="24.6009" y1="8.6091" x2="39.3037" y2="23.312">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st7" points="23,17.9 26.3,6.9 42,6.9 42.7,15.1 43.1,18.4 37.2,25.4 24.2,27.3 		"/>
+		<path class="st2" d="M41.5,7.4l0.7,7.7l0.4,3.2L36.9,25l-12.3,1.8l-1.1-8.8l3.2-10.6h7.4H41.5 M42.4,6.4h-0.9h-7.4h-7.4H26
+			l-0.2,0.7l-3.2,10.6l-0.1,0.2l0,0.2l1.1,8.8l0.1,1l1-0.1L37.1,26l0.4-0.1l0.2-0.3l5.6-6.7l0.3-0.3l0-0.4L43.2,15l-0.7-7.7
+			L42.4,6.4L42.4,6.4z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="14.6739" y1="35.1582" x2="26.7115" y2="47.1958">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st8" points="10.5,42.9 9.6,40.2 22.7,31.2 28.4,44.8 24.8,49.2 		"/>
+		<path class="st2" d="M22.5,32l5.3,12.7l-3.2,3.9l-13.7-6l-0.7-2.1L22.5,32 M22.9,30.5l-1,0.7L9.6,39.6L9,40l0.2,0.7l0.7,2.1
+			l0.1,0.4l0.4,0.2l13.7,6l0.7,0.3l0.5-0.6l3.2-3.9l0.4-0.5l-0.2-0.6l-5.3-12.7L22.9,30.5L22.9,30.5z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="6.6724" y1="46.5483" x2="20.5078" y2="60.3838">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st9" points="6.9,57.1 6.9,46.4 9.6,45.9 23.3,52.8 23.8,57.1 		"/>
+		<path class="st2" d="M9.5,46.4l13.4,6.7l0.4,3.5H7.4v-9.9L9.5,46.4 M9.6,45.4l-0.3,0.1l-2.1,0.4l-0.8,0.1v0.8v9.9v1h1h15.8h1.1
+			l-0.1-1.1L23.8,53l-0.1-0.5l-0.5-0.2L9.9,45.5L9.6,45.4L9.6,45.4z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="45.1394" y1="43.4509" x2="57.9822" y2="56.2937">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st10" points="42.8,57.1 42.4,46.2 46.9,42.8 57.1,39.4 57.1,57.1 		"/>
+		<path class="st2" d="M56.6,40.1v16.5H43.3l-0.4-10.2l4.2-3.2L56.6,40.1 M57.6,38.7l-1.3,0.4l-9.5,3.2l-0.2,0.1l-0.1,0.1l-4.2,3.2
+			l-0.4,0.3l0,0.5l0.4,10.2l0,1h1h13.4h1v-1V40.1V38.7L57.6,38.7z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="29.5807" y1="48.0965" x2="39.4513" y2="57.9671">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st11" points="26.9,57.1 27.3,51.9 31.4,46.3 39.5,46.3 40.3,57.1 		"/>
+		<path class="st2" d="M39,46.8l0.7,9.9H27.4l0.4-4.6l3.9-5.3H39 M40,45.8H39h-7.4h-0.5l-0.3,0.4L27,51.5l-0.2,0.2l0,0.3l-0.4,4.6
+			l-0.1,1.1h1.1h12.3h1.1l-0.1-1.1L40,46.7L40,45.8L40,45.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DialogueVoice_16.svg b/Content/Slate/Starship/AssetIcons/DialogueVoice_16.svg
new file mode 100644
index 0000000..3f81d53
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DialogueVoice_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 1C11.86 1 15 3.58 15 6.75C15 9.92 11.86 12.5 8 12.5C7.93 12.5 7.87 12.5 7.8 12.49L7.65 12.48L7.39 12.47L7.16 12.58L5.52 13.4L6.2 12.4L5.03 11.94C2.58 11 1 8.96 1 6.75C1 3.58 4.14 1 8 1ZM8 0C3.58 0 0 3.02 0 6.75C0 9.47 1.91 11.81 4.66 12.88L2.54 16L7.61 13.48C7.74 13.49 7.87 13.5 8 13.5C12.42 13.5 16 10.48 16 6.75C16 3.02 12.42 0 8 0Z" fill="white"/>
+<path d="M9.62 3.02039V5.78039C9.62 6.67039 8.89 7.40039 8 7.40039C7.11 7.40039 6.38 6.67039 6.38 5.78039V3.02039C6.38 2.13039 7.11 1.40039 8 1.40039C8.89 1.40039 9.62 2.13039 9.62 3.02039ZM10.4 5.00039V5.88039C10.4 7.20039 9.32 8.28039 8 8.28039C6.68 8.28039 5.6 7.20039 5.6 5.88039V5.00039H5V5.88039C5 7.34039 6.06 8.56039 7.45 8.82039C7.51 9.17039 7.57 9.85039 7.12 10.4004H6.2V11.0004C8 11.0004 8 11.0004 9.8 11.0004V10.4004H8.88C8.43 9.85039 8.48 9.17039 8.55 8.82039C9.94 8.56039 11 7.34039 11 5.88039V5.00039H10.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DialogueVoice_64.svg b/Content/Slate/Starship/AssetIcons/DialogueVoice_64.svg
new file mode 100644
index 0000000..6d6f531
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DialogueVoice_64.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="DialogueVoice_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_4_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.3365" y1="8.661" x2="32.3365" y2="54.6659">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<path class="st1" d="M32.3,8.7c-12.7,0-23,8.7-23,19.4c0,7.8,5.5,14.5,13.4,17.6l-6.1,9l14.6-7.2c0.4,0,0.7,0.1,1.1,0.1
+		c12.7,0,23-8.7,23-19.4S45,8.7,32.3,8.7z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32" y1="24.585" x2="32" y2="43.6657">
+		<stop  offset="0.797" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st2" d="M39.6,24.6v2.6c0,3.9-2.8,7.4-6.7,7.8c-4.6,0.5-8.5-3.1-8.5-7.6v-2.8c0,0,0,0,0,0h-1.8c0,0,0,0,0,0v2.8
+		c0,4.6,3.4,8.6,7.8,9.3c0,0,0,0,0,0c0.2,1.5,0.5,5.2-3.8,6.8c0,0,0,0.1,0,0.1h11.1c0,0,0-0.1,0-0.1c-4.4-1.6-4-5.3-3.8-6.8
+		c0,0,0,0,0,0c4.4-0.8,7.8-4.8,7.8-9.3v-2.8c0,0,0,0,0,0L39.6,24.6C39.6,24.6,39.6,24.6,39.6,24.6z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32" y1="13.72" x2="32" y2="32.2981">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.533" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st3" d="M37.2,17.7v9.9c0,2.5-2.1,4.6-4.6,4.6h-1.1c-2.5,0-4.6-2.1-4.6-4.6v-9.9c0-2.5,2.1-4.6,4.6-4.6h1.1
+		C35.1,13.1,37.2,15.2,37.2,17.7z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="32" y1="41.8674" x2="32" y2="43.4767">
+		<stop  offset="0" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st4" d="M36,41.8H28c-1,0-1.8,0.8-1.8,1.8v0.2h11.4v-0.2C37.7,42.5,36.9,41.8,36,41.8z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DialogueWave_16.svg b/Content/Slate/Starship/AssetIcons/DialogueWave_16.svg
new file mode 100644
index 0000000..c809e68
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DialogueWave_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 1C11.9 1 15 3.6 15 6.8C15 10 11.9 12.6 8 12.6C7.9 12.6 7.9 12.6 7.8 12.6H7.6H7.3L7.1 12.7L5.5 13.5L6.2 12.5L5 11.9C2.6 11 1 9 1 6.8C1 3.6 4.1 1 8 1ZM8 0C3.6 0 0 3 0 6.8C0 9.5 1.9 11.9 4.7 12.9L2.5 16L7.6 13.5C7.7 13.5 7.9 13.5 8 13.5C12.4 13.5 16 10.5 16 6.7C16 2.9 12.4 0 8 0Z" fill="white"/>
+<path d="M2.40039 7.39961H4.40039L4.60039 7.59961L5.00039 6.39961L5.40039 9.59961L6.10039 3.19961L6.90039 11.8996L7.60039 2.09961L8.40039 12.5996L9.10039 3.59961L9.90039 10.3996L10.6004 4.39961L11.4004 9.59961L11.8004 6.59961L12.1004 7.39961H12.9004" stroke="white" stroke-width="0.375" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DialogueWave_64.svg b/Content/Slate/Starship/AssetIcons/DialogueWave_64.svg
new file mode 100644
index 0000000..047c1e6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DialogueWave_64.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="DialogueWave_x5F_64_-_UPLOAD"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.3365" y1="8.661" x2="32.3365" y2="54.6659">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<path class="st1" d="M32.3,8.7c-12.7,0-23,8.7-23,19.4c0,7.8,5.5,14.5,13.4,17.6l-6.1,9l14.6-7.2c0.4,0,0.7,0.1,1.1,0.1
+		c12.7,0,23-8.7,23-19.4S45,8.7,32.3,8.7z"/>
+	<g>
+		<path class="st2" d="M15.8,28l5.9-0.1l0,0l0,0l0.7,0.5l-0.2,0.1l1-2.7l0.3-0.8l0.1,0.8L25,33l-0.8,0c0.3-2.4,0.6-4.8,1-7.1
+			l1.1-7.1l0.6-3.7l0.4,3.7L29.4,38l-1,0l2.2-21.7l1,0l2.2,23.4l-1,0L35,19.6l0.4-3.9l0.6,3.9l2.2,15l-1,0l2.2-13.4l0.5-2.8l0.5,2.8
+			c0.4,1.9,0.7,3.9,1,5.9l1,5.9l-0.5,0l1.3-6.7l0-0.3l0.1,0.2l1.1,1.7l0,0l2.2,0.1l-2.2,0.1l0,0l0,0l-1.1-1.6l0.2,0l-0.9,6.7
+			l-0.2,1.5l-0.3-1.5l-1.2-5.8c-0.4-1.9-0.8-3.9-1.2-5.8l1,0l-2.2,13.4L37.6,38l-0.5-3.2l-2.2-15l1,0l-2.2,20.1l-0.5,4.9l-0.5-4.9
+			l-2.2-23.4l1,0l-2.2,21.7L29,42.7l-0.5-4.6l-2.2-19.2l1,0L26.1,26c-0.3,2.4-0.8,4.7-1.2,7.1l-0.5,2.6l-0.3-2.6l-0.9-7.2l0.4,0.1
+			l-1.2,2.6l-0.1,0.2l-0.2-0.1l-0.6-0.5l0.1,0L15.8,28z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DirectionalLight_16.svg b/Content/Slate/Starship/AssetIcons/DirectionalLight_16.svg
new file mode 100644
index 0000000..6ea22c0
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DirectionalLight_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.5 8.5C7.60457 8.5 8.5 7.60457 8.5 6.5C8.5 5.39543 7.60457 4.5 6.5 4.5C5.39543 4.5 4.5 5.39543 4.5 6.5C4.5 7.60457 5.39543 8.5 6.5 8.5Z" fill="white"/>
+<path d="M7 0H6V2.5H7V0Z" fill="white"/>
+<path d="M7 10.5H6V13H7V10.5Z" fill="white"/>
+<path d="M2.5498 7.0498V6.0498L0.0498047 6.0498V7.0498H2.5498Z" fill="white"/>
+<path d="M13.0498 6.9502V5.9502L10.5498 5.9502V6.9502H13.0498Z" fill="white"/>
+<path d="M1.78092 1.09017L1.14453 1.72656L3.26583 3.84786L3.90222 3.21147L1.78092 1.09017Z" fill="white"/>
+<path d="M3.23458 9.13456L1.11328 11.2559L1.74969 11.8923L3.87099 9.77097L3.23458 9.13456Z" fill="white"/>
+<path d="M11.2356 1.09354L9.11426 3.21484L9.75067 3.85125L11.872 1.72995L11.2356 1.09354Z" fill="white"/>
+<path d="M13 13.9L9 9.90002L9.9 9L13.9 13L15.7 11.2L16 16L11.2 15.7L13 13.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DirectionalLight_64.svg b/Content/Slate/Starship/AssetIcons/DirectionalLight_64.svg
new file mode 100644
index 0000000..24b4e97
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DirectionalLight_64.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_2_);}
+</style>
+<g id="DirectionalLight_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<radialGradient id="SVGID_1_" cx="28.6" cy="218.2" r="21.457" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2;stop-opacity:0.7"/>
+			<stop  offset="1" style="stop-color:#B3B3B3;stop-opacity:0"/>
+		</radialGradient>
+		<circle class="st1" cx="28.6" cy="28.2" r="21.5"/>
+		<g>
+			<path class="st2" d="M28.6,34.1c3.3,0,5.9-2.7,5.9-5.9s-2.7-5.9-5.9-5.9s-5.9,2.7-5.9,5.9S25.4,34.1,28.6,34.1z"/>
+			<path class="st2" d="M30.1,8.8h-3v7.4h3V8.8z"/>
+			<path class="st2" d="M30.1,40h-3v7.4h3V40z"/>
+			<path class="st2" d="M16.9,29.8v-3H9.5v3H16.9z"/>
+			<path class="st2" d="M48.1,29.5v-3h-7.4v3H48.1z"/>
+			<path class="st2" d="M14.6,12.1L12.7,14l6.3,6.3l1.9-1.9L14.6,12.1z"/>
+			<path class="st2" d="M18.9,36l-6.3,6.3l1.9,1.9l6.3-6.3L18.9,36z"/>
+			<path class="st2" d="M42.7,12.1l-6.3,6.3l1.9,1.9l6.3-6.3L42.7,12.1z"/>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="37.3952" y1="227.5217" x2="57.2713" y2="246.3517" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#F2F2F2"/>
+				<stop  offset="0.5939" style="stop-color:#F2F2F2"/>
+				<stop  offset="0.8479" style="stop-color:#C8C8C8"/>
+				<stop  offset="1" style="stop-color:#B3B3B3"/>
+			</linearGradient>
+			<path class="st3" d="M47.9,50.1L36.1,38.2l2.7-2.7l11.9,11.9l5.3-5.3l0.9,14.3l-14.3-0.9L47.9,50.1z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DocumentationActor_16.svg b/Content/Slate/Starship/AssetIcons/DocumentationActor_16.svg
new file mode 100644
index 0000000..fb2f7f4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DocumentationActor_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 2L5 12V16L0 6V2Z" fill="white"/>
+<path opacity="0.5" d="M16 15H5V16H16V15Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 1H1L6 11H16L10 1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/DocumentationActor_64.svg b/Content/Slate/Starship/AssetIcons/DocumentationActor_64.svg
new file mode 100644
index 0000000..4984034
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/DocumentationActor_64.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="DocumentationActor_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st1{fill:#B2B2B2;enable-background:new    ;}
+	.st2{opacity:0.31;fill:#7F7F7F;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);enable-background:new    ;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:#7F7F7F;}
+	.st7{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="10.2798" y1="17.9938" x2="55.0667" y2="43.8862">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st0" d="M38.5,17.6H7.6l15.8,24.9h32.5c1,0,1.6-0.9,1.1-1.5L39.6,18.1C39.3,17.8,38.9,17.6,38.5,17.6z"/>
+	<path class="st1" d="M54.5,47.5l-31.8,1.3l0.7,1.6h32.8c0.6,0,1-0.4,1-0.8l0,0C57.2,49.1,55.1,47.5,54.5,47.5z"/>
+	<polygon class="st2" points="26.3,41 24.9,40.9 10.8,19.1 12.1,19.2 	"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="27.2973" y1="34.4709" x2="52.6841" y2="49.1477">
+		<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		<stop  offset="0.4949" style="stop-color:#FCFCFC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<path class="st3" d="M56.3,42.4l-32.6,0c-0.3,0-0.5-0.2-0.5-0.5l0,0c0-0.3,0.2-0.5,0.5-0.5h32.6c0.3,0,0.5,0.2,0.5,0.5l0,0
+		C56.8,42.1,56.6,42.4,56.3,42.4z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="39.1406" y1="42.4293" x2="39.1005" y2="49.2152">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="0.5635" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st4" d="M55.6,42.6H23.2c-0.4,0-0.7,0.3-0.7,0.6v5.6c0,0.3,0.3,0.6,0.8,0.6l32.4-0.1c0.1,0,0.1,0,0.1-0.1v-6.4
+		C55.7,42.7,55.7,42.6,55.6,42.6z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="27.5484" y1="42.9164" x2="52.2656" y2="57.2061">
+		<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		<stop  offset="0.4949" style="stop-color:#FCFCFC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<path class="st5" d="M56.1,50.4H23.7c-0.1,0-0.1-0.1-0.1-0.1v-0.3c0-0.1,0.1-0.1,0.1-0.1h32.5c0.1,0,0.1,0.1,0.1,0.1v0.3
+		C56.3,50.3,56.2,50.4,56.1,50.4z"/>
+	<g>
+		<path class="st6" d="M7.6,17.6c-0.9,2.3-1.1,4.6,0,7.4l15.8,25.4c-1.2-3-1.1-5.7,0-7.9L7.6,17.6z"/>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/EditorTutorial_16.svg b/Content/Slate/Starship/AssetIcons/EditorTutorial_16.svg
new file mode 100644
index 0000000..5be39b7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/EditorTutorial_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 4.75L8.5 9.51L1 4.75L8.5 0L16 4.75Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.49991 11.41L4.28991 8.73999C4.20457 9.0665 4.16089 9.40251 4.15991 9.73999C4.15991 10.891 4.61716 11.9949 5.43107 12.8088C6.24498 13.6227 7.34887 14.08 8.49991 14.08C9.65095 14.08 10.7548 13.6227 11.5688 12.8088C12.3827 11.9949 12.8399 10.891 12.8399 9.73999C12.8389 9.40251 12.7953 9.0665 12.7099 8.73999L8.49991 11.41Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 16H0L1 7H2L3 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/EditorTutorial_64.svg b/Content/Slate/Starship/AssetIcons/EditorTutorial_64.svg
new file mode 100644
index 0000000..176f7f9
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/EditorTutorial_64.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="EditorTutorial_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{opacity:0.3;fill-rule:evenodd;clip-rule:evenodd;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.3295" y1="56.1389" x2="11.9973" y2="28.129">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="0.3475" style="stop-color:#B9B9B9"/>
+		<stop  offset="0.7687" style="stop-color:#DADADA"/>
+		<stop  offset="1" style="stop-color:#E6E6E6"/>
+	</linearGradient>
+	<path class="st1" d="M13.4,56.6c-2,0.1-3.5-0.5-4-2.5l2.3-27l2.3,1.5L13.4,56.6z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.271" y1="22.0622" x2="31.3941" y2="51.4891">
+		<stop  offset="0.3756" style="stop-color:#4D4D4D"/>
+		<stop  offset="0.4328" style="stop-color:#535353"/>
+		<stop  offset="0.7991" style="stop-color:#747474"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st2" d="M21.7,22.9c0,0-7.3,12.8-6.6,16.9c0,0,9,9,16,11.6c0.6,0.2,1.3,0.2,1.8,0c2.5-1.1,9.7-4.7,14.8-12.6
+		c0,0-0.5-8-9-16.7"/>
+	<path class="st3" d="M21.7,22.9c0,0-3.9,7-5.5,11.5c0,0,9.3,8,15.8,9.9c0,0,8.5-2.6,14.7-9.7c0,0-1.6-6.4-9.4-14.4"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="21.4542" y1="31.0901" x2="43.9145" y2="15.3501">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st4" d="M56.9,24.1L32.3,39.6c-0.2,0.1-0.4,0.1-0.6,0L7.1,24.1c-0.3-0.2-0.3-0.7,0-0.9L31.7,7.5c0.2-0.1,0.4-0.1,0.6,0
+		l24.6,15.7C57.2,23.5,57.2,23.9,56.9,24.1z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.6565" y1="24.8827" x2="32" y2="24.8827">
+		<stop  offset="0" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<polyline class="st5" points="13.8,28.5 32,22 32,21.2 11.7,27 	"/>
+	<ellipse class="st3" cx="31.4" cy="22" rx="2.1" ry="1.2"/>
+	
+		<radialGradient id="SVGID_5_" cx="31.3415" cy="21.7237" r="4.1525" gradientTransform="matrix(1 0 0 0.4043 0 12.94)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</radialGradient>
+	<ellipse class="st6" cx="31.3" cy="21.7" rx="2.1" ry="1.2"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Emitter_16-1.svg b/Content/Slate/Starship/AssetIcons/Emitter_16-1.svg
new file mode 100644
index 0000000..7d9484f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Emitter_16-1.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 15.9996C1.1 15.7996 3.7 10.3996 6.9 7.19958C9.3 4.79958 12.5 3.19961 12.6 3.09961L13.4 4.29968C13.4 4.29968 9.7 5.99958 7.2 8.19958C3.9 11.0996 1 15.9996 1 15.9996Z" fill="white"/>
+<path opacity="0.5" d="M3 16C3 16 4.5 14.5 7.1 13.3C9.2 12.4 11.1 12 11.1 12L11.3 13.1C11 13.2 9.2 13.5 7.4 14C5 14.9 3 16 3 16Z" fill="white"/>
+<path opacity="0.5" d="M1.10011 14.8003C1.10011 14.7003 1.00011 12.7003 1.10011 10.9003C1.20011 9.30027 1.70011 7.4002 2.30011 5.7002H2.60011L3.30011 6.00024L3.70011 6.30029C2.90011 7.80029 2.10011 9.0002 1.60011 10.7002C1.10011 12.5002 1.10011 14.8003 1.10011 14.8003Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.0996094 5.80023L2.59961 6.00018L3.89961 8.20013L4.79961 5.90021L7.29961 5.30023L5.39961 3.70013L5.69961 1.2002L3.49961 2.50018L1.19961 1.50018L1.79961 3.90021L0.0996094 5.80023Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.19961 15.2997L11.4996 14.2997L13.6996 15.5996L13.3996 13.0996L15.2996 11.3997L12.7996 10.8997L11.7996 8.59961L10.5996 10.7997L8.09961 10.9996L9.79961 12.8997L9.19961 15.2997Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1004 6.90002L13.5004 5.09998L15.7004 5.19995L14.5004 3.30005L15.2004 1.20001L13.1004 1.90002L11.3004 0.5V2.70001L9.40039 4L11.5004 4.69995L12.1004 6.90002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Emitter_16.svg b/Content/Slate/Starship/AssetIcons/Emitter_16.svg
new file mode 100644
index 0000000..1488782
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Emitter_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 15.9996C1.1 15.7996 3.7 10.3996 6.9 7.19961C9.3 4.79961 12.5 3.19961 12.6 3.09961L13.4 4.29961C13.4 4.29961 9.7 5.99961 7.2 8.19961C3.9 11.0996 1 15.9996 1 15.9996Z" fill="white"/>
+<path opacity="0.5" d="M3 16C3 16 4.5 14.5 7.1 13.3C9.2 12.4 11.1 12 11.1 12L11.3 13.1C11 13.2 9.2 13.5 7.4 14C5 14.9 3 16 3 16Z" fill="white"/>
+<path opacity="0.5" d="M1.10011 14.7992C1.10011 14.6992 1.00011 12.6992 1.10011 10.8992C1.20011 9.29922 1.70011 7.39922 2.30011 5.69922H2.60011L3.30011 5.99922L3.70011 6.29922C2.80011 7.99922 2.10011 9.19922 1.60011 10.8992C1.10011 12.4992 1.10011 14.7992 1.10011 14.7992Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.100098 5.79922L2.6001 5.99922L3.9001 8.19922L4.8001 5.89922L7.3001 5.29922L5.4001 3.69922L5.7001 1.19922L3.5001 2.49922L1.2001 1.49922L1.8001 3.89922L0.100098 5.79922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.2001 15.2996L11.5001 14.2996L13.7001 15.5996L13.4001 13.0996L15.3001 11.3996L12.8001 10.8996L11.8001 8.59961L10.6001 10.7996L8.1001 10.9996L9.8001 12.8996L9.2001 15.2996Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0999 6.9L13.4999 5.1L15.6999 5.2L14.4999 3.3L15.1999 1.2L13.0999 1.9L11.2999 0.5V2.7L9.3999 4L11.4999 4.7L12.0999 6.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Emitter_64.svg b/Content/Slate/Starship/AssetIcons/Emitter_64.svg
new file mode 100644
index 0000000..fe53e31
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Emitter_64.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Emitter_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+</style>
+<g id="Layer_68">
+</g>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="6.1614" y1="53.1765" x2="14.5303" y2="25.1932">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st1" d="M18.8,25.6c0,0-13.4,9.8-10.2,28.8c0,0-6.2-14.1,3.8-32.7L18.8,25.6z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.8138" y1="54.1116" x2="43.8123" y2="20.1131">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st2" d="M47.5,23.5c0,0-21.8,9.9-37.4,34.2c0,0,1.2-18.1,33.8-42.3L47.5,23.5z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.3618" y1="56.8967" x2="47.4475" y2="44.1691">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st3" d="M40.9,50.9c0,0-14.8-1.4-28.2,7.7c0,0,9.4-12.7,27.6-14.6L40.9,50.9z"/>
+	<g>
+		<g>
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.5385" y1="26.4923" x2="20.7884" y2="14.7198">
+				<stop  offset="0" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#FFFFFF"/>
+			</linearGradient>
+			<path class="st4" d="M6.7,23.9l7.5,0.6c0.1,0,0.2,0.1,0.3,0.2l3.9,6.6c0.1,0.2,0.5,0.2,0.6,0l2.7-6.8c0-0.1,0.1-0.2,0.2-0.2
+				l7.5-1.8c0.3-0.1,0.4-0.4,0.1-0.6L23.8,17c-0.1-0.1-0.1-0.2-0.1-0.3l0.9-7.4c0-0.3-0.3-0.5-0.5-0.3l-6.6,3.9
+				c-0.1,0.1-0.2,0.1-0.3,0l-6.9-3c-0.3-0.1-0.5,0.1-0.5,0.4l1.8,7.1c0,0.1,0,0.2-0.1,0.3l-5.1,5.7C6.3,23.5,6.4,23.9,6.7,23.9z"/>
+		</g>
+		<g>
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="33.0406" y1="44.8816" x2="56.2334" y2="44.8816">
+				<stop  offset="0" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#FFFFFF"/>
+			</linearGradient>
+			<path class="st5" d="M37,55.2l6.9-3c0.1,0,0.2,0,0.3,0l6.6,3.9c0.2,0.1,0.6-0.1,0.5-0.3l-0.9-7.5c0-0.1,0-0.2,0.1-0.3l5.7-5.1
+				c0.2-0.2,0.1-0.5-0.2-0.6l-7.5-1.5c-0.1,0-0.2-0.1-0.2-0.2l-3-6.8c-0.1-0.3-0.5-0.3-0.6,0l-3.6,6.5c-0.1,0.1-0.2,0.2-0.3,0.2
+				l-7.4,0.6c-0.3,0-0.4,0.4-0.2,0.6l5.1,5.7c0.1,0.1,0.1,0.2,0.1,0.3l-1.8,7.1C36.4,55.1,36.7,55.3,37,55.2z"/>
+		</g>
+		<g>
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="37.4153" y1="16.8291" x2="57.6646" y2="16.8291">
+				<stop  offset="0" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#FFFFFF"/>
+			</linearGradient>
+			<path class="st6" d="M46.4,27l4.1-5.3c0.1-0.1,0.2-0.1,0.3-0.1l6.5,0.3c0.3,0,0.5-0.3,0.3-0.5l-3.6-5.6c-0.1-0.1-0.1-0.2,0-0.3
+				l2.1-6.2c0.1-0.3-0.2-0.5-0.4-0.4l-6.2,2.1c-0.1,0-0.2,0-0.3-0.1l-5.3-4.1c-0.2-0.2-0.6,0-0.6,0.3v6.4c0,0.1-0.1,0.2-0.1,0.3
+				l-5.6,3.8c-0.2,0.2-0.2,0.5,0.1,0.6l6.2,2.1c0.1,0,0.2,0.1,0.2,0.2l1.8,6.5C45.9,27.1,46.2,27.2,46.4,27z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/EmptyActor_16.svg b/Content/Slate/Starship/AssetIcons/EmptyActor_16.svg
new file mode 100644
index 0000000..34dfb20
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/EmptyActor_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 1C9.32608 1 10.5978 1.52678 11.5355 2.46446C12.4732 3.40214 13 4.67392 13 6C13 7.32608 12.4732 8.59786 11.5355 9.53554C10.5978 10.4732 9.32608 11 8 11C6.67392 11 5.40216 10.4732 4.46448 9.53554C3.5268 8.59786 3 7.32608 3 6C3 4.67392 3.5268 3.40214 4.46448 2.46446C5.40216 1.52678 6.67392 1 8 1V1ZM8 0C6.4087 0 4.88257 0.632136 3.75735 1.75735C2.63214 2.88257 2 4.4087 2 6C2 7.5913 2.63214 9.11743 3.75735 10.2426C4.88257 11.3679 6.4087 12 8 12C9.5913 12 11.1174 11.3679 12.2426 10.2426C13.3679 9.11743 14 7.5913 14 6C14 4.4087 13.3679 2.88257 12.2426 1.75735C11.1174 0.632136 9.5913 0 8 0V0Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M14 14L13 10L16 14V16H0V14L3 10L2 14H4H12H14Z" fill="white"/>
+<path d="M10.0401 5.16001C10.7028 5.16001 11.2401 4.62275 11.2401 3.96001C11.2401 3.29727 10.7028 2.76001 10.0401 2.76001C9.37735 2.76001 8.84009 3.29727 8.84009 3.96001C8.84009 4.62275 9.37735 5.16001 10.0401 5.16001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/EmptyActor_64.svg b/Content/Slate/Starship/AssetIcons/EmptyActor_64.svg
new file mode 100644
index 0000000..7007576
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/EmptyActor_64.svg
@@ -0,0 +1,16 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M55.7 51.1799L50.7 36.1799L59 52.4299V58.9999H6V52.4099L14.3 35.9199L9.29999 51.1799H55.7Z" fill="url(#paint0_linear_6488_8059)"/>
+<path d="M58.88 52.4099H6V58.9999H58.88V52.4099Z" fill="#BFBFBF"/>
+<path d="M32.5 47.4C35.3763 47.4013 38.2247 46.8358 40.8823 45.7357C43.5399 44.6355 45.9547 43.0225 47.9886 40.9886C50.0225 38.9547 51.6355 36.5399 52.7357 33.8823C53.8358 31.2247 54.4013 28.3763 54.4 25.5C54.3737 19.6999 52.058 14.1448 47.9566 10.0434C43.8552 5.94204 38.3001 3.62628 32.5 3.59998C26.6999 3.62628 21.1448 5.94204 17.0434 10.0434C12.942 14.1448 10.6263 19.6999 10.6 25.5C10.5987 28.3763 11.1642 31.2247 12.2643 33.8823C13.3645 36.5399 14.9776 38.9547 17.0114 40.9886C19.0453 43.0225 21.4601 44.6355 24.1177 45.7357C26.7753 46.8358 29.6237 47.4013 32.5 47.4Z" fill="url(#paint1_radial_6488_8059)"/>
+<path opacity="0.39" d="M32.5 7C37.3892 7.02643 42.0691 8.98717 45.5169 12.4537C48.9647 15.9203 50.9001 20.6108 50.9 25.5C50.8947 30.4049 48.9439 35.1073 45.4756 38.5756C42.0074 42.0439 37.3049 43.9947 32.4 44C29.9768 43.9948 27.5783 43.512 25.3417 42.5792C23.1052 41.6464 21.0744 40.2819 19.3655 38.5637C17.6567 36.8456 16.3032 34.8074 15.3826 32.5659C14.4619 30.3243 13.9921 27.9233 14 25.5C14.0053 20.5951 15.9561 15.8927 19.4244 12.4244C22.8927 8.9561 27.5951 7.00529 32.5 7ZM32.5 5C27.0655 5.00794 21.8558 7.17028 18.0131 11.0131C14.1703 14.8558 12.0079 20.0655 12 25.5C12.0079 30.9345 14.1703 36.1442 18.0131 39.9869C21.8558 43.8297 27.0655 45.9921 32.5 46C35.1859 45.9948 37.8445 45.4602 40.3237 44.4269C42.8029 43.3936 45.0541 41.8818 46.9487 39.9779C48.8432 38.074 50.344 35.8155 51.3652 33.3312C52.3863 30.847 52.9079 28.1859 52.9 25.5C52.9079 22.8141 52.3863 20.153 51.3652 17.6688C50.344 15.1845 48.8432 12.926 46.9487 11.0221C45.0541 9.11823 42.8029 7.60643 40.3237 6.57312C37.8445 5.53981 35.1859 5.00524 32.5 5Z" fill="#BFBFBF"/>
+<defs>
+<linearGradient id="paint0_linear_6488_8059" x1="32.51" y1="58.5699" x2="32.45" y2="36.0299" gradientUnits="userSpaceOnUse">
+<stop offset="0.39" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#404040"/>
+</linearGradient>
+<radialGradient id="paint1_radial_6488_8059" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(31.5025 28.0185) scale(21.85)">
+<stop stop-color="#666666"/>
+<stop offset="1" stop-color="#1A1A1A"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/EnvQuery_16.svg b/Content/Slate/Starship/AssetIcons/EnvQuery_16.svg
new file mode 100644
index 0000000..641c97a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/EnvQuery_16.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C5 0 2.5 2.5 2.5 5.5C2.5 8.5 5.5 10 8 16C10.5 10 13.5 8.5 13.5 5.5C13.5 2.5 11 0 8 0ZM8 11.2C7.3 11.2 6.8 10.6 6.8 10C6.8 9.3 7.4 8.8 8 8.8C8.6 8.8 9.2 9.4 9.2 10C9.2 10.7 8.7 11.2 8 11.2ZM8.9 7.4C8.9 7.9 8.5 8.3 8 8.3C7.5 8.3 7.1 7.9 7.1 7.4V6.6C7.1 6.1 7.5 5.7 8 5.7C8.6 5.7 9 5.2 9 4.7C9 4.1 8.5 3.7 8 3.7C7.5 3.7 7 4.2 7 4.7C7 5.2 6.6 5.6 6.1 5.6C5.6 5.6 5.2 5.2 5.2 4.7C5.2 3.2 6.5 2 8 2C9.5 2 10.8 3.2 10.8 4.8C10.8 6 10 7 8.9 7.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/EnvQuery_64.svg b/Content/Slate/Starship/AssetIcons/EnvQuery_64.svg
new file mode 100644
index 0000000..290d52e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/EnvQuery_64.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="EnvQuery_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#4C4C4C;}
+	.st2{font-family:'Roboto-Black';}
+	.st3{font-size:30.5709px;}
+	.st4{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.0574" y1="10.2034" x2="31.8904" y2="53.7962">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#C2C2C2"/>
+	</linearGradient>
+	<path class="st0" d="M32,10.2c-8.2,0-15,6.8-15,15s8.2,12.3,15,28.6c6.8-16.3,15-20.4,15-28.6S40.2,10.2,32,10.2z"/>
+	<text transform="matrix(0.9184 0 0 1 25.342 39.5168)" class="st1 st2 st3">?</text>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ExponentialHeightFog_16.svg b/Content/Slate/Starship/AssetIcons/ExponentialHeightFog_16.svg
new file mode 100644
index 0000000..03ed9d5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ExponentialHeightFog_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3002 8C11.2002 8 10.6002 8 10.5002 8H5.1002C5.1002 8 1.6002 8 1.5002 8C0.900195 8 0.200195 7.79998 0.200195 7.09998C0.200195 6.59998 0.800195 5.89998 2.2002 6.09998C0.300195 2.99998 4.4002 1.2 6.3002 4.5C5.2002 2.1 6.6002 0 8.7002 0C10.4002 0 12.2002 1.90002 10.9002 3.90002C12.2002 3.60002 13.6002 4.50002 13.6002 5.90002C13.6002 7.30002 12.7002 8 11.3002 8Z" fill="white"/>
+<path opacity="0.5" d="M0 10.5H8" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M0 12.5H8" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M0 14.5H8" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M11 16H13V13H15L12 8.5L9 13H11V16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ExponentialHeightFog_64.svg b/Content/Slate/Starship/AssetIcons/ExponentialHeightFog_64.svg
new file mode 100644
index 0000000..466a57a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ExponentialHeightFog_64.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+</style>
+<g id="ExponentialHeightFog_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<g>
+			<path class="st1" d="M57.9,27c0-5.4-4.5-8.8-9.7-7.6c5.2-7.7-2.4-14.9-9.2-14.9c-8.3,0-15.2,6.2-10.9,15.4
+				c-7.5-12.7-22.5-3.8-15,8.1C7.7,26.8,6,29.7,6,31.6c0,2.7,2.1,3.6,4.5,3.6c0.4,0,0,0,0,0h38.9c0.4,0-0.4,0,0,0
+				C55,35.3,58.3,32.4,57.9,27z"/>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.0216" y1="229.5441" x2="21.9788" y2="233.3133" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M35.3,39.7H8.7c-0.5,0-0.8,0.6-0.8,1.4v0.7c0,0.8,0.4,1.4,0.8,1.4h26.6c0.5,0,0.8-0.6,0.8-1.4v-0.7
+				C36.1,40.3,35.7,39.7,35.3,39.7z"/>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="22.022" y1="237.3122" x2="21.9792" y2="241.0814" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M35.3,47.5H8.7c-0.5,0-0.8,0.6-0.8,1.4v0.7c0,0.8,0.4,1.4,0.8,1.4h26.6c0.5,0,0.8-0.6,0.8-1.4v-0.7
+				C36.1,48.1,35.7,47.5,35.3,47.5z"/>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="22.0218" y1="244.9331" x2="21.979" y2="248.7022" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st4" d="M35.3,55.1H8.7c-0.5,0-0.8,0.6-0.8,1.4v0.7c0,0.8,0.4,1.4,0.8,1.4h26.6c0.5,0,0.8-0.6,0.8-1.4v-0.7
+				C36.1,55.7,35.7,55.1,35.3,55.1z"/>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="32.1436" y1="195.8249" x2="31.803" y2="225.7971" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="0.5615" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st5" d="M57.2,27.8c0-5.2-5.3-8.5-10.2-7.4c4.9-7.4-1.9-14.5-8.3-14.5c-7.9,0-13.2,7.8-9.1,16.7
+				C22.4,10.4,6.9,17,14.1,28.5c-5.3-1.1-7.6,1.9-7.6,3.7c0,2.6,2.6,3.3,4.9,3.3c0.4,0,0,0,0,0h37.1c0.4,0-0.4,0,0,0
+				C53.8,35.6,57.6,33,57.2,27.8z"/>
+		</g>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="48.2951" y1="228.6675" x2="48.0187" y2="248.7789" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st6" d="M45.8,58.8h4.5c0.3,0,0.6-0.3,0.6-0.6v-7.3c0-0.3,0.3-0.6,0.6-0.6h4c0.4,0,0.7-0.5,0.5-0.9l-7.4-11.1
+			c-0.2-0.3-0.7-0.3-0.9,0l-7.4,11.1c-0.2,0.4,0,0.9,0.5,0.9h4c0.3,0,0.6,0.3,0.6,0.6v7.3C45.2,58.6,45.5,58.8,45.8,58.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/FileMediaOutput_16.svg b/Content/Slate/Starship/AssetIcons/FileMediaOutput_16.svg
new file mode 100644
index 0000000..ce63329
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/FileMediaOutput_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 5.5L11.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.5 5.5L3.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 7.59961L3 13.5996V15.9996L0 9.99961V7.59961Z" fill="white"/>
+<path opacity="0.5" d="M10.6 15.4004H3V16.0004H10.6V15.4004Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.6001 11L3.6001 13H5.0001V11H2.6001Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.0001 7H0.600098L2.1001 10H5.0001V8L7.9001 10.5L5.0001 13H10.6001L7.0001 7Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9998 5H11.9998H1.9998C1.2998 5 0.599805 5.4 0.299805 6H1.9998H3.9998H11.9998V14V15H12.9998H13.9998C15.0998 15 15.9998 14.1 15.9998 13V7C15.9998 5.9 15.0998 5 13.9998 5ZM13.9998 13.5C13.1998 13.5 12.4998 12.8 12.4998 12C12.4998 11.2 13.1998 10.5 13.9998 10.5C14.7998 10.5 15.4998 11.2 15.4998 12C15.4998 12.8 14.7998 13.5 13.9998 13.5ZM13.9998 9.5C13.1998 9.5 12.4998 8.8 12.4998 8C12.4998 7.2 13.1998 6.5 13.9998 6.5C14.7998 6.5 15.4998 7.2 15.4998 8C15.4998 8.8 14.7998 9.5 13.9998 9.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/FileMediaOutput_64.svg b/Content/Slate/Starship/AssetIcons/FileMediaOutput_64.svg
new file mode 100644
index 0000000..f65ea1d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/FileMediaOutput_64.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="FileMediaOutput_x5F_64_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);}
+	.st10{fill:#B2B2B2;enable-background:new    ;}
+	.st11{opacity:0.31;fill:#7F7F7F;}
+	.st12{fill:url(#SVGID_9_);}
+	.st13{fill:url(#SVGID_10_);enable-background:new    ;}
+	.st14{fill:url(#SVGID_11_);}
+	.st15{fill:#7F7F7F;}
+	.st16{fill-rule:evenodd;clip-rule:evenodd;fill:#333333;}
+	.st17{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9874" y1="15.2879" x2="25.875" y2="14.1919">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st0" d="M29.1,21.8L29.1,21.8c-0.5,0.3-1,0.1-1.3-0.3L20.6,8.8c-0.3-0.5-0.1-1,0.3-1.3l0,0c0.5-0.3,1-0.1,1.3,0.3
+			l7.3,12.6C29.7,21,29.6,21.6,29.1,21.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="37.1369" y1="14.1327" x2="38.3547" y2="14.8634">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M33.9,21.8L33.9,21.8c0.5,0.3,1,0.1,1.3-0.3l7.3-12.6c0.3-0.5,0.1-1-0.3-1.3v0c-0.5-0.3-1-0.1-1.3,0.3
+			l-7.3,12.6C33.3,21,33.5,21.6,33.9,21.8z"/>
+		<path class="st2" d="M52.8,47H16.6c-2.2,0-4-1.8-4-4V22.1c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4V43C56.8,45.2,55,47,52.8,47z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="34.6988" y1="19.9061" x2="34.6988" y2="48.7761">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.7817" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M52.8,47.7H16.6c-2.2,0-4-1.8-4-4V22.8c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4v20.9
+			C56.8,45.9,55,47.7,52.8,47.7z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.4182" y1="22.0724" x2="31.4182" y2="44.0479">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#1A1A1A"/>
+		</linearGradient>
+		<path class="st4" d="M44,44.8H18.9c-1.7,0-3.1-1.4-3.1-3.1V24.6c0-1.7,1.4-3.1,3.1-3.1H44c1.7,0,3.1,1.4,3.1,3.1v17.1
+			C47.1,43.4,45.7,44.8,44,44.8z"/>
+		<radialGradient id="SVGID_5_" cx="52.0933" cy="25.2352" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st5" cx="52.1" cy="25.2" r="2.9"/>
+		<radialGradient id="SVGID_6_" cx="52.0933" cy="32.582" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st6" cx="52.1" cy="32.6" r="2.9"/>
+		<circle class="st7" cx="52.1" cy="25.2" r="2.3"/>
+		<circle class="st7" cx="52.1" cy="32.6" r="2.3"/>
+	</g>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="14.165" y1="31.3687" x2="14.0866" y2="25.6482">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#F2F2F2;stop-opacity:0"/>
+	</linearGradient>
+	<rect x="12.6" y="27.6" class="st8" width="3.2" height="3.7"/>
+	<g>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.3911" y1="30.5252" x2="38.0776" y2="47.6877">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</linearGradient>
+		<path class="st9" d="M27.1,30.3H6.6l10.5,16.5h21.5c0.7,0,1.1-0.6,0.7-1L27.8,30.6C27.7,30.4,27.4,30.3,27.1,30.3z"/>
+		<path class="st10" d="M37.7,50.1L16.6,51l0.4,1h21.7c0.4,0,0.7-0.2,0.7-0.5l0,0C39.5,51.2,38.1,50.1,37.7,50.1z"/>
+		<polygon class="st11" points="19,45.8 18.1,45.7 8.7,31.3 9.6,31.3 		"/>
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="19.6709" y1="41.4469" x2="36.4983" y2="51.1752">
+			<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			<stop  offset="0.4949" style="stop-color:#FCFCFC"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st12" d="M38.9,46.7H17.3c-0.2,0-0.4-0.2-0.4-0.4l0,0c0-0.2,0.2-0.4,0.4-0.4h21.6c0.2,0,0.4,0.2,0.4,0.4l0,0
+			C39.3,46.5,39.1,46.7,38.9,46.7z"/>
+		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="27.5211" y1="46.7221" x2="27.4945" y2="51.22">
+			<stop  offset="0" style="stop-color:#333333"/>
+			<stop  offset="0.5635" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st13" d="M38.4,46.8H17c-0.3,0-0.5,0.2-0.5,0.4V51c0,0.2,0.2,0.4,0.5,0.4l21.4-0.1c0,0,0.1,0,0.1-0.1L38.4,46.8
+			C38.5,46.9,38.5,46.8,38.4,46.8z"/>
+		<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="19.8525" y1="47.0537" x2="36.2057" y2="56.5079">
+			<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			<stop  offset="0.4949" style="stop-color:#FCFCFC"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st14" d="M38.7,52H17.3c-0.1,0-0.1-0.1-0.1-0.1v-0.1c0-0.1,0.1-0.1,0.1-0.1h21.4c0.1,0,0.1,0.1,0.1,0.1v0.1
+			C38.9,51.9,38.8,52,38.7,52z"/>
+		<g>
+			<path class="st15" d="M6.6,30.3c-0.6,1.5-0.7,3,0,4.9L17.1,52c-0.8-2-0.7-3.8,0-5.2L6.6,30.3z"/>
+		</g>
+	</g>
+	<path class="st16" d="M32,37.5l-13-5.4l2.6,3.4l-11.7,0c-0.8,1.8-0.3,4.4,0.7,6.1l1.9,3.1c-0.6-1.6-0.7-3.4-0.2-5.3l11.2,0.1
+		l2.7,3.4L32,37.5z"/>
+	<rect x="0" class="st17" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/FileMediaSource_16.svg b/Content/Slate/Starship/AssetIcons/FileMediaSource_16.svg
new file mode 100644
index 0000000..f4a5fd2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/FileMediaSource_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 5.5L11.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.5 5.5L3.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 7.59961L3 13.5996V15.9996L0 9.99961V7.59961Z" fill="white"/>
+<path opacity="0.5" d="M10.6 15.4004H3V16.0004H10.6V15.4004Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.0001 7H0.600098L3.6001 13H10.6001L7.0001 7Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9998 5H11.9998H1.9998C1.2998 5 0.599805 5.4 0.299805 6H1.9998H3.9998H11.9998V14V15H12.9998H13.9998C15.0998 15 15.9998 14.1 15.9998 13V7C15.9998 5.9 15.0998 5 13.9998 5ZM13.9998 13.5C13.1998 13.5 12.4998 12.8 12.4998 12C12.4998 11.2 13.1998 10.5 13.9998 10.5C14.7998 10.5 15.4998 11.2 15.4998 12C15.4998 12.8 14.7998 13.5 13.9998 13.5ZM13.9998 9.5C13.1998 9.5 12.4998 8.8 12.4998 8C12.4998 7.2 13.1998 6.5 13.9998 6.5C14.7998 6.5 15.4998 7.2 15.4998 8C15.4998 8.8 14.7998 9.5 13.9998 9.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/FileMediaSource_64.svg b/Content/Slate/Starship/AssetIcons/FileMediaSource_64.svg
new file mode 100644
index 0000000..81c8782
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/FileMediaSource_64.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="FileMediaSource_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);}
+	.st10{fill:#B2B2B2;enable-background:new    ;}
+	.st11{opacity:0.31;fill:#7F7F7F;}
+	.st12{fill:url(#SVGID_9_);}
+	.st13{fill:url(#SVGID_10_);enable-background:new    ;}
+	.st14{fill:url(#SVGID_11_);}
+	.st15{fill:#7F7F7F;}
+	.st16{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="23.9874" y1="15.2879" x2="25.875" y2="14.1919">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st0" d="M29.1,21.8L29.1,21.8c-0.5,0.3-1,0.1-1.3-0.3L20.6,8.8c-0.3-0.5-0.1-1,0.3-1.3l0,0c0.5-0.3,1-0.1,1.3,0.3
+			l7.3,12.6C29.7,21,29.6,21.6,29.1,21.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="37.1369" y1="14.1327" x2="38.3547" y2="14.8634">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M33.9,21.8L33.9,21.8c0.5,0.3,1,0.1,1.3-0.3l7.3-12.6c0.3-0.5,0.1-1-0.3-1.3v0c-0.5-0.3-1-0.1-1.3,0.3
+			l-7.3,12.6C33.3,21,33.5,21.6,33.9,21.8z"/>
+		<path class="st2" d="M52.8,47H16.6c-2.2,0-4-1.8-4-4V22.1c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4V43C56.8,45.2,55,47,52.8,47z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="34.6988" y1="19.9061" x2="34.6988" y2="48.7761">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.7817" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M52.8,47.7H16.6c-2.2,0-4-1.8-4-4V22.8c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4v20.9
+			C56.8,45.9,55,47.7,52.8,47.7z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.4182" y1="22.0724" x2="31.4182" y2="44.0479">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#1A1A1A"/>
+		</linearGradient>
+		<path class="st4" d="M44,44.8H18.9c-1.7,0-3.1-1.4-3.1-3.1V24.6c0-1.7,1.4-3.1,3.1-3.1H44c1.7,0,3.1,1.4,3.1,3.1v17.1
+			C47.1,43.4,45.7,44.8,44,44.8z"/>
+		<radialGradient id="SVGID_5_" cx="52.0933" cy="25.2352" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st5" cx="52.1" cy="25.2" r="2.9"/>
+		<radialGradient id="SVGID_6_" cx="52.0933" cy="32.582" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st6" cx="52.1" cy="32.6" r="2.9"/>
+		<circle class="st7" cx="52.1" cy="25.2" r="2.3"/>
+		<circle class="st7" cx="52.1" cy="32.6" r="2.3"/>
+	</g>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="14.165" y1="31.3687" x2="14.0866" y2="25.6482">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#F2F2F2;stop-opacity:0"/>
+	</linearGradient>
+	<rect x="12.6" y="27.6" class="st8" width="3.2" height="3.7"/>
+	<g>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="8.3911" y1="30.5252" x2="38.0776" y2="47.6877">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#FFFFFF"/>
+		</linearGradient>
+		<path class="st9" d="M27.1,30.3H6.6l10.5,16.5h21.5c0.7,0,1.1-0.6,0.7-1L27.8,30.6C27.7,30.4,27.4,30.3,27.1,30.3z"/>
+		<path class="st10" d="M37.7,50.1L16.6,51l0.4,1h21.7c0.4,0,0.7-0.2,0.7-0.5l0,0C39.5,51.2,38.1,50.1,37.7,50.1z"/>
+		<polygon class="st11" points="19,45.8 18.1,45.7 8.7,31.3 9.6,31.3 		"/>
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="19.6709" y1="41.4469" x2="36.4983" y2="51.1752">
+			<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			<stop  offset="0.4949" style="stop-color:#FCFCFC"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st12" d="M38.9,46.7H17.3c-0.2,0-0.4-0.2-0.4-0.4l0,0c0-0.2,0.2-0.4,0.4-0.4h21.6c0.2,0,0.4,0.2,0.4,0.4l0,0
+			C39.3,46.5,39.1,46.7,38.9,46.7z"/>
+		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="27.5211" y1="46.7221" x2="27.4945" y2="51.22">
+			<stop  offset="0" style="stop-color:#333333"/>
+			<stop  offset="0.5635" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st13" d="M38.4,46.8H17c-0.3,0-0.5,0.2-0.5,0.4V51c0,0.2,0.2,0.4,0.5,0.4l21.4-0.1c0,0,0.1,0,0.1-0.1L38.4,46.8
+			C38.5,46.9,38.5,46.8,38.4,46.8z"/>
+		<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="19.8525" y1="47.0537" x2="36.2057" y2="56.5079">
+			<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0"/>
+			<stop  offset="0.4949" style="stop-color:#FCFCFC"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st14" d="M38.7,52H17.3c-0.1,0-0.1-0.1-0.1-0.1v-0.1c0-0.1,0.1-0.1,0.1-0.1h21.4c0.1,0,0.1,0.1,0.1,0.1v0.1
+			C38.9,51.9,38.8,52,38.7,52z"/>
+		<g>
+			<path class="st15" d="M6.6,30.3c-0.6,1.5-0.7,3,0,4.9L17.1,52c-0.8-2-0.7-3.8,0-5.2L6.6,30.3z"/>
+		</g>
+	</g>
+	<rect x="0" class="st16" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/FoliageType_Actor_16.svg b/Content/Slate/Starship/AssetIcons/FoliageType_Actor_16.svg
new file mode 100644
index 0000000..e146cb3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/FoliageType_Actor_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8998 8.90039C13.6998 10.5004 10.4998 12.6004 7.2998 16.0004C7.2998 16.0004 9.1998 9.70039 15.8998 8.90039Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.40039 0.300781C12.6004 8.90078 8.00039 14.2008 6.60039 16.0008C6.60039 16.0008 9.40039 10.0008 5.40039 0.300781Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0.100098 9.60059C5.6001 10.5006 5.5001 15.0006 5.6001 16.0006C5.6001 16.0006 3.9001 12.3006 0.100098 9.60059Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16 13.3008C11.6 13.3008 8.1 15.0008 8 16.0008C8 16.0008 12.3 15.9008 16 13.3008Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.7001 13.5L6.3001 16C5.6001 13.7 6.5001 9.9 1.1001 5.5C7.4001 8.9 6.7001 13.5 6.7001 13.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/FoliageType_Actor_64.svg b/Content/Slate/Starship/AssetIcons/FoliageType_Actor_64.svg
new file mode 100644
index 0000000..e0243d3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/FoliageType_Actor_64.svg
@@ -0,0 +1,21 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M52.9 48.7C38.6 48.7 27.3 54.2 26.9 57.5C27 57.5 40.9 57.2 52.9 48.7Z" fill="#7F7F7F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M54.9 34.3999C47.8 39.5999 37.4 46.3999 27 57.4999C27 57.4999 33.1 36.9999 54.9 34.3999Z" fill="url(#paint0_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.09998 36.7C27 39.6 26.6 54.2 27 57.5C27 57.5 21.4 45.5 9.09998 36.7Z" fill="#7F7F7F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.9 50.5999L27 57.4999C24.7 49.9999 28.1 37.6999 10.6 23.3999C31 34.3999 28.9 50.5999 28.9 50.5999Z" fill="url(#paint1_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M22.7 6.5C46.1 35.9 31.7 51.4 27 57.5C27 57.5 33.6 38.4 22.7 6.5Z" fill="url(#paint2_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="40.9303" y1="34.459" x2="40.9697" y2="57.4628" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="19.7584" y1="23.3842" x2="19.8169" y2="57.5122" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="29.1794" y1="9.6227" x2="29.2613" y2="57.4563" gradientUnits="userSpaceOnUse">
+<stop offset="0.5989" stop-color="white"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Font_16.svg b/Content/Slate/Starship/AssetIcons/Font_16.svg
new file mode 100644
index 0000000..9adc13d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Font_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 4.9C9 5 9 5.2 8.9 5.2C8.9 5.3 8.8 5.3 8.7 5.3C8.6 5.3 8.5 5.3 8.5 5.2C8.4 5.2 8.4 5 8 4.9V4H6V11H7.4C7.5 11.4 7.7 11.4 7.7 11.4C7.8 11.5 7.8 11.5 7.8 11.6C7.8 11.7 7.8 11.8 7.7 11.8C7.7 12 7.6 12 7.4 12H3.6C3.5 12 3.3 12 3.3 11.9C3.2 11.8 3.2 11.8 3.2 11.7C3.2 11.6 3.2 11.5 3.3 11.5C3.4 11.4 3.5 11.4 3.6 11.1H5V4H3V4.9C2.6 5 2.6 5.2 2.5 5.2C2.5 5.3 2.4 5.3 2.3 5.3C2.2 5.3 2.1 5.3 2.1 5.2C2 5.2 2 5 2 4.9V3H9V4.9ZM14 7H12V11H13V12H11V7H9V6H11V4H12V6H14V7Z" fill="white"/>
+<path opacity="0.5" d="M15 2V13H1V2H15ZM16 1H0V14H16V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Font_64.svg b/Content/Slate/Starship/AssetIcons/Font_64.svg
new file mode 100644
index 0000000..38561a1
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Font_64.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{opacity:0.29;fill-rule:evenodd;clip-rule:evenodd;enable-background:new    ;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{opacity:0.5;fill:#7F7F7F;enable-background:new    ;}
+</style>
+<g id="TextRenderActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.0131" y1="204.0956" x2="31.7604" y2="243.7578" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#333333"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<rect x="6.4" y="11.8" class="st1" width="51" height="40.1"/>
+		<path class="st2" d="M31.8,48.9H18.9v-3.4h4.8V21.7h-6.8v3.1h-3.4v-6.5h23.8v6.5h-3.4v-3.1h-6.8v23.8h4.8v3.4H31.8z M54.3,31.9
+			h-6.8v13.6h3.4v3.4h-6.8v-17h-6.8v-3.4h6.8v-6.8h3.4v6.8h6.8C54.3,28.5,54.3,31.9,54.3,31.9z"/>
+		<path class="st3" d="M29.8,47.3H16.9v-3.4h4.8V20.1h-6.8v3.1h-3.4v-6.5h23.8v6.5h-3.4v-3.1h-6.8v23.8h4.8L29.8,47.3L29.8,47.3z
+			 M52.3,30.3h-6.8v13.6h3.4v3.4h-6.8v-17h-6.8v-3.4h6.8v-6.8h3.4v6.8h6.8C52.3,26.9,52.3,30.3,52.3,30.3z"/>
+		<g>
+			<path class="st4" d="M55.7,13.3v37.5H8V13.3H55.7z M59.1,9.9H4.6v44.3h54.5V9.9z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ForceFeedbackEffect_16.svg b/Content/Slate/Starship/AssetIcons/ForceFeedbackEffect_16.svg
new file mode 100644
index 0000000..ffd07c2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ForceFeedbackEffect_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2996 10.9996C12.7996 9.59961 11.6996 7.09961 10.6996 7.09961C9.09962 7.09961 9.09962 8.49961 8.49962 8.49961C8.19962 8.49961 6.99962 8.49961 6.59962 8.49961C5.99962 8.49961 5.99962 7.09961 4.39962 7.09961C3.39962 7.09961 2.29962 9.59961 1.79962 10.9996C0.899622 13.6996 0.799622 14.8996 2.69962 14.8996C4.79962 14.8996 4.79962 12.4996 7.49962 12.4996C10.1996 12.4996 10.2996 14.8996 12.2996 14.8996C14.1996 14.8996 14.1996 13.6996 13.2996 10.9996ZM6.49962 10.9996H4.99962V12.3996H3.99962V10.9996H2.59962V9.99961H3.99962V8.49961H4.99962V9.99961H6.49962V10.9996ZM10.4996 12.3996C9.49962 12.3996 8.69962 11.5996 8.69962 10.5996C8.69962 9.59961 9.49962 8.69961 10.4996 8.69961C11.4996 8.69961 12.3996 9.49961 12.3996 10.5996C12.3996 11.4996 11.4996 12.3996 10.4996 12.3996Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.4994 9.79883C10.1994 9.79883 9.89941 10.0988 9.89941 10.3988C9.89941 10.6988 10.1994 10.9988 10.4994 10.9988C10.7994 10.9988 11.0994 10.6988 11.0994 10.3988C11.0994 10.0988 10.7994 9.79883 10.4994 9.79883Z" fill="white"/>
+<path opacity="0.5" d="M14.5 7.5C14 6.1 12.5 4.5 11.5 4.5C9.5 4.5 9.5 5.5 7.5 5.5C5.5 5.5 5.5 4.5 3.5 4.5C2.5 4.5 1 6.1 0.5 7.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M14.5 3.50049C14 2.10049 12.7 0.60049 11.6 0.60049C9.5 0.50049 9.5 2.00049 7.5 2.00049C5.5 2.00049 5.5 0.50049 3.4 0.60049C2.4 0.60049 1 2.10049 0.5 3.50049" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ForceFeedback_16.svg b/Content/Slate/Starship/AssetIcons/ForceFeedback_16.svg
new file mode 100644
index 0000000..ffd07c2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ForceFeedback_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2996 10.9996C12.7996 9.59961 11.6996 7.09961 10.6996 7.09961C9.09962 7.09961 9.09962 8.49961 8.49962 8.49961C8.19962 8.49961 6.99962 8.49961 6.59962 8.49961C5.99962 8.49961 5.99962 7.09961 4.39962 7.09961C3.39962 7.09961 2.29962 9.59961 1.79962 10.9996C0.899622 13.6996 0.799622 14.8996 2.69962 14.8996C4.79962 14.8996 4.79962 12.4996 7.49962 12.4996C10.1996 12.4996 10.2996 14.8996 12.2996 14.8996C14.1996 14.8996 14.1996 13.6996 13.2996 10.9996ZM6.49962 10.9996H4.99962V12.3996H3.99962V10.9996H2.59962V9.99961H3.99962V8.49961H4.99962V9.99961H6.49962V10.9996ZM10.4996 12.3996C9.49962 12.3996 8.69962 11.5996 8.69962 10.5996C8.69962 9.59961 9.49962 8.69961 10.4996 8.69961C11.4996 8.69961 12.3996 9.49961 12.3996 10.5996C12.3996 11.4996 11.4996 12.3996 10.4996 12.3996Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.4994 9.79883C10.1994 9.79883 9.89941 10.0988 9.89941 10.3988C9.89941 10.6988 10.1994 10.9988 10.4994 10.9988C10.7994 10.9988 11.0994 10.6988 11.0994 10.3988C11.0994 10.0988 10.7994 9.79883 10.4994 9.79883Z" fill="white"/>
+<path opacity="0.5" d="M14.5 7.5C14 6.1 12.5 4.5 11.5 4.5C9.5 4.5 9.5 5.5 7.5 5.5C5.5 5.5 5.5 4.5 3.5 4.5C2.5 4.5 1 6.1 0.5 7.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M14.5 3.50049C14 2.10049 12.7 0.60049 11.6 0.60049C9.5 0.50049 9.5 2.00049 7.5 2.00049C5.5 2.00049 5.5 0.50049 3.4 0.60049C2.4 0.60049 1 2.10049 0.5 3.50049" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ForceFeedback_64.svg b/Content/Slate/Starship/AssetIcons/ForceFeedback_64.svg
new file mode 100644
index 0000000..ef93fc6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ForceFeedback_64.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ForceFeedback_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.3;fill-rule:evenodd;clip-rule:evenodd;stroke:#000000;stroke-width:4;stroke-miterlimit:10;}
+	.st1{enable-background:new    ;}
+	.st2{fill:#B2B2B2;}
+	.st3{fill:#7F7F7F;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;stroke:#BFBFBF;stroke-width:0.25;stroke-miterlimit:10;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#E5E5E5;stroke:#BFBFBF;stroke-width:0.25;stroke-miterlimit:10;}
+	.st7{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M49,40.5c-1.5-4.1-4.7-11.5-7.7-11.5c-4.7,0-4.7,1.3-6.5,1.3c-0.9,0-4.4,0-5.6,0c-1.8,0-1.8-1.3-6.5-1.3
+		c-2.9,0-6.2,7.4-7.7,11.5c-2.7,8-2.9,11.5,2.7,11.5c6.2,0,6.2-5.2,14.2-5.2S40.2,52,46.1,52C51.7,52,51.7,48.5,49,40.5z M28.5,39.7
+		h-2.7c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.3-0.2,0.5-0.5,0.5h-1.4c-0.3,0-0.5-0.2-0.5-0.5v-2.4c0-0.3-0.2-0.5-0.5-0.5H20
+		c-0.3,0-0.5-0.2-0.5-0.5v-1.4c0-0.3,0.2-0.5,0.5-0.5h2.4c0.3,0,0.5-0.2,0.5-0.5v-2.7c0-0.3,0.2-0.5,0.5-0.5h1.4
+		c0.3,0,0.5,0.2,0.5,0.5v2.7c0,0.3,0.2,0.5,0.5,0.5h2.7c0.3,0,0.5,0.2,0.5,0.5v1.4C29,39.5,28.7,39.7,28.5,39.7z M43.6,43.6
+		c-4.3,2.3-8.6-1-8.1-5.2c0.3-2.8,2.6-5.1,5.5-5c3.1,0.1,5.9,2.9,5.3,6.5C46,41.6,45,42.9,43.6,43.6z"/>
+	<g class="st1">
+		<path class="st2" d="M54.1,27.5c-1-2-2.3-3.8-3.9-5.4c-0.8-0.8-1.6-1.5-2.5-2.1c-0.9-0.6-1.9-1.1-2.8-1.2l-0.3,0l-0.4,0
+			c-0.3,0-0.5,0-0.8,0.1c-0.5,0.1-1,0.1-1.6,0.3c-1,0.2-1.9,0.7-2.9,1.2c-1,0.5-2.1,1.1-3.3,1.4c-1.2,0.3-2.4,0.4-3.6,0.4
+			c-1.2,0-2.4-0.1-3.6-0.4c-1.2-0.3-2.3-0.8-3.3-1.4c-1-0.5-1.9-0.9-2.9-1.2c-0.5-0.1-1-0.2-1.6-0.3c-0.3,0-0.5,0-0.8-0.1l-0.4,0
+			l-0.3,0c-0.9,0.1-1.9,0.6-2.8,1.1c-0.9,0.6-1.7,1.3-2.5,2.1c-1.6,1.6-2.9,3.4-3.9,5.4c0.6-2.2,1.8-4.2,3.2-6.1
+			c0.7-0.9,1.5-1.7,2.5-2.5c0.9-0.7,2-1.4,3.3-1.6c0.2,0,0.4,0,0.5-0.1l0.4,0c0.3,0,0.6,0,0.9,0c0.6,0,1.2,0.1,1.8,0.2
+			c1.2,0.2,2.4,0.7,3.4,1.2c1,0.5,2,0.9,3,1.2c1,0.3,2,0.3,3.1,0.3c1.1,0,2.1-0.1,3.1-0.3c1-0.2,1.9-0.7,3-1.2c1-0.5,2.2-1,3.4-1.2
+			c0.6-0.1,1.2-0.2,1.8-0.2c0.3,0,0.6,0,0.9,0l0.4,0c0.2,0,0.3,0,0.5,0.1c1.4,0.2,2.4,0.9,3.3,1.6c0.9,0.8,1.7,1.6,2.5,2.5
+			C52.3,23.3,53.5,25.3,54.1,27.5z"/>
+	</g>
+	<g class="st1">
+		<path class="st2" d="M54.1,19.9c-1-2-2.3-3.8-3.9-5.4c-0.8-0.8-1.6-1.5-2.5-2.1c-0.9-0.6-1.9-1.1-2.8-1.2l-0.3,0l-0.4,0
+			c-0.3,0-0.5,0-0.8,0.1c-0.5,0.1-1,0.1-1.6,0.3c-1,0.2-1.9,0.7-2.9,1.2c-1,0.5-2.1,1.1-3.3,1.4c-1.2,0.3-2.4,0.4-3.6,0.4
+			c-1.2,0-2.4-0.1-3.6-0.4c-1.2-0.3-2.3-0.8-3.3-1.4c-1-0.5-1.9-0.9-2.9-1.2c-0.5-0.1-1-0.2-1.6-0.3c-0.3,0-0.5,0-0.8-0.1l-0.4,0
+			l-0.3,0c-0.9,0.1-1.9,0.6-2.8,1.1c-0.9,0.6-1.7,1.3-2.5,2.1c-1.6,1.6-2.9,3.4-3.9,5.4c0.6-2.2,1.8-4.2,3.2-6.1
+			c0.7-0.9,1.5-1.7,2.5-2.5c0.9-0.7,2-1.4,3.3-1.6c0.2,0,0.4,0,0.5-0.1l0.4,0c0.3,0,0.6,0,0.9,0c0.6,0,1.2,0.1,1.8,0.2
+			c1.2,0.2,2.4,0.7,3.4,1.2c1,0.5,2,0.9,3,1.2c1,0.3,2,0.3,3.1,0.3c1.1,0,2.1-0.1,3.1-0.3c1-0.2,1.9-0.7,3-1.2c1-0.5,2.2-1,3.4-1.2
+			c0.6-0.1,1.2-0.2,1.8-0.2c0.3,0,0.6,0,0.9,0l0.4,0c0.2,0,0.3,0,0.5,0.1c1.4,0.2,2.4,0.9,3.3,1.6c0.9,0.8,1.7,1.6,2.5,2.5
+			C52.3,15.6,53.5,17.6,54.1,19.9z"/>
+	</g>
+	<g>
+		<circle class="st3" cx="41.9" cy="37.4" r="6.1"/>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.0974" y1="26.6894" x2="31.9466" y2="59.4128">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#545454"/>
+		</linearGradient>
+		<path class="st4" d="M50.9,39.2c-1.6-4.6-5.3-12.8-8.5-12.8c-5.3,0-5.3,1.4-7.2,1.4c-1,0-4.9,0-6.2,0c-2,0-2-1.4-7.2-1.4
+			c-3.3,0-6.9,8.2-8.5,12.8c-3,8.9-3.3,12.8,3,12.8c6.9,0,6.9-5.8,15.8-5.8S41.1,52,47.7,52C53.9,52,53.9,48.1,50.9,39.2z
+			 M28.1,38.3h-3c-0.3,0-0.6,0.3-0.6,0.6v2.7c0,0.3-0.3,0.6-0.6,0.6h-1.6c-0.3,0-0.6-0.3-0.6-0.6v-2.7c0-0.3-0.3-0.6-0.6-0.6h-2.7
+			c-0.3,0-0.6-0.3-0.6-0.6v-1.6c0-0.3,0.3-0.6,0.6-0.6h2.7c0.3,0,0.6-0.3,0.6-0.6v-3c0-0.3,0.3-0.6,0.6-0.6H24
+			c0.3,0,0.6,0.3,0.6,0.6v3c0,0.3,0.3,0.6,0.6,0.6h3c0.3,0,0.6,0.3,0.6,0.6v1.6C28.6,38.1,28.4,38.3,28.1,38.3z M44.9,42.7
+			c-4.8,2.5-9.6-1.1-9.1-5.8c0.3-3.1,2.9-5.7,6.1-5.6c3.5,0.1,6.6,3.2,6,7.3C47.6,40.4,46.5,41.9,44.9,42.7z"/>
+		<circle class="st5" cx="41.9" cy="34.7" r="1.5"/>
+		<circle class="st5" cx="44.8" cy="37.6" r="1.5"/>
+		<circle class="st5" cx="39" cy="37.6" r="1.5"/>
+		<circle class="st5" cx="41.9" cy="40.2" r="1.5"/>
+		<path class="st6" d="M28.1,38.3h-3c-0.3,0-0.6,0.3-0.6,0.6v2.7c0,0.3-0.3,0.6-0.6,0.6h-1.6c-0.3,0-0.6-0.3-0.6-0.6v-2.7
+			c0-0.3-0.3-0.6-0.6-0.6h-2.7c-0.3,0-0.6-0.3-0.6-0.6v-1.6c0-0.3,0.3-0.6,0.6-0.6h2.7c0.3,0,0.6-0.3,0.6-0.6v-3
+			c0-0.3,0.3-0.6,0.6-0.6H24c0.3,0,0.6,0.3,0.6,0.6v3c0,0.3,0.3,0.6,0.6,0.6h3c0.3,0,0.6,0.3,0.6,0.6v1.6
+			C28.6,38.1,28.4,38.3,28.1,38.3z"/>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GameModeBase_16.svg b/Content/Slate/Starship/AssetIcons/GameModeBase_16.svg
new file mode 100644
index 0000000..b2eec50
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GameModeBase_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 15.9999C6.2 13.9999 8 14.4999 8 14.4999C8 14.4999 9.8 13.9999 13.5 15.9999C9.8 15.9999 6.2 15.9999 2.5 15.9999Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4001 6.00005C12.9001 4.70005 11.9001 2.30005 10.9001 2.30005C9.40007 2.30005 9.40007 3.70005 8.80007 3.70005C8.50007 3.70005 7.40007 3.70005 7.00007 3.70005C6.40007 3.70005 6.40007 2.30005 5.00007 2.30005C4.00007 2.30005 3.00007 4.60005 2.50007 6.00005C1.70007 8.50005 1.60007 9.70005 3.40007 9.70005C5.40007 9.70005 5.40007 7.40005 7.90007 7.40005C10.4001 7.40005 10.5001 9.70005 12.4001 9.70005C14.3001 9.70005 14.3001 8.50005 13.4001 6.00005ZM7.00007 6.00005H6.00007V7.00005H5.00007V6.00005H4.00007V5.00005H5.00007V4.00005H6.00007V5.00005H7.00007V6.00005ZM10.5001 7.20005C9.60007 7.20005 8.80007 6.50005 8.80007 5.50005C8.80007 4.60005 9.50007 3.80005 10.5001 3.80005C11.5001 3.80005 12.2001 4.50005 12.2001 5.50005C12.2001 6.40005 11.4001 7.20005 10.5001 7.20005Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5 5C10.2 5 10 5.2 10 5.5C10 5.8 10.2 6 10.5 6C10.8 6 11 5.8 11 5.5C11 5.2 10.8 5 10.5 5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GameModeBase_64.svg b/Content/Slate/Starship/AssetIcons/GameModeBase_64.svg
new file mode 100644
index 0000000..7eee46c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GameModeBase_64.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="GameModeBase_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#5B5B5B;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#7F7F7F;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st7{opacity:0.3;fill-rule:evenodd;clip-rule:evenodd;}
+	.st8{fill:#7F7F7F;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st10{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;stroke:#BFBFBF;stroke-width:0.25;stroke-miterlimit:10;}
+	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:#E5E5E5;stroke:#BFBFBF;stroke-width:0.25;stroke-miterlimit:10;}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<rect x="26.8" y="45.6" class="st1" width="9.8" height="7.6"/>
+	<path class="st2" d="M24.1,42c0,2.7,3.4,4.8,7.7,4.8s7.7-2.2,7.7-4.8H24.1z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.8915" y1="9.8377" x2="31.8915" y2="41.8309">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<rect x="9.4" y="9.4" class="st3" width="45" height="32.6"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.872" y1="44.4242" x2="31.872" y2="6.9955">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<path class="st4" d="M53.7,11.1v29.2c0,0.5-0.4,1-1,1H11c-0.5,0-1-0.4-1-1V11.1c0-0.5,0.4-1,1-1h41.7
+		C53.3,10.1,53.7,10.6,53.7,11.1z M55.8,7H7.9c-0.5,0-1,0.4-1,1v35.4c0,0.5,0.4,1,1,1h47.9c0.5,0,1-0.4,1-1V8
+		C56.8,7.4,56.4,7,55.8,7z"/>
+	<path class="st5" d="M46.3,57c0-2.7-6.5-5.1-14.5-5.1S17.2,54.3,17.2,57H46.3z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.7439" y1="57.5463" x2="31.7439" y2="52.7146">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st6" d="M46.3,57.4c0.3-2.8-6.5-4.8-14.5-4.8c-8,0-14.8,2.1-14.5,4.8H46.3z"/>
+</g>
+<path class="st7" d="M48.6,27.8c-1.4-4-4.6-11.3-7.5-11.3c-4.6,0-4.6,1.3-6.3,1.3c-0.9,0-4.3,0-5.5,0c-1.7,0-1.7-1.3-6.3-1.3
+	c-2.9,0-6.1,7.2-7.5,11.3c-2.6,7.8-2.9,11.3,2.6,11.3c6.1,0,6.1-5.1,13.9-5.1c7.8,0,8.1,5.1,13.9,5.1C51.2,39.1,51.2,35.6,48.6,27.8
+	z M37.8,21.8c0.8-0.5,1.7-0.8,2.7-0.8C39.6,20.9,38.6,21.2,37.8,21.8z M41.4,21c-0.2,0-0.4-0.1-0.7-0.1c0,0,0,0,0,0
+	C41,20.9,41.2,20.9,41.4,21z M37.3,22.2c0,0-0.1,0.1-0.1,0.1C37.2,22.3,37.2,22.2,37.3,22.2z M35.4,25.7c0,0.1,0,0.2,0,0.4
+	c0-0.1,0-0.1,0-0.2C35.4,25.7,35.4,25.7,35.4,25.7z M35.4,26.3c0.1,2.8,2.3,5.1,5.1,5.2C37.6,31.5,35.4,29.2,35.4,26.3z M46,27.3
+	c-0.2,1.4-1,2.5-2.2,3.3c1.3-0.9,2.1-2.4,2.2-4.1C46,26.7,46,27,46,27.3z"/>
+<g>
+	<circle class="st8" cx="40.7" cy="24.1" r="5.3"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="32.0856" y1="14.6753" x2="31.9531" y2="43.4379">
+		<stop  offset="0" style="stop-color:#BFBFBF"/>
+		<stop  offset="1" style="stop-color:#545454"/>
+	</linearGradient>
+	<path class="st9" d="M48.6,25.7c-1.4-4-4.6-11.3-7.5-11.3c-4.6,0-4.6,1.3-6.3,1.3c-0.9,0-4.3,0-5.5,0c-1.7,0-1.7-1.3-6.3-1.3
+		c-2.9,0-6.1,7.2-7.5,11.3C12.9,33.5,12.6,37,18.1,37c6.1,0,6.1-5.1,13.9-5.1S40,37,45.8,37C51.2,37,51.2,33.5,48.6,25.7z
+		 M28.5,24.9h-2.6c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.3-0.2,0.5-0.5,0.5h-1.4c-0.3,0-0.5-0.2-0.5-0.5v-2.4c0-0.3-0.2-0.5-0.5-0.5h-2.4
+		c-0.3,0-0.5-0.2-0.5-0.5V23c0-0.3,0.2-0.5,0.5-0.5h2.4c0.3,0,0.5-0.2,0.5-0.5v-2.6c0-0.3,0.2-0.5,0.5-0.5H25c0.3,0,0.5,0.2,0.5,0.5
+		V22c0,0.3,0.2,0.5,0.5,0.5h2.6c0.3,0,0.5,0.2,0.5,0.5v1.4C29,24.7,28.8,24.9,28.5,24.9z M43.4,28.7c-4.2,2.2-8.4-1-8-5.1
+		c0.3-2.7,2.6-5,5.3-4.9c3.1,0.1,5.8,2.8,5.2,6.4C45.7,26.7,44.7,28,43.4,28.7z"/>
+	<circle class="st10" cx="40.7" cy="21.7" r="1.3"/>
+	<circle class="st10" cx="43.3" cy="24.3" r="1.3"/>
+	<circle class="st10" cx="38.2" cy="24.3" r="1.3"/>
+	<circle class="st10" cx="40.7" cy="26.5" r="1.3"/>
+	<path class="st11" d="M28.5,24.9h-2.6c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.3-0.2,0.5-0.5,0.5h-1.4c-0.3,0-0.5-0.2-0.5-0.5v-2.4
+		c0-0.3-0.2-0.5-0.5-0.5h-2.4c-0.3,0-0.5-0.2-0.5-0.5V23c0-0.3,0.2-0.5,0.5-0.5h2.4c0.3,0,0.5-0.2,0.5-0.5v-2.6
+		c0-0.3,0.2-0.5,0.5-0.5H25c0.3,0,0.5,0.2,0.5,0.5V22c0,0.3,0.2,0.5,0.5,0.5h2.6c0.3,0,0.5,0.2,0.5,0.5v1.4
+		C29,24.7,28.8,24.9,28.5,24.9z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GameStateBase_16.svg b/Content/Slate/Starship/AssetIcons/GameStateBase_16.svg
new file mode 100644
index 0000000..507d68e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GameStateBase_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 15.9999C6.2 13.9999 8 14.4999 8 14.4999C8 14.4999 9.8 13.9999 13.5 15.9999C9.8 15.9999 6.2 15.9999 2.5 15.9999Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+<path opacity="0.5" d="M2.5 9.5L6 4.44L10 8.76L13.5 3.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M7.06066 4.56066L6 3.5L4.93934 4.56066L6 5.62132L7.06066 4.56066Z" fill="white"/>
+<path d="M11.0607 8.56066L10 7.5L8.93934 8.56066L10 9.62132L11.0607 8.56066Z" fill="white"/>
+<path d="M14.5607 3.56066L13.5 2.5L12.4393 3.56066L13.5 4.62132L14.5607 3.56066Z" fill="white"/>
+<path d="M3.56066 9.56066L2.5 8.5L1.43934 9.56066L2.5 10.6213L3.56066 9.56066Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GameStateBase_64.svg b/Content/Slate/Starship/AssetIcons/GameStateBase_64.svg
new file mode 100644
index 0000000..10197ea
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GameStateBase_64.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="GameStateBase_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#5B5B5B;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#7F7F7F;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:none;stroke:url(#SVGID_4_);stroke-width:2;stroke-miterlimit:10;}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st10{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
+	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<g>
+		<rect x="26.8" y="45.6" class="st1" width="9.8" height="7.6"/>
+		<path class="st2" d="M24.1,42c0,2.7,3.4,4.8,7.7,4.8s7.7-2.2,7.7-4.8H24.1z"/>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.8915" y1="9.8377" x2="31.8915" y2="41.8309">
+			<stop  offset="0" style="stop-color:#333333"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<rect x="9.4" y="9.4" class="st3" width="45" height="32.6"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.872" y1="44.4242" x2="31.872" y2="6.9955">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st4" d="M53.7,11.1v29.2c0,0.5-0.4,1-1,1H11c-0.5,0-1-0.4-1-1V11.1c0-0.5,0.4-1,1-1h41.7
+			C53.3,10.1,53.7,10.6,53.7,11.1z M55.8,7H7.9c-0.5,0-1,0.4-1,1v35.4c0,0.5,0.4,1,1,1h47.9c0.5,0,1-0.4,1-1V8
+			C56.8,7.4,56.4,7,55.8,7z"/>
+		<path class="st5" d="M46.3,57c0-2.7-6.5-5.1-14.5-5.1S17.2,54.3,17.2,57H46.3z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.7439" y1="57.5463" x2="31.7439" y2="52.7146">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st6" d="M46.3,57.4c0.3-2.8-6.5-4.8-14.5-4.8c-8,0-14.8,2.1-14.5,4.8H46.3z"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="14.6793" y1="25.3393" x2="48.8243" y2="25.3393">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<polyline class="st7" points="15.5,34.8 26.3,19.7 37.5,31.4 48,15.9 	"/>
+	<radialGradient id="SVGID_5_" cx="15.4918" cy="34.8016" r="2.4981" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</radialGradient>
+	<circle class="st8" cx="15.5" cy="34.8" r="2.5"/>
+	<radialGradient id="SVGID_6_" cx="26.3265" cy="19.7014" r="2.4981" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</radialGradient>
+	<circle class="st9" cx="26.3" cy="19.7" r="2.5"/>
+	<radialGradient id="SVGID_7_" cx="37.1613" cy="31.149" r="2.4981" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</radialGradient>
+	<circle class="st10" cx="37.2" cy="31.1" r="2.5"/>
+	<radialGradient id="SVGID_8_" cx="47.996" cy="15.8543" r="2.4981" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</radialGradient>
+	<circle class="st11" cx="48" cy="15.9" r="2.5"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GeometryCollection_16.svg b/Content/Slate/Starship/AssetIcons/GeometryCollection_16.svg
new file mode 100644
index 0000000..56a2e82
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GeometryCollection_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8 8.10039L5 6.20039V2.40039L8 4.30039V8.10039Z" fill="white"/>
+<path opacity="0.5" d="M9 8.10039L12 6.20039V2.40039L9 4.30039V8.10039Z" fill="white"/>
+<path d="M8.4998 3.2L5.2998 1.3L8.4998 0L11.6998 1.3L8.4998 3.2Z" fill="white"/>
+<path opacity="0.5" d="M4 16.0008L1 14.1008V10.3008L4 12.2008V16.0008Z" fill="white"/>
+<path opacity="0.5" d="M5 16.0008L8 14.1008V10.3008L5 12.2008V16.0008Z" fill="white"/>
+<path d="M4.4998 11.1004L1.2998 9.20039L4.4998 7.90039L7.6998 9.20039L4.4998 11.1004Z" fill="white"/>
+<path opacity="0.5" d="M12 16.0008L9 14.1008V10.3008L12 12.2008V16.0008Z" fill="white"/>
+<path opacity="0.5" d="M13 16.0008L16 14.1008V10.3008L13 12.2008V16.0008Z" fill="white"/>
+<path d="M12.4998 11.1004L9.2998 9.20039L12.4998 7.90039L15.6998 9.20039L12.4998 11.1004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GeometryCollection_64.svg b/Content/Slate/Starship/AssetIcons/GeometryCollection_64.svg
new file mode 100644
index 0000000..8afeab9
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GeometryCollection_64.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="GeometryCollection_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_3_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st5{fill:url(#SVGID_5_);enable-background:new    ;}
+	.st6{fill:url(#SVGID_6_);enable-background:new    ;}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="7.5125" y1="44.0528" x2="19.0707" y2="44.0528">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st0" d="M19.1,55L7.5,47.7V33.1L19.1,39V55z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="19.0707" y1="44.0528" x2="30.6289" y2="44.0528">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<path class="st1" d="M19.1,55l11.6-7.3V33.1L19.1,39V55z"/>
+		<path class="st2" d="M19.1,39L7.5,33.1l11.6-4.9l11.6,4.9L19.1,39z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.8092" y1="44.0528" x2="43.3674" y2="44.0528">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st3" d="M43.4,55l-11.6-7.3V33.1L43.4,39V55z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="43.3674" y1="44.0528" x2="54.9256" y2="44.0528">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<path class="st4" d="M43.4,55l11.6-7.3V33.1L43.4,39V55z"/>
+		<path class="st2" d="M43.4,39l-11.6-5.9l11.6-4.9l11.6,4.9L43.4,39z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="19.4972" y1="22.2394" x2="31.0554" y2="22.2394">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st5" d="M31.1,31.9l-11.6-4.8V12.5l11.6,4.1V31.9z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="31.0554" y1="22.2394" x2="42.6136" y2="22.2394">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<path class="st6" d="M31.1,31.9l11.6-4.8V12.5l-11.6,4.1V31.9z"/>
+		<path class="st2" d="M31.1,16.6l-11.6-4.1L31.1,9l11.6,3.6L31.1,16.6z"/>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GroupActor_16.svg b/Content/Slate/Starship/AssetIcons/GroupActor_16.svg
new file mode 100644
index 0000000..5ac8f1f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GroupActor_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 12C6.10457 12 7 11.1046 7 10C7 8.89543 6.10457 8 5 8C3.89543 8 3 8.89543 3 10C3 11.1046 3.89543 12 5 12Z" fill="white"/>
+<path d="M11 12C12.1046 12 13 11.1046 13 10C13 8.89543 12.1046 8 11 8C9.89543 8 9 8.89543 9 10C9 11.1046 9.89543 12 11 12Z" fill="white"/>
+<path d="M8 7C9.10457 7 10 6.10457 10 5C10 3.89543 9.10457 3 8 3C6.89543 3 6 3.89543 6 5C6 6.10457 6.89543 7 8 7Z" fill="white"/>
+<path d="M8 1C11.9 1 15 4.1 15 8C15 11.9 11.9 15 8 15C4.1 15 1 11.9 1 8C1 4.1 4.1 1 8 1ZM8 0C3.6 0 0 3.6 0 8C0 12.4 3.6 16 8 16C12.4 16 16 12.4 16 8C16 3.6 12.4 0 8 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/GroupActor_64.svg b/Content/Slate/Starship/AssetIcons/GroupActor_64.svg
new file mode 100644
index 0000000..c4e675a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/GroupActor_64.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="GroupActor_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#B2B2B2;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M32,8.2c13.3,0,23.8,10.6,23.8,23.8S45.3,55.8,32,55.8S8.2,45.3,8.2,32S18.7,8.2,32,8.2z M32,4.8
+		C17,4.8,4.8,17,4.8,32S17,59.2,32,59.2S59.2,47,59.2,32S47,4.8,32,4.8z"/>
+	<radialGradient id="SVGID_1_" cx="33.9168" cy="18.7661" r="10.1005" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st1" d="M32.3,28.9c3.9,0,7.1-3.2,7.1-7.1s-3.2-7.1-7.1-7.1s-7.1,3.2-7.1,7.1S28.4,28.9,32.3,28.9z"/>
+	<radialGradient id="SVGID_2_" cx="43.8453" cy="35.7951" r="10.1005" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st2" d="M42.2,45.9c3.9,0,7.1-3.2,7.1-7.1s-3.2-7.1-7.1-7.1s-7.1,3.2-7.1,7.1S38.3,45.9,42.2,45.9z"/>
+	<radialGradient id="SVGID_3_" cx="23.4106" cy="35.7951" r="10.1005" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st3" d="M21.8,45.9c3.9,0,7.1-3.2,7.1-7.1s-3.2-7.1-7.1-7.1s-7.1,3.2-7.1,7.1S17.9,45.9,21.8,45.9z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/HUD_16.svg b/Content/Slate/Starship/AssetIcons/HUD_16.svg
new file mode 100644
index 0000000..003eb83
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/HUD_16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 15.9999C6.2 13.9999 8 14.4999 8 14.4999C8 14.4999 9.8 13.9999 13.5 15.9999C9.8 15.9999 6.2 15.9999 2.5 15.9999Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+<path d="M7.4999 8.09985C8.38356 8.09985 9.0999 7.38353 9.0999 6.49988C9.0999 5.61622 8.38356 4.8999 7.4999 4.8999C6.61625 4.8999 5.8999 5.61622 5.8999 6.49988C5.8999 7.38353 6.61625 8.09985 7.4999 8.09985Z" fill="white"/>
+<path opacity="0.5" d="M12 6H8V2H7V6H3V7H7V11H8V7H12V6Z" fill="white"/>
+<path opacity="0.5" d="M7.00005 10.2V9.20001C5.90005 9.00001 5.00005 8.1 4.80005 7H3.80005C4.00005 8.7 5.30005 10 7.00005 10.2Z" fill="white"/>
+<path opacity="0.5" d="M3.80005 6.00006H4.80005C5.00005 4.90006 5.90005 4.00005 7.00005 3.80005V2.80005C5.30005 3.00005 4.00005 4.30006 3.80005 6.00006Z" fill="white"/>
+<path opacity="0.5" d="M11.2 7H10.2C10 8.1 9.1 9.00001 8 9.20001V10.2C9.7 10 11 8.7 11.2 7Z" fill="white"/>
+<path opacity="0.5" d="M8 2.80005V3.80005C9.1 4.00005 10 4.90006 10.2 6.00006H11.2C11 4.30006 9.7 3.00005 8 2.80005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/HUD_64.svg b/Content/Slate/Starship/AssetIcons/HUD_64.svg
new file mode 100644
index 0000000..0ae26b4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/HUD_64.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#5B5B5B;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#7F7F7F;}
+	.st3{fill:url(#SVGID_1_);}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill:#CCCCCC;}
+	.st6{fill:#FFFFFF;}
+	.st7{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+</style>
+<g id="HUD_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<rect x="26.8" y="45.6" class="st1" width="9.8" height="7.6"/>
+		<path class="st2" d="M24.1,42c0,2.7,3.4,4.8,7.7,4.8s7.7-2.2,7.7-4.8H24.1z"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9" y1="199.8377" x2="31.9" y2="231.8309" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#333333"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<rect x="9.4" y="9.4" class="st3" width="45" height="32.6"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.85" y1="234.4" x2="31.85" y2="197" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st4" d="M53.7,11.1v29.2c0,0.5-0.4,1-1,1H11c-0.5,0-1-0.4-1-1V11.1c0-0.5,0.4-1,1-1h41.7
+			C53.3,10.1,53.7,10.6,53.7,11.1z M55.8,7H7.9c-0.5,0-1,0.4-1,1v35.4c0,0.5,0.4,1,1,1h47.9c0.5,0,1-0.4,1-1V8
+			C56.8,7.4,56.4,7,55.8,7z"/>
+		<g>
+			<path class="st5" d="M45.9,25.2H32.5V11.7h-1.1v13.5H17.9v1.1h13.5v13.5h1.1V26.3H46L45.9,25.2L45.9,25.2z"/>
+			<path class="st6" d="M31.9,29.1c1.9,0,3.4-1.5,3.4-3.4s-1.5-3.4-3.4-3.4s-3.4,1.5-3.4,3.4S30,29.1,31.9,29.1z"/>
+			<path class="st7" d="M30.3,37.3v-3.1c-3.4-0.6-6.2-3.4-6.9-6.9h-3.1C21,32.6,25,36.6,30.3,37.3z"/>
+			<path class="st7" d="M20.4,24.2h3.1c0.6-3.4,3.4-6.2,6.9-6.9v-3.1C25,14.8,21,18.8,20.4,24.2z"/>
+			<path class="st7" d="M43.4,27.3h-3.1c-0.6,3.4-3.4,6.2-6.9,6.9v3.1C38.8,36.6,42.8,32.6,43.4,27.3z"/>
+			<path class="st7" d="M33.5,14.2v3.1c3.4,0.6,6.2,3.4,6.9,6.9h3.1C42.8,18.8,38.8,14.8,33.5,14.2z"/>
+		</g>
+		<path class="st8" d="M46.3,57c0-2.7-6.5-5.1-14.5-5.1S17.2,54.3,17.2,57H46.3z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.8" y1="247.5463" x2="31.8" y2="242.7146" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st9" d="M46.3,57.4c0.3-2.8-6.5-4.8-14.5-4.8S17,54.7,17.3,57.4H46.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/HierarchicalInstancedStaticMeshComponent_16.svg b/Content/Slate/Starship/AssetIcons/HierarchicalInstancedStaticMeshComponent_16.svg
new file mode 100644
index 0000000..05c3fb3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/HierarchicalInstancedStaticMeshComponent_16.svg
@@ -0,0 +1,10 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 7.07367L3.78948 9.59999V6.44209L0 3.91577V7.07367Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1054 2.77881L4.42114 6.44197V9.59987L10.1054 5.4946V2.77881Z" fill="white"/>
+<path d="M6.06305 0L0.315674 3.09474L4.10515 5.62106L9.85252 1.89474L6.06305 0ZM6.06305 0.694737L8.58936 1.9579L6.50515 3.28421L4.16831 1.70526L6.06305 0.694737ZM1.51567 3.1579L3.53673 2.02105L5.93673 3.6L4.10515 4.86316L1.51567 3.1579Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M6 13.0737L9.78948 15.6V12.4421L6 9.91577V13.0737Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16.1054 8.77881L10.4211 12.442V15.5999L16.1054 11.4946V8.77881Z" fill="white"/>
+<path opacity="0.5" d="M12.063 6L6.31567 9.09474L10.1052 11.6211L15.8525 7.89474L12.063 6ZM12.063 6.69474L14.5894 7.9579L12.5052 9.28421L10.1683 7.70526L12.063 6.69474ZM7.51567 9.1579L9.53673 8.02105L11.9367 9.6L10.1052 10.8632L7.51567 9.1579Z" fill="white"/>
+<rect opacity="0.5" x="1" y="10" width="1" height="5" fill="white"/>
+<rect opacity="0.5" x="5" y="14" width="1" height="3" transform="rotate(90 5 14)" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/HierarchicalInstancedStaticMeshComponent_64.svg b/Content/Slate/Starship/AssetIcons/HierarchicalInstancedStaticMeshComponent_64.svg
new file mode 100644
index 0000000..d0ec71a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/HierarchicalInstancedStaticMeshComponent_64.svg
@@ -0,0 +1,90 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.8 16.1L25.3 20.6L17.8 21.8V9L28.8 16.1Z" fill="url(#paint0_linear)"/>
+<path d="M27.6 4.3999V15.0999L19.3 10.0999L17.6 9.3999L27.6 4.3999Z" fill="url(#paint1_linear)"/>
+<path d="M38.2999 10.9L34 14.7L27.2 14.3L27.2999 3.80005L38.2999 10.9Z" fill="url(#paint2_linear)"/>
+<path d="M17.9 9V27.1L5.59998 17.8L7.09998 14.3L17.9 9Z" fill="url(#paint3_linear)"/>
+<path d="M30.1 17.6L17.1 9.50005L18.5 7.30005L31.8 15.3L30.1 17.6Z" fill="url(#paint4_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.89996 26.6L19.4 38V25.1L3.89996 14.8V26.6Z" fill="url(#paint5_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.5 10.1001L19.3 25.1001V38.0001L42.5 21.5001V10.1001Z" fill="url(#paint6_linear)"/>
+<path d="M27.3 5.00005L37.4 10.3L19.5 21.3L9.39996 14.6L27.3 5.00005ZM27.2 2.80005L3.89996 14.8L19.3 25.1L42.5 10.1L27.2 2.80005Z" fill="url(#paint7_linear)"/>
+<path d="M48.1 39.2999L44.7 43.7999L37.1 45L37.2 32.2L48.1 39.2999Z" fill="url(#paint8_linear)"/>
+<path d="M46.9 27.6001V38.2001L38.6 33.3001L37 32.6001L46.9 27.6001Z" fill="url(#paint9_linear)"/>
+<path d="M57.6 34.1L53.3 37.9L46.6 37.5L46.7 27L57.6 34.1Z" fill="url(#paint10_linear)"/>
+<path d="M37.3 32.2V50.2999L25 41L26.5 37.5L37.3 32.2Z" fill="url(#paint11_linear)"/>
+<path d="M49.5 40.8L36.5 32.7L37.9 30.5L51.2 38.4L49.5 40.8Z" fill="url(#paint12_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.2 49.7999L38.7 61.0999V48.1999L23.2 37.8999V49.7999Z" fill="url(#paint13_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M61.9 33.2L38.7 48.2V61.0999L61.9 44.5999V33.2Z" fill="url(#paint14_linear)"/>
+<path d="M46.5999 28.2L56.7 33.5L38.9 44.5L28.7 37.7L46.5999 28.2ZM46.5 26L23.2 38L38.5999 48.3L61.7999 33.3L46.5 26Z" fill="url(#paint15_linear)"/>
+<path opacity="0.35" d="M46.5 26L23.2 38V49.9L38.7 61.1L61.9 44.6V33.2L46.5 26ZM56.7 33.6L56.5999 33.5L56.7 33.6Z" fill="black"/>
+<path d="M8.79999 35.7V55.7999H24.5" stroke="url(#paint16_linear)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<defs>
+<linearGradient id="paint0_linear" x1="17.76" y1="15.4" x2="28.77" y2="15.4" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="17.61" y1="9.7199" x2="27.57" y2="9.7199" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="27.22" y1="9.26005" x2="38.2699" y2="9.26005" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="5.59998" y1="18.09" x2="17.94" y2="18.09" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="30.0366" y1="15.8654" x2="19.5566" y2="9.31545" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="16.7835" y1="19.3299" x2="8.96346" y2="30.0099" gradientUnits="userSpaceOnUse">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#333333"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="26.8454" y1="18.2934" x2="35.1654" y2="29.9034" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="25.344" y1="4.67115" x2="19.664" y2="25.3311" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#CCCCCC"/>
+</linearGradient>
+<linearGradient id="paint8_linear" x1="37.11" y1="38.58" x2="48.11" y2="38.58" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint9_linear" x1="36.95" y1="32.9051" x2="46.91" y2="32.9051" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint10_linear" x1="46.57" y1="32.45" x2="57.61" y2="32.45" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint11_linear" x1="24.95" y1="41.275" x2="37.28" y2="41.275" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint12_linear" x1="49.3805" y1="39.0491" x2="38.9105" y2="32.4991" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint13_linear" x1="36.1085" y1="42.4988" x2="28.2885" y2="53.1888" gradientUnits="userSpaceOnUse">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#333333"/>
+</linearGradient>
+<linearGradient id="paint14_linear" x1="46.192" y1="41.4757" x2="54.5019" y2="53.0956" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint15_linear" x1="44.6961" y1="27.8517" x2="39.0061" y2="48.5217" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#CCCCCC"/>
+</linearGradient>
+<linearGradient id="paint16_linear" x1="18.9385" y1="37.4323" x2="13.2467" y2="58.099" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#666666"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ImagePlate_16-1.svg b/Content/Slate/Starship/AssetIcons/ImagePlate_16-1.svg
new file mode 100644
index 0000000..1354bd6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ImagePlate_16-1.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 16L9.6 6.5L6 13L1 12.2L15 16Z" fill="white"/>
+<path d="M14 1.3V14.7L2 11.4V4.6L14 1.3ZM15 0L1 3.8V12.1L15 16V0Z" fill="white"/>
+<path d="M3.7998 6.69999C3.7998 7.59999 4.3998 8.29999 5.1998 8.29999C6.0998 8.29999 6.8998 7.49999 6.8998 6.49999C6.8998 5.49999 6.0998 4.69999 5.1998 4.89999C4.3998 4.99999 3.7998 5.79999 3.7998 6.69999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ImagePlate_16.svg b/Content/Slate/Starship/AssetIcons/ImagePlate_16.svg
new file mode 100644
index 0000000..1354bd6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ImagePlate_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 16L9.6 6.5L6 13L1 12.2L15 16Z" fill="white"/>
+<path d="M14 1.3V14.7L2 11.4V4.6L14 1.3ZM15 0L1 3.8V12.1L15 16V0Z" fill="white"/>
+<path d="M3.7998 6.69999C3.7998 7.59999 4.3998 8.29999 5.1998 8.29999C6.0998 8.29999 6.8998 7.49999 6.8998 6.49999C6.8998 5.49999 6.0998 4.69999 5.1998 4.89999C4.3998 4.99999 3.7998 5.79999 3.7998 6.69999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ImagePlate_64.svg b/Content/Slate/Starship/AssetIcons/ImagePlate_64.svg
new file mode 100644
index 0000000..36a5c61
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ImagePlate_64.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ImagePlate_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g id="Layer_77">
+	
+		<radialGradient id="SVGID_1_" cx="21.4322" cy="25.5806" r="38.5544" gradientTransform="matrix(1.0387 0 0 1 -2.1948 0)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.2589" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</radialGradient>
+	<polygon class="st1" points="7.7,19.3 53.4,7 53.4,56.1 6.8,45.2 	"/>
+</g>
+<path class="st2" d="M52.4,55.5L36.9,28c-0.5-0.8-1.8-0.8-2.3,0L23.6,47.4c-0.3,0.5-0.8,0.7-1.3,0.6L8.9,45.2l43.2,11.3
+	C53.3,56.8,52.9,56.4,52.4,55.5z"/>
+<g>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="23.1823" y1="38.4691" x2="41.3918" y2="58.5772">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<path class="st3" d="M53.8,56.7L37.5,29c-0.5-0.8-1.8-0.8-2.3,0l-8.4,19.6c-0.3,0.5-3.5,0.4-4.1,0.4L6.8,45.7l45.8,11.9
+		C53.8,57.8,54.4,57.7,53.8,56.7z"/>
+	<path class="st2" d="M51.8,9.4v45.5L8.1,43.9V19.7L51.8,9.4z M55.3,5L6,17.9v28.2L55.3,59V5z"/>
+	<path class="st2" d="M15.9,27.8c0,3.1,2.1,5.4,4.9,5.4c3.2,0,6-2.7,6-6.1s-2.8-5.8-6-5.4C18,22,15.9,24.7,15.9,27.8z"/>
+</g>
+<radialGradient id="SVGID_3_" cx="22.6569" cy="27.4048" r="8.6713" gradientTransform="matrix(1.0387 0 0 1 -2.1948 0)" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+</radialGradient>
+<path class="st4" d="M12.8,28c0,4.8,3.3,8.5,7.7,8.5c5,0,9.4-4.3,9.4-9.6s-4.4-9-9.4-8.5C16.1,18.9,12.8,23.2,12.8,28z"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/InstancedStaticMeshComponent_16.svg b/Content/Slate/Starship/AssetIcons/InstancedStaticMeshComponent_16.svg
new file mode 100644
index 0000000..53587ff
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/InstancedStaticMeshComponent_16.svg
@@ -0,0 +1,8 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 7.07367L3.78948 9.59999V6.44209L0 3.91577V7.07367Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1054 2.77881L4.42114 6.44197V9.59987L10.1054 5.4946V2.77881Z" fill="white"/>
+<path d="M6.06305 0L0.315674 3.09474L4.10515 5.62106L9.85252 1.89474L6.06305 0ZM6.06305 0.694737L8.58936 1.9579L6.50515 3.28421L4.16831 1.70526L6.06305 0.694737ZM1.51567 3.1579L3.53673 2.02105L5.93673 3.6L4.10515 4.86316L1.51567 3.1579Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M6 13.0737L9.78948 15.6V12.4421L6 9.91577V13.0737Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16.1054 8.77881L10.4211 12.442V15.5999L16.1054 11.4946V8.77881Z" fill="white"/>
+<path opacity="0.5" d="M12.063 6L6.31567 9.09474L10.1052 11.6211L15.8525 7.89474L12.063 6ZM12.063 6.69474L14.5894 7.9579L12.5052 9.28421L10.1683 7.70526L12.063 6.69474ZM7.51567 9.1579L9.53673 8.02105L11.9367 9.6L10.1052 10.8632L7.51567 9.1579Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/InstancedStaticMeshComponent_64.svg b/Content/Slate/Starship/AssetIcons/InstancedStaticMeshComponent_64.svg
new file mode 100644
index 0000000..3acf48d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/InstancedStaticMeshComponent_64.svg
@@ -0,0 +1,85 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.8 16.1L25.3 20.6L17.8 21.8V9L28.8 16.1Z" fill="url(#paint0_linear)"/>
+<path d="M27.6 4.3999V15.0999L19.3 10.0999L17.6 9.3999L27.6 4.3999Z" fill="url(#paint1_linear)"/>
+<path d="M38.2999 10.9L34 14.7L27.2 14.3L27.2999 3.80005L38.2999 10.9Z" fill="url(#paint2_linear)"/>
+<path d="M17.9 9V27.1L5.59998 17.8L7.09998 14.3L17.9 9Z" fill="url(#paint3_linear)"/>
+<path d="M30.1 17.6L17.1 9.50005L18.5 7.30005L31.8 15.3L30.1 17.6Z" fill="url(#paint4_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.89996 26.6L19.4 38V25.1L3.89996 14.8V26.6Z" fill="url(#paint5_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M42.5 10.1001L19.3 25.1001V38.0001L42.5 21.5001V10.1001Z" fill="url(#paint6_linear)"/>
+<path d="M27.3 5.00005L37.4 10.3L19.5 21.3L9.39996 14.6L27.3 5.00005ZM27.2 2.80005L3.89996 14.8L19.3 25.1L42.5 10.1L27.2 2.80005Z" fill="url(#paint7_linear)"/>
+<path d="M48.1 39.2999L44.7 43.7999L37.1 45L37.2 32.2L48.1 39.2999Z" fill="url(#paint8_linear)"/>
+<path d="M46.9 27.6001V38.2001L38.6 33.3001L37 32.6001L46.9 27.6001Z" fill="url(#paint9_linear)"/>
+<path d="M57.6 34.1L53.3 37.9L46.6 37.5L46.7 27L57.6 34.1Z" fill="url(#paint10_linear)"/>
+<path d="M37.3 32.2V50.2999L25 41L26.5 37.5L37.3 32.2Z" fill="url(#paint11_linear)"/>
+<path d="M49.5 40.8L36.5 32.7L37.9 30.5L51.2 38.4L49.5 40.8Z" fill="url(#paint12_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.2 49.7999L38.7 61.0999V48.1999L23.2 37.8999V49.7999Z" fill="url(#paint13_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M61.9 33.2L38.7 48.2V61.0999L61.9 44.5999V33.2Z" fill="url(#paint14_linear)"/>
+<path d="M46.5999 28.2L56.7 33.5L38.9 44.5L28.7 37.7L46.5999 28.2ZM46.5 26L23.2 38L38.5999 48.3L61.7999 33.3L46.5 26Z" fill="url(#paint15_linear)"/>
+<path opacity="0.35" d="M46.5 26L23.2 38V49.9L38.7 61.1L61.9 44.6V33.2L46.5 26ZM56.7 33.6L56.5999 33.5L56.7 33.6Z" fill="black"/>
+<defs>
+<linearGradient id="paint0_linear" x1="17.76" y1="15.4" x2="28.77" y2="15.4" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="17.61" y1="9.7199" x2="27.57" y2="9.7199" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="27.22" y1="9.26005" x2="38.2699" y2="9.26005" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="5.59998" y1="18.09" x2="17.94" y2="18.09" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="30.0366" y1="15.8654" x2="19.5566" y2="9.31545" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="16.7835" y1="19.3299" x2="8.96346" y2="30.0099" gradientUnits="userSpaceOnUse">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#333333"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="26.8454" y1="18.2934" x2="35.1654" y2="29.9034" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="25.344" y1="4.67115" x2="19.664" y2="25.3311" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#CCCCCC"/>
+</linearGradient>
+<linearGradient id="paint8_linear" x1="37.11" y1="38.58" x2="48.11" y2="38.58" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint9_linear" x1="36.95" y1="32.9051" x2="46.91" y2="32.9051" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint10_linear" x1="46.57" y1="32.45" x2="57.61" y2="32.45" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint11_linear" x1="24.95" y1="41.275" x2="37.28" y2="41.275" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint12_linear" x1="49.3805" y1="39.0491" x2="38.9105" y2="32.4991" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint13_linear" x1="36.1085" y1="42.4988" x2="28.2885" y2="53.1888" gradientUnits="userSpaceOnUse">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#333333"/>
+</linearGradient>
+<linearGradient id="paint14_linear" x1="46.192" y1="41.4757" x2="54.5019" y2="53.0956" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint15_linear" x1="44.6961" y1="27.8517" x2="39.0061" y2="48.5217" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#CCCCCC"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Interface_16.svg b/Content/Slate/Starship/AssetIcons/Interface_16.svg
new file mode 100644
index 0000000..8509683
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Interface_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.7 12.6L5.8 9.5L6.5 10.2L3.4 13.3L4.8 14.7L1 15L1.3 11.2L2.7 12.6Z" fill="white"/>
+<path d="M11.7 12.4L14.8 15.5L15.5 14.8L12.4 11.7L13.8 10.3L10 10L10.3 13.8L11.7 12.4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.2996 5.4C13.2996 5.2 13.3996 5 13.3996 4.9C13.3996 4.7 13.3996 4.5 13.2996 4.4L11.9996 4.2C11.8996 3.9 11.7996 3.6 11.6996 3.4L12.4996 2.3C12.2996 2 11.9996 1.8 11.6996 1.5L10.5996 2.3C10.2996 2.1 9.99961 2 9.69961 1.9L9.49961 0.6C9.39961 0.6 9.19961 0.5 8.99961 0.5C8.79961 0.5 8.59961 0.5 8.49961 0.6L8.29961 1.9C7.99961 2 7.69961 2.1 7.39961 2.3L6.39961 1.5C6.09961 1.7 5.79961 2 5.59961 2.2L6.39961 3.3C6.29961 3.6 6.09961 3.8 6.09961 4.1L4.69961 4.3C4.69961 4.5 4.59961 4.7 4.59961 4.8C4.59961 5 4.59961 5.2 4.69961 5.3L5.99961 5.5C6.09961 5.8 6.19961 6.1 6.29961 6.3L5.59961 7.5C5.79961 7.8 6.09961 8 6.39961 8.3L7.49961 7.5C7.69961 7.6 7.99961 7.7 8.29961 7.8L8.49961 9.1C8.69961 9.1 8.89961 9.2 8.99961 9.2C9.19961 9.2 9.39961 9.2 9.49961 9.1L9.69961 7.8C9.99961 7.7 10.2996 7.6 10.4996 7.5L11.5996 8.3C11.8996 8.1 12.0996 7.8 12.3996 7.5L11.5996 6.4C11.7996 6.1 11.8996 5.9 11.8996 5.6L13.2996 5.4ZM8.99961 6.8C7.99961 6.8 7.09961 6 7.09961 4.9C7.09961 3.8 7.99961 3 8.99961 3C9.99961 3 10.8996 3.8 10.8996 4.9C10.8996 5.9 9.99961 6.8 8.99961 6.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Interface_64.svg b/Content/Slate/Starship/AssetIcons/Interface_64.svg
new file mode 100644
index 0000000..8cab6a6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Interface_64.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Interface_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{opacity:0.3;}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:none;}
+</style>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="87.5287" y1="12.0986" x2="58.6539" y2="11.9757" gradientTransform="matrix(-0.7005 0.7137 -0.7137 -0.7005 80.6571 -0.2943)">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#7E7E7E"/>
+	</linearGradient>
+	<path class="st0" d="M9.7,55.2l11-2.8c0.3-0.1,0.4-0.4,0.2-0.6l-2.4-2.3c-0.1-0.1-0.1-0.4,0-0.5l9.3-9.6c0.1-0.1,0.1-0.4,0-0.5
+		l-2.6-2.5c-0.1-0.1-0.4-0.1-0.5,0l-9.3,9.6c-0.1,0.1-0.4,0.1-0.5,0l-2.4-2.3c-0.2-0.2-0.5-0.1-0.6,0.2l-2.6,11
+		C9.2,55,9.5,55.3,9.7,55.2z"/>
+	
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="127.513" y1="35.4543" x2="98.6381" y2="35.3314" gradientTransform="matrix(-0.7137 -0.7005 0.7005 -0.7137 102.1438 152.6376)">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#7E7E7E"/>
+	</linearGradient>
+	<path class="st1" d="M34.5,37l2.8,11c0.1,0.3,0.4,0.4,0.6,0.2l2.3-2.4c0.1-0.1,0.4-0.1,0.5,0l9.6,9.3c0.1,0.1,0.4,0.1,0.5,0
+		l2.5-2.6c0.1-0.1,0.1-0.4,0-0.5l-9.6-9.3c-0.1-0.1-0.1-0.4,0-0.5l2.3-2.4c0.2-0.2,0.1-0.5-0.2-0.6l-11-2.6
+		C34.7,36.5,34.4,36.8,34.5,37z"/>
+	<g>
+		<g class="st2">
+			<path d="M30.8,31.6c-4.8,0-8.7-3.9-8.7-8.7s3.9-8.7,8.7-8.7s8.7,3.9,8.7,8.7S35.6,31.6,30.8,31.6z M30.8,17.6
+				c-2.9,0-5.3,2.4-5.3,5.3c0,2.9,2.4,5.3,5.3,5.3s5.3-2.4,5.3-5.3C36.1,20,33.7,17.6,30.8,17.6z"/>
+			<polygon points="32.9,15.4 28.7,15.4 29.5,10 32.1,10 			"/>
+			<polygon points="28.7,31.1 32.9,31.1 32.1,36.5 29.5,36.5 			"/>
+			<polygon points="38.6,25.4 38.6,21.1 44,22 44,24.5 			"/>
+			<polygon points="22.9,21.1 22.9,25.4 17.6,24.5 17.6,22 			"/>
+			<polygon points="37.8,18.9 34.8,15.9 39.2,12.7 41,14.5 			"/>
+			<polygon points="23.7,27 26.7,30 22.4,33.2 20.5,31.4 			"/>
+			<polygon points="34.8,30 37.8,27 41,31.4 39.2,33.2 			"/>
+			<polygon points="26.7,15.9 23.7,18.9 20.5,14.5 22.4,12.7 			"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="30.3844" y1="35.2401" x2="31.1892" y2="8.7736">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st3" d="M44,23.3v-2.6L39.3,20c-0.2-1-0.6-1.9-1.1-2.8l2.9-3.9l-1.8-1.8l-3.9,2.9c-0.8-0.5-1.6-0.8-2.5-1l-0.7-4.5
+			h-2.6l-0.7,4.5c-0.9,0.2-1.8,0.6-2.5,1l-3.9-2.9l-1.8,1.8l2.9,3.9c-0.5,0.8-0.9,1.8-1.1,2.8l-4.7,0.7v2.6l4.9,0.8
+			c0.2,0.8,0.5,1.5,0.9,2.2l-2.9,3.9l1.8,1.8l3.9-2.9c0.7,0.5,1.6,0.8,2.4,1l0.8,5.1h2.6l0.8-5.1c0.9-0.2,1.7-0.6,2.4-1l3.9,2.9
+			l1.8-1.8l-2.9-3.9c0.4-0.7,0.7-1.4,0.9-2.2L44,23.3z M30.8,27c-2.9,0-5.3-2.4-5.3-5.3c0-2.9,2.4-5.3,5.3-5.3s5.3,2.4,5.3,5.3
+			C36.1,24.7,33.7,27,30.8,27z"/>
+	</g>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/InterpData_16.svg b/Content/Slate/Starship/AssetIcons/InterpData_16.svg
new file mode 100644
index 0000000..45338ea
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/InterpData_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 8H16V16H1V8Z" fill="white"/>
+<path d="M15 9V15H2V9H15ZM16 8H1V16H16V8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3002 0.900391L10.3002 1.70039L10.2002 4.10039L12.3002 3.30039V0.900391Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.2002 2.09961L7.2002 2.89961V5.29961L9.2002 4.49961V2.09961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.09961 6.50078L6.09961 5.70078L6.19961 3.30078L4.09961 4.10078V6.50078Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4008 0.5L13.3008 2.9L15.4008 2.1L14.6008 0L13.4008 0.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.1002 4.5L0.200195 5.6L1.0002 7.7L3.1002 6.9V4.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/KillZVolume_16.svg b/Content/Slate/Starship/AssetIcons/KillZVolume_16.svg
new file mode 100644
index 0000000..d0b348f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/KillZVolume_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.49952 5C5.29952 5 3.99952 5.8 3.99952 8C3.99952 8.3 3.89952 10.7 3.99952 11H5.19952C5.59952 11 5.99952 11.4 5.99952 11.8V12.7C6.49952 12.9 6.99952 13 7.49952 13C7.99952 13 8.49952 12.9 8.99952 12.7V11.8C8.99952 11.4 9.39952 11 9.79952 11H10.9995C11.0995 10.7 10.9995 8.3 10.9995 8C10.9995 5.8 9.69952 5 7.49952 5ZM5.89952 10H4.99952V8H6.99952V8.90002C6.99952 9.50002 6.49952 10 5.89952 10ZM9.99952 10H9.09952C8.49952 10 7.99952 9.50002 7.99952 8.90002V8H9.99952V10ZM7.99952 11H6.99952L7.49952 10L7.99952 11Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/KillZVolume_64.svg b/Content/Slate/Starship/AssetIcons/KillZVolume_64.svg
new file mode 100644
index 0000000..c8b9edd
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/KillZVolume_64.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="KillZVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st6{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<path class="st5" d="M27.4,24.3c-6.9,0-10.9,2.5-10.9,9.4c0,0.6-0.1,4.3-0.1,6.8c0,1.4,1.1,2.5,2.5,2.5l1.4,0
+			c1.4,0,2.5,1.1,2.5,2.5v2.3c0,0.3,0.2,0.6,0.5,0.7c1.4,0.5,2.8,0.8,4.2,0.8c1.4,0,2.8-0.3,4.2-0.8c0.3-0.1,0.5-0.4,0.5-0.7v-2.3
+			c0-1.4,1.1-2.5,2.5-2.5l1.4,0c1.4,0,2.5-1.1,2.5-2.5c0-2.6-0.1-6.2-0.1-6.8C38.4,26.8,34.3,24.3,27.4,24.3z M22.5,39.9h-1.2
+			c-0.9,0-1.6-0.7-1.6-1.6v-3.1c0-0.9,0.7-1.6,1.6-1.6h3.1c0.9,0,1.6,0.7,1.6,1.6v1.2C25.9,38.4,24.3,39.9,22.5,39.9z M33.6,39.9
+			h-1.2c-1.9,0-3.4-1.5-3.4-3.4v-1.2c0-0.9,0.7-1.6,1.6-1.6h3.1c0.9,0,1.6,0.7,1.6,1.6v3.1C35.2,39.2,34.5,39.9,33.6,39.9z
+			 M28.3,44.1h-1.8c-0.3,0-0.5-0.5-0.4-0.9l0.7-2.2c0.2-0.5,0.9-0.5,1.1,0l0.7,2.2C28.8,43.6,28.6,44.1,28.3,44.1z"/>
+	</g>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Landscape_16.svg b/Content/Slate/Starship/AssetIcons/Landscape_16.svg
new file mode 100644
index 0000000..3a5f05e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Landscape_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0002 16.0002L11.6002 6.2002L8.4002 13.6002L6.0002 10.4002L3.2002 16.0002H16.0002Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M6 1.2002L0 14.0002H2.4L6 8.00018L8 10.8002L9.4 7.60016L6 1.2002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Landscape_64.svg b/Content/Slate/Starship/AssetIcons/Landscape_64.svg
new file mode 100644
index 0000000..ea2439e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Landscape_64.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{opacity:0.75;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st5{opacity:0.71;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
+</style>
+<g id="Landscape_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="22.4429" y1="196.2435" x2="22.8219" y2="238.8863" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.2727" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#404040"/>
+		</linearGradient>
+		<path class="st1" d="M25.7,7.2L5.9,49.4h12.9L25.1,37L33,47.5l6.6-15.3L25.7,7.2z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="36.6566" y1="212.4433" x2="36.9484" y2="245.2696" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st2" d="M15.8,55.5L25.1,37L33,47.5l10.6-24.4l14.5,32.3L15.8,55.5L15.8,55.5z"/>
+		<polygon class="st3" points="25.7,7.2 21.2,16.8 25.5,18.7 27.3,15.7 31.1,16.8 		"/>
+		<polygon class="st4" points="43.5,23.1 39.1,33.4 42.6,31.4 45.5,33.8 47.3,31.4 		"/>
+		<polygon class="st4" points="25.1,37 22,43.1 24.8,41.9 26.7,43.8 28.8,41.9 		"/>
+		<polygon class="st5" points="27.5,42 33.2,51 41.6,31.2 41.1,28.8 33,47.5 27.6,40.4 		"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelBounds_16.svg b/Content/Slate/Starship/AssetIcons/LevelBounds_16.svg
new file mode 100644
index 0000000..bd387d3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelBounds_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 14L13.5 9.09998L16 14V16H0V14L2.5 9L1 14H15Z" fill="white"/>
+<path d="M8.5 11.5L6 3L3 13H13L10.5 6.59998L8.5 11.5Z" fill="white"/>
+<path d="M0 0V9L1 7V1H15V7L16 9V0H0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelBounds_64.svg b/Content/Slate/Starship/AssetIcons/LevelBounds_64.svg
new file mode 100644
index 0000000..5dddb2d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelBounds_64.svg
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{opacity:0.71;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st7{fill:#FFFFFF;}
+</style>
+<g id="LevelBounds_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.7023" y1="242.2545" x2="31.5977" y2="200.8454" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#333333"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<rect x="10" y="10.9" class="st1" width="43.3" height="41.3"/>
+		<g>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-1256.4434" y1="207.3325" x2="-1256.1969" y2="235.0627" gradientTransform="matrix(-1 0 0 1 -1224.4957 -190)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<path class="st2" d="M47.3,45.2L40,28.7l-5.3,9.9L26.9,18L16.1,45.2H47.3z"/>
+			<polygon class="st3" points="26.8,17.9 30.1,26.6 27.8,24.4 26.5,28.5 25.5,24.1 24.1,24.9 			"/>
+			<polygon class="st3" points="40,28.7 42.7,34.8 41.2,33.5 40.4,35.8 39.5,32.9 37.2,33.7 			"/>
+			<polygon class="st4" points="39.5,30.6 34.5,41.5 28.3,24.7 28.7,22.7 34.6,38.5 38.2,31.9 			"/>
+		</g>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.7059" y1="244.348" x2="31.6593" y2="225.8929" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0.3858" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#404040"/>
+		</linearGradient>
+		<path class="st5" d="M50.7,48.3L46.6,36l6.8,13.3v5.4H10v-5.4l6.8-13.5l-4.1,12.5H50.7z"/>
+		<rect x="10" y="49.3" class="st6" width="43.3" height="5.4"/>
+		<path class="st7" d="M10,8.8v24.4l2.7-5.4V11.6h37.9v16.2l2.7,5.4V8.8H10z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelInstancePivot_16.svg b/Content/Slate/Starship/AssetIcons/LevelInstancePivot_16.svg
new file mode 100644
index 0000000..b3b0f44
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelInstancePivot_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 5L7.5 2L10 5H5Z" fill="white"/>
+<path d="M5 12L7.5 15L10 12H5Z" fill="white"/>
+<path d="M11 6L14 8.5L11 11V6Z" fill="white"/>
+<path d="M4 6L1 8.5L4 11V6Z" fill="white"/>
+<path d="M7.5 4.5V12.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M3.5 8.5H11.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelInstancePivot_64.svg b/Content/Slate/Starship/AssetIcons/LevelInstancePivot_64.svg
new file mode 100644
index 0000000..b6fd5c4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelInstancePivot_64.svg
@@ -0,0 +1,39 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M53.3 8.90039H10V52.2004H53.3V8.90039Z" fill="url(#paint0_linear_9539_28027)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.3001 45.2L40.0001 28.7L34.7001 38.6L26.9001 18L16.1001 45.2H47.3001Z" fill="url(#paint1_linear_9539_28027)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.8001 17.9004L30.1001 26.6004L27.8001 24.4004L26.5001 28.5004L25.5001 24.1004L24.1001 24.9004L26.8001 17.9004Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M40.0002 28.7002L42.7002 34.8002L41.2002 33.5002L40.4002 35.8002L39.5002 32.9002L37.2002 33.7002L40.0002 28.7002Z" fill="white"/>
+<path opacity="0.71" fill-rule="evenodd" clip-rule="evenodd" d="M39.5003 30.6002L34.5003 41.5002L28.3003 24.7002L28.7003 22.7002L34.6003 38.5002L38.2003 31.9002L39.5003 30.6002Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M50.7 48.3008L46.6 36.0008L53.4 49.3008V54.7008H10V49.3008L16.8 35.8008L12.7 48.3008H50.7Z" fill="url(#paint2_linear_9539_28027)"/>
+<path d="M53.3 49.3008H10V54.7008H53.3V49.3008Z" fill="#BFBFBF"/>
+<path d="M53.8398 33.9902H32.1198C30.4354 33.9902 29.0698 35.3558 29.0698 37.0402V53.2002C29.0698 54.8847 30.4354 56.2502 32.1198 56.2502H53.8398C55.5243 56.2502 56.8898 54.8847 56.8898 53.2002V37.0402C56.8898 35.3558 55.5243 33.9902 53.8398 33.9902Z" fill="url(#paint3_linear_9539_28027)"/>
+<g clip-path="url(#clip0_9539_28027)">
+<path d="M51.0813 52.8853L46.7867 48.5909C47.2824 47.836 47.549 46.9538 47.5543 46.0508C47.5545 44.9976 47.1908 43.9767 46.5248 43.1608C45.8588 42.3449 44.9314 41.7842 43.8995 41.5736V36H42.0721V41.5736C41.0402 41.7842 40.1127 42.3449 39.4467 43.1608C38.7807 43.9767 38.417 44.9976 38.4173 46.0508C38.4226 46.9538 38.6892 47.836 39.1848 48.5909L35 52.7756L36.1147 53.9086L40.2995 49.7238C41.0769 50.3004 42.0179 50.6141 42.9858 50.6193C43.9537 50.6141 44.8946 50.3004 45.672 49.7238L49.9664 54L51.0813 52.8853ZM42.9858 49.5594C42.0552 49.5594 41.1628 49.1897 40.5048 48.5317C39.8468 47.8738 39.4771 46.9813 39.4771 46.0508C39.4771 45.1202 39.8468 44.2278 40.5048 43.5698C41.1628 42.9118 42.0552 42.5421 42.9858 42.5421C43.9163 42.5421 44.8088 42.9118 45.4668 43.5698C46.1248 44.2278 46.4945 45.1202 46.4945 46.0508C46.4945 46.9813 46.1248 47.8738 45.4668 48.5317C44.8088 49.1897 43.9163 49.5594 42.9858 49.5594Z" fill="url(#paint4_linear_9539_28027)"/>
+<path d="M42.9858 47.4218C43.7427 47.4218 44.3564 46.8082 44.3564 46.0512C44.3564 45.2943 43.7427 44.6807 42.9858 44.6807C42.2289 44.6807 41.6152 45.2943 41.6152 46.0512C41.6152 46.8082 42.2289 47.4218 42.9858 47.4218Z" fill="white"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear_9539_28027" x1="31.7585" y1="52.2756" x2="31.6489" y2="8.84999" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint1_linear_9539_28027" x1="31.9518" y1="17.3325" x2="31.7053" y2="45.0627" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint2_linear_9539_28027" x1="31.7096" y1="54.3488" x2="31.663" y2="35.8937" gradientUnits="userSpaceOnUse">
+<stop offset="0.3858" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#404040"/>
+</linearGradient>
+<linearGradient id="paint3_linear_9539_28027" x1="43.0798" y1="55.7802" x2="42.8698" y2="33.7002" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint4_linear_9539_28027" x1="43.0407" y1="54" x2="43.0407" y2="36" gradientUnits="userSpaceOnUse">
+<stop stop-color="#989898"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<clipPath id="clip0_9539_28027">
+<rect width="16.0812" height="18" fill="white" transform="translate(35 36)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelInstance_16.svg b/Content/Slate/Starship/AssetIcons/LevelInstance_16.svg
new file mode 100644
index 0000000..a2437a0
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelInstance_16.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><g id="LevelInstance"><path class="cls-1" d="M13.5,6.06,14,7h-.19ZM8,11H1L2.5,6,0,11v2H8Z"/><polygon class="cls-2" points="8 10 8 9 10 9 10 7 11.83 7 10.5 3.59 8.5 8.5 6 0 3 10 8 10"/><rect class="cls-2" x="9" y="10" width="5" height="5"/><polygon class="cls-1" points="11 8 11 9 15 9 15 13 16 13 16 8 11 8"/><rect class="cls-3" width="16" height="16" transform="translate(16 0) rotate(90)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/AssetIcons/LevelInstance_64.svg b/Content/Slate/Starship/AssetIcons/LevelInstance_64.svg
new file mode 100644
index 0000000..9bb1b13
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelInstance_64.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="LevelInstance_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{opacity:0.71;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);enable-background:new    ;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.7585" y1="52.2752" x2="31.6489" y2="8.8496">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<rect x="10" y="8.9" class="st1" width="43.3" height="43.3"/>
+	<g>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-876.4474" y1="17.3325" x2="-876.2009" y2="45.0627" gradientTransform="matrix(-1 0 0 1 -844.4957 0)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st2" d="M47.3,45.2L40,28.7l-5.3,9.9l-7.8-20.6L16.1,45.2H47.3z"/>
+		<polygon class="st3" points="26.8,17.9 30.1,26.6 27.8,24.4 26.5,28.5 25.5,24.1 24.1,24.9 		"/>
+		<polygon class="st3" points="40,28.7 42.7,34.8 41.2,33.5 40.4,35.8 39.5,32.9 37.2,33.7 		"/>
+		<polygon class="st4" points="39.5,30.6 34.5,41.5 28.3,24.7 28.7,22.7 34.6,38.5 38.2,31.9 		"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.7096" y1="54.348" x2="31.663" y2="35.8929">
+		<stop  offset="0.3858" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#404040"/>
+	</linearGradient>
+	<path class="st5" d="M50.7,48.3L46.6,36l6.8,13.3v5.4H10v-5.4l6.8-13.5l-4.1,12.5H50.7z"/>
+	<rect x="10" y="49.3" class="st6" width="43.3" height="5.4"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelScriptActor_16.svg b/Content/Slate/Starship/AssetIcons/LevelScriptActor_16.svg
new file mode 100644
index 0000000..35f378a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelScriptActor_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 14L13.5 9.09998L16 14V16H0V14L2.5 9L1 14H15Z" fill="white"/>
+<path d="M8.5 11.5L6 3L3 13H13L10.5 6.59998L8.5 11.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5004 0C11.5004 0 10.4004 0.399976 10.4004 1.59998C10.4004 2.89998 12.6004 3.1 12.6004 5C12.6004 6.3 11.8004 6.90002 11.8004 6.90002H15.0004C15.0004 6.90002 16.0004 6.3 16.0004 5C16.0004 3.1 13.8004 2.79998 13.8004 1.59998C13.8004 0.399976 14.7004 0 14.7004 0H11.5004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelScriptActor_64.svg b/Content/Slate/Starship/AssetIcons/LevelScriptActor_64.svg
new file mode 100644
index 0000000..2f4fcfa
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelScriptActor_64.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{opacity:0.71;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#4C4C4C;}
+</style>
+<g id="LevelScriptActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<g>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.7023" y1="242.2545" x2="31.5977" y2="200.8454" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#333333"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<rect x="10" y="10.9" class="st1" width="43.3" height="41.3"/>
+			<g>
+				
+					<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-1256.4434" y1="207.3325" x2="-1256.1969" y2="235.0627" gradientTransform="matrix(-1 0 0 1 -1224.4957 -190)">
+					<stop  offset="0" style="stop-color:#FFFFFF"/>
+					<stop  offset="1" style="stop-color:#999999"/>
+				</linearGradient>
+				<path class="st2" d="M47.3,45.2L40,28.7l-5.3,9.9L26.9,18L16.1,45.2H47.3z"/>
+				<polygon class="st3" points="26.8,17.9 30.1,26.6 27.8,24.4 26.5,28.5 25.5,24.1 24.1,24.9 				"/>
+				<polygon class="st3" points="40,28.7 42.7,34.8 41.2,33.5 40.4,35.8 39.5,32.9 37.2,33.7 				"/>
+				<polygon class="st4" points="39.5,30.6 34.5,41.5 28.3,24.7 28.7,22.7 34.6,38.5 38.2,31.9 				"/>
+			</g>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.7059" y1="244.348" x2="31.6593" y2="225.8929" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0.3858" style="stop-color:#E6E6E6"/>
+				<stop  offset="1" style="stop-color:#404040"/>
+			</linearGradient>
+			<path class="st5" d="M50.7,48.3L46.6,36l6.8,13.3v5.4H10v-5.4l6.8-13.5l-4.1,12.5H50.7z"/>
+			<rect x="10" y="49.3" class="st6" width="43.3" height="5.4"/>
+		</g>
+		<path class="st7" d="M42.6,12.3c0,0-2.2,0.8-2.2,3.2c0,2.6,4.4,3,4.4,6.8c0,2.6-1.6,3.8-1.6,3.8h6.4c0,0,2-1.2,2-3.8
+			c0-3.8-4.4-4.4-4.4-6.8s1.8-3.2,1.8-3.2L42.6,12.3z"/>
+		<path class="st3" d="M41.7,12.3c0,0-2.2,0.8-2.2,3.2c0,2.6,4.4,3,4.4,6.8c0,2.6-1.6,3.8-1.6,3.8h6.4c0,0,2-1.2,2-3.8
+			c0-3.8-4.4-4.4-4.4-6.8s1.8-3.2,1.8-3.2L41.7,12.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelSequenceActor_16.svg b/Content/Slate/Starship/AssetIcons/LevelSequenceActor_16.svg
new file mode 100644
index 0000000..15104d4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelSequenceActor_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 8H16V16H1V8Z" fill="white"/>
+<path d="M15 9V15H2V9H15ZM16 8H1V16H16V8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3002 0.900391L10.3002 1.70041L10.2002 4.1004L12.3002 3.30038V0.900391Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.2002 2.09961L7.2002 2.8996V5.29959L9.2002 4.4996V2.09961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.10059 6.49982L6.10059 5.69983L6.20059 3.2998L4.10059 4.09982V6.49982Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3998 0.5L13.2998 2.89999L15.3998 2.10001L14.5998 0L13.3998 0.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.1002 4.5L0.200195 5.60001L1.0002 7.70001L3.1002 6.89999V4.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelSequenceActor_64.svg b/Content/Slate/Starship/AssetIcons/LevelSequenceActor_64.svg
new file mode 100644
index 0000000..b32ba86
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelSequenceActor_64.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#7F7F7F;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_1_);stroke:#FFFFFF;stroke-miterlimit:10;}
+</style>
+<g id="LevelSequenceActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<path class="st1" d="M9.9,56.5h46.3c0.9,0,1.6-0.7,1.6-1.6v-22c0-0.9-0.7-1.6-1.6-1.6H9.9c-0.9,0-1.6,0.7-1.6,1.6v21.9
+			C8.3,55.7,9,56.5,9.9,56.5z"/>
+		<g>
+			<g>
+				<rect x="8.8" y="27" class="st1" width="48.6" height="6.7"/>
+				<path class="st2" d="M56.9,27.5v5.7H9.3v-5.7H56.9 M57.9,26.5H8.3v7.7h49.6L57.9,26.5L57.9,26.5z"/>
+			</g>
+			<polygon class="st2" points="18.8,33.7 12.5,33.7 16.6,26.9 22.9,26.9 			"/>
+			<polygon class="st2" points="30.1,33.7 23.8,33.7 27.9,26.9 34.2,26.9 			"/>
+			<polygon class="st2" points="41.4,33.7 35,33.7 39.1,26.9 45.5,26.9 			"/>
+			<polygon class="st2" points="53,33.7 46.6,33.7 50.7,26.9 57.1,26.9 			"/>
+		</g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="33.129" y1="227.7861" x2="33.0712" y2="242.8653" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#C2C2C2"/>
+		</linearGradient>
+		<path class="st3" d="M17.2,52.8H49c0.6,0,1.1-0.5,1.1-1.1V39c0-0.6-0.5-1.1-1.1-1.1H17.2c-0.6,0-1.1,0.5-1.1,1.1v12.7
+			C16,52.3,16.6,52.8,17.2,52.8z"/>
+		<g>
+			<g>
+				
+					<rect x="6.8" y="12.7" transform="matrix(0.9639 -0.2662 0.2662 0.9639 -3.1503 8.858)" class="st1" width="48.6" height="6.7"/>
+				<path class="st2" d="M53.3,7l1.5,5.5L8.9,25.1l-1.5-5.5L53.3,7 M54,5.7L6.2,18.9l2.1,7.4L56,13.2L54,5.7L54,5.7z"/>
+			</g>
+			<polygon class="st2" points="16.5,16.6 10.3,18.3 16.1,23.8 22.2,22.1 			"/>
+			<polygon class="st2" points="27.3,13.6 21.2,15.3 27,20.7 33.1,19.1 			"/>
+			<polygon class="st2" points="38.2,10.6 32.1,12.3 37.8,17.7 44,16.1 			"/>
+			<polygon class="st2" points="49.4,7.5 43.3,9.2 49,14.7 55.1,13 			"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelStreamingVolume_16.svg b/Content/Slate/Starship/AssetIcons/LevelStreamingVolume_16.svg
new file mode 100644
index 0000000..1220a26
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelStreamingVolume_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M11.4 11.9993L10.5 8.69922L12.1 11.7993V12.9993H2V11.7993L3.6 8.69922L2.7 12.0992H11.4V11.9993Z" fill="white"/>
+<path d="M7.30039 10.0997L5.80039 4.7998L3.90039 10.9998H10.1004L8.60039 6.99976L7.30039 10.0997Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LevelStreamingVolume_64.svg b/Content/Slate/Starship/AssetIcons/LevelStreamingVolume_64.svg
new file mode 100644
index 0000000..66d9207
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LevelStreamingVolume_64.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="LevelStreamingVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st7{opacity:0.71;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);enable-background:new    ;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st10{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.2,21.3 20.8,8.6 55.8,9.1 55.8,42.5 43.7,54.8 10,54.8 		"/>
+		<polyline class="st1" points="55.8,42.5 21.4,42.5 21.4,8.6 		"/>
+		<line class="st1" x1="22.3" y1="41.6" x2="8.9" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.6664" y1="8.5307" x2="32.9413" y2="53.6197">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54.1,8.6H21.2c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55.1,43c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.9,9,54.5,8.6,54.1,8.6z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.2566" y1="7.2465" x2="32.554" y2="56.0096">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.7,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.5,52.8c-0.1,0.1-0.2,0.1-0.3,0.1H11.5c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.5,10.4,53.7,10.5,53.7,10.7z M56.3,7.3H20.4
+				c-0.1,0-0.2,0-0.3,0.1L8.2,19.4c-0.1,0.1-0.1,0.2-0.1,0.3v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.7C56.7,7.5,56.5,7.3,56.3,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.4434" y1="20.5721" x2="55.5413" y2="8.4742">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.8" y1="9.1" x2="44.2" y2="19.9"/>
+	</g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-871.9898" y1="24.4043" x2="-871.8249" y2="42.9546" gradientTransform="matrix(-1 0 0 1 -844.4957 0)">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<path class="st5" d="M37.7,43.1L32.9,32l-3.6,6.6l-5.2-13.8l-7.2,18.3H37.7z"/>
+			<polygon class="st6" points="24.1,24.8 26.3,30.6 24.7,29.1 23.9,31.8 23.2,28.9 22.2,29.5 			"/>
+			<polygon class="st6" points="32.9,32 34.7,36.1 33.7,35.2 33.1,36.7 32.6,34.8 31,35.4 			"/>
+			<polygon class="st7" points="32.5,33.3 29.2,40.6 25.1,29.3 25.3,28 29.3,38.6 31.7,34.1 			"/>
+		</g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="27.3321" y1="49.166" x2="27.3009" y2="36.8204">
+			<stop  offset="0.3858" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#404040"/>
+		</linearGradient>
+		<path class="st8" d="M40,45.1l-2.7-8.2l4.5,8.9v3.6h-29v-3.6l4.5-9.1l-2.7,8.4H40z"/>
+		<rect x="12.8" y="45.8" class="st9" width="29" height="3.6"/>
+	</g>
+	<rect x="0" class="st10" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Level_16.svg b/Content/Slate/Starship/AssetIcons/Level_16.svg
new file mode 100644
index 0000000..d58772b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Level_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 13L13.5 8.1L16 13V15H0V13L2.5 8L1 13H15Z" fill="white"/>
+<path d="M8.5 10.5L6 2L3 12H13L10.5 5.6L8.5 10.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LightmassCharacterDetailIndirectVolume_16.svg b/Content/Slate/Starship/AssetIcons/LightmassCharacterDetailIndirectVolume_16.svg
new file mode 100644
index 0000000..328d0f5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LightmassCharacterDetailIndirectVolume_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M7.49961 9.89966C8.27281 9.89966 8.89961 9.27283 8.89961 8.49963C8.89961 7.72644 8.27281 7.09961 7.49961 7.09961C6.72641 7.09961 6.09961 7.72644 6.09961 8.49963C6.09961 9.27283 6.72641 9.89966 7.49961 9.89966Z" fill="white"/>
+<path d="M7.9002 4H7.2002V5.69995H7.9002V4Z" fill="white"/>
+<path d="M7.9002 11.2998H7.2002V12.9998H7.9002V11.2998Z" fill="white"/>
+<path d="M4.76562 8.83477V8.13477H3.06555V8.83477H4.76562Z" fill="white"/>
+<path d="M12.0352 8.86504V8.16504H10.3351V8.86504H12.0352Z" fill="white"/>
+<path d="M4.1811 4.81109L3.75684 5.23535L5.24181 6.72033L5.66607 6.29607L4.1811 4.81109Z" fill="white"/>
+<path d="M9.79926 10.3668L9.375 10.791L10.8599 12.2759L11.2842 11.8516L9.79926 10.3668Z" fill="white"/>
+<path d="M5.26323 10.3042L3.77832 11.7891L4.20256 12.2133L5.68747 10.7284L5.26323 10.3042Z" fill="white"/>
+<path d="M10.8511 4.69868L9.36621 6.18359L9.79045 6.60784L11.2754 5.12293L10.8511 4.69868Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LightmassCharacterDetailIndirectVolume_64.svg b/Content/Slate/Starship/AssetIcons/LightmassCharacterDetailIndirectVolume_64.svg
new file mode 100644
index 0000000..886958e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LightmassCharacterDetailIndirectVolume_64.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="LightmassCharacterDetailIndirectVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#404040;}
+	.st2{fill:none;stroke:#333333;stroke-width:2;stroke-miterlimit:10;}
+	.st3{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{fill:#FFFFFF;}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<polygon class="st1" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 	"/>
+	<polyline class="st2" points="55.7,42.4 21.4,42.4 21.4,8.5 	"/>
+	<line class="st2" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+			c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+			c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+			c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+			c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+		<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+		<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+	</linearGradient>
+	<line class="st5" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+</g>
+<g>
+	<radialGradient id="SVGID_4_" cx="27.3009" cy="36.4012" r="14.7268" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2;stop-opacity:0.7"/>
+		<stop  offset="1" style="stop-color:#B3B3B3;stop-opacity:0"/>
+	</radialGradient>
+	<circle class="st6" cx="27.3" cy="36.4" r="14.7"/>
+	<g>
+		<path class="st7" d="M27.3,40.5c2.2,0,4.1-1.8,4.1-4.1s-1.8-4.1-4.1-4.1s-4.1,1.8-4.1,4.1S25.1,40.5,27.3,40.5z"/>
+		<path class="st7" d="M28.3,23.1h-2v5.1h2V23.1z"/>
+		<path class="st7" d="M28.3,44.5h-2v5.1h2V44.5z"/>
+		<path class="st7" d="M19.3,37.5v-2h-5.1v2H19.3z"/>
+		<path class="st7" d="M40.6,37.3v-2h-5.1v2H40.6z"/>
+		<path class="st7" d="M17.7,25.4l-1.3,1.3l4.3,4.3l1.3-1.3L17.7,25.4z"/>
+		<path class="st7" d="M20.7,41.7l-4.3,4.3l1.3,1.3l4.3-4.3L20.7,41.7z"/>
+		<path class="st7" d="M36.9,25.4l-4.3,4.3l1.3,1.3l4.3-4.3L36.9,25.4z"/>
+	</g>
+	<path class="st7" d="M34.1,41.7L32.8,43l4.3,4.3l1.3-1.3L34.1,41.7z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LightmassImportanceVolume_16.svg b/Content/Slate/Starship/AssetIcons/LightmassImportanceVolume_16.svg
new file mode 100644
index 0000000..cc32971
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LightmassImportanceVolume_16.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.49961 9.89966C8.27281 9.89966 8.89961 9.27283 8.89961 8.49963C8.89961 7.72644 8.27281 7.09961 7.49961 7.09961C6.72641 7.09961 6.09961 7.72644 6.09961 8.49963C6.09961 9.27283 6.72641 9.89966 7.49961 9.89966Z" fill="white"/>
+<path d="M7.9002 4H7.2002V5.69995H7.9002V4Z" fill="white"/>
+<path d="M7.9002 11.2998H7.2002V12.9998H7.9002V11.2998Z" fill="white"/>
+<path d="M4.76562 8.83477V8.13477H3.06555V8.83477H4.76562Z" fill="white"/>
+<path d="M4.18012 4.81109L3.75586 5.23535L5.24084 6.72033L5.6651 6.29607L4.18012 4.81109Z" fill="white"/>
+<path d="M5.26323 10.3042L3.77832 11.7891L4.20256 12.2133L5.68747 10.7284L5.26323 10.3042Z" fill="white"/>
+<path d="M10 5C10 4.4 10.4 4 11 4C11.6 4 12 4.4 12 5V9C12 9.6 11.6 10 11 10C10.4 10 10 9.6 10 9V5Z" fill="white"/>
+<path d="M11.0004 13.1003C11.6079 13.1003 12.1004 12.6079 12.1004 12.0004C12.1004 11.3929 11.6079 10.9004 11.0004 10.9004C10.3929 10.9004 9.90039 11.3929 9.90039 12.0004C9.90039 12.6079 10.3929 13.1003 11.0004 13.1003Z" fill="white"/>
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LightmassImportanceVolume_64.svg b/Content/Slate/Starship/AssetIcons/LightmassImportanceVolume_64.svg
new file mode 100644
index 0000000..8f14335
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LightmassImportanceVolume_64.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="LightmassImportanceVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:#FFFFFF;}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<radialGradient id="SVGID_4_" cx="27.302" cy="36.4831" r="14.7268" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2;stop-opacity:0.7"/>
+			<stop  offset="1" style="stop-color:#B3B3B3;stop-opacity:0"/>
+		</radialGradient>
+		<circle class="st5" cx="27.3" cy="36.5" r="14.7"/>
+		<g>
+			<path class="st6" d="M27.3,40.5c2.2,0,4.1-1.8,4.1-4.1c0-2.2-1.8-4.1-4.1-4.1s-4.1,1.8-4.1,4.1C23.2,38.7,25.1,40.5,27.3,40.5z"
+				/>
+			<path class="st6" d="M28.3,23.2h-2v5.1h2V23.2z"/>
+			<path class="st6" d="M28.3,44.6h-2v5.1h2V44.6z"/>
+			<path class="st6" d="M19.3,37.6v-2h-5.1v2H19.3z"/>
+			<path class="st6" d="M17.7,25.4l-1.3,1.3l4.3,4.3l1.3-1.3L17.7,25.4z"/>
+			<path class="st6" d="M20.7,41.8l-4.3,4.3l1.3,1.3l4.3-4.3L20.7,41.8z"/>
+		</g>
+		<g>
+			<g>
+				<path class="st6" d="M34.5,44.9c0-1.9,1.3-3.1,3.1-3.1c1.8,0,3.1,1.3,3.1,3.1c0,1.8-1.2,3.1-3.1,3.1
+					C35.8,48,34.5,46.7,34.5,44.9z M35.6,40l-0.8-15.7h5.5L39.6,40H35.6z"/>
+			</g>
+		</g>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LightmassVolume_16.svg b/Content/Slate/Starship/AssetIcons/LightmassVolume_16.svg
new file mode 100644
index 0000000..328d0f5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LightmassVolume_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M7.49961 9.89966C8.27281 9.89966 8.89961 9.27283 8.89961 8.49963C8.89961 7.72644 8.27281 7.09961 7.49961 7.09961C6.72641 7.09961 6.09961 7.72644 6.09961 8.49963C6.09961 9.27283 6.72641 9.89966 7.49961 9.89966Z" fill="white"/>
+<path d="M7.9002 4H7.2002V5.69995H7.9002V4Z" fill="white"/>
+<path d="M7.9002 11.2998H7.2002V12.9998H7.9002V11.2998Z" fill="white"/>
+<path d="M4.76562 8.83477V8.13477H3.06555V8.83477H4.76562Z" fill="white"/>
+<path d="M12.0352 8.86504V8.16504H10.3351V8.86504H12.0352Z" fill="white"/>
+<path d="M4.1811 4.81109L3.75684 5.23535L5.24181 6.72033L5.66607 6.29607L4.1811 4.81109Z" fill="white"/>
+<path d="M9.79926 10.3668L9.375 10.791L10.8599 12.2759L11.2842 11.8516L9.79926 10.3668Z" fill="white"/>
+<path d="M5.26323 10.3042L3.77832 11.7891L4.20256 12.2133L5.68747 10.7284L5.26323 10.3042Z" fill="white"/>
+<path d="M10.8511 4.69868L9.36621 6.18359L9.79045 6.60784L11.2754 5.12293L10.8511 4.69868Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LightmassVolume_64.svg b/Content/Slate/Starship/AssetIcons/LightmassVolume_64.svg
new file mode 100644
index 0000000..886958e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LightmassVolume_64.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="LightmassCharacterDetailIndirectVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#404040;}
+	.st2{fill:none;stroke:#333333;stroke-width:2;stroke-miterlimit:10;}
+	.st3{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{fill:#FFFFFF;}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<polygon class="st1" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 	"/>
+	<polyline class="st2" points="55.7,42.4 21.4,42.4 21.4,8.5 	"/>
+	<line class="st2" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+			c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+			c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+			c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+			c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+		<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+		<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+	</linearGradient>
+	<line class="st5" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+</g>
+<g>
+	<radialGradient id="SVGID_4_" cx="27.3009" cy="36.4012" r="14.7268" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2;stop-opacity:0.7"/>
+		<stop  offset="1" style="stop-color:#B3B3B3;stop-opacity:0"/>
+	</radialGradient>
+	<circle class="st6" cx="27.3" cy="36.4" r="14.7"/>
+	<g>
+		<path class="st7" d="M27.3,40.5c2.2,0,4.1-1.8,4.1-4.1s-1.8-4.1-4.1-4.1s-4.1,1.8-4.1,4.1S25.1,40.5,27.3,40.5z"/>
+		<path class="st7" d="M28.3,23.1h-2v5.1h2V23.1z"/>
+		<path class="st7" d="M28.3,44.5h-2v5.1h2V44.5z"/>
+		<path class="st7" d="M19.3,37.5v-2h-5.1v2H19.3z"/>
+		<path class="st7" d="M40.6,37.3v-2h-5.1v2H40.6z"/>
+		<path class="st7" d="M17.7,25.4l-1.3,1.3l4.3,4.3l1.3-1.3L17.7,25.4z"/>
+		<path class="st7" d="M20.7,41.7l-4.3,4.3l1.3,1.3l4.3-4.3L20.7,41.7z"/>
+		<path class="st7" d="M36.9,25.4l-4.3,4.3l1.3,1.3l4.3-4.3L36.9,25.4z"/>
+	</g>
+	<path class="st7" d="M34.1,41.7L32.8,43l4.3,4.3l1.3-1.3L34.1,41.7z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LiveLinkPreset_16.svg b/Content/Slate/Starship/AssetIcons/LiveLinkPreset_16.svg
new file mode 100644
index 0000000..94dee29
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LiveLinkPreset_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 9C9.65685 9 11 7.65685 11 6C11 4.34315 9.65685 3 8 3C6.34315 3 5 4.34315 5 6C5 7.65685 6.34315 9 8 9Z" fill="white"/>
+<path opacity="0.5" d="M13.2998 0.699219L11.7998 2.19922C12.7998 3.19922 13.3998 4.49922 13.3998 5.99922C13.3998 7.49922 12.7998 8.79922 11.7998 9.79922L13.2998 11.2992C14.6998 9.89922 15.4998 8.09922 15.4998 5.99922C15.4998 3.89922 14.6998 2.09922 13.2998 0.699219Z" fill="white"/>
+<path opacity="0.5" d="M2.6 5.99922C2.6 4.49922 3.2 3.19922 4.2 2.19922L2.7 0.699219C1.3 2.09922 0.5 3.89922 0.5 5.99922C0.5 8.09922 1.3 9.89922 2.7 11.2992L4.2 9.79922C3.2 8.79922 2.6 7.49922 2.6 5.99922Z" fill="white"/>
+<path d="M9 10H7V16H9V10Z" fill="white"/>
+<path d="M16 13.2991C16 14.5991 14.5 14.6991 13.5 15.9991C12.5 14.5991 11 14.4991 11 13.2991C11 12.0991 12.5 11.4991 13.5 12.9991C14.5 11.4991 16 11.9991 16 13.2991Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/LiveLinkPreset_64.svg b/Content/Slate/Starship/AssetIcons/LiveLinkPreset_64.svg
new file mode 100644
index 0000000..2b3b0c7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/LiveLinkPreset_64.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="LiveLinkPreset_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<radialGradient id="SVGID_1_" cx="31.8989" cy="26.3105" r="13.5947" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0.3"/>
+		<stop  offset="1" style="stop-color:#B3B3B3;stop-opacity:0"/>
+	</radialGradient>
+	<path class="st0" d="M31.9,39.9c7.5,0,13.6-6.1,13.6-13.6s-6.1-13.6-13.6-13.6s-13.6,6.1-13.6,13.6S24.4,39.9,31.9,39.9z"/>
+	<radialGradient id="SVGID_2_" cx="31.7608" cy="26.1719" r="8.6969" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</radialGradient>
+	<path class="st1" d="M31.8,34.9c4.8,0,8.7-3.9,8.7-8.7s-3.9-8.7-8.7-8.7s-8.7,3.9-8.7,8.7S27,34.9,31.8,34.9z"/>
+	<radialGradient id="SVGID_3_" cx="31.5684" cy="25.7895" r="21.7028" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st2" d="M47.1,10.8l-4.3,4.3c2.9,2.9,4.6,6.7,4.6,11s-1.7,8.1-4.6,11l4.3,4.3c4.1-4.1,6.4-9.3,6.4-15.4
+		S51.2,14.9,47.1,10.8z"/>
+	<radialGradient id="SVGID_4_" cx="31.9474" cy="26.1725" r="21.9825" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st3" d="M16.1,26.2c0-4.3,1.7-8.1,4.6-11l-4.3-4.3c-4.1,4.1-6.4,9.3-6.4,15.4s2.3,11.3,6.4,15.4l4.3-4.3
+		C17.8,34.3,16.1,30.5,16.1,26.2z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="31.7084" y1="55.0458" x2="31.8106" y2="36.9612">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st4" d="M34.7,36.4h-5.8v18.8h5.8V36.4z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="48.3449" y1="55.2194" x2="48.5344" y2="43.3773">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st5" d="M55,47.3c0,3.8-3.9,4.1-6.5,7.8c-2.6-4.1-6.5-4.3-6.5-7.8s3.9-5.2,6.5-0.9C51.1,42.1,55,43.6,55,47.3z"/>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MaterialFunction_16.svg b/Content/Slate/Starship/AssetIcons/MaterialFunction_16.svg
new file mode 100644
index 0000000..8ddd5c7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MaterialFunction_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 7H7V11H9V7Z" fill="white"/>
+<path d="M7 11H3V11.5C2.8 11.4 2.7 11.2 2.5 11H3V7H1C1 5.5 1.6 4.1 2.5 3H3V2.5C4.1 1.6 5.5 1 7 1V3H11V2.5C11.2 2.6 11.3 2.8 11.5 3H11V5L12.8 3.2C11.6 1.3 9.4 0 7 0C3.1 0 0 3.1 0 7C0 10.9 3.1 14 7 14V13V11Z" fill="white"/>
+<path d="M7 3H3V7H7V3Z" fill="white"/>
+<path d="M13.9998 6.5C14.0998 6.3 14.1998 6.2 14.2998 6.2C14.3998 6.3 14.3998 6.4 14.4998 6.4C14.5998 6.5 14.5998 6.6 14.6998 6.7C14.7998 6.8 14.8998 6.9 14.9998 6.9C15.0998 7 15.1998 7 15.2998 7C15.4998 7 15.6998 6.9 15.7998 6.8C15.8998 6.6 15.9998 6.5 15.9998 6.3C15.9998 6.1 15.8998 6 15.8998 5.9C15.8998 5.8 15.7998 5.8 15.7998 5.7C15.7998 5.7 15.6998 5.7 15.6998 5.6C15.6998 5.6 15.5998 5.6 15.4998 5.5C15.4998 5.5 15.4998 5.5 15.3998 5.5C15.2998 5.5 15.1998 5.5 15.0998 5.5C14.7998 5.5 14.5998 5.6 14.2998 5.7C13.9998 5.8 13.7998 6 13.5998 6.2C13.3998 6.4 13.1998 6.7 12.9998 7C12.7998 7.3 12.6998 7.7 12.5998 8L12.4998 8.3H10.4998L10.3998 8.8H12.3998L11.4998 13.1C11.3998 13.7 11.1998 14.2 10.9998 14.5C10.7998 14.8 10.5998 15 10.2998 15C10.2998 14.9 10.1998 14.9 10.1998 14.8C10.1998 14.7 10.0998 14.5 10.0998 14.4C9.9998 14.2 9.9998 14.1 9.8998 14C9.7998 14.1 9.6998 14 9.4998 14C9.3998 13.9 9.1998 13.9 9.0998 13.9C8.7998 13.9 8.6998 14 8.4998 14.2C8.3998 14.4 8.2998 14.6 8.2998 14.8C8.2998 15.1 8.3998 15.3 8.5998 15.4C8.7998 15.6 9.0998 15.7 9.5998 15.7C9.6998 15.7 9.6998 15.7 9.6998 15.7H9.7998C10.2998 15.7 10.8998 15.5 11.3998 15C11.8998 14.5 12.1998 13.9 12.3998 13.2L13.2998 9.1H15.5998L15.6998 8.6H13.3998L13.4998 8.1C13.6998 7.3 13.7998 6.8 13.9998 6.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MaterialFunction_64.svg b/Content/Slate/Starship/AssetIcons/MaterialFunction_64.svg
new file mode 100644
index 0000000..f0897d2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MaterialFunction_64.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="MaterialFunction_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:none;}
+</style>
+<g>
+	<g>
+		<radialGradient id="SVGID_1_" cx="32" cy="32" r="22.2409" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<path class="st0" d="M32,54.2c12.3,0,22.2-10,22.2-22.2c0-12.3-10-22.2-22.2-22.2C19.7,9.8,9.8,19.7,9.8,32
+			C9.8,44.3,19.7,54.2,32,54.2z"/>
+		<g>
+			<path class="st1" d="M45.7,18.3v-3.8c-3.8-3.1-8.6-4.8-13.7-4.8v8.6H45.7z"/>
+			<path class="st1" d="M45.7,32H32v13.7h13.7V32z"/>
+			<path class="st1" d="M32,18.3H18.3V32H32V18.3z"/>
+			<path class="st1" d="M54.2,32c0-5.1-1.7-9.9-4.8-13.7h-3.8V32H54.2z"/>
+			<path class="st1" d="M49.5,45.7h-3.8v3.8C47.1,48.4,48.4,47.1,49.5,45.7z"/>
+			<path class="st1" d="M18.3,49.5c3.8,3.1,8.6,4.8,13.7,4.8v-8.6H18.3V49.5z"/>
+			<path class="st1" d="M9.8,32c0,5.1,1.7,9.9,4.8,13.7h3.8V32H9.8z"/>
+			<path class="st1" d="M14.5,18.3h3.8v-3.8C16.9,15.6,15.6,16.9,14.5,18.3z"/>
+		</g>
+		<radialGradient id="SVGID_2_" cx="31.8525" cy="31.8841" r="21.6998" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080;stop-opacity:0"/>
+			<stop  offset="0.8223" style="stop-color:#333333;stop-opacity:0.5"/>
+			<stop  offset="1" style="stop-color:#333333;stop-opacity:0.8"/>
+		</radialGradient>
+		<path class="st2" d="M31.9,53.6c12,0,21.7-9.7,21.7-21.7c0-12-9.7-21.7-21.7-21.7c-12,0-21.7,9.7-21.7,21.7
+			C10.2,43.9,19.9,53.6,31.9,53.6z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32" y1="8.7591" x2="32" y2="55.2409">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st3" d="M32,54.2c12.3,0,22.2-10,22.2-22.2c0-12.3-10-22.2-22.2-22.2C19.7,9.8,9.8,19.7,9.8,32
+			C9.8,44.3,19.7,54.2,32,54.2z"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="43.0793" y1="55.7826" x2="42.8749" y2="33.7028">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st4" d="M53.8,56.3H32.1c-1.7,0-3-1.4-3-3V37c0-1.7,1.4-3,3-3h21.7c1.7,0,3,1.4,3,3v16.2
+		C56.9,54.9,55.5,56.3,53.8,56.3z"/>
+	<g>
+		<path class="st1" d="M49,36.3c0,0-1.8-0.2-2.8,4.8l-2.1,9.2c0,0-1.1,5.9-8,4.6l1.2-1c0,0,3.1,0.5,4.8-3.8l2.2-10.3
+			c0,0,1-3.5,3.5-4.4c0,0,1.3-0.5,2.6,0.1"/>
+		<polygon class="st1" points="45.7,41.5 39,41.5 39.3,40.5 46.1,40.5 		"/>
+		<polygon class="st1" points="50.6,42.6 43.9,42.6 44.3,41.6 51,41.6 		"/>
+		<circle class="st1" cx="49.6" cy="37" r="1.6"/>
+		<circle class="st1" cx="36.5" cy="53.2" r="1.7"/>
+	</g>
+	<rect x="0" class="st5" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MaterialInstanceActor_16.svg b/Content/Slate/Starship/AssetIcons/MaterialInstanceActor_16.svg
new file mode 100644
index 0000000..5d22c6c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MaterialInstanceActor_16.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 0C5.14348 0 3.36301 0.737493 2.05025 2.05025C0.737498 3.363 0 5.14348 0 7V7C0 8.85652 0.737498 10.637 2.05025 11.9498C3.36301 13.2625 5.14348 14 7 14C7.33488 13.9986 7.66917 13.9719 8 13.92V12.92C7.66942 12.9752 7.33513 13.0053 7 13.01C5.4087 13.01 3.88258 12.3779 2.75736 11.2526C1.63214 10.1274 1 8.60129 1 7.00999C1 5.4187 1.63214 3.89258 2.75736 2.76736C3.88258 1.64215 5.4087 1.00999 7 1.00999C8.5913 1.00999 10.1174 1.64215 11.2426 2.76736C12.3679 3.89258 13 5.4187 13 7.00999H14C14.0013 6.0899 13.8212 5.17857 13.47 4.32814C13.1188 3.47771 12.6034 2.70486 11.9533 2.05379C11.3031 1.40272 10.531 0.886206 9.6811 0.533798C8.83116 0.18139 7.9201 -9.38869e-07 7 0V0Z" fill="white"/>
+<path d="M11 3V1.88001C9.85865 0.985376 8.45019 0.499452 7 0.5V3H11Z" fill="white"/>
+<path d="M7 3H3V7H7V3Z" fill="white"/>
+<path d="M13.5 7C13.5005 5.54981 13.0146 4.14135 12.12 3H11V7H13.5Z" fill="white"/>
+<path d="M3 12.12C4.14135 13.0146 5.54981 13.5005 7 13.5V11H3V12.12Z" fill="white"/>
+<path d="M0.5 7C0.499452 8.45019 0.98537 9.85865 1.88 11H3V7H0.5Z" fill="white"/>
+<path d="M1.87988 2.99988H2.99988V1.87988C2.58288 2.20683 2.20683 2.58287 1.87988 2.99988V2.99988Z" fill="white"/>
+<path d="M7 11H8V9H10V7H7V11Z" fill="white"/>
+<path d="M14 10H9V15H14V10Z" fill="white"/>
+<path d="M11 8V9H15V13H16V8H11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MaterialInstanceActor_64.svg b/Content/Slate/Starship/AssetIcons/MaterialInstanceActor_64.svg
new file mode 100644
index 0000000..69e22e0
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MaterialInstanceActor_64.svg
@@ -0,0 +1,44 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.9999 54.24C36.3985 54.24 40.6984 52.9357 44.3558 50.4919C48.0131 48.0481 50.8637 44.5747 52.547 40.5109C54.2303 36.4471 54.6707 31.9753 53.8126 27.6612C52.9544 23.3471 50.8363 19.3843 47.7259 16.274C44.6156 13.1636 40.6528 11.0455 36.3387 10.1874C32.0246 9.32922 27.5528 9.76965 23.489 11.4529C19.4252 13.1362 15.9518 15.9868 13.508 19.6441C11.0642 23.3015 9.75989 27.6014 9.75989 32C9.75989 37.8984 12.103 43.5553 16.2738 47.7261C20.4446 51.8969 26.1015 54.24 31.9999 54.24Z" fill="url(#paint0_radial)"/>
+<path d="M45.69 18.3101V14.5501C41.8184 11.4174 36.9801 9.72454 32 9.76007V18.3101H45.69Z" fill="white"/>
+<path d="M45.69 32H32V45.69H45.69V32Z" fill="white"/>
+<path d="M31.9999 18.3101H18.3099V32.0001H31.9999V18.3101Z" fill="white"/>
+<path d="M54.2399 32.0001C54.2755 27.0199 52.5826 22.1817 49.4499 18.3101H45.6899V32.0001H54.2399Z" fill="white"/>
+<path d="M49.4499 45.6902H45.6899V49.4502C47.1075 48.3726 48.3724 47.1078 49.4499 45.6902Z" fill="white"/>
+<path d="M18.3099 49.4502C22.1815 52.5829 27.0198 54.2757 31.9999 54.2402V45.6902H18.3099V49.4502Z" fill="white"/>
+<path d="M9.75995 32C9.72442 36.9801 11.4173 41.8184 14.5499 45.69H18.3099V32H9.75995Z" fill="white"/>
+<path d="M14.5499 18.31H18.3099V14.55C16.8923 15.6276 15.6275 16.8925 14.5499 18.31Z" fill="white"/>
+<path d="M31.8499 53.5802C36.1418 53.5802 40.3372 52.3075 43.9058 49.9231C47.4743 47.5387 50.2557 44.1496 51.8981 40.1844C53.5405 36.2193 53.9702 31.8561 53.1329 27.6467C52.2956 23.4373 50.2289 19.5708 47.1941 16.536C44.1593 13.5012 40.2928 11.4344 36.0834 10.5971C31.874 9.75985 27.5108 10.1896 23.5457 11.832C19.5805 13.4744 16.1914 16.2558 13.807 19.8243C11.4226 23.3929 10.1499 27.5883 10.1499 31.8802C10.1486 34.7302 10.709 37.5526 11.799 40.186C12.8891 42.8193 14.4875 45.212 16.5028 47.2273C18.518 49.2426 20.9108 50.841 23.5441 51.931C26.1775 53.0211 28.9999 53.5815 31.8499 53.5802Z" fill="url(#paint1_radial)"/>
+<path d="M31.9999 54.24C36.3985 54.24 40.6984 52.9357 44.3558 50.4919C48.0131 48.0481 50.8637 44.5747 52.547 40.5109C54.2303 36.4471 54.6707 31.9754 53.8126 27.6612C52.9544 23.3471 50.8363 19.3843 47.7259 16.274C44.6156 13.1636 40.6528 11.0455 36.3387 10.1874C32.0246 9.32922 27.5528 9.76965 23.489 11.4529C19.4252 13.1362 15.9518 15.9868 13.508 19.6441C11.0642 23.3015 9.75989 27.6014 9.75989 32C9.75989 37.8984 12.103 43.5553 16.2738 47.7261C20.4446 51.8969 26.1015 54.24 31.9999 54.24V54.24Z" stroke="url(#paint2_linear)" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M53.8399 33.99H32.1199C30.4355 33.99 29.0699 35.3555 29.0699 37.04V53.2C29.0699 54.8845 30.4355 56.25 32.1199 56.25H53.8399C55.5244 56.25 56.8899 54.8845 56.8899 53.2V37.04C56.8899 35.3555 55.5244 33.99 53.8399 33.99Z" fill="url(#paint3_linear)"/>
+<path opacity="0.75" d="M49.8299 37.3401H40.9899C39.9903 37.3401 39.1799 38.1505 39.1799 39.1501V47.4101C39.1799 48.4097 39.9903 49.2201 40.9899 49.2201H49.8299C50.8296 49.2201 51.6399 48.4097 51.6399 47.4101V39.1501C51.6399 38.1505 50.8296 37.3401 49.8299 37.3401Z" fill="url(#paint4_linear)"/>
+<path opacity="0.3" d="M45.6899 40.3601H36.8499C35.8503 40.3601 35.0399 41.1705 35.0399 42.1701V50.4301C35.0399 51.4297 35.8503 52.2401 36.8499 52.2401H45.6899C46.6896 52.2401 47.4999 51.4297 47.4999 50.4301V42.1701C47.4999 41.1705 46.6896 40.3601 45.6899 40.3601Z" fill="black"/>
+<path d="M45.03 41.02H36.19C35.1904 41.02 34.38 41.8304 34.38 42.83V51.09C34.38 52.0897 35.1904 52.9 36.19 52.9H45.03C46.0296 52.9 46.84 52.0897 46.84 51.09V42.83C46.84 41.8304 46.0296 41.02 45.03 41.02Z" fill="url(#paint5_linear)"/>
+<defs>
+<radialGradient id="paint0_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(31.9999 32) scale(22.24)">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#333333"/>
+</radialGradient>
+<radialGradient id="paint1_radial" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(31.8499 31.8802) scale(21.7)">
+<stop stop-color="#808080" stop-opacity="0"/>
+<stop offset="0.82" stop-color="#333333" stop-opacity="0.5"/>
+<stop offset="1" stop-color="#333333" stop-opacity="0.8"/>
+</radialGradient>
+<linearGradient id="paint2_linear" x1="31.9999" y1="8.76002" x2="31.9999" y2="55.24" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="43.0799" y1="55.78" x2="42.8699" y2="33.7" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="39.1799" y1="43.2801" x2="51.6299" y2="43.2801" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="34.38" y1="46.96" x2="46.84" y2="46.96" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MaterialInstanceConstant_16.svg b/Content/Slate/Starship/AssetIcons/MaterialInstanceConstant_16.svg
new file mode 100644
index 0000000..ca812b2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MaterialInstanceConstant_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 11L10 8H11V7H7V11Z" fill="white"/>
+<path d="M7 3H3V7H7V3Z" fill="white"/>
+<path d="M3.2 12.8L5 11H3V11.5C2.8 11.4 2.7 11.2 2.5 11H3V7H1C1 5.5 1.6 4.1 2.5 3H3V2.5C4.1 1.6 5.5 1 7 1V3H11V2.5C11.2 2.6 11.3 2.8 11.5 3H11V7H13C13 7.3 13 7.7 12.9 8H13.9C14 7.7 14 7.3 14 7C14 3.1 10.9 0 7 0C3.1 0 0 3.1 0 7C0 9.4 1.3 11.6 3.2 12.8Z" fill="white"/>
+<path d="M8.0001 16L5.6001 13.3L6.4001 12.5L8.0001 14.5L11.4001 10H16.0001V11H11.9001L8.0001 16Z" fill="white"/>
+<path d="M14 13.4L14.9 12H16L14.7 14L16 16H14.9L14 14.6L13.1 16H12L13.4 14L12 12H13.1L14 13.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MaterialInstanceConstant_64.svg b/Content/Slate/Starship/AssetIcons/MaterialInstanceConstant_64.svg
new file mode 100644
index 0000000..a18b20e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MaterialInstanceConstant_64.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="MaterialInstanceConstant_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{opacity:0.8;}
+	.st6{fill:none;}
+</style>
+<g>
+	<g>
+		<radialGradient id="SVGID_1_" cx="32" cy="32" r="22.2409" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<path class="st0" d="M32,54.2c12.3,0,22.2-10,22.2-22.2c0-12.3-10-22.2-22.2-22.2C19.7,9.8,9.8,19.7,9.8,32
+			C9.8,44.3,19.7,54.2,32,54.2z"/>
+		<g>
+			<path class="st1" d="M45.7,18.3v-3.8c-3.8-3.1-8.6-4.8-13.7-4.8v8.6H45.7z"/>
+			<path class="st1" d="M45.7,32H32v13.7h13.7V32z"/>
+			<path class="st1" d="M32,18.3H18.3V32H32V18.3z"/>
+			<path class="st1" d="M54.2,32c0-5.1-1.7-9.9-4.8-13.7h-3.8V32H54.2z"/>
+			<path class="st1" d="M49.5,45.7h-3.8v3.8C47.1,48.4,48.4,47.1,49.5,45.7z"/>
+			<path class="st1" d="M18.3,49.5c3.8,3.1,8.6,4.8,13.7,4.8v-8.6H18.3V49.5z"/>
+			<path class="st1" d="M9.8,32c0,5.1,1.7,9.9,4.8,13.7h3.8V32H9.8z"/>
+			<path class="st1" d="M14.5,18.3h3.8v-3.8C16.9,15.6,15.6,16.9,14.5,18.3z"/>
+		</g>
+		<radialGradient id="SVGID_2_" cx="31.8525" cy="31.8841" r="21.6998" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080;stop-opacity:0"/>
+			<stop  offset="0.8223" style="stop-color:#333333;stop-opacity:0.5"/>
+			<stop  offset="1" style="stop-color:#333333;stop-opacity:0.8"/>
+		</radialGradient>
+		<path class="st2" d="M31.9,53.6c12,0,21.7-9.7,21.7-21.7c0-12-9.7-21.7-21.7-21.7c-12,0-21.7,9.7-21.7,21.7
+			C10.2,43.9,19.9,53.6,31.9,53.6z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32" y1="8.7591" x2="32" y2="55.2409">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st3" d="M32,54.2c12.3,0,22.2-10,22.2-22.2c0-12.3-10-22.2-22.2-22.2C19.7,9.8,9.8,19.7,9.8,32
+			C9.8,44.3,19.7,54.2,32,54.2z"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="43.0793" y1="55.7826" x2="42.8749" y2="33.7028">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st4" d="M53.8,56.3H32.1c-1.7,0-3-1.4-3-3V37c0-1.7,1.4-3,3-3h21.7c1.7,0,3,1.4,3,3v16.2
+		C56.9,54.9,55.5,56.3,53.8,56.3z"/>
+	<g class="st5">
+		<path class="st1" d="M36.9,51.2l-5.1-5.7l1.5-1.5l3.6,4l7.2-9.5h9.7v2.1h-8.7L36.9,51.2z"/>
+		<path class="st1" d="M49.6,45.7l1.9-3h2.3L51.1,47l3,4.2h-2.3l-2.1-3l-1.9,3h-2.3l3-4.2l-3-4.2h2.3L49.6,45.7z"/>
+	</g>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Material_16.svg b/Content/Slate/Starship/AssetIcons/Material_16.svg
new file mode 100644
index 0000000..6f04b5d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Material_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 4V2.9C10.9 2 9.5 1.5 8 1.5V4H12Z" fill="white"/>
+<path d="M12 8H8V12H12V8Z" fill="white"/>
+<path d="M8 4H4V8H8V4Z" fill="white"/>
+<path d="M14.5 8C14.5 6.5 14 5.1 13.1 4H12V8H14.5Z" fill="white"/>
+<path d="M13.1 12H12V13.1C12.4 12.8 12.8 12.4 13.1 12Z" fill="white"/>
+<path d="M4 13.1C5.1 14 6.5 14.5 8 14.5V12H4V13.1Z" fill="white"/>
+<path d="M1.5 8C1.5 9.5 2 10.9 2.9 12H4V8H1.5Z" fill="white"/>
+<path d="M2.8999 4.00039H3.9999V2.90039C3.5999 3.20039 3.1999 3.60039 2.8999 4.00039Z" fill="white"/>
+<path d="M8 14.5C11.5899 14.5 14.5 11.5899 14.5 8C14.5 4.41015 11.5899 1.5 8 1.5C4.41015 1.5 1.5 4.41015 1.5 8C1.5 11.5899 4.41015 14.5 8 14.5Z" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Material_64.svg b/Content/Slate/Starship/AssetIcons/Material_64.svg
new file mode 100644
index 0000000..b46da9a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Material_64.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-miterlimit:10;}
+</style>
+<g id="MaterialInstanceActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<radialGradient id="SVGID_1_" cx="32.7996" cy="222" r="22.2288" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<path class="st1" d="M32.8,54.2C45.1,54.2,55,44.3,55,32S45,9.8,32.8,9.8c-12.3,0-22.2,10-22.2,22.2
+			C10.5,44.3,20.5,54.2,32.8,54.2z"/>
+		<g>
+			<path class="st2" d="M46.5,18.3v-3.8c-3.8-3.1-8.6-4.8-13.7-4.8v8.6H46.5z"/>
+			<path class="st2" d="M46.5,32H32.8v13.7h13.7V32z"/>
+			<path class="st2" d="M32.8,18.3H19.1V32h13.7V18.3z"/>
+			<path class="st2" d="M55,32c0-5.1-1.7-9.9-4.8-13.7h-3.8V32H55z"/>
+			<path class="st2" d="M50.2,45.7h-3.8v3.8C47.8,48.4,49.2,47.1,50.2,45.7z"/>
+			<path class="st2" d="M19.1,49.5c3.8,3.1,8.6,4.8,13.7,4.8v-8.6H19.1V49.5z"/>
+			<path class="st2" d="M10.5,32c0,5.1,1.7,9.9,4.8,13.7h3.8V32H10.5z"/>
+			<path class="st2" d="M15.3,18.3h3.8v-3.8C17.7,15.6,16.4,16.9,15.3,18.3z"/>
+		</g>
+		
+			<radialGradient id="SVGID_2_" cx="32.6" cy="221.9" r="21.7218" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080;stop-opacity:0"/>
+			<stop  offset="0.8223" style="stop-color:#333333;stop-opacity:0.5"/>
+			<stop  offset="1" style="stop-color:#333333;stop-opacity:0.8"/>
+		</radialGradient>
+		<path class="st3" d="M32.6,53.6c12,0,21.7-9.7,21.7-21.7s-9.7-21.7-21.7-21.7s-21.7,9.7-21.7,21.7C10.9,43.9,20.6,53.6,32.6,53.6z
+			"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32.7996" y1="198.8" x2="32.7996" y2="245.2818" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st4" d="M32.8,54.2C45.1,54.2,55,44.3,55,32S45,9.8,32.8,9.8c-12.3,0-22.2,10-22.2,22.2
+			C10.5,44.3,20.5,54.2,32.8,54.2z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MediaPlayer_16.svg b/Content/Slate/Starship/AssetIcons/MediaPlayer_16.svg
new file mode 100644
index 0000000..39051c3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MediaPlayer_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2 5C0.9 5 0 5.9 0 7V13C0 14.1 0.9 15 2 15H12V5H2Z" fill="white"/>
+<path d="M2 6H12V5H2C0.9 5 0 5.9 0 7V13C0 14.1 0.9 15 2 15H12V14H2C1.4 14 1 13.6 1 13V7C1 6.4 1.4 6 2 6Z" fill="white"/>
+<path d="M8.5 5.5L11.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.5 5.5L3.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5H12V15H14C15.1 15 16 14.1 16 13V7C16 5.9 15.1 5 14 5ZM14 13.5C13.2 13.5 12.5 12.8 12.5 12C12.5 11.2 13.2 10.5 14 10.5C14.8 10.5 15.5 11.2 15.5 12C15.5 12.8 14.8 13.5 14 13.5ZM14 9.5C13.2 9.5 12.5 8.8 12.5 8C12.5 7.2 13.2 6.5 14 6.5C14.8 6.5 15.5 7.2 15.5 8C15.5 8.8 14.8 9.5 14 9.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MediaPlayer_64.svg b/Content/Slate/Starship/AssetIcons/MediaPlayer_64.svg
new file mode 100644
index 0000000..d60e0ed
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MediaPlayer_64.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="MediaPlayer_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st8{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20.6266" y1="16.9315" x2="22.725" y2="15.7131">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.6345" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st0" d="M26.4,24.2L26.4,24.2c-0.5,0.3-1.1,0.1-1.4-0.4l-8.1-14c-0.3-0.5-0.1-1.1,0.4-1.4v0c0.5-0.3,1.1-0.1,1.4,0.4
+		l8.1,14C27,23.3,26.9,23.9,26.4,24.2z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="35.2441" y1="15.6473" x2="36.5979" y2="16.4596">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.6345" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st1" d="M31.7,24.2L31.7,24.2c0.5,0.3,1.1,0.1,1.4-0.4l8.1-14c0.3-0.5,0.1-1.1-0.4-1.4v0c-0.5-0.3-1.1-0.1-1.4,0.4
+		l-8.1,14C31,23.3,31.2,23.9,31.7,24.2z"/>
+	<path class="st2" d="M53.1,52.2H11.9c-2.2,0-4-1.8-4-4V24.1c0-2.2,1.8-4,4-4h41.2c2.2,0,4,1.8,4,4v24.1
+		C57.2,50.4,55.4,52.2,53.1,52.2z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32.5338" y1="22.0653" x2="32.5338" y2="54.1584">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.7817" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st3" d="M53.1,53H11.9c-2.2,0-4-1.8-4-4V24.9c0-2.2,1.8-4,4-4h41.2c2.2,0,4,1.8,4,4V49C57.2,51.2,55.4,53,53.1,53z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="28.9429" y1="24.105" x2="28.8318" y2="49.3271">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st4" d="M43.2,49.8H14.6c-1.7,0-3.1-1.4-3.1-3.1V26.9c0-1.7,1.4-3.1,3.1-3.1h28.6c1.7,0,3.1,1.4,3.1,3.1v19.7
+		C46.3,48.4,44.9,49.8,43.2,49.8z"/>
+	<radialGradient id="SVGID_5_" cx="51.8704" cy="27.9893" r="3.2783" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</radialGradient>
+	<circle class="st5" cx="51.9" cy="28" r="3.3"/>
+	<radialGradient id="SVGID_6_" cx="51.8704" cy="36.1563" r="3.2783" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</radialGradient>
+	<circle class="st6" cx="51.9" cy="36.2" r="3.3"/>
+	<circle class="st7" cx="51.9" cy="28" r="2.5"/>
+	<circle class="st7" cx="51.9" cy="36.2" r="2.5"/>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MediaTexture_16.svg b/Content/Slate/Starship/AssetIcons/MediaTexture_16.svg
new file mode 100644
index 0000000..fb60da5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MediaTexture_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 5.5L11.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.5 5.5L3.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5H12H2C0.9 5 0 5.9 0 7V13C0 14.1 0.9 15 2 15H12H14C15.1 15 16 14.1 16 13V7C16 5.9 15.1 5 14 5ZM12 14H2C1.4 14 1 13.6 1 13V7C1 6.4 1.4 6 2 6H12V14ZM14 13.5C13.2 13.5 12.5 12.8 12.5 12C12.5 11.2 13.2 10.5 14 10.5C14.8 10.5 15.5 11.2 15.5 12C15.5 12.8 14.8 13.5 14 13.5ZM14 9.5C13.2 9.5 12.5 8.8 12.5 8C12.5 7.2 13.2 6.5 14 6.5C14.8 6.5 15.5 7.2 15.5 8C15.5 8.8 14.8 9.5 14 9.5Z" fill="white"/>
+<path opacity="0.5" d="M5 6H1V10H5V6Z" fill="white"/>
+<path opacity="0.5" d="M9 10H5V14H9V10Z" fill="white"/>
+<path opacity="0.5" d="M12 6H9V10H12V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MediaTexture_64.svg b/Content/Slate/Starship/AssetIcons/MediaTexture_64.svg
new file mode 100644
index 0000000..feb7d40
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MediaTexture_64.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="MediaTexture_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st9{fill:#FFFFFF;}
+	.st10{opacity:1.000000e-02;fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="20.6266" y1="16.8616" x2="22.725" y2="15.6432">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M26.4,24.1L26.4,24.1c-0.5,0.3-1.1,0.1-1.4-0.4l-8.1-14c-0.3-0.5-0.1-1.1,0.4-1.4v0c0.5-0.3,1.1-0.1,1.4,0.4
+			l8.1,14C27,23.2,26.9,23.8,26.4,24.1z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="35.2441" y1="15.5775" x2="36.5979" y2="16.3898">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M31.7,24.1L31.7,24.1c0.5,0.3,1.1,0.1,1.4-0.4l8.1-14c0.3-0.5,0.1-1.1-0.4-1.4v0c-0.5-0.3-1.1-0.1-1.4,0.4
+			l-8.1,14C31,23.2,31.2,23.8,31.7,24.1z"/>
+		<path class="st3" d="M53.1,52.2H11.9c-2.2,0-4-1.8-4-4V24c0-2.2,1.8-4,4-4h41.2c2.2,0,4,1.8,4,4v24.1
+			C57.2,50.4,55.4,52.2,53.1,52.2z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32.5338" y1="21.9955" x2="32.5338" y2="54.0886">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.7817" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M53.1,52.9H11.9c-2.2,0-4-1.8-4-4V24.8c0-2.2,1.8-4,4-4h41.2c2.2,0,4,1.8,4,4v24.1
+			C57.2,51.1,55.4,52.9,53.1,52.9z"/>
+		<radialGradient id="SVGID_4_" cx="28.8071" cy="34.0735" r="21.2159" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<path class="st5" d="M43.2,49.7H14.6c-1.7,0-3.1-1.4-3.1-3.1V26.9c0-1.7,1.4-3.1,3.1-3.1h28.6c1.7,0,3.1,1.4,3.1,3.1v19.7
+			C46.3,48.3,44.9,49.7,43.2,49.7z"/>
+		<radialGradient id="SVGID_5_" cx="51.8704" cy="27.9195" r="3.2783" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st6" cx="51.9" cy="27.9" r="3.3"/>
+		<radialGradient id="SVGID_6_" cx="51.8704" cy="36.0865" r="3.2783" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st7" cx="51.9" cy="36.1" r="3.3"/>
+		<circle class="st8" cx="51.9" cy="27.9" r="2.5"/>
+		<circle class="st8" cx="51.9" cy="36.1" r="2.5"/>
+	</g>
+	<g>
+		<path class="st9" d="M46.3,32.4H34.7v-8.7h8.7c1.6,0,2.9,1.3,2.9,2.9V32.4z"/>
+		<rect x="34.7" y="32.4" class="st10" width="11.6" height="8.7"/>
+		<path class="st9" d="M43.4,49.7h-8.7v-8.7h11.6v5.7C46.3,48.4,45,49.7,43.4,49.7z"/>
+		<rect x="23.1" y="23.7" class="st10" width="11.6" height="8.7"/>
+		<rect x="23.1" y="32.4" class="st9" width="11.6" height="8.7"/>
+		<rect x="23.1" y="41.1" class="st10" width="11.6" height="8.7"/>
+		<path class="st9" d="M23.1,32.4H11.4v-5.7c0-1.6,1.3-2.9,2.9-2.9h8.7V32.4z"/>
+		<rect x="11.4" y="32.4" class="st10" width="11.6" height="8.7"/>
+		<path class="st9" d="M23.1,49.7h-8.7c-1.6,0-2.9-1.3-2.9-2.9v-5.7h11.6V49.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MirrorDataTable_16.svg b/Content/Slate/Starship/AssetIcons/MirrorDataTable_16.svg
new file mode 100644
index 0000000..e45e5d2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MirrorDataTable_16.svg
@@ -0,0 +1,15 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8292:14600)">
+<path d="M7.76 11.73V12.63L1 14.4V1.6L7.76 3.37V4.46L8 5.26V3.12L0 0V16L8 12.88V11.64L7.76 11.73Z" fill="white" fill-opacity="0.5"/>
+<path opacity="0.5" d="M10.05 9.74994L10.21 9.84991L9.54999 10.96C9.50871 11.0391 9.44486 11.1041 9.36652 11.1469C9.28817 11.1896 9.19886 11.2081 9.10999 11.2H7.31C7.19353 11.1994 7.08206 11.1526 7 11.0699V10.4399C7.08206 10.3573 7.19353 10.3105 7.31 10.3099H8.90002L9.57001 9.15991C9.64605 9.41212 9.81852 9.62417 10.05 9.74994ZM15.55 7.95996H14L13.26 6.65991C13.341 6.92383 13.341 7.20599 13.26 7.46991L12.98 7.95996L13.35 8.60992C13.3963 8.69147 13.4655 8.7577 13.5491 8.80035C13.6326 8.84301 13.7268 8.8602 13.82 8.84991H15.61C15.7276 8.84994 15.8406 8.80392 15.9247 8.72168C16.0089 8.63944 16.0574 8.52752 16.06 8.40991C16.0551 8.34884 16.0378 8.28944 16.0092 8.23529C15.9805 8.18114 15.9411 8.13342 15.8934 8.09503C15.8456 8.05665 15.7906 8.02837 15.7315 8.01202C15.6725 7.99568 15.6107 7.99158 15.55 7.99994V7.95996Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.53998 7.10004C8.49795 7.05905 8.46458 7.01009 8.44177 6.95599C8.41897 6.9019 8.40723 6.84374 8.40723 6.78503C8.40723 6.72632 8.41897 6.66823 8.44177 6.61414C8.46458 6.56004 8.49795 6.51102 8.53998 6.47003L9.73999 5.13007C9.81203 5.04583 9.90909 4.98679 10.017 4.96161C10.125 4.93642 10.2382 4.9464 10.34 4.99005L11.94 5.80005H12.04L12.19 5.88007L12.91 6.29004C13.0167 6.39332 13.0848 6.53006 13.103 6.67743C13.1212 6.8248 13.0884 6.97391 13.01 7.10004L12.76 7.58008L11.76 9.25006L12.9 9.91003C12.9465 9.95163 12.9839 10.0025 13.0097 10.0593C13.0355 10.1161 13.0492 10.1777 13.05 10.2401V12.04C13.05 12.1594 13.0026 12.2739 12.9182 12.3583C12.8338 12.4427 12.7193 12.4901 12.6 12.4901C12.4824 12.4874 12.3705 12.4389 12.2883 12.3548C12.206 12.2707 12.1599 12.1577 12.16 12.04V10.5001L10.31 9.45007H10.24C10.0847 9.35819 9.96176 9.22025 9.88831 9.05542C9.81485 8.89059 9.7945 8.70702 9.83002 8.53009L11.09 6.37006L10.09 5.87006L9.09003 7.01007C9.02283 7.08626 8.93131 7.13685 8.83105 7.15326C8.7308 7.16966 8.62795 7.15083 8.53998 7.10004V7.10004ZM13.73 3.79004C13.417 3.79004 13.1169 3.91439 12.8956 4.13568C12.6743 4.35697 12.55 4.65708 12.55 4.97003C12.55 5.28299 12.6743 5.58315 12.8956 5.80444C13.1169 6.02574 13.417 6.15009 13.73 6.15009C14.0429 6.15009 14.3431 6.02574 14.5644 5.80444C14.7857 5.58315 14.91 5.28299 14.91 4.97003C14.91 4.65708 14.7857 4.35697 14.5644 4.13568C14.3431 3.91439 14.0429 3.79004 13.73 3.79004V3.79004Z" fill="white"/>
+<path d="M1.09009 5.00006C1.09009 4.68711 1.21438 4.38694 1.43567 4.16565C1.65696 3.94436 1.95713 3.82007 2.27008 3.82007C2.58304 3.82007 2.88314 3.94436 3.10443 4.16565C3.32572 4.38694 3.45007 4.68711 3.45007 5.00006C3.45007 5.31302 3.32572 5.61318 3.10443 5.83447C2.88314 6.05577 2.58304 6.18005 2.27008 6.18005C1.95713 6.18005 1.65696 6.05577 1.43567 5.83447C1.21438 5.61318 1.09009 5.31302 1.09009 5.00006V5.00006ZM7.20007 6.17004L6.30005 5.17004C6.22801 5.08581 6.13094 5.02683 6.02301 5.00165C5.91508 4.97646 5.80195 4.98644 5.70007 5.03009L4.10004 5.84009H4.00006L3.85004 5.92004L3.13007 6.33008C3.02339 6.43336 2.95527 6.57004 2.93707 6.71741C2.91888 6.86478 2.95173 7.01395 3.03009 7.14008L3.28009 7.62006L4.28009 9.29004L3.14008 9.95007C3.09356 9.99167 3.05616 10.0425 3.03033 10.0993C3.00451 10.1561 2.99081 10.2177 2.99005 10.2801V12.0801C2.99005 12.1994 3.0375 12.3139 3.12189 12.3983C3.20628 12.4826 3.32072 12.5301 3.44006 12.5301C3.55767 12.5275 3.66959 12.4789 3.75183 12.3948C3.83407 12.3107 3.88009 12.1977 3.88007 12.0801V10.54L5.73004 9.49005H5.80005C5.95537 9.39816 6.07827 9.26023 6.15173 9.0954C6.22519 8.93056 6.2456 8.747 6.21008 8.57007L4.95007 6.41003L5.95007 5.91003L6.95007 7.05005C6.99826 7.09834 7.05619 7.13583 7.12 7.15997C7.1838 7.18411 7.25199 7.19436 7.32007 7.19006L7.20007 6.17004Z" fill="white"/>
+<path opacity="0.5" d="M2.79004 6.65991L2.05005 7.95996H1.05005V8.84991H2.29004C2.38326 8.8602 2.47745 8.84301 2.56097 8.80035C2.6445 8.7577 2.71374 8.69147 2.76007 8.60992L3.13007 7.95996L2.85004 7.46991C2.74923 7.21204 2.72833 6.92982 2.79004 6.65991V6.65991Z" fill="white"/>
+<path opacity="0.5" d="M7.10004 10.3099L6.43005 9.15991C6.35401 9.41212 6.18154 9.62417 5.95007 9.74994L5.79004 9.84991L6.45007 10.96C6.49135 11.0391 6.5552 11.1041 6.63354 11.1469C6.71189 11.1896 6.8012 11.2081 6.89008 11.2H7.20007V10.3099H7.10004Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_8292:14600">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/MirrorDataTable_64.svg b/Content/Slate/Starship/AssetIcons/MirrorDataTable_64.svg
new file mode 100644
index 0000000..0d37e62
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/MirrorDataTable_64.svg
@@ -0,0 +1,31 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 2V62L31 50.3V13.7L1 2ZM30.09 49.36L5 55.8V8.20001L30.09 14.64V49.36Z" fill="url(#paint0_linear_8292:14633)"/>
+<path d="M7 21.0001C7 19.8862 7.44251 18.8179 8.23016 18.0302C9.01782 17.2426 10.0861 16.8 11.2 16.8C12.3122 16.8027 13.3779 17.2464 14.1634 18.0338C14.9489 18.8211 15.39 19.8879 15.39 21.0001C15.39 22.1122 14.9489 23.179 14.1634 23.9664C13.3779 24.7537 12.3122 25.1974 11.2 25.2001C10.0861 25.2001 9.01782 24.7576 8.23016 23.9699C7.44251 23.1823 7 22.114 7 21.0001ZM29 25.47L25.52 21.6C25.2704 21.2897 24.9259 21.0699 24.5394 20.9742C24.1528 20.8784 23.7456 20.9121 23.38 21.0701L17.69 23.9601L17.33 24.11L16.8 24.4001L14.23 25.86C13.8569 26.2333 13.6198 26.7208 13.5563 27.2447C13.4929 27.7686 13.6068 28.2986 13.88 28.7501L14.79 30.4401L18.22 36.4401L14.14 38.79L14 38.9001L13.85 39.0201C13.6785 39.1675 13.5406 39.35 13.4457 39.5553C13.3509 39.7606 13.3012 39.9839 13.3 40.2101V46.6C13.3026 47.0209 13.471 47.4238 13.7686 47.7214C14.0662 48.0191 14.4691 48.1874 14.89 48.1901C15.3126 48.1901 15.718 48.0229 16.0178 47.725C16.3176 47.4271 16.4873 47.0226 16.49 46.6V41.0001L23.04 37.2501L23.31 37.1C23.8599 36.7736 24.2954 36.2851 24.5568 35.7015C24.8181 35.1179 24.8926 34.4677 24.77 33.8401L20.28 26.16L23.77 24.3901L27.4 28.3901C27.5932 28.6081 27.8436 28.7677 28.1229 28.8508C28.4021 28.9338 28.699 28.9371 28.98 28.86L29 25.47Z" fill="url(#paint1_linear_8292:14633)"/>
+<path d="M6 31.6501H10.42L13.05 27.04C12.7474 27.9728 12.7474 28.9773 13.05 29.91L14.05 31.6401L12.74 33.97C12.5687 34.2564 12.3204 34.489 12.0234 34.6411C11.7263 34.7931 11.3925 34.8586 11.06 34.8301H6V31.6501ZM29 40.0101H28.37L25.99 35.9401C25.6927 36.8183 25.0893 37.5602 24.29 38.0301L23.7 38.3801L26.05 42.3801C26.2053 42.655 26.4351 42.8805 26.7128 43.0309C26.9905 43.1812 27.3049 43.2502 27.62 43.23H29V40.0101Z" fill="url(#paint2_linear_8292:14633)"/>
+<path d="M50.4 30.3999L46.97 36.3999L51.05 38.7499L51.2 38.8599L51.35 38.9799C51.5202 39.1278 51.6565 39.3108 51.7497 39.5161C51.8429 39.7214 51.8907 39.9444 51.89 40.1699V46.5599C51.89 46.9816 51.7225 47.3861 51.4243 47.6842C51.1261 47.9824 50.7217 48.1499 50.3 48.1499C49.8783 48.1499 49.4739 47.9824 49.1757 47.6842C48.8775 47.3861 48.71 46.9816 48.71 46.5599V40.9999L42.15 37.2499L41.88 37.0999C41.328 36.7756 40.8908 36.2874 40.6292 35.7032C40.3675 35.1189 40.2944 34.4677 40.42 33.84L44.91 26.1599L41.42 24.3899L37.79 28.3899C37.6504 28.5459 37.4813 28.6728 37.2925 28.7633C37.1038 28.8538 36.899 28.9061 36.6899 28.9173C36.4809 28.9284 36.2717 28.8982 36.0743 28.8283C35.877 28.7584 35.6954 28.6502 35.54 28.5099C35.3843 28.3712 35.2577 28.203 35.1673 28.0151C35.0769 27.8271 35.0246 27.6231 35.0135 27.4149C35.0023 27.2067 35.0325 26.9983 35.1023 26.8018C35.1721 26.6053 35.28 26.4245 35.42 26.2699L39.69 21.5199C39.938 21.2105 40.2807 20.9909 40.6655 20.8952C41.0503 20.7994 41.4559 20.8327 41.82 20.9899L47.51 23.8799L47.88 24.03L48.41 24.3199L50.97 25.78C51.3462 26.151 51.5864 26.6381 51.6517 27.1625C51.717 27.6868 51.6037 28.2179 51.33 28.6699L50.41 30.3599L50.4 30.3999ZM54.03 16.7999C52.9161 16.7999 51.8478 17.2424 51.0602 18.0301C50.2725 18.8177 49.83 19.886 49.83 20.9999C49.83 22.1138 50.2725 23.1821 51.0602 23.9698C51.8478 24.7574 52.9161 25.1999 54.03 25.1999C55.1439 25.1999 56.2122 24.7574 56.9999 23.9698C57.7875 23.1821 58.23 22.1138 58.23 20.9999C58.23 20.4458 58.1204 19.8972 57.9075 19.3857C57.6945 18.8741 57.3825 18.4098 56.9893 18.0194C56.5961 17.629 56.1295 17.3203 55.6165 17.111C55.1034 16.9017 54.5541 16.796 54 16.7999H54.03Z" fill="url(#paint3_linear_8292:14633)"/>
+<path d="M32 40.0001H36.85L39.23 35.9301C39.5263 36.8058 40.1256 37.547 40.92 38.0201L41.52 38.3701L39.16 42.3701C39.0046 42.645 38.7749 42.8705 38.4973 43.0209C38.2196 43.1712 37.9052 43.2402 37.59 43.22H32V40.0001ZM62 32.66C61.8818 32.3643 61.6776 32.1109 61.4137 31.9326C61.1498 31.7543 60.8385 31.6593 60.52 31.66H54.8L52.16 27.05C52.4703 27.9815 52.4703 28.9885 52.16 29.92L51.16 31.6501L52.48 33.98C52.6505 34.2648 52.8972 34.4963 53.1923 34.6483C53.4874 34.8003 53.8192 34.8667 54.15 34.8401H60.54C60.8584 34.8408 61.1698 34.7458 61.4337 34.5675C61.6976 34.3892 61.9018 34.1358 62.02 33.8401L62 32.66Z" fill="url(#paint4_linear_8292:14633)"/>
+<defs>
+<linearGradient id="paint0_linear_8292:14633" x1="1" y1="32" x2="31" y2="32" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#4F4F4F"/>
+</linearGradient>
+<linearGradient id="paint1_linear_8292:14633" x1="6.99" y1="32.4501" x2="29" y2="32.4501" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint2_linear_8292:14633" x1="6" y1="35.11" x2="29" y2="35.11" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="0.16" stop-color="#808080"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+<linearGradient id="paint3_linear_8292:14633" x1="-17750.1" y1="-31225.2" x2="-17211.2" y2="-31225.2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint4_linear_8292:14633" x1="-23053.4" y1="-16047.6" x2="-22152.8" y2="-16047.6" gradientUnits="userSpaceOnUse">
+<stop stop-color="#4D4D4D"/>
+<stop offset="0.16" stop-color="#808080"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ModularSynthPresetBank_16.svg b/Content/Slate/Starship/AssetIcons/ModularSynthPresetBank_16.svg
new file mode 100644
index 0000000..708014c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ModularSynthPresetBank_16.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.5 8.5H3.2L3.5 8.8L4 7.2L4.5 11.5L5.5 3L6.5 14.5L7.5 1.5L8.5 15.5L9.5 3.5L10.5 12.5L11.5 4.5L12.5 11.5L13 7.5L13.5 8.5H14.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ModularSynthPresetBank_64.svg b/Content/Slate/Starship/AssetIcons/ModularSynthPresetBank_64.svg
new file mode 100644
index 0000000..586984f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ModularSynthPresetBank_64.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ModularSynthPresetBank_x5F_64_-_UPLOAD"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<path class="st1" d="M9.1,32.8l8.8-0.3l0.1,0l0.1,0.1l1,0.9l-0.5,0.1l1.5-4.8l0.6-1.8l0.3,1.9l2,12.8l-1.6,0
+			c0.5-4.3,0.8-8.5,1.4-12.8l1.7-12.7l1.1-8.8l0.8,8.8l3.3,34.4l-2,0L31,11.7l2,0l3.3,41.9l-2,0l3.3-35.9l0.9-9.4l1.1,9.3l3.3,26.9
+			l-2,0l1.6-12c0.5-4,1.1-8,1.6-12l0.9-6.9l1.2,6.8c0.3,1.7,0.5,3.5,0.7,5.3l0.7,5.3l1.4,10.5l-1,0l2-11.9l0.1-0.6l0.3,0.5l1.5,3
+			l-0.1-0.1l3.3,0.1l-3.3,0.1l-0.1,0l0-0.1l-1.7-2.9l0.4-0.1l-1.3,12l-0.4,3.6l-0.7-3.6l-1.9-10.4l-1-5.2c-0.3-1.7-0.6-3.5-0.9-5.2
+			l2,0c-0.6,4-1.1,8-1.7,12l-1.6,12l-1,7.7l-0.9-7.7l-3.3-26.9l2,0l-3.3,35.9l-2,0L31,11.9l2,0l-3.3,38.9l-2,0l-3.3-34.4l2,0
+			l-1.6,12.7c-0.5,4.2-1.2,8.5-1.9,12.7L22,48.1l-0.6-6.2l-1.3-12.9L21,29l-1.8,4.7L19,34.2l-0.3-0.3l-1-0.9l0.2,0.1L9.1,32.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavLinkProxy_16.svg b/Content/Slate/Starship/AssetIcons/NavLinkProxy_16.svg
new file mode 100644
index 0000000..c6f5781
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavLinkProxy_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 8L12.5 12.2L8.9 8H11.3C11.3 4.1 11.4 1 7 0C12.7 0 13.6 3.9 13.6 8H16Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.30015 0C7.50015 0 9.00015 0.600098 9.50015 1.1001C8.20015 0.800098 6.20015 0.400049 5.10015 1.30005C4.00015 2.20005 3.40015 3.3001 3.30015 5.1001C3.30015 5.1001 3.00015 2.5 4.60015 1C5.20015 0.4 6.20015 0 7.30015 0Z" fill="white"/>
+<path d="M12.5 15.6997C14.1569 15.6997 15.5 15.1625 15.5 14.4998C15.5 13.837 14.1569 13.2998 12.5 13.2998C10.8431 13.2998 9.5 13.837 9.5 14.4998C9.5 15.1625 10.8431 15.6997 12.5 15.6997Z" fill="white"/>
+<path opacity="0.5" d="M3.5001 6C1.6001 6 0.100098 7.4999 0.100098 9.3999C0.100098 11.2999 2.0001 12.2 3.5001 16C5.1001 12.2 6.9001 11.2999 6.9001 9.3999C6.9001 7.4999 5.4001 6 3.5001 6ZM3.5001 11C2.6001 11 1.9001 10.2999 1.9001 9.3999C1.9001 8.4999 2.6001 7.80005 3.5001 7.80005C4.4001 7.80005 5.1001 8.4999 5.1001 9.3999C5.1001 10.2999 4.4001 11 3.5001 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavLinkProxy_64.svg b/Content/Slate/Starship/AssetIcons/NavLinkProxy_64.svg
new file mode 100644
index 0000000..6b4d299
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavLinkProxy_64.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#CCCCCC;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+</style>
+<g id="NavLink_x5F_64">
+	<rect class="st0" width="64" height="64"/>
+	<g>
+		<ellipse class="st1" cx="42.3" cy="53.2" rx="15.2" ry="4"/>
+		<polygon class="st1" points="31.1,34.3 53.5,34.3 42.2,47.3 		"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="36.9377" y1="32.3498" x2="27.7229" y2="57.9743" gradientTransform="matrix(1 0 0 -1 0 66)">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st2" d="M39,34.3c0,0,2.9-34.1-21.8-20.2c0,0,27.5-25.4,29.2,20.2"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="17.172" y1="49.4308" x2="16.9735" y2="22.3309" gradientTransform="matrix(1 0 0 -1 0 66)">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st3" d="M17.1,15.7C11.5,15.7,7,20.5,7,26.4c0,0.9,0.1,1.8,0.3,2.6c0.1,0.3,0.2,0.8,0.5,1.5c0.1,0.3,0.3,0.6,0.4,1
+			c1.1,2.3,3.6,6.4,8.9,13.2c5.3-6.8,7.8-10.9,8.9-13.2c0.2-0.3,0.3-0.6,0.4-1c0.3-0.7,0.4-1.2,0.5-1.5c0.2-0.8,0.3-1.7,0.3-2.6
+			C27.1,20.5,22.6,15.7,17.1,15.7z M17.1,30.4c-2.7,0-4.9-2.2-4.9-4.9s2.2-4.9,4.9-4.9s4.9,2.2,4.9,4.9
+			C21.9,28.2,19.8,30.4,17.1,30.4z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavLink_16.svg b/Content/Slate/Starship/AssetIcons/NavLink_16.svg
new file mode 100644
index 0000000..bd40a47
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavLink_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_9540_28176)">
+<path opacity="0.5" d="M4.5 0.360352C3.43913 0.360352 2.42172 0.781593 1.67157 1.53174C0.921424 2.28188 0.5 3.29949 0.5 4.36035C0.5 6.57035 2.68 7.64024 4.5 12.0002C6.32 7.64024 8.5 6.57035 8.5 4.36035C8.5 3.29949 8.07858 2.28188 7.32843 1.53174C6.57828 0.781593 5.56087 0.360352 4.5 0.360352ZM4.5 6.18018C4.14004 6.18018 3.78816 6.07352 3.48886 5.87354C3.18956 5.67355 2.95629 5.3892 2.81854 5.05664C2.68079 4.72408 2.64475 4.35817 2.71497 4.00513C2.7852 3.65208 2.95853 3.32777 3.21307 3.07324C3.4676 2.81871 3.79189 2.64542 4.14494 2.5752C4.49798 2.50497 4.86393 2.54096 5.19649 2.67871C5.52905 2.81646 5.81329 3.04982 6.01328 3.34912C6.21326 3.64842 6.32 4.00039 6.32 4.36035C6.32 4.84305 6.12825 5.3059 5.78693 5.64722C5.44562 5.98853 4.98269 6.18018 4.5 6.18018Z" fill="white"/>
+<path d="M9.77982 13.6694L8.87982 14.5696C8.82682 14.6231 8.76374 14.6656 8.69423 14.6946C8.62471 14.7236 8.55014 14.7385 8.47482 14.7385C8.3995 14.7385 8.32493 14.7236 8.25542 14.6946C8.1859 14.6656 8.12282 14.6231 8.06982 14.5696L7.39983 13.8994C7.34631 13.8464 7.30383 13.7834 7.27483 13.7139C7.24584 13.6444 7.23092 13.5699 7.23092 13.4946C7.23092 13.4193 7.24584 13.3447 7.27483 13.2751C7.30383 13.2056 7.34631 13.1426 7.39983 13.0896L8.29983 12.1895L9.48982 11.0095C9.28413 10.8243 9.01416 10.7268 8.7376 10.738C8.46105 10.7492 8.19985 10.8683 8.00983 11.0696L6.28983 12.7896C6.0968 12.9875 5.98877 13.2531 5.98877 13.5295C5.98877 13.806 6.0968 14.0716 6.28983 14.2695L7.71983 15.6995C7.91779 15.8925 8.18333 16.0005 8.45982 16.0005C8.73631 16.0005 9.00186 15.8925 9.19982 15.6995L10.9198 13.9795C11.0246 13.8857 11.1084 13.7709 11.1657 13.6426C11.2231 13.5142 11.2528 13.3752 11.2528 13.2346C11.2528 13.094 11.2231 12.9548 11.1657 12.8264C11.1084 12.698 11.0246 12.5833 10.9198 12.4895L9.79983 13.6196L9.77982 13.6694ZM14.2898 6.27954C14.0919 6.08652 13.8263 5.97852 13.5498 5.97852C13.2733 5.97852 13.0078 6.08652 12.8098 6.27954L10.9998 8.09961C10.7992 8.28791 10.6805 8.54736 10.6693 8.82227C10.6581 9.09717 10.7552 9.36555 10.9398 9.56958L12.1298 8.3894L13.1298 7.3894C13.1828 7.33589 13.2459 7.2934 13.3154 7.2644C13.3849 7.23541 13.4595 7.2207 13.5348 7.2207C13.6101 7.2207 13.6847 7.23541 13.7542 7.2644C13.8237 7.2934 13.8868 7.33589 13.9398 7.3894L14.6098 8.05957C14.6633 8.11257 14.7058 8.1756 14.7348 8.24512C14.7638 8.31463 14.7787 8.38928 14.7787 8.4646C14.7787 8.53992 14.7638 8.61432 14.7348 8.68384C14.7058 8.75335 14.6633 8.81663 14.6098 8.86963L13.6598 9.81958L13.5798 9.86963L12.4598 10.9995C12.6642 11.186 12.9335 11.2852 13.21 11.2759C13.4865 11.2665 13.7485 11.1493 13.9398 10.9495L15.7098 9.17944C15.9028 8.98148 16.0109 8.71594 16.0109 8.43945C16.0109 8.16296 15.9028 7.89743 15.7098 7.69946L14.2898 6.27954ZM8.99982 12.9995C9.15982 13.1495 9.34982 13.2194 9.66982 12.8994L12.9098 9.65942C13.2298 9.33942 13.1698 9.1395 13.0098 8.9895C12.8498 8.8395 12.6598 8.7696 12.3398 9.0896L9.09982 12.3296C8.78982 12.6196 8.84982 12.8195 8.99982 12.9995Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_9540_28176">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavLink_64.svg b/Content/Slate/Starship/AssetIcons/NavLink_64.svg
new file mode 100644
index 0000000..7ae2b9f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavLink_64.svg
@@ -0,0 +1,22 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23.1 4.7002C14.1733 4.7002 7 12.3517 7 21.7566C7 23.1913 7.15941 24.6259 7.47822 25.9012C7.63762 26.3794 7.79703 27.1764 8.27525 28.2923C8.43465 28.7705 8.75346 29.2487 8.91287 29.8863C10.6663 33.5527 14.6515 40.0883 23.1 50.9279C31.5485 40.0883 35.5337 33.5527 37.2871 29.8863C37.6059 29.4081 37.7653 28.9299 37.9248 28.2923C38.403 27.1764 38.5624 26.3794 38.7218 25.9012C39.0406 24.6259 39.2 23.1913 39.2 21.7566C39.0406 12.3517 31.8673 4.7002 23.1 4.7002ZM23.1 28.1329C18.796 28.1329 15.2891 24.6259 15.2891 20.322C15.2891 16.018 18.796 12.5111 23.1 12.5111C27.404 12.5111 30.9109 16.018 30.9109 20.322C30.7515 24.6259 27.404 28.1329 23.1 28.1329Z" fill="url(#paint0_linear_9539_28041)"/>
+<path d="M52.5058 44.5908L42.092 55.0045C40.0533 57.0432 36.7473 57.0432 34.7086 55.0045L33.221 53.5169C31.1823 51.4782 31.1823 48.1722 33.221 46.1335L43.6347 35.7197C45.6734 33.6811 48.9794 33.6811 51.0181 35.7197L52.5058 37.2074C54.5444 39.2461 54.5444 42.5521 52.5058 44.5908Z" fill="#5B5B5B"/>
+<path d="M40.8236 56.0514C38.6196 58.2553 34.9279 58.09 32.6137 55.7759C30.2996 53.4617 30.1343 49.77 32.3383 47.566L38.0135 41.8908L37.7931 43.103C37.6278 44.0397 37.6829 44.9764 37.9584 45.9131L38.0686 46.1335L34.4871 49.7149C33.4402 50.7618 33.4953 52.5801 34.6524 53.7372C35.8095 54.8943 37.6278 54.9494 38.6747 53.9025L44.1295 48.4476C45.1764 47.4007 45.1213 45.5825 43.9642 44.4254C43.4683 43.9295 42.752 43.5438 42.0358 43.4887L41.3195 43.4336L41.7603 42.8826C41.8154 42.8275 41.8705 42.7724 41.9256 42.7173L43.7438 40.899L43.9642 41.0092C44.7356 41.3398 45.3968 41.7806 46.0029 42.3867C48.3722 44.756 48.4824 48.3925 46.2784 50.5965L40.8236 56.0514Z" fill="url(#paint1_linear_9539_28041)"/>
+<path d="M37.4623 42.9932C37.297 43.9299 37.3521 44.9768 37.6827 45.9686L34.2665 49.3847C33.0543 50.5969 33.1094 52.6356 34.4318 53.958C35.7542 55.2804 37.7929 55.3355 39.0051 54.1233L44.4599 48.6684C45.6721 47.4563 45.617 45.4176 44.2946 44.0952C43.6885 43.4891 42.9171 43.1585 42.1458 43.0483C42.2009 42.9932 42.2559 42.9381 42.311 42.883L43.9089 41.2851C44.6252 41.5606 45.2864 42.0014 45.8374 42.5524C48.0414 44.7564 48.1516 48.1725 46.1129 50.2112L40.6581 55.6661C38.6194 57.7047 35.2032 57.5946 32.9992 55.3906C30.7953 53.1866 30.6851 49.7704 32.7237 47.7318L37.4623 42.9932ZM38.6194 40.7341L36.9113 42.4422L32.1177 47.2359C29.8035 49.55 29.9137 53.5172 32.3932 55.9967C34.8726 58.4761 38.8398 58.5863 41.154 56.2722L46.6088 50.8173C48.923 48.5031 48.8128 44.536 46.3333 42.0565C45.7272 41.4504 45.0109 40.9545 44.1844 40.5688L43.6885 40.4035L43.3028 40.7892L41.705 42.3871C41.6499 42.4422 41.5948 42.4973 41.4846 42.6075L40.5479 43.7646L41.9805 43.8748C42.5865 43.9299 43.1926 44.2054 43.6885 44.7013C44.6803 45.6931 44.7354 47.291 43.8538 48.1725L38.399 53.6274C37.4623 54.5641 35.9195 54.4539 34.9277 53.4621C33.9359 52.4703 33.8808 50.8724 34.7624 49.9908L38.1786 46.5747L38.5092 46.2441L38.399 45.8033C38.1235 44.9768 38.0684 44.0401 38.2337 43.2136L38.6194 40.7341Z" fill="#5B5B5B"/>
+<path d="M47.8203 49.0529L48.0407 47.8407C48.206 46.904 48.1509 45.9673 47.8754 45.0306L47.7652 44.8102L51.4568 41.1185C52.5037 40.0716 52.4486 38.2534 51.2915 37.0963C50.1344 35.9392 48.3162 35.8841 47.2693 36.931L41.8144 42.3858C40.7675 43.4327 40.8226 45.251 41.9797 46.4081C42.4756 46.904 43.1368 47.2346 43.8531 47.2897L44.5143 47.3999L44.1837 47.9509C44.0735 48.0611 44.0184 48.2264 43.9633 48.2815L42.3103 49.9344L42.0899 49.8242C41.3185 49.4936 40.6573 49.0529 40.0512 48.4468C37.682 46.0775 37.5718 42.4409 39.7758 40.2369L45.2306 34.7821C47.4346 32.5781 51.1262 32.7434 53.4404 35.0576C55.7546 37.3718 55.9199 41.0634 53.7159 43.2674L47.8754 49.108L47.8203 49.0529Z" fill="url(#paint2_linear_9539_28041)"/>
+<path d="M45.3964 35.0586C47.4351 33.0199 50.8513 33.1301 53.0553 35.3341C55.2592 37.538 55.3694 40.9542 53.3308 42.9929L48.4269 47.8967C48.5922 46.96 48.5371 45.9132 48.2065 44.9214L51.7329 41.395C52.9451 40.1828 52.89 38.1441 51.5676 36.8218C50.2452 35.4994 48.2065 35.4443 46.9943 36.6565L41.5395 42.1113C40.3273 43.3235 40.3824 45.3622 41.7048 46.6846C42.3109 47.2906 43.0823 47.6212 43.8537 47.7314C43.7986 47.7865 43.6884 47.8967 43.6333 47.9518L42.1456 49.4395C41.4293 49.164 40.7681 48.7232 40.2171 48.1722C38.0131 45.9683 37.9029 42.5521 39.9416 40.5134L45.3964 35.0586ZM44.8454 34.5076L39.3906 39.9624C37.0764 42.2766 37.1866 46.2438 39.6661 48.7232C40.2722 49.3293 40.9885 49.8252 41.815 50.2109L42.3109 50.3762L42.6966 49.9905L44.1843 48.5028C44.2945 48.3926 44.4047 48.2824 44.4598 48.1171L45.2311 47.0151L43.9088 46.9049C43.3027 46.8498 42.6966 46.5744 42.2558 46.1336C41.264 45.1418 41.2089 43.5439 42.0905 42.6623L47.5453 37.2074C48.482 36.2708 50.0248 36.381 51.0166 37.3727C52.0084 38.3645 52.0635 39.9624 51.1819 40.844L47.6555 44.3704L47.3249 44.701L47.4351 45.1418C47.7106 45.9683 47.7657 46.9049 47.6004 47.7314L47.2147 50.1007L48.9228 48.3926L53.8267 43.4888C56.1408 41.1746 56.0306 37.2074 53.5512 34.728C51.1268 32.3036 47.2147 32.1383 44.8454 34.5076Z" fill="#5B5B5B"/>
+<defs>
+<linearGradient id="paint0_linear_9539_28041" x1="23.2148" y1="6.08575" x2="22.8984" y2="49.2846" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#666666"/>
+</linearGradient>
+<linearGradient id="paint1_linear_9539_28041" x1="30.7941" y1="49.2484" x2="47.8876" y2="49.2484" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+<linearGradient id="paint2_linear_9539_28041" x1="38.1051" y1="41.5588" x2="55.1984" y2="41.5589" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavMeshBoundsVolume_16.svg b/Content/Slate/Starship/AssetIcons/NavMeshBoundsVolume_16.svg
new file mode 100644
index 0000000..51fc9c3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavMeshBoundsVolume_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 12H12V8L8 12Z" fill="white"/>
+<path d="M8 4H4V8L8 4Z" fill="white"/>
+<path d="M2 11.5L3.2 9.8L5 11.5L7.6 7.5L9 8.5L5 13.5L2 11.5Z" fill="white"/>
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavMeshBoundsVolume_64.svg b/Content/Slate/Starship/AssetIcons/NavMeshBoundsVolume_64.svg
new file mode 100644
index 0000000..f5bdc22
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavMeshBoundsVolume_64.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="NavMeshBoundsVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:#CCCCCC;}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.2,21.3 20.8,8.6 55.8,9.1 55.8,42.5 43.7,54.8 10,54.8 		"/>
+		<polyline class="st1" points="55.8,42.5 21.4,42.5 21.4,8.6 		"/>
+		<line class="st1" x1="22.3" y1="41.6" x2="8.9" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.6664" y1="8.5307" x2="32.9413" y2="53.6197">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54.1,8.6H21.2c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55.1,43c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.9,9,54.5,8.6,54.1,8.6z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.2566" y1="7.2465" x2="32.554" y2="56.0096">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.7,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.5,52.8c-0.1,0.1-0.2,0.1-0.3,0.1H11.5c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.5,10.4,53.7,10.5,53.7,10.7z M56.3,7.3H20.4
+				c-0.1,0-0.2,0-0.3,0.1L8.2,19.4c-0.1,0.1-0.1,0.2-0.1,0.3v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.7C56.7,7.5,56.5,7.3,56.3,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.4434" y1="20.5721" x2="55.5413" y2="8.4742">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.8" y1="9.1" x2="44.2" y2="19.9"/>
+	</g>
+	<path class="st5" d="M30.1,24.1h-9.6v9.6L30.1,24.1z"/>
+	<path class="st5" d="M30.1,43.3h9.6v-9.6L30.1,43.3z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="34.3832" y1="26.6076" x2="7.8823" y2="53.4063">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#7E7E7E"/>
+	</linearGradient>
+	<path class="st6" d="M13.5,41l2.9-4.1c0.2-0.2,0.5-0.3,0.7-0.1l4.4,4.2c0.2,0.2,0.6,0.2,0.7-0.1l7-10.8c0.2-0.2,0.5-0.3,0.7-0.1
+		l3.3,2.3c0.2,0.2,0.3,0.5,0.1,0.7L22.2,46.9c-0.2,0.2-0.4,0.2-0.7,0.1l-8-5.3C13.4,41.5,13.3,41.2,13.5,41z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavModifierComponent_16.svg b/Content/Slate/Starship/AssetIcons/NavModifierComponent_16.svg
new file mode 100644
index 0000000..d10eaa2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavModifierComponent_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 10V4C9 2.3 7.7 1 6 1H1V3H6C6.6 3 7 3.4 7 4V10C7 11.7 8.3 13 10 13H11V11H10C9.4 11 9 10.6 9 10Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 13H12V15L16 12L12 9V11H10V13Z" fill="white"/>
+<path opacity="0.5" d="M1 10V7C1 5.9 1.9 5 3 5H4C5.1 5 6 5.9 6 7V10C6 11.1 5.1 12 4 12H3C1.9 12 1 11.1 1 10Z" fill="white"/>
+<path opacity="0.5" d="M10 6V3C10 1.9 10.9 1 12 1H13C14.1 1 15 1.9 15 3V6C15 7.1 14.1 8 13 8H12C10.9 8 10 7.1 10 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavModifierComponent_64.svg b/Content/Slate/Starship/AssetIcons/NavModifierComponent_64.svg
new file mode 100644
index 0000000..9fb60ba
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavModifierComponent_64.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="NavModifierComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st2{enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:#999999;}
+	.st5{fill:url(#SVGID_3_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.9255" y1="46.2152" x2="24.9255" y2="12.2578">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st0" d="M33.4,37.7v-17c0-4.8-3.7-8.5-8.5-8.5H10.8v5.7h14.1c1.7,0,2.8,1.1,2.8,2.8v17c0,4.8,3.7,8.5,8.5,8.5h2.8v-5.7
+		h-2.8C34.5,40.6,33.4,39.4,33.4,37.7z"/>
+	<path class="st1" d="M36.2,46.2h5.7v5.7l11.3-8.5l-11.3-8.5v5.7h-5.7V46.2z"/>
+	<g class="st2">
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="18.0435" y1="25.8116" x2="17.6029" y2="43.3474">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st3" d="M16.4,42.9c-2.8,0-5.2-2.3-5.2-5.2v-8.5c0-2.8,2.3-5.2,5.2-5.2h2.8c2.8,0,5.2,2.3,5.2,5.2v8.5
+			c0,2.8-2.3,5.2-5.2,5.2H16.4z"/>
+		<path class="st4" d="M19.3,24.6c2.6,0,4.7,2.1,4.7,4.7v8.5c0,2.6-2.1,4.7-4.7,4.7h-2.8c-2.6,0-4.7-2.1-4.7-4.7v-8.5
+			c0-2.6,2.1-4.7,4.7-4.7H19.3 M19.3,23.6h-2.8c-3.1,0-5.7,2.5-5.7,5.7v8.5c0,3.1,2.5,5.7,5.7,5.7h2.8c3.1,0,5.7-2.5,5.7-5.7v-8.5
+			C24.9,26.1,22.4,23.6,19.3,23.6L19.3,23.6z"/>
+	</g>
+	<g class="st2">
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3193" y1="32.1206" x2="43.3193" y2="12.3549">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st5" d="M41.9,31.6c-2.8,0-5.2-2.3-5.2-5.2v-8.5c0-2.8,2.3-5.2,5.2-5.2h2.8c2.8,0,5.2,2.3,5.2,5.2v8.5
+			c0,2.8-2.3,5.2-5.2,5.2H41.9z"/>
+		<path class="st4" d="M44.7,13.3c2.6,0,4.7,2.1,4.7,4.7v8.5c0,2.6-2.1,4.7-4.7,4.7h-2.8c-2.6,0-4.7-2.1-4.7-4.7v-8.5
+			c0-2.6,2.1-4.7,4.7-4.7H44.7 M44.7,12.3h-2.8c-3.1,0-5.7,2.5-5.7,5.7v8.5c0,3.1,2.5,5.7,5.7,5.7h2.8c3.1,0,5.7-2.5,5.7-5.7v-8.5
+			C50.4,14.8,47.8,12.3,44.7,12.3L44.7,12.3z"/>
+	</g>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavModifierVolume_16.svg b/Content/Slate/Starship/AssetIcons/NavModifierVolume_16.svg
new file mode 100644
index 0000000..ffe23a8
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavModifierVolume_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 4H4V8L8 4Z" fill="white"/>
+<path d="M8 12H12V8L8 12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 8L5 10L3 8L2 9L4 11L2 13L3 14L5 12L7 14L8 13L6 11L8 9L7 8Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/NavModifierVolume_64.svg b/Content/Slate/Starship/AssetIcons/NavModifierVolume_64.svg
new file mode 100644
index 0000000..3123a13
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/NavModifierVolume_64.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="NavModifierVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st6{fill:#CCCCCC;}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.2,21.3 20.8,8.6 55.8,9.1 55.8,42.5 43.7,54.8 10,54.8 		"/>
+		<polyline class="st1" points="55.8,42.5 21.4,42.5 21.4,8.6 		"/>
+		<line class="st1" x1="22.3" y1="41.6" x2="8.9" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.6664" y1="8.5307" x2="32.9413" y2="53.6197">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54.1,8.6H21.2c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55.1,43c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.9,9,54.5,8.6,54.1,8.6z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.2566" y1="7.2465" x2="32.554" y2="56.0096">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.7,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.5,52.8c-0.1,0.1-0.2,0.1-0.3,0.1H11.5c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.5,10.4,53.7,10.5,53.7,10.7z M56.3,7.3H20.4
+				c-0.1,0-0.2,0-0.3,0.1L8.2,19.4c-0.1,0.1-0.1,0.2-0.1,0.3v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.7C56.7,7.5,56.5,7.3,56.3,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.4434" y1="20.5721" x2="55.5413" y2="8.4742">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.8" y1="9.1" x2="44.2" y2="19.9"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.4248" y1="32.9621" x2="9.9817" y2="54.7351">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#7E7E7E"/>
+	</linearGradient>
+	<path class="st5" d="M27.3,34.5l-4.9,4.9c-0.2,0.2-0.4,0.2-0.6,0l-4.9-4.9c-0.2-0.2-0.4-0.2-0.6,0l-2.2,2.2c-0.2,0.2-0.2,0.4,0,0.6
+		l4.9,4.9c0.2,0.2,0.2,0.4,0,0.6l-4.9,4.9c-0.2,0.2-0.2,0.4,0,0.6l2.2,2.2c0.2,0.2,0.4,0.2,0.6,0l4.9-4.9c0.2-0.2,0.4-0.2,0.6,0
+		l4.9,4.9c0.2,0.2,0.4,0.2,0.6,0l2.2-2.2c0.2-0.2,0.2-0.4,0-0.6l-4.9-4.9c-0.2-0.2-0.2-0.4,0-0.6l4.9-4.9c0.2-0.2,0.2-0.4,0-0.6
+		l-2.2-2.2C27.7,34.4,27.4,34.4,27.3,34.5z"/>
+	<path class="st6" d="M30.1,24.1h-9.6v9.6L30.1,24.1z"/>
+	<path class="st6" d="M30.1,43.3h9.6v-9.6L30.1,43.3z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Note_16.svg b/Content/Slate/Starship/AssetIcons/Note_16.svg
new file mode 100644
index 0000000..15541a4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Note_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.5 8.5L7.5 6.5L13.5 0.5L15.5 2.5L9.5 8.5ZM8.5 9.5L6.5 7.5L5 11L8.5 9.5Z" fill="white"/>
+<path opacity="0.5" d="M8 12H6H4H1V11H4V9H1V8H4L6 6H1V5H7L10 2H0V15H12V8L8 12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Note_64.svg b/Content/Slate/Starship/AssetIcons/Note_64.svg
new file mode 100644
index 0000000..d364e66
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Note_64.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#4C4C4C;}
+	.st3{opacity:0.75;}
+	.st4{fill:url(#SVGID_2_);}
+</style>
+<g id="Note_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<g>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.7605" y1="203.596" x2="27.9454" y2="244.0876" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<rect x="8.2" y="12" class="st1" width="39.3" height="42.4"/>
+			<path class="st2" d="M46.5,13v40.4H9.2V13H46.5 M48.5,11h-2H9.2h-2v2v40.4v2h2h37.3h2v-2V13V11L48.5,11z"/>
+		</g>
+		<g class="st3">
+			<rect x="13" y="21.9" class="st2" width="29.7" height="3.9"/>
+			<rect x="13" y="31.6" class="st2" width="29.7" height="3.9"/>
+			<rect x="13" y="41.9" class="st2" width="29.7" height="3.9"/>
+		</g>
+		<g>
+			<path class="st2" d="M35.1,38.8l-12.4,5c-0.6,0.2-1.2-0.4-1-1l5-12.4c0-0.1,0.1-0.2,0.2-0.2L48.6,8.6c0.3-0.3,0.8-0.3,1,0L57,16
+				c0.3,0.3,0.3,0.8,0,1L35.4,38.7C35.3,38.7,35.2,38.8,35.1,38.8z"/>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="34.9772" y1="214.7897" x2="41.0213" y2="220.8337" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="2.582137e-02" style="stop-color:#C4C4C4"/>
+				<stop  offset="6.947999e-02" style="stop-color:#DADADA"/>
+				<stop  offset="0.1211" style="stop-color:#EBEBEB"/>
+				<stop  offset="0.1849" style="stop-color:#F6F6F6"/>
+				<stop  offset="0.2744" style="stop-color:#FDFDFD"/>
+				<stop  offset="0.5228" style="stop-color:#FFFFFF"/>
+				<stop  offset="0.7496" style="stop-color:#FDFDFD"/>
+				<stop  offset="0.8313" style="stop-color:#F6F6F6"/>
+				<stop  offset="0.8895" style="stop-color:#EBEBEB"/>
+				<stop  offset="0.9366" style="stop-color:#DADADA"/>
+				<stop  offset="0.9764" style="stop-color:#C4C4C4"/>
+				<stop  offset="1" style="stop-color:#B3B3B3"/>
+			</linearGradient>
+			<path class="st4" d="M35.2,36.2l-5.8-5.8c-0.2-0.2-0.2-0.6,0-0.9l19-19c0.2-0.2,0.6-0.2,0.9,0l5.8,5.8c0.2,0.2,0.2,0.6,0,0.9
+				l-19,19C35.8,36.5,35.4,36.5,35.2,36.2z M33.8,37.2l-5.3-5.3c-0.3-0.3-0.8-0.2-1,0.2l-4,9.3c-0.2,0.5,0.3,1,0.8,0.8l9.3-4
+				C34,38,34.1,37.5,33.8,37.2z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ObjectLibrary_16.svg b/Content/Slate/Starship/AssetIcons/ObjectLibrary_16.svg
new file mode 100644
index 0000000..c153295
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ObjectLibrary_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 8.9002V7.2002L15 4.7002V6.4002L9 8.9002Z" fill="white" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 4.5002V2.7002L9 7.2002V8.9002L1 4.5002Z" fill="white"/>
+<path d="M9 12.5002V10.7002L15 8.2002V9.9002L9 12.5002Z" fill="white" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 8.0002V6.2002L9 10.7002V12.5002L1 8.0002Z" fill="white"/>
+<path d="M9 16.0002V14.2002L15 11.7002V13.4002L9 16.0002Z" fill="white" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 11.5998V9.7998L9 14.1998V15.9998L1 11.5998Z" fill="white"/>
+<path d="M7.2998 0.5L2.2998 2.4L8.7998 6L13.7998 3.9L7.2998 0.5Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ObjectLibrary_64.svg b/Content/Slate/Starship/AssetIcons/ObjectLibrary_64.svg
new file mode 100644
index 0000000..5f76d94
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ObjectLibrary_64.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ObjectLibrary_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_9_);}
+	.st9{fill:url(#SVGID_10_);}
+	.st10{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="50.6477" y1="28.5106" x2="14.5753" y2="45.9951">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<polygon class="st0" points="8.9,34.2 36,48.8 56.4,40.3 28.4,27.2 		"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="36.0375" y1="44.4696" x2="8.8337" y2="44.3786">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st1" d="M8.9,39.7v-5.5L36,48.8v5.9L8.9,39.7z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="56.3918" y1="42.1784" x2="34.1335" y2="52.9672">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st2" d="M36,54.6v-5.9l20.4-8.5v5.2L36,54.6z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="50.6477" y1="19.6919" x2="14.5753" y2="37.1764">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<polygon class="st3" points="8.9,25.4 36,39.9 56.4,31.5 28.4,18.4 		"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="36.0375" y1="35.6509" x2="8.8337" y2="35.5599">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st4" d="M8.9,30.9v-5.5L36,39.9v5.9L8.9,30.9z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="56.3918" y1="33.3598" x2="34.1335" y2="44.1485">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st5" d="M36,45.8v-5.9l20.4-8.5v5.2L36,45.8z"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="50.6477" y1="10.7697" x2="14.5753" y2="28.2542">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<polygon class="st6" points="8.9,16.5 36,31 56.4,22.5 28.4,9.5 		"/>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="36.0375" y1="26.7286" x2="8.8337" y2="26.6376">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st7" d="M8.9,22v-5.5L36,31v5.9L8.9,22z"/>
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="56.3918" y1="24.4375" x2="34.1335" y2="35.2262">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st8" d="M36,36.9V31l20.4-8.5v5.2L36,36.9z"/>
+	</g>
+	<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="46.6405" y1="12.4127" x2="19.2915" y2="25.6689">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<polygon class="st9" points="15,16.7 35.5,27.8 51,21.3 29.8,11.4 	"/>
+	<rect x="0" class="st10" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Object_16.svg b/Content/Slate/Starship/AssetIcons/Object_16.svg
new file mode 100644
index 0000000..0f53f20
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Object_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 15C11.366 15 14.5 11.866 14.5 8C14.5 4.13401 11.366 1 7.5 1C3.63401 1 0.5 4.13401 0.5 8C0.5 11.866 3.63401 15 7.5 15Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M7 13.1004L3 10.7004V5.90039L7 8.30039V13.1004Z" fill="white"/>
+<path d="M3.5 5.10078L7.5 2.80078L11.5 5.10078L7.5 7.50078L3.5 5.10078Z" fill="white"/>
+<path d="M12 10.7004L8 13.1004V8.30039L12 5.90039V10.7004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Object_64.svg b/Content/Slate/Starship/AssetIcons/Object_64.svg
new file mode 100644
index 0000000..1a28ce1
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Object_64.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Object_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:none;stroke:#BFBFBF;stroke-width:1.5958;stroke-miterlimit:10;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:none;stroke:url(#SVGID_4_);stroke-width:3;stroke-miterlimit:10;}
+	.st5{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9138" y1="16.8825" x2="31.9876" y2="28.9745">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</linearGradient>
+		<polygon class="st0" points="46.8,22.2 32.1,16.9 17.1,22.3 32.1,29 		"/>
+		<g>
+			<line class="st1" x1="32.1" y1="46.1" x2="32.1" y2="28.2"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="39.3027" y1="22.2767" x2="39.4539" y2="47.0731">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<polygon class="st2" points="32.1,28.2 46.8,22.2 46.9,39.7 32,47.1 			"/>
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="24.5331" y1="22.2155" x2="24.6852" y2="47.1631">
+				<stop  offset="0.4118" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#CCCCCC"/>
+			</linearGradient>
+			<polygon class="st3" points="32.1,28.3 17.1,22.3 17.1,39.7 32,47.1 			"/>
+		</g>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.862" y1="9.3695" x2="32.138" y2="54.6305">
+		<stop  offset="0" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<circle class="st4" cx="32" cy="32" r="21.1"/>
+	<rect x="0" class="st5" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PackedLevelActor_16.svg b/Content/Slate/Starship/AssetIcons/PackedLevelActor_16.svg
new file mode 100644
index 0000000..802c568
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PackedLevelActor_16.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.5;fill:#FFFFFF;}
+	.st1{opacity:0.5;}
+	.st2{fill:#FFFFFF;}
+	.st3{opacity:0.25;fill:#FFFFFF;}
+	.st4{opacity:0.5;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
+	.st5{opacity:0.75;}
+</style>
+<g>
+	<path class="st0" d="M15.8,13.2l-2.7,2.7c-0.2,0.1-0.2,0-0.2-0.1V4.2c0-0.1,0-0.3,0.1-0.4l2.7-2.7C16,0.9,16,1.2,16,1.3v11.3
+		C16,12.8,16,13,15.8,13.2z"/>
+	<g class="st1">
+		<path class="st2" d="M15.5,2v10.6c0,0.1,0,0.1-0.1,0.2l-2,2V4.2c0,0,0-0.1,0-0.1L15.5,2 M15.9,1c0,0-0.1,0-0.1,0.1L13,3.8
+			c-0.1,0.1-0.1,0.3-0.1,0.4v11.5c0,0.1,0,0.2,0.1,0.2c0,0,0.1,0,0.1,0l2.7-2.7C16,13,16,12.8,16,12.6V1.3C16,1.2,16,1,15.9,1
+			L15.9,1z"/>
+	</g>
+</g>
+<g>
+	<path class="st3" d="M12.2,3.6H0.8c-0.1,0-0.5,0-0.2-0.2l2.6-2.6c0.2-0.2,0.3-0.2,0.4-0.2h11.9c0.2,0,0.2,0,0,0.2l-2.7,2.7
+		C12.6,3.6,12.4,3.6,12.2,3.6z"/>
+	<g class="st1">
+		<path class="st2" d="M14.5,1l-2.1,2.1c0,0,0,0-0.1,0l-0.1,0c0,0-0.1,0-0.1,0l-10.7,0l2-2C3.5,1,3.6,1,3.6,1H14.5 M15.5,0.5H3.5
+			c-0.1,0-0.2,0.1-0.4,0.2L0.5,3.3c-0.2,0.2,0,0.2,0.1,0.2c0,0,0.1,0,0.1,0h11.5c0,0,0.1,0,0.1,0c0.1,0,0.3,0,0.5-0.2l2.7-2.7
+			C15.7,0.5,15.7,0.5,15.5,0.5L15.5,0.5z"/>
+	</g>
+</g>
+<g>
+	<path class="st2" d="M11.4,5v10h-10V5H11.4 M12.2,4H0.7C0.6,4,0.4,4.1,0.4,4.2v11.5c0,0.1,0.1,0.2,0.2,0.2h11.5
+		c0.1,0,0.2-0.1,0.2-0.2V4.2C12.4,4.1,12.3,4,12.2,4L12.2,4z"/>
+</g>
+<g>
+	<polygon class="st2" points="7.6,4 5.4,4 5.4,6.8 6.2,6.5 6.9,6.9 7.6,6.8 	"/>
+</g>
+<path class="st4" d="M10.2,13.2l-0.8-2.6l1.3,2.6v1.1H2.2v-1.1l1.3-2.7l-0.8,2.7H10.2z"/>
+<path class="st2" d="M6.7,11.9L5.4,7.4l-1.6,5.3h5.3L7.8,9.3L6.7,11.9z"/>
+<g class="st5">
+	<polygon class="st2" points="6,3.3 8.5,0.7 10,0.7 7.5,3.3 	"/>
+	<path class="st2" d="M9.4,1L7.4,3.1H6.6L8.6,1H9.4 M10.6,0.5H8.4l-3,3.1h2.2L10.6,0.5L10.6,0.5z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PackedLevelActor_64.svg b/Content/Slate/Starship/AssetIcons/PackedLevelActor_64.svg
new file mode 100644
index 0000000..3febd86
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PackedLevelActor_64.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000100379308157517742500000011885850826788906894_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{opacity:0.71;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000170280313786359687250000017393604425325312164_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#C0BFBF;}
+	.st7{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st8{opacity:0.5;}
+	.st9{fill:#FFFFFF;}
+	.st10{opacity:0.25;fill:#FFFFFF;enable-background:new    ;}
+	.st11{opacity:0.75;}
+</style>
+<rect class="st0" width="64" height="64"/>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.0407" y1="51.2408" x2="26.9593" y2="18.9592" gradientTransform="matrix(1 0 0 1 0 2)">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#818181"/>
+	</linearGradient>
+	<rect x="10.8" y="21" class="st1" width="32.4" height="32.2"/>
+	<g>
+		
+			<linearGradient id="SVGID_00000008122562233287492130000009387643169385663133_" gradientUnits="userSpaceOnUse" x1="-2725.719" y1="28.6827" x2="-2725.5962" y2="42.488" gradientTransform="matrix(-1 0 0 1 -2698.4956 2)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#989898"/>
+		</linearGradient>
+		<path style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000008122562233287492130000009387643169385663133_);" d="
+			M35.4,44.6l-3.9-8.2l-2.8,4.9L24.5,31l-5.7,13.5L35.4,44.6L35.4,44.6z"/>
+		<polygon class="st3" points="24.4,31 26.2,35.3 25,34.2 24.3,36.2 23.8,34 23,34.4 		"/>
+		<polygon class="st3" points="31.5,36.3 32.9,39.4 32.1,38.7 31.7,39.9 31.2,38.4 30,38.8 		"/>
+		<polygon class="st4" points="31.2,37.3 28.5,42.7 25.2,34.3 25.5,33.4 28.6,41.2 30.5,37.9 		"/>
+	</g>
+	
+		<linearGradient id="SVGID_00000132810466760049281880000012105030127640413866_" gradientUnits="userSpaceOnUse" x1="27.0529" y1="47.1062" x2="27.0297" y2="37.9176" gradientTransform="matrix(1 0 0 1 0 2)">
+		<stop  offset="0.3858" style="stop-color:#E6E6E5"/>
+		<stop  offset="1" style="stop-color:#414141"/>
+	</linearGradient>
+	<path style="fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_00000132810466760049281880000012105030127640413866_);" d="
+		M37.2,46.1L35,40l3.6,6.6v2.7H15.5v-2.7l3.6-6.7l-2.2,6.2H37.2z"/>
+	<rect x="15.5" y="46.6" class="st6" width="23.1" height="2.7"/>
+</g>
+<g>
+	<path class="st7" d="M53.1,45.9l-7.5,7.5c-0.4,0.3-0.5,0.1-0.5-0.3V21c0-0.4,0-0.8,0.4-1.2l7.5-7.6c0.6-0.5,0.7,0.2,0.7,0.6v31.6
+		C53.7,44.8,53.6,45.4,53.1,45.9z"/>
+	<g class="st8">
+		<path class="st9" d="M52.7,14v30.5c0,0.4-0.1,0.6-0.3,0.7l0,0l0,0L46,51.6V21c0-0.3,0-0.4,0.1-0.5L52.7,14 M53.3,12.1
+			c-0.1,0-0.2,0-0.4,0.2l-7.5,7.6C45,20.2,45,20.7,45,21v32.1c0,0.3,0.1,0.4,0.2,0.4c0.1,0,0.2,0,0.3-0.1l7.5-7.5
+			c0.5-0.5,0.6-1.1,0.6-1.5V12.8C53.7,12.6,53.6,12.1,53.3,12.1L53.3,12.1z"/>
+	</g>
+</g>
+<g>
+	<path class="st10" d="M43.2,19.1H11.3c-0.4,0-1.4,0.1-0.7-0.7l7.2-7.3c0.5-0.5,0.8-0.7,1.1-0.7h33.2c0.5,0,0.6,0.1,0,0.7l-7.4,7.5
+		C44.3,19.2,43.6,19.1,43.2,19.1z"/>
+	<g class="st8">
+		<path class="st9" d="M50.5,11.5L44.1,18c-0.1,0.1-0.3,0.1-0.6,0.1h-0.2h-0.2H12.3l6.2-6.3c0.3-0.3,0.4-0.4,0.4-0.4L50.5,11.5
+			 M52.2,10.5H19c-0.4,0-0.7,0.2-1.1,0.7l-7.2,7.3c-0.6,0.6,0,0.7,0.4,0.7c0.1,0,0.2,0,0.3,0h31.9c0.1,0,0.2,0,0.3,0
+			c0.4,0,0.9,0,1.3-0.4l7.4-7.5C52.8,10.6,52.7,10.5,52.2,10.5L52.2,10.5z"/>
+	</g>
+</g>
+<g>
+	<path class="st9" d="M42.8,21.4v31.4H11.3V21.4H42.8 M43.5,20.4h-33c-0.1,0-0.2,0.1-0.2,0.2v33c0,0.1,0.1,0.2,0.2,0.2h33
+		c0.1,0,0.2-0.1,0.2-0.2v-33C43.8,20.5,43.7,20.4,43.5,20.4L43.5,20.4z"/>
+</g>
+<g class="st11">
+	<polygon class="st9" points="30.2,20.4 24.1,20.4 24.1,28 26.2,27.4 28.3,28.5 30.2,28 	"/>
+</g>
+<g class="st11">
+	<polygon class="st9" points="24.7,18.9 32.6,10.8 38.1,10.8 30.1,18.9 	"/>
+	<path class="st9" d="M37.5,11L30,18.6h-4.7l7.5-7.6H37.5 M38.6,10.5h-6.1L24,19.1h6.1L38.6,10.5L38.6,10.5z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PainCausingVolume_16.svg b/Content/Slate/Starship/AssetIcons/PainCausingVolume_16.svg
new file mode 100644
index 0000000..31edac3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PainCausingVolume_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.8 10.0997L7.1 12.5997L9.5 9.89978L9 14.9998H9.7L12.5 11.2998L10.3 11.8998L10.7 6.7998L7.4 10.7998L5.4 5.2998L4.3 11.4998L1.5 10.2998L3.8 14.9998H4.4L5.8 10.0997Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PainCausingVolume_64.svg b/Content/Slate/Starship/AssetIcons/PainCausingVolume_64.svg
new file mode 100644
index 0000000..c274910
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PainCausingVolume_64.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PainCausingVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<g>
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="27.4889" y1="25.0832" x2="27.1564" y2="49.2747">
+				<stop  offset="0" style="stop-color:#E6E6E6"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st5" d="M34,49.2l7-9.2l-5.5,1.5l1-12.7l-8.2,10l-5-13.7l-2.7,15.4l-7-3l5.7,11.7H34z"/>
+			<path class="st6" d="M31.3,49.2l4.5-6l-3.6,1l0.6-8.3l-5.3,6.5l-3.2-8.9l-1.8,10L18,41.6l3.7,7.6H31.3z"/>
+		</g>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PawnNoiseEmitterComponent_16.svg b/Content/Slate/Starship/AssetIcons/PawnNoiseEmitterComponent_16.svg
new file mode 100644
index 0000000..a1f20ab
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PawnNoiseEmitterComponent_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M7.4999 11.3998V8.2998H4.4999V11.3998C4.4999 13.0998 3.0999 14.4998 1.3999 14.4998H10.6999C8.8999 14.4998 7.4999 13.0998 7.4999 11.3998Z" fill="white"/>
+<path d="M8.2999 9.79922H3.6999C3.1999 9.79922 2.8999 9.49922 2.8999 8.99922C2.8999 8.59922 3.1999 8.19922 3.6999 8.19922H8.2999C8.6999 8.19922 9.0999 8.49922 9.0999 8.99922C9.0999 9.49922 8.7999 9.79922 8.2999 9.79922Z" fill="white"/>
+<path d="M10.5999 16H1.3999V15.5C1.3999 14.9 1.7999 14.5 2.3999 14.5H9.6999C10.2999 14.5 10.6999 14.9 10.6999 15.5V16H10.5999Z" fill="white"/>
+<path d="M6.0001 7.8C7.04944 7.8 7.9001 6.94934 7.9001 5.9C7.9001 4.85066 7.04944 4 6.0001 4C4.95076 4 4.1001 4.85066 4.1001 5.9C4.1001 6.94934 4.95076 7.8 6.0001 7.8Z" fill="white"/>
+<path d="M14.7999 6.89961L14.6999 4.59961L9.8999 6.49961L14.7999 6.89961Z" fill="white"/>
+<path d="M14.0999 1.59922L12.3999 0.199219L9.3999 4.19922L14.0999 1.59922Z" fill="white"/>
+<path d="M13.9002 11.7996L14.9002 9.79961L10.2002 8.59961L13.9002 11.7996Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PawnNoiseEmitterComponent_64.svg b/Content/Slate/Starship/AssetIcons/PawnNoiseEmitterComponent_64.svg
new file mode 100644
index 0000000..9280d3b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PawnNoiseEmitterComponent_64.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PawnNoiseEmitterComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:none;stroke:url(#SVGID_4_);stroke-miterlimit:10;}
+	.st4{fill:none;stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill:url(#SVGID_8_);}
+	.st8{fill:url(#SVGID_9_);}
+	.st9{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.1133" y1="27.9776" x2="26.1133" y2="52.3647">
+		<stop  offset="0.2807" style="stop-color:#242424"/>
+		<stop  offset="0.3899" style="stop-color:#595959"/>
+		<stop  offset="1" style="stop-color:#8A8A8A"/>
+	</linearGradient>
+	<path class="st0" d="M32.2,40.2V28H20v12.2c0,6.7-3,12.2-9.7,12.2h31.7C35.2,52.4,32.2,46.9,32.2,40.2z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="26.1133" y1="27.3028" x2="26.1133" y2="33.5378">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.8342" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4A4A4A"/>
+	</linearGradient>
+	<path class="st1" d="M35.3,34.1H17c-1.8,0-3-1.2-3-3c0-1.8,1.2-3,3-3h18.3c1.8,0,3,1.2,3,3C38.3,32.9,37.1,34.1,35.3,34.1z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="26.1133" y1="52.3647" x2="26.1133" y2="58.4615">
+		<stop  offset="0" style="stop-color:#BFBFBF"/>
+		<stop  offset="0.7005" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st2" d="M44.4,58.5H7.8v-3c0-1.8,1.2-3,3-3h30.5c1.8,0,3,1.2,3,3V58.5z"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-102.9656" y1="52.894" x2="-76.2467" y2="52.894" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st3" x1="8.9" y1="52.9" x2="43.1" y2="52.9"/>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-97.0398" y1="28.3738" x2="-81.6395" y2="28.3738" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st4" x1="16.5" y1="28.4" x2="36.2" y2="28.4"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="40.2309" y1="18.2968" x2="58.3606" y2="18.2968">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#F2F2F2;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st5" points="38.3,18.4 55.4,15.2 55.4,21.3 	"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="38.0806" y1="15.7671" x2="55.2476" y2="3.5737">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="0.9978" style="stop-color:#F2F2F2;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st6" points="37.9,15.4 50.4,3.3 53.8,8.4 	"/>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="37.8879" y1="20.8684" x2="55.1352" y2="32.9014">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#F2F2F2;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st7" points="37.9,21.2 50.4,33.3 53.8,28.2 	"/>
+	<radialGradient id="SVGID_9_" cx="28.1483" cy="15.5016" r="11.1529" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.2421" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.6136" style="stop-color:#838383"/>
+		<stop  offset="0.7861" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</radialGradient>
+	<path class="st8" d="M26.4,26.7c4.3,0,7.8-3.5,7.8-7.8S30.7,11,26.4,11s-7.8,3.5-7.8,7.8S22,26.7,26.4,26.7z"/>
+	<rect x="0" class="st9" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PawnSensingComponent_16.svg b/Content/Slate/Starship/AssetIcons/PawnSensingComponent_16.svg
new file mode 100644
index 0000000..20d85cf
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PawnSensingComponent_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9.4999 10.3998V7.2998H6.4999V10.3998C6.4999 12.0998 5.0999 13.4998 3.3999 13.4998H12.6999C10.8999 13.4998 9.4999 12.0998 9.4999 10.3998Z" fill="white"/>
+<path d="M10.2999 8.79922H5.6999C5.1999 8.79922 4.8999 8.49922 4.8999 7.99922C4.8999 7.59922 5.1999 7.19922 5.6999 7.19922H10.2999C10.6999 7.19922 11.0999 7.49922 11.0999 7.99922C11.0999 8.49922 10.7999 8.79922 10.2999 8.79922Z" fill="white"/>
+<path d="M12.5999 15H3.3999V14.5C3.3999 13.9 3.7999 13.5 4.3999 13.5H11.6999C12.2999 13.5 12.6999 13.9 12.6999 14.5V15H12.5999Z" fill="white"/>
+<path d="M7.99961 6.8C9.04895 6.8 9.89961 5.94934 9.89961 4.9C9.89961 3.85066 9.04895 3 7.99961 3C6.95027 3 6.09961 3.85066 6.09961 4.9C6.09961 5.94934 6.95027 6.8 7.99961 6.8Z" fill="white"/>
+<path opacity="0.5" d="M13.8001 6C13.8001 7.6 13.1001 9.1 12.1001 10.2L12.9001 11C14.2001 9.7 15.0001 8 15.0001 6C15.0001 4 14.2001 2.3 12.9001 1L12.1001 1.8C13.2001 2.9 13.8001 4.4 13.8001 6Z" fill="white"/>
+<path opacity="0.5" d="M2.2 6C2.2 7.6 2.9 9.1 3.9 10.2L3.1 11C1.8 9.7 1 8 1 6C1 4 1.8 2.3 3.1 1L3.9 1.8C2.8 2.9 2.2 4.4 2.2 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PawnSensingComponent_64.svg b/Content/Slate/Starship/AssetIcons/PawnSensingComponent_64.svg
new file mode 100644
index 0000000..64fa8fb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PawnSensingComponent_64.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PawnSensingComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:none;stroke:url(#SVGID_4_);stroke-miterlimit:10;}
+	.st4{fill:none;stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_6_);enable-background:new    ;}
+	.st6{fill:url(#SVGID_7_);enable-background:new    ;}
+	.st7{fill:url(#SVGID_8_);}
+	.st8{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.2352" y1="27.9776" x2="32.2352" y2="52.3647">
+		<stop  offset="0.2807" style="stop-color:#242424"/>
+		<stop  offset="0.3899" style="stop-color:#595959"/>
+		<stop  offset="1" style="stop-color:#8A8A8A"/>
+	</linearGradient>
+	<path class="st0" d="M38.3,40.2V28H26.1v12.2c0,6.7-3,12.2-9.7,12.2h31.7C41.4,52.4,38.3,46.9,38.3,40.2z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.2352" y1="27.3028" x2="32.2352" y2="33.5378">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.8342" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4A4A4A"/>
+	</linearGradient>
+	<path class="st1" d="M41.4,34.1H23.1c-1.8,0-3-1.2-3-3c0-1.8,1.2-3,3-3h18.3c1.8,0,3,1.2,3,3C44.4,32.9,43.2,34.1,41.4,34.1z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32.2352" y1="52.3647" x2="32.2352" y2="58.4615">
+		<stop  offset="0" style="stop-color:#BFBFBF"/>
+		<stop  offset="0.7005" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st2" d="M50.5,58.5H13.9v-3c0-1.8,1.2-3,3-3h30.5c1.8,0,3,1.2,3,3V58.5z"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-98.174" y1="52.894" x2="-71.4551" y2="52.894" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st3" x1="15.1" y1="52.9" x2="49.2" y2="52.9"/>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-92.2482" y1="28.3738" x2="-76.8479" y2="28.3738" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st4" x1="22.6" y1="28.4" x2="42.3" y2="28.4"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="16.42" y1="23.0948" x2="5.4121" y2="23.0948">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st5" d="M10.8,23.1c0,4.9,1.9,9.4,4.7,13c0.6,0.8,0.5,1.9-0.1,2.6l0,0c-0.8,0.8-2.1,0.8-2.8-0.1
+		c-3.6-4.2-5.8-9.5-5.8-15.5s2.2-11.3,5.8-15.5c0.7-0.9,2-0.9,2.8-0.1l0,0c0.7,0.7,0.8,1.8,0.1,2.6C12.5,13.7,10.8,18.2,10.8,23.1z"
+		/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="48.503" y1="23.0948" x2="57.7178" y2="23.0948">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st6" d="M49.1,7.4L49.1,7.4c0.8-0.8,2.1-0.8,2.8,0.1c3.6,4.2,5.8,9.5,5.8,15.5S55.6,34.4,52,38.6
+		c-0.7,0.9-2,0.9-2.8,0.1l0,0c-0.7-0.7-0.8-1.8-0.1-2.6c2.8-3.6,4.7-8.2,4.7-13c0-4.9-1.6-9.4-4.6-13C48.4,9.3,48.4,8.2,49.1,7.4z"
+		/>
+	<radialGradient id="SVGID_8_" cx="34.2702" cy="15.4737" r="11.1529" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.2421" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.6136" style="stop-color:#838383"/>
+		<stop  offset="0.7861" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</radialGradient>
+	<path class="st7" d="M32.5,26.6c4.3,0,7.8-3.5,7.8-7.8S36.8,11,32.5,11s-7.8,3.5-7.8,7.8S28.1,26.6,32.5,26.6z"/>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Pawn_16-1.svg b/Content/Slate/Starship/AssetIcons/Pawn_16-1.svg
new file mode 100644
index 0000000..2dc0437
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Pawn_16-1.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 10V6H6V10C6 12.2 4.2 14 2 14H14C11.8 14 10 12.2 10 10Z" fill="white"/>
+<path d="M11 8H5C4.4 8 4 7.6 4 7C4 6.4 4.4 6 5 6H11C11.6 6 12 6.4 12 7C12 7.6 11.6 8 11 8Z" fill="white"/>
+<path d="M14 16H2V15C2 14.4 2.4 14 3 14H13C13.6 14 14 14.4 14 15V16Z" fill="white"/>
+<path d="M8 5.5C9.38071 5.5 10.5 4.38071 10.5 3C10.5 1.61929 9.38071 0.5 8 0.5C6.61929 0.5 5.5 1.61929 5.5 3C5.5 4.38071 6.61929 5.5 8 5.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Pawn_16.svg b/Content/Slate/Starship/AssetIcons/Pawn_16.svg
new file mode 100644
index 0000000..2dc0437
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Pawn_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 10V6H6V10C6 12.2 4.2 14 2 14H14C11.8 14 10 12.2 10 10Z" fill="white"/>
+<path d="M11 8H5C4.4 8 4 7.6 4 7C4 6.4 4.4 6 5 6H11C11.6 6 12 6.4 12 7C12 7.6 11.6 8 11 8Z" fill="white"/>
+<path d="M14 16H2V15C2 14.4 2.4 14 3 14H13C13.6 14 14 14.4 14 15V16Z" fill="white"/>
+<path d="M8 5.5C9.38071 5.5 10.5 4.38071 10.5 3C10.5 1.61929 9.38071 0.5 8 0.5C6.61929 0.5 5.5 1.61929 5.5 3C5.5 4.38071 6.61929 5.5 8 5.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Pawn_64.svg b/Content/Slate/Starship/AssetIcons/Pawn_64.svg
new file mode 100644
index 0000000..edec3d9
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Pawn_64.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Pawn_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:none;stroke:url(#SVGID_4_);stroke-miterlimit:10;}
+	.st4{fill:none;stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9184" y1="23.6972" x2="31.9184" y2="51.5087">
+		<stop  offset="0.2807" style="stop-color:#242424"/>
+		<stop  offset="0.3899" style="stop-color:#595959"/>
+		<stop  offset="1" style="stop-color:#8A8A8A"/>
+	</linearGradient>
+	<path class="st0" d="M38.9,37.6V23.7H25v13.9c0,7.6-3.4,13.9-11.1,13.9H50C42.3,51.5,38.9,45.3,38.9,37.6z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.9184" y1="22.9276" x2="31.9184" y2="30.0381">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.8342" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4A4A4A"/>
+	</linearGradient>
+	<path class="st1" d="M42.3,30.7H21.5c-2.1,0-3.5-1.4-3.5-3.5s1.4-3.5,3.5-3.5h20.9c2.1,0,3.5,1.4,3.5,3.5S44.4,30.7,42.3,30.7z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.9184" y1="51.5087" x2="31.9184" y2="58.4615">
+		<stop  offset="0" style="stop-color:#BFBFBF"/>
+		<stop  offset="0.7005" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st2" d="M52.8,58.5H11.1V55c0-2.1,1.4-3.5,3.5-3.5h34.8c2.1,0,3.5,1.4,3.5,3.5V58.5z"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-100.3092" y1="52.1122" x2="-69.8385" y2="52.1122" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st3" x1="12.3" y1="52.1" x2="51.3" y2="52.1"/>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-93.5514" y1="24.149" x2="-75.9886" y2="24.149" gradientTransform="matrix(1.2776 0 0 1 140.4942 0)">
+		<stop  offset="0" style="stop-color:#E6E6E6;stop-opacity:0"/>
+		<stop  offset="0.508" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+	</linearGradient>
+	<line class="st4" x1="21" y1="24.1" x2="43.4" y2="24.1"/>
+	<radialGradient id="SVGID_6_" cx="34.1817" cy="9.5756" r="12.3631" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.2421" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.6136" style="stop-color:#838383"/>
+		<stop  offset="0.7861" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</radialGradient>
+	<path class="st5" d="M32.2,22c4.8,0,8.7-3.9,8.7-8.7S37,4.6,32.2,4.6s-8.7,3.9-8.7,8.7S27.4,22,32.2,22z"/>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicalMaterial_16.svg b/Content/Slate/Starship/AssetIcons/PhysicalMaterial_16.svg
new file mode 100644
index 0000000..01781a1
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicalMaterial_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 7H7V9L9 7Z" fill="white"/>
+<path d="M7 11H3V11.5C2.8 11.4 2.7 11.2 2.5 11H3V7H1C1 5.5 1.6 4.1 2.5 3H3V2.5C4.1 1.6 5.5 1 7 1V3H11V2.5C11.2 2.6 11.3 2.8 11.5 3H11V5H13.7C12.8 2.1 10.2 0 7 0C3.1 0 0 3.1 0 7C0 10.9 3.1 14 7 14V13V11Z" fill="white"/>
+<path d="M7 3H3V7H7V3Z" fill="white"/>
+<path opacity="0.5" d="M12.4998 6.9C12.0998 6.9 11.7998 7.2 11.7998 7.5V8.2L10.7998 8.5V7.3C10.7998 6.6 11.4998 6 12.3998 6C13.2998 6 13.9998 6.7 13.9998 7.3V8.5L12.9998 8.2V7.6C13.1998 7.2 12.8998 6.9 12.4998 6.9Z" fill="white"/>
+<path d="M12.5 16C14.433 16 16 14.433 16 12.5C16 10.567 14.433 9 12.5 9C10.567 9 9 10.567 9 12.5C9 14.433 10.567 16 12.5 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicalMaterial_64.svg b/Content/Slate/Starship/AssetIcons/PhysicalMaterial_64.svg
new file mode 100644
index 0000000..77a978f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicalMaterial_64.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PhysicalMaterial_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-miterlimit:10;}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);enable-background:new    ;}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{opacity:0.1;fill:#FFFFFF;}
+	.st8{fill:none;}
+</style>
+<g>
+	<g>
+		<radialGradient id="SVGID_1_" cx="32" cy="32" r="22.2409" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<path class="st0" d="M32,54.2c12.3,0,22.2-10,22.2-22.2c0-12.3-10-22.2-22.2-22.2C19.7,9.8,9.8,19.7,9.8,32
+			C9.8,44.3,19.7,54.2,32,54.2z"/>
+		<g>
+			<path class="st1" d="M45.7,18.3v-3.8c-3.8-3.1-8.6-4.8-13.7-4.8v8.6H45.7z"/>
+			<path class="st1" d="M45.7,32H32v13.7h13.7V32z"/>
+			<path class="st1" d="M32,18.3H18.3V32H32V18.3z"/>
+			<path class="st1" d="M54.2,32c0-5.1-1.7-9.9-4.8-13.7h-3.8V32H54.2z"/>
+			<path class="st1" d="M49.5,45.7h-3.8v3.8C47.1,48.4,48.4,47.1,49.5,45.7z"/>
+			<path class="st1" d="M18.3,49.5c3.8,3.1,8.6,4.8,13.7,4.8v-8.6H18.3V49.5z"/>
+			<path class="st1" d="M9.8,32c0,5.1,1.7,9.9,4.8,13.7h3.8V32H9.8z"/>
+			<path class="st1" d="M14.5,18.3h3.8v-3.8C16.9,15.6,15.6,16.9,14.5,18.3z"/>
+		</g>
+		<radialGradient id="SVGID_2_" cx="31.8525" cy="31.8841" r="21.6998" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080;stop-opacity:0"/>
+			<stop  offset="0.8223" style="stop-color:#333333;stop-opacity:0.5"/>
+			<stop  offset="1" style="stop-color:#333333;stop-opacity:0.8"/>
+		</radialGradient>
+		<path class="st2" d="M31.9,53.6c12,0,21.7-9.7,21.7-21.7c0-12-9.7-21.7-21.7-21.7c-12,0-21.7,9.7-21.7,21.7
+			C10.2,43.9,19.9,53.6,31.9,53.6z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32" y1="8.7591" x2="32" y2="55.2409">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</linearGradient>
+		<path class="st3" d="M32,54.2c12.3,0,22.2-10,22.2-22.2c0-12.3-10-22.2-22.2-22.2C19.7,9.8,9.8,19.7,9.8,32
+			C9.8,44.3,19.7,54.2,32,54.2z"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="43.0793" y1="55.7826" x2="42.8749" y2="33.7028">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st4" d="M53.8,56.3H32.1c-1.7,0-3-1.4-3-3V37c0-1.7,1.4-3,3-3h21.7c1.7,0,3,1.4,3,3v16.2
+		C56.9,54.9,55.5,56.3,53.8,56.3z"/>
+	<g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="43.3993" y1="36.9124" x2="42.8726" y2="40.6696">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st5" d="M42.9,37c-0.8,0.1-1.4,0.6-1.4,1.4v3.1L39.6,42v-4c0-1.4,1.4-2.7,3.3-2.7s3.5,1.4,3.5,2.7v4l-1.9-0.6v-3.1
+			C44.4,37.6,43.9,36.9,42.9,37z"/>
+		<radialGradient id="SVGID_6_" cx="44.6447" cy="44.6467" r="10.3248" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+			<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</radialGradient>
+		<path class="st6" d="M43,55c4,0,7.3-3.2,7.3-7.3S47,40.5,43,40.5s-7.3,3.2-7.3,7.3S39,55,43,55z"/>
+		<path class="st7" d="M43,55c4,0,7.3-3.2,7.3-7.3S47,40.5,43,40.5s-7.3,3.2-7.3,7.3S39,55,43,55z"/>
+	</g>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsAsset_16.svg b/Content/Slate/Starship/AssetIcons/PhysicsAsset_16.svg
new file mode 100644
index 0000000..e646cb8
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsAsset_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8 1.9C7.3 1.9 6.9 2.4 6.9 2.9V4L5.5 4.4V2.6C5.5 1.5 6.6 0.5 8 0.5C9.5 0.5 10.5 1.5 10.5 2.6V4.5L9 4.1V2.9C9 2.4 8.7 1.9 8 1.9Z" fill="white"/>
+<path d="M8.0001 15.5002C10.9824 15.5002 13.4001 13.0825 13.4001 10.1002C13.4001 7.11786 10.9824 4.7002 8.0001 4.7002C5.01776 4.7002 2.6001 7.11786 2.6001 10.1002C2.6001 13.0825 5.01776 15.5002 8.0001 15.5002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsAsset_64.svg b/Content/Slate/Starship/AssetIcons/PhysicsAsset_64.svg
new file mode 100644
index 0000000..5d65ded
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsAsset_64.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PhysicsAsset_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{opacity:0.1;fill:#FFFFFF;}
+	.st3{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="33.675" y1="13.3606" x2="32.4793" y2="21.8904">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<path class="st0" d="M32.5,13.5c-1.7,0.1-3.1,1.3-3.1,3.1v6.9l-4.4,1.3v-9.1c0-3.1,3.1-6.1,7.5-6.1s7.9,3.1,7.9,6.1v9.1L36,23.6
+		v-6.9C36,14.8,34.7,13.4,32.5,13.5z"/>
+	<radialGradient id="SVGID_2_" cx="36.5024" cy="30.9195" r="23.4401" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st1" d="M32.7,54.4c9.1,0,16.5-7.4,16.5-16.5s-7.4-16.5-16.5-16.5s-16.5,7.4-16.5,16.5S23.6,54.4,32.7,54.4z"/>
+	<path class="st2" d="M32.7,54.4c9.1,0,16.5-7.4,16.5-16.5s-7.4-16.5-16.5-16.5s-16.5,7.4-16.5,16.5S23.6,54.4,32.7,54.4z"/>
+	<rect x="0" class="st3" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_16-1.svg b/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_16-1.svg
new file mode 100644
index 0000000..5d84e37
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_16-1.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M13.2002 7.4998C13.2002 6.9998 13.1002 6.5998 13.0002 6.1998L12.2002 6.9998C12.2002 7.1998 12.2002 7.2998 12.2002 7.4998C12.2002 10.0998 10.1002 12.2998 7.4002 12.2998C4.7002 12.2998 2.6002 10.1998 2.6002 7.4998C2.6002 4.7998 4.7002 2.6998 7.4002 2.6998C7.60019 2.6998 7.7002 2.6998 7.9002 2.6998L8.8002 1.7998C8.4002 1.7998 8.0002 1.7998 7.5002 1.7998C4.3002 1.7998 1.7002 4.3998 1.7002 7.5998C1.7002 9.89981 3.0002 11.7998 4.9002 12.7998V15.9998H8.9002V12.9998C11.4002 12.3998 13.2002 10.1998 13.2002 7.4998Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8 1.9002L13.1 0.200195L8.6 4.7002C8.3 4.6002 7.9 4.5002 7.5 4.5002C5.8 4.5002 4.5 5.8002 4.5 7.5002C4.5 9.2002 5.8 10.5002 7.5 10.5002C9.2 10.5002 10.5 9.2002 10.5 7.5002C10.5 7.1002 10.4 6.7002 10.3 6.4002L14.8 1.9002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_16.svg b/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_16.svg
new file mode 100644
index 0000000..046bfa4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M13.2002 7.50078C13.2002 7.00078 13.1002 6.60078 13.0002 6.20078L12.2002 7.00078C12.2002 7.20078 12.2002 7.30078 12.2002 7.50078C12.2002 10.1008 10.1002 12.3008 7.4002 12.3008C4.7002 12.3008 2.6002 10.2008 2.6002 7.50078C2.6002 4.80078 4.7002 2.70078 7.4002 2.70078C7.60019 2.70078 7.7002 2.70078 7.9002 2.70078L8.8002 1.80078C8.4002 1.80078 8.0002 1.80078 7.5002 1.80078C4.3002 1.80078 1.7002 4.40078 1.7002 7.60078C1.7002 9.90078 3.0002 11.8008 4.9002 12.8008V16.0008H8.9002V13.0008C11.4002 12.4008 13.2002 10.2008 13.2002 7.50078Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8 1.89922L13.1 0.199219L8.6 4.69922C8.3 4.59922 7.9 4.49922 7.5 4.49922C5.8 4.49922 4.5 5.79922 4.5 7.49922C4.5 9.19922 5.8 10.4992 7.5 10.4992C9.2 10.4992 10.5 9.19922 10.5 7.49922C10.5 7.09922 10.4 6.69922 10.3 6.39922L14.8 1.89922Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_64.svg b/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_64.svg
new file mode 100644
index 0000000..08d97db
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsConstraintActor_64.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PhysicsConstraintActor_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:#3D3D3D;}
+	.st3{fill:#333333;}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.7358" y1="42.343" x2="27.7358" y2="59.2089">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="0.4822" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st0" points="19.3,42.3 36.2,42.3 36.2,59.2 19.3,59.2 	"/>
+	<radialGradient id="SVGID_2_" cx="27.7358" cy="29.192" r="17.2601" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</radialGradient>
+	<circle class="st1" cx="27.7" cy="29.2" r="17.3"/>
+	<g>
+		<path class="st2" d="M27.7,41.5c-6.7,0-12.1-5.4-12.1-12.1s5.4-12.1,12.1-12.1c6.7,0,12.1,5.4,12.1,12.1S34.4,41.5,27.7,41.5z"/>
+		<path class="st3" d="M27.7,18.4c6.1,0,11.1,5,11.1,11.1s-5,11.1-11.1,11.1s-11.1-5-11.1-11.1S21.6,18.4,27.7,18.4 M27.7,16.4
+			c-7.2,0-13.1,5.9-13.1,13.1s5.9,13.1,13.1,13.1s13.1-5.9,13.1-13.1S34.9,16.4,27.7,16.4L27.7,16.4z"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="37.692" y1="11.1192" x2="44.611" y2="17.9051">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="0.5" style="stop-color:#A3A3A3"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<polygon class="st4" points="37.7,26.9 30.2,19.3 46,3.5 53.5,11 	"/>
+	<radialGradient id="SVGID_4_" cx="30.1741" cy="24.701" r="15.6596" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st5" d="M27.7,40.4c6.1,0,11-4.9,11-11s-4.9-11-11-11s-11,4.9-11,11S21.6,40.4,27.7,40.4z"/>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsHandleComponent_16.svg b/Content/Slate/Starship/AssetIcons/PhysicsHandleComponent_16.svg
new file mode 100644
index 0000000..f79e699
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsHandleComponent_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M7 1V6H9C9.7 6 10.5 6.6 10.5 7.5C10.5 7.9 10.4 8.2 10.1 8.5C10.3 8.7 10.5 9.1 10.5 9.5C10.5 9.9 10.4 10.3 10.1 10.5C10.3 10.7 10.5 11.1 10.5 11.5C10.5 12.4 9.8 12.9 9.1 13H7V15H15V1H7Z" fill="white"/>
+<path d="M5.6 4.2998C6 4.7998 5.5 5.0998 5.5 5.0998L3.3 6.4998V6.9998H9C9 6.9998 9.5 6.9998 9.5 7.4998C9.5 7.9998 9 7.9998 9 7.9998H4.8C4.8 7.9998 4.3 8.1998 4.3 8.4998C4.3 8.7998 4.8 8.9998 4.8 8.9998H9C9 8.9998 9.5 8.9998 9.5 9.4998C9.5 9.9998 8.9 9.9998 8.9 9.9998H4.8C4.8 9.9998 4.3 10.1998 4.3 10.4998C4.3 10.7998 4.8 10.9998 4.8 10.9998H9C9 10.9998 9.5 10.9998 9.5 11.4998C9.4 11.9998 8.9 11.9998 8.9 11.9998H4.5H2C1.1 11.9998 0 11.1998 0 10.2998V8.3998C0 7.2998 0.3 6.7998 1.7 5.9998C3.2 4.9998 4.9 4.1998 4.9 4.1998C4.9 4.1998 5.3 3.8998 5.6 4.2998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsHandleComponent_64.svg b/Content/Slate/Starship/AssetIcons/PhysicsHandleComponent_64.svg
new file mode 100644
index 0000000..0086f69
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsHandleComponent_64.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PhysicsHandleComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.6585" y1="32" x2="55.481" y2="32">
+		<stop  offset="2.538071e-03" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st0" d="M29.7,10.9v10.1c0,0.3,0,0.6,0,0.9v4.5l9.8,0c1.2,0,3.2,0.9,3.2,3.3c0,1-0.4,1.8-0.9,2.3
+		c1.1,0.3,2.4,1.3,2.4,3.2c0,1.9-1.2,2.9-2.4,3.2c0.6,0.5,1,1.3,1,2.4c0,2.2-1.7,3.2-3,3.3c0.4,0.5,0.7,1.2,0.7,2.1
+		c0,2.4-2,3.3-3.2,3.3h-7.6v3.7h25.8V10.9H29.7z"/>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="34.0956" y1="25.0867" x2="33.8786" y2="59.1576" gradientTransform="matrix(0 -1 -1 0 67.6465 67.6465)">
+				<stop  offset="0" style="stop-color:#F2F2F2"/>
+				<stop  offset="1" style="stop-color:#E6E6E6"/>
+			</linearGradient>
+			<path class="st1" d="M27.8,20.3c1,1.8-0.8,3.2-0.8,3.2L21,27.4c0.5,0.5,2.9,0.4,3.9,0.5h14.4c0,0,1.7,0,1.7,1.8
+				c0,1.8-1.7,1.8-1.7,1.8H24.9c-0.7,0.6-0.6,1.2,0,1.9h15.9c0,0,1.7,0,1.7,1.8c0,1.8-1.7,1.8-1.7,1.8H25c-0.9,0.6-0.9,1.3,0,2h14.5
+				c0,0,1.7,0,1.7,1.8c0,1.8-1.7,1.8-1.7,1.8H25c-0.9,0.6-1.1,1.2,0,1.8h12.1c0,0,1.7,0,1.7,1.8c0,1.8-1.7,1.8-1.7,1.8H24h-6.4
+				c-5,0-9-4.2-9-9.4V35c0-3.9,1-5.7,5.4-8.9c0.1,0,0.1-0.1,0.2-0.1c5.5-3.2,10.9-6.4,10.9-6.4S26.7,18.8,27.8,20.3z"/>
+		</g>
+	</g>
+	<rect x="0" class="st2" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsThruster_16-1.svg b/Content/Slate/Starship/AssetIcons/PhysicsThruster_16-1.svg
new file mode 100644
index 0000000..87bae71
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsThruster_16-1.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11 9.2C11 6.9 9.1 5 6.8 5C4.5 5 2.8 6.8 2.6 9.2C2.3 12.4 0 16 0 16C0 16 3.6 13.7 6.7 13.5C9.3 13.3 11 11.6 11 9.2Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.7998 8.5998C9.7998 7.2998 8.7998 6.2998 7.4998 6.2998C6.1998 6.2998 5.2998 7.2998 5.1998 8.5998C5.0998 10.2998 3.7998 12.2998 3.7998 12.2998C3.7998 12.2998 5.7998 10.9998 7.4998 10.8998C8.7998 10.7998 9.7998 9.8998 9.7998 8.5998Z" fill="white"/>
+<path d="M13.9996 6.00039L14.0996 5.90039C13.9996 3.70039 12.2996 2.00039 10.0996 1.90039L9.99961 2.00039L4.59961 2.90039C5.79961 2.80039 8.69961 2.70039 10.9996 5.00039C13.2996 7.30039 13.1996 10.2004 13.0996 11.4004L13.9996 6.00039Z" fill="white"/>
+<path d="M13.2 0C12.4 0 11.6 0.3 11.1 0.9L11 1C13.2 1.1 14.9 2.8 15 5L15.1 4.9C15.7 4.3 16 3.6 16 2.8V0H13.2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsThruster_16.svg b/Content/Slate/Starship/AssetIcons/PhysicsThruster_16.svg
new file mode 100644
index 0000000..4a890ab
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsThruster_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11 9.2C11 6.9 9.1 5 6.8 5C4.5 5 2.8 6.8 2.6 9.2C2.3 12.4 0 16 0 16C0 16 3.6 13.7 6.7 13.5C9.3 13.3 11 11.6 11 9.2Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.7998 8.60078C9.7998 7.30078 8.7998 6.30078 7.4998 6.30078C6.1998 6.30078 5.2998 7.30078 5.1998 8.60078C5.0998 10.3008 3.7998 12.3008 3.7998 12.3008C3.7998 12.3008 5.7998 11.0008 7.4998 10.9008C8.7998 10.8008 9.7998 9.90078 9.7998 8.60078Z" fill="white"/>
+<path d="M14.0001 6.00039L14.1001 5.90039C14.0001 3.70039 12.3001 2.00039 10.1001 1.90039L10.0001 2.00039L4.6001 2.90039C5.8001 2.80039 8.7001 2.70039 11.0001 5.00039C13.3001 7.30039 13.2001 10.2004 13.1001 11.4004L14.0001 6.00039Z" fill="white"/>
+<path d="M13.2 0C12.4 0 11.6 0.3 11.1 0.9L11 1C13.2 1.1 14.9 2.8 15 5L15.1 4.9C15.7 4.3 16 3.6 16 2.8V0H13.2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsThruster_64.svg b/Content/Slate/Starship/AssetIcons/PhysicsThruster_64.svg
new file mode 100644
index 0000000..50a4ccf
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsThruster_64.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PhysicsThruster_x5F_64_-_UPLOAD"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill:#666666;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st7{opacity:0.26;fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<radialGradient id="SVGID_1_" cx="46.7574" cy="16.4007" r="6.4855" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</radialGradient>
+	<polygon class="st1" points="38.6,14.6 42,11.3 50,12.7 52.5,21.8 48.3,26 43.7,17.4 36.6,16.5 	"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="33.5116" y1="17.5991" x2="47.5078" y2="28.7486">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="0.5" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<path class="st2" d="M49.4,24.9L49.4,24.9c-0.3-5.8-4.7-10.2-10.5-10.5l0,0l-14.7,2.9c3.2-0.3,11-0.8,17,5.3c6,6,6.1,13,5.8,16.2
+		L49.4,24.9z"/>
+	<g>
+		
+			<radialGradient id="SVGID_3_" cx="26.3212" cy="35.8454" r="21.9807" gradientTransform="matrix(0.6043 -0.6043 0.7071 0.7071 -10.4176 27.4897)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#1A1A1A"/>
+		</radialGradient>
+		<path class="st3" d="M32.5,49.9c-4.6,0-9.3-2-12.8-5.5c-6.7-6.7-7.4-16.8-1.6-22.6c2.5-2.5,6-3.9,9.9-3.9c4.6,0,9.3,2,12.8,5.5
+			C44,26.6,46,30.7,46.2,35c0.3,4.3-1.1,8.1-3.9,10.9C39.8,48.5,36.3,49.9,32.5,49.9z"/>
+		<path class="st4" d="M28,16.8v2c4.3,0,8.8,1.9,12.1,5.2c6.3,6.3,7,15.8,1.6,21.2c-2.3,2.3-5.6,3.6-9.2,3.6
+			c-4.3,0-8.8-1.9-12.1-5.2c-6.3-6.3-7-15.8-1.6-21.2c2.3-2.3,5.6-3.6,9.2-3.6L28,16.8 M28,16.8c-4,0-7.7,1.4-10.6,4.2
+			c-6.2,6.2-5.5,17,1.6,24.1c3.9,3.9,8.8,5.8,13.5,5.8c4,0,7.7-1.4,10.6-4.2c6.2-6.2,5.5-17-1.6-24.1C37.6,18.7,32.7,16.8,28,16.8
+			L28,16.8z"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="45.9268" y1="9.6042" x2="54.8183" y2="17.4636">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="0.5" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<path class="st5" d="M47.1,9.4c-2.1,0-3.8,0.8-5.5,2.4L41.3,12c5.8,0.3,10.2,4.7,10.5,10.5l0.3-0.3c1.6-1.6,2.4-3.4,2.4-5.5V9.4
+		H47.1z"/>
+	<g>
+		<radialGradient id="SVGID_5_" cx="28.828" cy="35.2993" r="13.4856" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</radialGradient>
+		<path class="st6" d="M40,36.5c0-6.8-5.2-11.9-11.9-11.9s-11.4,5.2-11.9,11.9c-0.5,8.8-7.3,19.2-7.3,19.2s10.4-6.8,19.2-7.3
+			C34.9,47.9,40,43.2,40,36.5z"/>
+		<radialGradient id="SVGID_6_" cx="28.5666" cy="35.0357" r="20.411" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</radialGradient>
+		<path class="st7" d="M36.9,36c0-5-3.8-8.8-8.8-8.8S19.6,31,19.2,36c-0.4,6.5-5.4,14.2-5.4,14.2s7.7-5,14.2-5.4
+			C33.1,44.5,36.9,41,36.9,36z"/>
+		<path class="st8" d="M34.4,36.3c0-3.4-2.6-6-6-6s-5.8,2.6-6,6c-0.3,4.5-3.7,9.7-3.7,9.7s5.3-3.4,9.7-3.7
+			C31.8,42.1,34.4,39.8,34.4,36.3z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsVolume_16.svg b/Content/Slate/Starship/AssetIcons/PhysicsVolume_16.svg
new file mode 100644
index 0000000..9fabecb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsVolume_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path opacity="0.5" d="M7.4998 4.90002C7.0998 4.90002 6.7998 5.19998 6.7998 5.59998V6.40002L5.7998 6.70001V5.40002C5.7998 4.70002 6.4998 4 7.4998 4C8.4998 4 9.2998 4.70002 9.2998 5.40002V6.70001L8.2998 6.40002V5.59998C8.1998 5.19998 7.8998 4.90002 7.4998 4.90002Z" fill="white"/>
+<path d="M7.5002 14.3002C9.59888 14.3002 11.3002 12.5989 11.3002 10.5002C11.3002 8.4015 9.59888 6.7002 7.5002 6.7002C5.40151 6.7002 3.7002 8.4015 3.7002 10.5002C3.7002 12.5989 5.40151 14.3002 7.5002 14.3002Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PhysicsVolume_64.svg b/Content/Slate/Starship/AssetIcons/PhysicsVolume_64.svg
new file mode 100644
index 0000000..816c722
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PhysicsVolume_64.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PhysicsVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{opacity:0.1;fill:#FFFFFF;}
+	.st8{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="27.6518" y1="25.6501" x2="26.9534" y2="30.6316">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<path class="st5" d="M27,25.8c-1,0.1-1.8,0.8-1.8,1.8v4l-2.6,0.8V27c0-1.8,1.8-3.6,4.4-3.6s4.6,1.8,4.6,3.6v5.3L29,31.6v-4
+		C29,26.5,28.3,25.7,27,25.8z"/>
+	<radialGradient id="SVGID_5_" cx="29.303" cy="35.9046" r="13.6891" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st6" d="M27.1,49.6c5.3,0,9.6-4.3,9.6-9.6s-4.3-9.6-9.6-9.6s-9.6,4.3-9.6,9.6S21.8,49.6,27.1,49.6z"/>
+	<path class="st7" d="M27.1,49.6c5.3,0,9.6-4.3,9.6-9.6s-4.3-9.6-9.6-9.6s-9.6,4.3-9.6,9.6S21.8,49.6,27.1,49.6z"/>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlanarReflectionCapture_16.svg b/Content/Slate/Starship/AssetIcons/PlanarReflectionCapture_16.svg
new file mode 100644
index 0000000..cd94510
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlanarReflectionCapture_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.4 3.30005V12.7L2.6 11V5L12.4 3.30005ZM14 2L2 4.5V11.5L14 14V2Z" fill="white"/>
+<path opacity="0.5" d="M10.9 11L4 9.80005V6L10.9 11Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9999 8.30029L6.8999 5.40027L10.9999 4.7002V8.30029Z" fill="white"/>
+<path opacity="0.5" d="M1 1H4V0H0V4H1V1Z" fill="white"/>
+<path opacity="0.5" d="M15 1V4H16V0H12V1H15Z" fill="white"/>
+<path opacity="0.5" d="M15 15H12V16H16V12H15V15Z" fill="white"/>
+<path opacity="0.5" d="M1 15V12H0V16H4V15H1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlanarReflectionCapture_64.svg b/Content/Slate/Starship/AssetIcons/PlanarReflectionCapture_64.svg
new file mode 100644
index 0000000..272756f
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlanarReflectionCapture_64.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st5{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st6{fill:url(#SVGID_3_);}
+</style>
+<g id="PlaneReflectionCapture_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="17.0897" y1="221.9303" x2="43.7926" y2="221.3961" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<polygon class="st1" points="15.5,22.2 15.4,40.5 45.7,46.3 46.5,16.4 		"/>
+		<path class="st2" d="M44,18.3v26.3l-27.4-4.8V23.1L44,18.3z M48.5,14.7l-33.6,7v19.6l33.6,7V14.7z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.1594" y1="228.7479" x2="31.5331" y2="221.5498" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M39.8,39.9l-19.3-3.4V25.9L39.8,39.9z"/>
+		<path class="st4" d="M40.1,32.3l-11.5-8.1l11.5-2V32.3z"/>
+		<path class="st5" d="M12.4,11.9h8.4V9.1H9.6v11.2h2.8C12.4,20.3,12.4,11.9,12.4,11.9z"/>
+		<path class="st5" d="M51.6,11.9v8.4h2.8V9.1H43.2v2.8C43.2,11.9,51.6,11.9,51.6,11.9z"/>
+		<path class="st5" d="M51.6,51h-8.4v2.8h11.2V42.7h-2.8V51z"/>
+		<path class="st5" d="M12.4,51v-8.4H9.6v11.2h11.2V51H12.4z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="48.2037" y1="221.5119" x2="49.2842" y2="221.4903" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<rect x="48.5" y="14.7" class="st6" width="0.6" height="33.6"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlatformMediaSource_16.svg b/Content/Slate/Starship/AssetIcons/PlatformMediaSource_16.svg
new file mode 100644
index 0000000..9abfb87
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlatformMediaSource_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5H12H2C0.9 5 0 5.9 0 7L1.2 6.4C1.4 6.2 1.7 6 2 6H12V14L11 15H12H14C15.1 15 16 14.1 16 13V7C16 5.9 15.1 5 14 5ZM14 13.5C13.2 13.5 12.5 12.8 12.5 12C12.5 11.2 13.2 10.5 14 10.5C14.8 10.5 15.5 11.2 15.5 12C15.5 12.8 14.8 13.5 14 13.5ZM14 9.5C13.2 9.5 12.5 8.8 12.5 8C12.5 7.2 13.2 6.5 14 6.5C14.8 6.5 15.5 7.2 15.5 8C15.5 8.8 14.8 9.5 14 9.5Z" fill="white"/>
+<path d="M8.5 5.5L11.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.5 5.5L3.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M0 13.5C0 13.5 4.9 15.7 5.5 16L11 13.5L9.8 13L5.5 14.9L1.2 13L0 13.5Z" fill="white"/>
+<path opacity="0.5" d="M0 11.1C0 11.1 4.9 13.3 5.5 13.6L11 11.1L9.8 10.5L5.5 12.4L1.2 10.5L0 11.1Z" fill="white"/>
+<path d="M0 8.7C0 8.7 4.9 10.9 5.5 11.2L11 8.7L5.5 7L0 8.7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlatformMediaSource_64.svg b/Content/Slate/Starship/AssetIcons/PlatformMediaSource_64.svg
new file mode 100644
index 0000000..73c5a13
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlatformMediaSource_64.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PlatformMediaSource_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill:url(#SVGID_8_);}
+	.st10{fill:url(#SVGID_9_);}
+	.st11{fill:url(#SVGID_10_);}
+	.st12{fill:#FFFFFF;}
+	.st13{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.0214" y1="15.1749" x2="25.909" y2="14.0788">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st0" d="M29.2,21.7L29.2,21.7c-0.5,0.3-1,0.1-1.3-0.3L20.6,8.7c-0.3-0.5-0.1-1,0.3-1.3l0,0c0.5-0.3,1-0.1,1.3,0.3
+			l7.3,12.6C29.8,20.9,29.6,21.4,29.2,21.7z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="37.1709" y1="14.0197" x2="38.3887" y2="14.7504">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M34,21.7L34,21.7c0.5,0.3,1,0.1,1.3-0.3l7.3-12.6c0.3-0.5,0.1-1-0.3-1.3v0c-0.5-0.3-1-0.1-1.3,0.3l-7.3,12.6
+			C33.4,20.9,33.5,21.4,34,21.7z"/>
+		<path class="st2" d="M52.9,46.9H16.6c-2.2,0-4-1.8-4-4V22c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4v20.9
+			C56.9,45.1,55.1,46.9,52.9,46.9z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="34.7328" y1="19.7931" x2="34.7328" y2="48.6631">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.7817" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M52.9,47.6H16.6c-2.2,0-4-1.8-4-4V22.7c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4v20.9
+			C56.9,45.8,55.1,47.6,52.9,47.6z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.5644" y1="21.7118" x2="31.3422" y2="44.1562">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#1A1A1A"/>
+		</linearGradient>
+		<path class="st4" d="M44,44.7H18.9c-1.7,0-3.1-1.4-3.1-3.1V24.5c0-1.7,1.4-3.1,3.1-3.1H44c1.7,0,3.1,1.4,3.1,3.1v17.1
+			C47.1,43.3,45.7,44.7,44,44.7z"/>
+		<radialGradient id="SVGID_5_" cx="52.1274" cy="25.1222" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st5" cx="52.1" cy="25.1" r="2.9"/>
+		<radialGradient id="SVGID_6_" cx="52.1274" cy="32.469" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st6" cx="52.1" cy="32.5" r="2.9"/>
+		<circle class="st7" cx="52.1" cy="25.1" r="2.3"/>
+		<circle class="st7" cx="52.1" cy="32.5" r="2.3"/>
+	</g>
+	
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="45.6487" y1="31.2264" x2="45.3969" y2="12.8433" gradientTransform="matrix(0 1 -1 0 62.9078 0.6195)">
+		<stop  offset="0" style="stop-color:#1A1A1A"/>
+		<stop  offset="1" style="stop-color:#999999;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st8" points="32,47.6 32,44.7 43.9,44.7 43.9,47.6 	"/>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="14.1979" y1="29.6908" x2="14.0719" y2="20.4951">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#F2F2F2;stop-opacity:0"/>
+	</linearGradient>
+	<rect x="12.6" y="23.6" class="st9" width="3.1" height="5.9"/>
+	<g>
+		<g>
+			<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="21.7081" y1="36.9411" x2="21.0745" y2="53.6274">
+				<stop  offset="0" style="stop-color:#4D4D4D"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<path class="st10" d="M5.1,44.6c0,0,14.6,8,16.3,8.9l16.3-8.9l-16.3-6.1L5.1,44.6z"/>
+		</g>
+		<g>
+			<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="21.64" y1="34.1508" x2="21.0063" y2="46.8239">
+				<stop  offset="0" style="stop-color:#999999"/>
+				<stop  offset="1" style="stop-color:#E6E6E6"/>
+			</linearGradient>
+			<path class="st11" d="M5.1,38.6c0,0,14.6,8,16.3,8.9l16.3-8.9l-16.3-6.1L5.1,38.6z"/>
+		</g>
+		<g>
+			<path class="st12" d="M5.1,31.9c0,0,14.6,8,16.3,8.9l16.3-8.9l-16.3-6.1L5.1,31.9z"/>
+		</g>
+	</g>
+	<rect x="0" class="st13" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlayerController_16.svg b/Content/Slate/Starship/AssetIcons/PlayerController_16.svg
new file mode 100644
index 0000000..116b410
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlayerController_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8004 8.0004C14.2004 6.3004 13.0004 3.40039 11.7004 3.40039C9.90042 3.40039 9.90042 5.1004 9.10042 5.1004C8.70042 5.1004 7.30042 5.1004 6.80042 5.1004C6.00042 5.1004 6.10042 3.40039 4.30042 3.40039C3.10042 3.40039 1.80042 6.3004 1.20042 8.0004C0.100422 11.1004 0.000422955 12.6004 2.30042 12.6004C4.80042 12.6004 4.70042 9.70039 8.00042 9.70039C11.1004 9.70039 11.2004 12.6004 13.6004 12.6004C15.9004 12.6004 15.9004 11.1004 14.8004 8.0004ZM6.80042 8.1004H5.30042V9.6004H3.80042V8.1004H2.30042V6.6004H3.80042V5.1004H5.30042V6.6004H6.80042V8.1004ZM11.4004 9.40039C10.3004 9.40039 9.30042 8.5004 9.30042 7.3004C9.30042 6.2004 10.2004 5.20039 11.4004 5.20039C12.5004 5.20039 13.5004 6.1004 13.5004 7.3004C13.4004 8.5004 12.5004 9.40039 11.4004 9.40039Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3998 6.2998C10.7998 6.2998 10.2998 6.7998 10.2998 7.3998C10.2998 7.9998 10.7998 8.4998 11.3998 8.4998C11.9998 8.4998 12.4998 7.9998 12.4998 7.3998C12.4998 6.7998 11.9998 6.2998 11.3998 6.2998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlayerController_64.svg b/Content/Slate/Starship/AssetIcons/PlayerController_64.svg
new file mode 100644
index 0000000..b295d27
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlayerController_64.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#7F7F7F;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;stroke:#BFBFBF;stroke-width:0.25;stroke-miterlimit:10;}
+</style>
+<g id="PlayerController_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<circle class="st1" cx="45.4" cy="29.6" r="8.2"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.1498" y1="204.9963" x2="31.9455" y2="249.3183" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#545454"/>
+		</linearGradient>
+		<path class="st2" d="M57.7,32c-2.2-6.2-7.1-17.3-11.6-17.3c-7.1,0-7.1,1.9-9.8,1.9c-1.3,0-6.7,0-8.4,0c-2.7,0-2.7-1.9-9.8-1.9
+			c-4.4,0-9.3,11.1-11.6,17.3c-4,12-4.4,17.3,4,17.3c9.3,0,9.3-7.8,21.3-7.8s12.5,7.8,21.3,7.8C61.7,49.3,61.7,44,57.7,32z
+			 M26.7,30.8h-4c-0.4,0-0.8,0.3-0.8,0.8v3.6c0,0.4-0.3,0.8-0.8,0.8H19c-0.4,0-0.8-0.3-0.8-0.8v-3.6c0-0.4-0.3-0.8-0.8-0.8h-3.6
+			c-0.4,0-0.8-0.3-0.8-0.8v-2.2c0-0.4,0.3-0.8,0.8-0.8h3.6c0.4,0,0.8-0.3,0.8-0.8v-4c0-0.4,0.3-0.8,0.8-0.8h2.2
+			c0.4,0,0.8,0.3,0.8,0.8v4c0,0.4,0.3,0.8,0.8,0.8h4c0.4,0,0.8,0.3,0.8,0.8V30C27.4,30.4,27.1,30.8,26.7,30.8z M49.5,36.7
+			c-6.5,3.4-12.9-1.5-12.3-7.8c0.5-4.2,4-7.7,8.2-7.5c4.7,0.2,8.9,4.4,8.1,9.8C53.2,33.5,51.6,35.6,49.5,36.7z"/>
+		<circle class="st3" cx="45.4" cy="25.8" r="2"/>
+		<circle class="st3" cx="49.4" cy="29.8" r="2"/>
+		<circle class="st3" cx="41.5" cy="29.8" r="2"/>
+		<circle class="st3" cx="45.4" cy="33.3" r="2"/>
+		<path class="st3" d="M26.7,30.8h-4c-0.4,0-0.8,0.3-0.8,0.8v3.6c0,0.4-0.3,0.8-0.8,0.8H19c-0.4,0-0.8-0.3-0.8-0.8v-3.6
+			c0-0.4-0.3-0.8-0.8-0.8h-3.6c-0.4,0-0.8-0.3-0.8-0.8v-2.2c0-0.4,0.3-0.8,0.8-0.8h3.6c0.4,0,0.8-0.3,0.8-0.8v-4
+			c0-0.4,0.3-0.8,0.8-0.8h2.2c0.4,0,0.8,0.3,0.8,0.8v4c0,0.4,0.3,0.8,0.8,0.8h4c0.4,0,0.8,0.3,0.8,0.8V30
+			C27.4,30.4,27.1,30.8,26.7,30.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlayerStart_16.svg b/Content/Slate/Starship/AssetIcons/PlayerStart_16.svg
new file mode 100644
index 0000000..938294b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlayerStart_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 0H0V16H1V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 6.5V0.5L10.6 3.5L1 6.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.3001 10.9996C14.8001 9.59963 13.7001 7.09961 12.7001 7.09961C11.1001 7.09961 11.1001 8.49963 10.5001 8.49963C10.2001 8.49963 9.00011 8.49963 8.60011 8.49963C8.00011 8.49963 8.00011 7.09961 6.40011 7.09961C5.40011 7.09961 4.30011 9.59963 3.80011 10.9996C2.90011 13.6996 2.80011 14.8997 4.70011 14.8997C6.80011 14.8997 6.80011 12.4996 9.50011 12.4996C12.2001 12.4996 12.3001 14.8997 14.3001 14.8997C16.2001 14.8997 16.2001 13.6996 15.3001 10.9996ZM8.50011 10.9996H7.00011V12.3997H6.00011V10.9996H4.60011V9.99963H6.00011V8.49963H7.00011V9.99963H8.50011V10.9996ZM12.5001 12.2997C11.5001 12.2997 10.7001 11.4996 10.7001 10.4996C10.7001 9.49963 11.5001 8.59961 12.5001 8.59961C13.5001 8.59961 14.4001 9.39963 14.4001 10.4996C14.4001 11.4996 13.5001 12.2997 12.5001 12.2997Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4999 9.7998C12.1999 9.7998 11.8999 10.0998 11.8999 10.3998C11.8999 10.6998 12.1999 10.9998 12.4999 10.9998C12.7999 10.9998 13.0999 10.6998 13.0999 10.3998C13.0999 10.0998 12.7999 9.7998 12.4999 9.7998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PlayerStart_64.svg b/Content/Slate/Starship/AssetIcons/PlayerStart_64.svg
new file mode 100644
index 0000000..6b3dd4a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PlayerStart_64.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#7F7F7F;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;stroke:#BFBFBF;stroke-width:0.5;stroke-miterlimit:10;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;stroke:#BFBFBF;stroke-width:0.25;stroke-miterlimit:10;}
+</style>
+<g id="PlayerStart_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<circle class="st1" cx="46.7" cy="39.1" r="5.7"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.614" y1="196.8005" x2="9.3864" y2="246.1995" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M9.5,6.8L9.5,6.8C8.6,6.8,8,7.5,8,8.4v46.3c0,0.9,0.7,1.5,1.5,1.5l0,0c0.9,0,1.5-0.7,1.5-1.5V8.4
+			C11,7.5,10.4,6.8,9.5,6.8z"/>
+		<path class="st3" d="M9.9,25.6v-16c0-0.6,0.6-1.1,1.2-0.9l25.6,8c0.9,0.3,0.9,1.5,0,1.8l-25.6,8C10.5,26.7,9.9,26.2,9.9,25.6z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="37.4852" y1="218.9703" x2="37.3433" y2="249.7537" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#545454"/>
+		</linearGradient>
+		<path class="st4" d="M55.2,40.8c-1.5-4.3-4.9-12-8-12c-4.9,0-4.9,1.3-6.8,1.3c-0.9,0-4.6,0-5.9,0c-1.9,0-1.9-1.3-6.8-1.3
+			c-3.1,0-6.5,7.7-8,12c-2.8,8.3-3.1,12,2.8,12c6.5,0,6.5-5.4,14.8-5.4s8.6,5.4,14.8,5.4C58,52.8,58,49.1,55.2,40.8z M33.7,39.9
+			h-2.8c-0.3,0-0.5,0.2-0.5,0.5V43c0,0.3-0.2,0.5-0.5,0.5h-1.5c-0.3,0-0.5-0.2-0.5-0.5v-2.5c0-0.3-0.2-0.5-0.5-0.5h-2.5
+			c-0.3,0-0.5-0.2-0.5-0.5V38c0-0.3,0.2-0.5,0.5-0.5h2.5c0.3,0,0.5-0.2,0.5-0.5v-2.8c0-0.3,0.2-0.5,0.5-0.5h1.5
+			c0.3,0,0.5,0.2,0.5,0.5V37c0,0.3,0.2,0.5,0.5,0.5h2.8c0.3,0,0.5,0.2,0.5,0.5v1.5C34.2,39.7,34,39.9,33.7,39.9z M49.6,44
+			c-4.5,2.4-9-1.1-8.5-5.4c0.3-2.9,2.8-5.3,5.7-5.2c3.3,0.1,6.2,3,5.6,6.8C52.1,41.8,51,43.3,49.6,44z"/>
+		<circle class="st5" cx="46.7" cy="36.5" r="1.4"/>
+		<circle class="st5" cx="49.4" cy="39.2" r="1.4"/>
+		<circle class="st5" cx="44" cy="39.2" r="1.4"/>
+		<circle class="st5" cx="46.7" cy="41.7" r="1.4"/>
+		<path class="st5" d="M33.7,39.9h-2.8c-0.3,0-0.5,0.2-0.5,0.5V43c0,0.3-0.2,0.5-0.5,0.5h-1.5c-0.3,0-0.5-0.2-0.5-0.5v-2.5
+			c0-0.3-0.2-0.5-0.5-0.5h-2.5c-0.3,0-0.5-0.2-0.5-0.5V38c0-0.3,0.2-0.5,0.5-0.5h2.5c0.3,0,0.5-0.2,0.5-0.5v-2.8
+			c0-0.3,0.2-0.5,0.5-0.5h1.5c0.3,0,0.5,0.2,0.5,0.5V37c0,0.3,0.2,0.5,0.5,0.5h2.8c0.3,0,0.5,0.2,0.5,0.5v1.5
+			C34.2,39.7,34,39.9,33.7,39.9z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PointLight_16.svg b/Content/Slate/Starship/AssetIcons/PointLight_16.svg
new file mode 100644
index 0000000..1f4c6cb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PointLight_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 12H6V14H10V12Z" fill="white"/>
+<path opacity="0.5" d="M8.8 16H7.2L6.5 15H9.5L8.8 16Z" fill="white"/>
+<path d="M8 0C5.2 0 3 2.50002 3 4.90002C3 6.30002 3.9 7.40002 4.9 8.40002C5.5 9.00002 6 10 6.7 11H9.4C10.1 10.1 10.6 9.00002 11.2 8.40002C12.2 7.40002 13.1 6.30002 13.1 4.90002C13 2.50002 10.8 0 8 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PointLight_64.svg b/Content/Slate/Starship/AssetIcons/PointLight_64.svg
new file mode 100644
index 0000000..f631eb4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PointLight_64.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#3D3D3D;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:#AFAFAF;}
+	.st6{fill:url(#SVGID_4_);}
+	.st7{fill:url(#SVGID_5_);}
+	.st8{fill:url(#SVGID_6_);}
+</style>
+<g id="PointLight_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<path class="st1" d="M35.2,56.4l-2.3,1.8c-1.4,1.1-3.1,1.1-4.4-0.1l-2.1-1.8L35.2,56.4z"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.2693" y1="194.9029" x2="30.8892" y2="232.2838" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#C9C9C9"/>
+			<stop  offset="0.3048" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.6818" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.8717" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M30.9,4.9c-9.5,0-16,8.5-16,16.6c0,4.8,2.1,8.5,5.5,11.9c1.8,1.8,4.5,4.3,5,7.7c0.1,0.7,0.6,1.2,1.3,1.2h8.5
+			c0.7,0,1.2-0.5,1.3-1.1c0.5-3.5,3.5-5.8,5.3-7.7c3.4-3.4,5.5-7.1,5.5-11.9C47,13.4,40.4,4.9,30.9,4.9z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="25.6202" y1="240.75" x2="35.8079" y2="240.75" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#1C1C1C"/>
+			<stop  offset="0.5722" style="stop-color:#595959"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st3" d="M35.2,56.7h-9c-0.3,0-0.6-0.3-0.6-0.6V45.4c0-0.3,0.3-0.6,0.6-0.6h9c0.3,0,0.6,0.3,0.6,0.6v10.7
+			C35.9,56.4,35.6,56.7,35.2,56.7z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="187.5469" y1="270.4358" x2="187.5469" y2="271.9007" gradientTransform="matrix(0.9837 -3.825276e-02 3.885777e-02 0.9992 -164.2782 -215.9616)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5187" style="stop-color:#A1A1A1"/>
+			<stop  offset="0.5306" style="stop-color:#9E9E9E"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st4" d="M25.4,47.5L25,47.9c-0.1,0.1-0.1,0.3,0,0.4l0.4,0.3c0.1,0.1,0.4,0.2,0.7,0.2l9.3-0.4c0.3,0,0.5-0.1,0.7-0.2
+			l0.4-0.4c0.1-0.1,0.1-0.3,0-0.4l-0.4-0.3c-0.1-0.1-0.4-0.2-0.7-0.2l-9.3,0.4C25.8,47.3,25.5,47.4,25.4,47.5z"/>
+		<path class="st5" d="M36,45.2H25.5c-0.3,0-0.6-0.3-0.6-0.6v-1.7c0-0.3,0.3-0.6,0.6-0.6H36c0.3,0,0.6,0.3,0.6,0.6v1.7
+			C36.6,44.9,36.4,45.2,36,45.2z"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.9727" y1="233.8652" x2="36.5848" y2="233.8346" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#404040"/>
+			<stop  offset="0.5294" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#404040"/>
+		</linearGradient>
+		<path class="st6" d="M36,45.3H25.5c-0.3,0-0.6-0.3-0.6-0.6V43c0-0.3,0.3-0.6,0.6-0.6H36c0.3,0,0.6,0.3,0.6,0.6v1.7
+			C36.6,45.1,36.4,45.3,36,45.3z"/>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="187.4324" y1="273.362" x2="187.4324" y2="274.8269" gradientTransform="matrix(0.9837 -3.825276e-02 3.885777e-02 0.9992 -164.2782 -215.9616)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5187" style="stop-color:#A1A1A1"/>
+			<stop  offset="0.5306" style="stop-color:#9E9E9E"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st7" d="M25.4,50.4L25,50.8c-0.1,0.1-0.1,0.3,0,0.4l0.4,0.3c0.1,0.1,0.4,0.2,0.7,0.2l9.3-0.4c0.3,0,0.5-0.1,0.7-0.2
+			l0.4-0.4c0.1-0.1,0.1-0.3,0-0.4L36.1,50c-0.1-0.1-0.4-0.2-0.7-0.2l-9.3,0.4C25.8,50.2,25.5,50.3,25.4,50.4z"/>
+		
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="187.3179" y1="276.2883" x2="187.3179" y2="277.7531" gradientTransform="matrix(0.9837 -3.825276e-02 3.885777e-02 0.9992 -164.2782 -215.9616)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5187" style="stop-color:#A1A1A1"/>
+			<stop  offset="0.5306" style="stop-color:#9E9E9E"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st8" d="M25.4,53.4L25,53.7c-0.1,0.1-0.1,0.3,0,0.4l0.4,0.3c0.1,0.1,0.4,0.2,0.7,0.2l9.3-0.4c0.3,0,0.5-0.1,0.7-0.2
+			l0.4-0.4c0.1-0.1,0.1-0.3,0-0.4l-0.4-0.3c-0.1-0.1-0.4-0.2-0.7-0.2l-9.3,0.4C25.8,53.2,25.5,53.2,25.4,53.4z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PoseAsset_16.svg b/Content/Slate/Starship/AssetIcons/PoseAsset_16.svg
new file mode 100644
index 0000000..e50ea12
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PoseAsset_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.49982 0.200195C6.09982 0.200195 5.29982 0.600195 5.29982 2.0002C5.29982 2.2002 5.19982 3.6002 5.29982 3.8002H5.99982C6.29982 3.8002 6.49982 4.0002 6.49982 4.3002V4.9002C6.89982 5.0002 7.19982 5.1002 7.49982 5.1002C7.79982 5.1002 8.09982 5.0002 8.39982 4.9002V4.3002C8.39982 4.0002 8.59982 3.8002 8.89982 3.8002H9.59982C9.69982 3.6002 9.59982 2.2002 9.59982 2.0002C9.69982 0.600195 8.89982 0.200195 7.49982 0.200195ZM6.09982 3.2002H5.99982V2.0002H7.19982V2.1002C7.19982 2.7002 6.69982 3.2002 6.09982 3.2002ZM8.99982 3.2002H8.89982C8.29982 3.2002 7.79982 2.7002 7.79982 2.1002V2.0002H8.99982V3.2002ZM7.79982 3.8002H7.19982L7.49982 3.2002L7.79982 3.8002Z" fill="white"/>
+<path d="M7 8.00098H5V9.00098H7V8.00098Z" fill="white"/>
+<path d="M10 8.00098H8V9.00098H10V8.00098Z" fill="white"/>
+<path d="M8 6.00098H7V11.001H8V6.00098Z" fill="white"/>
+<path d="M10 6.00098H5V7.00098H10V6.00098Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 6L4.5 6.5L5 5H0V6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 6.00098L10.5 6.50098L10 5.00098H15V6.00098Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.9 13.101L10 10.001L9 12.001L11.2 13.801L13.3 15.901L14 15.201L11.9 13.101Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 10.001L3.1 13.101L1 15.201L1.7 15.901L3.8 13.801L6 12.001L5 10.001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PoseAsset_64.svg b/Content/Slate/Starship/AssetIcons/PoseAsset_64.svg
new file mode 100644
index 0000000..39b1b6b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PoseAsset_64.svg
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PoseAsset_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#BFBFBF;}
+	.st3{fill:#A5A5A5;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#A5A5A5;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st10{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
+	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);}
+	.st12{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.8419" y1="18.5446" x2="32.0471" y2="35.8489">
+			<stop  offset="0" style="stop-color:#383838"/>
+			<stop  offset="0.2193" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st0" d="M32.6,18h-1.4v17.7h1.4V18z"/>
+		<path class="st1" d="M36.2,22.2h-8.5c-0.3,0-0.6,0.2-0.6,0.5v0.3c0,0.3,0.2,0.5,0.6,0.5h8.5c0.3,0,0.6-0.2,0.6-0.5v-0.3
+			C36.8,22.4,36.5,22.2,36.2,22.2z"/>
+		<path class="st2" d="M35.5,24.7h-7c-0.3,0-0.6,0.2-0.6,0.5v0.3c0,0.3,0.2,0.5,0.6,0.5h7c0.3,0,0.6-0.2,0.6-0.5v-0.3
+			C36,25,35.8,24.7,35.5,24.7z"/>
+		<path class="st3" d="M34.9,27.3H29c-0.3,0-0.6,0.2-0.6,0.5v0.3c0,0.3,0.2,0.5,0.6,0.5h5.9c0.3,0,0.6-0.2,0.6-0.5v-0.3
+			C35.4,27.6,35.2,27.3,34.9,27.3z"/>
+		<path class="st1" d="M37.4,19.6h-11c-0.4,0-0.6,0.3-0.6,0.6v0.1c0,0.3,0.3,0.6,0.6,0.6h11c0.4,0,0.6-0.3,0.6-0.6v-0.1
+			C38.1,19.9,37.8,19.6,37.4,19.6z"/>
+	</g>
+	
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="49.9508" y1="24.6652" x2="50.0594" y2="33.8235" gradientTransform="matrix(0.2394 -0.9709 0.9709 0.2394 3.6205 61.9513)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st4" d="M48.4,20.7l-7.2,0.1c-0.1,0-0.2,0-0.2,0.1l-0.5,0.5c-0.1,0.1-0.3,0.1-0.4,0l-0.4-0.3c-0.2-0.1-0.2-0.4-0.1-0.6
+		l0-0.1c0.1-0.1,0.1-0.3,0-0.5l0,0c-0.1-0.2-0.1-0.4,0.1-0.6l0.5-0.4c0.1-0.1,0.3-0.1,0.4,0l0.5,0.5c0.1,0.1,0.1,0.1,0.2,0.1
+		l7.2-0.1c0.2,0,0.3,0.2,0.3,0.4l0,0.5C48.7,20.5,48.5,20.7,48.4,20.7z"/>
+	<ellipse class="st1" cx="40.2" cy="20" rx="1.7" ry="1.6"/>
+	<ellipse transform="matrix(0.2394 -0.9709 0.9709 0.2394 17.3032 62.0748)" class="st1" cx="48.3" cy="20" rx="1.7" ry="1.6"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="49.6446" y1="32.9769" x2="49.7233" y2="39.6074" gradientTransform="matrix(-0.2437 0.9698 0.9698 0.2437 28.1983 -36.8359)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st5" d="M54.5,20.5l-5.2,0.1c-0.1,0-0.1,0-0.2,0.1l-0.3,0.5c-0.1,0.1-0.2,0.1-0.3,0l-0.3-0.3c-0.1-0.1-0.1-0.4-0.1-0.6
+		l0-0.1c0.1-0.1,0.1-0.3,0-0.5l0,0c-0.1-0.2-0.1-0.4,0.1-0.6l0.3-0.4c0.1-0.1,0.2-0.1,0.3,0l0.3,0.5c0,0.1,0.1,0.1,0.2,0.1l5.2-0.1
+		c0.1,0,0.2,0.2,0.2,0.4l0,0.5C54.7,20.3,54.6,20.5,54.5,20.5z"/>
+	<path class="st6" d="M35.2,32.8c0.7,0,1.1,1.1,0.7,1.8c-0.8,1.3-2.3,2.2-4.1,2.2s-3.3-0.9-4.1-2.2c-0.4-0.7,0-1.8,0.7-1.8H35.2z"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="24.0222" y1="39.5236" x2="22.4806" y2="56.4817" gradientTransform="matrix(0.8769 0.4806 -0.4806 0.8769 24.6741 -7.0385)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st7" d="M27.6,41.5l-8.3,11.3c-0.2,0.3-0.6,0.4-1,0.2l-0.4-0.2c-0.4-0.2-0.5-0.7-0.3-1l7.8-14.2
+		c0.3-0.6,1.2-0.5,1.4,0.2l0.9,3.1C27.8,41.1,27.7,41.3,27.6,41.5z"/>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="39.0541" y1="37.834" x2="40.655" y2="57.2823" gradientTransform="matrix(0.9026 -0.4304 0.4304 0.9026 -15.7445 19.7223)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st8" d="M35.8,40.6l1.1-3c0.2-0.6,1.1-0.7,1.4-0.1l7,14.6c0.2,0.4,0,0.8-0.4,1l-0.4,0.2c-0.4,0.2-0.8,0.1-1-0.2
+		l-7.6-11.8C35.8,41.1,35.8,40.8,35.8,40.6z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="31.907" y1="17.1201" x2="31.9672" y2="7.5618">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st9" d="M31.9,7.6c-2.3,0-4.1,0.9-4.1,2v4.5c0,0.2,0.2,0.3,0.3,0.3h1.3c0.2,0,0.3,0.2,0.3,0.3v1.6
+		c0,0.1,0.1,0.3,0.2,0.3c1.3,0.6,2.6,0.6,3.9,0c0.1-0.1,0.2-0.2,0.2-0.3v-1.6c0-0.2,0.2-0.3,0.3-0.3h1.3c0.2,0,0.3-0.2,0.3-0.3V9.6
+		C36,8.5,34.2,7.6,31.9,7.6z M29.5,12.8c-0.3,0.1-0.5-0.1-0.5-0.4v-1.6c0-0.2,0.2-0.4,0.4-0.4H31c0.3,0,0.4,0.2,0.4,0.5
+		C31.2,12,30.6,12.6,29.5,12.8z M32.6,14.1h-1.2c-0.1,0-0.2-0.1-0.1-0.1l0.6-0.9c0.1-0.1,0.2-0.1,0.3,0l0.6,0.9
+		C32.7,14,32.7,14.1,32.6,14.1z M34.9,12.4c0,0.3-0.3,0.5-0.5,0.4c-1.1-0.3-1.8-0.9-1.9-1.9c0-0.3,0.1-0.5,0.4-0.5h1.6
+		c0.2,0,0.4,0.2,0.4,0.4V12.4z"/>
+	
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="62.5654" y1="48.2818" x2="62.674" y2="57.4401" gradientTransform="matrix(-0.2394 -0.9709 -0.9709 0.2394 86.1472 68.7737)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st10" d="M15.5,20.9l7.2,0.1c0.1,0,0.2,0,0.2,0.1l0.5,0.5c0.1,0.1,0.3,0.1,0.4,0l0.4-0.3c0.2-0.1,0.2-0.4,0.1-0.6
+		l0-0.1c-0.1-0.1-0.1-0.3,0-0.5l0,0c0.1-0.2,0.1-0.4-0.1-0.6l-0.5-0.4c-0.1-0.1-0.3-0.1-0.4,0l-0.5,0.5c-0.1,0.1-0.1,0.1-0.2,0.1
+		l-7.2-0.1c-0.2,0-0.3,0.2-0.3,0.4l0,0.5C15.1,20.7,15.3,20.9,15.5,20.9z"/>
+	<ellipse class="st1" cx="23.6" cy="20.2" rx="1.7" ry="1.6"/>
+	<ellipse transform="matrix(0.9709 -0.2394 0.2394 0.9709 -4.3884 4.3096)" class="st1" cx="15.5" cy="20.2" rx="1.6" ry="1.7"/>
+	
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="36.9246" y1="56.5369" x2="37.0032" y2="63.1674" gradientTransform="matrix(0.2437 0.9698 -0.9698 0.2437 61.5694 -30.0135)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st11" d="M9.3,20.7l5.2,0.1c0.1,0,0.1,0,0.2,0.1l0.3,0.5c0.1,0.1,0.2,0.1,0.3,0l0.3-0.3c0.1-0.1,0.1-0.4,0.1-0.6l0-0.1
+		c-0.1-0.1-0.1-0.3,0-0.5l0,0c0.1-0.2,0.1-0.4-0.1-0.6L15.3,19c-0.1-0.1-0.2-0.1-0.3,0l-0.3,0.5c0,0.1-0.1,0.1-0.2,0.1l-5.2-0.1
+		c-0.1,0-0.2,0.2-0.2,0.4l0,0.5C9.1,20.6,9.2,20.7,9.3,20.7z"/>
+	<rect x="0" class="st12" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PostProcessVolume_16.svg b/Content/Slate/Starship/AssetIcons/PostProcessVolume_16.svg
new file mode 100644
index 0000000..7ccaa7a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PostProcessVolume_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M6.9999 12.7998C9.0999 12.7998 10.7999 11.0998 10.7999 8.99976C10.7999 7.99976 10.3999 6.9998 9.6999 6.2998L4.3999 11.5997C4.9999 12.2997 5.9999 12.7998 6.9999 12.7998Z" fill="white"/>
+<path d="M2.5 9C2.5 6.5 4.5 4.5 7 4.5C8.2 4.5 9.4 5.00005 10.2 5.80005L13 3H1V15L3.8 12.2C3 11.4 2.5 10.2 2.5 9Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PostProcessVolume_64.svg b/Content/Slate/Starship/AssetIcons/PostProcessVolume_64.svg
new file mode 100644
index 0000000..f965de3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PostProcessVolume_64.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PostProcessVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#333333;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill:url(#SVGID_8_);}
+	.st10{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.4184" y1="21.5343" x2="46.6539" y2="55.0152">
+		<stop  offset="0" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<rect x="11.1" y="20.6" class="st5" width="32.6" height="32.2"/>
+	<g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="29.413" y1="38.573" x2="9.1825" y2="23.9924">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polyline class="st6" points="13,51.2 13,22.8 41.4,22.8 		"/>
+		
+			<radialGradient id="SVGID_6_" cx="463.9496" cy="-27.7927" r="7.5134" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -284.5615 381.4507)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<path class="st7" d="M20.5,43.8c-3.7-3.7-3.7-9.7,0-13.4s9.7-3.7,13.4,0"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="42.2705" y1="51.3226" x2="26.9343" y2="36.7217">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<polyline class="st8" points="41.4,22.8 41.4,51.2 13,51.2 		"/>
+		
+			<radialGradient id="SVGID_8_" cx="175.1943" cy="1116.2439" r="7.5134" gradientTransform="matrix(-0.7071 0.7071 -0.7071 -0.7071 943.7054 705.8247)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</radialGradient>
+		<path class="st9" d="M33.9,30.3c3.7,3.7,3.7,9.7,0,13.4c-3.7,3.7-9.7,3.7-13.4,0"/>
+	</g>
+	<rect x="0" class="st10" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityOverrideVolume_16.svg b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityOverrideVolume_16.svg
new file mode 100644
index 0000000..55b6f20
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityOverrideVolume_16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M3.7998 9.00073C4.5998 9.00073 5.8998 9.30076 5.8998 9.90076C5.8998 10.7008 4.6998 11.4008 3.7998 11.4008C2.8998 11.4008 2.5998 10.6008 2.5998 9.90076C2.5998 9.40076 2.6998 9.00073 3.7998 9.00073ZM3.7998 8.30078C2.4998 8.30078 1.7998 8.70073 1.7998 10.0007C1.7998 11.3007 2.4998 12.3008 3.7998 12.3008C5.0998 12.3008 6.5998 11.3007 6.5998 10.0007C6.6998 8.70073 5.0998 8.30078 3.7998 8.30078Z" fill="white"/>
+<path d="M10.1999 9.00073C11.2999 9.00073 11.3999 9.40076 11.3999 9.90076C11.3999 10.6008 11.0999 11.4008 10.1999 11.4008C9.2999 11.4008 8.0999 10.7008 8.0999 9.90076C8.0999 9.30076 9.3999 9.00073 10.1999 9.00073ZM10.1999 8.30078C8.8999 8.30078 7.3999 8.70073 7.3999 10.0007C7.3999 11.3007 8.9999 12.3008 10.1999 12.3008C11.4999 12.3008 12.1999 11.3007 12.1999 10.0007C12.1999 8.70073 11.3999 8.30078 10.1999 8.30078Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.8002 10.0002C7.8002 10.4002 7.4002 9.90027 7.0002 9.90027C6.6002 9.90027 6.2002 10.4002 6.2002 10.0002C6.2002 9.60024 6.6002 9.2002 7.0002 9.2002C7.4002 9.2002 7.8002 9.60024 7.8002 10.0002Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6998 8.70039C10.3998 6.80039 10.9998 6.00039 9.5998 5.70039C9.5998 5.70039 8.6998 5.60044 8.2998 5.50044L8.4998 5.30049C10.8998 5.10049 10.9998 6.00049 12.4998 8.30049L11.6998 8.70039Z" fill="white" fill-opacity="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.3 8.70039C3.6 6.80039 3 6.00039 4.4 5.70039C4.4 5.70039 5.3 5.60044 5.7 5.50044L5.5 5.30049C3.1 5.10049 3 6.00049 1.5 8.30049L2.3 8.70039Z" fill="white" fill-opacity="0.5"/>
+<path d="M7 9.50024C6.5 9.50024 6.2 9.60029 5.7 9.30029C5.2 9.00029 4.4 8.90027 3.9 8.90027C2.9 8.90027 2.3 9.30027 2.1 9.40027L1.5 8.90027C1.5 8.20027 3.3 8.2002 3.8 8.2002C4.5 8.2002 5.1 8.20022 5.7 8.60022C6.2 8.90022 6.6 9.10022 6.9 9.10022C7.2 9.10022 7.7 8.90022 8.1 8.60022C8.7 8.30022 9.3 8.2002 10 8.2002C10.6 8.2002 12.3 8.30027 12.3 8.90027L11.7 9.50024C11.6 9.40024 10.9 9.00024 9.9 9.00024C9.4 9.00024 8.6 9.10027 8.1 9.40027C7.8 9.60027 7.5 9.50024 7 9.50024Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityOverrideVolume_64.svg b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityOverrideVolume_64.svg
new file mode 100644
index 0000000..658afd4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityOverrideVolume_64.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PrecomputedVisibilityOverrideVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);fill-opacity:0.5;}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);fill-opacity:0.5;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);fill-opacity:0.5;}
+	.st10{fill:url(#SVGID_9_);}
+	.st11{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<g>
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="19.8249" y1="35.797" x2="19.7274" y2="44.1874">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="1" style="stop-color:#1A1A1A"/>
+			</linearGradient>
+			<ellipse class="st5" cx="19.8" cy="40" rx="5.3" ry="4.2"/>
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="25.3303" y1="37.9352" x2="29.2387" y2="37.9352">
+				<stop  offset="0" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<path class="st6" d="M29.2,38.7c0,1-1-0.2-2-0.2c-1,0-2,1.2-2,0.2c0-1,1-2,2-2C28.3,36.8,29.2,37.7,29.2,38.7z"/>
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="35.1367" y1="35.797" x2="35.0391" y2="44.1875">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="1" style="stop-color:#1A1A1A"/>
+			</linearGradient>
+			<ellipse class="st7" cx="35.1" cy="40" rx="5.6" ry="4.2"/>
+			<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18.8852" y1="36.349" x2="18.8388" y2="27.6205">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#CCCCCC"/>
+			</linearGradient>
+			<path class="st8" d="M15.8,36.3c0.1,0.1,0.3,0,0.4-0.1c3-4.5,1.3-6.9,4.6-7.6c0,0,1.6-0.4,3.2-0.5c0-0.2-0.1-0.4-0.5-0.5
+				c-5.8-0.5-6.1,1.6-9.6,7.1c-0.1,0.1-0.1,0.3,0.1,0.4L15.8,36.3z"/>
+			<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="35.2213" y1="36.3805" x2="35.1745" y2="27.5872">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#CCCCCC"/>
+			</linearGradient>
+			<path class="st9" d="M40.2,35.1c0.1-0.1,0.2-0.3,0.1-0.4c-3.5-5.4-3.8-7.6-9.6-7.1c-0.4,0.1-0.5,0.3-0.5,0.5
+				c1.5,0.1,3.2,0.5,3.2,0.5c3.4,0.7,1.7,3.1,4.6,7.6c0.1,0.1,0.3,0.2,0.4,0.1L40.2,35.1z"/>
+			<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="27.2845" y1="34.7775" x2="27.2845" y2="47.7434">
+				<stop  offset="0" style="stop-color:#E6E6E6"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st10" d="M41.5,36.7c0-1.8-3.7-1.9-5-1.9c-1.8,0-4.5,0.5-6.1,1.5c-1.3,0.8-2.3,0.3-3.1,0.3c-0.8,0-1.8,0.5-3.1-0.3
+				c-1.6-1-4.3-1.5-6.1-1.5c-1.3,0-5,0.1-5,1.9l1.1,0c-0.3,0.6-0.5,1.4-0.5,2.4c0,3.4,1.8,5.9,5.2,5.9s7.2-2.6,7.2-5.9
+				c0-0.6-0.1-1.1-0.3-1.5c0.4,0.1,0.9,0,1.5,0c0.6,0,1.1,0,1.5,0c-0.2,0.4-0.3,0.9-0.3,1.5c0,3.4,3.9,5.9,7.2,5.9
+				c3.4,0,5.2-2.6,5.2-5.9c0-1-0.2-1.8-0.5-2.4L41.5,36.7z M18.7,43.9c-2.7,0-3.5-2.3-3.5-4.3c0-1.4,0.3-2.6,3.5-2.6
+				c2.4,0,6.2,0.9,6.2,2.6C24.9,41.9,21.3,43.9,18.7,43.9z M35.9,43.9c-2.7,0-6.2-2-6.2-4.3c0-1.7,3.8-2.6,6.2-2.6
+				c3.2,0,3.5,1.1,3.5,2.6C39.4,41.6,38.5,43.9,35.9,43.9z"/>
+		</g>
+	</g>
+	<rect x="0" class="st11" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityVolume_16.svg b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityVolume_16.svg
new file mode 100644
index 0000000..c3c9aaa
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityVolume_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M3.7998 9.99976C4.5998 9.99976 5.8998 10.2998 5.8998 10.8998C5.8998 11.6998 4.6998 12.3998 3.7998 12.3998C2.8998 12.3998 2.5998 11.5998 2.5998 10.8998C2.5998 10.3998 2.6998 9.99976 3.7998 9.99976ZM3.7998 9.2998C2.4998 9.2998 1.7998 9.69976 1.7998 10.9998C1.7998 12.2998 2.4998 13.2998 3.7998 13.2998C5.0998 13.2998 6.5998 12.2998 6.5998 10.9998C6.6998 9.69976 5.0998 9.2998 3.7998 9.2998Z" fill="white"/>
+<path d="M10.1999 9.99976C11.2999 9.99976 11.3999 10.3998 11.3999 10.8998C11.3999 11.5998 11.0999 12.3998 10.1999 12.3998C9.2999 12.3998 8.0999 11.6998 8.0999 10.8998C8.0999 10.2998 9.3999 9.99976 10.1999 9.99976ZM10.1999 9.2998C8.8999 9.2998 7.3999 9.69976 7.3999 10.9998C7.3999 12.2998 8.9999 13.2998 10.1999 13.2998C11.4999 13.2998 12.1999 12.2998 12.1999 10.9998C12.1999 9.69976 11.3999 9.2998 10.1999 9.2998Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.8002 11.0002C7.8002 11.4002 7.4002 10.9003 7.0002 10.9003C6.6002 10.9003 6.2002 11.4002 6.2002 11.0002C6.2002 10.6002 6.6002 10.2002 7.0002 10.2002C7.4002 10.2002 7.8002 10.6002 7.8002 11.0002Z" fill="white"/>
+<path d="M7 10.5002C6.5 10.5002 6.2 10.6003 5.7 10.3003C5.2 10.0003 4.4 9.90027 3.9 9.90027C2.9 9.90027 2.3 10.3003 2.1 10.4003L1.5 9.90027C1.5 9.20027 3.3 9.2002 3.8 9.2002C4.5 9.2002 5.1 9.20022 5.7 9.60022C6.2 9.90022 6.6 10.1002 6.9 10.1002C7.2 10.1002 7.7 9.90022 8.1 9.60022C8.7 9.30022 9.3 9.2002 10 9.2002C10.6 9.2002 12.3 9.30027 12.3 9.90027L11.7 10.5002C11.6 10.4002 10.9 10.0002 9.9 10.0002C9.4 10.0002 8.6 10.1003 8.1 10.4003C7.8 10.6003 7.5 10.5002 7 10.5002Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M11.6999 9.69995L12.4999 9.30005C12.1999 8.80005 11.8999 8.4 11.6999 8H10.8999C10.9999 8.4 11.1999 8.99995 11.6999 9.69995Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M3.7 7H3.1C2.6 7.5 2.2 8.20005 1.5 9.30005L2.3 9.69995C3.2 8.19995 3.2 7.4 3.7 7Z" fill="white"/>
+<path d="M9 6H2V5H9V3.5L11.9 5.5L9 7.5V6Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityVolume_64.svg b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityVolume_64.svg
new file mode 100644
index 0000000..daf4157
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/PrecomputedVisibilityVolume_64.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="PrecomputedVisibilityVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);fill-opacity:0.5;}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);fill-opacity:0.5;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);fill-opacity:0.5;}
+	.st10{fill:url(#SVGID_9_);}
+	.st11{fill:#FFFFFF;stroke:#3F3F3F;stroke-width:0.5;stroke-miterlimit:10;}
+	.st12{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="19.8249" y1="35.797" x2="19.7274" y2="44.1874">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#1A1A1A"/>
+		</linearGradient>
+		<ellipse class="st5" cx="19.8" cy="40" rx="5.3" ry="4.2"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="25.3303" y1="37.9352" x2="29.2387" y2="37.9352">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st6" d="M29.2,38.7c0,1-1-0.2-2-0.2c-1,0-2,1.2-2,0.2c0-1,1-2,2-2C28.3,36.8,29.2,37.7,29.2,38.7z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="35.1367" y1="35.797" x2="35.0391" y2="44.1875">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#1A1A1A"/>
+		</linearGradient>
+		<ellipse class="st7" cx="35.1" cy="40" rx="5.6" ry="4.2"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="18.8852" y1="36.349" x2="18.8388" y2="27.6205">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</linearGradient>
+		<path class="st8" d="M15.8,36.3c0.1,0.1,0.3,0,0.4-0.1c3-4.5,1.3-6.9,4.6-7.6c0,0,1.6-0.4,3.2-0.5c0-0.2-0.1-0.4-0.5-0.5
+			c-5.8-0.5-6.1,1.6-9.6,7.1c-0.1,0.1-0.1,0.3,0.1,0.4L15.8,36.3z"/>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="35.2213" y1="36.3805" x2="35.1745" y2="27.5872">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</linearGradient>
+		<path class="st9" d="M40.2,35.1c0.1-0.1,0.2-0.3,0.1-0.4c-3.5-5.4-3.8-7.6-9.6-7.1c-0.4,0.1-0.5,0.3-0.5,0.5
+			c1.5,0.1,3.2,0.5,3.2,0.5c3.4,0.7,1.7,3.1,4.6,7.6c0.1,0.1,0.3,0.2,0.4,0.1L40.2,35.1z"/>
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="27.2845" y1="34.7775" x2="27.2845" y2="47.7434">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st10" d="M41.5,36.7c0-1.8-3.7-1.9-5-1.9c-1.8,0-4.5,0.5-6.1,1.5c-1.3,0.8-2.3,0.3-3.1,0.3c-0.8,0-1.8,0.5-3.1-0.3
+			c-1.6-1-4.3-1.5-6.1-1.5c-1.3,0-5,0.1-5,1.9l1.1,0c-0.3,0.6-0.5,1.4-0.5,2.4c0,3.4,1.8,5.9,5.2,5.9s7.2-2.6,7.2-5.9
+			c0-0.6-0.1-1.1-0.3-1.5c0.4,0.1,0.9,0,1.5,0c0.6,0,1.1,0,1.5,0c-0.2,0.4-0.3,0.9-0.3,1.5c0,3.4,3.9,5.9,7.2,5.9
+			c3.4,0,5.2-2.6,5.2-5.9c0-1-0.2-1.8-0.5-2.4L41.5,36.7z M18.7,43.9c-2.7,0-3.5-2.3-3.5-4.3c0-1.4,0.3-2.6,3.5-2.6
+			c2.4,0,6.2,0.9,6.2,2.6C24.9,41.9,21.3,43.9,18.7,43.9z M35.9,43.9c-2.7,0-6.2-2-6.2-4.3c0-1.7,3.8-2.6,6.2-2.6
+			c3.2,0,3.5,1.1,3.5,2.6C39.4,41.6,38.5,43.9,35.9,43.9z"/>
+	</g>
+	<path class="st11" d="M34,29.9H15.5v-4.6H34v-3l7.7,5.3L34,32.9V29.9z"/>
+	<rect x="0" class="st12" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ProceduralFoliageBlockingVolume_16.svg b/Content/Slate/Starship/AssetIcons/ProceduralFoliageBlockingVolume_16.svg
new file mode 100644
index 0000000..a603815
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ProceduralFoliageBlockingVolume_16.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M15.7 3.39961C15.2 3.09961 14.9 3.49961 14.9 3.49961L13.5 5.79961H13V0.599609C13 0.599609 13 0.0996094 12.5 0.0996094C12 0.0996094 12 0.599609 12 0.599609V4.29961C12 4.29961 11.8 4.79961 11.5 4.79961C11.2 4.79961 11 4.29961 11 4.29961V0.599609C11 0.599609 11 0.0996094 10.5 0.0996094C10 0.0996094 10 0.599609 10 0.599609V4.19961C10 4.19961 9.8 4.69961 9.5 4.69961C9.2 4.69961 9 4.19961 9 4.19961V0.599609C9 0.599609 9 0.0996094 8.5 0.0996094C8 0.0996094 8 0.599609 8 0.599609V4.49961V6.99961C8 7.99961 8.8 8.99961 9.7 8.99961H11.6C12.7 8.99961 13.2 8.69961 14.1 7.39961C15 5.79961 15.9 4.19961 15.9 4.19961C15.9 4.19961 16.1 3.69961 15.7 3.39961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 10.1006C10.5 11.2006 8.3 12.6006 6 15.0006C6 15.0006 7.3 10.7006 12 10.1006Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.59961 4.2002C9.59961 10.1002 6.39961 13.8002 5.49961 15.0002C5.49961 15.0002 7.39961 10.9002 4.59961 4.2002Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M1 10.6006C4.8 11.2006 4.8 14.3006 4.8 15.0006C4.8 15.0006 3.7 12.4006 1 10.6006Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M12 13.2002C8.9 13.2002 6.5 14.4002 6.5 15.0002C6.5 15.0002 9.4 14.9002 12 13.2002Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.6002 13.3002L5.3002 15.0002C4.8002 13.4002 5.5002 10.8002 1.7002 7.7002C6.0002 10.1002 5.6002 13.3002 5.6002 13.3002Z" fill="white"/>
+<path opacity="0.5" d="M7 0.1V0H3L0 3H7V0.1Z" fill="white"/>
+<path opacity="0.5" d="M14 0V2.8L14.1 2.7V2.6C14.3 2.4 14.8 2 15.3 2C15.5 2 15.8 2.1 16 2.2V0H14Z" fill="white"/>
+<path opacity="0.5" d="M13 9.7998V15.9998L16 12.9998V6.2998L14.9 8.1998C14.3 9.1998 13.7 9.5998 13 9.7998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ProceduralFoliageBlockingVolume_64.svg b/Content/Slate/Starship/AssetIcons/ProceduralFoliageBlockingVolume_64.svg
new file mode 100644
index 0000000..667d4dc
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ProceduralFoliageBlockingVolume_64.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#7F7F7F;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+</style>
+<g id="ProceduralFoliageBlockingVolume_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<path class="st1" d="M52.9,48.7c-14.3,0-25.6,5.5-26,8.8C27,57.5,40.9,57.2,52.9,48.7z"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="40.9303" y1="224.4591" x2="40.9697" y2="247.4629" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M54.9,34.4c-7.1,5.2-17.5,12-27.9,23.1C27,57.5,33.1,37,54.9,34.4z"/>
+		<path class="st1" d="M9.1,36.7C27,39.6,26.6,54.2,27,57.5C27,57.5,21.4,45.5,9.1,36.7z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="19.7584" y1="213.3843" x2="19.8169" y2="247.5123" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M28.9,50.6L27,57.5c-2.3-7.5,1.1-19.8-16.4-34.1C31,34.4,28.9,50.6,28.9,50.6z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="29.1794" y1="199.6227" x2="29.2613" y2="247.4563" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0.5989" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M22.7,6.5c23.4,29.4,9,44.9,4.3,51C27,57.5,33.6,38.4,22.7,6.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ProceduralFoliageVolume_16.svg b/Content/Slate/Starship/AssetIcons/ProceduralFoliageVolume_16.svg
new file mode 100644
index 0000000..a7e4a1c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ProceduralFoliageVolume_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.9996 9.7002C11.2996 10.9002 8.89965 12.5002 6.59965 15.0002C6.49965 15.0002 7.89965 10.3002 12.9996 9.7002Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 3.2998C10.5 9.6998 7 13.6998 5.9 14.9998C6 14.9998 8.1 10.4998 5 3.2998Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M1.09961 10.2002C5.19961 10.9002 5.19961 14.3002 5.19961 15.0002C5.19961 15.0002 3.99961 12.2002 1.09961 10.2002Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M13 13C9.7 13 7 14.3 7 15C7 15 10.2 14.9 13 13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.9998 13.0996L5.6998 14.9996C5.1998 13.2996 5.8998 10.4996 1.7998 7.09961C6.4998 9.69961 5.9998 13.0996 5.9998 13.0996Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ProceduralFoliageVolume_64.svg b/Content/Slate/Starship/AssetIcons/ProceduralFoliageVolume_64.svg
new file mode 100644
index 0000000..ddb60d4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ProceduralFoliageVolume_64.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ProceduralFoliageVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#7F7F7F;enable-background:new    ;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st9{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<g>
+			<path class="st5" d="M39.5,46c-7.6,0-13.6,2.9-13.8,4.7C25.7,50.7,33.1,50.5,39.5,46z"/>
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="33.0896" y1="38.4305" x2="33.1105" y2="50.6677">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st6" d="M40.5,38.4c-3.8,2.8-9.3,6.4-14.9,12.3C25.7,50.7,29,39.8,40.5,38.4z"/>
+			<path class="st5" d="M16.2,39.6c9.5,1.6,9.3,9.3,9.5,11.1C25.7,50.7,22.7,44.3,16.2,39.6z"/>
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="21.8172" y1="32.537" x2="21.8483" y2="50.687">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st7" d="M26.7,47l-1,3.7c-1.2-4,0.6-10.5-8.7-18.1C27.8,38.4,26.7,47,26.7,47z"/>
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="26.8365" y1="25.2183" x2="26.8801" y2="50.6642">
+				<stop  offset="0.5989" style="stop-color:#FFFFFF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st8" d="M23.4,23.6c12.5,15.6,4.8,23.9,2.3,27.1C25.7,50.7,29.2,40.5,23.4,23.6z"/>
+		</g>
+	</g>
+	<rect x="0" class="st9" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ProjectileMovementComponent_16.svg b/Content/Slate/Starship/AssetIcons/ProjectileMovementComponent_16.svg
new file mode 100644
index 0000000..952153d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ProjectileMovementComponent_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12.0399 8.68945C11.0999 7.72945 10.0099 6.90945 8.85992 6.18945C8.82992 7.20945 8.48992 8.14945 7.91992 8.90945C8.92992 9.24945 9.90992 9.65945 10.8199 10.2195C11.9099 10.8695 12.9099 11.6995 13.7999 12.6695C14.6799 13.6395 15.4699 14.7395 15.9999 15.9895C15.7699 14.6395 15.2699 13.3395 14.5999 12.0995C13.9199 10.8795 13.0699 9.70945 12.0399 8.68945Z" fill="white"/>
+<path d="M4.00012 9.87914C6.14298 9.87914 7.88012 8.14201 7.88012 5.99914C7.88012 3.85628 6.14298 2.11914 4.00012 2.11914C1.85725 2.11914 0.120117 3.85628 0.120117 5.99914C0.120117 8.14201 1.85725 9.87914 4.00012 9.87914Z" fill="white"/>
+<path d="M12.5 0L11 2H14L12.5 0Z" fill="white"/>
+<path d="M12.5 7L11 5H14L12.5 7Z" fill="white"/>
+<path d="M16 3.5L14 2V5L16 3.5Z" fill="white"/>
+<path d="M9 3.5L11 2V5L9 3.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ProjectileMovementComponent_64.svg b/Content/Slate/Starship/AssetIcons/ProjectileMovementComponent_64.svg
new file mode 100644
index 0000000..86ff1b5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ProjectileMovementComponent_64.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ProjectileMovementComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="26.7114" y1="26.1336" x2="54.7319" y2="55.2639">
+		<stop  offset="9.644671e-02" style="stop-color:#666666"/>
+		<stop  offset="0.2843" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.4237" style="stop-color:#BEBEBE"/>
+		<stop  offset="0.6872" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<path class="st0" d="M39.5,31.5c-3.4-3.3-7.2-6.1-11.4-8.6c-0.1,3.5-1.3,6.8-3.4,9.4c3.6,1.2,7.1,2.6,10.4,4.5
+		c3.9,2.2,7.5,5.1,10.6,8.4c3.1,3.3,6,7.1,7.9,11.5c-0.8-4.7-2.6-9.1-5-13.4C46.2,39,43.2,35,39.5,31.5z"/>
+	<g>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="50.3177" y1="8.0231" x2="50.3177" y2="1.933">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st1" d="M50.3,1.9L45.8,8h9.1L50.3,1.9z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="50.3177" y1="25.2484" x2="50.3177" y2="19.1583">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st2" d="M50.3,25.2l-4.6-6.1h9.1L50.3,25.2z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="56.0265" y1="13.5926" x2="63.1563" y2="13.6876">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st3" d="M62,13.6L55.9,9v9.1L62,13.6z"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="45.4806" y1="13.5727" x2="37.7804" y2="13.7628">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st4" d="M38.7,13.6L44.8,9v9.1L38.7,13.6z"/>
+	</g>
+	<radialGradient id="SVGID_6_" cx="23.7968" cy="18.7931" r="18.0953" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st5" d="M20.9,36.9c7,0,12.7-5.7,12.7-12.7s-5.7-12.7-12.7-12.7S8.2,17.2,8.2,24.2S13.9,36.9,20.9,36.9z"/>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RadialForceActor_16-1.svg b/Content/Slate/Starship/AssetIcons/RadialForceActor_16-1.svg
new file mode 100644
index 0000000..4a6d330
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RadialForceActor_16-1.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="white"/>
+<path d="M2.3001 13.7C3.1001 14.5 4.1001 15.1 5.2001 15.5L5.6001 14.6C4.7001 14.3 3.8001 13.7 3.1001 13C2.4001 12.3 1.8001 11.4 1.5001 10.5L0.600098 10.9C0.900098 11.8 1.5001 12.8 2.3001 13.7Z" fill="white"/>
+<path d="M13.6999 2.30005C12.8999 1.50005 11.8999 0.9 10.7999 0.5L10.3999 1.40002C11.2999 1.70002 12.1999 2.3 12.8999 3C13.5999 3.7 14.1999 4.6 14.4999 5.5L15.3999 5.09998C15.0999 4.19998 14.4999 3.20005 13.6999 2.30005Z" fill="white"/>
+<path opacity="0.5" d="M4.4999 11.5007C4.9999 12.0007 5.5999 12.4007 6.2999 12.6007L6.6999 11.7007C6.1999 11.5007 5.6999 11.2008 5.1999 10.8008C4.6999 10.4008 4.4999 9.90078 4.2999 9.30078L3.3999 9.70068C3.5999 10.4007 3.8999 11.0007 4.4999 11.5007Z" fill="white"/>
+<path opacity="0.5" d="M11.4998 4.50037C10.9998 4.00037 10.3998 3.60039 9.6998 3.40039L9.2998 4.30042C9.7998 4.50042 10.2998 4.80032 10.7998 5.20032C11.2998 5.60032 11.4998 6.10032 11.6998 6.70032L12.5998 6.30042C12.3998 5.60041 12.0998 5.00037 11.4998 4.50037Z" fill="white"/>
+<path opacity="0.5" d="M3.2998 6.30042L4.1998 6.70032C4.3998 6.20032 4.6998 5.70032 5.0998 5.20032C5.4998 4.70032 5.9998 4.50042 6.5998 4.30042L6.1998 3.40039C5.4998 3.60039 4.8998 4.00037 4.3998 4.50037C3.8998 5.00037 3.5998 5.60041 3.2998 6.30042Z" fill="white"/>
+<path opacity="0.5" d="M12.6999 9.70068L11.7999 9.30078C11.5999 9.80078 11.2999 10.3008 10.8999 10.8008C10.4999 11.3008 9.9999 11.5007 9.3999 11.7007L9.7999 12.6007C10.4999 12.4007 11.0999 12.0007 11.5999 11.5007C12.0999 11.0007 12.3999 10.4007 12.6999 9.70068Z" fill="white"/>
+<path d="M0.5 5.19958L1.4 5.59961C1.7 4.69961 2.3 3.79961 3 3.09961C3.7 2.39961 4.6 1.79963 5.5 1.49963L5.1 0.599609C4.1 0.999609 3.1 1.59966 2.2 2.39966C1.3 3.19966 0.9 4.19958 0.5 5.19958Z" fill="white"/>
+<path d="M15.5 10.7994L14.6 10.3994C14.3 11.2994 13.7 12.1994 13 12.8994C12.3 13.5994 11.4 14.1994 10.5 14.4994L10.9 15.3994C11.9 14.9994 12.9 14.3994 13.8 13.5994C14.7 12.7994 15.1 11.7994 15.5 10.7994Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RadialForceActor_16.svg b/Content/Slate/Starship/AssetIcons/RadialForceActor_16.svg
new file mode 100644
index 0000000..86ef27e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RadialForceActor_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z" fill="white"/>
+<path d="M2.3001 13.7C3.1001 14.5 4.1001 15.1 5.2001 15.5L5.6001 14.6C4.7001 14.3 3.8001 13.7 3.1001 13C2.4001 12.3 1.8001 11.4 1.5001 10.5L0.600098 10.9C0.900098 11.8 1.5001 12.8 2.3001 13.7Z" fill="white"/>
+<path d="M13.6999 2.3C12.8999 1.5 11.8999 0.9 10.7999 0.5L10.3999 1.4C11.2999 1.7 12.1999 2.3 12.8999 3C13.5999 3.7 14.1999 4.6 14.4999 5.5L15.3999 5.1C15.0999 4.2 14.4999 3.2 13.6999 2.3Z" fill="white"/>
+<path opacity="0.5" d="M3.2998 6.30078L4.1998 6.70078C4.3998 6.20078 4.6998 5.70078 5.0998 5.20078C5.4998 4.70078 5.9998 4.50078 6.5998 4.30078L6.2998 3.30078C5.5998 3.60078 4.9998 3.90078 4.4998 4.50078C3.9998 5.10078 3.5998 5.60078 3.2998 6.30078Z" fill="white"/>
+<path opacity="0.5" d="M12.6999 9.70078L11.7999 9.30078C11.5999 9.80078 11.2999 10.3008 10.8999 10.8008C10.4999 11.3008 9.9999 11.5008 9.3999 11.7008L9.7999 12.6008C10.4999 12.4008 11.0999 12.0008 11.5999 11.5008C12.0999 11.0008 12.3999 10.4008 12.6999 9.70078Z" fill="white"/>
+<path opacity="0.5" d="M4.4998 11.5004C4.9998 12.0004 5.5998 12.4004 6.2998 12.6004L6.6998 11.7004C6.1998 11.5004 5.6998 11.2004 5.1998 10.8004C4.6998 10.4004 4.4998 9.90039 4.2998 9.40039L3.2998 9.70039C3.5998 10.4004 3.8998 11.0004 4.4998 11.5004Z" fill="white"/>
+<path opacity="0.5" d="M11.4999 4.50078C10.9999 3.90078 10.3999 3.60078 9.6999 3.30078L9.3999 4.30078C9.8999 4.50078 10.3999 4.80078 10.8999 5.20078C11.3999 5.60078 11.5999 6.10078 11.7999 6.70078L12.6999 6.30078C12.3999 5.60078 12.0999 5.00078 11.4999 4.50078Z" fill="white"/>
+<path d="M0.5 5.2L1.4 5.6C1.7 4.7 2.3 3.8 3 3.1C3.7 2.4 4.6 1.8 5.5 1.5L5.2 0.5C4.2 0.9 3.2 1.5 2.3 2.3C1.4 3.1 0.9 4.2 0.5 5.2Z" fill="white"/>
+<path d="M15.5 10.8004L14.6 10.4004C14.3 11.3004 13.7 12.2004 13 12.9004C12.3 13.6004 11.4 14.2004 10.5 14.5004L10.9 15.4004C11.9 15.0004 12.9 14.4004 13.8 13.6004C14.7 12.8004 15.1 11.8004 15.5 10.8004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RadialForceActor_64.svg b/Content/Slate/Starship/AssetIcons/RadialForceActor_64.svg
new file mode 100644
index 0000000..24d9000
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RadialForceActor_64.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="RadialForceActor_x5F_64_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.32;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#A0A0A0;}
+	.st4{fill:none;}
+</style>
+<g>
+	<radialGradient id="SVGID_1_" cx="32.0144" cy="32.0144" r="27.2245" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</radialGradient>
+	<circle class="st0" cx="32" cy="32" r="27.2"/>
+	<circle class="st1" cx="32.1" cy="31.3" r="17"/>
+	<circle class="st2" cx="32.1" cy="31.3" r="5.4"/>
+	<g>
+		<path class="st3" d="M19.5,37.1l-2.7,1.3c1.8,3.8,5,6.9,8.9,8.6l1.3-2.7C23.6,42.8,21,40.3,19.5,37.1z"/>
+		<path class="st3" d="M44.8,37.1c-1.6,3.5-4.6,6.1-8.3,7.4l1.3,2.7c4.3-1.5,7.8-4.7,9.7-8.8L44.8,37.1z"/>
+		<path class="st3" d="M19,26.7c1.3-3.7,4-6.7,7.5-8.2l-1.3-2.7c-4.2,1.9-7.4,5.4-9,9.7L19,26.7z"/>
+		<path class="st3" d="M38.6,15.5l-1.3,2.7c3.7,1.5,6.6,4.5,8,8.3l2.7-1.3C46.4,20.8,43,17.3,38.6,15.5z"/>
+	</g>
+	<g>
+		<path class="st2" d="M9.8,22.4c2.4-5.7,7-10.2,12.7-12.7L21.2,7C14.9,9.8,9.8,14.8,7.1,21.2L9.8,22.4z"/>
+		<path class="st2" d="M41.3,9.6c5.8,2.4,10.5,7,12.9,12.8l2.7-1.3c-2.8-6.4-8-11.5-14.4-14.3L41.3,9.6z"/>
+		<path class="st2" d="M22.3,54.1c-5.6-2.5-10.1-7-12.5-12.6l-2.7,1.3c2.7,6.3,7.7,11.3,14,14.1L22.3,54.1z"/>
+		<path class="st2" d="M54.3,41.5C51.8,47.4,47,52,41.1,54.4l1.3,2.7c6.5-2.7,11.8-7.9,14.6-14.4L54.3,41.5z"/>
+	</g>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RadialForceComponent_64.svg b/Content/Slate/Starship/AssetIcons/RadialForceComponent_64.svg
new file mode 100644
index 0000000..6f3879a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RadialForceComponent_64.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="RadialForceComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{opacity:0.32;}
+	.st3{fill:#FFFFFF;}
+	.st4{fill:#A0A0A0;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<radialGradient id="SVGID_1_" cx="32.0144" cy="32.0144" r="27.2245" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</radialGradient>
+	<circle class="st1" cx="32" cy="32" r="27.2"/>
+	<circle class="st2" cx="32.1" cy="31.3" r="17"/>
+	<circle class="st3" cx="32.1" cy="31.3" r="5.4"/>
+	<g>
+		<path class="st4" d="M19.5,37.1l-2.7,1.3c1.8,3.8,5,6.9,8.9,8.6l1.3-2.7C23.6,42.8,21,40.3,19.5,37.1z"/>
+		<path class="st4" d="M44.8,37.1c-1.6,3.5-4.6,6.1-8.3,7.4l1.3,2.7c4.3-1.5,7.8-4.7,9.7-8.8L44.8,37.1z"/>
+		<path class="st4" d="M19,26.7c1.3-3.7,4-6.7,7.5-8.2l-1.3-2.7c-4.2,1.9-7.4,5.4-9,9.7L19,26.7z"/>
+		<path class="st4" d="M38.6,15.5l-1.3,2.7c3.7,1.5,6.6,4.5,8,8.3l2.7-1.3C46.4,20.8,43,17.3,38.6,15.5z"/>
+	</g>
+	<g>
+		<path class="st3" d="M9.8,22.4c2.4-5.7,7-10.2,12.7-12.7L21.2,7C14.9,9.8,9.8,14.8,7.1,21.2L9.8,22.4z"/>
+		<path class="st3" d="M41.3,9.6c5.8,2.4,10.5,7,12.9,12.8l2.7-1.3c-2.8-6.4-8-11.5-14.4-14.3L41.3,9.6z"/>
+		<path class="st3" d="M22.3,54.1c-5.6-2.5-10.1-7-12.5-12.6l-2.7,1.3c2.7,6.3,7.7,11.3,14,14.1L22.3,54.1z"/>
+		<path class="st3" d="M54.3,41.5C51.8,47.4,47,52,41.1,54.4l1.3,2.7c6.5-2.7,11.8-7.9,14.6-14.4L54.3,41.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RecLight_16.svg b/Content/Slate/Starship/AssetIcons/RecLight_16.svg
new file mode 100644
index 0000000..576353d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RecLight_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 4H4V11H12V4Z" fill="white"/>
+<path d="M6.5 3H5.5L5 0.5H6L6.5 3Z" fill="white"/>
+<path d="M9.5 3H10.5L11 0.5H10L9.5 3Z" fill="white"/>
+<path d="M6.5 12H5.5L5 14.5H6L6.5 12Z" fill="white"/>
+<path d="M9.5 12H10.5L11 14.5H10L9.5 12Z" fill="white"/>
+<path d="M15.7998 8V7L13.2998 7V8H15.7998Z" fill="white"/>
+<path d="M15.1525 2.24589L13.0312 4.36719L13.6676 5.00358L15.7889 2.88228L15.1525 2.24589Z" fill="white"/>
+<path d="M13.6325 10.0316L12.9961 10.668L15.1174 12.7893L15.7538 12.1529L13.6325 10.0316Z" fill="white"/>
+<path d="M2.7998 8L2.7998 7L0.299805 7L0.299805 8L2.7998 8Z" fill="white"/>
+<path d="M0.882484 2.21127L0.246094 2.84766L2.36739 4.96896L3.00378 4.33257L0.882484 2.21127Z" fill="white"/>
+<path d="M2.33224 9.99589L0.210938 12.1172L0.847328 12.7536L2.96863 10.6323L2.33224 9.99589Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RectLight_16.svg b/Content/Slate/Starship/AssetIcons/RectLight_16.svg
new file mode 100644
index 0000000..225e26b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RectLight_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 4H4V11H12V4Z" fill="white"/>
+<path d="M6.5 3H5.5L5 0.5H6L6.5 3Z" fill="white"/>
+<path d="M9.5 3H10.5L11 0.5H10L9.5 3Z" fill="white"/>
+<path d="M6.5 12H5.5L5 14.5H6L6.5 12Z" fill="white"/>
+<path d="M9.5 12H10.5L11 14.5H10L9.5 12Z" fill="white"/>
+<path d="M15.8 8V7L13.3 7V8H15.8Z" fill="white"/>
+<path d="M15.1527 2.24613L13.0314 4.36743L13.6678 5.00382L15.7891 2.88252L15.1527 2.24613Z" fill="white"/>
+<path d="M13.6324 10.0316L12.996 10.668L15.1173 12.7893L15.7537 12.1529L13.6324 10.0316Z" fill="white"/>
+<path d="M2.79999 8L2.79999 7L0.299988 7L0.299988 8L2.79999 8Z" fill="white"/>
+<path d="M0.882514 2.21078L0.246124 2.84717L2.36742 4.96847L3.00381 4.33208L0.882514 2.21078Z" fill="white"/>
+<path d="M2.33199 9.99613L0.210693 12.1174L0.847084 12.7538L2.96838 10.6325L2.33199 9.99613Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RectLight_64.svg b/Content/Slate/Starship/AssetIcons/RectLight_64.svg
new file mode 100644
index 0000000..17e06a0
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RectLight_64.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="RectLight_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:#CCCCCC;}
+	.st3{fill:none;}
+</style>
+<g>
+	<g>
+		
+			<radialGradient id="SVGID_1_" cx="32.5117" cy="32.0952" r="22.8033" gradientTransform="matrix(1.152 0 0 1.1122 -5.2876 -4.0266)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="0.368" style="stop-color:#E2E2E2"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</radialGradient>
+		<rect x="18.4" y="20" class="st0" width="27.5" height="23.2"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1661" y1="20.0458" x2="32.1661" y2="43.2937">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="0.9949" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M44.9,21v21.2H19.4V21H44.9 M45.9,20H18.4v23.2h27.5V20L45.9,20z"/>
+	</g>
+	<path class="st2" d="M27.8,18.2h-3l-1.5-7.5h3L27.8,18.2z"/>
+	<path class="st2" d="M36.7,18.2h3l1.5-7.5h-3L36.7,18.2z"/>
+	<path class="st2" d="M27.8,45.1h-3l-1.5,7.5h3L27.8,45.1z"/>
+	<path class="st2" d="M36.7,45.1h3l1.5,7.5h-3L36.7,45.1z"/>
+	<path class="st2" d="M56.1,33v-3h-7.5v3H56.1z"/>
+	<path class="st2" d="M53.7,15.9l-6.3,6.3l1.9,1.9l6.3-6.3L53.7,15.9z"/>
+	<path class="st2" d="M49.3,39.2l-1.9,1.9l6.3,6.3l1.9-1.9L49.3,39.2z"/>
+	<path class="st2" d="M15.9,33.1v-3H8.4v3H15.9z"/>
+	<path class="st2" d="M10.6,15.9l-1.9,1.9l6.3,6.3l1.9-1.9L10.6,15.9z"/>
+	<path class="st2" d="M15,39.2l-6.3,6.3l1.9,1.9l6.3-6.3L15,39.2z"/>
+	<rect x="0" class="st3" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ReflectionCapture_16.svg b/Content/Slate/Starship/AssetIcons/ReflectionCapture_16.svg
new file mode 100644
index 0000000..e25a52e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ReflectionCapture_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 1H4V0H0V4H1V1Z" fill="white"/>
+<path opacity="0.5" d="M15 1V4H16V0H12V1H15Z" fill="white"/>
+<path opacity="0.5" d="M15 15H12V16H16V12H15V15Z" fill="white"/>
+<path opacity="0.5" d="M1 15V12H0V16H4V15H1Z" fill="white"/>
+<path opacity="0.5" d="M14 13V9L7 2H3L14 13Z" fill="white"/>
+<path d="M12 14H2V4L12 14Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 7L9 2H14V7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ReflectionCapture_64.svg b/Content/Slate/Starship/AssetIcons/ReflectionCapture_64.svg
new file mode 100644
index 0000000..c0f336b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ReflectionCapture_64.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ReflectionCapture_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#3F3F3F;}
+	.st1{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+	.st4{fill:none;}
+</style>
+<g>
+	<g>
+		<g>
+			<rect x="15.3" y="15.3" class="st0" width="33.5" height="33.5"/>
+		</g>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="15.2596" y1="48.7404" x2="32" y2="32">
+				<stop  offset="0" style="stop-color:#E6E6E6"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st1" d="M48.7,48.7H15.3V15.3L48.7,48.7z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="40.3702" y1="23.6298" x2="48.7404" y2="15.2596">
+				<stop  offset="0" style="stop-color:#CCCCCC"/>
+				<stop  offset="1" style="stop-color:#E6E6E6"/>
+			</linearGradient>
+			<path class="st2" d="M48.7,32L32,15.3h16.7V32z"/>
+		</g>
+	</g>
+	<path class="st3" d="M9.7,53.9v-8.7c0-0.2-0.2-0.4-0.4-0.4H7c-0.2,0-0.4,0.2-0.4,0.4V57c0,0.2,0.2,0.4,0.4,0.4h11.9
+		c0.2,0,0.4-0.2,0.4-0.4v-2.3c0-0.2-0.2-0.4-0.4-0.4h-8.7C9.9,54.3,9.7,54.1,9.7,53.9z"/>
+	<path class="st3" d="M10.1,9.7h8.7c0.2,0,0.4-0.2,0.4-0.4V7c0-0.2-0.2-0.4-0.4-0.4H7C6.7,6.5,6.5,6.7,6.5,7v11.9
+		c0,0.2,0.2,0.4,0.4,0.4h2.3c0.2,0,0.4-0.2,0.4-0.4v-8.7C9.7,9.9,9.9,9.7,10.1,9.7z"/>
+	<path class="st3" d="M54.3,10.1v8.7c0,0.2,0.2,0.4,0.4,0.4H57c0.2,0,0.4-0.2,0.4-0.4V7c0-0.2-0.2-0.4-0.4-0.4H45.1
+		c-0.2,0-0.4,0.2-0.4,0.4v2.3c0,0.2,0.2,0.4,0.4,0.4h8.7C54.1,9.7,54.3,9.9,54.3,10.1z"/>
+	<path class="st3" d="M53.9,54.3h-8.7c-0.2,0-0.4,0.2-0.4,0.4V57c0,0.2,0.2,0.4,0.4,0.4H57c0.2,0,0.4-0.2,0.4-0.4V45.1
+		c0-0.2-0.2-0.4-0.4-0.4h-2.3c-0.2,0-0.4,0.2-0.4,0.4v8.7C54.3,54.1,54.1,54.3,53.9,54.3z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ReverbEffect_16.svg b/Content/Slate/Starship/AssetIcons/ReverbEffect_16.svg
new file mode 100644
index 0000000..ce2507b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ReverbEffect_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 13L2 11V6L10 14H5L3 16L0 13Z" fill="white"/>
+<path opacity="0.5" d="M9.99 0.719766L9.28 0.00976562L5.67 3.62977L4.25 2.20977L4 5.99977L7.79 5.74977L6.37 4.32977L9.99 0.719766Z" fill="white"/>
+<path d="M7 8.28977L7.71 8.99977L11.32 5.37977L12.74 6.79977L12.99 3.00977L9.2 3.25977L10.62 4.67977L7 8.28977Z" fill="white"/>
+<path opacity="0.5" d="M15.99 6.71977L15.28 6.00977L11.67 9.62977L10.25 8.20977L10 11.9998L13.79 11.7498L12.37 10.3298L15.99 6.71977Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/ReverbEffect_64.svg b/Content/Slate/Starship/AssetIcons/ReverbEffect_64.svg
new file mode 100644
index 0000000..c1a2a10
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/ReverbEffect_64.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="ReverbEffect_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="14.0104" y1="16.2944" x2="14.0378" y2="32.3512" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -11.9931 42.026)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M24.1,51.7l-1.9,1.9c-2.6,2.6-6.9,2.6-9.5,0l-1.8-1.8c-2.6-2.6-2.6-6.9,0-9.5l1.9-1.9L24.1,51.7z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="24.6525" y1="7.9845" x2="24.5327" y2="40.3288" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -11.9931 42.026)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M36.8,50.1l-12.7,1.5L12.8,40.3l1.5-12.7c0.1-0.9,1.2-1.3,1.8-0.6l21.3,21.3C38,49,37.6,50,36.8,50.1z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="15.0734" y1="24.3171" x2="18.7039" y2="24.3171" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -11.9931 42.026)">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<polygon class="st3" points="21.5,54.2 24.1,51.7 12.8,40.3 10.2,42.9 		"/>
+	</g>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.9658" y1="26.7104" x2="34.8107" y2="10.4293" gradientTransform="matrix(-1 0 0 -1 74.2038 53.4494)">
+		<stop  offset="0" style="stop-color:#808080;stop-opacity:0"/>
+		<stop  offset="0.5" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st4" d="M43.3,36.4l11.3-11.3l2.8,2.8L46.2,39.2l3,3l-9.7,0.8l0.8-9.7L43.3,36.4z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="30.3691" y1="34.2369" x2="46.5657" y2="17.777">
+		<stop  offset="0" style="stop-color:#CCCCCC;stop-opacity:0"/>
+		<stop  offset="0.5" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<path class="st5" d="M43.1,24.2L31.8,35.4L29,32.6l11.3-11.3l-3-3l9.7-0.8l-0.8,9.7L43.1,24.2z"/>
+	
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="37.5985" y1="43.4687" x2="53.4001" y2="28.1939" gradientTransform="matrix(-1 0 0 -1 74.2038 53.4494)">
+		<stop  offset="0" style="stop-color:#808080;stop-opacity:0"/>
+		<stop  offset="0.5" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st6" d="M25.2,18.3L36.4,7l2.8,2.8L28,21.1l3,3l-9.7,0.8l0.8-9.7L25.2,18.3z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RotatingMovementComponent_16.svg b/Content/Slate/Starship/AssetIcons/RotatingMovementComponent_16.svg
new file mode 100644
index 0000000..84e1285
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RotatingMovementComponent_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 0L11 2H14L12.5 0Z" fill="white"/>
+<path d="M12.5 7L11 5H14L12.5 7Z" fill="white"/>
+<path d="M16 3.5L14 2V5L16 3.5Z" fill="white"/>
+<path d="M9 3.5L11 2V5L9 3.5Z" fill="white"/>
+<path opacity="0.5" d="M5.5 12.5C6.60457 12.5 7.5 11.6046 7.5 10.5C7.5 9.39543 6.60457 8.5 5.5 8.5C4.39543 8.5 3.5 9.39543 3.5 10.5C3.5 11.6046 4.39543 12.5 5.5 12.5Z" fill="white"/>
+<path d="M1.09 10.43C1.09 9.23 1.54 8.19 2.45 7.3L3.98 8.83V5H0.14L1.68 6.53C0.56 7.63 0 8.93 0 10.43C0 11.93 0.53 13.2 1.59 14.26C2.63 15.3 3.88 15.82 5.34 15.84V14.75C4.18 14.73 3.19 14.31 2.36 13.49C1.51 12.65 1.09 11.63 1.09 10.43Z" fill="white"/>
+<path d="M10.9998 10.5704C10.9998 9.07039 10.4698 7.80039 9.40978 6.74039C8.34978 5.68039 7.06978 5.15039 5.57978 5.15039C5.55978 5.15039 5.54979 5.15039 5.52979 5.15039V6.23039C5.54979 6.23039 5.55978 6.23039 5.57978 6.23039C6.76978 6.23039 7.78979 6.65039 8.63979 7.50039C9.48979 8.35039 9.91979 9.37039 9.91979 10.5604C9.91979 11.7604 9.46979 12.8004 8.55979 13.6904L7.02979 12.1604V16.0004H10.8698L9.32978 14.4704C10.4398 13.3704 10.9998 12.0704 10.9998 10.5704Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/RotatingMovementComponent_64.svg b/Content/Slate/Starship/AssetIcons/RotatingMovementComponent_64.svg
new file mode 100644
index 0000000..e52e850
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/RotatingMovementComponent_64.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="RotatingMovementComponent_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="50.3177" y1="8.0231" x2="50.3177" y2="1.933">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st0" d="M50.3,1.9L45.8,8h9.1L50.3,1.9z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="50.3177" y1="25.2484" x2="50.3177" y2="19.1583">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st1" d="M50.3,25.2l-4.6-6.1h9.1L50.3,25.2z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="56.0265" y1="13.5926" x2="63.1563" y2="13.6876">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st2" d="M62,13.6L55.9,9v9.1L62,13.6z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="45.4806" y1="13.5727" x2="37.7804" y2="13.7628">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st3" d="M38.7,13.6L44.8,9v9.1L38.7,13.6z"/>
+	</g>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="17.6058" y1="21.7075" x2="18.0659" y2="56.2162">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st4" d="M12.8,38.1c0-3.9,1.4-7.2,4.4-10.1l4.9,4.9V20.7H9.8l5,4.9c-3.6,3.5-5.4,7.7-5.4,12.6s1.7,8.9,5.1,12.3
+		c3.3,3.3,7.4,5,12.1,5.1v-3.5c-3.7-0.1-6.9-1.4-9.6-4.1C14.2,45.3,12.8,42,12.8,38.1z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="37.0501" y1="54.7543" x2="35.4397" y2="20.8208">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st5" d="M44.8,38.6c0-4.8-1.7-8.9-5.1-12.3c-3.4-3.4-7.5-5.1-12.3-5.1c-0.1,0-0.1,0-0.2,0v3.5c0.1,0,0.1,0,0.2,0
+		c3.8,0,7.1,1.4,9.9,4.1s4.1,6,4.1,9.9c0,3.9-1.4,7.2-4.4,10.1L32,43.7v12.4h12.4l-5-4.9C42.9,47.6,44.8,43.4,44.8,38.6z"/>
+	<radialGradient id="SVGID_7_" cx="28.4369" cy="35.4627" r="9.7539" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st6" d="M26.9,45.2c3.8,0,6.9-3.1,6.9-6.9c0-3.8-3.1-6.9-6.9-6.9S20,34.6,20,38.4C20,42.2,23.1,45.2,26.9,45.2z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SceneCapture2D_16.svg b/Content/Slate/Starship/AssetIcons/SceneCapture2D_16.svg
new file mode 100644
index 0000000..4830130
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SceneCapture2D_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.5 6.5L7.5 13L5 9.30005L2 14H14L10.5 6.5Z" fill="white"/>
+<path d="M13 3V13H3V3H13ZM14 2H2V14H14V2Z" fill="white"/>
+<path d="M6.0002 7.80029C6.99431 7.80029 7.8002 6.99436 7.8002 6.00024C7.8002 5.00613 6.99431 4.2002 6.0002 4.2002C5.00608 4.2002 4.2002 5.00613 4.2002 6.00024C4.2002 6.99436 5.00608 7.80029 6.0002 7.80029Z" fill="white"/>
+<path opacity="0.5" d="M1 1H4V0H0V4H1V1Z" fill="white"/>
+<path opacity="0.5" d="M15 1V4H16V0H12V1H15Z" fill="white"/>
+<path opacity="0.5" d="M15 15H12V16H16V12H15V15Z" fill="white"/>
+<path opacity="0.5" d="M1 15V12H0V16H4V15H1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SceneCapture2D_64.svg b/Content/Slate/Starship/AssetIcons/SceneCapture2D_64.svg
new file mode 100644
index 0000000..3cf94e4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SceneCapture2D_64.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:#FFFFFF;}
+	.st5{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+</style>
+<g id="SceneCapture2D_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<radialGradient id="SVGID_1_" cx="26.1367" cy="215.7974" r="36.2941" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<rect x="15.3" y="15.4" class="st1" width="34.3" height="34.3"/>
+		
+			<radialGradient id="SVGID_2_" cx="25.6352" cy="216.2" r="9.1583" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</radialGradient>
+		<path class="st2" d="M25.6,35.4c5.1,0,9.2-4.1,9.2-9.2S30.7,17,25.6,17s-9.2,4.1-9.2,9.2S20.6,35.4,25.6,35.4z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="24.4558" y1="222.1006" x2="35.0456" y2="246.369" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M38.7,27.6l-8.8,17.6l-7.4-10l-8.8,12.7H49L38.7,27.6z"/>
+		<path class="st4" d="M47.9,16.1v31.8H16.1V16.1H47.9z M51.1,12.9H12.9v38.2h38.2V12.9z"/>
+		<path class="st4" d="M25.6,31.4c3.2,0,5.7-2.6,5.7-5.7S28.7,20,25.6,20s-5.7,2.6-5.7,5.7S22.5,31.4,25.6,31.4z"/>
+		<path class="st5" d="M9.7,9.7h9.5V6.5H6.5v12.7h3.2V9.7z"/>
+		<path class="st5" d="M54.3,9.7v9.5h3.2V6.5H44.7v3.2H54.3z"/>
+		<path class="st5" d="M54.3,54.3h-9.5v3.2h12.7V44.7h-3.2V54.3z"/>
+		<path class="st5" d="M9.7,54.3v-9.5H6.5v12.7h12.7v-3.2H9.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SceneCaptureCube_16.svg b/Content/Slate/Starship/AssetIcons/SceneCaptureCube_16.svg
new file mode 100644
index 0000000..a57a3ad
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SceneCaptureCube_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 4H0V0H4V1H1V4ZM15 1V4H16V0H12V1H15ZM15 15H12V16H16V12H15V15ZM1 15V12H0V16H4V15H1Z" fill="white"/>
+<path opacity="0.5" d="M14 12.1L10 14.5V1.5L14 4.9V12.1Z" fill="white"/>
+<path d="M2 4V12.5L10 14.5V1.5L2 4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SceneCaptureCube_64.svg b/Content/Slate/Starship/AssetIcons/SceneCaptureCube_64.svg
new file mode 100644
index 0000000..4689fdc
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SceneCaptureCube_64.svg
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SceneCaptureCube_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#B2B2B2;enable-background:new    ;}
+	.st2{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<path class="st1" d="M10.2,19.6H7.1V7h12.6v3.1h-9.4V19.6z M54.2,10.2v9.4h3.1V7H44.8v3.1H54.2z M54.2,54.1h-9.4v3.1h12.6V44.7
+		h-3.1V54.1z M10.2,54.1v-9.4H7.1v12.6h12.6v-3.1H10.2z"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="28.6122" y1="22.1498" x2="51.8405" y2="44.1556">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st2" d="M51,45l-12.6,7.5V11.7L51,22.4V45z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.6199" y1="18.2609" x2="44.3082" y2="46.3867">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st3" d="M13.4,19.6v26.7l25.1,6.3V11.7L13.4,19.6z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SceneComponent_16.svg b/Content/Slate/Starship/AssetIcons/SceneComponent_16.svg
new file mode 100644
index 0000000..477217d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SceneComponent_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 10V8H12.5L10.5 3.59L8.5 8.5L6 0L3 10H9Z" fill="#C0C0C0"/>
+<path opacity="0.5" d="M0 11V13H9V11H1L2.5 6L0 11Z" fill="#C0C0C0"/>
+<path d="M15 9V11.5C14 11.5 14 11 13 11C12.7348 11 12.4804 11.1054 12.2929 11.2929C12.1054 11.4804 12 11.7348 12 12V13C12 13.2652 12.1054 13.5196 12.2929 13.7071C12.4804 13.8946 12.7348 14 13 14C14 14 14 13.5 15 13.5V16H16V9H15Z" fill="#C0C0C0"/>
+<path d="M14 15H12.5C12.1022 15 11.7206 14.842 11.4393 14.5607C11.158 14.2794 11 13.8978 11 13.5V11.5C11 11.1022 11.158 10.7206 11.4393 10.4393C11.7206 10.158 12.1022 10 12.5 10H14V9H10V16H14V15Z" fill="#C0C0C0"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SceneComponent_64.svg b/Content/Slate/Starship/AssetIcons/SceneComponent_64.svg
new file mode 100644
index 0000000..7b4b54e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SceneComponent_64.svg
@@ -0,0 +1,35 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M50.3 6.8999H7V50.1999H50.3V6.8999Z" fill="url(#paint0_linear_6488_8088)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M44.3 43.2L37 26.7L31.7 36.6L23.9 16L13.1 43.2H44.3Z" fill="url(#paint1_linear_6488_8088)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8 15.8999L27.1 24.5999L24.8 22.3999L23.5 26.4999L22.5 22.0999L21.1 22.8999L23.8 15.8999Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M37 26.7L39.7 32.7999L38.2 31.4999L37.4 33.7999L36.5 30.8999L34.2 31.7L37 26.7Z" fill="white"/>
+<path opacity="0.71" fill-rule="evenodd" clip-rule="evenodd" d="M36.5 28.5999L31.5 39.4999L25.3 22.7L25.7 20.7L31.6 36.4999L35.2 29.8999L36.5 28.5999Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M47.7 46.3L43.6 34.0001L50.4 47.3V52.7001H7V47.3L13.8 33.8L9.70001 46.3H47.7Z" fill="url(#paint2_linear_6488_8088)"/>
+<path d="M50.3 47.3H7V52.7001H50.3V47.3Z" fill="#BFBFBF"/>
+<path d="M54.8 58.3H33.1C32.3044 58.3 31.5413 57.9839 30.9787 57.4213C30.4161 56.8587 30.1 56.0956 30.1 55.3V37C30.1 36.2044 30.4161 35.4413 30.9787 34.8787C31.5413 34.3161 32.3044 34 33.1 34H54.8C55.5957 34 56.3587 34.3161 56.9213 34.8787C57.4839 35.4413 57.8 36.2044 57.8 37V55.2C57.8134 55.6023 57.7457 56.0032 57.601 56.3788C57.4563 56.7544 57.2374 57.097 56.9575 57.3863C56.6776 57.6755 56.3423 57.9055 55.9716 58.0625C55.601 58.2194 55.2025 58.3002 54.8 58.3Z" fill="url(#paint3_linear_6488_8088)"/>
+<path d="M52.14 36.5H35.86C35.1089 36.5 34.5 37.1089 34.5 37.86V54.14C34.5 54.8911 35.1089 55.5 35.86 55.5H52.14C52.8911 55.5 53.5 54.8911 53.5 54.14V37.86C53.5 37.1089 52.8911 36.5 52.14 36.5Z" fill="#333333"/>
+<path d="M52.14 37.23C52.3071 37.23 52.4673 37.2963 52.5855 37.4145C52.7036 37.5326 52.77 37.6929 52.77 37.86V54.14C52.77 54.3071 52.7036 54.4673 52.5855 54.5854C52.4673 54.7036 52.3071 54.77 52.14 54.77H48.75V50C48.7616 49.8052 48.7319 49.6102 48.6626 49.4277C48.5934 49.2453 48.4862 49.0797 48.3483 48.9417C48.2103 48.8037 48.0446 48.6966 47.8622 48.6273C47.6798 48.5581 47.4847 48.5283 47.29 48.54C45.83 48.54 45.1 50.36 42.9 50.36C40.7 50.36 39.35 48.74 39.35 45.98C39.35 43.22 40.71 41.6 42.9 41.6C45.09 41.6 45.46 43.42 46.9 43.42C47.3335 43.455 47.764 43.3234 48.104 43.0522C48.444 42.781 48.6678 42.3904 48.73 41.96V37.21L52.14 37.23ZM46.92 51.48C46.92 51.02 46.56 50.38 45.83 51.12C45.0333 51.8523 43.9816 52.2435 42.9 52.21C40.4 52.21 37.79 50.02 37.79 46C37.79 41.98 40.4 39.79 42.9 39.79C43.9816 39.7564 45.0333 40.1477 45.83 40.88C46.56 41.62 46.92 40.98 46.92 40.52V37.23H35.86C35.6929 37.23 35.5327 37.2963 35.4145 37.4145C35.2964 37.5326 35.23 37.6929 35.23 37.86V54.14C35.23 54.3071 35.2964 54.4673 35.4145 54.5854C35.5327 54.7036 35.6929 54.77 35.86 54.77H46.92V51.48Z" fill="url(#paint4_linear_6488_8088)"/>
+<path opacity="0.2" d="M52.14 37.78C52.1509 37.7783 52.162 37.7791 52.1725 37.7826C52.183 37.786 52.1925 37.7918 52.2003 37.7996C52.2081 37.8074 52.214 37.817 52.2174 37.8275C52.2208 37.8379 52.2217 37.8491 52.22 37.86V54.14C52.2217 54.1509 52.2208 54.162 52.2174 54.1725C52.214 54.183 52.2081 54.1925 52.2003 54.2003C52.1925 54.2081 52.183 54.214 52.1725 54.2174C52.162 54.2208 52.1509 54.2217 52.14 54.22H49.3V50C49.3098 49.7347 49.2648 49.4702 49.1677 49.2231C49.0707 48.9761 48.9237 48.7516 48.736 48.5639C48.5483 48.3762 48.3239 48.2293 48.0768 48.1322C47.8297 48.0352 47.5653 47.9902 47.3 48C46.5561 48.071 45.8549 48.3795 45.3 48.88C44.6551 49.4605 43.8271 49.7967 42.96 49.83C41.06 49.83 39.96 48.43 39.96 45.99C39.96 43.55 41.06 42.15 42.96 42.15C43.7542 42.1665 44.5094 42.4974 45.06 43.07C45.5612 43.6061 46.2476 43.9315 46.98 43.98C47.5572 44.0144 48.1258 43.8262 48.5685 43.4542C49.0112 43.0822 49.2945 42.5546 49.36 41.98V37.78H52.2H52.14ZM46.44 37.78V40.52C46.4456 40.5531 46.4456 40.5869 46.44 40.62C46.3863 40.5849 46.336 40.5447 46.29 40.5C45.8495 40.0807 45.33 39.7534 44.7617 39.5371C44.1934 39.3207 43.5877 39.2197 42.98 39.24C40.24 39.24 37.32 41.61 37.32 46C37.32 50.39 40.24 52.76 42.98 52.76C43.5877 52.7802 44.1934 52.6792 44.7617 52.4629C45.33 52.2465 45.8495 51.9192 46.29 51.5C46.336 51.4552 46.3863 51.4151 46.44 51.38C46.4456 51.4131 46.4456 51.4469 46.44 51.48V54.22H35.92C35.9091 54.2217 35.8979 54.2208 35.8875 54.2174C35.877 54.214 35.8674 54.2081 35.8596 54.2003C35.8518 54.1925 35.846 54.183 35.8426 54.1725C35.8392 54.162 35.8383 54.1509 35.84 54.14V37.86C35.8383 37.8491 35.8392 37.8379 35.8426 37.8275C35.846 37.817 35.8518 37.8074 35.8596 37.7996C35.8674 37.7918 35.877 37.786 35.8875 37.7826C35.8979 37.7791 35.9091 37.7783 35.92 37.78H46.44ZM52.2 37.23H48.81V42C48.7478 42.4304 48.524 42.821 48.184 43.0922C47.844 43.3635 47.4135 43.4949 46.98 43.46C45.52 43.46 45.16 41.64 42.98 41.64C40.8 41.64 39.43 43.26 39.43 46.02C39.43 48.78 40.79 50.4 42.98 50.4C45.17 50.4 45.91 48.58 47.37 48.58C47.5648 48.5683 47.7598 48.5981 47.9422 48.6673C48.1246 48.7366 48.2903 48.8437 48.4283 48.9817C48.5662 49.1197 48.6734 49.2853 48.7426 49.4677C48.8119 49.6502 48.8416 49.8452 48.83 50.04V54.79H52.22C52.3871 54.79 52.5473 54.7236 52.6655 54.6054C52.7836 54.4873 52.85 54.3271 52.85 54.16V37.88C52.85 37.7129 52.7836 37.5526 52.6655 37.4345C52.5473 37.3163 52.3871 37.25 52.22 37.25L52.2 37.23ZM46.98 37.23H35.92C35.7529 37.23 35.5927 37.2963 35.4745 37.4145C35.3564 37.5326 35.29 37.6929 35.29 37.86V54.14C35.29 54.3071 35.3564 54.4673 35.4745 54.5854C35.5927 54.7036 35.7529 54.77 35.92 54.77H46.98V51.48C46.98 51.17 46.82 50.78 46.49 50.78C46.2538 50.8122 46.039 50.9339 45.89 51.12C45.0933 51.8523 44.0416 52.2435 42.96 52.21C40.46 52.21 37.85 50.02 37.85 46C37.85 41.98 40.46 39.79 42.96 39.79C44.0416 39.7564 45.0933 40.1477 45.89 40.88C46.039 41.066 46.2538 41.1877 46.49 41.22C46.82 41.22 46.98 40.83 46.98 40.52V37.23Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_6488_8088" x1="28.7" y1="50.2499" x2="28.6" y2="6.8499" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+<linearGradient id="paint1_linear_6488_8088" x1="28.95" y1="15.33" x2="28.7" y2="43.06" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint2_linear_6488_8088" x1="28.71" y1="52.3501" x2="28.66" y2="33.89" gradientUnits="userSpaceOnUse">
+<stop offset="0.39" stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#404040"/>
+</linearGradient>
+<linearGradient id="paint3_linear_6488_8088" x1="44.06" y1="57.73" x2="43.83" y2="33.69" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint4_linear_6488_8088" x1="49.87" y1="35.82" x2="38.13" y2="56.18" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F2F2F2"/>
+<stop offset="1" stop-color="#4F4F4F"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkeletalMeshActor_16.svg b/Content/Slate/Starship/AssetIcons/SkeletalMeshActor_16.svg
new file mode 100644
index 0000000..bb21c0e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkeletalMeshActor_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.49952 0C5.29952 0 3.99952 0.8 3.99952 3C3.99952 3.3 3.89952 5.7 3.99952 6H5.19952C5.59952 6 5.99952 6.39999 5.99952 6.79999V7.70001C6.49952 7.90001 6.99952 8 7.49952 8C7.99952 8 8.49952 7.90001 8.99952 7.70001V6.79999C8.99952 6.39999 9.39952 6 9.79952 6H10.9995C11.0995 5.7 10.9995 3.3 10.9995 3C10.9995 0.8 9.69952 0 7.49952 0ZM5.89952 5H4.99952V3H6.99952V3.89999C6.99952 4.49999 6.49952 5 5.89952 5ZM9.99952 5H9.09952C8.49952 5 7.99952 4.49999 7.99952 3.89999V3H9.99952V5ZM7.99952 6H6.99952L7.49952 5L7.99952 6Z" fill="white"/>
+<path d="M7 11H4V12H7V11Z" fill="white"/>
+<path d="M7 13H4V14H7V13Z" fill="white"/>
+<path d="M7 15H4V16H7V15Z" fill="white"/>
+<path d="M11 15H8V16H11V15Z" fill="white"/>
+<path d="M11 13H8V14H11V13Z" fill="white"/>
+<path d="M11 11H8V12H11V11Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 9L2 16H1L2 9H3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 9L13 16H14L13 9H12Z" fill="white"/>
+<path d="M8 10H7V16H8V10Z" fill="white"/>
+<path d="M12 9H3V10H12V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkeletalMeshActor_64.svg b/Content/Slate/Starship/AssetIcons/SkeletalMeshActor_64.svg
new file mode 100644
index 0000000..36beff6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkeletalMeshActor_64.svg
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SkeletalMeshActor_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#BFBFBF;}
+	.st3{fill:#A5A5A5;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9762" y1="32.4523" x2="32.2716" y2="57.3644">
+				<stop  offset="0" style="stop-color:#383838"/>
+				<stop  offset="0.2193" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st0" d="M33.7,31.7h-3.1v25.4h3.1V31.7z"/>
+			<path class="st1" d="M41.8,41.6H22.5c-0.7,0-1.2,0.6-1.2,1.2v0.6c0,0.7,0.6,1.2,1.2,1.2h19.3c0.7,0,1.2-0.6,1.2-1.2v-0.6
+				C43.1,42.2,42.5,41.6,41.8,41.6z"/>
+			<path class="st2" d="M40.2,47.8H24.3c-0.7,0-1.2,0.6-1.2,1.2v0.6c0,0.7,0.6,1.2,1.2,1.2h15.8c0.7,0,1.2-0.6,1.2-1.2v-0.6
+				C41.4,48.4,40.9,47.8,40.2,47.8z"/>
+			<path class="st3" d="M38.8,54H25.5c-0.7,0-1.2,0.6-1.2,1.2v0.6c0,0.7,0.6,1.2,1.2,1.2h13.3c0.7,0,1.2-0.6,1.2-1.2v-0.6
+				C40,54.6,39.5,54,38.8,54z"/>
+			<path class="st1" d="M44.6,35.4H19.7c-0.8,0-1.5,0.7-1.5,1.5v0.2c0,0.8,0.7,1.5,1.5,1.5h24.9c0.8,0,1.5-0.7,1.5-1.5v-0.2
+				C46,36.1,45.4,35.4,44.6,35.4z"/>
+		</g>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="12.7678" y1="34.6113" x2="13.0269" y2="56.4549">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M11.2,55.9l4.2-16.7c0-0.2,0.2-0.3,0.3-0.5l1.3-0.9c0.3-0.2,0.4-0.6,0.3-0.9l-0.5-1.2
+			c-0.2-0.4-0.7-0.7-1.2-0.5l-0.2,0.1c-0.4,0.1-0.8,0-1-0.3l-0.1-0.1c-0.3-0.4-0.9-0.4-1.3-0.1l-1,0.8c-0.3,0.2-0.4,0.6-0.2,1
+			l0.7,1.4c0.1,0.2,0.1,0.4,0.1,0.6L8.5,55.2c-0.1,0.4,0.2,0.9,0.7,1l1,0.3C10.6,56.6,11.1,56.3,11.2,55.9z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="50.9542" y1="34.5941" x2="51.2141" y2="56.5147">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st5" d="M52.8,55.9l-4.2-16.7c0-0.2-0.2-0.3-0.3-0.5L47,37.9c-0.3-0.2-0.4-0.6-0.3-0.9l0.5-1.2
+			c0.2-0.4,0.7-0.7,1.2-0.5l0.2,0.1c0.4,0.1,0.8,0,1-0.3l0.1-0.1c0.3-0.4,0.9-0.4,1.3-0.1l1,0.8c0.3,0.2,0.4,0.6,0.2,1L51.4,38
+			c-0.1,0.2-0.1,0.4-0.1,0.6l4.2,16.7c0.1,0.4-0.2,0.9-0.7,1l-1,0.3C53.4,56.6,52.9,56.3,52.8,55.9z"/>
+	</g>
+	<circle class="st1" cx="15.1" cy="36.2" r="3.8"/>
+	<circle class="st1" cx="49.2" cy="37" r="3.8"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="32.1625" y1="32.3317" x2="32.3163" y2="7.8676">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st6" d="M32.2,7.9c-5.8,0-10.5,2.3-10.5,5.2v11.5c0,0.5,0.4,0.9,0.9,0.9h3.3c0.5,0,0.9,0.4,0.9,0.9v4.1
+		c0,0.4,0.2,0.7,0.5,0.8c3.3,1.4,6.6,1.4,9.9,0c0.3-0.1,0.5-0.5,0.5-0.8v-4.1c0-0.5,0.4-0.9,0.9-0.9h3.3c0.5,0,0.9-0.4,0.9-0.9V13.1
+		C42.8,10.2,38.1,7.9,32.2,7.9z M26,21.3c-0.7,0.2-1.3-0.3-1.3-1v-4.1c0-0.6,0.5-1,1-1h4.2c0.7,0,1.1,0.6,1,1.2
+		C30.5,19.1,28.7,20.7,26,21.3z M33.8,24.5h-3.2c-0.3,0-0.5-0.2-0.4-0.3l1.6-2.2c0.1-0.2,0.6-0.2,0.7,0l1.6,2.2
+		C34.3,24.4,34.1,24.5,33.8,24.5z M39.8,20.3c0,0.7-0.7,1.2-1.3,1c-2.8-0.7-4.5-2.2-5-4.9c-0.1-0.6,0.4-1.2,1-1.2h4.2
+		c0.6,0,1,0.5,1,1V20.3z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkeletalMesh_16.svg b/Content/Slate/Starship/AssetIcons/SkeletalMesh_16.svg
new file mode 100644
index 0000000..35bc5de
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkeletalMesh_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.50001 0C5.30001 0 4.00001 0.8 4.00001 3C4.00001 3.3 3.90001 5.7 4.00001 6H5.20001C5.60001 6 6.00001 6.39999 6.00001 6.79999V7.70001C6.50001 7.90001 7.00001 8 7.50001 8C8.00001 8 8.50001 7.90001 9.00001 7.70001V6.79999C9.00001 6.39999 9.40001 6 9.80001 6H11C11.1 5.7 11 3.3 11 3C11 0.8 9.70001 0 7.50001 0ZM5.90001 5H5.00001V3H7.00001V3.89999C7.00001 4.49999 6.50001 5 5.90001 5ZM10 5H9.10001C8.50001 5 8.00001 4.49999 8.00001 3.89999V3H10V5ZM8.00001 6H7.00001L7.50001 5L8.00001 6Z" fill="white"/>
+<path d="M7 11H4V12H7V11Z" fill="white"/>
+<path d="M7 13H4V14H7V13Z" fill="white"/>
+<path d="M7 15H4V16H7V15Z" fill="white"/>
+<path d="M11 15H8V16H11V15Z" fill="white"/>
+<path d="M11 13H8V14H11V13Z" fill="white"/>
+<path d="M11 11H8V12H11V11Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 9L2 16H1L2 9H3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 9L13 16H14L13 9H12Z" fill="white"/>
+<path d="M8 10H7V16H8V10Z" fill="white"/>
+<path d="M12 9H3V10H12V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Skeleton_16.svg b/Content/Slate/Starship/AssetIcons/Skeleton_16.svg
new file mode 100644
index 0000000..d661f15
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Skeleton_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5003 0.199219C7.1003 0.199219 6.3003 0.699219 6.3003 1.99922C6.3003 2.19922 6.2003 3.59922 6.3003 3.79922H7.0003C7.3003 3.79922 7.5003 3.99922 7.5003 4.29922V4.89922C7.8003 4.99922 8.10031 5.09922 8.40031 5.09922C8.70031 5.09922 9.0003 4.99922 9.3003 4.89922V4.29922C9.3003 3.99922 9.5003 3.79922 9.8003 3.79922H10.5003C10.6003 3.59922 10.5003 2.19922 10.5003 1.99922C10.7003 0.599219 9.9003 0.199219 8.5003 0.199219ZM7.1003 3.19922H7.0003V1.99922H8.20031V2.09922C8.20031 2.69922 7.7003 3.19922 7.1003 3.19922ZM10.0003 3.19922H9.90031C9.30031 3.19922 8.8003 2.69922 8.8003 2.09922V1.99922H10.0003V3.19922ZM8.8003 3.79922H8.20031L8.5003 3.19922L8.8003 3.79922Z" fill="white"/>
+<path d="M8 8H6V9H8V8Z" fill="white"/>
+<path d="M11 8H9V9H11V8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 5.99922L13 10.9992H14L11.9 5.69922L11 5.99922Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 5.99922L4 10.9992H3L5.1 5.69922L6 5.99922Z" fill="white"/>
+<path d="M9 6H8V10H9V6Z" fill="white"/>
+<path d="M11 6H6V7H11V6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 11L7 13H6V10L8 11Z" fill="white"/>
+<path d="M7 13H6V16H7V13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 11L10 13H11V10L9 11Z" fill="white"/>
+<path d="M11 13H10V16H11V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Skeleton_64.svg b/Content/Slate/Starship/AssetIcons/Skeleton_64.svg
new file mode 100644
index 0000000..12be388
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Skeleton_64.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Skeleton_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#BFBFBF;}
+	.st3{fill:#A5A5A5;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#A5A5A5;}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st10{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_7_);}
+	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);}
+	.st12{fill:none;}
+</style>
+<g>
+	<g>
+		<g>
+			<g>
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.1098" y1="19.5567" x2="31.315" y2="36.861">
+					<stop  offset="0" style="stop-color:#383838"/>
+					<stop  offset="0.2193" style="stop-color:#BFBFBF"/>
+					<stop  offset="1" style="stop-color:#808080"/>
+				</linearGradient>
+				<path class="st0" d="M31.9,19h-1.4v17.7h1.4V19z"/>
+				<path class="st1" d="M35.5,23.2H27c-0.3,0-0.6,0.2-0.6,0.5v0.3c0,0.3,0.2,0.5,0.6,0.5h8.5c0.3,0,0.6-0.2,0.6-0.5v-0.3
+					C36,23.4,35.8,23.2,35.5,23.2z"/>
+				<path class="st2" d="M34.8,25.8h-7c-0.3,0-0.6,0.2-0.6,0.5v0.3c0,0.3,0.2,0.5,0.6,0.5h7c0.3,0,0.6-0.2,0.6-0.5v-0.3
+					C35.3,26,35.1,25.8,34.8,25.8z"/>
+				<path class="st3" d="M34.2,28.3h-5.9c-0.3,0-0.6,0.2-0.6,0.5v0.3c0,0.3,0.2,0.5,0.6,0.5h5.9c0.3,0,0.6-0.2,0.6-0.5v-0.3
+					C34.7,28.6,34.5,28.3,34.2,28.3z"/>
+				<path class="st1" d="M36.7,20.6h-11c-0.4,0-0.6,0.3-0.6,0.6v0.1c0,0.3,0.3,0.6,0.6,0.6h11c0.4,0,0.6-0.3,0.6-0.6v-0.1
+					C37.4,20.9,37.1,20.6,36.7,20.6z"/>
+			</g>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="22.6695" y1="20.2423" x2="22.7777" y2="29.3666">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st4" d="M22,29.1l1.8-7c0-0.1,0.1-0.1,0.1-0.2l0.6-0.4c0.1-0.1,0.2-0.2,0.1-0.4l-0.2-0.5c-0.1-0.2-0.3-0.3-0.5-0.2
+				l-0.1,0c-0.2,0.1-0.3,0-0.5-0.1l0,0c-0.1-0.2-0.4-0.2-0.6-0.1l-0.5,0.4c-0.1,0.1-0.2,0.3-0.1,0.4l0.3,0.6c0,0.1,0.1,0.2,0,0.2
+				l-1.8,7c0,0.2,0.1,0.4,0.3,0.4l0.4,0.1C21.7,29.4,21.9,29.3,22,29.1z"/>
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="39.5267" y1="20.2347" x2="39.6353" y2="29.3929">
+				<stop  offset="0" style="stop-color:#FFFFFF"/>
+				<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st5" d="M40.3,29.1l-1.8-7c0-0.1-0.1-0.1-0.1-0.2l-0.6-0.4c-0.1-0.1-0.2-0.2-0.1-0.4l0.2-0.5
+				c0.1-0.2,0.3-0.3,0.5-0.2l0.1,0c0.2,0.1,0.3,0,0.5-0.1l0,0c0.1-0.2,0.4-0.2,0.6-0.1l0.5,0.4c0.1,0.1,0.2,0.3,0.1,0.4l-0.3,0.6
+				c0,0.1-0.1,0.2,0,0.2l1.8,7c0,0.2-0.1,0.4-0.3,0.4l-0.4,0.1C40.6,29.4,40.4,29.3,40.3,29.1z"/>
+		</g>
+		<ellipse class="st1" cx="23.7" cy="20.9" rx="1.7" ry="1.6"/>
+		<ellipse class="st1" cx="38.7" cy="21.2" rx="1.7" ry="1.6"/>
+		<ellipse class="st1" cx="41.5" cy="30.1" rx="1.7" ry="1.6"/>
+		<ellipse class="st1" cx="21" cy="30.1" rx="1.7" ry="1.6"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="19.8808" y1="29.7395" x2="19.9889" y2="38.8637">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st6" d="M19.2,38.6l1.8-7c0-0.1,0.1-0.1,0.1-0.2l0.6-0.4c0.1-0.1,0.2-0.2,0.1-0.4l-0.2-0.5c-0.1-0.2-0.3-0.3-0.5-0.2
+			l-0.1,0c-0.2,0.1-0.3,0-0.5-0.1l0,0c-0.1-0.2-0.4-0.2-0.6-0.1l-0.5,0.4c-0.1,0.1-0.2,0.3-0.1,0.4l0.3,0.6c0,0.1,0.1,0.2,0,0.2
+			l-1.8,7c0,0.2,0.1,0.4,0.3,0.4l0.4,0.1C18.9,38.9,19.1,38.8,19.2,38.6z"/>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="59.1806" y1="29.7395" x2="59.2888" y2="38.8637" gradientTransform="matrix(-1 0 0 1 101.6343 0)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st7" d="M43.1,38.6l-1.8-7c0-0.1-0.1-0.1-0.1-0.2l-0.6-0.4c-0.1-0.1-0.2-0.2-0.1-0.4l0.2-0.5c0.1-0.2,0.3-0.3,0.5-0.2
+			l0.1,0c0.2,0.1,0.3,0,0.5-0.1l0,0c0.1-0.2,0.4-0.2,0.6-0.1l0.5,0.4c0.1,0.1,0.2,0.3,0.1,0.4l-0.3,0.6c0,0.1-0.1,0.2,0,0.2l1.8,7
+			c0,0.2-0.1,0.4-0.3,0.4l-0.4,0.1C43.4,38.9,43.2,38.8,43.1,38.6z"/>
+		<path class="st8" d="M34.4,33.8c0.7,0,1.1,1.1,0.7,1.8c-0.8,1.3-2.3,2.2-4.1,2.2c-1.8,0-3.3-0.9-4.1-2.2c-0.4-0.7,0-1.8,0.7-1.8
+			H34.4z"/>
+		<ellipse class="st1" cx="44.1" cy="39.4" rx="1.7" ry="1.6"/>
+		<ellipse class="st1" cx="18.6" cy="38.9" rx="1.7" ry="1.6"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="26.4671" y1="39.2557" x2="24.9255" y2="56.2137">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st9" d="M28.4,40.9l-1.8,13.9c0,0.4-0.4,0.6-0.8,0.6h-0.5c-0.4,0-0.8-0.3-0.8-0.7V38.5c0-0.7,0.8-1,1.3-0.5l2.3,2.3
+			C28.3,40.4,28.4,40.7,28.4,40.9z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="35.8529" y1="37.0515" x2="37.4538" y2="56.4997">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.6346" style="stop-color:#AFAFAF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st10" d="M34.4,40.3l2.3-2.3c0.5-0.5,1.3-0.2,1.3,0.5v16.2c0,0.4-0.3,0.7-0.8,0.7h-0.5c-0.4,0-0.7-0.3-0.8-0.6
+			l-1.8-13.9C34.1,40.7,34.2,40.4,34.4,40.3z"/>
+	</g>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="31.175" y1="18.1322" x2="31.2351" y2="8.5739">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st11" d="M31.2,8.6c-2.3,0-4.1,0.9-4.1,2v4.5c0,0.2,0.2,0.3,0.3,0.3h1.3c0.2,0,0.3,0.2,0.3,0.3v1.6
+		c0,0.1,0.1,0.3,0.2,0.3c1.3,0.6,2.6,0.6,3.9,0c0.1-0.1,0.2-0.2,0.2-0.3v-1.6c0-0.2,0.2-0.3,0.3-0.3H35c0.2,0,0.3-0.2,0.3-0.3v-4.5
+		C35.3,9.5,33.5,8.6,31.2,8.6z M28.8,13.8c-0.3,0.1-0.5-0.1-0.5-0.4v-1.6c0-0.2,0.2-0.4,0.4-0.4h1.6c0.3,0,0.4,0.2,0.4,0.5
+		C30.5,13,29.8,13.6,28.8,13.8z M31.8,15.1h-1.2c-0.1,0-0.2-0.1-0.1-0.1l0.6-0.9c0.1-0.1,0.2-0.1,0.3,0L32,15
+		C32,15,31.9,15.1,31.8,15.1z M34.2,13.4c0,0.3-0.3,0.5-0.5,0.4c-1.1-0.3-1.8-0.9-1.9-1.9c0-0.3,0.1-0.5,0.4-0.5h1.6
+		c0.2,0,0.4,0.2,0.4,0.4V13.4z"/>
+	<rect x="0" class="st12" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkyAtmosphereComponent_16.svg b/Content/Slate/Starship/AssetIcons/SkyAtmosphereComponent_16.svg
new file mode 100644
index 0000000..cdc3226
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkyAtmosphereComponent_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.96 6.39961L13.99 4.34961L10.53 5.47961C10.38 5.25961 10.19 5.07961 9.99002 4.89961L11.88 2.01961L9.26002 4.42961C9.03002 4.32961 8.78002 4.24961 8.52002 4.20961L8.00002 1.09961L7.48002 4.20961C7.23002 4.24961 6.98002 4.31961 6.76002 4.41961L4.13002 2.01961L6.01002 4.89961C5.81002 5.06961 5.62002 5.25961 5.47002 5.47961L2.01002 4.34961L5.04002 6.39961C4.98002 6.59961 4.94002 6.81961 4.93002 7.03961L1.52002 7.33961L4.85002 7.80961C5.74002 7.67961 6.78002 7.58961 8.00002 7.58961C9.22002 7.58961 10.26 7.67961 11.16 7.80961L14.49 7.33961L11.08 7.03961C11.06 6.81961 11.02 6.60961 10.96 6.39961Z" fill="white"/>
+<path opacity="0.5" d="M16 14C16 14 14 10.91 8 10.91C2 10.91 0 14 0 14C0 14 1.5 9 8 9C14.5 9 16 14 16 14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkyAtmosphere_16.svg b/Content/Slate/Starship/AssetIcons/SkyAtmosphere_16.svg
new file mode 100644
index 0000000..d469a24
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkyAtmosphere_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 6.39961L14 4.29961L10.5 5.39961C10.3 5.19961 10.2 4.99961 10 4.79961L11.9 1.99961L9.3 4.39961C9 4.29961 8.8 4.29961 8.5 4.19961L8 1.09961L7.5 4.19961C7.2 4.19961 7 4.29961 6.8 4.39961L4.1 1.99961L6 4.89961C5.8 5.09961 5.6 5.29961 5.5 5.49961L2 4.29961L5 6.39961C5 6.59961 4.9 6.79961 4.9 6.99961L1.5 7.29961L4.8 7.79961C5.7 7.69961 6.8 7.59961 8 7.59961C9.2 7.59961 10.3 7.69961 11.2 7.79961L14.5 7.29961L11.1 6.99961C11.1 6.79961 11 6.59961 11 6.39961Z" fill="white"/>
+<path opacity="0.5" d="M16 14C16 14 14 10.9 8 10.9C2 10.9 0 14 0 14C0 14 1.5 9 8 9C14.5 9 16 14 16 14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkyAtmosphere_64.svg b/Content/Slate/Starship/AssetIcons/SkyAtmosphere_64.svg
new file mode 100644
index 0000000..380ba55
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkyAtmosphere_64.svg
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#CCCCCC;}
+	.st2{opacity:0.4;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);stroke:#FFFFFF;stroke-width:4;stroke-miterlimit:10;}
+	.st4{fill:url(#SVGID_3_);stroke:#CCCCCC;stroke-width:4;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+</style>
+<g id="SkyAtmosphere_x5F_64">
+	<rect class="st0" width="64" height="64"/>
+	<g>
+		<path class="st1" d="M41.8,28l8.2-5.7c0.3-0.2,0.1-0.6-0.2-0.5l-9.5,3c-0.1,0-0.2,0-0.3-0.1c-0.5-0.6-0.8-1.1-1.4-1.7
+			c-0.1-0.1-0.1-0.2,0-0.3l4.9-7.4c0.2-0.3-0.2-0.6-0.4-0.4l-6.7,6.2c-0.1,0.1-0.2,0.1-0.3,0c-0.6-0.3-1.3-0.5-1.9-0.6
+			c-0.1,0-0.2-0.1-0.2-0.2l-1.3-8.2c-0.1-0.3-0.5-0.3-0.6,0l-1.3,8.2c0,0.1-0.1,0.2-0.3,0.2c-0.8,0-1.3,0.3-1.9,0.6
+			c-0.1,0.1-0.2,0-0.3,0l-6.7-6.2c-0.2-0.2-0.6,0.1-0.4,0.4l4.8,7.4c0.1,0.1,0.1,0.3,0,0.3c-0.5,0.5-1.1,1.1-1.4,1.6
+			c-0.1,0.1-0.2,0.2-0.3,0.1l-9.5-3c-0.3-0.1-0.5,0.3-0.2,0.5l8.1,5.7c0.1,0.1,0.1,0.2,0.1,0.3c-0.2,0.5-0.2,1-0.2,1.5
+			c0,0.1-0.1,0.3-0.3,0.3l-8.5,0.8c-0.3,0-0.3,0.5,0,0.6l8.4,1.3c0,0,0,0,0.1,0c2.7-0.4,6-0.7,10.2-0.7s7.5,0.3,10.4,0.6
+			c0,0,0,0,0.1,0l8.4-1.3c0.3,0,0.3-0.5,0-0.6L42.7,30c-0.1,0-0.1,0-0.2-0.1c-0.5-0.6-0.8-1.1-0.9-1.7C41.6,28.1,41.7,28,41.8,28z"
+			/>
+		
+			<radialGradient id="SVGID_1_" cx="31.5537" cy="53.14" r="34.4738" gradientTransform="matrix(1 0 0 -1 0 66)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2;stop-opacity:0"/>
+			<stop  offset="1" style="stop-color:#F2F2F2;stop-opacity:0.5"/>
+		</radialGradient>
+		<circle class="st2" cx="32.5" cy="30.6" r="21.2"/>
+		
+			<radialGradient id="SVGID_2_" cx="32.731" cy="34.8747" r="11.6208" gradientTransform="matrix(1 0 0 -1 0 66)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</radialGradient>
+		<circle class="st3" cx="32.7" cy="31.1" r="11.6"/>
+		
+			<radialGradient id="SVGID_3_" cx="32.6552" cy="33.9583" r="11.6208" gradientTransform="matrix(1 0 0 -1 0 66)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#CCCCCC"/>
+		</radialGradient>
+		<circle class="st4" cx="32.7" cy="32" r="11.6"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="32.3664" y1="24.3071" x2="32.4921" y2="14.182" gradientTransform="matrix(1 0 0 -1 0 66)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st5" d="M5.6,52.5C7.5,46.6,17.6,42,32.5,42s24.9,4.8,26.9,10.4C41.1,52,23.1,52,5.6,52.5z"/>
+		
+			<radialGradient id="SVGID_5_" cx="32.2859" cy="31.5657" r="32.9504" gradientTransform="matrix(1 0 0 -1 0 66)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</radialGradient>
+		<path class="st6" d="M59.4,52.5c0,0-6.7-10.4-26.9-10.4S5.6,52.5,5.6,52.5s5-16.8,26.9-16.8S59.4,52.5,59.4,52.5z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkyLight_16-1.svg b/Content/Slate/Starship/AssetIcons/SkyLight_16-1.svg
new file mode 100644
index 0000000..6d852f5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkyLight_16-1.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0.299805C3.6 0.299805 0 3.8998 0 8.2998C0 8.6998 -9.68575e-08 9.19981 0.0999999 9.59981H1.1C1 9.19981 1 8.6998 1 8.2998C1 4.3998 4.1 1.2998 8 1.2998C11.9 1.2998 15 4.3998 15 8.2998C15 8.7998 15 9.19981 14.9 9.59981H15.9C16 9.19981 16 8.6998 16 8.2998C16 3.8998 12.4 0.299805 8 0.299805Z" fill="white"/>
+<path opacity="0.5" d="M1.1 9.59981C1 9.19981 1 8.6998 1 8.2998C1 4.3998 4.1 1.2998 8 1.2998C11.9 1.2998 15 4.3998 15 8.2998C15 8.7998 15 9.19981 14.9 9.59981C14.9 9.59981 12 7.59981 8 7.59981C4 7.59981 1.1 9.59981 1.1 9.59981Z" fill="white"/>
+<path d="M8.6 12.3008H7.5V16.0008H8.6V12.3008Z" fill="white"/>
+<path d="M11.5991 10.8247L10.8213 11.6025L13.2254 14.0067L14.0032 13.2289L11.5991 10.8247Z" fill="white"/>
+<path d="M5.17234 11.5864L4.39453 10.8086L1.91968 13.2834L2.69749 14.0613L5.17234 11.5864Z" fill="white"/>
+<path d="M8.00039 10.1004C9.16019 10.1004 10.1004 9.16019 10.1004 8.0004C10.1004 6.8406 9.16019 5.90039 8.00039 5.90039C6.84059 5.90039 5.90039 6.8406 5.90039 8.0004C5.90039 9.16019 6.84059 10.1004 8.00039 10.1004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkyLight_16.svg b/Content/Slate/Starship/AssetIcons/SkyLight_16.svg
new file mode 100644
index 0000000..a755940
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkyLight_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0.299805C3.6 0.299805 0 3.8998 0 8.2998C0 8.6998 0 9.19981 0.1 9.5998H1.1C1 9.19981 1 8.6998 1 8.2998C1 4.3998 4.1 1.2998 8 1.2998C11.9 1.2998 15 4.3998 15 8.2998C15 8.7998 15 9.19981 14.9 9.5998H15.9C16 9.19981 16 8.6998 16 8.2998C16 3.8998 12.4 0.299805 8 0.299805Z" fill="white"/>
+<path opacity="0.5" d="M1.1 9.60078C1 9.20078 1 8.70078 1 8.30078C1 4.40078 4.1 1.30078 8 1.30078C11.9 1.30078 15 4.40078 15 8.30078C15 8.80078 15 9.20078 14.9 9.60078C14.9 9.60078 12 7.60078 8 7.60078C4 7.60078 1.1 9.60078 1.1 9.60078Z" fill="white"/>
+<path d="M8.6 12.3008H7.5V16.0008H8.6V12.3008Z" fill="white"/>
+<path d="M11.6006 10.8257L10.8228 11.6035L13.2269 14.0077L14.0047 13.2298L11.6006 10.8257Z" fill="white"/>
+<path d="M5.17039 11.5884L4.39258 10.8105L1.91773 13.2854L2.69554 14.0632L5.17039 11.5884Z" fill="white"/>
+<path d="M7.9999 10.1004C9.1597 10.1004 10.0999 9.16019 10.0999 8.00039C10.0999 6.84059 9.1597 5.90039 7.9999 5.90039C6.8401 5.90039 5.8999 6.84059 5.8999 8.00039C5.8999 9.16019 6.8401 10.1004 7.9999 10.1004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SkyLight_64.svg b/Content/Slate/Starship/AssetIcons/SkyLight_64.svg
new file mode 100644
index 0000000..c84c80c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SkyLight_64.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#E5E5E5;}
+	.st2{opacity:0.5;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:#FFFFFF;}
+</style>
+<g id="SkyLight_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		<path class="st1" d="M32.2,5.6C17.4,5.6,5.3,17.7,5.3,32.5c0,1.3,0,3,0.3,4.4H9c-0.3-1.3-0.3-3-0.3-4.4C8.7,19.4,19.1,9,32.2,9
+			s23.5,10.4,23.5,23.5c0,1.7,0,3-0.3,4.4h3.4c0.3-1.3,0.3-3,0.3-4.4C59,17.7,46.9,5.6,32.2,5.6z"/>
+		
+			<radialGradient id="SVGID_1_" cx="32.2" cy="212.95" r="19.3242" fx="32.1143" fy="222.2279" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0.3529" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.728" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#3B3B3B"/>
+		</radialGradient>
+		<path class="st2" d="M9,36.9c-0.3-1.3-0.3-3-0.3-4.4C8.7,19.4,19.1,9,32.2,9s23.5,10.4,23.5,23.5c0,1.7,0,3-0.3,4.4
+			c0,0-9.7-6.7-23.2-6.7S9,36.9,9,36.9z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.3121" y1="235.9371" x2="32.3879" y2="248.3705" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.5187" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M32.8,45.9h-0.9c-0.8,0-1.4,0.6-1.4,1.4V57c0,0.8,0.6,1.4,1.4,1.4h0.9c0.8,0,1.4-0.6,1.4-1.4v-9.7
+			C34.2,46.6,33.6,45.9,32.8,45.9z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="47.0207" y1="231.5427" x2="47.0791" y2="241.113" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.5187" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M43.3,42l-0.6,0.6c-0.5,0.5-0.5,1.4,0,2l6.1,6.1c0.5,0.5,1.4,0.5,2,0l0.6-0.6c0.5-0.5,0.5-1.4,0-2L45.2,42
+			C44.7,41.4,43.8,41.4,43.3,42z"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="17.1648" y1="231.5208" x2="17.2242" y2="241.2605" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.5187" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st5" d="M21.7,42.6L21,41.9c-0.5-0.5-1.4-0.5-2,0l-6.3,6.3c-0.5,0.5-0.5,1.4,0,2l0.6,0.6c0.5,0.5,1.4,0.5,2,0l6.3-6.3
+			C22.2,44,22.2,43.1,21.7,42.6z"/>
+		<path class="st6" d="M32.2,38.8c4.4,0,7.9-3.5,7.9-7.9S36.6,23,32.2,23s-7.9,3.5-7.9,7.9S27.8,38.8,32.2,38.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SlateBrushAsset_16.svg b/Content/Slate/Starship/AssetIcons/SlateBrushAsset_16.svg
new file mode 100644
index 0000000..b33f802
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SlateBrushAsset_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M14 13H10L10.9 12H13V9.5L14 8.3V13ZM4 10L5 9.7V5H11L12 4H4V10Z" fill="white"/>
+<path d="M3 4H0V13H3V4Z" fill="white"/>
+<path d="M14 0H0V3H14V0Z" fill="white"/>
+<path opacity="0.5" d="M8.4999 11.8992L7.3999 10.7992C7.3999 10.7992 9.0999 8.69922 10.0999 7.69922C11.0999 6.69922 15.3999 3.39922 15.3999 3.39922C15.4999 3.29922 15.6999 3.29922 15.8999 3.39922C15.9999 3.49922 15.9999 3.69922 15.8999 3.89922C15.8999 3.89922 12.5999 8.19922 11.5999 9.19922C10.5999 10.1992 8.4999 11.8992 8.4999 11.8992Z" fill="white"/>
+<path d="M7.6 12.1993L6.9 11.4993C6.9 11.4993 5.1 11.1993 4.5 13.5993C4.1 14.9993 2 15.9993 2 15.9993C2 15.9993 3.9 15.9993 4.6 15.9993C5.3 15.9993 6.7 15.5993 7.4 14.1993C8 12.9993 7.6 12.1993 7.6 12.1993Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SlateBrushAsset_64.svg b/Content/Slate/Starship/AssetIcons/SlateBrushAsset_64.svg
new file mode 100644
index 0000000..918db2e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SlateBrushAsset_64.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SlatePrushAsset_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#999999;enable-background:new    ;}
+	.st3{opacity:0.3;enable-background:new    ;}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill:url(#SVGID_3_);}
+	.st6{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st7{fill:url(#SVGID_5_);enable-background:new    ;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="29.3217" y1="18.9094" x2="41.311" y2="49.7754">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#1A1A1A"/>
+	</linearGradient>
+	<rect x="21.5" y="21.9" class="st1" width="27.6" height="24.8"/>
+	<path class="st2" d="M49.1,46.7h-11l2.5-2.8h5.8v-6.9l2.8-3.3V46.7z M21.5,38.5l2.8-0.8v-13h16.5l2.8-2.8H21.5V38.5z"/>
+	<path class="st3" d="M49.1,29.6c-2.7,3.4-5.2,6.6-6.6,8.1c-2.2,2.2-6.2,5.5-7.8,6.8c-0.4,0.3-1,0.3-1.4-0.1l-1.7-1.7
+		c-0.4-0.4-0.4-1-0.1-1.4c1.4-1.7,4.7-5.7,6.8-7.8c1.8-1.8,7-5.2,10.8-8.1"/>
+	<path class="st3" d="M33.1,46.7c0-0.1-0.1-0.3-0.1-0.4c-0.1-0.3-0.2-0.5-0.4-0.7l-1.2-1.2c-0.3-0.3-2.8,2.3-3.2,2.3"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="9.9087" y1="22.1663" x2="19.3678" y2="46.5186">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st4" d="M18.8,21.9h-8.3v24.8h8.3V21.9z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="25.8762" y1="4.9357" x2="33.7281" y2="25.1501">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st5" d="M49.1,10.9H10.5v8.3h38.6V10.9z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.646" y1="42.1698" x2="56.8466" y2="19.3441">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<path class="st6" d="M33.3,43l-1.7-1.7c-0.4-0.4-0.4-1-0.1-1.4c1.4-1.7,4.7-5.7,6.8-7.8C41.1,29.4,53,20.3,53,20.3
+		c0.3-0.3,0.8-0.3,1.4,0c0.3,0.3,0.3,0.8,0,1.4c0,0-9.1,11.9-11.9,14.6c-2.2,2.2-6.2,5.5-7.8,6.8C34.3,43.5,33.6,43.4,33.3,43z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="30.4358" y1="45.5606" x2="17.3052" y2="56.5797">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st7" d="M31.2,44.3L30,43.1c-0.3-0.3-0.7-0.5-1.2-0.5c-1.4,0.1-4.6,0.8-5.9,5.8C21.8,52.3,16,55,16,55s5.2,0,7.2,0
+		s5.8-1.1,7.7-5c1.2-2.5,0.9-4.3,0.7-5.1C31.5,44.7,31.4,44.5,31.2,44.3z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SlateWidgetStyleAsset_16.svg b/Content/Slate/Starship/AssetIcons/SlateWidgetStyleAsset_16.svg
new file mode 100644
index 0000000..741db00
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SlateWidgetStyleAsset_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4 10L5 9.7V5H11L12 4H4V10Z" fill="white"/>
+<path opacity="0.5" d="M14 8.30078L13 9.50078V12.0008H10.9L10 13.0008H14V8.30078Z" fill="white"/>
+<path d="M14 0H0V3H14V0Z" fill="white"/>
+<path d="M3 4H0V13H3V4Z" fill="white"/>
+<path opacity="0.5" d="M8.50039 11.8992L7.40039 10.7992C7.40039 10.7992 9.10039 8.69922 10.1004 7.69922C11.1004 6.69922 15.4004 3.39922 15.4004 3.39922C15.5004 3.29922 15.7004 3.29922 15.9004 3.39922C16.0004 3.49922 16.0004 3.69922 15.9004 3.89922C15.9004 3.89922 12.6004 8.19922 11.6004 9.19922C10.6004 10.1992 8.50039 11.8992 8.50039 11.8992Z" fill="white"/>
+<path d="M7.6 12.1993L6.9 11.4993C6.9 11.4993 5.1 11.1993 4.5 13.5993C4.1 14.9993 2 15.9993 2 15.9993C2 15.9993 3.9 15.9993 4.6 15.9993C5.3 15.9993 6.7 15.5993 7.4 14.1993C8 12.9993 7.6 12.1993 7.6 12.1993Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundAttenuation_16.svg b/Content/Slate/Starship/AssetIcons/SoundAttenuation_16.svg
new file mode 100644
index 0000000..388c353
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundAttenuation_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 13L2 11V6L10 14H5L3 16L0 13Z" fill="white"/>
+<path opacity="0.5" d="M15 7L14.47 6.92C14.28 5.73 13.64 4.46 12.59 3.41C11.54 2.36 10.27 1.72 9.08 1.53L9 1C10.33 1.21 11.73 1.92 12.9 3.1C14.07 4.28 14.79 5.67 15 7Z" fill="white"/>
+<path opacity="0.5" d="M16 4L15.65 3.94C15.52 3.14 15.1 2.3 14.4 1.6C13.7 0.9 12.86 0.47 12.06 0.35L12 0C12.88 0.14 13.82 0.62 14.6 1.4C15.38 2.18 15.86 3.12 16 4Z" fill="white"/>
+<path opacity="0.5" d="M13.6301 9.66914L12.9901 9.56914C12.7601 8.11914 11.9801 6.57914 10.7001 5.29914C9.42008 4.01914 7.88008 3.23914 6.43008 3.00914L6.33008 2.36914C7.94008 2.62914 9.66008 3.49914 11.0801 4.91914C12.5001 6.33914 13.3801 8.05914 13.6301 9.66914Z" fill="white"/>
+<path opacity="0.5" d="M12.1299 12.8691L11.3399 12.7491C11.0599 10.9591 10.0899 9.05914 8.51988 7.48914C6.94988 5.91914 5.03988 4.93914 3.24988 4.65914L3.12988 3.86914C5.11988 4.17914 7.22988 5.25914 8.98988 7.00914C10.7499 8.75914 11.8199 10.8791 12.1299 12.8691Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundAttenuation_64.svg b/Content/Slate/Starship/AssetIcons/SoundAttenuation_64.svg
new file mode 100644
index 0000000..83df2f3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundAttenuation_64.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundAttenuation_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:#999999;enable-background:new    ;}
+	.st5{fill:#666666;enable-background:new    ;}
+	.st6{fill:#CCCCCC;enable-background:new    ;}
+	.st7{fill:#FFFFFF;enable-background:new    ;}
+	.st8{fill:none;}
+</style>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="27.2275" y1="37.3741" x2="49.988" y2="15.3755" gradientTransform="matrix(1.0501 -5.006482e-02 -5.006482e-02 1.0501 -1.0289 1.0289)">
+		<stop  offset="0" style="stop-color:#999999;stop-opacity:0.5"/>
+		<stop  offset="1" style="stop-color:#999999;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st0" points="55.9,19.1 37.7,49.3 14.9,27.4 45.3,8.5 	"/>
+	<g>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="14.0104" y1="16.2944" x2="14.0379" y2="32.3512" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -11.9931 42.026)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M24.1,51.7l-1.9,1.9c-2.6,2.6-6.9,2.6-9.5,0l-1.8-1.8c-2.6-2.6-2.6-6.9,0-9.5l1.9-1.9L24.1,51.7z"/>
+		
+			<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="24.6525" y1="7.9845" x2="24.5328" y2="40.3288" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -11.9931 42.026)">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M36.8,50.1l-12.7,1.5L12.8,40.3l1.5-12.7c0.1-0.9,1.2-1.3,1.8-0.6l21.3,21.3C38,49,37.6,50,36.8,50.1z"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="15.0735" y1="24.3171" x2="18.7039" y2="24.3171" gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -11.9931 42.026)">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<polygon class="st3" points="21.5,54.2 24.1,51.7 12.8,40.3 10.2,42.9 		"/>
+	</g>
+	<g>
+		<path class="st4" d="M53.3,27.1L52.5,27c-0.4-0.1-0.7-0.4-0.8-0.7c-0.6-3-2.3-6.1-4.9-8.7s-5.7-4.3-8.7-4.9
+			c-0.4-0.1-0.7-0.4-0.7-0.8l-0.1-0.8c3.5,0.6,7.3,2.4,10.4,5.6C50.8,19.9,52.7,23.5,53.3,27.1z"/>
+		<path class="st5" d="M55.9,19.1L55,19c-0.3-2.1-1.5-4.4-3.3-6.2c-1.9-1.9-4.1-3-6.2-3.3l-0.2-0.9c2.3,0.4,4.8,1.6,6.9,3.7
+			C54.3,14.3,55.6,16.8,55.9,19.1z"/>
+		<path class="st6" d="M49.6,34.2L48.6,34c-0.4-0.1-0.7-0.4-0.8-0.7c-0.7-3.7-2.8-7.5-6-10.7c-3.2-3.2-7-5.2-10.7-6
+			c-0.4-0.1-0.7-0.4-0.7-0.8l-0.2-1.1c4.3,0.7,8.8,3,12.6,6.8C46.6,25.3,49,29.9,49.6,34.2z"/>
+		<path class="st7" d="M45.7,42.7l-1.1-0.2c-0.6-0.1-1.1-0.6-1.2-1.1c-0.9-4.5-3.4-9.1-7.3-13c-3.9-3.9-8.5-6.4-13-7.3
+			c-0.6-0.1-1-0.6-1.1-1.2l-0.2-1.1c5.3,0.8,10.9,3.7,15.6,8.3C42,31.8,44.8,37.4,45.7,42.7z"/>
+	</g>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundClass_16.svg b/Content/Slate/Starship/AssetIcons/SoundClass_16.svg
new file mode 100644
index 0000000..ac89210
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundClass_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4 14H0V16H4V14Z" fill="white"/>
+<path opacity="0.5" d="M10 14H6V16H10V14Z" fill="white"/>
+<path opacity="0.5" d="M16 14H12V16H16V14Z" fill="white"/>
+<path opacity="0.5" d="M9 11H8H2V12V14H3V12H8V14H9V12H14V14H15V12V11H9Z" fill="white"/>
+<path d="M2 3H5L8 0V10L5 7H2V3Z" fill="white"/>
+<path opacity="0.5" d="M10 0C12.8 1.2 14.2 3.1 14.2 5C14.2 6.9 12.8 8.8 10 10C11.8 8.4 12.6 6.7 12.6 5C12.6 3.3 11.8 1.6 10 0Z" fill="white"/>
+<path opacity="0.5" d="M10 2.90039C10.9 3.40039 11.4 4.20039 11.4 5.00039C11.4 5.80039 10.9 6.60039 10 7.10039C10.6 6.40039 10.6 3.60039 10 2.90039Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundClass_64.svg b/Content/Slate/Starship/AssetIcons/SoundClass_64.svg
new file mode 100644
index 0000000..c93f55b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundClass_64.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundClass_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#7F7F7F;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:url(#SVGID_8_);}
+	.st9{fill:url(#SVGID_9_);}
+	.st10{fill:#7F7F7F;enable-background:new    ;}
+	.st11{fill:#BFBFBF;enable-background:new    ;}
+	.st12{fill:none;}
+</style>
+<g>
+	<g>
+		<rect x="11.3" y="36.6" class="st0" width="42.2" height="3.1"/>
+		
+			<rect x="44.1" y="43.5" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 97.0221 -6.9103)" class="st0" width="15.7" height="3.1"/>
+		
+			<rect x="24.5" y="43.5" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 77.4497 12.6621)" class="st0" width="15.7" height="3.1"/>
+		
+			<rect x="5" y="43.5" transform="matrix(-1.836970e-16 1 -1 -1.836970e-16 57.8772 32.2346)" class="st0" width="15.7" height="3.1"/>
+	</g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.8213" y1="48.7194" x2="12.8213" y2="41.9857">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="0.5736" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st1" points="11.3,48.7 11.3,42 14.4,42 14.4,48.7 	"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.3938" y1="48.7194" x2="32.3938" y2="41.9857">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="0.5736" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st2" points="30.9,48.7 30.9,42 33.9,42 33.9,48.7 	"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="12.8213" y1="57.0061" x2="12.8213" y2="48.283">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st3" d="M19,48.3H6.7c-0.8,0-1.5,0.7-1.5,1.5v5.8c0,0.8,0.7,1.5,1.5,1.5H19c0.8,0,1.5-0.7,1.5-1.5v-5.8
+		C20.4,48.9,19.8,48.3,19,48.3z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="51.9662" y1="48.7194" x2="51.9662" y2="41.9857">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="0.5736" style="stop-color:#808080"/>
+	</linearGradient>
+	<polygon class="st4" points="50.4,48.7 50.4,42 53.5,42 53.5,48.7 	"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="32.3938" y1="57.0061" x2="32.3938" y2="48.283">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st5" d="M38.6,48.3H26.2c-0.8,0-1.5,0.7-1.5,1.5v5.8c0,0.8,0.7,1.5,1.5,1.5h12.3c0.8,0,1.5-0.7,1.5-1.5v-5.8
+		C40,48.9,39.4,48.3,38.6,48.3z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="51.9662" y1="57.0061" x2="51.9662" y2="48.283">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st6" d="M58.1,48.3H45.8c-0.8,0-1.5,0.7-1.5,1.5v5.8c0,0.8,0.7,1.5,1.5,1.5h12.3c0.8,0,1.5-0.7,1.5-1.5v-5.8
+		C59.6,48.9,58.9,48.3,58.1,48.3z"/>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="39.0279" y1="17.1546" x2="39.0508" y2="30.4917" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st7" d="M26.6,26.3h-2.7c-2.8,0-5-2.3-5-5V18c0-2.8,2.3-5,5-5h2.7V26.3z"/>
+			
+				<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="47.8674" y1="10.2536" x2="47.7679" y2="37.1175" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+				<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st8" d="M34.9,32.9l-8.3-6.5V13l8.3-6.5c0.6-0.5,1.4,0,1.4,0.7v25C36.4,32.9,35.5,33.3,34.9,32.9z"/>
+			
+				<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="39.9114" y1="23.8188" x2="42.9267" y2="23.8188" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+				<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+			</linearGradient>
+			<rect x="23.6" y="13" class="st9" width="3" height="13.3"/>
+		</g>
+		<g>
+			<path class="st10" d="M39.2,8c4.4,2.8,6.7,7.3,6.7,11.6c0,4.4-2.3,8.9-6.7,11.6c2.8-3.7,4.1-7.6,4.1-11.6S42,11.7,39.2,8z"/>
+			<path class="st11" d="M37.9,13.7c1.8,1.4,2.7,3.7,2.7,6s-0.9,4.5-2.7,6C39,23.7,39,15.6,37.9,13.7z"/>
+		</g>
+	</g>
+	<rect x="0" class="st12" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundConcurrency_16.svg b/Content/Slate/Starship/AssetIcons/SoundConcurrency_16.svg
new file mode 100644
index 0000000..1369929
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundConcurrency_16.svg
@@ -0,0 +1,14 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 2H2L4 0V7L2 5H0V2Z" fill="white"/>
+<path d="M14 0V2L16 4H9L11 2V0H14Z" fill="white"/>
+<path d="M16 14H14L12 16V9L14 11H16V14Z" fill="white"/>
+<path d="M2 16V14L0 12H7L5 14V16H2Z" fill="white"/>
+<path opacity="0.5" d="M5 0C6.98 0.83 7.99 2.19 8 3.5C8 4.81 6.98 6.17 5 7C6.24 5.88 6.84 4.7 6.84 3.5C6.84 2.3 6.24 1.11 5 0Z" fill="white"/>
+<path opacity="0.5" d="M5 2C5.66 2.36 6 2.94 6 3.5C6 4.06 5.66 4.64 5 5C5.41 4.52 5.41 2.48 5 2Z" fill="white"/>
+<path opacity="0.5" d="M16 5C15.17 6.98 13.81 7.99 12.5 8C11.19 8 9.83 6.98 9 5C10.12 6.24 11.3 6.84 12.5 6.84C13.7 6.84 14.89 6.24 16 5Z" fill="white"/>
+<path opacity="0.5" d="M14 5C13.64 5.66 13.06 6 12.5 6C11.94 6 11.36 5.66 11 5C11.48 5.41 13.52 5.41 14 5Z" fill="white"/>
+<path opacity="0.5" d="M11 16C9.02 15.17 8.01 13.81 8 12.5C8 11.19 9.02 9.83 11 9C9.76 10.12 9.16 11.3 9.16 12.5C9.16 13.7 9.76 14.89 11 16Z" fill="white"/>
+<path opacity="0.5" d="M11 14C10.34 13.64 10 13.06 10 12.5C10 11.94 10.34 11.36 11 11C10.59 11.48 10.59 13.52 11 14Z" fill="white"/>
+<path opacity="0.5" d="M0 11C0.83 9.02 2.19 8.01 3.5 8C4.81 8 6.17 9.02 7 11C5.88 9.76 4.7 9.16 3.5 9.16C2.3 9.16 1.11 9.76 0 11Z" fill="white"/>
+<path opacity="0.5" d="M2 11C2.36 10.34 2.94 10 3.5 10C4.06 10 4.64 10.34 5 11C4.52 10.59 2.48 10.59 2 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundConcurrency_64.svg b/Content/Slate/Starship/AssetIcons/SoundConcurrency_64.svg
new file mode 100644
index 0000000..e7f2bc3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundConcurrency_64.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundConcurrency_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:#7F7F7F;enable-background:new    ;}
+	.st4{fill:#BFBFBF;enable-background:new    ;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill:url(#SVGID_8_);}
+	.st10{fill:url(#SVGID_9_);}
+	.st11{fill:url(#SVGID_10_);}
+	.st12{fill:url(#SVGID_11_);}
+	.st13{fill:url(#SVGID_12_);}
+	.st14{fill:none;}
+</style>
+<g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="34.5075" y1="31.2375" x2="34.5247" y2="41.3222" gradientTransform="matrix(0 1 -1 0 82.0665 -23.6197)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st0" d="M40.7,13.8V13c0-2.8,2.3-5,5-5h0c2.8,0,5,2.3,5,5v0.8H40.7z"/>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="41.2036" y1="26.0282" x2="41.1284" y2="46.3453" gradientTransform="matrix(0 1 -1 0 82.0665 -23.6197)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+				<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st1" d="M35.8,20.1l4.9-6.3h10.1l4.9,6.3c0.3,0.4,0,1.1-0.5,1.1H36.3C35.8,21.2,35.4,20.6,35.8,20.1z"/>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="35.1865" y1="36.2876" x2="37.467" y2="36.2876" gradientTransform="matrix(0 1 -1 0 82.0665 -23.6197)">
+				<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+				<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+			</linearGradient>
+			<polygon class="st2" points="40.7,11.6 40.7,13.8 50.8,13.8 50.8,11.6 			"/>
+		</g>
+		<g>
+			<path class="st3" d="M54.6,23.4c-2.1,3.4-5.5,5.1-8.8,5.1c-3.3,0-6.7-1.7-8.8-5.1c2.8,2.1,5.8,3.1,8.8,3.1
+				C48.8,26.5,51.8,25.5,54.6,23.4z"/>
+			<path class="st4" d="M50.3,22.4c-1.1,1.3-2.8,2-4.5,2c-1.7,0-3.4-0.7-4.5-2C42.7,23.2,48.9,23.2,50.3,22.4z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="58.7548" y1="14.8245" x2="58.7721" y2="24.9092" gradientTransform="matrix(-1 0 0 -1 111.8618 65.7718)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st5" d="M50.2,40.9H51c2.8,0,5,2.3,5,5v0c0,2.8-2.3,5-5,5h-0.8V40.9z"/>
+			
+				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="65.439" y1="9.6032" x2="65.3638" y2="29.9203" gradientTransform="matrix(-1 0 0 -1 111.8618 65.7718)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+				<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st6" d="M43.9,35.9l6.3,4.9V51l-6.3,4.9c-0.4,0.3-1.1,0-1.1-0.5V36.5C42.8,35.9,43.4,35.6,43.9,35.9z"/>
+			
+				<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="59.4219" y1="19.8625" x2="61.7024" y2="19.8625" gradientTransform="matrix(-1 0 0 -1 111.8618 65.7718)">
+				<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+				<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+			</linearGradient>
+			<polygon class="st7" points="52.4,40.9 50.2,40.9 50.2,51 52.4,51 			"/>
+		</g>
+		<g>
+			<path class="st3" d="M40.6,54.7c-3.4-2.1-5.1-5.5-5.1-8.8c0-3.3,1.7-6.7,5.1-8.8c-2.1,2.8-3.1,5.8-3.1,8.8S38.5,51.9,40.6,54.7z"
+				/>
+			<path class="st4" d="M41.6,50.4c-1.3-1.1-2-2.8-2-4.5s0.7-3.4,2-4.5C40.8,42.8,40.8,49,41.6,50.4z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="41.1285" y1="11.2757" x2="41.1458" y2="21.3604" gradientTransform="matrix(0 -1 1 0 3.144 94.2408)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st8" d="M24.5,50.2V51c0,2.8-2.3,5-5,5h0c-2.8,0-5-2.3-5-5v-0.8H24.5z"/>
+			
+				<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="47.8247" y1="6.0665" x2="47.7494" y2="26.3835" gradientTransform="matrix(0 -1 1 0 3.144 94.2408)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+				<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st9" d="M29.5,43.9l-4.9,6.3H14.4l-4.9-6.3c-0.3-0.4,0-1.1,0.5-1.1h18.9C29.5,42.8,29.8,43.4,29.5,43.9z"/>
+			
+				<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="41.8076" y1="16.3258" x2="44.088" y2="16.3258" gradientTransform="matrix(0 -1 1 0 3.144 94.2408)">
+				<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+				<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+			</linearGradient>
+			<polygon class="st10" points="24.5,52.4 24.5,50.2 14.4,50.2 14.4,52.4 			"/>
+		</g>
+		<g>
+			<path class="st3" d="M10.7,40.6c2.1-3.4,5.5-5.1,8.8-5.1c3.3,0,6.7,1.7,8.8,5.1c-2.8-2.1-5.8-3.1-8.8-3.1S13.5,38.5,10.7,40.6z"
+				/>
+			<path class="st4" d="M14.9,41.6c1.1-1.3,2.8-2,4.5-2s3.4,0.7,4.5,2C22.5,40.8,16.4,40.8,14.9,41.6z"/>
+		</g>
+	</g>
+	<g>
+		<g>
+			
+				<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="28.6037" y1="17.2035" x2="28.621" y2="27.2882" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st11" d="M15.2,23.1h-0.8c-2.8,0-5-2.3-5-5v0c0-2.8,2.3-5,5-5h0.8V23.1z"/>
+			
+				<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="35.2879" y1="11.9822" x2="35.2127" y2="32.2992" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#808080"/>
+				<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+				<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st12" d="M21.5,28.1l-6.3-4.9V13l6.3-4.9c0.4-0.3,1.1,0,1.1,0.5v18.9C22.6,28.1,22,28.4,21.5,28.1z"/>
+			
+				<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="29.2708" y1="22.2415" x2="31.5513" y2="22.2415" gradientTransform="matrix(1 0 0 1 -16.325 -4.1507)">
+				<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+				<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+			</linearGradient>
+			<rect x="12.9" y="13" class="st13" width="2.3" height="10.1"/>
+		</g>
+		<g>
+			<path class="st3" d="M24.8,9.3c3.4,2.1,5.1,5.5,5.1,8.8c0,3.3-1.7,6.7-5.1,8.8c2.1-2.8,3.1-5.8,3.1-8.8
+				C27.9,15.1,26.9,12.1,24.8,9.3z"/>
+			<path class="st4" d="M23.8,13.6c1.3,1.1,2,2.8,2,4.5s-0.7,3.4-2,4.5C24.6,21.2,24.6,15,23.8,13.6z"/>
+		</g>
+	</g>
+	<rect x="0" class="st14" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundCue_16.svg b/Content/Slate/Starship/AssetIcons/SoundCue_16.svg
new file mode 100644
index 0000000..fd434c7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundCue_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 6H2.5L6 2.5V14.5L2.5 11H0V6Z" fill="white"/>
+<path d="M5.3999 8.39961H7.3999L7.5999 8.59961L7.9999 7.39961L8.3999 10.5996L9.0999 4.19961L9.8999 12.8996L10.5999 3.09961L11.3999 13.5996L12.0999 4.59961L12.8999 11.3996L13.5999 5.39961L14.3999 10.5996L14.7999 7.59961L15.0999 8.39961H15.8999" stroke="white" stroke-width="0.375" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundCue_64.svg b/Content/Slate/Starship/AssetIcons/SoundCue_64.svg
new file mode 100644
index 0000000..5fad770
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundCue_64.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundCue_x5F_64_-_UPLOAD" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.0458" y1="24.4146" x2="12.0723" y2="39.8381">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M16.6,39.8h-2.3c-3.7,0-6.7-3-6.7-6.7v-2c0-3.7,3-6.7,6.7-6.7h2.3V39.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="22.2683" y1="16.4317" x2="22.1533" y2="47.5011">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M26.2,47.4l-9.6-7.6V24.4l9.6-7.6c0.7-0.5,1.7,0,1.7,0.8v28.9C27.8,47.4,26.9,47.9,26.2,47.4z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.0668" y1="32.1206" x2="16.5541" y2="32.1206">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.1" y="24.4" class="st3" width="3.5" height="15.4"/>
+	</g>
+	<g>
+		<path class="st4" d="M28.7,30.8l5.9-0.2l0,0l0.1,0l0.7,0.4l-0.3,0.1l1-2.3l0.3-0.8l0.2,0.8l1.3,6.1L37,35c0.3-2,0.6-4.1,1-6.1
+			l1.1-6.1l0.6-3.1l0.4,3.2l2.2,16.4l-1,0l2.2-18.6l0.5-4.4l0.5,4.4l2.2,20l-1,0l2.2-17.1l0.4-3.3l0.6,3.3L51,36.5l-1,0L52.2,25
+			l0.5-2.4l0.5,2.4c0.4,1.7,0.7,3.3,1,5l1,5l-0.5,0l1.2-5.7l0.1-0.3l0.2,0.2l1,1.5l-0.1,0l2.2,0.1l-2.2,0.1l0,0l0,0l-1.1-1.4
+			l0.2-0.1l-0.9,5.7l-0.2,1.3l-0.3-1.3l-1.2-5c-0.4-1.7-0.8-3.3-1.2-5l1,0L51,36.6l-0.5,2.7L50,36.6l-2.2-12.8l1,0l-2.2,17.1
+			l-0.5,4.2l-0.5-4.2l-2.2-20l1,0l-2.2,18.6l-0.5,4l-0.5-4L39.1,23l1,0L39,29.1c-0.3,2-0.7,4-1.2,6.1l-0.5,2.3L37,35.2L36.1,29
+			l0.5,0.1l-1.2,2.3l-0.1,0.2l-0.2-0.1L34.5,31l0.1,0L28.7,30.8z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundEffectSourcePresetChain_16.svg b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePresetChain_16.svg
new file mode 100644
index 0000000..d66e38e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePresetChain_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 7H2.5L5 5V12L2.5 10H0V7Z" fill="white"/>
+<path d="M8 7H10.5L13 5V12L10.5 10H8V7Z" fill="white"/>
+<path opacity="0.5" d="M14.9 8.1H16V1L0 4.8V12.1L16 16V8.6H15.3L14.2 12.4V6.8L13.6 8.8H13V8.2H13.3L14.7 3.2V8.8L14.9 8.1ZM8 8.6H7.3L6.2 12.4V6.8L5.6 8.8H5V8.2H5.3L6.7 3.2V8.8L6.9 8.1H8V8.6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundEffectSourcePresetChain_64.svg b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePresetChain_64.svg
new file mode 100644
index 0000000..8cba435
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePresetChain_64.svg
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundEffectSourcePresetChain_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:none;stroke:#3F3F3F;stroke-miterlimit:10;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.7684" y1="31.9507" x2="57.0764" y2="31.631">
+		<stop  offset="0" style="stop-color:#808080;stop-opacity:0"/>
+		<stop  offset="0.2487" style="stop-color:#666666"/>
+		<stop  offset="0.6904" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#999999;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st0" points="56.3,51.7 8.7,43.7 8.7,19.6 56.3,11.6 	"/>
+	<polyline class="st1" points="24,31.5 25.1,31.5 28,24.6 28.6,38 30.5,31.6 32.2,31.6 	"/>
+	<polyline class="st1" points="47.4,31.8 48.6,31.8 51.4,25 52,38.3 53.9,32 55.7,32 	"/>
+	<g>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.0632" y1="25.8844" x2="13.0829" y2="37.3979">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M16.4,37.4h-1c-3.2,0-5.8-2.6-5.8-5.8v0c0-3.2,2.6-5.8,5.8-5.8h1V37.4z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="20.6944" y1="19.9233" x2="20.6085" y2="43.119">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M23.6,43l-7.2-5.6V25.9l7.2-5.6c0.5-0.4,1.2,0,1.2,0.6v21.6C24.9,43.1,24.1,43.4,23.6,43z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="13.8248" y1="31.6362" x2="16.4283" y2="31.6362">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.8" y="25.9" class="st4" width="2.6" height="11.5"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="35.6" y1="25.8844" x2="35.6198" y2="37.3979">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st5" d="M39,37.4h-1c-3.2,0-5.8-2.6-5.8-5.8v0c0-3.2,2.6-5.8,5.8-5.8h1V37.4z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="43.2313" y1="19.9233" x2="43.1454" y2="43.119">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st6" d="M46.2,43L39,37.4V25.9l7.2-5.6c0.5-0.4,1.2,0,1.2,0.6v21.6C47.4,43.1,46.7,43.4,46.2,43z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="36.3616" y1="31.6362" x2="38.9652" y2="31.6362">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="36.4" y="25.9" class="st7" width="2.6" height="11.5"/>
+	</g>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundEffectSourcePreset_16.svg b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePreset_16.svg
new file mode 100644
index 0000000..92f5b68
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePreset_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M7 8.40078V5.00078L9.5 4.00078L8.9 9.00078L8.6 6.80078L8 8.50078V8.40078H7ZM9.7 3.90078L10.3 10.3008L10.8 4.00078H11.2L11.7 10.8008L12.2 5.30078H12.6L13.1 9.60078L13.8 4.50078L14.5 9.10078L14.8 7.20078L15.4 8.30078H16V1.30078L9.7 3.90078ZM15 8.60078L14.5 12.0008L13.8 7.40078L13.1 12.8008L12.4 7.20078L11.9 13.2008H11.5L11 6.50078L10.5 12.5008H10.1L9.5 6.80078L8.8 12.1008L8.4 8.60078L8.2 9.10078L7.8 8.80078H7V12.0008L16 15.6008V8.80078H15.2L15 8.60078Z" fill="white"/>
+<path d="M0 6H2.5L6 2.5V14.5L2.5 11H0V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundEffectSourcePreset_64.svg b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePreset_64.svg
new file mode 100644
index 0000000..de7d6a6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundEffectSourcePreset_64.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundEffectSourcePreset_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.0458" y1="24.4146" x2="12.0723" y2="39.8381">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M16.6,39.8h-2.3c-3.7,0-6.7-3-6.7-6.7v-2c0-3.7,3-6.7,6.7-6.7h2.3V39.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="22.2683" y1="16.4317" x2="22.1533" y2="47.5011">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M26.2,47.4l-9.6-7.6V24.4l9.6-7.6c0.7-0.5,1.7,0,1.7,0.8v28.9C27.8,47.4,26.9,47.9,26.2,47.4z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.0668" y1="32.1206" x2="16.5541" y2="32.1206">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.1" y="24.4" class="st3" width="3.5" height="15.4"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="28.5087" y1="32.2553" x2="58.1268" y2="32.0552">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="0.1827" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6904" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#999999;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st4" points="57.6,49.1 27.8,39.1 27.8,25 57.6,15 	"/>
+	<g>
+		<path d="M30.2,32l4.8-0.1l0,0l0,0l0.5,0.3l-0.2,0.1l0.9-1.9l0.3-0.6l0.1,0.6l1,5l-0.6,0c0.2-1.7,0.5-3.3,0.8-5l0.9-5l0.4-2.4
+			l0.3,2.4L41.3,39l-0.7,0l1.8-15.2l0.4-3.3l0.4,3.3l1.8,16.4l-0.7,0l1.8-14.1l0.3-2.5l0.4,2.5l1.8,10.5l-0.7,0l1.8-9.4l0.3-1.8
+			l0.4,1.8c0.3,1.4,0.6,2.7,0.8,4.1l0.8,4.1l-0.4,0l1-4.7l0-0.2l0.1,0.1l0.9,1.2l0,0l1.8,0l-1.8,0l0,0l0,0l-0.9-1.1l0.1,0l-0.8,4.7
+			l-0.2,1l-0.2-1l-1-4.1c-0.3-1.4-0.7-2.7-1-4.1l0.7,0l-1.8,9.4l-0.4,2l-0.3-2l-1.8-10.5l0.7,0l-1.8,14.1l-0.4,3.1l-0.3-3.2
+			l-1.8-16.4l0.7,0l-1.8,15.2L41,42l-0.4-3l-1.8-13.5l0.7,0l-0.9,5c-0.3,1.7-0.6,3.3-0.9,5l-0.4,1.8L37,35.6l-0.8-5.1l0.4,0.1
+			l-0.9,1.9l-0.1,0.2l-0.1-0.1L35,32.1l0.1,0L30.2,32z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundEffectSubmixPreset_64.svg b/Content/Slate/Starship/AssetIcons/SoundEffectSubmixPreset_64.svg
new file mode 100644
index 0000000..afff0b7
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundEffectSubmixPreset_64.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundEffectSubmixPreset_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill:url(#SVGID_8_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.6243" y1="38.5472" x2="12.6418" y2="48.7908">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M15.6,48.8h-1.1c-2.7,0-4.9-2.2-4.9-4.9v-0.4c0-2.7,2.2-4.9,4.9-4.9h1.1V48.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="19.4137" y1="33.2442" x2="19.3373" y2="53.8807">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M22,53.8l-6.4-5V38.5l6.4-5c0.4-0.4,1.1,0,1.1,0.5v19.2C23.1,53.8,22.5,54.2,22,53.8z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.302" y1="43.6648" x2="15.6183" y2="43.6648">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.3" y="38.5" class="st3" width="2.3" height="10.2"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.6243" y1="14.755" x2="12.6418" y2="24.9986">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M15.6,25h-1.1c-2.7,0-4.9-2.2-4.9-4.9v-0.4c0-2.7,2.2-4.9,4.9-4.9h1.1V25z"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="19.4137" y1="9.452" x2="19.3373" y2="30.0885">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st5" d="M22,30l-6.4-5V14.8l6.4-5c0.4-0.4,1.1,0,1.1,0.5v19.2C23.1,30,22.5,30.4,22,30z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="13.302" y1="19.8726" x2="15.6183" y2="19.8726">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.3" y="14.8" class="st6" width="2.3" height="10.2"/>
+	</g>
+	<path class="st7" d="M24.5,18.1"/>
+	<g>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="27.2431" y1="25.1748" x2="54.6001" y2="24.99">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.1827" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.6904" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#999999;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st8" d="M26.5,18.7c0.5,1,1,2.1,1.4,3.1l0.9,3.3l1.7,6.2h2.6l0.2,0.1l1.4-2.9l0.7,4l1.9-10.8L39.2,35l1.9-16.3L43,36
+			l1.8-13.8l2,11.6l1.8-9.4l1.9,8.6l0.7-3.5l1.5,1.9h1.6V14.1L26.5,18.7z"/>
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="23.7889" y1="34.2739" x2="54.5844" y2="34.0658">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.1827" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.6904" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#999999;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st9" d="M51.6,31.9l-1.2,6.2l-1.9-8.6l-1.9,10.1l-1.8-10.4l-2,15.6l-1.8-16.9l-1.8,15.5l-2-14.9l-1.8,10l-1.2-6.5
+			l-0.5,1l-0.9-0.6h-2.3l-2.1,6.1l-1.1,3.2c-0.5,1-1,2.1-1.6,3.1c0.2-1.2,0.4-2.3,0.6-3.4l1.1-3.2l2.2-6.3l-1.8-6.4L27,22.2
+			c-0.1-1.1-0.3-2.3-0.4-3.4l-3.4,0.6v25.1l31,5.2V32.4H52L51.6,31.9z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundEffectsSubmixPreset_16.svg b/Content/Slate/Starship/AssetIcons/SoundEffectsSubmixPreset_16.svg
new file mode 100644
index 0000000..f29041e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundEffectsSubmixPreset_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 2H2.5L5 0V7L2.5 5H0V2Z" fill="white"/>
+<path d="M0 11H2.5L5 9V16L2.5 14H0V11Z" fill="white"/>
+<path opacity="0.5" d="M8.1002 5.80039L8.4002 8.10039L9.1002 1.90039L6.2002 2.70039L7.5002 7.70039L8.1002 5.80039Z" fill="white"/>
+<path opacity="0.5" d="M9.9002 9.4L10.6002 2L11.4002 10L12.1002 3.5L12.9002 8.9L13.6002 3.1L14.4002 8.4L14.6002 6.4L15.3002 7.8H16.0002V0L9.2002 1.9L9.9002 9.4Z" fill="white"/>
+<path opacity="0.5" d="M7.1 7.9998L5.7 2.7998L5 2.9998V12.9998L5.7 13.1998L7.1 7.9998Z" fill="white"/>
+<path opacity="0.5" d="M15.0002 8.19961L14.9002 8.09961L14.4002 12.0996L13.6002 6.89961L12.9002 13.0996L12.2002 6.79961L11.4002 13.4996L10.6002 6.09961L9.8002 12.9996L9.1002 6.29961L8.4002 12.3996L7.9002 8.19961L7.7002 8.69961L7.5002 8.49961L6.2002 13.2996L16.0002 15.9996V8.19961H15.0002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundMix_16.svg b/Content/Slate/Starship/AssetIcons/SoundMix_16.svg
new file mode 100644
index 0000000..9a607ca
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundMix_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 6H3L6 3V13L3 10H0V6Z" fill="white"/>
+<path opacity="0.5" d="M9 15H10V8H9V15Z" fill="white"/>
+<path opacity="0.5" d="M9 5H10V1H9V5Z" fill="white"/>
+<path opacity="0.5" d="M13 15H14V12H13V15Z" fill="white"/>
+<path opacity="0.5" d="M13 9H14L14 1H13L13 9Z" fill="white"/>
+<path d="M11 5H8V7H11V5Z" fill="white"/>
+<path d="M15 9H12V11H15V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundMix_64.svg b/Content/Slate/Starship/AssetIcons/SoundMix_64.svg
new file mode 100644
index 0000000..ff53dff
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundMix_64.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundMix_x5F_64_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:url(#SVGID_8_);}
+	.st9{fill:url(#SVGID_9_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.0458" y1="24.4146" x2="12.0723" y2="39.8381">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M16.6,39.8h-2.3c-3.7,0-6.7-3-6.7-6.7v-2c0-3.7,3-6.7,6.7-6.7h2.3V39.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="22.2683" y1="16.4317" x2="22.1533" y2="47.5011">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M26.2,47.4l-9.6-7.6V24.4l9.6-7.6c0.7-0.5,1.7,0,1.7,0.8v28.9C27.8,47.4,26.9,47.9,26.2,47.4z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.0668" y1="32.1206" x2="16.5541" y2="32.1206">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.1" y="24.4" class="st3" width="3.5" height="15.4"/>
+	</g>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="38.0186" y1="52.021" x2="38.1449" y2="12.9894">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st4" d="M38.1,54.4L38.1,54.4c-0.9,0-1.6-0.7-1.6-1.6V11.5c0-0.9,0.7-1.6,1.6-1.6l0,0c0.9,0,1.6,0.7,1.6,1.6v41.2
+		C39.7,53.6,39,54.4,38.1,54.4z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="38.037" y1="52.689" x2="38.1272" y2="24.8416">
+		<stop  offset="0.7817" style="stop-color:#999999"/>
+		<stop  offset="0.8258" style="stop-color:#919191"/>
+		<stop  offset="0.8941" style="stop-color:#7B7B7B"/>
+		<stop  offset="0.9777" style="stop-color:#585858"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st5" d="M38.1,54.4L38.1,54.4c-0.9,0-1.6-0.7-1.6-1.6V24.3c0-0.9,0.7-1.6,1.6-1.6l0,0c0.9,0,1.6,0.7,1.6,1.6v28.4
+		C39.7,53.6,39,54.4,38.1,54.4z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="38.0758" y1="24.8492" x2="38.0899" y2="20.4958">
+		<stop  offset="0" style="stop-color:#E6E6E6"/>
+		<stop  offset="0.8832" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<path class="st6" d="M43.2,25.1H33c-0.4,0-0.8-0.3-0.8-0.8v-3.4c0-0.4,0.3-0.8,0.8-0.8h10.2c0.4,0,0.8,0.3,0.8,0.8v3.4
+		C43.9,24.8,43.6,25.1,43.2,25.1z"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="51.5796" y1="51.9004" x2="51.7059" y2="12.8688">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st7" d="M51.6,54.2L51.6,54.2c-0.9,0-1.6-0.7-1.6-1.6V11.4c0-0.9,0.7-1.6,1.6-1.6h0c0.9,0,1.6,0.7,1.6,1.6v41.2
+		C53.3,53.5,52.6,54.2,51.6,54.2z"/>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="51.6183" y1="53.3013" x2="51.6687" y2="37.7259">
+		<stop  offset="0.7107" style="stop-color:#999999"/>
+		<stop  offset="0.7691" style="stop-color:#919191"/>
+		<stop  offset="0.8596" style="stop-color:#7B7B7B"/>
+		<stop  offset="0.9704" style="stop-color:#585858"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st8" d="M51.6,54.2L51.6,54.2c-0.9,0-1.6-0.7-1.6-1.6V38.1c0-0.9,0.7-1.6,1.6-1.6h0c0.9,0,1.6,0.7,1.6,1.6v14.5
+		C53.3,53.5,52.6,54.2,51.6,54.2z"/>
+	<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="51.6368" y1="38.1268" x2="51.6509" y2="33.7733">
+		<stop  offset="5.076142e-03" style="stop-color:#E6E6E6"/>
+		<stop  offset="0.9086" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<path class="st9" d="M56.7,38.4H46.6c-0.4,0-0.8-0.3-0.8-0.8v-3.4c0-0.4,0.3-0.8,0.8-0.8h10.2c0.4,0,0.8,0.3,0.8,0.8v3.4
+		C57.5,38,57.2,38.4,56.7,38.4z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundSourceBus_16.svg b/Content/Slate/Starship/AssetIcons/SoundSourceBus_16.svg
new file mode 100644
index 0000000..bedb5ed
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundSourceBus_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 2H2.5L5 0V7L2.5 5H0V2Z" fill="white"/>
+<path d="M7 7H9.5L12 5V12L9.5 10H7V7Z" fill="white"/>
+<path d="M0 11H2.5L5 9V16L2.5 14H0V11Z" fill="white"/>
+<path d="M12.5 8.5L13.6 5L14.4 10.2L14.8 7.2L15.1 8H15.9" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M6 3L7 6" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M6 14L7 11" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundSourceBus_64.svg b/Content/Slate/Starship/AssetIcons/SoundSourceBus_64.svg
new file mode 100644
index 0000000..887e2df
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundSourceBus_64.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundSourceBus_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st8{fill:url(#SVGID_8_);}
+	.st9{fill:url(#SVGID_9_);}
+	.st10{fill:url(#SVGID_10_);}
+	.st11{fill:url(#SVGID_11_);}
+	.st12{fill:url(#SVGID_12_);}
+	.st13{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="53.7252" y1="31.2486" x2="40.4026" y2="31.4573">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<polyline class="st0" points="40.8,31.7 41.4,32.1 42.3,31.5 42.9,35.3 44,29.5 45.1,38.2 46.2,29.1 47.3,39 48.4,29.9 49.5,36 
+		50.6,30.1 51.7,35.1 52.4,31.4 52.6,31.7 53.9,31.7 53.9,31.1 52.9,31.1 52.1,30 51.7,32 50.6,27 49.5,32.6 48.4,25.8 47.3,33.8 
+		46.2,23.7 45.1,33.2 44.1,25.5 42.9,31.8 42.5,29.5 41.1,31.2 41,31.1 	"/>
+	<g>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="13.8293" y1="38.7785" x2="13.8468" y2="49.0221">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M16.8,49h-1.1c-2.7,0-4.9-2.2-4.9-4.9v-0.4c0-2.7,2.2-4.9,4.9-4.9h1.1V49z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="20.6187" y1="33.4755" x2="20.5423" y2="54.112">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M23.2,54l-6.4-5V38.8l6.4-5c0.4-0.4,1.1,0,1.1,0.5v19.2C24.3,54.1,23.7,54.4,23.2,54z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="14.507" y1="43.8961" x2="16.8233" y2="43.8961">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="14.5" y="38.8" class="st3" width="2.3" height="10.2"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="13.8293" y1="14.9863" x2="13.8468" y2="25.2299">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M16.8,25.2h-1.1c-2.7,0-4.9-2.2-4.9-4.9v-0.4c0-2.7,2.2-4.9,4.9-4.9h1.1V25.2z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="20.6187" y1="9.6833" x2="20.5423" y2="30.3198">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st5" d="M23.2,30.2l-6.4-5V15l6.4-5c0.4-0.4,1.1,0,1.1,0.5v19.2C24.3,30.3,23.7,30.6,23.2,30.2z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="14.507" y1="20.1039" x2="16.8233" y2="20.1039">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="14.5" y="15" class="st6" width="2.3" height="10.2"/>
+	</g>
+	<path class="st7" d="M24.7,18.3"/>
+	<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="32.1069" y1="24.2016" x2="25.2551" y2="24.309">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<polyline class="st8" points="25.4,20.1 32.2,29.7 32.2,26.8 25.4,18.8 	"/>
+	
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="32.1069" y1="22.5208" x2="25.2551" y2="22.6282" gradientTransform="matrix(1 0 0 -1 0 61.1757)">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<polyline class="st9" points="25.4,42.8 32.2,33.1 32.2,36 25.4,44.1 	"/>
+	<g>
+		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="30.9078" y1="26.2402" x2="30.9254" y2="36.4838">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st10" d="M33.9,36.5h-1.1c-2.7,0-4.9-2.2-4.9-4.9v-0.4c0-2.7,2.2-4.9,4.9-4.9h1.1V36.5z"/>
+		<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="37.6973" y1="20.9372" x2="37.6209" y2="41.5737">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st11" d="M40.3,41.5l-6.4-5V26.2l6.4-5c0.4-0.4,1.1,0,1.1,0.5V41C41.4,41.5,40.7,41.9,40.3,41.5z"/>
+		<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="31.5856" y1="31.3578" x2="33.9019" y2="31.3578">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="31.6" y="26.2" class="st12" width="2.3" height="10.2"/>
+	</g>
+	<rect x="0" class="st13" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundSubmix_16.svg b/Content/Slate/Starship/AssetIcons/SoundSubmix_16.svg
new file mode 100644
index 0000000..6cf5799
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundSubmix_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 2H2.5L5 0V7L2.5 5H0V2Z" fill="white"/>
+<path d="M0 11H2.5L5 9V16L2.5 14H0V11Z" fill="white"/>
+<path d="M6 13.0008L7.4 8.00078L7.6 8.20078L8 7.00078L8.4 10.2008L9.1 3.90078L9.9 12.5008L10.6 2.80078L11.4 13.2008L12.1 4.20078L12.9 11.0008L13.6 5.00078L14.4 10.2008L14.8 7.20078L15.1 8.00078H15.9" stroke="white" stroke-width="0.375" stroke-miterlimit="10"/>
+<path d="M6 3L7.4 8" stroke="white" stroke-width="0.375" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SoundSubmix_64.svg b/Content/Slate/Starship/AssetIcons/SoundSubmix_64.svg
new file mode 100644
index 0000000..743174d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SoundSubmix_64.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SoundSubmix_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:none;stroke:#000000;stroke-miterlimit:10;}
+	.st8{fill:url(#SVGID_7_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.6243" y1="38.5472" x2="12.6418" y2="48.7908">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M15.6,48.8h-1.1c-2.7,0-4.9-2.2-4.9-4.9v-0.4c0-2.7,2.2-4.9,4.9-4.9h1.1V48.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="19.4137" y1="33.2442" x2="19.3373" y2="53.8807">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M22,53.8l-6.4-5V38.5l6.4-5c0.4-0.4,1.1,0,1.1,0.5v19.2C23.1,53.8,22.5,54.2,22,53.8z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="13.302" y1="43.6648" x2="15.6183" y2="43.6648">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.3" y="38.5" class="st3" width="2.3" height="10.2"/>
+	</g>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="12.6243" y1="14.755" x2="12.6418" y2="24.9986">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.508" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M15.6,25h-1.1c-2.7,0-4.9-2.2-4.9-4.9v-0.4c0-2.7,2.2-4.9,4.9-4.9h1.1V25z"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="19.4137" y1="9.452" x2="19.3373" y2="30.0885">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="0.5053" style="stop-color:#D7D8D9"/>
+			<stop  offset="0.5421" style="stop-color:#D9D9D9"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st5" d="M22,30l-6.4-5V14.8l6.4-5c0.4-0.4,1.1,0,1.1,0.5v19.2C23.1,30,22.5,30.4,22,30z"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="13.302" y1="19.8726" x2="15.6183" y2="19.8726">
+			<stop  offset="0" style="stop-color:#4D4D4D;stop-opacity:0"/>
+			<stop  offset="0.9893" style="stop-color:#4D4D4D;stop-opacity:0.5"/>
+		</linearGradient>
+		<rect x="13.3" y="14.8" class="st6" width="2.3" height="10.2"/>
+	</g>
+	<path class="st7" d="M23.5,18.1"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="53.8474" y1="31.479" x2="23.5461" y2="31.9537">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#F2F2F2"/>
+	</linearGradient>
+	<path class="st8" d="M52.5,31.3l-1.5-1.9l-0.7,3.5l-1.9-8.6l-1.8,9.4l-2-11.6L43,36l-1.9-17.3L39.2,35l-1.8-13.2l-1.9,10.8l-0.7-4
+		l-2.4,2.9l-0.2-0.1h-2.6l-1.7-6.2L27,21.9c-0.5-1-0.9-2.1-1.4-3.1c0.1,1.2,0.3,2.3,0.4,3.4l0.9,3.3l1.8,6.4l-2.2,6.3l-1.1,3.2
+		c-0.2,1.1-0.5,2.3-0.6,3.4c0.6-1,1.1-2,1.6-3.1l1.1-3.2l2.1-6.1h2.3l0.9,0.6l1.5-1l1.2,6.5l1.8-10l2,14.9l1.8-15.5l1.8,16.9l2-15.6
+		l1.8,10.4l1.9-10.1l1.9,8.6l1.2-6.2l0.4,0.5h2.1v-1H52.5z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SphereCollision_16.svg b/Content/Slate/Starship/AssetIcons/SphereCollision_16.svg
new file mode 100644
index 0000000..e640f8a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SphereCollision_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.5 8.5C6.70914 8.5 8.5 6.70914 8.5 4.5C8.5 2.29086 6.70914 0.5 4.5 0.5C2.29086 0.5 0.5 2.29086 0.5 4.5C0.5 6.70914 2.29086 8.5 4.5 8.5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15.8 6L11.7 5.2L14.5 0.199997L9.4 3.8C9.4 4 9.5 4.3 9.5 4.5C9.5 7.3 7.3 9.5 4.5 9.5C4 9.5 3.6 9.4 3.1 9.3L0 14L5.6 11.8L8 16L9.5 10.5L15.2 11.5L11.2 7.9L15.8 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SphereReflectionCapture_16.svg b/Content/Slate/Starship/AssetIcons/SphereReflectionCapture_16.svg
new file mode 100644
index 0000000..e81c91c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SphereReflectionCapture_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.9999 2.90039C10.7999 2.90039 13.0999 5.20037 13.0999 8.00037C13.0999 10.8004 10.7999 13.1003 7.9999 13.1003C5.1999 13.1003 2.8999 10.8004 2.8999 8.00037C2.8999 5.20037 5.1999 2.90039 7.9999 2.90039ZM7.9999 1.90039C4.5999 1.90039 1.8999 4.60037 1.8999 8.00037C1.8999 11.4004 4.5999 14.1003 7.9999 14.1003C11.3999 14.1003 14.0999 11.4004 14.0999 8.00037C14.0999 4.60037 11.3999 1.90039 7.9999 1.90039Z" fill="white"/>
+<path opacity="0.5" d="M9.4 9.90027C7.6 9.90027 6.1 8.40022 6.1 6.60022C6.1 5.70022 6.5 4.8002 7.1 4.2002C5.6 4.7002 4.5 6.1002 4.5 7.7002C4.5 9.8002 6.2 11.4003 8.2 11.4003C9.9 11.4003 11.3 10.3002 11.8 8.7002C11.2 9.5002 10.3 9.90027 9.4 9.90027Z" fill="white"/>
+<path d="M9.8001 7.90002C10.739 7.90002 11.5001 7.13884 11.5001 6.19995C11.5001 5.26107 10.739 4.5 9.8001 4.5C8.86121 4.5 8.1001 5.26107 8.1001 6.19995C8.1001 7.13884 8.86121 7.90002 9.8001 7.90002Z" fill="white"/>
+<path opacity="0.5" d="M1 4H0V0H4V1H1V4ZM15 1V4H16V0H12V1H15ZM15 15H12V16H16V12H15V15ZM1 15V12H0V16H4V15H1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SphereReflectionCapture_64.svg b/Content/Slate/Starship/AssetIcons/SphereReflectionCapture_64.svg
new file mode 100644
index 0000000..9a0102e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SphereReflectionCapture_64.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SphereReflectionCapture_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="51.7924" y1="15.5285" x2="0.9127" y2="58.6552">
+		<stop  offset="0.4569" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<path class="st0" d="M32.2,10.5c11.9,0,21.6,9.8,21.6,21.6s-9.8,21.6-21.6,21.6c-11.9,0-21.6-9.8-21.6-21.6S20.3,10.5,32.2,10.5z
+		 M32.2,6.2C17.8,6.2,6.3,17.7,6.3,32.1S17.8,58,32.2,58c14.4,0,25.9-11.5,25.9-25.9S46.6,6.2,32.2,6.2z"/>
+	<radialGradient id="SVGID_2_" cx="39.081" cy="22.4403" r="20.1462" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</radialGradient>
+	<circle class="st1" cx="32.2" cy="32.1" r="22.7"/>
+	<radialGradient id="SVGID_3_" cx="36.948" cy="22.9535" r="30.7001" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st2" d="M32,53.7c11.9,0,21.6-9.7,21.6-21.6S43.9,10.5,32,10.5s-21.6,9.7-21.6,21.6S20.1,53.7,32,53.7z"/>
+	<radialGradient id="SVGID_4_" cx="39.9291" cy="24.3628" r="7.2137" gradientUnits="userSpaceOnUse">
+		<stop  offset="0.4569" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#F2F2F2;stop-opacity:0"/>
+	</radialGradient>
+	<path class="st3" d="M39.9,31.6c4,0,7.2-3.2,7.2-7.2c0-4-3.2-7.2-7.2-7.2s-7.2,3.2-7.2,7.2C32.7,28.3,35.9,31.6,39.9,31.6z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Spline_16.svg b/Content/Slate/Starship/AssetIcons/Spline_16.svg
new file mode 100644
index 0000000..9d6a84d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Spline_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="13" width="3" height="3" fill="white"/>
+<rect x="11" y="10" width="3" height="3" fill="white"/>
+<rect x="2" y="3" width="3" height="3" fill="white"/>
+<rect y="13" width="3" height="3" fill="white"/>
+<path opacity="0.5" d="M14.5 1.5H6.5C2 1.5 2.49992 8 6.5 8H9.00003C13.5001 8 14.0001 14.5 9.00003 14.5H1.5" stroke="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SpotLight_16.svg b/Content/Slate/Starship/AssetIcons/SpotLight_16.svg
new file mode 100644
index 0000000..61209d4
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SpotLight_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3.8 10L10 3.80005L4.2 0L0 4.19995L3.8 10Z" fill="white"/>
+<path d="M7 10.5H6V16H7V10.5Z" fill="white"/>
+<path d="M15.9502 7.0498V6.0498L10.4502 6.0498V7.0498L15.9502 7.0498Z" fill="white"/>
+<path d="M13 13.9L8 8.90002L8.9 8L13.9 13L15.7 11.2L16 16L11.2 15.7L13 13.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SpotLight_64.svg b/Content/Slate/Starship/AssetIcons/SpotLight_64.svg
new file mode 100644
index 0000000..8d4ca60
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SpotLight_64.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#BFBFBF;}
+</style>
+<g id="SpotLight_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="28.9035" y1="218.3604" x2="11.5508" y2="201.1098" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M20.8,35.8l15.5-15.5c0.7-0.7,0.6-2-0.3-2.6L21.7,8.4C21,8,20.1,8.1,19.6,8.6L9.1,19.1
+			c-0.6,0.6-0.6,1.4-0.2,2.1l9.4,14.3C18.8,36.4,20.1,36.5,20.8,35.8z"/>
+		<path class="st2" d="M46.3,48.5L32.1,34.3c-0.2-0.2-0.2-0.4,0-0.6l2.1-2.1c0.2-0.2,0.4-0.2,0.6,0L49,45.8c0.2,0.2,0.4,0.2,0.6,0
+			l4.4-4.4c0.3-0.3,0.7-0.1,0.7,0.3l0.8,12.8c0,0.3-0.2,0.5-0.4,0.4l-12.8-0.8c-0.4,0-0.5-0.5-0.3-0.7l4.4-4.4
+			C46.4,48.9,46.4,48.7,46.3,48.5z"/>
+		<path class="st3" d="M38.7,18.8h15.9c0.5,0,0.7,0.6,0.4,0.9l-5,5c-0.1,0.1-0.2,0.2-0.4,0.2H38.7c-0.3,0-0.5-0.2-0.5-0.5v-5
+			C38.1,19,38.4,18.8,38.7,18.8z"/>
+		<path class="st3" d="M19.2,38.1V54c0,0.5,0.6,0.7,0.9,0.4l5-5c0.1-0.1,0.2-0.2,0.2-0.4V38.1c0-0.3-0.2-0.5-0.5-0.5h-5
+			C19.4,37.6,19.2,37.8,19.2,38.1z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SpringArmComponent_16.svg b/Content/Slate/Starship/AssetIcons/SpringArmComponent_16.svg
new file mode 100644
index 0000000..ee655c2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SpringArmComponent_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.0999 9.40005C7.8999 9.70005 8.4999 9.70005 8.7999 9.40005C9.0999 8.90005 8.4999 8.00005 7.3999 7.30005C6.2999 6.60005 5.2999 6.40005 4.8999 6.80005C4.8999 6.80005 4.8999 6.80005 4.8999 6.90005C4.8999 6.70005 4.8999 6.60005 4.9999 6.40005C5.3999 5.80005 6.8999 6.10005 8.1999 7.00005C9.4999 7.90005 10.3999 9.20005 9.8999 9.80005C9.5999 10.3 8.3999 10.1 7.0999 9.40005Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5002 7.40005C9.3002 7.70005 9.9002 7.70005 10.2002 7.40005C10.4002 6.90005 9.8002 6.00005 8.8002 5.30005C7.8002 4.60005 6.6002 4.40005 6.2002 4.80005C6.2002 4.80005 6.2002 4.80005 6.2002 4.90005C6.2002 4.70005 6.2002 4.60005 6.3002 4.40005C6.7002 3.80005 8.2002 4.10005 9.5002 5.00005C10.8002 5.90005 11.7002 7.20005 11.2002 7.80005C10.9002 8.30005 9.7002 8.10005 8.5002 7.40005Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.79961 5.40005C10.5996 5.70005 11.1996 5.70005 11.4996 5.40005C11.7996 4.90005 11.1996 4.00005 10.0996 3.20005C8.99961 2.40005 7.89961 2.30005 7.59961 2.80005C7.59961 2.80005 7.59961 2.80005 7.59961 2.90005C7.59961 2.70005 7.59961 2.60005 7.69961 2.40005C7.99961 1.80005 9.49961 2.10005 10.7996 3.00005C12.0996 3.90005 12.9996 5.20005 12.4996 5.80005C12.1996 6.30005 10.9996 6.10005 9.79961 5.40005Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0999 3.4C11.8999 3.7 12.4999 3.7 12.7999 3.4C12.9999 2.9 12.3999 2 11.3999 1.2C10.3999 0.4 9.1999 0.3 8.8999 0.8C8.8999 0.8 8.8999 0.8 8.8999 0.9C8.8999 0.7 8.8999 0.6 8.9999 0.4C9.3999 -0.2 10.7999 0 12.1999 1C13.5999 2 14.3999 3.2 13.8999 3.8C13.4999 4.3 12.2999 4.1 11.0999 3.4Z" fill="white"/>
+<path d="M4.9998 15.2008C6.76712 15.2008 8.1998 13.7681 8.1998 12.0008C8.1998 10.2335 6.76712 8.80078 4.9998 8.80078C3.23249 8.80078 1.7998 10.2335 1.7998 12.0008C1.7998 13.7681 3.23249 15.2008 4.9998 15.2008Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SpringArmComponent_64.svg b/Content/Slate/Starship/AssetIcons/SpringArmComponent_64.svg
new file mode 100644
index 0000000..0ccb3d2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SpringArmComponent_64.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SpringArmComponent_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{opacity:0.5;}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st8{fill:#FFFFFF;}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="35.1941" y1="16.1042" x2="49.9391" y2="16.1042">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</linearGradient>
+		<path class="st1" d="M41.5,19.9c2.3,0.9,4,0.9,4.9,0c0.6-1.4-1.1-4-4-6.3c-2.9-2.3-6.3-2.6-7.2-1.1c0,0,0,0,0,0.3
+			c0-0.6,0-0.9,0.3-1.4c1.1-1.7,5.2-1.1,9.2,1.7c4,2.9,6.3,6.3,4.9,8C48.4,22.5,44.9,21.9,41.5,19.9z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.4717" y1="21.8672" x2="45.9036" y2="21.8672">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st2" d="M37.8,25.6c2.3,0.9,4,0.9,4.9,0c0.9-1.4-0.9-4-4-6.3c-3.1-2.3-6.3-2.6-7.2-1.1c0,0,0,0,0,0.3
+			c0-0.6,0-0.9,0.3-1.4c0.9-1.7,5.2-0.9,8.9,1.7c3.7,2.6,6.3,6.3,4.9,8C44.6,28.2,41.2,27.6,37.8,25.6z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="27.4634" y1="27.5938" x2="42.1816" y2="27.5938">
+			<stop  offset="0" style="stop-color:#E6E6E6"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st3" d="M34,31.4c2.3,0.9,4,0.9,4.9,0c0.6-1.4-1.1-4-4-6s-6.3-2.6-7.4-1.4c0,0,0,0,0,0.3c0-0.6,0-0.9,0.3-1.4
+			c1.1-1.7,5.4-0.9,9.2,1.7c3.7,2.6,6.3,6.3,4.9,8C40.9,33.9,37.5,33.4,34,31.4z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="29.0532" y1="27.9333" x2="32.9431" y2="37.9474">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st4" d="M30,37.1c2.3,0.9,4,0.9,4.9,0c0.9-1.4-0.9-4-4-6s-6-2.6-7.2-1.4c0,0,0,0,0,0.3c0-0.6,0-0.9,0.3-1.4
+			c1.1-1.7,5.4-0.9,9.2,1.7c3.7,2.6,6.3,6.3,4.9,8C37.2,39.7,33.8,39.1,30,37.1z"/>
+		<radialGradient id="SVGID_5_" cx="24.0277" cy="43.7022" r="9.1626" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</radialGradient>
+		<path class="st5" d="M24,52.9c5.1,0,9.2-4.1,9.2-9.2s-4.1-9.2-9.2-9.2s-9.2,4.1-9.2,9.2S19,52.9,24,52.9z"/>
+	</g>
+	<g class="st6">
+		<path class="st7" d="M41.5,19.9c2.3,0.9,4,0.9,4.9,0c0.6-1.4-1.1-4-4-6.3c-2.9-2.3-6.3-2.6-7.2-1.1c0,0,0,0,0,0.3
+			c0-0.6,0-0.9,0.3-1.4c1.1-1.7,5.2-1.1,9.2,1.7c4,2.9,6.3,6.3,4.9,8C48.4,22.5,44.9,21.9,41.5,19.9z"/>
+		<path class="st7" d="M37.8,25.6c2.3,0.9,4,0.9,4.9,0c0.9-1.4-0.9-4-4-6.3c-3.1-2.3-6.3-2.6-7.2-1.1c0,0,0,0,0,0.3
+			c0-0.6,0-0.9,0.3-1.4c0.9-1.7,5.2-0.9,8.9,1.7c3.7,2.6,6.3,6.3,4.9,8C44.6,28.2,41.2,27.6,37.8,25.6z"/>
+		<path class="st7" d="M34,31.4c2.3,0.9,4,0.9,4.9,0c0.6-1.4-1.1-4-4-6s-6.3-2.6-7.4-1.4c0,0,0,0,0,0.3c0-0.6,0-0.9,0.3-1.4
+			c1.1-1.7,5.4-0.9,9.2,1.7c3.7,2.6,6.3,6.3,4.9,8C40.9,33.9,37.5,33.4,34,31.4z"/>
+		<path class="st7" d="M30,37.1c2.3,0.9,4,0.9,4.9,0c0.9-1.4-0.9-4-4-6s-6-2.6-7.2-1.4c0,0,0,0,0,0.3c0-0.6,0-0.9,0.3-1.4
+			c1.1-1.7,5.4-0.9,9.2,1.7c3.7,2.6,6.3,6.3,4.9,8C37.2,39.7,33.8,39.1,30,37.1z"/>
+		<path class="st8" d="M24,52.9c5.1,0,9.2-4.1,9.2-9.2s-4.1-9.2-9.2-9.2s-9.2,4.1-9.2,9.2S19,52.9,24,52.9z"/>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StaticMeshActor_16.svg b/Content/Slate/Starship/AssetIcons/StaticMeshActor_16.svg
new file mode 100644
index 0000000..c7d6e29
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StaticMeshActor_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 12L6 16V11L0 7V12Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16 5.19995L7 11V16L16 9.49995V5.19995Z" fill="white"/>
+<path d="M9.6 0.800049L0.5 5.70005L6.5 9.70005L15.6 3.80005L9.6 0.800049ZM9.6 1.90005L13.6 3.90005L10.3 6.00005L6.6 3.50005L9.6 1.90005ZM2.4 5.80005L5.6 4.00005L9.4 6.50005L6.5 8.50005L2.4 5.80005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StaticMeshActor_64.svg b/Content/Slate/Starship/AssetIcons/StaticMeshActor_64.svg
new file mode 100644
index 0000000..7a46bc2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StaticMeshActor_64.svg
@@ -0,0 +1,44 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M40.41 25.0295L35.2 31.7295L23.87 33.5095L23.95 14.3095L40.41 25.0295Z" fill="url(#paint0_linear)"/>
+<path d="M38.6 7.34952V23.3995L26.12 16.0195L23.64 14.9295L38.6 7.34952Z" fill="url(#paint1_linear)"/>
+<path d="M54.68 17.1695L48.27 22.9295L38.09 22.2795L38.22 6.44952L54.68 17.1695Z" fill="url(#paint2_linear)"/>
+<path d="M24.14 14.3495V41.5595L5.60004 27.5195L7.85004 22.3195L24.14 14.3495Z" fill="url(#paint3_linear)"/>
+<path d="M42.48 27.2995L22.94 15.0195L25.01 11.7895L44.99 23.6995L42.48 27.2995Z" fill="url(#paint4_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.00004 40.8095L26.25 57.8095V38.4295L3.00004 22.9295V40.8095Z" fill="url(#paint5_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M61.1 15.8995L26.22 38.4495L26.27 57.7995L61.1 32.9395V15.8995Z" fill="url(#paint6_linear)"/>
+<path d="M38.19 8.28953L53.35 16.2895L26.52 32.7895L11.27 22.6695L38.19 8.28953ZM38 4.91953L3.00004 22.9195L26.2 38.4395L61.1 15.8995L38 4.91953Z" fill="url(#paint7_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="23.87" y1="23.9095" x2="40.41" y2="23.9095" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="23.64" y1="15.3795" x2="38.6" y2="15.3795" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="670.003" y1="248.541" x2="945.231" y2="248.541" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="109.424" y1="775.141" x2="453.156" y2="775.141" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="42.31" y1="24.6095" x2="26.58" y2="14.7595" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="22.38" y1="29.7995" x2="10.63" y2="45.8595" gradientUnits="userSpaceOnUse">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#333333"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="1335.27" y1="1199.57" x2="1882.25" y2="1835.23" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="35.26" y1="7.77952" x2="26.72" y2="38.8395" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#CCCCCC"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StaticMesh_16.svg b/Content/Slate/Starship/AssetIcons/StaticMesh_16.svg
new file mode 100644
index 0000000..c7d6e29
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StaticMesh_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 12L6 16V11L0 7V12Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16 5.19995L7 11V16L16 9.49995V5.19995Z" fill="white"/>
+<path d="M9.6 0.800049L0.5 5.70005L6.5 9.70005L15.6 3.80005L9.6 0.800049ZM9.6 1.90005L13.6 3.90005L10.3 6.00005L6.6 3.50005L9.6 1.90005ZM2.4 5.80005L5.6 4.00005L9.4 6.50005L6.5 8.50005L2.4 5.80005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StaticMesh_64.svg b/Content/Slate/Starship/AssetIcons/StaticMesh_64.svg
new file mode 100644
index 0000000..7a46bc2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StaticMesh_64.svg
@@ -0,0 +1,44 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M40.41 25.0295L35.2 31.7295L23.87 33.5095L23.95 14.3095L40.41 25.0295Z" fill="url(#paint0_linear)"/>
+<path d="M38.6 7.34952V23.3995L26.12 16.0195L23.64 14.9295L38.6 7.34952Z" fill="url(#paint1_linear)"/>
+<path d="M54.68 17.1695L48.27 22.9295L38.09 22.2795L38.22 6.44952L54.68 17.1695Z" fill="url(#paint2_linear)"/>
+<path d="M24.14 14.3495V41.5595L5.60004 27.5195L7.85004 22.3195L24.14 14.3495Z" fill="url(#paint3_linear)"/>
+<path d="M42.48 27.2995L22.94 15.0195L25.01 11.7895L44.99 23.6995L42.48 27.2995Z" fill="url(#paint4_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.00004 40.8095L26.25 57.8095V38.4295L3.00004 22.9295V40.8095Z" fill="url(#paint5_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M61.1 15.8995L26.22 38.4495L26.27 57.7995L61.1 32.9395V15.8995Z" fill="url(#paint6_linear)"/>
+<path d="M38.19 8.28953L53.35 16.2895L26.52 32.7895L11.27 22.6695L38.19 8.28953ZM38 4.91953L3.00004 22.9195L26.2 38.4395L61.1 15.8995L38 4.91953Z" fill="url(#paint7_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="23.87" y1="23.9095" x2="40.41" y2="23.9095" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="23.64" y1="15.3795" x2="38.6" y2="15.3795" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="670.003" y1="248.541" x2="945.231" y2="248.541" gradientUnits="userSpaceOnUse">
+<stop stop-color="#333333"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="109.424" y1="775.141" x2="453.156" y2="775.141" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="42.31" y1="24.6095" x2="26.58" y2="14.7595" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E6E6E6"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint5_linear" x1="22.38" y1="29.7995" x2="10.63" y2="45.8595" gradientUnits="userSpaceOnUse">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#333333"/>
+</linearGradient>
+<linearGradient id="paint6_linear" x1="1335.27" y1="1199.57" x2="1882.25" y2="1835.23" gradientUnits="userSpaceOnUse">
+<stop stop-color="#999999"/>
+<stop offset="1" stop-color="#4D4D4D"/>
+</linearGradient>
+<linearGradient id="paint7_linear" x1="35.26" y1="7.77952" x2="26.72" y2="38.8395" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#CCCCCC"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StreamMediaSource_16.svg b/Content/Slate/Starship/AssetIcons/StreamMediaSource_16.svg
new file mode 100644
index 0000000..22570df
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StreamMediaSource_16.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 5H12H2C0.9 5 0 5.9 0 7H1L1.2 6.4C1.4 6.2 1.7 6 2 6H12V14V15H13H14C15.1 15 16 14.1 16 13V7C16 5.9 15.1 5 14 5ZM14 13.5C13.2 13.5 12.5 12.8 12.5 12C12.5 11.2 13.2 10.5 14 10.5C14.8 10.5 15.5 11.2 15.5 12C15.5 12.8 14.8 13.5 14 13.5ZM14 9.5C13.2 9.5 12.5 8.8 12.5 8C12.5 7.2 13.2 6.5 14 6.5C14.8 6.5 15.5 7.2 15.5 8C15.5 8.8 14.8 9.5 14 9.5Z" fill="white"/>
+<path d="M8.5 5.5L11.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.5 5.5L3.5 0.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M5.5001 13.5002C6.2733 13.5002 6.9001 12.8734 6.9001 12.1002C6.9001 11.327 6.2733 10.7002 5.5001 10.7002C4.7269 10.7002 4.1001 11.327 4.1001 12.1002C4.1001 12.8734 4.7269 13.5002 5.5001 13.5002Z" fill="white"/>
+<path opacity="0.5" d="M3 14.6006L3.7 13.9006C3.3 13.4006 3 12.8006 3 12.1006C3 11.4006 3.3 10.8006 3.7 10.3006L3 9.60059C2.4 10.2006 2 11.1006 2 12.1006C2 13.1006 2.4 14.0006 3 14.6006Z" fill="white"/>
+<path opacity="0.5" d="M7.9998 9.60059L7.2998 10.3006C7.6998 10.8006 7.9998 11.4006 7.9998 12.1006C7.9998 12.8006 7.6998 13.4006 7.2998 13.9006L7.9998 14.6006C8.5998 14.0006 8.9998 13.1006 8.9998 12.1006C8.9998 11.1006 8.5998 10.3006 7.9998 9.60059Z" fill="white"/>
+<path opacity="0.5" d="M8.7002 8.9002C9.5002 9.7002 10.0002 10.8002 10.0002 12.1002C10.0002 13.4002 9.5002 14.5002 8.7002 15.3002L9.4002 16.0002C10.4002 15.0002 11.0002 13.6002 11.0002 12.1002C11.0002 10.6002 10.4002 9.2002 9.4002 8.2002L8.7002 8.9002Z" fill="white"/>
+<path opacity="0.5" d="M1 12.1002C1 10.9002 1.5 9.7002 2.3 8.9002L1.6 8.2002C0.6 9.2002 0 10.6002 0 12.1002C0 13.6002 0.6 15.0002 1.6 16.0002L2.3 15.3002C1.5 14.5002 1 13.4002 1 12.1002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StreamMediaSource_64.svg b/Content/Slate/Starship/AssetIcons/StreamMediaSource_64.svg
new file mode 100644
index 0000000..8aa8954
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StreamMediaSource_64.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="StreamMediaSource_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_6_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+	.st8{opacity:0.5;}
+	.st9{enable-background:new    ;}
+	.st10{fill:#FFFFFF;}
+	.st11{fill:#FFFFFF;enable-background:new    ;}
+	.st12{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="24.0214" y1="15.1121" x2="25.909" y2="14.016">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st0" d="M29.2,21.6L29.2,21.6c-0.5,0.3-1,0.1-1.3-0.3L20.6,8.7c-0.3-0.5-0.1-1,0.3-1.3l0,0c0.5-0.3,1-0.1,1.3,0.3
+			l7.3,12.6C29.8,20.8,29.6,21.4,29.2,21.6z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="37.1709" y1="13.9569" x2="38.3887" y2="14.6876">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.6345" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st1" d="M34,21.6L34,21.6c0.5,0.3,1,0.1,1.3-0.3l7.3-12.6c0.3-0.5,0.1-1-0.3-1.3v0c-0.5-0.3-1-0.1-1.3,0.3l-7.3,12.6
+			C33.4,20.8,33.5,21.4,34,21.6z"/>
+		<path class="st2" d="M52.9,46.9H16.6c-2.2,0-4-1.8-4-4V22c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4v20.9
+			C56.9,45.1,55.1,46.9,52.9,46.9z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="34.7328" y1="19.7303" x2="34.7328" y2="48.6003">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="0.7817" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M52.9,47.6H16.6c-2.2,0-4-1.8-4-4V22.7c0-2.2,1.8-4,4-4h36.2c2.2,0,4,1.8,4,4v20.9
+			C56.9,45.8,55.1,47.6,52.9,47.6z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="31.4523" y1="21.5609" x2="31.4523" y2="44.5608">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#1A1A1A"/>
+		</linearGradient>
+		<path class="st4" d="M44,44.7H18.9c-1.7,0-3.1-1.4-3.1-3.1V24.4c0-1.7,1.4-3.1,3.1-3.1H44c1.7,0,3.1,1.4,3.1,3.1v17.1
+			C47.1,43.3,45.7,44.7,44,44.7z"/>
+		<radialGradient id="SVGID_5_" cx="52.1274" cy="25.0593" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st5" cx="52.1" cy="25.1" r="2.9"/>
+		<radialGradient id="SVGID_6_" cx="52.1274" cy="32.4062" r="2.9491" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#808080"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st6" cx="52.1" cy="32.4" r="2.9"/>
+		<circle class="st7" cx="52.1" cy="25.1" r="2.3"/>
+		<circle class="st7" cx="52.1" cy="32.4" r="2.3"/>
+	</g>
+	<g class="st8">
+		<path d="M28.5,43.6c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.5-4.5c-2.5,0-4.5,2-4.5,4.5S26,43.6,28.5,43.6z"/>
+		<path class="st9" d="M20.4,47.1l2.3-2.3c-1.3-1.6-2.3-3.6-2.3-5.8c0-2.3,1-4.2,2.3-5.8l-2.3-2.3c-1.9,1.9-3.2,4.9-3.2,8.1
+			S18.4,45.2,20.4,47.1z"/>
+		<path class="st9" d="M36.6,30.9l-2.3,2.3c1.3,1.6,2.3,3.6,2.3,5.8c0,2.3-1,4.2-2.3,5.8l2.3,2.3c1.9-1.9,3.2-4.9,3.2-8.1
+			S38.5,33.2,36.6,30.9z"/>
+		<path class="st9" d="M44.1,47.6c1.4-2.6,2.1-5.5,2.1-8.5c0-4.9-1.9-9.4-5.2-12.6l-2.3,2.3C41.4,31.3,43,34.8,43,39
+			c0,3.3-1,6.2-2.7,8.5"/>
+		<path class="st9" d="M16.6,47.6c-1.7-2.4-2.7-5.3-2.7-8.6c0-3.9,1.6-7.8,4.2-10.4l-2.3-2.3c-3.2,3.2-5.2,7.8-5.2,12.6
+			s0.5,5.3,3.7,8.5"/>
+	</g>
+	<g>
+		<path class="st10" d="M27.2,42.7c2.5,0,4.5-2,4.5-4.5s-2-4.5-4.5-4.5c-2.5,0-4.5,2-4.5,4.5S24.7,42.7,27.2,42.7z"/>
+		<path class="st11" d="M19.1,46.3l2.3-2.3c-1.3-1.6-2.3-3.6-2.3-5.8c0-2.3,1-4.2,2.3-5.8l-2.3-2.3c-1.9,1.9-3.2,4.9-3.2,8.1
+			S17.2,44.3,19.1,46.3z"/>
+		<path class="st11" d="M35.3,30.1L33,32.3c1.3,1.6,2.3,3.6,2.3,5.8c0,2.3-1,4.2-2.3,5.8l2.3,2.3c1.9-1.9,3.2-4.9,3.2-8.1
+			S37.2,32.3,35.3,30.1z"/>
+		<path class="st11" d="M37.5,27.8c2.6,2.6,4.2,6.1,4.2,10.4s-1.6,7.8-4.2,10.4l2.3,2.3C43,47.6,45,43,45,38.2s-1.9-9.4-5.2-12.6
+			L37.5,27.8z"/>
+		<path class="st11" d="M12.6,38.2c0-3.9,1.6-7.8,4.2-10.4l-2.3-2.3c-3.2,3.2-5.2,7.8-5.2,12.6s1.9,9.4,5.2,12.6l2.3-2.3
+			C14.2,45.9,12.6,42.4,12.6,38.2z"/>
+	</g>
+	<rect x="0" class="st12" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StringTable_16-1.svg b/Content/Slate/Starship/AssetIcons/StringTable_16-1.svg
new file mode 100644
index 0000000..0f4cc79
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StringTable_16-1.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 5V0H2V16H14V5H9ZM3.2 4.4L4.5 4H4.6V7H4V4.7L3.2 4.9V4.4ZM4.7 14.8C4.6 14.9 4.3 15 4 15C3.7 15 3.5 14.9 3.3 14.8C3.1 14.6 3 14.4 3 14.2H3.6C3.6 14.3 3.6 14.4 3.7 14.5C3.8 14.6 3.9 14.6 4 14.6C4.1 14.6 4.2 14.6 4.3 14.5C4.4 14.4 4.4 14.3 4.4 14.2C4.4 13.9 4.2 13.8 3.9 13.8H3.7V13.3H4C4.1 13.3 4.3 13.3 4.3 13.2C4.4 13.1 4.4 13 4.4 12.9C4.4 12.8 4.4 12.7 4.3 12.6C4.2 12.5 4.1 12.5 4 12.5C3.9 12.5 3.8 12.5 3.7 12.6C3.6 12.7 3.6 12.7 3.6 12.8H3C3 12.6 3 12.5 3.1 12.4C3.2 12.3 3.3 12.2 3.4 12.1C3.7 12 3.8 12 4 12C4.3 12 4.6 12.1 4.7 12.2C4.9 12.4 5 12.6 5 12.8C5 12.9 5 13.1 4.9 13.2C4.8 13.3 4.7 13.4 4.6 13.5C4.8 13.6 4.9 13.6 5 13.8C5 13.8 5 14 5 14.1C5 14.4 4.9 14.6 4.7 14.8ZM5.1 11H3.1V10.6L4.1 9.6C4.2 9.5 4.3 9.3 4.4 9.2C4.4 9.1 4.4 9 4.4 8.9C4.4 8.8 4.4 8.7 4.3 8.6C4.2 8.5 4.1 8.5 4 8.5C3.9 8.5 3.8 8.5 3.7 8.6C3.6 8.7 3.6 8.8 3.6 9H3C3 8.8 3 8.7 3.1 8.5C3.2 8.4 3.3 8.2 3.5 8.1C3.7 8 3.8 8 4 8C4.3 8 4.5 8.1 4.7 8.2C4.9 8.4 5 8.6 5 8.8C5 9 5 9.1 4.9 9.3C4.8 9.4 4.7 9.6 4.5 9.8L3.8 10.5H5.1V11ZM12 15H6V14H12V15ZM12 11H6V10H12V11ZM12 7H6V6H12V7Z" fill="white"/>
+<path d="M9 0H8L14 6V5L9 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StringTable_16.svg b/Content/Slate/Starship/AssetIcons/StringTable_16.svg
new file mode 100644
index 0000000..1b2d599
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StringTable_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 0V4H14L10 0Z" fill="white"/>
+<path d="M9 5V0H2V16H14V5H9ZM3.2 4.4L4.5 4H4.6V7H4V4.7L3.2 4.9V4.4ZM4.7 14.8C4.6 14.9 4.3 15 4 15C3.7 15 3.5 14.9 3.3 14.8C3.1 14.6 3 14.4 3 14.2H3.6C3.6 14.3 3.6 14.4 3.7 14.5C3.8 14.6 3.9 14.6 4 14.6C4.1 14.6 4.2 14.6 4.3 14.5C4.4 14.4 4.4 14.3 4.4 14.2C4.4 13.9 4.2 13.8 3.9 13.8H3.7V13.3H4C4.1 13.3 4.3 13.3 4.3 13.2C4.4 13.1 4.4 13 4.4 12.9C4.4 12.8 4.4 12.7 4.3 12.6C4.2 12.5 4.1 12.5 4 12.5C3.9 12.5 3.8 12.5 3.7 12.6C3.6 12.7 3.6 12.7 3.6 12.8H3C3 12.6 3 12.5 3.1 12.4C3.2 12.3 3.3 12.2 3.4 12.1C3.7 12 3.8 12 4 12C4.3 12 4.6 12.1 4.7 12.2C4.9 12.4 5 12.6 5 12.8C5 12.9 5 13.1 4.9 13.2C4.8 13.3 4.7 13.4 4.6 13.5C4.8 13.6 4.9 13.6 5 13.8C5 13.8 5 14 5 14.1C5 14.4 4.9 14.6 4.7 14.8ZM5.1 11H3.1V10.6L4.1 9.6C4.2 9.5 4.3 9.3 4.4 9.2C4.4 9.1 4.4 9 4.4 8.9C4.4 8.8 4.4 8.7 4.3 8.6C4.2 8.5 4.1 8.5 4 8.5C3.9 8.5 3.8 8.5 3.7 8.6C3.6 8.7 3.6 8.8 3.6 9H3C3 8.8 3 8.7 3.1 8.5C3.2 8.4 3.3 8.2 3.5 8.1C3.7 8 3.8 8 4 8C4.3 8 4.5 8.1 4.7 8.2C4.9 8.4 5 8.6 5 8.8C5 9 5 9.1 4.9 9.3C4.8 9.4 4.7 9.6 4.5 9.8L3.8 10.5H5.1V11ZM12 14.5L10 15L8 14.5L6 15V14L8 13.5L10 14L12 13.5V14.5ZM12 10.5L10 11L8 10.5L6 11V10L8 9.5L10 10L12 9.5V10.5ZM12 6.5L10 7L8 6.5L6 7V6L8 5.5L10 6L12 5.5V6.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/StringTable_64.svg b/Content/Slate/Starship/AssetIcons/StringTable_64.svg
new file mode 100644
index 0000000..8f0b2c2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/StringTable_64.svg
@@ -0,0 +1,45 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M50.6 54.46H16.24V8.72H36.85L50.6 23.27V54.46Z" fill="url(#paint0_linear)"/>
+<path d="M36.77 11.15L47.7 22.89H36.82L36.77 11.15Z" fill="url(#paint1_linear)"/>
+<path d="M22.0684 28.59H21.1247V22.3347L19.2324 23.0297V22.1774L21.9212 21.1678H22.0684V28.59Z" fill="black"/>
+<path d="M23.8237 39.86H18.9838V39.1853L21.5407 36.3443C21.9195 35.9147 22.18 35.5664 22.322 35.2992C22.4675 35.0286 22.5402 34.7496 22.5402 34.4621C22.5402 34.0765 22.4235 33.7603 22.1901 33.5134C21.9567 33.2665 21.6456 33.143 21.2566 33.143C20.7899 33.143 20.4263 33.2766 20.1659 33.5438C19.9088 33.8076 19.7803 34.1763 19.7803 34.6498H18.8418C18.8418 33.97 19.0599 33.4204 19.4962 33.001C19.9359 32.5816 20.5227 32.3719 21.2566 32.3719C21.9432 32.3719 22.4861 32.5529 22.8852 32.9147C23.2842 33.2733 23.4838 33.7518 23.4838 34.3505C23.4838 35.0776 23.0204 35.9435 22.0937 36.948L20.1152 39.094H23.8237V39.86Z" fill="black"/>
+<path d="M20.3485 46.9801H21.0537C21.4968 46.9733 21.8451 46.8566 22.0988 46.63C22.3525 46.4034 22.4793 46.0973 22.4793 45.7118C22.4793 44.8459 22.0481 44.413 21.1856 44.413C20.7798 44.413 20.4551 44.5297 20.2116 44.7631C19.9714 44.9931 19.8514 45.2992 19.8514 45.6813H18.9128C18.9128 45.0962 19.1259 44.6109 19.552 44.2253C19.9816 43.8364 20.5261 43.6419 21.1856 43.6419C21.8823 43.6419 22.4286 43.8262 22.8243 44.1949C23.22 44.5635 23.4178 45.0759 23.4178 45.7321C23.4178 46.0534 23.313 46.3645 23.1033 46.6656C22.897 46.9666 22.6146 47.1915 22.2561 47.3403C22.6619 47.4688 22.9748 47.6819 23.1946 47.9795C23.4178 48.2772 23.5295 48.6407 23.5295 49.0703C23.5295 49.7332 23.313 50.2591 22.8801 50.648C22.4472 51.037 21.884 51.2315 21.1907 51.2315C20.4973 51.2315 19.9325 51.0438 19.4962 50.6683C19.0633 50.2929 18.8468 49.7974 18.8468 49.1819H19.7905C19.7905 49.5708 19.9173 49.882 20.171 50.1154C20.4246 50.3487 20.7645 50.4654 21.1907 50.4654C21.6439 50.4654 21.9906 50.347 22.2307 50.1103C22.4708 49.8735 22.5909 49.5336 22.5909 49.0906C22.5909 48.661 22.459 48.3313 22.1952 48.1013C21.9314 47.8713 21.5509 47.7529 21.0537 47.7462H20.3485V46.9801Z" fill="black"/>
+<path d="M46 25.83H27.23V28.98H46V25.83Z" fill="#3F3F3F"/>
+<path d="M46.16 37.16H27.39V40.31H46.16V37.16Z" fill="#3F3F3F"/>
+<path d="M46.16 48.48H27.39V51.63H46.16V48.48Z" fill="#3F3F3F"/>
+<path opacity="0.3" d="M39.79 9.60001L39.21 22.48L50.77 22.05L39.79 9.60001Z" fill="black"/>
+<path d="M50.79 58.47H11.1V6.38H34.91L50.79 22.96V58.47Z" fill="#333333"/>
+<path d="M52.85 19.7V57.06H12.61V5.32001H40.17" fill="url(#paint2_linear)"/>
+<path opacity="0.7" d="M40.17 5.32001L38.59 21L52.85 19.7L40.17 5.32001Z" fill="black"/>
+<path d="M40.19 5.32001L40.16 19.62L52.84 19.69L40.19 5.32001Z" fill="url(#paint3_linear)"/>
+<path opacity="0.8" d="M19.1384 27.58H18.1947V21.3247L16.3024 22.0197V21.1674L18.9912 20.1579H19.1384V27.58Z" fill="black"/>
+<path opacity="0.8" d="M20.8937 40.1H16.0538V39.4253L18.6107 36.5842C18.9896 36.1547 19.25 35.8064 19.392 35.5392C19.5375 35.2686 19.6102 34.9896 19.6102 34.7021C19.6102 34.3165 19.4935 34.0003 19.2601 33.7534C19.0268 33.5065 18.7156 33.383 18.3266 33.383C17.8599 33.383 17.4963 33.5166 17.2359 33.7838C16.9789 34.0476 16.8503 34.4163 16.8503 34.8898H15.9118C15.9118 34.21 16.1299 33.6604 16.5662 33.241C17.0059 32.8216 17.5927 32.6119 18.3266 32.6119C19.0132 32.6119 19.5561 32.7928 19.9552 33.1547C20.3543 33.5132 20.5538 33.9918 20.5538 34.5905C20.5538 35.3176 20.0904 36.1835 19.1637 37.188L17.1852 39.3339H20.8937V40.1Z" fill="black"/>
+<path opacity="0.8" d="M17.4185 48.4801H18.1237C18.5668 48.4733 18.9151 48.3566 19.1688 48.13C19.4225 47.9034 19.5493 47.5973 19.5493 47.2118C19.5493 46.3459 19.1181 45.913 18.2556 45.913C17.8498 45.913 17.5251 46.0297 17.2816 46.2631C17.0414 46.4931 16.9214 46.7992 16.9214 47.1813H15.9828C15.9828 46.5962 16.1959 46.1109 16.622 45.7253C17.0516 45.3364 17.5961 45.1419 18.2556 45.1419C18.9523 45.1419 19.4986 45.3262 19.8943 45.6949C20.29 46.0635 20.4878 46.5759 20.4878 47.2321C20.4878 47.5534 20.383 47.8645 20.1733 48.1656C19.967 48.4666 19.6846 48.6915 19.3261 48.8403C19.7319 48.9688 20.0448 49.1819 20.2646 49.4795C20.4878 49.7772 20.5995 50.1407 20.5995 50.5703C20.5995 51.2332 20.383 51.7591 19.9501 52.148C19.5172 52.537 18.954 52.7315 18.2607 52.7315C17.5674 52.7315 17.0025 52.5438 16.5662 52.1683C16.1333 51.7929 15.9169 51.2974 15.9169 50.6819H16.8605C16.8605 51.0708 16.9873 51.382 17.241 51.6154C17.4946 51.8487 17.8345 51.9654 18.2607 51.9654C18.7139 51.9654 19.0606 51.847 19.3007 51.6103C19.5408 51.3735 19.6609 51.0336 19.6609 50.5906C19.6609 50.161 19.529 49.8313 19.2652 49.6013C19.0014 49.3713 18.6209 49.2529 18.1237 49.2462H17.4185V48.4801Z" fill="black"/>
+<g opacity="0.8">
+<path opacity="0.8" d="M23.18 26C24.5984 23.9247 26.7742 22.4885 29.24 22C31.7354 21.4436 34.3366 21.596 36.75 22.44C37.95 22.84 39.02 23.37 40.01 23.73C40.9675 24.0908 41.9874 24.2574 43.01 24.22C45.2893 23.9624 47.5331 23.4526 49.7 22.7C47.8789 24.3773 45.6637 25.5674 43.26 26.16C41.9316 26.4225 40.5594 26.3608 39.26 25.98C38.05 25.63 37 25.14 36 24.8C33.9461 24.085 31.7706 23.7858 29.6 23.92C27.3171 24.0521 25.1065 24.7683 23.18 26Z" fill="#303030"/>
+</g>
+<g opacity="0.8">
+<path opacity="0.8" d="M23.18 38.22C24.6022 36.1486 26.7762 34.7136 29.24 34.22C31.7362 33.6736 34.3347 33.8258 36.75 34.66C38 35 39 35.56 40 35.91C40.9569 36.274 41.9767 36.4439 43 36.41C45.2763 36.1485 47.5167 35.6353 49.68 34.88C47.864 36.5645 45.6469 37.7557 43.24 38.34C41.9124 38.6058 40.5402 38.5475 39.24 38.17C38.05 37.82 37 37.33 36 37C33.9456 36.2868 31.771 35.9843 29.6 36.11C27.3154 36.2564 25.1059 36.9826 23.18 38.22Z" fill="#303030"/>
+</g>
+<g opacity="0.8">
+<path opacity="0.8" d="M23.18 50.41C24.5991 48.3355 26.7746 46.8995 29.24 46.41C31.7357 45.8583 34.3357 46.0107 36.75 46.85C37.95 47.26 39.02 47.78 40.01 48.14C40.9669 48.5039 41.9867 48.6739 43.01 48.64C45.2855 48.3734 47.5253 47.8604 49.69 47.11C47.874 48.7944 45.6569 49.9856 43.25 50.57C41.9224 50.8358 40.5502 50.7774 39.25 50.4C38.05 50 37 49.52 36 49.18C33.9456 48.4667 31.771 48.1643 29.6 48.29C27.3145 48.4394 25.1049 49.169 23.18 50.41Z" fill="#303030"/>
+</g>
+<defs>
+<linearGradient id="paint0_linear" x1="17.36" y1="53.25" x2="50.19" y2="8.98" gradientUnits="userSpaceOnUse">
+<stop stop-color="#B3B3B3"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="36.77" y1="17.02" x2="47.71" y2="17.02" gradientUnits="userSpaceOnUse">
+<stop stop-color="#666666"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="32.33" y1="7.13001" x2="32.96" y2="56.49" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="50.99" y1="8.44001" x2="36.66" y2="21.48" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SubsurfaceProfile_16.svg b/Content/Slate/Starship/AssetIcons/SubsurfaceProfile_16.svg
new file mode 100644
index 0000000..ae7c984
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SubsurfaceProfile_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 15H4.1L0 5H10.1L16 15Z" fill="white"/>
+<path opacity="0.5" d="M13.2001 1H3.1001C3.1001 1 5.2001 3 5.4001 5.8C5.5001 7.7 3.9001 9.4 2.1001 10C5.2001 10 8.3001 10 12.9001 10C17.5001 7 15.1001 2.4 13.2001 1Z" fill="white"/>
+<path d="M12.9001 10C13.0001 10 13.0001 10 12.9001 10L10.1001 5H5.3001C5.4001 5.3 5.4001 5.5 5.4001 5.8C5.5001 7.7 3.9001 9.4 2.1001 10C5.2001 10 8.3001 10 12.9001 10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/SubsurfaceProfile_64.svg b/Content/Slate/Starship/AssetIcons/SubsurfaceProfile_64.svg
new file mode 100644
index 0000000..e5373ea
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/SubsurfaceProfile_64.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="SubsurfaceProfile_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_3_);enable-background:new    ;}
+	.st4{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.8468" y1="22.3167" x2="32.1532" y2="48.156">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st0" d="M52.3,47.9H22.1L11.7,22.6h25.6L52.3,47.9z"/>
+	<path class="st1" d="M44.4,35.2C44.7,35.2,44.7,35.2,44.4,35.2l-7.1-12.7H25.2c0.3,0.8,0.3,1.3,0.3,2c0.3,4.8-3.8,9.1-8.4,10.7
+		C24.9,35.2,32.8,35.2,44.4,35.2z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="34.5788" y1="34.6185" x2="34.7389" y2="48.1254">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st2" d="M52.3,47.9H22.1L17,35.5l27.4-1L52.3,47.9z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="33.8806" y1="12.2411" x2="34.1548" y2="35.3674">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="0.4772" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.72" style="stop-color:#AEAEAE"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st3" d="M45.2,12.4H19.6c0,0,5.3,5.1,5.8,12.2c0.3,4.8-3.8,9.4-8.4,11c7.9,0,15.7-0.3,27.4-0.3
+		C56.1,27.6,50,16,45.2,12.4z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TakePreset_16.svg b/Content/Slate/Starship/AssetIcons/TakePreset_16.svg
new file mode 100644
index 0000000..bdd73ae
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TakePreset_16.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 1H0V14H16V1ZM15 5V7H13V5H15ZM15 2V4H13V2H15ZM1 4V2H3V4H1ZM1 7V5H3V7H1ZM1 10V8H3V10H1ZM4 7V2H12V7H4ZM15 11V13H13V11H15ZM15 8V10H13V8H15ZM1 13V11H3V13H1ZM4 13V8H12V13H4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TakeRecorderActorSource_16.svg b/Content/Slate/Starship/AssetIcons/TakeRecorderActorSource_16.svg
new file mode 100644
index 0000000..02da862
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TakeRecorderActorSource_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.7 8.9C7.0196 8.9 8.9 7.0196 8.9 4.7C8.9 2.3804 7.0196 0.5 4.7 0.5C2.3804 0.5 0.5 2.3804 0.5 4.7C0.5 7.0196 2.3804 8.9 4.7 8.9Z" fill="white"/>
+<path opacity="0.5" d="M8.4002 8.2998C7.4002 9.1998 6.2002 9.7998 4.7002 9.7998C3.9002 9.7998 3.1002 9.5998 2.4002 9.2998C2.3002 9.3998 2.2002 9.5998 2.2002 9.7998C2.2002 10.6998 4.3002 11.4998 6.9002 11.4998C9.5002 11.4998 11.6002 10.7998 11.6002 9.7998C11.5002 9.0998 10.2002 8.4998 8.4002 8.2998Z" fill="white"/>
+<path opacity="0.5" d="M9 11H16V15H9V11Z" fill="white"/>
+<path d="M16 11H9V15H16V11Z" fill="white"/>
+<path d="M14.9292 7.07184L8.44531 9.43164L8.95831 10.8412L15.4422 8.48139L14.9292 7.07184Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TakeRecorderLevelSequenceSource_16.svg b/Content/Slate/Starship/AssetIcons/TakeRecorderLevelSequenceSource_16.svg
new file mode 100644
index 0000000..334fcd2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TakeRecorderLevelSequenceSource_16.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M2 15V9H7L8 8H1V16H7L6 15H2Z" fill="white"/>
+<path opacity="0.5" d="M10 9H15V15H11L10 16H16V8H9L10 9Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M13.5 12.5L10 16H16V8H9L13.5 12.5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8 8H1V16H7L3.5 12.5L8 8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3002 1.09961L10.3002 1.89961L10.2002 4.19961L12.3002 3.39961V1.09961Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.2002 2.29883L7.2002 3.09883V5.39883L9.2002 4.59883V2.29883Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.09961 6.6L6.09961 5.8L6.19961 3.5L4.09961 4.3V6.6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4008 0.699219L13.3008 2.99922L15.4008 2.19922L14.6008 0.199219L13.4008 0.699219Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.1002 4.69922L0.200195 5.79922L1.0002 7.79922L3.1002 6.99922V4.69922Z" fill="white"/>
+<path d="M8.42895 10.0252L5.9541 12.5L8.42895 14.9748L10.9038 12.5L8.42895 10.0252Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TakeRecorderLiveLinkSource_16.svg b/Content/Slate/Starship/AssetIcons/TakeRecorderLiveLinkSource_16.svg
new file mode 100644
index 0000000..684e254
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TakeRecorderLiveLinkSource_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 16.0009C6.2 14.0009 8 14.5009 8 14.5009C8 14.5009 9.8 14.0009 13.5 16.0009C9.8 16.0009 6.2 16.0009 2.5 16.0009Z" fill="white"/>
+<path d="M7.99961 6.70039C9.04895 6.70039 9.89961 5.84973 9.89961 4.80039C9.89961 3.75105 9.04895 2.90039 7.99961 2.90039C6.95027 2.90039 6.09961 3.75105 6.09961 4.80039C6.09961 5.84973 6.95027 6.70039 7.99961 6.70039Z" fill="white"/>
+<path opacity="0.5" d="M11.2999 1.40039L10.3999 2.30039C10.9999 2.90039 11.3999 3.70039 11.3999 4.70039C11.3999 5.70039 10.9999 6.50039 10.3999 7.10039L11.2999 8.00039C12.0999 7.20039 12.6999 6.00039 12.6999 4.70039C12.6999 3.50039 12.1999 2.30039 11.2999 1.40039Z" fill="white"/>
+<path opacity="0.5" d="M4.6998 4.80039C4.6998 3.90039 5.0998 3.00039 5.6998 2.40039L4.6998 1.40039C3.8998 2.20039 3.2998 3.40039 3.2998 4.70039C3.2998 6.00039 3.7998 7.20039 4.6998 8.00039L5.5998 7.10039C4.9998 6.50039 4.6998 5.70039 4.6998 4.80039Z" fill="white"/>
+<path d="M8.5999 7.20117H7.3999V11.0012H8.5999V7.20117Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TakeRecorderMicrophoneAudioSource_16.svg b/Content/Slate/Starship/AssetIcons/TakeRecorderMicrophoneAudioSource_16.svg
new file mode 100644
index 0000000..5a95aa1
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TakeRecorderMicrophoneAudioSource_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 6V7.5C12 9.7 10.2 11.5 8 11.5C5.8 11.5 4 9.7 4 7.5V6H3V7.5C3 9.9 4.8 12 7.1 12.4C7.2 13.2 7.4 15.2 5 16C8 16 8 16 11 16C8.6 15.2 8.8 13.2 8.9 12.4C11.2 12 13 9.9 13 7.5V6H12Z" fill="white"/>
+<path opacity="0.5" d="M10.6998 2.4V7.6C10.6998 8.9 9.5998 10 8.2998 10H7.6998C6.3998 10 5.2998 8.9 5.2998 7.6V2.4C5.2998 1.1 6.3998 0 7.6998 0H8.2998C9.5998 0 10.6998 1.1 10.6998 2.4Z" fill="white"/>
+<path d="M11 15H5V16H11V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TakeRecorderNearbySpawnedActorSource_16.svg b/Content/Slate/Starship/AssetIcons/TakeRecorderNearbySpawnedActorSource_16.svg
new file mode 100644
index 0000000..6638660
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TakeRecorderNearbySpawnedActorSource_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.50039 3.30078C5.20039 3.30078 3.40039 5.10078 3.40039 7.40078C3.40039 9.70078 5.60039 10.8008 7.50039 15.3008C9.40039 10.8008 11.6004 9.70078 11.6004 7.40078C11.6004 5.10078 9.80039 3.30078 7.50039 3.30078ZM7.50039 9.40078C6.50039 9.40078 5.60039 8.60078 5.60039 7.50078C5.60039 6.40078 6.40039 5.60078 7.50039 5.60078C8.50039 5.60078 9.40039 6.40078 9.40039 7.50078C9.40039 8.60078 8.50039 9.40078 7.50039 9.40078Z" fill="white"/>
+<path opacity="0.5" d="M3.3 3.9L1.3 1.9L2 1.2L4 3.2C3.8 3.4 3.5 3.7 3.3 3.9ZM11.7 3.9L13.7 1.9L13 1.2L11 3.2C11.2 3.4 11.5 3.7 11.7 3.9ZM7.5 2C7.7 2 7.9 2 8 2V0H7V2C7.1 2 7.3 2 7.5 2ZM13 7C13 7.1 13 7.3 13 7.5C13 7.7 13 7.9 13 8H15V7H13ZM2 7.5C2 7.3 2 7.1 2 7H0V8H2C2 7.8 2 7.6 2 7.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TakeRecorderWorldSource_16.svg b/Content/Slate/Starship/AssetIcons/TakeRecorderWorldSource_16.svg
new file mode 100644
index 0000000..1951c91
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TakeRecorderWorldSource_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.1998 14.8996C5.9998 13.5996 4.69981 11.3996 4.7998 10.3996C4.9998 8.8996 5.9998 8.9996 5.9998 8.9996C5.9998 8.9996 3.9998 7.8996 3.6998 7.1996C3.3998 6.5996 2.1998 5.9996 1.7998 4.9996C2.8998 2.6996 5.2998 1.09961 7.9998 1.09961C9.1998 1.09961 10.3998 1.3996 11.3998 1.9996C10.9998 2.7996 10.2998 3.89961 9.4998 4.59961C8.5998 5.39961 10.4998 6.49961 9.8998 7.29961C9.3998 7.89961 8.9998 7.09961 8.5998 6.29961C8.2998 5.69961 7.2998 5.8996 6.6998 5.8996C4.4998 5.9996 5.2998 9.29961 7.0998 8.79961C8.2998 8.49961 8.9998 8.3996 10.0998 9.1996C10.7998 9.7996 10.8998 10.9996 10.0998 12.0996C9.4998 12.8996 9.4998 14.0996 9.3998 14.8996C8.8998 14.9996 8.4998 14.9996 7.9998 14.9996C7.6998 14.9996 7.3998 14.9996 7.1998 14.8996Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8 0.5C12.1 0.5 15.5 3.9 15.5 8C15.5 12.1 12.1 15.5 8 15.5C3.9 15.5 0.5 12.1 0.5 8C0.5 3.9 3.9 0.5 8 0.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TargetPoint_16.svg b/Content/Slate/Starship/AssetIcons/TargetPoint_16.svg
new file mode 100644
index 0000000..080e1c3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TargetPoint_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 8H8V1H7V8H0V9H7V16H8V9H15V8Z" fill="white"/>
+<path opacity="0.5" d="M7.5 13.5C10.2614 13.5 12.5 11.2614 12.5 8.5C12.5 5.73858 10.2614 3.5 7.5 3.5C4.73858 3.5 2.5 5.73858 2.5 8.5C2.5 11.2614 4.73858 13.5 7.5 13.5Z" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TargetPoint_64.svg b/Content/Slate/Starship/AssetIcons/TargetPoint_64.svg
new file mode 100644
index 0000000..b5f3831
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TargetPoint_64.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#FFFFFF;stroke:#666666;stroke-width:0.5;stroke-miterlimit:10;}
+	.st4{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+</style>
+<g id="TargetPoint_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<radialGradient id="SVGID_1_" cx="31.9" cy="222" r="19.9" gradientTransform="matrix(1 0 0 1 0 -190)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<circle class="st1" cx="31.9" cy="32" r="19.9"/>
+		<g>
+			<path class="st2" d="M54.6,31.1H32.8V9.3l-0.9-2l-0.9,2v21.8H9.2l-2,0.9l2,0.9H31v21.8l0.9,2l0.9-2V32.9h21.8l2-0.9L54.6,31.1z"
+				/>
+			<path class="st3" d="M31.9,33.9c1,0,1.9-0.8,1.9-1.9s-0.8-1.9-1.9-1.9c-1,0-1.9,0.8-1.9,1.9C30,33.1,30.9,33.9,31.9,33.9z"/>
+			<path class="st4" d="M29.4,50.7v-5c-5.5-1-10.1-5.5-11.1-11.1h-5C14.2,43.1,20.8,49.7,29.4,50.7z"/>
+			<path class="st4" d="M13.2,29.5h5c1-5.5,5.5-10.1,11.1-11.1v-5C20.8,14.3,14.2,20.9,13.2,29.5z"/>
+			<path class="st4" d="M50.6,34.5h-5c-1,5.5-5.5,10.1-11.1,11.1v5C43,49.7,49.5,43.1,50.6,34.5z"/>
+			<path class="st4" d="M34.4,13.3v5c5.5,1,10.1,5.5,11.1,11.1h5C49.5,20.9,43,14.3,34.4,13.3z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TemplateSequence_16.svg b/Content/Slate/Starship/AssetIcons/TemplateSequence_16.svg
new file mode 100644
index 0000000..3313b86
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TemplateSequence_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M1 10H11L12 11V16H16V8H1V10Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 10H2V9H15V15H12V16H16V8H1V10Z" fill="white"/>
+<path d="M8.6 11.9996C9.2 11.9996 9.7 12.4996 9.7 13.0996V13.9996C9.7 14.5996 9.2 15.0996 8.6 15.0996H8V15.9996H8.6C9.7 15.9996 10.6 15.0996 10.6 13.9996V13.0996C10.6 11.9996 9.7 11.0996 8.6 11.0996H6C4.9 11.0996 4 11.9996 4 13.0996V13.7996H4.9V13.0996C4.9 12.4996 5.4 11.9996 6 11.9996H8.6Z" fill="white"/>
+<path d="M2.59961 14.9996C1.99961 14.9996 1.49961 14.4996 1.49961 13.8996V12.9996C1.49961 12.4996 1.99961 11.9996 2.59961 11.9996H3.19961V11.0996H2.59961C1.49961 11.0996 0.599609 11.9996 0.599609 13.0996V13.9996C0.599609 15.0996 1.49961 15.9996 2.59961 15.9996H5.19961C6.29961 15.9996 7.19961 15.0996 7.19961 13.9996V13.1996H6.29961V13.8996C6.29961 14.5996 5.79961 15.0996 5.09961 15.0996H2.59961V14.9996Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3002 3.5998L10.2002 4.3998V2.0998L12.3002 1.2998V3.5998ZM9.2002 2.4998L7.2002 3.2998V5.5998L9.3002 4.7998L9.2002 2.4998ZM4.1002 6.7998L6.1002 5.9998V3.6998L4.1002 4.4998V6.7998ZM13.4002 0.899805V3.1998L15.5002 2.3998L14.7002 0.299805L13.4002 0.899805ZM3.1002 4.8998L0.200195 5.9998L1.0002 7.9998L3.1002 7.1998V4.8998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TemplateSequence_64.svg b/Content/Slate/Starship/AssetIcons/TemplateSequence_64.svg
new file mode 100644
index 0000000..a1d296c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TemplateSequence_64.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TemplateSequence_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#7F7F7F;}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_1_);stroke:#FFFFFF;stroke-miterlimit:10;}
+	.st4{fill:#5B5B5B;}
+	.st5{fill:url(#SVGID_2_);}
+	.st6{fill:url(#SVGID_3_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<path class="st1" d="M9.9,56.5h46.3c0.9,0,1.6-0.7,1.6-1.6V32.9c0-0.9-0.7-1.6-1.6-1.6H9.9c-0.9,0-1.6,0.7-1.6,1.6v21.9
+			C8.3,55.7,9,56.5,9.9,56.5z"/>
+		<g>
+			<g>
+				<rect x="8.8" y="27" class="st1" width="48.6" height="6.7"/>
+				<path class="st2" d="M56.9,27.5v5.7H9.3v-5.7H56.9 M57.9,26.5H8.3v7.7h49.6V26.5L57.9,26.5z"/>
+			</g>
+			<polygon class="st2" points="18.8,33.7 12.5,33.7 16.6,26.9 22.9,26.9 			"/>
+			<polygon class="st2" points="30.1,33.7 23.8,33.7 27.9,26.9 34.2,26.9 			"/>
+			<polygon class="st2" points="41.4,33.7 35,33.7 39.1,26.9 45.5,26.9 			"/>
+			<polygon class="st2" points="53,33.7 46.6,33.7 50.7,26.9 57.1,26.9 			"/>
+		</g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="33.1416" y1="37.7861" x2="33.0838" y2="52.8653">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#C2C2C2"/>
+		</linearGradient>
+		<path class="st3" d="M17.2,52.8H49c0.6,0,1.1-0.5,1.1-1.1V39c0-0.6-0.5-1.1-1.1-1.1H17.2c-0.6,0-1.1,0.5-1.1,1.1v12.7
+			C16,52.3,16.6,52.8,17.2,52.8z"/>
+		<g>
+			<g>
+				
+					<rect x="6.8" y="12.7" transform="matrix(0.9639 -0.2662 0.2662 0.9639 -3.1508 8.8575)" class="st1" width="48.6" height="6.7"/>
+				<path class="st2" d="M53.3,7l1.5,5.5L8.9,25.1l-1.5-5.5L53.3,7 M54,5.7L6.2,18.9l2.1,7.4L56,13.2L54,5.7L54,5.7z"/>
+			</g>
+			<polygon class="st2" points="16.5,16.6 10.3,18.3 16.1,23.8 22.2,22.1 			"/>
+			<polygon class="st2" points="27.3,13.6 21.2,15.3 27,20.7 33.1,19.1 			"/>
+			<polygon class="st2" points="38.2,10.6 32.1,12.3 37.8,17.7 44,16.1 			"/>
+			<polygon class="st2" points="49.4,7.5 43.3,9.2 49,14.7 55.1,13 			"/>
+		</g>
+	</g>
+	<g>
+		<path class="st4" d="M31.6,59.3H12.7c-3.7,0-6.7-3-6.7-6.7v-2.7c0-3.7,3-6.7,6.7-6.7h18.9c3.7,0,6.7,3,6.7,6.7v2.7
+			C38.3,56.3,35.3,59.3,31.6,59.3z"/>
+		<g>
+			<g>
+				
+					<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-56.4693" y1="-12.7458" x2="-40.9578" y2="-28.2573" gradientTransform="matrix(0 1 -1 0 -5.0737 100.2947)">
+					<stop  offset="0" style="stop-color:#E6E6E6"/>
+					<stop  offset="1" style="stop-color:#B3B3B3"/>
+				</linearGradient>
+				<path class="st5" d="M10.6,59.1c-4,0-7.2-3.5-7.2-7.7s3.2-7.7,7.2-7.7h10.3l-1.3,0.9c-1,0.7-1.8,1.6-2.4,2.7l-0.1,0.3h-6.5
+					c-1.9,0-3.5,1.7-3.5,3.8s1.6,3.8,3.5,3.8h9.9c1.9,0,3.5-1.7,3.5-3.8c0-0.9-0.3-1.9-0.9-2.6l-0.6-0.7l0.9-0.1c0.1,0,0.2,0,0.3,0
+					H27l0.1,0.3c0.4,1,0.6,2,0.6,3.1c0,4.3-3.2,7.7-7.2,7.7H10.6z"/>
+				<path class="st4" d="M19.4,44.2c-1,0.7-1.9,1.7-2.5,2.9h-6.2c-2.2,0-4,1.9-4,4.3c0,2.4,1.8,4.3,4,4.3h9.9c2.2,0,4-1.9,4-4.3
+					c0-1.1-0.4-2.1-1-2.9c0.1,0,0.2,0,0.3,0h2.9c0.4,0.9,0.6,1.9,0.6,2.9c0,4-3,7.2-6.7,7.2h-9.9c-3.7,0-6.7-3.2-6.7-7.2
+					s3-7.2,6.7-7.2H19.4 M22.5,43.2h-3.1h-8.7c-4.2,0-7.7,3.7-7.7,8.2c0,4.5,3.5,8.2,7.7,8.2h9.9c4.2,0,7.7-3.7,7.7-8.2
+					c0-1.1-0.2-2.2-0.6-3.3l-0.3-0.6h-0.7h-2.9c-0.1,0-0.2,0-0.4,0l-1.9,0.2l1.2,1.4c0.5,0.6,0.8,1.4,0.8,2.3c0,1.8-1.4,3.3-3,3.3
+					h-9.9c-1.7,0-3-1.5-3-3.3c0-1.8,1.4-3.3,3-3.3h6.2h0.6l0.3-0.5c0.5-1,1.3-1.9,2.2-2.5L22.5,43.2L22.5,43.2z"/>
+			</g>
+			<g>
+				
+					<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-56.8112" y1="-26.3581" x2="-41.2998" y2="-41.8694" gradientTransform="matrix(0 1 -1 0 -5.0737 100.2947)">
+					<stop  offset="0" style="stop-color:#E6E6E6"/>
+					<stop  offset="1" style="stop-color:#B3B3B3"/>
+				</linearGradient>
+				<path class="st6" d="M23.3,59.1l1.3-0.9c1-0.7,1.8-1.6,2.4-2.7l0.1-0.3h6.7c1.9,0,3.5-1.7,3.5-3.8s-1.6-3.8-3.5-3.8h-9.9
+					c-1.9,0-3.5,1.7-3.5,3.8c0,0.9,0.3,1.8,0.9,2.5l0.5,0.7L21,54.8c-0.2,0-0.4,0.1-0.5,0.1h-3l-0.1-0.3c-0.4-1-0.6-2-0.6-3.1
+					c0-4.3,3.2-7.7,7.2-7.7h9.9c4,0,7.2,3.5,7.2,7.7s-3.2,7.7-7.2,7.7H23.3z"/>
+				<path class="st4" d="M33.8,44.2c3.7,0,6.7,3.2,6.7,7.2s-3,7.2-6.7,7.2h-8.9c1-0.7,1.9-1.7,2.5-2.9h6.4c2.2,0,4-1.9,4-4.3
+					c0-2.4-1.8-4.3-4-4.3h-9.9c-2.2,0-4,1.9-4,4.3c0,1.1,0.4,2.1,1,2.9c-0.1,0-0.3,0-0.4,0h-2.7c-0.4-0.9-0.6-1.9-0.6-2.9
+					c0-4,3-7.2,6.7-7.2H33.8 M33.8,43.2h-9.9c-4.2,0-7.7,3.7-7.7,8.2c0,1.1,0.2,2.2,0.6,3.3l0.3,0.6h0.7h2.7c0.2,0,0.4,0,0.6-0.1
+					l1.7-0.3l-1.1-1.3c-0.5-0.6-0.8-1.4-0.8-2.2c0-1.8,1.4-3.3,3-3.3h9.9c1.7,0,3,1.5,3,3.3c0,1.8-1.4,3.3-3,3.3h-6.4h-0.6l-0.3,0.5
+					c-0.5,1-1.3,1.9-2.2,2.5l-2.5,1.8h3.1h8.9c4.2,0,7.7-3.7,7.7-8.2C41.5,46.9,38.1,43.2,33.8,43.2L33.8,43.2z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TextRenderActor_16.svg b/Content/Slate/Starship/AssetIcons/TextRenderActor_16.svg
new file mode 100644
index 0000000..eecb532
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TextRenderActor_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 4.90002C9 5.10002 9 5.19995 8.9 5.19995C8.8 5.29995 8.8 5.30005 8.7 5.30005C8.6 5.30005 8.5 5.29995 8.5 5.19995C8.4 5.09995 8.4 5.00002 8 4.90002V4H6V11H7.4C7.5 11.4 7.7 11.4 7.7 11.4C7.8 11.5 7.8 11.5 7.8 11.6C7.8 11.7 7.8 11.8 7.7 11.8C7.6 11.9 7.5 11.9 7.4 11.9H3.6C3.5 11.9 3.3 11.9 3.3 11.8C3.2 11.7 3.2 11.7 3.2 11.6C3.2 11.5 3.2 11.4 3.3 11.4C3.4 11.3 3.5 11.3 3.6 11H5V4H3V4.90002C2.6 5.10002 2.6 5.19995 2.5 5.19995C2.4 5.29995 2.4 5.30005 2.3 5.30005C2.2 5.30005 2.1 5.29995 2.1 5.19995C2.1 5.09995 2 5.00002 2 4.90002V3H9V4.90002ZM14 7H12V11H13V12H11V7H9V6H11V4H12V6H14V7Z" fill="white"/>
+<g opacity="0.5">
+<path opacity="0.5" d="M15 2V13H1V2H15ZM16 1H0V14H16V1Z" fill="white"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TextRenderActor_64.svg b/Content/Slate/Starship/AssetIcons/TextRenderActor_64.svg
new file mode 100644
index 0000000..38561a1
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TextRenderActor_64.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{opacity:0.29;fill-rule:evenodd;clip-rule:evenodd;enable-background:new    ;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{opacity:0.5;fill:#7F7F7F;enable-background:new    ;}
+</style>
+<g id="TextRenderActor_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.0131" y1="204.0956" x2="31.7604" y2="243.7578" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#333333"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<rect x="6.4" y="11.8" class="st1" width="51" height="40.1"/>
+		<path class="st2" d="M31.8,48.9H18.9v-3.4h4.8V21.7h-6.8v3.1h-3.4v-6.5h23.8v6.5h-3.4v-3.1h-6.8v23.8h4.8v3.4H31.8z M54.3,31.9
+			h-6.8v13.6h3.4v3.4h-6.8v-17h-6.8v-3.4h6.8v-6.8h3.4v6.8h6.8C54.3,28.5,54.3,31.9,54.3,31.9z"/>
+		<path class="st3" d="M29.8,47.3H16.9v-3.4h4.8V20.1h-6.8v3.1h-3.4v-6.5h23.8v6.5h-3.4v-3.1h-6.8v23.8h4.8L29.8,47.3L29.8,47.3z
+			 M52.3,30.3h-6.8v13.6h3.4v3.4h-6.8v-17h-6.8v-3.4h6.8v-6.8h3.4v6.8h6.8C52.3,26.9,52.3,30.3,52.3,30.3z"/>
+		<g>
+			<path class="st4" d="M55.7,13.3v37.5H8V13.3H55.7z M59.1,9.9H4.6v44.3h54.5V9.9z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Texture2D_16.svg b/Content/Slate/Starship/AssetIcons/Texture2D_16.svg
new file mode 100644
index 0000000..60eb280
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Texture2D_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 2H2V5H5V2Z" fill="white"/>
+<path d="M5 8H2V11H5V8Z" fill="white"/>
+<path d="M8 5H5V8H8V5Z" fill="white"/>
+<path d="M8 11H5V14H8V11Z" fill="white"/>
+<path opacity="0.5" d="M15 10L10 15V14V10H15Z" fill="white"/>
+<path d="M14 5H11V8H14V5Z" fill="white"/>
+<path d="M11 2H8V5H11V2Z" fill="white"/>
+<path opacity="0.5" d="M14 2V10H15V1H1V15H10V14H2V2H14Z" fill="white"/>
+<path d="M10 14V10H14L15 9H9V15L10 14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Texture2D_64.svg b/Content/Slate/Starship/AssetIcons/Texture2D_64.svg
new file mode 100644
index 0000000..1e51740
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Texture2D_64.svg
@@ -0,0 +1,27 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M45.3099 43.97L36.4999 58.37L5.43994 58.52V5.37H58.5999L58.5599 36.31L45.3099 43.97Z" fill="url(#paint0_linear)"/>
+<path d="M55.5499 8.41H8.48993V55.47H38.7299L46.4399 45.54L55.5499 38.43V8.41Z" fill="url(#paint1_linear)"/>
+<path opacity="0.8" d="M20.2499 8.41H8.48993V20.18H20.2499V8.41Z" fill="black"/>
+<path opacity="0.8" d="M43.7899 8.41H31.9999V20.18H43.7899V8.41Z" fill="black"/>
+<path opacity="0.8" d="M31.9999 20.18H20.2499V31.94H31.9999V20.18Z" fill="black"/>
+<path opacity="0.8" d="M55.5499 20.18H43.7899V31.94H55.5499V20.18Z" fill="black"/>
+<path opacity="0.8" d="M20.2499 31.94H8.48993V43.71H20.2499V31.94Z" fill="black"/>
+<path opacity="0.8" d="M43.7899 31.94H31.9999V43.71H43.7899V31.94Z" fill="black"/>
+<path opacity="0.8" d="M31.9999 43.71H20.2499V55.47H31.9999V43.71Z" fill="black"/>
+<path opacity="0.7" d="M58.34 36.33L33.59 33.51L36.5 58.37L58.34 36.33Z" fill="black"/>
+<path d="M58.5599 36.31L36.6099 36.26L36.4999 58.37L58.5599 36.31Z" fill="url(#paint2_linear)"/>
+<defs>
+<linearGradient id="paint0_linear" x1="5.43994" y1="31.94" x2="58.5999" y2="31.94" gradientUnits="userSpaceOnUse">
+<stop stop-color="#808080"/>
+<stop offset="1" stop-color="#E6E6E6"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="47.3099" y1="7.81" x2="10.4599" y2="45.42" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="48.2099" y1="35.51" x2="34.9299" y2="51.99" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TextureRenderTarget2D_16.svg b/Content/Slate/Starship/AssetIcons/TextureRenderTarget2D_16.svg
new file mode 100644
index 0000000..c036749
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TextureRenderTarget2D_16.svg
@@ -0,0 +1,16 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11 1H5V2H11V1Z" fill="white"/>
+<path opacity="0.5" d="M2 5H1V11H2V5Z" fill="white"/>
+<path opacity="0.5" d="M11 14H5V15H11V14Z" fill="white"/>
+<path opacity="0.5" d="M15 5H14V11H15V5Z" fill="white"/>
+<path opacity="0.5" d="M5 8H2V11H5V8Z" fill="white"/>
+<path opacity="0.5" d="M8 5H5V8H8V5Z" fill="white"/>
+<path opacity="0.5" d="M8 11H5V14H8V11Z" fill="white"/>
+<path opacity="0.5" d="M14 5H11V8H14V5Z" fill="white"/>
+<path opacity="0.5" d="M11 2H8V5H11V2Z" fill="white"/>
+<path opacity="0.5" d="M11 8H8V11H11V8Z" fill="white"/>
+<path d="M1.6 13.7L0 14.5L1.5 16L2.3 14.4L3.7 15.8L4 12L0.2 12.3L1.6 13.7Z" fill="white"/>
+<path d="M1.6 2.3L0 1.5L1.5 0L2.3 1.6L3.7 0.2L4 4L0.2 3.7L1.6 2.3Z" fill="white"/>
+<path d="M14.4 13.7L16 14.5L14.5 16L13.7 14.4L12.3 15.8L12 12L15.8 12.3L14.4 13.7Z" fill="white"/>
+<path d="M14.4 2.3L16 1.5L14.5 0L13.7 1.6L12.3 0.2L12 4L15.8 3.7L14.4 2.3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TextureRenderTarget2D_64.svg b/Content/Slate/Starship/AssetIcons/TextureRenderTarget2D_64.svg
new file mode 100644
index 0000000..80edec5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TextureRenderTarget2D_64.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TextureRenderTarget2D_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.3;fill:url(#SVGID_1_);}
+	.st1{fill:#262626;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:#FFFFFF;}
+	.st9{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="12.3419" y1="53.5975" x2="52.892" y2="11.0532">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<rect x="12" y="11.3" class="st0" width="41.1" height="42"/>
+	<path class="st1" d="M41.9,13.8h-9.3v9.3h9.3V13.8z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="23.3564" y1="23.2299" x2="32.4468" y2="13.6923">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st2" d="M32.6,13.8h-9.3v9.3h9.3V13.8z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="14.037" y1="32.5493" x2="23.1275" y2="23.0117">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st3" d="M23.2,23.1h-9.3v9.3h9.3V23.1z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="32.6758" y1="32.5493" x2="41.7662" y2="23.0117">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st4" d="M41.9,23.1h-9.3v9.3h9.3V23.1z"/>
+	<path class="st1" d="M32.6,23.1h-9.3v9.3h9.3V23.1z"/>
+	<path class="st1" d="M51.2,23.1h-9.3v9.3h9.3V23.1z"/>
+	<path class="st1" d="M23.2,32.4h-9.3v9.3h9.3V32.4z"/>
+	<path class="st1" d="M41.9,32.4h-9.3v9.3h9.3V32.4z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="23.3564" y1="41.8686" x2="32.4468" y2="32.3311">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st5" d="M32.6,32.4h-9.3v9.3h9.3V32.4z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="41.9951" y1="41.8686" x2="51.0856" y2="32.3311">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st6" d="M51.2,32.4h-9.3v9.3h9.3V32.4z"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="32.6758" y1="51.188" x2="41.7662" y2="41.6505">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</linearGradient>
+	<path class="st7" d="M41.9,41.8h-9.3v9.3h9.3V41.8z"/>
+	<path class="st1" d="M32.6,41.8h-9.3v9.3h9.3V41.8z"/>
+	<g>
+		<path class="st8" d="M18,8l0.8,9.8L9,17L18,8z"/>
+		
+			<rect x="10.3" y="10.3" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 30.6967 11.2987)" class="st8" width="5.4" height="3.5"/>
+	</g>
+	<g>
+		<path class="st8" d="M55.9,17l-9.8,0.8L46.9,8L55.9,17z"/>
+		
+			<rect x="49.2" y="10.3" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 80.1654 57.2192)" class="st8" width="5.4" height="3.5"/>
+	</g>
+	<g>
+		<path class="st8" d="M9,47l9.8-0.8L18,56L9,47z"/>
+		<rect x="10.3" y="50.3" transform="matrix(0.7071 0.7071 -0.7071 0.7071 40.5748 6.0302)" class="st8" width="5.4" height="3.5"/>
+	</g>
+	<g>
+		<path class="st8" d="M46.9,56l-0.8-9.8l9.8,0.8L46.9,56z"/>
+		
+			<rect x="49.2" y="50.3" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -21.5539 51.9507)" class="st8" width="5.4" height="3.5"/>
+	</g>
+	<rect x="0" class="st9" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TextureRenderTargetCube_16.svg b/Content/Slate/Starship/AssetIcons/TextureRenderTargetCube_16.svg
new file mode 100644
index 0000000..7d889ce
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TextureRenderTargetCube_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15 11.6008L9 15.2008V0.800781L15 4.50078V11.6008Z" fill="white"/>
+<path d="M2.8 13.0004L1 12.3004V9.40039L2.8 9.70039V13.0004Z" fill="white"/>
+<path d="M2.8 6.30098L1 6.60098V3.70098L2.8 3.00098V6.30098Z" fill="white"/>
+<path d="M5.2998 10L2.7998 9.7V6.3L5.2998 6V10Z" fill="white"/>
+<path d="M8.9998 15.2L5.2998 13.9V10L8.9998 10.4V15.2Z" fill="white"/>
+<path d="M8.9998 5.60078L5.2998 6.00078V2.10078L8.9998 0.800781V5.60078Z" fill="white"/>
+<g opacity="0.5">
+<path opacity="0.5" d="M8.8 1.00078V15.0008L1.2 12.2008V3.80078L8.8 1.00078ZM9 0.800781L1 3.70078V12.4008L9 15.3008V0.800781Z" fill="white"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TextureRenderTargetCube_64.svg b/Content/Slate/Starship/AssetIcons/TextureRenderTargetCube_64.svg
new file mode 100644
index 0000000..81f8ec6
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TextureRenderTargetCube_64.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TextureRenderTargetCube_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{opacity:0.5;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="11.3145" y1="31.9997" x2="34.6981" y2="31.9997">
+			<stop  offset="0" style="stop-color:#1A1A1A"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st0" d="M34.7,10.4v43.2l-23.4-9V19.4L34.7,10.4z"/>
+	</g>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="34.6981" y1="31.9997" x2="52.6855" y2="31.9997">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st1" d="M52.7,42.8l-18,10.8V10.4l18,11.1V42.8z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11.3145" y1="41.3656" x2="16.1111" y2="41.3656">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st2" d="M16.1,46.4l-4.8-1.8v-8.3l4.8,0.8V46.4z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11.3145" y1="22.6335" x2="16.1111" y2="22.6335">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st3" d="M16.1,26.9l-4.8,0.8v-8.3l4.8-1.8V26.9z"/>
+	<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="16.1113" y1="32.0003" x2="23.606" y2="32.0003">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st4" d="M23.6,38l-7.5-0.9V26.9l7.5-0.9V38z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="23.606" y1="45.7906" x2="34.6983" y2="45.7906">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st5" d="M34.7,53.6l-11.1-4.3V38l11.1,1.2V53.6z"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="23.606" y1="18.2093" x2="34.6983" y2="18.2093">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="1" style="stop-color:#CCCCCC"/>
+	</linearGradient>
+	<path class="st6" d="M34.7,24.8L23.6,26V14.7l11.1-4.3V24.8z"/>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TimeCodeSynchronizer_64.svg b/Content/Slate/Starship/AssetIcons/TimeCodeSynchronizer_64.svg
new file mode 100644
index 0000000..4af9af5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TimeCodeSynchronizer_64.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TimeCodeSynchronizer_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#DDDDDD;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:none;stroke:url(#SVGID_4_);stroke-miterlimit:10;}
+	.st6{fill:none;stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_8_);}
+	.st10{fill:#CCCCCC;}
+	.st11{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_9_);}
+	.st12{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_10_);}
+</style>
+<g>
+	<rect x="0" class="st0" width="64" height="64"/>
+	<g>
+		<path class="st1" d="M33.6,55.9H9.4c-1.8,0-3-1.2-3-2.9V29.7c0-1.7,1.2-2.9,3-2.9h24.2c1.8,0,3,1.2,3,2.9V53
+			C36.7,54.7,35.5,55.9,33.6,55.9z"/>
+		<path class="st1" d="M38.6,39.5v2.9c0,0.5,0.2,1,0.6,1.3l11.5,9.1c0.9,0.7,2.2,0,2.2-1.3V30.4c0-1.3-1.2-2-2.2-1.3l-11.5,9.1
+			C38.8,38.5,38.6,39,38.6,39.5z"/>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.615" y1="27.2455" x2="21.4451" y2="57.6657">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st2" d="M33.6,56.9H9.4c-1.8,0-3-1.2-3-2.9V30.7c0-1.7,1.2-2.9,3-2.9h24.2c1.8,0,3,1.2,3,2.9V54
+			C36.7,55.8,35.5,56.9,33.6,56.9z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="56.8569" y1="42.2241" x2="22.4667" y2="42.3235">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="0.5936" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st3" d="M38.6,40.8v2.9c0,0.5,0.2,1,0.6,1.3l11.5,9.1c0.9,0.7,2.2,0,2.2-1.3V31.7c0-1.3-1.2-2-2.2-1.3l-11.5,9.1
+			C38.8,39.8,38.6,40.3,38.6,40.8z"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="21.5446" y1="50.1012" x2="21.5164" y2="55.144">
+			<stop  offset="0" style="stop-color:#000000;stop-opacity:0"/>
+			<stop  offset="0.2075" style="stop-color:#000000;stop-opacity:0.3609"/>
+			<stop  offset="0.2299" style="stop-color:#000000;stop-opacity:0.4"/>
+			<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st4" d="M35.4,55.1H7.7c-0.7,0-1.3-0.6-1.3-1.3v-2.3c0-0.7,0.6-1.3,1.3-1.3h27.7c0.7,0,1.3,0.6,1.3,1.3v2.3
+			C36.7,54.5,36.1,55.1,35.4,55.1z"/>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="52.2845" y1="51.735" x2="52.2845" y2="51.735">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st5" d="M52.3,51.7"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="52.2845" y1="30.1509" x2="52.2845" y2="30.1509">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#DDDDDD;stop-opacity:0"/>
+		</linearGradient>
+		<path class="st6" d="M52.3,30.2"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="52.4769" y1="30.0379" x2="52.5126" y2="51.8088">
+			<stop  offset="0" style="stop-color:#DDDDDD"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<rect x="52.1" y="30.1" class="st7" width="0.7" height="21.7"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="36.3001" y1="28.1751" x2="36.3373" y2="50.8735">
+			<stop  offset="0" style="stop-color:#DDDDDD"/>
+			<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<polygon class="st8" points="36.7,50.9 36,50.9 36,28.2 36.7,29.3 		"/>
+	</g>
+	<g>
+		<radialGradient id="SVGID_8_" cx="47.8657" cy="14.8931" r="10.396" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<path class="st9" d="M47.9,25.3c-5.7,0-10.4-4.7-10.4-10.4S42.1,4.5,47.9,4.5s10.4,4.7,10.4,10.4S53.6,25.3,47.9,25.3z"/>
+		<path class="st10" d="M47.9,5.5c5.2,0,9.4,4.2,9.4,9.4s-4.2,9.4-9.4,9.4s-9.4-4.2-9.4-9.4S42.7,5.5,47.9,5.5 M47.9,3.5
+			c-6.3,0-11.4,5.1-11.4,11.4c0,6.3,5.1,11.4,11.4,11.4s11.4-5.1,11.4-11.4C59.3,8.6,54.2,3.5,47.9,3.5L47.9,3.5z"/>
+	</g>
+	<g>
+		<g>
+			<radialGradient id="SVGID_9_" cx="47.7358" cy="11.615" r="2.4241" gradientUnits="userSpaceOnUse">
+				<stop  offset="0" style="stop-color:#666666"/>
+				<stop  offset="1" style="stop-color:#4D4D4D"/>
+			</radialGradient>
+			<path class="st11" d="M47.7,15C47.7,15,47.7,15,47.7,15l0-6.9L47.7,15L47.7,15z"/>
+			<path class="st10" d="M47.7,7.1c-0.6,0-1,0.5-1,1V15c0,0.6,0.5,1,1,1s1-0.5,1-1V8.2C48.8,7.6,48.3,7.1,47.7,7.1L47.7,7.1z"/>
+		</g>
+		<g>
+			
+				<radialGradient id="SVGID_10_" cx="57.729" cy="18.1181" r="2.4083" gradientTransform="matrix(0 1 -0.9969 0 69.1923 -42.7248)" gradientUnits="userSpaceOnUse">
+				<stop  offset="0" style="stop-color:#666666"/>
+				<stop  offset="1" style="stop-color:#4D4D4D"/>
+			</radialGradient>
+			<polygon class="st12" points="47.7,15 54.5,15 54.5,15 			"/>
+			<path class="st10" d="M54.5,14h-6.8c-0.6,0-1,0.5-1,1s0.5,1,1,1h6.8c0.6,0,1-0.5,1-1S55.1,14,54.5,14L54.5,14z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TimecodeSynchronizer_16.svg b/Content/Slate/Starship/AssetIcons/TimecodeSynchronizer_16.svg
new file mode 100644
index 0000000..d476215
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TimecodeSynchronizer_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8 16H2C1.4 16 1 15.6 1 15V9C1 8.4 1.4 8 2 8H8C8.6 8 9 8.4 9 9V15C9 15.6 8.6 16 8 16Z" fill="white"/>
+<path opacity="0.5" d="M9.90039 11.3996V12.5996L14.0004 15.3996V8.59961L9.90039 11.3996Z" fill="white"/>
+<path d="M12 0C9.8 0 8 1.8 8 4C8 6.2 9.8 8 12 8C14.2 8 16 6.2 16 4C16 1.8 14.2 0 12 0ZM12 7.1C10.3 7.1 8.9 5.7 8.9 4C8.9 2.3 10.3 0.9 12 0.9C13.7 0.9 15.1 2.3 15.1 4C15.1 5.7 13.7 7.1 12 7.1Z" fill="white"/>
+<path d="M13.7996 4.89922H11.0996V2.19922H11.9996V3.99922H13.7996V4.89922Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TouchInterface_16.svg b/Content/Slate/Starship/AssetIcons/TouchInterface_16.svg
new file mode 100644
index 0000000..d6a23c3
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TouchInterface_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 0H3C2.4 0 2 0.4 2 1V15C2 15.6 2.4 16 3 16H13C13.6 16 14 15.6 14 15V1C14 0.4 13.6 0 13 0ZM8 15.5C7.2 15.5 6.5 14.8 6.5 14C6.5 13.2 7.2 12.5 8 12.5C8.8 12.5 9.5 13.2 9.5 14C9.5 14.8 8.8 15.5 8 15.5ZM13 12H3V1H13V12Z" fill="white"/>
+<path opacity="0.5" d="M13 1H3V12H13V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TouchInterface_64.svg b/Content/Slate/Starship/AssetIcons/TouchInterface_64.svg
new file mode 100644
index 0000000..8cc22b9
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TouchInterface_64.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TouchInterface_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#F2F2F2;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<path class="st0" d="M46.7,8.9H18.2c-1.7,0-2.8,1.1-2.8,2.8v39.9c0,1.7,1.1,2.8,2.8,2.8h28.5c1.7,0,2.8-1.1,2.8-2.8V11.7
+		C49.5,10,48.4,8.9,46.7,8.9z M46.7,43.1H18.2V11.7h28.5V43.1z"/>
+	<g>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.3257" y1="55.2" x2="32.5262" y2="9.4829">
+				<stop  offset="0" style="stop-color:#F2F2F2"/>
+				<stop  offset="1" style="stop-color:#B3B3B3"/>
+			</linearGradient>
+			<path class="st1" d="M46.7,9.5H18.2c-1.7,0-2.8,1.1-2.8,2.8v39.9c0,1.7,1.1,2.8,2.8,2.8h28.5c1.7,0,2.8-1.1,2.8-2.8V12.4
+				C49.5,10.7,48.4,9.5,46.7,9.5z M46.7,43.7H18.2V12.4h28.5V43.7z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.3588" y1="43.3743" x2="32.4909" y2="13.247">
+				<stop  offset="0" style="stop-color:#999999"/>
+				<stop  offset="1" style="stop-color:#666666"/>
+			</linearGradient>
+			<path class="st2" d="M46.7,12.4H18.2v31.3h28.5V12.4z"/>
+		</g>
+		<radialGradient id="SVGID_3_" cx="31.8876" cy="49.4528" r="3.5677" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#4D4D4D"/>
+		</radialGradient>
+		<circle class="st3" cx="31.9" cy="49.5" r="3.6"/>
+	</g>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerBase_16.svg b/Content/Slate/Starship/AssetIcons/TriggerBase_16.svg
new file mode 100644
index 0000000..f5e160c
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerBase_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12.5999 7.69971C12.5999 9.29971 10.5999 10.5997 7.9999 10.5997C5.3999 10.5997 3.3999 9.29971 3.3999 7.69971C3.3999 6.89971 3.3999 5.99976 3.3999 5.99976L7.9999 4.7998L12.5999 5.99976C12.5999 5.99976 12.5999 6.99971 12.5999 7.69971Z" fill="white"/>
+<path d="M7.9999 8.30005C10.5404 8.30005 12.5999 7.00165 12.5999 5.40002C12.5999 3.7984 10.5404 2.5 7.9999 2.5C5.45939 2.5 3.3999 3.7984 3.3999 5.40002C3.3999 7.00165 5.45939 8.30005 7.9999 8.30005Z" fill="white"/>
+<path d="M14 5.7002V6.50024C14.5 7.10024 14.9 7.90022 14.9 8.60022C14.9 11.0002 11.8 13.0002 8 13.0002C4.2 13.0002 1.1 11.0002 1.1 8.60022C1.1 7.80022 1.4 7.10024 2 6.50024V5.7002C0.8 6.6002 0 7.80022 0 9.10022C0 11.9002 3.6 14.2002 8 14.2002C12.4 14.2002 16 11.9002 16 9.10022C16 7.80022 15.2 6.6002 14 5.7002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerBase_64.svg b/Content/Slate/Starship/AssetIcons/TriggerBase_64.svg
new file mode 100644
index 0000000..0eaa928
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerBase_64.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TriggerBase_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st4{fill:#FFFFFF;}
+	.st5{fill:none;}
+</style>
+<g>
+	<radialGradient id="SVGID_1_" cx="32.2562" cy="41.7892" r="18.3555" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</radialGradient>
+	<path class="st0" d="M49.3,29.2v2.3c1.4,1.7,2.6,4,2.6,6c0,6.8-8.8,12.5-19.6,12.5s-19.6-5.7-19.6-12.5c0-2.3,0.9-4.3,2.6-6v-2.3
+		c-3.4,2.6-5.7,6-5.7,9.7c0,7.9,10.2,15.5,22.7,15.5S55,46.8,55,38.9C55,35.2,52.7,31.8,49.3,29.2z"/>
+	<radialGradient id="SVGID_2_" cx="32.9442" cy="28.6571" r="22.3545" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</radialGradient>
+	<ellipse class="st1" cx="32.5" cy="36.6" rx="20.4" ry="13.9"/>
+	
+		<radialGradient id="SVGID_3_" cx="32.1384" cy="36.2927" r="14.4946" gradientTransform="matrix(1 -4.464241e-03 2.810380e-03 0.6295 -0.1017 13.589)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0.7462" style="stop-color:#000000;stop-opacity:0.5"/>
+		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+	</radialGradient>
+	<path class="st2" d="M45.3,30.4c0-4.5-5.8-8.2-13.1-8.2s-13.1,3.7-13.1,8.2c0,0.6,0.1,1.1,0.3,1.6l-0.3,0.1c0,0,0,2.6,0,4.8
+		c0,4.5,5.7,8.2,13.1,8.2s13.1-3.7,13.1-8.2c0-2,0-4.8,0-4.8L45.1,32C45.2,31.5,45.3,30.9,45.3,30.4z"/>
+	<g>
+		<radialGradient id="SVGID_4_" cx="32.2562" cy="34.901" r="10.9172" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</radialGradient>
+		<path class="st3" d="M45.3,34.9c0,4.5-5.7,8.2-13.1,8.2c-7.4,0-13.1-3.7-13.1-8.2c0-2.3,0-4.8,0-4.8l13.1-3.4l13.1,3.4
+			C45.3,30.1,45.3,32.9,45.3,34.9z"/>
+		<path class="st4" d="M32.3,37.5c7.2,0,13.1-3.7,13.1-8.2c0-4.5-5.8-8.2-13.1-8.2s-13.1,3.7-13.1,8.2C19.2,33.8,25,37.5,32.3,37.5z
+			"/>
+	</g>
+	<rect x="0" class="st5" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerBox_16.svg b/Content/Slate/Starship/AssetIcons/TriggerBox_16.svg
new file mode 100644
index 0000000..364ae50
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerBox_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 6.7002V7.50024C14.5 8.10024 14.9 8.90022 14.9 9.60022C14.9 12.0002 11.8 14.0002 8 14.0002C4.2 14.0002 1.1 12.0002 1.1 9.60022C1.1 8.80022 1.4 8.10024 2 7.50024V6.7002C0.8 7.6002 0 8.80022 0 10.1002C0 12.9002 3.6 15.2002 8 15.2002C12.4 15.2002 16 12.9002 16 10.1002C16 8.80022 15.2 7.6002 14 6.7002Z" fill="white"/>
+<path d="M9 0L3 3V9.5L9 12V0Z" fill="white"/>
+<path opacity="0.5" d="M13 9.30005L9 12V0L13 3V9.30005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerBox_64.svg b/Content/Slate/Starship/AssetIcons/TriggerBox_64.svg
new file mode 100644
index 0000000..a91d098
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerBox_64.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TriggerBox_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{opacity:0.5;fill:url(#SVGID_3_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_5_);enable-background:new    ;}
+	.st5{fill:none;}
+</style>
+<g>
+	<g>
+		<radialGradient id="SVGID_1_" cx="32.2562" cy="41.8056" r="18.3555" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</radialGradient>
+		<path class="st0" d="M49.3,29.2v2.3c1.4,1.7,2.6,4,2.6,6C51.8,44.3,43,50,32.3,50s-19.6-5.7-19.6-12.5c0-2.3,0.9-4.3,2.6-6v-2.3
+			c-3.4,2.6-5.7,6-5.7,9.7c0,7.9,10.2,15.5,22.7,15.5S55,46.8,55,38.9C55,35.2,52.7,31.8,49.3,29.2z"/>
+		<radialGradient id="SVGID_2_" cx="33.8833" cy="27.9595" r="23.3822" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<ellipse class="st1" cx="32.5" cy="36.6" rx="20.4" ry="13.9"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32.5123" y1="31.1637" x2="32.5123" y2="42.9894">
+		<stop  offset="0" style="stop-color:#1A1A1A"/>
+		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st2" points="34.6,10.5 16.5,17.5 16.5,35.2 34.6,43.9 48.5,34 48.5,19.1 	"/>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="16.4996" y1="25.0966" x2="34.601" y2="25.0966">
+			<stop  offset="0" style="stop-color:#CCCCCC"/>
+			<stop  offset="1" style="stop-color:#F2F2F2"/>
+		</linearGradient>
+		<path class="st3" d="M34.6,8.4v33.4l-18.1-7V15.3L34.6,8.4z"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="34.601" y1="25.0966" x2="48.5251" y2="25.0966">
+			<stop  offset="0" style="stop-color:#B3B3B3"/>
+			<stop  offset="1" style="stop-color:#666666"/>
+		</linearGradient>
+		<path class="st4" d="M48.5,33.5l-13.9,8.4V8.4L48.5,17V33.5z"/>
+	</g>
+	<rect x="0" class="st5" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerCapsule_16.svg b/Content/Slate/Starship/AssetIcons/TriggerCapsule_16.svg
new file mode 100644
index 0000000..b373d7a
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerCapsule_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 6V6.5C14.1 7.3 14.9 8.3 14.9 9.5C14.9 12 11.8 14 8 14C4.2 14 1.1 12 1.1 9.6C1.1 8.4 1.8 7.4 3 6.6V6C1.2 6.9 0 8.4 0 10C0 12.8 3.6 15.1 8 15.1C12.4 15.1 16 12.8 16 10C16 8.4 14.8 7 13 6Z" fill="white"/>
+<path opacity="0.5" d="M9 12H7C5.3 12 4 10.7 4 9V3.5C4 1.6 5.6 0 7.5 0H8.5C10.4 0 12 1.6 12 3.5V9C12 10.7 10.7 12 9 12Z" fill="white"/>
+<path d="M9.2 3.0998C9.2 2.9998 9.1 2.8998 9 2.7998C9.1 2.8998 9.2 2.9998 9.2 3.0998Z" fill="white"/>
+<path d="M8.7 2H7C7 2 9 3 9 4.5V7.5L10 9V3.6C10 2.7 9.4 2 8.7 2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerCapsule_64.svg b/Content/Slate/Starship/AssetIcons/TriggerCapsule_64.svg
new file mode 100644
index 0000000..3bd4af5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerCapsule_64.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TriggerCapsule_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{opacity:0.5;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st4{fill:none;}
+</style>
+<g>
+	<radialGradient id="SVGID_1_" cx="32.2562" cy="41.9049" r="18.3555" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#B3B3B3"/>
+	</radialGradient>
+	<path class="st0" d="M49.3,29.3v2.3c1.4,1.7,2.6,4,2.6,6c0,6.8-8.8,12.5-19.6,12.5s-19.6-5.7-19.6-12.5c0-2.3,0.9-4.3,2.6-6v-2.3
+		c-3.4,2.6-5.7,6-5.7,9.7c0,7.9,10.2,15.5,22.7,15.5S55,46.9,55,39C55,35.3,52.7,31.9,49.3,29.3z"/>
+	<radialGradient id="SVGID_2_" cx="33.0706" cy="28.1518" r="22.2202" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</radialGradient>
+	<ellipse class="st1" cx="32.5" cy="36.7" rx="20.4" ry="13.9"/>
+	
+		<radialGradient id="SVGID_3_" cx="31.9584" cy="37.28" r="9.6921" gradientTransform="matrix(0.9999 -1.457705e-02 9.443201e-03 0.6477 -0.3486 13.598)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0.7944" style="stop-color:#000000"/>
+		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+	</radialGradient>
+	<path class="st2" d="M31.9,43.5c5.2,0,9.4-2.5,9.4-5.5c0-3-4.2-5.5-9.4-5.5S22.4,35,22.4,38C22.4,41,26.7,43.5,31.9,43.5z"/>
+	<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="39.1683" y1="23.8879" x2="19.8852" y2="24.1989">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="0.599" style="stop-color:#666666"/>
+		<stop  offset="1" style="stop-color:#999999"/>
+	</linearGradient>
+	<path class="st3" d="M29.2,40.7c-3.8,0-6.8-3.3-6.8-7.6V14.9c0-4.2,3-7.6,6.8-7.6h5.4c3.8,0,6.8,3.3,6.8,7.6v18.2
+		c0,4.2-3,7.6-6.8,7.6H29.2z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerSphere_16.svg b/Content/Slate/Starship/AssetIcons/TriggerSphere_16.svg
new file mode 100644
index 0000000..b1e7b65
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerSphere_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.6 7.09961L14.4 7.99961C14.7 8.49961 14.9 8.99961 14.9 9.59961C14.9 11.9996 11.8 13.9996 8 13.9996C4.2 13.9996 1.1 11.9996 1.1 9.59961C1.1 8.99961 1.3 8.49961 1.6 7.99961L1.4 7.09961C0.5 7.99961 0 8.99961 0 10.0996C0 12.8996 3.6 15.1996 8 15.1996C12.4 15.1996 16 12.8996 16 10.0996C16 8.99961 15.5 7.99961 14.6 7.09961Z" fill="white"/>
+<path opacity="0.5" d="M8 0.5C5 0.5 2.5 3 2.5 6C2.5 9 5 11.5 8 11.5C11 11.5 13.5 9 13.5 6C13.5 3 11 0.5 8 0.5Z" fill="white"/>
+<path d="M9.5998 6.19961C10.5939 6.19961 11.3998 5.39372 11.3998 4.39961C11.3998 3.4055 10.5939 2.59961 9.5998 2.59961C8.60569 2.59961 7.7998 3.4055 7.7998 4.39961C7.7998 5.39372 8.60569 6.19961 9.5998 6.19961Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerSphere_64.svg b/Content/Slate/Starship/AssetIcons/TriggerSphere_64.svg
new file mode 100644
index 0000000..251bf38
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerSphere_64.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TriggerSphere_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{opacity:0.5;fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:none;}
+</style>
+<g>
+	<g>
+		<radialGradient id="SVGID_1_" cx="32.2562" cy="41.9124" r="18.3555" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</radialGradient>
+		<path class="st0" d="M49.3,29.3v2.3c1.4,1.7,2.6,4,2.6,6c0,6.8-8.8,12.5-19.6,12.5s-19.6-5.7-19.6-12.5c0-2.3,0.9-4.3,2.6-6v-2.3
+			c-3.4,2.6-5.7,6-5.7,9.7c0,7.9,10.2,15.5,22.7,15.5S55,46.9,55,39C55,35.3,52.7,31.9,49.3,29.3z"/>
+		<radialGradient id="SVGID_2_" cx="32.2794" cy="28.4473" r="22.7644" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<ellipse class="st1" cx="32.5" cy="36.7" rx="20.4" ry="13.9"/>
+	</g>
+	
+		<radialGradient id="SVGID_3_" cx="32.3688" cy="35.7056" r="13.5715" gradientTransform="matrix(0.9999 -1.457705e-02 9.443201e-03 0.6477 -0.3337 13.0493)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0.7944" style="stop-color:#000000"/>
+		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+	</radialGradient>
+	<path class="st2" d="M32.3,44.4c7.3,0,13.2-3.4,13.2-7.7S39.6,29,32.3,29S19,32.5,19,36.7S25,44.4,32.3,44.4z"/>
+	<radialGradient id="SVGID_4_" cx="35.597" cy="20.6512" r="20.9885" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.3121" style="stop-color:#B3B3B3"/>
+		<stop  offset="0.6357" style="stop-color:#6A6A6A"/>
+		<stop  offset="0.7861" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</radialGradient>
+	<path class="st3" d="M32.2,41.7c8.1,0,14.8-6.6,14.8-14.8s-6.6-14.8-14.8-14.8s-14.8,6.6-14.8,14.8S24.1,41.7,32.2,41.7z"/>
+	<rect x="0" class="st4" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerVolume_16.svg b/Content/Slate/Starship/AssetIcons/TriggerVolume_16.svg
new file mode 100644
index 0000000..ebc3415
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerVolume_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 6.7002V7.50024C14.5 8.10024 14.9 8.90034 14.9 9.60034C14.9 12.0003 11.8 14.0002 8 14.0002C4.2 14.0002 1.1 12.0003 1.1 9.60034C1.1 8.80034 1.4 8.10024 2 7.50024V6.7002C0.8 7.6002 0 8.80034 0 10.1003C0 12.9003 3.6 15.2002 8 15.2002C12.4 15.2002 16 12.9003 16 10.1003C16 8.80034 15.2 7.6002 14 6.7002Z" fill="white"/>
+<path opacity="0.5" d="M4.9 0L3 2H11V10L13 8V0H4.9Z" fill="white"/>
+<path d="M11 9H4V2H3V10H11V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/TriggerVolume_64.svg b/Content/Slate/Starship/AssetIcons/TriggerVolume_64.svg
new file mode 100644
index 0000000..416cb65
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/TriggerVolume_64.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="TriggerVolume_x5F_64_1_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);enable-background:new    ;}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{opacity:0.7;fill:url(#SVGID_3_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_4_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_5_);enable-background:new    ;}
+	.st5{fill:none;stroke:url(#SVGID_6_);stroke-miterlimit:10;}
+	.st6{fill:none;stroke:url(#SVGID_7_);stroke-miterlimit:10;}
+	.st7{fill:none;stroke:#898989;stroke-miterlimit:10;}
+	.st8{fill:none;}
+</style>
+<g>
+	<g>
+		<radialGradient id="SVGID_1_" cx="32.2562" cy="41.8056" r="18.3555" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#B3B3B3"/>
+		</radialGradient>
+		<path class="st0" d="M49.3,29.2v2.3c1.4,1.7,2.6,4,2.6,6C51.8,44.3,43,50,32.3,50s-19.6-5.7-19.6-12.5c0-2.3,0.9-4.3,2.6-6v-2.3
+			c-3.4,2.6-5.7,6-5.7,9.7c0,7.9,10.2,15.5,22.7,15.5S55,46.8,55,38.9C55,35.2,52.7,31.8,49.3,29.2z"/>
+		<radialGradient id="SVGID_2_" cx="33.8833" cy="27.9595" r="23.3822" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#666666"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</radialGradient>
+		<ellipse class="st1" cx="32.5" cy="36.6" rx="20.4" ry="13.9"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="32.5635" y1="31.1637" x2="32.5635" y2="42.9894">
+		<stop  offset="0" style="stop-color:#1A1A1A"/>
+		<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st2" points="34.6,10.5 16.5,17.5 16,35.4 34.6,43.9 49.1,34.1 48.5,19.1 	"/>
+	<g>
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="33.8934" y1="25.0938" x2="17.1548" y2="25.0285">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st3" d="M34.6,8.4v33.4l-18.1-7V15.3L34.6,8.4z"/>
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="34.601" y1="25.0966" x2="48.5251" y2="25.0966">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#333333"/>
+		</linearGradient>
+		<path class="st4" d="M48.5,33.5l-13.9,8.4V8.4L48.5,17V33.5z"/>
+	</g>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="16.4142" y1="33.4333" x2="48.5697" y2="33.4333">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="9.607756e-02" style="stop-color:#545454;stop-opacity:0.8325"/>
+		<stop  offset="0.347" style="stop-color:#616161;stop-opacity:0.3951"/>
+		<stop  offset="0.5736" style="stop-color:#666666;stop-opacity:0"/>
+		<stop  offset="0.9873" style="stop-color:#666666"/>
+	</linearGradient>
+	<polyline class="st5" points="16.5,34.8 32.7,32 48.5,33.5 	"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="17.1528" y1="16.6065" x2="48.1998" y2="16.6065">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="3.453219e-02" style="stop-color:#505050;stop-opacity:0.9326"/>
+		<stop  offset="0.3061" style="stop-color:#606060;stop-opacity:0.4029"/>
+		<stop  offset="0.5127" style="stop-color:#666666;stop-opacity:0"/>
+		<stop  offset="0.9873" style="stop-color:#666666"/>
+	</linearGradient>
+	<polyline class="st6" points="17.2,15.8 32.7,17.4 48.2,17.1 	"/>
+	<polygon class="st7" points="16.5,15.6 34.6,8.4 48.5,17 48.5,33.5 34.6,41.8 16.5,34.8 	"/>
+	<line class="st7" x1="34.6" y1="8.4" x2="34.6" y2="41.8"/>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Tutorials_16.svg b/Content/Slate/Starship/AssetIcons/Tutorials_16.svg
new file mode 100644
index 0000000..8df280e
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Tutorials_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 4.8L8.5 9.5L1 4.8L8.5 0L16 4.8Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.5002 11.3992L4.3002 8.69922C4.2002 8.99922 4.2002 9.29922 4.2002 9.69922C4.2002 12.0992 6.1002 13.9992 8.5002 13.9992C10.9002 13.9992 12.8002 12.0992 12.8002 9.69922C12.8002 9.39922 12.8002 8.99922 12.7002 8.69922L8.5002 11.3992Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 16H0L1 7H2L3 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocal_64.svg b/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocal_64.svg
new file mode 100644
index 0000000..a2ce1a8
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocal_64.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="UserDefinedCaptureProtocal_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#B2B2B2;enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#CCCCCC;enable-background:new    ;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#E6E6E6;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st9{fill:url(#SVGID_6_);}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<path class="st1" d="M10.2,10h9.4V6.9H7.1v9.4h3.1V10z"/>
+<path class="st2" d="M39.6,21.6H24.8c-0.9,0-1.5-1.3-1.1-2.3l1.9-4.9c0.2-0.5,0.6-0.9,1.1-0.9h11c0.5,0,0.9,0.3,1.1,0.9l1.9,4.9
+	C41.1,20.3,40.5,21.6,39.6,21.6z"/>
+<path class="st1" d="M54.2,10v6.3h3.1V6.9H44.8V10H54.2z"/>
+<path class="st1" d="M54.2,54h-9.4v3.1h12.6v-9.4h-3.1V54z"/>
+<path class="st1" d="M10.2,54v-6.3H7.1v9.4h12.6V54H10.2z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.2157" y1="21.5531" x2="32.2157" y2="13.6053">
+	<stop  offset="0" style="stop-color:#808080"/>
+	<stop  offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<path class="st3" d="M39.6,22.2H24.8c-0.9,0-1.5-1.3-1.1-2.3l1.9-4.9c0.2-0.5,0.6-0.9,1.1-0.9h11c0.5,0,0.9,0.3,1.1,0.9l1.9,4.9
+	C41.1,20.9,40.5,22.2,39.6,22.2z"/>
+<path class="st4" d="M49.8,18.6H14.6c-2.5,0-4.4,1.9-4.4,4.4v19.1c0,2.8,1.9,4.7,4.4,4.7h34.8c2.5,0,4.4-1.9,4.4-4.4V23
+	C54.2,20.5,52.3,18.6,49.8,18.6z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.0759" y1="47.6942" x2="32.0759" y2="19.4447">
+	<stop  offset="0.4518" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path class="st5" d="M49.8,19.4H14.6c-2.5,0-4.4,1.9-4.4,4.4V43c0,2.8,1.9,4.7,4.4,4.7h34.8c2.5,0,4.4-1.9,4.4-4.4V23.8
+	C54.2,21.3,52.3,19.4,49.8,19.4z"/>
+<radialGradient id="SVGID_3_" cx="16.5788" cy="25.7698" r="4.5004" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.6193" style="stop-color:#808080"/>
+	<stop  offset="1" style="stop-color:#4D4D4D"/>
+</radialGradient>
+<circle class="st6" cx="16.6" cy="25.8" r="4.5"/>
+<radialGradient id="SVGID_4_" cx="33.7456" cy="33.3321" r="11.1643" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.6193" style="stop-color:#808080"/>
+	<stop  offset="1" style="stop-color:#4D4D4D"/>
+</radialGradient>
+<circle class="st7" cx="33.7" cy="33.3" r="11.2"/>
+<g>
+	<radialGradient id="SVGID_5_" cx="33.7456" cy="33.3321" r="8.5793" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</radialGradient>
+	<circle class="st8" cx="33.7" cy="33.3" r="8.6"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="33.7456" y1="41.9113" x2="33.7456" y2="24.7528">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st9" d="M33.7,26.8c3.6,0,6.6,3,6.6,6.6s-3,6.6-6.6,6.6s-6.6-3-6.6-6.6S30.1,26.8,33.7,26.8 M33.7,24.8
+		c-4.7,0-8.6,3.8-8.6,8.6s3.8,8.6,8.6,8.6s8.6-3.8,8.6-8.6S38.5,24.8,33.7,24.8L33.7,24.8z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocol_16.svg b/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocol_16.svg
new file mode 100644
index 0000000..8ab6c07
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocol_16.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 1H4V0H0V3H1V1Z" fill="white"/>
+<path opacity="0.5" d="M15 1V3H16V0H12V1H15Z" fill="white"/>
+<path opacity="0.5" d="M15 15H12V16H16V13H15V15Z" fill="white"/>
+<path opacity="0.5" d="M1 15V13H0V16H4V15H1Z" fill="white"/>
+<path opacity="0.5" d="M8.5 10.5C9.60457 10.5 10.5 9.60457 10.5 8.5C10.5 7.39543 9.60457 6.5 8.5 6.5C7.39543 6.5 6.5 7.39543 6.5 8.5C6.5 9.60457 7.39543 10.5 8.5 10.5Z" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M11 4H5L6 2H10L11 4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.6 4H2.4C1.6 4 1 4.6 1 5.4V11.5C1 12.4 1.6 13 2.4 13H13.5C14.3 13 14.9 12.4 14.9 11.6V5.4C15 4.6 14.4 4 13.6 4ZM3 7.5C2.2 7.5 1.5 6.8 1.5 6C1.5 5.2 2.2 4.5 3 4.5C3.8 4.5 4.5 5.2 4.5 6C4.5 6.8 3.8 7.5 3 7.5ZM8.5 12C6.6 12 5 10.4 5 8.5C5 6.6 6.6 5 8.5 5C10.4 5 12 6.6 12 8.5C12 10.4 10.4 12 8.5 12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocol_64.svg b/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocol_64.svg
new file mode 100644
index 0000000..a2ce1a8
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserDefinedCaptureProtocol_64.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="UserDefinedCaptureProtocal_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#B2B2B2;enable-background:new    ;}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:#CCCCCC;enable-background:new    ;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:#E6E6E6;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
+	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
+	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_5_);}
+	.st9{fill:url(#SVGID_6_);}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<path class="st1" d="M10.2,10h9.4V6.9H7.1v9.4h3.1V10z"/>
+<path class="st2" d="M39.6,21.6H24.8c-0.9,0-1.5-1.3-1.1-2.3l1.9-4.9c0.2-0.5,0.6-0.9,1.1-0.9h11c0.5,0,0.9,0.3,1.1,0.9l1.9,4.9
+	C41.1,20.3,40.5,21.6,39.6,21.6z"/>
+<path class="st1" d="M54.2,10v6.3h3.1V6.9H44.8V10H54.2z"/>
+<path class="st1" d="M54.2,54h-9.4v3.1h12.6v-9.4h-3.1V54z"/>
+<path class="st1" d="M10.2,54v-6.3H7.1v9.4h12.6V54H10.2z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.2157" y1="21.5531" x2="32.2157" y2="13.6053">
+	<stop  offset="0" style="stop-color:#808080"/>
+	<stop  offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<path class="st3" d="M39.6,22.2H24.8c-0.9,0-1.5-1.3-1.1-2.3l1.9-4.9c0.2-0.5,0.6-0.9,1.1-0.9h11c0.5,0,0.9,0.3,1.1,0.9l1.9,4.9
+	C41.1,20.9,40.5,22.2,39.6,22.2z"/>
+<path class="st4" d="M49.8,18.6H14.6c-2.5,0-4.4,1.9-4.4,4.4v19.1c0,2.8,1.9,4.7,4.4,4.7h34.8c2.5,0,4.4-1.9,4.4-4.4V23
+	C54.2,20.5,52.3,18.6,49.8,18.6z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.0759" y1="47.6942" x2="32.0759" y2="19.4447">
+	<stop  offset="0.4518" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#666666"/>
+</linearGradient>
+<path class="st5" d="M49.8,19.4H14.6c-2.5,0-4.4,1.9-4.4,4.4V43c0,2.8,1.9,4.7,4.4,4.7h34.8c2.5,0,4.4-1.9,4.4-4.4V23.8
+	C54.2,21.3,52.3,19.4,49.8,19.4z"/>
+<radialGradient id="SVGID_3_" cx="16.5788" cy="25.7698" r="4.5004" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.6193" style="stop-color:#808080"/>
+	<stop  offset="1" style="stop-color:#4D4D4D"/>
+</radialGradient>
+<circle class="st6" cx="16.6" cy="25.8" r="4.5"/>
+<radialGradient id="SVGID_4_" cx="33.7456" cy="33.3321" r="11.1643" gradientUnits="userSpaceOnUse">
+	<stop  offset="0.6193" style="stop-color:#808080"/>
+	<stop  offset="1" style="stop-color:#4D4D4D"/>
+</radialGradient>
+<circle class="st7" cx="33.7" cy="33.3" r="11.2"/>
+<g>
+	<radialGradient id="SVGID_5_" cx="33.7456" cy="33.3321" r="8.5793" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</radialGradient>
+	<circle class="st8" cx="33.7" cy="33.3" r="8.6"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="33.7456" y1="41.9113" x2="33.7456" y2="24.7528">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<path class="st9" d="M33.7,26.8c3.6,0,6.6,3,6.6,6.6s-3,6.6-6.6,6.6s-6.6-3-6.6-6.6S30.1,26.8,33.7,26.8 M33.7,24.8
+		c-4.7,0-8.6,3.8-8.6,8.6s3.8,8.6,8.6,8.6s8.6-3.8,8.6-8.6S38.5,24.8,33.7,24.8L33.7,24.8z"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserDefinedEnum_16.svg b/Content/Slate/Starship/AssetIcons/UserDefinedEnum_16.svg
new file mode 100644
index 0000000..0f4cc79
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserDefinedEnum_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 5V0H2V16H14V5H9ZM3.2 4.4L4.5 4H4.6V7H4V4.7L3.2 4.9V4.4ZM4.7 14.8C4.6 14.9 4.3 15 4 15C3.7 15 3.5 14.9 3.3 14.8C3.1 14.6 3 14.4 3 14.2H3.6C3.6 14.3 3.6 14.4 3.7 14.5C3.8 14.6 3.9 14.6 4 14.6C4.1 14.6 4.2 14.6 4.3 14.5C4.4 14.4 4.4 14.3 4.4 14.2C4.4 13.9 4.2 13.8 3.9 13.8H3.7V13.3H4C4.1 13.3 4.3 13.3 4.3 13.2C4.4 13.1 4.4 13 4.4 12.9C4.4 12.8 4.4 12.7 4.3 12.6C4.2 12.5 4.1 12.5 4 12.5C3.9 12.5 3.8 12.5 3.7 12.6C3.6 12.7 3.6 12.7 3.6 12.8H3C3 12.6 3 12.5 3.1 12.4C3.2 12.3 3.3 12.2 3.4 12.1C3.7 12 3.8 12 4 12C4.3 12 4.6 12.1 4.7 12.2C4.9 12.4 5 12.6 5 12.8C5 12.9 5 13.1 4.9 13.2C4.8 13.3 4.7 13.4 4.6 13.5C4.8 13.6 4.9 13.6 5 13.8C5 13.8 5 14 5 14.1C5 14.4 4.9 14.6 4.7 14.8ZM5.1 11H3.1V10.6L4.1 9.6C4.2 9.5 4.3 9.3 4.4 9.2C4.4 9.1 4.4 9 4.4 8.9C4.4 8.8 4.4 8.7 4.3 8.6C4.2 8.5 4.1 8.5 4 8.5C3.9 8.5 3.8 8.5 3.7 8.6C3.6 8.7 3.6 8.8 3.6 9H3C3 8.8 3 8.7 3.1 8.5C3.2 8.4 3.3 8.2 3.5 8.1C3.7 8 3.8 8 4 8C4.3 8 4.5 8.1 4.7 8.2C4.9 8.4 5 8.6 5 8.8C5 9 5 9.1 4.9 9.3C4.8 9.4 4.7 9.6 4.5 9.8L3.8 10.5H5.1V11ZM12 15H6V14H12V15ZM12 11H6V10H12V11ZM12 7H6V6H12V7Z" fill="white"/>
+<path d="M9 0H8L14 6V5L9 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserDefinedEnum_64.svg b/Content/Slate/Starship/AssetIcons/UserDefinedEnum_64.svg
new file mode 100644
index 0000000..8e93bb1
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserDefinedEnum_64.svg
@@ -0,0 +1,39 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M50.6 54.46H16.24V8.72H36.85L50.6 23.27V54.46Z" fill="url(#paint0_linear)"/>
+<path d="M36.77 11.15L47.7 22.89H36.82L36.77 11.15Z" fill="url(#paint1_linear)"/>
+<path d="M22.0684 28.59H21.1247V22.3347L19.2324 23.0297V22.1774L21.9212 21.1678H22.0684V28.59Z" fill="black"/>
+<path d="M23.8237 39.86H18.9838V39.1853L21.5407 36.3443C21.9195 35.9147 22.18 35.5664 22.322 35.2992C22.4675 35.0286 22.5402 34.7496 22.5402 34.4621C22.5402 34.0765 22.4235 33.7603 22.1901 33.5134C21.9567 33.2665 21.6456 33.143 21.2566 33.143C20.7899 33.143 20.4263 33.2766 20.1659 33.5438C19.9088 33.8076 19.7803 34.1763 19.7803 34.6498H18.8418C18.8418 33.97 19.0599 33.4204 19.4962 33.001C19.9359 32.5816 20.5227 32.3719 21.2566 32.3719C21.9432 32.3719 22.4861 32.5529 22.8852 32.9147C23.2842 33.2733 23.4838 33.7518 23.4838 34.3505C23.4838 35.0776 23.0204 35.9435 22.0937 36.948L20.1152 39.094H23.8237V39.86Z" fill="black"/>
+<path d="M20.3485 46.9801H21.0537C21.4968 46.9733 21.8451 46.8566 22.0988 46.63C22.3525 46.4034 22.4793 46.0973 22.4793 45.7118C22.4793 44.8459 22.0481 44.413 21.1856 44.413C20.7798 44.413 20.4551 44.5297 20.2116 44.7631C19.9714 44.9931 19.8514 45.2992 19.8514 45.6813H18.9128C18.9128 45.0962 19.1259 44.6109 19.552 44.2253C19.9816 43.8364 20.5261 43.6419 21.1856 43.6419C21.8823 43.6419 22.4286 43.8262 22.8243 44.1949C23.22 44.5635 23.4178 45.0759 23.4178 45.7321C23.4178 46.0534 23.313 46.3645 23.1033 46.6656C22.897 46.9666 22.6146 47.1915 22.2561 47.3403C22.6619 47.4688 22.9748 47.6819 23.1946 47.9795C23.4178 48.2772 23.5295 48.6407 23.5295 49.0703C23.5295 49.7332 23.313 50.2591 22.8801 50.648C22.4472 51.037 21.884 51.2315 21.1907 51.2315C20.4973 51.2315 19.9325 51.0438 19.4962 50.6683C19.0633 50.2929 18.8468 49.7974 18.8468 49.1819H19.7905C19.7905 49.5708 19.9173 49.882 20.171 50.1154C20.4246 50.3487 20.7645 50.4654 21.1907 50.4654C21.6439 50.4654 21.9906 50.347 22.2307 50.1103C22.4708 49.8735 22.5909 49.5336 22.5909 49.0906C22.5909 48.661 22.459 48.3313 22.1952 48.1013C21.9314 47.8713 21.5509 47.7529 21.0537 47.7462H20.3485V46.9801Z" fill="black"/>
+<path d="M46 25.83H27.23V28.98H46V25.83Z" fill="#3F3F3F"/>
+<path d="M46.16 37.16H27.39V40.31H46.16V37.16Z" fill="#3F3F3F"/>
+<path d="M46.16 48.48H27.39V51.63H46.16V48.48Z" fill="#3F3F3F"/>
+<path opacity="0.3" d="M39.79 9.60001L39.21 22.48L50.77 22.05L39.79 9.60001Z" fill="black"/>
+<path d="M50.79 58.47H11.1V6.38H34.91L50.79 22.96V58.47Z" fill="#333333"/>
+<path d="M52.85 19.7V57.06H12.61V5.32001H40.17" fill="url(#paint2_linear)"/>
+<path opacity="0.7" d="M40.17 5.32001L38.59 21L52.85 19.7L40.17 5.32001Z" fill="black"/>
+<path d="M40.19 5.32001L40.16 19.62L52.84 19.69L40.19 5.32001Z" fill="url(#paint3_linear)"/>
+<path opacity="0.8" d="M19.1384 27.58H18.1947V21.3247L16.3024 22.0197V21.1674L18.9912 20.1579H19.1384V27.58Z" fill="black"/>
+<path opacity="0.8" d="M20.8937 40.1H16.0538V39.4253L18.6107 36.5842C18.9896 36.1547 19.25 35.8064 19.392 35.5392C19.5375 35.2686 19.6102 34.9896 19.6102 34.7021C19.6102 34.3165 19.4935 34.0003 19.2601 33.7534C19.0268 33.5065 18.7156 33.383 18.3266 33.383C17.8599 33.383 17.4963 33.5166 17.2359 33.7838C16.9789 34.0476 16.8503 34.4163 16.8503 34.8898H15.9118C15.9118 34.21 16.1299 33.6604 16.5662 33.241C17.0059 32.8216 17.5927 32.6119 18.3266 32.6119C19.0132 32.6119 19.5561 32.7928 19.9552 33.1547C20.3543 33.5132 20.5538 33.9918 20.5538 34.5905C20.5538 35.3176 20.0904 36.1835 19.1637 37.188L17.1852 39.3339H20.8937V40.1Z" fill="black"/>
+<path opacity="0.8" d="M17.4185 48.4801H18.1237C18.5668 48.4733 18.9151 48.3566 19.1688 48.13C19.4225 47.9034 19.5493 47.5973 19.5493 47.2118C19.5493 46.3459 19.1181 45.913 18.2556 45.913C17.8498 45.913 17.5251 46.0297 17.2816 46.2631C17.0414 46.4931 16.9214 46.7992 16.9214 47.1813H15.9828C15.9828 46.5962 16.1959 46.1109 16.622 45.7253C17.0516 45.3364 17.5961 45.1419 18.2556 45.1419C18.9523 45.1419 19.4986 45.3262 19.8943 45.6949C20.29 46.0635 20.4878 46.5759 20.4878 47.2321C20.4878 47.5534 20.383 47.8645 20.1733 48.1656C19.967 48.4666 19.6846 48.6915 19.3261 48.8403C19.7319 48.9688 20.0448 49.1819 20.2646 49.4795C20.4878 49.7772 20.5995 50.1407 20.5995 50.5703C20.5995 51.2332 20.383 51.7591 19.9501 52.148C19.5172 52.537 18.954 52.7315 18.2607 52.7315C17.5674 52.7315 17.0025 52.5438 16.5662 52.1683C16.1333 51.7929 15.9169 51.2974 15.9169 50.6819H16.8605C16.8605 51.0708 16.9873 51.382 17.241 51.6154C17.4946 51.8487 17.8345 51.9654 18.2607 51.9654C18.7139 51.9654 19.0606 51.847 19.3007 51.6103C19.5408 51.3735 19.6609 51.0336 19.6609 50.5906C19.6609 50.161 19.529 49.8313 19.2652 49.6013C19.0014 49.3713 18.6209 49.2529 18.1237 49.2462H17.4185V48.4801Z" fill="black"/>
+<path opacity="0.8" d="M49.77 22.92H23.61V25.75H49.77V22.92Z" fill="#3F3F3F"/>
+<path opacity="0.8" d="M49.77 35.23H23.61V38.06H49.77V35.23Z" fill="#3F3F3F"/>
+<path opacity="0.8" d="M49.77 47.55H23.61V50.38H49.77V47.55Z" fill="#3F3F3F"/>
+<defs>
+<linearGradient id="paint0_linear" x1="17.36" y1="53.25" x2="50.19" y2="8.98" gradientUnits="userSpaceOnUse">
+<stop stop-color="#B3B3B3"/>
+<stop offset="1" stop-color="#F2F2F2"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="36.77" y1="17.02" x2="47.71" y2="17.02" gradientUnits="userSpaceOnUse">
+<stop stop-color="#666666"/>
+<stop offset="1" stop-color="#999999"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="32.33" y1="7.13001" x2="32.96" y2="56.49" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#B3B3B3"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="50.99" y1="8.44001" x2="36.66" y2="21.48" gradientUnits="userSpaceOnUse">
+<stop stop-color="#CCCCCC"/>
+<stop offset="1" stop-color="#808080"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserDefinedStruct_16.svg b/Content/Slate/Starship/AssetIcons/UserDefinedStruct_16.svg
new file mode 100644
index 0000000..9f021e8
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserDefinedStruct_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 7H11V10H16V7Z" fill="white"/>
+<path d="M16 12H11V15H16V12Z" fill="white"/>
+<path d="M9 2H1V10H9V2Z" fill="white"/>
+<path opacity="0.5" d="M13 8H14V4H2V7H3V5H13V8Z" fill="white"/>
+<path opacity="0.5" d="M5 4V3H3V14H11V13H4V4H5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserDefinedStruct_64.svg b/Content/Slate/Starship/AssetIcons/UserDefinedStruct_64.svg
new file mode 100644
index 0000000..3d3fede
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserDefinedStruct_64.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="UserDefinedStruct_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#7F7F7F;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:url(#SVGID_4_);}
+	.st5{fill:url(#SVGID_5_);}
+	.st6{fill:url(#SVGID_6_);}
+	.st7{fill:url(#SVGID_7_);}
+	.st8{fill:none;}
+</style>
+<g>
+	<polygon class="st0" points="46.2,47.9 16.2,47.9 16.2,16.4 47.7,16.4 47.7,26.3 44.7,26.3 44.7,19.4 19.2,19.4 19.2,44.9 
+		46.2,44.9 	"/>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="21.0389" y1="28.522" x2="21.2005" y2="32.7224" gradientTransform="matrix(-1 0 0 -1 67.2954 53.4547)">
+		<stop  offset="0" style="stop-color:#1A1A1A;stop-opacity:0.5"/>
+		<stop  offset="1" style="stop-color:#1A1A1A;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st1" points="44.7,24.7 47.7,24.7 47.7,20.8 44.7,20.8 	"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="36.0004" y1="28.9245" x2="56.9144" y2="29.064">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st2" d="M55.9,33.7H36.4c-0.4,0-0.7-0.3-0.7-0.7V25c0-0.4,0.3-0.7,0.7-0.7h19.6c0.4,0,0.7,0.3,0.7,0.7V33
+		C56.6,33.4,56.3,33.7,55.9,33.7z"/>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="17.5921" y1="32.9299" x2="17.7536" y2="37.1302">
+		<stop  offset="0" style="stop-color:#1A1A1A;stop-opacity:0.5"/>
+		<stop  offset="1" style="stop-color:#1A1A1A;stop-opacity:0"/>
+	</linearGradient>
+	<rect x="16.2" y="33.1" class="st3" width="3" height="4"/>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="35.0651" y1="15.2621" x2="35.2267" y2="19.4625" gradientTransform="matrix(0 -1 1 0 16.2787 53.0347)">
+		<stop  offset="0" style="stop-color:#1A1A1A;stop-opacity:0.5"/>
+		<stop  offset="1" style="stop-color:#1A1A1A;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st4" points="31.7,16.4 31.7,19.4 35.7,19.4 35.7,16.4 	"/>
+	
+		<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="37.8908" y1="17.9554" x2="38.0523" y2="22.1557" gradientTransform="matrix(0 1 -1 0 54.1117 8.4067)">
+		<stop  offset="0" style="stop-color:#1A1A1A;stop-opacity:0.5"/>
+		<stop  offset="1" style="stop-color:#1A1A1A;stop-opacity:0"/>
+	</linearGradient>
+	<polygon class="st5" points="36,47.9 36,44.9 32,44.9 32,47.9 	"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="9.2273" y1="23.2306" x2="32.2784" y2="23.3843">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st6" d="M31.2,33.7H9.6C9.3,33.7,9,33.4,9,33V13.6c0-0.4,0.3-0.7,0.7-0.7h21.6c0.4,0,0.7,0.3,0.7,0.7V33
+		C31.9,33.4,31.6,33.7,31.2,33.7z"/>
+	<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="36.0004" y1="46.3138" x2="56.9144" y2="46.4532">
+		<stop  offset="0" style="stop-color:#CCCCCC"/>
+		<stop  offset="1" style="stop-color:#FFFFFF"/>
+	</linearGradient>
+	<path class="st7" d="M55.9,51.1H36.4c-0.4,0-0.7-0.3-0.7-0.7v-8.1c0-0.4,0.3-0.7,0.7-0.7h19.6c0.4,0,0.7,0.3,0.7,0.7v8.1
+		C56.6,50.8,56.3,51.1,55.9,51.1z"/>
+	<rect x="0" class="st8" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserWidget_16.svg b/Content/Slate/Starship/AssetIcons/UserWidget_16.svg
new file mode 100644
index 0000000..0cf8757
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserWidget_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 1H5V4H16V1Z" fill="white"/>
+<path d="M3 1H0V14H3V1Z" fill="white"/>
+<path d="M16 6H13V14H16V6Z" fill="white"/>
+<path opacity="0.5" d="M11.6998 9.50042C11.6998 11.1004 9.7998 11.2004 8.4998 13.0004C7.1998 11.3004 5.2998 11.1004 5.2998 9.50042C5.2998 7.90042 7.1998 7.30042 8.4998 9.20042C9.7998 7.30042 11.6998 7.90042 11.6998 9.50042Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/UserWidget_64.svg b/Content/Slate/Starship/AssetIcons/UserWidget_64.svg
new file mode 100644
index 0000000..a7ae83b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/UserWidget_64.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="UserWidget_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.7;fill:#FFFFFF;}
+	.st2{fill:url(#SVGID_2_);enable-background:new    ;}
+	.st3{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9421" y1="14.5901" x2="31.9421" y2="49.5186">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="0.591" style="stop-color:#505050"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st0" d="M54.2,13.5H9.7v36h44.5V13.5z"/>
+	<path class="st1" d="M52.6,14H24.3c-0.5,0-0.9,0.3-0.9,0.8v5.7c0,0.4,0.4,0.8,0.9,0.8h28.3c0.5,0,0.9-0.3,0.9-0.8v-5.7
+		C53.5,14.4,53.1,14,52.6,14z"/>
+	<path class="st1" d="M17.6,14h-6.3c-0.5,0-0.9,0.4-0.9,0.9V48c0,0.5,0.4,0.9,0.9,0.9h6.3c0.5,0,0.9-0.4,0.9-0.9V14.9
+		C18.4,14.4,18,14,17.6,14z"/>
+	<path class="st1" d="M52.7,27h-6.2c-0.5,0-0.8,0.4-0.8,0.9V48c0,0.5,0.4,0.9,0.8,0.9h6.2c0.5,0,0.8-0.4,0.8-0.9V27.9
+		C53.5,27.4,53.1,27,52.7,27z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.9816" y1="29.0494" x2="32.0672" y2="44.9022">
+		<stop  offset="0" style="stop-color:#B3B3B3"/>
+		<stop  offset="1" style="stop-color:#4D4D4D"/>
+	</linearGradient>
+	<path class="st2" d="M42.1,33.8c0,5-6,5.5-10.1,11.1c-4-5.5-10.1-6-10.1-11.1s6-7.1,10.1-1C36,26.8,42.1,28.8,42.1,33.8z"/>
+	<rect x="0" class="st3" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VectorFieldVolume_16.svg b/Content/Slate/Starship/AssetIcons/VectorFieldVolume_16.svg
new file mode 100644
index 0000000..42467bb
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VectorFieldVolume_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M4 12H2V11H4V9L6.9 11.5L4 14V12Z" fill="white"/>
+<path d="M4 6H2V5H4V3L6.9 5.5L4 8V6Z" fill="white"/>
+<path d="M9.6 11.7L7.5 13.8L8.2 14.5L10.3 12.4L11.7 13.8L12 10L8.2 10.3L9.6 11.7Z" fill="white"/>
+<path d="M9.6 5.7L7.5 7.8L8.2 8.5L10.3 6.4L11.7 7.8L12 4L8.2 4.3L9.6 5.7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VectorFieldVolume_64.svg b/Content/Slate/Starship/AssetIcons/VectorFieldVolume_64.svg
new file mode 100644
index 0000000..0ca6660
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VectorFieldVolume_64.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="VectorFieldVolume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.2,21.3 20.8,8.6 55.8,9.1 55.8,42.5 43.7,54.8 10,54.8 		"/>
+		<polyline class="st1" points="55.8,42.5 21.4,42.5 21.4,8.6 		"/>
+		<line class="st1" x1="22.3" y1="41.6" x2="8.9" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.6664" y1="8.5307" x2="32.9413" y2="53.6197">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54.1,8.6H21.2c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55.1,43c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.9,9,54.5,8.6,54.1,8.6z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.2566" y1="7.2465" x2="32.554" y2="56.0096">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.7,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.5,52.8c-0.1,0.1-0.2,0.1-0.3,0.1H11.5c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.5,10.4,53.7,10.5,53.7,10.7z M56.3,7.3H20.4
+				c-0.1,0-0.2,0-0.3,0.1L8.2,19.4c-0.1,0.1-0.1,0.2-0.1,0.3v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.7C56.7,7.5,56.5,7.3,56.3,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.4434" y1="20.5721" x2="55.5413" y2="8.4742">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.8" y1="9.1" x2="44.2" y2="19.9"/>
+	</g>
+	
+		<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="101.3982" y1="11.4664" x2="62.5499" y2="11.3011" gradientTransform="matrix(0.7005 -0.7137 0.7137 0.7005 -40.8611 90.2188)">
+		<stop  offset="0" style="stop-color:#F2F2F2"/>
+		<stop  offset="1" style="stop-color:#7E7E7E"/>
+	</linearGradient>
+	<path class="st5" d="M39.7,23.9l-14.7,3.8c-0.4,0.1-0.5,0.5-0.2,0.8l3.2,3.1c0.2,0.2,0.2,0.5,0,0.7L15.4,45.3
+		c-0.2,0.2-0.2,0.5,0,0.7l3.4,3.4c0.2,0.2,0.5,0.2,0.7,0L32,36.4c0.2-0.2,0.5-0.2,0.7,0l3.2,3.1c0.3,0.3,0.7,0.1,0.8-0.2l3.6-14.8
+		C40.4,24.1,40,23.8,39.7,23.9z"/>
+	<rect x="0" class="st6" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VectorField_16.svg b/Content/Slate/Starship/AssetIcons/VectorField_16.svg
new file mode 100644
index 0000000..f0a66da
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VectorField_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 1V15H15V1H1ZM2 14V2H14V14H2Z" fill="white"/>
+<path d="M5 11H3V10H5V8L7.9 10.5L5 13V11Z" fill="white"/>
+<path d="M5 5H3V4H5V2L7.9 4.5L5 7V5Z" fill="white"/>
+<path d="M10.6 10.7L8.5 12.8L9.2 13.5L11.3 11.4L12.7 12.8L13 9L9.2 9.3L10.6 10.7Z" fill="white"/>
+<path d="M10.6 4.7L8.5 6.8L9.2 7.5L11.3 5.4L12.7 6.8L13 3L9.2 3.3L10.6 4.7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VectorField_64.svg b/Content/Slate/Starship/AssetIcons/VectorField_64.svg
new file mode 100644
index 0000000..b63be80
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VectorField_64.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{enable-background:new    ;}
+	.st2{fill:url(#SVGID_1_);}
+	.st3{fill:#BFBFBF;}
+	.st4{fill:none;stroke:#BFBFBF;stroke-width:2;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_2_);}
+	.st6{fill:url(#SVGID_3_);}
+</style>
+<g id="VectorField_x5F_64">
+	<rect class="st0" width="64" height="64"/>
+	<g>
+		<g>
+			<g class="st1">
+				
+					<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.3763" y1="58.3224" x2="32.0951" y2="7.8528" gradientTransform="matrix(1 0 0 -1 0 66)">
+					<stop  offset="0" style="stop-color:#999999"/>
+					<stop  offset="1" style="stop-color:#4D4D4D"/>
+				</linearGradient>
+				<polygon class="st2" points="6.6,45.9 6.6,14.8 32.3,5.6 57.9,14.8 57.9,45.9 32.3,58.7 				"/>
+				<path class="st3" d="M32.3,6.6l24.5,8.9v29.7L32.3,57.6L7.6,45.3V15.5L32.3,6.6 M32.3,4.5l-0.7,0.2L6.9,13.6l-1.3,0.5v1.4v29.7
+					v1.2L6.7,47l24.8,12.3l0.9,0.4l0.9-0.5L57.8,47l1.1-0.6v-1.2V15.5v-1.4l-1.3-0.5L33,4.8L32.3,4.5L32.3,4.5z"/>
+			</g>
+			<polyline class="st4" points="7.6,15.5 32.3,26 56.9,15.5 			"/>
+			<line class="st4" x1="32.3" y1="57.6" x2="32.3" y2="26"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="19.3389" y1="37.2948" x2="19.5343" y2="18.8365" gradientTransform="matrix(1 0 0 -1 0 66)">
+				<stop  offset="0" style="stop-color:#F2F2F2"/>
+				<stop  offset="1.488471e-02" style="stop-color:#F1F1F1"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<polygon class="st5" points="9.4,35.8 23,42.3 23,47.5 29.5,42.6 23,32 23,37.2 9.4,30.7 			"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="45.7" y1="38.2485" x2="45.7" y2="16.665" gradientTransform="matrix(1 0 0 -1 0 66)">
+				<stop  offset="0" style="stop-color:#F2F2F2"/>
+				<stop  offset="1.488471e-02" style="stop-color:#F1F1F1"/>
+				<stop  offset="1" style="stop-color:#999999"/>
+			</linearGradient>
+			<polygon class="st6" points="35.7,45.1 49.4,38.8 49.3,42.6 55.7,33.1 49.3,29.4 49.4,33.4 35.7,39.7 			"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Volume_16.svg b/Content/Slate/Starship/AssetIcons/Volume_16.svg
new file mode 100644
index 0000000..8a91cb9
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Volume_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path opacity="0.5" d="M12.9996 12H3.99961V3H2.99961V12.3L0.599609 14.6L1.39961 15.4L3.69961 13H12.9996V12Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Volume_64.svg b/Content/Slate/Starship/AssetIcons/Volume_64.svg
new file mode 100644
index 0000000..f484ee8
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Volume_64.svg
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Volume_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#404040;}
+	.st2{fill:none;stroke:#666666;stroke-width:2;stroke-miterlimit:10;}
+	.st3{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+</style>
+<g id="_x36_4x64_x5F_EmptyBg">
+	<rect x="0" class="st0" width="64" height="64"/>
+</g>
+<g>
+	<polygon class="st1" points="9.1,21.2 20.7,8.5 55.7,9 55.7,42.3 43.6,54.7 9.9,54.7 	"/>
+	<polyline class="st2" points="55.7,42.3 21.4,42.3 21.4,8.5 	"/>
+	<line class="st2" x1="22.2" y1="41.4" x2="8.8" y2="54.8"/>
+	<g>
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4064" x2="32.8604" y2="53.4954">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st3" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+			c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.8,54.4,8.5,54,8.5z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1222" x2="32.473" y2="55.8853">
+			<stop  offset="0" style="stop-color:#BFBFBF"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<path class="st4" d="M53.6,10.6v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.7
+			c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.2,53.6,10.4,53.6,10.6z M56.2,7.2H20.3
+			c-0.1,0-0.2,0-0.3,0.1L8.1,19.2C8.1,19.3,8,19.4,8,19.5v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+			c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.2,56.2,7.2z"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.4478" x2="55.4604" y2="8.3499">
+		<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+		<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+	</linearGradient>
+	<line class="st5" x1="54.7" y1="9" x2="44.1" y2="19.8"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VolumetricCloudComponent_16.svg b/Content/Slate/Starship/AssetIcons/VolumetricCloudComponent_16.svg
new file mode 100644
index 0000000..62af776
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VolumetricCloudComponent_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2.2998C3.6 2.2998 0 5.8998 0 10.2998C0 10.6998 0 11.1998 0.1 11.5998H1.1C1 11.1998 1 10.6998 1 10.2998C1 6.3998 4.1 3.2998 8 3.2998C11.9 3.2998 15 6.3998 15 10.2998C15 10.7998 15 11.1998 14.9 11.5998H15.9C16 11.1998 16 10.6998 16 10.2998C16 5.8998 12.4 2.2998 8 2.2998Z" fill="white"/>
+<path opacity="0.5" d="M1.1 11.5998C1 11.1998 1 10.6998 1 10.2998C1 6.3998 4.1 3.2998 8 3.2998C11.9 3.2998 15 6.3998 15 10.2998C15 10.7998 15 11.1998 14.9 11.5998C14.9 11.5998 12 9.5998 8 9.5998C4 9.5998 1.1 11.5998 1.1 11.5998Z" fill="white"/>
+<path d="M11.0002 14C11.0002 14 10.5002 14 10.4002 14H6.4002H3.7002C3.2002 14 2.7002 13.9 2.7002 13.3C2.7002 12.9 3.2002 12.4 4.2002 12.5C2.8002 10.2 5.9002 8.8 7.3002 11.3C6.5002 9.6 7.6002 8 9.2002 8C10.5002 8 11.8002 9.4 10.8002 11C11.8002 10.8 12.8002 11.4 12.8002 12.5C12.8002 13.6 12.1002 14 11.0002 14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VolumetricCloud_16.svg b/Content/Slate/Starship/AssetIcons/VolumetricCloud_16.svg
new file mode 100644
index 0000000..89894c2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VolumetricCloud_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2.30005C3.6 2.30005 0 5.90005 0 10.3C0 10.7 0 11.2 0.1 11.6H1.1C1 11.2 1 10.7 1 10.3C1 6.40005 4.1 3.30005 8 3.30005C11.9 3.30005 15 6.40005 15 10.3C15 10.8 15 11.2 14.9 11.6H15.9C16 11.2 16 10.7 16 10.3C16 5.90005 12.4 2.30005 8 2.30005Z" fill="white"/>
+<path opacity="0.5" d="M1.1 11.6C1 11.2 1 10.7 1 10.3C1 6.40005 4.1 3.30005 8 3.30005C11.9 3.30005 15 6.40005 15 10.3C15 10.8 15 11.2 14.9 11.6C14.9 11.6 12 9.60005 8 9.60005C4 9.60005 1.1 11.6 1.1 11.6Z" fill="white"/>
+<path d="M11 14C11 14 10.5 14 10.4 14H6.40001H3.70001C3.20001 14 2.70001 13.9 2.70001 13.3C2.70001 12.9 3.20001 12.4 4.20001 12.5C2.80001 10.2 5.90001 8.8 7.30001 11.3C6.50001 9.6 7.60001 8 9.20001 8C10.5 8 11.8 9.4 10.8 11C11.8 10.8 12.8 11.4 12.8 12.5C12.8 13.6 12.1 14 11 14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VolumetricLightmapDensityVolume_16.svg b/Content/Slate/Starship/AssetIcons/VolumetricLightmapDensityVolume_16.svg
new file mode 100644
index 0000000..328d0f5
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VolumetricLightmapDensityVolume_16.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+<path d="M7.49961 9.89966C8.27281 9.89966 8.89961 9.27283 8.89961 8.49963C8.89961 7.72644 8.27281 7.09961 7.49961 7.09961C6.72641 7.09961 6.09961 7.72644 6.09961 8.49963C6.09961 9.27283 6.72641 9.89966 7.49961 9.89966Z" fill="white"/>
+<path d="M7.9002 4H7.2002V5.69995H7.9002V4Z" fill="white"/>
+<path d="M7.9002 11.2998H7.2002V12.9998H7.9002V11.2998Z" fill="white"/>
+<path d="M4.76562 8.83477V8.13477H3.06555V8.83477H4.76562Z" fill="white"/>
+<path d="M12.0352 8.86504V8.16504H10.3351V8.86504H12.0352Z" fill="white"/>
+<path d="M4.1811 4.81109L3.75684 5.23535L5.24181 6.72033L5.66607 6.29607L4.1811 4.81109Z" fill="white"/>
+<path d="M9.79926 10.3668L9.375 10.791L10.8599 12.2759L11.2842 11.8516L9.79926 10.3668Z" fill="white"/>
+<path d="M5.26323 10.3042L3.77832 11.7891L4.20256 12.2133L5.68747 10.7284L5.26323 10.3042Z" fill="white"/>
+<path d="M10.8511 4.69868L9.36621 6.18359L9.79045 6.60784L11.2754 5.12293L10.8511 4.69868Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/VolumetricLightmapDensityVolume_64.svg b/Content/Slate/Starship/AssetIcons/VolumetricLightmapDensityVolume_64.svg
new file mode 100644
index 0000000..443ed0d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/VolumetricLightmapDensityVolume_64.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="VolumetricLightmapDensityVolume_x5F_64"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 64 64"
+	 style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#404040;}
+	.st1{fill:none;stroke:#3D3D3D;stroke-width:2;stroke-miterlimit:10;}
+	.st2{opacity:0.71;fill:url(#SVGID_1_);enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:none;stroke:url(#SVGID_3_);stroke-width:2;stroke-linecap:round;stroke-miterlimit:10;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:#FFFFFF;}
+	.st7{fill:none;}
+</style>
+<g>
+	<g>
+		<polygon class="st0" points="9.1,21.2 20.7,8.5 55.7,9.1 55.7,42.4 43.6,54.7 9.9,54.7 		"/>
+		<polyline class="st1" points="55.7,42.4 21.4,42.4 21.4,8.5 		"/>
+		<line class="st1" x1="22.2" y1="41.5" x2="8.8" y2="54.9"/>
+		<g>
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="32.5855" y1="8.4686" x2="32.8604" y2="53.5575">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st2" d="M54,8.5H21.1c-0.2,0-0.4,0.1-0.6,0.3l-10,10.4c-0.5,0.5-0.1,1.4,0.6,1.4h31.7c0.5,0,0.8,0.4,0.8,0.8v31.2
+				c0,0.8,0.9,1.1,1.4,0.6L55,42.9c0.2-0.2,0.2-0.4,0.2-0.6l-0.4-33C54.8,8.9,54.4,8.5,54,8.5z"/>
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="32.1757" y1="7.1843" x2="32.473" y2="55.9474">
+				<stop  offset="0" style="stop-color:#BFBFBF"/>
+				<stop  offset="1" style="stop-color:#808080"/>
+			</linearGradient>
+			<path class="st3" d="M53.6,10.7v31.7c0,0.1,0,0.2-0.1,0.3L43.4,52.7c-0.1,0.1-0.2,0.1-0.3,0.1H11.4c-0.2,0-0.4-0.2-0.4-0.4V20.8
+				c0-0.1,0-0.2,0.1-0.3l10.1-10.1c0.1-0.1,0.2-0.1,0.3-0.1h31.7C53.4,10.3,53.6,10.5,53.6,10.7z M56.2,7.3H20.3
+				c-0.1,0-0.2,0-0.3,0.1L8.1,19.3C8.1,19.4,8,19.5,8,19.6v35.9c0,0.2,0.2,0.4,0.4,0.4h35.9c0.1,0,0.2,0,0.3-0.1l11.9-11.9
+				c0.1-0.1,0.1-0.2,0.1-0.3V7.6C56.6,7.4,56.5,7.3,56.2,7.3z"/>
+		</g>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="43.3624" y1="20.51" x2="55.4604" y2="8.4121">
+			<stop  offset="0" style="stop-color:#9B9B9D;stop-opacity:0.9"/>
+			<stop  offset="0.4467" style="stop-color:#BFBFBF"/>
+		</linearGradient>
+		<line class="st4" x1="54.7" y1="9.1" x2="44.1" y2="19.9"/>
+	</g>
+	<g>
+		<radialGradient id="SVGID_4_" cx="27.3009" cy="36.4012" r="14.7268" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#F2F2F2;stop-opacity:0.7"/>
+			<stop  offset="1" style="stop-color:#B3B3B3;stop-opacity:0"/>
+		</radialGradient>
+		<circle class="st5" cx="27.3" cy="36.4" r="14.7"/>
+		<g>
+			<path class="st6" d="M27.3,40.5c2.2,0,4.1-1.8,4.1-4.1s-1.8-4.1-4.1-4.1s-4.1,1.8-4.1,4.1S25.1,40.5,27.3,40.5z"/>
+			<path class="st6" d="M28.3,23.1h-2v5.1h2V23.1z"/>
+			<path class="st6" d="M28.3,44.5h-2v5.1h2V44.5z"/>
+			<path class="st6" d="M19.3,37.5v-2h-5.1v2H19.3z"/>
+			<path class="st6" d="M40.6,37.3v-2h-5.1v2H40.6z"/>
+			<path class="st6" d="M17.7,25.4l-1.3,1.3l4.3,4.3l1.3-1.3L17.7,25.4z"/>
+			<path class="st6" d="M20.7,41.7l-4.3,4.3l1.3,1.3l4.3-4.3L20.7,41.7z"/>
+			<path class="st6" d="M36.9,25.4l-4.3,4.3l1.3,1.3l4.3-4.3L36.9,25.4z"/>
+		</g>
+		<path class="st6" d="M34.1,41.7L32.8,43l4.3,4.3l1.3-1.3L34.1,41.7z"/>
+	</g>
+	<rect x="0" class="st7" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/WidgetBlueprintGeneratedClass_16.svg b/Content/Slate/Starship/AssetIcons/WidgetBlueprintGeneratedClass_16.svg
new file mode 100644
index 0000000..46982c2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/WidgetBlueprintGeneratedClass_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 1H5V4H16V1Z" fill="white"/>
+<path d="M3 1H0V14H3V1Z" fill="white"/>
+<path d="M8 9V10C8 10.6 7.6 11 7 11H5C4.4 11 4 10.6 4 10V9C4 8.4 4.4 8 5 8H7C7.6 8 8 8.4 8 9Z" fill="white"/>
+<path d="M16 6V7C16 7.6 15.6 8 15 8H13C12.4 8 12 7.6 12 7V6C12 5.4 12.4 5 13 5H15C15.6 5 16 5.4 16 6Z" fill="white"/>
+<path d="M16 12V13C16 13.6 15.6 14 15 14H13C12.4 14 12 13.6 12 13V12C12 11.4 12.4 11 13 11H15C15.6 11 16 11.4 16 12Z" fill="white"/>
+<path opacity="0.5" d="M14 7V6H10C9.5 6 9 6.5 9 7V9H8V10H9V12C9 12.6 9.5 13 10 13H14V12H10.6C10.3 12 10 11.7 10 11.4V7.6C10 7.3 10.3 7 10.6 7H14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/WidgetBlueprintGeneratedClass_64.svg b/Content/Slate/Starship/AssetIcons/WidgetBlueprintGeneratedClass_64.svg
new file mode 100644
index 0000000..0317538
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/WidgetBlueprintGeneratedClass_64.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="WidgetBlueprint_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.7;fill:#FFFFFF;}
+	.st2{fill:#7F7F7F;enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9421" y1="14.5901" x2="31.9421" y2="49.5186">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st0" d="M54.2,13.5H9.7v36h44.5V13.5z"/>
+	<path class="st1" d="M52.6,14H24.3c-0.5,0-0.9,0.3-0.9,0.8v5.7c0,0.4,0.4,0.8,0.9,0.8h28.3c0.5,0,0.9-0.3,0.9-0.8v-5.7
+		C53.5,14.4,53.1,14,52.6,14z"/>
+	<path class="st1" d="M17.6,14h-6.3c-0.5,0-0.9,0.4-0.9,0.9V48c0,0.5,0.4,0.9,0.9,0.9h6.3c0.5,0,0.9-0.4,0.9-0.9V14.9
+		C18.4,14.4,18,14,17.6,14z"/>
+	<g>
+		<path class="st2" d="M44.8,28.5v-2H37c-1.2,0-2,1-2,2v5.9h-5.9v2H35v5.9c0,1.2,1,2,2,2h7.8v-2h-6.7c-0.6,0-1.2-0.6-1.2-1.2V29.7
+			c0-0.6,0.6-1.2,1.2-1.2H44.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.1437" y1="35.3824" x2="33.2361" y2="35.3963">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<rect x="31.1" y="34.4" class="st3" width="2.1" height="2"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="26.2434" y1="39.5652" x2="26.196" y2="31.6005">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st4" d="M31.1,32.6v5.5c0,0.6-0.5,1.2-1.2,1.2h-7.5c-0.6,0-1.2-0.5-1.2-1.2v-5.5c0-0.6,0.5-1.2,1.2-1.2H30
+			C30.6,31.5,31.1,32,31.1,32.6z"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="55.4585" y1="17.049" x2="57.5508" y2="17.0629" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st5" points="43.7,26.6 41.6,26.6 41.6,28.5 43.7,28.5 		"/>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="55.4585" y1="1.3661" x2="57.5508" y2="1.38" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st6" points="43.7,42.3 41.6,42.3 41.6,44.2 43.7,44.2 		"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="48.635" y1="31.7237" x2="48.5876" y2="23.759">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st7" d="M53.5,24.8v5.5c0,0.6-0.5,1.2-1.2,1.2h-7.5c-0.6,0-1.2-0.5-1.2-1.2v-5.5c0-0.6,0.5-1.2,1.2-1.2h7.5
+			C53,23.6,53.5,24.2,53.5,24.8z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="48.635" y1="47.4066" x2="48.5876" y2="39.442">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st8" d="M53.5,40.5V46c0,0.6-0.5,1.2-1.2,1.2h-7.5c-0.6,0-1.2-0.5-1.2-1.2v-5.5c0-0.6,0.5-1.2,1.2-1.2h7.5
+			C53,39.3,53.5,39.8,53.5,40.5z"/>
+	</g>
+	<rect x="0" class="st9" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/WidgetBlueprint_16.svg b/Content/Slate/Starship/AssetIcons/WidgetBlueprint_16.svg
new file mode 100644
index 0000000..46982c2
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/WidgetBlueprint_16.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 1H5V4H16V1Z" fill="white"/>
+<path d="M3 1H0V14H3V1Z" fill="white"/>
+<path d="M8 9V10C8 10.6 7.6 11 7 11H5C4.4 11 4 10.6 4 10V9C4 8.4 4.4 8 5 8H7C7.6 8 8 8.4 8 9Z" fill="white"/>
+<path d="M16 6V7C16 7.6 15.6 8 15 8H13C12.4 8 12 7.6 12 7V6C12 5.4 12.4 5 13 5H15C15.6 5 16 5.4 16 6Z" fill="white"/>
+<path d="M16 12V13C16 13.6 15.6 14 15 14H13C12.4 14 12 13.6 12 13V12C12 11.4 12.4 11 13 11H15C15.6 11 16 11.4 16 12Z" fill="white"/>
+<path opacity="0.5" d="M14 7V6H10C9.5 6 9 6.5 9 7V9H8V10H9V12C9 12.6 9.5 13 10 13H14V12H10.6C10.3 12 10 11.7 10 11.4V7.6C10 7.3 10.3 7 10.6 7H14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/WidgetBlueprint_64.svg b/Content/Slate/Starship/AssetIcons/WidgetBlueprint_64.svg
new file mode 100644
index 0000000..0317538
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/WidgetBlueprint_64.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="WidgetBlueprint_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.7;fill:#FFFFFF;}
+	.st2{fill:#7F7F7F;enable-background:new    ;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+	.st7{fill:url(#SVGID_6_);}
+	.st8{fill:url(#SVGID_7_);}
+	.st9{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9421" y1="14.5901" x2="31.9421" y2="49.5186">
+		<stop  offset="0" style="stop-color:#4D4D4D"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st0" d="M54.2,13.5H9.7v36h44.5V13.5z"/>
+	<path class="st1" d="M52.6,14H24.3c-0.5,0-0.9,0.3-0.9,0.8v5.7c0,0.4,0.4,0.8,0.9,0.8h28.3c0.5,0,0.9-0.3,0.9-0.8v-5.7
+		C53.5,14.4,53.1,14,52.6,14z"/>
+	<path class="st1" d="M17.6,14h-6.3c-0.5,0-0.9,0.4-0.9,0.9V48c0,0.5,0.4,0.9,0.9,0.9h6.3c0.5,0,0.9-0.4,0.9-0.9V14.9
+		C18.4,14.4,18,14,17.6,14z"/>
+	<g>
+		<path class="st2" d="M44.8,28.5v-2H37c-1.2,0-2,1-2,2v5.9h-5.9v2H35v5.9c0,1.2,1,2,2,2h7.8v-2h-6.7c-0.6,0-1.2-0.6-1.2-1.2V29.7
+			c0-0.6,0.6-1.2,1.2-1.2H44.8z"/>
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.1437" y1="35.3824" x2="33.2361" y2="35.3963">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<rect x="31.1" y="34.4" class="st3" width="2.1" height="2"/>
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="26.2434" y1="39.5652" x2="26.196" y2="31.6005">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st4" d="M31.1,32.6v5.5c0,0.6-0.5,1.2-1.2,1.2h-7.5c-0.6,0-1.2-0.5-1.2-1.2v-5.5c0-0.6,0.5-1.2,1.2-1.2H30
+			C30.6,31.5,31.1,32,31.1,32.6z"/>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="55.4585" y1="17.049" x2="57.5508" y2="17.0629" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st5" points="43.7,26.6 41.6,26.6 41.6,28.5 43.7,28.5 		"/>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="55.4585" y1="1.3661" x2="57.5508" y2="1.38" gradientTransform="matrix(-1 0 0 -1 99.1435 44.6034)">
+			<stop  offset="0" style="stop-color:#4D4D4D"/>
+			<stop  offset="1" style="stop-color:#808080"/>
+		</linearGradient>
+		<polygon class="st6" points="43.7,42.3 41.6,42.3 41.6,44.2 43.7,44.2 		"/>
+		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="48.635" y1="31.7237" x2="48.5876" y2="23.759">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st7" d="M53.5,24.8v5.5c0,0.6-0.5,1.2-1.2,1.2h-7.5c-0.6,0-1.2-0.5-1.2-1.2v-5.5c0-0.6,0.5-1.2,1.2-1.2h7.5
+			C53,23.6,53.5,24.2,53.5,24.8z"/>
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="48.635" y1="47.4066" x2="48.5876" y2="39.442">
+			<stop  offset="0" style="stop-color:#999999"/>
+			<stop  offset="1" style="stop-color:#E6E6E6"/>
+		</linearGradient>
+		<path class="st8" d="M53.5,40.5V46c0,0.6-0.5,1.2-1.2,1.2h-7.5c-0.6,0-1.2-0.5-1.2-1.2v-5.5c0-0.6,0.5-1.2,1.2-1.2h7.5
+			C53,39.3,53.5,39.8,53.5,40.5z"/>
+	</g>
+	<rect x="0" class="st9" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Widget_16.svg b/Content/Slate/Starship/AssetIcons/Widget_16.svg
new file mode 100644
index 0000000..9a5de2d
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Widget_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M5 13.9998V13.4998C5 11.5998 6.3 10.4998 8 10.4998C9.6 10.4998 11 11.5998 11 13.4998V13.9998H5ZM8 6.2998C7 6.2998 6.2 7.0998 6.2 8.0998C6.2 9.0998 7 9.8998 8 9.8998C9 9.8998 9.8 9.0998 9.8 8.0998C9.8 7.0998 9 6.2998 8 6.2998Z" fill="white"/>
+<path d="M16 1H5V4H16V1Z" fill="white"/>
+<path d="M3 1H0V14H3V1Z" fill="white"/>
+<path d="M16 6H13V14H16V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/Widget_64.svg b/Content/Slate/Starship/AssetIcons/Widget_64.svg
new file mode 100644
index 0000000..7391e11
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/Widget_64.svg
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Widget_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+	 y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{opacity:0.7;fill:#FFFFFF;}
+	.st2{opacity:0.5;fill:#FFFFFF;}
+	.st3{fill:url(#SVGID_2_);}
+	.st4{fill:url(#SVGID_3_);}
+	.st5{fill:none;}
+</style>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.9421" y1="14.5901" x2="31.9421" y2="49.5186">
+		<stop  offset="0" style="stop-color:#808080"/>
+		<stop  offset="0.591" style="stop-color:#505050"/>
+		<stop  offset="1" style="stop-color:#333333"/>
+	</linearGradient>
+	<path class="st0" d="M54.2,13.5H9.7v36h44.5V13.5z"/>
+	<path class="st1" d="M52.6,14H24.3c-0.5,0-0.9,0.3-0.9,0.8v5.7c0,0.4,0.4,0.8,0.9,0.8h28.3c0.5,0,0.9-0.3,0.9-0.8v-5.7
+		C53.5,14.4,53.1,14,52.6,14z"/>
+	<path class="st1" d="M17.6,14h-6.3c-0.5,0-0.9,0.4-0.9,0.9V48c0,0.5,0.4,0.9,0.9,0.9h6.3c0.5,0,0.9-0.4,0.9-0.9V14.9
+		C18.4,14.4,18,14,17.6,14z"/>
+	<path class="st1" d="M52.7,27h-6.2c-0.5,0-0.8,0.4-0.8,0.9V48c0,0.5,0.4,0.9,0.8,0.9h6.2c0.5,0,0.8-0.4,0.8-0.9V27.9
+		C53.5,27.4,53.1,27,52.7,27z"/>
+	<path class="st2" d="M38.6,44.4l-2.2-1c0,0-0.7-0.1-0.9-1.9L35,38.4h-3h-3l-0.4,3.1c-0.2,1.8-0.9,1.9-0.9,1.9l-2.2,1
+		c-3.8,1.3-3.5,5.1-3.5,5.1L32,48.9l10.1,0.6C42.1,49.5,42.4,45.7,38.6,44.4z"/>
+	<path class="st2" d="M36.8,34c0.9-5.7-4.8-5.9-4.8-5.9s-5.7,0.1-4.8,5.9c0,0-1.6-0.1-1,2.2c0,0,0.4,1.1,1.3,1.5
+		c0,0,0.3,3.2,3.2,4.8c0.2,0.1,0.4,0.2,0.7,0.2H32h0.7c0.2,0,0.5-0.1,0.7-0.2c2.9-1.7,3.2-4.8,3.2-4.8c0.8-0.4,1.3-1.5,1.3-1.5
+		C38.4,33.9,36.8,34,36.8,34z"/>
+	<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="31.944" y1="39.0218" x2="32.001" y2="49.568">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="2.259088e-02" style="stop-color:#363636"/>
+		<stop  offset="0.2044" style="stop-color:#4B4B4B"/>
+		<stop  offset="0.4066" style="stop-color:#5A5A5A"/>
+		<stop  offset="0.6436" style="stop-color:#636363"/>
+		<stop  offset="1" style="stop-color:#666666"/>
+	</linearGradient>
+	<path class="st3" d="M38.6,45.1l-2.2-1c0,0-0.7-0.1-0.9-1.9L35,39h-3h-3l-0.4,3.1c-0.2,1.8-0.9,1.9-0.9,1.9l-2.2,1
+		c-3.8,1.3-3.5,4.4-3.5,4.4H32h10.1C42.1,49.5,42.4,46.4,38.6,45.1z"/>
+	<radialGradient id="SVGID_3_" cx="32" cy="35.7379" r="6.6541" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#999999"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</radialGradient>
+	<path class="st4" d="M36.8,34.3c0.9-5.7-4.8-5.9-4.8-5.9s-5.7,0.1-4.8,5.9c0,0-1.6-0.1-1,2.2c0,0,0.4,1.1,1.3,1.5
+		c0,0,0.3,3.2,3.2,4.8c0.2,0.1,0.4,0.2,0.7,0.2H32h0.7c0.2,0,0.5-0.1,0.7-0.2c2.9-1.7,3.2-4.8,3.2-4.8c0.8-0.4,1.3-1.5,1.3-1.5
+		C38.4,34.2,36.8,34.3,36.8,34.3z"/>
+	<rect x="0" class="st5" width="64" height="64"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/WindDirectionalSource_16.svg b/Content/Slate/Starship/AssetIcons/WindDirectionalSource_16.svg
new file mode 100644
index 0000000..3837bed
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/WindDirectionalSource_16.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 13L11 10V12H0V14H11V16L16 13Z" fill="white"/>
+<path d="M9.2 0H8.4C8.4 0 9.4 1.19995 9.4 2.19995C9.4 3.19995 8.6 4 7.5 4H7H1C0.7 4 0.5 4.2 0.5 4.5C0.5 4.8 0.7 5 1 5H7H7.5C9 5 10.1 3.69995 10.1 2.19995C10.1 1.29995 9.7 0.6 9.2 0Z" fill="white"/>
+<path d="M12.2 0H10.9C11.6 0.6 12 1.5 12 2.5C12 4.4 10.4 6 8.5 6H8H1C0.7 6 0.5 6.2 0.5 6.5C0.5 6.8 0.7 7 1 7H8H8.5C11 7 13 5 13 2.5C13 1.6 12.7 0.7 12.2 0Z" fill="white"/>
+<path d="M15.2 0H14C14.6 0.8 15 1.9 15 3C15 5.8 12.8 8 10 8C9.4 8 9.1 8 8.5 8H8H1C0.7 8 0.5 8.2 0.5 8.5C0.5 8.8 0.7 9 1 9H8H8.5C9.1 9 9.4 9 10 9C13.3 9 16 6.3 16 3C16 1.9 15.7 0.9 15.2 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/WindDirectionalSource_64.svg b/Content/Slate/Starship/AssetIcons/WindDirectionalSource_64.svg
new file mode 100644
index 0000000..f080b26
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/WindDirectionalSource_64.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{fill:url(#SVGID_3_);}
+	.st4{fill:#999999;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{fill:url(#SVGID_5_);}
+</style>
+<g id="WindDirectionalSource_x5F_64">
+	<g>
+		<rect class="st0" width="64" height="64"/>
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="8.3956" y1="211.829" x2="55.5702" y2="212.6598" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#4F4F4F"/>
+			<stop  offset="1" style="stop-color:#7E7E7E"/>
+		</linearGradient>
+		<path class="st1" d="M10.8,18.7c-4.5,1.9-4.1,14.5,0,17.3l0,0h33.5c9.5-4.3,15.6-15.4,9.5-27.5h-1H28.4l0,0c3.5,4.9,4.4,8.7,0,9.9
+			L10.8,18.7L10.8,18.7z"/>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="49.506" y1="235.5316" x2="9.960254e-02" y2="235.3214" gradientTransform="matrix(1 0 0 1 0 -190)">
+			<stop  offset="0" style="stop-color:#F2F2F2"/>
+			<stop  offset="1" style="stop-color:#7E7E7E"/>
+		</linearGradient>
+		<path class="st2" d="M52.6,45.2L40.7,38c-0.3-0.2-0.7,0-0.7,0.4v4.1c0,0.2-0.2,0.4-0.4,0.4H11.3c-0.2,0-0.4,0.2-0.4,0.4v4.4
+			c0,0.2,0.2,0.4,0.4,0.4h28.3c0.2,0,0.4,0.2,0.4,0.4v4.1c0,0.3,0.4,0.6,0.7,0.4l11.9-7C52.9,45.8,52.9,45.4,52.6,45.2z"/>
+		<g>
+			
+				<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="11" y1="206.8" x2="37.9429" y2="206.8" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#F2F2F2"/>
+			</linearGradient>
+			<path class="st3" d="M12.6,23.7c-0.9,0-1.6-0.6-1.6-1.6s0.6-1.6,1.6-1.6h17.2c2.7,0,4.8-1.9,4.8-4.5c0-2.5-2.6-5.6-2.6-5.7
+				l-0.3-0.4h3.8l0.1,0.1c1,1.3,2.4,3.2,2.4,6c0,4.3-3.1,7.7-7.1,7.7H12.6z"/>
+			<g>
+				<path class="st4" d="M35.3,10.2c1.3,1.6,2.4,3.4,2.4,5.8c0,4-2.9,7.4-6.9,7.4H12.6c-0.8,0-1.3-0.5-1.3-1.3s0.5-1.3,1.3-1.3h17.2
+					c2.9,0,5-2.1,5-4.8s-2.7-5.8-2.7-5.8H35.3 M35.6,9.7h-0.2h-3.1h-1.1l0.7,0.8c0,0,2.5,3.1,2.5,5.5s-1.9,4.3-4.5,4.3H12.6
+					c-1.1,0-1.8,0.8-1.8,1.8c0,1.1,0.8,1.8,1.8,1.8h18.2c4.1,0,7.4-3.5,7.4-7.9c0-2.8-1.4-4.9-2.5-6.2L35.6,9.7L35.6,9.7z"/>
+			</g>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="11" y1="209.55" x2="45.6294" y2="209.55" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#F2F2F2"/>
+			</linearGradient>
+			<path class="st5" d="M12.6,29c-0.9,0-1.6-0.6-1.6-1.6c0-0.9,0.6-1.6,1.6-1.6h19.9c4.9,0,9-4.1,9-9c0-2.5-1-4.9-2.8-6.4L38.2,10
+				h5.3l0.1,0.1c1.4,1.9,2.2,4.4,2.2,6.8c0,6.7-5.5,12.2-12.2,12.2h-21C12.6,29.1,12.6,29,12.6,29z"/>
+			<path class="st4" d="M43.3,10.2c1.3,1.9,2.1,4.2,2.1,6.6c0,6.6-5.3,11.9-11.9,11.9H12.6c-0.8,0-1.3-0.5-1.3-1.3s0.5-1.3,1.3-1.3
+				h19.9c5,0,9.3-4.2,9.3-9.3c0-2.7-1.1-5-2.9-6.6L43.3,10.2 M43.5,9.7h-0.3h-4.4h-1.4l1,0.9c1.7,1.5,2.7,3.8,2.7,6.2
+				c0,4.8-4,8.8-8.8,8.8H12.6c-1.1,0-1.8,0.8-1.8,1.8s0.8,1.8,1.8,1.8h20.9c6.9,0,12.4-5.6,12.4-12.4c0-2.4-0.8-4.9-2.2-6.9
+				L43.5,9.7L43.5,9.7z"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="11" y1="212.1" x2="53.5805" y2="212.1" gradientTransform="matrix(1 0 0 1 0 -190)">
+				<stop  offset="0" style="stop-color:#B3B3B3"/>
+				<stop  offset="1" style="stop-color:#F2F2F2"/>
+			</linearGradient>
+			<path class="st6" d="M12.6,34.3c-0.9,0-1.6-0.6-1.6-1.6s0.6-1.6,1.6-1.6h23.9c7.3,0,13-5.7,13-13c0-2.7-1-5.6-2.6-7.8l-0.3-0.4
+				h4.8l0.1,0.1c1.4,2.6,2.2,5.3,2.2,8.1c0,8.9-7.2,16.2-16.2,16.2C37.5,34.3,12.6,34.3,12.6,34.3z"/>
+			<path class="st4" d="M51.2,10.2c1.3,2.4,2.1,5,2.1,8c0,8.7-7.2,15.9-15.9,15.9c-1.6,0-6.3,0-6.3,0H12.6c-0.8,0-1.3-0.5-1.3-1.3
+				s0.5-1.3,1.3-1.3h18.6c0,0,3.7,0,5.3,0c7.4,0,13.3-5.8,13.3-13.3c0-2.9-1.1-5.8-2.7-8L51.2,10.2 M51.5,9.7h-0.3H47h-1l0.6,0.8
+				c1.6,2.1,2.6,5,2.6,7.7c0,7.2-5.6,12.8-12.8,12.8h-5.3H12.6c-1.1,0-1.8,0.8-1.8,1.8c0,1.1,0.8,1.8,1.8,1.8h18.6h6.3
+				c9,0,16.4-7.4,16.4-16.4c0-2.8-0.7-5.6-2.2-8.2L51.5,9.7L51.5,9.7z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/World_16.svg b/Content/Slate/Starship/AssetIcons/World_16.svg
new file mode 100644
index 0000000..d58772b
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/World_16.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 13L13.5 8.1L16 13V15H0V13L2.5 8L1 13H15Z" fill="white"/>
+<path d="M8.5 10.5L6 2L3 12H13L10.5 5.6L8.5 10.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/AssetIcons/World_64.svg b/Content/Slate/Starship/AssetIcons/World_64.svg
new file mode 100644
index 0000000..9bb1b13
--- /dev/null
+++ b/Content/Slate/Starship/AssetIcons/World_64.svg
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="LevelInstance_x5F_64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 64 64" style="enable-background:new 0 0 64 64;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st4{opacity:0.71;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);enable-background:new    ;}
+	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:#BFBFBF;}
+</style>
+<rect x="0" class="st0" width="64" height="64"/>
+<g>
+	<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="31.7585" y1="52.2752" x2="31.6489" y2="8.8496">
+		<stop  offset="0" style="stop-color:#333333"/>
+		<stop  offset="1" style="stop-color:#808080"/>
+	</linearGradient>
+	<rect x="10" y="8.9" class="st1" width="43.3" height="43.3"/>
+	<g>
+		
+			<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-876.4474" y1="17.3325" x2="-876.2009" y2="45.0627" gradientTransform="matrix(-1 0 0 1 -844.4957 0)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="1" style="stop-color:#999999"/>
+		</linearGradient>
+		<path class="st2" d="M47.3,45.2L40,28.7l-5.3,9.9l-7.8-20.6L16.1,45.2H47.3z"/>
+		<polygon class="st3" points="26.8,17.9 30.1,26.6 27.8,24.4 26.5,28.5 25.5,24.1 24.1,24.9 		"/>
+		<polygon class="st3" points="40,28.7 42.7,34.8 41.2,33.5 40.4,35.8 39.5,32.9 37.2,33.7 		"/>
+		<polygon class="st4" points="39.5,30.6 34.5,41.5 28.3,24.7 28.7,22.7 34.6,38.5 38.2,31.9 		"/>
+	</g>
+	<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="31.7096" y1="54.348" x2="31.663" y2="35.8929">
+		<stop  offset="0.3858" style="stop-color:#E6E6E6"/>
+		<stop  offset="1" style="stop-color:#404040"/>
+	</linearGradient>
+	<path class="st5" d="M50.7,48.3L46.6,36l6.8,13.3v5.4H10v-5.4l6.8-13.5l-4.1,12.5H50.7z"/>
+	<rect x="10" y="49.3" class="st6" width="43.3" height="5.4"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/BehaviorTree/BehaviorTree_20.svg b/Content/Slate/Starship/BehaviorTree/BehaviorTree_20.svg
new file mode 100644
index 0000000..b38f5b3
--- /dev/null
+++ b/Content/Slate/Starship/BehaviorTree/BehaviorTree_20.svg
@@ -0,0 +1,9 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 17H14V19H19V17Z" fill="white"/>
+<path d="M5 17H0V19H5V17Z" fill="white"/>
+<path d="M12 17H7V19H12V17Z" fill="white"/>
+<path d="M13 9H6V12H13V9Z" fill="white"/>
+<path d="M15 1H4V6H15V1Z" fill="white"/>
+<path opacity="0.5" d="M10 6H9V10H10V6Z" fill="white"/>
+<path opacity="0.5" d="M9.25 11.75L3 18M9.75 11.75L16 18M9.5 12V18" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/BehaviorTree/Blackboard.svg b/Content/Slate/Starship/BehaviorTree/Blackboard.svg
new file mode 100644
index 0000000..74c93a7
--- /dev/null
+++ b/Content/Slate/Starship/BehaviorTree/Blackboard.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 3V11H2V3H14ZM15 2H1V12H15V2Z" fill="white"/>
+<path opacity="0.5" d="M12 12H10.5L12 16H13.5L12 12Z" fill="white"/>
+<path opacity="0.5" d="M5.5 12H4L2.5 16H4L5.5 12Z" fill="white"/>
+<path opacity="0.5" d="M8.5 0H7.5C7.36739 0 7.24025 0.0526552 7.14648 0.146423C7.05272 0.240192 7 0.367392 7 0.5V2H9V0.5C9 0.367392 8.94728 0.240192 8.85352 0.146423C8.75975 0.0526552 8.63261 0 8.5 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/BehaviorTree/BlackboardDecorator.svg b/Content/Slate/Starship/BehaviorTree/BlackboardDecorator.svg
new file mode 100644
index 0000000..c207d15
--- /dev/null
+++ b/Content/Slate/Starship/BehaviorTree/BlackboardDecorator.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 8.57007C6.933 8.57007 8.5 7.00307 8.5 5.07007C8.5 3.13707 6.933 1.57007 5 1.57007C3.067 1.57007 1.5 3.13707 1.5 5.07007C1.5 7.00307 3.067 8.57007 5 8.57007Z" fill="white"/>
+<path d="M5 18.5701C6.933 18.5701 8.5 17.0031 8.5 15.0701C8.5 13.1371 6.933 11.5701 5 11.5701C3.067 11.5701 1.5 13.1371 1.5 15.0701C1.5 17.0031 3.067 18.5701 5 18.5701Z" fill="white"/>
+<path opacity="0.5" d="M10.75 5.72986L15 9.99988L10.73 14.2699C10.5663 14.4347 10.4745 14.6576 10.4745 14.8899C10.4745 15.1222 10.5663 15.345 10.73 15.5099C10.8948 15.6735 11.1177 15.7654 11.35 15.7654C11.5823 15.7654 11.8051 15.6735 11.97 15.5099L17.48 9.99988L11.97 4.48987C11.8051 4.32621 11.5823 4.23438 11.35 4.23438C11.1177 4.23438 10.8948 4.32621 10.73 4.48987C10.569 4.65734 10.4807 4.88172 10.4844 5.11401C10.4882 5.34631 10.5837 5.56767 10.75 5.72986Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/BehaviorTree/BlackboardNewKey.svg b/Content/Slate/Starship/BehaviorTree/BlackboardNewKey.svg
new file mode 100644
index 0000000..8bcc3a7
--- /dev/null
+++ b/Content/Slate/Starship/BehaviorTree/BlackboardNewKey.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.41176 4C2.25136 4 0.5 5.567 0.5 7.5C0.5 9.433 2.25136 11 4.41176 11L15.5882 11C17.7486 11 19.5 9.433 19.5 7.5C19.5 5.567 17.7486 4 15.5882 4L4.41176 4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19 15H17V13H15V15H13V17H15V19H17V17H19V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/BehaviorTree/BlackboardService.svg b/Content/Slate/Starship/BehaviorTree/BlackboardService.svg
new file mode 100644
index 0000000..3a07c97
--- /dev/null
+++ b/Content/Slate/Starship/BehaviorTree/BlackboardService.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.00002 3.3999L0.400024 9.9999L7.00002 16.5999L8.75002 14.8499L3.90002 9.9999L8.75002 5.1499L7.00002 3.3999Z" fill="white"/>
+<path d="M6.40428 10.0055L13.0016 16.6028L19.5989 10.0055L13.0016 3.40817L6.40428 10.0055Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/BehaviorTree/Blackboard_20.svg b/Content/Slate/Starship/BehaviorTree/Blackboard_20.svg
new file mode 100644
index 0000000..59995dc
--- /dev/null
+++ b/Content/Slate/Starship/BehaviorTree/Blackboard_20.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18 3.92857V15.0714H2V3.92857H18ZM19 3H1V16H19V3Z" fill="white"/>
+<path opacity="0.5" d="M7.33002 16H5.33002L3.33002 20H5.33002L7.33002 16Z" fill="white"/>
+<path opacity="0.5" d="M14.67 16H12.67L14.67 20H16.67L14.67 16Z" fill="white"/>
+<path opacity="0.5" d="M10.5 0H9.5C9.36739 0 9.24022 0.0790285 9.14645 0.219681C9.05269 0.360333 9 0.551088 9 0.75V3H11V0.75C11 0.551088 10.9473 0.360333 10.8535 0.219681C10.7598 0.0790285 10.6326 0 10.5 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/BlueprintDiff.svg b/Content/Slate/Starship/Blueprints/BlueprintDiff.svg
new file mode 100644
index 0000000..3f171aa
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/BlueprintDiff.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="Blueprint"><rect class="cls-1" x="14" y="1" width="6" height="5" rx="1"/><rect class="cls-1" x="0.5" y="5.5" width="5" height="6" rx="1" transform="translate(-5.5 11.5) rotate(-90)"/><path class="cls-1" d="M15,10a5,5,0,1,0,5,5A5,5,0,0,0,15,10Zm2.91,3.4-3.57,4.84-2.49-2.5a.75.75,0,0,1,1.06-1.06l1.26,1.26,2.53-3.43a.75.75,0,0,1,1.21.89Z"/><path class="cls-2" d="M15,3H10.25A1.25,1.25,0,0,0,9,4.25V8H5V9H9v3.26a6.69,6.69,0,0,1,1-1.56v-6A.73.73,0,0,1,10.73,4H15Z"/><rect class="cls-3" width="20" height="20" transform="translate(0 20) rotate(-90)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Blueprints/Breakpoint_Disabled.svg b/Content/Slate/Starship/Blueprints/Breakpoint_Disabled.svg
new file mode 100644
index 0000000..4d0efd5
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/Breakpoint_Disabled.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.89 3L13 6.11V9.89L9.89 13H6.11L3 9.89V6.11L6.11 3H9.89ZM10.31 2H5.69L2 5.69V10.31L5.69 14H10.31L14 10.31V5.69L10.31 2Z" fill="black"/>
+<path d="M10.28 2L14 5.72V10.28L10.28 14H5.72L2 10.28V5.72L5.72 2H10.28ZM10.69 1H5.31L1 5.31V10.69L5.31 15H10.69L15 10.69V5.31L10.69 1Z" fill="white"/>
+<path d="M10.66 1L15 5.34V10.66L10.66 15H5.34L1 10.66V5.34L5.34 1H10.66ZM11.08 0H4.92L0 4.92V11.08L4.92 16H11.08L16 11.08V4.92L11.08 0Z" fill="black"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/Breakpoint_Invalid.svg b/Content/Slate/Starship/Blueprints/Breakpoint_Invalid.svg
new file mode 100644
index 0000000..b7dab8d
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/Breakpoint_Invalid.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.08 0H4.92L0 4.92V11.08L4.92 16H11.08L16 11.08V4.92L11.08 0Z" fill="black"/>
+<path d="M9.67 3H6.33L3 6.33V9.67L6.33 13H9.67L13 9.67V6.33L9.67 3ZM9 12H7V10H9V12ZM9 9H7V4H9V9Z" fill="white"/>
+<path d="M10.28 2L14 5.72V10.28L10.28 14H5.72L2 10.28V5.72L5.72 2H10.28ZM10.69 1H5.31L1 5.31V10.69L5.31 15H10.69L15 10.69V5.31L10.69 1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/Breakpoint_Mixed.svg b/Content/Slate/Starship/Blueprints/Breakpoint_Mixed.svg
new file mode 100644
index 0000000..5d07bc6
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/Breakpoint_Mixed.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g opacity="0.5">
+<path opacity="0.5" d="M10 2H6L2 6V10L6 14H10L14 10V6L10 2Z" fill="white"/>
+</g>
+<path d="M10.66 1L15 5.34V10.66L10.66 15H5.34L1 10.66V5.34L5.34 1H10.66ZM11.08 0H4.92L0 4.92V11.08L4.92 16H11.08L16 11.08V4.92L11.08 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/Breakpoint_Valid.svg b/Content/Slate/Starship/Blueprints/Breakpoint_Valid.svg
new file mode 100644
index 0000000..ef9ce43
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/Breakpoint_Valid.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.08 0H4.92L0 4.92V11.08L4.92 16H11.08L16 11.08V4.92L11.08 0Z" fill="black"/>
+<path d="M10.69 1H5.31L1 5.31V10.69L5.31 15H10.69L15 10.69V5.31L10.69 1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/CompileStatus_Background.svg b/Content/Slate/Starship/Blueprints/CompileStatus_Background.svg
new file mode 100644
index 0000000..bc94304
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/CompileStatus_Background.svg
@@ -0,0 +1,16 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 16H1V20H5V16Z" fill="white"/>
+<path d="M10 16H6V20H10V16Z" fill="white"/>
+<path d="M15 16H11V20H15V16Z" fill="white"/>
+<path d="M20 16H16V20H20V16Z" fill="white"/>
+<path d="M5 11H1V15H5V11Z" fill="white"/>
+<path d="M10 11H6V15H10V11Z" fill="white"/>
+<path d="M15 11H11V15H15V11Z" fill="white"/>
+<path d="M20 11H16V15H20V11Z" fill="white"/>
+<path d="M15 6H11V10H15V6Z" fill="white"/>
+<path d="M20 6H16V10H20V6Z" fill="white"/>
+<path d="M20 1H16V5H20V1Z" fill="white"/>
+<path opacity="0.5" d="M4 0H0V4H4V0Z" fill="white"/>
+<path opacity="0.5" d="M11 1H7V5H11V1Z" fill="white"/>
+<path opacity="0.5" d="M6 6H2V10H6V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/CompileStatus_Fail_Badge.svg b/Content/Slate/Starship/Blueprints/CompileStatus_Fail_Badge.svg
new file mode 100644
index 0000000..c558413
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/CompileStatus_Fail_Badge.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 4.99998C10.5109 4.99998 8.60322 5.79015 7.1967 7.19668C5.79018 8.6032 5 10.5109 5 12.5C5 14.4891 5.79018 16.3968 7.1967 17.8033C8.60322 19.2098 10.5109 20 12.5 20C14.4859 19.9895 16.3874 19.1959 17.7917 17.7917C19.1959 16.3874 19.9895 14.4859 20 12.5C20.0148 11.511 19.831 10.529 19.4593 9.61239C19.0877 8.69575 18.5358 7.86304 17.8363 7.16363C17.1369 6.46421 16.3042 5.91232 15.3876 5.54066C14.4709 5.169 13.489 4.98514 12.5 4.99998Z" fill="black"/>
+<path d="M12.5 6C11.2144 6 9.95772 6.38122 8.8888 7.09545C7.81988 7.80968 6.98676 8.82484 6.49479 10.0126C6.00282 11.2003 5.87409 12.5072 6.1249 13.7681C6.3757 15.029 6.99477 16.1872 7.90381 17.0962C8.81285 18.0052 9.97104 18.6243 11.2319 18.8751C12.4928 19.1259 13.7997 18.9972 14.9874 18.5052C16.1752 18.0132 17.1903 17.1801 17.9046 16.1112C18.6188 15.0423 19 13.7856 19 12.5C19.0053 11.6449 18.8408 10.7973 18.516 10.0063C18.1913 9.21528 17.7127 8.49661 17.108 7.89197C16.5034 7.28733 15.7847 6.80874 14.9937 6.48397C14.2027 6.15919 13.3551 5.99469 12.5 6Z" fill="white"/>
+<path d="M15.5 11H9.5C8.67157 11 8 11.6716 8 12.5C8 13.3284 8.67157 14 9.5 14H15.5C16.3284 14 17 13.3284 17 12.5C17 11.6716 16.3284 11 15.5 11Z" fill="black"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/CompileStatus_Good_Badge.svg b/Content/Slate/Starship/Blueprints/CompileStatus_Good_Badge.svg
new file mode 100644
index 0000000..5647d02
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/CompileStatus_Good_Badge.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 4.99998C10.5109 4.99998 8.60322 5.79015 7.1967 7.19668C5.79018 8.6032 5 10.5109 5 12.5C5 14.4891 5.79018 16.3968 7.1967 17.8033C8.60322 19.2098 10.5109 20 12.5 20C14.4859 19.9895 16.3874 19.1959 17.7917 17.7917C19.1959 16.3874 19.9895 14.4859 20 12.5C20.0148 11.511 19.831 10.529 19.4593 9.61239C19.0877 8.69575 18.5358 7.86304 17.8363 7.16363C17.1369 6.46421 16.3042 5.91232 15.3876 5.54066C14.4709 5.169 13.489 4.98514 12.5 4.99998Z" fill="black"/>
+<path d="M12.5 6C11.2144 6 9.95772 6.38122 8.8888 7.09545C7.81988 7.80968 6.98676 8.82484 6.49479 10.0126C6.00282 11.2003 5.87409 12.5072 6.1249 13.7681C6.3757 15.029 6.99477 16.1872 7.90381 17.0962C8.81285 18.0052 9.97104 18.6243 11.2319 18.8751C12.4928 19.1259 13.7997 18.9972 14.9874 18.5052C16.1752 18.0132 17.1903 17.1801 17.9046 16.1112C18.6188 15.0423 19 13.7856 19 12.5C19.0053 11.6449 18.8408 10.7973 18.516 10.0063C18.1913 9.21528 17.7127 8.49661 17.108 7.89197C16.5034 7.28733 15.7847 6.80874 14.9937 6.48397C14.2027 6.15919 13.3551 5.99469 12.5 6Z" fill="white"/>
+<path d="M8.70235 11.8355C8.88988 11.648 9.14424 11.5426 9.40945 11.5426C9.67467 11.5426 9.92902 11.648 10.1166 11.8355L12.945 14.6639L11.5308 16.0781L8.70235 13.2497C8.51481 13.0622 8.40945 12.8078 8.40945 12.5426C8.40945 12.2774 8.51481 12.023 8.70235 11.8355Z" fill="black"/>
+<path d="M11.5306 13.2452L15.0662 9.7097C15.2537 9.52217 15.5081 9.41681 15.7733 9.41681C16.0385 9.41681 16.2929 9.52217 16.4804 9.7097C16.6679 9.89724 16.7733 10.1516 16.7733 10.4168C16.7733 10.682 16.6679 10.9364 16.4804 11.1239L12.9449 14.6595L11.5306 13.2452Z" fill="black"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/CompileStatus_Unknown_Badge.svg b/Content/Slate/Starship/Blueprints/CompileStatus_Unknown_Badge.svg
new file mode 100644
index 0000000..1396258
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/CompileStatus_Unknown_Badge.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 4.99998C10.5109 4.99998 8.60322 5.79015 7.1967 7.19668C5.79018 8.6032 5 10.5109 5 12.5C5 14.4891 5.79018 16.3968 7.1967 17.8033C8.60322 19.2098 10.5109 20 12.5 20C14.4859 19.9895 16.3874 19.1959 17.7917 17.7917C19.1959 16.3874 19.9895 14.4859 20 12.5C20.0148 11.511 19.831 10.529 19.4593 9.61239C19.0877 8.69575 18.5358 7.86304 17.8363 7.16363C17.1369 6.46421 16.3042 5.91232 15.3876 5.54066C14.4709 5.169 13.489 4.98514 12.5 4.99998Z" fill="black"/>
+<path d="M12.5 6C11.2144 6 9.95772 6.38122 8.8888 7.09545C7.81988 7.80968 6.98676 8.82484 6.49479 10.0126C6.00282 11.2003 5.87409 12.5072 6.1249 13.7681C6.3757 15.029 6.99477 16.1872 7.90381 17.0962C8.81285 18.0052 9.97104 18.6243 11.2319 18.8751C12.4928 19.1259 13.7997 18.9972 14.9874 18.5052C16.1752 18.0132 17.1903 17.1801 17.9046 16.1112C18.6188 15.0423 19 13.7856 19 12.5C19.0053 11.6449 18.8408 10.7973 18.516 10.0063C18.1913 9.21528 17.7127 8.49661 17.108 7.89197C16.5034 7.28733 15.7847 6.80874 14.9937 6.48397C14.2027 6.15919 13.3551 5.99469 12.5 6ZM12.5 17.14C12.2251 17.14 11.9563 17.0585 11.7278 16.9057C11.4992 16.753 11.321 16.5359 11.2158 16.2819C11.1106 16.0279 11.0831 15.7485 11.1367 15.4788C11.1903 15.2092 11.3227 14.9615 11.5171 14.7671C11.7115 14.5727 11.9592 14.4403 12.2288 14.3867C12.4985 14.3331 12.7779 14.3606 13.0319 14.4658C13.2859 14.571 13.503 14.7492 13.6557 14.9778C13.8085 15.2063 13.89 15.4751 13.89 15.75C13.8799 16.1155 13.7302 16.4632 13.4717 16.7217C13.2132 16.9802 12.8655 17.1299 12.5 17.14ZM13.8 13.06C13.71 13.15 13.52 13.24 13.43 13.34C13.3321 13.5208 13.1809 13.6671 12.9969 13.7588C12.8129 13.8506 12.6051 13.8834 12.4017 13.8528C12.1984 13.8222 12.0095 13.7296 11.8606 13.5878C11.7118 13.4459 11.6103 13.2616 11.57 13.06C11.57 12.31 12.22 11.85 12.69 11.48C12.87 11.29 13.34 11.01 13.43 10.83C13.4136 10.5887 13.3104 10.3616 13.1394 10.1906C12.9684 10.0196 12.7413 9.91637 12.5 9.9C12.2725 9.91308 12.0562 10.0035 11.8871 10.1563C11.718 10.309 11.6061 10.515 11.57 10.74C11.528 10.995 11.389 11.2238 11.1821 11.3785C10.9752 11.5332 10.7164 11.6019 10.46 11.57C10.2032 11.5304 9.97195 11.3923 9.81516 11.1852C9.65837 10.978 9.58838 10.7179 9.62 10.46C9.66907 9.70811 10.0148 9.00651 10.5812 8.50954C11.1475 8.01257 11.8881 7.76094 12.64 7.81C13.3919 7.85907 14.0935 8.20481 14.5905 8.77117C15.0874 9.33753 15.3391 10.0781 15.29 10.83C15.2905 11.3075 15.1491 11.7744 14.8839 12.1714C14.6186 12.5684 14.2413 12.8777 13.8 13.06Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/CompileStatus_Warning_Badge.svg b/Content/Slate/Starship/Blueprints/CompileStatus_Warning_Badge.svg
new file mode 100644
index 0000000..4e0c266
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/CompileStatus_Warning_Badge.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.6777 17.0206L13.882 6.99279C13.6727 6.68669 13.3923 6.43634 13.0649 6.26337C12.7376 6.09039 12.3733 6 12.0034 6C11.6334 6 11.2691 6.09039 10.9418 6.26337C10.6145 6.43634 10.3341 6.68669 10.1248 6.99279L4.2891 17.0206C4.11104 17.3004 4.01149 17.6232 4.00094 17.9549C3.99038 18.2867 4.06922 18.6152 4.22915 18.9058C4.43522 19.25 4.72908 19.5327 5.0804 19.7249C5.43171 19.917 5.82776 20.0116 6.22766 19.9989H17.9889C18.3415 20.0069 18.6899 19.9211 18.9988 19.7503C19.3077 19.5794 19.5661 19.3296 19.7476 19.0262C19.9242 18.7188 20.0112 18.3679 19.9988 18.0133C19.9865 17.6588 19.8752 17.3148 19.6777 17.0206ZM11.9934 7.06299C11.9004 7.05264 11.8066 7.05264 11.7136 7.06299C11.8066 7.05264 11.9004 7.05264 11.9934 7.06299Z" fill="black"/>
+<path d="M18.8501 17.6201L13.0001 7.48005C12.8849 7.32298 12.7343 7.19524 12.5606 7.1072C12.3869 7.01915 12.1948 6.97327 12.0001 6.97327C11.8053 6.97327 11.6132 7.01915 11.4395 7.1072C11.2658 7.19524 11.1152 7.32298 11.0001 7.48005L5.14006 17.6201C4.73006 18.2601 5.25006 19.0001 6.14006 19.0001H18.0001C18.1684 19.0173 18.3382 18.9867 18.4899 18.9118C18.6417 18.837 18.7693 18.7208 18.858 18.5767C18.9468 18.4326 18.9931 18.2665 18.9917 18.0972C18.9903 17.928 18.9412 17.7626 18.8501 17.6201Z" fill="white"/>
+<path d="M12.29 9H11.71C11.3179 9 11 9.31788 11 9.71V14.29C11 14.6821 11.3179 15 11.71 15H12.29C12.6821 15 13 14.6821 13 14.29V9.71C13 9.31788 12.6821 9 12.29 9Z" fill="black"/>
+<path d="M12.53 16H11.47C11.2104 16 11 16.2104 11 16.47V17.53C11 17.7896 11.2104 18 11.47 18H12.53C12.7896 18 13 17.7896 13 17.53V16.47C13 16.2104 12.7896 16 12.53 16Z" fill="black"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/DebuggerArrow.svg b/Content/Slate/Starship/Blueprints/DebuggerArrow.svg
new file mode 100644
index 0000000..01c4b63
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/DebuggerArrow.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 10V15L13 8L4 1V10Z" fill="white"/>
+<path d="M4 1H3V15H4V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/HarvestBlueprintFromActors.svg b/Content/Slate/Starship/Blueprints/HarvestBlueprintFromActors.svg
new file mode 100644
index 0000000..24b454e
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/HarvestBlueprintFromActors.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 10H3V12L7 8L3 4V6H0V10Z" fill="white"/>
+<path opacity="0.5" d="M7 9V12C7 12.2652 7.10536 12.5196 7.29289 12.7071C7.48043 12.8946 7.73478 13 8 13H12V12H8.6C8.4447 11.9884 8.29871 11.9215 8.18859 11.8114C8.07847 11.7013 8.01155 11.5553 8 11.4V5.56C8.01155 5.4047 8.07847 5.25871 8.18859 5.14859C8.29871 5.03847 8.4447 4.97155 8.6 4.96H12V4H8C7.73478 4 7.48043 4.10536 7.29289 4.29289C7.10536 4.48043 7 4.73478 7 5V9Z" fill="white"/>
+<path d="M16 3V5C16 5.26522 15.8946 5.51957 15.7071 5.70711C15.5196 5.89464 15.2652 6 15 6H12C11.7348 6 11.4804 5.89464 11.2929 5.70711C11.1054 5.51957 11 5.26522 11 5V3C11 2.73478 11.1054 2.48043 11.2929 2.29289C11.4804 2.10536 11.7348 2 12 2H15C15.2652 2 15.5196 2.10536 15.7071 2.29289C15.8946 2.48043 16 2.73478 16 3Z" fill="white"/>
+<path d="M16 11V13C16 13.2652 15.8946 13.5196 15.7071 13.7071C15.5196 13.8946 15.2652 14 15 14H12C11.7348 14 11.4804 13.8946 11.2929 13.7071C11.1054 13.5196 11 13.2652 11 13V11C11 10.7348 11.1054 10.4804 11.2929 10.2929C11.4804 10.1054 11.7348 10 12 10H15C15.2652 10 15.5196 10.1054 15.7071 10.2929C15.8946 10.4804 16 10.7348 16 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/IP_Breakpoint.svg b/Content/Slate/Starship/Blueprints/IP_Breakpoint.svg
new file mode 100644
index 0000000..ee187cf
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/IP_Breakpoint.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 8L2 0H0V7L10 17L20 7V0H18L10 8Z" fill="white"/>
+<g opacity="0.5">
+<path opacity="0.5" d="M10 10L2 2H0V9L10 19L20 9V2H18L10 10Z" fill="white"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/Palette.svg b/Content/Slate/Starship/Blueprints/Palette.svg
new file mode 100644
index 0000000..dc37955
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/Palette.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 1H1V4H15V1Z" fill="white"/>
+<path d="M4 6H1V9H4V6Z" fill="white"/>
+<path opacity="0.5" d="M15 11H6V13H15V11Z" fill="white"/>
+<path opacity="0.5" d="M15 6H6V8H15V6Z" fill="white"/>
+<path d="M4 11H1V14H4V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/blueprint_Dif_has_graph.svg b/Content/Slate/Starship/Blueprints/blueprint_Dif_has_graph.svg
new file mode 100644
index 0000000..b8b002d
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/blueprint_Dif_has_graph.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447715 0 1V9C0 9.55229 0.447715 10 1 10H9C9.55229 10 10 9.55228 10 9V1C10 0.447715 9.55228 0 9 0H1ZM6 2H8V4H6V3.00006H4.7V6.99996H6V6H8V8H6V7.29996H4.3V5.14762H3V6H1V4H3V4.84762H4.3V2.60006H6V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/blueprint_Dif_missing_graph.svg b/Content/Slate/Starship/Blueprints/blueprint_Dif_missing_graph.svg
new file mode 100644
index 0000000..66dd8f8
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/blueprint_Dif_missing_graph.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 1H1V9H9V1ZM1 0C0.447715 0 0 0.447716 0 1V9C0 9.55229 0.447716 10 1 10H9C9.55229 10 10 9.55228 10 9V1C10 0.447715 9.55228 0 9 0H1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/diff_next.svg b/Content/Slate/Starship/Blueprints/diff_next.svg
new file mode 100644
index 0000000..b2b0e33
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/diff_next.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 10V15L16 8L7 1V10Z" fill="white"/>
+<path d="M4 1H1V15H4V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/diff_prev.svg b/Content/Slate/Starship/Blueprints/diff_prev.svg
new file mode 100644
index 0000000..0261a4a
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/diff_prev.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 5V1L0 8L9 15V5Z" fill="white"/>
+<path d="M12 15H15L15 1H12L12 15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_BlueprintEditor_EventGraph.svg b/Content/Slate/Starship/Blueprints/icon_BlueprintEditor_EventGraph.svg
new file mode 100644
index 0000000..c8a71cf
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_BlueprintEditor_EventGraph.svg
@@ -0,0 +1,9 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.99998 15.0001V17.0001C7.00881 17.1337 6.98901 17.2677 6.94188 17.393C6.89475 17.5183 6.82139 17.6321 6.72671 17.7268C6.63202 17.8215 6.51821 17.8949 6.39287 17.942C6.26754 17.9891 6.13358 18.0089 5.99998 18.0001H2.99998C2.86637 18.0089 2.73241 17.9891 2.60708 17.942C2.48174 17.8949 2.36793 17.8215 2.27324 17.7268C2.17856 17.6321 2.1052 17.5183 2.05807 17.393C2.01094 17.2677 1.99114 17.1337 1.99998 17.0001V15.0001C1.99114 14.8665 2.01094 14.7325 2.05807 14.6072C2.1052 14.4819 2.17856 14.368 2.27324 14.2734C2.36793 14.1787 2.48174 14.1053 2.60708 14.0582C2.73241 14.0111 2.86637 13.9913 2.99998 14.0001H5.99998C6.13358 13.9913 6.26754 14.0111 6.39287 14.0582C6.51821 14.1053 6.63202 14.1787 6.72671 14.2734C6.82139 14.368 6.89475 14.4819 6.94188 14.6072C6.98901 14.7325 7.00881 14.8665 6.99998 15.0001Z" fill="white"/>
+<path d="M19 5.00012V7.00012C19 7.26534 18.8946 7.51969 18.7071 7.70723C18.5196 7.89477 18.2652 8.00012 18 8.00012H15C14.7348 8.00012 14.4804 7.89477 14.2929 7.70723C14.1054 7.51969 14 7.26534 14 7.00012V5.00012C14 4.73491 14.1054 4.48055 14.2929 4.29302C14.4804 4.10548 14.7348 4.00012 15 4.00012H18C18.2652 4.00012 18.5196 4.10548 18.7071 4.29302C18.8946 4.48055 19 4.73491 19 5.00012Z" fill="white"/>
+<path d="M9.00002 3.7501V7.2501C9.02256 7.47279 8.99783 7.69773 8.92744 7.91021C8.85706 8.12268 8.7426 8.3179 8.59157 8.48309C8.44054 8.64828 8.25633 8.77972 8.051 8.86882C7.84567 8.95791 7.62384 9.00265 7.40002 9.0001H2.60002C2.37621 9.00265 2.15438 8.95791 1.94905 8.86882C1.74372 8.77972 1.55951 8.64828 1.40848 8.48309C1.25745 8.3179 1.14299 8.12268 1.07261 7.91021C1.00222 7.69773 0.977487 7.47279 1.00002 7.2501V3.7501C0.977487 3.52741 1.00222 3.30247 1.07261 3.09C1.14299 2.87753 1.25745 2.68231 1.40848 2.51712C1.55951 2.35193 1.74372 2.22048 1.94905 2.13139C2.15438 2.0423 2.37621 1.99756 2.60002 2.0001H7.40002C7.62384 1.99756 7.84567 2.0423 8.051 2.13139C8.25633 2.22048 8.44054 2.35193 8.59157 2.51712C8.7426 2.68231 8.85706 2.87753 8.92744 3.09C8.99783 3.30247 9.02256 3.52741 9.00002 3.7501Z" fill="white"/>
+<path opacity="0.5" d="M15 6.00012L5.09 5.97012L5 5.00012H15V6.00012Z" fill="white"/>
+<path opacity="0.5" d="M5 15.0001L5 5.00012H4L4 15.0001H5Z" fill="white"/>
+<path opacity="0.5" d="M14.4074 14.0913L7.29395 6.97778L6.58684 7.68489L13.7003 14.7984L14.4074 14.0913Z" fill="white"/>
+<path d="M18 14.0001V16.0001C18 16.2653 17.8946 16.5197 17.7071 16.7072C17.5196 16.8948 17.2652 17.0001 17 17.0001H14C13.7348 17.0001 13.4804 16.8948 13.2929 16.7072C13.1054 16.5197 13 16.2653 13 16.0001V14.0001C13 13.7349 13.1054 13.4806 13.2929 13.293C13.4804 13.1055 13.7348 13.0001 14 13.0001H17C17.2652 13.0001 17.5196 13.1055 17.7071 13.293C17.8946 13.4806 18 13.7349 18 14.0001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_AddDelegate.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddDelegate.svg
new file mode 100644
index 0000000..ebfc683
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddDelegate.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 17H7C5.59 17 5 16.41 5 15V11C5 9.59 5.59 9 7 9V10C6.14 10 6 10.14 6 11V15C6 15.86 6.14 16 7 16H10" fill="white"/>
+<path opacity="0.5" d="M13 11C13 10.14 12.86 10 12 10V9C13.41 9 14 9.59 14 11" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 14H15V12H13V14H11V16H13V18H15V16H17V14Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 4C7.8 4 9.6 5.9 10 11C8.8 6.8 7.9 6 4 6V8L0 5L4 2V4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 4C12.2 4 10.4 5.9 10 11C11.2 6.8 12.1 6 16 6V8L20 5L16 2V4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_AddFunction.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddFunction.svg
new file mode 100644
index 0000000..435f59d
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddFunction.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11.35 5.91944C11.4885 4.62609 11.912 3.37951 12.59 2.26944C12.59 2.26944 12.59 2.34944 12.59 2.38944C12.59 2.7077 12.7164 3.01293 12.9415 3.23797C13.1665 3.46302 13.4718 3.58944 13.79 3.58944C14.1083 3.58944 14.4135 3.46302 14.6385 3.23797C14.8636 3.01293 14.99 2.7077 14.99 2.38944C14.9918 2.16034 14.9325 1.9349 14.8183 1.7363C14.704 1.5377 14.539 1.37311 14.34 1.25944H14.24C13.6682 1.03331 13.0318 1.03331 12.46 1.25944C10.6 1.90944 9.93002 5.02944 9.93002 5.02944L9.83002 5.42944H6.35002L6.00002 6.36944H9.66002L8.34002 13.0894C7.48002 15.4494 6.13002 15.9594 5.40002 16.0894C5.46384 15.9164 5.49766 15.7338 5.50002 15.5494C5.51358 15.2036 5.38973 14.8665 5.15552 14.6116C4.92131 14.3568 4.59577 14.205 4.25002 14.1894C3.94452 14.2294 3.66163 14.3719 3.44768 14.5936C3.23372 14.8153 3.10139 15.103 3.07234 15.4098C3.0433 15.7165 3.11926 16.024 3.28779 16.2819C3.45633 16.5398 3.70744 16.7329 4.00002 16.8294C4.62289 17.0173 5.27863 17.0703 5.92359 16.985C6.56855 16.8996 7.18792 16.6778 7.74046 16.3344C8.29301 15.9909 8.76604 15.5337 9.12806 14.9932C9.49009 14.4526 9.73279 13.8411 9.84002 13.1994L11.09 7.40944H14.68L15.04 6.40944H11.26L11.35 5.91944Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 13.9994H15V11.9994H13V13.9994H11V15.9994H13V17.9994H15V15.9994H17V13.9994Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_AddGraph.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddGraph.svg
new file mode 100644
index 0000000..8e6e6c4
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddGraph.svg
@@ -0,0 +1,9 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.99998 15.0001V17.0001C7.00881 17.1337 6.98901 17.2677 6.94188 17.393C6.89475 17.5183 6.82139 17.6321 6.72671 17.7268C6.63202 17.8215 6.51821 17.8949 6.39287 17.942C6.26754 17.9891 6.13358 18.0089 5.99998 18.0001H2.99998C2.86637 18.0089 2.73241 17.9891 2.60708 17.942C2.48174 17.8949 2.36793 17.8215 2.27324 17.7268C2.17856 17.6321 2.1052 17.5183 2.05807 17.393C2.01094 17.2677 1.99114 17.1337 1.99998 17.0001V15.0001C1.99114 14.8665 2.01094 14.7325 2.05807 14.6072C2.1052 14.4819 2.17856 14.368 2.27324 14.2734C2.36793 14.1787 2.48174 14.1053 2.60708 14.0582C2.73241 14.0111 2.86637 13.9913 2.99998 14.0001H5.99998C6.13358 13.9913 6.26754 14.0111 6.39287 14.0582C6.51821 14.1053 6.63202 14.1787 6.72671 14.2734C6.82139 14.368 6.89475 14.4819 6.94188 14.6072C6.98901 14.7325 7.00881 14.8665 6.99998 15.0001Z" fill="white"/>
+<path d="M19 5.00012V7.00012C19 7.26534 18.8946 7.51969 18.7071 7.70723C18.5196 7.89477 18.2652 8.00012 18 8.00012H15C14.7348 8.00012 14.4804 7.89477 14.2929 7.70723C14.1054 7.51969 14 7.26534 14 7.00012V5.00012C14 4.73491 14.1054 4.48055 14.2929 4.29302C14.4804 4.10548 14.7348 4.00012 15 4.00012H18C18.2652 4.00012 18.5196 4.10548 18.7071 4.29302C18.8946 4.48055 19 4.73491 19 5.00012Z" fill="white"/>
+<path d="M9.00002 3.7501V7.2501C9.02256 7.47279 8.99783 7.69773 8.92744 7.91021C8.85706 8.12268 8.7426 8.3179 8.59157 8.48309C8.44054 8.64828 8.25633 8.77972 8.051 8.86882C7.84567 8.95791 7.62384 9.00265 7.40002 9.0001H2.60002C2.37621 9.00265 2.15438 8.95791 1.94905 8.86882C1.74372 8.77972 1.55951 8.64828 1.40848 8.48309C1.25745 8.3179 1.14299 8.12268 1.07261 7.91021C1.00222 7.69773 0.977487 7.47279 1.00002 7.2501V3.7501C0.977487 3.52741 1.00222 3.30247 1.07261 3.09C1.14299 2.87753 1.25745 2.68231 1.40848 2.51712C1.55951 2.35193 1.74372 2.22048 1.94905 2.13139C2.15438 2.0423 2.37621 1.99756 2.60002 2.0001H7.40002C7.62384 1.99756 7.84567 2.0423 8.051 2.13139C8.25633 2.22048 8.44054 2.35193 8.59157 2.51712C8.7426 2.68231 8.85706 2.87753 8.92744 3.09C8.99783 3.30247 9.02256 3.52741 9.00002 3.7501Z" fill="white"/>
+<path opacity="0.5" d="M15 6.00012L5.09 5.97012L5 5.00012H15V6.00012Z" fill="white"/>
+<path opacity="0.5" d="M5 15.0001L5 5.00012H4L4 15.0001H5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18 14.0001H16V12.0001H14V14.0001H12V16.0001H14V18.0001H16V16.0001H18V14.0001Z" fill="white"/>
+<path opacity="0.5" d="M14.4074 14.0913L7.29395 6.97778L6.58684 7.68489L13.7003 14.7984L14.4074 14.0913Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_AddMacro.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddMacro.svg
new file mode 100644
index 0000000..9352076
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddMacro.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8.24 2.81029L10 11.0003L14 2.53029C14.1076 2.3639 14.2559 2.22783 14.431 2.13506C14.606 2.04228 14.8019 1.99588 15 2.00029H18L17.7 2.78029C17.7 2.78029 16.37 2.91029 16.32 3.42029C16.27 3.93029 15.32 13.6703 15.27 14.4203C15.22 15.1703 16.51 15.3003 16.51 15.3003L16.38 16.0503H13.38C13.2724 16.0397 13.1681 16.0068 13.0739 15.9537C12.9797 15.9007 12.8975 15.8286 12.8326 15.7421C12.7677 15.6555 12.7216 15.5565 12.697 15.4512C12.6725 15.3458 12.6701 15.2366 12.69 15.1303L13.89 5.13029L10 13.0003C9.82 13.4003 9.17 14.0003 8.79 14.0003H8L6.49 4.50029L4.26 15.5003C4.23942 15.642 4.1704 15.7723 4.06467 15.8689C3.95894 15.9655 3.82302 16.0225 3.68 16.0303H2L2.09 15.2303C2.09 15.2303 3.09 15.2303 3.16 14.8803C3.23 14.5303 5.79 3.54029 5.92 3.15029C6.05 2.76029 4.84 2.71029 4.84 2.71029L5.08 2.00029H7C7.41 2.00029 8.15 2.34029 8.24 2.81029Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18 14.0002H16V12.0002H14V14.0002H12V16.0002H14V18.0002H16V16.0002H18V14.0002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_AddVariable.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddVariable.svg
new file mode 100644
index 0000000..769ceec
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_AddVariable.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18 14H16V12H14V14H12V16H14V18H16V16H18V14Z" fill="white"/>
+<path opacity="0.5" d="M3 2.00001H7C7.29 2.00001 7.35 2.22001 7.39 2.51001L9 12L14.46 2.30001C14.5167 2.20784 14.5961 2.13183 14.6907 2.07928C14.7853 2.02674 14.8918 1.99944 15 2.00001H17V3.00001C17 3.00001 15.82 2.83001 15.51 3.34001L8.11 15.62C8.04003 15.7353 7.94173 15.8307 7.82445 15.8972C7.70717 15.9637 7.57482 15.9991 7.44 16H6.6C6.6 16 4.82 3.79001 4.77 3.34001C4.72 2.89001 3 3.00001 3 3.00001V2.00001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_Delegate.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_Delegate.svg
new file mode 100644
index 0000000..c0ca0f6
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_Delegate.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 16H5C3.59 16 3 15.41 3 14V11C3 9.59 3.59 9 5 9V10C4.14 10 4 10.14 4 11V14C4 14.86 4.14 15 5 15H8" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 3.99997C10 3.99997 8.32 5.46997 8 9.99997C9 6.26997 9.88 5.99997 13 5.99997V7.77997L16 4.99997L13 2.21997V3.99997Z" fill="white"/>
+<path d="M8 16H11C12.41 16 13 15.41 13 14V11C13 9.59 12.41 9 11 9V10C11.86 10 12 10.14 12 11V14C12 14.86 11.86 15 11 15H8" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 3.99997C6 3.99997 7.68 5.46997 8 9.99997C7 6.26997 6.12 5.99997 3 5.99997V7.77997L0 4.99997L3 2.21997V3.99997Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_Function.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_Function.svg
new file mode 100644
index 0000000..8648000
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_Function.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.72002 6.0699C9.88111 4.96527 10.299 3.9138 10.94 2.99991C10.94 2.99991 10.94 3.05991 10.94 3.08991C10.94 3.36573 11.0496 3.63026 11.2446 3.8253C11.4397 4.02033 11.7042 4.12991 11.98 4.12991C12.2558 4.12991 12.5204 4.02033 12.7154 3.8253C12.9105 3.63026 13.02 3.36573 13.02 3.08991C13.0204 2.90249 12.9681 2.71873 12.8691 2.5596C12.7701 2.40047 12.6283 2.27237 12.46 2.18991H12.37C11.8725 2.00961 11.3275 2.00961 10.83 2.18991C9.21002 2.63991 8.58002 4.99991 8.58002 4.99991L8.40002 5.1199H5.40002L5.15002 6.1199H8.27002L7.27002 11.4199C7.11348 12.0161 6.79062 12.5555 6.33911 12.9751C5.8876 13.3948 5.32607 13.6773 4.72002 13.7899C4.78153 13.655 4.81227 13.5081 4.81002 13.3599C4.81002 13.0735 4.69624 12.7988 4.4937 12.5962C4.29116 12.3937 4.01646 12.2799 3.73002 12.2799C3.44359 12.2799 3.16889 12.3937 2.96635 12.5962C2.76381 12.7988 2.65002 13.0735 2.65002 13.3599C2.66114 13.605 2.75692 13.8386 2.92104 14.021C3.08517 14.2033 3.30746 14.3231 3.55002 14.3599C7.91002 15.1999 8.55002 11.4499 8.55002 11.4499L9.55002 7.05991H12.55L12.8 6.05991H9.64002L9.72002 6.0699Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_Macro.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_Macro.svg
new file mode 100644
index 0000000..df748c2
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_Macro.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2.92L10 12.29L14.55 2.61C14.662 2.4259 14.8189 2.27332 15.0061 2.16661C15.1933 2.05989 15.4045 2.00256 15.62 2H19L18.66 2.89C18.66 2.89 17.17 3.04 17.11 3.63C17.05 4.22 16 15.34 15.93 16.13C15.86 16.92 17.33 17.13 17.33 17.13L17.17 17.99H13.84C13.7241 17.9764 13.612 17.9399 13.5103 17.8826C13.4086 17.8253 13.3194 17.7484 13.2477 17.6562C13.176 17.5641 13.1234 17.4586 13.0929 17.346C13.0624 17.2333 13.0546 17.1157 13.07 17L14.43 5.52L10 14.57C9.8 15.03 9.07 15.72 8.63 15.71H7.75L6.05 4.86L3.54 17.39C3.51941 17.5514 3.44327 17.7005 3.32465 17.8118C3.20603 17.9232 3.05235 17.9897 2.89 18H1L1.11 17.09C1.11 17.09 2.21 17.09 2.3 16.69C2.39 16.29 5.3 3.76 5.41 3.32C5.52 2.88 4.19 2.81 4.19 2.81L4.46 2H6.62C7.09 2 7.92 2.38 8 2.92Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_OverrideFunction.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_OverrideFunction.svg
new file mode 100644
index 0000000..954d22f
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_OverrideFunction.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11.63 6.99994C11.7568 5.92285 12.1447 4.89302 12.76 3.99994C12.76 3.99994 12.76 4.06994 12.76 4.09994C12.7861 4.3723 12.9127 4.62517 13.1151 4.8092C13.3176 4.99322 13.5814 5.09518 13.855 5.09518C14.1286 5.09518 14.3924 4.99322 14.5949 4.8092C14.7973 4.62517 14.9239 4.3723 14.95 4.09994C14.9515 3.90588 14.8966 3.71557 14.7918 3.55221C14.687 3.38885 14.537 3.2595 14.36 3.17994H14.27C13.7425 2.99471 13.1675 2.99471 12.64 3.17994C10.94 3.70994 10.33 6.24994 10.33 6.24994L10.24 6.56994H7.06L6.78 7.41994H10.09L8.87 12.8799C8.69671 13.4949 8.35319 14.0483 7.87902 14.4765C7.40486 14.9046 6.81936 15.1901 6.19 15.2999C6.26776 15.1329 6.30192 14.9489 6.28928 14.7651C6.27665 14.5814 6.21765 14.4038 6.11777 14.249C6.0179 14.0942 5.88042 13.9672 5.71817 13.8799C5.55593 13.7927 5.37421 13.7479 5.19 13.7499C4.89507 13.7334 4.60537 13.8329 4.38295 14.0273C4.16052 14.2217 4.02306 14.4955 4 14.7899C4.00625 15.06 4.11163 15.3182 4.29604 15.5156C4.48046 15.7129 4.73103 15.8355 5 15.8599C9.6 16.7099 10.32 12.8599 10.32 12.8599L11.46 8.15994H14.74L15 7.35994H11.54L11.63 6.99994Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 1.73C2.2 1.73 0.4 3.37 0 7.73C1.2 4.15 2.1 3.46 6 3.46V5.19L10 2.59L6 0V1.73Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_Blueprint_Variable.svg b/Content/Slate/Starship/Blueprints/icon_Blueprint_Variable.svg
new file mode 100644
index 0000000..b4a3d7e
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_Blueprint_Variable.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 2H6.57C6.91 2 6.97 2.25 7.01 2.58L8.86 13.43L15.1 2.34C15.1645 2.23623 15.2543 2.15057 15.361 2.09109C15.4677 2.03161 15.5878 2.00026 15.71 2H18V3.14C18 3.14 16.65 2.95 16.3 3.53L7.84 17.53C7.76218 17.6628 7.65125 17.7731 7.51805 17.8503C7.38484 17.9274 7.23391 17.9686 7.08 17.97H6.08C6.08 17.97 4.08 4 4 3.53C3.92 3.06 2 3.14 2 3.14V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_horizontal_diff_view.svg b/Content/Slate/Starship/Blueprints/icon_horizontal_diff_view.svg
new file mode 100644
index 0000000..76ed7df
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_horizontal_diff_view.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 4L3 4L3 7L13 7L13 4Z" fill="white"/>
+<path d="M13 9L3 9L3 12L13 12L13 9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_kismet_findunused.svg b/Content/Slate/Starship/Blueprints/icon_kismet_findunused.svg
new file mode 100644
index 0000000..b729719
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_kismet_findunused.svg
@@ -0,0 +1,14 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 10.5L0 14.5699C0.0497835 14.9293 0.231594 15.2572 0.51 15.4899C0.742646 15.7683 1.07062 15.9501 1.43 15.9999L5.5 12L4.5 11.5L4 10.5Z" fill="white"/>
+<path d="M8.99997 14.0998C7.60141 14.1097 6.2315 13.7034 5.0645 12.9325C3.89751 12.1617 2.98616 11.0612 2.44637 9.77092C1.90659 8.48068 1.76276 7.05904 2.03319 5.68684C2.30362 4.31463 2.97609 3.05386 3.96505 2.0649C4.95401 1.07594 6.21477 0.403478 7.58698 0.133048C8.95919 -0.137382 10.3808 0.00644231 11.6711 0.546227C12.9613 1.08601 14.0618 1.99736 14.8327 3.16436C15.6035 4.33136 16.0099 5.70126 16 7.09983C16 8.95634 15.2625 10.7368 13.9497 12.0496C12.637 13.3623 10.8565 14.0998 8.99997 14.0998ZM8.99997 1.04983C7.81329 1.04983 6.65325 1.45172 5.66655 2.11101C4.67986 2.7703 3.91082 3.70737 3.4567 4.80373C3.00257 5.90008 2.88375 7.10648 3.11526 8.27037C3.34677 9.43426 3.91822 10.5034 4.75733 11.3425C5.59645 12.1816 6.66555 12.753 7.82943 12.9845C8.99332 13.2161 10.1997 13.0972 11.2961 12.6431C12.3924 12.189 13.3295 11.4199 13.9888 10.4332C14.6481 9.44655 15 8.28652 15 7.09983C15.0066 6.3077 14.8563 5.5221 14.5577 4.78837C14.2591 4.05463 13.8182 3.38729 13.2604 2.82483C12.7026 2.26237 12.0389 1.81594 11.3077 1.51129C10.5765 1.20664 9.79213 1.0498 8.99997 1.04983Z" fill="white"/>
+<path opacity="0.5" d="M11 3.99983H6.99995C6.98387 3.86464 6.99867 3.72755 7.04324 3.59891C7.08781 3.47026 7.16099 3.35341 7.25726 3.25713C7.35353 3.16086 7.47039 3.08769 7.59903 3.04312C7.72768 2.99855 7.86476 2.98375 7.99995 2.99983H9.99995C10.1343 2.98753 10.2698 3.00496 10.3967 3.05086C10.5236 3.09677 10.6389 3.17003 10.7343 3.26547C10.8297 3.3609 10.903 3.47615 10.9489 3.60306C10.9948 3.72998 11.0122 3.86543 11 3.99983Z" fill="white"/>
+<path opacity="0.5" d="M12.43 5.99988H5.57996C5.44735 5.99988 5.32017 5.9472 5.2264 5.85343C5.13263 5.75966 5.07996 5.63249 5.07996 5.49988C5.07996 5.36727 5.13263 5.24009 5.2264 5.14632C5.32017 5.05256 5.44735 4.99988 5.57996 4.99988H12.43C12.5626 4.99988 12.6897 5.05256 12.7835 5.14632C12.8773 5.24009 12.93 5.36727 12.93 5.49988C12.93 5.63249 12.8773 5.75966 12.7835 5.85343C12.6897 5.9472 12.5626 5.99988 12.43 5.99988Z" fill="white"/>
+<path opacity="0.5" d="M11 7.0498L10.49 9.9998H7.49L7 7.0498H6L6.42 10.5398C6.43453 10.6849 6.50142 10.8198 6.60817 10.9192C6.71491 11.0186 6.85421 11.0757 7 11.0798H11C11.1447 11.0754 11.2828 11.018 11.3879 10.9184C11.493 10.8188 11.5578 10.6841 11.57 10.5398L12 7.0498H11Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/icon_vertical_diff_view.svg b/Content/Slate/Starship/Blueprints/icon_vertical_diff_view.svg
new file mode 100644
index 0000000..8ef1c24
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/icon_vertical_diff_view.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 13V3H9V13H12Z" fill="white"/>
+<path d="M7 13V3H4V13H7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/pill.svg b/Content/Slate/Starship/Blueprints/pill.svg
new file mode 100644
index 0000000..94f4486
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/pill.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.3 5H4.7C3.20883 5 2 6.20883 2 7.7V8.3C2 9.79117 3.20883 11 4.7 11H11.3C12.7912 11 14 9.79117 14 8.3V7.7C14 6.20883 12.7912 5 11.3 5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/pillarray.svg b/Content/Slate/Starship/Blueprints/pillarray.svg
new file mode 100644
index 0000000..6e180b8
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/pillarray.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 0H0V4H4V0Z" fill="white"/>
+<path d="M10 0H6V4H10V0Z" fill="white"/>
+<path d="M16 0H12V4H16V0Z" fill="white"/>
+<path d="M4 6H0V10H4V6Z" fill="white"/>
+<path d="M10 6H6V10H10V6Z" fill="white"/>
+<path d="M16 6H12V10H16V6Z" fill="white"/>
+<path d="M4 12H0V16H4V12Z" fill="white"/>
+<path d="M10 12H6V16H10V12Z" fill="white"/>
+<path d="M16 12H12V16H16V12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/pillmapkey.svg b/Content/Slate/Starship/Blueprints/pillmapkey.svg
new file mode 100644
index 0000000..95a56b3
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/pillmapkey.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 0H0V4H4V0Z" fill="white"/>
+<path d="M4 6H0V10H4V6Z" fill="white"/>
+<path d="M4 12H0V16H4V12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/pillmapvalue.svg b/Content/Slate/Starship/Blueprints/pillmapvalue.svg
new file mode 100644
index 0000000..3d5b9dd
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/pillmapvalue.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 0H6V4H16V0Z" fill="white"/>
+<path d="M16 6H6V10H16V6Z" fill="white"/>
+<path d="M16 12H6V16H16V12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/pillset.svg b/Content/Slate/Starship/Blueprints/pillset.svg
new file mode 100644
index 0000000..faeaa89
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/pillset.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 7.99956V6.99956C1.62451 6.89501 2.23976 6.7412 2.84 6.53956C3.02865 6.44859 3.18802 6.30655 3.3 6.12956C3.44478 5.91383 3.53723 5.6673 3.57 5.40956C3.6183 5.04164 3.63836 4.67055 3.63 4.29956C3.60615 3.68664 3.64974 3.07296 3.76 2.46956C3.82982 2.152 3.99359 1.86279 4.23 1.63956C4.51974 1.39713 4.86221 1.22589 5.23 1.13956C5.68612 1.03782 6.15275 0.990826 6.62 0.999563H7V1.99956C6.69952 2.01634 6.4103 2.11967 6.16722 2.2971C5.92414 2.47453 5.73757 2.71849 5.63 2.99956C5.5431 3.18346 5.5052 3.3867 5.52 3.58956C5.52 3.86956 5.52 4.40956 5.46 5.19956C5.44584 5.56977 5.38194 5.9364 5.27 6.28956C5.18779 6.5495 5.05527 6.79074 4.88 6.99956C4.62654 7.36597 4.33121 7.70157 4 7.99956" fill="white"/>
+<path d="M4 7.99951C4.33723 8.31397 4.63295 8.67019 4.88 9.05951C5.05095 9.2601 5.18319 9.49067 5.27 9.73951C5.38194 10.0927 5.44584 10.4593 5.46 10.8295C5.5 11.6228 5.52 12.1628 5.52 12.4495C5.5061 12.6523 5.54395 12.8553 5.63 13.0395C5.74563 13.3117 5.93533 13.546 6.17752 13.7157C6.41972 13.8854 6.70468 13.9837 7 13.9995V14.9995H6.62C6.15021 15.0156 5.68019 14.9753 5.22 14.8795C4.85378 14.7889 4.51224 14.6181 4.22 14.3795C3.98551 14.1548 3.8221 13.8662 3.75 13.5495C3.64077 12.946 3.59718 12.3324 3.62 11.7195C3.63014 11.3418 3.61007 10.964 3.56 10.5895C3.52723 10.3318 3.43478 10.0852 3.29 9.86951C3.17802 9.69252 3.01865 9.55048 2.83 9.45951C2.23302 9.25838 1.62113 9.10457 1 8.99951V7.99951" fill="white"/>
+<path d="M12 7.99955C11.6688 7.70156 11.3735 7.36596 11.12 6.99955C10.947 6.79667 10.8146 6.56242 10.73 6.30955C10.6181 5.95638 10.5542 5.58976 10.54 5.21954C10.54 4.42954 10.48 3.88955 10.48 3.60955C10.4983 3.40004 10.4604 3.18944 10.37 2.99955C10.2624 2.71847 10.0759 2.47452 9.83278 2.29708C9.5897 2.11965 9.30048 2.01632 9 1.99955V0.999545H9.38C9.84979 0.983442 10.3198 1.02373 10.78 1.11955C11.1478 1.20587 11.4903 1.37711 11.78 1.61955C12.0164 1.84278 12.1802 2.13198 12.25 2.44955C12.3603 3.05294 12.4039 3.66662 12.38 4.27955C12.3706 4.6572 12.3907 5.03501 12.44 5.40954C12.4728 5.66728 12.5652 5.91382 12.71 6.12955C12.822 6.30653 12.9813 6.44858 13.17 6.53955C13.767 6.74067 14.3789 6.89448 15 6.99955V7.99955" fill="white"/>
+<path d="M15 7.99951V8.99951C14.3755 9.10406 13.7602 9.25787 13.16 9.45951C12.9713 9.55048 12.812 9.69252 12.7 9.86951C12.5552 10.0852 12.4628 10.3318 12.43 10.5895C12.3799 10.964 12.3599 11.3418 12.37 11.7195C12.3928 12.3324 12.3492 12.946 12.24 13.5495C12.1679 13.8662 12.0045 14.1548 11.77 14.3795C11.4778 14.6181 11.1362 14.7889 10.77 14.8795C10.3098 14.9753 9.83979 15.0156 9.37 14.9995H9V13.9995C9.2998 13.9803 9.58791 13.876 9.83056 13.6989C10.0732 13.5218 10.2603 13.2792 10.37 12.9995C10.456 12.8153 10.4939 12.6123 10.48 12.4095C10.48 12.1162 10.5 11.5762 10.54 10.7895C10.5542 10.4193 10.6181 10.0527 10.73 9.69951C10.8168 9.45067 10.9491 9.2201 11.12 9.01951C11.3698 8.64424 11.6654 8.30159 12 7.99951" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Blueprints/promotable_type_inner_icon.svg b/Content/Slate/Starship/Blueprints/promotable_type_inner_icon.svg
new file mode 100644
index 0000000..03d1da8
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/promotable_type_inner_icon.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 4 4" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 2C3 2.55228 2.55228 3 2 3C1.44772 3 1 2.55228 1 2C1 1.44772 1.44772 1 2 1C2.55228 1 3 1.44772 3 2Z" fill="white" stroke="white" stroke-width=".5"/>
+</svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Blueprints/promotable_type_outer_icon.svg b/Content/Slate/Starship/Blueprints/promotable_type_outer_icon.svg
new file mode 100644
index 0000000..45a9492
--- /dev/null
+++ b/Content/Slate/Starship/Blueprints/promotable_type_outer_icon.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="8" cy="8" r="7" stroke="white" stroke-width="2"/>
+</svg>
diff --git a/Content/Slate/Starship/ColorPicker/ColorThemes.svg b/Content/Slate/Starship/ColorPicker/ColorThemes.svg
new file mode 100644
index 0000000..1aa3bc8
--- /dev/null
+++ b/Content/Slate/Starship/ColorPicker/ColorThemes.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><path class="cls-1" d="M19,13v6H1V13H19m0-1H1a1,1,0,0,0-1,1v6a1,1,0,0,0,1,1H19a1,1,0,0,0,1-1V13a1,1,0,0,0-1-1Z"/><rect class="cls-1" x="0.5" y="12.5" width="6.5" height="7"/><rect class="cls-2" x="7" y="12" width="6" height="8"/><path class="cls-2" d="M16.73,6.06,5.9,10H19.2L18,6.66A1,1,0,0,0,16.73,6.06Z"/><path class="cls-2" d="M12.3,1.84a1,1,0,0,0-1.41,0l-7,7,11-4.38Z"/><path class="cls-2" d="M8.41,1.23a1,1,0,0,0-.33-.16L4.46.1A1,1,0,0,0,3.25.8L.86,9.72Z"/><rect class="cls-3" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/AddPlatformOverride.svg b/Content/Slate/Starship/Common/AddPlatformOverride.svg
new file mode 100644
index 0000000..c2df296
--- /dev/null
+++ b/Content/Slate/Starship/Common/AddPlatformOverride.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 5H1C0.4 5 0 5.5 0 6V15C0 15.6 0.5 16 1 16H6C6.6 16 7 15.5 7 15V6C7 5.5 6.5 5 6 5ZM3.5 15.5C2.9 15.5 2.5 15.1 2.5 14.5C2.5 13.9 2.9 13.5 3.5 13.5C4.1 13.5 4.5 13.9 4.5 14.5C4.5 15.1 4.1 15.5 3.5 15.5ZM6 13H1V6H6V13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0V4H2V1H15V10H16V0H1Z" fill="white"/>
+<path d="M16 13H13V16H11V13H8V11H11V8H13V11H16V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Adjust.svg b/Content/Slate/Starship/Common/Adjust.svg
new file mode 100644
index 0000000..890348b
--- /dev/null
+++ b/Content/Slate/Starship/Common/Adjust.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.85018 5.14603C8.47348 3.89034 8.72461 2.50909 9.60359 1.50454C10.6081 0.499999 11.9894 0.248864 13.2451 0.751137L11.1104 2.8858C10.6081 3.38807 10.6081 4.39261 11.1104 4.89489C11.6127 5.39716 12.6172 5.39716 13.1195 4.89489L15.2542 2.76023C15.7564 4.01591 15.3797 5.39716 14.5008 6.40171C13.4962 7.40625 12.115 7.65739 10.9848 7.28069L8.85018 5.14603Z" fill="white"/>
+<path opacity="0.5" d="M9.9804 8.03399L4.58097 13.4334C4.58097 13.9357 4.4554 14.5635 3.95313 14.9402C3.19972 15.6937 1.81847 15.6937 1.06506 14.9402C0.311648 14.1868 0.311648 12.8056 1.06506 12.0522C1.56733 11.5499 2.0696 11.4243 2.69744 11.4243L8.09688 6.0249L9.9804 8.03399ZM3.19972 12.8056C2.82301 12.4289 2.19517 12.4289 1.81847 12.8056C1.44176 13.1823 1.44176 13.8101 1.81847 14.1868C2.19517 14.5635 2.82301 14.5635 3.19972 14.1868C3.57642 13.8101 3.57642 13.1823 3.19972 12.8056Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Advanced.svg b/Content/Slate/Starship/Common/Advanced.svg
new file mode 100644
index 0000000..0801b08
--- /dev/null
+++ b/Content/Slate/Starship/Common/Advanced.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 7.99988C14 9.59988 15 11.0999 14.5 11.7999C14.1 12.5999 12.3 12.3999 9.89995 11.3999C9.59995 13.8999 8.79995 15.5999 7.89995 15.5999C6.99995 15.5999 6.19995 13.9999 5.89995 11.4999C3.59995 12.3999 1.79995 12.5999 1.29995 11.7999C0.999952 11.0999 1.99995 9.59988 3.99995 7.99988C1.99995 6.39988 0.999952 4.89989 1.39995 4.19989C1.79995 3.39989 3.59995 3.59988 5.99995 4.49988C6.39995 1.99988 7.09995 0.399902 7.99995 0.399902C8.89995 0.399902 9.69995 2.09988 9.99995 4.49988C12.3 3.59988 14.1 3.39989 14.6 4.19989C15 4.99989 14 6.49988 12 7.99988ZM4.19995 7.79987C4.69995 7.49987 5.19995 7.09989 5.69995 6.69989C5.69995 5.99989 5.79995 5.29987 5.89995 4.79987C3.69995 3.89987 1.99995 3.6999 1.69995 4.3999C1.29995 4.9999 2.39995 6.39987 4.19995 7.79987ZM5.89995 11.1999C5.79995 10.5999 5.69995 9.99987 5.69995 9.29987C5.09995 8.99987 4.59995 8.59989 4.19995 8.19989C2.29995 9.69989 1.29995 10.9999 1.69995 11.6999C2.09995 12.2999 3.79995 12.0999 5.89995 11.1999ZM5.69995 7.09985C5.19995 7.39985 4.79995 7.69988 4.39995 7.99988C4.79995 8.29988 5.19995 8.5999 5.69995 8.8999C5.69995 8.5999 5.69995 8.29988 5.69995 7.99988C5.69995 7.69988 5.69995 7.39985 5.69995 7.09985ZM6.09995 6.8999C6.09995 7.2999 6.09995 7.59988 6.09995 7.99988C6.09995 8.39988 6.09995 8.79985 6.19995 9.09985C6.49995 9.29985 6.79995 9.49989 7.09995 9.69989C7.39995 9.89989 7.69995 10.0999 8.09995 10.1999C8.39995 9.99989 8.69995 9.89989 9.09995 9.69989C9.39995 9.49989 9.69995 9.29985 9.99995 9.09985C9.99995 8.79985 9.99995 8.39988 9.99995 7.99988C9.99995 7.59988 9.99995 7.1999 9.99995 6.8999C9.69995 6.6999 9.39995 6.49987 9.09995 6.29987C8.79995 6.09987 8.39995 5.89987 8.09995 5.79987C7.79995 5.99987 7.49995 6.09987 7.09995 6.29987C6.69995 6.49987 6.29995 6.6999 6.09995 6.8999ZM7.69995 5.59985C7.19995 5.29985 6.69995 5.0999 6.29995 4.8999C6.19995 5.3999 6.19995 5.89988 6.09995 6.49988C6.29995 6.29988 6.59995 6.19988 6.89995 5.99988C7.09995 5.89988 7.39995 5.69985 7.69995 5.59985ZM6.09995 9.49988C6.09995 10.0999 6.19995 10.5999 6.19995 11.0999C6.69995 10.8999 7.09995 10.6999 7.59995 10.3999C7.29995 10.2999 6.99995 10.0999 6.79995 9.99988C6.59995 9.79988 6.29995 9.69988 6.09995 9.49988ZM9.69995 11.3999C9.09995 11.1999 8.59995 10.8999 7.99995 10.5999C7.39995 10.8999 6.79995 11.1999 6.29995 11.3999C6.59995 13.7999 7.29995 15.2999 7.99995 15.2999C8.69995 15.2999 9.39995 13.7999 9.69995 11.3999ZM6.29995 4.59985C6.89995 4.79985 7.39995 5.0999 7.99995 5.3999C8.59995 5.0999 9.19995 4.79985 9.69995 4.59985C9.39995 2.29985 8.79995 0.69989 7.99995 0.69989C7.19995 0.69989 6.59995 2.19985 6.29995 4.59985ZM7.99995 7.19989C8.39995 7.19989 8.79995 7.49988 8.79995 7.99988C8.79995 8.39988 8.49995 8.79987 7.99995 8.79987C7.59995 8.79987 7.19995 8.49988 7.19995 7.99988C7.19995 7.59988 7.59995 7.19989 7.99995 7.19989ZM8.29995 10.3999C8.79995 10.6999 9.29995 10.8999 9.69995 11.0999C9.79995 10.5999 9.79995 10.0999 9.89995 9.49988C9.69995 9.69988 9.39995 9.79988 9.09995 9.99988C8.89995 10.0999 8.59995 10.2999 8.29995 10.3999ZM9.89995 6.49988C9.89995 5.89988 9.79995 5.3999 9.69995 4.8999C9.19995 5.0999 8.79995 5.29985 8.29995 5.59985C8.49995 5.69985 8.79995 5.89988 9.09995 5.99988C9.39995 6.19988 9.69995 6.29988 9.89995 6.49988ZM9.99995 4.79987C10.1 5.39987 10.2 5.99989 10.2 6.69989C10.8 7.09989 11.3 7.39987 11.8 7.79987C13.7 6.39987 14.7 4.99987 14.3 4.29987C13.9 3.69987 12.2 3.89987 9.99995 4.79987ZM11.8 8.19989C11.3 8.59989 10.8 8.89987 10.2 9.29987C10.2 9.99987 10.1 10.5999 9.99995 11.1999C12.2 12.0999 13.9 12.3999 14.3 11.6999C14.7 10.9999 13.7 9.69989 11.8 8.19989ZM10.2 8.8999C10.6 8.5999 11.1 8.29988 11.5 7.99988C11.1 7.69988 10.7 7.39985 10.2 7.09985C10.2 7.39985 10.2 7.69988 10.2 7.99988C10.3 8.29988 10.3 8.5999 10.2 8.8999Z" fill="white" stroke="white" stroke-width="0.5083" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Align.svg b/Content/Slate/Starship/Common/Align.svg
new file mode 100644
index 0000000..414a5e6
--- /dev/null
+++ b/Content/Slate/Starship/Common/Align.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 4H4V8H16V4Z" fill="white"/>
+<path opacity="0.5" d="M19 11H1V16H19V11Z" fill="white"/>
+<path d="M11 0H9V20H11V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/AllClasses.svg b/Content/Slate/Starship/Common/AllClasses.svg
new file mode 100644
index 0000000..c5399a3
--- /dev/null
+++ b/Content/Slate/Starship/Common/AllClasses.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 8V13C0 14.1 0.9 15 2 15H8C9.1 15 10 14.1 10 13V8C10 6.9 9.1 6 8 6H2C0.9 6 0 6.9 0 8Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M12 11V6C12 4.9 11.1 4 10 4H4.00003C4.00003 4 4.00002 4 3.90002 4L2.90002 5H9.40002C10.2 5 10.9 5.7 10.9 6.5V12L12 11Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M14 9V4C14 2.9 13.1 2 12 2H6.00003C6.00003 2 6.00002 2 5.90002 2L4.90002 3H11.4C12.2 3 12.9 3.7 12.9 4.5V10L14 9Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16 7V2C16 0.9 15.1 0 14 0H8.00003C8.00003 0 8.00002 0 7.90002 0L6.90002 1H13.4C14.2 1 14.9 1.7 14.9 2.5V8L16 7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Animation.svg b/Content/Slate/Starship/Common/Animation.svg
new file mode 100644
index 0000000..1f6298c
--- /dev/null
+++ b/Content/Slate/Starship/Common/Animation.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15.1001 8.10039H12.4001L11.1001 5.90039C11.1001 5.90039 11.4001 6.70039 11.1001 7.30039L10.6001 8.10039L11.2001 9.20039C11.3001 9.40039 11.6001 9.60039 12.0001 9.60039H15.0001C15.4001 9.60039 15.8001 9.30039 15.8001 8.80039C15.8001 8.40039 15.5001 8.10039 15.1001 8.10039Z" fill="white"/>
+<path opacity="0.5" d="M5.80005 11.0996C5.40005 10.8996 5.10005 10.4996 5.00005 10.0996L3.90005 11.9996H1.10005C0.700049 11.9996 0.300049 12.2996 0.300049 12.7996C0.300049 13.1996 0.600049 13.5996 1.10005 13.5996H4.10005C4.40005 13.5996 4.70005 13.4996 4.80005 13.1996L6.00005 11.2996L5.80005 11.0996Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.3001 6.60043L6.0001 4.60043L7.7001 5.40043L5.5001 9.10043C5.4001 9.70043 5.6001 10.3004 6.2001 10.7004L6.3001 10.8004L9.4001 12.6004V15.2004C9.4001 15.6004 9.7001 16.0004 10.2001 16.0004C10.6001 16.0004 11.0001 15.7004 11.0001 15.2004V12.2004C11.0001 12.0004 10.9001 11.8004 10.7001 11.6004C10.7001 11.6004 10.7001 11.6004 10.6001 11.5004C10.6001 11.5004 10.6001 11.5004 10.5001 11.4004L8.6001 10.3004L10.2001 7.50043L10.6001 6.70043C10.9001 6.20043 10.8001 5.60043 10.4001 5.30043L9.3001 4.60043L9.1001 4.50043C9.0001 4.50043 8.9001 4.40043 8.9001 4.40043L6.2001 3.00043C5.8001 2.80043 5.4001 3.00043 5.2001 3.30043L3.2001 5.60043C2.9001 5.90043 2.9001 6.30043 3.2001 6.60043C3.5001 6.90043 4.0001 6.90043 4.3001 6.60043Z" fill="white"/>
+<path d="M12 5C13.1046 5 14 4.10457 14 3C14 1.89543 13.1046 1 12 1C10.8954 1 10 1.89543 10 3C10 4.10457 10.8954 5 12 5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/AntiAliasing.svg b/Content/Slate/Starship/Common/AntiAliasing.svg
new file mode 100644
index 0000000..c899207
--- /dev/null
+++ b/Content/Slate/Starship/Common/AntiAliasing.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 0V16H0L16 0Z" fill="white"/>
+<path d="M13 5V9H9V13H5V16H16V5H13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Apply.svg b/Content/Slate/Starship/Common/Apply.svg
new file mode 100644
index 0000000..1d61a92
--- /dev/null
+++ b/Content/Slate/Starship/Common/Apply.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.400391 9.9999C0.400391 7.4999 1.30039 5.2999 3.10039 3.5999C4.90039 1.7999 7.10039 0.899902 9.70039 0.899902C10.9004 0.899902 12.0004 1.0999 13.1004 1.4999L11.3004 2.8999C10.8004 2.7999 10.3004 2.6999 9.70039 2.6999C7.60039 2.6999 5.90039 3.3999 4.40039 4.8999C3.00039 6.2999 2.30039 7.9999 2.20039 9.9999V10.5999C2.20039 12.5999 3.00039 14.2999 4.40039 15.6999C5.90039 17.1999 7.60039 17.8999 9.70039 17.8999C11.8004 17.8999 13.6004 17.0999 15.1004 15.5999L12.5004 12.9999H19.1004V19.5999L16.5004 16.9999C14.6004 18.8999 12.4004 19.8999 9.80039 19.8999C7.20039 19.8999 5.00039 18.9999 3.20039 17.1999C1.40039 15.3999 0.500389 13.2999 0.500389 10.7999V9.9999H0.400391Z" fill="white"/>
+<path opacity="0.5" d="M10.1998 14.6L3.7998 10.3L5.4998 7.8L9.4998 11L16.5998 1L18.6998 2.4L10.1998 14.6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/AssetAudit.svg b/Content/Slate/Starship/Common/AssetAudit.svg
new file mode 100644
index 0000000..5d32a63
--- /dev/null
+++ b/Content/Slate/Starship/Common/AssetAudit.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.6 13.2999L0.9 15.9999C0.9 15.9999 0.7 15.9999 0.3 15.6999C-5.96046e-08 15.2999 0 15.0999 0 15.0999L2.7 12.3999L3.6 13.2999Z" fill="white"/>
+<path d="M6 6.89999C7.7 6.89999 9.1 8.3 9.1 10C9.1 11.7 7.7 13.1 6 13.1C4.3 13.1 2.9 11.7 2.9 10C2.9 8.3 4.3 6.89999 6 6.89999ZM6 6C3.8 6 2 7.8 2 10C2 12.2 3.8 14 6 14C8.2 14 10 12.2 10 10C10 7.8 8.2 6 6 6Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M11 5H16V12.1C16 12.6 15.6 13 15.1 13H10.5C10.9 12.2 11.2 11.3 11.2 10.3C11.2 7.39999 8.9 4.99999 6 4.79999V0.899994C6 0.399994 6.4 0 6.9 0H11V5ZM12 4H16L12 0V4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Atmosphere.svg b/Content/Slate/Starship/Common/Atmosphere.svg
new file mode 100644
index 0000000..7b58f0e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Atmosphere.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 6.4001L14 4.3001L10.5 5.4001C10.3 5.2001 10.2 5.0001 10 4.8001L11.9 1.9001L9.3 4.3001C9.1 4.2001 8.8 4.1001 8.6 4.1001L8 1.1001L7.5 4.2001C7.2 4.2001 7 4.3001 6.8 4.4001L4.1 2.0001L6 4.9001C5.8 5.1001 5.6 5.3001 5.5 5.5001L2 4.3001L5 6.4001C5 6.6001 4.9 6.8001 4.9 7.0001L1.5 7.3001L4.8 7.8001C5.7 7.7001 6.7 7.6001 8 7.6001C9.3 7.6001 10.3 7.7001 11.2 7.8001L14.5 7.3001L11.1 7.0001C11.1 6.8001 11 6.6001 11 6.4001Z" fill="white"/>
+<path opacity="0.5" d="M16 14.9999C16 14.9999 15.9 14.6999 15.8 14.1999C15.2 12.3999 13.1 9.3999 8 9.3999C2.9 9.3999 0.9 12.3999 0.2 14.1999C0.1 14.6999 0 14.9999 0 14.9999C0 14.9999 3.4 14.9999 8 14.9999C13 14.9999 16 14.9999 16 14.9999Z" fill="white"/>
+<path d="M16 15C16 15 14 10.1 8 10.1C2 10.1 0 15 0 15C0 15 1.5 9 8 9C14.5 9 16 15 16 15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/AutomationTools.svg b/Content/Slate/Starship/Common/AutomationTools.svg
new file mode 100644
index 0000000..072ffc7
--- /dev/null
+++ b/Content/Slate/Starship/Common/AutomationTools.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path opacity="0.5" d="M8 0L4.5 6H9.5L3 14L5.5 8H0.5L8 0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.29 8.22L15.85 6.66C16.0149 7.11196 16.0469 7.60166 15.9424 8.07125C15.8378 8.54083 15.601 8.97068 15.26 9.31C14.9291 9.64451 14.5102 9.8784 14.0518 9.98459C13.5934 10.0908 13.1143 10.0649 12.67 9.91L8.33001 14.26C8.34244 14.4904 8.30611 14.7208 8.22339 14.9362C8.14068 15.1516 8.01345 15.3471 7.85001 15.51C7.53318 15.8034 7.11501 15.9627 6.68327 15.9544C6.25152 15.9461 5.83977 15.7709 5.53442 15.4656C5.22907 15.1602 5.05388 14.7485 5.0456 14.3167C5.03732 13.885 5.1966 13.4668 5.49001 13.15C5.65982 12.9823 5.86398 12.8534 6.08842 12.7723C6.31286 12.6912 6.55222 12.6597 6.79001 12.68L11.1 8.37C10.9405 7.92058 10.9112 7.43522 11.0156 6.96989C11.12 6.50456 11.3538 6.07821 11.69 5.74C12.0343 5.39357 12.4722 5.15512 12.95 5.05387C13.4278 4.95263 13.9248 4.99298 14.38 5.17L12.81 6.73C12.614 6.92841 12.5041 7.19609 12.5041 7.475C12.5041 7.75392 12.614 8.02159 12.81 8.22C12.9037 8.32312 13.018 8.40551 13.1454 8.46189C13.2729 8.51827 13.4107 8.54739 13.55 8.54739C13.6894 8.54739 13.8272 8.51827 13.9546 8.46189C14.082 8.40551 14.1963 8.32312 14.29 8.22ZM7.23001 13.78C7.08414 13.6355 6.88683 13.5548 6.68148 13.5557C6.47612 13.5567 6.27955 13.6391 6.13501 13.785C5.99047 13.9309 5.90979 14.1282 5.91073 14.3335C5.91167 14.5389 5.99414 14.7355 6.14001 14.88C6.21084 14.9529 6.29557 15.0108 6.38918 15.0504C6.48279 15.0899 6.58339 15.1103 6.68501 15.1103C6.78664 15.1103 6.88723 15.0899 6.98084 15.0504C7.07446 15.0108 7.15918 14.9529 7.23001 14.88C7.30318 14.8083 7.36131 14.7227 7.401 14.6283C7.44068 14.5339 7.46112 14.4324 7.46112 14.33C7.46112 14.2276 7.44068 14.1262 7.401 14.0317C7.36131 13.9373 7.30318 13.8517 7.23001 13.78Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/BSP.svg b/Content/Slate/Starship/Common/BSP.svg
new file mode 100644
index 0000000..a1b1622
--- /dev/null
+++ b/Content/Slate/Starship/Common/BSP.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 16L0 12V7L9 10.5V16Z" fill="white"/>
+<path opacity="0.5" d="M16 7V2.5L8.5 0L0 2.5V7.5H0.8V2.9L8.2 5.9V10.6H9V5.9L15.3 3V7.5L9 10.5V16L16 12V7ZM8.5 5.2L2.2 2.6L8.5 0.799999L14.1 2.6L8.5 5.2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Basic.svg b/Content/Slate/Starship/Common/Basic.svg
new file mode 100644
index 0000000..ea01a04
--- /dev/null
+++ b/Content/Slate/Starship/Common/Basic.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M14.2 13.5999H11.8V14.7999H14.2V13.5999Z" fill="white"/>
+<path opacity="0.5" d="M13.4 16H12.6L12 15H14L13.4 16Z" fill="white"/>
+<path d="M13 6.3999C11.4 6.3999 10 7.8999 10 9.3999C10 10.1999 10.5 10.8999 11.1 11.4999C11.5 11.8999 11.8 12.4999 12.2 12.9999H13.8C14.2 12.3999 14.5 11.7999 14.9 11.4999C15.5 10.8999 16 10.1999 16 9.3999C16 7.8999 14.6 6.3999 13 6.3999Z" fill="white"/>
+<path d="M5.3 12.1V11.5H2.7V12.1C2.7 13.6 1.4 15 0 15H8C6.6 15 5.3 13.6 5.3 12.1Z" fill="white"/>
+<path d="M6.60002 10.2H1.40002V10.8H6.60002V10.2Z" fill="white"/>
+<path d="M8 15H0V16H8V15Z" fill="white"/>
+<path d="M3.99998 9.8C5.04932 9.8 5.89998 8.94934 5.89998 7.9C5.89998 6.85066 5.04932 6 3.99998 6C2.95063 6 2.09998 6.85066 2.09998 7.9C2.09998 8.94934 2.95063 9.8 3.99998 9.8Z" fill="white"/>
+<path d="M8.9 0L5 1.8V5.5L8.9 7V0Z" fill="white"/>
+<path opacity="0.5" d="M12 5.5L8.90002 7V0L12 1.8V5.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/BlueprintDebugger.svg b/Content/Slate/Starship/Common/BlueprintDebugger.svg
new file mode 100644
index 0000000..4264a75
--- /dev/null
+++ b/Content/Slate/Starship/Common/BlueprintDebugger.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9.2 5.7L7 5.2C6.8 5.3 6.7 5.4 6.6 5.6L8 7L7.5 7.5L6 6C5.9 6.1 5.7 6.2 5.6 6.3L6.2 8.7L5.5 9L4.9 6.6C4.3 6.7 3.7 6.6 3.3 6.2C2.9 5.8 2.8 5.2 3 4.6L0.5 4L0.8 3.3L3.2 3.9C3.3 3.8 3.4 3.6 3.4 3.5L2 2L2.5 1.5L3.9 2.9C4 2.8 4.2 2.7 4.3 2.6L3.8 0.3L4.5 0L5 2.1C5.9 1.7 6.8 1.7 7.3 2.2C7.8 2.7 7.8 3.6 7.4 4.5L9.5 5L9.2 5.7Z" fill="white"/>
+<path d="M8 10.5V12.5C8 12.8 7.8 13 7.5 13H4.5C4.2 13 4 12.8 4 12.5V10.5C4 10.2 4.2 10 4.5 10H7.5C7.8 10 8 10.2 8 10.5Z" fill="white"/>
+<path d="M16 7.5V9.5C16 9.8 15.8 10 15.5 10H12.5C12.2 10 12 9.8 12 9.5V7.5C12 7.2 12.2 7 12.5 7H15.5C15.8 7 16 7.2 16 7.5Z" fill="white"/>
+<path d="M16 13.5V15.5C16 15.8 15.8 16 15.5 16H12.5C12.2 16 12 15.8 12 15.5V13.5C12 13.2 12.2 13 12.5 13H15.5C15.8 13 16 13.2 16 13.5Z" fill="white"/>
+<path opacity="0.5" d="M14 9V8H10C9.5 8 9 8.5 9 9V11H8V12H9V14C9 14.6 9.5 15 10 15H14V14H10.6C10.3 14 10 13.7 10 13.4V9.6C10 9.3 10.3 9 10.6 9H14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Bookmarks.svg b/Content/Slate/Starship/Common/Bookmarks.svg
new file mode 100644
index 0000000..378ab72
--- /dev/null
+++ b/Content/Slate/Starship/Common/Bookmarks.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 2H5V9.8L2 13V0H10V2Z" fill="white"/>
+<path d="M13 16L9.5 12.1L6 16V3H13V16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/BrowseContent.svg b/Content/Slate/Starship/Common/BrowseContent.svg
new file mode 100644
index 0000000..9b03cfc
--- /dev/null
+++ b/Content/Slate/Starship/Common/BrowseContent.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.59003 13.3099L6.90003 15.9999C6.67582 15.964 6.4728 15.8465 6.33003 15.6699C5.99003 15.3399 6.00003 15.0999 6.00003 15.0999L8.69003 12.4099L9.59003 13.3099Z" fill="white"/>
+<path d="M12 7.5C12.4945 7.5 12.9778 7.64662 13.3889 7.92133C13.8 8.19603 14.1205 8.58646 14.3097 9.04327C14.4989 9.50009 14.5484 10.0028 14.452 10.4877C14.3555 10.9727 14.1174 11.4181 13.7678 11.7678C13.4181 12.1174 12.9727 12.3555 12.4877 12.452C12.0028 12.5484 11.5001 12.4989 11.0433 12.3097C10.5865 12.1205 10.196 11.8 9.92133 11.3889C9.64663 10.9778 9.5 10.4945 9.5 10C9.5 9.33696 9.76339 8.70108 10.2322 8.23224C10.7011 7.7634 11.337 7.5 12 7.5ZM12 6.25C11.2583 6.25 10.5333 6.46996 9.91661 6.88202C9.29993 7.29407 8.81929 7.87972 8.53546 8.56494C8.25163 9.25016 8.17736 10.0041 8.32206 10.7316C8.46675 11.459 8.82391 12.1272 9.34835 12.6517C9.8728 13.1761 10.541 13.5332 11.2684 13.6779C11.9958 13.8226 12.7498 13.7484 13.4351 13.4645C14.1203 13.1807 14.706 12.7001 15.118 12.0834C15.5301 11.4667 15.75 10.7417 15.75 10C15.75 9.00544 15.3549 8.05159 14.6517 7.34833C13.9484 6.64507 12.9946 6.25 12 6.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.93 3H8.27L5.93 0.369995C5.83211 0.255804 5.71104 0.163769 5.57483 0.0999756C5.43862 0.0361817 5.29039 0.00209463 5.14 0H1C0.734784 0 0.480429 0.105371 0.292892 0.292908C0.105356 0.480444 0 0.734784 0 1V3V12.92C0.00260268 13.0644 0.0336407 13.207 0.0913391 13.3395C0.149038 13.4719 0.232267 13.5917 0.336273 13.692C0.44028 13.7923 0.563028 13.8711 0.697502 13.924C0.831976 13.9768 0.975542 14.0027 1.12 14H5.12C5.69 13.47 6.41 12.79 7.06 12.15C6.76444 11.4346 6.62796 10.6634 6.66 9.89001C6.7396 8.48939 7.35526 7.17311 8.3793 6.21423C9.40333 5.25536 10.7572 4.72745 12.16 4.73999C12.7008 4.74675 13.2373 4.83787 13.75 5.01001C14.1897 5.20857 14.6142 5.43919 15.02 5.70001V4C15.0206 3.86075 14.992 3.72293 14.9363 3.59534C14.8805 3.46775 14.7986 3.35323 14.696 3.25909C14.5934 3.16496 14.4723 3.09326 14.3404 3.04865C14.2085 3.00403 14.0687 2.98747 13.93 3V3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/BrushWireframe.svg b/Content/Slate/Starship/Common/BrushWireframe.svg
new file mode 100644
index 0000000..c6bafb4
--- /dev/null
+++ b/Content/Slate/Starship/Common/BrushWireframe.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 15C3.3 15 0 11.7 0 7.5C0 3.3 3.3 0 7.5 0C11.7 0 15 3.3 15 7.5C15 11.7 11.7 15 7.5 15ZM7.5 1C3.9 1 1 3.9 1 7.5C1 11.1 3.9 14 7.5 14C11.1 14 14 11.1 14 7.5C14 3.9 11.1 1 7.5 1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.1 8.1999C14.1 8.1999 13.1 9.2999 11.2 9.9999C11.3 9.2999 11.4 8.5999 11.5 7.7999H14.4V7.0999H11.5C11.5 6.2999 11.4 5.5999 11.2 4.8999C13.1 5.5999 14.1 6.6999 14.1 6.6999L14.6 6.2999V6.1999C14.3 5.8999 13.1 4.7999 11 4.0999C10.3 1.9999 9.20002 0.799902 8.90002 0.499902H8.80002L8.20002 0.899902C8.20002 0.899902 9.30002 1.8999 10 3.7999C9.40002 3.6999 8.70002 3.5999 7.90002 3.4999V0.599902H7.10002V3.4999C6.30002 3.4999 5.60002 3.5999 4.90002 3.7999C5.60002 1.8999 6.70002 0.899902 6.70002 0.899902L6.30002 0.399902H6.20002C5.90002 0.699902 4.70002 1.8999 4.10002 4.0999C1.90002 4.6999 0.700024 5.8999 0.400024 6.1999V6.2999L0.900024 6.6999C0.900024 6.6999 1.90002 5.5999 3.80002 4.8999C3.70002 5.5999 3.60002 6.2999 3.50002 7.0999H0.600024V7.8999H3.50002C3.50002 8.6999 3.60002 9.3999 3.80002 10.0999C1.90002 9.2999 0.900024 8.2999 0.900024 8.1999L0.400024 8.6999V8.7999C0.700024 9.0999 1.90002 10.2999 4.00002 10.8999C4.70002 12.9999 5.80002 14.1999 6.10002 14.4999H6.20002L6.60002 13.9999C6.60002 13.9999 5.50002 12.9999 4.80002 11.0999C5.50002 11.1999 6.20002 11.2999 7.00002 11.3999V14.2999H7.80002V11.3999C8.60002 11.3999 9.30002 11.2999 10 11.0999C9.30002 12.9999 8.20002 13.9999 8.20002 13.9999L8.60003 14.4999H8.70002C9.00002 14.1999 10.2 12.9999 10.8 10.8999C12.9 10.1999 14.1 9.0999 14.4 8.7999V8.6999L14.1 8.1999ZM7.10002 10.6999C6.20002 10.6999 5.40002 10.4999 4.60002 10.2999C4.50002 9.5999 4.30002 8.7999 4.30002 7.8999H7.10002V10.6999ZM7.10002 7.0999H4.30002C4.30002 6.1999 4.50002 5.3999 4.70002 4.5999C5.40002 4.3999 6.20002 4.2999 7.20002 4.1999V7.0999H7.10002ZM10.3 10.2999C9.60003 10.4999 8.80002 10.5999 7.80002 10.6999V7.8999H10.6C10.7 8.7999 10.5 9.5999 10.3 10.2999ZM7.90002 7.0999V4.2999C8.80002 4.2999 9.60002 4.4999 10.4 4.6999C10.6 5.3999 10.7 6.1999 10.8 7.1999H7.90002V7.0999Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/BufferVisualization.svg b/Content/Slate/Starship/Common/BufferVisualization.svg
new file mode 100644
index 0000000..62d3687
--- /dev/null
+++ b/Content/Slate/Starship/Common/BufferVisualization.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 5H5V11H11V5Z" fill="white"/>
+<path opacity="0.5" d="M11 3H9V1H11V3ZM7 1H5V3H7V1ZM3 1H1V3H3V1ZM3 5H1V7H3V5ZM3 9H1V11H3V9ZM3 13H1V15H3V13ZM7 13H5V15H7V13ZM11 13H9V15H11V13ZM15 13H13V15H15V13ZM15 9H13V11H15V9ZM15 5H13V7H15V5ZM15 1H13V3H15V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Bug.svg b/Content/Slate/Starship/Common/Bug.svg
new file mode 100644
index 0000000..d9e162a
--- /dev/null
+++ b/Content/Slate/Starship/Common/Bug.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.6254 9.80592C12.4218 8.00953 12.8967 5.57186 11.6861 4.36125C10.4755 3.15064 8.03782 3.62551 6.24143 5.4219C4.44503 7.2183 3.97017 9.65596 5.18078 10.8666C6.39139 12.0772 8.82905 11.6023 10.6254 9.80592Z" fill="white"/>
+<path opacity="0.5" d="M5.49995 6.40001L3.09995 3.90001L3.99995 3.00001L6.29995 5.30001C5.99995 5.70001 5.69995 6.00001 5.49995 6.40001ZM7.99995 4.20001L7.09995 0.700012L5.99995 1.10001L6.89995 4.80001C7.29995 4.60001 7.59995 4.40001 7.99995 4.20001ZM11.2 9.10001L14.9 10L15.3 8.80001L11.8 8.00001C11.6 8.40001 11.4 8.70001 11.2 9.10001ZM5.09995 7.00001L1.09995 6.00001L0.699951 7.10001L4.69995 8.10001C4.69995 7.80001 4.89995 7.40001 5.09995 7.00001ZM10.6 9.70001C10.3 10 9.99995 10.3 9.59995 10.5L12 12.9L12.9 12L10.6 9.70001ZM7.79995 11.3L8.79995 15.3L9.99995 14.9L8.99995 10.9C8.59995 11.1 8.19995 11.3 7.79995 11.3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/CameraShake.svg b/Content/Slate/Starship/Common/CameraShake.svg
new file mode 100644
index 0000000..93fe13f
--- /dev/null
+++ b/Content/Slate/Starship/Common/CameraShake.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path opacity="0.5" d="M12.1 4.90002C12.1 4.90002 10.8 3.70002 8.60005 3.10002C6.00005 2.30002 3.00005 3.70002 3.00005 3.70002C3.00005 3.70002 5.60005 1.40002 8.80005 2.10002C11.4 2.70002 12.1 4.90002 12.1 4.90002ZM10.7 0.400017C7.90005 -0.699983 5.40005 0.900017 5.40005 0.900017C5.40005 0.900017 7.60005 -0.0999833 10.1 0.800017C12.5 1.70002 13.4 3.40002 13.4 3.40002C13.4 3.40002 13.5 1.50002 10.7 0.400017ZM5.20005 14C8.50005 13.8 9.80005 10.6 9.80005 10.6C9.80005 10.6 7.70005 12.9 4.90005 12.9C2.60005 12.9 0.800049 12 0.800049 12C0.800049 12 2.50005 14.1 5.20005 14ZM7.50005 15.8C10.1 15.1 10.5 12.6 10.5 12.6C10.5 12.6 9.80005 14.5 7.50005 15.2C5.30005 15.9 3.50005 15.2 3.50005 15.2C3.50005 15.2 4.90005 16.5 7.50005 15.8Z" fill="white"/>
+<path d="M8.2 11H2.8C2.3 11 2 10.7 2 10.2V5.8C2 5.3 2.3 5 2.8 5H8.3C8.7 5 9 5.3 9 5.8V10.3C9 10.7 8.7 11 8.2 11Z" fill="white"/>
+<path d="M10.2 7.50005V8.50005L14 11.2V4.80005L10.2 7.50005Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/Cinematics.svg b/Content/Slate/Starship/Common/Cinematics.svg
new file mode 100644
index 0000000..dc960f2
--- /dev/null
+++ b/Content/Slate/Starship/Common/Cinematics.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.33 1.1L10.28 1.9L10.25 4.23L12.3 3.43L12.33 1.1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.25003 2.3L7.19003 3.11L7.16003 5.44L9.22003 4.63L9.25003 2.3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.07996 6.64L6.12996 5.84L6.15996 3.51L4.10996 4.31L4.07996 6.64Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.36 0.699998L13.33 3.03L15.38 2.22L14.58 0.169998L13.36 0.699998Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.07994 4.71L0.189941 5.79L0.999941 7.85L3.04994 7.05L3.07994 4.71Z" fill="white"/>
+<path d="M16 8H1V16H16V8Z" fill="white" fill-opacity="0.5"/>
+<path d="M15 9V15H2V9H15ZM16 8H1V16H16V8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Class.svg b/Content/Slate/Starship/Common/Class.svg
new file mode 100644
index 0000000..ea7049a
--- /dev/null
+++ b/Content/Slate/Starship/Common/Class.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 0V4H14L10 0Z" fill="white"/>
+<path d="M9 5V0H2V16H14V5H9ZM8 12.5C9 12.5 9.9 11.9 10.3 11H12C11.6 12.8 9.9 14.1 8 14.1C5.7 14.1 3.9 12.3 3.9 10C3.9 7.7 5.7 5.89999 8 5.89999C9.9 5.89999 11.5 7.2 12 9H10.3C9.9 8.1 9 7.5 8 7.5C6.6 7.5 5.5 8.6 5.5 10C5.5 11.4 6.6 12.5 8 12.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Collision.svg b/Content/Slate/Starship/Common/Collision.svg
new file mode 100644
index 0000000..9001cbc
--- /dev/null
+++ b/Content/Slate/Starship/Common/Collision.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.5 8.5C6.70914 8.5 8.5 6.70914 8.5 4.5C8.5 2.29086 6.70914 0.5 4.5 0.5C2.29086 0.5 0.5 2.29086 0.5 4.5C0.5 6.70914 2.29086 8.5 4.5 8.5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15.8 5.99995L11.7 5.19995L14.5 0.199951L9.4 3.79996C9.4 3.99996 9.5 4.29995 9.5 4.49995C9.5 7.29995 7.3 9.49995 4.5 9.49995C4 9.49995 3.6 9.39996 3.1 9.29996L0 14L5.6 11.8L8 16L9.5 10.5L15.2 11.5L11.2 7.89996L15.8 5.99995Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Comment.svg b/Content/Slate/Starship/Common/Comment.svg
new file mode 100644
index 0000000..ad35be9
--- /dev/null
+++ b/Content/Slate/Starship/Common/Comment.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C3.6 0 0 2.7 0 6C0 8.4 1.9 10.5 4.7 11.4L2.5 16L7.6 12C7.7 12 7.9 12 8 12C12.4 12 16 9.3 16 6C16 2.7 12.4 0 8 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Component.svg b/Content/Slate/Starship/Common/Component.svg
new file mode 100644
index 0000000..46cdf10
--- /dev/null
+++ b/Content/Slate/Starship/Common/Component.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 1V5C11.9918 5.14874 11.9504 5.29375 11.879 5.42446C11.8075 5.55517 11.7078 5.66827 11.587 5.75549C11.4663 5.8427 11.3275 5.90183 11.181 5.92857C11.0344 5.9553 10.8838 5.94896 10.74 5.91C9.60001 5.63 9.12 5.06 7.5 5.06H7.38C6.75891 5.14584 6.18531 5.43986 5.75299 5.89397C5.32067 6.34809 5.05521 6.93544 5 7.56V8.5C5.05696 9.12394 5.32301 9.71034 5.755 10.1641C6.187 10.6179 6.75962 10.9124 7.38 11H7.5C9.12 11 9.60001 10.42 10.74 10.14C10.88 10.1015 11.0266 10.0939 11.1698 10.1177C11.313 10.1416 11.4493 10.1963 11.5692 10.2782C11.6891 10.36 11.7897 10.467 11.8641 10.5916C11.9385 10.7163 11.9849 10.8556 12 11V15H15V1H12Z" fill="#C0C0C0"/>
+<path d="M10 12.43C9.08649 12.9428 8.04612 13.1855 7 13.13C6.00776 13.0579 5.07 12.6487 4.34241 11.9702C3.61481 11.2917 3.14114 10.3848 3 9.4V6.6C3.14114 5.61521 3.61481 4.7083 4.34241 4.02982C5.07 3.35133 6.00776 2.94208 7 2.87C8.04612 2.81447 9.08649 3.05722 10 3.57V1H1V15H10V12.43Z" fill="#C0C0C0"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ComposureCompositing.svg b/Content/Slate/Starship/Common/ComposureCompositing.svg
new file mode 100644
index 0000000..9e10e2c
--- /dev/null
+++ b/Content/Slate/Starship/Common/ComposureCompositing.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 1.45V14.55L1 11.48V4.48L9 1.45ZM10 0L0 3.83V12.17L10 16V0Z" fill="white"/>
+<path d="M1.88 12.34V11.64C1.88752 11.3567 1.95202 11.0778 2.06967 10.82C2.18731 10.5622 2.35569 10.3307 2.56474 10.1394C2.7738 9.94807 3.01926 9.80082 3.28647 9.70643C3.55367 9.61204 3.83716 9.57244 4.12 9.59C5.98 9.67 8.12 11.76 8.12 13.59V14.83L1.88 12.34Z" fill="white"/>
+<path d="M5.93995 6.87C5.93995 8.22 5.04995 9.31 4.11995 9.3C3.18995 9.29 2.77995 8.48 2.77995 7.49C2.7623 7.01371 2.87849 6.542 3.11534 6.12839C3.3522 5.71478 3.70022 5.37584 4.11995 5.15C5.04995 4.78 5.93995 5.52 5.93995 6.87Z" fill="white"/>
+<path opacity="0.5" d="M11 3.99L15 2.45V11.65L11.6 5.38L11 6.55V13.08L16 15V13.5V1L11 2.92V3.99Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Compress.svg b/Content/Slate/Starship/Common/Compress.svg
new file mode 100644
index 0000000..17e85fd
--- /dev/null
+++ b/Content/Slate/Starship/Common/Compress.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-3{opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M7.58,17.36,2.47,12.24C1.19,11,3.11,9.05,4.39,7.77s3.19-3.2,4.47-1.92L14,11l.64-1.92L10.14,4.57c-1.92-1.92-5.55-1.48-8,1s-2.88,6.07-1,8L5.67,18Z"/><path class="cls-3" d="M19.74,7.77l-.64-.64a.9.9,0,0,0-.64-.27,1.89,1.89,0,0,1-1.38-.47L14.71,4a1.87,1.87,0,0,1-.47-1.37A.89.89,0,0,0,14,2l-.64-.64a.91.91,0,0,0-1.28,0L11.42,2a.91.91,0,0,0,0,1.28l.64.64a.89.89,0,0,0,.64.26,1.87,1.87,0,0,1,1.37.47L16.44,7a1.89,1.89,0,0,1,.47,1.38.9.9,0,0,0,.27.64l.64.64a.91.91,0,0,0,1.28,0l.64-.64A.91.91,0,0,0,19.74,7.77Z"/><rect class="cls-3" x="12.94" y="5.9" width="2.71" height="1.81" transform="translate(-0.63 12.1) rotate(-45)"/><rect class="cls-3" x="7.69" y="9.91" width="5.21" height="1.81" transform="translate(-4.63 10.44) rotate(-45)"/><path class="cls-3" d="M5.88,12.66l2.61,2.61.59-.59a1,1,0,0,0,0-1.41l-1.19-1.2a1,1,0,0,0-1.42,0Z"/><rect class="cls-4" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/Console.svg b/Content/Slate/Starship/Common/Console.svg
new file mode 100644
index 0000000..094f0d2
--- /dev/null
+++ b/Content/Slate/Starship/Common/Console.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.7 9L3 7.2V6L8 8.5V9.5L3 12V10.8L6.7 9Z" fill="white"/>
+<path d="M13 12H9V11H13V12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 2V15H16V2H0ZM15 14H1V3H15V14Z" fill="white"/>
+<path d="M15 2H1V5H15V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ContentBrowser.svg b/Content/Slate/Starship/Common/ContentBrowser.svg
new file mode 100644
index 0000000..fbac1e7
--- /dev/null
+++ b/Content/Slate/Starship/Common/ContentBrowser.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.6 13.2999L6.9 15.9999C6.9 15.9999 6.7 15.9999 6.3 15.6999C6 15.2999 6 15.0999 6 15.0999L8.7 12.3999L9.6 13.2999Z" fill="white"/>
+<path d="M12 7.19995C13.5 7.19995 14.8 8.39995 14.8 9.99995C14.8 11.6 13.6 12.8 12 12.8C10.4 12.8 9.19995 11.5 9.19995 9.99995C9.19995 8.49995 10.5 7.19995 12 7.19995ZM12 6.19995C9.89995 6.19995 8.19995 7.89995 8.19995 9.99995C8.19995 12.1 9.89995 13.8 12 13.8C14.1 13.8 15.8 12.1 15.8 9.99995C15.8 7.89995 14.1 6.19995 12 6.19995Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 13C0 13.6 0.4 14 1 14H5.1C5.7 13.5 6.4 12.8 7 12.1C6.7 11.4 6.6 10.6 6.6 9.8C6.8 7 9.3 4.7 12.1 4.7C12.7 4.7 13.2 4.8 13.7 5C14 5.1 14.5 5.4 15 5.7V5C15 4.4 14.6 4 14 4H0V13Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 1C0 0.5 0.5 0 1 0H5.1C5.4 0 5.7 0.1 5.9 0.4L8.3 3H0V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/CookContent.svg b/Content/Slate/Starship/Common/CookContent.svg
new file mode 100644
index 0000000..0f43c79
--- /dev/null
+++ b/Content/Slate/Starship/Common/CookContent.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 10H15C15 11.5913 14.3679 13.1174 13.2426 14.2426C12.1174 15.3679 10.5913 16 9 16H7C5.4087 16 3.88258 15.3679 2.75736 14.2426C1.63214 13.1174 1 11.5913 1 10Z" fill="white"/>
+<path opacity="0.5" d="M3.65002 0C3.65002 0 5.73002 1.38 5.73002 2.77C5.73002 4.16 3.65002 4.85 3.65002 6.23C3.78408 7.27639 4.25843 8.24969 5.00002 9C5.00002 9 2.27002 8.31 2.27002 6.23C2.27002 4.15 4.35002 4.15 4.35002 2.77C4.30763 1.80865 4.06943 0.866074 3.65002 0Z" fill="white"/>
+<path opacity="0.5" d="M7.65002 0C7.65002 0 9.73002 1.38 9.73002 2.77C9.73002 4.16 7.65002 4.85 7.65002 6.23C7.78408 7.27639 8.25843 8.24969 9.00002 9C9.00002 9 6.27002 8.31 6.27002 6.23C6.27002 4.15 8.35002 4.15 8.35002 2.77C8.30763 1.80865 8.06943 0.866074 7.65002 0V0Z" fill="white"/>
+<path opacity="0.5" d="M11.65 0C11.65 0 13.73 1.38 13.73 2.77C13.73 4.16 11.65 4.85 11.65 6.23C11.784 7.27639 12.2584 8.24969 13 9C13 9 10.23 8.31 10.23 6.23C10.23 4.15 12.31 4.15 12.31 2.77C12.2801 1.81146 12.0556 0.869015 11.65 0V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/CreateCamera.svg b/Content/Slate/Starship/Common/CreateCamera.svg
new file mode 100644
index 0000000..be53cb5
--- /dev/null
+++ b/Content/Slate/Starship/Common/CreateCamera.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8 8H2C1.4 8 1 7.6 1 7V1C1 0.4 1.4 0 2 0H8C8.6 0 9 0.4 9 1V7C9 7.6 8.6 8 8 8Z" fill="white"/>
+<path opacity="0.5" d="M9.90002 3.4001V4.6001L14 7.4001V0.600098L9.90002 3.4001Z" fill="white"/>
+<path d="M15 13H12V16H10V13H7V11H10V8H12V11H15V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Credits.svg b/Content/Slate/Starship/Common/Credits.svg
new file mode 100644
index 0000000..dbdc1ce
--- /dev/null
+++ b/Content/Slate/Starship/Common/Credits.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15 0H1V1H15V0Z" fill="white"/>
+<path d="M8 15C10.2091 15 12 13.2091 12 11C12 8.79086 10.2091 7 8 7C5.79086 7 4 8.79086 4 11C4 13.2091 5.79086 15 8 15Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8 5.5C9.08534 5.49787 10.1469 5.81807 11.05 6.42L14 2H2L5 6.42C5.88894 5.82746 6.9317 5.50769 8 5.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Crop.svg b/Content/Slate/Starship/Common/Crop.svg
new file mode 100644
index 0000000..46a5656
--- /dev/null
+++ b/Content/Slate/Starship/Common/Crop.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11 14H13V15H11V14ZM11 10H13V5V3H11H6V5H11V10Z" fill="white"/>
+<path d="M15 13H3V1C3 0.4 3.4 0 4 0C4.6 0 5 0.4 5 1V11H15C15.6 11 16 11.4 16 12C16 12.6 15.6 13 15 13Z" fill="white"/>
+<path d="M6 5H11V10H13V3H6V5Z" fill="white"/>
+<path d="M1 5H2V3H1C0.4 3 0 3.4 0 4C0 4.6 0.4 5 1 5Z" fill="white"/>
+<path d="M13 15V14H11V15C11 15.6 11.4 16 12 16C12.6 16 13 15.6 13 15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Curves.svg b/Content/Slate/Starship/Common/Curves.svg
new file mode 100644
index 0000000..e02fb5f
--- /dev/null
+++ b/Content/Slate/Starship/Common/Curves.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M0.50005 13.5C0.40005 11.6 0.70005 9.69995 1.90005 7.89995C2.20005 7.39995 2.60005 7.09995 3.00005 6.79995C3.50005 6.49995 4.00005 6.29995 4.50005 6.09995C5.50005 5.79995 6.60005 5.69995 7.60005 5.89995C8.70005 6.09995 9.70005 6.59995 10.4001 7.39995C11.1 8.19995 11.6001 8.99995 12.1001 9.79995C12.6001 10.6 13.0001 11.4 13.5001 11.9C13.6001 11.9999 13.8 12.2 13.9001 12.3C14.0001 12.4 14.1001 12.6 14.3001 12.8C14.6001 13.1 15.0001 13.4 15.4001 13.6C14.9001 13.8 14.4001 13.9 13.8001 13.8C13.5001 13.8 13.2001 13.7 13.0001 13.6C12.8001 13.4 12.6 13.2 12.4001 13C11.6 12.2 11.2001 11.3 10.7001 10.5C10.2001 9.69995 9.80005 8.89995 9.20005 8.39995C8.60005 7.79995 8.00005 7.49995 7.20005 7.29995C6.50005 7.19995 5.70005 7.19995 5.00005 7.49995C4.60005 7.59995 4.20005 7.79995 3.90005 7.99995C3.60005 8.29995 3.30005 8.59995 3.00005 8.79995C1.80005 9.99995 1.00005 11.7 0.50005 13.5Z" fill="white"/>
+<path d="M4.8787 4.50004L7 6.62134L9.1213 4.50004L7 2.37874L4.8787 4.50004Z" fill="white"/>
+<path opacity="0.5" d="M0.299927 4.5H13.6999" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M1.49998 5.89985C2.27317 5.89985 2.89998 5.27305 2.89998 4.49985C2.89998 3.72665 2.27317 3.09985 1.49998 3.09985C0.726777 3.09985 0.0999756 3.72665 0.0999756 4.49985C0.0999756 5.27305 0.726777 5.89985 1.49998 5.89985Z" fill="white"/>
+<path d="M12.5 5.89985C13.2732 5.89985 13.9 5.27305 13.9 4.49985C13.9 3.72665 13.2732 3.09985 12.5 3.09985C11.7268 3.09985 11.1 3.72665 11.1 4.49985C11.1 5.27305 11.7268 5.89985 12.5 5.89985Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/DataLayers.svg b/Content/Slate/Starship/Common/DataLayers.svg
new file mode 100644
index 0000000..0850621
--- /dev/null
+++ b/Content/Slate/Starship/Common/DataLayers.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 10.86L8.49 15L16 10.86L14.33 9.94L8.49 13.16L2.67 10L1 10.86Z" fill="white"/>
+<path opacity="0.5" d="M1 6.82C1 6.82 7.65 10.5 8.49 11L16 6.81L14.33 5.89L8.49 9.11L2.67 5.9C2.67 5.9 1 6.81 1 6.82Z" fill="white"/>
+<path d="M1 2.77C1 2.77 7.65 6.45 8.49 6.9L16 2.76L8.49 0C8.49 0 1 2.76 1 2.77Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Debug.svg b/Content/Slate/Starship/Common/Debug.svg
new file mode 100644
index 0000000..922aeb1
--- /dev/null
+++ b/Content/Slate/Starship/Common/Debug.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.5767 10.2256C12.3731 8.4292 12.848 5.99154 11.6374 4.78093C10.4268 3.57031 7.98912 4.04518 6.19272 5.84158C4.39633 7.63797 3.92146 10.0756 5.13207 11.2862C6.34269 12.4969 8.78035 12.022 10.5767 10.2256Z" fill="white"/>
+<path opacity="0.5" d="M5.49995 6.8001L3.09995 4.4001L3.99995 3.5001L6.29995 5.8001C5.99995 6.2001 5.69995 6.5001 5.49995 6.8001ZM7.99995 4.6001L7.09995 1.1001L5.99995 1.6001L6.89995 5.3001C7.29995 5.0001 7.59995 4.8001 7.99995 4.6001ZM11.2 9.6001L14.9 10.5001L15.3 9.3001L11.8 8.4001C11.6 8.9001 11.4 9.2001 11.2 9.6001ZM5.09995 7.5001L1.09995 6.5001L0.699951 7.7001L4.69995 8.7001C4.69995 8.2001 4.89995 7.9001 5.09995 7.5001ZM10.6 10.2001C10.3 10.5001 9.99995 10.8001 9.59995 11.0001L12 13.4001L12.9 12.5001L10.6 10.2001ZM7.79995 11.8001L8.79995 15.8001L9.99995 15.4001L8.99995 11.4001C8.59995 11.6001 8.19995 11.7001 7.79995 11.8001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Decals.svg b/Content/Slate/Starship/Common/Decals.svg
new file mode 100644
index 0000000..00f44c6
--- /dev/null
+++ b/Content/Slate/Starship/Common/Decals.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 8.7999L10.4 15.9999L0 11.1999L7.2 6.3999L16 8.7999Z" fill="white"/>
+<path d="M6 0.300049L14.2 4.10004C14.2 4.10004 12.7 8.20005 8 10C3.9 11.5 0 11.1 0 11.1C0 11.1 2.4 10.1 4.1 7.80005C6.2 5.00005 6 0.300049 6 0.300049Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/DetailLighting.svg b/Content/Slate/Starship/Common/DetailLighting.svg
new file mode 100644
index 0000000..a28d6d9
--- /dev/null
+++ b/Content/Slate/Starship/Common/DetailLighting.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M7 12L4 9L5 5L11 11L7 12Z" fill="white"/>
+<path opacity="0.5" d="M2 16L0 14L3 10L6 13L2 16Z" fill="white"/>
+<path d="M15.71 7.58001C15.71 7.58001 11.19 8.02001 11.19 8.07001C11.11 7.93001 11.04 7.79001 10.96 7.66001C10.88 7.53001 10.78 7.42001 10.7 7.31001L14.36 1.64001L8.71996 5.32001C8.59914 5.20659 8.47229 5.09977 8.33996 5.00001C8.19996 5.00001 8.04996 4.88001 7.90996 4.80001L8.53996 0.290009L6.45996 4.29001L9.04996 7.00001L11.2 9.10001L11.66 9.55001L15.71 7.58001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Details.svg b/Content/Slate/Starship/Common/Details.svg
new file mode 100644
index 0000000..c0ad983
--- /dev/null
+++ b/Content/Slate/Starship/Common/Details.svg
@@ -0,0 +1,9 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6 19H19V18H8L6 19Z" fill="white"/>
+<path opacity="0.5" d="M11 15H19V14H12L11 15Z" fill="white"/>
+<path opacity="0.5" d="M15 11H19V10H16L15 11Z" fill="white"/>
+<path opacity="0.5" d="M10 2H1V3H9L10 2Z" fill="white"/>
+<path opacity="0.5" d="M6 6H1V7H5L6 6Z" fill="white"/>
+<path d="M15.681 1.21858L17.8023 3.3399C17.9898 3.52744 18.0952 3.78173 18.0952 4.04694C18.0952 4.31216 17.9898 4.56658 17.8023 4.75412L7.25228 15.3041L3.71675 11.7686L14.2668 1.21858C14.4543 1.03104 14.7086 0.925558 14.9738 0.925558C15.239 0.925558 15.4934 1.03104 15.681 1.21858Z" fill="white"/>
+<path d="M5.96 16.56L2.44 13.04L0 19L5.96 16.56Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Developer.svg b/Content/Slate/Starship/Common/Developer.svg
new file mode 100644
index 0000000..6a86ab4
--- /dev/null
+++ b/Content/Slate/Starship/Common/Developer.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.69995 14.9999V14.5999C1.69995 10.5999 4.49995 8.29993 7.99995 8.29993C11.5 8.29993 14.3 10.5999 14.3 14.5999V14.9999H1.69995ZM7.99995 0.199951C6.09995 0.199951 4.59995 1.69991 4.59995 3.59991C4.59995 5.49991 6.09995 6.99994 7.99995 6.99994C9.89995 6.99994 11.4 5.49991 11.4 3.59991C11.4 1.69991 9.89995 0.199951 7.99995 0.199951Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/DeveloperTools.svg b/Content/Slate/Starship/Common/DeveloperTools.svg
new file mode 100644
index 0000000..30240e4
--- /dev/null
+++ b/Content/Slate/Starship/Common/DeveloperTools.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2901 8.22L15.8501 6.66C16.015 7.11196 16.0471 7.60166 15.9425 8.07125C15.838 8.54083 15.6012 8.97068 15.2601 9.31C14.9292 9.64451 14.5103 9.8784 14.0519 9.98459C13.5935 10.0908 13.1144 10.0649 12.6701 9.91L8.33013 14.26C8.34256 14.4904 8.30623 14.7208 8.22352 14.9362C8.1408 15.1516 8.01357 15.3471 7.85013 15.51C7.5333 15.8034 7.11513 15.9627 6.68339 15.9544C6.25164 15.9461 5.83989 15.7709 5.53454 15.4656C5.2292 15.1602 5.054 14.7485 5.04572 14.3167C5.03744 13.885 5.19672 13.4668 5.49013 13.15C5.65994 12.9823 5.8641 12.8534 6.08854 12.7723C6.31298 12.6912 6.55235 12.6597 6.79013 12.68L11.1001 8.37C10.9406 7.92058 10.9114 7.43522 11.0157 6.96989C11.1201 6.50456 11.3539 6.07821 11.6901 5.74C12.0344 5.39357 12.4723 5.15512 12.9501 5.05387C13.4279 4.95263 13.9249 4.99298 14.3801 5.17L12.8101 6.73C12.6141 6.92841 12.5042 7.19609 12.5042 7.475C12.5042 7.75392 12.6141 8.02159 12.8101 8.22C12.9039 8.32312 13.0181 8.40551 13.1455 8.46189C13.273 8.51827 13.4108 8.54739 13.5501 8.54739C13.6895 8.54739 13.8273 8.51827 13.9547 8.46189C14.0822 8.40551 14.1964 8.32312 14.2901 8.22ZM7.23013 13.78C7.08426 13.6355 6.88695 13.5548 6.6816 13.5557C6.47625 13.5567 6.27968 13.6391 6.13513 13.785C5.99059 13.9309 5.90991 14.1282 5.91085 14.3335C5.91179 14.5389 5.99426 14.7355 6.14013 14.88C6.21096 14.9529 6.29569 15.0108 6.3893 15.0504C6.48291 15.0899 6.58351 15.1103 6.68513 15.1103C6.78676 15.1103 6.88735 15.0899 6.98097 15.0504C7.07458 15.0108 7.1593 14.9529 7.23013 14.88C7.30331 14.8083 7.36144 14.7227 7.40112 14.6283C7.4408 14.5339 7.46125 14.4324 7.46125 14.33C7.46125 14.2276 7.4408 14.1262 7.40112 14.0317C7.36144 13.9373 7.30331 13.8517 7.23013 13.78Z" fill="white"/>
+<path d="M0.000110524 10V9.58C-0.0271775 9.04751 0.0576024 8.51523 0.248967 8.01756C0.440332 7.5199 0.734021 7.06795 1.11104 6.69093C1.48806 6.31391 1.94001 6.02022 2.43768 5.82886C2.93534 5.63749 3.46762 5.55271 4.00011 5.58C4.5326 5.55271 5.06488 5.63749 5.56255 5.82886C6.06021 6.02022 6.51216 6.31391 6.88918 6.69093C7.2662 7.06795 7.55989 7.5199 7.75125 8.01756C7.94262 8.51523 8.0274 9.04751 8.00011 9.58V10H0.000110524ZM4.00011 0.349998C3.57488 0.349998 3.1592 0.476094 2.80563 0.712339C2.45207 0.948584 2.1765 1.28437 2.01377 1.67723C1.85104 2.07009 1.80846 2.50238 1.89142 2.91944C1.97438 3.3365 2.17915 3.71959 2.47983 4.02028C2.78051 4.32096 3.16361 4.52573 3.58067 4.60869C3.99773 4.69165 4.43002 4.64907 4.82288 4.48634C5.21574 4.32361 5.55153 4.04804 5.78777 3.69447C6.02402 3.34091 6.15011 2.92523 6.15011 2.5C6.15011 2.21766 6.0945 1.93808 5.98645 1.67723C5.8784 1.41638 5.72004 1.17936 5.52039 0.979719C5.32074 0.780073 5.08373 0.621705 4.82288 0.513657C4.56203 0.40561 4.28245 0.349998 4.00011 0.349998Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/DeviceManager.svg b/Content/Slate/Starship/Common/DeviceManager.svg
new file mode 100644
index 0000000..4ffb343
--- /dev/null
+++ b/Content/Slate/Starship/Common/DeviceManager.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 5H1C0.4 5 0 5.5 0 6V15C0 15.6 0.5 16 1 16H6C6.6 16 7 15.5 7 15V6C7 5.5 6.5 5 6 5ZM3.5 15.5C2.9 15.5 2.5 15.1 2.5 14.5C2.5 13.9 2.9 13.5 3.5 13.5C4.1 13.5 4.5 13.9 4.5 14.5C4.5 15.1 4.1 15.5 3.5 15.5ZM6 13H1V6H6V13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0V4H2V1H15V10H8V11H16V3V0H1Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8 12.4999V13.9999C9.8 13.9999 11.7 13.9999 13.5 13.9999C9.8 11.9999 8 12.4999 8 12.4999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/DeviceProfiles.svg b/Content/Slate/Starship/Common/DeviceProfiles.svg
new file mode 100644
index 0000000..5564786
--- /dev/null
+++ b/Content/Slate/Starship/Common/DeviceProfiles.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 15.1V11.3C9.6 11.2 9.3 11 9 10.9V12H1V1H9V2.2C9.3 2 9.6 1.9 10 1.8V0.9C10 0.4 9.6 0 9.1 0H0.9C0.4 0 0 0.4 0 0.9V15C0 15.6 0.4 16 0.9 16H9C9.6 16 10 15.6 10 15.1ZM5 15.5C4.2 15.5 3.5 14.8 3.5 14C3.5 13.2 4.2 12.5 5 12.5C5.8 12.5 6.5 13.2 6.5 14C6.5 14.8 5.8 15.5 5 15.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8 7.0001C15.8 6.8001 15.9 6.6001 15.9 6.5001C15.9 6.3001 15.9 6.1001 15.8 6.0001L14.5 5.8001C14.4 5.5001 14.3 5.2001 14.2 5.0001L15 3.9001C14.8 3.6001 14.5 3.4001 14.2 3.1001L13.1 3.9001C12.8 3.7001 12.6 3.6001 12.3 3.6001L12 2.2001C11.8 2.2001 11.7 2.1001 11.5 2.1001C11.3 2.1001 11.1 2.1001 11 2.2001L10.8 3.5001C10.5 3.6001 10.2 3.7001 9.99998 3.8001L8.89998 3.1001C8.59998 3.3001 8.29998 3.6001 8.09998 3.9001L8.89998 5.0001C8.79998 5.2001 8.59998 5.5001 8.59998 5.8001L7.19998 6.0001C7.19998 6.2001 7.09998 6.4001 7.09998 6.5001C7.09998 6.7001 7.09998 6.9001 7.19998 7.0001L8.49998 7.2001C8.59998 7.5001 8.69998 7.8001 8.79998 8.0001L8.09998 9.1001C8.29998 9.4001 8.59998 9.6001 8.89998 9.9001L9.99998 9.1001C10.3 9.3001 10.5 9.4001 10.8 9.4001L11 10.7001C11.2 10.7001 11.4 10.8001 11.5 10.8001C11.7 10.8001 11.9 10.8001 12 10.7001L12.2 9.4001C12.5 9.3001 12.8 9.2001 13 9.1001L14.1 9.9001C14.4 9.7001 14.6 9.4001 14.9 9.1001L14.1 8.0001C14.3 7.7001 14.4 7.5001 14.4 7.2001L15.8 7.0001ZM11.5 8.4001C10.5 8.4001 9.59998 7.6001 9.59998 6.5001C9.59998 5.5001 10.4 4.6001 11.5 4.6001C12.6 4.6001 13.4 5.4001 13.4 6.5001C13.4 7.5001 12.5 8.4001 11.5 8.4001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/DirtyBadge.svg b/Content/Slate/Starship/Common/DirtyBadge.svg
new file mode 100644
index 0000000..b56c9f3
--- /dev/null
+++ b/Content/Slate/Starship/Common/DirtyBadge.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.1 4.5L14 7L10.1 8.3L12.5 11.5L10.4 13.2L8 9.8L5.6 13.2L3.4 11.6L5.8 8.4L2 7.1L2.9 4.6L6.6 6.1V2H9.2V6.1L13.1 4.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/DisableCollision.svg b/Content/Slate/Starship/Common/DisableCollision.svg
new file mode 100644
index 0000000..14059f1
--- /dev/null
+++ b/Content/Slate/Starship/Common/DisableCollision.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4{fill:#fff;}.cls-2,.cls-4{fill-rule:evenodd;}.cls-4{opacity:0.5;}.cls-5{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><g id="Collision"><path class="cls-2" d="M16,12a4,4,0,1,0,4,4A4,4,0,0,0,16,12Zm2.15,1.92-.07-.07A.23.23,0,0,1,18.15,13.92ZM16,19a3,3,0,1,1,1.7-5.47l-4.14,4.14.78.78,4.14-4.13A3,3,0,0,1,19,16,3,3,0,0,1,16,19Z"/><circle class="cls-3" cx="4.5" cy="4.5" r="4.3"/><path class="cls-4" d="M17,6.44l-4.41-.9,3-5.38L10.15,4.08a6.15,6.15,0,0,1,.07.75,5.38,5.38,0,0,1-5.38,5.38A5.07,5.07,0,0,1,3.38,10L0,15.05l6-2.31L8.61,17.2l1.64-5.94,2.66.46L15,11.07,12.08,8.42Z"/><rect class="cls-5" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/Documentation.svg b/Content/Slate/Starship/Common/Documentation.svg
new file mode 100644
index 0000000..9eb6f1e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Documentation.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 1H6L0 10H10L15 1Z" fill="white"/>
+<path d="M14.5 6L10 14.1H1V10.5H0V15H11L16 6H14.5Z" fill="white"/>
+<rect opacity="0.5" x="2" y="11" width="7" height="2" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/EditorModes.svg b/Content/Slate/Starship/Common/EditorModes.svg
new file mode 100644
index 0000000..6b9b5c6
--- /dev/null
+++ b/Content/Slate/Starship/Common/EditorModes.svg
@@ -0,0 +1,14 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M7.66998 4.2L15.78 12C15.9072 12.1354 15.9781 12.3142 15.9781 12.5C15.9781 12.6858 15.9072 12.8646 15.78 13L15.03 13.76C14.8958 13.8895 14.7165 13.9619 14.53 13.9619C14.3434 13.9619 14.1642 13.8895 14.03 13.76L6.47998 5.39L7.66998 4.2Z" fill="white" fill-opacity="0.5"/>
+<path d="M0.339951 5.33C0.529951 5.11 1.19995 4.75 1.43995 4.97C1.92404 4.82793 2.38052 4.60477 2.78995 4.31C3.12995 3.94 2.78995 2.8 3.08995 2.48L4.35995 1.21C4.99995 0.609996 7.22995 -0.680004 11.62 0.449996L11.53 0.999996C11.53 0.999996 8.63995 0.329996 7.07995 1.86C7.07995 1.86 6.71995 3.18 7.01995 3.57L7.18995 3.73L5.99995 4.89C5.14971 4.77317 4.28369 4.88358 3.48995 5.21C3.17995 5.5 2.85995 6.45 3.07995 6.6C3.29995 6.75 2.81995 7.41 2.59995 7.6L2.19995 7.86L0.199951 5.86L0.339951 5.33Z" fill="white"/>
+<path opacity="0.5" d="M7.05012 9.05C6.40012 9.8 5.87012 10.45 5.87012 10.45L7.00012 11.58L8.41012 10.41L7.05012 9.05Z" fill="white"/>
+<path opacity="0.5" d="M14.4001 2.55C14.4001 2.55 12.2801 4.19 10.5801 5.55L11.8701 6.84C13.2601 5.14 14.8701 3.02 14.8701 3.02C14.9364 2.95369 14.9736 2.86376 14.9736 2.77C14.9736 2.67623 14.9364 2.5863 14.8701 2.52C14.8038 2.45369 14.7138 2.41644 14.6201 2.41644C14.5263 2.41644 14.4364 2.45369 14.3701 2.52L14.4001 2.55Z" fill="white"/>
+<path d="M6 11.88L5.29 11.08C5.29 11.08 3.42 10.77 2.72 13.3C2.27 14.92 0 16 0 16H2.81C3.43557 15.9861 4.0455 15.8018 4.57412 15.467C5.10274 15.1322 5.53003 14.6596 5.81 14.1C6.00555 13.7677 6.12412 13.3958 6.157 13.0116C6.18988 12.6274 6.13624 12.2407 6 11.88Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/EnableCollision.svg b/Content/Slate/Starship/Common/EnableCollision.svg
new file mode 100644
index 0000000..2012005
--- /dev/null
+++ b/Content/Slate/Starship/Common/EnableCollision.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-3{fill-rule:evenodd;opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><g id="Collision"><circle class="cls-2" cx="4.5" cy="4.5" r="4.3"/><path class="cls-3" d="M17,6.44l-4.41-.9,3-5.38L10.15,4.08a6.15,6.15,0,0,1,.07.75,5.38,5.38,0,0,1-5.38,5.38A5.07,5.07,0,0,1,3.38,10L0,15.05l6-2.31L8.61,17.2l1.64-5.94,6.13,1.07-4.3-3.91Z"/><polygon class="cls-2" points="10.5 17.43 12.11 15.18 14.36 17.43 17.75 12.29 19.5 13.57 14.36 20 10.5 17.43"/><rect class="cls-4" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/EnableFullscreen.svg b/Content/Slate/Starship/Common/EnableFullscreen.svg
new file mode 100644
index 0000000..4f5d0fa
--- /dev/null
+++ b/Content/Slate/Starship/Common/EnableFullscreen.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 3H6V1H0V6H2V3Z" fill="white"/>
+<path d="M6 13H2V10H0V15H6V13Z" fill="white"/>
+<path d="M10 3H14V6H16V1H10V3Z" fill="white"/>
+<path d="M14 13H10V15H16V10H14V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Event.svg b/Content/Slate/Starship/Common/Event.svg
new file mode 100644
index 0000000..685f7f7
--- /dev/null
+++ b/Content/Slate/Starship/Common/Event.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.929031" y="8" width="10" height="10" rx="0.5" transform="rotate(-45 0.929031 8)" stroke="white"/>
+<path d="M5 4.00024L8 1.00024V6.00024H3L5 4.00024Z" fill="white"/>
+<path d="M6 13.0002L3 10.0002L8 10.0002L8 15.0002L6 13.0002Z" fill="white"/>
+<path d="M4.53551 6.82854L4.53551 11.0712L0.999977 7.53564L4.53551 4.00011L4.53551 6.82854Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Exit.svg b/Content/Slate/Starship/Common/Exit.svg
new file mode 100644
index 0000000..dd00f1e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Exit.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 1H16V16H6L14 14V3L6 1Z" fill="white"/>
+<path d="M1 7V10H6V13L11 8.5L6 4V7H1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Export.svg b/Content/Slate/Starship/Common/Export.svg
new file mode 100644
index 0000000..652151f
--- /dev/null
+++ b/Content/Slate/Starship/Common/Export.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-4{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><g id="ExportAll"><path class="cls-2" d="M12,12h4a1,1,0,0,1,1,1v3a1,1,0,0,1-1,1H3a1,1,0,0,1-1-1V13a1,1,0,0,1,1-1H5l1-2H2a2,2,0,0,0-2,2v5a2,2,0,0,0,2,2H17a2,2,0,0,0,2-2V12a2,2,0,0,0-2-2H15Z"/><rect class="cls-3" width="20" height="20"/><polygon class="cls-4" points="6 14 14.27 3.44 11.97 1.15 20 0 18.85 8.03 16.56 5.74 6 14"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/ExportAll.svg b/Content/Slate/Starship/Common/ExportAll.svg
new file mode 100644
index 0000000..aee2768
--- /dev/null
+++ b/Content/Slate/Starship/Common/ExportAll.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 12H16C16.2652 12 16.5196 12.1054 16.7071 12.2929C16.8946 12.4804 17 12.7348 17 13V16C17 16.2652 16.8946 16.5196 16.7071 16.7071C16.5196 16.8946 16.2652 17 16 17H3C2.73478 17 2.48043 16.8946 2.29289 16.7071C2.10536 16.5196 2 16.2652 2 16V13C2 12.7348 2.10536 12.4804 2.29289 12.2929C2.48043 12.1054 2.73478 12 3 12H5L6 10H2C1.46957 10 0.960858 10.2107 0.585785 10.5858C0.210712 10.9609 0 11.4696 0 12V17C0 17.5304 0.210712 18.0391 0.585785 18.4142C0.960858 18.7893 1.46957 19 2 19H17C17.5304 19 18.0391 18.7893 18.4142 18.4142C18.7893 18.0391 19 17.5304 19 17V12C19 11.4696 18.7893 10.9609 18.4142 10.5858C18.0391 10.2107 17.5304 10 17 10H15L12 12Z" fill="white"/>
+<path d="M6 14L14.27 3.44L11.97 1.15002L19.97 0L18.82 8L16.53 5.71002L6 14Z" fill="white"/>
+<path opacity="0.5" d="M2 5C1.46957 5 0.960858 5.21074 0.585785 5.58582C0.210712 5.96089 0 6.46957 0 7V8H2C2 7.73478 2.10536 7.48044 2.29289 7.29291C2.48043 7.10537 2.73478 7 3 7H7L8 5H2Z" fill="white"/>
+<path opacity="0.5" d="M2 0C1.46957 0 0.960858 0.210743 0.585785 0.585815C0.210712 0.960888 0 1.46957 0 2V3H2C2 2.73478 2.10536 2.48044 2.29289 2.29291C2.48043 2.10537 2.73478 2 3 2H9L10 0H2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ExportSelected.svg b/Content/Slate/Starship/Common/ExportSelected.svg
new file mode 100644
index 0000000..d7164a6
--- /dev/null
+++ b/Content/Slate/Starship/Common/ExportSelected.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9.65 10.4L1 3L1.11 14.38L3.63 10.9L6.09 16L7.91 15.13L5.47 10.06L9.65 10.4Z" fill="white"/>
+<path d="M7.86011 7.24L11.1501 2.91L9.21011 0.97L16.0001 0L15.0301 6.79L13.0901 4.85L8.77011 8.13L7.86011 7.24Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/FPS.svg b/Content/Slate/Starship/Common/FPS.svg
new file mode 100644
index 0000000..1a2912d
--- /dev/null
+++ b/Content/Slate/Starship/Common/FPS.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 0.5C11.4 0.5 14.5 3.6 14.5 7.5C14.5 11.4 11.4 14.5 7.5 14.5C3.6 14.5 0.5 11.4 0.5 7.5C0.5 3.6 3.6 0.5 7.5 0.5ZM7.5 0C3.4 0 0 3.4 0 7.5C0 11.6 3.4 15 7.5 15C11.6 15 15 11.6 15 7.5C15 3.4 11.6 0 7.5 0Z" fill="white"/>
+<path opacity="0.5" d="M14.8 9H0.199951C0.899951 12.4 3.89995 15 7.49995 15C11.1 15 14.2 12.4 14.8 9Z" fill="white"/>
+<path d="M10.5432 2.86001L9.93701 2.51001L9.18701 3.80901L9.79321 4.15901L10.5432 2.86001Z" fill="white"/>
+<path d="M5.0625 2.51011L4.4563 2.86011L5.2063 4.15911L5.8125 3.80911L5.0625 2.51011Z" fill="white"/>
+<path d="M2.9136 4.47437L2.5636 5.08057L3.8626 5.83057L4.2126 5.22437L2.9136 4.47437Z" fill="white"/>
+<path d="M3.43335 7.86675V7.16675H1.93335L1.93335 7.86675H3.43335Z" fill="white"/>
+<path d="M13 7.1001H11.5V7.8001H13V7.1001Z" fill="white"/>
+<path d="M12.5 4.5L6 8V9H8L12.5 4.5Z" fill="white"/>
+<path d="M7.8001 2H7.1001V3.5H7.8001V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/FarViewPlane.svg b/Content/Slate/Starship/Common/FarViewPlane.svg
new file mode 100644
index 0000000..396ead8
--- /dev/null
+++ b/Content/Slate/Starship/Common/FarViewPlane.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M13 14H0V4H6V8H13V14Z" fill="white"/>
+<path d="M16 8H14V3H6V1H16V8Z" fill="white"/>
+<path d="M13 4H6V8H13V4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/FieldOfView.svg b/Content/Slate/Starship/Common/FieldOfView.svg
new file mode 100644
index 0000000..0c608bf
--- /dev/null
+++ b/Content/Slate/Starship/Common/FieldOfView.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M13.4 13H2.6L5 8L0 15H16L11 8L13.4 13Z" fill="white"/>
+<path d="M8 0C4 0 0 4.5 0 4.5C0 4.5 4 9 8 9C12 9 16 4.5 16 4.5C16 4.5 12 0 8 0ZM8 8.3C5.9 8.3 4.2 6.6 4.2 4.5C4.2 2.4 5.9 0.699997 8 0.699997C10.1 0.699997 11.8 2.4 11.8 4.5C11.8 6.6 10.1 8.3 8 8.3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.90005 1.80005C6.50005 1.80005 7.00005 2.30004 7.00005 2.90004C7.00005 3.50004 6.50005 4.00005 5.90005 4.00005C5.30005 4.00005 4.80005 3.50004 4.80005 2.90004C4.80005 2.30004 5.30005 1.80005 5.90005 1.80005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Find.svg b/Content/Slate/Starship/Common/Find.svg
new file mode 100644
index 0000000..a09a457
--- /dev/null
+++ b/Content/Slate/Starship/Common/Find.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.5 11.9L1.4 16C1.4 16 1 16 0.5 15.5C0 15 0 14.6 0 14.6L4.1 10.5L5.5 11.9Z" fill="white"/>
+<path d="M2 7C2 3.1 5.1 0 9 0C12.9 0 16 3.1 16 7C16 10.9 12.9 14 9 14C5.1 14 2 10.9 2 7ZM3 7C3 10.3 5.7 13 9 13C12.3 13 15 10.3 15 7C15 3.7 12.3 1 9 1C5.7 1 3 3.7 3 7Z" fill="white"/>
+<path opacity="0.5" d="M9.00002 2.8999C6.70002 2.8999 4.90002 4.6999 4.90002 6.9999C4.90002 9.2999 6.70002 11.0999 9.00002 11.0999C11.3 11.0999 13.1 9.2999 13.1 6.9999C13.1 4.6999 11.3 2.8999 9.00002 2.8999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/FindInBlueprints.svg b/Content/Slate/Starship/Common/FindInBlueprints.svg
new file mode 100644
index 0000000..808a544
--- /dev/null
+++ b/Content/Slate/Starship/Common/FindInBlueprints.svg
@@ -0,0 +1,15 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M12 4H10V6H12V4Z" fill="white"/>
+<path d="M12 8H10V10H12V8Z" fill="white"/>
+<path d="M7 6H5V8H7V6Z" fill="white"/>
+<path opacity="0.5" d="M11 5V4H8V7H6V8H8V10H11V9H9V5H11Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.2 12.1L1.3 16C0.97536 15.9496 0.68026 15.7824 0.47 15.53C0.213046 15.3235 0.0448718 15.0266 0 14.7L3.9 10.8L5.2 12.1Z" fill="white"/>
+<path d="M9 1.5C10.0878 1.5 11.1512 1.82257 12.0556 2.42692C12.9601 3.03126 13.6651 3.89025 14.0813 4.89524C14.4976 5.90023 14.6065 7.0061 14.3943 8.073C14.1821 9.13989 13.6583 10.1199 12.8891 10.8891C12.1199 11.6583 11.1399 12.1821 10.073 12.3943C9.0061 12.6065 7.90024 12.4976 6.89524 12.0813C5.89025 11.6651 5.03127 10.9601 4.42692 10.0556C3.82257 9.15117 3.5 8.0878 3.5 7C3.50265 5.54212 4.08296 4.14471 5.11384 3.11383C6.14471 2.08295 7.54212 1.50264 9 1.5ZM9 0.5C7.71442 0.5 6.45772 0.881218 5.3888 1.59545C4.31988 2.30968 3.48676 3.32484 2.99479 4.51256C2.50282 5.70028 2.37409 7.00721 2.6249 8.26809C2.8757 9.52896 3.49477 10.6872 4.40381 11.5962C5.31285 12.5052 6.47104 13.1243 7.73192 13.3751C8.99279 13.6259 10.2997 13.4972 11.4874 13.0052C12.6752 12.5132 13.6903 11.6801 14.4046 10.6112C15.1188 9.54229 15.5 8.28558 15.5 7C15.5 6.14641 15.3319 5.30117 15.0052 4.51256C14.6786 3.72394 14.1998 3.00739 13.5962 2.40381C12.9926 1.80023 12.2761 1.32144 11.4874 0.994783C10.6988 0.668127 9.85359 0.5 9 0.5Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/Floor.svg b/Content/Slate/Starship/Common/Floor.svg
new file mode 100644
index 0000000..b47d3f7
--- /dev/null
+++ b/Content/Slate/Starship/Common/Floor.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M9.78082 5L1 10L10 15L19 8L9.78082 5Z" fill="white"/>
+<path opacity="0.5" d="M1 11.5L1.00002 10L19 8L19 9.5L10 16.5L1 11.5Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/Fog.svg b/Content/Slate/Starship/Common/Fog.svg
new file mode 100644
index 0000000..822e1d3
--- /dev/null
+++ b/Content/Slate/Starship/Common/Fog.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.3 8C12.2 8 11.6 8 11.5 8H6.09995C6.09995 8 2.59995 8 2.49995 8C1.89995 8 1.19995 7.80001 1.19995 7.10001C1.19995 6.60001 1.79995 5.80001 3.19995 6.10001C1.29995 3.00001 5.39995 1.2 7.29995 4.5C6.19995 2.1 7.59995 0 9.69995 0C11.4 0 13.2 1.89999 11.9 3.89999C13.2 3.59999 14.6 4.49999 14.6 5.89999C14.7 7.29999 13.7 8 12.3 8Z" fill="white"/>
+<path opacity="0.5" d="M14 11H2C1.7 11 1.5 10.8 1.5 10.5C1.5 10.2 1.7 10 2 10H14C14.3 10 14.5 10.2 14.5 10.5C14.5 10.8 14.3 11 14 11Z" fill="white"/>
+<path opacity="0.5" d="M14 13H2C1.7 13 1.5 12.8 1.5 12.5C1.5 12.2 1.7 12 2 12H14C14.3 12 14.5 12.2 14.5 12.5C14.5 12.8 14.3 13 14 13Z" fill="white"/>
+<path opacity="0.5" d="M14 15H2C1.7 15 1.5 14.8 1.5 14.5C1.5 14.2 1.7 14 2 14H14C14.3 14 14.5 14.2 14.5 14.5C14.5 14.8 14.3 15 14 15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/FoliageTypes.svg b/Content/Slate/Starship/Common/FoliageTypes.svg
new file mode 100644
index 0000000..1cee6cc
--- /dev/null
+++ b/Content/Slate/Starship/Common/FoliageTypes.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.1 9.2998C13 10.7998 9.99999 12.7998 6.99999 15.9998C6.89999 15.9998 8.69999 10.0998 15.1 9.2998Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.09998 1.19995C12 9.29995 7.59998 14.2999 6.29998 15.9999C6.19998 15.9999 8.89998 10.3 5.09998 1.19995Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0.0999756 10C5.29998 10.9 5.19998 15.1 5.29998 16C5.29998 16 3.69998 12.5 0.0999756 10Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15.1 13.5C10.9 13.5 7.6 15.1 7.5 16C7.6 16 11.6 15.9 15.1 13.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.3 13.5999L5.9 15.9999C5.3 13.7999 6.1 10.2999 1 6.09985C7 9.29985 6.3 13.5999 6.3 13.5999Z" fill="white"/>
+<path d="M16 6H10V8H16V6Z" fill="white"/>
+<path d="M16 3H10V5H16V3Z" fill="white"/>
+<path d="M16 0H10V2H16V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Forums.svg b/Content/Slate/Starship/Common/Forums.svg
new file mode 100644
index 0000000..9912e5e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Forums.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.43 0.999959H2.5C2.17348 0.997323 1.84967 1.05914 1.54712 1.18197C1.24457 1.30479 0.969279 1.48616 0.737 1.71566C0.50472 1.94515 0.320012 2.21833 0.193542 2.51937C0.0670734 2.82041 0.00130601 3.1434 0 3.46993V6.52999C0.00130601 6.85651 0.0670734 7.17951 0.193542 7.48055C0.320012 7.78159 0.50472 8.05477 0.737 8.28426C0.969279 8.51375 1.24457 8.69513 1.54712 8.81795C1.84967 8.94078 2.17348 9.00259 2.5 8.99996L1.5 13L5.83002 8.99996H10.5C10.8265 9.00259 11.1503 8.94078 11.4529 8.81795C11.7554 8.69513 12.0307 8.51375 12.263 8.28426C12.4953 8.05477 12.68 7.78159 12.8065 7.48055C12.9329 7.17951 12.9987 6.85651 13 6.52999V3.52999C12.9921 2.85451 12.7175 2.20946 12.2361 1.73555C11.7547 1.26165 11.1055 0.997274 10.43 0.999959V0.999959Z" fill="white"/>
+<path opacity="0.5" d="M13.9999 4.05005V7.53003C13.9986 7.85655 13.9329 8.17955 13.8064 8.48059C13.6799 8.78163 13.4952 9.05481 13.2629 9.2843C13.0307 9.51379 12.7554 9.69517 12.4528 9.81799C12.1503 9.94082 11.8265 10.0026 11.4999 10H7.82996L5.66992 12H10.1699L14.4999 16L13.4999 12C13.8265 12.0026 14.1503 11.9408 14.4528 11.818C14.7554 11.6952 15.0307 11.5138 15.2629 11.2843C15.4952 11.0548 15.6799 10.7816 15.8064 10.4806C15.9329 10.1795 15.9986 9.85655 15.9999 9.53003V6.46997C15.9969 5.89779 15.7961 5.34425 15.4316 4.9032C15.0671 4.46214 14.5613 4.16079 13.9999 4.05005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/GameView.svg b/Content/Slate/Starship/Common/GameView.svg
new file mode 100644
index 0000000..b2eec50
--- /dev/null
+++ b/Content/Slate/Starship/Common/GameView.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 15.9999C6.2 13.9999 8 14.4999 8 14.4999C8 14.4999 9.8 13.9999 13.5 15.9999C9.8 15.9999 6.2 15.9999 2.5 15.9999Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.4001 6.00005C12.9001 4.70005 11.9001 2.30005 10.9001 2.30005C9.40007 2.30005 9.40007 3.70005 8.80007 3.70005C8.50007 3.70005 7.40007 3.70005 7.00007 3.70005C6.40007 3.70005 6.40007 2.30005 5.00007 2.30005C4.00007 2.30005 3.00007 4.60005 2.50007 6.00005C1.70007 8.50005 1.60007 9.70005 3.40007 9.70005C5.40007 9.70005 5.40007 7.40005 7.90007 7.40005C10.4001 7.40005 10.5001 9.70005 12.4001 9.70005C14.3001 9.70005 14.3001 8.50005 13.4001 6.00005ZM7.00007 6.00005H6.00007V7.00005H5.00007V6.00005H4.00007V5.00005H5.00007V4.00005H6.00007V5.00005H7.00007V6.00005ZM10.5001 7.20005C9.60007 7.20005 8.80007 6.50005 8.80007 5.50005C8.80007 4.60005 9.50007 3.80005 10.5001 3.80005C11.5001 3.80005 12.2001 4.50005 12.2001 5.50005C12.2001 6.40005 11.4001 7.20005 10.5001 7.20005Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5 5C10.2 5 10 5.2 10 5.5C10 5.8 10.2 6 10.5 6C10.8 6 11 5.8 11 5.5C11 5.2 10.8 5 10.5 5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/GeneratedCode.svg b/Content/Slate/Starship/Common/GeneratedCode.svg
new file mode 100644
index 0000000..41e5caf
--- /dev/null
+++ b/Content/Slate/Starship/Common/GeneratedCode.svg
@@ -0,0 +1,15 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5 2V5" stroke="white" stroke-miterlimit="10"/>
+<path d="M8.5 2V5" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.5 7V10" stroke="white" stroke-miterlimit="10"/>
+<path d="M12.5 7V10" stroke="white" stroke-miterlimit="10"/>
+<path d="M5.5 5C4.9 5 4.5 4.6 4.5 4V3C4.5 2.4 4.9 2 5.5 2C6.1 2 6.5 2.4 6.5 3V4C6.5 4.6 6.1 5 5.5 5Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M11.5 5C10.9 5 10.5 4.6 10.5 4V3C10.5 2.4 10.9 2 11.5 2C12.1 2 12.5 2.4 12.5 3V4C12.5 4.6 12.1 5 11.5 5Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M9.5 10C8.9 10 8.5 9.6 8.5 9V8C8.5 7.4 8.9 7 9.5 7C10.1 7 10.5 7.4 10.5 8V9C10.5 9.6 10.1 10 9.5 10Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M3.5 10C2.9 10 2.5 9.6 2.5 9V8C2.5 7.4 2.9 7 3.5 7C4.1 7 4.5 7.4 4.5 8V9C4.5 9.6 4.1 10 3.5 10Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M2.5 12V15" stroke="white" stroke-miterlimit="10"/>
+<path d="M8.5 12V15" stroke="white" stroke-miterlimit="10"/>
+<path d="M5.5 15C4.9 15 4.5 14.6 4.5 14V13C4.5 12.4 4.9 12 5.5 12C6.1 12 6.5 12.4 6.5 13V14C6.5 14.6 6.1 15 5.5 15Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M11.5 15C10.9 15 10.5 14.6 10.5 14V13C10.5 12.4 10.9 12 11.5 12C12.1 12 12.5 12.4 12.5 13V14C12.5 14.6 12.1 15 11.5 15Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M14.5 0.5H0.5V15.5H14.5V0.5Z" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Geometry.svg b/Content/Slate/Starship/Common/Geometry.svg
new file mode 100644
index 0000000..00e6834
--- /dev/null
+++ b/Content/Slate/Starship/Common/Geometry.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 0L5 2.7V6H10V11H12V0Z" fill="white"/>
+<path opacity="0.5" d="M16 10.6L12 11V0L16 3V10.6Z" fill="white"/>
+<path d="M4 7L0 8V14.5L4 16V7Z" fill="white"/>
+<path opacity="0.5" d="M14 15L4 16V7H9V12H12L14 11.8V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Grid.svg b/Content/Slate/Starship/Common/Grid.svg
new file mode 100644
index 0000000..24edc85
--- /dev/null
+++ b/Content/Slate/Starship/Common/Grid.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12.2 2H9.9H9.1H6.9H6.1H3.8H3L0 14H1.2H4.9H6.2H9.8H11.1H14.8H16L13 2H12.2Z" fill="white"/>
+<path d="M12.2 2H9.9H9.1H6.9H6.1H3.8H3L0 14H1.2H4.9H6.1H9.8H11H14.7H16L13 2H12.2ZM9.2 2.60001L9.3 4.60001H6.7L6.8 2.60001H9.2ZM9.3 5.39999L9.5 8H6.5L6.7 5.39999H9.3ZM3.7 2.60001H6L5.8 4.60001H3.2L3.7 2.60001ZM3.1 5.39999H5.8L5.5 8H2.5L3.1 5.39999ZM1.5 12.6L2.3 9H5.4L5.1 12.6H1.5ZM6.2 12.6L6.4 9H9.5L9.7 12.6H6.2ZM14.5 12.6H11L10.7 9H13.8L14.5 12.6ZM13.5 8H10.5L10.2 5.39999H12.9L13.5 8ZM12.8 4.60001H10.2L10 2.60001H12.4L12.8 4.60001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/GroupActors.svg b/Content/Slate/Starship/Common/GroupActors.svg
new file mode 100644
index 0000000..5ac8f1f
--- /dev/null
+++ b/Content/Slate/Starship/Common/GroupActors.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 12C6.10457 12 7 11.1046 7 10C7 8.89543 6.10457 8 5 8C3.89543 8 3 8.89543 3 10C3 11.1046 3.89543 12 5 12Z" fill="white"/>
+<path d="M11 12C12.1046 12 13 11.1046 13 10C13 8.89543 12.1046 8 11 8C9.89543 8 9 8.89543 9 10C9 11.1046 9.89543 12 11 12Z" fill="white"/>
+<path d="M8 7C9.10457 7 10 6.10457 10 5C10 3.89543 9.10457 3 8 3C6.89543 3 6 3.89543 6 5C6 6.10457 6.89543 7 8 7Z" fill="white"/>
+<path d="M8 1C11.9 1 15 4.1 15 8C15 11.9 11.9 15 8 15C4.1 15 1 11.9 1 8C1 4.1 4.1 1 8 1ZM8 0C3.6 0 0 3.6 0 8C0 12.4 3.6 16 8 16C12.4 16 16 12.4 16 8C16 3.6 12.4 0 8 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/HierarchicalLODOutliner.svg b/Content/Slate/Starship/Common/HierarchicalLODOutliner.svg
new file mode 100644
index 0000000..e080273
--- /dev/null
+++ b/Content/Slate/Starship/Common/HierarchicalLODOutliner.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.98 1H6.02C6.00895 1 6 1.00895 6 1.02V11.98C6 11.991 6.00895 12 6.02 12H14.98C14.991 12 15 11.991 15 11.98V1.02C15 1.00895 14.991 1 14.98 1Z" fill="white"/>
+<path opacity="0.5" d="M3 6V14H10V13H5V6H3Z" fill="white"/>
+<path opacity="0.5" d="M0 10V16H5V15H2V10H0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/HighResolutionScreenshot.svg b/Content/Slate/Starship/Common/HighResolutionScreenshot.svg
new file mode 100644
index 0000000..842ddc3
--- /dev/null
+++ b/Content/Slate/Starship/Common/HighResolutionScreenshot.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 15H0V1H16V15ZM1 14H15V2H1V14Z" fill="white"/>
+<path opacity="0.5" d="M8.30005 13.9999H14.7L11.5 8.3999L8.30005 13.9999Z" fill="white"/>
+<path opacity="0.5" d="M1.30005 14H5.90005L8.00005 10.7999L5.50005 6.69995L1.30005 14Z" fill="white"/>
+<path opacity="0.5" d="M9.99995 6.79995C10.9941 6.79995 11.8 5.99406 11.8 4.99995C11.8 4.00584 10.9941 3.19995 9.99995 3.19995C9.00584 3.19995 8.19995 4.00584 8.19995 4.99995C8.19995 5.99406 9.00584 6.79995 9.99995 6.79995Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Home.svg b/Content/Slate/Starship/Common/Home.svg
new file mode 100644
index 0000000..9983088
--- /dev/null
+++ b/Content/Slate/Starship/Common/Home.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 1H17V6.1L14 3.6V1Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M17.4996 10.0001L9.9996 3.8001L2.4996 10.0001L1.09961 9.2001L10.0996 1.6001L18.8996 9.2001L17.4996 10.0001Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 10.9V19H14V14H10V19H3V10.9L10 5.5L17 10.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/IssueTracker.svg b/Content/Slate/Starship/Common/IssueTracker.svg
new file mode 100644
index 0000000..ac62991
--- /dev/null
+++ b/Content/Slate/Starship/Common/IssueTracker.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11.4999 0.500007C10.7457 0.498592 10.0064 0.71045 9.36744 1.11114C8.72843 1.51183 8.21574 2.08502 7.88851 2.76457C7.56128 3.44413 7.43284 4.20235 7.51803 4.95176C7.60321 5.70117 7.89854 6.41123 8.36994 7.00001L9.16994 6.40001C8.77937 5.9265 8.54344 5.34458 8.49398 4.73277C8.44453 4.12096 8.58393 3.5087 8.89339 2.97861C9.20284 2.44852 9.66744 2.0261 10.2245 1.76836C10.7816 1.51062 11.4043 1.42996 12.0087 1.53726C12.613 1.64456 13.1699 1.93466 13.6042 2.36841C14.0385 2.80217 14.3293 3.3587 14.4374 3.96292C14.5454 4.56714 14.4656 5.18996 14.2085 5.74736C13.9515 6.30475 13.5296 6.76989 12.9999 7.08001V8.20001C13.8553 7.84866 14.5626 7.21179 15.0013 6.39775C15.4401 5.58371 15.5832 4.6428 15.4064 3.73512C15.2296 2.82743 14.7437 2.00905 14.0315 1.41923C13.3193 0.829404 12.4247 0.504573 11.4999 0.500007Z" fill="white"/>
+<path d="M11 6C11 6.66304 10.7366 7.29893 10.2678 7.76777C9.79893 8.23661 9.16304 8.5 8.5 8.5C7.83696 8.5 7.20107 8.23661 6.73223 7.76777C6.26339 7.29893 6 6.66304 6 6V3H1.46C1.07359 3.00262 0.703757 3.15728 0.430519 3.43052C0.157282 3.70376 0.0026198 4.07359 0 4.46L0 14.54C0.0026198 14.9264 0.157282 15.2962 0.430519 15.5695C0.703757 15.8427 1.07359 15.9974 1.46 16H10.54C10.9264 15.9974 11.2962 15.8427 11.5695 15.5695C11.8427 15.2962 11.9974 14.9264 12 14.54V4.46C11.9979 4.15324 11.9006 3.85471 11.7214 3.6057C11.5423 3.35668 11.2902 3.16948 11 3.07V6ZM10 13H2V12H10V13ZM10 11H2V10H10V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/JumpToEvent.svg b/Content/Slate/Starship/Common/JumpToEvent.svg
new file mode 100644
index 0000000..ee7e937
--- /dev/null
+++ b/Content/Slate/Starship/Common/JumpToEvent.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8449:15139)">
+<path d="M8.70582 1.23168L3.30031 6.63719C3.13445 6.80305 3.13445 7.07195 3.30031 7.23781L8.70582 12.6433C8.87167 12.8092 9.14058 12.8092 9.30643 12.6433L14.7119 7.23781C14.8778 7.07195 14.8778 6.80305 14.7119 6.63719L9.30643 1.23168C9.14058 1.06583 8.87167 1.06583 8.70582 1.23168Z" stroke="white" stroke-width="0.849395"/>
+<path d="M5.65874 8.63413V5.23655H9.00536V1.49072L8.3853 1.61813L6.45718 3.53776L4.75839 5.23655H4.80935L3.55225 6.49366L3.63719 7.46197L5.65874 9.48353L8.20693 12.0317H9.05632V8.63413H5.65874Z" fill="white"/>
+<path d="M1.97091 13.1255L-2 17.0964L-1.09636 18L2.87455 14.0164L4.66909 15.8236L5 11L0.176364 11.3182L1.97091 13.1255Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_8449:15139">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/LOD.svg b/Content/Slate/Starship/Common/LOD.svg
new file mode 100644
index 0000000..fd27108
--- /dev/null
+++ b/Content/Slate/Starship/Common/LOD.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 1H6V12H15V1Z" fill="white"/>
+<path opacity="0.5" d="M3 6V14H10V13H5V6H3Z" fill="white"/>
+<path opacity="0.5" d="M0 10V16H5V15H2V10H0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LODColorization.svg b/Content/Slate/Starship/Common/LODColorization.svg
new file mode 100644
index 0000000..313d75c
--- /dev/null
+++ b/Content/Slate/Starship/Common/LODColorization.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 14H10V13H5V6H3V14Z" fill="white"/>
+<path opacity="0.5" d="M0 10V16H5V15H2V10H0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 1H6V12H15V1ZM10.5 11C9.57174 11 8.6815 10.6313 8.02513 9.97487C7.36875 9.3185 7 8.42826 7 7.5C7 5.57 9.1 4 10.5 1.19C11.9 4 14 5.57 14 7.5C14 8.42826 13.6313 9.3185 12.9749 9.97487C12.3185 10.6313 11.4283 11 10.5 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Landscape.svg b/Content/Slate/Starship/Common/Landscape.svg
new file mode 100644
index 0000000..be24f52
--- /dev/null
+++ b/Content/Slate/Starship/Common/Landscape.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 15L11.6 5.19995L8.39995 12.6L5.99995 9.39995L3.19995 15H16Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M6 0.199951L0 13H2.4L6 6.99995L8 9.79996L9.4 6.59996L6 0.199951Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Layers.svg b/Content/Slate/Starship/Common/Layers.svg
new file mode 100644
index 0000000..0850621
--- /dev/null
+++ b/Content/Slate/Starship/Common/Layers.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 10.86L8.49 15L16 10.86L14.33 9.94L8.49 13.16L2.67 10L1 10.86Z" fill="white"/>
+<path opacity="0.5" d="M1 6.82C1 6.82 7.65 10.5 8.49 11L16 6.81L14.33 5.89L8.49 9.11L2.67 5.9C2.67 5.9 1 6.81 1 6.82Z" fill="white"/>
+<path d="M1 2.77C1 2.77 7.65 6.45 8.49 6.9L16 2.76L8.49 0C8.49 0 1 2.76 1 2.77Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Layout.svg b/Content/Slate/Starship/Common/Layout.svg
new file mode 100644
index 0000000..2ee85ef
--- /dev/null
+++ b/Content/Slate/Starship/Common/Layout.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="14" viewBox="0 0 16 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 9H7V12H14V9Z" fill="white"/>
+<path opacity="0.5" d="M0 0V14H16V0H0ZM1 1H5V7H1V1ZM1 13V8H5V13H1ZM15 13H6V8H15V13ZM15 7H6V1H15V7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LayoutLoad.svg b/Content/Slate/Starship/Common/LayoutLoad.svg
new file mode 100644
index 0000000..1ab824a
--- /dev/null
+++ b/Content/Slate/Starship/Common/LayoutLoad.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15 9H6V3H7V2H0V16H16V6L15 7V9ZM5 15H1V10H5V15ZM5 9H1V3H5V9ZM15 15H6V10H15V15Z" fill="white"/>
+<path d="M14 11H7V14H14V11Z" fill="white"/>
+<path d="M13 0H11V3H8.5L12 8L15.5 3H13V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LayoutRemove.svg b/Content/Slate/Starship/Common/LayoutRemove.svg
new file mode 100644
index 0000000..2a2f5f6
--- /dev/null
+++ b/Content/Slate/Starship/Common/LayoutRemove.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6 9V3H7V2H0V16H16V9H6ZM5 15H1V10H5V15ZM5 9H1V3H5V9ZM15 15H6V10H15V15Z" fill="white"/>
+<path d="M14 11H7V14H14V11Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.33 0.5L12 2.83L9.67 0.5L8.5 1.67L10.83 4L8.5 6.33L9.67 7.5L12 5.17L14.33 7.5L15.5 6.33L13.17 4L15.5 1.67L14.33 0.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LayoutSave.svg b/Content/Slate/Starship/Common/LayoutSave.svg
new file mode 100644
index 0000000..a92edee
--- /dev/null
+++ b/Content/Slate/Starship/Common/LayoutSave.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15 9H6V3H7.2L7.8 2H0V16H16V6L15 7.5V9ZM5 15H1V10H5V15ZM5 9H1V3H5V9ZM15 15H6V10H15V15Z" fill="white"/>
+<path d="M14 11H7V14H14V11Z" fill="white"/>
+<path d="M13 8H11V5H8.5L12 0L15.5 5H13V8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LevelFavorite.svg b/Content/Slate/Starship/Common/LevelFavorite.svg
new file mode 100644
index 0000000..54ae953
--- /dev/null
+++ b/Content/Slate/Starship/Common/LevelFavorite.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 15L13 11L16 15V16H0V15L3 11L1 15H15Z" fill="white"/>
+<path d="M9 13L6.5 6L3 14H13L10.5 9L9 13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.98 2.95L16 3.53L13.9 5.78L14.28 8.82L11.5 7.52L8.72 8.82L9.1 5.78L7 3.53L10.02 2.95L11.5 0.18L12.98 2.95Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LevelImportInto.svg b/Content/Slate/Starship/Common/LevelImportInto.svg
new file mode 100644
index 0000000..f840236
--- /dev/null
+++ b/Content/Slate/Starship/Common/LevelImportInto.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 15L13 11L16 15V16H0V15L3 11L1 15H15Z" fill="white"/>
+<path d="M9 13L6.5 6L3 14H13L10.5 9L9 13Z" fill="white"/>
+<path d="M13 0H11V4H8.5L12 9L15.5 4H13V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LevelNew.svg b/Content/Slate/Starship/Common/LevelNew.svg
new file mode 100644
index 0000000..aba4584
--- /dev/null
+++ b/Content/Slate/Starship/Common/LevelNew.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 15L13 11L16 15V16H0V15L3 11L1 15H15Z" fill="white"/>
+<path d="M9 13L6.5 6L3 14H13L10.5 9L9 13Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 3H13V0H11V3H8V5H11V8H13V5H16V3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LevelOpen.svg b/Content/Slate/Starship/Common/LevelOpen.svg
new file mode 100644
index 0000000..6a04d0e
--- /dev/null
+++ b/Content/Slate/Starship/Common/LevelOpen.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 15L13 11L16 15V16H0V15L3 11L1 15H15Z" fill="white"/>
+<path d="M9 13L6.5 6L3 14H13L10.5 9L9 13Z" fill="white"/>
+<path d="M6 3V5H11V7.5L16 4L11 0.5V3H6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LevelRecent.svg b/Content/Slate/Starship/Common/LevelRecent.svg
new file mode 100644
index 0000000..6186724
--- /dev/null
+++ b/Content/Slate/Starship/Common/LevelRecent.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 15L13 11L16 15V16H0V15L3 11L1 15H15Z" fill="white"/>
+<path d="M9 13L6.5 6L3 14H13L10.5 9L9 13Z" fill="white"/>
+<path d="M12 0C11.2089 0 10.4355 0.234596 9.77772 0.674122C9.11993 1.11365 8.60723 1.73836 8.30448 2.46927C8.00173 3.20017 7.92252 4.00444 8.07686 4.78036C8.2312 5.55629 8.61216 6.26902 9.17157 6.82843C9.73098 7.38784 10.4437 7.7688 11.2196 7.92314C11.9956 8.07748 12.7998 7.99827 13.5307 7.69552C14.2616 7.39277 14.8864 6.88008 15.3259 6.22228C15.7654 5.56448 16 4.79113 16 4C16 2.93913 15.5786 1.92172 14.8284 1.17157C14.0783 0.421427 13.0609 0 12 0V0ZM12 7.11C11.3849 7.11 10.7836 6.9276 10.2722 6.58587C9.76074 6.24414 9.36213 5.75842 9.12674 5.19015C8.89135 4.62187 8.82976 3.99655 8.94976 3.39327C9.06976 2.78999 9.36596 2.23584 9.8009 1.8009C10.2358 1.36596 10.79 1.06976 11.3933 0.949758C11.9966 0.829758 12.6219 0.891346 13.1901 1.12673C13.7584 1.36212 14.2441 1.76074 14.5859 2.27218C14.9276 2.78361 15.11 3.3849 15.11 4C15.11 4.82482 14.7823 5.61586 14.1991 6.1991C13.6159 6.78234 12.8248 7.11 12 7.11Z" fill="white"/>
+<path d="M13.7801 4.89H11.1101V2.22H12.0001V4H13.7801V4.89Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LevelSaveAll.svg b/Content/Slate/Starship/Common/LevelSaveAll.svg
new file mode 100644
index 0000000..3f551c9
--- /dev/null
+++ b/Content/Slate/Starship/Common/LevelSaveAll.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.55 5L6.55 3.5L7.25 5H11V0H3V5H5.55ZM8 1H10V4H8V1Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 15L13 11L16 15V16H0V15L3 11L1 15H15Z" fill="white"/>
+<path d="M9 13L6.5 6L3 14H13L10.5 9L9 13Z" fill="white"/>
+<path opacity="0.5" d="M5.54 5H3V0H1V10.95L2.16 8.58L3 9L5.54 5Z" fill="white"/>
+<path opacity="0.5" d="M7.25 5L8.74 8H9.47L10.68 6.63L14 9.98V2L12 0H11V5H7.25Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Levels.svg b/Content/Slate/Starship/Common/Levels.svg
new file mode 100644
index 0000000..cf4b66e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Levels.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 13L13.5 8.06L16 13V15H0V13L2.5 8L1 13H15Z" fill="white"/>
+<path d="M8.5 10.5L6 2L3 12H13L10.5 5.59L8.5 10.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LightBulb.svg b/Content/Slate/Starship/Common/LightBulb.svg
new file mode 100644
index 0000000..a381853
--- /dev/null
+++ b/Content/Slate/Starship/Common/LightBulb.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 12H6V14H10V12Z" fill="white"/>
+<path opacity="0.5" d="M8.8 16H7.2L6.5 15H9.5L8.8 16Z" fill="white"/>
+<path d="M8 0C5.2 0 3 2.5 3 4.9C3 6.3 3.9 7.4 4.9 8.4C5.5 9 6 10 6.7 11H9.4C10.1 10.1 10.6 9 11.2 8.4C12.2 7.4 13.1 6.3 13.1 4.9C13 2.5 10.8 0 8 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LightBulbOff.svg b/Content/Slate/Starship/Common/LightBulbOff.svg
new file mode 100644
index 0000000..36e2297
--- /dev/null
+++ b/Content/Slate/Starship/Common/LightBulbOff.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 1C10.3 1 12 3.1 12 4.9C12 5.8 11.5 6.7 10.5 7.7C9.9 8.2 9.4 9.1 9.1 10H6.9C6.7 9.2 6.2 8.4 5.6 7.7C4.8 6.9 4 6 4 4.9C4 3.1 5.7 1 8 1ZM8 0C5.2 0 3 2.5 3 4.9C3 6.3 3.9 7.4 4.9 8.4C5.5 9 6 10 6 11H10C10 10 10.6 9 11.1 8.4C12.1 7.4 13 6.3 13 4.9C13 2.5 10.8 0 8 0Z" fill="white"/>
+<path opacity="0.5" d="M10 12H6V14H10V12Z" fill="white"/>
+<path opacity="0.5" d="M8.8 16H7.2L6.5 15H9.5L8.8 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LightBulbOffSolid.svg b/Content/Slate/Starship/Common/LightBulbOffSolid.svg
new file mode 100644
index 0000000..0dc5048
--- /dev/null
+++ b/Content/Slate/Starship/Common/LightBulbOffSolid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_6" data-name="Layer 6"><g id="LightBulbOffSolid"><path class="cls-1" d="M8,1a4.19,4.19,0,0,1,4,3.94A3.89,3.89,0,0,1,10.45,7.7,5,5,0,0,0,9.13,10H6.87a4.91,4.91,0,0,0-1.3-2.28A4.19,4.19,0,0,1,4,4.94,4.19,4.19,0,0,1,8,1M8,0A5.15,5.15,0,0,0,3,4.94H3A5.09,5.09,0,0,0,4.86,8.43,3.79,3.79,0,0,1,6,11h4a3.8,3.8,0,0,1,1.14-2.57A4.92,4.92,0,0,0,13,4.94h0A5.15,5.15,0,0,0,8,0Z"/><rect class="cls-2" width="16" height="16"/><rect class="cls-1" x="6" y="12" width="4" height="2"/><polygon class="cls-1" points="9 16 7 16 6 15 10 15 9 16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/LightBulbSolid.svg b/Content/Slate/Starship/Common/LightBulbSolid.svg
new file mode 100644
index 0000000..c7a9edb
--- /dev/null
+++ b/Content/Slate/Starship/Common/LightBulbSolid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_6" data-name="Layer 6"><g id="LightBulbSolid"><rect class="cls-1" x="6" y="12" width="4" height="2"/><polygon class="cls-1" points="9 16 7 16 6 15 10 15 9 16"/><path class="cls-1" d="M8,0A5.15,5.15,0,0,0,3,4.94H3A5.09,5.09,0,0,0,4.86,8.43,20.22,20.22,0,0,1,6.63,11H9.37a19.06,19.06,0,0,1,1.77-2.57A4.92,4.92,0,0,0,13,4.94h0A5.15,5.15,0,0,0,8,0Z"/><rect class="cls-2" width="16" height="16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/LightTypes.svg b/Content/Slate/Starship/Common/LightTypes.svg
new file mode 100644
index 0000000..53176a5
--- /dev/null
+++ b/Content/Slate/Starship/Common/LightTypes.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 7H10V9H16V7Z" fill="white"/>
+<path d="M16 4H10V6H16V4Z" fill="white"/>
+<path d="M16 1H10V3H16V1Z" fill="white"/>
+<path d="M2.2 9.5C2.2 9.6 2.2 9.79999 2.2 9.89999H0V9H2.2C2.2 9.2 2.2 9.4 2.2 9.5Z" fill="white"/>
+<path d="M9.79995 12.2L11.4 13.7999L10.8 14.3999L9.19995 12.7999C9.49995 12.6999 9.69995 12.5 9.79995 12.2Z" fill="white"/>
+<path d="M6.49998 13.8C6.59998 13.8 6.79998 13.8 6.89998 13.8V16.0001H6.09998V13.8C6.19998 13.8 6.39998 13.8 6.49998 13.8Z" fill="white"/>
+<path d="M3.79998 12.7999L2.19998 14.3999L1.59998 13.7999L3.19998 12.2C3.29998 12.5 3.49998 12.6999 3.79998 12.7999Z" fill="white"/>
+<path d="M3.19998 6.80008L1.59998 5.2001L2.19998 4.6001L3.79998 6.2001C3.49998 6.3001 3.29998 6.50008 3.19998 6.80008Z" fill="white"/>
+<path d="M6.49998 5.20001C6.39998 5.20001 6.19998 5.20001 6.09998 5.20001V3H6.99998V5.20001C6.79998 5.20001 6.59998 5.20001 6.49998 5.20001Z" fill="white"/>
+<path d="M6.50005 11.7001C7.71508 11.7001 8.70005 10.7151 8.70005 9.50006C8.70005 8.28503 7.71508 7.30005 6.50005 7.30005C5.28502 7.30005 4.30005 8.28503 4.30005 9.50006C4.30005 10.7151 5.28502 11.7001 6.50005 11.7001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LightingComponents.svg b/Content/Slate/Starship/Common/LightingComponents.svg
new file mode 100644
index 0000000..80e69c3
--- /dev/null
+++ b/Content/Slate/Starship/Common/LightingComponents.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.50005 11.7C7.71508 11.7 8.70005 10.7151 8.70005 9.50005C8.70005 8.28502 7.71508 7.30005 6.50005 7.30005C5.28502 7.30005 4.30005 8.28502 4.30005 9.50005C4.30005 10.7151 5.28502 11.7 6.50005 11.7Z" fill="white"/>
+<path d="M2.2 9.5001C2.2 9.6001 2.2 9.8001 2.2 9.9001H0V9.1001H2.2C2.2 9.2001 2.2 9.4001 2.2 9.5001Z" fill="white"/>
+<path d="M9.79995 12.2L11.4 13.8L10.8 14.4L9.19995 12.8C9.49995 12.7 9.69995 12.5 9.79995 12.2Z" fill="white"/>
+<path d="M6.49998 13.8C6.59998 13.8 6.79998 13.8 6.89998 13.8V16H6.09998V13.8C6.19998 13.8 6.39998 13.8 6.49998 13.8Z" fill="white"/>
+<path d="M3.79998 12.8L2.19998 14.4L1.59998 13.8L3.19998 12.2C3.29998 12.5 3.49998 12.7 3.79998 12.8Z" fill="white"/>
+<path d="M3.19998 6.8001L1.59998 5.2001L2.19998 4.6001L3.79998 6.2001C3.49998 6.3001 3.29998 6.5001 3.19998 6.8001Z" fill="white"/>
+<path d="M6.49998 5.2C6.39998 5.2 6.19998 5.2 6.09998 5.2V3H6.99998V5.2C6.79998 5.2 6.59998 5.2 6.49998 5.2Z" fill="white"/>
+<path d="M15 10H10V8V4H11C11.6 4 12 4.4 12 5V6.5C12 7.3 12.7 8 13.5 8H15V10Z" fill="white"/>
+<path d="M10 1V3H11.5C12.3 3 13 3.7 13 4.5V6C13 6.6 13.4 7 14 7H15V1H10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LightingFeatures.svg b/Content/Slate/Starship/Common/LightingFeatures.svg
new file mode 100644
index 0000000..33588d2
--- /dev/null
+++ b/Content/Slate/Starship/Common/LightingFeatures.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.2 9.5C2.2 9.6 2.2 9.79999 2.2 9.89999H0V9H2.2C2.2 9.2 2.2 9.4 2.2 9.5Z" fill="white"/>
+<path d="M9.79995 12.2L11.4 13.7999L10.8 14.3999L9.19995 12.7999C9.49995 12.6999 9.69995 12.5 9.79995 12.2Z" fill="white"/>
+<path d="M6.49998 13.8C6.59998 13.8 6.79998 13.8 6.89998 13.8V16.0001H6.09998V13.8C6.19998 13.8 6.39998 13.8 6.49998 13.8Z" fill="white"/>
+<path d="M3.79998 12.7999L2.19998 14.3999L1.59998 13.7999L3.19998 12.2C3.29998 12.5 3.49998 12.6999 3.79998 12.7999Z" fill="white"/>
+<path d="M10.8 9.90009C10.8 9.80009 10.8 9.60009 10.8 9.50009C10.8 9.40009 10.8 9.2001 10.8 9.1001H13V10.0001H10.8V9.90009Z" fill="white"/>
+<path d="M3.19998 6.80008L1.59998 5.2001L2.19998 4.6001L3.79998 6.2001C3.49998 6.3001 3.29998 6.50008 3.19998 6.80008Z" fill="white"/>
+<path d="M6.49998 5.20001C6.39998 5.20001 6.19998 5.20001 6.09998 5.20001V3H6.99998V5.20001C6.79998 5.20001 6.59998 5.20001 6.49998 5.20001Z" fill="white"/>
+<path d="M6.50005 11.7001C7.71508 11.7001 8.70005 10.7151 8.70005 9.50006C8.70005 8.28503 7.71508 7.30005 6.50005 7.30005C5.28502 7.30005 4.30005 8.28503 4.30005 9.50006C4.30005 10.7151 5.28502 11.7001 6.50005 11.7001Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.3 7.29993L12.5 6.19995L14.7 7.29993L14.2 4.89993L16 3.19995L13.6 2.89993L12.5 0.699951L11.4 2.89993L9 3.19995L10.7 4.89993L10.3 7.29993Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LitCube.svg b/Content/Slate/Starship/Common/LitCube.svg
new file mode 100644
index 0000000..9d6aee2
--- /dev/null
+++ b/Content/Slate/Starship/Common/LitCube.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M8 0.5C3.9 0.5 0.5 3.9 0.5 8C0.5 12.1 3.9 15.5 8 15.5C12.1 15.5 15.5 12.1 15.5 8C15.5 3.9 12.1 0.5 8 0.5Z" fill="white"/>
+<path d="M8.5 13.4C5.2 13.4 2.5 10.7 2.5 7.4C2.5 4.2 5 1.6 8.2 1.5C8.1 1.5 8 1.5 7.9 1.5C4.4 1.5 1.5 4.4 1.5 8C1.5 11.6 4.4 14.5 8 14.5C11.6 14.5 14.5 11.6 14.5 8C14.5 7.9 14.5 7.8 14.5 7.7C14.3 10.9 11.7 13.4 8.5 13.4Z" fill="white"/>
+<path d="M10.6 6.8999C11.4284 6.8999 12.1 6.22833 12.1 5.3999C12.1 4.57148 11.4284 3.8999 10.6 3.8999C9.77155 3.8999 9.09998 4.57148 9.09998 5.3999C9.09998 6.22833 9.77155 6.8999 10.6 6.8999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LiveLink.svg b/Content/Slate/Starship/Common/LiveLink.svg
new file mode 100644
index 0000000..6b19583
--- /dev/null
+++ b/Content/Slate/Starship/Common/LiveLink.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 9C9.65685 9 11 7.65685 11 6C11 4.34315 9.65685 3 8 3C6.34315 3 5 4.34315 5 6C5 7.65685 6.34315 9 8 9Z" fill="white"/>
+<path opacity="0.5" d="M15.5 6C15.5008 6.98483 15.3068 7.96009 14.9292 8.86968C14.5517 9.77926 13.998 10.6052 13.3 11.3L11.79 9.79C12.7951 8.78481 13.3598 7.42151 13.3598 6C13.3598 4.57848 12.7951 3.21518 11.79 2.21L13.3 0.699997C13.998 1.39479 14.5517 2.22073 14.9292 3.13032C15.3068 4.0399 15.5008 5.01516 15.5 6ZM2.64 6C2.63893 5.29596 2.77709 4.59866 3.04653 3.94822C3.31598 3.29778 3.71138 2.70704 4.21 2.21L2.7 0.699997C2.00216 1.39498 1.44844 2.22092 1.07061 3.13044C0.692786 4.03995 0.498291 5.01513 0.498291 6C0.498291 6.98487 0.692786 7.96004 1.07061 8.86956C1.44844 9.77907 2.00216 10.605 2.7 11.3L4.21 9.79C3.71138 9.29295 3.31598 8.70221 3.04653 8.05177C2.77709 7.40134 2.63893 6.70404 2.64 6Z" fill="white"/>
+<path d="M9 10H7V16H9V10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/LocalizationDashboard.svg b/Content/Slate/Starship/Common/LocalizationDashboard.svg
new file mode 100644
index 0000000..744a218
--- /dev/null
+++ b/Content/Slate/Starship/Common/LocalizationDashboard.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 12C15 12 14.5 13 12.5 13C10.5 13 10 10 7 10C6.37089 10.0499 5.76499 10.2598 5.2399 10.6099C4.71481 10.9599 4.28798 11.4385 4 12V3C4.28798 2.43846 4.71481 1.95991 5.2399 1.60985C5.76499 1.25979 6.37089 1.04985 7 1C10 1 10.5 4 12.5 4C14.5 4 15 3 15 3V12Z" fill="white"/>
+<path d="M3 2H2V16H3V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Log.svg b/Content/Slate/Starship/Common/Log.svg
new file mode 100644
index 0000000..63935c9
--- /dev/null
+++ b/Content/Slate/Starship/Common/Log.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 4V1H12V4H9V1H7V4H4V1H2V4V16H14V4ZM13 13H3V12H13V13ZM13 11H3V10H13V11ZM13 9H3V8H13V9ZM13 7H3V6H13V7Z" fill="white"/>
+<path opacity="0.5" d="M6 0H5V3H6V0Z" fill="white"/>
+<path opacity="0.5" d="M11 0H10V3H11V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Loop.svg b/Content/Slate/Starship/Common/Loop.svg
new file mode 100644
index 0000000..c2256fa
--- /dev/null
+++ b/Content/Slate/Starship/Common/Loop.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{fill:#fff;fill-rule:evenodd;}.cls-2{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><path class="cls-1" d="M16,2H4A4,4,0,0,0,0,6v4a4.14,4.14,0,0,0,4,4H9v5l8-6L9,7v5H4.5A2.36,2.36,0,0,1,2,9.5v-3A2.36,2.36,0,0,1,4.5,4h11A2.36,2.36,0,0,1,18,6.5V9a3,3,0,0,1-.69,2l1.88,1.41A4,4,0,0,0,20,10V6A4,4,0,0,0,16,2Z"/><rect class="cls-2" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/MakeStaticMesh.svg b/Content/Slate/Starship/Common/MakeStaticMesh.svg
new file mode 100644
index 0000000..0c10e6d
--- /dev/null
+++ b/Content/Slate/Starship/Common/MakeStaticMesh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4{fill:#fff;}.cls-2,.cls-4{fill-rule:evenodd;}.cls-2{opacity:0.5;}.cls-5{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><polygon class="cls-2" points="4 16 10 20 10 15 4 11 4 16"/><polygon class="cls-2" points="20 9.18 11 15 11 20 20 13.54 20 9.18"/><path class="cls-3" d="M13.61,4.75,4.5,9.69l6,4,9.11-5.94Zm0,1.13,4,2L14.35,10,10.62,7.51Zm-7.2,3.9,3.2-1.73,3.81,2.54L10.51,12.5Z"/><path class="cls-4" d="M7.07.16,11,3.47,7.07,6.79V4.56C3.39,4.56.79,6.22,0,10.93,0,4.65,3.52,2.35,7.07,2.35Z"/><rect class="cls-5" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/MaterialAnalyzer.svg b/Content/Slate/Starship/Common/MaterialAnalyzer.svg
new file mode 100644
index 0000000..c4abd8b
--- /dev/null
+++ b/Content/Slate/Starship/Common/MaterialAnalyzer.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 0C3.1 0 0 3.1 0 7C0 10.9 3.1 14 7 14C8.5 14 9.9 13.5 11 12.7V11.4C9.9 12.4 8.5 12.9 7 12.9C3.7 12.9 1 10.2 1 6.89999C1 3.59999 3.7 0.899994 7 0.899994C10.3 0.899994 13 3.59999 13 6.89999H14C14 3.09999 10.9 0 7 0Z" fill="white"/>
+<path opacity="0.5" d="M7 3V0.5C8.5 0.5 9.9 0.999994 11 1.89999V3H7ZM7 11H11V7H7V11ZM7 3H3V7H7V3ZM13.5 7C13.5 5.5 13 4.1 12.1 3H11V7H13.5ZM3 12.1C4.1 13 5.5 13.5 7 13.5V11H3V12.1ZM0.5 7C0.5 8.5 1 9.9 1.9 11H3V7H0.5ZM1.9 3H3V1.89999C2.6 2.19999 2.2 2.6 1.9 3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 10H13V8H15V10ZM15 15V11H14H13H12V12H13V15H12V16H13H15H16V15H15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/MediaPlanes.svg b/Content/Slate/Starship/Common/MediaPlanes.svg
new file mode 100644
index 0000000..e73da07
--- /dev/null
+++ b/Content/Slate/Starship/Common/MediaPlanes.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 12L6 15V1L15 4V12Z" fill="white"/>
+<path opacity="0.5" d="M5 12L1 13V3L5 4V12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Merge.svg b/Content/Slate/Starship/Common/Merge.svg
new file mode 100644
index 0000000..152281f
--- /dev/null
+++ b/Content/Slate/Starship/Common/Merge.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.2 6H12L8 1L4 6H6.8C6.6 9 4.7 13 0 13V15C3.7 15 6.6 13 8 9C9.4 13 12.3 15 16 15V13C11.3 13 9.4 9 9.2 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/MessageLog.svg b/Content/Slate/Starship/Common/MessageLog.svg
new file mode 100644
index 0000000..f22e607
--- /dev/null
+++ b/Content/Slate/Starship/Common/MessageLog.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6 0H5V3H6V0Z" fill="white"/>
+<path opacity="0.5" d="M11 0H10V3H11V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 1V4H9V1H7V4H4V1H2V4V16H14V4V1H12ZM8 12.5L4.6 15L5.7 12.1C4.1 11.5 3 10.2 3 8.8C3 6.7 5.2 5 8 5C10.8 5 13 6.7 13 8.8C13 10.9 10.8 12.5 8 12.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/MobilityMoveable.svg b/Content/Slate/Starship/Common/MobilityMoveable.svg
new file mode 100644
index 0000000..f8fa66e
--- /dev/null
+++ b/Content/Slate/Starship/Common/MobilityMoveable.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.00005 2L5.80005 5H10.2001L8.00005 2Z" fill="white"/>
+<path d="M8.00005 14L5.80005 11H10.2001L8.00005 14Z" fill="white"/>
+<path d="M14 8.00005L11 5.80005V10.2001L14 8.00005Z" fill="white"/>
+<path d="M2 8.00005L5 5.80005V10.2001L2 8.00005Z" fill="white"/>
+<path opacity="0.5" d="M9 7H7V9H9V7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/MobilityStatic.svg b/Content/Slate/Starship/Common/MobilityStatic.svg
new file mode 100644
index 0000000..de184b8
--- /dev/null
+++ b/Content/Slate/Starship/Common/MobilityStatic.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 4C10.2 4 12 5.8 12 8C12 10.2 10.2 12 8 12C5.8 12 4 10.2 4 8C4 5.8 5.8 4 8 4ZM8 2.5C5 2.5 2.5 5 2.5 8C2.5 11 5 13.5 8 13.5C11 13.5 13.5 11 13.5 8C13.5 5 11 2.5 8 2.5Z" fill="white"/>
+<path opacity="0.5" d="M9 7H7V9H9V7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/MobilityStationary.svg b/Content/Slate/Starship/Common/MobilityStationary.svg
new file mode 100644
index 0000000..2652d62
--- /dev/null
+++ b/Content/Slate/Starship/Common/MobilityStationary.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9 7H7V9H9V7Z" fill="white"/>
+<path d="M6 5V3H3V13H6V11H4V5H6Z" fill="white"/>
+<path d="M10 5V3H13V13H10V11H12V5H10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Modules.svg b/Content/Slate/Starship/Common/Modules.svg
new file mode 100644
index 0000000..9fec88f
--- /dev/null
+++ b/Content/Slate/Starship/Common/Modules.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.89996 5.39992C5.69996 5.89992 5.09996 6.09992 4.59996 5.89992C4.09996 5.69992 3.89996 5.09992 4.09996 4.59992C4.29996 4.09992 4.89996 3.79992 5.39996 4.09992C5.89996 4.29992 6.09996 4.89992 5.89996 5.39992Z" fill="white"/>
+<path d="M8.6 4.5L10 3.6C9.9 3.2 9.7 2.8 9.5 2.4L7.9 2.8C7.7 2.5 7.5 2.3 7.2 2.1L7.6 0.5C7.4 0.4 7.2 0.3 7 0.2C6.8 0.1 6.6 0.1 6.4 0L5.5 1.4C5.1 1.3 4.8 1.3 4.4 1.4L3.6 0C3.2 0.1 2.8 0.3 2.4 0.5L2.8 2.1C2.5 2.3 2.3 2.5 2.1 2.8L0.5 2.4C0.4 2.6 0.3 2.8 0.2 3C0.1 3.2 0.1 3.4 0 3.6L1.4 4.4C1.3 4.8 1.3 5.1 1.4 5.5L0 6.4C0.1 6.8 0.3 7.2 0.5 7.6L2.1 7.2C2.3 7.5 2.6 7.7 2.9 8L2.4 9.5C2.6 9.6 2.8 9.7 3 9.8C3.2 9.9 3.4 9.9 3.6 10L4.4 8.6C4.8 8.7 5.1 8.7 5.5 8.6L6.4 10C6.8 9.9 7.2 9.7 7.6 9.5L7.2 7.9C7.5 7.7 7.8 7.4 8 7.1L9.6 7.5C9.6 7.4 9.7 7.2 9.8 7C9.9 6.8 9.9 6.6 10 6.4L8.6 5.5C8.7 5.2 8.7 4.8 8.6 4.5ZM7.5 6C6.9 7.4 5.3 8.1 3.9 7.5C2.6 6.9 1.9 5.3 2.5 4C3 2.6 4.6 1.9 6 2.5C7.4 3.1 8.1 4.6 7.5 6Z" fill="white"/>
+<path opacity="0.5" d="M12 11C11.7 10.7 11.2 10.7 11 11C10.7 11.3 10.7 11.8 11 12C11.3 12.3 11.8 12.3 12 12C12.3 11.7 12.3 11.3 12 11ZM11.8 11.8C11.6 12 11.3 12 11.1 11.8C10.9 11.6 10.9 11.3 11.1 11.1C11.3 10.9 11.6 10.9 11.8 11.1C12 11.3 12 11.6 11.8 11.8ZM15.5 12C15.5 11.7 15.5 11.3 15.5 11L14.3 10.8C14.2 10.5 14.1 10.3 14 10L14.7 9C14.6 8.9 14.5 8.7 14.4 8.6C14.3 8.5 14.1 8.4 14 8.3L13 9C12.8 8.9 12.5 8.7 12.2 8.7L12 7.5C11.7 7.5 11.3 7.5 11 7.5L10.8 8.7C10.5 8.8 10.3 8.9 10 9L9 8.3C8.9 8.4 8.8 8.5 8.7 8.7C8.5 8.8 8.5 8.9 8.3 9L9 10C8.9 10.2 8.8 10.5 8.7 10.8L7.5 11C7.5 11.3 7.5 11.7 7.5 12L8.7 12.2C8.8 12.5 8.9 12.7 9 13L8.3 14C8.4 14.1 8.5 14.3 8.6 14.4C8.7 14.5 8.9 14.6 9 14.7L10 14C10.2 14.1 10.5 14.3 10.8 14.3L11 15.5C11.3 15.5 11.7 15.5 12 15.5L12.2 14.3C12.5 14.2 12.7 14.1 13 14L14 14.7C14.1 14.6 14.3 14.5 14.4 14.4C14.5 14.3 14.6 14.1 14.7 14L14 13C14.1 12.8 14.3 12.5 14.3 12.2L15.5 12ZM13.1 13.1C12.2 14 10.8 14 10 13.1C9.1 12.2 9.1 10.8 10 10C10.9 9.1 12.3 9.1 13.1 10C13.9 10.9 13.9 12.2 13.1 13.1Z" fill="white"/>
+<path d="M5.79998 14.0001C5.79998 14.0001 5.79998 13.9001 5.89998 13.9001L6.49998 13.7001V12.4001L5.89998 12.2001C5.79998 12.1001 5.79998 12.0001 5.69998 11.9001L5.79998 11.2001L4.59998 10.6001L4.09998 11.0001C3.99998 11.0001 3.89998 11.0001 3.79998 11.0001L3.29998 10.6001L2.19998 11.3001L2.39998 12.0001L2.29998 12.1001C2.29998 12.1001 2.29998 12.2001 2.19998 12.2001L1.59998 12.4001V13.7001L2.19998 13.9001C2.29998 14.0001 2.29998 14.1001 2.39998 14.2001L2.29998 14.9001L3.49998 15.5001L3.89998 15.0001C3.99998 15.0001 4.09998 15.0001 4.19998 15.0001L4.69998 15.4001L5.79998 14.7001L5.59998 14.0001C5.69998 14.0001 5.79998 14.0001 5.79998 14.0001ZM3.49998 14.0001C2.99998 13.7001 2.69998 13.0001 2.99998 12.5001C3.29998 12.0001 3.99998 11.7001 4.49998 12.0001C4.99998 12.3001 5.29998 13.0001 4.99998 13.5001C4.69998 14.1001 3.99998 14.3001 3.49998 14.0001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/MultiUser.svg b/Content/Slate/Starship/Common/MultiUser.svg
new file mode 100644
index 0000000..d5c0672
--- /dev/null
+++ b/Content/Slate/Starship/Common/MultiUser.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 10V9.09998C0 6.59998 1.8 5.09998 4 5.09998C6.2 5.09998 8 6.59998 8 9.09998V10H0ZM4 0.5C2.8 0.5 1.8 1.50001 1.8 2.70001C1.8 3.90001 2.8 4.90002 4 4.90002C5.2 4.90002 6.2 3.90001 6.2 2.70001C6.2 1.40001 5.2 0.5 4 0.5Z" fill="white"/>
+<path opacity="0.5" d="M9 10.0001V9.30005C9 7.40005 10.3 6.30005 12 6.30005C13.6 6.30005 15 7.40005 15 9.30005V10.0001H9ZM12 2.80005C11.1 2.80005 10.4 3.50009 10.4 4.40009C10.4 5.30009 11.1 6.00006 12 6.00006C12.9 6.00006 13.6 5.30009 13.6 4.40009C13.6 3.50009 12.9 2.80005 12 2.80005Z" fill="white"/>
+<path d="M15 15H0V14H4V11H5V14H11V11H12V14H15V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Navigation.svg b/Content/Slate/Starship/Common/Navigation.svg
new file mode 100644
index 0000000..1d12b7d
--- /dev/null
+++ b/Content/Slate/Starship/Common/Navigation.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 0C4.5 0 2 2.5 2 5.5C2 8.5 5 10 7.5 16C10 10 13 8.5 13 5.5C13 2.5 10.5 0 7.5 0ZM7.5 8C6.1 8 5 6.9 5 5.5C5 4.1 6.1 3 7.5 3C8.9 3 10 4.1 10 5.5C10 6.9 8.9 8 7.5 8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/NextArrow.svg b/Content/Slate/Starship/Common/NextArrow.svg
new file mode 100644
index 0000000..9799dfa
--- /dev/null
+++ b/Content/Slate/Starship/Common/NextArrow.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 10V6H9V2L16 8L9 14V10H1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ObjectsBrowser.svg b/Content/Slate/Starship/Common/ObjectsBrowser.svg
new file mode 100644
index 0000000..d5cd75c
--- /dev/null
+++ b/Content/Slate/Starship/Common/ObjectsBrowser.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.9 4H0V13.9C0 14.5 0.5 15 1.1 15H14.9C15.5 15 16 14.5 16 13.9V5C16 4.4 15.5 4 14.9 4ZM7.6 12H0.4L4 6L7.6 12ZM14.5 9.5C14.5 11.2 13.2 12.5 11.5 12.5C9.8 12.5 8.5 11.2 8.5 9.5C8.5 7.8 9.8 6.5 11.5 6.5C13.2 6.5 14.5 7.8 14.5 9.5Z" fill="white"/>
+<path opacity="0.5" d="M8.3 3L6 0.400024C5.8 0.200024 5.5 0 5.2 0H1C0.4 0 0 0.4 0 1V3H8.3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/OpenAsset.svg b/Content/Slate/Starship/Common/OpenAsset.svg
new file mode 100644
index 0000000..739f3db
--- /dev/null
+++ b/Content/Slate/Starship/Common/OpenAsset.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 14V12H12V10L16 13L12 16V14H8Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 11.2L6 15.2V10.2L0 6.19995V11.2Z" fill="white"/>
+<path d="M9.6 0L0.5 4.9L6.5 8.9L15.6 3L9.6 0ZM9.6 1.1L13.6 3.1L10.3 5.2L6.6 2.8L9.6 1.1ZM2.4 5L5.6 3.3L9.4 5.8L6.5 7.7L2.4 5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7 10.1999V10.9999H11V7.9999H12L14.5 9.9999L16 8.7999V4.3999L7 10.1999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/OpenInExternalEditor.svg b/Content/Slate/Starship/Common/OpenInExternalEditor.svg
new file mode 100644
index 0000000..1dff2b4
--- /dev/null
+++ b/Content/Slate/Starship/Common/OpenInExternalEditor.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15 1H1V4H15V1Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 13.5V0H16V15H6.125L7.25 14H15V1H1V12.0556L0 13.5Z" fill="white"/>
+<path d="M8.1108 10.305L1.91553 15.6801L1.36035 15.0745L6.64715 8.85396L4.69141 7.25151L11.0002 5.98975L9.73848 12.2986L8.1108 10.305Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/OpenSourceLocation.svg b/Content/Slate/Starship/Common/OpenSourceLocation.svg
new file mode 100644
index 0000000..a64edcd
--- /dev/null
+++ b/Content/Slate/Starship/Common/OpenSourceLocation.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M13.93 3H8.27L5.93 0.369999C5.83211 0.255808 5.71104 0.163758 5.57483 0.0999641C5.43862 0.0361703 5.29039 0.00209463 5.14 0H1C0.734784 0 0.480429 0.105356 0.292892 0.292892C0.105356 0.480429 0 0.734784 0 1V3V12.92C0.00379112 13.1003 0.0535362 13.2767 0.144531 13.4325C0.235526 13.5882 0.364758 13.7182 0.519997 13.81L3.29 10.21L1.13 7H10V14H13.88C14.0245 14.0027 14.168 13.9768 14.3025 13.924C14.437 13.8711 14.5597 13.7923 14.6637 13.692C14.7677 13.5917 14.851 13.4719 14.9087 13.3395C14.9664 13.207 14.9974 13.0645 15 12.92V4C15.0003 3.86257 14.9723 3.72655 14.9178 3.60043C14.8632 3.4743 14.7832 3.36078 14.6828 3.26694C14.5824 3.17311 14.4637 3.10098 14.3342 3.05505C14.2047 3.00912 14.0671 2.99038 13.93 3Z" fill="white"/>
+<path d="M6.91986 11.71L1.79986 15.68L1.35986 15.2L5.54986 10.27L3.78986 8.58L8.99986 8L8.41986 13.38L6.91986 11.71Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/OptimizationViewmodes.svg b/Content/Slate/Starship/Common/OptimizationViewmodes.svg
new file mode 100644
index 0000000..779dc64
--- /dev/null
+++ b/Content/Slate/Starship/Common/OptimizationViewmodes.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M2 1H1V12H2V1Z" fill="white"/>
+<path opacity="0.5" d="M15 15V14H4V15H15Z" fill="white"/>
+<path d="M7 9H4V12H7V9Z" fill="white"/>
+<path d="M11 5H8V8H11V5Z" fill="white"/>
+<path d="M15 1H12V4H15V1Z" fill="white"/>
+<path opacity="0.5" d="M11 1H8V4H11V1Z" fill="white"/>
+<path opacity="0.5" d="M7 1H4V4H7V1Z" fill="white"/>
+<path opacity="0.5" d="M7 5H4V8H7V5Z" fill="white"/>
+<path d="M15 5H12V8H15V5Z" fill="white"/>
+<path d="M15 9H12V12H15V9Z" fill="white"/>
+<path d="M11 9H8V12H11V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/OutputLog.svg b/Content/Slate/Starship/Common/OutputLog.svg
new file mode 100644
index 0000000..6cbe2a5
--- /dev/null
+++ b/Content/Slate/Starship/Common/OutputLog.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6 0H5V3H6V0Z" fill="white"/>
+<path opacity="0.5" d="M11 0H10V3H11V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 1V4H9V1H7V4H4V1H2V4V16H14V4V1H12ZM4 11.3L6.7 10L4 8.7V7L8 9.3V10.8L4 13V11.3ZM12 13H8V12H12V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Paintbrush.svg b/Content/Slate/Starship/Common/Paintbrush.svg
new file mode 100644
index 0000000..502ab5a
--- /dev/null
+++ b/Content/Slate/Starship/Common/Paintbrush.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-2{opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M9.34,13.11,7.83,11.6s2.4-2.95,3.83-4.38S19.2,1.07,19.2,1.07a.47.47,0,0,1,.66,0h0a.45.45,0,0,1,0,.66S15.1,7.88,13.67,9.31,9.34,13.11,9.34,13.11Z"/><path class="cls-3" d="M8,13.51l-.94-1.07s-2.5-.41-3.44,3C3,17.56,0,19,0,19H3.75a4.58,4.58,0,0,0,4-2.53A3.45,3.45,0,0,0,8,13.51Z"/><rect class="cls-4" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/Parameters.svg b/Content/Slate/Starship/Common/Parameters.svg
new file mode 100644
index 0000000..3f4b8cb
--- /dev/null
+++ b/Content/Slate/Starship/Common/Parameters.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.6999 7.7C10.3999 6.7 10.5999 5.6 11.2999 4.8C12.0999 4 13.1999 3.8 14.1999 4.2L12.4999 5.9C12.0999 6.3 12.0999 7.1 12.4999 7.5C12.8999 7.9 13.6999 7.9 14.0999 7.5L15.7999 5.8C16.1999 6.8 15.8999 7.9 15.1999 8.7C14.3999 9.5 13.2999 9.7 12.3999 9.4L10.6999 7.7Z" fill="white"/>
+<path opacity="0.5" d="M11.6 9.9999L7.30005 14.2999C7.30005 14.6999 7.20005 15.1999 6.80005 15.4999C6.20005 16.0999 5.10005 16.0999 4.50005 15.4999C3.90005 14.8999 3.90005 13.7999 4.50005 13.1999C4.90005 12.7999 5.30005 12.6999 5.80005 12.6999L10.1 8.3999L11.6 9.9999ZM6.20005 13.7999C5.90005 13.4999 5.40005 13.4999 5.10005 13.7999C4.80005 14.0999 4.80005 14.5999 5.10005 14.8999C5.40005 15.1999 5.90005 15.1999 6.20005 14.8999C6.50005 14.5999 6.50005 14.0999 6.20005 13.7999Z" fill="white"/>
+<path d="M8 8H0V9H8V8Z" fill="white"/>
+<path d="M8 6H0V7H8V6Z" fill="white"/>
+<path d="M8 4H0V5H8V4Z" fill="white"/>
+<path d="M8 2H0V3H8V2Z" fill="white"/>
+<path d="M8 0H0V1H8V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ParticleSprites.svg b/Content/Slate/Starship/Common/ParticleSprites.svg
new file mode 100644
index 0000000..f07f7b8
--- /dev/null
+++ b/Content/Slate/Starship/Common/ParticleSprites.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 16.0001C1.1 15.8001 3.7 10.4001 6.9 7.2001C9.3 4.8001 12.5 3.2001 12.6 3.1001L13.4 4.30009C13.4 4.30009 9.7 6.0001 7.2 8.2001C3.9 11.1001 1 16.0001 1 16.0001Z" fill="white"/>
+<path opacity="0.5" d="M3 16C3 16 4.5 14.5 7.1 13.3C9.2 12.4 11.1 12 11.1 12L11.3 13.1C11 13.2 9.2 13.5 7.4 14C5 14.9 3 16 3 16Z" fill="white"/>
+<path opacity="0.5" d="M1.09999 14.7999C1.09999 14.6999 0.999986 12.6999 1.09999 10.8999C1.19999 9.29993 1.69999 7.39995 2.29999 5.69995H2.59999L3.29999 5.99994L3.69999 6.29993C2.89999 7.79993 2.09999 8.99995 1.59999 10.7C1.09999 12.5 1.09999 14.7999 1.09999 14.7999Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.0999756 5.79994L2.59998 5.99995L3.89998 8.19997L4.79998 5.89995L7.29998 5.29994L5.39998 3.69995L5.69998 1.19995L3.49998 2.49995L1.19998 1.49995L1.79998 3.89995L0.0999756 5.79994Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.19998 15.3001L11.5 14.3001L13.7 15.6001L13.4 13.1001L15.3 11.4001L12.8 10.9001L11.8 8.6001L10.6 10.8001L8.09998 11.0001L9.79998 12.9001L9.19998 15.3001Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1 6.89999L13.5 5.10001L15.7 5.20001L14.5 3.3L15.2 1.2L13.1 1.89999L11.3 0.5V2.7L9.40002 4L11.5 4.7L12.1 6.89999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/PathTracing.svg b/Content/Slate/Starship/Common/PathTracing.svg
new file mode 100644
index 0000000..5585c3f
--- /dev/null
+++ b/Content/Slate/Starship/Common/PathTracing.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M0.5 15H12.5C11.5 12.7 9.2 11 6.5 11C3.8 11 1.5 12.7 0.5 15Z" fill="white"/>
+<path d="M8.6 1.1L10.7 3.2L5.5 8.5L0.5 3.5L5.5 10L12.8 5.3L14.9 7.4L16 0L8.6 1.1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Pinned.svg b/Content/Slate/Starship/Common/Pinned.svg
new file mode 100644
index 0000000..30cac0a
--- /dev/null
+++ b/Content/Slate/Starship/Common/Pinned.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.70039 9.3L9.20039 6.1C9.80039 5.8 10.2004 5.4 10.2004 5C10.2004 4.2 9.00039 3.5 7.60039 3.5C6.10039 3.5 5.00039 4.2 5.00039 5C5.00039 5.5 5.40039 5.9 6.00039 6.1L5.50039 9.3C4.30039 9.7 3.40039 10.5 3.40039 11.3C3.40039 12.6 5.30039 13.7 7.60039 13.7C9.90039 13.7 11.8004 12.6 11.8004 11.3C11.7004 10.5 10.9004 9.8 9.70039 9.3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/PixelInspector.svg b/Content/Slate/Starship/Common/PixelInspector.svg
new file mode 100644
index 0000000..5d93a34
--- /dev/null
+++ b/Content/Slate/Starship/Common/PixelInspector.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0H2V6H8V0Z" fill="white"/>
+<path opacity="0.5" d="M8 6H2V12H8V6Z" fill="white"/>
+<path opacity="0.5" d="M14 0H8V6H14V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 15V16H13H11H10V15H11V12H10V11H11H12H13V15H14ZM13 8H11V10H13V8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/PlaceActors.svg b/Content/Slate/Starship/Common/PlaceActors.svg
new file mode 100644
index 0000000..76982a1
--- /dev/null
+++ b/Content/Slate/Starship/Common/PlaceActors.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 0L0 2.7V10.2L6 14V9H7V0Z" fill="white"/>
+<path opacity="0.5" d="M7 9V0L13 2.5V6H9V9H7Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 11H13V8H11V11H8V13H11V16H13V13H16V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/PlayerCollision.svg b/Content/Slate/Starship/Common/PlayerCollision.svg
new file mode 100644
index 0000000..c847fc5
--- /dev/null
+++ b/Content/Slate/Starship/Common/PlayerCollision.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 9.85C8.66652 9.84009 8.83348 9.84009 9 9.85V9.35C8.83523 9.382 8.66785 9.39874 8.5 9.4C7.77462 9.35698 7.09307 9.0385 6.59469 8.50968C6.09631 7.98087 5.81875 7.28166 5.81875 6.555C5.81875 5.82834 6.09631 5.12913 6.59469 4.60032C7.09307 4.0715 7.77462 3.75302 8.5 3.71C8.66816 3.71455 8.83554 3.73464 9 3.77V0L0 3V13L3.56 14.19C3.65732 12.9662 4.22762 11.8285 5.1499 11.0182C6.07218 10.208 7.27387 9.78892 8.5 9.85Z" fill="white"/>
+<path opacity="0.5" d="M10 0.5V4.15C10.4183 4.40163 10.7644 4.75718 11.0046 5.1821C11.2449 5.60702 11.3711 6.08686 11.3711 6.575C11.3711 7.06314 11.2449 7.54298 11.0046 7.9679C10.7644 8.39282 10.4183 8.74837 10 9V10.1C10.8295 10.3089 11.5836 10.747 12.176 11.3641C12.7683 11.9813 13.1752 12.7526 13.35 13.59L16 12V4L10 0.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/PlayerController.svg b/Content/Slate/Starship/Common/PlayerController.svg
new file mode 100644
index 0000000..116b410
--- /dev/null
+++ b/Content/Slate/Starship/Common/PlayerController.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8004 8.0004C14.2004 6.3004 13.0004 3.40039 11.7004 3.40039C9.90042 3.40039 9.90042 5.1004 9.10042 5.1004C8.70042 5.1004 7.30042 5.1004 6.80042 5.1004C6.00042 5.1004 6.10042 3.40039 4.30042 3.40039C3.10042 3.40039 1.80042 6.3004 1.20042 8.0004C0.100422 11.1004 0.000422955 12.6004 2.30042 12.6004C4.80042 12.6004 4.70042 9.70039 8.00042 9.70039C11.1004 9.70039 11.2004 12.6004 13.6004 12.6004C15.9004 12.6004 15.9004 11.1004 14.8004 8.0004ZM6.80042 8.1004H5.30042V9.6004H3.80042V8.1004H2.30042V6.6004H3.80042V5.1004H5.30042V6.6004H6.80042V8.1004ZM11.4004 9.40039C10.3004 9.40039 9.30042 8.5004 9.30042 7.3004C9.30042 6.2004 10.2004 5.20039 11.4004 5.20039C12.5004 5.20039 13.5004 6.1004 13.5004 7.3004C13.4004 8.5004 12.5004 9.40039 11.4004 9.40039Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3998 6.2998C10.7998 6.2998 10.2998 6.7998 10.2998 7.3998C10.2998 7.9998 10.7998 8.4998 11.3998 8.4998C11.9998 8.4998 12.4998 7.9998 12.4998 7.3998C12.4998 6.7998 11.9998 6.2998 11.3998 6.2998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/PostProcessing.svg b/Content/Slate/Starship/Common/PostProcessing.svg
new file mode 100644
index 0000000..0d00755
--- /dev/null
+++ b/Content/Slate/Starship/Common/PostProcessing.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 8C2 4.7 4.7 2 8 2C9.7 2 11.2 2.69999 12.2 3.79999L16 0H0V16L3.8 12.2C2.7 11.2 2 9.7 2 8Z" fill="white"/>
+<path d="M8.00002 13C10.8 13 13 10.8 13 8C13 6.6 12.4 5.4 11.5 4.5L4.40002 11.6C5.40002 12.4 6.60002 13 8.00002 13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/PreviousArrow.svg b/Content/Slate/Starship/Common/PreviousArrow.svg
new file mode 100644
index 0000000..8f86112
--- /dev/null
+++ b/Content/Slate/Starship/Common/PreviousArrow.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 10V6H7V2L0 8L7 14V10H15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Profile.svg b/Content/Slate/Starship/Common/Profile.svg
new file mode 100644
index 0000000..a0af630
--- /dev/null
+++ b/Content/Slate/Starship/Common/Profile.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{fill-opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><g id="Statistics"><rect class="cls-1" x="1.5" y="10.5" width="4" height="7" transform="translate(17.5 10.5) rotate(90)"/><rect class="cls-2" x="6" y="-6" width="4" height="16" transform="translate(10 -6) rotate(90)"/><rect class="cls-1" x="3.5" y="2.5" width="4" height="11" transform="translate(13.5 2.5) rotate(90)"/><rect class="cls-3" width="16" height="16" transform="translate(16) rotate(90)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/ProfileDataVisualizer.svg b/Content/Slate/Starship/Common/ProfileDataVisualizer.svg
new file mode 100644
index 0000000..021189d
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProfileDataVisualizer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{fill-opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><g id="profile"><rect class="cls-1" x="1.5" y="6.5" width="2" height="5" transform="translate(11.5 6.5) rotate(90)"/><rect class="cls-2" x="4.5" y="-4.5" width="2" height="11" transform="translate(6.5 -4.5) rotate(90)"/><rect class="cls-1" x="2.5" y="1.5" width="2" height="7" transform="translate(8.5 1.5) rotate(90)"/><path class="cls-2" d="M10,9.11c-3,0-6,3.39-6,3.39s3,3.39,6,3.39,6-3.39,6-3.39S13,9.11,10,9.11Zm0,6.26a2.87,2.87,0,1,1,2.87-2.87A2.87,2.87,0,0,1,10,15.37ZM8.43,10.46a.85.85,0,1,1-.85.84A.85.85,0,0,1,8.43,10.46Z"/><rect class="cls-3" width="16" height="16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/ProjectC++.svg b/Content/Slate/Starship/Common/ProjectC++.svg
new file mode 100644
index 0000000..52840a7
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProjectC++.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 3C4 2.66 4 2.39 4 2.25C3.98323 2.12891 3.92352 2.01787 3.83174 1.93711C3.73997 1.85635 3.62224 1.81124 3.5 1.81C3.38349 1.80311 3.26846 1.8389 3.17643 1.91068C3.0844 1.98247 3.02168 2.08532 3 2.2C2.97138 2.49264 2.97138 2.78737 3 3.08V4.93C2.95384 5.23828 2.95384 5.55172 3 5.86C3.03084 5.95922 3.0937 6.04543 3.17874 6.10513C3.26377 6.16484 3.3662 6.19469 3.47 6.19C3.53731 6.19406 3.60474 6.18446 3.66824 6.16178C3.73174 6.13911 3.79 6.10382 3.83951 6.05804C3.88902 6.01227 3.92876 5.95695 3.95634 5.89542C3.98392 5.83389 3.99877 5.76742 4 5.7C4 5.54 4 5.11 4 4.85H5V5.18C5.04607 5.5736 4.96922 5.97181 4.78 6.32C4.64818 6.5386 4.45949 6.7173 4.23406 6.83706C4.00864 6.95682 3.75493 7.01314 3.5 7C3.2916 7.00537 3.08437 6.96723 2.89152 6.88803C2.69868 6.80883 2.52447 6.6903 2.38 6.54C2.07 6.19 2 5.9 2 5V3C2 2.1 2.07 1.81 2.38 1.46C2.52447 1.30971 2.69868 1.19118 2.89152 1.11198C3.08437 1.03277 3.2916 0.994638 3.5 1C3.75049 0.986855 4.0001 1.03891 4.22446 1.15109C4.44881 1.26327 4.64022 1.43172 4.78 1.64C4.96288 1.96145 5.03986 2.33233 5 2.7V3H4Z" fill="white"/>
+<path d="M11 4H9V6H8V4H6V3H8V1H9V3H11V4Z" fill="white"/>
+<path d="M15 4H13V6H12V4H10V3H12V1H13V3H15V4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.93 11.8L0 6.6V11.8L7.93 17V11.8Z" fill="white"/>
+<path opacity="0.5" d="M16 6.6L9 11.8V17L16 11.8V6.6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ProjectLauncher.svg b/Content/Slate/Starship/Common/ProjectLauncher.svg
new file mode 100644
index 0000000..23db686
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProjectLauncher.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2 0V6.8C2 6.8 5 6 6.5 8C8 6 11 6 12 8L12.5 9H16V0H2Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0V6.8C2.32876 6.72503 2.6633 6.6782 3 6.66V1H15V8H12L12.48 9H16V0H2Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M14 12H16V10H13L14 12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2599 12C11.7599 10.58 10.6899 8.09 9.63994 8.09C8.06994 8.09 8.07994 9.53 7.43994 9.53H5.50994C4.86994 9.53 4.92994 8.09 3.35994 8.09C2.35994 8.09 1.21994 10.57 0.739942 12C-0.160058 14.65 -0.260058 15.93 1.66994 15.93C3.81994 15.93 3.74994 13.5 6.49994 13.5C9.24994 13.5 9.25994 15.93 11.2799 15.93C13.2999 15.93 13.1999 14.67 12.2599 12ZM5.48994 12H3.99994V13.39H2.99994V12H1.57994V11H2.99994V9.47H3.99994V11H5.48994V12ZM9.48994 13.35C9.12405 13.35 8.76637 13.2415 8.46214 13.0382C8.15791 12.8349 7.92079 12.546 7.78077 12.208C7.64074 11.8699 7.60411 11.4979 7.67549 11.1391C7.74687 10.7802 7.92307 10.4506 8.18179 10.1919C8.44052 9.93313 8.77016 9.75693 9.12902 9.68555C9.48789 9.61416 9.85986 9.6508 10.1979 9.79082C10.5359 9.93085 10.8249 10.168 11.0282 10.4722C11.2314 10.7764 11.3399 11.1341 11.3399 11.5C11.3399 11.9889 11.1464 12.458 10.8016 12.8046C10.4568 13.1513 9.98886 13.3474 9.49994 13.35H9.48994Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.48009 10.78C9.35508 10.778 9.23231 10.8133 9.1274 10.8813C9.02249 10.9493 8.94018 11.047 8.89096 11.1619C8.84174 11.2768 8.82783 11.4038 8.851 11.5267C8.87417 11.6495 8.93337 11.7627 9.02106 11.8518C9.10876 11.9409 9.22098 12.0019 9.34346 12.0271C9.46593 12.0522 9.59311 12.0403 9.70881 11.9929C9.82451 11.9456 9.9235 11.8648 9.99318 11.761C10.0629 11.6572 10.1001 11.535 10.1001 11.41C10.1001 11.2446 10.0351 11.0859 9.91911 10.968C9.80312 10.8502 9.64543 10.7826 9.48009 10.78Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ProjectNew.svg b/Content/Slate/Starship/Common/ProjectNew.svg
new file mode 100644
index 0000000..e76bb14
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProjectNew.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 5H9V8H7V5H4V3H7V0H9V3H12V5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.93 10.8L0 5.6V10.8L7.93 16V10.8Z" fill="white"/>
+<path opacity="0.5" d="M16 5.6L9 10.8V16L16 10.8V5.6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ProjectOpen.svg b/Content/Slate/Starship/Common/ProjectOpen.svg
new file mode 100644
index 0000000..7062ba6
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProjectOpen.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 5V3H8V0L14 4L8 8V5H4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.93 10.8L0 5.6V10.8L7.93 16V10.8Z" fill="white"/>
+<path opacity="0.5" d="M16 5.6L9 10.8V16L16 10.8V5.6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ProjectPackage.svg b/Content/Slate/Starship/Common/ProjectPackage.svg
new file mode 100644
index 0000000..dad6c74
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProjectPackage.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.93 10.8L0 5.6V10.8L7.93 16V10.8Z" fill="white"/>
+<path opacity="0.5" d="M16 5.6L9 10.8V16L16 10.8V5.6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9999 1.35L8.11991 0L0.409912 4.38L3.35991 6.22L10.9999 1.35Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.93994 7.06L8.46994 9.36L15.5299 4.24L12.2899 2.02L4.93994 7.06Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ProjectSettings.svg b/Content/Slate/Starship/Common/ProjectSettings.svg
new file mode 100644
index 0000000..0c0cd15
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProjectSettings.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.93 10.8L0 5.60001V10.8L7.93 16V10.8Z" fill="white"/>
+<path opacity="0.5" d="M16 5.60001L9 10.8V16L16 10.8V5.60001Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.7699 5.00001C12.797 4.82448 12.8137 4.64751 12.8199 4.47001C12.8115 4.31258 12.7948 4.1557 12.7699 4.00001L11.4399 3.80001C11.3695 3.50291 11.2513 3.21922 11.0899 2.96001L11.8999 1.88001C11.6773 1.60067 11.4222 1.34889 11.1399 1.13001L10.0599 1.93001C9.79816 1.77602 9.51512 1.66145 9.21993 1.59001L8.99993 0.230013C8.83443 0.201242 8.66754 0.181214 8.49993 0.170013C8.33231 0.181045 8.1654 0.201074 7.99993 0.230013L7.79993 1.56001C7.51069 1.63519 7.23431 1.75316 6.97993 1.91001L5.84993 1.10001C5.57059 1.32261 5.31881 1.57775 5.09993 1.86001L5.89993 3.00001C5.74432 3.25384 5.62958 3.53055 5.55993 3.82001L4.22993 4.00001C4.20337 4.17896 4.18668 4.35923 4.17993 4.54001C4.18939 4.69404 4.20607 4.84755 4.22993 5.00001L5.55993 5.19001C5.62958 5.47948 5.74432 5.75619 5.89993 6.01001L5.09993 7.14001C5.31881 7.42228 5.57059 7.67741 5.84993 7.90001L6.93993 7.09001C7.19329 7.24883 7.46998 7.36693 7.75993 7.44001L7.99993 8.77001C8.17862 8.80043 8.35892 8.82047 8.53993 8.83001C8.69415 8.81747 8.84766 8.79745 8.99993 8.77001L9.18993 7.44001C9.48512 7.36858 9.76816 7.25401 10.0299 7.10001L11.1099 7.90001C11.3922 7.68113 11.6473 7.42935 11.8699 7.15001L11.0599 6.07001C11.2213 5.81081 11.3395 5.52711 11.4099 5.23001L12.7699 5.00001ZM8.49993 6.38001C8.12768 6.38199 7.76323 6.27342 7.45275 6.06805C7.14227 5.86268 6.89975 5.56976 6.75592 5.22641C6.6121 4.88307 6.57344 4.50475 6.64484 4.13941C6.71625 3.77407 6.89451 3.43815 7.15703 3.17423C7.41955 2.9103 7.75451 2.73026 8.11947 2.6569C8.48442 2.58355 8.86294 2.62019 9.20705 2.76218C9.55116 2.90418 9.84536 3.14513 10.0524 3.45451C10.2594 3.76389 10.3699 4.12776 10.3699 4.50001C10.3699 4.99689 10.1732 5.47357 9.82283 5.82585C9.47242 6.17813 8.9968 6.37737 8.49993 6.38001Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/ProjectsRecent.svg b/Content/Slate/Starship/Common/ProjectsRecent.svg
new file mode 100644
index 0000000..3e85540
--- /dev/null
+++ b/Content/Slate/Starship/Common/ProjectsRecent.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C7.20888 0 6.43552 0.234596 5.77772 0.674122C5.11992 1.11365 4.60723 1.73836 4.30448 2.46927C4.00173 3.20017 3.92252 4.00444 4.07686 4.78036C4.2312 5.55629 4.61216 6.26902 5.17157 6.82843C5.73098 7.38784 6.44372 7.7688 7.21964 7.92314C7.99556 8.07748 8.79983 7.99827 9.53074 7.69552C10.2616 7.39277 10.8864 6.88008 11.3259 6.22228C11.7654 5.56448 12 4.79113 12 4C12 2.93913 11.5786 1.92172 10.8284 1.17157C10.0783 0.421427 9.06087 0 8 0V0ZM8 7.11C7.3849 7.11 6.78362 6.9276 6.27218 6.58587C5.76074 6.24414 5.36212 5.75842 5.12674 5.19015C4.89135 4.62187 4.82976 3.99655 4.94976 3.39327C5.06976 2.78999 5.36596 2.23584 5.8009 1.8009C6.23584 1.36596 6.78999 1.06976 7.39327 0.949758C7.99655 0.829758 8.62187 0.891346 9.19015 1.12673C9.75843 1.36212 10.2441 1.76074 10.5859 2.27218C10.9276 2.78361 11.11 3.3849 11.11 4C11.11 4.82482 10.7823 5.61586 10.1991 6.1991C9.61587 6.78234 8.82483 7.11 8 7.11Z" fill="white"/>
+<path d="M9.78011 4.89H7.11011V2.22H8.00011V4H9.78011V4.89Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.93 10.8L0 5.6V10.8L7.93 16V10.8Z" fill="white"/>
+<path opacity="0.5" d="M16 5.6L9 10.8V16L16 10.8V5.6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/QuestionAnswer.svg b/Content/Slate/Starship/Common/QuestionAnswer.svg
new file mode 100644
index 0000000..82e802a
--- /dev/null
+++ b/Content/Slate/Starship/Common/QuestionAnswer.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0C3.58 0 0 2.69 0 6C0 8.42 1.90997 10.5 4.65997 11.45L2.53998 16L7.60999 12H8C12.42 12 16 9.31 16 6C16 2.69 12.42 0 8 0ZM8.84003 10.71C8.61383 10.8978 8.329 11.0007 8.03497 11.0007C7.74094 11.0007 7.45618 10.8978 7.22998 10.71C7.12349 10.621 7.03853 10.5092 6.98138 10.3828C6.92424 10.2564 6.89643 10.1187 6.90002 9.97998C6.89637 9.83983 6.9241 9.70067 6.9812 9.57263C7.0383 9.44459 7.12327 9.33092 7.22998 9.23999C7.45933 9.05912 7.74289 8.96082 8.03497 8.96082C8.32706 8.96082 8.61068 9.05912 8.84003 9.23999C8.94673 9.33092 9.03171 9.44459 9.08881 9.57263C9.14591 9.70067 9.17364 9.83983 9.16998 9.97998C9.17358 10.1187 9.14577 10.2564 9.08862 10.3828C9.03148 10.5092 8.94651 10.621 8.84003 10.71V10.71ZM10.76 5.31006C10.5903 5.62341 10.3707 5.90708 10.11 6.15002L9.41998 6.80005C9.23943 6.95829 9.09895 7.15701 9.01001 7.38C8.92346 7.62402 8.87948 7.88111 8.88 8.14001H7.15002C7.1342 7.66851 7.20186 7.19791 7.34998 6.75C7.48354 6.40076 7.70796 6.09349 8 5.85999C8.25171 5.65608 8.47979 5.4247 8.67999 5.17004C8.82789 4.97406 8.90853 4.73551 8.90997 4.48999C8.90997 3.87999 8.65 3.56995 8.12 3.56995C8.00905 3.56721 7.89895 3.59025 7.79834 3.63708C7.69773 3.68392 7.60931 3.75331 7.53998 3.83997C7.38081 4.04589 7.29621 4.29981 7.29999 4.56006H5.29999C5.28368 4.20895 5.34311 3.85834 5.47424 3.53223C5.60538 3.20611 5.80516 2.91212 6.06 2.67004C6.64961 2.18832 7.40031 1.94876 8.15997 2C8.90793 1.95395 9.64815 2.17353 10.25 2.62C10.5028 2.83961 10.7018 3.11427 10.8318 3.42285C10.9619 3.73143 11.0194 4.06573 11 4.40002C10.9889 4.71746 10.9069 5.02841 10.76 5.31006V5.31006Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/RayTracingDebug.svg b/Content/Slate/Starship/Common/RayTracingDebug.svg
new file mode 100644
index 0000000..a3c26fa
--- /dev/null
+++ b/Content/Slate/Starship/Common/RayTracingDebug.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M0.5 16H12.5C11.5 13.7 9.2 12 6.5 12C3.8 12 1.5 13.7 0.5 16Z" fill="white"/>
+<path d="M7.1 7.4L5 9.5L0 4.5L5 11L8.5 8.9C8.5 8.9 8.1 8.8 7.6 8.3C7.1 7.8 7.1 7.4 7.1 7.4Z" fill="white"/>
+<path d="M12.4524 6.83689C13.8192 5.47007 14.1991 3.63391 13.3009 2.73571C12.4027 1.83751 10.5665 2.21741 9.1997 3.58423C7.83288 4.95105 7.45299 6.78721 8.35118 7.68541C9.24938 8.58361 11.0855 8.20371 12.4524 6.83689Z" fill="white"/>
+<path opacity="0.5" d="M8.6 4.3L6.8 2.5L7.5 1.8L9.3 3.6C9 3.8 8.8 4 8.6 4.3ZM10.5 2.6L9.8 0L9 0.299999L9.7 3.1C9.9 2.9 10.2 2.8 10.5 2.6ZM12.9 6.3L15.7 7L16 6.1L13.4 5.5C13.2 5.8 13.1 6.1 12.9 6.3ZM8.3 4.8L5.3 4L5 4.8L8 5.6C8 5.3 8.2 5 8.3 4.8ZM12.5 6.8C12.3 7 12 7.2 11.8 7.4L13.6 9.2L14.3 8.5L12.5 6.8ZM10.4 8L11.2 11L12.1 10.7L11.3 7.7C11 7.8 10.7 7.9 10.4 8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Realtime.svg b/Content/Slate/Starship/Common/Realtime.svg
new file mode 100644
index 0000000..c57326d
--- /dev/null
+++ b/Content/Slate/Starship/Common/Realtime.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.5 16C3.9 16 1 13.1 1 9.5C1 5.9 3.9 3 7.5 3C11.1 3 14 5.9 14 9.5C14 13.1 11.1 16 7.5 16ZM7.5 4C4.5 4 2 6.5 2 9.5C2 12.5 4.5 15 7.5 15C10.5 15 13 12.5 13 9.5C13 6.5 10.5 4 7.5 4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.3 12.2L7 9.9V6H8V9.5L10 11.5L9.3 12.2Z" fill="white"/>
+<path d="M11.9909 2.46372L14.5365 5.00928L15.8093 3.7365L13.2637 1.19094L11.9909 2.46372Z" fill="white"/>
+<path opacity="0.5" d="M11.0551 4.50288L12.54 5.98779L14.5199 4.00791L13.035 2.523L11.0551 4.50288Z" fill="white"/>
+<path opacity="0.5" d="M9 1.5H6V3.5H9V1.5Z" fill="white"/>
+<path d="M10 0H5V2H10V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Recent.svg b/Content/Slate/Starship/Common/Recent.svg
new file mode 100644
index 0000000..5fe1958
--- /dev/null
+++ b/Content/Slate/Starship/Common/Recent.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.5 0C3.4 0 0 3.4 0 7.5C0 11.6 3.4 15 7.5 15C11.6 15 15 11.6 15 7.5C15 3.4 11.6 0 7.5 0ZM7.5 13.6C4.1 13.6 1.4 10.9 1.4 7.5C1.4 4.1 4.1 1.4 7.5 1.4C10.9 1.4 13.6 4.1 13.6 7.5C13.6 10.9 10.9 13.6 7.5 13.6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.10002 2.69995H6.90002V7.99995L10 11L10.9 10.1L8.10002 7.49995V2.69995Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/RecoveryHub.svg b/Content/Slate/Starship/Common/RecoveryHub.svg
new file mode 100644
index 0000000..59f5ab4
--- /dev/null
+++ b/Content/Slate/Starship/Common/RecoveryHub.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.19995 4.99995L3.89995 6.19995C4.09995 5.69995 4.39995 5.19995 4.79995 4.79995C5.19995 4.39995 5.69995 4.09995 6.19995 3.89995L4.99995 1.19995C4.09995 1.49995 3.39995 1.99995 2.69995 2.69995C1.99995 3.39995 1.49995 4.09995 1.19995 4.99995Z" fill="white"/>
+<path d="M14.7999 11L12.0999 9.80005C11.8999 10.3 11.5999 10.8 11.1999 11.2C10.7999 11.6 10.2999 11.9 9.79993 12.1L10.9999 14.8C11.7999 14.4 12.5999 13.9 13.2999 13.3C13.9999 12.6 14.4999 11.9 14.7999 11Z" fill="white"/>
+<path d="M2.69995 13.3C3.39995 14 4.09995 14.5 4.99995 14.8L6.19995 12.1C5.69995 11.9 5.19995 11.6 4.79995 11.2C4.39995 10.8 4.09995 10.3 3.89995 9.80005L1.19995 11C1.49995 11.9 1.99995 12.6 2.69995 13.3Z" fill="white"/>
+<path d="M13.2999 2.69995C12.5999 1.99995 11.8999 1.49995 10.9999 1.19995L9.79993 3.89995C10.2999 4.09995 10.7999 4.39995 11.1999 4.79995C11.5999 5.19995 11.8999 5.69995 12.0999 6.19995L14.7999 4.99995C14.4999 4.09995 13.9999 3.39995 13.2999 2.69995Z" fill="white"/>
+<path opacity="0.5" d="M11 14.9L9.8 12.2C9.2 12.4 8.6 12.6 8 12.6C7.4 12.6 6.7 12.5 6.2 12.2L5 14.9C5.9 15.3 7 15.5 8 15.5C9 15.5 10.1 15.3 11 14.9Z" fill="white"/>
+<path opacity="0.5" d="M5 1.1L6.2 3.8C6.7 3.6 7.3 3.5 8 3.5C8.7 3.5 9.3 3.6 9.8 3.9L11 1.1C10.1 0.7 9 0.5 8 0.5C7 0.5 5.9 0.7 5 1.1Z" fill="white"/>
+<path opacity="0.5" d="M12.5 8C12.5 8.7 12.4 9.3 12.1 9.8L14.8 11C15.2 10.1 15.4 9 15.4 8C15.4 7 15.2 5.9 14.8 5L12.1 6.2C12.4 6.7 12.5 7.3 12.5 8Z" fill="white"/>
+<path opacity="0.5" d="M3.5 8C3.5 7.3 3.6 6.7 3.9 6.2L1.1 5C0.7 5.9 0.5 7 0.5 8C0.5 9 0.7 10.1 1.1 11L3.8 9.8C3.6 9.3 3.5 8.7 3.5 8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Reflections.svg b/Content/Slate/Starship/Common/Reflections.svg
new file mode 100644
index 0000000..3111e77
--- /dev/null
+++ b/Content/Slate/Starship/Common/Reflections.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2C9.18669 2 10.3467 2.35189 11.3334 3.01118C12.3201 3.67047 13.0892 4.60754 13.5433 5.7039C13.9974 6.80026 14.1162 8.00666 13.8847 9.17054C13.6532 10.3344 13.0818 11.4035 12.2426 12.2426C11.4035 13.0818 10.3344 13.6532 9.17054 13.8847C8.00666 14.1162 6.80026 13.9974 5.7039 13.5433C4.60755 13.0892 3.67047 12.3201 3.01119 11.3334C2.3519 10.3467 2 9.18669 2 8C2 6.4087 2.63214 4.88258 3.75736 3.75736C4.88258 2.63214 6.4087 2 8 2ZM8 1C6.61553 1 5.26216 1.41054 4.11101 2.17971C2.95987 2.94888 2.06266 4.04213 1.53285 5.32122C1.00303 6.6003 0.86441 8.00776 1.13451 9.36563C1.4046 10.7235 2.07129 11.9708 3.05026 12.9497C4.02922 13.9287 5.2765 14.5954 6.63437 14.8655C7.99224 15.1356 9.3997 14.997 10.6788 14.4672C11.9579 13.9373 13.0511 13.0401 13.8203 11.889C14.5895 10.7378 15 9.38447 15 8C15 6.14348 14.2625 4.36301 12.9497 3.05025C11.637 1.7375 9.85652 1 8 1Z" fill="white"/>
+<path opacity="0.5" d="M9.55991 10.17C8.81597 10.1616 8.09132 9.93217 7.47815 9.51079C6.86499 9.0894 6.39103 8.49515 6.11657 7.80363C5.84211 7.11211 5.77954 6.35458 5.93684 5.6274C6.09414 4.90022 6.46419 4.23627 6.99991 3.72C6.30089 3.93605 5.66967 4.32931 5.16763 4.86154C4.66559 5.39377 4.30982 6.04686 4.13491 6.7573C3.96 7.46773 3.9719 8.21134 4.16946 8.91581C4.36702 9.62029 4.74352 10.2616 5.26234 10.7775C5.78115 11.2934 6.42464 11.6663 7.13022 11.8598C7.8358 12.0534 8.57947 12.0611 9.2889 11.8822C9.99833 11.7032 10.6494 11.3438 11.1788 10.8387C11.7081 10.3337 12.0978 9.70024 12.3099 9C11.9562 9.37311 11.5296 9.66951 11.0565 9.87078C10.5834 10.0721 10.074 10.1739 9.55991 10.17Z" fill="white"/>
+<path d="M10.0001 7.94C11.0715 7.94 11.9401 7.07143 11.9401 6C11.9401 4.92857 11.0715 4.06 10.0001 4.06C8.92863 4.06 8.06006 4.92857 8.06006 6C8.06006 7.07143 8.92863 7.94 10.0001 7.94Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/RefreshSourceCodeEditor.svg b/Content/Slate/Starship/Common/RefreshSourceCodeEditor.svg
new file mode 100644
index 0000000..de714c9
--- /dev/null
+++ b/Content/Slate/Starship/Common/RefreshSourceCodeEditor.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 0V15H7L6 14H1V4H15V6.25L16 7V0H0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.73999 8.1602C3.81824 8.06648 3.87606 7.95744 3.90991 7.84013C3.96204 7.68567 3.98582 7.52306 3.97998 7.36015V6.36015C3.97182 6.20443 4.02184 6.05129 4.12012 5.93022C4.18927 5.86946 4.27032 5.82374 4.35815 5.79619C4.44599 5.76863 4.53842 5.75981 4.62988 5.77019H4.83008L4.8999 5.62016C4.93971 5.55007 4.96046 5.47078 4.95996 5.39018C4.96543 5.33366 4.95535 5.27665 4.93066 5.22551C4.90598 5.17437 4.86773 5.13102 4.82007 5.10014C4.71876 5.04558 4.60503 5.01807 4.48999 5.02019H4.32007C4.0102 5.00587 3.70318 5.08606 3.43994 5.25017C3.32936 5.32363 3.23697 5.42115 3.16943 5.53544C3.10189 5.64974 3.06106 5.7779 3.05005 5.9102C3.03972 6.0233 3.03972 6.13707 3.05005 6.25017V7.25017C3.05571 7.39023 3.03179 7.52995 2.97998 7.6602C2.93061 7.7589 2.86276 7.84718 2.78003 7.92021C2.68793 7.98856 2.58214 8.03632 2.46997 8.06022C2.34046 8.07613 2.20959 8.07613 2.08008 8.06022H2V8.84013H2.05005C2.17957 8.82433 2.31042 8.82433 2.43994 8.84013C2.55051 8.86875 2.65542 8.91612 2.75 8.98015C2.83503 9.05099 2.90329 9.13979 2.94995 9.24016C3.00176 9.37041 3.02568 9.51013 3.02002 9.65019V10.7201C3.02154 10.8858 3.04515 11.0506 3.09009 11.2101C3.13492 11.3506 3.21393 11.4777 3.32007 11.5801C3.43508 11.6873 3.57127 11.7691 3.71997 11.8201C3.91514 11.8752 4.11728 11.9022 4.32007 11.9002H4.95996V11.1502H4.62988C4.53522 11.1635 4.43892 11.1561 4.34741 11.1285C4.2559 11.1008 4.17158 11.0536 4.1001 10.9902C4.01632 10.8665 3.97416 10.7193 3.97998 10.5701V9.57011C3.98582 9.4072 3.96204 9.24459 3.90991 9.09013C3.87606 8.97283 3.81824 8.8639 3.73999 8.77018C3.66696 8.68745 3.57868 8.61948 3.47998 8.57011L3.16992 8.44011L3.47998 8.30021C3.57528 8.27175 3.66377 8.22409 3.73999 8.1602V8.1602Z" fill="white"/>
+<path d="M11.0001 16L7.62012 13.5L11.0001 11V16Z" fill="white"/>
+<path d="M12 11V6L15.38 8.5L12 11Z" fill="white"/>
+<path d="M12.5 9L10.81 8.84998C10.2876 8.77278 9.75446 8.81378 9.24998 8.96997C8.75105 9.18608 8.32272 9.53769 8.01341 9.98486C7.7041 10.432 7.52619 10.9569 7.49998 11.5C7.484 10.9246 7.60041 10.3533 7.84007 9.82996C8.08887 9.27665 8.51931 8.82511 9.06004 8.55005C9.60824 8.29364 10.2049 8.15724 10.81 8.15002L12.5 8V9Z" fill="white"/>
+<path d="M10.5 13L12.1899 13.15C12.7124 13.2272 13.2455 13.1862 13.75 13.03C14.2489 12.8139 14.6773 12.4623 14.9866 12.0151C15.2959 11.568 15.4738 11.0431 15.5 10.5C15.516 11.0754 15.3996 11.6467 15.1599 12.17C14.9111 12.7234 14.4807 13.1749 13.9399 13.45C13.3917 13.7064 12.7951 13.8428 12.1899 13.85L10.5 14V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/RefreshVisualStudio.svg b/Content/Slate/Starship/Common/RefreshVisualStudio.svg
new file mode 100644
index 0000000..21cd0c3
--- /dev/null
+++ b/Content/Slate/Starship/Common/RefreshVisualStudio.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.26001 0L3.8999 4.40002L1.12012 2.22998L0 2.75V8.28003L1.13989 8.82996L3.87988 6.68994L6.17993 8.96997C6.59996 8.33239 7.1792 7.81537 7.86011 7.46997L5.41992 5.53003L8.26001 3.28003V7.28003C8.81665 7.07396 9.40649 6.97222 10 6.97998H11V1.08997L8.26001 0ZM1.12012 7.25V3.92004L2.77002 5.55005L1.12012 7.25Z" fill="white"/>
+<path d="M11.0001 16L7.62012 13.5L11.0001 11V16Z" fill="white"/>
+<path d="M12 11V6L15.38 8.5L12 11Z" fill="white"/>
+<path d="M12.5 9L10.81 8.84998C10.2876 8.77278 9.75446 8.81378 9.24998 8.96997C8.75105 9.18608 8.32272 9.53769 8.01341 9.98486C7.7041 10.432 7.52619 10.9569 7.49998 11.5C7.484 10.9246 7.60041 10.3533 7.84007 9.82996C8.08887 9.27665 8.51931 8.82511 9.06004 8.55005C9.60824 8.29364 10.2049 8.15724 10.81 8.15002L12.5 8V9Z" fill="white"/>
+<path d="M10.5 13L12.1899 13.15C12.7124 13.2272 13.2455 13.1862 13.75 13.03C14.2489 12.8139 14.6773 12.4623 14.9866 12.0151C15.2959 11.568 15.4738 11.0431 15.5 10.5C15.516 11.0754 15.3996 11.6467 15.1599 12.17C14.9111 12.7234 14.4807 13.1749 13.9399 13.45C13.3917 13.7064 12.7951 13.8428 12.1899 13.85L10.5 14V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ReplaceActors.svg b/Content/Slate/Starship/Common/ReplaceActors.svg
new file mode 100644
index 0000000..11a0a1b
--- /dev/null
+++ b/Content/Slate/Starship/Common/ReplaceActors.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 0L0 2.7V10.2L7 14.65V0Z" fill="white"/>
+<path opacity="0.5" d="M8 11V14.25L7 14.65V0L13 2.5V5H11L10 6L11.5 7.5L8 11Z" fill="white"/>
+<path d="M13.6298 7.67L10.5098 10.79L11.2098 11.49L14.3298 8.37L15.7498 9.79L15.9998 6L12.2098 6.25L13.6298 7.67Z" fill="white"/>
+<path d="M11.37 14.33L14.49 11.21L13.79 10.51L10.67 13.63L9.25 12.21L9 16L12.79 15.75L11.37 14.33Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Reset.svg b/Content/Slate/Starship/Common/Reset.svg
new file mode 100644
index 0000000..f7e3c84
--- /dev/null
+++ b/Content/Slate/Starship/Common/Reset.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1.17004L1 7.00004L8 12.83V8.00001H12.83C13.4226 7.99812 14.0097 8.11381 14.5573 8.3404C15.1048 8.56698 15.602 8.89994 16.02 9.32001C16.8603 10.1651 17.3319 11.3083 17.3319 12.5C17.3319 13.6917 16.8603 14.835 16.02 15.68C15.602 16.1001 15.1048 16.433 14.5573 16.6596C14.0097 16.8862 13.4226 17.0019 12.83 17H11C10.7348 17 10.4804 17.1054 10.2929 17.2929C10.1054 17.4804 10 17.7348 10 18C10 18.2652 10.1054 18.5196 10.2929 18.7071C10.4804 18.8947 10.7348 19 11 19H12.83C13.6841 19.0016 14.53 18.8345 15.3194 18.5085C16.1088 18.1824 16.826 17.7038 17.43 17.1C18.6464 15.8781 19.3293 14.2242 19.3293 12.5C19.3293 10.7759 18.6464 9.1219 17.43 7.90001C16.826 7.29622 16.1088 6.81758 15.3194 6.49154C14.53 6.1655 13.6841 5.99847 12.83 6.00001H8V1.17004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ResetCamera.svg b/Content/Slate/Starship/Common/ResetCamera.svg
new file mode 100644
index 0000000..21b968b
--- /dev/null
+++ b/Content/Slate/Starship/Common/ResetCamera.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 15H1C0.4 15 0 14.6 0 14V10C0 9.4 0.4 9 1 9H5C5.6 9 6 9.4 6 10V14C6 14.6 5.6 15 5 15Z" fill="white"/>
+<path d="M7 11.6V12.4L10 14.5V9.5L7 11.6Z" fill="white"/>
+<path opacity="0.5" d="M12 10.8H11.5C11.1 10.8 10.7 10.5 10.7 10C10.7 9.50002 11 9.20002 11.5 9.20002H12C13.2 9.20002 14.2 8.20002 14.2 7.00002C14.2 5.80002 13.2 4.80002 12 4.80002H5.79995L7.49995 6.50002C7.79995 6.80002 7.79995 7.30002 7.49995 7.60002C7.19995 7.90002 6.69995 7.90002 6.39995 7.60002L3.39995 4.60002C3.39995 4.50002 3.29995 4.40002 3.29995 4.30002C3.29995 4.20002 3.19995 4.10002 3.19995 4.00002C3.19995 3.90002 3.19995 3.80002 3.29995 3.70002C3.29995 3.60002 3.39995 3.50002 3.49995 3.50002L6.49995 0.500024C6.79995 0.200024 7.29995 0.200024 7.59995 0.500024C7.89995 0.800024 7.89995 1.30002 7.59995 1.60002L5.79995 3.20002H12C14.1 3.20002 15.8 4.90002 15.8 7.00002C15.8 9.10002 14.1 10.8 12 10.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ResetToDefault.svg b/Content/Slate/Starship/Common/ResetToDefault.svg
new file mode 100644
index 0000000..a874b32
--- /dev/null
+++ b/Content/Slate/Starship/Common/ResetToDefault.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="12" viewBox="0 0 12 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.26308 8.44735C6.98694 8.44735 6.76308 8.67121 6.76308 8.94735C6.76308 9.22349 6.98694 9.44735 7.26308 9.44735V8.44735ZM4.66927 3.40617C4.86453 3.2109 4.86453 2.89432 4.66927 2.69906C4.474 2.5038 4.15742 2.5038 3.96216 2.69906L4.66927 3.40617ZM2.21045 5.15788L1.8569 4.80432C1.66163 4.99958 1.66163 5.31617 1.8569 5.51143L2.21045 5.15788ZM3.96216 7.61669C4.15742 7.81195 4.474 7.81195 4.66927 7.61669C4.86453 7.42143 4.86453 7.10485 4.66927 6.90958L3.96216 7.61669ZM7.89466 8.44735H7.26308V9.44735H7.89466V8.44735ZM3.96216 2.69906L1.8569 4.80432L2.564 5.51143L4.66927 3.40617L3.96216 2.69906ZM1.8569 5.51143L3.96216 7.61669L4.66927 6.90958L2.564 4.80432L1.8569 5.51143ZM2.21045 5.65788H7.89466V4.65788H2.21045V5.65788ZM9.2894 7.05261C9.2894 7.8229 8.66495 8.44735 7.89466 8.44735V9.44735C9.21723 9.44735 10.2894 8.37519 10.2894 7.05261H9.2894ZM10.2894 7.05261C10.2894 5.73004 9.21724 4.65788 7.89466 4.65788V5.65788C8.66495 5.65788 9.2894 6.28232 9.2894 7.05261H10.2894Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SaveAll.svg b/Content/Slate/Starship/Common/SaveAll.svg
new file mode 100644
index 0000000..861132d
--- /dev/null
+++ b/Content/Slate/Starship/Common/SaveAll.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M13 1V5H6V1H4V12H6V8H13V12H15V3L13 1Z" fill="white"/>
+<path d="M13 8H6V12H13V8Z" fill="white"/>
+<path d="M6 1V5H13V1H6ZM12 4H11V2H12V4Z" fill="white"/>
+<path opacity="0.5" d="M3 13V3H1V15H13V13H3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SaveChanged.svg b/Content/Slate/Starship/Common/SaveChanged.svg
new file mode 100644
index 0000000..4e68ae8
--- /dev/null
+++ b/Content/Slate/Starship/Common/SaveChanged.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M18 10.76V18H16V11.41C16.6974 11.303 17.3729 11.0835 18 10.76V10.76ZM15 9.67L14.36 11H15.6L15 9.67ZM12.53 11C11.3824 10.5315 10.3933 9.74367 9.68 8.73L10.84 7.24V7.18L8.97 7.42C8.92 7.29 8.87 7.14 8.82 7H4V1H2V18H4V11H12.53Z" fill="white"/>
+<path d="M16 11.41V18H4V11H12.53C13.0517 11.2176 13.5997 11.3655 14.16 11.44L14.36 11H15.6L15.79 11.44L16 11.41ZM8.5 5.00005C8.49969 4.10448 8.68705 3.21878 9.05 2.40005L10.81 2.62005L9.74 1.23005L9.89 1.05005H4V7.05005H8.82C8.60576 6.3879 8.49775 5.69599 8.5 5.00005V5.00005Z" fill="white"/>
+<path d="M18.42 1.03007L15.75 4.55007V4.61007L20 4.04007V5.96007L15.75 5.45007V5.51007L18.45 8.89007L16.68 9.90007L14.99 5.96007H14.93L13.1 9.93007L11.49 8.91007L14.17 5.48007V5.42007L10 5.96007V4.04007L14.14 4.58007V4.52007L11.49 1.08007L13.21 0.100068L14.96 4.01007H15.01L16.73 0.0700684L18.42 1.03007Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SaveChoose.svg b/Content/Slate/Starship/Common/SaveChoose.svg
new file mode 100644
index 0000000..a5cc097
--- /dev/null
+++ b/Content/Slate/Starship/Common/SaveChoose.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 8H2V13H6V8Z" fill="white"/>
+<path d="M6 5V2L7 1L10 3.57V0H2V5H6Z" fill="white"/>
+<path opacity="0.5" d="M13 6.14V2L11 0H10V3.57L13 6.14Z" fill="white"/>
+<path opacity="0.5" d="M2 8H6V5H2V0H0V13H2V8Z" fill="white"/>
+<path d="M15.65 10.4L7 3L7.11 14.38L9.63 10.9L12.09 16L13.91 15.13L11.47 10.06L15.65 10.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SaveCurrent.svg b/Content/Slate/Starship/Common/SaveCurrent.svg
new file mode 100644
index 0000000..497197d
--- /dev/null
+++ b/Content/Slate/Starship/Common/SaveCurrent.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 1V7H3V1H1V15H3V10H13V15H15V4L12 1Z" fill="white"/>
+<path d="M13 10H3V15H13V10Z" fill="white"/>
+<path d="M3 1V7H12V1H3ZM11 6H9V2H11V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SaveCurrentAs.svg b/Content/Slate/Starship/Common/SaveCurrentAs.svg
new file mode 100644
index 0000000..9169df7
--- /dev/null
+++ b/Content/Slate/Starship/Common/SaveCurrentAs.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11 9V12H13V3L11 1H10V6H2V1H0V14H2V9H11Z" fill="white"/>
+<path d="M10 12H11V9H2V14H3L4 12H10Z" fill="white"/>
+<path d="M2 1V6H10V1H2ZM9 5H8V2H9V5Z" fill="white"/>
+<path d="M6.5 16C7.32843 16 8 15.3284 8 14.5C8 13.6716 7.32843 13 6.5 13C5.67157 13 5 13.6716 5 14.5C5 15.3284 5.67157 16 6.5 16Z" fill="white"/>
+<path d="M10.5 16C11.3284 16 12 15.3284 12 14.5C12 13.6716 11.3284 13 10.5 13C9.67157 13 9 13.6716 9 14.5C9 15.3284 9.67157 16 10.5 16Z" fill="white"/>
+<path d="M14.5 16C15.3284 16 16 15.3284 16 14.5C16 13.6716 15.3284 13 14.5 13C13.6716 13 13 13.6716 13 14.5C13 15.3284 13.6716 16 14.5 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SaveThumbnail.svg b/Content/Slate/Starship/Common/SaveThumbnail.svg
new file mode 100644
index 0000000..453117f
--- /dev/null
+++ b/Content/Slate/Starship/Common/SaveThumbnail.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 0V16H15V0H1ZM14 12H2V1H14V12Z" fill="white"/>
+<path opacity="0.5" d="M8.19995 12H14L11.1 7L8.19995 12Z" fill="white"/>
+<path opacity="0.5" d="M2 12H6.2L8 9.10001L5.8 5.5L2 12Z" fill="white"/>
+<path opacity="0.5" d="M9.9999 5.60004C10.8836 5.60004 11.5999 4.88369 11.5999 4.00003C11.5999 3.11637 10.8836 2.40002 9.9999 2.40002C9.11625 2.40002 8.3999 3.11637 8.3999 4.00003C8.3999 4.88369 9.11625 5.60004 9.9999 5.60004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ScratchPad.svg b/Content/Slate/Starship/Common/ScratchPad.svg
new file mode 100644
index 0000000..c4de6b9
--- /dev/null
+++ b/Content/Slate/Starship/Common/ScratchPad.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.9 9.90009L9.2 8.20009L14.3 3.1001L16 4.80009L10.9 9.90009ZM10 10.7001L8.3 9.00009L7 12.0001L10 10.7001Z" fill="white"/>
+<path opacity="0.5" d="M6 13V9L10 5H5V16H16V7L10 13H6Z" fill="white"/>
+<path d="M0 0.600011V12C0 12 5 10 5 16C5 13 5 8 5 5C5 -1.3 0 0.600011 0 0.600011Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Screen.svg b/Content/Slate/Starship/Common/Screen.svg
new file mode 100644
index 0000000..e4bf498
--- /dev/null
+++ b/Content/Slate/Starship/Common/Screen.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="Screen.svg"
+   inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="26.3125"
+     inkscape:cx="1.2175888"
+     inkscape:cy="5.9658239"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     opacity="0.5"
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M2.5 15.9999C6.2 13.9999 8 14.4999 8 14.4999C8 14.4999 9.8 13.9999 13.5 15.9999C9.8 15.9999 6.2 15.9999 2.5 15.9999Z"
+     fill="white"
+     id="path2" />
+  <path
+     d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z"
+     fill="white"
+     id="path4" />
+</svg>
diff --git a/Content/Slate/Starship/Common/ScreenPercentage.svg b/Content/Slate/Starship/Common/ScreenPercentage.svg
new file mode 100644
index 0000000..409c04e
--- /dev/null
+++ b/Content/Slate/Starship/Common/ScreenPercentage.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 15.9999C6.2 13.9999 8 14.4999 8 14.4999C8 14.4999 9.8 13.9999 13.5 15.9999C9.8 15.9999 6.2 15.9999 2.5 15.9999Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+<path d="M3.80005 3.8C3.80005 3.3 4.00005 2.8 4.30005 2.5C4.60005 2.2 5.10005 2 5.70005 2C6.30005 2 6.70005 2.2 7.10005 2.5C7.50005 2.8 7.60005 3.3 7.60005 3.8V4.2C7.60005 4.7 7.40005 5.2 7.10005 5.5C6.80005 5.8 6.30005 6 5.70005 6C5.10005 6 4.70005 5.8 4.30005 5.5C3.90005 5.2 3.80005 4.7 3.80005 4.2V3.8ZM5.10005 4.3C5.10005 4.5 5.20005 4.7 5.30005 4.8C5.40005 4.9 5.60005 5 5.80005 5C6.20005 5 6.40005 4.7 6.40005 4.2V3.89999C6.40005 3.69999 6.30005 3.49999 6.20005 3.39999C6.10005 3.29999 5.90005 3.2 5.70005 3.2C5.50005 3.2 5.40005 3.29999 5.20005 3.39999C5.00005 3.49999 5.00005 3.69999 5.00005 3.89999V4.3H5.10005ZM6.10005 10.1L5.20005 9.60001L9.40005 2.89999L10.3 3.39999L6.10005 10.1ZM7.90005 8.60001C7.90005 8.10001 8.10005 7.6 8.40005 7.3C8.70005 7 9.20005 6.8 9.80005 6.8C10.4 6.8 10.8 7 11.2 7.3C11.6 7.6 11.7 8.10001 11.7 8.60001V9C11.7 9.5 11.5 10 11.2 10.3C10.9 10.6 10.4 10.8 9.80005 10.8C9.20005 10.8 8.80005 10.6 8.40005 10.3C8.00005 10 7.90005 9.5 7.90005 9V8.60001ZM9.10005 9.10001C9.10005 9.30001 9.20005 9.40001 9.30005 9.60001C9.40005 9.70001 9.60005 9.8 9.80005 9.8C10.2 9.8 10.4 9.6 10.4 9.3V8.7C10.4 8.5 10.3 8.3 10.2 8.2C10.1 8.1 9.90005 8 9.70005 8C9.50005 8 9.40005 8.1 9.20005 8.2C9.00005 8.3 9.00005 8.5 9.00005 8.7V9.10001H9.10005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Search.svg b/Content/Slate/Starship/Common/Search.svg
new file mode 100644
index 0000000..610b666
--- /dev/null
+++ b/Content/Slate/Starship/Common/Search.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.59981 14.9999L1.8998 19.6999C1.8998 19.6999 1.4998 19.6999 0.899796 19.0999C0.299796 18.4999 0.299805 18.0999 0.299805 18.0999L4.9998 13.3999L6.59981 14.9999Z" fill="white"/>
+<path d="M11 16.5C15.1421 16.5 18.5 13.1421 18.5 9C18.5 4.85786 15.1421 1.5 11 1.5C6.85786 1.5 3.5 4.85786 3.5 9C3.5 13.1421 6.85786 16.5 11 16.5Z" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M11 14.5C14.0376 14.5 16.5 12.0376 16.5 9C16.5 5.96243 14.0376 3.5 11 3.5C7.96243 3.5 5.5 5.96243 5.5 9C5.5 12.0376 7.96243 14.5 11 14.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SelectInViewport.svg b/Content/Slate/Starship/Common/SelectInViewport.svg
new file mode 100644
index 0000000..139021a
--- /dev/null
+++ b/Content/Slate/Starship/Common/SelectInViewport.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 8.72999L5 2.73999L5.09 11.95L7.13 9.12999L9.12 13.26L10.59 12.55L8.62 8.45999L12 8.72999Z" fill="white"/>
+<path d="M2 2.40002C2 2.29394 2.04217 2.1922 2.11719 2.11719C2.1922 2.04217 2.29394 2 2.40002 2H6V0H2.40002C1.76432 0.00263237 1.15533 0.256293 0.705811 0.705811C0.256293 1.15533 0.00263237 1.76432 0 2.40002V6H2V2.40002Z" fill="white"/>
+<path d="M2.40002 14C2.29394 14 2.1922 13.9578 2.11719 13.8828C2.04217 13.8078 2 13.7061 2 13.6V10H0V13.6C0.00263237 14.2357 0.256293 14.8447 0.705811 15.2942C1.15533 15.7437 1.76432 15.9974 2.40002 16H6V14H2.40002Z" fill="white"/>
+<path d="M14 13.6C14 13.7061 13.9578 13.8078 13.8828 13.8828C13.8078 13.9578 13.7061 14 13.6 14H10V16H13.6C14.2357 15.9974 14.8447 15.7437 15.2942 15.2942C15.7437 14.8447 15.9974 14.2357 16 13.6V10H14V13.6Z" fill="white"/>
+<path d="M13.6 0H10V2H13.6C13.7061 2 13.8078 2.04217 13.8828 2.11719C13.9578 2.1922 14 2.29394 14 2.40002V6H16V2.40002C15.9974 1.76432 15.7437 1.15533 15.2942 0.705811C14.8447 0.256293 14.2357 0.00263237 13.6 0V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SessionFrontend.svg b/Content/Slate/Starship/Common/SessionFrontend.svg
new file mode 100644
index 0000000..3623ec5
--- /dev/null
+++ b/Content/Slate/Starship/Common/SessionFrontend.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 11H6V15H8V11Z" fill="white"/>
+<path opacity="0.5" d="M16 12H10V14H16V12Z" fill="white"/>
+<path d="M6 12H0V14H6V12Z" fill="white"/>
+<path opacity="0.5" d="M14.9 6.00012C14.9 7.90012 14.1 9.60015 12.9 10.9001L12.2 10.2001C13.3 9.10013 13.9 7.70012 13.9 6.00012C13.9 4.30012 13.2 2.90011 12.2 1.80011L12.9 1.1001C14.1 2.4001 14.9 4.10012 14.9 6.00012ZM3.79998 1.80011L3.09998 1.1001C1.89998 2.3001 1.09998 4.10012 1.09998 6.00012C1.09998 7.90012 1.89998 9.60015 3.09998 10.9001L3.79998 10.2001C2.69998 9.10013 2.09998 7.70012 2.09998 6.00012C2.09998 4.30012 2.79998 2.90011 3.79998 1.80011ZM4.99998 9.00012L5.69998 8.30011C5.09998 7.70011 4.69998 6.90012 4.69998 6.00012C4.69998 5.10012 5.09998 4.30013 5.69998 3.70013L4.99998 3.00012C4.19998 3.80012 3.79998 4.80012 3.79998 6.00012C3.79998 7.20012 4.19998 8.20012 4.99998 9.00012ZM11 3.00012L10.3 3.70013C10.9 4.30013 11.3 5.10012 11.3 6.00012C11.3 6.90012 10.9 7.70011 10.3 8.30011L11 9.00012C11.8 8.20012 12.2 7.20012 12.2 6.00012C12.2 4.80012 11.8 3.80012 11 3.00012Z" fill="white"/>
+<path d="M7.99995 7.79993C8.99406 7.79993 9.79995 6.99405 9.79995 5.99994C9.79995 5.00583 8.99406 4.19995 7.99995 4.19995C7.00584 4.19995 6.19995 5.00583 6.19995 5.99994C6.19995 6.99405 7.00584 7.79993 7.99995 7.79993Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetDrawUVs.svg b/Content/Slate/Starship/Common/SetDrawUVs.svg
new file mode 100644
index 0000000..7af6f80
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetDrawUVs.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 0H9H8H5H4H1H0V13H1H4H5H8H9H12H13V0H12ZM8 1V4H5V1H8ZM8 5V8H5V5H8ZM1 1H4V4H1V1ZM1 5H4V8H1V5ZM1 12V9H4V12H1ZM5 12V9H8V12H5ZM12 12H9V9H12V12ZM12 8H9V5H12V8ZM12 4H9V1H12V4Z" fill="white"/>
+<path d="M14 13.1C11 13.1 8 16.5 8 16.5C8 16.5 11 19.9 14 19.9C17 19.9 20 16.5 20 16.5C20 16.5 17 13.1 14 13.1ZM14 19.4C12.4 19.4 11.1 18.1 11.1 16.5C11.1 14.9 12.4 13.6 14 13.6C15.6 13.6 16.9 14.9 16.9 16.5C16.9 18.1 15.6 19.4 14 19.4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.4001 14.5C12.9001 14.5 13.2001 14.9 13.2001 15.3C13.2001 15.8 12.8001 16.1 12.4001 16.1C11.9001 16.1 11.6001 15.7 11.6001 15.3C11.6001 14.8 12.0001 14.5 12.4001 14.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowBinormals.svg b/Content/Slate/Starship/Common/SetShowBinormals.svg
new file mode 100644
index 0000000..2683a6d
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowBinormals.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 6H6V8H12V6Z" fill="white"/>
+<path opacity="0.5" d="M6 0H4V6H6V0Z" fill="white"/>
+<path d="M0 12H4.2L2.8 10.6L5.4 7.99998L4 6.59998L1.4 9.19998L0 7.79998V12Z" fill="white"/>
+<path opacity="0.5" d="M4.4 14.2L7.5 10.1H16V10.2L4.4 14.2ZM3.1 15.9L3 16H16V11.3L3.1 15.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowBounds.svg b/Content/Slate/Starship/Common/SetShowBounds.svg
new file mode 100644
index 0000000..e6cc5bc
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowBounds.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.99995 3.40005C8.69995 3.40005 8.49995 3.30005 8.19995 3.30005C5.69995 3.30005 3.69995 5.30005 3.69995 7.80005C3.69995 10.3 5.69995 12.3 8.19995 12.3C8.49995 12.3 8.69995 12.3 8.99995 12.2V3.40005Z" fill="white"/>
+<path d="M10 3.80005V12C11.6 11.3 12.7 9.70005 12.7 7.90005C12.7 6.10005 11.6 4.50005 10 3.80005Z" fill="white"/>
+<path opacity="0.5" d="M9.5 0L0 3V13L9.5 16L16 12V4L9.5 0ZM1 3.7L9 1.2V14.8L1 12.3V3.7ZM15 11.4L10 14.5V1.5L15 4.6V11.4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowNormals.svg b/Content/Slate/Starship/Common/SetShowNormals.svg
new file mode 100644
index 0000000..cf322fd
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowNormals.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4.04927 6.54497L0.0187988 10.5754L1.433 11.9896L5.46347 7.95917L4.04927 6.54497Z" fill="white"/>
+<path d="M5 0L7.5 3H6V6H4V3H2.5L5 0Z" fill="white"/>
+<path opacity="0.5" d="M12 6H6V8H12V6Z" fill="white"/>
+<path opacity="0.5" d="M4.4 14.2L7.5 10.1H16V10.2L4.4 14.2ZM3.1 15.9L3 16H16V11.3L3.1 15.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowPivot.svg b/Content/Slate/Starship/Common/SetShowPivot.svg
new file mode 100644
index 0000000..864aa75
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowPivot.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 0H7V5H9V0Z" fill="white"/>
+<path d="M3.93879 11.404L0.756836 14.5859L2.17104 16.0001L5.35299 12.8182L3.93879 11.404Z" fill="white"/>
+<path d="M11.9972 11.3967L10.583 12.8109L13.765 15.9929L15.1792 14.5787L11.9972 11.3967Z" fill="white"/>
+<path opacity="0.5" d="M8.0001 10.9C9.04944 10.9 9.9001 10.0493 9.9001 8.99998C9.9001 7.95063 9.04944 7.09998 8.0001 7.09998C6.95076 7.09998 6.1001 7.95063 6.1001 8.99998C6.1001 10.0493 6.95076 10.9 8.0001 10.9Z" fill="white"/>
+<path opacity="0.5" d="M7.9999 14.1C5.1999 14.1 2.8999 11.8 2.8999 9.00002C2.8999 6.20002 5.1999 3.90002 7.9999 3.90002C10.7999 3.90002 13.0999 6.20002 13.0999 9.00002C13.0999 11.8 10.7999 14.1 7.9999 14.1ZM7.9999 5.10002C5.8999 5.10002 4.0999 6.90002 4.0999 9.00002C4.0999 11.1 5.7999 12.9 7.9999 12.9C10.1999 12.9 11.8999 11.2 11.8999 9.00002C11.8999 6.80002 10.0999 5.10002 7.9999 5.10002Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowSockets.svg b/Content/Slate/Starship/Common/SetShowSockets.svg
new file mode 100644
index 0000000..148c829
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowSockets.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.09998 9.70007L0 11.9001L0.800049 12.9001L3.90002 10.5001L3.09998 9.70007Z" fill="white"/>
+<path d="M12.7999 2.40002L10.8999 3.80002L11.7999 4.40002L13.6998 2.90002L12.7999 2.40002Z" fill="white"/>
+<path d="M3.19995 2.40002L2.30005 2.90002L4.19995 4.40002L5.09998 3.80002L3.19995 2.40002Z" fill="white"/>
+<path d="M12.9001 9.70007L12.1001 10.5001L15.2001 12.9001L16.0001 11.9001L12.9001 9.70007Z" fill="white"/>
+<g opacity="0.5">
+<path opacity="0.5" d="M12.8 7.00007C12.8 9.70007 10.6 12.3001 8 12.3001C5.4 12.3001 3.19995 9.70007 3.19995 7.00007C3.19995 6.80007 3.69995 7.60007 4.19995 8.10007C4.99995 8.90007 6.4 9.50007 8 9.50007C9.5 9.50007 10.9 8.90007 11.8 8.10007C12.3 7.60007 12.8 6.80007 12.8 7.00007Z" fill="white"/>
+</g>
+<path d="M8 4.60005C10.2 4.60005 11.8 5.60005 11.8 6.50005C11.8 7.40005 10.2 8.40005 8 8.40005C5.8 8.40005 4.19995 7.40005 4.19995 6.50005C4.19995 5.60005 5.8 4.60005 8 4.60005ZM8 3.80005C5.3 3.80005 3.19995 5.10005 3.19995 6.70005C3.19995 8.30005 5.4 9.60005 8 9.60005C10.6 9.60005 12.8 8.30005 12.8 6.70005C12.8 5.10005 10.6 3.80005 8 3.80005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowTangents.svg b/Content/Slate/Starship/Common/SetShowTangents.svg
new file mode 100644
index 0000000..1e402f0
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowTangents.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6 0H4V6H6V0Z" fill="white"/>
+<path d="M13 7L10 9.5V8H6V6H10V4.5L13 7Z" fill="white"/>
+<path opacity="0.5" d="M4.04902 6.54522L0.0185547 10.5757L1.43275 11.9899L5.46322 7.95942L4.04902 6.54522Z" fill="white"/>
+<path opacity="0.5" d="M4.4 14.2L7.5 10.1H16V10.2L4.4 14.2ZM3.1 15.9L3 16H16V11.3L3.1 15.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowVertexColors.svg b/Content/Slate/Starship/Common/SetShowVertexColors.svg
new file mode 100644
index 0000000..2155f0d
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowVertexColors.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 11V12H1V11H2ZM3 10H0V13H3V10Z" fill="white"/>
+<path d="M4 1V2H3V1H4ZM5 0H2V3H5V0Z" fill="white"/>
+<path d="M15 1V2H14V1H15ZM16 0H13V3H16V0Z" fill="white"/>
+<path d="M12.5 7C11.2 9.6 9.30005 11 9.30005 12.8C9.30005 14.6 10.7 16 12.5 16C14.3 16 15.7 14.6 15.7 12.8C15.7 11 13.8 9.6 12.5 7Z" fill="white"/>
+<path opacity="0.5" d="M12.7 5L14.9 4L15 9C14.3 7.8 13.4 6.5 12.7 5ZM12 5.3L0.1 10.8L0 11H8.6C9.4 9.4 10.8 7.6 12 5.3ZM14.8 2H5L1.5 8.3L14.9 2.1L14.8 2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SetShowVertices.svg b/Content/Slate/Starship/Common/SetShowVertices.svg
new file mode 100644
index 0000000..9ccf46f
--- /dev/null
+++ b/Content/Slate/Starship/Common/SetShowVertices.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 12V13H1V12H2ZM3 11H0V14H3V11Z" fill="white"/>
+<path d="M5 2V3H4V2H5ZM6 1H3V4H6V1Z" fill="white"/>
+<path d="M15 2V3H14V2H15ZM16 1H13V4H16V1Z" fill="white"/>
+<path d="M15 12V13H14V12H15ZM16 11H13V14H16V11Z" fill="white"/>
+<path opacity="0.5" d="M1.5 9.3L5 3H14.9V3.1L1.5 9.3ZM0.1 11.8L0 12H15L14.9 4.9L0.1 11.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SkeletalMesh.svg b/Content/Slate/Starship/Common/SkeletalMesh.svg
new file mode 100644
index 0000000..35bc5de
--- /dev/null
+++ b/Content/Slate/Starship/Common/SkeletalMesh.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.50001 0C5.30001 0 4.00001 0.8 4.00001 3C4.00001 3.3 3.90001 5.7 4.00001 6H5.20001C5.60001 6 6.00001 6.39999 6.00001 6.79999V7.70001C6.50001 7.90001 7.00001 8 7.50001 8C8.00001 8 8.50001 7.90001 9.00001 7.70001V6.79999C9.00001 6.39999 9.40001 6 9.80001 6H11C11.1 5.7 11 3.3 11 3C11 0.8 9.70001 0 7.50001 0ZM5.90001 5H5.00001V3H7.00001V3.89999C7.00001 4.49999 6.50001 5 5.90001 5ZM10 5H9.10001C8.50001 5 8.00001 4.49999 8.00001 3.89999V3H10V5ZM8.00001 6H7.00001L7.50001 5L8.00001 6Z" fill="white"/>
+<path d="M7 11H4V12H7V11Z" fill="white"/>
+<path d="M7 13H4V14H7V13Z" fill="white"/>
+<path d="M7 15H4V16H7V15Z" fill="white"/>
+<path d="M11 15H8V16H11V15Z" fill="white"/>
+<path d="M11 13H8V14H11V13Z" fill="white"/>
+<path d="M11 11H8V12H11V11Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 9L2 16H1L2 9H3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 9L13 16H14L13 9H12Z" fill="white"/>
+<path d="M8 10H7V16H8V10Z" fill="white"/>
+<path d="M12 9H3V10H12V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Snap.svg b/Content/Slate/Starship/Common/Snap.svg
new file mode 100644
index 0000000..e550d5e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Snap.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 2H12V5H14V2Z" fill="white"/>
+<path d="M10.6 11.2H9.1C6.3 11.2 4.5 10 4.5 8C4.5 6 6.1 4.8 9 4.8H10.6V2H9.1C4.9 2 2 4.2 2 8C2 11.8 4.9 14 9.1 14H10.5V11.2H10.6Z" fill="white"/>
+<path d="M14 11H12V14H14V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/SourceCodeEditor.svg b/Content/Slate/Starship/Common/SourceCodeEditor.svg
new file mode 100644
index 0000000..f8cc743
--- /dev/null
+++ b/Content/Slate/Starship/Common/SourceCodeEditor.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 0V15H16V0H0ZM15 14H1V1H15V14Z" fill="white"/>
+<path opacity="0.5" d="M15 1H1V4H15V1Z" fill="white"/>
+<path d="M4.49005 5.00011C4.6051 4.998 4.71876 5.02551 4.82007 5.08007C4.86773 5.11095 4.90598 5.15442 4.93066 5.20556C4.95535 5.2567 4.96555 5.31358 4.96008 5.37011C4.96058 5.45071 4.93989 5.53 4.90009 5.60009L4.83008 5.75011H4.63007C4.5386 5.73974 4.44599 5.74856 4.35815 5.77611C4.27032 5.80367 4.18921 5.84939 4.12006 5.91015C4.02178 6.03122 3.97188 6.18436 3.98004 6.34008V7.34008C3.98588 7.50299 3.96216 7.6656 3.91003 7.82006C3.87618 7.93736 3.8183 8.04641 3.74005 8.14013C3.66968 8.22565 3.58076 8.294 3.48004 8.34008L3.17004 8.48009L3.48004 8.6101C3.57874 8.65947 3.66702 8.72744 3.74005 8.81017C3.8183 8.90389 3.87618 9.01281 3.91003 9.13012C3.96216 9.28458 3.98588 9.44718 3.98004 9.6101V10.6102C3.97422 10.7594 4.01626 10.9065 4.10004 11.0301C4.17152 11.0936 4.25596 11.1407 4.34747 11.1683C4.43898 11.196 4.53541 11.2034 4.63007 11.1901H5.00006V11.9401H4.36005C4.15726 11.9421 3.95524 11.9153 3.76007 11.8602C3.61137 11.8092 3.47506 11.7274 3.36005 11.6202C3.25391 11.5179 3.1749 11.3906 3.13007 11.2501C3.08512 11.0906 3.06158 10.9258 3.06006 10.7601V9.69005C3.06572 9.54999 3.04186 9.41039 2.99005 9.28014C2.94068 9.18145 2.87277 9.09316 2.79004 9.02013C2.69546 8.95611 2.59061 8.90874 2.48004 8.88012C2.35052 8.86431 2.21961 8.86431 2.09009 8.88012V8.88012V8.10009C2.2196 8.11599 2.35053 8.11599 2.48004 8.10009C2.59222 8.07618 2.69794 8.02842 2.79004 7.96007C2.87277 7.88704 2.94068 7.79876 2.99005 7.70006C3.04186 7.56981 3.06572 7.43021 3.06006 7.29015V6.29015C3.04973 6.17705 3.04973 6.06316 3.06006 5.95006C3.07107 5.81776 3.1119 5.68973 3.17944 5.57543C3.24698 5.46113 3.33949 5.36362 3.45007 5.29015C3.71331 5.12605 4.02021 5.04586 4.33008 5.06017L4.49005 5.00011Z" fill="white"/>
+<path d="M7.24987 9.51016C7.2513 9.70739 7.17597 9.89747 7.03985 10.0402C6.96978 10.1085 6.88687 10.1621 6.79589 10.1982C6.70492 10.2342 6.60772 10.2519 6.50988 10.2502C6.30922 10.2542 6.11505 10.1788 5.96984 10.0402C5.89927 9.9713 5.84341 9.88873 5.8056 9.79764C5.76779 9.70655 5.74884 9.60879 5.74987 9.51016C5.74669 9.40828 5.76457 9.30684 5.80243 9.21219C5.84028 9.11755 5.89727 9.0317 5.96984 8.96012C6.11505 8.82156 6.30922 8.7461 6.50988 8.75016C6.60772 8.74838 6.70492 8.76599 6.79589 8.80203C6.88687 8.83808 6.96978 8.89181 7.03985 8.96012C7.17994 9.10839 7.25549 9.30625 7.24987 9.51016V9.51016Z" fill="white"/>
+<path d="M10.2499 9.51016C10.2513 9.70739 10.176 9.89747 10.0399 10.0402C9.96978 10.1085 9.88687 10.1621 9.79589 10.1982C9.70492 10.2342 9.60772 10.2519 9.50988 10.2502C9.30922 10.2542 9.11505 10.1788 8.96984 10.0402C8.89927 9.9713 8.84341 9.88873 8.8056 9.79764C8.76779 9.70655 8.74884 9.60879 8.74987 9.51016C8.74669 9.40828 8.76457 9.30684 8.80243 9.21219C8.84028 9.11755 8.89727 9.0317 8.96984 8.96012C9.11505 8.82156 9.30922 8.7461 9.50988 8.75016C9.60772 8.74838 9.70492 8.76599 9.79589 8.80203C9.88687 8.83808 9.96978 8.89181 10.0399 8.96012C10.1799 9.10839 10.2555 9.30625 10.2499 9.51016V9.51016Z" fill="white"/>
+<path d="M13.2499 9.51016C13.2513 9.70739 13.176 9.89747 13.0399 10.0402C12.9698 10.1085 12.8869 10.1621 12.7959 10.1982C12.7049 10.2342 12.6077 10.2519 12.5099 10.2502C12.3092 10.2542 12.1151 10.1788 11.9698 10.0402C11.8993 9.9713 11.8434 9.88873 11.8056 9.79764C11.7678 9.70655 11.7488 9.60879 11.7499 9.51016C11.7467 9.40828 11.7646 9.30684 11.8024 9.21219C11.8403 9.11755 11.8973 9.0317 11.9698 8.96012C12.1151 8.82156 12.3092 8.7461 12.5099 8.75016C12.6077 8.74838 12.7049 8.76599 12.7959 8.80203C12.8869 8.83808 12.9698 8.89181 13.0399 8.96012C13.1799 9.10839 13.2555 9.30625 13.2499 9.51016V9.51016Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Spreadsheet.svg b/Content/Slate/Starship/Common/Spreadsheet.svg
new file mode 100644
index 0000000..e6ea87d
--- /dev/null
+++ b/Content/Slate/Starship/Common/Spreadsheet.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 5H13V14H2V1H9V5ZM1 0V15H14V4L10 0H1Z" fill="white"/>
+<path opacity="0.5" d="M3 4H7V6H3V4ZM3 12H7V10H3V12ZM3 9H7V7H3V9ZM8 12H12V10H8V12ZM8 9H12V7H8V9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Sprite.svg b/Content/Slate/Starship/Common/Sprite.svg
new file mode 100644
index 0000000..909f791
--- /dev/null
+++ b/Content/Slate/Starship/Common/Sprite.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M14 1V14H1V1H14ZM15 0H0V15H15V0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.1 8.59998L13 7.5L10.1 6.40002L11.4 3.59998L8.6 4.90002L7.5 2L6.4 4.90002L3.6 3.59998L4.9 6.40002L2 7.5L4.9 8.59998L3.6 11.4L6.4 10.1L7.5 13L8.6 10.1L11.4 11.4L10.1 8.59998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/StaticMesh.svg b/Content/Slate/Starship/Common/StaticMesh.svg
new file mode 100644
index 0000000..c7d6e29
--- /dev/null
+++ b/Content/Slate/Starship/Common/StaticMesh.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 12L6 16V11L0 7V12Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16 5.19995L7 11V16L16 9.49995V5.19995Z" fill="white"/>
+<path d="M9.6 0.800049L0.5 5.70005L6.5 9.70005L15.6 3.80005L9.6 0.800049ZM9.6 1.90005L13.6 3.90005L10.3 6.00005L6.6 3.50005L9.6 1.90005ZM2.4 5.80005L5.6 4.00005L9.4 6.50005L6.5 8.50005L2.4 5.80005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Statistics.svg b/Content/Slate/Starship/Common/Statistics.svg
new file mode 100644
index 0000000..17c7e5b
--- /dev/null
+++ b/Content/Slate/Starship/Common/Statistics.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 10H0V16H4V10Z" fill="white" fill-opacity="0.5"/>
+<path d="M10 0H6V16H10V0Z" fill="white"/>
+<path d="M16 6H12V16H16V6Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Struct.svg b/Content/Slate/Starship/Common/Struct.svg
new file mode 100644
index 0000000..9f021e8
--- /dev/null
+++ b/Content/Slate/Starship/Common/Struct.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 7H11V10H16V7Z" fill="white"/>
+<path d="M16 12H11V15H16V12Z" fill="white"/>
+<path d="M9 2H1V10H9V2Z" fill="white"/>
+<path opacity="0.5" d="M13 8H14V4H2V7H3V5H13V8Z" fill="white"/>
+<path opacity="0.5" d="M5 4V3H3V14H11V13H4V4H5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/StylusInputBug.svg b/Content/Slate/Starship/Common/StylusInputBug.svg
new file mode 100644
index 0000000..5d8fdb3
--- /dev/null
+++ b/Content/Slate/Starship/Common/StylusInputBug.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9.19998 6.20001L6.99998 5.70001C6.89998 5.80001 6.79998 5.99998 6.69998 6.09998L8.09998 7.5L7.49998 8L5.99998 6.5C5.89998 6.6 5.69998 6.70001 5.59998 6.70001L6.19998 9.09998L5.49998 9.40002L4.89998 7C4.29998 7.2 3.59998 7.10001 3.29998 6.70001C2.99998 6.30001 2.79998 5.69998 2.99998 5.09998L0.599976 4.5L0.899976 3.79999L3.29998 4.40002C3.39998 4.30002 3.49998 4.1 3.49998 4L1.99998 2.5L2.49998 2L3.89998 3.40002C3.99998 3.30002 4.19998 3.19998 4.29998 3.09998L3.69998 0.799988L4.39998 0.5L4.89998 2.59998C5.79998 2.19998 6.69998 2.20001 7.19998 2.70001C7.69998 3.20001 7.69998 4.1 7.29998 5L9.39997 5.5L9.19998 6.20001Z" fill="white"/>
+<path d="M9 13.2L6.8 10.9999L13.6 4.19995L15.8 6.39996L9 13.2ZM7.8 14.2999L5.7 12.2L4.5 15.4999L7.8 14.2999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Support.svg b/Content/Slate/Starship/Common/Support.svg
new file mode 100644
index 0000000..9ce5075
--- /dev/null
+++ b/Content/Slate/Starship/Common/Support.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M0.000110524 16V15.08C-0.0271775 14.5475 0.0576024 14.0152 0.248967 13.5176C0.440332 13.0199 0.734021 12.568 1.11104 12.1909C1.48806 11.8139 1.94001 11.5202 2.43768 11.3289C2.93534 11.1375 3.46762 11.0527 4.00011 11.08C4.5326 11.0527 5.06488 11.1375 5.56255 11.3289C6.06021 11.5202 6.51216 11.8139 6.88918 12.1909C7.2662 12.568 7.55989 13.0199 7.75125 13.5176C7.94262 14.0152 8.0274 14.5475 8.00011 15.08V16H0.000110524ZM4.00011 6.46001C3.57248 6.45803 3.15389 6.58303 2.79737 6.81917C2.44084 7.05531 2.16243 7.39196 1.99742 7.78647C1.8324 8.18098 1.78819 8.61559 1.8704 9.03525C1.95261 9.4549 2.15754 9.84071 2.45922 10.1438C2.7609 10.4469 3.14575 10.6536 3.56502 10.7378C3.98429 10.8219 4.41911 10.7797 4.81438 10.6165C5.20965 10.4533 5.54759 10.1765 5.78538 9.82108C6.02317 9.46566 6.15011 9.04765 6.15011 8.62001C6.15012 8.04888 5.92392 7.50098 5.521 7.09619C5.11808 6.6914 4.57124 6.46266 4.00011 6.46001Z" fill="white"/>
+<path opacity="0.5" d="M11 0C8.24 0 6 1.51 6 3.38C6 4.74 7.2 5.91 8.92 6.44L7 10C7 10 10.92 6.75 11 6.75C13.76 6.75 16 5.24 16 3.38C16 1.52 13.76 0 11 0Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/SystemOverview.svg b/Content/Slate/Starship/Common/SystemOverview.svg
new file mode 100644
index 0000000..4ef1352
--- /dev/null
+++ b/Content/Slate/Starship/Common/SystemOverview.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2.5 15.9999C6.2 13.9999 8 14.4999 8 14.4999C8 14.4999 9.8 13.9999 13.5 15.9999C9.8 15.9999 6.2 15.9999 2.5 15.9999Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+<path d="M6 8H4V11H6V8Z" fill="white" fill-opacity="0.5"/>
+<path d="M9 2H7V11H9V2Z" fill="white"/>
+<path d="M12 5H10V11H12V5Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Tasks.svg b/Content/Slate/Starship/Common/Tasks.svg
new file mode 100644
index 0000000..e10815d
--- /dev/null
+++ b/Content/Slate/Starship/Common/Tasks.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M19 3H10V5H19V3Z" fill="white"/>
+<path opacity="0.5" d="M19 9H10V11H19V9Z" fill="white"/>
+<path opacity="0.5" d="M19 15H10V17H19V15Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.21 1.32007L3.09 4.45007L1.79 3.15007L0.5 4.45007L3.09 7.03007L7.5 2.62007L6.21 1.32007Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.31995 7.18018L3.03995 10.4602L1.67995 9.10018L0.319946 10.4602L3.03995 13.1802L7.67995 8.54018L6.31995 7.18018Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.31995 13.1802L3.03995 16.4602L1.67995 15.1002L0.319946 16.4602L3.03995 19.1802L7.67995 14.5402L6.31995 13.1802Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Test.svg b/Content/Slate/Starship/Common/Test.svg
new file mode 100644
index 0000000..e0fd2be
--- /dev/null
+++ b/Content/Slate/Starship/Common/Test.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.06 1C10.06 1.12 10.06 1.25 10.06 1.35C10.06 1.45 10.06 1.79 10.06 2V6.27L10.2 6.51L15 14.68C14.9594 14.774 14.8925 14.8542 14.8074 14.911C14.7222 14.9678 14.6224 14.9987 14.52 15H1.52C1.41091 15.0068 1.30238 14.9797 1.20929 14.9224C1.1162 14.8651 1.0431 14.7804 1 14.68L5.86 6.51L6 6.27V2C6 1.79 6 1.57 6 1.35C6 1.13 6 1.12 6 1H10.12H10.06ZM10.54 0H5.54C4.68 0 5 1.16 5 2V6L0 14.48C0 14.8831 0.160142 15.2697 0.445198 15.5548C0.730253 15.8399 1.11687 16 1.52 16H14.52C14.9162 15.9896 15.2926 15.8248 15.569 15.5409C15.8455 15.257 16.0001 14.8763 16 14.48L11 6V2C11 1.16 11.32 0 10.48 0H10.54Z" fill="white"/>
+<path opacity="0.5" d="M5.41005 10L3.05005 14H12.95L10.59 10H5.41005Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/TestAutomation.svg b/Content/Slate/Starship/Common/TestAutomation.svg
new file mode 100644
index 0000000..2f2f90c
--- /dev/null
+++ b/Content/Slate/Starship/Common/TestAutomation.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M10 10H5.41005L3.05005 14H12.95L11.69 11.87L10 13V10Z" fill="white"/>
+<path d="M12.85 11.1L15 14.68C14.9594 14.774 14.8925 14.8542 14.8074 14.911C14.7222 14.9678 14.6224 14.9987 14.52 15H1.52C1.41091 15.0068 1.30238 14.9797 1.20929 14.9224C1.1162 14.8651 1.0431 14.7804 1 14.68L5.86 6.51L6 6.27V2C6 1.79 6 1.57 6 1.35C6 1.13 6 1.12 6 1H10.12C10.12 1.12 10.12 1.25 10.12 1.35C10.12 1.45 10.12 1.79 10.12 2V2.4L11.17 1.14C11.17 0.54 11.17 0 10.6 0H5.6C4.68 0 5 1.16 5 2V6L0 14.48C0 14.8831 0.160142 15.2697 0.445198 15.5548C0.730253 15.8399 1.11687 16 1.52 16H14.52C14.9162 15.9896 15.2926 15.8248 15.569 15.5409C15.8455 15.257 16.0001 14.8763 16 14.48L13.68 10.55L12.85 11.1Z" fill="white"/>
+<path d="M14.83 0.0599976L12.11 4.72H16L10.94 10.94L12.94 6.28H9L14.83 0.0599976Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Timecode.svg b/Content/Slate/Starship/Common/Timecode.svg
new file mode 100644
index 0000000..779cec0
--- /dev/null
+++ b/Content/Slate/Starship/Common/Timecode.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 0.5C3.9 0.5 0.5 3.9 0.5 8C0.5 12.1 3.9 15.5 8 15.5C12.1 15.5 15.5 12.1 15.5 8C15.5 3.9 12.1 0.5 8 0.5ZM8 14.1C4.6 14.1 1.9 11.4 1.9 8C1.9 4.6 4.6 1.90002 8 1.90002C11.4 1.90002 14.1 4.6 14.1 8C14.1 11.4 11.4 14.1 8 14.1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.60003 3.19995H7.40002V8.49994L10.5 11.4999L11.4 10.5999L8.60003 7.99994V3.19995Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Timeline.svg b/Content/Slate/Starship/Common/Timeline.svg
new file mode 100644
index 0000000..4f4972c
--- /dev/null
+++ b/Content/Slate/Starship/Common/Timeline.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 14H0V11H1V14ZM4 11H3V14H4V11ZM7 11H6V14H7V11ZM10 11H9V14H10V11ZM13 11H12V14H13V11ZM16 11H15V14H16V11Z" fill="white"/>
+<path d="M16 14H0V15H16V14Z" fill="white"/>
+<path d="M12 4.99995L6 0.199951V3.79995V6.19995V9.79995L12 4.99995Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Toolbar.svg b/Content/Slate/Starship/Common/Toolbar.svg
new file mode 100644
index 0000000..286aaee
--- /dev/null
+++ b/Content/Slate/Starship/Common/Toolbar.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16 8H0V15H16V8Z" fill="white"/>
+<path opacity="0.5" d="M14 5V3L2 3V5L14 5Z" fill="white"/>
+<path d="M15 2V6H1V2H15ZM16 1H0V7H16V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/TouchInterface.svg b/Content/Slate/Starship/Common/TouchInterface.svg
new file mode 100644
index 0000000..d6a23c3
--- /dev/null
+++ b/Content/Slate/Starship/Common/TouchInterface.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 0H3C2.4 0 2 0.4 2 1V15C2 15.6 2.4 16 3 16H13C13.6 16 14 15.6 14 15V1C14 0.4 13.6 0 13 0ZM8 15.5C7.2 15.5 6.5 14.8 6.5 14C6.5 13.2 7.2 12.5 8 12.5C8.8 12.5 9.5 13.2 9.5 14C9.5 14.8 8.8 15.5 8 15.5ZM13 12H3V1H13V12Z" fill="white"/>
+<path opacity="0.5" d="M13 1H3V12H13V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/TraceDataFiltering.svg b/Content/Slate/Starship/Common/TraceDataFiltering.svg
new file mode 100644
index 0000000..8dff91b
--- /dev/null
+++ b/Content/Slate/Starship/Common/TraceDataFiltering.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.5 12.9L1.4 17C1.4 17 1 17 0.5 16.5C0 16 0 15.6 0 15.6L4.1 11.5L5.5 12.9Z" fill="white"/>
+<path d="M9 14.5C12.5899 14.5 15.5 11.5899 15.5 8C15.5 4.41015 12.5899 1.5 9 1.5C5.41015 1.5 2.5 4.41015 2.5 8C2.5 11.5899 5.41015 14.5 9 14.5Z" stroke="white" stroke-width="1.0833" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M5 6H13V7H5V6ZM7 8H11V9H7V8ZM8 10H10V11H8V10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Transparency.svg b/Content/Slate/Starship/Common/Transparency.svg
new file mode 100644
index 0000000..0ef178f
--- /dev/null
+++ b/Content/Slate/Starship/Common/Transparency.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M10 16L1 13V3L10 0V16Z" fill="white"/>
+<path d="M5.5 8C5.5 10.5 7.5 12.5 10 12.5V3.5C7.5 3.5 5.5 5.5 5.5 8Z" fill="white"/>
+<path d="M15 8C15 5.8 13.2 4 11 4V12C13.2 12 15 10.2 15 8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Tutorials.svg b/Content/Slate/Starship/Common/Tutorials.svg
new file mode 100644
index 0000000..5be39b7
--- /dev/null
+++ b/Content/Slate/Starship/Common/Tutorials.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 4.75L8.5 9.51L1 4.75L8.5 0L16 4.75Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.49991 11.41L4.28991 8.73999C4.20457 9.0665 4.16089 9.40251 4.15991 9.73999C4.15991 10.891 4.61716 11.9949 5.43107 12.8088C6.24498 13.6227 7.34887 14.08 8.49991 14.08C9.65095 14.08 10.7548 13.6227 11.5688 12.8088C12.3827 11.9949 12.8399 10.891 12.8399 9.73999C12.8389 9.40251 12.7953 9.0665 12.7099 8.73999L8.49991 11.41Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3 16H0L1 7H2L3 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/USDStage.svg b/Content/Slate/Starship/Common/USDStage.svg
new file mode 100644
index 0000000..e3cf158
--- /dev/null
+++ b/Content/Slate/Starship/Common/USDStage.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 12.08V4.51L6 1.72V3.72L11 5.72V11.29L13 12.08Z" fill="white"/>
+<path d="M16 8.53V2.26L11 0.18V2.18L14 3.51C14 3.51 14 7.77 14 7.78L16 8.53Z" fill="white"/>
+<path d="M2 5.19L8 7.56V14.41L2 12V5.19ZM1 3.72V12.72L10 15.88V6.88L1 3.72Z" fill="white"/>
+<path opacity="0.5" d="M3 7L6.6 8.39V12.63L3 11.2V7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/UnlitCube.svg b/Content/Slate/Starship/Common/UnlitCube.svg
new file mode 100644
index 0000000..c3b3f77
--- /dev/null
+++ b/Content/Slate/Starship/Common/UnlitCube.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 0.5C3.9 0.5 0.5 3.9 0.5 8C0.5 12.1 3.9 15.5 8 15.5C12.1 15.5 15.5 12.1 15.5 8C15.5 3.9 12.1 0.5 8 0.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Unpinned.svg b/Content/Slate/Starship/Common/Unpinned.svg
new file mode 100644
index 0000000..7fa1a3b
--- /dev/null
+++ b/Content/Slate/Starship/Common/Unpinned.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.49995 11.6C7.79995 11.6 8.09995 11.6 8.39995 11.5C8.09995 14 7.49995 16 7.49995 16C7.49995 16 6.89995 14 6.59995 11.5C6.89995 11.6 7.19995 11.6 7.49995 11.6ZM9.69995 6.3L9.09995 3.1C9.69995 2.8 10.1 2.4 10.1 2C10.1 1.2 8.89995 0.5 7.49995 0.5C5.99995 0.5 4.89995 1.2 4.89995 2C4.89995 2.5 5.29995 2.9 5.89995 3.1L5.29995 6.3C4.09995 6.7 3.19995 7.5 3.19995 8.3C3.19995 9.6 5.09995 10.7 7.39995 10.7C9.69995 10.7 11.6 9.6 11.6 8.3C11.7 7.5 10.9 6.8 9.69995 6.3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/UnrealInsights.svg b/Content/Slate/Starship/Common/UnrealInsights.svg
new file mode 100644
index 0000000..07343f5
--- /dev/null
+++ b/Content/Slate/Starship/Common/UnrealInsights.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
+<defs><style>.cls-1{fill:#1a1a1a;}.cls-2,.cls-4{fill:#fff;}.cls-2{fill-rule:evenodd;}.cls-3{fill:none;}</style></defs>
+<path class="cls-1" d="M35.5,5.5A23,23,0,1,1,21.68,46.88L7.26,61.3s-1.23,0-2.9-1.66-1.66-2.9-1.66-2.9L17.12,42.32A23,23,0,0,1,35.5,5.5m0-2.25A25.28,25.28,0,0,0,10.25,28.5,25,25,0,0,0,14.2,42.06L1.1,55.15l-.63.63,0,.89c0,.52.1,2.38,2.32,4.57s4,2.31,4.49,2.31h.93l.66-.65L21.94,49.8a25,25,0,0,0,13.56,4,25.25,25.25,0,0,0,0-50.5Z"/>
+<path class="cls-2" d="M21.44,47.13,7.26,61.3s-1.23,0-2.9-1.66-1.66-2.9-1.66-2.9L16.87,42.56Z"/>
+<rect class="cls-3" width="64" height="64"/>
+<circle fill="black" cx="35.5" cy="28.5" r="22.27"/>
+<path class="cls-4" d="M35.5,7A21.54,21.54,0,1,1,14,28.5,21.56,21.56,0,0,1,35.5,7m0-1.46a23,23,0,1,0,23,23,23,23,0,0,0-23-23Z"/>
+<path class="cls-2" d="M49.84,31.9a14.56,14.56,0,0,1-7.93,9.79L39.48,39,35.4,43.06a14.39,14.39,0,0,1-11.36-6,7.07,7.07,0,0,0,1.32.21A1.17,1.17,0,0,0,26.7,36V25.44a1.75,1.75,0,0,0-2.21-1.74c-1.82.41-3.23,4.92-3.23,4.92A14.49,14.49,0,0,1,33.59,14.26a5.61,5.61,0,0,0-3.1,4.49c0,2.47,1.5,2.18,1.94,1.82V34.84a2.42,2.42,0,0,0,.3.51,2.14,2.14,0,0,0,1.74.87c1.5,0,3.45-1.7,3.45-1.7V23a4,4,0,0,0-1.78-3.08,4.09,4.09,0,0,1,2.93.68,9.73,9.73,0,0,1,.77-.84A14.55,14.55,0,0,1,48,15.58h0s-4.26,3.31-4.26,7.76c0,3.31.09,11.38.09,11.38C45.37,36.24,47.72,34.05,49.84,31.9Z"/>
+</svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/Unreal_DefaultThumbnail.png b/Content/Slate/Starship/Common/Unreal_DefaultThumbnail.png
new file mode 100644
index 0000000..0dd2ed4
Binary files /dev/null and b/Content/Slate/Starship/Common/Unreal_DefaultThumbnail.png differ
diff --git a/Content/Slate/Starship/Common/Update.svg b/Content/Slate/Starship/Common/Update.svg
new file mode 100644
index 0000000..fde511e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Update.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.18998 10C2.1875 9.02328 2.38802 8.05671 2.77879 7.16156C3.16955 6.26641 3.74206 5.46223 4.46 4.8L6.99998 7.34V1H0.619974L3.17997 3.54C2.29257 4.36883 1.58649 5.37252 1.1063 6.4878C0.626111 7.60308 0.382241 8.80576 0.389993 10.02C0.371305 11.2029 0.595998 12.377 1.05015 13.4693C1.5043 14.5617 2.17823 15.549 3.03001 16.37C4.86586 18.0697 7.27817 19.0096 9.78001 19H9.99998V17.19H9.78001C7.75922 17.1932 5.80943 16.4447 4.30998 15.09C3.62567 14.4329 3.08423 13.6418 2.71946 12.766C2.35469 11.8902 2.17444 10.9486 2.18998 10Z" fill="white"/>
+<path d="M18.6 10.0001C18.6177 8.81585 18.3925 7.64057 17.9385 6.54672C17.4844 5.45287 16.8111 4.46364 15.96 3.64006C14.0903 1.91116 11.6263 0.969236 9.08002 1.01006H9V2.81006H9.08002C11.15 2.77629 13.1554 3.53055 14.69 4.92006C15.3703 5.57759 15.9085 6.36764 16.2714 7.24139C16.6343 8.11515 16.8142 9.05404 16.8 10.0001C16.8054 10.9748 16.6072 11.94 16.218 12.8337C15.8288 13.7274 15.2573 14.53 14.54 15.1901L12 12.6501V19.0001H18.37L15.82 16.4601C16.7046 15.6338 17.4082 14.6332 17.8867 13.5213C18.3652 12.4094 18.6081 11.2105 18.6 10.0001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/UpdateAll.svg b/Content/Slate/Starship/Common/UpdateAll.svg
new file mode 100644
index 0000000..858c5bc
--- /dev/null
+++ b/Content/Slate/Starship/Common/UpdateAll.svg
@@ -0,0 +1,12 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8250:14778)">
+<path d="M9.00001 10.61C10.0923 11.6128 11.5172 12.1757 13 12.19V13.55C11.1386 13.549 9.34865 12.833 8.00001 11.55C7.35766 10.9322 6.84876 10.1893 6.50477 9.3672C6.16078 8.54506 5.98899 7.66112 6.00001 6.76998C5.99458 5.85664 6.17729 4.95198 6.53688 4.11238C6.89646 3.27279 7.42516 2.51627 8.08998 1.88998L6.17005 -0.0200195H10.97V4.76999L9.06007 2.85999C8.51864 3.35684 8.08682 3.96124 7.79237 4.63452C7.49792 5.3078 7.34723 6.03513 7.34999 6.76998C7.34259 7.48964 7.48554 8.20292 7.76966 8.86415C8.05379 9.52539 8.47285 10.12 9.00001 10.61ZM20 7.21999C20.0136 6.32701 19.843 5.44081 19.4989 4.61668C19.1548 3.79255 18.6446 3.04816 18 2.42998C16.6264 1.1229 14.796 0.405076 12.9 0.429977H12.83V1.77998H12.9C14.4311 1.75909 15.9122 2.32435 17.04 3.35999C17.5554 3.8543 17.9635 4.44947 18.2388 5.10841C18.5141 5.76735 18.6506 6.47594 18.64 7.18999C18.6409 7.92455 18.4894 8.65132 18.1951 9.32433C17.9007 9.99735 17.47 10.602 16.9301 11.1L15.02 9.17999V14H19.82L17.89 12.09C18.5592 11.4681 19.092 10.7143 19.4552 9.87606C19.8184 9.03786 20.0039 8.13347 20 7.21999Z" fill="white"/>
+<path opacity="0.5" d="M9.28006 18.0001C8.56488 18.3289 7.78715 18.4994 7.00003 18.5001C5.54215 18.4975 4.1448 17.9172 3.11392 16.8863C2.08304 15.8554 1.50267 14.458 1.50003 13.0001C1.50071 12.213 1.67126 11.4353 2.00003 10.7201V8.11011C0.713812 9.41207 -0.00516242 11.17 2.79078e-05 13.0001C2.79078e-05 14.8566 0.737566 16.6371 2.05032 17.9499C3.36308 19.2626 5.14351 20.0001 7.00003 20.0001C8.83017 20.0053 10.5881 19.2863 11.89 18.0001H9.28006Z" fill="white"/>
+<path opacity="0.5" d="M12.2801 15.0001C11.5649 15.3289 10.7872 15.4994 10 15.5001C8.54215 15.4975 7.1448 14.9172 6.11392 13.8863C5.08304 12.8554 4.50267 11.458 4.50003 10.0001C4.50071 9.21298 4.67126 8.43528 5.00003 7.72011V5.11011C3.71381 6.41207 2.99484 8.16996 3.00003 10.0001C3.00003 11.8566 3.73757 13.6371 5.05032 14.9499C6.36308 16.2626 8.14351 17.0001 10 17.0001C11.8302 17.0053 13.5881 16.2863 14.89 15.0001H12.2801Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_8250:14778">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/Versions.svg b/Content/Slate/Starship/Common/Versions.svg
new file mode 100644
index 0000000..6220b38
--- /dev/null
+++ b/Content/Slate/Starship/Common/Versions.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M6 15V5H3V15H6Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2 13V7H0V13H2Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 2V18H20V2H7ZM13.5 15.37C12.4355 15.37 11.395 15.0542 10.51 14.4626C9.62506 13.871 8.93547 13.0302 8.52856 12.0465C8.12166 11.0629 8.01572 9.98063 8.22412 8.93674C8.43252 7.89285 8.94593 6.93423 9.69934 6.18222C10.4527 5.43021 11.4123 4.91862 12.4565 4.71216C13.5008 4.5057 14.5829 4.61367 15.5658 5.0224C16.5487 5.43113 17.3882 6.12225 17.9781 7.0083C18.5681 7.89435 18.882 8.93551 18.88 10C18.88 10.706 18.7408 11.4051 18.4703 12.0573C18.1998 12.7095 17.8034 13.3019 17.3036 13.8007C16.8039 14.2995 16.2108 14.6948 15.5581 14.9641C14.9054 15.2334 14.206 15.3713 13.5 15.37Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 6C12.7089 6 11.9355 6.23461 11.2777 6.67413C10.6199 7.11366 10.1073 7.73836 9.80451 8.46927C9.50176 9.20017 9.42251 10.0044 9.57685 10.7804C9.73119 11.5563 10.1122 12.269 10.6716 12.8284C11.231 13.3878 11.9437 13.7688 12.7197 13.9231C13.4956 14.0775 14.2999 13.9983 15.0308 13.6955C15.7617 13.3928 16.3863 12.8801 16.8259 12.2223C17.2654 11.5645 17.5 10.7911 17.5 10C17.5 8.93913 17.0786 7.92172 16.3284 7.17157C15.5783 6.42142 14.5609 6 13.5 6ZM16 11H13L13 7H14V10H16V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewBack.svg b/Content/Slate/Starship/Common/ViewBack.svg
new file mode 100644
index 0000000..e5259f7
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewBack.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 5H5V0H16V11H11V5Z" fill="white"/>
+<path opacity="0.5" d="M11 11V15H1V5H5V4H0V16H12V11H11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewBottom.svg b/Content/Slate/Starship/Common/ViewBottom.svg
new file mode 100644
index 0000000..9d6d8b9
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewBottom.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M14 2V11H2V2H14ZM15 1H1V12H15V1Z" fill="white"/>
+<path d="M15 11H1V15H15V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewFront.svg b/Content/Slate/Starship/Common/ViewFront.svg
new file mode 100644
index 0000000..6475750
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewFront.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 16L11 16L11 5L0 5L0 16Z" fill="white"/>
+<path opacity="0.5" d="M5 0V5H6V1H15V10H11V11H16V0H5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewLeft.svg b/Content/Slate/Starship/Common/ViewLeft.svg
new file mode 100644
index 0000000..2db5c8a
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewLeft.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M14 2V14H5V2H14ZM15 1H4V15H15V1Z" fill="white"/>
+<path d="M5 1H1V15H5V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewPerspective.svg b/Content/Slate/Starship/Common/ViewPerspective.svg
new file mode 100644
index 0000000..dd45b83
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewPerspective.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path opacity="0.5" d="M7 16L0 11.8V4.39999L7 8.59999V16Z" fill="white"/>
+<path opacity="0.5" d="M8 16L15 11.8V4.39999L8 8.59999V16Z" fill="white"/>
+<path d="M7.5 7.5L0.5 3.3L7.5 0L14.5 3.3L7.5 7.5Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewRight.svg b/Content/Slate/Starship/Common/ViewRight.svg
new file mode 100644
index 0000000..f1b9393
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewRight.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11 2V14H2V2H11ZM12 1H1V15H12V1Z" fill="white"/>
+<path d="M15 1H11V15H15V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewTop.svg b/Content/Slate/Starship/Common/ViewTop.svg
new file mode 100644
index 0000000..d703de5
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewTop.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M14 5V14H2V5H14ZM15 4H1V15H15V4Z" fill="white"/>
+<path d="M15 1H1V5H15V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ViewportControls.svg b/Content/Slate/Starship/Common/ViewportControls.svg
new file mode 100644
index 0000000..5ea9d7d
--- /dev/null
+++ b/Content/Slate/Starship/Common/ViewportControls.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 4V12C0 12.2652 0.105357 12.5196 0.292893 12.7071C0.48043 12.8946 0.734784 13 1 13H15C15.2652 13 15.5196 12.8946 15.7071 12.7071C15.8946 12.5196 16 12.2652 16 12V4C16 3.73478 15.8946 3.48043 15.7071 3.29289C15.5196 3.10536 15.2652 3 15 3H1C0.734784 3 0.48043 3.10536 0.292893 3.29289C0.105357 3.48043 0 3.73478 0 4H0ZM10 4H12V6H10V4ZM14 7V9H11V7H14ZM7 4H9V6H7V4ZM10 7V9H8V7H10ZM4 4H6V6H4V4ZM7 7V9H5V7H7ZM1 4H3V6H1V4ZM4 7V9H2V7H4ZM3 12H1V10H3V12ZM12 12H4V10H12V12ZM15 12H13V10H15V12ZM15 6H13V4H15V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Viewports.svg b/Content/Slate/Starship/Common/Viewports.svg
new file mode 100644
index 0000000..033274e
--- /dev/null
+++ b/Content/Slate/Starship/Common/Viewports.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 8L15 8V3L8 3V8Z" fill="white"/>
+<path opacity="0.5" d="M0 8L7 8L7 3L0 3L0 8Z" fill="white"/>
+<path opacity="0.5" d="M0 14H7L7 9H0L0 14Z" fill="white"/>
+<path opacity="0.5" d="M8 14H15V9H8V14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/VirtualProduction.svg b/Content/Slate/Starship/Common/VirtualProduction.svg
new file mode 100644
index 0000000..8840358
--- /dev/null
+++ b/Content/Slate/Starship/Common/VirtualProduction.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 5V15H1V5H15ZM16 4H0V16H16V4Z" fill="white"/>
+<path opacity="0.5" d="M12 0L16 4H0L4 0H12Z" fill="white"/>
+<path d="M5 13.9999C5 11.9999 6.6 10.6999 8.5 10.6999C10.4 10.6999 12 11.9999 12 13.9999H5ZM8.5 6.3999C7.4 6.3999 6.5 7.2999 6.5 8.3999C6.5 9.4999 7.4 10.3999 8.5 10.3999C9.6 10.3999 10.5 9.4999 10.5 8.3999C10.5 7.2999 9.6 6.3999 8.5 6.3999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Visibility.svg b/Content/Slate/Starship/Common/Visibility.svg
new file mode 100644
index 0000000..83d41a2
--- /dev/null
+++ b/Content/Slate/Starship/Common/Visibility.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 5C4 5 0.25 10.5 0.25 10.5C0.25 10.5 4 16 10 16C16 16 19.75 10.5 19.75 10.5C19.75 10.5 16 5 10 5ZM10 15.25C8.74022 15.25 7.53203 14.7496 6.64124 13.8588C5.75044 12.968 5.25 11.7598 5.25 10.5C5.25 9.24022 5.75044 8.03203 6.64124 7.14124C7.53203 6.25044 8.74022 5.75 10 5.75C11.2598 5.75 12.468 6.25044 13.3588 7.14124C14.2496 8.03203 14.75 9.24022 14.75 10.5C14.75 11.7598 14.2496 12.968 13.3588 13.8588C12.468 14.7496 11.2598 15.25 10 15.25Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.46997 7.19995C7.83332 7.19995 8.1818 7.34439 8.43872 7.60132C8.69565 7.85824 8.83997 8.2066 8.83997 8.56995C8.83997 8.93329 8.69565 9.28177 8.43872 9.5387C8.1818 9.79562 7.83332 9.93994 7.46997 9.93994C7.10662 9.93994 6.75815 9.79562 6.50122 9.5387C6.2443 9.28177 6.09998 8.93329 6.09998 8.56995C6.09998 8.2066 6.2443 7.85824 6.50122 7.60132C6.75815 7.34439 7.10662 7.19995 7.46997 7.19995Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/VisibilityCollision.svg b/Content/Slate/Starship/Common/VisibilityCollision.svg
new file mode 100644
index 0000000..94771d2
--- /dev/null
+++ b/Content/Slate/Starship/Common/VisibilityCollision.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.33 0L0 3.27V12.73L9.33 16L16 11.79V4.31L9.33 0ZM9 14.59L1 12.22V3.88L9 1.45V14.59ZM15 11.59L10 14.33V1.78L15 4.54V11.59Z" fill="white"/>
+<path d="M9 2L1 12" stroke="white" stroke-miterlimit="10"/>
+<path d="M15 4L10 13.43" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/VisualEffects.svg b/Content/Slate/Starship/Common/VisualEffects.svg
new file mode 100644
index 0000000..b9f7552
--- /dev/null
+++ b/Content/Slate/Starship/Common/VisualEffects.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1 16.0001C1.1 15.8001 3.69999 10.4001 6.89999 7.2001C9.29999 4.8001 12.5 3.2001 12.6 3.1001L13.4 4.3001C13.4 4.3001 9.7 6.0001 7.2 8.2001C3.9 11.1001 1 16.0001 1 16.0001Z" fill="white"/>
+<path opacity="0.5" d="M3 16C3 16 4.50001 14.5 7.10001 13.3C9.20001 12.4 11.1 12 11.1 12L11.3 13.1C11 13.2 9.19999 13.5 7.39999 14C4.99999 14.9 3 16 3 16Z" fill="white"/>
+<path opacity="0.5" d="M1.09999 14.8C1.09999 14.7 0.999986 12.7 1.09999 10.9C1.19999 9.29995 1.69998 7.39995 2.29998 5.69995H2.59999L3.29998 5.99995L3.69998 6.29995C2.89998 7.79995 2.09999 8.99995 1.59999 10.7C1.09999 12.5 1.09999 14.8 1.09999 14.8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.0999756 5.79995L2.59998 5.99995L3.89996 8.19995L4.79997 5.89995L7.29997 5.29995L5.39996 3.69995L5.69997 1.19995L3.49997 2.49995L1.19997 1.49995L1.79997 3.89995L0.0999756 5.79995Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.19997 15.3001L11.5 14.3001L13.7 15.6001L13.4 13.1001L15.3 11.4001L12.8 10.9001L11.8 8.6001L10.6 10.8001L8.09998 11.0001L9.79997 12.9001L9.19997 15.3001Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1 6.9L13.5 5.1L15.7 5.2L14.5 3.3L15.2 1.2L13.1 1.9L11.3 0.5V2.7L9.40002 4L11.5 4.7L12.1 6.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/VisualLogger.svg b/Content/Slate/Starship/Common/VisualLogger.svg
new file mode 100644
index 0000000..8122b47
--- /dev/null
+++ b/Content/Slate/Starship/Common/VisualLogger.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9 6.80008L15.7 5.00009C16.1 6.10009 15.9 7.30007 15 8.10007C14.2 8.90007 13 9.20008 11.9 8.80008L6.80005 13.9001C6.80005 14.4001 6.60005 15.0001 6.20005 15.4001C5.40005 16.2001 4.20005 16.2001 3.40005 15.4001C2.60005 14.6001 2.60005 13.4001 3.40005 12.6001C3.80005 12.2001 4.40005 12.0001 4.90005 12.1001L10 7.00009C9.60005 6.00009 9.90005 4.70011 10.7 3.90011C11.6 3.00011 12.8 2.8001 13.9 3.2001L12.1 5.00009C11.6 5.50009 11.6 6.3001 12.1 6.7001C12.7 7.3001 13.5 7.30008 13.9 6.80008ZM5.60005 13.4001C5.20005 13.0001 4.70005 13.0001 4.30005 13.4001C3.90005 13.8001 3.90005 14.3001 4.30005 14.7001C4.70005 15.1001 5.20005 15.1001 5.60005 14.7001C6.00005 14.3001 6.00005 13.8001 5.60005 13.4001Z" fill="white"/>
+<path opacity="0.5" d="M9.19998 6.20001L6.99998 5.70001C6.89998 5.80001 6.79998 5.99998 6.69998 6.09998L8.09998 7.5L7.49998 8L5.99998 6.5C5.89998 6.6 5.69998 6.70001 5.59998 6.70001L6.19998 9.09998L5.49998 9.40002L4.89998 7C4.29998 7.2 3.59998 7.10001 3.29998 6.70001C2.99998 6.30001 2.79998 5.69998 2.99998 5.09998L0.599976 4.5L0.899976 3.79999L3.29998 4.40002C3.39998 4.30002 3.49998 4.1 3.49998 4L1.99998 2.5L2.49998 2L3.89998 3.40002C3.99998 3.30002 4.19998 3.19998 4.29998 3.09998L3.69998 0.799988L4.39998 0.5L4.89998 2.59998C5.79998 2.19998 6.69998 2.20001 7.19998 2.70001C7.69998 3.20001 7.69998 4.1 7.29998 5L9.39997 5.5L9.19998 6.20001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/VisualStudio.svg b/Content/Slate/Starship/Common/VisualStudio.svg
new file mode 100644
index 0000000..bb4d693
--- /dev/null
+++ b/Content/Slate/Starship/Common/VisualStudio.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.27 0.469999L5.32 6.47L1.53 3.47L0 4.23V11.77L1.56 12.51L5.29 9.6L11.29 15.53L15 14V2L11.27 0.469999ZM1.53 10.36V5.82L3.78 8L1.53 10.36ZM11.27 11.1L7.39 8L11.27 5V11.1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Visualize.svg b/Content/Slate/Starship/Common/Visualize.svg
new file mode 100644
index 0000000..6dbe2e6
--- /dev/null
+++ b/Content/Slate/Starship/Common/Visualize.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.00005 2.5C4.00005 2.5 1.30005 6.5 1.30005 6.5C1.30005 6.5 4.00005 10.5 8.00005 10.5C12 10.5 14.7 6.5 14.7 6.5C14.7 6.5 12 2.5 8.00005 2.5ZM8.00005 10.1C6.00005 10.1 4.40005 8.5 4.40005 6.5C4.40005 4.5 6.00005 2.90002 8.00005 2.90002C10 2.90002 11.6 4.5 11.6 6.5C11.6 8.5 10 10.1 8.00005 10.1Z" fill="white"/>
+<path d="M8.9 6.49994C9.39706 6.49994 9.8 6.09697 9.8 5.59991C9.8 5.10286 9.39706 4.69995 8.9 4.69995C8.40294 4.69995 8 5.10286 8 5.59991C8 6.09697 8.40294 6.49994 8.9 6.49994Z" fill="white"/>
+<path d="M15 1V12H1V1H15ZM16 0H0V13H16V0Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2 15.9999C6 13.3999 8 14.0999 8 14.0999C8 14.0999 10 13.4999 14 15.9999C10 15.9999 6 15.9999 2 15.9999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Visualizer.svg b/Content/Slate/Starship/Common/Visualizer.svg
new file mode 100644
index 0000000..021189d
--- /dev/null
+++ b/Content/Slate/Starship/Common/Visualizer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{fill-opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><g id="profile"><rect class="cls-1" x="1.5" y="6.5" width="2" height="5" transform="translate(11.5 6.5) rotate(90)"/><rect class="cls-2" x="4.5" y="-4.5" width="2" height="11" transform="translate(6.5 -4.5) rotate(90)"/><rect class="cls-1" x="2.5" y="1.5" width="2" height="7" transform="translate(8.5 1.5) rotate(90)"/><path class="cls-2" d="M10,9.11c-3,0-6,3.39-6,3.39s3,3.39,6,3.39,6-3.39,6-3.39S13,9.11,10,9.11Zm0,6.26a2.87,2.87,0,1,1,2.87-2.87A2.87,2.87,0,0,1,10,15.37ZM8.43,10.46a.85.85,0,1,1-.85.84A.85.85,0,0,1,8.43,10.46Z"/><rect class="cls-3" width="16" height="16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Common/VisualizerAlternate.svg b/Content/Slate/Starship/Common/VisualizerAlternate.svg
new file mode 100644
index 0000000..391d935
--- /dev/null
+++ b/Content/Slate/Starship/Common/VisualizerAlternate.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4 9H7L7 4H4V9Z" fill="white"/>
+<path d="M8 9H11L11 0H8V9Z" fill="white"/>
+<path d="M12 9H15V2H12V9Z" fill="white"/>
+<path opacity="0.5" d="M0 9H3L3 6H0L0 9Z" fill="white"/>
+<path d="M8.00008 10.5C5.50008 10.5 3.83008 13 3.83008 13C3.83008 13 5.50008 15.5 8.00008 15.5C10.5001 15.5 12.1701 13 12.1701 13C12.1701 13 10.5001 10.5 8.00008 10.5Z" stroke="white" stroke-width="0.97" stroke-miterlimit="10"/>
+<path d="M8.00012 14.39C7.72564 14.388 7.45788 14.3048 7.23062 14.1509C7.00335 13.997 6.82675 13.7792 6.72308 13.525C6.6194 13.2709 6.5933 12.9917 6.64806 12.7228C6.70281 12.4538 6.83598 12.207 7.03077 12.0137C7.22556 11.8203 7.47324 11.6889 7.7426 11.636C8.01196 11.5832 8.29092 11.6113 8.54433 11.7168C8.79774 11.8223 9.01424 12.0005 9.16654 12.2288C9.31883 12.4572 9.40011 12.7255 9.40012 13C9.40012 13.1834 9.36384 13.365 9.29336 13.5343C9.22288 13.7036 9.1196 13.8572 8.98947 13.9864C8.85933 14.1156 8.70492 14.2178 8.53512 14.2871C8.36532 14.3564 8.18349 14.3913 8.00012 14.39Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Volume.svg b/Content/Slate/Starship/Common/Volume.svg
new file mode 100644
index 0000000..323b52c
--- /dev/null
+++ b/Content/Slate/Starship/Common/Volume.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path opacity="0.5" d="M13 12H3.99998V3H2.99998V12.3L0.599976 14.6L1.39998 15.4L3.69998 13H13V12Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Volumes.svg b/Content/Slate/Starship/Common/Volumes.svg
new file mode 100644
index 0000000..b1775a2
--- /dev/null
+++ b/Content/Slate/Starship/Common/Volumes.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M3 0L0 3H13V16L16 13V0H3Z" fill="white"/>
+<path opacity="0.5" d="M13 12H3.99997V3H2.99997V12.3L0.599976 14.6L1.39996 15.4L3.69997 13H13V12Z" fill="white"/>
+<path d="M13 15H1V3H0V16H13V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/WebBrowser.svg b/Content/Slate/Starship/Common/WebBrowser.svg
new file mode 100644
index 0000000..b44e6e9
--- /dev/null
+++ b/Content/Slate/Starship/Common/WebBrowser.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M1 14.64L6.58 9.07L4.51 7L11 6L10 12.49L7.93 10.42L2.36 16L1 14.64Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 11L3 10V3H14V14H7L6 15H15V0H2V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/Widget.svg b/Content/Slate/Starship/Common/Widget.svg
new file mode 100644
index 0000000..8921a08
--- /dev/null
+++ b/Content/Slate/Starship/Common/Widget.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M5 14.0001V13.5001C5 11.6001 6.3 10.5001 8 10.5001C9.6 10.5001 11 11.6001 11 13.5001V14.0001H5ZM8 6.30005C7 6.30005 6.2 7.10004 6.2 8.10004C6.2 9.10004 7 9.90009 8 9.90009C9 9.90009 9.8 9.10004 9.8 8.10004C9.8 7.10004 9 6.30005 8 6.30005Z" fill="white"/>
+<path d="M16 1H5V4H16V1Z" fill="white"/>
+<path d="M3 1H0V14H3V1Z" fill="white"/>
+<path d="M16 6H13V14H16V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/WidgetComponents.svg b/Content/Slate/Starship/Common/WidgetComponents.svg
new file mode 100644
index 0000000..cdea588
--- /dev/null
+++ b/Content/Slate/Starship/Common/WidgetComponents.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 15H11V13V9H12C12.6 9 13 9.4 13 10V11.5C13 12.3 13.7 13 14.5 13H16V15ZM11 6V8H12.5C13.3 8 14 8.7 14 9.5V11C14 11.6 14.4 12 15 12H16V6H11Z" fill="white"/>
+<path opacity="0.5" d="M4 14V13.5C4 11.6 5.3 10.5 7 10.5C8.6 10.5 10 11.6 10 13.5V14H4ZM7 6.30005C6 6.30005 5.2 7.10005 5.2 8.10005C5.2 9.10005 6 9.90005 7 9.90005C8 9.90005 8.8 9.10005 8.8 8.10005C8.8 7.10005 8 6.30005 7 6.30005Z" fill="white"/>
+<path d="M16 1H5V4H16V1Z" fill="white"/>
+<path d="M3 1H0V14H3V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/World.svg b/Content/Slate/Starship/Common/World.svg
new file mode 100644
index 0000000..9c05574
--- /dev/null
+++ b/Content/Slate/Starship/Common/World.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 18.21C7.55 16.66 5.99993 14.01 6.17993 12.88C6.48993 11.07 7.6499 11.15 7.6499 11.15C7.6499 11.15 5.26011 9.81997 4.86011 8.96997C4.46011 8.11997 3.08008 7.57005 2.58008 6.30005C3.26441 4.91864 4.32042 3.7554 5.62939 2.94104C6.93837 2.12668 8.44837 1.69337 9.98999 1.68994C11.394 1.69981 12.7718 2.07188 13.99 2.77002C13.435 3.93135 12.6686 4.97917 11.73 5.85999C10.67 6.77999 12.96 8.16001 12.25 9.01001C11.54 9.86001 11.25 8.71006 10.7 7.81006C10.32 7.15006 9.20995 7.33 8.44995 7.37C5.85995 7.5 6.7999 11.37 8.8999 10.86C10.3099 10.5 11.1799 10.35 12.4299 11.36C13.3199 12.07 13.4299 13.52 12.4299 14.78C11.7299 15.67 11.7201 17.11 11.5601 18.15C11.0365 18.2547 10.5039 18.3084 9.96997 18.3101C9.64492 18.2962 9.32103 18.2627 9 18.21Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M9.99976 1.08984C12.3628 1.08984 14.6291 2.02864 16.3 3.69958C17.971 5.37053 18.9097 7.6368 18.9097 9.99988C18.9097 12.363 17.971 14.6292 16.3 16.3002C14.6291 17.9711 12.3628 18.9099 9.99976 18.9099C7.63668 18.9099 5.37041 17.9711 3.69946 16.3002C2.02851 14.6292 1.08984 12.363 1.08984 9.99988C1.08984 7.6368 2.02851 5.37053 3.69946 3.69958C5.37041 2.02864 7.63668 1.08984 9.99976 1.08984Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/WorldOutliner.svg b/Content/Slate/Starship/Common/WorldOutliner.svg
new file mode 100644
index 0000000..610433c
--- /dev/null
+++ b/Content/Slate/Starship/Common/WorldOutliner.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 12H6V15H15V12Z" fill="white"/>
+<path d="M15 7H6V10H15V7Z" fill="white"/>
+<path d="M15 1H1V4H15V1Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M5 9V8H2V5H1V8V9V13V14H2H5V13H2V9H5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/WorldSettings.svg b/Content/Slate/Starship/Common/WorldSettings.svg
new file mode 100644
index 0000000..7d6ace3
--- /dev/null
+++ b/Content/Slate/Starship/Common/WorldSettings.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.17001 14.92C6.00001 13.61 4.63001 11.38 4.79001 10.42C5.05001 8.9 6.00001 9 6.00001 9C6.00001 9 4.00001 7.85 3.68001 7.13C3.36001 6.41 2.18001 6 1.76001 4.88C2.17072 4.02792 2.75225 3.26938 3.46846 2.6515C4.18468 2.03362 5.02028 1.56961 5.92338 1.28827C6.82648 1.00693 7.77777 0.914279 8.71818 1.01607C9.65859 1.11787 10.568 1.41193 11.39 1.88C10.9151 2.85464 10.2681 3.73545 9.48001 4.48C8.59001 5.25 10.48 6.42 9.92001 7.14C9.36001 7.86 9.05001 6.89 8.61001 6.14C8.29001 5.59 7.36001 5.74 6.72001 5.77C4.54001 5.89 5.33001 9.18 7.10001 8.77C7.5874 8.54366 8.12978 8.46289 8.66197 8.53739C9.19417 8.6119 9.69352 8.83851 10.1 9.19C10.292 9.37642 10.4447 9.59948 10.5489 9.84597C10.6532 10.0925 10.7069 10.3574 10.7069 10.625C10.7069 10.8926 10.6532 11.1575 10.5489 11.404C10.4447 11.6505 10.292 11.8736 10.1 12.06C9.63337 12.9384 9.3831 13.9154 9.37001 14.91C8.91716 14.9827 8.45849 15.0129 8.00001 15C7.72204 14.9892 7.44493 14.9625 7.17001 14.92Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8 0.5C9.48336 0.5 10.9334 0.939867 12.1668 1.76398C13.4001 2.58809 14.3614 3.75943 14.9291 5.12987C15.4968 6.50032 15.6453 8.00832 15.3559 9.46318C15.0665 10.918 14.3522 12.2544 13.3033 13.3033C12.2544 14.3522 10.918 15.0665 9.46318 15.3559C8.00832 15.6453 6.50032 15.4968 5.12987 14.9291C3.75943 14.3614 2.58809 13.4001 1.76398 12.1668C0.939867 10.9334 0.5 9.48336 0.5 8C0.5 6.01088 1.29018 4.10322 2.6967 2.6967C4.10322 1.29018 6.01088 0.5 8 0.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/ZipProject.svg b/Content/Slate/Starship/Common/ZipProject.svg
new file mode 100644
index 0000000..669b73d
--- /dev/null
+++ b/Content/Slate/Starship/Common/ZipProject.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 9.8V15L16 10.5V5.3L10 9.8Z" fill="white"/>
+<path d="M6 9.8V15L0 10.5V5.3L6 9.8Z" fill="white"/>
+<path d="M7 8H9V7H7V8Z" fill="white"/>
+<path d="M7 10H9V9H7V10Z" fill="white"/>
+<path d="M7 12H9V11H7V12Z" fill="white"/>
+<path d="M7 16H9V15H7V16Z" fill="white"/>
+<path d="M7 14H9V13H7V14Z" fill="white"/>
+<path d="M6.3 1L8 5H7L4 1H6.3ZM7 0H2L6.5 6H9.5L7 0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/blueprint.svg b/Content/Slate/Starship/Common/blueprint.svg
new file mode 100644
index 0000000..5a915b6
--- /dev/null
+++ b/Content/Slate/Starship/Common/blueprint.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 5V4H8C7.4 4 7 4.5 7 5V8H4V9H7V12C7 12.6 7.5 13 8 13H12V12H8.60001C8.30001 12 8 11.7 8 11.4V5.6C8 5.3 8.30001 5 8.60001 5H12Z" fill="white"/>
+<path d="M16 3V5C16 5.6 15.6 6 15 6H12C11.4 6 11 5.6 11 5V3C11 2.4 11.4 2 12 2H15C15.6 2 16 2.4 16 3Z" fill="white"/>
+<path d="M16 11V13C16 13.6 15.6 14 15 14H12C11.4 14 11 13.6 11 13V11C11 10.4 11.4 10 12 10H15C15.6 10 16 10.4 16 11Z" fill="white"/>
+<path d="M5 7V9C5 9.6 4.6 10 4 10H1C0.4 10 0 9.6 0 9V7C0 6.4 0.4 6 1 6H4C4.6 6 5 6.4 5 7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/color.svg b/Content/Slate/Starship/Common/color.svg
new file mode 100644
index 0000000..ee70605
--- /dev/null
+++ b/Content/Slate/Starship/Common/color.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4 9.32C4.42763 9.31802 4.84622 9.44302 5.20275 9.67915C5.55927 9.91529 5.83768 10.2519 6.0027 10.6465C6.16772 11.041 6.21192 11.4756 6.12971 11.8952C6.0475 12.3149 5.84257 12.7007 5.54089 13.0038C5.23921 13.3069 4.85436 13.5136 4.43509 13.5977C4.01582 13.6819 3.581 13.6397 3.18573 13.4765C2.79046 13.3133 2.45252 13.0365 2.21473 12.6811C1.97694 12.3256 1.85001 11.9076 1.85 11.48C1.85 10.9089 2.07619 10.361 2.47911 9.95617C2.88203 9.55138 3.42887 9.32264 4 9.32ZM4 8C3.30777 8 2.63108 8.20527 2.05551 8.58986C1.47993 8.97444 1.03133 9.52107 0.766423 10.1606C0.501516 10.8001 0.432205 11.5039 0.567253 12.1828C0.702301 12.8618 1.03564 13.4854 1.52513 13.9749C2.01461 14.4644 2.63825 14.7977 3.31719 14.9327C3.99612 15.0678 4.69985 14.9985 5.33939 14.7336C5.97894 14.4687 6.52556 14.0201 6.91015 13.4445C7.29473 12.8689 7.5 12.1922 7.5 11.5C7.5 10.5717 7.13125 9.6815 6.47487 9.02513C5.8185 8.36875 4.92826 8 4 8Z" fill="white"/>
+<path opacity="0.5" d="M12 14.98C13.933 14.98 15.5 13.413 15.5 11.48C15.5 9.547 13.933 7.98 12 7.98C10.067 7.98 8.5 9.547 8.5 11.48C8.5 13.413 10.067 14.98 12 14.98Z" fill="white"/>
+<path d="M8 7.5C9.933 7.5 11.5 5.933 11.5 4C11.5 2.067 9.933 0.5 8 0.5C6.067 0.5 4.5 2.067 4.5 4C4.5 5.933 6.067 7.5 8 7.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/convert.svg b/Content/Slate/Starship/Common/convert.svg
new file mode 100644
index 0000000..9dabeb0
--- /dev/null
+++ b/Content/Slate/Starship/Common/convert.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.8 4.00006L11 0.800049V3.20007H10.3999C8.3499 3.20007 7.00996 5.43006 5.70996 7.59006C4.70996 9.28006 3.5499 11.2001 2.3999 11.2001H0V12.8H2.3999C4.3999 12.8 5.79009 10.5701 7.09009 8.41006C8.09009 6.72006 9.2499 4.80005 10.3999 4.80005H11V7.20007L15.8 4.00006Z" fill="white"/>
+<path opacity="0.5" d="M11 15.2V12.7999H10.3999C9.79303 12.7497 9.20617 12.5592 8.68555 12.2433C8.16492 11.9275 7.72477 11.495 7.3999 10.9799C7.6399 10.5999 7.87009 10.2199 8.09009 9.83994L8.29004 9.51993C8.97004 10.5199 9.66988 11.2 10.3799 11.2H10.98V8.79993L15.78 11.9999L11 15.2ZM2.3999 3.19995H0V4.79993H2.3999C3.1299 4.79993 3.86006 5.57994 4.56006 6.58994L4.68994 6.37994C4.93994 5.95994 5.18996 5.53992 5.45996 5.10992C5.13514 4.57415 4.68898 4.1222 4.15747 3.79044C3.62596 3.45868 3.0239 3.25642 2.3999 3.19995Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/play.svg b/Content/Slate/Starship/Common/play.svg
new file mode 100644
index 0000000..ac38935
--- /dev/null
+++ b/Content/Slate/Starship/Common/play.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.1 17.9L17.4 10.2C17.9 9.9 17.9 9.2 17.4 8.9L3.1 1.1C2.6 0.799997 2 1.2 2 1.8V17.3C2 17.8 2.6 18.2 3.1 17.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/transform-local.svg b/Content/Slate/Starship/Common/transform-local.svg
new file mode 100644
index 0000000..f64d752
--- /dev/null
+++ b/Content/Slate/Starship/Common/transform-local.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.5 6.5L7.5 8.5L11.5 6.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M3.5 6.5L7.5 4.5L11.5 6.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M3.5 6.5V11.5L7.5 13.5L11.5 11.5V6.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.5 13.5V8.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M7.5 0.5V4.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M4 12L0.5 15.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M11 12L14.5 15.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/use-circle.svg b/Content/Slate/Starship/Common/use-circle.svg
new file mode 100644
index 0000000..5592171
--- /dev/null
+++ b/Content/Slate/Starship/Common/use-circle.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.16 11.34C13.8541 11.9456 13.4635 12.5046 13 13.0001C12.021 13.9789 10.7737 14.6456 9.41589 14.9156C8.05805 15.1856 6.65062 15.047 5.37158 14.5171C4.09254 13.9873 2.99933 13.0901 2.23019 11.939C1.46106 10.7878 1.05054 9.43448 1.05054 8.05004C1.05054 6.6656 1.46106 5.31225 2.23019 4.16112C2.99933 3.01 4.09254 2.1128 5.37158 1.58297C6.65062 1.05313 8.05805 0.914462 9.41589 1.1845C10.7737 1.45454 12.021 2.12116 13 3.10006C13.4482 3.54439 13.8319 4.0493 14.14 4.60006" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M7.90991 4.5L4.40991 8L7.90991 11.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M14.4099 8H5.40991" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/Common/validate.svg b/Content/Slate/Starship/Common/validate.svg
new file mode 100644
index 0000000..6475629
--- /dev/null
+++ b/Content/Slate/Starship/Common/validate.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.06 1C10.06 1.12 10.06 1.25 10.06 1.35C10.06 1.45 10.06 1.79 10.06 2V6.27L10.2 6.51L15 14.68C14.9594 14.774 14.8925 14.8542 14.8074 14.911C14.7222 14.9678 14.6224 14.9987 14.52 15H1.52C1.41091 15.0068 1.30238 14.9797 1.20929 14.9224C1.1162 14.8651 1.0431 14.7804 1 14.68L5.86 6.51L6 6.27V2C6 1.79 6 1.57 6 1.35C6 1.13 6 1.12 6 1H10.12H10.06ZM10.54 0H5.54C4.68 0 5 1.16 5 2V6L0 14.48C0 14.8831 0.160142 15.2697 0.445198 15.5548C0.730253 15.8399 1.11687 16 1.52 16H14.52C14.9162 15.9896 15.2926 15.8248 15.569 15.5409C15.8455 15.257 16.0001 14.8763 16 14.48L11 6V2C11 1.16 11.32 0 10.48 0H10.54Z" fill="white"/>
+<path opacity="0.5" d="M5.4098 10L3.0498 14H12.9498L10.5898 10H5.4098Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/AssetFilterColorSegment.svg b/Content/Slate/Starship/ContentBrowser/AssetFilterColorSegment.svg
new file mode 100644
index 0000000..2995953
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/AssetFilterColorSegment.svg
@@ -0,0 +1,3 @@
+<svg width="8" height="24" viewBox="0 0 8 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H8V24H4C1.79086 24 0 22.2091 0 20V4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/ContentPack.svg b/Content/Slate/Starship/ContentBrowser/ContentPack.svg
new file mode 100644
index 0000000..55a9ff3
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/ContentPack.svg
@@ -0,0 +1,16 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path opacity="0.5" d="M2.91992 6.49008L5.91992 1.9801L7.42993 3.9801L8.42993 3.40009C8.53463 3.32208 8.64501 3.2519 8.76001 3.19009L6.36011 0.0900879L-0.0600586 3.40009L1.93994 7.0101L2.91992 6.49008Z" fill="white"/>
+<path d="M11.0701 2.53C12.0281 2.56204 12.9427 2.93707 13.6475 3.58679C14.3522 4.23651 14.8002 5.11773 14.9099 6.07001C14.9099 6.12001 14.9099 6.24001 14.9099 6.38L15.99 7L18.8999 3.29999L12.4099 0L9.82007 2.73001C10.2257 2.6068 10.6462 2.5395 11.0701 2.53Z" fill="white"/>
+<path opacity="0.5" d="M4.20999 6.91989L9.01999 9.76989L9.66999 9.39989L5.99999 4.13989L4.20999 6.91989Z" fill="white"/>
+<path opacity="0.5" d="M10.77 3.74991C10.233 3.74925 9.70578 3.89274 9.24316 4.16538C8.78055 4.43802 8.39943 4.82981 8.13989 5.2999L10.7 8.64991L13.8 6.80991C13.8081 6.40839 13.7355 6.00934 13.5864 5.63642C13.4374 5.26349 13.2149 4.92429 12.9324 4.63892C12.6498 4.35355 12.3128 4.12781 11.9414 3.9751C11.57 3.82239 11.1716 3.74582 10.77 3.74991Z" fill="white"/>
+<path d="M9 11.64L2 7V13L9 17.78V11.64Z" fill="white"/>
+<path opacity="0.5" d="M16 7L9 11.64V17.78L16 12.98V7Z" fill="white"/>
+<path d="M20 16H18V14H16V16H14V18H16V20H18V18H20V16Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/FolderLargeDeveloper.svg b/Content/Slate/Starship/ContentBrowser/FolderLargeDeveloper.svg
new file mode 100644
index 0000000..7bc538d
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/FolderLargeDeveloper.svg
@@ -0,0 +1,31 @@
+<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.23074 12.3077C1.23074 9.58874 3.43488 7.38461 6.15379 7.38461H22.7534C24.1748 7.38461 25.5269 7.99895 26.4618 9.06966L28.7567 11.698C29.0022 11.9792 29.1069 12.3565 29.0413 12.7239L27.559 21.0246H1.23071L1.23074 12.3077Z" fill="url(#paint0_linear)"/>
+<path d="M1.23074 9.92227C1.23075 8.52074 2.3669 7.38461 3.76841 7.38461H23.8374C24.57 7.38461 25.267 7.70129 25.7489 8.25323L28.9449 11.9135C29.0714 12.0585 29.1254 12.2529 29.0916 12.4423L27.559 21.0246H1.23071L1.23074 9.92227Z" fill="url(#paint1_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8374 7.70184H3.76841C2.54209 7.70184 1.54796 8.69594 1.54796 9.92227L1.54793 20.7074H27.2934L28.7793 12.3865C28.7962 12.2919 28.7692 12.1946 28.706 12.1222L25.5099 8.46184C25.0883 7.97889 24.4785 7.70184 23.8374 7.70184ZM27.559 21.0246L29.0916 12.4423C29.1254 12.2529 29.0714 12.0585 28.9449 11.9135L25.7489 8.25323C25.267 7.70129 24.57 7.38461 23.8374 7.38461H3.76841C2.3669 7.38461 1.23075 8.52074 1.23074 9.92227L1.23071 21.0246H27.559Z" fill="url(#paint2_linear)"/>
+<path d="M1.23071 18.1697C1.23071 17.4689 1.79879 16.9009 2.49955 16.9009H24.1189C24.8898 16.9009 25.6189 16.5505 26.1005 15.9485L28.9546 12.3809C29.075 12.2304 29.2572 12.1428 29.45 12.1428H60.2315C61.6332 12.1428 62.7692 13.2789 62.7692 14.6805V52.4283C62.7692 52.7786 62.4849 53.0627 62.1347 53.0627H1.86513C1.51475 53.0627 1.23071 52.7786 1.23071 52.4283V18.1697Z" fill="url(#paint3_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M62.4522 52.4283V14.6805C62.4522 13.4541 61.4578 12.46 60.2315 12.46H29.45C29.3536 12.46 29.2625 12.5038 29.2023 12.579L26.3482 16.1467C25.8064 16.8239 24.9862 17.2181 24.1189 17.2181H2.49955C1.97398 17.2181 1.54792 17.6441 1.54792 18.1697V52.4283C1.54792 52.6035 1.68994 52.7454 1.86513 52.7454H62.1347C62.3101 52.7454 62.4522 52.6035 62.4522 52.4283ZM2.49955 16.9009C1.79879 16.9009 1.23071 17.4689 1.23071 18.1697V52.4283C1.23071 52.7786 1.51475 53.0627 1.86513 53.0627H62.1347C62.4849 53.0627 62.7692 52.7786 62.7692 52.4283V14.6805C62.7692 13.2789 61.6332 12.1428 60.2315 12.1428H29.45C29.2572 12.1428 29.075 12.2304 28.9546 12.3809L26.1005 15.9485C25.6189 16.5505 24.8898 16.9009 24.1189 16.9009H2.49955Z" fill="url(#paint4_linear)"/>
+<path d="M1.23071 52.3077H62.7692C62.7692 52.8332 62.3433 53.2593 61.8178 53.2593H2.18234C1.65677 53.2593 1.23071 52.8332 1.23071 52.3077Z" fill="#878787"/>
+<path d="M31.5 21C29.9272 21 28.3896 21.4736 27.0818 22.3608C25.7741 23.248 24.7548 24.509 24.1529 25.9843C23.551 27.4597 23.3935 29.0829 23.7003 30.6491C24.0072 32.2154 24.7646 33.6541 25.8768 34.7832C26.9889 35.9124 28.4059 36.6814 29.9485 36.9929C31.4912 37.3045 33.0902 37.1446 34.5433 36.5335C35.9964 35.9224 37.2384 34.8875 38.1122 33.5598C38.9861 32.232 39.4525 30.6709 39.4525 29.074C39.4525 26.9326 38.6146 24.8791 37.1232 23.3649C35.6319 21.8508 33.6091 21 31.5 21V21ZM17 53H46C45.7544 49.3274 44.0962 45.9002 41.3834 43.4581C38.6706 41.016 35.1207 39.7549 31.5 39.9471C27.8793 39.7549 24.3294 41.016 21.6166 43.4581C18.9038 45.9002 17.2456 49.3274 17 53V53Z" fill="black" fill-opacity="0.4"/>
+<defs>
+<linearGradient id="paint0_linear" x1="15.1879" y1="7.38461" x2="15.1879" y2="21.0246" gradientUnits="userSpaceOnUse">
+<stop offset="0.349258" stop-color="#878787"/>
+<stop offset="1" stop-color="#464646"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="15.1879" y1="7.38461" x2="15.1879" y2="21.0246" gradientUnits="userSpaceOnUse">
+<stop offset="0.349258" stop-color="#BEBEBE"/>
+<stop offset="1" stop-color="#464646"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="15.1661" y1="7.38461" x2="15.1661" y2="17.2181" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DAB277" stop-opacity="0.21"/>
+<stop offset="1" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="44.371" y1="10.7153" x2="1.23068" y2="53.0627" gradientUnits="userSpaceOnUse">
+<stop stop-color="#C5C5C5"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="31.9999" y1="12.1428" x2="31.9999" y2="53.0627" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.84496" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/collections.svg b/Content/Slate/Starship/ContentBrowser/collections.svg
new file mode 100644
index 0000000..45d77fd
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/collections.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 15H15V1H0V15ZM14 14H1V2H14V14Z" fill="white"/>
+<path d="M5 9H2V12H5V9Z" fill="white"/>
+<path d="M5 4H2V7H5V4Z" fill="white"/>
+<path d="M9 9H6V12H9V9Z" fill="white"/>
+<path d="M9 4H6V7H9V4Z" fill="white"/>
+<path d="M13 9H10V12H13V9Z" fill="white"/>
+<path d="M13 4H10V7H13V4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/drop-shadow.png b/Content/Slate/Starship/ContentBrowser/drop-shadow.png
new file mode 100644
index 0000000..b10f297
Binary files /dev/null and b/Content/Slate/Starship/ContentBrowser/drop-shadow.png differ
diff --git a/Content/Slate/Starship/ContentBrowser/file-tree-open.svg b/Content/Slate/Starship/ContentBrowser/file-tree-open.svg
new file mode 100644
index 0000000..716e53f
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/file-tree-open.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.00988 12.8799H6.99988C6.38132 12.8799 5.87988 13.3813 5.87988 13.9999V14.0099C5.87988 14.6284 6.38132 15.1299 6.99988 15.1299H7.00988C7.62844 15.1299 8.12988 14.6284 8.12988 14.0099V13.9999C8.12988 13.3813 7.62844 12.8799 7.00988 12.8799Z" fill="white"/>
+<path d="M7.00988 8.87988H6.99988C6.38132 8.87988 5.87988 9.38132 5.87988 9.99988V10.0099C5.87988 10.6284 6.38132 11.1299 6.99988 11.1299H7.00988C7.62844 11.1299 8.12988 10.6284 8.12988 10.0099V9.99988C8.12988 9.38132 7.62844 8.87988 7.00988 8.87988Z" fill="white"/>
+<path d="M7.00988 4.87988H6.99988C6.38132 4.87988 5.87988 5.38132 5.87988 5.99988V6.00988C5.87988 6.62844 6.38132 7.12988 6.99988 7.12988H7.00988C7.62844 7.12988 8.12988 6.62844 8.12988 6.00988V5.99988C8.12988 5.38132 7.62844 4.87988 7.00988 4.87988Z" fill="white"/>
+<path d="M3.5 2H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M10.5 6H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M10.5 10H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M10.5 14H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 14L0 10L4 6V14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/file-tree.svg b/Content/Slate/Starship/ContentBrowser/file-tree.svg
new file mode 100644
index 0000000..10f5afc
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/file-tree.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.00012 12.8799H2.99012C2.37156 12.8799 1.87012 13.3813 1.87012 13.9999V14.0099C1.87012 14.6284 2.37156 15.1299 2.99012 15.1299H3.00012C3.61868 15.1299 4.12012 14.6284 4.12012 14.0099V13.9999C4.12012 13.3813 3.61868 12.8799 3.00012 12.8799Z" fill="white"/>
+<path d="M3.00012 8.87988H2.99012C2.37156 8.87988 1.87012 9.38132 1.87012 9.99988V10.0099C1.87012 10.6284 2.37156 11.1299 2.99012 11.1299H3.00012C3.61868 11.1299 4.12012 10.6284 4.12012 10.0099V9.99988C4.12012 9.38132 3.61868 8.87988 3.00012 8.87988Z" fill="white"/>
+<path d="M3.00012 4.87988H2.99012C2.37156 4.87988 1.87012 5.38132 1.87012 5.99988V6.00988C1.87012 6.62844 2.37156 7.12988 2.99012 7.12988H3.00012C3.61868 7.12988 4.12012 6.62844 4.12012 6.00988V5.99988C4.12012 5.38132 3.61868 4.87988 3.00012 4.87988Z" fill="white"/>
+<path d="M1.5 2H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M6.5 6H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M6.5 10H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M6.5 14H14.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/folder-developer.svg b/Content/Slate/Starship/ContentBrowser/folder-developer.svg
new file mode 100644
index 0000000..eda18b9
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/folder-developer.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M13 5H2V14H13V5Z" fill="white"/>
+<path d="M8 4L6.33008 2.32996C6.12022 2.12059 5.83646 2.00212 5.54004 2H1.12012C0.823075 2 0.538166 2.11796 0.328125 2.328C0.118084 2.53804 0 2.82295 0 3.12V4H8Z" fill="white"/>
+<path d="M14.8799 5H0V12.88C0 13.177 0.118084 13.462 0.328125 13.672C0.538166 13.882 0.823075 14 1.12012 14H3.6499C3.6499 12.26 5.11 11 7.5 11C9.89 11 11.3401 12.29 11.3401 14H14.8799C15.1769 14 15.4618 13.882 15.6719 13.672C15.8819 13.462 16 13.177 16 12.88V6.12C16 5.82295 15.8819 5.53804 15.6719 5.328C15.4618 5.11796 15.1769 5 14.8799 5ZM7.5 9.92004C7.12069 9.91807 6.75046 9.80372 6.43604 9.59155C6.12161 9.37938 5.87719 9.07891 5.7334 8.72791C5.58961 8.3769 5.55296 7.99117 5.62817 7.61938C5.70338 7.2476 5.8871 6.90643 6.15601 6.63892C6.42492 6.3714 6.76699 6.18949 7.13916 6.11621C7.51133 6.04293 7.89682 6.08156 8.24707 6.22717C8.59732 6.37278 8.89664 6.6188 9.10718 6.93433C9.31771 7.24985 9.42993 7.62069 9.42993 8C9.42729 8.51013 9.22274 8.99849 8.86108 9.35828C8.49942 9.71806 8.01014 9.92005 7.5 9.92004V9.92004Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/folder-drop-shadow.png b/Content/Slate/Starship/ContentBrowser/folder-drop-shadow.png
new file mode 100644
index 0000000..cbe9d74
Binary files /dev/null and b/Content/Slate/Starship/ContentBrowser/folder-drop-shadow.png differ
diff --git a/Content/Slate/Starship/ContentBrowser/folder.svg b/Content/Slate/Starship/ContentBrowser/folder.svg
new file mode 100644
index 0000000..2d9ed08
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/folder.svg
@@ -0,0 +1,30 @@
+<svg width="104" height="104" viewBox="0 0 104 104" fill="none" xmlns="http://www.w3.org/2000/svg">
+<defs>
+<linearGradient id="paint0_linear" x1="24.6804" y1="12" x2="24.6804" y2="34.1649" gradientUnits="userSpaceOnUse">
+<stop offset="0.349258" stop-color="#878787"/>
+<stop offset="1" stop-color="#464646"/>
+</linearGradient>
+<linearGradient id="paint1_linear" x1="24.6804" y1="12" x2="24.6804" y2="34.1649" gradientUnits="userSpaceOnUse">
+<stop offset="0.349258" stop-color="#BEBEBE"/>
+<stop offset="1" stop-color="#464646"/>
+</linearGradient>
+<linearGradient id="paint2_linear" x1="24.645" y1="12" x2="24.645" y2="27.9794" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DAB277" stop-opacity="0.21"/>
+<stop offset="1" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint3_linear" x1="72.103" y1="17.4124" x2="1.99994" y2="86.2268" gradientUnits="userSpaceOnUse">
+<stop stop-color="#C5C5C5"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint4_linear" x1="52" y1="19.732" x2="52" y2="86.2268" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="0.84496" stop-color="white" stop-opacity="0"/>
+</linearGradient>
+</defs>
+<path d="M2.00004 20C2.00005 15.5817 5.58177 12 10 12H36.9744C39.2842 12 41.4813 12.9983 43.0005 14.7382L46.7298 19.0093C47.1287 19.4662 47.2988 20.0793 47.1922 20.6764L44.7835 34.1649H2L2.00004 20Z" fill="url(#paint0_linear)"/>
+<path d="M2.00005 16.1237C2.00006 13.8462 3.8463 12 6.12376 12H38.7358C39.9264 12 41.0589 12.5146 41.842 13.4115L47.0356 19.3595C47.2412 19.595 47.3289 19.911 47.2739 20.2188L44.7835 34.1649H2L2.00005 16.1237Z" fill="url(#paint1_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M38.7358 12.5155H6.12376C4.13099 12.5155 2.51552 14.1309 2.51552 16.1237L2.51547 33.6495H44.3519L46.7665 20.1281C46.7939 19.9743 46.7501 19.8162 46.6473 19.6985L41.4537 13.7505C40.7685 12.9657 39.7776 12.5155 38.7358 12.5155ZM44.7835 34.1649L47.2739 20.2188C47.3289 19.911 47.2412 19.595 47.0356 19.3595L41.842 13.4115C41.0589 12.5146 39.9264 12 38.7358 12H6.12376C3.8463 12 2.00006 13.8462 2.00005 16.1237L2 34.1649H44.7835Z" fill="url(#paint2_linear)"/>
+<path d="M2 29.5258C2 28.387 2.92312 27.4639 4.06186 27.4639H39.1933C40.446 27.4639 41.6308 26.8945 42.4134 25.9163L47.0513 20.1189C47.2469 19.8743 47.5431 19.732 47.8563 19.732H97.8763C100.154 19.732 102 21.5782 102 23.8557V85.1959C102 85.7652 101.538 86.2268 100.969 86.2268H3.03093C2.46156 86.2268 2 85.7652 2 85.1959V29.5258Z" fill="url(#paint3_linear)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M101.485 85.1959V23.8557C101.485 21.8629 99.8691 20.2474 97.8763 20.2474H47.8563C47.6997 20.2474 47.5516 20.3186 47.4538 20.4409L42.8159 26.2383C41.9355 27.3388 40.6026 27.9794 39.1933 27.9794H4.06186C3.20781 27.9794 2.51546 28.6717 2.51546 29.5258V85.1959C2.51546 85.4806 2.74624 85.7113 3.03093 85.7113H100.969C101.254 85.7113 101.485 85.4806 101.485 85.1959ZM4.06186 27.4639C2.92312 27.4639 2 28.387 2 29.5258V85.1959C2 85.7652 2.46156 86.2268 3.03093 86.2268H100.969C101.538 86.2268 102 85.7652 102 85.1959V23.8557C102 21.5782 100.154 19.732 97.8763 19.732H47.8563C47.5431 19.732 47.2469 19.8743 47.0513 20.1189L42.4134 25.9163C41.6308 26.8945 40.446 27.4639 39.1933 27.4639H4.06186Z" fill="url(#paint4_linear)"/>
+<path d="M2 85H102V85C102 85.854 101.308 86.5464 100.454 86.5464H3.54639C2.69235 86.5464 2 85.854 2 85V85Z" fill="#878787"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/migrate.svg b/Content/Slate/Starship/ContentBrowser/migrate.svg
new file mode 100644
index 0000000..f9f1be9
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/migrate.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6 5V2.62C5.99914 2.19007 5.83051 1.77746 5.53 1.47C5.22988 1.1707 4.82384 1.00182 4.39999 1H1.60001C1.17616 1.00182 0.770117 1.1707 0.470001 1.47C0.169495 1.77746 0.000860635 2.19007 0 2.62V13.38C0.000860635 13.8099 0.169495 14.2225 0.470001 14.53C0.770117 14.8293 1.17616 14.9982 1.60001 15H4.39999C4.82384 14.9982 5.22988 14.8293 5.53 14.53C5.83051 14.2225 5.99914 13.8099 6 13.38V11H2V5H6Z" fill="white"/>
+<path opacity="0.5" d="M10 2.62V3L11 3.5L12 3C12 2.45 11.45 2 12 2H14C14.2652 2 14.5196 2.10536 14.7071 2.29289C14.8946 2.48043 15 2.73478 15 3V13C15 13.2652 14.8946 13.5196 14.7071 13.7071C14.5196 13.8946 14.2652 14 14 14H12C11.7348 14 11.4804 13.8946 11.2929 13.7071C11.1054 13.5196 11 13.2652 11 13V12.5L10 13V13.38C10.0009 13.8099 10.1695 14.2225 10.47 14.53C10.7701 14.8293 11.1762 14.9982 11.6 15H14.4C14.8238 14.9982 15.2299 14.8293 15.53 14.53C15.8305 14.2225 15.9991 13.8099 16 13.38V2.62C15.9991 2.19007 15.8305 1.77746 15.53 1.47C15.2299 1.1707 14.8238 1.00182 14.4 1H11.6C11.1762 1.00182 10.7701 1.1707 10.47 1.47C10.1695 1.77746 10.0009 2.19007 10 2.62Z" fill="white"/>
+<path d="M3 9V7H9V5L14 8L9 11V9H3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/reference-viewer.svg b/Content/Slate/Starship/ContentBrowser/reference-viewer.svg
new file mode 100644
index 0000000..9ca6c54
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/reference-viewer.svg
@@ -0,0 +1,15 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10.5 10.5L13.5 13.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M10.5 5.5L13.5 2.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M10 6.5H13.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M10 9.5H13.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M5.5 7.5L2.5 4.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M5.5 8.5L2.5 11.5" stroke="white" stroke-width="0.5" stroke-miterlimit="10"/>
+<path d="M16 1H13V3H16V1Z" fill="white"/>
+<path d="M16 13H13V15H16V13Z" fill="white"/>
+<path d="M16 5H13V7H16V5Z" fill="white"/>
+<path d="M16 9H13V11H16V9Z" fill="white"/>
+<path d="M11 5H5V11H11V5Z" fill="white"/>
+<path d="M3 3H0V6H3V3Z" fill="white"/>
+<path d="M3 10H0V13H3V10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/show-in-explorer.svg b/Content/Slate/Starship/ContentBrowser/show-in-explorer.svg
new file mode 100644
index 0000000..366a961
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/show-in-explorer.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.59003 13.31L6.90003 16C6.67582 15.9641 6.4728 15.8466 6.33003 15.67C5.99003 15.34 6.00003 15.1 6.00003 15.1L8.69003 12.41L9.59003 13.31Z" fill="white"/>
+<path d="M12 7.5C12.663 7.5 13.2989 7.76339 13.7678 8.23223C14.2366 8.70107 14.5 9.33696 14.5 10C14.5 10.663 14.2366 11.2989 13.7678 11.7678C13.2989 12.2366 12.663 12.5 12 12.5C11.337 12.5 10.7011 12.2366 10.2322 11.7678C9.76339 11.2989 9.5 10.663 9.5 10C9.5 9.33696 9.76339 8.70107 10.2322 8.23223C10.7011 7.76339 11.337 7.5 12 7.5ZM12 6.25C11.0054 6.25 10.0516 6.64509 9.34835 7.34835C8.64509 8.05161 8.25 9.00544 8.25 10C8.25 10.9946 8.64509 11.9484 9.34835 12.6516C10.0516 13.3549 11.0054 13.75 12 13.75C12.9946 13.75 13.9484 13.3549 14.6516 12.6516C15.3549 11.9484 15.75 10.9946 15.75 10C15.75 9.00544 15.3549 8.05161 14.6516 7.34835C13.9484 6.64509 12.9946 6.25 12 6.25Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M13.93 3.00001H0V12.92C0.00260268 13.0645 0.0336407 13.207 0.0913391 13.3395C0.149038 13.4719 0.232267 13.5917 0.336273 13.692C0.44028 13.7923 0.563028 13.8711 0.697502 13.924C0.831976 13.9768 0.975542 14.0027 1.12 14H5.12C5.69 13.47 6.41 12.79 7.06 12.15C6.76444 11.4346 6.62795 10.6634 6.66 9.89001C6.73959 8.48938 7.35526 7.17313 8.3793 6.21426C9.40334 5.25539 10.7572 4.72747 12.16 4.74001C12.7008 4.74677 13.2373 4.83787 13.75 5.01001C14.1828 5.20944 14.6006 5.44004 15 5.70001V4.00001C15.0003 3.86259 14.9723 3.72656 14.9178 3.60044C14.8632 3.47431 14.7832 3.36079 14.6828 3.26696C14.5824 3.17312 14.4637 3.10099 14.3342 3.05506C14.2047 3.00913 14.0671 2.99039 13.93 3.00001Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.38 2L5.93 0.369999C5.83211 0.255808 5.71103 0.163758 5.57483 0.0999641C5.43862 0.0361703 5.29039 0.00209463 5.14 0H1C0.734784 0 0.480429 0.105356 0.292892 0.292892C0.105356 0.480429 0 0.734784 0 1V2H7.38Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/ContentBrowser/size-map.svg b/Content/Slate/Starship/ContentBrowser/size-map.svg
new file mode 100644
index 0000000..e5faecb
--- /dev/null
+++ b/Content/Slate/Starship/ContentBrowser/size-map.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15 12H8V15H15V12Z" fill="white"/>
+<path opacity="0.5" d="M15 1H8V5H15V1Z" fill="white"/>
+<path d="M7 9H1V15H7V9Z" fill="white"/>
+<path d="M7 1H1V4H7V1Z" fill="white"/>
+<path opacity="0.5" d="M7 5H1V8H7V5Z" fill="white"/>
+<path d="M15 6H8V11H15V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_Cache_Settings.svg b/Content/Slate/Starship/DerivedData/DD_Cache_Settings.svg
new file mode 100644
index 0000000..4aa189f
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_Cache_Settings.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5001 8.9C15.5001 8.6 15.6001 8.3 15.6001 8C15.6001 7.7 15.5001 7.4 15.5001 7.1L13.2001 6.8C13.1001 6.3 12.9001 5.8 12.6001 5.3L14.0001 3.4C13.6001 2.9 13.2001 2.5 12.7001 2.1L10.8001 3.5C10.4001 3.2 9.90009 3 9.30009 2.9L9.00009 0.6C8.70009 0.6 8.4001 0.5 8.1001 0.5C7.8001 0.5 7.5001 0.6 7.1001 0.6L6.80009 2.9C6.30009 3 5.80009 3.2 5.40009 3.5L3.50009 2.1C3.00009 2.5 2.60009 2.9 2.20009 3.4L3.6001 5.3C3.3001 5.7 3.10009 6.2 3.00009 6.7L0.700089 7C0.700089 7.3 0.600098 7.6 0.600098 7.9C0.600098 8.2 0.700089 8.5 0.700089 8.8L3.00009 9.1C3.10009 9.6 3.3001 10.1 3.6001 10.5L2.20009 12.4C2.60009 12.9 3.00009 13.3 3.50009 13.7L5.40009 12.3C5.80009 12.6 6.30009 12.8 6.80009 12.9L7.1001 15.2C7.4001 15.2 7.7001 15.3 8.1001 15.3C8.4001 15.3 8.70009 15.2 9.00009 15.2L9.30009 12.9C9.80009 12.8 10.3001 12.6 10.8001 12.3L12.7001 13.7C13.2001 13.3 13.6001 12.9 14.0001 12.4L12.6001 10.5C12.9001 10 13.1001 9.6 13.2001 9L15.5001 8.9ZM8.00009 12C5.80009 12 4.00009 10.2 4.00009 8C4.00009 5.8 5.80009 4 8.00009 4C10.2001 4 12.0001 5.8 12.0001 8C12.0001 10.2 10.2001 12 8.00009 12Z" fill="white"/>
+<path opacity="0.5" d="M8.00009 6.10001C9.00009 6.10001 9.90009 6.90001 9.90009 8.00001C9.90009 9.00001 9.10009 9.90001 8.00009 9.90001C7.00009 9.90001 6.1001 9.10001 6.1001 8.00001C6.1001 7.00001 6.90009 6.10001 8.00009 6.10001ZM8.00009 5.10001C6.40009 5.10001 5.1001 6.40001 5.1001 8.00001C5.1001 9.60001 6.40009 10.9 8.00009 10.9C9.60009 10.9 10.9001 9.60001 10.9001 8.00001C10.9001 6.40001 9.60009 5.10001 8.00009 5.10001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_Cache_Statistics.svg b/Content/Slate/Starship/DerivedData/DD_Cache_Statistics.svg
new file mode 100644
index 0000000..17c7e5b
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_Cache_Statistics.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 10H0V16H4V10Z" fill="white" fill-opacity="0.5"/>
+<path d="M10 0H6V16H10V0Z" fill="white"/>
+<path d="M16 6H12V16H16V6Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_Download.svg b/Content/Slate/Starship/DerivedData/DD_Download.svg
new file mode 100644
index 0000000..5f07bb3
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_Download.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 16L10.5 12H9V6H7V12H5.5L8 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_DownloadBG.svg b/Content/Slate/Starship/DerivedData/DD_DownloadBG.svg
new file mode 100644
index 0000000..2fbd4bf
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_DownloadBG.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 6L10.5 10H12V16H14V10H15.5L13 6Z" fill="white"/>
+<path d="M5 6H1V10H5V6Z" fill="white"/>
+<path d="M1 15H4.9L2.5 11H1V15Z" fill="white"/>
+<path d="M1 1V5H15V1H1ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_Disabled.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Disabled.svg
new file mode 100644
index 0000000..978e572
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Disabled.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="DD_RemoteCache_Disabled.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12">
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="17.679306"
+       height="17.679306"
+       patternTransform="translate(1.8303729,1.7231257)"
+       id="pattern2741">
+      <rect
+         style="fill:#c87137;fill-opacity:1;stroke-width:1.9721"
+         id="rect347-7"
+         width="4.9469819"
+         height="20.055332"
+         x="10.027666"
+         y="-10.027666"
+         transform="rotate(45)" />
+    </pattern>
+  </defs>
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#000dee"
+     bordercolor="#cc5c5c"
+     borderopacity="0.24705882"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.8627451"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="45.254834"
+     inkscape:cx="7.3693785"
+     inkscape:cy="8.6289124"
+     inkscape:window-width="2073"
+     inkscape:window-height="1091"
+     inkscape:window-x="225"
+     inkscape:window-y="302"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg8" />
+  <path
+     id="rect347"
+     style="fill:#ffffff;fill-opacity:1;stroke-width:1.00119"
+     d="M 8.7042458,6.0533184 6.9287084,7.8288559 9.6692865,10.569434 6.9699201,13.2688 8.7454572,15.044338 11.444823,12.344971 14.128736,15.028883 15.904273,13.253346 13.220361,10.569433 15.945485,7.8460271 14.16823,6.068773 11.444824,8.7938966 Z" />
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_DisabledBG.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_DisabledBG.svg
new file mode 100644
index 0000000..18d4926
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_DisabledBG.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="DD_RemoteCache_DisabledBG.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12">
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="17.679306"
+       height="17.679306"
+       patternTransform="translate(1.8303729,1.7231257)"
+       id="pattern2741">
+      <rect
+         style="fill:#c87137;fill-opacity:1;stroke-width:1.9721"
+         id="rect347-7"
+         width="4.9469819"
+         height="20.055332"
+         x="10.027666"
+         y="-10.027666"
+         transform="rotate(45)" />
+    </pattern>
+  </defs>
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#000dee"
+     bordercolor="#cc5c5c"
+     borderopacity="0.24705882"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.8627451"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="45.254834"
+     inkscape:cx="5.8336309"
+     inkscape:cy="9.148194"
+     inkscape:window-width="2560"
+     inkscape:window-height="1334"
+     inkscape:window-x="2549"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     d="M1 1V5H15V1H1ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25V4.25Z"
+     fill="white"
+     id="path2" />
+  <path
+     d="m 1,6 v 4 H 6.6440678 L 3.7877679,7.1396345 3.7819922,6.0028418 Z"
+     fill="#ffffff"
+     id="path4"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     d="m 1,11 v 4 l 2.8858938,0.0085 0.00505,-1.275046 L 6.779661,11 Z"
+     fill="#ffffff"
+     id="path6"
+     sodipodi:nodetypes="cccccc" />
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_DisabledFull.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_DisabledFull.svg
new file mode 100644
index 0000000..1e2be24
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_DisabledFull.svg
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="DD_RemoteCache_DisabledFull.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12">
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="17.679306"
+       height="17.679306"
+       patternTransform="translate(1.8303729,1.7231257)"
+       id="pattern2741">
+      <rect
+         style="fill:#c87137;fill-opacity:1;stroke-width:1.9721"
+         id="rect347-7"
+         width="4.9469819"
+         height="20.055332"
+         x="10.027666"
+         y="-10.027666"
+         transform="rotate(45)" />
+    </pattern>
+  </defs>
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#000dee"
+     bordercolor="#cc5c5c"
+     borderopacity="0.24705882"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.8627451"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="45.254834"
+     inkscape:cx="5.8336309"
+     inkscape:cy="9.148194"
+     inkscape:window-width="2560"
+     inkscape:window-height="1494"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     d="M1 1V5H15V1H1ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25V4.25Z"
+     fill="white"
+     id="path2" />
+  <path
+     d="m 1,6 v 4 H 6.6440678 L 3.7877679,7.1396345 3.7819922,6.0028418 Z"
+     fill="#ffffff"
+     id="path4"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     d="m 1,11 v 4 l 2.8858938,0.0085 0.00505,-1.275046 L 6.779661,11 Z"
+     fill="#ffffff"
+     id="path6"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     id="rect347"
+     style="fill:#ffffff;fill-opacity:0.50246304;stroke-width:1.00119"
+     d="m 8.6692456,6.1552861 -1.775537,1.7755375 2.740578,2.7405784 -2.699366,2.699365 1.775537,1.775538 2.6993644,-2.699366 2.683913,2.683911 1.775537,-1.775537 -2.683912,-2.683912 2.725124,-2.7234062 -1.777255,-1.7772541 -2.723406,2.7251236 z" />
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_Idle.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Idle.svg
new file mode 100644
index 0000000..fb33985
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Idle.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.08485 6.37762C9.69214 6.12686 10.343 5.99855 11 6.00001C11.657 5.99855 12.3078 6.12686 12.9151 6.37762C13.5224 6.62837 14.0742 6.99664 14.5388 7.46123C15.0034 7.92581 15.3716 8.47757 15.6224 9.08486C15.8731 9.69215 16.0014 10.343 16 11C16.0014 11.657 15.8731 12.3079 15.6224 12.9152C15.3716 13.5224 15.0034 14.0742 14.5388 14.5388C14.0742 15.0034 13.5224 15.3717 12.9151 15.6224C12.3078 15.8732 11.657 16.0015 11 16C10.343 16.0015 9.69214 15.8732 9.08485 15.6224C8.47756 15.3717 7.92577 15.0034 7.46119 14.5388C6.9966 14.0742 6.62837 13.5224 6.37761 12.9152C6.12686 12.3079 5.99855 11.657 6.00001 11C5.99855 10.343 6.12686 9.69215 6.37761 9.08486C6.62837 8.47757 6.9966 7.92581 7.46119 7.46123C7.92577 6.99664 8.47756 6.62837 9.08485 6.37762ZM13.6291 9.0684C13.7896 8.84369 13.7375 8.53141 13.5128 8.37091C13.2881 8.21041 12.9758 8.26245 12.8153 8.48716L10.3806 11.8958L9.13134 10.6464C8.93608 10.4512 8.6195 10.4512 8.42423 10.6464C8.22897 10.8417 8.22897 11.1583 8.42423 11.3536L10.0909 13.0202L10.5082 13.4376L10.8513 12.9573L13.6291 9.0684Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_IdleBG.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_IdleBG.svg
new file mode 100644
index 0000000..6be4515
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_IdleBG.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 1V5H15V1H1ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25Z" fill="white"/>
+<path d="M1 10H4C4.0523 8.64087 4.99689 6.8971 6 6H1V10Z" fill="white"/>
+<path d="M1 11H4C4.04055 12.0538 4.5 13.5 5.5 15H1V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_Unavailable.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Unavailable.svg
new file mode 100644
index 0000000..3c6fcab
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Unavailable.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 1V5H15V1H1ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25V4.25Z" fill="white"/>
+<path d="M1 6V10H15V6H1ZM13 9.25C12.6685 9.25 12.3505 9.1183 12.1161 8.88388C11.8817 8.64946 11.75 8.33152 11.75 8C11.75 7.66848 11.8817 7.35054 12.1161 7.11612C12.3505 6.8817 12.6685 6.75 13 6.75C13.3315 6.75 13.6495 6.8817 13.8839 7.11612C14.1183 7.35054 14.25 7.66848 14.25 8C14.25 8.33152 14.1183 8.64946 13.8839 8.88388C13.6495 9.1183 13.3315 9.25 13 9.25V9.25ZM10 9.25C9.66848 9.25 9.35051 9.1183 9.11609 8.88388C8.88167 8.64946 8.75 8.33152 8.75 8C8.75 7.66848 8.88167 7.35054 9.11609 7.11612C9.35051 6.8817 9.66848 6.75 10 6.75C10.3315 6.75 10.6495 6.8817 10.8839 7.11612C11.1183 7.35054 11.25 7.66848 11.25 8C11.25 8.33152 11.1183 8.64946 10.8839 8.88388C10.6495 9.1183 10.3315 9.25 10 9.25V9.25Z" fill="white"/>
+<path d="M1 11V15H15V11H1ZM13 14.25C12.6685 14.25 12.3505 14.1183 12.1161 13.8839C11.8817 13.6495 11.75 13.3315 11.75 13C11.75 12.6685 11.8817 12.3505 12.1161 12.1161C12.3505 11.8817 12.6685 11.75 13 11.75C13.3315 11.75 13.6495 11.8817 13.8839 12.1161C14.1183 12.3505 14.25 12.6685 14.25 13C14.25 13.3315 14.1183 13.6495 13.8839 13.8839C13.6495 14.1183 13.3315 14.25 13 14.25V14.25ZM10 14.25C9.66848 14.25 9.35051 14.1183 9.11609 13.8839C8.88167 13.6495 8.75 13.3315 8.75 13C8.75 12.6685 8.88167 12.3505 9.11609 12.1161C9.35051 11.8817 9.66848 11.75 10 11.75C10.3315 11.75 10.6495 11.8817 10.8839 12.1161C11.1183 12.3505 11.25 12.6685 11.25 13C11.25 13.3315 11.1183 13.6495 10.8839 13.8839C10.6495 14.1183 10.3315 14.25 10 14.25V14.25Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDown.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDown.svg
new file mode 100644
index 0000000..d574d58
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDown.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 16L10.5 12H9V6H7V12H5.5L8 16Z" fill="white"/>
+<path d="M13 6L10.5 10H12V16H14V10H15.5L13 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDownBG.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDownBG.svg
new file mode 100644
index 0000000..d941a17
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDownBG.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 6H1V10H5V6Z" fill="white"/>
+<path d="M1 15H4.9L2.5 11H1V15Z" fill="white"/>
+<path d="M1 1V5H15V1H1ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDownFull.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDownFull.svg
new file mode 100644
index 0000000..1a09518
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_UpDownFull.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   fill="none"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="DD_RemoteCache_UpDownFull.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#5759d3"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="41.7193"
+     inkscape:cx="10.211101"
+     inkscape:cy="10.762405"
+     inkscape:window-width="2560"
+     inkscape:window-height="1494"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     d="M5 6H1V10H5V6Z"
+     fill="white"
+     id="path2" />
+  <path
+     d="M1 15H4.9L2.5 11H1V15Z"
+     fill="white"
+     id="path4" />
+  <path
+     d="M1 1V5H15V1H1ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25Z"
+     fill="white"
+     id="path6" />
+  <path
+     d="m 8.0946171,16.026071 2.4999999,-4 H 9.0946171 V 6.0260719 h -2 v 5.9999991 h -1.5 z"
+     fill="#ffffff"
+     id="path241"
+     style="fill:#ffffff;fill-opacity:0.5" />
+  <path
+     d="m 13.094617,6.0260719 -2.5,4.0000001 h 1.5 v 5.999999 h 2 v -5.999999 h 1.5 z"
+     fill="#ffffff"
+     id="path243"
+     style="fill:#ffffff;fill-opacity:0.5" />
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_Warning.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Warning.svg
new file mode 100644
index 0000000..64e08d0
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_Warning.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.79 14.84L11.6899 6.41003C11.6237 6.28441 11.5245 6.17925 11.4029 6.1059C11.2814 6.03254 11.142 5.99377 11 5.99377C10.858 5.99377 10.7186 6.03254 10.597 6.1059C10.4754 6.17925 10.3763 6.28441 10.3101 6.41003L6.20996 14.84C6.14645 14.9598 6.11483 15.0939 6.11816 15.2295C6.12149 15.365 6.15969 15.4974 6.229 15.6139C6.29831 15.7304 6.3964 15.8272 6.51391 15.8948C6.63142 15.9624 6.76445 15.9987 6.90002 16H15.1C15.2355 15.9987 15.3686 15.9624 15.4861 15.8948C15.6036 15.8272 15.7017 15.7304 15.771 15.6139C15.8403 15.4974 15.8785 15.365 15.8818 15.2295C15.8852 15.0939 15.8535 14.9598 15.79 14.84V14.84ZM11 15C10.7348 15 10.4804 14.8947 10.2928 14.7071C10.1053 14.5196 9.99999 14.2652 9.99999 14C9.99999 13.7348 10.1053 13.4805 10.2928 13.2929C10.4804 13.1054 10.7348 13 11 13C11.2652 13 11.5196 13.1054 11.7071 13.2929C11.8947 13.4805 12 13.7348 12 14C12 14.2652 11.8947 14.5196 11.7071 14.7071C11.5196 14.8947 11.2652 15 11 15ZM11.33 12.33H10.67C10.5374 12.33 10.4102 12.2774 10.3164 12.1836C10.2226 12.0898 10.17 11.9626 10.17 11.83V9.50003C10.17 9.36742 10.2226 9.24025 10.3164 9.14648C10.4102 9.05272 10.5374 9.00003 10.67 9.00003H11.33C11.4626 9.00003 11.5898 9.05272 11.6836 9.14648C11.7774 9.24025 11.83 9.36742 11.83 9.50003V11.83C11.83 11.9626 11.7774 12.0898 11.6836 12.1836C11.5898 12.2774 11.4626 12.33 11.33 12.33Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_RemoteCache_WarningBG.svg b/Content/Slate/Starship/DerivedData/DD_RemoteCache_WarningBG.svg
new file mode 100644
index 0000000..04611b0
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_RemoteCache_WarningBG.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.52002 6H1V10H6.27002L8.27002 6.32999C8.34445 6.21352 8.42805 6.10318 8.52002 6V6Z" fill="white"/>
+<path d="M1 15H3.54L5.73 11H1V15Z" fill="white"/>
+<path d="M14.9999 6H13.4199C13.5279 6.12832 13.6248 6.26547 13.7098 6.41L14.9999 9V6Z" fill="white"/>
+<path d="M1 5H15V1H1V5ZM13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75V1.75ZM10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_Resource_Usage.svg b/Content/Slate/Starship/DerivedData/DD_Resource_Usage.svg
new file mode 100644
index 0000000..1061a42
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_Resource_Usage.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 15H2C1.4 15 1 14.6 1 14V2C1 1.4 1.4 1 2 1H14C14.6 1 15 1.4 15 2V14C15 14.6 14.6 15 14 15ZM9 13H13V11H9V13ZM3 13H7V11H3V13ZM9 9H13V7H9V9ZM3 9H7V7H3V9ZM8 5H13V3H3V5H8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_Upload.svg b/Content/Slate/Starship/DerivedData/DD_Upload.svg
new file mode 100644
index 0000000..9be26a1
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_Upload.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 6L10.5 10H12V16H14V10H15.5L13 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DerivedData/DD_UploadBG.svg b/Content/Slate/Starship/DerivedData/DD_UploadBG.svg
new file mode 100644
index 0000000..94625b5
--- /dev/null
+++ b/Content/Slate/Starship/DerivedData/DD_UploadBG.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 16L10.5 12H9V6H7V12H5.5L8 16Z" fill="white"/>
+<path d="M5 6H1V10H5V6Z" fill="white"/>
+<path d="M1 15H4.9L2.5 11H1V15Z" fill="white"/>
+<path d="M1 1V5H15V1H1ZM10 4.25C9.66848 4.25 9.35051 4.1183 9.11609 3.88388C8.88167 3.64946 8.75 3.33152 8.75 3C8.75 2.66848 8.88167 2.35054 9.11609 2.11612C9.35051 1.8817 9.66848 1.75 10 1.75C10.3315 1.75 10.6495 1.8817 10.8839 2.11612C11.1183 2.35054 11.25 2.66848 11.25 3C11.25 3.33152 11.1183 3.64946 10.8839 3.88388C10.6495 4.1183 10.3315 4.25 10 4.25ZM13 4.25C12.6685 4.25 12.3505 4.1183 12.1161 3.88388C11.8817 3.64946 11.75 3.33152 11.75 3C11.75 2.66848 11.8817 2.35054 12.1161 2.11612C12.3505 1.8817 12.6685 1.75 13 1.75C13.3315 1.75 13.6495 1.8817 13.8839 2.11612C14.1183 2.35054 14.25 2.66848 14.25 3C14.25 3.33152 14.1183 3.64946 13.8839 3.88388C13.6495 4.1183 13.3315 4.25 13 4.25V4.25Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/CircleCheck_20.svg b/Content/Slate/Starship/DeviceManager/CircleCheck_20.svg
new file mode 100644
index 0000000..ffbbff2
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/CircleCheck_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.63 10.63L8.75 13.75L13.82 6.88" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M9.99994 18.3099C14.5894 18.3099 18.3099 14.5894 18.3099 9.99994C18.3099 5.41045 14.5894 1.68994 9.99994 1.68994C5.41045 1.68994 1.68994 5.41045 1.68994 9.99994C1.68994 14.5894 5.41045 18.3099 9.99994 18.3099Z" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/CircleMinus_20.svg b/Content/Slate/Starship/DeviceManager/CircleMinus_20.svg
new file mode 100644
index 0000000..e977aec
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/CircleMinus_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 10H6" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M9.99994 18.3099C14.5894 18.3099 18.3099 14.5894 18.3099 9.99994C18.3099 5.41045 14.5894 1.68994 9.99994 1.68994C5.41045 1.68994 1.68994 5.41045 1.68994 9.99994C1.68994 14.5894 5.41045 18.3099 9.99994 18.3099Z" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/CircleX_20.svg b/Content/Slate/Starship/DeviceManager/CircleX_20.svg
new file mode 100644
index 0000000..2e8f758
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/CircleX_20.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.8299 7.17004L7.16992 12.83" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M12.83 12.83L7.16996 7.17004" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M9.99994 18.3099C14.5894 18.3099 18.3099 14.5894 18.3099 9.99994C18.3099 5.41045 14.5894 1.68994 9.99994 1.68994C5.41045 1.68994 1.68994 5.41045 1.68994 9.99994C1.68994 14.5894 5.41045 18.3099 9.99994 18.3099Z" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/DeviceClaim.svg b/Content/Slate/Starship/DeviceManager/DeviceClaim.svg
new file mode 100644
index 0000000..c132de7
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/DeviceClaim.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 19V18.74C0 15.42 2.47 13.5 5.5 13.5C8.5 13.5 11 15.42 11 18.74V19H0Z" fill="white"/>
+<path d="M5.50004 12.46C7.1348 12.46 8.46004 11.1348 8.46004 9.50004C8.46004 7.86528 7.1348 6.54004 5.50004 6.54004C3.86528 6.54004 2.54004 7.86528 2.54004 9.50004C2.54004 11.1348 3.86528 12.46 5.50004 12.46Z" fill="white"/>
+<path d="M13 19H17V13H13V19ZM16 16H14V14H16V16Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.1 6.5L18.33 1L15.23 8L17.36 9.47L11.58 11L11 5L13.1 6.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/DeviceRelease.svg b/Content/Slate/Starship/DeviceManager/DeviceRelease.svg
new file mode 100644
index 0000000..9d03d8f
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/DeviceRelease.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 19V18.74C0 15.42 2.47 13.5 5.5 13.5C8.5 13.5 11 15.42 11 18.74V19H0Z" fill="white"/>
+<path d="M5.50004 12.46C7.1348 12.46 8.46004 11.1348 8.46004 9.50004C8.46004 7.86528 7.1348 6.54004 5.50004 6.54004C3.86528 6.54004 2.54004 7.86528 2.54004 9.50004C2.54004 11.1348 3.86528 12.46 5.50004 12.46Z" fill="white"/>
+<path d="M15 7H19V1H15V7ZM18 4H16V2H18V4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.16 11.14L17 8.59998L18.7 13.85L16.49 12.94L12.68 18.84L14.29 12.04L12.16 11.14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/DeviceRemove.svg b/Content/Slate/Starship/DeviceManager/DeviceRemove.svg
new file mode 100644
index 0000000..86906dc
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/DeviceRemove.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 19V18.74C0 15.42 2.47 13.5 5.5 13.5C8.5 13.5 11 15.42 11 18.74V19H0Z" fill="white"/>
+<path d="M5.50004 12.46C7.1348 12.46 8.46004 11.1348 8.46004 9.50004C8.46004 7.86528 7.1348 6.54004 5.50004 6.54004C3.86528 6.54004 2.54004 7.86528 2.54004 9.50004C2.54004 11.1348 3.86528 12.46 5.50004 12.46Z" fill="white"/>
+<path d="M13 19H17V13H13V19ZM16 16H14V14H16V16Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.17 1.5L14.5 4.17L11.83 1.5L10.5 2.83L13.17 5.5L10.5 8.17L11.83 9.5L14.5 6.83L17.17 9.5L18.5 8.17L15.83 5.5L18.5 2.83L17.17 1.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/DeviceShare.svg b/Content/Slate/Starship/DeviceManager/DeviceShare.svg
new file mode 100644
index 0000000..ec3bb04
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/DeviceShare.svg
@@ -0,0 +1,14 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M0 19V18.74C0 15.42 2.47 13.5 5.5 13.5C8.5 13.5 11 15.42 11 18.74V19H0Z" fill="white"/>
+<path d="M5.50004 12.46C7.1348 12.46 8.46004 11.1348 8.46004 9.50004C8.46004 7.86528 7.1348 6.54004 5.50004 6.54004C3.86528 6.54004 2.54004 7.86528 2.54004 9.50004C2.54004 11.1348 3.86528 12.46 5.50004 12.46Z" fill="white"/>
+<path d="M13 19H17V13H13V19ZM16 16H14V14H16V16Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 4.14998L18.22 1.59998L20.03 6.19998L18.03 5.50998L14.91 11L15.96 4.82998L14 4.14998Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.16 3.52001L11.32 9.78001L9.07001 3.91001L6.96997 4.30001L9.41998 0.0100098L13.23 3.14001L11.16 3.52001Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/PowerOn_20.svg b/Content/Slate/Starship/DeviceManager/PowerOn_20.svg
new file mode 100644
index 0000000..fc24a36
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/PowerOn_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 2.68994C14.7065 3.07011 15.3534 3.55191 15.92 4.11993C17.4759 5.68128 18.3496 7.79568 18.3496 9.99994C18.3496 12.2042 17.4759 14.3186 15.92 15.8799C14.3586 17.4359 12.2442 18.3096 10.04 18.3096C7.83572 18.3096 5.72131 17.4359 4.15997 15.8799C2.60403 14.3186 1.73035 12.2042 1.73035 9.99994C1.73035 7.79568 2.60403 5.68128 4.15997 4.11993C4.69683 3.59285 5.29829 3.13588 5.94998 2.75993" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+<path d="M10 1V10.07" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/DeviceManager/Reboot.svg b/Content/Slate/Starship/DeviceManager/Reboot.svg
new file mode 100644
index 0000000..8c0f86e
--- /dev/null
+++ b/Content/Slate/Starship/DeviceManager/Reboot.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.5 1.5V8.43" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M18.5 8.43C18.0955 6.47395 17.0294 4.71697 15.4813 3.45479C13.9331 2.1926 11.9975 1.50228 10 1.5C8.00764 1.49849 6.0754 2.18244 4.52765 3.43703C2.9799 4.69161 1.91087 6.44046 1.5 8.39" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M18.5 18.4999V11.5699" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M1.5 11.5699C1.90455 13.526 2.97061 15.283 4.51874 16.5452C6.06687 17.8073 8.00255 18.4977 10 18.4999C11.9924 18.5015 13.9246 17.8175 15.4724 16.5629C17.0201 15.3083 18.0891 13.5595 18.5 11.6099" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M12.18 6C12.5676 6.20916 12.9216 6.47548 13.23 6.79C13.6551 7.21364 13.9924 7.71703 14.2226 8.27131C14.4527 8.82558 14.5712 9.41984 14.5712 10.02C14.5712 10.6202 14.4527 11.2144 14.2226 11.7687C13.9924 12.323 13.6551 12.8264 13.23 13.25C12.8063 13.6751 12.303 14.0124 11.7487 14.2426C11.1944 14.4727 10.6002 14.5912 10 14.5912C9.39984 14.5912 8.80556 14.4727 8.25128 14.2426C7.69701 14.0124 7.19366 13.6751 6.77002 13.25C6.34491 12.8264 6.00756 12.323 5.7774 11.7687C5.54725 11.2144 5.42883 10.6202 5.42883 10.02C5.42883 9.41984 5.54725 8.82558 5.7774 8.27131C6.00756 7.71703 6.34491 7.21364 6.77002 6.79C7.068 6.49604 7.40438 6.24375 7.77002 6.04" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M10 5.05005V10.04" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/ToolBarLeftGroup.png b/Content/Slate/Starship/EditorViewport/ToolBarLeftGroup.png
new file mode 100644
index 0000000..fe97716
Binary files /dev/null and b/Content/Slate/Starship/EditorViewport/ToolBarLeftGroup.png differ
diff --git a/Content/Slate/Starship/EditorViewport/ToolBarMiddleGroup.png b/Content/Slate/Starship/EditorViewport/ToolBarMiddleGroup.png
new file mode 100644
index 0000000..e029755
Binary files /dev/null and b/Content/Slate/Starship/EditorViewport/ToolBarMiddleGroup.png differ
diff --git a/Content/Slate/Starship/EditorViewport/ToolBarRightGroup.png b/Content/Slate/Starship/EditorViewport/ToolBarRightGroup.png
new file mode 100644
index 0000000..ca7a2c7
Binary files /dev/null and b/Content/Slate/Starship/EditorViewport/ToolBarRightGroup.png differ
diff --git a/Content/Slate/Starship/EditorViewport/TranslateRotate2D.svg b/Content/Slate/Starship/EditorViewport/TranslateRotate2D.svg
new file mode 100644
index 0000000..43b8f2b
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/TranslateRotate2D.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.72" d="M15.4 10.5001L12 8.0001V10.0001H6V4.0001H8L5.5 0.600098L3 4.0001H5V11.0001H12V13.0001L15.4 10.5001Z" fill="white"/>
+<path opacity="0.5" d="M5.5 15.5C8.26142 15.5 10.5 13.2614 10.5 10.5C10.5 7.73858 8.26142 5.5 5.5 5.5C2.73858 5.5 0.5 7.73858 0.5 10.5C0.5 13.2614 2.73858 15.5 5.5 15.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/TranslateRotate3D.svg b/Content/Slate/Starship/EditorViewport/TranslateRotate3D.svg
new file mode 100644
index 0000000..b61fb20
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/TranslateRotate3D.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.72" d="M7.49985 1.37988C6.09165 1.37988 4.71504 1.79746 3.54417 2.57982C2.37329 3.36217 1.46075 4.47417 0.921851 5.77518C0.382955 7.07619 0.241973 8.50777 0.516699 9.88892C0.791426 11.2701 1.46956 12.5387 2.46531 13.5345C3.46106 14.5302 4.72967 15.2083 6.11082 15.4831C7.49196 15.7578 8.92358 15.6168 10.2246 15.0779C11.5256 14.539 12.6375 13.6264 13.4199 12.4555C14.2023 11.2847 14.6198 9.90808 14.6198 8.49988C14.6198 6.61154 13.8697 4.80053 12.5344 3.46527C11.1991 2.13001 9.3882 1.37988 7.49985 1.37988V1.37988ZM10.9999 10.9999V8.99988H7.99985V11.9999H9.99985L7.49985 14.9999L4.99985 11.9999H6.99985V8.99988H3.99985V10.9999L0.999854 8.49988L3.99985 5.99988V7.99988H6.99985V4.99988H4.99985L7.49985 1.99988L9.99985 4.99988H7.99985V7.99988H10.9999V5.99988L13.9999 8.49988L10.9999 10.9999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/angle.svg b/Content/Slate/Starship/EditorViewport/angle.svg
new file mode 100644
index 0000000..1eb6438
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/angle.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.5 13.5H1.5L8.5 2.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="bevel"/>
+<path d="M8.00002 13.5C8.20002 13 8.30002 12.5 8.30002 12C8.30002 10.1 7.00001 8.5 5.20001 8.1" stroke="white" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="bevel"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/camera.svg b/Content/Slate/Starship/EditorViewport/camera.svg
new file mode 100644
index 0000000..db77cab
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/camera.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.70792 13.5H1.29208C0.896042 13.5 0.5 13.203 0.5 12.7079V4.29208C0.5 3.89604 0.797033 3.5 1.29208 3.5H9.70792C10.104 3.5 10.5 3.79703 10.5 4.29208V12.7079C10.401 13.203 10.104 13.5 9.70792 13.5Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M14 6.4V10.6L11.2 8.7V8.4L14 6.4ZM15 4.5L10.2 7.8V9.1L15 12.4V4.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/globe.svg b/Content/Slate/Starship/EditorViewport/globe.svg
new file mode 100644
index 0000000..09d4e51
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/globe.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.49998 2.3C11 2.3 13.8 5.12258 13.8 8.55C13.8 11.9774 11 14.8 7.49998 14.8C3.99998 14.8 1.29999 11.9774 1.29999 8.55C1.29999 5.12258 3.99998 2.3 7.49998 2.3Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M7.54999 14.2C8.79263 14.2 9.79999 11.6256 9.79999 8.45C9.79999 5.27436 8.79263 2.7 7.54999 2.7C6.30735 2.7 5.29999 5.27436 5.29999 8.45C5.29999 11.6256 6.30735 14.2 7.54999 14.2Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M1.5 8.5H13.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/grid.svg b/Content/Slate/Starship/EditorViewport/grid.svg
new file mode 100644
index 0000000..a305ef5
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/grid.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.5 6.5H13.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M1.5 10.5H13.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M5.5 14.5V2.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M9.5 14.5V2.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M12.7066 14.5H2.29339C1.8967 14.5 1.5 14.2025 1.5 13.7066V3.29339C1.5 2.89669 1.79752 2.5 2.29339 2.5H12.7066C13.1033 2.5 13.5 2.79752 13.5 3.29339V13.7066C13.4008 14.2025 13.1033 14.5 12.7066 14.5Z" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/menu.svg b/Content/Slate/Starship/EditorViewport/menu.svg
new file mode 100644
index 0000000..ec1ed8c
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/menu.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5 4.5H2.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="bevel"/>
+<path d="M12.5 8.5H2.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="bevel"/>
+<path d="M12.5 12.5H2.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="bevel"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/pilot.svg b/Content/Slate/Starship/EditorViewport/pilot.svg
new file mode 100644
index 0000000..fc04532
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/pilot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19 20"><defs><style>.cls-1{opacity:0.8;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-3{fill-rule:evenodd;}.cls-4{opacity:0.5;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_2-2" data-name="Layer 2"><g class="cls-1"><rect class="cls-2" width="19" height="20" transform="translate(19 20) rotate(-180)"/><polygon class="cls-3" points="8 15 8 3 9.5 0 11 3 11 15 10 19 9 19 8 15"/><polygon class="cls-4" points="0.06 10.11 9.06 6 9.94 6 18.94 10.11 18.94 12 0.06 12 0.06 10.11"/><polygon class="cls-4" points="4 18 8.33 15 10.67 15 15 18 15 19 4 19 4 18"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/EditorViewport/quad.svg b/Content/Slate/Starship/EditorViewport/quad.svg
new file mode 100644
index 0000000..5a7074b
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/quad.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.8058 13.5H2.29336C1.89666 13.5 1.49997 13.203 1.49997 12.7079V4.29208C1.49997 3.89605 1.79749 3.50001 2.29336 3.50001H12.7066C13.1033 3.50001 13.5 3.79704 13.5 4.29208V12.7079C13.5 13.203 13.2024 13.5 12.8058 13.5Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M7.5 3.5V13.5" stroke="white" stroke-miterlimit="10"/>
+<path d="M1.5 8.5H13.5" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/rotate.svg b/Content/Slate/Starship/EditorViewport/rotate.svg
new file mode 100644
index 0000000..57f5e24
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/rotate.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 3.5V8H9.5L14 3.5Z" fill="white"/>
+<path d="M5.5 9H1V13.5L5.5 9Z" fill="white"/>
+<path d="M2.40002 10C3.00002 12.2 5.10002 13.9 7.50002 13.9C9.90002 13.9 12 12.3 12.6 10" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M12.6 7C12 4.8 9.90002 3.1 7.50002 3.1C5.10002 3.1 3.00002 4.8 2.40002 7" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/scale-grid-snap.svg b/Content/Slate/Starship/EditorViewport/scale-grid-snap.svg
new file mode 100644
index 0000000..bf7990d
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/scale-grid-snap.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.7 7.8L13 3L8.20001 3.3L12.7 7.8Z" fill="white"/>
+<path d="M5 11H2V14H5V11Z" fill="white"/>
+<path d="M6.5 9.5L11.5 4.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/scale.svg b/Content/Slate/Starship/EditorViewport/scale.svg
new file mode 100644
index 0000000..316080a
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/scale.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.5 3.5H3.3C2.9 3.5 2.5 3.8 2.5 4.3V6.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M9.5 13.5H11.7C12.1 13.5 12.5 13.2 12.5 12.7V10.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M9.5 4.5L6 10L11.5 6.5L13 8V3H8L9.5 4.5Z" fill="white"/>
+<path d="M5 11H2V14H5V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/select.svg b/Content/Slate/Starship/EditorViewport/select.svg
new file mode 100644
index 0000000..b8d3460
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/select.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.28 8.94568L9.78 5.05282L5.28 1.15996L5.42286 13.0886L8.06571 9.44567L10.5657 14.7314L12.4943 13.8743L9.92286 8.58853L14.28 8.94568Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/speed.svg b/Content/Slate/Starship/EditorViewport/speed.svg
new file mode 100644
index 0000000..99ffd0a
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/speed.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 10.7L15.6 7.5L12 4.3V10.7Z" fill="white"/>
+<path d="M3.5 7.5H13.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M7 6L9.9 3.5L7 1V6Z" fill="white"/>
+<path d="M1.5 3.5H8.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M7 15L9.9 12.5L7 10V15Z" fill="white"/>
+<path d="M1.5 12.5H8.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/square.svg b/Content/Slate/Starship/EditorViewport/square.svg
new file mode 100644
index 0000000..762d712
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/square.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.8058 13.5H2.29339C1.89669 13.5 1.5 13.203 1.5 12.7079V4.29208C1.5 3.89604 1.79752 3.5 2.29339 3.5H12.7066C13.1033 3.5 13.5 3.79703 13.5 4.29208V12.7079C13.5 13.203 13.2025 13.5 12.8058 13.5Z" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/surface-snap.svg b/Content/Slate/Starship/EditorViewport/surface-snap.svg
new file mode 100644
index 0000000..2c11111
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/surface-snap.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 14.6L14.4 11.7L11.2 9.7L12 14.6Z" fill="white"/>
+<path d="M6.19998 5L4.39999 1.7L1.29999 4L6.19998 5Z" fill="white"/>
+<path d="M10.7 8.8L11 5L7.20001 5.3L10.7 8.8Z" fill="white"/>
+<path d="M3.79999 4.2L2.79999 8.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M5.90002 10.1L9.00002 7" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M12 12.1L7.59998 12.8" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M1 8.5C4.8 8.5 7.5 11.2 7.5 15" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/EditorViewport/translate.svg b/Content/Slate/Starship/EditorViewport/translate.svg
new file mode 100644
index 0000000..b3b0f44
--- /dev/null
+++ b/Content/Slate/Starship/EditorViewport/translate.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5 5L7.5 2L10 5H5Z" fill="white"/>
+<path d="M5 12L7.5 15L10 12H5Z" fill="white"/>
+<path d="M11 6L14 8.5L11 11V6Z" fill="white"/>
+<path d="M4 6L1 8.5L4 11V6Z" fill="white"/>
+<path d="M7.5 4.5V12.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M3.5 8.5H11.5" stroke="white" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/FontEditor/FontBackground.svg b/Content/Slate/Starship/FontEditor/FontBackground.svg
new file mode 100644
index 0000000..036e146
--- /dev/null
+++ b/Content/Slate/Starship/FontEditor/FontBackground.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 8.33008H5.32996V9.51001C5.07933 9.5822 4.86292 9.74181 4.71997 9.95996C4.68337 10.004 4.63754 10.0396 4.58569 10.064C4.53384 10.0883 4.47732 10.1008 4.42004 10.1008C4.36277 10.1008 4.30612 10.0883 4.25427 10.064C4.20242 10.0396 4.15659 10.004 4.12 9.95996C4.02664 9.82953 3.98399 9.66961 4 9.51001V7H13.33V9.51001C13.3489 9.66837 13.3098 9.82818 13.22 9.95996C13.1833 10.0039 13.1374 10.0393 13.0856 10.0635C13.0337 10.0877 12.9773 10.1002 12.92 10.1001C12.8613 10.101 12.803 10.0889 12.7494 10.0647C12.6958 10.0405 12.6482 10.0046 12.61 9.95996C12.467 9.74181 12.2506 9.5822 12 9.51001V8.33008H9.32996V15H16V12.3301H13.33V11H16V1H0V15H8V8.33008Z" fill="white"/>
+<path opacity="0.5" d="M11.68 18.8799C11.5561 18.971 11.4031 19.0138 11.25 19H6.07993C5.92973 19.0152 5.7795 18.9721 5.66 18.8799C5.61816 18.8399 5.58496 18.7919 5.56259 18.7385C5.54022 18.6852 5.52915 18.6279 5.53 18.5701C5.52718 18.512 5.53741 18.454 5.55991 18.4004C5.5824 18.3468 5.61659 18.2987 5.66 18.26C5.85839 18.1122 6.00523 17.9058 6.07993 17.6699H7.99997V15H9.32993V17.6699H11.25C11.3227 17.9094 11.4743 18.1175 11.68 18.26C11.7219 18.2999 11.7549 18.348 11.7773 18.4014C11.7997 18.4547 11.8109 18.5122 11.81 18.5701C11.8074 18.6861 11.7609 18.7966 11.68 18.8799ZM17.3299 8.33008H16V19H18.67V17.6699H17.3299V12.3301H20V11H17.3299V8.33008Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/FontEditor/FontForeground.svg b/Content/Slate/Starship/FontEditor/FontForeground.svg
new file mode 100644
index 0000000..f634e7c
--- /dev/null
+++ b/Content/Slate/Starship/FontEditor/FontForeground.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8250:14781)">
+<path opacity="0.5" d="M16 1H0V15H16V1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.33 9.51001C13.3489 9.66837 13.3098 9.82818 13.22 9.95996C13.1833 10.0039 13.1374 10.0393 13.0856 10.0635C13.0337 10.0877 12.9773 10.1002 12.92 10.1001C12.8613 10.101 12.803 10.0889 12.7494 10.0647C12.6958 10.0405 12.6482 10.0046 12.61 9.95996C12.467 9.74181 12.2506 9.5822 12 9.51001V8.33008H9.32996V17.6699H11.25C11.3227 17.9094 11.4743 18.1175 11.6801 18.26C11.7219 18.2999 11.755 18.348 11.7773 18.4014C11.7997 18.4547 11.8109 18.5122 11.8101 18.5701C11.8074 18.6861 11.7609 18.7966 11.6801 18.8799C11.5562 18.971 11.4032 19.0138 11.25 19H6.07996C5.92976 19.0152 5.77953 18.9721 5.66004 18.8799C5.61819 18.8399 5.58499 18.7919 5.56262 18.7385C5.54025 18.6852 5.52918 18.6279 5.53003 18.5701C5.52721 18.512 5.53744 18.454 5.55994 18.4004C5.58243 18.3468 5.61662 18.2987 5.66004 18.26C5.85842 18.1122 6.00526 17.9058 6.07996 17.6699H8V8.33008H5.32996V9.51001C5.07934 9.5822 4.86292 9.74181 4.71997 9.95996C4.68337 10.004 4.63754 10.0396 4.5857 10.064C4.53385 10.0883 4.47732 10.1008 4.42005 10.1008C4.36277 10.1008 4.30612 10.0883 4.25427 10.064C4.20242 10.0396 4.15659 10.004 4.12 9.95996C4.02664 9.82953 3.98399 9.66961 4 9.51001V7H13.33V9.51001ZM20 12.3301H17.33V17.6699H18.67V19H16V12.3301H13.33V11H16V8.33008H17.33V11H20V12.3301Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_8250:14781">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/AdjustKeyLockFrame_20.svg b/Content/Slate/Starship/GenericCurveEditor/AdjustKeyLockFrame_20.svg
new file mode 100644
index 0000000..4ed9752
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/AdjustKeyLockFrame_20.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 5H13L10 0.5L7 5H9V15H7L10 19.5L13 15H11V5Z" fill="white"/>
+<path opacity="0.5" d="M7 9H5V7L0.5 10L5 13V11H7V9Z" fill="white"/>
+<path opacity="0.5" d="M19.5 10L15 7V9H13V11H15V13L19.5 10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/AdjustKeyLockValue_20.svg b/Content/Slate/Starship/GenericCurveEditor/AdjustKeyLockValue_20.svg
new file mode 100644
index 0000000..74feafb
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/AdjustKeyLockValue_20.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M11 7V5H13L10 0.5L7 5H9V7H11Z" fill="white"/>
+<path opacity="0.5" d="M10 19.5L13 15H11V13H9V15H7L10 19.5Z" fill="white"/>
+<path d="M15 11V13L19.5 10L15 7V9H5V7L0.5 10L5 13V11H15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/AdjustKeyMoveFree_20.svg b/Content/Slate/Starship/GenericCurveEditor/AdjustKeyMoveFree_20.svg
new file mode 100644
index 0000000..de205de
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/AdjustKeyMoveFree_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 5H13L10 0.5L7 5H9V15H7L10 19.5L13 15H11V5Z" fill="white"/>
+<path d="M15 11V13L19.5 10L15 7V9H5V7L0.5 10L5 13V11H15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/AdjustKeySnapFrameHorizontal.svg b/Content/Slate/Starship/GenericCurveEditor/AdjustKeySnapFrameHorizontal.svg
new file mode 100644
index 0000000..788c61c
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/AdjustKeySnapFrameHorizontal.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 10H12V12H14V10Z" fill="white"/>
+<path d="M8 10H6V12H8V10Z" fill="white"/>
+<path d="M12.3002 7.0001C12.3002 7.5001 12.1002 8.9001 12.0002 9.4001H14.0002C14.1002 9.0001 14.3002 7.3001 14.3002 6.7001C14.3002 5.6001 14.0002 2.1001 10.0002 2.1001C6.0002 2.1001 5.7002 5.6001 5.7002 6.6001C5.7002 7.2001 6.0002 8.9001 6.0002 9.4001H8.0002C7.9002 8.9001 7.7002 7.5001 7.7002 7.0001C7.7002 4.9001 8.5002 4.0001 10.0002 4.0001C11.5002 4.0001 12.3002 4.9001 12.3002 7.0001Z" fill="white"/>
+<path opacity="0.5" d="M15 17V19L19.5 16L15 13V15H5V13L0.5 16L5 19V17H15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/AdjustKeySnapFrameVertical.svg b/Content/Slate/Starship/GenericCurveEditor/AdjustKeySnapFrameVertical.svg
new file mode 100644
index 0000000..8254b89
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/AdjustKeySnapFrameVertical.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 12H8V14H10V12Z" fill="white"/>
+<path d="M10 6H8V8H10V6Z" fill="white"/>
+<path d="M13.0001 12.3C12.5001 12.3 11.1001 12.1 10.6001 12V14C11.0001 14.1 12.7001 14.3 13.3001 14.3C14.4001 14.3 17.9001 14 17.9001 9.99995C17.9001 5.99995 14.4001 5.69995 13.4001 5.69995C12.8001 5.69995 11.1001 5.99995 10.6001 5.99995V7.99995C11.0001 7.89995 12.4001 7.69995 12.9001 7.69995C15.0001 7.69995 15.9001 8.49995 15.9001 9.99995C16.0001 11.5 15.1001 12.3 13.0001 12.3Z" fill="white"/>
+<path opacity="0.5" d="M3 15H1L4 19.5L7 15H5V5H7L4 0.5L1 5H3V15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/CurveEditor.svg b/Content/Slate/Starship/GenericCurveEditor/CurveEditor.svg
new file mode 100644
index 0000000..cb9018e
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/CurveEditor.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M0 0V19H19V0H0ZM12 1V6H7V1H12ZM12 12H7V7H12V12ZM13 7H18V12H13V7ZM6 12H1V7H6V12ZM6 1V6H1V1H6ZM1 18V13H6V18H1ZM7 18V13H12V18H7ZM13 18V13H18V18H13ZM18 6H13V1H18V6Z" fill="white"/>
+<path d="M18.9998 7.45007L18.5398 8.45007L18.3599 8.88013C17.7599 10.3201 16.7497 12.7301 13.4797 12.7301C12.0197 12.7301 10.7299 11.0501 9.36987 9.27014C7.72987 7.13014 6.02971 4.91016 3.44971 4.91016C2.18493 4.91091 0.963172 5.36901 0.00976562 6.20007V9.67017C0.879766 8.28017 1.92971 7.16016 3.44971 7.16016C4.96971 7.16016 6.20983 8.85014 7.57983 10.6401C9.21983 12.7801 10.9097 14.9901 13.4797 14.9901C14.5465 15.0317 15.6074 14.8131 16.5708 14.3531C17.5342 13.8932 18.3713 13.2057 19.0098 12.3501L18.9998 7.45007Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/CurveEditorTab.svg b/Content/Slate/Starship/GenericCurveEditor/CurveEditorTab.svg
new file mode 100644
index 0000000..0e47a67
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/CurveEditorTab.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 5.90002L15.5 7.03003C15.02 8.17003 14.2299 10.03 11.6399 10.03C10.4799 10.03 9.45988 8.70004 8.37988 7.29004C7.07988 5.60004 5.74996 3.85999 3.70996 3.85999C2.96494 3.89157 2.23871 4.10263 1.59277 4.47522C0.94684 4.84781 0.40036 5.3709 0 6V9.37C0.12 9.19 0.249912 8.95003 0.409912 8.66003C1.21991 7.15003 2.14996 5.66003 3.70996 5.66003C4.87996 5.66003 5.90999 6.99003 6.98999 8.41003C8.27999 10.09 9.60989 11.83 11.6399 11.83C12.4818 11.8624 13.3191 11.6891 14.0789 11.325C14.8386 10.9608 15.498 10.4167 16 9.73999V5.90002Z" fill="white"/>
+<path opacity="0.5" d="M15 0H0V16H16V0H15ZM10 1V5H6V1H10ZM6 6H10V10H6V6ZM5 10H1V6H5V10ZM5 1V5H1V1H5ZM1 15V11H5V15H1ZM6 15V11H10V15H6ZM15 15H11V11H15V15ZM15 10H11V6H15V10ZM15 5H11V1H15V5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/FramingAll.svg b/Content/Slate/Starship/GenericCurveEditor/FramingAll.svg
new file mode 100644
index 0000000..99a0b1a
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/FramingAll.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 19H13V18H18V13H19V19Z" fill="white"/>
+<path d="M7 19H1V13H2V18H7V19Z" fill="white"/>
+<path d="M2 7H1V1H7V2H2V7Z" fill="white"/>
+<path d="M19 7H18V2H13V1H19V7Z" fill="white"/>
+<path opacity="0.5" d="M9.6001 5.4001L11.1001 6.8001L8.9001 8.9001L6.8001 11.1001L5.4001 9.6001L5.1001 14.9001L10.4001 14.6001L8.9001 13.2001L11.1001 11.1001L13.2001 8.9001L14.6001 10.4001L14.9001 5.1001L9.6001 5.4001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/FramingHorizontal.svg b/Content/Slate/Starship/GenericCurveEditor/FramingHorizontal.svg
new file mode 100644
index 0000000..559b16b
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/FramingHorizontal.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 1V2H18V12V13V18H15V19H19V14V12V1H15Z" fill="white"/>
+<path d="M2 15V2H5V1H1V16V17V19H5V18H2V17V15Z" fill="white"/>
+<path opacity="0.5" d="M17 9.5L13 6V8H10H7V6L3 9.5L7 13V11H10H13V13L17 9.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/FramingPlayback.svg b/Content/Slate/Starship/GenericCurveEditor/FramingPlayback.svg
new file mode 100644
index 0000000..0669d64
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/FramingPlayback.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 12L10 16L13 12V4H7V12Z" fill="white"/>
+<path opacity="0.5" d="M19 19H13V18H18V13H19V19ZM7 18H2V13H1V19H7V18ZM2 2H7V1H1V7H2V2ZM19 1H13V2H18V7H19V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/FramingSelected.svg b/Content/Slate/Starship/GenericCurveEditor/FramingSelected.svg
new file mode 100644
index 0000000..53e11d9
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/FramingSelected.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M19 19H13V18H18V13H19V19ZM7 18H2V13H1V19H7V18ZM2 2H7V1H1V7H2V2ZM19 1H13V2H18V7H19V1Z" fill="white"/>
+<path d="M15 11.1L7 4.30005L7.1 14.8L10.1 10.7L15 11.1Z" fill="white"/>
+<path d="M10.1786 8.74973L8.46631 9.573L11.6727 16.2419L13.385 15.4186L10.1786 8.74973Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/FramingTimeRange.svg b/Content/Slate/Starship/GenericCurveEditor/FramingTimeRange.svg
new file mode 100644
index 0000000..6a34e92
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/FramingTimeRange.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 7H5V13H8V15H4V5H8V7Z" fill="white"/>
+<path d="M12 5H16V15H12V13H15V7H12V5Z" fill="white"/>
+<path opacity="0.5" d="M19 19H13V18H18V13H19V19ZM7 18H2V13H1V19H7V18ZM2 2H7V1H1V7H2V2ZM19 1H13V2H18V7H19V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/FramingVertical.svg b/Content/Slate/Starship/GenericCurveEditor/FramingVertical.svg
new file mode 100644
index 0000000..e6a84ca
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/FramingVertical.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 1H3H1V5H2V2H4H6H18V5H19V1H6Z" fill="white"/>
+<path d="M18 15V18H10H5H2V15H1V19H4H10.2H19V15H18Z" fill="white"/>
+<path opacity="0.5" d="M11 10V7H13L9.5 3L6 7H8V10V13H6L9.5 17L13 13H11V10Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/GraphViewAbsolute_20.svg b/Content/Slate/Starship/GenericCurveEditor/GraphViewAbsolute_20.svg
new file mode 100644
index 0000000..b84ecd9
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/GraphViewAbsolute_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 9.8C1.48387 8.9 2.83871 6.5 5.45161 6.5C9.22581 6.5 11.0645 13.6 14.8387 13.6C17.4516 13.6 18.5161 11.3 19 10.1" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M1 10.0481C1.29032 6.00535 2.06452 1 5.25807 1C9.70968 1 9.90323 19 14.4516 19C18.7097 19 18.4194 8.123 19 5.13904" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/GraphViewNormalized_20.svg b/Content/Slate/Starship/GenericCurveEditor/GraphViewNormalized_20.svg
new file mode 100644
index 0000000..3fb13e5
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/GraphViewNormalized_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M1.5 10.9001C1.7 7.1001 2.1 1.6001 4.5 1.6001C7.7 1.6001 7.9 18.5001 11.2 18.5001C14.3 18.5001 14.1 8.2001 14.5 5.4001" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+<path d="M5.5 10.9001C5.7 7.1001 6.1 1.6001 8.5 1.6001C11.7 1.6001 11.9 18.5001 15.2 18.5001C18.3 18.5001 18.1 8.2001 18.5 5.4001" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/GraphViewStack_20.svg b/Content/Slate/Starship/GenericCurveEditor/GraphViewStack_20.svg
new file mode 100644
index 0000000..8166b37
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/GraphViewStack_20.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M18.8002 4.5C18.4002 3.7 17.1002 1.5 14.6002 1.5C11.0002 1.5 9.3002 8 5.7002 8C3.2002 8 1.8002 5.9 1.2002 4.8" stroke="white" stroke-opacity="0.5" stroke-width="1.25" stroke-miterlimit="10"/>
+<path d="M18.7998 9.5C18.3998 8.7 17.0998 6.5 14.5998 6.5C10.9998 6.5 9.2998 13 5.6998 13C3.1998 13 1.7998 10.8 1.2998 9.8" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+<path d="M18.7998 14.5C18.3998 13.7 17.0998 11.5 14.5998 11.5C10.9998 11.5 9.2998 18 5.6998 18C3.1998 18 1.7998 15.8 1.2998 14.8" stroke="white" stroke-opacity="0.5" stroke-width="1.25" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/MiscFilters.svg b/Content/Slate/Starship/GenericCurveEditor/MiscFilters.svg
new file mode 100644
index 0000000..94172cd
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/MiscFilters.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11 0H9V20H11V0Z" fill="white"/>
+<path opacity="0.5" d="M9.9998 8.6C9.6998 8.6 9.3998 8.7 9.1998 8.8C8.5998 9.1 8.2998 9.6 7.9998 10C7.4998 10.9 7.1998 11.8 6.9998 12.7C6.7998 13.6 6.5998 14.6 6.2998 15.3C6.1998 14.9 6.0998 14.5 5.9998 14.1C5.6998 12.3 5.5998 10.4 5.3998 8.6C5.2998 7.7 5.1998 6.7 4.9998 5.8C4.8998 5.3 4.7998 4.9 4.4998 4.3C4.4998 4.2 4.3998 4.2 4.3998 4.1C4.3998 4 4.2998 4 4.1998 3.9C3.9998 3.8 3.5998 3.7 3.3998 3.8C2.8998 4.1 2.8998 4.4 2.7998 4.7C2.4998 5.7 2.3998 6.6 2.2998 7.6C2.1998 8.5 2.0998 9.4 1.9998 10.3C1.9998 10.7 1.8998 11.2 1.7998 11.5C1.7998 11.6 1.6998 11.6 1.7998 11.6C1.8998 11.6 1.7998 11.6 1.7998 11.6C1.6998 11.6 1.5998 11.4 1.4998 11.2C1.0998 10.4 0.999805 9.5 0.799805 8.6C0.799805 9.5 0.799802 10.5 0.999802 11.4C1.0998 11.6 1.1998 11.9 1.4998 12.1C1.6998 12.2 1.8998 12.3 2.0998 12.2C2.2998 12.1 2.3998 11.9 2.4998 11.8C2.7998 11.3 2.8998 10.8 2.9998 10.4C3.1998 9.5 3.1998 8.5 3.2998 7.6C3.3998 6.7 3.4998 5.7 3.6998 5V4.9C3.7998 5.2 3.9998 5.6 3.9998 6C4.1998 6.9 4.2998 7.8 4.3998 8.7C4.5998 10.5 4.7998 12.4 4.9998 14.3C5.0998 14.8 5.1998 15.2 5.2998 15.7C5.2998 15.8 5.3998 16 5.4998 16.1C5.4998 16.2 5.6998 16.3 5.7998 16.4C5.9998 16.5 6.1998 16.5 6.2998 16.5C6.8998 16.4 6.9998 16 7.0998 15.8C7.4998 14.8 7.6998 13.9 7.8998 13C8.0998 12.1 8.3998 11.2 8.7998 10.5C8.9998 10.1 9.2998 9.9 9.5998 9.7C9.6998 9.6 9.7998 9.6 9.9998 9.6V8.6Z" fill="white"/>
+<path d="M15.7 11C15.3 11 15 11 14.6 10.8C14.2 10.6 13.9 10.4 13.5 10.1C12.8 9.6 12 8.9 10.9 8.7C10.6 8.6 10.3 8.6 10 8.6V9.6C10.2 9.6 10.4 9.6 10.7 9.6C11.5 9.8 12.2 10.3 12.9 10.9C13.3 11.2 13.7 11.5 14.2 11.7C14.7 11.9 15.3 12 15.8 11.9C16.3 11.8 16.8 11.7 17.3 11.4C17.7 11.1 18.1 10.7 18.4 10.3C19 9.5 19.2 8.6 19.6 7.7C19 8.4 18.6 9.3 18 9.9C17.3 10.7 16.5 11 15.7 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/MiscFlatten.svg b/Content/Slate/Starship/GenericCurveEditor/MiscFlatten.svg
new file mode 100644
index 0000000..109dd7f
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/MiscFlatten.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2 13.5H18" stroke="white" stroke-miterlimit="10"/>
+<path d="M6.53521 13.5713L10 17.0361L13.4648 13.5713L10 10.1066L6.53521 13.5713Z" fill="white"/>
+<path d="M2.5001 15.4001C3.54944 15.4001 4.4001 14.5494 4.4001 13.5001C4.4001 12.4508 3.54944 11.6001 2.5001 11.6001C1.45076 11.6001 0.600098 12.4508 0.600098 13.5001C0.600098 14.5494 1.45076 15.4001 2.5001 15.4001Z" fill="white"/>
+<path d="M17.5001 15.4001C18.5494 15.4001 19.4001 14.5494 19.4001 13.5001C19.4001 12.4508 18.5494 11.6001 17.5001 11.6001C16.4508 11.6001 15.6001 12.4508 15.6001 13.5001C15.6001 14.5494 16.4508 15.4001 17.5001 15.4001Z" fill="white"/>
+<path opacity="0.5" d="M4 2H2V5H0L3 9.5L6 5H4V2Z" fill="white"/>
+<path opacity="0.5" d="M18 2H16V5H14L17 9.5L20 5H18V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/MiscStraighten.svg b/Content/Slate/Starship/GenericCurveEditor/MiscStraighten.svg
new file mode 100644
index 0000000..29772f6
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/MiscStraighten.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.53521 10.0708L10 13.5356L13.4648 10.0708L10 6.60602L6.53521 10.0708Z" fill="white"/>
+<path d="M2.3999 5.19995L17.8999 15" stroke="white" stroke-width="1.0966" stroke-miterlimit="10"/>
+<path d="M1.8001 6.59995C2.73898 6.59995 3.5001 5.83884 3.5001 4.89995C3.5001 3.96107 2.73898 3.19995 1.8001 3.19995C0.861214 3.19995 0.100098 3.96107 0.100098 4.89995C0.100098 5.83884 0.861214 6.59995 1.8001 6.59995Z" fill="white"/>
+<path d="M18.2 16.7999C19.1389 16.7999 19.9 16.0388 19.9 15.0999C19.9 14.161 19.1389 13.3999 18.2 13.3999C17.2611 13.3999 16.5 14.161 16.5 15.0999C16.5 16.0388 17.2611 16.7999 18.2 16.7999Z" fill="white"/>
+<path opacity="0.5" d="M2 17H4V14H6L3 9.5L0 14H2V17Z" fill="white"/>
+<path opacity="0.5" d="M18 3H16V6H14L17 10.5L20 6H18V3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PostInfinityConstant_20.svg b/Content/Slate/Starship/GenericCurveEditor/PostInfinityConstant_20.svg
new file mode 100644
index 0000000..808d6d0
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PostInfinityConstant_20.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M21 6.5H10" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M10.5 6.5L1.5 15.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PostInfinityCycle_20.svg b/Content/Slate/Starship/GenericCurveEditor/PostInfinityCycle_20.svg
new file mode 100644
index 0000000..394abe7
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PostInfinityCycle_20.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 13.5C7 13.5 3 5.5 10 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M10 13.5C17 13.5 13 5.5 20 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M11 12H10V11H11V12ZM11 10H10V9H11V10ZM11 8H10V7H11V8ZM11 6H10V5H11V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PostInfinityLinear_20.svg b/Content/Slate/Starship/GenericCurveEditor/PostInfinityLinear_20.svg
new file mode 100644
index 0000000..c8b79b6
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PostInfinityLinear_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10.5 10.5L18.5 2.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M2.5 18.5L10.5 10.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PostInfinityMultipleSelected_20.svg b/Content/Slate/Starship/GenericCurveEditor/PostInfinityMultipleSelected_20.svg
new file mode 100644
index 0000000..33c2d74
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PostInfinityMultipleSelected_20.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.25 16.5C2.52 16.36 2.78 16.22 3.03 16.11L3.4 15.9399L3.73 15.72C4.21 15.65 4.63 15.46 4.99 15.21C5.71 14.72 6.06 13.8199 6.39 12.7899C6.57 12.2699 6.74 11.7199 7.04 11.1799L7.27 10.7799L7.57 10.41C7.76 10.14 8.03 9.95996 8.29 9.75996C8.82 9.39996 9.42 9.16997 10.01 9.06997C10.33 9.07997 10.62 9.12993 10.91 9.22993C11.2 9.30993 11.48 9.40996 11.75 9.50996C11.48 9.64996 11.22 9.77995 10.97 9.89995L10.6 10.07L10.27 10.2899C9.79 10.3699 9.36 10.5499 9 10.7899C8.27 11.2799 7.9 12.1599 7.58 13.1799C7.26 14.1799 6.82 15.4599 5.72 16.2299C5.2 16.5999 4.59 16.83 4.01 16.95C3.69 16.94 3.39 16.8899 3.1 16.7899C2.8 16.7099 2.52 16.61 2.25 16.5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 9.62998V16.37C0 18.38 1.63 20 3.63 20H10.37C12.38 20 14 18.37 14 16.37V9.62998C14 7.61998 12.37 6 10.37 6H3.63C1.63 6 0 7.62998 0 9.62998ZM10 19H4C2.34 19 1 17.66 1 16V10C1 8.34 2.34 7 4 7H10C11.66 7 13 8.34 13 10V16C13 17.66 11.66 19 10 19Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M17 14.73V6.63999C17 4.62999 15.37 3.01001 13.37 3.01001H5.28C5.1 3.01001 4.94 3.08 4.81 3.2L4 4.01001H13C14.66 4.01001 16 5.35001 16 7.01001V16.01L16.81 15.2C16.93 15.07 17 14.9 17 14.73Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M20 11.74V3.62998C20 1.61998 18.37 0 16.37 0H8.26C8.09 0 7.93 0.0699806 7.82 0.17998L7 1H16C17.66 1 19 2.34 19 4V13L19.82 12.18C19.93 12.07 20 11.91 20 11.74Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PostInfinityOffset_20.svg b/Content/Slate/Starship/GenericCurveEditor/PostInfinityOffset_20.svg
new file mode 100644
index 0000000..6f67cb0
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PostInfinityOffset_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 17.5C7 17.5 3 9.5 10 9.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M10 9.5C17 9.5 13 1.5 20 1.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PostInfinityOscillate_20.svg b/Content/Slate/Starship/GenericCurveEditor/PostInfinityOscillate_20.svg
new file mode 100644
index 0000000..b23197a
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PostInfinityOscillate_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 13.5C7 13.5 3 5.5 10 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M20 13.5C13 13.5 17 5.5 10 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PreInfinityConstant_20.svg b/Content/Slate/Starship/GenericCurveEditor/PreInfinityConstant_20.svg
new file mode 100644
index 0000000..7e97984
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PreInfinityConstant_20.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M0 6.5H11" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M10.5 6.5L19.5 15.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PreInfinityCycle_20.svg b/Content/Slate/Starship/GenericCurveEditor/PreInfinityCycle_20.svg
new file mode 100644
index 0000000..433fe06
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PreInfinityCycle_20.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 13.5C13 13.5 17 5.5 10 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M10 13.5C3 13.5 7 5.5 0 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M10 12H9V11H10V12ZM10 10H9V9H10V10ZM10 8H9V7H10V8ZM10 6H9V5H10V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PreInfinityLinear_20.svg b/Content/Slate/Starship/GenericCurveEditor/PreInfinityLinear_20.svg
new file mode 100644
index 0000000..233466d
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PreInfinityLinear_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M9.5 10.5L1.5 2.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path d="M17.5 18.5L9.5 10.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PreInfinityMultipleSelected_20.svg b/Content/Slate/Starship/GenericCurveEditor/PreInfinityMultipleSelected_20.svg
new file mode 100644
index 0000000..bc4b86f
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PreInfinityMultipleSelected_20.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.7498 16.5C11.4798 16.61 11.1998 16.7099 10.9098 16.7899C10.6198 16.8899 10.3198 16.94 9.99977 16.95C9.41977 16.83 8.80977 16.5999 8.28977 16.2299C7.18977 15.4599 6.74977 14.1799 6.42977 13.1799C6.09977 12.1499 5.72977 11.2699 5.00977 10.7899C4.64977 10.5499 4.21977 10.3699 3.73977 10.2899L3.40977 10.07L3.03977 9.89995C2.78977 9.77995 2.52977 9.64996 2.25977 9.50996C2.52977 9.40996 2.80977 9.30993 3.09977 9.22993C3.38977 9.12993 3.68977 9.07997 3.99977 9.06997C4.57977 9.16997 5.18977 9.40996 5.71977 9.75996C5.96977 9.95996 6.24977 10.14 6.43977 10.41L6.73977 10.7799L6.96977 11.1799C7.26977 11.7199 7.43976 12.2699 7.61977 12.7899C7.94977 13.8199 8.29977 14.72 9.01976 15.21C9.37977 15.46 9.79977 15.64 10.2798 15.72L10.6098 15.9399L10.9798 16.11C11.2198 16.22 11.4798 16.36 11.7498 16.5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M0 9.62998V16.37C0 18.38 1.63 20 3.63 20H10.37C12.38 20 14 18.37 14 16.37V9.62998C14 7.61998 12.37 6 10.37 6H3.63C1.63 6 0 7.62998 0 9.62998ZM10 19H4C2.34 19 1 17.66 1 16V10C1 8.34 2.34 7 4 7H10C11.66 7 13 8.34 13 10V16C13 17.66 11.66 19 10 19Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M17 14.73V6.63999C17 4.62999 15.37 3.01001 13.37 3.01001H5.27C5.09 3.01001 4.93 3.08 4.8 3.2L4 4H13C14.66 4 16 5.34 16 7V16L16.81 15.19C16.93 15.07 17 14.9 17 14.73Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M20 11.74V3.62998C20 1.61998 18.37 0 16.37 0H8.26C8.09 0 7.93 0.0699806 7.82 0.17998L7 1H16C17.66 1 19 2.34 19 4V13L19.82 12.18C19.93 12.07 20 11.91 20 11.74Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PreInfinityOffset_20.svg b/Content/Slate/Starship/GenericCurveEditor/PreInfinityOffset_20.svg
new file mode 100644
index 0000000..d40b8b4
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PreInfinityOffset_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 17.5C13 17.5 17 9.5 10 9.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M10 9.5C3 9.5 7 1.5 0 1.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/PreInfinityOscillate_20.svg b/Content/Slate/Starship/GenericCurveEditor/PreInfinityOscillate_20.svg
new file mode 100644
index 0000000..95fc4c4
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/PreInfinityOscillate_20.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 13.5C13 13.5 17 5.5 10 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M0 13.5C7 13.5 3 5.5 10 5.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/Select.svg b/Content/Slate/Starship/GenericCurveEditor/Select.svg
new file mode 100644
index 0000000..b8d3460
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/Select.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.28 8.94568L9.78 5.05282L5.28 1.15996L5.42286 13.0886L8.06571 9.44567L10.5657 14.7314L12.4943 13.8743L9.92286 8.58853L14.28 8.94568Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/TangentsConstant.svg b/Content/Slate/Starship/GenericCurveEditor/TangentsConstant.svg
new file mode 100644
index 0000000..9d6c6fa
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/TangentsConstant.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.965 15.5009L15.5005 19.0364L19.036 15.5009L15.5005 11.9654L11.965 15.5009Z" fill="white"/>
+<path d="M0.964988 4.50063L4.50049 8.03613L8.03599 4.50063L4.50049 0.965133L0.964988 4.50063Z" fill="white"/>
+<path opacity="0.5" d="M3.5 4.5H15.5V16.5" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/TangentsCubicAuto.svg b/Content/Slate/Starship/GenericCurveEditor/TangentsCubicAuto.svg
new file mode 100644
index 0000000..6b8640f
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/TangentsCubicAuto.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.46548 6.50039L10.001 10.0359L13.5365 6.50039L10.001 2.96489L6.46548 6.50039Z" fill="white"/>
+<path d="M1 6.5H19" stroke="white" stroke-miterlimit="10"/>
+<path d="M2.5001 8.39985C3.54944 8.39985 4.4001 7.54919 4.4001 6.49985C4.4001 5.45051 3.54944 4.59985 2.5001 4.59985C1.45076 4.59985 0.600098 5.45051 0.600098 6.49985C0.600098 7.54919 1.45076 8.39985 2.5001 8.39985Z" fill="white"/>
+<path d="M17.5001 8.39985C18.5494 8.39985 19.4001 7.54919 19.4001 6.49985C19.4001 5.45051 18.5494 4.59985 17.5001 4.59985C16.4508 4.59985 15.6001 5.45051 15.6001 6.49985C15.6001 7.54919 16.4508 8.39985 17.5001 8.39985Z" fill="white"/>
+<path opacity="0.5" d="M0.500237 18C0.400237 16.7 0.400237 15.4 0.700237 14.1C1.20024 12.9 1.80024 11.7 2.70024 10.6C3.60024 9.6 4.70024 8.7 6.00024 8.2C7.30024 7.7 8.60024 7.4 10.0002 7.4C11.3002 7.4 12.7002 7.6 14.0002 8.2C15.3002 8.7 16.4002 9.6 17.3002 10.6C18.2002 11.6 18.9002 12.8 19.3002 14.1C19.6002 15.4 19.7002 16.7 19.5002 18C19.1002 16.8 18.7002 15.6 18.1002 14.5C17.7002 13.4 17.1002 12.3 16.3002 11.4C14.8002 9.6 12.4002 8.6 10.0002 8.6C7.60024 8.6 5.20024 9.5 3.70024 11.4C2.90024 12.3 2.30024 13.4 1.90024 14.5C1.30024 15.6 0.900237 16.8 0.500237 18Z" fill="white"/>
+<path d="M8.5999 17.2L8.0999 19H6.3999L8.4999 12H10.5999L12.7999 19H11.0999L10.5999 17.2H8.5999ZM10.3999 16L9.9999 14.5C9.8999 14.1 9.7999 13.6 9.5999 13.1C9.4999 13.5 9.3999 14 9.2999 14.5L8.7999 16H10.3999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/TangentsCubicBreak.svg b/Content/Slate/Starship/GenericCurveEditor/TangentsCubicBreak.svg
new file mode 100644
index 0000000..c256786
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/TangentsCubicBreak.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.53521 10.5709L10 14.0356L13.4648 10.5709L10 7.10607L6.53521 10.5709Z" fill="white"/>
+<path d="M2.5001 5.4001C3.54944 5.4001 4.4001 4.54944 4.4001 3.5001C4.4001 2.45076 3.54944 1.6001 2.5001 1.6001C1.45076 1.6001 0.600098 2.45076 0.600098 3.5001C0.600098 4.54944 1.45076 5.4001 2.5001 5.4001Z" fill="white"/>
+<path d="M17.5001 5.4001C18.5494 5.4001 19.4001 4.54944 19.4001 3.5001C19.4001 2.45076 18.5494 1.6001 17.5001 1.6001C16.4508 1.6001 15.6001 2.45076 15.6001 3.5001C15.6001 4.54944 16.4508 5.4001 17.5001 5.4001Z" fill="white"/>
+<path d="M2.5 3.5L10 11L17.5 3.5" stroke="white" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M0.600098 19.6C0.300098 18.1 0.100098 16.6 0.100098 15C0.300098 13.5 0.500098 11.8 1.5001 10.4C2.0001 9.7 2.8001 9.1 3.8001 9C4.7001 8.9 5.5001 9 6.3001 9.3C7.8001 9.8 9.2001 10.7 10.4001 11.6H9.6001C10.8001 10.7 12.2001 9.9 13.7001 9.3C14.5001 9 15.3001 8.9 16.2001 9C17.1001 9.1 18.0001 9.7 18.5001 10.4C19.5001 11.8 19.7001 13.5 19.9001 15C19.8001 16.6 19.6001 18.1 19.4001 19.6C19.2001 18.1 19.0001 16.6 18.7001 15.1C18.6001 13.7 18.3001 12.2 17.6001 11.1C17.2001 10.6 16.7001 10.3 16.1001 10.2C15.5001 10.1 14.8001 10.2 14.2001 10.4C12.9001 10.9 11.6001 11.6 10.4001 12.5L10.0001 12.9L9.6001 12.6C8.4001 11.7 7.2001 11 5.8001 10.5C5.1001 10.3 4.5001 10.2 3.9001 10.3C3.3001 10.4 2.8001 10.7 2.4001 11.2C1.7001 12.2 1.4001 13.7 1.3001 15.2C1.0001 16.5 0.900098 18 0.600098 19.6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/TangentsCubicUser.svg b/Content/Slate/Starship/GenericCurveEditor/TangentsCubicUser.svg
new file mode 100644
index 0000000..f92da47
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/TangentsCubicUser.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M0 7.2C0.5 6.3 1.6 5.7 2.6 5.4C3.7 5.3 4.8 5.4 5.8 5.7C7.8 6.3 9.7 7.3 11.2 8.8C12.7 10.3 13.8 12.2 14.3 14.2C14.6 15.2 14.7 16.3 14.6 17.4C14.3 18.5 13.7 19.5 12.8 20C13.3 19.1 13.4 18.2 13.4 17.2C13.5 16.3 13.4 15.4 13.2 14.5C12.7 12.7 11.8 11 10.4 9.7C9 8.4 7.3 7.4 5.5 6.9C4.6 6.7 3.6 6.6 2.7 6.7C1.8 6.6 0.9 6.7 0 7.2Z" fill="white"/>
+<path d="M6.6001 2.59985L17.4001 13.3999" stroke="white" stroke-width="0.75" stroke-miterlimit="10"/>
+<path d="M6.0002 3.79995C6.99431 3.79995 7.8002 2.99406 7.8002 1.99995C7.8002 1.00584 6.99431 0.199951 6.0002 0.199951C5.00608 0.199951 4.2002 1.00584 4.2002 1.99995C4.2002 2.99406 5.00608 3.79995 6.0002 3.79995Z" fill="white"/>
+<path d="M18.0002 15.8C18.9943 15.8 19.8002 14.9941 19.8002 14C19.8002 13.0058 18.9943 12.2 18.0002 12.2C17.0061 12.2 16.2002 13.0058 16.2002 14C16.2002 14.9941 17.0061 15.8 18.0002 15.8Z" fill="white"/>
+<path d="M8.53521 8.07085L12 11.5356L15.4648 8.07085L12 4.60607L8.53521 8.07085Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/TangentsLinear.svg b/Content/Slate/Starship/GenericCurveEditor/TangentsLinear.svg
new file mode 100644
index 0000000..aa2a117
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/TangentsLinear.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.57085 7.96455L8.03564 4.49976L4.57085 1.03497L1.10606 4.49976L4.57085 7.96455Z" fill="white"/>
+<path d="M15.5713 18.9645L19.0361 15.4998L15.5713 12.035L12.1066 15.4998L15.5713 18.9645Z" fill="white"/>
+<path opacity="0.5" d="M4 4L16 16" stroke="white" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/TangentsWeighted.svg b/Content/Slate/Starship/GenericCurveEditor/TangentsWeighted.svg
new file mode 100644
index 0000000..5f9e6a7
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/TangentsWeighted.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M2.5001 19.5C2.2001 18.1 2.1001 16.8 2.1001 15.4C2.2001 14 2.5001 12.7 2.9001 11.3C3.3001 10 3.8001 8.5 5.2001 7.5C5.5001 7.3 5.9001 7.1 6.3001 7C6.7001 6.9 7.1001 6.9 7.5001 6.9C8.2001 6.9 8.9001 7.1 9.6001 7.2C12.4001 8 14.7001 9.8 16.6001 11.9C17.5001 13 18.3001 14.1 19.0001 15.4C19.5001 16.7 19.8001 18.2 19.6001 19.5C19.2001 18.2 18.6001 17 17.8001 15.9C17.2001 14.7 16.5001 13.7 15.6001 12.7C13.9001 10.7 11.7001 9.1 9.3001 8.4C8.7001 8.2 8.1001 8.1 7.4001 8.1C6.8001 8 6.3001 8.2 5.9001 8.5C5.0001 9.1 4.5001 10.4 4.1001 11.6C3.7001 12.8 3.5001 14.2 3.4001 15.5C3.0001 16.8 2.8001 18.1 2.5001 19.5Z" fill="white"/>
+<path d="M4.46596 5.50088L8.00146 9.03638L11.537 5.50088L8.00146 1.96538L4.46596 5.50088Z" fill="white"/>
+<path d="M1 5.5H19" stroke="white" stroke-miterlimit="10"/>
+<path d="M2.5001 7.39985C3.54944 7.39985 4.4001 6.54919 4.4001 5.49985C4.4001 4.45051 3.54944 3.59985 2.5001 3.59985C1.45076 3.59985 0.600098 4.45051 0.600098 5.49985C0.600098 6.54919 1.45076 7.39985 2.5001 7.39985Z" fill="white"/>
+<path d="M17.5001 7.39985C18.5494 7.39985 19.4001 6.54919 19.4001 5.49985C19.4001 4.45051 18.5494 3.59985 17.5001 3.59985C16.4508 3.59985 15.6001 4.45051 15.6001 5.49985C15.6001 6.54919 16.4508 7.39985 17.5001 7.39985Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/ToolsMultiScale.svg b/Content/Slate/Starship/GenericCurveEditor/ToolsMultiScale.svg
new file mode 100644
index 0000000..e0001a5
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/ToolsMultiScale.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M2 1H0V19H2V1Z" fill="white"/>
+<path opacity="0.5" d="M20 1H18V19H20V1Z" fill="white"/>
+<path d="M16.612 5.25406C16.3114 4.65298 15.3347 3 13.4563 3C10.7514 3 9.47414 7.88379 6.76927 7.88379C4.89089 7.88379 3.839 6.30595 3.38818 5.47946" stroke="white" stroke-opacity="0.5" stroke-width="1.25" stroke-miterlimit="10"/>
+<path d="M16.6121 9.76216C16.3115 9.16108 15.3348 7.5081 13.4564 7.5081C10.7515 7.5081 9.4742 12.3919 6.76933 12.3919C4.89095 12.3919 3.83906 10.7389 3.46338 9.98757" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+<path d="M16.6121 14.2703C16.3115 13.6692 15.3348 12.0163 13.4564 12.0163C10.7515 12.0163 9.4742 16.9001 6.76933 16.9001C4.89095 16.9001 3.83906 15.2471 3.46338 14.4957" stroke="white" stroke-opacity="0.5" stroke-width="1.25" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/ToolsRetime.svg b/Content/Slate/Starship/GenericCurveEditor/ToolsRetime.svg
new file mode 100644
index 0000000..b11d039
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/ToolsRetime.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M2 1H0V19H2V1Z" fill="white"/>
+<path opacity="0.5" d="M19 1H17V19H19V1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.5 4.5C6.2 4.5 3.5 7.2 3.5 10.5C3.5 13.8 6.2 16.5 9.5 16.5C12.8 16.5 15.5 13.8 15.5 10.5C15.5 7.2 12.8 4.5 9.5 4.5ZM9.5 15.4C6.8 15.4 4.6 13.2 4.6 10.5C4.6 7.8 6.8 5.6 9.5 5.6C12.2 5.6 14.4 7.8 14.4 10.5C14.4 13.2 12.2 15.4 9.5 15.4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 6.6001H9V10.9001L11.5 13.3001L12.2 12.6001L10 10.5001V6.6001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/ToolsTransform.svg b/Content/Slate/Starship/GenericCurveEditor/ToolsTransform.svg
new file mode 100644
index 0000000..00e3737
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/ToolsTransform.svg
@@ -0,0 +1,9 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M13 0.4L19 0L18.6 6L13 0.4ZM6 0.4L0 0L0.4 6L6 0.4ZM13 18.6L19 19L18.6 13L13 18.6ZM0.4 13L0 19L6 18.6L0.4 13Z" fill="white"/>
+<path d="M7 5.0001L9.5 2.1001L12 5.0001H7Z" fill="white"/>
+<path d="M7 14L9.5 16.9L12 14H7Z" fill="white"/>
+<path d="M14 7L16.9 9.5L14 12V7Z" fill="white"/>
+<path d="M5.0001 7L2.1001 9.5L5.0001 12V7Z" fill="white"/>
+<path d="M14.5 9H4.5V10H14.5V9Z" fill="white"/>
+<path d="M10 5H9V14H10V5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GenericCurveEditor/VisibilityOptions.svg b/Content/Slate/Starship/GenericCurveEditor/VisibilityOptions.svg
new file mode 100644
index 0000000..705d9c7
--- /dev/null
+++ b/Content/Slate/Starship/GenericCurveEditor/VisibilityOptions.svg
@@ -0,0 +1,12 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M19 1H6V3H19V1Z" fill="white"/>
+<path d="M4 1H1V4H4V1Z" fill="white"/>
+<path opacity="0.5" d="M4 6H1V9H4V6Z" fill="white"/>
+<path opacity="0.5" d="M10 11H6V13H10V11Z" fill="white"/>
+<path opacity="0.5" d="M10 6H6V8H10V6Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M19.0001 8H17.0001L14.6001 6H19.0001V8Z" fill="white"/>
+<path d="M4 11H1V14H4V11Z" fill="white"/>
+<path opacity="0.5" d="M10 16H6V18H10V16Z" fill="white"/>
+<path d="M4 16H1V19H4V16Z" fill="white"/>
+<path d="M20 13.8L12 7L12.1 17.5L14.4 14.3L16.7 19L18.4 18.2L16.1 13.5L20 13.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/AlignBottom.svg b/Content/Slate/Starship/GraphEditors/AlignBottom.svg
new file mode 100644
index 0000000..d9d3852
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/AlignBottom.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M12 4L12 16L16 16L16 4L12 4Z" fill="white"/>
+<path opacity="0.5" d="M4 1L4 16L9 16L9 1L4 1Z" fill="white"/>
+<path d="M-8.74228e-08 18L0 20L20 20L20 18L-8.74228e-08 18Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/AlignLeft.svg b/Content/Slate/Starship/GraphEditors/AlignLeft.svg
new file mode 100644
index 0000000..74ebaf7
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/AlignLeft.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 12H4V16H16V12Z" fill="white"/>
+<path opacity="0.5" d="M19 4H4V9H19V4Z" fill="white"/>
+<path d="M2 0H0V20H2V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/AlignMiddle.svg b/Content/Slate/Starship/GraphEditors/AlignMiddle.svg
new file mode 100644
index 0000000..09213c1
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/AlignMiddle.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 16L16 4L12 4L12 16L16 16Z" fill="white"/>
+<path opacity="0.5" d="M9 19L9 1L4 1L4 19L9 19Z" fill="white"/>
+<path d="M20 11L20 9L0 9L-8.74228e-08 11L20 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/AlignRight.svg b/Content/Slate/Starship/GraphEditors/AlignRight.svg
new file mode 100644
index 0000000..6d98fc4
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/AlignRight.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4 8L16 8L16 4L4 4L4 8Z" fill="white"/>
+<path opacity="0.5" d="M1 16L16 16L16 11L1 11L1 16Z" fill="white"/>
+<path d="M18 20L20 20L20 0L18 -1.74846e-07L18 20Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/AlignTop.svg b/Content/Slate/Starship/GraphEditors/AlignTop.svg
new file mode 100644
index 0000000..4f32f27
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/AlignTop.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 16L16 4L12 4L12 16L16 16Z" fill="white"/>
+<path opacity="0.5" d="M9 19L9 4L4 4L4 19L9 19Z" fill="white"/>
+<path d="M20 2L20 0L0 -8.74228e-07L-8.74228e-08 2L20 2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Branch.svg b/Content/Slate/Starship/GraphEditors/Branch.svg
new file mode 100644
index 0000000..1c04895
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Branch.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 2H6C5.44772 2 5 2.44772 5 3V13C5 13.5523 5.44772 14 6 14H11V12H7V4H11V2Z" fill="white"/>
+<rect x="1" y="7" width="4" height="2" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 6L15 3L11 0V6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 16L15 13L11 10V16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/BreakStruct.svg b/Content/Slate/Starship/GraphEditors/BreakStruct.svg
new file mode 100644
index 0000000..b119fa5
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/BreakStruct.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 14L10 12L11 11L13 13L14 12L14 15L11 15L12 14Z" fill="white"/>
+<path d="M13 3L11 5L10 4L12 2L11 1L14 1L14 4L13 3Z" fill="white"/>
+<path d="M7.975 6H3.025C1.90662 6 1 6.90662 1 8.025V8.475C1 9.59338 1.90662 10.5 3.025 10.5H7.975C9.09338 10.5 10 9.59338 10 8.475V8.025C10 6.90662 9.09338 6 7.975 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/CallInEditorEvent.svg b/Content/Slate/Starship/GraphEditors/CallInEditorEvent.svg
new file mode 100644
index 0000000..fabbab2
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/CallInEditorEvent.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.929031" y="8" width="10" height="10" rx="0.5" transform="rotate(-45 0.929031 8)" stroke="white"/>
+<path d="M8.85545 6.44728C8.93614 5.78146 9.18298 5.14485 9.57455 4.59278C9.57455 4.59278 9.57455 4.63605 9.57455 4.65459C9.59113 4.82296 9.6717 4.97927 9.80055 5.09303C9.92939 5.20679 10.0973 5.26982 10.2714 5.26982C10.4455 5.26982 10.6133 5.20679 10.7422 5.09303C10.871 4.97927 10.9516 4.82296 10.9682 4.65459C10.9692 4.53463 10.9342 4.41699 10.8675 4.316C10.8008 4.21502 10.7054 4.13506 10.5927 4.08588H10.5355C10.1997 3.97137 9.83389 3.97137 9.49818 4.08588C8.41636 4.41351 8.02818 5.98365 8.02818 5.98365L7.97091 6.18147H5.94727L5.76909 6.70691H7.87545L7.09909 10.0821C6.98882 10.4622 6.77021 10.8043 6.46847 11.069C6.16673 11.3337 5.79413 11.5102 5.39364 11.5781C5.44312 11.4748 5.46486 11.3611 5.45682 11.2475C5.44878 11.1339 5.41123 11.0241 5.34767 10.9284C5.28412 10.8327 5.19663 10.7542 5.09338 10.7003C4.99014 10.6463 4.8745 10.6187 4.75727 10.6199C4.56959 10.6097 4.38524 10.6712 4.24369 10.7914C4.10215 10.9115 4.01468 11.0808 4 11.2628C4.00398 11.4297 4.07104 11.5894 4.18839 11.7114C4.30575 11.8333 4.4652 11.9091 4.63636 11.9242C7.56364 12.4497 8.02182 10.0697 8.02182 10.0697L8.74727 7.16435H10.8345L11 6.66982H8.79818L8.85545 6.44728Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Cast.svg b/Content/Slate/Starship/GraphEditors/Cast.svg
new file mode 100644
index 0000000..3825e74
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Cast.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 12L16 7.5L12 3V12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0 11L4 7.5L0 4V11Z" fill="white"/>
+<rect opacity="0.5" x="5" y="6" width="1" height="3" fill="white"/>
+<rect opacity="0.5" x="7" y="6" width="1" height="3" fill="white"/>
+<rect opacity="0.5" x="9" y="6" width="1" height="3" fill="white"/>
+<rect x="9" y="6" width="3" height="3" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/CleanUp.svg b/Content/Slate/Starship/GraphEditors/CleanUp.svg
new file mode 100644
index 0000000..fe6e1cd
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/CleanUp.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.6 2.9L18 1.3C17.6 0.9 16.8 0.9 16.4 1.3L13 6C12.4 6.6 10.3 6.5 9.70001 5.9L8.70001 4.9C8.50001 4.7 8.2 4.7 8 4.9L5 8L13 16L16.1 12.9C16.3 12.7 16.3 12.4 16.1 12.2L15.1 11.2C14.5 10.6 14.4 8.6 15 8L19.6 4.5C20.1 4.1 20.1 3.4 19.6 2.9Z" fill="white"/>
+<path opacity="0.5" d="M7.5 18.5L0 11C0 11 2.30001 10.4 3.70001 9.20003C5.10001 8.00003 4.20001 8.70003 4.20001 8.70003L12.2 16.7C12.2 16.7 13.4 15.8 11.7 17.2C10 18.8 7.5 18.5 7.5 18.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Comment_Handle.svg b/Content/Slate/Starship/GraphEditors/Comment_Handle.svg
new file mode 100644
index 0000000..ad23151
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Comment_Handle.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16 5L5.00004 16H2.92004L16 3V5ZM16 9L9.00004 16H6.91004L16 7V9ZM16 13L13 16H10.91L16 11V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Conduit.svg b/Content/Slate/Starship/GraphEditors/Conduit.svg
new file mode 100644
index 0000000..cd1f6eb
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Conduit.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="7" width="14" height="2" fill="white"/>
+<rect opacity="0.5" x="1" y="3" width="9" height="2" fill="white"/>
+<rect opacity="0.5" x="1" y="11" width="12" height="2" fill="white"/>
+<rect opacity="0.5" x="8" y="1" width="2" height="2" fill="white"/>
+<rect opacity="0.5" x="11" y="13" width="2" height="2" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/DistributeHorizontally.svg b/Content/Slate/Starship/GraphEditors/DistributeHorizontally.svg
new file mode 100644
index 0000000..45a64e9
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/DistributeHorizontally.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M20 16L20 4L16 4L16 16L20 16Z" fill="white"/>
+<path opacity="0.5" d="M4 16L4 4L0 4L-5.24537e-07 16L4 16Z" fill="white"/>
+<path opacity="0.5" d="M12 19L12 1L8 1L8 19L12 19Z" fill="white"/>
+<path d="M20 11L20 9L0 9L-8.74228e-08 11L20 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/DistributeVertically.svg b/Content/Slate/Starship/GraphEditors/DistributeVertically.svg
new file mode 100644
index 0000000..7df87c7
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/DistributeVertically.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4 20L16 20L16 16L4 16L4 20Z" fill="white"/>
+<path opacity="0.5" d="M4 4L16 4L16 0L4 -1.04907e-06L4 4Z" fill="white"/>
+<path opacity="0.5" d="M1 12L19 12L19 8L1 8L1 12Z" fill="white"/>
+<path d="M9 20L11 20L11 0L9 -1.74846e-07L9 20Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/DoN.svg b/Content/Slate/Starship/GraphEditors/DoN.svg
new file mode 100644
index 0000000..6fbfdcf
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/DoN.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 12V8H9V4L16 10L9 16V12H1Z" fill="white"/>
+<path d="M7 6L6 6L4 2.66667V6H3V1H4L6 4.33333V1H7V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/DoOnce.svg b/Content/Slate/Starship/GraphEditors/DoOnce.svg
new file mode 100644
index 0000000..153485e
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/DoOnce.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 12V8H9V4L16 10L9 16V12H1Z" fill="white"/>
+<path d="M6 6H5L4.98752 2.42387L4 2.8642V1.893L5.89305 1H6V6Z" fill="white"/>
+<rect x="4" y="5" width="3" height="1" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Enum.svg b/Content/Slate/Starship/GraphEditors/Enum.svg
new file mode 100644
index 0000000..1b2d599
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Enum.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M10 0V4H14L10 0Z" fill="white"/>
+<path d="M9 5V0H2V16H14V5H9ZM3.2 4.4L4.5 4H4.6V7H4V4.7L3.2 4.9V4.4ZM4.7 14.8C4.6 14.9 4.3 15 4 15C3.7 15 3.5 14.9 3.3 14.8C3.1 14.6 3 14.4 3 14.2H3.6C3.6 14.3 3.6 14.4 3.7 14.5C3.8 14.6 3.9 14.6 4 14.6C4.1 14.6 4.2 14.6 4.3 14.5C4.4 14.4 4.4 14.3 4.4 14.2C4.4 13.9 4.2 13.8 3.9 13.8H3.7V13.3H4C4.1 13.3 4.3 13.3 4.3 13.2C4.4 13.1 4.4 13 4.4 12.9C4.4 12.8 4.4 12.7 4.3 12.6C4.2 12.5 4.1 12.5 4 12.5C3.9 12.5 3.8 12.5 3.7 12.6C3.6 12.7 3.6 12.7 3.6 12.8H3C3 12.6 3 12.5 3.1 12.4C3.2 12.3 3.3 12.2 3.4 12.1C3.7 12 3.8 12 4 12C4.3 12 4.6 12.1 4.7 12.2C4.9 12.4 5 12.6 5 12.8C5 12.9 5 13.1 4.9 13.2C4.8 13.3 4.7 13.4 4.6 13.5C4.8 13.6 4.9 13.6 5 13.8C5 13.8 5 14 5 14.1C5 14.4 4.9 14.6 4.7 14.8ZM5.1 11H3.1V10.6L4.1 9.6C4.2 9.5 4.3 9.3 4.4 9.2C4.4 9.1 4.4 9 4.4 8.9C4.4 8.8 4.4 8.7 4.3 8.6C4.2 8.5 4.1 8.5 4 8.5C3.9 8.5 3.8 8.5 3.7 8.6C3.6 8.7 3.6 8.8 3.6 9H3C3 8.8 3 8.7 3.1 8.5C3.2 8.4 3.3 8.2 3.5 8.1C3.7 8 3.8 8 4 8C4.3 8 4.5 8.1 4.7 8.2C4.9 8.4 5 8.6 5 8.8C5 9 5 9.1 4.9 9.3C4.8 9.4 4.7 9.6 4.5 9.8L3.8 10.5H5.1V11ZM12 14.5L10 15L8 14.5L6 15V14L8 13.5L10 14L12 13.5V14.5ZM12 10.5L10 11L8 10.5L6 11V10L8 9.5L10 10L12 9.5V10.5ZM12 6.5L10 7L8 6.5L6 7V6L8 5.5L10 6L12 5.5V6.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/FlipFlop.svg b/Content/Slate/Starship/GraphEditors/FlipFlop.svg
new file mode 100644
index 0000000..11f1454
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/FlipFlop.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14 2L10 14" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M6 2L2 14" stroke="white" stroke-width="2" stroke-linecap="round"/>
+<path d="M6 2L10 14" stroke="white" stroke-opacity="0.5" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/ForEach.svg b/Content/Slate/Starship/GraphEditors/ForEach.svg
new file mode 100644
index 0000000..3cc262d
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/ForEach.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2C1.8 2 0 3.8 0 6V9C0 11.2 2 13 4 13H10V11H5C3.2 11 2 9.7 2 8V7C2 5.63882 2.76933 4.53408 4 4.14779V2ZM12 4C13.8 4 14 5.3 14 7V8C14 8.8 13.7 9.5 13.3 10L15.2 11.4C15.7 10.7 16 9.9 16 9V6C16 3.8 14.2 2 12 2V4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 16L13 12L8 8V16Z" fill="white"/>
+<rect x="5" y="1" width="1" height="4" fill="white"/>
+<rect x="7" y="1" width="1" height="4" fill="white"/>
+<rect x="9" y="1" width="1" height="4" fill="white"/>
+<rect x="11" y="2" width="1" height="2" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Gate.svg b/Content/Slate/Starship/GraphEditors/Gate.svg
new file mode 100644
index 0000000..2ed3a9b
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Gate.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.5" y="4.5" width="13" height="8" stroke="white"/>
+<rect x="1" y="8" width="14" height="1" fill="white"/>
+<rect opacity="0.5" width="1" height="11" transform="matrix(-1 0 0 1 16.0005 3)" fill="white"/>
+<rect opacity="0.5" width="1" height="11" transform="matrix(-1 0 0 1 1 3)" fill="white"/>
+<rect opacity="0.5" x="1.65088" y="4.27002" width="14.6871" height="1" transform="rotate(29.4797 1.65088 4.27002)" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/GetSequenceBinding.svg b/Content/Slate/Starship/GraphEditors/GetSequenceBinding.svg
new file mode 100644
index 0000000..93e640c
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/GetSequenceBinding.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1.5" y="1.5" width="3" height="2" fill="white" fill-opacity="0.5" stroke="white"/>
+<rect x="1.5" y="11.5" width="3" height="2" fill="white" fill-opacity="0.5" stroke="white"/>
+<rect x="1.5" y="6.5" width="3" height="2" fill="white" fill-opacity="0.5" stroke="white"/>
+<path d="M7 9V6H11V4L15 7.5L11 11V9H7Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/HideUnrelated.svg b/Content/Slate/Starship/GraphEditors/HideUnrelated.svg
new file mode 100644
index 0000000..6ab8f83
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/HideUnrelated.svg
@@ -0,0 +1,7 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.50005 5.70005C3.71508 5.70005 4.70005 4.71508 4.70005 3.50005C4.70005 2.28502 3.71508 1.30005 2.50005 1.30005C1.28502 1.30005 0.300049 2.28502 0.300049 3.50005C0.300049 4.71508 1.28502 5.70005 2.50005 5.70005Z" fill="white"/>
+<path d="M13.5 5.70005C14.7151 5.70005 15.7 4.71508 15.7 3.50005C15.7 2.28502 14.7151 1.30005 13.5 1.30005C12.285 1.30005 11.3 2.28502 11.3 3.50005C11.3 4.71508 12.285 5.70005 13.5 5.70005Z" fill="white"/>
+<path opacity="0.5" d="M13.5 3H4.5H2.5V4H4.5C6.2 4 7 5.8 7 7.5C7 8 7.1 8.6 7.2 9.1C7.5 8.9 7.8 8.6 8.1 8.4C8 8 8 7.8 8 7.5C8 6.2 7.6 4.9 6.8 4H13.5V3Z" fill="white"/>
+<path d="M11 8.19995C8.20005 8.19995 6.30005 11 6.30005 11C6.30005 11 8.20005 13.8 11 13.8C13.8 13.8 15.7 11 15.7 11C15.7 11 13.8 8.19995 11 8.19995Z" stroke="white" stroke-miterlimit="10"/>
+<path d="M11 12.5999C10.1 12.5999 9.40002 11.8999 9.40002 10.9999C9.40002 10.0999 10.1 9.3999 11 9.3999C11.9 9.3999 12.6 10.0999 12.6 10.9999C12.6 11.8999 11.9 12.5999 11 12.5999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/InterfaceFunction.svg b/Content/Slate/Starship/GraphEditors/InterfaceFunction.svg
new file mode 100644
index 0000000..5e3ac5f
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/InterfaceFunction.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.7 12.6L5.8 9.5L6.5 10.2L3.4 13.3L4.8 14.7L1 15L1.3 11.2L2.7 12.6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3001 5.4C13.3001 5.2 13.4001 5 13.4001 4.9C13.4001 4.7 13.4001 4.5 13.3001 4.4L12.0001 4.2C11.9001 3.9 11.8001 3.6 11.7001 3.4L12.5001 2.3C12.3001 2 12.0001 1.8 11.7001 1.5L10.6001 2.3C10.3001 2.1 10.0001 2 9.7001 1.9L9.5001 0.6C9.4001 0.6 9.2001 0.5 9.0001 0.5C8.8001 0.5 8.6001 0.5 8.5001 0.6L8.3001 1.9C8.0001 2 7.7001 2.1 7.4001 2.3L6.4001 1.5C6.1001 1.7 5.8001 2 5.6001 2.2L6.4001 3.3C6.3001 3.6 6.1001 3.8 6.1001 4.1L4.7001 4.3C4.7001 4.5 4.6001 4.7 4.6001 4.8C4.6001 5 4.6001 5.2 4.7001 5.3L6.0001 5.5C6.1001 5.8 6.2001 6.1 6.3001 6.3L5.6001 7.5C5.8001 7.8 6.1001 8 6.4001 8.3L7.5001 7.5C7.7001 7.6 8.0001 7.7 8.3001 7.8L8.5001 9.1C8.7001 9.1 8.9001 9.2 9.0001 9.2C9.2001 9.2 9.4001 9.2 9.5001 9.1L9.7001 7.8C10.0001 7.7 10.3001 7.6 10.5001 7.5L11.6001 8.3C11.9001 8.1 12.1001 7.8 12.4001 7.5L11.6001 6.4C11.8001 6.1 11.9001 5.9 11.9001 5.6L13.3001 5.4ZM9.0001 6.8C8.0001 6.8 7.1001 6 7.1001 4.9C7.1001 3.8 8.0001 3 9.0001 3C10.0001 3 10.9001 3.8 10.9001 4.9C10.9001 5.9 10.0001 6.8 9.0001 6.8Z" fill="white"/>
+<path opacity="0.5" d="M13.1618 10.1414C13.231 9.55878 13.4426 9.00174 13.7782 8.51868C13.7782 8.51868 13.7782 8.55654 13.7782 8.57277C13.7924 8.72009 13.8615 8.85687 13.9719 8.9564C14.0823 9.05594 14.2262 9.11109 14.3755 9.11109C14.5247 9.11109 14.6686 9.05594 14.779 8.9564C14.8894 8.85687 14.9585 8.72009 14.9727 8.57277C14.9736 8.4678 14.9436 8.36486 14.8864 8.2765C14.8293 8.18814 14.7475 8.11818 14.6509 8.07515H14.6018C14.3141 7.97495 14.0005 7.97495 13.7127 8.07515C12.7855 8.36182 12.4527 9.7357 12.4527 9.7357L12.4036 9.90878H10.6691L10.5164 10.3685H12.3218L11.6564 13.3218C11.5618 13.6544 11.3745 13.9538 11.1158 14.1854C10.8572 14.417 10.5378 14.5714 10.1945 14.6308C10.237 14.5405 10.2556 14.441 10.2487 14.3415C10.2418 14.2421 10.2096 14.1461 10.1551 14.0623C10.1007 13.9786 10.0257 13.9099 9.93719 13.8627C9.84869 13.8155 9.74957 13.7913 9.64909 13.7924C9.48822 13.7834 9.3302 13.8373 9.20888 13.9424C9.08756 14.0476 9.01258 14.1957 9 14.355C9.00341 14.501 9.06089 14.6407 9.16148 14.7474C9.26207 14.8542 9.39874 14.9205 9.54545 14.9337C12.0545 15.3935 12.4473 13.311 12.4473 13.311L13.0691 10.7688H14.8582L15 10.3361H13.1127L13.1618 10.1414Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/IsValid.svg b/Content/Slate/Starship/GraphEditors/IsValid.svg
new file mode 100644
index 0000000..efa2fc4
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/IsValid.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 15C9.10456 15 10 14.1046 10 13C10 11.8954 9.10456 11 8 11C6.89544 11 6 11.8954 6 13C6 14.1046 6.89544 15 8 15Z" fill="white"/>
+<path d="M5 4.86697C5.15 3.33619 6.5 2.26465 8 2.26465C9.65 2.26465 11 3.64235 11 5.3262C11 7.01005 8 7.92852 8 9.00006" stroke="white" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/MakeArray.svg b/Content/Slate/Starship/GraphEditors/MakeArray.svg
new file mode 100644
index 0000000..d1690f5
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/MakeArray.svg
@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 4H13V6H15V4Z" fill="white"/>
+<path d="M15 7H13V9H15V7Z" fill="white"/>
+<path d="M15 10H13V12H15V10Z" fill="white"/>
+<path d="M12 4H10V6H12V4Z" fill="white"/>
+<path d="M12 7H10V9H12V7Z" fill="white"/>
+<path d="M12 10H10V12H12V10Z" fill="white"/>
+<path d="M9 4H7V6H9V4Z" fill="white"/>
+<path d="M9 7H7V9H9V7Z" fill="white"/>
+<path d="M9 10H7V12H9V10Z" fill="white"/>
+<path d="M3 4L1 1.99995L2 1L4 3L5 1.99995L5 5L2 5L3 4Z" fill="white"/>
+<path d="M4 13L1.99995 15L1 14L3 12L1.99995 11L5 11L5 14L4 13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/MakeMap.svg b/Content/Slate/Starship/GraphEditors/MakeMap.svg
new file mode 100644
index 0000000..4d89bee
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/MakeMap.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 4H10V6H15V4Z" fill="white"/>
+<path d="M15 7H10V9H15V7Z" fill="white"/>
+<path d="M15 10H10V12H15V10Z" fill="white"/>
+<path d="M9 4H7V6H9V4Z" fill="white"/>
+<path d="M9 7H7V9H9V7Z" fill="white"/>
+<path d="M9 10H7V12H9V10Z" fill="white"/>
+<path d="M3 4L1 1.99995L2 1L4 3L5 1.99995L5 5L2 5L3 4Z" fill="white"/>
+<path d="M4 13L1.99995 15L1 14L3 12L1.99995 11L5 11L5 14L4 13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/MakeSet.svg b/Content/Slate/Starship/GraphEditors/MakeSet.svg
new file mode 100644
index 0000000..6b4f487
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/MakeSet.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 4L1 1.99995L2 1L4 3L5 1.99995L5 5L2 5L3 4Z" fill="white"/>
+<path d="M4 13L1.99995 15L1 14L3 12L1.99995 11L5 11L5 14L4 13Z" fill="white"/>
+<path d="M6 8.00205V7.43062C6.40147 7.37088 6.79699 7.28299 7.18286 7.16777C7.30414 7.11578 7.40659 7.03462 7.47858 6.93348C7.57165 6.81021 7.63108 6.66933 7.65215 6.52205C7.6832 6.31181 7.69609 6.09976 7.69072 5.88777C7.67539 5.53753 7.70341 5.18685 7.77429 4.84205C7.81918 4.66059 7.92446 4.49533 8.07643 4.36777C8.26269 4.22923 8.48285 4.13138 8.71929 4.08205C9.01252 4.02392 9.31249 3.99706 9.61287 4.00205H9.85715V4.57348C9.66398 4.58307 9.47806 4.64211 9.32179 4.7435C9.16552 4.84489 9.04559 4.9843 8.97644 5.14491C8.92057 5.24999 8.89621 5.36613 8.90572 5.48205C8.90572 5.64205 8.90572 5.95062 8.86715 6.40205C8.85805 6.6136 8.81697 6.8231 8.74501 7.02491C8.69216 7.17345 8.60697 7.3113 8.49429 7.43062C8.33135 7.64 8.1415 7.83177 7.92858 8.00205" fill="white"/>
+<path d="M7.92858 8.00195C8.14537 8.18165 8.33547 8.3852 8.49429 8.60767C8.60419 8.72229 8.6892 8.85404 8.74501 8.99624C8.81697 9.19805 8.85805 9.40755 8.86715 9.6191C8.89286 10.0724 8.90572 10.381 8.90572 10.5448C8.89679 10.6607 8.92112 10.7767 8.97644 10.882C9.05077 11.0375 9.17272 11.1714 9.32842 11.2683C9.48411 11.3653 9.66731 11.4215 9.85715 11.4305V12.002H9.61287C9.31086 12.0112 9.0087 11.9881 8.71286 11.9334C8.47744 11.8816 8.25788 11.784 8.07001 11.6477C7.91926 11.5193 7.81421 11.3543 7.76786 11.1734C7.69764 10.8285 7.66962 10.4779 7.68429 10.1277C7.69081 9.91186 7.67791 9.69593 7.64572 9.48195C7.62465 9.33468 7.56522 9.1938 7.47215 9.07052C7.40016 8.96939 7.29771 8.88822 7.17643 8.83624C6.79266 8.72131 6.3993 8.63342 6 8.57338V8.00195" fill="white"/>
+<path d="M13.0712 8.00197C12.8582 7.83169 12.6684 7.63992 12.5054 7.43054C12.3942 7.31461 12.3091 7.18076 12.2547 7.03626C12.1828 6.83445 12.1417 6.62495 12.1326 6.4134C12.1326 5.96197 12.094 5.6534 12.094 5.4934C12.1058 5.37369 12.0814 5.25334 12.0233 5.14483C11.9541 4.98422 11.8342 4.84481 11.6779 4.74342C11.5217 4.64203 11.3357 4.58299 11.1426 4.5734V4.00197H11.3869C11.6889 3.99277 11.991 4.01579 12.2869 4.07054C12.5233 4.11987 12.7435 4.21772 12.9297 4.35626C13.0817 4.48382 13.187 4.64908 13.2319 4.83054C13.3027 5.17534 13.3308 5.52602 13.3154 5.87626C13.3094 6.09206 13.3223 6.30795 13.354 6.52197C13.3751 6.66925 13.4345 6.81013 13.5276 6.9334C13.5996 7.03454 13.702 7.1157 13.8233 7.16769C14.2071 7.28262 14.6004 7.37051 14.9997 7.43054V8.00197" fill="white"/>
+<path d="M14.9997 8.00195V8.57338C14.5983 8.63312 14.2027 8.72102 13.8169 8.83624C13.6956 8.88822 13.5931 8.96939 13.5212 9.07052C13.4281 9.1938 13.3686 9.33468 13.3476 9.48195C13.3154 9.69593 13.3025 9.91186 13.309 10.1277C13.3237 10.4779 13.2957 10.8285 13.2254 11.1734C13.1791 11.3543 13.074 11.5193 12.9233 11.6477C12.7354 11.784 12.5159 11.8816 12.2804 11.9334C11.9846 11.9881 11.6824 12.0112 11.3804 12.002H11.1426V11.4305C11.3353 11.4196 11.5205 11.36 11.6765 11.2588C11.8325 11.1576 11.9528 11.0189 12.0233 10.8591C12.0786 10.7539 12.1029 10.6378 12.094 10.522C12.094 10.3543 12.1069 10.0458 12.1326 9.59624C12.1417 9.38469 12.1828 9.17519 12.2547 8.97338C12.3105 8.83119 12.3955 8.69943 12.5054 8.58481C12.666 8.37037 12.856 8.17457 13.0712 8.00195" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/MakeStruct.svg b/Content/Slate/Starship/GraphEditors/MakeStruct.svg
new file mode 100644
index 0000000..3061b12
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/MakeStruct.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3 4L1 1.99995L2 1L4 3L5 1.99995L5 5L2 5L3 4Z" fill="white"/>
+<path d="M4 13L1.99995 15L1 14L3 12L1.99995 11L5 11L5 14L4 13Z" fill="white"/>
+<path d="M12.975 6H8.025C6.90662 6 6 6.90662 6 8.025V8.475C6 9.59338 6.90662 10.5 8.025 10.5H12.975C14.0934 10.5 15 9.59338 15 8.475V8.025C15 6.90662 14.0934 6 12.975 6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/MouseEvent.svg b/Content/Slate/Starship/GraphEditors/MouseEvent.svg
new file mode 100644
index 0000000..1bce264
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/MouseEvent.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M8.85714 8.34043H14L13.9143 6.6383H8.85714V0H7.14286V6.6383H2.08571L2 8.34043H7.14286H8.85714Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.85714 0C11 0.595745 13.4 3.31915 13.9143 6.6383H8.85714V0ZM7.14286 0C5 0.595745 2.6 3.31915 2.08571 6.6383H7.14286V0ZM8.85714 8.34043H7.14286H2C2 12.5957 3.02857 16 8 16C12.9714 16 14 12.5957 14 8.34043H8.85714Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Node.svg b/Content/Slate/Starship/GraphEditors/Node.svg
new file mode 100644
index 0000000..e19a21c
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Node.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="15" rx="1" fill="white" fill-opacity="0.5"/>
+<rect x="0.5" y="0.5" width="15" height="14" rx="0.5" stroke="white"/>
+<rect x="1" width="14" height="5" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/PinIcon.svg b/Content/Slate/Starship/GraphEditors/PinIcon.svg
new file mode 100644
index 0000000..d086f9e
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/PinIcon.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="10" cy="10" r="8" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/RefPin.svg b/Content/Slate/Starship/GraphEditors/RefPin.svg
new file mode 100644
index 0000000..7715922
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/RefPin.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="19" y="10" width="12.7279" height="12.7279" transform="rotate(135 19 10)" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Rule.svg b/Content/Slate/Starship/GraphEditors/Rule.svg
new file mode 100644
index 0000000..26d9d7a
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Rule.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.9985 1.99995L11.9984 2.99995L3 9.99995L10.9985 1.99995Z" fill="white"/>
+<path d="M12.9985 1L12.5 5L10.897 3L9 1.5L12.9985 1Z" fill="white"/>
+<path d="M5.00005 14L4.00019 13L13 5.99999L5.00005 14Z" fill="white"/>
+<path d="M3 15L3.5 11L5 13L7 14.5L3 15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Select.svg b/Content/Slate/Starship/GraphEditors/Select.svg
new file mode 100644
index 0000000..83ecac6
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Select.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="1" y="2" width="6" height="2" fill="white"/>
+<rect x="10" y="7" width="3" height="2" fill="white"/>
+<path d="M12 5L15 8L12 11V5Z" fill="white"/>
+<rect x="1" y="7" width="8" height="2" fill="white"/>
+<rect x="5" y="4" width="2" height="9" fill="white"/>
+<rect x="1" y="12" width="6" height="2" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Sequence.svg b/Content/Slate/Starship/GraphEditors/Sequence.svg
new file mode 100644
index 0000000..6a09097
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Sequence.svg
@@ -0,0 +1,9 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="2" width="5" height="2" fill="white"/>
+<rect y="7" width="8" height="2" fill="white"/>
+<rect x="3" y="4" width="2" height="9" fill="white"/>
+<rect x="3" y="12" width="5" height="2" fill="white"/>
+<rect x="10" y="2" width="6" height="2" fill="white"/>
+<rect x="10" y="7" width="4" height="2" fill="white"/>
+<rect x="10" y="12" width="2" height="2" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/SpawnActor.svg b/Content/Slate/Starship/GraphEditors/SpawnActor.svg
new file mode 100644
index 0000000..8307630
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/SpawnActor.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.38 12.62L7 11.5L10.38 10.38L11.5 7L12.63 10.38L16 11.5L12.63 12.62L11.5 16L10.38 12.62Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M4 14H2L3 10L0 14V16H10L9 14H4Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M2 6C1.9996 7.10384 2.30372 8.1864 2.87889 9.12854C3.45406 10.0707 4.27798 10.8359 5.26 11.34L9 9L11.5 5L13.78 7.6C13.9251 7.07902 13.9991 6.54081 14 6C14 4.4087 13.3679 2.88258 12.2426 1.75736C11.1174 0.63214 9.5913 0 8 0C6.4087 0 4.88258 0.63214 3.75736 1.75736C2.63214 2.88258 2 4.4087 2 6V6Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.22005 0.810059H8.00005C6.62265 0.810056 5.30153 1.35654 4.32663 2.32957C3.35172 3.30259 2.8027 4.62266 2.80005 6.00006C2.79984 7.03987 3.11257 8.05567 3.69756 8.91532C4.28255 9.77497 5.11271 10.4387 6.08005 10.8201L7.17005 10.1401C6.16687 9.86642 5.28119 9.27116 4.64894 8.44562C4.01669 7.62008 3.6728 6.60989 3.67005 5.57006C3.66886 4.34318 4.14143 3.16323 4.98917 2.27635C5.83692 1.38948 6.99437 0.864185 8.22005 0.810059V0.810059Z" fill="white"/>
+<path d="M10.0401 5.16001C10.7028 5.16001 11.2401 4.62275 11.2401 3.96001C11.2401 3.29727 10.7028 2.76001 10.0401 2.76001C9.37735 2.76001 8.84009 3.29727 8.84009 3.96001C8.84009 4.62275 9.37735 5.16001 10.0401 5.16001Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/State.svg b/Content/Slate/Starship/GraphEditors/State.svg
new file mode 100644
index 0000000..266ebf3
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/State.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.0315 1.1102C12.3203 1.28174 12.6007 1.47315 12.8707 1.68444L1.67521 12.9416C1.46508 12.6701 1.27472 12.3881 1.10412 12.0977C-0.702795 9.02143 -0.291921 4.99275 2.33674 2.34961C4.96541 -0.293529 8.97203 -0.706665 12.0315 1.1102ZM3.04192 3.05867C5.27781 0.810462 8.65429 0.405883 11.2998 1.84592L1.83581 11.362C0.403661 8.70195 0.806023 5.30687 3.04192 3.05867Z" fill="white"/>
+<path d="M13.6633 13.6505C10.7865 16.5431 6.25936 16.7647 3.12946 14.3156L14.3248 3.05858C16.7605 6.20572 16.5402 10.7578 13.6633 13.6505Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/StateMachine.svg b/Content/Slate/Starship/GraphEditors/StateMachine.svg
new file mode 100644
index 0000000..9cb5890
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/StateMachine.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M4 13L4 3H3L3 13H4Z" fill="white"/>
+<path opacity="0.5" d="M5.70725 11.7781L12.7783 4.70703L12.0712 3.99992L5.00015 11.071L5.70725 11.7781Z" fill="white"/>
+<rect y="1" width="7" height="4" rx="1" fill="white"/>
+<rect y="11" width="7" height="4" rx="1" fill="white"/>
+<rect x="9" y="1" width="7" height="4" rx="1" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/StraightenConnections.svg b/Content/Slate/Starship/GraphEditors/StraightenConnections.svg
new file mode 100644
index 0000000..3814137
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/StraightenConnections.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="9" cy="10" r="2" fill="white"/>
+<circle cx="9" cy="16" r="2" fill="white"/>
+<rect opacity="0.5" x="9" y="9" width="10" height="2" fill="white"/>
+<rect opacity="0.5" x="9" y="15" width="10" height="2" fill="white"/>
+<path opacity="0.5" d="M2 1C2 9 3.5 10 10 10" stroke="white" stroke-width="2"/>
+<path opacity="0.5" d="M2 11C2.00098 15.5 4 16 10.4645 16" stroke="white" stroke-width="2"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19 8C17.8954 8 17 8.89543 17 10C17 11.1046 17.8954 12 19 12V8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19 14C17.8954 14 17 14.8954 17 16C17 17.1046 17.8954 18 19 18V14Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/SubGraph.svg b/Content/Slate/Starship/GraphEditors/SubGraph.svg
new file mode 100644
index 0000000..ead318b
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/SubGraph.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.00211 13.5C5.50132 13 0.99822 11.5 1.99984 6C2.49984 6 1.99984 6 2.99984 6C1.99822 10 6.00278 11 7.00278 11V12L7.00211 13.5Z" fill="white"/>
+<path d="M6 2V4C6 4.26522 5.89464 4.51957 5.70711 4.70711C5.51957 4.89464 5.26522 5 5 5H2C1.73478 5 1.48043 4.89464 1.29289 4.70711C1.10536 4.51957 1 4.26522 1 4V2C1 1.73478 1.10536 1.48043 1.29289 1.29289C1.48043 1.10536 1.73478 1 2 1H5C5.26522 1 5.51957 1.10536 5.70711 1.29289C5.89464 1.48043 6 1.73478 6 2Z" fill="white"/>
+<path d="M14.9929 10.5V13.5C15.0126 13.6908 14.991 13.8836 14.9296 14.0657C14.8681 14.2479 14.7682 14.4152 14.6363 14.5568C14.5044 14.6984 14.3435 14.811 14.1642 14.8874C13.9849 14.9637 13.7912 15.0021 13.5958 14.9999H9.40423C9.20879 15.0021 9.01508 14.9637 8.83578 14.8874C8.65648 14.811 8.49562 14.6984 8.36373 14.5568C8.23185 14.4152 8.1319 14.2479 8.07044 14.0657C8.00897 13.8836 7.98738 13.6908 8.00706 13.5V10.5C7.98738 10.3092 8.00897 10.1164 8.07044 9.93426C8.1319 9.75214 8.23185 9.58482 8.36373 9.44323C8.49562 9.30164 8.65648 9.18898 8.83578 9.11262C9.01508 9.03625 9.20879 8.99791 9.40423 9.00009H13.5958C13.7912 8.99791 13.9849 9.03625 14.1642 9.11262C14.3435 9.18898 14.5044 9.30164 14.6363 9.44323C14.7682 9.58482 14.8681 9.75214 14.9296 9.93426C14.991 10.1164 15.0126 10.3092 14.9929 10.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/Switch.svg b/Content/Slate/Starship/GraphEditors/Switch.svg
new file mode 100644
index 0000000..3d470bb
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/Switch.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="3" y="2" width="6" height="2" fill="white"/>
+<rect y="7" width="9" height="2" fill="white"/>
+<rect x="3" y="4" width="2" height="9" fill="white"/>
+<rect x="3" y="12" width="6" height="2" fill="white"/>
+<rect x="10" y="2" width="3" height="2" fill="white"/>
+<path d="M12 0L15 3L12 6V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/VarGet.svg b/Content/Slate/Starship/GraphEditors/VarGet.svg
new file mode 100644
index 0000000..30c6c32
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/VarGet.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.3 13H3.7C2.20883 13 1 14.2088 1 15.7V16.3C1 17.7912 2.20883 19 3.7 19H10.3C11.7912 19 13 17.7912 13 16.3V15.7C13 14.2088 11.7912 13 10.3 13Z" fill="white"/>
+<path d="M16.3 13H9.7C8.20883 13 7 14.2088 7 15.7V16.3C7 17.7912 8.20883 19 9.7 19H16.3C17.7912 19 19 17.7912 19 16.3V15.7C19 14.2088 17.7912 13 16.3 13Z" fill="white"/>
+<g opacity="0.5">
+<path d="M13.5 5.5L10 2L6.5 5.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M10 12L10 3" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/VarSet.svg b/Content/Slate/Starship/GraphEditors/VarSet.svg
new file mode 100644
index 0000000..a03ed7c
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/VarSet.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.3 13H3.7C2.20883 13 1 14.2088 1 15.7V16.3C1 17.7912 2.20883 19 3.7 19H10.3C11.7912 19 13 17.7912 13 16.3V15.7C13 14.2088 11.7912 13 10.3 13Z" fill="white"/>
+<path d="M16.3 13H9.7C8.20883 13 7 14.2088 7 15.7V16.3C7 17.7912 8.20883 19 9.7 19H16.3C17.7912 19 19 17.7912 19 16.3V15.7C19 14.2088 17.7912 13 16.3 13Z" fill="white"/>
+<g opacity="0.5">
+<path d="M6.5 7.5L10 11L13.5 7.5" stroke="white" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M10 1V10" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</g>
+</svg>
diff --git a/Content/Slate/Starship/GraphEditors/WatchVariable.svg b/Content/Slate/Starship/GraphEditors/WatchVariable.svg
new file mode 100644
index 0000000..a09a457
--- /dev/null
+++ b/Content/Slate/Starship/GraphEditors/WatchVariable.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.5 11.9L1.4 16C1.4 16 1 16 0.5 15.5C0 15 0 14.6 0 14.6L4.1 10.5L5.5 11.9Z" fill="white"/>
+<path d="M2 7C2 3.1 5.1 0 9 0C12.9 0 16 3.1 16 7C16 10.9 12.9 14 9 14C5.1 14 2 10.9 2 7ZM3 7C3 10.3 5.7 13 9 13C12.3 13 15 10.3 15 7C15 3.7 12.3 1 9 1C5.7 1 3 3.7 3 7Z" fill="white"/>
+<path opacity="0.5" d="M9.00002 2.8999C6.70002 2.8999 4.90002 4.6999 4.90002 6.9999C4.90002 9.2999 6.70002 11.0999 9.00002 11.0999C11.3 11.0999 13.1 9.2999 13.1 6.9999C13.1 4.6999 11.3 2.8999 9.00002 2.8999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Launcher/PaperAirplane.svg b/Content/Slate/Starship/Launcher/PaperAirplane.svg
new file mode 100644
index 0000000..3005a24
--- /dev/null
+++ b/Content/Slate/Starship/Launcher/PaperAirplane.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6.66997 16.33L8.82997 13.19L20 3L3.83997 9.35L6.66997 16.33Z" fill="white"/>
+<path d="M20 3L0 7.76L3.84 9.35L20 3Z" fill="white"/>
+<path d="M13.82 15.87L20 3L8.82996 13.19L13.82 15.87Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/AssetPlacementMode.svg b/Content/Slate/Starship/MainToolbar/AssetPlacementMode.svg
new file mode 100644
index 0000000..d4cbfce
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/AssetPlacementMode.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2,.cls-3{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill-rule:evenodd;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><polygon class="cls-1" points="16 11 11 12.5 11 18.45 16 20 16 11"/><polygon class="cls-2" points="20 17.7 16 20 16 11 20 13.2 20 17.7"/><path class="cls-2" d="M9,13.48,7.59,12.06S9.84,9.3,11.18,8s7.07-5.77,7.07-5.77a.44.44,0,0,1,.62,0h0a.44.44,0,0,1,0,.62s-4.47,5.77-5.8,7.11S9,13.48,9,13.48Z"/><path class="cls-1" d="M7.75,13.85l-.88-1s-2.35-.39-3.22,2.77C3.08,17.65.25,19,.25,19H3.76a4.31,4.31,0,0,0,3.76-2.37A3.26,3.26,0,0,0,7.75,13.85Z"/><path class="cls-3" d="M9.74,2.56C10.39,7,10.09,8,5.37,10.67A10.78,10.78,0,0,0,9.74,2.56Z"/><path class="cls-3" d="M3.25.44c6.49,6.77,2.69,8.5,1.5,10.23C4.75,10.67,7,8.59,3.25.44Z"/><path class="cls-3" d="M4.82,8.29l-.34,2.37C3.91,8.48,4,7.14,0,4.06,4.85,5.23,4.82,8.29,4.82,8.29Z"/><rect class="cls-4" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MainToolbar/DebugFindNode.svg b/Content/Slate/Starship/MainToolbar/DebugFindNode.svg
new file mode 100644
index 0000000..b56520e
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/DebugFindNode.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M19 16V18H1V16C1 15.4696 1.21062 14.9609 1.58569 14.5858C1.96077 14.2107 2.46957 14 3 14H17C17.5304 14 18.0392 14.2107 18.4143 14.5858C18.7894 14.9609 19 15.4696 19 16Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.21 9L14.21 12C14.4627 11.9629 14.6919 11.8306 14.8501 11.63C15.2301 11.26 15.22 10.99 15.22 10.99L12.22 7.98999L11.21 9Z" fill="white"/>
+<path d="M8.50001 2C9.13489 2 9.75558 2.1883 10.2835 2.54102C10.8113 2.89373 11.2226 3.39502 11.4656 3.98157C11.7085 4.56812 11.7723 5.2135 11.6484 5.83618C11.5246 6.45886 11.2187 7.03093 10.7698 7.47986C10.3209 7.92878 9.74891 8.23442 9.12623 8.35828C8.50355 8.48213 7.85804 8.41862 7.27149 8.17566C6.68494 7.9327 6.18378 7.52129 5.83106 6.99341C5.47834 6.46553 5.29005 5.84484 5.29005 5.20996C5.29005 4.35862 5.62824 3.54218 6.23023 2.94019C6.83223 2.33819 7.64866 2 8.50001 2V2ZM8.50001 1C7.66537 1 6.8495 1.24748 6.15553 1.71118C5.46155 2.17488 4.92073 2.834 4.60133 3.6051C4.28193 4.37621 4.19826 5.22474 4.36109 6.04333C4.52392 6.86193 4.92595 7.6138 5.51612 8.20398C6.1063 8.79416 6.85817 9.19606 7.67677 9.35889C8.49537 9.52172 9.3439 9.43818 10.115 9.11877C10.8861 8.79937 11.5451 8.25843 12.0088 7.56445C12.4725 6.87048 12.72 6.05461 12.72 5.21997C12.72 4.10076 12.2753 3.02737 11.4839 2.23596C10.6925 1.44456 9.61922 1 8.50001 1V1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/DebugStepInto.svg b/Content/Slate/Starship/MainToolbar/DebugStepInto.svg
new file mode 100644
index 0000000..2bc9355
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/DebugStepInto.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M19 16V18H1V16C1 15.4696 1.21062 14.9609 1.58569 14.5858C1.96077 14.2107 2.46957 14 3 14H17C17.5304 14 18.0392 14.2107 18.4143 14.5858C18.7894 14.9609 19 15.4696 19 16Z" fill="white"/>
+<path d="M10.5 11.5V5.49998C10.5586 5.0924 10.5214 4.67681 10.3914 4.28611C10.2613 3.89542 10.0419 3.54041 9.75073 3.24925C9.45957 2.95808 9.10456 2.73867 8.71387 2.60862C8.32317 2.47857 7.90758 2.44141 7.5 2.49998H1.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M6.5 7.5L10.5 11.5L14.5 7.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/DebugStepOut.svg b/Content/Slate/Starship/MainToolbar/DebugStepOut.svg
new file mode 100644
index 0000000..35b384c
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/DebugStepOut.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M19 16V18H1V16C1 15.4696 1.21062 14.9609 1.58569 14.5858C1.96077 14.2107 2.46957 14 3 14H17C17.5304 14 18.0392 14.2107 18.4143 14.5858C18.7894 14.9609 19 15.4696 19 16Z" fill="white"/>
+<path d="M17.5001 5.49998H10.5001C10.0925 5.44141 9.67693 5.47857 9.28624 5.60862C8.89554 5.73867 8.54054 5.95808 8.24937 6.24925C7.9582 6.54041 7.7388 6.89542 7.60875 7.28611C7.47869 7.67681 7.44153 8.0924 7.5001 8.49998V11.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M13.5 9.5L17.5 5.5L13.5 1.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/DebugStepOver.svg b/Content/Slate/Starship/MainToolbar/DebugStepOver.svg
new file mode 100644
index 0000000..13fe346
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/DebugStepOver.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M19 16V18H1V16C1 15.4696 1.21062 14.9609 1.58569 14.5858C1.96077 14.2107 2.46957 14 3 14H17C17.5304 14 18.0392 14.2107 18.4143 14.5858C18.7894 14.9609 19 15.4696 19 16Z" fill="white"/>
+<path d="M17.5 6.5H1.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+<path d="M13.5 10.5L17.5 6.5L13.5 2.5" stroke="white" stroke-width="1.5" stroke-miterlimit="10" stroke-linecap="round"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/LevelBlueprint.svg b/Content/Slate/Starship/MainToolbar/LevelBlueprint.svg
new file mode 100644
index 0000000..ce95a26
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/LevelBlueprint.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 15L13 11L16 15V16H0V15L3 11L1 15H15Z" fill="white"/>
+<path d="M4 4V5C4 5.55228 4.44772 6 5 6H7C7.55228 6 8 5.55228 8 5V4C8 3.44772 7.55228 3 7 3H5C4.44772 3 4 3.44772 4 4Z" fill="white"/>
+<path d="M12 1V2C12 2.55228 12.4477 3 13 3H15C15.5523 3 16 2.55228 16 2V1C16 0.447715 15.5523 0 15 0H13C12.4477 0 12 0.447715 12 1Z" fill="white"/>
+<path d="M12 7V8C12 8.55228 12.4477 9 13 9H15C15.5523 9 16 8.55228 16 8V7C16 6.44772 15.5523 6 15 6H13C12.4477 6 12 6.44772 12 7Z" fill="white"/>
+<path opacity="0.5" d="M14 2V1H10C9.73478 1 9.48043 1.10536 9.29289 1.29289C9.10536 1.48043 9 1.73478 9 2V4H8V5H9V7C9 7.26522 9.10536 7.51957 9.29289 7.70711C9.48043 7.89464 9.73478 8 10 8H14V7H10.6C10.4409 7 10.2883 6.93679 10.1757 6.82426C10.0632 6.71174 10 6.55913 10 6.4V2.6C10 2.44087 10.0632 2.28826 10.1757 2.17574C10.2883 2.06321 10.4409 2 10.6 2H14Z" fill="white"/>
+<path d="M10.5 9L9 13L6.5 7L3 14H13L10.5 9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/PlaceActorsBase.svg b/Content/Slate/Starship/MainToolbar/PlaceActorsBase.svg
new file mode 100644
index 0000000..d5e8464
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/PlaceActorsBase.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 0L0 3.4V12.7L7 17V11H9V0Z" fill="white"/>
+<path opacity="0.5" d="M9 11V0L16 3V7H11V11H9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/PlayMobilePreview.svg b/Content/Slate/Starship/MainToolbar/PlayMobilePreview.svg
new file mode 100644
index 0000000..1897c00
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/PlayMobilePreview.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{fill-rule:evenodd;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><path class="cls-1" d="M9.94,19h8.12a.94.94,0,0,0,.94-.94V3.94A.94.94,0,0,0,18.06,3H10.35L12,4h6V15H10V11.91l-1,.6v5.55A.94.94,0,0,0,9.94,19Zm2.56-2A1.5,1.5,0,1,1,14,18.5,1.5,1.5,0,0,1,12.5,17Z"/><path class="cls-2" d="M1,14.9,13.6,8.1a.67.67,0,0,0,0-1.2L1,.1A.66.66,0,0,0,0,.7V14.4A.65.65,0,0,0,1,14.9Z"/><rect class="cls-3" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MainToolbar/PlayNewEditorWindow.svg b/Content/Slate/Starship/MainToolbar/PlayNewEditorWindow.svg
new file mode 100644
index 0000000..cc83ca8
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/PlayNewEditorWindow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><path class="cls-1" d="M1,14.9,13.59,8.1a.67.67,0,0,0,0-1.2L1,.1A.66.66,0,0,0,0,.7V14.4A.65.65,0,0,0,1,14.9Z"/><path class="cls-1" d="M8.25,13H19V10H13.69Zm7.25-2.5a1,1,0,0,1,1,1,1,1,0,1,1,1,1,1,1,0,0,1-1-1,1,1,0,0,1-2,0,1,1,0,1,1-1-1,1,1,0,0,1,1,1A1,1,0,0,1,15.5,10.5Z"/><polygon class="cls-2" points="5 14.79 5 20 19 20 19 13 8.25 13 5 14.79"/><rect class="cls-3" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MainToolbar/PlayStandaloneGame.svg b/Content/Slate/Starship/MainToolbar/PlayStandaloneGame.svg
new file mode 100644
index 0000000..29a14e8
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/PlayStandaloneGame.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><path class="cls-1" d="M1,14.9,13.59,8.1a.67.67,0,0,0,0-1.2L1,.1A.66.66,0,0,0,0,.7V14.4A.65.65,0,0,0,1,14.9Z"/><path class="cls-2" d="M4.51,18.49c8.49-1.32,10.82-5.13,10.82-5.13l-2-2,6.42-1.12-1.12,6.42-2-2S13.36,18.4,4.51,18.49Z"/><rect class="cls-3" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MainToolbar/PlayVRPreview.svg b/Content/Slate/Starship/MainToolbar/PlayVRPreview.svg
new file mode 100644
index 0000000..2fd4866
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/PlayVRPreview.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2,.cls-3{fill:#fff;}.cls-2{fill-rule:evenodd;}.cls-3{opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><path class="cls-1" d="M1,14.9,13.59,8.1a.67.67,0,0,0,0-1.2L1,.1A.66.66,0,0,0,0,.7V14.4A.65.65,0,0,0,1,14.9Z"/><path class="cls-2" d="M9.26,13.83H9.2L5,14.45v3.9l2.56.37.6-1.78.73-1L9.68,17l.78,2.16,4.39.65a1,1,0,0,0,1.15-1V14a1,1,0,0,0-1.15-1ZM5.44,17.61V15.19L8.09,15l-.9,2.8Zm9.2.8L11,18.1,9.77,14.81l4.87-.42Z"/><path class="cls-3" d="M18.78,13.08,15.18,13h-.33A1,1,0,0,1,16,14v4.82a1,1,0,0,1-.3.69L19.27,18a1.36,1.36,0,0,0,.73-1.2V14.34A1.28,1.28,0,0,0,18.78,13.08Z"/><rect class="cls-4" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MainToolbar/SingleFrameAdvance.svg b/Content/Slate/Starship/MainToolbar/SingleFrameAdvance.svg
new file mode 100644
index 0000000..f5c71e8
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/SingleFrameAdvance.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6 18H3V2H6V18ZM9 17.9L18.5 10L9 2.1V17.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/ToolBadgePlus.svg b/Content/Slate/Starship/MainToolbar/ToolBadgePlus.svg
new file mode 100644
index 0000000..606bdff
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/ToolBadgePlus.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 13H16V9H13V13H9V16H13V20H16V16H20V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/blueprints.svg b/Content/Slate/Starship/MainToolbar/blueprints.svg
new file mode 100644
index 0000000..f52e573
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/blueprints.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20 4V7C20 7.6 19.6 8 19 8H15C14.4 8 14 7.6 14 7V4C14 3.4 14.4 3 15 3H19C19.6 3 20 3.4 20 4Z" fill="white"/>
+<path d="M20 14V17C20 17.6 19.6 18 19 18H15C14.4 18 14 17.6 14 17V14C14 13.4 14.4 13 15 13H19C19.6 13 20 13.4 20 14Z" fill="white"/>
+<path d="M6 9V12C6 12.6 5.6 13 5 13H1C0.4 13 0 12.6 0 12V9C0 8.4 0.4 8 1 8H5C5.6 8 6 8.4 6 9Z" fill="white"/>
+<path opacity="0.5" d="M15 6V5H10.2C9.6 5 9 5.6 9 6.2V10H5V11H9V14.8C9 15.5 9.6 16 10.2 16H15V15H10.7C10.3 15 10 14.7 10 14.3V6.7C10 6.3 10.3 6 10.7 6H15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/brush_edit.svg b/Content/Slate/Starship/MainToolbar/brush_edit.svg
new file mode 100644
index 0000000..1e9f1a2
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/brush_edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="Volume"><rect class="cls-1" x="12" width="2" height="2"/><rect class="cls-1" x="12" y="17" width="2" height="2"/><rect class="cls-1" y="16" width="2" height="2"/><rect class="cls-1" y="2" width="2" height="2"/><rect class="cls-1" x="18" y="3" width="2" height="2"/><rect class="cls-1" x="18" y="15" width="2" height="2"/><polygon class="cls-1" points="13 3 11 3 11 1.19 3 3.04 3 5 1 5 1 15 3 15 3 16.73 11 17.96 11 16 13 16 13 3"/><polygon class="cls-2" points="19 6 17 6 17 3.68 15 1.68 15 3 14 3 14 16 15 16 15 17.67 17 16.37 17 14 19 14 19 6"/><rect class="cls-3" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MainToolbar/cinematics.svg b/Content/Slate/Starship/MainToolbar/cinematics.svg
new file mode 100644
index 0000000..477c660
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/cinematics.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10 2.5L8 3.2V6.4L10 5.7V2.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 3.5L18 2.8L17 0L16 0.3V3.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 7.8L6 7.1V3.9L4 4.6V7.8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.99998 5.3L0.0999756 6L1.09998 8.8L1.99998 8.5V5.3Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14 1.1L12 1.8V5L14 4.2V1.1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1 9V19H19V9H1Z" fill="white" fill-opacity="0.5"/>
+<path d="M17 11H3V12H17V11Z" fill="white"/>
+<path d="M10 13H3V17H10V13Z" fill="white"/>
+<path d="M17 13H11V17H17V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/compile.svg b/Content/Slate/Starship/MainToolbar/compile.svg
new file mode 100644
index 0000000..2d525aa
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/compile.svg
@@ -0,0 +1,16 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 15H3V18H6V15Z" fill="white"/>
+<path d="M10 15H7V18H10V15Z" fill="white"/>
+<path d="M14 15H11V18H14V15Z" fill="white"/>
+<path d="M18 15H15V18H18V15Z" fill="white"/>
+<path d="M18 11H15V14H18V11Z" fill="white"/>
+<path d="M14 11H11V14H14V11Z" fill="white"/>
+<path d="M10 11H7V14H10V11Z" fill="white"/>
+<path d="M6 11H3V14H6V11Z" fill="white"/>
+<path d="M14 7H11V10H14V7Z" fill="white"/>
+<path d="M18 7H15V10H18V7Z" fill="white"/>
+<path d="M18 3H15V6H18V3Z" fill="white"/>
+<path opacity="0.5" d="M12 1H9V4H12V1Z" fill="white"/>
+<path opacity="0.5" d="M8 5H5V8H8V5Z" fill="white"/>
+<path opacity="0.5" d="M4 0H1V3H4V0Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/content.svg b/Content/Slate/Starship/MainToolbar/content.svg
new file mode 100644
index 0000000..6d48e87
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/content.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.7999 16L9.79991 19C9.79991 19 9.49991 19 9.19991 18.6C8.69991 18.3 8.79991 18 8.79991 18L11.7999 15L12.7999 16Z" fill="white"/>
+<path d="M15.4998 9.5C16.9998 9.5 18.1998 10.7 18.1998 12.2C18.1998 13.7 16.9998 15 15.4998 15C13.9998 15 12.7998 13.8 12.7998 12.3C12.7998 10.8 13.9998 9.5 15.4998 9.5ZM15.4998 8C13.1998 8 11.2998 9.9 11.2998 12.2C11.2998 14.5 13.1998 16.4 15.4998 16.4C17.7998 16.4 19.6998 14.5 19.6998 12.2C19.6998 9.9 17.7998 8 15.4998 8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5 4H10H18C18.6 4 19 4.4 19 5V7.5C18.4 7.1 17.7 6.7 17.4 6.6C16.6 6.3 15.8 6.2 14.9 6.3C12 6.6 9.6 9.1 9.5 12C9.4 12.9 9.6 13.8 9.9 14.6C9.2 15.4 7.7 17 7.7 17H3C2.4 17 2 16.6 2 16V4H5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M11 3L8.8 0.4C8.6 0.1 8.3 0 8 0H3C2.4 0 2 0.4 2 1V3H11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/eject.svg b/Content/Slate/Starship/MainToolbar/eject.svg
new file mode 100644
index 0000000..c996327
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/eject.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 17V14H18V17H2ZM17.9 11L10 1.5L2.1 11H17.9Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/foliage.svg b/Content/Slate/Starship/MainToolbar/foliage.svg
new file mode 100644
index 0000000..ffea099
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/foliage.svg
@@ -0,0 +1,7 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.9 11.2C18.1 13.2 14.1 15.8 10.1 20C10.2 20 12.6 12.2 20.9 11.2Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.70001 0.400002C16.8 11.1 11 17.7 9.29999 20C9.29999 20 12.8 12.5 7.70001 0.400002Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M1.09998 12C7.99998 13.1 7.9 18.8 8 20C8 20 5.89998 15.3 1.09998 12Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M21 16.7C15.4 16.7 11.1 18.8 11 20C11 20 16.3 19.9 21 16.7Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.40002 16.8L8.90002 19.9C8.10002 17 9.20002 12.3 2.40002 6.7C10.2 11.2 9.40002 16.8 9.40002 16.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/landscape.svg b/Content/Slate/Starship/MainToolbar/landscape.svg
new file mode 100644
index 0000000..e842b1d
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/landscape.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 19L14.5 6.8L10.5 16L7.5 12L4 19H20Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.5 1L0 17H3L7.5 9.5L10 13L11.8 9L7.5 1Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/launch.svg b/Content/Slate/Starship/MainToolbar/launch.svg
new file mode 100644
index 0000000..eb02438
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/launch.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M4 1V8.4C4.1 8.4 6.7 8.4 8 10.2C9.6 8.2 13.4 8 14.4 9.9C14.6 10.2 14.8 10.6 15 11H20V4.3V1H4Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 1V8.4C4 8.4 4.4 8.4 5 8.4V2H19V10H14.5C14.7 10.3 14.8 10.6 15 11H20V4.3V1H4Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M16.7 15H20V13.8L15.7 13C16.3 14.2 16.7 15 16.7 15Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.8 15C14.2 13.3 12.9999 10.4 11.6999 10.4C9.8999 10.4 9.89992 12.1 9.09992 12.1C8.69992 12.1 7.29999 12.1 6.79999 12.1C5.99999 12.1 6.09999 10.4 4.29999 10.4C3.09999 10.4 1.7999 13.3 1.1999 15C0.0998966 18.1 -5.72205e-06 19.6 2.29999 19.6C4.79999 19.6 4.69995 16.7 7.99995 16.7C11.0999 16.7 11.1999 19.6 13.5999 19.6C15.8999 19.6 15.9 18.1 14.8 15ZM6.49995 15H4.99995V16.5H3.99995V15H2.49995V14H3.99995V12.5H4.99995V14H6.49995V15ZM11.4999 16.5C10.3999 16.5 9.49995 15.6 9.49995 14.5C9.49995 13.4 10.3999 12.5 11.4999 12.5C12.5999 12.5 13.4999 13.4 13.4999 14.5C13.4999 15.6 12.5999 16.5 11.4999 16.5Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5 13.8C11.1 13.8 10.8 14.1 10.8 14.5C10.8 14.9 11.1 15.2 11.5 15.2C11.9 15.2 12.2 14.9 12.2 14.5C12.2 14.1 11.9 13.8 11.5 13.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/marketplace.svg b/Content/Slate/Starship/MainToolbar/marketplace.svg
new file mode 100644
index 0000000..a1c02c3
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/marketplace.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M6 4V7.8H7V4C7 2.3 8.3 1 10 1C11.7 1 13 2.3 13 4V7.8H14V4C14 1.8 12.2 0 10 0C7.8 0 6 1.8 6 4Z" fill="white"/>
+<path d="M1 6V19H19V6H1ZM12.3 17.2L11.2 16.3L10 17.6C10 17.6 7.29998 17.4 6.09998 15.7C6.09998 15.7 6.3 15.8 6.5 15.8C6.7 15.8 7 15.7 7 15.3V11.4C7 11.2 6.89998 11 6.59998 11C6.29998 11 5.90002 11.2 5.40002 11.7C4.30002 12.8 3.80005 13.9 3.80005 13.9C3.80005 13.9 3.49995 12.3 5.19995 10.4C6.89995 8.5 8.1 7.8 9.5 7.4C9.5 7.4 8.40002 8 8.40002 9C8.40002 9.3 8.4 9.5 8.5 9.6C8.6 9.8 8.70005 9.8 8.80005 9.8C8.90005 9.8 8.99998 9.8 9.09998 9.7V14.8C9.09998 14.8 9.09995 14.9 9.19995 15C9.29995 15.1 9.50005 15.3 9.80005 15.3C10.3 15.3 11 14.7 11 14.7V10.6C11 10.2 10.7 9.7 10.4 9.5C10.4 9.5 11.1 9.5 11.4 9.7C11.4 9.7 12.5 8.4 14.6 7.9C14.6 7.9 13.5 9.2 13.2 9.9C13.1 9.9 13.1 11.1 13.1 12.4C13.1 13.6 13.1 14.8 13.2 14.8C13.2 14.8 13.3 15 13.6 15C13.9 15 14.5 14.8 15.4 13.8C15.3 13.8 14.3 16 12.3 17.2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/paint.svg b/Content/Slate/Starship/MainToolbar/paint.svg
new file mode 100644
index 0000000..4ad4756
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/paint.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.29999 14.1L7.79999 12.6C7.79999 12.6 10.2 9.7 11.6 8.2C13 6.7 19.1 2 19.1 2C19.3 1.8 19.6 1.8 19.8 2C20 2.2 20 2.5 19.8 2.7C19.8 2.7 15 8.9 13.6 10.3C12.2 11.7 9.29999 14.1 9.29999 14.1Z" fill="white"/>
+<path d="M8 14.5L7.1 13.4C7.1 13.4 4.6 13 3.7 16.4C3 18.6 0 20 0 20C0 20 2.7 20 3.7 20C4.8 20 6.7 19.5 7.7 17.5C8.6 15.8 8 14.5 8 14.5Z" fill="white"/>
+<path opacity="0.5" d="M3 14C3.7 13.2 4.8 12.1 6.5 11.4C8.3 9.3 12.4 5.6 15.5 3C15.1 2.6 14.6 2.2 14.1 2C9.4 -0.799997 3.6 0.600003 1.1 4.9C-1 8.8 0.3 12.3 3 14ZM10.1 2.7C10.5 1.9 11.5 1.7 12.3 2.1C13.1 2.5 13.3 3.5 12.9 4.3C12.5 5.1 11.5 5.3 10.7 4.9C10 4.5 9.7 3.5 10.1 2.7ZM4.9 11.3C4.5 12.1 3.5 12.3 2.7 11.9C1.9 11.5 1.7 10.5 2.1 9.7C2.5 8.9 3.5 8.7 4.3 9.1C5.1 9.6 5.4 10.5 4.9 11.3ZM5 2.7C5.4 1.9 6.4 1.7 7.2 2.1C8 2.5 8.2 3.5 7.8 4.3C7.4 5 6.4 5.3 5.6 4.9C4.9 4.5 4.6 3.5 5 2.7ZM2.1 5.7C2.5 4.9 3.5 4.7 4.3 5.1C5.1 5.5 5.3 6.5 4.9 7.3C4.4 8 3.4 8.3 2.7 7.9C1.9 7.4 1.6 6.4 2.1 5.7Z" fill="white"/>
+<path opacity="0.5" d="M11.4 14.4C14.2 14.5 15.8 17.1 18.5 15.5C20.5 14.3 20.1 10.5 18.5 7.10001C17.2 8.70001 15.5 10.8 14.4 11.9C13.5 12.8 12.3 13.7 11.4 14.4ZM15.6 12.3C16 11.5 17 11.3 17.8 11.7C18.6 12.1 18.8 13.1 18.4 13.9C18 14.7 17 14.9 16.2 14.5C15.4 14 15.2 13 15.6 12.3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/pause.svg b/Content/Slate/Starship/MainToolbar/pause.svg
new file mode 100644
index 0000000..3495f80
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/pause.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 18H4V2H8V18ZM16 2H12V18H16V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/place.svg b/Content/Slate/Starship/MainToolbar/place.svg
new file mode 100644
index 0000000..9b11959
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/place.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9 0L0 3.4V12.7L7 17V11H9V0Z" fill="white"/>
+<path opacity="0.5" d="M9 11V0L16 3V7H11V11H9Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20 13H16V9H13V13H9V16H13V20H16V16H20V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/save.svg b/Content/Slate/Starship/MainToolbar/save.svg
new file mode 100644
index 0000000..fabf1d6
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/save.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M15 1V7H4V1H2V18H5V11H16V18H19V4L16 1H15Z" fill="white"/>
+<path d="M16 11H5V18H16V11Z" fill="white"/>
+<path d="M5 1V6H14V1H5ZM13 5H11V2H13V5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/select.svg b/Content/Slate/Starship/MainToolbar/select.svg
new file mode 100644
index 0000000..6003f73
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/select.svg
@@ -0,0 +1,5 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 0L1 3.4V12.7L10 16V0Z" fill="white"/>
+<path opacity="0.5" d="M10 4.4V0L16 4V8.1L10 4.4Z" fill="white"/>
+<path d="M20 14.8L12 8L12.1 18.5L14.4 15.3L16.7 20L18.4 19.2L16.1 14.5L20 14.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/settings.svg b/Content/Slate/Starship/MainToolbar/settings.svg
new file mode 100644
index 0000000..4727d98
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/settings.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.4 11.2C19.4 10.8 19.5 10.4 19.5 10C19.5 9.6 19.4 9.2 19.4 8.8L16.5 8.4C16.3 7.7 16.1 7.1 15.7 6.6L17.5 4.2C17 3.6 16.5 3 15.8 2.5L13.4 4.3C12.8 4 12.2 3.7 11.6 3.5L11.2 0.599998C10.8 0.599998 10.4 0.5 10 0.5C9.6 0.5 9.20005 0.599998 8.80005 0.599998L8.40002 3.5C7.80002 3.7 7.09998 3.9 6.59998 4.3L4.19995 2.5C3.59995 3 3 3.5 2.5 4.2L4.30005 6.6C4.00005 7.2 3.69998 7.8 3.59998 8.4L0.699951 8.8C0.699951 9.2 0.599976 9.6 0.599976 10C0.599976 10.4 0.699951 10.8 0.699951 11.2L3.59998 11.6C3.79998 12.2 4.00005 12.8 4.30005 13.4L2.5 15.8C3 16.4 3.49995 17 4.19995 17.5L6.59998 15.7C7.19998 16 7.80002 16.3 8.40002 16.5L8.80005 19.4C9.20005 19.5 9.6 19.5 10 19.5C10.4 19.5 10.8 19.4 11.2 19.4L11.6 16.5C12.3 16.3 12.9 16.1 13.4 15.7L15.8 17.5C16.4 17 17 16.5 17.5 15.8L15.7 13.4C16 12.8 16.3 12.2 16.5 11.6L19.4 11.2ZM10 15.4C7 15.4 4.59998 13 4.59998 10C4.59998 7 7 4.6 10 4.6C13 4.6 15.4 7 15.4 10C15.4 13 13 15.4 10 15.4Z" fill="white"/>
+<path opacity="0.5" d="M10 7.3C11.5 7.3 12.7 8.5 12.7 10C12.7 11.5 11.5 12.7 10 12.7C8.5 12.7 7.30005 11.5 7.30005 10C7.30005 8.5 8.5 7.3 10 7.3ZM10 6.3C8 6.3 6.30005 8 6.30005 10C6.30005 12 8 13.7 10 13.7C12 13.7 13.7 12 13.7 10C13.7 8 12 6.3 10 6.3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MainToolbar/simulate.svg b/Content/Slate/Starship/MainToolbar/simulate.svg
new file mode 100644
index 0000000..4af5394
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/simulate.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><path class="cls-1" d="M1,14.85,13.5,8.1a.67.67,0,0,0,0-1.2L1,.15a.65.65,0,0,0-1,.6v13.6A.65.65,0,0,0,1,14.85Z"/><path class="cls-1" d="M6.51,13.83a.67.67,0,0,1,0,1.34.66.66,0,0,1-.66-.67A.67.67,0,0,1,6.51,13.83ZM4.28,17.35l.91-.68a2.41,2.41,0,0,0,.7.29l.16,1.12.44.05A3.41,3.41,0,0,0,7,18.08L7.11,17a2.85,2.85,0,0,0,.7-.28l.9.67a3.47,3.47,0,0,0,.64-.63l-.68-.91A2.35,2.35,0,0,0,9,15.12L10.08,15a3.42,3.42,0,0,0,0-.45,2.28,2.28,0,0,0,0-.45L9,13.89a3,3,0,0,0-.29-.69l.68-.9c-.06-.08-.14-.14-.2-.21l-1.43.83a2,2,0,1,1-3.2,1.87L4,15.1H4a2.53,2.53,0,0,0,.29.7l-.67.9A3.47,3.47,0,0,0,4.28,17.35Z"/><path class="cls-1" d="M17,13.89a3,3,0,0,0-.29-.69l.68-.9a3.82,3.82,0,0,0-.63-.64l-.91.67a2.6,2.6,0,0,0-.69-.29L15,10.92l-.45-.05a3.12,3.12,0,0,0-.44.05L13.9,12a2.53,2.53,0,0,0-.7.29l-.91-.68a3.76,3.76,0,0,0-.63.63l.67.91a2.53,2.53,0,0,0-.29.7L10.92,14a3.42,3.42,0,0,0,0,.45,2.28,2.28,0,0,0,0,.45l1.11.17a2.53,2.53,0,0,0,.29.7l-.67.9a3.47,3.47,0,0,0,.63.64l.91-.68a2.41,2.41,0,0,0,.7.29l.16,1.12.44.05a3.41,3.41,0,0,0,.46-.05L15.11,17a2.85,2.85,0,0,0,.7-.28l.9.67a3.47,3.47,0,0,0,.64-.63l-.68-.91a2.35,2.35,0,0,0,.29-.69L18.08,15a3.42,3.42,0,0,0,0-.45,2.28,2.28,0,0,0,0-.45ZM14.5,16.5a2,2,0,1,1,2-2A2,2,0,0,1,14.5,16.5Zm.67-2a.67.67,0,0,1-.67.67.66.66,0,0,1-.66-.67.67.67,0,1,1,1.33,0Z"/><path class="cls-2" d="M14.5,9h0l-1.71,1H14.5a4.5,4.5,0,0,1,0,9h-9a4.5,4.5,0,0,1-4-2.45l-.87.51A5.48,5.48,0,0,0,5.5,20h9a5.5,5.5,0,0,0,0-11Z"/><rect class="cls-3" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MainToolbar/stop.svg b/Content/Slate/Starship/MainToolbar/stop.svg
new file mode 100644
index 0000000..27c30f1
--- /dev/null
+++ b/Content/Slate/Starship/MainToolbar/stop.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 2H3V18H17V2Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MaterialEditor/Hierarchy.svg b/Content/Slate/Starship/MaterialEditor/Hierarchy.svg
new file mode 100644
index 0000000..9e9dd7f
--- /dev/null
+++ b/Content/Slate/Starship/MaterialEditor/Hierarchy.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19 17H14V19H19V17Z" fill="white"/>
+<path d="M5 17H0V19H5V17Z" fill="white"/>
+<path d="M12 17H7V19H12V17Z" fill="white"/>
+<path d="M12 8H7V10H12V8Z" fill="white"/>
+<path d="M15 1H4V5H15V1Z" fill="white"/>
+<path opacity="0.5" d="M16 18H17V13H10V9H9V13H2V18H3V14H16V18Z" fill="white"/>
+<path opacity="0.5" d="M10 14H9V17H10V14Z" fill="white"/>
+<path opacity="0.5" d="M10 4H9V8H10V4Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MaterialEditor/LiveUpdate.svg b/Content/Slate/Starship/MaterialEditor/LiveUpdate.svg
new file mode 100644
index 0000000..3bc57c4
--- /dev/null
+++ b/Content/Slate/Starship/MaterialEditor/LiveUpdate.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5 7H15V6H2.5C1.1 6 0 7.2 0 8.6V16.4C0 17.8 1.1 19 2.5 19H15V18H2.5C1.7 18 1 17.3 1 16.4V8.6C1 7.7 1.7 7 2.5 7Z" fill="white"/>
+<path opacity="0.5" d="M10.5996 6.9001L14.3996 0.600098" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M8.1004 6.9001L4.40039 0.600098" stroke="white" stroke-width="1.25" stroke-miterlimit="10"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5 6H15V19H17.5C18.9 19 20 17.8 20 16.4V8.6C20 7.2 18.9 6 17.5 6ZM17.5 16.9C16.5 16.9 15.6 16.1 15.6 15C15.6 13.9 16.4 13.1 17.5 13.1C18.5 13.1 19.4 13.9 19.4 15C19.4 16.1 18.5 16.9 17.5 16.9ZM17.5 11.9C16.5 11.9 15.6 11.1 15.6 10C15.6 8.9 16.4 8.1 17.5 8.1C18.5 8.1 19.4 8.9 19.4 10C19.4 11.1 18.5 11.9 17.5 11.9Z" fill="white"/>
+<path d="M7.4998 8.19995C5.1998 8.19995 3.2998 10.1 3.2998 12.4C3.2998 14.7 5.1998 16.6 7.4998 16.6C8.7998 16.6 9.9998 16 10.7998 15L9.7998 14.3C9.2998 14.9 8.49981 15.3 7.59981 15.3C5.89981 15.3 4.59981 14 4.59981 12.3C4.59981 10.6 5.89981 9.29995 7.59981 9.29995C9.29981 9.29995 10.5998 10.6 10.5998 12.3C10.5998 12.5 10.5998 12.6 10.4998 12.8H11.7998C11.7998 12.6 11.8998 12.5 11.8998 12.3C11.7998 10.2 9.7998 8.19995 7.4998 8.19995Z" fill="white"/>
+<path d="M13 13H8L13 8V13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MaterialEditor/MaterialLayerParams.svg b/Content/Slate/Starship/MaterialEditor/MaterialLayerParams.svg
new file mode 100644
index 0000000..aede920
--- /dev/null
+++ b/Content/Slate/Starship/MaterialEditor/MaterialLayerParams.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-2{opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><g id="Layers"><path class="cls-2" d="M2.85,8.33,8.6,11.5l5.75-3.17-1.28-.71L8.6,10.09,4.13,7.63h0Z"/><path class="cls-2" d="M2.85,5.23,8.6,8.4l5.75-3.18-1.28-.7L8.6,7,4.13,4.52h0S2.85,5.22,2.85,5.23Z"/><path class="cls-3" d="M2.85,2.12,8.6,5.29l5.75-3.17L8.6,0Z"/><rect class="cls-3" x="6" y="12" width="2" height="4"/><rect class="cls-2" x="10" y="13" width="5" height="2"/><rect class="cls-3" x="1" y="13" width="6" height="2"/><rect class="cls-4" width="16" height="16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/MaterialEditor/PlatformStats.svg b/Content/Slate/Starship/MaterialEditor/PlatformStats.svg
new file mode 100644
index 0000000..e454b7b
--- /dev/null
+++ b/Content/Slate/Starship/MaterialEditor/PlatformStats.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.0996 0H2.99963C2.49963 0 2.09961 0.400002 2.09961 0.900002V19C2.09961 19.5 2.49963 19.9 2.99963 19.9H16.0996C16.5996 19.9 16.9996 19.5 16.9996 19V0.900002C16.9996 0.400002 16.5996 0 16.0996 0ZM9.49963 19.5C8.69963 19.5 7.99963 18.8 7.99963 18C7.99963 17.2 8.69963 16.5 9.49963 16.5C10.2996 16.5 10.9996 17.2 10.9996 18C10.9996 18.8 10.2996 19.5 9.49963 19.5ZM15.9996 16H2.99963V1H15.9996V16Z" fill="white"/>
+<path d="M7 10H4V14H7V10Z" fill="white" fill-opacity="0.5"/>
+<path d="M11 3H8V14H11V3Z" fill="white"/>
+<path d="M15 7H12V14H15V7Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/MergeActors/MeshMerging_16.svg b/Content/Slate/Starship/MergeActors/MeshMerging_16.svg
new file mode 100644
index 0000000..c37ba86
--- /dev/null
+++ b/Content/Slate/Starship/MergeActors/MeshMerging_16.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.5 7C9.88071 7 11 5.88071 11 4.5C11 3.11929 9.88071 2 8.5 2C7.11929 2 6 3.11929 6 4.5C6 5.88071 7.11929 7 8.5 7Z" fill="white"/>
+<path d="M3.5 14C4.32843 14 5 13.3284 5 12.5C5 11.6716 4.32843 11 3.5 11C2.67157 11 2 11.6716 2 12.5C2 13.3284 2.67157 14 3.5 14Z" fill="white"/>
+<path d="M8.5 14C9.32843 14 10 13.3284 10 12.5C10 11.6716 9.32843 11 8.5 11C7.67157 11 7 11.6716 7 12.5C7 13.3284 7.67157 14 8.5 14Z" fill="white"/>
+<path d="M13.5 14C14.3284 14 15 13.3284 15 12.5C15 11.6716 14.3284 11 13.5 11C12.6716 11 12 11.6716 12 12.5C12 13.3284 12.6716 14 13.5 14Z" fill="white"/>
+<path d="M4 8H3V12H4V8Z" fill="white" fill-opacity="0.5"/>
+<path d="M9 5H8V12H9V5Z" fill="white" fill-opacity="0.5"/>
+<path d="M14 8H13V12H14V8Z" fill="white" fill-opacity="0.5"/>
+<path d="M8 8H4V9H8V8Z" fill="white" fill-opacity="0.5"/>
+<path d="M13 8H9V9H13V8Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/MergeActors/MeshProxy_16.svg b/Content/Slate/Starship/MergeActors/MeshProxy_16.svg
new file mode 100644
index 0000000..655ed22
--- /dev/null
+++ b/Content/Slate/Starship/MergeActors/MeshProxy_16.svg
@@ -0,0 +1,7 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.5 8C14.5 11.5899 11.5899 14.5 8 14.5C4.41015 14.5 1.5 11.5899 1.5 8C1.5 4.41015 4.41015 1.5 8 1.5C11.5899 1.5 14.5 4.41015 14.5 8Z" stroke="white" stroke-opacity="0.5"/>
+<path d="M4 11C4.55228 11 5 10.5523 5 10C5 9.44772 4.55228 9 4 9C3.44772 9 3 9.44772 3 10C3 10.5523 3.44772 11 4 11Z" fill="white"/>
+<path d="M8 11C8.55228 11 9 10.5523 9 10C9 9.44772 8.55228 9 8 9C7.44772 9 7 9.44772 7 10C7 10.5523 7.44772 11 8 11Z" fill="white"/>
+<path d="M8 7C9.10457 7 10 6.10457 10 5C10 3.89543 9.10457 3 8 3C6.89543 3 6 3.89543 6 5C6 6.10457 6.89543 7 8 7Z" fill="white"/>
+<path d="M12 11C12.5523 11 13 10.5523 13 10C13 9.44772 12.5523 9 12 9C11.4477 9 11 9.44772 11 10C11 10.5523 11.4477 11 12 11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/MergeActors/approximate.svg b/Content/Slate/Starship/MergeActors/approximate.svg
new file mode 100644
index 0000000..7231c77
--- /dev/null
+++ b/Content/Slate/Starship/MergeActors/approximate.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.42 4.80994C14.9573 5.5212 14.3308 6.11121 13.593 6.53052C12.8553 6.94983 12.0279 7.18624 11.18 7.21994C9.98152 7.15342 8.81457 6.81121 7.76999 6.21994C6.85392 5.68694 5.82737 5.37212 4.76999 5.29993C4.16677 5.34954 3.57999 5.52142 3.04532 5.80508C2.51065 6.08875 2.03931 6.47829 1.66 6.94995L0.5 5.51993C0.993818 4.83239 1.63758 4.26623 2.38257 3.86429C3.12755 3.46234 3.95422 3.23517 4.79999 3.19995C5.97997 3.26398 7.128 3.60668 8.14999 4.19995C9.07186 4.71958 10.0953 5.03342 11.15 5.11993C11.7396 5.06494 12.3112 4.88704 12.8279 4.59769C13.3446 4.30833 13.795 3.91395 14.15 3.43994L15.42 4.80994ZM15.5 10.3199C15.0391 11.0504 14.4061 11.6567 13.6564 12.0855C12.9067 12.5144 12.0633 12.7529 11.2 12.7799C10.0214 12.7082 8.87509 12.366 7.85001 11.7799C6.91873 11.2402 5.87437 10.9252 4.79999 10.8599C4.20614 10.9188 3.62988 11.095 3.10461 11.3782C2.57935 11.6615 2.11551 12.0461 1.73999 12.5099L0.579987 11.0499C1.0676 10.3717 1.70228 9.81254 2.43652 9.41425C3.17077 9.01595 3.9856 8.78886 4.82001 8.74994C6.01903 8.8132 7.18672 9.15563 8.23001 9.74994C9.15188 10.2696 10.1753 10.5834 11.23 10.67C11.8313 10.6283 12.4164 10.4565 12.9447 10.1664C13.4731 9.87637 13.9321 9.47492 14.29 8.98993L15.5 10.3199Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Persona/AnimationNotifies.svg b/Content/Slate/Starship/Persona/AnimationNotifies.svg
new file mode 100644
index 0000000..cdd40f4
--- /dev/null
+++ b/Content/Slate/Starship/Persona/AnimationNotifies.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4{fill:#fff;}.cls-3{opacity:0.5;}.cls-4{fill-rule:evenodd;}.cls-5{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M16,1a3,3,0,0,1,3,3v6a3,3,0,0,1-2.85,3h-4l-.26.2L6.24,17.38l1-3.08L7.61,13H3.85A3,3,0,0,1,1,10V3.85A2.86,2.86,0,0,1,3.85,1H16m0-1H3.85A3.86,3.86,0,0,0,0,3.85V10a4,4,0,0,0,3.85,4h2.4L4.38,20l8.12-6h3.65A4,4,0,0,0,20,10V4a4,4,0,0,0-4-4Z"/><path class="cls-3" d="M14.05,7.15H12.12l-.89-1.56a1.55,1.55,0,0,1,0,1l-.34.58.45.79a.59.59,0,0,0,.56.29h2.16a.54.54,0,1,0,0-1.07Z"/><path class="cls-3" d="M7.42,9.31a1.32,1.32,0,0,1-.57-.71L6,10H4.13a.54.54,0,1,0,0,1.07H6.29a.57.57,0,0,0,.54-.28l.79-1.35Z"/><path class="cls-4" d="M6.36,6.07,7.59,4.7l1.18.61L7.25,7.9A1,1,0,0,0,7.75,9l.09.05h0l2.22,1.26v1.86a.54.54,0,0,0,1.08,0V10a.5.5,0,0,0-.19-.4l0,0h0l-.05,0-1.38-.8,1.16-2h0L11,6.17a.81.81,0,0,0-.12-1L10,4.69,9.78,4.6l-.12-.06-1.93-1A.61.61,0,0,0,7,3.74L5.56,5.35a.54.54,0,1,0,.8.72Z"/><circle class="cls-2" cx="11.86" cy="3.54" r="1.42"/><rect class="cls-5" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/AnimationPhysicalMaterial.svg b/Content/Slate/Starship/Persona/AnimationPhysicalMaterial.svg
new file mode 100644
index 0000000..153a290
--- /dev/null
+++ b/Content/Slate/Starship/Persona/AnimationPhysicalMaterial.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-4{opacity:0.5;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><rect class="cls-2" x="1" y="1" width="18" height="18"/><path class="cls-3" d="M8.88,1.06a7.82,7.82,0,1,0,1.46,15.49c0-.31-.05-.64-.05-1a7.33,7.33,0,0,1-1.41.15A6.82,6.82,0,1,1,15.5,7.32a4,4,0,0,1,.5,0l.53,0A7.83,7.83,0,0,0,8.88,1.06Z"/><path class="cls-4" d="M12,2.27a7.28,7.28,0,0,0-3.12-.71A8.48,8.48,0,0,0,8,1.62V4h4Z"/><path class="cls-4" d="M1.62,8a8.48,8.48,0,0,0-.06.88A7.28,7.28,0,0,0,2.27,12H4V8Z"/><path class="cls-4" d="M4,14.31A7.25,7.25,0,0,0,7.25,16H8V12H4Z"/><path class="cls-4" d="M3.44,4H4V3.44A4.94,4.94,0,0,0,3.44,4Z"/><rect class="cls-4" x="8" y="8" width="4" height="4"/><rect class="cls-4" x="4" y="4" width="4" height="4"/><path class="cls-4" d="M16,7.29v0A7.25,7.25,0,0,0,14.31,4H12V8h1.78A3.36,3.36,0,0,1,16,7.29Z"/><path class="cls-4" d="M16.06,9.8a.72.72,0,0,0-.76.7v.83l-1.07.28V10.25a1.69,1.69,0,0,1,1.83-1.5,1.73,1.73,0,0,1,1.84,1.5v1.36l-1.08-.28V10.5A.72.72,0,0,0,16.06,9.8Z"/><circle class="cls-3" cx="16.06" cy="16.06" r="3.94"/><rect class="cls-2" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/AnimationPreviewMesh.svg b/Content/Slate/Starship/Persona/AnimationPreviewMesh.svg
new file mode 100644
index 0000000..c766bef
--- /dev/null
+++ b/Content/Slate/Starship/Persona/AnimationPreviewMesh.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-2{fill-rule:evenodd;opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M3.81,19C7.94,16.75,10,17.31,10,17.31s2.06-.56,6.19,1.69Z"/><path class="cls-3" d="M19,2V15H1V2H19m1-1H0V16H20V1Z"/><rect class="cls-4" width="20" height="20"/><path class="cls-3" d="M11.1,3,5,4.87v7.26L11.1,14,16,8.5ZM9,8.5,6,10.79V6.21ZM6.57,5.42l3.71-1.11L9.54,7.65Zm3,3.93.74,3.34L6.57,11.58ZM10.47,9h3.74l-3,3.37Zm0-1,.75-3.37,3,3.37Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/AnimationToBallAndSocket.svg b/Content/Slate/Starship/Persona/AnimationToBallAndSocket.svg
new file mode 100644
index 0000000..d8ff0c3
--- /dev/null
+++ b/Content/Slate/Starship/Persona/AnimationToBallAndSocket.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-4{opacity:0.5;}.cls-3,.cls-4,.cls-5{fill:#fff;}.cls-5{fill-rule:evenodd;}.cls-6{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><g class="cls-2"><path class="cls-3" d="M14,10.05C14,13,11.56,16,8.52,16S3,13,3,10.05c0-.25.59.68,1.18,1.26a6.13,6.13,0,0,0,4.32,1.57,6.19,6.19,0,0,0,4.28-1.57C13.47,10.65,14,9.77,14,10.05Z"/></g><path class="cls-3" d="M13,9.66c0,1.13-1.91,2.39-4.48,2.39S4.05,10.79,4.05,9.66a1.41,1.41,0,0,1,.37-.88,6.06,6.06,0,0,1-.11-1.33A2.83,2.83,0,0,0,3,9.66c0,1.91,2.47,3.46,5.5,3.46S14,11.57,14,9.66a2.4,2.4,0,0,0-.39-1.28A10.21,10.21,0,0,1,13,9.66Z"/><path class="cls-4" d="M10,20H7V16.45s.28.39,1.5.39,1.5-.39,1.5-.39Z"/><path class="cls-5" d="M9.79,5.22A3.64,3.64,0,0,0,8.51,5,3.51,3.51,0,0,0,5,8.49c0,.08,0,.16,0,.24,0,.83,1.5,1.77,3.5,1.77S11.78,9.7,12,8.91a3,3,0,0,0,0-.42,3.64,3.64,0,0,0-.24-1.28L17,2,15,0Z"/><rect class="cls-6" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/AnimationToHinge.svg b/Content/Slate/Starship/Persona/AnimationToHinge.svg
new file mode 100644
index 0000000..912964e
--- /dev/null
+++ b/Content/Slate/Starship/Persona/AnimationToHinge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-3{fill-rule:evenodd;opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><rect class="cls-2" x="12" y="14" width="8" height="3"/><polygon class="cls-3" points="7 11 3 11 3 2 7 0 7 11"/><path class="cls-2" d="M8,12.5a3,3,0,1,1-3,3,3,3,0,0,1,3-3m0-1a4,4,0,1,0,4,4,4,4,0,0,0-4-4Z"/><circle class="cls-2" cx="8" cy="15.5" r="1.75"/><path class="cls-3" d="M6.1,19.44a4.26,4.26,0,0,1-.7-.19A4,4,0,0,1,2.9,15.5a3.92,3.92,0,0,1,3.85-4H3.86A3.76,3.76,0,0,0,3.26,19Z"/><rect class="cls-4" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/AnimationToPrismatic.svg b/Content/Slate/Starship/Persona/AnimationToPrismatic.svg
new file mode 100644
index 0000000..4998416
--- /dev/null
+++ b/Content/Slate/Starship/Persona/AnimationToPrismatic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4{fill:#fff;}.cls-3,.cls-4{opacity:0.5;}.cls-4{fill-rule:evenodd;}.cls-5{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><g id="ModelingCylinder"><path class="cls-2" d="M14.65,5.35c-1.4-1.4-3.47-1.59-3.94-1.12L4.24,10.7a1,1,0,0,0-.23.73,1,1,0,0,1,.26-.63c.61-.61,2.44-.24,3.81,1.12s1.73,3.2,1.12,3.81a1,1,0,0,1-.63.26,1,1,0,0,0,.73-.23l6.47-6.47C16.24,8.82,16.05,6.75,14.65,5.35Z"/><path class="cls-3" d="M4.27,10.8c.61-.61,2.44-.24,3.81,1.12s1.73,3.2,1.12,3.81-2.39.18-3.75-1.18S3.66,11.4,4.27,10.8Z"/><path class="cls-4" d="M15.76,5.66l2.12-2.12L19.29,5,20,0,15.05.71l1.41,1.41L14.34,4.24Z"/><path class="cls-4" d="M4.24,14.34,2.12,16.46.71,15.05,0,20l5-.71L3.54,17.88l2.12-2.12Z"/><rect class="cls-5" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/AnimationToSkeletal.svg b/Content/Slate/Starship/Persona/AnimationToSkeletal.svg
new file mode 100644
index 0000000..61ea646
--- /dev/null
+++ b/Content/Slate/Starship/Persona/AnimationToSkeletal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-2{opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><polygon class="cls-2" points="3 7 3 11 11 15 7 7 3 7"/><circle class="cls-3" cx="2" cy="6" r="2"/><polygon class="cls-2" points="12 14 16 14 20 6 12 10 12 14"/><circle class="cls-3" cx="11" cy="15" r="2"/><rect class="cls-4" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/EditInSequencer.svg b/Content/Slate/Starship/Persona/EditInSequencer.svg
new file mode 100644
index 0000000..5b2e716
--- /dev/null
+++ b/Content/Slate/Starship/Persona/EditInSequencer.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16.43 9L13 12.46L9.5 9H16.43ZM1 9V18H7L3 13.5L7.5 9H1Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.84 3.85994L11.53 4.75993V2.13994L13.84 1.22993V3.85994ZM10.4 2.58994L8.08997 3.48994V6.11993L10.4 5.20995V2.58994ZM4.58997 7.47993L6.89997 6.56995V3.94994L4.58997 4.84995V7.47993ZM15.03 0.779938V3.40994L17.35 2.49994L16.44 0.189941L15.03 0.779938ZM3.46997 5.29994L0.219971 6.51994L1.11997 8.82994L3.42997 7.92993L3.46997 5.29994Z" fill="white"/>
+<path d="M8.49836 10.6862L5.68408 13.5005L8.49836 16.3148L11.3126 13.5005L8.49836 10.6862Z" fill="white"/>
+<path d="M14.36 17.5899L12.36 15.5899L17.86 10.0999C17.9556 10.0047 18.085 9.95117 18.22 9.95117C18.355 9.95117 18.4844 10.0047 18.58 10.0999L19.8 11.3199C19.8953 11.4155 19.9488 11.545 19.9488 11.6799C19.9488 11.8149 19.8953 11.9443 19.8 12.0399L14.36 17.5899ZM13.29 18.6499L11.35 16.7099L10 19.9999L13.29 18.6499Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Persona/PersonaCreateAsset.svg b/Content/Slate/Starship/Persona/PersonaCreateAsset.svg
new file mode 100644
index 0000000..36a80d0
--- /dev/null
+++ b/Content/Slate/Starship/Persona/PersonaCreateAsset.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill-rule:evenodd;}.cls-5{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M14.05,7.81h-2.6l-1.2-2.09a2.06,2.06,0,0,1,0,1.31l-.46.78.6,1.06a.83.83,0,0,0,.76.39h2.91a.72.72,0,0,0,.72-.72A.73.73,0,0,0,14.05,7.81Z"/><path class="cls-2" d="M5.14,10.71a1.71,1.71,0,0,1-.77-1L3.29,11.61H.72a.73.73,0,0,0-.72.73.72.72,0,0,0,.72.72H3.63a.76.76,0,0,0,.71-.39l1.07-1.8Z"/><path class="cls-3" d="M3.72,6.37,5.37,4.54,7,5.34l-2,3.49a1.4,1.4,0,0,0,.67,1.48l.12.08h0l3,1.7v2.49a.73.73,0,0,0,.73.73.73.73,0,0,0,.72-.73v-2.9a.71.71,0,0,0-.25-.54l-.06-.06h0L9.74,11,7.89,10l1.56-2.7v0l.42-.77a1.08,1.08,0,0,0-.17-1.32L8.55,4.52,8.3,4.39l-.16-.07L5.55,3a.82.82,0,0,0-1,.24L2.64,5.4a.74.74,0,0,0,.06,1A.73.73,0,0,0,3.72,6.37Z"/><circle class="cls-4" cx="11.1" cy="2.97" r="1.91"/><polygon class="cls-3" points="19 14 16 14 16 11 14 11 14 14 11 14 11 16 14 16 14 19 16 19 16 16 19 16 19 14"/><rect class="cls-5" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/PersonaHome.svg b/Content/Slate/Starship/Persona/PersonaHome.svg
new file mode 100644
index 0000000..43d04ec
--- /dev/null
+++ b/Content/Slate/Starship/Persona/PersonaHome.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-2{fill-rule:evenodd;}.cls-3{opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><g id="StaticMesh"><polygon class="cls-2" points="16 11 16 19 14 19 14 14 10 14 10 19 4 19 4 11 10 6 16 11"/><polygon class="cls-3" points="14 1 16 1 16 5.75 14 4 14 1"/><polygon class="cls-3" points="17.5 10 10 3.75 2.5 10 1.11 9.65 10 2 18.89 9.65 17.5 10"/><rect class="cls-4" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/PersonaPaint.svg b/Content/Slate/Starship/Persona/PersonaPaint.svg
new file mode 100644
index 0000000..502ab5a
--- /dev/null
+++ b/Content/Slate/Starship/Persona/PersonaPaint.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3{fill:#fff;}.cls-2{opacity:0.5;}.cls-4{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M9.34,13.11,7.83,11.6s2.4-2.95,3.83-4.38S19.2,1.07,19.2,1.07a.47.47,0,0,1,.66,0h0a.45.45,0,0,1,0,.66S15.1,7.88,13.67,9.31,9.34,13.11,9.34,13.11Z"/><path class="cls-3" d="M8,13.51l-.94-1.07s-2.5-.41-3.44,3C3,17.56,0,19,0,19H3.75a4.58,4.58,0,0,0,4-2.53A3.45,3.45,0,0,0,8,13.51Z"/><rect class="cls-4" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/PersonaPreviewAnimation.svg b/Content/Slate/Starship/Persona/PersonaPreviewAnimation.svg
new file mode 100644
index 0000000..50a24ed
--- /dev/null
+++ b/Content/Slate/Starship/Persona/PersonaPreviewAnimation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4,.cls-5{fill:#fff;}.cls-2,.cls-5{opacity:0.5;}.cls-3,.cls-5{fill-rule:evenodd;}.cls-6{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M15.53,8.17H13.22L12.15,6.31a1.87,1.87,0,0,1,0,1.16l-.41.7.53.94a.73.73,0,0,0,.68.35h2.58a.65.65,0,0,0,0-1.29Z"/><path class="cls-2" d="M7.61,10.76a1.59,1.59,0,0,1-.69-.85L6,11.56H3.67a.64.64,0,1,0,0,1.28H6.26a.68.68,0,0,0,.63-.34l1-1.6Z"/><path class="cls-3" d="M6.34,6.89,7.81,5.26,9.22,6,7.4,9.08A1.26,1.26,0,0,0,8,10.4l.1.06h0L10.76,12v2.22a.65.65,0,0,0,1.29,0V11.61a.66.66,0,0,0-.22-.49l-.06,0h0l-.06,0-1.65-1,1.39-2.4v0L11.82,7a1,1,0,0,0-.15-1.17l-1-.59-.22-.12-.14-.06L8,3.9a.72.72,0,0,0-.86.21L5.38,6a.66.66,0,0,0,0,.91A.65.65,0,0,0,6.34,6.89Z"/><circle class="cls-4" cx="12.91" cy="3.87" r="1.7"/><path class="cls-5" d="M3.81,19C7.94,16.75,10,17.31,10,17.31s2.06-.56,6.19,1.69Z"/><path class="cls-4" d="M19,2V15H1V2H19m1-1H0V16H20V1Z"/><rect class="cls-6" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/PersonaReimport.svg b/Content/Slate/Starship/Persona/PersonaReimport.svg
new file mode 100644
index 0000000..8700d97
--- /dev/null
+++ b/Content/Slate/Starship/Persona/PersonaReimport.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_6423_2)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.71 11.43C13.617 11.5237 13.5064 11.5981 13.3846 11.6489C13.2627 11.6997 13.132 11.7258 13 11.7258C12.868 11.7258 12.7373 11.6997 12.6154 11.6489C12.4936 11.5981 12.383 11.5237 12.29 11.43L9.94001 9.06999V12.43C9.97523 12.5298 9.99545 12.6343 10 12.74V19C10 19.2652 9.89465 19.5196 9.70712 19.7071C9.51958 19.8946 9.26523 20 9.00001 20C8.73479 20 8.48044 19.8946 8.2929 19.7071C8.10537 19.5196 8.00001 19.2652 8.00001 19V14H6.00001V19C6.00001 19.2652 5.89465 19.5196 5.70712 19.7071C5.51958 19.8946 5.26523 20 5.00001 20C4.7348 20 4.48044 19.8946 4.2929 19.7071C4.10537 19.5196 4.00001 19.2652 4.00001 19V9.13L1.71001 11.43C1.61705 11.5237 1.50645 11.5981 1.38459 11.6489C1.26273 11.6997 1.13202 11.7258 1.00001 11.7258C0.867999 11.7258 0.737294 11.6997 0.615435 11.6489C0.493575 11.5981 0.382974 11.5237 0.290011 11.43C0.194765 11.3369 0.119086 11.2256 0.0674187 11.1029C0.015751 10.9801 -0.0108643 10.8482 -0.0108643 10.715C-0.0108643 10.5818 0.015751 10.4499 0.0674187 10.3271C0.119086 10.2043 0.194765 10.0931 0.290011 10L4.00001 6.29C4.11033 6.17726 4.24575 6.09221 4.39522 6.04181C4.54468 5.99141 4.70395 5.97708 4.86001 6C4.90656 5.99532 4.95346 5.99532 5.00001 6H8.94001C8.99658 5.99517 9.05345 5.99517 9.11001 6C9.2668 5.96995 9.4285 5.97787 9.58159 6.0231C9.73469 6.06833 9.87473 6.14956 9.99001 6.26L13.71 10C13.8053 10.0931 13.8809 10.2043 13.9326 10.3271C13.9843 10.4499 14.0109 10.5818 14.0109 10.715C14.0109 10.8482 13.9843 10.9801 13.9326 11.1029C13.8809 11.2256 13.8053 11.3369 13.71 11.43ZM7.00001 0.619995C6.52929 0.619995 6.06914 0.75958 5.67775 1.0211C5.28637 1.28262 4.98131 1.65432 4.80118 2.08921C4.62104 2.5241 4.57391 3.00264 4.66574 3.46431C4.75758 3.92598 4.98425 4.35006 5.3171 4.68291C5.64995 5.01576 6.07402 5.24243 6.5357 5.33426C6.99737 5.4261 7.47591 5.37897 7.9108 5.19883C8.34569 5.01869 8.71739 4.71364 8.97891 4.32225C9.24043 3.93086 9.38001 3.47071 9.38001 3C9.37738 2.36959 9.12578 1.76576 8.68002 1.31999C8.23425 0.874222 7.63042 0.622627 7.00001 0.619995Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M20 15L17 20L14 15H16C16 13 17 8 13 6C19 8 18 11 18 15H20Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_6423_2">
+<rect width="20" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/Content/Slate/Starship/Persona/PersonaTPose.svg b/Content/Slate/Starship/Persona/PersonaTPose.svg
new file mode 100644
index 0000000..b93eb12
--- /dev/null
+++ b/Content/Slate/Starship/Persona/PersonaTPose.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2{fill:#fff;fill-rule:evenodd;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M19,8a1,1,0,0,1-1,1H12.94v4.43a1.07,1.07,0,0,1,.06.31V19a1,1,0,0,1-2,0V14H9v5a1,1,0,0,1-2,0V9H2A1,1,0,0,1,2,7H18A1,1,0,0,1,19,8ZM10,1.62A2.38,2.38,0,1,0,12.38,4,2.39,2.39,0,0,0,10,1.62Z"/><rect class="cls-3" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/Physics.svg b/Content/Slate/Starship/Persona/Physics.svg
new file mode 100644
index 0000000..be6a1c9
--- /dev/null
+++ b/Content/Slate/Starship/Persona/Physics.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.7701 3.84999L16.6499 1.72998L11.3601 7.00998C10.9264 6.84141 10.4654 6.75331 10 6.74998C9.25836 6.74998 8.53323 6.96992 7.91654 7.38197C7.29986 7.79403 6.81927 8.3797 6.53544 9.06493C6.25161 9.75015 6.17737 10.5041 6.32206 11.2316C6.46676 11.959 6.82398 12.6272 7.34843 13.1516C7.87288 13.6761 8.54092 14.0332 9.26835 14.1779C9.99578 14.3226 10.7499 14.2484 11.4351 13.9645C12.1203 13.6807 12.7059 13.2001 13.118 12.5834C13.53 11.9667 13.75 11.2417 13.75 10.5C13.7467 10.0346 13.6586 9.57376 13.49 9.13998L18.7701 3.84999Z" fill="white"/>
+<path d="M8 15.8999V19.9999H12V15.9999C11.3497 16.1901 10.6773 16.2943 10 16.3099C9.31497 16.2871 8.63874 16.1485 8 15.8999Z" fill="white"/>
+<path opacity="0.5" d="M18.6499 8.09985C19.0337 10.0163 18.7625 12.006 17.8799 13.7498C17.0348 15.3906 15.6707 16.7056 14 17.4899V19.8799L14.1599 19.7898L14.99 19.2198C16.784 17.9894 18.1202 16.1996 18.79 14.1299C19.4262 12.1618 19.3768 10.0363 18.6499 8.09985Z" fill="white"/>
+<path opacity="0.5" d="M12.2701 2.90994L13.9 1.26994L13.71 1.19993L12.71 0.959942C10.371 0.37523 7.89884 0.666905 5.76009 1.77993C3.68511 2.87223 2.07326 4.67575 1.22005 6.85994C0.420466 9.00106 0.420466 11.3588 1.22005 13.4999C2.01013 15.5797 3.52712 17.3028 5.49007 18.3499C3.66413 17.1936 2.31524 15.4188 1.69002 13.3499C1.10915 11.3295 1.27598 9.16734 2.15999 7.25993C3.03775 5.41505 4.55493 3.95119 6.43001 3.13993C8.25144 2.35551 10.2974 2.26656 12.18 2.88993L12.2701 2.90994Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Persona/RetargetManager.svg b/Content/Slate/Starship/Persona/RetargetManager.svg
new file mode 100644
index 0000000..8361d3f
--- /dev/null
+++ b/Content/Slate/Starship/Persona/RetargetManager.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4{fill:#fff;}.cls-2{fill-rule:evenodd;}.cls-3{opacity:0.5;}.cls-5{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M19.77,16a4.52,4.52,0,0,0,.06-.53,4.52,4.52,0,0,0-.06-.53l-1.33-.2a2.82,2.82,0,0,0-.35-.84l.81-1.08a4.49,4.49,0,0,0-.76-.75l-1.08.8a3.09,3.09,0,0,0-.84-.34L16,11.23a4.78,4.78,0,0,0-.53-.06,4.69,4.69,0,0,0-.54.06l-.2,1.33a3,3,0,0,0-.82.35l-1.09-.81a4.49,4.49,0,0,0-.75.76L12.9,14a2.84,2.84,0,0,0-.34.82L11.23,15a5,5,0,0,0-.06.54,5,5,0,0,0,.06.54l1.33.19a2.84,2.84,0,0,0,.34.82l-.8,1.09a4.49,4.49,0,0,0,.75.76l1.09-.81a2.86,2.86,0,0,0,.82.35l.2,1.33a4.69,4.69,0,0,0,.54.06,4.78,4.78,0,0,0,.53-.06l.19-1.33a3.09,3.09,0,0,0,.84-.34l1.08.8a4.49,4.49,0,0,0,.76-.75l-.81-1.08a2.82,2.82,0,0,0,.35-.84ZM15.5,17.38a1.88,1.88,0,1,1,1.88-1.88A1.88,1.88,0,0,1,15.5,17.38Z"/><path class="cls-3" d="M.73,9.51a8.16,8.16,0,0,0,2.49,6A8.17,8.17,0,0,0,9.1,18H10V16.51c0-.08,0-.15,0-.22H9.1a6.57,6.57,0,0,1-4.67-2,6.51,6.51,0,0,1-2-4.8,6.65,6.65,0,0,1,2.13-4.9L6.24,6.28,7,7V1H1L3.36,3.4A8.25,8.25,0,0,0,.73,9.51Z"/><path class="cls-3" d="M9,2.71h.74a6.54,6.54,0,0,1,4.8,2,6.51,6.51,0,0,1,2,4.8c0,.17,0,.34,0,.51a5.59,5.59,0,0,1,1.65.58,9.81,9.81,0,0,0,.07-1.09,8.16,8.16,0,0,0-2.49-6A8.18,8.18,0,0,0,9.74,1H9Z"/><path class="cls-3" d="M9.5,5a4.5,4.5,0,0,0,0,9,4.48,4.48,0,0,0,.63-.06,5.36,5.36,0,0,1,.46-1.13A3.62,3.62,0,0,1,9.5,13,3.5,3.5,0,1,1,13,9.5a3.62,3.62,0,0,1-.19,1.09,5.36,5.36,0,0,1,1.13-.46A4.48,4.48,0,0,0,14,9.5,4.49,4.49,0,0,0,9.5,5Z"/><polygon class="cls-4" points="16 9 10 9 10 3 9 3 9 9 3 9 3 10 9 10 9 16 10 16 10 10 16 10 16 9"/><rect class="cls-5" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/SectionSelection.svg b/Content/Slate/Starship/Persona/SectionSelection.svg
new file mode 100644
index 0000000..2d6b7b2
--- /dev/null
+++ b/Content/Slate/Starship/Persona/SectionSelection.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20.02"><defs><style>.cls-1{opacity:0.7;}.cls-2,.cls-3,.cls-4,.cls-5{fill:#fff;}.cls-2,.cls-4{fill-rule:evenodd;}.cls-2,.cls-3{opacity:0.5;}.cls-6{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4" class="cls-1"><path class="cls-2" d="M6.26,7H1A1,1,0,0,0,1,9H6V19a1,1,0,0,0,2,0V14h2v5a1,1,0,0,0,2,0V7Z"/><circle class="cls-3" cx="9" cy="4" r="2.37"/><path class="cls-4" d="M17,7H12V9h5a1,1,0,0,0,0-2Z"/><polygon class="cls-5" points="20 16.14 14 11 14.08 18.9 15.83 16.48 17.53 20.02 18.79 19.41 17.1 15.9 20 16.14"/><rect class="cls-6" width="20" height="20"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Persona/SkeletalMesh.svg b/Content/Slate/Starship/Persona/SkeletalMesh.svg
new file mode 100644
index 0000000..a5a8f08
--- /dev/null
+++ b/Content/Slate/Starship/Persona/SkeletalMesh.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.55005 5.00006C4.66978 3.86078 5.17709 2.79718 5.98712 1.98715C6.79715 1.17712 7.86078 0.669785 9.00006 0.550049V5.00006H4.55005ZM10.0001 5.00006H14.4501C14.3303 3.86078 13.823 2.79718 13.013 1.98715C12.203 1.17712 11.1393 0.669785 10.0001 0.550049V5.00006ZM10.0001 6.00006V10.4501C11.1393 10.3303 12.203 9.823 13.013 9.01297C13.823 8.20294 14.3303 7.13934 14.4501 6.00006H10.0001ZM9.00006 6.00006H4.55005C4.66978 7.13934 5.17709 8.20294 5.98712 9.01297C6.79715 9.823 7.86078 10.3303 9.00006 10.4501V6.00006Z" fill="white"/>
+<path d="M10 11H17V11.24L10 18.29V11ZM1.40002 12.53L0 20H2L3.53003 14.66L1.40002 12.53ZM9 18.29V11H2V11.24L9 18.29ZM15.47 14.66L17 20H19L17.6 12.53L15.47 14.66ZM10 20H14V16L10 20ZM5 16V20H9L5 16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Persona/Skeleton.svg b/Content/Slate/Starship/Persona/Skeleton.svg
new file mode 100644
index 0000000..1d8b64f
--- /dev/null
+++ b/Content/Slate/Starship/Persona/Skeleton.svg
@@ -0,0 +1,13 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.99998 0C7.18998 0 5.54999 1.00001 5.54999 3.82001C5.54999 4.26001 5.43999 7.22001 5.54999 7.63H7.05998C7.3252 7.63 7.57955 7.73535 7.76709 7.92288C7.95463 8.11042 8.05998 8.36479 8.05998 8.63V9.76999C8.66559 10.0206 9.31457 10.1497 9.96999 10.15C10.6254 10.1497 11.2744 10.0206 11.88 9.76999V8.63C11.88 8.36479 11.9853 8.11042 12.1729 7.92288C12.3604 7.73535 12.6148 7.63 12.88 7.63H14.39C14.5 7.22001 14.39 4.26001 14.39 3.82001C14.45 1.00001 12.81 0 9.99998 0ZM8.24998 6.35999H6.81998V3.82001H9.35999V5.25C9.35999 5.54439 9.24304 5.82672 9.03487 6.03488C8.82671 6.24305 8.54437 6.35999 8.24998 6.35999ZM13.18 6.35999H11.75C11.4556 6.35999 11.1733 6.24305 10.9651 6.03488C10.7569 5.82672 10.64 5.54439 10.64 5.25V3.82001H13.18V6.35999ZM10.75 8H9.24998L9.99998 6.5L10.75 8Z" fill="white"/>
+<path d="M9.5 15H5.5V16H9.5V15Z" fill="white"/>
+<path d="M9.5 19H5.5V20H9.5V19Z" fill="white"/>
+<path d="M14.5 19H10.5V20H14.5V19Z" fill="white"/>
+<path d="M14.5 15H10.5V16H14.5V15Z" fill="white"/>
+<path d="M9.5 17H5.5V18H9.5V17Z" fill="white"/>
+<path d="M14.5 17H10.5V18H14.5V17Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.5 12L3.47 20H2L3 11L4.5 12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5 12L16.53 20H18L17 11L15.5 12Z" fill="white"/>
+<path d="M11 12H9V20H11V12Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5 13H4.5L3 11H17L15.5 13Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/PlacementBrowser/LabelBack_18x.png b/Content/Slate/Starship/PlacementBrowser/LabelBack_18x.png
new file mode 100644
index 0000000..a259164
Binary files /dev/null and b/Content/Slate/Starship/PlacementBrowser/LabelBack_18x.png differ
diff --git a/Content/Slate/Starship/Projects/CustomTemplate_2x.png b/Content/Slate/Starship/Projects/CustomTemplate_2x.png
new file mode 100644
index 0000000..5f67d77
Binary files /dev/null and b/Content/Slate/Starship/Projects/CustomTemplate_2x.png differ
diff --git a/Content/Slate/Starship/Projects/RecentProjects_2x.png b/Content/Slate/Starship/Projects/RecentProjects_2x.png
new file mode 100644
index 0000000..cea5b18
Binary files /dev/null and b/Content/Slate/Starship/Projects/RecentProjects_2x.png differ
diff --git a/Content/Slate/Starship/SceneOutliner/MobilityMoveable.svg b/Content/Slate/Starship/SceneOutliner/MobilityMoveable.svg
new file mode 100644
index 0000000..6cb5180
--- /dev/null
+++ b/Content/Slate/Starship/SceneOutliner/MobilityMoveable.svg
@@ -0,0 +1,7 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 0L2.5 2H5.5L4 0Z" fill="white"/>
+<path d="M4 8L2.5 6H5.5L4 8Z" fill="white"/>
+<path d="M8 4L6 2.5V5.5L8 4Z" fill="white"/>
+<path d="M0 4L2 2.5V5.5L0 4Z" fill="white"/>
+<path d="M5 3H3V5H5V3Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/SceneOutliner/MobilityStatic.svg b/Content/Slate/Starship/SceneOutliner/MobilityStatic.svg
new file mode 100644
index 0000000..6f633b9
--- /dev/null
+++ b/Content/Slate/Starship/SceneOutliner/MobilityStatic.svg
@@ -0,0 +1,4 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 1C4.59335 1 5.17337 1.17595 5.66671 1.50559C6.16006 1.83524 6.54458 2.30377 6.77164 2.85195C6.9987 3.40013 7.05811 4.00333 6.94236 4.58527C6.8266 5.16721 6.54088 5.70176 6.12132 6.12132C5.70176 6.54088 5.16722 6.8266 4.58527 6.94236C4.00333 7.05811 3.40013 6.9987 2.85195 6.77164C2.30377 6.54458 1.83524 6.16006 1.50559 5.66671C1.17595 5.17336 1 4.59334 1 4C1 3.20435 1.31607 2.44129 1.87868 1.87868C2.44129 1.31607 3.20435 1 4 1ZM4 0C3.20888 0 2.43552 0.234596 1.77772 0.674122C1.11992 1.11365 0.607234 1.73836 0.304484 2.46927C0.00173312 3.20017 -0.0774802 4.00444 0.0768607 4.78036C0.231202 5.55629 0.612165 6.26902 1.17157 6.82843C1.73098 7.38784 2.44372 7.7688 3.21964 7.92314C3.99556 8.07748 4.79983 7.99827 5.53074 7.69552C6.26164 7.39277 6.88635 6.88008 7.32588 6.22228C7.76541 5.56448 8 4.79113 8 4C8 2.93913 7.57857 1.92172 6.82843 1.17157C6.07828 0.421427 5.06087 0 4 0V0Z" fill="white"/>
+<path d="M4 5.75C4.9665 5.75 5.75 4.9665 5.75 4C5.75 3.0335 4.9665 2.25 4 2.25C3.0335 2.25 2.25 3.0335 2.25 4C2.25 4.9665 3.0335 5.75 4 5.75Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/SceneOutliner/MobilityStationary.svg b/Content/Slate/Starship/SceneOutliner/MobilityStationary.svg
new file mode 100644
index 0000000..9205a38
--- /dev/null
+++ b/Content/Slate/Starship/SceneOutliner/MobilityStationary.svg
@@ -0,0 +1,6 @@
+<svg width="8" height="8" viewBox="0 0 8 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2V1L0 1V2L8 2Z" fill="white"/>
+<path d="M8 7V6L0 6V7H8Z" fill="white"/>
+<path d="M7 0H5V3H7V0Z" fill="white"/>
+<path d="M4 5H2V8H4V5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/Actions.svg b/Content/Slate/Starship/Sequencer/Actions.svg
new file mode 100644
index 0000000..e2cebc3
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/Actions.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.49 5.88984C11.2106 5.11918 11.1564 4.28494 11.3335 3.48457C11.5105 2.6842 11.9116 1.95074 12.49 1.36982C13.081 0.774447 13.8319 0.363097 14.6518 0.185621C15.4718 0.00814413 16.3257 0.0721487 17.1101 0.369825L14.4099 3.05989C14.0734 3.39893 13.8847 3.85713 13.8847 4.33479C13.8847 4.81245 14.0734 5.27078 14.4099 5.60982C14.7506 5.94691 15.2106 6.13594 15.6899 6.13594C16.1692 6.13594 16.6292 5.94691 16.9699 5.60982L19.6399 2.93977C19.9217 3.71496 19.9776 4.55433 19.8005 5.35994C19.6234 6.16555 19.2208 6.90425 18.6399 7.48982C18.0637 8.0559 17.3408 8.44958 16.5527 8.62629C15.7646 8.80301 14.9426 8.7557 14.1799 8.48982L11.49 5.88984Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M13 9.47986L6.19995 16.2699C6.22629 16.6367 6.17402 17.0049 6.04639 17.3499C5.91876 17.6948 5.71874 18.0085 5.45996 18.2699C5.21812 18.5148 4.93012 18.7092 4.61255 18.8419C4.29498 18.9746 3.9543 19.043 3.61011 19.043C3.26592 19.043 2.92499 18.9746 2.60742 18.8419C2.28985 18.7092 2.00185 18.5148 1.76001 18.2699C1.51541 18.0289 1.32106 17.7417 1.18848 17.4249C1.05589 17.1082 0.987793 16.7683 0.987793 16.4249C0.987793 16.0816 1.05589 15.7415 1.18848 15.4248C1.32106 15.1081 1.51541 14.8208 1.76001 14.5798C2.0207 14.3207 2.33463 14.1213 2.67993 13.9952C3.02523 13.8692 3.39368 13.8196 3.76001 13.8499L10.51 7.09985L13 9.47986ZM4.48999 15.5399C4.37747 15.4262 4.24356 15.336 4.09595 15.2744C3.94833 15.2128 3.78983 15.181 3.62988 15.181C3.46993 15.181 3.31168 15.2128 3.16406 15.2744C3.01645 15.336 2.88254 15.4262 2.77002 15.5399C2.65664 15.6516 2.56659 15.7846 2.50513 15.9314C2.44367 16.0782 2.41211 16.2358 2.41211 16.3949C2.41211 16.554 2.44367 16.7116 2.50513 16.8584C2.56659 17.0052 2.65664 17.1382 2.77002 17.2499C2.88254 17.3636 3.01645 17.4538 3.16406 17.5154C3.31168 17.577 3.46993 17.6086 3.62988 17.6086C3.78983 17.6086 3.94833 17.577 4.09595 17.5154C4.24356 17.4538 4.37747 17.3636 4.48999 17.2499C4.71787 17.0243 4.847 16.7176 4.84888 16.397C4.85075 16.0764 4.72523 15.7681 4.5 15.5399H4.48999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/AllowAllEdits.svg b/Content/Slate/Starship/Sequencer/AllowAllEdits.svg
new file mode 100644
index 0000000..cb9a17a
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/AllowAllEdits.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.87501 15.3751L4.5 12.0001L14.5 2.00006C15 1.50006 15.75 1.50006 16.25 2.00006L17.875 3.75006C18.375 4.25006 18.375 5.00006 17.875 5.50006L7.87501 15.3751Z" fill="white"/>
+<path d="M1.25 18.75L2.875 13.75L6.25 17.125L1.25 18.75Z" fill="white"/>
+<path d="M8.125 17.5L18.75 18V18.75H6.25L8.125 17.5Z" fill="white" fill-opacity="0.5"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/AllowLevelEditsOnly.svg b/Content/Slate/Starship/Sequencer/AllowLevelEditsOnly.svg
new file mode 100644
index 0000000..6ebf1c7
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/AllowLevelEditsOnly.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 10L15.83 9.17L13.13 3.75L11.25 8.75L8.13 0L3.75 10H15Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M14 11H1.5L4 6.25L0 11V13H12L14 11Z" fill="white"/>
+<path d="M14.27 17.64L12.3601 15.73L17.6499 10.4399C17.7693 10.3245 17.9289 10.26 18.095 10.26C18.261 10.26 18.4207 10.3245 18.54 10.4399L19.54 11.4399C19.6555 11.5593 19.72 11.7189 19.72 11.885C19.72 12.0511 19.6555 12.2106 19.54 12.33L14.27 17.64ZM13.27 18.64L11.3601 16.73L10 20L13.27 18.64Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/AllowSequencerEditsOnly.svg b/Content/Slate/Starship/Sequencer/AllowSequencerEditsOnly.svg
new file mode 100644
index 0000000..6376f6f
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/AllowSequencerEditsOnly.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.27 17.64L11.3601 15.73L16.6499 10.4399C16.7693 10.3245 16.9289 10.26 17.095 10.26C17.261 10.26 17.4207 10.3245 17.54 10.4399L18.54 11.4399C18.6555 11.5593 18.72 11.7189 18.72 11.885C18.72 12.0511 18.6555 12.2106 18.54 12.33L13.27 17.64ZM12.27 18.64L10.3601 16.73L9 20L12.27 18.64Z" fill="white"/>
+<path d="M7.49978 0.428169L0.428711 7.49924L7.49978 14.5703L14.5708 7.49924L7.49978 0.428169Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/AutoChangeAll.svg b/Content/Slate/Starship/Sequencer/AutoChangeAll.svg
new file mode 100644
index 0000000..cc107a8
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/AutoChangeAll.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.66992 3.87C7.52253 3.14555 7.12971 2.49425 6.55762 2.026C5.98552 1.55776 5.26932 1.30133 4.53003 1.30005C3.67868 1.30005 2.86225 1.63824 2.26025 2.24023C1.65826 2.84223 1.32007 3.65866 1.32007 4.51001C1.32007 5.36135 1.65826 6.17779 2.26025 6.77979C2.86225 7.38178 3.67868 7.71997 4.53003 7.71997C5.26882 7.71682 5.98395 7.45975 6.55566 6.99182C7.12738 6.52389 7.52079 5.87361 7.66992 5.15002H14.1499V9H15.4299V7.71997H16.72V9H18V3.87H7.66992ZM4.53003 6.43005C4.27705 6.43137 4.02634 6.38264 3.79224 6.28674C3.55814 6.19084 3.34512 6.04964 3.16577 5.87122C2.98642 5.6928 2.84418 5.48067 2.74707 5.24707C2.64996 5.01347 2.60009 4.76299 2.6001 4.51001C2.6001 3.99814 2.80334 3.50721 3.16528 3.14526C3.52723 2.78332 4.01816 2.57996 4.53003 2.57996C5.04016 2.5826 5.5284 2.78714 5.88818 3.1488C6.24797 3.51046 6.44996 3.99987 6.44995 4.51001C6.44995 4.76215 6.40044 5.01181 6.30396 5.24475C6.20747 5.4777 6.06598 5.68939 5.8877 5.86768C5.70941 6.04596 5.49759 6.18732 5.26465 6.28381C5.0317 6.3803 4.78217 6.43005 4.53003 6.43005V6.43005Z" fill="white"/>
+<path d="M17 13H3V17H17V13Z" fill="white"/>
+<path d="M18 12V18H2V12H18ZM19 11H1V19H19V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/AutoChangeNone.svg b/Content/Slate/Starship/Sequencer/AutoChangeNone.svg
new file mode 100644
index 0000000..45137ba
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/AutoChangeNone.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.99672 1.38658L1.38403 9.99927L9.99655 18.6118L18.6092 9.99909L9.99672 1.38658Z" stroke="white" stroke-width="1.19" stroke-miterlimit="10"/>
+<path d="M13.21 13.2098C13.1165 13.3025 13.0056 13.3759 12.8838 13.4257C12.762 13.4754 12.6316 13.5006 12.5 13.4999C12.3684 13.5006 12.238 13.4754 12.1162 13.4257C11.9944 13.3759 11.8835 13.3025 11.79 13.2098L10 11.4099L8.20996 13.2098C8.11652 13.3025 8.00563 13.3759 7.88379 13.4257C7.76195 13.4754 7.63161 13.5006 7.5 13.4999C7.36839 13.5006 7.23805 13.4754 7.11621 13.4257C6.99437 13.3759 6.88348 13.3025 6.79004 13.2098C6.69631 13.1169 6.62181 13.0063 6.57104 12.8844C6.52028 12.7625 6.49414 12.6319 6.49414 12.4999C6.49414 12.3679 6.52028 12.2372 6.57104 12.1154C6.62181 11.9935 6.69631 11.8829 6.79004 11.7899L8.59009 9.99988L6.79004 8.20984C6.69631 8.11688 6.62181 8.00626 6.57104 7.8844C6.52028 7.76254 6.49414 7.63189 6.49414 7.49988C6.49414 7.36787 6.52028 7.23722 6.57104 7.11536C6.62181 6.9935 6.69631 6.88288 6.79004 6.78992C6.883 6.69619 6.99362 6.62181 7.11548 6.57104C7.23734 6.52028 7.36799 6.49414 7.5 6.49414C7.63201 6.49414 7.76266 6.52028 7.88452 6.57104C8.00638 6.62181 8.117 6.69619 8.20996 6.78992L10 8.58984L11.79 6.78992C11.883 6.69619 11.9936 6.62181 12.1155 6.57104C12.2373 6.52028 12.368 6.49414 12.5 6.49414C12.632 6.49414 12.7627 6.52028 12.8845 6.57104C13.0064 6.62181 13.117 6.69619 13.21 6.78992C13.3037 6.88288 13.3782 6.9935 13.429 7.11536C13.4797 7.23722 13.5059 7.36787 13.5059 7.49988C13.5059 7.63189 13.4797 7.76254 13.429 7.8844C13.3782 8.00626 13.3037 8.11688 13.21 8.20984L11.4099 9.99988L13.21 11.7899C13.3037 11.8829 13.3782 11.9935 13.429 12.1154C13.4797 12.2372 13.5059 12.3679 13.5059 12.4999C13.5059 12.6319 13.4797 12.7625 13.429 12.8844C13.3782 13.0063 13.3037 13.1169 13.21 13.2098Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/AutoKey.svg b/Content/Slate/Starship/Sequencer/AutoKey.svg
new file mode 100644
index 0000000..b028252
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/AutoKey.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.52002 8.31987C6.66794 8.31855 6.81462 8.34657 6.95166 8.40227C7.0887 8.45796 7.2133 8.54032 7.31836 8.64445C7.42342 8.74859 7.50681 8.87242 7.56372 9.00896C7.62063 9.1455 7.64991 9.29194 7.6499 9.43986C7.6499 9.58826 7.62075 9.73526 7.56396 9.87236C7.50718 10.0095 7.42402 10.134 7.31909 10.2389C7.21416 10.3439 7.08949 10.4271 6.95239 10.4839C6.81529 10.5407 6.66841 10.5699 6.52002 10.5699C6.22206 10.5672 5.9373 10.447 5.72754 10.2354C5.51778 10.0238 5.39989 9.73783 5.3999 9.43986C5.3999 9.14282 5.51799 8.85803 5.72803 8.64799C5.93807 8.43795 6.22298 8.31987 6.52002 8.31987Z" fill="white"/>
+<path d="M0.5 10L10 19.5L19.5 10L10 0.5L0.5 10ZM16 11V13H15V12H14V13H13V10H9C8.85348 10.5472 8.53167 11.0313 8.08374 11.3781C7.63581 11.7248 7.08648 11.9153 6.52002 11.92C5.86402 11.9174 5.23588 11.6549 4.77295 11.1901C4.31002 10.7253 4.05004 10.0959 4.05005 9.43994C4.05005 8.78486 4.31022 8.1567 4.77344 7.69348C5.23665 7.23027 5.86493 6.96997 6.52002 6.96997C7.08985 7.00468 7.63471 7.21584 8.0791 7.57422C8.52349 7.9326 8.84536 8.42042 9 8.96997H16V11Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/AutoTrack.svg b/Content/Slate/Starship/Sequencer/AutoTrack.svg
new file mode 100644
index 0000000..3e65bad
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/AutoTrack.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17 8H3V12H17V8Z" fill="white"/>
+<path d="M18 7V13H2V7H18ZM19 6H1V14H19V6Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/CreateCamera.svg b/Content/Slate/Starship/Sequencer/CreateCamera.svg
new file mode 100644
index 0000000..a687a34
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/CreateCamera.svg
@@ -0,0 +1,8 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" d="M16 12H14V15H16V12Z" fill="white"/>
+<path d="M16 11.57L19 9V18L16 15.43V11.57Z" fill="white"/>
+<path opacity="0.5" d="M10.5 1C9.57174 1 8.68152 1.36877 8.02515 2.02515C7.36877 2.68152 7 3.57174 7 4.5C7 3.57174 6.63123 2.68152 5.97485 2.02515C5.31848 1.36877 4.42826 1 3.5 1C2.57174 1 1.68152 1.36877 1.02515 2.02515C0.368769 2.68152 0 3.57174 0 4.5C0 5.42826 0.368769 6.31848 1.02515 6.97485C1.68152 7.63123 2.57174 8 3.5 8H10.5C11.4283 8 12.3185 7.63123 12.9749 6.97485C13.6312 6.31848 14 5.42826 14 4.5C14 3.57174 13.6312 2.68152 12.9749 2.02515C12.3185 1.36877 11.4283 1 10.5 1V1Z" fill="white"/>
+<path d="M12.25 9H1.75C1.33579 9 1 9.33579 1 9.75V17.25C1 17.6642 1.33579 18 1.75 18H12.25C12.6642 18 13 17.6642 13 17.25V9.75C13 9.33579 12.6642 9 12.25 9Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.25 2.74988C12.8017 3.30238 13.1395 4.03264 13.2036 4.81079C13.2677 5.58894 13.054 6.36456 12.6001 6.99988C12.7521 6.89428 12.8958 6.7773 13.03 6.6499C13.6505 6.0292 13.999 5.18755 13.999 4.30994C13.999 3.43233 13.6505 2.59055 13.03 1.96985C12.4093 1.34942 11.5676 1.00098 10.6899 1.00098C9.81233 1.00098 8.9708 1.34942 8.3501 1.96985C8.2227 2.1041 8.1056 2.2479 8 2.3999C8.63532 1.94604 9.41106 1.73206 10.1892 1.79614C10.9674 1.86023 11.6975 2.19819 12.25 2.74988Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.99976 2.29993C5.7941 2.74078 6.47796 3.35618 6.99976 4.09985C6.94228 3.29036 6.58585 2.53116 5.99976 1.96985C5.37905 1.34942 4.53728 1.00098 3.65967 1.00098C2.78206 1.00098 1.94053 1.34942 1.31982 1.96985C1.19242 2.1041 1.07532 2.2479 0.969727 2.3999C1.56904 2.01879 2.26094 1.80815 2.97095 1.79053C3.68095 1.77291 4.38228 1.94901 4.99976 2.29993V2.29993Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/KeyAll.svg b/Content/Slate/Starship/Sequencer/KeyAll.svg
new file mode 100644
index 0000000..cec76e7
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/KeyAll.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 0.5L0.5 10L10 19.5L19.5 10L10 0.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/KeyChanged.svg b/Content/Slate/Starship/Sequencer/KeyChanged.svg
new file mode 100644
index 0000000..e551d06
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/KeyChanged.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.42 10L10 2.42V0.5L0.5 10L10 19.5V17.58L2.42 10Z" fill="white"/>
+<path d="M10 4.34L15.66 10L10 15.66V19.5L19.5 10L10 0.5V4.34Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/KeyGroup.svg b/Content/Slate/Starship/Sequencer/KeyGroup.svg
new file mode 100644
index 0000000..fe68d6e
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/KeyGroup.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 2.42004L17.5801 10L10 17.58L2.41992 10L10 2.42004ZM10 0.5L0.5 10L10 19.5L19.5 10L10 0.5Z" fill="white"/>
+<path d="M10 19.5L19.5 10L10 0.5V19.5Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/PlaybackOptions.svg b/Content/Slate/Starship/Sequencer/PlaybackOptions.svg
new file mode 100644
index 0000000..5eead55
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/PlaybackOptions.svg
@@ -0,0 +1,5 @@
+<svg width="21" height="22" viewBox="0 0 21 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.77004 20.3499L19.77 14.9599C19.8511 14.9135 19.9185 14.8466 19.9653 14.7658C20.0122 14.6851 20.0369 14.5933 20.0369 14.5C20.0369 14.4066 20.0122 14.3149 19.9653 14.2341C19.9185 14.1533 19.8511 14.0864 19.77 14.04L9.77004 8.64999C9.69055 8.60641 9.60115 8.58435 9.51051 8.58603C9.41988 8.5877 9.33126 8.61302 9.25343 8.65951C9.17561 8.706 9.1111 8.77203 9.06667 8.85104C9.02223 8.93006 8.99931 9.0193 9.00002 9.10995V19.89C8.99931 19.9806 9.02223 20.0699 9.06667 20.1489C9.1111 20.2279 9.17561 20.2939 9.25343 20.3404C9.33126 20.3869 9.41988 20.4122 9.51051 20.4139C9.60115 20.4156 9.69055 20.3935 9.77004 20.3499Z" fill="white"/>
+<path d="M7.99976 13.5699C7.39961 13.5699 6.80543 13.4518 6.25098 13.2222C5.69652 12.9925 5.19267 12.6558 4.76831 12.2314C4.34395 11.8071 4.00725 11.3034 3.77759 10.7489C3.54792 10.1944 3.42969 9.60014 3.42969 9C3.43233 7.78877 3.91477 6.62795 4.77124 5.77148C5.62771 4.91502 6.78853 4.4327 7.99976 4.43005C9.05219 4.43111 10.072 4.79448 10.8879 5.45923C11.7039 6.12398 12.266 7.04945 12.4797 8.07996L15.9297 9.93994C15.9799 9.62888 16.0101 9.31495 16.0198 9C16.0072 8.66492 15.9737 8.33094 15.9197 8L13.4597 7.64001C13.32 7.09594 13.1047 6.57413 12.8198 6.08997L14.2998 4.08997C13.8948 3.56837 13.4241 3.10117 12.8997 2.69995L10.8997 4.18005C10.4205 3.89467 9.90166 3.68233 9.35986 3.55005L8.99976 1.08997C8.6688 1.03607 8.33483 1.00269 7.99976 0.98999C7.6647 1.003 7.33075 1.03637 6.99976 1.08997L6.62964 3.56006C6.09565 3.69689 5.58408 3.9089 5.10986 4.18994L3.10986 2.70996C2.58744 3.11732 2.11708 3.58756 1.70972 4.10999L3.19971 6.10999C2.91704 6.57983 2.7049 7.08858 2.56982 7.62L0.109863 7.98999C0.0558634 8.32093 0.0223681 8.65491 0.00976562 8.98999C0.0223681 9.32507 0.0558634 9.65905 0.109863 9.98999L2.56982 10.36C2.7049 10.8914 2.91704 11.4002 3.19971 11.87L1.70972 13.87C2.11444 14.3947 2.58511 14.8653 3.10986 15.27L5.10986 13.79C5.58276 14.0761 6.09458 14.2917 6.62964 14.4301L6.99976 16.89C7.33075 16.9436 7.6647 16.977 7.99976 16.99V13.5601V13.5699Z" fill="white"/>
+<path opacity="0.5" d="M8 5.89014C7.1716 5.89013 6.37699 6.21852 5.79028 6.80334C5.20358 7.38817 4.87276 8.18174 4.87012 9.01013C4.87012 9.84026 5.19988 10.6364 5.78687 11.2234C6.37385 11.8104 7.16987 12.1401 8 12.1401V11.3002C7.6989 11.3015 7.4005 11.2432 7.12207 11.1285C6.84364 11.0139 6.5906 10.8452 6.37769 10.6323C6.16478 10.4194 5.99621 10.1665 5.88159 9.88806C5.76698 9.60963 5.70864 9.31123 5.70996 9.01013C5.70996 8.70987 5.76932 8.41253 5.88452 8.13525C5.99973 7.85798 6.16857 7.60626 6.38135 7.39441C6.59413 7.18256 6.84673 7.01475 7.12451 6.90076C7.40229 6.78677 7.69975 6.72879 8 6.7301C8.5 6.7323 8.73438 6.7301 10.25 6.88013C9.96228 6.57042 9.61423 6.32284 9.22729 6.15259C8.84036 5.98234 8.42272 5.89302 8 5.89014Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Sequencer/SequenceRecorder.svg b/Content/Slate/Starship/Sequencer/SequenceRecorder.svg
new file mode 100644
index 0000000..cb19511
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/SequenceRecorder.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{fill-rule:evenodd;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><path class="cls-1" d="M7.51.49a7,7,0,1,0,7,7A7,7,0,0,0,7.51.49Zm1.93,7a2.14,2.14,0,1,1,2.14,2.13A2.14,2.14,0,0,1,9.44,7.44Zm-2-1.88A2.14,2.14,0,1,1,9.59,3.42,2.14,2.14,0,0,1,7.46,5.56Zm-4,4.11A2.14,2.14,0,1,1,5.58,7.54,2.13,2.13,0,0,1,3.44,9.67Zm4.07-3a.78.78,0,1,0,.77.78A.77.77,0,0,0,7.51,6.71Zm0,2.71a2.14,2.14,0,1,1-2.14,2.13A2.13,2.13,0,0,1,7.56,9.42Z"/><polygon class="cls-2" points="8 16 16 16 15.22 15.39 11 15 8 16"/><rect class="cls-3" width="16" height="16"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Sequencer/Snap.svg b/Content/Slate/Starship/Sequencer/Snap.svg
new file mode 100644
index 0000000..3ffc797
--- /dev/null
+++ b/Content/Slate/Starship/Sequencer/Snap.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 15C7 15 6.6 10.4 6.6 9.39999C6.6 6.29999 7.8 4.79999 10 4.79999C12.3 4.79999 13.4 6.19999 13.4 9.29999C13.4 10.2 13 14.9 13 14.9H17C17 14.9 17.5 8.99999 17.5 7.89999C17.5 4.59999 15.6 0.899994 10 0.899994C4.4 0.999994 2.5 4.69999 2.5 7.99999C2.5 9.09999 3 15 3 15H7Z" fill="white"/>
+<path opacity="0.5" d="M7 16H3V19H7V16Z" fill="white"/>
+<path opacity="0.5" d="M17 16H13V19H17V16Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/Splines/Spline_AddNext.svg b/Content/Slate/Starship/Splines/Spline_AddNext.svg
new file mode 100644
index 0000000..8234f3e
--- /dev/null
+++ b/Content/Slate/Starship/Splines/Spline_AddNext.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.6;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-4{fill-rule:evenodd;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_23" data-name="Layer 23" class="cls-1"><rect class="cls-2" width="20" height="20" transform="translate(20 20) rotate(-180)"/><circle class="cls-3" cx="4" cy="10" r="4"/><path class="cls-4" d="M13,8V2H9V5.85a6.49,6.49,0,0,1,0,8.3V18h4V12h6V8Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Splines/Spline_AddPrevious.svg b/Content/Slate/Starship/Splines/Spline_AddPrevious.svg
new file mode 100644
index 0000000..9058906
--- /dev/null
+++ b/Content/Slate/Starship/Splines/Spline_AddPrevious.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.6;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-4{fill-rule:evenodd;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_23" data-name="Layer 23" class="cls-1"><rect class="cls-2" width="20" height="20"/><circle class="cls-3" cx="16" cy="10" r="4"/><path class="cls-4" d="M7,8V2h4V5.85a6.49,6.49,0,0,0,0,8.3V18H7V12H1V8Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Splines/Spline_SelectAll.svg b/Content/Slate/Starship/Splines/Spline_SelectAll.svg
new file mode 100644
index 0000000..d91a21f
--- /dev/null
+++ b/Content/Slate/Starship/Splines/Spline_SelectAll.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.6;}.cls-2{fill:none;}.cls-3{fill:#fff;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_23" data-name="Layer 23" class="cls-1"><rect class="cls-2" width="20" height="20"/><circle class="cls-3" cx="10" cy="10" r="4"/><path class="cls-3" d="M4,10A6,6,0,0,1,9,4.09L7,2,0,10l7,8,2-2.09A6,6,0,0,1,4,10Z"/><path class="cls-3" d="M13,2,11,4.09a6,6,0,0,1,0,11.82L13,18l7-8Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Splines/Spline_SelectFirst.svg b/Content/Slate/Starship/Splines/Spline_SelectFirst.svg
new file mode 100644
index 0000000..02cc1bb
--- /dev/null
+++ b/Content/Slate/Starship/Splines/Spline_SelectFirst.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.6;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-4{fill-rule:evenodd;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_23" data-name="Layer 23" class="cls-1"><rect class="cls-2" width="20" height="20" transform="translate(20 20) rotate(-180)"/><circle class="cls-3" cx="5" cy="10" r="4"/><path class="cls-4" d="M11.13,7.85A6.43,6.43,0,0,1,11.5,10a6.53,6.53,0,0,1-.38,2.18L18,17.93V2.12Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Splines/Spline_SelectLast.svg b/Content/Slate/Starship/Splines/Spline_SelectLast.svg
new file mode 100644
index 0000000..5f76826
--- /dev/null
+++ b/Content/Slate/Starship/Splines/Spline_SelectLast.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.6;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-4{fill-rule:evenodd;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_23" data-name="Layer 23" class="cls-1"><rect class="cls-2" width="20" height="20"/><circle class="cls-3" cx="15" cy="10" r="4"/><path class="cls-4" d="M8.87,7.85A6.43,6.43,0,0,0,8.5,10a6.53,6.53,0,0,0,.38,2.18L2,17.93V2.12Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Splines/Spline_SelectNext.svg b/Content/Slate/Starship/Splines/Spline_SelectNext.svg
new file mode 100644
index 0000000..72cc011
--- /dev/null
+++ b/Content/Slate/Starship/Splines/Spline_SelectNext.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.6;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-4{fill-rule:evenodd;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_23" data-name="Layer 23" class="cls-1"><rect class="cls-2" width="20" height="20"/><circle class="cls-3" cx="6" cy="10" r="4"/><path class="cls-4" d="M12,10A6,6,0,0,0,9,4.81V2.12L18.47,10,9,17.93V15.19A6,6,0,0,0,12,10Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/Splines/Spline_SelectPrevious.svg b/Content/Slate/Starship/Splines/Spline_SelectPrevious.svg
new file mode 100644
index 0000000..be2712f
--- /dev/null
+++ b/Content/Slate/Starship/Splines/Spline_SelectPrevious.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{opacity:0.6;}.cls-2{fill:none;}.cls-3,.cls-4{fill:#fff;}.cls-4{fill-rule:evenodd;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_23" data-name="Layer 23" class="cls-1"><rect class="cls-2" width="20" height="20" transform="translate(20 20) rotate(-180)"/><circle class="cls-3" cx="14" cy="10" r="4"/><path class="cls-4" d="M8,10a6,6,0,0,1,3-5.19V2.12L1.53,10,11,17.93V15.19A6,6,0,0,1,8,10Z"/></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/StaticMeshEditor/AdditionalData.svg b/Content/Slate/Starship/StaticMeshEditor/AdditionalData.svg
new file mode 100644
index 0000000..b42cc7b
--- /dev/null
+++ b/Content/Slate/Starship/StaticMeshEditor/AdditionalData.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M11.0001 10.7C12.1001 9.7 12.8001 8.5 13.0001 7.1L7.00005 6.2L10.0001 0.999998C7.80005 -0.300002 5.00005 -0.100002 3.00005 1.7C0.500052 3.9 0.300052 7.7 2.50005 10.2C4.70005 12.6 8.50005 12.8 11.0001 10.7Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.7 0.8C13.4 0.5 13.2 0.3 12.9 0L9 5.3L15.4 5.5C15.5 3.9 14.9 2.1 13.7 0.8Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 12H15V10H13V12H11V14H13V16H15V14H17V12Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/StaticMeshEditor/ConvexDecomposition.svg b/Content/Slate/Starship/StaticMeshEditor/ConvexDecomposition.svg
new file mode 100644
index 0000000..b89f1fb
--- /dev/null
+++ b/Content/Slate/Starship/StaticMeshEditor/ConvexDecomposition.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.9 1.8L7 3.5L0 0V13.3L8.6 16L15.9 1.8ZM1.7 1.8L6.4 4.5L5.4 9L1.7 1.8ZM4.8 9.5L0.8 12V2.3L4.8 9.5ZM7.3 4.6L13.4 3.1L6.2 9L7.3 4.6ZM14 3.7L8.6 14.4L6.3 10.1L14 3.7ZM7.9 14.9L1.2 12.8L5.3 10.4L7.9 14.9ZM0.8 12.7V12.6L1 12.7H0.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/StaticMeshEditor/Properties.svg b/Content/Slate/Starship/StaticMeshEditor/Properties.svg
new file mode 100644
index 0000000..00b9a0d
--- /dev/null
+++ b/Content/Slate/Starship/StaticMeshEditor/Properties.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.5 12.9L1.4 17C1.4 17 1 17 0.5 16.5C0 16 0 15.7 0 15.7L4.1 11.6L5.5 12.9Z" fill="white"/>
+<path d="M9 14.5C12.5899 14.5 15.5 11.5899 15.5 8C15.5 4.41015 12.5899 1.5 9 1.5C5.41015 1.5 2.5 4.41015 2.5 8C2.5 11.5899 5.41015 14.5 9 14.5Z" stroke="white" stroke-width="1.0833" stroke-miterlimit="10"/>
+<path opacity="0.5" d="M8.9999 3.8999C6.6999 3.8999 4.8999 5.7999 4.8999 7.9999C4.8999 10.2999 6.6999 12.0999 8.9999 12.0999C11.2999 12.0999 13.0999 10.2999 13.0999 7.9999C13.0999 5.7999 11.2999 3.8999 8.9999 3.8999ZM9.9999 10.9999H7.9999V7.9999H9.9999V10.9999ZM9.9999 6.9999H7.9999V4.9999H9.9999V6.9999Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/StaticMeshEditor/ReimportMesh.svg b/Content/Slate/Starship/StaticMeshEditor/ReimportMesh.svg
new file mode 100644
index 0000000..eadf4d1
--- /dev/null
+++ b/Content/Slate/Starship/StaticMeshEditor/ReimportMesh.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.3 1.90002L0 4.10002V12.8L7.3 15L13.1 8.40002L7.3 1.90002ZM5 8.50002L1 11.5V5.50002L5 8.50002ZM1.6 4.70002L6.5 3.20002L5.5 7.60002L1.6 4.70002ZM5.5 9.40002L6.5 13.8L1.6 12.3L5.5 9.40002ZM6.5 9.00002H11.4L7.5 13.4L6.5 9.00002ZM6.5 8.00002L7.5 3.60002L11.4 8.00002H6.5Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M20 12L16.5 16.2L12.9 12H15.3C15.3 8.1 14.2 4.2 10 3C15.1 3.4 17.6 8.2 17.6 12H20Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/StaticMeshEditor/SocketManager.svg b/Content/Slate/Starship/StaticMeshEditor/SocketManager.svg
new file mode 100644
index 0000000..ea5d847
--- /dev/null
+++ b/Content/Slate/Starship/StaticMeshEditor/SocketManager.svg
@@ -0,0 +1,11 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.1 7.69995L0 9.89996L0.8 10.9L3.9 8.49994L3.1 7.69995Z" fill="white"/>
+<path d="M12.7999 0.400024L10.8999 1.79999L11.7999 2.40002L13.6999 0.900024L12.7999 0.400024Z" fill="white"/>
+<path d="M3.20005 0.400024L2.30005 0.900024L4.20005 2.40002L5.10005 1.79999L3.20005 0.400024Z" fill="white"/>
+<path d="M12.9001 7.69995L12.1001 8.49994L15.2001 10.9L16.0001 9.89996L12.9001 7.69995Z" fill="white"/>
+<g opacity="0.5">
+<path opacity="0.5" d="M12.8 5.00007C12.8 7.70007 10.6 10.3001 7.99995 10.3001C5.39995 10.3001 3.19995 7.70007 3.19995 5.00007C3.19995 4.80007 3.69995 5.60005 4.19995 6.10005C4.99995 6.90005 6.39995 7.50007 7.99995 7.50007C9.49995 7.50007 10.9 6.90005 11.8 6.10005C12.3 5.60005 12.8 4.80007 12.8 5.00007Z" fill="white"/>
+</g>
+<path d="M7.99995 2.60004C10.2 2.60004 11.8 3.60006 11.8 4.50006C11.8 5.40006 10.2 6.40009 7.99995 6.40009C5.79995 6.40009 4.19995 5.40006 4.19995 4.50006C4.19995 3.60006 5.79995 2.60004 7.99995 2.60004ZM7.99995 1.80005C5.29995 1.80005 3.19995 3.10007 3.19995 4.70007C3.19995 6.30007 5.39995 7.60004 7.99995 7.60004C10.6 7.60004 12.8 6.30007 12.8 4.70007C12.8 3.10007 10.6 1.80005 7.99995 1.80005Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5 12.9C13.5 12.8 13.5 12.7 13.5 12.5C13.5 12.4 13.5 12.3 13.5 12.1L12.6 12C12.5 11.8 12.5 11.6 12.4 11.4L13 10.6C12.8 10.4 12.7 10.2 12.5 10.1L11.7 10.7C11.5 10.6 11.3 10.5 11.1 10.5L11 9.59998C10.9 9.59998 10.8 9.59998 10.6 9.59998C10.5 9.59998 10.3 9.59998 10.2 9.59998L10.1 10.5C9.89995 10.6 9.69995 10.6 9.49995 10.7L8.69995 10.1C8.49995 10.3 8.29995 10.4 8.19995 10.6L8.79995 11.4C8.69995 11.6 8.59995 11.8 8.59995 12L7.69995 12.1C7.69995 12.2 7.69995 12.3 7.69995 12.5C7.69995 12.6 7.69995 12.7 7.69995 12.9L8.59995 13C8.69995 13.2 8.69995 13.4 8.79995 13.6L8.19995 14.4C8.39995 14.6 8.49995 14.8 8.69995 14.9L9.49995 14.3C9.69995 14.4 9.89995 14.5 10.1 14.5L10.2 15.4C10.3 15.4 10.4 15.4 10.6 15.4C10.7 15.4 10.8 15.4 11 15.4L11.1 14.5C11.3 14.4 11.5 14.4 11.7 14.3L12.5 14.9C12.7 14.7 12.9 14.6 13 14.4L12.4 13.6C12.5 13.4 12.6 13.2 12.6 13L13.5 12.9ZM10.5 13.8C9.79995 13.8 9.19995 13.2 9.19995 12.5C9.19995 11.8 9.79995 11.2 10.5 11.2C11.2 11.2 11.8 11.8 11.8 12.5C11.8 13.2 11.2 13.8 10.5 13.8Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/StatusBar/drawer-shadow-bottom.png b/Content/Slate/Starship/StatusBar/drawer-shadow-bottom.png
new file mode 100644
index 0000000..5ba6a94
Binary files /dev/null and b/Content/Slate/Starship/StatusBar/drawer-shadow-bottom.png differ
diff --git a/Content/Slate/Starship/TimelineEditor/TimelineAutoPlay.svg b/Content/Slate/Starship/TimelineEditor/TimelineAutoPlay.svg
new file mode 100644
index 0000000..ea47977
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TimelineAutoPlay.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="TimelineAutoPlay"><path class="cls-1" d="M18.31,9.28,10.47,5.05,8,10h4L4,18l3-6H3l7.13-7.13L3.2,1.12A.79.79,0,0,0,2,1.84V18.27a.78.78,0,0,0,1.2.6l15.11-8.15A.8.8,0,0,0,18.31,9.28Z"/><rect class="cls-2" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/TimelineEditor/TimelineIgnoreTimeDilation.svg b/Content/Slate/Starship/TimelineEditor/TimelineIgnoreTimeDilation.svg
new file mode 100644
index 0000000..dd8318d
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TimelineIgnoreTimeDilation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{opacity:0.5;}.cls-3,.cls-4{fill:none;}.cls-3{stroke:#fff;stroke-miterlimit:10;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="TimelineIgnoreTimeDilation"><path class="cls-1" d="M7.35,1,9,1.06V11.71a.48.48,0,0,1-.79-.32L6.68,1.46A.47.47,0,0,1,7.35,1Z"/><path class="cls-1" d="M4.16,2.88l1.45-.24L7.51,12a.43.43,0,0,1-.75-.14l-3.1-8.4A.42.42,0,0,1,4.16,2.88Z"/><path class="cls-1" d="M1.59,6l1.09-.5,3.45,6.87a.35.35,0,0,1-.62.05L1.32,6.49A.34.34,0,0,1,1.59,6Z"/><path class="cls-1" d="M.18,9.19l.67-.58,3.87,4.21a.26.26,0,0,1-.43.16L.08,9.62A.26.26,0,0,1,.18,9.19Z"/><path class="cls-2" d="M10.72.71l9,4.86a.48.48,0,0,1,0,.86l-9,4.87a.48.48,0,0,1-.72-.43V1.06A.46.46,0,0,1,10.72.71Z"/><path class="cls-2" d="M16,11.8A3.2,3.2,0,1,1,12.8,15,3.21,3.21,0,0,1,16,11.8m0-.8a4,4,0,1,0,4,4,4,4,0,0,0-4-4Z"/><line class="cls-3" x1="18.4" y1="12.6" x2="13.6" y2="17.4"/><rect class="cls-4" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/TimelineEditor/TimelineReplicated.svg b/Content/Slate/Starship/TimelineEditor/TimelineReplicated.svg
new file mode 100644
index 0000000..0d1d19a
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TimelineReplicated.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="TimelineReplicated"><path class="cls-1" d="M5,13H4V10H5Zm3-3H7v3H8Zm3,0H10v3h1Zm3,0H13v3h1Zm3,0H16v3h1Zm3,0H19v3h1Z"/><rect class="cls-2" x="4" y="13" width="16" height="1"/><path class="cls-1" d="M1,18H0V15H1Zm3-3H3v3H4Zm3,0H6v3H7Zm3,0H9v3h1Zm3,0H12v3h1Zm3,0H15v3h1Z"/><rect class="cls-2" y="18" width="16" height="1"/><path class="cls-2" d="M.72.21l9,4.86a.48.48,0,0,1,0,.86l-9,4.87A.48.48,0,0,1,0,10.37V.56A.46.46,0,0,1,.72.21Z"/><rect class="cls-3" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/TimelineEditor/TimelineUseLastKeyframe.svg b/Content/Slate/Starship/TimelineEditor/TimelineUseLastKeyframe.svg
new file mode 100644
index 0000000..884285f
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TimelineUseLastKeyframe.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_4" data-name="Layer 4"><g id="TimelineUseLastKeyframe"><rect class="cls-1" x="2.7" y="4.7" width="10.61" height="10.61" transform="translate(6.59 22.73) rotate(-135)"/><path class="cls-2" d="M18,2h2a0,0,0,0,1,0,0V18a0,0,0,0,1,0,0H18a1,1,0,0,1-1-1V3a1,1,0,0,1,1-1Z" transform="translate(37 20) rotate(180)"/><rect class="cls-3" width="20" height="20"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/TimelineEditor/TrackTypeColor.svg b/Content/Slate/Starship/TimelineEditor/TrackTypeColor.svg
new file mode 100644
index 0000000..b842930
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TrackTypeColor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><g id="TrackTypeColor"><path class="cls-1" d="M11.93,10.68A5.7,5.7,0,0,1,5.5,7L5.42,6.8a4.59,4.59,0,1,0,6.51,3.88Z"/><path class="cls-1" d="M3.32.71A4.56,4.56,0,0,0,2.4,8.89,4,4,0,0,1,3,8.05,3.48,3.48,0,0,1,1.45,6.2a3.58,3.58,0,0,1,2.2-4.55,3.69,3.69,0,0,1,1.17-.2,3.55,3.55,0,0,1,1.64.4,4,4,0,0,1,.67-.75A4.56,4.56,0,0,0,3.32.71Z"/><circle class="cls-2" cx="11" cy="5" r="4.5"/><rect class="cls-3" width="16" height="16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/TimelineEditor/TrackTypeCurve.svg b/Content/Slate/Starship/TimelineEditor/TrackTypeCurve.svg
new file mode 100644
index 0000000..dd737f1
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TrackTypeCurve.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.8501 12L12.48 16L9.1001 12H11.3601C11.3601 10.75 11.75 7.7001 8.80005 6.3501C10.1806 6.47989 11.456 7.14238 12.356 8.19727C13.2559 9.25215 13.7095 10.6163 13.6201 12H15.8501Z" fill="white"/>
+<path opacity="0.5" d="M14 1H11.8101C5.69006 1 8.31 10 0 10" stroke="white" stroke-width="2" stroke-miterlimit="10"/>
+</svg>
diff --git a/Content/Slate/Starship/TimelineEditor/TrackTypeFloat.svg b/Content/Slate/Starship/TimelineEditor/TrackTypeFloat.svg
new file mode 100644
index 0000000..f829401
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TrackTypeFloat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-1{opacity:0.5;}.cls-2{fill-rule:evenodd;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><g id="TrackTypeFloat"><rect class="cls-1" y="12" width="16" height="2"/><path class="cls-2" d="M8,4c3.95,0,2.11,6,8,6V8c-5.06,0-2.95-6-8-6S5.06,8,0,8v2C6.06,10,4.05,4,8,4Z"/><rect class="cls-3" width="16" height="16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/TimelineEditor/TrackTypeVector.svg b/Content/Slate/Starship/TimelineEditor/TrackTypeVector.svg
new file mode 100644
index 0000000..e073467
--- /dev/null
+++ b/Content/Slate/Starship/TimelineEditor/TrackTypeVector.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1,.cls-2{fill:#fff;}.cls-2{opacity:0.5;}.cls-3{fill:none;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_3" data-name="Layer 3"><g id="TrackTypeVector"><polygon class="cls-1" points="16 13 12 10 12 12 4 12 4 14 12 14 12 16 16 13"/><polygon class="cls-1" points="3 0 0 4 2 4 2 14 4 14 4 4 6 4 3 0"/><polygon class="cls-2" points="13.24 2.76 8.29 3.46 9.71 4.88 2.95 11.64 4.36 13.05 11.12 6.29 12.54 7.71 13.24 2.76"/><rect class="cls-3" width="16" height="16"/></g></g></g></svg>
\ No newline at end of file
diff --git a/Content/Slate/Starship/WorldBrowser/LevelDetails.svg b/Content/Slate/Starship/WorldBrowser/LevelDetails.svg
new file mode 100644
index 0000000..2ad8e39
--- /dev/null
+++ b/Content/Slate/Starship/WorldBrowser/LevelDetails.svg
@@ -0,0 +1,10 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7 8V7H10L8.4 2.88L6.8 6.8L4.8 0L2.4 8H7Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M10.8 4.64999L12 7H11.52L10.8 4.64999ZM7 9H0.799988L2 4.79999L0 8.79999V11H7V9Z" fill="white"/>
+<path opacity="0.5" d="M11.5 16H16V15H12.5L11.5 16Z" fill="white"/>
+<path opacity="0.5" d="M13.5 14H16V13H14.5L13.5 14Z" fill="white"/>
+<path opacity="0.5" d="M12.6 8H8V9H11.6L12.6 8Z" fill="white"/>
+<path opacity="0.5" d="M10.5 10H8V11H9.5L10.5 10Z" fill="white"/>
+<path opacity="0.5" d="M9 12H8V13L9 12Z" fill="white"/>
+<path d="M11.36 14.2L9.79999 12.64L14.06 8.38C14.2474 8.19375 14.5008 8.0892 14.765 8.0892C15.0292 8.0892 15.2826 8.19375 15.47 8.38L15.62 8.53C15.8062 8.71736 15.9108 8.9708 15.9108 9.23499C15.9108 9.49917 15.8062 9.75264 15.62 9.94L11.36 14.2ZM10.5 14.98L9 13.5L8 16L10.5 14.98Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/WorldBrowser/LevelDetails_20.svg b/Content/Slate/Starship/WorldBrowser/LevelDetails_20.svg
new file mode 100644
index 0000000..8c26209
--- /dev/null
+++ b/Content/Slate/Starship/WorldBrowser/LevelDetails_20.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9 10V9H12.61L10.5 3.59L8.5 8.5L6 0L3 10H9Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M13.5 6.06L15 9H14.4L13.5 6.06ZM9 11H1L2.5 6L0 11V13H9V11Z" fill="white"/>
+<path opacity="0.5" d="M14 20H20V19H15L14 20Z" fill="white"/>
+<path opacity="0.5" d="M16 18H20V17H17L16 18Z" fill="white"/>
+<path opacity="0.5" d="M18 16H20V15H19L18 16Z" fill="white"/>
+<path opacity="0.5" d="M16 10H10.01V11H15L16 10Z" fill="white"/>
+<path opacity="0.5" d="M14 12H10.01V13H13L14 12Z" fill="white"/>
+<path opacity="0.5" d="M12 14H10V15H11L12 14Z" fill="white"/>
+<path d="M14.2 17.75L12.25 15.8L17.75 10.3C17.843 10.2063 17.9535 10.1319 18.0754 10.0811C18.1973 10.0303 18.328 10.0042 18.46 10.0042C18.592 10.0042 18.7227 10.0303 18.8446 10.0811C18.9664 10.1319 19.0771 10.2063 19.17 10.3L19.7 10.83C19.7937 10.9229 19.8681 11.0336 19.9189 11.1554C19.9697 11.2773 19.9958 11.408 19.9958 11.54C19.9958 11.672 19.9697 11.8027 19.9189 11.9246C19.8681 12.0465 19.7937 12.157 19.7 12.25L14.2 17.75ZM13.35 18.63L11.35 16.63L10 20L13.35 18.63Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/WorldBrowser/LevelStack.svg b/Content/Slate/Starship/WorldBrowser/LevelStack.svg
new file mode 100644
index 0000000..d664a15
--- /dev/null
+++ b/Content/Slate/Starship/WorldBrowser/LevelStack.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 9L13.67 5L16 8.48V10H0V8.48L2.33 5L1 9H15Z" fill="white"/>
+<path d="M8.45 6.67L6.2 0L3.5 8H12.5L10.25 2.67L8.45 6.67Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 14V14.5H1V14H0.46L0 14.48V16H16V14.48L15.54 14H15Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M15 11V11.5H1V11H0.46L0 11.48V13H16V11.48L15.54 11H15Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/WorldBrowser/LevelStack_20.svg b/Content/Slate/Starship/WorldBrowser/LevelStack_20.svg
new file mode 100644
index 0000000..7233de6
--- /dev/null
+++ b/Content/Slate/Starship/WorldBrowser/LevelStack_20.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M17.88 10L16 5L19 9.88V12H1V9.88L4 5L2.13 10H3.12H16.82H17.88Z" fill="white"/>
+<path d="M10.56 7.5L7.75 0L4.38 9H15.63L12.81 3L10.56 7.5Z" fill="white"/>
+<path opacity="0.5" d="M19 14H1V16H19V14Z" fill="white"/>
+<path opacity="0.5" d="M19 18H1V20H19V18Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/WorldBrowser/WorldComp_16.svg b/Content/Slate/Starship/WorldBrowser/WorldComp_16.svg
new file mode 100644
index 0000000..3cba286
--- /dev/null
+++ b/Content/Slate/Starship/WorldBrowser/WorldComp_16.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.33002 11.5301C4.33002 10.5301 3.33002 8.70003 3.43002 7.94003C3.64002 6.72003 4.43002 6.78012 4.43002 6.78012C4.43002 6.78012 2.83002 5.88014 2.55002 5.30014C2.27002 4.72014 1.35002 4.3601 1.02002 3.5101C1.34933 2.82964 1.81513 2.22424 2.38846 1.73153C2.96178 1.23882 3.63036 0.869322 4.3526 0.646084C5.07484 0.422846 5.83532 0.35066 6.58667 0.433926C7.33802 0.517191 8.0642 0.754013 8.72003 1.12997C8.34343 1.91218 7.8246 2.61759 7.19003 3.21005C6.48003 3.83005 8.02002 4.76017 7.55002 5.33017C7.08002 5.90017 6.85003 5.13011 6.50003 4.52011C6.24003 4.08011 5.50002 4.20007 4.99002 4.23007C3.24002 4.32007 3.88004 6.95017 5.29004 6.58017C5.67778 6.40355 6.108 6.34169 6.52979 6.40194C6.95157 6.4622 7.34727 6.6419 7.67004 6.92001C7.97415 7.22548 8.14487 7.63912 8.14487 8.07016C8.14487 8.50119 7.97415 8.91459 7.67004 9.22006C7.29101 9.91721 7.08841 10.6966 7.08002 11.4901C6.72798 11.5628 6.36951 11.5998 6.01004 11.6002C5.78206 11.5921 5.55485 11.5687 5.33002 11.5301Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M6 0C7.18669 0 8.34674 0.351942 9.33344 1.01123C10.3201 1.67052 11.0891 2.6075 11.5433 3.70386C11.9974 4.80021 12.1162 6.00677 11.8847 7.17065C11.6532 8.33454 11.0818 9.40356 10.2426 10.2427C9.40353 11.0818 8.33442 11.6533 7.17053 11.8848C6.00665 12.1163 4.80024 11.9973 3.70389 11.5432C2.60753 11.0891 1.67046 10.3202 1.01117 9.3335C0.351881 8.3468 0 7.18669 0 6C0 4.4087 0.632136 2.88254 1.75735 1.75732C2.88257 0.632106 4.4087 0 6 0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.21 12C10.9064 11.5202 11.5124 10.9209 12 10.23V12H10.21ZM5.51999 13.3799C5.34678 13.389 5.17321 13.389 5 13.3799V16H8V13C7.19513 13.2418 6.36034 13.3696 5.51999 13.3799ZM9 13V16H12V13H9ZM13 12H16V9H13V12ZM13 16H16V13H13V16ZM13.41 5.47998C13.415 6.33243 13.2972 7.18118 13.06 8H16V5H13.39C13.4 5.16 13.41 5.32998 13.41 5.47998Z" fill="white"/>
+</svg>
diff --git a/Content/Slate/Starship/WorldBrowser/WorldComp_20.svg b/Content/Slate/Starship/WorldBrowser/WorldComp_20.svg
new file mode 100644
index 0000000..4fc33a3
--- /dev/null
+++ b/Content/Slate/Starship/WorldBrowser/WorldComp_20.svg
@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.67001 14.42C5.45001 13.11 4.13001 10.88 4.29001 9.91995C4.55001 8.39995 5.53 8.47 5.53 8.47C5.53 8.47 3.52999 7.34991 3.17999 6.62991C2.82999 5.90991 1.68001 5.44991 1.26001 4.37991C1.67072 3.52783 2.25223 2.76952 2.96844 2.15164C3.68466 1.53376 4.52027 1.0697 5.42337 0.788359C6.32647 0.507021 7.27776 0.414348 8.21817 0.516142C9.15858 0.617937 10.068 0.911843 10.89 1.37991C10.4232 2.36009 9.78287 3.24784 9 4.00003C8.11 4.77003 10 5.93994 9.44 6.65994C8.88 7.37994 8.57 6.40994 8.13 5.65994C7.81 5.10994 6.87999 5.26007 6.23999 5.29007C4.05999 5.41007 4.85 8.70002 6.62 8.24002C7.10738 8.01368 7.64979 7.93285 8.18198 8.00735C8.71417 8.08186 9.2135 8.30845 9.62 8.65994C9.81202 8.84636 9.96469 9.06946 10.0689 9.31595C10.1732 9.56244 10.2269 9.82737 10.2269 10.095C10.2269 10.3626 10.1732 10.6276 10.0689 10.8741C9.96469 11.1205 9.81202 11.3436 9.62 11.5301C9.15335 12.4084 8.9031 13.3854 8.89001 14.3799C8.17668 14.5364 7.43979 14.5534 6.72 14.43L6.67001 14.42Z" fill="white"/>
+<path opacity="0.5" fill-rule="evenodd" clip-rule="evenodd" d="M7.5 0C8.98336 0 10.4334 0.439805 11.6668 1.26392C12.9001 2.08803 13.8615 3.25944 14.4291 4.62988C14.9968 6.00033 15.1453 7.50828 14.8559 8.96313C14.5665 10.418 13.8522 11.7543 12.8033 12.8032C11.7544 13.8521 10.418 14.5666 8.96317 14.856C7.50831 15.1453 6.00033 14.9969 4.62988 14.4292C3.25944 13.8615 2.08809 12.9001 1.26398 11.6667C0.439866 10.4334 0 8.98336 0 7.5C0 5.51088 0.790163 3.6033 2.19669 2.19678C3.60321 0.790254 5.51088 0 7.5 0Z" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15 16V20H11V16H15ZM6.89999 16.72C6.59812 16.7133 6.29722 16.6831 6 16.6299V20H10V16.3C8.99077 16.5813 7.94768 16.7226 6.89999 16.72ZM15 15V12.79C14.3919 13.6517 13.6371 14.3997 12.77 15H15ZM16.76 6.8501C16.765 7.91506 16.6203 8.97535 16.33 10H20V6H16.72C16.7478 6.28247 16.7612 6.56627 16.76 6.8501ZM16 20H20V16H16V20ZM16 15H20V11H16V15Z" fill="white"/>
+</svg>
diff --git a/Content/SodaGameMode.uasset b/Content/SodaGameMode.uasset
new file mode 100644
index 0000000..ac8f401
--- /dev/null
+++ b/Content/SodaGameMode.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa1bf4062e90250c04a1f711aab8a3575f96f19601108d244db9c965347c4632
+size 25348
diff --git a/Content/SodaSimLibrery.uasset b/Content/SodaSimLibrery.uasset
new file mode 100644
index 0000000..bf911f8
--- /dev/null
+++ b/Content/SodaSimLibrery.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb9245218c1441f9c1fbbf60ee666f450abf2ec2b2263b15ffcd9226445a61be
+size 22690
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/LICENSE.txt b/Content/SodaVehicles/SodaSampleVeh01/Mesh/LICENSE.txt
new file mode 100644
index 0000000..763641a
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/LICENSE.txt
@@ -0,0 +1 @@
+"Ford Mustang John Bowe 1969 3D model" (https://skfb.ly/oK79D) by FERtyn_12 is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
\ No newline at end of file
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01.uasset
new file mode 100644
index 0000000..b1a6d3b
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a6d5c029f02a785bc4d9c3b0663017339b6a11f07ba2dc7035fefffae81a217
+size 41250942
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_PhysicsAsset.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_PhysicsAsset.uasset
new file mode 100644
index 0000000..8a6b57f
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17b030a59dd7d2d2ff9079ed1048c6d41dd71ffd071dec6c818697c15c62b165
+size 11048
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_Skeleton.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_Skeleton.uasset
new file mode 100644
index 0000000..a03eae4
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57d175c258d5e6261803f862a9ffc6ae09fb3c3e4331141d94a2e3d9de768cb7
+size 8423
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_Wheel.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_Wheel.uasset
new file mode 100644
index 0000000..50d1c24
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/SodaSampleVeh01_Wheel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8648146d43208c5c4780a902160a3287bb8fe1a506ce1370b1619bcf44abcf9c
+size 715530
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/black.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/black.uasset
new file mode 100644
index 0000000..2e330b8
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/black.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4dfa543bcdb4cd375792e3a5b67cde211afbc9c3bc577bfe0402a54fcca9b160
+size 9775
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/brakedisk.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/brakedisk.uasset
new file mode 100644
index 0000000..5920fb2
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/brakedisk.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54a025264bc84e9d293971b22b95abc3c3df186218964c33d769d15ba9ce7a5d
+size 9680
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/carpaint.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/carpaint.uasset
new file mode 100644
index 0000000..c2463c4
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/carpaint.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:326250f3e477b1d9e1bd2e25751b3207181bba696af699f1d7cf8fa4e86cd646
+size 9793
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/chrome.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/chrome.uasset
new file mode 100644
index 0000000..1966fa7
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/chrome.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:49089c1ef9fd938928ca967a28dfdf5ebb34a80e3f16207280caa76f76256827
+size 9662
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/clearglass.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/clearglass.uasset
new file mode 100644
index 0000000..bc6e4fb
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/clearglass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4afdcbfd98114e62c12d32219c6c498c155029531a288ab99159c3937623a9a4
+size 9805
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/interior.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/interior.uasset
new file mode 100644
index 0000000..fb8fdcf
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/interior.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cf9df6991d707a65c055b8dfe1718376f18c835f2da6b5c77e7faa2e30d9cd0
+size 9674
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/logo.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/logo.uasset
new file mode 100644
index 0000000..6b02909
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/logo.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:336103142d7fa78912c1cd316574845f77fea70893c213c023ca1d37f7d97bb8
+size 8010
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/mirror.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/mirror.uasset
new file mode 100644
index 0000000..3c01700
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/mirror.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fe2869affac5f3243ce16624b5d341b1cc02c578ac1bb4a6381e86d2c4b1966
+size 9662
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/orangeglass.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/orangeglass.uasset
new file mode 100644
index 0000000..8aff5aa
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/orangeglass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c740792b489e87dc613cd23c8eec84e0fcf20b33013615d598d876582ee31904
+size 9692
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/redglass.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/redglass.uasset
new file mode 100644
index 0000000..f886b4a
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/redglass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0b71dfc6aa4de95798cfaf870c619f8c935a90a53e59750714aee50ab7741a8
+size 9245
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/rim.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/rim.uasset
new file mode 100644
index 0000000..21ac528
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/rim.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a554eea056bb9e847b4fa4d09ce15b5c1832644ec0322eb329184166bc2f532d
+size 9644
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/tire.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/tire.uasset
new file mode 100644
index 0000000..90b05b0
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/tire.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bff5a9240dd131400c4c6670375dced0dc0cd8e764025ec3856080d38dc51ceb
+size 7690
diff --git a/Content/SodaVehicles/SodaSampleVeh01/Mesh/windowglass.uasset b/Content/SodaVehicles/SodaSampleVeh01/Mesh/windowglass.uasset
new file mode 100644
index 0000000..bbe3982
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/Mesh/windowglass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ad6515b04760f9bbec4a808e7740643342048acc2d4262a265df1aa76a5356cd
+size 9811
diff --git a/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01.uasset b/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01.uasset
new file mode 100644
index 0000000..f5b506d
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc37a88ffacfeb39355e582ee393696ad97d8ee8aee3c9a4700d4a26f78ee0f8
+size 56597
diff --git a/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01_ChaosWheelBack.uasset b/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01_ChaosWheelBack.uasset
new file mode 100644
index 0000000..0958738
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01_ChaosWheelBack.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5dde3170514a27fcaed361a572396cb8916496f1e258fd3d8ea7ee720f0430c3
+size 5912
diff --git a/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01_ChaosWheelFront.uasset b/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01_ChaosWheelFront.uasset
new file mode 100644
index 0000000..0199fd0
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh01/SodaSampleVeh01_ChaosWheelFront.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b96f1d04633749f2ee3872db67b901bb95f18ad5b287ddc6b23cd8654da510b5
+size 5925
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/LICENSE.txt b/Content/SodaVehicles/SodaSampleVeh02/Mesh/LICENSE.txt
new file mode 100644
index 0000000..ff8a68e
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/LICENSE.txt
@@ -0,0 +1 @@
+"Hummer EV - Low Poly" (https://skfb.ly/oG9CS) by Ajay Gawde is licensed under Creative Commons Attribution (http://creativecommons.org/licenses/by/4.0/).
\ No newline at end of file
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__554.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__554.uasset
new file mode 100644
index 0000000..fa275a1
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__554.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb011e6d65ed3042e743c58b3f87f2b703818f45d2dc9e3aac2d234e559bcc9d
+size 9247
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__555.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__555.uasset
new file mode 100644
index 0000000..fe25f60
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__555.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ddd11046678c8db6eae10ed3f97113182b96b311b5aeba5ede3c764eecf865f7
+size 9012
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__556.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__556.uasset
new file mode 100644
index 0000000..e8ebca8
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__556.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:39b817209fa6fd28717eba248c9cf56b6a24978d89f4a48161f53114d4167066
+size 9370
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__557.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__557.uasset
new file mode 100644
index 0000000..e26e5a3
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__557.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a11373c1ec8b1bb6e24b086c6a71bbd1c0b6698e764ec8facd2a30a171080264
+size 9179
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__558.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__558.uasset
new file mode 100644
index 0000000..ae14889
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__558.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08b81b64e0130445b6a5d79cf93bea0390e1296dfc38310288e01b2635e4df1c
+size 9105
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__559.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__559.uasset
new file mode 100644
index 0000000..f578097
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__559.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:246d316ad4868754092bef47896dc584863cf188f8b890bfdf6774a354cb765a
+size 9445
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__561.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__561.uasset
new file mode 100644
index 0000000..b719d00
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__561.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f44658dbeac1f5ee65ab966e9d22e238c193808411b377fb0b0f3454eaebfe6
+size 7794
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__562.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__562.uasset
new file mode 100644
index 0000000..6edd0d1
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__562.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:100292ff2fe02e5d69820df6ec0fdf7c4c3a98924414e3121b00bd3b6cdaa24e
+size 9369
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__563.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__563.uasset
new file mode 100644
index 0000000..cc6c598
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/Material__563.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d8f8a5c816f15e4c5b0d52f9e3fe9941bacc4d62b3454c0762f4679a0bb6595
+size 9369
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02.uasset
new file mode 100644
index 0000000..36def69
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:288d44b75d1d3f44114891fc59f403546687756d3847d8253f58256eb9d37750
+size 7809237
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_PhysicsAsset.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_PhysicsAsset.uasset
new file mode 100644
index 0000000..44bbdba
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e9afa8658af7c3a7571a38b3d70a9c06b07c41e6439dafe3c4f5aab557f196f8
+size 10170
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_Skeleton.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_Skeleton.uasset
new file mode 100644
index 0000000..c6b055a
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:daf9a5e346d16f2782ca40684ebe17420f513f2e4727bb87bb48bb5fca2ba690
+size 8253
diff --git a/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_Wheel.uasset b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_Wheel.uasset
new file mode 100644
index 0000000..a25630b
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/Mesh/SodaSampleVeh02_Wheel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3f0e7cdfa074a7ba8ef39d0294712bb9ef2dab6271de5cf06bd10350bfc7b40
+size 217824
diff --git a/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02.uasset b/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02.uasset
new file mode 100644
index 0000000..a36d961
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b1729a0e63a3fd8d7e433451278739623796b3ccc37159ac0b5c720dd5a691c
+size 57821
diff --git a/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02_ChaosWheelBack.uasset b/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02_ChaosWheelBack.uasset
new file mode 100644
index 0000000..ce3171e
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02_ChaosWheelBack.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0b2758206e5c02252e16ea1557da5bf224a948b89dfe8f28716fe9c028872a50
+size 5912
diff --git a/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02_ChaosWheelFront.uasset b/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02_ChaosWheelFront.uasset
new file mode 100644
index 0000000..e1d9ba3
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh02/SodaSampleVeh02_ChaosWheelFront.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48236108a5e29e2b0b432bfe9a9881a4a0c84149203b0e1b4959b8159f39668a
+size 5925
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03.uasset
new file mode 100644
index 0000000..dafde4c
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f188bb48272b8692a60b97902c954ce89ee29976ff8b7f0d9e4fb8193c30b9a9
+size 26212659
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03_PhysicsAsset.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03_PhysicsAsset.uasset
new file mode 100644
index 0000000..e494fa8
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03_PhysicsAsset.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d95c9ec483725bb79f12f5422166ce251a5e1f876f2bdadf974eb8cf001cde6
+size 10053
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03_Skeleton.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03_Skeleton.uasset
new file mode 100644
index 0000000..4823a29
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/SodaSampleVeh03_Skeleton.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ca784c56470cddc3a207eeb48ae74fc4a9b81a81a98e7bc57c9bf7ae0019bb2
+size 10097
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_AllDoorsGlass.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_AllDoorsGlass.uasset
new file mode 100644
index 0000000..0f753dd
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_AllDoorsGlass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:54bd1170706071c2a72fde4c4bd8b5c77a922de3673eb2d08027aa8c8c41a511
+size 9410
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_AnotherGlassGover.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_AnotherGlassGover.uasset
new file mode 100644
index 0000000..97a9c37
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_AnotherGlassGover.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e03a003b7b0df6fc707fd6251efaa2d9ac7b3258e4e51c73177a891f6371590
+size 9203
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BackLight.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BackLight.uasset
new file mode 100644
index 0000000..f0f5e40
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BackLight.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8a18a03ee37faf55296908861c5586ec4c52d4ed485963cc794d67a17df625bf
+size 9264
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BlackParts1.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BlackParts1.uasset
new file mode 100644
index 0000000..82b471c
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BlackParts1.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2966fef3def5479e01b61baca918a92c9f86e7f26b88dc1ca62e15f6bdf8324b
+size 9292
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BlackParts2.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BlackParts2.uasset
new file mode 100644
index 0000000..4c010ee
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_BlackParts2.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07979be4ee0a1c356dad6bd4f1a3f1e6479261baa536c195ceabf5b3a5ac7249
+size 7830
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_FrontLight.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_FrontLight.uasset
new file mode 100644
index 0000000..dea5ba9
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_FrontLight.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:38f6d944915ca06a5ad57b672d3b4a04eeafc38afa51c0083c41499dab78892f
+size 9566
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_FrontPartBlack.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_FrontPartBlack.uasset
new file mode 100644
index 0000000..b88e314
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_FrontPartBlack.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0cdbf18b4b21b0430ad243fa5c9a2c7b3ce8ed77dd10e037b84000763f0a43bb
+size 8345
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_Inside.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_Inside.uasset
new file mode 100644
index 0000000..005fbb0
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_Inside.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df31b6b2d064da51bcfd58a74eecacfcdb77cc7773d791316f5535a2b7e85aac
+size 8468
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LidarBody_001.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LidarBody_001.uasset
new file mode 100644
index 0000000..a3f93b7
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LidarBody_001.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:93ab1d8e192a791ae9440a4afa4c62882e1b43d43b4017fddae0ee2ffdb9c6dc
+size 9160
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LightsEMISSION.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LightsEMISSION.uasset
new file mode 100644
index 0000000..a665836
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LightsEMISSION.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4614d6692fff6b828044f0fe9f8dd7d8b850b1f38d82989ccbcbd1905acf4d65
+size 9186
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LongGlass.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LongGlass.uasset
new file mode 100644
index 0000000..b01bd9d
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_LongGlass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24ca824cc81c748be0d6a8b96580eb6cb746b9e1933ed505b72b4b3908b4be33
+size 8087
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_MainColor.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_MainColor.uasset
new file mode 100644
index 0000000..a932fc5
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_MainColor.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72a223e25c00d1eb16e1338e3fecba323e9a2a15f38baacc64c87d69a6f3f40c
+size 9386
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_MainColor_001.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_MainColor_001.uasset
new file mode 100644
index 0000000..c7a5e85
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_MainColor_001.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:920e7feb59227dec2cfd4d8081f165a7dd3bb2338a84ab6e4ead61fdaa217ed9
+size 9207
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_RearFinsParts.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_RearFinsParts.uasset
new file mode 100644
index 0000000..ac94093
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_RearFinsParts.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48f01b23625ef530e8b32378059541ba4ff8efed31ddd9caf9636903c0a5e855
+size 8503
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_Seats.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_Seats.uasset
new file mode 100644
index 0000000..92d7759
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_Seats.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3081cf9c0c7aaa84bdb4ad69f64f41abade02abd2236296c7dab154c94f5a186
+size 8498
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_SmallGlassParts.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_SmallGlassParts.uasset
new file mode 100644
index 0000000..6105951
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_SmallGlassParts.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ee703177e80cba02c23953cc7ce3614061fd7251be199b703fb3135b50d3c341
+size 9163
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_SmallLightsGlass.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_SmallLightsGlass.uasset
new file mode 100644
index 0000000..43224fe
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_SmallLightsGlass.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6f46b7eb92bb94697d4ffcb678505cd19367fe4b2a9b7247e8bf286c1735614
+size 9178
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_UnderSmallLigthsBlack.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_UnderSmallLigthsBlack.uasset
new file mode 100644
index 0000000..728ab4e
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_UnderSmallLigthsBlack.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ecb54f0f96b0356eebca121e42618ab89d85c135ee74e07ad2ad6dcd0d35ce4
+size 9225
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_VehLogoColor.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_VehLogoColor.uasset
new file mode 100644
index 0000000..d7f4958
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_VehLogoColor.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92b93e1706ce239f953ef10f64714659e3e95230915c2ff9a87fd83798126c13
+size 7836
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlBody.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlBody.uasset
new file mode 100644
index 0000000..32c167c
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlBody.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7adf7cf22772aa4ec817daa3e035983c1bc09cb057a9fb128c7c719ea11fa49f
+size 9370
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlColpaks.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlColpaks.uasset
new file mode 100644
index 0000000..a187e19
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlColpaks.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:70702cfa1637e9581e96ee4b346afd75c9f8c3ea2705ebd735493935051eb5a0
+size 8316
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlDecals.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlDecals.uasset
new file mode 100644
index 0000000..46cef7f
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlDecals.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a410e64fbed2daf040cff830c49e88e5e15017bfbe3d574bd93174289b895b6d
+size 9387
diff --git a/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlTyre.uasset b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlTyre.uasset
new file mode 100644
index 0000000..0d852d7
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/Mesh/Soda_WhlTyre.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:419c8fd72f2cada3781aa62829f96f4a1efc5ee67fa147df5f993bdf81f3217e
+size 7806
diff --git a/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03.uasset b/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03.uasset
new file mode 100644
index 0000000..b0c1a4b
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4b93c062c42504c95d510afb6d49e77b3d00d8ebbc398ec19f19a9fdc6a7091
+size 56609
diff --git a/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03_ChaosWheelBack.uasset b/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03_ChaosWheelBack.uasset
new file mode 100644
index 0000000..54ab724
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03_ChaosWheelBack.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6233979fc2b80c30a24037bdc4b133559aefeecfeaae98999bdf7abdf825c656
+size 5912
diff --git a/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03_ChaosWheelFront.uasset b/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03_ChaosWheelFront.uasset
new file mode 100644
index 0000000..c6bf1b3
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh03/SodaSampleVeh03_ChaosWheelFront.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:16d9a1f344eb9cc2be3e50b9e62fa54c1928a6793b628e84e7e2b30cda30da24
+size 5925
diff --git a/Content/SodaVehicles/SodaSampleVeh_Anim_Template.uasset b/Content/SodaVehicles/SodaSampleVeh_Anim_Template.uasset
new file mode 100644
index 0000000..2c64432
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh_Anim_Template.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:194fd732cd50cb2eada5da27fed6479bbaf88b423c37355f512f21ebbc71a7be
+size 43622
diff --git a/Content/SodaVehicles/SodaSampleVeh_SteerSpeed.uasset b/Content/SodaVehicles/SodaSampleVeh_SteerSpeed.uasset
new file mode 100644
index 0000000..f1a5caa
--- /dev/null
+++ b/Content/SodaVehicles/SodaSampleVeh_SteerSpeed.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:211530da3f06c6b525f72e9b8bb75d8f52d30c44d847699f46bf8c7f04e1ef19
+size 4476
diff --git a/Content/Widgets/Mat/LoadArrow.uasset b/Content/Widgets/Mat/LoadArrow.uasset
new file mode 100644
index 0000000..7c499f4
--- /dev/null
+++ b/Content/Widgets/Mat/LoadArrow.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:de38b7f24c345250167c8e0cdf2d80b3ae0829b895100ebe7623ebb3387f3606
+size 14621
diff --git a/Content/Widgets/Mat/SpeedArrow.uasset b/Content/Widgets/Mat/SpeedArrow.uasset
new file mode 100644
index 0000000..ff84267
--- /dev/null
+++ b/Content/Widgets/Mat/SpeedArrow.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6bd3e8829c4a9ee4e14f410aa06fb9c4f1aa243e386b9bd92eff1964e406c714
+size 14523
diff --git a/Content/Widgets/Mat/Status.uasset b/Content/Widgets/Mat/Status.uasset
new file mode 100644
index 0000000..e14856a
--- /dev/null
+++ b/Content/Widgets/Mat/Status.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b51611161a04f0c58224a6309d9d1021e60a5a18b78bf805ba434a4f5895ee2
+size 11748
diff --git a/Content/Widgets/Mat/speedometer.uasset b/Content/Widgets/Mat/speedometer.uasset
new file mode 100644
index 0000000..5983253
--- /dev/null
+++ b/Content/Widgets/Mat/speedometer.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62f12a42426b1c3796034f0038f1afdacc12228e795ad8fb6f2b2a61cad251d6
+size 108887
diff --git a/Content/Widgets/SpeedGaugeWidget.uasset b/Content/Widgets/SpeedGaugeWidget.uasset
new file mode 100644
index 0000000..92f5c7a
--- /dev/null
+++ b/Content/Widgets/SpeedGaugeWidget.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ef04eaf5fae7f82b5dc206b2f4395eee6b2cda518f2425fc31a0ca8b57b8200
+size 478946
diff --git a/Content/Widgets/Textures/ad.uasset b/Content/Widgets/Textures/ad.uasset
new file mode 100644
index 0000000..8e88b74
--- /dev/null
+++ b/Content/Widgets/Textures/ad.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb48616f28a3eb25a4b9943bd6484fcef2437fa78144b47beefb717a361272a3
+size 11760
diff --git a/Content/Widgets/Textures/arrow_route.uasset b/Content/Widgets/Textures/arrow_route.uasset
new file mode 100644
index 0000000..3c21d2e
--- /dev/null
+++ b/Content/Widgets/Textures/arrow_route.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0dc9eac90c71c0f4bd419296b5e15e76afc90a497e65832d137f7ec223b661b2
+size 6121
diff --git a/Content/Widgets/Textures/horn.uasset b/Content/Widgets/Textures/horn.uasset
new file mode 100644
index 0000000..8b76d5e
--- /dev/null
+++ b/Content/Widgets/Textures/horn.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:082c09599035fc1d752ad9fd3fe64f47dc6297fbe34755a72099dc8f2c04b95a
+size 8037
diff --git a/Content/Widgets/Textures/load_arrow.uasset b/Content/Widgets/Textures/load_arrow.uasset
new file mode 100644
index 0000000..28c07dc
--- /dev/null
+++ b/Content/Widgets/Textures/load_arrow.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9724a30fdedabc9345d7f61b4d0f9c0be0d14f4132b3efdb6189c12ff4a2ad2
+size 26421
diff --git a/Content/Widgets/Textures/load_arrow_mask.uasset b/Content/Widgets/Textures/load_arrow_mask.uasset
new file mode 100644
index 0000000..265aba0
--- /dev/null
+++ b/Content/Widgets/Textures/load_arrow_mask.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1dd6bb6744ba2a19865ca2cf37270160c6895a954421072f801222e3b861fbb3
+size 25758
diff --git a/Content/Widgets/Textures/manual.uasset b/Content/Widgets/Textures/manual.uasset
new file mode 100644
index 0000000..df74290
--- /dev/null
+++ b/Content/Widgets/Textures/manual.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7405e32e4b602bb52c36e8b45339f3c0bdf8934256eb3539f5aceac030ac0b35
+size 11143
diff --git a/Content/Widgets/Textures/ping.uasset b/Content/Widgets/Textures/ping.uasset
new file mode 100644
index 0000000..0d7d891
--- /dev/null
+++ b/Content/Widgets/Textures/ping.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c520c086625d000983f90976d6ccc445f61c1a5aa357047a52f1ae8593a54754
+size 11407
diff --git a/Content/Widgets/Textures/safe_stop.uasset b/Content/Widgets/Textures/safe_stop.uasset
new file mode 100644
index 0000000..859fe02
--- /dev/null
+++ b/Content/Widgets/Textures/safe_stop.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d832588011a1a8e4e807ad65ea0b97b22870aed6a357c52cfe4aa14cdfb53cea
+size 8736
diff --git a/Content/Widgets/Textures/speed_arrow.uasset b/Content/Widgets/Textures/speed_arrow.uasset
new file mode 100644
index 0000000..cf5bd2b
--- /dev/null
+++ b/Content/Widgets/Textures/speed_arrow.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:028dfdac7009286d322546f4468d5f9ff6740d2336d7e1346991206dcbf242e0
+size 29497
diff --git a/Content/Widgets/Textures/speed_arrow_mask.uasset b/Content/Widgets/Textures/speed_arrow_mask.uasset
new file mode 100644
index 0000000..e92633a
--- /dev/null
+++ b/Content/Widgets/Textures/speed_arrow_mask.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:027a1db04d3ceb91d4929b6cb2f91bbb221e93162b3ee0a1151885aa82545f7a
+size 13244
diff --git a/Content/Widgets/Textures/warning.uasset b/Content/Widgets/Textures/warning.uasset
new file mode 100644
index 0000000..92438fc
--- /dev/null
+++ b/Content/Widgets/Textures/warning.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af4389243b2e5d3ac451142d928ac8d0b57aeb1c562018eb16c0c07350dd6a55
+size 11348
diff --git a/Docs/img/intro.jpg b/Docs/img/intro.jpg
new file mode 100644
index 0000000..dbf502d
Binary files /dev/null and b/Docs/img/intro.jpg differ
diff --git a/Doxyfile b/Doxyfile
new file mode 100644
index 0000000..8efae16
--- /dev/null
+++ b/Doxyfile
@@ -0,0 +1,2821 @@
+# Doxyfile 1.9.7
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+#
+# Note:
+#
+# Use doxygen to compare the used configuration file with the template
+# configuration file:
+# doxygen -x [configFile]
+# Use doxygen to compare the used configuration file with the template
+# configuration file without replacing the environment variables or CMake type
+# replacement variables:
+# doxygen -x_noenv [configFile]
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the configuration
+# file that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "UnrealSoda"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = Docs
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create up to 4096
+# sub-directories (in 2 levels) under the output directory of each output format
+# and will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system. Adapt CREATE_SUBDIRS_LEVEL to
+# control the number of sub-directories.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# Controls the number of sub-directories that will be created when
+# CREATE_SUBDIRS tag is set to YES. Level 0 represents 16 directories, and every
+# level increment doubles the number of directories, resulting in 4096
+# directories at level 8 which is the default and also the maximum value. The
+# sub-directories are organized in 2 levels, the first level always has a fixed
+# number of 16 directories.
+# Minimum value: 0, maximum value: 8, default value: 8.
+# This tag requires that the tag CREATE_SUBDIRS is set to YES.
+
+CREATE_SUBDIRS_LEVEL   = 8
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Bulgarian,
+# Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, English
+# (United States), Esperanto, Farsi (Persian), Finnish, French, German, Greek,
+# Hindi, Hungarian, Indonesian, Italian, Japanese, Japanese-en (Japanese with
+# English messages), Korean, Korean-en (Korean with English messages), Latvian,
+# Lithuanian, Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese,
+# Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish,
+# Swedish, Turkish, Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the JAVADOC_BANNER tag is set to YES then doxygen will interpret a line
+# such as
+# /***************
+# as being the beginning of a Javadoc-style comment "banner". If set to NO, the
+# Javadoc-style will behave just like regular comments and it will not be
+# interpreted by doxygen.
+# The default value is: NO.
+
+JAVADOC_BANNER         = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# By default Python docstrings are displayed as preformatted text and doxygen's
+# special commands cannot be used. By setting PYTHON_DOCSTRING to NO the
+# doxygen's special commands can be used and the contents of the docstring
+# documentation blocks is shown as doxygen documentation.
+# The default value is: YES.
+
+PYTHON_DOCSTRING       = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:^^"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". Note that you cannot put \n's in the value part of an alias
+# to insert newlines (in the resulting output). You can put ^^ in the value part
+# of an alias to insert a newline as if a physical newline was in the original
+# file. When you need a literal { or } or , in the value part of an alias you
+# have to escape them by means of a backslash (\), this can lead to conflicts
+# with the commands \{ and \} for these it is advised to use the version @{ and
+# @} or use a double escape (\\{ and \\})
+
+ALIASES                =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
+# sources only. Doxygen will then generate output that is more tailored for that
+# language. For instance, namespaces will be presented as modules, types will be
+# separated into more groups, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_SLICE  = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, JavaScript,
+# Csharp (C#), C, C++, Lex, D, PHP, md (Markdown), Objective-C, Python, Slice,
+# VHDL, Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
+# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
+# tries to guess whether the code is fixed or free formatted code, this is the
+# default for Fortran type files). For instance to make doxygen treat .inc files
+# as Fortran files (default is PHP), and .f files as C (default is Fortran),
+# use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen. When specifying no_extension you should add
+# * to the FILE_PATTERNS.
+#
+# Note see also the list of default file extension mappings.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 5.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 5
+
+# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
+# generate identifiers for the Markdown headings. Note: Every identifier is
+# unique.
+# Possible values are: DOXYGEN Use a fixed 'autotoc_md' string followed by a
+# sequence number starting at 0. and GITHUB Use the lower case version of title
+# with any whitespace replaced by '-' and punctations characters removed..
+# The default value is: DOXYGEN.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+MARKDOWN_ID_STYLE      = DOXYGEN
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+# The NUM_PROC_THREADS specifies the number of threads doxygen is allowed to use
+# during processing. When set to 0 doxygen will based this on the number of
+# cores available in the system. You can set it explicitly to a value larger
+# than 0 to get more control over the balance between CPU load and processing
+# speed. At this moment only the input processing can be done using multiple
+# threads. Since this is still an experimental feature the default is set to 1,
+# which effectively disables parallel processing. Please report any issues you
+# encounter. Generating dot graphs in parallel is controlled by the
+# DOT_NUM_THREADS setting.
+# Minimum value: 0, maximum value: 32, default value: 1.
+
+NUM_PROC_THREADS       = 1
+
+# If the TIMESTAMP tag is set different from NO then each generated page will
+# contain the date or date and time when the page was generated. Setting this to
+# NO can help when comparing the output of multiple runs.
+# Possible values are: YES, NO, DATETIME and DATE.
+# The default value is: NO.
+
+TIMESTAMP              = NO
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PRIV_VIRTUAL tag is set to YES, documented private virtual
+# methods of a class will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIV_VIRTUAL   = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If this flag is set to YES, the name of an unnamed parameter in a declaration
+# will be determined by the corresponding definition. By default unnamed
+# parameters remain unnamed in the output.
+# The default value is: YES.
+
+RESOLVE_UNNAMED_PARAMS = YES
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# will also hide undocumented C++ concepts if enabled. This option has no effect
+# if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# declarations. If set to NO, these declarations will be included in the
+# documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# With the correct setting of option CASE_SENSE_NAMES doxygen will better be
+# able to match the capabilities of the underlying filesystem. In case the
+# filesystem is case sensitive (i.e. it supports files in the same directory
+# whose names only differ in casing), the option must be set to YES to properly
+# deal with such files in case they appear in the input. For filesystems that
+# are not case sensitive the option should be set to NO to properly deal with
+# output files written for symbols that only differ in casing, such as for two
+# classes, one named CLASS and the other named Class, and to also support
+# references to files without having to specify the exact matching casing. On
+# Windows (including Cygwin) and MacOS, users should typically set this option
+# to NO, whereas on Linux or other Unix flavors it should typically be set to
+# YES.
+# Possible values are: SYSTEM, NO and YES.
+# The default value is: SYSTEM.
+
+CASE_SENSE_NAMES       = SYSTEM
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_HEADERFILE tag is set to YES then the documentation for a class
+# will show which file needs to be included to use the class.
+# The default value is: YES.
+
+SHOW_HEADERFILE        = YES
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = YES
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file. See also section "Changing the
+# layout of pages" for information.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as documenting some parameters in
+# a documented function twice, or documenting parameters that don't exist or
+# using markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# If WARN_IF_INCOMPLETE_DOC is set to YES, doxygen will warn about incomplete
+# function parameter documentation. If set to NO, doxygen will accept that some
+# parameters have no documentation without warning.
+# The default value is: YES.
+
+WARN_IF_INCOMPLETE_DOC = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong parameter
+# documentation, but not about the absence of documentation. If EXTRACT_ALL is
+# set to YES then this flag will automatically be disabled. See also
+# WARN_IF_INCOMPLETE_DOC
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
+# undocumented enumeration values. If set to NO, doxygen will accept
+# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: NO.
+
+WARN_IF_UNDOC_ENUM_VAL = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
+# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
+# at the end of the doxygen process doxygen will return with a non-zero status.
+# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves
+# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not
+# write the warning messages in between other messages but write them at the end
+# of a run, in case a WARN_LOGFILE is defined the warning messages will be
+# besides being in the defined file also be shown at the end of a run, unless
+# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
+# the behavior will remain as with the setting FAIL_ON_WARNINGS.
+# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# See also: WARN_LINE_FORMAT
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# In the $text part of the WARN_FORMAT command it is possible that a reference
+# to a more specific place is given. To make it easier to jump to this place
+# (outside of doxygen) the user can define a custom "cut" / "paste" string.
+# Example:
+# WARN_LINE_FORMAT = "'vi $file +$line'"
+# See also: WARN_FORMAT
+# The default value is: at line $line of file $file.
+
+WARN_LINE_FORMAT       = "at line $line of file $file"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr). In case the file specified cannot be opened for writing the
+# warning and error messages are written to standard error. When as file - is
+# specified the warning and error messages are written to standard output
+# (stdout).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = Source/UnrealSoda/Public \
+						 Source/RuntimeEditor/Public/IEditableObject.h \
+						 Source/RuntimeEditor/Public/MetadataPrimaryAsset.h \
+						 Source/RuntimeEditor/Public/RuntimeEditorModule.h \
+						 Source/RuntimeEditor/Public/RuntimeEditorUtils.h \
+						 Source/RuntimeEditor/Public/RuntimeMetaData.h \
+						 Source/RuntimeEditor/Public/RuntimeMetaDataStatic.h \
+						 Source/SodaDBC/Public 
+                         Source/SodaJoystick/Public \
+						 Source/SodaStyle/Public \
+                         Source/UnrealSodaProto/Public
+						 
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see:
+# https://www.gnu.org/software/libiconv/) for the list of possible encodings.
+# See also: INPUT_FILE_ENCODING
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses The INPUT_FILE_ENCODING tag can be used to specify
+# character encoding on a per file pattern basis. Doxygen will compare the file
+# name with each pattern and apply the encoding instead of the default
+# INPUT_ENCODING) if there is a match. The character encodings are a list of the
+# form: pattern=encoding (like *.php=ISO-8859-1). See cfg_input_encoding
+# "INPUT_ENCODING" for further information on supported encodings.
+
+INPUT_FILE_ENCODING    =
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# Note the list of default checked file patterns might differ from the list of
+# default file extension mappings.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.l, *.cs, *.d, *.php, *.php4, *.php5, *.phtml,
+# *.inc, *.m, *.markdown, *.md, *.mm, *.dox (to be provided as doxygen C
+# comment), *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, *.f18, *.f, *.for, *.vhd,
+# *.vhdl, *.ucf, *.qsf and *.ice.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.l \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f18 \
+                         *.f \
+                         *.for \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf \
+                         *.ice
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# ANamespace::AClass, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that doxygen will use the data processed and written to standard output
+# for further processing, therefore nothing else, like debug statements or used
+# commands (so in case of a Windows batch file always use @echo OFF), should be
+# written to standard output.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           = "python BuildUtils/doxygen_ue_filter.py"
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+# The Fortran standard specifies that for fixed formatted Fortran code all
+# characters from position 72 are to be considered as comment. A common
+# extension is to allow longer lines before the automatic comment starts. The
+# setting FORTRAN_COMMENT_AFTER will also make it possible that longer lines can
+# be processed before the automatic comment starts.
+# Minimum value: 7, maximum value: 10000, default value: 72.
+
+FORTRAN_COMMENT_AFTER  = 72
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# entity all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see:
+# http://clang.llvm.org/) for more accurate parsing at the cost of reduced
+# performance. This can be particularly helpful with template rich C++ code for
+# which doxygen's built-in parser lacks the necessary type information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES and the CLANG_ADD_INC_PATHS
+# tag is set to YES then doxygen will add the directory of each input to the
+# include path.
+# The default value is: YES.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_ADD_INC_PATHS    = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+# If clang assisted parsing is enabled you can provide the clang parser with the
+# path to the directory containing a file called compile_commands.json. This
+# file is the compilation database (see:
+# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) containing the
+# options used when the source files were built. This is equivalent to
+# specifying the -p option to a clang tool, such as clang-check. These options
+# will then be passed to the parser. Any options specified with CLANG_OPTIONS
+# will be added as well.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse_libclang=ON option for CMake.
+
+CLANG_DATABASE_PATH    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
+# that should be ignored while generating the index headers. The IGNORE_PREFIX
+# tag works for classes, function and member names. The entity will be placed in
+# the alphabetical list under the first letter of the entity name that remains
+# after removing the prefix.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# Note: Since the styling of scrollbars can currently not be overruled in
+# Webkit/Chromium, the styling will be left out of the default doxygen.css if
+# one or more extra stylesheets have been specified. So if scrollbar
+# customization is desired it has to be added explicitly. For an example see the
+# documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
+# should be rendered with a dark or light theme.
+# Possible values are: LIGHT always generate light mode output, DARK always
+# generate dark mode output, AUTO_LIGHT automatically set the mode according to
+# the user preference, use light mode if no preference is set (the default),
+# AUTO_DARK automatically set the mode according to the user preference, use
+# dark mode if no preference is set and TOGGLE allow to user to switch between
+# light and dark mode via a button.
+# The default value is: AUTO_LIGHT.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE        = AUTO_LIGHT
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a color-wheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use gray-scales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via JavaScript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have JavaScript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see:
+# https://developer.apple.com/xcode/), introduced with OSX 10.5 (Leopard). To
+# create a documentation set, doxygen will generate a Makefile in the HTML
+# output directory. Running make will produce the docset in that directory and
+# running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
+# genXcode/_index.html for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag determines the URL of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDURL         =
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# on Windows. In the beginning of 2021 Microsoft took the original page, with
+# a.o. the download links, offline the HTML help workshop was already many years
+# in maintenance mode). You can download the HTML help workshop from the web
+# archives at Installation executable (see:
+# http://web.archive.org/web/20160201063255/http://download.microsoft.com/downlo
+# ad/0/A/9/0A939EF6-E31C-430F-A3DF-DFAE7960D564/htmlhelp.exe).
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the main .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# The SITEMAP_URL tag is used to specify the full URL of the place where the
+# generated documentation will be placed on the server by the user during the
+# deployment of the documentation. The generated sitemap is called sitemap.xml
+# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
+# is specified no sitemap is generated. For information about the sitemap
+# protocol see https://www.sitemaps.org
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SITEMAP_URL            =
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# https://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location (absolute path
+# including file name) of Qt's qhelpgenerator. If non-empty doxygen will try to
+# run qhelpgenerator on the generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine tune the look of the index (see "Fine-tuning the output"). As an
+# example, the default style sheet generated by doxygen has an example that
+# shows how to put an image at the root of the tree instead of the PROJECT_NAME.
+# Since the tree basically has the same information as the tab index, you could
+# consider setting DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# When both GENERATE_TREEVIEW and DISABLE_INDEX are set to YES, then the
+# FULL_SIDEBAR option determines if the side bar is limited to only the treeview
+# area (value NO) or if it should extend to the full height of the window (value
+# YES). Setting this to YES gives a layout similar to
+# https://docs.readthedocs.io with more room for contents, but less room for the
+# project logo, title, and description. If either GENERATE_TREEVIEW or
+# DISABLE_INDEX is set to NO, this option has no effect.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FULL_SIDEBAR           = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# If the OBFUSCATE_EMAILS tag is set to YES, doxygen will obfuscate email
+# addresses.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+OBFUSCATE_EMAILS       = YES
+
+# If the HTML_FORMULA_FORMAT option is set to svg, doxygen will use the pdf2svg
+# tool (see https://github.com/dawbarton/pdf2svg) or inkscape (see
+# https://inkscape.org) to generate formulas as SVG images instead of PNGs for
+# the HTML output. These images will generally look nicer at scaled resolutions.
+# Possible values are: png (the default) and svg (looks nicer but requires the
+# pdf2svg or inkscape tool).
+# The default value is: png.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FORMULA_FORMAT    = png
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# The FORMULA_MACROFILE can contain LaTeX \newcommand and \renewcommand commands
+# to create new LaTeX commands to be used in formulas as building blocks. See
+# the section "Including formulas" for details.
+
+FORMULA_MACROFILE      =
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side JavaScript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# With MATHJAX_VERSION it is possible to specify the MathJax version to be used.
+# Note that the different versions of MathJax have different requirements with
+# regards to the different settings, so it is possible that also other MathJax
+# settings have to be changed when switching between the different MathJax
+# versions.
+# Possible values are: MathJax_2 and MathJax_3.
+# The default value is: MathJax_2.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_VERSION        = MathJax_2
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. For more details about the output format see MathJax
+# version 2 (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) and MathJax version 3
+# (see:
+# http://docs.mathjax.org/en/latest/web/components/output.html).
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility. This is the name for Mathjax version 2, for MathJax version 3
+# this will be translated into chtml), NativeMML (i.e. MathML. Only supported
+# for NathJax 2. For MathJax version 3 chtml will be used instead.), chtml (This
+# is the name for Mathjax version 3, for MathJax version 2 this will be
+# translated into HTML-CSS) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment. The default value is:
+# - in case of MathJax version 2: https://cdn.jsdelivr.net/npm/mathjax@2
+# - in case of MathJax version 3: https://cdn.jsdelivr.net/npm/mathjax@3
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        =
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# for MathJax version 2 (see
+# https://docs.mathjax.org/en/v2.7-latest/tex.html#tex-and-latex-extensions):
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# For example for MathJax version 3 (see
+# http://docs.mathjax.org/en/latest/input/tex/extensions/index.html):
+# MATHJAX_EXTENSIONS = ams
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see:
+# http://docs.mathjax.org/en/v2.7-latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using JavaScript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see:
+# https://xapian.org/). See the section "External Indexing and Searching" for
+# details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when not enabling USE_PDFLATEX the default is latex when enabling
+# USE_PDFLATEX the default is pdflatex and when in the later case latex is
+# chosen this is overwritten by pdflatex. For specific output languages the
+# default can have been set differently, this depends on the implementation of
+# the output language.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         =
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# Note: This tag is used in the Makefile / make.bat.
+# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
+# (.tex).
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
+# generate index for LaTeX. In case there is no backslash (\) as first character
+# it will be automatically added in the LaTeX code.
+# Note: This tag is used in the generated output file (.tex).
+# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
+# The default value is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_MAKEINDEX_CMD    = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a user-defined LaTeX header for
+# the generated LaTeX document. The header should contain everything until the
+# first chapter. If it is left blank doxygen will generate a standard header. It
+# is highly recommended to start with a default header using
+# doxygen -w latex new_header.tex new_footer.tex new_stylesheet.sty
+# and then modify the file new_header.tex. See also section "Doxygen usage" for
+# information on how to generate the default header that doxygen normally uses.
+#
+# Note: Only use a user-defined header if you know what you are doing!
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. The following
+# commands have a special meaning inside the header (and footer): For a
+# description of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a user-defined LaTeX footer for
+# the generated LaTeX document. The footer should contain everything after the
+# last chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer. See also section "Doxygen
+# usage" for information on how to generate the default footer that doxygen
+# normally uses. Note: Only use a user-defined footer if you know what you are
+# doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use the engine as
+# specified with LATEX_CMD_NAME to generate the PDF file directly from the LaTeX
+# files. Set this option to YES, to get a higher quality PDF documentation.
+#
+# See also section LATEX_CMD_NAME for selecting the engine.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# The LATEX_BATCHMODE tag ignals the behavior of LaTeX in case of an error.
+# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
+# mode nothing is printed on the terminal, errors are scrolled as if <return> is
+# hit at every error; missing files that TeX tries to input or request from
+# keyboard input (\read on a not open input stream) cause the job to abort,
+# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
+# but there is no possibility of user interaction just like in batch mode,
+# SCROLL In scroll mode, TeX will stop only for missing files to input or if
+# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
+# each error, asking for user intervention.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
+# path from which the emoji images will be read. If a relative path is entered,
+# it will be relative to the LATEX_OUTPUT directory. If left blank the
+# LATEX_OUTPUT directory will be used.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EMOJI_DIRECTORY  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# configuration file, i.e. a series of assignments. You only have to provide
+# replacements, missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's configuration file. A template extensions file can be
+# generated using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
+# namespace members in file scope as well, matching the HTML output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_NS_MEMB_FILE_SCOPE = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor. Note that the INCLUDE_PATH is not recursive, so the setting of
+# RECURSIVE has no effect here.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to diagram generator tools
+#---------------------------------------------------------------------------
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# DOT_COMMON_ATTR is common attributes for nodes, edges and labels of
+# subgraphs. When you want a differently looking font in the dot files that
+# doxygen generates you can specify fontname, fontcolor and fontsize attributes.
+# For details please see <a href=https://graphviz.org/doc/info/attrs.html>Node,
+# Edge and Graph Attributes specification</a> You need to make sure dot is able
+# to find the font, which can be done by putting it in a standard location or by
+# setting the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
+# directory containing the font. Default graphviz fontsize is 14.
+# The default value is: fontname=Helvetica,fontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_COMMON_ATTR        = "fontname=Helvetica,fontsize=10"
+
+# DOT_EDGE_ATTR is concatenated with DOT_COMMON_ATTR. For elegant style you can
+# add 'arrowhead=open, arrowtail=open, arrowsize=0.5'. <a
+# href=https://graphviz.org/doc/info/arrows.html>Complete documentation about
+# arrows shapes.</a>
+# The default value is: labelfontname=Helvetica,labelfontsize=10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_EDGE_ATTR          = "labelfontname=Helvetica,labelfontsize=10"
+
+# DOT_NODE_ATTR is concatenated with DOT_COMMON_ATTR. For view without boxes
+# around nodes set 'shape=plain' or 'shape=plaintext' <a
+# href=https://www.graphviz.org/doc/info/shapes.html>Shapes specification</a>
+# The default value is: shape=box,height=0.2,width=0.4.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NODE_ATTR          = "shape=box,height=0.2,width=0.4"
+
+# You can set the path where dot can find font specified with fontname in
+# DOT_COMMON_ATTR and others dot attributes.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will
+# generate a graph for each documented class showing the direct and indirect
+# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
+# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
+# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
+# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
+# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
+# relations will be shown as texts / links.
+# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
+# The default value is: YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies. See also the chapter Grouping
+# in the manual.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the DOT_UML_DETAILS tag is set to NO, doxygen will show attributes and
+# methods without types and arguments in the UML graphs. If the DOT_UML_DETAILS
+# tag is set to YES, doxygen will add type and arguments for attributes and
+# methods in the UML graphs. If the DOT_UML_DETAILS tag is set to NONE, doxygen
+# will not generate fields with class member information in the UML graphs. The
+# class diagrams will look similar to the default class diagrams but using UML
+# notation for the relationships.
+# Possible values are: NO, YES and NONE.
+# The default value is: NO.
+# This tag requires that the tag UML_LOOK is set to YES.
+
+DOT_UML_DETAILS        = NO
+
+# The DOT_WRAP_THRESHOLD tag can be used to set the maximum number of characters
+# to display on a single line. If the actual line length exceeds this threshold
+# significantly it will wrapped across multiple lines. Some heuristics are apply
+# to avoid ugly line breaks.
+# Minimum value: 0, maximum value: 1000, default value: 17.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_WRAP_THRESHOLD     = 17
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DIR_GRAPH_MAX_DEPTH tag can be used to limit the maximum number of levels
+# of child directories generated in directory dependency graphs by dot.
+# Minimum value: 1, maximum value: 25, default value: 1.
+# This tag requires that the tag DIRECTORY_GRAPH is set to YES.
+
+DIR_GRAPH_MAX_DEPTH    = 1
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# https://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file or to the filename of jar file
+# to be used. If left blank, it is assumed PlantUML is not used or called during
+# a preprocessing step. Doxygen will generate a warning when it encounters a
+# \startuml command in this case and will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# Note: This tag requires that UML_LOOK isn't set, i.e. the doxygen internal
+# graphical representation for inheritance and collaboration diagrams is used.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate
+# files that are used to generate the various graphs.
+#
+# Note: This setting is not only used for dot files but also for msc temporary
+# files.
+# The default value is: YES.
+
+DOT_CLEANUP            = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will
+# use a built-in version of mscgen tool to produce the charts. Alternatively,
+# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
+# specifying prog as the value, doxygen will call the tool as prog -T
+# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
+# output file formats "png", "eps", "svg", and "ismap".
+
+MSCGEN_TOOL            =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..af3dace
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,180 @@
+## End User License Agreement
+
+This End User License Agreement (the “Agreement�) applies to your use of Software, SODA.AUTO’s SODA.Sim (the Software).
+Software can be used for vehicle systems and environment simulation as a part of vehicle research and development activities, prototyping, design and architecture review, testing, training, and education.
+
+***This Agreement is a legal document detailing your rights and obligations related to using SODA.AUTO’s SODA.Sim — vehicle validation system with vehicle systems and environment simulation, and any updates or upgrades of the system made available by SODA.AUTO (the “LICENSED SOFTWARE�). By downloading or using the LICENSED SOFTWARE, you are agreeing to be bound by the terms of this Agreement, and this Agreement will be effective upon the first of those events to occur. If you do not or cannot agree to the terms of this Agreement, do not use the LICENSED SOFTWARE. When we say, “you,� “your� or “yourself�, we mean you as an individual or the legal entity exercising rights under this Agreement through you. When we say “SODA.AUTO,� “we� or “us,� we are referring to the SODA.AUTO entity responsible for providing the LICENSED SOFTWARE in your region detailed in Section 9.***  
+
+PLEASE READ THIS AGREEMENT CAREFULLY. IT CONTAINS A GROUP LITIGATION WAIVER PROVISION. IF YOU ACCEPT THIS AGREEMENT, YOU AND SODA.AUTO AGREE TO RESOLVE DISPUTES ONLY IN YOUR INDIVIDUAL CAPACITIES RATHER THAN THROUGH A GROUP LITIGATION PROCESS (SEE SECTION 15). YOU HAVE A TIME-LIMITED RIGHT TO OPT OUT OF THIS WAIVER. BY AGREEING TO THE TERMS OF THIS AGREEMENT, YOU ARE ALSO AGREEING TO CONTRACTUAL TERMS THAT WILL LIMIT SOME OF YOUR LEGAL RIGHTS, INCLUDING A DISCLAIMER OF WARRANTY, AN EXCLUSION OF CERTAIN KINDS OF DAMAGES, AND A LIMITATION OF LIABILITY.  
+
+## Table of Contents 
+
+The LICENSED SOFTWARE  
+    1.	What Technology SODA.AUTO Is Licensing to You  
+2.	How You Can Use the LICENSED SOFTWARE  
+3.	How You Can Share Products You’ve Made with the LICENSED SOFTWARE  
+4.	How You Can Share the LICENSED SOFTWARE When It Isn’t Part of a Product  
+5.	Other Restrictions on Your Use of the LICENSED SOFTWARE  
+6.	Who Owns What    
+
+Our Relationship  
+7.	The Agreement Between You and SODA.AUTO  
+8.	Who are You?  
+9.	Who is SODA.AUTO?  
+10.	Privacy  
+
+Other Rights and Obligations  
+11.	Disclaimers  
+12.	Limitation of Liability  
+13.	Indemnification  
+14.	Governing Law and Jurisdiction  
+15.	No Group Litigation  
+16.	Miscellaneous  
+
+ 
+## The LICENSED SOFTWARE
+
+1.	***What SODA.AUTO Is Licensing to You***  
+The LICENSED SOFTWARE licensed to you under this Agreement includes all Software code that is copied to your computer when you install Software. This includes software code and packs of binary content.  
+“Software� means the Source Code (as defined below) and object code of Software, including any future versions made available to you by us under this Agreement and any object code compiled from that Source Code, including all modules it contains, plus any associated interface definition files, scripts used to control compilation, content embedded into software.  
+“Content packs� - maps and artwork, scenarios, or other content made available by us.  
+The LICENSED SOFTWARE includes any modified version of any of the foregoing that you make under the License.
+
+2.	***How You Can Use the LICENSED SOFTWARE***  
+SODA.AUTO grants you a non-exclusive, non-transferable, non-sublicensable license to privately use, reproduce, display, perform, and modify the LICENSED SOFTWARE in accordance with the terms of this Agreement (the “License�). This means that as long as you are not violating this Agreement or applicable law, you can privately use the LICENSED SOFTWARE however you want. If you want to share the LICENSED SOFTWARE or anything you make with it, Sections 3 and 4 below address when and how you can do that.  
+
+3.	***How You Can Share Products You’ve Made with the LICENSED SOFTWARE***  
+If you develop products, services, or any other projects that (i) are made using any LICENSED SOFTWARE or (ii) combine any LICENSED SOFTWARE with any other software or content (collectively “Products�), you may only Distribute those Products as expressly permitted in this Section 3.   
+“Distribute� means, with respect to a Product, to provide or otherwise make a copy of the Product available publicly or to any other person or entity or make the Product’s functionality available on a network.  
+a.	***Royalty-Free Distribution***  
+As described in this Section 3(a), you may Distribute certain Products to certain persons or entities without any obligation to pay us royalties, until you are not monetizing that Distribution.  
+i.	***Media Products (e.g., Rendered Video Files)***  
+You will not owe us any royalty payments for Distributing Media Products that do not require any LICENSED SOFTWARE in source format to any person or entity.  
+This means, for example, you will not owe us royalties for Distributing Media:  
+•	rendered video files (e.g., broadcast or streamed video files, cartoons, movies, or images) created using the LICENSED SOFTWARE or  
+•	create your own plugins, asset files and other similar products.  
+Please note that certain assets that we make available under a separate agreement are available for use only with Software.  
+ii.	***Indirect Revenue***  
+You will not owe us any royalty payments for Distributing Products to any person or entity as long as the Products are not directly involved in generating revenue -- i.e., no revenue is attributable to any Product access, including features and functionality within the Product, or to any in-Product benefits.
+This means, for instance, that you will not owe any royalties for using the LICENSED SOFTWARE or Products in the research and development. However, if you use the LICENSED SOFTWARE or Products for testing automotive products that are produced and sold to end consumers, then a separate Commercial License Agreement or Individual Royalty Addendum will apply.  
+iii.	***Other Royalty-Free Distributions***  
+You will not owe us any royalty payments for Distributing Products:  
+A.	To the legal entities that are part of your company group, such as a parent company or a subsidiary, for their private use, so long as those entities do not further Distribute the Products outside of your company group. 
+This means, for example, applications (which would be Products) you create for internal use within your company can also be shared with your parent company, your subsidiary, or another subsidiary of your parent company.  
+B.	To clients who hired you to develop the Products for them, for their private use, so long as your clients do not further Distribute the Products.  
+This means, for example, if you are hired to create an application (a Product), you can share that application with your client.  
+C.	To other third parties who are separately licensed by us to use the LICENSED SOFTWARE, through SODA.AUTO’s Open Source Framework.
+This means, for example, you may Distribute a LICENSED SOFTWARE to end users through SODA.AUTO’s Open Source Framework.  
+b.	***Royalty Bearing Distribution***  
+You may make other Distributions of Products, but unless described in Section 3(a), all commercial Distributions of a Product will be subject to the terms of the separate Commercial License Agreement. Additionally, any advance royalty payment you receive to develop such a Product will be subject to the Individual Royalty Addendum.
+This means, for example, that you may owe royalties to SODA.AUTO for Products that are sold to the general public or for off-the-shelf Products that you sell privately to third parties, whether directly by you or through a distributor or publisher.  
+If you wish to make further commercial use of the SODA.AUTO products, please contact us to pro@soda.auto for more information.  
+c.	***Use by End Users, Publishers, and Distributors***  
+When you Distribute a Product, you may permit end users to use, reproduce, display and publicly perform the LICENSED SOFTWARE, solely (1) as incorporated in the Product in object code as an inseparable part of the Product, (2) to the extent necessary for end users to make permitted uses of the Product, and (3) pursuant to an end user license agreement that explicitly disclaims any representations, warranties, conditions, and liabilities related to the LICENSED SOFTWARE. You may not permit your end users to incorporate any LICENSED SOFTWARE into their own products, services, or other projects. You may, however, permit your publishers and distributors to market and Distribute a Product on your behalf, but only to the extent that you are permitted to make such Distribution yourself under this Section 3, and such Distribution will be subject to the terms of this Agreement.
+
+4.	***How You Can Share the LICENSED SOFTWARE When It Isn’t Part of a Product***  
+You may only Distribute LICENSED SOFTWARE (including as modified by you) outside of a Product as expressly permitted by this Section 4.  
+a.	***Sharing LICENSED SOFTWARE***  
+i.	***Sharing LICENSED SOFTWARE with Another Licensee***  
+You may Distribute LICENSED SOFTWARE (including as modified by you) in Source Code or object code to a third party who is separately licensed by us to use the same version of the LICENSED SOFTWARE that you are Distributing.
+Any public Distribution of LICENSED SOFTWARE (e.g., intended generally for third parties who are separately licensed by us to use the LICENSED SOFTWARE) must take place through a fork of SODA.AUTO’s Open Source Framework (e.g., for Distributing Source Code).  
+ii.	***Sharing LICENSED SOFTWARE for Public Discussion***  
+You are permitted to post snippets of LICENSED SOFTWARE, up to 30 lines of code in length, online in public forums for the sole purpose of discussing the content of the snippet or Distribute such snippets in connection with supporting patches and plugins for the LICENSED SOFTWARE, so long as it is not for the purpose of enabling third parties without a license to the LICENSED SOFTWARE to use or modify any parts of LICENSED SOFTWARE or to aggregate, recombine, or reconstruct any larger portion of the LICENSED SOFTWARE.  
+b.	***Sharing Examples***  
+You may Distribute Examples (including as modified by you) in Source Code or object code to any third party.  
+c.	***Sharing Non-C++ Program Language Integration***  
+You may Distribute an integration of a programming language other than C++ for the LICENSED SOFTWARE, but if you do, the integration must be Distributed in Source Code (including, but not limited to, any compiler, linker, toolchain, and runtime), free of charge, to all third parties who are separately licensed by us to use Software, and under a license that permits licensees to Distribute the integration free of charge, on all platforms, in any Product.  
+
+5.	***Other Restrictions on Your Use of the LICENSED SOFTWARE***  
+a.	***Non-Compatible Licenses***  
+You may not, and may not permit others to, combine, Distribute, or otherwise use the LICENSED SOFTWARE with any code or other content which is covered by a license that would directly or indirectly require that all or part of the LICENSED SOFTWARE be governed under any terms other than those of this Agreement (those licenses, the “Non-Compatible Licenses�). This means, for example, that you may not combine the LICENSED SOFTWARE with code or content that is licensed under any of the following licenses: GNU General Public License (GPL), Lesser GPL (LGPL) (unless you are merely dynamically linking a shared library), or Creative Commons Attribution-ShareAlike License.  
+b.	***General Restrictions***  
+You must ensure that your activities with the LICENSED SOFTWARE do not: 
+•	violate any applicable law or regulation;  
+•	result in the LICENSED SOFTWARE being rented or leased;  
+•	misappropriate any of our other products or services;  
+•	support a claim by you or any third party that the LICENSED SOFTWARE infringes a patent;  
+•	result in a sale or grant of a security interest in any LICENSED SOFTWARE; or  
+•	result in a Distribution of a Product or the LICENSED SOFTWARE in any manner other than as permitted by Sections 3 and 4.  
+
+6.	***Who Owns What***  
+As between you and us, you own all rights, other than rights in the LICENSED SOFTWARE, in the Products you develop under this Agreement, and we own all title, ownership rights, and intellectual property rights in the LICENSED SOFTWARE.  
+All rights granted to you under this Agreement are granted by the License only and not by sale, and all of those rights are limited by and subject to the terms of this Agreement. No license or other right in any SODA.AUTO technology or intellectual property rights other than the LICENSED SOFTWARE is granted under this Agreement, and no license or other rights will be created under this Agreement by implication, estoppel, or otherwise. Any attempted sublicense that is not consistent with the terms of this Agreement will be null and void.
+a.	***Proprietary Notices and Attribution***  
+You agree to retain the copyright, trademark, and other proprietary notices and disclaimers of SODA.AUTO as they appear in the LICENSED SOFTWARE.
+If a Product you develop under this Agreement has credits, you must place the following notices in the credits (replacing xxxx with the current year):  
+“© 2023-xxxx SODA.AUTO UK LTD. ALL RIGHTS RESERVED�
+No other license or right is granted under this Agreement in the trademarks, service marks, trade names, and logos associated with SODA.AUTO, SODA.AUTO’s intellectual property, including Software (the “SODA.AUTO IPR"). All use of the SODA.AUTO IPR will inure to the sole benefit of SODA.AUTO. You agree not to engage in any activity that could tarnish, dilute, or affect the validity or enforceability of the SODA.AUTO IPR or cause consumer confusion or diminish any goodwill relating to any SODA.AUTO Trademarks.  
+If you wish to make further use of the SODA.AUTO Trademarks, please contact us to pro@soda.auto for more information.  
+b.	***Third Party Software***  
+The LICENSED SOFTWARE incorporates and is bundled with code developed by third parties (the “Third Party Software") that may be subject to additional or alternative license terms. If Third Party Software is incorporated in the LICENSED SOFTWARE and is subject to additional license terms, those terms or other attribution requirements can be found in the installation directory for each engine version under the /Engine/Source/ThirdParty/Licenses sub¬folder. Third Party Software that is only bundled with the LICENSED SOFTWARE as independent, standalone software can be found in the installation directory for each engine version under the /Engine/Extras/ThirdPartyNotUE/ sub-folder. This Third Party Software is not itself LICENSED SOFTWARE and is instead licensed to you directly by its authors under the license terms provided in the /Engine/Extras/ThirdPartyNotUE/ sub-folder.  
+By entering into this Agreement and using Third Party Software, you are accepting the terms of those additional or alternative licenses. In the case of additional license terms, the additional license terms will take precedence over any inconsistencies with the terms of this License with regard to the Third Party Software licensed under those additional license terms. You agree that the owners of the Third Party Software are intended third party beneficiaries to this Agreement in relation to your uses of Third Party Software.  
+c.	***Feedback and Contributions***  
+You grant SODA.AUTO a right to freely use and disclose any feedback or suggestions that you provide to us regarding the LICENSED SOFTWARE (the “Feedback�). You acknowledge that we may use any Feedback, including any ideas contained in Feedback, for any purpose, commercial or otherwise, without acknowledgment or compensation to you, including to develop, copy, publish, modify, or improve the LICENSED SOFTWARE in our sole discretion. You understand that we may treat Feedback as non-confidential.  
+You grant SODA.AUTO a non-exclusive, fully paid, irrevocable, transferable, sublicensable license to reproduce, distribute, publicly perform, publicly display, make, use, have made, sell, offer to sell, import, modify and make derivative works based on, and otherwise exploit any Contributions for all current and future methods and forms of exploitation in any country.  
+“Contributions� means any information or content, including software or code, that (a) you make available to SODA.AUTO via submissions to forums, wiki, SODA.AUTO’s Open Source Framework, or other source code repository under our control and that are based upon or incorporate the LICENSED SOFTWARE or (b) that you provide to SODA.AUTO and explicitly designate in writing as a Contribution.  
+You represent and warrant that you have sufficient rights in any Feedback or Contribution that you provide to SODA.AUTO to grant SODA.AUTO and other affected parties the rights described above. This includes but is not limited to intellectual property rights and other proprietary or personal rights. If any rights to be licensed under this Section 6(c) may not be licensed under applicable law (such as moral and other personal rights), you hereby waive and agree not to assert any of those rights.
+
+## Our Relationship
+7.	***The Agreement Between You and SODA.AUTO***  
+a.	***Amendments***  
+If we make changes to this Agreement, you are not required to accept the amended Agreement, and this Agreement will continue to govern your use of any LICENSED SOFTWARE you already have access to.  
+However, if we make changes to this Agreement, you will not be allowed to access certain SODA.AUTO services or download the LICENSED SOFTWARE unless you have accepted the amended Agreement. If we make changes, we will provide you with notice, such as by sending an email or giving you notice when you next log into a SODA.AUTO service.  
+b.	***Alternative and Additional Terms***  
+With respect to your rights and obligations related to LICENSED SOFTWARE, this Agreement supersedes any prior SODA’s Software End User License Agreements. 
+This Agreement, however, does not supersede, amend or otherwise affect other agreements you may have with us or any sublicensor authorized by us, other than as described in Section 7(a). For example, if we grant you a license to use Software to develop one or more products under a custom license, that custom license and not this Agreement governs your use of Software and related materials with respect to those products.  
+c.	***Notice***  
+Where this Agreement calls for notice from us, including written notice, we may provide notice to you through the SODA.AUTO services or by any email address that you’ve provided to us. Our notices, when provided to you through the SODA.AUTO services, will be effective when you access the SODA.AUTO services, and when sent to you by email, will be effective when they are sent.  
+
+8.	***Who are You?***  
+a.	***You***    
+If you use the LICENSED SOFTWARE on behalf of another person or entity, (i) all references to “you� throughout this Agreement will include, and this Agreement will be binding on, that person or entity, (ii) you represent that you are authorized to accept this Agreement on that person’s or entity’s behalf, and (iii) in the event you violate this Agreement, that person or entity agrees to be responsible to us.  
+b.	***Eligibility for This Agreement***  
+If you are under the age of legal majority where you live or otherwise require the consent of a parent or legal guardian to enter into this Agreement under applicable law, you may use the LICENSED SOFTWARE only under the supervision of a parent or legal guardian who also agrees to be bound by this Agreement.
+You are not eligible to enter into this Agreement and may not download or use the LICENSED SOFTWARE if you are, or are acting on behalf of any person or entity that is (i) on the Specially Designated Nationals and Blocked Persons List or other similar lists maintained by any U.S., EU or UK government entity pursuant to economic sanctions laws or (ii) located in, organized in, or ordinarily resident in any country or territory that is subject to a U.S., EU or UK embargo, in each case unless your use of the Licensed Content is authorized by U.S., EU or UK law.  
+c.	***Use by individuals***  
+The License (as defined in Section 2) permits use of the LICENSED SOFTWARE by individuals (“Users�). If you are an individual, you are the User. If you are a legal entity, the individual employees or agents exercising your rights under this Agreement are Users. When exercising a legal entity’s rights under this Agreement, Users are not required to accept this Agreement as individuals. The User may store the LICENSED SOFTWARE on any of the User’s computers, but the LICENSED SOFTWARE cannot be shared with others except as part of a permitted Distribution of LICENSED SOFTWARE as described in Sections 3 and 4.  
+d.	***Use by Educational Institutions***  
+As an exception to the above requirement that only a User may use the LICENSED SOFTWARE, if you are an educational institution, like a school or a library, you may store LICENSED SOFTWARE on any of your computers, and you may allow all users of those computers to use the LICENSED SOFTWARE under the License on those computers. However, those users are not authorized under your License to Distribute the LICENSED SOFTWARE (including as incorporated in a Product). For that, they must obtain a License of their own.  
+
+9.	***Who is SODA.AUTO?***  
+SODA.AUTO UK Ltd. a company incorporated in the United Kingdom under company number 14698049 whose registered office is at 71-75 Uxbridge Road, Ealing, London, England, W5 5SL.  
+
+10.	***Privacy***  
+Your privacy is important to us. Please review our [Privacy Policy](https://soda.auto/privacypolicy). It describes how we collect, use, and share information when you use the SODA.AUTO services that link to this Privacy Policy.
+
+## Other Rights and Obligations
+11.	***Disclaimers***  
+Nothing in this Agreement will prejudice any statutory rights that you have that may not be waived. Some countries, states, provinces or other jurisdictions do not allow the exclusion of certain warranties, or the limitation of liability as stated in this and the next sections, so the below terms may not fully apply to you. In those jurisdictions, the exclusions and limitations below apply only to the extent permitted by the applicable laws of such jurisdictions.  
+THE LICENSED SOFTWARE, INCLUDING ALL INFORMATION, CONTENT, MATERIALS, CODE, AND SOFTWARE, ARE PROVIDED BY SODA.AUTO ON AN “AS IS� AND “AS AVAILABLE� BASIS. SODA.AUTO AND ITS AFFILIATES, LICENSORS AND SERVICE PROVIDERS MAKE NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, EXPRESS OR IMPLIED, REGARDING THE LICENSED SOFTWARE. YOUR USE OF THE LICENSED SOFTWARE IS AT YOUR SOLE RISK. TO THE FULL EXTENT PERMISSIBLE BY APPLICABLE LAW, THE SODA.AUTO DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING IMPLIED OR STATUTORY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NONINFRINGEMENT. THE SODA.AUTO DO NOT WARRANT THAT THE LICENSED SOFTWARE IS FREE OF VIRUSES OR OTHER HARMFUL COMPONENTS. THE PARTIES ACKNOWLEDGE AND AGREE THAT THE FOREGOING WARRANTY DISCLAIMERS WERE AN ESSENTIAL ELEMENT IN SETTING CONSIDERATION UNDER THIS AGREEMENT.
+
+12.	***Limitation of Liability***  
+TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, THE SODA.AUTO AND ITS AFFILIATES (SODA.AUTO PARTIES), WILL NOT BE LIABLE FOR ANY LOSS OF PROFITS OR ANY INDIRECT, INCIDENTAL, PUNITIVE, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR IN CONNECTION WITH THIS AGREEMENT. FURTHER, TO THE FULL EXTENT PERMITTED BY APPLICABLE LAW, THE SODA.AUTO PARTIES’ AGGREGATE LIABILITY ARISING OUT OF OR IN CONNECTION WITH THIS AGREEMENT WILL NOT EXCEED THE GREATER OF $100 AND THE TOTAL AMOUNTS YOU HAVE PAID (IF ANY) TO SODA.AUTO UNDER THIS AGREEMENT DURING THE SIX (6) MONTHS IMMEDIATELY PRECEDING THE EVENTS GIVING RISE TO SUCH LIABILITY. SEEKING DAMAGES AS LIMITED BY THIS SECTION 12 SHALL BE YOUR SOLE AND EXCLUSIVE REMEDY FOR ANY ACT OR OMISSION OF THE SODA.AUTO PARTIES. THE PARTIES ACKNOWLEDGE AND AGREE THAT THESE LIMITATIONS OF LIABILITY AND EXCLUSIONS OF POTENTIAL DAMAGES WERE AN ESSENTIAL ELEMENT IN SETTING CONSIDERATION UNDER THIS AGREEMENT.
+
+13.	***Indemnification***  
+This section only applies to the extent allowed by the applicable laws of your jurisdiction. If the applicable laws of your jurisdiction do not allow you to enter into the indemnification obligation below, then you assume, to the extent permitted by the applicable laws of your jurisdiction, all liabilities, damages, judgements, awards, losses, costs, expenses, and fees (including reasonable attorney and expert witness fees) that are the stated subject matter of the indemnification obligation below.
+You agree to indemnify and hold harmless the SODA.AUTO Parties from and against all liabilities, damages, judgments, awards, losses, costs, expenses, and fees (including reasonable attorney and expert witness fees) arising out of or in connection with any third-party claims, demands, or actions (i) that, if true, would involve a breach by you of this Agreement (including, without limitation, any distribution or sublicensing of the LICENSED SOFTWARE in violation of this Agreement), or (ii) related to your Products or your exercise of the License (except to the extent the third party is alleging your authorized use of unmodified LICENSED SOFTWARE originally provided to you by SODA.AUTO under this Agreement infringes any patent, trademark, or copyright).  
+
+14.	***Governing Law and Jurisdiction***
+Any dispute or claim by you arising out of or related to this Agreement will be governed by law of England and Wales, exclusive of its choice of law rules. You and SODA.AUTO agree to submit to the exclusive jurisdiction of the courts of England. You and SODA.AUTO agree to waive any jurisdictional, venue, or inconvenient forum objections to such courts, as well as any right to a jury trial. Any law or regulation which provides that the language of a contract will be construed against the drafter will not apply to this Agreement. This paragraph will be interpreted as broadly as applicable law permits.  
+
+15.	***No Group Litigation***  
+To the maximum extent permitted by applicable law, you and SODA.AUTO agree to only bring disputes arising out of or related to this Agreement in an individual capacity and will not:  
+• seek to bring, join, or participate in any class or representative action, collective or class¬wide arbitration, or any other action where another individual or entity acts in a representative capacity (e.g., private attorney general actions); or  
+• consolidate or combine individual proceedings or permit another to do so without the express consent of all parties to this Agreement.  
+
+16.	***Miscellaneous***  
+a.	***Support***  
+SODA.AUTO intends to provide support and regularly release new versions but does not have any support obligations with respect to the LICENSED SOFTWARE under this Agreement. Without limiting the foregoing, SODA.AUTO does not have any obligation to make new versions of the LICENSED SOFTWARE available, or to continue to make available for access or download any versions of the LICENSED SOFTWARE.  
+b.	***No Assignment***  
+You may not assign your rights or obligations under this Agreement, including any rights to use the LICENSED SOFTWARE. Any attempted assignment in violation of the foregoing will be void. We may assign this Agreement, in whole or in part, with or without notice to you.  
+c.	***Relationship of the Parties***  
+The relationship between you and SODA.AUTO will be that of independent signatories, and nothing in this Agreement will be construed to constitute either party an agent of the other party. Without limiting the foregoing, neither party will have authority to act for or to bind the other party in any way, including to make representations or warranties or to execute agreements on behalf of the other party. This Agreement will not be construed to create an association, joint venture, or partnership between the parties or to impose any partnership obligation or liability upon any party.  
+d.	***Language***  
+To the fullest extent permitted by applicable law, the controlling language for this Agreement is English. It is the express wish of the parties that this Agreement and all related documents have been drawn up in English. Any translation has been provided for your convenience.  
+e.	***No Waiver; Severability***  
+Any act by SODA.AUTO to exercise, or failure or delay in exercise of, any of its rights under this Agreement, at law or in equity will not be deemed a waiver of those or any other rights or remedies available in contract, at law or in equity. Unless otherwise stated in this Agreement, if any term of this Agreement is held by a court or tribunal of competent jurisdiction to be unenforceable, the term will be enforced to the maximum extent permissible, and the remaining terms of this Agreement will remain in full force and effect. You agree that this Agreement does not confer any rights or remedies on any person other than the parties to this Agreement, except as expressly stated. SODA.AUTO’s obligations are subject to existing laws and legal process, and SODA.AUTO may comply with law enforcement or regulatory requests or requirements despite any contrary term in this Agreement.  
+f.	***Survival***  
+Upon conclusion of this Agreement, all royalties due to SODA.AUTO will become immediately due and payable and all rights and remedies of SODA.AUTO will survive.  
+g.	***Entire Agreement***  
+This Agreement and any document or information referred to in this Agreement constitute the entire agreement between you and SODA.AUTO relating to the subject matter covered by this Agreement. All other communications, proposals, and representations with respect to the subject matter covered by this Agreement are excluded.  
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c13b830
--- /dev/null
+++ b/README.md
@@ -0,0 +1,66 @@
+# SODA.Sim  
+
+[SODA.Sim](https://soda.auto/products/sim/index.html) is designed for seamless software validation of any vehicle, covering the entire process from initial concept through certification to aftermarket updates.
+
+By simulating vehicles at the level of atomic components, such as sensors, vehicle systems, and electronic control units SODA.Sim is not only a perfect tool for AD/ADAS development, but also a virtual proving ground for validation and certification of all vehicle functions.
+
+SODA.Sim is empowered by SODA Validation Library. You can choose available tests or craft your bespoke scenarios in real-time. Be the first to access SODA Validation Library with a built-in AI scenario generator and AI scenario mixer.  
+
+Now we support ***UnrealEngine 5.3***.
+
+![SodaSim](Docs/img/intro.jpg)
+
+Full list of features see [here](https://docs.soda.auto/projects/soda-sim/en/latest/Introduction.html).  
+
+## Docs
+All documentation is [here](https://docs.soda.auto/projects/soda-sim)  
+Create a new UProject with SODA.Sim is [here](https://docs.soda.auto/projects/soda-sim/en/latest/How_To/Setup_a_New_UProject.html)  
+Quick start [here](https://docs.soda.auto/projects/soda-sim/en/latest/How_To/Quick_Start.html)  
+
+## Install
+
+This repository is plugin for UnrealEngine. You can clone this repo to the UnrealEngine's plugins folder or to the project plugins folders. Then you need to follow the next steps: [Setup a New UProject](https://docs.soda.auto/projects/soda-sim/en/latest/How_To/Setup_a_New_UProject.html)
+
+> [!NOTE]
+> * Keep in mind this repo contain a submodule [SodaSimProto](https://github.com/soda-auto/SodaSimProto).  Make sure you clone the submodule as well.
+> * The repose includes LFS files. Make sure you clone LFS files as well.
+
+See more information about [Working with Plugins in Unreal Engine](https://docs.unrealengine.com/5.0/en-US/working-with-plugins-in-unreal-engine/).
+
+## Supported OS
+* Windows
+* Linux (not tested)
+
+## Roadmap
+
+* Integration with [Project Chrono](https://projectchrono.org/) for accurate vehicle physics simulation.
+* Analog/Digital Input/Output hardware interface. 
+We have almost finished developing our own hardware, which will allow virtual Analog/Digital Input/Output to be mapped to real hardware for HIL purpose.
+* Realtime Python Scripts. Support [Unreal Editor Python](https://docs.unrealengine.com/5.2/en-US/scripting-the-unreal-editor-using-python/) to work in game mode.
+* Simulink Model Importing. Ability to develop vehicle components using Simulinks and import them into the simulator.
+* LIN interfce support.
+* City Traffic Generation based on the Summo.
+* Support of the OpenScenario.
+* Distributed simulation. Horisontal parallelization of simulation on multiple computers to simulate more vehicle sensors.
+* Integration with ROS/ROS2.
+
+## Contact
+Please feel free to provide feedback or ask questions by creating a Github issue. For inquiries about collaboration, please email us at sim@soda.auto.
+
+## Copyright and License
+Copyright © 2023 SODA.AUTO UK LTD. ALL RIGHTS RESERVED.  
+This software contains code licensed as described in [LICENSE](LICENSE.md).  
+
+### Third Parties Licenses
+Please ensure to comply with the respective licenses when using these third-party components in your project.
+Lists the licenses for third-party software used in this project:
+* **dbcppp** - Licensed under the [MIT License](https://opensource.org/licenses/MIT).
+* **libzmq** - Licensed under the [Mozilla Public License 2.0](https://www.mozilla.org/en-US/MPL/2.0/).
+* mongodb Licensed under the [Server Side Public License v1.0](https://www.mongodb.com/licensing/server-side-public-license). MongoDB drivers are available under the [Apache License v2.0](https://www.apache.org/licenses/LICENSE-2.0).
+* **mongodb-cxx** - Licensed under the [Apache License, version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
+* **opendrive_reader** - Licensed under the [MIT License](https://opensource.org/licenses/MIT).
+* **pugixml** - Distributed under the [MIT License](https://opensource.org/licenses/MIT).
+* **quickhull** - Licensed under the [BSD-2-Clause license](https://opensource.org/licenses/BSD-2-Clause).
+* **3D models** - Licensed under the [CC-BY License](https://creativecommons.org/licenses/by/4.0/).
+* **Unreal Engine** - Dependencies Associated with the [Unreal Engine EULA](https://www.unrealengine.com/en-US/eula).
+
diff --git a/Scripts/CamLatency.py b/Scripts/CamLatency.py
new file mode 100644
index 0000000..b950f88
--- /dev/null
+++ b/Scripts/CamLatency.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import zmq
+import signal
+import struct
+import time
+
+
+addr = "tcp://172.16.11.159:8008"
+
+# struct MsgHeader
+# {
+# 	union Tenser_t {
+# 		std::int32_t Data[4];
+# 		struct
+# 		{
+# 			std::int32_t Depth;
+# 			std::int32_t Height;
+# 			std::int32_t Width;
+# 			std::int32_t Channels;
+# 		} Shape;
+# 	} Tenser;
+# 	std::int32_t DataType;
+# 	std::int64_t Timestamp;
+# 	std::int64_t Index;
+# };
+
+TENSOR_MSG_HEADER_FMT = 'iiiiiqq'
+HEADER_LENGTH = struct.calcsize(TENSOR_MSG_HEADER_FMT)
+
+is_running = True
+
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+if __name__ == '__main__':
+
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    ctx = zmq.Context()
+
+    cam_sock = ctx.socket(zmq.SUB)
+    cam_sock.setsockopt(zmq.SUBSCRIBE, b'')
+    cam_sock.setsockopt(zmq.CONFLATE, 1)
+    cam_sock.connect(addr)
+    print('Connected to {}'.format(addr))
+
+    while is_running:
+        try:
+            rawbuf = cam_sock.recv(0)
+        except zmq.ZMQError as e:
+            if e.errno != zmq.EAGAIN: raise
+            break
+        img_header = struct.unpack(TENSOR_MSG_HEADER_FMT, rawbuf[:HEADER_LENGTH])
+
+        cam_timestamp = img_header[5]
+        system_timestamp = int(round(time.time() * 1000))
+        diff = system_timestamp - cam_timestamp
+
+        print("Addr: {}, System: {}, Device: {}, Diff: {}".format(addr, system_timestamp, cam_timestamp, diff))
+
+    print('Finished')
+
diff --git a/Scripts/DcuUdp.py b/Scripts/DcuUdp.py
new file mode 100644
index 0000000..4dd43fb
--- /dev/null
+++ b/Scripts/DcuUdp.py
@@ -0,0 +1,99 @@
+#!/usr/bin/env python3
+
+import socket
+import sys
+import threading
+import struct
+import time
+from pynput.keyboard import Key, Listener, KeyCode
+
+recv_addr = ('', 7078)
+send_addr = ('127.0.0.1', 7077)
+
+OUT_MSG_HEADER_FMT = '=ffb'
+OUT_MSG_HEADER_LENGTH = struct.calcsize(OUT_MSG_HEADER_FMT)
+IN_MSG_HEADER_FMT = '=fbbffffffffffffdddffffffffffff'
+IN_MSG_HEADER_LENGTH = struct.calcsize(IN_MSG_HEADER_FMT)
+
+recv_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+recv_sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+recv_sock.bind(recv_addr)
+sens_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+
+global do_work
+global steer_req
+global acc_deacc_req
+global gear_req
+
+do_work = True
+steer_req = 0
+acc_deacc_req = 0
+gear_req = 3
+
+
+def unix_getch():
+    fd = sys.stdin.fileno()
+    old_settings = termios.tcgetattr(fd)
+    try:
+        tty.setraw(sys.stdin.fileno())          # Raw read
+        ch = sys.stdin.read(1)
+    finally:
+        termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
+    return ch
+
+def recv_func():
+    while(do_work):
+        bytes, addr = recv_sock.recvfrom(1024)
+        assert len(bytes) == IN_MSG_HEADER_LENGTH, "Protocol error, got {} bytes, excepted {}".format(len(bytes), IN_MSG_HEADER_LENGTH)
+        in_data = struct.unpack(IN_MSG_HEADER_FMT, bytes)
+        print('Steer: ', in_data[0])
+        print('Gear: ', in_data[1])
+        print('Mode: ', in_data[2])
+        print('Velocity (X, Y, Z): ', in_data[3], in_data[4], in_data[5])
+        print('Acc (X, Y, Z): ', in_data[6], in_data[7], in_data[8])
+        print('AngVelocity (X, Y, Z): ', in_data[9], in_data[10], in_data[11])
+        print('Yaw, Pitch, Roll: ', in_data[12], in_data[13], in_data[14])
+        print('Coord: ', in_data[15], in_data[16], in_data[17])
+        print('RPM: ', in_data[18], in_data[19], in_data[20], in_data[21])
+        print('Brake: ', in_data[22], in_data[23], in_data[24], in_data[25])
+        print('Torq: ', in_data[26], in_data[27], in_data[28], in_data[29])
+
+def send_func():
+    while(do_work):
+        bytes = struct.pack(OUT_MSG_HEADER_FMT, steer_req, acc_deacc_req, gear_req)
+        sens_sock.sendto(bytes, send_addr)
+        time.sleep(0.05)
+
+recv_thread = threading.Thread(target=recv_func)
+recv_thread.start()
+
+send_thread = threading.Thread(target=send_func)
+send_thread.start()
+
+global listener
+
+def on_press(key):
+    global listener
+    global do_work
+    global steer_req
+    global acc_deacc_req
+    global gear_req
+    try:
+        if key.char == 'q': 
+            do_work = False
+            listener.stop()
+        elif key.char == 'a': steer_req += 0.1
+        elif key.char == 'd': steer_req -= 0.1
+        elif key.char == 'w': acc_deacc_req += 0.1
+        elif key.char == 's': acc_deacc_req -= 0.1
+        elif key.char == 'g': gear_req = (gear_req + 1) % 3
+
+    except AttributeError:
+        pass
+
+with Listener(on_press=on_press) as listener:
+    listener.join()
+
+
+recv_sock.close()
+sens_sock.close()
diff --git a/Scripts/FakeImu.py b/Scripts/FakeImu.py
new file mode 100644
index 0000000..4a87ffb
--- /dev/null
+++ b/Scripts/FakeImu.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+
+
+from socket import *
+import sys
+import time
+
+port = 3000
+
+s = socket(AF_INET, SOCK_DGRAM)
+s.bind(('', 0))
+s.setsockopt(SOL_SOCKET, SO_BROADCAST, 1)
+data = bytearray([0]*72)
+
+while 1:
+    s.sendto(data, ('<broadcast>', port))
+    time.sleep(0.01)
+    # print ("Sent")
diff --git a/Scripts/ImuCoordPlot.py b/Scripts/ImuCoordPlot.py
new file mode 100644
index 0000000..3a9040b
--- /dev/null
+++ b/Scripts/ImuCoordPlot.py
@@ -0,0 +1,123 @@
+#!/usr/bin/env python3
+
+import numpy as np
+#import zmq
+import socket
+import signal
+import struct
+import copy
+import math
+import matplotlib.pyplot as plt
+from matplotlib.animation import FuncAnimation
+import threading
+from bitstring import ConstBitStream
+from datetime import datetime
+
+
+#camera_addr = "ipc:///tmp/ue4_imu"
+
+UDP_IP = ''
+UDP_PORT = 8000
+period = 10000
+
+
+is_running = True
+
+global x
+global y
+
+
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+if __name__ == '__main__':
+
+
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+    sock.bind((UDP_IP, UDP_PORT))
+
+    print("Binding: ", UDP_IP, ":", UDP_PORT);
+
+    x = [] 
+    y = [] 
+
+    lock = threading.Lock()
+
+    fig = plt.figure("IMU")
+
+    ax01 = fig.add_subplot(1,1,1)
+    ax01.grid(True)
+
+    def anim_func(i):
+        lock.acquire()
+        ax01.clear()
+        ax01.plot(copy.copy(x), copy.copy(y))
+        ax01.plot(x[-1], y[-1], 'go')
+        lock.release()
+
+    anim = FuncAnimation(fig, anim_func, interval=33)
+
+    def loop():
+        global x
+        global y
+
+        while is_running:
+
+            bytes, addr = sock.recvfrom(1024)
+
+            assert len(bytes) == 72, "Protocol error"
+            s = ConstBitStream(bytes)
+
+            #if(first_stamp == 0) : first_stamp = msg[10]
+            lock.acquire()
+
+            s.read('uint:8') #sync
+            s.read('uintle:16')
+
+            s.read('intle:24')
+            s.read('intle:24') 
+            s.read('intle:24')
+
+            s.read('intle:24') 
+            s.read('intle:24') 
+            s.read('intle:24')
+
+            s.read('uint:8') #nav_status
+            s.read('uint:8') #chksum1
+
+            y.append(s.read('floatle:64') / math.pi * 180.0) #latitude
+            x.append(s.read('floatle:64') / math.pi * 180.0)  #longitude
+
+            s.read('floatle:32') #altitude
+            s.read('intle:24') #vel_north
+            s.read('intle:24') #vel_east
+            s.read('intle:24') #vel_down
+
+            s.read('intle:24')
+            s.read('intle:24') 
+            s.read('intle:24')
+
+            s.read('uint:8') #chksum2
+            s.read('uint:8')
+            s.read('intle:64')
+
+            x = x[-period:]
+            y = y[-period:]
+
+            lock.release()
+
+
+    thread = threading.Thread(target=loop)
+    thread.start()
+    plt.show()
+    print('Finished')
+
diff --git a/Scripts/ImuLatency.py b/Scripts/ImuLatency.py
new file mode 100644
index 0000000..2807c64
--- /dev/null
+++ b/Scripts/ImuLatency.py
@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import socket
+import signal
+import struct
+import copy
+import math
+import threading
+from bitstring import ConstBitStream
+from datetime import datetime
+
+
+UDP_IP = ''
+UDP_PORT = 8000
+
+is_running = True
+
+earth_a = 6378137.0   
+RefPoint = [30.13, 59.995]
+    
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+if __name__ == '__main__':
+
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    
+    # For Linux only
+    # sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+    
+    sock.bind((UDP_IP, UDP_PORT))
+
+    print("Binding: ", UDP_IP, ":", UDP_PORT);
+
+    timestamp = datetime.now()
+
+    while is_running:
+
+        bytes, addr = sock.recvfrom(1024)
+
+        cur_timestamp = datetime.now()
+        latency = int((cur_timestamp - timestamp).total_seconds() * 1000)
+
+        assert len(bytes) == 72, "Protocol error"
+
+        s = ConstBitStream(bytes)
+
+        s.read('uint:8') #sync
+        s.read('uintle:16') #imeatamp
+
+        s.read('intle:24') / 10000 #acc_x
+        s.read('intle:24') / 10000 #acc_y
+        s.read('intle:24') / 10000 #acc_z
+
+        s.read('intle:24') / 100000 #ang_vel_x
+        s.read('intle:24') / 100000 #ang_vel_y
+        s.read('intle:24') / 100000 #ang_vel_z
+
+        s.read('uint:8') #nav_status
+        s.read('uint:8') #chksum1
+        lat = s.read('floatle:64') / math.pi * 180.0 #latitude
+        lon = s.read('floatle:64') / math.pi * 180.0 #longitude
+        s.read('floatle:32') #altitude
+        s.read('intle:24') #vel_north
+        s.read('intle:24') #vel_east
+        s.read('intle:24') #vel_down
+
+        s.read('intle:24') / 1000000 #yaw
+        s.read('intle:24') / 1000000 #pitch
+        s.read('intle:24') / 1000000 #roll
+
+        s.read('uint:8') #chksum2
+        s.read('uint:8') #channel
+
+        timestamp = cur_timestamp
+
+        print("latency: ", latency)
+        
+        #dX = (lon - RefPoint[0]) / 180 * earth_a / math.cos(lat / 180 * math.pi)
+        #dY = (lat - RefPoint[1]) / 90 * earth_a / math.cos(lat / 180 * math.pi)
+        #print("X:", dX, "Y:", dY)
+
+    print('Finished')
diff --git a/Scripts/ImuPlot.py b/Scripts/ImuPlot.py
new file mode 100644
index 0000000..afcf74f
--- /dev/null
+++ b/Scripts/ImuPlot.py
@@ -0,0 +1,243 @@
+#!/usr/bin/env python3
+
+import numpy as np
+#import zmq
+import socket
+import signal
+import struct
+import copy
+import math
+import matplotlib.pyplot as plt
+from matplotlib.animation import FuncAnimation
+import threading
+from bitstring import ConstBitStream
+from datetime import datetime
+from sys import platform
+
+#camera_addr = "ipc:///tmp/ue4_imu"
+
+UDP_IP = ''
+UDP_PORT = 8000
+period = 300
+
+
+is_running = True
+
+global pitch
+global roll
+global yaw
+global acc_x
+global acc_y
+global acc_z
+global ang_vel_x
+global ang_vel_y
+global ang_vel_z
+global latency
+    
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+if __name__ == '__main__':
+
+
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    
+    #ctx = zmq.Context()
+    #sock = ctx.socket(zmq.SUB)
+    #sock.setsockopt(zmq.SUBSCRIBE, b'')
+    #sock.connect(camera_addr)
+
+    sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    if platform == "linux" or platform == "linux2":
+        sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+    sock.bind((UDP_IP, UDP_PORT))
+
+    print("Binding: ", UDP_IP, ":", UDP_PORT);
+
+    xs = []
+    for i in range(period): xs.append(i)
+    pitch = [0] * period
+    roll = [0] * period
+    yaw = [0] * period
+    acc_x = [0] * period
+    acc_y = [0] * period
+    acc_z = [0] * period
+    ang_vel_x = [0] * period
+    ang_vel_y = [0] * period
+    ang_vel_z = [0] * period
+    latency = [0] * period
+
+    lock = threading.Lock()
+
+    fig = plt.figure("IMU")
+    #fig_lat = plt.figure("Latency")
+
+    ax01 = plt.subplot2grid((2, 2), (0, 0))
+    ax02 = plt.subplot2grid((2, 2), (0, 1))
+    ax03 = plt.subplot2grid((2, 2), (1, 0))
+    ax04 = plt.subplot2grid((2, 2), (1, 1))
+
+    ax01.set_title('Linear Acceleration')
+    ax02.set_title('Angular Velocity')
+    ax03.set_title('Angels')
+    ax04.set_title('Latency')
+
+    ax01.set_ylim(-20 ,20)
+    ax02.set_ylim(-1, 1)
+    ax03.set_ylim(-3.5, 3.5)
+    ax04.set_ylim(-10, 50)
+
+    ax01.set_ylabel('m/c^2')
+    ax02.set_ylabel('rad/c')
+    ax03.set_ylabel('rad')
+    ax04.set_ylabel('msec')
+
+    p00, = ax01.plot(xs, acc_x, 'r-', label="x")
+    p01, = ax01.plot(xs, acc_y, 'g-', label="y")
+    p02, = ax01.plot(xs, acc_z, 'b-', label="z")
+
+    p10, = ax02.plot(xs, ang_vel_x, 'r-', label="x")
+    p11, = ax02.plot(xs, ang_vel_y, 'g-', label="y")
+    p12, = ax02.plot(xs, ang_vel_z, 'b-', label="z")
+
+    p20, = ax03.plot(xs, pitch, 'r-', label="pitch")
+    p21, = ax03.plot(xs, roll, 'g-', label="roll")
+    p22, = ax03.plot(xs, yaw, 'b-', label="yaw")
+
+    p30, = ax04.plot(xs, latency, 'b-', label="latency")
+
+    ax01.legend([p00, p01, p02], [p00.get_label(), p01.get_label(), p02.get_label()])
+    ax02.legend([p10, p11, p12], [p10.get_label(), p11.get_label(), p12.get_label()])
+    ax03.legend([p20, p21, p22], [p20.get_label(), p21.get_label(), p22.get_label()])
+    ax03.legend([p30], [p30.get_label()])
+
+    ax01.grid(True)
+    ax02.grid(True)
+    ax03.grid(True)
+    ax04.grid(True)
+
+    def anim_func(i):
+        lock.acquire()
+        p00.set_data(xs, copy.copy(acc_x))
+        p01.set_data(xs, copy.copy(acc_y))
+        p02.set_data(xs, copy.copy(acc_z))
+        p10.set_data(xs, copy.copy(ang_vel_x))
+        p11.set_data(xs, copy.copy(ang_vel_y))
+        p12.set_data(xs, copy.copy(ang_vel_z))
+        p20.set_data(xs, copy.copy(pitch))
+        p21.set_data(xs, copy.copy(roll))
+        p22.set_data(xs, copy.copy(yaw))
+        p30.set_data(xs, copy.copy(latency))
+        lock.release()
+        return p00, p01, p02, p10, p11, p12, p20, p21, p22, p30
+
+    anim = FuncAnimation(fig, anim_func, interval=33)
+    
+
+    #first_stamp = 0
+
+    def loop():
+        global pitch
+        global roll
+        global yaw
+        global acc_x
+        global acc_y
+        global acc_z
+        global ang_vel_x
+        global ang_vel_y
+        global ang_vel_z
+        global latency
+
+        index = 0
+        timestamp = datetime.now()
+
+        while is_running:
+
+            bytes, addr = sock.recvfrom(1024)
+
+            cur_timestamp = datetime.now()
+            latency.append(int((cur_timestamp - timestamp).total_seconds() * 1000))
+
+            assert len(bytes) == 72, "Protocol error len = %s" % len(bytes)
+
+            s = ConstBitStream(bytes)
+
+            lock.acquire()
+
+            s.read('uint:8') #sync
+            device_time = s.read('uintle:16')
+
+            acc_x.append(s.read('intle:24') / 10000)
+            acc_y.append(s.read('intle:24') / 10000)
+            acc_z.append(s.read('intle:24') / 10000)
+
+            ang_vel_x.append(s.read('intle:24') / 100000)
+            ang_vel_y.append(s.read('intle:24') / 100000)
+            ang_vel_z.append(s.read('intle:24') / 100000)
+
+            s.read('uint:8') #nav_status
+            s.read('uint:8') #chksum1
+            lat = s.read('floatle:64') / math.pi * 180.0 #latitude
+            lon = s.read('floatle:64') / math.pi * 180.0  #longitude
+            s.read('floatle:32') #altitude
+            s.read('intle:24') #vel_north
+            s.read('intle:24') #vel_east
+            s.read('intle:24') #vel_down
+
+            r_yaw = s.read('intle:24') / 1000000
+            r_pitch = s.read('intle:24') / 1000000
+            r_roll = s.read('intle:24')  / 1000000       
+
+            yaw.append(r_yaw)
+            pitch.append(r_pitch)
+            roll.append(r_roll)
+
+            s.read('uint:8') #chksum2
+            channel = s.read('uint:8')
+
+            if channel == 0:
+                gps_minutes = s.read('uintle:32')
+                num_sats = s.read('uint:8')
+                position_mode = s.read('uint:8') 
+                velocity_mode = s.read('uint:8') 
+                orientation_mode = s.read('uint:8')
+                print('gps_minutes:', gps_minutes, "; device_time ", device_time)
+            else: 
+                s.read('intle:64') #placeholder
+
+            s.read('uint:8') #chksum3
+
+
+            #xs.append(msg[10] - first_stamp)
+            pitch = pitch[-period:]
+            roll = roll[-period:]
+            yaw = yaw[-period:]
+            acc_x = acc_x[-period:] 
+            acc_y = acc_y[-period:]
+            acc_z = acc_z[-period:]
+            ang_vel_x = ang_vel_x[-period:]
+            ang_vel_y = ang_vel_y[-period:]
+            ang_vel_z = ang_vel_z[-period:]
+            latency = latency[-period:]
+            #xs = xs[-period:]
+            lock.release()
+
+            
+
+            timestamp = cur_timestamp
+
+            print('lat:', lat, "; lon ", lon, "; yaw ", r_yaw,  "; pitch ", r_pitch,  "; roll ", r_roll)
+
+
+    thread = threading.Thread(target=loop)
+    thread.start()
+    plt.show()
+    print('Finished')
+
diff --git a/Scripts/LidarCheckTime.py b/Scripts/LidarCheckTime.py
new file mode 100644
index 0000000..4341bb0
--- /dev/null
+++ b/Scripts/LidarCheckTime.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python3
+
+import socket
+import time
+from ctypes import Structure, c_int64
+import struct
+from multiprocessing import Process
+
+import signal
+import sys
+
+
+class LidarData(Structure):
+    _fields_ = [
+        ("steadyTimestamp", c_int64),
+        ("systemTimestamp", c_int64),
+        ("deviceStartTime", c_int64),
+    ]
+
+
+f = open("./times.csv", "a+")
+# f = open("/Users/krayzee/Downloads/times.csv", "a+")
+f.write("port,system_time,device_time,diff,max_diff,min_diff\n")
+
+
+class ReadMulticast:
+    def __init__(self, grp: str = '239.0.0.230', port: int = 8001, is_all_groups: bool = True):
+        self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
+        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        if is_all_groups:
+            # on this port, receives ALL multicast groups
+            print("Binding *:{}".format(port))
+            self.sock.bind(('', port))
+        else:
+            # on this port, listen ONLY to MCAST_GRP
+            print("Binding group {}:{}".format(grp, port))
+            self.sock.bind((grp, port))
+        self.port = port
+        self.grp = grp
+        mreq = struct.pack("4sl", socket.inet_aton(self.grp), socket.INADDR_ANY)
+        self.sock.setsockopt(socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, mreq)
+        self.max_diff = 0
+        self.min_diff = 999
+        self.read()
+
+    def read(self):
+        while True:
+            package = self.sock.recv(32)
+            lidar_timestamp = (LidarData.from_buffer_copy(package)).deviceStartTime
+            system_timestamp = int(round(time.time() * 1000))
+            diff = system_timestamp - lidar_timestamp
+            print("Port: {}, System: {}, Device: {}, Diff: {} (Max={}, Min={})".format(self.port,
+                                                                                       system_timestamp,
+                                                                                       lidar_timestamp,
+                                                                                       diff,
+                                                                                       self.max_diff,
+                                                                                       self.min_diff))
+            if diff > self.max_diff:
+                self.max_diff = diff
+            if diff < self.min_diff:
+                self.min_diff = diff
+            f.write(','.join([str(self.port), str(system_timestamp), str(lidar_timestamp),str(diff), str(self.max_diff), str(self.min_diff)]))
+            f.write('\n')
+            assert diff < 1000
+
+
+PORTS = [8001, 8002, 8003, 8004]
+lidars = {}
+for MCAST_PORT in PORTS:
+    lidars.update({MCAST_PORT: Process(target=ReadMulticast, kwargs={'port': MCAST_PORT})})
+    lidars[MCAST_PORT].start()
+
+def signal_handler(sig, frame):
+    print('You pressed Ctrl+C!')
+    for lidar in lidars:
+        lidars[lidar].terminate()
+    f.close()
+
+
+signal.signal(signal.SIGINT, signal_handler)
+print('Press Ctrl+C')
+signal.pause()
+
diff --git a/Scripts/UdpTest.py b/Scripts/UdpTest.py
new file mode 100644
index 0000000..9a8fc02
--- /dev/null
+++ b/Scripts/UdpTest.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+
+from socket import *
+import sys
+
+host = '255.255.255.255'
+port = 5000
+addr = (host,port)
+
+udp_socket = socket(AF_INET, SOCK_DGRAM)
+
+
+#data = input('write to server: ')
+#if not data : 
+#    udp_socket.close() 
+#    sys.exit(1)
+
+#encode - перекодирует введенные данные в байты, decode - обратно
+#data = str.encode(data)
+#udp_socket.sendto(data, addr)
+#data = bytes.decode(data)
+
+udp_socket.bind(addr)
+data, addr = udp_socket.recvfrom(1024)
+print("Got: ", len(data))
+
+udp_socket.close()
+
diff --git a/Scripts/V2VHubView.py b/Scripts/V2VHubView.py
new file mode 100644
index 0000000..d649000
--- /dev/null
+++ b/Scripts/V2VHubView.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import socket
+import signal
+import struct
+import copy
+import math
+import threading
+from bitstring import ConstBitStream
+from datetime import datetime
+
+
+UDP_IP = ''
+UDP_PORT = 5000
+
+is_running = True
+
+    
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+if __name__ == '__main__':
+
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+    sock.bind((UDP_IP, UDP_PORT))
+
+    print("Binding: ", UDP_IP, ":", UDP_PORT);
+
+    timestamp = datetime.now()
+
+    while is_running:
+
+        bytes, addr = sock.recvfrom(1024)
+
+        #cur_timestamp = datetime.now()
+        #latency = int((cur_timestamp - timestamp).total_seconds() * 1000)
+
+        #assert len(bytes) == 72, "Protocol error"
+
+        s = ConstBitStream(bytes)
+
+        ID = s.read('uintle:16')
+        Timestamp = s.read('uintle:64')
+
+        BoundingBox0_X = s.read('floatle:64') 
+        BoundingBox0_Y = s.read('floatle:64') 
+        BoundingBox1_X = s.read('floatle:64') 
+        BoundingBox1_Y = s.read('floatle:64') 
+        BoundingBox2_X = s.read('floatle:64') 
+        BoundingBox2_Y = s.read('floatle:64') 
+        BoundingBox3_X = s.read('floatle:64') 
+        BoundingBox3_Y = s.read('floatle:64') 
+
+        BoundingBox3D0_X = s.read('floatle:64') 
+        BoundingBox3D0_Y = s.read('floatle:64') 
+        BoundingBox3D0_Z = s.read('floatle:64') 
+        BoundingBox3D1_X = s.read('floatle:64') 
+        BoundingBox3D1_Y = s.read('floatle:64') 
+        BoundingBox3D1_Z = s.read('floatle:64') 
+        BoundingBox3D2_X = s.read('floatle:64') 
+        BoundingBox3D2_Y = s.read('floatle:64') 
+        BoundingBox3D2_Z = s.read('floatle:64') 
+        BoundingBox3D3_X = s.read('floatle:64') 
+        BoundingBox3D3_Y = s.read('floatle:64') 
+        BoundingBox3D3_Z = s.read('floatle:64') 
+        BoundingBox3D4_X = s.read('floatle:64') 
+        BoundingBox3D4_Y = s.read('floatle:64') 
+        BoundingBox3D4_Z = s.read('floatle:64') 
+        BoundingBox3D5_X = s.read('floatle:64') 
+        BoundingBox3D5_Y = s.read('floatle:64') 
+        BoundingBox3D5_Z = s.read('floatle:64') 
+        BoundingBox3D6_X = s.read('floatle:64') 
+        BoundingBox3D6_Y = s.read('floatle:64') 
+        BoundingBox3D6_Z = s.read('floatle:64') 
+        BoundingBox3D7_X = s.read('floatle:64') 
+        BoundingBox3D7_Y = s.read('floatle:64') 
+        BoundingBox3D7_Z = s.read('floatle:64') 
+
+        Longitude = s.read('floatle:64') 
+        Latitude = s.read('floatle:64') 
+        Altitude = s.read('floatle:64') 
+        Roll = s.read('floatle:64') 
+        Pitch = s.read('floatle:64') 
+        Yaw = s.read('floatle:64') 
+
+        AngVelRoll = s.read('floatle:64') 
+        AngVelPitch = s.read('floatle:64') 
+        AngVelYaw = s.read('floatle:64') 
+
+        VelForward = s.read('floatle:64') 
+        VelLateral = s.read('floatle:64') 
+        VelUp = s.read('floatle:64') 
+
+
+        #timestamp = cur_timestamp
+
+        print("ID:", ID, "Longitude:", math.degrees(Longitude), "Latitude:", math.degrees(Latitude), "Altitude:", Altitude)
+
+    print('Finished')
diff --git a/Scripts/V2XServerView.py b/Scripts/V2XServerView.py
new file mode 100644
index 0000000..722af68
--- /dev/null
+++ b/Scripts/V2XServerView.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import socket
+import signal
+import struct
+import copy
+import math
+import threading
+from bitstring import ConstBitStream
+from datetime import datetime
+
+
+UDP_IP = ''
+UDP_PORT = 3003
+
+is_running = True
+
+    
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+if __name__ == '__main__':
+
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
+    sock.bind((UDP_IP, UDP_PORT))
+
+    print("Binding: ", UDP_IP, ":", UDP_PORT);
+
+    timestamp = datetime.now()
+
+    while is_running:
+
+        bytes, addr = sock.recvfrom(1024)
+
+        cur_timestamp = datetime.now()
+        latency = int((cur_timestamp - timestamp).total_seconds() * 1000)
+
+        #assert len(bytes) == 72, "Protocol error"
+
+        s = ConstBitStream(bytes)
+
+        reserved = s.read('uintle:32')
+        object_type = s.read('uintle:32') 
+        object_id = s.read('uintle:32')
+        timestamp = s.read('floatle:64') 
+        east = s.read('floatle:64') 
+        north = s.read('floatle:64') 
+        up = s.read('floatle:64') 
+        heading = s.read('floatle:64') 
+
+        timestamp = cur_timestamp
+
+        print("object_id:", object_id, "object_type:", object_type, "heading:", heading)
+
+    print('Finished')
diff --git a/Scripts/ViewCam.py b/Scripts/ViewCam.py
new file mode 100644
index 0000000..2c6bbb4
--- /dev/null
+++ b/Scripts/ViewCam.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import zmq
+from threading import Thread
+import signal
+import struct
+import cv2
+import sys
+
+camera_addr = "tcp://localhost:8008"
+scale_percent = 1
+depth_32bit_scale = 1 / 200.0
+
+# struct MsgHeader
+# {
+# 	union Tenser_t {
+# 		std::int32_t Data[4];
+# 		struct
+# 		{
+# 			std::int32_t Depth;
+# 			std::int32_t Height;
+# 			std::int32_t Width;
+# 			std::int32_t Channels;
+# 		} Shape;
+# 	} Tenser;
+# 	std::int32_t DataType;
+# 	std::int64_t Timestamp;
+# 	std::int64_t Index;
+# };
+
+
+TENSOR_MSG_HEADER_FMT = 'iiiiiqq'
+HEADER_LENGTH = struct.calcsize(TENSOR_MSG_HEADER_FMT)
+
+CV_8U = 0
+CV_8S = 1
+CV_16U = 2
+CV_16S = 3
+CV_32S = 4
+CV_32F = 5
+CV_64F = 6
+
+def ocv2np_type(ocv_type):
+    if ocv_type == CV_8U: return np.uint8
+    if ocv_type == CV_8S: return np.int8
+    if ocv_type == CV_16U: return np.uint16
+    if ocv_type == CV_16S: return np.int16
+    if ocv_type == CV_32S: return np.int32
+    if ocv_type == CV_32F: return np.float32
+    if ocv_type == CV_64F: return np.float64
+
+
+is_running = True
+
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+
+if __name__ == '__main__':
+
+    if len(sys.argv) >= 2: 
+        camera_addr = sys.argv[1];
+        
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    ctx = zmq.Context()
+    cam_sock = ctx.socket(zmq.SUB)
+    cam_sock.setsockopt(zmq.SUBSCRIBE, b'')
+    cam_sock.setsockopt(zmq.CONFLATE, 1)
+    cam_sock.connect(camera_addr)
+
+    print('Connected to {}'.format(camera_addr))
+
+    
+
+    img_header, img_data = None, None
+    while is_running:
+        try:
+            rawbuf = cam_sock.recv(0)
+        except zmq.ZMQError as e:
+            print('ZMQ error')
+            if e.errno != zmq.EAGAIN: raise
+
+        img_header = struct.unpack(TENSOR_MSG_HEADER_FMT, rawbuf[:HEADER_LENGTH])
+        img_data = rawbuf[HEADER_LENGTH:]
+
+        print("Got image; Depth:", img_header[0], "Height:", img_header[1], "Width:", img_header[2], "Channels:", img_header[3], "DataType:", img_header[4], "Timestamp:", img_header[5], "Index:", img_header[6])
+
+        if img_header[3] > 1:
+            np_image = np.frombuffer(img_data, ocv2np_type(img_header[4])).reshape(img_header[1:4])
+        else:
+            np_image = np.frombuffer(img_data, ocv2np_type(img_header[4])).reshape(img_header[1:3])
+
+        if img_header[4] == CV_8U or img_header[4] == CV_16U:
+            pass
+        elif img_header[4] == CV_32F and img_header[3] == 1:
+            np_image = np.trunc(np_image * depth_32bit_scale * 0xFFFF).astype(np.uint16)
+        else:
+            print("Data type ", mg_header[4], " not supported")
+            break;
+
+        width = int(img_header[2] * scale_percent)
+        height = int(img_header[1] * scale_percent)
+        cv2.imshow('image', cv2.resize(np_image, (width, height)) )
+        cv2.waitKey(1)
+       
+    print('Finished')
+
diff --git a/Scripts/ViewPath.py b/Scripts/ViewPath.py
new file mode 100644
index 0000000..5fa3341
--- /dev/null
+++ b/Scripts/ViewPath.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python3
+
+import matplotlib.pyplot as plt
+import csv
+
+x = []
+y = []
+
+file_path = '/tmp/imu_path.txt'
+
+with open(file_path,'r') as csvfile:
+    plots = csv.reader(csvfile, delimiter=',')
+    for row in plots:
+        x.append(float(row[0]))
+        y.append(float(row[1]))
+
+plt.plot(x,y, label='Path')
+plt.grid()
+plt.xlabel('x')
+plt.ylabel('y')
+plt.title(file_path)
+plt.legend()
+plt.show()
+
diff --git a/Scripts/WebSockTest.py b/Scripts/WebSockTest.py
new file mode 100644
index 0000000..cb659eb
--- /dev/null
+++ b/Scripts/WebSockTest.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python3
+
+import asyncio
+import websockets
+import sys
+
+Requests = {
+	0 : '{"jsonrpc": "2.0", "method": "open_level",           "params": {"level_name": "SimpleTown"}, "id": 1}',
+	1 : '{"jsonrpc": "2.0", "method": "get_level",            "params": {}, "id": 1}',
+	2 : '{"jsonrpc": "2.0", "method": "get_levels",           "params": {}, "id": 1}',
+	3 : '{"jsonrpc": "2.0", "method": "reset_level",          "params": {}, "id": 1}',
+	4 : '{"jsonrpc": "2.0", "method": "get_level_vehicles",   "params": {}, "id": 1}',
+	5 : '{"jsonrpc": "2.0", "method": "get_vehicle_classes",  "params": {}, "id": 1}',
+	6 : '{"jsonrpc": "2.0", "method": "get_vehicle_state",    "params": {"veh_id" : 0}, "id": 1}',
+	7 : '{"jsonrpc": "2.0", "method": "set_vehicle_inputs",   "params": {"veh_id" : 0, "throttle" : 0, "steering" : 0, "brake" : 0, "gear" : 0}, "id": 1}',
+	8 : '{"jsonrpc": "2.0", "method": "get_vehicle_params",   "params": {"veh_id" : 0}, "id": 1}',
+	9 : '{"jsonrpc": "2.0", "method": "get_vehicle_param",    "params": {"veh_id" : 0, "parameter_name" : "VehicleMovementClass"}, "id": 1}',
+	10 :  '''
+	{
+		"jsonrpc": "2.0", 
+		"method": "set_vehicle_params",   
+		"params": 
+		{
+			"veh_id" : 0, 
+			"parameters" : [{"name" : "VehicleMovementClass", "value" : "2WD"}]
+		}, "id": 1
+	}''',
+	11 : '''
+	{
+		"jsonrpc": "2.0", 
+		"method": "set_vehicle_param",    
+		"params": {"veh_id" : 0, "parameter_name" : "VehicleMovementClass", "value" : "2WD"}, 
+		"id": 1
+	}''',
+	12 : '{"jsonrpc": "2.0", "method": "change_vehicle_class", "params": {"veh_id" : 0, "vehicle_class_name" : "RobocarDefSensors_C"}, "id": 1}',
+	13 : '''
+	{
+		"jsonrpc": "2.0", 
+		"method": "set_vehicle_position", 
+		"params": 
+		{
+			"veh_id" : 0, 
+			"location" : {"x" : 706, "y" : -5580, "z" : 265},
+			"rotation" : {"yaw" : 0, "pitch" : 0, "roll" : 0}
+		}, 
+		"id": 1
+	}''',
+	14 : '{"jsonrpc": "2.0", "method": "reset_default_vehicle_params", "params": {"veh_id" : 0}, "id": 1}',
+	15 : '{"jsonrpc": "2.0", "method": "get_sensors_params", "params": {"veh_id" : 0}, "id": 1}',
+	16 : '{"jsonrpc": "2.0", "method": "get_sensor_params",  "params": {"veh_id" : 0, "sensor_name" : "IMU"}, "id": 1}',
+	17 : '{"jsonrpc": "2.0", "method": "get_sensor_param",   "params": {"veh_id" : 0, "sensor_name" : "IMU", "parameter_name": "Port"}, "id": 1}',
+	18 : '''
+	{
+		"jsonrpc": "2.0", 
+		"method": "set_sensors_params", 
+		"params": 
+		{
+			"veh_id" : 0,
+			"sensors": 
+			[
+				{
+					"sensor_name" : "IMU",
+					"parameters" : 
+					[
+						{"name" : "Port", "value" : 8001}
+					]
+				}
+			]
+		}, 
+		"id": 1
+	}''',
+	19 : '''
+	{
+		"jsonrpc": "2.0", 
+		"method": "set_sensor_params", 
+		"params": 
+		{
+			"veh_id" : 0,
+			"sensor_name": "IMU",
+			"parameters": 
+			[
+				{"name" : "Port", "value" : 8002}
+			]
+		}, 
+		"id": 1
+	}''',
+	20 : '{"jsonrpc": "2.0", "method": "set_sensor_param", "params": {"veh_id" : 0, "sensor_name" : "IMU", "parameter_name" : "Port", "value" : 8003}, "id": 1}',
+	21 : '{"jsonrpc": "2.0", "method": "enable_sensor",    "params": {"veh_id" : 0, "sensor_name" : "IMU"}, "id": 1}',
+	22 : '{"jsonrpc": "2.0", "method": "disable_sensor",   "params": {"veh_id" : 0, "sensor_name" : "IMU"}, "id": 1}'
+}
+
+
+if len(sys.argv) < 2: 
+	print ("Use python3 WebSockTest.py <request_id>")
+	sys.exit(-1)
+
+async def hello():
+	uri = "ws://localhost:16000"
+	async with websockets.connect(uri) as websocket:
+		await websocket.send(Requests[int(sys.argv[1])])
+		data = await websocket.recv()
+		print(data)
+asyncio.get_event_loop().run_until_complete(hello())
+
diff --git a/Scripts/WriteCamDataset.py b/Scripts/WriteCamDataset.py
new file mode 100644
index 0000000..1066a64
--- /dev/null
+++ b/Scripts/WriteCamDataset.py
@@ -0,0 +1,159 @@
+#!/usr/bin/env python3
+
+import numpy as np
+import zmq
+from threading import Thread
+import signal
+import struct
+from PIL import Image
+
+###########################################################################################
+###################################### BEGIN INPUTS #######################################
+###########################################################################################
+
+cameras = [
+    ["tcp://localhost:8008", "C:\\UnrealProjects\\dataset"],
+#    ["ipc:///tmp/ue4_stere_right", "/home/ivan/dataset/stereo_right"],
+#    ["ipc:///tmp/ue4_stere_left", "/home/ivan/dataset/stereo_left"],
+#    ["ipc:///tmp/ue4_camera", "/home/ivan/dataset/stereo_left_depth"]
+]
+skip_mod = 1 # 1 - no skip 
+depth_32bit_scale = 1 / 200.0
+
+###########################################################################################
+####################################### END INPUTS ########################################
+###########################################################################################
+
+# struct MsgHeader
+# {
+# 	union Tenser_t {
+# 		std::int32_t Data[4];
+# 		struct
+# 		{
+# 			std::int32_t Depth;
+# 			std::int32_t Height;
+# 			std::int32_t Width;
+# 			std::int32_t Channels;
+# 		} Shape;
+# 	} Tenser;
+# 	std::int32_t DataType;
+# 	std::int64_t Timestamp;
+# 	std::int64_t Index;
+# };
+
+
+TENSOR_MSG_HEADER_FMT = 'iiiiiqq'
+HEADER_LENGTH = struct.calcsize(TENSOR_MSG_HEADER_FMT)
+
+CV_8U = 0
+CV_8S = 1
+CV_16U = 2
+CV_16S = 3
+CV_32S = 4
+CV_32F = 5
+CV_64F = 6
+
+def ocv2np_type(ocv_type):
+    if ocv_type == CV_8U: return np.uint8
+    if ocv_type == CV_8S: return np.int8
+    if ocv_type == CV_16U: return np.uint16
+    if ocv_type == CV_16S: return np.int16
+    if ocv_type == CV_32S: return np.int32
+    if ocv_type == CV_32F: return np.float32
+    if ocv_type == CV_64F: return np.float64
+
+
+
+is_running = True
+
+class WriterThread(Thread):
+
+    def __init__(self, ctx, camera_addr, file_prefix):
+        Thread.__init__(self)
+        self.cam_sock = ctx.socket(zmq.SUB)
+        self.cam_sock.setsockopt(zmq.SUBSCRIBE, b'')
+        self.cam_sock.connect(camera_addr)
+        self.camera_addr = camera_addr
+        self.file_prefix = file_prefix
+        print('Connected to {}'.format(camera_addr))
+        self.file_timestamps = open(file_prefix + ".timestamps", "w")
+
+    
+    def run(self):
+        img_header, img_data, image = None, None, None
+        while is_running:
+            try:
+                rawbuf = self.cam_sock.recv(0)
+            except zmq.ZMQError as e:
+                if e.errno != zmq.EAGAIN: raise
+                break
+
+            img_header = struct.unpack(TENSOR_MSG_HEADER_FMT, rawbuf[:HEADER_LENGTH])
+            img_data = rawbuf[HEADER_LENGTH:]
+
+            if img_header[6] % skip_mod != 0: continue
+
+            if img_header[3] > 1:
+                np_image = np.frombuffer(img_data, ocv2np_type(img_header[4])).reshape(img_header[1:4])
+            else:
+                np_image = np.frombuffer(img_data, ocv2np_type(img_header[4])).reshape(img_header[1:3])
+
+
+            if img_header[4] == CV_8U or img_header[4] == CV_16U:
+                img = Image.fromarray(np_image)
+
+                if img_header[3] == 3:
+                    b, g, r = img.split()
+                    img = Image.merge("RGB", (r, g, b))
+                elif img_header[3] == 4:
+                    b, g, r, a = img.split()
+                    img = Image.merge("RGB", (r, g, b))
+
+
+            elif img_header[4] == CV_32F and img_header[3] == 1:
+                np_image_16bit = np.trunc(np_image * depth_32bit_scale * 0xFFFF).astype(np.uint16)
+                img = Image.new("I", np_image_16bit.T.shape)
+                img.frombytes(np_image_16bit.tobytes(), 'raw', "I;16")
+            else:
+                print("Data type ", mg_header[4], " not supported")
+                continue;
+                
+            path = self.file_prefix + ("_%06d.png" % img_header[6])
+            img.save(path, "PNG", compress_level=0)
+
+
+            print(self.camera_addr, "  : Save image ", path, "Res:", img_header[1], "x", img_header[2], "Timestamp:", img_header[5], "Index:", img_header[6])
+
+            self.file_timestamps.write(str(img_header[6]) + " " + str(img_header[5]) + "\n")
+            self.file_timestamps.flush()
+
+        self.file_timestamps.close()
+        print(self.camera_addr, 'is finished')
+    
+def signal_handler(signum, frame):
+    import sys
+    global is_running
+    if (is_running):
+        is_running = False
+    else:
+        sys.exit(0)
+
+
+if __name__ == '__main__':
+
+    print('Started')
+    signal.signal(signal.SIGINT, signal_handler)
+
+    ctx = zmq.Context()
+    
+    writers = []
+
+    for i in range(0, len(cameras)):
+        writers.append(WriterThread(ctx, cameras[i][0], cameras[i][1]))
+        writers[i].start()
+
+
+    writers[0].join()
+
+    print('Finished')
+
diff --git a/Scripts/bitstring.py b/Scripts/bitstring.py
new file mode 100644
index 0000000..aa078d0
--- /dev/null
+++ b/Scripts/bitstring.py
@@ -0,0 +1,4242 @@
+#!/usr/bin/env python
+"""
+This package defines classes that simplify bit-wise creation, manipulation and
+interpretation of data.
+
+Classes:
+
+Bits -- An immutable container for binary data.
+BitArray -- A mutable container for binary data.
+ConstBitStream -- An immutable container with streaming methods.
+BitStream -- A mutable container with streaming methods.
+
+                      Bits (base class)
+                     /    \
+ + mutating methods /      \ + streaming methods
+                   /        \
+              BitArray   ConstBitStream
+                   \        /
+                    \      /
+                     \    /
+                    BitStream
+
+Functions:
+
+pack -- Create a BitStream from a format string.
+
+Exceptions:
+
+Error -- Module exception base class.
+CreationError -- Error during creation.
+InterpretError -- Inappropriate interpretation of binary data.
+ByteAlignError -- Whole byte position or length needed.
+ReadError -- Reading or peeking past the end of a bitstring.
+
+https://github.com/scott-griffiths/bitstring
+"""
+
+__licence__ = """
+The MIT License
+
+Copyright (c) 2006-2016 Scott Griffiths (dr.scottgriffiths@gmail.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+"""
+
+__version__ = "3.1.5"
+
+__author__ = "Scott Griffiths"
+
+import numbers
+import copy
+import sys
+import re
+import binascii
+import mmap
+import os
+import struct
+import operator
+import collections
+import array
+
+byteorder = sys.byteorder
+
+bytealigned = False
+"""Determines whether a number of methods default to working only on byte boundaries."""
+
+# Maximum number of digits to use in __str__ and __repr__.
+MAX_CHARS = 250
+
+# Maximum size of caches used for speed optimisations.
+CACHE_SIZE = 1000
+
+class Error(Exception):
+    """Base class for errors in the bitstring module."""
+
+    def __init__(self, *params):
+        self.msg = params[0] if params else ''
+        self.params = params[1:]
+
+    def __str__(self):
+        if self.params:
+            return self.msg.format(*self.params)
+        return self.msg
+
+
+class ReadError(Error, IndexError):
+    """Reading or peeking past the end of a bitstring."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class InterpretError(Error, ValueError):
+    """Inappropriate interpretation of binary data."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class ByteAlignError(Error):
+    """Whole-byte position or length needed."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class CreationError(Error, ValueError):
+    """Inappropriate argument during bitstring creation."""
+
+    def __init__(self, *params):
+        Error.__init__(self, *params)
+
+
+class ConstByteStore(object):
+    """Stores raw bytes together with a bit offset and length.
+
+    Used internally - not part of public interface.
+    """
+
+    __slots__ = ('offset', '_rawarray', 'bitlength')
+
+    def __init__(self, data, bitlength=None, offset=None):
+        """data is either a bytearray or a MmapByteArray"""
+        self._rawarray = data
+        if offset is None:
+            offset = 0
+        if bitlength is None:
+            bitlength = 8 * len(data) - offset
+        self.offset = offset
+        self.bitlength = bitlength
+
+    def getbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        return bool(self._rawarray[byte] & (128 >> bit))
+
+    def getbyte(self, pos):
+        """Direct access to byte data."""
+        return self._rawarray[pos]
+
+    def getbyteslice(self, start, end):
+        """Direct access to byte data."""
+        c = self._rawarray[start:end]
+        return c
+
+    @property
+    def bytelength(self):
+        if not self.bitlength:
+            return 0
+        sb = self.offset // 8
+        eb = (self.offset + self.bitlength - 1) // 8
+        return eb - sb + 1
+
+    def __copy__(self):
+        return ByteStore(self._rawarray[:], self.bitlength, self.offset)
+
+    def _appendstore(self, store):
+        """Join another store on to the end of this one."""
+        if not store.bitlength:
+            return
+        # Set new array offset to the number of bits in the final byte of current array.
+        store = offsetcopy(store, (self.offset + self.bitlength) % 8)
+        if store.offset:
+            # first do the byte with the join.
+            joinval = (self._rawarray.pop() & (255 ^ (255 >> store.offset)) |
+                       (store.getbyte(0) & (255 >> store.offset)))
+            self._rawarray.append(joinval)
+            self._rawarray.extend(store._rawarray[1:])
+        else:
+            self._rawarray.extend(store._rawarray)
+        self.bitlength += store.bitlength
+
+    def _prependstore(self, store):
+        """Join another store on to the start of this one."""
+        if not store.bitlength:
+            return
+            # Set the offset of copy of store so that it's final byte
+        # ends in a position that matches the offset of self,
+        # then join self on to the end of it.
+        store = offsetcopy(store, (self.offset - store.bitlength) % 8)
+        assert (store.offset + store.bitlength) % 8 == self.offset % 8
+        bit_offset = self.offset % 8
+        if bit_offset:
+            # first do the byte with the join.
+            store.setbyte(-1, (store.getbyte(-1) & (255 ^ (255 >> bit_offset)) | \
+                               (self._rawarray[self.byteoffset] & (255 >> bit_offset))))
+            store._rawarray.extend(self._rawarray[self.byteoffset + 1: self.byteoffset + self.bytelength])
+        else:
+            store._rawarray.extend(self._rawarray[self.byteoffset: self.byteoffset + self.bytelength])
+        self._rawarray = store._rawarray
+        self.offset = store.offset
+        self.bitlength += store.bitlength
+
+    @property
+    def byteoffset(self):
+        return self.offset // 8
+
+    @property
+    def rawbytes(self):
+        return self._rawarray
+
+
+class ByteStore(ConstByteStore):
+    """Adding mutating methods to ConstByteStore
+
+    Used internally - not part of public interface.
+    """
+    __slots__ = ()
+
+    def setbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        self._rawarray[byte] |= (128 >> bit)
+
+    def unsetbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        self._rawarray[byte] &= ~(128 >> bit)
+
+    def invertbit(self, pos):
+        assert 0 <= pos < self.bitlength
+        byte, bit = divmod(self.offset + pos, 8)
+        self._rawarray[byte] ^= (128 >> bit)
+
+    def setbyte(self, pos, value):
+        self._rawarray[pos] = value
+
+    def setbyteslice(self, start, end, value):
+        self._rawarray[start:end] = value
+
+
+def offsetcopy(s, newoffset):
+    """Return a copy of a ByteStore with the newoffset.
+
+    Not part of public interface.
+    """
+    assert 0 <= newoffset < 8
+    if not s.bitlength:
+        return copy.copy(s)
+    else:
+        if newoffset == s.offset % 8:
+            return ByteStore(s.getbyteslice(s.byteoffset, s.byteoffset + s.bytelength), s.bitlength, newoffset)
+        newdata = []
+        d = s._rawarray
+        assert newoffset != s.offset % 8
+        if newoffset < s.offset % 8:
+            # We need to shift everything left
+            shiftleft = s.offset % 8 - newoffset
+            # First deal with everything except for the final byte
+            for x in range(s.byteoffset, s.byteoffset + s.bytelength - 1):
+                newdata.append(((d[x] << shiftleft) & 0xff) +\
+                               (d[x + 1] >> (8 - shiftleft)))
+            bits_in_last_byte = (s.offset + s.bitlength) % 8
+            if not bits_in_last_byte:
+                bits_in_last_byte = 8
+            if bits_in_last_byte > shiftleft:
+                newdata.append((d[s.byteoffset + s.bytelength - 1] << shiftleft) & 0xff)
+        else: # newoffset > s._offset % 8
+            shiftright = newoffset - s.offset % 8
+            newdata.append(s.getbyte(0) >> shiftright)
+            for x in range(s.byteoffset + 1, s.byteoffset + s.bytelength):
+                newdata.append(((d[x - 1] << (8 - shiftright)) & 0xff) +\
+                               (d[x] >> shiftright))
+            bits_in_last_byte = (s.offset + s.bitlength) % 8
+            if not bits_in_last_byte:
+                bits_in_last_byte = 8
+            if bits_in_last_byte + shiftright > 8:
+                newdata.append((d[s.byteoffset + s.bytelength - 1] << (8 - shiftright)) & 0xff)
+        new_s = ByteStore(bytearray(newdata), s.bitlength, newoffset)
+        assert new_s.offset == newoffset
+        return new_s
+
+
+def equal(a, b):
+    """Return True if ByteStores a == b.
+
+    Not part of public interface.
+    """
+    # We want to return False for inequality as soon as possible, which
+    # means we get lots of special cases.
+    # First the easy one - compare lengths:
+    a_bitlength = a.bitlength
+    b_bitlength = b.bitlength
+    if a_bitlength != b_bitlength:
+        return False
+    if not a_bitlength:
+        assert b_bitlength == 0
+        return True
+    # Make 'a' the one with the smaller offset
+    if (a.offset % 8) > (b.offset % 8):
+        a, b = b, a
+    # and create some aliases
+    a_bitoff = a.offset % 8
+    b_bitoff = b.offset % 8
+    a_byteoffset = a.byteoffset
+    b_byteoffset = b.byteoffset
+    a_bytelength = a.bytelength
+    b_bytelength = b.bytelength
+    da = a._rawarray
+    db = b._rawarray
+
+    # If they are pointing to the same data, they must be equal
+    if da is db and a.offset == b.offset:
+        return True
+
+    if a_bitoff == b_bitoff:
+        bits_spare_in_last_byte = 8 - (a_bitoff + a_bitlength) % 8
+        if bits_spare_in_last_byte == 8:
+            bits_spare_in_last_byte = 0
+        # Special case for a, b contained in a single byte
+        if a_bytelength == 1:
+            a_val = ((da[a_byteoffset] << a_bitoff) & 0xff) >> (8 - a_bitlength)
+            b_val = ((db[b_byteoffset] << b_bitoff) & 0xff) >> (8 - b_bitlength)
+            return a_val == b_val
+        # Otherwise check first byte
+        if da[a_byteoffset] & (0xff >> a_bitoff) != db[b_byteoffset] & (0xff >> b_bitoff):
+            return False
+        # then everything up to the last
+        b_a_offset = b_byteoffset - a_byteoffset
+        for x in range(1 + a_byteoffset, a_byteoffset + a_bytelength - 1):
+            if da[x] != db[b_a_offset + x]:
+                return False
+        # and finally the last byte
+        return (da[a_byteoffset + a_bytelength - 1] >> bits_spare_in_last_byte ==
+                db[b_byteoffset + b_bytelength - 1] >> bits_spare_in_last_byte)
+
+    assert a_bitoff != b_bitoff
+    # This is how much we need to shift a to the right to compare with b:
+    shift = b_bitoff - a_bitoff
+    # Special case for b only one byte long
+    if b_bytelength == 1:
+        assert a_bytelength == 1
+        a_val = ((da[a_byteoffset] << a_bitoff) & 0xff) >> (8 - a_bitlength)
+        b_val = ((db[b_byteoffset] << b_bitoff) & 0xff) >> (8 - b_bitlength)
+        return a_val == b_val
+    # Special case for a only one byte long
+    if a_bytelength == 1:
+        assert b_bytelength == 2
+        a_val = ((da[a_byteoffset] << a_bitoff) & 0xff) >> (8 - a_bitlength)
+        b_val = ((db[b_byteoffset] << 8) + db[b_byteoffset + 1]) << b_bitoff
+        b_val &= 0xffff
+        b_val >>= 16 - b_bitlength
+        return a_val == b_val
+
+    # Compare first byte of b with bits from first byte of a
+    if (da[a_byteoffset] & (0xff >> a_bitoff)) >> shift != db[b_byteoffset] & (0xff >> b_bitoff):
+        return False
+    # Now compare every full byte of b with bits from 2 bytes of a
+    for x in range(1, b_bytelength - 1):
+        # Construct byte from 2 bytes in a to compare to byte in b
+        b_val = db[b_byteoffset + x]
+        a_val = ((da[a_byteoffset + x - 1] << 8) + da[a_byteoffset + x]) >> shift
+        a_val &= 0xff
+        if a_val != b_val:
+            return False
+
+    # Now check bits in final byte of b
+    final_b_bits = (b.offset + b_bitlength) % 8
+    if not final_b_bits:
+        final_b_bits = 8
+    b_val = db[b_byteoffset + b_bytelength - 1] >> (8 - final_b_bits)
+    final_a_bits = (a.offset + a_bitlength) % 8
+    if not final_a_bits:
+        final_a_bits = 8
+    if b.bytelength > a_bytelength:
+        assert b_bytelength == a_bytelength + 1
+        a_val = da[a_byteoffset + a_bytelength - 1] >> (8 - final_a_bits)
+        a_val &= 0xff >> (8 - final_b_bits)
+        return a_val == b_val
+    assert a_bytelength == b_bytelength
+    a_val = da[a_byteoffset + a_bytelength - 2] << 8
+    a_val += da[a_byteoffset + a_bytelength - 1]
+    a_val >>= (8 - final_a_bits)
+    a_val &= 0xff >> (8 - final_b_bits)
+    return a_val == b_val
+
+
+class MmapByteArray(object):
+    """Looks like a bytearray, but from an mmap.
+
+    Not part of public interface.
+    """
+
+    __slots__ = ('filemap', 'filelength', 'source', 'byteoffset', 'bytelength')
+
+    def __init__(self, source, bytelength=None, byteoffset=None):
+        self.source = source
+        source.seek(0, os.SEEK_END)
+        self.filelength = source.tell()
+        if byteoffset is None:
+            byteoffset = 0
+        if bytelength is None:
+            bytelength = self.filelength - byteoffset
+        self.byteoffset = byteoffset
+        self.bytelength = bytelength
+        self.filemap = mmap.mmap(source.fileno(), 0, access=mmap.ACCESS_READ)
+
+    def __getitem__(self, key):
+        try:
+            start = key.start
+            stop = key.stop
+        except AttributeError:
+            try:
+                assert 0 <= key < self.bytelength
+                return ord(self.filemap[key + self.byteoffset])
+            except TypeError:
+                # for Python 3
+                return self.filemap[key + self.byteoffset]
+        else:
+            if start is None:
+                start = 0
+            if stop is None:
+                stop = self.bytelength
+            assert key.step is None
+            assert 0 <= start < self.bytelength
+            assert 0 <= stop <= self.bytelength
+            s = slice(start + self.byteoffset, stop + self.byteoffset)
+            return bytearray(self.filemap.__getitem__(s))
+
+    def __len__(self):
+        return self.bytelength
+
+
+# This creates a dictionary for every possible byte with the value being
+# the key with its bits reversed.
+BYTE_REVERSAL_DICT = dict()
+
+# For Python 2.x/ 3.x coexistence
+# Yes this is very very hacky.
+try:
+    xrange
+    for i in range(256):
+        BYTE_REVERSAL_DICT[i] = chr(int("{0:08b}".format(i)[::-1], 2))
+except NameError:
+    for i in range(256):
+        BYTE_REVERSAL_DICT[i] = bytes([int("{0:08b}".format(i)[::-1], 2)])
+    from io import IOBase as file
+    xrange = range
+    basestring = str
+
+# Python 2.x octals start with '0', in Python 3 it's '0o'
+LEADING_OCT_CHARS = len(oct(1)) - 1
+
+def tidy_input_string(s):
+    """Return string made lowercase and with all whitespace removed."""
+    s = ''.join(s.split()).lower()
+    return s
+
+INIT_NAMES = ('uint', 'int', 'ue', 'se', 'sie', 'uie', 'hex', 'oct', 'bin', 'bits',
+              'uintbe', 'intbe', 'uintle', 'intle', 'uintne', 'intne',
+              'float', 'floatbe', 'floatle', 'floatne', 'bytes', 'bool', 'pad')
+
+TOKEN_RE = re.compile(r'(?P<name>' + '|'.join(INIT_NAMES) +
+                      r')((:(?P<len>[^=]+)))?(=(?P<value>.*))?$', re.IGNORECASE)
+DEFAULT_UINT = re.compile(r'(?P<len>[^=]+)?(=(?P<value>.*))?$', re.IGNORECASE)
+
+MULTIPLICATIVE_RE = re.compile(r'(?P<factor>.*)\*(?P<token>.+)')
+
+# Hex, oct or binary literals
+LITERAL_RE = re.compile(r'(?P<name>0(x|o|b))(?P<value>.+)', re.IGNORECASE)
+
+# An endianness indicator followed by one or more struct.pack codes
+STRUCT_PACK_RE = re.compile(r'(?P<endian><|>|@)?(?P<fmt>(?:\d*[bBhHlLqQfd])+)$')
+
+# A number followed by a single character struct.pack code
+STRUCT_SPLIT_RE = re.compile(r'\d*[bBhHlLqQfd]')
+
+# These replicate the struct.pack codes
+# Big-endian
+REPLACEMENTS_BE = {'b': 'intbe:8', 'B': 'uintbe:8',
+                   'h': 'intbe:16', 'H': 'uintbe:16',
+                   'l': 'intbe:32', 'L': 'uintbe:32',
+                   'q': 'intbe:64', 'Q': 'uintbe:64',
+                   'f': 'floatbe:32', 'd': 'floatbe:64'}
+# Little-endian
+REPLACEMENTS_LE = {'b': 'intle:8', 'B': 'uintle:8',
+                   'h': 'intle:16', 'H': 'uintle:16',
+                   'l': 'intle:32', 'L': 'uintle:32',
+                   'q': 'intle:64', 'Q': 'uintle:64',
+                   'f': 'floatle:32', 'd': 'floatle:64'}
+
+# Size in bytes of all the pack codes.
+PACK_CODE_SIZE = {'b': 1, 'B': 1, 'h': 2, 'H': 2, 'l': 4, 'L': 4,
+                  'q': 8, 'Q': 8, 'f': 4, 'd': 8}
+
+_tokenname_to_initialiser = {'hex': 'hex', '0x': 'hex', '0X': 'hex', 'oct': 'oct',
+                             '0o': 'oct', '0O': 'oct', 'bin': 'bin', '0b': 'bin',
+                             '0B': 'bin', 'bits': 'auto', 'bytes': 'bytes', 'pad': 'pad'}
+
+def structparser(token):
+    """Parse struct-like format string token into sub-token list."""
+    m = STRUCT_PACK_RE.match(token)
+    if not m:
+        return [token]
+    else:
+        endian = m.group('endian')
+        if endian is None:
+            return [token]
+        # Split the format string into a list of 'q', '4h' etc.
+        formatlist = re.findall(STRUCT_SPLIT_RE, m.group('fmt'))
+        # Now deal with mulitiplicative factors, 4h -> hhhh etc.
+        fmt = ''.join([f[-1] * int(f[:-1]) if len(f) != 1 else
+                       f for f in formatlist])
+        if endian == '@':
+            # Native endianness
+            if byteorder == 'little':
+                endian = '<'
+            else:
+                assert byteorder == 'big'
+                endian = '>'
+        if endian == '<':
+            tokens = [REPLACEMENTS_LE[c] for c in fmt]
+        else:
+            assert endian == '>'
+            tokens = [REPLACEMENTS_BE[c] for c in fmt]
+    return tokens
+
+def tokenparser(fmt, keys=None, token_cache={}):
+    """Divide the format string into tokens and parse them.
+
+    Return stretchy token and list of [initialiser, length, value]
+    initialiser is one of: hex, oct, bin, uint, int, se, ue, 0x, 0o, 0b etc.
+    length is None if not known, as is value.
+
+    If the token is in the keyword dictionary (keys) then it counts as a
+    special case and isn't messed with.
+
+    tokens must be of the form: [factor*][initialiser][:][length][=value]
+
+    """
+    try:
+        return token_cache[(fmt, keys)]
+    except KeyError:
+        token_key = (fmt, keys)
+    # Very inefficient expanding of brackets.
+    fmt = expand_brackets(fmt)
+    # Split tokens by ',' and remove whitespace
+    # The meta_tokens can either be ordinary single tokens or multiple
+    # struct-format token strings.
+    meta_tokens = (''.join(f.split()) for f in fmt.split(','))
+    return_values = []
+    stretchy_token = False
+    for meta_token in meta_tokens:
+        # See if it has a multiplicative factor
+        m = MULTIPLICATIVE_RE.match(meta_token)
+        if not m:
+            factor = 1
+        else:
+            factor = int(m.group('factor'))
+            meta_token = m.group('token')
+        # See if it's a struct-like format
+        tokens = structparser(meta_token)
+        ret_vals = []
+        for token in tokens:
+            if keys and token in keys:
+                # Don't bother parsing it, it's a keyword argument
+                ret_vals.append([token, None, None])
+                continue
+            value = length = None
+            if token == '':
+                continue
+            # Match literal tokens of the form 0x... 0o... and 0b...
+            m = LITERAL_RE.match(token)
+            if m:
+                name = m.group('name')
+                value = m.group('value')
+                ret_vals.append([name, length, value])
+                continue
+            # Match everything else:
+            m1 = TOKEN_RE.match(token)
+            if not m1:
+                # and if you don't specify a 'name' then the default is 'uint':
+                m2 = DEFAULT_UINT.match(token)
+                if not m2:
+                    raise ValueError("Don't understand token '{0}'.".format(token))
+            if m1:
+                name = m1.group('name')
+                length = m1.group('len')
+                if m1.group('value'):
+                    value = m1.group('value')
+            else:
+                assert m2
+                name = 'uint'
+                length = m2.group('len')
+                if m2.group('value'):
+                    value = m2.group('value')
+            if name == 'bool':
+                if length is not None:
+                    raise ValueError("You can't specify a length with bool tokens - they are always one bit.")
+                length = 1
+            if length is None and name not in ('se', 'ue', 'sie', 'uie'):
+                stretchy_token = True
+            if length is not None:
+                # Try converting length to int, otherwise check it's a key.
+                try:
+                    length = int(length)
+                    if length < 0:
+                        raise Error
+                    # For the 'bytes' token convert length to bits.
+                    if name == 'bytes':
+                        length *= 8
+                except Error:
+                    raise ValueError("Can't read a token with a negative length.")
+                except ValueError:
+                    if not keys or length not in keys:
+                        raise ValueError("Don't understand length '{0}' of token.".format(length))
+            ret_vals.append([name, length, value])
+        # This multiplies by the multiplicative factor, but this means that
+        # we can't allow keyword values as multipliers (e.g. n*uint:8).
+        # The only way to do this would be to return the factor in some fashion
+        # (we can't use the key's value here as it would mean that we couldn't
+        # sensibly continue to cache the function's results. (TODO).
+        return_values.extend(ret_vals * factor)
+    return_values = [tuple(x) for x in return_values]
+    if len(token_cache) < CACHE_SIZE:
+        token_cache[token_key] = stretchy_token, return_values
+    return stretchy_token, return_values
+
+# Looks for first number*(
+BRACKET_RE = re.compile(r'(?P<factor>\d+)\*\(')
+
+def expand_brackets(s):
+    """Remove whitespace and expand all brackets."""
+    s = ''.join(s.split())
+    while True:
+        start = s.find('(')
+        if start == -1:
+            break
+        count = 1 # Number of hanging open brackets
+        p = start + 1
+        while p < len(s):
+            if s[p] == '(':
+                count += 1
+            if s[p] == ')':
+                count -= 1
+            if not count:
+                break
+            p += 1
+        if count:
+            raise ValueError("Unbalanced parenthesis in '{0}'.".format(s))
+        if start == 0 or s[start - 1] != '*':
+            s = s[0:start] + s[start + 1:p] + s[p + 1:]
+        else:
+            m = BRACKET_RE.search(s)
+            if m:
+                factor = int(m.group('factor'))
+                matchstart = m.start('factor')
+                s = s[0:matchstart] + (factor - 1) * (s[start + 1:p] + ',') + s[start + 1:p] + s[p + 1:]
+            else:
+                raise ValueError("Failed to parse '{0}'.".format(s))
+    return s
+
+
+# This converts a single octal digit to 3 bits.
+OCT_TO_BITS = ['{0:03b}'.format(i) for i in xrange(8)]
+
+# A dictionary of number of 1 bits contained in binary representation of any byte
+BIT_COUNT = dict(zip(xrange(256), [bin(i).count('1') for i in xrange(256)]))
+
+
+class Bits(object):
+    """A container holding an immutable sequence of bits.
+
+    For a mutable container use the BitArray class instead.
+
+    Methods:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    join() -- Join bitstrings together using current bitstring.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Special methods:
+
+    Also available are the operators [], ==, !=, +, *, ~, <<, >>, &, |, ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ('_datastore')
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable, an array or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is mainly intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        pass
+
+    def __new__(cls, auto=None, length=None, offset=None, _cache={}, **kwargs):
+        # For instances auto-initialised with a string we intern the
+        # instance for re-use.
+        try:
+            if isinstance(auto, basestring):
+                try:
+                    return _cache[auto]
+                except KeyError:
+                    x = object.__new__(Bits)
+                    try:
+                        _, tokens = tokenparser(auto)
+                    except ValueError as e:
+                        raise CreationError(*e.args)
+                    x._datastore = ConstByteStore(bytearray(0), 0, 0)
+                    for token in tokens:
+                        x._datastore._appendstore(Bits._init_with_token(*token)._datastore)
+                    assert x._assertsanity()
+                    if len(_cache) < CACHE_SIZE:
+                        _cache[auto] = x
+                    return x
+            if type(auto) == Bits:
+                return auto
+        except TypeError:
+            pass
+        x = super(Bits, cls).__new__(cls)
+        x._initialise(auto, length, offset, **kwargs)
+        return x
+
+    def _initialise(self, auto, length, offset, **kwargs):
+        if length is not None and length < 0:
+            raise CreationError("bitstring length cannot be negative.")
+        if offset is not None and offset < 0:
+            raise CreationError("offset must be >= 0.")
+        if auto is not None:
+            self._initialise_from_auto(auto, length, offset)
+            return
+        if not kwargs:
+            # No initialisers, so initialise with nothing or zero bits
+            if length is not None and length != 0:
+                data = bytearray((length + 7) // 8)
+                self._setbytes_unsafe(data, length, 0)
+                return
+            self._setbytes_unsafe(bytearray(0), 0, 0)
+            return
+        k, v = kwargs.popitem()
+        try:
+            init_without_length_or_offset[k](self, v)
+            if length is not None or offset is not None:
+                raise CreationError("Cannot use length or offset with this initialiser.")
+        except KeyError:
+            try:
+                init_with_length_only[k](self, v, length)
+                if offset is not None:
+                    raise CreationError("Cannot use offset with this initialiser.")
+            except KeyError:
+                if offset is None:
+                    offset = 0
+                try:
+                    init_with_length_and_offset[k](self, v, length, offset)
+                except KeyError:
+                    raise CreationError("Unrecognised keyword '{0}' used to initialise.", k)
+
+    def _initialise_from_auto(self, auto, length, offset):
+        if offset is None:
+            offset = 0
+        self._setauto(auto, length, offset)
+        return
+
+    def __copy__(self):
+        """Return a new copy of the Bits for the copy module."""
+        # Note that if you want a new copy (different ID), use _copy instead.
+        # The copy can return self as it's immutable.
+        return self
+
+    def __lt__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __gt__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __le__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __ge__(self, other):
+        raise TypeError("unorderable type: {0}".format(type(self).__name__))
+
+    def __add__(self, bs):
+        """Concatenate bitstrings and return new bitstring.
+
+        bs -- the bitstring to append.
+
+        """
+        bs = Bits(bs)
+        if bs.len <= self.len:
+            s = self._copy()
+            s._append(bs)
+        else:
+            s = bs._copy()
+            s = self.__class__(s)
+            s._prepend(self)
+        return s
+
+    def __radd__(self, bs):
+        """Append current bitstring to bs and return new bitstring.
+
+        bs -- the string for the 'auto' initialiser that will be appended to.
+
+        """
+        bs = self._converttobitstring(bs)
+        return bs.__add__(self)
+
+    def __getitem__(self, key):
+        """Return a new bitstring representing a slice of the current bitstring.
+
+        Indices are in units of the step parameter (default 1 bit).
+        Stepping is used to specify the number of bits in each item.
+
+        >>> print BitArray('0b00110')[1:4]
+        '0b011'
+        >>> print BitArray('0x00112233')[1:3:8]
+        '0x1122'
+
+        """
+        length = self.len
+        try:
+            step = key.step if key.step is not None else 1
+        except AttributeError:
+            # single element
+            if key < 0:
+                key += length
+            if not 0 <= key < length:
+                raise IndexError("Slice index out of range.")
+            # Single bit, return True or False
+            return self._datastore.getbit(key)
+        else:
+            if step != 1:
+                # convert to binary string and use string slicing
+                bs = self.__class__()
+                bs._setbin_unsafe(self._getbin().__getitem__(key))
+                return bs
+            start, stop = 0, length
+            if key.start is not None:
+                start = key.start
+                if key.start < 0:
+                    start += stop
+            if key.stop is not None:
+                stop = key.stop
+                if key.stop < 0:
+                    stop += length
+            start = max(start, 0)
+            stop = min(stop, length)
+            if start < stop:
+                return self._slice(start, stop)
+            else:
+                return self.__class__()
+
+    def __len__(self):
+        """Return the length of the bitstring in bits."""
+        return self._getlength()
+
+    def __str__(self):
+        """Return approximate string representation of bitstring for printing.
+
+        Short strings will be given wholly in hexadecimal or binary. Longer
+        strings may be part hexadecimal and part binary. Very long strings will
+        be truncated with '...'.
+
+        """
+        length = self.len
+        if not length:
+            return ''
+        if length > MAX_CHARS * 4:
+            # Too long for hex. Truncate...
+            return ''.join(('0x', self._readhex(MAX_CHARS * 4, 0), '...'))
+        # If it's quite short and we can't do hex then use bin
+        if length < 32 and length % 4 != 0:
+            return '0b' + self.bin
+        # If we can use hex then do so
+        if not length % 4:
+            return '0x' + self.hex
+        # Otherwise first we do as much as we can in hex
+        # then add on 1, 2 or 3 bits on at the end
+        bits_at_end = length % 4
+        return ''.join(('0x', self._readhex(length - bits_at_end, 0),
+                        ', ', '0b',
+                        self._readbin(bits_at_end, length - bits_at_end)))
+
+    def __repr__(self):
+        """Return representation that could be used to recreate the bitstring.
+
+        If the returned string is too long it will be truncated. See __str__().
+
+        """
+        length = self.len
+        if isinstance(self._datastore._rawarray, MmapByteArray):
+            offsetstring = ''
+            if self._datastore.byteoffset or self._offset:
+                offsetstring = ", offset=%d" % (self._datastore._rawarray.byteoffset * 8 + self._offset)
+            lengthstring = ", length=%d" % length
+            return "{0}(filename='{1}'{2}{3})".format(self.__class__.__name__,
+                    self._datastore._rawarray.source.name, lengthstring, offsetstring)
+        else:
+            s = self.__str__()
+            lengthstring = ''
+            if s.endswith('...'):
+                lengthstring = " # length={0}".format(length)
+            return "{0}('{1}'){2}".format(self.__class__.__name__, s, lengthstring)
+
+    def __eq__(self, bs):
+        """Return True if two bitstrings have the same binary representation.
+
+        >>> BitArray('0b1110') == '0xe'
+        True
+
+        """
+        try:
+            bs = Bits(bs)
+        except TypeError:
+            return False
+        return equal(self._datastore, bs._datastore)
+
+    def __ne__(self, bs):
+        """Return False if two bitstrings have the same binary representation.
+
+        >>> BitArray('0b111') == '0x7'
+        False
+
+        """
+        return not self.__eq__(bs)
+
+    def __invert__(self):
+        """Return bitstring with every bit inverted.
+
+        Raises Error if the bitstring is empty.
+
+        """
+        if not self.len:
+            raise Error("Cannot invert empty bitstring.")
+        s = self._copy()
+        s._invert_all()
+        return s
+
+    def __lshift__(self, n):
+        """Return bitstring with bits shifted by n to the left.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        n = min(n, self.len)
+        s = self._slice(n, self.len)
+        s._append(Bits(n))
+        return s
+
+    def __rshift__(self, n):
+        """Return bitstring with bits shifted by n to the right.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        if not n:
+            return self._copy()
+        s = self.__class__(length=min(n, self.len))
+        s._append(self[:-n])
+        return s
+
+    def __mul__(self, n):
+        """Return bitstring consisting of n concatenations of self.
+
+        Called for expression of the form 'a = b*3'.
+        n -- The number of concatenations. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot multiply by a negative integer.")
+        if not n:
+            return self.__class__()
+        s = self._copy()
+        s._imul(n)
+        return s
+
+    def __rmul__(self, n):
+        """Return bitstring consisting of n concatenations of self.
+
+        Called for expressions of the form 'a = 3*b'.
+        n -- The number of concatenations. Must be >= 0.
+
+        """
+        return self.__mul__(n)
+
+    def __and__(self, bs):
+        """Bit-wise 'and' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '&' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for & operator.")
+        s = self._copy()
+        s._iand(bs)
+        return s
+
+    def __rand__(self, bs):
+        """Bit-wise 'and' between two bitstrings. Returns new bitstring.
+
+        bs -- the bitstring to '&' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        return self.__and__(bs)
+
+    def __or__(self, bs):
+        """Bit-wise 'or' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '|' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for | operator.")
+        s = self._copy()
+        s._ior(bs)
+        return s
+
+    def __ror__(self, bs):
+        """Bit-wise 'or' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '|' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        return self.__or__(bs)
+
+    def __xor__(self, bs):
+        """Bit-wise 'xor' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '^' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for ^ operator.")
+        s = self._copy()
+        s._ixor(bs)
+        return s
+
+    def __rxor__(self, bs):
+        """Bit-wise 'xor' between two bitstrings. Returns new bitstring.
+
+        bs -- The bitstring to '^' with.
+
+        Raises ValueError if the two bitstrings have differing lengths.
+
+        """
+        return self.__xor__(bs)
+
+    def __contains__(self, bs):
+        """Return whether bs is contained in the current bitstring.
+
+        bs -- The bitstring to search for.
+
+        """
+        # Don't want to change pos
+        try:
+            pos = self._pos
+        except AttributeError:
+            pass
+        found = Bits.find(self, bs, bytealigned=False)
+        try:
+            self._pos = pos
+        except AttributeError:
+            pass
+        return bool(found)
+
+    def __hash__(self):
+        """Return an integer hash of the object."""
+        # We can't in general hash the whole bitstring (it could take hours!)
+        # So instead take some bits from the start and end.
+        if self.len <= 160:
+            # Use the whole bitstring.
+            shorter = self
+        else:
+            # Take 10 bytes from start and end
+            shorter = self[:80] + self[-80:]
+        h = 0
+        for byte in shorter.tobytes():
+            try:
+                h = (h << 4) + ord(byte)
+            except TypeError:
+                # Python 3
+                h = (h << 4) + byte
+            g = h & 0xf0000000
+            if g & (1 << 31):
+                h ^= (g >> 24)
+                h ^= g
+        return h % 1442968193
+
+    # This is only used in Python 2.x...
+    def __nonzero__(self):
+        """Return True if any bits are set to 1, otherwise return False."""
+        return self.any(True)
+
+    # ...whereas this is used in Python 3.x
+    __bool__ = __nonzero__
+
+    def _assertsanity(self):
+        """Check internal self consistency as a debugging aid."""
+        assert self.len >= 0
+        assert 0 <= self._offset, "offset={0}".format(self._offset)
+        assert (self.len + self._offset + 7) // 8 == self._datastore.bytelength + self._datastore.byteoffset
+        return True
+
+    @classmethod
+    def _init_with_token(cls, name, token_length, value):
+        if token_length is not None:
+            token_length = int(token_length)
+        if token_length == 0:
+            return cls()
+        # For pad token just return the length in zero bits
+        if name == 'pad':
+            return cls(token_length)
+
+        if value is None:
+            if token_length is None:
+                error = "Token has no value ({0}=???).".format(name)
+            else:
+                error = "Token has no value ({0}:{1}=???).".format(name, token_length)
+            raise ValueError(error)
+        try:
+            b = cls(**{_tokenname_to_initialiser[name]: value})
+        except KeyError:
+            if name in ('se', 'ue', 'sie', 'uie'):
+                b = cls(**{name: int(value)})
+            elif name in ('uint', 'int', 'uintbe', 'intbe', 'uintle', 'intle', 'uintne', 'intne'):
+                b = cls(**{name: int(value), 'length': token_length})
+            elif name in ('float', 'floatbe', 'floatle', 'floatne'):
+                b = cls(**{name: float(value), 'length': token_length})
+            elif name == 'bool':
+                if value in (1, 'True', '1'):
+                    b = cls(bool=True)
+                elif value in (0, 'False', '0'):
+                    b = cls(bool=False)
+                else:
+                    raise CreationError("bool token can only be 'True' or 'False'.")
+            else:
+                raise CreationError("Can't parse token name {0}.", name)
+        if token_length is not None and b.len != token_length:
+            msg = "Token with length {0} packed with value of length {1} ({2}:{3}={4})."
+            raise CreationError(msg, token_length, b.len, name, token_length, value)
+        return b
+
+    def _clear(self):
+        """Reset the bitstring to an empty state."""
+        self._datastore = ByteStore(bytearray(0))
+
+    def _setauto(self, s, length, offset):
+        """Set bitstring from a bitstring, file, bool, integer, array, iterable or string."""
+        # As s can be so many different things it's important to do the checks
+        # in the correct order, as some types are also other allowed types.
+        # So basestring must be checked before Iterable
+        # and bytes/bytearray before Iterable but after basestring!
+        if isinstance(s, Bits):
+            if length is None:
+                length = s.len - offset
+            self._setbytes_unsafe(s._datastore.rawbytes, length, s._offset + offset)
+            return
+        if isinstance(s, file):
+            if offset is None:
+                offset = 0
+            if length is None:
+                length = os.path.getsize(s.name) * 8 - offset
+            byteoffset, offset = divmod(offset, 8)
+            bytelength = (length + byteoffset * 8 + offset + 7) // 8 - byteoffset
+            m = MmapByteArray(s, bytelength, byteoffset)
+            if length + byteoffset * 8 + offset > m.filelength * 8:
+                raise CreationError("File is not long enough for specified "
+                                    "length and offset.")
+            self._datastore = ConstByteStore(m, length, offset)
+            return
+        if length is not None:
+            raise CreationError("The length keyword isn't applicable to this initialiser.")
+        if offset:
+            raise CreationError("The offset keyword isn't applicable to this initialiser.")
+        if isinstance(s, basestring):
+            bs = self._converttobitstring(s)
+            assert bs._offset == 0
+            self._setbytes_unsafe(bs._datastore.rawbytes, bs.length, 0)
+            return
+        if isinstance(s, (bytes, bytearray)):
+            self._setbytes_unsafe(bytearray(s), len(s) * 8, 0)
+            return
+        if isinstance(s, array.array):
+            b = s.tostring()
+            self._setbytes_unsafe(bytearray(b), len(b) * 8, 0)
+            return
+        if isinstance(s, numbers.Integral):
+            # Initialise with s zero bits.
+            if s < 0:
+                msg = "Can't create bitstring of negative length {0}."
+                raise CreationError(msg, s)
+            data = bytearray((s + 7) // 8)
+            self._datastore = ByteStore(data, s, 0)
+            return
+        if isinstance(s, collections.Iterable):
+            # Evaluate each item as True or False and set bits to 1 or 0.
+            self._setbin_unsafe(''.join(str(int(bool(x))) for x in s))
+            return
+        raise TypeError("Cannot initialise bitstring from {0}.".format(type(s)))
+
+    def _setfile(self, filename, length, offset):
+        """Use file as source of bits."""
+        source = open(filename, 'rb')
+        if offset is None:
+            offset = 0
+        if length is None:
+            length = os.path.getsize(source.name) * 8 - offset
+        byteoffset, offset = divmod(offset, 8)
+        bytelength = (length + byteoffset * 8 + offset + 7) // 8 - byteoffset
+        m = MmapByteArray(source, bytelength, byteoffset)
+        if length + byteoffset * 8 + offset > m.filelength * 8:
+            raise CreationError("File is not long enough for specified "
+                                "length and offset.")
+        self._datastore = ConstByteStore(m, length, offset)
+
+    def _setbytes_safe(self, data, length=None, offset=0):
+        """Set the data from a string."""
+        data = bytearray(data)
+        if length is None:
+            # Use to the end of the data
+            length = len(data)*8 - offset
+            self._datastore = ByteStore(data, length, offset)
+        else:
+            if length + offset > len(data) * 8:
+                msg = "Not enough data present. Need {0} bits, have {1}."
+                raise CreationError(msg, length + offset, len(data) * 8)
+            if length == 0:
+                self._datastore = ByteStore(bytearray(0))
+            else:
+                self._datastore = ByteStore(data, length, offset)
+
+    def _setbytes_unsafe(self, data, length, offset):
+        """Unchecked version of _setbytes_safe."""
+        self._datastore = ByteStore(data[:], length, offset)
+        assert self._assertsanity()
+
+    def _readbytes(self, length, start):
+        """Read bytes and return them. Note that length is in bits."""
+        assert length % 8 == 0
+        assert start + length <= self.len
+        if not (start + self._offset) % 8:
+            return bytes(self._datastore.getbyteslice((start + self._offset) // 8,
+                                                      (start + self._offset + length) // 8))
+        return self._slice(start, start + length).tobytes()
+
+    def _getbytes(self):
+        """Return the data as an ordinary string."""
+        if self.len % 8:
+            raise InterpretError("Cannot interpret as bytes unambiguously - "
+                                 "not multiple of 8 bits.")
+        return self._readbytes(self.len, 0)
+
+    def _setuint(self, uint, length=None):
+        """Reset the bitstring to have given unsigned int interpretation."""
+        try:
+            if length is None:
+                # Use the whole length. Deliberately not using .len here.
+                length = self._datastore.bitlength
+        except AttributeError:
+            # bitstring doesn't have a _datastore as it hasn't been created!
+            pass
+        # TODO: All this checking code should be hoisted out of here!
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with a "
+                                "uint initialiser.")
+        if uint >= (1 << length):
+            msg = "{0} is too large an unsigned integer for a bitstring of length {1}. "\
+                  "The allowed range is [0, {2}]."
+            raise CreationError(msg, uint, length, (1 << length) - 1)
+        if uint < 0:
+            raise CreationError("uint cannot be initialsed by a negative number.")
+        s = hex(uint)[2:]
+        s = s.rstrip('L')
+        if len(s) & 1:
+            s = '0' + s
+        try:
+            data = bytes.fromhex(s)
+        except AttributeError:
+            # the Python 2.x way
+            data = binascii.unhexlify(s)
+        # Now add bytes as needed to get the right length.
+        extrabytes = ((length + 7) // 8) - len(data)
+        if extrabytes > 0:
+            data = b'\x00' * extrabytes + data
+        offset = 8 - (length % 8)
+        if offset == 8:
+            offset = 0
+        self._setbytes_unsafe(bytearray(data), length, offset)
+
+    def _readuint(self, length, start):
+        """Read bits and interpret as an unsigned int."""
+        if not length:
+            raise InterpretError("Cannot interpret a zero length bitstring "
+                                           "as an integer.")
+        offset = self._offset
+        startbyte = (start + offset) // 8
+        endbyte = (start + offset + length - 1) // 8
+
+        b = binascii.hexlify(bytes(self._datastore.getbyteslice(startbyte, endbyte + 1)))
+        assert b
+        i = int(b, 16)
+        final_bits = 8 - ((start + offset + length) % 8)
+        if final_bits != 8:
+            i >>= final_bits
+        i &= (1 << length) - 1
+        return i
+
+    def _getuint(self):
+        """Return data as an unsigned int."""
+        return self._readuint(self.len, 0)
+
+    def _setint(self, int_, length=None):
+        """Reset the bitstring to have given signed int interpretation."""
+        # If no length given, and we've previously been given a length, use it.
+        if length is None and hasattr(self, 'len') and self.len != 0:
+            length = self.len
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with an int initialiser.")
+        if int_ >= (1 << (length - 1)) or int_ < -(1 << (length - 1)):
+            raise CreationError("{0} is too large a signed integer for a bitstring of length {1}. "
+                                "The allowed range is [{2}, {3}].", int_, length, -(1 << (length - 1)),
+                                (1 << (length - 1)) - 1)
+        if int_ >= 0:
+            self._setuint(int_, length)
+            return
+        # TODO: We should decide whether to just use the _setuint, or to do the bit flipping,
+        # based upon which will be quicker. If the -ive number is less than half the maximum
+        # possible then it's probably quicker to do the bit flipping...
+
+        # Do the 2's complement thing. Add one, set to minus number, then flip bits.
+        int_ += 1
+        self._setuint(-int_, length)
+        self._invert_all()
+
+    def _readint(self, length, start):
+        """Read bits and interpret as a signed int"""
+        ui = self._readuint(length, start)
+        if not ui >> (length - 1):
+            # Top bit not set, number is positive
+            return ui
+        # Top bit is set, so number is negative
+        tmp = (~(ui - 1)) & ((1 << length) - 1)
+        return -tmp
+
+    def _getint(self):
+        """Return data as a two's complement signed int."""
+        return self._readint(self.len, 0)
+
+    def _setuintbe(self, uintbe, length=None):
+        """Set the bitstring to a big-endian unsigned int interpretation."""
+        if length is not None and length % 8 != 0:
+            raise CreationError("Big-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setuint(uintbe, length)
+
+    def _readuintbe(self, length, start):
+        """Read bits and interpret as a big-endian unsigned int."""
+        if length % 8:
+            raise InterpretError("Big-endian integers must be whole-byte. "
+                                 "Length = {0} bits.", length)
+        return self._readuint(length, start)
+
+    def _getuintbe(self):
+        """Return data as a big-endian two's complement unsigned int."""
+        return self._readuintbe(self.len, 0)
+
+    def _setintbe(self, intbe, length=None):
+        """Set bitstring to a big-endian signed int interpretation."""
+        if length is not None and length % 8 != 0:
+            raise CreationError("Big-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setint(intbe, length)
+
+    def _readintbe(self, length, start):
+        """Read bits and interpret as a big-endian signed int."""
+        if length % 8:
+            raise InterpretError("Big-endian integers must be whole-byte. "
+                                 "Length = {0} bits.", length)
+        return self._readint(length, start)
+
+    def _getintbe(self):
+        """Return data as a big-endian two's complement signed int."""
+        return self._readintbe(self.len, 0)
+
+    def _setuintle(self, uintle, length=None):
+        if length is not None and length % 8 != 0:
+            raise CreationError("Little-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setuint(uintle, length)
+        self._reversebytes(0, self.len)
+
+    def _readuintle(self, length, start):
+        """Read bits and interpret as a little-endian unsigned int."""
+        if length % 8:
+            raise InterpretError("Little-endian integers must be whole-byte. "
+                                 "Length = {0} bits.", length)
+        assert start + length <= self.len
+        absolute_pos = start + self._offset
+        startbyte, offset = divmod(absolute_pos, 8)
+        val = 0
+        if not offset:
+            endbyte = (absolute_pos + length - 1) // 8
+            chunksize = 4 # for 'L' format
+            while endbyte - chunksize + 1 >= startbyte:
+                val <<= 8 * chunksize
+                val += struct.unpack('<L', bytes(self._datastore.getbyteslice(endbyte + 1 - chunksize, endbyte + 1)))[0]
+                endbyte -= chunksize
+            for b in xrange(endbyte, startbyte - 1, -1):
+                val <<= 8
+                val += self._datastore.getbyte(b)
+        else:
+            data = self._slice(start, start + length)
+            assert data.len % 8 == 0
+            data._reversebytes(0, self.len)
+            for b in bytearray(data.bytes):
+                val <<= 8
+                val += b
+        return val
+
+    def _getuintle(self):
+        return self._readuintle(self.len, 0)
+
+    def _setintle(self, intle, length=None):
+        if length is not None and length % 8 != 0:
+            raise CreationError("Little-endian integers must be whole-byte. "
+                                "Length = {0} bits.", length)
+        self._setint(intle, length)
+        self._reversebytes(0, self.len)
+
+    def _readintle(self, length, start):
+        """Read bits and interpret as a little-endian signed int."""
+        ui = self._readuintle(length, start)
+        if not ui >> (length - 1):
+            # Top bit not set, number is positive
+            return ui
+        # Top bit is set, so number is negative
+        tmp = (~(ui - 1)) & ((1 << length) - 1)
+        return -tmp
+
+    def _getintle(self):
+        return self._readintle(self.len, 0)
+
+    def _setfloat(self, f, length=None):
+        # If no length given, and we've previously been given a length, use it.
+        if length is None and hasattr(self, 'len') and self.len != 0:
+            length = self.len
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with a "
+                                "float initialiser.")
+        if length == 32:
+            b = struct.pack('>f', f)
+        elif length == 64:
+            b = struct.pack('>d', f)
+        else:
+            raise CreationError("floats can only be 32 or 64 bits long, "
+                                "not {0} bits", length)
+        self._setbytes_unsafe(bytearray(b), length, 0)
+
+    def _readfloat(self, length, start):
+        """Read bits and interpret as a float."""
+        if not (start + self._offset) % 8:
+            startbyte = (start + self._offset) // 8
+            if length == 32:
+                f, = struct.unpack('>f', bytes(self._datastore.getbyteslice(startbyte, startbyte + 4)))
+            elif length == 64:
+                f, = struct.unpack('>d', bytes(self._datastore.getbyteslice(startbyte, startbyte + 8)))
+        else:
+            if length == 32:
+                f, = struct.unpack('>f', self._readbytes(32, start))
+            elif length == 64:
+                f, = struct.unpack('>d', self._readbytes(64, start))
+        try:
+            return f
+        except NameError:
+            raise InterpretError("floats can only be 32 or 64 bits long, not {0} bits", length)
+
+    def _getfloat(self):
+        """Interpret the whole bitstring as a float."""
+        return self._readfloat(self.len, 0)
+
+    def _setfloatle(self, f, length=None):
+        # If no length given, and we've previously been given a length, use it.
+        if length is None and hasattr(self, 'len') and self.len != 0:
+            length = self.len
+        if length is None or length == 0:
+            raise CreationError("A non-zero length must be specified with a "
+                                "float initialiser.")
+        if length == 32:
+            b = struct.pack('<f', f)
+        elif length == 64:
+            b = struct.pack('<d', f)
+        else:
+            raise CreationError("floats can only be 32 or 64 bits long, "
+                                "not {0} bits", length)
+        self._setbytes_unsafe(bytearray(b), length, 0)
+
+    def _readfloatle(self, length, start):
+        """Read bits and interpret as a little-endian float."""
+        startbyte, offset = divmod(start + self._offset, 8)
+        if not offset:
+            if length == 32:
+                f, = struct.unpack('<f', bytes(self._datastore.getbyteslice(startbyte, startbyte + 4)))
+            elif length == 64:
+                f, = struct.unpack('<d', bytes(self._datastore.getbyteslice(startbyte, startbyte + 8)))
+        else:
+            if length == 32:
+                f, = struct.unpack('<f', self._readbytes(32, start))
+            elif length == 64:
+                f, = struct.unpack('<d', self._readbytes(64, start))
+        try:
+            return f
+        except NameError:
+            raise InterpretError("floats can only be 32 or 64 bits long, "
+                                 "not {0} bits", length)
+
+    def _getfloatle(self):
+        """Interpret the whole bitstring as a little-endian float."""
+        return self._readfloatle(self.len, 0)
+
+    def _setue(self, i):
+        """Initialise bitstring with unsigned exponential-Golomb code for integer i.
+
+        Raises CreationError if i < 0.
+
+        """
+        if i < 0:
+            raise CreationError("Cannot use negative initialiser for unsigned "
+                                "exponential-Golomb.")
+        if not i:
+            self._setbin_unsafe('1')
+            return
+        tmp = i + 1
+        leadingzeros = -1
+        while tmp > 0:
+            tmp >>= 1
+            leadingzeros += 1
+        remainingpart = i + 1 - (1 << leadingzeros)
+        binstring = '0' * leadingzeros + '1' + Bits(uint=remainingpart,
+                                                             length=leadingzeros).bin
+        self._setbin_unsafe(binstring)
+
+    def _readue(self, pos):
+        """Return interpretation of next bits as unsigned exponential-Golomb code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        oldpos = pos
+        try:
+            while not self[pos]:
+                pos += 1
+        except IndexError:
+            raise ReadError("Read off end of bitstring trying to read code.")
+        leadingzeros = pos - oldpos
+        codenum = (1 << leadingzeros) - 1
+        if leadingzeros > 0:
+            if pos + leadingzeros + 1 > self.len:
+                raise ReadError("Read off end of bitstring trying to read code.")
+            codenum += self._readuint(leadingzeros, pos + 1)
+            pos += leadingzeros + 1
+        else:
+            assert codenum == 0
+            pos += 1
+        return codenum, pos
+
+    def _getue(self):
+        """Return data as unsigned exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readue(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single exponential-Golomb code.")
+        return value
+
+    def _setse(self, i):
+        """Initialise bitstring with signed exponential-Golomb code for integer i."""
+        if i > 0:
+            u = (i * 2) - 1
+        else:
+            u = -2 * i
+        self._setue(u)
+
+    def _getse(self):
+        """Return data as signed exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readse(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single exponential-Golomb code.")
+        return value
+
+    def _readse(self, pos):
+        """Return interpretation of next bits as a signed exponential-Golomb code.
+
+        Advances position to after the read code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        codenum, pos = self._readue(pos)
+        m = (codenum + 1) // 2
+        if not codenum % 2:
+            return -m, pos
+        else:
+            return m, pos
+
+    def _setuie(self, i):
+        """Initialise bitstring with unsigned interleaved exponential-Golomb code for integer i.
+
+        Raises CreationError if i < 0.
+
+        """
+        if i < 0:
+            raise CreationError("Cannot use negative initialiser for unsigned "
+                                "interleaved exponential-Golomb.")
+        self._setbin_unsafe('1' if i == 0 else '0' + '0'.join(bin(i + 1)[3:]) + '1')
+
+    def _readuie(self, pos):
+        """Return interpretation of next bits as unsigned interleaved exponential-Golomb code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        try:
+            codenum = 1
+            while not self[pos]:
+                pos += 1
+                codenum <<= 1
+                codenum += self[pos]
+                pos += 1
+            pos += 1
+        except IndexError:
+            raise ReadError("Read off end of bitstring trying to read code.")
+        codenum -= 1
+        return codenum, pos
+
+    def _getuie(self):
+        """Return data as unsigned interleaved exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readuie(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single interleaved exponential-Golomb code.")
+        return value
+
+    def _setsie(self, i):
+        """Initialise bitstring with signed interleaved exponential-Golomb code for integer i."""
+        if not i:
+            self._setbin_unsafe('1')
+        else:
+            self._setuie(abs(i))
+            self._append(Bits([i < 0]))
+
+    def _getsie(self):
+        """Return data as signed interleaved exponential-Golomb code.
+
+        Raises InterpretError if bitstring is not a single exponential-Golomb code.
+
+        """
+        try:
+            value, newpos = self._readsie(0)
+            if value is None or newpos != self.len:
+                raise ReadError
+        except ReadError:
+            raise InterpretError("Bitstring is not a single interleaved exponential-Golomb code.")
+        return value
+
+    def _readsie(self, pos):
+        """Return interpretation of next bits as a signed interleaved exponential-Golomb code.
+
+        Advances position to after the read code.
+
+        Raises ReadError if the end of the bitstring is encountered while
+        reading the code.
+
+        """
+        codenum, pos = self._readuie(pos)
+        if not codenum:
+            return 0, pos
+        try:
+            if self[pos]:
+                return -codenum, pos + 1
+            else:
+                return codenum, pos + 1
+        except IndexError:
+            raise ReadError("Read off end of bitstring trying to read code.")
+
+    def _setbool(self, value):
+        # We deliberately don't want to have implicit conversions to bool here.
+        # If we did then it would be difficult to deal with the 'False' string.
+        if value in (1, 'True'):
+            self._setbytes_unsafe(bytearray(b'\x80'), 1, 0)
+        elif value in (0, 'False'):
+            self._setbytes_unsafe(bytearray(b'\x00'), 1, 0)
+        else:
+            raise CreationError('Cannot initialise boolean with {0}.', value)
+
+    def _getbool(self):
+        if self.length != 1:
+            msg = "For a bool interpretation a bitstring must be 1 bit long, not {0} bits."
+            raise InterpretError(msg, self.length)
+        return self[0]
+
+    def _readbool(self, pos):
+        return self[pos], pos + 1
+
+    def _setbin_safe(self, binstring):
+        """Reset the bitstring to the value given in binstring."""
+        binstring = tidy_input_string(binstring)
+        # remove any 0b if present
+        binstring = binstring.replace('0b', '')
+        self._setbin_unsafe(binstring)
+
+    def _setbin_unsafe(self, binstring):
+        """Same as _setbin_safe, but input isn't sanity checked. binstring mustn't start with '0b'."""
+        length = len(binstring)
+        # pad with zeros up to byte boundary if needed
+        boundary = ((length + 7) // 8) * 8
+        padded_binstring = binstring + '0' * (boundary - length)\
+                           if len(binstring) < boundary else binstring
+        try:
+            bytelist = [int(padded_binstring[x:x + 8], 2)
+                        for x in xrange(0, len(padded_binstring), 8)]
+        except ValueError:
+            raise CreationError("Invalid character in bin initialiser {0}.", binstring)
+        self._setbytes_unsafe(bytearray(bytelist), length, 0)
+
+    def _readbin(self, length, start):
+        """Read bits and interpret as a binary string."""
+        if not length:
+            return ''
+        # Get the byte slice containing our bit slice
+        startbyte, startoffset = divmod(start + self._offset, 8)
+        endbyte = (start + self._offset + length - 1) // 8
+        b = self._datastore.getbyteslice(startbyte, endbyte + 1)
+        # Convert to a string of '0' and '1's (via a hex string an and int!)
+        try:
+            c = "{:0{}b}".format(int(binascii.hexlify(b), 16), 8*len(b))
+        except TypeError:
+            # Hack to get Python 2.6 working
+            c = "{0:0{1}b}".format(int(binascii.hexlify(str(b)), 16), 8*len(b))
+        # Finally chop off any extra bits.
+        return c[startoffset:startoffset + length]
+
+    def _getbin(self):
+        """Return interpretation as a binary string."""
+        return self._readbin(self.len, 0)
+
+    def _setoct(self, octstring):
+        """Reset the bitstring to have the value given in octstring."""
+        octstring = tidy_input_string(octstring)
+        # remove any 0o if present
+        octstring = octstring.replace('0o', '')
+        binlist = []
+        for i in octstring:
+            try:
+                if not 0 <= int(i) < 8:
+                    raise ValueError
+                binlist.append(OCT_TO_BITS[int(i)])
+            except ValueError:
+                raise CreationError("Invalid symbol '{0}' in oct initialiser.", i)
+        self._setbin_unsafe(''.join(binlist))
+
+    def _readoct(self, length, start):
+        """Read bits and interpret as an octal string."""
+        if length % 3:
+            raise InterpretError("Cannot convert to octal unambiguously - "
+                                 "not multiple of 3 bits.")
+        if not length:
+            return ''
+        # Get main octal bit by converting from int.
+        # Strip starting 0 or 0o depending on Python version.
+        end = oct(self._readuint(length, start))[LEADING_OCT_CHARS:]
+        if end.endswith('L'):
+            end = end[:-1]
+        middle = '0' * (length // 3 - len(end))
+        return middle + end
+
+    def _getoct(self):
+        """Return interpretation as an octal string."""
+        return self._readoct(self.len, 0)
+
+    def _sethex(self, hexstring):
+        """Reset the bitstring to have the value given in hexstring."""
+        hexstring = tidy_input_string(hexstring)
+        # remove any 0x if present
+        hexstring = hexstring.replace('0x', '')
+        length = len(hexstring)
+        if length % 2:
+            hexstring += '0'
+        try:
+            try:
+                data = bytearray.fromhex(hexstring)
+            except TypeError:
+                # Python 2.6 needs a unicode string (a bug). 2.7 and 3.x work fine.
+                data = bytearray.fromhex(unicode(hexstring))
+        except ValueError:
+            raise CreationError("Invalid symbol in hex initialiser.")
+        self._setbytes_unsafe(data, length * 4, 0)
+
+    def _readhex(self, length, start):
+        """Read bits and interpret as a hex string."""
+        if length % 4:
+            raise InterpretError("Cannot convert to hex unambiguously - "
+                                           "not multiple of 4 bits.")
+        if not length:
+            return ''
+        s = self._slice(start, start + length).tobytes()
+        try:
+            s = s.hex() # Available in Python 3.5
+        except AttributeError:
+            # This monstrosity is the only thing I could get to work for both 2.6 and 3.1.
+            # TODO: Is utf-8 really what we mean here?
+            s = str(binascii.hexlify(s).decode('utf-8'))
+        # If there's one nibble too many then cut it off
+        return s[:-1] if (length // 4) % 2 else s
+
+    def _gethex(self):
+        """Return the hexadecimal representation as a string prefixed with '0x'.
+
+        Raises an InterpretError if the bitstring's length is not a multiple of 4.
+
+        """
+        return self._readhex(self.len, 0)
+
+    def _getoffset(self):
+        return self._datastore.offset
+
+    def _getlength(self):
+        """Return the length of the bitstring in bits."""
+        return self._datastore.bitlength
+
+    def _ensureinmemory(self):
+        """Ensure the data is held in memory, not in a file."""
+        self._setbytes_unsafe(self._datastore.getbyteslice(0, self._datastore.bytelength),
+                              self.len, self._offset)
+
+    @classmethod
+    def _converttobitstring(cls, bs, offset=0, cache={}):
+        """Convert bs to a bitstring and return it.
+
+        offset gives the suggested bit offset of first significant
+        bit, to optimise append etc.
+
+        """
+        if isinstance(bs, Bits):
+            return bs
+        try:
+            return cache[(bs, offset)]
+        except KeyError:
+            if isinstance(bs, basestring):
+                b = cls()
+                try:
+                    _, tokens = tokenparser(bs)
+                except ValueError as e:
+                    raise CreationError(*e.args)
+                if tokens:
+                    b._append(Bits._init_with_token(*tokens[0]))
+                    b._datastore = offsetcopy(b._datastore, offset)
+                    for token in tokens[1:]:
+                        b._append(Bits._init_with_token(*token))
+                assert b._assertsanity()
+                assert b.len == 0 or b._offset == offset
+                if len(cache) < CACHE_SIZE:
+                    cache[(bs, offset)] = b
+                return b
+        except TypeError:
+            # Unhashable type
+            pass
+        return cls(bs)
+
+    def _copy(self):
+        """Create and return a new copy of the Bits (always in memory)."""
+        s_copy = self.__class__()
+        s_copy._setbytes_unsafe(self._datastore.getbyteslice(0, self._datastore.bytelength),
+                                self.len, self._offset)
+        return s_copy
+
+    def _slice(self, start, end):
+        """Used internally to get a slice, without error checking."""
+        if end == start:
+            return self.__class__()
+        offset = self._offset
+        startbyte, newoffset = divmod(start + offset, 8)
+        endbyte = (end + offset - 1) // 8
+        bs = self.__class__()
+        bs._setbytes_unsafe(self._datastore.getbyteslice(startbyte, endbyte + 1), end - start, newoffset)
+        return bs
+
+    def _readtoken(self, name, pos, length):
+        """Reads a token from the bitstring and returns the result."""
+        if length is not None and int(length) > self.length - pos:
+            raise ReadError("Reading off the end of the data. "
+                            "Tried to read {0} bits when only {1} available.".format(int(length), self.length - pos))
+        try:
+            val = name_to_read[name](self, length, pos)
+            return val, pos + length
+        except KeyError:
+            if name == 'pad':
+                return None, pos + length
+            raise ValueError("Can't parse token {0}:{1}".format(name, length))
+        except TypeError:
+            # This is for the 'ue', 'se' and 'bool' tokens. They will also return the new pos.
+            return name_to_read[name](self, pos)
+
+    def _append(self, bs):
+        """Append a bitstring to the current bitstring."""
+        self._datastore._appendstore(bs._datastore)
+
+    def _prepend(self, bs):
+        """Prepend a bitstring to the current bitstring."""
+        self._datastore._prependstore(bs._datastore)
+
+    def _reverse(self):
+        """Reverse all bits in-place."""
+        # Reverse the contents of each byte
+        n = [BYTE_REVERSAL_DICT[b] for b in self._datastore.rawbytes]
+        # Then reverse the order of the bytes
+        n.reverse()
+        # The new offset is the number of bits that were unused at the end.
+        newoffset = 8 - (self._offset + self.len) % 8
+        if newoffset == 8:
+            newoffset = 0
+        self._setbytes_unsafe(bytearray().join(n), self.length, newoffset)
+
+    def _truncatestart(self, bits):
+        """Truncate bits from the start of the bitstring."""
+        assert 0 <= bits <= self.len
+        if not bits:
+            return
+        if bits == self.len:
+            self._clear()
+            return
+        bytepos, offset = divmod(self._offset + bits, 8)
+        self._setbytes_unsafe(self._datastore.getbyteslice(bytepos, self._datastore.bytelength), self.len - bits,
+                              offset)
+        assert self._assertsanity()
+
+    def _truncateend(self, bits):
+        """Truncate bits from the end of the bitstring."""
+        assert 0 <= bits <= self.len
+        if not bits:
+            return
+        if bits == self.len:
+            self._clear()
+            return
+        newlength_in_bytes = (self._offset + self.len - bits + 7) // 8
+        self._setbytes_unsafe(self._datastore.getbyteslice(0, newlength_in_bytes), self.len - bits,
+                              self._offset)
+        assert self._assertsanity()
+
+    def _insert(self, bs, pos):
+        """Insert bs at pos."""
+        assert 0 <= pos <= self.len
+        if pos > self.len // 2:
+            # Inserting nearer end, so cut off end.
+            end = self._slice(pos, self.len)
+            self._truncateend(self.len - pos)
+            self._append(bs)
+            self._append(end)
+        else:
+            # Inserting nearer start, so cut off start.
+            start = self._slice(0, pos)
+            self._truncatestart(pos)
+            self._prepend(bs)
+            self._prepend(start)
+        try:
+            self._pos = pos + bs.len
+        except AttributeError:
+            pass
+        assert self._assertsanity()
+
+    def _overwrite(self, bs, pos):
+        """Overwrite with bs at pos."""
+        assert 0 <= pos < self.len
+        if bs is self:
+            # Just overwriting with self, so do nothing.
+            assert pos == 0
+            return
+        firstbytepos = (self._offset + pos) // 8
+        lastbytepos = (self._offset + pos + bs.len - 1) // 8
+        bytepos, bitoffset = divmod(self._offset + pos, 8)
+        if firstbytepos == lastbytepos:
+            mask = ((1 << bs.len) - 1) << (8 - bs.len - bitoffset)
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) & (~mask))
+            d = offsetcopy(bs._datastore, bitoffset)
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) | (d.getbyte(0) & mask))
+        else:
+            # Do first byte
+            mask = (1 << (8 - bitoffset)) - 1
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) & (~mask))
+            d = offsetcopy(bs._datastore, bitoffset)
+            self._datastore.setbyte(bytepos, self._datastore.getbyte(bytepos) | (d.getbyte(0) & mask))
+            # Now do all the full bytes
+            self._datastore.setbyteslice(firstbytepos + 1, lastbytepos, d.getbyteslice(1, lastbytepos - firstbytepos))
+            # and finally the last byte
+            bitsleft = (self._offset + pos + bs.len) % 8
+            if not bitsleft:
+                bitsleft = 8
+            mask = (1 << (8 - bitsleft)) - 1
+            self._datastore.setbyte(lastbytepos, self._datastore.getbyte(lastbytepos) & mask)
+            self._datastore.setbyte(lastbytepos,
+                                    self._datastore.getbyte(lastbytepos) | (d.getbyte(d.bytelength - 1) & ~mask))
+        assert self._assertsanity()
+
+    def _delete(self, bits, pos):
+        """Delete bits at pos."""
+        assert 0 <= pos <= self.len
+        assert pos + bits <= self.len
+        if not pos:
+            # Cutting bits off at the start.
+            self._truncatestart(bits)
+            return
+        if pos + bits == self.len:
+            # Cutting bits off at the end.
+            self._truncateend(bits)
+            return
+        if pos > self.len - pos - bits:
+            # More bits before cut point than after it, so do bit shifting
+            # on the final bits.
+            end = self._slice(pos + bits, self.len)
+            assert self.len - pos > 0
+            self._truncateend(self.len - pos)
+            self._append(end)
+            return
+        # More bits after the cut point than before it.
+        start = self._slice(0, pos)
+        self._truncatestart(pos + bits)
+        self._prepend(start)
+        return
+
+    def _reversebytes(self, start, end):
+        """Reverse bytes in-place."""
+        # Make the start occur on a byte boundary
+        # TODO: We could be cleverer here to avoid changing the offset.
+        newoffset = 8 - (start % 8)
+        if newoffset == 8:
+            newoffset = 0
+        self._datastore = offsetcopy(self._datastore, newoffset)
+        # Now just reverse the byte data
+        toreverse = bytearray(self._datastore.getbyteslice((newoffset + start) // 8, (newoffset + end) // 8))
+        toreverse.reverse()
+        self._datastore.setbyteslice((newoffset + start) // 8, (newoffset + end) // 8, toreverse)
+
+    def _set(self, pos):
+        """Set bit at pos to 1."""
+        assert 0 <= pos < self.len
+        self._datastore.setbit(pos)
+
+    def _unset(self, pos):
+        """Set bit at pos to 0."""
+        assert 0 <= pos < self.len
+        self._datastore.unsetbit(pos)
+
+    def _invert(self, pos):
+        """Flip bit at pos 1<->0."""
+        assert 0 <= pos < self.len
+        self._datastore.invertbit(pos)
+
+    def _invert_all(self):
+        """Invert every bit."""
+        set = self._datastore.setbyte
+        get = self._datastore.getbyte
+        for p in xrange(self._datastore.byteoffset, self._datastore.byteoffset + self._datastore.bytelength):
+            set(p, 256 + ~get(p))
+
+    def _ilshift(self, n):
+        """Shift bits by n to the left in place. Return self."""
+        assert 0 < n <= self.len
+        self._append(Bits(n))
+        self._truncatestart(n)
+        return self
+
+    def _irshift(self, n):
+        """Shift bits by n to the right in place. Return self."""
+        assert 0 < n <= self.len
+        self._prepend(Bits(n))
+        self._truncateend(n)
+        return self
+
+    def _imul(self, n):
+        """Concatenate n copies of self in place. Return self."""
+        assert n >= 0
+        if not n:
+            self._clear()
+            return self
+        m = 1
+        old_len = self.len
+        while m * 2 < n:
+            self._append(self)
+            m *= 2
+        self._append(self[0:(n - m) * old_len])
+        return self
+
+    def _inplace_logical_helper(self, bs, f):
+        """Helper function containing most of the __ior__, __iand__, __ixor__ code."""
+        # Give the two bitstrings the same offset (modulo 8)
+        self_byteoffset, self_bitoffset = divmod(self._offset, 8)
+        bs_byteoffset, bs_bitoffset = divmod(bs._offset, 8)
+        if bs_bitoffset != self_bitoffset:
+            if not self_bitoffset:
+                bs._datastore = offsetcopy(bs._datastore, 0)
+            else:
+                self._datastore = offsetcopy(self._datastore, bs_bitoffset)
+        a = self._datastore.rawbytes
+        b = bs._datastore.rawbytes
+        for i in xrange(len(a)):
+            a[i] = f(a[i + self_byteoffset], b[i + bs_byteoffset])
+        return self
+
+    def _ior(self, bs):
+        return self._inplace_logical_helper(bs, operator.ior)
+
+    def _iand(self, bs):
+        return self._inplace_logical_helper(bs, operator.iand)
+
+    def _ixor(self, bs):
+        return self._inplace_logical_helper(bs, operator.xor)
+
+    def _readbits(self, length, start):
+        """Read some bits from the bitstring and return newly constructed bitstring."""
+        return self._slice(start, start + length)
+
+    def _validate_slice(self, start, end):
+        """Validate start and end and return them as positive bit positions."""
+        if start is None:
+            start = 0
+        elif start < 0:
+            start += self.len
+        if end is None:
+            end = self.len
+        elif end < 0:
+            end += self.len
+        if not 0 <= end <= self.len:
+            raise ValueError("end is not a valid position in the bitstring.")
+        if not 0 <= start <= self.len:
+            raise ValueError("start is not a valid position in the bitstring.")
+        if end < start:
+            raise ValueError("end must not be less than start.")
+        return start, end
+
+    def unpack(self, fmt, **kwargs):
+        """Interpret the whole bitstring using fmt and return list.
+
+        fmt -- A single string or a list of strings with comma separated tokens
+               describing how to interpret the bits in the bitstring. Items
+               can also be integers, for reading new bitstring of the given length.
+        kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+                  format string will be replaced with their given value.
+
+        Raises ValueError if the format is not understood. If not enough bits
+        are available then all bits to the end of the bitstring will be used.
+
+        See the docstring for 'read' for token examples.
+
+        """
+        return self._readlist(fmt, 0, **kwargs)[0]
+
+    def _readlist(self, fmt, pos, **kwargs):
+        tokens = []
+        stretchy_token = None
+        if isinstance(fmt, basestring):
+            fmt = [fmt]
+        # Not very optimal this, but replace integers with 'bits' tokens
+        # TODO: optimise
+        for i, f in enumerate(fmt):
+            if isinstance(f, numbers.Integral):
+                fmt[i] = "bits:{0}".format(f)
+        for f_item in fmt:
+            stretchy, tkns = tokenparser(f_item, tuple(sorted(kwargs.keys())))
+            if stretchy:
+                if stretchy_token:
+                    raise Error("It's not possible to have more than one 'filler' token.")
+                stretchy_token = stretchy
+            tokens.extend(tkns)
+        if not stretchy_token:
+            lst = []
+            for name, length, _ in tokens:
+                if length in kwargs:
+                    length = kwargs[length]
+                    if name == 'bytes':
+                        length *= 8
+                if name in kwargs and length is None:
+                    # Using default 'uint' - the name is really the length.
+                    value, pos = self._readtoken('uint', pos, kwargs[name])
+                    lst.append(value)
+                    continue
+                value, pos = self._readtoken(name, pos, length)
+                if value is not None: # Don't append pad tokens
+                    lst.append(value)
+            return lst, pos
+        stretchy_token = False
+        bits_after_stretchy_token = 0
+        for token in tokens:
+            name, length, _ = token
+            if length in kwargs:
+                length = kwargs[length]
+                if name == 'bytes':
+                    length *= 8
+            if name in kwargs and length is None:
+                # Default 'uint'.
+                length = kwargs[name]
+            if stretchy_token:
+                if name in ('se', 'ue', 'sie', 'uie'):
+                    raise Error("It's not possible to parse a variable"
+                                "length token after a 'filler' token.")
+                else:
+                    if length is None:
+                        raise Error("It's not possible to have more than "
+                                    "one 'filler' token.")
+                    bits_after_stretchy_token += length
+            if length is None and name not in ('se', 'ue', 'sie', 'uie'):
+                assert not stretchy_token
+                stretchy_token = token
+        bits_left = self.len - pos
+        return_values = []
+        for token in tokens:
+            name, length, _ = token
+            if token is stretchy_token:
+                # Set length to the remaining bits
+                length = max(bits_left - bits_after_stretchy_token, 0)
+            if length in kwargs:
+                length = kwargs[length]
+                if name == 'bytes':
+                    length *= 8
+            if name in kwargs and length is None:
+                # Default 'uint'
+                length = kwargs[name]
+            if length is not None:
+                bits_left -= length
+            value, pos = self._readtoken(name, pos, length)
+            if value is not None:
+                return_values.append(value)
+        return return_values, pos
+
+    def _findbytes(self, bytes_, start, end, bytealigned):
+        """Quicker version of find when everything's whole byte
+        and byte aligned.
+
+        """
+        assert self._datastore.offset == 0
+        assert bytealigned is True
+        # Extract data bytes from bitstring to be found.
+        bytepos = (start + 7) // 8
+        found = False
+        p = bytepos
+        finalpos = end // 8
+        increment = max(1024, len(bytes_) * 10)
+        buffersize = increment + len(bytes_)
+        while p < finalpos:
+            # Read in file or from memory in overlapping chunks and search the chunks.
+            buf = bytearray(self._datastore.getbyteslice(p, min(p + buffersize, finalpos)))
+            pos = buf.find(bytes_)
+            if pos != -1:
+                found = True
+                p += pos
+                break
+            p += increment
+        if not found:
+            return ()
+        return (p * 8,)
+
+    def _findregex(self, reg_ex, start, end, bytealigned):
+        """Find first occurrence of a compiled regular expression.
+
+        Note that this doesn't support arbitrary regexes, in particular they
+        must match a known length.
+
+        """
+        p = start
+        length = len(reg_ex.pattern)
+        # We grab overlapping chunks of the binary representation and
+        # do an ordinary string search within that.
+        increment = max(4096, length * 10)
+        buffersize = increment + length
+        while p < end:
+            buf = self._readbin(min(buffersize, end - p), p)
+            # Test using regular expressions...
+            m = reg_ex.search(buf)
+            if m:
+                pos = m.start()
+            # pos = buf.find(targetbin)
+            # if pos != -1:
+                # if bytealigned then we only accept byte aligned positions.
+                if not bytealigned or (p + pos) % 8 == 0:
+                    return (p + pos,)
+                if bytealigned:
+                    # Advance to just beyond the non-byte-aligned match and try again...
+                    p += pos + 1
+                    continue
+            p += increment
+            # Not found, return empty tuple
+        return ()
+
+    def find(self, bs, start=None, end=None, bytealigned=None):
+        """Find first occurrence of substring bs.
+
+        Returns a single item tuple with the bit position if found, or an
+        empty tuple if not found. The bit position (pos property) will
+        also be set to the start of the substring if it is found.
+
+        bs -- The bitstring to find.
+        start -- The bit position to start the search. Defaults to 0.
+        end -- The bit position one past the last bit to search.
+               Defaults to self.len.
+        bytealigned -- If True the bitstring will only be
+                       found on byte boundaries.
+
+        Raises ValueError if bs is empty, if start < 0, if end > self.len or
+        if end < start.
+
+        >>> BitArray('0xc3e').find('0b1111')
+        (6,)
+
+        """
+        bs = Bits(bs)
+        if not bs.len:
+            raise ValueError("Cannot find an empty bitstring.")
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        if bytealigned and not bs.len % 8 and not self._datastore.offset:
+            p = self._findbytes(bs.bytes, start, end, bytealigned)
+        else:
+            p = self._findregex(re.compile(bs._getbin()), start, end, bytealigned)
+        # If called from a class that has a pos, set it
+        try:
+            self._pos = p[0]
+        except (AttributeError, IndexError):
+            pass
+        return p
+
+    def findall(self, bs, start=None, end=None, count=None, bytealigned=None):
+        """Find all occurrences of bs. Return generator of bit positions.
+
+        bs -- The bitstring to find.
+        start -- The bit position to start the search. Defaults to 0.
+        end -- The bit position one past the last bit to search.
+               Defaults to self.len.
+        count -- The maximum number of occurrences to find.
+        bytealigned -- If True the bitstring will only be found on
+                       byte boundaries.
+
+        Raises ValueError if bs is empty, if start < 0, if end > self.len or
+        if end < start.
+
+        Note that all occurrences of bs are found, even if they overlap.
+
+        """
+        if count is not None and count < 0:
+            raise ValueError("In findall, count must be >= 0.")
+        bs = Bits(bs)
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        c = 0
+        if bytealigned and not bs.len % 8 and not self._datastore.offset:
+            # Use the quick find method
+            f = self._findbytes
+            x = bs._getbytes()
+        else:
+            f = self._findregex
+            x = re.compile(bs._getbin())
+        while True:
+
+            p = f(x, start, end, bytealigned)
+            if not p:
+                break
+            if count is not None and c >= count:
+                return
+            c += 1
+            try:
+                self._pos = p[0]
+            except AttributeError:
+                pass
+            yield p[0]
+            if bytealigned:
+                start = p[0] + 8
+            else:
+                start = p[0] + 1
+            if start >= end:
+                break
+        return
+
+    def rfind(self, bs, start=None, end=None, bytealigned=None):
+        """Find final occurrence of substring bs.
+
+        Returns a single item tuple with the bit position if found, or an
+        empty tuple if not found. The bit position (pos property) will
+        also be set to the start of the substring if it is found.
+
+        bs -- The bitstring to find.
+        start -- The bit position to end the reverse search. Defaults to 0.
+        end -- The bit position one past the first bit to reverse search.
+               Defaults to self.len.
+        bytealigned -- If True the bitstring will only be found on byte
+                       boundaries.
+
+        Raises ValueError if bs is empty, if start < 0, if end > self.len or
+        if end < start.
+
+        """
+        bs = Bits(bs)
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        if not bs.len:
+            raise ValueError("Cannot find an empty bitstring.")
+        # Search chunks starting near the end and then moving back
+        # until we find bs.
+        increment = max(8192, bs.len * 80)
+        buffersize = min(increment + bs.len, end - start)
+        pos = max(start, end - buffersize)
+        while True:
+            found = list(self.findall(bs, start=pos, end=pos + buffersize,
+                                      bytealigned=bytealigned))
+            if not found:
+                if pos == start:
+                    return ()
+                pos = max(start, pos - increment)
+                continue
+            return (found[-1],)
+
+    def cut(self, bits, start=None, end=None, count=None):
+        """Return bitstring generator by cutting into bits sized chunks.
+
+        bits -- The size in bits of the bitstring chunks to generate.
+        start -- The bit position to start the first cut. Defaults to 0.
+        end -- The bit position one past the last bit to use in the cut.
+               Defaults to self.len.
+        count -- If specified then at most count items are generated.
+                 Default is to cut as many times as possible.
+
+        """
+        start, end = self._validate_slice(start, end)
+        if count is not None and count < 0:
+            raise ValueError("Cannot cut - count must be >= 0.")
+        if bits <= 0:
+            raise ValueError("Cannot cut - bits must be >= 0.")
+        c = 0
+        while count is None or c < count:
+            c += 1
+            nextchunk = self._slice(start, min(start + bits, end))
+            if nextchunk.len != bits:
+                return
+            assert nextchunk._assertsanity()
+            yield nextchunk
+            start += bits
+        return
+
+    def split(self, delimiter, start=None, end=None, count=None,
+              bytealigned=None):
+        """Return bitstring generator by splittling using a delimiter.
+
+        The first item returned is the initial bitstring before the delimiter,
+        which may be an empty bitstring.
+
+        delimiter -- The bitstring used as the divider.
+        start -- The bit position to start the split. Defaults to 0.
+        end -- The bit position one past the last bit to use in the split.
+               Defaults to self.len.
+        count -- If specified then at most count items are generated.
+                 Default is to split as many times as possible.
+        bytealigned -- If True splits will only occur on byte boundaries.
+
+        Raises ValueError if the delimiter is empty.
+
+        """
+        delimiter = Bits(delimiter)
+        if not delimiter.len:
+            raise ValueError("split delimiter cannot be empty.")
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        if count is not None and count < 0:
+            raise ValueError("Cannot split - count must be >= 0.")
+        if count == 0:
+            return
+        if bytealigned and not delimiter.len % 8 and not self._datastore.offset:
+            # Use the quick find method
+            f = self._findbytes
+            x = delimiter._getbytes()
+        else:
+            f = self._findregex
+            x = re.compile(delimiter._getbin())
+        found = f(x, start, end, bytealigned)
+        if not found:
+            # Initial bits are the whole bitstring being searched
+            yield self._slice(start, end)
+            return
+        # yield the bytes before the first occurrence of the delimiter, even if empty
+        yield self._slice(start, found[0])
+        startpos = pos = found[0]
+        c = 1
+        while count is None or c < count:
+            pos += delimiter.len
+            found = f(x, pos, end, bytealigned)
+            if not found:
+                # No more occurrences, so return the rest of the bitstring
+                yield self._slice(startpos, end)
+                return
+            c += 1
+            yield self._slice(startpos, found[0])
+            startpos = pos = found[0]
+        # Have generated count bitstrings, so time to quit.
+        return
+
+    def join(self, sequence):
+        """Return concatenation of bitstrings joined by self.
+
+        sequence -- A sequence of bitstrings.
+
+        """
+        s = self.__class__()
+        i = iter(sequence)
+        try:
+            s._append(Bits(next(i)))
+            while True:
+                n = next(i)
+                s._append(self)
+                s._append(Bits(n))
+        except StopIteration:
+            pass
+        return s
+
+    def tobytes(self):
+        """Return the bitstring as bytes, padding with zero bits if needed.
+
+        Up to seven zero bits will be added at the end to byte align.
+
+        """
+        d = offsetcopy(self._datastore, 0).rawbytes
+        # Need to ensure that unused bits at end are set to zero
+        unusedbits = 8 - self.len % 8
+        if unusedbits != 8:
+            d[-1] &= (0xff << unusedbits)
+        return bytes(d)
+
+    def tofile(self, f):
+        """Write the bitstring to a file object, padding with zero bits if needed.
+
+        Up to seven zero bits will be added at the end to byte align.
+
+        """
+        # If the bitstring is file based then we don't want to read it all
+        # in to memory.
+        chunksize = 1024 * 1024 # 1 MB chunks
+        if not self._offset:
+            a = 0
+            bytelen = self._datastore.bytelength
+            p = self._datastore.getbyteslice(a, min(a + chunksize, bytelen - 1))
+            while len(p) == chunksize:
+                f.write(p)
+                a += chunksize
+                p = self._datastore.getbyteslice(a, min(a + chunksize, bytelen - 1))
+            f.write(p)
+            # Now the final byte, ensuring that unused bits at end are set to 0.
+            bits_in_final_byte = self.len % 8
+            if not bits_in_final_byte:
+                bits_in_final_byte = 8
+            f.write(self[-bits_in_final_byte:].tobytes())
+        else:
+            # Really quite inefficient...
+            a = 0
+            b = a + chunksize * 8
+            while b <= self.len:
+                f.write(self._slice(a, b)._getbytes())
+                a += chunksize * 8
+                b += chunksize * 8
+            if a != self.len:
+                f.write(self._slice(a, self.len).tobytes())
+
+    def startswith(self, prefix, start=None, end=None):
+        """Return whether the current bitstring starts with prefix.
+
+        prefix -- The bitstring to search for.
+        start -- The bit position to start from. Defaults to 0.
+        end -- The bit position to end at. Defaults to self.len.
+
+        """
+        prefix = Bits(prefix)
+        start, end = self._validate_slice(start, end)
+        if end < start + prefix.len:
+            return False
+        end = start + prefix.len
+        return self._slice(start, end) == prefix
+
+    def endswith(self, suffix, start=None, end=None):
+        """Return whether the current bitstring ends with suffix.
+
+        suffix -- The bitstring to search for.
+        start -- The bit position to start from. Defaults to 0.
+        end -- The bit position to end at. Defaults to self.len.
+
+        """
+        suffix = Bits(suffix)
+        start, end = self._validate_slice(start, end)
+        if start + suffix.len > end:
+            return False
+        start = end - suffix.len
+        return self._slice(start, end) == suffix
+
+    def all(self, value, pos=None):
+        """Return True if one or many bits are all set to value.
+
+        value -- If value is True then checks for bits set to 1, otherwise
+                 checks for bits set to 0.
+        pos -- An iterable of bit positions. Negative numbers are treated in
+               the same way as slice indices. Defaults to the whole bitstring.
+
+        """
+        value = bool(value)
+        length = self.len
+        if pos is None:
+            pos = xrange(self.len)
+        for p in pos:
+            if p < 0:
+                p += length
+            if not 0 <= p < length:
+                raise IndexError("Bit position {0} out of range.".format(p))
+            if not self._datastore.getbit(p) is value:
+                return False
+        return True
+
+    def any(self, value, pos=None):
+        """Return True if any of one or many bits are set to value.
+
+        value -- If value is True then checks for bits set to 1, otherwise
+                 checks for bits set to 0.
+        pos -- An iterable of bit positions. Negative numbers are treated in
+               the same way as slice indices. Defaults to the whole bitstring.
+
+        """
+        value = bool(value)
+        length = self.len
+        if pos is None:
+            pos = xrange(self.len)
+        for p in pos:
+            if p < 0:
+                p += length
+            if not 0 <= p < length:
+                raise IndexError("Bit position {0} out of range.".format(p))
+            if self._datastore.getbit(p) is value:
+                return True
+        return False
+
+    def count(self, value):
+        """Return count of total number of either zero or one bits.
+
+        value -- If True then bits set to 1 are counted, otherwise bits set
+                 to 0 are counted.
+
+        >>> Bits('0xef').count(1)
+        7
+
+        """
+        if not self.len:
+            return 0
+        # count the number of 1s (from which it's easy to work out the 0s).
+        # Don't count the final byte yet.
+        count = sum(BIT_COUNT[self._datastore.getbyte(i)] for i in xrange(self._datastore.bytelength - 1))
+        # adjust for bits at start that aren't part of the bitstring
+        if self._offset:
+            count -= BIT_COUNT[self._datastore.getbyte(0) >> (8 - self._offset)]
+        # and count the last 1 - 8 bits at the end.
+        endbits = self._datastore.bytelength * 8 - (self._offset + self.len)
+        count += BIT_COUNT[self._datastore.getbyte(self._datastore.bytelength - 1) >> endbits]
+        return count if value else self.len - count
+
+    # Create native-endian functions as aliases depending on the byteorder
+    if byteorder == 'little':
+        _setfloatne = _setfloatle
+        _readfloatne = _readfloatle
+        _getfloatne = _getfloatle
+        _setuintne = _setuintle
+        _readuintne = _readuintle
+        _getuintne = _getuintle
+        _setintne = _setintle
+        _readintne = _readintle
+        _getintne = _getintle
+    else:
+        _setfloatne = _setfloat
+        _readfloatne = _readfloat
+        _getfloatne = _getfloat
+        _setuintne = _setuintbe
+        _readuintne = _readuintbe
+        _getuintne = _getuintbe
+        _setintne = _setintbe
+        _readintne = _readintbe
+        _getintne = _getintbe
+
+    _offset = property(_getoffset)
+
+    len = property(_getlength,
+                   doc="""The length of the bitstring in bits. Read only.
+                      """)
+    length = property(_getlength,
+                      doc="""The length of the bitstring in bits. Read only.
+                      """)
+    bool = property(_getbool,
+                    doc="""The bitstring as a bool (True or False). Read only.
+                    """)
+    hex = property(_gethex,
+                   doc="""The bitstring as a hexadecimal string. Read only.
+                   """)
+    bin = property(_getbin,
+                   doc="""The bitstring as a binary string. Read only.
+                   """)
+    oct = property(_getoct,
+                   doc="""The bitstring as an octal string. Read only.
+                   """)
+    bytes = property(_getbytes,
+                     doc="""The bitstring as a bytes object. Read only.
+                      """)
+    int = property(_getint,
+                   doc="""The bitstring as a two's complement signed int. Read only.
+                      """)
+    uint = property(_getuint,
+                    doc="""The bitstring as a two's complement unsigned int. Read only.
+                      """)
+    float = property(_getfloat,
+                     doc="""The bitstring as a floating point number. Read only.
+                      """)
+    intbe = property(_getintbe,
+                     doc="""The bitstring as a two's complement big-endian signed int. Read only.
+                      """)
+    uintbe = property(_getuintbe,
+                      doc="""The bitstring as a two's complement big-endian unsigned int. Read only.
+                      """)
+    floatbe = property(_getfloat,
+                       doc="""The bitstring as a big-endian floating point number. Read only.
+                      """)
+    intle = property(_getintle,
+                     doc="""The bitstring as a two's complement little-endian signed int. Read only.
+                      """)
+    uintle = property(_getuintle,
+                      doc="""The bitstring as a two's complement little-endian unsigned int. Read only.
+                      """)
+    floatle = property(_getfloatle,
+                       doc="""The bitstring as a little-endian floating point number. Read only.
+                      """)
+    intne = property(_getintne,
+                     doc="""The bitstring as a two's complement native-endian signed int. Read only.
+                      """)
+    uintne = property(_getuintne,
+                      doc="""The bitstring as a two's complement native-endian unsigned int. Read only.
+                      """)
+    floatne = property(_getfloatne,
+                       doc="""The bitstring as a native-endian floating point number. Read only.
+                      """)
+    ue = property(_getue,
+                  doc="""The bitstring as an unsigned exponential-Golomb code. Read only.
+                      """)
+    se = property(_getse,
+                  doc="""The bitstring as a signed exponential-Golomb code. Read only.
+                      """)
+    uie = property(_getuie,
+                   doc="""The bitstring as an unsigned interleaved exponential-Golomb code. Read only.
+                      """)
+    sie = property(_getsie,
+                   doc="""The bitstring as a signed interleaved exponential-Golomb code. Read only.
+                      """)
+
+
+# Dictionary that maps token names to the function that reads them.
+name_to_read = {'uint': Bits._readuint,
+                'uintle': Bits._readuintle,
+                'uintbe': Bits._readuintbe,
+                'uintne': Bits._readuintne,
+                'int': Bits._readint,
+                'intle': Bits._readintle,
+                'intbe': Bits._readintbe,
+                'intne': Bits._readintne,
+                'float': Bits._readfloat,
+                'floatbe': Bits._readfloat, # floatbe is a synonym for float
+                'floatle': Bits._readfloatle,
+                'floatne': Bits._readfloatne,
+                'hex': Bits._readhex,
+                'oct': Bits._readoct,
+                'bin': Bits._readbin,
+                'bits': Bits._readbits,
+                'bytes': Bits._readbytes,
+                'ue': Bits._readue,
+                'se': Bits._readse,
+                'uie': Bits._readuie,
+                'sie': Bits._readsie,
+                'bool': Bits._readbool,
+                }
+
+# Dictionaries for mapping init keywords with init functions.
+init_with_length_and_offset = {'bytes': Bits._setbytes_safe,
+                               'filename': Bits._setfile,
+                               }
+
+init_with_length_only = {'uint': Bits._setuint,
+                         'int': Bits._setint,
+                         'float': Bits._setfloat,
+                         'uintbe': Bits._setuintbe,
+                         'intbe': Bits._setintbe,
+                         'floatbe': Bits._setfloat,
+                         'uintle': Bits._setuintle,
+                         'intle': Bits._setintle,
+                         'floatle': Bits._setfloatle,
+                         'uintne': Bits._setuintne,
+                         'intne': Bits._setintne,
+                         'floatne': Bits._setfloatne,
+                         }
+
+init_without_length_or_offset = {'bin': Bits._setbin_safe,
+                                 'hex': Bits._sethex,
+                                 'oct': Bits._setoct,
+                                 'ue': Bits._setue,
+                                 'se': Bits._setse,
+                                 'uie': Bits._setuie,
+                                 'sie': Bits._setsie,
+                                 'bool': Bits._setbool,
+                                 }
+
+
+class BitArray(Bits):
+    """A container holding a mutable sequence of bits.
+
+    Subclass of the immutable Bits class. Inherits all of its
+    methods (except __hash__) and adds mutating methods.
+
+    Mutating methods:
+
+    append() -- Append a bitstring.
+    byteswap() -- Change byte endianness in-place.
+    insert() -- Insert a bitstring.
+    invert() -- Flip bit(s) between one and zero.
+    overwrite() -- Overwrite a section with a new bitstring.
+    prepend() -- Prepend a bitstring.
+    replace() -- Replace occurrences of one bitstring with another.
+    reverse() -- Reverse bits in-place.
+    rol() -- Rotate bits to the left.
+    ror() -- Rotate bits to the right.
+    set() -- Set bit(s) to 1 or 0.
+
+    Methods inherited from Bits:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    join() -- Join bitstrings together using current bitstring.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Special methods:
+
+    Mutating operators are available: [], <<=, >>=, +=, *=, &=, |= and ^=
+    in addition to the inherited [], ==, !=, +, *, ~, <<, >>, &, | and ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytepos -- The current byte position in the bitstring.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    pos -- The current bit position in the bitstring.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ()
+
+    # As BitArray objects are mutable, we shouldn't allow them to be hashed.
+    __hash__ = None
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        # For mutable BitArrays we always read in files to memory:
+        if not isinstance(self._datastore, ByteStore):
+            self._ensureinmemory()
+
+    def __new__(cls, auto=None, length=None, offset=None, **kwargs):
+        x = super(BitArray, cls).__new__(cls)
+        y = Bits.__new__(BitArray, auto, length, offset, **kwargs)
+        x._datastore = y._datastore
+        return x
+
+    def __iadd__(self, bs):
+        """Append bs to current bitstring. Return self.
+
+        bs -- the bitstring to append.
+
+        """
+        self.append(bs)
+        return self
+
+    def __copy__(self):
+        """Return a new copy of the BitArray."""
+        s_copy = BitArray()
+        if not isinstance(self._datastore, ByteStore):
+            # Let them both point to the same (invariant) array.
+            # If either gets modified then at that point they'll be read into memory.
+            s_copy._datastore = self._datastore
+        else:
+            s_copy._datastore = copy.copy(self._datastore)
+        return s_copy
+
+    def __setitem__(self, key, value):
+        """Set item or range to new value.
+
+        Indices are in units of the step parameter (default 1 bit).
+        Stepping is used to specify the number of bits in each item.
+
+        If the length of the bitstring is changed then pos will be moved
+        to after the inserted section, otherwise it will remain unchanged.
+
+        >>> s = BitArray('0xff')
+        >>> s[0:1:4] = '0xe'
+        >>> print s
+        '0xef'
+        >>> s[4:4] = '0x00'
+        >>> print s
+        '0xe00f'
+
+        """
+        try:
+            # A slice
+            start, step = 0, 1
+            if key.step is not None:
+                step = key.step
+        except AttributeError:
+            # single element
+            if key < 0:
+                key += self.len
+            if not 0 <= key < self.len:
+                raise IndexError("Slice index out of range.")
+            if isinstance(value, numbers.Integral):
+                if not value:
+                    self._unset(key)
+                    return
+                if value in (1, -1):
+                    self._set(key)
+                    return
+                raise ValueError("Cannot set a single bit with integer {0}.".format(value))
+            value = Bits(value)
+            if value.len == 1:
+                # TODO: this can't be optimal
+                if value[0]:
+                    self._set(key)
+                else:
+                    self._unset(key)
+            else:
+                self._delete(1, key)
+                self._insert(value, key)
+            return
+        else:
+            if step != 1:
+                # convert to binary string and use string slicing
+                # TODO: Horribly inefficent
+                temp = list(self._getbin())
+                v = list(Bits(value)._getbin())
+                temp.__setitem__(key, v)
+                self._setbin_unsafe(''.join(temp))
+                return
+
+            # If value is an integer then we want to set the slice to that
+            # value rather than initialise a new bitstring of that length.
+            if not isinstance(value, numbers.Integral):
+                try:
+                    # TODO: Better way than calling constructor here?
+                    value = Bits(value)
+                except TypeError:
+                    raise TypeError("Bitstring, integer or string expected. "
+                                    "Got {0}.".format(type(value)))
+            if key.start is not None:
+                start = key.start
+                if key.start < 0:
+                    start += self.len
+                if start < 0:
+                    start = 0
+            stop = self.len
+            if key.stop is not None:
+                stop = key.stop
+                if key.stop < 0:
+                    stop += self.len
+            if start > stop:
+                # The standard behaviour for lists is to just insert at the
+                # start position if stop < start and step == 1.
+                stop = start
+            if isinstance(value, numbers.Integral):
+                if value >= 0:
+                    value = self.__class__(uint=value, length=stop - start)
+                else:
+                    value = self.__class__(int=value, length=stop - start)
+            stop = min(stop, self.len)
+            start = max(start, 0)
+            start = min(start, stop)
+            if (stop - start) == value.len:
+                if not value.len:
+                    return
+                if step >= 0:
+                    self._overwrite(value, start)
+                else:
+                    self._overwrite(value.__getitem__(slice(None, None, 1)), start)
+            else:
+                # TODO: A delete then insert is wasteful - it could do unneeded shifts.
+                # Could be either overwrite + insert or overwrite + delete.
+                self._delete(stop - start, start)
+                if step >= 0:
+                    self._insert(value, start)
+                else:
+                    self._insert(value.__getitem__(slice(None, None, 1)), start)
+                # pos is now after the inserted piece.
+            return
+
+    def __delitem__(self, key):
+        """Delete item or range.
+
+        Indices are in units of the step parameter (default 1 bit).
+        Stepping is used to specify the number of bits in each item.
+
+        >>> a = BitArray('0x001122')
+        >>> del a[1:2:8]
+        >>> print a
+        0x0022
+
+        """
+        try:
+            # A slice
+            start = 0
+            step = key.step if key.step is not None else 1
+        except AttributeError:
+            # single element
+            if key < 0:
+                key += self.len
+            if not 0 <= key < self.len:
+                raise IndexError("Slice index out of range.")
+            self._delete(1, key)
+            return
+        else:
+            if step != 1:
+                # convert to binary string and use string slicing
+                # TODO: Horribly inefficent
+                temp = list(self._getbin())
+                temp.__delitem__(key)
+                self._setbin_unsafe(''.join(temp))
+                return
+            stop = key.stop
+            if key.start is not None:
+                start = key.start
+                if key.start < 0 and stop is None:
+                    start += self.len
+                if start < 0:
+                    start = 0
+            if stop is None:
+                stop = self.len
+            if start > stop:
+                return
+            stop = min(stop, self.len)
+            start = max(start, 0)
+            start = min(start, stop)
+            self._delete(stop - start, start)
+            return
+
+    def __ilshift__(self, n):
+        """Shift bits by n to the left in place. Return self.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        if not n:
+            return self
+        n = min(n, self.len)
+        return self._ilshift(n)
+
+    def __irshift__(self, n):
+        """Shift bits by n to the right in place. Return self.
+
+        n -- the number of bits to shift. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot shift by a negative amount.")
+        if not self.len:
+            raise ValueError("Cannot shift an empty bitstring.")
+        if not n:
+            return self
+        n = min(n, self.len)
+        return self._irshift(n)
+
+    def __imul__(self, n):
+        """Concatenate n copies of self in place. Return self.
+
+        Called for expressions of the form 'a *= 3'.
+        n -- The number of concatenations. Must be >= 0.
+
+        """
+        if n < 0:
+            raise ValueError("Cannot multiply by a negative integer.")
+        return self._imul(n)
+
+    def __ior__(self, bs):
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for |= operator.")
+        return self._ior(bs)
+
+    def __iand__(self, bs):
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for &= operator.")
+        return self._iand(bs)
+
+    def __ixor__(self, bs):
+        bs = Bits(bs)
+        if self.len != bs.len:
+            raise ValueError("Bitstrings must have the same length "
+                             "for ^= operator.")
+        return self._ixor(bs)
+
+    def replace(self, old, new, start=None, end=None, count=None,
+                bytealigned=None):
+        """Replace all occurrences of old with new in place.
+
+        Returns number of replacements made.
+
+        old -- The bitstring to replace.
+        new -- The replacement bitstring.
+        start -- Any occurrences that start before this will not be replaced.
+                 Defaults to 0.
+        end -- Any occurrences that finish after this will not be replaced.
+               Defaults to self.len.
+        count -- The maximum number of replacements to make. Defaults to
+                 replace all occurrences.
+        bytealigned -- If True replacements will only be made on byte
+                       boundaries.
+
+        Raises ValueError if old is empty or if start or end are
+        out of range.
+
+        """
+        old = Bits(old)
+        new = Bits(new)
+        if not old.len:
+            raise ValueError("Empty bitstring cannot be replaced.")
+        start, end = self._validate_slice(start, end)
+        if bytealigned is None:
+            bytealigned = globals()['bytealigned']
+        # Adjust count for use in split()
+        if count is not None:
+            count += 1
+        sections = self.split(old, start, end, count, bytealigned)
+        lengths = [s.len for s in sections]
+        if len(lengths) == 1:
+            # Didn't find anything to replace.
+            return 0 # no replacements done
+        if new is self:
+            # Prevent self assignment woes
+            new = copy.copy(self)
+        positions = [lengths[0] + start]
+        for l in lengths[1:-1]:
+            # Next position is the previous one plus the length of the next section.
+            positions.append(positions[-1] + l)
+        # We have all the positions that need replacements. We do them
+        # in reverse order so that they won't move around as we replace.
+        positions.reverse()
+        try:
+            # Need to calculate new pos, if this is a bitstream
+            newpos = self._pos
+            for p in positions:
+                self[p:p + old.len] = new
+            if old.len != new.len:
+                diff = new.len - old.len
+                for p in positions:
+                    if p >= newpos:
+                        continue
+                    if p + old.len <= newpos:
+                        newpos += diff
+                    else:
+                        newpos = p
+            self._pos = newpos
+        except AttributeError:
+            for p in positions:
+                self[p:p + old.len] = new
+        assert self._assertsanity()
+        return len(lengths) - 1
+
+    def insert(self, bs, pos=None):
+        """Insert bs at bit position pos.
+
+        bs -- The bitstring to insert.
+        pos -- The bit position to insert at.
+
+        Raises ValueError if pos < 0 or pos > self.len.
+
+        """
+        bs = Bits(bs)
+        if not bs.len:
+            return self
+        if bs is self:
+            bs = self.__copy__()
+        if pos is None:
+            try:
+                pos = self._pos
+            except AttributeError:
+                raise TypeError("insert require a bit position for this type.")
+        if pos < 0:
+            pos += self.len
+        if not 0 <= pos <= self.len:
+            raise ValueError("Invalid insert position.")
+        self._insert(bs, pos)
+
+    def overwrite(self, bs, pos=None):
+        """Overwrite with bs at bit position pos.
+
+        bs -- The bitstring to overwrite with.
+        pos -- The bit position to begin overwriting from.
+
+        Raises ValueError if pos < 0 or pos + bs.len > self.len
+
+        """
+        bs = Bits(bs)
+        if not bs.len:
+            return
+        if pos is None:
+            try:
+                pos = self._pos
+            except AttributeError:
+                raise TypeError("overwrite require a bit position for this type.")
+        if pos < 0:
+            pos += self.len
+        if pos < 0 or pos + bs.len > self.len:
+            raise ValueError("Overwrite exceeds boundary of bitstring.")
+        self._overwrite(bs, pos)
+        try:
+            self._pos = pos + bs.len
+        except AttributeError:
+            pass
+
+    def append(self, bs):
+        """Append a bitstring to the current bitstring.
+
+        bs -- The bitstring to append.
+
+        """
+        # The offset is a hint to make bs easily appendable.
+        bs = self._converttobitstring(bs, offset=(self.len + self._offset) % 8)
+        self._append(bs)
+
+    def prepend(self, bs):
+        """Prepend a bitstring to the current bitstring.
+
+        bs -- The bitstring to prepend.
+
+        """
+        bs = Bits(bs)
+        self._prepend(bs)
+
+    def reverse(self, start=None, end=None):
+        """Reverse bits in-place.
+
+        start -- Position of first bit to reverse. Defaults to 0.
+        end -- One past the position of the last bit to reverse.
+               Defaults to self.len.
+
+        Using on an empty bitstring will have no effect.
+
+        Raises ValueError if start < 0, end > self.len or end < start.
+
+        """
+        start, end = self._validate_slice(start, end)
+        if start == 0 and end == self.len:
+            self._reverse()
+            return
+        s = self._slice(start, end)
+        s._reverse()
+        self[start:end] = s
+
+    def set(self, value, pos=None):
+        """Set one or many bits to 1 or 0.
+
+        value -- If True bits are set to 1, otherwise they are set to 0.
+        pos -- Either a single bit position or an iterable of bit positions.
+               Negative numbers are treated in the same way as slice indices.
+               Defaults to the entire bitstring.
+
+        Raises IndexError if pos < -self.len or pos >= self.len.
+
+        """
+        f = self._set if value else self._unset
+        if pos is None:
+            pos = xrange(self.len)
+        try:
+            length = self.len
+            for p in pos:
+                if p < 0:
+                    p += length
+                if not 0 <= p < length:
+                    raise IndexError("Bit position {0} out of range.".format(p))
+                f(p)
+        except TypeError:
+            # Single pos
+            if pos < 0:
+                pos += self.len
+            if not 0 <= pos < length:
+                raise IndexError("Bit position {0} out of range.".format(pos))
+            f(pos)
+
+    def invert(self, pos=None):
+        """Invert one or many bits from 0 to 1 or vice versa.
+
+        pos -- Either a single bit position or an iterable of bit positions.
+               Negative numbers are treated in the same way as slice indices.
+
+        Raises IndexError if pos < -self.len or pos >= self.len.
+
+        """
+        if pos is None:
+            self._invert_all()
+            return
+        if not isinstance(pos, collections.Iterable):
+            pos = (pos,)
+        length = self.len
+
+        for p in pos:
+            if p < 0:
+                p += length
+            if not 0 <= p < length:
+                raise IndexError("Bit position {0} out of range.".format(p))
+            self._invert(p)
+
+    def ror(self, bits, start=None, end=None):
+        """Rotate bits to the right in-place.
+
+        bits -- The number of bits to rotate by.
+        start -- Start of slice to rotate. Defaults to 0.
+        end -- End of slice to rotate. Defaults to self.len.
+
+        Raises ValueError if bits < 0.
+
+        """
+        if not self.len:
+            raise Error("Cannot rotate an empty bitstring.")
+        if bits < 0:
+            raise ValueError("Cannot rotate right by negative amount.")
+        start, end = self._validate_slice(start, end)
+        bits %= (end - start)
+        if not bits:
+            return
+        rhs = self._slice(end - bits, end)
+        self._delete(bits, end - bits)
+        self._insert(rhs, start)
+
+    def rol(self, bits, start=None, end=None):
+        """Rotate bits to the left in-place.
+
+        bits -- The number of bits to rotate by.
+        start -- Start of slice to rotate. Defaults to 0.
+        end -- End of slice to rotate. Defaults to self.len.
+
+        Raises ValueError if bits < 0.
+
+        """
+        if not self.len:
+            raise Error("Cannot rotate an empty bitstring.")
+        if bits < 0:
+            raise ValueError("Cannot rotate left by negative amount.")
+        start, end = self._validate_slice(start, end)
+        bits %= (end - start)
+        if not bits:
+            return
+        lhs = self._slice(start, start + bits)
+        self._delete(bits, start)
+        self._insert(lhs, end - bits)
+
+    def byteswap(self, fmt=None, start=None, end=None, repeat=True):
+        """Change the endianness in-place. Return number of repeats of fmt done.
+
+        fmt -- A compact structure string, an integer number of bytes or
+               an iterable of integers. Defaults to 0, which byte reverses the
+               whole bitstring.
+        start -- Start bit position, defaults to 0.
+        end -- End bit position, defaults to self.len.
+        repeat -- If True (the default) the byte swapping pattern is repeated
+                  as much as possible.
+
+        """
+        start, end = self._validate_slice(start, end)
+        if fmt is None or fmt == 0:
+            # reverse all of the whole bytes.
+            bytesizes = [(end - start) // 8]
+        elif isinstance(fmt, numbers.Integral):
+            if fmt < 0:
+                raise ValueError("Improper byte length {0}.".format(fmt))
+            bytesizes = [fmt]
+        elif isinstance(fmt, basestring):
+            m = STRUCT_PACK_RE.match(fmt)
+            if not m:
+                raise ValueError("Cannot parse format string {0}.".format(fmt))
+            # Split the format string into a list of 'q', '4h' etc.
+            formatlist = re.findall(STRUCT_SPLIT_RE, m.group('fmt'))
+            # Now deal with multiplicative factors, 4h -> hhhh etc.
+            bytesizes = []
+            for f in formatlist:
+                if len(f) == 1:
+                    bytesizes.append(PACK_CODE_SIZE[f])
+                else:
+                    bytesizes.extend([PACK_CODE_SIZE[f[-1]]] * int(f[:-1]))
+        elif isinstance(fmt, collections.Iterable):
+            bytesizes = fmt
+            for bytesize in bytesizes:
+                if not isinstance(bytesize, numbers.Integral) or bytesize < 0:
+                    raise ValueError("Improper byte length {0}.".format(bytesize))
+        else:
+            raise TypeError("Format must be an integer, string or iterable.")
+
+        repeats = 0
+        totalbitsize = 8 * sum(bytesizes)
+        if not totalbitsize:
+            return 0
+        if repeat:
+            # Try to repeat up to the end of the bitstring.
+            finalbit = end
+        else:
+            # Just try one (set of) byteswap(s).
+            finalbit = start + totalbitsize
+        for patternend in xrange(start + totalbitsize, finalbit + 1, totalbitsize):
+            bytestart = patternend - totalbitsize
+            for bytesize in bytesizes:
+                byteend = bytestart + bytesize * 8
+                self._reversebytes(bytestart, byteend)
+                bytestart += bytesize * 8
+            repeats += 1
+        return repeats
+
+    def clear(self):
+        """Remove all bits, reset to zero length."""
+        self._clear()
+
+    def copy(self):
+        """Return a copy of the bitstring."""
+        return self._copy()
+
+    int = property(Bits._getint, Bits._setint,
+                   doc="""The bitstring as a two's complement signed int. Read and write.
+                      """)
+    uint = property(Bits._getuint, Bits._setuint,
+                    doc="""The bitstring as a two's complement unsigned int. Read and write.
+                      """)
+    float = property(Bits._getfloat, Bits._setfloat,
+                     doc="""The bitstring as a floating point number. Read and write.
+                      """)
+    intbe = property(Bits._getintbe, Bits._setintbe,
+                     doc="""The bitstring as a two's complement big-endian signed int. Read and write.
+                      """)
+    uintbe = property(Bits._getuintbe, Bits._setuintbe,
+                      doc="""The bitstring as a two's complement big-endian unsigned int. Read and write.
+                      """)
+    floatbe = property(Bits._getfloat, Bits._setfloat,
+                       doc="""The bitstring as a big-endian floating point number. Read and write.
+                      """)
+    intle = property(Bits._getintle, Bits._setintle,
+                     doc="""The bitstring as a two's complement little-endian signed int. Read and write.
+                      """)
+    uintle = property(Bits._getuintle, Bits._setuintle,
+                      doc="""The bitstring as a two's complement little-endian unsigned int. Read and write.
+                      """)
+    floatle = property(Bits._getfloatle, Bits._setfloatle,
+                       doc="""The bitstring as a little-endian floating point number. Read and write.
+                      """)
+    intne = property(Bits._getintne, Bits._setintne,
+                     doc="""The bitstring as a two's complement native-endian signed int. Read and write.
+                      """)
+    uintne = property(Bits._getuintne, Bits._setuintne,
+                      doc="""The bitstring as a two's complement native-endian unsigned int. Read and write.
+                      """)
+    floatne = property(Bits._getfloatne, Bits._setfloatne,
+                       doc="""The bitstring as a native-endian floating point number. Read and write.
+                      """)
+    ue = property(Bits._getue, Bits._setue,
+                  doc="""The bitstring as an unsigned exponential-Golomb code. Read and write.
+                      """)
+    se = property(Bits._getse, Bits._setse,
+                  doc="""The bitstring as a signed exponential-Golomb code. Read and write.
+                      """)
+    uie = property(Bits._getuie, Bits._setuie,
+                  doc="""The bitstring as an unsigned interleaved exponential-Golomb code. Read and write.
+                      """)
+    sie = property(Bits._getsie, Bits._setsie,
+                  doc="""The bitstring as a signed interleaved exponential-Golomb code. Read and write.
+                      """)
+    hex = property(Bits._gethex, Bits._sethex,
+                   doc="""The bitstring as a hexadecimal string. Read and write.
+                       """)
+    bin = property(Bits._getbin, Bits._setbin_safe,
+                   doc="""The bitstring as a binary string. Read and write.
+                       """)
+    oct = property(Bits._getoct, Bits._setoct,
+                   doc="""The bitstring as an octal string. Read and write.
+                       """)
+    bool = property(Bits._getbool, Bits._setbool,
+                    doc="""The bitstring as a bool (True or False). Read and write.
+                    """)
+    bytes = property(Bits._getbytes, Bits._setbytes_safe,
+                     doc="""The bitstring as a ordinary string. Read and write.
+                      """)
+
+
+
+class ConstBitStream(Bits):
+    """A container or stream holding an immutable sequence of bits.
+
+    For a mutable container use the BitStream class instead.
+
+    Methods inherited from Bits:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    join() -- Join bitstrings together using current bitstring.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Other methods:
+
+    bytealign() -- Align to next byte boundary.
+    peek() -- Peek at and interpret next bits as a single item.
+    peeklist() -- Peek at and interpret next bits as a list of items.
+    read() -- Read and interpret next bits as a single item.
+    readlist() -- Read and interpret next bits as a list of items.
+
+    Special methods:
+
+    Also available are the operators [], ==, !=, +, *, ~, <<, >>, &, |, ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytepos -- The current byte position in the bitstring.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    pos -- The current bit position in the bitstring.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ('_pos')
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        self._pos = 0
+
+    def __new__(cls, auto=None, length=None, offset=None, **kwargs):
+        x = super(ConstBitStream, cls).__new__(cls)
+        x._initialise(auto, length, offset, **kwargs)
+        return x
+
+    def _setbytepos(self, bytepos):
+        """Move to absolute byte-aligned position in stream."""
+        self._setbitpos(bytepos * 8)
+
+    def _getbytepos(self):
+        """Return the current position in the stream in bytes. Must be byte aligned."""
+        if self._pos % 8:
+            raise ByteAlignError("Not byte aligned in _getbytepos().")
+        return self._pos // 8
+
+    def _setbitpos(self, pos):
+        """Move to absolute postion bit in bitstream."""
+        if pos < 0:
+            raise ValueError("Bit position cannot be negative.")
+        if pos > self.len:
+            raise ValueError("Cannot seek past the end of the data.")
+        self._pos = pos
+
+    def _getbitpos(self):
+        """Return the current position in the stream in bits."""
+        return self._pos
+
+    def _clear(self):
+        Bits._clear(self)
+        self._pos = 0
+
+    def __copy__(self):
+        """Return a new copy of the ConstBitStream for the copy module."""
+        # Note that if you want a new copy (different ID), use _copy instead.
+        # The copy can use the same datastore as it's immutable.
+        s = ConstBitStream()
+        s._datastore = self._datastore
+        # Reset the bit position, don't copy it.
+        s._pos = 0
+        return s
+
+    def __add__(self, bs):
+        """Concatenate bitstrings and return new bitstring.
+
+        bs -- the bitstring to append.
+
+        """
+        s = Bits.__add__(self, bs)
+        s._pos = 0
+        return s
+
+    def read(self, fmt):
+        """Interpret next bits according to the format string and return result.
+
+        fmt -- Token string describing how to interpret the next bits.
+
+        Token examples: 'int:12'    : 12 bits as a signed integer
+                        'uint:8'    : 8 bits as an unsigned integer
+                        'float:64'  : 8 bytes as a big-endian float
+                        'intbe:16'  : 2 bytes as a big-endian signed integer
+                        'uintbe:16' : 2 bytes as a big-endian unsigned integer
+                        'intle:32'  : 4 bytes as a little-endian signed integer
+                        'uintle:32' : 4 bytes as a little-endian unsigned integer
+                        'floatle:64': 8 bytes as a little-endian float
+                        'intne:24'  : 3 bytes as a native-endian signed integer
+                        'uintne:24' : 3 bytes as a native-endian unsigned integer
+                        'floatne:32': 4 bytes as a native-endian float
+                        'hex:80'    : 80 bits as a hex string
+                        'oct:9'     : 9 bits as an octal string
+                        'bin:1'     : single bit binary string
+                        'ue'        : next bits as unsigned exp-Golomb code
+                        'se'        : next bits as signed exp-Golomb code
+                        'uie'       : next bits as unsigned interleaved exp-Golomb code
+                        'sie'       : next bits as signed interleaved exp-Golomb code
+                        'bits:5'    : 5 bits as a bitstring
+                        'bytes:10'  : 10 bytes as a bytes object
+                        'bool'      : 1 bit as a bool
+                        'pad:3'     : 3 bits of padding to ignore - returns None
+
+        fmt may also be an integer, which will be treated like the 'bits' token.
+
+        The position in the bitstring is advanced to after the read items.
+
+        Raises ReadError if not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        """
+        if isinstance(fmt, numbers.Integral):
+            if fmt < 0:
+                raise ValueError("Cannot read negative amount.")
+            if fmt > self.len - self._pos:
+                raise ReadError("Cannot read {0} bits, only {1} available.",
+                                fmt, self.len - self._pos)
+            bs = self._slice(self._pos, self._pos + fmt)
+            self._pos += fmt
+            return bs
+        p = self._pos
+        _, token = tokenparser(fmt)
+        if len(token) != 1:
+            self._pos = p
+            raise ValueError("Format string should be a single token, not {0} "
+                             "tokens - use readlist() instead.".format(len(token)))
+        name, length, _ = token[0]
+        if length is None:
+            length = self.len - self._pos
+        value, self._pos = self._readtoken(name, self._pos, length)
+        return value
+
+    def readlist(self, fmt, **kwargs):
+        """Interpret next bits according to format string(s) and return list.
+
+        fmt -- A single string or list of strings with comma separated tokens
+               describing how to interpret the next bits in the bitstring. Items
+               can also be integers, for reading new bitstring of the given length.
+        kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+                  format string will be replaced with their given value.
+
+        The position in the bitstring is advanced to after the read items.
+
+        Raises ReadError is not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        See the docstring for 'read' for token examples. 'pad' tokens are skipped
+        and not added to the returned list.
+
+        >>> h, b1, b2 = s.readlist('hex:20, bin:5, bin:3')
+        >>> i, bs1, bs2 = s.readlist(['uint:12', 10, 10])
+
+        """
+        value, self._pos = self._readlist(fmt, self._pos, **kwargs)
+        return value
+
+    def readto(self, bs, bytealigned=None):
+        """Read up to and including next occurrence of bs and return result.
+
+        bs -- The bitstring to find. An integer is not permitted.
+        bytealigned -- If True the bitstring will only be
+                       found on byte boundaries.
+
+        Raises ValueError if bs is empty.
+        Raises ReadError if bs is not found.
+
+        """
+        if isinstance(bs, numbers.Integral):
+            raise ValueError("Integers cannot be searched for")
+        bs = Bits(bs)
+        oldpos = self._pos
+        p = self.find(bs, self._pos, bytealigned=bytealigned)
+        if not p:
+            raise ReadError("Substring not found")
+        self._pos += bs.len
+        return self._slice(oldpos, self._pos)
+
+    def peek(self, fmt):
+        """Interpret next bits according to format string and return result.
+
+        fmt -- Token string describing how to interpret the next bits.
+
+        The position in the bitstring is not changed. If not enough bits are
+        available then all bits to the end of the bitstring will be used.
+
+        Raises ReadError if not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        See the docstring for 'read' for token examples.
+
+        """
+        pos_before = self._pos
+        value = self.read(fmt)
+        self._pos = pos_before
+        return value
+
+    def peeklist(self, fmt, **kwargs):
+        """Interpret next bits according to format string(s) and return list.
+
+        fmt -- One or more strings with comma separated tokens describing
+               how to interpret the next bits in the bitstring.
+        kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+                  format string will be replaced with their given value.
+
+        The position in the bitstring is not changed. If not enough bits are
+        available then all bits to the end of the bitstring will be used.
+
+        Raises ReadError if not enough bits are available.
+        Raises ValueError if the format is not understood.
+
+        See the docstring for 'read' for token examples.
+
+        """
+        pos = self._pos
+        return_values = self.readlist(fmt, **kwargs)
+        self._pos = pos
+        return return_values
+
+    def bytealign(self):
+        """Align to next byte and return number of skipped bits.
+
+        Raises ValueError if the end of the bitstring is reached before
+        aligning to the next byte.
+
+        """
+        skipped = (8 - (self._pos % 8)) % 8
+        self.pos += self._offset + skipped
+        assert self._assertsanity()
+        return skipped
+
+    pos = property(_getbitpos, _setbitpos,
+                   doc="""The position in the bitstring in bits. Read and write.
+                      """)
+    bitpos = property(_getbitpos, _setbitpos,
+                      doc="""The position in the bitstring in bits. Read and write.
+                      """)
+    bytepos = property(_getbytepos, _setbytepos,
+                       doc="""The position in the bitstring in bytes. Read and write.
+                      """)
+
+
+
+
+
+class BitStream(ConstBitStream, BitArray):
+    """A container or stream holding a mutable sequence of bits
+
+    Subclass of the ConstBitStream and BitArray classes. Inherits all of
+    their methods.
+
+    Methods:
+
+    all() -- Check if all specified bits are set to 1 or 0.
+    any() -- Check if any of specified bits are set to 1 or 0.
+    append() -- Append a bitstring.
+    bytealign() -- Align to next byte boundary.
+    byteswap() -- Change byte endianness in-place.
+    count() -- Count the number of bits set to 1 or 0.
+    cut() -- Create generator of constant sized chunks.
+    endswith() -- Return whether the bitstring ends with a sub-string.
+    find() -- Find a sub-bitstring in the current bitstring.
+    findall() -- Find all occurrences of a sub-bitstring in the current bitstring.
+    insert() -- Insert a bitstring.
+    invert() -- Flip bit(s) between one and zero.
+    join() -- Join bitstrings together using current bitstring.
+    overwrite() -- Overwrite a section with a new bitstring.
+    peek() -- Peek at and interpret next bits as a single item.
+    peeklist() -- Peek at and interpret next bits as a list of items.
+    prepend() -- Prepend a bitstring.
+    read() -- Read and interpret next bits as a single item.
+    readlist() -- Read and interpret next bits as a list of items.
+    replace() -- Replace occurrences of one bitstring with another.
+    reverse() -- Reverse bits in-place.
+    rfind() -- Seek backwards to find a sub-bitstring.
+    rol() -- Rotate bits to the left.
+    ror() -- Rotate bits to the right.
+    set() -- Set bit(s) to 1 or 0.
+    split() -- Create generator of chunks split by a delimiter.
+    startswith() -- Return whether the bitstring starts with a sub-bitstring.
+    tobytes() -- Return bitstring as bytes, padding if needed.
+    tofile() -- Write bitstring to file, padding if needed.
+    unpack() -- Interpret bits using format string.
+
+    Special methods:
+
+    Mutating operators are available: [], <<=, >>=, +=, *=, &=, |= and ^=
+    in addition to [], ==, !=, +, *, ~, <<, >>, &, | and ^.
+
+    Properties:
+
+    bin -- The bitstring as a binary string.
+    bool -- For single bit bitstrings, interpret as True or False.
+    bytepos -- The current byte position in the bitstring.
+    bytes -- The bitstring as a bytes object.
+    float -- Interpret as a floating point number.
+    floatbe -- Interpret as a big-endian floating point number.
+    floatle -- Interpret as a little-endian floating point number.
+    floatne -- Interpret as a native-endian floating point number.
+    hex -- The bitstring as a hexadecimal string.
+    int -- Interpret as a two's complement signed integer.
+    intbe -- Interpret as a big-endian signed integer.
+    intle -- Interpret as a little-endian signed integer.
+    intne -- Interpret as a native-endian signed integer.
+    len -- Length of the bitstring in bits.
+    oct -- The bitstring as an octal string.
+    pos -- The current bit position in the bitstring.
+    se -- Interpret as a signed exponential-Golomb code.
+    ue -- Interpret as an unsigned exponential-Golomb code.
+    sie -- Interpret as a signed interleaved exponential-Golomb code.
+    uie -- Interpret as an unsigned interleaved exponential-Golomb code.
+    uint -- Interpret as a two's complement unsigned integer.
+    uintbe -- Interpret as a big-endian unsigned integer.
+    uintle -- Interpret as a little-endian unsigned integer.
+    uintne -- Interpret as a native-endian unsigned integer.
+
+    """
+
+    __slots__ = ()
+
+    # As BitStream objects are mutable, we shouldn't allow them to be hashed.
+    __hash__ = None
+
+    def __init__(self, auto=None, length=None, offset=None, **kwargs):
+        """Either specify an 'auto' initialiser:
+        auto -- a string of comma separated tokens, an integer, a file object,
+                a bytearray, a boolean iterable or another bitstring.
+
+        Or initialise via **kwargs with one (and only one) of:
+        bytes -- raw data as a string, for example read from a binary file.
+        bin -- binary string representation, e.g. '0b001010'.
+        hex -- hexadecimal string representation, e.g. '0x2ef'
+        oct -- octal string representation, e.g. '0o777'.
+        uint -- an unsigned integer.
+        int -- a signed integer.
+        float -- a floating point number.
+        uintbe -- an unsigned big-endian whole byte integer.
+        intbe -- a signed big-endian whole byte integer.
+        floatbe - a big-endian floating point number.
+        uintle -- an unsigned little-endian whole byte integer.
+        intle -- a signed little-endian whole byte integer.
+        floatle -- a little-endian floating point number.
+        uintne -- an unsigned native-endian whole byte integer.
+        intne -- a signed native-endian whole byte integer.
+        floatne -- a native-endian floating point number.
+        se -- a signed exponential-Golomb code.
+        ue -- an unsigned exponential-Golomb code.
+        sie -- a signed interleaved exponential-Golomb code.
+        uie -- an unsigned interleaved exponential-Golomb code.
+        bool -- a boolean (True or False).
+        filename -- a file which will be opened in binary read-only mode.
+
+        Other keyword arguments:
+        length -- length of the bitstring in bits, if needed and appropriate.
+                  It must be supplied for all integer and float initialisers.
+        offset -- bit offset to the data. These offset bits are
+                  ignored and this is intended for use when
+                  initialising using 'bytes' or 'filename'.
+
+        """
+        self._pos = 0
+        # For mutable BitStreams we always read in files to memory:
+        if not isinstance(self._datastore, ByteStore):
+            self._ensureinmemory()
+
+    def __new__(cls, auto=None, length=None, offset=None, **kwargs):
+        x = super(BitStream, cls).__new__(cls)
+        x._initialise(auto, length, offset, **kwargs)
+        return x
+
+    def __copy__(self):
+        """Return a new copy of the BitStream."""
+        s_copy = BitStream()
+        s_copy._pos = 0
+        if not isinstance(self._datastore, ByteStore):
+            # Let them both point to the same (invariant) array.
+            # If either gets modified then at that point they'll be read into memory.
+            s_copy._datastore = self._datastore
+        else:
+            s_copy._datastore = ByteStore(self._datastore._rawarray[:],
+                                          self._datastore.bitlength,
+                                          self._datastore.offset)
+        return s_copy
+
+    def prepend(self, bs):
+        """Prepend a bitstring to the current bitstring.
+
+        bs -- The bitstring to prepend.
+
+        """
+        bs = self._converttobitstring(bs)
+        self._prepend(bs)
+        self._pos += bs.len
+
+
+def pack(fmt, *values, **kwargs):
+    """Pack the values according to the format string and return a new BitStream.
+
+    fmt -- A single string or a list of strings with comma separated tokens
+           describing how to create the BitStream.
+    values -- Zero or more values to pack according to the format.
+    kwargs -- A dictionary or keyword-value pairs - the keywords used in the
+              format string will be replaced with their given value.
+
+    Token examples: 'int:12'    : 12 bits as a signed integer
+                    'uint:8'    : 8 bits as an unsigned integer
+                    'float:64'  : 8 bytes as a big-endian float
+                    'intbe:16'  : 2 bytes as a big-endian signed integer
+                    'uintbe:16' : 2 bytes as a big-endian unsigned integer
+                    'intle:32'  : 4 bytes as a little-endian signed integer
+                    'uintle:32' : 4 bytes as a little-endian unsigned integer
+                    'floatle:64': 8 bytes as a little-endian float
+                    'intne:24'  : 3 bytes as a native-endian signed integer
+                    'uintne:24' : 3 bytes as a native-endian unsigned integer
+                    'floatne:32': 4 bytes as a native-endian float
+                    'hex:80'    : 80 bits as a hex string
+                    'oct:9'     : 9 bits as an octal string
+                    'bin:1'     : single bit binary string
+                    'ue' / 'uie': next bits as unsigned exp-Golomb code
+                    'se' / 'sie': next bits as signed exp-Golomb code
+                    'bits:5'    : 5 bits as a bitstring object
+                    'bytes:10'  : 10 bytes as a bytes object
+                    'bool'      : 1 bit as a bool
+                    'pad:3'     : 3 zero bits as padding
+
+    >>> s = pack('uint:12, bits', 100, '0xffe')
+    >>> t = pack(['bits', 'bin:3'], s, '111')
+    >>> u = pack('uint:8=a, uint:8=b, uint:55=a', a=6, b=44)
+
+    """
+    tokens = []
+    if isinstance(fmt, basestring):
+        fmt = [fmt]
+    try:
+        for f_item in fmt:
+            _, tkns = tokenparser(f_item, tuple(sorted(kwargs.keys())))
+            tokens.extend(tkns)
+    except ValueError as e:
+        raise CreationError(*e.args)
+    value_iter = iter(values)
+    s = BitStream()
+    try:
+        for name, length, value in tokens:
+            # If the value is in the kwd dictionary then it takes precedence.
+            if value in kwargs:
+                value = kwargs[value]
+            # If the length is in the kwd dictionary then use that too.
+            if length in kwargs:
+                length = kwargs[length]
+            # Also if we just have a dictionary name then we want to use it
+            if name in kwargs and length is None and value is None:
+                s.append(kwargs[name])
+                continue
+            if length is not None:
+                length = int(length)
+            if value is None and name != 'pad':
+                # Take the next value from the ones provided
+                value = next(value_iter)
+            s._append(BitStream._init_with_token(name, length, value))
+    except StopIteration:
+        raise CreationError("Not enough parameters present to pack according to the "
+                            "format. {0} values are needed.", len(tokens))
+    try:
+        next(value_iter)
+    except StopIteration:
+        # Good, we've used up all the *values.
+        return s
+    raise CreationError("Too many parameters present to pack according to the format.")
+
+
+# Aliases for backward compatibility
+ConstBitArray = Bits
+BitString = BitStream
+
+__all__ = ['ConstBitArray', 'ConstBitStream', 'BitStream', 'BitArray',
+           'Bits', 'BitString', 'pack', 'Error', 'ReadError',
+           'InterpretError', 'ByteAlignError', 'CreationError', 'bytealigned']
diff --git a/SodaSim.uplugin b/SodaSim.uplugin
new file mode 100644
index 0000000..4f83af7
--- /dev/null
+++ b/SodaSim.uplugin
@@ -0,0 +1,71 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "1.0",
+	"FriendlyName": "SodaSim",
+	"Description": "",
+	"Category": "Soda",
+	"CreatedBy": "Soda LTD",
+	"CreatedByURL": "http://soda.auto",
+	"DocsURL": "",
+	"MarketplaceURL": "",
+	"SupportURL": "",
+	"CanContainContent": true,
+	"IsBetaVersion": false,
+	"Installed": false,
+	"Modules": [
+		{
+			"Name": "SodaStyle",
+			"Type": "DeveloperTool"
+		},
+		{
+			"Name": "SodaSimProto",
+			"Type": "DeveloperTool"
+		},
+		{
+			"Name": "RuntimeEditor",
+			"Type": "DeveloperTool"
+		},
+		{
+			"Name": "SodaJoystick",
+			"Type": "DeveloperTool"
+		},
+		{
+			"Name": "UnrealSoda",
+			"Type": "DeveloperTool"
+		},
+		{
+			"Name": "SodaLoadingScreen",
+			"Type": "DeveloperTool",
+			"LoadingPhase": "PreLoadingScreen"
+		},
+		{
+			"Name": "SodaSimEditor",
+			"Type": "UncookedOnly",
+			"LoadingPhase": "PreDefault"
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ChaosVehiclesPlugin",
+			"Enabled": true
+		},
+		{
+			"Name": "RemoteControl",
+			"Enabled": true
+		},
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "GeoReferencing",
+			"Enabled": true
+		},
+		{
+			"Name": "GeometryProcessing",
+			"Enabled": true
+		}
+	]
+
+}
diff --git a/Source/RuntimeEditor/Private/IEditableObject.cpp b/Source/RuntimeEditor/Private/IEditableObject.cpp
new file mode 100644
index 0000000..61ab0b6
--- /dev/null
+++ b/Source/RuntimeEditor/Private/IEditableObject.cpp
@@ -0,0 +1,81 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "IEditableObject.h"
+
+FArchive& operator << (FArchive& Ar, FRuntimeMetadataField& This)
+{
+	Ar << This.MetadataMap;
+	Ar << This.DisplayName;
+	Ar << This.ToolTip_Depricated;
+	return Ar;
+}
+
+void operator << (FStructuredArchive::FSlot Slot, FRuntimeMetadataField& This)
+{
+	FStructuredArchive::FRecord Record = Slot.EnterRecord();
+	Record << SA_VALUE(TEXT("MetadataMap"), This.MetadataMap);
+	Record << SA_VALUE(TEXT("DisplayName"), This.DisplayName);
+	Record << SA_VALUE(TEXT("ToolTip"), This.ToolTip_Depricated);
+}
+
+FArchive& operator << (FArchive& Ar, FRuntimeMetadataObject& This)
+{
+	Ar << This.Fields;
+	Ar << This.MetadataMap;
+	return Ar;
+}
+
+void operator << (FStructuredArchive::FSlot Slot, FRuntimeMetadataObject& This)
+{
+	FStructuredArchive::FRecord Record = Slot.EnterRecord();
+	Record << SA_VALUE(TEXT("Fields"), This.Fields);
+	Record << SA_VALUE(TEXT("MetadataMap"), This.MetadataMap);
+}
+
+void IEditableObject::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	if (UEditableObject* This = Cast<UEditableObject>(this))
+	{
+		IEditableObject::Execute_ReceivePostEditChangeProperty(This, FPropertyChangedEventBP(&PropertyChangedEvent));
+	}
+}
+
+void IEditableObject::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	if (UEditableObject* This = Cast<UEditableObject>(this))
+	{
+		IEditableObject::Execute_ReceivePostEditChangeProperty(This, FPropertyChangedEventBP(&PropertyChangedEvent));
+	}
+}
+
+void IEditableObject::RuntimePreEditChange(FProperty* PropertyAboutToChange)
+{
+}
+
+void IEditableObject::RuntimePreEditChange(FEditPropertyChain& PropertyAboutToChange)
+{
+}
+
+bool IEditableObject::RuntimeCanEditChange(const FProperty* InProperty) const
+{
+#if WITH_EDITOR
+	return CastChecked<UObject>(this)->CanEditChange(InProperty);
+#else
+	const bool bIsMutable = !InProperty->HasAnyPropertyFlags(CPF_EditConst);
+	return bIsMutable;
+#endif
+}
+
+bool IEditableObject::RuntimeCanEditChange(const FEditPropertyChain& PropertyChain) const
+{
+#if WITH_EDITOR
+	return CastChecked<UObject>(this)->CanEditChange(PropertyChain);
+#else
+	return RuntimeCanEditChange(PropertyChain.GetActiveNode()->GetValue());
+#endif
+}
+
+TSharedPtr<SWidget> IEditableObject::GenerateToolBar()
+{
+	return TSharedPtr<SWidget>(); 
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/MetadataPrimaryAsset.cpp b/Source/RuntimeEditor/Private/MetadataPrimaryAsset.cpp
new file mode 100644
index 0000000..dc3bb22
--- /dev/null
+++ b/Source/RuntimeEditor/Private/MetadataPrimaryAsset.cpp
@@ -0,0 +1,155 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "MetadataPrimaryAsset.h"
+#include "UObject/ObjectSaveContext.h"
+#include "RuntimeMetaData.h"
+
+#if WITH_EDITOR
+bool UMetadataPrimaryAsset::AddStructToMetadataGlobalScope(const UStruct* Struct)
+{
+	check(Struct);
+	UPackage* Package = Struct->GetOutermost();
+	check(Package);
+	UMetaData* MetaData = Package->GetMetaData();
+	check(MetaData);
+
+	// Check store object
+	bool StoreObject = Struct->HasMetaData(TEXT("RuntimeMetaData"));
+	if (!StoreObject)
+	{
+		for (TFieldIterator<FField> FieldIt(Struct); FieldIt; ++FieldIt)
+		{
+			FField* Field = *FieldIt;
+			if (const TMap<FName, FString>* FieldValues = Field->GetMetaDataMap())
+			{
+				bool StoreField = false;
+				for (const auto& MetaDataIt : *FieldValues)
+				{
+					if (MetaDataIt.Key.ToString() == TEXT("EditInRuntime") || MetaDataIt.Key.ToString() == TEXT("CallInRuntime"))
+					{
+						StoreObject = true;
+						break;
+					}
+				}
+				if (StoreObject) break;
+			}
+		}
+	}
+
+	if (!StoreObject)
+	{
+		for (TFieldIterator<UField> FieldIt(Struct); FieldIt; ++FieldIt)
+		{
+			UField* Field = *FieldIt;
+			if (TMap<FName, FString>* FieldValues = MetaData->ObjectMetaDataMap.Find(Field))
+			{
+				for (const auto& MetaDataIt : *FieldValues)
+				{
+					if (MetaDataIt.Key.ToString() == TEXT("EditInRuntime") || MetaDataIt.Key.ToString() == TEXT("CallInRuntime"))
+					{
+						StoreObject = true;
+						break;
+					}
+				}
+			}
+			if (StoreObject) break;
+		}
+	}
+
+	if (!StoreObject)
+	{
+		return false;
+	}
+
+	// Store metadata
+	FRuntimeMetadataObject& MetadataObject = MetadataGlobalScope.FindOrAdd(Struct->GetName());
+	for (TFieldIterator<FField> FieldIt(Struct); FieldIt; ++FieldIt)
+	{
+		FField* Field = *FieldIt;
+		if (const TMap<FName, FString>* FieldValues = Field->GetMetaDataMap())
+		{
+			FRuntimeMetadataField& MetadataField = MetadataObject.Fields.FindOrAdd(Field->GetName());
+			MetadataField.DisplayName = Field->GetDisplayNameText().ToString();
+			//MetadataField.ToolTip = Field->GetToolTipText().ToString();
+			for (const auto& MetaDataIt : *FieldValues)
+			{
+				MetadataField.MetadataMap.Add(MetaDataIt.Key.ToString(), MetaDataIt.Value);
+			}
+		}
+	}
+	for (TFieldIterator<UField> FieldIt(Struct); FieldIt; ++FieldIt)
+	{
+		UField* Field = *FieldIt;
+		if (TMap<FName, FString>* FieldValues = MetaData->ObjectMetaDataMap.Find(Field))
+		{
+			FRuntimeMetadataField& MetadataField = MetadataObject.Fields.FindOrAdd(Field->GetName());
+			MetadataField.DisplayName = Field->GetDisplayNameText().ToString();
+			//MetadataField.ToolTip = Field->GetToolTipText().ToString();
+			for (const auto& MetaDataIt : *FieldValues)
+			{
+				MetadataField.MetadataMap.Add(MetaDataIt.Key.ToString(), MetaDataIt.Value);
+			}
+		}
+	}
+	return true;
+}
+
+void UMetadataPrimaryAsset::UpdateMetadataGlobalScope()
+{
+	MetadataGlobalScope.Empty();
+
+	UE_LOG(LogMetaData, Display, TEXT("UMetadataPrimaryAsset::UpdateMetadataGlobalScope(): "));
+
+	for (TObjectIterator<UStruct> It; It; ++It)
+	{
+		if (bSaveAllCPPMetadata)
+		{
+			if (!It->IsChildOf(UBlueprintGeneratedClass::StaticClass()))
+			{
+				if (AddStructToMetadataGlobalScope(*It))
+				{
+					UE_LOG(LogMetaData, Display, TEXT("   \"%s\""), *It->GetName());
+				}
+			}
+		}
+	}
+}
+
+#endif
+
+void UMetadataPrimaryAsset::PreSave(FObjectPreSaveContext ObjectSaveContext)
+{
+	Super::PreSave(ObjectSaveContext);
+	MetadataGlobalScope.Empty();
+}
+
+void UMetadataPrimaryAsset::PostLoad()
+{
+	Super::PostLoad();
+
+	UE_LOG(LogMetaData, Display, TEXT("UMetadataPrimaryAsset::PostLoad();"));
+
+#if WITH_EDITOR
+	UpdateMetadataGlobalScope();
+#endif
+
+	
+	for (auto & It : MetadataGlobalScope)
+	{
+		UE_LOG(LogMetaData, Display, TEXT("   \"%s\""), *It.Key);
+	}
+	
+}
+
+void UMetadataPrimaryAsset::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+#if WITH_EDITOR
+	if (Ar.IsCooking())
+	{
+		UE_LOG(LogMetaData, Display, TEXT("UMetadataPrimaryAsset::Serialize(FArchive); Cooking..."));
+		UpdateMetadataGlobalScope();
+	}
+#endif
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerFilter.cpp b/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerFilter.cpp
new file mode 100644
index 0000000..28967f4
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerFilter.cpp
@@ -0,0 +1,722 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeClassViewer/ClassViewerFilter.h"
+#include "AssetRegistry/AssetData.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "AssetRegistry/IAssetRegistry.h"
+#include "RuntimeClassViewer/ClassViewerModule.h"
+#include "RuntimeClassViewer/ClassViewerNode.h"
+#include "Containers/UnrealString.h"
+#include "CoreGlobals.h"
+//#include "Editor.h"
+//#include "Editor/EditorEngine.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "Engine/Brush.h"
+#include "GameFramework/Actor.h"
+#include "HAL/PlatformCrt.h"
+//#include "Kismet2/KismetEditorUtilities.h"
+#include "Logging/LogCategory.h"
+#include "Logging/LogMacros.h"
+#include "Misc/AssertionMacros.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Misc/PackageName.h"
+#include "Misc/Paths.h"
+#include "Misc/TextFilterExpressionEvaluator.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+//#include "Settings/ClassViewerSettings.h"
+#include "Trace/Detail/Channel.h"
+#include "UObject/Class.h"
+#include "UObject/Object.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/UObjectGlobals.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+#include "RuntimeClassViewer/UnloadedBlueprintData.h"
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfInChildOfClassesSet(TSet< const UClass* >& InSet, const UClass* InClass)
+{
+	check(InClass);
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			if (InClass->IsChildOf(*CurClassIt))
+			{
+				return EFilterReturn::Passed;
+			}
+		}
+
+		return EFilterReturn::Failed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfInChildOfClassesSet(TSet< const UClass* >& InSet, const TSharedPtr< const IUnloadedBlueprintData > InClass)
+{
+	check(InClass.IsValid());
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			if (InClass->IsChildOf(*CurClassIt))
+			{
+				return EFilterReturn::Passed;
+			}
+		}
+
+		return EFilterReturn::Failed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatchesAllInChildOfClassesSet(TSet< const UClass* >& InSet, const UClass* InClass)
+{
+	check(InClass);
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			if (!InClass->IsChildOf(*CurClassIt))
+			{
+				// Since it doesn't match one, it fails.
+				return EFilterReturn::Failed;
+			}
+		}
+
+		// It matches all of them, so it passes.
+		return EFilterReturn::Passed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatchesAllInChildOfClassesSet(TSet< const UClass* >& InSet, const TSharedPtr< const IUnloadedBlueprintData > InClass)
+{
+	check(InClass.IsValid());
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			if (!InClass->IsChildOf(*CurClassIt))
+			{
+				// Since it doesn't match one, it fails.
+				return EFilterReturn::Failed;
+			}
+		}
+
+		// It matches all of them, so it passes.
+		return EFilterReturn::Passed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatchesAll_ObjectsSetIsAClass(TSet< const UObject* >& InSet, const UClass* InClass)
+{
+	check(InClass);
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			if (!(*CurClassIt)->IsA(InClass))
+			{
+				// Since it doesn't match one, it fails.
+				return EFilterReturn::Failed;
+			}
+		}
+
+		// It matches all of them, so it passes.
+		return EFilterReturn::Passed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatchesAll_ObjectsSetIsAClass(TSet< const UObject* >& InSet, const TSharedPtr< const IUnloadedBlueprintData > InClass)
+{
+	check(InClass.IsValid());
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			if (!(*CurClassIt)->IsA(UBlueprintGeneratedClass::StaticClass()))
+			{
+				// Since it doesn't match one, it fails.
+				return EFilterReturn::Failed;
+			}
+		}
+
+		// It matches all of them, so it passes.
+		return EFilterReturn::Passed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatchesAll_ClassesSetIsAClass(TSet< const UClass* >& InSet, const UClass* InClass)
+{
+	check(InClass);
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			const UObject* Object = *CurClassIt;
+			if (!Object->IsA(InClass))
+			{
+				// Since it doesn't match one, it fails.
+				return EFilterReturn::Failed;
+			}
+		}
+
+		// It matches all of them, so it passes.
+		return EFilterReturn::Passed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatchesAll_ClassesSetIsAClass(TSet< const UClass* >& InSet, const TSharedPtr< const IUnloadedBlueprintData > InClass)
+{
+	check(InClass.IsValid());
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			const UObject* Object = *CurClassIt;
+			if (!Object->IsA(UBlueprintGeneratedClass::StaticClass()))
+			{
+				// Since it doesn't match one, it fails.
+				return EFilterReturn::Failed;
+			}
+		}
+
+		// It matches all of them, so it passes.
+		return EFilterReturn::Passed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatches_ClassesSetIsAClass(TSet< const UClass* >& InSet, const UClass* InClass)
+{
+	check(InClass);
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			const UObject* Object = *CurClassIt;
+			if (Object->IsA(InClass))
+			{
+				return EFilterReturn::Passed;
+			}
+		}
+
+		return EFilterReturn::Failed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfMatches_ClassesSetIsAClass(TSet< const UClass* >& InSet, const TSharedPtr< const IUnloadedBlueprintData > InClass)
+{
+	check(InClass.IsValid());
+
+	if (InSet.Num())
+	{
+		// If a class is a child of any classes on this list, it will be allowed onto the list, unless it also appears on a disallowed list.
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			const UObject* Object = *CurClassIt;
+			if (Object->IsA(UBlueprintGeneratedClass::StaticClass()))
+			{
+				return EFilterReturn::Passed;
+			}
+		}
+
+		return EFilterReturn::Failed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfInClassesSet(TSet< const UClass* >& InSet, const UClass* InClass)
+{
+	check(InClass);
+
+	if (InSet.Num())
+	{
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			if (InClass == *CurClassIt)
+			{
+				return EFilterReturn::Passed;
+			}
+		}
+		return EFilterReturn::Failed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+EFilterReturn::Type FClassViewerFilterFuncs::IfInClassesSet(TSet< const UClass* >& InSet, const TSharedPtr< const IUnloadedBlueprintData > InClass)
+{
+	check(InClass.IsValid());
+
+	if (InSet.Num())
+	{
+		for (auto CurClassIt = InSet.CreateConstIterator(); CurClassIt; ++CurClassIt)
+		{
+			const TSharedPtr<const FUnloadedBlueprintData> UnloadedBlueprintData = StaticCastSharedPtr<const FUnloadedBlueprintData>(InClass);
+			if (*UnloadedBlueprintData->GetClassViewerNode().Pin()->GetClassName() == (*CurClassIt)->GetName())
+			{
+				return EFilterReturn::Passed;
+			}
+		}
+		return EFilterReturn::Failed;
+	}
+
+	// Since there are none on this list, return that there is no items.
+	return EFilterReturn::NoItems;
+}
+
+/** Checks if a particular class is a brush.
+*	@param InClass				The Class to check.
+*	@return Returns true if the class is a brush.
+*/
+static bool IsBrush(const UClass* InClass)
+{
+	return InClass->IsChildOf(ABrush::StaticClass());
+}
+
+static bool IsBrush(const TSharedRef<const IUnloadedBlueprintData>& InBlueprintData)
+{
+	return InBlueprintData->IsChildOf(ABrush::StaticClass());
+}
+
+/** Checks if a particular class is placeable.
+*	@param InClass				The Class to check.
+*	@return Returns true if the class is placeable.
+*/
+static bool IsPlaceable(const UClass* InClass)
+{
+	return !InClass->HasAnyClassFlags(CLASS_Abstract | CLASS_NotPlaceable) 
+		&& InClass->IsChildOf(AActor::StaticClass());
+}
+
+static bool IsPlaceable(const TSharedRef<const IUnloadedBlueprintData>& InBlueprintData)
+{
+	return !InBlueprintData->HasAnyClassFlags(CLASS_Abstract | CLASS_NotPlaceable)
+		&& InBlueprintData->IsChildOf(AActor::StaticClass());
+}
+
+/** Util class to checks if a particular class can be made into a Blueprint, ignores deprecation
+ *
+ * @param InClass	The class to verify can be made into a Blueprint
+ * @return			true if the class can be made into a Blueprint
+ */
+/*
+static bool CanCreateBlueprintOfClass(UClass* InClass)
+{
+	// Temporarily remove the deprecated flag so we can check if it is valid for
+	bool bIsClassDeprecated = InClass->HasAnyClassFlags(CLASS_Deprecated);
+	InClass->ClassFlags &= ~CLASS_Deprecated;
+
+	bool bCanCreateBlueprintOfClass = FKismetEditorUtilities::CanCreateBlueprintOfClass(InClass);
+
+	// Reassign the deprecated flag if it was previously assigned
+	if (bIsClassDeprecated)
+	{
+		InClass->ClassFlags |= CLASS_Deprecated;
+	}
+
+	return bCanCreateBlueprintOfClass;
+}
+*/
+/** Checks if a node is a blueprint base or not.
+*	@param	InNode	The node to check if it is a blueprint base.
+*	@return			true if the class is a blueprint base.
+*/
+static bool CheckIfBlueprintBase(const TSharedRef<const IUnloadedBlueprintData>& InBlueprintData)
+{
+	if (InBlueprintData->IsNormalBlueprintType())
+	{
+		bool bAllowDerivedBlueprints = false;
+		GConfig->GetBool(TEXT("Kismet"), TEXT("AllowDerivedBlueprints"), /*out*/ bAllowDerivedBlueprints, GEngineIni);
+
+		return bAllowDerivedBlueprints;
+	}
+	return false;
+}
+
+/** Checks if the TestString passes the filter.
+*	@param InTestString			The string to test against the filter.
+*	@param InTextFilter			Compiled text filter to apply.
+*
+*	@return	true if it passes the filter.
+*/
+static bool PassesTextFilter(const FString& InTestString, const TSharedRef<FTextFilterExpressionEvaluator>& InTextFilter)
+{
+	return InTextFilter->TestTextFilter(FBasicStringFilterExpressionContext(InTestString));
+}
+
+/** Returns true if the given class is a REINST class (starts with the 'REINST_' prefix) */
+static bool IsReinstClass(const UClass* Class)
+{
+	static const FString ReinstPrefix = TEXT("REINST");
+	return Class && Class->GetFName().ToString().StartsWith(ReinstPrefix);
+}
+
+FClassViewerFilter::FClassViewerFilter(const FClassViewerInitializationOptions& InInitOptions) :
+	TextFilter(MakeShared<FTextFilterExpressionEvaluator>(ETextFilterExpressionEvaluatorMode::BasicString)),
+	FilterFunctions(MakeShared<FClassViewerFilterFuncs>()),
+	AssetRegistry(FModuleManager::GetModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry")).Get())
+{
+	// Create a game-specific filter, if the referencing property/assets were supplied
+	/*
+	if (GEditor)
+	{
+		FAssetReferenceFilterContext AssetReferenceFilterContext;
+		AssetReferenceFilterContext.ReferencingAssets = InInitOptions.AdditionalReferencingAssets;
+		if (InInitOptions.PropertyHandle.IsValid())
+		{
+			TArray<UObject*> ReferencingObjects;
+			InInitOptions.PropertyHandle->GetOuterObjects(ReferencingObjects);
+			for (UObject* ReferencingObject : ReferencingObjects)
+			{
+				AssetReferenceFilterContext.ReferencingAssets.Add(FAssetData(ReferencingObject));
+			}
+		}
+		AssetReferenceFilter = GEditor->MakeAssetReferenceFilter(AssetReferenceFilterContext);
+	}
+	*/
+}
+
+bool FClassViewerFilter::IsNodeAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef<FClassViewerNode>& InNode, const bool bCheckTextFilter)
+{
+	if (InNode->Class.IsValid())
+	{
+		return IsClassAllowed(InInitOptions, InNode->Class.Get(), FilterFunctions, bCheckTextFilter);
+	}
+	else if (InInitOptions.bShowUnloadedBlueprints && InNode->UnloadedBlueprintData.IsValid())
+	{
+		return IsUnloadedClassAllowed(InInitOptions, InNode->UnloadedBlueprintData.ToSharedRef(), FilterFunctions, bCheckTextFilter);
+	}
+
+	return false;
+}
+
+bool FClassViewerFilter::IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef<class FClassViewerFilterFuncs> InFilterFuncs)
+{
+	const bool bCheckTextFilter = true;
+	return IsClassAllowed(InInitOptions, InClass, InFilterFuncs, bCheckTextFilter);
+}
+
+bool FClassViewerFilter::IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef<class FClassViewerFilterFuncs> InFilterFuncs, const bool bCheckTextFilter)
+{
+	if (InInitOptions.bIsActorsOnly && !InClass->IsChildOf(AActor::StaticClass()))
+	{
+		return false;
+	}
+
+	const bool bPassesBlueprintBaseFilter = !InInitOptions.bIsBlueprintBaseOnly;// || CanCreateBlueprintOfClass(const_cast<UClass*>(InClass));
+	const bool bPassesEditorClassFilter = !InInitOptions.bEditorClassesOnly;// || IsEditorOnlyObject(InClass);
+
+	// Determine if we allow any developer folder classes, if so determine if this class is in one of the allowed developer folders.
+	static const FString DeveloperPathWithSlash = FPackageName::FilenameToLongPackageName(FPaths::GameDevelopersDir());
+	static const FString UserDeveloperPathWithSlash = FPackageName::FilenameToLongPackageName(FPaths::GameUserDeveloperDir());
+	const FString GeneratedClassPathString = InClass->GetPathName();
+
+	//const UClassViewerSettings* ClassViewerSettings = GetDefault<UClassViewerSettings>();
+
+	bool bPassesDeveloperFilter = true;
+	/*
+	EClassViewerDeveloperType AllowedDeveloperType = ClassViewerSettings->DeveloperFolderType;
+	if (AllowedDeveloperType == EClassViewerDeveloperType::CVDT_None)
+	{
+		bPassesDeveloperFilter = !GeneratedClassPathString.StartsWith(DeveloperPathWithSlash);
+	}
+	else if (AllowedDeveloperType == EClassViewerDeveloperType::CVDT_CurrentUser)
+	{
+		if (GeneratedClassPathString.StartsWith(DeveloperPathWithSlash))
+		{
+			bPassesDeveloperFilter = GeneratedClassPathString.StartsWith(UserDeveloperPathWithSlash);
+		}
+	}
+	*/
+	
+	// The INI files declare classes and folders that are considered internal only. Does this class match any of those patterns?
+	// INI path: /Script/ClassViewer.ClassViewerProjectSettings
+	bool bPassesInternalFilter = true;
+	if (/*!ClassViewerSettings->DisplayInternalClasses*/ true)
+	{
+		for (const FDirectoryPath& DirPath : InternalPaths)
+		{
+			if (GeneratedClassPathString.StartsWith(DirPath.Path))
+			{
+				bPassesInternalFilter = false;
+				break;
+			}
+		}
+
+		if (bPassesInternalFilter)
+		{
+			for (const UClass* Class : InternalClasses)
+			{
+				if (InClass->IsChildOf(Class))
+				{
+					bPassesInternalFilter = false;
+					break;
+				}
+			}
+		}
+	}
+
+	// The INI files can contain a list of globally allowed classes - if it does, then only classes whose names match will be shown.
+	bool bPassesAllowedClasses = true;
+	/*
+	if (ClassViewerSettings->AllowedClasses.Num() > 0)
+	{
+		if (!ClassViewerSettings->AllowedClasses.Contains(GeneratedClassPathString))
+		{
+			bPassesAllowedClasses = false;
+		}
+	}
+	*/
+
+	bool bPassesPlaceableFilter = true;
+	if (InInitOptions.bIsPlaceableOnly)
+	{
+		bPassesPlaceableFilter = IsPlaceable(InClass) && 
+			(InInitOptions.Mode == EClassViewerMode::ClassPicker || !IsBrush(InClass));
+	}
+
+	bool bPassesCustomFilter = true;
+	for (const TSharedRef<IClassViewerFilter>& CustomFilter : InInitOptions.ClassFilters)
+	{
+		if (!CustomFilter->IsClassAllowed(InInitOptions, InClass, FilterFunctions))
+		{
+			bPassesCustomFilter = false;
+			break;
+		}
+	}
+
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
+	// Retained for backcompat; can remove when fully deprecated.
+	if (bPassesCustomFilter && InInitOptions.ClassFilter.IsValid())
+	{
+		bPassesCustomFilter = InInitOptions.ClassFilter->IsClassAllowed(InInitOptions, InClass, FilterFunctions);
+	}
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
+
+	bool bPassesGlobalClassFilter = true;
+	/*
+	if (const TSharedPtr<IClassViewerFilter>& GlobalClassFilter = FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").GetGlobalClassViewerFilter())
+	{
+		bPassesGlobalClassFilter = GlobalClassFilter->IsClassAllowed(InInitOptions, InClass, FilterFunctions);
+	}
+	*/
+
+	bool bPassesTextFilter = true;
+	if (bCheckTextFilter && (TextFilter->GetFilterType() != ETextFilterExpressionType::Empty))
+	{
+		FString ClassNameWithCppPrefix = FString::Printf(TEXT("%s%s"), InClass->GetPrefixCPP(), *InClass->GetName());
+		bPassesTextFilter = PassesTextFilter(InClass->GetName(), TextFilter) || PassesTextFilter(ClassNameWithCppPrefix, TextFilter) || PassesTextFilter(FRuntimeMetaData::GetDisplayNameText(InClass).ToString(), TextFilter);
+
+		// If the class is deprecated, try searching without the deprecated name inserted, in case a user typed a string
+		if (!bPassesTextFilter && InClass->HasAnyClassFlags(CLASS_Deprecated))
+		{
+			ClassNameWithCppPrefix.RemoveAt(1, 11);
+			bPassesTextFilter |= PassesTextFilter(ClassNameWithCppPrefix, TextFilter);
+		}
+	}
+
+	bool bPassesAssetReferenceFilter = true;
+	/*
+	if (AssetReferenceFilter.IsValid() && !InClass->IsNative())
+	{
+		bPassesAssetReferenceFilter = AssetReferenceFilter->PassesFilter(FAssetData(InClass));
+	}
+	*/
+
+	// REINST classes cannot be used in any class viewer. 
+	const bool bPassesReinstFilter = !IsReinstClass(InClass);
+
+	bool bPassesFilter = bPassesAllowedClasses && bPassesPlaceableFilter && bPassesBlueprintBaseFilter
+		&& bPassesDeveloperFilter && bPassesInternalFilter && bPassesEditorClassFilter 
+		&& bPassesCustomFilter && bPassesGlobalClassFilter && bPassesTextFilter && bPassesAssetReferenceFilter
+		&& bPassesReinstFilter;
+
+	return bPassesFilter;
+}
+
+bool FClassViewerFilter::IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef<const IUnloadedBlueprintData> InUnloadedClassData, TSharedRef<FClassViewerFilterFuncs> InFilterFuncs)
+{
+	const bool bCheckTextFilter = true;
+	return IsUnloadedClassAllowed(InInitOptions, InUnloadedClassData, InFilterFuncs, bCheckTextFilter);
+}
+
+bool FClassViewerFilter::IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef<const IUnloadedBlueprintData> InUnloadedClassData, TSharedRef<FClassViewerFilterFuncs> InFilterFuncs, const bool bCheckTextFilter)
+{
+	if (InInitOptions.bIsActorsOnly && !InUnloadedClassData->IsChildOf(AActor::StaticClass()))
+	{
+		return false;
+	}
+
+	const bool bIsBlueprintBase = CheckIfBlueprintBase(InUnloadedClassData);
+	const bool bPassesBlueprintBaseFilter = !InInitOptions.bIsBlueprintBaseOnly || bIsBlueprintBase;
+
+	// Determine if we allow any developer folder classes, if so determine if this class is in one of the allowed developer folders.
+	static const FString DeveloperPathWithSlash = FPackageName::FilenameToLongPackageName(FPaths::GameDevelopersDir());
+	static const FString UserDeveloperPathWithSlash = FPackageName::FilenameToLongPackageName(FPaths::GameUserDeveloperDir());
+	FString GeneratedClassPathString = InUnloadedClassData->GetClassPathName().ToString();
+
+	bool bPassesDeveloperFilter = true;
+
+	/*
+	const UClassViewerSettings* ClassViewerSettings = GetDefault<UClassViewerSettings>();
+	EClassViewerDeveloperType AllowedDeveloperType = ClassViewerSettings->DeveloperFolderType;
+	if (AllowedDeveloperType == EClassViewerDeveloperType::CVDT_None)
+	{
+		bPassesDeveloperFilter = !GeneratedClassPathString.StartsWith(DeveloperPathWithSlash);
+	}
+	else if (AllowedDeveloperType == EClassViewerDeveloperType::CVDT_CurrentUser)
+	{
+		if (GeneratedClassPathString.StartsWith(DeveloperPathWithSlash))
+		{
+			bPassesDeveloperFilter = GeneratedClassPathString.StartsWith(UserDeveloperPathWithSlash);
+		}
+	}
+	*/
+
+	// The INI files declare classes and folders that are considered internal only. Does this class match any of those patterns?
+	// INI path: /Script/ClassViewer.ClassViewerProjectSettings
+	bool bPassesInternalFilter = true;
+	/*
+	if (!ClassViewerSettings->DisplayInternalClasses)
+	{
+		for (const FDirectoryPath& DirPath : InternalPaths)
+		{
+			if (GeneratedClassPathString.StartsWith(DirPath.Path))
+			{
+				bPassesInternalFilter = false;
+				break;
+			}
+		}
+	}
+	*/
+
+	// The INI files can contain a list of globally allowed classes - if it does, then only classes whose names match will be shown.
+	bool bPassesAllowedClasses = true;
+	/*
+	if (ClassViewerSettings->AllowedClasses.Num() > 0)
+	{
+		if (!ClassViewerSettings->AllowedClasses.Contains(GeneratedClassPathString))
+		{
+			bPassesAllowedClasses = false;
+		}
+	}
+	*/
+
+	bool bPassesPlaceableFilter = true;
+	if (InInitOptions.bIsPlaceableOnly)
+	{
+		bPassesPlaceableFilter = IsPlaceable(InUnloadedClassData) &&
+			(InInitOptions.Mode == EClassViewerMode::ClassPicker || !IsBrush(InUnloadedClassData));
+	}
+
+	bool bPassesCustomFilter = true;
+	for (const TSharedRef<IClassViewerFilter>& CustomFilter : InInitOptions.ClassFilters)
+	{
+		if (!CustomFilter->IsUnloadedClassAllowed(InInitOptions, InUnloadedClassData, FilterFunctions))
+		{
+			bPassesCustomFilter = false;
+			break;
+		}
+	}
+
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
+	// Retained for backcompat; can remove when fully deprecated.
+	if (bPassesCustomFilter && InInitOptions.ClassFilter.IsValid())
+	{
+		bPassesCustomFilter = InInitOptions.ClassFilter->IsUnloadedClassAllowed(InInitOptions, InUnloadedClassData, FilterFunctions);
+	}
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
+
+
+	bool bPassesGlobalClassFilter = true;
+	/*
+	if (const TSharedPtr<IClassViewerFilter>& GlobalClassFilter = FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").GetGlobalClassViewerFilter())
+	{
+		bPassesGlobalClassFilter = GlobalClassFilter->IsUnloadedClassAllowed(InInitOptions, InUnloadedClassData, FilterFunctions);
+	}
+	*/
+
+	const bool bPassesTextFilter = PassesTextFilter(*InUnloadedClassData->GetClassName().Get(), TextFilter);
+
+	bool bPassesAssetReferenceFilter = true;
+	/*
+	if (AssetReferenceFilter.IsValid() && bIsBlueprintBase)
+	{
+		FString BlueprintAssetPath = GeneratedClassPathString;
+		FAssetData BlueprintAssetData = AssetRegistry.GetAssetByObjectPath(FSoftObjectPath(BlueprintAssetPath));
+		if (!BlueprintAssetData.IsValid())
+		{
+			BlueprintAssetPath = GeneratedClassPathString.LeftChop(2); // Chop off _C
+			BlueprintAssetData = AssetRegistry.GetAssetByObjectPath(FSoftObjectPath(BlueprintAssetPath));
+		}
+
+		if (BlueprintAssetData.IsValid())
+		{
+			bPassesAssetReferenceFilter = AssetReferenceFilter->PassesFilter(BlueprintAssetData);
+		}
+		else
+		{
+			UE_LOG(LogEditorClassViewer, Warning, TEXT("Blueprint class cannot be found: %s"), *GeneratedClassPathString);
+		}
+	}
+	*/
+
+	bool bPassesFilter = bPassesPlaceableFilter && bPassesBlueprintBaseFilter && bPassesDeveloperFilter 
+		&& bPassesInternalFilter && bPassesCustomFilter && bPassesGlobalClassFilter
+		&& (!bCheckTextFilter || bPassesTextFilter) && bPassesAssetReferenceFilter;
+
+	return bPassesFilter;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerNode.cpp b/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerNode.cpp
new file mode 100644
index 0000000..b824047
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerNode.cpp
@@ -0,0 +1,170 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeClassViewer/ClassViewerNode.h"
+#include "RuntimeClassViewer/ClassViewerFilter.h"
+#include "Engine/Blueprint.h"
+#include "Engine/Brush.h"
+#include "GameFramework/Actor.h"
+#include "HAL/Platform.h"
+#include "HAL/PlatformCrt.h"
+#include "Internationalization/Text.h"
+#include "Misc/AssertionMacros.h"
+#include "Misc/StringFormatArg.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Templates/Casts.h"
+#include "UObject/Class.h"
+#include "UObject/Object.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/UObjectGlobals.h"
+#include "UObject/UnrealNames.h"
+#include "UObject/WeakObjectPtr.h"
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+
+FClassViewerNode::FClassViewerNode(UClass* InClass)
+{
+	Class = InClass;
+	ClassName = MakeShareable(new FString(Class->GetName()));
+	ClassDisplayName = MakeShareable(new FString(FRuntimeMetaData::GetDisplayNameText(InClass).ToString()));
+	ClassPath = Class->GetPathName();
+
+	if (Class->GetSuperClass())
+	{
+		ParentClassPath = Class->GetSuperClass()->GetClassPathName();
+	}
+#if WITH_EDITORONLY_DATA
+	if (Class->ClassGeneratedBy && Class->ClassGeneratedBy->IsA(UBlueprint::StaticClass()))
+	{
+		Blueprint = Cast<UBlueprint>(Class->ClassGeneratedBy);
+	}
+	else
+#endif
+	{
+		Blueprint = nullptr;
+	}
+
+	bPassesFilter = false;
+	bPassesFilterRegardlessTextFilter = false;
+}
+
+FClassViewerNode::FClassViewerNode(const FString& InClassName, const FString& InClassDisplayName)
+{
+	ClassName = MakeShareable(new FString(InClassName));
+	ClassDisplayName = MakeShareable(new FString(InClassDisplayName));
+	bPassesFilter = false;
+	bPassesFilterRegardlessTextFilter = false;
+
+	Class = nullptr;
+	Blueprint = nullptr;
+}
+
+FClassViewerNode::FClassViewerNode( const FClassViewerNode& InCopyObject)
+{
+	ClassName = InCopyObject.ClassName;
+	ClassDisplayName = InCopyObject.ClassDisplayName;
+	bPassesFilter = InCopyObject.bPassesFilter;
+	bPassesFilterRegardlessTextFilter = InCopyObject.bPassesFilterRegardlessTextFilter;
+
+	Class = InCopyObject.Class;
+	Blueprint = InCopyObject.Blueprint;
+	
+	UnloadedBlueprintData = InCopyObject.UnloadedBlueprintData;
+
+	ClassPath = InCopyObject.ClassPath;
+	ParentClassPath = InCopyObject.ParentClassPath;
+	ClassName = InCopyObject.ClassName;
+	BlueprintAssetPath = InCopyObject.BlueprintAssetPath;
+
+	// We do not want to copy the child list, do not add it. It should be the only item missing.
+}
+
+/**
+ * Adds the specified child to the node.
+ *
+ * @param	Child							The child to be added to this node for the tree.
+ */
+void FClassViewerNode::AddChild( TSharedPtr<FClassViewerNode> Child )
+{
+	check(Child.IsValid());
+	Child->ParentNode = AsShared();
+	ChildrenList.Add(Child);
+}
+
+bool FClassViewerNode::IsRestricted() const
+{
+	return PropertyHandle.IsValid() && PropertyHandle->IsRestricted(*ClassName);
+}
+
+TSharedPtr<FString> FClassViewerNode::GetClassName(EClassViewerNameTypeToDisplay NameType) const
+{
+	switch (NameType)
+	{
+	case EClassViewerNameTypeToDisplay::ClassName:
+		return ClassName;
+		break;
+	case EClassViewerNameTypeToDisplay::DisplayName:
+		return ClassDisplayName;
+		break;
+	case EClassViewerNameTypeToDisplay::Dynamic:
+		FString CombinedName;
+		FString SanitizedName = FName::NameToDisplayString(*ClassName.Get(), false);
+		if (ClassDisplayName.IsValid() && !ClassDisplayName->IsEmpty() && !ClassDisplayName->Equals(SanitizedName) && !ClassDisplayName->Equals(*ClassName.Get()))
+		{
+			TArray<FStringFormatArg> Args;
+			Args.Add(*ClassName.Get());
+			Args.Add(*ClassDisplayName.Get());
+			CombinedName = FString::Format(TEXT("{0} ({1})"), Args);
+		}
+		else
+		{
+			CombinedName = *ClassName.Get();
+		}
+		return MakeShareable(new FString(CombinedName));
+		break;
+	}
+
+	ensureMsgf(false, TEXT("FClassViewerNode::GetClassName called with invalid name type."));
+	return ClassName;
+}
+
+bool FClassViewerNode::IsClassPlaceable() const
+{
+	const UClass* LoadedClass = Class.Get();
+	if (LoadedClass)
+	{
+		const bool bPlaceableFlags = !LoadedClass->HasAnyClassFlags(CLASS_Abstract | CLASS_NotPlaceable);
+		const bool bBasedOnActor = LoadedClass->IsChildOf(AActor::StaticClass());
+		const bool bNotABrush = !LoadedClass->IsChildOf(ABrush::StaticClass());
+		return bPlaceableFlags && bBasedOnActor && bNotABrush;
+	}
+
+	if (UnloadedBlueprintData.IsValid())
+	{
+		const bool bPlaceableFlags = !UnloadedBlueprintData->HasAnyClassFlags(CLASS_Abstract | CLASS_NotPlaceable);
+		const bool bBasedOnActor = UnloadedBlueprintData->IsChildOf(AActor::StaticClass());
+		const bool bNotABrush = !UnloadedBlueprintData->IsChildOf(ABrush::StaticClass());
+		return bPlaceableFlags && bBasedOnActor && bNotABrush;
+	}
+
+	return false;
+}
+
+bool FClassViewerNode::IsBlueprintClass() const
+{
+	return !BlueprintAssetPath.IsNull();
+}
+
+bool FClassViewerNode::IsEditorOnlyClass() const
+{
+	return Class.IsValid();//&& IsEditorOnlyObject(Class.Get());
+}
+
+TSharedPtr< FClassViewerNode > FClassViewerNode::GetParentNode() const
+{
+	return ParentNode.Pin();
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerNode.h b/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerNode.h
new file mode 100644
index 0000000..ac5e0c0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeClassViewer/ClassViewerNode.h
@@ -0,0 +1,127 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimeClassViewer/ClassViewerModule.h"
+#include "Containers/Array.h"
+#include "Containers/UnrealString.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/NameTypes.h"
+#include "UObject/TopLevelAssetPath.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class UBlueprint;
+class UClass;
+
+namespace soda
+{
+
+class IPropertyHandle;
+class IUnloadedBlueprintData;
+
+class FClassViewerNode : public TSharedFromThis<FClassViewerNode>
+{
+public:
+	FClassViewerNode(UClass* Class);
+
+	/**
+	 * Creates a node for the widget's tree.
+	 *
+	 * @param	InClassName						The name of the class this node represents.
+	 * @param	InClassDisplayName				The display name of the class this node represents
+	 * @param	bInIsPlaceable					true if the class is a placeable class.
+	 */
+	FClassViewerNode( const FString& InClassName, const FString& InClassDisplayName );
+
+	FClassViewerNode( const FClassViewerNode& InCopyObject);
+
+	/**
+	 * Adds the specified child to the node.
+	 *
+	 * @param	Child							The child to be added to this node for the tree.
+	 */
+	void AddChild( TSharedPtr<FClassViewerNode> Child );
+
+	/** 
+	 * Retrieves the class name this node is associated with. This is not the literal UClass name as it is missing the _C for blueprints
+	 * @param	bUseDisplayName	Whether to use the display name or class name
+	 */
+	TSharedPtr<FString> GetClassName(bool bUseDisplayName = false) const
+	{
+		return bUseDisplayName ? ClassDisplayName : ClassName;
+	}
+
+	/**
+	 * Retrieves the class name this node is associated with. This is not the literal UClass name as it is missing the _C for blueprints
+	 * @param	NameType	Whether to use the display name or class name
+	 */
+	TSharedPtr<FString> GetClassName(EClassViewerNameTypeToDisplay NameType) const;
+
+	/** Retrieves the children list. */
+	TArray<TSharedPtr<FClassViewerNode>>& GetChildrenList()
+	{
+		return ChildrenList;
+	}
+
+	/** Checks if the class is placeable. */
+	bool IsClassPlaceable() const;
+
+	/** Checks if this is a blueprint */
+	bool IsBlueprintClass() const;
+
+	/** Checks if this is an editor module class */
+	bool IsEditorOnlyClass() const;
+
+	/** Rather this class is not allowed for the specific context */
+	bool IsRestricted() const;
+
+	/** Get the parent node for this node. */
+	TSharedPtr< FClassViewerNode > GetParentNode() const;
+
+private:
+	/** The nontranslated internal name for this class. This is not necessarily the UClass's name, as that may have _C for blueprints */
+	TSharedPtr<FString> ClassName;
+
+	/** The translated display name for this class */
+	TSharedPtr<FString> ClassDisplayName;
+
+	/** List of children. */
+	TArray<TSharedPtr<FClassViewerNode>> ChildrenList;
+
+	/** Pointer to the parent to this object. */
+	TWeakPtr< FClassViewerNode > ParentNode;
+
+public:
+	/** The class this node is associated with. */
+	TWeakObjectPtr<UClass> Class;
+
+	/** The blueprint this node is associated with. */
+	TWeakObjectPtr<UBlueprint> Blueprint;
+
+	/** Full object path to the class including _C, set for both blueprint and native */
+	FTopLevelAssetPath ClassPath;
+
+	/** Full object path to the parent class, may be blueprint or native */
+	FTopLevelAssetPath ParentClassPath;
+
+	/** Full path to the Blueprint that this class is loaded from, none for native classes*/
+	FSoftObjectPath BlueprintAssetPath;
+
+	/** true if the class passed the filter. */
+	bool bPassesFilter;
+
+	/** 
+	 * true if the class passed all the sub-filters of the filter (regardless of the TextFilter one).
+	 * This could be useful to verify e.g., that the parent class of a IsNodeAllowed() object is also valid (even though that parent will not likely pass the TextFilter).
+	 */
+	bool bPassesFilterRegardlessTextFilter;
+
+	/** Data for unloaded blueprints, only valid if the class is unloaded. */
+	TSharedPtr< IUnloadedBlueprintData > UnloadedBlueprintData;
+
+	/** The property this node will be working on. */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimeClassViewer/SClassViewer.cpp b/Source/RuntimeEditor/Private/RuntimeClassViewer/SClassViewer.cpp
new file mode 100644
index 0000000..914ef24
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeClassViewer/SClassViewer.cpp
@@ -0,0 +1,2771 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeClassViewer/SClassViewer.h"
+
+//#include "AddToProjectConfig.h"
+//#include "AssetDiscoveryIndicator.h"
+#include "AssetRegistry/AssetData.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "AssetRegistry/IAssetRegistry.h"
+//#include "AssetToolsModule.h"
+#include "Blueprint/BlueprintSupport.h"
+#include "RuntimeClassViewer/ClassViewerFilter.h"
+#include "RuntimeClassViewer/ClassViewerNode.h"
+//#include "RuntimeClassViewer/ClassViewerProjectSettings.h"
+#include "Containers/ArrayView.h"
+#include "Containers/UnrealString.h"
+//#include "ContentBrowserDataDragDropOp.h"
+//#include "ContentBrowserModule.h"
+#include "CoreGlobals.h"
+#include "CoreTypes.h"
+//#include "Dialogs/Dialogs.h"
+//#include "DragAndDrop/ClassDragDropOp.h"
+//#include "Editor.h"
+//#include "Editor/EditorEngine.h"
+//#include "Editor/UnrealEdEngine.h"
+//#include "EditorClassUtils.h"
+//#include "EditorDirectories.h"
+//#include "EditorWidgetsModule.h"
+#include "Engine/Blueprint.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/Commands/UICommandInfo.h"
+#include "Framework/Docking/TabManager.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Framework/SlateDelegates.h"
+#include "Framework/Views/ITypedTableView.h"
+//#include "GameProjectGenerationModule.h"
+#include "HAL/PlatformMisc.h"
+//#include "IAssetTools.h"
+//#include "IContentBrowserSingleton.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "Input/Events.h"
+#include "InputCoreTypes.h"
+#include "Internationalization/Internationalization.h"
+//#include "Kismet2/KismetEditorUtilities.h"
+#include "Layout/Children.h"
+#include "Layout/Margin.h"
+#include "Layout/Visibility.h"
+#include "Layout/WidgetPath.h"
+#include "Logging/LogCategory.h"
+#include "Logging/LogMacros.h"
+#include "Logging/MessageLog.h"
+#include "Math/Color.h"
+#include "Misc/AssertionMacros.h"
+#include "Misc/Attribute.h"
+#include "Misc/CString.h"
+#include "Misc/FeedbackContext.h"
+#include "Misc/MessageDialog.h"
+#include "Misc/PackageName.h"
+#include "Misc/Paths.h"
+#include "Misc/TextFilterExpressionEvaluator.h"
+#include "Modules/ModuleManager.h"
+//#include "PackageTools.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "SodaEditorWidgets/SListViewSelectorDropdownMenu.h"
+#include "SlateOptMacros.h"
+#include "SlotBase.h"
+//#include "SourceCodeNavigation.h"
+#include "Styling/AppStyle.h"
+#include "Styling/ISlateStyle.h"
+#include "Styling/SlateColor.h"
+#include "Styling/SlateIconFinder.h"
+//#include "Subsystems/AssetEditorSubsystem.h"
+#include "Templates/Casts.h"
+#include "Textures/SlateIcon.h"
+#include "Trace/Detail/Channel.h"
+#include "Types/SlateStructs.h"
+#include "UObject/Class.h"
+#include "UObject/Object.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/Package.h"
+#include "UObject/SoftObjectPath.h"
+#include "UObject/TopLevelAssetPath.h"
+#include "UObject/UObjectBase.h"
+#include "UObject/UObjectGlobals.h"
+#include "UObject/UObjectIterator.h"
+#include "UObject/UnrealNames.h"
+#include "UObject/WeakObjectPtr.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+#include "RuntimeClassViewer/UnloadedBlueprintData.h"
+//#include "UnrealEdGlobals.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SScrollBorder.h"
+#include "Widgets/Layout/SSeparator.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/SNullWidget.h"
+#include "Widgets/SOverlay.h"
+#include "Widgets/SToolTip.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Views/SExpanderArrow.h"
+#include "Widgets/Views/SHeaderRow.h"
+#include "Widgets/Views/STableRow.h"
+#include "RuntimeEditorUtils.h"
+#include "RuntimeMetaData.h"
+
+class FUICommandList;
+class ITableRow;
+class SWidget;
+struct FGeometry;
+struct FSlateBrush;
+
+#define LOCTEXT_NAMESPACE "SClassViewer"
+
+namespace soda
+{
+
+//////////////////////////////////////////////////////////////
+
+struct FClassViewerNodeNameLess
+{
+	FClassViewerNodeNameLess(EClassViewerNameTypeToDisplay NameTypeToDisplay = EClassViewerNameTypeToDisplay::ClassName) : NameTypeToDisplay(NameTypeToDisplay) {}
+
+	bool operator()(TSharedPtr<FClassViewerNode> A, TSharedPtr<FClassViewerNode> B) const
+	{ 
+		check(A.IsValid());
+		check(B.IsValid());
+
+		// The display name only matters when NameTypeToDisplay == DisplayName. For NameTypeToDisplay == Dynamic,
+		// the class name is displayed first with the display name in parentheses, but only if it differs from the display name.
+		bool bUseDisplayName = NameTypeToDisplay == EClassViewerNameTypeToDisplay::DisplayName;
+		const FString& NameA = *A->GetClassName(bUseDisplayName).Get();
+		const FString& NameB = *B->GetClassName(bUseDisplayName).Get();
+		return NameA.Compare(NameB, ESearchCase::IgnoreCase) < 0;
+	}
+
+	EClassViewerNameTypeToDisplay NameTypeToDisplay;
+};
+
+class FClassHierarchy
+{
+public:
+	FClassHierarchy();
+	~FClassHierarchy();
+
+	/** Populates the class hierarchy tree, pulling in all the loaded and unloaded classes. */
+	void PopulateClassHierarchy();
+	void PopulateClassHierarchy(const FAssetData& InAssetData) { PopulateClassHierarchy(); }
+
+	/** Recursive function to sort a tree.
+	 *	@param InOutRootNode						The current node to sort.
+	 */	
+	void SortChildren(TSharedPtr< FClassViewerNode >& InRootNode);
+
+	/** Checks if a particular class is placeable.
+	 *	@return The ObjectClassRoot for building a duplicate tree using.
+	 */
+	const TSharedPtr< FClassViewerNode > GetObjectRootNode() const
+	{
+		// This node should always be valid.
+		check(ObjectClassRoot.IsValid())
+
+		return ObjectClassRoot;
+	}
+
+	/** Finds the parent of a node, recursively going deeper into the hierarchy.
+	 *	@param InRootNode							The current class node to examine.
+	 *	@param InParentClassName					The classname to look for.
+	 *	@param InParentClass						The parent class to look for.
+	 *
+	 *	@return The parent node.
+	 */
+	TSharedPtr< FClassViewerNode > FindParent(const TSharedPtr< FClassViewerNode >& InRootNode, FTopLevelAssetPath InParentClassname, const UClass* InParentClass);
+
+	/** Updates the Class of a node. Uses the generated class package name to find the node.
+	 *	@param InGeneratedClassPath		The path of the generated class to find the node for.
+	 *	@param InNewClass				The class to update the node with.
+	*/
+	void UpdateClassInNode(FTopLevelAssetPath InGeneratedClassPath, UClass* InNewClass, UBlueprint* InNewBluePrint );
+
+	/** Finds the node, recursively going deeper into the hierarchy. Does so by comparing generated class package names.
+	 *	@param InGeneratedClassPath		The path of the generated class to find the node for.
+	 *
+	 *	@return The node.
+	 */
+	TSharedPtr< FClassViewerNode > FindNodeByGeneratedClassPath(const TSharedPtr< FClassViewerNode >& InRootNode, FTopLevelAssetPath InGeneratedClassPath);
+
+private:
+	/** Adds UClass information to The node in InOutClassPathToNode for every loaded class, creating the node if it does not exist. Does not filter classes.
+	 *	@param OutRootNode						Out parameter that receives the node pointer for the root UClass.
+	 *  @param InOutClassPathToNode				Map containing all nodes.
+	 */	
+	void CreateNodesForLoadedClasses( TSharedPtr<FClassViewerNode>& OutRootNode, TMap<FTopLevelAssetPath, TSharedPtr< FClassViewerNode >>& InOutClassPathToNode );
+
+	/** Called when reload has finished */
+	void OnReloadComplete( EReloadCompleteReason Reason );
+
+	/** 
+	 * Makes or updates a class viewer node with the data for an unloaded blueprint asset.
+	 *
+	 * @param InOutClassViewerNode		The node to save all the data into.
+	 * @param InAssetData				The asset data to pull the tags from.
+	 * @parma InClassPath				The class path
+	 */
+	void CreateOrUpdateUnloadedClassNode(TSharedPtr<FClassViewerNode>& InOutClassViewerNode, const FAssetData& InAssetData, FTopLevelAssetPath InClassPath);
+
+	/**
+	 * Finds the UClass and UBlueprint for the passed in node, utilizing unloaded data to find it.
+	 *
+	 * @param InOutClassNode		The node to find the class and fill out.
+	 */
+	void FindClass(TSharedPtr< FClassViewerNode > InOutClassNode);
+
+	/** Sets the fields calculated from the in-memory UClass on the given Node, if not already set. */
+	void SetClassFields(TSharedPtr<FClassViewerNode>& InOutClassNode, UClass& Class);
+
+	/** 
+	 * Recursively searches through the hierarchy to find and remove the asset. Used when deleting assets.
+	 *
+	 * @param InRootNode	The node to start the search with.
+	 * @param InClassPath	The class path of the asset to delete
+	 *
+	 * @return Returns true if the asset was found and deleted successfully.
+	 */
+	bool FindAndRemoveNodeByClassPath(const TSharedPtr< FClassViewerNode >& InRootNode, FTopLevelAssetPath InClassPath);
+
+	/** Callback registered to the Asset Registry to be notified when an asset is added. */
+	void AddAsset(const FAssetData& InAddedAssetData);
+
+	/** Callback registered to the Asset Registry to be notified when an asset is removed. */
+	void RemoveAsset(const FAssetData& InRemovedAssetData);
+private:
+	/** The "Object" class node that is used as a rooting point for the Class Viewer. */
+	TSharedPtr< FClassViewerNode > ObjectClassRoot;
+
+	/** Handles to various registered RequestPopulateClassHierarchy delegates */
+	//FDelegateHandle OnFilesLoadedRequestPopulateClassHierarchyDelegateHandle;
+	//FDelegateHandle OnBlueprintCompiledRequestPopulateClassHierarchyDelegateHandle;
+	//FDelegateHandle OnClassPackageLoadedOrUnloadedRequestPopulateClassHierarchyDelegateHandle;
+};
+
+namespace ClassViewer
+{
+	namespace Helpers
+	{
+		DECLARE_MULTICAST_DELEGATE( FPopulateClassViewer );
+
+		/** The class hierarchy that manages the unfiltered class tree for the Class Viewer. */
+		static TSharedPtr< FClassHierarchy > ClassHierarchy;
+
+		/** Used to inform any registered Class Viewers to refresh. */
+		static FPopulateClassViewer PopulateClassviewerDelegate;
+
+		/** true if the Class Hierarchy should be populated. */
+		static bool bPopulateClassHierarchy;
+
+		// Pre-declare these functions.
+		static UBlueprint* GetBlueprint( UClass* InClass );
+		static void UpdateClassInNode(FTopLevelAssetPath InGeneratedClassPath, UClass* InNewClass, UBlueprint* InNewBluePrint );
+
+		/** Util class to checks if a particular class can be made into a Blueprint, ignores deprecation
+		 *
+		 * @param InClass					The class to verify can be made into a Blueprint
+		 * @return							TRUE if the class can be made into a Blueprint
+		 */
+	
+		bool CanCreateBlueprintOfClass_IgnoreDeprecation(UClass* InClass)
+		{
+			// Temporarily remove the deprecated flag so we can check if it is valid for
+			bool bIsClassDeprecated = InClass->HasAnyClassFlags(CLASS_Deprecated);
+			InClass->ClassFlags &= ~CLASS_Deprecated;
+
+			bool bCanCreateBlueprintOfClass = FRuntimeEditorUtils::CanCreateBlueprintOfClass( InClass );
+
+			// Reassign the deprecated flag if it was previously assigned
+			if(bIsClassDeprecated)
+			{
+				InClass->ClassFlags |= CLASS_Deprecated;
+			}
+
+			return bCanCreateBlueprintOfClass;
+		}
+		
+
+		/** Checks if a particular class is abstract.
+		 *	@param InClass				The Class to check.
+		 *	@return Returns true if the class is abstract.
+		 */
+		static bool IsAbstract(const UClass* InClass)
+		{
+			return InClass->HasAnyClassFlags(CLASS_Abstract);
+		}
+
+		/** Will create the instance of FClassHierarchy and populate the class hierarchy tree. */
+		static void ConstructClassHierarchy()
+		{
+			if(!ClassHierarchy.IsValid())
+			{
+				ClassHierarchy = MakeShareable(new FClassHierarchy);
+
+				// When created, populate the hierarchy.
+				GWarn->BeginSlowTask( LOCTEXT("RebuildingClassHierarchy", "Rebuilding Class Hierarchy"), true );
+				ClassHierarchy->PopulateClassHierarchy();
+				GWarn->EndSlowTask();
+			}
+		}
+
+		/** Cleans up the Class Hierarchy */
+		static void DestroyClassHierachy()
+		{
+			ClassHierarchy.Reset();
+		}
+
+		/** Will populate the class hierarchy tree if previously requested. */
+		static void PopulateClassHierarchy()
+		{
+			if(bPopulateClassHierarchy)
+			{
+				bPopulateClassHierarchy = false;
+
+				GWarn->BeginSlowTask( LOCTEXT("RebuildingClassHierarchy", "Rebuilding Class Hierarchy"), true );
+				ClassHierarchy->PopulateClassHierarchy();
+				GWarn->EndSlowTask();
+			}
+		}
+
+		/** Will enable the Class Hierarchy to be populated next Tick. */
+		static void RequestPopulateClassHierarchy()
+		{
+			bPopulateClassHierarchy = true;
+		}
+
+		/** Refreshes all registered instances of Class Viewer/Pickers. */
+		static void RefreshAll()
+		{
+			ClassViewer::Helpers::PopulateClassviewerDelegate.Broadcast();
+		}
+
+		/** Recursive function to build a tree, filtering out nodes based on the InitOptions and filter search terms.
+		 *	@param InOutRootNode						The node that this function will add the children of to the tree.
+		 *	@param InRootClassIndex						The index of the root node.
+		 *	@param InClassFilter						The class filter to use to filter nodes.
+		 *	@param InInitOptions						The class viewer's options, holds the AllowedClasses and DisallowedClasses.
+		 *
+		 *	@return Returns true if the child passed the filter.
+		 */
+		static bool AddChildren_Tree(TSharedPtr< FClassViewerNode >& InOutRootNode, const TSharedPtr< FClassViewerNode >& InOriginalRootNode, 
+			const TSharedPtr<FClassViewerFilter>& InClassFilter, const FClassViewerInitializationOptions& InInitOptions)
+		{
+			bool bCheckTextFilter = true;
+			InOutRootNode->bPassesFilter = InClassFilter->IsNodeAllowed(InInitOptions, InOutRootNode.ToSharedRef(), bCheckTextFilter);
+
+			bool bReturnPassesFilter = InOutRootNode->bPassesFilter;
+
+			bCheckTextFilter = false;
+			InOutRootNode->bPassesFilterRegardlessTextFilter = bReturnPassesFilter || InClassFilter->IsNodeAllowed(InInitOptions, InOutRootNode.ToSharedRef(), bCheckTextFilter);
+
+			TArray< TSharedPtr< FClassViewerNode > >& ChildList = InOriginalRootNode->GetChildrenList();
+			for(int32 ChildIdx = 0; ChildIdx < ChildList.Num(); ChildIdx++)
+			{
+				TSharedPtr< FClassViewerNode > NewNode = MakeShared<FClassViewerNode>( *ChildList[ChildIdx].Get() );
+
+				const bool bChildrenPassesFilter = AddChildren_Tree(NewNode, ChildList[ChildIdx], InClassFilter, InInitOptions);
+				bReturnPassesFilter |= bChildrenPassesFilter;
+
+				if (bChildrenPassesFilter)
+				{
+					InOutRootNode->AddChild(NewNode);
+				}
+			}
+
+			if (bReturnPassesFilter)
+			{
+				InOutRootNode->GetChildrenList().Sort(FClassViewerNodeNameLess(InInitOptions.NameTypeToDisplay));
+			}
+
+			return bReturnPassesFilter;
+		}
+
+		/** Builds the class tree.
+		 *	@param InOutRootNode						The node to root the tree to.
+		 *	@param InClassFilter						The class filter to use to filter nodes.
+		 *	@param InInitOptions						The class viewer's options, holds the AllowedClasses and DisallowedClasses.
+		 *
+		 *	@return A fully built tree.
+		 */
+		static void GetClassTree(TSharedPtr< FClassViewerNode >& InOutRootNode, const TSharedPtr<FClassViewerFilter>& InClassFilter,
+			const FClassViewerInitializationOptions& InInitOptions)
+		{
+			const TSharedPtr< FClassViewerNode > ObjectClassRoot = ClassHierarchy->GetObjectRootNode();
+
+			// Duplicate the node, it will have no children.
+			InOutRootNode = MakeShared<FClassViewerNode>(*ObjectClassRoot);
+
+			if (InInitOptions.bIsActorsOnly)
+			{
+				for (int32 ClassIdx = 0; ClassIdx < ObjectClassRoot->GetChildrenList().Num(); ClassIdx++)
+				{
+					TSharedPtr<FClassViewerNode> ChildNode = MakeShared<FClassViewerNode>(*ObjectClassRoot->GetChildrenList()[ClassIdx].Get());
+					if (AddChildren_Tree(ChildNode, ObjectClassRoot->GetChildrenList()[ClassIdx], InClassFilter, InInitOptions))
+					{
+						InOutRootNode->AddChild(ChildNode);
+					}
+				}
+			}
+			else
+			{
+				AddChildren_Tree(InOutRootNode, ObjectClassRoot, InClassFilter, InInitOptions);
+			}
+		}
+
+		/** Recursive function to build the list, filtering out nodes based on the InitOptions and filter search terms.
+		 *	@param InOutRootNode						The node that this function will add the children of to the tree.
+		 *	@param InRootClassIndex						The index of the root node.
+		 *	@param InClassFilter						The class filter to use to filter nodes.
+		 *	@param InInitOptions						The class viewer's options, holds the AllowedClasses and DisallowedClasses.
+		 *
+		 *	@return Returns true if the child passed the filter.
+		 */
+		static void AddChildren_List(TArray< TSharedPtr< FClassViewerNode > >& InOutNodeList, const TSharedPtr< FClassViewerNode >& InOriginalRootNode, 
+			const TSharedPtr< FClassViewerFilter >& InClassFilter, const FClassViewerInitializationOptions& InInitOptions)
+		{
+			const bool bCheckTextFilter = true;
+			if (InClassFilter->IsNodeAllowed(InInitOptions, InOriginalRootNode.ToSharedRef(), bCheckTextFilter))
+			{
+				TSharedPtr< FClassViewerNode > NewNode = MakeShared<FClassViewerNode>(*InOriginalRootNode.Get());
+				NewNode->bPassesFilter = true;
+				NewNode->bPassesFilterRegardlessTextFilter = true;
+				NewNode->PropertyHandle = InOriginalRootNode->PropertyHandle;
+
+				InOutNodeList.Add(NewNode);
+			}
+
+			for(const TSharedPtr<FClassViewerNode>& ChildNode : InOriginalRootNode->GetChildrenList())
+			{
+				FClassViewerInitializationOptions TempOptions = InInitOptions;
+
+				// set bOnlyActors to false so that anything below Actor is added
+				TempOptions.bIsActorsOnly = false;
+				AddChildren_List(InOutNodeList, ChildNode, InClassFilter, InInitOptions);
+			}
+		}	
+
+		/** Builds the class list.
+		 *	@param InOutNodeList						The list to add all the nodes to.
+		 *	@param InClassFilter						The class filter to use to filter nodes.
+		 *	@param InInitOptions						The class viewer's options, holds the AllowedClasses and DisallowedClasses.
+		 *
+		 *	@return A fully built list.
+		 */
+		static void GetClassList(TArray< TSharedPtr< FClassViewerNode > >& InOutNodeList, const TSharedPtr<FClassViewerFilter>& InClassFilter, 
+			const FClassViewerInitializationOptions& InInitOptions)
+		{
+			const TSharedPtr< FClassViewerNode > ObjectClassRoot = ClassHierarchy->GetObjectRootNode();
+
+			// If the option to see the object root class is set, add it to the list, proceed normally from there so the actor's only filter continues to work.
+			if (InInitOptions.bShowObjectRootClass)
+			{
+				const bool bCheckTextFilter = true;
+				if (InClassFilter->IsNodeAllowed(InInitOptions, ObjectClassRoot.ToSharedRef(), bCheckTextFilter))
+				{
+					TSharedPtr< FClassViewerNode > NewNode = MakeShared<FClassViewerNode>(*ObjectClassRoot.Get());
+					NewNode->bPassesFilter = true;
+					NewNode->bPassesFilterRegardlessTextFilter = true;
+					NewNode->PropertyHandle = InInitOptions.PropertyHandle;
+
+					InOutNodeList.Add(NewNode);
+				}
+			}
+
+			for(const TSharedPtr<FClassViewerNode>& ChildNode : ObjectClassRoot->GetChildrenList())
+			{
+				AddChildren_List(InOutNodeList, ChildNode, InClassFilter, InInitOptions);
+			}
+		}
+
+		/** Retrieves the blueprint for a class index.
+		 *	@param InClass							The class whose blueprint is desired.
+		 *
+		 *	@return									The blueprint associated with the class index.
+		 */
+		static UBlueprint* GetBlueprint( UClass* InClass )
+		{
+#if WITH_EDITORONLY_DATA
+			if( InClass->ClassGeneratedBy && InClass->ClassGeneratedBy->IsA(UBlueprint::StaticClass()) )
+			{
+				return Cast<UBlueprint>(InClass->ClassGeneratedBy);
+			}
+#endif
+
+			return nullptr;
+		}
+
+		/** Retrieves a few items of information on the given UClass (retrieved via the InClassIndex). 
+		 *	@param InClass							The class to gather info of.
+		 *	@param bInOutIsBlueprintBase			true if the class is a blueprint.
+		 *	@param bInOutHasBlueprint				true if the class has a blueprint.
+		 *
+		 *	@return									The blueprint associated with the class index.
+		 */
+		static void GetClassInfo( TWeakObjectPtr<UClass> InClass, bool& bInOutIsBlueprintBase, bool& bInOutHasBlueprint )
+		{
+			if (UClass* Class = InClass.Get())
+			{
+				bInOutIsBlueprintBase = CanCreateBlueprintOfClass_IgnoreDeprecation( Class );
+#if WITH_EDITORONLY_DATA
+				bInOutHasBlueprint = Class->ClassGeneratedBy != nullptr;
+#endif
+			}
+			else
+			{
+				bInOutIsBlueprintBase = false;
+				bInOutHasBlueprint = false;
+			}
+		}
+
+		/**
+		 * Creates a blueprint from a class.
+		 *
+		 * @param	InCreationClass			The class to create the blueprint from.
+		 * @param	InParentContent			The content to parent the STextEntryPopup to. 
+		 */
+		/*
+		static void CreateBlueprint(const FString& InBlueprintName, UClass* InCreationClass)
+		{
+			if(InCreationClass == nullptr || !FKismetEditorUtilities::CanCreateBlueprintOfClass(InCreationClass))
+			{
+				FMessageDialog::Open( EAppMsgType::Ok, NSLOCTEXT("UnrealEd", "InvalidClassToMakeBlueprintFrom", "Invalid class to make a Blueprint of."));
+				return;
+			}
+
+			// Get the full name of where we want to create the physics asset.
+			FString PackageName = InBlueprintName;
+
+			// Then find/create it.
+			UPackage* Package = CreatePackage( *PackageName);
+			check(Package);
+
+			// Handle fully loading packages before creating new objects.
+			TArray<UPackage*> TopLevelPackages;
+			TopLevelPackages.Add( Package->GetOutermost() );
+			if( !UPackageTools::HandleFullyLoadingPackages( TopLevelPackages, NSLOCTEXT("UnrealEd", "CreateANewObject", "Create a new object") ) )
+			{
+				// Can't load package
+				return;
+			}
+
+			FName BPName(*FPackageName::GetLongPackageAssetName(PackageName));
+
+			if(PromptUserIfExistingObject(BPName.ToString(), PackageName, Package))
+			{
+				// Create and init a new Blueprint
+				UBlueprint* NewBP = FKismetEditorUtilities::CreateBlueprint(InCreationClass, Package, BPName, BPTYPE_Normal, UBlueprint::StaticClass(), UBlueprintGeneratedClass::StaticClass(), FName("ClassViewer"));
+				if(NewBP)
+				{
+					GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->OpenEditorForAsset(NewBP);
+
+					// Notify the asset registry
+					FAssetRegistryModule::AssetCreated(NewBP);
+
+					// Mark the package dirty...
+					Package->MarkPackageDirty();
+				}
+			}
+
+			// All viewers must refresh.
+			RefreshAll();
+		}
+		*/
+
+		/**
+		 * Creates a SaveAssetDialog for specifying the path for the new blueprint
+		 */
+		/*
+		static void OpenCreateBlueprintDialog(UClass* InCreationClass)
+		{
+			// Determine default path for the Save Asset dialog
+			FString DefaultPath;
+			const FString DefaultDirectory = FEditorDirectories::Get().GetLastDirectory(ELastDirectory::NEW_ASSET);
+			FPackageName::TryConvertFilenameToLongPackageName(DefaultDirectory, DefaultPath);
+
+			if (DefaultPath.IsEmpty())
+			{
+				DefaultPath = TEXT("/Game/Blueprints");
+			}
+
+			// Determine default filename for the Save Asset dialog
+			check(InCreationClass != nullptr);
+			const FString ClassName = InCreationClass->ClassGeneratedBy ? InCreationClass->ClassGeneratedBy->GetName() : InCreationClass->GetName();
+			FString DefaultName = LOCTEXT("PrefixNew", "New").ToString() + ClassName;
+
+			FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>("AssetTools");
+			FString UniquePackageName;
+			FString UniqueAssetName;
+			AssetToolsModule.Get().CreateUniqueAssetName(DefaultPath / DefaultName, TEXT(""), UniquePackageName, UniqueAssetName);
+			DefaultName = FPaths::GetCleanFilename(UniqueAssetName);
+
+			// Initialize SaveAssetDialog config
+			FSaveAssetDialogConfig SaveAssetDialogConfig;
+			SaveAssetDialogConfig.DialogTitleOverride = LOCTEXT("CreateBlueprintDialogTitle", "Create Blueprint Class");
+			SaveAssetDialogConfig.DefaultPath = DefaultPath;
+			SaveAssetDialogConfig.DefaultAssetName = DefaultName;
+			SaveAssetDialogConfig.ExistingAssetPolicy = ESaveAssetDialogExistingAssetPolicy::AllowButWarn;
+
+			FContentBrowserModule& ContentBrowserModule = FModuleManager::LoadModuleChecked<FContentBrowserModule>("ContentBrowser");
+			FString SaveObjectPath = ContentBrowserModule.Get().CreateModalSaveAssetDialog(SaveAssetDialogConfig);
+			if (!SaveObjectPath.IsEmpty())
+			{
+				const FString PackageName = FPackageName::ObjectPathToPackageName(SaveObjectPath);
+				const FString PackageFilename = FPackageName::LongPackageNameToFilename(PackageName);
+				const FString PackagePath = FPaths::GetPath(PackageFilename);
+
+				CreateBlueprint(PackageName, InCreationClass);
+				FEditorDirectories::Get().SetLastDirectory(ELastDirectory::NEW_ASSET, PackagePath);
+			}
+		}
+		*/
+
+		/** Returns the tooltip to display when attempting to derive a Blueprint */
+		FText GetCreateBlueprintTooltip(UClass* InCreationClass)
+		{
+			if(InCreationClass->HasAnyClassFlags(CLASS_Deprecated))
+			{
+				return LOCTEXT("ClassViewerMenuCreateDeprecatedBlueprint_Tooltip", "Class is deprecated!");
+			}
+			else
+			{
+				return LOCTEXT("ClassViewerMenuCreateBlueprint_Tooltip", "Creates a Blueprint Class using this class as a base.");
+			}
+		}
+
+		/** Returns TRUE if you can derive a Blueprint */
+		bool CanOpenCreateBlueprintDialog(UClass* InCreationClass)
+		{
+			return !InCreationClass->HasAnyClassFlags(CLASS_Deprecated);
+		}
+
+		/**
+		 * Creates a class wizard for creating a new C++ class
+		 *
+		 * @param	InParentContent			The content to parent the STextEntryPopup to. 
+		 */
+		/*
+		static void OpenCreateCPlusPlusClassWizard(UClass* InCreationClass)
+		{
+			FGameProjectGenerationModule::Get().OpenAddCodeToProjectDialog(
+				FAddToProjectConfig()
+				.ParentClass(InCreationClass)
+				.ParentWindow(FGlobalTabmanager::Get()->GetRootWindow())
+			);
+		}
+		*/
+
+		/**
+		 * Creates a blueprint from a class.
+		 *
+		 * @param	InOutClassNode			Class node to pull what class to load and to update information in.
+		 */
+		static void LoadClass(TSharedPtr< FClassViewerNode > InOutClassNode)
+		{
+			GWarn->BeginSlowTask(LOCTEXT("LoadPackage", "Loading Package..."), true);
+			UClass* Class = LoadObject<UClass>(nullptr, *InOutClassNode->ClassPath.ToString());
+			GWarn->EndSlowTask();
+
+			if (Class)
+			{
+#if WITH_EDITORONLY_DATA
+				InOutClassNode->Blueprint = Cast<UBlueprint>(Class->ClassGeneratedBy);
+#endif
+				InOutClassNode->Class = Class;
+
+				// Tell the original node to update so when a refresh happens it will still know about the newly loaded class.
+				ClassViewer::Helpers::UpdateClassInNode(InOutClassNode->ClassPath, InOutClassNode->Class.Get(), InOutClassNode->Blueprint.Get() );
+			}
+			else
+			{
+				FMessageLog EditorErrors("EditorErrors");
+				FFormatNamedArguments Arguments;
+				Arguments.Add(TEXT("ObjectName"), FText::FromString(InOutClassNode->ClassPath.ToString()));
+				EditorErrors.Error(FText::Format(LOCTEXT("PackageLoadFail", "Failed to load class {ObjectName}"), Arguments));
+			}
+		}
+
+		/**
+		 * Opens a blueprint.
+		 *
+		 * @param	InBlueprint			The blueprint to open.
+		 */
+		/*
+		static void OpenBlueprintTool(UBlueprint* InBlueprint)
+		{
+			if( InBlueprint != nullptr )
+			{
+				GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->OpenEditorForAsset(InBlueprint);
+			}
+		}
+		*/
+
+		/**
+		 * Opens a class's source file.
+		 *
+		 * @param	InClass		The class to open source for.
+		 */
+		/*
+		static void OpenClassInIDE(UClass* InClass)
+		{
+			//ignore result
+			FSourceCodeNavigation::NavigateToClass(InClass);
+		}
+		*/
+
+		/**
+		 * Finds the blueprint or class in the content browser. Blueprint prioritized because if there is a blueprint we want to find that.
+		 *
+		 * @param	InBlueprint			The blueprint to find.
+		 * @param	InClass				The class to find.
+		 */
+		/*
+		static void FindInContentBrowser(UBlueprint* InBlueprint, UClass* InClass)
+		{
+			// If there is a blueprint, use the blueprint instead of the class. Otherwise it will not fully find the requested object.
+			if(InBlueprint)
+			{
+				TArray<UObject*> Objects;
+				Objects.Add(InBlueprint);
+				GEditor->SyncBrowserToObjects(Objects);
+			}
+			else if (InClass)
+			{
+				TArray<UObject*> Objects;
+				Objects.Add(InClass);
+				GEditor->SyncBrowserToObjects(Objects);
+			}
+		}
+		*/
+
+		/** Updates the Class of a node. Uses the generated class package name to find the node.
+		*	@param InGeneratedClassPath			The name of the generated class to find the node for.
+		*	@param InNewClass					The class to update the node with.
+		*/
+		static void UpdateClassInNode(FTopLevelAssetPath InGeneratedClassPath, UClass* InNewClass, UBlueprint* InNewBluePrint )
+		{
+			ClassHierarchy->UpdateClassInNode(InGeneratedClassPath, InNewClass, InNewBluePrint );
+		}
+		/*
+
+		static TSharedRef<SWidget> CreateMenu(UClass* Class, const bool bIsBlueprint, const bool bHasBlueprint)
+		{
+			// Empty list of commands.
+			TSharedPtr< FUICommandList > Commands;
+
+			const bool bShouldCloseWindowAfterMenuSelection = true;	// Set the menu to automatically close when the user commits to a choice
+			FMenuBuilder MenuBuilder(bShouldCloseWindowAfterMenuSelection, Commands);
+			{
+				if (bIsBlueprint)
+				{
+					TAttribute<FText>::FGetter DynamicTooltipGetter;
+					DynamicTooltipGetter.BindStatic(&ClassViewer::Helpers::GetCreateBlueprintTooltip, Class);
+					TAttribute<FText> DynamicTooltipAttribute = TAttribute<FText>::Create(DynamicTooltipGetter);
+
+					MenuBuilder.AddMenuEntry(
+						LOCTEXT("ClassViewerMenuCreateBlueprint", "Create Blueprint Class..."),
+						DynamicTooltipAttribute,
+						FSlateIcon(),
+						FUIAction(
+							FExecuteAction::CreateStatic(&ClassViewer::Helpers::OpenCreateBlueprintDialog, Class),
+							FCanExecuteAction::CreateStatic(&ClassViewer::Helpers::CanOpenCreateBlueprintDialog, Class)
+							)
+						);
+				}
+
+				if (bHasBlueprint)
+				{
+					MenuBuilder.BeginSection("ClassViewerDropDownHasBlueprint");
+					{
+						FUIAction Action(FExecuteAction::CreateStatic(&ClassViewer::Helpers::OpenBlueprintTool, ClassViewer::Helpers::GetBlueprint(Class)));
+						MenuBuilder.AddMenuEntry(LOCTEXT("ClassViewerMenuEditBlueprint", "Edit Blueprint Class..."), LOCTEXT("ClassViewerMenuEditBlueprint_Tooltip", "Open the Blueprint Class in the editor."), FSlateIcon(), Action);
+					}
+					MenuBuilder.EndSection();
+
+					MenuBuilder.BeginSection("ClassViewerDropDownHasBlueprint2");
+					{
+						FUIAction Action(FExecuteAction::CreateStatic(&ClassViewer::Helpers::FindInContentBrowser, ClassViewer::Helpers::GetBlueprint(Class), Class));
+						MenuBuilder.AddMenuEntry(LOCTEXT("ClassViewerMenuFindContent", "Find in Content Browser..."), LOCTEXT("ClassViewerMenuFindContent_Tooltip", "Find in Content Browser"), FSlateIcon(), Action);
+					}
+					MenuBuilder.EndSection();
+				}
+				else
+				{
+					MenuBuilder.BeginSection("ClassViewerIsCode");
+					{
+						FUIAction Action(FExecuteAction::CreateStatic(&ClassViewer::Helpers::OpenClassInIDE, Class));
+						MenuBuilder.AddMenuEntry(LOCTEXT("ClassViewerMenuOpenCPlusPlusClass", "Open Source Code..."), LOCTEXT("ClassViewerMenuOpenCPlusPlusClass_Tooltip", "Open the source file for this class in the IDE."), FSlateIcon(), Action);
+					}
+					{
+						FUIAction Action(FExecuteAction::CreateStatic(&ClassViewer::Helpers::OpenCreateCPlusPlusClassWizard, Class));
+						MenuBuilder.AddMenuEntry(LOCTEXT("ClassViewerMenuCreateCPlusPlusClass", "Create New C++ Class..."), LOCTEXT("ClassViewerMenuCreateCPlusPlusClass_Tooltip", "Creates a new C++ class using this class as a base."), FSlateIcon(), Action);
+					}
+					MenuBuilder.EndSection();
+				}
+			}
+			
+			return MenuBuilder.MakeWidget();
+		}
+		*/
+
+	} // namespace Helpers
+} // namespace ClassViewer
+
+/** Delegate used with the Class Viewer in 'class picking' mode.  You'll bind a delegate when the
+	class viewer widget is created, which will be fired off when the selected class is double clicked */
+DECLARE_DELEGATE_OneParam( FOnClassItemDoubleClickDelegate, TSharedPtr<FClassViewerNode> );
+
+/** The item used for visualizing the class in the tree. */
+class SClassItem : public STableRow< TSharedPtr<FString> >
+{
+public:
+	
+	SLATE_BEGIN_ARGS( SClassItem )
+		: _ClassName()
+		, _bIsPlaceable(false)
+		, _bIsInClassViewer( true )
+		, _bDynamicClassLoading( true )
+		, _HighlightText()
+		, _Font(FAppStyle::Get().GetFontStyle("NormalFont"))
+		{}
+
+		/** The classname this item contains. */
+		SLATE_ARGUMENT( TSharedPtr<FString>, ClassName )
+		/** true if this item is a placeable object. */
+		SLATE_ARGUMENT( bool, bIsPlaceable )
+		/** true if this item is in a Class Viewer (as opposed to a Class Picker) */
+		SLATE_ARGUMENT( bool, bIsInClassViewer )
+		/** true if this item should allow dynamic class loading */
+		SLATE_ARGUMENT( bool, bDynamicClassLoading )
+		/** The text this item should highlight, if any. */
+		SLATE_ARGUMENT( FText, HighlightText )
+		/** The font this item will use. */
+		SLATE_ARGUMENT( FSlateFontInfo, Font )
+		/** The node this item is associated with. */
+		SLATE_ARGUMENT( TSharedPtr<FClassViewerNode>, AssociatedNode)
+		/** the delegate for handling double clicks outside of the SClassItem */
+		SLATE_ARGUMENT( FOnClassItemDoubleClickDelegate, OnClassItemDoubleClicked )
+		/** On Class Picked callback. */
+		SLATE_EVENT( FOnDragDetected, OnDragDetected )
+
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct the widget
+	 *
+	 * @param InArgs   A declaration from which to construct the widget
+	 */
+	void Construct( const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTableView )
+	{
+		ClassName = InArgs._ClassName;
+		bIsClassPlaceable = InArgs._bIsPlaceable;
+		bIsInClassViewer = InArgs._bIsInClassViewer;
+		bDynamicClassLoading = InArgs._bDynamicClassLoading;
+		AssociatedNode = InArgs._AssociatedNode;
+		OnDoubleClicked = InArgs._OnClassItemDoubleClicked;
+		
+		bool bIsBlueprint(false);
+		bool bHasBlueprint(false);
+
+		//SetEnabled( AssociatedNode->Restrictions.Num() == 0 );
+
+		ClassViewer::Helpers::GetClassInfo(AssociatedNode->Class, bIsBlueprint, bHasBlueprint);
+		
+		struct Local
+		{
+
+			static TSharedPtr<SToolTip> GetToolTip(TSharedPtr<FClassViewerNode> AssociatedNode)
+			{
+				TSharedPtr<SToolTip> ToolTip;
+				if( AssociatedNode->PropertyHandle.IsValid() && AssociatedNode->IsRestricted() )
+				{
+					FText RestrictionToolTip;
+					AssociatedNode->PropertyHandle->GenerateRestrictionToolTip(*AssociatedNode->GetClassName(),RestrictionToolTip);
+
+					ToolTip = IDocumentation::Get()->CreateToolTip(RestrictionToolTip, nullptr, "", "");
+				}
+				else if (UClass* Class = AssociatedNode->Class.Get())
+				{
+					UPackage*  Package  = Class->GetOutermost();
+					ToolTip = FRuntimeEditorUtils::GetTooltip(Class);
+				}
+				else if (!AssociatedNode->ClassPath.IsNull())
+				{
+					ToolTip = SNew(SToolTip).Text(FText::FromString(AssociatedNode->ClassPath.ToString()));
+				}
+
+				return ToolTip;
+			}
+		};
+
+		bool bIsRestricted = AssociatedNode->IsRestricted();
+
+		const FSlateBrush* ClassIcon = FSlateIconFinder::FindIconBrushForClass(AssociatedNode->Class.Get());
+		
+		this->ChildSlot
+		[
+			SNew(SHorizontalBox)
+				
+			+SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SNew( SExpanderArrow, SharedThis(this) )
+				]
+
+			+SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding( 0.0f, 2.0f, 6.0f, 2.0f )
+				[
+					SNew( SImage )
+					.Image(	ClassIcon )
+					.Visibility( ClassIcon != FAppStyle::GetDefaultBrush()? EVisibility::Visible : EVisibility::Collapsed )
+				]
+
+			+SHorizontalBox::Slot()
+				.FillWidth(1.0f)
+				.Padding( 0.0f, 3.0f, 6.0f, 3.0f )
+				.VAlign(VAlign_Center)
+				[
+					SNew( STextBlock )
+						.Text( FText::FromString(*ClassName.Get()) )
+						.Font(InArgs._Font)
+						.HighlightText(InArgs._HighlightText)
+						.ColorAndOpacity(FSlateColor::UseForeground())
+						.ToolTip(Local::GetToolTip(AssociatedNode))
+						.IsEnabled(!bIsRestricted)
+				]
+
+			+SHorizontalBox::Slot()
+				.AutoWidth()
+				.HAlign(HAlign_Right)
+				.VAlign(VAlign_Center)
+				.Padding( 0.0f, 0.0f, 6.0f, 0.0f )
+				[
+					SNew( SComboButton )
+						.ContentPadding(FMargin(2.0f))
+						.Visibility(this, &SClassItem::ShowOptions)
+						.OnGetMenuContent(this, &SClassItem::GenerateDropDown)
+				]
+		];
+
+		UE_LOG(LogEditorClassViewer, VeryVerbose, TEXT("CLASS [%s]"), **ClassName);
+
+
+		STableRow< TSharedPtr<FString> >::ConstructInternal(
+			STableRow::FArguments()
+				.ShowSelection(true)
+				.OnDragDetected(InArgs._OnDragDetected),
+			InOwnerTableView
+		);	
+	}
+
+private:
+	/*
+	virtual FReply OnMouseButtonDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent ) override
+	{
+		// If in a Class Viewer and it has not been loaded, load the class when double-left clicking.
+		if ( bIsInClassViewer )
+		{
+			if( bDynamicClassLoading && AssociatedNode->Class == nullptr && AssociatedNode->UnloadedBlueprintData.IsValid() && InMouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+			{
+				ClassViewer::Helpers::LoadClass(AssociatedNode);
+			}
+			// If there is a blueprint, open it. Otherwise try to open the class header.
+			if(AssociatedNode->Blueprint.IsValid())
+			{
+				ClassViewer::Helpers::OpenBlueprintTool(AssociatedNode->Blueprint.Get());
+			}
+			else
+			{
+				ClassViewer::Helpers::OpenClassInIDE(AssociatedNode->Class.Get());
+			}
+		}
+		else
+		{
+			OnDoubleClicked.ExecuteIfBound( AssociatedNode );
+		}
+		return FReply::Handled();
+	}
+	*/
+
+	EVisibility ShowOptions() const
+	{
+		// If it's in viewer mode, show the options combo button.
+		if(bIsInClassViewer)
+		{
+			bool bIsBlueprint(false);
+			bool bHasBlueprint(false);
+
+			ClassViewer::Helpers::GetClassInfo(AssociatedNode->Class, bIsBlueprint, bHasBlueprint);
+
+			return (bIsBlueprint || AssociatedNode->Blueprint.IsValid())? EVisibility::Visible : EVisibility::Collapsed;
+		}
+
+		return EVisibility::Collapsed;
+	}
+
+	/**
+	 * Generates the drop down menu for the item.
+	 *
+	 * @return		The drop down menu widget.
+	 */
+	TSharedRef<SWidget> GenerateDropDown()
+	{
+		/*
+		if (UClass* Class = AssociatedNode->Class.Get())
+		{
+			bool bIsBlueprint(false);
+			bool bHasBlueprint(false);
+
+			ClassViewer::Helpers::GetClassInfo(Class, bIsBlueprint, bHasBlueprint);
+			bHasBlueprint = AssociatedNode->Blueprint.IsValid();
+			return ClassViewer::Helpers::CreateMenu(Class, bIsBlueprint, bHasBlueprint);
+		}
+		*/
+
+		return SNullWidget::NullWidget;
+	}
+
+private:
+
+	/** The class name for which this item is associated with. */
+	TSharedPtr<FString> ClassName;
+
+	/** true if this class is placeable. */
+	bool bIsClassPlaceable;
+
+	/** true if in a Class Viewer (as opposed to a Class Picker). */
+	bool bIsInClassViewer;
+
+	/** true if dynamic class loading is permitted. */
+	bool bDynamicClassLoading;
+
+	/** The Class Viewer Node this item is associated with. */
+	TSharedPtr< FClassViewerNode > AssociatedNode;
+
+	/** the on Double Clicked delegate */
+	FOnClassItemDoubleClickDelegate OnDoubleClicked;
+};
+
+static void OnModulesChanged(FName ModuleThatChanged, EModuleChangeReason ReasonForChange)
+{
+	ClassViewer::Helpers::RequestPopulateClassHierarchy();
+}
+
+FClassHierarchy::FClassHierarchy()
+{
+	// Register with the Asset Registry to be informed when it is done loading up files.
+	IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(AssetRegistryConstants::ModuleName).Get();
+	//OnFilesLoadedRequestPopulateClassHierarchyDelegateHandle = AssetRegistry.OnFilesLoaded().AddStatic( ClassViewer::Helpers::RequestPopulateClassHierarchy );
+	AssetRegistry.OnAssetAdded().AddRaw( this, &FClassHierarchy::AddAsset);
+	AssetRegistry.OnAssetRemoved().AddRaw( this, &FClassHierarchy::RemoveAsset );
+
+	// Register to have Populate called when doing a Reload.
+	FCoreUObjectDelegates::ReloadCompleteDelegate.AddRaw( this, &FClassHierarchy::OnReloadComplete );
+
+	// Register to have Populate called when a Blueprint is compiled.
+	//OnBlueprintCompiledRequestPopulateClassHierarchyDelegateHandle            = GEditor->OnBlueprintCompiled().AddStatic(ClassViewer::Helpers::RequestPopulateClassHierarchy);
+	//OnClassPackageLoadedOrUnloadedRequestPopulateClassHierarchyDelegateHandle = GEditor->OnClassPackageLoadedOrUnloaded().AddStatic(ClassViewer::Helpers::RequestPopulateClassHierarchy);
+
+	FModuleManager::Get().OnModulesChanged().AddStatic(&OnModulesChanged);
+}
+
+FClassHierarchy::~FClassHierarchy()
+{
+	// Unregister with the Asset Registry to be informed when it is done loading up files.
+	if (FAssetRegistryModule* AssetRegistryModule = FModuleManager::Get().GetModulePtr<FAssetRegistryModule>(AssetRegistryConstants::ModuleName))
+	{
+		IAssetRegistry* AssetRegistry = AssetRegistryModule->TryGet();
+		if (AssetRegistry)
+		{
+			//AssetRegistry->OnFilesLoaded().Remove(OnFilesLoadedRequestPopulateClassHierarchyDelegateHandle);
+			AssetRegistry->OnAssetAdded().RemoveAll(this);
+			AssetRegistry->OnAssetRemoved().RemoveAll(this);
+		}
+
+		// Unregister to have Populate called when doing a Reload.
+		FCoreUObjectDelegates::ReloadCompleteDelegate.RemoveAll(this);
+
+		/*
+		if (GEditor)
+		{
+			// Unregister to have Populate called when a Blueprint is compiled.
+			GEditor->OnBlueprintCompiled().Remove(OnBlueprintCompiledRequestPopulateClassHierarchyDelegateHandle);
+			GEditor->OnClassPackageLoadedOrUnloaded().Remove(OnClassPackageLoadedOrUnloadedRequestPopulateClassHierarchyDelegateHandle);
+		}
+		*/
+	}
+
+	FModuleManager::Get().OnModulesChanged().RemoveAll(this);
+}
+
+void FClassHierarchy::OnReloadComplete(EReloadCompleteReason Reason)
+{
+	ClassViewer::Helpers::RequestPopulateClassHierarchy();
+}
+
+void FClassHierarchy::CreateNodesForLoadedClasses(TSharedPtr<FClassViewerNode>& OutRootNode, TMap<FTopLevelAssetPath, TSharedPtr< FClassViewerNode >>& InOutClassPathToNode)
+{
+	for (TObjectIterator<UClass> ClassIt; ClassIt; ++ClassIt)
+	{
+		UClass* CurrentClass = *ClassIt;
+		// Ignore deprecated and temporary trash classes.
+		if (CurrentClass->HasAnyClassFlags(CLASS_Deprecated | CLASS_NewerVersionExists | CLASS_Hidden) ||
+			FRuntimeEditorUtils::IsClassABlueprintSkeleton(CurrentClass))
+		{
+			continue;
+		}
+		TSharedPtr<FClassViewerNode>& Node = InOutClassPathToNode.FindOrAdd(CurrentClass->GetClassPathName());
+		if (!Node)
+		{
+			Node = MakeShared<FClassViewerNode>(CurrentClass->GetName(), FRuntimeMetaData::GetDisplayNameText(CurrentClass).ToString());
+		}
+		SetClassFields(Node, *CurrentClass);
+	}
+	TSharedPtr<FClassViewerNode>* ExistingRoot = InOutClassPathToNode.Find(UObject::StaticClass()->GetClassPathName());
+	check(ExistingRoot && ExistingRoot->IsValid());
+	OutRootNode = *ExistingRoot;
+}
+
+TSharedPtr< FClassViewerNode > FClassHierarchy::FindParent(const TSharedPtr< FClassViewerNode >& InRootNode, FTopLevelAssetPath InParentClassname, const UClass* InParentClass)
+{
+	// Check if the current node is the parent classname that is being searched for.
+	if(InRootNode->ClassPath == InParentClassname)
+	{
+		// Return the node if it is the correct parent, this ends the recursion.
+		return InRootNode;
+	}
+	else
+	{
+		// If a class does not have a generated classname, we look up the parent class and compare.
+		const UClass* ParentClass = InParentClass;
+
+		if(const UClass* RootClass = InRootNode->Class.Get())
+		{
+			if(ParentClass == RootClass)
+			{
+				return InRootNode;
+			}
+		}
+
+	}
+
+	TSharedPtr< FClassViewerNode > ReturnNode;
+
+	// Search the children recursively, one of them might have the parent.
+	for(int32 ChildClassIndex = 0; !ReturnNode.IsValid() && ChildClassIndex < InRootNode->GetChildrenList().Num(); ChildClassIndex++)
+	{
+		// Check the child, then check the return to see if it is valid. If it is valid, end the recursion.
+		ReturnNode = FindParent(InRootNode->GetChildrenList()[ChildClassIndex], InParentClassname, InParentClass);
+
+		if(ReturnNode.IsValid())
+		{
+			break;
+		}
+	}
+
+	return ReturnNode;
+}
+
+TSharedPtr< FClassViewerNode > FClassHierarchy::FindNodeByGeneratedClassPath(const TSharedPtr< FClassViewerNode >& InRootNode, FTopLevelAssetPath InGeneratedClassPath)
+{
+	if(InRootNode->ClassPath == InGeneratedClassPath)
+	{
+		return InRootNode;
+	}
+
+	TSharedPtr< FClassViewerNode > ReturnNode;
+
+	// Search the children recursively, one of them might have the parent.
+	for(int32 ChildClassIndex = 0; !ReturnNode.IsValid() && ChildClassIndex < InRootNode->GetChildrenList().Num(); ChildClassIndex++)
+	{
+		// Check the child, then check the return to see if it is valid. If it is valid, end the recursion.
+		ReturnNode = FindNodeByGeneratedClassPath(InRootNode->GetChildrenList()[ChildClassIndex], InGeneratedClassPath);
+
+		if(ReturnNode.IsValid())
+		{
+			break;
+		}
+	}
+
+	return ReturnNode;
+}
+
+void FClassHierarchy::UpdateClassInNode(FTopLevelAssetPath InGeneratedClassPath, UClass* InNewClass, UBlueprint* InNewBluePrint )
+{
+	TSharedPtr< FClassViewerNode > Node = FindNodeByGeneratedClassPath(ObjectClassRoot, InGeneratedClassPath);
+
+	if( Node.IsValid() )
+	{
+		Node->Class = InNewClass;
+		Node->Blueprint = InNewBluePrint;
+	}
+}
+
+bool FClassHierarchy::FindAndRemoveNodeByClassPath(const TSharedPtr< FClassViewerNode >& InRootNode, FTopLevelAssetPath InClassPath)
+{
+	bool bReturnValue = false;
+
+	// Search the children recursively, one of them might have the parent.
+	for(int32 ChildClassIndex = 0; ChildClassIndex < InRootNode->GetChildrenList().Num(); ChildClassIndex++)
+	{
+		if(InRootNode->GetChildrenList()[ChildClassIndex]->ClassPath == InClassPath)						   
+		{
+			InRootNode->GetChildrenList().RemoveAt(ChildClassIndex);
+			return true;
+		}
+		// Check the child, then check the return to see if it is valid. If it is valid, end the recursion.
+		bReturnValue = FindAndRemoveNodeByClassPath(InRootNode->GetChildrenList()[ChildClassIndex], InClassPath);
+
+		if(bReturnValue)
+		{
+			break;
+		}
+	}
+	return bReturnValue;
+}
+
+void FClassHierarchy::RemoveAsset(const FAssetData& InRemovedAssetData)
+{
+	// BPGCs can be missing if it was already deleted prior to the notification being sent. 
+	// Let's try to reconstruct the generated class path from the BP object path.
+	bool bGenerateClassPathIfMissing = true;
+	const FTopLevelAssetPath ClassPath = FRuntimeEditorUtils::GetClassPathNameFromAsset(InRemovedAssetData, bGenerateClassPathIfMissing);
+
+	if (!ClassPath.IsNull() && FindAndRemoveNodeByClassPath(ObjectClassRoot, ClassPath))
+	{
+		// All viewers must refresh.
+		ClassViewer::Helpers::RefreshAll();
+	}
+}
+
+void FClassHierarchy::AddAsset(const FAssetData& InAddedAssetData)
+{
+	IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(AssetRegistryConstants::ModuleName).Get();
+	if (AssetRegistry.IsLoadingAssets())
+	{
+		return;
+	}
+
+	const FTopLevelAssetPath ClassPath = FRuntimeEditorUtils::GetClassPathNameFromAsset(InAddedAssetData);
+
+	// Make sure that the node does not already exist. There is a bit of double adding going on at times and this prevents it.
+	if (!ClassPath.IsNull() && !FindNodeByGeneratedClassPath(ObjectClassRoot, ClassPath).IsValid())
+	{
+		TSharedPtr<FClassViewerNode> NewNode;
+		CreateOrUpdateUnloadedClassNode(NewNode, InAddedAssetData, ClassPath);
+
+		// Find the blueprint if it's loaded.
+		FindClass(NewNode);
+
+		// Resolve the parent's class name locally and use it to find the parent's class.
+		FString ParentClassPath = NewNode->ParentClassPath.ToString();
+		UClass* ParentClass = FindObject<UClass>(nullptr, *ParentClassPath);
+		TSharedPtr< FClassViewerNode > ParentNode = FindParent(ObjectClassRoot, NewNode->ParentClassPath, ParentClass); 
+		if (ParentNode.IsValid())
+		{
+			ParentNode->AddChild(NewNode);
+
+			// Make sure the children are properly sorted.
+			SortChildren(ObjectClassRoot);
+
+			// All Viewers must repopulate.
+			ClassViewer::Helpers::RefreshAll();
+		}
+	}
+}
+
+void FClassHierarchy::SortChildren( TSharedPtr< FClassViewerNode >& InRootNode)
+{
+	TArray< TSharedPtr< FClassViewerNode > >& ChildList = InRootNode->GetChildrenList();
+	for(int32 ChildIndex = 0; ChildIndex < ChildList.Num(); ChildIndex++)
+	{
+		// Check the child, then check the return to see if it is valid. If it is valid, end the recursion.
+		SortChildren(ChildList[ChildIndex]);
+	}
+
+	// Sort the children.
+	ChildList.Sort(FClassViewerNodeNameLess());
+}
+
+void FClassHierarchy::FindClass(TSharedPtr<FClassViewerNode> InOutClassNode)
+{
+	UClass* Class = FindObject<UClass>(nullptr, *InOutClassNode->ClassPath.ToString());
+
+	if (Class)
+	{
+		SetClassFields(InOutClassNode, *Class);
+	}
+}
+
+void FClassHierarchy::SetClassFields(TSharedPtr<FClassViewerNode>& InOutClassNode, UClass& Class)
+{
+	if (InOutClassNode->Class.Get())
+	{
+		// Already set
+		return;
+	}
+
+	// Fields that can als be set from FAssetData
+	if (InOutClassNode->ClassPath.IsNull())
+	{
+		InOutClassNode->ClassPath = Class.GetClassPathName();
+	}
+	if (InOutClassNode->ParentClassPath.IsNull())
+	{
+		if (Class.GetSuperClass())
+		{
+			InOutClassNode->ParentClassPath = Class.GetSuperClass()->GetClassPathName();
+		}
+	}
+#if WITH_EDITORONLY_DATA
+	// UClass-specific fields
+	InOutClassNode->Blueprint = Cast<UBlueprint>(Class.ClassGeneratedBy);
+#endif
+	InOutClassNode->Class = &Class;
+}
+
+void FClassHierarchy::CreateOrUpdateUnloadedClassNode(TSharedPtr<FClassViewerNode>& InOutClassViewerNode, const FAssetData& InAssetData, FTopLevelAssetPath InClassPath)
+{
+	if (!InOutClassViewerNode)
+	{
+		const FString ClassName = InAssetData.AssetName.ToString();
+		FString ClassDisplayName = InAssetData.GetTagValueRef<FString>(FBlueprintTags::BlueprintDisplayName);
+		if (ClassDisplayName.IsEmpty())
+		{
+			ClassDisplayName = ClassName;
+		}
+		InOutClassViewerNode = MakeShared<FClassViewerNode>(ClassName, ClassDisplayName);
+	}
+
+	if (InOutClassViewerNode->UnloadedBlueprintData.IsValid())
+	{
+		// Already set
+		return;
+	}
+
+	// Fields that can also be set from UClass*
+
+	InOutClassViewerNode->ClassPath = InClassPath;
+
+	if (InOutClassViewerNode->ParentClassPath.IsNull())
+	{
+		FString ParentClassPathString;
+		if (InAssetData.GetTagValue(FBlueprintTags::ParentClassPath, ParentClassPathString))
+		{
+			InOutClassViewerNode->ParentClassPath = FTopLevelAssetPath(*FPackageName::ExportTextPathToObjectPath(ParentClassPathString));
+		}
+	}
+
+	// Blueprint-specific fields
+
+	InOutClassViewerNode->BlueprintAssetPath = InAssetData.GetSoftObjectPath();
+
+	// It is an unloaded blueprint, so we need to create the structure that will hold the data.
+	TSharedPtr<FUnloadedBlueprintData> UnloadedBlueprintData = MakeShareable(new FUnloadedBlueprintData(InOutClassViewerNode));
+	InOutClassViewerNode->UnloadedBlueprintData = UnloadedBlueprintData;
+
+	const bool bNormalBlueprintType = InAssetData.GetTagValueRef<FString>(FBlueprintTags::BlueprintType) == TEXT("BPType_Normal");
+	InOutClassViewerNode->UnloadedBlueprintData->SetNormalBlueprintType(bNormalBlueprintType);
+
+	// Get the class flags.
+	const uint32 ClassFlags = InAssetData.GetTagValueRef<uint32>(FBlueprintTags::ClassFlags);
+	InOutClassViewerNode->UnloadedBlueprintData->SetClassFlags(ClassFlags);
+
+	// Get interface class paths.
+	TArray<FString> ImplementedInterfaces;
+	FRuntimeEditorUtils::GetImplementedInterfaceClassPathsFromAsset(InAssetData, ImplementedInterfaces);
+	for (const FString& InterfacePath : ImplementedInterfaces)
+	{
+		UnloadedBlueprintData->AddImplementedInterface(InterfacePath);
+	}
+}
+
+void FClassHierarchy::PopulateClassHierarchy()
+{
+	// Fetch all classes from AssetRegistry blueprint data (which covers unloaded classes), and in-memory UClasses.
+	// Create a node for each one with unioned data from the AssetRegistry or UClass for that class.
+	// Set parent/child pointers to create a tree, and store this tree in this->ObjectClassRoot
+	TMap<FTopLevelAssetPath, TSharedPtr<FClassViewerNode>> ClassPathToNode;
+
+	// Create a node for every Blueprint class listed in the AssetRegistry and set the Blueprint fields
+	// Retrieve all blueprint classes 
+	{
+		IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(AssetRegistryConstants::ModuleName).Get();
+		FString ClassPathString;
+
+		TArray<FAssetData> Assets;
+		AssetRegistry.GetAssetsByClass(UBlueprint::StaticClass()->GetClassPathName(), Assets, /*bSearchSubClasses=*/true);
+
+		for (const FAssetData& AssetData : Assets)
+		{
+			const FTopLevelAssetPath ClassPath = FRuntimeEditorUtils::GetClassPathNameFromAssetTag(AssetData);
+			if (!ClassPath.IsNull())
+			{
+				TSharedPtr<FClassViewerNode>& Node = ClassPathToNode.FindOrAdd(ClassPath);
+				CreateOrUpdateUnloadedClassNode(Node, AssetData, ClassPath);
+			}
+			else
+			{
+				UE_LOG(LogEditorClassViewer, Warning, TEXT("AssetRegistry Blueprint %s is missing tag value for %s. Blueprint will not be available to ClassViewer when unloaded."),
+					*AssetData.GetObjectPathString(), *FBlueprintTags::GeneratedClassPath.ToString());
+			}
+		}
+
+		Assets.Reset();
+		AssetRegistry.GetAssetsByClass(UBlueprintGeneratedClass::StaticClass()->GetClassPathName(), Assets, /*bSearchSubClasses=*/true);
+
+		for (const FAssetData& AssetData : Assets)
+		{
+			FTopLevelAssetPath ClassPathNameFromAssetPath = AssetData.GetSoftObjectPath().GetAssetPath();
+			TSharedPtr<FClassViewerNode>& Node = ClassPathToNode.FindOrAdd(ClassPathNameFromAssetPath);
+			CreateOrUpdateUnloadedClassNode(Node, AssetData, ClassPathNameFromAssetPath);
+		}
+	}
+
+	// FindOrCreate a node for every loaded UClass, and set the UClass fields
+	CreateNodesForLoadedClasses(ObjectClassRoot, ClassPathToNode);
+
+	// Set the parent and child pointers
+	for (TPair<FTopLevelAssetPath, TSharedPtr<FClassViewerNode>>& KVPair : ClassPathToNode)
+	{
+		TSharedPtr<FClassViewerNode>& Node = KVPair.Value;
+		if (Node == ObjectClassRoot)
+		{
+			// No parent expected for the root class
+			continue;
+		}
+		TSharedPtr<FClassViewerNode>* ParentNodePtr = nullptr;
+		if (!Node->ParentClassPath.IsNull())
+		{
+			ParentNodePtr = ClassPathToNode.Find(Node->ParentClassPath);
+		}
+		if (!ParentNodePtr)
+		{
+			UE_LOG(LogEditorClassViewer, Warning, TEXT("Class %s has parent %s, but this parent is not found. The Class will not be shown in ClassViewer."),
+				*KVPair.Key.ToString(), *Node->ParentClassPath.ToString());
+			continue;
+		}
+		TSharedPtr<FClassViewerNode>& ParentNode = *ParentNodePtr;
+		check(ParentNode);
+		ParentNode->AddChild(Node);
+	}
+
+	// Recursively sort the children.
+	SortChildren(ObjectClassRoot);
+
+	// All viewers must refresh.
+	ClassViewer::Helpers::RefreshAll();
+}
+
+BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
+void SClassViewer::Construct(const FArguments& InArgs, const FClassViewerInitializationOptions& InInitOptions )
+{
+	bNeedsRefresh = true;
+	NumClasses = 0;
+	
+	// Listen for when view settings are changed
+	//UClassViewerSettings::OnSettingChanged().AddSP(this, &SClassViewer::HandleSettingChanged);
+
+	InitOptions = InInitOptions;
+
+	OnClassPicked = InArgs._OnClassPickedDelegate;
+
+	bSaveExpansionStates = true;
+	bPendingSetExpansionStates = false;
+
+	ClassFilter = MakeShareable(new FClassViewerFilter(InitOptions));
+
+	bEnableClassDynamicLoading = InInitOptions.bEnableClassDynamicLoading;
+
+	EVisibility HeaderVisibility = (this->InitOptions.Mode == EClassViewerMode::ClassBrowsing)? EVisibility::Visible : EVisibility::Collapsed;
+
+	// If set to default, decide what display mode to use.
+	if( InitOptions.DisplayMode == EClassViewerDisplayMode::DefaultView )
+	{
+		// By default the Browser uses the tree view, the Picker the list. The option is available to users to force to another display mode when creating the Class Browser/Picker.
+		if( InitOptions.Mode == EClassViewerMode::ClassBrowsing )
+		{
+			InitOptions.DisplayMode = EClassViewerDisplayMode::TreeView;
+		}
+		else
+		{
+			InitOptions.DisplayMode = EClassViewerDisplayMode::ListView;
+		}
+	}
+
+	// Clear out the current set of custom filter options.
+	//CustomClassFilterOptions.Empty(InitOptions.ClassFilters.Num());
+
+	// Gather additional filter options from any custom filters.
+	TArray<TSharedRef<FClassViewerFilterOption>> FilterOptions;
+	for (TSharedRef<IClassViewerFilter> CustomFilter : InitOptions.ClassFilters)
+	{
+		// Append this filter's options to the current set.
+		CustomFilter->GetFilterOptions(FilterOptions);
+		//CustomClassFilterOptions.Append(FilterOptions);
+
+		// Reset the temp array for the next pass.
+		FilterOptions.Reset();
+	}
+
+	TSharedRef<SWidget> FiltersWidget = SNullWidget::NullWidget;
+	// Build the top menu
+	if(InitOptions.Mode == EClassViewerMode::ClassBrowsing)
+	{
+		FiltersWidget = 
+		SNew(SComboButton)
+		.ComboButtonStyle(FAppStyle::Get(), "GenericFilters.ComboButtonStyle")
+		.ForegroundColor(FLinearColor::White)
+		.ContentPadding(0)
+		.ToolTipText(LOCTEXT("Filters_Tooltip", "Filter options for the Class Viewer."))
+		.OnGetMenuContent(this, &SClassViewer::FillFilterEntries)
+		.HasDownArrow(true)
+		.ContentPadding(FMargin(1, 0))
+		.ButtonContent()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.TextStyle(FAppStyle::Get(), "GenericFilters.TextStyle")
+				.Font(FAppStyle::Get().GetFontStyle("FontAwesome.9"))
+				.Text(FText::FromString(FString(TEXT("\xf0b0"))) /*fa-filter*/)
+			]
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(2, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.TextStyle(FAppStyle::Get(), "GenericFilters.TextStyle")
+				.Text(LOCTEXT("Filters", "Filters"))
+			]
+		];
+	}
+
+	// Create the asset discovery indicator
+	//FEditorWidgetsModule& EditorWidgetsModule = FModuleManager::LoadModuleChecked<FEditorWidgetsModule>("EditorWidgets");
+	//TSharedRef<SWidget> AssetDiscoveryIndicator = EditorWidgetsModule.CreateAssetDiscoveryIndicator(EAssetDiscoveryIndicatorScaleMode::Scale_Vertical);
+	FOnContextMenuOpening OnContextMenuOpening;
+	if ( InitOptions.Mode == EClassViewerMode::ClassBrowsing )
+	{
+		OnContextMenuOpening = FOnContextMenuOpening::CreateSP(this, &SClassViewer::BuildMenuWidget);
+	}
+
+	SAssignNew(ClassList, SListView<TSharedPtr< FClassViewerNode > >)
+		.SelectionMode(ESelectionMode::Single)
+		.ListItemsSource(&RootTreeItems)
+		// Generates the actual widget for a tree item
+		.OnGenerateRow(this, &SClassViewer::OnGenerateRowForClassViewer)
+		// Generates the right click menu.
+		.OnContextMenuOpening(OnContextMenuOpening)
+		// Find out when the user selects something in the tree
+		.OnSelectionChanged(this, &SClassViewer::OnClassViewerSelectionChanged)
+		// Allow for some spacing between items with a larger item height.
+		.ItemHeight(20.0f)
+		.HeaderRow
+		(
+			SNew(SHeaderRow)
+			.Visibility(EVisibility::Collapsed)
+			+ SHeaderRow::Column(TEXT("Class"))
+			.DefaultLabel(NSLOCTEXT("ClassViewer", "Class", "Class"))
+		);
+
+	SAssignNew(ClassTree, STreeView<TSharedPtr< FClassViewerNode > >)
+		.SelectionMode(ESelectionMode::Single)
+		.TreeItemsSource(&RootTreeItems)
+		// Called to child items for any given parent item
+		.OnGetChildren(this, &SClassViewer::OnGetChildrenForClassViewerTree)
+		// Called to handle recursively expanding/collapsing items
+		.OnSetExpansionRecursive(this, &SClassViewer::SetAllExpansionStates_Helper)
+		// Generates the actual widget for a tree item
+		.OnGenerateRow(this, &SClassViewer::OnGenerateRowForClassViewer)
+		// Generates the right click menu.
+		.OnContextMenuOpening(OnContextMenuOpening)
+		// Find out when the user selects something in the tree
+		.OnSelectionChanged(this, &SClassViewer::OnClassViewerSelectionChanged)
+		// Called when the expansion state of an item changes
+		.OnExpansionChanged(this, &SClassViewer::OnClassViewerExpansionChanged)
+		// Allow for some spacing between items with a larger item height.
+		.ItemHeight(20.0f)
+		.HeaderRow
+		(
+			SNew(SHeaderRow)
+			.Visibility(EVisibility::Collapsed)
+			+ SHeaderRow::Column(TEXT("Class"))
+			.DefaultLabel(NSLOCTEXT("ClassViewer", "Class", "Class"))
+		);
+	TSharedRef<STreeView<TSharedPtr< FClassViewerNode > > > ClassTreeView = ClassTree.ToSharedRef();
+	TSharedRef<SListView<TSharedPtr< FClassViewerNode > > > ClassListView = ClassList.ToSharedRef();
+	
+	bool bHasTitle = InitOptions.ViewerTitleString.IsEmpty() == false;
+
+	// Holds the bulk of the class viewer's sub-widgets, to be added to the widget after construction
+	TSharedPtr< SWidget > ClassViewerContent;
+
+	ClassViewerContent = 
+	SNew(SBox)
+	.MaxDesiredHeight(800.0f)
+	[
+		SNew(SBorder)
+		.BorderImage(FAppStyle::GetBrush(InitOptions.bShowBackgroundBorder ? "ToolPanel.GroupBorder" : "NoBorder"))
+		[
+			SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.Visibility(bHasTitle ? EVisibility::Visible : EVisibility::Collapsed)
+					.ColorAndOpacity(FAppStyle::GetColor("MultiboxHookColor"))
+					.Text(InitOptions.ViewerTitleString)
+				]
+			]
+
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(2.0f, 2.0f)
+				[
+					FiltersWidget
+				]
+				+ SHorizontalBox::Slot()
+				.Padding(2.0f, 2.0f, 6.0f, 2.0f)
+				[
+					SAssignNew(SearchBox, SSearchBox)
+					.OnTextChanged( this, &SClassViewer::OnFilterTextChanged )
+					.OnTextCommitted( this, &SClassViewer::OnFilterTextCommitted )
+				]
+				// View mode combo button
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(2.0f, 2.0f)
+				[
+					SAssignNew(ViewOptionsComboButton, SComboButton)
+					.ContentPadding(0)
+					.ForegroundColor(FSlateColor::UseForeground())
+					.ComboButtonStyle(FAppStyle::Get(), "SimpleComboButton")
+					.HasDownArrow(false)
+					.OnGetMenuContent(this, &SClassViewer::GetViewButtonContent)
+					.ButtonContent()
+					[
+						SNew(SImage)
+						.Image(FAppStyle::Get().GetBrush("Icons.Settings"))
+						.ColorAndOpacity(FSlateColor::UseForeground())
+					]
+				]
+			]
+
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SSeparator)
+				.Visibility(HeaderVisibility)
+			]
+
+			+SVerticalBox::Slot()
+			.FillHeight(1.0f)
+			[
+				SNew(SOverlay)
+
+				+SOverlay::Slot()
+				.HAlign(HAlign_Fill)
+				.VAlign(VAlign_Fill)
+				[
+					SNew(SVerticalBox)
+
+					+SVerticalBox::Slot()
+					.FillHeight(1.0f)
+					[
+						SNew(SScrollBorder, ClassTreeView)
+						.Visibility(InitOptions.DisplayMode == EClassViewerDisplayMode::TreeView ? EVisibility::Visible : EVisibility::Collapsed)
+						[
+							ClassTreeView
+						]
+					]
+
+					+SVerticalBox::Slot()
+					.FillHeight(1.0f)
+					[
+						SNew(SScrollBorder, ClassListView)
+						.Visibility(InitOptions.DisplayMode == EClassViewerDisplayMode::ListView ? EVisibility::Visible : EVisibility::Collapsed)
+						[
+							ClassListView
+						]
+					]
+				]
+
+				+SOverlay::Slot()
+				.HAlign(HAlign_Fill)
+				.VAlign(VAlign_Bottom)
+				.Padding(FMargin(24, 0, 24, 0))
+				/*
+				[
+					// Asset discovery indicator
+					AssetDiscoveryIndicator
+				]
+				*/
+			]
+
+			// Bottom panel
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.VAlign(VAlign_Center)
+			.Padding(4.0f)
+			[
+				SNew(STextBlock)
+				.Text(this, &SClassViewer::GetClassCountText)
+			]
+		]
+	];
+
+	if (ViewOptionsComboButton.IsValid())
+	{
+		ViewOptionsComboButton->SetVisibility(InitOptions.bAllowViewOptions ? EVisibility::Visible : EVisibility::Collapsed);
+	}
+
+	// When using a class picker in list-view mode, the widget will auto-focus the search box
+	// and allow the up and down arrow keys to navigate and enter to pick without using the mouse ever
+	if ( InitOptions.Mode == EClassViewerMode::ClassPicker && InitOptions.DisplayMode == EClassViewerDisplayMode::ListView )
+	{
+		this->ChildSlot
+		[
+			SNew(SListViewSelectorDropdownMenu<TSharedPtr<FClassViewerNode>>, SearchBox, ClassList)
+			[
+				ClassViewerContent.ToSharedRef()
+			]
+		];
+	}
+	else
+	{
+		this->ChildSlot
+		[
+			ClassViewerContent.ToSharedRef()
+		];
+	}
+
+	// Construct the class hierarchy.
+	ClassViewer::Helpers::ConstructClassHierarchy();
+
+	// Only want filter options enabled in browsing mode.
+	if( this->InitOptions.Mode == EClassViewerMode::ClassBrowsing )
+	{
+		// Default the "Only Placeable" checkbox to be checked, it will check "Only Actors"
+		MenuPlaceableOnly_Execute();
+	}
+
+	ClassViewer::Helpers::PopulateClassviewerDelegate.AddSP(this, &SClassViewer::Refresh);
+
+	// Request delayed setting of focus to the search box
+	bPendingFocusNextFrame = true;
+}
+END_SLATE_FUNCTION_BUILD_OPTIMIZATION
+
+TSharedRef<SWidget> SClassViewer::GetContent()
+{
+	return SharedThis( this );
+}
+
+SClassViewer::~SClassViewer()
+{
+	ClassViewer::Helpers::PopulateClassviewerDelegate.RemoveAll(this);
+
+	// Remove the listener for when view settings are changed
+	//UClassViewerSettings::OnSettingChanged().RemoveAll(this);
+}
+
+void SClassViewer::ClearSelection()
+{
+	ClassTree->ClearSelection();
+}
+
+void SClassViewer::OnGetChildrenForClassViewerTree( TSharedPtr<FClassViewerNode> InParent, TArray< TSharedPtr< FClassViewerNode > >& OutChildren )
+{
+	// Simply return the children, it's already setup.
+	OutChildren = InParent->GetChildrenList();
+}
+
+void SClassViewer::OnClassViewerSelectionChanged( TSharedPtr<FClassViewerNode> Item, ESelectInfo::Type SelectInfo )
+{
+	// Do not act on selection change when it is for navigation
+	if(SelectInfo == ESelectInfo::OnNavigation && InitOptions.DisplayMode == EClassViewerDisplayMode::ListView)
+	{
+		return;
+	}
+
+	// Sometimes the item is not valid anymore due to filtering.
+	if(Item.IsValid() == false || Item->IsRestricted())
+	{
+		return;
+	}
+
+	if(InitOptions.Mode == EClassViewerMode::ClassBrowsing)
+	{
+		// Allows the user to right click in the level editor and select to place the selected class.
+		//GUnrealEd->SetCurrentClass( Item->Class.Get() );
+	}
+	else
+	{
+		UClass* Class = Item->Class.Get();
+
+		// If the class is nullptr and UnloadedBlueprintData is valid then attempt to load it. UnloadedBlueprintData is invalid in the case of a "None" item.
+		if ( bEnableClassDynamicLoading && !Class && Item->UnloadedBlueprintData.IsValid() )
+		{
+			ClassViewer::Helpers::LoadClass( Item );
+
+			// Populate the tree/list so any changes to previously unloaded classes will be reflected.
+			Refresh();
+		}
+
+		// Check if the item passes the filter
+		if ( ( Item->Class.IsValid() || !Class ))
+		{
+			// Parent items might be displayed but filtered out by bPassesFilter, thus bPassesFilterRegardlessTextFilter makes sure to keep them selectable.
+			// In addition, Item->bPassesFilter would be redundant here as bPassesFilterRegardlessTextFilter = true if bPassesFilter = true
+			if (Item->bPassesFilterRegardlessTextFilter || Item->bPassesFilter)
+			{
+				OnClassPicked.ExecuteIfBound( Item->Class.Get() );
+			}
+			else
+			{
+				OnClassPicked.ExecuteIfBound( nullptr );
+			}
+		}
+	}
+}
+
+void SClassViewer::OnClassViewerExpansionChanged(TSharedPtr<FClassViewerNode> Item, bool bExpanded)
+{
+	// Sometimes the item is not valid anymore due to filtering.
+	if (Item.IsValid() == false || Item->IsRestricted())
+	{
+		return;
+	}
+
+	ExpansionStateMap.Add(*(Item->GetClassName()), bExpanded);
+}
+
+TSharedPtr< SWidget > SClassViewer::BuildMenuWidget()
+{
+	/*
+	bool bIsBlueprint;
+	bool bHasBlueprint;
+	TArray< TSharedPtr< FClassViewerNode > > SelectedList;
+
+	// Based upon which mode the viewer is in, pull the selected item.
+	if( InitOptions.DisplayMode == EClassViewerDisplayMode::TreeView )
+	{
+		SelectedList = ClassTree->GetSelectedItems();
+	}
+	else
+	{
+		SelectedList = ClassList->GetSelectedItems();
+	}
+
+	// If there is no selected item, return a null widget.
+	if(SelectedList.Num() == 0)
+	{
+		return SNullWidget::NullWidget;
+	}
+
+	// If it is NOT stale, it has not been set (meaning it was never valid but now is invalid).
+	if( bEnableClassDynamicLoading && !SelectedList[0]->Class.IsStale() && !SelectedList[0]->Class.IsValid() && SelectedList[0]->UnloadedBlueprintData.IsValid() )
+	{
+		ClassViewer::Helpers::LoadClass(SelectedList[0]);
+
+		// Populate the tree/list so any changes to previously unloaded classes will be reflected.
+		Refresh();
+	}
+
+	// Get the class and it's info.
+	RightClickClass = SelectedList[0]->Class.Get();
+	RightClickBlueprint = SelectedList[0]->Blueprint.Get();
+	ClassViewer::Helpers::GetClassInfo(RightClickClass, bIsBlueprint, bHasBlueprint);
+	
+	if(RightClickBlueprint)
+	{
+		bHasBlueprint = true;
+	}
+
+	return ClassViewer::Helpers::CreateMenu(RightClickClass, bIsBlueprint, bHasBlueprint);
+	*/
+
+	return SNullWidget::NullWidget;
+}
+
+TSharedRef< ITableRow > SClassViewer::OnGenerateRowForClassViewer( TSharedPtr<FClassViewerNode> Item, const TSharedRef< STableViewBase >& OwnerTable )
+{	
+	// If the item was accepted by the filter, leave it bright, otherwise dim it.
+	float AlphaValue = Item->bPassesFilter? 1.0f : 0.5f;
+
+	// If the item passed the filter, it may be from a match with hidden class name strings, update the search box text to retain highlighting of valid matching text
+	FText SearchBoxTextForHighlight = SearchBox->GetText();
+	TSharedPtr<FString> ClassNameDisplay = Item->GetClassName(InitOptions.NameTypeToDisplay);
+	if (!SearchBoxTextForHighlight.IsEmpty() && (ClassNameDisplay->Find(*SearchBoxTextForHighlight.ToString()) == INDEX_NONE))
+	{
+		SearchBoxTextForHighlight = FText::FromString(UObjectBase::RemoveClassPrefix(*SearchBoxTextForHighlight.ToString()));
+	}
+
+	TSharedRef< SClassItem > ReturnRow = SNew(SClassItem, OwnerTable)
+		.ClassName(ClassNameDisplay)
+		.bIsPlaceable(Item->IsClassPlaceable())
+		.HighlightText(SearchBoxTextForHighlight)
+		.Font(Item->IsClassPlaceable()? FCoreStyle::Get().GetFontStyle("NormalFontItalic") : FCoreStyle::Get().GetFontStyle("NormalFont"))
+		.AssociatedNode(Item)
+		.bIsInClassViewer( InitOptions.Mode == EClassViewerMode::ClassBrowsing )
+		.bDynamicClassLoading( bEnableClassDynamicLoading )
+		.OnDragDetected(this, &SClassViewer::OnDragDetected)
+		.OnClassItemDoubleClicked(FOnClassItemDoubleClickDelegate::CreateSP(this, &SClassViewer::ToggleExpansionState_Helper));
+
+	// Expand the item if needed.
+	if (!bPendingSetExpansionStates)
+	{
+		bool* bIsExpanded = ExpansionStateMap.Find(*(Item->GetClassName()));
+		if (bIsExpanded && *bIsExpanded)
+		{
+			bPendingSetExpansionStates = true;
+		}
+	}
+
+	return ReturnRow;
+}
+
+const TArray< TSharedPtr< FClassViewerNode > > SClassViewer::GetSelectedItems() const
+{
+	if ( InitOptions.DisplayMode == EClassViewerDisplayMode::ListView )
+	{
+		return ClassList->GetSelectedItems();
+	}
+
+	return ClassTree->GetSelectedItems();
+}
+
+
+const int SClassViewer::GetNumItems() const
+{
+	return NumClasses;
+}
+
+TSharedRef<SWidget> SClassViewer::GetViewButtonContent()
+{
+
+	// Get all menu extenders for this context menu from the content browser module
+
+	FMenuBuilder MenuBuilder(/*bInShouldCloseWindowAfterMenuSelection=*/true, nullptr, nullptr, /*bCloseSelfOnly=*/ true);
+	/*
+
+	MenuBuilder.AddMenuEntry(LOCTEXT("ExpandAll", "Expand All"), LOCTEXT("ExpandAll_Tooltip", "Expands the entire tree"), FSlateIcon(), FUIAction(FExecuteAction::CreateSP(this, &SClassViewer::SetAllExpansionStates, bool(true))), NAME_None, EUserInterfaceActionType::Button);
+	MenuBuilder.AddMenuEntry(LOCTEXT("CollapseAll", "Collapse All"), LOCTEXT("CollapseAll_Tooltip", "Collapses the entire tree"), FSlateIcon(), FUIAction(FExecuteAction::CreateSP(this, &SClassViewer::SetAllExpansionStates, bool(false))), NAME_None, EUserInterfaceActionType::Button);
+
+	MenuBuilder.BeginSection("Filters", LOCTEXT("ClassViewerFiltersHeading", "Class Filters"));
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("ShowInternalClassesOption", "Show Internal Classes"),
+			LOCTEXT("ShowInternalClassesOptionToolTip", "Shows internal-use only classes in the view."),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SClassViewer::ToggleShowInternalClasses),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SClassViewer::IsShowingInternalClasses)
+				),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+			);
+
+		for (const TSharedRef<FClassViewerFilterOption>& FilterOption : CustomClassFilterOptions)
+		{
+			MenuBuilder.AddMenuEntry(
+				FilterOption->LabelText,
+				FilterOption->ToolTipText,
+				FSlateIcon(),
+				FUIAction(
+					FExecuteAction::CreateSP(this, &SClassViewer::ToggleCustomFilterOption, FilterOption),
+					FCanExecuteAction(),
+					FIsActionChecked::CreateSP(this, &SClassViewer::IsCustomFilterOptionEnabled, FilterOption)
+				),
+				NAME_None,
+				EUserInterfaceActionType::ToggleButton
+			);
+		}
+	}
+	MenuBuilder.EndSection();
+
+	MenuBuilder.BeginSection("DeveloperViewType", LOCTEXT("DeveloperViewTypeHeading", "Developer Folder Filter"));
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("NoneDeveloperViewOption", "None"),
+			LOCTEXT("NoneDeveloperViewOptionToolTip", "Filter classes to show no classes in developer folders."),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SClassViewer::SetCurrentDeveloperViewType, EClassViewerDeveloperType::CVDT_None),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SClassViewer::IsCurrentDeveloperViewType, EClassViewerDeveloperType::CVDT_None)
+				),
+			NAME_None,
+			EUserInterfaceActionType::RadioButton
+			);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("CurrentUserDeveloperViewOption", "Current Developer"),
+			LOCTEXT("CurrentUserDeveloperViewOptionToolTip", "Filter classes to allow classes in the current user's development folder."),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SClassViewer::SetCurrentDeveloperViewType, EClassViewerDeveloperType::CVDT_CurrentUser),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SClassViewer::IsCurrentDeveloperViewType, EClassViewerDeveloperType::CVDT_CurrentUser)
+				),
+			NAME_None,
+			EUserInterfaceActionType::RadioButton
+			);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("AllUsersDeveloperViewOption", "All Developers"),
+			LOCTEXT("AllUsersDeveloperViewOptionToolTip", "Filter classes to allow classes in all users' development folders."),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SClassViewer::SetCurrentDeveloperViewType, EClassViewerDeveloperType::CVDT_All),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SClassViewer::IsCurrentDeveloperViewType, EClassViewerDeveloperType::CVDT_All)
+				),
+			NAME_None,
+			EUserInterfaceActionType::RadioButton
+			);
+
+	}
+	MenuBuilder.EndSection();
+	*/
+
+	return MenuBuilder.MakeWidget();
+}
+
+/*
+void SClassViewer::SetCurrentDeveloperViewType(EClassViewerDeveloperType NewType)
+{
+	if (ensure((int)NewType < (int)EClassViewerDeveloperType::CVDT_Max) && NewType != GetDefault<UClassViewerSettings>()->DeveloperFolderType)
+	{
+		GetMutableDefault<UClassViewerSettings>()->DeveloperFolderType = NewType;
+		GetMutableDefault<UClassViewerSettings>()->PostEditChange();
+	}
+}
+
+EClassViewerDeveloperType SClassViewer::GetCurrentDeveloperViewType() const
+{
+	if (!InitOptions.bAllowViewOptions)
+	{
+		return EClassViewerDeveloperType::CVDT_All;
+	}
+	return GetDefault<UClassViewerSettings>()->DeveloperFolderType;
+}
+
+bool SClassViewer::IsCurrentDeveloperViewType(EClassViewerDeveloperType ViewType) const
+{
+	return GetCurrentDeveloperViewType() == ViewType;
+}
+*/
+
+void SClassViewer::GetInternalOnlyClasses(TArray<FSoftClassPath>& Classes)
+{
+	/*
+	if (!InitOptions.bAllowViewOptions)
+	{
+		return;
+	}
+	Classes = GetDefault<UClassViewerProjectSettings>()->InternalOnlyClasses;
+	*/
+}
+
+void SClassViewer::GetInternalOnlyPaths(TArray<FDirectoryPath>& Paths)
+{
+	/*
+	if (!InitOptions.bAllowViewOptions)
+	{
+		return;
+	}
+	Paths = GetDefault<UClassViewerProjectSettings>()->InternalOnlyPaths;
+	*/
+}
+
+FText SClassViewer::GetClassCountText() const
+{
+
+	const int32 NumAssets = GetNumItems();
+	const int32 NumSelectedAssets = GetSelectedItems().Num();
+
+	FText AssetCount = LOCTEXT("AssetCountLabelSingular", "1 item");
+
+	if (NumSelectedAssets == 0)
+	{
+		if (NumAssets == 1)
+		{
+			AssetCount = LOCTEXT("AssetCountLabelSingular", "1 item");
+		}
+		else
+		{
+			AssetCount = FText::Format(LOCTEXT("AssetCountLabelPlural", "{0} items"), FText::AsNumber(NumAssets));
+		}
+	}
+	else
+	{
+		if (NumAssets == 1)
+		{
+			AssetCount = FText::Format(LOCTEXT("AssetCountLabelSingularPlusSelection", "1 item ({0} selected)"), FText::AsNumber(NumSelectedAssets));
+		}
+		else
+		{
+			AssetCount = FText::Format(LOCTEXT("AssetCountLabelPluralPlusSelection", "{0} items ({1} selected)"), FText::AsNumber(NumAssets), FText::AsNumber(NumSelectedAssets));
+		}
+	}
+
+	return AssetCount;
+}
+
+
+void SClassViewer::ExpandRootNodes()
+{
+	for (int32 NodeIdx = 0; NodeIdx < RootTreeItems.Num(); ++NodeIdx)
+	{
+		ExpansionStateMap.Add(*(RootTreeItems[NodeIdx]->GetClassName()), true);
+		ClassTree->SetItemExpansion(RootTreeItems[NodeIdx], true);
+	}
+}
+
+/*
+FReply SClassViewer::OnDragDetected( const FGeometry& Geometry, const FPointerEvent& PointerEvent )
+{
+	if(InitOptions.Mode == EClassViewerMode::ClassBrowsing)
+	{
+		const TArray< TSharedPtr< FClassViewerNode > > SelectedItems = GetSelectedItems();
+
+		if ( SelectedItems.Num() > 0 && SelectedItems[0].IsValid() )
+		{
+			TSharedRef< FClassViewerNode > Item = SelectedItems[0].ToSharedRef();
+
+			// If there is no class then we must spawn an FAssetDragDropOp so the class will be loaded when dropped.
+			if ( UClass* Class = Item->Class.Get() )
+			{
+				// Spawn a loaded blueprint just like any other asset from the Content Browser.
+				if ( Item->Blueprint.IsValid() )
+				{
+					const FAssetData AssetData(Item->Blueprint.Get());
+					return FReply::Handled().BeginDragDrop(FContentBrowserDataDragDropOp::Legacy_New(MakeArrayView(&AssetData, 1)));
+				}
+				else
+				{
+					// Add the UClass associated with this item to the drag event being spawned.
+					return FReply::Handled().BeginDragDrop(FClassDragDropOp::New(MakeWeakObjectPtr(Class)));
+				}	
+			}
+			else if (!Item->BlueprintAssetPath.IsNull())
+			{
+				IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(AssetRegistryConstants::ModuleName).Get();
+
+				// Pull asset data out of asset registry
+				const FAssetData AssetData = AssetRegistry.GetAssetByObjectPath(Item->BlueprintAssetPath);
+				return FReply::Handled().BeginDragDrop(FContentBrowserDataDragDropOp::Legacy_New(MakeArrayView(&AssetData, 1)));
+			}
+		}
+	}
+
+	return FReply::Unhandled();
+}
+*/
+
+void SClassViewer::OnOpenBlueprintTool()
+{
+	//ClassViewer::Helpers::OpenBlueprintTool(RightClickBlueprint);
+}
+
+void SClassViewer::FindInContentBrowser()
+{
+	//ClassViewer::Helpers::FindInContentBrowser(RightClickBlueprint, RightClickClass);
+}
+
+void SClassViewer::OnFilterTextChanged( const FText& InFilterText )
+{
+	// Update the compiled filter and report any syntax error information back to the user
+	ClassFilter->TextFilter->SetFilterText(InFilterText);
+	SearchBox->SetError(ClassFilter->TextFilter->GetFilterErrorText());
+
+	// Repopulate the list to show only what has not been filtered out.
+	Refresh();
+}
+
+void SClassViewer::OnFilterTextCommitted(const FText& InText, ETextCommit::Type CommitInfo)
+{
+	if (CommitInfo == ETextCommit::OnEnter)
+	{
+		if (InitOptions.Mode == EClassViewerMode::ClassPicker)
+		{
+			TArray< TSharedPtr< FClassViewerNode > > SelectedList = ClassList->GetSelectedItems();
+			TSharedPtr< FClassViewerNode > FirstSelected;
+
+			UClass* Class = nullptr;
+			
+			if (SelectedList.Num() > 0)
+			{
+				FirstSelected = SelectedList[0];
+				Class = FirstSelected->Class.Get();
+
+				// If the class is nullptr and UnloadedBlueprintData is valid then attempt to load it. UnloadedBlueprintData is invalid in the case of a "None" item.
+				if ( bEnableClassDynamicLoading && Class == nullptr && FirstSelected->UnloadedBlueprintData.IsValid())
+				{
+					ClassViewer::Helpers::LoadClass(FirstSelected);
+					Class = FirstSelected->Class.Get();
+				}
+
+				// Check if the item passes the filter, parent items might be displayed but filtered out and thus not desired to be selected.
+				if (Class && FirstSelected->bPassesFilter == true)
+				{
+					OnClassPicked.ExecuteIfBound(Class);
+				}
+			}
+		}
+	}
+}
+
+bool SClassViewer::Menu_CanExecute() const
+{
+	return true;
+}
+
+void SClassViewer::MenuActorsOnly_Execute()
+{
+	InitOptions.bIsActorsOnly = !InitOptions.bIsActorsOnly;
+
+	// "Placeable Only" cannot be true when "Actors Only" is false.
+	if (!InitOptions.bIsActorsOnly)
+	{
+		InitOptions.bIsPlaceableOnly = false;
+	}
+
+	Refresh();
+}
+
+bool SClassViewer::MenuActorsOnly_IsChecked() const
+{
+	return InitOptions.bIsActorsOnly;
+}
+
+void SClassViewer::MenuPlaceableOnly_Execute()
+{
+	InitOptions.bIsPlaceableOnly = !InitOptions.bIsPlaceableOnly;
+
+	// "Actors Only" must be true when "Placeable Only" is true.
+	if (InitOptions.bIsPlaceableOnly)
+	{
+		InitOptions.bIsActorsOnly = true;
+	}
+
+	Refresh();
+}
+
+bool SClassViewer::MenuPlaceableOnly_IsChecked() const
+{
+	return InitOptions.bIsPlaceableOnly;
+}
+
+void SClassViewer::MenuBlueprintBasesOnly_Execute()
+{
+	InitOptions.bIsBlueprintBaseOnly = !InitOptions.bIsBlueprintBaseOnly;
+
+	Refresh();
+}
+
+bool SClassViewer::MenuBlueprintBasesOnly_IsChecked() const
+{
+	return InitOptions.bIsBlueprintBaseOnly;
+}
+
+TSharedRef<SWidget> SClassViewer::FillFilterEntries()
+{
+	FMenuBuilder MenuBuilder(true, nullptr);
+	MenuBuilder.BeginSection("ClassViewerFilterEntries");
+	{
+		MenuBuilder.AddMenuEntry( LOCTEXT("ActorsOnly", "Actors Only"), LOCTEXT( "ActorsOnly_Tooltip", "Filter the Class Viewer to show only actors" ), FSlateIcon(), FUIAction(FExecuteAction::CreateRaw(this, &SClassViewer::MenuActorsOnly_Execute), FCanExecuteAction::CreateRaw(this, &SClassViewer::Menu_CanExecute), FIsActionChecked::CreateRaw(this, &SClassViewer::MenuActorsOnly_IsChecked)), NAME_None, EUserInterfaceActionType::Check );
+		MenuBuilder.AddMenuEntry( LOCTEXT("PlaceableOnly", "Placeable Only"), LOCTEXT( "PlaceableOnly_Tooltip", "Filter the Class Viewer to show only placeable actors." ), FSlateIcon(), FUIAction(FExecuteAction::CreateRaw(this, &SClassViewer::MenuPlaceableOnly_Execute), FCanExecuteAction::CreateRaw(this, &SClassViewer::Menu_CanExecute), FIsActionChecked::CreateRaw(this, &SClassViewer::MenuPlaceableOnly_IsChecked)), NAME_None, EUserInterfaceActionType::Check );
+	}
+	MenuBuilder.EndSection();
+
+	MenuBuilder.BeginSection("ClassViewerFilterEntries2");
+	{
+		MenuBuilder.AddMenuEntry( LOCTEXT("BlueprintsOnly", "Blueprint Class Bases Only"), LOCTEXT( "BlueprinsOnly_Tooltip", "Filter the Class Viewer to show only base blueprint classes." ), FSlateIcon(), FUIAction(FExecuteAction::CreateRaw(this, &SClassViewer::MenuBlueprintBasesOnly_Execute), FCanExecuteAction::CreateRaw(this, &SClassViewer::Menu_CanExecute), FIsActionChecked::CreateRaw(this, &SClassViewer::MenuBlueprintBasesOnly_IsChecked)), NAME_None, EUserInterfaceActionType::Check );
+	}
+	MenuBuilder.EndSection();
+
+	return MenuBuilder.MakeWidget();
+}
+
+void SClassViewer::SetAllExpansionStates(bool bInExpansionState)
+{
+	// Go through all the items in the root of the tree and recursively visit their children to set every item in the tree.
+	for(int32 ChildIndex = 0; ChildIndex < RootTreeItems.Num(); ChildIndex++)
+	{
+		SetAllExpansionStates_Helper( RootTreeItems[ChildIndex], bInExpansionState );
+	}
+}
+
+void SClassViewer::SetAllExpansionStates_Helper(TSharedPtr< FClassViewerNode > InNode, bool bInExpansionState)
+{
+	ClassTree->SetItemExpansion(InNode, bInExpansionState);
+
+	// Recursively go through the children.
+	for(int32 ChildIndex = 0; ChildIndex < InNode->GetChildrenList().Num(); ChildIndex++)
+	{
+		SetAllExpansionStates_Helper( InNode->GetChildrenList()[ChildIndex], bInExpansionState );
+	}
+}
+
+void SClassViewer::ToggleExpansionState_Helper(TSharedPtr< FClassViewerNode > InNode)
+{
+	bool bExpanded = ClassTree->IsItemExpanded( InNode );
+	ClassTree->SetItemExpansion(InNode, !bExpanded);
+}
+
+bool SClassViewer::ExpandFilteredInNodes(TSharedPtr<FClassViewerNode> InNode)
+{
+	bool bShouldExpand(InNode->bPassesFilter);
+
+	for(int32 ChildIdx = 0; ChildIdx < InNode->GetChildrenList().Num(); ChildIdx++)
+	{
+		bShouldExpand |= ExpandFilteredInNodes(InNode->GetChildrenList()[ChildIdx]);
+	}
+
+	if(bShouldExpand)
+	{
+		ClassTree->SetItemExpansion(InNode, true);
+	}
+
+	return bShouldExpand;
+}
+
+void SClassViewer::MapExpansionStatesInTree( TSharedPtr<FClassViewerNode> InItem )
+{
+	ExpansionStateMap.Add( *(InItem->GetClassName()), ClassTree->IsItemExpanded( InItem ) );
+
+	// Map out all the children, this will be done recursively.
+	for( int32 ChildIdx(0); ChildIdx < InItem->GetChildrenList().Num(); ++ChildIdx )
+	{
+		MapExpansionStatesInTree( InItem->GetChildrenList()[ChildIdx] );
+	}
+}
+
+void SClassViewer::SetExpansionStatesInTree( TSharedPtr<FClassViewerNode> InItem )
+{
+	bool* bIsExpanded = ExpansionStateMap.Find( *(InItem->GetClassName()) );
+	if( bIsExpanded )
+	{
+		ClassTree->SetItemExpansion( InItem, *bIsExpanded );
+
+		// No reason to set expansion states if the parent is not expanded, it does not seem to do anything.
+		if( *bIsExpanded )
+		{
+			for( int32 ChildIdx(0); ChildIdx < InItem->GetChildrenList().Num(); ++ChildIdx )
+			{
+				SetExpansionStatesInTree( InItem->GetChildrenList()[ChildIdx] );
+			}
+		}
+	}
+	else
+	{
+		// Default to no expansion.
+		ClassTree->SetItemExpansion( InItem, false );
+	}
+}
+
+int32 SClassViewer::CountTreeItems(FClassViewerNode* Node)
+{
+	if (Node == nullptr)
+	{
+		return 0;
+	}
+	int32 Count = 1;
+	TArray<TSharedPtr<FClassViewerNode>>& ChildArray = Node->GetChildrenList();
+	for (int32 i = 0; i < ChildArray.Num(); i++)
+	{
+		Count += CountTreeItems(ChildArray[i].Get());
+	}
+	return Count;
+}
+
+void SClassViewer::Populate()
+{
+	TArray<FTopLevelAssetPath> PreviousSelection;
+	{
+		TArray<TSharedPtr<FClassViewerNode>> SelectedItems = GetSelectedItems();
+		if (SelectedItems.Num() > 0)
+		{
+			for (TSharedPtr<FClassViewerNode>& Node : SelectedItems)
+			{
+				if (Node.IsValid())
+				{
+					PreviousSelection.Add(Node->ClassPath);
+				}
+			}
+		}
+	}
+
+	bPendingSetExpansionStates = false;
+
+	// If showing a class tree, we may need to save expansion states.
+	if(InitOptions.DisplayMode == EClassViewerDisplayMode::TreeView)
+	{
+		if( bSaveExpansionStates )
+		{
+			for( int32 ChildIdx(0); ChildIdx < RootTreeItems.Num(); ++ChildIdx )
+			{
+				// Check if the item is actually expanded or if it's only expanded because it is root level.
+				bool* bIsExpanded = ExpansionStateMap.Find( *(RootTreeItems[ChildIdx]->GetClassName()) );
+				if((bIsExpanded && !*bIsExpanded) || !bIsExpanded)
+				{
+					ClassTree->SetItemExpansion( RootTreeItems[ChildIdx], false );
+				}
+
+				// Recursively map out the expansion state of the tree-node.
+				MapExpansionStatesInTree( RootTreeItems[ChildIdx] );
+			}
+		}
+
+		// This is set to false before the call to populate when it is not desired.
+		bSaveExpansionStates = true;
+	}
+
+	// Empty the tree out so it can be redone.
+	RootTreeItems.Empty();
+
+	TArray<FSoftClassPath> InternalClassNames;
+	// If we aren't showing the internal classes, then we need to know what classes to consider Internal Only, so let's gather them up from the settings object.
+	if (!IsShowingInternalClasses())
+	{
+		GetInternalOnlyPaths(ClassFilter->InternalPaths);
+		GetInternalOnlyClasses(InternalClassNames);
+
+		// Take the package names for the internal only classes and convert them into their UClass
+		for (int i = 0; i < InternalClassNames.Num(); i++)
+		{
+			FTopLevelAssetPath PackageClassName(InternalClassNames[i].ToString());
+			const TSharedPtr<FClassViewerNode> ClassNode = ClassViewer::Helpers::ClassHierarchy->FindNodeByGeneratedClassPath(ClassViewer::Helpers::ClassHierarchy->GetObjectRootNode(), PackageClassName);
+
+			if (ClassNode.IsValid())
+			{
+				ClassFilter->InternalClasses.Add(ClassNode->Class.Get());
+			}
+		}
+	}
+
+	
+
+	// Based on if the list or tree is visible we create what will be displayed differently.
+	if(InitOptions.DisplayMode == EClassViewerDisplayMode::TreeView)
+	{
+		// The root node for the tree, will be "Object" which we will skip.
+		TSharedPtr<FClassViewerNode> RootNode;
+
+		// Get the class tree, passing in certain filter options.
+		ClassViewer::Helpers::GetClassTree(RootNode, ClassFilter, InitOptions);
+
+		// Check if we will restore expansion states, we will not if there is filtering happening.
+		const bool bRestoreExpansionState = ClassFilter->TextFilter->GetFilterType() == ETextFilterExpressionType::Empty;
+
+		if(InitOptions.bShowObjectRootClass)
+		{
+			RootTreeItems.Add(RootNode);
+
+			if( bRestoreExpansionState )
+			{
+				SetExpansionStatesInTree( RootNode );
+			}
+
+			// Expand any items that pass the filter.
+			if(ClassFilter->TextFilter->GetFilterType() != ETextFilterExpressionType::Empty)
+			{
+				ExpandFilteredInNodes(RootNode);
+			}
+		}
+		else
+		{
+			// Add all the children of the "Object" root.
+			for(int32 ChildIndex = 0; ChildIndex < RootNode->GetChildrenList().Num(); ChildIndex++)
+			{
+				RootTreeItems.Add(RootNode->GetChildrenList()[ChildIndex]);
+				if( bRestoreExpansionState )
+				{
+					SetExpansionStatesInTree( RootTreeItems[ChildIndex] );
+				}
+
+				// Expand any items that pass the filter.
+				if(ClassFilter->TextFilter->GetFilterType() != ETextFilterExpressionType::Empty)
+				{
+					ExpandFilteredInNodes(RootNode->GetChildrenList()[ChildIndex]);
+				}
+			}
+		}
+
+		// Only display this option if the user wants it and in Picker Mode.
+		if(InitOptions.bShowNoneOption && InitOptions.Mode == EClassViewerMode::ClassPicker)
+		{
+			// @todo - It would seem smart to add this in before the other items, since it needs to be on top. However, that causes strange issues with saving/restoring expansion states. 
+			// This is likely not very efficient since the list can have hundreds and even thousands of items.
+			RootTreeItems.Insert(CreateNoneOption(), 0);			
+		}
+
+		NumClasses = 0;
+		for (int32 i = 0; i < RootTreeItems.Num(); i++)
+		{
+			NumClasses += CountTreeItems(RootTreeItems[i].Get());
+		}
+
+		// Now that new items are in the tree, we need to request a refresh.
+		ClassTree->RequestTreeRefresh();
+
+		TSharedPtr<FClassViewerNode> ClassNode;
+		TSharedPtr<FClassViewerNode> ExpandNode;
+		if (PreviousSelection.Num() > 0)
+		{
+			ClassNode = ClassViewer::Helpers::ClassHierarchy->FindNodeByGeneratedClassPath(RootNode, PreviousSelection[0]);
+			ExpandNode = ClassNode ? ClassNode->GetParentNode() : nullptr;
+		}
+		else if (InitOptions.InitiallySelectedClass)
+		{
+			UClass* CurrentClass = InitOptions.InitiallySelectedClass;
+			InitOptions.InitiallySelectedClass = nullptr;
+
+			TArray<UClass*> ClassHierarchy;
+			while (CurrentClass)
+			{
+				ClassHierarchy.Add(CurrentClass);
+				CurrentClass = CurrentClass->GetSuperClass();
+			}
+
+			ClassNode = RootNode;
+			for (int32 Index = ClassHierarchy.Num() - 2; Index >= 0; --Index)
+			{
+				for (const TSharedPtr<FClassViewerNode>& ChildClassNode : ClassNode->GetChildrenList())
+				{
+					UClass* ChildClass = ChildClassNode->Class.Get();
+					if (ChildClass == ClassHierarchy[Index])
+					{
+						ClassNode = ChildClassNode;
+						break;
+					}
+				}
+			}
+			ExpandNode = ClassNode;
+		}
+
+		for (; ExpandNode; ExpandNode = ExpandNode->GetParentNode())
+		{
+			ClassTree->SetItemExpansion(ExpandNode, true);
+		}
+
+		if (ClassNode)
+		{
+			ClassTree->SetSelection(ClassNode);
+		}
+	}
+	else
+	{
+		// Get the class list, passing in certain filter options.
+		ClassViewer::Helpers::GetClassList(RootTreeItems, ClassFilter, InitOptions);
+
+		// Sort the list alphabetically.
+		RootTreeItems.Sort(FClassViewerNodeNameLess(InitOptions.NameTypeToDisplay));
+
+		// Only display this option if the user wants it and in Picker Mode.
+		if(InitOptions.bShowNoneOption && InitOptions.Mode == EClassViewerMode::ClassPicker)
+		{
+			// @todo - It would seem smart to add this in before the other items, since it needs to be on top. However, that causes strange issues with saving/restoring expansion states. 
+			// This is likely not very efficient since the list can have hundreds and even thousands of items.
+			RootTreeItems.Insert(CreateNoneOption(), 0);
+		}
+
+		NumClasses = 0;
+		for (int32 i = 0; i < RootTreeItems.Num(); i++)
+		{
+			NumClasses += CountTreeItems(RootTreeItems[i].Get());
+		}
+
+		// Now that new items are in the list, we need to request a refresh.
+		ClassList->RequestListRefresh();
+
+		FString ClassPathNameToSelect;
+		if (PreviousSelection.Num() > 0)
+		{
+			ClassPathNameToSelect = PreviousSelection[0].ToString();
+		}
+		else if (InitOptions.InitiallySelectedClass)
+		{
+			ClassPathNameToSelect = InitOptions.InitiallySelectedClass->GetPathName();
+		}
+
+		if (ClassPathNameToSelect.Len() > 0)
+		{
+			if(TSharedPtr<FClassViewerNode>* ClassNode = RootTreeItems.FindByPredicate([ClassPathNameToSelect](const TSharedPtr< FClassViewerNode > InClassNode) { return InClassNode->Class.IsValid() && (InClassNode->Class->GetPathName() == ClassPathNameToSelect); }))
+			{
+				ClassList->SetSelection(*ClassNode);
+			}
+			InitOptions.InitiallySelectedClass = nullptr;
+		}
+	}
+}
+
+FReply SClassViewer::OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent )
+{
+	// Forward key down to class tree
+	return ClassTree->OnKeyDown(MyGeometry,InKeyEvent);
+}
+
+
+FReply SClassViewer::OnFocusReceived( const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent )
+{
+	if (InFocusEvent.GetCause() == EFocusCause::Navigation)
+	{
+		FSlateApplication::Get().SetKeyboardFocus(SearchBox.ToSharedRef(), EFocusCause::SetDirectly);
+	}
+	
+	return FReply::Unhandled();
+}
+
+bool SClassViewer::SupportsKeyboardFocus() const 
+{
+	return true;
+}
+
+void SClassViewer::RequestPopulateClassHierarchy()
+{
+	ClassViewer::Helpers::RequestPopulateClassHierarchy();
+}
+
+void SClassViewer::DestroyClassHierarchy()
+{
+	ClassViewer::Helpers::DestroyClassHierachy();
+}
+
+TSharedPtr<FClassViewerNode> SClassViewer::CreateNoneOption()
+{
+	TSharedPtr<FClassViewerNode> NoneItem = MakeShared<FClassViewerNode>("None", "None");
+
+	// The item "passes" the filter so it does not appear grayed out.
+	NoneItem->bPassesFilter = true;
+	NoneItem->bPassesFilterRegardlessTextFilter = true;
+
+	return NoneItem;
+}
+
+void SClassViewer::Refresh()
+{
+	bNeedsRefresh = true;
+}
+
+void SClassViewer::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{	
+	// Will populate the class hierarchy as needed.
+	ClassViewer::Helpers::PopulateClassHierarchy();
+
+	// Move focus to search box
+	if (bPendingFocusNextFrame && SearchBox.IsValid())
+	{
+		FWidgetPath WidgetToFocusPath;
+		FSlateApplication::Get().GeneratePathToWidgetUnchecked( SearchBox.ToSharedRef(), WidgetToFocusPath );
+		FSlateApplication::Get().SetKeyboardFocus( WidgetToFocusPath, EFocusCause::SetDirectly );
+		bPendingFocusNextFrame = false;
+	}
+
+	if (bNeedsRefresh)
+	{
+		bNeedsRefresh = false;
+		Populate();
+
+		if (InitOptions.bExpandRootNodes)
+		{
+			ExpandRootNodes();
+		}
+
+		if (InitOptions.bExpandAllNodes)
+		{
+			SetAllExpansionStates(true);
+		}
+
+		// Scroll the first item into view if applicable
+		const TArray<TSharedPtr<FClassViewerNode>> SelectedItems = GetSelectedItems();
+		if (SelectedItems.Num() > 0)
+		{
+			ClassTree->RequestScrollIntoView(SelectedItems[0]);
+		}
+	}
+
+	if (bPendingSetExpansionStates)
+	{
+		check(RootTreeItems.Num() > 0);
+		SetExpansionStatesInTree(RootTreeItems[0]);
+		bPendingSetExpansionStates = false;
+	}
+}
+
+bool SClassViewer::IsClassAllowed(const UClass* InClass) const
+{
+	return ClassFilter->IsClassAllowed(InitOptions, InClass, ClassFilter->FilterFunctions);
+}
+
+void SClassViewer::HandleSettingChanged(FName PropertyName)
+{
+	if ((PropertyName == "DisplayInternalClasses") ||
+		(PropertyName == "DeveloperFolderType") ||
+		(PropertyName == NAME_None))	// @todo: Needed if PostEditChange was called manually, for now
+	{
+		Refresh();
+	}
+}
+
+void SClassViewer::ToggleShowInternalClasses()
+{
+	check(IsToggleShowInternalClassesAllowed());
+	//GetMutableDefault<UClassViewerSettings>()->DisplayInternalClasses = !GetDefault<UClassViewerSettings>()->DisplayInternalClasses;
+	//GetMutableDefault<UClassViewerSettings>()->PostEditChange();
+}
+
+bool SClassViewer::IsToggleShowInternalClassesAllowed() const
+{
+	return InitOptions.bAllowViewOptions;
+}
+
+bool SClassViewer::IsShowingInternalClasses() const
+{
+	if (!InitOptions.bAllowViewOptions)
+	{
+		return true;
+	}
+	return false;// IsToggleShowInternalClassesAllowed() ? GetDefault<UClassViewerSettings>()->DisplayInternalClasses : false;
+}
+
+/*
+void SClassViewer::ToggleCustomFilterOption(TSharedRef<FClassViewerFilterOption> FilterOption)
+{
+	FilterOption->bEnabled = !FilterOption->bEnabled;
+
+	if (FilterOption->OnOptionChanged.IsBound())
+	{
+		FilterOption->OnOptionChanged.Execute(FilterOption->bEnabled);
+	}
+
+	Refresh();
+}
+
+bool SClassViewer::IsCustomFilterOptionEnabled(TSharedRef<FClassViewerFilterOption> FilterOption) const
+{
+	return FilterOption->bEnabled;
+}
+*/
+
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimeClassViewer/UnloadedBlueprintData.cpp b/Source/RuntimeEditor/Private/RuntimeClassViewer/UnloadedBlueprintData.cpp
new file mode 100644
index 0000000..3485f8e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeClassViewer/UnloadedBlueprintData.cpp
@@ -0,0 +1,168 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeClassViewer/UnloadedBlueprintData.h"
+#include "RuntimeClassViewer/ClassViewerNode.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "HAL/PlatformCrt.h"
+#include "UObject/Class.h"
+#include "UObject/Object.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+namespace soda
+{
+
+FUnloadedBlueprintData::FUnloadedBlueprintData(TWeakPtr<FClassViewerNode> InClassViewerNode)
+	: ClassViewerNode(InClassViewerNode)
+{
+}
+
+bool FUnloadedBlueprintData::HasAnyClassFlags( uint32 InFlagsToCheck ) const
+{
+	return (ClassFlags & InFlagsToCheck) != 0;
+}
+
+bool FUnloadedBlueprintData::HasAllClassFlags( uint32 InFlagsToCheck ) const
+{
+	return ((ClassFlags & InFlagsToCheck) == InFlagsToCheck);
+}
+
+void FUnloadedBlueprintData::SetClassFlags(uint32 InFlags)
+{
+	ClassFlags = InFlags;
+}
+
+bool FUnloadedBlueprintData::IsChildOf(const UClass* InClass) const
+{
+	TSharedPtr<FClassViewerNode> CurrentNode = ClassViewerNode.Pin()->GetParentNode();
+
+	// Keep going through parents till you find an invalid.
+	while (CurrentNode.IsValid())
+	{
+		if (CurrentNode->Class.Get() == InClass)
+		{
+			return true;
+		}
+		CurrentNode = CurrentNode->GetParentNode();
+	}
+
+	return false;
+}
+
+bool FUnloadedBlueprintData::ImplementsInterface(const UClass* InInterface) const
+{
+	FString InterfacePath = InInterface->GetPathName();
+	// Does this blueprint implement the interface directly?
+	for (const FString& DirectlyImplementedInterface : ImplementedInterfaces)
+	{
+		if (DirectlyImplementedInterface == InterfacePath)
+		{
+			return true;
+		}
+	}
+
+	// If not, does a parent class implement the interface?
+	TSharedPtr<FClassViewerNode> CurrentNode = ClassViewerNode.Pin()->GetParentNode();
+	while (CurrentNode.IsValid())
+	{
+		if (CurrentNode->Class.IsValid() && CurrentNode->Class->ImplementsInterface(InInterface))
+		{
+			return true;
+		}
+		else if (CurrentNode->UnloadedBlueprintData.IsValid() && CurrentNode->UnloadedBlueprintData->ImplementsInterface(InInterface))
+		{
+			return true;
+		}
+		CurrentNode = CurrentNode->GetParentNode();
+	}
+
+	return false;
+}
+
+bool FUnloadedBlueprintData::IsA(const UClass* InClass) const
+{
+	// Unloaded blueprints will always return true for IsA(UBlueprintGeneratedClass::StaticClass). With that in mind, even though we do not have the exact class, we can use that knowledge as a basis for a check.
+	return ((UObject*)UBlueprintGeneratedClass::StaticClass())->IsA(InClass);
+}
+
+const UClass* FUnloadedBlueprintData::GetClassWithin() const
+{
+	TSharedPtr<FClassViewerNode> CurrentNode = ClassViewerNode.Pin()->GetParentNode();
+
+	while (CurrentNode.IsValid())
+	{
+		// The class field will be invalid for unloaded classes.
+		// However, it should be valid once we've hit a loaded class or a Native class.
+		// Assuming BP cannot change ClassWithin data, this should be safe.
+		if (CurrentNode->Class.IsValid())
+		{
+			return CurrentNode->Class->ClassWithin;
+		}
+
+		CurrentNode = CurrentNode->GetParentNode();
+	}
+
+	return nullptr;
+}
+
+const UClass* FUnloadedBlueprintData::GetNativeParent() const
+{
+	TSharedPtr<FClassViewerNode> CurrentNode = ClassViewerNode.Pin()->GetParentNode();
+
+	while (CurrentNode.IsValid())
+	{
+		// The class field will be invalid for unloaded classes.
+		// However, it should be valid once we've hit a loaded class or a Native class.
+		// Assuming BP cannot change ClassWithin data, this should be safe.
+		if (CurrentNode->Class.IsValid() && CurrentNode->Class->HasAnyClassFlags(CLASS_Native))
+		{
+			return CurrentNode->Class.Get();
+		}
+
+		CurrentNode = CurrentNode->GetParentNode();
+	}
+
+	return nullptr;
+}
+
+TSharedPtr<FString> FUnloadedBlueprintData::GetClassName() const
+{
+	if (ClassViewerNode.IsValid())
+	{
+		return ClassViewerNode.Pin()->GetClassName();
+	}
+
+	return TSharedPtr<FString>();
+}
+
+FName FUnloadedBlueprintData::GetClassPath() const
+{
+	if (ClassViewerNode.IsValid())
+	{
+		return FName(*ClassViewerNode.Pin()->ClassPath.ToString());
+	}
+
+	return FName();
+}
+
+FTopLevelAssetPath FUnloadedBlueprintData::GetClassPathName() const
+{
+	if (ClassViewerNode.IsValid())
+	{
+		return ClassViewerNode.Pin()->ClassPath;
+	}
+
+	return FTopLevelAssetPath();
+}
+
+const TWeakPtr<FClassViewerNode>& FUnloadedBlueprintData::GetClassViewerNode() const
+{
+	return ClassViewerNode;
+}
+
+void FUnloadedBlueprintData::AddImplementedInterface(const FString& InterfaceName)
+{
+	ImplementedInterfaces.Add(InterfaceName);
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimeClassViewer/UnloadedBlueprintData.h b/Source/RuntimeEditor/Private/RuntimeClassViewer/UnloadedBlueprintData.h
new file mode 100644
index 0000000..ad09bfc
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeClassViewer/UnloadedBlueprintData.h
@@ -0,0 +1,76 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimeClassViewer/ClassViewerFilter.h"
+#include "Containers/Array.h"
+#include "Containers/UnrealString.h"
+#include "CoreTypes.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/NameTypes.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/TopLevelAssetPath.h"
+
+class UClass;
+
+namespace soda
+{
+
+class FClassViewerNode;
+
+class FUnloadedBlueprintData : public IUnloadedBlueprintData
+{
+public:
+	FUnloadedBlueprintData(TWeakPtr<FClassViewerNode> InClassViewerNode);
+
+	virtual ~FUnloadedBlueprintData() {}
+
+	virtual bool HasAnyClassFlags(uint32 InFlagsToCheck) const override;
+
+	virtual bool HasAllClassFlags(uint32 InFlagsToCheck) const override;
+
+	virtual void SetClassFlags(uint32 InFlags) override;
+
+	virtual bool ImplementsInterface(const UClass* InInterface) const override;
+
+	virtual bool IsChildOf(const UClass* InClass) const override;
+
+	virtual bool IsA(const UClass* InClass) const override;
+
+	virtual void SetNormalBlueprintType(bool bInNormalBPType) override { bNormalBlueprintType = bInNormalBPType; }
+
+	virtual bool IsNormalBlueprintType() const override { return bNormalBlueprintType; }
+
+	virtual TSharedPtr<FString> GetClassName() const override;
+
+	UE_DEPRECATED(5.1, "Class names are now represented by path names. Please use GetClassPathName.")
+	virtual FName GetClassPath() const override;
+
+	virtual FTopLevelAssetPath GetClassPathName() const override;
+
+	virtual const UClass* GetClassWithin() const override;
+
+	virtual const UClass* GetNativeParent() const override;
+
+	/** Retrieves the Class Viewer node this data is associated with. */
+	const TWeakPtr<FClassViewerNode>& GetClassViewerNode() const;
+
+	/** Adds the path of an interface that this blueprint implements directly. */
+	void AddImplementedInterface(const FString& InterfacePath);
+
+private:
+	/** Flags for the class. */
+	uint32 ClassFlags = CLASS_None;
+
+	/** Is this a normal blueprint type? */
+	bool bNormalBlueprintType;
+
+	/** The full paths for all directly implemented interfaces for this class. */
+	TArray<FString> ImplementedInterfaces;
+
+	/** The node this class is contained in, used to gather hierarchical data as needed. */
+	TWeakPtr<FClassViewerNode> ClassViewerNode;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/Documentation.cpp b/Source/RuntimeEditor/Private/RuntimeDocumentation/Documentation.cpp
new file mode 100644
index 0000000..cb2258f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/Documentation.cpp
@@ -0,0 +1,400 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeDocumentation/Documentation.h"
+
+#include "CoreTypes.h"
+#include "Delegates/Delegate.h"
+//#include "Dialogs/Dialogs.h"
+#include "RuntimeDocumentation/DocumentationLink.h"
+#include "RuntimeDocumentation/DocumentationPage.h"
+#include "RuntimeDocumentation/RuntimeDocumentationSettings.h"
+#include "EngineAnalytics.h"
+#include "HAL/FileManager.h"
+#include "HAL/PlatformProcess.h"
+#include "IAnalyticsProviderET.h"
+//#include "Interfaces/IMainFrameModule.h"
+#include "Interfaces/IPluginManager.h"
+#include "Internationalization/Internationalization.h"
+#include "Internationalization/Text.h"
+#include "Layout/Margin.h"
+#include "Misc/Attribute.h"
+#include "Misc/CommandLine.h"
+#include "Misc/PackageName.h"
+#include "Misc/Parse.h"
+#include "Misc/Paths.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimeDocumentation/SDocumentationAnchor.h"
+#include "RuntimeDocumentation/SDocumentationToolTip.h"
+#include "Styling/CoreStyle.h"
+#include "Styling/ISlateStyle.h"
+#include "SodaStyleSet.h"
+//#include "RuntimeDocumentation/UDNParser.h"
+//#include "UnrealEdMisc.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SToolTip.h"
+
+#include "Kismet/GameplayStatics.h"
+
+class IDocumentationPage;
+class SVerticalBox;
+class SWidget;
+
+#define LOCTEXT_NAMESPACE "DocumentationActor"
+
+DEFINE_LOG_CATEGORY(LogDocumentation);
+
+
+
+namespace soda
+{
+
+TSharedRef< IDocumentation > FDocumentation::Create() 
+{
+	return MakeShareable( new FDocumentation() );
+}
+
+FDocumentation::FDocumentation() 
+{
+	//IMainFrameModule& MainFrameModule = FModuleManager::LoadModuleChecked<IMainFrameModule>(TEXT("MainFrame"));
+	//MainFrameModule.OnMainFrameSDKNotInstalled().AddRaw(this, &FDocumentation::HandleSDKNotInstalled);
+
+	if (const URuntimeDocumentationSettings* DocSettings = GetDefault<URuntimeDocumentationSettings>())
+	{
+		for (const FRuntimeDocumentationBaseUrl& BaseUrl : DocSettings->DocumentationBaseUrls)
+		{
+			if (!RegisterBaseUrl(BaseUrl.Id, BaseUrl.Url))
+			{
+				UE_LOG(LogDocumentation, Warning, TEXT("Could not register documentation base URL: %s"), *BaseUrl.Id);
+			}
+		}
+	}
+
+	AddSourcePath(FPaths::Combine(FPaths::ProjectDir(), TEXT("Documentation"), TEXT("Source")));
+	for (TSharedRef<IPlugin> Plugin : IPluginManager::Get().GetEnabledPlugins())
+	{
+		AddSourcePath(FPaths::Combine(Plugin->GetBaseDir(), TEXT("Documentation"), TEXT("Source")));
+	}
+	AddSourcePath(FPaths::Combine(FPaths::EngineDir(), TEXT("Documentation"), TEXT("Source")));
+}
+
+FDocumentation::~FDocumentation() 
+{
+
+}
+
+bool FDocumentation::OpenHome(FDocumentationSourceInfo Source, const FString& BaseUrlId) const
+{
+	return Open(TEXT("%ROOT%"), Source, BaseUrlId);
+}
+
+bool FDocumentation::OpenHome(const FCultureRef& Culture, FDocumentationSourceInfo Source, const FString& BaseUrlId) const
+{
+	return Open(TEXT("%ROOT%"), Culture, Source, BaseUrlId);
+}
+
+bool FDocumentation::OpenAPIHome(FDocumentationSourceInfo Source) const
+{
+	/*
+	FString Url;
+	FUnrealEdMisc::Get().GetURL(TEXT("APIDocsURL"), Url, true);
+
+	if (!Url.IsEmpty())
+	{
+		FUnrealEdMisc::Get().ReplaceDocumentationURLWildcards(Url, FInternationalization::Get().GetCurrentCulture());
+		FPlatformProcess::LaunchURL(*Url, nullptr, nullptr);
+
+		return true;
+	}
+	*/
+	return false;
+}
+
+bool FDocumentation::Open(const FString& Link, FDocumentationSourceInfo Source, const FString& BaseUrlId) const
+{
+	FString DocumentationUrl;
+
+	// Warn the user if they are opening a URL
+	if (Link.StartsWith(TEXT("http")) || Link.StartsWith(TEXT("https")))
+	{
+		FText Message = LOCTEXT("OpeningURLMessage", "You are about to open an external URL. This will open your web browser. Do you want to proceed?");
+		FText URLDialog = LOCTEXT("OpeningURLTitle", "Open external link");
+
+		/*
+		FSuppressableWarningDialog::FSetupInfo Info(Message, URLDialog, "SuppressOpenURLWarning");
+		Info.ConfirmText = LOCTEXT("OpenURL_yes", "Yes");
+		Info.CancelText = LOCTEXT("OpenURL_no", "No");
+		FSuppressableWarningDialog OpenURLWarning(Info);
+		if (OpenURLWarning.ShowModal() == FSuppressableWarningDialog::Cancel)
+		{
+			return false;
+		}
+		else
+		{
+			FPlatformProcess::LaunchURL(*Link, nullptr, nullptr);
+			return true;
+		}
+		*/
+		return false;
+	}
+
+	if (!FParse::Param(FCommandLine::Get(), TEXT("testdocs")))
+	{
+		FString OnDiskPath = FDocumentationLink::ToFilePath(Link);
+		if (IFileManager::Get().FileSize(*OnDiskPath) != INDEX_NONE)
+		{
+			DocumentationUrl = FDocumentationLink::ToFileUrl(Link, Source);
+		}
+	}
+
+	
+	if (DocumentationUrl.IsEmpty())
+	{
+		// When opening a doc website we always request the most ideal culture for our documentation.
+		// The DNS will redirect us if necessary.
+		DocumentationUrl = FDocumentationLink::ToUrl(Link, Source, BaseUrlId);
+	}
+
+	if (!DocumentationUrl.IsEmpty())
+	{
+		FPlatformProcess::LaunchURL(*DocumentationUrl, NULL, NULL);
+	}
+
+	if (!DocumentationUrl.IsEmpty() && FEngineAnalytics::IsAvailable())
+	{
+		FEngineAnalytics::GetProvider().RecordEvent(TEXT("Editor.Usage.Documentation"), TEXT("OpenedPage"), Link);
+	}
+
+	return !DocumentationUrl.IsEmpty();
+}
+
+bool FDocumentation::Open(const FString& Link, const FCultureRef& Culture, FDocumentationSourceInfo Source, const FString& BaseUrlId) const
+{
+	FString DocumentationUrl;
+
+	if (!FParse::Param(FCommandLine::Get(), TEXT("testdocs")))
+	{
+		FString OnDiskPath = FDocumentationLink::ToFilePath(Link, Culture);
+		if (IFileManager::Get().FileSize(*OnDiskPath) != INDEX_NONE)
+		{
+			DocumentationUrl = FDocumentationLink::ToFileUrl(Link, Culture, Source);
+		}
+	}
+
+	if (DocumentationUrl.IsEmpty())
+	{
+		DocumentationUrl = FDocumentationLink::ToUrl(Link, Culture, Source, BaseUrlId);
+	}
+
+	if (!DocumentationUrl.IsEmpty())
+	{
+		FPlatformProcess::LaunchURL(*DocumentationUrl, NULL, NULL);
+	}
+
+	if (!DocumentationUrl.IsEmpty() && FEngineAnalytics::IsAvailable())
+	{
+		FEngineAnalytics::GetProvider().RecordEvent(TEXT("Editor.Usage.Documentation"), TEXT("OpenedPage"), Link);
+	}
+
+	return !DocumentationUrl.IsEmpty();
+}
+
+TSharedRef< SWidget > FDocumentation::CreateAnchor( const TAttribute<FString>& Link, const FString& PreviewLink, const FString& PreviewExcerptName, const TAttribute<FString>& BaseUrlId) const
+{
+	return SNew( SDocumentationAnchor )
+		.Link(Link)
+		.PreviewLink(PreviewLink)
+		.PreviewExcerptName(PreviewExcerptName)
+		.BaseUrlId(BaseUrlId);
+}
+
+TSharedRef< IDocumentationPage > FDocumentation::GetPage( const FString& Link, const TSharedPtr< FParserConfiguration >& Config, const FDocumentationStyle& Style )
+{
+	TSharedPtr< IDocumentationPage > Page;
+	const TWeakPtr< IDocumentationPage >* ExistingPagePtr = LoadedPages.Find( Link );
+
+	if ( ExistingPagePtr != NULL )
+	{
+		const TSharedPtr< IDocumentationPage > ExistingPage = ExistingPagePtr->Pin();
+		if ( ExistingPage.IsValid() )
+		{
+			Page = ExistingPage;
+		}
+	}
+
+	if ( !Page.IsValid() )
+	{
+		Page = FDocumentationPage::Create( Link/*, FUDNParser::Create(Config, Style)*/);
+		LoadedPages.Add( Link, TWeakPtr< IDocumentationPage >( Page ) );
+	}
+
+	return Page.ToSharedRef();
+}
+
+bool FDocumentation::PageExists(const FString& Link) const
+{
+	const TWeakPtr< IDocumentationPage >* ExistingPagePtr = LoadedPages.Find(Link);
+	if (ExistingPagePtr != NULL)
+	{
+		return true;
+	}
+
+	for (const FString& SourcePath : SourcePaths)
+	{
+		FString LinkPath = FDocumentationLink::ToSourcePath(Link, SourcePath);
+		if (FPaths::FileExists(LinkPath))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+bool FDocumentation::PageExists(const FString& Link, const FCultureRef& Culture) const
+{
+	const TWeakPtr< IDocumentationPage >* ExistingPagePtr = LoadedPages.Find(Link);
+	if (ExistingPagePtr != NULL)
+	{
+		return true;
+	}
+
+	for (const FString& SourcePath : SourcePaths)
+	{
+		FString LinkPath = FDocumentationLink::ToSourcePath(Link, Culture, SourcePath);
+		if (FPaths::FileExists(LinkPath))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+const TArray <FString>& FDocumentation::GetSourcePaths() const
+{
+	return SourcePaths;
+}
+
+TSharedRef< SToolTip > FDocumentation::CreateToolTip(const TAttribute<FText>& Text, const TSharedPtr<SWidget>& OverrideContent, const FString& Link, const FString& ExcerptName) const
+{
+	TSharedPtr< SDocumentationToolTip > DocToolTip;
+
+	if ( !Text.IsBound() && Text.Get().IsEmpty() )
+	{
+		return SNew( SToolTip );
+	}
+
+	if ( OverrideContent.IsValid() )
+	{
+		SAssignNew( DocToolTip, SDocumentationToolTip )
+		.DocumentationLink( Link )
+		.ExcerptName( ExcerptName )
+		[
+			OverrideContent.ToSharedRef()
+		];
+	}
+	else
+	{
+		SAssignNew( DocToolTip, SDocumentationToolTip )
+		.Text( Text )
+		.DocumentationLink( Link )
+		.ExcerptName( ExcerptName );
+	}
+	
+	return SNew(SToolTip)
+		.IsInteractive( DocToolTip.ToSharedRef(), &SDocumentationToolTip::IsInteractive )
+
+		// Emulate text-only tool-tip styling that SToolTip uses when no custom content is supplied.  We want documentation tool-tips to 
+		// be styled just like text-only tool-tips
+		.BorderImage( FSodaStyle::Get().GetBrush("ToolTip.BrightBackground") )
+		.TextMargin(FMargin(11.0f))
+		[
+			DocToolTip.ToSharedRef()
+		];
+}
+
+TSharedRef< class SToolTip > FDocumentation::CreateToolTip(const TAttribute<FText>& Text, const TSharedRef<SWidget>& OverrideContent, const TSharedPtr<SVerticalBox>& DocVerticalBox, const FString& Link, const FString& ExcerptName) const
+{
+	TSharedRef<SDocumentationToolTip> DocToolTip =
+		SNew(SDocumentationToolTip)
+		.Text(Text)
+		.DocumentationLink(Link)
+		.ExcerptName(ExcerptName)
+		.AddDocumentation(false)
+		.DocumentationMargin(7)
+		[
+			OverrideContent
+		];
+
+	if (DocVerticalBox.IsValid())
+	{
+		DocToolTip->AddDocumentation(DocVerticalBox);
+	}
+
+	return SNew(SToolTip)
+		.IsInteractive(DocToolTip, &SDocumentationToolTip::IsInteractive)
+
+		// Emulate text-only tool-tip styling that SToolTip uses when no custom content is supplied.  We want documentation tool-tips to 
+		// be styled just like text-only tool-tips
+		.BorderImage( FSodaStyle::Get().GetBrush("ToolTip.BrightBackground") )
+		.TextMargin(FMargin(11.0f))
+		[
+			DocToolTip
+		];
+}
+
+/*
+void FDocumentation::HandleSDKNotInstalled(const FString& PlatformName, const FString& InDocumentationPage)
+{
+	if (FPackageName::IsValidLongPackageName(InDocumentationPage, true))
+	{
+		return;
+	}
+	IDocumentation::Get()->Open(InDocumentationPage);
+}
+*/
+
+bool FDocumentation::RegisterBaseUrl(const FString& Id, const FString& Url)
+{
+	if (!Id.IsEmpty() && !Url.IsEmpty())
+	{
+		if (!RegisteredBaseUrls.Contains(Id))
+		{
+			RegisteredBaseUrls.Add(Id, Url);
+			return true;
+		}
+		UE_LOG(LogDocumentation, Warning, TEXT("Could not register documentation base URL with ID: %s. This ID is already in use."), *Id);
+		return false;
+	}
+	return false;
+}
+
+FString FDocumentation::GetBaseUrl(const FString& Id) const
+{
+	if (!Id.IsEmpty())
+	{
+		const FString* BaseUrl = RegisteredBaseUrls.Find(Id);
+		if (BaseUrl != NULL && !BaseUrl->IsEmpty())
+		{
+			return *BaseUrl;
+		}
+		UE_LOG(LogDocumentation, Warning, TEXT("Could not resolve base URL with ID: %s. It may not have been registered."), *Id);
+	}
+
+	FString DefaultUrl = "soda.auto";
+	//FUnrealEdMisc::Get().GetURL(TEXT("DocumentationURL"), DefaultUrl, true);
+	return DefaultUrl;
+}
+
+bool FDocumentation::AddSourcePath(const FString& Path)
+{
+	if (!Path.IsEmpty() && FPaths::DirectoryExists(Path))
+	{
+		SourcePaths.Add(Path);
+		return true;
+	}
+	return false;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/Documentation.h b/Source/RuntimeEditor/Private/RuntimeDocumentation/Documentation.h
new file mode 100644
index 0000000..2b25516
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/Documentation.h
@@ -0,0 +1,79 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Map.h"
+#include "Containers/UnrealString.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "Internationalization/CulturePointer.h"
+#include "Templates/SharedPointer.h"
+
+class FText;
+class SVerticalBox;
+class SWidget;
+template< typename ObjectType > class TAttribute;
+
+DECLARE_LOG_CATEGORY_EXTERN(LogDocumentation, Log, All);
+
+namespace soda
+{
+
+class IDocumentationPage;
+
+class FDocumentation : public IDocumentation
+{
+public:
+
+	static TSharedRef< IDocumentation > Create();
+
+public:
+
+	virtual ~FDocumentation();
+
+	virtual bool OpenHome(FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString& BaseUrlId = FString()) const override;
+
+	virtual bool OpenHome(const FCultureRef& Culture, FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString& BaseUrlId = FString()) const override;
+
+	virtual bool OpenAPIHome(FDocumentationSourceInfo Source = FDocumentationSourceInfo()) const override;
+
+	virtual bool Open( const FString& Link, FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString& BaseUrlId = FString()) const override;
+
+	virtual bool Open( const FString& Link, const FCultureRef& Culture, FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString& BaseUrlId = FString()) const override;
+
+	virtual TSharedRef< SWidget > CreateAnchor( const TAttribute<FString>& Link, const FString& PreviewLink = FString(), const FString& PreviewExcerptName = FString(), const TAttribute<FString>& BaseUrlId = FString()) const override;
+
+	virtual TSharedRef< IDocumentationPage > GetPage( const FString& Link, const TSharedPtr< FParserConfiguration >& Config, const FDocumentationStyle& Style = FDocumentationStyle() ) override;
+
+	virtual bool PageExists(const FString& Link) const override;
+
+	virtual bool PageExists(const FString& Link, const FCultureRef& Culture) const override;
+
+	virtual const TArray < FString >& GetSourcePaths() const override;
+
+	virtual TSharedRef< class SToolTip > CreateToolTip( const TAttribute<FText>& Text, const TSharedPtr<SWidget>& OverrideContent, const FString& Link, const FString& ExcerptName ) const override;
+	
+	virtual TSharedRef< class SToolTip > CreateToolTip(const TAttribute<FText>& Text, const TSharedRef<SWidget>& OverrideContent, const TSharedPtr<SVerticalBox>& DocVerticalBox, const FString& Link, const FString& ExcerptName) const override;
+
+	virtual bool RegisterBaseUrl(const FString& Id, const FString& Url) override;
+
+	virtual FString GetBaseUrl(const FString& Id) const override;
+
+private:
+
+	FDocumentation();
+
+private:
+
+	TMap< FString, TWeakPtr< IDocumentationPage > > LoadedPages;
+
+	TMap< const FString, const FString > RegisteredBaseUrls;
+
+	TArray < FString > SourcePaths;
+
+	//void HandleSDKNotInstalled(const FString& PlatformName, const FString& InDocumentationPage);
+
+	bool AddSourcePath(const FString& Path);
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationLink.h b/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationLink.h
new file mode 100644
index 0000000..9a409b5
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationLink.h
@@ -0,0 +1,267 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "Misc/Paths.h"
+#include "HAL/FileManager.h"
+#include "Internationalization/Culture.h"
+//#include "UnrealEdMisc.h"
+#include "Misc/EngineVersion.h"
+
+namespace soda
+{
+
+class FDocumentationLink
+{
+public: 
+
+	static FString GetUrlRoot(const FString& BaseUrlId = FString())
+	{
+		return IDocumentation::Get()->GetBaseUrl(BaseUrlId);
+	}
+
+	static FString GetHomeUrl()
+	{
+		return GetHomeUrl(FInternationalization::Get().GetCurrentCulture());
+	}
+
+	static FString GetHomeUrl(const FCultureRef& Culture)
+	{
+		FString Url = TEXT("soda.auto");
+		//FUnrealEdMisc::Get().GetURL( TEXT("DocumentationURL"), Url, true );
+		//FUnrealEdMisc::Get().ReplaceDocumentationURLWildcards(Url, Culture);
+
+		return Url;
+	}
+
+	static FString ToUrl(const FString& Link, FDocumentationSourceInfo const& Source, const FString& BaseUrlId = FString())
+	{
+		return ToUrl(Link, FInternationalization::Get().GetCurrentCulture(), Source, BaseUrlId);
+	}
+
+	static FString ToUrl(const FString& Link, const FCultureRef& Culture, FDocumentationSourceInfo const& Source, const FString& BaseUrlId = FString())
+	{
+		// Get the base URL for this doc request, if any.
+		// It may have any or all of the following pieces in it.
+		FString UrlRoot = GetUrlRoot(BaseUrlId);
+		FString RootPath;
+		FString QueryString;
+		FString Anchor;
+		SplitLink(UrlRoot, RootPath, QueryString, Anchor);
+
+		// Break up the incoming documentation link into pieces.
+		// Depending on where it comes from, the link may be just a page ID, or it may have any or all
+		// of the following pieces in it. If there's a query string, SplitLink will merge it with the existing query
+		// string found in the base URL (if any). If there's an anchor, SplitLink will use it /instead/ of the
+		// one in the BaseUrl (if any).
+		FString LinkPath;
+		SplitLink(Link, LinkPath, QueryString, Anchor);
+		const FString TrimmedPartialPath = LinkPath.TrimChar('/');
+
+		// Add query parameters for the source, if needed.
+		AddSourceInfoToQueryString(QueryString, Source);
+
+		FString AssembledUrl = RootPath + QueryString + Anchor;
+		//FUnrealEdMisc::Get().ReplaceDocumentationURLWildcards(AssembledUrl, Culture, TrimmedPartialPath);
+		return AssembledUrl;
+	}
+
+	static FString ToFilePath( const FString& Link )
+	{
+		FInternationalization& I18N = FInternationalization::Get();
+
+		FString FilePath = ToFilePath(Link, I18N.GetCurrentCulture());
+
+		if (!FPaths::FileExists(FilePath))
+		{
+			const FCulturePtr FallbackCulture = I18N.GetCulture(TEXT("en"));
+			if (FallbackCulture.IsValid())
+			{
+				const FString FallbackFilePath = ToFilePath(Link, FallbackCulture.ToSharedRef());
+				if (FPaths::FileExists(FallbackFilePath))
+				{
+					FilePath = FallbackFilePath;
+				}
+			}
+		}
+
+		return FilePath;
+	}
+
+	static FString ToFilePath(const FString& Link, const FCultureRef& Culture)
+	{
+		FString Path;
+		FString Anchor;
+		FString QueryString;
+		SplitLink(Link, Path, QueryString, Anchor);
+
+		static FString Version = FString::FromInt(FEngineVersion::Current().GetMajor()) + TEXT(".") + FString::FromInt(FEngineVersion::Current().GetMinor());
+		const FString PartialPath = FString::Printf(TEXT("%s/%s%s/index.html"), *Version, *(Culture->GetName()), *Path);
+		return FString::Printf(TEXT("%sDocumentation/HTML/%s"), *FPaths::ConvertRelativePathToFull(FPaths::EngineDir()), *PartialPath);
+	}
+
+	static FString ToFileUrl(const FString& Link, FDocumentationSourceInfo const& SourceInfo)
+	{
+		FInternationalization& I18N = FInternationalization::Get();
+
+		FCultureRef Culture = I18N.GetCurrentCulture();
+		FString FilePath = ToFilePath(Link, Culture);
+
+		if (!FPaths::FileExists(FilePath))
+		{
+			const FCulturePtr FallbackCulture = I18N.GetCulture(TEXT("en"));
+			if (FallbackCulture.IsValid())
+			{
+				const FString FallbackFilePath = ToFilePath(Link, FallbackCulture.ToSharedRef());
+				if (FPaths::FileExists(FallbackFilePath))
+				{
+					Culture = FallbackCulture.ToSharedRef();
+				}
+			}
+		}
+
+		return ToFileUrl(Link, Culture, SourceInfo);
+	}
+
+	static FString ToFileUrl(const FString& Link, const FCultureRef& Culture, FDocumentationSourceInfo const& SourceInfo)
+	{
+		FString Path;
+		FString Anchor;
+		FString QueryString;
+		SplitLink(Link, Path, QueryString, Anchor);
+
+		AddSourceInfoToQueryString(QueryString, SourceInfo);
+
+		return FString::Printf(TEXT("file:///%s%s%s"), *ToFilePath(Link, Culture), *QueryString, *Anchor);
+	}
+
+	static FString ToSourcePath(const FString& Link, const FString& BasePath = FString())
+	{
+		FInternationalization& I18N = FInternationalization::Get();
+
+		FString SourcePath = ToSourcePath(Link, I18N.GetCurrentCulture(), BasePath);
+
+		if (!FPaths::FileExists(SourcePath))
+		{
+			const FCulturePtr FallbackCulture = I18N.GetCulture(TEXT("en"));
+			if (FallbackCulture.IsValid())
+			{
+				const FString FallbackSourcePath = ToSourcePath(Link, FallbackCulture.ToSharedRef(), BasePath);
+				if (FPaths::FileExists(FallbackSourcePath))
+				{
+					SourcePath = FallbackSourcePath;
+				}
+			}
+		}
+
+		return SourcePath;
+	}
+
+	static FString ToSourcePath(const FString& Link, const FCultureRef& Culture, const FString& BasePath = FString())
+	{
+		FString Path;
+		FString Anchor;
+		FString QueryString;
+		SplitLink(Link, Path, QueryString, Anchor);
+
+		FString DocSourcePath = BasePath;
+		if (DocSourcePath.IsEmpty() && !IDocumentation::Get()->GetSourcePaths().IsEmpty())
+		{
+			DocSourcePath = IDocumentation::Get()->GetSourcePaths().Last();
+		}
+		const FString FullDirectoryPath = FPaths::Combine(DocSourcePath, Path);
+
+		const FString WildCard = FString::Printf(TEXT("%s/*.%s.udn"), *FullDirectoryPath, *(Culture->GetUnrealLegacyThreeLetterISOLanguageName()));
+
+		TArray<FString> Filenames;
+		IFileManager::Get().FindFiles(Filenames, *WildCard, true, false);
+
+		if (Filenames.Num() > 0)
+		{
+			return FPaths::Combine(FullDirectoryPath, Filenames[0]);
+		}
+
+		// Since the source file doesn't exist already make up a valid name for a new one
+		FString Category = FPaths::GetBaseFilename(Link);
+		return FString::Printf(TEXT("%s/%s.%s.udn"), *FullDirectoryPath, *Category, *(Culture->GetUnrealLegacyThreeLetterISOLanguageName()));
+	}
+
+private:
+	static void AddSourceInfoToQueryString(FString& QueryString, FDocumentationSourceInfo const& Info)
+	{
+		if (Info.IsEmpty() == false)
+		{
+			if (QueryString.IsEmpty())
+			{
+				QueryString = FString::Printf(TEXT("?utm_source=%s&utm_medium=%s&utm_campaign=%s"), *Info.Source, *Info.Medium, *Info.Campaign);
+			}
+			else
+			{
+				QueryString = FString::Printf(TEXT("%s&utm_source=%s&utm_medium=%s&utm_campaign=%s"), *QueryString, *Info.Source, *Info.Medium, *Info.Campaign);
+			}
+		}
+	}
+	
+	// Splits the Link parameter into three parts:
+	// - The path, which is everything up to the first ? or # character (or to the end of the link).
+	// - The query string, which is everything from the first ? to the first # (or to the end of the link).
+	// - The anchor, which is everything from the first # to the end of the link.
+	// If the query parameter contains anything already, whatever is found in the link will
+	// be appended to the existing value.
+	//
+	static void SplitLink( const FString& Link, /*OUT*/ FString& Path, /*OUT*/ FString& QueryString, /*OUT*/ FString& Anchor )
+	{
+		FString CleanedLink = Link;
+		CleanedLink.TrimStartAndEndInline();
+
+		if ( CleanedLink == TEXT("%ROOT%") )
+		{
+			Path.Empty();
+		}
+		else
+		{
+			FString PathAndQueryString;
+			FString InAnchor = FString(Anchor).TrimChar('#');
+			if ( !CleanedLink.Split( TEXT("#"), &PathAndQueryString, &Anchor ) )
+			{
+				PathAndQueryString = CleanedLink;
+			}
+			else if ( !Anchor.IsEmpty() )
+			{
+				// ensure leading #
+				Anchor = FString( TEXT("#") ) + Anchor;
+			}
+			else if (!InAnchor.IsEmpty())
+			{
+				Anchor = FString(TEXT("#")) + InAnchor;
+			}
+
+			if ( Anchor.EndsWith( TEXT("/"), ESearchCase::CaseSensitive ) )
+			{
+				Anchor.LeftInline( Anchor.Len() - 1 );
+			}
+
+			if ( PathAndQueryString.EndsWith( TEXT("/"), ESearchCase::CaseSensitive ) )
+			{
+				PathAndQueryString.LeftInline(PathAndQueryString.Len() - 1, false);
+			}
+
+			// split path and query string
+			FString InQuery = FString(QueryString).TrimChar('?');
+			if (!PathAndQueryString.Split(TEXT("?"), &Path, &QueryString))
+			{
+				Path = PathAndQueryString;
+			}
+			else if (!QueryString.IsEmpty())
+			{
+				// ensure leading ?
+				QueryString = FString(TEXT("?")) + InQuery + QueryString;
+			}
+		}
+	}
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationPage.cpp b/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationPage.cpp
new file mode 100644
index 0000000..256be0c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationPage.cpp
@@ -0,0 +1,94 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeDocumentation/DocumentationPage.h"
+
+#include "Containers/Set.h"
+
+namespace soda
+{
+
+TSharedRef< IDocumentationPage > FDocumentationPage::Create( const FString& Link/*, const TSharedRef< FUDNParser >& Parser*/)
+{
+	return MakeShareable( new FDocumentationPage( Link/*, Parser*/));
+}
+
+FDocumentationPage::~FDocumentationPage() 
+{
+
+}
+
+bool FDocumentationPage::GetExcerptContent( FExcerpt& Excerpt )
+{
+	for (int32 Index = 0; Index < StoredExcerpts.Num(); ++Index)
+	{
+		if ( Excerpt.Name == StoredExcerpts[ Index ].Name )
+		{
+			//Parser->GetExcerptContent( Link, StoredExcerpts[ Index ] );
+			Excerpt.Content = StoredExcerpts[ Index ].Content;
+			Excerpt.RichText = StoredExcerpts[ Index ].RichText;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool FDocumentationPage::HasExcerpt( const FString& ExcerptName )
+{
+	return false; //StoredMetadata.ExcerptNames.Contains( ExcerptName );
+}
+
+int32 FDocumentationPage::GetNumExcerpts() const
+{
+	return StoredExcerpts.Num();
+}
+
+bool FDocumentationPage::GetExcerpt(const FString& ExcerptName, FExcerpt& Excerpt)
+{
+	for (const FExcerpt& StoredExcerpt : StoredExcerpts)
+	{
+		if (StoredExcerpt.Name == ExcerptName)
+		{
+			Excerpt = StoredExcerpt;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void FDocumentationPage::GetExcerpts( /*OUT*/ TArray< FExcerpt >& Excerpts )
+{
+	Excerpts.Empty();
+	for (int32 i = 0; i < StoredExcerpts.Num(); ++i)
+	{
+		Excerpts.Add(StoredExcerpts[i]);
+	}
+}
+
+FText FDocumentationPage::GetTitle()
+{
+	return FText::FromString(TEXT("TODO: FDocumentationPage::GetTitle()"));//toredMetadata.Title;
+}
+
+void FDocumentationPage::Reload()
+{
+	StoredExcerpts.Empty();
+	//StoredMetadata = FUDNPageMetadata();
+	//Parser->Parse( Link, StoredExcerpts, StoredMetadata );
+}
+
+void FDocumentationPage::SetTextWrapAt( TAttribute<float> WrapAt )
+{
+	//Parser->SetWrapAt( WrapAt );
+}
+
+FDocumentationPage::FDocumentationPage( const FString& InLink/*, const TSharedRef< FUDNParser >& InParser*/)
+	: Link( InLink )
+	//, Parser( InParser )
+{
+	//Parser->Parse( Link, StoredExcerpts, StoredMetadata );
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationPage.h b/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationPage.h
new file mode 100644
index 0000000..943a11b
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/DocumentationPage.h
@@ -0,0 +1,57 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Array.h"
+#include "Containers/UnrealString.h"
+#include "HAL/Platform.h"
+#include "RuntimeDocumentation/IDocumentationPage.h"
+#include "Internationalization/Text.h"
+#include "Misc/Attribute.h"
+#include "Templates/SharedPointer.h"
+//#include "RuntimeDocumentation/UDNParser.h"
+
+namespace soda
+{
+
+class FDocumentationPage : public IDocumentationPage
+{
+public:
+
+	/** Returns an instance of class containing content from the link argument */
+	static TSharedRef< IDocumentationPage > Create( const FString& Link/*, const TSharedRef< FUDNParser >& Parser*/);
+
+public:
+
+	virtual ~FDocumentationPage();
+	virtual bool HasExcerpt( const FString& ExcerptName ) override;
+	virtual int32 GetNumExcerpts() const override;
+	virtual bool GetExcerpt( const FString& ExcerptName, FExcerpt& Excerpt) override;
+	virtual void GetExcerpts( /*OUT*/ TArray< FExcerpt >& Excerpts ) override;
+	virtual bool GetExcerptContent( FExcerpt& Excerpt ) override;
+
+	virtual FText GetTitle() override;
+
+	virtual void Reload() override;
+
+	virtual void SetTextWrapAt( TAttribute<float> WrapAt ) override;
+
+private:
+
+	FDocumentationPage( const FString& InLink/*, const TSharedRef< FUDNParser >& InParser*/);
+
+private:
+
+	/** The string representing the UDN page location */
+	FString Link;
+	/** The UDN parser instance used to create this page */
+	//TSharedRef< FUDNParser > Parser;
+
+	/** The excerpts contained in this UDN page */
+	TArray<FExcerpt> StoredExcerpts;
+	/** The UDN meta data contained in this page */
+	//FUDNPageMetadata StoredMetadata;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationAnchor.cpp b/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationAnchor.cpp
new file mode 100644
index 0000000..3b682d3
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationAnchor.cpp
@@ -0,0 +1,80 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeDocumentation/SDocumentationAnchor.h"
+
+#include "Delegates/Delegate.h"
+#include "HAL/Platform.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "RuntimeDocumentation/IDocumentationPage.h"
+#include "Internationalization/Internationalization.h"
+#include "Internationalization/Text.h"
+#include "Layout/Children.h"
+#include "Layout/Visibility.h"
+#include "Misc/AssertionMacros.h"
+#include "SSimpleButton.h"
+#include "Styling/AppStyle.h"
+#include "Styling/ISlateStyle.h"
+#include "SodaStyleSet.h"
+#include "Widgets/SToolTip.h"
+
+namespace soda
+{
+
+void SDocumentationAnchor::Construct(const FArguments& InArgs )
+{
+	Link = InArgs._Link;
+	BaseUrlId = InArgs._BaseUrlId;
+
+	SetVisibility(TAttribute<EVisibility>::CreateLambda([this]()
+		{
+			return Link.Get(FString()).IsEmpty() ? EVisibility::Collapsed : EVisibility::Visible;
+		}));
+
+	TAttribute<FText> ToolTipText = InArgs._ToolTipText;
+	if (!ToolTipText.IsBound() && ToolTipText.Get().IsEmpty())
+	{
+		ToolTipText = NSLOCTEXT("DocumentationAnchor", "DefaultToolTip", "Click to open documentation");
+	}
+
+	const FString PreviewLink = InArgs._PreviewLink;
+	const FString PreviewExcerptName = InArgs._PreviewExcerptName;
+	if (!PreviewLink.IsEmpty() && !PreviewExcerptName.IsEmpty() && BaseUrlId.Get().IsEmpty())
+	{
+		TSharedRef<IDocumentation> Documentation = IDocumentation::Get();
+		if (Documentation->PageExists(PreviewLink))
+		{
+			TSharedPtr<IDocumentationPage> DocumentationPage = Documentation->GetPage(PreviewLink, NULL);
+
+			FExcerpt Excerpt;
+			if (DocumentationPage->HasExcerpt(PreviewExcerptName))
+			{
+				if (DocumentationPage->GetExcerpt(PreviewExcerptName, Excerpt))
+				{
+					if (FString* BaseUrlValue = Excerpt.Variables.Find(TEXT("BaseUrl")))
+					{
+						BaseUrlId = *BaseUrlValue;
+					}
+				}
+			}
+		}
+
+	}
+
+	ChildSlot
+	[
+		SAssignNew(Button, SSimpleButton)
+		.OnClicked(this, &SDocumentationAnchor::OnClicked)
+		.Icon(FSodaStyle::Get().GetBrush("Icons.Help"))
+		.ToolTip(IDocumentation::Get()->CreateToolTip(ToolTipText, nullptr, PreviewLink, PreviewExcerptName))
+	];
+}
+
+
+FReply SDocumentationAnchor::OnClicked() const
+{
+	IDocumentation::Get()->Open(Link.Get(FString()), FDocumentationSourceInfo(TEXT("doc_anchors")), BaseUrlId.Get(FString()));
+	return FReply::Handled();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationAnchor.h b/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationAnchor.h
new file mode 100644
index 0000000..066de38
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationAnchor.h
@@ -0,0 +1,47 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/UnrealString.h"
+#include "Input/Reply.h"
+#include "Misc/Attribute.h"
+#include "Templates/SharedPointer.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+
+class SButton;
+class SImage;
+
+namespace soda
+{
+
+class SDocumentationAnchor : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SDocumentationAnchor )
+	{}
+		SLATE_ARGUMENT( FString, PreviewLink )
+		SLATE_ARGUMENT( FString, PreviewExcerptName )
+
+		/** The string for the link to follow when clicked  */
+		SLATE_ATTRIBUTE( FString, Link )
+		/** The base URL for the Link, if any is needed  */
+		SLATE_ATTRIBUTE(FString, BaseUrlId)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs);
+
+private:
+	
+	FReply OnClicked() const;
+
+private:
+
+	TAttribute<FString> Link;
+	TAttribute<FString> BaseUrlId;
+	TSharedPtr<SButton> Button;
+	TSharedPtr<SImage> ButtonImage;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationToolTip.cpp b/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationToolTip.cpp
new file mode 100644
index 0000000..7e01fc4
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeDocumentation/SDocumentationToolTip.cpp
@@ -0,0 +1,447 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeDocumentation/SDocumentationToolTip.h"
+#include "Misc/Paths.h"
+#include "HAL/FileManager.h"
+#include "Modules/ModuleManager.h"
+#include "Widgets/SBoxPanel.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/SToolTip.h"
+#include "Styling/AppStyle.h"
+#include "SodaStyleSet.h"
+//#include "Editor/EditorPerProjectUserSettings.h"
+#include "RuntimeDocumentation/IDocumentationPage.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "RuntimeDocumentation/DocumentationLink.h"
+//#include "ISourceCodeAccessor.h"
+//#include "ISourceCodeAccessModule.h"
+//#include "SourceControlHelpers.h"
+#include "EngineAnalytics.h"
+#include "AnalyticsEventAttribute.h"
+#include "Interfaces/IAnalyticsProvider.h"
+#include "Widgets/Input/SHyperlink.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+
+namespace soda
+{
+
+void SDocumentationToolTip::Construct( const FArguments& InArgs )
+{
+	TextContent = InArgs._Text;
+	StyleInfo = FSodaStyle::GetWidgetStyle<FTextBlockStyle>(InArgs._Style);
+	SubduedStyleInfo = FSodaStyle::GetWidgetStyle<FTextBlockStyle>(InArgs._SubduedStyle);
+	HyperlinkTextStyleInfo = FSodaStyle::GetWidgetStyle<FTextBlockStyle>(InArgs._HyperlinkTextStyle);
+	HyperlinkButtonStyleInfo = FSodaStyle::GetWidgetStyle<FButtonStyle>(InArgs._HyperlinkButtonStyle);
+	ColorAndOpacity = InArgs._ColorAndOpacity;
+	DocumentationLink = InArgs._DocumentationLink;
+	IsDisplayingDocumentationLink = false;
+	bAddDocumentation = InArgs._AddDocumentation;
+	DocumentationMargin = InArgs._DocumentationMargin;
+
+	ExcerptName = InArgs._ExcerptName;
+	IsShowingFullTip = false;
+
+	if( InArgs._Content.Widget != SNullWidget::NullWidget )
+	{
+		// Widget content argument takes precedence
+		// overrides the text content.
+		OverrideContent = InArgs._Content.Widget;
+	}
+
+	ConstructSimpleTipContent();
+
+	ChildSlot
+	[
+		SAssignNew(WidgetContent, SBox)
+		[
+			SimpleTipContent.ToSharedRef()
+		]
+	];
+}
+
+void SDocumentationToolTip::ConstructSimpleTipContent()
+{
+	// If there a UDN file that matches the DocumentationLink path, and that page has an excerpt whose name
+	// matches ExcerptName, and that excerpt has a variable named ToolTipOverride, use the content of that
+	// variable instead of the default TextContent.
+	if (!DocumentationLink.IsEmpty() && !ExcerptName.IsEmpty())
+	{
+		TSharedRef<IDocumentation> Documentation = IDocumentation::Get();
+		if (Documentation->PageExists(DocumentationLink))
+		{
+			DocumentationPage = Documentation->GetPage(DocumentationLink, NULL);
+
+			FExcerpt Excerpt;
+			if (DocumentationPage->HasExcerpt(ExcerptName))
+			{
+				if (DocumentationPage->GetExcerpt(ExcerptName, Excerpt))
+				{
+					if (FString* TooltipValue = Excerpt.Variables.Find(TEXT("ToolTipOverride")))
+					{
+						TextContent = FText::FromString(*TooltipValue);
+					}
+				}
+			}
+		}
+	}
+
+	TSharedPtr< SVerticalBox > VerticalBox;
+	if ( !OverrideContent.IsValid() )
+	{
+		SAssignNew( SimpleTipContent, SBox )
+		[
+			SAssignNew( VerticalBox, SVerticalBox )
+			+SVerticalBox::Slot()
+			.FillHeight( 1.0f )
+			[
+				SNew( STextBlock )
+				.Text( TextContent )
+				.TextStyle( &StyleInfo )
+				.ColorAndOpacity( ColorAndOpacity )
+				.WrapTextAt_Static( &SToolTip::GetToolTipWrapWidth )
+			]
+		];
+	}
+	else
+	{
+		SAssignNew( SimpleTipContent, SBox )
+		[
+			SAssignNew( VerticalBox, SVerticalBox )
+			+SVerticalBox::Slot()
+			.FillHeight( 1.0f )
+			[
+				OverrideContent.ToSharedRef()
+			]
+		];
+	}
+
+	if (bAddDocumentation)
+	{
+		AddDocumentation(VerticalBox);
+	}
+}
+
+void SDocumentationToolTip::AddDocumentation(TSharedPtr< SVerticalBox > VerticalBox)
+{
+	if ( !DocumentationLink.IsEmpty() )
+	{
+		//IsDisplayingDocumentationLink = GetDefault<UEditorPerProjectUserSettings>()->bDisplayDocumentationLink;
+
+		if ( /*IsDisplayingDocumentationLink*/ false)
+		{
+			FString OptionalExcerptName;
+			if ( !ExcerptName.IsEmpty() )
+			{ 
+				OptionalExcerptName = FString( TEXT(" [") ) + ExcerptName + TEXT("]");
+			}
+
+			VerticalBox->AddSlot()
+			.AutoHeight()
+			.Padding(0, 5, 0, 0)
+			.HAlign( HAlign_Center )
+			[
+				SNew( STextBlock )
+				.Text( FText::FromString(DocumentationLink + OptionalExcerptName) )
+				.TextStyle( &SubduedStyleInfo )
+			];
+		}
+
+		if ( !DocumentationPage.IsValid() )
+		{
+			DocumentationPage = IDocumentation::Get()->GetPage( DocumentationLink, NULL );
+		}
+
+		if ( DocumentationPage->HasExcerpt( ExcerptName ) )
+		{
+			FText MacShortcut = NSLOCTEXT("SToolTip", "MacRichTooltipShortcut", "(Command + Option)");
+			FText WinShortcut = NSLOCTEXT("SToolTip", "WinRichTooltipShortcut", "(Ctrl + Alt)");
+
+			FText KeyboardShortcut;
+#if PLATFORM_MAC
+			KeyboardShortcut = MacShortcut;
+#else
+			KeyboardShortcut = WinShortcut;
+#endif
+
+			VerticalBox->AddSlot()
+			.AutoHeight()
+			.HAlign( HAlign_Center )
+			.Padding(0, 5, 0, 0)
+			[
+				SNew( STextBlock )
+				.TextStyle( &SubduedStyleInfo )
+				.Text( FText::Format( NSLOCTEXT( "SToolTip", "AdvancedToolTipMessage", "hold {0} for more" ), KeyboardShortcut) )
+			];
+		}
+		else
+		{
+			if ( IsDisplayingDocumentationLink && FSlateApplication::Get().SupportsSourceAccess() )
+			{
+				FString DocPath = FDocumentationLink::ToSourcePath( DocumentationLink, FInternationalization::Get().GetCurrentCulture() );
+				if ( !FPaths::FileExists(DocPath) )
+				{
+					DocPath = FPaths::ConvertRelativePathToFull(DocPath);
+				}
+
+				VerticalBox->AddSlot()
+				.AutoHeight()
+				.Padding(0, 5, 0, 0)
+				.HAlign( HAlign_Center )
+				[
+					SNew( SHyperlink )
+					.Text( NSLOCTEXT( "SToolTip", "EditDocumentationMessage_Create", "create" ) )
+					.TextStyle( &HyperlinkTextStyleInfo )
+					.UnderlineStyle( &HyperlinkButtonStyleInfo )
+					.OnNavigate( this, &SDocumentationToolTip::CreateExcerpt, DocPath, ExcerptName )
+				];
+			}
+		}
+	}
+}
+
+void SDocumentationToolTip::CreateExcerpt( FString FileSource, FString InExcerptName )
+{
+	FText CheckoutFailReason;
+	bool bNewFile = true;
+	bool bCheckoutOrAddSucceeded = true;
+
+	/*
+	if (FPaths::FileExists(FileSource))
+	{
+		// Check out the existing file
+		bNewFile = false;
+		bCheckoutOrAddSucceeded = SourceControlHelpers::CheckoutOrMarkForAdd(FileSource, NSLOCTEXT("SToolTip", "DocumentationSCCActionDesc", "tool tip excerpt"), FOnPostCheckOut(), CheckoutFailReason);
+	}
+*/
+
+	FArchive* FileWriter = IFileManager::Get().CreateFileWriter( *FileSource, EFileWrite::FILEWRITE_Append | EFileWrite::FILEWRITE_AllowRead | EFileWrite::FILEWRITE_EvenIfReadOnly );
+
+	if (bNewFile)
+	{
+		FString UdnHeader;
+		UdnHeader += "Availability:NoPublish";
+		UdnHeader += LINE_TERMINATOR;
+		UdnHeader += "Title:";
+		UdnHeader += LINE_TERMINATOR;
+		UdnHeader += "Crumbs:";
+		UdnHeader += LINE_TERMINATOR;
+		UdnHeader += "Description:";
+		UdnHeader += LINE_TERMINATOR;
+
+		FileWriter->Serialize( TCHAR_TO_ANSI( *UdnHeader ), UdnHeader.Len() );
+	}
+
+	FString NewExcerpt;
+	NewExcerpt += LINE_TERMINATOR;
+	NewExcerpt += "[EXCERPT:";
+	NewExcerpt += InExcerptName;
+	NewExcerpt += "]";
+	NewExcerpt += LINE_TERMINATOR;
+
+	NewExcerpt += TextContent.Get().ToString();
+	NewExcerpt += LINE_TERMINATOR;
+
+	NewExcerpt += "[/EXCERPT:";
+	NewExcerpt += InExcerptName;
+	NewExcerpt += "]";
+	NewExcerpt += LINE_TERMINATOR;
+
+	if (!bNewFile)
+	{
+		FileWriter->Seek( FMath::Max( FileWriter->TotalSize(), (int64)0 ) );
+	}
+
+	FileWriter->Serialize( TCHAR_TO_ANSI( *NewExcerpt ), NewExcerpt.Len() );
+
+	FileWriter->Close();
+	delete FileWriter;
+
+	/*
+	if (bNewFile)
+	{
+		// Add the new file
+		bCheckoutOrAddSucceeded = SourceControlHelpers::CheckoutOrMarkForAdd(FileSource, NSLOCTEXT("SToolTip", "DocumentationSCCActionDesc", "tool tip excerpt"), FOnPostCheckOut(), CheckoutFailReason);
+	}
+	*/
+
+	//ISourceCodeAccessModule& SourceCodeAccessModule = FModuleManager::LoadModuleChecked<ISourceCodeAccessModule>("SourceCodeAccess");
+	//SourceCodeAccessModule.GetAccessor().OpenFileAtLine(FileSource, 0);
+
+	if (!bCheckoutOrAddSucceeded)
+	{
+		FNotificationInfo Info(CheckoutFailReason);
+		Info.ExpireDuration = 3.0f;
+		FSlateNotificationManager::Get().AddNotification(Info);
+	}
+
+	ReloadDocumentation();
+}
+
+void SDocumentationToolTip::ConstructFullTipContent()
+{
+	TArray< FExcerpt > Excerpts;
+	DocumentationPage->GetExcerpts( Excerpts );
+
+	if ( Excerpts.Num() > 0 )
+	{
+		int32 ExcerptIndex = 0;
+		if ( !ExcerptName.IsEmpty() )
+		{
+			for (int Index = 0; Index < Excerpts.Num(); Index++)
+			{
+				if ( Excerpts[ Index ].Name == ExcerptName )
+				{
+					ExcerptIndex = Index;
+					break;
+				}
+			}
+		}
+
+		if ( !Excerpts[ ExcerptIndex ].Content.IsValid() )
+		{
+			DocumentationPage->GetExcerptContent( Excerpts[ ExcerptIndex ] );
+		}
+
+		if ( Excerpts[ ExcerptIndex ].Content.IsValid() )
+		{
+			TSharedPtr< SVerticalBox > Box;
+			FullTipContent = 
+				SNew(SBox)
+				.Padding(DocumentationMargin)
+				[
+					SAssignNew(Box, SVerticalBox)
+					+ SVerticalBox::Slot()
+					.HAlign(HAlign_Center)
+					.AutoHeight()
+					[
+						Excerpts[ExcerptIndex].Content.ToSharedRef()
+					]
+				];
+
+			FString* FullDocumentationLink = Excerpts[ ExcerptIndex ].Variables.Find( TEXT("ToolTipFullLink") );
+			FString* ExcerptBaseUrl = Excerpts[ExcerptIndex].Variables.Find(TEXT("BaseUrl"));
+			if ( FullDocumentationLink != NULL && !FullDocumentationLink->IsEmpty() )
+			{
+				FString BaseUrl = FString();
+				if (ExcerptBaseUrl != NULL)
+				{
+					BaseUrl = *ExcerptBaseUrl;
+				}
+
+				Box->AddSlot()
+				.HAlign( HAlign_Center )
+				.AutoHeight()
+				[
+					SNew( SHyperlink )
+						.Text( NSLOCTEXT( "SToolTip", "GoToFullDocsLinkMessage", "see full documentation" ) )
+						.TextStyle( &HyperlinkTextStyleInfo )
+						.UnderlineStyle( &HyperlinkButtonStyleInfo )
+						.OnNavigate_Static([](FString Link, FString BaseUrl) {
+								if (!IDocumentation::Get()->Open(Link, FDocumentationSourceInfo(TEXT("rich_tooltips")), BaseUrl))
+								{
+									FNotificationInfo Info(NSLOCTEXT("SToolTip", "FailedToOpenLink", "Failed to Open Link"));
+									FSlateNotificationManager::Get().AddNotification(Info);
+								}
+							}, *FullDocumentationLink, BaseUrl)
+				];
+			}
+
+			/*
+			if ( GetDefault<UEditorPerProjectUserSettings>()->bDisplayDocumentationLink && FSlateApplication::Get().SupportsSourceAccess() )
+			{
+				Box->AddSlot()
+				.AutoHeight()
+				.HAlign( HAlign_Center )
+				[
+					SNew( SHyperlink )
+						.Text( NSLOCTEXT( "SToolTip", "EditDocumentationMessage_Edit", "edit" ) )
+						.TextStyle( &HyperlinkTextStyleInfo )
+						.UnderlineStyle( &HyperlinkButtonStyleInfo )
+						// todo: needs to update to point to the "real" source file used for the excerpt
+						.OnNavigate_Static([](FString Link, int32 LineNumber) {
+								ISourceCodeAccessModule& SourceCodeAccessModule = FModuleManager::LoadModuleChecked<ISourceCodeAccessModule>("SourceCodeAccess");
+								SourceCodeAccessModule.GetAccessor().OpenFileAtLine(Link, LineNumber);
+							}, FPaths::ConvertRelativePathToFull(FDocumentationLink::ToSourcePath(DocumentationLink, FInternationalization::Get().GetCurrentCulture())), Excerpts[ExcerptIndex].LineNumber)
+				];
+			}
+			*/
+		}
+	}
+}
+
+FReply SDocumentationToolTip::ReloadDocumentation()
+{
+	SimpleTipContent.Reset();
+	FullTipContent.Reset();
+
+	ConstructSimpleTipContent();
+
+	if ( DocumentationPage.IsValid() )
+	{
+		DocumentationPage->Reload();
+
+		if ( DocumentationPage->HasExcerpt( ExcerptName ) )
+		{
+			ConstructFullTipContent();
+		}
+	}
+
+	return FReply::Handled();
+}
+
+void SDocumentationToolTip::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	const FModifierKeysState ModifierKeys = FSlateApplication::Get().GetModifierKeys();
+	const bool NeedsUpdate = false; //IsDisplayingDocumentationLink != GetDefault<UEditorPerProjectUserSettings>()->bDisplayDocumentationLink;
+
+	if ( !IsShowingFullTip && ModifierKeys.IsAltDown() && ModifierKeys.IsControlDown() )
+	{
+		if ( !FullTipContent.IsValid() && DocumentationPage.IsValid() && DocumentationPage->HasExcerpt( ExcerptName ) )
+		{
+			ConstructFullTipContent();
+		}
+		else if ( /*GetDefault<UEditorPerProjectUserSettings>()->bDisplayDocumentationLink*/ false)
+		{
+			ReloadDocumentation();
+		}
+
+		if ( FullTipContent.IsValid() )
+		{
+			WidgetContent->SetContent( FullTipContent.ToSharedRef() );
+			IsShowingFullTip = true;
+
+			// Analytics event
+			if (FEngineAnalytics::IsAvailable())
+			{
+				TArray<FAnalyticsEventAttribute> Params;
+				Params.Add(FAnalyticsEventAttribute(TEXT("Page"), DocumentationLink));
+				Params.Add(FAnalyticsEventAttribute(TEXT("Excerpt"), ExcerptName));
+
+				FEngineAnalytics::GetProvider().RecordEvent(TEXT("Editor.Usage.Documentation.FullTooltipShown"), Params);
+			}
+		}
+	}
+	else if ( ( IsShowingFullTip || NeedsUpdate )  && ( !ModifierKeys.IsAltDown() || !ModifierKeys.IsControlDown() ) )
+	{
+		if ( NeedsUpdate )
+		{
+			ReloadDocumentation();
+			//IsDisplayingDocumentationLink = GetDefault<UEditorPerProjectUserSettings>()->bDisplayDocumentationLink;
+		}
+
+		WidgetContent->SetContent( SimpleTipContent.ToSharedRef() );
+		IsShowingFullTip = false;
+	}
+}
+
+bool SDocumentationToolTip::IsInteractive() const
+{
+	const FModifierKeysState ModifierKeys = FSlateApplication::Get().GetModifierKeys();
+	return ( DocumentationPage.IsValid() && ModifierKeys.IsAltDown() && ModifierKeys.IsControlDown() );
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimeEditorModule.cpp b/Source/RuntimeEditor/Private/RuntimeEditorModule.cpp
new file mode 100644
index 0000000..531eac2
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeEditorModule.cpp
@@ -0,0 +1,932 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeEditorModule.h"
+#include "UObject/UnrealType.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Modules/ModuleManager.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Engine/UserDefinedEnum.h"
+#include "Engine/UserDefinedStruct.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/SSingleProperty.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "RuntimePropertyEditor/SDetailsView.h"
+#include "RuntimePropertyEditor/IPropertyTableWidgetHandle.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+//#include "UserInterface/PropertyTable/SPropertyTable.h"
+//#include "UserInterface/PropertyTable/PropertyTableWidgetHandle.h"
+//#include "IAssetTools.h"
+//#include "AssetToolsModule.h"
+//#include "SPropertyTreeViewImpl.h"
+//#include "Interfaces/IMainFrameModule.h"
+#include "RuntimePropertyEditor/IPropertyChangeListener.h"
+//#include "PropertyChangeListener.h"
+//#include "Toolkits/AssetEditorToolkit.h"
+//#include "PropertyEditorToolkit.h"
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.h"
+#include "RuntimePropertyEditor/IPropertyTableCellPresenter.h"
+//#include "UserInterface/PropertyTable/TextPropertyTableCellPresenter.h"
+
+#include "RuntimePropertyEditor/SStructureDetailsView.h"
+//#include "Widgets/Colors/SColorPicker.h"
+#include "RuntimePropertyEditor/PropertyRowGenerator.h"
+
+#include "RuntimeMetaData.h"
+
+#include "SodaDetailCustomizations/ActorDetails.h"
+#include "SodaDetailCustomizations/ActorComponentDetails.h"
+#include "SodaDetailCustomizations/SceneComponentDetails.h"
+#include "SodaDetailCustomizations/KeyStructCustomization.h"
+#include "SodaDetailCustomizations/ComponentReferenceCustomization.h"
+#include "SodaDetailCustomizations/ObjectDetails.h"
+#include "SodaDetailCustomizations/SoftObjectPathCustomization.h"
+
+
+// For Documentation
+#include "Containers/UnrealString.h"
+#include "Delegates/Delegate.h"
+#include "RuntimeDocumentation/Documentation.h"
+#include "Framework/Commands/UICommandInfo.h"
+#include "Framework/MultiBox/MultiBoxDefs.h"
+#include "HAL/Platform.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "Internationalization/Text.h"
+#include "Misc/Attribute.h"
+#include "Modules/ModuleManager.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/NameTypes.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SNullWidget.h"
+#include "Widgets/SToolTip.h"
+
+//For ClassViewer
+#include "RuntimeClassViewer/SClassViewer.h"
+
+namespace soda
+{
+
+TSharedRef<IPropertyTypeCustomization> FPropertyTypeLayoutCallback::GetCustomizationInstance() const
+{
+	return PropertyTypeLayoutDelegate.Execute();
+}
+
+void FPropertyTypeLayoutCallbackList::Add( const FPropertyTypeLayoutCallback& NewCallback )
+{
+	if( !NewCallback.PropertyTypeIdentifier.IsValid() )
+	{
+		BaseCallback = NewCallback;
+	}
+	else
+	{
+		IdentifierList.Add( NewCallback );
+	}
+}
+
+void FPropertyTypeLayoutCallbackList::Remove( const TSharedPtr<IPropertyTypeIdentifier>& InIdentifier )
+{
+	if( !InIdentifier.IsValid() )
+	{
+		BaseCallback = FPropertyTypeLayoutCallback();
+	}
+	else
+	{
+		IdentifierList.RemoveAllSwap( [&InIdentifier]( FPropertyTypeLayoutCallback& Callback) { return Callback.PropertyTypeIdentifier == InIdentifier; } );
+	}
+}
+
+const FPropertyTypeLayoutCallback& FPropertyTypeLayoutCallbackList::Find( const IPropertyHandle& PropertyHandle ) const 
+{
+	if( IdentifierList.Num() > 0 )
+	{
+		const FPropertyTypeLayoutCallback* Callback =
+			IdentifierList.FindByPredicate
+			(
+				[&]( const FPropertyTypeLayoutCallback& InCallback )
+				{
+					return InCallback.PropertyTypeIdentifier->IsPropertyTypeCustomized( PropertyHandle );
+				}
+			);
+
+		if( Callback )
+		{
+			return *Callback;
+		}
+	}
+
+	return BaseCallback;
+}
+
+}
+
+bool FRuntimeEditorModule::IsCustomizedStruct(const UStruct* Struct, const soda::FCustomPropertyTypeLayoutMap& InstancePropertyTypeLayoutMap) const
+{
+	bool bFound = false;
+	if (Struct && !Struct->IsA<UUserDefinedStruct>())
+	{
+		bFound = InstancePropertyTypeLayoutMap.Contains(Struct->GetFName());
+		if (!bFound)
+		{
+			bFound = GlobalPropertyTypeToLayoutMap.Contains(Struct->GetFName());
+		}
+	}
+
+	return bFound;
+}
+
+
+soda::FPropertyTypeLayoutCallback FRuntimeEditorModule::GetPropertyTypeCustomization(const FProperty* Property, const soda::IPropertyHandle& PropertyHandle, const soda::FCustomPropertyTypeLayoutMap& InstancedPropertyTypeLayoutMap)
+{
+	if( Property )
+	{
+		const FStructProperty* StructProperty = CastField<FStructProperty>(Property);
+		bool bStructProperty = StructProperty && StructProperty->Struct;
+		const bool bUserDefinedStruct = bStructProperty && StructProperty->Struct->IsA<UUserDefinedStruct>();
+		bStructProperty &= !bUserDefinedStruct;
+
+		const UEnum* Enum = nullptr;
+
+		if (const FByteProperty* ByteProperty = CastField<FByteProperty>(Property))
+		{
+			Enum = ByteProperty->Enum;
+		}
+		else if (const FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property))
+		{
+			Enum = EnumProperty->GetEnum();
+		}
+
+		if (Enum && Enum->IsA<UUserDefinedEnum>())
+		{
+			Enum = nullptr;
+		}
+
+		const FObjectProperty* ObjectProperty = CastField<FObjectProperty>(Property);
+		const bool bObjectProperty = ObjectProperty != NULL && ObjectProperty->PropertyClass != NULL;
+
+		FName PropertyTypeName;
+		if( bStructProperty )
+		{
+			PropertyTypeName = StructProperty->Struct->GetFName();
+		}
+		else if( Enum )
+		{
+			PropertyTypeName = Enum->GetFName();
+		}
+		else if ( bObjectProperty )
+		{
+			UClass* PropertyClass = ObjectProperty->PropertyClass;
+			while (PropertyClass)
+			{
+				const soda::FPropertyTypeLayoutCallback& Callback = FindPropertyTypeLayoutCallback(PropertyClass->GetFName(), PropertyHandle, InstancedPropertyTypeLayoutMap);
+				if (Callback.IsValid())
+				{
+					return Callback;
+				}
+
+				PropertyClass = PropertyClass->GetSuperClass();
+			}
+		}
+		else
+		{
+			PropertyTypeName = Property->GetClass()->GetFName();
+		}
+
+		return FindPropertyTypeLayoutCallback(PropertyTypeName, PropertyHandle, InstancedPropertyTypeLayoutMap);
+	}
+
+	return soda::FPropertyTypeLayoutCallback();
+}
+
+soda::FPropertyTypeLayoutCallback FRuntimeEditorModule::FindPropertyTypeLayoutCallback(FName PropertyTypeName, const soda::IPropertyHandle& PropertyHandle, const soda::FCustomPropertyTypeLayoutMap& InstancedPropertyTypeLayoutMap)
+{
+	if (PropertyTypeName != NAME_None)
+	{
+		const soda::FPropertyTypeLayoutCallbackList* LayoutCallbacks = InstancedPropertyTypeLayoutMap.Find(PropertyTypeName);
+
+		if (!LayoutCallbacks)
+		{
+			LayoutCallbacks = GlobalPropertyTypeToLayoutMap.Find(PropertyTypeName);
+		}
+
+		if (LayoutCallbacks)
+		{
+			const soda::FPropertyTypeLayoutCallback& Callback = LayoutCallbacks->Find(PropertyHandle);
+			return Callback;
+		}
+	}
+
+	return soda::FPropertyTypeLayoutCallback();
+}
+
+
+/*
+TSharedRef< FAssetEditorToolkit > FRuntimeEditorModule::CreatePropertyEditorToolkit(const EToolkitMode::Type Mode, const TSharedPtr< class IToolkitHost >& InitToolkitHost, UObject* ObjectToEdit)
+{
+	return FPropertyEditorToolkit::CreateEditor(Mode, InitToolkitHost, ObjectToEdit);
+}
+
+
+TSharedRef< FAssetEditorToolkit > FRuntimeEditorModule::CreatePropertyEditorToolkit(const EToolkitMode::Type Mode, const TSharedPtr< IToolkitHost >& InitToolkitHost, const TArray< UObject* >& ObjectsToEdit)
+{
+	return FPropertyEditorToolkit::CreateEditor(Mode, InitToolkitHost, ObjectsToEdit);
+}
+
+TSharedRef< FAssetEditorToolkit > FRuntimeEditorModule::CreatePropertyEditorToolkit(const EToolkitMode::Type Mode, const TSharedPtr< IToolkitHost >& InitToolkitHost, const TArray< TWeakObjectPtr< UObject > >& ObjectsToEdit)
+{
+	TArray< UObject* > RawObjectsToEdit;
+	for (auto ObjectIter = ObjectsToEdit.CreateConstIterator(); ObjectIter; ++ObjectIter)
+	{
+		RawObjectsToEdit.Add(ObjectIter->Get());
+	}
+
+	return FPropertyEditorToolkit::CreateEditor(Mode, InitToolkitHost, RawObjectsToEdit);
+}
+*/
+
+/*
+TSharedRef<soda::FSlateStyleSet> FRuntimeEditorModule::CreateSodaStyleInstance() const
+{
+	return FSlateSodaStyle::Create(FSlateSodaStyle::Settings);
+}
+*/
+
+void FRuntimeEditorModule::StartupModule()
+{
+	//StructOnScopePropertyOwner = nullptr;
+
+	RegisterObjectCustomizations();
+	RegisterPropertyTypeCustomizations();
+
+	Documentation = soda::FDocumentation::Create();
+	FMultiBoxSettings::ToolTipConstructor = FMultiBoxSettings::FConstructToolTip::CreateLambda([this](const TAttribute<FText>& ToolTipText, const TSharedPtr<SWidget>& OverrideContent, const TSharedPtr<const FUICommandInfo>& Action) 
+	{
+		if ( Action.IsValid() )
+		{
+			return Documentation->CreateToolTip( ToolTipText, OverrideContent, FString( TEXT("Shared/") ) + Action->GetBindingContext().ToString(), Action->GetCommandName().ToString() );
+		}
+
+		TSharedPtr< SWidget > ToolTipContent;
+        if ( OverrideContent.IsValid() )
+        {
+            ToolTipContent = OverrideContent;
+        }
+        else
+        {
+            ToolTipContent = SNullWidget::NullWidget;
+        }
+        
+		return SNew( SToolTip )
+			   .Text( ToolTipText )
+			   [
+					ToolTipContent.ToSharedRef()
+			   ];
+	});
+}
+
+void FRuntimeEditorModule::ShutdownModule()
+{
+	// No need to remove this object from root since the final GC pass doesn't care about root flags
+	//StructOnScopePropertyOwner = nullptr;
+
+	// NOTE: It's vital that we clean up everything created by this DLL here!  We need to make sure there
+	//       are no outstanding references to objects as the compiled code for this module's class will
+	//       literally be unloaded from memory after this function exits.  This even includes instantiated
+	//       templates, such as delegate wrapper objects that are allocated by the module!
+	//DestroyColorPicker();
+
+	AllDetailViews.Empty();
+	AllSinglePropertyViews.Empty();
+
+	soda::SClassViewer::DestroyClassHierarchy();
+}
+
+TSharedRef<SWindow> FRuntimeEditorModule::CreateFloatingDetailsView(const TArray< UObject* >& InObjects, bool bIsLockable)
+{
+
+	TSharedRef<SWindow> NewSlateWindow = SNew(SWindow)
+		.Title(NSLOCTEXT("PropertyEditor", "WindowTitle", "Property Editor"))
+		.ClientSize(FVector2D(400, 550));
+
+	// If the main frame exists parent the window to it
+	TSharedPtr< SWindow > ParentWindow;
+
+	/*
+	if (FModuleManager::Get().IsModuleLoaded("MainFrame"))
+	{
+		IMainFrameModule& MainFrame = FModuleManager::GetModuleChecked<IMainFrameModule>("MainFrame");
+		ParentWindow = MainFrame.GetParentWindow();
+	}
+	*/
+
+	if (ParentWindow.IsValid())
+	{
+		// Parent the window to the main frame 
+		FSlateApplication::Get().AddWindowAsNativeChild(NewSlateWindow, ParentWindow.ToSharedRef());
+	}
+	else
+	{
+		FSlateApplication::Get().AddWindow(NewSlateWindow);
+	}
+
+	soda::FDetailsViewArgs Args;
+	Args.bHideSelectionTip = true;
+	Args.bLockable = bIsLockable;
+
+	TSharedRef<soda::IDetailsView> DetailView = CreateDetailView(Args);
+
+	bool bHaveTemplate = false;
+	for (int32 i = 0; i < InObjects.Num(); i++)
+	{
+		if (InObjects[i] != NULL && InObjects[i]->IsTemplate())
+		{
+			bHaveTemplate = true;
+			break;
+		}
+	}
+
+	//DetailView->SetIsPropertyVisibleDelegate(FIsPropertyVisible::CreateStatic(&ShouldShowProperty, bHaveTemplate));
+
+	DetailView->SetObjects(InObjects);
+
+	NewSlateWindow->SetContent(
+		SNew(SBorder)
+		.BorderImage(FSodaStyle::GetBrush(TEXT("PropertyWindow.WindowBorder")))
+		[
+			DetailView
+		]
+	);
+
+	return NewSlateWindow;
+}
+
+
+
+void FRuntimeEditorModule::NotifyCustomizationModuleChanged()
+{
+	if (FSlateApplication::IsInitialized())
+	{
+		// The module was changed (loaded or unloaded), force a refresh.  Note it is assumed the module unregisters all customization delegates before this
+		for (int32 ViewIndex = 0; ViewIndex < AllDetailViews.Num(); ++ViewIndex)
+		{
+			if (AllDetailViews[ViewIndex].IsValid())
+			{
+				TSharedPtr<soda::SDetailsView> DetailViewPin = AllDetailViews[ViewIndex].Pin();
+
+				DetailViewPin->ForceRefresh();
+			}
+		}
+	}
+}
+
+
+/*
+static bool ShouldShowProperty(const FPropertyAndParent& PropertyAndParent, bool bHaveTemplate)
+{
+	const FProperty& Property = PropertyAndParent.Property;
+
+	if ( bHaveTemplate )
+	{
+		const UClass* PropertyOwnerClass = Property.GetOwner<const UClass>();
+		const bool bDisableEditOnTemplate = PropertyOwnerClass 
+			&& PropertyOwnerClass->IsNative()
+			&& Property.HasAnyPropertyFlags(CPF_DisableEditOnTemplate);
+		if(bDisableEditOnTemplate)
+		{
+			return false;
+		}
+	}
+	return true;
+}
+*/
+
+/*
+TSharedRef<SPropertyTreeViewImpl> FRuntimeEditorModule::CreatePropertyView( 
+	UObject* InObject,
+	bool bAllowFavorites, 
+	bool bIsLockable, 
+	bool bHiddenPropertyVisibility, 
+	bool bAllowSearch, 
+	bool ShowTopLevelNodes,
+	FNotifyHook* InNotifyHook, 
+	float InNameColumnWidth,
+	FOnPropertySelectionChanged OnPropertySelectionChanged,
+	FOnPropertyClicked OnPropertyMiddleClicked,
+	FConstructExternalColumnHeaders ConstructExternalColumnHeaders,
+	FConstructExternalColumnCell ConstructExternalColumnCell)
+{
+	TSharedRef<SPropertyTreeViewImpl> PropertyView = 
+		SNew( SPropertyTreeViewImpl )
+		.IsLockable( bIsLockable )
+		.AllowFavorites( bAllowFavorites )
+		.HiddenPropertyVis( bHiddenPropertyVisibility )
+		.NotifyHook( InNotifyHook )
+		.AllowSearch( bAllowSearch )
+		.ShowTopLevelNodes( ShowTopLevelNodes )
+		.NameColumnWidth( InNameColumnWidth )
+		.OnPropertySelectionChanged( OnPropertySelectionChanged )
+		.OnPropertyMiddleClicked( OnPropertyMiddleClicked )
+		.ConstructExternalColumnHeaders( ConstructExternalColumnHeaders )
+		.ConstructExternalColumnCell( ConstructExternalColumnCell );
+
+	if( InObject )
+	{
+		TArray<UObject*> Objects;
+		Objects.Add( InObject );
+		PropertyView->SetObjectArray( Objects );
+	}
+
+	return PropertyView;
+}
+*/
+
+/*
+TSharedPtr<FAssetThumbnailPool> FRuntimeEditorModule::GetThumbnailPool()
+{
+	if (!GlobalThumbnailPool.IsValid())
+	{
+		// Create a thumbnail pool for the view if it doesn't exist.  This does not use resources of no thumbnails are used
+		GlobalThumbnailPool = MakeShareable(new FAssetThumbnailPool(50, true));
+	}
+
+	return GlobalThumbnailPool;
+}
+*/
+
+TSharedRef<soda::IDetailsView> FRuntimeEditorModule::CreateDetailView( const soda::FDetailsViewArgs& DetailsViewArgs )
+{
+	// Compact the list of detail view instances
+	for( int32 ViewIndex = 0; ViewIndex < AllDetailViews.Num(); ++ViewIndex )
+	{
+		if ( !AllDetailViews[ViewIndex].IsValid() )
+		{
+			AllDetailViews.RemoveAtSwap( ViewIndex );
+			--ViewIndex;
+		}
+	}
+
+	TSharedRef<soda::SDetailsView> DetailView = SNew(soda::SDetailsView, DetailsViewArgs);
+
+	AllDetailViews.Add( DetailView );
+
+	//PropertyEditorOpened.Broadcast();
+	return DetailView;
+}
+
+/*
+TSharedPtr<IDetailsView> FRuntimeEditorModule::FindDetailView( const FName ViewIdentifier ) const
+{
+	if(ViewIdentifier.IsNone())
+	{
+		return nullptr;
+	}
+
+	for(auto It = AllDetailViews.CreateConstIterator(); It; ++It)
+	{
+		TSharedPtr<SDetailsView> DetailsView = It->Pin();
+		if(DetailsView.IsValid() && DetailsView->GetIdentifier() == ViewIdentifier)
+		{
+			return DetailsView;
+		}
+	}
+
+	return nullptr;
+}
+*/
+
+
+TSharedPtr<soda::ISinglePropertyView> FRuntimeEditorModule::CreateSingleProperty( UObject* InObject, FName InPropertyName, const soda::FSinglePropertyParams& InitParams )
+{
+	// Compact the list of detail view instances
+	for( int32 ViewIndex = 0; ViewIndex < AllSinglePropertyViews.Num(); ++ViewIndex )
+	{
+		if ( !AllSinglePropertyViews[ViewIndex].IsValid() )
+		{
+			AllSinglePropertyViews.RemoveAtSwap( ViewIndex );
+			--ViewIndex;
+		}
+	}
+
+	TSharedRef<soda::SSingleProperty> Property =
+		SNew(soda::SSingleProperty )
+		.Object( InObject )
+		.PropertyName( InPropertyName )
+		.NamePlacement( InitParams.NamePlacement )
+		.NameOverride( InitParams.NameOverride )
+		.NotifyHook( InitParams.NotifyHook )
+		.PropertyFont( InitParams.Font );
+
+	if( Property->HasValidProperty() )
+	{
+		AllSinglePropertyViews.Add( Property );
+
+		return Property;
+	}
+
+	return NULL;
+}
+
+
+/*
+TSharedRef< IPropertyTable > FRuntimeEditorModule::CreatePropertyTable()
+{
+	return MakeShareable( new FPropertyTable() );
+}
+*/
+
+/*
+TSharedRef< SWidget > FRuntimeEditorModule::CreatePropertyTableWidget( const TSharedRef< class IPropertyTable >& PropertyTable )
+{
+	return SNew( SPropertyTable, PropertyTable );
+}
+*/
+
+/*
+TSharedRef< SWidget > FRuntimeEditorModule::CreatePropertyTableWidget( const TSharedRef< IPropertyTable >& PropertyTable, const TArray< TSharedRef< class IPropertyTableCustomColumn > >& Customizations )
+{
+	return SNew( SPropertyTable, PropertyTable )
+		.ColumnCustomizations( Customizations );
+}
+*/
+
+/*
+TSharedRef< IPropertyTableWidgetHandle > FRuntimeEditorModule::CreatePropertyTableWidgetHandle( const TSharedRef< IPropertyTable >& PropertyTable )
+{
+	TSharedRef< FPropertyTableWidgetHandle > FWidgetHandle = MakeShareable( new FPropertyTableWidgetHandle( SNew( SPropertyTable, PropertyTable ) ) );
+
+	TSharedRef< IPropertyTableWidgetHandle > IWidgetHandle = StaticCastSharedRef<IPropertyTableWidgetHandle>(FWidgetHandle);
+
+	 return IWidgetHandle;
+}
+*/
+
+/*
+TSharedRef< IPropertyTableWidgetHandle > FRuntimeEditorModule::CreatePropertyTableWidgetHandle( const TSharedRef< IPropertyTable >& PropertyTable, const TArray< TSharedRef< class IPropertyTableCustomColumn > >& Customizations )
+{
+	TSharedRef< FPropertyTableWidgetHandle > FWidgetHandle = MakeShareable( new FPropertyTableWidgetHandle( SNew( SPropertyTable, PropertyTable )
+		.ColumnCustomizations( Customizations )));
+
+	TSharedRef< IPropertyTableWidgetHandle > IWidgetHandle = StaticCastSharedRef<IPropertyTableWidgetHandle>(FWidgetHandle);
+
+	 return IWidgetHandle;
+}
+*/
+
+/*
+TSharedRef< IPropertyTableCellPresenter > FRuntimeEditorModule::CreateTextPropertyCellPresenter(const TSharedRef< class FPropertyNode >& InPropertyNode, const TSharedRef< class IPropertyTableUtilities >& InPropertyUtilities, 
+																								 const FSlateFontInfo* InFontPtr)
+{
+	FSlateFontInfo InFont;
+
+	if (InFontPtr == NULL)
+	{
+		// Encapsulating reference to Private file PropertyTableConstants.h
+		InFont = FSodaStyle::GetFontStyle( PropertyTableConstants::NormalFontStyle );
+	}
+	else
+	{
+		InFont = *InFontPtr;
+	}
+
+	TSharedRef< FPropertyEditor > PropertyEditor = FPropertyEditor::Create( InPropertyNode, InPropertyUtilities );
+	return MakeShareable( new FTextPropertyTableCellPresenter( PropertyEditor, InPropertyUtilities, InFont) );
+}
+*/
+
+
+FStructProperty* FRuntimeEditorModule::RegisterStructOnScopeProperty(TSharedRef<FStructOnScope> StructOnScope)
+{
+	const FName StructName = StructOnScope->GetStruct()->GetFName();
+	FStructProperty* StructProperty = RegisteredStructToProxyMap.FindRef(StructName);
+
+	if (!StructProperty)
+	{
+		if (!StructOnScopePropertyOwner)
+		{
+			// Create a container for all StructOnScope property objects.
+			// It's important that this container is the owner of these properties and maintains a linked list 
+			// to all of the properties created here. This is automatically handled by the specialized property constructor.
+			StructOnScopePropertyOwner = NewObject<UStruct>(GetTransientPackage(), TEXT("StructOnScope"), RF_Transient);
+			StructOnScopePropertyOwner->AddToRoot();
+		}
+		UScriptStruct* InnerStruct = Cast<UScriptStruct>(const_cast<UStruct*>(StructOnScope->GetStruct()));
+		StructProperty = new FStructProperty(StructOnScopePropertyOwner, *MakeUniqueObjectName(StructOnScopePropertyOwner, UField::StaticClass(), InnerStruct->GetFName()).ToString(), RF_Transient);
+		StructProperty->Struct = InnerStruct;
+		StructProperty->ElementSize = StructOnScope->GetStruct()->GetStructureSize();
+		StructOnScopePropertyOwner->AddCppProperty(StructProperty);
+
+		RegisteredStructToProxyMap.Add(StructName, StructProperty);
+	}
+
+	return StructProperty;
+}
+
+/*
+TSharedRef<IPropertyChangeListener> FRuntimeEditorModule::CreatePropertyChangeListener()
+{
+	return MakeShareable( new FPropertyChangeListener );
+}
+*/
+
+void FRuntimeEditorModule::RegisterCustomClassLayout( FName ClassName, soda::FOnGetDetailCustomizationInstance DetailLayoutDelegate )
+{
+	if (ClassName != NAME_None)
+	{
+		soda::FDetailLayoutCallback Callback;
+		Callback.DetailLayoutDelegate = DetailLayoutDelegate;
+		// @todo: DetailsView: Fix me: this specifies the order in which detail layouts should be queried
+		Callback.Order = ClassNameToDetailLayoutNameMap.Num();
+
+		ClassNameToDetailLayoutNameMap.Add(ClassName, Callback);
+	}
+}
+
+void FRuntimeEditorModule::UnregisterCustomClassLayout( FName ClassName )
+{
+	if (ClassName.IsValid() && (ClassName != NAME_None))
+	{
+		ClassNameToDetailLayoutNameMap.Remove(ClassName);
+	}
+}
+
+void FRuntimeEditorModule::RegisterCustomPropertyTypeLayout(FName PropertyTypeName, soda::FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<soda::IPropertyTypeIdentifier> Identifier)
+{
+	if (PropertyTypeName != NAME_None)
+	{
+		soda::FPropertyTypeLayoutCallback Callback;
+		Callback.PropertyTypeLayoutDelegate = PropertyTypeLayoutDelegate;
+		Callback.PropertyTypeIdentifier = Identifier;
+
+		soda::FPropertyTypeLayoutCallbackList* LayoutCallbacks = GlobalPropertyTypeToLayoutMap.Find(PropertyTypeName);
+		if (LayoutCallbacks)
+		{
+			LayoutCallbacks->Add(Callback);
+		}
+		else
+		{
+			soda::FPropertyTypeLayoutCallbackList NewLayoutCallbacks;
+			NewLayoutCallbacks.Add(Callback);
+			GlobalPropertyTypeToLayoutMap.Add(PropertyTypeName, NewLayoutCallbacks);
+		}
+	}
+}
+
+void FRuntimeEditorModule::UnregisterCustomPropertyTypeLayout(FName PropertyTypeName, TSharedPtr<soda::IPropertyTypeIdentifier> Identifier)
+{
+	if (!PropertyTypeName.IsValid() || (PropertyTypeName == NAME_None))
+	{
+		return;
+	}
+
+	soda::FPropertyTypeLayoutCallbackList* LayoutCallbacks = GlobalPropertyTypeToLayoutMap.Find(PropertyTypeName);
+
+	if (LayoutCallbacks)
+	{
+		LayoutCallbacks->Remove(Identifier);
+	}
+}
+
+
+/*
+void FRuntimeEditorModule::UnregisterCustomPropertyTypeLayout( FName PropertyTypeName, TSharedPtr<IPropertyTypeIdentifier> Identifier)
+{
+	if (!PropertyTypeName.IsValid() || (PropertyTypeName == NAME_None))
+	{
+		return;
+	}
+
+	FPropertyTypeLayoutCallbackList* LayoutCallbacks = GlobalPropertyTypeToLayoutMap.Find(PropertyTypeName);
+
+	if (LayoutCallbacks)
+	{
+		LayoutCallbacks->Remove(Identifier);
+	}
+}
+*/
+
+/*
+bool FRuntimeEditorModule::HasUnlockedDetailViews() const
+{
+	uint32 NumUnlockedViews = 0;
+	for( int32 ViewIndex = 0; ViewIndex < AllDetailViews.Num(); ++ViewIndex )
+	{
+		const TWeakPtr<SDetailsView>& DetailView = AllDetailViews[ ViewIndex ];
+		if( DetailView.IsValid() )
+		{
+			TSharedPtr<SDetailsView> DetailViewPin = DetailView.Pin();
+			if( DetailViewPin->IsUpdatable() &&  !DetailViewPin->IsLocked() )
+			{
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+*/
+
+/**
+ * Refreshes property windows with a new list of objects to view
+ * 
+ * @param NewObjectList	The list of objects each property window should view
+ */
+
+/*
+void FRuntimeEditorModule::UpdatePropertyViews( const TArray<UObject*>& NewObjectList )
+{
+	DestroyColorPicker();
+
+	TSet<AActor*> ValidObjects;
+	
+	for( int32 ViewIndex = 0; ViewIndex < AllDetailViews.Num(); ++ViewIndex )
+	{
+		if( AllDetailViews[ ViewIndex ].IsValid() )
+		{
+			TSharedPtr<SDetailsView> DetailViewPin = AllDetailViews[ ViewIndex ].Pin();
+			if( DetailViewPin->IsUpdatable() )
+			{
+				if( !DetailViewPin->IsLocked() )
+				{
+					DetailViewPin->SetObjects(NewObjectList, true);
+				}
+				else
+				{
+					DetailViewPin->ForceRefresh();
+				}
+			}
+		}
+	}
+}
+*/
+
+/*
+void FRuntimeEditorModule::ReplaceViewedObjects( const TMap<UObject*, UObject*>& OldToNewObjectMap )
+{
+	// Replace objects from detail views
+	for( int32 ViewIndex = 0; ViewIndex < AllDetailViews.Num(); ++ViewIndex )
+	{
+		if( AllDetailViews[ ViewIndex ].IsValid() )
+		{
+			TSharedPtr<SDetailsView> DetailViewPin = AllDetailViews[ ViewIndex ].Pin();
+
+			DetailViewPin->ReplaceObjects( OldToNewObjectMap );
+		}
+	}
+
+	// Replace objects from single views
+	for( int32 ViewIndex = 0; ViewIndex < AllSinglePropertyViews.Num(); ++ViewIndex )
+	{
+		if( AllSinglePropertyViews[ ViewIndex ].IsValid() )
+		{
+			TSharedPtr<SSingleProperty> SinglePropPin = AllSinglePropertyViews[ ViewIndex ].Pin();
+
+			SinglePropPin->ReplaceObjects( OldToNewObjectMap );
+		}
+	}
+}
+*/
+
+/*
+void FRuntimeEditorModule::RemoveDeletedObjects( TArray<UObject*>& DeletedObjects )
+{
+	DestroyColorPicker();
+
+	// remove deleted objects from detail views
+	for( int32 ViewIndex = 0; ViewIndex < AllDetailViews.Num(); ++ViewIndex )
+	{
+		if( AllDetailViews[ ViewIndex ].IsValid() )
+		{
+			TSharedPtr<SDetailsView> DetailViewPin = AllDetailViews[ ViewIndex ].Pin();
+
+			DetailViewPin->RemoveDeletedObjects( DeletedObjects );
+		}
+	}
+
+	// remove deleted object from single property views
+	for( int32 ViewIndex = 0; ViewIndex < AllSinglePropertyViews.Num(); ++ViewIndex )
+	{
+		if( AllSinglePropertyViews[ ViewIndex ].IsValid() )
+		{
+			TSharedPtr<SSingleProperty> SinglePropPin = AllSinglePropertyViews[ ViewIndex ].Pin();
+
+			SinglePropPin->RemoveDeletedObjects( DeletedObjects );
+		}
+	}
+}
+*/
+
+TSharedRef<soda::IStructureDetailsView> FRuntimeEditorModule::CreateStructureDetailView(const soda::FDetailsViewArgs& DetailsViewArgs, const soda::FStructureDetailsViewArgs& StructureDetailsViewArgs, TSharedPtr<FStructOnScope> StructData, const FText& CustomName)
+{
+	TSharedRef<soda::SStructureDetailsView> DetailView =
+		SNew(soda::SStructureDetailsView)
+		.DetailsViewArgs(DetailsViewArgs)
+		.CustomName(CustomName);
+
+	struct FStructureDetailsViewFilter
+	{
+		static bool HasFilter( const soda::FStructureDetailsViewArgs InStructureDetailsViewArgs )
+		{
+			const bool bShowEverything = InStructureDetailsViewArgs.bShowObjects 
+				&& InStructureDetailsViewArgs.bShowAssets 
+				&& InStructureDetailsViewArgs.bShowClasses 
+				&& InStructureDetailsViewArgs.bShowInterfaces;
+			return !bShowEverything;
+		}
+
+		static bool PassesFilter( const soda::FPropertyAndParent& PropertyAndParent, const soda::FStructureDetailsViewArgs InStructureDetailsViewArgs )
+		{
+			const auto ArrayProperty = CastField<FArrayProperty>(&PropertyAndParent.Property);
+			const auto SetProperty = CastField<FSetProperty>(&PropertyAndParent.Property);
+			const auto MapProperty = CastField<FMapProperty>(&PropertyAndParent.Property);
+
+			// If the property is a container type, the filter should test against the type of the container's contents
+			const FProperty* PropertyToTest = ArrayProperty ? ArrayProperty->Inner : &PropertyAndParent.Property;
+			PropertyToTest = SetProperty ? SetProperty->ElementProp : PropertyToTest;
+			PropertyToTest = MapProperty ? MapProperty->ValueProp : PropertyToTest;
+
+			// Meta-data should always be queried off the top-level property, as the inner (for container types) is generated by UHT
+			const FProperty* MetaDataProperty = &PropertyAndParent.Property;
+
+			if( InStructureDetailsViewArgs.bShowClasses && (PropertyToTest->IsA<FClassProperty>() || PropertyToTest->IsA<FSoftClassProperty>()) )
+			{
+				return true;
+			}
+
+			if( InStructureDetailsViewArgs.bShowInterfaces && PropertyToTest->IsA<FInterfaceProperty>() )
+			{
+				return true;
+			}
+
+			const auto ObjectProperty = CastField<FObjectPropertyBase>(PropertyToTest);
+			if( ObjectProperty )
+			{
+				if( InStructureDetailsViewArgs.bShowAssets )
+				{
+					// Is this an "asset" property?
+					if( PropertyToTest->IsA<FSoftObjectProperty>())
+					{
+						return true;
+					}
+
+					// Not an "asset" property, but it may still be a property using an asset class type (such as a raw pointer)
+					if( ObjectProperty->PropertyClass )
+					{
+						if (ensure(MetaDataProperty) && FRuntimeMetaData::HasMetaData(MetaDataProperty, TEXT("AllowedClasses")))
+						{
+							return true;
+						}
+						else
+						{
+							// We can use the asset tools module to see whether this type has asset actions (which likely means it's an asset class type)
+							//FAssetToolsModule& AssetToolsModule = FAssetToolsModule::GetModule();
+							//return AssetToolsModule.Get().GetAssetTypeActionsForClass(ObjectProperty->PropertyClass).IsValid();
+							return false;
+						}
+					}
+				}
+
+				return InStructureDetailsViewArgs.bShowObjects;
+			}
+
+			return true;
+		}
+	};
+
+	// Only add the filter if we need to exclude things
+	if (FStructureDetailsViewFilter::HasFilter(StructureDetailsViewArgs))
+	{
+		DetailView->SetIsPropertyVisibleDelegate(soda::FIsPropertyVisible::CreateStatic(&FStructureDetailsViewFilter::PassesFilter, StructureDetailsViewArgs));
+	}
+	DetailView->SetStructureData(StructData);
+
+	return DetailView;
+}
+
+
+TSharedRef<soda::IPropertyRowGenerator> FRuntimeEditorModule::CreatePropertyRowGenerator(const soda::FPropertyRowGeneratorArgs& InArgs)
+{
+	return MakeShared<soda::FPropertyRowGenerator>(InArgs/*, GetThumbnailPool()*/);
+}
+
+
+void FRuntimeEditorModule::RegisterObjectCustomizations()
+{
+	RegisterCustomClassLayout("Object", soda::FOnGetDetailCustomizationInstance::CreateStatic(&soda::FObjectDetails::MakeInstance));
+	RegisterCustomClassLayout("Actor", soda::FOnGetDetailCustomizationInstance::CreateStatic(&soda::FActorDetails::MakeInstance));
+	RegisterCustomClassLayout("ActorComponent", soda::FOnGetDetailCustomizationInstance::CreateStatic(&soda::FActorComponentDetails::MakeInstance));
+	RegisterCustomClassLayout("SceneComponent", soda::FOnGetDetailCustomizationInstance::CreateStatic(&soda::FSceneComponentDetails::MakeInstance));	
+}
+
+void FRuntimeEditorModule::RegisterPropertyTypeCustomizations()
+{
+	RegisterCustomPropertyTypeLayout("SoftObjectPath", soda::FOnGetPropertyTypeCustomizationInstance::CreateStatic(&soda::FSoftObjectPathCustomization::MakeInstance));
+	RegisterCustomPropertyTypeLayout("Key", soda::FOnGetPropertyTypeCustomizationInstance::CreateStatic(&soda::FKeyStructCustomization::MakeInstance));
+	RegisterCustomPropertyTypeLayout("ComponentReference", soda::FOnGetPropertyTypeCustomizationInstance::CreateStatic(&soda::FComponentReferenceCustomization::MakeInstance));
+}
+
+class TSharedRef< soda::IDocumentation > FRuntimeEditorModule::GetDocumentation() const
+{
+	return Documentation.ToSharedRef();
+}
+
+IMPLEMENT_MODULE(FRuntimeEditorModule, RuntimeEditor);
+
diff --git a/Source/RuntimeEditor/Private/RuntimeEditorUtils.cpp b/Source/RuntimeEditor/Private/RuntimeEditorUtils.cpp
new file mode 100644
index 0000000..2acac69
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeEditorUtils.cpp
@@ -0,0 +1,601 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeEditorUtils.h"
+#include "HAL/FileManager.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Input/SHyperlink.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "RuntimeMetaData.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Components/SceneComponent.h"
+#include "Blueprint/BlueprintSupport.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "Engine/Blueprint.h"
+
+namespace FRuntimeEditorUtils
+{
+
+//------------------------------------------------------------------------------
+FString GetDocumentationPage(const UClass* Class)
+{
+	return (Class ? FString::Printf( TEXT("Shared/Types/%s%s"), Class->GetPrefixCPP(), *Class->GetName() ) : FString());
+}
+
+//------------------------------------------------------------------------------
+FString GetDocumentationExcerpt(const UClass* Class)
+{
+	return (Class ? FString::Printf( TEXT("%s%s"), Class->GetPrefixCPP(), *Class->GetName() ) : FString());
+}
+
+//------------------------------------------------------------------------------
+TSharedRef<SToolTip> GetTooltip(const UClass* Class)
+{
+	const bool bShowShortTooltips = true;
+	return (Class ? GetTooltip(Class, FRuntimeMetaData::GetToolTipText(Class, bShowShortTooltips)) : SNew(SToolTip));
+	//return (Class ? GetTooltip(Class, FText::GetEmpty()) : SNew(SToolTip));
+}
+
+//------------------------------------------------------------------------------
+TSharedRef<SToolTip> GetTooltip(const UClass* Class, const TAttribute<FText>& OverrideText)
+{
+	return (Class ? soda::IDocumentation::Get()->CreateToolTip(OverrideText, nullptr, GetDocumentationPage(Class), GetDocumentationExcerpt(Class)) : SNew(SToolTip));
+	//return (Class ? CreateDocToolTip(OverrideText, nullptr) : SNew(SToolTip));
+}
+
+//------------------------------------------------------------------------------
+UClass* GetClassFromString(const FString& ClassName)
+{
+	if (ClassName.IsEmpty() || ClassName == TEXT("None"))
+	{
+		return nullptr;
+	}
+
+	UClass* Class = nullptr;
+	if (!FPackageName::IsShortPackageName(ClassName))
+	{
+		Class = FindObject<UClass>(nullptr, *ClassName);
+	}
+	else
+	{
+		Class = FindFirstObject<UClass>(*ClassName, EFindFirstObjectOptions::None, ELogVerbosity::Warning, TEXT("FEditorClassUtils::GetClassFromString"));
+	}
+	if (!Class)
+	{
+		Class = LoadObject<UClass>(nullptr, *ClassName);
+	}
+	return Class;
+}
+
+//------------------------------------------------------------------------------
+bool ValidateActorName(const FText& InName, FText& OutErrorMessage)
+{
+	FText TrimmedLabel = FText::TrimPrecedingAndTrailing(InName);
+
+	if (TrimmedLabel.IsEmpty())
+	{
+		OutErrorMessage = FText::FromString(TEXT("Names cannot be left blank"));
+		return false;
+	}
+
+	if (TrimmedLabel.ToString().Len() >= NAME_SIZE)
+	{
+		FFormatNamedArguments Arguments;
+		Arguments.Add(TEXT("CharCount"), NAME_SIZE);
+		OutErrorMessage = FText::Format(FText::FromString(TEXT("Names must be less than {CharCount} characters long.")), Arguments);
+		return false;
+	}
+
+	if (FName(*TrimmedLabel.ToString()) == NAME_None)
+	{
+		OutErrorMessage = FText::FromString(TEXT("\"None\" is a reserved term and cannot be used for actor names"));
+		return false;
+	}
+
+	return true;
+}
+
+
+//------------------------------------------------------------------------------
+FText GetCategoryText(const FField* InField)
+{
+	static const FTextKey CategoryLocalizationNamespace = TEXT("UObjectCategory");
+	static const FName CategoryMetaDataKey = TEXT("Category");
+
+	if (InField)
+	{
+		const FString& NativeCategory = FRuntimeMetaData::GetMetaData(InField, CategoryMetaDataKey);
+		if (!NativeCategory.IsEmpty())
+		{
+			FText LocalizedCategory;
+			if (!FText::FindText(CategoryLocalizationNamespace, NativeCategory, /*OUT*/LocalizedCategory, &NativeCategory))
+			{
+				LocalizedCategory = FText::AsCultureInvariant(NativeCategory);
+			}
+			return LocalizedCategory;
+		}
+	}
+
+	return FText::GetEmpty();
+}
+
+//------------------------------------------------------------------------------
+FText GetCategoryText(const UField* InField)
+{
+	static const FTextKey CategoryLocalizationNamespace = TEXT("UObjectCategory");
+	static const FName CategoryMetaDataKey = TEXT("Category");
+
+	if (InField)
+	{
+		const FString& NativeCategory = FRuntimeMetaData::GetMetaData(InField, CategoryMetaDataKey);
+		if (!NativeCategory.IsEmpty())
+		{
+			FText LocalizedCategory;
+			if (!FText::FindText(CategoryLocalizationNamespace, NativeCategory, /*OUT*/LocalizedCategory, &NativeCategory))
+			{
+				LocalizedCategory = FText::AsCultureInvariant(NativeCategory);
+			}
+			return LocalizedCategory;
+		}
+	}
+
+	return FText::GetEmpty();
+}
+
+//------------------------------------------------------------------------------
+FString GetCategory(const FField* InField)
+{
+	return GetCategoryText(InField).ToString();
+}
+
+//------------------------------------------------------------------------------
+FString GetCategory(const UField* InField)
+{
+	return GetCategoryText(InField).ToString();
+}
+
+//------------------------------------------------------------------------------
+FName GetCategoryFName(const FField* InField)
+{
+	static const FName CategoryKey(TEXT("Category"));
+
+	const FField* CurrentField = InField;
+	FString CategoryString;
+	while (CurrentField != nullptr && CategoryString.IsEmpty())
+	{
+		CategoryString = FRuntimeMetaData::GetMetaData(CurrentField, CategoryKey);
+		CurrentField = CurrentField->GetOwner<FField>();
+	}
+
+	if (!CategoryString.IsEmpty())
+	{
+		return FName(*CategoryString);
+	}
+
+	return NAME_None;
+}
+
+//------------------------------------------------------------------------------
+FName GetCategoryFName(const UField* InField)
+{
+	static const FName CategoryKey(TEXT("Category"));
+	if (InField && FRuntimeMetaData::HasMetaData(InField, CategoryKey))
+	{
+		return FName(FRuntimeMetaData::GetMetaData(InField, CategoryKey));
+	}
+	return NAME_None;
+}
+
+//------------------------------------------------------------------------------
+bool CanCreateBlueprintOfClass(const UClass* Class)
+{
+	bool bCanCreateBlueprint = false;
+
+	if (Class)
+	{
+		bool bAllowDerivedBlueprints = false;
+		GConfig->GetBool(TEXT("Kismet"), TEXT("AllowDerivedBlueprints"), /*out*/ bAllowDerivedBlueprints, GEngineIni);
+
+#if WITH_EDITORONLY_DATA
+		bCanCreateBlueprint = !Class->HasAnyClassFlags(CLASS_Deprecated)
+			&& !Class->HasAnyClassFlags(CLASS_NewerVersionExists)
+			&& (!Class->ClassGeneratedBy || (bAllowDerivedBlueprints && !IsClassABlueprintSkeleton(Class)));
+#else
+		bCanCreateBlueprint = !Class->HasAnyClassFlags(CLASS_Deprecated)
+			&& !Class->HasAnyClassFlags(CLASS_NewerVersionExists)
+			&& (/*!Class->ClassGeneratedBy ||*/ (bAllowDerivedBlueprints /*&& !IsClassABlueprintSkeleton(Class)*/));
+#endif
+
+
+		const bool bIsBPGC = (Cast<UBlueprintGeneratedClass>(Class) != nullptr);
+
+		const bool bIsValidClass = /*Class->GetBoolMetaDataHierarchical(FBlueprintMetadata::MD_IsBlueprintBase)*/
+			/*||*/ (Class == UObject::StaticClass())
+			|| (Class->HasAnyClassFlags(CLASS_CompiledFromBlueprint) || Class == USceneComponent::StaticClass() || Class == UActorComponent::StaticClass())
+			|| bIsBPGC;  // BPs are always considered inheritable
+
+		bCanCreateBlueprint &= bIsValidClass;
+	}
+
+	return bCanCreateBlueprint;
+}
+
+//------------------------------------------------------------------------------
+FString GetFriendlyName(const FProperty* Property, UStruct* OwnerStruct/* = NULL*/)
+{
+	// first, try to pull the friendly name from the loc file
+	check(Property);
+	UStruct* RealOwnerStruct = Property->GetOwnerStruct();
+	if (OwnerStruct == NULL)
+	{
+		OwnerStruct = RealOwnerStruct;
+	}
+	checkSlow(OwnerStruct);
+
+	FText FoundText;
+	bool DidFindText = false;
+	UStruct* CurrentStruct = OwnerStruct;
+	do
+	{
+		FString PropertyPathName = Property->GetPathName(CurrentStruct);
+
+		DidFindText = FText::FindText(*CurrentStruct->GetName(), *(PropertyPathName + TEXT(".FriendlyName")), /*OUT*/FoundText);
+		CurrentStruct = CurrentStruct->GetSuperStruct();
+	} while (CurrentStruct != NULL && CurrentStruct->IsChildOf(RealOwnerStruct) && !DidFindText);
+
+	if (!DidFindText)
+	{
+		const FString& DefaultFriendlyName = FRuntimeMetaData::GetMetaData(Property, TEXT("DisplayName"));
+		if (DefaultFriendlyName.IsEmpty())
+		{
+			const bool bIsBool = CastField<const FBoolProperty>(Property) != NULL;
+			return FName::NameToDisplayString(Property->GetName(), bIsBool);
+		}
+		return DefaultFriendlyName;
+	}
+
+	return FoundText.ToString();
+}
+
+//------------------------------------------------------------------------------
+bool IsCategoryHiddenFromClass(const UStruct* Class, const FText& Category)
+{
+	return IsCategoryHiddenFromClass(Class, Category.ToString());
+}
+
+//------------------------------------------------------------------------------
+bool IsCategoryHiddenFromClass(const UStruct* Class, const FString& Category)
+{
+	TArray<FString> ClassHideCategories;
+	GetClassHideCategories(Class, ClassHideCategories);
+	return IsCategoryHiddenFromClass(ClassHideCategories, Class, Category);
+}
+
+//------------------------------------------------------------------------------
+bool IsCategoryHiddenFromClass(const TArray<FString>& ClassHideCategories, const UStruct* Class, const FString& Category)
+{
+	bool bIsHidden = false;
+
+	// run the category through sanitization so we can ensure compares will hit
+	const FString DisplayCategory = GetCategoryDisplayString(Category);
+
+	for (const FString& HideCategory : ClassHideCategories)
+	{
+		bIsHidden = (HideCategory == DisplayCategory);
+		if (bIsHidden)
+		{
+			TArray<FString> ClassShowCategories;
+			GetClassShowCategories(Class, ClassShowCategories);
+			// if they hid it, and showed it... favor showing (could be a shown in a sub-class, and hid in a super)
+			bIsHidden = (ClassShowCategories.Find(DisplayCategory) == INDEX_NONE);
+		}
+		else // see if the category's root is hidden
+		{
+			TArray<FString> SubCategoryList;
+			DisplayCategory.ParseIntoArray(SubCategoryList, TEXT("|"), /*InCullEmpty =*/true);
+
+			FString FullSubCategoryPath;
+			for (const FString& SubCategory : SubCategoryList)
+			{
+				FullSubCategoryPath += SubCategory;
+				if ((HideCategory == SubCategory) || (HideCategory == FullSubCategoryPath))
+				{
+					TArray<FString> ClassShowCategories;
+					GetClassShowCategories(Class, ClassShowCategories);
+					// if they hid it, and showed it... favor showing (could be a shown in a sub-class, and hid in a super)
+					bIsHidden = (ClassShowCategories.Find(DisplayCategory) == INDEX_NONE);
+				}
+				FullSubCategoryPath += "|";
+			}
+		}
+
+		if (bIsHidden)
+		{
+			break;
+		}
+	}
+
+	return bIsHidden;
+}
+
+//------------------------------------------------------------------------------
+void GetClassHideCategories(const UStruct* Class, TArray<FString>& CategoriesOut, bool bHomogenize)
+{
+	CategoriesOut.Empty();
+
+	if (FRuntimeMetaData::HasMetaData(Class, TEXT("HideCategories")))
+	{
+		const FString& HideCategories = FRuntimeMetaData::GetMetaData(Class, TEXT("HideCategories"));
+
+		HideCategories.ParseIntoArray(CategoriesOut, TEXT(" "), /*InCullEmpty =*/true);
+
+		if (bHomogenize)
+		{
+			for (FString& Category : CategoriesOut)
+			{
+				Category = GetCategoryDisplayString(Category);
+			}
+		}
+	}
+}
+
+
+//------------------------------------------------------------------------------
+FText GetCategoryDisplayString(const FText& UnsanitizedCategory)
+{
+	return FText::FromString(GetCategoryDisplayString(UnsanitizedCategory.ToString()));
+}
+
+//------------------------------------------------------------------------------
+FString GetCategoryDisplayString(const FString& UnsanitizedCategory)
+{
+	FString DisplayString = UnsanitizedCategory;
+
+	int32 KeyIndex = INDEX_NONE;
+	do
+	{
+		KeyIndex = DisplayString.Find(TEXT("{"), ESearchCase::CaseSensitive, ESearchDir::FromStart, KeyIndex);
+		if (KeyIndex != INDEX_NONE)
+		{
+			int32 EndIndex = DisplayString.Find(TEXT("}"), ESearchCase::CaseSensitive, ESearchDir::FromStart, KeyIndex);
+			if (EndIndex != INDEX_NONE)
+			{
+				FString ToReplaceStr(EndIndex + 1 - KeyIndex, *DisplayString + KeyIndex);
+				FString ReplacementStr;
+
+				int32 KeyLen = EndIndex - (KeyIndex + 1);
+				if (KeyLen > 0)
+				{
+					FString Key(KeyLen, *DisplayString + KeyIndex + 1);
+					Key.TrimStartInline();
+					ReplacementStr = GetCategory(*Key).ToString();
+				}
+				DisplayString.ReplaceInline(*ToReplaceStr, *ReplacementStr);
+			}
+			KeyIndex = EndIndex;
+		}
+
+	} while (KeyIndex != INDEX_NONE);
+
+	DisplayString = FName::NameToDisplayString(DisplayString, /*bIsBool =*/false);
+	DisplayString.ReplaceInline(TEXT("| "), TEXT("|"), ESearchCase::CaseSensitive);
+
+	return DisplayString;
+}
+
+//------------------------------------------------------------------------------
+void  GetClassShowCategories(const UStruct* Class, TArray<FString>& CategoriesOut)
+{
+	CategoriesOut.Empty();
+
+	if (FRuntimeMetaData::HasMetaData(Class, TEXT("ShowCategories")))
+	{
+		const FString& ShowCategories = FRuntimeMetaData::GetMetaData(Class, TEXT("ShowCategories"));
+		ShowCategories.ParseIntoArray(CategoriesOut, TEXT(" "), /*InCullEmpty =*/true);
+
+		for (FString& Category : CategoriesOut)
+		{
+			Category = GetCategoryDisplayString(FText::FromString(Category)).ToString();
+		}
+	}
+}
+
+//------------------------------------------------------------------------------
+const FText& GetCategory(const FString& Key)
+{
+	/*
+	if (FEditorCategoryUtilsImpl::FCategoryInfo const* FoundCategory = GetCategoryTable().Find(Key))
+	{
+		return FoundCategory->DisplayName;
+	}
+	*/
+	return FText::GetEmpty();
+
+}
+
+//------------------------------------------------------------------------------
+/*
+TSharedRef< class SToolTip > CreateDocToolTip(const TAttribute<FText>& Text, const TSharedPtr<SWidget>& OverrideContent, const FString& Link, const FString& ExcerptName)
+{
+	return
+		SNew(SToolTip)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString("TODO!!!"))
+			]
+		];
+}
+*/
+//------------------------------------------------------------------------------
+
+/*
+TSharedRef< class SToolTip > CreateDocToolTip(const TAttribute<FText>& Text, const TSharedRef<SWidget>& OverrideContent, const TSharedPtr<SVerticalBox>& DocVerticalBox, const FString& Link, const FString& ExcerptName)
+{
+	return
+		SNew(SToolTip)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+		[
+			SNew(STextBlock)
+			.Text(FText::FromString("TODO!!!"))
+		]
+		];
+}
+*/
+
+//------------------------------------------------------------------------------
+FTopLevelAssetPath GetClassPathNameFromAssetTag(const FAssetData& InAssetData)
+{
+	const FString GeneratedClassPath = InAssetData.GetTagValueRef<FString>(FBlueprintTags::GeneratedClassPath);
+	return FTopLevelAssetPath(FPackageName::ExportTextPathToObjectPath(FStringView(GeneratedClassPath)));
+}
+
+//------------------------------------------------------------------------------
+FTopLevelAssetPath GetClassPathNameFromAsset(const FAssetData& InAssetData, bool bGenerateClassPathIfMissing /*= false*/)
+{
+	bool bIsBPGC = false;
+	const bool bIsBP = IsBlueprintAsset(InAssetData, &bIsBPGC);
+
+	if (bIsBPGC)
+	{
+		return FTopLevelAssetPath(InAssetData.GetSoftObjectPath().GetAssetPath());
+	}
+	else if (bIsBP)
+	{
+		FTopLevelAssetPath ClassPath = GetClassPathNameFromAssetTag(InAssetData);
+		if (bGenerateClassPathIfMissing && ClassPath.IsNull())
+		{
+			FString ClassPathString = InAssetData.GetObjectPathString();
+			ClassPathString += TEXT("_C");
+			ClassPath = FTopLevelAssetPath(ClassPathString);
+		}
+		return ClassPath;
+	}
+	return FTopLevelAssetPath();
+}
+
+//------------------------------------------------------------------------------
+bool IsBlueprintAsset(const FAssetData& InAssetData, bool* bOutIsBPGC /*= nullptr*/)
+{
+	bool bIsBP = (InAssetData.AssetClassPath == UBlueprint::StaticClass()->GetClassPathName());
+	bool bIsBPGC = (InAssetData.AssetClassPath == UBlueprintGeneratedClass::StaticClass()->GetClassPathName());
+
+	if (!bIsBP && !bIsBPGC)
+	{
+		IAssetRegistry& AssetRegistry = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(AssetRegistryConstants::ModuleName).Get();
+		TArray<FTopLevelAssetPath> AncestorClassNames;
+		AssetRegistry.GetAncestorClassNames(InAssetData.AssetClassPath, AncestorClassNames);
+
+		if (AncestorClassNames.Contains(UBlueprint::StaticClass()->GetClassPathName()))
+		{
+			bIsBP = true;
+		}
+		else if (AncestorClassNames.Contains(UBlueprintGeneratedClass::StaticClass()->GetClassPathName()))
+		{
+			bIsBPGC = true;
+		}
+	}
+
+	if (bOutIsBPGC)
+	{
+		*bOutIsBPGC = bIsBPGC;
+	}
+
+	return bIsBP || bIsBPGC;
+}
+
+//------------------------------------------------------------------------------
+void GetImplementedInterfaceClassPathsFromAsset(const struct FAssetData& InAssetData, TArray<FString>& OutClassPaths)
+{
+	if (!InAssetData.IsValid())
+	{
+		return;
+	}
+
+	const FString ImplementedInterfaces = InAssetData.GetTagValueRef<FString>(FBlueprintTags::ImplementedInterfaces);
+	if (!ImplementedInterfaces.IsEmpty())
+	{
+		// Parse string like "((Interface=Class'"/Script/VPBookmark.VPBookmarkProvider"'),(Interface=Class'"/Script/VPUtilities.VPContextMenuProvider"'))"
+		// We don't want to actually resolve the hard ref so do some manual parsing
+
+		FString FullInterface;
+		FString CurrentString = *ImplementedInterfaces;
+		while (CurrentString.Split(TEXT("Interface="), nullptr, &FullInterface))
+		{
+			// Cutoff at next )
+			int32 RightParen = INDEX_NONE;
+			if (FullInterface.FindChar(TCHAR(')'), RightParen))
+			{
+				// Keep parsing
+				CurrentString = FullInterface.Mid(RightParen);
+
+				// Strip class name
+				FullInterface = *FPackageName::ExportTextPathToObjectPath(FullInterface.Left(RightParen));
+
+				// Handle quotes
+				FString InterfacePath;
+				const TCHAR* NewBuffer = FPropertyHelpers::ReadToken(*FullInterface, InterfacePath, true);
+
+				if (NewBuffer)
+				{
+					OutClassPaths.Add(InterfacePath);
+				}
+			}
+		}
+	}
+}
+
+//------------------------------------------------------------------------------
+bool IsClassABlueprintSkeleton(const UClass* Class)
+{
+	// Find generating blueprint for a class
+#if WITH_EDITORONLY_DATA
+	UBlueprint* GeneratingBP = Cast<UBlueprint>(Class->ClassGeneratedBy);
+	if (GeneratingBP && GeneratingBP->SkeletonGeneratedClass)
+	{
+		return (Class == GeneratingBP->SkeletonGeneratedClass) && (GeneratingBP->SkeletonGeneratedClass != GeneratingBP->GeneratedClass);
+	}
+#endif
+	return Class->HasAnyFlags(RF_Transient) && Class->HasAnyClassFlags(CLASS_CompiledFromBlueprint);
+}
+//------------------------------------------------------------------------------
+FString GetDisplayNameHelper(const UObject& Object)
+{
+	const UClass* Class = Cast<const UClass>(&Object);
+	if (Class && !Class->HasAnyClassFlags(CLASS_Native))
+	{
+		FString Name = Object.GetName();
+		Name.RemoveFromEnd(TEXT("_C"));
+		Name.RemoveFromStart(TEXT("SKEL_"));
+		return Name;
+	}
+
+	//if (auto Property = dynamic_cast<const FProperty*>(&Object))
+	//{
+	//	return Property->GetAuthoredName();
+	//}
+
+	return Object.GetName();
+}
+
+//------------------------------------------------------------------------------
+FString GetDisplayNameHelper(const FField& Object)
+{
+	if (const FProperty* Property = CastField<FProperty>(&Object))
+	{
+		if (auto OwnerStruct = Property->GetOwnerStruct())
+		{
+			return OwnerStruct->GetAuthoredNameForField(Property);
+		}
+	}
+
+	return Object.GetName();
+}
+
+}
+
diff --git a/Source/RuntimeEditor/Private/RuntimeMetaData.cpp b/Source/RuntimeEditor/Private/RuntimeMetaData.cpp
new file mode 100644
index 0000000..35e1f39
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeMetaData.cpp
@@ -0,0 +1,757 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeMetaData.h"
+#include "MetadataPrimaryAsset.h"
+#include "Engine/AssetManager.h"
+#include "RuntimeEditorUtils.h"
+
+DEFINE_LOG_CATEGORY(LogMetaData);
+
+//#define RUNTIME_METADATA_DEBUG
+
+TMap<FString, FRuntimeMetadataObject> FRuntimeMetaData::MetadataGlobalScope;
+
+const FRuntimeMetadataField* FRuntimeMetaData::FindField(const UField* Field)
+{
+	UObject* Owner = Field->GetOuter();
+	if (FRuntimeMetadataObject* Metadata = MetadataGlobalScope.Find(Owner->GetName()))
+	{
+		return Metadata->Fields.Find(Field->GetName());
+	}
+	return nullptr;
+}
+
+const FRuntimeMetadataField* FRuntimeMetaData::FindField(const FField* Field)
+{
+	UObject* Owner = Field->GetOwnerUObject();
+	if (FRuntimeMetadataObject* Metadata = MetadataGlobalScope.Find(Owner->GetName()))
+	{
+		return Metadata->Fields.Find(Field->GetName());
+	}
+	return nullptr;
+}
+
+bool FRuntimeMetaData::AddGeneratedMetadataToGlobalScope(UClass* Class)
+{
+	if (!Class->ImplementsInterface(UEditableObject::StaticClass()))
+	{
+		return false;
+	}
+
+	FRuntimeMetadataObject DummyMetadataObject;
+
+	while(Class && Class->HasAnyClassFlags(CLASS_CompiledFromBlueprint))
+	{
+		if (Class->ImplementsInterface(UEditableObject::StaticClass()))
+		{
+			FRuntimeMetadataObject MetadataObject;
+			IEditableObject::Execute_GenerateMetadata(Class->GetDefaultObject(), MetadataObject);
+
+			MetadataObject.Fields.Append(DummyMetadataObject.Fields);
+			MetadataGlobalScope.FindOrAdd(Class->GetName()) = MetadataObject;
+			DummyMetadataObject.Fields = MetadataObject.Fields;
+		}
+		else
+		{
+			MetadataGlobalScope.FindOrAdd(Class->GetName()) = DummyMetadataObject;
+		}
+
+#ifdef RUNTIME_METADATA_DEBUG
+		for (TFieldIterator<FField> FieldIt(Class); FieldIt; ++FieldIt)
+		{
+			FField* Field = *FieldIt;
+			if (FRuntimeMetadataField* MetadataField = MetadataObject.Fields.Find(Field->GetName()))
+			{
+				for (auto& It : MetadataField->MetadataMap)
+				{
+					Field->SetMetaData(*It.Key, *It.Value);
+				}
+			}
+		}
+		for (TFieldIterator<UField> FieldIt(Class); FieldIt; ++FieldIt)
+		{
+			UField* Field = *FieldIt;
+			if (FRuntimeMetadataField* MetadataField = MetadataObject.Fields.Find(Field->GetName()))
+			{
+				for (auto& It : MetadataField->MetadataMap)
+				{
+					Field->SetMetaData(*It.Key, *It.Value);
+				}
+			}
+		}
+#endif // RUNTIME_METADATA_DEBUG
+
+		Class = Cast<UClass>(Class->GetInheritanceSuper());
+	}
+
+	return true;
+}
+
+const FString * FRuntimeMetaData::TryGetMetaData(const UField* Field, const TCHAR* Key)
+{
+	if (const FRuntimeMetadataField* MetadataField = FindField(Field))
+	{
+		return MetadataField->MetadataMap.Find(Key);
+	}
+	return nullptr;
+}
+
+const FString* FRuntimeMetaData::TryGetMetaData(const FField* Field, const TCHAR* Key)
+{
+	if (const FRuntimeMetadataField* MetadataField = FindField(Field))
+	{
+		return MetadataField->MetadataMap.Find(Key);
+	}
+	return nullptr;
+}
+
+void FRuntimeMetaData::RegisterMetadataPrimaryAssets()
+{
+	MetadataGlobalScope.Empty();
+
+	UAssetManager& AssetManager = UAssetManager::Get();
+	TArray<FPrimaryAssetId> PrimaryAssetIdList;
+	AssetManager.GetPrimaryAssetIdList(FPrimaryAssetType("MetadataPrimaryAsset"), PrimaryAssetIdList);
+	TSharedPtr<FStreamableHandle> Handle = AssetManager.LoadPrimaryAssets(PrimaryAssetIdList);
+
+	TArray<UObject*> LoadedAssets;
+	if (Handle.IsValid())
+	{
+		Handle->WaitUntilComplete();
+		Handle->GetLoadedAssets(LoadedAssets);
+	}
+	else
+	{
+		for (const auto& It : PrimaryAssetIdList)
+		{
+			if (UObject* Obj = AssetManager.GetPrimaryAssetObject(It))
+			{
+				LoadedAssets.Add(Obj);
+			}
+		}
+	}
+
+	for (auto& LoadedAsset : LoadedAssets)
+	{
+		if (UClass* MetadataPrimaryAsset = Cast<UClass>(LoadedAsset))
+		{
+			UE_LOG(LogMetaData, Log, TEXT("FRuntimeMetaData::RegisterMetadataPrimaryAssets(); Loaded asset %s"), *MetadataPrimaryAsset->GetName());
+			MetadataGlobalScope.Append(CastChecked<UMetadataPrimaryAsset>(MetadataPrimaryAsset->GetDefaultObject())->GetMetadataScope());
+		}
+	}
+}
+
+/*
+void FRuntimeMetaData::PrimaryAssetsLoaded(FPrimaryAssetId AssetId)
+{
+	UAssetManager& AssetManager = UAssetManager::Get();
+	UClass* AssetObjectClass = AssetManager.GetPrimaryAssetObjectClass<UMetadataPrimaryAsset>(AssetId);
+	if (AssetObjectClass)
+	{
+		UE_LOG(LogMetaData, Log, TEXT("FRuntimeMetaData::RegisterMetadataPrimaryAssets(); Loaded asset %s"), *AssetObjectClass->GetName());
+		MetadataGlobalScope.Append(CastChecked<UMetadataPrimaryAsset>(AssetObjectClass->GetDefaultObject())->GetMetadataScope());
+	}
+	else
+	{
+		UE_LOG(LogMetaData, Error, TEXT("FRuntimeMetaData::RegisterMetadataPrimaryAssets(); Primary asset \"%s\" load faild"), *AssetId.ToString());
+	}
+}
+*/
+
+#ifdef RUNTIME_METADATA_DEBUG
+
+const FString* FRuntimeMetaData::FindMetaData(const FField* Field, const TCHAR* Key) { return Field->FindMetaData(Key); }
+const FString* FRuntimeMetaData::FindMetaData(const FField* Field, const FName& Key) { return Field->FindMetaData(Key); }
+const FString* FRuntimeMetaData::FindMetaData(const UField* Field, const TCHAR* Key) { return Field->FindMetaData(Key); }
+const FString* FRuntimeMetaData::FindMetaData(const UField* Field, const FName& Key) { return Field->FindMetaData(Key); }
+bool FRuntimeMetaData::HasMetaData(const UField* Field, const TCHAR* Key) { return Field->HasMetaData(Key); }
+bool FRuntimeMetaData::HasMetaData(const UField* Field, const FName& Key) { return Field->HasMetaData(Key); }
+bool FRuntimeMetaData::HasMetaData(const FField* Field, const TCHAR* Key) { return Field->HasMetaData(Key); }
+bool FRuntimeMetaData::HasMetaData(const FField* Field, const FName& Key) { return Field->HasMetaData(Key); }
+const FString& FRuntimeMetaData::GetMetaData(const UField* Field, const TCHAR* Key) { return Field->GetMetaData(Key); }
+const FString& FRuntimeMetaData::GetMetaData(const FField* Field, const TCHAR* Key) { return Field->GetMetaData(Key); }
+const FString& FRuntimeMetaData::GetMetaData(const UField* Field, const FName& Key) { return Field->GetMetaData(Key); }
+const FString& FRuntimeMetaData::GetMetaData(const FField* Field, const FName& Key) { return Field->GetMetaData(Key); }
+FText FRuntimeMetaData::GetDisplayNameText(const FField* Field) { return Field->GetDisplayNameText(); }
+FText FRuntimeMetaData::GetDisplayNameText(const UField* Field) { return Field->GetDisplayNameText(); }
+FText FRuntimeMetaData::GetToolTipText(const UField* Field) { return Field->GetToolTipText(); }
+FText FRuntimeMetaData::GetToolTipText(const FField* Field) { return Field->GetToolTipText(); }
+bool FRuntimeMetaData::GetBoolMetaData(const UField* Field, const TCHAR* Key) { return Field->GetBoolMetaData(Key); }
+bool FRuntimeMetaData::GetBoolMetaData(const UField* Field, const FName& Key) { return Field->GetBoolMetaData(Key); }
+bool FRuntimeMetaData::GetBoolMetaData(const FField* Field, const TCHAR* Key) { return Field->GetBoolMetaData(Key); }
+bool FRuntimeMetaData::GetBoolMetaData(const FField* Field, const FName& Key) { return Field->GetBoolMetaData(Key); }
+UClass* FRuntimeMetaData::GetClassMetaData(const FField* Field, const TCHAR* Key) { return Field->GetClassMetaData(Key); }
+UClass* FRuntimeMetaData::GetClassMetaData(const FField* Field, const FName& Key) { return Field->GetClassMetaData(Key); }
+float FRuntimeMetaData::GetFloatMetaData(const FField* Field, const TCHAR* Key) { return Field->GetFloatMetaData(Key); }
+float FRuntimeMetaData::GetFloatMetaData(const FField* Field, const FName& Key) { return Field->GetFloatMetaData(Key); }
+int32 FRuntimeMetaData::GetIntMetaData(const FField* Field, const TCHAR* Key) { return Field->GetIntMetaData(Key); }
+int32 FRuntimeMetaData::GetIntMetaData(const FField* Field, const FName& Key) { return Field->GetIntMetaData(Key); }
+bool FRuntimeMetaData::IsAutoExpandCategory(const UClass* Class, const TCHAR* InCategory) { return Class->IsAutoExpandCategory(InCategory); }
+bool FRuntimeMetaData::IsAutoCollapseCategory(const UClass* Class, const TCHAR* InCategory) { return Class->IsAutoCollapseCategory(InCategory); }
+bool FRuntimeMetaData::HasMetaData(const UEnum* Enum, const TCHAR* Key, int32 NameIndex) { return Enum->HasMetaData(Key, NameIndex); };
+FString FRuntimeMetaData::GetMetaData(const UEnum* Enum, const TCHAR* Key, int32 NameIndex, bool bAllowRemap) { return Enum->GetMetaData(Key, NameIndex, bAllowRemap); }
+FText FRuntimeMetaData::GetToolTipTextByIndex(const UEnum* Enum, int32 NameIndex) { return Enum->GetToolTipTextByIndex(NameIndex); };
+FText FRuntimeMetaData::GetDisplayNameTextByIndex(const UEnum* Enum, int32 NameIndex) { return Enum->GetDisplayNameTextByIndex(NameIndex); };
+
+#else // RUNTIME_METADATA_DEBUG
+
+
+static FString GetFieldDisplayName(const FField& Object)
+{
+	if (const FProperty* Property = CastField<FProperty>(&Object))
+	{
+		if (auto OwnerStruct = Property->GetOwnerStruct())
+		{
+			return OwnerStruct->GetAuthoredNameForField(Property);
+		}
+	}
+
+	return Object.GetName();
+}
+
+
+static FString GetFieldDisplayName(const UObject& Object)
+{
+	const UClass* Class = Cast<const UClass>(&Object);
+	if (Class && !Class->HasAnyClassFlags(CLASS_Native))
+	{
+		FString Name = Object.GetName();
+		Name.RemoveFromEnd(TEXT("_C"));
+		Name.RemoveFromStart(TEXT("SKEL_"));
+		return Name;
+	}
+
+	//if (auto Property = dynamic_cast<const FProperty*>(&Object))
+	//{
+	//	return Property->GetAuthoredName();
+	//}
+
+	return Object.GetName();
+}
+
+
+static FString GetFieldFullGroupName(const FField& Object, bool bStartWithOuter)
+{
+	if (bStartWithOuter)
+	{
+		if (Object.Owner.IsValid())
+		{
+			if (Object.Owner.IsUObject())
+			{
+				return Object.Owner.ToUObject()->GetPathName(Object.Owner.ToUObject()->GetOutermost());
+			}
+			else
+			{
+				return Object.Owner.ToField()->GetPathName(Object.GetOutermost());
+			}
+		}
+		else
+		{
+			return FString();
+		}
+	}
+	else
+	{
+		return Object.GetPathName(Object.GetOutermost());
+	}
+}
+
+static void FormatNativeToolTip(const UField * Field, FString& ToolTipString, bool bRemoveExtraSections)
+{
+	// First do doxygen replace
+	static const FString DoxygenSee(TEXT("@see"));
+	static const FString TooltipSee(TEXT("See:"));
+	ToolTipString.ReplaceInline(*DoxygenSee, *TooltipSee);
+
+	bool bCurrentLineIsEmpty = true;
+	int32 EmptyLineCount = 0;
+	int32 LastContentIndex = INDEX_NONE;
+	const int32 ToolTipLength = ToolTipString.Len();
+
+	// Start looking for empty lines and whitespace to strip
+	for (int32 StrIndex = 0; StrIndex < ToolTipLength; StrIndex++)
+	{
+		TCHAR CurrentChar = ToolTipString[StrIndex];
+
+		if (!FChar::IsWhitespace(CurrentChar))
+		{
+			if (FChar::IsPunct(CurrentChar))
+			{
+				// Punctuation is considered content if it's on a line with alphanumeric text
+				if (!bCurrentLineIsEmpty)
+				{
+					LastContentIndex = StrIndex;
+				}
+			}
+			else
+			{
+				// This is something alphanumeric, this is always content and mark line as not empty
+				bCurrentLineIsEmpty = false;
+				LastContentIndex = StrIndex;
+			}
+		}
+		else if (CurrentChar == TEXT('\n'))
+		{
+			if (bCurrentLineIsEmpty)
+			{
+				EmptyLineCount++;
+				if (bRemoveExtraSections && EmptyLineCount >= 2)
+				{
+					// If we get two empty or punctuation/separator lines in a row, cut off the string if requested
+					break;
+				}
+			}
+			else
+			{
+				EmptyLineCount = 0;
+			}
+
+			bCurrentLineIsEmpty = true;
+		}
+	}
+
+	// Trim string to last content character, this strips trailing whitespace as well as extra sections if needed
+	if (LastContentIndex >= 0 && LastContentIndex != ToolTipLength - 1)
+	{
+		ToolTipString.RemoveAt(LastContentIndex + 1, ToolTipLength - (LastContentIndex + 1));
+	}
+}
+
+const FString* FRuntimeMetaData::FindMetaData(const FField* Field, const TCHAR* Key) 
+{
+	if (const FRuntimeMetadataField * MetadataField = FindField(Field))
+	{
+		return MetadataField->MetadataMap.Find(Key);
+	}
+	return nullptr;
+}
+const FString* FRuntimeMetaData::FindMetaData(const FField* Field, const FName& Key) 
+{
+	if (const FRuntimeMetadataField* MetadataField = FindField(Field))
+	{
+		return MetadataField->MetadataMap.Find(Key.ToString());
+	}
+	return nullptr;
+}
+const FString* FRuntimeMetaData::FindMetaData(const UField* Field, const TCHAR* Key) 
+{
+	if (const FRuntimeMetadataField* MetadataField = FindField(Field))
+	{
+		return MetadataField->MetadataMap.Find(Key);
+	}
+	return nullptr;
+}
+const FString* FRuntimeMetaData::FindMetaData(const UField* Field, const FName& Key) 
+{
+	if (const FRuntimeMetadataField* MetadataField = FindField(Field))
+	{
+		return MetadataField->MetadataMap.Find(Key.ToString());
+	}
+	return nullptr;
+}
+FText FRuntimeMetaData::GetDisplayNameText(const UField* Field)
+{
+	FText LocalizedDisplayName;
+
+	static const FString Namespace = TEXT("UObjectDisplayNames");
+	static const FName NAME_DisplayName(TEXT("DisplayName"));
+
+	const FString Key = Field->GetFullGroupName(false);
+
+	FString NativeDisplayName = GetMetaData(Field, NAME_DisplayName);
+	if (NativeDisplayName.IsEmpty())
+	{
+		NativeDisplayName = FName::NameToDisplayString(FRuntimeEditorUtils::GetDisplayNameHelper(*Field), false);
+	}
+
+	if (!(FText::FindText(Namespace, Key, /*OUT*/LocalizedDisplayName, &NativeDisplayName)))
+	{
+		LocalizedDisplayName = FText::FromString(NativeDisplayName);
+	}
+
+	return LocalizedDisplayName;
+}
+FText FRuntimeMetaData::GetToolTipText(const UField* Field, bool bShortTooltip)
+{
+	bool bFoundShortTooltip = false;
+	static const FName NAME_Tooltip(TEXT("Tooltip"));
+	static const FName NAME_ShortTooltip(TEXT("ShortTooltip"));
+	FText LocalizedToolTip;
+	FString NativeToolTip;
+
+	if (bShortTooltip)
+	{
+		NativeToolTip = GetMetaData(Field, NAME_ShortTooltip);
+		if (NativeToolTip.IsEmpty())
+		{
+			NativeToolTip = GetMetaData(Field, NAME_Tooltip);
+		}
+		else
+		{
+			bFoundShortTooltip = true;
+		}
+	}
+	else
+	{
+		NativeToolTip = GetMetaData(Field, NAME_Tooltip);
+	}
+
+	const FString Namespace = bFoundShortTooltip ? TEXT("UObjectShortTooltips") : TEXT("UObjectToolTips");
+	const FString Key = Field->GetFullGroupName(false);
+	if (!FText::FindText(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
+	{
+		if (NativeToolTip.IsEmpty())
+		{
+			NativeToolTip = FName::NameToDisplayString(GetFieldDisplayName(*Field), false);
+		}
+		else if (!bShortTooltip && Field->IsNative())
+		{
+			FormatNativeToolTip(Field, NativeToolTip, true);
+		}
+		LocalizedToolTip = FText::FromString(NativeToolTip);
+	}
+
+	return LocalizedToolTip;
+}
+bool FRuntimeMetaData::HasMetaData(const UField* Field, const TCHAR* Key)
+{
+	return TryGetMetaData(Field, Key) != nullptr;
+}
+const FString& FRuntimeMetaData::GetMetaData(const UField* Field, const TCHAR* Key)
+{
+	static FString EmptyString;
+	const FString * Ret = TryGetMetaData(Field, Key);
+	return Ret ? *Ret : EmptyString;
+}
+bool FRuntimeMetaData::HasMetaData(const UField* Field, const FName& Key)
+{
+	return TryGetMetaData(Field, *Key.ToString()) != nullptr;
+}
+const FString& FRuntimeMetaData::GetMetaData(const UField* Field, const FName& Key)
+{
+	static FString EmptyString;
+	const FString* Ret = TryGetMetaData(Field, *Key.ToString());
+	return Ret ? *Ret : EmptyString;
+}
+FText FRuntimeMetaData::GetDisplayNameText(const FField* Field)
+{
+	FText LocalizedDisplayName;
+
+	static const FString Namespace = TEXT("UObjectDisplayNames");
+	static const FName NAME_DisplayName(TEXT("DisplayName"));
+
+	const FString Key = Field->GetPathName(Field->GetOutermost()); //Field->GetFullGroupName(false);
+
+	FString NativeDisplayName;
+	if (const FString* FoundMetaData = FindMetaData(Field, NAME_DisplayName))
+	{
+		NativeDisplayName = *FoundMetaData;
+	}
+	else
+	{
+		NativeDisplayName = FName::NameToDisplayString(FRuntimeEditorUtils::GetDisplayNameHelper(*Field), Field->IsA<FBoolProperty>());
+	}
+
+	if (!(FText::FindText(Namespace, Key, /*OUT*/LocalizedDisplayName, &NativeDisplayName)))
+	{
+		LocalizedDisplayName = FText::FromString(NativeDisplayName);
+	}
+
+	return LocalizedDisplayName;
+}
+FText FRuntimeMetaData::GetToolTipText(const FField* Field, bool bShortTooltip)
+{
+	bool bFoundShortTooltip = false;
+	static const FName NAME_Tooltip(TEXT("Tooltip"));
+	static const FName NAME_ShortTooltip(TEXT("ShortTooltip"));
+	FText LocalizedToolTip;
+	FString NativeToolTip;
+
+	if (bShortTooltip)
+	{
+		NativeToolTip = GetMetaData(Field, NAME_ShortTooltip);
+		if (NativeToolTip.IsEmpty())
+		{
+			NativeToolTip = GetMetaData(Field, NAME_Tooltip);
+		}
+		else
+		{
+			bFoundShortTooltip = true;
+		}
+	}
+	else
+	{
+		NativeToolTip = GetMetaData(Field, NAME_Tooltip);
+	}
+
+	const FString Namespace = bFoundShortTooltip ? TEXT("UObjectShortTooltips") : TEXT("UObjectToolTips");
+	const FString Key = GetFieldFullGroupName(*Field, false);
+	if (!FText::FindText(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
+	{
+		if (!NativeToolTip.IsEmpty())
+		{
+			static const FString DoxygenSee(TEXT("@see"));
+			static const FString TooltipSee(TEXT("See:"));
+			if (NativeToolTip.ReplaceInline(*DoxygenSee, *TooltipSee) > 0)
+			{
+				NativeToolTip.TrimEndInline();
+			}
+		}
+		LocalizedToolTip = FText::FromString(NativeToolTip);
+	}
+
+	const FText DisplayName = FText::FromString(FName::NameToDisplayString(GetFieldDisplayName(*Field), Field->IsA<FBoolProperty>()));
+	if (LocalizedToolTip.IsEmpty())
+	{
+		LocalizedToolTip = DisplayName;
+	}
+	else
+	{
+		LocalizedToolTip = FText::Join(FText::FromString(TEXT(":" LINE_TERMINATOR_ANSI)), DisplayName, LocalizedToolTip);
+	}
+
+	return LocalizedToolTip;
+	
+
+}
+bool FRuntimeMetaData::HasMetaData(const FField* Field, const TCHAR* Key)
+{
+	return TryGetMetaData(Field, Key) != nullptr;
+}
+const FString& FRuntimeMetaData::GetMetaData(const FField* Field, const TCHAR* Key)
+{
+	static FString EmptyString;
+	const FString* Ret = TryGetMetaData(Field, Key);
+	return Ret ? *Ret : EmptyString;
+}
+bool FRuntimeMetaData::HasMetaData(const FField* Field, const FName& Key)
+{
+	return TryGetMetaData(Field, *Key.ToString()) != nullptr;
+}
+const FString& FRuntimeMetaData::GetMetaData(const FField* Field, const FName& Key)
+{
+	static FString EmptyString;
+	const FString* Ret = TryGetMetaData(Field, *Key.ToString());
+	return Ret ? *Ret : EmptyString;
+}
+bool FRuntimeMetaData::GetBoolMetaData(const UField* Field, const TCHAR* Key)
+{
+	if (const FString* BoolString = TryGetMetaData(Field, Key))
+	{
+		return (BoolString->IsEmpty() || *BoolString == "true");
+	}
+	return false;
+
+}
+bool FRuntimeMetaData::GetBoolMetaData(const UField* Field, const FName& Key)
+{
+	if (const FString* BoolString = TryGetMetaData(Field, *Key.ToString()))
+	{
+		return (BoolString->IsEmpty() || *BoolString == "true");
+	}
+	return false;
+}
+bool FRuntimeMetaData::GetBoolMetaData(const FField* Field, const TCHAR* Key)
+{
+	if (const FString* BoolString = TryGetMetaData(Field, Key))
+	{
+		return (BoolString->IsEmpty() || *BoolString == "true");
+	}
+	return false;
+}
+bool FRuntimeMetaData::GetBoolMetaData(const FField* Field, const FName& Key)
+{
+	if (const FString* BoolString = TryGetMetaData(Field, *Key.ToString()))
+	{
+		return (BoolString->IsEmpty() || *BoolString == "true");
+	}
+	return false;
+}
+UClass* FRuntimeMetaData::GetClassMetaData(const FField* Field, const TCHAR* Key)
+{
+	const FString& ClassName = GetMetaData(Field, Key);
+	UClass* const FoundObject = UClass::TryFindTypeSlow<UClass>(*ClassName, EFindFirstObjectOptions::ExactClass);
+	return FoundObject;
+}
+UClass* FRuntimeMetaData::GetClassMetaData(const FField* Field, const FName& Key)
+{
+	const FString& ClassName = GetMetaData(Field, Key);
+	UClass* const FoundObject = UClass::TryFindTypeSlow<UClass>(*ClassName, EFindFirstObjectOptions::ExactClass);
+	return FoundObject;
+}
+float FRuntimeMetaData::GetFloatMetaData(const FField* Field, const TCHAR* Key)
+{
+	const FString& FLOATString = GetMetaData(Field, Key);
+	float Value = FCString::Atof(*FLOATString);
+	return Value;
+}
+float FRuntimeMetaData::GetFloatMetaData(const FField* Field, const FName& Key)
+{
+	const FString& FLOATString = GetMetaData(Field, Key);
+	float Value = FCString::Atof(*FLOATString);
+	return Value;
+}
+int32 FRuntimeMetaData::GetIntMetaData(const FField* Field, const TCHAR* Key)
+{
+	const FString& INTString = (const FString&)GetMetaData(Field, Key);
+	int32 Value = FCString::Atoi(*INTString);
+	return Value;
+}
+int32 FRuntimeMetaData::GetIntMetaData(const FField* Field, const FName& Key)
+{
+	const FString& INTString = GetMetaData(Field, Key);
+	int32 Value = FCString::Atoi(*INTString);
+	return Value;
+}
+bool FRuntimeMetaData::IsAutoExpandCategory(const UClass * Class, const TCHAR* InCategory)
+{
+	static const FName NAME_AutoExpandCategories(TEXT("AutoExpandCategories"));
+	if (const FString* AutoExpandCategories = FindMetaData(Class, NAME_AutoExpandCategories))
+	{
+		return !!FCString::StrfindDelim(**AutoExpandCategories, InCategory, TEXT(" "));
+	}
+	return false;
+}
+bool FRuntimeMetaData::IsAutoCollapseCategory(const UClass* Class, const TCHAR* InCategory)
+{
+	static const FName NAME_AutoCollapseCategories(TEXT("AutoCollapseCategories"));
+	if (const FString* AutoCollapseCategories = FindMetaData(Class, NAME_AutoCollapseCategories))
+	{
+		return !!FCString::StrfindDelim(**AutoCollapseCategories, InCategory, TEXT(" "));
+	}
+	return false;
+}
+bool FRuntimeMetaData::HasMetaData(const UEnum* Enum, const TCHAR* Key, int32 NameIndex)
+{
+	bool bResult = false;
+
+	//UPackage* Package = GetOutermost();
+	//check(Package);
+
+	//UMetaData* MetaData = Package->GetMetaData();
+	//check(MetaData);
+
+	FString KeyString;
+
+	// If an index was specified, search for metadata linked to a specified value
+	if (NameIndex != INDEX_NONE)
+	{
+		KeyString = Enum->GetNameStringByIndex(NameIndex);
+		KeyString.AppendChar(TEXT('.'));
+		KeyString.Append(Key);
+	}
+	// If no index was specified, search for metadata for the enum itself
+	else
+	{
+		KeyString = Key;
+	}
+	//bResult = MetaData->HasValue(this, *KeyString);
+	bResult = HasMetaData(static_cast<const UField*>(Enum), *KeyString);
+
+	return bResult;
+}
+FString FRuntimeMetaData::GetMetaData(const UEnum* Enum, const TCHAR* Key, int32 NameIndex, bool bAllowRemap)
+{
+	//UPackage* Package = GetOutermost();
+	//check(Package);
+
+	//UMetaData* MetaData = Package->GetMetaData();
+	//check(MetaData);
+
+	FString KeyString;
+
+	// If an index was specified, search for metadata linked to a specified value
+	if (NameIndex != INDEX_NONE)
+	{
+		check(Enum->NumEnums() > NameIndex);
+		KeyString = Enum->GetNameStringByIndex(NameIndex) + TEXT(".") + Key;
+	}
+	// If no index was specified, search for metadata for the enum itself
+	else
+	{
+		KeyString = Key;
+	}
+
+	//FString ResultString = MetaData->GetValue(this, *KeyString);
+	FString ResultString = GetMetaData(static_cast<const UField*>(Enum), *KeyString);
+
+	// look in the engine ini, in a section named after the metadata key we are looking for, and the enum's name (KeyString)
+	/*
+	if (bAllowRemap && ResultString.StartsWith(TEXT("ini:")))
+	{
+		if (!GConfig->GetString(TEXT("EnumRemap"), *KeyString, ResultString, GEngineIni))
+		{
+			// if this fails, then use what's after the ini:
+			ResultString.MidInline(4, MAX_int32, false);
+		}
+	}
+	*/
+
+	return ResultString;
+}
+FText FRuntimeMetaData::GetToolTipTextByIndex(const UEnum* Enum, int32 NameIndex)
+{
+	FText LocalizedToolTip;
+	FString NativeToolTip = GetMetaData(Enum, TEXT("ToolTip"), NameIndex);
+
+	static const FString Namespace = TEXT("UObjectToolTips");
+
+	FString Key = Enum->GetPathName(Enum->GetOutermost()) + TEXT(".") + Enum->GetNameStringByIndex(NameIndex);
+
+	if (!FText::FindText(Namespace, Key, /*OUT*/LocalizedToolTip, &NativeToolTip))
+	{
+		static const FString DoxygenSee(TEXT("@see"));
+		static const FString TooltipSee(TEXT("See:"));
+		if (NativeToolTip.ReplaceInline(*DoxygenSee, *TooltipSee) > 0)
+		{
+			NativeToolTip.TrimEndInline();
+		}
+
+		LocalizedToolTip = FText::FromString(NativeToolTip);
+	}
+
+	return LocalizedToolTip;
+}
+FText FRuntimeMetaData::GetDisplayNameTextByIndex(const UEnum* Enum, int32 NameIndex)
+{
+	FString RawName = Enum->GetNameStringByIndex(NameIndex);
+
+	if (RawName.IsEmpty())
+	{
+		return FText::GetEmpty();
+	}
+
+	//FText LocalizedDisplayName;
+	// In the editor, use metadata and localization to look up names
+	//static const FString Namespace = TEXT("UObjectDisplayNames");
+	//const FString Key = GetFullGroupName(false) + TEXT(".") + RawName;
+
+	//FString NativeDisplayName;
+	//if (HasMetaData(Enum, TEXT("DisplayName"), NameIndex))
+	//{
+	//	NativeDisplayName = GetMetaData(Enum, TEXT("DisplayName"), NameIndex);
+	//}
+	//else
+	//{
+	//	NativeDisplayName = FName::NameToDisplayString(RawName, false);
+	//}
+
+	//if (!(FText::FindText(Namespace, Key, /*OUT*/LocalizedDisplayName, &NativeDisplayName)))
+	//{
+	//	LocalizedDisplayName = FText::FromString(NativeDisplayName);
+	//}
+
+	//if (!LocalizedDisplayName.IsEmpty())
+	//{
+	//	return LocalizedDisplayName;
+	//}
+
+	//if (EnumDisplayNameFn)
+	//{
+	//	return (*EnumDisplayNameFn)(NameIndex);
+	//}
+
+	return FText::FromString(Enum->GetNameStringByIndex(NameIndex));
+}
+
+#endif // RUNTIME_METADATA_DEBUG
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimeMetaDataStatic.cpp b/Source/RuntimeEditor/Private/RuntimeMetaDataStatic.cpp
new file mode 100644
index 0000000..82d7d4d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimeMetaDataStatic.cpp
@@ -0,0 +1,39 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimeMetaDataStatic.h"
+
+void URuntimeMetaDataStatic::MakeRuntimeMetadataProperties(const FString& CategoryName, const TMap<FString, FRuntimeMetadataPropertyBuilder>& In, FRuntimeMetadataObject& Out)
+{
+	for (auto& It : In)
+	{
+		FRuntimeMetadataField & MetadataField = Out.Fields.FindOrAdd(It.Key);
+		MetadataField.DisplayName = It.Value.DisplayName;
+		//MetadataField.ToolTip = It.Value.ToolTip;
+		MetadataField.MetadataMap.Add("Category", CategoryName);
+		MetadataField.MetadataMap.Add("EditInRuntime", "");
+		if (It.Value.bIsInitialize)
+		{
+			//MetadataField.MetadataMap.Add("ReactivateComponent");
+		}
+	}
+}
+
+void URuntimeMetaDataStatic::MakeRuntimeMetadataButtons(const FString& CategoryName, const TMap<FString, FRuntimeMetadataButtonBuilder>& In, FRuntimeMetadataObject& Out)
+{
+	for (auto& It : In)
+	{
+		FRuntimeMetadataField& MetadataField = Out.Fields.FindOrAdd(It.Key);
+		MetadataField.DisplayName = It.Value.DisplayName;
+		//MetadataField.ToolTip = It.Value.ToolTip;
+		MetadataField.MetadataMap.Add("Category", CategoryName);
+		MetadataField.MetadataMap.Add("CallInRuntime", "");
+	}
+}
+
+void URuntimeMetaDataStatic::MergeRuntimeMetadata(const TArray<FRuntimeMetadataObject>& In, FRuntimeMetadataObject& Out)
+{
+	for (auto& It : In)
+	{
+		Out.Fields.Append(It.Fields);
+	}
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/CategoryPropertyNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CategoryPropertyNode.cpp
new file mode 100644
index 0000000..31e666d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CategoryPropertyNode.cpp
@@ -0,0 +1,173 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "Misc/ConfigCacheIni.h"
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+//#include "ObjectEditorUtils.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+
+#include "RuntimeEditorUtils.h"
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+
+FCategoryPropertyNode::FCategoryPropertyNode(void)
+	: FPropertyNode()
+{
+}
+
+FCategoryPropertyNode::~FCategoryPropertyNode(void)
+{
+}
+
+bool FCategoryPropertyNode::IsSubcategory() const
+{
+	return GetParentNode() != nullptr && GetParentNode()->AsCategoryNode() != nullptr;
+}
+
+FText FCategoryPropertyNode::GetDisplayName() const 
+{
+	FString SubcategoryName = GetSubcategoryName();
+	return FText::FromString( SubcategoryName );
+}	
+/**
+ * Overridden function for special setup
+ */
+void FCategoryPropertyNode::InitBeforeNodeFlags()
+{
+
+}
+/**
+ * Overridden function for Creating Child Nodes
+ */
+void FCategoryPropertyNode::InitChildNodes()
+{
+	const bool bShowHiddenProperties = !!HasNodeFlags( EPropertyNodeFlags::ShouldShowHiddenProperties );
+	const bool bShouldShowDisableEditOnInstance = !!HasNodeFlags(EPropertyNodeFlags::ShouldShowDisableEditOnInstance);
+	const bool bGameModeOnlyVisible = !!HasNodeFlags(EPropertyNodeFlags::GameModeOnlyVisible);
+
+	TArray<FProperty*> Properties;
+	TSet<FProperty*> SparseProperties;
+	// The parent of a category window has to be an object window.
+	FComplexPropertyNode* ComplexNode = FindComplexParent();
+	if (ComplexNode)
+	{
+		FObjectPropertyNode* ObjectNode = FindObjectItemParent();
+		
+		// Get a list of properties that are in the same category
+		for (const UStruct* Structure : ComplexNode->GetAllStructures())
+		{
+			const bool bIsSparseStruct = (ObjectNode && ObjectNode->IsSparseDataStruct(Cast<const UScriptStruct>(Structure)));
+			for (TFieldIterator<FProperty> It(Structure); It; ++It)
+			{
+				bool bMetaDataAllowVisible = true;
+				if (!bShowHiddenProperties)
+				{
+					static const FName Name_bShowOnlyWhenTrue("bShowOnlyWhenTrue");
+					const FString& MetaDataVisibilityCheckString = FRuntimeMetaData::GetMetaData(*It, Name_bShowOnlyWhenTrue);
+					if (MetaDataVisibilityCheckString.Len())
+					{
+						//ensure that the metadata visibility string is actually set to true in order to show this property
+						// @todo Remove this
+						GConfig->GetBool(TEXT("UnrealEd.PropertyFilters"), *MetaDataVisibilityCheckString, bMetaDataAllowVisible, GEditorPerProjectIni);
+					}
+				}
+
+				if (bMetaDataAllowVisible)
+				{
+					// Add if we are showing non-editable props and this is the 'None' category, 
+					// or if this is the right category, and we are showing non-editable
+					if (FRuntimeEditorUtils::GetCategoryFName(*It) == CategoryName && PropertyEditorHelpers::ShouldBeVisible(*this, *It))
+					{
+						if (bIsSparseStruct)
+						{
+							SparseProperties.Add(*It);
+						}
+
+						Properties.Add(*It);
+					}
+				}
+			}
+		}
+	}
+
+	PropertyEditorHelpers::OrderPropertiesFromMetadata(Properties);
+
+	for( int32 PropertyIndex = 0 ; PropertyIndex < Properties.Num() ; ++PropertyIndex )
+	{
+		TSharedPtr<FItemPropertyNode> NewItemNode( new FItemPropertyNode );
+
+		FPropertyNodeInitParams InitParams;
+		InitParams.ParentNode = SharedThis(this);
+		InitParams.Property = Properties[PropertyIndex];
+		InitParams.ArrayOffset = 0;
+		InitParams.ArrayIndex = INDEX_NONE;
+		InitParams.bAllowChildren = true;
+		InitParams.bForceHiddenPropertyVisibility = bShowHiddenProperties;
+		InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+		InitParams.IsSparseProperty = SparseProperties.Contains(Properties[PropertyIndex]) ? FPropertyNodeInitParams::EIsSparseDataProperty::True : FPropertyNodeInitParams::EIsSparseDataProperty::Inherit;
+		InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+		NewItemNode->InitNode( InitParams );
+
+		AddChildNode(NewItemNode);
+	}
+}
+
+
+/**
+ * Appends my path, including an array index (where appropriate)
+ */
+bool FCategoryPropertyNode::GetQualifiedName( FString& PathPlusIndex, const bool bWithArrayIndex, const FPropertyNode* StopParent, bool bIgnoreCategories ) const
+{
+	bool bAddedAnything = false;
+
+	const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (ParentNode && StopParent != ParentNode.Get())
+	{
+		bAddedAnything = ParentNode->GetQualifiedName(PathPlusIndex, bWithArrayIndex, StopParent, bIgnoreCategories );
+	}
+	
+	if (!bIgnoreCategories)
+	{
+		if (bAddedAnything)
+		{
+			PathPlusIndex += TEXT(".");
+		}
+
+		GetCategoryName().AppendString(PathPlusIndex);
+		bAddedAnything = true;
+	}
+
+	return bAddedAnything;
+}
+
+FString FCategoryPropertyNode::GetSubcategoryName() const 
+{
+	FString SubcategoryName;
+	{
+		// The category name may actually contain a path of categories.  When displaying this category
+		// in the property window, we only want the leaf part of the path
+		const FString& CategoryPath = GetCategoryName().ToString();
+		FString CategoryDelimiterString;
+		CategoryDelimiterString.AppendChar( FPropertyNodeConstants::CategoryDelimiterChar );  
+		const int32 LastDelimiterCharIndex = CategoryPath.Find( CategoryDelimiterString, ESearchCase::IgnoreCase, ESearchDir::FromEnd );
+		if( LastDelimiterCharIndex != INDEX_NONE )
+		{
+			// Grab the last sub-category from the path
+			SubcategoryName = CategoryPath.Mid( LastDelimiterCharIndex + 1 );
+		}
+		else
+		{
+			// No sub-categories, so just return the original (clean) category path
+			SubcategoryName = CategoryPath;
+		}
+	}
+	return SubcategoryName;
+}
+
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/CategoryPropertyNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CategoryPropertyNode.h
new file mode 100644
index 0000000..0255655
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CategoryPropertyNode.h
@@ -0,0 +1,61 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+
+namespace soda
+{
+
+class FCategoryPropertyNode : public FPropertyNode
+{
+public:
+	FCategoryPropertyNode();
+	virtual ~FCategoryPropertyNode();
+
+	/**
+	 * Overridden function to get the derived object node
+	 */
+	virtual FCategoryPropertyNode* AsCategoryNode() override { return this; }
+	virtual const FCategoryPropertyNode* AsCategoryNode() const override { return this; }
+
+	/**
+	 * Accessor functions for getting a category name
+	 */
+	void SetCategoryName(const FName& InCategoryName) { CategoryName = InCategoryName; }
+	const FName& GetCategoryName(void) const { return CategoryName; }
+
+	/**
+	 * Checks to see if this category is a 'sub-category'
+	 *
+	 * @return	True if this category node is a sub-category, otherwise false
+	 */
+	bool IsSubcategory() const;
+
+	virtual FText GetDisplayName() const override;
+
+protected:
+	/**
+	 * Overridden function for special setup
+	 */
+	virtual void InitBeforeNodeFlags() override;
+	/**
+	 * Overridden function for Creating Child Nodes
+	 */
+	virtual void InitChildNodes() override;
+
+	/**
+	 * Appends my path, including an array index (where appropriate)
+	 */
+	virtual bool GetQualifiedName( FString& PathPlusIndex, const bool bWithArrayIndex, const FPropertyNode* StopParent = nullptr, bool bIgnoreCategories = false ) const override;
+
+	FString GetSubcategoryName() const;
+	/**
+	 * Stored category name for the window
+	 */
+	FName CategoryName;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/CustomChildBuilder.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CustomChildBuilder.cpp
new file mode 100644
index 0000000..c51c1a6
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CustomChildBuilder.cpp
@@ -0,0 +1,199 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/CustomChildBuilder.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/DetailGroup.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+
+namespace soda
+{
+
+IDetailChildrenBuilder& FCustomChildrenBuilder::AddCustomBuilder( TSharedRef<class IDetailCustomNodeBuilder> InCustomBuilder )
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.CustomBuilderRow = MakeShareable( new FDetailCustomBuilderRow( InCustomBuilder ) );
+
+	ChildCustomizations.Add( NewCustomization );
+	return *this;
+}
+
+IDetailGroup& FCustomChildrenBuilder::AddGroup( FName GroupName, const FText& LocalizedDisplayName )
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.DetailGroup = MakeShareable( new FDetailGroup( GroupName, ParentCategory.Pin().ToSharedRef(), LocalizedDisplayName ) );
+
+	ChildCustomizations.Add( NewCustomization );
+
+	return *NewCustomization.DetailGroup;
+}
+
+FDetailWidgetRow& FCustomChildrenBuilder::AddCustomRow( const FText& SearchString )
+{
+	TSharedRef<FDetailWidgetRow> NewRow = MakeShareable( new FDetailWidgetRow );
+	FDetailLayoutCustomization NewCustomization;
+
+	NewRow->FilterString( SearchString );
+	NewCustomization.WidgetDecl = NewRow;
+
+	ChildCustomizations.Add( NewCustomization );
+	return *NewRow;
+}
+
+IDetailPropertyRow& FCustomChildrenBuilder::AddProperty( TSharedRef<IPropertyHandle> PropertyHandle )
+{
+	check( PropertyHandle->IsValidHandle() )
+
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.PropertyRow = MakeShareable( new FDetailPropertyRow( StaticCastSharedRef<FPropertyHandleBase>( PropertyHandle )->GetPropertyNode(), ParentCategory.Pin().ToSharedRef() ) );
+
+	if (CustomResetChildToDefault.IsSet())
+	{
+		NewCustomization.PropertyRow->OverrideResetToDefault(CustomResetChildToDefault.GetValue());
+	}
+
+	ChildCustomizations.Add( NewCustomization );
+
+	return *NewCustomization.PropertyRow;
+}
+
+
+IDetailPropertyRow* FCustomChildrenBuilder::AddExternalStructure(TSharedRef<FStructOnScope> ChildStructure, FName UniqueIdName)
+{
+	return AddExternalStructureProperty(ChildStructure, NAME_None, FAddPropertyParams().UniqueId(UniqueIdName));
+}
+
+IDetailPropertyRow* FCustomChildrenBuilder::AddExternalStructureProperty(TSharedRef<FStructOnScope> ChildStructure, FName PropertyName, const FAddPropertyParams& Params)
+{
+	FDetailLayoutCustomization NewCustomization;
+
+	TSharedRef<FDetailCategoryImpl> ParentCategoryRef = ParentCategory.Pin().ToSharedRef();
+
+	FDetailPropertyRow::MakeExternalPropertyRowCustomization(ChildStructure, PropertyName, ParentCategoryRef, NewCustomization, Params);
+
+	TSharedPtr<FDetailPropertyRow> NewRow = NewCustomization.PropertyRow;
+
+	if (NewRow.IsValid())
+	{
+		NewRow->SetCustomExpansionId(Params.GetUniqueId());
+
+		TSharedPtr<FPropertyNode> PropertyNode = NewRow->GetPropertyNode();
+		TSharedPtr<FComplexPropertyNode> RootNode = StaticCastSharedRef<FComplexPropertyNode>(PropertyNode->FindComplexParent()->AsShared());
+
+		ChildCustomizations.Add(NewCustomization);
+	}
+
+	return NewRow.Get();
+}
+
+IDetailPropertyRow* FCustomChildrenBuilder::AddExternalObjects(const TArray<UObject *>& Objects, FName UniqueIdName)
+{
+	return AddExternalObjectProperty(Objects, NAME_None, FAddPropertyParams().UniqueId(UniqueIdName));
+}
+
+TArray<TSharedPtr<IPropertyHandle>> FCustomChildrenBuilder::AddAllExternalStructureProperties(TSharedRef<FStructOnScope> ChildStructure)
+{
+	return ParentCategory.Pin()->AddAllExternalStructureProperties(ChildStructure);
+}
+
+IDetailPropertyRow* FCustomChildrenBuilder::AddExternalObjectProperty(const TArray<UObject*>& Objects, FName PropertyName, const FAddPropertyParams& Params)
+{
+	FDetailLayoutCustomization NewCustomization;
+
+	TSharedRef<FDetailCategoryImpl> ParentCategoryRef = ParentCategory.Pin().ToSharedRef();
+
+	FDetailPropertyRow::MakeExternalPropertyRowCustomization(Objects, PropertyName, ParentCategoryRef, NewCustomization, Params);
+
+	TSharedPtr<FDetailPropertyRow> NewRow = NewCustomization.PropertyRow;
+
+	if (NewRow.IsValid())
+	{
+		NewRow->SetCustomExpansionId(Params.GetUniqueId());
+
+		TSharedPtr<FPropertyNode> PropertyNode = NewRow->GetPropertyNode();
+		TSharedPtr<FObjectPropertyNode> RootNode = StaticCastSharedRef<FObjectPropertyNode>(PropertyNode->FindObjectItemParent()->AsShared());
+
+		ChildCustomizations.Add(NewCustomization);
+	}
+
+	return NewRow.Get();
+}
+
+class SStandaloneCustomStructValue : public SCompoundWidget, public IPropertyTypeCustomizationUtils
+{
+public:
+	SLATE_BEGIN_ARGS( SStandaloneCustomStructValue )
+	{}
+	SLATE_END_ARGS()
+	
+	void Construct( const FArguments& InArgs, TSharedPtr<IPropertyTypeCustomization> InCustomizationInterface, TSharedRef<IPropertyHandle> InStructPropertyHandle, TSharedRef<FDetailCategoryImpl> InParentCategory )
+	{
+		CustomizationInterface = InCustomizationInterface;
+		StructPropertyHandle = InStructPropertyHandle;
+		ParentCategory = InParentCategory;
+		CustomPropertyWidget = MakeShareable(new FDetailWidgetRow);
+
+		CustomizationInterface->CustomizeHeader(InStructPropertyHandle, *CustomPropertyWidget, *this);
+
+		ChildSlot
+		[
+			CustomPropertyWidget->ValueWidget.Widget
+		];
+	}
+	/*
+	virtual TSharedPtr<FAssetThumbnailPool> GetThumbnailPool() const override
+	{
+		TSharedPtr<FDetailCategoryImpl> ParentCategoryPinned = ParentCategory.Pin();
+		return ParentCategoryPinned.IsValid() ? ParentCategoryPinned->GetParentLayout().GetThumbnailPool() : NULL;
+	}
+	*/
+
+private:
+	TWeakPtr<FDetailCategoryImpl> ParentCategory;
+	TSharedPtr<IPropertyTypeCustomization> CustomizationInterface;
+	TSharedPtr<IPropertyHandle> StructPropertyHandle;
+	TSharedPtr<FDetailWidgetRow> CustomPropertyWidget;
+};
+
+
+TSharedRef<SWidget> FCustomChildrenBuilder::GenerateStructValueWidget( TSharedRef<IPropertyHandle> StructPropertyHandle )
+{
+	FStructProperty* StructProperty = CastFieldChecked<FStructProperty>( StructPropertyHandle->GetProperty() );
+
+	FRuntimeEditorModule& PropertyEditorModule = FModuleManager::GetModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+	
+	IDetailsViewPrivate* DetailsView = ParentCategory.Pin()->GetDetailsView();
+
+	FPropertyTypeLayoutCallback LayoutCallback = PropertyEditorModule.GetPropertyTypeCustomization(StructProperty, *StructPropertyHandle, DetailsView ? DetailsView->GetCustomPropertyTypeLayoutMap() : FCustomPropertyTypeLayoutMap() );
+	if (LayoutCallback.IsValid())
+	{
+		TSharedRef<IPropertyTypeCustomization> CustomStructInterface = LayoutCallback.GetCustomizationInstance();
+
+		return SNew( SStandaloneCustomStructValue, CustomStructInterface, StructPropertyHandle, ParentCategory.Pin().ToSharedRef() );
+	}
+	else
+	{
+		// Uncustomized structs have nothing for their value content
+		return SNullWidget::NullWidget;
+	}
+}
+
+IDetailCategoryBuilder& FCustomChildrenBuilder::GetParentCategory() const
+{
+	return *ParentCategory.Pin();
+}
+
+FCustomChildrenBuilder& FCustomChildrenBuilder::OverrideResetChildrenToDefault(const FResetToDefaultOverride& ResetToDefault)
+{
+	CustomResetChildToDefault = ResetToDefault;
+	return *this;
+}
+
+IDetailGroup* FCustomChildrenBuilder::GetParentGroup() const
+{
+	return ParentGroup.IsValid() ? ParentGroup.Pin().Get() : nullptr;
+}
+
+}
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/CustomChildBuilder.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CustomChildBuilder.h
new file mode 100644
index 0000000..207869f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/CustomChildBuilder.h
@@ -0,0 +1,55 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "UObject/StructOnScope.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/IDetailChildrenBuilder.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+
+namespace soda
+{
+
+class IDetailGroup;
+class IDetailCustomNodeBuilder;
+
+class FCustomChildrenBuilder : public IDetailChildrenBuilder
+{
+public:
+	FCustomChildrenBuilder(TSharedRef<FDetailCategoryImpl> InParentCategory, TSharedPtr<IDetailGroup> InParentGroup = nullptr)
+		: ParentCategory(InParentCategory)
+		, ParentGroup(InParentGroup)
+	{}
+
+	virtual IDetailChildrenBuilder& AddCustomBuilder(TSharedRef<IDetailCustomNodeBuilder> InCustomBuilder) override;
+	virtual IDetailGroup& AddGroup(FName GroupName, const FText& LocalizedDisplayName) override;
+	virtual FDetailWidgetRow& AddCustomRow(const FText& SearchString) override;
+	virtual IDetailPropertyRow& AddProperty(TSharedRef<IPropertyHandle> PropertyHandle) override;
+	virtual IDetailPropertyRow* AddExternalObjects(const TArray<UObject*>& Objects, FName UniqueIdName = NAME_None) override;
+	virtual IDetailPropertyRow* AddExternalObjectProperty(const TArray<UObject*>& Objects, FName PropertyName, const FAddPropertyParams& Params) override;
+	virtual IDetailPropertyRow* AddExternalStructure(TSharedRef<FStructOnScope> ChildStructure, FName UniqueIdName = NAME_None) override;
+	virtual IDetailPropertyRow* AddExternalStructureProperty(TSharedRef<FStructOnScope> ChildStructure, FName PropertyName, const FAddPropertyParams& Params) override;
+	virtual TArray<TSharedPtr<IPropertyHandle>> AddAllExternalStructureProperties(TSharedRef<FStructOnScope> ChildStructure) override;
+	virtual TSharedRef<SWidget> GenerateStructValueWidget(TSharedRef<IPropertyHandle> StructPropertyHandle) override;
+	virtual IDetailCategoryBuilder& GetParentCategory() const override;
+	virtual IDetailGroup* GetParentGroup() const override;
+
+	const TArray< FDetailLayoutCustomization >& GetChildCustomizations() const { return ChildCustomizations; }
+
+	/** Set the user customized reset to default for the children of this builder */
+	FCustomChildrenBuilder& OverrideResetChildrenToDefault(const FResetToDefaultOverride& ResetToDefault);
+
+private:
+	TArray< FDetailLayoutCustomization > ChildCustomizations;
+	TWeakPtr<FDetailCategoryImpl> ParentCategory;
+	TWeakPtr<IDetailGroup> ParentGroup;
+
+	/** User customized reset to default on children */
+	TOptional<FResetToDefaultOverride> CustomResetChildToDefault;
+};
+
+}
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailAdvancedDropdownNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailAdvancedDropdownNode.cpp
new file mode 100644
index 0000000..8247381
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailAdvancedDropdownNode.cpp
@@ -0,0 +1,247 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "DetailAdvancedDropdownNode.h"
+
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/SDetailRowIndent.h"
+#include "RuntimePropertyEditor/SDetailTableRowBase.h"
+#include "Styling/StyleColors.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+#include "AssetRegistry/AssetData.h"
+
+namespace soda
+{
+
+class SAdvancedDropdownRow : public SDetailTableRowBase
+{
+public:
+	SLATE_BEGIN_ARGS(SAdvancedDropdownRow)
+		: _IsExpanded(false)
+		, _IsButtonEnabled(true)
+		, _IsVisible(true)
+	{}
+		SLATE_ATTRIBUTE(bool, IsExpanded)
+		SLATE_ATTRIBUTE(bool, IsButtonEnabled)
+		SLATE_ATTRIBUTE(bool, IsVisible)
+		SLATE_EVENT(FOnClicked, OnClicked)
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct the widget
+	 *
+	 * @param InArgs   A declaration from which to construct the widget
+	 */
+	void Construct( const FArguments& InArgs, IDetailsViewPrivate* InDetailsView, const TSharedRef<STableViewBase>& InOwnerTableView)
+	{
+		IsExpanded = InArgs._IsExpanded;
+		DetailsView = InDetailsView;
+		OnClicked = InArgs._OnClicked;
+
+		TAttribute<bool> IsVisibleBool = InArgs._IsVisible;
+		TAttribute<EVisibility> IsVisible = TAttribute<EVisibility>::CreateLambda([IsVisibleBool]() { return IsVisibleBool.Get(true) ? EVisibility::Visible : EVisibility::Collapsed; });
+
+		TSharedPtr<SWidget> ContentWidget = SNew(SHorizontalBox)
+		.Visibility(IsVisible)
+		+ SHorizontalBox::Slot()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Fill)
+		.AutoWidth()
+		[
+			SNew(SDetailRowIndent, SharedThis(this))
+		]
+		+ SHorizontalBox::Slot()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		.Padding(2, 0, 0, 0)
+		.AutoWidth()
+		[
+			SAssignNew(ExpanderButton, SButton)
+			.ButtonStyle(FCoreStyle::Get(), "NoBorder")
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			.ClickMethod(EButtonClickMethod::MouseDown)
+			.OnClicked(InArgs._OnClicked)
+			.IsEnabled(InArgs._IsButtonEnabled)
+			.ContentPadding(0)
+			.IsFocusable(false)
+			.ToolTipText(this, &SAdvancedDropdownRow::GetAdvancedPulldownToolTipText )
+			[
+				SNew(SImage)
+				.Image(this, &SAdvancedDropdownRow::GetExpanderImage)
+				.ColorAndOpacity(FSlateColor::UseSubduedForeground())
+			]
+		]
+		+ SHorizontalBox::Slot()
+		.VAlign(VAlign_Center)
+		.HAlign(HAlign_Fill)
+		.Padding(4, 0, 0, 0)
+		[
+			SNew(SBox)
+			.VAlign(VAlign_Center)
+			.HeightOverride(PropertyEditorConstants::PropertyRowHeight)
+			[
+				SNew(STextBlock)
+				.Text(NSLOCTEXT("PropertyEditor", "Advanced", "Advanced"))
+				.Font(FSodaStyle::Get().GetFontStyle(PropertyEditorConstants::PropertyFontStyle))
+				.TextStyle(FSodaStyle::Get(), "DetailsView.CategoryTextStyle")
+			]
+		];
+
+		TWeakPtr<STableViewBase> OwnerTableViewWeak = InOwnerTableView;
+		auto GetScrollbarWellBrush = [this, OwnerTableViewWeak]()
+		{
+			return SDetailTableRowBase::IsScrollBarVisible(OwnerTableViewWeak) ?
+				FSodaStyle::Get().GetBrush("DetailsView.GridLine") :
+				FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle");
+		};
+
+		auto GetScrollbarWellTint = [this, OwnerTableViewWeak]()
+		{
+			return SDetailTableRowBase::IsScrollBarVisible(OwnerTableViewWeak) ?
+				FStyleColors::White : 
+				this->GetRowBackgroundColor();
+		};
+
+		ChildSlot
+		[
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.GridLine"))
+			.Padding(FMargin(0, 0, 0, 1))
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Fill)
+				[
+					SNew(SBorder)
+					.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle"))
+					.BorderBackgroundColor(this, &SAdvancedDropdownRow::GetRowBackgroundColor)
+					.Padding(0)
+					[
+						ContentWidget.ToSharedRef()
+					]
+				]
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Right)
+				.VAlign(VAlign_Fill)
+				.AutoWidth()
+				[
+					SNew(SBorder)
+					.BorderImage_Lambda(GetScrollbarWellBrush)
+					.BorderBackgroundColor_Lambda(GetScrollbarWellTint)
+					.Padding(FMargin(0, 0, SDetailTableRowBase::ScrollBarPadding, 0))
+				]
+			]
+		];
+
+		STableRow< TSharedPtr< FDetailTreeNode > >::ConstructInternal(
+			STableRow::FArguments()
+				.Style(FSodaStyle::Get(), "DetailsView.TreeView.TableRow")
+				.ShowSelection(false),
+			InOwnerTableView
+		);	
+	}
+
+private:
+
+	FText GetAdvancedPulldownToolTipText() const
+	{
+		return IsExpanded.Get() ? NSLOCTEXT("DetailsView", "HideAdvanced", "Hide Advanced") : NSLOCTEXT("DetailsView", "ShowAdvanced", "Show Advanced");
+	}
+
+	const FSlateBrush* GetExpanderImage() const
+	{
+		const bool bIsItemExpanded = IsExpanded.Get();
+
+		FName ResourceName;
+		if (bIsItemExpanded)
+		{
+			if (ExpanderButton->IsHovered())
+			{
+				static const FName ExpandedHoveredName = "TreeArrow_Expanded_Hovered";
+				ResourceName = ExpandedHoveredName;
+			}
+			else
+			{
+				static const FName ExpandedName = "TreeArrow_Expanded";
+				ResourceName = ExpandedName;
+			}
+		}
+		else
+		{
+			if (ExpanderButton->IsHovered())
+			{
+				static const FName CollapsedHoveredName = "TreeArrow_Collapsed_Hovered";
+				ResourceName = CollapsedHoveredName;
+			}
+			else
+			{
+				static const FName CollapsedName = "TreeArrow_Collapsed";
+				ResourceName = CollapsedName;
+			}
+		}
+
+		return FSodaStyle::Get().GetBrush(ResourceName);
+	}
+
+	FSlateColor GetRowBackgroundColor() const
+	{
+		return PropertyEditorConstants::GetRowBackgroundColor(0, this->IsHovered());
+	}
+
+	FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		if (MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+		{
+			if (OnClicked.IsBound())
+			{
+				return OnClicked.Execute();
+			}
+		}
+		
+		return FReply::Unhandled();
+	}
+
+private:
+	TAttribute<bool> IsExpanded;
+	TSharedPtr<SButton> ExpanderButton;
+	FOnClicked OnClicked;
+	bool bDisplayShowAdvancedMessage;
+	IDetailsViewPrivate* DetailsView;
+};
+
+TSharedRef< ITableRow > FAdvancedDropdownNode::GenerateWidgetForTableView( const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem)
+{
+	return SNew(SAdvancedDropdownRow, ParentCategory.GetDetailsView(), OwnerTable)
+		.OnClicked(this, &FAdvancedDropdownNode::OnAdvancedDropDownClicked)
+		.IsButtonEnabled(IsEnabled)
+		.IsExpanded(IsExpanded)
+		.IsVisible(IsVisible);
+}
+
+bool FAdvancedDropdownNode::GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const
+{
+	// Not supported
+	return false;
+}
+
+FReply FAdvancedDropdownNode::OnAdvancedDropDownClicked()
+{
+	ParentCategory.OnAdvancedDropdownClicked();
+
+	return FReply::Handled();
+}
+
+ENodeVisibility FAdvancedDropdownNode::GetVisibility() const
+{
+	IDetailsViewPrivate* DetailsView = GetDetailsView();
+	if (!DetailsView || DetailsView->IsCustomRowVisible(FName(NAME_None), FName(*GetParentCategory()->GetDisplayName().ToString())))
+	{
+		return ENodeVisibility::Visible;
+	}
+	return ENodeVisibility::ForcedHidden;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailAdvancedDropdownNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailAdvancedDropdownNode.h
new file mode 100644
index 0000000..f3816f0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailAdvancedDropdownNode.h
@@ -0,0 +1,59 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Input/Reply.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+namespace soda
+{
+
+class FAdvancedDropdownNode : public FDetailTreeNode, public TSharedFromThis<FAdvancedDropdownNode>
+{
+public:
+	FAdvancedDropdownNode(TSharedRef<FDetailCategoryImpl> InParentCategory, const TAttribute<bool>& InExpanded, const TAttribute<bool>& InEnabled, TAttribute<bool> InVisible)
+		: ParentCategory(InParentCategory.Get())
+		, IsEnabled(InEnabled)
+		, IsExpanded(InExpanded)
+		, IsVisible(InVisible)
+	{
+		SetParentNode(InParentCategory);
+	}
+
+private:
+	/** IDetailTreeNode Interface */
+	virtual IDetailsView* GetNodeDetailsView() const override { return ParentCategory.GetNodeDetailsView(); }
+	virtual IDetailsViewPrivate* GetDetailsView() const override { return ParentCategory.GetDetailsView(); }
+	virtual TSharedRef< ITableRow > GenerateWidgetForTableView( const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem) override;
+	virtual bool GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const override;
+	virtual void GetChildren(FDetailNodeList& OutChildren) override {}
+	virtual void OnItemExpansionChanged( bool bIsExpanded, bool bShouldSaveState) override {}
+	virtual bool ShouldBeExpanded() const override { return false; }
+	virtual ENodeVisibility GetVisibility() const override;
+	virtual void FilterNode( const FDetailFilter& InFilter ) override {}
+	virtual void Tick( float DeltaTime ) override {}
+	virtual bool ShouldShowOnlyChildren() const override { return false; }
+	virtual FName GetNodeName() const override { return NAME_None; }
+
+	virtual EDetailNodeType GetNodeType() const override { return EDetailNodeType::Advanced; }
+	virtual TSharedPtr<IPropertyHandle> CreatePropertyHandle() const override { return nullptr; }
+
+	/** Called when the advanced drop down arrow is clicked */
+	FReply OnAdvancedDropDownClicked();
+
+private:
+	FDetailCategoryImpl& ParentCategory;
+	TAttribute<bool> IsEnabled;
+	TAttribute<bool> IsExpanded;
+	TAttribute<bool> IsVisible;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryBuilderImpl.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryBuilderImpl.cpp
new file mode 100644
index 0000000..fc98f6a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryBuilderImpl.cpp
@@ -0,0 +1,1120 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailAdvancedDropdownNode.h"
+#include "RuntimePropertyEditor/DetailBuilderTypes.h"
+#include "RuntimePropertyEditor/DetailCategoryGroupNode.h"
+#include "RuntimePropertyEditor/DetailGroup.h"
+#include "RuntimePropertyEditor/DetailItemNode.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/IPropertyGenerationUtilities.h"
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/PropertyEditorPermissionList.h"
+#include "RuntimePropertyEditor/SDetailCategoryTableRow.h"
+#include "RuntimePropertyEditor/SDetailSingleItemRow.h"
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+#include "Styling/StyleColors.h"
+
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+ 
+void FDetailLayout::AddLayout(const FDetailLayoutCustomization& Layout)
+{
+	if (Layout.bAdvanced)
+	{
+		AdvancedLayouts.Add(Layout);
+	}
+	else
+	{
+		SimpleLayouts.Add(Layout);
+	}
+}
+
+FDetailLayoutCustomization* FDetailLayout::GetDefaultLayout(const TSharedRef<FPropertyNode>& PropertyNode)
+{
+	FDetailLayoutCustomization* Customization = 
+		SimpleLayouts.FindByPredicate([&PropertyNode](const FDetailLayoutCustomization& TestCustomization)
+		{
+			return TestCustomization.GetPropertyNode() == PropertyNode;
+		});
+
+	// Didn't find it in the simple layouts, look in advanced layouts
+	if (Customization == nullptr)
+	{
+		Customization = 
+			AdvancedLayouts.FindByPredicate([&PropertyNode](const FDetailLayoutCustomization& TestCustomization)
+			{
+				return TestCustomization.GetPropertyNode() == PropertyNode;
+			});
+	}
+
+	if (Customization != nullptr && Customization->bCustom)
+	{
+		return nullptr;
+	}
+
+	return Customization;
+}
+
+FDetailLayoutCustomization::FDetailLayoutCustomization()
+	: PropertyRow(nullptr)
+	, WidgetDecl(nullptr)
+	, CustomBuilderRow(nullptr)
+{
+
+}
+
+bool FDetailLayoutCustomization::HasExternalPropertyRow() const
+{
+	return HasPropertyNode() && PropertyRow->HasExternalProperty();
+}
+
+bool FDetailLayoutCustomization::IsHidden() const
+{
+	return !IsValidCustomization()
+		|| (HasCustomWidget() && WidgetDecl->VisibilityAttr.Get() != EVisibility::Visible)
+		|| (HasPropertyNode() && PropertyRow->GetPropertyVisibility() != EVisibility::Visible);
+}
+
+
+TSharedPtr<FPropertyNode> FDetailLayoutCustomization::GetPropertyNode() const
+{
+	return PropertyRow.IsValid() ? PropertyRow->GetPropertyNode() : nullptr;
+}
+
+FDetailWidgetRow FDetailLayoutCustomization::GetWidgetRow() const
+{
+	if (HasCustomWidget())
+	{
+		return *WidgetDecl;
+	}
+	else if (HasCustomBuilder())
+	{
+		return CustomBuilderRow->GetWidgetRow();
+	}
+	else if (HasPropertyNode())
+	{
+		return PropertyRow->GetWidgetRow();
+	}
+	else
+	{
+		return DetailGroup->GetWidgetRow();
+	}
+}
+
+FName FDetailLayoutCustomization::GetName() const
+{
+	if (HasCustomWidget())
+	{
+		return WidgetDecl->GetRowName();
+	}
+	else if (HasCustomBuilder())
+	{
+		return CustomBuilderRow->GetRowName();
+	}
+	else if (HasGroup())
+	{
+		return DetailGroup->GetRowName();
+	}
+	else if (GetPropertyNode())
+	{
+		return PropertyRow->GetRowName();
+	}
+	return NAME_None;
+}
+
+FDetailCategoryImpl::FDetailCategoryImpl(FName InCategoryName, TSharedRef<FDetailLayoutBuilderImpl> InDetailLayout)
+	: HeaderContentWidget(nullptr)
+	, DetailLayoutBuilder(InDetailLayout)
+	, CategoryName(InCategoryName)
+	, SortOrder(0)
+	, bRestoreExpansionState(!ContainsOnlyAdvanced())
+	, bShouldBeInitiallyCollapsed(false)
+	, bUserShowAdvanced(false)
+	, bForceAdvanced(false)
+	, bHasFilterStrings(false)
+	, bHasVisibleDetails(true)
+	, bIsCategoryVisible(true)
+	, bFavoriteCategory(false)
+	, bShowOnlyChildren(false)
+	, bHasVisibleAdvanced(false)
+{
+	const UStruct* BaseStruct = InDetailLayout->GetRootNode()->GetBaseStructure();
+
+	static const FName NoCategoryName = TEXT("NoCategory");
+	bShowOnlyChildren = (InDetailLayout->IsLayoutForExternalRoot() && !InDetailLayout->GetRootNode()->HasNodeFlags(EPropertyNodeFlags::ShowCategories)) || 
+		CategoryName == NoCategoryName ||
+		(BaseStruct && BaseStruct->IsA<UFunction>());
+
+	// Use the base class name if there is one otherwise this is a generic category not specific to a class
+	FName BaseStructName = BaseStruct ? BaseStruct->GetFName() : FName("Generic");
+
+	//Path is separate by '.' so convert category delimiter from '|' to '.'
+	FString CategoryDelimiterString;
+	CategoryDelimiterString.AppendChar(FPropertyNodeConstants::CategoryDelimiterChar);
+	FString CategoryPathDelimiterString;
+	CategoryPathDelimiterString.AppendChar(TCHAR('.'));
+	CategoryPathName = BaseStructName.ToString() + TEXT(".") + CategoryName.ToString().Replace(*CategoryDelimiterString, *CategoryPathDelimiterString);
+	bool bUserShowAdvancedConfigValue = false;
+	GConfig->GetBool(TEXT("DetailCategoriesAdvanced"), *CategoryPathName, bUserShowAdvancedConfigValue, GEditorPerProjectIni);
+
+	bUserShowAdvanced = bUserShowAdvancedConfigValue;
+}
+
+FDetailCategoryImpl::~FDetailCategoryImpl()
+{
+}
+
+
+FDetailWidgetRow& FDetailCategoryImpl::AddCustomRow(const FText& FilterString, bool bForAdvanced)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+	NewCustomization.bAdvanced = bForAdvanced;
+	NewCustomization.WidgetDecl = MakeShareable(new FDetailWidgetRow);
+	NewCustomization.WidgetDecl->FilterString(FilterString);
+
+	AddCustomLayout(NewCustomization);
+
+	return *NewCustomization.WidgetDecl;
+}
+
+
+void FDetailCategoryImpl::AddCustomBuilder(TSharedRef<IDetailCustomNodeBuilder> InCustomBuilder, bool bForAdvanced)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+	NewCustomization.bAdvanced = bForAdvanced;
+	NewCustomization.CustomBuilderRow = MakeShareable(new FDetailCustomBuilderRow(InCustomBuilder));
+
+	if (!InCustomBuilder->GetName().IsNone())
+	{
+		TStringBuilder<256> PathToNode;
+		PathToNode.Append(GetCategoryPathName());
+		PathToNode.Append(TEXT("."));
+		PathToNode.Append(InCustomBuilder->GetName().ToString());
+		NewCustomization.CustomBuilderRow->SetOriginalPath(PathToNode.ToString());
+	}
+
+	if (GetDetailsView() != nullptr && !bFavoriteCategory)
+	{
+		if (GetDetailsView()->IsCustomBuilderFavorite(NewCustomization.CustomBuilderRow->GetOriginalPath()))
+		{
+			TSharedPtr<FDetailLayoutBuilderImpl> LayoutBuilder = DetailLayoutBuilder.Pin();
+			if (LayoutBuilder.IsValid())
+			{
+				static const FName FavoritesCategoryName(TEXT("Favorites"));
+				FDetailCategoryImpl& FavoritesCategory = LayoutBuilder->DefaultCategory(FavoritesCategoryName);
+
+				FDetailLayoutCustomization FavoritesCustomization;
+				FavoritesCustomization.bCustom = true;
+				FavoritesCustomization.bAdvanced = false;
+				FavoritesCustomization.CustomBuilderRow = MakeShareable(new FDetailCustomBuilderRow(InCustomBuilder));
+				FavoritesCustomization.CustomBuilderRow->SetOriginalPath(NewCustomization.CustomBuilderRow->GetOriginalPath());
+				FavoritesCategory.AddCustomLayout(FavoritesCustomization);
+			}
+		}
+	}
+
+	AddCustomLayout(NewCustomization);
+}
+
+IDetailGroup& FDetailCategoryImpl::AddGroup(FName GroupName, const FText& LocalizedDisplayName, bool bForAdvanced, bool bStartExpanded)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+	NewCustomization.bAdvanced = bForAdvanced;
+	NewCustomization.DetailGroup = MakeShareable(new FDetailGroup(GroupName, AsShared(), LocalizedDisplayName, bStartExpanded));
+
+	AddCustomLayout(NewCustomization);
+
+	return *NewCustomization.DetailGroup;
+}
+
+int32 FDetailCategoryImpl::GetNumCustomizations() const
+{
+	int32 NumCustomizations = 0;
+
+	for (const FDetailLayout& Layout : LayoutMap)
+	{
+		NumCustomizations += Layout.GetSimpleLayouts().Num();
+		NumCustomizations += Layout.GetAdvancedLayouts().Num();
+	}
+
+	return NumCustomizations;
+}
+
+void FDetailCategoryImpl::GetDefaultProperties(TArray<TSharedRef<IPropertyHandle> >& OutDefaultProperties, bool bSimpleProperties, bool bAdvancedProperties)
+{
+	FDetailLayoutBuilderImpl& DetailLayoutBuilderRef = GetParentLayoutImpl();
+	for (const FDetailLayout& Layout : LayoutMap)
+	{
+		if (bSimpleProperties)
+		{
+			for (const FDetailLayoutCustomization& Customization : Layout.GetSimpleLayouts())
+			{
+				if (Customization.HasPropertyNode())
+				{
+					const TSharedPtr<FPropertyNode>& Node = Customization.GetPropertyNode();
+
+					TSharedRef<IPropertyHandle> PropertyHandle = DetailLayoutBuilderRef.GetPropertyHandle(Node);
+					if (PropertyHandle->IsValidHandle())
+					{
+						OutDefaultProperties.Add(PropertyHandle);
+					}
+				}
+			}
+		}
+
+		if (bAdvancedProperties)
+		{
+			for (const FDetailLayoutCustomization& Customization : Layout.GetAdvancedLayouts())
+			{
+				if (Customization.HasPropertyNode())
+				{
+					const TSharedPtr<FPropertyNode>& Node = Customization.GetPropertyNode();
+					TSharedRef<IPropertyHandle> PropertyHandle = DetailLayoutBuilderRef.GetPropertyHandle(Node);
+					if (PropertyHandle->IsValidHandle())
+					{
+						OutDefaultProperties.Add(PropertyHandle);
+					}
+				}
+			}
+		}
+	}
+}
+
+void FDetailCategoryImpl::SetCategoryVisibility(bool bIsVisible)
+{
+	if (bIsVisible != bIsCategoryVisible)
+	{
+		bIsCategoryVisible = bIsVisible;
+
+		if (GetDetailsView())
+		{
+			GetDetailsView()->RerunCurrentFilter();
+		}
+		if (DetailLayoutBuilder.IsValid())
+		{
+			DetailLayoutBuilder.Pin()->NotifyNodeVisibilityChanged();
+		}
+	}
+}
+
+IDetailCategoryBuilder& FDetailCategoryImpl::InitiallyCollapsed(bool bInShouldBeInitiallyCollapsed)
+{
+	this->bShouldBeInitiallyCollapsed = bInShouldBeInitiallyCollapsed;
+	return *this;
+}
+
+IDetailCategoryBuilder& FDetailCategoryImpl::OnExpansionChanged(FOnBooleanValueChanged InOnExpansionChanged)
+{
+	this->OnExpansionChangedDelegate = InOnExpansionChanged;
+	return *this;
+}
+
+IDetailCategoryBuilder& FDetailCategoryImpl::RestoreExpansionState(bool bRestore)
+{
+	this->bRestoreExpansionState = bRestore;
+	return *this;
+}
+
+IDetailCategoryBuilder& FDetailCategoryImpl::HeaderContent(TSharedRef<SWidget> InHeaderContent)
+{
+	ensureMsgf(!this->HeaderContentWidget.IsValid(), TEXT("Category already has a header content widget defined!"));
+	this->HeaderContentWidget = InHeaderContent;
+	return *this;
+}
+
+IDetailPropertyRow& FDetailCategoryImpl::AddProperty(FName PropertyPath, UClass* ClassOutermost, FName InstanceName, EPropertyLocation::Type Location)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+
+	TSharedPtr<FPropertyNode> PropertyNode = GetParentLayoutImpl().GetPropertyNode(PropertyPath, ClassOutermost, InstanceName);
+	if (PropertyNode.IsValid())
+	{
+		GetParentLayoutImpl().SetCustomProperty(PropertyNode);
+	}
+
+	NewCustomization.PropertyRow = MakeShareable(new FDetailPropertyRow(PropertyNode, AsShared()));
+	NewCustomization.bAdvanced = (Location == EPropertyLocation::Default) ? IsAdvancedLayout(NewCustomization) : (Location == EPropertyLocation::Advanced);
+
+	AddCustomLayout(NewCustomization);
+
+	return *NewCustomization.PropertyRow;
+}
+
+IDetailPropertyRow& FDetailCategoryImpl::AddProperty(TSharedPtr<IPropertyHandle> PropertyHandle, EPropertyLocation::Type Location)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+
+	TSharedPtr<FPropertyNode> PropertyNode = GetParentLayoutImpl().GetPropertyNode(PropertyHandle);
+
+	if (PropertyNode.IsValid())
+	{
+		GetParentLayoutImpl().SetCustomProperty(PropertyNode);
+	}
+
+	NewCustomization.PropertyRow = MakeShareable(new FDetailPropertyRow(PropertyNode, AsShared()));
+	NewCustomization.bAdvanced = (Location == EPropertyLocation::Default) ? IsAdvancedLayout(NewCustomization) : (Location == EPropertyLocation::Advanced);
+
+	AddCustomLayout(NewCustomization);
+
+	return *NewCustomization.PropertyRow;
+}
+
+IDetailPropertyRow* FDetailCategoryImpl::AddExternalObjects(const TArray<UObject*>& Objects, EPropertyLocation::Type Location /*= EPropertyLocation::Default*/, const FAddPropertyParams& Params /*= FAddPropertyParams()*/)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+	NewCustomization.bAdvanced = Location == EPropertyLocation::Advanced;
+
+	FAddPropertyParams AddPropertyParams = Params;
+	AddPropertyParams.AllowChildren(true);
+
+	FDetailPropertyRow::MakeExternalPropertyRowCustomization(Objects, NAME_None, AsShared(), NewCustomization, AddPropertyParams);
+
+	if (Params.ShouldHideRootObjectNode() && NewCustomization.HasPropertyNode() && NewCustomization.GetPropertyNode()->AsObjectNode())
+	{
+		NewCustomization.PropertyRow->SetForceShowOnlyChildren(true);
+	}
+
+	TSharedPtr<FDetailPropertyRow> NewRow = NewCustomization.PropertyRow;
+
+	if (NewRow.IsValid())
+	{
+		AddCustomLayout(NewCustomization);
+	}
+
+	return NewRow.Get();
+}
+
+IDetailPropertyRow* FDetailCategoryImpl::AddExternalObjectProperty(const TArray<UObject*>& Objects, FName PropertyName, EPropertyLocation::Type Location, const FAddPropertyParams& Params)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+	NewCustomization.bAdvanced = Location == EPropertyLocation::Advanced;
+
+	FDetailPropertyRow::MakeExternalPropertyRowCustomization(Objects, PropertyName, AsShared(), NewCustomization, Params);
+
+	TSharedPtr<FDetailPropertyRow> NewRow = NewCustomization.PropertyRow;
+
+	if (NewRow.IsValid())
+	{
+		AddCustomLayout(NewCustomization);
+
+	}
+
+	return NewRow.Get();
+}
+
+IDetailPropertyRow* FDetailCategoryImpl::AddExternalStructure(TSharedPtr<FStructOnScope> StructData, EPropertyLocation::Type Location /*= EPropertyLocation::Default*/)
+{
+	return AddExternalStructureProperty(StructData, NAME_None, Location);
+}
+
+IDetailPropertyRow* FDetailCategoryImpl::AddExternalStructureProperty(TSharedPtr<FStructOnScope> StructData, FName PropertyName, EPropertyLocation::Type Location/* = EPropertyLocation::Default*/, const FAddPropertyParams& Params)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.bCustom = true;
+	NewCustomization.bAdvanced = Location == EPropertyLocation::Advanced;
+
+	FDetailPropertyRow::MakeExternalPropertyRowCustomization(StructData, PropertyName, AsShared(), NewCustomization, Params);
+
+	TSharedPtr<FDetailPropertyRow> NewRow = NewCustomization.PropertyRow;
+
+	if (NewRow.IsValid())
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = NewRow->GetPropertyNode();
+		TSharedPtr<FComplexPropertyNode> RootNode = StaticCastSharedRef<FComplexPropertyNode>(PropertyNode->FindComplexParent()->AsShared());
+
+		AddCustomLayout(NewCustomization);
+	}
+
+	return NewRow.Get();
+}
+
+TArray<TSharedPtr<IPropertyHandle>> FDetailCategoryImpl::AddAllExternalStructureProperties(TSharedRef<FStructOnScope> StructData, EPropertyLocation::Type Location)
+{
+	TSharedPtr<FStructurePropertyNode> RootPropertyNode(new FStructurePropertyNode);
+	RootPropertyNode->SetStructure(StructData);
+
+	FPropertyNodeInitParams InitParams;
+	InitParams.ParentNode = nullptr;
+	InitParams.Property = nullptr;
+	InitParams.ArrayOffset = 0;
+	InitParams.ArrayIndex = INDEX_NONE;
+	InitParams.bAllowChildren = false;
+	InitParams.bForceHiddenPropertyVisibility = FPropertySettings::Get().ShowHiddenProperties();
+	InitParams.bCreateCategoryNodes = false;
+
+	RootPropertyNode->InitNode(InitParams);
+
+	TArray<TSharedPtr<IPropertyHandle>> Handles;
+
+	FDetailLayoutBuilderImpl& DetailLayoutBuilderRef = GetParentLayoutImpl();
+
+	if (RootPropertyNode.IsValid())
+	{
+		RootPropertyNode->RebuildChildren();
+		DetailLayoutBuilder.Pin()->AddExternalRootPropertyNode(RootPropertyNode.ToSharedRef());
+
+		for (int32 ChildIdx = 0; ChildIdx < RootPropertyNode->GetNumChildNodes(); ++ChildIdx)
+		{
+			TSharedPtr< FPropertyNode > PropertyNode = RootPropertyNode->GetChildNode(ChildIdx);
+			if (FProperty* Property = PropertyNode->GetProperty())
+			{
+				FDetailLayoutCustomization NewCustomization;
+				NewCustomization.PropertyRow = MakeShared<FDetailPropertyRow>(PropertyNode, AsShared(), RootPropertyNode);
+				NewCustomization.bAdvanced = Location == EPropertyLocation::Advanced;
+				AddDefaultLayout(NewCustomization, NAME_None);
+
+				Handles.Add(DetailLayoutBuilderRef.GetPropertyHandle(PropertyNode));
+			}
+		}
+	}
+
+	return Handles;
+}
+
+void FDetailCategoryImpl::AddPropertyNode(TSharedRef<FPropertyNode> PropertyNode, FName InstanceName)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.PropertyRow = MakeShared<FDetailPropertyRow>(PropertyNode, AsShared());
+	NewCustomization.bAdvanced = IsAdvancedLayout(NewCustomization);
+	AddDefaultLayout(NewCustomization, InstanceName);
+}
+
+bool FDetailCategoryImpl::IsAdvancedLayout(const FDetailLayoutCustomization& LayoutInfo)
+{
+	TSharedPtr<FPropertyNode> PropertyNode = LayoutInfo.GetPropertyNode();
+	if (PropertyNode.IsValid() && PropertyNode->HasNodeFlags(EPropertyNodeFlags::IsAdvanced))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void FDetailCategoryImpl::AddCustomLayout(const FDetailLayoutCustomization& LayoutInfo)
+{
+	ensure(LayoutInfo.bCustom == true);
+	GetLayoutForInstance(GetParentLayoutImpl().GetCurrentCustomizationVariableName()).AddLayout(LayoutInfo);
+}
+
+void FDetailCategoryImpl::AddDefaultLayout(const FDetailLayoutCustomization& LayoutInfo, FName InstanceName)
+{
+	ensure(LayoutInfo.bCustom == false);
+	GetLayoutForInstance(InstanceName).AddLayout(LayoutInfo);
+}
+
+FDetailLayout& FDetailCategoryImpl::GetLayoutForInstance(FName InstanceName)
+{
+	return LayoutMap.FindOrAdd(InstanceName);
+}
+
+void FDetailCategoryImpl::OnAdvancedDropdownClicked()
+{
+	bUserShowAdvanced = !bUserShowAdvanced;
+
+	GConfig->SetBool(TEXT("DetailCategoriesAdvanced"), *CategoryPathName, bUserShowAdvanced, GEditorPerProjectIni);
+
+	const bool bRefilterCategory = true;
+	RefreshTree(bRefilterCategory);
+}
+
+FDetailLayoutCustomization* FDetailCategoryImpl::GetDefaultCustomization(TSharedRef<FPropertyNode> PropertyNode)
+{
+	FDetailLayout& Layout = GetLayoutForInstance(GetParentLayoutImpl().GetCurrentCustomizationVariableName());
+	
+	FDetailLayoutCustomization* Customization = Layout.GetDefaultLayout(PropertyNode);
+	return Customization;
+}
+
+bool FDetailCategoryImpl::ShouldAdvancedBeExpanded() const
+{
+	return bUserShowAdvanced || bForceAdvanced;
+}
+
+void FDetailCategoryImpl::SetShowAdvanced(bool bShowAdvanced)
+{
+	bUserShowAdvanced = bShowAdvanced;
+}
+
+int32 FDetailCategoryImpl::GetSortOrder() const
+{
+	return SortOrder;
+}
+
+void FDetailCategoryImpl::SetSortOrder(int32 InSortOrder)
+{
+	SortOrder = InSortOrder;
+}
+
+bool FDetailCategoryImpl::IsAdvancedDropdownEnabled() const
+{
+	return !bForceAdvanced;
+}
+
+bool FDetailCategoryImpl::ShouldAdvancedBeVisible() const
+{
+	return bHasVisibleAdvanced;
+}
+
+void FDetailCategoryImpl::RequestItemExpanded(TSharedRef<FDetailTreeNode> TreeNode, bool bShouldBeExpanded)
+{
+	if (GetDetailsView())
+	{		
+		GetDetailsView()->RequestItemExpanded(TreeNode, bShouldBeExpanded);
+	}
+}
+
+void FDetailCategoryImpl::RefreshTree(bool bRefilterCategory)
+{
+	if (bRefilterCategory)
+	{
+		TSharedPtr<FDetailLayoutBuilderImpl> DetailLayoutBuilderPtr = DetailLayoutBuilder.Pin();
+		if (DetailLayoutBuilderPtr.IsValid())
+		{
+			FilterNode(DetailLayoutBuilderPtr->GetCurrentFilter());
+			DetailLayoutBuilderPtr->GetPropertyGenerationUtilities().RebuildTreeNodes();
+		}
+	}
+	else
+	{
+		if (GetDetailsView())
+		{
+			GetDetailsView()->RefreshTree();
+		}
+	}
+}
+
+void FDetailCategoryImpl::AddTickableNode(FDetailTreeNode& TickableNode)
+{
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayoutBuilderPtr = DetailLayoutBuilder.Pin();
+	if (DetailLayoutBuilderPtr.IsValid())
+	{
+		DetailLayoutBuilderPtr->AddTickableNode(TickableNode);
+	}
+}
+
+void FDetailCategoryImpl::RemoveTickableNode(FDetailTreeNode& TickableNode)
+{
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayoutBuilderPtr = DetailLayoutBuilder.Pin();
+	if (DetailLayoutBuilderPtr.IsValid())
+	{
+		DetailLayoutBuilderPtr->RemoveTickableNode(TickableNode);
+	}
+}
+
+void FDetailCategoryImpl::SaveExpansionState(FDetailTreeNode& InTreeNode)
+{
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayoutBuilderPtr = DetailLayoutBuilder.Pin();
+	if (DetailLayoutBuilderPtr.IsValid())
+	{
+		bool bIsExpanded = InTreeNode.ShouldBeExpanded();
+
+		FString Key = CategoryPathName;
+		Key += TEXT(".");
+		Key += InTreeNode.GetNodeName().ToString();
+
+		DetailLayoutBuilderPtr->SaveExpansionState(Key, bIsExpanded);
+	}
+}
+
+bool FDetailCategoryImpl::GetSavedExpansionState(FDetailTreeNode& InTreeNode) const
+{
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayoutBuilderPtr = DetailLayoutBuilder.Pin();
+	if (DetailLayoutBuilderPtr.IsValid())
+	{
+		FString Key = CategoryPathName;
+		Key += TEXT(".");
+		Key += InTreeNode.GetNodeName().ToString();
+
+		return DetailLayoutBuilderPtr->GetSavedExpansionState(Key);
+	}
+
+	return false;
+}
+
+bool FDetailCategoryImpl::ContainsOnlyAdvanced() const
+{
+	return !bFavoriteCategory && SimpleChildNodes.Num() == 0 && AdvancedChildNodes.Num() > 0;
+}
+
+void FDetailCategoryImpl::SetDisplayName(FName InCategoryName, const FText& LocalizedNameOverride)
+{
+	if (!LocalizedNameOverride.IsEmpty())
+	{
+		DisplayName = LocalizedNameOverride;
+	}
+	else if (InCategoryName != NAME_None)
+	{
+		static const FTextKey CategoryLocalizationNamespace = TEXT("UObjectCategory");
+		static const FName CategoryMetaDataKey = TEXT("Category");
+
+		DisplayName = FText();
+
+		const FString NativeCategory = InCategoryName.ToString();
+		if (FText::FindText(CategoryLocalizationNamespace, NativeCategory, /*OUT*/DisplayName, &NativeCategory))
+		{
+			// Category names in English are typically gathered in their non-pretty form (eg "UserInterface" rather than "User Interface"), so skip 
+			// applying the localized variant if the text matches the raw category name, as in this case the pretty printer will do a better job
+			if (NativeCategory.Equals(DisplayName.ToString(), ESearchCase::CaseSensitive))
+			{
+				DisplayName = FText();
+			}
+		}
+		
+		if (DisplayName.IsEmpty())
+		{
+			DisplayName = FText::AsCultureInvariant(FName::NameToDisplayString(NativeCategory, false));
+		}
+	}
+	else
+	{
+		// Use the base class name if there is one otherwise this is a generic category not specific to a class
+		const UStruct* BaseStruct = GetParentLayoutImpl().GetRootNode()->GetBaseStructure();
+		if (BaseStruct)
+		{
+			DisplayName = FRuntimeMetaData::GetDisplayNameText(BaseStruct);
+		}
+		else
+		{
+			DisplayName = NSLOCTEXT("DetailCategory", "GenericCategory", "Generic");
+		}
+	}
+}
+
+IDetailsViewPrivate* FDetailCategoryImpl::GetDetailsView() const
+{
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayoutBuilderPtr = DetailLayoutBuilder.Pin();
+	if (DetailLayoutBuilderPtr.IsValid())
+	{
+		return DetailLayoutBuilderPtr->GetDetailsView();
+	}
+
+	return nullptr;
+}
+
+TSharedRef<ITableRow> FDetailCategoryImpl::GenerateWidgetForTableView(const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem)
+{
+	TSharedPtr<SWidget> HeaderContent = HeaderContentWidget;
+	if (InlinePropertyNode.IsValid())
+	{
+		FDetailWidgetRow Row;
+		InlinePropertyNode->GenerateStandaloneWidget(Row);
+		HeaderContent = Row.ValueWidget.Widget;
+	}
+
+	return SNew(SDetailCategoryTableRow, AsShared(), OwnerTable)
+		.InnerCategory(DetailLayoutBuilder.IsValid() ? DetailLayoutBuilder.Pin()->IsLayoutForExternalRoot() : false)
+		.DisplayName(GetDisplayName())
+		.HeaderContent(HeaderContent);
+}
+
+
+bool FDetailCategoryImpl::GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const
+{
+	TSharedPtr<SWidget> HeaderContent = HeaderContentWidget;
+	if (InlinePropertyNode.IsValid())
+	{
+		FDetailWidgetRow Row;
+		InlinePropertyNode->GenerateStandaloneWidget(Row);
+		HeaderContent = Row.ValueWidget.Widget;
+	}
+
+	const bool bIsInnerCategory = DetailLayoutBuilder.Pin()->IsLayoutForExternalRoot();
+	FTextBlockStyle NameStyle = bIsInnerCategory ? FSodaStyle::Get().GetWidgetStyle<FTextBlockStyle>("NormalText") : FSodaStyle::Get().GetWidgetStyle<FTextBlockStyle>("DetailsView.CategoryTextStyle");
+	OutRow.NameContent()
+	[
+		SNew(STextBlock)
+		.Text(GetDisplayName())
+		.TextStyle(&NameStyle)
+		.ShadowOffset(FVector2D::ZeroVector)
+	];
+
+	if(HeaderContentWidget.IsValid())
+	{
+		OutRow
+			.ValueContent()
+			.HAlign(HAlign_Fill)
+			[
+				HeaderContent.ToSharedRef()
+			];
+	}
+
+	return true;
+}
+
+void FDetailCategoryImpl::GetFilterStrings(TArray<FString>& OutFilterStrings) const
+{
+	OutFilterStrings.Add(GetDisplayName().ToString());
+}
+
+bool FDetailCategoryImpl::GetInitiallyCollapsed() const
+{
+	return bShouldBeInitiallyCollapsed;
+}
+
+void FDetailCategoryImpl::OnItemExpansionChanged(bool bIsExpanded, bool bShouldSaveState)
+{
+	if (bRestoreExpansionState && bShouldSaveState)
+	{
+		// Save the collapsed state of this section
+		GConfig->SetBool(TEXT("DetailCategories"), *CategoryPathName, bIsExpanded, GEditorPerProjectIni);
+	}
+
+	OnExpansionChangedDelegate.ExecuteIfBound(bIsExpanded);
+}
+
+bool FDetailCategoryImpl::ShouldBeExpanded() const
+{
+	if (bHasFilterStrings)
+	{
+		return true;
+	}
+	else if (bRestoreExpansionState)
+	{
+		// Collapse by default if there are no simple child nodes
+		bool bShouldBeExpanded = !ContainsOnlyAdvanced() && !bShouldBeInitiallyCollapsed;
+		// Save the collapsed state of this section
+		GConfig->GetBool(TEXT("DetailCategories"), *CategoryPathName, bShouldBeExpanded, GEditorPerProjectIni);
+		return bShouldBeExpanded;
+	}
+	else
+	{
+		return !bShouldBeInitiallyCollapsed;
+	}
+}
+
+ENodeVisibility FDetailCategoryImpl::GetVisibility() const
+{
+	return bHasVisibleDetails && bIsCategoryVisible ? 
+		ENodeVisibility::Visible : ENodeVisibility::ForcedHidden;
+}
+
+static bool IsCustomProperty(const TSharedPtr<FPropertyNode>& PropertyNode)
+{
+	// The property node is custom if it has a custom layout or if its a struct and any of its children have a custom layout
+	bool bIsCustom = !PropertyNode.IsValid() || PropertyNode->HasNodeFlags(EPropertyNodeFlags::IsCustomized) != 0;
+
+	return bIsCustom;
+}
+
+static bool ShouldBeInlineNode(const TSharedRef<FDetailItemNode>& Node)
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Node->GetPropertyNode();
+	if (PropertyNode.IsValid())
+	{
+		const FProperty* Property = PropertyNode->GetProperty();
+		if (Property != nullptr)
+		{
+			const FBoolProperty* BoolProperty = CastField<FBoolProperty>(Property);
+			const FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property);
+			const FByteProperty* ByteProperty = CastField<FByteProperty>(Property);
+
+			// Only allow bools and enums as inline nodes.
+			if (BoolProperty != nullptr || EnumProperty != nullptr ||
+				(ByteProperty != nullptr && ByteProperty->IsEnum()))
+			{
+				static const FName Name_InlineCategoryProperty("InlineCategoryProperty");
+				if (FRuntimeMetaData::HasMetaData(Property, Name_InlineCategoryProperty))
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+bool PassesInlineFilters(FDetailItemNode& Node)
+{
+	if (TSharedPtr<FPropertyNode> PropertyNode = Node.GetPropertyNode())
+	{
+		if (FPropertyNode* ParentNode = PropertyNode->GetParentNode())
+		{
+			if (FProperty* ParentProperty = ParentNode->GetProperty())
+			{
+				// If the DetailParentNode check below ends up having issues, removing it and checking ShowOnlyInnerProperties instead is safer,
+				// but may not catch some edge cases with certain customizations (eg PrimaryActorTick).
+				if (ParentProperty->GetClass() == FStructProperty::StaticClass()/* && ParentProperty->HasMetaData("ShowOnlyInnerProperties")*/)
+				{
+					if (TSharedPtr<FDetailTreeNode> DetailNodeParent = Node.GetParentNode().Pin())
+					{
+						// If the parent detail node's property node doesn't match the property node's parent node, there is a mismatch meaning
+						// the struct's properties are inlined. This means we must check separately to see if the struct property itself
+						// passes the filter before deciding whether to include its child properties.
+						if (ParentNode != DetailNodeParent->GetPropertyNode().Get())
+						{
+							return FPropertyEditorPermissionList::Get().DoesPropertyPassFilter(FDetailTreeNode::GetPropertyNodeBaseStructure(ParentNode->GetParentNode()), ParentProperty->GetFName());
+						}
+					}
+				}
+			}
+			else if (FPropertyNode* GrandparentNode = ParentNode->GetParentNode())
+			{
+				// VisibleAnywhere EditInline properties have to be special-cased as they don't have a proper detail node created, and instead
+				// their children are inlined one level higher than they'd normally be. On top of this, object property nodes have an extra property node
+				// in them before the child properties, so the grandparent node must be queried instead of the parent.
+				if (FObjectPropertyNode* GrandparentAsObjectNode = GrandparentNode->AsObjectNode())
+				{
+					// It's not reasonable to expect an Actor to allow all possible components that could be added to it,
+					// so just always allow inlined Components. This means a Component's property will always show up on
+					// an Actor if the property passes the Component's filter rather than both the Component's and the Actor's.
+					if (!GrandparentAsObjectNode->GetBaseStructure()->IsChildOf(UActorComponent::StaticClass()))
+					{
+						if (FProperty* GrandparentProperty = GrandparentAsObjectNode->GetStoredProperty())
+						{
+							if (FRuntimeMetaData::HasMetaData(GrandparentProperty, "EditInline"))
+							{
+								return FPropertyEditorPermissionList::Get().DoesPropertyPassFilter(GrandparentProperty->GetOwnerClass(), GrandparentProperty->GetFName());
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	return true;
+}
+
+void FDetailCategoryImpl::GenerateNodesFromCustomizations(const TArray<FDetailLayoutCustomization>& InCustomizationList, FDetailNodeList& OutNodeList)
+{
+	TAttribute<bool> IsParentEnabled(this, &FDetailCategoryImpl::IsParentEnabled);
+	TArray<FDetailLayoutCustomization> CustomizationList = InCustomizationList;
+	for (const FDetailLayoutCustomization& Customization : CustomizationList)
+	{
+		if (Customization.IsValidCustomization())
+		{
+			// if a property is customized, skip the default customization
+			if (!IsCustomProperty(Customization.GetPropertyNode()) || Customization.bCustom || bFavoriteCategory)
+			{
+				TSharedRef<FDetailItemNode> NewNode = MakeShareable(new FDetailItemNode(Customization, AsShared(), IsParentEnabled));
+				// Discard nodes that don't pass the property permission test. There is a special check here for properties in structs that do not have a
+				// parent struct node (eg ShowOnlyInnerProperties). Both the node and it's container must pass the filter.
+				if (FPropertyEditorPermissionList::Get().IsEnabled() && (NewNode->GetNodeType() == EDetailNodeType::Object || NewNode->GetNodeType() == EDetailNodeType::Item))
+				{
+					if (!FPropertyEditorPermissionList::Get().DoesPropertyPassFilter(NewNode->GetParentBaseStructure(), NewNode->GetNodeName()) || !PassesInlineFilters(NewNode.Get()))
+					{
+						continue;
+					}
+				}
+				NewNode->Initialize();
+
+				if (ShouldBeInlineNode(NewNode))
+				{
+					ensureMsgf(!InlinePropertyNode.IsValid(), TEXT("Multiple properties marked InlineCategoryProperty detected in category %s."), *DisplayName.ToString());
+					InlinePropertyNode = NewNode;
+					continue;
+				}
+
+				// Add the node unless only its children should be visible or it didn't generate any children or if it is a custom builder which can generate children at any point
+				if (!NewNode->ShouldShowOnlyChildren() || NewNode->HasGeneratedChildren() || Customization.HasCustomBuilder())
+				{
+					OutNodeList.Add(NewNode);
+				}
+			}
+		}
+	}
+}
+
+void FDetailCategoryImpl::GenerateChildrenForLayouts()
+{
+	// note: this can't be a ranged-for, because the map may have items added to it by customizations during iteration
+	for (int32 LayoutIndex = 0; LayoutIndex < LayoutMap.Num(); ++LayoutIndex)
+	{
+		const FDetailLayout& Layout = LayoutMap[LayoutIndex];
+		GenerateNodesFromCustomizations(Layout.GetSimpleLayouts(), SimpleChildNodes);
+	}
+
+	// note: this can't be a ranged-for, because the map may have items added to it by customizations during iteration
+	for (int32 LayoutIndex = 0; LayoutIndex < LayoutMap.Num(); ++LayoutIndex)
+	{
+		const FDetailLayout& Layout = LayoutMap[LayoutIndex];
+		GenerateNodesFromCustomizations(Layout.GetAdvancedLayouts(), AdvancedChildNodes);
+	}
+
+	// Generate nodes for advanced dropdowns
+	if (AdvancedChildNodes.Num() > 0)
+	{
+		TAttribute<bool> IsExpanded(this, &FDetailCategoryImpl::ShouldAdvancedBeExpanded);
+		TAttribute<bool> IsEnabled(this, &FDetailCategoryImpl::IsAdvancedDropdownEnabled);
+		TAttribute<bool> IsVisible(this, &FDetailCategoryImpl::ShouldAdvancedBeVisible);
+
+		AdvancedDropdownNode = MakeShared<FAdvancedDropdownNode>(AsShared(), IsExpanded, IsEnabled, IsVisible);
+	}
+}
+
+void FDetailCategoryImpl::GetChildren(FDetailNodeList& OutChildren)
+{
+	GetGeneratedChildren(OutChildren, false, false);
+}
+
+void FDetailCategoryImpl::GetGeneratedChildren(FDetailNodeList& OutChildren, bool bIgnoreVisibility, bool bIgnoreAdvanced)
+{
+	for (TSharedRef<FDetailTreeNode>& Child : SimpleChildNodes)
+	{
+		if (bIgnoreVisibility || Child->GetVisibility() == ENodeVisibility::Visible)
+		{
+			if (Child->ShouldShowOnlyChildren())
+			{
+				Child->GetChildren(OutChildren);
+			}
+			else
+			{
+				OutChildren.Add(Child);
+			}
+		}
+	}
+
+	if (!bIgnoreAdvanced)
+	{
+		if (AdvancedChildNodes.Num() > 0 && AdvancedDropdownNode.IsValid())
+		{
+			OutChildren.Add(AdvancedDropdownNode.ToSharedRef());
+		}
+
+		if (ShouldAdvancedBeExpanded())
+		{
+			for (TSharedRef<FDetailTreeNode>& Child : AdvancedChildNodes)
+			{
+				if (bIgnoreVisibility || Child->GetVisibility() == ENodeVisibility::Visible)
+				{
+					if (Child->ShouldShowOnlyChildren())
+					{
+						Child->GetChildren(OutChildren);
+					}
+					else
+					{
+						OutChildren.Add(Child);
+					}
+				}
+			}
+		}
+	}
+}
+
+void FDetailCategoryImpl::FilterNode(const FDetailFilter& InFilter)
+{
+	bHasFilterStrings = InFilter.FilterStrings.Num() > 0;
+	bForceAdvanced = bFavoriteCategory || InFilter.bShowAllAdvanced == true || bHasFilterStrings || ContainsOnlyAdvanced();
+
+	bHasVisibleDetails = false;
+	bHasVisibleAdvanced = false;
+
+	if (bFavoriteCategory && !InFilter.bShowFavoritesCategory)
+	{
+		return;
+	}
+
+	// only apply the section filter if the user hasn't typed anything and this isn't the favorites category
+	if (InFilter.FilterStrings.IsEmpty() && !InFilter.VisibleSections.IsEmpty() && !bFavoriteCategory)
+	{
+		const UStruct* BaseStruct = GetParentBaseStructure();
+		if (BaseStruct != nullptr)
+		{
+			static FName PropertyEditor("RuntimeEditor");
+			const FRuntimeEditorModule& PropertyModule = FModuleManager::GetModuleChecked<FRuntimeEditorModule>(PropertyEditor);
+
+			/*
+			TArray<TSharedPtr<FPropertySection>> PropertySections = PropertyModule.FindSectionsForCategory(BaseStruct, CategoryName);
+			if (PropertySections.IsEmpty())
+			{
+				// property has no sections, must be filtered
+				return;
+			}
+			
+			return;
+
+			// if this property is not in any visible section, hide it
+			bool bFound = false;
+			for (const TSharedPtr<FPropertySection>& Section : PropertySections)
+			{
+				if (Section->HasAddedCategory(CategoryName) &&
+					InFilter.VisibleSections.Contains(Section->GetName()))
+				{
+					bFound = true; 
+					break;
+				}
+			}
+
+			if (!bFound)
+			{
+				return;
+			}
+			*/ return;
+		}
+	}
+
+	if (InlinePropertyNode.IsValid())
+	{
+		bHasVisibleDetails = true;
+	}
+
+	for (TSharedRef<FDetailTreeNode>& Child : SimpleChildNodes)
+	{
+		Child->FilterNode(InFilter);
+
+		if (Child->GetVisibility() == ENodeVisibility::Visible)
+		{
+			bHasVisibleDetails = true;
+			RequestItemExpanded(Child, Child->ShouldBeExpanded());
+		}
+	}
+
+	for (TSharedRef<FDetailTreeNode>& Child : AdvancedChildNodes)
+	{
+		Child->FilterNode(InFilter);
+
+		if (Child->GetVisibility() == ENodeVisibility::Visible)
+		{
+			bHasVisibleDetails = true;
+			bHasVisibleAdvanced = true;
+			RequestItemExpanded(Child, Child->ShouldBeExpanded());
+		}
+	}
+}
+
+FCustomPropertyTypeLayoutMap FDetailCategoryImpl::GetCustomPropertyTypeLayoutMap() const
+{
+	if (DetailLayoutBuilder.IsValid())
+	{
+		return DetailLayoutBuilder.Pin()->GetInstancedPropertyTypeLayoutMap();
+	}
+
+	return FCustomPropertyTypeLayoutMap();
+}
+
+void FDetailCategoryImpl::GenerateLayout()
+{
+	// Reset all children
+	SimpleChildNodes.Empty();
+	AdvancedChildNodes.Empty();
+	AdvancedDropdownNode.Reset();
+	InlinePropertyNode.Reset();
+
+	GenerateChildrenForLayouts();
+
+	bHasVisibleDetails = SimpleChildNodes.Num() + AdvancedChildNodes.Num() > 0;
+}
+
+bool FDetailCategoryImpl::IsParentEnabled() const
+{
+	IDetailsViewPrivate* DetailsView = GetDetailsView();
+	return !DetailsView || DetailsView->IsPropertyEditingEnabled();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryBuilderImpl.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryBuilderImpl.h
new file mode 100644
index 0000000..74f8ad8
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryBuilderImpl.h
@@ -0,0 +1,437 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Widgets/SWidget.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "UObject/StructOnScope.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/DetailCustomBuilderRow.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilderImpl.h"
+#include "RuntimePropertyEditor/IDetailCustomNodeBuilder.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+namespace soda
+{
+
+class IDetailGroup;
+class FDetailGroup;
+class IDetailPropertyRow;
+class FDetailPropertyRow;
+
+/**
+ * Defines a customization for a specific detail
+ */
+struct FDetailLayoutCustomization
+{
+	FDetailLayoutCustomization();
+	/** The property node for the property detail */
+	TSharedPtr<FDetailPropertyRow> PropertyRow;
+	/** A group of customizations */
+	TSharedPtr<FDetailGroup> DetailGroup;
+	/** Custom Widget for displaying the detail */
+	TSharedPtr<FDetailWidgetRow> WidgetDecl;
+	/** Custom builder for more complicated widgets */
+	TSharedPtr<FDetailCustomBuilderRow> CustomBuilderRow;
+	/** @return true if this customization has a property node */
+	bool HasPropertyNode() const { return GetPropertyNode().IsValid(); }
+	/** @return true if this customization has a custom widget */
+	bool HasCustomWidget() const { return WidgetDecl.IsValid(); }
+	/** @return true if this customization has a custom builder (custom builders will set the custom widget) */
+	bool HasCustomBuilder() const { return CustomBuilderRow.IsValid(); }
+	/** @return true if this customization has a group */
+	bool HasGroup() const { return DetailGroup.IsValid(); }
+	/** @return true if this has a customization for an external property row */
+	bool HasExternalPropertyRow() const;
+	/** @return true if this customization is valid */
+	bool IsValidCustomization() const { return HasPropertyNode() || HasCustomWidget() || HasCustomBuilder() || HasGroup(); }
+	/** @return true if the customized item is hidden */
+	bool IsHidden() const;
+	/** @return the property node for this customization (if any ) */
+	TSharedPtr<FPropertyNode> GetPropertyNode() const;
+	/** @return The row to display from this customization */
+	FDetailWidgetRow GetWidgetRow() const;
+	/** Whether or not this customization is considered an advanced property. */
+	bool bAdvanced { false };
+	/** Whether or not this customization is custom or a default one. */
+	bool bCustom { false };
+	/** @return The name of the row depending on which type of customization this is, then the name of the property node, then NAME_None. */
+	FName GetName() const;
+};
+
+class FDetailLayout
+{
+public:
+	FDetailLayout(FName InInstanceName)
+		: InstanceName(InInstanceName)
+	{}
+
+	void AddLayout(const FDetailLayoutCustomization& Layout);
+
+	const TArray<FDetailLayoutCustomization>& GetSimpleLayouts() const { return SimpleLayouts; }
+	const TArray<FDetailLayoutCustomization>& GetAdvancedLayouts() const { return AdvancedLayouts; }
+
+	FDetailLayoutCustomization* GetDefaultLayout(const TSharedRef<FPropertyNode>& PropertyNode);
+
+	bool HasAdvancedLayouts() const { return AdvancedLayouts.Num() > 0; }
+
+	/**
+	 * Get the instance name - this is usually the UObject's name when in a multi-selection.
+	 * Used to display a group beneath the category if multiple objects share some of the same-named properties.
+	 */
+	FName GetInstanceName() const { return InstanceName; }
+
+private:
+	/** Layouts that appear in the simple (visible by default) area of a category */
+	TArray<FDetailLayoutCustomization> SimpleLayouts;
+	/** Layouts that appear in the advanced (hidden by default) details area of a category */
+	TArray<FDetailLayoutCustomization> AdvancedLayouts;
+	/** The sort order in which this layout is displayed (lower numbers are displayed first) */
+	FName InstanceName;
+};
+
+
+class FDetailLayoutMap
+{
+public:
+	FDetailLayoutMap()
+		: bContainsBaseInstance(false)
+	{}
+
+	FDetailLayout& FindOrAdd(FName InstanceName)
+	{
+		for (int32 LayoutIndex = 0; LayoutIndex < Layouts.Num(); ++LayoutIndex)
+		{
+			FDetailLayout& Layout = Layouts[LayoutIndex];
+			if (Layout.GetInstanceName() == InstanceName)
+			{
+				return Layout;
+			}
+		}
+
+		bContainsBaseInstance |= (InstanceName == NAME_None);
+
+		int32 Index = Layouts.Add(FDetailLayout(InstanceName));
+
+		return Layouts[Index];
+	}
+
+	using RangedForIteratorType = TArray<FDetailLayout>::RangedForIteratorType;
+	using RangedForConstIteratorType = TArray<FDetailLayout>::RangedForConstIteratorType;
+
+	FORCEINLINE RangedForIteratorType      begin()       { return Layouts.begin(); }
+	FORCEINLINE RangedForConstIteratorType begin() const { return Layouts.begin(); }
+	FORCEINLINE RangedForIteratorType      end()         { return Layouts.end(); }
+	FORCEINLINE RangedForConstIteratorType end()   const { return Layouts.end(); }
+
+	FDetailLayout& operator[](int32 Index) { return Layouts[Index]; }
+	const FDetailLayout& operator[](int32 Index) const { return Layouts[Index]; }
+
+	int32 Num() const { return Layouts.Num(); }
+
+	/**
+	 * @return Whether or not we need to display a group border around a list of details.
+	 */
+	bool ShouldShowGroup(FName RequiredGroupName) const
+	{
+		// Should show the group if the group name is not empty and there are more than two entries in the list where one of them is not the default "none" entry (represents the base object)
+		return RequiredGroupName != NAME_None && Layouts.Num() > 1 && (Layouts.Num() > 2 || !bContainsBaseInstance);
+	}
+private:
+	TArray<FDetailLayout> Layouts;
+	bool bContainsBaseInstance;
+};
+
+
+/**
+ * Detail category implementation
+ */
+class FDetailCategoryImpl : public IDetailCategoryBuilder, public FDetailTreeNode, public TSharedFromThis<FDetailCategoryImpl>
+{
+public:
+	FDetailCategoryImpl(FName InCategoryName, TSharedRef<FDetailLayoutBuilderImpl> InDetailLayout);
+	~FDetailCategoryImpl();
+
+	/** IDetailCategoryBuilder interface */
+	virtual IDetailCategoryBuilder& InitiallyCollapsed(bool bShouldBeInitiallyCollapsed) override;
+	virtual IDetailCategoryBuilder& OnExpansionChanged(FOnBooleanValueChanged InOnExpansionChanged) override;
+	virtual IDetailCategoryBuilder& RestoreExpansionState(bool bRestore) override;
+	virtual IDetailCategoryBuilder& HeaderContent(TSharedRef<SWidget> InHeaderContent) override;
+	virtual IDetailPropertyRow& AddProperty(FName PropertyPath, UClass* ClassOuter = nullptr, FName InstanceName = NAME_None, EPropertyLocation::Type Location = EPropertyLocation::Default) override;
+	virtual IDetailPropertyRow& AddProperty(TSharedPtr<IPropertyHandle> PropertyHandle, EPropertyLocation::Type Location = EPropertyLocation::Default) override;
+	virtual IDetailPropertyRow* AddExternalObjects(const TArray<UObject*>& Objects, EPropertyLocation::Type Location = EPropertyLocation::Default, const FAddPropertyParams& Params = FAddPropertyParams()) override;
+	virtual IDetailPropertyRow* AddExternalObjectProperty(const TArray<UObject*>& Objects, FName PropertyName, EPropertyLocation::Type Location = EPropertyLocation::Default, const FAddPropertyParams& Params = FAddPropertyParams()) override;
+	virtual IDetailPropertyRow* AddExternalStructure(TSharedPtr<FStructOnScope> StructData, EPropertyLocation::Type Location = EPropertyLocation::Default) override;
+	virtual IDetailPropertyRow* AddExternalStructureProperty(TSharedPtr<FStructOnScope> StructData, FName PropertyName, EPropertyLocation::Type Location = EPropertyLocation::Default, const FAddPropertyParams& Params = FAddPropertyParams()) override;
+	virtual TArray<TSharedPtr<IPropertyHandle>> AddAllExternalStructureProperties(TSharedRef<FStructOnScope> StructData, EPropertyLocation::Type Location = EPropertyLocation::Default) override;
+	virtual IDetailLayoutBuilder& GetParentLayout() const override { return *DetailLayoutBuilder.Pin(); }
+	virtual FDetailWidgetRow& AddCustomRow(const FText& FilterString, bool bForAdvanced = false) override;
+	virtual void AddCustomBuilder(TSharedRef<IDetailCustomNodeBuilder> InCustomBuilder, bool bForAdvanced = false) override;
+	virtual IDetailGroup& AddGroup(FName GroupName, const FText& LocalizedDisplayName, bool bForAdvanced = false, bool bStartExpanded = false) override;
+	virtual void GetDefaultProperties(TArray<TSharedRef<IPropertyHandle> >& OutAllProperties, bool bSimpleProperties = true, bool bAdvancedProperties = true) override;
+	virtual const FText& GetDisplayName() const override { return DisplayName; }
+	virtual void SetCategoryVisibility(bool bIsVisible) override;
+	virtual void SetShowAdvanced(bool bShowAdvanced) override;
+	virtual int32 GetSortOrder() const override;
+	virtual void SetSortOrder(int32 InSortOrder) override;
+
+	/** FDetailTreeNode interface */
+	virtual IDetailsView* GetNodeDetailsView() const override { return GetDetailsView(); }
+	virtual IDetailsViewPrivate* GetDetailsView() const override;
+	virtual TSharedRef< ITableRow > GenerateWidgetForTableView(const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem) override;
+	virtual bool GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const override;
+
+	/** IDetailTreeNode interface */
+	virtual EDetailNodeType GetNodeType() const override { return EDetailNodeType::Category; }
+	virtual TSharedPtr<IPropertyHandle> CreatePropertyHandle() const override { return nullptr; }
+	virtual void GetFilterStrings(TArray<FString>& OutFilterStrings) const override;
+	virtual bool GetInitiallyCollapsed() const override;
+
+	virtual void GetChildren(FDetailNodeList& OutChildren) override;
+	virtual bool ShouldBeExpanded() const override;
+	virtual ENodeVisibility GetVisibility() const override;
+	virtual void FilterNode(const FDetailFilter& DetailFilter) override;
+	virtual void Tick(float DeltaTime) override {}
+	virtual bool ShouldShowOnlyChildren() const override { return bShowOnlyChildren; }
+	virtual FName GetNodeName() const override { return GetCategoryName(); }
+
+	/**
+	 * Gets all generated children with options for ignoring current child visibility or advanced dropdowns
+	 */
+	void GetGeneratedChildren(FDetailNodeList& OutChildren, bool bIgnoreVisibility, bool bIgnoreAdvancedDropdown);
+
+	FCustomPropertyTypeLayoutMap GetCustomPropertyTypeLayoutMap() const;
+
+	/**
+	 * @return true if the parent layout is valid or has been destroyed by a refresh.
+	 */
+	bool IsParentLayoutValid() const { return DetailLayoutBuilder.IsValid(); }
+
+	/**
+	 * @return The name of the category
+	 */
+	FName GetCategoryName() const { return CategoryName; }
+
+	/**
+	 * @return The parent detail layout builder for this category
+	 */
+	FDetailLayoutBuilderImpl& GetParentLayoutImpl() const { return *DetailLayoutBuilder.Pin(); }
+
+	/**
+	 * Generates the children for this category
+	 */
+	void GenerateLayout();
+
+	/**
+	 * Adds a property node to the default category layout
+	 *
+	 * @param PropertyNode			The property node to add
+	 * @param InstanceName			The name of the property instance (for duplicate properties of the same type)
+	 */
+	void AddPropertyNode(TSharedRef<FPropertyNode> PropertyNode, FName InstanceName);
+
+	/**
+	 * Sets the display name of the category string
+	 *
+	 * @param CategoryName			Base category name to use if no localized override is set
+	 * @param LocalizedNameOverride	The localized name override to use (can be empty)
+	 */
+	void SetDisplayName(FName CategoryName, const FText& LocalizedNameOverride);
+
+	/**
+	 * Request that a child node of this category be expanded or collapsed
+	 *
+	 * @param TreeNode				The node to expand or collapse
+	 * @param bShouldBeExpanded		True if the node should be expanded, false to collapse it
+	 */
+	void RequestItemExpanded(TSharedRef<FDetailTreeNode> TreeNode, bool bShouldBeExpanded);
+
+	/**
+	 * Notifies the tree view that it needs to be refreshed
+	 *
+	 * @param bRefilterCategory True if the category should be refiltered
+	 */
+	void RefreshTree(bool bRefilterCategory);
+
+	/**
+	 * Adds a node that needs to be ticked
+	 *
+	 * @param TickableNode	The node that needs to be ticked
+	 */
+	void AddTickableNode(FDetailTreeNode& TickableNode);
+
+	/**
+	 * Removes a node that no longer needs to be ticked
+	 *
+	 * @param TickableNode	The node that no longer needs to be ticked
+	 */
+	void RemoveTickableNode(FDetailTreeNode& TickableNode);
+
+	/** @return The category path for this category */
+	const FString& GetCategoryPathName() const { return CategoryPathName; }
+
+	/**
+	 * Saves the expansion state of a tree node in this category
+	 *
+	 * @param InTreeNode	The node to save expansion state from
+	 */
+	void SaveExpansionState(FDetailTreeNode& InTreeNode);
+
+	/**
+	 * Gets the saved expansion state of a tree node in this category
+	 *
+	 * @param InTreeNode	The node to get expansion state for
+	 * @return true if the node should be expanded, false otherwise
+	 */
+	bool GetSavedExpansionState(FDetailTreeNode& InTreeNode) const;
+
+	/** @return true if this category only contains advanced properties */
+	bool ContainsOnlyAdvanced() const;
+
+	/**
+	 * Get the number of customizations in this category.
+	 */
+	int32 GetNumCustomizations() const;
+
+	/**
+	 * Called when the advanced dropdown button is clicked
+	 */
+	void OnAdvancedDropdownClicked();
+
+	/*
+	 * Call this function to make the category behave like favorite category
+	 */
+	void SetCategoryAsSpecialFavorite() { bFavoriteCategory = true; bForceAdvanced = true; }
+
+	/** Is this the Favorites category? */
+	bool IsFavoriteCategory() const { return bFavoriteCategory; }
+
+	/** Is this category initially collapsed? */
+	bool GetShouldBeInitiallyCollapsed() const { return bShouldBeInitiallyCollapsed; }
+
+	FDetailLayoutCustomization* GetDefaultCustomization(TSharedRef<FPropertyNode> PropertyNode);
+
+private:
+	virtual void OnItemExpansionChanged(bool bIsExpanded, bool bShouldSaveState) override;
+
+	/**
+	 * Adds a new filter widget to this category (for checking if anything is visible in the category when filtered)
+	 */
+	void AddFilterWidget(TSharedRef<SWidget> InWidget);
+
+	/**
+	 * Generates children for each layout
+	 */
+	void GenerateChildrenForLayouts();
+
+	/**
+	 * Generates nodes from a list of customization in a single layout
+	 *
+	 * @param InCustomizationList	The list of customizations to generate nodes from
+	 * @param OutNodeList			The generated nodes
+	 */
+	void GenerateNodesFromCustomizations(const TArray<FDetailLayoutCustomization>& InCustomizationList, FDetailNodeList& OutNodeList);
+
+	/**
+	 * @return Whether or not a customization should appear in the advanced section of the category by default
+	 */
+	bool IsAdvancedLayout(const FDetailLayoutCustomization& LayoutInfo);
+
+	/**
+	 * Adds a custom layout to this category
+	 *
+	 * @param LayoutInfo	The custom layout information
+	 * @param bForAdvanced	Whether or not the custom layout should appear in the advanced section of the category
+	 */
+	void AddCustomLayout(const FDetailLayoutCustomization& LayoutInfo);
+
+	/**
+	 * Adds a default layout to this category
+	 *
+	 * @param DefaultLayoutInfo		The layout information
+	 * @param bForAdvanced			Whether or not the layout should appear in the advanced section of the category
+	 */
+	void AddDefaultLayout(const FDetailLayoutCustomization& DefaultLayoutInfo, FName InstanceName);
+
+	/**
+	 * Returns the layout for a given object instance name
+	 *
+	 * @param InstanceName the name of the instance to get the layout for
+	 */
+	FDetailLayout& GetLayoutForInstance(FName InstanceName);
+
+	/**
+	 * @return True of we should show the advanced button
+	 */
+	bool ShouldAdvancedBeExpanded() const;
+
+	/**
+	 * @return true if the advaned dropdown button is enabled
+	 */
+	bool IsAdvancedDropdownEnabled() const;
+
+	/**
+	 * @return the visibility of the advanced help text drop down (it is visible in a category if there are no simple properties)
+	 */
+	bool ShouldAdvancedBeVisible() const;
+
+	/**
+	 * @return true if the parent that hosts us is enabled
+	 */
+	bool IsParentEnabled() const;
+
+private:
+	/** Layouts that appear in this category category */
+	FDetailLayoutMap LayoutMap;
+	/** All Simple child nodes */
+	TArray< TSharedRef<FDetailTreeNode> > SimpleChildNodes;
+	/** All Advanced child nodes */
+	TArray< TSharedRef<FDetailTreeNode> > AdvancedChildNodes;
+	/** Advanced dropdown node. */
+	TSharedPtr<FDetailTreeNode> AdvancedDropdownNode;
+	/** Delegate called when expansion of the category changes */
+	FOnBooleanValueChanged OnExpansionChangedDelegate;
+	/** The display name of the category */
+	FText DisplayName;
+	/** The path name of the category */
+	FString CategoryPathName;
+	/** Custom header content displayed to the right of the category name */
+	TSharedPtr<SWidget> HeaderContentWidget;
+	/** A property node that is displayed in the header row to the right of the category name. */
+	TSharedPtr<FDetailTreeNode> InlinePropertyNode;
+	/** The parent detail builder */
+	TWeakPtr<FDetailLayoutBuilderImpl> DetailLayoutBuilder;
+	/** The category identifier */
+	FName CategoryName;
+	/** The sort order of this category (amongst all categories) */
+	int32 SortOrder;
+	/** Whether or not to restore the expansion state between sessions */
+	bool bRestoreExpansionState : 1;
+	/** Whether or not the category should be initially collapsed */
+	bool bShouldBeInitiallyCollapsed : 1;
+	/** Whether or not advanced properties should be shown (as specified by the user) */
+	bool bUserShowAdvanced : 1;
+	/** Whether or not advanced properties are forced to be shown (this is an independent toggle from bShowAdvanced which is user driven)*/
+	bool bForceAdvanced : 1;
+	/** Whether or not the content in the category is being filtered */
+	bool bHasFilterStrings : 1;
+	/** true if anything is visible in the category */
+	bool bHasVisibleDetails : 1;
+	/** true if the category is visible at all */
+	bool bIsCategoryVisible : 1;
+	/*true if this category is the special favorite category, all property in the layout will be display when we generate the root tree */
+	bool bFavoriteCategory : 1;
+	bool bShowOnlyChildren : 1;
+	bool bHasVisibleAdvanced : 1;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryGroupNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryGroupNode.cpp
new file mode 100644
index 0000000..b8aa70c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryGroupNode.cpp
@@ -0,0 +1,87 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailCategoryGroupNode.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/SDetailCategoryTableRow.h"
+
+namespace soda
+{
+
+FDetailCategoryGroupNode::FDetailCategoryGroupNode(FName InGroupName, TSharedRef<FDetailCategoryImpl> InParentCategory)
+	: ParentCategory(InParentCategory.Get())
+	, GroupName( InGroupName )
+	, bShouldBeVisible( false )
+	, bShowBorder(true)
+	, bHasSplitter(false)
+{
+	SetParentNode(InParentCategory);
+}
+
+void FDetailCategoryGroupNode::SetChildren(const FDetailNodeList& InChildNodes)
+{
+	ChildNodes = InChildNodes;
+	for (TSharedRef<FDetailTreeNode> Child : ChildNodes)
+	{
+		Child->SetParentNode(AsShared());
+	}
+}
+
+TSharedRef< ITableRow > FDetailCategoryGroupNode::GenerateWidgetForTableView( const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem)
+{
+	return SNew( SDetailCategoryTableRow, AsShared(), OwnerTable )
+		.DisplayName( FText::FromName(GroupName) )
+		.InnerCategory( true )
+		.ShowBorder( bShowBorder );
+}
+
+bool FDetailCategoryGroupNode::GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const
+{
+	OutRow.NameContent()
+	[
+		SNew(STextBlock)
+		.Font(FSodaStyle::GetFontStyle("PropertyWindow.NormalFont"))
+		.Text(FText::FromName(GroupName))
+	];
+
+	return true;
+}
+
+void FDetailCategoryGroupNode::GetChildren( FDetailNodeList& OutChildren )
+{
+	for( int32 ChildIndex = 0; ChildIndex < ChildNodes.Num(); ++ChildIndex )
+	{
+		TSharedRef<FDetailTreeNode>& Child = ChildNodes[ChildIndex];
+		if( Child->GetVisibility() == ENodeVisibility::Visible )
+		{
+			if( Child->ShouldShowOnlyChildren() )
+			{
+				Child->GetChildren( OutChildren );
+			}
+			else
+			{
+				OutChildren.Add( Child );
+			}
+		}
+	}
+}
+
+void FDetailCategoryGroupNode::FilterNode( const FDetailFilter& InFilter )
+{
+	bShouldBeVisible = false;
+	for( int32 ChildIndex = 0; ChildIndex < ChildNodes.Num(); ++ChildIndex )
+	{
+		TSharedRef<FDetailTreeNode>& Child = ChildNodes[ChildIndex];
+
+		Child->FilterNode( InFilter );
+
+		if( Child->GetVisibility() == ENodeVisibility::Visible )
+		{
+			bShouldBeVisible = true;
+
+			ParentCategory.RequestItemExpanded( Child, Child->ShouldBeExpanded() );
+		}
+	}
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryGroupNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryGroupNode.h
new file mode 100644
index 0000000..716ddcf
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCategoryGroupNode.h
@@ -0,0 +1,60 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "UObject/NameTypes.h"
+
+namespace soda
+{
+
+class FDetailCategoryGroupNode : public FDetailTreeNode, public TSharedFromThis<FDetailCategoryGroupNode>
+{
+public:
+	FDetailCategoryGroupNode(FName InGroupName, TSharedRef<FDetailCategoryImpl> InParentCategory);
+
+public:
+	void SetChildren(const FDetailNodeList& InChildNodes);
+
+	void SetShowBorder(bool bInShowBorder) { bShowBorder = bInShowBorder; }
+	bool GetShowBorder() const { return bShowBorder; }
+
+	void SetHasSplitter(bool bInHasSplitter) { bHasSplitter = bInHasSplitter; }
+	bool GetHasSplitter() const { return bHasSplitter; }
+
+private:
+	virtual IDetailsView* GetNodeDetailsView() const override { return ParentCategory.GetNodeDetailsView(); }
+	virtual IDetailsViewPrivate* GetDetailsView() const override { return ParentCategory.GetDetailsView(); }
+	virtual void OnItemExpansionChanged( bool bIsExpanded, bool bShouldSaveState) override {}
+	virtual bool ShouldBeExpanded() const override { return true; }
+	virtual ENodeVisibility GetVisibility() const override { return bShouldBeVisible ? ENodeVisibility::Visible : ENodeVisibility::HiddenDueToFiltering; }
+	virtual TSharedRef< ITableRow > GenerateWidgetForTableView( const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem) override;
+	virtual bool GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const override;
+
+	virtual EDetailNodeType GetNodeType() const override { return EDetailNodeType::Category; }
+	virtual TSharedPtr<IPropertyHandle> CreatePropertyHandle() const override { return nullptr; }
+	virtual void GetFilterStrings(TArray<FString>& OutFilterStrings) const override { OutFilterStrings.Add(GroupName.ToString()); };
+
+	virtual void GetChildren(FDetailNodeList& OutChildren ) override;
+	virtual void FilterNode( const FDetailFilter& InFilter ) override;
+	virtual void Tick( float DeltaTime ) override {}
+	virtual bool ShouldShowOnlyChildren() const override { return false; }
+	virtual FName GetNodeName() const override { return GroupName; }
+
+private:
+	FDetailNodeList ChildNodes;
+	FDetailCategoryImpl& ParentCategory;
+	FName GroupName;
+	bool bShouldBeVisible;
+
+	bool bShowBorder;
+	bool bHasSplitter;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCustomBuilderRow.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCustomBuilderRow.cpp
new file mode 100644
index 0000000..6e325eb
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCustomBuilderRow.cpp
@@ -0,0 +1,107 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailCustomBuilderRow.h"
+#include "RuntimePropertyEditor/IDetailCustomNodeBuilder.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailItemNode.h"
+#include "RuntimePropertyEditor/CustomChildBuilder.h"
+
+namespace soda
+{
+
+FDetailCustomBuilderRow::FDetailCustomBuilderRow( TSharedRef<IDetailCustomNodeBuilder> CustomBuilder )
+	: CustomNodeBuilder( CustomBuilder )
+{
+}
+
+void FDetailCustomBuilderRow::Tick( float DeltaTime ) 
+{
+	return CustomNodeBuilder->Tick( DeltaTime );
+}
+
+bool FDetailCustomBuilderRow::RequiresTick() const
+{
+	return CustomNodeBuilder->RequiresTick();
+}
+
+bool FDetailCustomBuilderRow::HasColumns() const
+{
+	return HeaderRow->HasColumns();
+}
+
+bool FDetailCustomBuilderRow::ShowOnlyChildren() const
+{
+	return !HeaderRow->HasAnyContent();
+}
+
+void FDetailCustomBuilderRow::OnItemNodeInitialized( TSharedRef<FDetailItemNode> InTreeNode, TSharedRef<FDetailCategoryImpl> InParentCategory, const TAttribute<bool>& InIsParentEnabled )
+{
+	ParentCategory = InParentCategory;
+	IsParentEnabled = InIsParentEnabled;
+
+	const bool bUpdateFilteredNodes = true;
+
+	// Set a delegate on the interface that it will call to rebuild this nodes children
+	CustomNodeBuilder->SetOnRebuildChildren(FSimpleDelegate::CreateSP(InTreeNode, &FDetailItemNode::GenerateChildren, bUpdateFilteredNodes));
+
+	CustomNodeBuilder->SetOnToggleExpansion(FOnToggleNodeExpansion::CreateSP(InTreeNode, &FDetailItemNode::SetExpansionState));
+
+	HeaderRow = MakeShared<FDetailWidgetRow>();
+
+	CustomNodeBuilder->GenerateHeaderRowContent(*HeaderRow);
+}
+
+FName FDetailCustomBuilderRow::GetCustomBuilderName() const
+{
+	return CustomNodeBuilder->GetName();
+}
+
+TSharedPtr<IPropertyHandle> FDetailCustomBuilderRow::GetPropertyHandle() const
+{
+	return CustomNodeBuilder->GetPropertyHandle();
+}
+
+void FDetailCustomBuilderRow::OnGenerateChildren( FDetailNodeList& OutChildren )
+{
+	ChildrenBuilder = MakeShared<FCustomChildrenBuilder>(ParentCategory.Pin().ToSharedRef());
+
+	CustomNodeBuilder->GenerateChildContent(*ChildrenBuilder);
+
+	const TArray< FDetailLayoutCustomization >& ChildRows = ChildrenBuilder->GetChildCustomizations();
+
+	for (int32 ChildIndex = 0; ChildIndex < ChildRows.Num(); ++ChildIndex)
+	{
+		TSharedRef<FDetailItemNode> ChildNodeItem = MakeShareable(new FDetailItemNode(ChildRows[ChildIndex], ParentCategory.Pin().ToSharedRef(), IsParentEnabled));
+		ChildNodeItem->Initialize();
+		OutChildren.Add(ChildNodeItem);
+	}
+}
+
+bool FDetailCustomBuilderRow::IsInitiallyCollapsed() const
+{
+	return CustomNodeBuilder->InitiallyCollapsed();
+}
+
+FDetailWidgetRow FDetailCustomBuilderRow::GetWidgetRow()
+{
+	return *HeaderRow;
+}
+
+bool FDetailCustomBuilderRow::AreChildCustomizationsHidden() const
+{
+	if (ChildrenBuilder && ChildrenBuilder->GetChildCustomizations().Num() > 0)
+	{
+		for (const FDetailLayoutCustomization& ChildCustomizations : ChildrenBuilder->GetChildCustomizations())
+		{
+			if (!ChildCustomizations.IsHidden())
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+	return false;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCustomBuilderRow.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCustomBuilderRow.h
new file mode 100644
index 0000000..1c29fa1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailCustomBuilderRow.h
@@ -0,0 +1,54 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/SDetailsViewBase.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+
+namespace soda
+{
+
+class FCustomChildrenBuilder;
+class FDetailCategoryImpl;
+class FDetailItemNode;
+class IDetailCustomNodeBuilder;
+
+class FDetailCustomBuilderRow : public IDetailLayoutRow, public TSharedFromThis<FDetailCustomBuilderRow>
+{
+public:
+	FDetailCustomBuilderRow( TSharedRef<IDetailCustomNodeBuilder> CustomBuilder );
+	virtual ~FDetailCustomBuilderRow() {}
+
+	/** IDetailLayoutRow interface */
+	virtual FName GetRowName() const override { return GetCustomBuilderName(); }
+
+	void Tick( float DeltaTime );
+	bool RequiresTick() const;
+	bool HasColumns() const;
+	bool ShowOnlyChildren() const;
+	void OnItemNodeInitialized( TSharedRef<FDetailItemNode> InTreeNode, TSharedRef<FDetailCategoryImpl> InParentCategory, const TAttribute<bool>& InIsParentEnabled );
+	TSharedRef<IDetailCustomNodeBuilder> GetCustomBuilder() const { return CustomNodeBuilder; }
+	FName GetCustomBuilderName() const;
+	TSharedPtr<IPropertyHandle> GetPropertyHandle() const;
+	void OnGenerateChildren( FDetailNodeList& OutChildren );
+	bool IsInitiallyCollapsed() const;
+	FDetailWidgetRow GetWidgetRow();
+	bool AreChildCustomizationsHidden() const;
+	void SetOriginalPath(FStringView Path) { OriginalPath = Path; }
+	const FString& GetOriginalPath() const { return OriginalPath; }
+
+private:
+	/** Whether or not our parent is enabled */
+	TAttribute<bool> IsParentEnabled;
+	TSharedPtr<FDetailWidgetRow> HeaderRow;
+	TSharedRef<IDetailCustomNodeBuilder> CustomNodeBuilder;
+	TSharedPtr<FCustomChildrenBuilder> ChildrenBuilder;
+	TWeakPtr<FDetailCategoryImpl> ParentCategory;
+	FString OriginalPath;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailFilter.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailFilter.h
new file mode 100644
index 0000000..de8939a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailFilter.h
@@ -0,0 +1,58 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+/** Represents a filter which controls the visibility of items in the details view */
+struct FDetailFilter
+{
+	FDetailFilter() :
+		bShowOnlyModified(false)
+		, bShowAllAdvanced(false)
+		, bShowAllChildrenIfCategoryMatches(true)
+		, bShowOnlyKeyable(false)
+		, bShowOnlyAnimated(false)
+		, bShowFavoritesCategory(false)
+		, bShowOnlyAllowed(false)
+	{}
+
+	bool IsEmptyFilter() const
+	{
+		return FilterStrings.Num() == 0
+			&& VisibleSections.Num() == 0
+			&& bShowOnlyModified == false
+			&& bShowAllAdvanced == false
+			&& bShowOnlyAllowed == false
+			&& bShowAllChildrenIfCategoryMatches == false
+			&& bShowOnlyKeyable == false
+			&& bShowOnlyAnimated == false;
+	}
+
+	/** Any user search terms that items must match */
+	TArray<FString> FilterStrings;
+	/** If we should only show modified properties */
+	bool bShowOnlyModified;
+	/** If we should show all advanced properties */
+	bool bShowAllAdvanced;
+	/** If we should show all the children if their category name matches the search */
+	bool bShowAllChildrenIfCategoryMatches;
+	/** If we should only show keyable properties */
+	bool bShowOnlyKeyable;
+	/** If we should only show animated properties */
+	bool bShowOnlyAnimated;
+	/** If we should show the favorites category. */
+	bool bShowFavoritesCategory;
+	/** If we should only show properties that match PropertyAllowList */
+	bool bShowOnlyAllowed;
+	/** The set of allowed properties to show. */
+	TSet<FPropertyPath> PropertyAllowList;
+	/** The set of selected sections to show. If empty, all sections are shown.*/
+	TSet<FName> VisibleSections;
+};
+
+}
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailGroup.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailGroup.cpp
new file mode 100644
index 0000000..99dca24
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailGroup.cpp
@@ -0,0 +1,310 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "DetailGroup.h"
+#include "Widgets/Input/SButton.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "Widgets/Images/SImage.h"
+
+#define LOCTEXT_NAMESPACE "FDetailGroup"
+
+namespace soda
+{
+
+FDetailGroup::FDetailGroup( const FName InGroupName, TSharedRef<FDetailCategoryImpl> InParentCategory, const FText& InLocalizedDisplayName, const bool bInStartExpanded )
+	: ParentCategory( InParentCategory )
+	, LocalizedDisplayName( InLocalizedDisplayName )
+	, GroupName( InGroupName )
+	, bStartExpanded( bInStartExpanded )
+	, ResetEnabled(false)
+{
+
+}
+
+FDetailWidgetRow& FDetailGroup::HeaderRow()
+{
+	HeaderCustomization = MakeShareable( new FDetailLayoutCustomization );
+	HeaderCustomization->WidgetDecl = MakeShareable( new FDetailWidgetRow );
+
+	return *HeaderCustomization->WidgetDecl;
+}
+
+IDetailPropertyRow& FDetailGroup::HeaderProperty( TSharedRef<IPropertyHandle> PropertyHandle )
+{
+	check( PropertyHandle->IsValidHandle() );
+
+	PropertyHandle->MarkHiddenByCustomization();
+
+	HeaderCustomization = MakeShareable( new FDetailLayoutCustomization );
+	HeaderCustomization->PropertyRow = MakeShareable( new FDetailPropertyRow( StaticCastSharedRef<FPropertyHandleBase>( PropertyHandle )->GetPropertyNode(), ParentCategory.Pin().ToSharedRef() ) );
+
+	return *HeaderCustomization->PropertyRow;
+}
+
+FDetailWidgetRow& FDetailGroup::AddWidgetRow()
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.WidgetDecl = MakeShareable( new FDetailWidgetRow );
+
+	GroupChildren.Add( NewCustomization );
+
+	return *NewCustomization.WidgetDecl;
+}
+
+IDetailPropertyRow& FDetailGroup::AddPropertyRow( TSharedRef<IPropertyHandle> PropertyHandle )
+{
+	check( PropertyHandle->IsValidHandle() );
+
+	PropertyHandle->MarkHiddenByCustomization();
+
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.PropertyRow = MakeShareable( new FDetailPropertyRow( StaticCastSharedRef<FPropertyHandleBase>( PropertyHandle )->GetPropertyNode(), ParentCategory.Pin().ToSharedRef() ) );
+
+	GroupChildren.Add( NewCustomization );
+
+	return *NewCustomization.PropertyRow;
+}
+
+TSharedPtr<IDetailPropertyRow> FDetailGroup::FindPropertyRow(TSharedRef<IPropertyHandle> PropertyHandle) const
+{
+	for (const FDetailLayoutCustomization& Customization : GroupChildren)
+	{
+		if (Customization.PropertyRow.IsValid() && Customization.PropertyRow->GetPropertyHandle() == PropertyHandle)
+		{
+			return Customization.PropertyRow;
+		}
+	}
+
+	return nullptr;
+}
+
+IDetailGroup& FDetailGroup::AddGroup(FName NewGroupName, const FText& InLocalizedDisplayName, bool bInStartExpanded)
+{
+	FDetailLayoutCustomization NewCustomization;
+	NewCustomization.DetailGroup = MakeShareable(new FDetailGroup(NewGroupName, ParentCategory.Pin().ToSharedRef(), InLocalizedDisplayName, bStartExpanded));
+
+	GroupChildren.Add(NewCustomization);
+
+	return *NewCustomization.DetailGroup;
+}
+
+void FDetailGroup::ToggleExpansion( bool bExpand )
+{
+	if( ParentCategory.IsValid() && OwnerTreeNode.IsValid() )
+	{
+		ParentCategory.Pin()->RequestItemExpanded( OwnerTreeNode.Pin().ToSharedRef(), bExpand );
+	}
+}
+
+bool FDetailGroup::GetExpansionState() const
+{
+	if (ParentCategory.IsValid() && OwnerTreeNode.IsValid())
+	{
+		return ParentCategory.Pin()->GetSavedExpansionState(*OwnerTreeNode.Pin().Get());
+	}
+	return false;
+}
+
+TSharedPtr<FDetailPropertyRow> FDetailGroup::GetHeaderPropertyRow() const
+{
+	return HeaderCustomization.IsValid() ? HeaderCustomization->PropertyRow : nullptr;
+}
+
+TSharedPtr<FPropertyNode> FDetailGroup::GetHeaderPropertyNode() const
+{
+	return HeaderCustomization.IsValid() ? HeaderCustomization->GetPropertyNode() : nullptr;
+}
+
+bool FDetailGroup::HasColumns() const
+{
+	if( HeaderCustomization.IsValid() && HeaderCustomization->HasPropertyNode() && HeaderCustomization->PropertyRow->HasColumns() )
+	{
+		return HeaderCustomization->PropertyRow->HasColumns();
+	}
+	else if( HeaderCustomization.IsValid() && HeaderCustomization->HasCustomWidget() )
+	{
+		return HeaderCustomization->WidgetDecl->HasColumns();
+	}
+	
+	return true;
+}
+
+bool FDetailGroup::RequiresTick() const
+{
+	bool bRequiresTick = false;
+	if( HeaderCustomization.IsValid() && HeaderCustomization->HasPropertyNode() )
+	{
+		bRequiresTick = HeaderCustomization->PropertyRow->RequiresTick();
+	}
+	else if ( HeaderCustomization.IsValid() && HeaderCustomization->HasCustomWidget() )
+	{
+		bRequiresTick = HeaderCustomization->WidgetDecl->VisibilityAttr.IsBound();
+	}
+
+	return bRequiresTick;
+}
+
+EVisibility FDetailGroup::GetGroupVisibility() const
+{
+	EVisibility Visibility = EVisibility::Visible;
+	if( HeaderCustomization.IsValid() && HeaderCustomization->HasPropertyNode() )
+	{
+		Visibility = HeaderCustomization->PropertyRow->GetPropertyVisibility();
+	}
+	else if ( HeaderCustomization.IsValid() && HeaderCustomization->HasCustomWidget() )
+	{
+		Visibility = HeaderCustomization->WidgetDecl->VisibilityAttr.Get();
+	}
+
+	return Visibility;
+}
+
+FDetailWidgetRow FDetailGroup::GetWidgetRow()
+{
+	if( HeaderCustomization.IsValid() && HeaderCustomization->HasPropertyNode() )
+	{
+		return HeaderCustomization->PropertyRow->GetWidgetRow();
+	}
+	else if ( HeaderCustomization.IsValid() && HeaderCustomization->HasCustomWidget() )
+	{
+		return *HeaderCustomization->WidgetDecl;
+	}
+	else
+	{
+		FDetailWidgetRow Row;
+
+		Row.NameContent()
+		[
+			MakeNameWidget()
+		];
+
+		Row.OverrideResetToDefault(FResetToDefaultOverride::Create(TAttribute<bool>(this, &FDetailGroup::IsResetVisible), FSimpleDelegate::CreateSP(this, &FDetailGroup::OnResetClicked)));
+
+		return Row;
+	}
+}
+
+void FDetailGroup::OnItemNodeInitialized( TSharedRef<FDetailItemNode> InTreeNode, TSharedRef<FDetailCategoryImpl> InParentCategory, const TAttribute<bool>& InIsParentEnabled )
+{
+	OwnerTreeNode = InTreeNode;
+	ParentCategory = InParentCategory;
+	IsParentEnabled = InIsParentEnabled;
+
+	if( HeaderCustomization.IsValid() && HeaderCustomization->HasPropertyNode() )
+	{
+		HeaderCustomization->PropertyRow->OnItemNodeInitialized( InParentCategory, InIsParentEnabled, AsShared() );
+	}
+}
+
+void FDetailGroup::OnGenerateChildren( FDetailNodeList& OutChildren )
+{
+	for( int32 ChildIndex = 0; ChildIndex < GroupChildren.Num(); ++ChildIndex )
+	{
+		TSharedRef<FDetailItemNode> NewNode = MakeShareable( new FDetailItemNode( GroupChildren[ChildIndex], ParentCategory.Pin().ToSharedRef(), IsParentEnabled, AsShared()) );
+		NewNode->Initialize();
+		OutChildren.Add( NewNode );
+	}
+}
+
+FReply FDetailGroup::OnNameClicked()
+{
+	OwnerTreeNode.Pin()->ToggleExpansion();
+
+	return FReply::Handled();
+}
+
+TSharedRef<SWidget> FDetailGroup::MakeNameWidget()
+{
+	return
+		SNew( SButton )
+		.ButtonStyle( FSodaStyle::Get(), "NoBorder" )
+		.ContentPadding(FMargin(0,2,0,2))
+		.OnClicked( this, &FDetailGroup::OnNameClicked )				
+		.ForegroundColor( FSlateColor::UseForeground() )
+		.Content()
+		[
+			SNew( STextBlock )
+			.Font( IDetailLayoutBuilder::GetDetailFont() )
+			.Text( LocalizedDisplayName )
+		];
+}
+
+void FDetailGroup::OnResetClicked()
+{
+	if (ResetEnabled)
+	{
+		TArray<TSharedPtr<IPropertyHandle>> PropertyHandles;
+
+		if (GetAllChildrenPropertyHandles(PropertyHandles))
+		{
+			for (TSharedPtr<IPropertyHandle> PropertyHandle : PropertyHandles)
+			{
+				PropertyHandle->ResetToDefault();
+			}
+
+			OnDetailGroupReset.Broadcast();
+		}
+	}
+}
+
+bool FDetailGroup::IsResetVisible() const
+{
+	if (ResetEnabled)
+	{
+		TArray<TSharedPtr<IPropertyHandle>> PropertyHandles;
+
+		if (GetAllChildrenPropertyHandles(PropertyHandles))
+		{
+			for (TSharedPtr<IPropertyHandle> PropertyHandle : PropertyHandles)
+			{
+				if (PropertyHandle->DiffersFromDefault())
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+void FDetailGroup::EnableReset(bool InValue)
+{
+	ResetEnabled = InValue;
+}
+
+bool FDetailGroup::GetAllChildrenPropertyHandles(TArray<TSharedPtr<IPropertyHandle>>& PropertyHandles) const
+{
+	PropertyHandles.Reserve(GroupChildren.Num());
+	return GetAllChildrenPropertyHandlesRecursive(this, PropertyHandles);
+}
+
+bool FDetailGroup::GetAllChildrenPropertyHandlesRecursive(const FDetailGroup* CurrentDetailGroup, TArray<TSharedPtr<IPropertyHandle>>& PropertyHandles) const
+{
+	bool Result = false;
+
+	for (const FDetailLayoutCustomization& Customization : CurrentDetailGroup->GroupChildren)
+	{
+		if (Customization.HasPropertyNode())
+		{
+			PropertyHandles.Add(Customization.PropertyRow->GetPropertyHandle());
+			Result = true;
+		}
+		else if (Customization.HasGroup())
+		{
+			Result &= GetAllChildrenPropertyHandlesRecursive(Customization.DetailGroup.Get(), PropertyHandles);
+		}
+		else if (Customization.HasCustomWidget())
+		{
+			PropertyHandles.Append(Customization.WidgetDecl->GetPropertyHandles());
+			Result = true;
+		}
+	}
+
+	return Result;
+}
+
+} //namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailGroup.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailGroup.h
new file mode 100644
index 0000000..3aa08f8
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailGroup.h
@@ -0,0 +1,135 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailItemNode.h"
+#include "RuntimePropertyEditor/IDetailGroup.h"
+
+namespace soda
+{
+
+class IDetailPropertyRow;
+
+class FDetailGroup : public IDetailGroup, public IDetailLayoutRow, public TSharedFromThis<FDetailGroup>
+{
+public:
+	FDetailGroup( const FName InGroupName, TSharedRef<FDetailCategoryImpl> InParentCategory, const FText& InLocalizedDisplayName, const bool bStartExpanded = false );
+
+	/** IDetailGroup interface */     
+	virtual FDetailWidgetRow& HeaderRow() override;
+	virtual IDetailPropertyRow& HeaderProperty( TSharedRef<IPropertyHandle> PropertyHandle ) override;
+	virtual FDetailWidgetRow& AddWidgetRow() override;
+	virtual IDetailPropertyRow& AddPropertyRow( TSharedRef<IPropertyHandle> PropertyHandle ) override;
+	virtual IDetailGroup& AddGroup(FName NewGroupName, const FText& InLocalizedDisplayName, bool bInStartExpanded = false) override;
+
+	virtual void ToggleExpansion( bool bExpand ) override;
+	virtual bool GetExpansionState() const override;
+
+	/** IDetailLayoutRow interface */
+	virtual FName GetRowName() const override { return GetGroupName(); }
+
+	TSharedPtr<FDetailPropertyRow> GetHeaderPropertyRow() const;
+	TSharedPtr<FPropertyNode> GetHeaderPropertyNode() const;
+
+	/** @return The name of the group */
+	virtual FName GetGroupName() const override { return GroupName; }
+
+	/** Whether or not the group has columns */
+	bool HasColumns() const;
+
+	/** @return true if this row should be ticked */
+	bool RequiresTick() const;
+
+	/** @return true is this row should start expanded */
+	bool ShouldStartExpanded() const { return bStartExpanded; }
+
+	/** 
+	 * @return The visibility of this group
+	 */
+	EVisibility GetGroupVisibility() const;
+
+	/**
+	 * Called by the owning item node when it has been initialized
+	 *
+	 * @param InTreeNode		The node that owns this group
+	 * @param InParentCategory	The category this group is located in
+	 * @param InIsParentEnabled	Whether or not the parent node is enabled
+	 */
+	void OnItemNodeInitialized( TSharedRef<class FDetailItemNode> InTreeNode, TSharedRef<FDetailCategoryImpl> InParentCategory, const TAttribute<bool>& InIsParentEnabled );
+
+	/** @return the row which should be displayed for this group */
+	FDetailWidgetRow GetWidgetRow();
+
+	/**
+	 * Called to generate children of this group
+	 *
+	 * @param OutChildren	The list of children to add to
+	 */
+	void OnGenerateChildren( FDetailNodeList& OutChildren );
+
+
+	/**
+	* Permit resetting all the properties in the group
+	*/
+	virtual void EnableReset(bool InValue);
+
+	/**
+	* Return the property row associated with the specified property handle
+	*/
+	virtual TSharedPtr<IDetailPropertyRow> FindPropertyRow(TSharedRef<IPropertyHandle> PropertyHandle) const override;
+
+	/**
+	* Return the delegate called when user press the Group Reset ui
+	*/
+	virtual FDetailGroupReset& GetOnDetailGroupReset() override { return OnDetailGroupReset; }
+
+private:
+	/**
+	 * Called when the name of the group is clicked to expand the group
+	 */
+	FReply OnNameClicked();
+
+	/** 
+	 * Makes a name widget for this group 
+	 */
+	TSharedRef<SWidget> MakeNameWidget();
+
+	/** Called when the "Reset to Default" button for the location has been clicked */
+	void OnResetClicked();
+	bool IsResetVisible() const;
+	bool GetAllChildrenPropertyHandles(TArray<TSharedPtr<IPropertyHandle>>& PropertyHandles) const;
+	bool GetAllChildrenPropertyHandlesRecursive(const FDetailGroup* CurrentDetailGroup, TArray<TSharedPtr<IPropertyHandle>>& PropertyHandles) const;
+
+private:
+	/** Customized group children */
+	TArray<FDetailLayoutCustomization> GroupChildren;
+	/** User customized header row */
+	TSharedPtr<FDetailLayoutCustomization> HeaderCustomization;
+	/** Owner node of this group */
+	TWeakPtr<class FDetailItemNode> OwnerTreeNode;
+	/** Parent category of this group */
+	TWeakPtr<FDetailCategoryImpl> ParentCategory;
+	/** Whether or not our parent is enabled */
+	TAttribute<bool> IsParentEnabled;
+	/** Display name of this group */
+	FText LocalizedDisplayName;
+	/** Name identifier of this group */
+	FName GroupName;
+	/** Whether the detail group should start expanded or not */
+	bool bStartExpanded;
+	/** Permit resetting all the properties in the group */
+	bool ResetEnabled;
+	/**	Delegate called when user press the Group Reset ui */
+	FDetailGroupReset OnDetailGroupReset;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailItemNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailItemNode.cpp
new file mode 100644
index 0000000..9219fab
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailItemNode.cpp
@@ -0,0 +1,892 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailItemNode.h"
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "RuntimePropertyEditor/DetailCategoryGroupNode.h"
+#include "RuntimePropertyEditor/DetailGroup.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/IDetailKeyframeHandler.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/SConstrainedBox.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyEditorPermissionList.h"
+#include "RuntimePropertyEditor/SDetailCategoryTableRow.h"
+#include "RuntimePropertyEditor/SDetailSingleItemRow.h"
+
+namespace soda
+{
+
+FDetailItemNode::FDetailItemNode(const FDetailLayoutCustomization& InCustomization, TSharedRef<FDetailCategoryImpl> InParentCategory, TAttribute<bool> InIsParentEnabled, TSharedPtr<IDetailGroup> InParentGroup)
+	: Customization( InCustomization )
+	, ParentCategory( InParentCategory )
+	, ParentGroup(InParentGroup)
+	, IsParentEnabled( InIsParentEnabled )
+	, CachedItemVisibility( EVisibility::Visible )
+	, bShouldBeVisibleDueToFiltering( false )
+	, bShouldBeVisibleDueToChildFiltering( false )
+	, bTickable( false )
+	, bIsExpanded( InCustomization.HasCustomBuilder() ? !InCustomization.CustomBuilderRow->IsInitiallyCollapsed() : false )
+	, bIsHighlighted( false )
+{
+	SetParentNode(InParentCategory);
+}
+
+void FDetailItemNode::Initialize()
+{
+	if( ( Customization.HasCustomWidget() && Customization.WidgetDecl->VisibilityAttr.IsBound() )
+		|| ( Customization.HasCustomBuilder() && Customization.CustomBuilderRow->RequiresTick() )
+		|| ( Customization.HasPropertyNode() && Customization.PropertyRow->RequiresTick() )
+		|| ( Customization.HasGroup() && Customization.DetailGroup->RequiresTick() ) )
+	{
+		// The node needs to be ticked because it has widgets that can dynamically come and go
+		bTickable = true;
+		ParentCategory.Pin()->AddTickableNode( *this );
+	}
+
+	if( Customization.HasPropertyNode() )
+	{
+		InitPropertyEditor();
+	}
+	else if( Customization.HasCustomBuilder() )
+	{
+		InitCustomBuilder();
+	}
+	else if( Customization.HasGroup() )
+	{
+		InitGroup();
+	}
+
+	if (Customization.PropertyRow.IsValid() && Customization.PropertyRow->GetForceAutoExpansion())
+	{
+		const bool bShouldExpand = true;
+		const bool bSaveState = false;
+		SetExpansionState(bShouldExpand, bSaveState);
+	}
+
+	CachedItemVisibility = ComputeItemVisibility();
+
+	const bool bUpdateFilteredNodes = false;
+	GenerateChildren( bUpdateFilteredNodes );
+}
+
+FDetailItemNode::~FDetailItemNode()
+{
+	if( bTickable && ParentCategory.IsValid() )
+	{
+		ParentCategory.Pin()->RemoveTickableNode( *this );
+	}
+}
+
+EDetailNodeType FDetailItemNode::GetNodeType() const
+{
+	if (Customization.HasPropertyNode() && Customization.GetPropertyNode()->AsCategoryNode())
+	{
+		return EDetailNodeType::Category;
+	}
+	else
+	{
+		return EDetailNodeType::Item;
+	}
+}
+
+TSharedPtr<IPropertyHandle> FDetailItemNode::CreatePropertyHandle() const
+{
+	TSharedPtr<FDetailCategoryImpl> ParentCategoryPtr = ParentCategory.Pin();
+	if (Customization.HasPropertyNode() && ParentCategoryPtr && ParentCategoryPtr->IsParentLayoutValid())
+	{
+		return ParentCategoryPtr->GetParentLayoutImpl().GetPropertyHandle(Customization.GetPropertyNode());
+	}
+	else if (Customization.HasCustomWidget())
+	{
+		const TArray<TSharedPtr<IPropertyHandle>>& Handles = Customization.WidgetDecl->GetPropertyHandles();
+		if (Handles.Num() > 0)
+		{
+			return Handles[0];
+		}
+	}
+
+	return nullptr;
+}
+
+void FDetailItemNode::GetFilterStrings(TArray<FString>& OutFilterStrings) const
+{
+	if (Customization.HasCustomWidget())
+	{
+		OutFilterStrings.Add(Customization.GetWidgetRow().FilterTextString.ToString());
+	}
+
+	if (Customization.HasPropertyNode())
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = Customization.GetPropertyNode();
+		if (PropertyNode.IsValid())
+		{
+			OutFilterStrings.Add(GetPropertyNode()->GetDisplayName().ToString());
+			if (PropertyNode->GetDisplayName().ToString() != PropertyNode->GetProperty()->GetName())
+			{
+				OutFilterStrings.Add(PropertyNode->GetProperty()->GetName());
+			}
+		}
+	}
+}
+
+bool FDetailItemNode::GetInitiallyCollapsed() const
+{
+	if (Customization.IsValidCustomization() && Customization.PropertyRow.IsValid())
+	{
+		return Customization.PropertyRow->GetForceAutoExpansion() == false;
+	}
+	return true;
+}
+
+void FDetailItemNode::InitPropertyEditor()
+{
+	FProperty* NodeProperty = Customization.GetPropertyNode()->GetProperty();
+
+	if( NodeProperty && (NodeProperty->IsA<FArrayProperty>() || NodeProperty->IsA<FSetProperty>() || NodeProperty->IsA<FMapProperty>() ))
+	{
+		const bool bUpdateFilteredNodes = false;
+		FSimpleDelegate OnRegenerateChildren = FSimpleDelegate::CreateSP( this, &FDetailItemNode::GenerateChildren, bUpdateFilteredNodes );
+
+		Customization.GetPropertyNode()->SetOnRebuildChildren( OnRegenerateChildren );
+	}
+
+	Customization.PropertyRow->OnItemNodeInitialized( ParentCategory.Pin().ToSharedRef(), IsParentEnabled, ParentGroup.IsValid() ? ParentGroup.Pin() : nullptr );
+
+	if (Customization.HasExternalPropertyRow())
+	{
+		const bool bSaveState = false;
+		SetExpansionState(ParentCategory.Pin()->GetSavedExpansionState(*this), bSaveState);
+	}
+}
+
+void FDetailItemNode::InitCustomBuilder()
+{
+	Customization.CustomBuilderRow->OnItemNodeInitialized( AsShared(), ParentCategory.Pin().ToSharedRef(), IsParentEnabled );
+
+	// Restore saved expansion state
+	FName BuilderName = Customization.CustomBuilderRow->GetCustomBuilderName();
+	if( BuilderName != NAME_None )
+	{
+		const bool bSaveState = false;
+		SetExpansionState(ParentCategory.Pin()->GetSavedExpansionState(*this), bSaveState);
+	}
+}
+
+void FDetailItemNode::InitGroup()
+{
+	Customization.DetailGroup->OnItemNodeInitialized( AsShared(), ParentCategory.Pin().ToSharedRef(), IsParentEnabled );
+
+	if (Customization.DetailGroup->ShouldStartExpanded())
+	{
+		bIsExpanded = true;
+	}
+	else
+	{
+		// Restore saved expansion state
+		FName GroupName = Customization.DetailGroup->GetGroupName();
+		if (GroupName != NAME_None)
+		{
+			const bool bSaveState = false;
+			SetExpansionState(ParentCategory.Pin()->GetSavedExpansionState(*this), bSaveState);
+		}
+	}
+}
+
+bool FDetailItemNode::HasMultiColumnWidget() const
+{
+	return ( Customization.HasCustomWidget() && Customization.WidgetDecl->HasColumns() )
+		|| ( Customization.HasCustomBuilder() && Customization.CustomBuilderRow->HasColumns() )
+		|| ( Customization.HasGroup() && Customization.DetailGroup->HasColumns() )
+		|| ( Customization.HasPropertyNode() && Customization.PropertyRow->HasColumns());
+}
+
+void FDetailItemNode::ToggleExpansion()
+{
+	const bool bSaveState = true;
+	SetExpansionState( !bIsExpanded, bSaveState );
+}
+
+void FDetailItemNode::SetExpansionState(bool bWantsExpanded, bool bSaveState)
+{
+	bIsExpanded = bWantsExpanded;
+
+	// Expand the child after filtering if it wants to be expanded
+	ParentCategory.Pin()->RequestItemExpanded(AsShared(), bIsExpanded);
+
+	OnItemExpansionChanged(bIsExpanded, bSaveState);
+}
+
+void FDetailItemNode::SetExpansionState(bool bWantsExpanded)
+{
+	const bool bSaveState = true;
+	SetExpansionState(bWantsExpanded, bSaveState);
+}
+
+TSharedRef< ITableRow > FDetailItemNode::GenerateWidgetForTableView( const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem)
+{
+	FTagMetaData TagMeta(TEXT("DetailRowItem"));
+	if (ParentCategory.IsValid())
+	{
+		if (Customization.IsValidCustomization() && Customization.GetPropertyNode().IsValid())
+		{
+			TagMeta.Tag = *FString::Printf(TEXT("DetailRowItem.%s"), *Customization.GetPropertyNode()->GetDisplayName().ToString());
+		}
+		else if (Customization.HasCustomWidget() )
+		{
+			TagMeta.Tag = Customization.GetWidgetRow().RowTagName;
+		}
+	}
+
+	if( Customization.HasPropertyNode() && Customization.GetPropertyNode()->AsCategoryNode() )
+	{
+		return
+			SNew(SDetailCategoryTableRow, AsShared(), OwnerTable)
+			.DisplayName(Customization.GetPropertyNode()->GetDisplayName())
+			.AddMetaData<FTagMetaData>(TagMeta)
+			.InnerCategory(true);
+	}
+	else
+	{
+		return
+			SNew(SDetailSingleItemRow, &Customization, HasMultiColumnWidget(), AsShared(), OwnerTable )
+			.AddMetaData<FTagMetaData>(TagMeta)
+			.AllowFavoriteSystem(bAllowFavoriteSystem);
+	}
+}
+
+bool FDetailItemNode::GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const
+{
+	bool bResult = false;
+
+	if (Customization.HasPropertyNode() && Customization.GetPropertyNode()->AsCategoryNode())
+	{
+		const bool bIsInnerCategory = true;
+
+		OutRow.NameContent()
+		[
+			SNew(STextBlock)
+			.Text(Customization.GetPropertyNode()->GetDisplayName())
+			.Font(FSodaStyle::GetFontStyle(bIsInnerCategory ? "PropertyWindow.NormalFont" : "DetailsView.CategoryFontStyle"))
+			.ShadowOffset(bIsInnerCategory ? FVector2D::ZeroVector : FVector2D(1.0f, 1.0f))
+		];
+
+		bResult = true;
+	}
+	else if (Customization.IsValidCustomization())
+	{
+		FDetailWidgetRow Row = Customization.GetWidgetRow();
+
+		// We make some slight modifications to the row here before giving it to OutRow
+		if (HasMultiColumnWidget())
+		{
+			TSharedPtr<SWidget> NameWidget = Row.NameWidget.Widget;
+			TSharedPtr<SWidget> ValueWidget =
+				SNew(SConstrainedBox)
+				.MinWidth(Row.ValueWidget.MinWidth)
+				.MaxWidth(Row.ValueWidget.MaxWidth)
+				[
+					Row.ValueWidget.Widget
+				];
+
+			if (Row.IsEnabledAttr.IsSet() || Row.IsValueEnabledAttr.IsSet() || Row.EditConditionValue.IsSet())
+			{
+				// copies of attributes for lambda captures
+				TAttribute<bool> PropertyEnabledAttribute = IsPropertyEditingEnabled();
+				TAttribute<bool> RowIsEnabledAttribute = Row.IsEnabledAttr;
+				TAttribute<bool> RowEditConditionAttribute = Row.EditConditionValue;
+
+				TAttribute<bool> IsEnabledAttribute = TAttribute<bool>::CreateLambda(
+					[PropertyEnabledAttribute, RowIsEnabledAttribute, RowEditConditionAttribute]()
+					{
+						return PropertyEnabledAttribute.Get() && RowIsEnabledAttribute.Get(true) && RowEditConditionAttribute.Get(true);
+					});
+
+				// there's an unavoidable conflict here if the user customizes the widget to have a custom IsEnabled,
+				// and a custom EditCondition/IsEnabled on the widget row - we choose to favor the row in this case
+				NameWidget->SetEnabled(IsEnabledAttribute);
+
+				if (Row.IsValueEnabledAttr.IsSet())
+				{
+					TAttribute<bool> RowIsValueEnabledAttribute = Row.IsValueEnabledAttr;
+					TAttribute<bool> IsValueWidgetEnabledAttribute = TAttribute<bool>::CreateLambda(
+						[IsEnabledAttribute, RowIsValueEnabledAttribute]()
+						{
+							return IsEnabledAttribute.Get() && RowIsValueEnabledAttribute.Get(true);
+						});
+
+					ValueWidget->SetEnabled(IsValueWidgetEnabledAttribute);
+				}
+				else
+				{
+					ValueWidget->SetEnabled(IsEnabledAttribute);
+				}
+			}
+
+			OutRow.NameContent()
+			[
+				NameWidget.ToSharedRef()
+			];
+
+			OutRow.ValueContent()
+			[
+				ValueWidget.ToSharedRef()
+			];
+		}
+		else
+		{
+			OutRow.WholeRowContent()
+			[
+				Row.WholeRowWidget.Widget
+			];
+		}
+
+		OutRow.CustomResetToDefault = Row.CustomResetToDefault;
+		OutRow.IsEnabledAttr = Row.IsEnabledAttr;
+		OutRow.EditConditionValue = Row.EditConditionValue;
+		OutRow.OnEditConditionValueChanged = Row.OnEditConditionValueChanged;
+
+		OutRow.CopyMenuAction = Row.CopyMenuAction;
+		OutRow.PasteMenuAction = Row.PasteMenuAction;
+		OutRow.CustomMenuItems = Row.CustomMenuItems;
+
+		OutRow.FilterTextString = Row.FilterTextString;
+
+		bResult = true;
+	}
+
+	return bResult;
+}
+
+void FDetailItemNode::GetChildren(FDetailNodeList& OutChildren)
+{
+	for( int32 ChildIndex = 0; ChildIndex < Children.Num(); ++ChildIndex )
+	{
+		TSharedRef<FDetailTreeNode>& Child = Children[ChildIndex];
+
+		ENodeVisibility ChildVisibility = Child->GetVisibility();
+
+		// Report the child if the child is visible or we are visible due to filtering and there were no filtered children.  
+		// If we are visible due to filtering and so is a child, we only show that child.  
+		// If we are visible due to filtering and no child is visible, we show all children
+
+		if( ChildVisibility == ENodeVisibility::Visible ||
+			( !bShouldBeVisibleDueToChildFiltering && bShouldBeVisibleDueToFiltering && ChildVisibility != ENodeVisibility::ForcedHidden ) )
+		{
+			if( Child->ShouldShowOnlyChildren() )
+			{
+				Child->GetChildren( OutChildren );
+			}
+			else
+			{
+				OutChildren.Add( Child );
+			}
+		}
+	}
+}
+
+void FDetailItemNode::GenerateChildren( bool bUpdateFilteredNodes )
+{
+	FDetailNodeList OldChildren = Children;
+	Children.Empty();
+
+	TSharedPtr<FDetailCategoryImpl> ParentCategoryPinned = ParentCategory.Pin();
+	if (ParentCategoryPinned.IsValid() == false || !ParentCategoryPinned->IsParentLayoutValid())
+	{
+		return;
+	}
+
+	// Make sure to remove the root properties referenced by the old children, otherwise they will leak.
+	for (TSharedRef<FDetailTreeNode> OldChild : OldChildren)
+	{
+		TSharedPtr<FComplexPropertyNode> OldChildExternalRootPropertyNode = OldChild->GetExternalRootPropertyNode();
+		if (OldChildExternalRootPropertyNode.IsValid())
+		{
+			ParentCategoryPinned->GetParentLayoutImpl().RemoveExternalRootPropertyNode(OldChildExternalRootPropertyNode.ToSharedRef());
+		}
+	}
+
+	if( Customization.HasPropertyNode() )
+	{
+		Customization.PropertyRow->OnGenerateChildren( Children );
+	}
+	else if( Customization.HasCustomBuilder() )
+	{
+		Customization.CustomBuilderRow->OnGenerateChildren( Children );
+
+		// Need to refresh the tree for custom builders as we could be regenerating children at any point
+		ParentCategory.Pin()->RefreshTree( bUpdateFilteredNodes );
+	}
+	else if( Customization.HasGroup() )
+	{
+		Customization.DetailGroup->OnGenerateChildren( Children );
+	}
+
+	// Discard generated nodes that don't pass the property allow list, as well as generated categories who no longer contain any children
+	// Searching backwards guarantees that a category's children will be culled before the category itself.
+	for (int32 i = Children.Num() - 1; i >= 0; --i)
+	{
+		Children[i]->SetParentNode(AsShared());
+		if (Children[i]->GetNodeType() == EDetailNodeType::Object || Children[i]->GetNodeType() == EDetailNodeType::Item)
+		{
+			if (!FPropertyEditorPermissionList::Get().DoesPropertyPassFilter(Children[i]->GetParentBaseStructure(), Children[i]->GetNodeName()))
+			{
+				Children.RemoveAt(i);
+			}
+		}
+		else if (Children[i]->GetNodeType() == EDetailNodeType::Category)
+		{
+			// Nodes default to hidden until the filter runs the first time - categories return no children if they're hidden, so force an empty filter to initialize properly
+			Children[i]->FilterNode(FDetailFilter());
+			FDetailNodeList Subchildren;
+			Children[i]->GetChildren(Subchildren);
+			if (Subchildren.Num() == 0)
+			{
+				Children.RemoveAt(i);
+			}
+		}
+	}
+}
+
+
+void FDetailItemNode::OnItemExpansionChanged( bool bInIsExpanded, bool bShouldSaveState )
+{
+	bIsExpanded = bInIsExpanded;
+	if( Customization.HasPropertyNode() )
+	{
+		Customization.GetPropertyNode()->SetNodeFlags( EPropertyNodeFlags::Expanded, bInIsExpanded );
+	}
+
+	if (ParentCategory.IsValid() && bShouldSaveState &&
+			(  (Customization.HasCustomBuilder() && Customization.CustomBuilderRow->GetCustomBuilderName() != NAME_None)
+			|| (Customization.HasGroup() && Customization.DetailGroup->GetGroupName() != NAME_None)
+			|| (Customization.HasExternalPropertyRow())))
+	{
+		ParentCategory.Pin()->SaveExpansionState(*this);
+	}
+}
+
+bool FDetailItemNode::ShouldBeExpanded() const
+{
+	bool bShouldBeExpanded = bIsExpanded || bShouldBeVisibleDueToChildFiltering;
+	if( Customization.HasPropertyNode() )
+	{
+		FPropertyNode& PropertyNode = *Customization.GetPropertyNode();
+		bShouldBeExpanded = PropertyNode.HasNodeFlags( EPropertyNodeFlags::Expanded ) != 0;
+		bShouldBeExpanded |= PropertyNode.HasNodeFlags( EPropertyNodeFlags::IsSeenDueToChildFiltering ) != 0;
+	}
+	return bShouldBeExpanded;
+}
+
+ENodeVisibility FDetailItemNode::GetVisibility() const
+{
+	ENodeVisibility Visibility = CachedItemVisibility == EVisibility::Collapsed ? ENodeVisibility::ForcedHidden : ENodeVisibility::Visible;
+	if(Customization.IsHidden())
+	{
+		Visibility = ENodeVisibility::ForcedHidden;
+	}
+	else
+	{
+		Visibility = (bShouldBeVisibleDueToFiltering || bShouldBeVisibleDueToChildFiltering) ? Visibility : ENodeVisibility::HiddenDueToFiltering;
+	}
+	return Visibility;
+}
+
+static bool PassesAllFilters( FDetailItemNode* ItemNode, const FDetailLayoutCustomization& InCustomization, const FDetailFilter& InFilter, const FString& InCategoryName )
+{	
+	struct Local
+	{
+		static bool StringPassesFilter(const FDetailFilter& InDetailFilter, const FString& InString)
+		{
+			// Make sure the passed string matches all filter strings
+			if( InString.Len() > 0 )
+			{
+				for (int32 TestNameIndex = 0; TestNameIndex < InDetailFilter.FilterStrings.Num(); ++TestNameIndex)
+				{
+					const FString& TestName = InDetailFilter.FilterStrings[TestNameIndex];
+					if ( !InString.Contains(TestName) ) 
+					{
+						return false;
+					}
+				}
+				return true;
+			}
+			return false;
+		}
+		static bool ItemIsKeyable( FDetailItemNode *InItemNode, UClass *ObjectClass, TSharedPtr<FPropertyNode> PropertyNode)
+		{
+			IDetailsViewPrivate* DetailsView = InItemNode->GetDetailsView();
+			TSharedPtr<IDetailKeyframeHandler> KeyframeHandler = DetailsView->GetKeyframeHandler();
+			if (KeyframeHandler.IsValid())
+			{
+				TSharedPtr<IPropertyHandle> PropertyHandle = PropertyEditorHelpers::GetPropertyHandle(PropertyNode.ToSharedRef(), nullptr, nullptr);
+
+				return
+					KeyframeHandler->IsPropertyKeyingEnabled() &&
+					KeyframeHandler->IsPropertyKeyable(ObjectClass, *PropertyHandle);
+			}
+			return false;
+		}
+
+		static bool ItemIsAnimated(FDetailItemNode *InItemNode, TSharedPtr<FPropertyNode> PropertyNode)
+		{
+			IDetailsViewPrivate* DetailsView = InItemNode->GetDetailsView();
+			TSharedPtr<IDetailKeyframeHandler> KeyframeHandler = DetailsView->GetKeyframeHandler();
+			if (KeyframeHandler.IsValid())
+			{
+				TSharedPtr<IPropertyHandle> PropertyHandle = PropertyEditorHelpers::GetPropertyHandle(PropertyNode.ToSharedRef(), nullptr, nullptr);
+				FObjectPropertyNode *ParentPropertyNode = PropertyNode->FindObjectItemParent();
+				// Get an iterator for the enclosing objects.
+				for (int32 ObjIndex = 0; ObjIndex < ParentPropertyNode->GetNumObjects(); ++ObjIndex)
+				{
+					UObject* ParentObject = ParentPropertyNode->GetUObject(ObjIndex);
+
+					if (KeyframeHandler->IsPropertyAnimated(*PropertyHandle, ParentObject))
+					{
+						return true;
+					}
+				}
+			}
+			return false;
+		}
+
+		static FString GetPropertyNodeValueFilterString(const FDetailLayoutCustomization& InCustomization, TSharedPtr<FPropertyNode> PropertyNode)
+		{
+			if (PropertyNode.IsValid())
+			{
+				// Is it a container (array, map, set?) - if so, ignore it, we don't care about these, only their inner nodes.
+				if (CastField<FArrayProperty>(PropertyNode->GetProperty()) || CastField<FMapProperty>(PropertyNode->GetProperty()) || CastField<FSetProperty>(PropertyNode->GetProperty()))
+				{
+					return FString();
+				}
+
+				// Is it a struct?  If so, some structs are useful, like FGameplayTag, or FGameplayTags, but if it's a user struct for the game
+				// like FMyGameplayStruct, with a bunch of other sub nodes, that will individually be matched and filtered, there's no reason
+				// to filter on the struct as a whole, so essentially what we're doing here is only checking structs that are leaf nodes.
+				if (CastField<FStructProperty>(PropertyNode->GetProperty()))
+				{
+					if (PropertyNode->GetNumChildNodes() > 0)
+					{
+						return FString();
+					}
+				}
+
+				// TODO Will have to do something special for EditInlineNew UObjects, rather than just a simple object path.
+				if (FObjectProperty* ObjectProperty = CastField<FObjectProperty>(PropertyNode->GetProperty()))
+				{
+					uint8* ValueAddress = nullptr;
+					FPropertyAccess::Result Result = PropertyNode->GetSingleReadAddress(ValueAddress);
+					if (ValueAddress != nullptr)
+					{
+						if (UObject* ObjectValue = ObjectProperty->GetObjectPropertyValue(ValueAddress))
+						{
+							return ObjectValue->GetName();
+						}
+					}
+				}
+				else
+				{
+					// PPF_SimpleObjectText, seems to get the most reasonable string for searching.
+					FString OutString;
+					PropertyNode->GetPropertyValueString(OutString, true, PPF_SimpleObjectText);
+
+					return OutString;
+				}
+			}
+
+			return FString();
+		}
+	};
+
+	bool bPassesAllFilters = true;
+
+	if( InFilter.FilterStrings.Num() > 0 || 
+		InFilter.bShowOnlyModified == true || 
+		InFilter.bShowOnlyAllowed == true ||
+		InFilter.bShowOnlyKeyable == true || 
+		InFilter.bShowOnlyAnimated == true)
+	{
+		const bool bSearchFilterIsEmpty = InFilter.FilterStrings.Num() == 0;
+
+		TSharedPtr<FPropertyNode> PropertyNodePin = InCustomization.GetPropertyNode();
+		
+		const bool bPassesCategoryFilter = !bSearchFilterIsEmpty && InFilter.bShowAllChildrenIfCategoryMatches ? Local::StringPassesFilter(InFilter, InCategoryName) : false;
+		const bool bPassesValueFilter = !bSearchFilterIsEmpty && Local::StringPassesFilter(InFilter, Local::GetPropertyNodeValueFilterString(InCustomization, PropertyNodePin));
+
+		bPassesAllFilters = false;
+		if( PropertyNodePin.IsValid() && !PropertyNodePin->AsCategoryNode())
+		{
+			const bool bIsNotBeingFiltered = PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::IsBeingFiltered) == 0;
+			const bool bIsSeenDueToFiltering = PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering) != 0;
+			const bool bIsParentSeenDueToFiltering = PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::IsParentSeenDueToFiltering) != 0;
+
+			const bool bPassesSearchFilter = bPassesCategoryFilter || bPassesValueFilter || bSearchFilterIsEmpty || ( bIsNotBeingFiltered || bIsSeenDueToFiltering || bIsParentSeenDueToFiltering );
+			const bool bPassesModifiedFilter = bPassesSearchFilter && ( InFilter.bShowOnlyModified == false || PropertyNodePin->GetDiffersFromDefault() == true );
+			const bool bPassesAllowListFilter = InFilter.bShowOnlyAllowed ? InFilter.PropertyAllowList.Contains(*FPropertyNode::CreatePropertyPath(PropertyNodePin.ToSharedRef())) : true;
+
+			bool bPassesKeyableFilter = true;
+			if (InFilter.bShowOnlyKeyable)
+			{
+				FObjectPropertyNode* ParentPropertyNode = PropertyNodePin->FindObjectItemParent();
+				if (ParentPropertyNode != nullptr)
+				{
+					UClass* ObjectClass = ParentPropertyNode->GetObjectBaseClass();
+					bPassesKeyableFilter = Local::ItemIsKeyable(ItemNode, ObjectClass, PropertyNodePin);
+				}
+				else
+				{
+					bPassesKeyableFilter = false;
+				}
+			}
+			const bool bPassesAnimatedFilter = (InFilter.bShowOnlyAnimated == false || Local::ItemIsAnimated(ItemNode, PropertyNodePin));
+
+			// The property node is visible (note categories are never visible unless they have a child that is visible )
+			bPassesAllFilters = bPassesSearchFilter && bPassesModifiedFilter && bPassesAllowListFilter && bPassesKeyableFilter && bPassesAnimatedFilter;
+		}
+		else if (InCustomization.HasCustomWidget())
+		{
+			const bool bPassesTextFilter = bPassesCategoryFilter || bPassesValueFilter || Local::StringPassesFilter(InFilter, InCustomization.WidgetDecl->FilterTextString.ToString());
+			const bool bPassesModifiedFilter = InFilter.bShowOnlyModified == false || InCustomization.WidgetDecl->EditConditionValue.Get(false);
+			//@todo we need to support custom widgets for keyable, animated, in particular for transforms(ComponentTransformDetails).
+			const bool bPassesKeyableFilter = (InFilter.bShowOnlyKeyable == false);
+			const bool bPassesAnimatedFilter = (InFilter.bShowOnlyAnimated == false);
+			bPassesAllFilters = bPassesTextFilter && bPassesModifiedFilter && bPassesKeyableFilter && bPassesAnimatedFilter;
+		}
+		else if (InCustomization.HasCustomBuilder())
+		{
+			const bool bPassesTextFilter = bPassesCategoryFilter || bPassesValueFilter || Local::StringPassesFilter(InFilter, InCustomization.CustomBuilderRow->GetWidgetRow().FilterTextString.ToString());
+			//@todo we need to support custom builders for modified, keyable, animated, in particular for transforms(ComponentTransformDetails).
+			const bool bPassesModifiedFilter = (InFilter.bShowOnlyModified == false);
+			const bool bPassesKeyableFilter = (InFilter.bShowOnlyKeyable == false);
+			const bool bPassesAnimatedFilter = (InFilter.bShowOnlyAnimated == false);
+			bPassesAllFilters = bPassesTextFilter && bPassesModifiedFilter && bPassesKeyableFilter && bPassesAnimatedFilter;
+		}
+	}
+
+	return bPassesAllFilters;
+}
+
+void FDetailItemNode::Tick( float DeltaTime )
+{
+	if( ensure( bTickable ) )
+	{
+		if( Customization.HasCustomBuilder() && Customization.CustomBuilderRow->RequiresTick() ) 
+		{
+			Customization.CustomBuilderRow->Tick( DeltaTime );
+		}
+
+		// Recache visibility
+		EVisibility NewVisibility = ComputeItemVisibility();
+	
+		if( CachedItemVisibility != NewVisibility )
+		{
+			// The visibility of a node in the tree has changed.  We must refresh the tree to remove the widget
+			CachedItemVisibility = NewVisibility;
+			const bool bRefilterCategory = true;
+			ParentCategory.Pin()->RefreshTree( bRefilterCategory );
+		}
+	}
+}
+
+EVisibility FDetailItemNode::ComputeItemVisibility() const
+{
+	EVisibility NewVisibility = EVisibility::Visible;
+	if (Customization.HasPropertyNode())
+	{
+		NewVisibility = Customization.PropertyRow->GetPropertyVisibility();
+
+		if (NewVisibility != EVisibility::Collapsed)
+		{
+			TSharedPtr<FDetailCategoryImpl> ParentCategoryPtr = GetParentCategory();
+			if (ParentCategoryPtr.IsValid() && ParentCategoryPtr->IsParentLayoutValid())
+			{
+				if (!ParentCategoryPtr->GetParentLayout().IsPropertyVisible(CreatePropertyHandle().ToSharedRef()))
+				{
+					NewVisibility = EVisibility::Collapsed;
+				}
+			}
+		}
+	}
+	else if (Customization.HasCustomWidget())
+	{	
+		NewVisibility = Customization.WidgetDecl->VisibilityAttr.Get();
+	}
+	else if (Customization.HasGroup())
+	{
+		NewVisibility = Customization.DetailGroup->GetGroupVisibility();
+	}
+	else if (Customization.HasCustomBuilder() && Children.Num() > 0)
+	{
+		NewVisibility = EVisibility::Collapsed;
+
+		for (TSharedRef<FDetailTreeNode> Child : Children)
+		{
+			if (Child->GetVisibility() == ENodeVisibility::Visible)
+			{
+				NewVisibility = EVisibility::Visible;
+				break;
+			}
+		}
+	}
+
+	// check the details view's IsCustomRowVisible delegate if this isn't a property row
+	if (NewVisibility != EVisibility::Collapsed && 
+		GetDetailsView() != nullptr && 
+		!Customization.HasPropertyNode())
+	{
+		const FName CategoryName = GetParentCategory()->GetCategoryName();
+		FName RowName;
+		if (Customization.HasCustomWidget())
+		{
+			RowName = Customization.WidgetDecl->GetRowName();
+		}
+		else if (Customization.HasCustomBuilder())
+		{
+			RowName = Customization.CustomBuilderRow->GetCustomBuilderName();
+		}
+		else if (Customization.HasGroup())
+		{
+			RowName = Customization.DetailGroup->GetGroupName();
+		}
+
+		if (!GetDetailsView()->IsCustomRowVisible(RowName, CategoryName))
+		{
+			NewVisibility = EVisibility::Collapsed;
+		}
+	}
+
+	return NewVisibility;
+}
+
+bool FDetailItemNode::ShouldShowOnlyChildren() const
+{
+	// Show only children of this node if there is no content for custom details or the property node requests that only children be shown
+	return ( Customization.HasCustomBuilder() && Customization.CustomBuilderRow->ShowOnlyChildren() )
+		 || (Customization.HasPropertyNode() && Customization.PropertyRow->ShowOnlyChildren() );
+}
+
+FPropertyPath FDetailItemNode::GetPropertyPath() const
+{
+	FPropertyPath Ret;
+	TSharedPtr<FPropertyNode> PropertyNode = Customization.GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		Ret = *FPropertyNode::CreatePropertyPath( PropertyNode.ToSharedRef() );
+	}
+	return Ret;
+}
+
+TAttribute<bool> FDetailItemNode::IsPropertyEditingEnabled() const
+{
+	return MakeAttributeSP(this, &FDetailItemNode::IsPropertyEditingEnabledImpl);
+}
+
+bool FDetailItemNode::IsPropertyEditingEnabledImpl() const
+{
+	const bool IsParentEnabledValue = IsParentEnabled.Get(true);
+	if (Customization.HasCustomWidget())
+	{
+		IDetailsViewPrivate* DetailsView = GetDetailsView();
+		if (DetailsView)
+		{
+			return IsParentEnabledValue &&
+				!DetailsView->IsCustomRowReadOnly(FName(*Customization.WidgetDecl->FilterTextString.ToString()), FName(*GetParentCategory()->GetDisplayName().ToString()));
+		}
+	}
+	
+	return IsParentEnabledValue;
+}
+
+TSharedPtr<FPropertyNode> FDetailItemNode::GetPropertyNode() const
+{
+	return Customization.GetPropertyNode();
+}
+
+TSharedPtr<IDetailPropertyRow> FDetailItemNode::GetRow() const
+{
+	if (Customization.IsValidCustomization() && Customization.PropertyRow.IsValid())
+	{
+		return Customization.PropertyRow;
+	}
+	return nullptr;
+}
+
+TSharedPtr<FComplexPropertyNode> FDetailItemNode::GetExternalRootPropertyNode() const
+{
+	if (Customization.IsValidCustomization() && Customization.PropertyRow.IsValid())
+	{
+		return Customization.PropertyRow->GetExternalRootNode();
+	}
+	return nullptr;
+}
+
+void FDetailItemNode::FilterNode(const FDetailFilter& InFilter)
+{
+	bShouldBeVisibleDueToFiltering = PassesAllFilters(this, Customization, InFilter, ParentCategory.Pin()->GetDisplayName().ToString());
+	if (!bShouldBeVisibleDueToFiltering && ParentGroup.IsValid() && !ParentGroup.Pin()->GetGroupName().IsNone())
+	{
+		bShouldBeVisibleDueToFiltering = PassesAllFilters(this, Customization, InFilter, ParentGroup.Pin()->GetGroupName().ToString());
+	}
+
+	bShouldBeVisibleDueToChildFiltering = false;
+
+	// Filter each child
+	for( int32 ChildIndex = 0; ChildIndex < Children.Num(); ++ChildIndex )
+	{
+		TSharedRef<FDetailTreeNode>& Child = Children[ChildIndex];
+
+		// If the parent is visible, we pass an empty filter to all children so that they resume their
+		// default expansion.  This is a lot safer method, otherwise customized details panels tend to be
+		// filtered incorrectly because they have no means of discovering if their parents were filtered.
+		if ( bShouldBeVisibleDueToFiltering )
+		{
+			Child->FilterNode(FDetailFilter());
+
+			// The child should be visible, but maybe something else has it hidden, check if it's
+			// visible just for safety reasons.
+			if ( Child->GetVisibility() == ENodeVisibility::Visible )
+			{
+				// Expand the child after filtering if it wants to be expanded
+				ParentCategory.Pin()->RequestItemExpanded(Child, Child->ShouldBeExpanded());
+			}
+		}
+		else
+		{
+			Child->FilterNode(InFilter);
+
+			if ( Child->GetVisibility() == ENodeVisibility::Visible )
+			{
+				if ( !InFilter.IsEmptyFilter() )
+				{
+					// The child is visible due to filtering so we must also be visible
+					bShouldBeVisibleDueToChildFiltering = true;
+				}
+
+				// Expand the child after filtering if it wants to be expanded
+				ParentCategory.Pin()->RequestItemExpanded(Child, Child->ShouldBeExpanded());
+			}
+		}
+	}
+
+	// if this is a subcategory, it should only be visible if one or more of its children is visible
+	if (Customization.HasPropertyNode() &&
+		Customization.GetPropertyNode()->AsCategoryNode() && 
+		bShouldBeVisibleDueToFiltering)
+	{
+		bool bAnyChildVisible = false;
+		for (const TSharedRef<FDetailTreeNode>& Child : Children)
+		{
+			if (Child->GetVisibility() == ENodeVisibility::Visible)
+			{
+				bAnyChildVisible = true;
+				break;
+			}
+		}
+		if (!bAnyChildVisible)
+		{
+			bShouldBeVisibleDueToFiltering = false;
+		}
+	}
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailItemNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailItemNode.h
new file mode 100644
index 0000000..b88d78b
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailItemNode.h
@@ -0,0 +1,136 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Layout/Visibility.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+namespace soda
+{
+
+/**
+ * A single item in a detail tree                                                              
+ */
+class FDetailItemNode : public FDetailTreeNode, public TSharedFromThis<FDetailItemNode>
+{
+public:
+	FDetailItemNode( const FDetailLayoutCustomization& InCustomization, TSharedRef<FDetailCategoryImpl> InParentCategory, TAttribute<bool> InIsParentEnabled, TSharedPtr<IDetailGroup> InParentGroup = nullptr);
+	~FDetailItemNode();
+
+	/** IDetailTreeNode interface */
+	virtual EDetailNodeType GetNodeType() const override;
+	virtual TSharedPtr<IPropertyHandle> CreatePropertyHandle() const override;
+	virtual void GetFilterStrings(TArray<FString>& OutFilterStrings) const override;
+	virtual bool GetInitiallyCollapsed() const override;
+
+	/**
+	 * Initializes this node                                                              
+	 */
+	void Initialize();
+
+	void ToggleExpansion();
+
+	void SetExpansionState(bool bWantsExpanded, bool bSaveState);
+	void SetExpansionState(bool bWantsExpanded);
+	/**
+	 * Generates children for this node
+	 *
+	 * @param bUpdateFilteredNodes If true, details panel will re-filter to account for new nodes being added
+	 */
+	void GenerateChildren( bool bUpdateFilteredNodes );
+
+	/**
+	 * @return TRUE if this node has a widget with multiple columns                                                              
+	 */
+	bool HasMultiColumnWidget() const;
+
+	/**
+	 * @return true if this node has any children (regardless of child visibility)
+	 */
+	bool HasGeneratedChildren() const { return Children.Num() > 0;}
+
+	/**
+	 * @return The new, uncached visibility of this item.
+	 */
+	EVisibility ComputeItemVisibility() const;
+
+	/** FDetailTreeNode interface */
+	virtual IDetailsView* GetNodeDetailsView() const override { TSharedPtr<FDetailCategoryImpl> PC = GetParentCategory(); return PC.IsValid() ? PC->GetNodeDetailsView() : nullptr; }
+	virtual IDetailsViewPrivate* GetDetailsView() const override{ TSharedPtr<FDetailCategoryImpl> PC = GetParentCategory(); return PC.IsValid() ? PC->GetDetailsView() : nullptr; }
+	virtual TSharedRef< ITableRow > GenerateWidgetForTableView( const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem) override;
+	virtual bool GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const override;
+	virtual void GetChildren( FDetailNodeList& OutChildren )  override;
+	virtual void OnItemExpansionChanged( bool bInIsExpanded, bool bShouldSaveState) override;
+	virtual bool ShouldBeExpanded() const override;
+	virtual ENodeVisibility GetVisibility() const override;
+	virtual void FilterNode( const FDetailFilter& InFilter ) override;
+	virtual void Tick( float DeltaTime ) override;
+	virtual bool ShouldShowOnlyChildren() const override;
+	virtual FName GetNodeName() const override { return Customization.GetName(); }
+	virtual TSharedPtr<FDetailCategoryImpl> GetParentCategory() const override { return ParentCategory.Pin(); }
+	virtual FPropertyPath GetPropertyPath() const override;
+	virtual void SetIsHighlighted(bool bInIsHighlighted) override { bIsHighlighted = bInIsHighlighted; }
+	virtual bool IsHighlighted() const override { return bIsHighlighted; }
+	virtual bool IsLeaf() override { return Children.Num() == 0;  }
+	virtual TAttribute<bool> IsPropertyEditingEnabled() const override;
+	virtual TSharedPtr<FPropertyNode> GetPropertyNode() const override;
+	virtual TSharedPtr<FComplexPropertyNode> GetExternalRootPropertyNode() const override;
+	virtual TSharedPtr<IDetailPropertyRow> GetRow() const override;
+
+private:
+
+	/**
+	 * Initializes the property editor on this node                                                              
+	 */
+	void InitPropertyEditor();
+
+	/**
+	 * Initializes the custom builder on this node                                                              
+	 */
+	void InitCustomBuilder();
+
+	/**
+	 * Initializes the detail group on this node                                                              
+	 */
+	void InitGroup();
+
+	/**
+	 * Implementation of IsPropertyEditingEnabled
+	 */
+	bool IsPropertyEditingEnabledImpl() const;
+
+private:
+	/** Customization on this node */
+	FDetailLayoutCustomization Customization;
+	/** Child nodes of this node */
+	FDetailNodeList Children;
+	/** Parent categories on this node */
+	TWeakPtr<FDetailCategoryImpl> ParentCategory;
+	/** Parent group on this node */
+	TWeakPtr<IDetailGroup> ParentGroup;
+	/** Attribute for checking if our parent is enabled */
+	TAttribute<bool> IsParentEnabled;
+	/** Cached visibility of this node */
+	EVisibility CachedItemVisibility;
+	/** True if this node passes filtering */
+	bool bShouldBeVisibleDueToFiltering;
+	/** True if this node is visible because its children are filtered successfully */
+	bool bShouldBeVisibleDueToChildFiltering;
+	/** True if this node should be ticked */
+	bool bTickable;
+	/** True if this node is expanded */
+	bool bIsExpanded;
+	/** True if this node is highlighted */
+	bool bIsHighlighted;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutBuilderImpl.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutBuilderImpl.cpp
new file mode 100644
index 0000000..a714145
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutBuilderImpl.cpp
@@ -0,0 +1,942 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailLayoutBuilderImpl.h"
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/IPropertyGenerationUtilities.h"
+//#include "ObjectEditorUtils.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+#include "RuntimeEditorUtils.h"
+
+namespace soda
+{
+
+FDetailLayoutBuilderImpl::FDetailLayoutBuilderImpl(TSharedPtr<FComplexPropertyNode>& InRootNode, FClassToPropertyMap& InPropertyMap, const TSharedRef<IPropertyUtilities>& InPropertyUtilities, const TSharedRef<IPropertyGenerationUtilities>& InPropertyGenerationUtilities, const TSharedPtr< IDetailsViewPrivate >& InDetailsView, bool bIsExternal)
+	: RootNode( InRootNode )
+	, PropertyMap( InPropertyMap )
+	, PropertyDetailsUtilities( InPropertyUtilities )
+	, PropertyGenerationUtilities( InPropertyGenerationUtilities )
+	, DetailsView( InDetailsView.Get() )
+	, CurrentCustomizationClass( nullptr )
+	, bLayoutForExternalRoot(bIsExternal)
+{
+}
+
+
+FDetailLayoutBuilderImpl::~FDetailLayoutBuilderImpl()
+{
+	if (GetDetailsView())
+	{
+		for (TSharedPtr<FComplexPropertyNode> ExternalRootPropertyNode : ExternalRootPropertyNodes)
+		{
+			GetDetailsView()->SaveExpandedItems(ExternalRootPropertyNode.ToSharedRef());
+		}
+	}
+}
+
+IDetailCategoryBuilder& FDetailLayoutBuilderImpl::EditCategory(FName CategoryName, const FText& NewLocalizedDisplayName, ECategoryPriority::Type CategoryType)
+{
+	FText LocalizedDisplayName = NewLocalizedDisplayName;
+
+	// Use a generic name if one was not specified
+	if (CategoryName == NAME_None)
+	{
+		static const FText GeneralString = NSLOCTEXT("DetailLayoutBuilderImpl", "General", "General");
+		static const FName GeneralName = TEXT("General");
+
+		CategoryName = GeneralName;
+		LocalizedDisplayName = GeneralString;
+	}
+
+	TSharedPtr<FDetailCategoryImpl> CategoryImpl;
+	// If the default category map had a category by the provided name, remove it from the map as it is now customized
+	if (!DefaultCategoryMap.RemoveAndCopyValue(CategoryName, CategoryImpl))
+	{
+		// Default category map did not have a category by the requested name. Find or add it to the custom map
+		TSharedPtr<FDetailCategoryImpl>& NewCategoryImpl = CustomCategoryMap.FindOrAdd(CategoryName);
+
+		if (!NewCategoryImpl.IsValid())
+		{
+			NewCategoryImpl = MakeShareable(new FDetailCategoryImpl(CategoryName, SharedThis(this)));
+			// Categories within a type should display in the order they were added but sorting is unstable so numbers are made unique
+			const int32 SortOrder = CategoryType * 1000 + (CustomCategoryMap.Num() - 1);
+			NewCategoryImpl->SetSortOrder( SortOrder );
+		}
+		CategoryImpl = NewCategoryImpl;
+	}
+	else
+	{
+		// Custom category should not exist yet as it was in the default category map
+		checkSlow(!CustomCategoryMap.Contains(CategoryName) && CategoryImpl.IsValid());
+		CustomCategoryMap.Add(CategoryName, CategoryImpl);
+
+		// Categories within a type should display in the order they were added but sorting is unstable so numbers are made unique
+		const int32 SortOrder = CategoryType * 1000 + (CustomCategoryMap.Num() - 1);
+		CategoryImpl->SetSortOrder( SortOrder );
+	}
+	CategoryImpl->SetDisplayName(CategoryName, LocalizedDisplayName);
+
+	return *CategoryImpl;
+}
+
+void FDetailLayoutBuilderImpl::GetCategoryNames(TArray<FName>& OutCategoryNames) const
+{
+	OutCategoryNames.Reserve(OutCategoryNames.Num() + DefaultCategoryMap.Num() + CustomCategoryMap.Num());
+
+	TArray<FName> TempCategoryNames;
+	DefaultCategoryMap.GenerateKeyArray(TempCategoryNames);
+	OutCategoryNames.Append(TempCategoryNames);
+	CustomCategoryMap.GenerateKeyArray(TempCategoryNames);
+	OutCategoryNames.Append(TempCategoryNames);
+}
+
+IDetailPropertyRow& FDetailLayoutBuilderImpl::AddPropertyToCategory(TSharedPtr<IPropertyHandle> InPropertyHandle)
+{
+	// Get the FProperty itself
+	FProperty* Property = InPropertyHandle->GetProperty();
+
+	// Get the property's category name
+	FName CategoryFName = FRuntimeEditorUtils::GetCategoryFName(Property);
+
+	// Get the layout builder's category builder
+	IDetailCategoryBuilder& MyCategory = EditCategory(CategoryFName);
+
+	// Add the property to the category
+	return MyCategory.AddProperty(InPropertyHandle);
+}
+
+FDetailWidgetRow& FDetailLayoutBuilderImpl::AddCustomRowToCategory(TSharedPtr<IPropertyHandle> InPropertyHandle, const FText& CustomSearchString, bool bForAdvanced)
+{
+	// Get the FProperty itself
+	FProperty* Property = InPropertyHandle->GetProperty();
+
+	// Get the property's category name
+	FName CategoryFName = FRuntimeEditorUtils::GetCategoryFName(Property);
+
+	// Get the layout builder's category builder
+	IDetailCategoryBuilder& MyCategory = EditCategory(CategoryFName);
+
+	// Add the property to the category
+	return MyCategory.AddCustomRow(CustomSearchString, bForAdvanced);
+}
+
+TSharedPtr<IPropertyHandle> FDetailLayoutBuilderImpl::AddObjectPropertyData(TConstArrayView<UObject*> Objects, FName PropertyName)
+{
+	TSharedPtr<IPropertyHandle> Handle;
+
+	if (PropertyName != NAME_None)
+	{
+		TSharedPtr<FObjectPropertyNode> RootPropertyNode = MakeShared<FObjectPropertyNode>();
+
+		for (UObject* Obj : Objects)
+		{
+			RootPropertyNode->AddObject(Obj);
+		}
+		FPropertyNodeInitParams Params;
+		Params.bAllowChildren = false;
+
+		RootPropertyNode->InitNode(Params);
+
+		if (TSharedPtr<FPropertyNode> PropertyNode = RootPropertyNode->GenerateSingleChild(PropertyName))
+		{
+			RootPropertyNode->AddChildNode(PropertyNode);
+			PropertyNode->RebuildChildren();
+			Handle = GetPropertyHandle(PropertyNode);
+			AddExternalRootPropertyNode(RootPropertyNode.ToSharedRef());
+			
+			FClassInstanceToPropertyMap& ClassInstanceToPropertyMap = PropertyMap.FindOrAdd(PropertyNode->GetProperty()->GetOwnerStruct()->GetFName());
+			FPropertyNodeMap& PropertyNodeMap = ClassInstanceToPropertyMap.FindOrAdd(NAME_None);
+			PropertyNodeMap.Add(PropertyName, PropertyNode);
+		}
+	}
+
+	return Handle;
+}
+
+TSharedPtr<IPropertyHandle> FDetailLayoutBuilderImpl::AddStructurePropertyData(const TSharedPtr<FStructOnScope>& StructData, FName PropertyName)
+{
+	TSharedPtr<IPropertyHandle> Handle;
+
+	if (PropertyName != NAME_None && StructData && StructData->IsValid())
+	{
+		TSharedPtr<FStructurePropertyNode> RootPropertyNode = MakeShared<FStructurePropertyNode>();
+		
+		RootPropertyNode->SetStructure(StructData);
+		RootPropertyNode->InitNode(FPropertyNodeInitParams());
+
+		for (int32 ChildIdx = 0; ChildIdx < RootPropertyNode->GetNumChildNodes(); ++ChildIdx)
+		{
+			TSharedPtr< FPropertyNode > PropertyNode = RootPropertyNode->GetChildNode(ChildIdx);
+			if (FProperty* Property = PropertyNode->GetProperty())
+			{
+				if (Property->GetFName() == PropertyName)
+				{
+					AddExternalRootPropertyNode(RootPropertyNode.ToSharedRef());
+					FClassInstanceToPropertyMap& ClassInstanceToPropertyMap = PropertyMap.FindOrAdd(PropertyNode->GetProperty()->GetOwnerStruct()->GetFName());
+					FPropertyNodeMap& PropertyNodeMap = ClassInstanceToPropertyMap.FindOrAdd(NAME_None);
+					PropertyNodeMap.Add(PropertyName, PropertyNode);
+
+					RootPropertyNode->AddChildNode(PropertyNode);
+					PropertyNode->RebuildChildren();
+					Handle = GetPropertyHandle(PropertyNode);
+					break;
+				}
+			}
+		}
+	}
+
+	return Handle;
+}
+
+IDetailPropertyRow* FDetailLayoutBuilderImpl::EditDefaultProperty(TSharedPtr<IPropertyHandle> InPropertyHandle)
+{
+	if (InPropertyHandle.IsValid() && InPropertyHandle->IsValidHandle())
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode(InPropertyHandle);
+		if (PropertyNode.IsValid())
+		{
+			FProperty* Property = InPropertyHandle->GetProperty();
+
+			// Get the property's category name
+			FName CategoryFName = FRuntimeEditorUtils::GetCategoryFName(Property);
+
+			// Get the layout builder's category builder
+			TSharedPtr<FDetailCategoryImpl> DefaultCategory = DefaultCategoryMap.FindRef(CategoryFName);
+
+			if(DefaultCategory.IsValid())
+			{
+				FDetailLayoutCustomization* Customization = DefaultCategory->GetDefaultCustomization(PropertyNode.ToSharedRef());
+				if (Customization)
+				{
+					return Customization->PropertyRow.Get();
+				}
+			}
+		}
+
+	}
+
+	return nullptr;
+}
+
+TSharedRef<IPropertyHandle> FDetailLayoutBuilderImpl::GetProperty( const FName PropertyPath, const UStruct* ClassOutermost, FName InInstanceName ) const
+{	
+	TSharedPtr<FPropertyHandleBase> PropertyHandle; 
+
+	TSharedPtr<FPropertyNode> PropertyNodePtr = GetPropertyNode( PropertyPath, ClassOutermost, InInstanceName );
+	
+	return GetPropertyHandle( PropertyNodePtr );
+
+}
+
+FName FDetailLayoutBuilderImpl::GetTopLevelProperty()
+{
+	for (auto It = PropertyMap.CreateConstIterator(); It; ++It)
+	{
+		return It.Key();
+	}
+	return NAME_None;
+}
+
+void FDetailLayoutBuilderImpl::HideProperty( const TSharedPtr<IPropertyHandle> PropertyHandle )
+{
+	if( PropertyHandle.IsValid() && PropertyHandle->IsValidHandle() )
+	{
+		// Mark the property as customized so it wont show up in the default location
+		TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode( PropertyHandle );
+		if( PropertyNode.IsValid() )
+		{
+			SetCustomProperty( PropertyNode );
+		}
+	}
+}
+
+void FDetailLayoutBuilderImpl::HideProperty( FName PropertyPath, const UStruct* ClassOutermost, FName InstanceName )
+{
+	TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode( PropertyPath, ClassOutermost, InstanceName );
+	if( PropertyNode.IsValid() )
+	{
+		SetCustomProperty( PropertyNode );
+	}
+}
+
+void FDetailLayoutBuilderImpl::ForceRefreshDetails()
+{
+	PropertyDetailsUtilities.Pin()->ForceRefresh();
+}
+
+FDetailCategoryImpl& FDetailLayoutBuilderImpl::DefaultCategory(FName CategoryName)
+{
+	for (const TSharedRef<FDetailTreeNode>& RootTreeNode : AllRootTreeNodes)
+	{
+		if (RootTreeNode->GetNodeType() == EDetailNodeType::Category && 
+			CategoryName == RootTreeNode->GetNodeName())
+		{
+			return (FDetailCategoryImpl&) RootTreeNode.Get();
+		}
+	}
+
+	TSharedPtr<FDetailCategoryImpl>& CategoryImpl = DefaultCategoryMap.FindOrAdd(CategoryName);
+	if (!CategoryImpl.IsValid())
+	{
+		CategoryImpl = MakeShareable(new FDetailCategoryImpl(CategoryName, SharedThis(this)));
+
+		// We want categories within a type to display in the order they were added but sorting is unstable so we make unique numbers 
+		uint32 SortOrder = (uint32) ECategoryPriority::Default * 1000 + (DefaultCategoryMap.Num() - 1);
+		CategoryImpl->SetSortOrder(SortOrder);
+
+		CategoryImpl->SetDisplayName(CategoryName, FText::GetEmpty());
+	}
+
+	return *CategoryImpl;
+}
+
+TSharedPtr<FDetailCategoryImpl> FDetailLayoutBuilderImpl::GetSubCategoryImpl(FName CategoryName) const
+{
+	return SubCategoryMap.FindRef(CategoryName);
+}
+
+bool FDetailLayoutBuilderImpl::HasCategory(FName CategoryName) const
+{
+	return DefaultCategoryMap.Contains(CategoryName);
+}
+
+void FDetailLayoutBuilderImpl::BuildCategories( const FCategoryMap& CategoryMap, TArray< TSharedRef<FDetailCategoryImpl> >& OutSimpleCategories, TArray< TSharedRef<FDetailCategoryImpl> >& OutAdvancedCategories )
+{		
+	for( FCategoryMap::TConstIterator It(CategoryMap); It; ++It )
+	{
+		TSharedRef<FDetailCategoryImpl> DetailCategory = It.Value().ToSharedRef();
+
+		TSharedPtr<FComplexPropertyNode> RootPropertyNode = GetRootNode();
+		const bool bCategoryHidden = PropertyEditorHelpers::IsCategoryHiddenByClass(RootPropertyNode, DetailCategory->GetCategoryName())
+			|| ForceHiddenCategories.Contains(DetailCategory->GetCategoryName());
+
+		if( !bCategoryHidden )
+		{
+			DetailCategory->GenerateLayout();
+
+			if( DetailCategory->ContainsOnlyAdvanced() )
+			{
+				OutAdvancedCategories.Add( DetailCategory );
+			}
+			else
+			{
+				OutSimpleCategories.Add( DetailCategory );
+			}
+		}
+	}
+}
+
+void FDetailLayoutBuilderImpl::GenerateDetailLayout()
+{
+	AllRootTreeNodes.Empty();
+
+	// Sort by the order in which categories were edited
+	struct FCompareFDetailCategoryImpl
+	{
+		FORCEINLINE bool operator()( TSharedPtr<FDetailCategoryImpl> A, TSharedPtr<FDetailCategoryImpl> B ) const
+		{
+			return A->GetSortOrder() < B->GetSortOrder();
+		}
+	};
+
+	TArray<TSharedRef<FDetailCategoryImpl>> SimpleCategories;
+	TArray<TSharedRef<FDetailCategoryImpl>> AdvancedOnlyCategories;
+
+	SubCategoryMap.Empty();
+	for (FCategoryMap::TIterator It(DefaultCategoryMap); It; ++It)
+	{
+		// Remove all subcategories
+		TSharedPtr<FDetailCategoryImpl> DetailCategory = It.Value();
+		// Note: Sub-categories are added later
+		int32 Index = INDEX_NONE;
+		if (DetailCategory->GetCategoryName().ToString().FindChar(FPropertyNodeConstants::CategoryDelimiterChar, Index))
+		{
+			SubCategoryMap.Add(It.Key(), DetailCategory);
+			It.RemoveCurrent();
+		}
+	}
+
+	// Build default categories
+	while (DefaultCategoryMap.Num() > 0)
+	{
+		FCategoryMap DefaultCategoryMapCopy = DefaultCategoryMap;
+
+		DefaultCategoryMap.Empty();
+
+		BuildCategories(DefaultCategoryMapCopy, SimpleCategories, AdvancedOnlyCategories);
+	}
+
+	// Customizations can add more categories while customizing so just keep doing this until the maps are empty
+	while (CustomCategoryMap.Num() > 0)
+	{
+		FCategoryMap CustomCategoryMapCopy = CustomCategoryMap;
+
+		CustomCategoryMap.Empty();
+
+		BuildCategories(CustomCategoryMapCopy, SimpleCategories, AdvancedOnlyCategories);
+	}
+
+	FDetailNodeList CategoryNodes;
+
+	// Run initial sort
+	SimpleCategories.Sort(FCompareFDetailCategoryImpl());
+	AdvancedOnlyCategories.Sort(FCompareFDetailCategoryImpl());
+
+	if (CategorySortOrderFunctions.Num() > 0)
+	{
+		TMap<FName, IDetailCategoryBuilder*> AllCategoryMap;
+		TArray<TSharedRef<FDetailCategoryImpl>> AllCategories;
+
+		for (TSharedRef<FDetailCategoryImpl>& CategoryImpl : SimpleCategories)
+		{
+			const FName CategoryName = CategoryImpl->GetCategoryName();
+			AllCategories.Add(CategoryImpl);
+			IDetailCategoryBuilder* Builder = static_cast<IDetailCategoryBuilder*>(&CategoryImpl.Get());
+			AllCategoryMap.Add(CategoryName, Builder);
+		}
+
+		for (TSharedRef<FDetailCategoryImpl>& CategoryImpl : AdvancedOnlyCategories)
+		{
+			const FName CategoryName = CategoryImpl->GetCategoryName();
+			AllCategories.Add(CategoryImpl);
+			IDetailCategoryBuilder* Builder = static_cast<IDetailCategoryBuilder*>(&CategoryImpl.Get());
+			AllCategoryMap.Add(CategoryName, Builder);
+		}
+
+		// Run second override function sort
+		for (FOnCategorySortOrderFunction& SortFunction : CategorySortOrderFunctions)
+		{
+			SortFunction(AllCategoryMap);
+		}
+		AllCategories.Sort(FCompareFDetailCategoryImpl());
+
+		// Merge the two category lists in sorted order
+		for (int32 CategoryIndex = 0; CategoryIndex < AllCategories.Num(); ++CategoryIndex)
+		{
+			CategoryNodes.AddUnique(AllCategories[CategoryIndex]);
+		}
+	}
+	else
+	{
+		// Merge the two category lists in sorted order
+		for (int32 CategoryIndex = 0; CategoryIndex < SimpleCategories.Num(); ++CategoryIndex)
+		{
+			CategoryNodes.AddUnique(SimpleCategories[CategoryIndex]);
+		}
+
+		for (int32 CategoryIndex = 0; CategoryIndex < AdvancedOnlyCategories.Num(); ++CategoryIndex)
+		{
+			CategoryNodes.AddUnique(AdvancedOnlyCategories[CategoryIndex]);
+		}
+	}
+
+	TSharedPtr<FComplexPropertyNode> RootNodePinned = RootNode.Pin();
+	if (DetailsView && DetailsView->GetRootObjectCustomization() && RootNodePinned->GetInstancesNum())
+	{
+		FObjectPropertyNode* ObjectNode = RootNodePinned->AsObjectNode();
+
+		TSharedPtr<IDetailRootObjectCustomization> RootObjectCustomization = DetailsView->GetRootObjectCustomization();
+
+		// there are multiple objects in the details panel.  Separate each one with a unique object name node to differentiate them
+		TSharedRef<FDetailMultiTopLevelObjectRootNode> NewRootNode = MakeShared<FDetailMultiTopLevelObjectRootNode>(RootObjectCustomization, DetailsView, ObjectNode);
+		NewRootNode->SetChildren(CategoryNodes);
+
+		AllRootTreeNodes.Add(NewRootNode);
+	}
+	else
+	{
+		// The categories are the root in this case
+		AllRootTreeNodes = CategoryNodes;
+	}
+}
+
+void FDetailLayoutBuilderImpl::FilterDetailLayout( const FDetailFilter& InFilter )
+{
+	CurrentFilter = InFilter;
+	FilteredRootTreeNodes.Reset();
+
+	for(int32 RootNodeIndex = 0; RootNodeIndex < AllRootTreeNodes.Num(); ++RootNodeIndex)
+	{
+		TSharedRef<FDetailTreeNode>& RootTreeNode = AllRootTreeNodes[RootNodeIndex];
+
+		RootTreeNode->FilterNode(InFilter);
+
+		if(RootTreeNode->GetVisibility() == ENodeVisibility::Visible)
+		{
+			FilteredRootTreeNodes.Add(RootTreeNode);
+			if (DetailsView)
+			{
+				DetailsView->RequestItemExpanded(RootTreeNode, RootTreeNode->ShouldBeExpanded());
+			}
+		}
+	}
+}
+
+void FDetailLayoutBuilderImpl::SetCurrentCustomizationClass( UStruct* CurrentClass, FName VariableName )
+{
+	CurrentCustomizationClass = CurrentClass;
+	CurrentCustomizationVariableName = VariableName;
+}
+
+TSharedPtr<FPropertyNode> FDetailLayoutBuilderImpl::GetPropertyNode( const FName PropertyName, const UStruct* ClassOutermost, FName InstanceName ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNodeInternal( PropertyName, ClassOutermost, InstanceName );
+	return PropertyNode;
+}
+
+/**
+ * Parses a path node string into a property and index  The string should be in the format "Property[Index]" for arrays or "Property" for non arrays
+ * 
+ * @param OutProperty	The property name parsed from the string
+ * @param OutIndex		The index of the property in an array (INDEX_NONE if not found)
+ */
+static void GetPropertyAndIndex( const FString& PathNode, FString& OutProperty, int32& OutIndex )
+{
+	OutIndex = INDEX_NONE;
+	FString FoundIndexStr;
+	// Split the text into the property (left of the brackets) and index Right of the open bracket
+	if( PathNode.Split( TEXT("["), &OutProperty, &FoundIndexStr, ESearchCase::IgnoreCase, ESearchDir::FromEnd ) )
+	{
+		// Convert the index string into a number 
+		OutIndex = FCString::Atoi( *FoundIndexStr );
+	}
+	else
+	{
+		// No index was found, the path node is just the property
+		OutProperty = PathNode;
+	}
+}
+/**
+ * Finds a child property node from the provided parent node (does not recurse into grandchildren)
+ *
+ * @param InParentNode	The parent node to locate the child from
+ * @param PropertyName	The property name to find
+ * @param Index			The index of the property if its in an array
+ */
+static TSharedPtr<FPropertyNode> FindChildPropertyNode( FPropertyNode& InParentNode, const FString& PropertyName, int32 Index )
+{
+	TSharedPtr<FPropertyNode> FoundNode(nullptr);
+
+	// search each child for a property with the provided name
+	for( int32 ChildIndex = 0; ChildIndex < InParentNode.GetNumChildNodes(); ++ChildIndex )
+	{
+		TSharedPtr<FPropertyNode>& ChildNode = InParentNode.GetChildNode(ChildIndex);
+		FProperty* Property = ChildNode->GetProperty();
+		if( Property && Property->GetFName() == *PropertyName )
+		{
+			FoundNode = ChildNode;
+			break;
+		}
+	}
+
+	// Find the array element.
+	if( FoundNode.IsValid() && Index != INDEX_NONE )
+	{
+		// The found node is the top array so get its child which is the actual node
+		FoundNode = FoundNode->GetChildNode( Index );
+	}
+
+	return FoundNode;
+}
+
+TSharedPtr<FPropertyNode> FDetailLayoutBuilderImpl::GetPropertyNode( TSharedPtr<IPropertyHandle> PropertyHandle ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = nullptr;
+	if( PropertyHandle->IsValidHandle() )
+	{
+		PropertyNode = StaticCastSharedPtr<FPropertyHandleBase>(PropertyHandle)->GetPropertyNode();
+	}
+
+	return PropertyNode;
+}
+
+/**
+ Contains the location of a property, by path
+
+ Supported format: instance_name'outer.outer.value[optional_index]
+ Instance name is needed if multiple UProperties of the same type exist (such as two identical structs, the instance name is one of the struct variable names)
+ Items in arrays are indexed by []
+ Example setup
+*/
+
+TSharedPtr<FPropertyNode> FDetailLayoutBuilderImpl::GetPropertyNodeInternal( const FName PropertyPath, const UStruct* ClassOutermost, FName InstanceName ) const
+{
+	FName PropertyName;
+	TArray<FString> PathList;
+	PropertyPath.ToString().ParseIntoArray( PathList, TEXT("."), true );
+
+	int32 ArrayFoundIndex = 0;
+	if( PathList.Num() == 1 && !PathList[0].FindChar(TEXT('['), ArrayFoundIndex))
+	{
+		PropertyName = FName( *PathList[0] );
+	}
+	// The class to find properties in defaults to the class currently being customized
+	FName ClassName = CurrentCustomizationClass ? CurrentCustomizationClass->GetFName() : NAME_None;
+	if( ClassOutermost != nullptr)
+	{
+		// The requested a different class
+		ClassName = ClassOutermost->GetFName();
+	}
+
+	// Find the outer variable name.  This only matters if there are multiple instances of the same property
+	FName OuterVariableName = CurrentCustomizationVariableName;
+	if( InstanceName != NAME_None )
+	{
+		OuterVariableName = InstanceName;
+	}
+
+	// If this fails there are no properties associated with the class name provided
+	FClassInstanceToPropertyMap* ClassInstanceToPropertyMapPtr = PropertyMap.Find( ClassName );
+
+	if( ClassInstanceToPropertyMapPtr )
+	{
+		FClassInstanceToPropertyMap& ClassInstanceToPropertyMap = *ClassInstanceToPropertyMapPtr;
+		if( OuterVariableName == NAME_None && ClassInstanceToPropertyMap.Num() == 1 )
+		{
+			// If the outer  variable name still wasnt specified and there is only one instance, just use that
+			auto FirstKey = ClassInstanceToPropertyMap.CreateIterator();
+			OuterVariableName = FirstKey.Key();
+		}
+
+		FPropertyNodeMap* PropertyNodeMapPtr = ClassInstanceToPropertyMap.Find( OuterVariableName );
+
+		if( PropertyNodeMapPtr )
+		{
+			FPropertyNodeMap& PropertyNodeMap = *PropertyNodeMapPtr;
+			// Check for property name fast path first
+			if( PropertyName != NAME_None )
+			{
+				// The property name was ambiguous or not found if this fails.  If ambiguous, it means there are multiple data same typed data structures(components or structs) in the class which
+				// causes multiple properties by the same name to exist.  These properties must be found via the path method.
+				return PropertyNodeMap.PropertyNameToNode.FindRef( PropertyName );
+			}
+			else
+			{
+				// We need to search through the tree for a property with the given path
+				TSharedPtr<FPropertyNode> PropertyNode;
+
+				// Path should be in the format A[optional_index].B.C
+				if( PathList.Num() )
+				{
+					// Get the base property and index
+					FString Property;
+					int32 Index;
+					GetPropertyAndIndex( PathList[0], Property, Index );
+
+					// Get the parent most property node which is the one in the map.  Its children need to be searched
+					PropertyNode = PropertyNodeMap.PropertyNameToNode.FindRef( FName( *Property ) );
+					if( PropertyNode.IsValid() )
+					{
+						if( Index != INDEX_NONE )
+						{
+							if (Index >= PropertyNode->GetNumChildNodes())
+							{
+								return nullptr;
+							}
+
+							// The parent is the actual array, its children are array elements
+							PropertyNode = PropertyNode->GetChildNode( Index );
+						}
+
+						// Search any additional paths for the child
+						for( int32 PathIndex = 1; PathIndex < PathList.Num(); ++PathIndex )
+						{
+							GetPropertyAndIndex( PathList[PathIndex], Property, Index );
+
+							PropertyNode = FindChildPropertyNode( *PropertyNode, Property, Index );
+						}
+					}
+				}
+
+				return PropertyNode;
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+
+TSharedRef<IPropertyHandle> FDetailLayoutBuilderImpl::GetPropertyHandle( TSharedPtr<FPropertyNode> PropertyNodePtr ) const
+{
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+	if( PropertyNodePtr.IsValid() )
+	{ 
+		TSharedRef<FPropertyNode> PropertyNode = PropertyNodePtr.ToSharedRef();
+		FNotifyHook* NotifyHook = GetPropertyUtilities()->GetNotifyHook();
+
+		PropertyHandle = PropertyEditorHelpers::GetPropertyHandle( PropertyNode, NotifyHook, PropertyDetailsUtilities.Pin() );
+	}
+	else
+	{
+		// Invalid handle
+		PropertyHandle = MakeShareable( new FPropertyHandleBase(nullptr, nullptr, nullptr) );
+	}	
+
+	return PropertyHandle.ToSharedRef();
+}
+
+void FDetailLayoutBuilderImpl::AddExternalRootPropertyNode(TSharedRef<FComplexPropertyNode> InExternalRootNode)
+{
+	ExternalRootPropertyNodes.Add(InExternalRootNode);
+	if (GetDetailsView())
+	{
+		GetDetailsView()->RestoreExpandedItems(InExternalRootNode);
+	}
+}
+
+void FDetailLayoutBuilderImpl::RemoveExternalRootPropertyNode(TSharedRef<FComplexPropertyNode> InExternalRootNode)
+{
+	int32 NumRemoved = ExternalRootPropertyNodes.RemoveAll([InExternalRootNode](TSharedPtr<FComplexPropertyNode> ExternalRootPropertyNode)
+	{
+		return ExternalRootPropertyNode == InExternalRootNode;
+	});
+
+	if (NumRemoved > 0 && GetDetailsView())
+	{
+		GetDetailsView()->SaveExpandedItems(InExternalRootNode);
+	}
+}
+
+FDelegateHandle FDetailLayoutBuilderImpl::AddNodeVisibilityChangedHandler(FSimpleMulticastDelegate::FDelegate InOnNodeVisibilityChanged)
+{
+	return OnNodeVisibilityChanged.Add(InOnNodeVisibilityChanged);
+}
+
+void FDetailLayoutBuilderImpl::RemoveNodeVisibilityChangedHandler(FDelegateHandle DelegateHandle)
+{
+	OnNodeVisibilityChanged.Remove(DelegateHandle);
+}
+
+void FDetailLayoutBuilderImpl::NotifyNodeVisibilityChanged()
+{
+	OnNodeVisibilityChanged.Broadcast();
+}
+
+IPropertyGenerationUtilities& FDetailLayoutBuilderImpl::GetPropertyGenerationUtilities() const
+{
+	TSharedPtr<IPropertyGenerationUtilities> PropertyGenerationUtilitiesPinned = PropertyGenerationUtilities.Pin();
+	checkf(PropertyGenerationUtilitiesPinned.IsValid(), TEXT("Property generation utilities were destroyed while the layout builder was still in use."));
+	return *PropertyGenerationUtilitiesPinned.Get();
+}
+
+FCustomPropertyTypeLayoutMap FDetailLayoutBuilderImpl::GetInstancedPropertyTypeLayoutMap() const
+{
+	FCustomPropertyTypeLayoutMap TypeLayoutMap = GetPropertyGenerationUtilities().GetInstancedPropertyTypeLayoutMap();
+	TypeLayoutMap.Append(InstancePropertyTypeExtensions);
+	return TypeLayoutMap;
+}
+/*
+TSharedPtr<FAssetThumbnailPool> FDetailLayoutBuilderImpl::GetThumbnailPool() const
+{
+	return PropertyDetailsUtilities.Pin()->GetThumbnailPool();
+}
+*/
+
+bool FDetailLayoutBuilderImpl::IsPropertyVisible( TSharedRef<IPropertyHandle> PropertyHandle ) const
+{
+	if (PropertyHandle->IsValidHandle() && DetailsView != nullptr)
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = PropertyHandle->GetPropertyNode();
+		const FCategoryPropertyNode* CategoryNode = PropertyNode.IsValid() ? PropertyNode->AsCategoryNode() : nullptr;
+		if (CategoryNode != nullptr)
+		{
+			// this is a subcategory
+			FName CategoryName = CategoryNode->GetCategoryName();
+			return DetailsView->IsCustomRowVisible(FName(), CategoryName);
+		}
+		else if (PropertyHandle->GetProperty() != nullptr)
+		{
+			FPropertyAndParent PropertyAndParent(PropertyHandle);
+			return DetailsView->IsPropertyVisible(PropertyAndParent);
+		}
+	}
+
+	return true;
+}
+
+bool FDetailLayoutBuilderImpl::IsPropertyVisible( const struct FPropertyAndParent& PropertyAndParent ) const
+{
+	return DetailsView ? DetailsView->IsPropertyVisible( PropertyAndParent ) : true;
+}
+
+void FDetailLayoutBuilderImpl::HideCategory( FName CategoryName )
+{
+	ForceHiddenCategories.Add(CategoryName);
+}
+
+const IDetailsView* FDetailLayoutBuilderImpl::GetDetailsView() const
+{ 
+	return DetailsView; 
+}
+
+void FDetailLayoutBuilderImpl::GetObjectsBeingCustomized( TArray< TWeakObjectPtr<UObject> >& OutObjects ) const
+{
+	OutObjects.Empty();
+
+	FObjectPropertyNode* RootObjectNode = RootNode.IsValid() ? RootNode.Pin()->AsObjectNode() : nullptr;
+
+	// The class to find properties in defaults to the class currently being customized
+	FName ClassName = CurrentCustomizationClass ? CurrentCustomizationClass->GetFName() : NAME_None;
+
+	if(ClassName != NAME_None && CurrentCustomizationVariableName != NAME_None)
+	{
+		// If this fails there are no properties associated with the class name provided
+		FClassInstanceToPropertyMap* ClassInstanceToPropertyMapPtr = PropertyMap.Find(ClassName);
+
+		if(ClassInstanceToPropertyMapPtr)
+		{
+			FClassInstanceToPropertyMap& ClassInstanceToPropertyMap = *ClassInstanceToPropertyMapPtr;
+
+			FPropertyNodeMap* PropertyNodeMapPtr = ClassInstanceToPropertyMap.Find(CurrentCustomizationVariableName);
+
+			if(PropertyNodeMapPtr)
+			{
+				FPropertyNodeMap& PropertyNodeMap = *PropertyNodeMapPtr;
+				FObjectPropertyNode* ParentObjectProperty = PropertyNodeMap.ParentProperty ? PropertyNodeMap.ParentProperty->AsObjectNode() : NULL;
+				if(ParentObjectProperty)
+				{
+					for(int32 ObjectIndex = 0; ObjectIndex < ParentObjectProperty->GetNumObjects(); ++ObjectIndex)
+					{
+						OutObjects.Add(ParentObjectProperty->GetUObject(ObjectIndex));
+					}
+				}
+			}
+		}
+	}
+	else if(RootObjectNode)
+	{
+		for (int32 ObjectIndex = 0; ObjectIndex < RootObjectNode->GetNumObjects(); ++ObjectIndex)
+		{
+			OutObjects.Add(RootObjectNode->GetUObject(ObjectIndex));
+		}
+	}
+}
+
+void FDetailLayoutBuilderImpl::GetStructsBeingCustomized( TArray< TSharedPtr<FStructOnScope> >& OutStructs ) const
+{
+	OutStructs.Reset();
+
+	FStructurePropertyNode* RootStructNode = RootNode.IsValid() ? RootNode.Pin()->AsStructureNode() : nullptr;
+
+	// The class to find properties in defaults to the class currently being customized
+	FName ClassName = CurrentCustomizationClass ? CurrentCustomizationClass->GetFName() : NAME_None;
+
+	if(ClassName != NAME_None && CurrentCustomizationVariableName != NAME_None)
+	{
+		// If this fails there are no properties associated with the class name provided
+		FClassInstanceToPropertyMap* ClassInstanceToPropertyMapPtr = PropertyMap.Find(ClassName);
+
+		if(ClassInstanceToPropertyMapPtr)
+		{
+			FClassInstanceToPropertyMap& ClassInstanceToPropertyMap = *ClassInstanceToPropertyMapPtr;
+
+			FPropertyNodeMap* PropertyNodeMapPtr = ClassInstanceToPropertyMap.Find(CurrentCustomizationVariableName);
+
+			if(PropertyNodeMapPtr)
+			{
+				FPropertyNodeMap& PropertyNodeMap = *PropertyNodeMapPtr;
+				FComplexPropertyNode* ParentComplexProperty = PropertyNodeMap.ParentProperty ? PropertyNodeMap.ParentProperty->AsComplexNode() : nullptr;
+				FStructurePropertyNode* StructureNode = ParentComplexProperty ? ParentComplexProperty->AsStructureNode() : nullptr;
+				if(StructureNode)
+				{
+					OutStructs.Add(StructureNode->GetStructData());
+				}
+			}
+		}
+	}
+
+	if(RootStructNode)
+	{
+		OutStructs.Add(RootStructNode->GetStructData());
+	}
+}
+
+const TSharedRef< IPropertyUtilities > FDetailLayoutBuilderImpl::GetPropertyUtilities() const
+{
+	return PropertyDetailsUtilities.Pin().ToSharedRef();
+}
+
+UClass* FDetailLayoutBuilderImpl::GetBaseClass() const
+{
+	return RootNode.IsValid() ? Cast<UClass>(RootNode.Pin()->GetBaseStructure()) : nullptr;
+}
+
+const TArray<TWeakObjectPtr<UObject>>& FDetailLayoutBuilderImpl::GetSelectedObjects() const
+{
+	return PropertyDetailsUtilities.Pin()->GetSelectedObjects();
+}
+
+
+bool FDetailLayoutBuilderImpl::HasClassDefaultObject() const
+{
+	return PropertyDetailsUtilities.Pin()->HasClassDefaultObject();
+}
+
+void FDetailLayoutBuilderImpl::SetCustomProperty( const TSharedPtr<FPropertyNode>& PropertyNode ) 
+{
+	PropertyNode->SetNodeFlags( EPropertyNodeFlags::IsCustomized, true );
+}
+
+void FDetailLayoutBuilderImpl::Tick( float DeltaTime )
+{
+	for( auto It = TickableNodes.CreateIterator(); It; ++It )
+	{
+		(*It)->Tick( DeltaTime );
+	}
+}
+
+void FDetailLayoutBuilderImpl::AddTickableNode( FDetailTreeNode& TickableNode )
+{
+	TickableNodes.Add( &TickableNode );
+}
+
+void FDetailLayoutBuilderImpl::RemoveTickableNode( FDetailTreeNode& TickableNode )
+{
+	TickableNodes.Remove( &TickableNode );
+}
+
+void FDetailLayoutBuilderImpl::SaveExpansionState( const FString& NodePath, bool bIsExpanded )
+{
+	if (DetailsView)
+	{
+		DetailsView->SaveCustomExpansionState(NodePath, bIsExpanded);
+	}
+}
+
+bool FDetailLayoutBuilderImpl::GetSavedExpansionState( const FString& NodePath ) const
+{
+	return DetailsView ? DetailsView->GetCustomSavedExpansionState(NodePath) : false;
+}
+
+void FDetailLayoutBuilderImpl::RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier)
+{
+	FPropertyTypeLayoutCallback Callback;
+	Callback.PropertyTypeLayoutDelegate = PropertyTypeLayoutDelegate;
+	Callback.PropertyTypeIdentifier = Identifier;
+
+	FPropertyTypeLayoutCallbackList* LayoutCallbacks = InstancePropertyTypeExtensions.Find(PropertyTypeName);
+	if (LayoutCallbacks)
+	{
+		LayoutCallbacks->Add(Callback);
+	}
+	else
+	{
+		FPropertyTypeLayoutCallbackList NewLayoutCallbacks;
+		NewLayoutCallbacks.Add(Callback);
+		InstancePropertyTypeExtensions.Add(PropertyTypeName, NewLayoutCallbacks);
+	}
+}
+
+void FDetailLayoutBuilderImpl::SortCategories(const FOnCategorySortOrderFunction& InSortFunction)
+{
+	CategorySortOrderFunctions.Add(InSortFunction);
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutBuilderImpl.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutBuilderImpl.h
new file mode 100644
index 0000000..4c6c678
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutBuilderImpl.h
@@ -0,0 +1,282 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/IDetailsViewPrivate.h"
+#include "RuntimePropertyEditor/SDetailsViewBase.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+
+namespace soda
+{
+
+class FDetailCategoryImpl;
+class IDetailCategoryBuilder;
+class IPropertyUtilities;
+class IPropertyGenerationUtilities;
+
+class FDetailLayoutBuilderImpl : public IDetailLayoutBuilder, public TSharedFromThis<FDetailLayoutBuilderImpl>
+{
+public:
+	FDetailLayoutBuilderImpl(
+		TSharedPtr<FComplexPropertyNode>& InRootNode,
+		FClassToPropertyMap& InPropertyMap,
+		const TSharedRef<IPropertyUtilities>& InPropertyUtilities,
+		const TSharedRef<IPropertyGenerationUtilities>& InPropertyGenerationUtilities,
+		const TSharedPtr<IDetailsViewPrivate>& InDetailsView,
+		bool bIsExternal);
+
+	~FDetailLayoutBuilderImpl();
+
+	/** IDetailLayoutBuilder Interface */
+	virtual const IDetailsView* GetDetailsView() const override;
+	virtual void GetObjectsBeingCustomized(TArray< TWeakObjectPtr<UObject> >& OutObjects) const override;
+	virtual void GetStructsBeingCustomized(TArray< TSharedPtr<FStructOnScope> >& OutStructs) const override;
+	virtual IDetailCategoryBuilder& EditCategory(FName CategoryName, const FText& NewLocalizedDisplayName = FText::GetEmpty(), ECategoryPriority::Type CategoryType = ECategoryPriority::Default) override;
+	virtual void GetCategoryNames(TArray<FName>& OutCategoryNames) const override;
+	virtual IDetailPropertyRow& AddPropertyToCategory(TSharedPtr<IPropertyHandle> InPropertyHandle) override;
+	virtual FDetailWidgetRow& AddCustomRowToCategory(TSharedPtr<IPropertyHandle> InPropertyHandle, const FText& InCustomSearchString, bool bForAdvanced = false) override;
+	virtual TSharedPtr<IPropertyHandle> AddObjectPropertyData(TConstArrayView<UObject*> Objects, FName PropertyName) override;
+	virtual TSharedPtr<IPropertyHandle> AddStructurePropertyData(const TSharedPtr<FStructOnScope>& StructData, FName PropertyName) override;
+	virtual IDetailPropertyRow* EditDefaultProperty(TSharedPtr<IPropertyHandle> InPropertyHandle) override;
+	virtual TSharedRef<IPropertyHandle> GetProperty(const FName PropertyPath, const UStruct* ClassOutermost, FName InInstanceName) const override;
+	virtual FName GetTopLevelProperty() override;
+	virtual void HideProperty(const TSharedPtr<IPropertyHandle> Property) override;
+	virtual void HideProperty(FName PropertyPath, const UStruct* ClassOutermost = NULL, FName InstanceName = NAME_None) override;
+	virtual void ForceRefreshDetails() override;
+	//virtual TSharedPtr<FAssetThumbnailPool> GetThumbnailPool() const override;
+	virtual bool IsPropertyVisible(TSharedRef<IPropertyHandle> PropertyHandle) const override;
+	virtual bool IsPropertyVisible(const struct FPropertyAndParent& PropertyAndParent) const override;
+	virtual void HideCategory(FName CategoryName) override;
+	virtual const TSharedRef<IPropertyUtilities> GetPropertyUtilities() const override;
+	virtual UClass* GetBaseClass() const override;
+	virtual const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const override;
+	virtual bool HasClassDefaultObject() const override;
+	virtual void RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) override;
+	virtual void SortCategories(const FOnCategorySortOrderFunction& SortFunction) override;
+	/**
+	 * Creates a default category. The SDetails view will generate widgets in default categories
+	 *
+	 * @param CategoryName	The name of the category to create
+	 */
+	FDetailCategoryImpl& DefaultCategory(FName CategoryName);
+
+	/** 
+	 * Find a subcategory with the given name, if it exists
+	 */
+	TSharedPtr<FDetailCategoryImpl> GetSubCategoryImpl(FName CategoryName) const;
+
+	/**
+	 * @returns true if a category with the given name exists
+	 */
+	bool HasCategory(FName CategoryName) const;
+
+	/**
+	 * Generates the layout for this detail builder
+	 */
+	void GenerateDetailLayout();
+
+	/**
+	 * Filters the layout based on the passed in filter
+	 */
+	void FilterDetailLayout(const FDetailFilter& InFilter);
+
+	/**
+	 * Sets the current class being asked for customization
+	 * Used for looking up properties if a class is not provided
+	 *
+	 * @param CurrentClass	The current class being customized
+	 * @param VariableName The variable name of the class being customized (used for inner classes/structs where there can be multiple instances of them)
+	 */
+	void SetCurrentCustomizationClass(UStruct* CurrentClass, FName VariableName);
+
+	/** @return The current class variable name being customized */
+	FName GetCurrentCustomizationVariableName() const { return CurrentCustomizationVariableName; }
+
+	/**
+	 * Finds a property node for the current property
+	 *
+	 * @param PropertyPath	The path to the property
+	 * @param ClassOutermost	The outer class of the property
+	 * @return The found property node
+	 */
+	TSharedPtr<FPropertyNode> GetPropertyNode(FName PropertyPath, const UStruct* ClassOutermost, FName InstanceName) const;
+
+	/**
+	 * Gets the property node from the provided handle
+	 *
+	 * @param PropertyHandle	The property handle to get the node from
+	 */
+	TSharedPtr<FPropertyNode> GetPropertyNode(TSharedPtr<IPropertyHandle> PropertyHandle) const;
+
+	/**
+	 * Marks a property as customized
+	 *
+	 * @param PropertyNode	The property node to mark as customized
+	 */
+	void SetCustomProperty(const TSharedPtr<FPropertyNode>& PropertyNode);
+
+	/**
+	 * @return All tree nodes that should be visible in the tree
+	 */
+	FDetailNodeList& GetFilteredRootTreeNodes() { return FilteredRootTreeNodes; }
+
+	FDetailNodeList& GetAllRootTreeNodes() { return AllRootTreeNodes; }
+
+	/**
+	 * @return true if the layout has any details
+	 */
+	bool HasDetails() const { return AllRootTreeNodes.Num() > 0; }
+
+	/**
+	 * Ticks tickable nodes (if any)
+	 */
+	void Tick(float DeltaTime);
+
+	/**
+	 * Adds a node that should be ticked each frame
+	 *
+	 * @param TickableNode	The node to tick
+	 */
+	void AddTickableNode(FDetailTreeNode& TickableNode);
+
+	/**
+	 * Removes a node that should no longer be ticked each frame
+	 *
+	 * @param TickableNode	The node to remove
+	 */
+	void RemoveTickableNode(FDetailTreeNode& TickableNode);
+
+	/**
+	 * @return The current filter that is being used to show or hide rows
+	 */
+	const FDetailFilter& GetCurrentFilter() const { return CurrentFilter; }
+
+	/**
+	 * Saves the expansion state of a tree node
+	 *
+	 * @param NodePath	The path to the detail node to save
+	 * @param bIsExpanded	true if the node is expanded, false otherwise
+	 */
+	void SaveExpansionState(const FString& NodePath, bool bIsExpanded);
+
+	/**
+	 * Gets the saved expansion state of a tree node in this category
+	 *
+	 * @param NodePath	The path to the detail node to get
+	 * @return true if the node should be expanded, false otherwise
+	 */
+	bool GetSavedExpansionState(const FString& NodePath) const;
+
+	/**
+	 * Makes a property handle from a property node
+	 *
+	 * @param PropertyNodePtr	The property node to make a handle for.
+	 */
+	TSharedRef<IPropertyHandle> GetPropertyHandle(TSharedPtr<FPropertyNode> PropertyNodePtr) const;
+
+	/**
+	 * Adds an external property root node to the list of root nodes that the details new needs to manage
+	 *
+	 * @param InExternalRootNode		The node to add
+	 */
+	void AddExternalRootPropertyNode(TSharedRef<FComplexPropertyNode> InExternalRootNode);
+
+	/**
+	* Removes an external property root node to the list of root nodes that the details new needs to manage
+	*
+	* @param InExternalRootNode		The node to remove
+	*/
+	void RemoveExternalRootPropertyNode(TSharedRef<FComplexPropertyNode> InExternalRootNode);
+
+	/** @return The details view that owns this layout */
+	IDetailsViewPrivate* GetDetailsView() { return DetailsView; }
+	/** @return The root node for this customization */
+	TSharedPtr<FComplexPropertyNode> GetRootNode() const { return RootNode.Pin(); }
+
+	FRootPropertyNodeList& GetExternalRootPropertyNodes() { return ExternalRootPropertyNodes;  }
+
+	/** @return True if the layout is for an external root property node and not in the main set of objects the details panel is observing */
+	bool IsLayoutForExternalRoot() const { return bLayoutForExternalRoot; }
+
+	/** Adds a handler for when a node this builder owns has had a forced visibility change. */
+	FDelegateHandle AddNodeVisibilityChangedHandler(FSimpleMulticastDelegate::FDelegate InOnNodeVisibilityChanged);
+
+	/** Removes a handler for when a node this builder owns has had a forced visibility change. */
+	void RemoveNodeVisibilityChangedHandler(FDelegateHandle DelegateHandle);
+	
+	/** Notifies this detail layout builder that a node it owns had it's visibility forcibly changed. */
+	void NotifyNodeVisibilityChanged();
+
+	/** Gets internal utilities for generating property layouts. */
+	IPropertyGenerationUtilities& GetPropertyGenerationUtilities() const;
+
+	/** Combines the type layout map from our PropertyGenerationUtilities object, with the local InstancePropertyTypeExtensions map - which provides instance based customizations/overrides. */
+	FCustomPropertyTypeLayoutMap GetInstancedPropertyTypeLayoutMap() const;
+
+private:
+	/**
+	 * Finds a property node for the current property by searching in a fast lookup map or a path search if required
+	 *
+	 * @param PropertyPath	The path to the property
+	 * @param ClassOutermost	The outer class of the property
+	 * @param bMarkPropertyAsCustomized	Whether or not to mark the property as customized so it does not appear in the default layout
+	 * @return The found property node
+	 */
+	TSharedPtr<FPropertyNode> GetPropertyNodeInternal( FName PropertyPath, const UStruct* ClassOutermost, FName InstanceName ) const;
+
+	/**
+	 * Builds a list of simple and advanced categories that should be displayed
+	 */
+	void BuildCategories( const FCategoryMap& CategoryMap, TArray< TSharedRef<FDetailCategoryImpl> >& OutSimpleCategories, TArray< TSharedRef<FDetailCategoryImpl> >& OutAdvancedCategories );
+
+private:
+	/** The root property node for this customization */
+	TWeakPtr<FComplexPropertyNode> RootNode;
+	/** External property nodes which need to validated each tick */
+	FRootPropertyNodeList ExternalRootPropertyNodes;
+	/** A mapping of category names to categories which have been customized */
+	FCategoryMap CustomCategoryMap;
+	/** A mapping of category names to categories which have been not customized */
+	FCategoryMap DefaultCategoryMap;
+	/** Mapping of subcategory names to their subcategory builder */
+	FCategoryMap SubCategoryMap;
+	/** A mapping of classes to top level properties in that class */
+	FClassToPropertyMap& PropertyMap;
+	/** Force hidden categories set by the user */
+	TSet<FName> ForceHiddenCategories;
+	/** Nodes that require ticking */
+	TSet<FDetailTreeNode*> TickableNodes;
+	/** Current filter applied to the view */
+	FDetailFilter CurrentFilter;
+	/** All RootTreeNodes */
+	FDetailNodeList AllRootTreeNodes;
+	/** All generated category widgets for rebuilding them if needed */
+	FDetailNodeList FilteredRootTreeNodes;
+	/** The current variable name of the class being customized (inner class instances)*/
+	FName CurrentCustomizationVariableName;
+	/** The global property utilties.  This is weak to avoid circular ref but it should always be valid if this class exists*/
+	const TWeakPtr<IPropertyUtilities> PropertyDetailsUtilities;
+	/** Internal utilities for generating property layouts. */
+	const TWeakPtr<IPropertyGenerationUtilities> PropertyGenerationUtilities;
+	/** The view where this detail customizer resides */
+	class IDetailsViewPrivate* DetailsView;
+	/** The current class being customized */
+	UStruct* CurrentCustomizationClass;
+	/** True if the layout is for an external root property node and not in the main set of objects the details panel is observing */
+	bool bLayoutForExternalRoot;
+	/** A delegate which is called whenever a node owned by this layout builder has it's visibility forcibly changed. */
+	FSimpleMulticastDelegate OnNodeVisibilityChanged;
+
+	/** Optionally provided functions to sort categories, which allow caller to reconfigure sort order. */
+	TArray<FOnCategorySortOrderFunction> CategorySortOrderFunctions;
+
+	/** Local customizations for this detail layout only. Provides a way for IDetailCustomizations to override type customizations without polluting customizations for other instances. */
+	FCustomPropertyTypeLayoutMap InstancePropertyTypeExtensions;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutHelpers.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutHelpers.cpp
new file mode 100644
index 0000000..d6cf23e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutHelpers.cpp
@@ -0,0 +1,429 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailLayoutHelpers.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilderImpl.h"
+#include "RuntimePropertyEditor/PropertyRowGenerator.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+//#include "ObjectEditorUtils.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/IDetailCustomization.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h"
+#include "AssetRegistry/AssetData.h"
+#include "RuntimeEditorUtils.h"
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+
+namespace DetailLayoutHelpers
+{
+	void UpdateSinglePropertyMapRecursive(FPropertyNode& InNode, FName CurCategory, FComplexPropertyNode* CurObjectNode, FUpdatePropertyMapArgs& InUpdateArgs)
+	{
+		FDetailLayoutData& LayoutData = *InUpdateArgs.LayoutData;
+		FDetailLayoutBuilderImpl& DetailLayout = *LayoutData.DetailLayout;
+
+		const FStructProperty* ParentStructProp = CastField<FStructProperty>(InNode.GetProperty());
+		for (int32 ChildIndex = 0; ChildIndex < InNode.GetNumChildNodes(); ++ChildIndex)
+		{
+			//Use the original value for each child
+			bool LocalUpdateFavoriteSystemOnly = InUpdateArgs.bUpdateFavoriteSystemOnly;
+
+			FUpdatePropertyMapArgs ChildArgs = InUpdateArgs;
+			ChildArgs.bUpdateFavoriteSystemOnly = LocalUpdateFavoriteSystemOnly;
+
+			TSharedPtr<FPropertyNode> ChildNodePtr = InNode.GetChildNode(ChildIndex);
+			FPropertyNode& ChildNode = *ChildNodePtr;
+			FProperty* Property = ChildNode.GetProperty();
+
+			if (FObjectPropertyNode* ObjNode = ChildNode.AsObjectNode())
+			{
+				// Currently object property nodes do not provide any useful information other than being a container for its children.  We do not draw anything for them.
+				// When we encounter object property nodes, add their children instead of adding them to the tree.
+				UpdateSinglePropertyMapRecursive(ChildNode, CurCategory, ObjNode, ChildArgs);
+			}
+			else if (FCategoryPropertyNode* CategoryNode = ChildNode.AsCategoryNode())
+			{
+				if (!LocalUpdateFavoriteSystemOnly)
+				{
+					FName InstanceName = NAME_None;
+					FName CategoryName = CurCategory;
+					FString CategoryDelimiterString;
+					CategoryDelimiterString.AppendChar(FPropertyNodeConstants::CategoryDelimiterChar);
+					if (CurCategory != NAME_None && CategoryNode->GetCategoryName().ToString().Contains(CategoryDelimiterString))
+					{
+						// This property is child of another property so add it to the parent detail category
+						FDetailCategoryImpl& CategoryImpl = DetailLayout.DefaultCategory(CategoryName);
+						CategoryImpl.AddPropertyNode(ChildNodePtr.ToSharedRef(), InstanceName);
+					}
+				}
+
+				// For category nodes, we just set the current category and recurse through the children
+				UpdateSinglePropertyMapRecursive(ChildNode, CategoryNode->GetCategoryName(), CurObjectNode, ChildArgs);
+			}
+			else
+			{
+				// Whether or not the property can be visible in the default detail layout
+				bool bVisibleByDefault = PropertyEditorHelpers::IsVisibleStandaloneProperty(ChildNode, InNode);
+
+				// Whether or not the property is a struct
+				const FStructProperty* StructProperty = CastField<FStructProperty>(Property);
+				const bool bIsStruct = StructProperty != NULL;
+
+				static FName ShowOnlyInners("ShowOnlyInnerProperties");
+
+				bool bIsCustomizedStruct = false;
+				bool bIsChildOfCustomizedStruct = false;
+
+				const UStruct* Struct = StructProperty ? StructProperty->Struct : NULL;
+				const UStruct* ParentStruct = ParentStructProp ? ParentStructProp->Struct : NULL;
+				if (Struct || ParentStruct)
+				{
+					FRuntimeEditorModule& ParentPlugin = FModuleManager::GetModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+					if (Struct)
+					{
+						bIsCustomizedStruct = ParentPlugin.IsCustomizedStruct(Struct, *InUpdateArgs.InstancedPropertyTypeToDetailLayoutMap);
+					}
+
+					if (ParentStruct)
+					{
+						bIsChildOfCustomizedStruct = ParentPlugin.IsCustomizedStruct(ParentStruct, *InUpdateArgs.InstancedPropertyTypeToDetailLayoutMap);
+					}
+				}
+
+				// Whether or not to push out struct properties to their own categories or show them inside an expandable struct 
+				const bool bPushOutStructProps = bIsStruct && !bIsCustomizedStruct && !ParentStructProp && FRuntimeMetaData::HasMetaData(Property, ShowOnlyInners);
+
+				// Is the property edit inline new 
+				const bool bIsEditInlineNew = ChildNode.HasNodeFlags(EPropertyNodeFlags::ShowInnerObjectProperties) || SPropertyEditorEditInline::Supports(&ChildNode, ChildNode.GetArrayIndex());
+
+				// Is this a property of a container property
+				const bool bIsChildOfContainer = PropertyEditorHelpers::IsChildOfArray(ChildNode) || PropertyEditorHelpers::IsChildOfSet(ChildNode) || PropertyEditorHelpers::IsChildOfMap(ChildNode);
+
+				// Edit inline new properties should be visible by default
+				bVisibleByDefault |= bIsEditInlineNew;
+
+				// Children of arrays are not visible directly,
+				bVisibleByDefault &= !bIsChildOfContainer;
+
+				FPropertyAndParent PropertyAndParent(ChildNodePtr.ToSharedRef());
+				const bool bIsUserVisible = InUpdateArgs.IsPropertyVisible(PropertyAndParent);
+
+				// Inners of customized in structs should not be taken into consideration for customizing.  They are not designed to be individually customized when their parent is already customized
+				if (!bIsChildOfCustomizedStruct && !LocalUpdateFavoriteSystemOnly)
+				{
+					// Add any object classes with properties so we can ask them for custom property layouts later
+					LayoutData.ClassesWithProperties.Add(Property->GetOwnerStruct());
+				}
+
+				// If there is no outer object then the class is the object root and there is only one instance
+				FName InstanceName = NAME_None;
+				if (CurObjectNode && CurObjectNode->GetParentNode())
+				{
+					InstanceName = CurObjectNode->GetParentNode()->GetProperty()->GetFName();
+				}
+				else if (ParentStructProp)
+				{
+					InstanceName = ParentStructProp->GetFName();
+				}
+
+				// Do not add children of customized in struct properties or arrays
+				if (!bIsChildOfCustomizedStruct && !bIsChildOfContainer && !LocalUpdateFavoriteSystemOnly)
+				{
+					// Get the class property map
+					FClassInstanceToPropertyMap& ClassInstanceMap = LayoutData.ClassToPropertyMap.FindOrAdd(Property->GetOwnerStruct()->GetFName());
+
+					FPropertyNodeMap& PropertyNodeMap = ClassInstanceMap.FindOrAdd(InstanceName);
+
+					if (!PropertyNodeMap.ParentProperty)
+					{
+						PropertyNodeMap.ParentProperty = CurObjectNode;
+					}
+					else
+					{
+						ensure(PropertyNodeMap.ParentProperty == CurObjectNode);
+					}
+
+					checkSlow(!PropertyNodeMap.Contains(Property->GetFName()));
+
+					PropertyNodeMap.Add(Property->GetFName(), ChildNodePtr);
+				}
+
+				if (bVisibleByDefault && bIsUserVisible && !bPushOutStructProps)
+				{
+					FName CategoryName = CurCategory;
+					// For properties inside a struct, add them to their own category unless they just take the name of the parent struct.  
+					// In that case push them to the parent category
+					FName PropertyCategoryName = FRuntimeEditorUtils::GetCategoryFName(Property);
+					if (!ParentStructProp || (PropertyCategoryName != ParentStructProp->Struct->GetFName()))
+					{
+						CategoryName = PropertyCategoryName;
+					}
+
+					if (!LocalUpdateFavoriteSystemOnly)
+					{
+						if (InUpdateArgs.IsPropertyReadOnly(PropertyAndParent))
+						{
+							ChildNode.SetNodeFlags(EPropertyNodeFlags::IsReadOnly, true);
+						}
+
+						// Add a property to the default category
+						FDetailCategoryImpl& CategoryImpl = DetailLayout.DefaultCategory(CategoryName);
+						CategoryImpl.AddPropertyNode(ChildNodePtr.ToSharedRef(), InstanceName);
+					}
+
+					if (InUpdateArgs.bEnableFavoriteSystem)
+					{
+						if (ChildNodePtr->IsFavorite())
+						{
+							// Find or create the favorite category, we have to duplicate favorite property row under this category
+							static const FName FavoritesCategoryName(TEXT("Favorites"));
+							FDetailCategoryImpl& FavoritesCategory = DetailLayout.DefaultCategory(FavoritesCategoryName);
+
+							if (LocalUpdateFavoriteSystemOnly)
+							{
+								if (InUpdateArgs.IsPropertyReadOnly(PropertyAndParent))
+								{
+									ChildNode.SetNodeFlags(EPropertyNodeFlags::IsReadOnly, true);
+								}
+								else
+								{
+									//If the parent has a condition that is not met, mark the child as read-only
+									FDetailLayoutCustomization ParentTmpCustomization;
+									ParentTmpCustomization.PropertyRow = MakeShared<FDetailPropertyRow>(InNode.AsShared(), FavoritesCategory.AsShared());
+									if (ParentTmpCustomization.PropertyRow->GetPropertyEditor()->IsPropertyEditingEnabled() == false)
+									{
+										ChildNode.SetNodeFlags(EPropertyNodeFlags::IsReadOnly, true);
+									}
+								}
+							}
+
+							// Add the property to the favorite
+							const FObjectPropertyNode* RootObjectParent = ChildNodePtr->FindRootObjectItemParent();
+							FName RootInstanceName = NAME_None;
+							if (RootObjectParent != nullptr)
+							{
+								RootInstanceName = RootObjectParent->GetObjectBaseClass()->GetFName();
+							}
+
+							// Duplicate the row
+							FavoritesCategory.AddPropertyNode(ChildNodePtr.ToSharedRef(), RootInstanceName);
+						}
+
+						if (bIsStruct)
+						{
+							LocalUpdateFavoriteSystemOnly = true;
+						}
+
+						ChildArgs.bUpdateFavoriteSystemOnly = LocalUpdateFavoriteSystemOnly;
+					}
+				}
+
+				bool bRecurseIntoChildren =
+					!bIsChildOfCustomizedStruct // Don't recurse into built in struct children, we already know what they are and how to display them
+					&& !bIsCustomizedStruct // Don't recurse into customized structs
+					&& !bIsChildOfContainer // Don't recurse into containers, the children are drawn by the container property parent
+					&& !bIsEditInlineNew // Edit inline new children are not supported for customization yet
+					&&	bIsUserVisible // Properties must be allowed to be visible by a user if they are not then their children are not visible either
+					&& (!bIsStruct || bPushOutStructProps); //  Only recurse into struct properties if they are going to be displayed as standalone properties in categories instead of inside an expandable area inside a category
+
+				if (bRecurseIntoChildren || LocalUpdateFavoriteSystemOnly)
+				{
+					// Built in struct properties or children of arras 
+					UpdateSinglePropertyMapRecursive(ChildNode, CurCategory, CurObjectNode, ChildArgs);
+				}
+			}
+		}
+	}
+
+	void QueryLayoutForClass(FDetailLayoutData& LayoutData, UStruct* Class, const FCustomDetailLayoutMap& InstancedDetailLayoutMap)
+	{
+		LayoutData.DetailLayout->SetCurrentCustomizationClass(Class, NAME_None);
+
+		FRuntimeEditorModule& ParentPlugin = FModuleManager::GetModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+		const FCustomDetailLayoutNameMap& GlobalCustomLayoutNameMap = ParentPlugin.GetClassNameToDetailLayoutNameMap();
+
+		// Check the instanced map first
+		const FDetailLayoutCallback* Callback = InstancedDetailLayoutMap.Find(Class);
+
+		if (!Callback)
+		{
+			// callback wasn't found in the per instance map, try the global instances instead
+			Callback = GlobalCustomLayoutNameMap.Find(Class->GetFName());
+		}
+
+		if (Callback && Callback->DetailLayoutDelegate.IsBound())
+		{
+			// Create a new instance of the custom detail layout for the current class
+			TSharedRef<IDetailCustomization> CustomizationInstance = Callback->DetailLayoutDelegate.Execute();
+
+			// Ask for details immediately
+			CustomizationInstance->CustomizeDetails(LayoutData.DetailLayout);
+
+			// Save the instance from destruction until we refresh
+			LayoutData.CustomizationClassInstances.Add(CustomizationInstance);
+		}
+	}
+
+
+	void QueryCustomDetailLayout(FDetailLayoutData& LayoutData, const FCustomDetailLayoutMap& InstancedDetailLayoutMap, const FOnGetDetailCustomizationInstance& GenericLayoutDelegate)
+	{
+		FRuntimeEditorModule& ParentPlugin = FModuleManager::GetModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+
+		// Get the registered classes that customize details
+		const FCustomDetailLayoutNameMap& GlobalCustomLayoutNameMap = ParentPlugin.GetClassNameToDetailLayoutNameMap();
+
+		UStruct* BaseStruct = LayoutData.DetailLayout->GetRootNode()->GetBaseStructure();
+
+		LayoutData.CustomizationClassInstances.Empty();
+
+		//Ask for generic details not specific to an object being viewed 
+		if (GenericLayoutDelegate.IsBound())
+		{
+			// Create a new instance of the custom detail layout for the current class
+			TSharedRef<IDetailCustomization> CustomizationInstance = GenericLayoutDelegate.Execute();
+
+			// Ask for details immediately
+			CustomizationInstance->CustomizeDetails(LayoutData.DetailLayout);
+
+			// Save the instance from destruction until we refresh
+			LayoutData.CustomizationClassInstances.Add(CustomizationInstance);
+		}
+
+
+		// Sort them by query order.  @todo not good enough
+		struct FCompareFDetailLayoutCallback
+		{
+			FORCEINLINE bool operator()(const FDetailLayoutCallback& A, const FDetailLayoutCallback& B) const
+			{
+				return A.Order < B.Order;
+			}
+		};
+
+		TMap< TWeakObjectPtr<UStruct>, const FDetailLayoutCallback*> FinalCallbackMap;
+
+		for (auto ClassIt = LayoutData.ClassesWithProperties.CreateConstIterator(); ClassIt; ++ClassIt)
+		{
+			// Must be a class
+			UClass* Class = Cast<UClass>(ClassIt->Get());
+			if (!Class)
+			{
+				continue;
+			}
+
+			// Check the instanced map first
+			const FDetailLayoutCallback* Callback = InstancedDetailLayoutMap.Find(Class);
+
+			if (!Callback)
+			{
+				// callback wasn't found in the per instance map, try the global instances instead
+				Callback = GlobalCustomLayoutNameMap.Find(Class->GetFName());
+			}
+
+			if (Callback)
+			{
+				FinalCallbackMap.Add(Class, Callback);
+			}
+		}
+
+		FinalCallbackMap.ValueSort(FCompareFDetailLayoutCallback());
+
+		TSet<UStruct*> QueriedClasses;
+
+		if (FinalCallbackMap.Num() > 0)
+		{
+			// Ask each class that we have properties for to customize its layout
+			for (auto LayoutIt(FinalCallbackMap.CreateConstIterator()); LayoutIt; ++LayoutIt)
+			{
+				const TWeakObjectPtr<UStruct> WeakClass = LayoutIt.Key();
+
+				if (WeakClass.IsValid())
+				{
+					UStruct* Class = WeakClass.Get();
+
+					TSet<FName> ProcessedClasses;
+					bool bHasItemsToProcess = true;
+					while (bHasItemsToProcess)
+					{
+						bHasItemsToProcess = false;
+
+						// Copy ClassToProperty map since it could be modified during customization (through AddObjectPropertyData for example)
+						FClassInstanceToPropertyMap InstancedPropertyMapCopy = LayoutData.ClassToPropertyMap.FindChecked(Class->GetFName());
+
+						// Stamp this rounds number of item to detect if current map has changed after going through it
+						const int32 InitialCount = InstancedPropertyMapCopy.Num();
+						for (FClassInstanceToPropertyMap::TIterator InstanceIt(InstancedPropertyMapCopy); InstanceIt; ++InstanceIt)
+						{
+							// Stamp classes that have been processed to avoid reprocessing them when doing subsequent rounds
+							const FName Key = InstanceIt.Key();
+							if (ProcessedClasses.Contains(Key))
+							{
+								continue;
+							}
+							ProcessedClasses.Add(Key);
+
+							LayoutData.DetailLayout->SetCurrentCustomizationClass(Class, Key);
+
+							const FOnGetDetailCustomizationInstance& DetailDelegate = LayoutIt.Value()->DetailLayoutDelegate;
+
+							if (DetailDelegate.IsBound())
+							{
+								QueriedClasses.Add(Class);
+
+								// Create a new instance of the custom detail layout for the current class
+								TSharedRef<IDetailCustomization> CustomizationInstance = DetailDelegate.Execute();
+
+								// Ask for details immediately
+								CustomizationInstance->CustomizeDetails(LayoutData.DetailLayout);
+
+								// Save the instance from destruction until we refresh
+								LayoutData.CustomizationClassInstances.Add(CustomizationInstance);
+							}
+						}
+						
+						// Verify if current mapping has changed after customizations which would require another pass
+						const int32 NewCount = LayoutData.ClassToPropertyMap.FindChecked(Class->GetFName()).Num();
+						if (NewCount > InitialCount)
+						{
+							bHasItemsToProcess = true;
+						}
+					}
+				}
+			}
+		}
+
+		// Ensure that the base class and its parents are always queried
+		TSet<UStruct*> ParentClassesToQuery;
+		if (BaseStruct && !QueriedClasses.Contains(BaseStruct))
+		{
+			ParentClassesToQuery.Add(BaseStruct);
+			LayoutData.ClassesWithProperties.Add(BaseStruct);
+		}
+
+		// Find base classes of queried classes that were not queried and add them to the query list
+		// this supports cases where a parent class has no properties but still wants to add customization
+		for (auto QueriedClassIt = LayoutData.ClassesWithProperties.CreateConstIterator(); QueriedClassIt; ++QueriedClassIt)
+		{
+			UStruct* ParentStruct = (*QueriedClassIt)->GetSuperStruct();
+
+			while (ParentStruct && ParentStruct->IsA(UClass::StaticClass()) && !QueriedClasses.Contains(ParentStruct) && !LayoutData.ClassesWithProperties.Contains(ParentStruct))
+			{
+				ParentClassesToQuery.Add(ParentStruct);
+				ParentStruct = ParentStruct->GetSuperStruct();
+			}
+		}
+
+		// Query extra base classes and structs
+		for (auto ParentIt = ParentClassesToQuery.CreateConstIterator(); ParentIt; ++ParentIt)
+		{
+			QueryLayoutForClass(LayoutData, *ParentIt, InstancedDetailLayoutMap);
+		}
+	}
+
+
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutHelpers.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutHelpers.h
new file mode 100644
index 0000000..9e2c17d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailLayoutHelpers.h
@@ -0,0 +1,42 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimeEditorModule.h"
+
+namespace soda
+{
+struct FDetailLayoutData;
+class FPropertyNode;
+class FComplexPropertyNode;
+
+namespace DetailLayoutHelpers
+{
+	struct FUpdatePropertyMapArgs
+	{
+		FDetailLayoutData* LayoutData;
+		FCustomPropertyTypeLayoutMap* InstancedPropertyTypeToDetailLayoutMap;
+		TFunction<bool(const FPropertyAndParent&)> IsPropertyVisible;
+		TFunction<bool(const FPropertyAndParent&)> IsPropertyReadOnly;
+		bool bEnableFavoriteSystem;
+		bool bUpdateFavoriteSystemOnly;
+	};
+
+	/**
+	 * Recursively updates children of property nodes. Generates default layout for properties
+	 *
+	 * @param InNode	The parent node to get children from
+	 * @param The detail layout builder that will be used for customization of this property map
+	 * @param CurCategory The current category name
+	 */
+	void UpdateSinglePropertyMapRecursive(FPropertyNode& InNode, FName CurCategory, FComplexPropertyNode* CurObjectNode, FUpdatePropertyMapArgs& InUpdateArgs);
+
+	/**
+	 * Calls a delegate for each registered class that has properties visible to get any custom detail layouts
+	 */
+	void QueryCustomDetailLayout(FDetailLayoutData& LayoutData, const FCustomDetailLayoutMap& InstancedDetailLayoutMap, const FOnGetDetailCustomizationInstance& GenericLayoutDelegate);
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.cpp
new file mode 100644
index 0000000..1f5a7fe
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.cpp
@@ -0,0 +1,235 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.h"
+#include "RuntimePropertyEditor/IDetailRootObjectCustomization.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "Misc/ConfigCacheIni.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+namespace soda
+{
+
+void SDetailMultiTopLevelObjectTableRow::Construct( const FArguments& InArgs, TSharedRef<FDetailTreeNode> InOwnerTreeNode, const TSharedRef<STableViewBase>& InOwnerTableView )
+{
+	OwnerTreeNode = InOwnerTreeNode;
+	ExpansionArrowUsage = InArgs._ExpansionArrowUsage;
+	OwnerTableViewWeak = InOwnerTableView;
+
+	STableRow< TSharedPtr< FDetailTreeNode > >::ConstructInternal(
+		STableRow::FArguments()
+			.Style(FSodaStyle::Get(), "DetailsView.TreeView.TableRow")
+			.ShowSelection(false),
+		InOwnerTableView
+	);
+}
+
+void SDetailMultiTopLevelObjectTableRow::SetContent(TSharedRef<SWidget> InContent)
+{
+	if (ExpansionArrowUsage == EExpansionArrowUsage::Default)
+	{
+		ChildSlot
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.Padding(2.0f, 2.0f, 2.0f, 2.0f)
+			.AutoWidth()
+			[
+				SNew(SExpanderArrow, SharedThis(this))
+				.Visibility(ExpansionArrowUsage == EExpansionArrowUsage::Default ? EVisibility::Visible : EVisibility::Collapsed)
+			]
+			+ SHorizontalBox::Slot()
+			.Expose(ContentSlot)
+			.Padding(FMargin(0, 0, 0, 16))
+			[
+				InContent
+			]
+		];
+	}
+	else
+	{
+		ChildSlot
+		[
+			InContent
+		];
+	}
+}
+
+FReply SDetailMultiTopLevelObjectTableRow::OnMouseButtonDown( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent )
+{
+	if (ExpansionArrowUsage != EExpansionArrowUsage::None && MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+	{
+		ToggleExpansion();
+		return FReply::Handled();
+	}
+	else
+	{
+		return FReply::Unhandled();
+	}
+}
+
+FReply SDetailMultiTopLevelObjectTableRow::OnMouseButtonDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent )
+{
+	return OnMouseButtonDown(InMyGeometry, InMouseEvent);
+}
+
+
+FDetailMultiTopLevelObjectRootNode::FDetailMultiTopLevelObjectRootNode(const TSharedPtr<IDetailRootObjectCustomization>& InRootObjectCustomization, IDetailsViewPrivate* InDetailsView, const FObjectPropertyNode* RootNode)
+	: DetailsView(InDetailsView)
+	, RootObjectCustomization(InRootObjectCustomization)
+	, bShouldBeVisible(false)
+	, bHasFilterStrings(false)
+{
+	RootObjectSet.RootObjects.Reserve(RootNode->GetNumObjects());
+	for (int32 ObjectIndex = 0; ObjectIndex < RootNode->GetNumObjects(); ++ObjectIndex)
+	{
+		RootObjectSet.RootObjects.Add(RootNode->GetUObject(ObjectIndex));
+	}
+
+	RootObjectSet.CommonBaseClass = RootNode->GetObjectBaseClass();
+
+	NodeName = RootObjectSet.CommonBaseClass->GetFName();
+}
+
+void FDetailMultiTopLevelObjectRootNode::SetChildren(const FDetailNodeList& InChildNodes)
+{
+	ChildNodes = InChildNodes;
+
+	for (TSharedRef<FDetailTreeNode> Node : ChildNodes)
+	{
+		Node->SetParentNode(AsShared());
+	}
+}
+
+void FDetailMultiTopLevelObjectRootNode::OnItemExpansionChanged(bool bIsExpanded, bool bShouldSaveState)
+{
+	if (bShouldSaveState)
+	{
+		GConfig->SetBool(TEXT("DetailMultiObjectNodeExpansion"), *NodeName.ToString(), bIsExpanded, GEditorPerProjectIni);
+	}
+}
+
+bool FDetailMultiTopLevelObjectRootNode::ShouldBeExpanded() const
+{
+	if (bHasFilterStrings)
+	{
+		return true;
+	}
+	else
+	{
+		bool bShouldBeExpanded = true;
+		GConfig->GetBool(TEXT("DetailMultiObjectNodeExpansion"), *NodeName.ToString(), bShouldBeExpanded, GEditorPerProjectIni);
+		return bShouldBeExpanded;
+	}
+}
+
+ENodeVisibility FDetailMultiTopLevelObjectRootNode::GetVisibility() const
+{
+	ENodeVisibility FinalVisibility = ENodeVisibility::Visible;
+	if(RootObjectCustomization.IsValid() && !RootObjectCustomization.Pin()->AreObjectsVisible(RootObjectSet))
+	{
+		FinalVisibility = ENodeVisibility::ForcedHidden;
+	}
+	else
+	{
+		FinalVisibility = bShouldBeVisible ? ENodeVisibility::Visible : ENodeVisibility::HiddenDueToFiltering;
+	}
+
+	return FinalVisibility;
+}
+
+TSharedRef< ITableRow > FDetailMultiTopLevelObjectRootNode::GenerateWidgetForTableView(const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem)
+{
+	EExpansionArrowUsage ExpansionArrowUsage = EExpansionArrowUsage::None;
+
+	TSharedPtr<IDetailRootObjectCustomization> Customization = RootObjectCustomization.Pin();
+	if (Customization)
+	{
+		ExpansionArrowUsage = Customization->GetExpansionArrowUsage();
+	}
+
+	TSharedRef<SDetailMultiTopLevelObjectTableRow> TableRowWidget =
+		SNew(SDetailMultiTopLevelObjectTableRow, AsShared(), OwnerTable)
+		.ExpansionArrowUsage(ExpansionArrowUsage);
+
+	FDetailWidgetRow Row;
+	GenerateWidget_Internal(Row, TableRowWidget);
+
+	TableRowWidget->SetContent(Row.NameWidget.Widget);
+
+	return TableRowWidget;
+}
+
+
+bool FDetailMultiTopLevelObjectRootNode::GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const
+{
+	GenerateWidget_Internal(OutRow, nullptr);
+	return true;
+}
+
+
+void FDetailMultiTopLevelObjectRootNode::GetChildren(FDetailNodeList& OutChildren )
+{
+	for( int32 ChildIndex = 0; ChildIndex < ChildNodes.Num(); ++ChildIndex )
+	{
+		TSharedRef<FDetailTreeNode>& Child = ChildNodes[ChildIndex];
+		if( Child->GetVisibility() == ENodeVisibility::Visible )
+		{
+			if( Child->ShouldShowOnlyChildren() )
+			{
+				Child->GetChildren( OutChildren );
+			}
+			else
+			{
+				OutChildren.Add( Child );
+			}
+		}
+	}
+}
+
+void FDetailMultiTopLevelObjectRootNode::FilterNode( const FDetailFilter& InFilter )
+{
+	bShouldBeVisible = false;
+	bHasFilterStrings = InFilter.FilterStrings.Num() > 0;
+
+	for( int32 ChildIndex = 0; ChildIndex < ChildNodes.Num(); ++ChildIndex )
+	{
+		TSharedRef<FDetailTreeNode>& Child = ChildNodes[ChildIndex];
+
+		Child->FilterNode( InFilter );
+
+		if( Child->GetVisibility() == ENodeVisibility::Visible )
+		{
+			bShouldBeVisible = true;
+
+			if (DetailsView)
+			{
+				DetailsView->RequestItemExpanded(Child, Child->ShouldBeExpanded());
+			}
+		}
+	}
+}
+
+bool FDetailMultiTopLevelObjectRootNode::ShouldShowOnlyChildren() const
+{
+	return RootObjectCustomization.IsValid() && RootObjectSet.RootObjects.Num() ? !RootObjectCustomization.Pin()->ShouldDisplayHeader(RootObjectSet) : bShouldShowOnlyChildren;
+}
+
+void FDetailMultiTopLevelObjectRootNode::GenerateWidget_Internal(FDetailWidgetRow& OutRow, TSharedPtr<SDetailMultiTopLevelObjectTableRow> TableRowWidget) const
+{
+	TSharedPtr<SWidget> HeaderWidget = SNullWidget::NullWidget;
+	if (RootObjectCustomization.IsValid() && RootObjectSet.RootObjects.Num())
+	{
+		HeaderWidget = RootObjectCustomization.Pin()->CustomizeObjectHeader(RootObjectSet, TableRowWidget);
+	}
+
+	OutRow.NameContent()
+	[
+		HeaderWidget.ToSharedRef()
+	];
+
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.h
new file mode 100644
index 0000000..6814c3a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailMultiTopLevelObjectRootNode.h
@@ -0,0 +1,83 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "RuntimePropertyEditor/SDetailsViewBase.h"
+#include "RuntimePropertyEditor/SDetailTableRowBase.h"
+#include "RuntimePropertyEditor/IDetailRootObjectCustomization.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+namespace soda
+{
+
+using EExpansionArrowUsage = IDetailRootObjectCustomization::EExpansionArrowUsage;
+
+class SDetailMultiTopLevelObjectTableRow : public SDetailTableRowBase
+{
+public:
+	SLATE_BEGIN_ARGS(SDetailMultiTopLevelObjectTableRow)
+		: _DisplayName()
+		, _ExpansionArrowUsage(EExpansionArrowUsage::None)
+	{}
+		SLATE_ARGUMENT( FText, DisplayName )
+		SLATE_ARGUMENT(IDetailRootObjectCustomization::EExpansionArrowUsage, ExpansionArrowUsage)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, TSharedRef<FDetailTreeNode> InOwnerTreeNode, const TSharedRef<STableViewBase>& InOwnerTableView);
+	void SetContent(TSharedRef<SWidget> InContent) override;
+
+private:
+	const FSlateBrush* GetBackgroundImage() const;
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual FReply OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent) override;
+
+private:
+	EExpansionArrowUsage ExpansionArrowUsage;
+	SHorizontalBox::FSlot* ContentSlot = nullptr;
+	TWeakPtr<STableViewBase> OwnerTableViewWeak;
+};
+
+class FDetailMultiTopLevelObjectRootNode : public FDetailTreeNode, public TSharedFromThis<FDetailMultiTopLevelObjectRootNode>
+{
+public:
+	FDetailMultiTopLevelObjectRootNode(const TSharedPtr<IDetailRootObjectCustomization>& RootObjectCustomization, IDetailsViewPrivate* InDetailsView, const FObjectPropertyNode* RootNode);
+	void SetChildren(const FDetailNodeList& InChildNodes);
+private:
+	virtual IDetailsView* GetNodeDetailsView() const override { return DetailsView; }
+	virtual IDetailsViewPrivate* GetDetailsView() const override { return DetailsView; }
+	virtual void OnItemExpansionChanged(bool bIsExpanded, bool bShouldSaveState) override;
+	virtual bool ShouldBeExpanded() const override;
+	virtual ENodeVisibility GetVisibility() const override;
+	virtual TSharedRef<ITableRow> GenerateWidgetForTableView(const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem) override;
+	virtual bool GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const override;
+	virtual void GetChildren(FDetailNodeList& OutChildren)  override;
+	virtual void FilterNode(const FDetailFilter& InFilter) override;
+	virtual void Tick(float DeltaTime) override {}
+	virtual bool ShouldShowOnlyChildren() const override;
+	virtual FName GetNodeName() const override { return NodeName; }
+	virtual EDetailNodeType GetNodeType() const override { return EDetailNodeType::Object; }
+	virtual TSharedPtr<IPropertyHandle> CreatePropertyHandle() const override { return nullptr; }
+	void GenerateWidget_Internal(FDetailWidgetRow& Row, TSharedPtr<SDetailMultiTopLevelObjectTableRow> TableRow) const;
+
+private:
+	FDetailNodeList ChildNodes;
+	IDetailsViewPrivate* DetailsView;
+	TWeakPtr<IDetailRootObjectCustomization> RootObjectCustomization;
+	FDetailsObjectSet RootObjectSet;
+	const UClass* CommonBaseClass;
+	FName NodeName;
+	bool bShouldBeVisible;
+	bool bHasFilterStrings;
+	bool bShouldShowOnlyChildren;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailPropertyRow.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailPropertyRow.cpp
new file mode 100644
index 0000000..3f64665
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailPropertyRow.cpp
@@ -0,0 +1,924 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "RuntimePropertyEditor/CustomChildBuilder.h"
+#include "RuntimePropertyEditor/DetailCategoryGroupNode.h"
+#include "RuntimePropertyEditor/DetailItemNode.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+#include "Modules/ModuleManager.h"
+#include "Widgets/Layout/SSpacer.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE	"DetailPropertyRow"
+
+namespace soda
+{
+
+FDetailPropertyRow::FDetailPropertyRow(TSharedPtr<FPropertyNode> InPropertyNode, TSharedRef<FDetailCategoryImpl> InParentCategory, TSharedPtr<FComplexPropertyNode> InExternalRootNode)
+	: CustomIsEnabledAttrib( true )
+	, PropertyNode( InPropertyNode )
+	, ParentCategory( InParentCategory )
+	, ExternalRootNode( InExternalRootNode )
+	, bShowPropertyButtons( true )
+	, bShowCustomPropertyChildren( true )
+	, bForceAutoExpansion( false )
+	, bCachedCustomTypeInterface(false)
+{
+	PropertyHandle = InParentCategory->GetParentLayoutImpl().GetPropertyHandle(PropertyNode);
+
+	if (PropertyNode.IsValid())
+	{
+		TSharedRef<FPropertyNode> PropertyNodeRef = PropertyNode.ToSharedRef();
+
+		const TSharedRef<IPropertyUtilities> Utilities = InParentCategory->GetParentLayoutImpl().GetPropertyUtilities();
+
+		if (PropertyNode->AsCategoryNode() == nullptr)
+		{
+			MakePropertyEditor(PropertyNodeRef, Utilities, PropertyEditor);
+		}
+		
+		if (PropertyNode->AsObjectNode() && ExternalRootNode.IsValid())
+		{
+			// We are showing an entirely different object inline.  Generate a layout for it now.
+			if (IDetailsViewPrivate* DetailsView = InParentCategory->GetDetailsView())
+			{
+				ExternalObjectLayout = MakeShared<FDetailLayoutData>();
+				DetailsView->UpdateSinglePropertyMap(InExternalRootNode, *ExternalObjectLayout, true);
+			}
+		}
+
+		if (PropertyNode->GetPropertyKeyNode().IsValid())
+		{							
+			TSharedPtr<IPropertyTypeCustomization> FoundPropertyCustomisation = GetPropertyCustomization(PropertyNode->GetPropertyKeyNode().ToSharedRef(), ParentCategory.Pin().ToSharedRef());
+
+			bool bInlineRow = FoundPropertyCustomisation != nullptr ? FoundPropertyCustomisation->ShouldInlineKey() : false;
+
+			static FName InlineKeyMeta("ForceInlineRow");
+			bInlineRow |= FRuntimeMetaData::HasMetaData(InPropertyNode->GetParentNode()->GetProperty(), InlineKeyMeta);
+
+			// Only create the property editor if it's not a struct or if it requires to be inlined (and has customization)
+			if (!NeedsKeyNode(PropertyNodeRef, InParentCategory) || (bInlineRow && FoundPropertyCustomisation != nullptr))
+			{
+				CachedKeyCustomTypeInterface = FoundPropertyCustomisation;
+				
+				MakePropertyEditor(PropertyNode->GetPropertyKeyNode().ToSharedRef(), Utilities, PropertyKeyEditor);
+			}
+		}
+	}
+}
+
+bool FDetailPropertyRow::NeedsKeyNode(TSharedRef<FPropertyNode> InPropertyNode, TSharedRef<FDetailCategoryImpl> InParentCategory)
+{
+	FStructProperty* KeyStructProp = CastField<FStructProperty>(InPropertyNode->GetPropertyKeyNode()->GetProperty());
+	return KeyStructProp != nullptr;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::DisplayName( const FText& InDisplayName )
+{
+	if (PropertyNode.IsValid())
+	{
+		PropertyNode->SetDisplayNameOverride( InDisplayName );
+	}
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::ToolTip( const FText& InToolTip )
+{
+	if (PropertyNode.IsValid())
+	{
+		PropertyNode->SetToolTipOverride( InToolTip );
+	}
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::ShowPropertyButtons( bool bInShowPropertyButtons )
+{
+	bShowPropertyButtons = bInShowPropertyButtons;
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::EditCondition( TAttribute<bool> EditConditionValue, FOnBooleanValueChanged OnEditConditionValueChanged )
+{
+	CustomEditConditionValue = EditConditionValue;
+	CustomEditConditionValueChanged = OnEditConditionValueChanged;
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::IsEnabled( TAttribute<bool> InIsEnabled )
+{
+	CustomIsEnabledAttrib = InIsEnabled;
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::ShouldAutoExpand(bool bInForceExpansion)
+{
+	bForceAutoExpansion = bInForceExpansion;
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::Visibility( TAttribute<EVisibility> Visibility )
+{
+	PropertyVisibility = Visibility;
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::OverrideResetToDefault(const FResetToDefaultOverride& ResetToDefault)
+{
+	CustomResetToDefault = ResetToDefault;
+	return *this;
+}
+
+IDetailPropertyRow& FDetailPropertyRow::DragDropHandler(TSharedPtr<IDetailDragDropHandler> InDragDropHandler)
+{
+	CustomDragDropHandler = InDragDropHandler;
+	return *this;
+}
+
+void FDetailPropertyRow::GetDefaultWidgets( TSharedPtr<SWidget>& OutNameWidget, TSharedPtr<SWidget>& OutValueWidget, bool bAddWidgetDecoration )
+{
+	FDetailWidgetRow Row;
+	GetDefaultWidgets(OutNameWidget, OutValueWidget, Row, bAddWidgetDecoration);
+}
+
+void FDetailPropertyRow::GetDefaultWidgets( TSharedPtr<SWidget>& OutNameWidget, TSharedPtr<SWidget>& OutValueWidget, FDetailWidgetRow& Row, bool bAddWidgetDecoration )
+{
+	TSharedPtr<FDetailWidgetRow> CustomTypeRow;
+
+	TSharedPtr<IPropertyTypeCustomization>& CustomTypeInterface = GetTypeInterface();
+	if ( CustomTypeInterface.IsValid() ) 
+	{
+		CustomTypeRow = MakeShareable(new FDetailWidgetRow);
+
+		CustomTypeInterface->CustomizeHeader(PropertyHandle.ToSharedRef(), *CustomTypeRow, *this);
+	}
+
+	SetWidgetRowProperties(Row);
+	MakeNameOrKeyWidget(Row, CustomTypeRow);
+	MakeValueWidget(Row, CustomTypeRow, bAddWidgetDecoration);
+
+	OutNameWidget = Row.NameWidget.Widget;
+	OutValueWidget = Row.ValueWidget.Widget;
+}
+
+bool FDetailPropertyRow::HasColumns() const
+{
+	// Regular properties always have columns
+	return !CustomPropertyWidget.IsValid() || CustomPropertyWidget->HasColumns();
+}
+
+bool FDetailPropertyRow::ShowOnlyChildren() const
+{
+	return bForceShowOnlyChildren || (PropertyTypeLayoutBuilder.IsValid() && CustomPropertyWidget.IsValid() && !CustomPropertyWidget->HasAnyContent());
+}
+
+bool FDetailPropertyRow::RequiresTick() const
+{
+	return PropertyVisibility.IsBound() || 
+		(PropertyEditor.IsValid() && PropertyEditor->IsOnlyVisibleWhenEditConditionMet());
+}
+
+FDetailWidgetRow& FDetailPropertyRow::CustomWidget( bool bShowChildren )
+{
+	bShowCustomPropertyChildren = bShowChildren;
+	CustomPropertyWidget = MakeShareable( new FDetailWidgetRow );
+	return *CustomPropertyWidget;
+}
+
+FDetailWidgetDecl* FDetailPropertyRow::CustomNameWidget()
+{
+	return CustomPropertyWidget.IsValid() ? &CustomPropertyWidget->NameContent() : nullptr;
+}
+
+FDetailWidgetDecl* FDetailPropertyRow::CustomValueWidget()
+{
+	return CustomPropertyWidget.IsValid() ? &CustomPropertyWidget->ValueContent() : nullptr;
+}
+
+/*
+TSharedPtr<FAssetThumbnailPool> FDetailPropertyRow::GetThumbnailPool() const
+{
+	TSharedPtr<FDetailCategoryImpl> ParentCategoryPinned = ParentCategory.Pin();
+	return ParentCategoryPinned.IsValid() ? ParentCategoryPinned->GetParentLayout().GetThumbnailPool() : NULL;
+}
+*/
+
+TSharedPtr<IPropertyUtilities> FDetailPropertyRow::GetPropertyUtilities() const
+{
+	TSharedPtr<FDetailCategoryImpl> ParentCategoryPinned = ParentCategory.Pin();
+	if (ParentCategoryPinned.IsValid() && ParentCategoryPinned->IsParentLayoutValid())
+	{
+		return ParentCategoryPinned->GetParentLayout().GetPropertyUtilities();
+	}
+	
+	return nullptr;
+}
+
+FDetailWidgetRow FDetailPropertyRow::GetWidgetRow()
+{
+	if( HasColumns() )
+	{
+		FDetailWidgetRow Row;
+
+		SetWidgetRowProperties(Row);
+		MakeNameOrKeyWidget( Row, CustomPropertyWidget );
+		MakeValueWidget( Row, CustomPropertyWidget );
+
+		return Row;
+	}
+	else
+	{
+		return *CustomPropertyWidget;
+	}
+}
+
+static bool IsHeaderRowRequired(const TSharedPtr<IPropertyHandle>& PropertyHandle)
+{
+	TSharedPtr<IPropertyHandle> ParentHandle = PropertyHandle->GetParentHandle();
+	while (ParentHandle.IsValid())
+	{
+		if (ParentHandle->AsMap().IsValid())
+		{
+			return true;
+		}
+
+		ParentHandle = ParentHandle->GetParentHandle();
+	}
+
+	return false;
+}
+
+static void FixEmptyHeaderRowInContainers(const TSharedPtr<IPropertyHandle>& PropertyHandle, const TSharedPtr<FDetailWidgetRow>& HeaderRow)
+{
+	if (IsHeaderRowRequired(PropertyHandle))
+	{
+		if (!HeaderRow->HasAnyContent())
+		{
+			if (!HeaderRow->HasNameContent())
+			{
+				HeaderRow->NameContent()
+				[
+					PropertyHandle->CreatePropertyNameWidget()
+				];
+			}
+
+			if (!HeaderRow->HasValueContent())
+			{
+				HeaderRow->ValueContent()
+				[
+					PropertyHandle->CreatePropertyValueWidget(false)
+				];
+			}
+		}
+	}
+}
+
+void FDetailPropertyRow::OnItemNodeInitialized( TSharedRef<FDetailCategoryImpl> InParentCategory, const TAttribute<bool>& InIsParentEnabled, TSharedPtr<IDetailGroup> InParentGroup)
+{
+	IsParentEnabled = InIsParentEnabled;
+
+	TSharedPtr<IPropertyTypeCustomization>& CustomTypeInterface = GetTypeInterface();
+	// Don't customize the user already customized
+	if (!CustomPropertyWidget.IsValid() && CustomTypeInterface.IsValid())
+	{
+		CustomPropertyWidget = MakeShareable(new FDetailWidgetRow);
+
+		CustomTypeInterface->CustomizeHeader(PropertyHandle.ToSharedRef(), *CustomPropertyWidget, *this);
+
+		FixEmptyHeaderRowInContainers(PropertyHandle, CustomPropertyWidget);
+
+		// set initial value of enabled attribute to settings from struct customization
+		if (CustomPropertyWidget->IsEnabledAttr.IsSet())
+		{
+			CustomIsEnabledAttrib = CustomPropertyWidget->IsEnabledAttr;
+		}		
+	}
+
+	if( bShowCustomPropertyChildren && CustomTypeInterface.IsValid() )
+	{
+		PropertyTypeLayoutBuilder = MakeShareable(new FCustomChildrenBuilder(InParentCategory, InParentGroup));
+
+		/** Does this row pass its custom reset behavior to its children? */
+		if (CustomResetToDefault.IsSet() && CustomResetToDefault->PropagatesToChildren())
+		{
+			PropertyTypeLayoutBuilder->OverrideResetChildrenToDefault(CustomResetToDefault.GetValue());
+		}
+
+		CustomTypeInterface->CustomizeChildren(PropertyHandle.ToSharedRef(), *PropertyTypeLayoutBuilder, *this);
+	}
+}
+
+void FDetailPropertyRow::OnGenerateChildren( FDetailNodeList& OutChildren )
+{
+	if (PropertyNode->AsCategoryNode() && PropertyNode->GetParentNode() && !PropertyNode->GetParentNode()->AsObjectNode())
+	{
+		// This is a sub-category.  Populate from SubCategory builder
+		TSharedRef<FDetailCategoryImpl> ParentCategoryRef = ParentCategory.Pin().ToSharedRef();
+		FDetailLayoutBuilderImpl& LayoutBuilder = ParentCategoryRef->GetParentLayoutImpl();
+		TSharedPtr<FDetailCategoryImpl> MyCategory = LayoutBuilder.GetSubCategoryImpl(PropertyNode->AsCategoryNode()->GetCategoryName());
+		if(MyCategory.IsValid())
+		{
+			MyCategory->GenerateLayout();
+
+			// Ignore the header of the category by just getting the categories children directly. We are the header in this case.
+			// Also ignore visibility here as we dont have a filter yet and the children will be filtered later anyway
+			const bool bIgnoreVisibility = true;
+			const bool bIgnoreAdvancedDropdown = true;
+			MyCategory->GetGeneratedChildren(OutChildren, bIgnoreVisibility, bIgnoreAdvancedDropdown);
+		}
+		else
+		{
+			// Fall back to the default if we can't find the category implementation
+			GenerateChildrenForPropertyNode(PropertyNode, OutChildren);
+		}
+	}
+	else if (PropertyNode->AsCategoryNode() || PropertyNode->GetProperty() || ExternalObjectLayout.IsValid())
+	{
+		GenerateChildrenForPropertyNode( PropertyNode, OutChildren );
+	}
+}
+
+void FDetailPropertyRow::GenerateChildrenForPropertyNode( TSharedPtr<FPropertyNode>& RootPropertyNode, FDetailNodeList& OutChildren )
+{
+	// Children should be disabled if we are disabled
+	TAttribute<bool> ParentEnabledState = TAttribute<bool>::CreateSP(this, &FDetailPropertyRow::GetEnabledState);
+
+	if( PropertyTypeLayoutBuilder.IsValid() && bShowCustomPropertyChildren )
+	{
+		const TArray< FDetailLayoutCustomization >& ChildRows = PropertyTypeLayoutBuilder->GetChildCustomizations();
+
+		for( int32 ChildIndex = 0; ChildIndex < ChildRows.Num(); ++ChildIndex )
+		{
+			TSharedRef<FDetailItemNode> ChildNodeItem = MakeShareable( new FDetailItemNode( ChildRows[ChildIndex], ParentCategory.Pin().ToSharedRef(), ParentEnabledState ) );
+			ChildNodeItem->Initialize();
+			OutChildren.Add( ChildNodeItem );
+		}
+	}
+	else if (ExternalObjectLayout.IsValid() && ExternalObjectLayout->DetailLayout->HasDetails())
+	{
+		OutChildren.Append(ExternalObjectLayout->DetailLayout->GetAllRootTreeNodes());
+	}
+	else if ((bShowCustomPropertyChildren || !CustomPropertyWidget.IsValid()) && RootPropertyNode->GetNumChildNodes() > 0)
+	{
+		TSharedRef<FDetailCategoryImpl> ParentCategoryRef = ParentCategory.Pin().ToSharedRef();
+		IDetailLayoutBuilder& LayoutBuilder = ParentCategoryRef->GetParentLayout();
+		FProperty* ParentProperty = RootPropertyNode->GetProperty();
+
+		const bool bStructProperty = ParentProperty && ParentProperty->IsA<FStructProperty>();
+		const bool bMapProperty = ParentProperty && ParentProperty->IsA<FMapProperty>();
+		const bool bSetProperty = ParentProperty && ParentProperty->IsA<FSetProperty>();
+
+		for( int32 ChildIndex = 0; ChildIndex < RootPropertyNode->GetNumChildNodes(); ++ChildIndex )
+		{
+			TSharedPtr<FPropertyNode> ChildNode = RootPropertyNode->GetChildNode(ChildIndex);
+
+			if( ChildNode.IsValid() && ChildNode->HasNodeFlags( EPropertyNodeFlags::IsCustomized ) == 0 )
+			{
+				if( ChildNode->AsObjectNode() )
+				{
+					// Skip over object nodes and generate their children.  Object nodes are not visible
+					GenerateChildrenForPropertyNode( ChildNode, OutChildren );
+				}
+				// Only struct children can have custom visibility that is different from their parent.
+				else if ( !bStructProperty || LayoutBuilder.IsPropertyVisible(FPropertyAndParent(ChildNode.ToSharedRef())) )
+				{	
+					TArray<TSharedRef<FDetailTreeNode>> PropNodes;
+					bool bHasKeyNode = false;
+
+					// Create and initialize the child first
+					FDetailLayoutCustomization Customization;
+					Customization.PropertyRow = MakeShareable(new FDetailPropertyRow(ChildNode, ParentCategoryRef));
+					TSharedRef<FDetailItemNode> ChildNodeItem = MakeShareable(new FDetailItemNode(Customization, ParentCategoryRef, ParentEnabledState));
+					ChildNodeItem->Initialize();
+
+					if ( ChildNode->GetPropertyKeyNode().IsValid() )
+					{
+						// If the child has a key property, only create a second node for the key if the child did not already create a property
+						// editor for it
+						if ( !Customization.PropertyRow->PropertyKeyEditor.IsValid() )
+						{
+							FDetailLayoutCustomization KeyCustom;
+							KeyCustom.PropertyRow = MakeShareable(new FDetailPropertyRow(ChildNode->GetPropertyKeyNode(), ParentCategoryRef));
+							TSharedRef<FDetailItemNode> KeyNodeItem = MakeShareable(new FDetailItemNode(KeyCustom, ParentCategoryRef, ParentEnabledState));
+							KeyNodeItem->Initialize();
+							
+							PropNodes.Add(KeyNodeItem);
+							bHasKeyNode = true;
+						}
+					}
+
+					// Add the child node 
+					PropNodes.Add(ChildNodeItem);
+					
+					// For set properties, set the name override to match the index
+					if (bSetProperty)
+					{
+						ChildNode->SetDisplayNameOverride(FText::AsNumber(ChildIndex));
+					}
+
+					if (bMapProperty && bHasKeyNode)
+					{
+						// Group the key/value nodes for map properties
+						static FText KeyValueGroupNameFormat = LOCTEXT("KeyValueGroupName", "Element {0}");
+						FText KeyValueGroupName = FText::Format(KeyValueGroupNameFormat, ChildIndex);
+
+						TSharedRef<FDetailCategoryGroupNode> KeyValueGroupNode = MakeShared<FDetailCategoryGroupNode>(FName(*KeyValueGroupName.ToString()), ParentCategoryRef);
+						KeyValueGroupNode->SetChildren(PropNodes);
+						KeyValueGroupNode->SetShowBorder(false);
+						KeyValueGroupNode->SetHasSplitter(true);
+
+						OutChildren.Add(KeyValueGroupNode);
+					}
+					else
+					{
+						OutChildren.Append(PropNodes);
+					}
+				}
+			}
+		}
+	}
+}
+
+FName FDetailPropertyRow::GetRowName() const
+{
+	if (HasExternalProperty())
+	{
+		if (GetCustomExpansionId() != NAME_None)
+		{
+			return GetCustomExpansionId();
+		}
+		else if (FProperty* ExternalRootProperty = ExternalRootNode->GetProperty())
+		{
+			return ExternalRootProperty->GetFName();
+		}
+	}
+	if (GetPropertyNode())
+	{
+		if (FProperty* Property = GetPropertyNode()->GetProperty())
+		{
+			return Property->GetFName();
+		}
+	}
+	return NAME_None;
+}
+
+TSharedRef<FPropertyEditor> FDetailPropertyRow::MakePropertyEditor(const TSharedRef<FPropertyNode>& InPropertyNode, const TSharedRef<IPropertyUtilities>& PropertyUtilities, TSharedPtr<FPropertyEditor>& InEditor )
+{
+	if( !InEditor.IsValid() )
+	{
+		InEditor = FPropertyEditor::Create( InPropertyNode, PropertyUtilities );
+	}
+
+	return InEditor.ToSharedRef();
+}
+
+TSharedPtr<IPropertyTypeCustomization> FDetailPropertyRow::GetPropertyCustomization(const TSharedRef<FPropertyNode>& InPropertyNode, const TSharedRef<FDetailCategoryImpl>& InParentCategory)
+{
+	TSharedPtr<IPropertyTypeCustomization> CustomInterface;
+
+	if (!PropertyEditorHelpers::IsStaticArray(*InPropertyNode))
+	{
+		FProperty* Property = InPropertyNode->GetProperty();
+		TSharedPtr<IPropertyHandle> PropHandle = InParentCategory->GetParentLayoutImpl().GetPropertyHandle(InPropertyNode);
+
+		FRuntimeEditorModule& PropertyEditorModule = FModuleManager::GetModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+
+		FPropertyTypeLayoutCallback LayoutCallback = PropertyEditorModule.GetPropertyTypeCustomization(Property, *PropHandle, InParentCategory->GetCustomPropertyTypeLayoutMap() );
+		if (LayoutCallback.IsValid())
+		{
+			if (PropHandle->IsValidHandle())
+			{
+				CustomInterface = LayoutCallback.GetCustomizationInstance();
+			}
+		}
+	}
+
+	return CustomInterface;
+}
+
+void FDetailPropertyRow::MakeExternalPropertyRowCustomization(TSharedPtr<FStructOnScope> StructData, FName PropertyName, TSharedRef<FDetailCategoryImpl> ParentCategory, FDetailLayoutCustomization& OutCustomization, const FAddPropertyParams& Parameters)
+{
+	TSharedRef<FStructurePropertyNode> RootPropertyNode = MakeShared<FStructurePropertyNode>();
+
+	//SET
+	RootPropertyNode->SetStructure(StructData);
+
+	FPropertyNodeInitParams InitParams;
+	InitParams.ParentNode = nullptr;
+	InitParams.Property = nullptr;
+	InitParams.ArrayOffset = 0;
+	InitParams.ArrayIndex = INDEX_NONE;
+	InitParams.bForceHiddenPropertyVisibility = Parameters.ShouldForcePropertyVisible() || FPropertySettings::Get().ShowHiddenProperties();
+	InitParams.bCreateCategoryNodes = false;
+	InitParams.bAllowChildren = false;
+
+	Parameters.OverrideAllowChildren(InitParams.bAllowChildren);
+	Parameters.OverrideCreateCategoryNodes(InitParams.bCreateCategoryNodes);
+
+	RootPropertyNode->InitNode(InitParams);
+
+	ParentCategory->GetParentLayoutImpl().AddExternalRootPropertyNode(RootPropertyNode);
+
+	if (PropertyName != NAME_None)
+	{
+		RootPropertyNode->RebuildChildren();
+
+		for (int32 ChildIdx = 0; ChildIdx < RootPropertyNode->GetNumChildNodes(); ++ChildIdx)
+		{
+			TSharedPtr< FPropertyNode > PropertyNode = RootPropertyNode->GetChildNode(ChildIdx);
+			if (FProperty* Property = PropertyNode->GetProperty())
+			{
+				if (Property->GetFName() == PropertyName)
+				{
+					OutCustomization.PropertyRow = MakeShareable(new FDetailPropertyRow(PropertyNode, ParentCategory, RootPropertyNode));
+					OutCustomization.PropertyRow->SetCustomExpansionId(Parameters.GetUniqueId());
+					break;
+				}
+			}
+		}
+	}
+	else
+	{
+		static const FName PropertyEditorModuleName("RuntimeEditor");
+		FRuntimeEditorModule& PropertyEditorModule = FModuleManager::GetModuleChecked<FRuntimeEditorModule>(PropertyEditorModuleName);
+
+		// Make a "fake" struct property to represent the entire struct
+		FStructProperty* StructProperty = PropertyEditorModule.RegisterStructOnScopeProperty(StructData.ToSharedRef());
+
+		// Generate a node for the struct
+		TSharedPtr<FItemPropertyNode> ItemNode = MakeShared<FItemPropertyNode>();
+
+		FPropertyNodeInitParams ItemNodeInitParams;
+		ItemNodeInitParams.ParentNode = RootPropertyNode;
+		ItemNodeInitParams.Property = StructProperty;
+		ItemNodeInitParams.ArrayOffset = 0;
+		ItemNodeInitParams.ArrayIndex = INDEX_NONE;
+		ItemNodeInitParams.bAllowChildren = true;
+		ItemNodeInitParams.bForceHiddenPropertyVisibility = Parameters.ShouldForcePropertyVisible() || FPropertySettings::Get().ShowHiddenProperties();
+		ItemNodeInitParams.bCreateCategoryNodes = false;
+
+		ItemNode->InitNode(ItemNodeInitParams);
+
+		RootPropertyNode->AddChildNode(ItemNode);
+
+		OutCustomization.PropertyRow = MakeShareable(new FDetailPropertyRow(ItemNode, ParentCategory, RootPropertyNode));
+		OutCustomization.PropertyRow->SetCustomExpansionId(Parameters.GetUniqueId());
+	}
+}
+
+void FDetailPropertyRow::MakeExternalPropertyRowCustomization(const TArray<UObject*>& InObjects, FName PropertyName, TSharedRef<FDetailCategoryImpl> ParentCategory, struct FDetailLayoutCustomization& OutCustomization, const FAddPropertyParams& Parameters)
+{
+	TSharedRef<FObjectPropertyNode> RootPropertyNode = MakeShared<FObjectPropertyNode>();
+
+	for (UObject* Object : InObjects)
+	{
+		RootPropertyNode->AddObject(Object);
+	}
+
+	FPropertyNodeInitParams InitParams;
+	InitParams.ParentNode = nullptr;
+	InitParams.Property = nullptr;
+	InitParams.ArrayOffset = 0;
+	InitParams.ArrayIndex = INDEX_NONE;
+	InitParams.bAllowChildren = false;
+	InitParams.bForceHiddenPropertyVisibility = Parameters.ShouldForcePropertyVisible() || FPropertySettings::Get().ShowHiddenProperties();
+	InitParams.bCreateCategoryNodes = PropertyName == NAME_None;
+
+	Parameters.OverrideAllowChildren(InitParams.bAllowChildren);
+	Parameters.OverrideCreateCategoryNodes(InitParams.bCreateCategoryNodes);
+
+	RootPropertyNode->InitNode(InitParams);
+
+	ParentCategory->GetParentLayoutImpl().AddExternalRootPropertyNode(RootPropertyNode);
+
+	if (PropertyName != NAME_None)
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = RootPropertyNode->GenerateSingleChild(PropertyName);
+		if(PropertyNode.IsValid())
+		{
+			RootPropertyNode->AddChildNode(PropertyNode);
+
+			PropertyNode->RebuildChildren();
+
+			OutCustomization.PropertyRow = MakeShared<FDetailPropertyRow>(PropertyNode, ParentCategory, RootPropertyNode);
+			OutCustomization.PropertyRow->SetCustomExpansionId(Parameters.GetUniqueId());
+		}
+	}
+	else
+	{
+		OutCustomization.PropertyRow = MakeShared<FDetailPropertyRow>(RootPropertyNode, ParentCategory, RootPropertyNode);
+		OutCustomization.PropertyRow->SetCustomExpansionId(Parameters.GetUniqueId());
+	}
+}
+
+EVisibility FDetailPropertyRow::GetPropertyVisibility() const
+{
+	if (PropertyEditor.IsValid() && PropertyEditor->IsOnlyVisibleWhenEditConditionMet() && !PropertyEditor->IsEditConditionMet())
+	{
+		return EVisibility::Collapsed;
+	}
+
+	return PropertyVisibility.Get();
+}
+
+bool FDetailPropertyRow::HasEditCondition() const
+{
+	return (PropertyEditor.IsValid() && PropertyEditor->HasEditCondition()) || CustomEditConditionValue.IsSet();
+}
+
+bool FDetailPropertyRow::GetEnabledState() const
+{
+	bool Result = IsParentEnabled.Get();
+
+	Result = Result && CustomIsEnabledAttrib.Get(true);
+
+	if (HasEditCondition())
+	{
+		if (CustomEditConditionValue.IsSet())
+		{
+			Result = Result && CustomEditConditionValue.Get();
+		}
+		else
+		{
+			Result = Result && PropertyEditor->IsEditConditionMet();
+		}
+	}
+
+	return Result;
+}
+
+TSharedPtr<IPropertyTypeCustomization>& FDetailPropertyRow::GetTypeInterface()
+{
+	if (!bCachedCustomTypeInterface)
+	{
+		if (PropertyNode.IsValid() && ParentCategory.IsValid())
+		{
+			CachedCustomTypeInterface = GetPropertyCustomization(PropertyNode.ToSharedRef(), ParentCategory.Pin().ToSharedRef());
+		}
+		bCachedCustomTypeInterface = true;
+	}
+
+	return CachedCustomTypeInterface;
+}
+
+bool FDetailPropertyRow::GetForceAutoExpansion() const
+{
+	return bForceAutoExpansion;
+}
+
+static void TogglePropertyEditorEditCondition(bool bValue, TWeakPtr<FPropertyEditor> PropertyEditorWeak)
+{
+	TSharedPtr<FPropertyEditor> PropertyEditorPtr = PropertyEditorWeak.Pin();
+	if (PropertyEditorPtr.IsValid() && PropertyEditorPtr->IsEditConditionMet() != bValue)
+	{
+		PropertyEditorPtr->ToggleEditConditionState();
+	}
+}
+
+static void ExecuteCustomEditConditionToggle(bool bValue, FOnBooleanValueChanged CustomEditConditionToggle, TWeakPtr<FPropertyEditor> PropertyEditorWeak)
+{
+	CustomEditConditionToggle.ExecuteIfBound(bValue);
+
+	TSharedPtr<FPropertyEditor> PropertyEditorPtr = PropertyEditorWeak.Pin();
+	if (PropertyEditorPtr.IsValid())
+	{
+		 PropertyEditorPtr->GetPropertyNode()->InvalidateCachedState();
+	}
+}
+
+void FDetailPropertyRow::SetWidgetRowProperties(FDetailWidgetRow& Row) const
+{
+	// set edit condition handlers - use customized if provided
+	TAttribute<bool> EditConditionValue = CustomEditConditionValue;
+	if (!EditConditionValue.IsSet())
+	{
+		EditConditionValue = TAttribute<bool>(PropertyEditor.ToSharedRef(), &FPropertyEditor::IsEditConditionMet);
+	}
+
+	FOnBooleanValueChanged OnEditConditionValueChanged;
+	if (CustomEditConditionValueChanged.IsBound())
+	{
+		TWeakPtr<FPropertyEditor> PropertyEditorWeak = PropertyEditor;
+		OnEditConditionValueChanged = FOnBooleanValueChanged::CreateStatic(&ExecuteCustomEditConditionToggle, CustomEditConditionValueChanged, PropertyEditorWeak);
+	}
+	else if (PropertyEditor->SupportsEditConditionToggle())
+	{
+		TWeakPtr<FPropertyEditor> PropertyEditorWeak = PropertyEditor;
+		OnEditConditionValueChanged = FOnBooleanValueChanged::CreateStatic(&TogglePropertyEditorEditCondition, PropertyEditorWeak);
+	}
+
+	Row.EditCondition(EditConditionValue, OnEditConditionValueChanged);
+	Row.IsEnabled(CustomIsEnabledAttrib);
+	Row.CustomResetToDefault = CustomResetToDefault;
+	Row.CustomDragDropHandler = CustomDragDropHandler;
+	Row.PropertyHandles.Add(GetPropertyHandle());
+
+	// set custom actions and reset to default
+	if (CustomPropertyWidget.IsValid())
+	{
+		Row.CopyMenuAction = CustomPropertyWidget->CopyMenuAction;
+		Row.PasteMenuAction = CustomPropertyWidget->PasteMenuAction;
+		Row.CustomMenuItems = CustomPropertyWidget->CustomMenuItems;
+
+		if (CustomPropertyWidget->CustomResetToDefault.IsSet())
+		{
+			ensureMsgf(!CustomResetToDefault.IsSet(), TEXT("Duplicate reset to default handlers set on both FDetailPropertyRow and CustomWidget()!"));
+			Row.CustomResetToDefault = CustomPropertyWidget->CustomResetToDefault;
+		}
+	}
+}
+
+void FDetailPropertyRow::MakeNameOrKeyWidget( FDetailWidgetRow& Row, const TSharedPtr<FDetailWidgetRow> InCustomRow ) const
+{
+	EVerticalAlignment VerticalAlignment = VAlign_Center;
+	EHorizontalAlignment HorizontalAlignment = HAlign_Fill;
+
+	// We will only use key widgets for non-struct keys
+	const bool bHasKeyNode = PropertyKeyEditor.IsValid() && !PropertyHandle->HasMetaData(TEXT("ReadOnlyKeys"));
+
+	if (!bHasKeyNode && InCustomRow.IsValid())
+	{
+		VerticalAlignment = InCustomRow->NameWidget.VerticalAlignment;
+		HorizontalAlignment = InCustomRow->NameWidget.HorizontalAlignment;
+	}
+
+	TAttribute<bool> IsEnabledAttrib = TAttribute<bool>::CreateSP( this, &FDetailPropertyRow::GetEnabledState );
+
+	TSharedRef<SHorizontalBox> NameHorizontalBox = SNew(SHorizontalBox)
+		.Clipping(EWidgetClipping::OnDemand);
+	
+	TSharedPtr<SWidget> NameWidget = SNullWidget::NullWidget;
+
+	// Key nodes take precedence over custom rows
+	if (bHasKeyNode)
+	{
+		// Does this key have a custom type, use it
+		if (CachedKeyCustomTypeInterface)
+		{
+			// Create a widget that will properly represent the key
+			const TSharedPtr<FDetailWidgetRow> CustomTypeWidget = MakeShared<FDetailWidgetRow>();
+			CachedKeyCustomTypeInterface->CustomizeHeader(PropertyKeyEditor->GetPropertyHandle(), *CustomTypeWidget, const_cast<FDetailPropertyRow&>(*this));
+
+			NameWidget = CustomTypeWidget->ValueWidget.Widget;
+		}
+		else
+		{
+			const TSharedRef<IPropertyUtilities> PropertyUtilities = ParentCategory.Pin()->GetParentLayoutImpl().GetPropertyUtilities();
+
+			NameWidget =
+				SNew(SPropertyValueWidget, PropertyKeyEditor, PropertyUtilities)
+				.IsEnabled(IsEnabledAttrib)
+				.ShowPropertyButtons(false);
+		}
+
+	}
+	else if (InCustomRow.IsValid())
+	{
+		NameWidget = 
+			SNew( SBox )
+			.IsEnabled( IsEnabledAttrib )
+			[
+				InCustomRow->NameWidget.Widget
+			];
+	}
+	else if (PropertyEditor.IsValid())
+	{
+		NameWidget = 
+			SNew( SPropertyNameWidget, PropertyEditor )
+			.IsEnabled( IsEnabledAttrib );
+	}
+
+	SHorizontalBox::FSlot* SlotPointer = nullptr;
+	NameHorizontalBox->AddSlot()
+	.Expose(SlotPointer)
+	[
+		NameWidget.ToSharedRef()
+	];
+
+	if (bHasKeyNode)
+	{
+		SlotPointer->SetPadding(FMargin(0.0f, 0.0f, 2.0f, 0.0f));
+	}
+	else if (InCustomRow.IsValid())
+	{
+		// Allow custom name slots to fill all of the area. Eg., the user adds a SHorizontalBox with left and right align slots.
+		SlotPointer->SetFillWidth(1.0f);
+	}
+	else
+	{
+		SlotPointer->SetAutoWidth();
+	}
+
+	Row.NameContent()
+	.HAlign( HorizontalAlignment )
+	.VAlign( VerticalAlignment )
+	[
+		NameHorizontalBox
+	];
+}
+
+void FDetailPropertyRow::MakeValueWidget( FDetailWidgetRow& Row, const TSharedPtr<FDetailWidgetRow> InCustomRow, bool bAddWidgetDecoration ) const
+{
+	EVerticalAlignment VerticalAlignment = VAlign_Center;
+	EHorizontalAlignment HorizontalAlignment = HAlign_Left;
+
+	TOptional<float> MinWidth;
+	TOptional<float> MaxWidth;
+
+	TAttribute<bool> IsEnabledAttrib = TAttribute<bool>::CreateSP( this, &FDetailPropertyRow::GetEnabledState );
+
+	TSharedRef<SHorizontalBox> ValueWidget = 
+		SNew( SHorizontalBox )
+		.IsEnabled( IsEnabledAttrib );
+
+	if (InCustomRow.IsValid())
+	{
+		VerticalAlignment = InCustomRow->ValueWidget.VerticalAlignment;
+		HorizontalAlignment = InCustomRow->ValueWidget.HorizontalAlignment;
+		MinWidth = InCustomRow->ValueWidget.MinWidth;
+		MaxWidth = InCustomRow->ValueWidget.MaxWidth;
+
+		ValueWidget->AddSlot()
+		[
+			InCustomRow->ValueWidget.Widget
+		];
+
+		Row
+		.ExtensionContent()
+		[
+			InCustomRow->ExtensionWidget.Widget
+		];
+	}
+	else if (PropertyEditor.IsValid())
+	{
+		TSharedPtr<SPropertyValueWidget> PropertyValue;
+		ValueWidget->AddSlot()
+		[
+			SAssignNew( PropertyValue, SPropertyValueWidget, PropertyEditor, GetPropertyUtilities() )
+			.ShowPropertyButtons( false ) // We handle this ourselves
+		];
+		
+		MinWidth = PropertyValue->GetMinDesiredWidth();
+		MaxWidth = PropertyValue->GetMaxDesiredWidth();
+	}
+
+	if (bAddWidgetDecoration && PropertyEditor.IsValid())
+	{
+		if (bShowPropertyButtons)
+		{
+			TArray< TSharedRef<SWidget> > RequiredButtons;
+			PropertyEditorHelpers::MakeRequiredPropertyButtons( PropertyEditor.ToSharedRef(), /*OUT*/RequiredButtons );
+
+			for( int32 ButtonIndex = 0; ButtonIndex < RequiredButtons.Num(); ++ButtonIndex )
+			{
+				ValueWidget->AddSlot()
+				.AutoWidth()
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				.Padding(4.0f, 1.0f, 0.0f, 1.0f)
+				[ 
+					RequiredButtons[ButtonIndex]
+				];
+			}
+		}
+
+		// Don't add config hierarchy to container children, can't edit child properties at the hiearchy's per file level
+		TSharedPtr<IPropertyHandle> ParentHandle = PropertyHandle->GetParentHandle();
+		bool bIsChildProperty = ParentHandle && (ParentHandle->AsArray() || ParentHandle->AsMap() || ParentHandle->AsSet());
+
+		/*
+		if (!bIsChildProperty && PropertyHandle->HasMetaData(TEXT("ConfigHierarchyEditable")))
+		{
+			ValueWidget->AddSlot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Left)
+			.Padding(4.0f, 0.0f, 4.0f, 0.0f)
+			[
+				PropertyCustomizationHelpers::MakeEditConfigHierarchyButton(FSimpleDelegate::CreateSP(PropertyEditor.ToSharedRef(), &FPropertyEditor::EditConfigHierarchy))
+			];
+		}
+		*/
+	}
+
+	Row.ValueContent()
+		.HAlign( HorizontalAlignment )
+		.VAlign( VerticalAlignment )	
+		.MinDesiredWidth( MinWidth )
+		.MaxDesiredWidth( MaxWidth )
+		[
+			ValueWidget
+		];
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailPropertyRow.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailPropertyRow.h
new file mode 100644
index 0000000..29f2af4
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailPropertyRow.h
@@ -0,0 +1,242 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Layout/Visibility.h"
+//#include "AssetThumbnail.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+
+namespace soda
+{
+
+struct FAddPropertyParams;
+
+class FCustomChildrenBuilder;
+class IDetailGroup;
+
+class FDetailPropertyRow : public IDetailPropertyRow, public IPropertyTypeCustomizationUtils, public IDetailLayoutRow, public TSharedFromThis<FDetailPropertyRow>
+{
+public:
+	FDetailPropertyRow(TSharedPtr<FPropertyNode> InPropertyNode, TSharedRef<FDetailCategoryImpl> InParentCategory, TSharedPtr<FComplexPropertyNode> InExternalRootNode = nullptr);
+
+	/** IDetailPropertyRow interface */
+	virtual TSharedPtr<IPropertyHandle> GetPropertyHandle() const override { return PropertyHandle; }
+	virtual IDetailPropertyRow& DisplayName( const FText& InDisplayName ) override;
+	virtual IDetailPropertyRow& ToolTip( const FText& InToolTip ) override;
+	virtual IDetailPropertyRow& ShowPropertyButtons( bool bInShowPropertyButtons ) override;
+	virtual IDetailPropertyRow& EditCondition( TAttribute<bool> EditConditionValue, FOnBooleanValueChanged OnEditConditionValueChanged ) override;
+	virtual IDetailPropertyRow& IsEnabled(TAttribute<bool> InIsEnabled) override;
+	virtual IDetailPropertyRow& ShouldAutoExpand(bool bForceExpansion) override;
+	virtual IDetailPropertyRow& Visibility( TAttribute<EVisibility> Visibility ) override;
+	virtual IDetailPropertyRow& OverrideResetToDefault(const FResetToDefaultOverride& ResetToDefault) override;
+	virtual IDetailPropertyRow& DragDropHandler(TSharedPtr<IDetailDragDropHandler> InDragDropHandler) override;
+	virtual FDetailWidgetRow& CustomWidget( bool bShowChildren = false ) override;
+	virtual FDetailWidgetDecl* CustomNameWidget() override;
+	virtual FDetailWidgetDecl* CustomValueWidget() override;
+	virtual void GetDefaultWidgets( TSharedPtr<SWidget>& OutNameWidget, TSharedPtr<SWidget>& OutValueWidget, bool bAddWidgetDecoration = false) override;
+	virtual void GetDefaultWidgets( TSharedPtr<SWidget>& OutNameWidget, TSharedPtr<SWidget>& OutValueWidget, FDetailWidgetRow& Row, bool bAddWidgetDecoration = false) override;
+
+	/** IPropertyTypeCustomizationUtils interface */
+	//virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const override;
+	virtual TSharedPtr<class IPropertyUtilities> GetPropertyUtilities() const override;
+
+	/** IDetailLayoutRow interface */
+	virtual FName GetRowName() const override;
+
+	/** @return true if this row has widgets with columns */
+	bool HasColumns() const;
+
+	/** @return true if this row shows only children and is not visible itself */
+	bool ShowOnlyChildren() const;
+
+	/** @return true if this row should be ticked */
+	bool RequiresTick() const;
+
+	/** @return true if this row has an external property */
+	bool HasExternalProperty() const { return ExternalRootNode.IsValid(); }
+
+	/** Sets the custom name that should be used to save and restore this nodes expansion state */
+	void SetCustomExpansionId(const FName ExpansionIdName) { CustomExpansionIdName = ExpansionIdName; }
+
+	/** @return Gets the custom name that should be used to save and restore this nodes expansion state */
+	FName GetCustomExpansionId() const { return CustomExpansionIdName; }
+
+	/** 
+	 * Sets whether or not we force only children to be shown regardless of what the customization wants.
+	 * Typically used when this row is only for organizational purposes and doesnt have anything valid to show (like external object nodes)
+	 */
+	void SetForceShowOnlyChildren(bool bInForceShowOnlyChildren) { bForceShowOnlyChildren = bInForceShowOnlyChildren; }
+
+	/**
+	 * Called when the owner node is initialized
+	 *
+	 * @param InParentCategory	The category that this property is in
+	 * @param InIsParentEnabled	Whether or not our parent is enabled
+	 */
+	void OnItemNodeInitialized( TSharedRef<FDetailCategoryImpl> InParentCategory, const TAttribute<bool>& InIsParentEnabled, TSharedPtr<IDetailGroup> InParentGroup);
+
+	/** @return The widget row that should be displayed for this property row */
+	FDetailWidgetRow GetWidgetRow();
+
+	/**
+	 * @return The property node for this row
+	 */
+	TSharedPtr<FPropertyNode> GetPropertyNode() const { return PropertyNode; }
+
+	/**
+	 * @return The external root node for this row if it has one.
+	 */
+	TSharedPtr<FComplexPropertyNode> GetExternalRootNode() const { return ExternalRootNode; }
+
+	/**
+	 * @return The property node for this row
+	 */
+	TSharedPtr<FPropertyEditor> GetPropertyEditor() { return PropertyEditor; }
+
+	/**
+	 * Called when children of this row should be generated
+	 *
+	 * @param OutChildren	The list of children created
+	 */
+	void OnGenerateChildren( FDetailNodeList& OutChildren );
+	
+	/**
+	 * @return Whether or not this row wants to force expansion
+	 */
+	bool GetForceAutoExpansion() const;
+
+	/** 
+	 * @return The visibility of this property
+	 */
+	EVisibility GetPropertyVisibility() const;
+
+	static void MakeExternalPropertyRowCustomization(TSharedPtr<FStructOnScope> StructData, FName PropertyName, TSharedRef<FDetailCategoryImpl> ParentCategory, struct FDetailLayoutCustomization& OutCustomization, const FAddPropertyParams& Parameters);
+	static void MakeExternalPropertyRowCustomization(const TArray<UObject*>& InObjects, FName PropertyName, TSharedRef<FDetailCategoryImpl> ParentCategory, struct FDetailLayoutCustomization& OutCustomization, const FAddPropertyParams& Parameters);
+
+private:
+	/**
+	 * Makes a name widget or key widget for the tree
+	 */
+	void MakeNameOrKeyWidget( FDetailWidgetRow& Row, const TSharedPtr<FDetailWidgetRow> InCustomRow ) const;
+
+	/**
+	 * Makes the value widget for the tree
+	 */
+	void MakeValueWidget( FDetailWidgetRow& Row, const TSharedPtr<FDetailWidgetRow> InCustomRow, bool bAddWidgetDecoration = true ) const;
+
+	/**
+	 * Set the given widget row's custom properties. Note: Should be called before MakeNameOrKeyWidget and MakeValueWidget.
+	 */
+	void SetWidgetRowProperties( FDetailWidgetRow& Row ) const;
+
+	/**
+	 * @return true if this row has an edit condition
+	 */
+	bool HasEditCondition() const;
+
+	/**
+	 * @return Whether or not this row is enabled
+	 */
+	bool GetEnabledState() const;
+
+	/** 
+	 * Looks up and caches (if not already) the associated type interface, and then returns it.
+	 * Could be null/invalid if no customization was specified for this row.
+	 *
+	 * Creating the CustomTypeInterface on demand, instead of at construction, allows for 
+	 * IDetailCustomization's to override custom property type layouts via a IDetailLayoutBuilder.
+	 * 
+	 */
+	TSharedPtr<IPropertyTypeCustomization>& GetTypeInterface();
+
+	/**
+	 * Generates children for the property node
+	 *
+	 * @param RootPropertyNode	The property node to generate children for (May be a child of the property node being stored)
+	 * @param OutChildren	The list of children created 
+	 */
+	void GenerateChildrenForPropertyNode( TSharedPtr<FPropertyNode>& RootPropertyNode, FDetailNodeList& OutChildren );
+
+	/**
+	 * Makes a property editor from the property node on this row
+	 *
+	 * @param InPropertyNode	The node to create the editor for
+	 * @param PropertyUtilities	Utilities for the property editor
+	 * @param InEditor			The editor we wish to create if it does not yet exist.
+	 */
+	static TSharedRef<FPropertyEditor> MakePropertyEditor( const TSharedRef<FPropertyNode>& InPropertyNode, const TSharedRef<IPropertyUtilities>& PropertyUtilities, TSharedPtr<FPropertyEditor>& InEditor );
+
+	/**
+	 * Gets the property customization for the specified node
+	 *
+	 * @param	InPropertyNode		The node to check for customizations
+	 * @param	InParentCategory	The node's parent category
+	 * @return	The property customization for the node, or null if one does not exist
+	 */
+	static TSharedPtr<IPropertyTypeCustomization> GetPropertyCustomization( const TSharedRef<FPropertyNode>& InPropertyNode, const TSharedRef<FDetailCategoryImpl>& InParentCategory );
+
+	/** Does the given property node require a key node to be created, or is a key property editor sufficient? */
+	static bool NeedsKeyNode(TSharedRef<FPropertyNode> InPropertyNode, TSharedRef<FDetailCategoryImpl> InParentCategory);
+
+private:
+	/** User driven enabled state */
+	TAttribute<bool> CustomIsEnabledAttrib;
+	/** Whether or not our parent is enabled */
+	TAttribute<bool> IsParentEnabled;
+	/** Visibility of the property */
+	TAttribute<EVisibility> PropertyVisibility;
+	/** If the property on this row is a customized property type, this is the interface to that customization */
+	TSharedPtr<IPropertyTypeCustomization> CachedCustomTypeInterface;
+	/** Builder for children of a customized property type */
+	TSharedPtr<class FCustomChildrenBuilder> PropertyTypeLayoutBuilder;
+	/** The property handle for this row */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+	/** The property node for this row */
+	TSharedPtr<FPropertyNode> PropertyNode;
+	/** The property editor for this row */
+	TSharedPtr<FPropertyEditor> PropertyEditor;
+	/** The property editor for this row's key */
+	TSharedPtr<FPropertyEditor> PropertyKeyEditor;
+	/** The property Type customization for this row's key */
+	TSharedPtr<IPropertyTypeCustomization> CachedKeyCustomTypeInterface;
+	/** Custom widgets to use for this row instead of the default ones */
+	TSharedPtr<FDetailWidgetRow> CustomPropertyWidget;
+	/** User customized edit condition */
+	TAttribute<bool> CustomEditConditionValue;
+	/** User customized edit condition change handler. */
+	FOnBooleanValueChanged CustomEditConditionValueChanged;
+	/** User customized reset to default */
+	TOptional<FResetToDefaultOverride> CustomResetToDefault;
+	/** User customized drag/drop handler */
+	TSharedPtr<IDetailDragDropHandler> CustomDragDropHandler;
+	/** The category this row resides in */
+	TWeakPtr<FDetailCategoryImpl> ParentCategory;
+	/** Root of the property node if this node comes from an external tree */
+	TSharedPtr<FComplexPropertyNode> ExternalRootNode;
+
+	TSharedPtr<struct FDetailLayoutData> ExternalObjectLayout;
+	/** The custom expansion ID name used to save and restore expansion state on this node */
+	FName CustomExpansionIdName;
+	/** Whether or not to show standard property buttons */
+	bool bShowPropertyButtons;
+	/** True to show custom property children */
+	bool bShowCustomPropertyChildren;
+	/** True to force auto-expansion */
+	bool bForceAutoExpansion;
+	/** True if we've already attempted to fill out our CustomTypeInterface (no need to rerun the query) */
+	bool bCachedCustomTypeInterface;
+	/** True if this row is only for organizational purposes and doesnt have anything valid to show itself*/
+	bool bForceShowOnlyChildren = false;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailTreeNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailTreeNode.cpp
new file mode 100644
index 0000000..9890bf5
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailTreeNode.cpp
@@ -0,0 +1,131 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+
+namespace soda
+{
+
+FNodeWidgets FDetailTreeNode::CreateNodeWidgets() const
+{
+	FDetailWidgetRow Row;
+	GenerateStandaloneWidget(Row);
+
+	FNodeWidgets Widgets;
+
+	if (Row.HasAnyContent())
+	{
+		if (Row.HasColumns())
+		{
+			Widgets.NameWidget = Row.NameWidget.Widget;
+			Widgets.NameWidgetLayoutData = FNodeWidgetLayoutData(
+				Row.NameWidget.HorizontalAlignment, Row.NameWidget.VerticalAlignment, Row.NameWidget.MinWidth, Row.NameWidget.MaxWidth);
+			Widgets.ValueWidget = Row.ValueWidget.Widget;
+			Widgets.ValueWidgetLayoutData = FNodeWidgetLayoutData(
+				Row.ValueWidget.HorizontalAlignment, Row.ValueWidget.VerticalAlignment, Row.ValueWidget.MinWidth, Row.ValueWidget.MaxWidth);
+		}
+		else
+		{
+			Widgets.WholeRowWidget = Row.WholeRowWidget.Widget;
+			Widgets.WholeRowWidgetLayoutData = FNodeWidgetLayoutData(
+				Row.WholeRowWidget.HorizontalAlignment, Row.WholeRowWidget.VerticalAlignment, Row.WholeRowWidget.MinWidth, Row.WholeRowWidget.MaxWidth);
+		}
+
+		Widgets.EditConditionWidget = SNew(SEditConditionWidget)
+			.EditConditionValue(Row.EditConditionValue)
+			.OnEditConditionValueChanged(Row.OnEditConditionValueChanged);
+	}
+
+	Widgets.Actions.CopyMenuAction = Row.CopyMenuAction;
+	Widgets.Actions.PasteMenuAction = Row.PasteMenuAction;
+	for (const FDetailWidgetRow::FCustomMenuData& CustomMenuItem : Row.CustomMenuItems)
+	{
+		Widgets.Actions.CustomMenuItems.Add(FNodeWidgetActionsCustomMenuData(CustomMenuItem.Action, CustomMenuItem.Name, CustomMenuItem.Tooltip, CustomMenuItem.SlateIcon));
+	}
+
+	return Widgets;
+}
+
+void FDetailTreeNode::GetChildren(TArray<TSharedRef<IDetailTreeNode>>& OutChildren)
+{
+	FDetailNodeList Children;
+	GetChildren(Children);
+
+	OutChildren.Reset(Children.Num());
+
+	OutChildren.Append(Children);
+}
+
+const UStruct* FDetailTreeNode::GetPropertyNodeBaseStructure(const FPropertyNode* PropertyNode)
+{
+	while (PropertyNode)
+	{
+		if (const FComplexPropertyNode* ComplexNode = PropertyNode->AsComplexNode())
+		{
+			return ComplexNode->GetBaseStructure();
+		}
+		else if (const FProperty* CurrentProperty = PropertyNode->GetProperty())
+		{
+			FFieldClass* PropertyClass = CurrentProperty->GetClass();
+			if (PropertyClass == FStructProperty::StaticClass())
+			{
+
+				return static_cast<const FStructProperty*>(CurrentProperty)->Struct;
+			}
+			// Object Properties seem to always show up as ObjectPropertyNodes, which are handled above
+			//else if (PropertyClass == FObjectProperty::StaticClass())
+			//{
+			//}
+		}
+		PropertyNode = PropertyNode->GetParentNode();
+	}
+	return nullptr;
+}
+
+const UStruct* FDetailTreeNode::GetParentBaseStructure() const
+{
+	if (TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode())
+	{
+		// We don't want this node to return its own UStruct - we want its parent
+		if (const UStruct* BaseStructure = GetPropertyNodeBaseStructure(PropertyNode->GetParentNode()))
+		{
+			return BaseStructure;
+		}
+	}
+
+	TWeakPtr<FDetailTreeNode> CurrentParentNode = GetParentNode();
+	while (TSharedPtr<FDetailTreeNode> PinnedParent = CurrentParentNode.Pin())
+	{
+		if (TSharedPtr<FPropertyNode> PropertyNode = PinnedParent->GetPropertyNode())
+		{
+			// Since we're already checking parents, we can use the first property node directly instead of jumping to its parent like before
+			if (const UStruct* BaseStructure = GetPropertyNodeBaseStructure(PropertyNode.Get()))
+			{
+				return BaseStructure;
+			}
+		}
+		CurrentParentNode = PinnedParent->GetParentNode();
+	}
+
+	// If property nodes fail, check the detail layout
+	if (TSharedPtr<FDetailCategoryImpl> ParentCategory = GetParentCategory())
+	{
+		return ParentCategory->GetParentLayout().GetBaseClass();
+	}
+	// If category fails, use the first selected object. This should be rare, if it's even possible
+	// (maybe a custom builder appearing in a detail property row or something?)
+	for (TWeakObjectPtr<UObject> Selected : GetDetailsView()->GetSelectedObjects())
+	{
+		if (UObject* Object = Selected.Get())
+		{
+			return Object->GetClass();
+		}
+	}
+	return nullptr;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailTreeNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailTreeNode.h
new file mode 100644
index 0000000..887f06e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailTreeNode.h
@@ -0,0 +1,178 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/IDetailTreeNode.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "Misc/Attribute.h"
+
+class STableViewBase;
+class ITableRow;
+
+namespace soda
+{
+class FDetailCategoryImpl;
+class IDetailsViewPrivate;
+class FDetailWidgetRow;
+class FPropertyNode;
+//class FComplexPropertyNode;
+struct FDetailFilter;
+class FDetailTreeNode;
+
+typedef TArray<TSharedRef<FDetailTreeNode>> FDetailNodeList;
+
+enum class ENodeVisibility : uint8
+{
+	// Hidden but can be visible if parent is visible due to filtering
+	HiddenDueToFiltering,
+	// Never visible no matter what
+	ForcedHidden,
+	// Always visible
+	Visible,
+};
+
+class FDetailTreeNode : public IDetailTreeNode
+{
+public:
+
+	/** IDetailTreeNode interface */
+	virtual FNodeWidgets CreateNodeWidgets() const;
+	virtual void GetChildren(TArray<TSharedRef<IDetailTreeNode>>& OutChildren);
+	virtual TSharedPtr<class IDetailPropertyRow> GetRow() const override { return nullptr; }
+	virtual void GetFilterStrings(TArray<FString>& OutFilterStrings) const override { };
+	virtual bool GetInitiallyCollapsed() const override { return false; }
+
+	/** @return The details view that this node is in */
+	virtual IDetailsViewPrivate* GetDetailsView() const = 0;
+
+	/**
+	 * Generates the widget representing this node
+	 *
+	 * @param OwnerTable		The table owner of the widget being generated
+	 * @param PropertyUtilities	Property utilities to help generate widgets
+	 */
+	virtual TSharedRef< ITableRow > GenerateWidgetForTableView(const TSharedRef<STableViewBase>& OwnerTable, bool bAllowFavoriteSystem) = 0;
+
+	virtual bool GenerateStandaloneWidget(FDetailWidgetRow& OutRow) const = 0;
+
+	/**
+	 * Filters this nodes visibility based on the provided filter strings
+	 */
+	virtual void FilterNode(const FDetailFilter& InFilter) = 0;
+
+	/**
+	 * Gets child tree nodes
+	 *
+	 * @param OutChildren	The array to add children to
+	 */
+	virtual void GetChildren(FDetailNodeList& OutChildren) = 0;
+
+	/**
+	 * @ The parent DetailTreeNode of this node, or nullptr if this is a root node (or not yet added to a tree)
+	 */
+	TWeakPtr<FDetailTreeNode> GetParentNode() const { return ParentNode; }
+
+	/**
+	 * Sets the parent node. The parent node's GetChildren() call should include this node.
+	 *
+	 * @param The new parent for this node
+	 */
+	void SetParentNode(TWeakPtr<FDetailTreeNode> InParentNode) { ParentNode = InParentNode; }
+
+	/**
+	 * Finds the immediate UScriptStruct or UClass containing this node, which is found through a series of checks:
+	 * 1. Get the corresponding property node and find the nearest object or struct property containing the property
+	 * 2. If that fails, each parent node is checked with the same criteria as above
+	 * 3. If that fails, the base structure of the detail layout containing this node is used
+	 * 4. If that fails, the class of the first selected object in the details view is used
+	 *
+	 * @return The best matching UStruct that was responsible for creating this node
+	 */
+	const UStruct* GetParentBaseStructure() const;
+
+	/**
+	 * A helper function for GetParentBaseStructure that gets the parent specifically for a property node instead of a detail node
+	 */
+	static const UStruct* GetPropertyNodeBaseStructure(const FPropertyNode* PropertyNode);
+
+	/**
+	 * Called when the item is expanded in the tree
+	 */
+	virtual void OnItemExpansionChanged(bool bIsExpanded, bool bShouldSaveState) = 0;
+
+	/**
+	 * @return Whether or not the tree node should be expanded
+	 */
+	virtual bool ShouldBeExpanded() const = 0;
+
+	/**
+	 * @return the visibility of this node in the tree
+	 */
+	virtual ENodeVisibility GetVisibility() const = 0;
+
+	/**
+	 * Called each frame if the node requests that it should be ticked
+	 */
+	virtual void Tick(float DeltaTime) = 0;
+
+	/**
+	 * @return true to ignore this node for visibility in the tree and only examine children
+	 */
+	virtual bool ShouldShowOnlyChildren() const = 0;
+
+	/**
+	 * The identifier name of the node
+	 */
+	virtual FName GetNodeName() const = 0;
+
+	/**
+	 * @return The category node that this node is nested in, if any:
+	 */
+	virtual TSharedPtr<FDetailCategoryImpl> GetParentCategory() const { return TSharedPtr<FDetailCategoryImpl>(); }
+
+	/**
+	 * @return The property path that this node is associate with, if any:
+	 */
+	virtual FPropertyPath GetPropertyPath() const { return FPropertyPath(); }
+
+	/**
+	 * Called when the node should appear 'highlighted' to draw the users attention to it
+	 */
+	virtual void SetIsHighlighted(bool bInIsHighlighted) {}
+
+	/**
+	 * @return true if the node has been highlighted
+	 */
+	virtual bool IsHighlighted() const { return false; }
+
+	/**
+	 * @return true if this is a leaf node:
+	 */
+	virtual bool IsLeaf() { return false; }
+
+	/**
+	 * @return TAttribute indicating whether editing is enabled or whether the property is readonly:
+	 */
+	virtual TAttribute<bool> IsPropertyEditingEnabled() const { return false; }
+
+	/** 
+	 * Gets the property node associated with this node.  Not all nodes have properties so this will fail for anything other than a property row or for property rows that have complex customizations that ignore the property
+	 */
+	virtual TSharedPtr<FPropertyNode> GetPropertyNode() const { return nullptr; }
+
+	/**
+	 * Gets the external property node associated with this node.  This will return nullptr for all rows expect property rows which were generated from an external root.
+	 */
+	virtual TSharedPtr<FComplexPropertyNode> GetExternalRootPropertyNode() const { return nullptr; }
+
+private:
+
+	/** The parent whose GetChildren() call will return this node. This can be null for root nodes or nodes not added to the tree yet. */
+	TWeakPtr<FDetailTreeNode> ParentNode = nullptr;
+};
+
+} // namespace soda
+
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailWidgetRow.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailWidgetRow.cpp
new file mode 100644
index 0000000..d8b16e3
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailWidgetRow.cpp
@@ -0,0 +1,13 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+
+namespace soda
+{
+
+const float FDetailWidgetRow::DefaultValueMinWidth = 125.0f;
+const float FDetailWidgetRow::DefaultValueMaxWidth = 125.0f;
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewConfig2.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewConfig2.h
new file mode 100644
index 0000000..b9df1ee
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewConfig2.h
@@ -0,0 +1,79 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+//#include "EditorConfigBase.h"
+
+#include "DetailsViewConfig2.generated.h"
+
+USTRUCT()
+struct FDetailsSectionSelection2
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY()
+	TSet<FName> SectionNames;
+};
+
+USTRUCT()
+struct FDetailsViewConfig2
+{
+	GENERATED_BODY()
+
+public:
+	
+	/** If we should show the favorites category. */
+	UPROPERTY()
+	bool bShowFavoritesCategory { false };
+
+	/** When enabled, the Advanced Details will always auto expand. */
+	UPROPERTY()
+	bool bShowAllAdvanced { false };
+
+	/** When Playing or Simulating, shows all properties (even non-visible and non-editable properties), if the object belongs to a simulating world.  This is useful for debugging. */
+	UPROPERTY()
+	bool bShowHiddenPropertiesWhilePlaying { false };
+
+	/** Show all category children if the category matches the filter. */
+	UPROPERTY()
+	bool bShowAllChildrenIfCategoryMatches { false };
+
+	/** Show only keyable properties. */
+	UPROPERTY()
+	bool bShowOnlyKeyable { false };
+
+	/** Show only animated properties. */
+	UPROPERTY()
+	bool bShowOnlyAnimated { false };
+
+	/** Show only modified properties. */
+	UPROPERTY()
+	bool bShowOnlyModified { false };
+
+	/** Show sections. */
+	UPROPERTY()
+	bool bShowSections { true };
+
+	/** Width of the value column in the details view (0.0-1.0). */
+	UPROPERTY()
+	float ValueColumnWidth { 0 };
+
+	/** A map of class name to a set of selected sections for that class. */
+	UPROPERTY()
+	TMap<FName, FDetailsSectionSelection2> SelectedSections;
+};
+
+UCLASS(EditorConfig="DetailsView")
+class UDetailsConfig2 : public UObject /*UEditorConfigBase*/
+{
+	GENERATED_BODY()
+	
+public:
+
+	UPROPERTY(meta=(EditorConfig))
+	TMap<FName, FDetailsViewConfig2> Views;
+};
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewGenericObjectFilter.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewGenericObjectFilter.cpp
new file mode 100644
index 0000000..dc299f0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewGenericObjectFilter.cpp
@@ -0,0 +1,33 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/DetailsViewGenericObjectFilter.h"
+
+namespace soda
+{
+
+FDetailsViewDefaultObjectFilter::FDetailsViewDefaultObjectFilter(bool bInAllowMultipleRoots)
+	: bAllowMultipleRoots(bInAllowMultipleRoots)
+{
+}
+
+TArray<FDetailsViewObjectRoot> FDetailsViewDefaultObjectFilter::FilterObjects(const TArray<UObject*>& SourceObjects)
+{
+	TArray<FDetailsViewObjectRoot> Roots;
+	if (bAllowMultipleRoots)
+	{
+		Roots.Reserve(SourceObjects.Num());
+		for (UObject* Object : SourceObjects)
+		{
+			Roots.Emplace(Object);
+		}
+	}
+	else
+	{
+		Roots.Emplace(SourceObjects);
+	}
+
+	return Roots;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewGenericObjectFilter.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewGenericObjectFilter.h
new file mode 100644
index 0000000..381ff72
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewGenericObjectFilter.h
@@ -0,0 +1,28 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/DetailsViewObjectFilter.h"
+
+namespace soda
+{
+
+/**
+ * The default object set is just a pass through to the details panel.  
+ */
+class FDetailsViewDefaultObjectFilter : public FDetailsViewObjectFilter
+{
+public:
+	FDetailsViewDefaultObjectFilter(bool bInAllowMultipleRoots);
+
+	/**
+	 * FDetailsViewObjectFilter interface
+	 */
+	virtual TArray<FDetailsViewObjectRoot> FilterObjects(const TArray<UObject*>& SourceObjects);
+
+private:
+	bool bAllowMultipleRoots;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewPropertyGenerationUtilities.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewPropertyGenerationUtilities.h
new file mode 100644
index 0000000..d4c69e5
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/DetailsViewPropertyGenerationUtilities.h
@@ -0,0 +1,34 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/IPropertyGenerationUtilities.h"
+
+namespace soda
+{
+
+/** Property generation utilities for widgets derived from SDetailsViewBase. */
+class FDetailsViewPropertyGenerationUtilities : public IPropertyGenerationUtilities
+{
+public:
+	FDetailsViewPropertyGenerationUtilities(SDetailsViewBase& InDetailsView)
+		: DetailsView(&InDetailsView)
+	{
+	}
+
+	virtual const FCustomPropertyTypeLayoutMap& GetInstancedPropertyTypeLayoutMap() const override
+	{
+		return DetailsView->GetCustomPropertyTypeLayoutMap();
+	}
+
+	virtual void RebuildTreeNodes() override
+	{
+		DetailsView->RerunCurrentFilter();
+	}
+
+private:
+	SDetailsViewBase * DetailsView;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionContext.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionContext.cpp
new file mode 100644
index 0000000..ae839f1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionContext.cpp
@@ -0,0 +1,484 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/EditConditionContext.h"
+#include "RuntimePropertyEditor/EditConditionParser.h"
+
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+
+DEFINE_LOG_CATEGORY(LogEditCondition);
+
+namespace soda
+{
+
+FEditConditionContext::FEditConditionContext(FPropertyNode& InPropertyNode)
+{
+	PropertyNode = InPropertyNode.AsShared();
+}
+
+FName FEditConditionContext::GetContextName() const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return FName();
+	}
+
+	return PinnedNode->GetProperty()->GetOwnerStruct()->GetFName();
+}
+
+const FBoolProperty* FEditConditionContext::GetSingleBoolProperty(const TSharedPtr<FEditConditionExpression>& Expression) const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return nullptr;
+	}
+
+	const FProperty* Property = PinnedNode->GetProperty();
+	if (Property == nullptr)
+	{
+		return nullptr;
+	}
+
+	const FBoolProperty* BoolProperty = nullptr;
+
+	for (const FCompiledToken& Token : Expression->Tokens)
+	{
+		if (const EditConditionParserTokens::FPropertyToken* PropertyToken = Token.Node.Cast<EditConditionParserTokens::FPropertyToken>())
+		{
+			if (BoolProperty != nullptr)
+			{
+				// second property token in the same expression, this can't be a simple expression like "bValue == false"
+				return nullptr;
+			}
+
+			BoolProperty = FindFProperty<FBoolProperty>(Property->GetOwnerStruct(), *PropertyToken->PropertyName);
+			if (BoolProperty == nullptr)
+			{
+				return nullptr;
+			}
+		}
+	}
+
+	return BoolProperty;
+}
+
+static TSet<TPair<FName, FString>> AlreadyLogged;
+
+template<typename T>
+const T* FindTypedField(const TSharedPtr<FPropertyNode>& PropertyNode, const FString& FieldName)
+{
+	if (!PropertyNode.IsValid())
+	{
+		return nullptr;
+	}
+
+	const FProperty* Property = PropertyNode->GetProperty();
+	if (Property == nullptr)
+	{
+		return nullptr;
+	}
+
+	const FProperty* Field = FindFProperty<FProperty>(Property->GetOwnerStruct(), *FieldName);
+	if (Field == nullptr)
+	{
+		TPair<FName, FString> FieldKey(Property->GetOwnerStruct()->GetFName(), FieldName);
+		if (!AlreadyLogged.Find(FieldKey))
+		{
+			AlreadyLogged.Add(FieldKey);
+			UE_LOG(LogEditCondition, Error, TEXT("EditCondition parsing failed: Field name \"%s\" was not found in class \"%s\"."), *FieldName, *Property->GetOwnerStruct()->GetName());
+		}
+
+		return nullptr;
+	}
+
+	return CastField<T>(Field);
+}
+
+/** 
+ * Get the parent to use as the context when evaluating the edit condition.
+ * For normal properties inside a UObject, this is the UObject. 
+ * For children of containers, this is the UObject the container is in. 
+ * Note: We do not support nested containers.
+ * The result can be nullptr in exceptional cases, eg. if the UI is getting rebuilt.
+ */
+static const FPropertyNode* GetEditConditionParentNode(const TSharedPtr<FPropertyNode>& PropertyNode)
+{
+	const FPropertyNode* ParentNode = PropertyNode->GetParentNode();
+	FFieldVariant PropertyOuter = PropertyNode->GetProperty()->GetOwnerVariant();
+
+	if (PropertyOuter.Get<FArrayProperty>() != nullptr ||
+		PropertyOuter.Get<FSetProperty>() != nullptr ||
+		PropertyOuter.Get<FMapProperty>() != nullptr)
+	{
+		// in a dynamic container, parent is actually one level up
+		return ParentNode->GetParentNode();
+	}
+
+	if (PropertyNode->GetProperty()->ArrayDim > 1 && PropertyNode->GetArrayIndex() != INDEX_NONE)
+	{
+		// in a fixed size container, parent node is just the header field
+		return ParentNode->GetParentNode();
+	}
+
+	return ParentNode;
+}
+
+static const uint8* GetPropertyValuePtr(const FProperty* Property, const TSharedPtr<FPropertyNode>& PropertyNode, const FPropertyNode* ParentNode, const FComplexPropertyNode* ComplexParentNode, int32 Index)
+{
+	const uint8* ValuePtr = ComplexParentNode->GetValuePtrOfInstance(Index, Property, ParentNode);
+	return ValuePtr;
+}
+
+TOptional<bool> FEditConditionContext::GetBoolValue(const FString& PropertyName) const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return TOptional<bool>();
+	}
+
+	const FBoolProperty* BoolProperty = FindTypedField<FBoolProperty>(PinnedNode, PropertyName);
+	if (BoolProperty == nullptr)
+	{
+		return TOptional<bool>();
+	}
+
+	const FPropertyNode* ParentNode = GetEditConditionParentNode(PinnedNode);
+	if (ParentNode == nullptr)
+	{
+		return TOptional<bool>();
+	}
+
+	const FComplexPropertyNode* ComplexParentNode = PinnedNode->FindComplexParent();
+	if (ComplexParentNode == nullptr)
+	{
+		return TOptional<bool>();
+	}
+
+	TOptional<bool> Result;
+	for (int32 Index = 0; Index < ComplexParentNode->GetInstancesNum(); ++Index)
+	{
+		const uint8* ValuePtr = GetPropertyValuePtr(BoolProperty, PinnedNode, ParentNode, ComplexParentNode, Index);
+		if (ValuePtr == nullptr)
+		{
+			return TOptional<bool>();
+		}
+
+		bool bValue = BoolProperty->GetPropertyValue(ValuePtr);
+		if (!Result.IsSet())
+		{
+			Result = bValue;
+		}
+		else if (Result.GetValue() != bValue)
+		{
+			// all values aren't the same...
+			return TOptional<bool>();
+		}
+	}
+
+	return Result;
+}
+
+TOptional<int64> FEditConditionContext::GetIntegerValue(const FString& PropertyName) const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return TOptional<int64>();
+	}
+
+	const FProperty* Property = FindTypedField<FProperty>(PinnedNode, PropertyName);
+	const FNumericProperty* NumericProperty = CastField<FNumericProperty>(Property);
+
+	if (NumericProperty == nullptr)
+	{
+		// Retry with an enum and its underlying property
+		if (const FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property))
+		{
+			NumericProperty = EnumProperty->GetUnderlyingProperty();
+		}
+	}
+
+	if (NumericProperty == nullptr || !NumericProperty->IsInteger())
+	{
+		return TOptional<int64>();
+	}
+
+	const FPropertyNode* ParentNode = GetEditConditionParentNode(PinnedNode);
+	if (ParentNode == nullptr)
+	{
+		return TOptional<int64>();
+	}
+
+	const FComplexPropertyNode* ComplexParentNode = PinnedNode->FindComplexParent();
+	if (ComplexParentNode == nullptr)
+	{
+		return TOptional<int64>();
+	}
+
+	TOptional<int64> Result;
+	for (int32 Index = 0; Index < ComplexParentNode->GetInstancesNum(); ++Index)
+	{
+		const uint8* ValuePtr = GetPropertyValuePtr(Property, PinnedNode, ParentNode, ComplexParentNode, Index);
+		if (ValuePtr == nullptr)
+		{
+			return TOptional<int64>();
+		}
+
+		int64 Value = NumericProperty->GetSignedIntPropertyValue(ValuePtr);
+		if (!Result.IsSet())
+		{
+			Result = Value;
+		}
+		else if (Result.GetValue() != Value)
+		{
+			// all values aren't the same...
+			return TOptional<int64>();
+		}
+	}
+
+	return Result;
+}
+
+TOptional<double> FEditConditionContext::GetNumericValue(const FString& PropertyName) const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return TOptional<double>();
+	}
+
+	const FNumericProperty* NumericProperty = FindTypedField<FNumericProperty>(PinnedNode, PropertyName);
+	if (NumericProperty == nullptr)
+	{
+		return TOptional<double>();
+	}
+
+	const FPropertyNode* ParentNode = GetEditConditionParentNode(PinnedNode);
+	if (ParentNode == nullptr)
+	{
+		return TOptional<double>();
+	}
+
+	const FComplexPropertyNode* ComplexParentNode = PinnedNode->FindComplexParent();
+	if (ComplexParentNode == nullptr)
+	{
+		return TOptional<double>();
+	}
+
+	TOptional<double> Result;
+	for (int32 Index = 0; Index < ComplexParentNode->GetInstancesNum(); ++Index)
+	{
+		const uint8* ValuePtr = GetPropertyValuePtr(NumericProperty, PinnedNode, ParentNode, ComplexParentNode, Index);
+		if (ValuePtr == nullptr)
+		{
+			return TOptional<double>();
+		}
+
+		double Value = 0;
+
+		if (NumericProperty->IsInteger())
+		{
+			Value = (double) NumericProperty->GetSignedIntPropertyValue(ValuePtr);
+		}
+		else if (NumericProperty->IsFloatingPoint())
+		{
+			Value = NumericProperty->GetFloatingPointPropertyValue(ValuePtr);
+		}
+
+		if (!Result.IsSet())
+		{
+			Result = Value;
+		}
+		else if (!FMath::IsNearlyEqual(Result.GetValue(), Value))
+		{
+			// all values aren't the same...
+			return TOptional<double>();
+		}
+	}
+
+	return Result;
+}
+
+TOptional<FString> FEditConditionContext::GetEnumValue(const FString& PropertyName) const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return TOptional<FString>();
+	}
+
+	const FProperty* Property = FindTypedField<FProperty>(PinnedNode, PropertyName);
+	if (Property == nullptr)
+	{
+		return TOptional<FString>();
+	}
+
+	const UEnum* EnumType = nullptr;
+	const FNumericProperty* NumericProperty = nullptr;
+	if (const FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property))
+	{
+		NumericProperty = EnumProperty->GetUnderlyingProperty();
+		EnumType = EnumProperty->GetEnum();
+	}
+	else if (const FByteProperty* ByteProperty = CastField<FByteProperty>(Property))
+	{
+		NumericProperty = ByteProperty;
+		EnumType = ByteProperty->GetIntPropertyEnum();
+	}
+
+	if (EnumType == nullptr || NumericProperty == nullptr || !NumericProperty->IsInteger())
+	{
+		return TOptional<FString>();
+	}
+
+	const FPropertyNode* ParentNode = GetEditConditionParentNode(PinnedNode);
+	if (ParentNode == nullptr)
+	{
+		return TOptional<FString>();
+	}
+
+	const FComplexPropertyNode* ComplexParentNode = PinnedNode->FindComplexParent();
+	if (ComplexParentNode == nullptr)
+	{
+		return TOptional<FString>();
+	}
+
+	TOptional<int64> Result;
+	for (int32 Index = 0; Index < ComplexParentNode->GetInstancesNum(); ++Index)
+	{
+		// NOTE: this very intentionally fetches the value from Property, not NumericProperty, 
+		// because the underlying property of an enum does not return a valid value
+		const uint8* ValuePtr = GetPropertyValuePtr(Property, PinnedNode, ParentNode, ComplexParentNode, Index);
+		if (ValuePtr == nullptr)
+		{
+			return TOptional<FString>();
+		}
+
+		const int64 Value = NumericProperty->GetSignedIntPropertyValue(ValuePtr);
+		if (!Result.IsSet())
+		{
+			Result = Value;
+		}
+		else if (Result.GetValue() != Value)
+		{
+			// all values aren't the same...
+			return TOptional<FString>();
+		}
+	}
+
+	if (!Result.IsSet())
+	{
+		return TOptional<FString>();
+	}
+
+	return EnumType->GetNameStringByValue(Result.GetValue());
+}
+
+TOptional<UObject*> FEditConditionContext::GetPointerValue(const FString& PropertyName) const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return TOptional<UObject*>();
+	}
+
+	const FProperty* Property = FindTypedField<FProperty>(PinnedNode, PropertyName);
+	if (Property == nullptr)
+	{
+		return TOptional<UObject*>();
+	}
+
+	const FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(Property);
+	if (ObjectProperty == nullptr)
+	{
+		return TOptional<UObject*>();
+	}
+
+	const FPropertyNode* ParentNode = GetEditConditionParentNode(PinnedNode);
+	if (ParentNode == nullptr)
+	{
+		return TOptional<UObject*>();
+	}
+
+	const FComplexPropertyNode* ComplexParentNode = PinnedNode->FindComplexParent();
+	if (ComplexParentNode == nullptr)
+	{
+		return TOptional<UObject*>();
+	}
+
+	TOptional<UObject*> Result;
+	for (int32 Index = 0; Index < ComplexParentNode->GetInstancesNum(); ++Index)
+	{
+		const uint8* ValuePtr = GetPropertyValuePtr(Property, PinnedNode, ParentNode, ComplexParentNode, Index);
+		if (ValuePtr == nullptr)
+		{
+			return TOptional<UObject*>();
+		}
+
+		UObject* Value = ObjectProperty->GetObjectPropertyValue(ValuePtr);
+		if (!Result.IsSet())
+		{
+			Result = Value;
+		}
+		else if (Result.GetValue() != Value)
+		{
+			// all values aren't the same
+			return TOptional<UObject*>();
+		}
+	}
+
+	return Result;
+}
+
+TOptional<FString> FEditConditionContext::GetTypeName(const FString& PropertyName) const
+{
+	TSharedPtr<FPropertyNode> PinnedNode = PropertyNode.Pin();
+	if (!PinnedNode.IsValid())
+	{
+		return TOptional<FString>();
+	}
+
+	const FProperty* Property = FindTypedField<FProperty>(PinnedNode, PropertyName);
+	if (Property == nullptr)
+	{
+		return TOptional<FString>();
+	}
+
+	if (const FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property))
+	{
+		return EnumProperty->GetEnum()->GetName();
+	}
+	else if (const FByteProperty* ByteProperty = CastField<FByteProperty>(Property))
+	{
+		const UEnum* EnumType = ByteProperty->GetIntPropertyEnum();
+		if (EnumType != nullptr)
+		{
+			return EnumType->GetName();
+		}
+	}
+
+	return Property->GetCPPType();
+}
+
+TOptional<int64> FEditConditionContext::GetIntegerValueOfEnum(const FString& EnumTypeName, const FString& MemberName) const
+{
+	const UEnum* EnumType = UClass::TryFindTypeSlow<UEnum>(EnumTypeName, EFindFirstObjectOptions::ExactClass);
+	if (EnumType == nullptr)
+	{
+		return TOptional<int64>();
+	}
+
+	const int64 EnumValue = EnumType->GetValueByName(FName(*MemberName));
+	if (EnumValue == INDEX_NONE)
+	{
+		return TOptional<int64>();
+	}
+
+	return EnumValue;
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionContext.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionContext.h
new file mode 100644
index 0000000..33f2b04
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionContext.h
@@ -0,0 +1,59 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+DECLARE_LOG_CATEGORY_EXTERN(LogEditCondition, Log, All);
+
+class FProperty;
+
+namespace soda
+{
+
+class IEditConditionContext
+{
+public:
+	virtual FName GetContextName() const = 0;
+
+	virtual TOptional<bool> GetBoolValue(const FString& PropertyName) const = 0;
+	virtual TOptional<int64> GetIntegerValue(const FString& PropertyName) const = 0;
+	virtual TOptional<double> GetNumericValue(const FString& PropertyName) const = 0;
+	virtual TOptional<FString> GetEnumValue(const FString& PropertyName) const = 0;
+	virtual TOptional<UObject*> GetPointerValue(const FString& PropertyName) const = 0;
+	virtual TOptional<FString> GetTypeName(const FString& PropertyName) const = 0;
+	virtual TOptional<int64> GetIntegerValueOfEnum(const FString& EnumType, const FString& EnumValue) const = 0;
+};
+
+class FPropertyNode;
+class FComplexPropertyNode;
+class FEditConditionExpression;
+
+class FEditConditionContext : public IEditConditionContext
+{
+public:
+	FEditConditionContext(FPropertyNode& InPropertyNode);
+	virtual ~FEditConditionContext() {}
+
+	virtual FName GetContextName() const override;
+
+	virtual TOptional<bool> GetBoolValue(const FString& PropertyName) const override;
+	virtual TOptional<int64> GetIntegerValue(const FString& PropertyName) const override;
+	virtual TOptional<double> GetNumericValue(const FString& PropertyName) const override;
+	virtual TOptional<FString> GetEnumValue(const FString& PropertyName) const override;
+	virtual TOptional<UObject*> GetPointerValue(const FString& PropertyName) const override;
+	virtual TOptional<FString> GetTypeName(const FString& PropertyName) const override;
+	virtual TOptional<int64> GetIntegerValueOfEnum(const FString& EnumType, const FString& EnumValue) const override;
+
+	/**
+	 * Fetch the single boolean property referenced.
+	 * Returns nullptr if more than one property is referenced.
+	 */
+	const FBoolProperty* GetSingleBoolProperty(const TSharedPtr<FEditConditionExpression>& Expression) const;
+
+private:
+	TWeakPtr<FPropertyNode> PropertyNode;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionParser.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionParser.cpp
new file mode 100644
index 0000000..bf157f5
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionParser.cpp
@@ -0,0 +1,845 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/EditConditionParser.h"
+#include "RuntimePropertyEditor/EditConditionContext.h"
+
+#include "Containers/Set.h"
+#include "HAL/PlatformCrt.h"
+#include "Internationalization/Internationalization.h"
+#include "Internationalization/Text.h"
+#include "Logging/LogCategory.h"
+#include "Logging/LogMacros.h"
+#include "Math/BasicMathExpressionEvaluator.h"
+#include "Misc/AssertionMacros.h"
+#include "Misc/ExpressionParser.h"
+#include "Misc/Optional.h"
+#include "Trace/Detail/Channel.h"
+#include "UObject/NameTypes.h"
+
+class UObject;
+
+#define LOCTEXT_NAMESPACE "EditConditionParser"
+
+namespace soda
+{
+
+namespace EditConditionParserTokens
+{
+	const TCHAR* const FEqual::Moniker = TEXT("==");
+	const TCHAR* const FNotEqual::Moniker = TEXT("!=");
+	const TCHAR* const FGreater::Moniker = TEXT(">");
+	const TCHAR* const FGreaterEqual::Moniker = TEXT(">=");
+	const TCHAR* const FLess::Moniker = TEXT("<");
+	const TCHAR* const FLessEqual::Moniker = TEXT("<=");
+	const TCHAR* const FNot::Moniker = TEXT("!");
+	const TCHAR* const FAnd::Moniker = TEXT("&&");
+	const TCHAR* const FOr::Moniker = TEXT("||");
+	const TCHAR* const FAdd::Moniker = TEXT("+");
+	const TCHAR* const FSubtract::Moniker = TEXT("-");
+	const TCHAR* const FMultiply::Moniker = TEXT("*");
+	const TCHAR* const FDivide::Moniker = TEXT("/");
+	const TCHAR* const FBitwiseAnd::Moniker = TEXT("&");
+	const TCHAR* const FSubExpressionStart::Moniker = TEXT("(");
+	const TCHAR* const FSubExpressionEnd::Moniker = TEXT(")");
+}
+
+static const TCHAR PropertyBreakingChars[] = { '|', '=', '&', '>', '<', '!', '+', '-', '*', '/', ' ', '\t', '(', ')' };
+
+static TOptional<FExpressionError> ConsumeBool(FExpressionTokenConsumer& Consumer)
+{
+	TOptional<FStringToken> TrueToken = Consumer.GetStream().ParseTokenIgnoreCase(TEXT("true"));
+	if (TrueToken.IsSet())
+	{
+		Consumer.Add(TrueToken.GetValue(), true);
+	}
+
+	TOptional<FStringToken> FalseToken = Consumer.GetStream().ParseTokenIgnoreCase(TEXT("false"));
+	if (FalseToken.IsSet())
+	{
+		Consumer.Add(FalseToken.GetValue(), false);
+	}
+
+	return TOptional<FExpressionError>();
+}
+
+static TOptional<FExpressionError> ConsumeNullPtr(FExpressionTokenConsumer& Consumer)
+{
+	TOptional<FStringToken> NullToken = Consumer.GetStream().ParseToken(TEXT("nullptr"));
+	if (NullToken.IsSet())
+	{
+		Consumer.Add(NullToken.GetValue(), EditConditionParserTokens::FNullPtrToken());
+	}
+
+	return TOptional<FExpressionError>();
+}
+
+static TOptional<FExpressionError> ConsumePropertyName(FExpressionTokenConsumer& Consumer)
+{
+	enum class EParsedStringType : uint8
+	{
+		Unknown,
+		Unquoted,
+		Quoted,
+	};
+
+	FString PropertyName;
+	bool bShouldBeEnum = false;
+	EParsedStringType ParsedStringType = EParsedStringType::Unknown;
+
+	TCHAR OpeningQuoteChar = TEXT('\0');
+	int32 NumConsecutiveSlashes = 0;
+
+	TOptional<FStringToken> StringToken = Consumer.GetStream().ParseToken([&PropertyName, &bShouldBeEnum, &ParsedStringType, &OpeningQuoteChar, &NumConsecutiveSlashes](TCHAR InC)
+	{
+		if (ParsedStringType == EParsedStringType::Unknown)
+		{
+			if (InC == '"' || InC == '\'')
+			{
+				ParsedStringType = EParsedStringType::Quoted;
+
+				OpeningQuoteChar = InC;
+				NumConsecutiveSlashes = 0;
+				return EParseState::Continue;
+			}
+			
+			ParsedStringType = EParsedStringType::Unquoted;
+		}
+
+		check(ParsedStringType != EParsedStringType::Unknown);
+
+		if (InC == ':')
+		{
+			bShouldBeEnum = true;
+		}
+
+		if (ParsedStringType == EParsedStringType::Unquoted)
+		{
+			for (const TCHAR BreakingChar : PropertyBreakingChars)
+			{
+				if (InC == BreakingChar)
+				{
+					return EParseState::StopBefore;
+				}
+			}
+
+			PropertyName.AppendChar(InC);
+		}
+		else
+		{
+			check(ParsedStringType == EParsedStringType::Quoted);
+
+			if (InC == OpeningQuoteChar && NumConsecutiveSlashes % 2 == 0)
+			{
+				return EParseState::StopAfter;
+			}
+
+			PropertyName.AppendChar(InC);
+
+			if (InC == '\\')
+			{
+				NumConsecutiveSlashes++;
+			}
+			else
+			{
+				NumConsecutiveSlashes = 0;
+			}
+		}
+
+		return EParseState::Continue;
+	});
+
+	if (ParsedStringType == EParsedStringType::Quoted)
+	{
+		PropertyName.ReplaceEscapedCharWithCharInline();
+	}
+
+	if (StringToken.IsSet())
+	{
+		if (bShouldBeEnum)
+		{
+			int32 DoubleColonIndex = PropertyName.Find("::");
+			if (DoubleColonIndex == INDEX_NONE)
+			{
+				return FExpressionError(FText::Format(LOCTEXT("PropertyContainsSingleColon", "EditCondition contains single colon in property name \"{0}\", expected double colons."), FText::FromString(PropertyName)));
+			}
+
+			if (DoubleColonIndex == 0)
+			{
+				return FExpressionError(FText::Format(LOCTEXT("PropertyDoubleColonAtStart", "EditCondition contained double colon at start of property name \"{0}\", expected enum type."), FText::FromString(PropertyName)));
+			}
+
+			FString EnumType = PropertyName.Left(DoubleColonIndex);
+			FString EnumValue = PropertyName.RightChop(DoubleColonIndex + 2);
+			
+			if (EnumValue.Len() == 0)
+			{
+				return FExpressionError(FText::Format(LOCTEXT("PropertyDoubleColonAtEnd", "EditCondition contained double colon at end of property name \"{0}\", expected enum value."), FText::FromString(PropertyName)));
+			}
+
+			Consumer.Add(StringToken.GetValue(), EditConditionParserTokens::FEnumToken(MoveTemp(EnumType), MoveTemp(EnumValue)));
+		}
+		else
+		{
+			Consumer.Add(StringToken.GetValue(), EditConditionParserTokens::FPropertyToken(MoveTemp(PropertyName)));
+		}
+	}
+
+	return TOptional<FExpressionError>();
+}
+
+template <typename ValueType>
+static void LogEditConditionError(const TValueOrError<ValueType, FExpressionError>& Error, const IEditConditionContext* Context = nullptr)
+{
+	if (!Error.HasError())
+	{
+		return;
+	}
+
+	const FString Message = Error.GetError().Text.ToString();
+	FString Formatted = Message;
+	if (Context != nullptr)
+	{
+		Formatted = FString::Printf(TEXT("%s - %s"), *Context->GetContextName().ToString(), *Message);
+	}
+
+	static TSet<FString> ErrorsAlreadyLogged;
+	if (!ErrorsAlreadyLogged.Find(Formatted))
+	{
+		ErrorsAlreadyLogged.Add(Formatted);
+		UE_LOG(LogEditCondition, Error, TEXT("%s"), *Formatted);
+	}
+}
+
+template <typename T>
+TOptional<T> GetValueInternal(const IEditConditionContext& Context, const FString& PropertyName)
+{
+	return TOptional<T>();
+}
+
+template<>
+TOptional<bool> GetValueInternal<bool>(const IEditConditionContext& Context, const FString& PropertyName)
+{
+	return Context.GetBoolValue(PropertyName);
+}
+
+template<>
+TOptional<double> GetValueInternal<double>(const IEditConditionContext& Context, const FString& PropertyName)
+{
+	return Context.GetNumericValue(PropertyName);
+}
+
+template <typename T>
+struct TOperand
+{
+	TOperand(T InValue) : Value(InValue), Property(nullptr), Context(nullptr) {}
+	TOperand(const EditConditionParserTokens::FPropertyToken& InProperty, const IEditConditionContext& InContext) : 
+		Property(&InProperty), Context(&InContext) {}
+
+	bool IsProperty() const { return Property != nullptr; }
+	TOptional<T> GetValue() const
+	{
+		if (IsProperty())
+		{
+			return GetValueInternal<T>(*Context, Property->PropertyName);	
+		}
+		
+		return TOptional<T>(Value);
+	}
+
+	const FString& GetName() const { check(IsProperty()); return Property->PropertyName; }
+
+private:
+	T Value;
+	const EditConditionParserTokens::FPropertyToken* Property;
+	const IEditConditionContext* Context;
+};
+
+static FExpressionResult ApplyNot(TOperand<bool> A)
+{
+	TOptional<bool> Value = A.GetValue();
+	if (Value.IsSet())
+	{
+		return MakeValue(!Value.GetValue());
+	}
+	return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(A.GetName())));
+}
+
+template <typename T, typename Function>
+FExpressionResult ApplyBinary(TOperand<T> A, TOperand<T> B, Function Apply)
+{
+	TOptional<T> ValueA = A.GetValue();
+	if (!ValueA.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(A.GetName())));
+	}
+
+	TOptional<T> ValueB = B.GetValue();
+	if (!ValueB.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(B.GetName())));
+	}
+
+	return MakeValue(Apply(ValueA.GetValue(), ValueB.GetValue()));
+}
+
+static FExpressionResult ApplyBitwiseAnd(const EditConditionParserTokens::FPropertyToken& Property, const EditConditionParserTokens::FEnumToken& Enum, const IEditConditionContext& Context)
+{
+	TOptional<int64> EnumValue = Context.GetIntegerValueOfEnum(Enum.Type, Enum.Value);
+	if (!EnumValue.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidEnumValue", "EditCondition attempted to use an invalid enum value \"{0}::{1}\"."), FText::FromString(Enum.Type), FText::FromString(Enum.Value)));
+	}
+
+	TOptional<int64> PropertyValue = Context.GetIntegerValue(Property.PropertyName);
+	if (!PropertyValue.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(Property.PropertyName)));
+	}
+
+	return MakeValue((PropertyValue.Get(0) & EnumValue.Get(0)) != 0);
+}
+
+static FExpressionResult ApplyPropertyIsNull(const EditConditionParserTokens::FPropertyToken& Property, const IEditConditionContext& Context, bool bNegate)
+{
+	TOptional<FString> TypeName = Context.GetTypeName(Property.PropertyName);
+	if (!TypeName.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(Property.PropertyName)));
+	}
+
+	TOptional<UObject*> Ptr = Context.GetPointerValue(Property.PropertyName);
+	if (!Ptr.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(Property.PropertyName)));
+	}
+
+	bool bIsNull = Ptr.GetValue() == nullptr;
+	if (bNegate)
+	{
+		bIsNull = !bIsNull;
+	}
+
+	return MakeValue(bIsNull);
+}
+
+static FExpressionResult ApplyPropertiesEqual(const EditConditionParserTokens::FPropertyToken& A, const EditConditionParserTokens::FPropertyToken& B, const IEditConditionContext& Context, bool bNegate)
+{
+	TOptional<UObject*> PtrA = Context.GetPointerValue(A.PropertyName);
+	TOptional<UObject*> PtrB = Context.GetPointerValue(B.PropertyName);
+	if (PtrA.IsSet() && PtrB.IsSet())
+	{
+		const bool bAreEqual = PtrA.GetValue() == PtrB.GetValue();
+		return MakeValue(bNegate ? !bAreEqual : bAreEqual);
+	}
+
+	TOptional<FString> TypeNameA = Context.GetTypeName(A.PropertyName);
+	TOptional<FString> TypeNameB = Context.GetTypeName(B.PropertyName);
+	if (!TypeNameA.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(A.PropertyName)));
+	}
+
+	if (!TypeNameB.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand", "EditCondition attempted to use an invalid operand \"{0}\"."), FText::FromString(B.PropertyName)));
+	}
+
+	if (TypeNameA.GetValue() != TypeNameB.GetValue())
+	{
+		return MakeError(FText::Format(LOCTEXT("OperandTypeMismatch", "EditCondition attempted to compare operands of different types: \"{0}\" and \"{1}\"."), FText::FromString(A.PropertyName), FText::FromString(B.PropertyName)));
+	}
+
+	TOptional<bool> bEqual;
+
+	TOptional<bool> BoolA = Context.GetBoolValue(A.PropertyName);
+	TOptional<bool> BoolB = Context.GetBoolValue(B.PropertyName);
+	if (BoolA.IsSet() && BoolB.IsSet())
+	{
+		bEqual = BoolA.GetValue() == BoolB.GetValue();
+	}
+
+	TOptional<double> DoubleA = Context.GetNumericValue(A.PropertyName);
+	TOptional<double> DoubleB = Context.GetNumericValue(B.PropertyName);
+	if (DoubleA.IsSet() && DoubleB.IsSet())
+	{
+		bEqual = DoubleA.GetValue() == DoubleB.GetValue();
+	}
+
+	TOptional<FString> EnumA = Context.GetEnumValue(A.PropertyName);
+	TOptional<FString> EnumB = Context.GetEnumValue(B.PropertyName);
+	if (EnumA.IsSet() && EnumB.IsSet())
+	{
+		bEqual = EnumA.GetValue() == EnumB.GetValue();
+	}
+
+	if (bEqual.IsSet())
+	{
+		return MakeValue(bNegate ? !bEqual.GetValue() : bEqual.GetValue());
+	}
+
+	return MakeError(FText::Format(LOCTEXT("OperandTypeMismatch", "EditCondition attempted to compare operands of different types: \"{0}\" and \"{1}\"."), FText::FromString(A.PropertyName), FText::FromString(B.PropertyName)));
+}
+
+static void CreateBooleanOperators(TOperatorJumpTable<IEditConditionContext>& OperatorJumpTable)
+{
+	using namespace EditConditionParserTokens;
+
+	OperatorJumpTable.MapPreUnary<FNot>([](bool A) { return !A; });
+	OperatorJumpTable.MapPreUnary<FNot>([](const FPropertyToken& A, const IEditConditionContext* Context)
+	{
+		return ApplyNot(TOperand<bool>(A, *Context));
+	});
+
+	// AND
+	{
+		auto ApplyAnd = [](bool First, bool Second) { return First && Second; };
+	
+		OperatorJumpTable.MapBinary<FAnd>(ApplyAnd);
+		OperatorJumpTable.MapBinary<FAnd>([ApplyAnd](const FPropertyToken& A, bool B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A, *Context), TOperand<bool>(B), ApplyAnd);
+		});
+		OperatorJumpTable.MapBinary<FAnd>([ApplyAnd](bool A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A), TOperand<bool>(B, *Context), ApplyAnd);
+		});
+		OperatorJumpTable.MapBinary<FAnd>([ApplyAnd](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A, *Context), TOperand<bool>(B, *Context), ApplyAnd);
+		});
+	}
+
+	// OR
+	{
+		auto ApplyOr = [](bool First, bool Second) { return First || Second; };
+
+		OperatorJumpTable.MapBinary<FOr>(ApplyOr);
+		OperatorJumpTable.MapBinary<FOr>([ApplyOr](const FPropertyToken& A, bool B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A, *Context), TOperand<bool>(B), ApplyOr);
+		});
+		OperatorJumpTable.MapBinary<FOr>([ApplyOr](bool A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A), TOperand<bool>(B, *Context), ApplyOr);
+		});
+		OperatorJumpTable.MapBinary<FOr>([ApplyOr](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A, *Context), TOperand<bool>(B, *Context), ApplyOr);
+		});
+	}
+
+	// EQUALS
+	{
+		auto ApplyEqual = [](bool First, bool Second) { return First == Second; };
+
+		OperatorJumpTable.MapBinary<FEqual>(ApplyEqual);
+		OperatorJumpTable.MapBinary<FEqual>([ApplyEqual](const FPropertyToken& A, bool B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A, *Context), TOperand<bool>(B), ApplyEqual);
+		});
+		OperatorJumpTable.MapBinary<FEqual>([ApplyEqual](bool A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A), TOperand<bool>(B, *Context), ApplyEqual);
+		});
+	}
+
+	// NOT-EQUALS
+	{
+		auto ApplyNotEqual = [](bool First, bool Second) { return First != Second; };
+
+		OperatorJumpTable.MapBinary<FNotEqual>(ApplyNotEqual);
+		OperatorJumpTable.MapBinary<FNotEqual>([ApplyNotEqual](const FPropertyToken& A, bool B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A, *Context), TOperand<bool>(B), ApplyNotEqual);
+		});
+		OperatorJumpTable.MapBinary<FNotEqual>([ApplyNotEqual](bool A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<bool>(A), TOperand<bool>(B, *Context), ApplyNotEqual);
+		});
+	}
+}
+
+template <typename T>
+void CreateNumberOperators(TOperatorJumpTable<IEditConditionContext>& OperatorJumpTable)
+{
+	using namespace EditConditionParserTokens;
+
+	// EQUAL
+	{
+		auto ApplyEqual = [](T First, T Second) { return First == Second; };
+
+		OperatorJumpTable.MapBinary<FEqual>(ApplyEqual);
+		OperatorJumpTable.MapBinary<FEqual>([ApplyEqual](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyEqual);
+		});
+		OperatorJumpTable.MapBinary<FEqual>([ApplyEqual](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyEqual);
+		});
+	}
+
+	// NOT-EQUAL
+	{
+		auto ApplyNotEqual = [](T First, T Second) { return First != Second; };
+
+		OperatorJumpTable.MapBinary<FNotEqual>(ApplyNotEqual);
+		OperatorJumpTable.MapBinary<FNotEqual>([ApplyNotEqual](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyNotEqual);
+		});
+		OperatorJumpTable.MapBinary<FNotEqual>([ApplyNotEqual](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyNotEqual);
+		});
+	}
+
+	// GREATER
+	{
+		auto ApplyGreater = [](T First, T Second) { return First > Second; };
+
+		OperatorJumpTable.MapBinary<FGreater>(ApplyGreater);
+		OperatorJumpTable.MapBinary<FGreater>([ApplyGreater](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyGreater);
+		});
+		OperatorJumpTable.MapBinary<FGreater>([ApplyGreater](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyGreater);
+		});
+		OperatorJumpTable.MapBinary<FGreater>([ApplyGreater](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplyGreater);
+		});
+	}
+
+	// GREATER-EQUAL
+	{
+		auto ApplyGreaterEqual = [](T First, T Second) { return First >= Second; };
+
+		OperatorJumpTable.MapBinary<FGreaterEqual>(ApplyGreaterEqual);
+		OperatorJumpTable.MapBinary<FGreaterEqual>([ApplyGreaterEqual](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyGreaterEqual);
+		});
+		OperatorJumpTable.MapBinary<FGreaterEqual>([ApplyGreaterEqual](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyGreaterEqual);
+		});
+		OperatorJumpTable.MapBinary<FGreaterEqual>([ApplyGreaterEqual](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplyGreaterEqual);
+		});
+	}
+
+	// LESS
+	{
+		auto ApplyLess = [](T First, T Second) { return First < Second; };
+
+		OperatorJumpTable.MapBinary<FLess>(ApplyLess);
+		OperatorJumpTable.MapBinary<FLess>([ApplyLess](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyLess);
+		});
+		OperatorJumpTable.MapBinary<FLess>([ApplyLess](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyLess);
+		});
+		OperatorJumpTable.MapBinary<FLess>([ApplyLess](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplyLess);
+		});
+	}
+
+	// LESS-EQUAL
+	{
+		auto ApplyLessEqual = [](T First, T Second) { return First <= Second; };
+
+		OperatorJumpTable.MapBinary<FLessEqual>(ApplyLessEqual);
+		OperatorJumpTable.MapBinary<FLessEqual>([ApplyLessEqual](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyLessEqual);
+		});
+		OperatorJumpTable.MapBinary<FLessEqual>([ApplyLessEqual](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyLessEqual);
+		});
+		OperatorJumpTable.MapBinary<FLessEqual>([ApplyLessEqual](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplyLessEqual);
+		});
+	}
+
+	// ADD
+	{
+		auto ApplyAdd = [](T First, T Second) { return First + Second; };
+
+		OperatorJumpTable.MapBinary<FAdd>(ApplyAdd);
+		OperatorJumpTable.MapBinary<FAdd>([ApplyAdd](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyAdd);
+		});
+		OperatorJumpTable.MapBinary<FAdd>([ApplyAdd](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyAdd);
+		});
+		OperatorJumpTable.MapBinary<FAdd>([ApplyAdd](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplyAdd);
+		});
+	}
+
+	// SUBTRACT
+	{
+		auto ApplySubtract = [](T First, T Second) { return First - Second; };
+
+		OperatorJumpTable.MapBinary<FSubtract>(ApplySubtract);
+		OperatorJumpTable.MapBinary<FSubtract>([ApplySubtract](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplySubtract);
+		});
+		OperatorJumpTable.MapBinary<FSubtract>([ApplySubtract](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplySubtract);
+		});
+		OperatorJumpTable.MapBinary<FSubtract>([ApplySubtract](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplySubtract);
+		});
+	}
+
+	// MULTIPLY
+	{
+		auto ApplyMultiply = [](T First, T Second) { return First * Second; };
+
+		OperatorJumpTable.MapBinary<FMultiply>(ApplyMultiply);
+		OperatorJumpTable.MapBinary<FMultiply>([ApplyMultiply](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyMultiply);
+		});
+		OperatorJumpTable.MapBinary<FMultiply>([ApplyMultiply](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyMultiply);
+		});
+		OperatorJumpTable.MapBinary<FMultiply>([ApplyMultiply](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplyMultiply);
+		});
+	}
+
+	// DIVIDE
+	{
+		auto ApplyDivide = [](T First, T Second) { return First / Second; };
+
+		OperatorJumpTable.MapBinary<FDivide>(ApplyDivide);
+		OperatorJumpTable.MapBinary<FDivide>([ApplyDivide](const FPropertyToken& A, T B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B), ApplyDivide);
+		});
+		OperatorJumpTable.MapBinary<FDivide>([ApplyDivide](T A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A), TOperand<T>(B, *Context), ApplyDivide);
+		});
+		OperatorJumpTable.MapBinary<FDivide>([ApplyDivide](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return ApplyBinary(TOperand<T>(A, *Context), TOperand<T>(B, *Context), ApplyDivide);
+		});
+	}
+}
+
+static FExpressionResult EnumPropertyEquals(const EditConditionParserTokens::FEnumToken& Enum, const EditConditionParserTokens::FPropertyToken& Property, const IEditConditionContext& Context, bool bNegate)
+{
+	TOptional<FString> TypeName = Context.GetTypeName(Property.PropertyName);
+	if (!TypeName.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand_Type", "EditCondition attempted to use an invalid operand \"{0}\" (type error)."), FText::FromString(Property.PropertyName)));
+	}
+
+	if (TypeName.GetValue() != Enum.Type)
+	{
+		return MakeError(FText::Format(LOCTEXT("OperandTypeMismatch", "EditCondition attempted to compare operands of different types: \"{0}\" and \"{1}\"."), FText::FromString(Property.PropertyName), FText::FromString(Enum.Type + TEXT("::") + Enum.Value)));
+	}
+
+	TOptional<FString> ValueProp = Context.GetEnumValue(Property.PropertyName);
+	if (!ValueProp.IsSet())
+	{
+		return MakeError(FText::Format(LOCTEXT("InvalidOperand_Value", "EditCondition attempted to use an invalid operand \"{0}\" (value error)."), FText::FromString(Property.PropertyName)));
+	}
+
+	bool bEqual = ValueProp.GetValue() == Enum.Value;
+	return MakeValue(bNegate ? !bEqual : bEqual);
+}
+
+static void CreateEnumOperators(TOperatorJumpTable<IEditConditionContext>& OperatorJumpTable)
+{
+	using namespace EditConditionParserTokens;
+
+	// EQUALS
+	{
+		OperatorJumpTable.MapBinary<FEqual>([](const FEnumToken& A, const FEnumToken& B, const IEditConditionContext* Context)
+		{
+			return A.Type == B.Type && A.Value == B.Value;
+		});
+		OperatorJumpTable.MapBinary<FEqual>([](const FPropertyToken& A, const FEnumToken& B, const IEditConditionContext* Context)
+		{
+			return EnumPropertyEquals(B, A, *Context, false);
+		});
+		OperatorJumpTable.MapBinary<FEqual>([](const FEnumToken& A, const FPropertyToken& B, const IEditConditionContext* Context)
+		{
+			return EnumPropertyEquals(A, B, *Context, false);
+		});
+	}
+
+	// NOT-EQUALS
+	{
+		OperatorJumpTable.MapBinary<FNotEqual>([](const FEnumToken& A, const FEnumToken& B, const IEditConditionContext* Context)
+		{
+			return A.Type != B.Type || A.Value != B.Value;
+		});
+		OperatorJumpTable.MapBinary<FNotEqual>([](const FPropertyToken& A, const FEnumToken& B, const IEditConditionContext* Context) -> FExpressionResult
+		{
+			return EnumPropertyEquals(B, A, *Context, true);
+		});
+		OperatorJumpTable.MapBinary<FNotEqual>([](const FEnumToken& A, const FPropertyToken& B, const IEditConditionContext* Context) -> FExpressionResult
+		{
+			return EnumPropertyEquals(A, B, *Context, true);
+		});
+	}
+}
+
+FEditConditionParser::FEditConditionParser()
+{
+	using namespace EditConditionParserTokens;
+
+	TokenDefinitions.IgnoreWhitespace();
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FEqual>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FNotEqual>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FLessEqual>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FLess>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FGreaterEqual>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FGreater>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FNot>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FAnd>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FOr>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FAdd>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FSubtract>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FMultiply>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FDivide>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FBitwiseAnd>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FSubExpressionStart>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeSymbol<FSubExpressionEnd>);
+	TokenDefinitions.DefineToken(&ExpressionParser::ConsumeNumber);
+	TokenDefinitions.DefineToken(&ConsumeNullPtr);
+	TokenDefinitions.DefineToken(&ConsumeBool);
+	TokenDefinitions.DefineToken(&ConsumePropertyName);
+				
+	ExpressionGrammar.DefineBinaryOperator<FAnd>(4);
+	ExpressionGrammar.DefineBinaryOperator<FOr>(4);
+	ExpressionGrammar.DefineBinaryOperator<FEqual>(3);
+	ExpressionGrammar.DefineBinaryOperator<FNotEqual>(3);
+	ExpressionGrammar.DefineBinaryOperator<FLess>(3);
+	ExpressionGrammar.DefineBinaryOperator<FLessEqual>(3);
+	ExpressionGrammar.DefineBinaryOperator<FGreater>(3);
+	ExpressionGrammar.DefineBinaryOperator<FGreaterEqual>(3);
+	ExpressionGrammar.DefineBinaryOperator<FBitwiseAnd>(2);
+	ExpressionGrammar.DefineBinaryOperator<FAdd>(2);
+	ExpressionGrammar.DefineBinaryOperator<FSubtract>(2);
+	ExpressionGrammar.DefineBinaryOperator<FMultiply>(1);
+	ExpressionGrammar.DefineBinaryOperator<FDivide>(1);
+	ExpressionGrammar.DefinePreUnaryOperator<FNot>();
+	ExpressionGrammar.DefineGrouping<FSubExpressionStart, FSubExpressionEnd>();
+
+	// POINTER EQUALITY
+	OperatorJumpTable.MapBinary<FEqual>([](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context) -> FExpressionResult
+	{
+		return ApplyPropertiesEqual(A, B, *Context, false);
+	});
+
+	OperatorJumpTable.MapBinary<FNotEqual>([](const FPropertyToken& A, const FPropertyToken& B, const IEditConditionContext* Context) -> FExpressionResult
+	{
+		return ApplyPropertiesEqual(A, B, *Context, true);
+	});
+
+	// POINTER NULL
+	OperatorJumpTable.MapBinary<FEqual>([](const FPropertyToken& A, const FNullPtrToken& B, const IEditConditionContext* Context) -> FExpressionResult
+	{
+		return ApplyPropertyIsNull(A, *Context, false);
+	});
+
+	OperatorJumpTable.MapBinary<FNotEqual>([](const FPropertyToken& A, const FNullPtrToken& B, const IEditConditionContext* Context) -> FExpressionResult
+	{
+		return ApplyPropertyIsNull(A, *Context, true);
+	});
+
+	// BITWISE AND
+	OperatorJumpTable.MapBinary<FBitwiseAnd>([](const FPropertyToken& A, const FEnumToken& B, const IEditConditionContext* Context) -> FExpressionResult
+	{
+		return ApplyBitwiseAnd(A, B, *Context);
+	});
+
+	CreateBooleanOperators(OperatorJumpTable);
+	CreateNumberOperators<double>(OperatorJumpTable);
+	CreateEnumOperators(OperatorJumpTable);
+}
+
+TValueOrError<bool, FText> FEditConditionParser::Evaluate(const FEditConditionExpression& Expression, const IEditConditionContext& Context) const
+{
+	using namespace EditConditionParserTokens;
+	
+	FExpressionResult Result = ExpressionParser::Evaluate(Expression.Tokens, OperatorJumpTable, &Context);
+	if (Result.HasValue())
+	{
+		const bool* BoolResult = Result.GetValue().Cast<bool>();
+		if (BoolResult != nullptr)
+		{
+			return MakeValue(*BoolResult);
+		}
+
+		const FPropertyToken* PropertyResult = Result.GetValue().Cast<FPropertyToken>();
+		if (PropertyResult != nullptr)
+		{
+			TOptional<bool> PropertyValue = Context.GetBoolValue(PropertyResult->PropertyName);
+			if (PropertyValue.IsSet())
+			{
+				return MakeValue(PropertyValue.GetValue());
+			}
+		}
+	}
+	else
+	{
+		LogEditConditionError(Result, &Context);
+	}
+
+	const FText ErrorText = Result.HasError() ? Result.StealError().Text : FText::GetEmpty();
+	return MakeError(ErrorText);
+}
+
+TSharedPtr<FEditConditionExpression> FEditConditionParser::Parse(const FString& ExpressionString) const
+{
+	using namespace ExpressionParser;
+
+	LexResultType LexResult = ExpressionParser::Lex(*ExpressionString, TokenDefinitions);
+	if (LexResult.IsValid())
+	{
+		CompileResultType CompileResult = ExpressionParser::Compile(LexResult.StealValue(), ExpressionGrammar);
+		if (CompileResult.IsValid())
+		{
+			return TSharedPtr<FEditConditionExpression>(new FEditConditionExpression(CompileResult.StealValue()));
+		}
+		else
+		{
+			LogEditConditionError(CompileResult);
+		}
+	}
+	else
+	{
+		LogEditConditionError(LexResult);
+	}
+
+	return TSharedPtr<FEditConditionExpression>();
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionParser.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionParser.h
new file mode 100644
index 0000000..7f3165c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/EditConditionParser.h
@@ -0,0 +1,138 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Array.h"
+#include "Containers/UnrealString.h"
+#include "CoreTypes.h"
+#include "Misc/ExpressionParserTypes.h"
+#include "Templates/SharedPointer.h"
+#include "Templates/UnrealTemplate.h"
+#include "Templates/ValueOrError.h"
+
+class FText;
+
+namespace soda
+{
+
+namespace EditConditionParserTokens
+{
+	struct FPropertyToken 
+	{
+		FPropertyToken(FString&& InProperty) :
+			PropertyName(InProperty) {}
+
+		FPropertyToken(const FPropertyToken& Other) :
+			PropertyName(Other.PropertyName) {}
+
+		FPropertyToken& operator=(const FPropertyToken& Other)
+		{
+			PropertyName = Other.PropertyName;
+			return *this;
+		}
+
+		FString PropertyName;
+	};
+
+	struct FEnumToken 
+	{
+		FEnumToken(FString&& InType, FString&& InValue) :
+			Type(InType), Value(InValue) {}
+
+		FEnumToken(const FEnumToken& Other) :
+			Type(Other.Type), Value(Other.Value) {}
+
+		FEnumToken& operator=(const FEnumToken& Other)
+		{
+			Type = Other.Type;
+			Value = Other.Value;
+			return *this;
+		}
+
+		FString Type;
+		FString Value;
+	};
+
+	struct FNullPtrToken
+	{
+		FNullPtrToken() = default;
+		FNullPtrToken(const FNullPtrToken&) = default;
+		FNullPtrToken& operator=(const FNullPtrToken&) = default;
+	};
+}
+
+} // namespace soda
+
+#define DEFINE_EDIT_CONDITION_NODE(TYPE, ...) \
+	namespace soda { namespace EditConditionParserTokens { struct TYPE { static const TCHAR* const Moniker; }; } } \
+	DEFINE_EXPRESSION_NODE_TYPE(soda::EditConditionParserTokens::TYPE, __VA_ARGS__)
+
+	DEFINE_EDIT_CONDITION_NODE(FEqual, 0x3AF0EE1B, 0xC3F847C7, 0xA2B95102, 0x4EFC202D)
+	DEFINE_EDIT_CONDITION_NODE(FNotEqual, 0x5CDF3FA4, 0x35614D88, 0x8F94017C, 0xF9229625)
+	DEFINE_EDIT_CONDITION_NODE(FLessEqual, 0x0D097F12, 0x2268447B, 0xA9C6769E, 0x5FE086EA)
+	DEFINE_EDIT_CONDITION_NODE(FLess, 0xD3B1D8E9, 0x552249C7, 0x92646CF8, 0x6D065F45)
+	DEFINE_EDIT_CONDITION_NODE(FGreaterEqual, 0x5BC680B9, 0x148448FB, 0xA37A0EBB, 0x34C4BCA8)
+	DEFINE_EDIT_CONDITION_NODE(FGreater, 0xBD99934C, 0x5E7F4BE9, 0x99A1BD6E, 0x582F8FC9)
+	DEFINE_EDIT_CONDITION_NODE(FNot, 0xE0FB4BB7, 0x66A646C2, 0xB2360362, 0x0E1FAE33)
+	DEFINE_EDIT_CONDITION_NODE(FAnd, 0x71F839BC, 0xD75F6B47, 0x9C68017B, 0x33FAB080)
+	DEFINE_EDIT_CONDITION_NODE(FOr, 0x9C317A4C, 0xCE50304D, 0x8BF6D471, 0x9D791746)
+	DEFINE_EDIT_CONDITION_NODE(FAdd, 0xF4086317, 0x80428041, 0x903149EB, 0xC5A60ACF)
+	DEFINE_EDIT_CONDITION_NODE(FSubtract, 0xE80D53E9, 0x32F1E145, 0x8535B767, 0x0634DE9E)
+	DEFINE_EDIT_CONDITION_NODE(FMultiply, 0x0D4D37DB, 0x53C7EA41, 0x8297C200, 0xF5B28D27)
+	DEFINE_EDIT_CONDITION_NODE(FDivide, 0x48009789, 0x2EE84F40, 0x83467A99, 0x92617168)
+	DEFINE_EDIT_CONDITION_NODE(FBitwiseAnd, 0xF5335505, 0xACB75044, 0xAA468084, 0x1042ADE8)
+	DEFINE_EDIT_CONDITION_NODE(FSubExpressionStart, 0x78CE8411, 0x34076241, 0xA2BD0548, 0x54458A3A)
+	DEFINE_EDIT_CONDITION_NODE(FSubExpressionEnd, 0x5CB25466, 0x780CAE4D, 0x8A88E000, 0xD3695885)
+
+	DEFINE_EXPRESSION_NODE_TYPE(soda::EditConditionParserTokens::FPropertyToken, 0x9A3FAF6F, 0xB2E45E4D, 0xA80A70C6, 0x47A89BD7)
+	DEFINE_EXPRESSION_NODE_TYPE(soda::EditConditionParserTokens::FEnumToken, 0xC9A35C24, 0x21FC904B, 0x9F1B2B6A, 0xDF6F4BC4)
+	DEFINE_EXPRESSION_NODE_TYPE(soda::EditConditionParserTokens::FNullPtrToken, 0xC3E91735, 0xB3B90C4D, 0x99BA3DCA, 0xC6CC6231)
+
+#undef DEFINE_EDIT_CONDITION_NODE
+
+namespace soda 
+{
+
+
+class IEditConditionContext;
+
+class FEditConditionExpression
+{
+public:
+	FEditConditionExpression(TArray<FCompiledToken>&& InTokens) :
+		Tokens(MoveTemp(InTokens))
+	{}
+
+	TArray<FCompiledToken> Tokens;
+};
+
+class FEditConditionParser
+{
+public:
+	FEditConditionParser();
+
+	FEditConditionParser(const FEditConditionParser&) = delete;
+	FEditConditionParser(FEditConditionParser&&) = default;
+	FEditConditionParser& operator=(const FEditConditionParser&) = delete;
+	FEditConditionParser& operator=(FEditConditionParser&&) = default;
+
+	/**
+	 * Parse the given string into an expression.
+	 * @returns The parsed expression if valid, invalid TSharedPtr if the string is not a valid expression string.
+	 */
+	TSharedPtr<FEditConditionExpression> Parse(const FString& ExpressionString) const;
+
+	/** 
+	 * Evaluate the given expression within the given context.
+	 * @returns The result of the evaluated expression if valid, invalid TOptional if the evaluation failed or produced a non-bool result.
+	 */
+	TValueOrError<bool, FText> Evaluate(const FEditConditionExpression& Expression, const IEditConditionContext& Context) const;
+
+private:
+	FTokenDefinitions TokenDefinitions;
+	FExpressionGrammar ExpressionGrammar;
+	TOperatorJumpTable<IEditConditionContext> OperatorJumpTable;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/IDetailsViewPrivate.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/IDetailsViewPrivate.h
new file mode 100644
index 0000000..1ad26d1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/IDetailsViewPrivate.h
@@ -0,0 +1,182 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+//#include "AssetThumbnail.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+
+class FNotifyHook;
+
+namespace soda
+{
+
+class FEditConditionParser;
+class IDetailPropertyExtensionHandler;
+class IDetailRootObjectCustomization;
+class IClassViewerFilter;
+
+class IDetailsViewPrivate : public IDetailsView
+{
+public:
+	/**
+	 * Sets the expansion state for a node and optionally all of its children
+	 *
+	 * @param InTreeNode		The node to change expansion state on
+	 * @param bIsItemExpanded	The new expansion state
+	 * @param bRecursive		Whether or not to apply the expansion change to any children
+	 */
+	virtual void SetNodeExpansionState(TSharedRef<FDetailTreeNode> InTreeNode, bool bIsItemExpanded, bool bRecursive) = 0;
+
+	/**
+	 * Requests that an item in the tree be expanded or collapsed
+	 *
+	 * @param TreeNode	The tree node to expand
+	 * @param bExpand	true if the item should be expanded, false otherwise
+	 */
+	virtual void RequestItemExpanded(TSharedRef<FDetailTreeNode> TreeNode, bool bExpand) = 0;
+
+	/**
+	 * Refreshes the detail's treeview
+	 */
+	virtual void RefreshTree() = 0;
+
+	/** Returns the notify hook to use when properties change */
+	virtual FNotifyHook* GetNotifyHook() const = 0;
+
+	/**
+	 * Returns the property utilities for this view
+	 */
+	virtual TSharedPtr<IPropertyUtilities> GetPropertyUtilities() = 0;
+
+	/** Causes the details view to be refreshed (new widgets generated) with the current set of objects */
+	virtual void ForceRefresh() = 0;
+
+	/** Causes the details view to move the scroll offset (by item)
+	 * @param DeltaOffset	We add this value to the current scroll offset if the result is in the scrolling range
+	 */
+	virtual void MoveScrollOffset(int32 DeltaOffset) = 0;
+
+	/**
+	 * Saves the expansion state of a tree node
+	 *
+	 * @param NodePath	The path to the detail node to save
+	 * @param bIsExpanded	true if the node is expanded, false otherwise
+	 */
+	virtual void SaveCustomExpansionState(const FString& NodePath, bool bIsExpanded) = 0;
+
+	/**
+	 * Gets the saved expansion state of a tree node in this category
+	 *
+	 * @param NodePath	The path to the detail node to get
+	 * @return true if the node should be expanded, false otherwise
+	 */
+	virtual bool GetCustomSavedExpansionState(const FString& NodePath) const = 0;
+
+	/**
+	 * @return True if the property is visible
+	 */
+	virtual bool IsPropertyVisible( const struct FPropertyAndParent& PropertyAndParent ) const = 0;
+
+	/**
+	 * @return True if the property is visible
+	 */
+	virtual bool IsPropertyReadOnly( const struct FPropertyAndParent& PropertyAndParent ) const = 0;
+
+	/**
+	 * @return Whether a custom row with the specified name and parent name is visible.
+	 */
+	virtual bool IsCustomRowVisible(FName InRowName, FName InParentName) const = 0;
+
+	/**
+	 * @return Whether a custom row with the specified name and parent name is read-only.
+	 */
+	virtual bool IsCustomRowReadOnly(FName InRowName, FName InParentName) const = 0;
+
+	/**
+	 * @return The thumbnail pool that should be used for thumbnails being rendered in this view
+	 */
+	//virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const = 0;
+
+	/**
+	 * @return The set of custom class viewer filters to use for class properties in this view
+	 */
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const = 0;
+
+	/**
+	 * Creates the color picker window for this property view.
+	 *
+	 * @param PropertyEditor				The slate property node to edit.
+	 * @param bUseAlpha			Whether or not alpha is supported
+	 */
+	virtual void CreateColorPickerWindow(const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha) = 0;
+
+	/**
+	 * Adds an action to execute next tick
+	 */
+	virtual void EnqueueDeferredAction(FSimpleDelegate& DeferredAction) = 0;
+
+	/**
+	 * Called when properties have finished changing (after PostEditChange is called)
+	 */
+	virtual void NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent) = 0;
+
+	/**
+	 * Reruns the current search filter applied to the details panel to account for any new changes                                                              
+	 */
+	virtual void RerunCurrentFilter() = 0;
+
+	/** If a customization standalone widget is used, the value should be update only once, when its window is closed */
+	virtual bool DontUpdateValueWhileEditing() const = 0;
+
+	/** @return Whether or not the details panel was created with multiple unrelated objects visible at once in the details panel */
+	virtual bool ContainsMultipleTopLevelObjects() const = 0;
+
+	/** @return the customization instance that defines how the display for a root object looks */
+	virtual TSharedPtr<class IDetailRootObjectCustomization> GetRootObjectCustomization() const = 0;
+
+	/** Runs the details customization update on a root property node */
+	virtual void UpdateSinglePropertyMap(TSharedPtr<FComplexPropertyNode> InRootPropertyNode, struct FDetailLayoutData& LayoutData, bool bIsExternal) = 0;
+
+	virtual const FCustomPropertyTypeLayoutMap& GetCustomPropertyTypeLayoutMap() const = 0;
+
+	/** Saves the expansion state of property nodes for the selected object set */
+	virtual void SaveExpandedItems(TSharedRef<FPropertyNode> StartNode) = 0;
+
+	/**
+	* Restores the expansion state of property nodes for the selected object set
+	*/
+	virtual void RestoreExpandedItems(TSharedRef<FPropertyNode> StartNode) = 0;
+
+	/** Mark node as animating, useful if animating during behaviors that trigger widget reconstruction */
+	virtual void MarkNodeAnimating(TSharedPtr<FPropertyNode> InNode, float InAnimationDuration) = 0;
+
+	/** Returns true if node is animating, currently we only keep track of the last animated node */
+	virtual bool IsNodeAnimating(TSharedPtr<FPropertyNode> InNode) = 0;
+
+	/** Column width accessibility */
+	virtual FDetailColumnSizeData& GetColumnSizeData() = 0;
+
+	/** Does this details view allow favoriting? */
+	virtual bool IsFavoritingEnabled() const = 0;
+
+	/** Is the given group a favorite? */
+	virtual bool IsGroupFavorite(FStringView GroupPath) const = 0;
+
+	/** Set the given group's favorite status. */
+	virtual void SetGroupFavorite(FStringView GroupPath, bool IsFavorite) = 0;
+
+	/** Is the given custom builder a favorite? */
+	virtual bool IsCustomBuilderFavorite(FStringView Path) const = 0;
+
+	/** Set the given group's favorite status. */
+	virtual void SetCustomBuilderFavorite(FStringView GroupPath, bool IsFavorite) = 0;
+
+	virtual bool ShouldHideRightColumn() const = 0;
+
+	virtual const FOnGenerateGlobalRowExtension& GetLocalRowExtensionDelegate() const = 0;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/IPropertyGenerationUtilities.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/IPropertyGenerationUtilities.h
new file mode 100644
index 0000000..90fb2e3
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/IPropertyGenerationUtilities.h
@@ -0,0 +1,21 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+namespace soda
+{
+/** Defines internal utilities for generating property layouts. */
+class IPropertyGenerationUtilities
+{
+public:
+	virtual ~IPropertyGenerationUtilities() { }
+
+	/** Gets the instance type customization map for the details implementation providing this utilities object. */
+	virtual const FCustomPropertyTypeLayoutMap& GetInstancedPropertyTypeLayoutMap() const = 0;
+
+	/** Rebuilds the details tree nodes for the details implementation providing this utilities object. */
+	virtual void RebuildTreeNodes() = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/IStructureDataProvider.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/IStructureDataProvider.h
new file mode 100644
index 0000000..3c6da9d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/IStructureDataProvider.h
@@ -0,0 +1,121 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Array.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/StructOnScope.h"
+
+namespace soda
+{
+
+//-----------------------------------------------------------------------------
+//	IStructureDataProvider - Used to provide struct data for a property node.
+//
+// The IsPropertyIndirection() and GetValueBaseAddress() allow a struct provider to expose data to be edited that
+// is not supported by the property system. When IsPropertyIndirection() returns true, GetValueBaseAddress() is called
+// relative to the parent property node to retrieve pointer to the data to be edited.
+// 
+// In the following example, a struct provider is added via ParentProperty property handle. In this case "ParentProperty"
+// is the parent property node, and the value passed into GetValueBaseAddress() of the provider is the value of the parent property.
+//
+//		TSharedPtr<IPropertyHandle> ParentProperty = ...; // E.g. handle to structure being customized
+//		...
+//		TSharedRef<FMyStructProvider> NewStructProvider = MakeShared<FMyStructProvider>(ParentProperty);
+//		TArray<TSharedPtr<IPropertyHandle>> ChildProperties = ParentProperty->AddChildStructure(NewStructProvider);
+// 
+// The GetValueBaseAddress() may get called on foreign objects too (e.g. object templates), and if property indirection is used
+// it should not rely on other values cached in the provider.
+// 
+//		class FMyStructProvider : public IStructureDataProvider
+//		{
+//		public:
+//			...
+//
+//			virtual bool IsPropertyIndirection() const override { return true; }
+//
+//			virtual uint8* GetValueBaseAddress(uint8* ParentValueAddress, const UStruct* ExpectedType) const override
+//			{
+//				if (ParentValueAddress)
+//				{
+//					// "ParentValueAddress" is pointer to a value of the type defined in "ParentProperty".
+//					FMyStruct& Value = *reinterpret_cast<FMyStruct*>(ParentValueAddress);
+//					// The return value should match the ExpectedType. The expected type should be the same as the GetBaseStructure() returned by this provider.
+//					return (Value.GetScriptStruct() == ExpectedType) ? Value.GetMemory() : nullptr;
+//				}
+//				return nullptr;
+//			}
+//		};
+// 
+// If IsPropertyIndirection() is false, there structures are expected to be standalone, and GetInstances() is used instead to retried the instance values.
+// When indirection is not used and the struct provider is part of an another instance, the provider should return only one instance, since there is no to associate the provided value
+// with an foreign object.
+// 
+// Multiple instances are supported when the provider is the root node (e.g. on Structure details view).
+// 
+//-----------------------------------------------------------------------------
+class IStructureDataProvider
+{
+public:
+	virtual ~IStructureDataProvider() {}
+
+	/** @return true if we have any data instances. */
+	virtual bool IsValid() const = 0;
+	
+	/** @return the most common struct of the instance data. This struct will be used to build the UI for the instances. */
+	virtual const UStruct* GetBaseStructure() const = 0;
+
+	/** @return instances to edit. Each provided struct should be compatible with base struct. */
+	virtual void GetInstances(TArray<TSharedPtr<FStructOnScope>>& OutInstances) const = 0;
+
+	/** @return true, if the provider supports handling indirections using GetValueBaseAddress(). */
+	virtual bool IsPropertyIndirection() const { return false; }
+
+	/**
+	 * Returns base address of provided struct based on parent property nodes value.
+	 * @param ParentValueAddress Value of the parent 
+	 * @param ExpectedType the type of struct that is expected to be returned (generally the same type as returned by GetBaseStructure())
+	 * @return value base address based on parent base address.
+	 */
+	virtual uint8* GetValueBaseAddress(uint8* ParentValueAddress, const UStruct* ExpectedType) const { return ParentValueAddress; }
+};
+
+
+//-----------------------------------------------------------------------------
+//	FStructOnScopeStructureDataProvider - Implementation of standalone struct that holds one value.
+//-----------------------------------------------------------------------------
+class FStructOnScopeStructureDataProvider : public IStructureDataProvider
+{
+public:
+	FStructOnScopeStructureDataProvider() = default;
+	FStructOnScopeStructureDataProvider(const TSharedPtr<FStructOnScope>& InStructData)
+		: StructData(InStructData)
+	{
+	}
+	
+	void SetStructData(const TSharedPtr<FStructOnScope>& InStructData)
+	{
+		StructData = InStructData;
+	}
+	
+	virtual bool IsValid() const override
+	{
+		return StructData.IsValid() && StructData->IsValid();
+	};
+	
+	virtual const UStruct* GetBaseStructure() const override
+	{
+		return StructData.IsValid() ? StructData->GetStruct() : nullptr;
+	}
+	
+	virtual void GetInstances(TArray<TSharedPtr<FStructOnScope>>& OutInstances) const override
+	{
+		OutInstances.Add(StructData);
+	}
+
+protected:
+	TSharedPtr<FStructOnScope> StructData;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/ItemPropertyNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ItemPropertyNode.cpp
new file mode 100644
index 0000000..c09091e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ItemPropertyNode.cpp
@@ -0,0 +1,685 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+//#include "Editor.h"
+//#include "EditorMetadataOverrides.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "PropertyPathHelpers.h"
+#include "Classes/SodaStyleSettings.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "ItemPropertyNode"
+
+namespace soda
+{
+
+FItemPropertyNode::FItemPropertyNode(void)
+	: FPropertyNode()
+{
+	bCanDisplayFavorite = false;
+}
+
+FItemPropertyNode::~FItemPropertyNode(void)
+{
+
+}
+
+uint8* FItemPropertyNode::GetValueBaseAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const
+{
+	const FProperty* MyProperty = GetProperty();
+	const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (MyProperty && ParentNode)
+	{
+		const FArrayProperty* OuterArrayProp = MyProperty->GetOwner<FArrayProperty>();
+		const FSetProperty* OuterSetProp = MyProperty->GetOwner<FSetProperty>();
+		const FMapProperty* OuterMapProp = MyProperty->GetOwner<FMapProperty>();
+
+		uint8* ValueBaseAddress = ParentNode->GetValueBaseAddress(StartAddress, bIsSparseData, bIsStruct);
+
+		if (OuterArrayProp != nullptr)
+		{
+			FScriptArrayHelper ArrayHelper(OuterArrayProp, ValueBaseAddress);
+			if (ValueBaseAddress != nullptr && ArrayHelper.IsValidIndex(ArrayIndex))
+			{
+				return ArrayHelper.GetRawPtr(ArrayIndex);
+			}
+		}
+		else if (OuterSetProp != nullptr)
+		{
+			FScriptSetHelper SetHelper(OuterSetProp, ValueBaseAddress);
+			if (ValueBaseAddress != nullptr)
+			{
+				int32 ActualIndex = SetHelper.FindInternalIndex(ArrayIndex);
+				if (ActualIndex != INDEX_NONE)
+				{
+					return SetHelper.GetElementPtr(ActualIndex);
+				}
+			}
+		}
+		else if (OuterMapProp != nullptr)
+		{
+			FScriptMapHelper MapHelper(OuterMapProp, ValueBaseAddress);
+			if (ValueBaseAddress != nullptr)
+			{
+				int32 ActualIndex = MapHelper.FindInternalIndex(ArrayIndex);
+				if (ActualIndex != INDEX_NONE)
+				{
+					uint8* PairPtr = MapHelper.GetPairPtr(ActualIndex);
+					return MyProperty->ContainerPtrToValuePtr<uint8>(PairPtr);
+				}
+			}
+		}
+		else
+		{
+			uint8* ValueAddress = ParentNode->GetValueAddress(StartAddress, bIsSparseData, bIsStruct);
+			if (ValueAddress != nullptr && ParentNode->GetProperty() != MyProperty)
+			{
+				// if this is not a fixed size array (in which the parent property and this property are the same), we need to offset from the property (otherwise, the parent already did that for us)
+				ValueAddress = MyProperty->ContainerPtrToValuePtr<uint8>(ValueAddress);
+			}
+
+			if (ValueAddress != nullptr)
+			{
+				ValueAddress += ArrayOffset;
+			}
+			return ValueAddress;
+		}
+	}
+
+	return nullptr;
+}
+
+uint8* FItemPropertyNode::GetValueAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const
+{
+	uint8* Result = GetValueBaseAddress(StartAddress, bIsSparseData, bIsStruct);
+	return Result;
+}
+
+/**
+ * Overridden function for special setup
+ */
+void FItemPropertyNode::InitExpansionFlags (void)
+{
+	FProperty* MyProperty = GetProperty();
+
+	bool bExpandableType = CastField<FStructProperty>(MyProperty) 
+		|| (CastField<FArrayProperty>(MyProperty) || CastField<FSetProperty>(MyProperty) || CastField<FMapProperty>(MyProperty));
+
+	if(	bExpandableType
+		|| HasNodeFlags(EPropertyNodeFlags::EditInlineNew)
+		|| HasNodeFlags(EPropertyNodeFlags::ShowInnerObjectProperties)
+		|| ( MyProperty->ArrayDim > 1 && ArrayIndex == -1 ) )
+	{
+		SetNodeFlags(EPropertyNodeFlags::CanBeExpanded, true);
+	}
+}
+/**
+ * Overridden function for Creating Child Nodes
+ */
+void FItemPropertyNode::InitChildNodes()
+{
+	//NOTE - this is only turned off as to not invalidate child object nodes.
+	FProperty* MyProperty = GetProperty();
+	FStructProperty* StructProperty = CastField<FStructProperty>(MyProperty);
+	FArrayProperty* ArrayProperty = CastField<FArrayProperty>(MyProperty);
+	FSetProperty* SetProperty = CastField<FSetProperty>(MyProperty);
+	FMapProperty* MapProperty = CastField<FMapProperty>(MyProperty);
+	FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(MyProperty);
+
+	const bool bShouldShowHiddenProperties = !!HasNodeFlags(EPropertyNodeFlags::ShouldShowHiddenProperties);
+	const bool bShouldShowDisableEditOnInstance = !!HasNodeFlags(EPropertyNodeFlags::ShouldShowDisableEditOnInstance);
+	const bool bGameModeOnlyVisible = !!HasNodeFlags(EPropertyNodeFlags::GameModeOnlyVisible);
+
+	if( MyProperty->ArrayDim > 1 && ArrayIndex == -1 )
+	{
+		// Do not add array children which are defined by an enum but the enum at the array index is hidden
+		// This only applies to static arrays
+		static const FName NAME_ArraySizeEnum("ArraySizeEnum");
+		UEnum* ArraySizeEnum = NULL; 
+		if (FRuntimeMetaData::HasMetaData(MyProperty, NAME_ArraySizeEnum))
+		{
+			ArraySizeEnum	= FindObject<UEnum>(NULL, *FRuntimeMetaData::GetMetaData(MyProperty, NAME_ArraySizeEnum));
+		}
+
+		// Expand array.
+		for( int32 Index = 0 ; Index < MyProperty->ArrayDim ; Index++ )
+		{
+			bool bShouldBeHidden = false;
+			if( ArraySizeEnum )
+			{
+				// The enum at this array index is hidden
+				bShouldBeHidden = FRuntimeMetaData::HasMetaData(ArraySizeEnum, TEXT("Hidden"), Index );
+			}
+
+			if( !bShouldBeHidden )
+			{
+				TSharedPtr<FItemPropertyNode> NewItemNode( new FItemPropertyNode);
+				FPropertyNodeInitParams InitParams;
+				InitParams.ParentNode = SharedThis(this);
+				InitParams.Property = MyProperty;
+				InitParams.ArrayOffset = Index*MyProperty->ElementSize;
+				InitParams.ArrayIndex = Index;
+				InitParams.bAllowChildren = true;
+				InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+				InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+				InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+				NewItemNode->InitNode( InitParams );
+				AddChildNode(NewItemNode);
+			}
+		}
+	}
+	else if( ArrayProperty )
+	{
+		void* Array = NULL;
+		FReadAddressList Addresses;
+		if ( GetReadAddress(!!HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), Addresses ) )
+		{
+			Array = Addresses.GetAddress(0);
+		}
+
+		if( Array )
+		{
+			FScriptArrayHelper ArrayHelper(ArrayProperty, Array);
+			for( int32 Index = 0 ; Index < ArrayHelper.Num(); Index++ )
+			{
+				TSharedPtr<FItemPropertyNode> NewItemNode( new FItemPropertyNode );
+
+				FPropertyNodeInitParams InitParams;
+				InitParams.ParentNode = SharedThis(this);
+				InitParams.Property = ArrayProperty->Inner;
+				InitParams.ArrayOffset = Index * ArrayProperty->Inner->ElementSize;
+				InitParams.ArrayIndex = Index;
+				InitParams.bAllowChildren = true;
+				InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+				InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+				InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+				NewItemNode->InitNode( InitParams );
+				AddChildNode(NewItemNode);
+			}
+		}
+	}
+	else if ( SetProperty )
+	{
+		void* Set = NULL;
+		FReadAddressList Addresses;
+		if (GetReadAddress(!!HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), Addresses))
+		{
+			Set = Addresses.GetAddress(0);
+		}
+
+		if (Set)
+		{
+			FScriptSetHelper SetHelper(SetProperty, Set);
+
+			for (int32 Index = 0; Index < SetHelper.Num(); ++Index)
+			{
+				TSharedPtr<FItemPropertyNode> NewItemNode(new FItemPropertyNode);
+
+				FPropertyNodeInitParams InitParams;
+				InitParams.ParentNode = SharedThis(this);
+				InitParams.Property = SetProperty->ElementProp;
+				InitParams.ArrayIndex = Index;
+				InitParams.bAllowChildren = true;
+				InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+				InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+				InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+				NewItemNode->InitNode(InitParams);
+				AddChildNode(NewItemNode);
+			}
+		}
+	}
+	else if ( MapProperty )
+	{
+		void* Map = NULL;
+		FReadAddressList Addresses;
+		if (GetReadAddress(!!HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), Addresses))
+		{
+			Map = Addresses.GetAddress(0);
+		}
+
+		if ( Map )
+		{
+			FScriptMapHelper MapHelper(MapProperty, Map);
+
+			for (int32 Index = 0; Index < MapHelper.Num(); ++Index)
+			{
+				// Construct the key node first
+				TSharedPtr<FPropertyNode> KeyNode(new FItemPropertyNode());
+					
+				FPropertyNodeInitParams InitParams;
+				InitParams.ParentNode = SharedThis(this);	// Key Node needs to point to this node to ensure its data is set correctly
+				InitParams.Property = MapHelper.KeyProp;
+				InitParams.ArrayIndex = Index;
+				InitParams.ArrayOffset = 0;
+				InitParams.bAllowChildren = true;
+				InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+				InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+				InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+				KeyNode->InitNode(InitParams);
+				// Not adding the key node as a child, otherwise it'll show up in the wrong spot.
+
+				// Then the value node
+				TSharedPtr<FPropertyNode> ValueNode(new FItemPropertyNode());
+					
+				// Reuse the init params
+				InitParams.ParentNode = SharedThis(this);
+				InitParams.Property = MapHelper.ValueProp;
+
+				ValueNode->InitNode(InitParams);
+				AddChildNode(ValueNode);
+
+				FPropertyNode::SetupKeyValueNodePair(KeyNode, ValueNode);
+			}
+		}
+	}
+	else if( StructProperty )
+	{
+		// Expand struct.
+		TArray<FProperty*> StructMembers;
+		for (TFieldIterator<FProperty> It(StructProperty->Struct); It; ++It)
+		{
+			FProperty* StructMember = *It;
+			
+			if (PropertyEditorHelpers::ShouldBeVisible(*this, StructMember))
+			{
+				StructMembers.Add(StructMember);
+			}
+		}
+
+		PropertyEditorHelpers::OrderPropertiesFromMetadata(StructMembers);
+
+		for (FProperty* StructMember : StructMembers)
+		{
+			TSharedPtr<FItemPropertyNode> NewItemNode( new FItemPropertyNode );
+		
+			FPropertyNodeInitParams InitParams;
+			InitParams.ParentNode = SharedThis(this);
+			InitParams.Property = StructMember;
+			InitParams.ArrayOffset = 0;
+			InitParams.ArrayIndex = INDEX_NONE;
+			InitParams.bAllowChildren = true;
+			InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+			InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+			InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+			NewItemNode->InitNode( InitParams );
+			AddChildNode(NewItemNode);
+
+			if ( FPropertySettings::Get().ExpandDistributions() == false)
+			{
+				// auto-expand distribution structs
+				if ( CastField<FObjectProperty>(StructMember) || CastField<FWeakObjectProperty>(StructMember) || CastField<FLazyObjectProperty>(StructMember) || CastField<FSoftObjectProperty>(StructMember) )
+				{
+					const FName StructName = StructProperty->Struct->GetFName();
+					if (StructName == NAME_RawDistributionFloat || StructName == NAME_RawDistributionVector)
+					{
+						NewItemNode->SetNodeFlags(EPropertyNodeFlags::Expanded, true);
+					}
+				}
+			}
+		}
+	}
+	else if( ObjectProperty )
+	{
+		uint8* ReadValue = NULL;
+
+		FReadAddressList ReadAddresses;
+		if( GetReadAddress(!!HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false ) )
+		{
+			// We've got some addresses, and we know they're all NULL or non-NULL.
+			// Have a peek at the first one, and only build an objects node if we've got addresses.
+			if( UObject* Obj = (ReadAddresses.Num() > 0) ? ObjectProperty->GetObjectPropertyValue(ReadAddresses.GetAddress(0)) : nullptr )
+			{
+				//verify it's not above in the hierarchy somewhere
+				FObjectPropertyNode* ParentObjectNode = FindObjectItemParent();
+				while (ParentObjectNode)
+				{
+					for ( TPropObjectIterator Itor( ParentObjectNode->ObjectIterator() ) ; Itor ; ++Itor )
+					{
+						if (*Itor == Obj)
+						{
+							SetNodeFlags(EPropertyNodeFlags::NoChildrenDueToCircularReference, true);
+							//stop the circular loop!!!
+							return;
+						}
+					}
+					FPropertyNode* UpwardTravesalNode = ParentObjectNode->GetParentNode();
+					ParentObjectNode = (UpwardTravesalNode==NULL) ? NULL : UpwardTravesalNode->FindObjectItemParent();
+				}
+
+			
+				TSharedPtr<FObjectPropertyNode> NewObjectNode( new FObjectPropertyNode );
+				for ( int32 AddressIndex = 0 ; AddressIndex < ReadAddresses.Num() ; ++AddressIndex )
+				{
+					NewObjectNode->AddObject( ObjectProperty->GetObjectPropertyValue(ReadAddresses.GetAddress(AddressIndex) ) );
+				}
+
+				FPropertyNodeInitParams InitParams;
+				InitParams.ParentNode = SharedThis(this);
+				InitParams.Property = MyProperty;
+				InitParams.ArrayOffset = 0;
+				InitParams.ArrayIndex = INDEX_NONE;
+				InitParams.bAllowChildren = true;
+				InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+				InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+				InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+				NewObjectNode->InitNode( InitParams );
+				AddChildNode(NewObjectNode);
+			}
+		}
+	}
+}
+
+void FItemPropertyNode::SetFavorite(bool IsFavorite)
+{
+	/*
+	if (GEditor == nullptr)
+	{
+		return;
+	}
+
+	UEditorMetadataOverrides* MetadataOverrides = GEditor->GetEditorSubsystem<UEditorMetadataOverrides>();
+	if (MetadataOverrides == nullptr)
+	{
+		return;
+	}
+
+	const FObjectPropertyNode* ObjectParent = FindObjectItemParent();
+	if (ObjectParent == nullptr)
+	{
+		return;
+	}
+				
+	FString Path;
+	GetQualifiedName(Path, true, ObjectParent, true);
+
+	static const FName FavoritePropertiesName("FavoriteProperties");
+
+	TArray<FString> FavoritePropertiesList;
+	if (MetadataOverrides->GetArrayMetadata(ObjectParent->GetObjectBaseClass(), FavoritePropertiesName, FavoritePropertiesList))
+	{
+		if (IsFavorite)
+		{
+			FavoritePropertiesList.AddUnique(Path);
+		}
+		else
+		{
+			FavoritePropertiesList.Remove(Path);
+		}
+
+		MetadataOverrides->SetArrayMetadata(ObjectParent->GetObjectBaseClass(), FavoritePropertiesName, FavoritePropertiesList);
+	}
+	else
+	{
+		if (IsFavorite)
+		{
+			FavoritePropertiesList.Add(Path);
+			MetadataOverrides->SetArrayMetadata(ObjectParent->GetObjectBaseClass(), FavoritePropertiesName, FavoritePropertiesList);
+		}
+	}
+	*/
+}
+
+bool FItemPropertyNode::IsFavorite() const
+{
+	/*
+	if (GEditor == nullptr)
+	{
+		return false;
+	}
+
+	UEditorMetadataOverrides* MetadataOverrides = GEditor->GetEditorSubsystem<UEditorMetadataOverrides>();
+	if (MetadataOverrides == nullptr)
+	{
+		return false;
+	}
+
+	const FObjectPropertyNode* ObjectParent = FindObjectItemParent();
+	if (ObjectParent == nullptr)
+	{
+		return false;
+	}
+
+	FString Path;
+	GetQualifiedName(Path, bWithArrayIndex=true, ObjectParent, bIgnoreCategories=true);
+
+	static const FName FavoritePropertiesName("FavoriteProperties");
+
+	TArray<FString> FavoritePropertiesList;
+	if (MetadataOverrides->GetArrayMetadata(ObjectParent->GetObjectBaseClass(), FavoritePropertiesName, FavoritePropertiesList))
+	{
+		return FavoritePropertiesList.Contains(Path);
+	}
+	*/
+	return false;
+}
+
+void FItemPropertyNode::SetDisplayNameOverride( const FText& InDisplayNameOverride )
+{
+	DisplayNameOverride = InDisplayNameOverride;
+}
+
+FText FItemPropertyNode::GetDisplayName() const
+{
+	FText FinalDisplayName;
+
+	if( !DisplayNameOverride.IsEmpty() )
+	{
+		FinalDisplayName = DisplayNameOverride;
+	}
+	else 
+	{
+		const FProperty* PropertyPtr = GetProperty();
+		if( GetArrayIndex()==-1 && PropertyPtr != NULL  )
+		{
+			// This item is not a member of an array, get a traditional display name
+			if ( FPropertySettings::Get().ShowFriendlyPropertyNames() )
+			{
+				//We are in "readable display name mode"../ Make a nice name
+				FinalDisplayName = FRuntimeMetaData::GetDisplayNameText(PropertyPtr);
+				if ( FinalDisplayName.IsEmpty() )
+				{
+					FString PropertyDisplayName;
+					bool bIsBoolProperty = CastField<const FBoolProperty>(PropertyPtr) != NULL;
+					const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+					const FStructProperty* ParentStructProperty = CastField<const FStructProperty>(ParentNode->GetProperty());
+					if( ParentStructProperty && ParentStructProperty->Struct->GetFName() == NAME_Rotator )
+					{
+						if( Property->GetFName() == "Roll" )
+						{
+							PropertyDisplayName = TEXT("X");
+						}
+						else if( Property->GetFName() == "Pitch" )
+						{
+							PropertyDisplayName = TEXT("Y");
+						}
+						else if( Property->GetFName() == "Yaw" )
+						{
+							PropertyDisplayName = TEXT("Z");
+						}
+						else
+						{
+							check(0);
+						}
+					}
+					else
+					{
+						PropertyDisplayName = Property->GetName();
+					}
+					if( GetDefault<USodaStyleSettings>()->bShowFriendlyNames )
+					{
+						PropertyDisplayName = FName::NameToDisplayString( PropertyDisplayName, bIsBoolProperty );
+					}
+
+					FinalDisplayName = FText::FromString( PropertyDisplayName );
+				}
+			}
+			else
+			{
+				FinalDisplayName =  FText::FromString( PropertyPtr->GetName() );
+			}
+		}
+		else if (const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin())
+		{
+			// Get the ArraySizeEnum class from meta data.
+			static const FName NAME_ArraySizeEnum("ArraySizeEnum");
+			UEnum* ArraySizeEnum = NULL; 
+			if (PropertyPtr && FRuntimeMetaData::HasMetaData(PropertyPtr, NAME_ArraySizeEnum))
+			{
+				ArraySizeEnum	= FindObject<UEnum>(NULL, *FRuntimeMetaData::GetMetaData(&(*Property), NAME_ArraySizeEnum));
+			}
+			
+			// Sets and maps do not have a display index.
+			FProperty* ParentProperty = ParentNode->GetProperty();
+
+			// Also handle UArray's having the ArraySizeEnum entry...
+			if (ArraySizeEnum == nullptr && CastField<FArrayProperty>(ParentProperty) != nullptr && FRuntimeMetaData::HasMetaData(ParentProperty, NAME_ArraySizeEnum))
+			{
+				ArraySizeEnum = FindObject<UEnum>(NULL, *FRuntimeMetaData::GetMetaData(ParentProperty, NAME_ArraySizeEnum));
+			}
+
+			if (CastField<FSetProperty>(ParentProperty) == nullptr &&  CastField<FMapProperty>(ParentProperty) == nullptr)
+			{
+				if (PropertyPtr != nullptr)
+				{
+					// Check if this property has Title Property Meta
+					static const FName NAME_TitleProperty = FName(TEXT("TitleProperty"));
+					FString TitleProperty = FRuntimeMetaData::GetMetaData(PropertyPtr, NAME_TitleProperty);
+					if (!TitleProperty.IsEmpty())
+					{
+						FItemPropertyNode* NonConstThis = const_cast<FItemPropertyNode*>(this);
+
+						FReadAddressListData ReadAddress;
+						GetReadAddressUncached(*NonConstThis, ReadAddress);
+
+						const UStruct* PropertyStruct = nullptr;
+
+						if (const FObjectProperty* ObjectProperty = CastField<FObjectProperty>(PropertyPtr))
+						{
+							// We do this so we get the classes *exact* value and not just the base from PropertyClass
+							uint8* FoundAddress = ReadAddress.GetAddress(0);
+							UObject* ObjectValue = FoundAddress != nullptr ? ObjectProperty->GetObjectPropertyValue(FoundAddress) : nullptr;
+
+							if (ObjectValue != nullptr)
+							{
+								PropertyStruct = ObjectValue->GetClass();
+							}
+						}
+
+						// Find the property and get the right property handle
+						if (PropertyStruct != nullptr)
+						{
+							const TSharedPtr<IPropertyHandle> ThisAsHandle = PropertyEditorHelpers::GetPropertyHandle(NonConstThis->AsShared(), nullptr, nullptr);
+							TSharedPtr<FTitleMetadataFormatter> TitleFormatter = FTitleMetadataFormatter::TryParse(ThisAsHandle, TitleProperty);
+							if (TitleFormatter)
+							{
+								TitleFormatter->GetDisplayText(FinalDisplayName);
+							}
+						}
+					}
+				}
+
+				if(FinalDisplayName.IsEmpty())
+				{
+					// This item is a member of an array, its display name is its index 
+					if (PropertyPtr == NULL || ArraySizeEnum == NULL)
+					{
+						if (ArraySizeEnum == nullptr)
+						{
+							FinalDisplayName = FText::AsNumber(GetArrayIndex());
+						}
+						else
+						{
+							FinalDisplayName = ArraySizeEnum->GetDisplayNameTextByIndex(GetArrayIndex());
+						}
+					}
+					else
+					{
+						FinalDisplayName = ArraySizeEnum->GetDisplayNameTextByIndex(GetArrayIndex());
+					}
+				}
+			}
+			// Maps should have display names that reflect the key and value types
+			else if (PropertyPtr != nullptr && CastField<FMapProperty>(ParentNode->GetProperty()) != nullptr)
+			{
+				FText FormatText = GetPropertyKeyNode().IsValid()
+					? LOCTEXT("MapValueDisplayFormat", "Value ({0})")
+					: LOCTEXT("MapKeyDisplayFormat", "Key ({0})");
+
+				FString TypeName;
+
+				if (const FStructProperty* StructProp = CastField<FStructProperty>(PropertyPtr))
+				{
+					// For struct props, use the name of the struct itself
+					TypeName = StructProp->Struct->GetName();
+				}
+				else if (const FEnumProperty* EnumProp = CastField<FEnumProperty>(PropertyPtr))
+				{
+					// For enum props, use the name of the enum
+					if (EnumProp->GetEnum() != nullptr)
+					{
+						TypeName = EnumProp->GetEnum()->GetName();
+					}
+					else
+					{
+						TypeName = TEXT("Enum");
+					}
+				}
+				else if(PropertyPtr->IsA<FStrProperty>())
+				{
+					// For strings, actually return "String" and not "Str"
+					TypeName = TEXT("String");
+				}
+				else
+				{
+					// For any other property, get the type from the property class
+					TypeName = PropertyPtr->GetClass()->GetName();
+
+					int32 EndIndex = TypeName.Find(TEXT("Property"), ESearchCase::IgnoreCase, ESearchDir::FromEnd);
+
+					if (EndIndex != -1)
+					{
+						TypeName.MidInline(0, EndIndex, false);
+					}
+				}
+
+				if (FPropertySettings::Get().ShowFriendlyPropertyNames())
+				{
+					TypeName = FName::NameToDisplayString(TypeName, false);
+				}
+
+				FinalDisplayName = FText::Format(FormatText, FText::FromString(TypeName));
+			}
+		}
+	}
+	
+	return FinalDisplayName;
+}
+
+void FItemPropertyNode::SetToolTipOverride( const FText& InToolTipOverride )
+{
+	ToolTipOverride = InToolTipOverride;
+}
+
+FText FItemPropertyNode::GetToolTipText() const
+{
+	if(!ToolTipOverride.IsEmpty())
+	{
+		return ToolTipOverride;
+	}
+
+	return PropertyEditorHelpers::GetToolTipText(GetProperty());
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/ItemPropertyNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ItemPropertyNode.h
new file mode 100644
index 0000000..228e328
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ItemPropertyNode.h
@@ -0,0 +1,79 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+
+namespace soda
+{
+
+class FItemPropertyNode : public FPropertyNode
+{
+public:
+
+	FItemPropertyNode();
+	virtual ~FItemPropertyNode();
+
+	virtual uint8* GetValueBaseAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const override;
+	virtual uint8* GetValueAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const override;
+
+	/**
+	 * Overridden function to get the derived object node
+	 */
+	virtual FItemPropertyNode* AsItemPropertyNode() override { return this; }
+	virtual const FItemPropertyNode* AsItemPropertyNode() const override { return this; }
+
+	/** Display name override to use instead of the property name */
+	void SetDisplayNameOverride( const FText& InDisplayNameOverride ) override;
+
+	/**
+	* @return true if the property is mark as a favorite
+	*/
+	virtual void SetFavorite(bool FavoriteValue) override;
+
+	/**
+	* @return true if the property is mark as a favorite
+	*/
+	virtual bool IsFavorite() const override;
+
+	/**
+	 * @return The formatted display name for the property in this node                                                              
+	 */
+	virtual FText GetDisplayName() const override;
+
+	/**
+	 * Sets the tooltip override to use instead of the property tooltip
+	 */
+	virtual void SetToolTipOverride( const FText& InToolTipOverride ) override;
+
+	/**
+	 * @return The tooltip for the property in this node                                                              
+	 */
+	virtual FText GetToolTipText() const override;
+
+protected:
+	/**
+	 * Overridden function for special setup
+	 */
+	virtual void InitExpansionFlags() override;
+
+	/**
+	 * Overridden function for Creating Child Nodes
+	 */
+	virtual void InitChildNodes() override;
+
+private:
+	/** Display name override to use instead of the property name */
+	FText DisplayNameOverride;
+	/** Tooltip override to use instead of the property tooltip */
+	FText ToolTipOverride;
+
+	/**
+	* Option to know if we can display the favorite icon in the property editor
+	*/
+	bool bCanDisplayFavorite;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/ObjectPropertyNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ObjectPropertyNode.cpp
new file mode 100644
index 0000000..d5c2cf0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ObjectPropertyNode.cpp
@@ -0,0 +1,848 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "ObjectPropertyNode.h"
+#include "Misc/ConfigCacheIni.h"
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+//#include "ObjectEditorUtils.h"
+//#include "EditorCategoryUtils.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimeEditorUtils.h"
+
+//#if WITH_EDITORONLY_DATA
+//#include "Engine/Blueprint.h"
+//#endif
+
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+
+FObjectPropertyNode::FObjectPropertyNode(void)
+	: FComplexPropertyNode()
+	, BaseClass(NULL)
+{
+}
+
+FObjectPropertyNode::~FObjectPropertyNode(void)
+{
+}
+
+UObject* FObjectPropertyNode::GetUObject(int32 InIndex)
+{
+	check(Objects.IsValidIndex(InIndex));
+	return Objects[InIndex].Get();
+}
+
+const UObject* FObjectPropertyNode::GetUObject(int32 InIndex) const
+{
+	check(Objects.IsValidIndex(InIndex));
+	return Objects[InIndex].Get();
+}
+
+UPackage* FObjectPropertyNode::GetUPackage(int32 InIndex)
+{
+	UObject* Obj = GetUObject(InIndex);
+	if (Obj)
+	{
+		TWeakObjectPtr<UPackage>* Package = ObjectToPackageMapping.Find(Obj);
+		return Package ? Package->Get() : Obj->GetOutermost();
+	}
+	return nullptr;
+}
+
+const UPackage* FObjectPropertyNode::GetUPackage(int32 InIndex) const
+{
+	return const_cast<FObjectPropertyNode*>(this)->GetUPackage(InIndex);
+}
+
+// Adds a new object to the list.
+void FObjectPropertyNode::AddObject( UObject* InObject )
+{
+	Objects.Add( InObject );
+}
+
+// Adds new objects to the list.
+void FObjectPropertyNode::AddObjects(const TArray<UObject*>& InObjects)
+{
+	Objects.Append( InObjects );
+}
+
+// Removes an object from the list.
+void FObjectPropertyNode::RemoveObject( UObject* InObject )
+{
+	const int32 idx = Objects.Find( InObject );
+
+	if( idx != INDEX_NONE )
+	{
+		Objects.RemoveAt( idx, 1 );
+	}
+}
+
+// Removes all objects from the list.
+void FObjectPropertyNode::RemoveAllObjects()
+{
+	Objects.Empty();
+}
+
+void FObjectPropertyNode::SetObjectPackageOverrides(const TMap<TWeakObjectPtr<UObject>, TWeakObjectPtr<UPackage>>& InMapping)
+{
+	ObjectToPackageMapping = InMapping;
+}
+
+void FObjectPropertyNode::ClearObjectPackageOverrides()
+{
+	ObjectToPackageMapping.Empty();
+}
+
+// Purges any objects marked pending kill from the object list
+void FObjectPropertyNode::PurgeKilledObjects()
+{
+	// Purge any objects that are marked pending kill from the object list
+	for (int32 Index = 0; Index < Objects.Num(); )
+	{
+		TWeakObjectPtr<UObject> Object = Objects[Index];
+
+		if ( !Object.IsValid() )
+		{
+			Objects.RemoveAt(Index, 1);
+		}
+		else
+		{
+			++Index;
+		}
+	}
+}
+
+// Called when the object list is finalized, Finalize() finishes the property window setup.
+void FObjectPropertyNode::Finalize()
+{
+	// May be NULL...
+	UClass* OldBase = GetObjectBaseClass();
+
+	// Find an appropriate base class.
+	SetBestBaseClass();
+	if (BaseClass.IsValid() && BaseClass->HasAnyClassFlags(CLASS_CollapseCategories) )
+	{
+		SetNodeFlags(EPropertyNodeFlags::ShowCategories, false );
+	}
+}
+
+TArray<UStruct*> FObjectPropertyNode::GetAllStructures()
+{
+	TArray<UStruct*> RetVal;
+	RetVal.Reserve(SparseClassDataInstances.Num() + 1);
+	if (UStruct* BaseStruct = GetBaseStructure())
+	{
+		RetVal.Add(BaseStruct);
+	}
+
+	for (const auto& ClassSparseDataPair : SparseClassDataInstances)
+	{
+		const TTuple<UScriptStruct*, void*>& SparseInstance = ClassSparseDataPair.Value;
+		RetVal.AddUnique(SparseInstance.Key);
+	}
+
+	return RetVal;
+}
+
+TArray<const UStruct*> FObjectPropertyNode::GetAllStructures() const
+{
+	TArray<const UStruct*> RetVal;
+	RetVal.Reserve(SparseClassDataInstances.Num() + 1);
+	if (const UStruct* BaseStruct = GetBaseStructure())
+	{
+		RetVal.Add(BaseStruct);
+	}
+
+	for (const auto& ClassSparseDataPair : SparseClassDataInstances)
+	{
+		const TTuple<UScriptStruct*, void*>& SparseInstance = ClassSparseDataPair.Value;
+		RetVal.AddUnique(SparseInstance.Key);
+	}
+	return RetVal;
+}
+
+// Intended for a function that gets the number of elements in a container
+DECLARE_DELEGATE_RetVal_OneParam(int32, FGetNumDelegate, const void*);
+
+bool FObjectPropertyNode::GetReadAddressUncached(const FPropertyNode& InNode,
+											   bool InRequiresSingleSelection,
+											   FReadAddressListData* OutAddresses,
+											   bool bComparePropertyContents,
+											   bool bObjectForceCompare,
+											   bool bArrayPropertiesCanDifferInSize) const
+{
+	// Are any objects selected for property editing?
+	if( !GetNumObjects())
+	{
+		return false;
+	}
+
+	const FProperty* InItemProperty = InNode.GetProperty();
+	// Is there a InItemProperty bound to the InItemProperty window?
+	if( !InItemProperty )
+	{
+		return false;
+	}
+
+	UStruct* OwnerStruct = InItemProperty->GetOwnerStruct();
+	if (!OwnerStruct || OwnerStruct->IsStructTrashed())
+	{
+		// Verify that the property is not part of an invalid trash class
+		return false;
+	}
+
+	// Requesting a single selection?
+	if( InRequiresSingleSelection && GetNumObjects() > 1)
+	{
+		// Fail: we're editing properties for multiple objects.
+		return false;
+	}
+
+	//assume all properties are the same unless proven otherwise
+	bool bAllTheSame = true;
+
+	//////////////////////////////////////////
+
+	// If this item is the child of a container, return NULL if there is a different number
+	// of items in the container in different objects, when multi-selecting.
+
+	FArrayProperty* ArrayOuter = InItemProperty->GetOwner<FArrayProperty>();
+	FSetProperty* SetOuter = InItemProperty->GetOwner<FSetProperty>();
+	FMapProperty* MapOuter = InItemProperty->GetOwner<FMapProperty>();
+
+	if( ArrayOuter || SetOuter || MapOuter)
+	{
+		const FPropertyNode* ParentPropertyNode = InNode.GetParentNode();
+		check(ParentPropertyNode);
+		const UObject* TempObject = GetUObject(0);
+		if( TempObject )
+		{
+			uint8* BaseAddr = ParentPropertyNode->GetValueBaseAddressFromObject(TempObject);
+			if( BaseAddr )
+			{
+				if ( ArrayOuter )
+				{
+					FScriptArrayHelper ArrayHelper(ArrayOuter, BaseAddr);
+					const int32 Num = ArrayHelper.Num();
+					for (int32 ObjIndex = 1; ObjIndex < GetNumObjects(); ++ObjIndex)
+					{
+						TempObject = GetUObject(ObjIndex);
+						BaseAddr = ParentPropertyNode->GetValueBaseAddressFromObject(TempObject);
+
+						ArrayHelper = FScriptArrayHelper(ArrayOuter, BaseAddr);
+						if (BaseAddr && Num != ArrayHelper.Num())
+						{
+							bAllTheSame = false;
+						}
+					}
+				}
+				else if ( SetOuter )
+				{
+					const int32 Num = FScriptSetHelper::Num(BaseAddr);
+					for (int32 ObjIndex = 1; ObjIndex < GetNumObjects(); ++ObjIndex)
+					{
+						TempObject = GetUObject(ObjIndex);
+						BaseAddr = ParentPropertyNode->GetValueBaseAddressFromObject(TempObject);
+
+						if (BaseAddr && Num != FScriptSetHelper::Num(BaseAddr))
+						{
+							bAllTheSame = false;
+						}
+					}
+				}
+				else if ( MapOuter )
+				{
+					FScriptMapHelper MapHelper(MapOuter, BaseAddr);
+					const int32 Num = MapHelper.Num();
+					for (int32 ObjIndex = 1; ObjIndex < GetNumObjects(); ++ObjIndex)
+					{
+						TempObject = GetUObject(ObjIndex);
+						BaseAddr = ParentPropertyNode->GetValueBaseAddressFromObject(TempObject);
+
+						if (BaseAddr)
+						{
+							MapHelper = FScriptMapHelper(MapOuter, BaseAddr);
+							if (Num != MapHelper.Num())
+							{
+								bAllTheSame = false;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	uint8* BaseAddr = InNode.GetValueBaseAddressFromObject(GetUObject(0));
+	if (BaseAddr)
+	{
+		// If the item is an array or set itself, return NULL if there are a different number of
+		// items in the container in different objects, when multi-selecting.
+
+		const FArrayProperty* ArrayProp = CastField<FArrayProperty>(InItemProperty);
+		const FSetProperty* SetProp = CastField<FSetProperty>(InItemProperty);
+		const FMapProperty* MapProp = CastField<FMapProperty>(InItemProperty);
+
+		if (ArrayProp || SetProp || MapProp)
+		{
+			// This flag is an override for array properties which want to display e.g. the "Clear" and "Empty"
+			// buttons, even though the array properties may differ in the number of elements.
+			if (!bArrayPropertiesCanDifferInSize)
+			{
+				const UObject* TempObject = GetUObject(0);
+
+				if (ArrayProp)
+				{
+					FScriptArrayHelper ArrayHelper(ArrayProp, BaseAddr);
+					int32 const Num = ArrayHelper.Num();
+					for (int32 ObjIndex = 1; ObjIndex < GetNumObjects(); ObjIndex++)
+					{
+						TempObject = GetUObject(ObjIndex);
+						if (TempObject)
+						{
+							ArrayHelper = FScriptArrayHelper(ArrayProp, InNode.GetValueBaseAddressFromObject(TempObject));
+							if (Num != ArrayHelper.Num())
+							{
+								bAllTheSame = false;
+							}
+						}
+					}
+				}
+				else if (SetProp)
+				{
+					int32 const Num = FScriptSetHelper::Num(BaseAddr);
+					for (int32 ObjIndex = 1; ObjIndex < GetNumObjects(); ++ObjIndex)
+					{
+						TempObject = GetUObject(ObjIndex);
+						if (TempObject && Num != FScriptSetHelper::Num(InNode.GetValueBaseAddressFromObject(TempObject)))
+						{
+							bAllTheSame = false;
+						}
+					}
+				}
+				else if (MapProp)
+				{
+					FScriptMapHelper MapHelper(MapProp, BaseAddr);
+					int32 const Num = MapHelper.Num();
+					for (int32 ObjIndex = 1; ObjIndex < GetNumObjects(); ++ObjIndex)
+					{
+						TempObject = GetUObject(ObjIndex);
+						if (TempObject)
+						{
+							MapHelper = FScriptMapHelper(MapProp, InNode.GetValueBaseAddressFromObject(TempObject));
+							if (Num != MapHelper.Num())
+							{
+								bAllTheSame = false;
+							}
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			if ( bComparePropertyContents || !CastField<FObjectPropertyBase>(InItemProperty) || bObjectForceCompare )
+			{
+				// Make sure the value of this InItemProperty is the same in all selected objects.
+				for( int32 ObjIndex = 1 ; ObjIndex < GetNumObjects() ; ObjIndex++ )
+				{
+					if (!InItemProperty->Identical(BaseAddr, InNode.GetValueBaseAddressFromObject(GetUObject(ObjIndex))))
+					{
+						bAllTheSame = false;
+						break;
+					}
+				}
+			}
+			else
+			{
+				if (CastField<FObjectPropertyBase>(InItemProperty))
+				{
+					// We don't want to exactly compare component properties.  However, we
+					// need to be sure that all references are either valid or invalid.
+
+					// If BaseObj is NON-NULL, all other objects' properties should also be non-NULL.
+					// If BaseObj is NULL, all other objects' properties should also be NULL.
+					UObject* BaseObj = CastField<FObjectPropertyBase>(InItemProperty)->GetObjectPropertyValue(BaseAddr);
+
+					for (int32 ObjIndex = 1; ObjIndex < GetNumObjects(); ObjIndex++)
+					{
+						UObject* CurObj = CastField<FObjectPropertyBase>(InItemProperty)->GetObjectPropertyValue(InNode.GetValueBaseAddressFromObject(GetUObject(ObjIndex)));
+						if (   ( !BaseObj && CurObj )			// BaseObj is NULL, but this InItemProperty is non-NULL!
+							|| ( BaseObj && !CurObj ) )			// BaseObj is non-NULL, but this InItemProperty is NULL!
+						{
+							bAllTheSame = false;
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+
+		// Write addresses to the output.
+	if (OutAddresses != nullptr)
+		{
+		for (int32 ObjIndex = 0; ObjIndex < GetNumObjects(); ++ObjIndex)
+		{	
+			const UObject* TempObject = GetUObject(ObjIndex);
+			if (TempObject)
+			{
+				OutAddresses->Add(TempObject, InNode.GetValueBaseAddressFromObject(TempObject));
+			}
+		}
+	}
+
+	// Everything checked out and we have usable addresses.
+	return bAllTheSame;
+}
+
+/**
+ * fills in the OutAddresses array with the addresses of all of the available objects.
+ * @param InItem		The property to get objects from.
+ * @param OutAddresses	Storage array for all of the objects' addresses.
+ */
+bool FObjectPropertyNode::GetReadAddressUncached(const FPropertyNode& InNode, FReadAddressListData& OutAddresses ) const
+{
+	// Are any objects selected for property editing?
+	if( !GetNumObjects())
+	{
+		return false;
+	}
+
+	const FProperty* InItemProperty = InNode.GetProperty();
+	// Is there a InItemProperty bound to the InItemProperty window?
+	if( !InItemProperty )
+	{
+		return false;
+	}
+
+
+	// Write addresses to the output.
+	for (int32 ObjIndex = 0 ; ObjIndex < GetNumObjects() ; ++ObjIndex)
+	{
+		const UObject* TempObject = GetUObject(ObjIndex);
+		if (TempObject != nullptr)
+		{
+			OutAddresses.Add(TempObject, InNode.GetValueBaseAddressFromObject(TempObject));
+		}
+	}
+
+	// Everything checked out and we have usable addresses.
+	return true;
+}
+
+uint8* FObjectPropertyNode::GetValueBaseAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const
+{
+	uint8* Result = StartAddress;
+
+	UClass* ClassObject;
+	if (!bIsSparseData)
+	{
+		if ( (ClassObject=Cast<UClass>((UObject*)Result)) != NULL )
+		{
+			Result = (uint8*)ClassObject->GetDefaultObject();
+		}
+	}
+
+	return Result;
+}
+
+
+void FObjectPropertyNode::InitBeforeNodeFlags()
+{
+	StoredProperty = Property;
+	Property = NULL;
+
+	Finalize();
+}
+
+void FObjectPropertyNode::InitChildNodes()
+{
+	InternalInitChildNodes();
+}
+
+static TSharedPtr<FPropertyNode> FindChildCategory( TSharedPtr<FPropertyNode> ParentNode, FName CategoryName )
+{
+	for( int32 CurNodeIndex = 0; CurNodeIndex < ParentNode->GetNumChildNodes(); ++CurNodeIndex )
+	{
+		TSharedPtr<FPropertyNode>& ChildNode = ParentNode->GetChildNode(CurNodeIndex);
+		check( ChildNode.IsValid() );
+
+		// Is this a category node?
+		FCategoryPropertyNode* ChildCategoryNode = ChildNode->AsCategoryNode();
+		if( ChildCategoryNode != nullptr && ChildCategoryNode->GetCategoryName() == CategoryName )
+		{
+			return ChildNode;
+		}
+	}
+	return nullptr;
+}
+
+void FObjectPropertyNode::GetCategoryProperties(const TSet<UClass*>& ClassesToConsider, const FProperty* CurrentProperty, bool bShouldShowDisableEditOnInstance, bool bShouldShowHiddenProperties, bool bGameModeOnlyVisible,
+	const TSet<FName>& CategoriesFromBlueprints, TSet<FName>& CategoriesFromProperties, TArray<FName>& SortedCategories)
+{
+	static const FName Name_bShowOnlyWhenTrue("bShowOnlyWhenTrue");
+	static const FName Name_ShowOnlyInnerProperties("ShowOnlyInnerProperties");
+
+	FName CategoryName = FRuntimeEditorUtils::GetCategoryFName(CurrentProperty);
+
+	for (UClass* Class : ClassesToConsider)
+	{
+		if (FRuntimeEditorUtils::IsCategoryHiddenFromClass(Class, CategoryName.ToString()))
+		{
+			HiddenCategories.Add(CategoryName);
+			break;
+		}
+	}
+
+	bool bMetaDataAllowVisible = true;
+	const FString& ShowOnlyWhenTrueString = FRuntimeMetaData::GetMetaData(CurrentProperty, Name_bShowOnlyWhenTrue);
+	if (ShowOnlyWhenTrueString.Len())
+	{
+		//ensure that the metadata visibility string is actually set to true in order to show this property
+		GConfig->GetBool(TEXT("UnrealEd.PropertyFilters"), *ShowOnlyWhenTrueString, bMetaDataAllowVisible, GEditorPerProjectIni);
+	}
+
+	if (bMetaDataAllowVisible)
+	{
+		if (PropertyEditorHelpers::ShouldBeVisible(*this, CurrentProperty) && !HiddenCategories.Contains(CategoryName))
+		{
+			if (!CategoriesFromBlueprints.Contains(CategoryName) && !CategoriesFromProperties.Contains(CategoryName))
+			{
+				SortedCategories.AddUnique(CategoryName);
+			}
+			CategoriesFromProperties.Add(CategoryName);
+		}
+	}
+
+	if (FRuntimeMetaData::HasMetaData(CurrentProperty, Name_ShowOnlyInnerProperties))
+	{
+		const FStructProperty* StructProperty = CastField<const FStructProperty>(CurrentProperty);
+		if (StructProperty)
+		{
+			for (TFieldIterator<FProperty> It(StructProperty->Struct); It; ++It)
+			{
+				GetCategoryProperties(ClassesToConsider, *It, bShouldShowDisableEditOnInstance, bShouldShowHiddenProperties, bGameModeOnlyVisible, CategoriesFromBlueprints, CategoriesFromProperties, SortedCategories);
+			}
+		}
+	}
+}
+
+void FObjectPropertyNode::InternalInitChildNodes( FName SinglePropertyName )
+{
+	HiddenCategories.Reset();
+	SparseClassDataInstances.Reset();
+	// Assemble a list of category names by iterating over all fields of BaseClass.
+
+	// build a list of classes that we need to look at
+	TSet<UClass*> ClassesToConsider;
+	for( int32 i = 0; i < GetNumObjects(); ++i )
+	{
+		UObject* TempObject = GetUObject( i );
+		if( TempObject )
+		{
+			ClassesToConsider.Add( TempObject->GetClass() );
+		}
+	}
+
+	// Create a merged list of user-enforced sorted info, hidden category info, etc...
+	TSet<FName> CategoriesFromBlueprints, CategoriesFromProperties;
+	TArray<FName> SortedCategories;
+	TArray<FName> PrioritizeCategories;
+
+#if WITH_EDITORONLY_DATA
+	for (UClass* Class : ClassesToConsider)
+	{
+		if (UBlueprint* BP = Cast<UBlueprint>(Class->ClassGeneratedBy))
+		{
+			for (const FName& TestCategory : BP->CategorySorting)
+			{
+				if (!CategoriesFromBlueprints.Contains(TestCategory))
+				{
+					CategoriesFromBlueprints.Add(TestCategory);
+					SortedCategories.AddUnique(TestCategory);
+				}
+			}
+		}
+
+		TArray<FString> ClassPrioritizeCategories;
+		Class->GetPrioritizeCategories(ClassPrioritizeCategories);
+		for (const FString& ClassPrioritizeCategory : ClassPrioritizeCategories)
+		{
+			FName PrioritizeCategoryName = FName(ClassPrioritizeCategory);
+			SortedCategories.AddUnique(PrioritizeCategoryName);
+			PrioritizeCategories.AddUnique(PrioritizeCategoryName);
+		}
+	}
+#endif
+
+	const bool bShouldShowHiddenProperties = !!HasNodeFlags(EPropertyNodeFlags::ShouldShowHiddenProperties);
+	const bool bShouldShowDisableEditOnInstance = !!HasNodeFlags(EPropertyNodeFlags::ShouldShowDisableEditOnInstance);
+	const bool bGameModeOnlyVisible = !!HasNodeFlags(EPropertyNodeFlags::GameModeOnlyVisible);
+
+	for (TFieldIterator<FProperty> It(BaseClass.Get()); It; ++It)
+	{
+		GetCategoryProperties(ClassesToConsider, *It, bShouldShowDisableEditOnInstance, bShouldShowHiddenProperties, bGameModeOnlyVisible, CategoriesFromBlueprints, CategoriesFromProperties, SortedCategories);
+	}
+
+	for (UClass* Class : ClassesToConsider)
+	{
+		if (Class)
+		{
+			UScriptStruct* SparseClassDataStruct = Class->GetSparseClassDataStruct();
+			if (SparseClassDataStruct)
+			{
+				SparseClassDataInstances.Add(Class, TTuple<UScriptStruct*, void*>(SparseClassDataStruct, Class->GetOrCreateSparseClassData()));
+
+				for (TFieldIterator<FProperty> It(SparseClassDataStruct); It; ++It)
+				{
+					GetCategoryProperties(ClassesToConsider, *It, bShouldShowDisableEditOnInstance, bShouldShowHiddenProperties, bGameModeOnlyVisible, CategoriesFromBlueprints, CategoriesFromProperties, SortedCategories);
+				}
+			}
+		}
+	}
+
+	// Categories from the Blueprint class may include categories with no associated properties, so remove those ones
+	for ( const FName& CategoryName : CategoriesFromBlueprints )
+	{
+		if ( !CategoriesFromProperties.Contains(CategoryName) )
+		{
+			SortedCategories.Remove(CategoryName);
+		}
+	}
+
+	// Remove any prioritized categories that don't actually exist
+	for (const FName& PrioritizeCategory : PrioritizeCategories)
+	{
+		if (!CategoriesFromProperties.Contains(PrioritizeCategory))
+		{
+			SortedCategories.Remove(PrioritizeCategory);
+		}
+	}
+
+	//////////////////////////////////////////
+	// Add the category headers and the child items that belong inside of them.
+
+	// Only show category headers if this is the top level object window and the parent window allows headers.
+	if( HasNodeFlags(EPropertyNodeFlags::ShowCategories) )
+	{
+		FString CategoryDelimiterString;
+		CategoryDelimiterString.AppendChar( FPropertyNodeConstants::CategoryDelimiterChar );
+
+		TArray< FPropertyNode* > ParentNodesToSort;
+
+		for( const FName& FullCategoryPath : SortedCategories )
+		{
+			// Figure out the nesting level for this category
+			TArray< FString > FullCategoryPathStrings;
+			FullCategoryPath.ToString().ParseIntoArray( FullCategoryPathStrings, *CategoryDelimiterString, true );
+
+			TSharedPtr<FPropertyNode> ParentLevelNode = SharedThis(this);
+			FString CurCategoryPathString;
+			for( int32 PathLevelIndex = 0; PathLevelIndex < FullCategoryPathStrings.Num(); ++PathLevelIndex )
+			{
+				// Build up the category path name for the current path level index
+				if( CurCategoryPathString.Len() != 0 )
+				{
+					CurCategoryPathString += FPropertyNodeConstants::CategoryDelimiterChar;
+				}
+				CurCategoryPathString += FullCategoryPathStrings[ PathLevelIndex ];
+				const FName CategoryName( *CurCategoryPathString );
+
+				// Check to see if we've already created a category at the specified path level
+				TSharedPtr<FPropertyNode> FoundCategory = FindChildCategory( ParentLevelNode, CategoryName );
+
+				// If we didn't find the category, then we'll need to create it now!
+				if( !FoundCategory.IsValid() )
+				{
+					// Create the category node and assign it to its parent node
+					TSharedPtr<FCategoryPropertyNode> NewCategoryNode( new FCategoryPropertyNode );
+					{
+						NewCategoryNode->SetCategoryName( CategoryName );
+
+						FPropertyNodeInitParams InitParams;
+						InitParams.ParentNode = ParentLevelNode;
+						InitParams.Property = NULL;
+						InitParams.ArrayOffset = 0;
+						InitParams.ArrayIndex = INDEX_NONE;
+						InitParams.bAllowChildren = true;
+						InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+						InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+						InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+						NewCategoryNode->InitNode( InitParams );
+
+						// Recursively expand category properties if the category has been flagged for auto-expansion.
+						if (FRuntimeMetaData::IsAutoExpandCategory(BaseClass.Get(), *CategoryName.ToString())
+							&&	!FRuntimeMetaData::IsAutoCollapseCategory(BaseClass.Get(), *CategoryName.ToString()))
+						{
+							NewCategoryNode->SetNodeFlags(EPropertyNodeFlags::Expanded, true);
+						}
+
+						// Add this node to it's parent.  Note that no sorting happens here, so the parent's
+						// list of child nodes will not be in the correct order.  We'll keep track of which
+						// nodes we added children to so we can sort them after we're finished adding new nodes.
+						ParentLevelNode->AddChildNode(NewCategoryNode);
+						ParentNodesToSort.AddUnique( ParentLevelNode.Get() );
+					}
+
+					// Descend into the newly created category by using this node as the new parent
+					ParentLevelNode = NewCategoryNode;
+				}
+				else
+				{
+					ParentLevelNode = FoundCategory;
+				}
+			}
+		}
+	}
+	else
+	{
+		TArray<FProperty*> SortedProperties;
+
+		// Iterate over all fields, creating items.
+		for( TFieldIterator<FProperty> It(BaseClass.Get()); It; ++It )
+		{
+			if (PropertyEditorHelpers::ShouldBeVisible(*this, *It))
+			{
+				FProperty* CurProp = *It;
+				if( SinglePropertyName == NAME_None || CurProp->GetFName() == SinglePropertyName )
+				{
+					SortedProperties.Add(CurProp);
+
+					if( SinglePropertyName != NAME_None )
+					{
+						// Generate no other children
+						break;
+					}
+				}
+			}
+		}
+
+		// Sort the properties if needed.
+		if (SortedProperties.Num() > 1)
+		{
+			PropertyEditorHelpers::OrderPropertiesFromMetadata(SortedProperties);
+		}
+
+		// Add nodes for the properties.
+		for (FProperty* CurProp : SortedProperties)
+		{
+			TSharedPtr<FItemPropertyNode> NewItemNode( new FItemPropertyNode );
+
+			FPropertyNodeInitParams InitParams;
+			InitParams.ParentNode = SharedThis(this);
+			InitParams.Property = CurProp;
+			InitParams.ArrayOffset =  0;
+			InitParams.ArrayIndex = INDEX_NONE;
+			InitParams.bAllowChildren = SinglePropertyName == NAME_None;
+			InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+			InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+			InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+			NewItemNode->InitNode( InitParams );
+
+			AddChildNode(NewItemNode);
+		}
+	}
+
+}
+
+
+TSharedPtr<FPropertyNode> FObjectPropertyNode::GenerateSingleChild( FName ChildPropertyName )
+{
+	bool bDestroySelf = false;
+	DestroyTree(bDestroySelf);
+
+	// No category nodes should be created in single property mode
+	SetNodeFlags( EPropertyNodeFlags::ShowCategories, false );
+
+	InternalInitChildNodes( ChildPropertyName );
+
+	if( ChildNodes.Num() > 0 )
+	{
+		// only one node should be been created
+		check( ChildNodes.Num() == 1);
+
+		return ChildNodes[0];
+	}
+
+	return NULL;
+}
+
+bool FObjectPropertyNode::IsSparseDataStruct(const UScriptStruct* Struct) const
+{
+	for (const auto& Instance : SparseClassDataInstances)
+	{
+		const TTuple<UScriptStruct*, void*>& SparseData = Instance.Value;
+		if (SparseData.Key == Struct)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Appends my path, including an array index (where appropriate)
+ */
+bool FObjectPropertyNode::GetQualifiedName(FString& PathPlusIndex, bool bWithArrayIndex, const FPropertyNode* StopParent, bool bIgnoreCategories ) const
+{
+	bool bAddedAnything = false;
+	const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (ParentNode && StopParent != ParentNode.Get())
+	{
+		bAddedAnything = ParentNode->GetQualifiedName(PathPlusIndex, bWithArrayIndex, StopParent, bIgnoreCategories);
+	}
+
+	if (bAddedAnything)
+	{
+		PathPlusIndex += TEXT(".");
+	}
+
+	PathPlusIndex += TEXT("Object");
+	bAddedAnything = true;
+
+	return bAddedAnything;
+}
+
+// Looks at the Objects array and returns the best base class.  Called by
+// Finalize(); that is, when the list of selected objects is being finalized.
+void FObjectPropertyNode::SetBestBaseClass()
+{
+	BaseClass = NULL;
+
+	for( int32 x = 0 ; x < Objects.Num() ; ++x )
+	{
+		UObject* Obj = Objects[x].Get();
+		
+		if( Obj )
+		{
+			UClass* ObjClass = Cast<UClass>(Obj);
+			if (ObjClass == NULL)
+			{
+				ObjClass = Obj->GetClass();
+			}
+			check( ObjClass );
+
+			// Initialize with the class of the first object we encounter.
+			if( BaseClass == NULL )
+			{
+				BaseClass = ObjClass;
+			}
+
+			// If we've encountered an object that's not a subclass of the current best baseclass,
+			// climb up a step in the class hierarchy.
+			while( !ObjClass->IsChildOf( BaseClass.Get() ) )
+			{
+				BaseClass = BaseClass->GetSuperClass();
+			}
+		}
+	}
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/ObjectPropertyNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ObjectPropertyNode.h
new file mode 100644
index 0000000..0a8f853
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/ObjectPropertyNode.h
@@ -0,0 +1,204 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "UObject/WeakFieldPtr.h"
+
+namespace soda
+{
+
+//-----------------------------------------------------------------------------
+//	FObjectPropertyNode - Used for the root and various sub-nodes
+//-----------------------------------------------------------------------------
+
+//////////////////////////////////////////////////////////////////////////
+// Object iteration
+typedef TArray< TWeakObjectPtr<UObject> >::TIterator TPropObjectIterator;
+typedef TArray< TWeakObjectPtr<UObject> >::TConstIterator TPropObjectConstIterator;
+
+class FObjectPropertyNode : public FComplexPropertyNode
+{
+public:
+	FObjectPropertyNode();
+	virtual ~FObjectPropertyNode();
+
+	/** FPropertyNode Interface */
+	virtual FObjectPropertyNode* AsObjectNode() override { return this;}
+	virtual const FObjectPropertyNode* AsObjectNode() const override { return this; }
+	virtual bool GetReadAddressUncached(const FPropertyNode& InNode, bool InRequiresSingleSelection, FReadAddressListData* OutAddresses, bool bComparePropertyContents = true, bool bObjectForceCompare = false, bool bArrayPropertiesCanDifferInSize = false) const override;
+	virtual bool GetReadAddressUncached(const FPropertyNode& InNode, FReadAddressListData& OutAddresses) const override;
+
+	/**
+	 * Returns the UObject at index "n" of the Objects Array
+	 * @param InIndex - index to read out of the array
+	 */
+	UObject* GetUObject(int32 InIndex);
+	const UObject* GetUObject(int32 InIndex) const;
+
+	/**
+	 * Returns the UPackage at index "n" of the Objects Array
+	 * @param InIndex - index to read out of the array
+	 */
+	UPackage* GetUPackage(int32 InIndex);
+	const UPackage* GetUPackage(int32 InIndex) const;
+
+	/** Returns the number of objects for which properties are currently being edited. */
+	int32 GetNumObjects() const	{ return Objects.Num(); }
+
+	/**
+	 * Adds a new object to the list.
+	 */
+	void AddObject( UObject* InObject );
+
+	/** Adds new objects to the list. */
+	void AddObjects(const TArray<UObject*>& InObjects);
+
+	/**
+	 * Removes an object from the list.
+	 */
+	void RemoveObject(UObject* InObject);
+	/**
+	 * Removes all objects from the list.
+	 */
+	void RemoveAllObjects();
+
+	/** Set overrides that should be used when looking for packages that contain the given object */
+	void SetObjectPackageOverrides(const TMap<TWeakObjectPtr<UObject>, TWeakObjectPtr<UPackage>>& InMapping);
+	/** Clear overrides that should be used when looking for packages that contain the given object */
+	void ClearObjectPackageOverrides();
+
+	/**
+	 * Purges any objects marked pending kill from the object list
+	 */
+	void PurgeKilledObjects();
+
+	// Called when the object list is finalized, Finalize() finishes the property window setup.
+	void Finalize();
+
+	/** @return		The base-est baseclass for objects in this list. */
+	UClass*			GetObjectBaseClass()       { return BaseClass.IsValid() ? BaseClass.Get() : nullptr; }
+	/** @return		The base-est baseclass for objects in this list. */
+	const UClass*	GetObjectBaseClass() const { return BaseClass.IsValid() ? BaseClass.Get() : nullptr; }
+
+
+	// FComplexPropertyNode implementation
+	virtual UStruct* GetBaseStructure() override { return GetObjectBaseClass(); }
+	virtual const UStruct* GetBaseStructure() const override{ return GetObjectBaseClass(); }
+
+	virtual TArray<UStruct*> GetAllStructures() override;
+	virtual TArray<const UStruct*> GetAllStructures() const override;
+
+	virtual int32 GetInstancesNum() const override{ return GetNumObjects(); }
+	virtual uint8* GetMemoryOfInstance(int32 Index) const override
+	{
+		return (uint8*)GetUObject(Index);
+	}
+	virtual uint8* GetValuePtrOfInstance(int32 Index, const FProperty* InProperty, const FPropertyNode* InParentNode) const override
+	{
+		if (InParentNode == nullptr || InProperty == nullptr)
+		{
+			return nullptr;
+		}
+
+		const UObject* Obj = GetUObject(Index);
+		if (Obj == nullptr)
+		{
+			return nullptr;
+		}
+
+		uint8* ParentPtr = InParentNode->GetValueAddressFromObject(Obj);
+		if (ParentPtr == nullptr)
+		{
+			return nullptr;
+		}
+
+		return InProperty->ContainerPtrToValuePtr<uint8>(ParentPtr);
+	}
+	virtual TWeakObjectPtr<UObject> GetInstanceAsUObject(int32 Index) const override
+	{
+		check(Objects.IsValidIndex(Index));
+		return Objects[Index];
+	}
+	virtual EPropertyType GetPropertyType() const override { return EPT_Object; }
+	virtual void Disconnect() override
+	{
+		RemoveAllObjects();
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+	/** @return		The property stored at this node, to be passed to Pre/PostEditChange. */
+	virtual FProperty*		GetStoredProperty()		{ return StoredProperty.IsValid() ? StoredProperty.Get() : nullptr; }
+
+	TPropObjectIterator			ObjectIterator()			{ return TPropObjectIterator( Objects ); }
+	TPropObjectConstIterator	ObjectConstIterator() const	{ return TPropObjectConstIterator( Objects ); }
+
+
+	/** Generates a single child from the provided property name.  Any existing children are destroyed */
+	TSharedPtr<FPropertyNode> GenerateSingleChild( FName ChildPropertyName );
+
+	/**
+	 * @return The hidden categories 
+	 */
+	const TSet<FName>& GetHiddenCategories() const { return HiddenCategories; }
+
+	bool IsRootNode() const { return ParentNodeWeakPtr.Pin() == nullptr; }
+
+	/**
+	 * @return True if Struct is one of the sparse data structures used by this object
+	 */
+	bool IsSparseDataStruct(const UScriptStruct* Struct) const;
+protected:
+	/** FPropertyNode interface */
+	virtual void InitBeforeNodeFlags() override;
+	virtual void InitChildNodes() override;
+	virtual bool GetQualifiedName( FString& PathPlusIndex, const bool bWithArrayIndex, const FPropertyNode* StopParent = nullptr, bool bIgnoreCategories = false ) const override;
+	virtual uint8* GetValueBaseAddress(uint8* Base, bool bIsSparseData, bool bIsStruct) const override;
+	/**
+	 * Looks at the Objects array and creates the best base class.  Called by
+	 * Finalize(); that is, when the list of selected objects is being finalized.
+	 */
+	void SetBestBaseClass();
+
+private:
+	/**
+	 * Creates child nodes
+	 * 
+	 * @param SingleChildName	The property name of a single child to create instead of all childen
+	 */
+	void InternalInitChildNodes( FName SingleChildName = NAME_None );
+
+	/** If CurrentProperty should show up in the ClassesToConsider make sure its category is in SortedCategories and CategoriesFromProperties. */
+	void GetCategoryProperties(const TSet<UClass*>& ClassesToConsider, const FProperty* CurrentProperty, bool bShouldShowDisableEditOnInstance, bool bShouldShowHiddenProperties, bool bGameModeOnlyVisible,
+	const TSet<FName>& CategoriesFromBlueprints, TSet<FName>& CategoriesFromProperties, TArray<FName>& SortedCategories);
+private:
+	/** The list of objects we are editing properties for. */
+	TArray< TWeakObjectPtr<UObject> >		Objects;
+
+	/** The lowest level base class for objects in this list. */
+	TWeakObjectPtr<UClass>					BaseClass;
+
+	/**
+	 * The property passed to Pre/PostEditChange calls.  
+	 */
+	TWeakFieldPtr<FProperty>				StoredProperty;
+
+	/**
+	 * Set of all category names hidden by the objects in this node
+	 */
+	TSet<FName> HiddenCategories;
+
+
+
+	/* 
+	 * Contains the structure and memory location for storing data of that type. Used to read and write to sidecar structs for the class
+	 */
+	TMap<UClass*, TTuple<UScriptStruct*, void*>> SparseClassDataInstances;
+
+	/** Object -> Package re-mapping */
+	TMap<TWeakObjectPtr<UObject>, TWeakObjectPtr<UPackage>> ObjectToPackageMapping;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.cpp
new file mode 100644
index 0000000..c86422b
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.cpp
@@ -0,0 +1,725 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "Modules/ModuleManager.h"
+//#include "UnrealEdGlobals.h"
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+
+//#include "Editor/SceneOutliner/Public/SceneOutlinerFilters.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+//#include "Editor.h"
+//#include "EditorClassUtils.h"
+//#include "Kismet2/KismetEditorUtilities.h"
+//#include "IConfigEditorModule.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+//#include "Kismet2/BlueprintEditorUtils.h"
+#include "RuntimePropertyEditor/EditConditionParser.h"
+#include "RuntimePropertyEditor/EditConditionContext.h"
+//#include "Subsystems/AssetEditorSubsystem.h"
+//#include "ActorTreeItem.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+DEFINE_LOG_CATEGORY_STATIC(LogPropertyEditor, Log, All);
+
+const FString FPropertyEditor::MultipleValuesDisplayName = NSLOCTEXT("PropertyEditor", "MultipleValues", "Multiple Values").ToString();
+
+TSharedRef< FPropertyEditor > FPropertyEditor::Create( const TSharedRef< class FPropertyNode >& InPropertyNode, const TSharedRef<class IPropertyUtilities >& InPropertyUtilities )
+{
+	return MakeShareable( new FPropertyEditor( InPropertyNode, InPropertyUtilities ) );
+}
+
+FPropertyEditor::FPropertyEditor( const TSharedRef<FPropertyNode>& InPropertyNode, const TSharedRef<IPropertyUtilities>& InPropertyUtilities )
+	: PropertyHandle( NULL )
+	, PropertyNode( InPropertyNode )
+	, PropertyUtilities( InPropertyUtilities )
+{
+	// FPropertyEditor isn't built to handle CategoryNodes
+	check( InPropertyNode->AsCategoryNode() == NULL );
+
+	PropertyHandle = PropertyEditorHelpers::GetPropertyHandle( InPropertyNode, PropertyUtilities->GetNotifyHook(), PropertyUtilities );
+	check( PropertyHandle.IsValid() && PropertyHandle->IsValidHandle() );
+}
+
+
+FText FPropertyEditor::GetDisplayName() const
+{
+	FItemPropertyNode* ItemPropertyNode = PropertyNode->AsItemPropertyNode();
+
+	if ( ItemPropertyNode != NULL )
+	{
+		return ItemPropertyNode->GetDisplayName();
+	}
+	else
+	{
+		FString DisplayName;
+		PropertyNode->GetQualifiedName( DisplayName, true );
+		return FText::FromString(DisplayName);
+	}
+
+	return FText::GetEmpty();
+}
+
+FText FPropertyEditor::GetToolTipText() const
+{
+	return PropertyNode->GetToolTipText();
+}
+
+FString FPropertyEditor::GetDocumentationLink() const
+{
+	FString DocumentationLink;
+
+	if( PropertyNode->AsItemPropertyNode() )
+	{
+		FProperty* Property = PropertyNode->GetProperty();
+		DocumentationLink = PropertyEditorHelpers::GetDocumentationLink( Property );
+	}
+
+	return DocumentationLink;
+}
+
+FString FPropertyEditor::GetDocumentationExcerptName() const
+{
+	FString ExcerptName;
+
+	if( PropertyNode->AsItemPropertyNode() )
+	{
+		FProperty* Property = PropertyNode->GetProperty();
+		ExcerptName = PropertyEditorHelpers::GetDocumentationExcerptName( Property );
+	}
+
+	return ExcerptName;
+}
+
+FString FPropertyEditor::GetValueAsString() const 
+{
+	FString Str;
+
+	if( PropertyHandle->GetValueAsFormattedString( Str ) == FPropertyAccess::MultipleValues )
+	{
+		Str = MultipleValuesDisplayName;
+	}
+
+	return Str;
+}
+
+FString FPropertyEditor::GetValueAsDisplayString() const
+{
+	FString Str;
+
+	if( PropertyHandle->GetValueAsDisplayString( Str ) == FPropertyAccess::MultipleValues )
+	{
+		Str = MultipleValuesDisplayName;
+	}
+
+	return Str;
+}
+
+FText FPropertyEditor::GetValueAsText() const
+{
+	FText Text;
+
+	if( PropertyHandle->GetValueAsFormattedText( Text ) == FPropertyAccess::MultipleValues )
+	{
+		Text = NSLOCTEXT("PropertyEditor", "MultipleValues", "Multiple Values");
+	}
+
+	return Text;
+}
+
+FText FPropertyEditor::GetValueAsDisplayText() const
+{
+	FText Text;
+
+	if( PropertyHandle->GetValueAsDisplayText( Text ) == FPropertyAccess::MultipleValues )
+	{
+		Text = NSLOCTEXT("PropertyEditor", "MultipleValues", "Multiple Values");
+	}
+
+	return Text;
+}
+
+bool FPropertyEditor::PropertyIsA(const FFieldClass* Class) const
+{
+	return PropertyNode->GetProperty() != NULL ? PropertyNode->GetProperty()->IsA( Class ) : false;
+}
+
+bool FPropertyEditor::IsFavorite() const 
+{ 
+	return PropertyNode->HasNodeFlags( EPropertyNodeFlags::IsFavorite ) != 0; 
+}
+
+bool FPropertyEditor::IsChildOfFavorite() const 
+{ 
+	return PropertyNode->IsChildOfFavorite(); 
+}
+
+void FPropertyEditor::ToggleFavorite() 
+{ 
+	PropertyUtilities->ToggleFavorite( SharedThis( this ) ); 
+}
+
+void FPropertyEditor::UseSelected()
+{
+	OnUseSelected();
+}
+
+void FPropertyEditor::OnUseSelected()
+{
+	PropertyHandle->SetObjectValueFromSelection();
+}
+
+void FPropertyEditor::AddItem()
+{
+	// This action must be deferred until next tick so that we avoid accessing invalid data before we have a chance to tick
+	PropertyUtilities->EnqueueDeferredAction( FSimpleDelegate::CreateSP( this, &FPropertyEditor::OnAddItem ) );
+}
+
+void FPropertyEditor::AddGivenItem(const FString& InGivenItem)
+{
+	// This action must be deferred until next tick so that we avoid accessing invalid data before we have a chance to tick
+	PropertyUtilities->EnqueueDeferredAction(FSimpleDelegate::CreateSP(this, &FPropertyEditor::OnAddGivenItem, InGivenItem));
+}
+
+void FPropertyEditor::OnAddItem()
+{
+	// Check to make sure that the property is a valid container
+	TSharedPtr<IPropertyHandleArray> ArrayHandle = PropertyHandle->AsArray();
+	TSharedPtr<IPropertyHandleSet> SetHandle = PropertyHandle->AsSet();
+	TSharedPtr<IPropertyHandleMap> MapHandle = PropertyHandle->AsMap();
+
+	check(ArrayHandle.IsValid() || SetHandle.IsValid() || MapHandle.IsValid());
+
+	if (ArrayHandle.IsValid())
+	{
+		ArrayHandle->AddItem();
+	}
+	else if (SetHandle.IsValid())
+	{
+		SetHandle->AddItem();
+	}
+	else if (MapHandle.IsValid())
+	{
+		MapHandle->AddItem();
+	}
+
+	// Expand containers when an item is added to them
+	PropertyNode->SetNodeFlags(EPropertyNodeFlags::Expanded, true);
+
+	//In case the property is show in the favorite category refresh the whole tree
+	if (PropertyNode->IsFavorite())
+	{
+		ForceRefresh();
+	}
+}
+
+void FPropertyEditor::OnAddGivenItem(const FString InGivenItem)
+{
+
+	//const FScopedTransaction Transaction(FText::Format(LOCTEXT("AddElementToArray", "Add element to {0} array "), PropertyNode->GetDisplayName()));
+
+	FProperty* NodeProperty = PropertyNode->GetProperty();
+
+	FReadAddressList ReadAddresses;
+	PropertyNode->GetReadAddress(!!PropertyNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, true, false, true);
+	if (ReadAddresses.Num())
+	{
+		TArray< TMap<FString, int32> > ArrayIndicesPerObject;
+
+		// List of top level objects sent to the PropertyChangedEvent
+		TArray<const UObject*> TopLevelObjects;
+		TopLevelObjects.Reserve(ReadAddresses.Num());
+
+		FObjectPropertyNode* ObjectNode = PropertyNode->FindObjectItemParent();
+		FArrayProperty* Array = CastField<FArrayProperty>(NodeProperty);
+
+		check(Array);
+
+		for (int32 i = 0; i < ReadAddresses.Num(); ++i)
+		{
+			void* Addr = ReadAddresses.GetAddress(i);
+			if (Addr)
+			{
+				//add on array index so we can tell which entry just changed
+				ArrayIndicesPerObject.Add(TMap<FString, int32>());
+				FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[i], &PropertyNode.Get());
+
+				UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+				if (Obj)
+				{
+					if ((Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) ||
+						(Obj->HasAnyFlags(RF_DefaultSubObject) && Obj->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))))
+					{
+						PropertyNode->PropagateContainerPropertyChange(Obj, Addr, EPropertyArrayChangeType::Add, -1);
+					}
+
+					TopLevelObjects.Add(Obj);
+				}
+
+				int32 Index = INDEX_NONE;
+
+				FScriptArrayHelper	ArrayHelper(Array, Addr);
+				Index = ArrayHelper.AddValue();
+
+				ArrayIndicesPerObject[i].Add(NodeProperty->GetName(), Index);
+			}
+		}
+
+		FPropertyChangedEvent ChangeEvent(NodeProperty, EPropertyChangeType::ArrayAdd, MakeArrayView(TopLevelObjects));
+		ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+		PropertyNode->FixPropertiesInEvent(ChangeEvent);
+
+		// Both Insert and Add are deferred so you need to rebuild the parent node's children
+		GetPropertyNode()->RebuildChildren();
+
+		// Check to make sure that the property is a valid container
+		TSharedPtr<IPropertyHandleArray> ArrayHandle = PropertyHandle->AsArray();
+
+		check(ArrayHandle.IsValid());
+
+		TSharedPtr<IPropertyHandle> ElementHandle;
+
+		if (ArrayHandle.IsValid())
+		{
+			uint32 Last;
+			ArrayHandle->GetNumElements(Last);
+			ElementHandle = ArrayHandle->GetElement(Last - 1);
+		}
+
+		if (ElementHandle.IsValid())
+		{
+			ElementHandle->SetValueFromFormattedString(InGivenItem);
+		}
+	}
+}
+
+void FPropertyEditor::ClearItem()
+{
+	OnClearItem();
+}
+
+void FPropertyEditor::OnClearItem()
+{
+	static const FString None("None");
+	PropertyHandle->SetValueFromFormattedString( None );
+}
+
+/*
+void FPropertyEditor::MakeNewBlueprint()
+{
+	FProperty* NodeProperty = PropertyNode->GetProperty();
+	FClassProperty* ClassProp = CastField<FClassProperty>(NodeProperty);
+	UClass* Class = (ClassProp ? ClassProp->MetaClass : FEditorClassUtils::GetClassFromString(NodeProperty->GetMetaData("MetaClass")));
+
+	UClass* RequiredInterface = FEditorClassUtils::GetClassFromString(NodeProperty->GetMetaData("MustImplement"));
+
+	if (Class)
+	{
+		UBlueprint* Blueprint = FKismetEditorUtilities::CreateBlueprintFromClass(LOCTEXT("CreateNewBlueprint", "Create New Blueprint"), Class, FString::Printf(TEXT("New%s"),*Class->GetName()));
+
+		if(Blueprint != NULL && Blueprint->GeneratedClass)
+		{
+			if (RequiredInterface != nullptr && FKismetEditorUtilities::CanBlueprintImplementInterface(Blueprint, RequiredInterface))
+			{
+				FBlueprintEditorUtils::ImplementNewInterface(Blueprint, RequiredInterface->GetFName());
+			}
+			
+			PropertyHandle->SetValueFromFormattedString(Blueprint->GeneratedClass->GetPathName());
+
+			GEditor->GetEditorSubsystem<UAssetEditorSubsystem>()->OpenEditorForAsset(Blueprint);
+		}
+	}
+}
+*/
+
+/*
+void FPropertyEditor::EditConfigHierarchy()
+{
+	FProperty* NodeProperty = PropertyNode->GetProperty();
+
+	IConfigEditorModule& ConfigEditorModule = FModuleManager::LoadModuleChecked<IConfigEditorModule>("ConfigEditor");
+	ConfigEditorModule.CreateHierarchyEditor(NodeProperty);
+	FGlobalTabmanager::Get()->TryInvokeTab(FName(TEXT("ConfigEditor")));
+}
+*/
+
+void FPropertyEditor::InsertItem()
+{
+	// This action must be deferred until next tick so that we avoid accessing invalid data before we have a chance to tick
+	PropertyUtilities->EnqueueDeferredAction( FSimpleDelegate::CreateSP( this, &FPropertyEditor::OnInsertItem ) );
+}
+
+void FPropertyEditor::OnInsertItem()
+{
+	TSharedPtr<IPropertyHandleArray> ArrayHandle = PropertyHandle->GetParentHandle()->AsArray();
+	check(ArrayHandle.IsValid());
+
+	int32 Index = PropertyNode->GetArrayIndex();
+	
+	// Insert is only supported on arrays, not maps or sets
+	ArrayHandle->Insert(Index);
+
+	//In case the property is show in the favorite category refresh the whole tree
+	if (PropertyNode->IsFavorite() || (PropertyNode->GetParentNode() != nullptr && PropertyNode->GetParentNode()->IsFavorite()))
+	{
+		ForceRefresh();
+	}
+}
+
+void FPropertyEditor::DeleteItem()
+{
+	// This action must be deferred until next tick so that we avoid accessing invalid data before we have a chance to tick
+	PropertyUtilities->EnqueueDeferredAction( FSimpleDelegate::CreateSP( this, &FPropertyEditor::OnDeleteItem ) );
+}
+
+void FPropertyEditor::OnDeleteItem()
+{
+	TSharedPtr<IPropertyHandleArray> ArrayHandle = PropertyHandle->GetParentHandle()->AsArray();
+	TSharedPtr<IPropertyHandleSet> SetHandle = PropertyHandle->GetParentHandle()->AsSet();
+	TSharedPtr<IPropertyHandleMap> MapHandle = PropertyHandle->GetParentHandle()->AsMap();
+
+	check(ArrayHandle.IsValid() || SetHandle.IsValid() || MapHandle.IsValid());
+
+	int32 Index = PropertyNode->GetArrayIndex();
+
+	if (ArrayHandle.IsValid())
+	{
+		ArrayHandle->DeleteItem(Index);
+	}
+	else if (SetHandle.IsValid())
+	{
+		SetHandle->DeleteItem(Index);
+	}
+	else if (MapHandle.IsValid())
+	{
+		MapHandle->DeleteItem(Index);
+	}
+
+	//In case the property is show in the favorite category refresh the whole tree
+	if (PropertyNode->IsFavorite() || (PropertyNode->GetParentNode() != nullptr && PropertyNode->GetParentNode()->IsFavorite()))
+	{
+		ForceRefresh();
+	}
+}
+
+void FPropertyEditor::DuplicateItem()
+{
+	// This action must be deferred until next tick so that we avoid accessing invalid data before we have a chance to tick
+	PropertyUtilities->EnqueueDeferredAction( FSimpleDelegate::CreateSP( this, &FPropertyEditor::OnDuplicateItem ) );
+}
+
+void FPropertyEditor::OnDuplicateItem()
+{
+	TSharedPtr<IPropertyHandleArray> ArrayHandle = PropertyHandle->GetParentHandle()->AsArray();
+	check(ArrayHandle.IsValid());
+
+	int32 Index = PropertyNode->GetArrayIndex();
+	
+	ArrayHandle->DuplicateItem(Index);
+
+	//In case the property is show in the favorite category refresh the whole tree
+	if (PropertyNode->IsFavorite() || (PropertyNode->GetParentNode() != nullptr && PropertyNode->GetParentNode()->IsFavorite()))
+	{
+		ForceRefresh();
+	}
+}
+
+void FPropertyEditor::BrowseTo()
+{
+	OnBrowseTo();
+}
+
+void FPropertyEditor::OnBrowseTo()
+{
+	// Sync the content browser or level editor viewport to the object(s) specified by the given property.
+	//SyncToObjectsInNode( PropertyNode );
+}
+
+void FPropertyEditor::EmptyArray()
+{
+	// This action must be deferred until next tick so that we avoid accessing invalid data before we have a chance to tick
+	PropertyUtilities->EnqueueDeferredAction( FSimpleDelegate::CreateSP( this, &FPropertyEditor::OnEmptyArray ) );
+}
+
+void FPropertyEditor::OnEmptyArray()
+{
+	TSharedPtr<IPropertyHandleArray> ArrayHandle = PropertyHandle->AsArray();
+	TSharedPtr<IPropertyHandleSet> SetHandle = PropertyHandle->AsSet();
+	TSharedPtr<IPropertyHandleMap> MapHandle = PropertyHandle->AsMap();
+
+	check(ArrayHandle.IsValid() || SetHandle.IsValid() || MapHandle.IsValid());
+
+	if (ArrayHandle.IsValid())
+	{
+		ArrayHandle->EmptyArray();
+	}
+	else if (SetHandle.IsValid())
+	{
+		SetHandle->Empty();
+	}
+	else if (MapHandle.IsValid())
+	{
+		MapHandle->Empty();
+	}
+
+	//In case the property is show in the favorite category refresh the whole tree
+	if (PropertyNode->IsFavorite())
+	{
+		ForceRefresh();
+	}
+}
+
+bool FPropertyEditor::DoesPassFilterRestrictions() const
+{
+	return PropertyNode->HasNodeFlags( EPropertyNodeFlags::IsSeenDueToFiltering ) != 0;
+}
+
+bool FPropertyEditor::IsEditConst() const
+{
+	return PropertyNode->IsEditConst();
+}
+
+bool FPropertyEditor::SupportsEditConditionToggle() const
+{
+	return PropertyNode->SupportsEditConditionToggle();
+}
+
+bool FPropertyEditor::HasEditCondition() const
+{
+	return PropertyNode->HasEditCondition();
+}
+
+bool FPropertyEditor::IsEditConditionMet() const
+{
+	return PropertyNode->IsEditConditionMet();
+}
+
+bool FPropertyEditor::IsOnlyVisibleWhenEditConditionMet() const
+{
+	return PropertyNode->IsOnlyVisibleWhenEditConditionMet();
+}
+
+void FPropertyEditor::ToggleEditConditionState()
+{
+	//const FScopedTransaction Transaction(FText::Format(LOCTEXT("SetEditConditionState", "Set {0} edit condition state "), PropertyNode->GetDisplayName()));
+
+	PropertyNode->NotifyPreChange( PropertyNode->GetProperty(), PropertyUtilities->GetNotifyHook() );
+
+	PropertyNode->ToggleEditConditionState();
+
+	const FComplexPropertyNode* ComplexParentNode = PropertyNode->FindComplexParent();
+
+	TArray<TMap<FString,int32>> ArrayIndicesPerObject;
+	ArrayIndicesPerObject.AddDefaulted(ComplexParentNode->GetInstancesNum());
+
+	for (int32 ObjectIndex = 0; ObjectIndex < ComplexParentNode->GetInstancesNum(); ++ObjectIndex)
+	{
+		FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[ObjectIndex], &PropertyNode.Get());
+	}
+
+	FPropertyChangedEvent ChangeEvent(PropertyNode->GetProperty(), EPropertyChangeType::ValueSet);
+	ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+	PropertyNode->NotifyPostChange( ChangeEvent, PropertyUtilities->GetNotifyHook() );
+}
+
+void FPropertyEditor::OnGetClassesForAssetPicker( TArray<const UClass*>& OutClasses )
+{
+	FProperty* NodeProperty = GetPropertyNode()->GetProperty();
+
+	FObjectPropertyBase* ObjProp = CastField<FObjectPropertyBase>( NodeProperty );
+
+	// This class and its children are the classes that we can show objects for
+	UClass* AllowedClass = ObjProp ? ObjProp->PropertyClass.Get() : UObject::StaticClass();
+
+	OutClasses.Add( AllowedClass );
+}
+
+void FPropertyEditor::OnAssetSelected( const FAssetData& AssetData )
+{
+	// Set the object found from the asset picker
+	GetPropertyHandle()->SetValueFromFormattedString( AssetData.IsValid() ? AssetData.GetAsset()->GetPathName() : TEXT("None") );
+}
+
+void FPropertyEditor::OnActorSelected( AActor* InActor )
+{
+	// Update the name like we would a picked asset
+	OnAssetSelected(InActor);
+}
+/*
+void FPropertyEditor::OnGetActorFiltersForSceneOutliner( TSharedPtr<FSceneOutlinerFilters>& OutFilters )
+{
+
+	struct Local
+	{
+		static bool IsFilteredActor( const AActor* Actor, TSharedRef<FPropertyEditor> PropertyEditor )
+		{
+			const TSharedRef<FPropertyNode> PropertyNode = PropertyEditor->GetPropertyNode();
+			FProperty* NodeProperty = PropertyNode->GetProperty();
+
+			FObjectPropertyBase* ObjProp = CastField<FObjectPropertyBase>( NodeProperty );
+
+			// This class and its children are the classes that we can show objects for
+			UClass* AllowedClass = ObjProp ? ObjProp->PropertyClass : AActor::StaticClass();
+
+			return Actor->IsA( AllowedClass );
+		}
+	};
+
+	OutFilters->AddFilterPredicate<FActorTreeItem>(FActorTreeItem::FFilterPredicate::CreateStatic( &Local::IsFilteredActor, AsShared() ) );
+}
+*/
+bool FPropertyEditor::IsPropertyEditingEnabled() const
+{
+	return PropertyUtilities->IsPropertyEditingEnabled() && (!PropertyNode->HasEditCondition() || PropertyNode->IsEditConditionMet());
+}
+
+void FPropertyEditor::ForceRefresh()
+{
+	PropertyUtilities->ForceRefresh();
+}
+
+void FPropertyEditor::RequestRefresh()
+{
+	PropertyUtilities->RequestRefresh();
+}
+
+TSharedRef< FPropertyNode > FPropertyEditor::GetPropertyNode() const
+{
+	return PropertyNode;
+}
+
+const FProperty* FPropertyEditor::GetProperty() const
+{
+	return PropertyNode->GetProperty();
+}
+
+TSharedRef< IPropertyHandle > FPropertyEditor::GetPropertyHandle() const
+{
+	return PropertyHandle.ToSharedRef();
+}
+
+/*
+void FPropertyEditor::SyncToObjectsInNode( const TWeakPtr< FPropertyNode >& WeakPropertyNode )
+{
+
+#if WITH_EDITOR
+
+	if ( !GUnrealEd )
+	{
+		return;
+	}
+
+	TSharedPtr< FPropertyNode > PropertyNode = WeakPropertyNode.Pin();
+	check(PropertyNode.IsValid());
+	FProperty* NodeProperty = PropertyNode->GetProperty();
+
+	FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>( NodeProperty );
+	FInterfaceProperty* IntProp = CastField<FInterfaceProperty>( NodeProperty );
+	{
+		UClass* PropertyClass = UObject::StaticClass();
+		if( ObjectProperty )
+		{
+			PropertyClass = ObjectProperty->PropertyClass;
+		}
+		else if( IntProp )
+		{
+			// Note: this should be IntProp->InterfaceClass but we're using UObject as the class  to work around InterfaceClass not working with FindObject
+			PropertyClass = UObject::StaticClass();
+		}
+
+		// Get a list of addresses for objects handled by the property window.
+		FReadAddressList ReadAddresses;
+		PropertyNode->GetReadAddress( !!PropertyNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false );
+
+		// GetReadAddresses will only provide a list of addresses if the property was properly formed, objects were selected, and only one object was selected if the node has the SingleSelectOnly flag.
+		// If a list of addresses is provided, GetReadAddress may still return false but we can operate on the property addresses even if they have different values.
+		check( ReadAddresses.Num() > 0 );
+
+		// Create a list of object names.
+		TArray<FString> ObjectNames;
+		ObjectNames.Empty( ReadAddresses.Num() );
+
+		// Copy each object's object property name off into the name list.
+		for ( int32 AddrIndex = 0 ; AddrIndex < ReadAddresses.Num() ; ++AddrIndex )
+		{
+			new( ObjectNames ) FString();
+			uint8* Address = ReadAddresses.GetAddress(AddrIndex);
+			if( Address )
+			{
+				NodeProperty->ExportText_Direct(ObjectNames[AddrIndex], Address, Address, NULL, PPF_None );
+			}
+		}
+
+
+		// Create a list of objects to sync the generic browser to.
+		TArray<UObject*> Objects;
+		for ( int32 ObjectIndex = 0 ; ObjectIndex < ObjectNames.Num() ; ++ObjectIndex )
+		{
+
+			UObject* Package = ANY_PACKAGE;
+			if( ObjectNames[ObjectIndex].Contains( TEXT(".")) )
+			{
+				// Formatted text string, use the exact path instead of any package
+				Package = NULL;
+			}
+
+			UObject* Object = StaticFindObject( PropertyClass, Package, *ObjectNames[ObjectIndex] );
+			if( !Object && Package != ANY_PACKAGE )
+			{
+				Object = StaticLoadObject(PropertyClass, Package, *ObjectNames[ObjectIndex]);
+			}
+			if ( Object )
+			{
+				// If the selected object is a blueprint generated class, then browsing to it in the content browser should instead point to the blueprint
+				// Note: This code needs to change once classes are the top level asset in the content browser and/or blueprint classes are displayed in the content browser
+				if (UClass* ObjectAsClass = Cast<UClass>(Object))
+				{
+					if (ObjectAsClass->ClassGeneratedBy != NULL)
+					{
+						Object = ObjectAsClass->ClassGeneratedBy;
+					}
+				}
+
+				Objects.Add( Object );
+			}
+		}
+
+		// If a single actor is selected, sync to its location in the level editor viewport instead of the content browser.
+		if( Objects.Num() == 1 && Objects[0]->IsA<AActor>() )
+		{
+			AActor* Actor = CastChecked<AActor>(Objects[0]);
+
+			if (Actor->GetLevel())
+			{
+				TArray<AActor*> Actors;
+				Actors.Add(Actor);
+
+				GEditor->SelectNone(false, true);
+				GEditor->SelectActor(Actor, true, true, true);
+
+				// Jump to the location of the actor
+				GEditor->MoveViewportCamerasToActor(Actors, false);
+			}
+		}
+		else if ( Objects.Num() > 0 )
+		{
+			GEditor->SyncBrowserToObjects(Objects);
+		}
+	}
+
+#endif
+}
+*/
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h
new file mode 100644
index 0000000..0d1ebaa
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h
@@ -0,0 +1,130 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+//#include "Editor/SceneOutliner/Public/SceneOutlinerFwd.h"
+
+namespace soda
+{
+
+class FEditConditionExpression;
+class FEditConditionContext;
+
+class FPropertyEditor : public TSharedFromThis< FPropertyEditor >	
+{
+public:
+	static TSharedRef< FPropertyEditor > Create( const TSharedRef< class FPropertyNode >& InPropertyNode, const TSharedRef<class IPropertyUtilities >& InPropertyUtilities );
+
+	/** @return The String containing the value of the property */
+	FString GetValueAsString() const;
+
+	/** @return The String containing the value of the property, possibly using an alternate form more suitable for display in the UI */
+	FString GetValueAsDisplayString() const;
+
+	/** @return The String containing the value of the property as Text */
+	FText GetValueAsText() const;
+
+	/** @return The String containing the value of the property as Text, possibly using an alternate form more suitable for display in the UI */
+	FText GetValueAsDisplayText() const;
+
+	bool PropertyIsA(const FFieldClass* InClass) const;
+
+	bool IsFavorite() const;
+
+	bool IsChildOfFavorite() const;
+
+	void ToggleFavorite();
+
+	bool IsPropertyEditingEnabled() const;
+
+	void ForceRefresh();
+
+	void RequestRefresh();
+
+	/**	@return Whether the property is editconst */
+	bool IsEditConst() const;
+
+	/** @return Whether this property should have an edit condition toggle. */
+	bool SupportsEditConditionToggle() const;
+
+	/** Toggle the current state of the edit condition if this SupportsEditConditionToggle() */
+	void ToggleEditConditionState();
+
+	/**	@return Whether the property has a condition which must be met before allowing editing of it's value */
+	bool HasEditCondition() const;
+
+	/**	@return Whether the condition has been met to allow editing of this property's value */
+	bool IsEditConditionMet() const;
+
+	/**	@return Whether this property derives its visibility from its edit condition */
+	bool IsOnlyVisibleWhenEditConditionMet() const;
+
+	/**	@return The tooltip for this property editor */
+	FText GetToolTipText() const;
+
+	/** @return The documentation link for this property */
+	FString GetDocumentationLink() const;
+
+	/** @return The documentation excerpt name to use from this properties documentation link */
+	FString GetDocumentationExcerptName() const;
+
+	/**	@return The display name to be used for the property */
+	FText GetDisplayName() const;
+
+	/**	@return Whether the property passes the current filter restrictions. If no there are no filter restrictions false will be returned. */
+	bool DoesPassFilterRestrictions() const;
+
+	void UseSelected();
+	void AddItem();
+	void AddGivenItem(const FString& InGivenItem);
+	void ClearItem();
+	void InsertItem();
+	void DeleteItem();
+	void DuplicateItem();
+	//void MakeNewBlueprint();
+	void BrowseTo();
+	void EmptyArray();
+	void OnGetClassesForAssetPicker( TArray<const UClass*>& OutClasses );
+	void OnAssetSelected( const FAssetData& AssetData );
+	void OnActorSelected( AActor* InActor );
+	//void OnGetActorFiltersForSceneOutliner( TSharedPtr<FSceneOutlinerFilters>& OutFilters );
+	//void EditConfigHierarchy();
+
+	/**	In an ideal world we wouldn't expose these */
+	TSharedRef< FPropertyNode > GetPropertyNode() const;
+	const FProperty* GetProperty() const;
+	TSharedRef< IPropertyHandle > GetPropertyHandle() const;
+
+	//static void SyncToObjectsInNode( const TWeakPtr< FPropertyNode >& WeakPropertyNode );
+
+	static const FString MultipleValuesDisplayName;
+private:
+	FPropertyEditor( const TSharedRef< class FPropertyNode >& InPropertyNode, const TSharedRef<class IPropertyUtilities >& InPropertyUtilities );
+
+	void OnUseSelected();
+	void OnAddItem();
+	void OnAddGivenItem(const FString InGivenItem);
+	void OnClearItem();
+	void OnInsertItem();
+	void OnDeleteItem();
+	void OnDuplicateItem();
+	void OnBrowseTo();
+	void OnEmptyArray();
+
+private:
+
+	/** Property handle for actually reading/writing the value of a property */
+	TSharedPtr< class IPropertyHandle > PropertyHandle;
+
+	/** pointer to the property node. */
+	TSharedRef< class FPropertyNode > PropertyNode;
+	 
+	/** The property view where this widget resides */
+	TSharedRef< class IPropertyUtilities > PropertyUtilities;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h
new file mode 100644
index 0000000..dbf4aea
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h
@@ -0,0 +1,67 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+
+namespace soda
+{
+
+class UObjectDataSource : public IDataSource
+{
+public:
+
+	UObjectDataSource( const TWeakObjectPtr< UObject >& InObject )
+		: Object( InObject )
+	{
+	}
+
+	virtual ~UObjectDataSource() {}
+
+	virtual TWeakObjectPtr< UObject > AsUObject() const override { return Object; }
+	virtual TSharedPtr< FPropertyPath > AsPropertyPath() const override { return NULL; }
+
+	virtual bool IsValid() const override { return Object.IsValid(); }
+
+private:
+
+	TWeakObjectPtr< UObject > Object;
+};
+
+class PropertyPathDataSource : public IDataSource
+{
+public:
+
+	PropertyPathDataSource( const TSharedRef< FPropertyPath >& InPath )
+		: Path( InPath )
+	{
+	}
+
+	virtual ~PropertyPathDataSource() {}
+
+	virtual TWeakObjectPtr< UObject > AsUObject() const override { return NULL; }
+	virtual TSharedPtr< FPropertyPath > AsPropertyPath() const override { return Path; }
+
+	virtual bool IsValid() const override { return true; }
+
+private:
+
+	TSharedRef< FPropertyPath > Path;
+};
+
+class NoDataSource : public IDataSource
+{
+public:
+
+	virtual ~NoDataSource() {}
+
+	virtual TWeakObjectPtr< UObject > AsUObject() const override { return NULL; }
+	virtual TSharedPtr< FPropertyPath > AsPropertyPath() const override { return NULL; }
+
+	virtual bool IsValid() const override { return false; }
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.cpp
new file mode 100644
index 0000000..0b510ed
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.cpp
@@ -0,0 +1,1454 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.h"
+#include "Misc/FeedbackContext.h"
+//#include "Editor/EditorPerProjectUserSettings.h"
+//#include "Editor.h"
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRowHeaderColumn.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameColumn.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.h"
+
+#include "RuntimePropertyEditor/EditConditionParser.h"
+
+#define LOCTEXT_NAMESPACE "PropertyTable"
+
+namespace soda
+{
+
+FPropertyTable::FPropertyTable()
+	: SourceObjects()
+	, Columns()
+	, Rows()
+	, CurrentRow( NULL )
+	, CurrentCell( NULL )
+	, CurrentColumn( NULL )
+	, RootPath( FPropertyPath::CreateEmpty() )
+	, SelectionUnit( EPropertyTableSelectionUnit::Cell )
+	, SelectionMode( ESelectionMode::Multi )
+	, ShowRowHeader( true )
+	, ShowObjectName( true )
+	, ItemHeight( 20 )
+	, PrimarySortMode( EColumnSortMode::None )
+	, SecondarySortMode( EColumnSortMode::None )
+	, AllowUserToChangeRoot( true )
+	, bRefreshRequested( false )
+	, Orientation( EPropertyTableOrientation::AlignPropertiesInColumns )
+	, EditConditionParser( new FEditConditionParser )
+{
+}
+
+FPropertyTable::~FPropertyTable()
+{
+	/*
+	if (ObjectsReplacedHandle.IsValid())
+	{
+		FCoreUObjectDelegates::OnObjectsReplaced.Remove(ObjectsReplacedHandle);
+	}
+	*/
+}
+
+void FPropertyTable::Tick()
+{
+	// Execute any deferred actions
+	for( int32 ActionIndex = 0; ActionIndex < DeferredActions.Num(); ++ActionIndex )
+	{
+		DeferredActions[ActionIndex].ExecuteIfBound();
+	}
+
+	DeferredActions.Empty();
+
+	for( int32 ColumnIdx = 0; ColumnIdx < Columns.Num(); ColumnIdx++ )
+	{
+		Columns[ColumnIdx]->Tick();
+	}
+
+	if( bRefreshRequested )
+	{
+		bRefreshRequested = false;
+		PurgeInvalidObjectNodes();
+		UpdateRows();
+		
+		if( Orientation == EPropertyTableOrientation::AlignPropertiesInRows )
+		{
+			UpdateColumns();
+		}
+	}
+}
+
+void FPropertyTable::ForceRefresh()
+{
+	RequestRefresh();
+}
+
+void FPropertyTable::RequestRefresh()
+{
+	bRefreshRequested = true;
+}
+
+FNotifyHook* FPropertyTable::GetNotifyHook() const
+{
+	return NULL;
+	//return View.GetNotifyHook();
+}
+
+bool FPropertyTable::AreFavoritesEnabled() const
+{
+	return false;
+}
+
+void FPropertyTable::ToggleFavorite( const TSharedRef< class FPropertyEditor >& PropertyEditor ) const
+{
+}
+
+void FPropertyTable::CreateColorPickerWindow( const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha ) const
+{
+	//TableView.CreateColorPickerWindow( PropertyEditor, bUseAlpha );
+}
+
+void FPropertyTable::EnqueueDeferredAction( FSimpleDelegate DeferredAction )
+{
+	DeferredActions.Add( DeferredAction );
+}
+/*
+TSharedPtr<class FAssetThumbnailPool> FPropertyTable::GetThumbnailPool() const
+{
+	return NULL;
+}
+*/
+
+const TArray<TSharedRef<IClassViewerFilter>>& FPropertyTable::GetClassViewerFilters() const
+{
+	// not implemented
+	static TArray<TSharedRef<IClassViewerFilter>> NotImplemented;
+	return NotImplemented;
+}
+
+bool FPropertyTable::GetIsUserAllowedToChangeRoot()
+{
+	return AllowUserToChangeRoot;
+}
+
+void FPropertyTable::SetIsUserAllowedToChangeRoot( bool InAllowUserToChangeRoot )
+{
+	AllowUserToChangeRoot = InAllowUserToChangeRoot;
+}
+
+void FPropertyTable::AddColumn( const TWeakObjectPtr< UObject >& Object )
+{
+	AddColumn( CreateColumn( Object ) );
+}
+
+void FPropertyTable::AddColumn( const TWeakFieldPtr< FProperty >& Property )
+{
+	AddColumn( CreateColumn( Property ) );
+}
+
+void FPropertyTable::AddColumn( const TSharedRef< FPropertyPath >& PropertyPath )
+{
+	AddColumn( CreateColumn( PropertyPath ) );
+}
+
+void FPropertyTable::AddColumn( const TSharedRef< class IPropertyTableColumn >& Column )
+{
+	Columns.AddUnique( Column );
+	ColumnsChanged.Broadcast();
+}
+
+void FPropertyTable::AddRow( const TWeakObjectPtr< UObject >& Object )
+{
+	AddRow( CreateRow( Object ) );
+}
+
+void FPropertyTable::AddRow( const TWeakFieldPtr< FProperty >& Property )
+{
+	AddRow( CreateRow( Property ) );
+}
+
+void FPropertyTable::AddRow( const TSharedRef< FPropertyPath >& PropertyPath )
+{
+	AddRow( CreateRow( PropertyPath ) );
+}
+
+void FPropertyTable::AddRow( const TSharedRef< class IPropertyTableRow >& Row )
+{
+	Rows.AddUnique( Row );
+	RowsChanged.Broadcast();
+}
+
+void FPropertyTable::RemoveColumn( const TSharedRef< class IPropertyTableColumn >& Column )
+{
+	// Update the selection to exclude cells in the column we are removing
+	TSet<TSharedRef<IPropertyTableCell>> NewSelectedCells;
+	for(const TSharedRef<IPropertyTableCell>& CurrentSelectedCell : SelectedCells)
+	{
+		if(CurrentSelectedCell->GetColumn() != Column)
+		{
+			NewSelectedCells.Add(CurrentSelectedCell);
+		}
+	}
+
+	Columns.Remove( Column );
+	ColumnsChanged.Broadcast();
+
+	if(NewSelectedCells.Num() != SelectedCells.Num())
+	{
+		SetSelectedCells(NewSelectedCells);
+	}
+}
+
+void FPropertyTable::RemoveRow( const TSharedRef< class IPropertyTableRow >& Row )
+{
+	//@todo Consider encapsulating the logic for this check [12/7/2012 Justin.Sargent]
+	if ( !Row->HasChildren() && !Row->GetDataSource()->AsPropertyPath().IsValid() )
+	{
+		const TWeakObjectPtr< UObject > Object = Row->GetDataSource()->AsUObject();
+		SourceObjectPropertyNodes.Remove( Object );
+
+		if ( !Object.IsValid() )
+		{
+			PurgeInvalidObjectNodes();
+		}
+	}
+
+	// Update the selection to exclude cells in the row we are removing
+	TSet<TSharedRef<IPropertyTableCell>> NewSelectedCells;
+	for(const TSharedRef<IPropertyTableCell>& CurrentSelectedCell : SelectedCells)
+	{
+		if(CurrentSelectedCell->GetRow() != Row)
+		{
+			NewSelectedCells.Add(CurrentSelectedCell);
+		}
+	}
+
+	Rows.Remove( Row );
+	RowsChanged.Broadcast();
+
+	for( const TSharedRef< IPropertyTableColumn >& Column : Columns )
+	{
+		Column->RemoveCellsForRow( Row );
+	}
+
+	if(NewSelectedCells.Num() != SelectedCells.Num())
+	{
+		SetSelectedCells(NewSelectedCells);
+	}
+}
+
+void FPropertyTable::ResetTable()
+{
+	Rows.Reset();
+	Columns.Reset();
+	SourceObjectPropertyNodes.Reset();
+	SelectedColumns.Reset();
+	SelectedRows.Reset();
+	SelectedCells.Reset();
+	StartingCellSelectionRange = nullptr;
+	EndingCellSelectionRange = nullptr;
+	CurrentRow = nullptr;
+	CurrentCell = nullptr;
+	CurrentColumn = nullptr;
+	LastClickedCell = nullptr;
+}
+
+void FPropertyTable::PurgeInvalidObjectNodes()
+{
+	TArray< TSharedRef< FObjectPropertyNode > > ValidNodes;
+	for( auto NodeIter = SourceObjectPropertyNodes.CreateIterator(); NodeIter; ++NodeIter )
+	{
+		const TWeakObjectPtr< UObject > Object = NodeIter.Key();
+
+		if ( Object.IsValid() )
+		{
+			ValidNodes.Add( NodeIter.Value() );
+		}
+	}
+
+	SourceObjectPropertyNodes.Empty();
+	for( auto NodeIter = ValidNodes.CreateIterator(); NodeIter; ++NodeIter )
+	{
+		const TSharedRef< FObjectPropertyNode >& CurrentNode = *NodeIter;
+		SourceObjectPropertyNodes.Add( CurrentNode->GetUObject( 0 ), CurrentNode );
+	}
+}
+
+void FPropertyTable::SetRootPath( const TSharedPtr< FPropertyPath >& Path )
+{
+	if ( Path.IsValid() )
+	{
+		RootPath = Path.ToSharedRef();
+	}
+	else
+	{
+		RootPath = FPropertyPath::CreateEmpty();
+	}
+
+	RootPathChanged.Broadcast();
+
+	UpdateRows();
+	UpdateColumns();
+}
+
+TArray< FPropertyInfo > FPropertyTable::GetPossibleExtensionsForPath( const TSharedRef< FPropertyPath >& Path ) const
+{
+	TArray< FPropertyInfo > ValidExtensions;
+
+	for( auto ObjectNodeIter = SourceObjectPropertyNodes.CreateConstIterator(); ObjectNodeIter; ++ObjectNodeIter )
+	{
+		TArray< FPropertyInfo > Extensions = FPropertyNode::GetPossibleExtensionsForPath( Path, ObjectNodeIter.Value() );
+
+		for( auto ExtensionIter = Extensions.CreateIterator(); ExtensionIter; ++ExtensionIter )
+		{
+			const FPropertyInfo& Info = *ExtensionIter;
+
+			if ( Info.ArrayIndex == INDEX_NONE && Info.Property.IsValid() && 
+				 ( Info.Property->IsA( FStructProperty::StaticClass() ) ||
+				   Info.Property->IsA( FArrayProperty::StaticClass() ) ) )
+			{
+				bool AlreadyExists = false;
+				for( auto ValidExtensionIter = ValidExtensions.CreateConstIterator(); ValidExtensionIter; ++ValidExtensionIter )
+				{
+					if ( *ValidExtensionIter == Info )
+					{
+						AlreadyExists = true;
+						break;
+					}
+				}
+
+				if ( !AlreadyExists )
+				{
+					ValidExtensions.Add( Info );
+				}
+			}
+		}
+	}
+
+	return ValidExtensions;
+}
+
+void FPropertyTable::SetOrientation( EPropertyTableOrientation::Type InOrientation )
+{
+	Orientation = InOrientation;
+
+	UpdateColumns();
+	UpdateRows();
+}
+
+bool FPropertyTable::CanSelectCells() const
+{
+	return ( SelectionUnit & EPropertyTableSelectionUnit::Cell ) != 0;
+}
+
+bool FPropertyTable::CanSelectRows() const
+{
+	return ( SelectionUnit & EPropertyTableSelectionUnit::Row ) != 0;
+}
+
+void FPropertyTable::SetSelectionMode( const ESelectionMode::Type Mode )
+{
+	SelectionMode = Mode;
+
+	if ( !CanSelectCells() )
+	{
+		SetCurrentCell( NULL );
+		SetCurrentColumn( NULL );
+	}
+
+	if ( !CanSelectRows() )
+	{
+		SetCurrentRow( NULL );
+	}
+}
+
+EColumnSortPriority::Type FPropertyTable::GetColumnSortPriority(const TSharedRef< class IPropertyTableColumn > Column) const
+{
+	if (Column == PrimarySortedByColumn.Pin())
+	{
+		return EColumnSortPriority::Primary;
+	}
+	else if (Column == SecondarySortedByColumn.Pin())
+	{
+		return EColumnSortPriority::Secondary;
+	}
+
+	return EColumnSortPriority::None;
+}
+
+EColumnSortMode::Type FPropertyTable::GetColumnSortMode( const TSharedRef< class IPropertyTableColumn > Column ) const
+{
+	if ( Column == PrimarySortedByColumn.Pin() )
+	{
+		return PrimarySortMode;
+	}
+	else if (Column == SecondarySortedByColumn.Pin())
+	{
+		return SecondarySortMode;
+	}
+
+	return EColumnSortMode::None;
+}
+
+void FPropertyTable::SortByColumnWithId( const EColumnSortPriority::Type SortPriority, const FName& ColumnId, const EColumnSortMode::Type SortMode)
+{
+	for( auto ColumnIter = Columns.CreateIterator(); ColumnIter; ++ColumnIter )
+	{
+		const TSharedRef< IPropertyTableColumn > Column = *ColumnIter;
+		if ( Column->GetId() == ColumnId )
+		{
+			SortByColumn( Column, SortMode, SortPriority );
+			break;
+		}
+	}
+}
+
+void FPropertyTable::SortByColumn( const TSharedRef< class IPropertyTableColumn >& Column, EColumnSortMode::Type SortMode, const EColumnSortPriority::Type SortPriority)
+{
+	if ( !Column->CanSortBy() )
+	{
+		/*PrimarySortedByColumn = nullptr;
+		SecondarySortedByColumn = nullptr;
+		PrimarySortMode = EColumnSortMode::None;
+		PrimarySortMode = EColumnSortMode::None;*/
+		return;
+	}
+
+	if (SortPriority == EColumnSortPriority::Primary)
+	{
+		PrimarySortedByColumn = Column;
+		PrimarySortMode = SortMode;
+	}
+	else
+	{
+		SecondarySortedByColumn = Column;
+		SecondarySortMode = SortMode;
+	}
+
+	// If the primary and secondary columns are the same eliminate the secondary sort
+	if (PrimarySortedByColumn == SecondarySortedByColumn)
+	{
+		SecondarySortedByColumn = nullptr;
+		SecondarySortMode = EColumnSortMode::None;
+	}
+
+	if (SortMode == EColumnSortMode::None )
+	{
+		return;
+	}
+
+	if (ensure(PrimarySortedByColumn.IsValid()))
+	{
+		PrimarySortedByColumn.Pin()->Sort(Rows, PrimarySortMode, SecondarySortedByColumn.Pin(), SecondarySortMode);
+	}
+
+	RowsChanged.Broadcast();
+}
+
+void SetCellValue( const TSharedRef< IPropertyTableCell >& Cell, FString Value )
+{
+	if ( Cell->IsReadOnly() )
+	{
+		return;
+	}
+
+	// We need to sanitize property name strings
+	TSharedPtr<FPropertyNode> PropertyNode = Cell->GetNode();
+	if (PropertyNode.IsValid())
+	{
+		FProperty* NodeProperty = PropertyNode->GetProperty();
+		if (NodeProperty->IsA(FNameProperty::StaticClass()))
+		{
+			// Remove any pre-existing return characters
+			Value = Value.TrimQuotes().Replace(LINE_TERMINATOR, TEXT(""));
+		}
+	}
+
+	FString CurrentValue = Cell->GetValueAsString();
+	if ( CurrentValue != Value )
+	{
+		// Set value
+		Cell->SetValueFromString( Value );
+	}
+}
+
+void FPropertyTable::PasteTextAtCell( const FString& Text, const TSharedRef< IPropertyTableCell >& Cell )
+{
+	if ( !SelectedCells.Contains( Cell ) )
+	{
+		return;
+	}
+
+	int32 CurrentRowIdx = 0;
+	int32 CurrentColumnIdx = 0;
+	TSharedPtr< IPropertyTableCell > FirstCellInRow = Cell;
+	TSharedPtr< IPropertyTableCell > TargetCell = Cell;
+
+	// Parse into row strings
+	TArray<FString> RowStrings;
+	Text.ParseIntoArray(RowStrings,LINE_TERMINATOR, false);
+	if (RowStrings.Num() == 0)
+	{
+		// Pasted an empty string, ParseIntoArray didn't create empty entry, so create that now
+		RowStrings.Emplace(TEXT(""));
+	}
+
+	// Parse row strings into individual cell strings
+	TArray<FString> CellStrings;
+	RowStrings[CurrentRowIdx++].ParseIntoArray(CellStrings, TEXT("\t"), false);
+	if (CellStrings.Num() == 0)
+	{
+		// Pasted an empty string, ParseIntoArray didn't create empty entry, so create that now
+		CellStrings.Emplace(TEXT(""));
+	}
+
+	// Get the maximum paste operations before displaying the slow task
+	int32 NumPasteOperationsBeforeWarning = 20;//GetDefault<UEditorPerProjectUserSettings>()->PropertyMatrix_NumberOfPasteOperationsBeforeWarning;
+	
+	const bool bShowCancelButton = false;
+	const bool bShowProgressDialog = SelectedCells.Num() > NumPasteOperationsBeforeWarning;
+	GWarn->BeginSlowTask(LOCTEXT("UpdatingPropertiesSlowTaskLabel", "Updating properties..."), bShowProgressDialog, bShowCancelButton);
+
+	if ( RowStrings.Num() == 1 && CellStrings.Num() == 1 )
+	{
+		int32 CurrentCellIndex = 0;
+		for( auto CellIter = SelectedCells.CreateIterator(); CellIter; ++CellIter )
+		{
+			SetCellValue( *CellIter, CellStrings[0] );
+			
+			if ( bShowProgressDialog )
+			{
+				GWarn->UpdateProgress(CurrentCellIndex, SelectedCells.Num());
+				CurrentCellIndex++;
+			}
+		}
+	}
+	else
+	{
+		// Paste values into cells
+		while ( TargetCell.IsValid() && CurrentColumnIdx < CellStrings.Num() )
+		{
+			SetCellValue( TargetCell.ToSharedRef(), CellStrings[CurrentColumnIdx++] );
+
+			// Move to next column
+			TargetCell = GetNextCellInRow(TargetCell.ToSharedRef());
+
+			if ( ( !TargetCell.IsValid() || CurrentColumnIdx == CellStrings.Num() ) && CurrentRowIdx < RowStrings.Num() )
+			{
+				// Move to next row
+				TargetCell = GetNextCellInColumn(FirstCellInRow.ToSharedRef());
+
+				if ( TargetCell.IsValid() )
+				{
+					// Prepare data to operate on next row
+					CurrentColumnIdx = 0;
+					FirstCellInRow = TargetCell;
+					RowStrings[CurrentRowIdx++].ParseIntoArray(CellStrings, TEXT("\t"), false);
+					if (CellStrings.Num() == 0)
+					{
+						// Tried to parse an empty row string, create an empty cell string
+						CellStrings.Emplace(TEXT(""));
+					}
+				
+					if ( bShowProgressDialog )
+					{
+						GWarn->UpdateProgress(CurrentRowIdx, RowStrings.Num());
+					}
+				}
+			}
+		}
+	}
+	
+	GWarn->EndSlowTask();
+
+}
+
+TSharedPtr< IPropertyTableColumn > FPropertyTable::ScanForColumnWithSelectableCells( const int32 StartIndex, const int32 Step ) const
+{
+	TSharedPtr< IPropertyTableColumn > Column;
+	for (int ColumnIndex = StartIndex; ColumnIndex >= 0 && ColumnIndex < Columns.Num() && ( !Column.IsValid() || !Column->CanSelectCells() ); ColumnIndex += Step )
+	{
+		Column = Columns[ ColumnIndex ];
+	}
+
+	if ( !Column.IsValid() || !Column->CanSelectCells() )
+	{
+		return NULL;
+	}
+
+	return Column;
+}
+
+TSharedPtr< IPropertyTableRow > FPropertyTable::ScanForRowWithCells( const int32 StartIndex, const int32 Step ) const
+{
+	TSharedPtr< IPropertyTableRow > Row;
+	for (int RowIndex = StartIndex; RowIndex >= 0 && RowIndex < Rows.Num() && ( !Row.IsValid() || !Row->HasCells() ); RowIndex += Step )
+	{
+		Row = Rows[ RowIndex ];
+	}
+
+	if ( !Row.IsValid() || !Row->HasCells() )
+	{
+		return NULL;
+	}
+
+	return Row;
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetFirstCellInSelection() 
+{
+	return StartingCellSelectionRange;
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetLastCellInSelection()
+{
+	return EndingCellSelectionRange;
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetNextCellInRow( const TSharedRef< class IPropertyTableCell >& Cell ) 
+{
+	const int32 FoundIndex = Columns.Find( Cell->GetColumn() );
+
+	if ( FoundIndex == INDEX_NONE )
+	{
+		return NULL;
+	}
+
+	const int32 StartIndex = FoundIndex + 1;
+	const int32 Step = 1;
+	TSharedPtr< IPropertyTableColumn > NextColumn = ScanForColumnWithSelectableCells( StartIndex, Step );
+
+	if ( !NextColumn.IsValid() )
+	{
+		return NULL;
+	}
+
+	return NextColumn->GetCell( Cell->GetRow() );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetPreviousCellInRow( const TSharedRef< class IPropertyTableCell >& Cell ) 
+{
+	const int32 FoundIndex = Columns.Find( Cell->GetColumn() );
+
+	if ( FoundIndex == INDEX_NONE )
+	{
+		return NULL;
+	}
+
+	const int32 StartIndex = FoundIndex - 1;
+	const int32 Step = -1;
+	TSharedPtr< IPropertyTableColumn > PreviousColumn = ScanForColumnWithSelectableCells( StartIndex, Step );
+
+	if ( !PreviousColumn.IsValid() )
+	{
+		return NULL;
+	}
+
+	return PreviousColumn->GetCell( Cell->GetRow() );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetNextCellInColumn( const TSharedRef< class IPropertyTableCell >& Cell ) 
+{
+	const int32 FoundIndex = Rows.Find( Cell->GetRow() );
+
+	if ( FoundIndex == INDEX_NONE )
+	{
+		return NULL;
+	}
+
+	const int32 StartIndex = FoundIndex + 1;
+	const int32 Step = 1;
+	TSharedPtr< IPropertyTableRow > NextRow = ScanForRowWithCells( StartIndex, Step );
+
+	if ( !NextRow.IsValid() )
+	{
+		return NULL;
+	}
+
+	return Cell->GetColumn()->GetCell( NextRow.ToSharedRef() );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetPreviousCellInColumn( const TSharedRef< class IPropertyTableCell >& Cell ) 
+{
+	const int32 FoundIndex = Rows.Find( Cell->GetRow() );
+
+	if ( FoundIndex == INDEX_NONE )
+	{
+		return NULL;
+	}
+
+	const int32 StartIndex = FoundIndex - 1;
+	const int32 Step = -1;
+	TSharedPtr< IPropertyTableRow > NextRow = ScanForRowWithCells( StartIndex, Step );
+
+	if ( !NextRow.IsValid() )
+	{
+		return NULL;
+	}
+
+	return Cell->GetColumn()->GetCell( NextRow.ToSharedRef() );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetFirstCellInRow( const TSharedRef< class IPropertyTableRow >& Row )
+{
+	const int32 StartIndex = 0;
+	const int32 Step = 1;
+	TSharedPtr< IPropertyTableColumn > FirstColumn = ScanForColumnWithSelectableCells( StartIndex, Step );
+
+	if ( !FirstColumn.IsValid() )
+	{
+		return NULL;
+	}
+
+	return FirstColumn->GetCell( Row );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetLastCellInRow( const TSharedRef< class IPropertyTableRow >& Row )
+{
+	const int32 StartIndex = Columns.Num() - 1;
+	const int32 Step = -1;
+	TSharedPtr< IPropertyTableColumn > LastColumn = ScanForColumnWithSelectableCells( StartIndex, Step );
+
+	if ( !LastColumn.IsValid() )
+	{
+		return NULL;
+	}
+
+	return LastColumn->GetCell( Row );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetFirstCellInColumn( const TSharedRef< class IPropertyTableColumn >& Column )
+{
+	const int32 StartIndex = 0;
+	const int32 Step = 1;
+	TSharedPtr< IPropertyTableRow > FirstRow = ScanForRowWithCells( StartIndex, Step );
+
+	if ( !FirstRow.IsValid() )
+	{
+		return NULL;
+	}
+
+	return Column->GetCell( FirstRow.ToSharedRef() );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetLastCellInColumn( const TSharedRef< class IPropertyTableColumn >& Column )
+{
+	const int32 StartIndex = Rows.Num() - 1;
+	const int32 Step = -1;
+	TSharedPtr< IPropertyTableRow > LastRow = ScanForRowWithCells( StartIndex, Step );
+
+	if ( !LastRow.IsValid() )
+	{
+		return NULL;
+	}
+
+	return Column->GetCell( LastRow.ToSharedRef() );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetFirstCellInTable()
+{
+	const int32 StartIndex = 0;
+	const int32 Step = 1;
+	
+	TSharedPtr< IPropertyTableRow > FirstRow = ScanForRowWithCells( StartIndex, Step );
+
+	if ( !FirstRow.IsValid() )
+	{
+		return NULL;
+	}
+
+	TSharedPtr< IPropertyTableColumn > FirstColumn = ScanForColumnWithSelectableCells( StartIndex, Step );
+
+	if ( !FirstColumn.IsValid() )
+	{
+		return NULL;
+	}
+
+	return FirstColumn->GetCell( FirstRow.ToSharedRef() );
+}
+
+TSharedPtr< class IPropertyTableCell > FPropertyTable::GetLastCellInTable() 
+{
+	const int32 Step = -1;
+
+	const int32 RowStartIndex = Rows.Num() - 1;
+	TSharedPtr< IPropertyTableRow > LastRow = ScanForRowWithCells( RowStartIndex, Step );
+
+	if ( !LastRow.IsValid() )
+	{
+		return NULL;
+	}
+
+	const int32 ColumnStartIndex = Columns.Num() - 1;
+	TSharedPtr< IPropertyTableColumn > LastColumn = ScanForColumnWithSelectableCells( ColumnStartIndex, Step );
+
+	if ( !LastColumn.IsValid() )
+	{
+		return NULL;
+	}
+
+	return LastColumn->GetCell( LastRow.ToSharedRef() );
+}
+
+void FPropertyTable::SetCurrentCell( const TSharedPtr< class IPropertyTableCell >& Cell ) 
+{
+	if ( CurrentCell == Cell || !CanSelectCells() )
+	{
+		return;
+	}
+
+	if ( CurrentCell.IsValid() )
+	{
+		CurrentCell->ExitEditMode();
+	}
+
+	if ( Cell.IsValid() )
+	{
+		CurrentRow = Cell->GetRow();
+		CurrentColumn = Cell->GetColumn();
+	}
+
+	CurrentCell = Cell;
+
+	bool NotifySelectionChanged = false;
+	if ( CurrentRow.IsValid() && ( !SelectedRows.Contains( CurrentRow.ToSharedRef() ) || ( CurrentCell.IsValid() && !SelectedCells.Contains( CurrentCell.ToSharedRef() ) ) ) )
+	{
+		SelectedRows.Empty();
+		SelectedRows.Add( CurrentRow.ToSharedRef() );
+		NotifySelectionChanged = true;
+	}
+
+	if ( CurrentCell.IsValid() && !SelectedCells.Contains( CurrentCell.ToSharedRef() ) )
+	{
+		SelectedCells.Empty();
+		SelectedCells.Add( CurrentCell.ToSharedRef() );
+
+		StartingCellSelectionRange = CurrentCell;
+		EndingCellSelectionRange = CurrentCell;
+
+		NotifySelectionChanged = true;
+	}
+
+	if ( NotifySelectionChanged )
+	{
+		SelectionChanged.Broadcast();
+	}
+}
+
+void FPropertyTable::SetCurrentColumn( const TSharedPtr< class IPropertyTableColumn >& Column )
+{
+	if ( CurrentColumn == Column || !CanSelectCells() )
+	{
+		return;
+	}
+
+	CurrentColumn = Column;
+
+	if ( CurrentCell.IsValid() && CurrentCell->GetColumn() != Column )
+	{
+		CurrentCell->ExitEditMode();
+		CurrentCell = NULL;
+	}
+}
+
+void FPropertyTable::SetCurrentRow( const TSharedPtr< class IPropertyTableRow >& Row ) 
+{
+	if ( CurrentRow == Row || !CanSelectRows() )
+	{
+		return;
+	}
+
+	CurrentRow = Row;
+
+	if ( !CurrentRow.IsValid() || ( CurrentCell.IsValid() && CurrentCell->GetRow() != CurrentRow ) )
+	{
+		CurrentCell->ExitEditMode();
+		CurrentCell = NULL;
+	}
+
+	if ( CurrentRow.IsValid() && !SelectedRows.Contains( CurrentRow.ToSharedRef() ) )
+	{
+		SelectedRows.Empty();
+		SelectedRows.Add( CurrentRow.ToSharedRef() );
+		SelectionChanged.Broadcast();
+	}
+}
+
+void FPropertyTable::SetSelectedRows( const TSet< TSharedRef< IPropertyTableRow > >& InSelectedRows )
+{
+	SelectedColumns.Empty();
+	SelectedRows.Empty(); 
+
+	if ( !CanSelectRows() )
+	{
+		return;
+	}
+
+	SelectedRows.Append( InSelectedRows ); 
+
+	TSet< TSharedRef< IPropertyTableCell > > PreviouslySelectedCells( SelectedCells );
+
+	bool RemovedCells = false;
+	for( auto CellIter = PreviouslySelectedCells.CreateConstIterator(); CellIter; ++CellIter )
+	{
+		const TSharedRef< IPropertyTableCell > Cell = *CellIter;
+		if ( !SelectedRows.Contains( Cell->GetRow() ) )
+		{
+			SelectedCells.Remove( Cell );
+			SelectedColumns.Add( Cell->GetColumn() );
+			RemovedCells = true;
+		}
+	}
+
+	if ( RemovedCells )
+	{
+		StartingCellSelectionRange = NULL;
+		EndingCellSelectionRange = NULL;
+	}
+
+	if ( CurrentRow.IsValid() && !SelectedRows.Contains( CurrentRow.ToSharedRef() ) )
+	{
+		CurrentRow = NULL;
+	}
+
+	if ( CurrentColumn.IsValid() && !SelectedColumns.Contains( CurrentColumn.ToSharedRef() ) )
+	{
+		CurrentColumn = NULL;
+	}
+
+	if ( CurrentCell.IsValid() && !SelectedCells.Contains( CurrentCell.ToSharedRef() ) )
+	{
+		CurrentCell->ExitEditMode();
+		CurrentCell = NULL;
+	}
+
+	SelectionChanged.Broadcast();
+}
+
+void FPropertyTable::SetSelectedCells( const TSet< TSharedRef< class IPropertyTableCell > >& InSelectedCells )
+{
+	SelectedCells.Empty();
+
+	if ( !CanSelectCells() )
+	{
+		return;
+	}
+
+	SelectedCells.Append( InSelectedCells );
+
+	SelectedColumns.Empty();
+	SelectedRows.Empty();
+	TSharedPtr< IPropertyTableCell > LastCellInSet;
+
+	for( auto CellIter = SelectedCells.CreateConstIterator(); CellIter; ++CellIter )
+	{
+		LastCellInSet = *CellIter;
+		SelectedRows.Add( LastCellInSet->GetRow() );
+		SelectedColumns.Add( LastCellInSet->GetColumn() );
+	}
+
+	if ( CurrentRow.IsValid() && !SelectedRows.Contains( CurrentRow.ToSharedRef() ) )
+	{
+		CurrentRow = NULL;
+	}
+
+	if ( CurrentColumn.IsValid() && !SelectedColumns.Contains( CurrentColumn.ToSharedRef() ) )
+	{
+		CurrentColumn = NULL;
+	}
+
+	if ( LastCellInSet.IsValid() && SelectedCells.Num() == 1 )
+	{
+		StartingCellSelectionRange = LastCellInSet;
+		EndingCellSelectionRange = LastCellInSet;
+	}
+	else
+	{
+		StartingCellSelectionRange = NULL;
+		EndingCellSelectionRange = NULL;
+	}
+
+	if ( CurrentCell.IsValid() && !SelectedCells.Contains( CurrentCell.ToSharedRef() ) )
+	{
+		CurrentCell->ExitEditMode();
+		CurrentCell = NULL;
+	}
+
+	SelectionChanged.Broadcast();
+}
+
+void FPropertyTable::SelectCellRange( const TSharedRef< class IPropertyTableCell >& StartingCell, const TSharedRef< class IPropertyTableCell >& EndingCell )
+{
+	SelectedColumns.Empty();
+	SelectedRows.Empty();
+	SelectedCells.Empty();
+
+	const int32 StartingCellRowIndex = Rows.Find( StartingCell->GetRow() );
+	const int32 EndingCellRowIndex = Rows.Find( EndingCell->GetRow() );
+
+	for (int RowIndex = StartingCellRowIndex; RowIndex < Rows.Num() && RowIndex <= EndingCellRowIndex; RowIndex++)
+	{
+		SelectedRows.Add( Rows[ RowIndex ] );
+	}
+
+	const int32 StartingCellColumnIndex = Columns.Find( StartingCell->GetColumn() );
+	const int32 EndingCellColumnIndex = Columns.Find( EndingCell->GetColumn() );
+
+	for (int ColumnsIndex = StartingCellColumnIndex; ColumnsIndex < Columns.Num() && ColumnsIndex <= EndingCellColumnIndex; ColumnsIndex++)
+	{
+		SelectedColumns.Add( Columns[ ColumnsIndex ] );
+
+		for( auto RowIter = SelectedRows.CreateConstIterator(); RowIter; ++RowIter )
+		{
+			SelectedCells.Add( Columns[ ColumnsIndex ]->GetCell( *RowIter ) );
+		}
+	}
+
+	if ( CurrentRow.IsValid() && !SelectedRows.Contains( CurrentRow.ToSharedRef() ) )
+	{
+		CurrentRow = NULL;
+	}
+
+	if ( CurrentColumn.IsValid() && !SelectedColumns.Contains( CurrentColumn.ToSharedRef() ) )
+	{
+		CurrentColumn = NULL;
+	}
+
+	StartingCellSelectionRange = StartingCell;
+	EndingCellSelectionRange = EndingCell;
+
+	if ( CurrentCell.IsValid() && !SelectedCells.Contains( CurrentCell.ToSharedRef() ) )
+	{
+		CurrentCell->ExitEditMode();
+		CurrentCell = NULL;
+	}
+
+	SelectionChanged.Broadcast();
+}
+
+void FPropertyTable::GetSelectedTableObjects( TArray< TWeakObjectPtr< UObject > >& OutSelectedObjects) const
+{
+	for( auto RowIter = SelectedRows.CreateConstIterator(); RowIter; ++RowIter )
+	{
+		const TSharedRef< IPropertyTableRow > Row = *RowIter;
+		const TWeakObjectPtr< UObject > Object = Row->GetDataSource()->AsUObject();
+
+		if ( Object.IsValid() )
+		{
+			OutSelectedObjects.Add( Object );
+		}
+	}
+}
+
+void FPropertyTable::SetObjects( const TArray< TWeakObjectPtr< UObject > >& Objects )
+{
+	SourceObjects.Empty();
+	SourceObjects.Append( Objects );
+
+	UpdateColumns();
+	UpdateRows();
+
+	// Bind to object delegates, we can't do this at construction because the shared pointer isn't set up yet
+	/*
+	if (!ObjectsReplacedHandle.IsValid())
+	{
+		ObjectsReplacedHandle = FCoreUObjectDelegates::OnObjectsReplaced.AddSP(this, &FPropertyTable::OnObjectsReplaced);
+	}
+	*/
+}
+
+void FPropertyTable::SetObjects( const TArray< UObject* >& Objects )
+{
+	TArray<TWeakObjectPtr<UObject>> WeakObjects;
+	
+	for(UObject* Object : Objects)
+	{
+		WeakObjects.Add(Object);
+	}
+
+	SetObjects(WeakObjects);
+}
+/*
+void FPropertyTable::OnObjectsReplaced(const TMap<UObject*, UObject*>& ReplacementMap)
+{
+	bool bChangedAny = false;
+
+	// Fix up any objects in our source list that were replaced, then refresh UI
+	for (int32 i = 0; i < SourceObjects.Num(); i++)
+	{
+		UObject* SourceObject = SourceObjects[i].Get(true);
+		UObject* ReplacedObject = ReplacementMap.FindRef(SourceObject);
+
+		if (ReplacedObject && ReplacedObject != SourceObject)
+		{
+			SourceObjectPropertyNodes.Remove(SourceObject);
+			SourceObjects[i] = ReplacedObject;
+
+			bChangedAny = true;
+		}
+	}
+
+	if (bChangedAny)
+	{
+		// The update functions do not correctly handle partial reconstruction, so delete everything and reconstruct
+		ResetTable();
+
+		UpdateRows();
+		UpdateColumns();
+
+		// This reset our selection so broadcast it
+		SelectionChanged.Broadcast();
+	}
+}
+*/
+
+void FPropertyTable::SetShowRowHeader( const bool InShowRowHeader ) 
+{
+	ShowRowHeader = InShowRowHeader; 
+	UpdateColumns();
+}
+
+void FPropertyTable::SetShowObjectName( const bool InShowObjectName ) 
+{
+	ShowObjectName = InShowObjectName; 
+	UpdateColumns();
+}
+
+TSharedRef< FObjectPropertyNode > FPropertyTable::GetObjectPropertyNode( const TSharedRef< IPropertyTableColumn >& Column, const TSharedRef< IPropertyTableRow >& Row ) 
+{
+	TWeakObjectPtr< UObject > Object;
+	if( Orientation == EPropertyTableOrientation::AlignPropertiesInColumns )
+	{
+		Object = Row->GetDataSource()->AsUObject();
+	}
+	else
+	{
+		Object = Column->GetDataSource()->AsUObject();
+	}
+
+	return GetObjectPropertyNode( Object );
+}
+
+TSharedRef< FObjectPropertyNode > FPropertyTable::GetObjectPropertyNode( const TWeakObjectPtr< UObject >& Object ) 
+{
+	TSharedRef< FObjectPropertyNode >* ObjectNodePtr = SourceObjectPropertyNodes.Find( Object );
+
+	if( ObjectNodePtr != NULL )
+	{
+		return *ObjectNodePtr;
+	}
+
+	TSharedRef< FObjectPropertyNode > ObjectPropertyNode( new FObjectPropertyNode() );
+	ObjectPropertyNode->AddObject( Object.Get() );
+
+	FPropertyNodeInitParams InitParams;
+	InitParams.bCreateCategoryNodes = false;
+	ObjectPropertyNode->InitNode( InitParams );
+
+	SourceObjectPropertyNodes.Add( Object, ObjectPropertyNode );
+
+	return ObjectPropertyNode;
+}
+
+TSharedRef< IPropertyTableColumn > FPropertyTable::CreateColumn( const TWeakObjectPtr< UObject >& Object )
+{
+	return MakeShareable( new FPropertyTableColumn( SharedThis( this ), Object ) );
+}
+
+TSharedRef< IPropertyTableColumn > FPropertyTable::CreateColumn( const TWeakFieldPtr< FProperty >& Property )
+{
+	return MakeShareable( new FPropertyTableColumn( SharedThis( this ), FPropertyPath::Create( Property ) ) );
+}
+
+TSharedRef< IPropertyTableColumn > FPropertyTable::CreateColumn( const TSharedRef< FPropertyPath >& PropertyPath )
+{
+	return MakeShareable( new FPropertyTableColumn( SharedThis( this ), PropertyPath ) );
+}
+
+TSharedRef< IPropertyTableRow > FPropertyTable::CreateRow( const TWeakObjectPtr< UObject >& Object )
+{
+	return MakeShareable( new FPropertyTableRow( SharedThis( this ), Object ) );
+}
+
+TSharedRef< IPropertyTableRow > FPropertyTable::CreateRow( const TWeakFieldPtr< FProperty >& Property )
+{
+	return MakeShareable( new FPropertyTableRow( SharedThis( this ), FPropertyPath::Create( Property ) ) );
+}
+
+TSharedRef< IPropertyTableRow > FPropertyTable::CreateRow( const TSharedRef< FPropertyPath >& PropertyPath )
+{
+	return MakeShareable( new FPropertyTableRow( SharedThis( this ), PropertyPath ) );
+}
+
+void FPropertyTable::UpdateRows()
+{
+	if( Orientation == EPropertyTableOrientation::AlignPropertiesInColumns )
+	{
+		TMultiMap< UObject*, TSharedRef< IPropertyTableRow > > RowsMap;
+
+		for (int RowIdx = 0; RowIdx < Rows.Num(); ++RowIdx)
+		{
+			RowsMap.Add(Rows[RowIdx]->GetDataSource()->AsUObject().Get(), Rows[RowIdx]);
+		}
+
+		Rows.Empty();
+		for( auto ObjectIter = SourceObjects.CreateConstIterator(); ObjectIter; ++ObjectIter )
+		{
+			const TWeakObjectPtr< UObject >& Object = *ObjectIter;
+
+			if( Object.IsValid() )
+			{
+				const TSharedRef< FObjectPropertyNode > ObjectNode = GetObjectPropertyNode( Object );
+				const TSharedPtr< FPropertyNode > PropertyNode = FPropertyNode::FindPropertyNodeByPath( RootPath, ObjectNode );
+
+				//@todo This system will need to change in order to properly support arrays [11/30/2012 Justin.Sargent]
+				if ( PropertyNode.IsValid() )
+				{
+					FProperty* Property = PropertyNode->GetProperty();
+
+					if ( Property != NULL && Property->IsA( FArrayProperty::StaticClass() ) )
+					{
+						for (int ChildIdx = 0; ChildIdx < PropertyNode->GetNumChildNodes(); ChildIdx++)
+						{
+							TSharedPtr< FPropertyNode > ChildNode = PropertyNode->GetChildNode( ChildIdx );
+
+							FPropertyInfo Extension;
+							Extension.Property = ChildNode->GetProperty();
+							Extension.ArrayIndex = ChildNode->GetArrayIndex();
+							TSharedRef< FPropertyPath > Path = FPropertyPath::CreateEmpty()->ExtendPath( Extension );
+							TArray< TSharedRef< IPropertyTableRow > > MapResults;
+							bool Found = false;
+
+							RowsMap.MultiFind(Object.Get(), MapResults);
+
+							for (int MapIdx = 0; MapIdx < MapResults.Num(); ++MapIdx)
+							{
+								if (FPropertyPath::AreEqual(Path, MapResults[MapIdx]->GetPartialPath()))
+								{
+									Found = true;
+									Rows.Add(MapResults[MapIdx]);
+									break;
+								}
+							}
+
+							if (!Found)
+							{
+								Rows.Add( MakeShareable( new FPropertyTableRow( SharedThis( this ), Object, Path ) ) );
+							}
+						}
+					}
+					else
+					{
+						TArray< TSharedRef< IPropertyTableRow > > MapResults;
+						bool Found = false;
+
+						RowsMap.MultiFind(Object.Get(), MapResults);
+
+						for (int MapIdx = 0; MapIdx < MapResults.Num(); ++MapIdx)
+						{
+							if (MapResults[MapIdx]->GetPartialPath()->GetNumProperties() == 0)
+							{
+								Found = true;
+								Rows.Add(MapResults[MapIdx]);
+								break;
+							}
+						}
+
+						if (!Found)
+						{
+							Rows.Add( MakeShareable( new FPropertyTableRow( SharedThis( this ), Object ) ) );
+						}
+					}
+				}
+			}
+		}
+	}
+
+	const TSharedPtr< IPropertyTableColumn > Column = PrimarySortedByColumn.Pin();
+	if ( Column.IsValid() && PrimarySortMode != EColumnSortMode::None )
+	{
+		Column->Sort( Rows, PrimarySortMode, SecondarySortedByColumn.Pin(), SecondarySortMode);
+	}
+
+	RowsChanged.Broadcast();
+}
+
+void FPropertyTable::UpdateColumns()
+{
+	if( Orientation == EPropertyTableOrientation::AlignPropertiesInColumns)
+	{
+		TMultiMap< FProperty*, TSharedRef< IPropertyTableColumn > > ColumnsMap;
+		for (int ColumnIdx = 0; ColumnIdx < Columns.Num(); ++ColumnIdx)
+		{
+			TSharedRef< IDataSource > DataSource = Columns[ColumnIdx]->GetDataSource();
+			TSharedPtr< FPropertyPath > PropertyPath = DataSource->AsPropertyPath();
+			if( PropertyPath.IsValid() && PropertyPath->GetNumProperties() > 0 )
+			{
+				ColumnsMap.Add(PropertyPath->GetRootProperty().Property.Get(), Columns[ColumnIdx]);
+			}
+		}
+
+		Columns.Empty();
+
+		if ( ShowRowHeader )
+		{
+			TSharedRef< IPropertyTableColumn > NewColumn = MakeShareable( new FPropertyTableRowHeaderColumn( SharedThis( this ) ) );
+			Columns.Add( NewColumn );
+		}
+
+		if ( ShowObjectName )
+		{
+			TSharedRef< IPropertyTableColumn > NewColumn = MakeShareable( new FPropertyTableObjectNameColumn( SharedThis( this ) ) );
+			NewColumn->SetFrozen( true );
+			Columns.Add( NewColumn );
+		}
+
+		TArray< TWeakObjectPtr< UStruct > > UniqueTypes;
+		TArray< int > TypeCounter;
+
+		for( auto ObjectIter = SourceObjects.CreateConstIterator(); ObjectIter; ++ObjectIter )
+		{
+			auto Object = *ObjectIter;
+
+			if( !Object.IsValid() )
+			{
+				continue;
+			}
+
+			const TSharedRef< FObjectPropertyNode > RootObjectNode = GetObjectPropertyNode( Object );
+
+			TWeakObjectPtr< UStruct > Type;
+			if ( RootPath->GetNumProperties() == 0 )
+			{
+				Type = RootObjectNode->GetObjectBaseClass();
+			}
+			else
+			{
+				const TSharedPtr< FPropertyNode > PropertyNode = FPropertyNode::FindPropertyNodeByPath( RootPath, RootObjectNode );
+
+				if ( !PropertyNode.IsValid() )
+				{
+					continue;
+				}
+
+				const TWeakFieldPtr< FProperty > Property = PropertyNode->GetProperty();
+
+				if ( !Property.IsValid() || !Property->IsA( FStructProperty::StaticClass() ) )
+				{
+					continue;
+				}
+
+				FStructProperty* StructProperty = CastField< FStructProperty >( Property.Get() );
+				Type = StructProperty->Struct;
+			}
+
+			if ( !Type.IsValid() )
+			{
+				continue;
+			}
+
+			int FoundIndex = -1;
+			if ( UniqueTypes.Find( Type, /*OUT*/FoundIndex ) )
+			{
+				TypeCounter[ FoundIndex ] = TypeCounter[ FoundIndex ] + 1;
+				continue;
+			}
+
+			UniqueTypes.Add( Type );
+			TypeCounter.Add( 1 );
+		}
+
+		if ( UniqueTypes.Num() > 0 )
+		{
+			int HighestCountIndex = 0;
+			int HighestCount = 0;
+			for (int Index = 0; Index < TypeCounter.Num(); Index++)
+			{
+				if ( TypeCounter[Index] > HighestCount )
+				{
+					HighestCountIndex = Index;
+					HighestCount = TypeCounter[Index];
+				}
+			}
+
+			TWeakObjectPtr< UStruct > PrimaryType = UniqueTypes[ HighestCountIndex ];
+
+			for (TFieldIterator<FProperty> PropertyIter( PrimaryType.Get(), EFieldIteratorFlags::IncludeSuper); PropertyIter; ++PropertyIter)
+			{
+				TWeakFieldPtr< FProperty > Property = *PropertyIter;
+
+				// Don't expose CPF_NativeAccessSpecifierProtected and CPF_NativeAccessSpecifierPrivate properties
+				if ( PropertyIter->HasAllPropertyFlags(CPF_NativeAccessSpecifierPublic | CPF_AssetRegistrySearchable) )
+				{
+					TArray< TSharedRef< IPropertyTableColumn > > MapResults;
+
+					ColumnsMap.MultiFind(Property.Get(), MapResults);
+					if(MapResults.Num() > 0)
+					{
+						for (int MapIdx = 0; MapIdx < MapResults.Num(); ++MapIdx)
+						{
+							Columns.Add(MapResults[MapIdx]);
+						}
+					}
+					else
+					{
+						TSharedRef< IPropertyTableColumn > NewColumn = CreateColumn( Property );
+						Columns.Add( NewColumn );
+					}
+				}
+			}
+		}
+	}
+	else
+	{
+		Columns.Empty();
+
+		if( SourceObjects.Num() > 0 )
+		{
+			UClass* ObjectClass = SourceObjects[0]->GetClass();
+			TSharedRef< IPropertyTableColumn > HeadingColumn = MakeShareable( new FPropertyTablePropertyNameColumn( SharedThis( this ) ) );
+
+			Columns.Add( HeadingColumn );
+
+			for( auto ObjectIter = SourceObjects.CreateConstIterator(); ObjectIter; ++ObjectIter )
+			{
+				auto Object = *ObjectIter;
+
+				if( Object.IsValid() )
+				{
+					const TSharedRef< FObjectPropertyNode > ObjectNode = GetObjectPropertyNode( Object );
+					const TSharedPtr< FPropertyNode > PropertyNode = FPropertyNode::FindPropertyNodeByPath( RootPath, ObjectNode );
+
+					FProperty* Property = PropertyNode->GetProperty();
+					if ( Property != NULL && Property->IsA( FArrayProperty::StaticClass() ) )
+					{
+						for (int ChildIdx = 0; ChildIdx < PropertyNode->GetNumChildNodes(); ChildIdx++)
+						{
+							TSharedPtr< FPropertyNode > ChildNode = PropertyNode->GetChildNode( ChildIdx );
+							FPropertyInfo Extension;
+							Extension.Property = ChildNode->GetProperty();
+							Extension.ArrayIndex = ChildNode->GetArrayIndex();
+							TSharedRef< FPropertyPath > Path = FPropertyPath::CreateEmpty()->ExtendPath( Extension );
+							TSharedRef< IPropertyTableColumn > NewColumn = MakeShareable( new FPropertyTableColumn( SharedThis( this ), Object, Path ) );
+							Columns.Add( NewColumn );
+						}
+					}
+					else if (  Property != NULL )
+					{
+						TSharedRef< IPropertyTableColumn > NewColumn = MakeShareable( new FPropertyTableColumn( SharedThis( this ), Object ) );
+						Columns.Add( NewColumn );
+					}
+				}
+
+			}
+		}
+	}
+
+	ColumnsChanged.Broadcast();
+}
+
+} // namespace soda
+ 
+#undef LOCTEXT_NAMESPACE 
+ 
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.h
new file mode 100644
index 0000000..762b87e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTable.h
@@ -0,0 +1,238 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+//#include "AssetThumbnail.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+
+namespace soda
+{
+class IClassViewerFilter;
+
+class FPropertyTable : public TSharedFromThis< FPropertyTable >, public IPropertyTable
+{
+public: 
+
+	FPropertyTable();
+	virtual ~FPropertyTable();
+
+	virtual void Tick() override;
+
+	virtual void ForceRefresh() override;
+	virtual void RequestRefresh() override;
+
+	virtual FNotifyHook* GetNotifyHook() const override;
+	virtual bool AreFavoritesEnabled() const override;
+	virtual void ToggleFavorite( const TSharedRef< class FPropertyEditor >& PropertyEditor ) const override;
+	virtual void CreateColorPickerWindow( const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha ) const override;
+	virtual void EnqueueDeferredAction( FSimpleDelegate DeferredAction ) override;
+	//virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const override;
+	virtual void NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent) override {}
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const override;
+
+	virtual bool GetIsUserAllowedToChangeRoot() override;
+	virtual void SetIsUserAllowedToChangeRoot( bool InAllowUserToChangeRoot ) override;
+
+	virtual void AddColumn( const TWeakObjectPtr< UObject >& Object ) override;
+	virtual void AddColumn( const TWeakFieldPtr< FProperty >& Property ) override;
+	virtual void AddColumn( const TSharedRef< FPropertyPath >& PropertyPath ) override;
+	virtual void AddColumn( const TSharedRef< class IPropertyTableColumn >& Column ) override;
+	virtual void RemoveColumn( const TSharedRef< class IPropertyTableColumn >& Column ) override;
+
+	virtual void AddRow( const TWeakObjectPtr< UObject >& Object ) override;
+	virtual void AddRow( const TWeakFieldPtr< FProperty >& Property ) override;
+	virtual void AddRow( const TSharedRef< FPropertyPath >& PropertyPath ) override;
+	virtual void AddRow( const TSharedRef< class IPropertyTableRow >& Row ) override;
+	virtual void RemoveRow( const TSharedRef< class IPropertyTableRow >& Row ) override;
+
+	virtual const EPropertyTableOrientation::Type GetOrientation() const override { return Orientation; }
+	virtual void SetOrientation( EPropertyTableOrientation::Type InOrientation ) override;
+
+	virtual void SetRootPath( const TSharedPtr< FPropertyPath >& Path ) override;
+	virtual TSharedRef< FPropertyPath > GetRootPath() const override { return RootPath; }
+	virtual TArray< FPropertyInfo > GetPossibleExtensionsForPath( const TSharedRef< FPropertyPath >& Path ) const override;
+
+	virtual void GetSelectedTableObjects( TArray< TWeakObjectPtr< UObject > >& OutSelectedObjects) const override;
+
+	virtual const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const { return SourceObjects; }
+	virtual void SetObjects( const TArray< TWeakObjectPtr< UObject > >& Objects ) override;
+	virtual void SetObjects( const TArray< UObject* >& Objects ) override;
+
+	virtual TSharedRef< class FObjectPropertyNode > GetObjectPropertyNode( const TSharedRef< IPropertyTableColumn >& Column, const TSharedRef< IPropertyTableRow >& Row ) override;
+	virtual TSharedRef< class FObjectPropertyNode > GetObjectPropertyNode( const TWeakObjectPtr< UObject >& Object ) override;
+
+	virtual bool GetShowRowHeader() const override { return ShowRowHeader; }
+	virtual void SetShowRowHeader( const bool InShowRowHeader ) override;
+
+	virtual bool GetShowObjectName() const override { return ShowObjectName; }
+	virtual void SetShowObjectName( const bool ShowObjectName ) override;
+
+	virtual const TArray< TSharedRef< class IPropertyTableColumn > >& GetColumns() override { return Columns; }
+	virtual TArray< TSharedRef< class IPropertyTableRow > >& GetRows() override { return Rows; }
+
+	virtual const TSet< TSharedRef< class IPropertyTableRow > >& GetSelectedRows() override { return SelectedRows; }
+	virtual void SetSelectedRows( const TSet< TSharedRef< IPropertyTableRow > >& InSelectedRows ) override;
+
+	virtual const TSet< TSharedRef< class IPropertyTableCell > >& GetSelectedCells() override { return SelectedCells; }
+	virtual void SetSelectedCells( const TSet< TSharedRef< class IPropertyTableCell > >& InSelectedCells ) override;
+
+	virtual void SelectCellRange( const TSharedRef< class IPropertyTableCell >& StartingCell, const TSharedRef< class IPropertyTableCell >& EndingCell ) override;
+
+	virtual float GetItemHeight() const override { return ItemHeight; }
+	virtual void SetItemHeight( float NewItemHeight ) override { ItemHeight = NewItemHeight; }
+
+	virtual TSharedPtr< class IPropertyTableCell > GetLastClickedCell() const override { return LastClickedCell; }
+	virtual void SetLastClickedCell( const TSharedPtr< class IPropertyTableCell >& Cell ) override { LastClickedCell = Cell; }
+
+	virtual TSharedPtr< class IPropertyTableCell > GetCurrentCell() const override { return CurrentCell; }
+	virtual void SetCurrentCell( const TSharedPtr< class IPropertyTableCell >& Cell ) override;
+
+	virtual TSharedPtr< class IPropertyTableColumn > GetCurrentColumn() const override { return CurrentColumn; }
+	virtual void SetCurrentColumn( const TSharedPtr< class IPropertyTableColumn >& Column ) override;
+
+	virtual TSharedPtr< class IPropertyTableRow > GetCurrentRow() const override { return CurrentRow; }
+	virtual void SetCurrentRow( const TSharedPtr< class IPropertyTableRow >& Row ) override;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInSelection() override;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInSelection() override;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetNextCellInRow( const TSharedRef< class IPropertyTableCell >& Cell ) override;
+	virtual TSharedPtr< class IPropertyTableCell > GetPreviousCellInRow( const TSharedRef< class IPropertyTableCell >& Cell ) override;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetNextCellInColumn( const TSharedRef< class IPropertyTableCell >& Cell ) override;
+	virtual TSharedPtr< class IPropertyTableCell > GetPreviousCellInColumn( const TSharedRef< class IPropertyTableCell >& Cell ) override;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInRow( const TSharedRef< class IPropertyTableRow >& Row ) override;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInRow( const TSharedRef< class IPropertyTableRow >& Row ) override;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInColumn( const TSharedRef< class IPropertyTableColumn >& Column ) override;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInColumn( const TSharedRef< class IPropertyTableColumn >& Column ) override;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInTable() override;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInTable() override;
+
+	virtual EPropertyTableSelectionUnit::Type GetSelectionUnit() const override { return SelectionUnit; }
+	virtual void SetSelectionUnit( const EPropertyTableSelectionUnit::Type Unit ) override { SelectionUnit = Unit; }
+
+	virtual ESelectionMode::Type GetSelectionMode() const override { return SelectionMode; }
+	virtual void SetSelectionMode( const ESelectionMode::Type Mode ) override;
+
+	virtual EColumnSortPriority::Type GetColumnSortPriority(const TSharedRef< class IPropertyTableColumn > Column) const override;
+	virtual EColumnSortMode::Type GetColumnSortMode( const TSharedRef< class IPropertyTableColumn > Column ) const override;
+	virtual void SortByColumnWithId( const EColumnSortPriority::Type SortPriority, const FName& ColumnId, const EColumnSortMode::Type SortMode) override;
+	virtual void SortByColumn( const TSharedRef< class IPropertyTableColumn >& Column, EColumnSortMode::Type SortMode, const EColumnSortPriority::Type SortPriority ) override;
+
+	virtual void PasteTextAtCell( const FString& Text, const TSharedRef< class IPropertyTableCell >& Cell ) override;
+
+	DECLARE_DERIVED_EVENT( FPropertyTable, IPropertyTable::FSelectionChanged, FSelectionChanged );
+	FSelectionChanged* OnSelectionChanged() override { return &SelectionChanged; }
+
+	DECLARE_DERIVED_EVENT( FPropertyTable, IPropertyTable::FColumnsChanged, FColumnsChanged );
+	FColumnsChanged* OnColumnsChanged() override { return &ColumnsChanged; }
+
+	DECLARE_DERIVED_EVENT( FPropertyTable, IPropertyTable::FRowsChanged, FRowsChanged );
+	FRowsChanged* OnRowsChanged() override { return &RowsChanged; }
+
+	DECLARE_DERIVED_EVENT( FPropertyTable, IPropertyTable::FRootPathChanged, FRootPathChanged );
+	virtual FRootPathChanged* OnRootPathChanged() override { return &RootPathChanged; }
+
+	virtual bool IsPropertyEditingEnabled() const override { return true; }
+
+	virtual bool DontUpdateValueWhileEditing() const override
+	{
+		return false;
+	}
+
+	virtual bool HasClassDefaultObject() const
+	{
+		return false;
+	}
+private:
+
+	void UpdateColumns();
+	void UpdateRows();
+
+	bool CanSelectCells() const;
+	bool CanSelectRows() const;
+
+	TSharedPtr< IPropertyTableColumn > ScanForColumnWithSelectableCells( const int32 StartIndex, const int32 Step ) const;
+	TSharedPtr< IPropertyTableRow > ScanForRowWithCells( const int32 StartIndex, const int32 Step ) const;
+
+	TSharedRef< IPropertyTableRow > CreateRow( const TWeakObjectPtr< UObject >& Object );
+	TSharedRef< IPropertyTableRow > CreateRow( const TWeakFieldPtr< FProperty >& Property );
+	TSharedRef< IPropertyTableRow > CreateRow( const TSharedRef< FPropertyPath >& PropertyPath );
+
+	TSharedRef< IPropertyTableColumn > CreateColumn( const TWeakObjectPtr< UObject >& Object );
+	TSharedRef< IPropertyTableColumn > CreateColumn( const TWeakFieldPtr< FProperty >& Property );
+	TSharedRef< IPropertyTableColumn > CreateColumn( const TSharedRef< FPropertyPath >& PropertyPath );
+
+	void PurgeInvalidObjectNodes();
+
+	void ResetTable();
+
+	//void OnObjectsReplaced(const TMap<UObject*, UObject*>& ReplacementMap);
+
+private:
+
+	TArray< TWeakObjectPtr< UObject > > SourceObjects;
+	TMap< TWeakObjectPtr< UObject >, TSharedRef< FObjectPropertyNode > > SourceObjectPropertyNodes;
+	
+	TArray< TSharedRef< class IPropertyTableColumn > > Columns;
+	TArray< TSharedRef< class IPropertyTableRow > > Rows;
+
+	TSet< TSharedRef< class IPropertyTableColumn > > SelectedColumns;
+	TSet< TSharedRef< class IPropertyTableRow > > SelectedRows;
+	TSet< TSharedRef< class IPropertyTableCell > > SelectedCells;
+	TSharedPtr< class IPropertyTableCell > StartingCellSelectionRange;
+	TSharedPtr< class IPropertyTableCell > EndingCellSelectionRange;
+
+	TSharedPtr< class IPropertyTableRow > CurrentRow;
+	TSharedPtr< class IPropertyTableCell > CurrentCell;
+	TSharedPtr< class IPropertyTableColumn > CurrentColumn;
+
+	TSharedRef< FPropertyPath > RootPath;
+
+	EPropertyTableSelectionUnit::Type SelectionUnit;
+	ESelectionMode::Type SelectionMode;
+
+	bool ShowRowHeader;
+	bool ShowObjectName;
+
+	float ItemHeight;
+	TSharedPtr< class IPropertyTableCell > LastClickedCell;
+
+	/** Actions that should be executed next tick */
+	TArray<FSimpleDelegate> DeferredActions;
+
+	FSelectionChanged SelectionChanged;
+	FColumnsChanged ColumnsChanged;
+	FRowsChanged RowsChanged;
+	FRootPathChanged RootPathChanged;
+
+	TWeakPtr< class IPropertyTableColumn > PrimarySortedByColumn;
+	TWeakPtr< class IPropertyTableColumn > SecondarySortedByColumn;
+
+	EColumnSortMode::Type PrimarySortMode;
+	EColumnSortMode::Type SecondarySortMode;
+
+	bool AllowUserToChangeRoot;
+
+	/** Refresh the table contents? */
+	bool bRefreshRequested;
+
+	/** The Orientation of this table, I.e. do we swap columns and rows */
+	EPropertyTableOrientation::Type Orientation;
+
+	//FDelegateHandle ObjectsReplacedHandle;
+
+	TSharedRef<FEditConditionParser> EditConditionParser;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.cpp
new file mode 100644
index 0000000..386371d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.cpp
@@ -0,0 +1,178 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+
+namespace soda
+{
+
+FPropertyTableCell::FPropertyTableCell( const TSharedRef< class IPropertyTableColumn >& InColumn, const TSharedRef< class IPropertyTableRow >& InRow )
+	: bIsBound( false )
+	, bInEditMode( false )
+	, EnteredEditModeEvent()
+	, ExitedEditModeEvent()
+	, Column( InColumn )
+	, Row( InRow )
+	, PropertyNode( NULL )
+	, ObjectNode( NULL )
+	, PropertyEditor( NULL )
+{
+	Refresh();
+}
+
+void FPropertyTableCell::Refresh()
+{
+	const TSharedRef< IPropertyTableColumn > ColumnRef = Column.Pin().ToSharedRef();
+	const TSharedRef< IPropertyTableRow > RowRef = Row.Pin().ToSharedRef();
+
+	bIsBound = false;
+	ObjectNode = GetTable()->GetObjectPropertyNode( ColumnRef, RowRef );
+
+	if ( !ObjectNode.IsValid() )
+	{
+		return;
+	}
+
+	TSharedRef< IDataSource > ColumnBoundData = ColumnRef->GetDataSource();
+	TSharedRef< IDataSource > RowBoundData = RowRef->GetDataSource();
+
+	if ( !ColumnBoundData->IsValid() || !RowBoundData->IsValid() )
+	{
+		return;
+	}
+
+	TSharedPtr< FPropertyPath > PropertyPath;
+	TWeakObjectPtr< UObject > Item;
+
+	Item = ColumnBoundData->AsUObject();
+	if ( !Item.IsValid() )
+	{
+		Item = RowBoundData->AsUObject();
+	}
+
+	if ( !Item.IsValid() )
+	{
+		// Must have a valid non-FProperty UObject bound to the column or row
+		return;
+	}
+
+	PropertyPath = ColumnBoundData->AsPropertyPath();
+	if ( !PropertyPath.IsValid() )
+	{
+		PropertyPath = RowBoundData->AsPropertyPath();
+	}
+
+	if ( !PropertyPath.IsValid() )
+	{
+		// By this point a valid PropertyPath must have been found or created
+		return;
+	}
+
+	PropertyNode = FPropertyNode::FindPropertyNodeByPath( GetTable()->GetRootPath(), ObjectNode.ToSharedRef() );
+
+	if ( !PropertyNode.IsValid() )
+	{
+		return;
+	}
+
+	PropertyNode = FPropertyNode::FindPropertyNodeByPath( RowRef->GetPartialPath(), PropertyNode.ToSharedRef() );
+
+	if ( !PropertyNode.IsValid() )
+	{
+		return;
+	}
+
+	PropertyNode = FPropertyNode::FindPropertyNodeByPath( ColumnRef->GetPartialPath(), PropertyNode.ToSharedRef() );
+
+	if ( !PropertyNode.IsValid() )
+	{
+		return;
+	}
+
+	PropertyNode = FPropertyNode::FindPropertyNodeByPath( PropertyPath, PropertyNode.ToSharedRef() );
+
+	if ( PropertyNode.IsValid() )
+	{
+		bIsBound = true;
+		PropertyEditor = FPropertyEditor::Create( PropertyNode.ToSharedRef(), GetTable() );
+	}
+}
+
+bool FPropertyTableCell::IsReadOnly() const 
+{ 
+	return !IsBound() || PropertyEditor->IsEditConst() || ( PropertyEditor->HasEditCondition() && !PropertyEditor->IsEditConditionMet() );
+}
+
+bool FPropertyTableCell::IsValid() const
+{
+	return !IsBound() || (PropertyEditor->GetPropertyHandle()->GetProperty() != NULL);
+}
+
+FString FPropertyTableCell::GetValueAsString() const
+{
+	return IsBound() ? PropertyEditor->GetValueAsString() : FString();
+}
+
+FText FPropertyTableCell::GetValueAsText() const
+{
+	return IsBound() ? PropertyEditor->GetValueAsText() : FText::GetEmpty();
+}
+
+void FPropertyTableCell::SetValueFromString( const FString& InString )
+{
+	if ( IsReadOnly() )
+	{
+		return;
+	}
+
+	TSharedRef< IPropertyHandle > Handle = PropertyEditor->GetPropertyHandle();
+	Handle->SetValueFromFormattedString( InString );
+}
+
+TWeakObjectPtr< UObject > FPropertyTableCell::GetObject() const
+{
+	if ( !ObjectNode.IsValid() )
+	{
+		return NULL;
+	}
+
+	return ObjectNode->GetUObject( 0 );
+}
+
+TSharedRef< class IPropertyTable > FPropertyTableCell::GetTable() const
+{
+	return Column.Pin()->GetTable();
+}
+
+TSharedPtr< class IPropertyHandle > FPropertyTableCell::GetPropertyHandle() const 
+{ 
+	if( IsBound() ) 
+	{
+		return PropertyEditor->GetPropertyHandle(); 
+	}
+	return NULL;
+}
+
+void FPropertyTableCell::EnterEditMode() 
+{
+	if ( !bInEditMode )
+	{
+		TSharedRef< IPropertyTable > Table = GetTable();
+		Table->SetCurrentCell( SharedThis( this ) );
+		bInEditMode = true;
+		EnteredEditModeEvent.Broadcast();
+	}
+}
+
+void FPropertyTableCell::ExitEditMode()
+{
+	if ( bInEditMode )
+	{
+		bInEditMode = false;
+		ExitedEditModeEvent.Broadcast();
+	}
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.h
new file mode 100644
index 0000000..eb155f0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.h
@@ -0,0 +1,72 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+
+namespace soda
+{
+
+class FPropertyEditor;
+
+class FPropertyTableCell : public TSharedFromThis< FPropertyTableCell >, public IPropertyTableCell
+{
+public:
+
+	FPropertyTableCell( const TSharedRef< class IPropertyTableColumn >& InColumn, const TSharedRef< class IPropertyTableRow >& InRow );
+
+	virtual ~FPropertyTableCell() {}
+
+	virtual void Refresh() override;
+
+	virtual bool IsReadOnly() const override;
+	virtual bool IsBound() const override { return bIsBound; }
+	virtual bool InEditMode() const override { return bInEditMode; }
+	virtual bool IsValid() const override;
+
+	virtual FString GetValueAsString() const override;
+	virtual FText GetValueAsText() const override;
+	virtual void SetValueFromString( const FString& InString ) override;
+
+	virtual TWeakObjectPtr< UObject > GetObject() const override;
+	virtual TSharedPtr< class FPropertyNode > GetNode() const override { return PropertyNode; }
+	virtual TSharedRef< class IPropertyTableColumn > GetColumn() const override { return Column.Pin().ToSharedRef(); }
+	virtual TSharedRef< class IPropertyTableRow > GetRow() const override { return Row.Pin().ToSharedRef(); }
+	virtual TSharedRef< class IPropertyTable > GetTable() const override;
+	virtual TSharedPtr< class IPropertyHandle > GetPropertyHandle() const override;
+
+	virtual void EnterEditMode() override;
+	virtual void ExitEditMode() override;
+
+	DECLARE_DERIVED_EVENT( FPropertyTableCell, IPropertyTableCell::FEnteredEditModeEvent, FEnteredEditModeEvent );
+	virtual FEnteredEditModeEvent& OnEnteredEditMode() override { return EnteredEditModeEvent; }
+
+	DECLARE_DERIVED_EVENT( FPropertyTableCell, IPropertyTableCell::FExitedEditModeEvent, FExitedEditModeEvent  );
+	virtual FExitedEditModeEvent& OnExitedEditMode() override { return ExitedEditModeEvent; }
+
+
+private:
+
+	bool bIsBound;
+	bool bInEditMode;
+
+	FEnteredEditModeEvent EnteredEditModeEvent;
+	FExitedEditModeEvent ExitedEditModeEvent;
+
+	TWeakPtr< class IPropertyTableColumn > Column;
+	TWeakPtr< class IPropertyTableRow > Row;
+
+	TSharedPtr< class FPropertyNode > PropertyNode;
+	TSharedPtr< class FObjectPropertyNode > ObjectNode;
+
+	TSharedPtr< FPropertyEditor > PropertyEditor;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.cpp
new file mode 100644
index 0000000..d382e4a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.cpp
@@ -0,0 +1,833 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h"
+//#include "Editor/EditorEngine.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "UObject/TextProperty.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyTableColumn"
+
+namespace soda
+{
+
+struct FCompareRowByColumnBase
+{
+	virtual int32 Compare(const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs) const = 0;
+	virtual ~FCompareRowByColumnBase() {}
+};
+
+struct FCompareRowPrimaryAndSecondary
+{
+	FCompareRowPrimaryAndSecondary(FCompareRowByColumnBase* InPrimarySort, FCompareRowByColumnBase* InSecondarySort)
+		: PrimarySort(InPrimarySort)
+		, SecondarySort(InSecondarySort)
+	{}
+	
+	bool operator()(const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs) const
+	{
+		const int32 PrimaryResult = PrimarySort->Compare(Lhs, Rhs);
+		if (PrimaryResult != 0 || !SecondarySort)
+		{
+			return PrimaryResult < 0;
+		}
+		else
+		{
+			return SecondarySort->Compare(Lhs, Rhs) < 0;
+		}
+	}
+private:
+	FCompareRowByColumnBase* PrimarySort;
+	FCompareRowByColumnBase* SecondarySort;
+
+};
+
+
+
+template< typename FPropertyType >
+struct FCompareRowByColumnAscending : public FCompareRowByColumnBase
+{
+public:
+	FCompareRowByColumnAscending( const TSharedRef< IPropertyTableColumn >& InColumn, const FPropertyType* InFProperty )
+		: Property( InFProperty )
+		, Column( InColumn )
+	{
+
+	}
+
+	int32 Compare( const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs ) const
+	{
+		const TSharedRef< IPropertyTableCell > LhsCell = Column->GetCell( Lhs );
+		const TSharedRef< IPropertyTableCell > RhsCell = Column->GetCell( Rhs );
+
+		const TSharedPtr< FPropertyNode > LhsPropertyNode = LhsCell->GetNode();
+		if ( !LhsPropertyNode.IsValid() )
+		{
+			return 1;
+		}
+
+		const TSharedPtr< FPropertyNode > RhsPropertyNode = RhsCell->GetNode();
+		if ( !RhsPropertyNode.IsValid() )
+		{
+			return -1;
+		}
+
+		const TSharedPtr< IPropertyHandle > LhsPropertyHandle = PropertyEditorHelpers::GetPropertyHandle( LhsPropertyNode.ToSharedRef(), NULL, NULL );
+		if ( !LhsPropertyHandle.IsValid() )
+		{
+			return 1;
+		}
+
+		const TSharedPtr< IPropertyHandle > RhsPropertyHandle = PropertyEditorHelpers::GetPropertyHandle( RhsPropertyNode.ToSharedRef(), NULL, NULL );
+		if ( !RhsPropertyHandle.IsValid() )
+		{
+			return -1;
+		}
+
+		return ComparePropertyValue( LhsPropertyHandle, RhsPropertyHandle );
+	}
+
+private:
+
+	int32 ComparePropertyValue( const TSharedPtr< IPropertyHandle >& LhsPropertyHandle, const TSharedPtr< IPropertyHandle >& RhsPropertyHandle ) const
+	{
+		typename FPropertyType::TCppType LhsValue; 
+		LhsPropertyHandle->GetValue( LhsValue );
+
+		typename FPropertyType::TCppType RhsValue; 
+		RhsPropertyHandle->GetValue( RhsValue );
+
+		if (LhsValue < RhsValue)
+		{
+			return -1;
+		}
+		else if (LhsValue > RhsValue)
+		{
+			return 1;
+		}
+
+		return 0;
+	}
+
+private:
+
+	const FPropertyType* Property;
+	TSharedRef< IPropertyTableColumn > Column;
+};
+
+template< typename FPropertyType >
+struct FCompareRowByColumnDescending : public FCompareRowByColumnBase
+{
+public:
+	FCompareRowByColumnDescending( const TSharedRef< IPropertyTableColumn >& InColumn, const FPropertyType* InFProperty )
+		: Comparer( InColumn, InFProperty )
+	{
+
+	}
+
+	int32 Compare( const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs ) const override
+	{
+		return Comparer.Compare(Rhs, Lhs);
+	}
+
+
+private:
+
+	const FCompareRowByColumnAscending< FPropertyType > Comparer;
+};
+
+struct FCompareRowByColumnUsingExportTextLexicographic : public FCompareRowByColumnBase
+{
+public:
+	FCompareRowByColumnUsingExportTextLexicographic( const TSharedRef< IPropertyTableColumn >& InColumn, const FProperty* InFProperty, bool InAscendingOrder )
+		: Property( InFProperty )
+		, Column( InColumn )
+		, bAscending( InAscendingOrder )
+	{
+
+	}
+
+	int32 Compare( const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs ) const
+	{
+		const TSharedRef< IPropertyTableCell > LhsCell = Column->GetCell( Lhs );
+		const TSharedRef< IPropertyTableCell > RhsCell = Column->GetCell( Rhs );
+
+		const TSharedPtr< FPropertyNode > LhsPropertyNode = LhsCell->GetNode();
+		if ( !LhsPropertyNode.IsValid() )
+		{
+			return 1;
+		}
+
+		const TSharedPtr< FPropertyNode > RhsPropertyNode = RhsCell->GetNode();
+		if ( !RhsPropertyNode.IsValid() )
+		{
+			return -1;
+		}
+
+		const TSharedPtr< IPropertyHandle > LhsPropertyHandle = PropertyEditorHelpers::GetPropertyHandle( LhsPropertyNode.ToSharedRef(), NULL, NULL );
+		if ( !LhsPropertyHandle.IsValid() )
+		{
+			return 1;
+		}
+
+		const TSharedPtr< IPropertyHandle > RhsPropertyHandle = PropertyEditorHelpers::GetPropertyHandle( RhsPropertyNode.ToSharedRef(), NULL, NULL );
+		if ( !RhsPropertyHandle.IsValid() )
+		{
+			return -1;
+		}
+
+		return ComparePropertyValue( LhsPropertyHandle, RhsPropertyHandle );
+	}
+
+private:
+
+	int32 ComparePropertyValue( const TSharedPtr< IPropertyHandle >& LhsPropertyHandle, const TSharedPtr< IPropertyHandle >& RhsPropertyHandle ) const
+	{
+		FString LhsValue; 
+		LhsPropertyHandle->GetValueAsDisplayString( LhsValue );
+
+		FString RhsValue; 
+		RhsPropertyHandle->GetValueAsDisplayString( RhsValue );
+
+		if (LhsValue < RhsValue)
+		{
+			return bAscending ? -1 : 1;
+		}
+		else if (LhsValue > RhsValue)
+		{
+			return bAscending ? 1: -1;
+		}
+
+		return 0;
+	}
+
+private:
+
+	const FProperty* Property;
+	TSharedRef< IPropertyTableColumn > Column;
+	bool bAscending;
+};
+
+
+
+template<>
+FORCEINLINE int32 FCompareRowByColumnAscending<FEnumProperty>::ComparePropertyValue( const TSharedPtr< IPropertyHandle >& LhsPropertyHandle, const TSharedPtr< IPropertyHandle >& RhsPropertyHandle ) const
+{
+	// Only Bytes work right now
+
+	// Get the basic uint8 values
+	uint8 LhsValue; 
+	LhsPropertyHandle->GetValue( LhsValue );
+
+	uint8 RhsValue; 
+	RhsPropertyHandle->GetValue( RhsValue );
+
+	// Bytes are trivially sorted numerically
+	UEnum* PropertyEnum = Property->GetEnum();
+
+	// Enums are sorted alphabetically based on the full enum entry name - must be sure that values are within Enum bounds!
+	int32 LhsIndex = PropertyEnum->GetIndexByValue(LhsValue);
+	int32 RhsIndex = PropertyEnum->GetIndexByValue(RhsValue);
+	bool bLhsEnumValid = LhsIndex != INDEX_NONE;
+	bool bRhsEnumValid = RhsIndex != INDEX_NONE;
+	if (bLhsEnumValid && bRhsEnumValid)
+	{
+		FName LhsEnumName(PropertyEnum->GetNameByIndex(LhsIndex));
+		FName RhsEnumName(PropertyEnum->GetNameByIndex(RhsIndex));
+		return LhsEnumName.Compare(RhsEnumName);
+	}
+	else if(bLhsEnumValid)
+	{
+		return -1;
+	}
+	else if(bRhsEnumValid)
+	{
+		return 1;
+	}
+	else
+	{
+		return RhsValue - LhsValue;
+	}
+}
+
+// FByteProperty objects may in fact represent Enums - so they need special handling for alphabetic Enum vs. numerical Byte sorting.
+template<>
+FORCEINLINE int32 FCompareRowByColumnAscending<FByteProperty>::ComparePropertyValue( const TSharedPtr< IPropertyHandle >& LhsPropertyHandle, const TSharedPtr< IPropertyHandle >& RhsPropertyHandle ) const
+{
+	// Get the basic uint8 values
+	uint8 LhsValue; 
+	LhsPropertyHandle->GetValue( LhsValue );
+
+	uint8 RhsValue; 
+	RhsPropertyHandle->GetValue( RhsValue );
+
+	// Bytes are trivially sorted numerically
+	UEnum* PropertyEnum = Property->GetIntPropertyEnum();
+	if(PropertyEnum == nullptr)
+	{
+		return LhsValue < RhsValue;
+	}
+	else
+	{
+		int32 LhsIndex = PropertyEnum->GetIndexByValue(LhsValue);
+		int32 RhsIndex = PropertyEnum->GetIndexByValue(RhsValue);
+		// But Enums are sorted alphabetically based on the full enum entry name - must be sure that values are within Enum bounds!
+		bool bLhsEnumValid = LhsIndex != INDEX_NONE;
+		bool bRhsEnumValid = RhsIndex != INDEX_NONE;
+		if(bLhsEnumValid && bRhsEnumValid)
+		{
+			FName LhsEnumName(PropertyEnum->GetNameByIndex(LhsIndex));
+			FName RhsEnumName(PropertyEnum->GetNameByIndex(RhsIndex));
+			return LhsEnumName.Compare(RhsEnumName);
+		}
+		else if(bLhsEnumValid)
+		{
+			return true;
+		}
+		else if(bRhsEnumValid)
+		{
+			return false;
+		}
+		else
+		{
+			return RhsValue - LhsValue;
+		}
+	}
+}
+
+template<>
+FORCEINLINE int32 FCompareRowByColumnAscending<FNameProperty>::ComparePropertyValue( const TSharedPtr< IPropertyHandle >& LhsPropertyHandle, const TSharedPtr< IPropertyHandle >& RhsPropertyHandle ) const
+{
+	FName LhsValue; 
+	LhsPropertyHandle->GetValue( LhsValue );
+
+	FName RhsValue; 
+	RhsPropertyHandle->GetValue( RhsValue );
+
+	return LhsValue.Compare(RhsValue);
+}
+
+template<>
+FORCEINLINE int32 FCompareRowByColumnAscending<FObjectPropertyBase>::ComparePropertyValue( const TSharedPtr< IPropertyHandle >& LhsPropertyHandle, const TSharedPtr< IPropertyHandle >& RhsPropertyHandle ) const
+{
+	UObject* LhsValue; 
+	LhsPropertyHandle->GetValue( LhsValue );
+
+	if ( LhsValue == NULL )
+	{
+		return 1;
+	}
+
+	UObject* RhsValue; 
+	RhsPropertyHandle->GetValue( RhsValue );
+
+	if ( RhsValue == NULL )
+	{
+		return -1;
+	}
+
+	return FCString::Stricmp(*LhsValue->GetName(), *RhsValue->GetName());
+}
+
+template<>
+FORCEINLINE int32 FCompareRowByColumnAscending<FStructProperty>::ComparePropertyValue( const TSharedPtr< IPropertyHandle >& LhsPropertyHandle, const TSharedPtr< IPropertyHandle >& RhsPropertyHandle ) const
+{
+	if ( !FPropertyTableColumn::IsSupportedStructProperty(LhsPropertyHandle->GetProperty() ) )
+	{
+		return 1;
+	}
+
+	if ( !FPropertyTableColumn::IsSupportedStructProperty(RhsPropertyHandle->GetProperty() ) )
+	{
+		return -1;
+	}
+
+	{
+		FVector LhsVector;
+		FVector RhsVector;
+
+		if ( LhsPropertyHandle->GetValue(LhsVector) != FPropertyAccess::Fail && RhsPropertyHandle->GetValue(RhsVector) != FPropertyAccess::Fail )
+		{
+			return RhsVector.SizeSquared() - LhsVector.SizeSquared();
+		}
+
+		FVector2D LhsVector2D;
+		FVector2D RhsVector2D;
+
+		if ( LhsPropertyHandle->GetValue(LhsVector2D) != FPropertyAccess::Fail && RhsPropertyHandle->GetValue(RhsVector2D) != FPropertyAccess::Fail )
+		{
+			return RhsVector2D.SizeSquared() - LhsVector2D.SizeSquared();
+		}
+
+		FVector4 LhsVector4;
+		FVector4 RhsVector4;
+
+		if ( LhsPropertyHandle->GetValue(LhsVector4) != FPropertyAccess::Fail && RhsPropertyHandle->GetValue(RhsVector4) != FPropertyAccess::Fail )
+		{
+			return RhsVector4.SizeSquared() - LhsVector4.SizeSquared();
+		}
+	}
+
+	ensureMsgf(false, TEXT("A supported struct property does not have a defined implementation for sorting a property column."));
+	return 0;
+}
+
+
+FPropertyTableColumn::FPropertyTableColumn( const TSharedRef< IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject )
+	: Cells()
+	, DataSource( MakeShareable( new UObjectDataSource( InObject.Get() ) ) )
+	, Table( InTable )
+	, Id( NAME_None )
+	, DisplayName()
+	, Width( 1.0f )
+	, bIsHidden( false )
+	, bIsFrozen( false )
+	, PartialPath( FPropertyPath::CreateEmpty() )
+	, SizeMode(EPropertyTableColumnSizeMode::Fill)
+{
+	GenerateColumnId();
+	GenerateColumnDisplayName();
+}
+
+FPropertyTableColumn::FPropertyTableColumn( const TSharedRef< IPropertyTable >& InTable, const TSharedRef< FPropertyPath >& InPropertyPath )
+	: Cells()
+	, DataSource( MakeShareable( new PropertyPathDataSource( InPropertyPath ) ) )
+	, Table( InTable )
+	, Id( NAME_None )
+	, DisplayName()
+	, Width( 1.0f )
+	, bIsHidden( false )
+	, bIsFrozen( false )
+	, PartialPath( FPropertyPath::CreateEmpty() )
+	, SizeMode(EPropertyTableColumnSizeMode::Fill)
+{
+	GenerateColumnId();
+	GenerateColumnDisplayName();
+}
+
+FPropertyTableColumn::FPropertyTableColumn( const TSharedRef< class IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject, const TSharedRef< FPropertyPath >& InPartialPropertyPath )
+	: Cells()
+	, DataSource( MakeShareable( new UObjectDataSource( InObject.Get() ) ) )
+	, Table( InTable )
+	, Id( NAME_None )
+	, DisplayName()
+	, Width( 1.0f )
+	, bIsHidden( false )
+	, bIsFrozen( false )
+	, PartialPath( InPartialPropertyPath )
+	, SizeMode(EPropertyTableColumnSizeMode::Fill)
+{
+	GenerateColumnId();
+}
+
+
+void FPropertyTableColumn::GenerateColumnId()
+{
+	TWeakObjectPtr< UObject > Object = DataSource->AsUObject();
+	TSharedPtr< FPropertyPath > PropertyPath = DataSource->AsPropertyPath();
+
+	// Use partial path for a valid column ID if we have one. We are pointing to a container with an array, but all columns must be unique
+	if ( PartialPath->GetNumProperties() > 0 )
+	{
+		Id = FName( *PartialPath->ToString());
+	}
+	else if ( Object.IsValid() )
+	{
+		Id = Object->GetFName();
+	}
+	else if ( PropertyPath.IsValid() )
+	{
+		Id = FName( *PropertyPath->ToString() );
+	}
+	else
+	{
+		Id = NAME_None;
+	}
+}
+
+void FPropertyTableColumn::GenerateColumnDisplayName()
+{
+	TWeakObjectPtr< UObject > Object = DataSource->AsUObject();
+	TSharedPtr< FPropertyPath > PropertyPath = DataSource->AsPropertyPath();
+
+	if ( Object.IsValid() )
+	{
+		DisplayName = FText::FromString(Object->GetFName().ToString());
+	}
+	else if ( PropertyPath.IsValid() )
+	{
+		//@todo unify this logic with all the property editors [12/11/2012 Justin.Sargent]
+		FString NewName;
+		bool FirstAddition = true;
+		const FPropertyInfo* PreviousPropInfo = NULL;
+		for (int PropertyIndex = 0; PropertyIndex < PropertyPath->GetNumProperties(); PropertyIndex++)
+		{
+			const FPropertyInfo& PropInfo = PropertyPath->GetPropertyInfo( PropertyIndex );
+
+			if ( !(PropInfo.Property->IsA( FArrayProperty::StaticClass() ) && PropertyIndex != PropertyPath->GetNumProperties() - 1 ) )
+			{
+				if ( !FirstAddition )
+				{
+					NewName += TEXT( "->" );
+				}
+
+				FString PropertyName = FRuntimeMetaData::GetDisplayNameText(PropInfo.Property.Get()).ToString();
+
+				if ( PropertyName.IsEmpty() )
+				{
+					PropertyName = PropInfo.Property->GetName();
+
+					const bool bIsBoolProperty = CastField<const FBoolProperty>( PropInfo.Property.Get() ) != NULL;
+
+					if ( PreviousPropInfo != NULL )
+					{
+						const FStructProperty* ParentStructProperty = CastField<const FStructProperty>( PreviousPropInfo->Property.Get() );
+						if( ParentStructProperty && ParentStructProperty->Struct->GetFName() == NAME_Rotator )
+						{
+							if( PropInfo.Property->GetFName() == "Roll" )
+							{
+								PropertyName = TEXT("X");
+							}
+							else if( PropInfo.Property->GetFName() == "Pitch" )
+							{
+								PropertyName = TEXT("Y");
+							}
+							else if( PropInfo.Property->GetFName() == "Yaw" )
+							{
+								PropertyName = TEXT("Z");
+							}
+							else
+							{
+								check(0);
+							}
+						}
+					}
+
+					PropertyName = FName::NameToDisplayString( PropertyName, bIsBoolProperty );
+				}
+
+				NewName += PropertyName;
+
+				if ( PropInfo.ArrayIndex != INDEX_NONE )
+				{
+					NewName += FString::Printf( TEXT( "[%d]" ), PropInfo.ArrayIndex );
+				}
+
+				PreviousPropInfo = &PropInfo;
+				FirstAddition = false;
+			}
+		}
+
+		DisplayName = FText::FromString(*NewName);
+	}
+	else
+	{
+		DisplayName = LOCTEXT( "InvalidColumnName", "Invalid Property" );
+	}
+}
+
+FName FPropertyTableColumn::GetId() const 
+{ 
+	return Id;
+}
+
+FText FPropertyTableColumn::GetDisplayName() const 
+{ 
+	return DisplayName;
+}
+
+TSharedRef< IPropertyTableCell > FPropertyTableColumn::GetCell( const TSharedRef< class IPropertyTableRow >& Row ) 
+{
+	//@todo Clean Cells cache when rows get updated [11/27/2012 Justin.Sargent]
+	TSharedRef< IPropertyTableCell >* CellPtr = Cells.Find( Row );
+
+	if( CellPtr != NULL )
+	{
+		return *CellPtr;
+	}
+
+	TSharedRef< IPropertyTableCell > Cell = MakeShareable( new FPropertyTableCell( SharedThis( this ), Row ) );
+	Cells.Add( Row, Cell );
+
+	return Cell;
+}
+
+void FPropertyTableColumn::RemoveCellsForRow( const TSharedRef< class IPropertyTableRow >& Row )
+{
+	Cells.Remove( Row );
+}
+
+TSharedRef< class IPropertyTable > FPropertyTableColumn::GetTable() const
+{
+	return Table.Pin().ToSharedRef();
+}
+
+bool FPropertyTableColumn::CanSortBy() const
+{
+	TWeakObjectPtr< UObject > Object = DataSource->AsUObject();
+	FProperty* Property = nullptr;
+
+	TSharedPtr< FPropertyPath > Path = DataSource->AsPropertyPath();
+	if ( Path.IsValid() )
+	{
+		Property = Path->GetLeafMostProperty().Property.Get();
+	}
+
+	return ( Property != nullptr );
+}
+
+TSharedPtr<FCompareRowByColumnBase> FPropertyTableColumn::GetPropertySorter(FProperty* Property, EColumnSortMode::Type SortMode)
+{
+	if (Property->IsA(FEnumProperty::StaticClass()))
+	{
+		FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FEnumProperty>(SharedThis(this), EnumProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FEnumProperty>(SharedThis(this), EnumProperty));
+		}
+	}
+	else if (Property->IsA(FByteProperty::StaticClass()))
+	{
+		FByteProperty* ByteProperty = CastField<FByteProperty>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FByteProperty>(SharedThis(this), ByteProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FByteProperty>(SharedThis(this), ByteProperty));
+		}
+	}
+	else if (Property->IsA(FIntProperty::StaticClass()))
+	{
+		FIntProperty* IntProperty = CastField<FIntProperty>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FIntProperty>(SharedThis(this), IntProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FIntProperty>(SharedThis(this), IntProperty));
+		}
+	}
+	else if (Property->IsA(FBoolProperty::StaticClass()))
+	{
+		FBoolProperty* BoolProperty = CastField<FBoolProperty>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FBoolProperty>(SharedThis(this), BoolProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FBoolProperty >(SharedThis(this), BoolProperty));
+		}
+	}
+	else if (Property->IsA(FFloatProperty::StaticClass()))
+	{
+		FFloatProperty* FloatProperty(CastField< FFloatProperty >(Property));
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FFloatProperty>(SharedThis(this), FloatProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FFloatProperty>(SharedThis(this), FloatProperty));
+		}
+	}
+	else if (Property->IsA(FDoubleProperty::StaticClass()))
+	{
+		FDoubleProperty* DoubleProperty(CastField< FDoubleProperty >(Property));
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FDoubleProperty>(SharedThis(this), DoubleProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FDoubleProperty>(SharedThis(this), DoubleProperty));
+		}
+	}
+	else if (Property->IsA(FNameProperty::StaticClass()))
+	{
+		FNameProperty* NameProperty = CastField<FNameProperty>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FNameProperty>(SharedThis(this), NameProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FNameProperty>(SharedThis(this), NameProperty));
+		}
+	}
+	else if (Property->IsA(FStrProperty::StaticClass()))
+	{
+		FStrProperty* StrProperty = CastField<FStrProperty>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FStrProperty>(SharedThis(this), StrProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FStrProperty>(SharedThis(this), StrProperty));
+		}
+	}
+	else if (Property->IsA(FObjectPropertyBase::StaticClass()) && !Property->HasAnyPropertyFlags(CPF_InstancedReference))
+	{
+		FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FObjectPropertyBase>(SharedThis(this), ObjectProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FObjectPropertyBase>(SharedThis(this), ObjectProperty));
+		}
+	}
+	else if (IsSupportedStructProperty(Property))
+	{
+		FStructProperty* StructProperty = CastField<FStructProperty>(Property);
+
+		if (SortMode == EColumnSortMode::Ascending)
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnAscending<FStructProperty>(SharedThis(this), StructProperty));
+		}
+		else
+		{
+			return MakeShareable<FCompareRowByColumnBase>(new FCompareRowByColumnDescending<FStructProperty>(SharedThis(this), StructProperty));
+		}
+	}
+	//else if ( Property->IsA( FTextProperty::StaticClass() ) )
+	//{
+	//	if ( SortMode == EColumnSortMode::Ascending )
+	//	{
+	//		Rows.Sort( FCompareRowByColumnAscending< FTextProperty >( SharedThis( this ) ) );
+	//	}
+	//	else
+	//	{
+	//		Rows.Sort( FCompareRowByColumnDescending< FTextProperty >( SharedThis( this ) ) );
+	//	}
+	//}
+	else
+	{
+		return MakeShareable<FCompareRowByColumnUsingExportTextLexicographic>(new FCompareRowByColumnUsingExportTextLexicographic(SharedThis(this), Property, (SortMode == EColumnSortMode::Ascending)));
+	}
+}
+
+void FPropertyTableColumn::Sort( TArray< TSharedRef< class IPropertyTableRow > >& Rows, const EColumnSortMode::Type PrimarySortMode, const TSharedPtr<IPropertyTableColumn>& SecondarySortColumn, const EColumnSortMode::Type SecondarySortMode )
+{
+	if (PrimarySortMode == EColumnSortMode::None )
+	{
+		return;
+	}
+
+	UObject* PrimaryObject = DataSource->AsUObject().Get();
+	FProperty* PrimaryProperty = nullptr;
+	TSharedPtr< FPropertyPath > PrimaryPath = DataSource->AsPropertyPath();
+	if (PrimaryPath.IsValid())
+	{
+		PrimaryProperty = PrimaryPath->GetLeafMostProperty().Property.Get();
+	}
+
+	UObject* SecondaryObject = nullptr;
+	FProperty* SecondaryProperty = nullptr;
+	if(SecondarySortColumn.IsValid())
+	{
+		SecondaryObject = SecondarySortColumn->GetDataSource()->AsUObject().Get();
+		SecondaryProperty = nullptr;
+		TSharedPtr< FPropertyPath > SecondaryPath = SecondarySortColumn->GetDataSource()->AsPropertyPath();
+		if (SecondaryPath.IsValid())
+		{
+			SecondaryProperty = SecondaryPath->GetLeafMostProperty().Property.Get();
+		}
+	}
+
+
+	if (!PrimaryProperty)
+	{
+		return;
+	}
+
+
+	TSharedPtr<FCompareRowByColumnBase> SecondarySorter = nullptr;
+	if(SecondaryProperty && SecondarySortMode != EColumnSortMode::None)
+	{
+		SecondarySorter = SecondarySortColumn->GetPropertySorter(SecondaryProperty, SecondarySortMode);
+	}
+
+	// if we had a secondary sort we need to make sure the primary sort is stable to not break the secondary results
+	TSharedPtr<FCompareRowByColumnBase> PrimarySorter = GetPropertySorter(PrimaryProperty, PrimarySortMode);
+	Rows.Sort(FCompareRowPrimaryAndSecondary(PrimarySorter.Get(), SecondarySorter.Get()));
+
+}
+
+void FPropertyTableColumn::Tick()
+{
+	if ( !DataSource->AsPropertyPath().IsValid() )
+	{
+		const TSharedRef< IPropertyTable > TableRef = GetTable();
+		const TWeakObjectPtr< UObject > Object = DataSource->AsUObject();
+
+		if ( !Object.IsValid() )
+		{
+			TableRef->RemoveColumn( SharedThis( this ) );
+		}
+		else
+		{
+			const TSharedRef< FObjectPropertyNode > Node = TableRef->GetObjectPropertyNode( Object );
+			EPropertyDataValidationResult Result = Node->EnsureDataIsValid();
+
+			if ( Result == EPropertyDataValidationResult::ObjectInvalid )
+			{
+				TableRef->RemoveColumn( SharedThis( this ) );
+			}
+			else if ( Result == EPropertyDataValidationResult::ArraySizeChanged )
+			{
+				TableRef->RequestRefresh();
+			}
+		}
+	}
+}
+
+void FPropertyTableColumn::SetFrozen(bool InIsFrozen)
+{
+	bIsFrozen = InIsFrozen;
+	FrozenStateChanged.Broadcast( SharedThis(this) );
+}
+
+bool FPropertyTableColumn::IsSupportedStructProperty(const FProperty* InProperty)
+{
+	if ( InProperty != nullptr && CastField<FStructProperty>(InProperty) != nullptr)
+	{
+		const FStructProperty* StructProp = CastField<FStructProperty>(InProperty);
+		FName StructName = StructProp->Struct->GetFName();
+
+		return StructName == NAME_Vector ||
+			StructName == NAME_Vector2D	 ||
+			StructName == NAME_Vector4;
+	}
+
+	return false;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h
new file mode 100644
index 0000000..bb7b144
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h
@@ -0,0 +1,105 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+
+namespace soda
+{
+
+class FPropertyTableColumn : public TSharedFromThis< FPropertyTableColumn >, public IPropertyTableColumn
+{
+public:
+
+	FPropertyTableColumn( const TSharedRef< IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject );
+
+	FPropertyTableColumn( const TSharedRef< IPropertyTable >& InTable, const TSharedRef< FPropertyPath >& InPropertyPath );
+
+	FPropertyTableColumn( const TSharedRef< IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject, const TSharedRef< FPropertyPath >& InPartialPropertyPath );
+
+	virtual ~FPropertyTableColumn() {}
+
+	//~ Begin IPropertyTable Interface
+
+	virtual FName GetId() const override;
+
+	virtual FText GetDisplayName() const override;
+
+	virtual TSharedRef< IDataSource > GetDataSource() const override { return DataSource; }
+
+	virtual TSharedRef< class FPropertyPath > GetPartialPath() const override { return PartialPath; }
+
+	virtual TSharedRef< class IPropertyTableCell > GetCell( const TSharedRef< class IPropertyTableRow >& Row ) override;
+
+	virtual void RemoveCellsForRow( const TSharedRef< class IPropertyTableRow >& Row ) override;
+
+	virtual TSharedRef<IPropertyTable > GetTable() const override;
+
+	virtual bool CanSelectCells() const override { return !IsHidden(); }
+
+	virtual EPropertyTableColumnSizeMode::Type GetSizeMode() const override { return SizeMode; }
+
+	virtual void SetSizeMode(EPropertyTableColumnSizeMode::Type InSizeMode) override{ SizeMode = InSizeMode; }
+
+	virtual float GetWidth() const override { return Width; } 
+
+	virtual void SetWidth( float InWidth ) override { Width = InWidth; }
+
+	virtual bool IsHidden() const override { return bIsHidden; }
+
+	virtual void SetHidden( bool InIsHidden ) override { bIsHidden = InIsHidden; }
+
+	virtual bool IsFrozen() const override { return bIsFrozen; }
+
+	virtual void SetFrozen( bool InIsFrozen ) override;
+
+	virtual bool CanSortBy() const override;
+
+	virtual void Sort(TArray< TSharedRef< class IPropertyTableRow > >& Rows, const EColumnSortMode::Type PrimarySortMode, const TSharedPtr<IPropertyTableColumn>& SecondarySortColumn, const EColumnSortMode::Type SecondarySortMode) override;
+
+	virtual void Tick() override;
+
+	virtual TSharedPtr<struct FCompareRowByColumnBase> GetPropertySorter(FProperty* Property, EColumnSortMode::Type SortMode) override;
+
+	DECLARE_DERIVED_EVENT( FPropertyTableColumn, IPropertyTableColumn::FFrozenStateChanged, FFrozenStateChanged );
+	FFrozenStateChanged* OnFrozenStateChanged() override { return &FrozenStateChanged; }
+
+	//~ End IPropertyTable Interface
+
+	static bool IsSupportedStructProperty(const FProperty* InProperty);
+
+private:
+
+	void GenerateColumnId();
+
+	void GenerateColumnDisplayName();
+
+
+private:
+
+	TMap< TSharedRef< IPropertyTableRow >, TSharedRef< class IPropertyTableCell > > Cells;
+
+	TSharedRef< IDataSource > DataSource;
+	TWeakPtr< IPropertyTable > Table;
+
+	FName Id;
+	FText DisplayName;
+
+	float Width;
+
+	bool bIsHidden;
+	bool bIsFrozen;
+
+	FFrozenStateChanged FrozenStateChanged;
+
+	TSharedRef< class FPropertyPath > PartialPath;
+
+	EPropertyTableColumnSizeMode::Type SizeMode;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.cpp
new file mode 100644
index 0000000..642e8a6
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.cpp
@@ -0,0 +1,106 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameColumn.h"
+
+namespace soda
+{
+
+FPropertyTableObjectNameCell::FPropertyTableObjectNameCell( const TSharedRef< class FPropertyTableObjectNameColumn >& InColumn, const TSharedRef< class IPropertyTableRow >& InRow )
+	: EnteredEditModeEvent()
+	, ExitedEditModeEvent()
+	, Column( InColumn )
+	, Row( InRow )
+	, ObjectNode( NULL )
+	, bIsBound( false )
+	, bInEditMode( false )
+{
+	Refresh();
+}
+
+void FPropertyTableObjectNameCell::Refresh()
+{
+	ObjectName.Empty();
+	bIsBound = false;
+	const TSharedRef< IPropertyTableColumn > ColumnRef = Column.Pin().ToSharedRef();
+	const TSharedRef< IPropertyTableRow > RowRef = Row.Pin().ToSharedRef();
+
+	ObjectNode = GetTable()->GetObjectPropertyNode( ColumnRef, RowRef );
+
+	if ( !ObjectNode.IsValid() || ObjectNode->GetNumObjects() != 1 )
+	{
+		return;
+	}
+
+	bIsBound = true;
+}
+
+bool FPropertyTableObjectNameCell::IsReadOnly() const 
+{ 
+	return true;
+}
+
+bool FPropertyTableObjectNameCell::IsValid() const
+{
+	return !IsBound() || (ObjectNode.IsValid() && (ObjectNode->GetNumObjects() == 1));
+}
+
+FString FPropertyTableObjectNameCell::GetValueAsString() const
+{
+	return Column.Pin()->GetObjectNameAsString( Row.Pin().ToSharedRef() );
+}
+
+FText FPropertyTableObjectNameCell::GetValueAsText() const
+{
+	return FText::FromString(GetValueAsString());
+}
+
+TWeakObjectPtr< UObject > FPropertyTableObjectNameCell::GetObject() const
+{
+	if ( !ObjectNode.IsValid() )
+	{
+		return NULL;
+	}
+
+	return ObjectNode->GetUObject( 0 );
+}
+
+TSharedRef< class IPropertyTableColumn > FPropertyTableObjectNameCell::GetColumn() const
+{ 
+	return Column.Pin().ToSharedRef(); 
+}
+
+TSharedRef< class IPropertyTableRow > FPropertyTableObjectNameCell::GetRow() const
+{
+	return Row.Pin().ToSharedRef(); 
+}
+
+TSharedRef< class IPropertyTable > FPropertyTableObjectNameCell::GetTable() const
+{
+	return Column.Pin()->GetTable();
+}
+
+void FPropertyTableObjectNameCell::EnterEditMode() 
+{
+	if ( !bInEditMode )
+	{
+		TSharedRef< IPropertyTable > Table = GetTable();
+		Table->SetCurrentCell( SharedThis( this ) );
+		bInEditMode = true;
+		EnteredEditModeEvent.Broadcast();
+	}
+}
+
+void FPropertyTableObjectNameCell::ExitEditMode()
+{
+	if ( bInEditMode )
+	{
+		bInEditMode = false;
+		ExitedEditModeEvent.Broadcast();
+	}
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.h
new file mode 100644
index 0000000..98ea054
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.h
@@ -0,0 +1,69 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+
+namespace soda
+{
+
+class FPropertyTableObjectNameColumn;
+
+class FPropertyTableObjectNameCell : public TSharedFromThis< FPropertyTableObjectNameCell >, public IPropertyTableCell
+{
+public:
+
+	FPropertyTableObjectNameCell( const TSharedRef< class FPropertyTableObjectNameColumn >& InColumn, const TSharedRef< class IPropertyTableRow >& InRow );
+	virtual ~FPropertyTableObjectNameCell() {}
+
+	virtual void Refresh() override;
+
+	virtual bool IsReadOnly() const override;
+	virtual bool IsBound() const override { return bIsBound; }
+	virtual bool InEditMode() const override { return bInEditMode; }
+	virtual bool IsValid() const override;
+
+	virtual FString GetValueAsString() const override;
+	virtual FText GetValueAsText() const override;
+	virtual void SetValueFromString( const FString& InString ) override {}
+
+	virtual TWeakObjectPtr< UObject > GetObject() const override;
+
+	virtual TSharedPtr< class FPropertyNode > GetNode() const override { return NULL; }
+	virtual TSharedRef< class IPropertyTableColumn > GetColumn() const override;
+	virtual TSharedRef< class IPropertyTableRow > GetRow() const override;
+	virtual TSharedRef< class IPropertyTable > GetTable() const override;
+	virtual TSharedPtr< class IPropertyHandle > GetPropertyHandle() const override { return NULL; }
+
+	virtual void EnterEditMode() override;
+	virtual void ExitEditMode() override;
+
+	DECLARE_DERIVED_EVENT( FPropertyTableObjectNameCell, IPropertyTableCell::FEnteredEditModeEvent, FEnteredEditModeEvent );
+	virtual FEnteredEditModeEvent& OnEnteredEditMode() override { return EnteredEditModeEvent; }
+
+	DECLARE_DERIVED_EVENT( FPropertyTableObjectNameCell, IPropertyTableCell::FExitedEditModeEvent, FExitedEditModeEvent  );
+	virtual FExitedEditModeEvent& OnExitedEditMode() override { return ExitedEditModeEvent; }
+
+
+private:
+
+	FEnteredEditModeEvent EnteredEditModeEvent;
+	FExitedEditModeEvent ExitedEditModeEvent;
+
+	TWeakPtr< class FPropertyTableObjectNameColumn > Column;
+	TWeakPtr< class IPropertyTableRow > Row;
+
+	TSharedPtr< class FObjectPropertyNode > ObjectNode;
+	FString ObjectName;
+
+	bool bIsBound;
+	bool bInEditMode;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameColumn.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameColumn.h
new file mode 100644
index 0000000..258dc66
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameColumn.h
@@ -0,0 +1,203 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableObjectNameCell.h"
+#include "Engine/BlueprintGeneratedClass.h"
+
+#define LOCTEXT_NAMESPACE "ObjectNameColumnHeader"
+
+namespace soda
+{
+
+class FPropertyTableObjectNameColumn : public TSharedFromThis< FPropertyTableObjectNameColumn >, public IPropertyTableColumn
+{
+public:
+
+	FPropertyTableObjectNameColumn( const TSharedRef< IPropertyTable >& InTable )
+		: Table( InTable )
+		, Cells()
+		, Width( 2.0f )
+		, bIsHidden( false )
+	{
+
+	}
+
+	virtual ~FPropertyTableObjectNameColumn() {}
+
+	//  Begin IPropertyTable Interface
+
+	virtual FName GetId() const override { return FName( TEXT("ObjectName") ); }
+
+	virtual FText GetDisplayName() const override { return LOCTEXT( "DisplayName", "Name" ); }
+
+	virtual TSharedRef< IDataSource > GetDataSource() const override { return MakeShareable( new NoDataSource() ); }
+
+	virtual TSharedRef< class FPropertyPath > GetPartialPath() const override { return FPropertyPath::CreateEmpty(); }
+
+	virtual TSharedRef< class IPropertyTableCell > GetCell( const TSharedRef< class IPropertyTableRow >& Row ) override
+	{
+		//@todo Clean Cells cache when rows get updated [11/27/2012 Justin.Sargent]
+		TSharedRef< IPropertyTableCell >* CellPtr = Cells.Find( Row );
+
+		if( CellPtr != NULL )
+		{
+			return *CellPtr;
+		}
+
+		TSharedRef< IPropertyTableCell > Cell = MakeShareable( new FPropertyTableObjectNameCell( SharedThis( this ), Row ) );
+		Cells.Add( Row, Cell );
+
+		return Cell;
+	}
+
+	virtual void RemoveCellsForRow( const TSharedRef< class IPropertyTableRow >& Row ) override
+	{
+		Cells.Remove( Row );
+	}
+
+	virtual TSharedRef< class IPropertyTable > GetTable() const override { return Table.Pin().ToSharedRef(); }
+
+	virtual bool CanSelectCells() const override { return true; }
+
+	virtual EPropertyTableColumnSizeMode::Type GetSizeMode() const override { return EPropertyTableColumnSizeMode::Fill; }
+
+	virtual void SetSizeMode(EPropertyTableColumnSizeMode::Type InSizeMode) override {}
+
+	virtual float GetWidth() const override { return Width; } 
+
+	virtual void SetWidth( float InWidth ) override { Width = InWidth; }
+
+	virtual bool IsHidden() const override { return bIsHidden; }
+
+	virtual void SetHidden( bool InIsHidden ) override { bIsHidden = InIsHidden; }
+
+	virtual bool IsFrozen() const override { return true; }
+
+	virtual void SetFrozen( bool InIsFrozen ) override {}
+
+	virtual bool CanSortBy() const override { return true; }
+
+	virtual void Sort( TArray< TSharedRef< class IPropertyTableRow > >& Rows, const EColumnSortMode::Type PrimarySortMode, const TSharedPtr<IPropertyTableColumn>& SecondarySortColumn, const EColumnSortMode::Type SecondarySortMode ) override
+	{
+		struct FCompareRowByObjectNameAscending
+		{
+		public:
+			FCompareRowByObjectNameAscending(const TSharedRef< FPropertyTableObjectNameColumn >& Column)
+				: NameColumn(Column)
+			{ }
+
+			FORCEINLINE bool operator()(const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs) const
+			{
+				return NameColumn->GetObjectNameAsString(Lhs) < NameColumn->GetObjectNameAsString(Rhs);
+			}
+
+			TSharedRef< FPropertyTableObjectNameColumn > NameColumn;
+		};
+
+		struct FCompareRowByObjectNameDescending
+		{
+		public:
+			FCompareRowByObjectNameDescending(const TSharedRef< FPropertyTableObjectNameColumn >& Column)
+				: Comparer(Column)
+			{ }
+
+			FORCEINLINE bool operator()(const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs) const
+			{
+				return !Comparer(Lhs, Rhs);
+			}
+
+		private:
+
+			const FCompareRowByObjectNameAscending Comparer;
+		};
+
+		if (PrimarySortMode == EColumnSortMode::None)
+		{
+			return;
+		}
+
+		if (PrimarySortMode == EColumnSortMode::Ascending )
+		{
+			Rows.Sort( FCompareRowByObjectNameAscending( SharedThis( this ) ) );
+		}
+		else
+		{
+			Rows.Sort( FCompareRowByObjectNameDescending( SharedThis( this ) ) );
+		}
+	}
+
+	virtual TSharedPtr<struct FCompareRowByColumnBase> GetPropertySorter(FProperty* Property, EColumnSortMode::Type SortMode) override
+	{
+		// Does not sort properties
+		return nullptr;
+	}
+
+	virtual void Tick() override {}
+
+	DECLARE_DERIVED_EVENT( FPropertyTableColumn, IPropertyTableColumn::FFrozenStateChanged, FFrozenStateChanged );
+	FFrozenStateChanged* OnFrozenStateChanged() override { return &FrozenStateChanged; }
+
+	// End IPropertyTable Interface
+
+public:
+
+	FString GetObjectNameAsString( const TSharedRef< IPropertyTableRow >& Row )
+	{
+		FString ObjectName;
+		FString Suffix = GetTable()->GetRootPath()->ExtendPath( Row->GetPartialPath() )->ToString();
+		if ( !Suffix.IsEmpty() )
+		{
+			Suffix = FString( TEXT("->") ) + Suffix;
+		}
+
+		const UObject* const Object = GetTable()->GetObjectPropertyNode( SharedThis( this ), Row )->GetUObject( 0 );
+		if ( Object != NULL )
+		{
+			UClass* ObjectClass = Object->GetClass();
+			/*
+			const UBlueprintGeneratedClass* const BlueprintGeneratedClass = Cast<UBlueprintGeneratedClass>( ObjectClass ); 
+			const bool IsCDO = Object->HasAnyFlags(RF_ClassDefaultObject);
+			if ( BlueprintGeneratedClass != NULL && IsCDO )
+			{
+				ObjectName = BlueprintGeneratedClass->ClassGeneratedBy->GetFName().ToString();
+			}
+			else
+			if ( Object->IsA( AActor::StaticClass() ) )
+			{
+				ObjectName = Cast<const  AActor >( Object )->GetActorLabel();
+			}
+			else
+			 */
+			{
+				ObjectName = Object->GetFName().ToString();
+			}
+		}
+
+		return ObjectName + Suffix;
+	}
+
+
+private:
+
+	TWeakPtr< IPropertyTable > Table;
+	TMap< TSharedRef< IPropertyTableRow >, TSharedRef< class IPropertyTableCell > > Cells;
+	float Width;
+	bool bIsHidden;
+
+	FFrozenStateChanged FrozenStateChanged;
+};
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameCell.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameCell.cpp
new file mode 100644
index 0000000..0c2fd3f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameCell.cpp
@@ -0,0 +1,75 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameCell.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.h"
+
+namespace soda
+{
+
+FPropertyTablePropertyNameCell::FPropertyTablePropertyNameCell( const TSharedRef< class FPropertyTablePropertyNameColumn >& InColumn, const TSharedRef< class IPropertyTableRow >& InRow )
+	: bInEditMode( false )
+	, bIsBound( true )
+	, Column( InColumn )
+	, EnteredEditModeEvent()
+	, ExitedEditModeEvent()
+	, Row( InRow )
+{
+	Refresh();
+}
+
+void FPropertyTablePropertyNameCell::Refresh()
+{
+	const TSharedRef< IPropertyTableColumn > ColumnRef = Column.Pin().ToSharedRef();
+	const TSharedRef< IPropertyTableRow > RowRef = Row.Pin().ToSharedRef();
+
+	ObjectNode = GetTable()->GetObjectPropertyNode( ColumnRef, RowRef );
+
+	bIsBound = ObjectNode.IsValid();
+}
+
+FString FPropertyTablePropertyNameCell::GetValueAsString() const
+{
+	return Row.Pin()->GetDataSource()->AsPropertyPath()->ToString();
+}
+
+FText FPropertyTablePropertyNameCell::GetValueAsText() const
+{
+	return FText::FromString(GetValueAsString());
+}
+
+TSharedRef< class IPropertyTable > FPropertyTablePropertyNameCell::GetTable() const
+{
+	return Column.Pin()->GetTable();
+}
+
+void FPropertyTablePropertyNameCell::EnterEditMode() 
+{
+}
+
+TSharedRef< class IPropertyTableColumn > FPropertyTablePropertyNameCell::GetColumn() const
+{ 
+	return Column.Pin().ToSharedRef(); 
+}
+
+TWeakObjectPtr< UObject > FPropertyTablePropertyNameCell::GetObject() const
+{
+	if ( !ObjectNode.IsValid() )
+	{
+		return NULL;
+	}
+
+	return ObjectNode->GetUObject( 0 );
+}
+
+TSharedRef< class IPropertyTableRow > FPropertyTablePropertyNameCell::GetRow() const
+{ 
+	return Row.Pin().ToSharedRef(); 
+}
+
+void FPropertyTablePropertyNameCell::ExitEditMode()
+{
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameCell.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameCell.h
new file mode 100644
index 0000000..370a195
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameCell.h
@@ -0,0 +1,87 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+
+namespace soda
+{
+
+class FPropertyTablePropertyNameColumn;
+
+class FPropertyTablePropertyNameCell : public TSharedFromThis< FPropertyTablePropertyNameCell >, public IPropertyTableCell
+{
+public:
+
+	FPropertyTablePropertyNameCell( const TSharedRef< class FPropertyTablePropertyNameColumn >& InColumn, const TSharedRef< class IPropertyTableRow >& InRow );
+
+	//~ Begin IPropertyTableCell Interface
+
+	virtual void EnterEditMode() override;
+
+	virtual void ExitEditMode() override;
+
+	virtual TSharedRef< class IPropertyTableColumn > GetColumn() const override;
+
+	virtual TSharedPtr< class FPropertyNode > GetNode() const override { return NULL; }
+
+	virtual TWeakObjectPtr< UObject > GetObject() const override;
+
+	virtual TSharedRef< class IPropertyTableRow > GetRow() const override;
+
+	virtual TSharedRef< class IPropertyTable > GetTable() const override;
+
+	virtual FString GetValueAsString() const override;
+
+	virtual FText GetValueAsText() const override;
+
+	virtual bool InEditMode() const override { return bInEditMode; }
+
+	virtual bool IsReadOnly() const override { return true; }
+
+	virtual bool IsBound() const override { return bIsBound; }
+
+	virtual bool IsValid() const override  { return true; }
+
+	DECLARE_DERIVED_EVENT( FPropertyTablePropertyNameCell, IPropertyTableCell::FEnteredEditModeEvent, FEnteredEditModeEvent );
+	virtual FEnteredEditModeEvent& OnEnteredEditMode() override { return EnteredEditModeEvent; }
+
+	DECLARE_DERIVED_EVENT( FPropertyTablePropertyNameCell, IPropertyTableCell::FExitedEditModeEvent, FExitedEditModeEvent  );
+	virtual FExitedEditModeEvent& OnExitedEditMode() override { return ExitedEditModeEvent; }
+
+	virtual void Refresh() override;
+
+	virtual void SetValueFromString( const FString& InString ) override {}
+
+	//~ End IPropertyTableCell Interface
+
+private:
+
+	/** Is this cell being edited? */
+	bool bInEditMode;
+
+	/** Is this cell valid? */
+	bool bIsBound;
+
+	/** The column this cell is in */
+	TWeakPtr< class FPropertyTablePropertyNameColumn > Column;
+
+	/** Delegate to execute when we enter edit mode */
+	FEnteredEditModeEvent EnteredEditModeEvent;
+
+	/** Delegate to execute when we exit edit mode */
+	FExitedEditModeEvent ExitedEditModeEvent;
+
+	/** The object node which is associated with this cell */
+	TSharedPtr< class FObjectPropertyNode > ObjectNode;
+
+	/** The row this cell is in */
+	TWeakPtr< class IPropertyTableRow > Row;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.cpp
new file mode 100644
index 0000000..bf7c12d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.cpp
@@ -0,0 +1,113 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.h"
+//#include "Editor/EditorEngine.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h"
+#include "RuntimeEditorUtils.h"
+
+#define LOCTEXT_NAMESPACE "PropertyNameColumnHeader"
+
+namespace soda
+{
+
+
+FPropertyTablePropertyNameColumn::FPropertyTablePropertyNameColumn( const TSharedRef< IPropertyTable >& InTable )
+	: bIsHidden( false )
+	, Cells()
+	, DataSource( MakeShareable( new NoDataSource() ) )
+	, Table( InTable )
+	, Width( 2.0f )
+{
+
+}
+
+
+TSharedRef< class IPropertyTableCell > FPropertyTablePropertyNameColumn::GetCell( const TSharedRef< class IPropertyTableRow >& Row )
+{
+	TSharedRef< IPropertyTableCell >* CellPtr = Cells.Find( Row );
+
+	if( CellPtr != NULL )
+	{
+		return *CellPtr;
+	}
+
+	TSharedRef< IPropertyTableCell > Cell = MakeShareable( new FPropertyTableCell( SharedThis( this ), Row ) );
+	Cells.Add( Row, Cell );
+
+	return Cell;
+}
+
+
+void FPropertyTablePropertyNameColumn::Sort( TArray<TSharedRef<class IPropertyTableRow>>& Rows, const EColumnSortMode::Type PrimarySortMode, const TSharedPtr<IPropertyTableColumn>& SecondarySortColumn, const EColumnSortMode::Type SecondarySortMode )
+{
+	struct FCompareRowByPropertyNameAscending
+	{
+	public:
+		FCompareRowByPropertyNameAscending( const TSharedRef< FPropertyTablePropertyNameColumn >& Column )
+			: NameColumn( Column )
+		{ }
+
+		FORCEINLINE bool operator()( const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs ) const
+		{
+			return NameColumn->GetPropertyNameAsString( Lhs ) < NameColumn->GetPropertyNameAsString( Rhs );
+		}
+
+		TSharedRef< FPropertyTablePropertyNameColumn > NameColumn;
+	};
+
+	struct FCompareRowByPropertyNameDescending
+	{
+	public:
+		FCompareRowByPropertyNameDescending( const TSharedRef< FPropertyTablePropertyNameColumn >& Column )
+			: Comparer( Column )
+		{ }
+
+		FORCEINLINE bool operator()( const TSharedRef< IPropertyTableRow >& Lhs, const TSharedRef< IPropertyTableRow >& Rhs ) const
+		{
+			return !Comparer( Lhs, Rhs ); 
+		}
+
+	private:
+
+		const FCompareRowByPropertyNameAscending Comparer;
+	};
+
+	if (PrimarySortMode == EColumnSortMode::None )
+	{
+		return;
+	}
+
+	if (PrimarySortMode == EColumnSortMode::Ascending )
+	{
+		Rows.Sort( FCompareRowByPropertyNameAscending( SharedThis( this ) ) );
+	}
+	else
+	{
+		Rows.Sort( FCompareRowByPropertyNameDescending( SharedThis( this ) ) );
+	}
+}
+
+
+TSharedPtr<struct FCompareRowByColumnBase> FPropertyTablePropertyNameColumn::GetPropertySorter(FProperty* Property, EColumnSortMode::Type SortMode)
+{
+	// Does not sort properties
+	return nullptr;
+}
+
+FString FPropertyTablePropertyNameColumn::GetPropertyNameAsString( const TSharedRef< IPropertyTableRow >& Row )
+{
+	FString PropertyName;
+	if( Row->GetDataSource()->AsPropertyPath().IsValid() )
+	{
+		const TWeakFieldPtr< FProperty > Property = Row->GetDataSource()->AsPropertyPath()->GetLeafMostProperty().Property;
+		PropertyName = FRuntimeEditorUtils::GetFriendlyName( Property.Get() );
+	}
+	return PropertyName;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.h
new file mode 100644
index 0000000..96a1c49
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTablePropertyNameColumn.h
@@ -0,0 +1,102 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h"
+
+#define LOCTEXT_NAMESPACE "PropertyNameColumnHeader"
+
+namespace soda
+{
+
+class FPropertyTablePropertyNameColumn : public TSharedFromThis< FPropertyTablePropertyNameColumn >, public IPropertyTableColumn
+{
+public:
+
+	FPropertyTablePropertyNameColumn( const TSharedRef< IPropertyTable >& InTable );
+
+	virtual ~FPropertyTablePropertyNameColumn() {}
+
+	//~ Begin IPropertyTableColumn Interface
+
+	virtual bool CanSelectCells() const override { return true; }
+
+	virtual bool CanSortBy() const override { return true; }
+
+	virtual TSharedRef< class IPropertyTableCell > GetCell( const TSharedRef< class IPropertyTableRow >& Row ) override;
+
+	virtual TSharedRef< IDataSource > GetDataSource() const override { return DataSource; }
+
+	virtual TSharedRef< class FPropertyPath > GetPartialPath() const override { return FPropertyPath::CreateEmpty(); }
+
+	virtual FText GetDisplayName() const override { return LOCTEXT( "DisplayName", "Name" ); }
+
+	virtual FName GetId() const override { return FName( TEXT("PropertyName") ); }
+
+	virtual EPropertyTableColumnSizeMode::Type GetSizeMode() const override { return EPropertyTableColumnSizeMode::Fill; }
+
+	virtual void SetSizeMode(EPropertyTableColumnSizeMode::Type InSizeMode) override {}
+
+	virtual TSharedRef< class IPropertyTable > GetTable() const override { return Table.Pin().ToSharedRef(); }
+
+	virtual float GetWidth() const override { return Width; }
+
+	virtual bool IsFrozen() const override { return false; }
+
+	virtual bool IsHidden() const override { return bIsHidden; }
+
+	virtual void RemoveCellsForRow( const TSharedRef< class IPropertyTableRow >& Row ) override
+	{
+		Cells.Remove( Row );
+	}
+
+	virtual void SetFrozen( bool InIsFrozen ) override {}
+
+	virtual void SetHidden( bool InIsHidden ) override { bIsHidden = InIsHidden; }
+
+	virtual void SetWidth( float InWidth ) override { Width = InWidth; }
+
+	virtual void Sort( TArray< TSharedRef< class IPropertyTableRow > >& Rows, const EColumnSortMode::Type PrimarySortMode, const TSharedPtr<IPropertyTableColumn>& SecondarySortColumn, const EColumnSortMode::Type SecondarySortMode ) override;
+
+	virtual TSharedPtr<struct FCompareRowByColumnBase> GetPropertySorter(FProperty* Property, EColumnSortMode::Type SortMode) override;
+
+	virtual void Tick() override {}
+
+	DECLARE_DERIVED_EVENT( FPropertyTableColumn, IPropertyTableColumn::FFrozenStateChanged, FFrozenStateChanged );
+	FFrozenStateChanged* OnFrozenStateChanged() override { return &FrozenStateChanged; }
+
+	//~ End IPropertyTableColumn Interface
+
+private:
+
+	FString GetPropertyNameAsString( const TSharedRef< IPropertyTableRow >& Row );
+
+private:
+
+	/** Has this column been hidden? */
+	bool bIsHidden;
+
+	/** A map of all cells in this column */
+	TMap< TSharedRef< IPropertyTableRow >, TSharedRef< class IPropertyTableCell > > Cells;
+
+	/** The data source for this column */
+	TSharedRef< IDataSource > DataSource;
+
+	/** A reference to the owner table */
+	TWeakPtr< IPropertyTable > Table;
+
+	/** The width of the column */
+	float Width;
+
+	FFrozenStateChanged FrozenStateChanged;
+};
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.cpp
new file mode 100644
index 0000000..d42e76a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.cpp
@@ -0,0 +1,176 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h"
+
+namespace soda
+{
+
+FPropertyTableRow::FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject )
+	: DataSource( MakeShareable( new UObjectDataSource( InObject ) ) )
+	, Table( InTable )
+	, Children()
+	, PartialPath( FPropertyPath::CreateEmpty() )
+{
+	GenerateChildren();
+}
+
+FPropertyTableRow::FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TSharedRef< FPropertyPath >& InPropertyPath )
+	: DataSource( MakeShareable( new PropertyPathDataSource( InPropertyPath ) ) )
+	, Table( InTable )
+	, Children()
+	, PartialPath( FPropertyPath::CreateEmpty() )
+{
+	GenerateChildren();
+}
+
+FPropertyTableRow::FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject, const TSharedRef< FPropertyPath >& InPartialPropertyPath )
+	: DataSource( MakeShareable( new UObjectDataSource( InObject ) ) )
+	, Table( InTable )
+	, Children()
+	, PartialPath( InPartialPropertyPath )
+{
+	GenerateChildren();
+}
+
+FPropertyTableRow::FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TSharedRef< FPropertyPath >& InPropertyPath, const TSharedRef< FPropertyPath >& InPartialPropertyPath )
+	: DataSource( MakeShareable( new PropertyPathDataSource( InPropertyPath ) ) )
+	, Table( InTable )
+	, Children()
+	, PartialPath( InPartialPropertyPath )
+{
+	GenerateChildren();
+}
+
+bool FPropertyTableRow::HasChildren() const
+{
+	return Children.Num() > 0;
+}
+
+void FPropertyTableRow::GetChildRows( TArray< TSharedRef< IPropertyTableRow > >& OutChildren ) const 
+{
+	OutChildren.Append( Children );
+}
+
+void FPropertyTableRow::GenerateChildren()
+{
+	if ( !DataSource->IsValid() || DataSource->AsPropertyPath().IsValid() )
+	{
+		return;
+	}
+
+	const TSharedRef< class IPropertyTable > TableRef = GetTable();
+	TWeakObjectPtr< UObject > Object = DataSource->AsUObject();
+	TSharedRef< FObjectPropertyNode > ObjectNode = TableRef->GetObjectPropertyNode( Object );
+	TSharedRef< FPropertyPath > RootPath = TableRef->GetRootPath();
+
+	TSharedPtr< FPropertyNode > PropertyNode = FPropertyNode::FindPropertyNodeByPath( RootPath, ObjectNode );
+
+	if ( !PropertyNode.IsValid() )
+	{
+		return;
+	}
+
+	PropertyNode = FPropertyNode::FindPropertyNodeByPath( PartialPath, PropertyNode.ToSharedRef() );
+
+	if ( !PropertyNode.IsValid() )
+	{
+		return;
+	}
+
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property != NULL && Property->IsA( FArrayProperty::StaticClass() ) )
+	{
+		for (int Index = 0; Index < PropertyNode->GetNumChildNodes(); Index++)
+		{
+			TSharedPtr< FPropertyNode > ChildNode = PropertyNode->GetChildNode( Index );
+
+			FPropertyInfo Extension;
+			Extension.Property = ChildNode->GetProperty();
+			Extension.ArrayIndex = ChildNode->GetArrayIndex();
+
+			Children.Add( MakeShareable( new FPropertyTableRow( TableRef, Object, RootPath->ExtendPath( Extension ) ) ) );
+		}
+	}
+}
+
+TSharedRef< class IPropertyTable > FPropertyTableRow::GetTable() const 
+{
+	return Table.Pin().ToSharedRef();
+}
+
+void FPropertyTableRow::Tick() 
+{
+	//@todo Create similar logic to handle if the column is the object and row is the property [12/7/2012 Justin.Sargent]
+	if ( !HasChildren() && !DataSource->AsPropertyPath().IsValid() )
+	{
+		const TSharedRef< IPropertyTable > TableRef = GetTable();
+		const TWeakObjectPtr< UObject > Object = DataSource->AsUObject();
+
+		if ( !Object.IsValid() )
+		{
+			TableRef->RemoveRow( SharedThis( this ) );
+		}
+		else
+		{
+			TSharedPtr< FPropertyNode > Node = TableRef->GetObjectPropertyNode( Object );
+			if(!Node.IsValid())
+			{
+				TableRef->RemoveRow( SharedThis( this ) );
+				return;
+			}
+
+			Node = FPropertyNode::FindPropertyNodeByPath( GetTable()->GetRootPath(), Node.ToSharedRef() );
+			if ( !Node.IsValid() )
+			{
+				TableRef->RemoveRow( SharedThis( this ) );
+				return;
+			}
+
+			Node = FPropertyNode::FindPropertyNodeByPath( GetPartialPath(), Node.ToSharedRef() );
+
+			if ( !Node.IsValid() )
+			{
+				TableRef->RemoveRow( SharedThis( this ) );
+				return;
+			}
+
+			EPropertyDataValidationResult Result = Node->EnsureDataIsValid();
+
+			if ( Result == EPropertyDataValidationResult::ObjectInvalid )
+			{
+				TableRef->RemoveRow( SharedThis( this ) );
+			}
+			else if ( Result == EPropertyDataValidationResult::ArraySizeChanged )
+			{
+				TableRef->RequestRefresh();
+			}
+			else if ( Result != EPropertyDataValidationResult::DataValid )
+			{
+				Refresh();
+			}
+		}
+	}
+}
+
+void FPropertyTableRow::Refresh()
+{
+	const TSharedRef< IPropertyTable > TableRef = GetTable();
+	const TSharedRef< IPropertyTableRow > SelfRef = SharedThis( this );
+	for( auto ColumnIter = TableRef->GetColumns().CreateConstIterator(); ColumnIter; ++ColumnIter )
+	{
+		const TSharedRef< IPropertyTableColumn >& CurrentColumn = *ColumnIter;
+
+		CurrentColumn->GetCell( SelfRef )->Refresh();
+	}
+
+	Refreshed.Broadcast();
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.h
new file mode 100644
index 0000000..6489e5b
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRow.h
@@ -0,0 +1,66 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+
+namespace soda
+{
+
+class FPropertyTableRow : public TSharedFromThis< FPropertyTableRow >, public IPropertyTableRow
+{
+public:
+	
+	FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject  );
+
+	FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TSharedRef< FPropertyPath >& InPropertyPath );
+
+	FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TWeakObjectPtr< UObject >& InObject, const TSharedRef< FPropertyPath >& InPartialPropertyPath );
+
+	FPropertyTableRow( const TSharedRef< class IPropertyTable >& InTable, const TSharedRef< FPropertyPath >& InPropertyPath, const TSharedRef< FPropertyPath >& InPartialPropertyPath );
+
+	virtual ~FPropertyTableRow() {}
+
+	virtual TSharedRef< class IDataSource > GetDataSource() const override { return DataSource; }
+
+	virtual bool HasChildren() const override;
+
+	virtual void GetChildRows( TArray< TSharedRef< class IPropertyTableRow > >& OutChildren ) const override;
+
+	virtual TSharedRef< class IPropertyTable > GetTable() const override;
+
+	virtual bool HasCells() const override { return true; }
+
+	virtual TSharedRef< class FPropertyPath > GetPartialPath() const override { return PartialPath; }
+
+	virtual void Tick() override;
+
+	virtual void Refresh() override;
+
+	DECLARE_DERIVED_EVENT( FPropertyTableRow, IPropertyTableRow::FRefreshed, FRefreshed );
+	virtual FRefreshed* OnRefresh() override { return &Refreshed; }
+
+
+private:
+
+	void GenerateChildren();
+
+
+private:
+
+	TSharedRef< class IDataSource > DataSource;
+
+	TWeakPtr< class IPropertyTable > Table;
+
+	TArray< TSharedRef< class IPropertyTableRow > > Children;
+
+	TSharedRef< class FPropertyPath > PartialPath;
+
+	FRefreshed Refreshed;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRowHeaderColumn.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRowHeaderColumn.h
new file mode 100644
index 0000000..67fce8a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableRowHeaderColumn.h
@@ -0,0 +1,101 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/IPropertyTableColumn.h"
+#include "RuntimePropertyEditor/IPropertyTable.h"
+#include "RuntimePropertyEditor/IPropertyTableCell.h"
+#include "RuntimePropertyEditor/IPropertyTableRow.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableColumn.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/PropertyTableCell.h"
+#include "RuntimePropertyEditor/Presentation/PropertyTable/DataSource.h"
+
+namespace soda
+{
+
+class FPropertyTableRowHeaderColumn : public TSharedFromThis< FPropertyTableRowHeaderColumn >, public IPropertyTableColumn
+{
+public:
+
+	FPropertyTableRowHeaderColumn( const TSharedRef< IPropertyTable >& InTable )
+		: Table( InTable )
+		, Cells()
+		, bIsHidden( false )
+		, DataSource( MakeShareable( new NoDataSource() ) )
+	{
+
+	}
+
+	virtual ~FPropertyTableRowHeaderColumn() {}
+
+	virtual FName GetId() const override { return FName( TEXT("RowHeader") ); }
+	virtual FText GetDisplayName() const override { return FText::GetEmpty(); }
+	virtual TSharedRef< IDataSource > GetDataSource() const override { return MakeShareable( new PropertyPathDataSource( FPropertyPath::CreateEmpty() ) ); }
+	virtual TSharedRef< class FPropertyPath > GetPartialPath() const override { return FPropertyPath::CreateEmpty(); }
+
+	virtual TSharedRef< class IPropertyTableCell > GetCell( const TSharedRef< class IPropertyTableRow >& Row ) override
+	{
+		//@todo Clean Cells cache when rows get updated [11/27/2012 Justin.Sargent]
+		TSharedRef< IPropertyTableCell >* CellPtr = Cells.Find( Row );
+
+		if( CellPtr != NULL )
+		{
+			return *CellPtr;
+		}
+
+		TSharedRef< IPropertyTableCell > Cell = MakeShareable( new FPropertyTableCell( SharedThis( this ), Row ) );
+		Cells.Add( Row, Cell );
+
+		return Cell;
+	}
+
+	virtual void RemoveCellsForRow( const TSharedRef< class IPropertyTableRow >& Row ) override
+	{
+		Cells.Remove( Row );
+	}
+
+	virtual TSharedRef< class IPropertyTable > GetTable() const override { return Table.Pin().ToSharedRef(); }
+
+	virtual bool CanSelectCells() const override { return false; }
+
+	virtual EPropertyTableColumnSizeMode::Type GetSizeMode() const override { return EPropertyTableColumnSizeMode::Fixed; }
+
+	virtual void SetSizeMode(EPropertyTableColumnSizeMode::Type InSizeMode) override {}
+
+	virtual float GetWidth() const override { return 20.0f; } 
+
+	virtual void SetWidth( float InWidth ) override {  }
+
+	virtual bool IsHidden() const override { return bIsHidden; }
+
+	virtual void SetHidden( bool InIsHidden ) override { bIsHidden = InIsHidden; }
+
+	virtual bool IsFrozen() const override { return true; }
+
+	virtual void SetFrozen( bool InIsFrozen ) override {}
+
+	virtual bool CanSortBy() const override { return false; }
+
+	virtual void Sort( TArray< TSharedRef< class IPropertyTableRow > >& Rows, const EColumnSortMode::Type PrimarySortMode, const TSharedPtr<IPropertyTableColumn>& SecondarySortColumn, const EColumnSortMode::Type SecondarySortMode ) override {  }
+
+	virtual TSharedPtr<struct FCompareRowByColumnBase> GetPropertySorter(FProperty* Property, EColumnSortMode::Type SortMode) override { return nullptr;  }
+
+	virtual void Tick() override {}
+
+	DECLARE_DERIVED_EVENT( FPropertyTableColumn, IPropertyTableColumn::FFrozenStateChanged, FFrozenStateChanged );
+	FFrozenStateChanged* OnFrozenStateChanged() override { return &FrozenStateChanged; }
+
+private:
+
+	TWeakPtr< IPropertyTable > Table;
+	TMap< TSharedRef< IPropertyTableRow >, TSharedRef< class IPropertyTableCell > > Cells;
+	bool bIsHidden;
+	TSharedRef< IDataSource > DataSource;
+	
+	FFrozenStateChanged FrozenStateChanged;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyCustomizationHelpers.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyCustomizationHelpers.cpp
new file mode 100644
index 0000000..a8f8233
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyCustomizationHelpers.cpp
@@ -0,0 +1,1476 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/IDetailChildrenBuilder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Engine/Texture.h"
+//#include "Factories/Factory.h"
+//#include "Editor.h"
+#include "UObject/UObjectHash.h"
+#include "UObject/UObjectIterator.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SGridPanel.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SComboButton.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+//#include "UserInterface/PropertyEditor/SPropertyAssetPicker.h"
+//#include "UserInterface/PropertyEditor/SPropertyMenuAssetPicker.h"
+#include "UserInterface/PropertyEditor/SPropertyMenuComponentPicker.h"
+//#include "UserInterface/PropertyEditor/SPropertyMenuActorPicker.h"
+//#include "UserInterface/PropertyEditor/SPropertySceneOutliner.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "UserInterface/PropertyEditor/SPropertyEditorAsset.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.h"
+//#include "UserInterface/PropertyEditor/SPropertyEditorInteractiveActorPicker.h"
+//#include "UserInterface/PropertyEditor/SPropertyEditorSceneDepthPicker.h"
+#include "Widgets/Input/SHyperlink.h"
+#include "Widgets/Layout/SWidgetSwitcher.h"
+//#include "IDocumentation.h"
+#include "RuntimePropertyEditor/SResetToDefaultPropertyEditor.h"
+#include "SodaFontGlyphs.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+#include "RuntimePropertyEditor/IDetailGroup.h"
+//#include "AssetToolsModule.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyCustomizationHelpers"
+
+namespace soda
+{
+
+namespace PropertyCustomizationHelpers
+{
+	class SPropertyEditorButton : public SCompoundWidget
+	{
+	public:
+
+		SLATE_BEGIN_ARGS( SPropertyEditorButton ) 
+			: _Text( )
+			, _Image( FSodaStyle::GetBrush("Default") )
+			, _IsFocusable( true )
+		{}
+			SLATE_ATTRIBUTE( FText, Text )
+			SLATE_ARGUMENT( const FSlateBrush*, Image )
+			SLATE_EVENT( FSimpleDelegate, OnClickAction )
+
+			/** Sometimes a button should only be mouse-clickable and never keyboard focusable. */
+			SLATE_ARGUMENT( bool, IsFocusable )
+		SLATE_END_ARGS()
+
+		void Construct( const FArguments& InArgs )
+		{
+			OnClickAction = InArgs._OnClickAction;
+
+			ChildSlot
+			[
+				SNew(SBox)
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.WidthOverride(22)
+				.HeightOverride(22)
+				.ToolTipText(InArgs._Text)
+				[
+					SNew(SButton)
+					.ButtonStyle( FAppStyle::Get(), "SimpleButton" )
+					.OnClicked( this, &SPropertyEditorButton::OnClick )
+					.ContentPadding(0)
+					.IsFocusable(InArgs._IsFocusable)
+					[ 
+						SNew( SImage )
+						.Image( InArgs._Image )
+						.ColorAndOpacity( FSlateColor::UseForeground() )
+					]
+				]
+			]; 
+		}
+
+
+	private:
+		FReply OnClick()
+		{
+			OnClickAction.ExecuteIfBound();
+			return FReply::Handled();
+		}
+	private:
+		FSimpleDelegate OnClickAction;
+	};
+
+	TSharedRef<SWidget> MakeResetButton(FSimpleDelegate OnResetClicked, TAttribute<FText> OptionalToolTipText /*= FText()*/, TAttribute<bool> IsEnabled /*= true*/)
+	{
+		return
+			SNew(SPropertyEditorButton)
+			.Text(OptionalToolTipText.Get().IsEmpty() ? LOCTEXT("ResetButtonToolTipText", "Reset Element to Default Value") : OptionalToolTipText)
+			.Image(FSodaStyle::GetBrush("PropertyWindow.DiffersFromDefault"))
+			.OnClickAction(OnResetClicked)
+			.IsEnabled(IsEnabled)
+			.Visibility(IsEnabled.Get() ? EVisibility::Visible : EVisibility::Collapsed)
+			.IsFocusable(false);
+	}
+
+
+	TSharedRef<SWidget> MakeAddButton( FSimpleDelegate OnAddClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled )
+	{
+		return	
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "AddButtonToolTipText", "Add Element") : OptionalToolTipText )
+			.Image( FSodaStyle::GetBrush("Icons.PlusCircle") )
+			.OnClickAction( OnAddClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	TSharedRef<SWidget> MakeRemoveButton( FSimpleDelegate OnRemoveClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled )
+	{
+		return	
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "RemoveButtonToolTipText", "Remove Element") : OptionalToolTipText )
+			.Image( FSodaStyle::GetBrush("Icons.Minus") )
+			.OnClickAction( OnRemoveClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	TSharedRef<SWidget> MakeEmptyButton( FSimpleDelegate OnEmptyClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled )
+	{
+		return
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "EmptyButtonToolTipText", "Remove All Elements") : OptionalToolTipText )
+			.Image( FSodaStyle::GetBrush("Icons.Delete") )
+			.OnClickAction( OnEmptyClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	TSharedRef<SWidget> MakeUseSelectedButton( FSimpleDelegate OnUseSelectedClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled )
+	{
+		return
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "UseButtonToolTipText", "Use Selected Asset from Content Browser") : OptionalToolTipText )
+			.Image( FSodaStyle::GetBrush("Icons.Use") )
+			.OnClickAction( OnUseSelectedClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	TSharedRef<SWidget> MakeDeleteButton( FSimpleDelegate OnDeleteClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled )
+	{
+		return
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "DeleteButtonToolTipText", "Delete") : OptionalToolTipText )
+			.Image( FSodaStyle::GetBrush("Icons.Delete") )
+			.OnClickAction( OnDeleteClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	TSharedRef<SWidget> MakeClearButton( FSimpleDelegate OnClearClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled )
+	{
+		return
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "ClearButtonToolTipText", "Clear") : OptionalToolTipText )
+			.Image(FAppStyle::Get().GetBrush("Icons.X"))
+			.OnClickAction( OnClearClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	FText GetVisibilityDisplay(TAttribute<bool> bEnabled)
+	{
+		return bEnabled.Get() ? FSodaFontGlyphs::Eye : FSodaFontGlyphs::Eye_Slash;
+	}
+
+	TSharedRef<SWidget> MakeVisibilityButton(FOnClicked OnVisibilityClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> VisibilityDelegate)
+	{
+		TAttribute<FText>::FGetter DynamicVisibilityGetter;
+		DynamicVisibilityGetter.BindStatic(&GetVisibilityDisplay, VisibilityDelegate);
+		TAttribute<FText> DynamicVisibilityAttribute = TAttribute<FText>::Create(DynamicVisibilityGetter);
+		return
+			SNew( SButton )
+			.OnClicked( OnVisibilityClicked )
+			.IsEnabled(true)
+			.IsFocusable( false )
+			.ButtonStyle(FSodaStyle::Get(), "HoverHintOnly")
+			.ToolTipText(LOCTEXT("ToggleVisibility", "Toggle Visibility"))
+			.ContentPadding(2.0f)
+			.ForegroundColor(FSlateColor::UseForeground())
+			[
+				SNew(STextBlock)
+				.Font(FSodaStyle::Get().GetFontStyle("FontAwesome.10"))
+				.Text(DynamicVisibilityAttribute)
+			];
+	}
+
+	TSharedRef<SWidget> MakeBrowseButton( FSimpleDelegate OnFindClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled, const bool IsActor)
+	{
+		const FSlateBrush* BrowseIcon = IsActor ? FSodaStyle::Get().GetBrush("Icons.SelectInViewport") : FSodaStyle::Get().GetBrush("Icons.BrowseContent");
+
+		return
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "BrowseButtonToolTipText", "Browse to Asset in Content Browser") : OptionalToolTipText )
+			.Image(BrowseIcon)
+			.OnClickAction( OnFindClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	TSharedRef<SWidget> MakeNewBlueprintButton( FSimpleDelegate OnNewBlueprintClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled )
+	{
+		return
+			SNew( SPropertyEditorButton )
+			.Text( OptionalToolTipText.Get().IsEmpty() ? LOCTEXT( "NewBlueprintButtonToolTipText", "Create New Blueprint") : OptionalToolTipText )
+			.Image( FSodaStyle::GetBrush("Icons.PlusCircle") )
+			.OnClickAction( OnNewBlueprintClicked )
+			.IsEnabled(IsEnabled)
+			.IsFocusable( false );
+	}
+
+	TSharedRef<SWidget> MakeInsertDeleteDuplicateButton(FExecuteAction OnInsertClicked, FExecuteAction OnDeleteClicked, FExecuteAction OnDuplicateClicked)
+	{
+		FMenuBuilder MenuContentBuilder( true, nullptr, nullptr, true );
+		{
+			if (OnInsertClicked.IsBound())
+			{
+				FUIAction InsertAction(OnInsertClicked);
+				MenuContentBuilder.AddMenuEntry(LOCTEXT("InsertButtonLabel", "Insert"), FText::GetEmpty(), FSlateIcon(), InsertAction);
+			}
+
+			if (OnDeleteClicked.IsBound())
+			{
+				FUIAction DeleteAction(OnDeleteClicked);
+				MenuContentBuilder.AddMenuEntry(LOCTEXT("DeleteButtonLabel", "Delete"), FText::GetEmpty(), FSlateIcon(), DeleteAction);
+			}
+
+			if (OnDuplicateClicked.IsBound())
+			{
+				FUIAction DuplicateAction( OnDuplicateClicked );
+				MenuContentBuilder.AddMenuEntry( LOCTEXT( "DuplicateButtonLabel", "Duplicate"), FText::GetEmpty(), FSlateIcon(), DuplicateAction );
+			}
+		}
+
+		return
+			SNew(SComboButton)
+			.ComboButtonStyle( FAppStyle::Get(), "SimpleComboButton" )
+			.ContentPadding(2)
+			.ForegroundColor( FSlateColor::UseForeground() )
+			.HasDownArrow(true)
+			.MenuContent()
+			[
+				MenuContentBuilder.MakeWidget()
+			];
+	}
+	/*
+	TSharedRef<SWidget> MakeAssetPickerAnchorButton( FOnGetAllowedClasses OnGetAllowedClasses, FOnAssetSelected OnAssetSelectedFromPicker, const TSharedPtr<IPropertyHandle>& PropertyHandle)
+	{
+		return 
+			SNew( SPropertyAssetPicker )
+			.OnGetAllowedClasses( OnGetAllowedClasses )
+			.OnAssetSelected( OnAssetSelectedFromPicker )
+			.PropertyHandle( PropertyHandle );
+	}
+	*/
+
+	TArray<const UClass*> EmptyClassArray;
+
+	/*
+	TSharedRef<SWidget> MakeAssetPickerWithMenu(const FAssetData& InitialObject, const bool AllowClear, const TArray<const UClass*>& AllowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle, const TArray<FAssetData>& OwnerAssetArray)
+	{
+		return MakeAssetPickerWithMenu(InitialObject, AllowClear, true, AllowedClasses, EmptyClassArray, NewAssetFactories, OnShouldFilterAsset, OnSet, OnClose, PropertyHandle, OwnerAssetArray);
+	}
+
+	TSharedRef<SWidget> MakeAssetPickerWithMenu(const FAssetData& InitialObject, const bool AllowClear, const TArray<const UClass*>& AllowedClasses, const TArray<const UClass*>& DisallowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle, const TArray<FAssetData>& OwnerAssetArray)
+	{
+		return MakeAssetPickerWithMenu(InitialObject, AllowClear, true, AllowedClasses, DisallowedClasses, NewAssetFactories, OnShouldFilterAsset, OnSet, OnClose, PropertyHandle, OwnerAssetArray);
+	}
+
+	TSharedRef<SWidget> MakeAssetPickerWithMenu(const FAssetData& InitialObject, const bool AllowClear, const bool AllowCopyPaste, const TArray<const UClass*>& AllowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle, const TArray<FAssetData>& OwnerAssetArray)
+	{
+		return MakeAssetPickerWithMenu(InitialObject, AllowClear, AllowCopyPaste, AllowedClasses, EmptyClassArray, NewAssetFactories, OnShouldFilterAsset, OnSet, OnClose, PropertyHandle, OwnerAssetArray);
+	}
+	*/
+	/*
+	TSharedRef<SWidget> MakeAssetPickerWithMenu( const FAssetData& InitialObject, const bool AllowClear, const bool AllowCopyPaste, const TArray<const UClass*>& AllowedClasses, const TArray<const UClass*>& DisallowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle, const TArray<FAssetData>& OwnerAssetArray)
+	{
+		return
+			SNew(SPropertyMenuAssetPicker)
+			.InitialObject(InitialObject)
+			.PropertyHandle(PropertyHandle)
+			.OwnerAssetArray(OwnerAssetArray)
+			.AllowClear(AllowClear)
+			.AllowCopyPaste(AllowCopyPaste)
+			.AllowedClasses(AllowedClasses)
+			.DisallowedClasses(DisallowedClasses)
+			.NewAssetFactories(NewAssetFactories)
+			.OnShouldFilterAsset(OnShouldFilterAsset)
+			.OnSet(OnSet)
+			.OnClose(OnClose);
+	}
+	*/
+	/*
+	TSharedRef<SWidget> MakeActorPickerAnchorButton( FOnGetActorFilters OnGetActorFilters, FOnActorSelected OnActorSelectedFromPicker )
+	{
+		return 
+			SNew( SPropertySceneOutliner )
+			.OnGetActorFilters( OnGetActorFilters )
+			.OnActorSelected( OnActorSelectedFromPicker );
+	}
+	*/
+	
+	/*
+	TSharedRef<SWidget> MakeActorPickerWithMenu( AActor* const InitialActor, const bool AllowClear, FOnShouldFilterActor ActorFilter, FOnActorSelected OnSet, FSimpleDelegate OnClose, FSimpleDelegate OnUseSelected )
+	{
+		return 
+			SNew( SPropertyMenuActorPicker )
+			.InitialActor(InitialActor)
+			.AllowClear(AllowClear)
+			.ActorFilter(ActorFilter)
+			.OnSet(OnSet)
+			.OnClose(OnClose)
+			.OnUseSelected(OnUseSelected);
+	}
+	*/
+	
+
+	TSharedRef<SWidget> MakeComponentPickerWithMenu( UActorComponent* const InitialComponent, const bool AllowClear, FOnShouldFilterActor ActorFilter, FOnShouldFilterComponent ComponentFilter, FOnComponentSelected OnSet, FSimpleDelegate OnClose )
+	{
+		return
+			SNew(SPropertyMenuComponentPicker)
+			.InitialComponent(InitialComponent)
+			.AllowClear(AllowClear)
+			.ActorFilter(ActorFilter)
+			.ComponentFilter(ComponentFilter)
+			.OnSet(OnSet)
+			.OnClose(OnClose);
+	}
+
+	/*
+	TSharedRef<SWidget> MakeInteractiveActorPicker( FOnGetAllowedClasses OnGetAllowedClasses, FOnShouldFilterActor OnShouldFilterActor, FOnActorSelected OnActorSelectedFromPicker )
+	{
+		return 
+			SNew( SPropertyEditorInteractiveActorPicker )
+			.ToolTipText( LOCTEXT( "PickButtonLabel", "Pick Actor from scene") )
+			.OnGetAllowedClasses( OnGetAllowedClasses )
+			.OnShouldFilterActor( OnShouldFilterActor )
+			.OnActorSelected( OnActorSelectedFromPicker );
+	}
+	*/
+	/*
+	TSharedRef<SWidget> MakeSceneDepthPicker(FOnSceneDepthLocationSelected OnSceneDepthLocationSelected)
+	{
+		return
+			SNew(SPropertyEditorSceneDepthPicker)
+			.ToolTipText(LOCTEXT("PickSceneDepthLabel", "Sample Scene Depth from scene"))
+			.OnSceneDepthLocationSelected(OnSceneDepthLocationSelected);
+	}
+	*/
+	TSharedRef<SWidget> MakeEditConfigHierarchyButton(FSimpleDelegate OnEditConfigClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled)
+	{
+		return
+			SNew(SPropertyEditorButton)
+			.Text(OptionalToolTipText.Get().IsEmpty() ? LOCTEXT("EditConfigHierarchyButtonToolTipText", "Edit the config values of this property") : OptionalToolTipText)
+			.Image(FSodaStyle::GetBrush("DetailsView.EditConfigProperties"))
+			.OnClickAction(OnEditConfigClicked)
+			.IsEnabled(IsEnabled)
+			.IsFocusable(false);
+	}
+	/*
+	TSharedRef<SWidget> MakeDocumentationButton(const TSharedRef<FPropertyEditor>& InPropertyEditor)
+	{
+		TSharedPtr<IPropertyHandle> PropertyHandle = InPropertyEditor->GetPropertyHandle();
+
+		FString DocLink;
+		FString DocExcerptName;
+
+		if (PropertyHandle.IsValid() && PropertyHandle->HasDocumentation())
+		{
+			DocLink = PropertyHandle->GetDocumentationLink();
+			DocExcerptName = PropertyHandle->GetDocumentationExcerptName();
+		}
+		else
+		{
+			DocLink = InPropertyEditor->GetDocumentationLink();
+			DocExcerptName = InPropertyEditor->GetDocumentationExcerptName();
+		}
+
+		return IDocumentation::Get()->CreateAnchor(DocLink, FString(), DocExcerptName);
+	}
+	*/
+
+	TSharedRef<SWidget> MakeSaveButton(FSimpleDelegate OnSaveClicked, TAttribute<FText> OptionalToolTipText, TAttribute<bool> IsEnabled)
+	{
+		return
+			SNew(SPropertyEditorButton)
+			.Text(OptionalToolTipText.Get().IsEmpty() ? LOCTEXT("SaveButtonTooltipText", "Save the currently selected asset.") : OptionalToolTipText)
+			.Image(FSodaStyle::GetBrush("Icons.Save"))
+			.OnClickAction(OnSaveClicked)
+			.IsEnabled(IsEnabled)
+			.IsFocusable(false);
+	}
+
+	FBoolProperty* GetEditConditionProperty(const FProperty* InProperty, bool& bNegate)
+	{
+		FBoolProperty* EditConditionProperty = NULL;
+		bNegate = false;
+
+		if ( InProperty != NULL )
+		{
+			// find the name of the property that should be used to determine whether this property should be editable
+			FString ConditionPropertyName = FRuntimeMetaData::GetMetaData(InProperty, TEXT("EditCondition"));
+
+			// Support negated edit conditions whose syntax is !BoolProperty
+			if ( ConditionPropertyName.StartsWith(FString(TEXT("!"))) )
+			{
+				bNegate = true;
+				// Chop off the negation from the property name
+				ConditionPropertyName = ConditionPropertyName.Right(ConditionPropertyName.Len() - 1);
+			}
+
+			// for now, only support boolean conditions, and only allow use of another property within the same struct as the conditional property
+			if ( ConditionPropertyName.Len() > 0 && !ConditionPropertyName.Contains(TEXT(".")) )
+			{
+				UStruct* Scope = InProperty->GetOwnerStruct();
+				EditConditionProperty = FindFProperty<FBoolProperty>(Scope, *ConditionPropertyName);
+			}
+		}
+
+		return EditConditionProperty;
+	}
+	/*
+	TArray<UFactory*> GetNewAssetFactoriesForClasses(const TArray<const UClass*>& Classes)
+	{
+		return GetNewAssetFactoriesForClasses(Classes, EmptyClassArray);
+	}
+
+	TArray<UFactory*> GetNewAssetFactoriesForClasses(const TArray<const UClass*>& Classes, const TArray<const UClass*>& DisallowedClasses)
+	{
+		const IAssetTools& AssetTools = FModuleManager::LoadModuleChecked<FAssetToolsModule>("AssetTools").Get();
+		TArray<UFactory*> AllFactories = AssetTools.GetNewAssetFactories();
+		TArray<UFactory*> FilteredFactories;
+
+		for (UFactory* Factory : AllFactories)
+				{
+					UClass* SupportedClass = Factory->GetSupportedClass();
+			auto IsChildOfLambda = [SupportedClass](const UClass* InClass) { return SupportedClass->IsChildOf(InClass); };
+
+					if (SupportedClass != nullptr 
+				&& Classes.ContainsByPredicate(IsChildOfLambda)
+				&& !DisallowedClasses.ContainsByPredicate(IsChildOfLambda))
+					{
+				FilteredFactories.Add(Factory);
+			}
+		}
+
+		FilteredFactories.Sort([](UFactory& A, UFactory& B) -> bool
+		{
+			return A.GetDisplayName().CompareToCaseIgnored(B.GetDisplayName()) < 0;
+		});
+
+		return FilteredFactories;
+	}
+	*/
+}
+
+
+void SObjectPropertyEntryBox::Construct( const FArguments& InArgs )
+{
+	ObjectPath = InArgs._ObjectPath;
+	OnObjectChanged = InArgs._OnObjectChanged;
+	OnShouldSetAsset = InArgs._OnShouldSetAsset;
+	OnIsEnabled = InArgs._OnIsEnabled;
+
+	const TArray<FAssetData>& OwnerAssetDataArray = InArgs._OwnerAssetDataArray;
+
+	bool bDisplayThumbnail = InArgs._DisplayThumbnail;
+	FIntPoint ThumbnailSize(48, 48);
+	if (InArgs._ThumbnailSizeOverride.IsSet())
+	{
+		ThumbnailSize = InArgs._ThumbnailSizeOverride.Get();
+	}
+
+	if( InArgs._PropertyHandle.IsValid() && InArgs._PropertyHandle->IsValidHandle() )
+	{
+		PropertyHandle = InArgs._PropertyHandle;
+
+		// check if the property metadata wants us to display a thumbnail
+		/*
+		const FString& DisplayThumbnailString = PropertyHandle->GetProperty()->GetMetaData(TEXT("DisplayThumbnail"));
+		if(DisplayThumbnailString.Len() > 0)
+		{
+			bDisplayThumbnail = DisplayThumbnailString == TEXT("true");
+		}
+		*/
+
+		// check if the property metadata has an override to the thumbnail size
+		/*
+		const FString& ThumbnailSizeString = PropertyHandle->GetProperty()->GetMetaData(TEXT("ThumbnailSize"));
+		if ( ThumbnailSizeString.Len() > 0 )
+		{
+			FVector2D ParsedVector;
+			if ( ParsedVector.InitFromString(ThumbnailSizeString) )
+			{
+				ThumbnailSize.X = (int32)ParsedVector.X;
+				ThumbnailSize.Y = (int32)ParsedVector.Y;
+			}
+		}
+		*/
+
+		// if being used with an object property, check the allowed class is valid for the property
+		FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(PropertyHandle->GetProperty());
+		if (ObjectProperty != NULL)
+		{
+			checkSlow(InArgs._AllowedClass->IsChildOf(ObjectProperty->PropertyClass));
+		}
+	}
+
+	ChildSlot
+	[	
+		SNew(SHorizontalBox)
+		+SHorizontalBox::Slot()
+		.FillWidth(1)
+		.VAlign(VAlign_Center)	
+		[
+			SAssignNew(PropertyEditorAsset, SPropertyEditorAsset)
+				.ObjectPath( this, &SObjectPropertyEntryBox::OnGetObjectPath )
+				.Class( InArgs._AllowedClass )
+				//.NewAssetFactories( InArgs._NewAssetFactories )
+				.IsEnabled(this, &SObjectPropertyEntryBox::IsEnabled)
+				.OnSetObject(this, &SObjectPropertyEntryBox::OnSetObject)
+				//.ThumbnailPool(InArgs._ThumbnailPool)
+				.DisplayThumbnail(bDisplayThumbnail)
+				.OnShouldFilterAsset(InArgs._OnShouldFilterAsset)
+				.AllowClear(InArgs._AllowClear)
+				.DisplayUseSelected(InArgs._DisplayUseSelected)
+				.DisplayBrowse(InArgs._DisplayBrowse)
+				.EnableContentPicker(InArgs._EnableContentPicker)
+				.PropertyHandle(PropertyHandle)
+				.OwnerAssetDataArray(OwnerAssetDataArray)
+				.ThumbnailSize(ThumbnailSize)
+				.DisplayCompactSize(InArgs._DisplayCompactSize)
+				.CustomContentSlot()
+				[
+					InArgs._CustomContentSlot.Widget
+				]
+		]
+	];
+}
+
+void SObjectPropertyEntryBox::GetDesiredWidth(float& OutMinDesiredWidth, float &OutMaxDesiredWidth)
+{
+	checkf(PropertyEditorAsset.IsValid(), TEXT("SObjectPropertyEntryBox hasn't been constructed yet."));
+	//PropertyEditorAsset->GetDesiredWidth(OutMinDesiredWidth, OutMaxDesiredWidth);
+	OutMinDesiredWidth = 16;
+	OutMaxDesiredWidth = 16;
+}
+
+FString SObjectPropertyEntryBox::OnGetObjectPath() const
+{
+	FString StringReference;
+	if (ObjectPath.IsSet())
+	{
+		StringReference = ObjectPath.Get();
+	}
+	else if( PropertyHandle.IsValid() )
+	{
+		PropertyHandle->GetValueAsFormattedString( StringReference );
+	}
+	
+	return StringReference;
+}
+
+void SObjectPropertyEntryBox::OnSetObject(const FAssetData& AssetData)
+{
+	if( PropertyHandle.IsValid() && PropertyHandle->IsValidHandle() )
+	{
+		if (!OnShouldSetAsset.IsBound() || OnShouldSetAsset.Execute(AssetData))
+		{
+			PropertyHandle->SetValue(AssetData);
+		}
+	}
+	OnObjectChanged.ExecuteIfBound(AssetData);
+}
+
+bool SObjectPropertyEntryBox::IsEnabled() const
+{
+	bool IsEnabled = true;
+	if (PropertyHandle.IsValid())
+	{
+		IsEnabled &= PropertyHandle->IsEditable();
+	}
+
+	if (OnIsEnabled.IsBound())
+	{
+		IsEnabled &= OnIsEnabled.Execute();
+	}
+
+	return IsEnabled;
+}
+
+/*
+void SClassPropertyEntryBox::Construct(const FArguments& InArgs)
+{
+	ChildSlot
+	[	
+		SNew(SHorizontalBox)
+		+SHorizontalBox::Slot()
+		.VAlign(VAlign_Center)
+		[
+			SAssignNew(PropertyEditorClass, SPropertyEditorClass)
+				.MetaClass(InArgs._MetaClass)
+				.RequiredInterface(InArgs._RequiredInterface)
+				.AllowAbstract(InArgs._AllowAbstract)
+				.IsBlueprintBaseOnly(InArgs._IsBlueprintBaseOnly)
+				.AllowNone(InArgs._AllowNone)
+				.ShowViewOptions(!InArgs._HideViewOptions)
+				.ShowDisplayNames(InArgs._ShowDisplayNames)
+				.ShowTree(InArgs._ShowTreeView)
+				.SelectedClass(InArgs._SelectedClass)
+				.OnSetClass(InArgs._OnSetClass)
+		]
+	];
+}
+*/
+
+/*
+void SStructPropertyEntryBox::Construct(const FArguments& InArgs)
+{
+	ChildSlot
+	[	
+		SNew(SHorizontalBox)
+		+SHorizontalBox::Slot()
+		.VAlign(VAlign_Center)
+		[
+			SAssignNew(PropertyEditorStruct, SPropertyEditorStruct)
+				.MetaStruct(InArgs._MetaStruct)
+				.AllowNone(InArgs._AllowNone)
+				.ShowViewOptions(!InArgs._HideViewOptions)
+				.ShowDisplayNames(InArgs._ShowDisplayNames)
+				.ShowTree(InArgs._ShowTreeView)
+				.SelectedStruct(InArgs._SelectedStruct)
+				.OnSetStruct(InArgs._OnSetStruct)
+		]
+	];
+}
+*/
+
+/*
+void SProperty::Construct( const FArguments& InArgs, TSharedPtr<IPropertyHandle> InPropertyHandle )
+{
+	TSharedPtr<SWidget> ChildSlotContent;
+
+	const FText& DisplayName = InArgs._DisplayName.Get();
+
+	PropertyHandle = InPropertyHandle;
+
+	if( PropertyHandle->IsValidHandle() )
+	{
+		InPropertyHandle->MarkHiddenByCustomization();
+
+		if( InArgs._CustomWidget.Widget != SNullWidget::NullWidget )
+		{
+			TSharedRef<SWidget> CustomWidget = InArgs._CustomWidget.Widget;
+
+			// If the name should be displayed create it now
+			if( InArgs._ShouldDisplayName )
+			{
+				CustomWidget = 
+					SNew( SHorizontalBox )
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Right)
+					.Padding( 4.0f, 0.0f )
+					.FillWidth(1.0f)
+					[
+						InPropertyHandle->CreatePropertyNameWidget( DisplayName )
+					]
+					+ SHorizontalBox::Slot()
+					.Padding( 0.0f, 0.0f )
+					.VAlign(VAlign_Center)
+					.FillWidth(1.0f)
+					[
+						CustomWidget
+					];
+			}
+
+			ChildSlotContent = CustomWidget;
+		}
+		else
+		{
+			if( InArgs._ShouldDisplayName )
+			{
+				ChildSlotContent = 
+					SNew( SHorizontalBox )
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Right)
+					.Padding( 3.0f, 0.0f )
+					.FillWidth(1.0f)
+					[
+						InPropertyHandle->CreatePropertyNameWidget( DisplayName )
+					]
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.FillWidth(1.0f)
+					[
+						InPropertyHandle->CreatePropertyValueWidget()
+					];
+			}
+			else
+			{
+				ChildSlotContent = InPropertyHandle->CreatePropertyValueWidget();
+			}
+		}
+	}
+	else
+	{
+		// The property was not found, just filter out this widget completely
+		// Note a spacer widget is used instead of setting the visibility of this widget in the case that a user overrides the visibility of this widget
+		ChildSlotContent = 
+			SNew( SSpacer )
+			.Visibility( EVisibility::Collapsed );
+	}
+	
+	ChildSlot
+	[
+		ChildSlotContent.ToSharedRef()
+	];
+}
+
+void SProperty::ResetToDefault()
+{
+	if( PropertyHandle->IsValidHandle() )
+	{
+		PropertyHandle->ResetToDefault();
+	}
+}
+
+FText SProperty::GetResetToDefaultLabel() const
+{
+	if( PropertyHandle->IsValidHandle() )
+	{
+		return PropertyHandle->GetResetToDefaultLabel();
+	}
+
+	return FText();
+}
+
+bool SProperty::ShouldShowResetToDefault() const
+{
+	return PropertyHandle->IsValidHandle() && !PropertyHandle->IsEditConst() && PropertyHandle->DiffersFromDefault();
+}
+
+bool SProperty::IsValidProperty() const
+{
+	return PropertyHandle.IsValid() && PropertyHandle->IsValidHandle();
+}
+*/
+
+/*
+TSharedRef<SWidget> PropertyCustomizationHelpers::MakePropertyComboBox(const FPropertyComboBoxArgs& InArgs)
+{
+	return SNew(SPropertyEditorCombo).ComboArgs(InArgs);
+}
+
+
+TSharedRef<SWidget> PropertyCustomizationHelpers::MakePropertyComboBox(const TSharedPtr<IPropertyHandle>& InPropertyHandle, FOnGetPropertyComboBoxStrings OnGetStrings, FOnGetPropertyComboBoxValue OnGetValue, FOnPropertyComboBoxValueSelected OnValueSelected)
+{
+	return MakePropertyComboBox(FPropertyComboBoxArgs(InPropertyHandle, OnGetStrings, OnGetValue, OnValueSelected));
+}
+
+void PropertyCustomizationHelpers::MakeInstancedPropertyCustomUI(TMap<FName, IDetailGroup*>& ExistingGroup, IDetailCategoryBuilder& BaseCategory, TSharedRef<IPropertyHandle>& BaseProperty, FOnInstancedPropertyIteration AddRowDelegate)
+{
+	uint32 NumChildren = 0;
+	BaseProperty->GetNumChildren(NumChildren);
+	for (uint32 PropertyIndex = 0; PropertyIndex < NumChildren; ++PropertyIndex)
+	{
+		TSharedRef<IPropertyHandle> ChildHandle = BaseProperty->GetChildHandle(PropertyIndex).ToSharedRef();
+
+		if (ChildHandle->GetProperty())
+		{
+			const FName DefaultCategoryName = ChildHandle->GetDefaultCategoryName();
+			const bool DelegateIsBound = AddRowDelegate.IsBound();
+			IDetailGroup* DetailGroup = nullptr;
+
+			if (!DefaultCategoryName.IsNone())
+			{
+				// Custom categories don't work with instanced object properties, so we are using groups instead here.
+				IDetailGroup*& DetailGroupPtr = ExistingGroup.FindOrAdd(DefaultCategoryName);
+				if (!DetailGroupPtr)
+				{
+					DetailGroupPtr = &BaseCategory.AddGroup(DefaultCategoryName, ChildHandle->GetDefaultCategoryText());
+				}
+				DetailGroup = DetailGroupPtr;
+			}
+
+			if (DelegateIsBound)
+			{
+				AddRowDelegate.Execute(BaseCategory, DetailGroup, ChildHandle);
+			}
+			else if (DetailGroup)
+			{
+				DetailGroup->AddPropertyRow(ChildHandle);
+			}
+			else
+			{
+				BaseCategory.AddProperty(ChildHandle);
+			}
+		}
+		else
+		{
+			MakeInstancedPropertyCustomUI(ExistingGroup, BaseCategory, ChildHandle, AddRowDelegate);
+		}
+	}
+}
+*/
+//////////////////////////////////////////////////////////////////////////
+//
+// Sections list
+
+/**
+* Builds up a list of unique Sections while creating some information about the Sections
+*/
+
+/*
+class FSectionListBuilder : public ISectionListBuilder
+{
+	friend class FSectionList;
+public:
+	
+	FSectionListBuilder(int32 InThumbnailSize)
+		:ThumbnailSize(InThumbnailSize)
+	{}
+	
+	//
+	// Adds a new Section to the list
+	//
+	// @param SlotIndex		The slot (usually mesh element index) where the Section is located on the component
+	// @param Section		The Section being used
+	// @param bCanBeReplced	Whether or not the Section can be replaced by a user
+	//
+	virtual void AddSection(int32 LodIndex, int32 SectionIndex, FName InMaterialSlotName, int32 InMaterialSlotIndex, FName InOriginalMaterialSlotName, const TMap<int32, FName> &InAvailableMaterialSlotName, const UMaterialInterface* Material, bool IsSectionUsingCloth, bool bIsChunkSection, int32 DefaultMaterialIndex) override
+	{
+		FSectionListItem SectionItem(LodIndex, SectionIndex, InMaterialSlotName, InMaterialSlotIndex, InOriginalMaterialSlotName, InAvailableMaterialSlotName, Material, IsSectionUsingCloth, ThumbnailSize, bIsChunkSection, DefaultMaterialIndex);
+		if (!Sections.Contains(SectionItem))
+		{
+			Sections.Add(SectionItem);
+			if (!SectionsByLOD.Contains(SectionItem.LodIndex))
+			{
+				TArray<FSectionListItem> LodSectionsArray;
+				LodSectionsArray.Add(SectionItem);
+				SectionsByLOD.Add(SectionItem.LodIndex, LodSectionsArray);
+			}
+			else
+			{
+				//Remove old entry
+				TArray<FSectionListItem> &ExistingSections = *SectionsByLOD.Find(SectionItem.LodIndex);
+				for (int32 ExistingSectionIndex = 0; ExistingSectionIndex < ExistingSections.Num(); ++ExistingSectionIndex)
+				{
+					const FSectionListItem &ExistingSectionItem = ExistingSections[ExistingSectionIndex];
+					if (ExistingSectionItem.LodIndex == LodIndex && ExistingSectionItem.SectionIndex == SectionIndex)
+					{
+						ExistingSections.RemoveAt(ExistingSectionIndex);
+						break;
+					}
+				}
+				ExistingSections.Add(SectionItem);
+			}
+		}
+	}
+
+	// Empties the list
+	void Empty()
+	{
+		Sections.Reset();
+		SectionsByLOD.Reset();
+	}
+
+	// Sorts the list by lod and section index 
+	void Sort()
+	{
+		struct FSortByIndex
+		{
+			bool operator()(const FSectionListItem& A, const FSectionListItem& B) const
+			{
+				return (A.LodIndex == B.LodIndex) ? A.SectionIndex < B.SectionIndex : A.LodIndex < B.LodIndex;
+			}
+		};
+
+		Sections.Sort(FSortByIndex());
+	}
+
+	// @return The number of Sections in the list 
+	uint32 GetNumSections() const
+	{
+		return Sections.Num();
+	}
+
+	uint32 GetNumSections(int32 LodIndex) const
+	{
+		return SectionsByLOD.Contains(LodIndex) ? SectionsByLOD.Find(LodIndex)->Num() : 0;
+	}
+
+private:
+	// All Section items in the list 
+	TArray<FSectionListItem> Sections;
+	// All Section items in the list 
+	TMap<int32, TArray<FSectionListItem>> SectionsByLOD;
+
+	int32 ThumbnailSize;
+};
+*/
+
+/**
+* A view of a single item in an FSectionList
+*/
+/*
+class FSectionItemView : public TSharedFromThis<FSectionItemView>
+{
+public:
+	//
+	// Creates a new instance of this class
+	//
+	// @param Section				The Section to view
+	// @param InOnSectionChanged	Delegate for when the Section changes
+	//
+	static TSharedRef<FSectionItemView> Create(
+		const FSectionListItem& Section,
+		FOnSectionChanged InOnSectionChanged,
+		FOnGenerateWidgetsForSection InOnGenerateNameWidgetsForSection,
+		FOnGenerateWidgetsForSection InOnGenerateWidgetsForSection,
+		FOnResetSectionToDefaultClicked InOnResetToDefaultClicked,
+		int32 InMultipleSectionCount,
+		int32 InThumbnailSize)
+	{
+		return MakeShareable(new FSectionItemView(Section, InOnSectionChanged, InOnGenerateNameWidgetsForSection, InOnGenerateWidgetsForSection, InOnResetToDefaultClicked, InMultipleSectionCount, InThumbnailSize));
+	}
+
+	TSharedRef<SWidget> CreateNameContent()
+	{
+		FFormatNamedArguments Arguments;
+		Arguments.Add(TEXT("SectionIndex"), SectionItem.SectionIndex);
+		return
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.VAlign(VAlign_Center)
+			[
+				SNew(STextBlock)
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+				.Text(FText::Format(LOCTEXT("SectionIndex", "Section {SectionIndex}"), Arguments))
+			]
+			+ SVerticalBox::Slot()
+			.Padding(0.0f, 4.0f)
+			.AutoHeight()
+			[
+				OnGenerateCustomNameWidgets.IsBound() ? OnGenerateCustomNameWidgets.Execute(SectionItem.LodIndex, SectionItem.SectionIndex) : StaticCastSharedRef<SWidget>(SNullWidget::NullWidget)
+			];
+	}
+
+	TSharedRef<SWidget> CreateValueContent(const TSharedPtr<FAssetThumbnailPool>& ThumbnailPool)
+	{
+		FFormatNamedArguments Arguments;
+		Arguments.Add(TEXT("DefaultMaterialIndex"), SectionItem.DefaultMaterialIndex);
+		FText BaseMaterialSlotTooltip = SectionItem.DefaultMaterialIndex != SectionItem.MaterialSlotIndex ? FText::Format(LOCTEXT("SectionIndex_BaseMaterialSlotNameTooltip", "This section material slot was change from the default value [{DefaultMaterialIndex}]."), Arguments) : FText::GetEmpty();
+		FText MaterialSlotNameTooltipText = SectionItem.IsSectionUsingCloth ? FText(LOCTEXT("SectionIndex_MaterialSlotNameTooltip", "Cannot change the material slot when the mesh section use the cloth system.")) : BaseMaterialSlotTooltip;
+		return
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.HAlign(HAlign_Fill)
+			[
+				SNew(SVerticalBox)
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				.Padding(0.0f)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Fill)
+				[
+					SNew(SHorizontalBox)
+					.Visibility(SectionItem.bIsChunkSection ? EVisibility::Collapsed : EVisibility::Visible)
+					+ SHorizontalBox::Slot()
+					.FillWidth(1.0f)
+					[
+						SNew(SPropertyEditorAsset)
+						.ObjectPath(SectionItem.Material->GetPathName())
+						.Class(UMaterialInterface::StaticClass())
+						.DisplayThumbnail(true)
+						.ThumbnailSize(FIntPoint(ThumbnailSize, ThumbnailSize))
+						.DisplayUseSelected(false)
+						.AllowClear(false)
+						.DisplayBrowse(false)
+						.EnableContentPicker(false)
+						.ThumbnailPool(ThumbnailPool)
+						.DisplayCompactSize(true)
+						.CustomContentSlot()
+						[
+							SNew( SBox )
+							.HAlign(HAlign_Fill)
+							[
+								SNew(SVerticalBox)
+								+SVerticalBox::Slot()
+								.AutoHeight()
+								[
+									SNew(SHorizontalBox)
+									+ SHorizontalBox::Slot()
+									.Padding(0)
+									.VAlign(VAlign_Center)
+									.AutoWidth()
+									[
+										SNew(SBox)
+										.HAlign(HAlign_Right)
+										.MinDesiredWidth(65.0f)
+										[
+											SNew(STextBlock)
+											.Font(IDetailLayoutBuilder::GetDetailFont())
+											.Text(LOCTEXT("SectionListItemMaterialSlotNameLabel", "Material Slot"))
+											.ToolTipText(MaterialSlotNameTooltipText)
+										]
+									]
+									+ SHorizontalBox::Slot()
+									.VAlign(VAlign_Center)
+									.FillWidth(1.0f)
+									.Padding(5, 0, 0, 0)
+									[
+										SNew(SBox)
+										.HAlign(HAlign_Fill)
+										.VAlign(VAlign_Center)
+										.MinDesiredWidth(210.0f)
+										[
+											//Material Slot Name
+											SNew(SComboButton)
+											.OnGetMenuContent(this, &FSectionItemView::OnGetMaterialSlotNameMenuForSection)
+											.VAlign(VAlign_Center)
+											.ContentPadding(2)
+											.IsEnabled(!SectionItem.IsSectionUsingCloth)
+											.ButtonContent()
+											[
+												SNew(STextBlock)
+												.Font(IDetailLayoutBuilder::GetDetailFont())
+												.Text(this, &FSectionItemView::GetCurrentMaterialSlotName)
+												.ToolTipText(MaterialSlotNameTooltipText)
+											]
+										]
+									]
+								]
+								+SVerticalBox::Slot()
+								.AutoHeight()
+								.VAlign(VAlign_Center)
+								[
+									OnGenerateCustomSectionWidgets.IsBound() ? OnGenerateCustomSectionWidgets.Execute(SectionItem.LodIndex, SectionItem.SectionIndex) : StaticCastSharedRef<SWidget>(SNullWidget::NullWidget)
+								]
+							]
+						]
+					]
+				]
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				.Padding(0.0f)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Fill)
+				[
+					SNew(SHorizontalBox)
+					.Visibility(SectionItem.bIsChunkSection ? EVisibility::Visible : EVisibility::Collapsed)
+					+ SHorizontalBox::Slot()
+					.FillWidth(1.0f)
+					[
+						SNew(STextBlock)
+						.Font(IDetailLayoutBuilder::GetDetailFont())
+						.Text(LOCTEXT("SectionListItemChunkSectionValueLabel", "Chunked"))
+					]
+				]
+			];
+	}
+
+private:
+
+	FSectionItemView(const FSectionListItem& InSection,
+		FOnSectionChanged& InOnSectionChanged,
+		FOnGenerateWidgetsForSection& InOnGenerateNameWidgets,
+		FOnGenerateWidgetsForSection& InOnGenerateSectionWidgets,
+		FOnResetSectionToDefaultClicked& InOnResetToDefaultClicked,
+		int32 InMultipleSectionCount,
+		int32 InThumbnailSize)
+		: SectionItem(InSection)
+		, OnSectionChanged(InOnSectionChanged)
+		, OnGenerateCustomNameWidgets(InOnGenerateNameWidgets)
+		, OnGenerateCustomSectionWidgets(InOnGenerateSectionWidgets)
+		, OnResetToDefaultClicked(InOnResetToDefaultClicked)
+		, MultipleSectionCount(InMultipleSectionCount)
+		, ThumbnailSize(InThumbnailSize)
+	{
+
+	}
+
+	TSharedRef<SWidget> OnGetMaterialSlotNameMenuForSection()
+	{
+		FMenuBuilder MenuBuilder(true, NULL);
+
+		// Add a menu item for each texture.  Clicking on the texture will display it in the content browser
+		for (auto kvp : SectionItem.AvailableMaterialSlotName)
+		{
+			FName AvailableMaterialSlotName = kvp.Value;
+			int32 AvailableMaterialSlotIndex = kvp.Key;
+
+			FUIAction Action(FExecuteAction::CreateSP(this, &FSectionItemView::SetMaterialSlotName, AvailableMaterialSlotIndex, AvailableMaterialSlotName));
+
+			FString MaterialSlotDisplayName;
+			AvailableMaterialSlotName.ToString(MaterialSlotDisplayName);
+			MaterialSlotDisplayName = TEXT("[") + FString::FromInt(kvp.Key) + TEXT("] ") + MaterialSlotDisplayName;
+			MenuBuilder.AddMenuEntry(FText::FromString(MaterialSlotDisplayName), LOCTEXT("BrowseAvailableMaterialSlotName_ToolTip", "Set the material slot name for this section"), FSlateIcon(), Action);
+		}
+
+		return MenuBuilder.MakeWidget();
+	}
+
+	void SetMaterialSlotName(int32 MaterialSlotIndex, FName NewSlotName)
+	{
+		OnSectionChanged.ExecuteIfBound(SectionItem.LodIndex, SectionItem.SectionIndex, MaterialSlotIndex, NewSlotName);
+	}
+
+	FText GetCurrentMaterialSlotName() const
+	{
+		FString MaterialSlotDisplayName;
+		SectionItem.MaterialSlotName.ToString(MaterialSlotDisplayName);
+		FString MaterialSlotRemapString = TEXT("");
+		if (SectionItem.DefaultMaterialIndex != INDEX_NONE && SectionItem.DefaultMaterialIndex != SectionItem.MaterialSlotIndex)
+		{
+			MaterialSlotRemapString = TEXT(" (Modified)");
+		}
+		MaterialSlotDisplayName = TEXT("[") + FString::FromInt(SectionItem.MaterialSlotIndex) + TEXT("] ") + MaterialSlotDisplayName + MaterialSlotRemapString;
+		return FText::FromString(MaterialSlotDisplayName);
+	}
+
+	//
+	// Called when reset to base is clicked
+	//
+	void OnResetToBaseClicked(TSharedRef<IPropertyHandle> PropertyHandle)
+	{
+		OnResetToDefaultClicked.ExecuteIfBound(SectionItem.LodIndex, SectionItem.SectionIndex);
+	}
+
+private:
+	FSectionListItem SectionItem;
+	FOnSectionChanged OnSectionChanged;
+	FOnGenerateWidgetsForSection OnGenerateCustomNameWidgets;
+	FOnGenerateWidgetsForSection OnGenerateCustomSectionWidgets;
+	FOnResetSectionToDefaultClicked OnResetToDefaultClicked;
+	int32 MultipleSectionCount;
+	int32 ThumbnailSize;
+};
+*/
+/*
+FSectionList::FSectionList(IDetailLayoutBuilder& InDetailLayoutBuilder, FSectionListDelegates& InSectionListDelegates, bool bInInitiallyCollapsed, int32 InThumbnailSize, int32 InSectionsLodIndex, FName InSectionListName)
+	: SectionListDelegates(InSectionListDelegates)
+	, DetailLayoutBuilder(InDetailLayoutBuilder)
+	, SectionListBuilder(new FSectionListBuilder(InThumbnailSize))
+	, bInitiallyCollapsed(bInInitiallyCollapsed)
+	, SectionListName(InSectionListName)
+	, ThumbnailSize(InThumbnailSize)
+	, SectionsLodIndex(InSectionsLodIndex)
+{
+}
+
+void FSectionList::OnDisplaySectionsForLod(int32 LodIndex)
+{
+	// We now want to display all the materials in the element
+	ExpandedSlots.Add(LodIndex);
+
+	SectionListBuilder->Empty();
+	SectionListDelegates.OnGetSections.ExecuteIfBound(*SectionListBuilder);
+
+	OnRebuildChildren.ExecuteIfBound();
+}
+
+void FSectionList::OnHideSectionsForLod(int32 SlotIndex)
+{
+	// No longer want to expand the element
+	ExpandedSlots.Remove(SlotIndex);
+
+	// regenerate the Sections
+	SectionListBuilder->Empty();
+	SectionListDelegates.OnGetSections.ExecuteIfBound(*SectionListBuilder);
+
+	OnRebuildChildren.ExecuteIfBound();
+}
+
+
+void FSectionList::Tick(float DeltaTime)
+{
+	// Check each Section to see if its still valid.  This allows the Section list to stay up to date when Sections are changed out from under us
+	if (SectionListDelegates.OnGetSections.IsBound())
+	{
+		// Whether or not to refresh the Section list
+		bool bRefrestSectionList = false;
+
+		// Get the current list of Sections from the user
+		SectionListBuilder->Empty();
+		SectionListDelegates.OnGetSections.ExecuteIfBound(*SectionListBuilder);
+
+		if (SectionListBuilder->GetNumSections() != DisplayedSections.Num())
+		{
+			// The array sizes differ so we need to refresh the list
+			bRefrestSectionList = true;
+		}
+		else
+		{
+			// Compare the new list against the currently displayed list
+			for (int32 SectionIndex = 0; SectionIndex < SectionListBuilder->Sections.Num(); ++SectionIndex)
+			{
+				const FSectionListItem& Item = SectionListBuilder->Sections[SectionIndex];
+
+				// The displayed Sections is out of date if there isn't a 1:1 mapping between the Section sets
+				if (!DisplayedSections.IsValidIndex(SectionIndex) || DisplayedSections[SectionIndex] != Item)
+				{
+					bRefrestSectionList = true;
+					break;
+				}
+			}
+		}
+
+		if (bRefrestSectionList)
+		{
+			OnRebuildChildren.ExecuteIfBound();
+		}
+	}
+}
+
+void FSectionList::GenerateHeaderRowContent(FDetailWidgetRow& NodeRow)
+{
+	NodeRow.CopyAction(FUIAction(FExecuteAction::CreateSP(this, &FSectionList::OnCopySectionList), FCanExecuteAction::CreateSP(this, &FSectionList::OnCanCopySectionList)));
+	NodeRow.PasteAction(FUIAction(FExecuteAction::CreateSP(this, &FSectionList::OnPasteSectionList)));
+
+	NodeRow.NameContent()
+	[
+		SNew(STextBlock)
+		.Text(LOCTEXT("SectionHeaderTitle", "Sections"))
+		.Font(IDetailLayoutBuilder::GetDetailFont())
+	];
+}
+
+void FSectionList::GenerateChildContent(IDetailChildrenBuilder& ChildrenBuilder)
+{
+	ViewedSections.Empty();
+	DisplayedSections.Empty();
+	if (SectionListBuilder->GetNumSections() > 0)
+	{
+		DisplayedSections = SectionListBuilder->Sections;
+
+		SectionListBuilder->Sort();
+		TArray<FSectionListItem>& Sections = SectionListBuilder->Sections;
+
+		int32 CurrentLODIndex = INDEX_NONE;
+		bool bDisplayAllSectionsInSlot = true;
+		for (auto It = Sections.CreateConstIterator(); It; ++It)
+		{
+			const FSectionListItem& Section = *It;
+
+			CurrentLODIndex = Section.LodIndex;
+
+			// Display each thumbnail element unless we shouldn't display multiple Sections for one slot
+			if (bDisplayAllSectionsInSlot)
+			{
+				FDetailWidgetRow& ChildRow = ChildrenBuilder.AddCustomRow(Section.Material.IsValid() ? FText::FromString(Section.Material->GetName()) : FText::GetEmpty());
+				AddSectionItem(ChildRow, CurrentLODIndex, FSectionListItem(CurrentLODIndex, Section.SectionIndex, Section.MaterialSlotName, Section.MaterialSlotIndex, Section.OriginalMaterialSlotName, Section.AvailableMaterialSlotName, Section.Material.Get(), Section.IsSectionUsingCloth, ThumbnailSize, Section.bIsChunkSection, Section.DefaultMaterialIndex), !bDisplayAllSectionsInSlot);
+			}
+		}
+	}
+	else
+	{
+		FDetailWidgetRow& ChildRow = ChildrenBuilder.AddCustomRow(LOCTEXT("NoSections", "No Sections"));
+
+		ChildRow
+			[
+				SNew(SBox)
+				.HAlign(HAlign_Center)
+				[
+					SNew(STextBlock)
+					.Text(LOCTEXT("NoSections", "No Sections"))
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+				]
+			];
+	}
+}
+
+bool FSectionList::OnCanCopySectionList() const
+{
+	if (SectionListDelegates.OnCanCopySectionList.IsBound())
+	{
+		return SectionListDelegates.OnCanCopySectionList.Execute();
+	}
+
+	return false;
+}
+
+void FSectionList::OnCopySectionList()
+{
+	if (SectionListDelegates.OnCopySectionList.IsBound())
+	{
+		SectionListDelegates.OnCopySectionList.Execute();
+	}
+}
+
+void FSectionList::OnPasteSectionList()
+{
+	if (SectionListDelegates.OnPasteSectionList.IsBound())
+	{
+		SectionListDelegates.OnPasteSectionList.Execute();
+	}
+}
+
+bool FSectionList::OnCanCopySectionItem(int32 LODIndex, int32 SectionIndex) const
+{
+	if (SectionListDelegates.OnCanCopySectionItem.IsBound())
+	{
+		return SectionListDelegates.OnCanCopySectionItem.Execute(LODIndex, SectionIndex);
+	}
+
+	return false;
+}
+
+void FSectionList::OnCopySectionItem(int32 LODIndex, int32 SectionIndex)
+{
+	if (SectionListDelegates.OnCopySectionItem.IsBound())
+	{
+		SectionListDelegates.OnCopySectionItem.Execute(LODIndex, SectionIndex);
+	}
+}
+
+void FSectionList::OnPasteSectionItem(int32 LODIndex, int32 SectionIndex)
+{
+	if (SectionListDelegates.OnPasteSectionItem.IsBound())
+	{
+		SectionListDelegates.OnPasteSectionItem.Execute(LODIndex, SectionIndex);
+	}
+}
+
+void FSectionList::OnEnableSectionItem(int32 LodIndex, int32 SectionIndex, bool bEnable)
+{
+	SectionListDelegates.OnEnableSectionItem.ExecuteIfBound(LodIndex, SectionIndex, bEnable);
+}
+
+void FSectionList::AddSectionItem(FDetailWidgetRow& Row, int32 LodIndex, const struct FSectionListItem& Item, bool bDisplayLink)
+{
+	uint32 NumSections = SectionListBuilder->GetNumSections(LodIndex);
+
+	bool bIsChunkSection = Item.bIsChunkSection;
+	TSharedRef<FSectionItemView> NewView = FSectionItemView::Create(Item, SectionListDelegates.OnSectionChanged, SectionListDelegates.OnGenerateCustomNameWidgets, SectionListDelegates.OnGenerateCustomSectionWidgets, SectionListDelegates.OnResetSectionToDefaultClicked, NumSections, ThumbnailSize);
+
+	TSharedPtr<SWidget> RightSideContent;
+	if (bDisplayLink)
+	{
+		FFormatNamedArguments Arguments;
+		Arguments.Add(TEXT("NumSections"), NumSections);
+
+		RightSideContent =
+			SNew(SBox)
+			.HAlign(HAlign_Left)
+			.VAlign(VAlign_Top)
+			[
+				SNew(SHyperlink)
+				.TextStyle(FSodaStyle::Get(), "MaterialList.HyperlinkStyle")
+				.Text(FText::Format(LOCTEXT("DisplayAllSectionLinkText", "Display {NumSections} Sections"), Arguments))
+				.ToolTipText(LOCTEXT("DisplayAllSectionLink_ToolTip", "Display all Sections. Drag and drop a Section here to replace all Sections."))
+				.OnNavigate(this, &FSectionList::OnDisplaySectionsForLod, LodIndex)
+			];
+	}
+	else
+	{
+		RightSideContent = NewView->CreateValueContent(DetailLayoutBuilder.GetThumbnailPool());
+		ViewedSections.Add(NewView);
+	}
+
+	//Chunk section cannot be copy enable or disable, do the operation on the parent section
+	if (!bIsChunkSection)
+	{
+		Row.CopyAction(FUIAction(FExecuteAction::CreateSP(this, &FSectionList::OnCopySectionItem, LodIndex, Item.SectionIndex), FCanExecuteAction::CreateSP(this, &FSectionList::OnCanCopySectionItem, LodIndex, Item.SectionIndex)));
+		Row.PasteAction(FUIAction(FExecuteAction::CreateSP(this, &FSectionList::OnPasteSectionItem, LodIndex, Item.SectionIndex)));
+
+		if (SectionListDelegates.OnEnableSectionItem.IsBound())
+		{
+			Row.AddCustomContextMenuAction(FUIAction(FExecuteAction::CreateSP(this, &FSectionList::OnEnableSectionItem, LodIndex, Item.SectionIndex, true)), LOCTEXT("SectionItemContexMenu_Enable", "Enable"));
+			Row.AddCustomContextMenuAction(FUIAction(FExecuteAction::CreateSP(this, &FSectionList::OnEnableSectionItem, LodIndex, Item.SectionIndex, false)), LOCTEXT("SectionItemContexMenu_Disable", "Disable"));
+		}
+	}
+
+	Row.RowTag(SectionListName);
+	Row.NameContent()
+		[
+			NewView->CreateNameContent()
+		]
+	.ValueContent()
+		.MinDesiredWidth(250.0f)
+		.MaxDesiredWidth(0.0f) // no maximum
+		[
+			RightSideContent.ToSharedRef()
+		];
+}
+*/
+
+
+/*
+void SMaterialSlotWidget::Construct(const FArguments& InArgs, int32 SlotIndex, bool bIsMaterialUsed)
+{
+	TSharedPtr<SHorizontalBox> SlotNameBox;
+
+	TSharedRef<SWidget> DeleteButton =
+		PropertyCustomizationHelpers::MakeDeleteButton(
+			InArgs._OnDeleteMaterialSlot,
+			LOCTEXT("CustomNameMaterialNotUsedDeleteTooltip", "Delete this material slot"),
+			InArgs._CanDeleteMaterialSlot);
+
+	ChildSlot
+	[
+		SAssignNew(SlotNameBox, SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		[
+			SNew(SBox)
+			.VAlign(VAlign_Center)
+			[
+				SNew(STextBlock)
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+				.Text(LOCTEXT("MaterialArrayNameLabelStringKey", "Slot Name"))
+			]
+		]
+		+ SHorizontalBox::Slot()
+		.FillWidth(1.0f)
+		.Padding(5.0f, 0.0f, 0.0f,0.0f)
+		[
+			SNew(SBox)
+			.VAlign(VAlign_Center)
+			.MinDesiredWidth(160.0f)
+			[
+				SNew(SEditableTextBox)
+				.Text(InArgs._MaterialName)
+				.OnTextChanged(InArgs._OnMaterialNameChanged)
+				.OnTextCommitted(InArgs._OnMaterialNameCommitted)
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+			]
+		]
+	];
+
+	
+	if (bIsMaterialUsed)
+	{
+		DeleteButton->SetEnabled(false);
+	}
+	
+
+	SlotNameBox->AddSlot()
+		.AutoWidth()
+		.VAlign(VAlign_Center)
+		.Padding(2)
+		[
+			DeleteButton
+		];
+}
+*/
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorDelegates.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorDelegates.cpp
new file mode 100644
index 0000000..998176a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorDelegates.cpp
@@ -0,0 +1,53 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyEditorDelegates.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+
+namespace soda
+{
+
+FPropertyAndParent::FPropertyAndParent(const TSharedRef<IPropertyHandle>& InPropertyHandle) :
+	Property(*InPropertyHandle->GetProperty())
+{
+	Initialize(InPropertyHandle->GetPropertyNode().ToSharedRef());
+}
+
+FPropertyAndParent::FPropertyAndParent(const TSharedRef<FPropertyNode>& InPropertyNode) :
+	Property(*InPropertyNode->GetProperty())
+{
+	Initialize(InPropertyNode);
+}
+
+void FPropertyAndParent::Initialize(const TSharedRef<FPropertyNode>& InPropertyNode)
+{
+	checkf(InPropertyNode->GetProperty() != nullptr, TEXT("Creating an FPropertyAndParent with a null property!"));
+
+	FObjectPropertyNode* ObjectNode = InPropertyNode->FindObjectItemParent();
+	if (ObjectNode)
+	{
+		for (int32 ObjectIndex = 0; ObjectIndex < ObjectNode->GetNumObjects(); ++ObjectIndex)
+		{
+			Objects.Add(ObjectNode->GetUObject(ObjectIndex));
+		}
+	}
+
+	ArrayIndex = InPropertyNode->GetArrayIndex();
+
+	TSharedPtr<FPropertyNode> ParentNode = InPropertyNode->GetParentNodeSharedPtr();
+	while (ParentNode.IsValid())
+	{
+		const FProperty* ParentProperty = ParentNode->GetProperty();
+		if (ParentProperty != nullptr)
+		{
+			ParentProperties.Add(ParentProperty);
+			ParentArrayIndices.Add(ParentNode->GetArrayIndex());
+		}
+
+		ParentNode = ParentNode->GetParentNodeSharedPtr();
+	}
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorHelpers.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorHelpers.cpp
new file mode 100644
index 0000000..d55a7a1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorHelpers.cpp
@@ -0,0 +1,1291 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArray.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorTitle.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.h"
+
+//#include "Kismet2/KismetEditorUtilities.h"
+//#include "EditorClassUtils.h"
+#include "Engine/Selection.h"
+
+#include "RuntimeEditorUtils.h"
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+void SPropertyNameWidget::Construct( const FArguments& InArgs, TSharedPtr<FPropertyEditor> InPropertyEditor )
+{
+	PropertyEditor = InPropertyEditor;
+
+	TSharedPtr<SHorizontalBox> HorizontalBox;
+	ChildSlot
+	[
+		SAssignNew(HorizontalBox, SHorizontalBox)
+		+SHorizontalBox::Slot()
+		.Padding( FMargin( 0, 1, 0, 1 ) )
+		.FillWidth(1)
+		[
+			SNew(SBorder)
+			.BorderImage_Static( &PropertyEditorConstants::GetOverlayBrush, PropertyEditor.ToSharedRef() )
+			.Padding( FMargin( 0.0f, 2.0f ) )
+			.VAlign(VAlign_Center)
+			[
+				SNew( SPropertyEditorTitle, PropertyEditor.ToSharedRef() )
+				.OnDoubleClicked( InArgs._OnDoubleClicked )
+				.ToolTip(soda::IDocumentation::Get()->CreateToolTip(PropertyEditor->GetToolTipText(), NULL, PropertyEditor->GetDocumentationLink(), PropertyEditor->GetDocumentationExcerptName()))
+			]
+		]
+	
+	];
+}
+
+void SPropertyValueWidget::Construct( const FArguments& InArgs, TSharedPtr<FPropertyEditor> PropertyEditor, TSharedPtr<IPropertyUtilities> InPropertyUtilities )
+{
+	MinDesiredWidth = 0.0f;
+	MaxDesiredWidth = 0.0f;
+
+	SetEnabled( TAttribute<bool>( PropertyEditor.ToSharedRef(), &FPropertyEditor::IsPropertyEditingEnabled ) );
+
+	ValueEditorWidget = ConstructPropertyEditorWidget( PropertyEditor, InPropertyUtilities );
+
+	if ( !ValueEditorWidget->GetToolTip().IsValid() )
+	{
+		ValueEditorWidget->SetToolTipText(TAttribute<FText>(PropertyEditor.ToSharedRef(), &FPropertyEditor::GetValueAsText));
+	}
+
+
+	if( InArgs._ShowPropertyButtons )
+	{
+		TSharedRef<SHorizontalBox> HorizontalBox = SNew(SHorizontalBox);
+
+		HorizontalBox->AddSlot()
+		.FillWidth(1) // Fill the entire width if possible
+		.VAlign(VAlign_Center)	
+		[
+			ValueEditorWidget.ToSharedRef()
+		];
+
+		TArray< TSharedRef<SWidget> > RequiredButtons;
+		PropertyEditorHelpers::MakeRequiredPropertyButtons( PropertyEditor.ToSharedRef(), /*OUT*/RequiredButtons );
+
+		for( int32 ButtonIndex = 0; ButtonIndex < RequiredButtons.Num(); ++ButtonIndex )
+		{
+			HorizontalBox->AddSlot()
+				.AutoWidth()
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.Padding( 2.0f, 0.0f )
+				[ 
+					RequiredButtons[ButtonIndex]
+				];
+		}
+
+		ChildSlot
+		[
+			HorizontalBox
+		];
+
+	}
+	else
+	{
+		ChildSlot
+		.VAlign(VAlign_Center)	
+		[
+			ValueEditorWidget.ToSharedRef()
+		];
+	}
+
+
+}
+
+TSharedRef<SWidget> SPropertyValueWidget::ConstructPropertyEditorWidget( TSharedPtr<FPropertyEditor>& PropertyEditor, TSharedPtr<IPropertyUtilities> InPropertyUtilities )
+{
+	const TSharedRef<FPropertyEditor> PropertyEditorRef = PropertyEditor.ToSharedRef();
+	//const TSharedRef<IPropertyUtilities> PropertyUtilitiesRef = InPropertyUtilities.ToSharedRef();
+
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditorRef->GetPropertyNode();
+	const int32 NodeArrayIndex = PropertyNode->GetArrayIndex();
+	FProperty* Property = PropertyNode->GetProperty();
+	
+	FSlateFontInfo FontStyle = FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle );
+	TSharedPtr<SWidget> PropertyWidget; 
+	if( Property )
+	{
+		// ORDER MATTERS: first widget type to support the property node wins!
+		if ( SPropertyEditorArray::Supports(PropertyEditorRef) )
+		{
+			TSharedRef<SPropertyEditorArray> ArrayWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorArray, PropertyEditorRef )
+				.Font( FontStyle );
+
+			ArrayWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if ( SPropertyEditorSet::Supports(PropertyEditorRef) )
+		{
+			TSharedRef<SPropertyEditorSet> SetWidget =
+				SAssignNew( PropertyWidget, SPropertyEditorSet, PropertyEditorRef )
+				.Font( FontStyle );
+
+			SetWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if ( SPropertyEditorMap::Supports(PropertyEditorRef) )
+		{
+			TSharedRef<SPropertyEditorMap> MapWidget =
+				SAssignNew( PropertyWidget, SPropertyEditorMap, PropertyEditorRef )
+				.Font( FontStyle );
+
+			MapWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if (SPropertyEditorClass::Supports(PropertyEditorRef))
+		{
+			static TArray<TSharedRef<IClassViewerFilter>> NullFilters;
+			TSharedRef<SPropertyEditorClass> ClassWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorClass, PropertyEditorRef)
+				.Font(FontStyle);
+				//.ClassViewerFilters(InPropertyUtilities.IsValid() ? InPropertyUtilities->GetClassViewerFilters() : NullFilters);
+
+			ClassWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		else if (SPropertyEditorStruct::Supports(PropertyEditorRef))
+		{
+			TSharedRef<SPropertyEditorStruct> StructWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorStruct, PropertyEditorRef)
+				.Font(FontStyle);
+
+			StructWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		/*
+		else if ( SPropertyEditorAsset::Supports( PropertyEditorRef ) )
+		{
+			TSharedRef<SPropertyEditorAsset> AssetWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorAsset, PropertyEditorRef)
+				//.ThumbnailPool( InPropertyUtilities.IsValid() ? InPropertyUtilities->GetThumbnailPool() : nullptr );
+				;
+			
+			AssetWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		*/
+		else if ( SPropertyEditorNumeric<float>::Supports( PropertyEditorRef ) )
+		{
+			auto NumericWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorNumeric<float>, PropertyEditorRef )
+				.Font( FontStyle );
+
+			NumericWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if ( SPropertyEditorNumeric<double>::Supports( PropertyEditorRef ) )
+		{
+			auto NumericWidget =
+				SAssignNew( PropertyWidget, SPropertyEditorNumeric<double>, PropertyEditorRef )
+				.Font( FontStyle );
+
+			NumericWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if (SPropertyEditorNumeric<int8>::Supports(PropertyEditorRef))
+		{
+			auto NumericWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorNumeric<int8>, PropertyEditorRef)
+				.Font(FontStyle);
+
+			NumericWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		else if (SPropertyEditorNumeric<int16>::Supports(PropertyEditorRef))
+		{
+			auto NumericWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorNumeric<int16>, PropertyEditorRef)
+				.Font(FontStyle);
+
+			NumericWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		else if ( SPropertyEditorNumeric<int32>::Supports( PropertyEditorRef ) )
+		{
+			auto NumericWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorNumeric<int32>, PropertyEditorRef )
+				.Font( FontStyle );
+
+			NumericWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if (SPropertyEditorNumeric<int64>::Supports(PropertyEditorRef))
+		{
+			auto NumericWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorNumeric<int64>, PropertyEditorRef)
+				.Font(FontStyle);
+
+			NumericWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		else if ( SPropertyEditorNumeric<uint8>::Supports( PropertyEditorRef ) )
+		{
+			auto NumericWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorNumeric<uint8>, PropertyEditorRef )
+				.Font( FontStyle );
+
+			NumericWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if (SPropertyEditorNumeric<uint16>::Supports(PropertyEditorRef))
+		{
+			auto NumericWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorNumeric<uint16>, PropertyEditorRef)
+				.Font(FontStyle);
+
+			NumericWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		else if (SPropertyEditorNumeric<uint32>::Supports(PropertyEditorRef))
+		{
+			auto NumericWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorNumeric<uint32>, PropertyEditorRef)
+				.Font(FontStyle);
+
+			NumericWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		else if (SPropertyEditorNumeric<uint64>::Supports(PropertyEditorRef))
+		{
+			auto NumericWidget =
+				SAssignNew(PropertyWidget, SPropertyEditorNumeric<uint64>, PropertyEditorRef)
+				.Font(FontStyle);
+
+			NumericWidget->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+		}
+		else if ( SPropertyEditorCombo::Supports( PropertyEditorRef ) )
+		{
+			FPropertyComboBoxArgs ComboArgs;
+			ComboArgs.Font = FontStyle;
+
+			TSharedRef<SPropertyEditorCombo> ComboWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorCombo, PropertyEditorRef )
+				.ComboArgs( ComboArgs );
+
+			ComboWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if ( SPropertyEditorEditInline::Supports( PropertyEditorRef ) )
+		{
+			TSharedRef<SPropertyEditorEditInline> EditInlineWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorEditInline, PropertyEditorRef )
+				.Font( FontStyle );
+
+			EditInlineWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if ( SPropertyEditorText::Supports( PropertyEditorRef ) )
+		{
+			TSharedRef<SPropertyEditorText> TextWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorText, PropertyEditorRef )
+				.Font( FontStyle );
+
+			TextWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if ( SPropertyEditorBool::Supports( PropertyEditorRef ) )
+		{
+			TSharedRef<SPropertyEditorBool> BoolWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorBool, PropertyEditorRef );
+
+			BoolWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+
+		}
+		else if ( SPropertyEditorArrayItem::Supports( PropertyEditorRef ) )
+		{
+			TSharedRef<SPropertyEditorArrayItem> ArrayItemWidget = 
+				SAssignNew( PropertyWidget, SPropertyEditorArrayItem, PropertyEditorRef )
+				.Font( FontStyle );
+
+			ArrayItemWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+		}
+		else if ( SPropertyEditorDateTime::Supports( PropertyEditorRef ) )
+		{
+			TSharedRef<SPropertyEditorDateTime> DateTimeWidget =
+				SAssignNew( PropertyWidget, SPropertyEditorDateTime, PropertyEditorRef )
+				.Font( FontStyle );
+		}
+	}
+
+	if( !PropertyWidget.IsValid() )
+	{
+		TSharedRef<SPropertyEditor> BasePropertyEditorWidget = 
+			SAssignNew( PropertyWidget, SPropertyEditor, PropertyEditorRef )
+			.Font( FontStyle );
+
+		BasePropertyEditorWidget->GetDesiredWidth( MinDesiredWidth, MaxDesiredWidth );
+	}
+
+	return PropertyWidget.ToSharedRef();
+}
+
+void SEditConditionWidget::Construct( const FArguments& Args )
+{
+	EditConditionValue = Args._EditConditionValue;
+	OnEditConditionValueChanged = Args._OnEditConditionValueChanged;
+
+	ChildSlot
+	[
+		// Some properties become irrelevant depending on the value of other properties.
+		// We prevent the user from editing those properties by disabling their widgets.
+		// This is a shortcut for toggling the property that disables us.
+		SNew(SCheckBox)
+		.OnCheckStateChanged(this, &SEditConditionWidget::OnEditConditionCheckChanged)
+		.IsChecked(this, &SEditConditionWidget::OnGetEditConditionCheckState)
+		.Visibility(this, &SEditConditionWidget::GetVisibility)
+	];
+}
+
+EVisibility SEditConditionWidget::GetVisibility() const
+{
+	return HasEditConditionToggle() ? EVisibility::Visible : EVisibility::Collapsed;
+}
+
+bool SEditConditionWidget::HasEditConditionToggle() const
+{
+	return OnEditConditionValueChanged.IsBound();
+}
+
+void SEditConditionWidget::OnEditConditionCheckChanged( ECheckBoxState CheckState )
+{
+	checkSlow(HasEditConditionToggle());
+
+	//FScopedTransaction EditConditionChangedTransaction(LOCTEXT("UpdatedEditConditionFmt", "Edit Condition Changed"));
+	
+	OnEditConditionValueChanged.ExecuteIfBound(CheckState == ECheckBoxState::Checked);
+}
+
+ECheckBoxState SEditConditionWidget::OnGetEditConditionCheckState() const
+{
+	return EditConditionValue.Get() ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+}
+
+namespace PropertyEditorHelpers
+{
+	bool ShouldBeVisible(const FPropertyNode& InParentNode, const FProperty* Property)
+	{
+		const bool bShouldShowHiddenProperties = !!InParentNode.HasNodeFlags(EPropertyNodeFlags::ShouldShowHiddenProperties);
+		if (bShouldShowHiddenProperties)
+		{
+			return true;
+		}
+
+		if (!!InParentNode.HasNodeFlags(EPropertyNodeFlags::GameModeOnlyVisible) && !IsBuiltInStructProperty(InParentNode.GetProperty()))
+		{
+			static const FName Name_EditInRuntime("EditInRuntime");
+			static const FName Name_CallInRuntime("CallInRuntime");
+			if (!FRuntimeMetaData::HasMetaData(Property, Name_EditInRuntime) && !FRuntimeMetaData::HasMetaData(Property, Name_CallInRuntime))
+			{
+				return false;
+			}
+		}
+
+		const bool bShouldShowDisableEditOnInstance = !!InParentNode.HasNodeFlags(EPropertyNodeFlags::ShouldShowDisableEditOnInstance);
+
+		static const FName Name_InlineEditConditionToggle("InlineEditConditionToggle");
+		const bool bOnlyShowAsInlineEditCondition = FRuntimeMetaData::HasMetaData(Property, Name_InlineEditConditionToggle);
+		const bool bShowIfEditableProperty = Property->HasAnyPropertyFlags(CPF_Edit);
+		const bool bShowIfDisableEditOnInstance = bShouldShowDisableEditOnInstance || !Property->HasAnyPropertyFlags(CPF_DisableEditOnInstance);
+
+		return bShowIfEditableProperty && !bOnlyShowAsInlineEditCondition && bShowIfDisableEditOnInstance;
+	}
+
+	bool IsBuiltInStructProperty( const FProperty* Property )
+	{
+		bool bIsBuiltIn = false;
+
+		const FStructProperty* StructProp = CastField<const FStructProperty>( Property );
+		if( StructProp && StructProp->Struct )
+		{
+			FName StructName = StructProp->Struct->GetFName();
+
+			bIsBuiltIn = StructName == NAME_Rotator || 
+						 StructName == NAME_Color ||  
+						 StructName == NAME_LinearColor || 
+						 StructName == NAME_Vector ||
+						 StructName == NAME_Quat ||
+						 StructName == NAME_Vector4 ||
+						 StructName == NAME_Vector2D ||
+						 StructName == NAME_IntPoint;
+		}
+
+		return bIsBuiltIn;
+	}
+
+	bool IsChildOfArray( const FPropertyNode& InPropertyNode )
+	{
+		return GetArrayParent( InPropertyNode ) != NULL;
+	}
+
+	bool IsChildOfSet(  const FPropertyNode& InPropertyNode )
+	{
+		return GetSetParent( InPropertyNode ) != NULL;
+	}
+
+	bool IsChildOfMap(const FPropertyNode& InPropertyNode)
+	{
+		return GetMapParent(InPropertyNode) != NULL;
+	}
+
+	bool IsStaticArray( const FPropertyNode& InPropertyNode )
+	{
+		const FProperty* NodeProperty = InPropertyNode.GetProperty();
+		return NodeProperty && NodeProperty->ArrayDim != 1 && InPropertyNode.GetArrayIndex() == -1;
+	}
+
+	bool IsDynamicArray( const FPropertyNode& InPropertyNode )
+	{
+		const FProperty* NodeProperty = InPropertyNode.GetProperty();
+		return NodeProperty && CastField<const FArrayProperty>(NodeProperty) != NULL;
+	}
+
+	const FProperty* GetArrayParent( const FPropertyNode& InPropertyNode )
+	{
+		const FProperty* ParentProperty = InPropertyNode.GetParentNode() != NULL ? InPropertyNode.GetParentNode()->GetProperty() : NULL;
+		
+		if( ParentProperty )
+		{
+			if( (ParentProperty->IsA<FArrayProperty>()) || // dynamic array
+				(InPropertyNode.GetArrayIndex() != INDEX_NONE && ParentProperty->ArrayDim > 0) ) //static array
+			{
+				return ParentProperty;
+			}
+		}
+
+		return NULL;
+	}
+
+	const FProperty* GetSetParent( const FPropertyNode& InPropertyNode )
+	{
+		const FProperty* ParentProperty = InPropertyNode.GetParentNode() != NULL ? InPropertyNode.GetParentNode()->GetProperty() : NULL;
+
+		if ( ParentProperty )
+		{
+			if (ParentProperty->IsA<FSetProperty>())
+			{
+				return ParentProperty;
+			}
+		}
+
+		return NULL;
+	}
+
+	const FProperty* GetMapParent( const FPropertyNode& InPropertyNode )
+	{
+		const FProperty* ParentProperty = InPropertyNode.GetParentNode() != NULL ? InPropertyNode.GetParentNode()->GetProperty() : NULL;
+
+		if (ParentProperty)
+		{
+			if (ParentProperty->IsA<FMapProperty>())
+			{
+				return ParentProperty;
+			}
+
+			//@todo: Also check a key/value node parent property?
+		}
+
+		return NULL;
+	}
+
+	bool IsEditInlineClassAllowed( UClass* CheckClass, bool bAllowAbstract ) 
+	{
+		return !CheckClass->HasAnyClassFlags(CLASS_Hidden|CLASS_HideDropDown|CLASS_Deprecated)
+			&&	(bAllowAbstract || !CheckClass->HasAnyClassFlags(CLASS_Abstract));
+	}
+
+	FText GetToolTipText( const FProperty* const Property )
+	{
+		if( Property )
+		{
+			return FRuntimeMetaData::GetToolTipText(Property, false);
+		}
+
+		return FText::GetEmpty();
+	}
+
+	FString GetDocumentationLink( const FProperty* const Property )
+	{
+		if ( Property != NULL )
+		{
+			UStruct* OwnerStruct = Property->GetOwnerStruct();
+
+			if ( OwnerStruct != NULL )
+			{
+				return FString::Printf( TEXT("Shared/Types/%s%s"), OwnerStruct->GetPrefixCPP(), *OwnerStruct->GetName() );
+			}
+		}
+
+		return TEXT("");
+	}
+
+	FString GetEnumDocumentationLink(const FProperty* const Property)
+	{
+		if(Property != NULL)
+		{
+			const FByteProperty* ByteProperty = CastField<FByteProperty>(Property);
+			const FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property);
+			if(ByteProperty || EnumProperty || (Property->IsA(FStrProperty::StaticClass()) && FRuntimeMetaData::HasMetaData(Property, TEXT("Enum"))))
+			{
+				UEnum* Enum = nullptr;
+				if(ByteProperty)
+				{
+					Enum = ByteProperty->Enum;
+				}
+				else if (EnumProperty)
+				{
+					Enum = EnumProperty->GetEnum();
+				}
+				else
+				{
+
+					const FString& EnumName = FRuntimeMetaData::GetMetaData(Property, TEXT("Enum"));
+					Enum = UClass::TryFindTypeSlow<UEnum>(EnumName, EFindFirstObjectOptions::ExactClass);
+				}
+
+				if(Enum)
+				{
+					return FString::Printf(TEXT("Shared/Enums/%s"), *Enum->GetName());
+				}
+			}
+		}
+
+		return TEXT("");
+	}
+
+	FString GetDocumentationExcerptName(const FProperty* const Property)
+	{
+		if ( Property != NULL )
+		{
+			return Property->GetName();
+		}
+
+		return TEXT("");
+	}
+
+	TSharedPtr<IPropertyHandle> GetPropertyHandle( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities )
+	{
+		TSharedPtr<IPropertyHandle> PropertyHandle;
+
+		// Always check arrays first, many types can be static arrays
+		if( FPropertyHandleArray::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleArray( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if( FPropertyHandleInt::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleInt( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if( FPropertyHandleFloat::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleFloat( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if ( FPropertyHandleDouble::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleDouble( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if( FPropertyHandleBool::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleBool( PropertyNode, NotifyHook, PropertyUtilities ) ) ;
+		}
+		else if( FPropertyHandleByte::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleByte( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if( FPropertyHandleObject::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleObject( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if( FPropertyHandleString::Supports( PropertyNode ) ) 
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleString( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if (FPropertyHandleText::Supports(PropertyNode))
+		{
+			PropertyHandle = MakeShareable(new FPropertyHandleText(PropertyNode, NotifyHook, PropertyUtilities));
+		}
+		else if( FPropertyHandleVector::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleVector( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if( FPropertyHandleRotator::Supports( PropertyNode ) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleRotator( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if (FPropertyHandleSet::Supports(PropertyNode))
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleSet( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if ( FPropertyHandleMap::Supports(PropertyNode) )
+		{
+			PropertyHandle = MakeShareable( new FPropertyHandleMap( PropertyNode, NotifyHook, PropertyUtilities ) );
+		}
+		else if (FPropertyHandleFieldPath::Supports(PropertyNode))
+		{
+			PropertyHandle = MakeShareable(new FPropertyHandleFieldPath(PropertyNode, NotifyHook, PropertyUtilities));
+		}
+		else
+		{
+			// Untyped or doesn't support getting the property directly but the property is still valid(probably struct property)
+			PropertyHandle = MakeShareable( new FPropertyHandleBase( PropertyNode, NotifyHook, PropertyUtilities ) ); 
+		}
+
+		return PropertyHandle;
+	}
+
+	static bool SupportsObjectPropertyButtons( FProperty* NodeProperty, bool bUsingAssetPicker )
+	{
+		return (NodeProperty->IsA<FObjectPropertyBase>() || NodeProperty->IsA<FInterfaceProperty>()) && (!bUsingAssetPicker /* || !SPropertyEditorAsset::Supports(NodeProperty)*/);
+	}
+	
+	bool IsSoftObjectPath( const FProperty* Property )
+	{
+		const FStructProperty* StructProp = CastField<const FStructProperty>( Property );
+		return StructProp && StructProp->Struct == TBaseStructure<FSoftObjectPath>::Get();
+	}
+
+	bool IsSoftClassPath( const FProperty* Property )
+	{
+		const FStructProperty* StructProp = CastField<const FStructProperty>(Property);
+		return StructProp && StructProp->Struct == TBaseStructure<FSoftClassPath>::Get();
+	}
+
+	void GetRequiredPropertyButtons( TSharedRef<FPropertyNode> PropertyNode, TArray<EPropertyButton::Type>& OutRequiredButtons, bool bUsingAssetPicker )
+	{
+		FProperty* NodeProperty = PropertyNode->GetProperty();
+
+		// If no property is bound, don't create any buttons.
+		if ( !NodeProperty )
+		{
+			return;
+		}
+
+		// If the property is an item of a const container, don't create any buttons.
+		const FArrayProperty* OuterArrayProp = NodeProperty->GetOwner<FArrayProperty>();
+		const FSetProperty* OuterSetProp = NodeProperty->GetOwner<FSetProperty>();
+		const FMapProperty* OuterMapProp = NodeProperty->GetOwner<FMapProperty>();
+
+		//////////////////////////////
+		// Handle a container property.
+		if( NodeProperty->IsA(FArrayProperty::StaticClass()) || NodeProperty->IsA(FSetProperty::StaticClass()) || NodeProperty->IsA(FMapProperty::StaticClass()) )
+		{
+			if( !(NodeProperty->PropertyFlags & CPF_EditFixedSize) )
+			{
+				OutRequiredButtons.Add( EPropertyButton::Add );
+				OutRequiredButtons.Add( EPropertyButton::Empty );
+			}
+		}
+
+		//////////////////////////////
+		// Handle a class property.
+		FClassProperty* ClassProp = CastField<FClassProperty>(NodeProperty);
+		FSoftClassProperty* SoftClassProp = CastField<FSoftClassProperty>(NodeProperty);
+		if( ClassProp || SoftClassProp || IsSoftClassPath(NodeProperty))
+		{
+			OutRequiredButtons.Add( EPropertyButton::Use );			
+			OutRequiredButtons.Add( EPropertyButton::Browse );
+
+			UClass* Class = nullptr;
+			if (ClassProp)
+			{
+				Class = ClassProp->MetaClass;
+			}
+			else if (SoftClassProp)
+			{
+				Class = SoftClassProp->MetaClass;
+			}
+			else
+			{
+				Class = FRuntimeMetaData::GetClassMetaData(NodeProperty->GetOwnerProperty(), TEXT("MetaClass"));
+			}
+
+			if (Class && FRuntimeEditorUtils::CanCreateBlueprintOfClass(Class) && !FRuntimeMetaData::HasMetaData(NodeProperty, "DisallowCreateNew"))
+			{
+				OutRequiredButtons.Add(EPropertyButton::NewBlueprint);
+			}
+
+			if( !(NodeProperty->PropertyFlags & CPF_NoClear) )
+			{
+				OutRequiredButtons.Add( EPropertyButton::Clear );
+			}
+		}
+
+		//////////////////////////////
+		// Handle a struct type property.
+		if (SPropertyEditorStruct::Supports(NodeProperty))
+		{
+			OutRequiredButtons.Add(EPropertyButton::Use);
+
+			OutRequiredButtons.Add(EPropertyButton::Browse);
+
+			if (!(NodeProperty->PropertyFlags & CPF_NoClear))
+			{
+				OutRequiredButtons.Add(EPropertyButton::Clear);
+			}
+		}
+
+		//////////////////////////////
+		// Handle an object property.
+		if( SupportsObjectPropertyButtons( NodeProperty, bUsingAssetPicker ) )
+		{
+			//ignore this node if the consistency check should happen for the children
+			bool bStaticSizedArray = (NodeProperty->ArrayDim > 1) && (PropertyNode->GetArrayIndex() == -1);
+			if (!bStaticSizedArray)
+			{
+				if( PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew) )
+				{
+					// hmmm, seems like this code could be removed and the code inside the 'if <FClassProperty>' check
+					// below could be moved outside the else....but is there a reason to allow class properties to have the
+					// following buttons if the class property is marked 'editinline' (which is effectively what this logic is doing)
+					if( !(NodeProperty->PropertyFlags & CPF_NoClear) )
+					{
+						OutRequiredButtons.Add( EPropertyButton::Clear );
+					}
+				}
+				else
+				{
+					// ignore class properties
+					if( (CastField<const FClassProperty>( NodeProperty ) == NULL) && (CastField<const FSoftClassProperty>( NodeProperty ) == NULL) )
+					{
+						FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>( NodeProperty );
+
+						if( ObjectProperty && ObjectProperty->PropertyClass->IsChildOf( AActor::StaticClass() ) )
+						{
+							// add button for picking the actor from the viewport
+							OutRequiredButtons.Add( EPropertyButton::PickActorInteractive );
+						}
+						else
+						{
+							// add button for filling the value of this item with the selected object from the GB
+							OutRequiredButtons.Add( EPropertyButton::Use );
+						}
+
+						// add button to display the generic browser
+						OutRequiredButtons.Add( EPropertyButton::Browse );
+
+						// reference to object resource that isn't dynamically created (i.e. some content package)
+						if( !(NodeProperty->PropertyFlags & CPF_NoClear) )
+						{
+							// add button to clear the text
+							OutRequiredButtons.Add( EPropertyButton::Clear );
+						}
+							
+						// Do not allow actor object properties to show the asset picker
+						if( ( ObjectProperty && !ObjectProperty->PropertyClass->IsChildOf( AActor::StaticClass() ) ) || IsSoftObjectPath(NodeProperty) )
+						{
+							// add button for picking the asset from an asset picker
+							OutRequiredButtons.Add( EPropertyButton::PickAsset );
+						}
+						else if( ObjectProperty && ObjectProperty->PropertyClass->IsChildOf( AActor::StaticClass() ) )
+						{
+							// add button for picking the actor from the scene outliner
+							OutRequiredButtons.Add( EPropertyButton::PickActor );
+						}
+					}
+				}
+			}
+		}
+
+		if( OuterArrayProp )
+		{
+			if( PropertyNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly) && !(OuterArrayProp->PropertyFlags & CPF_EditFixedSize) )
+			{
+				if (FRuntimeMetaData::HasMetaData(OuterArrayProp, TEXT("NoElementDuplicate")))
+				{
+					OutRequiredButtons.Add( EPropertyButton::Insert_Delete );
+				}
+				else
+				{
+					OutRequiredButtons.Add( EPropertyButton::Insert_Delete_Duplicate );
+				}
+			}
+		}
+
+		if (OuterSetProp || OuterMapProp)
+		{
+			FProperty* OuterNodeProperty = NodeProperty->GetOwner<FProperty>();
+
+			if ( PropertyNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly) && !(OuterNodeProperty->PropertyFlags & CPF_EditFixedSize) )
+			{
+				OutRequiredButtons.Add(EPropertyButton::Delete);
+			}
+		}
+
+	}
+	
+	void MakeRequiredPropertyButtons( const TSharedRef<FPropertyNode>& PropertyNode, const TSharedRef<IPropertyUtilities>& PropertyUtilities,  TArray< TSharedRef<SWidget> >& OutButtons, const TArray<EPropertyButton::Type>& ButtonsToIgnore, bool bUsingAssetPicker  )
+	{
+		const TSharedRef<FPropertyEditor> PropertyEditor = FPropertyEditor::Create( PropertyNode, PropertyUtilities );
+		PropertyEditorHelpers::MakeRequiredPropertyButtons( PropertyEditor, OutButtons, ButtonsToIgnore, bUsingAssetPicker );
+	}
+
+	static bool IsPropertyButtonEnabled(TWeakPtr<FPropertyNode> PropertyNode)
+	{
+		return PropertyNode.IsValid() ? !PropertyNode.Pin()->IsEditConst() : false;
+	}
+
+	TSharedRef<SWidget> MakePropertyReorderHandle(TSharedPtr<SDetailSingleItemRow> InParentRow, TAttribute<bool> InEnabledAttr)
+	{
+		TSharedRef<SArrayRowHandle> Handle = SNew(SArrayRowHandle)
+			.Content()
+			[
+				SNew(SBox)
+				.Padding(0.0f)
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.WidthOverride(16.0f)
+				[
+					SNew(SImage)
+					.Image(FCoreStyle::Get().GetBrush("VerticalBoxDragIndicatorShort"))
+				]
+			]
+		.ParentRow(InParentRow)
+		.Cursor(EMouseCursor::GrabHand)
+		.IsEnabled(InEnabledAttr)
+		.Visibility_Lambda([InParentRow]() { return InParentRow->IsHovered() ? EVisibility::Visible : EVisibility::Hidden; });
+		return Handle;
+	}
+
+	void MakeRequiredPropertyButtons( const TSharedRef< FPropertyEditor >& PropertyEditor, TArray< TSharedRef<SWidget> >& OutButtons, const TArray<EPropertyButton::Type>& ButtonsToIgnore, bool bUsingAssetPicker )
+	{
+		TArray< EPropertyButton::Type > RequiredButtons;
+		GetRequiredPropertyButtons( PropertyEditor->GetPropertyNode(), RequiredButtons, bUsingAssetPicker );
+
+		for( int32 ButtonIndex = 0; ButtonIndex < RequiredButtons.Num(); ++ButtonIndex )
+		{
+			if( !ButtonsToIgnore.Contains( RequiredButtons[ButtonIndex] ) )
+			{
+				OutButtons.Add( MakePropertyButton( RequiredButtons[ButtonIndex], PropertyEditor ) );
+			}
+		}
+	}
+
+	/**
+	 * A helper function that retrieves the path name of the currently selected 
+	 * item (the value that will be used to set the associated property from the 
+	 * "use selection" button)
+	 * 
+	 * @param  PropertyNode		The associated property that the selection is a candidate for.
+	 * @return Empty if the selection isn't compatible with the specified property, else the path-name of the object/class selected in the editor. 
+	 */
+	static FString GetSelectionPathNameForProperty(TSharedRef<FPropertyNode> PropertyNode)
+	{
+		FString SelectionPathName;
+
+		FProperty* Property = PropertyNode->GetProperty();
+		FClassProperty* ClassProperty = CastField<FClassProperty>(Property);
+		FSoftClassProperty* SoftClassProperty = CastField<FSoftClassProperty>(Property);
+
+		if (ClassProperty || SoftClassProperty)
+		{
+			//UClass const* const SelectedClass = GEditor->GetFirstSelectedClass(ClassProperty ? ClassProperty->MetaClass : SoftClassProperty->MetaClass);
+			//if (SelectedClass != nullptr)
+			//{
+				//SelectionPathName = SelectedClass->GetPathName();
+			//}
+		}
+		else
+		{
+			UClass* ObjectClass = UObject::StaticClass();
+
+			bool bMustBeLevelActor = false;
+			UClass* RequiredInterface = nullptr;
+
+			if (FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(Property))
+			{
+				ObjectClass = ObjectProperty->PropertyClass;
+				bMustBeLevelActor = FRuntimeMetaData::GetBoolMetaData(ObjectProperty->GetOwnerProperty(), TEXT("MustBeLevelActor"));
+				RequiredInterface = FRuntimeMetaData::GetClassMetaData(ObjectProperty->GetOwnerProperty(), TEXT("MustImplement"));
+			}
+			else if (FInterfaceProperty* InterfaceProperty = CastField<FInterfaceProperty>(Property))
+			{
+				ObjectClass = InterfaceProperty->InterfaceClass;
+			}
+
+			UObject* SelectedObject = nullptr;
+			if (bMustBeLevelActor)
+			{
+				//USelection* const SelectedSet = GEditor->GetSelectedActors();
+				//SelectedObject = SelectedSet->GetTop(ObjectClass, RequiredInterface);
+			}
+			else 
+			{
+				//USelection* const SelectedSet = GEditor->GetSelectedSet(ObjectClass);
+				//SelectedObject = SelectedSet->GetTop(ObjectClass, RequiredInterface);
+			}
+
+			if (SelectedObject != nullptr)
+			{
+				SelectionPathName = SelectedObject->GetPathName();
+			}
+		}
+
+		return SelectionPathName;
+	}
+
+	/**
+	 * A helper method that checks to see if the editor's current selection is 
+	 * compatible with the specified property.
+	 * 
+	 * @param  PropertyNode		The property you desire to set from the "use selected" button.
+	 * @return False if the currently selected object is restricted for the specified property, true otherwise.
+	 */
+	static bool IsUseSelectedUnrestricted(TWeakPtr<FPropertyNode> PropertyNode)
+	{
+		TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+		return ( PropertyNodePin.IsValid() && IsPropertyButtonEnabled(PropertyNode) ) ? !PropertyNodePin->IsRestricted( GetSelectionPathNameForProperty( PropertyNodePin.ToSharedRef() ) ) : false;
+	}
+
+	/**
+	 * A helper method that checks to see if the editor's current selection is 
+	 * restricted, and then returns a tooltip explaining why (otherwise, it 
+	 * returns a default explanation of the "use selected" button).
+	 * 
+	 * @param  PropertyNode		The property that would be set from the "use selected" button.
+	 * @return A tooltip for the "use selected" button.
+	 */
+	static FText GetUseSelectedTooltip(TWeakPtr<FPropertyNode> PropertyNode)
+	{
+		TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+		FText ToolTip;
+		if (PropertyNodePin.IsValid() && !PropertyNodePin->GenerateRestrictionToolTip(GetSelectionPathNameForProperty(PropertyNodePin.ToSharedRef()), ToolTip))
+		{
+			ToolTip = LOCTEXT("UseButtonToolTipText", "Use Selected Asset from Content Browser");
+		}
+
+		return ToolTip;
+	}
+
+	TSharedRef<SWidget> MakePropertyButton( const EPropertyButton::Type ButtonType, const TSharedRef< FPropertyEditor >& PropertyEditor )
+	{
+		TSharedPtr<SWidget> NewButton;
+
+		TWeakPtr<FPropertyNode> WeakPropertyEditor = PropertyEditor->GetPropertyNode();
+
+		TAttribute<bool>::FGetter IsPropertyButtonEnabledDelegate = TAttribute<bool>::FGetter::CreateStatic(&IsPropertyButtonEnabled, WeakPropertyEditor);
+		TAttribute<bool> IsEnabledAttribute = TAttribute<bool>::Create( IsPropertyButtonEnabledDelegate );
+
+		TAttribute<bool> IsAddEnabledAttribute = TAttribute<bool>::Create(
+			TAttribute<bool>::FGetter::CreateLambda([WeakPropertyEditor, PropertyEditor]() {
+			if (WeakPropertyEditor.IsValid())
+			{
+				FProperty* Property = WeakPropertyEditor.Pin()->GetProperty();
+				// Check for multiple array selections with mismatched values
+				FArrayProperty* ArrayProperty = CastField<FArrayProperty>(Property);
+				if (ArrayProperty)
+				{
+					FString ArrayString;
+					FPropertyAccess::Result GetValResult = PropertyEditor->GetPropertyHandle()->GetValueAsDisplayString(ArrayString);
+					return IsPropertyButtonEnabled(WeakPropertyEditor) && GetValResult == FPropertyAccess::Success;
+				}
+			}
+			return IsPropertyButtonEnabled(WeakPropertyEditor);
+		}));
+
+		switch( ButtonType )
+		{
+		case EPropertyButton::Add:
+			NewButton = PropertyCustomizationHelpers::MakeAddButton( FSimpleDelegate::CreateSP( PropertyEditor, &FPropertyEditor::AddItem ), FText(), IsAddEnabledAttribute);
+			break;
+
+		case EPropertyButton::Empty:
+			NewButton = PropertyCustomizationHelpers::MakeEmptyButton( FSimpleDelegate::CreateSP( PropertyEditor, &FPropertyEditor::EmptyArray ), FText(), IsEnabledAttribute );
+			break;
+
+		case EPropertyButton::Delete:
+		case EPropertyButton::Insert_Delete:
+		case EPropertyButton::Insert_Delete_Duplicate:
+			{
+				FExecuteAction InsertAction; 
+				FExecuteAction DeleteAction = FExecuteAction::CreateSP( PropertyEditor, &FPropertyEditor::DeleteItem );
+				FExecuteAction DuplicateAction;
+
+				if (ButtonType == EPropertyButton::Insert_Delete || ButtonType == EPropertyButton::Insert_Delete_Duplicate)
+				{
+					InsertAction = FExecuteAction::CreateSP(PropertyEditor, &FPropertyEditor::InsertItem);
+				}
+
+				if (ButtonType == EPropertyButton::Insert_Delete_Duplicate)
+				{
+					DuplicateAction = FExecuteAction::CreateSP( PropertyEditor, &FPropertyEditor::DuplicateItem );
+				}
+
+				NewButton = PropertyCustomizationHelpers::MakeInsertDeleteDuplicateButton( InsertAction, DeleteAction, DuplicateAction );
+				NewButton->SetEnabled( IsEnabledAttribute );
+				break;
+			}
+
+		case EPropertyButton::Browse:
+			NewButton = PropertyCustomizationHelpers::MakeBrowseButton( FSimpleDelegate::CreateSP( PropertyEditor, &FPropertyEditor::BrowseTo ) );
+			break;
+
+		case EPropertyButton::Clear:
+			NewButton = PropertyCustomizationHelpers::MakeClearButton( FSimpleDelegate::CreateSP( PropertyEditor, &FPropertyEditor::ClearItem ), FText(), IsEnabledAttribute );
+			break;
+
+		case EPropertyButton::Use:
+			{
+				FSimpleDelegate OnClickDelegate = FSimpleDelegate::CreateSP(PropertyEditor, &FPropertyEditor::UseSelected);
+				TAttribute<bool>::FGetter EnabledDelegate = TAttribute<bool>::FGetter::CreateStatic(&IsUseSelectedUnrestricted, WeakPropertyEditor);
+				TAttribute<FText>::FGetter TooltipDelegate = TAttribute<FText>::FGetter::CreateStatic(&GetUseSelectedTooltip, WeakPropertyEditor);
+
+				NewButton = PropertyCustomizationHelpers::MakeUseSelectedButton(OnClickDelegate, TAttribute<FText>::Create(TooltipDelegate), TAttribute<bool>::Create(EnabledDelegate));
+				break;
+			}
+
+		//case EPropertyButton::PickAsset:
+		//	NewButton = PropertyCustomizationHelpers::MakeAssetPickerAnchorButton( FOnGetAllowedClasses::CreateSP( PropertyEditor, &FPropertyEditor::OnGetClassesForAssetPicker ), FOnAssetSelected::CreateSP( PropertyEditor, &FPropertyEditor::OnAssetSelected ), PropertyEditor->GetPropertyHandle());
+		//	break;
+
+		case EPropertyButton::PickActor:
+			check(0);
+		//	NewButton = PropertyCustomizationHelpers::MakeActorPickerAnchorButton( FOnGetActorFilters::CreateSP( PropertyEditor, &FPropertyEditor::OnGetActorFiltersForSceneOutliner ), FOnActorSelected::CreateSP( PropertyEditor, &FPropertyEditor::OnActorSelected ) );
+			break;
+
+		//case EPropertyButton::PickActorInteractive:
+		//	NewButton = PropertyCustomizationHelpers::MakeInteractiveActorPicker( FOnGetAllowedClasses::CreateSP( PropertyEditor, &FPropertyEditor::OnGetClassesForAssetPicker ), FOnShouldFilterActor(), FOnActorSelected::CreateSP( PropertyEditor, &FPropertyEditor::OnActorSelected ) );
+		//	break;
+
+		//case EPropertyButton::NewBlueprint:
+		//	NewButton = PropertyCustomizationHelpers::MakeNewBlueprintButton( FSimpleDelegate::CreateSP( PropertyEditor, &FPropertyEditor::MakeNewBlueprint )  );
+		//	break;
+
+		//case EPropertyButton::EditConfigHierarchy:
+		//	NewButton = PropertyCustomizationHelpers::MakeEditConfigHierarchyButton(FSimpleDelegate::CreateSP(PropertyEditor, &FPropertyEditor::EditConfigHierarchy));
+		//	break;
+
+		//case EPropertyButton::Documentation:
+		//	NewButton = PropertyCustomizationHelpers::MakeDocumentationButton(PropertyEditor);
+		//	break;
+
+		default:
+			//checkf( 0, TEXT( "Unknown button type" ) );
+			NewButton = SNullWidget::NullWidget;
+			break;
+		}
+
+		return NewButton.ToSharedRef();
+	}
+
+	void CollectObjectNodes( TSharedPtr<FPropertyNode> StartNode, TArray<FObjectPropertyNode*>& OutObjectNodes )
+	{
+		if( StartNode->AsObjectNode() != NULL )
+		{
+			OutObjectNodes.Add( StartNode->AsObjectNode() );
+		}
+			
+		for( int32 ChildIndex = 0; ChildIndex < StartNode->GetNumChildNodes(); ++ChildIndex )
+		{
+			CollectObjectNodes( StartNode->GetChildNode( ChildIndex ), OutObjectNodes );
+		}
+		
+	}
+
+	TArray<FName> GetValidEnumsFromPropertyOverride(const FProperty* Property, const UEnum* InEnum)
+	{
+		TArray<FName> ValidEnumValues;
+
+		static const FName ValidEnumValuesName("ValidEnumValues");
+		if(FRuntimeMetaData::HasMetaData(Property, ValidEnumValuesName))
+		{
+			TArray<FString> ValidEnumValuesAsString;
+
+			FRuntimeMetaData::GetMetaData(Property, ValidEnumValuesName).ParseIntoArray(ValidEnumValuesAsString, TEXT(","));
+			for(auto& Value : ValidEnumValuesAsString)
+			{
+				Value.TrimStartInline();
+				ValidEnumValues.Add(*InEnum->GenerateFullEnumName(*Value));
+			}
+		}
+
+		return ValidEnumValues;
+	}
+
+	bool IsCategoryHiddenByClass(const TSharedPtr<FComplexPropertyNode>& InRootNode, FName CategoryName)
+	{
+		return InRootNode->AsObjectNode() && InRootNode->AsObjectNode()->GetHiddenCategories().Contains(CategoryName);
+	}
+
+	/**
+	* Determines whether or not a property should be visible in the default generated detail layout
+	*
+	* @param PropertyNode	The property node to check
+	* @param ParentNode	The parent property node to check
+	* @return true if the property should be visible
+	*/
+	bool IsVisibleStandaloneProperty(const FPropertyNode& PropertyNode, const FPropertyNode& ParentNode)
+	{
+		const FProperty* Property = PropertyNode.GetProperty();
+		const FArrayProperty* ParentArrayProperty = CastField<const FArrayProperty>(ParentNode.GetProperty());
+
+		bool bIsVisibleStandalone = false;
+		if (Property)
+		{
+			if (Property->IsA(FObjectPropertyBase::StaticClass()))
+			{
+				// Do not add this child node to the current map if its a single object property in a category (serves no purpose for UI)
+				bIsVisibleStandalone = !ParentArrayProperty && (PropertyNode.GetNumChildNodes() == 0 || PropertyNode.GetNumChildNodes() > 1);
+			}
+			else if (Property->IsA(FArrayProperty::StaticClass()) || (Property->ArrayDim > 1 && PropertyNode.GetArrayIndex() == INDEX_NONE))
+			{
+				// Base array properties are always visible
+				bIsVisibleStandalone = true;
+			}
+			else
+			{
+				bIsVisibleStandalone = true;
+			}
+
+		}
+
+		return bIsVisibleStandalone;
+	}
+
+	static const FName NAME_DisplayAfter("DisplayAfter");
+	static const FName NAME_DisplayPriority("DisplayPriority");
+
+	void OrderPropertiesFromMetadata(TArray<FProperty*>& Properties)
+	{
+		TMap<FName, TArray<TTuple<FProperty*, int32>>> DisplayAfterPropertyMap;
+		TArray<TTuple<FProperty*, int32>> OrderedProperties;
+		OrderedProperties.Reserve(Properties.Num());
+
+		// First establish the properties that are not dependent on another property in display priority order
+		// At the same time build a display priority sorted list of order after properties for each property name
+		for (FProperty* Prop : Properties)
+		{
+			const FString& DisplayPriorityStr = FRuntimeMetaData::GetMetaData(Prop, NAME_DisplayPriority);
+			int32 DisplayPriority = (DisplayPriorityStr.IsEmpty() ? MAX_int32 : FCString::Atoi(*DisplayPriorityStr));
+			if (DisplayPriority == 0 && !FCString::IsNumeric(*DisplayPriorityStr))
+			{
+				// If there was a malformed display priority str Atoi will say it is 0, but we want to treat it as unset
+				DisplayPriority = MAX_int32;
+			}
+
+			auto InsertProperty = [Prop, DisplayPriority](TArray<TTuple<FProperty*, int32>>& InsertToArray)
+			{
+				bool bInserted = false;
+				if (DisplayPriority != MAX_int32)
+				{
+					for (int32 InsertIndex = 0; InsertIndex < InsertToArray.Num(); ++InsertIndex)
+					{
+						const int32 PriorityAtIndex = InsertToArray[InsertIndex].Get<1>();
+						if (DisplayPriority < PriorityAtIndex)
+						{
+							InsertToArray.Insert(MakeTuple(Prop, DisplayPriority), InsertIndex);
+							bInserted = true;
+							break;
+						}
+					}
+				}
+
+				if (!bInserted)
+				{
+					InsertToArray.Emplace(MakeTuple(Prop, DisplayPriority));
+				}
+			};
+
+			const FString& DisplayAfterPropertyName = FRuntimeMetaData::GetMetaData(Prop, NAME_DisplayAfter);
+			if (DisplayAfterPropertyName.IsEmpty())
+			{
+				InsertProperty(OrderedProperties);
+			}
+			else
+			{
+				TArray<TPair<FProperty*, int32>>& DisplayAfterProperties = DisplayAfterPropertyMap.FindOrAdd(FName(*DisplayAfterPropertyName));
+				InsertProperty(DisplayAfterProperties);
+			}
+		}
+
+		// While there are still properties that need insertion seek out the property they should be listed after and insert them in their pre-display priority sorted order
+		int32 RemainingDisplayAfterNodes = -1; // avoid infinite loop caused by cycles or missing dependencies by tracking that the map shrunk each iteration
+		while (DisplayAfterPropertyMap.Num() > 0 && DisplayAfterPropertyMap.Num() != RemainingDisplayAfterNodes)
+		{
+			RemainingDisplayAfterNodes = DisplayAfterPropertyMap.Num();
+
+			for (int32 InsertIndex = 0; InsertIndex < OrderedProperties.Num(); ++InsertIndex)
+			{
+				FProperty* Prop = OrderedProperties[InsertIndex].Get<0>();
+
+				if (TArray<TTuple<FProperty*, int32>>* DisplayAfterProperties = DisplayAfterPropertyMap.Find(Prop->GetFName()))
+				{
+					OrderedProperties.Insert(MoveTemp(*DisplayAfterProperties), InsertIndex + 1);
+					DisplayAfterPropertyMap.Remove(Prop->GetFName());
+					if (DisplayAfterPropertyMap.Num() == 0)
+					{
+						break;
+					}
+				}
+			}
+		}
+
+		// Copy the sorted properties back in to the original array
+		Properties.Reset();
+		for (const TTuple<FProperty*, int32>& Property : OrderedProperties)
+		{
+			Properties.Add(Property.Get<0>());
+		}
+
+		if (DisplayAfterPropertyMap.Num() != 0)
+		{
+			// If we hit this there is either a cycle or a dependency on something that doesn't exist, so just put them at the end of the list
+			// TODO: Some kind of warning?
+			for (TPair<FName, TArray<TTuple<FProperty*, int32>>>& DisplayAfterProperties : DisplayAfterPropertyMap)
+			{
+				for (const TTuple<FProperty*, int32>& Property : DisplayAfterProperties.Value)
+				{
+					Properties.Add(Property.Get<0>());
+				}
+			}
+		}
+	}
+
+	FName GetPropertyOptionsMetaDataKey(const FProperty* Property)
+	{
+		// Only string and name properties can have options
+		if (Property->IsA(FStrProperty::StaticClass()) || Property->IsA(FNameProperty::StaticClass()))
+		{
+			const FProperty* OwnerProperty = Property->GetOwnerProperty();
+			static const FName GetOptionsName("GetOptions");
+			if (FRuntimeMetaData::HasMetaData(OwnerProperty, GetOptionsName))
+			{
+				return GetOptionsName;
+			}
+
+			// Map properties can have separate options for keys and values
+			const FMapProperty* MapProperty = CastField<FMapProperty>(OwnerProperty);
+			if (MapProperty)
+			{
+				static const FName GetKeyOptionsName("GetKeyOptions");
+				if (FRuntimeMetaData::HasMetaData(MapProperty, GetKeyOptionsName) && MapProperty->GetKeyProperty() == Property)
+				{
+					return GetKeyOptionsName;
+				}
+
+				static const FName GetValueOptionsName("GetValueOptions");
+				if (FRuntimeMetaData::HasMetaData(MapProperty, GetValueOptionsName) && MapProperty->GetValueProperty() == Property)
+				{
+					return GetValueOptionsName;
+				}
+			}
+		}
+
+		return NAME_None;
+	}
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorHelpers.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorHelpers.h
new file mode 100644
index 0000000..4f8ea85
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorHelpers.h
@@ -0,0 +1,282 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Widgets/SWidget.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Framework/SlateDelegates.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/SDetailSingleItemRow.h"
+
+class FNotifyHook;
+
+namespace soda
+{
+
+class FObjectPropertyNode;
+
+/** Property button enums. */
+namespace EPropertyButton
+{
+	enum Type
+	{
+		Add,
+		Empty,
+		Insert_Delete_Duplicate,
+		Insert_Delete,
+		Insert,
+		Delete,
+		Duplicate,
+		Browse,
+		PickAsset,
+		PickActor,
+		PickActorInteractive,
+		Clear,
+		Use,
+		NewBlueprint,
+		EditConfigHierarchy,
+		Documentation,
+	};
+}
+
+class SPropertyNameWidget : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SPropertyNameWidget )
+	{}
+		SLATE_EVENT( FOnClicked, OnDoubleClicked )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, TSharedPtr<FPropertyEditor> PropertyEditor );
+
+private:
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+};
+
+class SPropertyValueWidget : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SPropertyValueWidget )
+		: _ShowPropertyButtons( true )
+	{}
+		SLATE_ARGUMENT( bool, ShowPropertyButtons )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, TSharedPtr<FPropertyEditor> InPropertyEditor, TSharedPtr<IPropertyUtilities> InPropertyUtilities );
+
+	/** @return The minimum desired with if this property value */
+	float GetMinDesiredWidth() const { return MinDesiredWidth; }
+
+	/** @return The maximum desired with if this property value */
+	float GetMaxDesiredWidth() const { return MaxDesiredWidth; }
+
+private:
+	TSharedRef<SWidget> ConstructPropertyEditorWidget( TSharedPtr<FPropertyEditor>& PropertyEditor, TSharedPtr<IPropertyUtilities> InPropertyUtilities );
+private:
+	TSharedPtr< SWidget > ValueEditorWidget;
+	/** The minimum desired with if this property value */
+	float MinDesiredWidth;
+	/** The maximum desired with if this property value */
+	float MaxDesiredWidth;
+};
+
+class SEditConditionWidget : public SCompoundWidget
+{
+	SLATE_BEGIN_ARGS( SEditConditionWidget )
+	{}
+		SLATE_ATTRIBUTE( bool, EditConditionValue )
+		SLATE_EVENT( FOnBooleanValueChanged, OnEditConditionValueChanged )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& Args );
+
+private:
+	void OnEditConditionCheckChanged( ECheckBoxState CheckState );
+	bool HasEditConditionToggle() const;
+	ECheckBoxState OnGetEditConditionCheckState() const;
+	EVisibility GetVisibility() const;
+
+private:
+	TAttribute<bool> EditConditionValue;
+	FOnBooleanValueChanged OnEditConditionValueChanged;
+};
+
+namespace PropertyEditorHelpers
+{
+	/** 
+	 * Perform common checks from metadata to determine if a given Property
+	 * should be visible when displayed underneath the given property node.
+	 */
+	bool ShouldBeVisible(const FPropertyNode& InParentNode, const FProperty* Property);
+
+	/**
+	 * Returns whether or not a property is a built in struct property like a vector or color
+	 *
+	 * @return true if the property is built in type, false otherwise
+	 */
+	bool IsBuiltInStructProperty( const FProperty* Property );
+
+	/**
+	 * Returns whether or not a property is a child of an array (static or dynamic)
+	 *
+	 * @return true if the property is in an array, false otherwise
+	 */
+	bool IsChildOfArray( const FPropertyNode& InPropertyNode );
+
+	/**
+	 * @return true if the property is a child (within) a set, false otherwise
+	 */
+	bool IsChildOfSet( const FPropertyNode& InPropertyNode );
+
+	/**
+	 * @return true if the property is a child (within) a map, false otherwise
+	 */
+	bool IsChildOfMap( const FPropertyNode& InPropertyNode );
+	
+	/**
+	 * Returns whether or not a property a static array
+	 *
+	 * @param InPropertyNode	The property node containing the property to check
+	 */
+	bool IsStaticArray( const FPropertyNode& InPropertyNode );
+	
+	/**
+	 * Returns whether or not a property a static array
+	 *
+	 * @param InPropertyNode	The property node containing the property to check
+	 */
+	bool IsDynamicArray( const FPropertyNode& InPropertyNode );
+
+	/**
+	 * Returns true if this is an FSoftObjectPath and should be treated like a TSoftObjectPtr
+	 */
+	bool IsSoftObjectPath(const FProperty* Property);
+
+	/**
+	 * Returns true if this is an FSoftClassPath and should be treated like a TSoftClassPtr
+	 */
+	bool IsSoftClassPath(const FProperty* Property);
+
+	/**
+	 * Gets the array parent of a property if it is in a dynamic or static array
+	 */
+	const FProperty* GetArrayParent( const FPropertyNode& InPropertyNode );
+
+	/**
+	 * Gets the set parent of a property if it is in a set
+	 */
+	const FProperty* GetSetParent( const FPropertyNode& InPropertyNode );
+
+	/**
+	 * Gets the map parent of a property if it is in a map
+	 */
+	const FProperty* GetMapParent(const FPropertyNode& InPropertyNode);
+
+	/**
+	 * Returns if a class is acceptable for edit inline
+	 *
+	 * @param CheckClass		The class to check
+	 * @param bAllowAbstract	True if abstract classes are allowed
+	 */
+	bool IsEditInlineClassAllowed( UClass* CheckClass, bool bAllowAbstract );
+
+	/**
+	 * @return The text that represents the specified properties tooltip
+	 */
+	FText GetToolTipText( const FProperty* const Property );
+
+	/**
+	 * @return The link to the documentation that describes this property in detail
+	 */
+	FString GetDocumentationLink( const FProperty* const Property );
+
+	/**
+	* @return The link to the documentation that describes this enum property in detail
+	*/
+	FString GetEnumDocumentationLink(const FProperty* const Property);
+
+	/**
+	 * @return The name of the excerpt that describes this property in detail in the documentation file linked to this property
+	 */
+	FString GetDocumentationExcerptName( const FProperty* const Property );
+
+	/**
+	 * Gets a property handle for the specified property node
+	 * 
+	 * @param PropertyNode		The property node to get the handle from
+	 * @param NotifyHook		Optional notify hook for the handle to use
+	 */
+	TSharedPtr<IPropertyHandle> GetPropertyHandle( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+
+	/**
+	 * Generates a list of required button types for the property
+	 *
+	 * @param PropertyNode			The property node to get required buttons from
+	 * @param OutRequiredbuttons	The list of required buttons 
+	 * @param bUsingAssetPicker		Whether or not the property editor is using the asset picker
+	 */
+	void GetRequiredPropertyButtons( TSharedRef<FPropertyNode> PropertyNode, TArray<EPropertyButton::Type>& OutRequiredButtons, bool bUsingAssetPicker = true );
+
+	/**
+	 * Makes property buttons widgets that accompany a property
+	 *
+	 * @param PropertyNode				The property node to make buttons for
+	 * @param ButtonTypeToDelegateMap	A mapping of button type to the delegate to call when the button is clicked
+	 * @param OutButtons				The populated list of button widgets
+	 * @param ButtonsToIgnore			Specify those buttons which should be ignored and not added
+	 * @param bUsingAssetPicker			Whether or not the property editor is using the asset picker
+	 */
+	void MakeRequiredPropertyButtons( const TSharedRef<FPropertyNode>& PropertyNode, const TSharedRef<IPropertyUtilities>& PropertyUtilities, TArray< TSharedRef<SWidget> >& OutButtons, const TArray<EPropertyButton::Type>& ButtonsToIgnore = TArray<EPropertyButton::Type>(), bool bUsingAssetPicker = true );
+	void MakeRequiredPropertyButtons( const TSharedRef< FPropertyEditor >& PropertyEditor, TArray< TSharedRef<SWidget> >& OutButtons, const TArray<EPropertyButton::Type>& ButtonsToIgnore = TArray<EPropertyButton::Type>(), bool bUsingAssetPicker = true );
+
+	TSharedRef<SWidget> MakePropertyButton( const EPropertyButton::Type ButtonType, const TSharedRef< FPropertyEditor >& PropertyEditor );
+	TSharedRef<SWidget> MakePropertyReorderHandle(TSharedPtr<SDetailSingleItemRow> InParentRow, TAttribute<bool> InEnabledAttr);
+	/**
+	 * Recursively finds all object property nodes in a property tree
+	 *
+	 * @param StartNode	The node to start from
+	 * @param OutObjectNodes	List of all object nodes found
+	 */
+	void CollectObjectNodes( TSharedPtr<FPropertyNode> StartNode, TArray<FObjectPropertyNode*>& OutObjectNodes );
+
+	/**
+	 * Returns any enums that are explicitly allowed by the "ValidEnumValues" metadata on FProperty using the specified enum.
+	 *
+	 * @param Property	The property which may contain the "ValidEnumValues" metadata
+	 * @param InEnum	The enum to search
+	 * @return The array of allowed enums.  NOTE: If an empty array is returned all enum values are allowed.  It is an error for a property to hide all enum values so that state is undefined here.
+	 */
+	TArray<FName> GetValidEnumsFromPropertyOverride(const FProperty* Property, const UEnum* InEnum);
+	/**
+	 * Whether or not a category is hidden by a given root object
+	 * @param InRootNode	The root node that for the objects we are customizing
+	 * @param CategoryName	The name of the category to check
+	 * @return true if a category is hidden, false otherwise
+	 */
+	bool IsCategoryHiddenByClass(const TSharedPtr<FComplexPropertyNode>& InRootNode, FName CategoryName);
+	
+	/**
+	 * Determines whether or not a property should be visible in the default generated detail layout
+	 *
+	 * @param PropertyNode	The property node to check
+	 * @param ParentNode	The parent property node to check
+	 * @return true if the property should be visible
+	 */
+	bool IsVisibleStandaloneProperty(const FPropertyNode& PropertyNode, const FPropertyNode& ParentNode);
+
+	void OrderPropertiesFromMetadata(TArray<FProperty*>& Properties);
+
+	/**
+	* For properties that support options lists, returns the metadata key which holds the name of the UFunction to call.
+	* Returns NAME_None if the property doesn't support, or doesn't have, options.
+	*/
+	FName GetPropertyOptionsMetaDataKey(const FProperty* Property);
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorPermissionList.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorPermissionList.cpp
new file mode 100644
index 0000000..9359175
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyEditorPermissionList.cpp
@@ -0,0 +1,237 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyEditorPermissionList.h"
+
+//#include "Editor.h"
+#include "Misc/CoreDelegates.h"
+#include "UObject/UnrealType.h"
+
+namespace soda
+{
+namespace
+{
+	const FName PropertyEditorPermissionListOwner = "PropertyEditorPermissionList";
+}
+
+FPropertyEditorPermissionList::FPropertyEditorPermissionList()
+{
+	/*
+	if (GEditor)
+	{
+		RegisterOnBlueprintCompiled();
+	}
+	else
+	*/
+	{
+		FCoreDelegates::OnPostEngineInit.AddRaw(this, &FPropertyEditorPermissionList::RegisterOnBlueprintCompiled);
+	}
+}
+
+void FPropertyEditorPermissionList::RegisterOnBlueprintCompiled()
+{
+	/*
+	if (ensure(GEditor))
+	{
+		GEditor->OnBlueprintCompiled().AddRaw(this, &FPropertyEditorPermissionList::ClearCache);
+	}
+	*/
+}
+
+FPropertyEditorPermissionList::~FPropertyEditorPermissionList()
+{
+	/*
+	if (GEditor)
+	{
+		GEditor->OnBlueprintCompiled().RemoveAll(this);
+	}
+	*/
+}
+
+void FPropertyEditorPermissionList::AddPermissionList(TSoftObjectPtr<UStruct> Struct, const FNamePermissionList& PermissionList, EPropertyEditorPermissionListRules Rules)
+{
+	FPropertyEditorPermissionListEntry& Entry = RawPropertyEditorPermissionList.FindOrAdd(Struct);
+	Entry.PermissionList.Append(PermissionList);
+	Entry.Rules = Rules;
+	// The cache isn't too expensive to recompute, so it is cleared
+	// and lazily repopulated any time the raw PermissionList changes.
+	ClearCache();
+	PermissionListUpdatedDelegate.Broadcast(Struct, NAME_None);
+}
+
+void FPropertyEditorPermissionList::RemovePermissionList(TSoftObjectPtr<UStruct> Struct)
+{
+	if (RawPropertyEditorPermissionList.Remove(Struct) > 0)
+	{
+		ClearCache();
+		PermissionListUpdatedDelegate.Broadcast(Struct, NAME_None);
+	}
+}
+
+void FPropertyEditorPermissionList::ClearPermissionList()
+{
+	TArray<TSoftObjectPtr<UStruct>> Keys;
+	RawPropertyEditorPermissionList.Reset();
+	PermissionListUpdatedDelegate.Broadcast(nullptr, NAME_None);
+}
+
+void FPropertyEditorPermissionList::AddToAllowList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner)
+{
+	FPropertyEditorPermissionListEntry& Entry = RawPropertyEditorPermissionList.FindOrAdd(Struct);
+	if (Entry.PermissionList.AddAllowListItem(Owner, PropertyName))
+	{
+		ClearCache();
+		PermissionListUpdatedDelegate.Broadcast(Struct, Owner);
+	}
+}
+
+void FPropertyEditorPermissionList::RemoveFromAllowList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner)
+{
+	FPropertyEditorPermissionListEntry& Entry = RawPropertyEditorPermissionList.FindOrAdd(Struct);
+	if (Entry.PermissionList.RemoveAllowListItem(Owner, PropertyName))
+	{
+		ClearCache();
+		PermissionListUpdatedDelegate.Broadcast(Struct, Owner);
+	}
+}
+
+void FPropertyEditorPermissionList::AddToDenyList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner)
+{
+	FPropertyEditorPermissionListEntry& Entry = RawPropertyEditorPermissionList.FindOrAdd(Struct);
+	if (Entry.PermissionList.AddDenyListItem(Owner, PropertyName))
+	{
+		ClearCache();
+		PermissionListUpdatedDelegate.Broadcast(Struct, Owner);
+	}
+}
+
+void FPropertyEditorPermissionList::RemoveFromDenyList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner)
+{
+	FPropertyEditorPermissionListEntry& Entry = RawPropertyEditorPermissionList.FindOrAdd(Struct);
+	if (Entry.PermissionList.RemoveDenyListItem(Owner, PropertyName))
+	{
+		ClearCache();
+		PermissionListUpdatedDelegate.Broadcast(Struct, Owner);
+	}
+}
+
+void FPropertyEditorPermissionList::SetEnabled(bool bEnable)
+{
+	bEnablePropertyEditorPermissionList = bEnable;
+	PermissionListEnabledDelegate.Broadcast();
+}
+
+void FPropertyEditorPermissionList::ClearCache()
+{
+	CachedPropertyEditorPermissionList.Reset();
+}
+
+bool FPropertyEditorPermissionList::DoesPropertyPassFilter(const UStruct* ObjectStruct, FName PropertyName) const
+{
+	if (bEnablePropertyEditorPermissionList && ObjectStruct)
+	{
+		return GetCachedPermissionListForStruct(ObjectStruct).PassesFilter(PropertyName);
+	}
+	return true;
+}
+
+const FNamePermissionList& FPropertyEditorPermissionList::GetCachedPermissionListForStruct(const UStruct* Struct) const
+{
+	const FNamePermissionList* CachedPermissionList = CachedPropertyEditorPermissionList.Find(Struct);
+	if (CachedPermissionList)
+	{
+		return *CachedPermissionList;
+	}
+
+	// Default value doesn't matter since it's a no-op until the first PermissionList is encountered, at which
+	// point the rules will re-assign the value.
+	bool bShouldPermissionListAllProperties = true;
+	return GetCachedPermissionListForStructHelper(Struct, bShouldPermissionListAllProperties);
+}
+
+const FNamePermissionList& FPropertyEditorPermissionList::GetCachedPermissionListForStructHelper(const UStruct* Struct, bool& bInOutShouldAllowListAllProperties) const
+{
+	check(Struct);
+
+	const FPropertyEditorPermissionListEntry* Entry = RawPropertyEditorPermissionList.Find(Struct);
+	bool bIsThisAllowListEmpty = Entry ? Entry->PermissionList.GetAllowList().Num() == 0 : true;
+
+	// Normally this case would be caught in GetCachedPermissionListForStruct, but when being called recursively from a subclass
+	// we still need to update bInOutShouldAllowListAllProperties so that new PermissionLists cache properly.
+	FNamePermissionList* PermissionList = CachedPropertyEditorPermissionList.Find(Struct);
+	if (PermissionList)
+	{
+		// Same check as below, but it specifically has to come after the recursive call so we have to duplicate the code here
+		if (Entry && Entry->Rules == EPropertyEditorPermissionListRules::AllowListAllProperties)
+		{
+			bInOutShouldAllowListAllProperties = true;
+		}
+	}
+	else
+	{
+		FNamePermissionList NewPermissionList;
+
+		UStruct* SuperStruct = Struct->GetSuperStruct();
+		// Recursively fill the cache for all parent structs
+		if (SuperStruct)
+		{
+			NewPermissionList.Append(GetCachedPermissionListForStructHelper(SuperStruct, bInOutShouldAllowListAllProperties));
+		}
+
+		// Append this struct's PermissionList on top of the parent's PermissionList
+		if (Entry)
+		{
+			NewPermissionList.Append(Entry->PermissionList);
+
+			if (Entry->Rules == EPropertyEditorPermissionListRules::AllowListAllProperties)
+			{
+				bInOutShouldAllowListAllProperties = true;
+			}
+		}
+
+		// PermissionList all properties if the flag is set, the parent Struct has a PermissionList, and this Struct has no PermissionList
+		// If the parent Struct's PermissionList is empty then that already implies all properties are visible
+		// If this Struct has a PermissionList, the manually-specified list always overrides the ShouldPermissionListAllProperties rule
+		if (bInOutShouldAllowListAllProperties && NewPermissionList.GetAllowList().Num() > 0 && bIsThisAllowListEmpty)
+		{
+			for (TFieldIterator<FProperty> Property(Struct, EFieldIteratorFlags::ExcludeSuper, EFieldIteratorFlags::ExcludeDeprecated); Property; ++Property)
+			{
+				NewPermissionList.AddAllowListItem(PropertyEditorPermissionListOwner, Property->GetFName());
+			}
+		}
+
+		PermissionList = &CachedPropertyEditorPermissionList.Add(Struct, NewPermissionList);
+	}
+
+	// If this Struct has no PermissionList, then the ShouldPermissionListAllProperties rule just forwards its current value on to the next subclass.
+	// This causes an issue in the case where a Struct should have no PermissionListed properties but wants to PermissionList all subclass properties.
+	// In this case, simply add a dummy entry to the Struct's PermissionList that (likely) won't ever collide with a real property name
+	if (!bIsThisAllowListEmpty)
+	{
+		bInOutShouldAllowListAllProperties = Entry->Rules == EPropertyEditorPermissionListRules::AllowListAllSubclassProperties;
+	}
+
+	return *PermissionList;
+}
+
+bool FPropertyEditorPermissionList::IsSpecificPropertyAllowListed(const UStruct* ObjectStruct, FName PropertyName) const
+{
+	const FPropertyEditorPermissionListEntry* Entry = RawPropertyEditorPermissionList.Find(ObjectStruct);
+	if (Entry)
+	{
+		return Entry->PermissionList.GetAllowList().Contains(PropertyName);
+	}
+	return false;
+}
+
+bool FPropertyEditorPermissionList::IsSpecificPropertyDenyListed(const UStruct* ObjectStruct, FName PropertyName) const
+{
+	const FPropertyEditorPermissionListEntry* Entry = RawPropertyEditorPermissionList.Find(ObjectStruct);
+	if (Entry)
+	{
+		return Entry->PermissionList.GetDenyList().Contains(PropertyName);
+	}
+	return false;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyHandleImpl.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyHandleImpl.cpp
new file mode 100644
index 0000000..6358c84
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyHandleImpl.cpp
@@ -0,0 +1,5010 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "GameFramework/Actor.h"
+//#include "Editor.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "Misc/MessageDialog.h"
+#include "Misc/App.h"
+#include "UObject/UObjectHash.h"
+#include "UObject/UObjectIterator.h"
+#include "UObject/TextProperty.h"
+//#include "Editor/UnrealEdEngine.h"
+//#include "UnrealEdGlobals.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+//#include "ScopedTransaction.h"
+//#include "Kismet2/KismetEditorUtilities.h"
+#include "Engine/Selection.h"
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+#include "Algo/Transform.h"
+
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "UObject/EnumProperty.h"
+#include "UObject/FieldPathProperty.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+//#include "ObjectEditorUtils.h"
+#include "RuntimePropertyEditor/SResetToDefaultPropertyEditor.h"
+#include "PropertyPathHelpers.h"
+#include "RuntimePropertyEditor/PropertyTextUtilities.h"
+#include "HAL/PlatformApplicationMisc.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+
+#include "RuntimeEditorUtils.h"
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyHandleImplementation"
+
+namespace soda
+{
+
+bool IsTemplate(UObject* Obj)
+{
+	return Obj &&
+		(Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) ||
+		(Obj->HasAnyFlags(RF_DefaultSubObject) && Obj->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject)));
+}
+
+FPropertyValueImpl::FPropertyValueImpl( TSharedPtr<FPropertyNode> InPropertyNode, FNotifyHook* InNotifyHook, TSharedPtr<IPropertyUtilities> InPropertyUtilities )
+	: PropertyNode( InPropertyNode )
+	, PropertyUtilities( InPropertyUtilities )
+	, NotifyHook( InNotifyHook )
+	, bInteractiveChangeInProgress( false )
+	, InvalidOperationError( nullptr )
+{
+}
+
+void FPropertyValueImpl::EnumerateObjectsToModify( FPropertyNode* InPropertyNode, const EnumerateObjectsToModifyFuncRef& InObjectsToModifyCallback ) const
+{
+	// Find the parent object node which contains offset addresses for reading a property value on an object
+	FComplexPropertyNode* ComplexNode = InPropertyNode->FindComplexParent();
+	if (ComplexNode)
+	{
+		const bool bIsStruct = FComplexPropertyNode::EPT_StandaloneStructure == ComplexNode->GetPropertyType();
+		const int32 NumInstances = ComplexNode->GetInstancesNum();
+		for (int32 Index = 0; Index < NumInstances; ++Index)
+		{
+			UObject* Object = nullptr;
+			uint8* StructAddress = nullptr;
+			if (bIsStruct)
+			{
+				StructAddress = ComplexNode->GetMemoryOfInstance(Index);
+			}
+			else
+			{
+				Object = ComplexNode->GetInstanceAsUObject(Index).Get();
+				StructAddress = InPropertyNode->GetStartAddressFromObject(Object);
+			}
+			uint8* BaseAddress = InPropertyNode->GetValueBaseAddress(StructAddress, InPropertyNode->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData));
+
+			if (!InObjectsToModifyCallback(FObjectBaseAddress(Object, StructAddress, BaseAddress), Index, NumInstances))
+			{
+				break;
+			}
+		}
+	}
+}
+
+void FPropertyValueImpl::GetObjectsToModify( TArray<FObjectBaseAddress>& ObjectsToModify, FPropertyNode* InPropertyNode ) const
+{
+	EnumerateObjectsToModify(InPropertyNode, [&](const FObjectBaseAddress& ObjectToModify, const int32 ObjectIndex, const int32 NumObjects) -> bool
+	{
+		if (ObjectIndex == 0)
+		{
+			ObjectsToModify.Reserve(ObjectsToModify.Num() + NumObjects);
+		}
+		ObjectsToModify.Add(ObjectToModify);
+		return true;
+	});
+}
+
+FPropertyAccess::Result FPropertyValueImpl::GetValueData( void*& OutAddress ) const
+{
+	FPropertyAccess::Result Res = FPropertyAccess::Fail;
+	OutAddress = nullptr;
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() )
+	{
+		uint8* ValueAddress = nullptr;
+		FReadAddressList ReadAddresses;
+		bool bAllValuesTheSame = PropertyNodePin->GetReadAddress( !!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false, true );
+
+		if( (ReadAddresses.Num() > 0 && bAllValuesTheSame) || ReadAddresses.Num() == 1 ) 
+		{
+			ValueAddress = ReadAddresses.GetAddress(0);
+			const FProperty* Property = PropertyNodePin->GetProperty();
+			if (ValueAddress && Property)
+			{
+				const int32 Index = 0;
+				OutAddress = ValueAddress + Index * Property->ElementSize;
+				Res = FPropertyAccess::Success;
+			}
+		}
+		else if (ReadAddresses.Num() > 1)
+		{
+			Res = FPropertyAccess::MultipleValues;
+		}
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyValueImpl::ImportText( const FString& InValue, EPropertyValueSetFlags::Type Flags )
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() && !PropertyNodePin->IsEditConst() )
+	{
+		return ImportText( InValue, PropertyNodePin.Get(), Flags );
+	}
+
+	// The property node is not valid or cant be set.  If not valid it probably means this value was stored somewhere and selection changed causing the node to be destroyed
+	return FPropertyAccess::Fail;
+}
+
+FString FPropertyValueImpl::GetPropertyValueArray() const
+{
+	FString String;
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() )
+	{
+		FReadAddressList ReadAddresses;
+
+		bool bSingleValue = PropertyNodePin->GetReadAddress( !!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false );
+
+		if( bSingleValue )
+		{
+			FProperty* NodeProperty = PropertyNodePin->GetProperty();
+			if( NodeProperty != nullptr )
+			{
+				uint8* Addr = ReadAddresses.GetAddress(0);
+				if( Addr )
+				{
+					if ( FArrayProperty* ArrayProperty = CastField<FArrayProperty>(NodeProperty) )
+					{
+						FScriptArrayHelper ArrayHelper(ArrayProperty, Addr);
+						String = FString::Printf( TEXT("%(%d)"), ArrayHelper.Num() );
+					}
+					else if ( CastField<FSetProperty>(NodeProperty) != nullptr )	
+					{
+						String = FString::Printf( TEXT("%(%d)"), FScriptSetHelper::Num(Addr) );
+					}
+					else if (FMapProperty* MapProperty = CastField<FMapProperty>(NodeProperty))
+					{
+						FScriptMapHelper MapHelper(MapProperty, Addr);
+						String = FString::Printf(TEXT("%(%d)"), MapHelper.Num());
+					}
+					else
+					{
+						String = FString::Printf( TEXT("%[%d]"), NodeProperty->ArrayDim );
+					}
+				}
+			}
+		}
+		else
+		{
+			String = NSLOCTEXT("PropertyEditor", "MultipleValues", "Multiple Values").ToString();
+		}
+	}
+
+	return String;
+}
+
+
+void FPropertyValueImpl::GenerateArrayIndexMapToObjectNode( TMap<FString,int32>& OutArrayIndexMap, FPropertyNode* PropertyNode )
+{
+	if( PropertyNode )
+	{
+		OutArrayIndexMap.Empty();
+		for (FPropertyNode* IterationNode = PropertyNode; (IterationNode != nullptr) && (IterationNode->AsObjectNode() == nullptr); IterationNode = IterationNode->GetParentNode())
+		{
+			FProperty* Property = IterationNode->GetProperty();
+			if (Property)
+			{
+				//since we're starting from the lowest level, we have to take the first entry.  In the case of an array, the entries and the array itself have the same name, except the parent has an array index of -1
+				if (!OutArrayIndexMap.Contains(Property->GetName()))
+				{
+					OutArrayIndexMap.Add(Property->GetName(), IterationNode->GetArrayIndex());
+				}
+			}
+		}
+	}
+}
+
+FPropertyAccess::Result FPropertyValueImpl::ImportText( const FString& InValue, FPropertyNode* InPropertyNode, EPropertyValueSetFlags::Type Flags )
+{
+	TArray<FObjectBaseAddress> ObjectsToModify;
+	GetObjectsToModify(ObjectsToModify, InPropertyNode);
+
+	TArray<FString> Values;
+	for (const FObjectBaseAddress& BaseAddress : ObjectsToModify)
+	{
+		if (BaseAddress.BaseAddress)
+		{
+			Values.Add(InValue);
+		}
+	}
+
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (Values.Num() > 0)
+	{
+		Result = ImportText(ObjectsToModify, Values, InPropertyNode, Flags);
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyValueImpl::ImportText( const TArray<FObjectBaseAddress>& InObjects, const TArray<FString>& InValues, FPropertyNode* InPropertyNode, EPropertyValueSetFlags::Type Flags )
+{
+	check(InPropertyNode);
+	FProperty* NodeProperty = InPropertyNode->GetProperty();
+
+	FPropertyAccess::Result Result = FPropertyAccess::Success;
+
+	if( !NodeProperty )
+	{
+		// The property has been deleted out from under this
+		Result = FPropertyAccess::Fail;
+	}
+	else if( NodeProperty->IsA<FObjectProperty>() || NodeProperty->IsA<FNameProperty>() )
+	{
+		// certain properties have requirements on the size of string values that can be imported.  Search for strings that are too large.
+		for (const FString& Value : InValues)
+		{
+			if (Value.Len() >= NAME_SIZE)
+			{
+				Result = FPropertyAccess::Fail;
+				break;
+			}
+		}
+	}
+
+	if( Result != FPropertyAccess::Fail )
+	{
+		UWorld* OldGWorld = nullptr;
+
+		bool bIsGameWorld = false;
+		// If the object we are modifying is in the PIE world, than make the PIE world the active
+		// GWorld.  Assumes all objects managed by this property window belong to the same world.
+		/*
+		UObject* FirstObject = InObjects[0].Object;
+		if (UPackage* ObjectPackage = (FirstObject ? FirstObject->GetOutermost() : nullptr))
+		{
+			const bool bIsPIEPackage = ObjectPackage->HasAnyPackageFlags(PKG_PlayInEditor);
+			if (GUnrealEd && GUnrealEd->PlayWorld && bIsPIEPackage && !GIsPlayInEditorWorld)
+			{
+				OldGWorld = SetPlayInEditorWorld(GUnrealEd->PlayWorld);
+				bIsGameWorld = true;
+			}
+		}
+		*/
+		///////////////
+
+		// Send the values and assemble a list of pre/posteditchange values.
+		bool bNotifiedPreChange = false;
+		UObject *NotifiedObj = nullptr;
+		TArray< TMap<FString,int32> > ArrayIndicesPerObject;
+
+		const bool bTransactable = (Flags & EPropertyValueSetFlags::NotTransactable) == 0;
+		const bool bFinished = ( Flags & EPropertyValueSetFlags::InteractiveChange) == 0;
+		
+		// List of top level objects sent to the PropertyChangedEvent
+		TArray<const UObject*> TopLevelObjects;
+		TopLevelObjects.Reserve(InObjects.Num());
+
+		for (int32 ObjectIndex = 0 ; ObjectIndex < InObjects.Num() ; ++ObjectIndex)
+		{	
+			const FObjectBaseAddress& Cur = InObjects[ObjectIndex];
+			if (Cur.BaseAddress == nullptr)
+			{
+				//Fully abort this procedure.  The data has changed out from under the object
+				Result = FPropertyAccess::Fail;
+				break;
+			}
+
+			UObject* CurObject = Cur.Object;
+
+			const FString& NewValue = InValues[ObjectIndex];
+
+			// Cache the value of the property before modifying it.
+			FString PreviousValue;
+			FPropertyTextUtilities::PropertyToTextHelper(PreviousValue, InPropertyNode, NodeProperty, Cur, PPF_None);
+
+			// If this property is the inner-property of a container, cache the current value as well
+			FString PreviousContainerValue;
+			
+			FPropertyNode* ParentNode = InPropertyNode->GetParentNode();
+			FProperty* Property = ParentNode ? ParentNode->GetProperty() : nullptr;
+
+			const bool bIsSparseClassData = InPropertyNode->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) != 0;
+			const bool bIsStruct = !Cur.Object;
+
+			bool bIsInContainer = false;
+
+			if (FArrayProperty* ArrayProperty = CastField<FArrayProperty>(Property))
+			{
+				bIsInContainer = (ArrayProperty->Inner == NodeProperty);
+			}
+			else if (FSetProperty* SetProperty = CastField<FSetProperty>(Property))
+			{
+				// If the element is part of a set, check for duplicate elements
+				bIsInContainer = SetProperty->ElementProp == NodeProperty;
+
+				if (bIsInContainer)
+				{
+					uint8* ValueBaseAddress = ParentNode->GetValueBaseAddress(Cur.StructAddress, bIsSparseClassData, bIsStruct);
+
+					/**
+					 * Checks if an element has already been added to the set
+					 *
+					 * @param	Helper			The set helper used to query the property.
+					 * @param	InBaseAddress	The base address of the set
+					 * @param	InElementValue	The element value to check for
+					 *
+					 * @return	True if the element is found in the set, false otherwise
+					 */
+					static auto HasElement = [](const FScriptSetHelper& Helper, void* InBaseAddress, const FString& InElementValue)
+					{
+						FProperty* ElementProp = Helper.GetElementProperty();
+
+						void* TempElementStorage = ElementProp->AllocateAndInitializeValue();
+						ON_SCOPE_EXIT
+						{
+							ElementProp->DestroyAndFreeValue(TempElementStorage);
+						};
+
+						for (int32 Index = 0, ItemsLeft = Helper.Num(); ItemsLeft > 0; ++Index)
+						{
+							if (Helper.IsValidIndex(Index))
+							{
+								--ItemsLeft;
+
+								const uint8* Element = Helper.GetElementPtr(Index);
+
+								if (Element != InBaseAddress && ElementProp->ImportText_Direct(*InElementValue, TempElementStorage, nullptr, 0) && ElementProp->Identical(Element, TempElementStorage))
+								{
+									return true;
+								}
+							}
+						}
+
+						return false;
+					};
+
+					FScriptSetHelper SetHelper(SetProperty, ValueBaseAddress);
+					if (HasElement(SetHelper, Cur.BaseAddress, NewValue) &&
+						(Flags & EPropertyValueSetFlags::InteractiveChange) == 0)
+					{
+						// Duplicate element in the set
+						ShowInvalidOperationError(LOCTEXT("DuplicateSetElement", "Duplicate elements are not allowed in Set properties."));
+
+						return FPropertyAccess::Fail;
+					}
+				}
+			}
+			else if (FMapProperty* MapProperty = CastField<FMapProperty>(Property))
+			{
+				bIsInContainer = MapProperty->KeyProp == NodeProperty;
+
+				if (bIsInContainer)
+				{
+					uint8* ValueBaseAddress = ParentNode->GetValueBaseAddress(Cur.StructAddress, bIsSparseClassData, bIsStruct);
+
+					/**
+					 * Checks if a key in the map matches the specified key
+					 *
+					 * @param	Helper			The map helper used to query the property.
+					 * @param	InBaseAddress	The base address of the map
+					 * @param	InKeyValue		The key to find within the map
+					 *
+					 * @return	True if the key is found, false otherwise
+					 */
+					static auto HasKey = [](const FScriptMapHelper& Helper, void* InBaseAddress, const FString& InKeyValue)
+					{
+						FProperty* KeyProp = Helper.GetKeyProperty();
+
+						void* TempKeyStorage = KeyProp->AllocateAndInitializeValue();
+						ON_SCOPE_EXIT
+						{
+							KeyProp->DestroyAndFreeValue(TempKeyStorage);
+						};
+
+						for (int32 Index = 0, ItemsLeft = Helper.Num(); ItemsLeft > 0; ++Index)
+						{
+							if (Helper.IsValidIndex(Index))
+							{
+								--ItemsLeft;
+
+								const uint8* PairPtr = Helper.GetPairPtr(Index);
+								const uint8* KeyPtr = KeyProp->ContainerPtrToValuePtr<const uint8>(PairPtr);
+
+								if (KeyPtr != InBaseAddress && KeyProp->ImportText_Direct(*InKeyValue, TempKeyStorage, nullptr, 0) && KeyProp->Identical(KeyPtr, TempKeyStorage))
+								{
+									return true;
+								}
+							}
+						}
+
+						return false;
+					};
+
+					FScriptMapHelper MapHelper(MapProperty, ValueBaseAddress);
+					if (HasKey(MapHelper, Cur.BaseAddress, NewValue) &&
+						(Flags & EPropertyValueSetFlags::InteractiveChange) == 0)
+					{
+						// Duplicate key in the map
+						ShowInvalidOperationError(LOCTEXT("DuplicateMapKey", "Duplicate keys are not allowed in Map properties."));
+
+						return FPropertyAccess::Fail;
+					}
+				}
+				else
+				{
+					bIsInContainer = MapProperty->ValueProp == NodeProperty;
+				}
+			}
+
+			if (bIsInContainer)
+			{
+				uint8* Addr = ParentNode->GetValueBaseAddress(Cur.StructAddress, bIsSparseClassData);
+				Property->ExportText_Direct(PreviousContainerValue, Addr, Addr, nullptr, 0);
+			}
+
+			// Check if we need to call PreEditChange on all objects.
+			// Remove quotes from the original value because FName properties  
+			// are wrapped in quotes before getting here. This causes the 
+			// string comparison to fail even when the name is unchanged. 
+			if (!bNotifiedPreChange && 
+				(FCString::Strcmp(*NewValue.TrimQuotes(), *PreviousValue) != 0 || 
+				(bFinished && bInteractiveChangeInProgress)))
+			{
+				bNotifiedPreChange = true;
+				NotifiedObj = CurObject;
+				/*
+				if (!bInteractiveChangeInProgress)
+				{
+					// Begin a transaction only if we need to call PreChange
+					if (GEditor && bTransactable)
+					{
+						// @todo: FProp
+						//GEditor->BeginTransaction(TEXT("PropertyEditor"), FText::Format(NSLOCTEXT("PropertyEditor", "EditPropertyTransaction", "Edit {0}"), InPropertyNode->GetDisplayName()), NodeProperty);
+						GEditor->BeginTransaction(TEXT("PropertyEditor"), FText::Format(NSLOCTEXT("PropertyEditor", "EditPropertyTransaction", "Edit {0}"), InPropertyNode->GetDisplayName()), nullptr);
+					}
+				}
+				*/
+				InPropertyNode->NotifyPreChange(NodeProperty, NotifyHook);
+
+				bInteractiveChangeInProgress = (Flags & EPropertyValueSetFlags::InteractiveChange) != 0;
+			}
+
+			// Set the new value.
+			EPropertyPortFlags PortFlags = (Flags & EPropertyValueSetFlags::InstanceObjects) != 0 ? PPF_InstanceSubobjects : PPF_None;
+			FPropertyTextUtilities::TextToPropertyHelper(*NewValue, InPropertyNode, NodeProperty, Cur, PortFlags);
+
+			// Cache the value of the property after having modified it.
+			FString ValueAfterImport;
+			FPropertyTextUtilities::PropertyToTextHelper(ValueAfterImport, InPropertyNode, NodeProperty, Cur, PPF_None);
+
+			if (CurObject)
+			{
+				if ((CurObject->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) ||
+					(CurObject->HasAnyFlags(RF_DefaultSubObject) && CurObject->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))) &&
+					!bIsGameWorld)
+				{
+					// propagate the changes to instances unless we're modifying class shared data
+					if (!bIsSparseClassData)
+					{
+						InPropertyNode->PropagatePropertyChange(CurObject, *NewValue, PreviousContainerValue.IsEmpty() ? PreviousValue : PreviousContainerValue);
+					}
+				}
+
+				TopLevelObjects.Add(CurObject);
+			}
+
+			// If the values before and after setting the property differ, mark the object dirty.
+			if (FCString::Strcmp(*PreviousValue, *ValueAfterImport) != 0)
+			{
+				if (CurObject)
+				{
+					CurObject->MarkPackageDirty();
+				}
+
+				// For TMap and TSet, we need to rehash it in case a key was modified
+				if (NodeProperty->GetOwner<FMapProperty>())
+				{
+					uint8* Addr = InPropertyNode->GetParentNode()->GetValueBaseAddress(Cur.StructAddress, bIsSparseClassData);
+					FScriptMapHelper MapHelper(NodeProperty->GetOwner<FMapProperty>(), Addr);
+					MapHelper.Rehash();
+				}
+				else if (NodeProperty->GetOwner<FSetProperty>())
+				{
+					uint8* Addr = InPropertyNode->GetParentNode()->GetValueBaseAddress(Cur.StructAddress, bIsSparseClassData);
+					FScriptSetHelper SetHelper(NodeProperty->GetOwner<FSetProperty>(), Addr);
+					SetHelper.Rehash();
+				}
+			}
+
+			//add on array index so we can tell which entry just changed
+			ArrayIndicesPerObject.Add(TMap<FString,int32>());
+			FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[ObjectIndex], InPropertyNode);
+		}
+
+		FPropertyChangedEvent ChangeEvent(NodeProperty, bFinished ? EPropertyChangeType::ValueSet : EPropertyChangeType::Interactive, MakeArrayView(TopLevelObjects));
+		ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+
+		// If PreEditChange was called, so should PostEditChange.
+		if (bNotifiedPreChange)
+		{
+			// Call PostEditChange on all objects.
+			InPropertyNode->NotifyPostChange( ChangeEvent, NotifyHook );
+
+			if (bFinished)
+			{
+				bInteractiveChangeInProgress = false;
+				/*
+				if (bTransactable)
+				{
+					// End the transaction if we called PreChange
+					GEditor->EndTransaction();
+				}
+				*/
+			}
+		}
+		/*
+		if (OldGWorld)
+		{
+			// restore the original (editor) GWorld
+			RestoreEditorWorld( OldGWorld );
+		}
+		*/
+		if (PropertyUtilities.IsValid() && !bInteractiveChangeInProgress)
+		{
+			InPropertyNode->FixPropertiesInEvent(ChangeEvent);
+			PropertyUtilities.Pin()->NotifyFinishedChangingProperties(ChangeEvent);
+		}
+	}
+
+	return Result;
+}
+
+void FPropertyValueImpl::EnumerateRawData( const IPropertyHandle::EnumerateRawDataFuncRef& InRawDataCallback )
+{
+	EnumerateObjectsToModify(PropertyNode.Pin().Get(), [&](const FObjectBaseAddress& ObjectToModify, const int32 ObjectIndex, const int32 NumObjects) -> bool
+	{
+		return InRawDataCallback(ObjectToModify.BaseAddress, ObjectIndex, NumObjects);
+	});
+}
+
+void FPropertyValueImpl::EnumerateConstRawData( const IPropertyHandle::EnumerateConstRawDataFuncRef& InRawDataCallback ) const
+{
+	EnumerateObjectsToModify(PropertyNode.Pin().Get(), [&](const FObjectBaseAddress& ObjectToModify, const int32 ObjectIndex, const int32 NumObjects) -> bool
+	{
+		return InRawDataCallback(ObjectToModify.BaseAddress, ObjectIndex, NumObjects);
+	});
+}
+
+void FPropertyValueImpl::AccessRawData( TArray<void*>& RawData )
+{
+	RawData.Empty();
+	EnumerateObjectsToModify(PropertyNode.Pin().Get(), [&](const FObjectBaseAddress& ObjectToModify, const int32 ObjectIndex, const int32 NumObjects) -> bool
+	{
+		if (ObjectIndex == 0)
+		{
+			RawData.Reserve(NumObjects);
+		}
+		RawData.Add(ObjectToModify.BaseAddress);
+		return true;
+	});
+}
+
+void FPropertyValueImpl::AccessRawData( TArray<const void*>& RawData ) const
+{
+	RawData.Empty();
+	EnumerateObjectsToModify(PropertyNode.Pin().Get(), [&](const FObjectBaseAddress& ObjectToModify, const int32 ObjectIndex, const int32 NumObjects) -> bool
+	{
+		if (ObjectIndex == 0)
+		{
+			RawData.Reserve(NumObjects);
+		}
+		RawData.Add(ObjectToModify.BaseAddress);
+		return true;
+	});
+}
+
+void FPropertyValueImpl::SetOnPropertyValueChanged( const FSimpleDelegate& InOnPropertyValueChanged )
+{
+	if( PropertyNode.IsValid() )
+	{
+		PropertyNode.Pin()->OnPropertyValueChanged().Add( InOnPropertyValueChanged );
+	}
+}
+
+void FPropertyValueImpl::SetOnChildPropertyValueChanged( const FSimpleDelegate& InOnChildPropertyValueChanged )
+{
+	if( PropertyNode.IsValid() )
+	{
+		PropertyNode.Pin()->OnChildPropertyValueChanged().Add( InOnChildPropertyValueChanged );
+	}
+}
+
+void FPropertyValueImpl::SetOnPropertyValuePreChange(const FSimpleDelegate& InOnPropertyValuePreChange)
+{
+	if (PropertyNode.IsValid())
+	{
+		PropertyNode.Pin()->OnPropertyValuePreChange().Add(InOnPropertyValuePreChange);
+	}
+}
+
+void FPropertyValueImpl::SetOnChildPropertyValuePreChange(const FSimpleDelegate& InOnChildPropertyValuePreChange)
+{
+	if (PropertyNode.IsValid())
+	{
+		PropertyNode.Pin()->OnChildPropertyValuePreChange().Add(InOnChildPropertyValuePreChange);
+	}
+}
+
+void FPropertyValueImpl::SetOnPropertyResetToDefault(const FSimpleDelegate& InOnPropertyResetToDefault)
+{
+	if (PropertyNode.IsValid())
+	{
+		PropertyNode.Pin()->OnPropertyResetToDefault().Add(InOnPropertyResetToDefault);
+	}
+}
+
+void FPropertyValueImpl::SetOnRebuildChildren( const FSimpleDelegate& InOnRebuildChildren )
+{
+	if( PropertyNode.IsValid() )
+	{
+		PropertyNode.Pin()->SetOnRebuildChildren( InOnRebuildChildren );
+	}
+}
+/**
+ * Gets the max valid index for a array property of an object
+ * @param InObjectNode - The parent of the variable being clamped
+ * @param InArrayName - The array name we're hoping to clamp to the extents of
+ * @return LastValidEntry in the array (if the array is found)
+ */
+static int32 GetArrayPropertyLastValidIndex( FObjectPropertyNode* InObjectNode, const FString& InArrayName )
+{
+	int32 ClampMax = MAX_int32;
+
+	check(InObjectNode->GetNumObjects() == 1);
+	UObject* ParentObject = InObjectNode->GetUObject(0);
+
+	//find the associated property
+	FProperty* FoundProperty = nullptr;
+	for( TFieldIterator<FProperty> It(ParentObject->GetClass()); It; ++It )
+	{
+		FProperty* CurProp = *It;
+		if (CurProp->GetName()==InArrayName)
+		{
+			FoundProperty = CurProp;
+			break;
+		}
+	}
+
+	if (FoundProperty && (FoundProperty->ArrayDim == 1))
+	{
+		FArrayProperty* ArrayProperty = CastFieldChecked<FArrayProperty>( FoundProperty );
+		if (ArrayProperty)
+		{
+			uint8* PropertyAddressBase = ArrayProperty->ContainerPtrToValuePtr<uint8>(ParentObject);
+			FScriptArrayHelper ArrayHelper(ArrayProperty, PropertyAddressBase);
+			ClampMax = ArrayHelper.Num() - 1;
+		}
+		else
+		{
+			UE_LOG(LogPropertyNode, Warning, TEXT("The property (%s) passed for array clamping use is not an array.  Clamp will only ensure greater than zero."), *InArrayName);
+		}
+	}
+	else
+	{
+		UE_LOG(LogPropertyNode, Warning, TEXT("The property (%s) passed for array clamping was not found.  Clamp will only ensure greater than zero."), *InArrayName);
+	}
+
+	return ClampMax;
+}
+
+
+FPropertyAccess::Result FPropertyValueImpl::GetValueAsString( FString& OutString, EPropertyPortFlags PortFlags ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+
+	FPropertyAccess::Result Res = FPropertyAccess::Success;
+
+	if( PropertyNodePin.IsValid() )
+	{
+		const bool bAllowAlternateDisplayValue = false;
+		Res = PropertyNodePin->GetPropertyValueString( OutString, bAllowAlternateDisplayValue, PortFlags );
+	}
+	else
+	{
+		Res = FPropertyAccess::Fail;
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyValueImpl::GetValueAsDisplayString( FString& OutString, EPropertyPortFlags PortFlags ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+
+	FPropertyAccess::Result Res = FPropertyAccess::Success;
+
+	if( PropertyNodePin.IsValid() )
+	{
+		const bool bAllowAlternateDisplayValue = true;
+		Res = PropertyNodePin->GetPropertyValueString(OutString, bAllowAlternateDisplayValue, PortFlags);
+	}
+	else
+	{
+		Res = FPropertyAccess::Fail;
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyValueImpl::GetValueAsText( FText& OutText ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+
+	FPropertyAccess::Result Res = FPropertyAccess::Success;
+
+	if( PropertyNodePin.IsValid() )
+	{
+		Res = PropertyNodePin->GetPropertyValueText( OutText, false/*bAllowAlternateDisplayValue*/ );
+	}
+	else
+	{
+		Res = FPropertyAccess::Fail;
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyValueImpl::GetValueAsDisplayText( FText& OutText ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+
+	FPropertyAccess::Result Res = FPropertyAccess::Success;
+
+	if( PropertyNodePin.IsValid() )
+	{
+		Res = PropertyNodePin->GetPropertyValueText( OutText, true/*bAllowAlternateDisplayValue*/ );
+	}
+	else
+	{
+		Res = FPropertyAccess::Fail;
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyValueImpl::SetValueAsString( const FString& InValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() )
+	{
+		FProperty* NodeProperty = PropertyNodePin->GetProperty();
+
+		FString Value = InValue;
+
+		// Trim the name
+		if( NodeProperty && NodeProperty->IsA( FNameProperty::StaticClass() ) )
+		{
+			Value.TrimStartAndEndInline();
+		}
+
+		// If more than one object is selected, an empty field indicates their values for this property differ.
+		// Don't send it to the objects value in this case (if we did, they would all get set to None which isn't good).
+		FComplexPropertyNode* ParentNode = PropertyNodePin->FindComplexParent();
+
+		FString PreviousValue;
+		GetValueAsString( PreviousValue );
+
+		const bool bDidValueChange = Value.Len() && (FCString::Strcmp(*PreviousValue, *Value) != 0);
+		const bool bComingOutOfInteractiveChange = bInteractiveChangeInProgress && ( ( Flags & EPropertyValueSetFlags::InteractiveChange ) != EPropertyValueSetFlags::InteractiveChange );
+
+		if ( ParentNode && ( ParentNode->GetInstancesNum() == 1 || bComingOutOfInteractiveChange || bDidValueChange ) )
+		{
+			ImportText( Value, PropertyNodePin.Get(), Flags );
+		}
+
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+bool FPropertyValueImpl::IsPropertyTypeOf(FFieldClass* ClassType ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() )
+	{
+		if(FProperty* Property = PropertyNodePin->GetProperty())
+		{
+			return Property->IsA( ClassType );
+		}
+	}
+	return false;
+}
+
+template< typename Type>
+static Type ClampValueFromMetaData(Type InValue, FPropertyNode& InPropertyNode )
+{
+	FProperty* Property = InPropertyNode.GetProperty();
+
+	Type RetVal = InValue;
+	if( Property )
+	{
+		//enforce min
+		const FString& MinString = FRuntimeMetaData::GetMetaData(Property, TEXT("ClampMin"));
+		if(MinString.Len())
+		{
+			checkSlow(MinString.IsNumeric());
+			Type MinValue;
+			TTypeFromString<Type>::FromString(MinValue, *MinString);
+			RetVal = FMath::Max<Type>(MinValue, RetVal);
+		}
+		//Enforce max 
+		const FString& MaxString = FRuntimeMetaData::GetMetaData(Property, TEXT("ClampMax"));
+		if(MaxString.Len())
+		{
+			checkSlow(MaxString.IsNumeric());
+			Type MaxValue;
+			TTypeFromString<Type>::FromString(MaxValue, *MaxString);
+			RetVal = FMath::Min<Type>(MaxValue, RetVal);
+		}
+	}
+
+	return RetVal;
+}
+
+template <typename Type>
+static Type ClampIntegerValueFromMetaData(Type InValue, FPropertyNode& InPropertyNode )
+{
+	Type RetVal = ClampValueFromMetaData<Type>( InValue, InPropertyNode );
+
+	FProperty* Property = InPropertyNode.GetProperty();
+
+
+	//if there is "Multiple" meta data, the selected number is a multiple
+	const FString& MultipleString = FRuntimeMetaData::GetMetaData(Property, TEXT("Multiple"));
+	if (MultipleString.Len())
+	{
+		check(MultipleString.IsNumeric());
+		Type MultipleValue;
+		TTypeFromString<Type>::FromString(MultipleValue, *MultipleString);
+		if (MultipleValue != 0)
+		{
+			RetVal -= Type(RetVal) % MultipleValue;
+		}
+	}
+
+	//enforce array bounds
+	const FString& ArrayClampString = FRuntimeMetaData::GetMetaData(Property, TEXT("ArrayClamp"));
+	if (ArrayClampString.Len())
+	{
+		FObjectPropertyNode* ObjectPropertyNode = InPropertyNode.FindObjectItemParent();
+		if (ObjectPropertyNode && ObjectPropertyNode->GetNumObjects() == 1)
+		{
+			Type LastValidIndex = GetArrayPropertyLastValidIndex(ObjectPropertyNode, ArrayClampString);
+			RetVal = FMath::Clamp<Type>(RetVal, 0, LastValidIndex);
+		}
+		else
+		{
+			UE_LOG(LogPropertyNode, Warning, TEXT("Array Clamping isn't supported in multi-select (Param Name: %s)"), *Property->GetName());
+		}
+	}
+
+	return RetVal;
+}
+
+
+int32 FPropertyValueImpl::GetNumChildren() const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() )
+	{
+		return PropertyNodePin->GetNumChildNodes();
+	}
+
+	return 0;
+}
+
+TSharedPtr<FPropertyNode> FPropertyValueImpl::GetPropertyNode() const
+{
+	return PropertyNode.Pin();
+}
+
+TSharedPtr<FPropertyNode> FPropertyValueImpl::GetChildNode( FName ChildName, bool bRecurse ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() )
+	{
+		return PropertyNodePin->FindChildPropertyNode(ChildName, bRecurse);
+	}
+
+	return nullptr;
+}
+
+
+TSharedPtr<FPropertyNode> FPropertyValueImpl::GetChildNode( int32 ChildIndex ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() )
+	{
+		return PropertyNodePin->GetChildNode( ChildIndex );
+	}
+
+	return nullptr;
+}
+
+bool FPropertyValueImpl::GetChildNode(const int32 ChildArrayIndex, TSharedPtr<FPropertyNode>& OutChildNode) const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if (PropertyNodePin.IsValid())
+	{
+		return PropertyNodePin->GetChildNode(ChildArrayIndex, OutChildNode);
+	}
+
+	return false;
+}
+
+
+void FPropertyValueImpl::ResetToDefault()
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid() && !PropertyNodePin->IsEditConst() && PropertyNodePin->GetDiffersFromDefault() )
+	{
+		const bool bUseDisplayName = false;
+		//FScopedTransaction Transaction( NSLOCTEXT("UnrealEd", "PropertyWindowResetToDefault", "Reset to Default") );
+		TSharedPtr<FPropertyNode>& KeyNode = PropertyNodePin->GetPropertyKeyNode();
+		if(KeyNode.IsValid())
+		{
+			FPropertyValueImpl(KeyNode, NotifyHook, PropertyUtilities.Pin())
+				.ImportText(KeyNode->GetDefaultValueAsString(bUseDisplayName), EPropertyValueSetFlags::InstanceObjects);
+		}
+		ImportText(PropertyNodePin->GetDefaultValueAsString(bUseDisplayName), EPropertyValueSetFlags::InstanceObjects);
+
+		PropertyNodePin->BroadcastPropertyResetToDefault();
+	}
+}
+
+bool FPropertyValueImpl::DiffersFromDefault() const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid()  )
+	{
+		return PropertyNodePin->GetDiffersFromDefault();
+	}
+
+	return false;
+}
+
+bool FPropertyValueImpl::IsEditConst() const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid()  )
+	{
+		return PropertyNodePin->IsEditConst();
+	} 
+
+	return false;
+}
+
+FText FPropertyValueImpl::GetResetToDefaultLabel() const
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if( PropertyNodePin.IsValid()  )
+	{
+		return PropertyNodePin->GetResetToDefaultLabel();
+	} 
+
+	return FText::GetEmpty();
+}
+
+void FPropertyValueImpl::AddChild()
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if ( PropertyNodePin.IsValid() )
+	{
+		FProperty* NodeProperty = PropertyNodePin->GetProperty();
+
+		FReadAddressList ReadAddresses;
+		PropertyNodePin->GetReadAddress( !!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, true, false, true );
+		if ( ReadAddresses.Num() )
+		{
+			// determines whether we actually changed any values (if the user clicks the "empty" button when the array is already empty,
+			// we don't want the objects to be marked dirty)
+			bool bHasChanges = false;
+
+			// If we added a new Map entry we need to rebuild children
+			bool bAddedMapEntry = false;
+
+			TArray< TMap<FString, int32> > ArrayIndicesPerObject;
+			TArray< TArray< UObject* > > AffectedInstancesPerObject;
+			AffectedInstancesPerObject.SetNum(ReadAddresses.Num());
+
+			// List of top level objects sent to the PropertyChangedEvent
+			TArray<const UObject*> TopLevelObjects;
+			TopLevelObjects.Reserve(ReadAddresses.Num());
+
+			// Begin a property edit transaction.
+			//FScopedTransaction Transaction( NSLOCTEXT("UnrealEd", "AddChild", "Add Child") );
+			FObjectPropertyNode* ObjectNode = PropertyNodePin->FindObjectItemParent();
+			FArrayProperty* Array = CastField<FArrayProperty>(NodeProperty);
+			FSetProperty* Set = CastField<FSetProperty>(NodeProperty);
+			FMapProperty* Map = CastField<FMapProperty>(NodeProperty);
+
+			check(Array || Set || Map);
+			
+			for ( int32 i = 0 ; i < ReadAddresses.Num() ; ++i )
+			{
+				void* Addr = ReadAddresses.GetAddress(i);
+				if ( Addr )
+				{
+					bHasChanges = true;
+
+					if (!FApp::IsGame())
+					{
+						UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+						if (IsTemplate(Obj))
+						{
+							PropertyNodePin->GatherInstancesAffectedByContainerPropertyChange(Obj, Addr, EPropertyArrayChangeType::Add, AffectedInstancesPerObject[i]);
+						}
+					}
+				}
+			}
+
+			if ( bHasChanges )
+			{
+				TSet< UObject* > AllAffectedInstances;
+				for (const TArray<UObject*>& AffectedInstances : AffectedInstancesPerObject)
+				{
+					AllAffectedInstances.Append(AffectedInstances);
+				}
+
+				// send the PreEditChange notification to all selected objects
+				PropertyNodePin->NotifyPreChange(NodeProperty, NotifyHook, AllAffectedInstances);
+
+				for (int32 i = 0 ; i < ReadAddresses.Num() ; ++i )
+				{
+					void* Addr = ReadAddresses.GetAddress(i);
+					if ( Addr )
+					{
+						//add on array index so we can tell which entry just changed
+						ArrayIndicesPerObject.Add(TMap<FString, int32>());
+						FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[i], PropertyNodePin.Get());
+
+						UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+						if (Obj)
+						{
+							if (IsTemplate(Obj) && !FApp::IsGame())
+							{
+								PropertyNodePin->PropagateContainerPropertyChange(Obj, Addr, AffectedInstancesPerObject[i], EPropertyArrayChangeType::Add, -1);
+							}
+
+							TopLevelObjects.Add(Obj);
+						}
+
+						int32 Index = INDEX_NONE;
+
+						if (Array)
+						{
+							FScriptArrayHelper	ArrayHelper(Array, Addr);
+							Index = ArrayHelper.AddValue();
+						}
+						else if (Set)
+						{
+							FScriptSetHelper	SetHelper(Set, Addr);
+							Index = SetHelper.AddDefaultValue_Invalid_NeedsRehash();
+							SetHelper.Rehash();
+
+						}
+						else if (Map)
+						{
+							FScriptMapHelper	MapHelper(Map, Addr);
+							Index = MapHelper.AddDefaultValue_Invalid_NeedsRehash();
+							MapHelper.Rehash();
+							bAddedMapEntry = true;
+						}
+
+						ArrayIndicesPerObject[i].Add(NodeProperty->GetName(), Index);
+					}
+				}
+
+				FPropertyChangedEvent ChangeEvent(NodeProperty, EPropertyChangeType::ArrayAdd, MakeArrayView(TopLevelObjects));
+				ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+				ChangeEvent.SetInstancesChanged(MoveTemp(AllAffectedInstances));
+
+				// send the PostEditChange notification; it will be propagated to all selected objects
+				PropertyNodePin->NotifyPostChange(ChangeEvent, NotifyHook);
+
+				if (PropertyUtilities.IsValid())
+				{
+					PropertyNodePin->FixPropertiesInEvent(ChangeEvent);
+					PropertyUtilities.Pin()->NotifyFinishedChangingProperties(ChangeEvent);
+				}
+
+				if (bAddedMapEntry)
+				{
+					PropertyNodePin->RebuildChildren();
+				}
+			}
+		}
+	}
+}
+
+void FPropertyValueImpl::ClearChildren()
+{
+	TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+	if ( PropertyNodePin.IsValid() )
+	{
+		FProperty* NodeProperty = PropertyNodePin->GetProperty();
+
+		FReadAddressList ReadAddresses;
+		PropertyNodePin->GetReadAddress( !!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses,
+			true, //bComparePropertyContents
+			false, //bObjectForceCompare
+			true ); //bArrayPropertiesCanDifferInSize
+
+		if ( ReadAddresses.Num() )
+		{
+			// determines whether we actually changed any values (if the user clicks the "emtpy" button when the array is already empty,
+			// we don't want the objects to be marked dirty)
+			bool bHasChanges = false;
+
+			// List of top level objects sent to the PropertyChangedEvent
+			TArray<const UObject*> TopLevelObjects;
+			TopLevelObjects.Reserve(ReadAddresses.Num());
+
+			TArray< TArray< UObject* > > AffectedInstancesPerObject;
+			AffectedInstancesPerObject.SetNum(ReadAddresses.Num());
+
+			// Begin a property edit transaction.
+			//FScopedTransaction Transaction( NSLOCTEXT("UnrealEd", "ClearChildren", "Clear Children") );
+			FObjectPropertyNode* ObjectNode = PropertyNodePin->FindObjectItemParent();
+			FArrayProperty* ArrayProperty = CastField<FArrayProperty>(NodeProperty);
+			FSetProperty* SetProperty = CastField<FSetProperty>(NodeProperty);
+			FMapProperty* MapProperty = CastField<FMapProperty>(NodeProperty);
+
+			check(ArrayProperty || SetProperty || MapProperty);
+
+			for ( int32 i = 0 ; i < ReadAddresses.Num() ; ++i )
+			{
+				void* Addr = ReadAddresses.GetAddress(i);
+				if ( Addr )
+				{
+					bHasChanges = true;
+
+					if (!FApp::IsGame())
+					{
+						UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+						if (IsTemplate(Obj))
+						{
+							PropertyNodePin->GatherInstancesAffectedByContainerPropertyChange(Obj, Addr, EPropertyArrayChangeType::Clear, AffectedInstancesPerObject[i]);
+						}
+					}
+				}
+			}
+
+			if (bHasChanges)
+			{
+				TSet< UObject* > AllAffectedInstances;
+				for (const TArray<UObject*>& AffectedInstances : AffectedInstancesPerObject)
+				{
+					AllAffectedInstances.Append(AffectedInstances);
+				}
+
+				// Send the PreEditChange notification to all selected objects
+				PropertyNodePin->NotifyPreChange(NodeProperty, NotifyHook, AllAffectedInstances);
+
+				for ( int32 i = 0 ; i < ReadAddresses.Num() ; ++i )
+				{
+					void* Addr = ReadAddresses.GetAddress(i);
+					if ( Addr )
+					{
+						UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+						if (Obj)
+						{
+							if (IsTemplate(Obj) && !FApp::IsGame())
+							{
+								PropertyNodePin->PropagateContainerPropertyChange(Obj, Addr, AffectedInstancesPerObject[i], EPropertyArrayChangeType::Clear, -1);
+							}
+
+							TopLevelObjects.Add(Obj);
+						}
+
+						if (ArrayProperty)
+						{
+							FScriptArrayHelper ArrayHelper(ArrayProperty, Addr);
+
+							// If the inner property is an instanced property we must move the old objects to the 
+							// transient package so code looking for objects of this type on the parent doesn't find them
+							FObjectProperty* InnerObjectProperty = CastField<FObjectProperty>(ArrayProperty->Inner);
+							if (InnerObjectProperty && InnerObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+							{
+								const int32 ArraySize = ArrayHelper.Num();
+								for (int32 Index = 0; Index < ArraySize; ++Index)
+								{
+									if (UObject* InstancedObject = *reinterpret_cast<UObject**>(ArrayHelper.GetRawPtr(Index)))
+									{
+										InstancedObject->Modify();
+										InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+									}
+								}
+							}
+
+							ArrayHelper.EmptyValues();
+						}
+						else if (SetProperty)
+						{
+							FScriptSetHelper SetHelper(SetProperty, Addr);
+
+							// If the element property is an instanced property we must move the old objects to the 
+							// transient package so code looking for objects of this type on the parent doesn't find them
+							FObjectProperty* ElementObjectProperty = CastField<FObjectProperty>(SetProperty->ElementProp);
+							if (ElementObjectProperty && ElementObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+							{
+								int32 ElementsToRemove = SetHelper.Num();
+								int32 Index = 0;
+								while (ElementsToRemove > 0)
+								{
+									if (SetHelper.IsValidIndex(Index))
+									{
+										if (UObject* InstancedObject = *reinterpret_cast<UObject**>(SetHelper.GetElementPtr(Index)))
+										{
+											InstancedObject->Modify();
+											InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+										}
+										--ElementsToRemove;
+									}
+									++Index;
+								}
+							}
+
+							SetHelper.EmptyElements();
+						}
+						else if (MapProperty)
+						{
+							FScriptMapHelper MapHelper(MapProperty, Addr);
+
+							// If the map's value property is an instanced property we must move the old objects to the 
+							// transient package so code looking for objects of this type on the parent doesn't find them
+							FObjectProperty* ValueObjectProperty = CastField<FObjectProperty>(MapProperty->ValueProp);
+							if (ValueObjectProperty && ValueObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+							{
+								int32 ElementsToRemove = MapHelper.Num();
+								int32 Index = 0;
+								while (ElementsToRemove > 0)
+								{
+									if (MapHelper.IsValidIndex(Index))
+									{
+										if (UObject* InstancedObject = *reinterpret_cast<UObject**>(MapHelper.GetValuePtr(Index)))
+										{
+											InstancedObject->Modify();
+											InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+										}
+										--ElementsToRemove;
+									}
+									++Index;
+								}
+							}
+
+							MapHelper.EmptyValues();
+						}
+					}
+				}
+
+				FPropertyChangedEvent ChangeEvent(NodeProperty, EPropertyChangeType::ArrayClear, MakeArrayView(TopLevelObjects));
+				ChangeEvent.SetInstancesChanged(MoveTemp(AllAffectedInstances));
+
+				// Send the PostEditChange notification; it will be propagated to all selected objects
+				PropertyNodePin->NotifyPostChange( ChangeEvent, NotifyHook );
+
+				if (PropertyUtilities.IsValid())
+				{
+					PropertyNodePin->FixPropertiesInEvent(ChangeEvent);
+					PropertyUtilities.Pin()->NotifyFinishedChangingProperties(ChangeEvent);
+				}
+			}
+		}
+	}
+}
+
+void FPropertyValueImpl::InsertChild( int32 Index )
+{
+	if( PropertyNode.IsValid() )
+	{
+		InsertChild( PropertyNode.Pin()->GetChildNode(Index));
+	}
+}
+
+void FPropertyValueImpl::InsertChild( TSharedPtr<FPropertyNode> ChildNodeToInsertAfter )
+{
+	FPropertyNode* ChildNodePtr = ChildNodeToInsertAfter.Get();
+
+	FPropertyNode* ParentNode = ChildNodePtr->GetParentNode();
+	FObjectPropertyNode* ObjectNode = ChildNodePtr->FindObjectItemParent();
+
+	FProperty* NodeProperty = ChildNodePtr->GetProperty();
+	FArrayProperty* ArrayProperty = CastFieldChecked<FArrayProperty>(NodeProperty->GetOwner<FField>()); // Insert is not supported for sets or maps
+
+
+	FReadAddressList ReadAddresses;
+	void* Addr = nullptr;
+	ParentNode->GetReadAddress( !!ParentNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses );
+	if ( ReadAddresses.Num() )
+	{
+		Addr = ReadAddresses.GetAddress(0);
+	}
+
+	if( Addr )
+	{
+		TArray< UObject* > AffectedInstances;
+
+		// Begin a property edit transaction.
+		//FScopedTransaction Transaction( NSLOCTEXT("UnrealEd", "InsertChild", "Insert Child") );
+
+		if (!FApp::IsGame())
+		{
+			UObject* Obj = ObjectNode ? ObjectNode->GetUObject(0) : nullptr;
+			if (IsTemplate(Obj))
+			{
+				ChildNodePtr->GatherInstancesAffectedByContainerPropertyChange(Obj, Addr, EPropertyArrayChangeType::Insert, AffectedInstances);
+			}
+		}
+
+		TSet< UObject* > AllAffectedInstances;
+		AllAffectedInstances.Append(AffectedInstances);
+
+		ChildNodePtr->NotifyPreChange( ParentNode->GetProperty(), NotifyHook, AllAffectedInstances );
+
+		FScriptArrayHelper	ArrayHelper(ArrayProperty,Addr);
+		int32 Index = ChildNodePtr->GetArrayIndex();
+
+		// List of top level objects sent to the PropertyChangedEvent
+		TArray<const UObject*> TopLevelObjects;
+
+		UObject* Obj = ObjectNode ? ObjectNode->GetUObject(0) : nullptr;
+		if (Obj)
+		{
+			if (IsTemplate(Obj) && !FApp::IsGame())
+			{
+				ChildNodePtr->PropagateContainerPropertyChange(Obj, Addr, AffectedInstances, EPropertyArrayChangeType::Insert, Index);
+			}
+
+			TopLevelObjects.Add(Obj);
+		}
+
+		ArrayHelper.InsertValues(Index, 1 );
+
+		//set up indices for the coming events
+		TArray< TMap<FString,int32> > ArrayIndicesPerObject;
+		for (int32 ObjectIndex = 0; ObjectIndex < ReadAddresses.Num(); ++ObjectIndex)
+		{
+			//add on array index so we can tell which entry just changed
+			ArrayIndicesPerObject.Add(TMap<FString,int32>());
+			FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[ObjectIndex], ChildNodePtr );
+		}
+
+		FPropertyChangedEvent ChangeEvent(ParentNode->GetProperty(), EPropertyChangeType::ArrayAdd, MakeArrayView(TopLevelObjects));
+		ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+		ChangeEvent.SetInstancesChanged(MoveTemp(AllAffectedInstances));
+
+		PropertyNode.Pin()->NotifyPostChange(ChangeEvent, NotifyHook);
+
+		if (PropertyUtilities.IsValid())
+		{
+			ChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+			PropertyUtilities.Pin()->NotifyFinishedChangingProperties(ChangeEvent);
+		}
+
+		PropertyNode.Pin()->RebuildChildren();
+	}
+}
+
+
+void FPropertyValueImpl::DeleteChild( int32 Index )
+{
+	TSharedPtr<FPropertyNode> ArrayParentPin = PropertyNode.Pin();
+	if( ArrayParentPin.IsValid()  )
+	{
+		DeleteChild( ArrayParentPin->GetChildNode( Index ) );
+	}
+}
+
+void FPropertyValueImpl::DeleteChild( TSharedPtr<FPropertyNode> ChildNodeToDelete )
+{
+	FPropertyNode* ChildNodePtr = ChildNodeToDelete.Get();
+
+	FPropertyNode* ParentNode = ChildNodePtr->GetParentNode();
+	FObjectPropertyNode* ObjectNode = ChildNodePtr->FindObjectItemParent();
+
+	FProperty* NodeProperty = ChildNodePtr->GetProperty();
+	FArrayProperty* ArrayProperty = NodeProperty->GetOwner<FArrayProperty>();
+	FSetProperty* SetProperty = NodeProperty->GetOwner<FSetProperty>();
+	FMapProperty* MapProperty = NodeProperty->GetOwner<FMapProperty>();
+
+	TArray< TMap<FString, int32> > ArrayIndicesPerObject;
+
+	check(ArrayProperty || SetProperty || MapProperty);
+
+	FReadAddressList ReadAddresses;
+	ParentNode->GetReadAddress( !!ParentNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses ); 
+	if ( ReadAddresses.Num() )
+	{
+		// determines whether we actually changed any values (if the user clicks the "empty" button when the array is already empty,
+		// we don't want the objects to be marked dirty)
+		bool bHasChanges = false;
+
+		TArray< TArray< UObject* > > AffectedInstancesPerObject;
+		AffectedInstancesPerObject.SetNum(ReadAddresses.Num());
+
+		//FScopedTransaction Transaction(NSLOCTEXT("UnrealEd", "DeleteChild", "Delete Child"));
+
+		// List of top level objects sent to the PropertyChangedEvent
+		TArray<const UObject*> TopLevelObjects;
+		TopLevelObjects.Reserve(ReadAddresses.Num());
+
+		for ( int32 i = 0 ; i < ReadAddresses.Num() ; ++i )
+		{
+			uint8* Address = ReadAddresses.GetAddress(i);
+
+			if( Address ) 
+			{
+				bHasChanges = true;
+
+				if (!FApp::IsGame())
+				{
+					UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+					if (IsTemplate(Obj))
+					{
+						ChildNodePtr->GatherInstancesAffectedByContainerPropertyChange(Obj, Address, EPropertyArrayChangeType::Delete, AffectedInstancesPerObject[i]);
+					}
+				}
+			}
+		}
+
+		if (bHasChanges)
+		{
+			TSet< UObject* > AllAffectedInstances;
+			for (const TArray<UObject*>& AffectedInstances : AffectedInstancesPerObject)
+			{
+				AllAffectedInstances.Append(AffectedInstances);
+			}
+
+			// Send the PreEditChange notification to all selected objects
+			ChildNodePtr->NotifyPreChange(NodeProperty, NotifyHook, AllAffectedInstances);
+
+			// Perform the operation on the array for all selected objects
+			for (int32 i = 0; i < ReadAddresses.Num(); ++i)
+			{
+				uint8* Address = ReadAddresses.GetAddress(i);
+
+				if ( Address )
+				{
+					int32 Index = ChildNodePtr->GetArrayIndex();
+
+					// Add on array index so we can tell which entry just changed
+					ArrayIndicesPerObject.Add(TMap<FString, int32>());
+					FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[i], ChildNodePtr);
+
+					UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+					if (Obj)
+					{
+						if (IsTemplate(Obj) && !FApp::IsGame())
+						{
+							ChildNodePtr->PropagateContainerPropertyChange(Obj, Address, AffectedInstancesPerObject[i], EPropertyArrayChangeType::Delete, Index);
+						}
+
+						TopLevelObjects.Add(Obj);
+					}
+
+					if (ArrayProperty)
+					{
+						FScriptArrayHelper ArrayHelper(ArrayProperty, Address);
+
+						// If the inner property is an instanced property we must move the old object to the 
+						// transient package so code looking for objects of this type on the parent doesn't find it
+						FObjectProperty* InnerObjectProperty = CastField<FObjectProperty>(ArrayProperty->Inner);
+						if (InnerObjectProperty && InnerObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+						{
+							if (UObject* InstancedObject = *reinterpret_cast<UObject**>(ArrayHelper.GetRawPtr(ChildNodePtr->GetArrayIndex())))
+							{
+								InstancedObject->Modify();
+								InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+							}
+						}
+
+						ArrayHelper.RemoveValues(ChildNodePtr->GetArrayIndex());
+					}
+					else if (SetProperty)
+					{
+						FScriptSetHelper SetHelper(SetProperty, Address);
+						int32 InternalIndex = SetHelper.FindInternalIndex(ChildNodePtr->GetArrayIndex());
+						
+						// If the element property is an instanced property we must move the old object to the 
+						// transient package so code looking for objects of this type on the parent doesn't find it
+						FObjectProperty* ElementObjectProperty = CastField<FObjectProperty>(SetProperty->ElementProp);
+						if (ElementObjectProperty && ElementObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+						{
+							if (UObject* InstancedObject = *reinterpret_cast<UObject**>(SetHelper.GetElementPtr(InternalIndex)))
+							{
+								InstancedObject->Modify();
+								InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+							}
+						}
+
+						SetHelper.RemoveAt(InternalIndex);
+						SetHelper.Rehash();
+					}
+					else if (MapProperty)
+					{
+						FScriptMapHelper MapHelper(MapProperty, Address);
+						int32 InternalIndex = MapHelper.FindInternalIndex(ChildNodePtr->GetArrayIndex());
+						
+						// If the map's value property is an instanced property we must move the old object to the 
+						// transient package so code looking for objects of this type on the parent doesn't find it
+						FObjectProperty* ValueObjectProperty = CastField<FObjectProperty>(MapProperty->ValueProp);
+						if (ValueObjectProperty && ValueObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+						{
+							if (UObject* InstancedObject = *reinterpret_cast<UObject**>(MapHelper.GetValuePtr(InternalIndex)))
+							{
+								InstancedObject->Modify();
+								InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+							}
+						}
+
+						MapHelper.RemoveAt(InternalIndex);
+						MapHelper.Rehash();
+					}
+
+					ArrayIndicesPerObject[i].Add(NodeProperty->GetName(), Index);
+				}
+			}
+
+			FPropertyChangedEvent ChangeEvent(ParentNode->GetProperty(), EPropertyChangeType::ArrayRemove, MakeArrayView(TopLevelObjects));
+			ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+			ChangeEvent.SetInstancesChanged(MoveTemp(AllAffectedInstances));
+
+			PropertyNode.Pin()->NotifyPostChange(ChangeEvent, NotifyHook);
+
+			if (PropertyUtilities.IsValid())
+			{
+				ChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+				PropertyUtilities.Pin()->NotifyFinishedChangingProperties(ChangeEvent);
+			}
+
+			PropertyNode.Pin()->RebuildChildren();
+		}
+	}
+}
+
+void FPropertyValueImpl::SwapChildren(int32 FirstIndex, int32 SecondIndex)
+{
+	TSharedPtr<FPropertyNode> ArrayParentPin = PropertyNode.Pin();
+	if (ArrayParentPin.IsValid())
+	{
+		SwapChildren(ArrayParentPin->GetChildNode(FirstIndex), ArrayParentPin->GetChildNode(SecondIndex));
+	}
+}
+
+void FPropertyValueImpl::SwapChildren( TSharedPtr<FPropertyNode> FirstChildNode, TSharedPtr<FPropertyNode> SecondChildNode)
+{
+	FPropertyNode* FirstChildNodePtr = FirstChildNode.Get();
+	FPropertyNode* SecondChildNodePtr = SecondChildNode.Get();
+
+	FPropertyNode* ParentNode = FirstChildNodePtr->GetParentNode();
+	FObjectPropertyNode* ObjectNode = FirstChildNodePtr->FindObjectItemParent();
+
+	FProperty* FirstNodeProperty = FirstChildNodePtr->GetProperty();
+	FProperty* SecondNodeProperty = SecondChildNodePtr->GetProperty();
+	FArrayProperty* ArrayProperty = FirstNodeProperty->GetOwner<FArrayProperty>();
+
+	check(ArrayProperty);
+
+	FReadAddressList ReadAddresses;
+	ParentNode->GetReadAddress( !!ParentNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses ); 
+	if ( ReadAddresses.Num() )
+	{
+		//FScopedTransaction Transaction( NSLOCTEXT("UnrealEd", "SwapChildren", "Swap Children") );
+
+		FirstChildNodePtr->NotifyPreChange( FirstNodeProperty, NotifyHook );
+		SecondChildNodePtr->NotifyPreChange( SecondNodeProperty, NotifyHook );
+		
+		// List of top level objects sent to the PropertyChangedEvent
+		TArray<const UObject*> TopLevelObjects;
+		TopLevelObjects.Reserve(ReadAddresses.Num());
+
+		// perform the operation on the array for all selected objects
+		for ( int32 i = 0 ; i < ReadAddresses.Num() ; ++i )
+		{
+			uint8* Address = ReadAddresses.GetAddress(i);
+
+			if( Address ) 
+			{
+				int32 FirstIndex = FirstChildNodePtr->GetArrayIndex();
+				int32 SecondIndex = SecondChildNodePtr->GetArrayIndex();
+
+				UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+				if (Obj)
+				{
+					if ((Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) || (Obj->HasAnyFlags(RF_DefaultSubObject) && Obj->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))) 
+						&& !FApp::IsGame())
+					{
+						FirstChildNodePtr->PropagateContainerPropertyChange(Obj, Address, EPropertyArrayChangeType::Swap, FirstIndex, SecondIndex);
+					}
+
+					TopLevelObjects.Add(Obj);
+				}
+
+				if (ArrayProperty)
+				{
+					FScriptArrayHelper ArrayHelper(ArrayProperty, Address);
+
+					// If the inner property is an instanced property we must move the old object to the 
+					// transient package so code looking for objects of this type on the parent doesn't find it
+					FObjectProperty* InnerObjectProperty = CastField<FObjectProperty>(ArrayProperty->Inner);
+					if (InnerObjectProperty && InnerObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+					{
+						if (UObject* InstancedObject = *reinterpret_cast<UObject**>(ArrayHelper.GetRawPtr(FirstIndex)))
+						{
+							InstancedObject->Modify();
+							InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+						}
+
+						if (UObject* InstancedObject = *reinterpret_cast<UObject**>(ArrayHelper.GetRawPtr(SecondIndex)))
+						{
+							InstancedObject->Modify();
+							InstancedObject->Rename(nullptr, GetTransientPackage(), REN_DontCreateRedirectors);
+						}
+					}
+
+					ArrayHelper.SwapValues(FirstIndex, SecondIndex);
+				}
+			}
+		}
+
+		FPropertyChangedEvent ChangeEvent(ParentNode->GetProperty(), EPropertyChangeType::Unspecified, MakeArrayView(TopLevelObjects));
+		FirstChildNodePtr->NotifyPostChange(ChangeEvent, NotifyHook);
+		SecondChildNodePtr->NotifyPostChange(ChangeEvent, NotifyHook);
+
+		if (PropertyUtilities.IsValid())
+		{
+			FirstChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+			SecondChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+			PropertyUtilities.Pin()->NotifyFinishedChangingProperties(ChangeEvent);
+		}
+
+		PropertyNode.Pin()->RebuildChildren();
+	}
+}
+
+void FPropertyValueImpl::MoveElementTo(int32 OriginalIndex, int32 NewIndex)
+{
+	if (OriginalIndex == NewIndex)
+	{
+		return;
+	}
+
+	// We don't do a true swap of the old index and new index here
+	// Instead we insert a new item after the existing item at the desired NewIndex, swap the Original after the "NewIndex" node, and delete the item at OriginalIndex
+	// To try to describe with array examples..
+
+	// Case A NewIndex > OriginalIndex
+	// Input Array: A B C D, where OriginalIndex = 1 and NewIndex = 2
+	// We add a new node (?) at NewIndex + 1
+	// A B C ? D
+	// Now swap OriginalIndex (B) and NewIndex + 1 (?)
+	// A ? C B D
+	// Delete OriginalIndex (?)
+	// A C B D
+
+	// Or -
+	// Input Array: A B C D, where OriginalIndex = 2 and NewIndex = 1
+	// Insert at NewIndex (?), which increments OriginalIndex (C)
+	// A ? B C D
+	// Swap OriginalIndex + 1 (C) and NewIndex (?)
+	// A C B ? D
+	// Delete OriginalIndex + 1 (?)
+	// A C B D
+
+	// If we're in case A, increment the "NewIndex" for swap target
+	if (NewIndex > OriginalIndex)
+	{
+		NewIndex += 1;
+	}
+	// Otherwise increment OriginalIndex
+	else
+	{
+		OriginalIndex += 1;
+	}
+
+	// Insert into the middle of the array
+	if (NewIndex < GetPropertyNode()->GetNumChildNodes())
+	{
+		TSharedPtr<FPropertyNode> InsertAfterChild = PropertyNode.Pin()->GetChildNode(NewIndex);
+		FPropertyNode* ChildNodePtr = InsertAfterChild.Get();
+
+		FPropertyNode* ParentNode = ChildNodePtr->GetParentNode();
+		FObjectPropertyNode* ObjectNode = ChildNodePtr->FindObjectItemParent();
+
+		FProperty* NodeProperty = ChildNodePtr->GetProperty();
+		FArrayProperty* ArrayProperty = CastFieldChecked<FArrayProperty>(NodeProperty->GetOwner<FArrayProperty>()); // Insert is not supported for sets or maps
+
+
+		FReadAddressList ReadAddresses;
+		ParentNode->GetReadAddress(!!ParentNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses);
+		for (int32 i = 0; i < ReadAddresses.Num(); ++i)
+		{
+			void* Addr = ReadAddresses.GetAddress(i);
+			if (Addr)
+			{
+				FScriptArrayHelper	ArrayHelper(ArrayProperty, Addr);
+				int32 Index = ChildNodePtr->GetArrayIndex();
+
+				// List of top level objects sent to the PropertyChangedEvent
+				TArray<const UObject*> TopLevelObjects;
+
+				UObject* Obj = ObjectNode ? ObjectNode->GetUObject(0) : nullptr;
+				if (Obj)
+				{
+					if ((Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) ||
+						(Obj->HasAnyFlags(RF_DefaultSubObject) && Obj->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))))
+					{
+						ChildNodePtr->PropagateContainerPropertyChange(Obj, Addr, EPropertyArrayChangeType::Insert, Index);
+					}
+
+					TopLevelObjects.Add(Obj);
+				}
+
+				ArrayHelper.InsertValues(Index, 1);
+
+				//set up indices for the coming events
+				TArray< TMap<FString, int32> > ArrayIndicesPerObject;
+				for (int32 ObjectIndex = 0; ObjectIndex < ReadAddresses.Num(); ++ObjectIndex)
+				{
+					//add on array index so we can tell which entry just changed
+					ArrayIndicesPerObject.Add(TMap<FString, int32>());
+					FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[ObjectIndex], ChildNodePtr);
+				}
+
+				FPropertyChangedEvent ChangeEvent(ParentNode->GetProperty(), EPropertyChangeType::ArrayAdd, MakeArrayView(TopLevelObjects));
+				ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+
+				if (PropertyUtilities.IsValid())
+				{
+					ChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+				}
+			}
+		}
+	}
+	else // or add to the end of the array
+	{
+		TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+		if (PropertyNodePin.IsValid())
+		{
+			FProperty* NodeProperty = PropertyNodePin->GetProperty();
+
+			FReadAddressList ReadAddresses;
+			PropertyNodePin->GetReadAddress(!!PropertyNodePin->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, true, false, true);
+			if (ReadAddresses.Num())
+			{
+				// determines whether we actually changed any values (if the user clicks the "emtpy" button when the array is already empty,
+				// we don't want the objects to be marked dirty)
+				bool bNotifiedPreChange = false;
+
+				TArray< TMap<FString, int32> > ArrayIndicesPerObject;
+
+				// List of top level objects sent to the PropertyChangedEvent
+				TArray<const UObject*> TopLevelObjects;
+				TopLevelObjects.Reserve(ReadAddresses.Num());
+
+				FObjectPropertyNode* ObjectNode = PropertyNodePin->FindObjectItemParent();
+				FArrayProperty* Array = CastField<FArrayProperty>(NodeProperty);
+
+				check(Array);
+
+				for (int32 i = 0; i < ReadAddresses.Num(); ++i)
+				{
+					void* Addr = ReadAddresses.GetAddress(i);
+					if (Addr)
+					{
+						//add on array index so we can tell which entry just changed
+						ArrayIndicesPerObject.Add(TMap<FString, int32>());
+						FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[i], PropertyNodePin.Get());
+
+						UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+						if (Obj)
+						{
+							if ((Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) ||
+								(Obj->HasAnyFlags(RF_DefaultSubObject) && Obj->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))))
+							{
+								PropertyNodePin->PropagateContainerPropertyChange(Obj, Addr, EPropertyArrayChangeType::Add, -1);
+							}
+
+							TopLevelObjects.Add(Obj);
+						}
+
+						int32 Index = INDEX_NONE;
+
+						FScriptArrayHelper	ArrayHelper(Array, Addr);
+						Index = ArrayHelper.AddValue();
+
+						ArrayIndicesPerObject[i].Add(NodeProperty->GetName(), Index);
+					}
+				}
+
+				FPropertyChangedEvent ChangeEvent(NodeProperty, EPropertyChangeType::ArrayAdd, MakeArrayView(TopLevelObjects));
+				ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+
+				if (PropertyUtilities.IsValid())
+				{
+					PropertyNodePin->FixPropertiesInEvent(ChangeEvent);
+				}
+			}
+		}
+	}
+
+	// Both Insert and Add are deferred so you need to rebuild the parent node's children
+	GetPropertyNode()->RebuildChildren();
+
+	//Swap
+	{
+		FPropertyNode* FirstChildNodePtr = GetPropertyNode()->GetChildNode(OriginalIndex).Get();
+		FPropertyNode* SecondChildNodePtr = GetPropertyNode()->GetChildNode(NewIndex).Get();
+
+		FPropertyNode* ParentNode = FirstChildNodePtr->GetParentNode();
+		FObjectPropertyNode* ObjectNode = FirstChildNodePtr->FindObjectItemParent();
+
+		FProperty* FirstNodeProperty = FirstChildNodePtr->GetProperty();
+		FProperty* SecondNodeProperty = SecondChildNodePtr->GetProperty();
+		FArrayProperty* ArrayProperty = FirstNodeProperty->GetOwner<FArrayProperty>();
+
+		check(ArrayProperty);
+
+		FReadAddressList ReadAddresses;
+		ParentNode->GetReadAddress(!!ParentNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses);
+		if (ReadAddresses.Num())
+		{
+			// List of top level objects sent to the PropertyChangedEvent
+			TArray<const UObject*> TopLevelObjects;
+			TopLevelObjects.Reserve(ReadAddresses.Num());
+
+			// perform the operation on the array for all selected objects
+			for (int32 i = 0; i < ReadAddresses.Num(); ++i)
+			{
+				uint8* Address = ReadAddresses.GetAddress(i);
+
+				if (Address)
+				{
+					int32 FirstIndex = FirstChildNodePtr->GetArrayIndex();
+					int32 SecondIndex = SecondChildNodePtr->GetArrayIndex();
+
+					UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+					if (Obj)
+					{
+						if ((Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) ||
+							(Obj->HasAnyFlags(RF_DefaultSubObject) && Obj->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))))
+						{
+							FirstChildNodePtr->PropagateContainerPropertyChange(Obj, Address, EPropertyArrayChangeType::Swap, FirstIndex, SecondIndex);
+						}
+
+						TopLevelObjects.Add(Obj);
+					}
+
+					FScriptArrayHelper ArrayHelper(ArrayProperty, Address);
+					ArrayHelper.SwapValues(FirstIndex, SecondIndex);
+				}
+			}
+
+			FPropertyChangedEvent ChangeEvent(ParentNode->GetProperty(), EPropertyChangeType::Unspecified, MakeArrayView(TopLevelObjects));
+
+			if (PropertyUtilities.IsValid())
+			{
+				FirstChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+				SecondChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+			}
+		}
+	}
+
+	// Delete the original index
+	{
+		FPropertyNode* ChildNodePtr = GetPropertyNode()->GetChildNode(OriginalIndex).Get();
+
+		FPropertyNode* ParentNode = ChildNodePtr->GetParentNode();
+		FObjectPropertyNode* ObjectNode = ChildNodePtr->FindObjectItemParent();
+
+		FProperty* NodeProperty = ChildNodePtr->GetProperty();
+		FArrayProperty* ArrayProperty = NodeProperty->GetOwner<FArrayProperty>();
+
+		FReadAddressList ReadAddresses;
+		ParentNode->GetReadAddress(!!ParentNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses);
+		if (ReadAddresses.Num())
+		{
+			// List of top level objects sent to the PropertyChangedEvent
+			TArray<const UObject*> TopLevelObjects;
+			TopLevelObjects.Reserve(ReadAddresses.Num());
+
+			// perform the operation on the array for all selected objects
+			for (int32 i = 0; i < ReadAddresses.Num(); ++i)
+			{
+				uint8* Address = ReadAddresses.GetAddress(i);
+
+				if (Address)
+				{
+					int32 Index = ChildNodePtr->GetArrayIndex();
+
+					UObject* Obj = ObjectNode ? ObjectNode->GetUObject(i) : nullptr;
+					if (Obj)
+					{
+						if ((Obj->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject) ||
+							(Obj->HasAnyFlags(RF_DefaultSubObject) && Obj->GetOuter()->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))) &&
+							!FApp::IsGame())
+						{
+							ChildNodePtr->PropagateContainerPropertyChange(Obj, Address, EPropertyArrayChangeType::Delete, Index);
+						}
+
+						TopLevelObjects.Add(Obj);
+					}
+
+					FScriptArrayHelper ArrayHelper(ArrayProperty, Address);
+					ArrayHelper.RemoveValues(ChildNodePtr->GetArrayIndex());
+				}
+			}
+
+			FPropertyChangedEvent ChangeEvent(ParentNode->GetProperty(), EPropertyChangeType::ArrayRemove, MakeArrayView(TopLevelObjects));
+			if (PropertyUtilities.IsValid())
+			{
+				ChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+			}
+		}
+	}
+}
+
+void FPropertyValueImpl::DuplicateChild( int32 Index )
+{
+	TSharedPtr<FPropertyNode> ArrayParentPin = PropertyNode.Pin();
+	if( ArrayParentPin.IsValid() )
+	{
+		DuplicateChild( ArrayParentPin->GetChildNode( Index ) );
+	}
+}
+
+void FPropertyValueImpl::DuplicateChild( TSharedPtr<FPropertyNode> ChildNodeToDuplicate )
+{
+	FPropertyNode* ChildNodePtr = ChildNodeToDuplicate.Get();
+
+	FPropertyNode* ParentNode = ChildNodePtr->GetParentNode();
+	FObjectPropertyNode* ObjectNode = ChildNodePtr->FindObjectItemParent();
+
+	FProperty* NodeProperty = ChildNodePtr->GetProperty();
+	FArrayProperty* ArrayProperty = NodeProperty->GetOwner<FArrayProperty>(); // duplication is only supported for arrays
+
+	FReadAddressList ReadAddresses;
+	void* Addr = nullptr;
+	ParentNode->GetReadAddress( !!ParentNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses );
+	if ( ReadAddresses.Num() )
+	{
+		Addr = ReadAddresses.GetAddress(0);
+	}
+
+	if( Addr )
+	{
+		TArray< UObject* > AffectedInstances;
+
+		// List of top level objects sent to the PropertyChangedEvent
+		TArray<const UObject*> TopLevelObjects;
+
+		//FScopedTransaction Transaction( NSLOCTEXT("UnrealEd", "DuplicateChild", "Duplicate Child") );
+
+		if (!FApp::IsGame())
+		{
+			UObject* Obj = ObjectNode ? ObjectNode->GetUObject(0) : nullptr;
+			if (IsTemplate(Obj))
+			{
+				ChildNodePtr->GatherInstancesAffectedByContainerPropertyChange(Obj, Addr, EPropertyArrayChangeType::Duplicate, AffectedInstances);
+			}
+		}
+
+		TSet< UObject* > AllAffectedInstances;
+		AllAffectedInstances.Append(AffectedInstances);
+
+		ChildNodePtr->NotifyPreChange( ParentNode->GetProperty(), NotifyHook, AllAffectedInstances );
+
+		int32 Index = ChildNodePtr->GetArrayIndex();
+		UObject* Obj = ObjectNode ? ObjectNode->GetUObject(0) : nullptr;
+
+		TArray< TMap<FString, int32> > ArrayIndicesPerObject;
+
+		FScriptArrayHelper ArrayHelper(ArrayProperty, Addr);
+		FPropertyNode::DuplicateArrayEntry(NodeProperty, ArrayHelper, Index);
+
+		if (Obj)
+		{
+			if (IsTemplate(Obj) && !FApp::IsGame())
+			{
+				ChildNodePtr->PropagateContainerPropertyChange(Obj, Addr, AffectedInstances, EPropertyArrayChangeType::Duplicate, Index);
+			}
+
+			TopLevelObjects.Add(Obj);
+
+			ArrayIndicesPerObject.Add(TMap<FString, int32>());
+			FPropertyValueImpl::GenerateArrayIndexMapToObjectNode(ArrayIndicesPerObject[0], ChildNodePtr);
+		}
+
+		FPropertyChangedEvent ChangeEvent(ParentNode->GetProperty(), EPropertyChangeType::Duplicate, MakeArrayView(TopLevelObjects));
+		ChangeEvent.SetArrayIndexPerObject(ArrayIndicesPerObject);
+		ChangeEvent.SetInstancesChanged(MoveTemp(AllAffectedInstances));
+
+		PropertyNode.Pin()->NotifyPostChange(ChangeEvent, NotifyHook);
+
+		if (PropertyUtilities.IsValid())
+		{
+			ChildNodePtr->FixPropertiesInEvent(ChangeEvent);
+			PropertyUtilities.Pin()->NotifyFinishedChangingProperties(ChangeEvent);
+		}
+	}
+}
+
+bool FPropertyValueImpl::HasValidPropertyNode() const
+{
+	return PropertyNode.IsValid();
+}
+
+FText FPropertyValueImpl::GetDisplayName() const
+{
+	return PropertyNode.IsValid() ? PropertyNode.Pin()->GetDisplayName() : FText::GetEmpty();
+}
+
+void FPropertyValueImpl::ShowInvalidOperationError(const FText& ErrorText)
+{
+	if (!InvalidOperationError.IsValid())
+	{
+		FNotificationInfo InvalidOperation(ErrorText);
+		InvalidOperation.ExpireDuration = 3.0f;
+		InvalidOperationError = FSlateNotificationManager::Get().AddNotification(InvalidOperation);
+	}
+}
+
+#define IMPLEMENT_PROPERTY_ACCESSOR( ValueType ) \
+	FPropertyAccess::Result FPropertyHandleBase::SetValue( ValueType const& InValue, EPropertyValueSetFlags::Type Flags ) \
+	{ \
+		return FPropertyAccess::Fail; \
+	} \
+	FPropertyAccess::Result FPropertyHandleBase::GetValue( ValueType& OutValue ) const \
+	{ \
+		return FPropertyAccess::Fail; \
+	}
+
+IMPLEMENT_PROPERTY_ACCESSOR( bool )
+IMPLEMENT_PROPERTY_ACCESSOR( int8 )
+IMPLEMENT_PROPERTY_ACCESSOR( int16 )
+IMPLEMENT_PROPERTY_ACCESSOR( int32 )
+IMPLEMENT_PROPERTY_ACCESSOR( int64 )
+IMPLEMENT_PROPERTY_ACCESSOR( uint8 )
+IMPLEMENT_PROPERTY_ACCESSOR( uint16 )
+IMPLEMENT_PROPERTY_ACCESSOR( uint32 )
+IMPLEMENT_PROPERTY_ACCESSOR( uint64 )
+IMPLEMENT_PROPERTY_ACCESSOR( float )
+IMPLEMENT_PROPERTY_ACCESSOR( double )
+IMPLEMENT_PROPERTY_ACCESSOR( FString )
+IMPLEMENT_PROPERTY_ACCESSOR( FText )
+IMPLEMENT_PROPERTY_ACCESSOR( FName )
+IMPLEMENT_PROPERTY_ACCESSOR( FVector )
+IMPLEMENT_PROPERTY_ACCESSOR( FVector2D )
+IMPLEMENT_PROPERTY_ACCESSOR( FVector4 )
+IMPLEMENT_PROPERTY_ACCESSOR( FQuat )
+IMPLEMENT_PROPERTY_ACCESSOR( FRotator )
+IMPLEMENT_PROPERTY_ACCESSOR( UObject* )
+IMPLEMENT_PROPERTY_ACCESSOR( const UObject* )
+IMPLEMENT_PROPERTY_ACCESSOR( FAssetData )
+IMPLEMENT_PROPERTY_ACCESSOR( FProperty* )
+IMPLEMENT_PROPERTY_ACCESSOR( const FProperty* )
+
+FPropertyAccess::Result FPropertyHandleBase::SetValue( const TCHAR* InValue, EPropertyValueSetFlags::Type Flags )
+{
+	return FPropertyAccess::Fail;
+}
+
+FPropertyHandleBase::FPropertyHandleBase( TSharedPtr<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities )
+	: Implementation( MakeShareable( new FPropertyValueImpl( PropertyNode, NotifyHook, PropertyUtilities ) ) )
+{
+
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetValueData(void*& OutAddress) const
+{
+	return Implementation->GetValueData(OutAddress);
+}
+
+bool FPropertyHandleBase::IsValidHandle() const
+{
+	return Implementation->HasValidPropertyNode();
+}
+
+FText FPropertyHandleBase::GetPropertyDisplayName() const
+{
+	return Implementation->GetDisplayName();
+}
+
+void FPropertyHandleBase::SetPropertyDisplayName(FText InDisplayName)
+{
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		Implementation->GetPropertyNode()->SetDisplayNameOverride(InDisplayName);
+	}
+}
+	
+void FPropertyHandleBase::ResetToDefault()
+{
+	Implementation->ResetToDefault();
+}
+
+bool FPropertyHandleBase::DiffersFromDefault() const
+{
+	return Implementation->DiffersFromDefault();
+}
+
+FText FPropertyHandleBase::GetResetToDefaultLabel() const
+{
+	return Implementation->GetResetToDefaultLabel();
+}
+
+void FPropertyHandleBase::MarkHiddenByCustomization()
+{
+	if( Implementation->GetPropertyNode().IsValid() )
+	{
+		Implementation->GetPropertyNode()->SetNodeFlags( EPropertyNodeFlags::IsCustomized, true );
+	}
+}
+
+void FPropertyHandleBase::MarkResetToDefaultCustomized(bool bCustomized/* = true*/)
+{
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		Implementation->GetPropertyNode()->SetNodeFlags(EPropertyNodeFlags::HasCustomResetToDefault, bCustomized);
+	}
+}
+
+void FPropertyHandleBase::ClearResetToDefaultCustomized()
+{
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		Implementation->GetPropertyNode()->SetNodeFlags(EPropertyNodeFlags::HasCustomResetToDefault, false);
+	}
+}
+
+bool FPropertyHandleBase::IsCustomized() const
+{
+	return Implementation->GetPropertyNode()->HasNodeFlags( EPropertyNodeFlags::IsCustomized ) != 0;
+}
+
+bool FPropertyHandleBase::IsResetToDefaultCustomized() const
+{
+	return Implementation->GetPropertyNode()->HasNodeFlags(EPropertyNodeFlags::HasCustomResetToDefault) != 0;
+}
+
+FString FPropertyHandleBase::GeneratePathToProperty() const
+{
+	FString OutPath;
+	if( Implementation.IsValid() && Implementation->GetPropertyNode().IsValid() )
+	{
+		const bool bArrayIndex = true;
+		const bool bIgnoreCategories = true;
+		FPropertyNode* StopParent = Implementation->GetPropertyNode()->FindObjectItemParent();
+		Implementation->GetPropertyNode()->GetQualifiedName( OutPath, bArrayIndex, StopParent, bIgnoreCategories );
+	}
+
+	return OutPath;
+
+}
+
+TSharedRef<SWidget> FPropertyHandleBase::CreatePropertyNameWidget( const FText& NameOverride, const FText& ToolTipOverride, bool bDisplayResetToDefault, bool bDisplayText, bool bDisplayThumbnail ) const
+{
+	if( Implementation.IsValid() && Implementation->GetPropertyNode().IsValid() )
+	{
+		struct FPropertyNodeDisplayNameOverrideHelper
+		{
+			FPropertyNodeDisplayNameOverrideHelper(TSharedPtr<FPropertyValueImpl> InImplementation, const FText& InNameOverride, const FText& InToolTipOverride)
+				:Implementation(InImplementation)
+				,bResetDisplayName(false)
+				,bResetToolTipText(false)
+			{
+				if (!InNameOverride.IsEmpty())
+				{
+					bResetDisplayName = true;
+					Implementation->GetPropertyNode()->SetDisplayNameOverride(InNameOverride);
+				}
+				
+				if (!InToolTipOverride.IsEmpty())
+				{
+					bResetToolTipText = true;
+					Implementation->GetPropertyNode()->SetToolTipOverride(InToolTipOverride);
+				}
+			}
+
+			~FPropertyNodeDisplayNameOverrideHelper()
+			{
+				if (bResetDisplayName)
+				{
+					Implementation->GetPropertyNode()->SetDisplayNameOverride(FText::GetEmpty());
+				}
+				
+				if (bResetToolTipText)
+				{
+					Implementation->GetPropertyNode()->SetToolTipOverride(FText::GetEmpty());
+				}
+			}
+
+		private:
+			TSharedPtr<FPropertyValueImpl> Implementation;
+			bool bResetDisplayName;
+			bool bResetToolTipText;
+		};
+
+		FPropertyNodeDisplayNameOverrideHelper TempPropertyNameOverride(Implementation, NameOverride, ToolTipOverride);
+
+		TSharedPtr<FPropertyEditor> PropertyEditor = FPropertyEditor::Create( Implementation->GetPropertyNode().ToSharedRef(), Implementation->GetPropertyUtilities().ToSharedRef() );
+
+		return SNew( SPropertyNameWidget, PropertyEditor );
+	}
+
+	return SNullWidget::NullWidget;
+}
+
+TSharedRef<SWidget> FPropertyHandleBase::CreatePropertyValueWidget( bool bDisplayDefaultPropertyButtons ) const
+{
+	if( Implementation.IsValid() && Implementation->GetPropertyNode().IsValid() )
+	{
+		TSharedPtr<FPropertyEditor> PropertyEditor = FPropertyEditor::Create( Implementation->GetPropertyNode().ToSharedRef(), Implementation->GetPropertyUtilities().ToSharedRef() );
+
+		return SNew( SPropertyValueWidget, PropertyEditor, Implementation->GetPropertyUtilities() )
+				.ShowPropertyButtons( bDisplayDefaultPropertyButtons );
+	}
+
+	return SNullWidget::NullWidget;
+}
+
+class SDefaultPropertyButtonWidgets : public SCompoundWidget
+{
+	SLATE_BEGIN_ARGS(SDefaultPropertyButtonWidgets)	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, TSharedRef<FPropertyEditor> InPropertyEditor)
+	{
+		PropertyEditor = InPropertyEditor;
+		TSharedRef<SHorizontalBox> ButtonBox = SNew(SHorizontalBox);
+
+		TArray<TSharedRef<SWidget>> RequiredButtons;
+		PropertyEditorHelpers::MakeRequiredPropertyButtons(PropertyEditor.ToSharedRef(), RequiredButtons);
+		for (TSharedRef<SWidget> RequiredButton : RequiredButtons)
+		{
+			ButtonBox->AddSlot()
+			.AutoWidth()
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			.Padding(2.0f, 1.0f)
+			[
+				RequiredButton
+			];
+		}
+
+		ChildSlot
+		[
+			ButtonBox
+		];
+	}
+
+private:
+	TSharedPtr<FPropertyEditor> PropertyEditor;
+};
+
+TSharedRef<SWidget> FPropertyHandleBase::CreateDefaultPropertyButtonWidgets() const
+{
+	TArray<TSharedRef<SWidget>> DefaultButtons;
+	if (Implementation.IsValid() && Implementation->GetPropertyNode().IsValid())
+	{
+		TSharedRef<FPropertyEditor> PropertyEditor = FPropertyEditor::Create(Implementation->GetPropertyNode().ToSharedRef(), Implementation->GetPropertyUtilities().ToSharedRef());
+		return SNew(SDefaultPropertyButtonWidgets, PropertyEditor);
+	}
+	return SNullWidget::NullWidget;
+}
+
+void FPropertyHandleBase::CreateDefaultPropertyCopyPasteActions(FUIAction& OutCopyAction, FUIAction& OutPasteAction) const
+{
+	if(Implementation.IsValid())
+	{
+		OutCopyAction.ExecuteAction.BindStatic(&FPropertyHandleBase::CopyValueToClipboard, TWeakPtr<FPropertyValueImpl>(Implementation.ToSharedRef()));
+		OutPasteAction.ExecuteAction.BindStatic(&FPropertyHandleBase::PasteValueFromClipboard, TWeakPtr<FPropertyValueImpl>(Implementation.ToSharedRef()));
+	}
+}
+
+bool FPropertyHandleBase::IsEditConst() const
+{
+	return Implementation->IsEditConst();
+}
+
+bool FPropertyHandleBase::IsEditable() const
+{
+	return !IsEditConst();
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetValueAsFormattedString( FString& OutValue, EPropertyPortFlags PortFlags ) const
+{
+	return Implementation->GetValueAsString(OutValue, PortFlags);
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetValueAsDisplayString( FString& OutValue, EPropertyPortFlags PortFlags ) const
+{
+	return Implementation->GetValueAsDisplayString(OutValue, PortFlags);
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetValueAsFormattedText( FText& OutValue ) const
+{
+	return Implementation->GetValueAsText(OutValue);
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetValueAsDisplayText( FText& OutValue ) const
+{
+	return Implementation->GetValueAsDisplayText(OutValue);
+}
+
+FPropertyAccess::Result FPropertyHandleBase::SetValueFromFormattedString( const FString& InValue, EPropertyValueSetFlags::Type Flags )
+{
+	return Implementation->SetValueAsString( InValue, Flags );
+}
+
+TSharedPtr<IPropertyHandle> FPropertyHandleBase::GetChildHandle( FName ChildName, bool bRecurse ) const
+{
+	// Container children cannot be accessed in this manner
+	if( ! ( Implementation->IsPropertyTypeOf(FArrayProperty::StaticClass() ) || Implementation->IsPropertyTypeOf(FSetProperty::StaticClass()) || Implementation->IsPropertyTypeOf(FMapProperty::StaticClass()) ) )
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetChildNode( ChildName, bRecurse );
+
+		if( PropertyNode.IsValid() )
+		{
+			return PropertyEditorHelpers::GetPropertyHandle( PropertyNode.ToSharedRef(), Implementation->GetNotifyHook(), Implementation->GetPropertyUtilities() );
+		}
+	}
+	
+	return nullptr;
+}
+
+TSharedPtr<IPropertyHandle> FPropertyHandleBase::GetChildHandle( uint32 ChildIndex ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetChildNode( ChildIndex );
+
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyEditorHelpers::GetPropertyHandle( PropertyNode.ToSharedRef(), Implementation->GetNotifyHook(), Implementation->GetPropertyUtilities() );
+	}
+	return nullptr;
+}
+
+TSharedPtr<IPropertyHandle> FPropertyHandleBase::GetParentHandle() const
+{
+	TSharedPtr<FPropertyNode> ParentNode = Implementation->GetPropertyNode()->GetParentNodeSharedPtr();
+	if( ParentNode.IsValid() )
+	{
+		return PropertyEditorHelpers::GetPropertyHandle( ParentNode.ToSharedRef(), Implementation->GetNotifyHook(), Implementation->GetPropertyUtilities() );
+	}
+
+	return nullptr;
+}
+
+TSharedPtr<IPropertyHandle> FPropertyHandleBase::GetKeyHandle() const
+{
+	TSharedPtr<FPropertyNode> KeyNode = Implementation->GetPropertyNode()->GetPropertyKeyNode();
+	if (KeyNode.IsValid())
+	{
+		return PropertyEditorHelpers::GetPropertyHandle(KeyNode.ToSharedRef(), Implementation->GetNotifyHook(), Implementation->GetPropertyUtilities());
+	}
+
+	return nullptr;
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetNumChildren( uint32& OutNumChildren ) const
+{
+	OutNumChildren = Implementation->GetNumChildren();
+	return FPropertyAccess::Success;
+}
+
+uint32 FPropertyHandleBase::GetNumOuterObjects() const
+{
+	uint32 NumObjects = 0;
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		FObjectPropertyNode* ObjectNode = Implementation->GetPropertyNode()->FindObjectItemParent();
+
+
+		if (ObjectNode)
+		{
+			NumObjects = ObjectNode->GetNumObjects();
+		}
+	}
+
+	return NumObjects;
+}
+
+void FPropertyHandleBase::GetOuterObjects( TArray<UObject*>& OuterObjects ) const
+{
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		FObjectPropertyNode* ObjectNode = Implementation->GetPropertyNode()->FindObjectItemParent();
+		if (ObjectNode)
+		{
+			for (int32 ObjectIndex = 0; ObjectIndex < ObjectNode->GetNumObjects(); ++ObjectIndex)
+			{
+				OuterObjects.Add(ObjectNode->GetUObject(ObjectIndex));
+			}
+		}
+	}
+}
+
+const UClass* FPropertyHandleBase::GetOuterBaseClass() const
+{
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		FObjectPropertyNode* ObjectNode = Implementation->GetPropertyNode()->FindObjectItemParent();
+		if (ObjectNode)
+		{
+			return ObjectNode->GetObjectBaseClass();
+		}
+	}
+
+	return nullptr;
+}
+
+void FPropertyHandleBase::ReplaceOuterObjects(const TArray<UObject*>& OuterObjects)
+{
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		FObjectPropertyNode* ObjectNode = Implementation->GetPropertyNode()->FindObjectItemParent();
+		if (ObjectNode)
+		{
+			ObjectNode->RemoveAllObjects();
+			ObjectNode->ClearCachedReadAddresses(true);
+			ObjectNode->AddObjects(OuterObjects);
+		}
+	}
+}
+
+void FPropertyHandleBase::GetOuterPackages(TArray<UPackage*>& OuterPackages) const
+{
+	if (Implementation->GetPropertyNode().IsValid())
+	{
+		FComplexPropertyNode* ComplexNode = Implementation->GetPropertyNode()->FindComplexParent();
+		if (ComplexNode)
+		{
+			switch (ComplexNode->GetPropertyType())
+			{
+			case FComplexPropertyNode::EPT_Object:
+			{
+				FObjectPropertyNode* ObjectNode = static_cast<FObjectPropertyNode*>(ComplexNode);
+				for (int32 ObjectIndex = 0; ObjectIndex < ObjectNode->GetNumObjects(); ++ObjectIndex)
+				{
+					OuterPackages.Add(ObjectNode->GetUPackage(ObjectIndex));
+				}
+			}
+			break;
+
+			case FComplexPropertyNode::EPT_StandaloneStructure:
+			{
+				FStructurePropertyNode* StructNode = static_cast<FStructurePropertyNode*>(ComplexNode);
+				StructNode->GetOwnerPackages(OuterPackages);
+			}
+			break;
+
+			default:
+				break;
+			}
+		}
+	}
+}
+
+void FPropertyHandleBase::EnumerateRawData( const EnumerateRawDataFuncRef& InRawDataCallback )
+{
+	Implementation->EnumerateRawData( InRawDataCallback );
+}
+
+void FPropertyHandleBase::EnumerateConstRawData( const EnumerateConstRawDataFuncRef& InRawDataCallback ) const
+{
+	Implementation->EnumerateConstRawData( InRawDataCallback );
+}
+
+void FPropertyHandleBase::AccessRawData( TArray<void*>& RawData )
+{
+	Implementation->AccessRawData( RawData );
+}
+
+void FPropertyHandleBase::AccessRawData( TArray<const void*>& RawData ) const
+{
+	Implementation->AccessRawData(RawData);
+}
+
+void FPropertyHandleBase::SetOnPropertyValueChanged( const FSimpleDelegate& InOnPropertyValueChanged )
+{
+	Implementation->SetOnPropertyValueChanged(InOnPropertyValueChanged);
+}
+
+void FPropertyHandleBase::SetOnChildPropertyValueChanged( const FSimpleDelegate& InOnChildPropertyValueChanged )
+{
+	Implementation->SetOnChildPropertyValueChanged( InOnChildPropertyValueChanged );
+}
+
+void FPropertyHandleBase::SetOnPropertyValuePreChange(const FSimpleDelegate& InOnPropertyValuePreChange)
+{
+	Implementation->SetOnPropertyValuePreChange(InOnPropertyValuePreChange);
+}
+
+void FPropertyHandleBase::SetOnChildPropertyValuePreChange(const FSimpleDelegate& InOnChildPropertyValuePreChange)
+{
+	Implementation->SetOnChildPropertyValuePreChange(InOnChildPropertyValuePreChange);
+}
+
+void FPropertyHandleBase::SetOnPropertyResetToDefault(const FSimpleDelegate& InOnPropertyResetToDefault)
+{
+	Implementation->SetOnPropertyResetToDefault(InOnPropertyResetToDefault);
+}
+
+TSharedPtr<FPropertyNode> FPropertyHandleBase::GetPropertyNode() const
+{
+	return Implementation->GetPropertyNode();
+}
+
+void FPropertyHandleBase::OnCustomResetToDefault(const FResetToDefaultOverride& CustomResetToDefault)
+{
+	if (CustomResetToDefault.HasResetToDefaultHandler())
+	{
+		//FScopedTransaction Transaction(LOCTEXT("PropertyCustomResetToDefault", "Custom Reset to Default"));
+		if (Implementation->GetPropertyUtilities().IsValid() && Implementation->GetPropertyUtilities()->GetNotifyHook() != nullptr)
+		{
+			Implementation->GetPropertyNode()->NotifyPreChange(Implementation->GetPropertyNode()->GetProperty(), Implementation->GetPropertyUtilities()->GetNotifyHook());
+		}
+
+		FResetToDefaultHandler Delegate = CustomResetToDefault.GetPropertyResetToDefaultDelegate();
+		Delegate.ExecuteIfBound(SharedThis(this));
+
+		// Call PostEditchange on all the objects
+		FPropertyChangedEvent ChangeEvent(Implementation->GetPropertyNode()->GetProperty());
+		if (Implementation->GetPropertyUtilities().IsValid() && Implementation->GetPropertyUtilities()->GetNotifyHook() != nullptr)
+		{
+			Implementation->GetPropertyNode()->NotifyPostChange(ChangeEvent, Implementation->GetPropertyUtilities()->GetNotifyHook());
+		}
+	}
+}
+
+int32 FPropertyHandleBase::GetIndexInArray() const
+{
+	if( Implementation->GetPropertyNode().IsValid() )
+	{
+		return Implementation->GetPropertyNode()->GetArrayIndex();
+	}
+
+	return INDEX_NONE;
+}
+
+const FFieldClass* FPropertyHandleBase::GetPropertyClass() const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() && PropertyNode->GetProperty() )
+	{
+		return PropertyNode->GetProperty()->GetClass();
+	}
+
+	return nullptr;
+}
+
+FProperty* FPropertyHandleBase::GetProperty() const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->GetProperty();
+	}
+
+	return nullptr;
+}
+
+FProperty* FPropertyHandleBase::GetMetaDataProperty() const
+{
+	FProperty* MetaDataProperty = nullptr;
+
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		MetaDataProperty = PropertyNode->GetProperty();
+		
+		// If we are part of an array, we need to take our meta-data from the array property
+		if( PropertyNode->GetArrayIndex() != INDEX_NONE )
+		{
+			TSharedPtr<FPropertyNode> ParentNode = PropertyNode->GetParentNodeSharedPtr();
+			if (ParentNode)
+			{
+				MetaDataProperty = ParentNode->GetProperty();
+			}
+		}
+	}
+
+	return MetaDataProperty;
+}
+
+bool FPropertyHandleBase::HasMetaData(const FName& Key) const
+{
+	FProperty* const MetaDataProperty = GetMetaDataProperty();
+	return (MetaDataProperty) ? FRuntimeMetaData::HasMetaData(MetaDataProperty, Key) : false;
+}
+
+const FString& FPropertyHandleBase::GetMetaData(const FName& Key) const
+{
+	// if not found, return a static empty string
+	static const FString EmptyString = TEXT("");
+
+	FProperty* const MetaDataProperty = GetMetaDataProperty();
+	return (MetaDataProperty) ? (const FString &)FRuntimeMetaData::GetMetaData(MetaDataProperty, Key) : EmptyString;
+}
+
+bool FPropertyHandleBase::GetBoolMetaData(const FName& Key) const
+{
+	FProperty* const MetaDataProperty = GetMetaDataProperty();
+	return (MetaDataProperty) ? FRuntimeMetaData::GetBoolMetaData(MetaDataProperty, Key) : false;
+}
+
+int32 FPropertyHandleBase::GetIntMetaData(const FName& Key) const
+{
+	FProperty* const MetaDataProperty = GetMetaDataProperty();
+	return (MetaDataProperty) ? FRuntimeMetaData::GetIntMetaData(MetaDataProperty, Key) : 0;
+}
+
+float FPropertyHandleBase::GetFloatMetaData(const FName& Key) const
+{
+	FProperty* const MetaDataProperty = GetMetaDataProperty();
+	return (MetaDataProperty) ? FRuntimeMetaData::GetFloatMetaData(MetaDataProperty, Key) : 0.0f;
+}
+
+UClass* FPropertyHandleBase::GetClassMetaData(const FName& Key) const
+{
+	FProperty* const MetaDataProperty = GetMetaDataProperty();
+	return (MetaDataProperty) ? FRuntimeMetaData::GetClassMetaData(MetaDataProperty, Key) : nullptr;
+}
+
+
+void FPropertyHandleBase::SetInstanceMetaData(const FName& Key, const FString& Value)
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid())
+	{
+		PropertyNode->SetInstanceMetaData(Key, Value);
+	}
+}
+
+const FString* FPropertyHandleBase::GetInstanceMetaData(const FName& Key) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid())
+	{
+		return PropertyNode->GetInstanceMetaData(Key);
+	}
+
+	return nullptr;
+}
+
+const TMap<FName, FString>* FPropertyHandleBase::GetInstanceMetaDataMap() const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid())
+	{
+		return PropertyNode->GetInstanceMetaDataMap();
+	}
+
+	return nullptr;
+}
+
+FText FPropertyHandleBase::GetToolTipText() const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->GetToolTipText();
+	}
+
+	return FText::GetEmpty();
+}
+
+void FPropertyHandleBase::SetToolTipText( const FText& ToolTip )
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid())
+	{
+		PropertyNode->SetToolTipOverride( ToolTip );
+	}
+}
+
+uint8* FPropertyHandleBase::GetValueBaseAddress(uint8* Base) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid())
+	{
+		return PropertyNode->GetValueBaseAddress(Base, PropertyNode->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) != 0);
+	}
+
+	return nullptr;
+}
+
+int32 FPropertyHandleBase::GetNumPerObjectValues() const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid() && PropertyNode->GetProperty())
+	{
+		FComplexPropertyNode* ComplexNode = PropertyNode->FindComplexParent();
+		if (ComplexNode)
+		{
+			return ComplexNode->GetInstancesNum();
+		}
+	}
+	return 0;
+}
+
+FPropertyAccess::Result FPropertyHandleBase::SetPerObjectValues( const TArray<FString>& InPerObjectValues, EPropertyValueSetFlags::Type Flags )
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() && PropertyNode->GetProperty() )
+	{
+		FComplexPropertyNode* ComplexNode = PropertyNode->FindComplexParent();
+
+		if (ComplexNode && InPerObjectValues.Num() == ComplexNode->GetInstancesNum())
+		{
+			TArray<FObjectBaseAddress> ObjectsToModify;
+			Implementation->GetObjectsToModify( ObjectsToModify, PropertyNode.Get() );
+
+			if(ObjectsToModify.Num() > 0)
+			{
+				Implementation->ImportText( ObjectsToModify, InPerObjectValues, PropertyNode.Get(), Flags );
+			}
+
+			return FPropertyAccess::Success;
+		}
+	}
+
+	return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetPerObjectValues( TArray<FString>& OutPerObjectValues ) const
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() && PropertyNode->GetProperty() )
+	{
+		// Get a list of addresses for objects handled by the property window.
+		FReadAddressList ReadAddresses;
+		PropertyNode->GetReadAddress( !!PropertyNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false );
+
+		FProperty* NodeProperty = PropertyNode->GetProperty();
+
+		if( ReadAddresses.Num() > 0 )
+		{
+			// Copy each object's value into the value list
+			OutPerObjectValues.SetNum( ReadAddresses.Num(), /*bAllowShrinking*/false );
+			for ( int32 AddrIndex = 0 ; AddrIndex < ReadAddresses.Num() ; ++AddrIndex )
+			{
+				uint8* Address = ReadAddresses.GetAddress(AddrIndex);
+				if( Address )
+				{
+					NodeProperty->ExportText_Direct(OutPerObjectValues[AddrIndex], Address, Address, nullptr, 0 );
+				}
+				else
+				{
+					OutPerObjectValues[AddrIndex].Reset();
+				}
+			}
+
+			Result = FPropertyAccess::Success;
+		}
+	}
+	
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleBase::SetPerObjectValue( const int32 ObjectIndex, const FString& ObjectValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid() && PropertyNode->GetProperty())
+	{
+		Implementation->EnumerateObjectsToModify(PropertyNode.Get(), [&](const FObjectBaseAddress& ObjectToModify, const int32 ObjIndex, const int32 NumObjects) -> bool
+		{
+			if (ObjIndex == ObjectIndex)
+			{
+				TArray<FObjectBaseAddress> ObjectsToModify;
+				ObjectsToModify.Add(ObjectToModify);
+
+				TArray<FString> PerObjectValues;
+				PerObjectValues.Add(ObjectValue);
+
+				Implementation->ImportText(ObjectsToModify, PerObjectValues, PropertyNode.Get(), Flags);
+
+				Result = FPropertyAccess::Success;
+				return false; // End enumeration
+			}
+			return true;
+		});
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleBase::GetPerObjectValue( const int32 ObjectIndex, FString& OutObjectValue ) const
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if (PropertyNode.IsValid() && PropertyNode->GetProperty())
+	{
+		// Get a list of addresses for objects handled by the property window.
+		FReadAddressList ReadAddresses;
+		PropertyNode->GetReadAddress(!!PropertyNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false);
+
+		FProperty* NodeProperty = PropertyNode->GetProperty();
+
+		if (ReadAddresses.IsValidIndex(ObjectIndex))
+		{
+			uint8* Address = ReadAddresses.GetAddress(ObjectIndex);
+			if (Address)
+			{
+				NodeProperty->ExportText_Direct(OutObjectValue, Address, Address, nullptr, 0);
+			}
+			else
+			{
+				OutObjectValue.Reset();
+			}
+
+			Result = FPropertyAccess::Success;
+		}
+	}
+
+	return Result;
+}
+
+bool FPropertyHandleBase::GeneratePossibleValues(TArray< TSharedPtr<FString> >& OutOptionStrings, TArray< FText >& OutToolTips, TArray<bool>& OutRestrictedItems)
+{
+	FProperty* Property = GetProperty();
+	if (Property == nullptr)
+	{
+		return false;
+	}
+
+	bool bUsesAlternateDisplayValues = false;
+
+	UEnum* Enum = nullptr;
+	if( const FByteProperty* ByteProperty = CastField<const FByteProperty>( Property ) )
+	{
+		Enum = ByteProperty->Enum;
+	}
+	else if( const FEnumProperty* EnumProperty = CastField<const FEnumProperty>( Property ) )
+	{
+		Enum = EnumProperty->GetEnum();
+	}
+	else if ( Property->IsA(FStrProperty::StaticClass()) && FRuntimeMetaData::HasMetaData(Property, TEXT("Enum") ) )
+	{
+		const FString& EnumName = FRuntimeMetaData::GetMetaData(Property, TEXT("Enum"));
+		Enum = UClass::TryFindTypeSlow<UEnum>(EnumName, EFindFirstObjectOptions::ExactClass);
+		check( Enum );
+	}
+
+	if( Enum )
+	{
+		const TArray<FName> ValidEnumValues = PropertyEditorHelpers::GetValidEnumsFromPropertyOverride(Property, Enum);
+
+		//NumEnums() - 1, because the last item in an enum is the _MAX item
+		for( int32 EnumIndex = 0; EnumIndex < Enum->NumEnums() - 1; ++EnumIndex )
+		{
+			// Ignore hidden enums
+			bool bShouldBeHidden = FRuntimeMetaData::HasMetaData(Enum, TEXT("Hidden"), EnumIndex ) || FRuntimeMetaData::HasMetaData(Enum, TEXT("Spacer"), EnumIndex );
+			if (!bShouldBeHidden && ValidEnumValues.Num() != 0)
+			{
+				bShouldBeHidden = ValidEnumValues.Find(Enum->GetNameByIndex(EnumIndex)) == INDEX_NONE;
+			}
+
+			if (!bShouldBeHidden)
+			{
+				bShouldBeHidden = IsHidden(Enum->GetNameStringByIndex(EnumIndex));
+			}
+
+			if( !bShouldBeHidden )
+			{
+				// See if we specified an alternate name for this value using metadata
+				FString EnumName = Enum->GetNameStringByIndex(EnumIndex);
+				FString EnumDisplayName = Enum->GetDisplayNameTextByIndex(EnumIndex).ToString();
+
+				FText RestrictionTooltip;
+				const bool bIsRestricted = GenerateRestrictionToolTip(EnumName, RestrictionTooltip);
+				OutRestrictedItems.Add(bIsRestricted);
+
+				if (EnumDisplayName.Len() == 0)
+				{
+					EnumDisplayName = MoveTemp(EnumName);
+				}
+				else
+				{
+					bUsesAlternateDisplayValues = true;
+				}
+
+				TSharedPtr< FString > EnumStr(new FString(EnumDisplayName));
+				OutOptionStrings.Add(EnumStr);
+
+				FText EnumValueToolTip = bIsRestricted ? RestrictionTooltip : FRuntimeMetaData::GetToolTipTextByIndex(Enum, EnumIndex);
+				OutToolTips.Add(MoveTemp(EnumValueToolTip));
+			}
+			else
+			{
+				OutToolTips.Add(FText());
+			}
+		}
+	}
+
+	FName MetaDataKey = PropertyEditorHelpers::GetPropertyOptionsMetaDataKey(Property);
+	if (!MetaDataKey.IsNone())
+	{
+		FString GetOptionsFunctionName = FRuntimeMetaData::GetMetaData(Property->GetOwnerProperty(), MetaDataKey);
+		if (!GetOptionsFunctionName.IsEmpty())
+		{
+			TArray<UObject*> OutObjects;
+			GetOuterObjects(OutObjects);
+
+			// Check for external function references
+			if (GetOptionsFunctionName.Contains(TEXT(".")))
+			{
+				OutObjects.Empty();
+				UFunction* GetOptionsFunction = FindObject<UFunction>(nullptr, *GetOptionsFunctionName, true);
+
+				if (ensureMsgf(GetOptionsFunction && GetOptionsFunction->HasAnyFunctionFlags(EFunctionFlags::FUNC_Static), TEXT("Invalid GetOptions: %s"), *GetOptionsFunctionName))
+				{
+					UObject* GetOptionsCDO = GetOptionsFunction->GetOuterUClass()->GetDefaultObject();
+					GetOptionsFunction->GetName(GetOptionsFunctionName);
+					OutObjects.Add(GetOptionsCDO);
+				}
+			}
+
+			if (OutObjects.Num() > 0)
+			{
+				TArray<FString> OptionIntersection;
+				TSet<FString> OptionIntersectionSet;
+
+				for (UObject* Target : OutObjects)
+				{
+					TArray<FString> StringOptions;
+					{
+						FEditorScriptExecutionGuard ScriptExecutionGuard;
+
+						FCachedPropertyPath Path(GetOptionsFunctionName);
+						if (!PropertyPathHelpers::GetPropertyValue(Target, Path, StringOptions))
+					{
+						TArray<FName> NameOptions;
+						if (PropertyPathHelpers::GetPropertyValue(Target, Path, NameOptions))
+						{
+							Algo::Transform(NameOptions, StringOptions, [](const FName& InName) { return InName.ToString(); });
+						}
+					}
+					}
+
+					// If this is the first time there won't be any options.
+					if (OptionIntersection.Num() == 0)
+					{
+						OptionIntersection = StringOptions;
+						OptionIntersectionSet = TSet<FString>(StringOptions);
+					}
+					else
+					{
+						TSet<FString> StringOptionsSet(StringOptions);
+						OptionIntersectionSet = StringOptionsSet.Intersect(OptionIntersectionSet);
+						OptionIntersection.RemoveAll([&OptionIntersectionSet](const FString& Option){ return !OptionIntersectionSet.Contains(Option); });
+					}
+
+					// If we're out of possible intersected options, we can stop.
+					if (OptionIntersection.Num() == 0)
+					{
+						break;
+					}
+				}
+
+				Algo::Transform(OptionIntersection, OutOptionStrings, [](const FString& InString) { return MakeShared<FString>(InString); });
+			}
+		}
+	}
+	else if( Property->IsA(FClassProperty::StaticClass()) || Property->IsA(FSoftClassProperty::StaticClass()) )		
+	{
+		UClass* MetaClass = Property->IsA(FClassProperty::StaticClass()) 
+			? CastFieldChecked<FClassProperty>(Property)->MetaClass
+			: CastFieldChecked<FSoftClassProperty>(Property)->MetaClass;
+
+		TSharedPtr< FString > NoneStr( new FString( TEXT("None") ) );
+		OutOptionStrings.Add( NoneStr );
+
+		const bool bAllowAbstract = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("AllowAbstract"));
+		const bool bBlueprintBaseOnly = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("BlueprintBaseOnly"));
+		const bool bAllowOnlyPlaceable = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("OnlyPlaceable"));
+		UClass* InterfaceThatMustBeImplemented = FRuntimeMetaData::GetClassMetaData(Property->GetOwnerProperty(), TEXT("MustImplement"));
+
+		if (!bAllowOnlyPlaceable || MetaClass->IsChildOf<AActor>())
+		{
+			for (TObjectIterator<UClass> It; It; ++It)
+			{
+				if (It->IsChildOf(MetaClass)
+					&& PropertyEditorHelpers::IsEditInlineClassAllowed(*It, bAllowAbstract)
+					&& (!bBlueprintBaseOnly || FRuntimeEditorUtils::CanCreateBlueprintOfClass(*It))
+					&& (!InterfaceThatMustBeImplemented || It->ImplementsInterface(InterfaceThatMustBeImplemented))
+					&& (!bAllowOnlyPlaceable || !It->HasAnyClassFlags(CLASS_Abstract | CLASS_NotPlaceable)))
+				{
+					OutOptionStrings.Add(TSharedPtr< FString >(new FString(It->GetName())));
+				}
+			}
+		}
+	}
+
+	return bUsesAlternateDisplayValues;
+}
+
+void FPropertyHandleBase::NotifyPreChange()
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		PropertyNode->NotifyPreChange( PropertyNode->GetProperty(), Implementation->GetNotifyHook() );
+	}
+}
+
+void FPropertyHandleBase::NotifyPostChange( EPropertyChangeType::Type ChangeType )
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		TArray<const UObject*> ObjectsBeingChanged;
+		FObjectPropertyNode* ObjectNode = PropertyNode->FindObjectItemParent();
+		if(ObjectNode)
+		{
+			ObjectsBeingChanged.Reserve(ObjectNode->GetNumObjects());
+			for(int32 ObjectIndex = 0; ObjectIndex < ObjectNode->GetNumObjects(); ++ObjectIndex)
+			{
+				ObjectsBeingChanged.Add(ObjectNode->GetUObject(ObjectIndex));
+			}
+		}
+
+		FPropertyChangedEvent PropertyChangedEvent( PropertyNode->GetProperty(), ChangeType, MakeArrayView(ObjectsBeingChanged) );
+		PropertyNode->NotifyPostChange( PropertyChangedEvent, Implementation->GetNotifyHook());
+	}
+}
+
+void FPropertyHandleBase::NotifyFinishedChangingProperties()
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		FPropertyChangedEvent ChangeEvent(PropertyNode->GetProperty(), EPropertyChangeType::ValueSet);
+		PropertyNode->FixPropertiesInEvent(ChangeEvent);
+		Implementation->GetPropertyUtilities()->NotifyFinishedChangingProperties(ChangeEvent);
+	}
+}
+
+FPropertyAccess::Result FPropertyHandleBase::SetObjectValueFromSelection()
+{
+	// Only implemented by Object handles
+	return FPropertyAccess::Result::Fail;
+}
+
+void FPropertyHandleBase::AddRestriction( TSharedRef<const FPropertyRestriction> Restriction )
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		PropertyNode->AddRestriction(Restriction);
+	}
+}
+
+bool FPropertyHandleBase::IsRestricted(const FString& Value) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->IsRestricted(Value);
+	}
+	return false;
+}
+
+bool FPropertyHandleBase::IsRestricted(const FString& Value, TArray<FText>& OutReasons) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->IsRestricted(Value, OutReasons);
+	}
+	return false;
+}
+
+bool FPropertyHandleBase::IsHidden(const FString& Value) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->IsHidden(Value);
+	}
+	return false;
+}
+
+bool FPropertyHandleBase::IsHidden(const FString& Value, TArray<FText>& OutReasons) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->IsHidden(Value, &OutReasons);
+	}
+	return false;
+}
+
+bool FPropertyHandleBase::IsDisabled(const FString& Value) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->IsDisabled(Value);
+	}
+	return false;
+}
+
+bool FPropertyHandleBase::IsDisabled(const FString& Value, TArray<FText>& OutReasons) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->IsDisabled(Value, &OutReasons);
+	}
+	return false;
+}
+
+bool FPropertyHandleBase::GenerateRestrictionToolTip(const FString& Value, FText& OutTooltip)const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		return PropertyNode->GenerateRestrictionToolTip(Value, OutTooltip);
+	}
+	return false;
+}
+
+void FPropertyHandleBase::SetIgnoreValidation(bool bInIgnore)
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( PropertyNode.IsValid() )
+	{
+		PropertyNode->SetNodeFlags( EPropertyNodeFlags::SkipChildValidation, bInIgnore); 
+	}
+}
+
+TArray<TSharedPtr<IPropertyHandle>> FPropertyHandleBase::AddChildStructure( TSharedRef<FStructOnScope> InStruct )
+{
+	TArray<TSharedPtr<IPropertyHandle>> PropertyHandles;
+
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetPropertyNode();
+	if( !PropertyNode.IsValid() )
+	{
+		return PropertyHandles;
+	}
+
+	TSharedPtr<FStructurePropertyNode> StructPropertyNode( new FStructurePropertyNode );
+	StructPropertyNode->SetStructure(InStruct);
+
+	FPropertyNodeInitParams RootInitParams;
+	RootInitParams.ParentNode = PropertyNode;
+	RootInitParams.Property = nullptr;
+	RootInitParams.ArrayOffset = 0;
+	RootInitParams.ArrayIndex = INDEX_NONE;
+	RootInitParams.bAllowChildren = true;
+	RootInitParams.bForceHiddenPropertyVisibility = FPropertySettings::Get().ShowHiddenProperties();
+	RootInitParams.bCreateCategoryNodes = false;
+	RootInitParams.IsSparseProperty = FPropertyNodeInitParams::EIsSparseDataProperty::False; // FStructurePropertyNode can't inherit the sparse data flag
+
+	StructPropertyNode->InitNode(RootInitParams);
+
+	const bool bShouldShowHiddenProperties = !!PropertyNode->HasNodeFlags(EPropertyNodeFlags::ShouldShowHiddenProperties);
+	const bool bShouldShowDisableEditOnInstance = !!PropertyNode->HasNodeFlags(EPropertyNodeFlags::ShouldShowDisableEditOnInstance);
+	const bool bGameModeOnlyVisible = !!PropertyNode->HasNodeFlags(EPropertyNodeFlags::GameModeOnlyVisible);
+
+	for (TFieldIterator<FProperty> It(InStruct->GetStruct()); It; ++It)
+	{
+		FProperty* StructMember = *It;
+
+		if (PropertyEditorHelpers::ShouldBeVisible(*StructPropertyNode.Get(), StructMember))
+		{
+			TSharedRef<FItemPropertyNode> NewItemNode(new FItemPropertyNode);
+
+			FPropertyNodeInitParams InitParams;
+			InitParams.ParentNode = StructPropertyNode;
+			InitParams.Property = StructMember;
+			InitParams.ArrayOffset = 0;
+			InitParams.ArrayIndex = INDEX_NONE;
+			InitParams.bAllowChildren = true;
+			InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+			InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+			InitParams.bCreateCategoryNodes = false;
+			InitParams.bGameModeOnlyVisible = bGameModeOnlyVisible;
+
+			NewItemNode->InitNode(InitParams);
+			StructPropertyNode->AddChildNode(NewItemNode);
+
+			PropertyHandles.Add(PropertyEditorHelpers::GetPropertyHandle(NewItemNode, Implementation->GetNotifyHook(), Implementation->GetPropertyUtilities()));
+		}
+	}
+
+	PropertyNode->AddChildNode(StructPropertyNode);
+
+	return PropertyHandles;
+}
+
+bool FPropertyHandleBase::CanResetToDefault() const
+{
+	FProperty* Property = GetProperty();
+	if (Property == nullptr)
+	{
+		return false;
+	}
+
+	// Should not be able to reset fixed size arrays
+	const bool bFixedSized = (Property->PropertyFlags & CPF_EditFixedSize) != 0;
+	const bool bCanResetToDefault = (Property->PropertyFlags & CPF_Config) == 0;
+
+	return bCanResetToDefault && !bFixedSized && DiffersFromDefault();
+}
+
+void FPropertyHandleBase::ExecuteCustomResetToDefault(const FResetToDefaultOverride& InOnCustomResetToDefault)
+{
+	// This action must be deferred until next tick so that we avoid accessing invalid data before we have a chance to tick
+	TSharedPtr<IPropertyUtilities> PropertyUtilities = Implementation->GetPropertyUtilities();
+	if (PropertyUtilities.IsValid())
+	{
+		TSharedPtr<FPropertyHandleBase> ThisShared = SharedThis(this);
+		PropertyUtilities->EnqueueDeferredAction(FSimpleDelegate::CreateLambda([ThisShared, InOnCustomResetToDefault]()
+			{
+				if (ThisShared.IsValid())
+				{
+					ThisShared->OnCustomResetToDefault(InOnCustomResetToDefault);
+				}
+			}));
+	}
+}
+
+FName FPropertyHandleBase::GetDefaultCategoryName() const
+{
+	FProperty* Property = GetProperty();
+	if (Property)
+	{
+		return FRuntimeEditorUtils::GetCategoryFName(Property);
+	}
+
+	return NAME_None;
+}
+
+FText FPropertyHandleBase::GetDefaultCategoryText() const
+{
+	FProperty* Property = GetProperty();
+
+	if (Property)
+	{
+		return FRuntimeEditorUtils::GetCategoryText(Property);
+	}
+
+	return FText::GetEmpty();
+}
+
+void FPropertyHandleBase::CopyValueToClipboard(TWeakPtr<FPropertyValueImpl> ImplementationWeak)
+{
+	TSharedPtr<FPropertyValueImpl> Implementation = ImplementationWeak.Pin();
+	if (Implementation.IsValid())
+	{
+		FString Value;
+		if (Implementation->GetValueAsString(Value, PPF_Copy) == FPropertyAccess::Success)
+		{
+			FPlatformApplicationMisc::ClipboardCopy(*Value);
+		}
+	}
+}
+
+void FPropertyHandleBase::PasteValueFromClipboard(TWeakPtr<FPropertyValueImpl> ImplementationWeak)
+{
+	TSharedPtr<FPropertyValueImpl> Implementation = ImplementationWeak.Pin();
+	if (Implementation.IsValid())
+	{
+		FString Value;
+		FPlatformApplicationMisc::ClipboardPaste(Value);
+		if (Value.IsEmpty() == false)
+		{
+			Implementation->SetValueAsString(Value, EPropertyValueSetFlags::DefaultFlags);
+		}
+	}
+}
+
+/** Implements common property value functions */
+#define IMPLEMENT_PROPERTY_VALUE( ClassName ) \
+	ClassName::ClassName( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities ) \
+	: FPropertyHandleBase( PropertyNode, NotifyHook, PropertyUtilities )  \
+	{}
+
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleInt )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleFloat )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleDouble )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleBool )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleByte )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleString )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleObject )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleArray )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleText )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleSet )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleMap )
+IMPLEMENT_PROPERTY_VALUE( FPropertyHandleFieldPath )
+
+// int32 
+bool FPropertyHandleInt::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	const bool bIsInteger = 
+			Property->IsA<FInt8Property>()
+		||	Property->IsA<FInt16Property>()
+		||  Property->IsA<FIntProperty>()
+		||	Property->IsA<FInt64Property>()
+		||  Property->IsA<FUInt16Property>()
+		||  Property->IsA<FUInt32Property>()
+		||  Property->IsA<FUInt64Property>();
+
+	// The value is an integer
+	return bIsInteger;
+}
+
+template <typename PropertyClass, typename ValueType>
+ValueType GetIntegerValue(void* PropValue, FPropertyValueImpl& Implementation )
+{
+	check( Implementation.IsPropertyTypeOf( PropertyClass::StaticClass() ) );
+	return Implementation.GetPropertyValue<PropertyClass>(PropValue);
+}
+
+FPropertyAccess::Result FPropertyHandleInt::GetValue(int8& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue = GetIntegerValue<FInt8Property, int8>(PropValue, *Implementation);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::GetValue(int16& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue = GetIntegerValue<FInt16Property, int16>(PropValue, *Implementation);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::GetValue(int32& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue = GetIntegerValue<FIntProperty, int32>(PropValue, *Implementation);
+	}
+
+	return Res;
+}
+FPropertyAccess::Result FPropertyHandleInt::GetValue( int64& OutValue ) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData( PropValue );
+
+	if( Res == FPropertyAccess::Success )
+	{
+		OutValue = GetIntegerValue<FInt64Property,int64>(PropValue, *Implementation);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::GetValue(uint16& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue = GetIntegerValue<FUInt16Property, uint16>(PropValue, *Implementation);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::GetValue(uint32& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue = GetIntegerValue<FUInt32Property, uint32>(PropValue, *Implementation);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::GetValue(uint64& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue = GetIntegerValue<FUInt64Property, uint64>(PropValue, *Implementation);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::SetValue(const int8& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	int8 FinalValue = ClampIntegerValueFromMetaData<int8>( NewValue, *Implementation->GetPropertyNode() );
+
+	const FString ValueStr = LexToString(FinalValue);
+	Res = Implementation->ImportText(ValueStr, Flags);
+
+	return Res;
+}
+
+
+FPropertyAccess::Result FPropertyHandleInt::SetValue(const int16& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	int16 FinalValue = ClampIntegerValueFromMetaData<int16>(NewValue, *Implementation->GetPropertyNode());
+
+	const FString ValueStr = LexToString(FinalValue);
+	Res = Implementation->ImportText(ValueStr, Flags);
+
+	return Res;
+}
+
+
+FPropertyAccess::Result FPropertyHandleInt::SetValue( const int32& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	int32 FinalValue = ClampIntegerValueFromMetaData<int32>( NewValue, *Implementation->GetPropertyNode() );
+
+	const FString ValueStr = LexToString(FinalValue);
+	Res = Implementation->ImportText( ValueStr, Flags );
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::SetValue(const int64& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FPropertyAccess::Result Res;
+
+	// Clamp the value from any meta data ranges stored on the property value
+	int64 FinalValue = ClampIntegerValueFromMetaData<int64>(NewValue, *Implementation->GetPropertyNode());
+
+	const FString ValueStr = LexToString(FinalValue);
+	Res = Implementation->ImportText(ValueStr, Flags);
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::SetValue(const uint16& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	uint16 FinalValue = ClampIntegerValueFromMetaData<uint16>(NewValue, *Implementation->GetPropertyNode());
+
+	const FString ValueStr = LexToString(FinalValue);
+	Res = Implementation->ImportText(ValueStr, Flags);
+
+	return Res;
+}
+
+
+FPropertyAccess::Result FPropertyHandleInt::SetValue(const uint32& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	uint32 FinalValue = ClampIntegerValueFromMetaData<uint32>(NewValue, *Implementation->GetPropertyNode());
+
+	const FString ValueStr = LexToString(FinalValue);
+	Res = Implementation->ImportText(ValueStr, Flags);
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleInt::SetValue(const uint64& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	uint64 FinalValue = ClampIntegerValueFromMetaData<uint64>(NewValue, *Implementation->GetPropertyNode());
+
+	const FString ValueStr = LexToString(FinalValue);
+	Res = Implementation->ImportText(ValueStr, Flags);
+	return Res;
+}
+
+// float
+bool FPropertyHandleFloat::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	return Property->IsA(FFloatProperty::StaticClass());
+}
+
+FPropertyAccess::Result FPropertyHandleFloat::GetValue( float& OutValue ) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData( PropValue );
+
+	if( Res == FPropertyAccess::Success )
+	{
+		OutValue = Implementation->GetPropertyValue<FFloatProperty>(PropValue);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleFloat::SetValue( const float& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	float FinalValue = ClampValueFromMetaData<float>( NewValue, *Implementation->GetPropertyNode() );
+
+	const FString ValueStr = FString::Printf( TEXT("%f"), FinalValue );
+	Res = Implementation->ImportText( ValueStr, Flags );
+
+	return Res;
+}
+
+// double
+bool FPropertyHandleDouble::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if (Property == nullptr)
+	{
+		return false;
+	}
+
+	return Property->IsA(FDoubleProperty::StaticClass());
+}
+
+FPropertyAccess::Result FPropertyHandleDouble::GetValue( double& OutValue ) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData( PropValue );
+
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue = Implementation->GetPropertyValue<FDoubleProperty>(PropValue);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleDouble::SetValue( const double& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	double FinalValue = ClampValueFromMetaData<double>( NewValue, *Implementation->GetPropertyNode() );
+
+	const FString ValueStr = FString::Printf( TEXT("%f"), FinalValue );
+	Res = Implementation->ImportText( ValueStr, Flags );
+
+	return Res;
+}
+
+// bool
+bool FPropertyHandleBool::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	return Property->IsA(FBoolProperty::StaticClass());
+}
+
+FPropertyAccess::Result FPropertyHandleBool::GetValue( bool& OutValue ) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData( PropValue );
+
+	if( Res == FPropertyAccess::Success )
+	{
+		OutValue = Implementation->GetPropertyValue<FBoolProperty>(PropValue);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleBool::SetValue( const bool& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res = FPropertyAccess::Fail;
+
+	//These are not localized values because ImportText does not accept localized values!
+	FString ValueStr; 
+	if( NewValue == false )
+	{
+		ValueStr = TEXT("False");
+	}
+	else
+	{
+		ValueStr = TEXT("True");
+	}
+
+	Res = Implementation->ImportText( ValueStr, Flags );
+
+	return Res;
+}
+
+bool FPropertyHandleByte::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	return Property->IsA<FByteProperty>() || Property->IsA<FEnumProperty>();
+}
+
+FPropertyAccess::Result FPropertyHandleByte::GetValue( uint8& OutValue ) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData( PropValue );
+
+	if( Res == FPropertyAccess::Success )
+	{
+		TSharedPtr<FPropertyNode> PropertyNodePin = Implementation->GetPropertyNode();
+
+		FProperty* Property = PropertyNodePin->GetProperty();
+		if( Property->IsA<FByteProperty>() )
+		{
+			OutValue = Implementation->GetPropertyValue<FByteProperty>(PropValue);
+		}
+		else
+		{
+			check(PropertyNodePin.IsValid());
+			OutValue = CastFieldChecked<FEnumProperty>(Property)->GetUnderlyingProperty()->GetUnsignedIntPropertyValue(PropValue);
+		}
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleByte::SetValue( const uint8& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res;
+	FString ValueStr;
+
+	FProperty* Property = GetProperty();
+
+	UEnum* Enum = nullptr;
+	if (FByteProperty* ByteProperty = CastField<FByteProperty>(Property))
+	{
+		Enum = ByteProperty->Enum;
+	}
+	else if (FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property))
+	{
+		Enum = EnumProperty->GetEnum();
+	}
+
+	if (Enum)
+	{
+		// Handle Enums using enum names to make sure they're compatible with FByteProperty::ExportText.
+		ValueStr = Enum->GetNameStringByValue(NewValue);
+	}
+	else
+	{
+		// Ordinary byte, convert value to string.
+		ValueStr = FString::Printf( TEXT("%i"), NewValue );
+	}
+	Res = Implementation->ImportText( ValueStr, Flags );
+
+	return Res;
+}
+
+
+// String
+bool FPropertyHandleString::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	// Supported if the property is a name, string or object/interface that can be set via string
+	return	( Property->IsA(FNameProperty::StaticClass()) && Property->GetFName() != NAME_InitialState )
+		||	Property->IsA( FStrProperty::StaticClass() )
+		||	( Property->IsA( FObjectPropertyBase::StaticClass() ) && !Property->HasAnyPropertyFlags(CPF_InstancedReference) )
+		||	Property->IsA(FInterfaceProperty::StaticClass());
+}
+
+FPropertyAccess::Result FPropertyHandleString::GetValue( FString& OutValue ) const
+{
+	return Implementation->GetValueAsString( OutValue );
+}
+
+FPropertyAccess::Result FPropertyHandleString::SetValue( const FString& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	return Implementation->SetValueAsString( NewValue, Flags );
+}
+
+FPropertyAccess::Result FPropertyHandleString::SetValue( const TCHAR* NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	return Implementation->SetValueAsString( NewValue, Flags );
+}
+
+FPropertyAccess::Result FPropertyHandleString::GetValue( FName& OutValue ) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData( PropValue );
+
+	if( Res == FPropertyAccess::Success )
+	{
+		OutValue = Implementation->GetPropertyValue<FNameProperty>(PropValue);
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleString::SetValue( const FName& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	return Implementation->SetValueAsString( NewValue.ToString(), Flags );
+}
+
+// Object
+
+bool FPropertyHandleObject::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	return Property->IsA(FObjectPropertyBase::StaticClass()) || Property->IsA(FInterfaceProperty::StaticClass()) 
+		|| PropertyEditorHelpers::IsSoftClassPath(Property) || PropertyEditorHelpers::IsSoftObjectPath(Property);
+}
+
+FPropertyAccess::Result FPropertyHandleObject::GetValue( UObject*& OutValue ) const
+{
+	return FPropertyHandleObject::GetValue((const UObject*&)OutValue);
+}
+
+FPropertyAccess::Result FPropertyHandleObject::GetValue( const UObject*& OutValue ) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData( PropValue );
+
+	if( Res == FPropertyAccess::Success )
+	{
+		FProperty* Property = GetProperty();
+
+		if (Property->IsA(FObjectPropertyBase::StaticClass()))
+		{
+			OutValue = Implementation->GetObjectPropertyValue(PropValue);
+		}
+		else if (Property->IsA(FInterfaceProperty::StaticClass()))
+		{
+			FInterfaceProperty* InterfaceProp = CastField<FInterfaceProperty>(Property);
+			const FScriptInterface& ScriptInterface = InterfaceProp->GetPropertyValue(PropValue);
+			OutValue = ScriptInterface.GetObject();
+		}
+		else
+		{
+			// This is a struct path, get the path string and search for the object
+			FString ObjectPathString;
+			Res = Implementation->GetValueAsString(ObjectPathString);
+			FSoftObjectPath ObjectPath(ObjectPathString);
+			OutValue = ObjectPath.ResolveObject();
+		}
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleObject::SetValue( UObject* const& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	return FPropertyHandleObject::SetValue((const UObject*)NewValue);
+}
+
+FPropertyAccess::Result FPropertyHandleObject::SetValue( const UObject* const& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	const TSharedPtr<FPropertyNode>& PropertyNode = Implementation->GetPropertyNode();
+
+	if (!PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew))
+	{
+		FString ObjectPathName = NewValue ? NewValue->GetPathName() : TEXT("None");
+		return SetValueFromFormattedString(ObjectPathName, Flags);
+	}
+
+	return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleObject::GetValue(FAssetData& OutValue) const
+{
+	UObject* ObjectValue = nullptr;
+	FPropertyAccess::Result	Result = GetValue(ObjectValue);
+	
+	if ( Result == FPropertyAccess::Success )
+	{
+		OutValue = FAssetData(ObjectValue);
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleObject::SetValue(const FAssetData& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	const TSharedPtr<FPropertyNode>& PropertyNode = Implementation->GetPropertyNode();
+
+	if (!PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew))
+	{
+		const bool bSkipResolve = PropertyNode->GetProperty()->IsA(FSoftObjectProperty::StaticClass());
+		if (!bSkipResolve)
+		{
+			// Make sure the asset is loaded if we are not a soft reference
+			NewValue.GetAsset();
+		}
+
+		FString ObjectPathName = NewValue.IsValid() ? FString::Printf(TEXT("%s'%s'"), *NewValue.GetClass()->GetName(), *NewValue.GetObjectPathString()) : TEXT("None");
+		return SetValueFromFormattedString(ObjectPathName, Flags, bSkipResolve);
+	}
+
+	return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleObject::SetValueFromFormattedString(const FString& InValue, EPropertyValueSetFlags::Type Flags)
+{
+	const bool bSkipResolve = false;
+	return SetValueFromFormattedString(InValue, Flags, bSkipResolve);
+}
+
+FPropertyAccess::Result FPropertyHandleObject::SetValueFromFormattedString(const FString& InValue, EPropertyValueSetFlags::Type Flags, bool bSkipResolve)
+{
+	// We need to do all of the type validation up front, to correctly support soft objects
+	TSharedPtr<FPropertyNode> PropertyNodePin = Implementation->GetPropertyNode();
+	FProperty* NodeProperty = PropertyNodePin.IsValid() ? PropertyNodePin->GetProperty() : nullptr;
+	const TCHAR* ObjectBuffer = *InValue;
+	TObjectPtr<UObject> QualifiedObject = nullptr;
+
+	// Only allow finding any object with the same name if package path not provided
+	const bool bAllowAnyPackage = !InValue.Contains(TEXT("/"));
+
+	if (!NodeProperty)
+	{
+		return FPropertyAccess::Fail;
+	} // Skip the resolving, just set the value
+	else if (bSkipResolve)
+	{
+		return FPropertyHandleBase::SetValueFromFormattedString(InValue, Flags);
+	} // This will attempt to load the object if it is not in memory. We purposefully pass in null as owner to avoid issues with cross level references
+	else if (FObjectPropertyBase::ParseObjectPropertyValue(NodeProperty, nullptr, UObject::StaticClass(), 0, ObjectBuffer, QualifiedObject, nullptr, bAllowAnyPackage))
+	{
+		if (QualifiedObject)
+		{
+			FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(NodeProperty);
+			FInterfaceProperty* InterfaceProperty = CastField<FInterfaceProperty>(NodeProperty);
+			FClassProperty* ClassProperty = CastField<FClassProperty>(NodeProperty);
+			FSoftClassProperty* SoftClassProperty = CastField<FSoftClassProperty>(NodeProperty);
+
+			// Figure out what classes are required
+			UClass* InterfaceThatMustBeImplemented = nullptr;
+			UClass* RequiredClass = nullptr;
+			if (ClassProperty)
+			{
+				RequiredClass = ClassProperty->MetaClass;
+			}
+			else if (SoftClassProperty)
+			{
+				RequiredClass = SoftClassProperty->MetaClass;
+			}
+			else if (ObjectProperty)
+			{
+				RequiredClass = ObjectProperty->PropertyClass;
+				InterfaceThatMustBeImplemented = FRuntimeMetaData::GetClassMetaData(ObjectProperty->GetOwnerProperty(), TEXT("MustImplement"));
+			}
+			else if (InterfaceProperty)
+			{
+				InterfaceThatMustBeImplemented = InterfaceProperty->InterfaceClass;
+			}
+			else if (PropertyEditorHelpers::IsSoftClassPath(NodeProperty))
+			{
+				RequiredClass = FRuntimeMetaData::GetClassMetaData(NodeProperty->GetOwnerProperty(), TEXT("MetaClass"));
+				InterfaceThatMustBeImplemented = FRuntimeMetaData::GetClassMetaData(NodeProperty->GetOwnerProperty(), TEXT("MustImplement"));
+			}
+			else if (PropertyEditorHelpers::IsSoftObjectPath(NodeProperty))
+			{
+				// No metaclass, allowedclasses is the only filter
+			}
+			else
+			{
+				return FPropertyAccess::Fail;
+			}
+
+			// Figure out what class to check against
+			UClass* QualifiedClass = Cast<UClass>(QualifiedObject);
+			if (!QualifiedClass)
+			{
+				QualifiedClass = QualifiedObject->GetClass();
+			}
+
+			const FString& AllowedClassesString = FRuntimeMetaData::GetMetaData(NodeProperty, "AllowedClasses");
+			TArray<FString> AllowedClassNames;
+			AllowedClassesString.ParseIntoArrayWS(AllowedClassNames, TEXT(","), true);
+			bool bSupportedObject = false;
+
+			// Check AllowedClasses metadata
+			if (AllowedClassNames.Num() > 0)
+			{
+				for (const FString& ClassName : AllowedClassNames)
+				{
+					UClass* AllowedClass = nullptr;
+					if (!FPackageName::IsShortPackageName(ClassName))
+					{
+						AllowedClass = FindObject<UClass>(nullptr, *ClassName);
+					}
+					else
+					{
+						AllowedClass = FindFirstObject<UClass>(*ClassName, EFindFirstObjectOptions::None, ELogVerbosity::Warning, TEXT("FPropertyHandleObject::SetValueFromFormattedString"));
+					}
+
+					const bool bIsInterface = AllowedClass && AllowedClass->HasAnyClassFlags(CLASS_Interface);
+
+					// Check if the object is an allowed class type this property supports
+					if ((AllowedClass && QualifiedClass->IsChildOf(AllowedClass)) || (bIsInterface && QualifiedObject->GetClass()->ImplementsInterface(AllowedClass)))
+					{
+						bSupportedObject = true;
+						break;
+					}
+				}
+			}
+			else
+			{
+				bSupportedObject = true;
+			}
+
+			if (bSupportedObject)
+			{
+				const FString& DisallowedClassesString = FRuntimeMetaData::GetMetaData(NodeProperty, "DisallowedClasses");
+				TArray<FString> DisallowedClassNames;
+				DisallowedClassesString.ParseIntoArrayWS(DisallowedClassNames, TEXT(","), true);
+
+				for (const FString& DisallowedClassName : DisallowedClassNames)
+				{
+					UClass* DisallowedClass = UClass::TryFindTypeSlow<UClass>(DisallowedClassName);
+					const bool bIsInterface = DisallowedClass && DisallowedClass->HasAnyClassFlags(CLASS_Interface);
+
+					if ((DisallowedClass && QualifiedClass->IsChildOf(DisallowedClass)) || (bIsInterface && QualifiedObject->GetClass()->ImplementsInterface(DisallowedClass)))
+					{
+						bSupportedObject = false;
+						break;
+					}
+				}
+			}
+
+			// Check required class
+			if (RequiredClass && !QualifiedClass->IsChildOf(RequiredClass))
+			{
+				bSupportedObject = false;
+			}
+
+			// Check required interface
+			if (InterfaceThatMustBeImplemented && !QualifiedClass->ImplementsInterface(InterfaceThatMustBeImplemented))
+			{
+				bSupportedObject = false;
+			}
+
+			// Check node restrictions
+			TArray<FText> RestrictReasons;
+			if (PropertyNodePin->IsRestricted(QualifiedObject->GetPathName(), RestrictReasons))
+			{
+				bSupportedObject = false;
+			}
+
+			// Check level actor
+			bool const bMustBeLevelActor = ObjectProperty ? FRuntimeMetaData::GetBoolMetaData(ObjectProperty->GetOwnerProperty(), TEXT("MustBeLevelActor")) : false;
+			if (bMustBeLevelActor)
+			{
+				if (AActor* Actor = Cast<AActor>(QualifiedObject))
+				{
+					if (!Actor->GetLevel())
+					{
+						// Not in a level
+						bSupportedObject = false;
+					}
+				}
+				else
+				{
+					// Not an actor
+					bSupportedObject = false;
+				}
+			}
+
+			if (!bSupportedObject)
+			{
+				return FPropertyAccess::Fail;
+			}
+		}
+
+		// Parsing passed and QualifiedObject !nullptr and bSupportedObject is true and so we should set the value or
+		// Parsing passed but QualifiedObject is nullptr and we want to set it to null explicitly
+		return FPropertyHandleBase::SetValueFromFormattedString(InValue, Flags);
+	}
+
+		// Failed parsing, it's either invalid format or a nonexistent object
+		return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleObject::SetObjectValueFromSelection()
+{
+	FPropertyAccess::Result Res = FPropertyAccess::Fail;
+	TSharedPtr<FPropertyNode> PropertyNodePin = Implementation->GetPropertyNode();
+	if (PropertyNodePin.IsValid())
+	{
+		FProperty* NodeProperty = PropertyNodePin->GetProperty();
+
+		FObjectPropertyBase* ObjProp = CastField<FObjectPropertyBase>(NodeProperty);
+		FInterfaceProperty* IntProp = CastField<FInterfaceProperty>(NodeProperty);
+		FClassProperty* ClassProp = CastField<FClassProperty>(NodeProperty);
+		FSoftClassProperty* SoftClassProperty = CastField<FSoftClassProperty>(NodeProperty);
+		UClass* const InterfaceThatMustBeImplemented = NodeProperty ? FRuntimeMetaData::GetClassMetaData(NodeProperty->GetOwnerProperty(), TEXT("MustImplement")) : nullptr;
+
+		if (ClassProp || SoftClassProperty || PropertyEditorHelpers::IsSoftClassPath(NodeProperty))
+		{
+			//FEditorDelegates::LoadSelectedAssetsIfNeeded.Broadcast();
+
+			UClass* RequiredClass = nullptr;
+			if (ClassProp)
+			{
+				RequiredClass = ClassProp->MetaClass;
+			}
+			else if (SoftClassProperty)
+			{
+				RequiredClass = SoftClassProperty->MetaClass;
+			}
+			else
+			{
+				RequiredClass = FRuntimeMetaData::GetClassMetaData(NodeProperty->GetOwnerProperty(), TEXT("MetaClass"));
+			}
+			/*
+			const UClass* const SelectedClass = GEditor->GetFirstSelectedClass(RequiredClass);
+			if (SelectedClass)
+			{
+				if (!InterfaceThatMustBeImplemented || SelectedClass->ImplementsInterface(InterfaceThatMustBeImplemented))
+				{
+					FString const ClassPathName = SelectedClass->GetPathName();
+
+					TArray<FText> RestrictReasons;
+					if (PropertyNodePin->IsRestricted(ClassPathName, RestrictReasons))
+					{
+						check(RestrictReasons.Num() > 0);
+						FMessageDialog::Open(EAppMsgType::Ok, RestrictReasons[0]);
+					}
+					else
+					{
+
+						Res = SetValueFromFormattedString(ClassPathName, EPropertyValueSetFlags::DefaultFlags);
+					}
+				}
+			}
+			*/
+		}
+		else
+		{
+			//FEditorDelegates::LoadSelectedAssetsIfNeeded.Broadcast();
+
+			UClass* ObjPropClass = UObject::StaticClass();
+			if (ObjProp)
+			{
+				ObjPropClass = ObjProp->PropertyClass;
+			}
+			else if (IntProp)
+			{
+				ObjPropClass = IntProp->InterfaceClass;
+			}
+
+			bool const bMustBeLevelActor = ObjProp ? FRuntimeMetaData::GetBoolMetaData(ObjProp->GetOwnerProperty(), TEXT("MustBeLevelActor")) : false;
+
+			// Find best appropriate selected object
+			UObject* SelectedObject = nullptr;
+			/*
+			if (bMustBeLevelActor)
+			{
+				// @todo: ensure at compile time that MustBeLevelActor flag is only set on actor properties
+
+				// looking only for level actors here
+				USelection* const SelectedSet = GEditor->GetSelectedActors();
+				SelectedObject = SelectedSet->GetTop(ObjPropClass, InterfaceThatMustBeImplemented);
+			}
+			else
+			{
+				// normal behavior, where actor classes will look for level actors and 
+				USelection* const SelectedSet = GEditor->GetSelectedSet(ObjPropClass);
+				SelectedObject = SelectedSet->GetTop(ObjPropClass, InterfaceThatMustBeImplemented);
+			}
+			*/
+			if (SelectedObject)
+			{
+				FString const ObjPathName = SelectedObject->GetPathName();
+
+				TArray<FText> RestrictReasons;
+				if (PropertyNodePin->IsRestricted(ObjPathName, RestrictReasons))
+				{
+					check(RestrictReasons.Num() > 0);
+					FMessageDialog::Open(EAppMsgType::Ok, RestrictReasons[0]);
+				}
+				else if (SetValueFromFormattedString(SelectedObject->GetPathName(), EPropertyValueSetFlags::DefaultFlags) != FPropertyAccess::Success)
+				{
+					// Warn that some object assignments failed.
+					FMessageDialog::Open(EAppMsgType::Ok, FText::Format(
+						NSLOCTEXT("UnrealEd", "ObjectAssignmentsFailed", "Failed to assign {0} to the {1} property, see log for details."),
+						FText::FromString(SelectedObject->GetPathName()), PropertyNodePin->GetDisplayName()));
+				}
+				else
+				{
+					Res = FPropertyAccess::Success;
+				}
+			}
+		}
+	}
+
+	return Res;
+}
+
+
+// Temporary mixed float/double property handle to support the various default template types having differing component types. LWC_TODO: Remove once all types support double.
+FPropertyHandleMixed::FPropertyHandleMixed(TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities)
+	: FPropertyHandleBase(PropertyNode, NotifyHook, PropertyUtilities) {}
+
+bool FPropertyHandleMixed::Supports(TSharedRef<FPropertyNode> PropertyNode)
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if (Property == nullptr)
+	{
+		return false;
+	}
+
+	return Property->IsA(FFloatProperty::StaticClass()) || Property->IsA(FDoubleProperty::StaticClass());
+}
+
+FPropertyAccess::Result FPropertyHandleMixed::GetValue(double& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		if(Implementation->IsPropertyTypeOf(FFloatProperty::StaticClass()))
+		{
+			OutValue = Implementation->GetPropertyValue<FFloatProperty>(PropValue);
+		}
+		else
+		{
+			OutValue = Implementation->GetPropertyValue<FDoubleProperty>(PropValue);
+		}
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleMixed::SetValue(const double& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FPropertyAccess::Result Res;
+	// Clamp the value from any meta data ranges stored on the property value
+	double FinalValue = ClampValueFromMetaData<double>(NewValue, *Implementation->GetPropertyNode());
+
+	const FString ValueStr = FString::Printf(TEXT("%f"), FinalValue);
+	Res = Implementation->ImportText(ValueStr, Flags);
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleMixed::GetValue(float& OutValue) const
+{
+	double AsDouble;
+	FPropertyAccess::Result Res = GetValue(AsDouble);
+	OutValue = AsDouble;
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleMixed::SetValue(const float& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	return SetValue((double)NewValue);
+}
+
+// Vector
+bool FPropertyHandleVector::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	FStructProperty* StructProp = CastField<FStructProperty>(Property);
+
+	bool bSupported = false;
+	if( StructProp && StructProp->Struct )
+	{
+		FName StructName = StructProp->Struct->GetFName();
+
+		bSupported = StructName == NAME_Vector ||
+			StructName == NAME_Vector2D ||
+			StructName == NAME_Vector4 ||
+			StructName == NAME_Quat;
+	}
+
+	return bSupported;
+}
+
+FPropertyHandleVector::FPropertyHandleVector( TSharedRef<class FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities )
+	: FPropertyHandleBase( PropertyNode, NotifyHook, PropertyUtilities ) 
+{
+	const bool bRecurse = false;
+	// A vector is a struct property that has 3 children.  We get/set the values from the children
+	VectorComponents.Add( MakeShareable( new FPropertyHandleMixed( Implementation->GetChildNode("X", bRecurse).ToSharedRef(), NotifyHook, PropertyUtilities ) ) );
+
+	VectorComponents.Add( MakeShareable( new FPropertyHandleMixed( Implementation->GetChildNode("Y", bRecurse).ToSharedRef(), NotifyHook, PropertyUtilities ) ) );
+
+	if( Implementation->GetNumChildren() > 2 )
+	{
+		// at least a 3 component vector
+		VectorComponents.Add( MakeShareable( new FPropertyHandleMixed( Implementation->GetChildNode("Z",bRecurse).ToSharedRef(), NotifyHook, PropertyUtilities ) ) );
+	}
+	if( Implementation->GetNumChildren() > 3 )
+	{
+		// a 4 component vector
+		VectorComponents.Add( MakeShareable( new FPropertyHandleMixed( Implementation->GetChildNode("W",bRecurse).ToSharedRef(), NotifyHook, PropertyUtilities ) ) );
+	}
+}
+
+FPropertyAccess::Result FPropertyHandleVector::GetValue( FVector2D& OutValue ) const
+{
+	if( VectorComponents.Num() == 2 )
+	{
+		// To get the value from the vector we read each child.  If reading a child fails, the value for that component is not set
+		FPropertyAccess::Result ResX = VectorComponents[0]->GetValue( OutValue.X );
+		FPropertyAccess::Result ResY = VectorComponents[1]->GetValue( OutValue.Y );
+
+		if( ResX == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail )
+		{
+			// If reading any value failed the entire value fails
+			return FPropertyAccess::Fail;
+		}
+		else if( ResX == FPropertyAccess::MultipleValues || ResY == FPropertyAccess::MultipleValues )
+		{
+			// At least one component had multiple values
+			return FPropertyAccess::MultipleValues;
+		}
+		else
+		{
+			return FPropertyAccess::Success;
+		}
+	}
+
+	// Not a 2 component vector
+	return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleVector::SetValue( const FVector2D& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	// To set the value from the vector we set each child. 
+	FPropertyAccess::Result ResX = VectorComponents[0]->SetValue( NewValue.X, Flags );
+	FPropertyAccess::Result ResY = VectorComponents[1]->SetValue( NewValue.Y, Flags );
+
+	if( ResX == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail )
+	{
+		return FPropertyAccess::Fail;
+	}
+	else
+	{
+		return FPropertyAccess::Success;
+	}
+}
+
+FPropertyAccess::Result FPropertyHandleVector::GetValue( FVector& OutValue ) const
+{
+	if( VectorComponents.Num() == 3 )
+	{
+		// To get the value from the vector we read each child.  If reading a child fails, the value for that component is not set
+		FPropertyAccess::Result ResX = VectorComponents[0]->GetValue( OutValue.X );
+		FPropertyAccess::Result ResY = VectorComponents[1]->GetValue( OutValue.Y );
+		FPropertyAccess::Result ResZ = VectorComponents[2]->GetValue( OutValue.Z );
+
+		if( ResX == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail || ResZ == FPropertyAccess::Fail )
+		{
+			// If reading any value failed the entire value fails
+			return FPropertyAccess::Fail;
+		}
+		else if( ResX == FPropertyAccess::MultipleValues || ResY == FPropertyAccess::MultipleValues || ResZ == FPropertyAccess::MultipleValues )
+		{
+			// At least one component had multiple values
+			return FPropertyAccess::MultipleValues;
+		}
+		else
+		{
+			return FPropertyAccess::Success;
+		}
+	}
+
+	// Not a 3 component vector
+	return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleVector::SetValue( const FVector& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	if( VectorComponents.Num() == 3)
+	{
+		// To set the value from the vector we set each child. 
+		FPropertyAccess::Result ResX = VectorComponents[0]->SetValue( NewValue.X, Flags );
+		FPropertyAccess::Result ResY = VectorComponents[1]->SetValue( NewValue.Y, Flags );
+		FPropertyAccess::Result ResZ = VectorComponents[2]->SetValue( NewValue.Z, Flags );
+
+		if( ResX == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail || ResZ == FPropertyAccess::Fail )
+		{
+			return FPropertyAccess::Fail;
+		}
+		else
+		{
+			return FPropertyAccess::Success;
+		}
+	}
+
+	return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleVector::GetValue( FVector4& OutValue ) const
+{
+	if( VectorComponents.Num() == 4 )
+	{
+		// To get the value from the vector we read each child.  If reading a child fails, the value for that component is not set
+		FPropertyAccess::Result ResX = VectorComponents[0]->GetValue( OutValue.X );
+		FPropertyAccess::Result ResY = VectorComponents[1]->GetValue( OutValue.Y );
+		FPropertyAccess::Result ResZ = VectorComponents[2]->GetValue( OutValue.Z );
+		FPropertyAccess::Result ResW = VectorComponents[3]->GetValue( OutValue.W );
+
+		if( ResX == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail || ResZ == FPropertyAccess::Fail || ResW == FPropertyAccess::Fail )
+		{
+			// If reading any value failed the entire value fails
+			return FPropertyAccess::Fail;
+		}
+		else if( ResX == FPropertyAccess::MultipleValues || ResY == FPropertyAccess::MultipleValues || ResZ == FPropertyAccess::MultipleValues || ResW == FPropertyAccess::MultipleValues )
+		{
+			// At least one component had multiple values
+			return FPropertyAccess::MultipleValues;
+		}
+		else
+		{
+			return FPropertyAccess::Success;
+		}
+	}
+
+	// Not a 4 component vector
+	return FPropertyAccess::Fail;
+}
+
+
+FPropertyAccess::Result FPropertyHandleVector::SetValue( const FVector4& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	// To set the value from the vector we set each child. 
+	FPropertyAccess::Result ResX = VectorComponents[0]->SetValue( NewValue.X, Flags );
+	FPropertyAccess::Result ResY = VectorComponents[1]->SetValue( NewValue.Y, Flags );
+	FPropertyAccess::Result ResZ = VectorComponents[2]->SetValue( NewValue.Z, Flags );
+	FPropertyAccess::Result ResW = VectorComponents[3]->SetValue( NewValue.W, Flags );
+
+	if( ResX == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail || ResZ == FPropertyAccess::Fail || ResW == FPropertyAccess::Fail )
+	{
+		return FPropertyAccess::Fail;
+	}
+	else
+	{
+		return FPropertyAccess::Success;
+	}
+}
+
+FPropertyAccess::Result FPropertyHandleVector::GetValue( FQuat& OutValue ) const
+{
+	FVector4 VectorProxy;
+	FPropertyAccess::Result Res = GetValue(VectorProxy);
+	if (Res == FPropertyAccess::Success)
+	{
+		OutValue.X = VectorProxy.X;
+		OutValue.Y = VectorProxy.Y;
+		OutValue.Z = VectorProxy.Z;
+		OutValue.W = VectorProxy.W;
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleVector::SetValue( const FQuat& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	FVector4 VectorProxy;
+	VectorProxy.X = NewValue.X;
+	VectorProxy.Y = NewValue.Y;
+	VectorProxy.Z = NewValue.Z;
+	VectorProxy.W = NewValue.W;
+
+	return SetValue(VectorProxy);
+}
+
+FPropertyAccess::Result FPropertyHandleVector::SetX( double InValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res = VectorComponents[0]->SetValue( InValue, Flags );
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleVector::SetY(double InValue, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res = VectorComponents[1]->SetValue( InValue, Flags );
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleVector::SetZ(double InValue, EPropertyValueSetFlags::Type Flags )
+{
+	if( VectorComponents.Num() > 2 )
+	{
+		FPropertyAccess::Result Res = VectorComponents[2]->SetValue( InValue, Flags );
+
+		return Res;
+	}
+	
+	return FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyHandleVector::SetW(double InValue, EPropertyValueSetFlags::Type Flags )
+{
+	if( VectorComponents.Num() == 4 )
+	{
+		FPropertyAccess::Result Res = VectorComponents[3]->SetValue( InValue, Flags );
+	}
+
+	return FPropertyAccess::Fail;
+}
+
+// Rotator
+
+bool FPropertyHandleRotator::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	FStructProperty* StructProp = CastField<FStructProperty>(Property);
+	return StructProp && StructProp->Struct->GetFName() == NAME_Rotator;
+}
+
+FPropertyHandleRotator::FPropertyHandleRotator( TSharedRef<class FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities )
+	: FPropertyHandleBase( PropertyNode, NotifyHook, PropertyUtilities ) 
+{
+	const bool bRecurse = false;
+	// A vector is a struct property that has 3 children.  We get/set the values from the children
+	RollValue = MakeShareable( new FPropertyHandleMixed( Implementation->GetChildNode("Roll", bRecurse).ToSharedRef(), NotifyHook, PropertyUtilities ) );
+
+	PitchValue = MakeShareable( new FPropertyHandleMixed( Implementation->GetChildNode("Pitch", bRecurse).ToSharedRef(), NotifyHook, PropertyUtilities ) );
+
+	YawValue = MakeShareable( new FPropertyHandleMixed( Implementation->GetChildNode("Yaw", bRecurse).ToSharedRef(), NotifyHook, PropertyUtilities ) );
+}
+
+
+FPropertyAccess::Result FPropertyHandleRotator::GetValue( FRotator& OutValue ) const
+{
+	// To get the value from the rotator we read each child.  If reading a child fails, the value for that component is not set
+	FPropertyAccess::Result ResR = RollValue->GetValue( OutValue.Roll );
+	FPropertyAccess::Result ResP = PitchValue->GetValue( OutValue.Pitch );
+	FPropertyAccess::Result ResY = YawValue->GetValue( OutValue.Yaw );
+
+	if( ResR == FPropertyAccess::MultipleValues || ResP == FPropertyAccess::MultipleValues || ResY == FPropertyAccess::MultipleValues )
+	{
+		return FPropertyAccess::MultipleValues;
+	}
+	else if( ResR == FPropertyAccess::Fail || ResP == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail )
+	{
+		return FPropertyAccess::Fail;
+	}
+	else
+	{
+		return FPropertyAccess::Success;
+	}
+}
+
+FPropertyAccess::Result FPropertyHandleRotator::SetValue( const FRotator& NewValue, EPropertyValueSetFlags::Type Flags )
+{
+	// To set the value from the rotator we set each child. 
+	FPropertyAccess::Result ResR = RollValue->SetValue( NewValue.Roll, Flags );
+	FPropertyAccess::Result ResP = PitchValue->SetValue( NewValue.Pitch, Flags );
+	FPropertyAccess::Result ResY = YawValue->SetValue( NewValue.Yaw, Flags );
+
+	if( ResR == FPropertyAccess::Fail || ResP == FPropertyAccess::Fail || ResY == FPropertyAccess::Fail )
+	{
+		return FPropertyAccess::Fail;
+	}
+	else
+	{
+		return FPropertyAccess::Success;
+	}
+}
+
+FPropertyAccess::Result FPropertyHandleRotator::SetRoll( double InRoll, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res = RollValue->SetValue( InRoll, Flags );
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleRotator::SetPitch( double InPitch, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res = PitchValue->SetValue( InPitch, Flags );
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleRotator::SetYaw( double InYaw, EPropertyValueSetFlags::Type Flags )
+{
+	FPropertyAccess::Result Res = YawValue->SetValue( InYaw, Flags );
+	return Res;
+}
+
+
+bool FPropertyHandleArray::Supports( TSharedRef<FPropertyNode> PropertyNode )
+{
+	FProperty* Property = PropertyNode->GetProperty();
+	int32 ArrayIndex = PropertyNode->GetArrayIndex();
+
+	// Static array or dynamic array
+	return ( ( Property && Property->ArrayDim != 1 && ArrayIndex == -1 ) || CastField<const FArrayProperty>(Property) );
+}
+
+
+FPropertyAccess::Result FPropertyHandleArray::AddItem()
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if( IsEditable() )
+	{
+		Implementation->AddChild();
+		Implementation->GetPropertyNode()->RebuildChildren();
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleArray::EmptyArray()
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if( IsEditable() )
+	{
+		Implementation->ClearChildren();
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleArray::Insert( int32 Index )
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if( IsEditable() && Index < Implementation->GetNumChildren()  )
+	{
+		Implementation->InsertChild( Index );
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleArray::DuplicateItem( int32 Index )
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if( IsEditable() && Index < Implementation->GetNumChildren() )
+	{
+		Implementation->DuplicateChild( Index );
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleArray::DeleteItem( int32 Index )
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if( IsEditable() && Index < Implementation->GetNumChildren() )
+	{
+		Implementation->DeleteChild( Index );
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleArray::SwapItems(int32 FirstIndex, int32 SecondIndex)
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (IsEditable() && FirstIndex >= 0 && SecondIndex >= 0 && FirstIndex < Implementation->GetNumChildren() && SecondIndex < Implementation->GetNumChildren())
+	{
+		Implementation->SwapChildren(FirstIndex, SecondIndex);
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleArray::GetNumElements( uint32 &OutNumItems ) const
+{
+	OutNumItems = Implementation->GetNumChildren();
+	return FPropertyAccess::Success;
+}
+
+void FPropertyHandleArray::SetOnNumElementsChanged( FSimpleDelegate& OnChildrenChanged )
+{
+	Implementation->SetOnRebuildChildren( OnChildrenChanged );
+}
+
+TSharedPtr<IPropertyHandleArray> FPropertyHandleArray::AsArray()
+{
+	return SharedThis(this);
+}
+
+TSharedRef<IPropertyHandle> FPropertyHandleArray::GetElement( int32 Index ) const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Implementation->GetChildNode( Index );
+	return PropertyEditorHelpers::GetPropertyHandle( PropertyNode.ToSharedRef(), Implementation->GetNotifyHook(), Implementation->GetPropertyUtilities() ).ToSharedRef();
+}
+
+FPropertyAccess::Result FPropertyHandleArray::MoveElementTo(int32 OriginalIndex, int32 NewIndex)
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (IsEditable() && OriginalIndex >= 0 && NewIndex >= 0)
+	{
+		Implementation->MoveElementTo(OriginalIndex, NewIndex);
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+bool FPropertyHandleArray::IsEditable() const
+{
+	// Property is editable if its a non-const dynamic array
+	return Implementation->HasValidPropertyNode() && !Implementation->IsEditConst() && Implementation->IsPropertyTypeOf(FArrayProperty::StaticClass());
+}
+
+// Localized Text
+bool FPropertyHandleText::Supports(TSharedRef<FPropertyNode> PropertyNode)
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if ( Property == nullptr )
+	{
+		return false;
+	}
+
+	// Supported if the property is a text property only
+	return Property->IsA(FTextProperty::StaticClass());
+}
+
+FPropertyAccess::Result FPropertyHandleText::GetValue(FText& OutValue) const
+{
+	return Implementation->GetValueAsText(OutValue);
+}
+
+FPropertyAccess::Result FPropertyHandleText::SetValue(const FText& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	FString StringValue;
+	FTextStringHelper::WriteToBuffer(StringValue, NewValue);
+	return Implementation->ImportText(StringValue, Flags);
+}
+
+FPropertyAccess::Result FPropertyHandleText::SetValue(const FString& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	return SetValue(FText::FromString(NewValue), Flags);
+}
+
+FPropertyAccess::Result FPropertyHandleText::SetValue(const TCHAR* NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	return SetValue(FText::FromString(NewValue), Flags);
+}
+
+// Sets
+
+bool FPropertyHandleSet::Supports(TSharedRef<FPropertyNode> PropertyNode)
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	return CastField<const FSetProperty>(Property) != nullptr;
+}
+
+bool FPropertyHandleSet::HasDefaultElement()
+{
+	TSharedPtr<FPropertyNode> PropNode = Implementation->GetPropertyNode();
+	if (PropNode.IsValid())
+	{
+		TArray<FObjectBaseAddress> Addresses;
+		Implementation->GetObjectsToModify(Addresses, PropNode.Get());
+
+		if (Addresses.Num() > 0)
+		{
+			const bool IsSparseClassData = PropNode->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) != 0;
+			FSetProperty* SetProperty = CastFieldChecked<FSetProperty>(PropNode->GetProperty());
+			FScriptSetHelper SetHelper(SetProperty, PropNode->GetValueBaseAddress(Addresses[0].StructAddress, IsSparseClassData));
+
+			FDefaultConstructedPropertyElement DefaultElement(SetHelper.ElementProp);
+			return SetHelper.FindElementIndex(DefaultElement.GetObjAddress()) != INDEX_NONE;
+		}
+	}
+
+	return false;
+}
+
+FPropertyAccess::Result FPropertyHandleSet::AddItem()
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (IsEditable())
+	{
+		if (!HasDefaultElement())
+		{
+			Implementation->AddChild();
+			Result = FPropertyAccess::Success;
+		}
+		else
+		{
+			Implementation->ShowInvalidOperationError(LOCTEXT("DuplicateSetElement_Add", "Cannot add a new element to the set while an element with the default value exists"));
+		}
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleSet::Empty()
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (IsEditable())
+	{
+		Implementation->ClearChildren();
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleSet::DeleteItem(int32 Index)
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	TSharedPtr<FPropertyNode> ItemNode;
+
+	if (IsEditable() && Implementation->GetChildNode(Index, ItemNode))
+	{
+		Implementation->DeleteChild(ItemNode);
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleSet::GetNumElements(uint32& OutNumChildren)
+{
+	OutNumChildren = Implementation->GetNumChildren();
+	return FPropertyAccess::Success;
+}
+
+void FPropertyHandleSet::SetOnNumElementsChanged(FSimpleDelegate& OnChildrenChanged)
+{
+	Implementation->SetOnRebuildChildren(OnChildrenChanged);
+}
+
+TSharedPtr<IPropertyHandleSet> FPropertyHandleSet::AsSet()
+{
+	return SharedThis(this);
+}
+
+bool FPropertyHandleSet::IsEditable() const
+{
+	// Property is editable if its a non-const dynamic array
+	return Implementation->HasValidPropertyNode() && !Implementation->IsEditConst() && Implementation->IsPropertyTypeOf(FSetProperty::StaticClass());
+}
+
+// Maps
+
+bool FPropertyHandleMap::Supports(TSharedRef<FPropertyNode> PropertyNode)
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	return CastField<const FMapProperty>(Property) != nullptr;
+}
+
+bool FPropertyHandleMap::HasDefaultKey()
+{
+	TSharedPtr<FPropertyNode> PropNode = Implementation->GetPropertyNode();
+	if (PropNode.IsValid())
+	{
+		TArray<FObjectBaseAddress> Addresses;
+		Implementation->GetObjectsToModify(Addresses, PropNode.Get());
+
+		if (Addresses.Num() > 0)
+		{
+			const bool IsSparseClassData = PropNode->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) != 0;
+			FMapProperty* MapProperty = CastFieldChecked<FMapProperty>(PropNode->GetProperty());
+			FScriptMapHelper MapHelper(MapProperty, PropNode->GetValueBaseAddress(Addresses[0].StructAddress, IsSparseClassData));
+
+			FDefaultConstructedPropertyElement DefaultKey(MapHelper.KeyProp);
+			return MapHelper.FindMapIndexWithKey(DefaultKey.GetObjAddress()) != INDEX_NONE;
+		}
+	}
+
+	return false;
+}
+
+FPropertyAccess::Result FPropertyHandleMap::AddItem()
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (IsEditable())
+	{
+		if ( !HasDefaultKey() )
+		{
+			Implementation->AddChild();
+			Result = FPropertyAccess::Success;
+		}
+		else
+		{
+			Implementation->ShowInvalidOperationError(LOCTEXT("DuplicateMapKey_Add", "Cannot add a new key to the map while a key with the default value exists"));
+		}
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleMap::Empty()
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (IsEditable())
+	{
+		Implementation->ClearChildren();
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleMap::DeleteItem(int32 Index)
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	TSharedPtr<FPropertyNode> ItemNode;
+
+	if (IsEditable() && Implementation->GetChildNode(Index, ItemNode))
+	{
+		Implementation->DeleteChild(ItemNode);
+		Result = FPropertyAccess::Success;
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyHandleMap::GetNumElements(uint32& OutNumChildren)
+{
+	OutNumChildren = Implementation->GetNumChildren();
+	return FPropertyAccess::Success;
+}
+
+void FPropertyHandleMap::SetOnNumElementsChanged(FSimpleDelegate& OnChildrenChanged)
+{
+	Implementation->SetOnRebuildChildren(OnChildrenChanged);
+}
+
+TSharedPtr<IPropertyHandleMap> FPropertyHandleMap::AsMap()
+{
+	return SharedThis(this);
+}
+
+bool FPropertyHandleMap::IsEditable() const
+{
+	// Property is editable if its a non-const dynamic array
+	return Implementation->HasValidPropertyNode() && !Implementation->IsEditConst() && Implementation->IsPropertyTypeOf(FMapProperty::StaticClass());
+}
+
+// FieldPath
+
+bool FPropertyHandleFieldPath::Supports(TSharedRef<FPropertyNode> PropertyNode)
+{
+	FProperty* Property = PropertyNode->GetProperty();
+
+	if (Property == nullptr)
+	{
+		return false;
+	}
+
+	// The value is a field path
+	return Property->IsA<FFieldPathProperty>();
+}
+
+FPropertyAccess::Result FPropertyHandleFieldPath::GetValue(FProperty*& OutValue) const
+{
+	return FPropertyHandleFieldPath::GetValue((const FProperty*&)OutValue);
+}
+
+FPropertyAccess::Result FPropertyHandleFieldPath::GetValue(const FProperty*& OutValue) const
+{
+	void* PropValue = nullptr;
+	FPropertyAccess::Result Res = Implementation->GetValueData(PropValue);
+
+	if (Res == FPropertyAccess::Success)
+	{
+		FProperty* Property = GetProperty();
+		check(Property->IsA(FFieldPathProperty::StaticClass()));
+		const TFieldPath<FProperty>* FieldPathValue = (const TFieldPath<FProperty>*)(PropValue);
+		OutValue = FieldPathValue->Get();
+	}
+
+	return Res;
+}
+
+FPropertyAccess::Result FPropertyHandleFieldPath::SetValue(FProperty* const& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	return FPropertyHandleFieldPath::SetValue((const FProperty*)NewValue);
+}
+
+FPropertyAccess::Result FPropertyHandleFieldPath::SetValue(const FProperty* const& NewValue, EPropertyValueSetFlags::Type Flags)
+{
+	const TSharedPtr<FPropertyNode>& PropertyNode = Implementation->GetPropertyNode();
+
+	if (!PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew))
+	{
+		FString ObjectPathName = NewValue ? NewValue->GetPathName() : TEXT("None");
+		return SetValueFromFormattedString(ObjectPathName, Flags);
+	}
+
+	return FPropertyAccess::Fail;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyHandleImpl.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyHandleImpl.h
new file mode 100644
index 0000000..4e53ad0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyHandleImpl.h
@@ -0,0 +1,743 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/UnrealType.h"
+#include "Widgets/SWidget.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "AssetRegistry/AssetData.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+
+class FNotifyHook;
+class SNotificationItem;
+
+namespace soda
+{
+
+class FPropertyRestriction;
+class IPropertyUtilities;
+
+class FObjectBaseAddress
+{
+public:
+	FObjectBaseAddress() = default;
+	FObjectBaseAddress(UObject* InObject, uint8* InStructAddress, uint8* InBaseAddress)
+		: Object(InObject)
+		, StructAddress(InStructAddress)
+		, BaseAddress(InBaseAddress)
+	{}
+
+	/** Object associated with the value, or null when editing a struct. */
+	UObject* Object = nullptr;
+	/** Pointer to the object/struct instance that actually owns the value (may be pointing to sidecar data). */
+	uint8* StructAddress = nullptr;
+	/** Pointer to the base address of the value within StructAddress. */
+	uint8* BaseAddress = nullptr;
+};
+
+/**
+ * Encapsulates a property node (and property) and provides functionality to read and write to that node     
+ */
+class FPropertyValueImpl
+{
+public:
+	/**
+	 * Constructor
+	 * 
+	 * @param InPropertyNode	The property node containing information about the property to be edited
+	 * @param NotifyHook		Optional notify hook for pre/post edit change messages sent outside of objects being modified
+	 */
+	FPropertyValueImpl( TSharedPtr<FPropertyNode> InPropertyNode, FNotifyHook* InNotifyHook, TSharedPtr<IPropertyUtilities> InPropertyUtilities );
+
+	/**
+	 * Recurse up to the next object node, adding all array indices into a map according to their property name
+	 * @param ArrayIndexMap - for the current object, what properties use which array offsets
+	 * @param InNode - node to start adding array offsets for.  This function will move upward until it gets to an object node
+	 */
+	static void GenerateArrayIndexMapToObjectNode( TMap<FString,int32>& OutArrayIndexMap, FPropertyNode* PropertyNode );
+
+	/**
+	 * Gets the value as a string formatted for multiple values in an array                 
+	 */
+	FString GetPropertyValueArray() const;
+
+	/**
+	 * Enumerate the objects that need to be modified from the passed in property node
+	 *
+	 * @param InPropertyNode			The property node to get objects from
+	 * @param InObjectsToModifyCallback	The function to call for each object
+	 */
+	typedef TFunctionRef<bool(const FObjectBaseAddress& /*ObjectToModify*/, const int32 /*ObjectIndex*/, const int32 /*NumObjects*/)> EnumerateObjectsToModifyFuncRef; /** Return true to continue enumeration */
+	void EnumerateObjectsToModify( FPropertyNode* InPropertyNode, const EnumerateObjectsToModifyFuncRef& InObjectsToModifyCallback ) const;
+
+	/**
+	 * Gets the objects that need to be modified from the passed in property node
+	 * 
+	 * @param ObjectsToModify	The addresses of the objects to modify
+	 * @param InPropertyNode	The property node to get objects from
+	 */
+	void GetObjectsToModify( TArray<FObjectBaseAddress>& ObjectsToModify, FPropertyNode* InPropertyNode ) const;
+
+	/**
+	 * Gets the union of values with the appropriate type for the property set
+	 *
+	 * @param OutAddress	The location of the property value
+	 * @return The result of the query 
+	 */
+	FPropertyAccess::Result GetValueData( void*& OutAddress ) const;
+
+	/**
+	 * Given an address and a property type, get the actual value out
+	 *
+	 * @param Address	The location of the property value
+	 * @return The property value
+	 */
+	template<class TProperty>
+	typename TProperty::TCppType GetPropertyValue(void const* Address) const
+	{
+		TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+		check(PropertyNodePin.IsValid());
+		return CastFieldChecked<TProperty>(PropertyNodePin->GetProperty())->GetPropertyValue(Address);
+	}
+
+	/**
+	 * Given an address, get the actual UObject* value out
+	 *
+	 * @param Address	The location of the property value
+	 * @return The object property value
+	 */
+	UObject* GetObjectPropertyValue(void const* Address) const
+	{
+		TSharedPtr<FPropertyNode> PropertyNodePin = PropertyNode.Pin();
+		check(PropertyNodePin.IsValid());
+		return CastFieldChecked<FObjectPropertyBase>(PropertyNodePin->GetProperty())->GetObjectPropertyValue(Address);
+	}
+
+
+	/**
+	 * The core functionality for setting values on a property
+	 *
+	 * @param	The value formatted as a string
+	 * @return	The result of attempting to set the value
+	 */
+	FPropertyAccess::Result ImportText( const FString& InValue, EPropertyValueSetFlags::Type Flags );
+	FPropertyAccess::Result ImportText( const FString& InValue, FPropertyNode* PropertyNode, EPropertyValueSetFlags::Type Flags );
+	FPropertyAccess::Result ImportText( const TArray<FObjectBaseAddress>& InObjects, const TArray<FString>& InValues, FPropertyNode* PropertyNode, EPropertyValueSetFlags::Type Flags );
+
+	/**
+	 * Enumerate the raw data of this property.  (Each pointer can be cast to the property data type)
+	 *
+	 * @param InRawDataCallback		The function to call for each data
+	 */ 
+	void EnumerateRawData( const IPropertyHandle::EnumerateRawDataFuncRef& InRawDataCallback );
+	void EnumerateConstRawData( const IPropertyHandle::EnumerateConstRawDataFuncRef& InRawDataCallback ) const;
+
+	/**
+	 * Accesses the raw data of this property. 
+	 *
+	 * @param RawData	An array of raw data. 
+	 */ 
+	void AccessRawData( TArray<void*>& RawData );
+	void AccessRawData( TArray<const void*>& RawData ) const;
+
+	/**
+	 * Sets a delegate to call when the property value changes
+	 */
+	void SetOnPropertyValueChanged( const FSimpleDelegate& InOnPropertyValueChanged );
+	
+	/**
+	 * Sets a delegate to call when the propery value of a child changes
+	 */
+	void SetOnChildPropertyValueChanged( const FSimpleDelegate& InOnChildPropertyValueChanged );
+
+	/**
+	 * Sets a delegate to call when the property value is about to change
+	 */
+	void SetOnPropertyValuePreChange(const FSimpleDelegate& InOnPropertyValuePreChange);
+
+	/**
+	 * Sets a delegate to call when the propery value of a child is about to change
+	 */
+	void SetOnChildPropertyValuePreChange(const FSimpleDelegate& InOnChildPropertyValuePreChange);
+
+	/**
+	 * Sets a delegate to call when a property is reset to default
+	 */
+	void SetOnPropertyResetToDefault(const FSimpleDelegate& InOnPropertyResetToDefault);
+
+	/**
+	 * Sets a delegate to call when children of the property node must be rebuilt
+	 */
+	void SetOnRebuildChildren( const FSimpleDelegate& InOnRebuildChildren );
+
+	/**
+	 * Get the value of a property as a formatted string.
+	 * Each FProperty has a specific string format that it sets
+	 *
+	 * @param OutValue	The formatted string value to set
+	 * @param PortFlags	Determines how the property's value is accessed. Defaults to PPF_PropertyWindow
+	 * @return The result of attempting to get the value
+	 */
+	FPropertyAccess::Result GetValueAsString( FString& OutString, EPropertyPortFlags PortFlags = PPF_PropertyWindow ) const;
+
+	/**
+	 * Get the value of a property as a formatted string, possibly using an alternate form more suitable for display in the UI
+	 *
+	 * @param OutValue	The formatted string value to set
+	 * @param PortFlags	Determines how the property's value is accessed. 
+	 * @return The result of attempting to get the value
+	 */
+	FPropertyAccess::Result GetValueAsDisplayString( FString& OutString, EPropertyPortFlags PortFlags ) const;
+
+	/**
+	 * Get the value of a property as FText.
+	 *
+	 * @param OutValue The formatted text value to set
+	 * @return The result of attempting to get the value
+	 */
+	FPropertyAccess::Result GetValueAsText( FText& OutText ) const;
+
+	/**
+	 * Get the value of a property as FText, possibly using an alternate form more suitable for display in the UI
+	 *
+	 * @param OutValue The formatted text value to set
+	 * @return The result of attempting to get the value
+	 */
+	FPropertyAccess::Result GetValueAsDisplayText( FText& OutText ) const;
+
+	/**
+	 * Sets the value of a property formatted from a string.
+	 * Each FProperty has a specific string format it requires
+	 *
+	 * @param InValue The formatted string value to set
+	 * @return The result of attempting to set the value
+	 */
+	FPropertyAccess::Result SetValueAsString( const FString& InValue, EPropertyValueSetFlags::Type Flags );
+
+	/**
+	 * Returns whether or not a property is of a specific subclass of FProperty
+	 *
+	 * @param ClassType	The class type to check
+	 * @param true if the property is a ClassType
+	 */
+	bool IsPropertyTypeOf( FFieldClass* ClassType ) const ;
+	
+	/**
+	 * @return The property node used by this value
+	 */
+	TSharedPtr<FPropertyNode> GetPropertyNode() const;
+
+	/**
+	 * @return The number of children the property node has
+	 */
+	int32 GetNumChildren() const;
+
+	/**
+	 * Gets a child node of the property node
+	 * 
+	 * @param ChildName	The name of the child to get
+	 * @return The child property node or nullptr if it doesnt exist
+	 */
+	TSharedPtr<FPropertyNode> GetChildNode( FName ChildName, bool bRecurse = true ) const;
+
+	/**
+	 * Gets a child node of the property node
+	 * 
+	 * @param ChildIndex	The child index where the child is stored
+	 * @return The child property node or nullptr if it doesnt exist
+	 */
+	TSharedPtr<FPropertyNode> GetChildNode( int32 ChildIndex ) const ;
+
+	/**
+	 * Gets a child of the property node that has the given array index
+	 *
+	 * @param ChildArrayIndex	The array index we're searching for. This is not necessarily the same value as the index where the child is stored
+	 * @param OutChildNode		The child property node whose array index matches ChildArrayIndex, or nullptr if it could not be found
+	 * @return True if a matching child property node was found, false otherwise
+	 */
+	bool GetChildNode(const int32 ChildArrayIndex, TSharedPtr<FPropertyNode>& OutChildNode) const;
+
+	/**
+	 * Rests the value to its default value
+	 */
+	void ResetToDefault() ;
+
+	/**
+	 * @return true if the property value differs from its default value
+	 */
+	bool DiffersFromDefault() const ;
+
+	/**
+	 * @return true if the property  is edit const and cannot be changed
+	 */
+	bool IsEditConst() const;
+
+	/**
+	 * @return The label to use for displaying reset to default values
+	 */
+	FText GetResetToDefaultLabel() const;
+
+	/**
+	 * Adds a child to the property node (container properties only)
+	 */
+	void AddChild();
+
+	/**
+	 * Removes all children from the property node (container properties only)
+	 */
+	void ClearChildren();
+
+	/** 
+	 * Inserts a child at Index (arrays only)
+	 */ 
+	void InsertChild( int32 Index );
+
+	/**
+	 * Inserts a child at the index provided by the child node (arrays only)
+	 */
+	void InsertChild( TSharedPtr<FPropertyNode> ChildNodeToInsertAfter );
+
+	/** 
+	 * Duplicates the child at Index (containers only)
+	 */ 
+	void DuplicateChild( int32 Index );
+
+	/**
+	 * Duplicates the provided child (containers only)                                                             
+	 */
+	void DuplicateChild( TSharedPtr<FPropertyNode> ChildNodeToDuplicate );
+
+	/** 
+	 * Deletes the child at Index (containers only)
+	 */ 
+	void DeleteChild( int32 Index );
+
+	/** 
+	 * Deletes the provided child (containers only)
+	 */ 
+	void DeleteChild( TSharedPtr<FPropertyNode> ChildNodeToDelete );
+
+	/** 
+	 * Swaps the children at FirstIndex and SecondIndex
+	 */ 
+	void SwapChildren( int32 FirstIndex, int32 SecondIndex );
+
+	/** 
+	 * Swaps the children provided children (containers only)
+	 */ 
+	void SwapChildren( TSharedPtr<FPropertyNode> FirstChildNode, TSharedPtr<FPropertyNode> SecondChildNode );
+
+	/**
+	* Moves the element at OriginalIndex to NewIndex
+	*/
+	void MoveElementTo(int32 OriginalIndex, int32 NewIndex);
+
+	/**
+	 * @return true if the property node is valid
+	 */
+	bool HasValidPropertyNode() const;
+
+	/**
+	 * @return The display name of the property
+	 */
+	FText GetDisplayName() const;
+
+	/** @return The notify hook being used */
+	FNotifyHook* GetNotifyHook() const { return NotifyHook; }
+
+	TSharedPtr<IPropertyUtilities> GetPropertyUtilities() const { return PropertyUtilities.Pin(); }
+
+	void ShowInvalidOperationError(const FText& ErrorText);
+
+protected:
+	/** Property node used to access FProperty and address of object to change */
+	TWeakPtr<FPropertyNode> PropertyNode;
+	TWeakPtr<IPropertyUtilities> PropertyUtilities;
+	/** Notify hook to call when properties change */
+	FNotifyHook* NotifyHook;
+	/** Set true if a change was made with bFinished=false */
+	bool bInteractiveChangeInProgress;
+
+private:
+	TWeakPtr<SNotificationItem> InvalidOperationError;
+};
+
+#define DECLARE_PROPERTY_ACCESSOR( ValueType ) \
+	virtual FPropertyAccess::Result SetValue( ValueType const& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override; \
+	virtual FPropertyAccess::Result GetValue( ValueType& OutValue ) const override; 
+
+class FDetailCategoryImpl;
+
+/**
+ * The base implementation of a property handle
+ */
+class FPropertyHandleBase : public IPropertyHandle
+{
+public:
+	FPropertyHandleBase( TSharedPtr<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+
+	/** IPropertyHandle interface */
+	DECLARE_PROPERTY_ACCESSOR( bool )
+	DECLARE_PROPERTY_ACCESSOR( int8 )
+	DECLARE_PROPERTY_ACCESSOR( int16)
+	DECLARE_PROPERTY_ACCESSOR( int32 )
+	DECLARE_PROPERTY_ACCESSOR( int64 )
+	DECLARE_PROPERTY_ACCESSOR( uint8 )
+	DECLARE_PROPERTY_ACCESSOR( uint16 )
+	DECLARE_PROPERTY_ACCESSOR( uint32 )
+	DECLARE_PROPERTY_ACCESSOR( uint64 )
+	DECLARE_PROPERTY_ACCESSOR( float )
+	DECLARE_PROPERTY_ACCESSOR( double )
+	DECLARE_PROPERTY_ACCESSOR( FString )
+	DECLARE_PROPERTY_ACCESSOR( FText )
+	DECLARE_PROPERTY_ACCESSOR( FName )
+	DECLARE_PROPERTY_ACCESSOR( FVector )
+	DECLARE_PROPERTY_ACCESSOR( FVector2D )
+	DECLARE_PROPERTY_ACCESSOR( FVector4 )
+	DECLARE_PROPERTY_ACCESSOR( FQuat )
+	DECLARE_PROPERTY_ACCESSOR( FRotator )
+	DECLARE_PROPERTY_ACCESSOR( UObject* )
+	DECLARE_PROPERTY_ACCESSOR( const UObject* )
+	DECLARE_PROPERTY_ACCESSOR( FAssetData )
+	DECLARE_PROPERTY_ACCESSOR( FProperty* )
+	DECLARE_PROPERTY_ACCESSOR( const FProperty* )
+	virtual FPropertyAccess::Result GetValueData(void*& OutAddress) const override;
+
+	virtual FPropertyAccess::Result SetValue( const TCHAR* InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	/** IPropertyHandle interface */
+	virtual bool IsValidHandle() const override;
+	virtual FText GetPropertyDisplayName() const override;
+	virtual void SetPropertyDisplayName(FText InDisplayName) override;
+	virtual void ResetToDefault() override;
+	virtual bool DiffersFromDefault() const override;
+	virtual FText GetResetToDefaultLabel() const override;
+	virtual void MarkHiddenByCustomization() override;
+	virtual void MarkResetToDefaultCustomized(bool bCustomized = true) override;
+	virtual void ClearResetToDefaultCustomized() override;
+	virtual bool IsCustomized() const override;
+	virtual bool IsResetToDefaultCustomized() const override;
+	virtual FString GeneratePathToProperty() const override;
+	virtual TSharedRef<SWidget> CreatePropertyNameWidget( const FText& NameOverride = FText::GetEmpty(), const FText& ToolTipOverride = FText::GetEmpty(), bool bDisplayResetToDefault = false, bool bDisplayText = true, bool bDisplayThumbnail = true ) const override;
+	virtual TSharedRef<SWidget> CreatePropertyValueWidget( bool bDisplayDefaultPropertyButtons = true ) const override;
+	virtual TSharedRef<SWidget> CreateDefaultPropertyButtonWidgets() const override;
+	virtual void CreateDefaultPropertyCopyPasteActions(FUIAction& OutCopyAction, FUIAction& OutPasteAction) const override;
+	virtual bool IsEditConst() const override;
+	virtual bool IsEditable() const override;
+	virtual void SetOnPropertyValueChanged( const FSimpleDelegate& InOnPropertyValueChanged ) override;
+	virtual void SetOnChildPropertyValueChanged( const FSimpleDelegate& InOnPropertyValueChanged ) override;
+	virtual void SetOnPropertyValuePreChange(const FSimpleDelegate& InOnPropertyValuePreChange) override;
+	virtual void SetOnChildPropertyValuePreChange(const FSimpleDelegate& InOnPropertyValuePreChange) override;
+	virtual void SetOnPropertyResetToDefault(const FSimpleDelegate& InOnPropertyResetToDefault) override;
+
+	virtual int32 GetIndexInArray() const override;
+	virtual FPropertyAccess::Result GetValueAsFormattedString( FString& OutValue, EPropertyPortFlags PortFlags = PPF_PropertyWindow ) const override;
+	virtual FPropertyAccess::Result GetValueAsDisplayString( FString& OutValue, EPropertyPortFlags PortFlags = PPF_PropertyWindow) const override;
+	virtual FPropertyAccess::Result GetValueAsFormattedText( FText& OutValue ) const override;
+	virtual FPropertyAccess::Result GetValueAsDisplayText( FText& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValueFromFormattedString( const FString& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+	virtual TSharedPtr<IPropertyHandle> GetChildHandle( uint32 ChildIndex ) const override;
+	virtual TSharedPtr<IPropertyHandle> GetChildHandle( FName ChildName, bool bRecurse = true ) const override;
+	virtual TSharedPtr<IPropertyHandle> GetParentHandle() const override;
+	virtual TSharedPtr<IPropertyHandle> GetKeyHandle() const override;
+	virtual void EnumerateRawData( const EnumerateRawDataFuncRef& InRawDataCallback ) override;
+	virtual void EnumerateConstRawData( const EnumerateConstRawDataFuncRef& InRawDataCallback ) const override;
+	virtual void AccessRawData( TArray<void*>& RawData ) override;
+	virtual void AccessRawData( TArray<const void*>& RawData ) const override;
+	virtual uint32 GetNumOuterObjects() const override;
+	virtual void GetOuterObjects(TArray<UObject*>& OuterObjects) const override;
+	virtual const UClass* GetOuterBaseClass() const override;
+	virtual void ReplaceOuterObjects(const TArray<UObject*>& OuterObjects) override;
+	virtual void GetOuterPackages(TArray<UPackage*>& OuterPackages) const override;
+	virtual FPropertyAccess::Result GetNumChildren( uint32& OutNumChildren ) const override;
+	virtual TSharedPtr<IPropertyHandleArray> AsArray() override { return nullptr; }
+	virtual TSharedPtr<IPropertyHandleSet> AsSet() override { return nullptr; }
+	virtual TSharedPtr<IPropertyHandleMap> AsMap() override { return nullptr; }
+	virtual const FFieldClass* GetPropertyClass() const override;
+	virtual FProperty* GetProperty() const override;
+	virtual FProperty* GetMetaDataProperty() const override;
+	virtual bool HasMetaData(const FName& Key) const override;
+	virtual const FString& GetMetaData(const FName& Key) const override;
+	virtual bool GetBoolMetaData(const FName& Key) const override;
+	virtual int32 GetIntMetaData(const FName& Key) const override;
+	virtual float GetFloatMetaData(const FName& Key) const override;
+	virtual UClass* GetClassMetaData(const FName& Key) const override;
+	virtual void SetInstanceMetaData(const FName& Key, const FString& Value) override;
+	virtual const FString* GetInstanceMetaData(const FName& Key) const override;
+	virtual const TMap<FName, FString>* GetInstanceMetaDataMap() const override;	
+	virtual FText GetToolTipText() const override;
+	virtual void SetToolTipText(const FText& ToolTip) override;
+	virtual bool HasDocumentation() override { return false; }
+	virtual FString GetDocumentationLink() override { return FString(); }
+	virtual FString GetDocumentationExcerptName() override { return FString(); }
+	virtual uint8* GetValueBaseAddress( uint8* Base ) const override;
+	virtual int32 GetNumPerObjectValues() const override;
+	virtual FPropertyAccess::Result SetPerObjectValues( const TArray<FString>& InPerObjectValues,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+	virtual FPropertyAccess::Result GetPerObjectValues( TArray<FString>& OutPerObjectValues ) const override;
+	virtual FPropertyAccess::Result SetPerObjectValue( const int32 ObjectIndex, const FString& ObjectValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+	virtual FPropertyAccess::Result GetPerObjectValue( const int32 ObjectIndex, FString& OutObjectValue ) const override;
+	virtual bool GeneratePossibleValues(TArray< TSharedPtr<FString> >& OutOptionStrings, TArray< FText >& OutToolTips, TArray<bool>& OutRestrictedItems) override;
+	virtual FPropertyAccess::Result SetObjectValueFromSelection() override;
+	virtual void NotifyPreChange() override;
+	virtual void NotifyPostChange(EPropertyChangeType::Type ChangeType) override;
+	virtual void NotifyFinishedChangingProperties() override;
+	virtual void AddRestriction(TSharedRef<const FPropertyRestriction> Restriction) override;
+	virtual bool IsHidden(const FString& Value) const override;
+	virtual bool IsHidden(const FString& Value, TArray<FText>& OutReasons) const override;
+	virtual bool IsDisabled(const FString& Value) const override;
+	virtual bool IsDisabled(const FString& Value, TArray<FText>& OutReasons) const override;
+	virtual bool IsRestricted(const FString& Value) const override;
+	virtual bool IsRestricted(const FString& Value, TArray<FText>& OutReasons) const override;
+	virtual bool GenerateRestrictionToolTip(const FString& Value, FText& OutTooltip) const override;
+	virtual void SetIgnoreValidation(bool bInIgnore) override;
+	virtual TArray<TSharedPtr<IPropertyHandle>> AddChildStructure(TSharedRef<FStructOnScope> ChildStructure) override;
+	virtual bool CanResetToDefault() const override;
+	virtual void ExecuteCustomResetToDefault(const FResetToDefaultOverride& InOnCustomResetToDefault) override;
+	virtual FName GetDefaultCategoryName() const override;
+	virtual FText GetDefaultCategoryText() const override;
+
+	TSharedPtr<FPropertyNode> GetPropertyNode() const;
+	void OnCustomResetToDefault(const FResetToDefaultOverride& OnCustomResetToDefault);
+
+private:
+	static void CopyValueToClipboard(TWeakPtr<FPropertyValueImpl> ImplementationWeak);
+	static void PasteValueFromClipboard(TWeakPtr<FPropertyValueImpl> ImplementationWeak);
+
+protected:
+	TSharedPtr<FPropertyValueImpl> Implementation;
+};
+
+class FPropertyHandleInt : public FPropertyHandleBase
+{	
+public:
+	FPropertyHandleInt( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+
+	virtual FPropertyAccess::Result GetValue(int8& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue(const int8& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	virtual FPropertyAccess::Result GetValue(int16& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const int16& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+
+	virtual FPropertyAccess::Result GetValue(int32& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const int32& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+
+	virtual FPropertyAccess::Result GetValue(int64& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const int64& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+
+	virtual FPropertyAccess::Result GetValue(uint16& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const uint16& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+
+	virtual FPropertyAccess::Result GetValue(uint32& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const uint32& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+
+	virtual FPropertyAccess::Result GetValue(uint64& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const uint64& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+};
+
+class FPropertyHandleFloat : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleFloat( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( float& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const float& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+};
+
+class FPropertyHandleDouble : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleDouble( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( double& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const double& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+};
+
+class FPropertyHandleBool : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleBool( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( bool& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const bool& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+};
+
+class FPropertyHandleByte : public FPropertyHandleBase
+{	
+public:
+	FPropertyHandleByte( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( uint8& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const uint8& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+};
+
+class FPropertyHandleString : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleString( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook,TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( FString& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FString& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+	virtual FPropertyAccess::Result SetValue( const TCHAR* InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	virtual FPropertyAccess::Result GetValue( FName& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FName& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+};
+
+class FPropertyHandleObject : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleObject( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( UObject*& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( UObject* const& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+	virtual FPropertyAccess::Result GetValue( const UObject*& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const UObject* const& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+	virtual FPropertyAccess::Result GetValue( FAssetData& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FAssetData& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+	virtual FPropertyAccess::Result SetValueFromFormattedString(const FString& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+	FPropertyAccess::Result SetValueFromFormattedString(const FString& InValue, EPropertyValueSetFlags::Type Flags, bool bSkipResolve);
+	virtual FPropertyAccess::Result SetObjectValueFromSelection() override;
+};
+
+// LWC_TODO: Replace with FPropertyHandleDouble once all types support it
+class FPropertyHandleMixed : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleMixed(TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities);
+	static bool Supports(TSharedRef<FPropertyNode> PropertyNode);
+	virtual FPropertyAccess::Result GetValue(float& OutValue) const override;
+	virtual FPropertyAccess::Result GetValue(double& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const float& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+	virtual FPropertyAccess::Result SetValue(const double& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+};
+
+class FPropertyHandleVector : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleVector( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( FVector& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FVector& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	virtual FPropertyAccess::Result GetValue( FVector2D& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FVector2D& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	virtual FPropertyAccess::Result GetValue( FVector4& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FVector4& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	virtual FPropertyAccess::Result GetValue( FQuat& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FQuat& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	virtual FPropertyAccess::Result SetX(double InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags);
+	virtual FPropertyAccess::Result SetY(double InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags);
+	virtual FPropertyAccess::Result SetZ(double InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags);
+	virtual FPropertyAccess::Result SetW(double InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags);
+private:
+	TArray< TSharedPtr<FPropertyHandleMixed> > VectorComponents;	
+};
+
+class FPropertyHandleRotator : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleRotator( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities  );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	virtual FPropertyAccess::Result GetValue( FRotator& OutValue ) const override;
+	virtual FPropertyAccess::Result SetValue( const FRotator& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) override;
+
+	virtual FPropertyAccess::Result SetRoll( double InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags );
+	virtual FPropertyAccess::Result SetPitch( double InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags );
+	virtual FPropertyAccess::Result SetYaw( double InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags );
+private:
+	TSharedPtr<FPropertyHandleMixed> RollValue;
+	TSharedPtr<FPropertyHandleMixed> PitchValue;
+	TSharedPtr<FPropertyHandleMixed> YawValue;
+};
+
+
+class FPropertyHandleArray : public FPropertyHandleBase, public IPropertyHandleArray
+{
+public:
+	FPropertyHandleArray( TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities );
+	static bool Supports( TSharedRef<FPropertyNode> PropertyNode );
+	/** IPropertyHandleArray interface */
+	virtual FPropertyAccess::Result AddItem() override;
+	virtual FPropertyAccess::Result EmptyArray() override;
+	virtual FPropertyAccess::Result Insert( int32 Index ) override;
+	virtual FPropertyAccess::Result DuplicateItem( int32 Index ) override;
+	virtual FPropertyAccess::Result DeleteItem( int32 Index ) override;
+	virtual FPropertyAccess::Result SwapItems(int32 FirstIndex, int32 SecondIndex) override;
+	virtual FPropertyAccess::Result GetNumElements( uint32& OutNumItems ) const override;
+	virtual void SetOnNumElementsChanged( FSimpleDelegate& InOnNumElementsChanged ) override;
+	virtual TSharedPtr<IPropertyHandleArray> AsArray() override;
+	virtual TSharedRef<IPropertyHandle> GetElement( int32 Index ) const override;
+	virtual FPropertyAccess::Result MoveElementTo(int32 OriginalIndex, int32 NewIndex) override;
+	virtual bool IsEditable() const override;
+};
+
+class FPropertyHandleText : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleText(TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook,TSharedPtr<IPropertyUtilities> PropertyUtilities);
+	static bool Supports(TSharedRef<FPropertyNode> PropertyNode);
+	virtual FPropertyAccess::Result GetValue(FText& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const FText& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+
+	virtual FPropertyAccess::Result SetValue(const FString& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+	virtual FPropertyAccess::Result SetValue(const TCHAR* InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+};
+
+class FPropertyHandleSet : public FPropertyHandleBase, public IPropertyHandleSet
+{
+public:
+	FPropertyHandleSet(TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities);
+	static bool Supports(TSharedRef<FPropertyNode> PropertyNode);
+	virtual TSharedPtr<IPropertyHandleSet> AsSet() override;
+
+	/** IPropertyHandleSet Interface */
+	virtual bool HasDefaultElement() override;
+	virtual FPropertyAccess::Result AddItem() override;
+	virtual FPropertyAccess::Result Empty() override;
+	virtual FPropertyAccess::Result DeleteItem(int32 Index) override;
+	virtual FPropertyAccess::Result GetNumElements(uint32& OutNumElements) override;
+	virtual void SetOnNumElementsChanged(FSimpleDelegate& InOnNumElementsChanged) override;
+	virtual bool HasDocumentation() override { return true; }
+	virtual FString GetDocumentationLink() override { return FString("Engine/UI/LevelEditor/Details/Properties/Set/"); }
+	virtual FString GetDocumentationExcerptName() override { return FString("Sets"); }
+	virtual bool IsEditable() const override;
+};
+
+class FPropertyHandleMap : public FPropertyHandleBase, public IPropertyHandleMap
+{
+public:
+	FPropertyHandleMap(TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities);
+	static bool Supports(TSharedRef<FPropertyNode> PropertyNode);
+	virtual TSharedPtr<IPropertyHandleMap> AsMap() override;
+
+	/** IPropertyHandleMap Interface */
+	virtual bool HasDefaultKey() override;
+	virtual FPropertyAccess::Result AddItem() override;
+	virtual FPropertyAccess::Result Empty() override;
+	virtual FPropertyAccess::Result DeleteItem(int32 Index) override;
+	virtual FPropertyAccess::Result GetNumElements(uint32& OutNumElements) override;
+	virtual void SetOnNumElementsChanged(FSimpleDelegate& InOnNumElementsChanged) override;
+	virtual bool HasDocumentation() override { return true; }
+	virtual FString GetDocumentationLink() override { return FString("Engine/UI/LevelEditor/Details/Properties/Map/"); }
+	virtual FString GetDocumentationExcerptName() override { return FString("Maps"); }
+	virtual bool IsEditable() const override;
+};
+
+class FPropertyHandleFieldPath : public FPropertyHandleBase
+{
+public:
+	FPropertyHandleFieldPath(TSharedRef<FPropertyNode> PropertyNode, FNotifyHook* NotifyHook, TSharedPtr<IPropertyUtilities> PropertyUtilities);
+	static bool Supports(TSharedRef<FPropertyNode> PropertyNode);
+	virtual FPropertyAccess::Result GetValue(FProperty*& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(FProperty* const& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+	virtual FPropertyAccess::Result GetValue(const FProperty*& OutValue) const override;
+	virtual FPropertyAccess::Result SetValue(const FProperty* const& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) override;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyNode.cpp
new file mode 100644
index 0000000..1dfcb41
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyNode.cpp
@@ -0,0 +1,3965 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Serialization/ArchiveReplaceObjectRef.h"
+#include "Components/ActorComponent.h"
+//#include "Editor/UnrealEdEngine.h"
+//#include "Engine/UserDefinedStruct.h"
+#include "RuntimePropertyEditor/EditConditionContext.h"
+//#include "UnrealEdGlobals.h"
+//#include "ScopedTransaction.h"
+#include "RuntimePropertyEditor/PropertyRestriction.h"
+//#include "Kismet2/StructureEditorUtils.h"
+//#include "Kismet2/BlueprintEditorUtils.h"
+#include "Misc/ScopeExit.h"
+//#include "Editor.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "RuntimePropertyEditor/PropertyTextUtilities.h"
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+//#include "EditorSupportDelegates.h"
+#include "UObject/ConstructorHelpers.h"
+#include "InstancedReferenceSubobjectHelper.h"
+
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "UObject/MetaData.h"
+#include "UObject/TextProperty.h"
+#include "UObject/EnumProperty.h"
+#include "UObject/UnrealType.h"
+#include "Misc/NotifyHook.h"
+#include "Misc/App.h"
+#include "Engine/Level.h"
+#include "Containers/Deque.h"
+
+#include "IEditableObject.h"
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyNode"
+
+namespace soda
+{
+
+FEditConditionParser FPropertyNode::EditConditionParser;
+
+FPropertySettings& FPropertySettings::Get()
+{
+	static FPropertySettings Settings;
+
+	return Settings;
+}
+
+FPropertySettings::FPropertySettings()
+	: bShowFriendlyPropertyNames( true )
+	, bExpandDistributions( false )
+	, bShowHiddenProperties(false)
+{
+	GConfig->GetBool(TEXT("PropertySettings"), TEXT("ShowHiddenProperties"), bShowHiddenProperties, GEditorPerProjectIni);
+	GConfig->GetBool(TEXT("PropertySettings"), TEXT("ShowFriendlyPropertyNames"), bShowFriendlyPropertyNames, GEditorPerProjectIni);
+	GConfig->GetBool(TEXT("PropertySettings"), TEXT("ExpandDistributions"), bExpandDistributions, GEditorPerProjectIni);
+}
+
+DEFINE_LOG_CATEGORY(LogPropertyNode);
+
+static FObjectPropertyNode* NotifyFindObjectItemParent(FPropertyNode* InNode)
+{
+	FObjectPropertyNode* Result = NULL;
+	check(InNode);
+	FPropertyNode* ParentNode = InNode->GetParentNode(); 
+	if (ParentNode)
+	{
+		Result = ParentNode->FindObjectItemParent();
+	}
+	return Result;
+}
+
+FPropertyNode::FPropertyNode()
+	: Property(nullptr)
+	, ArrayOffset(0)
+	, ArrayIndex(-1)
+	, MaxChildDepthAllowed(FPropertyNodeConstants::NoDepthRestrictions)
+	, PropertyNodeFlags (EPropertyNodeFlags::NoFlags)
+	, bRebuildChildrenRequested( false )
+	, bChildrenRebuilt(false)
+	, bIgnoreInstancedReference(false)
+	, PropertyPath(TEXT(""))
+	, bIsEditConst(false)
+	, bUpdateEditConstState(true)
+	, bDiffersFromDefault(false)
+	, bUpdateDiffersFromDefault(true)
+{
+}
+
+FPropertyNode::~FPropertyNode()
+{
+	DestroyTree();
+}
+
+void FPropertyNode::InitNode(const FPropertyNodeInitParams& InitParams)
+{
+	//Dismantle the previous tree
+	DestroyTree();
+
+	//tree hierarchy
+	check(InitParams.ParentNode.Get() != this);
+	ParentNodeWeakPtr = InitParams.ParentNode;
+	
+	//Property Data
+	Property = InitParams.Property;
+	ArrayOffset = InitParams.ArrayOffset;
+	ArrayIndex = InitParams.ArrayIndex;
+
+	bool bIsSparse = InitParams.IsSparseProperty == FPropertyNodeInitParams::EIsSparseDataProperty::True;
+
+	TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (ParentNode.IsValid() && InitParams.IsSparseProperty == FPropertyNodeInitParams::EIsSparseDataProperty::Inherit)
+	{
+		//default to parents max child depth
+		MaxChildDepthAllowed = ParentNode->MaxChildDepthAllowed;
+		//if limitless or has hit the full limit
+		if (MaxChildDepthAllowed > 0)
+		{
+			--MaxChildDepthAllowed;
+		}
+
+		// if the parent node's property is sparse data, our property must be too
+		bIsSparse = bIsSparse || ParentNode->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData);
+	}
+
+	// Property is advanced if it is marked advanced or the entire class is advanced and the property not marked as simple
+	static const FName Name_AdvancedClassDisplay("AdvancedClassDisplay");
+	bool bAdvanced = Property.IsValid() ? ( Property->HasAnyPropertyFlags(CPF_AdvancedDisplay) || ( !Property->HasAnyPropertyFlags( CPF_SimpleDisplay ) && Property->GetOwnerClass() && FRuntimeMetaData::GetBoolMetaData(Property->GetOwnerClass(), Name_AdvancedClassDisplay) ) ) : false;
+
+	PropertyNodeFlags = EPropertyNodeFlags::NoFlags;
+	SetNodeFlags(EPropertyNodeFlags::IsSparseClassData, bIsSparse);
+
+	static const FName Name_ShouldShowInViewport("ShouldShowInViewport");
+	bool bShouldShowInViewport = Property.IsValid() ? FRuntimeMetaData::GetBoolMetaData(Property.Get(), Name_ShouldShowInViewport) : false;
+	SetNodeFlags(EPropertyNodeFlags::ShouldShowInViewport, bShouldShowInViewport);
+
+	//default to copying from the parent
+	if (ParentNode)
+	{
+		if (ParentNode->HasNodeFlags(EPropertyNodeFlags::ShowCategories))
+		{
+			SetNodeFlags(EPropertyNodeFlags::ShowCategories, true);
+		}
+		else
+		{
+			SetNodeFlags(EPropertyNodeFlags::ShowCategories, false);
+		}
+
+		// We are advanced if our parent is advanced or our property is marked as advanced
+		SetNodeFlags(EPropertyNodeFlags::IsAdvanced, ParentNode->HasNodeFlags(EPropertyNodeFlags::IsAdvanced) || bAdvanced );
+	}
+	else
+	{
+		SetNodeFlags(EPropertyNodeFlags::ShowCategories, InitParams.bCreateCategoryNodes );
+	}
+
+	SetNodeFlags(EPropertyNodeFlags::ShouldShowHiddenProperties, InitParams.bForceHiddenPropertyVisibility);
+	SetNodeFlags(EPropertyNodeFlags::ShouldShowDisableEditOnInstance, InitParams.bCreateDisableEditOnInstanceNodes);
+	SetNodeFlags(EPropertyNodeFlags::GameModeOnlyVisible, InitParams.bGameModeOnlyVisible);
+
+	//Custom code run prior to setting property flags
+	//needs to happen after the above SetNodeFlags calls so that ObjectPropertyNode can properly respond to CollapseCategories
+	InitBeforeNodeFlags();
+
+	bool bIsEditInlineNew = false;
+	bool bShowInnerObjectProperties = false;
+	const FProperty* MyProperty = Property.Get();
+	if (MyProperty == nullptr)
+	{
+		// Disable all flags if no property is bound.
+		SetNodeFlags(EPropertyNodeFlags::SingleSelectOnly | EPropertyNodeFlags::EditInlineNew | EPropertyNodeFlags::ShowInnerObjectProperties, false);
+	}
+	else
+	{
+		const bool GotReadAddresses = GetReadAddressUncached( *this, false, nullptr, false );
+		const bool bSingleSelectOnly = GetReadAddressUncached( *this, true, nullptr);
+		SetNodeFlags(EPropertyNodeFlags::SingleSelectOnly, bSingleSelectOnly);
+
+		const FProperty* OwnerProperty = MyProperty->GetOwnerProperty();
+
+		const bool bIsObjectOrInterface = CastField<FObjectPropertyBase>(MyProperty) || CastField<FInterfaceProperty>(MyProperty);
+		bool bIsInsideContainer = CastField<FArrayProperty>(OwnerProperty) || CastField<FSetProperty>(OwnerProperty) || CastField<FMapProperty>(OwnerProperty);
+
+		// Don't consider the container's inline status if the key is a class property that is not inline
+		if (const FMapProperty* MapProperty = CastField<FMapProperty>(OwnerProperty))
+		{
+			const FObjectPropertyBase* KeyObjectProperty = CastField<FObjectPropertyBase>(MapProperty->GetKeyProperty());
+
+			if (KeyObjectProperty && KeyObjectProperty->PropertyClass && !KeyObjectProperty->PropertyClass->HasAnyClassFlags(EClassFlags::CLASS_EditInlineNew))
+			{
+				bIsInsideContainer = false;
+			}
+		}
+
+		// true if the property can be expanded into the property window; that is, instead of seeing
+		// a pointer to the object, you see the object's properties.
+		static const FName Name_EditInline("EditInline");
+		static const FName Name_ShowInnerProperties("ShowInnerProperties");
+		static const FName Name_NoEditInline("NoEditInline");
+
+		// we are EditInlineNew if this property has the flag, or if inside a container that has the flag.
+		bIsEditInlineNew = GotReadAddresses && bIsObjectOrInterface && !FRuntimeMetaData::HasMetaData( MyProperty, Name_NoEditInline) &&
+			(FRuntimeMetaData::HasMetaData(MyProperty, Name_EditInline) || (bIsInsideContainer && FRuntimeMetaData::HasMetaData(OwnerProperty, Name_EditInline)));
+		bShowInnerObjectProperties = bIsObjectOrInterface && FRuntimeMetaData::HasMetaData(MyProperty, Name_ShowInnerProperties);
+
+		if (bIsEditInlineNew)
+		{
+			SetNodeFlags(EPropertyNodeFlags::EditInlineNew, true);
+		}
+		else if (bShowInnerObjectProperties)
+		{
+			SetNodeFlags(EPropertyNodeFlags::ShowInnerObjectProperties, true);
+		}
+
+		//Get the property max child depth
+		static const FName Name_MaxPropertyDepth("MaxPropertyDepth");
+		if (FRuntimeMetaData::HasMetaData(Property.Get(), Name_MaxPropertyDepth))
+		{
+			int32 NewMaxChildDepthAllowed = FRuntimeMetaData::GetIntMetaData(Property.Get(), Name_MaxPropertyDepth);
+			//Ensure new depth is valid.  Otherwise just let the parent specified value stand
+			if (NewMaxChildDepthAllowed > 0)
+			{
+				//if there is already a limit on the depth allowed, take the minimum of the allowable depths
+				if (MaxChildDepthAllowed >= 0)
+				{
+					MaxChildDepthAllowed = FMath::Min(MaxChildDepthAllowed, NewMaxChildDepthAllowed);
+				}
+				else
+				{
+					//no current limit, go ahead and take the new limit
+					MaxChildDepthAllowed = NewMaxChildDepthAllowed;
+				}
+			}
+		}
+
+		const FString& EditConditionString = FRuntimeMetaData::GetMetaData(MyProperty, TEXT("EditCondition"));
+
+		// see if the property supports some kind of edit condition and this isn't the "parent" property of a static array
+		const bool bIsStaticArrayParent = MyProperty->ArrayDim > 1 && GetArrayIndex() != -1;
+		if (!EditConditionString.IsEmpty() && !bIsStaticArrayParent)
+		{
+			EditConditionExpression = EditConditionParser.Parse(EditConditionString);
+			if (EditConditionExpression.IsValid())
+			{
+				EditConditionContext = MakeShareable(new FEditConditionContext(*this));
+			}
+		}
+		
+		bool bRequiresValidation = bIsEditInlineNew || bShowInnerObjectProperties;
+	
+		// We require validation if we are in a container.
+		bRequiresValidation |= MyProperty->IsA<FArrayProperty>() || MyProperty->IsA<FSetProperty>() || MyProperty->IsA<FMapProperty>();
+
+		// We require validation if our parent also needs validation (if an array parent was resized all the addresses of children are invalid)
+		bRequiresValidation |= (GetParentNode() && GetParentNode()->HasNodeFlags(EPropertyNodeFlags::RequiresValidation));
+
+		// We require validation is we are on a structure node (the value of the structure may change externally, which invalidates the addresses).
+		const FComplexPropertyNode* ComplexParent = GetParentNode() ? GetParentNode()->AsComplexNode() : nullptr;
+		bRequiresValidation |= ComplexParent && ComplexParent->GetPropertyType() == FComplexPropertyNode::EPT_StandaloneStructure; 
+		
+		SetNodeFlags( EPropertyNodeFlags::RequiresValidation, bRequiresValidation );
+	}
+
+	InitExpansionFlags();
+
+	if (InitParams.bAllowChildren)
+	{
+		RebuildChildren();
+	}
+
+	PropertyPath = FPropertyNode::CreatePropertyPath(this->AsShared())->ToString();
+}
+
+/**
+ * Used for rebuilding a sub portion of the tree
+ */
+void FPropertyNode::RebuildChildren()
+{
+	CachedReadAddresses.Reset();
+
+	bool bDestroySelf = false;
+	TSet<FString> OutExpandedChildPropertyPaths;
+
+	for (const TSharedPtr<FPropertyNode>& ChildNode : ChildNodes)
+	{
+		if (ChildNode->HasNodeFlags(EPropertyNodeFlags::Expanded))
+		{
+			OutExpandedChildPropertyPaths.Add(ChildNode->GetPropertyPath());
+		}
+	}
+	
+	DestroyTree(bDestroySelf);
+
+	if (MaxChildDepthAllowed != 0)
+	{
+		//the case where we don't want init child nodes is when an Item has children that we don't want to display
+		//the other option would be to make each node "Read only" under that item.
+		//The example is a material assigned to a static mesh.
+		if (HasNodeFlags(EPropertyNodeFlags::CanBeExpanded) && (ChildNodes.Num() == 0))
+		{
+			InitChildNodes();
+			for (const TSharedPtr<FPropertyNode>& ChildNode : ChildNodes)
+			{
+				if ( OutExpandedChildPropertyPaths.Contains(ChildNode->GetPropertyPath()) )
+				{
+					ChildNode->SetNodeFlags(EPropertyNodeFlags::Expanded, true);
+				}
+			}
+		}
+	}
+
+	// Children have been rebuilt, clear any pending rebuild requests
+	bRebuildChildrenRequested = false;
+	bChildrenRebuilt = true;
+
+	// Notify any listener that children have been rebuilt
+	OnRebuildChildrenEvent.Broadcast();
+}
+
+void FPropertyNode::AddChildNode(TSharedPtr<FPropertyNode> InNode)
+{
+	ChildNodes.Add(InNode); 
+}
+
+void FPropertyNode::ClearCachedReadAddresses( bool bRecursive )
+{
+	CachedReadAddresses.Reset();
+
+	if( bRecursive )
+	{
+		for( int32 ChildIndex = 0; ChildIndex < ChildNodes.Num(); ++ChildIndex )
+		{
+			ChildNodes[ChildIndex]->ClearCachedReadAddresses( bRecursive );
+		}
+	}
+}
+
+// Follows the chain of items upwards until it finds the object window that houses this item.
+FComplexPropertyNode* FPropertyNode::FindComplexParent()
+{
+	FPropertyNode* Cur = this;
+	FComplexPropertyNode* Found = NULL;
+
+	while( true )
+	{
+		Found = Cur->AsComplexNode();
+		if( Found )
+		{
+			break;
+		}
+		Cur = Cur->GetParentNode();
+		if( !Cur )
+		{
+			// There is a break in the parent chain
+			break;
+		}
+	}
+
+	return Found;
+}
+
+
+// Follows the chain of items upwards until it finds the object window that houses this item.
+const FComplexPropertyNode* FPropertyNode::FindComplexParent() const
+{
+	const FPropertyNode* Cur = this;
+	const FComplexPropertyNode* Found = NULL;
+
+	while( true )
+	{
+		Found = Cur->AsComplexNode();
+		if( Found )
+		{
+			break;
+		}
+		Cur = Cur->GetParentNode();
+		if( !Cur )
+		{
+			// There is a break in the parent chain
+			break;
+		}
+
+	}
+
+	return Found;
+}
+
+class FObjectPropertyNode* FPropertyNode::FindObjectItemParent()
+{
+	FComplexPropertyNode* ComplexParent = FindComplexParent();
+	if (!ComplexParent)
+	{
+		return nullptr;
+	}
+
+	if (FObjectPropertyNode* ObjectNode = ComplexParent->AsObjectNode())
+	{
+		return ObjectNode;
+	}
+	else if (FPropertyNode* ParentNodePtr = ComplexParent->GetParentNode())
+	{
+		return ParentNodePtr->FindObjectItemParent();
+	}
+	return nullptr;
+}
+
+const class FObjectPropertyNode* FPropertyNode::FindObjectItemParent() const
+{
+	const FComplexPropertyNode* ComplexParent = FindComplexParent();
+	if (!ComplexParent)
+	{
+		return nullptr;
+	}
+
+	if (const FObjectPropertyNode* ObjectNode = ComplexParent->AsObjectNode())
+	{
+		return ObjectNode;
+	}
+	else if (const FPropertyNode* ParentNodePtr = ComplexParent->GetParentNode())
+	{
+		return ParentNodePtr->FindObjectItemParent();
+	}
+	return nullptr;
+}
+
+FStructurePropertyNode* FPropertyNode::FindStructureItemParent()
+{
+	FComplexPropertyNode* ComplexParent = FindComplexParent();
+	if (!ComplexParent)
+	{
+		return nullptr;
+	}
+
+	if (FStructurePropertyNode* StructureNode = ComplexParent->AsStructureNode())
+	{
+		return StructureNode;
+	}
+
+	return nullptr;
+}
+
+const FStructurePropertyNode* FPropertyNode::FindStructureItemParent() const
+{
+	const FComplexPropertyNode* ComplexParent = FindComplexParent();
+	if (!ComplexParent)
+	{
+		return nullptr;
+	}
+
+	if (const FStructurePropertyNode* StructureNode = ComplexParent->AsStructureNode())
+	{
+		return StructureNode;
+	}
+
+	return nullptr;
+}
+
+/**
+ * Follows the top-most object window that contains this property window item.
+ */
+FObjectPropertyNode* FPropertyNode::FindRootObjectItemParent()
+{
+	// not every type of change to property values triggers a proper refresh of the hierarchy, so find the topmost container window and trigger a refresh manually.
+	FObjectPropertyNode* TopmostObjectItem=NULL;
+
+	FObjectPropertyNode* NextObjectItem = FindObjectItemParent();
+	while ( NextObjectItem != NULL )
+	{
+		TopmostObjectItem = NextObjectItem;
+		FPropertyNode* NextObjectParent = NextObjectItem->GetParentNode();
+		if ( NextObjectParent != NULL )
+		{
+			NextObjectItem = NextObjectParent->FindObjectItemParent();
+		}
+		else
+		{
+			break;
+		}
+	}
+
+	return TopmostObjectItem;
+}
+
+bool FPropertyNode::DoesChildPropertyRequireValidation(FProperty* InChildProp)
+{
+	return InChildProp != nullptr && (CastField<FObjectProperty>(InChildProp) != nullptr || CastField<FStructProperty>(InChildProp) != nullptr);
+}
+
+void FPropertyNode::MarkChildrenAsRebuilt()
+{
+	bChildrenRebuilt = false;
+
+	for (const TSharedPtr<FPropertyNode>& ChildNode : ChildNodes)
+	{
+		ChildNode->MarkChildrenAsRebuilt();
+	}
+}
+
+/** 
+ * Used to see if any data has been destroyed from under the property tree.
+ */
+EPropertyDataValidationResult FPropertyNode::EnsureDataIsValid()
+{
+	bool bValidateChildren = !HasNodeFlags(EPropertyNodeFlags::SkipChildValidation);
+	bool bValidateChildrenKeyNodes = false;		// by default, we don't check this, since it's just for Map properties
+
+	// If we have rebuilt children since last EnsureDataIsValid call let the caller know
+	if (bChildrenRebuilt)
+	{
+		MarkChildrenAsRebuilt();
+		return EPropertyDataValidationResult::ChildrenRebuilt;
+	}
+
+	// The root must always be validated
+	if (GetParentNode() == nullptr || HasNodeFlags(EPropertyNodeFlags::RequiresValidation))
+	{
+		CachedReadAddresses.Reset();
+
+		//Figure out if an array mismatch can be ignored
+		bool bIgnoreAllMismatch = false;
+		//make sure that force depth-limited trees don't cause a refresh
+		bIgnoreAllMismatch |= (MaxChildDepthAllowed==0);
+
+		//check my property
+		if (Property.IsValid())
+		{
+			FProperty* MyProperty = Property.Get();
+			UStruct* OwnerStruct = MyProperty->GetOwnerStruct();
+
+			if (!OwnerStruct || OwnerStruct->IsStructTrashed())
+			{
+				//verify that the property is not part of an invalid trash class, treat it as an invalid object if it is which will cause a refresh
+				return EPropertyDataValidationResult::ObjectInvalid;
+			}
+
+			//verify that the number of container children is correct
+			FArrayProperty* ArrayProperty = CastField<FArrayProperty>(MyProperty);
+			FSetProperty* SetProperty = CastField<FSetProperty>(MyProperty);
+			FMapProperty* MapProperty = CastField<FMapProperty>(MyProperty);
+			FStructProperty* StructProperty = CastField<FStructProperty>(MyProperty);
+
+			//default to unknown array length
+			int32 NumArrayChildren = -1;
+			//assume all arrays have the same length
+			bool bArraysHaveEqualNum = true;
+			//assume all arrays match the number of property window children
+			bool bArraysMatchChildNum = true;
+
+			bool bArrayHasNewItem = false;
+
+			FProperty* ContainerElementProperty = MyProperty;
+
+			if (ArrayProperty)
+			{
+				ContainerElementProperty = ArrayProperty->Inner;
+			}
+			else if (SetProperty)
+			{
+				ContainerElementProperty = SetProperty->ElementProp;
+			}
+			else if (MapProperty)
+			{
+				// Need to attempt to validate both the key and value properties...
+				bValidateChildrenKeyNodes = DoesChildPropertyRequireValidation(MapProperty->KeyProp);
+
+				ContainerElementProperty = MapProperty->ValueProp;
+			}
+
+			bValidateChildren = DoesChildPropertyRequireValidation(ContainerElementProperty);
+
+			//verify that the number of object children are the same too
+			FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(MyProperty);
+			//check to see, if this an object property, whether the contents are NULL or not.
+			//This is the check to see if an object property was changed from NULL to non-NULL, or vice versa, from non-property window code.
+			bool bObjectPropertyNull = true;
+
+			//Edit inline properties can change underneath the window
+			bool bIgnoreChangingChildren = !(HasNodeFlags(EPropertyNodeFlags::EditInlineNew) || HasNodeFlags(EPropertyNodeFlags::ShowInnerObjectProperties));
+			//ignore this node if the consistency check should happen for the children
+			bool bIgnoreStaticArray = (Property->ArrayDim > 1) && (ArrayIndex == -1);
+
+			//if this node can't possibly have children (or causes a circular reference loop) then ignore this as a object property
+			if (bIgnoreChangingChildren || bIgnoreStaticArray || HasNodeFlags(EPropertyNodeFlags::NoChildrenDueToCircularReference))
+			{
+				//this will bypass object property consistency checks
+				ObjectProperty = nullptr;
+			}
+
+			FReadAddressList ReadAddresses;
+			const bool bSuccess = GetReadAddress( ReadAddresses );
+			//make sure we got the addresses correctly
+			if (!bSuccess)
+			{
+				UE_LOG( LogPropertyNode, Verbose, TEXT("Object is invalid %s"), *Property->GetName() );
+				return EPropertyDataValidationResult::ObjectInvalid;
+			}
+
+			// If an object property with ShowInnerProperties changed object values out from under the property
+			bool bShowInnerObjectPropertiesObjectChanged = false;
+
+			//check for null, if we find one, there is a problem.
+			for (int32 Scan = 0; Scan < ReadAddresses.Num(); ++Scan)
+			{
+				uint8* Addr = ReadAddresses.GetAddress(Scan);
+				//make sure the data still exists
+				if (Addr==NULL)
+				{
+					UE_LOG( LogPropertyNode, Verbose, TEXT("Object is invalid %s"), *Property->GetName() );
+					return EPropertyDataValidationResult::ObjectInvalid;
+				}
+
+				if( ArrayProperty && !bIgnoreAllMismatch)
+				{
+					//ensure that array structures have the proper number of children
+					FScriptArrayHelper ArrayHelper(ArrayProperty, Addr);
+					int32 ArrayNum = ArrayHelper.Num();
+					//if first child
+					if (NumArrayChildren == -1)
+					{
+						NumArrayChildren = ArrayNum;
+					}
+					bArrayHasNewItem = GetNumChildNodes() < ArrayNum;
+					//make sure multiple arrays match
+					bArraysHaveEqualNum = bArraysHaveEqualNum && (NumArrayChildren == ArrayNum);
+					//make sure the array matches the number of property node children
+					bArraysMatchChildNum = bArraysMatchChildNum && (GetNumChildNodes() == ArrayNum);
+				}
+
+				if (SetProperty && !bIgnoreAllMismatch)
+				{
+					// like arrays, ensure that set structures have the proper number of children
+					int32 SetNum = FScriptSetHelper::Num(Addr);
+
+					if (NumArrayChildren == -1)
+					{
+						NumArrayChildren = SetNum;
+					}
+
+					bArrayHasNewItem = GetNumChildNodes() < SetNum;
+					bArraysHaveEqualNum = bArraysHaveEqualNum && (NumArrayChildren == SetNum);
+					bArraysMatchChildNum = bArraysMatchChildNum && (GetNumChildNodes() == SetNum);
+				}
+
+				if (MapProperty && !bIgnoreAllMismatch)
+				{
+					FScriptMapHelper MapHelper(MapProperty, Addr);
+					int32 MapNum = MapHelper.Num();
+
+					if (NumArrayChildren == -1)
+					{
+						NumArrayChildren = MapNum;
+					}
+
+					bArrayHasNewItem = GetNumChildNodes() < MapNum;
+					bArraysHaveEqualNum = bArraysHaveEqualNum && (NumArrayChildren == MapNum);
+					bArraysMatchChildNum = bArraysMatchChildNum && (GetNumChildNodes() == MapNum);
+				}
+
+				if (ObjectProperty && !bIgnoreAllMismatch)
+				{
+					UObject* Obj = ObjectProperty->GetObjectPropertyValue(Addr);
+					if (IsValid(Obj))
+					{
+						if (!bShowInnerObjectPropertiesObjectChanged && 
+							HasNodeFlags(EPropertyNodeFlags::ShowInnerObjectProperties|EPropertyNodeFlags::EditInlineNew) && 
+							ChildNodes.Num() == 1)
+						{
+							bool bChildObjectFound = false;
+							FObjectPropertyNode* ChildObjectNode = ChildNodes[0]->AsObjectNode();
+							for (int32 ObjectIndex = 0; ObjectIndex < ChildObjectNode->GetNumObjects(); ++ObjectIndex)
+							{
+								if (Obj == ChildObjectNode->GetUObject(ObjectIndex))
+								{
+									bChildObjectFound = true;
+									break;
+								}
+							}
+							bShowInnerObjectPropertiesObjectChanged = !bChildObjectFound;
+						}
+					}
+
+					if (Obj != nullptr)
+					{
+						bObjectPropertyNull = false;
+						break;
+					}
+				}
+			}
+
+			//if all arrays match each other but they do NOT match the property structure, cause a rebuild
+			if (bArraysHaveEqualNum && !bArraysMatchChildNum)
+			{
+				RebuildChildren();
+
+				if( bArrayHasNewItem && ChildNodes.Num() )
+				{
+					TSharedPtr<FPropertyNode> LastChildNode = ChildNodes.Last();
+					// Don't expand huge children
+					if( LastChildNode->GetNumChildNodes() > 0 && LastChildNode->GetNumChildNodes() < 10 )
+					{
+						// Expand the last item for convenience since generally the user will want to edit the new value they added.
+						LastChildNode->SetNodeFlags(EPropertyNodeFlags::Expanded, true);
+					}
+				}
+
+				return EPropertyDataValidationResult::ArraySizeChanged;
+			}
+
+			if (bShowInnerObjectPropertiesObjectChanged)
+			{
+				RebuildChildren();
+				return EPropertyDataValidationResult::EditInlineNewValueChanged;
+			}
+
+			const bool bHasChildren = (GetNumChildNodes() > 0);
+			// If the object property is not null and has no children, its children need to be rebuilt
+			// If the object property is null and this node has children, the node needs to be rebuilt
+			if (!HasNodeFlags(EPropertyNodeFlags::ShowInnerObjectProperties) && 
+				ObjectProperty != nullptr && 
+				((!bObjectPropertyNull && !bHasChildren) || (bObjectPropertyNull && bHasChildren)))
+			{
+				RebuildChildren();
+				return EPropertyDataValidationResult::PropertiesChanged;
+			}
+		}
+	}
+
+	if( bRebuildChildrenRequested )
+	{
+		RebuildChildren();
+		// If this property is editinline and not edit const then its editinline new and we can optimize some of the refreshing in some cases.  Otherwise we need to refresh all properties in the view
+		return HasNodeFlags(EPropertyNodeFlags::ShowInnerObjectProperties) || (HasNodeFlags(EPropertyNodeFlags::EditInlineNew) && !IsEditConst()) ? EPropertyDataValidationResult::EditInlineNewValueChanged : EPropertyDataValidationResult::PropertiesChanged;
+	}
+	
+	EPropertyDataValidationResult FinalResult = EPropertyDataValidationResult::DataValid;
+
+	// Validate children and/or their key nodes.
+	if (bValidateChildren || bValidateChildrenKeyNodes)
+	{
+		for (int32 Scan = 0; Scan < ChildNodes.Num(); ++Scan)
+		{
+			TSharedPtr<FPropertyNode>& ChildNode = ChildNodes[Scan];
+			check(ChildNode.IsValid());
+
+			if (bValidateChildren)
+			{
+				EPropertyDataValidationResult ChildDataResult = ChildNode->EnsureDataIsValid();
+				if (FinalResult == EPropertyDataValidationResult::DataValid && ChildDataResult != EPropertyDataValidationResult::DataValid)
+				{
+					FinalResult = ChildDataResult;
+				}
+			}
+
+			// If the child property has a key node that needs validation, validate it here
+			TSharedPtr<FPropertyNode>& ChildKeyNode = ChildNode->GetPropertyKeyNode();
+			if (bValidateChildrenKeyNodes && ChildKeyNode.IsValid())
+			{
+				EPropertyDataValidationResult ChildDataResult = ChildKeyNode->EnsureDataIsValid();
+				if (FinalResult == EPropertyDataValidationResult::DataValid && ChildDataResult != EPropertyDataValidationResult::DataValid)
+				{
+					FinalResult = ChildDataResult;
+				}
+			}
+		}
+	}
+
+	return FinalResult;
+}
+
+FPropertyNodeEditStack::FPropertyNodeEditStack(const FPropertyNode* InNode, const UObject* InObj)
+{
+	Initialize(InNode, InObj);
+}
+
+FPropertyAccess::Result FPropertyNodeEditStack::Initialize(const FPropertyNode* InNode, const UObject* InObj)
+{
+	Cleanup();
+	FPropertyAccess::Result Result = InitializeInternal(InNode, InObj);
+	if (Result != FPropertyAccess::Success)
+	{
+		Cleanup();
+	}
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyNodeEditStack::InitializeInternal(const FPropertyNode* InNode, const UObject* InObj)
+{
+	FPropertyAccess::Result Result = FPropertyAccess::Success;
+	const FPropertyNode* Parent = InNode->GetParentNode();
+	const FProperty* Property = InNode->GetProperty();
+	if (Parent && Parent->GetProperty())
+	{
+		// Recursively initialize the stack
+		Result = InitializeInternal(Parent, InObj);
+		if (Result != FPropertyAccess::Success)
+		{
+			return Result;
+		}
+
+		// Get the direct memory pointer for the current property
+		const FProperty* ParentProperty = Parent->GetProperty();
+		if (Property == ParentProperty) // Static array items
+		{
+			// Static array property node creates subnodes that point to individual array items
+			MemoryStack.Add(FMemoryFrame(Property, MemoryStack.Last().Memory + InNode->GetArrayIndex() * Property->ElementSize));
+		}
+		else if (const FStructProperty* StructProp = CastField<FStructProperty>(ParentProperty)) // structs
+		{
+			if (Property->HasSetterOrGetter())
+			{
+				// If a property has a setter or getter we allocate temp memory to hold its value so that we can
+				// change the value using direct memory pointer access. After we're done editing we will copy the memory back to the property in CommitChanges
+				FMemoryFrame PropertyFrame(Property, (uint8*)Property->AllocateAndInitializeValue());
+				int32 StackIndex = MemoryStack.Add(PropertyFrame);
+				Property->GetValue_InContainer(MemoryStack[StackIndex - 1].Memory, PropertyFrame.Memory);
+			}
+			else
+			{
+				MemoryStack.Add(FMemoryFrame(Property, Property->ContainerPtrToValuePtr<uint8>(MemoryStack.Last().Memory)));
+			}
+		}
+		else if (Property->GetOwner<FProperty>() == ParentProperty) // TArrays, TMaps and TSets
+		{
+			uint8* ItemAddress = (uint8*)ParentProperty->GetValueAddressAtIndex_Direct(Property, (void*)MemoryStack.Last().Memory, InNode->GetArrayIndex());
+			if (ItemAddress)
+			{
+				MemoryStack.Add(FMemoryFrame(Property, ItemAddress));
+			}
+			else
+			{
+				return FPropertyAccess::Fail;
+			}
+		}
+		else
+		{
+			checkf(false, TEXT("Unsupported property chain: Current: %s, Parent: %s"), *Property->GetFullName(), *ParentProperty->GetFullName());
+		}
+	}
+	else
+	{
+		const UObject* Object = InObj;
+		if (!Object)
+		{
+			UObject* NodeObject = nullptr;
+			Result = InNode->GetSingleObject(NodeObject);
+			if (Result != FPropertyAccess::Success)
+			{
+				return Result;
+			}
+			Object = NodeObject;
+		}
+
+		// Determine the root container address (Struct address, UObject instance or sparse class data) for this property stack
+		uint8* Container = nullptr;
+		if (InNode->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData))
+		{
+			checkf(Object != nullptr, TEXT("No object pointer for property %s"), *GetNameSafe(Property));
+			Container = (uint8*)Object->GetClass()->GetOrCreateSparseClassData();
+		}
+		else if (Object)
+		{
+			Container = (uint8*)Object;
+		}
+		else
+		{
+			Result = InNode->GetSingleReadAddress(Container);
+			if (Result != FPropertyAccess::Success)
+			{
+				return Result;
+			}
+		}
+		if (!Container)
+		{
+			// This may happen when the node points at stale object
+			return FPropertyAccess::Fail;
+		}
+		MemoryStack.Add(FMemoryFrame(nullptr, Container));
+		
+		// Get the direct memory pointer for the root property
+		if (Property->HasSetterOrGetter())
+		{
+			FMemoryFrame PropertyFrame(Property, (uint8*)Property->AllocateAndInitializeValue());
+			int32 StackIndex = MemoryStack.Add(PropertyFrame);
+			Property->GetValue_InContainer(MemoryStack[StackIndex - 1].Memory, PropertyFrame.Memory);
+		}
+		else if ((uint8*)Object == Container)
+		{
+			MemoryStack.Add(FMemoryFrame(Property, (uint8*)Property->ContainerPtrToValuePtr<uint8>(Container)));
+		}
+		else
+		{
+			// This node represents a struct in which case the Container represents direct memory for the root property.
+			// todo: RobM: ideally we want Container to be the struct memory and not a property address
+			MemoryStack.Add(FMemoryFrame(Property, Container));
+		}
+	}
+	return Result;
+}
+
+void FPropertyNodeEditStack::CommitChanges()
+{
+	for (int32 Index = MemoryStack.Num() - 1; Index > 0; --Index)
+	{
+		if (MemoryStack[Index].Property->HasSetterOrGetter() &&
+			MemoryStack[Index].Property != MemoryStack[Index - 1].Property) // If this property is identical to the one below then it represents an item from an array
+		{
+			// Set the actual property value with the temp allocated memory
+			MemoryStack[Index].Property->SetValue_InContainer(MemoryStack[Index - 1].Memory, MemoryStack[Index].Memory);
+		}
+	}
+}
+
+void FPropertyNodeEditStack::Cleanup()
+{
+	for (int32 Index = MemoryStack.Num() - 1; Index > 0; --Index)
+	{
+		if (MemoryStack[Index].Property->HasSetterOrGetter() &&
+			MemoryStack[Index].Property != MemoryStack[Index - 1].Property) // If this property is identical to the one below then it represents an item from an array
+		{
+			MemoryStack[Index].Property->DestroyAndFreeValue(MemoryStack[Index].Memory);
+			MemoryStack[Index].Memory = nullptr;
+		}
+	}
+	MemoryStack.Empty();
+}
+
+FPropertyNodeEditStack::~FPropertyNodeEditStack()
+{
+	Cleanup();
+}
+
+FPropertyAccess::Result FPropertyNode::GetPropertyValueString(FString& OutString, const bool bAllowAlternateDisplayValue, EPropertyPortFlags PortFlags) const
+{
+	uint8* ValueAddress = nullptr;
+	FPropertyAccess::Result Result = GetSingleReadAddress(ValueAddress);
+
+	if (ValueAddress != nullptr)
+	{
+		const FProperty* PropertyPtr = GetProperty();
+
+		// Check for bogus data
+		if (PropertyPtr != nullptr && GetParentNode() != nullptr)
+		{
+			FPropertyTextUtilities::PropertyToTextHelper(OutString, this, PropertyPtr, ValueAddress, nullptr, PortFlags);
+
+			UEnum* Enum = nullptr;
+			int64 EnumValue = 0;
+			if (const FByteProperty* ByteProperty = CastField<FByteProperty>(PropertyPtr))
+			{
+				if (ByteProperty->Enum != nullptr)
+				{
+					Enum = ByteProperty->Enum;
+					EnumValue = ByteProperty->GetPropertyValue(ValueAddress);
+				}
+			}
+			else if (const FEnumProperty* EnumProperty = CastField<FEnumProperty>(PropertyPtr))
+			{
+				Enum = EnumProperty->GetEnum();
+				EnumValue = EnumProperty->GetUnderlyingProperty()->GetSignedIntPropertyValue(ValueAddress);
+			}
+
+			if (Enum != nullptr)
+			{
+				if (Enum->IsValidEnumValue(EnumValue))
+				{
+					// See if we specified an alternate name for this value using metadata
+					OutString = Enum->GetDisplayNameTextByValue(EnumValue).ToString();
+					if (!bAllowAlternateDisplayValue || OutString.Len() == 0)
+					{
+						OutString = Enum->GetNameStringByValue(EnumValue);
+					}
+				}
+				else
+				{
+					Result = FPropertyAccess::Fail;
+				}
+			}
+		}
+		else
+		{
+			Result = FPropertyAccess::Fail;
+		}
+	}
+
+	return Result;
+}
+
+FPropertyAccess::Result FPropertyNode::GetPropertyValueText(FText& OutText, const bool bAllowAlternateDisplayValue) const
+{
+	uint8* ValueAddress = nullptr;
+	FPropertyAccess::Result Result = GetSingleReadAddress(ValueAddress);
+
+	if (ValueAddress != nullptr)
+	{
+		const FProperty* PropertyPtr = GetProperty();
+		if (PropertyPtr)
+		{
+			if (PropertyPtr->IsA(FTextProperty::StaticClass()))
+			{
+				OutText = CastField<FTextProperty>(PropertyPtr)->GetPropertyValue(ValueAddress);
+			}
+			else
+			{
+				FString ExportedTextString;
+				FPropertyTextUtilities::PropertyToTextHelper(ExportedTextString, this, PropertyPtr, ValueAddress, nullptr, PPF_PropertyWindow);
+
+				UEnum* Enum = nullptr;
+				int64 EnumValue = 0;
+				if (const FByteProperty* ByteProperty = CastField<FByteProperty>(PropertyPtr))
+				{
+					Enum = ByteProperty->Enum;
+					EnumValue = ByteProperty->GetPropertyValue(ValueAddress);
+				}
+				else if (const FEnumProperty* EnumProperty = CastField<FEnumProperty>(PropertyPtr))
+				{
+					Enum = EnumProperty->GetEnum();
+					EnumValue = EnumProperty->GetUnderlyingProperty()->GetSignedIntPropertyValue(ValueAddress);
+				}
+
+				if (Enum)
+				{
+					if (Enum->IsValidEnumValue(EnumValue))
+					{
+						// Text form is always display name
+						OutText = Enum->GetDisplayNameTextByValue(EnumValue);
+					}
+					else
+					{
+						Result = FPropertyAccess::Fail;
+					}
+				}
+				else
+				{
+					OutText = FText::FromString(ExportedTextString);
+				}
+			}
+		}
+		else
+		{
+			Result = FPropertyAccess::Fail;
+		}
+	}
+
+	return Result;
+}
+
+/**
+ * Sets the flags used by the window and the root node
+ * @param InFlags - flags to turn on or off
+ * @param InOnOff - whether to toggle the bits on or off
+ */
+void FPropertyNode::SetNodeFlags(const EPropertyNodeFlags::Type InFlags, const bool InOnOff)
+{
+	if (InOnOff)
+	{
+		PropertyNodeFlags |= InFlags;
+	}
+	else
+	{
+		PropertyNodeFlags &= (~InFlags);
+	}
+}
+
+bool FPropertyNode::GetChildNode(const int32 ChildArrayIndex, TSharedPtr<FPropertyNode>& OutChildNode)
+{
+	OutChildNode = nullptr;
+
+	for (auto Child = ChildNodes.CreateIterator(); Child; ++Child)
+	{
+		if (Child->IsValid() && (*Child)->ArrayIndex == ChildArrayIndex)
+		{
+			OutChildNode = *Child;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool FPropertyNode::GetChildNode(const int32 ChildArrayIndex, TSharedPtr<FPropertyNode>& OutChildNode) const
+{
+	OutChildNode = nullptr;
+
+	for (auto Child = ChildNodes.CreateConstIterator(); Child; ++Child)
+	{
+		if (Child->IsValid() && (*Child)->ArrayIndex == ChildArrayIndex)
+		{
+			OutChildNode = *Child;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+TSharedPtr<FPropertyNode> FPropertyNode::FindChildPropertyNode( const FName InPropertyName, bool bRecurse )
+{
+	// search children breadth-first, so that identically-named properties are first picked up in top-level classes, eg:
+	// class UFoo 
+	// { 
+	//    struct FBar
+	//    { 
+	//       int ID; 
+	//    } Bar;
+	//    int ID;
+	// };
+	// depth-first search would find FBar::ID before UFoo::ID when searching for "ID", which is rarely what was intended
+
+	TDeque<TSharedPtr<FPropertyNode>> NodesToSearch;
+
+	auto PushAll = [&NodesToSearch](const TArray<TSharedPtr<FPropertyNode>>& Nodes)
+	{
+		NodesToSearch.Reserve(NodesToSearch.Num() + Nodes.Num());
+		for (const TSharedPtr<FPropertyNode>& Node : Nodes)
+		{
+			NodesToSearch.PushLast(Node);
+		}
+	};
+
+	PushAll(ChildNodes);
+	while (!NodesToSearch.IsEmpty())
+	{
+		TSharedPtr<FPropertyNode> Node = NodesToSearch.First();
+		NodesToSearch.PopFirst();
+
+		if (Node->GetProperty() && Node->GetProperty()->GetFName() == InPropertyName)
+		{
+			return Node;
+		}
+
+		if (bRecurse)
+		{
+			PushAll(Node->ChildNodes);
+		}
+	}
+
+	return nullptr;
+}
+
+/**
+ * Returns whether this window's property is read only or has the CPF_EditConst flag.
+ */
+bool FPropertyNode::IsPropertyConst() const
+{
+	if (HasNodeFlags(EPropertyNodeFlags::IsReadOnly))
+	{
+		return true;
+	}
+
+	if (Property != nullptr)
+	{
+		return Property->HasAllPropertyFlags(CPF_EditConst);
+	}
+
+	return false;
+}
+
+/** @return whether this window's property is constant (can't be edited by the user) */
+bool FPropertyNode::IsEditConst() const
+{
+	if (bUpdateEditConstState)
+	{
+		// Ask the objects whether this property can be changed
+		const FObjectPropertyNode* ObjectPropertyNode = FindObjectItemParent();
+
+		bIsEditConst = IsPropertyConst();
+		if (!bIsEditConst && Property.IsValid() && ObjectPropertyNode)
+		{
+			TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain(Property.Get());
+			
+			// travel up the chain to see if this property's owner struct is EditConst - if it is, so is this property
+			TSharedPtr<FPropertyNode> CurParent = ParentNodeWeakPtr.Pin();
+			while (CurParent != nullptr)
+			{
+				FStructProperty* StructProperty = CastField<FStructProperty>(CurParent->GetProperty());
+				if (StructProperty == nullptr)
+				{
+					break;
+				}
+
+				if (CurParent->IsEditConst())
+				{
+					// An owning struct is edit const, so the child property is too
+					bIsEditConst = true;
+				}
+				/*
+				else
+				{
+					// See if the struct has a problem with this property being editable
+					UScriptStruct* ScriptStruct = StructProperty->Struct;
+					if (ScriptStruct && ScriptStruct->StructFlags & STRUCT_CanEditChange)
+					{
+						UScriptStruct::ICppStructOps* TheCppStructOps = ScriptStruct->GetCppStructOps();
+						check(TheCppStructOps);
+
+						const int32 NumInstances = ObjectPropertyNode->GetInstancesNum();
+
+						TArray<const void*> StructAddresses;
+						StructAddresses.Reset(NumInstances);
+
+						for (int32 Index = 0; Index < NumInstances; ++Index)
+						{
+							StructAddresses.Add(CurParent->GetValueAddressFromObject(ObjectPropertyNode->GetUObject(Index)));
+						}
+
+						for (const void* StructAddr : StructAddresses)
+						{
+							if (!TheCppStructOps->CanEditChange(*PropertyChain, StructAddr))
+							{
+								bIsEditConst = true;
+								break;
+							}
+						}
+					}
+				}
+				*/
+
+				if (bIsEditConst)
+				{
+					break;
+				}
+				
+				CurParent = CurParent->ParentNodeWeakPtr.Pin();
+			}
+
+			if (!bIsEditConst)
+			{
+				for (TPropObjectConstIterator CurObjectIt(ObjectPropertyNode->ObjectConstIterator()); CurObjectIt; ++CurObjectIt)
+				{
+					const TWeakObjectPtr<UObject> CurObject = *CurObjectIt;
+					if (CurObject.IsValid())
+					{
+						if(IEditableObject * EditableObject = Cast<IEditableObject>(CurObject.Get()))
+						if (!EditableObject->RuntimeCanEditChange(*PropertyChain))
+						{
+							// At least one of the objects didn't like the idea of this property being changed.
+							bIsEditConst = true;
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		// check edit condition
+		if (!bIsEditConst && HasEditCondition())
+		{
+			bIsEditConst = !IsEditConditionMet();
+		}
+
+		bUpdateEditConstState = false;
+	}
+
+	return bIsEditConst;
+}
+
+bool FPropertyNode::ShouldSkipSerialization() const
+{
+	return Property != nullptr && Property->HasAnyPropertyFlags(CPF_SkipSerialization);
+}
+
+bool FPropertyNode::HasEditCondition() const 
+{ 
+	return EditConditionExpression.IsValid();
+}
+
+bool FPropertyNode::IsEditConditionMet() const 
+{ 
+	if (HasEditCondition())
+	{
+		TValueOrError<bool, FText> Result = EditConditionParser.Evaluate(*EditConditionExpression.Get(), *EditConditionContext.Get());
+		if (Result.IsValid())
+		{
+			return Result.GetValue();
+		}
+	}
+
+	return true;
+}
+
+bool FPropertyNode::SupportsEditConditionToggle() const
+{
+	if (!Property.IsValid())
+	{
+		return false;
+	}
+
+	FProperty* MyProperty = Property.Get();
+
+	static const FName Name_HideEditConditionToggle("HideEditConditionToggle");
+	if (EditConditionExpression.IsValid() && !FRuntimeMetaData::HasMetaData(Property.Get(), Name_HideEditConditionToggle))
+	{
+		const FBoolProperty* ConditionalProperty = EditConditionContext->GetSingleBoolProperty(EditConditionExpression);
+		if (ConditionalProperty != nullptr)
+		{
+			// There are 2 valid states for inline edit conditions:
+			// 1. The property is marked as editable and has InlineEditConditionToggle set. 
+			// 2. The property is not marked as editable and does not have InlineEditConditionToggle set.
+			// In both cases, the original property will be hidden and only show up as a toggle.
+
+			static const FName Name_InlineEditConditionToggle("InlineEditConditionToggle");
+			const bool bIsInlineEditCondition = FRuntimeMetaData::HasMetaData(ConditionalProperty, Name_InlineEditConditionToggle);
+			const bool bIsEditable = ConditionalProperty->HasAllPropertyFlags(CPF_Edit);
+
+			if (bIsInlineEditCondition == bIsEditable)
+			{
+				return true;
+			}
+
+			if (bIsInlineEditCondition && !bIsEditable)
+			{
+				UE_LOG(LogPropertyNode, Warning, TEXT("Property being used as inline edit condition is not editable, but has redundant InlineEditConditionToggle flag. Field \"%s\" in class \"%s\"."), *ConditionalProperty->GetNameCPP(), *Property->GetOwnerStruct()->GetName());
+				return true;
+			}
+
+			// The property is already shown, and not marked as inline edit condition.
+			if (!bIsInlineEditCondition && bIsEditable)
+			{
+				return false;
+			}
+		}
+	}
+
+	return false;
+}
+
+void FPropertyNode::ToggleEditConditionState()
+{
+	const FBoolProperty* EditConditionProperty = EditConditionContext->GetSingleBoolProperty(EditConditionExpression);
+	check(EditConditionProperty != nullptr);
+
+	FPropertyNode* MyParentNode = ParentNodeWeakPtr.Pin().Get();
+	check(MyParentNode != nullptr);
+
+	bool OldValue = true;
+
+	FComplexPropertyNode* ComplexParentNode = FindComplexParent();
+	for (int32 Index = 0; Index < ComplexParentNode->GetInstancesNum(); ++Index)
+	{
+		uint8* ValuePtr = ComplexParentNode->GetValuePtrOfInstance(Index, EditConditionProperty, MyParentNode);
+
+		OldValue &= EditConditionProperty->GetPropertyValue(ValuePtr);
+		EditConditionProperty->SetPropertyValue(ValuePtr, !OldValue);
+	}
+
+	// Propagate the value change to any instances if we're editing a template object
+	FObjectPropertyNode* ObjectNode = FindObjectItemParent();
+	if (ObjectNode != nullptr)
+	{
+		for (int32 ObjIndex = 0; ObjIndex < ObjectNode->GetNumObjects(); ++ObjIndex)
+		{
+			TWeakObjectPtr<UObject> ObjectWeakPtr = ObjectNode->GetUObject(ObjIndex);
+			UObject* Object = ObjectWeakPtr.Get();
+			if (Object != nullptr && Object->IsTemplate())
+			{
+				TArray<UObject*> ArchetypeInstances;
+				Object->GetArchetypeInstances(ArchetypeInstances);
+				for (int32 InstanceIndex = 0; InstanceIndex < ArchetypeInstances.Num(); ++InstanceIndex)
+				{
+					uint8* ArchetypeBaseOffset = MyParentNode->GetValueAddressFromObject(ArchetypeInstances[InstanceIndex]);
+					uint8* ArchetypeValueAddr = EditConditionProperty->ContainerPtrToValuePtr<uint8>(ArchetypeBaseOffset);
+
+					// Only propagate if the current value on the instance matches the previous value on the template.
+					const bool CurValue = EditConditionProperty->GetPropertyValue(ArchetypeValueAddr);
+					if (OldValue == CurValue)
+					{
+						EditConditionProperty->SetPropertyValue(ArchetypeValueAddr, !OldValue);
+					}
+				}
+			}
+		}
+	}
+}
+
+bool FPropertyNode::IsOnlyVisibleWhenEditConditionMet() const
+{
+	static const FName Name_EditConditionHides("EditConditionHides");
+	if (Property.IsValid() && FRuntimeMetaData::HasMetaData(Property.Get(), Name_EditConditionHides))
+	{
+		return HasEditCondition();
+	}
+
+	return false;
+}
+
+/**
+ * Appends my path, including an array index (where appropriate)
+ */
+bool FPropertyNode::GetQualifiedName( FString& PathPlusIndex, const bool bWithArrayIndex, const FPropertyNode* StopParent, bool bIgnoreCategories ) const
+{
+	bool bAddedAnything = false;
+	const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (ParentNode && StopParent != ParentNode.Get())
+	{
+		bAddedAnything = ParentNode->GetQualifiedName(PathPlusIndex, bWithArrayIndex, StopParent, bIgnoreCategories);
+	}
+
+	if (Property.IsValid())
+	{
+		if (bAddedAnything)
+		{
+			PathPlusIndex += TEXT(".");
+		}
+
+		Property->AppendName(PathPlusIndex);
+
+		if (bWithArrayIndex && (ArrayIndex != INDEX_NONE))
+		{
+			PathPlusIndex += TEXT("[");
+			PathPlusIndex.AppendInt(ArrayIndex);
+			PathPlusIndex += TEXT("]");
+		}
+
+		bAddedAnything = true;
+	}
+
+	return bAddedAnything;
+}
+
+bool FPropertyNode::GetReadAddressUncached( const FPropertyNode& InPropertyNode,
+									bool InRequiresSingleSelection,
+									FReadAddressListData* OutAddresses,
+									bool bComparePropertyContents,
+									bool bObjectForceCompare,
+									bool bArrayPropertiesCanDifferInSize ) const
+{
+	const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (ParentNode.IsValid())
+	{
+		return ParentNode->GetReadAddressUncached( InPropertyNode, InRequiresSingleSelection, OutAddresses, bComparePropertyContents, bObjectForceCompare, bArrayPropertiesCanDifferInSize );
+	}
+
+	return false;
+}
+
+bool FPropertyNode::GetReadAddressUncached( const FPropertyNode& InPropertyNode, FReadAddressListData& OutAddresses ) const
+{
+	const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (ParentNode.IsValid())
+	{
+		return ParentNode->GetReadAddressUncached( InPropertyNode, OutAddresses );
+	}
+	return false;
+}
+
+bool FPropertyNode::GetReadAddress(bool InRequiresSingleSelection,
+								   FReadAddressList& OutAddresses,
+								   bool bComparePropertyContents,
+								   bool bObjectForceCompare,
+								   bool bArrayPropertiesCanDifferInSize) const
+
+{
+	if (!ParentNodeWeakPtr.IsValid())
+	{
+		return false;
+	}
+
+	// @todo PropertyEditor Nodes which require validation cannot be cached
+	if( CachedReadAddresses.Num() && !CachedReadAddresses.bRequiresCache && !HasNodeFlags(EPropertyNodeFlags::RequiresValidation) )
+	{
+		OutAddresses.ReadAddressListData = &CachedReadAddresses;
+		return CachedReadAddresses.bAllValuesTheSame;
+	}
+
+	CachedReadAddresses.Reset();
+
+	bool bAllValuesTheSame = GetReadAddressUncached( *this, InRequiresSingleSelection, &CachedReadAddresses, bComparePropertyContents, bObjectForceCompare, bArrayPropertiesCanDifferInSize );
+	OutAddresses.ReadAddressListData = &CachedReadAddresses;
+	CachedReadAddresses.bAllValuesTheSame = bAllValuesTheSame;
+	CachedReadAddresses.bRequiresCache = false;
+
+	return bAllValuesTheSame;
+}
+
+/**
+ * fills in the OutAddresses array with the addresses of all of the available objects.
+ * @param InItem		The property to get objects from.
+ * @param OutAddresses	Storage array for all of the objects' addresses.
+ */
+bool FPropertyNode::GetReadAddress( FReadAddressList& OutAddresses ) const
+{
+	if (!ParentNodeWeakPtr.IsValid())
+	{
+		return false;
+	}
+
+	// @todo PropertyEditor Nodes which require validation cannot be cached
+	if( CachedReadAddresses.Num() && !HasNodeFlags(EPropertyNodeFlags::RequiresValidation) )
+	{
+		OutAddresses.ReadAddressListData = &CachedReadAddresses;
+		return true;
+	}
+
+	CachedReadAddresses.Reset();
+
+	bool bSuccess = GetReadAddressUncached( *this, CachedReadAddresses );
+	if( bSuccess )
+	{
+		OutAddresses.ReadAddressListData = &CachedReadAddresses;
+	}
+
+	CachedReadAddresses.bRequiresCache = false;
+
+	return bSuccess;
+}
+
+FPropertyAccess::Result FPropertyNode::GetSingleReadAddress(uint8*& OutValueAddress) const
+{
+	OutValueAddress = nullptr;
+	FReadAddressList ReadAddresses;
+	bool bAllValuesTheSame = GetReadAddress(!!HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false, true);
+
+	if ((ReadAddresses.Num() > 0 && bAllValuesTheSame) || ReadAddresses.Num() == 1)
+	{
+		OutValueAddress = ReadAddresses.GetAddress(0);
+
+		return FPropertyAccess::Success;
+	}
+
+	return ReadAddresses.Num() > 1 ? FPropertyAccess::MultipleValues : FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyNode::GetSingleObject(UObject*& OutObject) const
+{
+	OutObject = nullptr;
+	FReadAddressList ReadAddresses;
+	bool bAllValuesTheSame = GetReadAddress(HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly), ReadAddresses, false, true);
+
+	if ((ReadAddresses.Num() > 0 && bAllValuesTheSame) || ReadAddresses.Num() == 1)
+	{
+		OutObject = (UObject*)ReadAddresses.GetObject(0);
+
+		return FPropertyAccess::Success;
+	}
+
+	return ReadAddresses.Num() > 1 ? FPropertyAccess::MultipleValues : FPropertyAccess::Fail;
+}
+
+FPropertyAccess::Result FPropertyNode::GetSingleEditStack(FPropertyNodeEditStack& OutStack) const
+{
+	UObject* Object = nullptr;
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (GetProperty())
+	{
+		Result = GetSingleObject(Object);
+		if (Result == FPropertyAccess::Success)
+		{
+			Result = OutStack.Initialize(this, Object);
+		}
+	}
+	return Result;
+}
+
+uint8* FPropertyNode::GetStartAddressFromObject(const UObject* Obj) const
+{
+	if (!Obj)
+	{
+		return nullptr;
+	}
+
+	if (HasNodeFlags(EPropertyNodeFlags::IsSparseClassData))
+	{
+		return (uint8*)Obj->GetClass()->GetOrCreateSparseClassData();
+	}
+
+	return (uint8*)Obj;
+}
+
+uint8* FPropertyNode::GetValueBaseAddressFromObject(const UObject* Obj) const
+{
+	return GetValueBaseAddress(GetStartAddressFromObject(Obj), HasNodeFlags(EPropertyNodeFlags::IsSparseClassData));
+}
+
+uint8* FPropertyNode::GetValueAddressFromObject(const UObject* Obj) const
+{
+	return GetValueAddress(GetStartAddressFromObject(Obj), HasNodeFlags(EPropertyNodeFlags::IsSparseClassData));
+}
+
+
+uint8* FPropertyNode::GetValueBaseAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const
+{
+	uint8* Result = NULL;
+
+	if (bIsSparseData)
+	{
+		Result = StartAddress;
+	}
+	else
+	{
+		const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+		if (ParentNode.IsValid())
+		{
+			Result = ParentNode->GetValueAddress(StartAddress, bIsSparseData, bIsStruct);
+		}
+	}
+	return Result;
+}
+
+uint8* FPropertyNode::GetValueAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const
+{
+	return GetValueBaseAddress(StartAddress, bIsSparseData, bIsStruct);
+}
+
+
+/*-----------------------------------------------------------------------------
+	FPropertyItemValueDataTrackerSlate
+-----------------------------------------------------------------------------*/
+/**
+ * Calculates and stores the address for both the current and default value of
+ * the associated property and the owning object.
+ */
+class FPropertyItemValueDataTrackerSlate
+{
+public:
+	/**
+	 * A union which allows a single address to be represented as a pointer to a uint8
+	 * or a pointer to a UObject.
+	 */
+	union FPropertyValueRoot
+	{
+		UObject*	OwnerObject;
+		uint8*		ValueAddress;
+	};
+
+	void Reset(FPropertyNode* InPropertyNode, UObject* InOwnerObject)
+	{
+		OwnerObject = InOwnerObject;
+		PropertyNode = InPropertyNode;
+		bHasDefaultValue = false;
+		InnerInitialize();
+	}
+
+	void InnerInitialize()
+	{
+		PropertyValueRoot.OwnerObject = NULL;
+		PropertyDefaultValueRoot.OwnerObject = NULL;
+		PropertyValueAddress = NULL;
+		PropertyValueBaseAddress = NULL;
+		PropertyDefaultBaseAddress = NULL;
+		PropertyDefaultAddress = NULL;
+
+		PropertyValueRoot.OwnerObject = OwnerObject.Get();
+		check(PropertyNode);
+		FProperty* Property = PropertyNode->GetProperty();
+		check(Property);
+		check(PropertyValueRoot.OwnerObject);
+
+		// Do not cache pointers for standalone structures, as we don't have the same guarantees how the provided pointers are invalidated as we have with UObject nodes. 
+		// The default value handling for structure nodes is done in FPropertyNode::GetDefaultValueAsString() and FPropertyNode::GetDiffersFromDefault().
+		if (PropertyNode->FindStructureItemParent())
+		{
+			return;
+		}
+		
+		FPropertyNode* ParentNode = PropertyNode->GetParentNode();
+
+		// if the object specified is a class object, transfer to the CDO instead
+		if ( Cast<UClass>(PropertyValueRoot.OwnerObject) != NULL )
+		{
+			PropertyValueRoot.OwnerObject = Cast<UClass>(PropertyValueRoot.OwnerObject)->GetDefaultObject();
+		}
+
+		const bool bIsContainerProperty = CastField<FArrayProperty>(Property) || CastField<FSetProperty>(Property) || CastField<FMapProperty>(Property);
+		const bool bIsInsideContainerProperty = Property->GetOwner<FArrayProperty>() || Property->GetOwner<FSetProperty>() || Property->GetOwner<FMapProperty>();
+
+		FPropertyNode* Node = bIsInsideContainerProperty ? ParentNode : PropertyNode;
+
+		PropertyValueBaseAddress = Node->GetValueBaseAddressFromObject(PropertyValueRoot.OwnerObject);
+		PropertyValueAddress = PropertyNode->GetValueAddressFromObject(PropertyValueRoot.OwnerObject);
+
+		if (IsValidTracker())
+		{
+			bHasDefaultValue = Private_HasDefaultValue();
+
+			// calculate the addresses for the default object if it exists
+			if (bHasDefaultValue)
+			{
+				PropertyDefaultValueRoot.OwnerObject = PropertyValueRoot.OwnerObject ? PropertyValueRoot.OwnerObject->GetArchetype() : nullptr;
+
+				PropertyDefaultBaseAddress = Node->GetValueBaseAddressFromObject(PropertyDefaultValueRoot.OwnerObject);
+				PropertyDefaultAddress = PropertyNode->GetValueAddressFromObject(PropertyDefaultValueRoot.OwnerObject);
+
+				//////////////////////////
+				// If this is a container property, we must take special measures to use the base address of the property's value; for instance,
+				// the array property's PropertyDefaultBaseAddress points to an FScriptArray*, while PropertyDefaultAddress points to the 
+				// FScriptArray's Data pointer.
+				if (bIsContainerProperty)
+				{
+					PropertyValueAddress = PropertyValueBaseAddress;
+					PropertyDefaultAddress = PropertyDefaultBaseAddress;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Constructor
+	 *
+	 * @param	InPropItem		the property window item this struct will hold values for
+	 * @param	InOwnerObject	the object which contains the property value
+	 */
+	FPropertyItemValueDataTrackerSlate(FPropertyNode* InPropertyNode, UObject* InOwnerObject)
+		: OwnerObject(InOwnerObject)
+		, PropertyNode(InPropertyNode)
+		, bHasDefaultValue(false)
+	{
+		InnerInitialize();
+	}
+
+	/**
+	 * @return Whether or not this tracker has a valid address to a property and object
+	 */
+	bool IsValidTracker() const
+	{
+		return PropertyValueBaseAddress != nullptr && OwnerObject.IsValid();
+	}
+
+	/**
+	 * @return	a pointer to the subobject root (outer-most non-subobject) of the owning object.
+	 */
+	UObject* GetTopLevelObject()
+	{
+		check(PropertyNode);
+		FObjectPropertyNode* RootNode = PropertyNode->FindRootObjectItemParent();
+		check(RootNode);
+	
+		TArray<UObject*> RootObjects;
+		for ( TPropObjectIterator Itor( RootNode->ObjectIterator() ) ; Itor ; ++Itor )
+		{
+			TWeakObjectPtr<UObject> Object = *Itor;
+
+			if( Object.IsValid() )
+			{
+				RootObjects.Add(Object.Get());
+			}
+		}
+	
+		UObject* Result;
+		for ( Result = PropertyValueRoot.OwnerObject; Result; Result = Result->GetOuter() )
+		{
+			if ( RootObjects.Contains(Result) )
+			{
+				break;
+			}
+		}
+		
+		if( !Result )
+		{
+			// The result is not contained in the root so it is the top level object
+			Result = PropertyValueRoot.OwnerObject;
+		}
+		return Result;
+	}
+
+	/**
+	 * Whether or not we have a default value
+	 */
+	bool HasDefaultValue() const { return bHasDefaultValue; }
+
+	
+	/**
+	 * @return The property node we are inspecting
+	 */
+	FPropertyNode* GetPropertyNode() const { return PropertyNode; }
+
+	/**
+	 * @return The address of the property's value.
+	 */
+	uint8* GetPropertyValueAddress() const { return PropertyValueAddress; }
+
+	/**
+	 * @return The base address of the property's default value.
+	 */
+	uint8* GetPropertyDefaultBaseAddress() const { return PropertyDefaultBaseAddress; }
+
+	/**
+	 * @return The address of the property's default value.
+	 */
+	uint8* GetPropertyDefaultAddress() const { return PropertyDefaultAddress; }
+
+	/**
+	 * @return The address of the property's owner object.
+	 */
+	uint8* GetPropertyRootAddress() const { return PropertyValueRoot.ValueAddress; }
+
+	/**
+	 * @return The address of the default value owner object.
+	 */
+	uint8* GetPropertyDefaultRootAddress() const { return PropertyDefaultValueRoot.ValueAddress; }
+
+private:
+	/**
+	 * Determines whether the property bound to this struct exists in the owning object's archetype.
+	 *
+	 * @return	true if this property exists in the owning object's archetype; false if the archetype is e.g. a
+	 *			CDO for a base class and this property is declared in the owning object's class.
+	 */
+	bool Private_HasDefaultValue() const
+	{
+		bool bResult = false;
+
+		if (IsValidTracker())
+		{
+			UClass* OwnerClass = PropertyValueRoot.OwnerObject->GetClass();
+			if (GetPropertyNode()->HasNodeFlags(EPropertyNodeFlags::IsSparseClassData))
+			{
+				if (OwnerClass)
+				{
+					UStruct* SparseClassDataStruct = OwnerClass->GetSparseClassDataStruct();
+					UStruct* SparseClassDataArchetypeStruct = OwnerClass->GetSparseClassDataArchetypeStruct();
+
+					if (SparseClassDataStruct == SparseClassDataArchetypeStruct)
+					{
+						bResult = true;
+					}
+					else
+					{
+						// Find the member property which contains this item's property
+						FPropertyNode* MemberPropertyNode = PropertyNode;
+						for (; MemberPropertyNode != nullptr; MemberPropertyNode = MemberPropertyNode->GetParentNode())
+						{
+							FProperty* MemberProperty = MemberPropertyNode->GetProperty();
+							if (MemberProperty != nullptr)
+							{
+								if (MemberProperty->GetOwner<UClass>() != nullptr)
+								{
+									break;
+								}
+							}
+						}
+						if (MemberPropertyNode != nullptr && MemberPropertyNode->GetProperty())
+						{
+							// we check to see that this property is in the defaults class
+							bResult = MemberPropertyNode->GetProperty()->IsInContainer(SparseClassDataArchetypeStruct);
+						}
+					}
+				}
+
+				return bResult;
+			}
+			check(PropertyValueBaseAddress);
+			check(PropertyValueRoot.OwnerObject);
+			UObject* ParentDefault = PropertyValueRoot.OwnerObject->GetArchetype();
+			check(ParentDefault);
+			if (OwnerClass == ParentDefault->GetClass())
+			{
+				// if the archetype is of the same class, then we must have a default
+				bResult = true;
+			}
+			else
+			{
+				// Find the member property which contains this item's property
+				FPropertyNode* MemberPropertyNode = PropertyNode;
+				for ( ;MemberPropertyNode != NULL; MemberPropertyNode = MemberPropertyNode->GetParentNode() )
+				{
+					FProperty* MemberProperty = MemberPropertyNode->GetProperty();
+					if ( MemberProperty != NULL )
+					{
+						if ( MemberProperty->GetOwner<UClass>() != NULL )
+						{
+							break;
+						}
+					}
+				}
+				if ( MemberPropertyNode != NULL && MemberPropertyNode->GetProperty())
+				{
+					// we check to see that this property is in the defaults class
+					bResult = MemberPropertyNode->GetProperty()->IsInContainer(ParentDefault->GetClass());
+				}
+			}
+		}
+
+		return bResult;
+	}
+
+private:
+	TWeakObjectPtr<UObject> OwnerObject;
+
+	/** The property node we are inspecting */
+	FPropertyNode* PropertyNode;
+
+
+	/** The address of the owning object */
+	FPropertyValueRoot PropertyValueRoot;
+
+	/**
+	 * The address of the owning object's archetype
+	 */
+	FPropertyValueRoot PropertyDefaultValueRoot;
+
+	/**
+	 * The address of this property's value.
+	 */
+	uint8* PropertyValueAddress;
+
+	/**
+	 * The base address of this property's value.  i.e. for dynamic arrays, the location of the FScriptArray which
+	 * contains the array property's value
+	 */
+	uint8* PropertyValueBaseAddress;
+
+	/**
+	 * The base address of this property's default value (see other comments for PropertyValueBaseAddress)
+	 */
+	uint8* PropertyDefaultBaseAddress;
+
+	/**
+	 * The address of this property's default value.
+	 */
+	uint8* PropertyDefaultAddress;
+
+	/** Whether or not we have a default value */
+	bool bHasDefaultValue;
+};
+
+
+/* ==========================================================================================================
+	FPropertyItemComponentCollector
+
+	Given a property and the address for that property's data, searches for references to components and
+	keeps a list of any that are found.
+========================================================================================================== */
+/**
+ * Given a property and the address for that property's data, searches for references to components and keeps a list of any that are found.
+ */
+struct FPropertyItemComponentCollector
+{
+	/** contains the property to search along with the value address to use */
+	const FPropertyItemValueDataTrackerSlate& ValueTracker;
+
+	/** holds the list of instanced objects found */
+	TArray<UObject*> Components;
+
+	/** Whether or not we have an edit inline new */
+	bool bContainsEditInlineNew;
+
+	/** Constructor */
+	FPropertyItemComponentCollector( const FPropertyItemValueDataTrackerSlate& InValueTracker )
+	: ValueTracker(InValueTracker)
+	, bContainsEditInlineNew( false )
+	{
+		check(ValueTracker.GetPropertyNode());
+		FPropertyNode* PropertyNode = ValueTracker.GetPropertyNode();
+		check(PropertyNode);
+		FProperty* Prop = PropertyNode->GetProperty();
+		if ( PropertyNode->GetArrayIndex() == INDEX_NONE )
+		{
+			// either the associated property is not an array property, or it's the header for the property (meaning the entire array)
+			for ( int32 ArrayIndex = 0; ArrayIndex < Prop->ArrayDim; ArrayIndex++ )
+			{
+				ProcessProperty(Prop, ValueTracker.GetPropertyValueAddress() + ArrayIndex * Prop->ElementSize);
+			}
+		}
+		else
+		{
+			// single element of either a dynamic or static array
+			ProcessProperty(Prop, ValueTracker.GetPropertyValueAddress());
+		}
+	}
+
+	/**
+	 * Routes the processing to the appropriate method depending on the type of property.
+	 *
+	 * @param	Property				the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 */
+	void ProcessProperty( FProperty* Property, uint8* PropertyValueAddress )
+	{
+		if ( Property != NULL )
+		{
+			bContainsEditInlineNew |= FRuntimeMetaData::HasMetaData(Property, TEXT("EditInline")) && ((Property->PropertyFlags & CPF_EditConst) == 0);
+
+			if ( ProcessObjectProperty(CastField<FObjectPropertyBase>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+			if ( ProcessStructProperty(CastField<FStructProperty>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+			if ( ProcessInterfaceProperty(CastField<FInterfaceProperty>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+			if ( ProcessDelegateProperty(CastField<FDelegateProperty>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+			if ( ProcessMulticastDelegateProperty(CastField<FMulticastDelegateProperty>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+			if ( ProcessArrayProperty(CastField<FArrayProperty>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+			if ( ProcessSetProperty(CastField<FSetProperty>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+			if ( ProcessMapProperty(CastField<FMapProperty>(Property), PropertyValueAddress) )
+			{
+				return;
+			}
+		}
+	}
+private:
+
+	/**
+	 * FArrayProperty version - invokes ProcessProperty on the array's Inner member for each element in the array.
+	 *
+	 * @param	ArrayProp				the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessArrayProperty( FArrayProperty* ArrayProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if ( ArrayProp != NULL )
+		{
+			FScriptArrayHelper ArrayHelper(ArrayProp, PropertyValueAddress);
+
+			uint8* ArrayValue = (uint8*)ArrayHelper.GetRawPtr();
+			int32 ArraySize = ArrayHelper.Num();
+			for ( int32 ArrayIndex = 0; ArrayIndex < ArraySize; ArrayIndex++ )
+			{
+				ProcessProperty(ArrayProp->Inner, ArrayValue + ArrayIndex * ArrayProp->Inner->ElementSize);
+			}
+
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+	/**
+	 * FSetProperty version - invokes ProcessProperty on the each item in the set
+	 *
+	 * @param	SetProp					the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessSetProperty( FSetProperty* SetProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if (SetProp != NULL)
+		{
+			FScriptSet* SetValuePtr = SetProp->GetPropertyValuePtr(PropertyValueAddress);
+
+			FScriptSetLayout SetLayout = SetValuePtr->GetScriptLayout(SetProp->ElementProp->ElementSize, SetProp->ElementProp->GetMinAlignment());
+			int32 ItemsLeft = SetValuePtr->Num();
+
+			for (int32 Index = 0; ItemsLeft > 0; ++Index)
+			{
+				if (SetValuePtr->IsValidIndex(Index))
+				{
+					--ItemsLeft;
+					ProcessProperty(SetProp->ElementProp, (uint8*)SetValuePtr->GetData(Index, SetLayout));
+				}
+			}
+
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+	/**
+	 * FMapProperty version - invokes ProcessProperty on each item in the map
+	 *
+	 * @param	MapProp					the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessMapProperty( FMapProperty* MapProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if (MapProp != NULL)
+		{
+			FScriptMapHelper MapHelper(MapProp, PropertyValueAddress);
+
+			int32 ItemsLeft = MapHelper.Num();
+			for (int32 Index = 0; ItemsLeft > 0; ++Index)
+			{
+				if (MapHelper.IsValidIndex(Index))
+				{
+					--ItemsLeft;
+
+					uint8* Data = MapHelper.GetPairPtr(Index);
+
+					ProcessProperty(MapProp->KeyProp, MapProp->KeyProp->ContainerPtrToValuePtr<uint8>(Data));
+					ProcessProperty(MapProp->ValueProp, MapProp->ValueProp->ContainerPtrToValuePtr<uint8>(Data));
+				}
+			}
+
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+	/**
+	 * FStructProperty version - invokes ProcessProperty on each property in the struct
+	 *
+	 * @param	StructProp				the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessStructProperty( FStructProperty* StructProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if ( StructProp != NULL )
+		{
+			for ( FProperty* Prop = StructProp->Struct->PropertyLink; Prop; Prop = Prop->PropertyLinkNext )
+			{
+				for ( int32 ArrayIndex = 0; ArrayIndex < Prop->ArrayDim; ArrayIndex++ )
+				{
+					ProcessProperty(Prop, Prop->ContainerPtrToValuePtr<uint8>(PropertyValueAddress, ArrayIndex));
+				}
+			}
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+	/**
+	 * FObjectProperty version - if the object located at the specified address is instanced, adds the component the list.
+	 *
+	 * @param	ObjectProp				the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessObjectProperty( FObjectPropertyBase* ObjectProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if ( ObjectProp != NULL )
+		{
+			UObject* ObjValue = ObjectProp->GetObjectPropertyValue(PropertyValueAddress);
+			if (ObjectProp->PropertyFlags & CPF_InstancedReference)
+			{
+				Components.AddUnique(ObjValue);
+			}
+
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+	/**
+	 * FInterfaceProperty version - if the FScriptInterface located at the specified address contains a reference to an instance, add the component to the list.
+	 *
+	 * @param	InterfaceProp			the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessInterfaceProperty( FInterfaceProperty* InterfaceProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if ( InterfaceProp != NULL )
+		{
+			FScriptInterface* InterfaceValue = InterfaceProp->GetPropertyValuePtr(PropertyValueAddress);
+
+			UObject* InterfaceObj = InterfaceValue->GetObject();
+			if (InterfaceObj && InterfaceObj->IsDefaultSubobject())
+			{
+				Components.AddUnique(InterfaceValue->GetObject());
+			}
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+	/**
+	 * FDelegateProperty version - if the FScriptDelegate located at the specified address contains a reference to an instance, add the component to the list.
+	 *
+	 * @param	DelegateProp			the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessDelegateProperty( FDelegateProperty* DelegateProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if ( DelegateProp != NULL )
+		{
+			FScriptDelegate* DelegateValue = DelegateProp->GetPropertyValuePtr(PropertyValueAddress);
+			if (DelegateValue->GetUObject() && DelegateValue->GetUObject()->IsDefaultSubobject())
+			{
+				Components.AddUnique(DelegateValue->GetUObject());
+			}
+
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+	/**
+	 * FMulticastDelegateProperty version - if the FMulticastScriptDelegate located at the specified address contains a reference to an instance, add the component to the list.
+	 *
+	 * @param	MulticastDelegateProp	the property to process
+	 * @param	PropertyValueAddress	the address of the property's value
+	 *
+	 * @return	true if the property was handled by this method
+	 */
+	bool ProcessMulticastDelegateProperty( FMulticastDelegateProperty* MulticastDelegateProp, uint8* PropertyValueAddress )
+	{
+		bool bResult = false;
+
+		if ( MulticastDelegateProp != NULL )
+		{
+			if (const FMulticastScriptDelegate* MulticastDelegateValue = MulticastDelegateProp->GetMulticastDelegate(PropertyValueAddress))
+			{
+				TArray<UObject*> AllObjects = MulticastDelegateValue->GetAllObjects();
+				for (TArray<UObject*>::TConstIterator CurObjectIt(AllObjects); CurObjectIt; ++CurObjectIt)
+				{
+					if ((*CurObjectIt)->IsDefaultSubobject())
+					{
+						Components.AddUnique((*CurObjectIt));
+					}
+				}
+			}
+
+			bResult = true;
+		}
+
+		return bResult;
+	}
+
+};
+
+
+bool FPropertyNode::GetDiffersFromDefault(const uint8* PropertyValueAddress, const uint8* PropertyDefaultAddress, const uint8* DefaultPropertyValueBaseAddress, const FProperty* InProperty) const
+{
+	bool bDiffersFromDefaultValue = false;
+
+	if (DefaultPropertyValueBaseAddress != nullptr)
+	{
+		if (const FArrayProperty* OuterArrayProperty = InProperty->GetOwner<FArrayProperty>())
+		{
+			// make sure we're not trying to compare against an element that doesn't exist
+			FScriptArrayHelper ArrayHelper(OuterArrayProperty, DefaultPropertyValueBaseAddress);
+			if (!ArrayHelper.IsValidIndex(GetArrayIndex()))
+			{
+				bDiffersFromDefaultValue = true;
+			}
+		}
+		else if (const FSetProperty* OuterSetProperty = InProperty->GetOwner<FSetProperty>())
+		{
+			FScriptSetHelper SetHelper(OuterSetProperty, DefaultPropertyValueBaseAddress);
+			if (!SetHelper.IsValidIndex(GetArrayIndex()))
+			{
+				bDiffersFromDefaultValue = true;
+			}
+		}
+		else if (const FMapProperty* OuterMapProperty = InProperty->GetOwner<FMapProperty>())
+		{
+			FScriptMapHelper MapHelper(OuterMapProperty, DefaultPropertyValueBaseAddress);
+			if (!MapHelper.IsValidIndex(GetArrayIndex()))
+			{
+				bDiffersFromDefaultValue = true;
+			}
+		}
+	}
+
+	if (!bDiffersFromDefaultValue)
+	{
+		uint32 PortFlags = 0;
+		if (InProperty->ContainsInstancedObjectProperty())
+		{
+			PortFlags |= PPF_DeepComparison;
+		}
+	
+		if (PropertyValueAddress == nullptr || PropertyDefaultAddress == nullptr)
+		{
+			// if either are NULL, we had a dynamic array somewhere in our parent chain and the array doesn't
+			// have enough elements in either the default or the object
+			bDiffersFromDefaultValue = true;
+		}
+		else if (GetArrayIndex() == INDEX_NONE && InProperty->ArrayDim > 1)
+		{
+			// this is a container; loop through all of its elements and see if any of them differ from the default
+			for (int32 Idx = 0; !bDiffersFromDefault && Idx < InProperty->ArrayDim; Idx++)
+			{
+				bDiffersFromDefaultValue = !InProperty->Identical(
+					PropertyValueAddress + Idx * InProperty->ElementSize,
+					PropertyDefaultAddress + Idx * InProperty->ElementSize,
+					PortFlags
+					);
+			}
+		}
+		else
+		{
+			// try to compare the values at the current and default property addresses
+			if( PropertyValueAddress != nullptr && PropertyDefaultAddress != nullptr )
+			{
+				bDiffersFromDefaultValue = !InProperty->Identical(
+					PropertyValueAddress,
+					PropertyDefaultAddress,
+					PortFlags
+					);
+			}
+		}
+	}
+
+	return bDiffersFromDefaultValue;
+}
+
+bool FPropertyNode::GetDiffersFromDefaultForObject( FPropertyItemValueDataTrackerSlate& ValueTracker, FProperty* InProperty )
+{	
+	check( InProperty );
+
+	const bool bIsValidTracker = ValueTracker.IsValidTracker();
+	const bool bHasDefaultValue = ValueTracker.HasDefaultValue();
+	const bool bHasParent = GetParentNode() != nullptr;
+
+	if (bIsValidTracker && bHasDefaultValue && bHasParent)
+	{
+		return GetDiffersFromDefault(ValueTracker.GetPropertyValueAddress(), ValueTracker.GetPropertyDefaultAddress(), ValueTracker.GetPropertyDefaultBaseAddress(), InProperty);
+	}
+
+	return false;
+}
+
+/**
+ * If there is a property, sees if it matches.  Otherwise sees if the entire parent structure matches
+ */
+bool FPropertyNode::GetDiffersFromDefault()
+{
+	if( bUpdateDiffersFromDefault )
+	{
+		bUpdateDiffersFromDefault = false;
+		bDiffersFromDefault = false;
+
+		FProperty* Prop = GetProperty();
+		if (!Prop)
+		{
+			return bDiffersFromDefault;
+		}
+
+		if (const FStructurePropertyNode* StructNode = FindStructureItemParent())
+		{
+			TArray<TSharedPtr<FStructOnScope>> Structs;
+			StructNode->GetAllStructureData(Structs);
+			
+			const bool bIsSparse = HasNodeFlags(EPropertyNodeFlags::IsSparseClassData);
+			const bool bIsContainer = CastField<FArrayProperty>(Prop) || CastField<FSetProperty>(Prop) || CastField<FMapProperty>(Prop);
+			const bool bIsInsideContainerProperty = Property->GetOwner<FArrayProperty>() || Property->GetOwner<FSetProperty>() || Property->GetOwner<FMapProperty>();
+			const FPropertyNode* BaseNode = bIsInsideContainerProperty ? GetParentNode() : this;
+
+			FStructOnScope DefaultStruct;
+
+			for (int32 Index = 0; !bDiffersFromDefault && Index < Structs.Num(); Index++)
+			{
+				const TSharedPtr<FStructOnScope>& StructData = Structs[Index];
+				// Skip empty data.
+				if (!StructData.IsValid())
+				{
+					continue;
+				}
+				const UStruct* Struct = StructData->GetStruct();
+				if (!Struct)
+				{
+					continue;
+				}
+				
+				// Make an instance of the struct to be used as default value to test against.
+				if (DefaultStruct.GetStruct() != Struct)
+				{
+					DefaultStruct.Initialize(Struct);
+				}
+
+				check(DefaultStruct.IsValid());
+
+				const uint8* PropertyValueAddress = GetValueAddress(StructData->GetStructMemory(), bIsSparse, /*bIsStruct=*/true);
+				const uint8* PropertyDefaultAddress = GetValueAddress(DefaultStruct.GetStructMemory(), bIsSparse, /*bIsStruct=*/true);
+				const uint8* PropertyDefaultBaseAddress = BaseNode->GetValueBaseAddress(DefaultStruct.GetStructMemory(), bIsSparse, /*bIsStruct=*/true);
+
+				// If this is a container property, we must take special measures to use the base address of the property's value; for instance,
+				// the array property's PropertyDefaultBaseAddress points to an FScriptArray*, while PropertyDefaultAddress points to the 
+				// FScriptArray's Data pointer.
+				if (bIsContainer)
+				{
+					const uint8* PropertyValueBaseAddress = BaseNode->GetValueBaseAddress(StructData->GetStructMemory(), bIsSparse, /*bIsStruct=*/true);
+					PropertyValueAddress = PropertyValueBaseAddress;
+					PropertyDefaultAddress = PropertyDefaultBaseAddress;
+				}
+
+				bDiffersFromDefault = GetDiffersFromDefault(PropertyValueAddress, PropertyDefaultAddress, PropertyDefaultBaseAddress, Prop);
+			}
+		}
+		else if (FObjectPropertyNode* ObjectNode = FindObjectItemParent())
+		{
+			// Get an iterator for the enclosing objects.
+			for (int32 ObjIndex = 0; ObjIndex < ObjectNode->GetNumObjects(); ++ObjIndex)
+			{
+				UObject* Object = ObjectNode->GetUObject(ObjIndex);
+
+				TSharedPtr<FPropertyItemValueDataTrackerSlate> ValueTracker = GetValueTracker(Object, ObjIndex);
+
+				if (Object && GetDiffersFromDefaultForObject(*ValueTracker, Prop))
+				{
+					// If any object being observed differs from the result then there is no need to keep searching
+					bDiffersFromDefault = true;
+					break;
+				}
+			}
+		}
+	}
+
+	return bDiffersFromDefault;
+}
+
+
+FString FPropertyNode::GetDefaultValueAsString(const uint8* PropertyDefaultAddress, const FProperty* InProperty, const bool bUseDisplayName) const
+{
+	FString DefaultValue;
+
+	uint32 PortFlags = bUseDisplayName ? PPF_PropertyWindow : PPF_None;
+	if (InProperty->ContainsInstancedObjectProperty())
+	{
+		PortFlags |= PPF_DeepComparison;
+	}
+
+	if (!PropertyDefaultAddress)
+	{
+		// no default available, fall back on the default value for our primitive:
+		uint8* TempComplexPropAddr = (uint8*)FMemory::Malloc(InProperty->GetSize(), InProperty->GetMinAlignment());
+		InProperty->InitializeValue(TempComplexPropAddr);
+		ON_SCOPE_EXIT
+		{
+			InProperty->DestroyValue(TempComplexPropAddr);
+			FMemory::Free(TempComplexPropAddr);
+		};
+				
+		InProperty->ExportText_Direct(DefaultValue, TempComplexPropAddr, TempComplexPropAddr, nullptr, PPF_None);
+	}
+	else if ( GetArrayIndex() == INDEX_NONE && InProperty->ArrayDim > 1 )
+	{
+		FArrayProperty::ExportTextInnerItem(DefaultValue, InProperty, PropertyDefaultAddress, InProperty->ArrayDim,
+											PropertyDefaultAddress, InProperty->ArrayDim, nullptr, PortFlags);
+	}
+	else
+	{
+		// Port flags will cause enums to display correctly
+		InProperty->ExportTextItem_Direct(DefaultValue, PropertyDefaultAddress, PropertyDefaultAddress, nullptr, PortFlags, nullptr);
+	}
+
+	return DefaultValue;
+}
+
+FString FPropertyNode::GetDefaultValueAsStringForObject( FPropertyItemValueDataTrackerSlate& ValueTracker, UObject* InObject, FProperty* InProperty, bool bUseDisplayName)
+{
+	check( InObject );
+	check( InProperty );
+
+	FString DefaultValue;
+
+	// special case for Object class - no defaults to compare against
+	if ( InObject != UObject::StaticClass() && InObject != UObject::StaticClass()->GetDefaultObject() )
+	{
+		if ( ValueTracker.IsValidTracker() && ValueTracker.HasDefaultValue() )
+		{
+			DefaultValue = GetDefaultValueAsString(ValueTracker.GetPropertyDefaultAddress(), InProperty, bUseDisplayName);
+		}
+	}
+
+	return DefaultValue;
+}
+
+FString FPropertyNode::GetDefaultValueAsString(bool bUseDisplayName)
+{
+	FString DefaultValue;
+	FString DelimitedValue;
+	bool bAllSame = true;
+
+	FProperty* Prop = GetProperty();
+	if (!Prop)
+	{
+		return DefaultValue;
+	}
+
+	if (const FStructurePropertyNode* StructNode = FindStructureItemParent())
+	{
+		TArray<TSharedPtr<FStructOnScope>> Structs;
+		StructNode->GetAllStructureData(Structs);
+
+		const bool bIsSparse = HasNodeFlags(EPropertyNodeFlags::IsSparseClassData);
+		const bool bIsContainer = CastField<FArrayProperty>(Prop) || CastField<FSetProperty>(Prop) || CastField<FMapProperty>(Prop);
+		const bool bIsInsideContainerProperty = Property->GetOwner<FArrayProperty>() || Property->GetOwner<FSetProperty>() || Property->GetOwner<FMapProperty>();
+		const FPropertyNode* BaseNode = bIsInsideContainerProperty ? GetParentNode() : this;
+
+		FStructOnScope DefaultStruct;
+		FString NodeDefaultValue;
+
+		for (const TSharedPtr<FStructOnScope>& StructData : Structs)
+		{
+			if (!StructData.IsValid())
+			{
+				continue;
+			}
+			const UStruct* Struct = StructData->GetStruct();
+			if (!StructData)
+			{
+				continue;
+			}
+
+			if (DefaultStruct.GetStruct() != Struct)
+			{
+				// Make an instance of the struct to be used as default value.
+				DefaultStruct.Initialize(Struct);
+				check(DefaultStruct.IsValid());
+
+				const uint8* PropertyDefaultAddress = GetValueAddress(DefaultStruct.GetStructMemory(), bIsSparse, /*bIsStruct=*/true);
+				const uint8* PropertyDefaultBaseAddress = BaseNode->GetValueBaseAddress(DefaultStruct.GetStructMemory(), bIsSparse, /*bIsStruct=*/true);
+
+				// If this is a container property, we must take special measures to use the base address of the property's value; for instance,
+				// the array property's PropertyDefaultBaseAddress points to an FScriptArray*, while PropertyDefaultAddress points to the 
+				// FScriptArray's Data pointer.
+				if (bIsContainer)
+				{
+					PropertyDefaultAddress = PropertyDefaultBaseAddress;
+				}
+
+				NodeDefaultValue = GetDefaultValueAsString(PropertyDefaultAddress, Prop, bUseDisplayName);
+			}
+			
+			if (DefaultValue.IsEmpty())
+			{
+				DefaultValue = NodeDefaultValue;
+			}
+
+			if (DelimitedValue.Len() > 0 && NodeDefaultValue.Len() > 0)
+			{
+				DelimitedValue += TEXT(", ");
+			}
+			DelimitedValue += NodeDefaultValue;
+
+			if (!ensureAlwaysMsgf(NodeDefaultValue == DefaultValue, TEXT("Default values differ for different objects of property '%s'. First: \"%s\", Other: \"%s\""), *Prop->GetNameCPP(), *DefaultValue, *NodeDefaultValue))
+			{
+				bAllSame = false;
+			}
+		}
+	}
+	else if (FObjectPropertyNode* ObjectNode = FindObjectItemParent())
+	{
+		// Get an iterator for the enclosing objects.
+		for (int32 ObjIndex = 0; ObjIndex < ObjectNode->GetNumObjects(); ++ObjIndex)
+		{
+			UObject* Object = ObjectNode->GetUObject( ObjIndex );
+			TSharedPtr<FPropertyItemValueDataTrackerSlate> ValueTracker = GetValueTracker(Object, ObjIndex);
+
+			if (Object && ValueTracker.IsValid())
+			{
+				const FString NodeDefaultValue = GetDefaultValueAsStringForObject( *ValueTracker, Object, Prop, bUseDisplayName );
+
+				if (DefaultValue.IsEmpty())
+				{
+					DefaultValue = NodeDefaultValue;
+				}
+
+				if (DelimitedValue.Len() > 0 && NodeDefaultValue.Len() > 0)
+				{
+					DelimitedValue += TEXT(", ");
+				}
+				DelimitedValue += NodeDefaultValue;
+
+				if (!ensureAlwaysMsgf(NodeDefaultValue == DefaultValue, TEXT("Default values differ for different objects of property '%s'. First: \"%s\", Other: \"%s\""), *Prop->GetNameCPP(), *DefaultValue, *NodeDefaultValue))
+				{
+					bAllSame = false;
+				}
+			}
+		}
+	}
+
+	return bAllSame ? DefaultValue : DelimitedValue; 
+}
+
+FText FPropertyNode::GetResetToDefaultLabel()
+{
+	FString DefaultValue = GetDefaultValueAsString();
+	FText OutLabel = GetDisplayName();
+	if (DefaultValue.Len())
+	{
+		const int32 MaxValueLen = 60;
+
+		if (DefaultValue.Len() > MaxValueLen)
+		{
+			DefaultValue.LeftInline( MaxValueLen, false );
+			DefaultValue += TEXT( "..." );
+		}
+
+		return FText::Format(NSLOCTEXT("FPropertyNode", "ResetToDefaultLabelFmt", "{0}: {1}"), OutLabel, FText::FromString(MoveTemp(DefaultValue)));
+	}
+
+	return OutLabel;
+}
+
+bool FPropertyNode::IsReorderable()
+{
+	FProperty* NodeProperty = GetProperty();
+	if (NodeProperty == nullptr)
+	{
+		return false;
+	}
+	// It is reorderable if the parent is an array and metadata doesn't prohibit it
+	const FArrayProperty* OuterArrayProp = NodeProperty->GetOwner<FArrayProperty>();
+
+	static const FName Name_DisableReordering("EditFixedOrder");
+	static const FName NAME_ArraySizeEnum("ArraySizeEnum");
+	return OuterArrayProp != nullptr 
+		&& !FRuntimeMetaData::HasMetaData(OuterArrayProp, Name_DisableReordering)
+		&& !IsEditConst()
+		&& !FRuntimeMetaData::HasMetaData(OuterArrayProp, NAME_ArraySizeEnum)
+		&& !FApp::IsGame();
+}
+
+/**
+ * Helper function to obtain the display name for an enum property
+ * @param InEnum		The enum whose metadata to pull from
+ * @param DisplayName	The name of the enum value to adjust
+ *
+ * @return	true if the DisplayName has been changed
+ */
+bool FPropertyNode::AdjustEnumPropDisplayName( UEnum *InEnum, FString& DisplayName ) const
+{
+	// see if we have alternate text to use for displaying the value
+	UMetaData* PackageMetaData = InEnum->GetOutermost()->GetMetaData();
+	if (PackageMetaData)
+	{
+		FName AltDisplayName = FName(*(DisplayName+TEXT(".DisplayName")));
+		FString ValueText = PackageMetaData->GetValue(InEnum, AltDisplayName);
+		if (ValueText.Len() > 0)
+		{
+			// use the alternate text for this enum value
+			DisplayName = ValueText;
+			return true;
+		}
+	}	
+
+	//DisplayName has been unmodified
+	return false;
+}
+
+/**Walks up the hierachy and return true if any parent node is a favorite*/
+bool FPropertyNode::IsChildOfFavorite (void) const
+{
+	for (const FPropertyNode* TestParentNode = GetParentNode(); TestParentNode != NULL; TestParentNode = TestParentNode->GetParentNode())
+	{
+		if (TestParentNode->HasNodeFlags(EPropertyNodeFlags::IsFavorite))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+/**
+ * Destroys all node within the hierarchy
+ */
+void FPropertyNode::DestroyTree(const bool bInDestroySelf)
+{
+	ChildNodes.Empty();
+}
+
+/**
+ * Marks windows as visible based on the filter strings (EVEN IF normally NOT EXPANDED)
+ */
+void FPropertyNode::FilterNodes( const TArray<FString>& InFilterStrings, const bool bParentSeenDueToFiltering )
+{
+	if (const TSharedPtr<FPropertyNode>& KeyNode = GetPropertyKeyNode())
+	{
+		KeyNode->FilterNodes(InFilterStrings);						
+	}
+
+	//clear flags first.  Default to hidden
+	SetNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering | EPropertyNodeFlags::IsSeenDueToChildFiltering | EPropertyNodeFlags::IsParentSeenDueToFiltering, false);
+	SetNodeFlags(EPropertyNodeFlags::IsBeingFiltered, InFilterStrings.Num() > 0 );
+
+	//FObjectPropertyNode* ParentPropertyNode = FindObjectItemParent();
+	//@todo slate property window
+	bool bMultiObjectOnlyShowDiffering = false;/*TopPropertyWindow->HasFlags(EPropertyWindowFlags::ShowOnlyDifferingItems) && (ParentPropertyNode->GetNumObjects()>1)*/;
+
+	if (InFilterStrings.Num() > 0 /*|| (TopPropertyWindow->HasFlags(EPropertyWindowFlags::ShowOnlyModifiedItems)*/ || bMultiObjectOnlyShowDiffering)
+	{
+		//if filtering, default to NOT-seen
+		bool bPassedFilter = false;	//assuming that we aren't filtered
+
+		// Populate name aliases acceptable for searching / filtering
+		FText DisplayName = GetDisplayName();
+		const FString& DisplayNameStr = DisplayName.ToString();
+		TArray <FString> AcceptableNames;
+		AcceptableNames.Add(DisplayNameStr);
+
+		// For containers, check if base class metadata in parent includes 'TitleProperty', add corresponding value to filter names if so.
+		static const FName TitlePropertyFName = FName(TEXT("TitleProperty"));
+		const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+		if (ParentNode && ParentNode->GetProperty())
+		{
+			const FString& TitleProperty = FRuntimeMetaData::GetMetaData(ParentNode->GetProperty(), TitlePropertyFName);
+			if (!TitleProperty.IsEmpty())
+			{
+				if (TSharedPtr<FPropertyNode> TitlePropertyNode = FindChildPropertyNode(*TitleProperty, true))
+				{
+					FString TitlePropertyValue;
+					if (TitlePropertyNode->GetPropertyValueString(TitlePropertyValue, true /*bAllowAlternateDisplayValue*/) != FPropertyAccess::Result::Fail)
+					{
+						AcceptableNames.Add(TitlePropertyValue);
+					}
+				}
+			}
+		}
+
+		// Get the basic name as well of the property
+		FProperty* TheProperty = GetProperty();
+		if (TheProperty && (TheProperty->GetName() != DisplayNameStr))
+		{
+			AcceptableNames.Add(TheProperty->GetName());
+		}
+
+		bPassedFilter = IsFilterAcceptable(AcceptableNames, InFilterStrings);
+
+		if (bPassedFilter)
+		{
+			SetNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering, true);
+		} 
+		SetNodeFlags(EPropertyNodeFlags::IsParentSeenDueToFiltering, bParentSeenDueToFiltering);
+	}
+	else
+	{
+		//indicating that this node should not be force displayed, but opened normally
+		SetNodeFlags(EPropertyNodeFlags::IsParentSeenDueToFiltering, true);
+	}
+
+	// default to doing only one pass
+	int32 StartRecursionPass = HasNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering) ? 1 : 0;
+	//Pass 1, if a pass 1 exists (object or category), is to see if there are any children that pass the filter, if any do, trim the tree to the leaves.
+	//	This will stop categories from showing ALL properties if they pass the filter AND a child passes the filter
+	//Pass 0, if no child exists that passes the filter OR this node didn't pass the filter
+	for (int32 RecursionPass = StartRecursionPass; RecursionPass >= 0; --RecursionPass)
+	{
+		for (int32 scan = 0; scan < ChildNodes.Num(); ++scan)
+		{
+			TSharedPtr<FPropertyNode>& ScanNode = ChildNodes[scan];
+			check(ScanNode.IsValid());
+			//default to telling the children this node is NOT visible, therefore if not in the base pass, only filtered nodes will survive the filtering process.
+			bool bChildParamParentVisible = false;
+			//if we're at the base pass, tell the children the truth about visibility
+			if (RecursionPass == 0)
+			{
+				bChildParamParentVisible = bParentSeenDueToFiltering || HasNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering);
+			}
+			ScanNode->FilterNodes(InFilterStrings, bChildParamParentVisible);
+
+			if (ScanNode->HasNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering | EPropertyNodeFlags::IsSeenDueToChildFiltering))
+			{
+				SetNodeFlags(EPropertyNodeFlags::IsSeenDueToChildFiltering, true);
+			}
+		}
+
+		//now that we've tried a pass at our children, if any of them have been successfully seen due to filtering, just quit now
+		if (HasNodeFlags(EPropertyNodeFlags::IsSeenDueToChildFiltering))
+		{
+			break;
+		}
+	}
+}
+
+void FPropertyNode::ProcessSeenFlags(const bool bParentAllowsVisible )
+{
+	// Set initial state first
+	SetNodeFlags(EPropertyNodeFlags::IsSeen, false);
+	SetNodeFlags(EPropertyNodeFlags::IsSeenDueToChildFavorite, false );
+
+	bool bAllowChildrenVisible;
+
+	if ( AsObjectNode() )
+	{
+		bAllowChildrenVisible = true;
+	}
+	else
+	{
+		//can't show children unless they are seen due to child filtering
+		bAllowChildrenVisible = !!HasNodeFlags(EPropertyNodeFlags::IsSeenDueToChildFiltering);	
+	}
+
+	//process children
+	for (int32 scan = 0; scan < ChildNodes.Num(); ++scan)
+	{
+		TSharedPtr<FPropertyNode>& ScanNode = ChildNodes[scan];
+		check(ScanNode.IsValid());
+		ScanNode->ProcessSeenFlags(bParentAllowsVisible && bAllowChildrenVisible );	//both parent AND myself have to allow children
+	}
+
+	if (HasNodeFlags(EPropertyNodeFlags::IsSeenDueToFiltering | EPropertyNodeFlags::IsSeenDueToChildFiltering))
+	{
+		SetNodeFlags(EPropertyNodeFlags::IsSeen, true); 
+	}
+	else 
+	{
+		//Finally, apply the REAL IsSeen
+		SetNodeFlags(EPropertyNodeFlags::IsSeen, bParentAllowsVisible && HasNodeFlags(EPropertyNodeFlags::IsParentSeenDueToFiltering));
+	}
+}
+
+/**
+ * Marks windows as visible based their favorites status
+ */
+void FPropertyNode::ProcessSeenFlagsForFavorites(void)
+{
+	if( !HasNodeFlags(EPropertyNodeFlags::IsFavorite) ) 
+	{
+		bool bAnyChildFavorites = false;
+		//process children
+		for (int32 scan = 0; scan < ChildNodes.Num(); ++scan)
+		{
+			TSharedPtr<FPropertyNode>& ScanNode = ChildNodes[scan];
+			check(ScanNode.IsValid());
+			ScanNode->ProcessSeenFlagsForFavorites();
+			bAnyChildFavorites = bAnyChildFavorites || ScanNode->HasNodeFlags(EPropertyNodeFlags::IsFavorite | EPropertyNodeFlags::IsSeenDueToChildFavorite);
+		}
+		if (bAnyChildFavorites)
+		{
+			SetNodeFlags(EPropertyNodeFlags::IsSeenDueToChildFavorite, true);
+		}
+	}
+}
+
+
+void FPropertyNode::NotifyPreChange( FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook )
+{
+	TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain( PropertyAboutToChange );
+	NotifyPreChangeInternal(PropertyChain, PropertyAboutToChange, InNotifyHook);
+}
+
+void FPropertyNode::NotifyPreChange( FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook, const TSet<UObject*>& AffectedInstances )
+{
+	TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain( PropertyAboutToChange, AffectedInstances );
+	NotifyPreChangeInternal(PropertyChain, PropertyAboutToChange, InNotifyHook);
+}
+
+void FPropertyNode::NotifyPreChange( FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook, TSet<UObject*>&& AffectedInstances )
+{
+	TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain( PropertyAboutToChange, MoveTemp(AffectedInstances) );
+	NotifyPreChangeInternal(PropertyChain, PropertyAboutToChange, InNotifyHook);
+}
+
+void FPropertyNode::NotifyPreChangeInternal( TSharedRef<FEditPropertyChain> PropertyChain, FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook )
+{
+	// Call through to the property window's notify hook.
+	if( InNotifyHook )
+	{
+		if ( PropertyChain->Num() == 0 )
+		{
+			InNotifyHook->NotifyPreChange( PropertyAboutToChange );
+		}
+		else
+		{
+			InNotifyHook->NotifyPreChange( &PropertyChain.Get() );
+		}
+	}
+
+	FObjectPropertyNode* ObjectNode = FindObjectItemParent();
+	if( ObjectNode )
+	{
+		FProperty* CurProperty = PropertyAboutToChange;
+
+		// Call PreEditChange on the object chain.
+		while ( true )
+		{
+			for( TPropObjectIterator Itor( ObjectNode->ObjectIterator() ) ; Itor ; ++Itor )
+			{
+				UObject* Object = Itor->Get();
+				if (IEditableObject* EditableObject = Cast<IEditableObject>(Object))
+				{
+					if (ensure(Object) && PropertyChain->Num() == 0)
+					{
+						EditableObject->RuntimePreEditChange(Property.Get());
+
+					}
+					else if (ensure(Object))
+					{
+						EditableObject->RuntimePreEditChange(*PropertyChain);
+					}
+				}
+			}
+
+			// Pass this property to the parent's PreEditChange call.
+			CurProperty = ObjectNode->GetStoredProperty();
+			FObjectPropertyNode* PreviousObjectNode = ObjectNode;
+
+			// Traverse up a level in the nested object tree.
+			ObjectNode = NotifyFindObjectItemParent( ObjectNode );
+			if ( !ObjectNode )
+			{
+				// We've hit the root -- break.
+				break;
+			}
+			else if ( PropertyChain->Num() > 0 )
+			{
+				PropertyChain->SetActivePropertyNode( CurProperty->GetOwnerProperty() );
+				for ( FPropertyNode* BaseItem = PreviousObjectNode; BaseItem && BaseItem != ObjectNode; BaseItem = BaseItem->GetParentNode())
+				{
+					FProperty* ItemProperty = BaseItem->GetProperty();
+					if ( ItemProperty == NULL )
+					{
+						// if this property item doesn't have a Property, skip it...it may be a category item or the virtual
+						// item used as the root for an inline object
+						continue;
+					}
+
+					// skip over property window items that correspond to a single element in a static array, or
+					// the inner property of another FProperty (e.g. FArrayProperty->Inner)
+					if ( BaseItem->ArrayIndex == INDEX_NONE && ItemProperty->GetOwnerProperty() == ItemProperty )
+					{
+						PropertyChain->SetActiveMemberPropertyNode(ItemProperty);
+					}
+				}
+			}
+		}
+	}
+
+	// Broadcast the change to any listeners
+	BroadcastPropertyPreChangeDelegates();
+}
+
+void FPropertyNode::NotifyPostChange( FPropertyChangedEvent& InPropertyChangedEvent, class FNotifyHook* InNotifyHook )
+{
+	TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain( InPropertyChangedEvent.Property );
+	
+	// remember the property that was the chain's original active property; this will correspond to the outermost property of struct/array that was modified
+	FProperty* const OriginalActiveProperty = PropertyChain->GetActiveMemberNode() ? PropertyChain->GetActiveMemberNode()->GetValue() : nullptr;
+
+	// invalidate the entire chain of objects in the hierarchy
+	{
+		FComplexPropertyNode* ComplexNode = FindComplexParent();
+		while (ComplexNode)
+		{
+			ComplexNode->InvalidateCachedState();
+
+			// FindComplexParent returns itself if the node is an object, so step up the hierarchy to get to its actual parent object
+			FPropertyNode* CurrentParent = ComplexNode->GetParentNode();
+			ComplexNode = CurrentParent != nullptr ? CurrentParent->FindComplexParent() : nullptr;
+		}
+	}
+
+	FObjectPropertyNode* ObjectNode = FindObjectItemParent();
+	if( ObjectNode )
+	{
+		TWeakPtr<FObjectPropertyNode> ObjectNodeAsWeakPtr = ObjectNode->SharedThis<FObjectPropertyNode>(ObjectNode);
+		TWeakPtr<FPropertyNode> ThisAsWeakPtr = AsShared();
+
+		FProperty* CurProperty = InPropertyChangedEvent.Property;
+
+		// Fire ULevel::LevelDirtiedEvent when falling out of scope.
+		FScopedLevelDirtied	LevelDirtyCallback;
+
+		// Call PostEditChange on the object chain.
+		while ( true )
+		{
+			TArray<FString> ObjectPaths;
+			TArray<TWeakObjectPtr<UObject>> WeakObjects;
+			// It's possible that PostEditChangeProperty may cause a construction script to re-run
+			// which will invalidate the PropObjectIterator. We need to instead cache all of the objects
+			// before emitting any change events to ensure there is a PostChange for every PreChange.
+			for (TPropObjectIterator Itor(ObjectNode->ObjectIterator()); Itor; ++Itor)
+			{
+				WeakObjects.Add(*Itor);
+				ObjectPaths.Add((*Itor)->GetPathName());
+			}
+
+			for (int32 CurrentObjectIndex = 0; CurrentObjectIndex < WeakObjects.Num(); ++CurrentObjectIndex)
+			{
+				UObject* Object = WeakObjects[CurrentObjectIndex].Get();
+				if (Object == nullptr)
+				{
+					// If our weak pointer has gone out of scope, it means that a prior object has destroyed it, 
+					// eg. by causing a blueprint construction script to run (which is triggered by PostEditChangeProperty())
+					// Find a new copy now.
+					Object = FindObject<UObject>(nullptr, *ObjectPaths[CurrentObjectIndex]);
+					if (Object == nullptr)
+					{
+						continue;
+					}
+				}
+
+				// Use a scope to ensure that only local variable are use in the loop.
+				// Since this object can be destroyed in this loop.
+				auto ScopePostEditChange = [&PropertyChain, &InPropertyChangedEvent, &CurProperty, CurrentObjectIndex](UObject* Object)
+				{
+					// copy the property changed event
+					FPropertyChangedEvent ChangedEvent = CurProperty != InPropertyChangedEvent.Property ? 
+						FPropertyChangedEvent(CurProperty, InPropertyChangedEvent.ChangeType) : 
+						InPropertyChangedEvent;
+					ChangedEvent.ObjectIteratorIndex = CurrentObjectIndex;
+
+					if (PropertyChain->Num() == 0)
+					{
+						if (IEditableObject* EditableObject = Cast<IEditableObject>(Object))
+						{
+							EditableObject->RuntimePostEditChangeProperty(ChangedEvent);
+						}
+					}
+					else
+					{
+						FPropertyChangedChainEvent ChainEvent(*PropertyChain, ChangedEvent);
+						ChainEvent.ObjectIteratorIndex = CurrentObjectIndex;
+						if (IEditableObject* EditableObject = Cast<IEditableObject>(Object))
+						{
+							EditableObject->RuntimePostEditChangeChainProperty(ChainEvent);
+						}
+					}
+				};
+
+				ScopePostEditChange(Object);
+				LevelDirtyCallback.Request();
+			}
+
+			if (!ThisAsWeakPtr.IsValid())
+			{
+				UE_LOG(LogPropertyNode, Error, TEXT("The FPropertyNode was destroy while processing the PostEditChangeProperty or PostEditChangeChainProperty."));
+				// Redraw viewports
+				//FEditorSupportDelegates::RedrawAllViewports.Broadcast();
+				return;
+			}
+
+			if (!ObjectNodeAsWeakPtr.IsValid())
+			{
+				ObjectNode = nullptr;
+				UE_LOG(LogPropertyNode, Error, TEXT("Object for property '%s, was valid before the PostEditChange callback and now it's invalid"), *Property->GetName());
+				break;
+			}
+
+			// Pass this property to the parent's PostEditChange call.
+			CurProperty = ObjectNode->GetStoredProperty();
+			FObjectPropertyNode* PreviousObjectNode = ObjectNode;
+
+			// Traverse up a level in the nested object tree.
+			ObjectNode = NotifyFindObjectItemParent( ObjectNode );
+			if ( !ObjectNode )
+			{
+				// We've hit the root -- break.
+				break;
+			}
+			else if ( PropertyChain->Num() > 0 )
+			{
+				PropertyChain->SetActivePropertyNode(CurProperty->GetOwnerProperty());
+				for ( FPropertyNode* BaseItem = PreviousObjectNode; BaseItem && BaseItem != ObjectNode; BaseItem = BaseItem->GetParentNode())
+				{
+					FProperty* ItemProperty = BaseItem->GetProperty();
+					if ( ItemProperty == NULL )
+					{
+						// if this property item doesn't have a Property, skip it...it may be a category item or the virtual
+						// item used as the root for an inline object
+						continue;
+					}
+
+					// skip over property window items that correspond to a single element in a static array, or
+					// the inner property of another FProperty (e.g. FArrayProperty->Inner)
+					if ( BaseItem->GetArrayIndex() == INDEX_NONE && ItemProperty->GetOwnerProperty() == ItemProperty )
+					{
+						PropertyChain->SetActiveMemberPropertyNode(ItemProperty);
+					}
+				}
+			}
+		}
+	}
+
+	// Broadcast the change to any listeners
+	BroadcastPropertyChangedDelegates(InPropertyChangedEvent);
+	BroadcastPropertyChangedDelegates();
+
+	// Call through to the property window's notify hook.
+	if( InNotifyHook )
+	{
+		if ( PropertyChain->Num() == 0 )
+		{
+			InNotifyHook->NotifyPostChange( InPropertyChangedEvent, InPropertyChangedEvent.Property );
+		}
+		else
+		{
+			PropertyChain->SetActiveMemberPropertyNode( OriginalActiveProperty );
+			PropertyChain->SetActivePropertyNode( InPropertyChangedEvent.Property);
+		
+			InPropertyChangedEvent.SetActiveMemberProperty(OriginalActiveProperty);
+			InNotifyHook->NotifyPostChange( InPropertyChangedEvent, &PropertyChain.Get() );
+		}
+	}
+
+
+	if( OriginalActiveProperty )
+	{
+		//if i have metadata forcing other property windows to rebuild
+		const FString& MetaData = FRuntimeMetaData::GetMetaData(OriginalActiveProperty, TEXT("ForceRebuildProperty"));
+
+		if( MetaData.Len() > 0 )
+		{
+			// We need to find the property node beginning at the root/parent, not at our own node.
+			ObjectNode = FindObjectItemParent();
+			check(ObjectNode != NULL);
+
+			TSharedPtr<FPropertyNode> ForceRebuildNode = ObjectNode->FindChildPropertyNode( FName(*MetaData), true );
+
+			if( ForceRebuildNode.IsValid() )
+			{
+				ForceRebuildNode->RequestRebuildChildren();
+			}
+		}
+	}
+
+	// The value has changed so the cached value could be invalid
+	// Need to recurse here as we might be editing a struct with child properties that need re-caching
+	ClearCachedReadAddresses(true);
+
+	// Redraw viewports
+	//FEditorSupportDelegates::RedrawAllViewports.Broadcast();
+}
+
+
+void FPropertyNode::BroadcastPropertyChangedDelegates()
+{
+	PropertyValueChangedEvent.Broadcast();
+
+	// Walk through the parents and broadcast
+	FPropertyNode* LocalParentNode = GetParentNode();
+	while( LocalParentNode )
+	{
+		if( LocalParentNode->OnChildPropertyValueChanged().IsBound() )
+		{
+			LocalParentNode->OnChildPropertyValueChanged().Broadcast();
+		}
+
+		LocalParentNode = LocalParentNode->GetParentNode();
+	}
+}
+
+void FPropertyNode::BroadcastPropertyChangedDelegates(const FPropertyChangedEvent& Event)
+{
+	PropertyValueChangedDelegate.Broadcast(Event);
+
+	// Walk through the parents and broadcast
+	FPropertyNode* LocalParentNode = GetParentNode();
+	while( LocalParentNode )
+	{
+		if( LocalParentNode->OnChildPropertyValueChangedWithData().IsBound() )
+		{
+			LocalParentNode->OnChildPropertyValueChangedWithData().Broadcast(Event);
+		}
+
+		LocalParentNode = LocalParentNode->GetParentNode();
+	}
+}
+
+void FPropertyNode::BroadcastPropertyPreChangeDelegates()
+{
+	PropertyValuePreChangeEvent.Broadcast();
+
+	// Walk through the parents and broadcast
+	FPropertyNode* LocalParentNode = GetParentNode();
+	while (LocalParentNode)
+	{
+		if (LocalParentNode->OnChildPropertyValuePreChange().IsBound())
+		{
+			LocalParentNode->OnChildPropertyValuePreChange().Broadcast();
+		}
+
+		LocalParentNode = LocalParentNode->GetParentNode();
+	}
+
+}
+
+void FPropertyNode::BroadcastPropertyResetToDefault()
+{
+	PropertyResetToDefaultEvent.Broadcast();
+}
+
+void FPropertyNode::GetExpandedChildPropertyPaths(TSet<FString>& OutExpandedChildPropertyPaths) const
+{
+	TArray<const FPropertyNode*> RecursiveStack;
+	RecursiveStack.Add(this);
+
+	do
+	{
+		const FPropertyNode* SearchNode = RecursiveStack.Pop();
+		if (SearchNode->HasNodeFlags(EPropertyNodeFlags::Expanded))
+		{
+			OutExpandedChildPropertyPaths.Add(SearchNode->PropertyPath);
+
+			for (int32 Index = 0; Index < SearchNode->GetNumChildNodes(); ++Index)
+			{
+				TSharedPtr<FPropertyNode> ChildNode = SearchNode->GetChildNode(Index);
+				if (ChildNode.IsValid())
+				{
+					RecursiveStack.Push(ChildNode.Get());
+				}
+			}
+		}
+	} while (RecursiveStack.Num() > 0);
+}
+
+void FPropertyNode::SetExpandedChildPropertyNodes(const TSet<FString>& InNodesToExpand)
+{
+	TArray<FPropertyNode*> RecursiveStack;
+	RecursiveStack.Add(this);
+
+	do
+	{
+		FPropertyNode* SearchNode = RecursiveStack.Pop();
+		if (InNodesToExpand.Contains(SearchNode->PropertyPath))
+		{
+			SearchNode->SetNodeFlags(EPropertyNodeFlags::Expanded, true);
+
+			// Lets recurse over this nodes children to see if they need to be expanded
+			for (int32 Index = 0; Index < SearchNode->GetNumChildNodes(); ++Index)
+			{
+				TSharedPtr<FPropertyNode> ChildNode = SearchNode->GetChildNode(Index);
+				if (ChildNode.IsValid())
+				{
+					RecursiveStack.Push(ChildNode.Get());
+				}
+			}
+		}
+		else
+		{
+			// Collapse the target node if its not within the list of expanded nodes.
+			SearchNode->SetNodeFlags(EPropertyNodeFlags::Expanded, false);
+		}
+	} while (RecursiveStack.Num() > 0);
+}
+
+void FPropertyNode::SetIgnoreInstancedReference()
+{
+	bIgnoreInstancedReference = true;
+}
+
+bool FPropertyNode::IsIgnoringInstancedReference() const
+{
+	return bIgnoreInstancedReference;
+}
+
+FDelegateHandle FPropertyNode::SetOnRebuildChildren(const FSimpleDelegate& InOnRebuildChildren)
+{
+	return OnRebuildChildrenEvent.Add(InOnRebuildChildren);
+}
+
+TSharedPtr< FPropertyItemValueDataTrackerSlate > FPropertyNode::GetValueTracker( UObject* Object, uint32 ObjIndex )
+{
+	ensure( AsItemPropertyNode() );
+
+	TSharedPtr< FPropertyItemValueDataTrackerSlate > RetVal;
+
+	if( Object && Object != UObject::StaticClass() && Object != UObject::StaticClass()->GetDefaultObject() )
+	{
+		if( !ObjectDefaultValueTrackers.IsValidIndex(ObjIndex) )
+		{
+			uint32 NumToAdd = (ObjIndex - ObjectDefaultValueTrackers.Num()) + 1;
+			while( NumToAdd > 0 )
+			{
+				ObjectDefaultValueTrackers.Add( TSharedPtr<FPropertyItemValueDataTrackerSlate> () );
+				--NumToAdd;
+			}
+		}
+
+		TSharedPtr<FPropertyItemValueDataTrackerSlate>& ValueTracker = ObjectDefaultValueTrackers[ObjIndex];
+		if( !ValueTracker.IsValid() )
+		{
+			ValueTracker = MakeShareable( new FPropertyItemValueDataTrackerSlate( this, Object ) );
+		}
+		else
+		{
+			ValueTracker->Reset(this, Object);
+		}
+		RetVal = ValueTracker;
+
+	}
+
+	return RetVal;
+
+}
+
+TSharedRef<FEditPropertyChain> FPropertyNode::BuildPropertyChain( FProperty* InProperty ) const
+{
+	TSharedRef<FEditPropertyChain> PropertyChain( MakeShareable( new FEditPropertyChain ) );
+
+	const FPropertyNode* ItemNode = this;
+
+	const FComplexPropertyNode* ComplexNode = FindComplexParent();
+	FProperty* MemberProperty = InProperty;
+
+	do
+	{
+		if (ItemNode == ComplexNode && PropertyChain->GetHead())
+		{
+			MemberProperty = PropertyChain->GetHead()->GetValue();
+		}
+
+		FProperty* TheProperty	= ItemNode->Property.Get();
+		if ( TheProperty )
+		{
+			// Skip over property window items that correspond to a single element in a static array,
+			// or the inner property of another FProperty (e.g. FArrayProperty->Inner).
+			if ( ItemNode->GetArrayIndex() == INDEX_NONE && TheProperty->GetOwnerProperty() == TheProperty )
+			{
+				PropertyChain->AddHead( TheProperty );
+			}
+		}
+		ItemNode = ItemNode->GetParentNode();
+	} 
+	while( ItemNode != NULL );
+
+	// If the modified property was a property of the object at the root of this property window, the member property will not have been set correctly
+	if (ItemNode == ComplexNode && PropertyChain->GetHead())
+	{
+		MemberProperty = PropertyChain->GetHead()->GetValue();
+	}
+
+	PropertyChain->SetActivePropertyNode( InProperty );
+	PropertyChain->SetActiveMemberPropertyNode( MemberProperty );
+
+	return PropertyChain;
+}
+
+TSharedRef<FEditPropertyChain> FPropertyNode::BuildPropertyChain( FProperty* InProperty, const TSet<UObject*>& InAffectedArchetypeInstances ) const
+{
+	TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain(InProperty);
+	PropertyChain->SetAffectedArchetypeInstances(InAffectedArchetypeInstances);
+	return PropertyChain;
+}
+
+TSharedRef<FEditPropertyChain> FPropertyNode::BuildPropertyChain( FProperty* InProperty, TSet<UObject*>&& InAffectedArchetypeInstances ) const
+{
+	TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain(InProperty);
+	PropertyChain->SetAffectedArchetypeInstances(MoveTemp(InAffectedArchetypeInstances));
+	return PropertyChain;
+}
+
+FPropertyChangedEvent& FPropertyNode::FixPropertiesInEvent(FPropertyChangedEvent& Event)
+{
+	ensure(Event.Property);
+
+	TSharedRef<FEditPropertyChain> PropertyChain = BuildPropertyChain(Event.Property);
+	auto MemberProperty = PropertyChain->GetActiveMemberNode() ? PropertyChain->GetActiveMemberNode()->GetValue() : NULL;
+	if (ensure(MemberProperty))
+	{
+		Event.SetActiveMemberProperty(MemberProperty);
+	}
+
+	return Event;
+}
+
+void FPropertyNode::SetInstanceMetaData(const FName& Key, const FString& Value)
+{
+	InstanceMetaData.Add(Key, Value);
+}
+
+const FString* FPropertyNode::GetInstanceMetaData(const FName& Key) const
+{
+	return InstanceMetaData.Find(Key);
+}
+
+const TMap<FName, FString>* FPropertyNode::GetInstanceMetaDataMap() const
+{
+	return &InstanceMetaData;
+}
+
+bool FPropertyNode::ParentOrSelfHasMetaData(const FName& MetaDataKey) const
+{
+	if (Property.IsValid() && FRuntimeMetaData::HasMetaData(Property.Get(), MetaDataKey))
+	{
+		return true;
+	}
+	
+	const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+	if (ParentNode.IsValid() && ParentNode->ParentOrSelfHasMetaData(MetaDataKey))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void FPropertyNode::InvalidateCachedState()
+{
+	bUpdateDiffersFromDefault = true;
+	bUpdateEditConstState = true;
+
+	for( TSharedPtr<FPropertyNode>& ChildNode : ChildNodes )
+	{
+		ChildNode->InvalidateCachedState();
+	}
+}
+
+/**
+ * Does the string compares to ensure this Name is acceptable to the filter that is passed in
+ * @return		Return True if this property should be displayed.  False if it should be culled
+ */
+bool FPropertyNode::IsFilterAcceptable(const TArray<FString>& InAcceptableNames, const TArray<FString>& InFilterStrings)
+{
+	bool bCompleteMatchFound = true;
+	if (InFilterStrings.Num())
+	{
+		//we have to make sure one name matches all criteria
+		for (int32 TestNameIndex = 0; TestNameIndex < InAcceptableNames.Num(); ++TestNameIndex)
+		{
+			bCompleteMatchFound = true;
+
+			FString TestName = InAcceptableNames[TestNameIndex];
+			for (int32 scan = 0; scan < InFilterStrings.Num(); scan++)
+			{
+				if (!TestName.Contains(InFilterStrings[scan])) 
+				{
+					bCompleteMatchFound = false;
+					break;
+				}
+			}
+			if (bCompleteMatchFound)
+			{
+				break;
+			}
+		}
+	}
+	return bCompleteMatchFound;
+}
+
+void FPropertyNode::PropagateContainerPropertyChange( UObject* ModifiedObject, const void* OriginalContainerAddr, EPropertyArrayChangeType::Type ChangeType, int32 Index, int32 SwapIndex /*= INDEX_NONE*/)
+{
+	TArray<UObject*> AffectedInstances;
+	GatherInstancesAffectedByContainerPropertyChange(ModifiedObject, OriginalContainerAddr, ChangeType, AffectedInstances);
+	PropagateContainerPropertyChange(ModifiedObject, OriginalContainerAddr, AffectedInstances, ChangeType, Index, SwapIndex);
+}
+
+void FPropertyNode::GatherInstancesAffectedByContainerPropertyChange(UObject* ModifiedObject, const void* OriginalContainerAddr, EPropertyArrayChangeType::Type ChangeType, TArray<UObject*>& OutAffectedInstances)
+{
+	check(OriginalContainerAddr);
+
+	FProperty* NodeProperty = GetProperty();
+
+	FPropertyNode* ParentPropertyNode = GetParentNode();
+	
+	FComplexPropertyNode* ComplexParentNode = FindComplexParent();
+
+	FProperty* ConvertedProperty = NULL;
+
+	if (ChangeType == EPropertyArrayChangeType::Add || ChangeType == EPropertyArrayChangeType::Clear)
+	{
+		ConvertedProperty = NodeProperty;
+	}
+	else
+	{
+		ConvertedProperty = NodeProperty->GetOwner<FProperty>();
+	}
+
+	TArray<UObject*> ArchetypeInstances, ObjectsToChange;
+	FPropertyNode* SubobjectPropertyNode = NULL;
+	UObject* Object = ModifiedObject;
+
+	if (Object->HasAnyFlags(RF_ClassDefaultObject|RF_ArchetypeObject))
+	{
+		// Object is a default subobject, collect all instances.
+		Object->GetArchetypeInstances(ArchetypeInstances);
+	}
+	else if (Object->HasAnyFlags(RF_DefaultSubObject) && Object->GetOuter()->HasAnyFlags(RF_ClassDefaultObject|RF_ArchetypeObject))
+	{
+		// Object is a default subobject of a default object. Get the subobject property node and use its owner instead.
+		for (SubobjectPropertyNode = FindObjectItemParent(); SubobjectPropertyNode && !SubobjectPropertyNode->GetProperty(); SubobjectPropertyNode = SubobjectPropertyNode->GetParentNode());
+		if (SubobjectPropertyNode != NULL)
+		{
+			// Switch the object to the owner default object and collect its instances.
+			Object = Object->GetOuter();	
+			Object->GetArchetypeInstances(ArchetypeInstances);
+		}
+	}
+
+	ObjectsToChange.Push(Object);
+
+	while (ObjectsToChange.Num() > 0)
+	{
+		check(ObjectsToChange.Num() > 0);
+
+		// Pop the first object to change
+		UObject* ObjToChange = ObjectsToChange[0];
+		UObject* ActualObjToChange = NULL;
+		ObjectsToChange.RemoveAt(0);
+		
+		if (SubobjectPropertyNode)
+		{
+			// If the original object is a subobject, get the current object's subobject too.
+			// In this case we're not going to modify ObjToChange but its default subobject.
+			ActualObjToChange = *(UObject**)SubobjectPropertyNode->GetValueBaseAddressFromObject(ObjToChange);
+		}
+		else
+		{
+			ActualObjToChange = ObjToChange;
+		}
+
+		if (ActualObjToChange != ModifiedObject)
+		{
+			uint8* Addr = NULL;
+
+			if (ChangeType == EPropertyArrayChangeType::Add || ChangeType == EPropertyArrayChangeType::Clear)
+			{
+				Addr = GetValueBaseAddressFromObject(ActualObjToChange);
+			}
+			else
+			{
+				Addr = ParentPropertyNode->GetValueBaseAddressFromObject(ActualObjToChange);
+			}
+
+			if (Addr != nullptr)
+			{
+				if (OriginalContainerAddr == Addr)
+				{
+					if (HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) || (ComplexParentNode && ComplexParentNode->AsStructureNode()))
+					{
+						// SparseClassData and StructureNodes will always return the same address from GetValueBaseAddressFromObject 
+						// (see FPropertyNode::GetStartAddressFromObject and FStructurePropertyNode::GetValueBaseAddress)
+						continue;
+					}
+
+					checkf(false, TEXT("PropagateContainerPropertyChange tried to propagate a change onto itself!"));
+				}
+
+				const bool bIsDefaultContainerContent = ConvertedProperty->Identical(OriginalContainerAddr, Addr, PPF_DeepComparison);
+				if (bIsDefaultContainerContent)
+				{
+					OutAffectedInstances.Add(ActualObjToChange);
+				}
+			}
+		}
+
+		for (int32 i=0; i < ArchetypeInstances.Num(); ++i)
+		{
+			UObject* Obj = ArchetypeInstances[i];
+
+			if (Obj->GetArchetype() == ObjToChange)
+			{
+				ObjectsToChange.Push(Obj);
+				ArchetypeInstances.RemoveAt(i--);
+			}
+		}
+	}
+}
+
+void FPropertyNode::DuplicateArrayEntry(FProperty* NodeProperty, FScriptArrayHelper& ArrayHelper, int32 Index)
+{
+	ArrayHelper.InsertValues(Index);
+
+	void* SrcAddress = ArrayHelper.GetRawPtr(Index + 1);
+	void* DestAddress = ArrayHelper.GetRawPtr(Index);
+
+	check(SrcAddress && DestAddress);
+
+	// Copy the selected item's value to the new item.
+	NodeProperty->CopyCompleteValue(DestAddress, SrcAddress);
+
+	if (FObjectProperty* ObjProp = CastField<FObjectProperty>(NodeProperty))
+	{
+		if (ObjProp->HasAnyPropertyFlags(CPF_InstancedReference))
+		{
+			UObject* CurrentObject = ObjProp->GetObjectPropertyValue(DestAddress);
+
+			// Make a deep copy
+			UObject* DuplicatedObject = DuplicateObject(CurrentObject, CurrentObject ? CurrentObject->GetOuter() : nullptr);
+			ObjProp->SetObjectPropertyValue(SrcAddress, DuplicatedObject);
+		}
+	}
+	else if (NodeProperty->HasAnyPropertyFlags(CPF_ContainsInstancedReference))
+	{
+		// If this is a container with instanced references within it the new entry will reference the old subobjects
+		// Go through and duplicate the subobjects so that each container has unique instances
+		FInstancedPropertyPath NodePropertyPath(NodeProperty);
+		FFindInstancedReferenceSubobjectHelper::ForEachInstancedSubObject<void*>(
+			NodePropertyPath,
+			SrcAddress,
+			[](const FInstancedSubObjRef& Ref, void* PropertyValueAddress)
+			{
+				UObject* Obj = Ref;
+				((FObjectProperty*)Ref.PropertyPath.Head())->SetObjectPropertyValue(PropertyValueAddress, DuplicateObject(Obj, Obj->GetOuter()));
+			}
+		);
+	}
+}
+
+void FPropertyNode::PropagateContainerPropertyChange( UObject* ModifiedObject, const void* OriginalContainerAddr, const TArray<UObject*>& AffectedInstances, EPropertyArrayChangeType::Type ChangeType, int32 Index, int32 SwapIndex /*= INDEX_NONE*/)
+{
+	check(OriginalContainerAddr);
+
+	FProperty* NodeProperty = GetProperty();
+
+	FPropertyNode* ParentPropertyNode = GetParentNode();
+	
+	FProperty* ConvertedProperty = NULL;
+
+	if (ChangeType == EPropertyArrayChangeType::Add || ChangeType == EPropertyArrayChangeType::Clear)
+	{
+		ConvertedProperty = NodeProperty;
+	}
+	else
+	{
+		ConvertedProperty = NodeProperty->GetOwner<FProperty>();
+	}
+
+	FArrayProperty* ArrayProperty = CastField<FArrayProperty>(ConvertedProperty);
+	FSetProperty* SetProperty = CastField<FSetProperty>(ConvertedProperty);
+	FMapProperty* MapProperty = CastField<FMapProperty>(ConvertedProperty);
+
+	check(ArrayProperty || SetProperty || MapProperty);
+
+	FPropertyNode* SubobjectPropertyNode = NULL;
+
+	UObject* Object = ModifiedObject;
+
+	if (Object->HasAnyFlags(RF_ClassDefaultObject|RF_ArchetypeObject))
+	{
+		// Object is a default subobject
+	}
+	else if (Object->HasAnyFlags(RF_DefaultSubObject) && Object->GetOuter()->HasAnyFlags(RF_ClassDefaultObject|RF_ArchetypeObject))
+	{
+		// Object is a default subobject of a default object. Get the subobject property node and use its owner instead.
+		for (SubobjectPropertyNode = FindObjectItemParent(); SubobjectPropertyNode && !SubobjectPropertyNode->GetProperty(); SubobjectPropertyNode = SubobjectPropertyNode->GetParentNode());
+		if (SubobjectPropertyNode != NULL)
+		{
+			// Switch the object to the owner default object
+			Object = Object->GetOuter();	
+		}
+	}
+	
+	for (UObject* InstanceToChange : AffectedInstances)
+	{
+		uint8* Addr = NULL;
+
+		if (ChangeType == EPropertyArrayChangeType::Add || ChangeType == EPropertyArrayChangeType::Clear)
+		{
+			Addr = GetValueBaseAddressFromObject(InstanceToChange);
+		}
+		else
+		{
+			Addr = ParentPropertyNode->GetValueBaseAddressFromObject(InstanceToChange);
+		}
+
+		if (ArrayProperty)
+		{
+			FScriptArrayHelper ArrayHelper(ArrayProperty, Addr);
+
+			int32 ElementToInitialize = -1;
+			switch (ChangeType)
+			{
+			case EPropertyArrayChangeType::Add:
+				ElementToInitialize = ArrayHelper.AddValue();
+				break;
+			case EPropertyArrayChangeType::Clear:
+				ArrayHelper.EmptyValues();
+				break;
+			case EPropertyArrayChangeType::Insert:
+				ArrayHelper.InsertValues(ArrayIndex, 1);
+				ElementToInitialize = ArrayIndex;
+				break;
+			case EPropertyArrayChangeType::Delete:
+				ArrayHelper.RemoveValues(ArrayIndex, 1);
+				break;
+			case EPropertyArrayChangeType::Duplicate:
+				DuplicateArrayEntry(NodeProperty, ArrayHelper, ArrayIndex);
+				break;
+			case EPropertyArrayChangeType::Swap:
+				if (SwapIndex != INDEX_NONE)
+				{
+					ArrayHelper.SwapValues(Index, SwapIndex);
+				}
+				break;
+			}
+		}	// End Array
+
+		else if (SetProperty)
+		{
+			FScriptSetHelper SetHelper(SetProperty, Addr);
+
+			int32 ElementToInitialize = -1;
+			switch (ChangeType)
+			{
+			case EPropertyArrayChangeType::Add:
+				ElementToInitialize = SetHelper.AddDefaultValue_Invalid_NeedsRehash();
+				SetHelper.Rehash();
+				break;
+			case EPropertyArrayChangeType::Clear:
+				SetHelper.EmptyElements();
+				break;
+			case EPropertyArrayChangeType::Insert:
+				check(false);	// Insert is not supported for sets
+				break;
+			case EPropertyArrayChangeType::Delete:
+				SetHelper.RemoveAt(SetHelper.FindInternalIndex(ArrayIndex));
+				SetHelper.Rehash();
+				break;
+			case EPropertyArrayChangeType::Duplicate:
+				check(false);	// Duplicate not supported on sets
+				break;
+			}
+		}	// End Set
+		else if (MapProperty)
+		{
+			FScriptMapHelper MapHelper(MapProperty, Addr);
+
+			// Check if the original value was the default value and change it only then
+			int32 ElementToInitialize = -1;
+			switch (ChangeType)
+			{
+			case EPropertyArrayChangeType::Add:
+				ElementToInitialize = MapHelper.AddDefaultValue_Invalid_NeedsRehash();
+				MapHelper.Rehash();
+				break;
+			case EPropertyArrayChangeType::Clear:
+				MapHelper.EmptyValues();
+				break;
+			case EPropertyArrayChangeType::Insert:
+				check(false);	// Insert is not supported for maps
+				break;
+			case EPropertyArrayChangeType::Delete:
+				MapHelper.RemoveAt(MapHelper.FindInternalIndex(ArrayIndex));
+				MapHelper.Rehash();
+				break;
+			case EPropertyArrayChangeType::Duplicate:
+				check(false);	// Duplicate is not supported for maps
+				break;
+			}
+		}	// End Map
+	}
+}
+
+void FPropertyNode::PropagatePropertyChange( UObject* ModifiedObject, const TCHAR* NewValue, const FString& PreviousValue )
+{
+	TArray<UObject*> ArchetypeInstances, ObjectsToChange;
+	FPropertyNode* SubobjectPropertyNode = NULL;
+	UObject* Object = ModifiedObject;
+
+	if (Object->HasAnyFlags(RF_ClassDefaultObject|RF_ArchetypeObject))
+	{
+		// Object is a default subobject, collect all instances.
+		Object->GetArchetypeInstances(ArchetypeInstances);
+	}
+	else if (Object->HasAnyFlags(RF_DefaultSubObject) && Object->GetOuter()->HasAnyFlags(RF_ClassDefaultObject|RF_ArchetypeObject))
+	{
+		// Object is a default subobject of a default object. Get the subobject property node and use its owner instead.
+		for (SubobjectPropertyNode = FindObjectItemParent(); SubobjectPropertyNode && !SubobjectPropertyNode->GetProperty(); SubobjectPropertyNode = SubobjectPropertyNode->GetParentNode());
+		if (SubobjectPropertyNode != NULL)
+		{
+			// Switch the object to the owner default object and collect its instances.
+			Object = Object->GetOuter();	
+			Object->GetArchetypeInstances(ArchetypeInstances);
+		}
+	}
+
+	static const FName FNAME_EditableWhenInherited = GET_MEMBER_NAME_CHECKED(UActorComponent,bEditableWhenInherited);
+	if (GetProperty()->GetFName() == FNAME_EditableWhenInherited && ModifiedObject->IsA<UActorComponent>() && FString(TEXT("False")) == NewValue)
+	{
+		//FBlueprintEditorUtils::HandleDisableEditableWhenInherited(ModifiedObject, ArchetypeInstances);
+	}
+
+	FPropertyNode*  Parent          = GetParentNode();
+	FProperty*      ParentProp      = Parent->GetProperty();
+	FArrayProperty* ParentArrayProp = CastField<FArrayProperty>(ParentProp);
+	FMapProperty*   ParentMapProp   = CastField<FMapProperty>(ParentProp);
+	FSetProperty*	ParentSetProp	= CastField<FSetProperty>(ParentProp);
+	FProperty*      Prop            = GetProperty();
+
+	if (ParentArrayProp && ParentArrayProp->Inner != Prop)
+	{
+		ParentArrayProp = nullptr;
+	}
+
+	if (ParentMapProp && ParentMapProp->KeyProp != Prop && ParentMapProp->ValueProp != Prop)
+	{
+		ParentMapProp = nullptr;
+	}
+
+	if (ParentSetProp && ParentSetProp->ElementProp != Prop)
+	{
+		ParentSetProp = nullptr;
+	}
+
+	ObjectsToChange.Push(Object);
+
+	while (ObjectsToChange.Num() > 0)
+	{
+		check(ObjectsToChange.Num() > 0);
+
+		// Pop the first object to change
+		UObject* ObjToChange = ObjectsToChange[0];
+		UObject* ActualObjToChange = NULL;
+		ObjectsToChange.RemoveAt(0);
+		
+		if (SubobjectPropertyNode)
+		{
+			// If the original object is a subobject, get the current object's subobject too.
+			// In this case we're not going to modify ObjToChange but its default subobject.
+			ActualObjToChange = *(UObject**)SubobjectPropertyNode->GetValueBaseAddressFromObject(ObjToChange);
+		}
+		else
+		{
+			ActualObjToChange = ObjToChange;
+		}
+
+		if (ActualObjToChange != ModifiedObject)
+		{
+			uint8* DestSimplePropAddr = GetValueBaseAddressFromObject(ActualObjToChange);
+			if (DestSimplePropAddr != nullptr)
+			{
+				FProperty* ComplexProperty = Prop;
+				TSharedPtr<FPropertyNode> ComplexPropertyNode = AsShared();
+				if (ParentArrayProp || ParentMapProp || ParentSetProp)
+				{
+					ComplexProperty = ParentProp;
+					ComplexPropertyNode = ParentNodeWeakPtr.Pin();
+				}
+				
+				uint8* DestComplexPropAddr = ComplexPropertyNode->GetValueBaseAddressFromObject(ActualObjToChange);
+				uint8* ModifiedComplexPropAddr = ComplexPropertyNode->GetValueBaseAddressFromObject(ModifiedObject);
+
+				bool bShouldImport = false;
+				{
+					uint8* TempComplexPropAddr = (uint8*)FMemory::Malloc(ComplexProperty->GetSize(), ComplexProperty->GetMinAlignment());
+					ComplexProperty->InitializeValue(TempComplexPropAddr);
+					ON_SCOPE_EXIT
+					{
+						ComplexProperty->DestroyValue(TempComplexPropAddr);
+						FMemory::Free(TempComplexPropAddr);
+					};
+
+					// Importing the previous value into the temporary property can potentially affect shared state (such as FText display string values), so we back-up the current value 
+					// before we do this, so that we can restore it once we've checked whether the two properties are identical
+					// This ensures that shared state keeps the correct value, even if the destination property itself isn't imported (or only partly imported, as is the case with arrays/maps/sets)
+					FString CurrentValue;
+					ComplexProperty->ExportText_Direct(CurrentValue, ModifiedComplexPropAddr, ModifiedComplexPropAddr, ModifiedObject, PPF_None);
+					ComplexProperty->ImportText_Direct(*PreviousValue, TempComplexPropAddr, ModifiedObject, PPF_SerializedAsImportText);
+					bShouldImport = ComplexProperty->Identical(DestComplexPropAddr, TempComplexPropAddr, PPF_DeepComparison);
+					ComplexProperty->ImportText_Direct(*CurrentValue, TempComplexPropAddr, ModifiedObject, PPF_None);
+				}
+
+				// Only import if the value matches the previous value of the property that changed
+				if (bShouldImport)
+				{
+					Prop->ImportText_Direct(NewValue, DestSimplePropAddr, ActualObjToChange, PPF_InstanceSubobjects);
+				}
+			}
+		}
+
+		for (int32 InstanceIndex = 0; InstanceIndex < ArchetypeInstances.Num(); ++InstanceIndex)
+		{
+			UObject* Obj = ArchetypeInstances[InstanceIndex];
+
+			if (Obj->GetArchetype() == ObjToChange)
+			{
+				ObjectsToChange.Push(Obj);
+				ArchetypeInstances.RemoveAt(InstanceIndex--);
+			}
+		}
+	}
+}
+
+void FPropertyNode::AddRestriction( TSharedRef<const class FPropertyRestriction> Restriction )
+{
+	Restrictions.AddUnique(Restriction);
+}
+
+bool FPropertyNode::IsHidden(const FString& Value, TArray<FText>* OutReasons) const
+{
+	bool bIsHidden = false;
+	for( auto It = Restrictions.CreateConstIterator() ; It ; ++It )
+	{
+		TSharedRef<const FPropertyRestriction> Restriction = (*It);
+		if( Restriction->IsValueHidden(Value) )
+		{
+			bIsHidden = true;
+			if (OutReasons)
+			{
+				OutReasons->Add(Restriction->GetReason());
+			}
+			else
+			{
+				break;
+			}
+		}
+	}
+
+	return bIsHidden;
+}
+
+bool FPropertyNode::IsDisabled(const FString& Value, TArray<FText>* OutReasons) const
+{
+	bool bIsDisabled = false;
+	for (const TSharedRef<const FPropertyRestriction>& Restriction : Restrictions)
+	{
+		if( Restriction->IsValueDisabled(Value) )
+		{
+			bIsDisabled = true;
+			if (OutReasons)
+			{
+				OutReasons->Add(Restriction->GetReason());
+			}
+			else
+			{
+				break;
+			}
+		}
+	}
+
+	return bIsDisabled;
+}
+
+bool FPropertyNode::IsRestricted(const FString& Value, TArray<FText>& OutReasons) const
+{
+	const bool bIsHidden = IsHidden(Value, &OutReasons);
+	const bool bIsDisabled = IsDisabled(Value, &OutReasons);
+	return (bIsHidden || bIsDisabled);
+}
+
+bool FPropertyNode::GenerateRestrictionToolTip(const FString& Value, FText& OutTooltip) const
+{
+	static FText ToolTipFormat = NSLOCTEXT("PropertyRestriction", "TooltipFormat ", "{0}{1}");
+	static FText MultipleRestrictionsToolTopAdditionFormat = NSLOCTEXT("PropertyRestriction", "MultipleRestrictionToolTipAdditionFormat ", "({0} restrictions...)");
+
+	TArray<FText> Reasons;
+	const bool bRestricted = IsRestricted(Value, Reasons);
+
+	FText Ret;
+	if( bRestricted && Reasons.Num() > 0 )
+	{
+		if( Reasons.Num() > 1 )
+		{
+			FText NumberOfRestrictions = FText::AsNumber(Reasons.Num());
+
+			OutTooltip = FText::Format(ToolTipFormat, Reasons[0], FText::Format(MultipleRestrictionsToolTopAdditionFormat,NumberOfRestrictions));
+		}
+		else
+		{
+			OutTooltip = FText::Format(ToolTipFormat, Reasons[0], FText());
+		}
+	}
+	return bRestricted;
+}
+
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyNode.h
new file mode 100644
index 0000000..1c249d1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyNode.h
@@ -0,0 +1,1321 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "UObject/UnrealType.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/EditConditionParser.h"
+
+class FNotifyHook;
+
+namespace soda
+{
+
+class FCategoryPropertyNode;
+class FComplexPropertyNode;
+class FEditConditionContext;
+class FEditConditionExpression;
+class FObjectPropertyNode;
+class FPropertyItemValueDataTrackerSlate;
+class FPropertyNode;
+class FStructurePropertyNode;
+class FPropertyRestriction;
+class FItemPropertyNode;
+class FDetailTreeNode;
+
+DECLARE_LOG_CATEGORY_EXTERN(LogPropertyNode, Log, All);
+
+namespace EPropertyNodeFlags
+{
+	typedef uint32 Type;
+
+	inline const Type	IsSeen = 1 << 0;	/** true if this node can be seen based on current parent expansion.  Does not take into account clipping*/
+	inline const Type	IsSeenDueToFiltering = 1 << 1;	/** true if this node has been accepted by the filter*/
+	inline const Type	IsSeenDueToChildFiltering = 1 << 2;	/** true if this node or one of it's children is seen due to filtering.  It will then be forced on as well.*/
+	inline const Type	IsParentSeenDueToFiltering = 1 << 3;	/** True if the parent was visible due to filtering*/
+	inline const Type	IsSeenDueToChildFavorite = 1 << 4;	/** True if this node is seen to it having a favorite as a child */
+
+	inline const Type	Expanded = 1 << 5;	/** true if this node should display its children*/
+	inline const Type	CanBeExpanded = 1 << 6;	/** true if this node is able to be expanded */
+
+	inline const Type	EditInlineNew = 1 << 7;	/** true if the property can be expanded into the property window. */
+
+	inline const Type	SingleSelectOnly = 1 << 8;	/** true if only a single object is selected. */
+	inline const Type  ShowCategories = 1 << 9;	/** true if this node should show categories.  Different*/
+
+	inline const Type  HasEverBeenExpanded = 1 << 10;	/** true if expand has ever been called on this node */
+
+	inline const Type	IsBeingFiltered = 1 << 11;	/** true if the node is being filtered. If this is true, seen flags should be checked for visibility.  If this is false the node has no filter and is visible */
+
+	inline const Type  IsFavorite = 1 << 12;	/** true if this item has been dubbed a favorite by the user */
+
+	inline const Type  NoChildrenDueToCircularReference = 1 << 13;	/** true if this node has no children (but normally would) due to circular referencing */
+
+	inline const Type	AutoExpanded = 1 << 14;	/** true if this node was autoexpanded due to being filtered */
+	inline const Type	ShouldShowHiddenProperties = 1 << 15;	/** true if this node should all properties not just those with the correct flag(s) to be shown in the editor */
+	inline const Type	IsAdvanced = 1 << 16;	/** true if the property node is advanced (i.e it only shows up in advanced sections) */
+	inline const Type	IsCustomized = 1 << 17;	/** true if this node's visual representation has been customized by the editor */
+
+	inline const Type	RequiresValidation = 1 << 18;	/** true if this node could unexpectedly change (array changes, editinlinenew changes) */
+
+	inline const Type	ShouldShowDisableEditOnInstance = 1 << 19;	/** true if this node should show child properties marked CPF_DisableEditOnInstance */
+
+	inline const Type	IsReadOnly = 1 << 20;	/** true if this node is overridden to appear as read-only */
+
+	inline const Type	SkipChildValidation = 1 << 21;	/** true if this node should skip child validation */
+
+	inline const Type  ShowInnerObjectProperties = 1 << 22;
+
+	inline const Type	HasCustomResetToDefault = 1 << 23;	/** true if this node's visual representation of reset to default has been customized*/
+
+	inline const Type	IsSparseClassData = 1 << 24;	/** true if the property on this node is part of a sparse class data structure */
+
+	inline const Type	ShouldShowInViewport = 1 << 25;	/** true if the property should be shown in the viewport context menu */
+
+	inline const Type	GameModeOnlyVisible = 1 << 26;
+
+	inline const Type 	NoFlags = 0;
+
+};
+
+namespace FPropertyNodeConstants
+{
+	inline const int32 NoDepthRestrictions = -1;
+
+	/** Character used to deliminate sub-categories in category path names */
+	inline const TCHAR CategoryDelimiterChar = TCHAR('|');
+};
+
+class FPropertySettings
+{
+public:
+	static FPropertySettings& Get();
+	bool ShowFriendlyPropertyNames() const { return bShowFriendlyPropertyNames; }
+	bool ShowHiddenProperties() const { return bShowHiddenProperties; }
+	bool ExpandDistributions() const { return bExpandDistributions; }
+private:
+	FPropertySettings();
+private:
+	bool bShowFriendlyPropertyNames;
+	bool bExpandDistributions;
+	bool bShowHiddenProperties;
+};
+
+struct FAddressPair
+{
+	FAddressPair(const UObject* InObject, uint8* Address, bool bInIsStruct)
+		: Object(InObject)
+		, ReadAddress(Address)
+		, bIsStruct(bInIsStruct)
+	{}
+	TWeakObjectPtr<const UObject> Object;
+	uint8* ReadAddress;
+	bool bIsStruct;
+};
+
+struct FReadAddressListData
+{
+public:
+	FReadAddressListData()
+		: bAllValuesTheSame(false)
+		, bRequiresCache(true)
+	{
+	}
+	void Add(const UObject* Object, uint8* Address, bool bIsStruct = false)
+	{
+		ReadAddresses.Add(FAddressPair(Object, Address, bIsStruct));
+	}
+
+	int32 Num() const
+	{
+		return ReadAddresses.Num();
+	}
+
+	uint8* GetAddress(int32 Index)
+	{
+		const FAddressPair& Pair = ReadAddresses[Index];
+		return (Pair.Object.IsValid() || Pair.bIsStruct) ? Pair.ReadAddress : 0;
+	}
+
+	const UObject* GetObject(int32 Index)
+	{
+		const FAddressPair& Pair = ReadAddresses[Index];
+		return Pair.Object.Get();
+	}
+
+	bool IsValidIndex(int32 Index) const
+	{
+		return ReadAddresses.IsValidIndex(Index);
+	}
+
+	void Reset()
+	{
+		ReadAddresses.Reset();
+		bAllValuesTheSame = false;
+		bRequiresCache = true;
+	}
+
+	bool bAllValuesTheSame;
+	bool bRequiresCache;
+private:
+	TArray<FAddressPair> ReadAddresses;
+};
+
+/**
+ * A list of read addresses for a property node which contains the address for the nodes FProperty on each object
+ */
+class FReadAddressList
+{
+	friend class FPropertyNode;
+public:
+	FReadAddressList()
+		: ReadAddressListData(nullptr)
+	{}
+
+	int32 Num() const
+	{
+		return (ReadAddressListData != nullptr) ? ReadAddressListData->Num() : 0;
+	}
+
+	uint8* GetAddress(int32 Index)
+	{
+		return ReadAddressListData->GetAddress(Index);
+	}
+
+	const UObject* GetObject(int32 Index)
+	{
+		return ReadAddressListData->GetObject(Index);
+	}
+
+	bool IsValidIndex(int32 Index) const
+	{
+		return ReadAddressListData->IsValidIndex(Index);
+	}
+
+	void Reset()
+	{
+		if (ReadAddressListData != nullptr)
+		{
+			ReadAddressListData->Reset();
+		}
+	}
+
+private:
+	FReadAddressListData* ReadAddressListData;
+};
+
+
+
+/**
+ * Parameters for initializing a property node
+ */
+struct FPropertyNodeInitParams
+{
+	enum class EIsSparseDataProperty : uint8
+	{
+		False,
+		True,
+		Inherit,
+	};
+
+	/** The parent of the property node */
+	TSharedPtr<FPropertyNode> ParentNode;
+	/** The property that the node observes and modifies*/
+	FProperty* Property;
+	/** Offset to the property data within either a fixed array or a dynamic array */
+	int32 ArrayOffset;
+	/** Index of the property in its array parent */
+	int32 ArrayIndex;
+	/** Whether or not to create any children */
+	bool bAllowChildren;
+	/** Whether or not to allow hidden properties (ones without CPF_Edit) to be visible */
+	bool bForceHiddenPropertyVisibility;
+	/** Whether or not to create category nodes (note: this setting is only valid for the root node of a property tree. The setting will propagate to children) */
+	bool bCreateCategoryNodes;
+	/** Whether or not to create nodes for properties marked CPF_DisableEditOnInstance */
+	bool bCreateDisableEditOnInstanceNodes;
+	/** Whether or not this property is sparse data */
+	EIsSparseDataProperty IsSparseProperty;
+
+	/** */
+	bool bGameModeOnlyVisible;
+
+	FPropertyNodeInitParams()
+		: ParentNode(nullptr)
+		, Property(nullptr)
+		, ArrayOffset(0)
+		, ArrayIndex(INDEX_NONE)
+		, bAllowChildren(true)
+		, bForceHiddenPropertyVisibility(false)
+		, bCreateCategoryNodes(true)
+		, bCreateDisableEditOnInstanceNodes(true)
+		, IsSparseProperty(EIsSparseDataProperty::Inherit)
+		, bGameModeOnlyVisible(false)
+	{}
+};
+
+/** Describes in which way an array property change has happend. This is used
+	for propagation of array property changes to the instances of archetype objects. */
+struct EPropertyArrayChangeType
+{
+	enum Type
+	{
+		/** A value was added to the array */
+		Add,
+		/** The array was cleared */
+		Clear,
+		/** A new item has been inserted. */
+		Insert,
+		/** An item has been deleted */
+		Delete,
+		/** An item has been duplicated */
+		Duplicate,
+		/** Two items have been swapped */
+		Swap,
+	};
+};
+
+enum EPropertyDataValidationResult : uint8
+{
+	/** The object(s) being viewed are now invalid */
+	ObjectInvalid,
+	/** Non dynamic array property nodes were added or removed that would require a refresh */
+	PropertiesChanged,
+	/** An edit inline new value changed,  In the tree this rebuilds the nodes, in the details view we don't need to do this */
+	EditInlineNewValueChanged,
+	/** The size of an array changed (delete,insert,add) */
+	ArraySizeChanged,
+	/** An internal node's children were rebuilt for some reason */
+	ChildrenRebuilt,
+	/** All data is valid */
+	DataValid,
+};
+
+/** Helper class for modifying property values with setters and getters */
+class FPropertyNodeEditStack
+{
+	struct FMemoryFrame
+	{
+		FMemoryFrame() = default;
+		FMemoryFrame(const FProperty* InProperty, uint8* InMemory)
+			: Property(InProperty)
+			, Memory(InMemory)
+		{
+		}
+		/** Property that points to the memory in this frame */
+		const FProperty* Property = nullptr;
+		/** Property address */
+		uint8* Memory = nullptr;
+	};
+public:
+
+	/**
+	* Constructs property stack for the specified node
+	* InNode Property node to construct the stack for
+	* InObj Optional Object instance that contains the property being modified (if not provided the root container pointer will be acquired from the provided node hierarchy)
+	*/
+	FPropertyNodeEditStack(const FPropertyNode* InNode, const UObject* InObj = nullptr);
+	FPropertyNodeEditStack() = default;
+	~FPropertyNodeEditStack();
+
+	FPropertyNodeEditStack& operator = (const FPropertyNodeEditStack& Other) = delete;
+	FPropertyNodeEditStack(const FPropertyNodeEditStack& Other) = delete;
+
+	/**
+	* Initializes property stack for the specified node
+	* InNode Property node to construct the stack for
+	* InObj Object instance that contains the property being modified
+	*/
+	FPropertyAccess::Result Initialize(const FPropertyNode* InNode, const UObject* InObj);
+
+	/**
+	* Returns the address of the property being modified.
+	* If anywhere in the property stack is a property with a setter or getter this will point to a temporarily allocated memory.
+	*/
+	uint8* GetDirectPropertyAddress()
+	{
+		return MemoryStack.Last().Memory;
+	}
+
+	/**
+	* Commits all modifications to temporarily allocated property values back to the actual member variables using setters and getters where available
+	*/
+	void CommitChanges();
+
+	/** Checks if this edit stack is valid */
+	bool IsValid() const
+	{
+		return MemoryStack.Num() > 0;
+	}
+
+private:
+
+	FPropertyAccess::Result InitializeInternal(const FPropertyNode* InNode, const UObject* InObj);
+	void Cleanup();
+
+	TArray<FMemoryFrame> MemoryStack;
+};
+
+/**
+ * The base class for all property nodes
+ */
+class FPropertyNode : public TSharedFromThis<FPropertyNode>
+{
+public:
+
+	FPropertyNode();
+	virtual ~FPropertyNode();
+
+	/**
+	 * Init Tree Node internally (used only derived classes to pass through variables that are common to all nodes
+	 * @param InitParams	Parameters for how the node should be initialized
+	 */
+	void InitNode(const FPropertyNodeInitParams& InitParams);
+
+	/**
+	 * Indicates that children of this node should be rebuilt next tick.  Some topology changes will require this
+	 */
+	void RequestRebuildChildren() { bRebuildChildrenRequested = true; }
+
+	/**
+	 * Used for rebuilding this nodes children
+	 */
+	void RebuildChildren();
+
+	/**
+	 * Mark this and all children as having been rebuilt.
+	 */
+	void MarkChildrenAsRebuilt();
+
+	/**
+	 * For derived windows to be able to add their nodes to the child array
+	 */
+	void AddChildNode(TSharedPtr<FPropertyNode> InNode);
+
+	/**
+	 * Clears cached read address data
+	 */
+	void ClearCachedReadAddresses(bool bRecursive = true);
+
+	/**
+	 * Interface function to get at the derived FObjectPropertyNode class
+	 */
+	virtual FObjectPropertyNode* AsObjectNode() { return nullptr; }
+	virtual const FObjectPropertyNode* AsObjectNode() const { return nullptr; }
+
+	/**
+	 * Interface function to get at the derived FComplexPropertyNode class
+	 */
+	virtual FComplexPropertyNode* AsComplexNode() { return nullptr; }
+	virtual const FComplexPropertyNode* AsComplexNode() const { return nullptr; }
+
+	/**
+	 * Interface function to get at the derived FCategoryPropertyNode class
+	 */
+	virtual FCategoryPropertyNode* AsCategoryNode() { return nullptr; }
+	virtual const FCategoryPropertyNode* AsCategoryNode() const { return nullptr; }
+
+	/**
+	 * Interface function to get at the derived FItemPropertyNode class
+	 */
+	virtual FItemPropertyNode* AsItemPropertyNode() { return nullptr; }
+	virtual const FItemPropertyNode* AsItemPropertyNode() const { return nullptr; }
+
+	/**
+	 * Follows the chain of items upwards until it finds the complex property that houses this item.
+	 */
+	FComplexPropertyNode* FindComplexParent();
+	const FComplexPropertyNode* FindComplexParent() const;
+
+	/**
+	 * Follows the chain of items upwards until it finds the object property that houses this item.
+	 */
+	FObjectPropertyNode* FindObjectItemParent();
+	const FObjectPropertyNode* FindObjectItemParent() const;
+
+	/**
+	 * Follows the chain of items upwards until it finds the structure property that houses this item.
+	 */
+	FStructurePropertyNode* FindStructureItemParent();
+	const FStructurePropertyNode* FindStructureItemParent() const;
+
+	/**
+	 * Follows the top-most object window that contains this property window item.
+	 */
+	FObjectPropertyNode* FindRootObjectItemParent();
+
+	/**
+	 * Used to see if any data has been destroyed from under the property tree.  Should only be called during Tick
+	 */
+	virtual EPropertyDataValidationResult EnsureDataIsValid();
+
+	//////////////////////////////////////////////////////////////////////////
+	// Text
+
+	/**
+	 * @param OutText						The property formatted in a string
+	 * @param bAllowAlternateDisplayValue	Allow the function to potentially use an alternate form more suitable for display in the UI
+	 * @param PortFlags						Determines how the property's value is accessed. Defaults to PPF_PropertyWindow
+	 * @return true if the value was retrieved successfully
+	 */
+	FPropertyAccess::Result GetPropertyValueString(FString& OutString, const bool bAllowAlternateDisplayValue, EPropertyPortFlags PortFlags = PPF_PropertyWindow) const;
+
+	/**
+	 * @param OutText			The property formatted in text
+	 * @param bAllowAlternateDisplayValue Allow the function to potentially use an alternate form more suitable for display in the UI
+	 * @return true if the value was retrieved successfully
+	 */
+	FPropertyAccess::Result GetPropertyValueText(FText& OutText, const bool bAllowAlternateDisplayValue) const;
+
+	//////////////////////////////////////////////////////////////////////////
+	//Flags
+	bool HasNodeFlags(const EPropertyNodeFlags::Type InTestFlags) const { return (PropertyNodeFlags & InTestFlags) != 0; }
+	/**
+	 * Sets the flags used by the window and the root node
+	 * @param InFlags - flags to turn on or off
+	 * @param InOnOff - whether to toggle the bits on or off
+	 */
+	void SetNodeFlags(const EPropertyNodeFlags::Type InFlags, const bool InOnOff);
+
+	/**
+	 * Finds a child of this property node
+	 *
+	 * @param InPropertyName	The name of the property to find
+	 * @param bRecurse		true if we should recurse into children's children and so on.
+	 */
+	TSharedPtr<FPropertyNode> FindChildPropertyNode(const FName InPropertyName, bool bRecurse = false);
+
+	/**
+	 * Returns the parent node in the hierarchy
+	 */
+	FPropertyNode* GetParentNode() { return ParentNodeWeakPtr.Pin().Get(); }
+	const FPropertyNode* GetParentNode() const { return ParentNodeWeakPtr.Pin().Get(); }
+	TSharedPtr<FPropertyNode> GetParentNodeSharedPtr() { return ParentNodeWeakPtr.Pin(); }
+	/**
+	 * Returns the Property this Node represents
+	 */
+	FProperty* GetProperty() { return Property.Get(); }
+	const FProperty* GetProperty() const { return Property.Get(); }
+
+	/**
+	 * Accessor functions for internals
+	 */
+	int32 GetArrayOffset() const { return ArrayOffset; }
+	int32 GetArrayIndex() const { return ArrayIndex; }
+
+	/**
+	 * Return number of children that survived being filtered
+	 */
+	int32 GetNumChildNodes() const { return ChildNodes.Num(); }
+
+	/**
+	 * Returns the matching Child node
+	 */
+	TSharedPtr<FPropertyNode>& GetChildNode(const int32 ChildIndex)
+	{
+		check(ChildNodes[ChildIndex].IsValid());
+		return ChildNodes[ChildIndex];
+	}
+
+	/**
+	 * Returns the matching Child node
+	 */
+	const TSharedPtr<FPropertyNode>& GetChildNode(const int32 ChildIndex) const
+	{
+		check(ChildNodes[ChildIndex].IsValid());
+		return ChildNodes[ChildIndex];
+	}
+
+	/**
+	 * Returns the Child node whose ArrayIndex matches the supplied ChildIndex
+	 */
+	bool GetChildNode(const int32 ChildArrayIndex, TSharedPtr<FPropertyNode>& OutChildNode);
+
+	/**
+	* Returns the Child node whose ArrayIndex matches the supplied ChildIndex
+	*/
+	bool GetChildNode(const int32 ChildArrayIndex, TSharedPtr<FPropertyNode>& OutChildNode) const;
+
+	/**
+	 * Returns whether this window's property is read only or has the CPF_EditConst flag.
+	 */
+	bool IsPropertyConst() const;
+
+	/** @return whether this window's property is constant (can't be edited by the user) */
+	bool IsEditConst() const;
+
+	/**
+	 * Returns whether this window's property should not be serialized (determined by the CPF_SkipSerialization flag).
+	 */
+	bool ShouldSkipSerialization() const;
+
+	/**
+	 * Gets the full name of this node
+	 * @param PathPlusIndex - return value with full path of node
+	 * @param bWithArrayIndex - If True, adds an array index (where appropriate)
+	 * @param StopParent	- Stop at this parent (if any). Does NOT include it in the path
+	 * @param bIgnoreCategories - Skip over categories
+	 */
+	virtual bool GetQualifiedName(FString& PathPlusIndex, const bool bWithArrayIndex, const FPropertyNode* StopParent = nullptr, bool bIgnoreCategories = false) const;
+
+	// The bArrayPropertiesCanDifferInSize flag is an override for array properties which want to display
+	// e.g. the "Clear" and "Empty" buttons, even though the array properties may differ in the number of elements.
+	bool GetReadAddress(
+		bool InRequiresSingleSelection,
+		FReadAddressList& OutAddresses,
+		bool bComparePropertyContents = true,
+		bool bObjectForceCompare = false,
+		bool bArrayPropertiesCanDifferInSize = false) const;
+
+	/**
+	 * fills in the OutAddresses array with the addresses of all of the available objects.
+	 * @param OutAddresses	Storage array for all of the objects' addresses.
+	 */
+	bool GetReadAddress(FReadAddressList& OutAddresses) const;
+
+	/**
+	 * Fills in the OutValueAddress with the address of the value of all the available objects.
+	 * If multiple items are selected, this will return a null address unless they are all the same value.
+	 * @param OutValueAddress	The address of the item
+	 */
+	FPropertyAccess::Result GetSingleReadAddress(uint8*& OutValueAddress) const;
+
+	/**
+	 * Fills in the OutObject with the address of the object of all the available objects.
+	 * If multiple items are selected, this will return a null address unless they are all the same value.
+	 * @param OutObject	The address of the Object
+	 */
+	FPropertyAccess::Result GetSingleObject(UObject*& OutObject) const;
+
+	/**
+	 * Fills in the OutContainer with the address of the container (struct or UObject instance) that owns the property this node represents.
+	 * @param OutContainer	The address of the container instance
+	 */
+	FPropertyAccess::Result GetSingleEditStack(FPropertyNodeEditStack& OutStack) const;
+
+	/**
+	 * Gets read addresses without accessing cached data.  Is less efficient but gets the must up to date data
+	 */
+	virtual bool GetReadAddressUncached(const FPropertyNode& InNode, bool InRequiresSingleSelection, FReadAddressListData* OutAddresses, bool bComparePropertyContents = true, bool bObjectForceCompare = false, bool bArrayPropertiesCanDifferInSize = false) const;
+	virtual bool GetReadAddressUncached(const FPropertyNode& InNode, FReadAddressListData& OutAddresses) const;
+
+	/**
+	 * Calculates the memory address for the data associated with this item's property.  This is typically the value of a FProperty or a UObject address.
+	 *
+	 * @param	StartAddress	the location to use as the starting point for the calculation; typically the address of the object that contains this property.
+	 * @param	bIsSparseData	True if StartAddress is pointing to a sidecar structure containing sparse class data, false otherwise
+	 *
+	 * @return	a pointer to a FProperty value or UObject.  (For dynamic arrays, you'd cast this value to an FArray*)
+	 */
+	virtual uint8* GetValueBaseAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct = false) const;
+
+	/**
+	 * Calculates the memory address for the data associated with this item's value.  For most properties, identical to GetValueBaseAddress.  For items corresponding
+	 * to dynamic array elements, the pointer returned will be the location for that element's data.
+	 *
+	 * @param	StartAddress	the location to use as the starting point for the calculation; typically the address of the object that contains this property.
+	 * @param	bIsSparseData	True if StartAddress is pointing to a sidecar structure containing sparse class data, false otherwise
+	 *
+	 * @return	a pointer to a FProperty value or UObject.  (For dynamic arrays, you'd cast this value to whatever type is the Inner for the dynamic array)
+	 */
+	virtual uint8* GetValueAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct = false) const;
+
+	/**
+	 * Caclulates the memory address for the starting point of the structure that contains the property this node uses.
+	 * This will often be Obj but may also point to a sidecar data structure.
+	 */
+	uint8* GetStartAddressFromObject(const UObject* Obj) const;
+
+	/**
+	 * Calculates the memory address for the data associated with this item's property.  This is typically the value of a FProperty or a UObject address.
+	 *
+	 * @param	Obj	The object that contains this property; used as the starting point for the calculation
+	 *
+	 * @return	a pointer to a FProperty value or UObject.  (For dynamic arrays, you'd cast this value to an FArray*)
+	 */
+	uint8* GetValueBaseAddressFromObject(const UObject* Obj) const;
+
+	/**
+	 * Calculates the memory address for the data associated with this item's value.  For most properties, identical to GetValueBaseAddress.  For items corresponding
+	 * to dynamic array elements, the pointer returned will be the location for that element's data.
+	 *
+	 * @param	Obj	The object that contains this property; used as the starting point for the calculation
+	 *
+	 * @return	a pointer to a FProperty value or UObject.  (For dynamic arrays, you'd cast this value to whatever type is the Inner for the dynamic array)
+	 */
+	uint8* GetValueAddressFromObject(const UObject* Obj) const;
+
+	/**
+	 * Sets the display name override to use instead of the display name
+	 */
+	virtual void SetDisplayNameOverride(const FText& InDisplayNameOverride) {}
+
+	/**
+	* @return true if the property is mark as a favorite
+	*/
+	virtual void SetFavorite(bool FavoriteValue) {}
+
+	/**
+	* @return true if the property is mark as a favorite
+	*/
+	virtual bool IsFavorite() const { return false; }
+
+	/**
+	 * @return The formatted display name for the property in this node
+	 */
+	virtual FText GetDisplayName() const { return FText::GetEmpty(); }
+
+	/**
+	 * Sets the tooltip override to use instead of the property tooltip
+	 */
+	virtual void SetToolTipOverride(const FText& InToolTipOverride) {}
+
+	/**
+	 * @return The tooltip for the property in this node
+	 */
+	virtual FText GetToolTipText() const { return FText::GetEmpty(); }
+
+	/**
+	 * If there is a property, sees if it matches.  Otherwise sees if the entire parent structure matches
+	 */
+	bool GetDiffersFromDefault();
+
+	/**
+	 * @return The label for displaying a reset to default value
+	 */
+	FText GetResetToDefaultLabel();
+
+	/**
+	 * @return If this property node is associated with a property that can be reordered within an array
+	 */
+	bool IsReorderable();
+
+	/**Walks up the hierarchy and return true if any parent node is a favorite*/
+	bool IsChildOfFavorite() const;
+
+	void NotifyPreChange(FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook);
+	void NotifyPreChange(FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook, const TSet<UObject*>& AffectedInstances);
+	void NotifyPreChange(FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook, TSet<UObject*>&& AffectedInstances);
+
+	void NotifyPostChange(FPropertyChangedEvent& InPropertyChangedEvent, FNotifyHook* InNotifyHook);
+
+	DECLARE_EVENT(FPropertyNode, FPropertyChildrenRebuiltEvent);
+	FDelegateHandle SetOnRebuildChildren(const FSimpleDelegate& InOnRebuildChildren);
+	FPropertyChildrenRebuiltEvent& OnRebuildChildren() { return OnRebuildChildrenEvent; }
+
+	/**
+	 * Propagates the property change to all instances of an archetype
+	 *
+	 * @param	ModifiedObject	Object which property has been modified
+	 * @param	NewValue		New value of the property
+	 * @param	PreviousValue	Value of the property before the modification
+	 */
+	void PropagatePropertyChange(UObject* ModifiedObject, const TCHAR* NewValue, const FString& PreviousValue);
+
+	/**
+	 * Propagates the property change of a container property to all instances of an archetype
+	 *
+	 * @param	ModifiedObject				Object which property has been modified
+	 * @param	OriginalContainerAddr		Original address holding the container value before the modification
+	 * @param	ChangeType					In which way was the container modified
+	 * @param	Index						Index of the modified item
+	 */
+	void PropagateContainerPropertyChange(UObject* ModifiedObject, const void* OriginalContainerAddr,
+		EPropertyArrayChangeType::Type ChangeType, int32 Index, int32 SwapIndex = INDEX_NONE);
+
+	/**
+	 * Helper function to centralize logic for duplcating an array entry and ensuring that instanced object references are correctly handled
+	 */
+	static void DuplicateArrayEntry(FProperty* NodeProperty, FScriptArrayHelper& ArrayHelper, int32 Index);
+
+	/**
+	 * Gather the list of all instances that will be affected by a container property change
+	 *
+	 * @param	ModifiedObject				Object which property has been modified
+	 * @param	OriginalContainerAddr		Original address holding the container value before the modification
+	 * @param	ChangeType					In which way is the container modified
+	 * @param	OutAffectedInstances		Instances affected by the property change
+	 */
+	void GatherInstancesAffectedByContainerPropertyChange(UObject* ModifiedObject, const void* OriginalContainerAddr, EPropertyArrayChangeType::Type ChangeType, TArray<UObject*>& OutAffectedInstances);
+
+	/**
+	 * Propagates the property change of a container property to the provided archetype instances
+	 *
+	 * @param	ModifiedObject				Object which property has been modified
+	 * @param	OriginalContainerAddr		Original address holding the container value before the modification
+	 * @param	AffectedInstances			Instances affected by the property change
+	 * @param	ChangeType					In which way was the container modified
+	 * @param	Index						Index of the modified item
+	 */
+	void PropagateContainerPropertyChange(UObject* ModifiedObject, const void* OriginalContainerAddr, const TArray<UObject*>& AffectedInstances,
+		EPropertyArrayChangeType::Type ChangeType, int32 Index, int32 SwapIndex = INDEX_NONE);
+
+	/** Broadcasts when a property value changes */
+	DECLARE_EVENT(FPropertyNode, FPropertyValueChangedEvent);
+	/** Broadcasts when a property value changes, but additionally includes the property changed event.*/
+	DECLARE_MULTICAST_DELEGATE_OneParam(FPropertyValueChangedWithData, const FPropertyChangedEvent&)
+		FPropertyValueChangedEvent& OnPropertyValueChanged() { return PropertyValueChangedEvent; }
+	FPropertyValueChangedWithData& OnPropertyValueChangedWithData() { return PropertyValueChangedDelegate; }
+
+	/** Broadcasts when a child of this property changes */
+	FPropertyValueChangedEvent& OnChildPropertyValueChanged() { return ChildPropertyValueChangedEvent; }
+	FPropertyValueChangedWithData& OnChildPropertyValueChangedWithData() { return ChildPropertyValueChangedDelegate; }
+
+	/** Broadcasts when a property value changes */
+	DECLARE_EVENT(FPropertyNode, FPropertyValuePreChangeEvent);
+	FPropertyValuePreChangeEvent& OnPropertyValuePreChange() { return PropertyValuePreChangeEvent; }
+
+	/** Broadcasts when a child of this property changes */
+	FPropertyValuePreChangeEvent& OnChildPropertyValuePreChange() { return ChildPropertyValuePreChangeEvent; }
+
+	/** Broadcasts when this property is reset to default */
+	DECLARE_EVENT(FPropertyNode, FPropertyResetToDefaultEvent);
+	FPropertyResetToDefaultEvent& OnPropertyResetToDefault() { return PropertyResetToDefaultEvent; }
+
+	/**
+	 * Marks window's seem due to filtering flags
+	 * @param InFilterStrings	- List of strings that must be in the property name in order to display
+	 *					Empty InFilterStrings means display as normal
+	 *					All strings must match in order to be accepted by the filter
+	 * @param bParentAllowsVisible - is NOT true for an expander that is NOT expanded
+	 */
+	void FilterNodes(const TArray<FString>& InFilterStrings, const bool bParentSeenDueToFiltering = false);
+
+	/**
+	 * Marks windows as visible based on the filter strings or standard visibility
+	 *
+	 * @param bParentAllowsVisible - is NOT true for an expander that is NOT expanded
+	 */
+	void ProcessSeenFlags(const bool bParentAllowsVisible);
+
+	/**
+	 * Marks windows as visible based their favorites status
+	 */
+	void ProcessSeenFlagsForFavorites();
+
+	/**
+	 * @return true if this node should be visible in a tree
+	 */
+	bool IsVisible() const { return HasNodeFlags(EPropertyNodeFlags::IsBeingFiltered) == 0 || HasNodeFlags(EPropertyNodeFlags::IsSeen) || HasNodeFlags(EPropertyNodeFlags::IsSeenDueToChildFiltering); };
+
+	static TSharedRef< FPropertyPath > CreatePropertyPath(const TSharedRef< FPropertyNode >& PropertyNode)
+	{
+		TArray< FPropertyInfo > Properties;
+		FPropertyNode* CurrentNode = &PropertyNode.Get();
+
+		if (CurrentNode != nullptr && CurrentNode->AsCategoryNode() != nullptr)
+		{
+			TSharedRef< FPropertyPath > NewPath = MakeShareable(new FPropertyPath());
+			return NewPath;
+		}
+
+		while (CurrentNode != nullptr)
+		{
+			if (CurrentNode->AsItemPropertyNode() != nullptr)
+			{
+				FPropertyInfo NewPropInfo;
+				NewPropInfo.Property = CurrentNode->GetProperty();
+				NewPropInfo.ArrayIndex = CurrentNode->GetArrayIndex();
+
+				Properties.Add(NewPropInfo);
+			}
+
+			CurrentNode = CurrentNode->GetParentNode();
+		}
+
+		TSharedRef< FPropertyPath > NewPath = MakeShareable(new FPropertyPath());
+
+		for (int PropertyIndex = Properties.Num() - 1; PropertyIndex >= 0; --PropertyIndex)
+		{
+			NewPath->AddProperty(Properties[PropertyIndex]);
+		}
+
+		return NewPath;
+	}
+
+	static TSharedPtr< FPropertyNode > FindPropertyNodeByPath(const TSharedPtr< FPropertyPath > Path, const TSharedRef< FPropertyNode >& StartingNode)
+	{
+		if (!Path.IsValid() || Path->GetNumProperties() == 0)
+		{
+			return StartingNode;
+		}
+
+		bool FailedToFindProperty = false;
+		TSharedPtr< FPropertyNode > PropertyNode = StartingNode;
+		for (int PropertyIndex = 0; PropertyIndex < Path->GetNumProperties() && !FailedToFindProperty; PropertyIndex++)
+		{
+			FailedToFindProperty = true;
+			const FPropertyInfo& PropInfo = Path->GetPropertyInfo(PropertyIndex);
+
+			TArray< TSharedRef< FPropertyNode > > ChildrenStack;
+			ChildrenStack.Push(PropertyNode.ToSharedRef());
+			while (ChildrenStack.Num() > 0)
+			{
+				const TSharedRef< FPropertyNode > CurrentNode = ChildrenStack.Pop();
+
+				for (int32 ChildIndex = 0; ChildIndex < CurrentNode->GetNumChildNodes(); ++ChildIndex)
+				{
+					const TSharedPtr< FPropertyNode > ChildNode = CurrentNode->GetChildNode(ChildIndex);
+
+					if (ChildNode->AsItemPropertyNode() == nullptr)
+					{
+						ChildrenStack.Add(ChildNode.ToSharedRef());
+					}
+					else if (ChildNode.IsValid() &&
+						ChildNode->GetProperty() == PropInfo.Property.Get() &&
+						ChildNode->GetArrayIndex() == PropInfo.ArrayIndex)
+					{
+						PropertyNode = ChildNode;
+						FailedToFindProperty = false;
+						break;
+					}
+				}
+			}
+		}
+
+		if (FailedToFindProperty)
+		{
+			PropertyNode = nullptr;
+		}
+
+		return PropertyNode;
+	}
+
+
+	static TArray< FPropertyInfo > GetPossibleExtensionsForPath(const TSharedPtr< FPropertyPath > Path, const TSharedRef< FPropertyNode >& StartingNode)
+	{
+		TArray< FPropertyInfo > PossibleExtensions;
+		TSharedPtr< FPropertyNode > PropertyNode = FindPropertyNodeByPath(Path, StartingNode);
+
+		if (!PropertyNode.IsValid())
+		{
+			return PossibleExtensions;
+		}
+
+		for (int32 ChildIndex = 0; ChildIndex < PropertyNode->GetNumChildNodes(); ++ChildIndex)
+		{
+			TSharedPtr< FPropertyNode > CurrentNode = PropertyNode->GetChildNode(ChildIndex);
+
+			if (CurrentNode.IsValid() && CurrentNode->AsItemPropertyNode() != nullptr)
+			{
+				FPropertyInfo NewPropInfo;
+				NewPropInfo.Property = CurrentNode->GetProperty();
+				NewPropInfo.ArrayIndex = CurrentNode->GetArrayIndex();
+
+				bool AlreadyExists = false;
+				for (auto ExtensionIter = PossibleExtensions.CreateConstIterator(); ExtensionIter; ++ExtensionIter)
+				{
+					if (*ExtensionIter == NewPropInfo)
+					{
+						AlreadyExists = true;
+						break;
+					}
+				}
+
+				if (!AlreadyExists)
+				{
+					PossibleExtensions.Add(NewPropInfo);
+				}
+			}
+		}
+
+		return PossibleExtensions;
+	}
+
+	/**
+	 * Adds a restriction to the possible values for this property.
+	 * @param Restriction	The restriction being added to this property.
+	 */
+	virtual void AddRestriction(TSharedRef<const FPropertyRestriction> Restriction);
+
+	/**
+	* Tests if a value is hidden for this property
+	* @param Value			The value to test for being hidden.
+	* @return				True if this value is hidden.
+	*/
+	bool IsHidden(const FString& Value) const
+	{
+		return IsHidden(Value, nullptr);
+	}
+
+	/**
+	 * Tests if a value is disabled for this property
+	 * @param Value			The value to test for being disabled.
+	 * @return				True if this value is disabled.
+	 */
+	bool IsDisabled(const FString& Value) const
+	{
+		return IsDisabled(Value, nullptr);
+	}
+
+	bool IsRestricted(const FString& Value) const
+	{
+		return IsHidden(Value) || IsDisabled(Value);
+	}
+
+	/**
+	* Tests if a value is hidden for this property.
+	* @param Value			The value to test for being hidden.
+	* @param OutReasons		If hidden, the reasons why.
+	* @return				True if this value is hidden.
+	*/
+	virtual bool IsHidden(const FString& Value, TArray<FText>* OutReasons) const;
+
+	/**
+	 * Tests if a value is disabled for this property.
+	 * @param Value			The value to test for being disabled.
+	 * @param OutReasons	If disabled, the reasons why.
+	 * @return				True if this value is disabled.
+	 */
+	virtual bool IsDisabled(const FString& Value, TArray<FText>* OutReasons) const;
+
+	/**
+	* Tests if a value is restricted for this property.
+	* @param Value			The value to test for being restricted.
+	* @param OutReasons		If restricted, the reasons why.
+	* @return				True if this value is restricted.
+	*/
+	bool IsRestricted(const FString& Value, TArray<FText>& OutReasons) const;
+
+	/**
+	 * Generates a consistent tooltip describing this restriction for use in the editor.
+	 * @param Value			The value to test for restriction and generate the tooltip from.
+	 * @param OutTooltip	The tooltip describing why this value is restricted.
+	 * @return				True if this value is restricted.
+	 */
+	virtual bool GenerateRestrictionToolTip(const FString& Value, FText& OutTooltip)const;
+
+	const TArray<TSharedRef<const FPropertyRestriction>>& GetRestrictions() const
+	{
+		return Restrictions;
+	}
+
+	FPropertyChangedEvent& FixPropertiesInEvent(FPropertyChangedEvent& Event);
+
+	/** Set metadata value for 'Key' to 'Value' on this property instance (as opposed to the class) */
+	void SetInstanceMetaData(const FName& Key, const FString& Value);
+
+	/**
+	 * Get metadata value for 'Key' for this property instance (as opposed to the class)
+	 *
+	 * @return Pointer to metadata value; nullptr if Key not found
+	 */
+	const FString* GetInstanceMetaData(const FName& Key) const;
+
+	/**
+	 * Get metadata map for this property instance (as opposed to the class)
+	 *
+	 * @return Map ptr containing metadata pairs
+	 */
+	const TMap<FName, FString>* GetInstanceMetaDataMap() const;
+
+	bool ParentOrSelfHasMetaData(const FName& MetaDataKey) const;
+
+	/**
+	 * Invalidates the cached state of this node in all children;
+	 */
+	void InvalidateCachedState();
+
+	static void SetupKeyValueNodePair(TSharedPtr<FPropertyNode>& KeyNode, TSharedPtr<FPropertyNode>& ValueNode)
+	{
+		check(KeyNode.IsValid() && ValueNode.IsValid());
+		check(!KeyNode->PropertyKeyNode.IsValid() && !ValueNode->PropertyKeyNode.IsValid());
+
+		ValueNode->PropertyKeyNode = KeyNode;
+	}
+
+	TSharedPtr<FPropertyNode>& GetPropertyKeyNode() { return PropertyKeyNode; }
+
+	const TSharedPtr<FPropertyNode>& GetPropertyKeyNode() const { return PropertyKeyNode; }
+
+	/**
+	* Gets the default value of the property as string.
+	*/
+	FString GetDefaultValueAsString(bool bUseDisplayName = true);
+
+	/**
+	 * Broadcasts reset to default property changes
+	 */
+	void BroadcastPropertyResetToDefault();
+
+	/** @return Whether this property should have an edit condition toggle. */
+	bool SupportsEditConditionToggle() const;
+
+	/** Toggle the current state of the edit condition if this SupportsEditConditionToggle() */
+	void ToggleEditConditionState();
+
+	/**	@return Whether the property has a condition which must be met before allowing editing of it's value */
+	bool HasEditCondition() const;
+
+	/**	@return Whether the condition has been met to allow editing of this property's value */
+	bool IsEditConditionMet() const;
+
+	/**	@return Whether this property derives its visibility from its edit condition */
+	bool IsOnlyVisibleWhenEditConditionMet() const;
+
+
+	/**
+	 * Helper to fetch a list of child property nodes that are expanded
+	 */
+	void GetExpandedChildPropertyPaths(TSet<FString>& OutExpandedChildPropertyPaths) const;
+
+	/**
+	 * Helper to set the expansion state of a list of child property nodes
+	 */
+	void SetExpandedChildPropertyNodes(const TSet<FString>& InNodesToExpand);
+
+	/**
+	 * Helper to fetch a PropertyPath
+	 */
+	const FString& GetPropertyPath() const { return PropertyPath; }
+
+	/** Marks this property node as ignoring CPF_InstancedReference */
+	void SetIgnoreInstancedReference();
+
+	/** Queries whether the node would like to ignore CPF_InstancedReference semantics */
+	bool IsIgnoringInstancedReference() const;
+
+protected:
+	TSharedRef<FEditPropertyChain> BuildPropertyChain(FProperty* PropertyAboutToChange) const;
+	TSharedRef<FEditPropertyChain> BuildPropertyChain(FProperty* PropertyAboutToChange, const TSet<UObject*>& InAffectedArchetypeInstances) const;
+	TSharedRef<FEditPropertyChain> BuildPropertyChain(FProperty* PropertyAboutToChange, TSet<UObject*>&& InAffectedArchetypeInstances) const;
+
+	void NotifyPreChangeInternal(TSharedRef<FEditPropertyChain> PropertyChain, FProperty* PropertyAboutToChange, FNotifyHook* InNotifyHook);
+
+	/**
+	 * Destroys all node within the hierarchy
+	 */
+	void DestroyTree(const bool bInDestroySelf = true);
+
+	/**
+	 * Interface function for Custom Setup of Node (prior to node flags being set)
+	 */
+	virtual void InitBeforeNodeFlags() {};
+
+	/**
+	 * Interface function for Custom expansion Flags.  Default is objects and categories which always expand
+	 */
+	virtual void InitExpansionFlags() { SetNodeFlags(EPropertyNodeFlags::CanBeExpanded, true); };
+
+	/**
+	 * Interface function for Creating Child Nodes
+	 */
+	virtual void InitChildNodes() = 0;
+
+	/**
+	 * Does the string compares to ensure this Name is acceptable to the filter that is passed in
+	 */
+	bool IsFilterAcceptable(const TArray<FString>& InAcceptableNames, const TArray<FString>& InFilterStrings);
+	/**
+	 * Make sure that parent nodes are expanded
+	 */
+	void ExpandParent(bool bInRecursive);
+
+	/** @return		The property stored at this node, to be passed to Pre/PostEditChange. */
+	FProperty* GetStoredProperty() { return nullptr; }
+
+	bool GetDiffersFromDefault(const uint8* PropertyValueAddress, const uint8* PropertyDefaultAddress, const uint8* DefaultPropertyValueBaseAddress, const FProperty* InProperty) const;
+	bool GetDiffersFromDefaultForObject(FPropertyItemValueDataTrackerSlate& ValueTracker, FProperty* InProperty);
+
+	FString GetDefaultValueAsString(const uint8* PropertyDefaultAddress, const FProperty* InProperty, const bool bUseDisplayName) const;
+	FString GetDefaultValueAsStringForObject(FPropertyItemValueDataTrackerSlate& ValueTracker, UObject* InObject, FProperty* InProperty, bool bUseDisplayName);
+
+	/**
+	 * Helper function to obtain the display name for an enum property
+	 * @param InEnum		The enum whose metadata to pull from
+	 * @param DisplayName	The name of the enum value to adjust
+	 *
+	 * @return	true if the DisplayName has been changed
+	 */
+	bool AdjustEnumPropDisplayName(UEnum* InEnum, FString& DisplayName) const;
+
+	/**
+	 * Helper function for derived members to be able to
+	 * broadcast property changed notifications
+	 */
+	void BroadcastPropertyChangedDelegates();
+
+	/**
+	 * Helper function for derived members to be able to
+	 * broadcast property changed notifications including property changed event data
+	 */
+	void BroadcastPropertyChangedDelegates(const FPropertyChangedEvent& Event);
+
+
+	/**
+	* Helper function for derived members to be able to
+	* broadcast property pre-change notifications
+	*/
+	void BroadcastPropertyPreChangeDelegates();
+
+	/**
+	 * Gets a value tracker for the default of this property in the passed in object
+	 *
+	 * @param Object	The object to get the value for
+	 * @param ObjIndex	The index of the object in the parent property node's object array (for caching)
+	 */
+	TSharedPtr< FPropertyItemValueDataTrackerSlate > GetValueTracker(UObject* Object, uint32 ObjIndex);
+
+	/**
+	 * Updates and caches the current edit const state of this property
+	 */
+	void UpdateEditConstState();
+
+	/**
+	 * Checks to see if the supplied property of a child node requires validation
+	 * @param	InChildProp		The property of the child node
+	 * @return	True if the property requires validation, false otherwise
+	 */
+	static bool DoesChildPropertyRequireValidation(FProperty* InChildProp);
+
+protected:
+
+	static FEditConditionParser EditConditionParser;
+
+	/**
+	 * The node that is the parent of this node or nullptr for the root
+	 */
+	TWeakPtr<FPropertyNode> ParentNodeWeakPtr;
+
+	/**	The property node, if any, that serves as the key value for this node */
+	TSharedPtr<FPropertyNode> PropertyKeyNode;
+
+	/** Cached read addresses for this property node */
+	mutable FReadAddressListData CachedReadAddresses;
+
+	/** List of per object default value trackers associated with this property node */
+	TArray< TSharedPtr<FPropertyItemValueDataTrackerSlate> > ObjectDefaultValueTrackers;
+
+	/** List of all child nodes this node is responsible for */
+	TArray< TSharedPtr<FPropertyNode> > ChildNodes;
+
+	/** Called when this node's children are rebuilt */
+	FPropertyChildrenRebuiltEvent OnRebuildChildrenEvent;
+
+	/** Called when this node's property value is about to change (called during NotifyPreChange) */
+	FPropertyValuePreChangeEvent PropertyValuePreChangeEvent;
+
+	/** Called when a child's property value is about to change */
+	FPropertyValuePreChangeEvent ChildPropertyValuePreChangeEvent;
+
+	/** Called when this node's property value has changed (called during NotifyPostChange) */
+	FPropertyValueChangedEvent PropertyValueChangedEvent;
+	/** Called when this node's property value has changed with the property changed event data as payload (called during NotifyPostChange) */
+	FPropertyValueChangedWithData PropertyValueChangedDelegate;
+
+	/** Called when a child's property value has changed */
+	FPropertyValueChangedEvent ChildPropertyValueChangedEvent;
+	/** Called when a child's property value has changed with the property changed event data as payload */
+	FPropertyValueChangedWithData ChildPropertyValueChangedDelegate;
+
+	/** Called when the property is reset to default */
+	FPropertyResetToDefaultEvent PropertyResetToDefaultEvent;
+
+	/** The property being displayed/edited. */
+	TWeakFieldPtr<FProperty> Property;
+
+	/** Offset to the property data within either a fixed array or a dynamic array */
+	int32 ArrayOffset;
+
+	/** The index of the property if it is inside an array, set, or map (internally, we'll use set/map helpers that store element indices in an array) */
+	int32 ArrayIndex;
+
+	/** Safety Value representing Depth in the property tree used to stop diabolical topology cases
+	 * -1 = No limit on children
+	 *  0 = No more children are allowed.  Do not process child nodes
+	 *  >0 = A limit has been set by the property and will tick down for successive children
+	 */
+	int32 MaxChildDepthAllowed;
+
+	/**
+	 * Used for flags to determine if the node is seen (if not seen and never been created, don't create it on display)
+	 */
+	EPropertyNodeFlags::Type PropertyNodeFlags;
+
+	/** If true, children of this node will be rebuilt next tick. */
+	bool bRebuildChildrenRequested;
+
+	/** Set to true when RebuildChildren is called on the node */
+	bool bChildrenRebuilt;
+
+	/** Set to true when we want to ignore CPF_InstancedReference */
+	bool bIgnoreInstancedReference;
+
+	/** An array of restrictions limiting this property's potential values in property editors.*/
+	TArray<TSharedRef<const FPropertyRestriction>> Restrictions;
+
+	/** Optional reference to a tree node that is displaying this property */
+	TWeakPtr<FDetailTreeNode> TreeNode;
+
+	/**
+	 * Stores metadata for this instance of the property (in contrast
+	 * to regular metadata, which is stored per-class)
+	 */
+	TMap<FName, FString> InstanceMetaData;
+
+	/**
+	* The property path for this property
+	*/
+	FString PropertyPath;
+
+	/** Edit condition expression used to determine if this property editor can modify its property */
+	TSharedPtr<FEditConditionExpression> EditConditionExpression;
+	TSharedPtr<FEditConditionContext> EditConditionContext;
+
+	/**
+	* Cached state of flags that are expensive to update
+	* These update when values are changed in the details panel
+	*/
+	mutable bool bIsEditConst;
+	mutable bool bUpdateEditConstState;
+	mutable bool bDiffersFromDefault;
+	mutable bool bUpdateDiffersFromDefault;
+};
+
+class FComplexPropertyNode : public FPropertyNode
+{
+public:
+
+	enum EPropertyType
+	{
+		EPT_Object,
+		EPT_StandaloneStructure,
+	};
+
+	FComplexPropertyNode() : FPropertyNode() {}
+	virtual ~FComplexPropertyNode() {}
+
+	virtual FComplexPropertyNode* AsComplexNode() override { return this; }
+	virtual const FComplexPropertyNode* AsComplexNode() const override { return this; }
+
+	virtual FStructurePropertyNode* AsStructureNode() { return nullptr; }
+	virtual const FStructurePropertyNode* AsStructureNode() const { return nullptr; }
+
+	virtual UStruct* GetBaseStructure() = 0;
+	virtual const UStruct* GetBaseStructure() const = 0;
+
+	// Returns the base struct as well as any sidecar data structs
+	virtual TArray<UStruct*> GetAllStructures() = 0;
+	virtual TArray<const UStruct*> GetAllStructures() const = 0;
+
+	virtual int32 GetInstancesNum() const = 0;
+	virtual uint8* GetMemoryOfInstance(int32 Index) const = 0;
+
+	/**
+	 * Returns a pointer to the stored value of InProperty on InParentNode's Index'th instance.
+	 */
+	virtual uint8* GetValuePtrOfInstance(int32 Index, const FProperty* InProperty, const FPropertyNode* InParentNode) const = 0;
+	virtual TWeakObjectPtr<UObject> GetInstanceAsUObject(int32 Index) const = 0;
+	virtual EPropertyType GetPropertyType() const = 0;
+
+	virtual void Disconnect() = 0;
+};
+
+
+} // namespace soda
+
+template<> struct TIsPODType<soda::FAddressPair> { enum { Value = true }; };
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRestriction.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRestriction.cpp
new file mode 100644
index 0000000..f3d2f6f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRestriction.cpp
@@ -0,0 +1,59 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyRestriction.h"
+
+namespace soda
+{
+
+bool FPropertyRestriction::IsValueHidden(const FString& InValue) const
+{
+	for (const FString& Value : HiddenValues)
+	{
+		if (InValue == Value)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+bool FPropertyRestriction::IsValueDisabled(const FString& InValue)const
+{
+	for (const FString& Value : DisabledValues)
+	{
+		if (InValue == Value)
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+void FPropertyRestriction::AddHiddenValue(FString InValue)
+{
+	HiddenValues.Add(MoveTemp(InValue));
+}
+
+void FPropertyRestriction::AddDisabledValue(FString InValue)
+{
+	DisabledValues.Add(MoveTemp(InValue));
+}
+
+void FPropertyRestriction::RemoveHiddenValue(FString Value)
+{
+	HiddenValues.Remove(Value);
+}
+
+void FPropertyRestriction::RemoveDisabledValue(FString Value)
+{
+	DisabledValues.Remove(Value);
+}
+
+void FPropertyRestriction::RemoveAll()
+{
+	HiddenValues.Empty();
+	DisabledValues.Empty();
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRowGenerator.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRowGenerator.cpp
new file mode 100644
index 0000000..cf1ffcd
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRowGenerator.cpp
@@ -0,0 +1,749 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyRowGenerator.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+#include "Classes/SodaStyleSettings.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilderImpl.h"
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/DetailLayoutHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "RuntimePropertyEditor/IPropertyGenerationUtilities.h"
+#include "RuntimePropertyEditor/EditConditionParser.h"
+#include "UObject/StructOnScope.h"
+//#include "ThumbnailRendering/ThumbnailManager.h"
+
+namespace soda
+{
+
+class FPropertyRowGeneratorUtilities : public IPropertyUtilities
+{
+public:
+	FPropertyRowGeneratorUtilities(FPropertyRowGenerator& InGenerator)
+		: Generator(&InGenerator)
+	{
+	}
+
+	void ResetGenerator()
+	{
+		Generator = nullptr;
+	}
+
+	/** IPropertyUtilities interface */
+	virtual FNotifyHook* GetNotifyHook() const override
+	{
+		return Generator != nullptr ? Generator->GetNotifyHook() : nullptr;
+	}
+	virtual bool AreFavoritesEnabled() const override
+	{
+		return false;
+	}
+
+	virtual void ToggleFavorite(const TSharedRef< class FPropertyEditor >& PropertyEditor) const override {}
+	virtual void CreateColorPickerWindow(const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha) const override {}
+	virtual void EnqueueDeferredAction(FSimpleDelegate DeferredAction) override
+	{
+		checkf(Generator != nullptr, TEXT("Can not enqueue action, generator is no longer valid"));
+		Generator->EnqueueDeferredAction(DeferredAction);
+	}
+	virtual bool IsPropertyEditingEnabled() const override
+	{
+		return Generator != nullptr && Generator->IsPropertyEditingEnabled();
+	}
+
+	virtual void ForceRefresh() override
+	{
+		if (Generator != nullptr)
+		{
+			Generator->ForceRefresh();
+		}
+	}
+	virtual void RequestRefresh() override {}
+	/*
+	virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const override
+	{
+		return Generator != nullptr
+			? Generator->GetThumbnailPool()
+			: TSharedPtr<class FAssetThumbnailPool>();
+	}
+	*/
+	virtual void NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent) override 
+	{
+		if (Generator)
+		{
+			Generator->OnFinishedChangingProperties().Broadcast(PropertyChangedEvent);
+		}
+	}
+
+	virtual bool DontUpdateValueWhileEditing() const override { return false; }
+
+	const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const override
+	{
+		if (Generator != nullptr)
+		{
+			return Generator->GetSelectedObjects();
+		}
+		else
+		{
+			static TArray<TWeakObjectPtr<UObject>> NullSelectedObjects;
+			return NullSelectedObjects;
+		}
+	}
+
+	virtual bool HasClassDefaultObject() const override
+	{
+		return Generator != nullptr && Generator->HasClassDefaultObject();
+	}
+
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const override
+	{
+		if (Generator != nullptr)
+		{
+			return Generator->GetClassViewerFilters();
+		}
+		else
+		{
+			static TArray<TSharedRef<IClassViewerFilter>> NullFilters;
+			return NullFilters;
+		}
+	}
+
+private:
+	FPropertyRowGenerator* Generator;
+};
+
+
+class FPropertyRowGeneratorGenerationUtilities : public IPropertyGenerationUtilities
+{
+public:
+	FPropertyRowGeneratorGenerationUtilities(FPropertyRowGenerator& InGenerator)
+		: Generator(&InGenerator)
+	{
+	}
+
+	void ResetGenerator()
+	{
+		Generator = nullptr;
+	}
+
+	virtual const FCustomPropertyTypeLayoutMap& GetInstancedPropertyTypeLayoutMap() const override
+	{
+		return Generator->GetInstancedPropertyTypeLayoutMap();
+	}
+
+	virtual void RebuildTreeNodes() override
+	{
+		if (Generator != nullptr)
+		{
+			Generator->UpdateDetailRows();
+		}
+	}
+
+private:
+	FPropertyRowGenerator* Generator;
+};
+
+FPropertyRowGenerator::FPropertyRowGenerator(const FPropertyRowGeneratorArgs& InArgs)
+	: Args(InArgs)
+	, PropertyUtilities(new FPropertyRowGeneratorUtilities(*this))
+	, PropertyGenerationUtilities(new FPropertyRowGeneratorGenerationUtilities(*this))
+{
+}
+/*
+FPropertyRowGenerator::FPropertyRowGenerator(const FPropertyRowGeneratorArgs& InArgs, TSharedPtr<FAssetThumbnailPool> InThumbnailPool)
+	: Args(InArgs)
+	, PropertyUtilities(new FPropertyRowGeneratorUtilities(*this))
+	, PropertyGenerationUtilities(new FPropertyRowGeneratorGenerationUtilities(*this))
+{
+
+}
+*/
+FPropertyRowGenerator::~FPropertyRowGenerator()
+{
+	StaticCastSharedRef<FPropertyRowGeneratorUtilities>(PropertyUtilities)->ResetGenerator();
+	StaticCastSharedRef<FPropertyRowGeneratorGenerationUtilities>(PropertyGenerationUtilities)->ResetGenerator();
+}
+
+void FPropertyRowGenerator::SetObjects(const TArray<UObject*>& InObjects)
+{
+	PreSetObject(InObjects.Num(), /*bHasStructRoots=*/false);
+	
+	bViewingClassDefaultObject = InObjects.Num() > 0 ? true : false;
+	
+	SelectedObjects.Reset(InObjects.Num());
+
+	for (int32 ObjectIndex = 0; ObjectIndex < InObjects.Num(); ++ObjectIndex)
+	{
+		UObject* Object = InObjects[ObjectIndex];
+
+		SelectedObjects.Add(Object);
+
+		bViewingClassDefaultObject &= Object->HasAnyFlags(RF_ClassDefaultObject);
+
+		if (Args.bAllowMultipleTopLevelObjects)
+		{
+			check(RootPropertyNodes.Num() == InObjects.Num());
+			RootPropertyNodes[ObjectIndex]->AsObjectNode()->AddObject(Object);
+		}
+		else
+		{
+			RootPropertyNodes[0]->AsObjectNode()->AddObject(Object);
+		}
+	}
+
+	PostSetObject();
+}
+
+void FPropertyRowGenerator::SetStructure(const TSharedPtr<FStructOnScope>& InStruct)
+{
+	PreSetObject(1, /*bHasStructRoots=*/true);
+
+	check(RootPropertyNodes.Num() == 1);
+	RootPropertyNodes[0]->AsStructureNode()->SetStructure(InStruct);
+
+	PostSetObject();
+}
+
+const TArray<TSharedRef<IDetailTreeNode>>& FPropertyRowGenerator::GetRootTreeNodes() const
+{
+	return RootTreeNodes;
+}
+
+TSharedPtr<IDetailTreeNode> FPropertyRowGenerator::FindTreeNode(TSharedPtr<IPropertyHandle> PropertyHandle) const
+{
+	if (PropertyHandle.IsValid() && PropertyHandle->IsValidHandle())
+	{
+		TArray<TSharedPtr<IDetailTreeNode>> NodesToCheck;
+		NodesToCheck.Append(RootTreeNodes);
+		TSharedPtr<FPropertyNode> PropertyNodeWeAreAfter = StaticCastSharedPtr<FPropertyHandleBase>(PropertyHandle)->GetPropertyNode();
+
+		TArray<TSharedRef<IDetailTreeNode>> Children;
+		while(NodesToCheck.Num())
+		{
+			TSharedPtr<IDetailTreeNode> Node = NodesToCheck.Pop(false);
+			TSharedPtr<FDetailTreeNode> TreeNodeImpl = StaticCastSharedPtr<FDetailTreeNode>(Node);
+			TSharedPtr<FPropertyNode> PropertyNode = TreeNodeImpl->GetPropertyNode();
+
+			if (UNLIKELY(PropertyNode.IsValid() && PropertyNode == PropertyNodeWeAreAfter))
+			{
+				return Node;
+			}
+
+			Node->GetChildren(Children);	// will nix the existing Children contents
+			NodesToCheck.Append(Children);
+		}
+	}
+	return nullptr;
+}
+
+TArray<TSharedPtr<IDetailTreeNode>> FPropertyRowGenerator::FindTreeNodes(const TArray<TSharedPtr<IPropertyHandle>>& PropertyHandles) const
+{
+	TArray<TSharedPtr<IDetailTreeNode>> NodesToCheck;
+	NodesToCheck.Append(RootTreeNodes);
+
+	// Property Node to Array Index mapping
+	TMap<TSharedPtr<FPropertyNode>, int32> PropertyNodesWeAreAfter;
+	for (int32 Index = 0, NumHandle = PropertyHandles.Num(); Index < NumHandle; ++Index)
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = StaticCastSharedPtr<FPropertyHandleBase>(PropertyHandles[Index])->GetPropertyNode();
+		// we assume no duplicates in the input param
+		ensure(!PropertyNodesWeAreAfter.Contains(PropertyNode));
+		PropertyNodesWeAreAfter.Add(MoveTemp(PropertyNode), Index);
+	}
+	TArray<TSharedPtr<IDetailTreeNode>> Results;
+	Results.AddDefaulted(PropertyHandles.Num());
+
+	int32 NumNotFound = Results.Num();
+
+	TArray<TSharedRef<IDetailTreeNode>> Children;
+	while (NodesToCheck.Num())
+	{
+		TSharedPtr<IDetailTreeNode> Node = NodesToCheck.Pop(false);
+		TSharedPtr<FDetailTreeNode> TreeNodeImpl = StaticCastSharedPtr<FDetailTreeNode>(Node);
+		TSharedPtr<FPropertyNode> PropertyNode = TreeNodeImpl->GetPropertyNode();
+
+		if (PropertyNode.IsValid())
+		{
+			if (int32* HandleIndex = PropertyNodesWeAreAfter.Find(PropertyNode))
+			{
+				Results[*HandleIndex] = Node;
+				--NumNotFound;
+			}
+
+			check(NumNotFound >= 0);
+			if (NumNotFound == 0)
+			{
+				break;
+			}
+		}
+
+		Node->GetChildren(Children);	// will nix the existing Children contents
+		NodesToCheck.Append(Children);
+	}
+
+	return Results;
+}
+
+void FPropertyRowGenerator::RegisterInstancedCustomPropertyLayout(UStruct* Class, FOnGetDetailCustomizationInstance DetailLayoutDelegate)
+{
+	check(Class);
+
+	FDetailLayoutCallback Callback;
+	Callback.DetailLayoutDelegate = DetailLayoutDelegate;
+	Callback.Order = InstancedClassToDetailLayoutMap.Num();
+
+	InstancedClassToDetailLayoutMap.Add(Class, Callback);
+}
+
+void FPropertyRowGenerator::RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier /*= nullptr*/)
+{
+	FPropertyTypeLayoutCallback Callback;
+	Callback.PropertyTypeLayoutDelegate = PropertyTypeLayoutDelegate;
+	Callback.PropertyTypeIdentifier = Identifier;
+
+	FPropertyTypeLayoutCallbackList* LayoutCallbacks = InstancedTypeToLayoutMap.Find(PropertyTypeName);
+	if (LayoutCallbacks)
+	{
+		LayoutCallbacks->Add(Callback);
+	}
+	else
+	{
+		FPropertyTypeLayoutCallbackList NewLayoutCallbacks;
+		NewLayoutCallbacks.Add(Callback);
+		InstancedTypeToLayoutMap.Add(PropertyTypeName, NewLayoutCallbacks);
+	}
+}
+
+void FPropertyRowGenerator::UnregisterInstancedCustomPropertyLayout(UStruct* Class)
+{
+	check(Class);
+
+	InstancedClassToDetailLayoutMap.Remove(Class);
+}
+
+void FPropertyRowGenerator::UnregisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, TSharedPtr<IPropertyTypeIdentifier> Identifier /*= nullptr*/)
+{
+	FPropertyTypeLayoutCallbackList* LayoutCallbacks = InstancedTypeToLayoutMap.Find(PropertyTypeName);
+
+	if (LayoutCallbacks)
+	{
+		LayoutCallbacks->Remove(Identifier);
+	}
+}
+
+void FPropertyRowGenerator::InvalidateCachedState()
+{
+	for (const TSharedPtr<FComplexPropertyNode>& ComplexRootNode : RootPropertyNodes)
+	{
+		ComplexRootNode->InvalidateCachedState();
+	}
+}
+
+void FPropertyRowGenerator::Tick(float DeltaTime)
+{
+	for (TSharedPtr<IDetailCustomization>& Customization : CustomizationClassInstancesPendingDelete)
+	{
+		ensure(Customization.IsUnique());
+	}
+
+	// Release any pending kill nodes.
+	for (TSharedPtr<FComplexPropertyNode>& PendingKillNode : RootNodesPendingKill)
+	{
+		if (PendingKillNode.IsValid())
+		{
+			PendingKillNode->Disconnect();
+			PendingKillNode.Reset();
+		}
+	}
+
+	RootNodesPendingKill.Empty();
+	CustomizationClassInstancesPendingDelete.Empty();
+
+	if (DeferredActions.Num() > 0)
+	{
+		// Execute any deferred actions
+		for (FSimpleDelegate& Action : DeferredActions)
+		{
+			Action.ExecuteIfBound();
+		}
+		DeferredActions.Empty();
+	}
+
+	bool bFullRefresh = ValidatePropertyNodes(RootPropertyNodes);
+
+	for (FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		if (LayoutData.DetailLayout.IsValid())
+		{
+			if (!bFullRefresh)
+			{
+				ValidatePropertyNodes(LayoutData.DetailLayout->GetExternalRootPropertyNodes());
+			}
+			LayoutData.DetailLayout->Tick(DeltaTime);
+		}
+	}
+
+}
+
+TStatId FPropertyRowGenerator::GetStatId() const 
+{
+	RETURN_QUICK_DECLARE_CYCLE_STAT(FPropertyRowGenerator, STATGROUP_Tickables);
+}
+
+void FPropertyRowGenerator::EnqueueDeferredAction(FSimpleDelegate DeferredAction)
+{
+	DeferredActions.Add(DeferredAction);
+}
+
+bool FPropertyRowGenerator::IsPropertyEditingEnabled() const
+{
+	if (!Args.bAllowEditingClassDefaultObjects)
+	{
+		return !bViewingClassDefaultObject;
+	}
+
+	return true;
+}
+
+void FPropertyRowGenerator::ForceRefresh()
+{
+	TArray<UObject*> NewObjectList;
+	TSharedPtr<FStructOnScope> StructData = nullptr;
+
+	for (const TSharedPtr<FComplexPropertyNode>& ComplexRootNode : RootPropertyNodes)
+	{
+		if (FObjectPropertyNode* RootNode = ComplexRootNode->AsObjectNode())
+		{
+			// Simply re-add the same existing objects to cause a refresh
+			for (TPropObjectIterator Itor(RootNode->ObjectIterator()); Itor; ++Itor)
+			{
+				TWeakObjectPtr<UObject> Object = *Itor;
+				if (Object.IsValid())
+				{
+					NewObjectList.Add(Object.Get());
+				}
+			}
+		}
+		else if (FStructurePropertyNode* StructRootNode = ComplexRootNode->AsStructureNode())
+		{
+			StructData = StructRootNode->GetStructData();
+		}
+	}
+	
+	if (StructData && StructData->IsValid())
+	{
+		SetStructure(StructData);
+	}
+	else
+	{
+		SetObjects(NewObjectList);
+	}
+}
+/*
+TSharedPtr<class FAssetThumbnailPool> FPropertyRowGenerator::GetThumbnailPool() const
+{
+	return UThumbnailManager::Get().GetSharedThumbnailPool();
+}
+*/
+const TArray<TSharedRef<IClassViewerFilter>>& FPropertyRowGenerator::GetClassViewerFilters() const
+{
+	// not implemented
+	static TArray<TSharedRef<IClassViewerFilter>> NotImplemented;
+	return NotImplemented;
+}
+
+void FPropertyRowGenerator::PreSetObject(int32 NumNewObjects, bool bHasStructRoots)
+{
+	// Save existing expanded items first
+	for (TSharedPtr<FComplexPropertyNode>& RootNode : RootPropertyNodes)
+	{
+		RootNodesPendingKill.Add(RootNode);
+		if (FObjectPropertyNode* RootObjectNode = RootNode->AsObjectNode())
+		{
+			RootObjectNode->RemoveAllObjects();
+			RootObjectNode->ClearObjectPackageOverrides();
+		}
+		else
+		{
+			FStructurePropertyNode* RootStructNode = RootNode->AsStructureNode();
+			RootStructNode->RemoveStructure();
+		}
+		RootNode->ClearCachedReadAddresses(true);
+	}
+
+	RootPropertyNodes.Empty(NumNewObjects);
+
+	if (!bHasStructRoots)
+	{
+		if (Args.bAllowMultipleTopLevelObjects)
+		{
+			for (int32 NewRootIndex = 0; NewRootIndex < NumNewObjects; ++NewRootIndex)
+			{
+				RootPropertyNodes.Add(MakeShared<FObjectPropertyNode>());
+			}
+		}
+		else
+		{
+			RootPropertyNodes.Add(MakeShared<FObjectPropertyNode>());
+		}
+	}
+	else
+	{
+		RootPropertyNodes.Add(MakeShared<FStructurePropertyNode>());
+	}
+}
+
+void FPropertyRowGenerator::PostSetObject()
+{
+	FPropertyNodeInitParams InitParams;
+	InitParams.ParentNode = nullptr;
+	InitParams.Property = nullptr;
+	InitParams.ArrayOffset = 0;
+	InitParams.ArrayIndex = INDEX_NONE;
+	InitParams.bAllowChildren = true;
+	InitParams.bForceHiddenPropertyVisibility = FPropertySettings::Get().ShowHiddenProperties() || Args.bShouldShowHiddenProperties;
+	InitParams.bGameModeOnlyVisible = Args.bGameModeOnlyVisible;
+	
+	switch (Args.DefaultsOnlyVisibility)
+	{
+	case EEditDefaultsOnlyNodeVisibility::Hide:
+		InitParams.bCreateDisableEditOnInstanceNodes = false;
+		break;
+	case EEditDefaultsOnlyNodeVisibility::Show:
+		InitParams.bCreateDisableEditOnInstanceNodes = true;
+		break;
+	case EEditDefaultsOnlyNodeVisibility::Automatic:
+		InitParams.bCreateDisableEditOnInstanceNodes = HasClassDefaultObject();
+		break;
+	default:
+		check(false);
+	}
+
+	for (TSharedPtr<FComplexPropertyNode>& ComplexRootNode : RootPropertyNodes)
+	{
+		ComplexRootNode->InitNode(InitParams);
+	}
+
+	UpdatePropertyMaps();
+
+	UpdateDetailRows();
+}
+
+const FCustomPropertyTypeLayoutMap& FPropertyRowGenerator::GetInstancedPropertyTypeLayoutMap() const
+{
+	return InstancedTypeToLayoutMap;
+}
+
+void FPropertyRowGenerator::UpdateDetailRows()
+{
+	RootTreeNodes.Reset();
+
+	FDetailNodeList InitialRootNodeList;
+
+	//NumVisbleTopLevelObjectNodes = 0;
+
+	FDetailFilter CurrentFilter;
+	CurrentFilter.bShowAllAdvanced = true;
+
+	for (int32 RootNodeIndex = 0; RootNodeIndex < RootPropertyNodes.Num(); ++RootNodeIndex)
+	{
+		TSharedPtr<FComplexPropertyNode>& RootPropertyNode = RootPropertyNodes[RootNodeIndex];
+		if (RootPropertyNode.IsValid())
+		{
+			RootPropertyNode->FilterNodes(CurrentFilter.FilterStrings);
+			RootPropertyNode->ProcessSeenFlags(true);
+
+			TSharedPtr<FDetailLayoutBuilderImpl>& DetailLayout = DetailLayouts[RootNodeIndex].DetailLayout;
+			if (DetailLayout.IsValid())
+			{
+				const FRootPropertyNodeList& ExternalPropertyNodeList = DetailLayout->GetExternalRootPropertyNodes();
+				for (int32 NodeIndex = 0; NodeIndex < ExternalPropertyNodeList.Num(); ++NodeIndex)
+				{
+					TSharedPtr<FPropertyNode> PropertyNode = ExternalPropertyNodeList[NodeIndex];
+
+					if (PropertyNode.IsValid())
+					{
+						PropertyNode->FilterNodes(CurrentFilter.FilterStrings);
+						PropertyNode->ProcessSeenFlags(true);
+					}
+				}
+
+				DetailLayout->FilterDetailLayout(CurrentFilter);
+
+				FDetailNodeList& LayoutRoots = DetailLayout->GetFilteredRootTreeNodes();
+				if (LayoutRoots.Num() > 0)
+				{
+					// A top level object nodes has a non-filtered away root so add one to the total number we have
+					//++NumVisbleTopLevelObjectNodes;
+
+					InitialRootNodeList.Append(LayoutRoots);
+				}
+			}
+		}
+	}
+
+
+	// for multiple top level object we need to do a secondary pass on top level object nodes after we have determined if there is any nodes visible at all.  If there are then we ask the details panel if it wants to show childen
+	for (TSharedRef<class FDetailTreeNode> RootNode : InitialRootNodeList)
+	{
+		if (RootNode->ShouldShowOnlyChildren())
+		{
+			FDetailNodeList TreeNodes;
+			RootNode->GetChildren(TreeNodes);
+			for (auto& Node : TreeNodes)
+			{
+				RootTreeNodes.Add(Node);
+			}
+		}
+		else
+		{
+			RootTreeNodes.Add(RootNode);
+		}
+	}
+
+	RowsRefreshedDelegate.Broadcast();
+
+}
+
+void FPropertyRowGenerator::UpdatePropertyMaps()
+{
+	RootTreeNodes.Empty();
+
+
+	for (FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		// Check uniqueness.  It is critical that detail layouts can be destroyed
+		// We need to be able to create a new detail layout and properly clean up the old one in the process
+		check(!LayoutData.DetailLayout.IsValid() || LayoutData.DetailLayout.IsUnique());
+
+		// All the current customization instances need to be deleted when it is safe
+		CustomizationClassInstancesPendingDelete.Append(LayoutData.CustomizationClassInstances);
+
+		for (auto ExternalRootNode : LayoutData.DetailLayout->GetExternalRootPropertyNodes())
+		{
+			if (ExternalRootNode.IsValid())
+			{
+				FComplexPropertyNode* ComplexNode = ExternalRootNode->AsComplexNode();
+				if (ComplexNode)
+				{
+					ComplexNode->Disconnect();
+				}
+			}
+		}
+	}
+
+	DetailLayouts.Empty(RootPropertyNodes.Num());
+
+	// There should be one detail layout for each root node
+	DetailLayouts.AddDefaulted(RootPropertyNodes.Num());
+
+	for (int32 RootNodeIndex = 0; RootNodeIndex < RootPropertyNodes.Num(); ++RootNodeIndex)
+	{
+		FDetailLayoutData& LayoutData = DetailLayouts[RootNodeIndex];
+		UpdateSinglePropertyMap(RootPropertyNodes[RootNodeIndex], LayoutData);
+	}
+}
+
+void FPropertyRowGenerator::UpdateSinglePropertyMap(TSharedPtr<FComplexPropertyNode> InRootPropertyNode, FDetailLayoutData& LayoutData)
+{
+	// Reset everything
+	LayoutData.ClassToPropertyMap.Empty();
+
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayout = MakeShareable(new FDetailLayoutBuilderImpl(InRootPropertyNode, LayoutData.ClassToPropertyMap, PropertyUtilities, PropertyGenerationUtilities, nullptr, false));
+	DetailLayout->AddNodeVisibilityChangedHandler(FSimpleMulticastDelegate::FDelegate::CreateRaw(this, &FPropertyRowGenerator::LayoutNodeVisibilityChanged));
+	LayoutData.DetailLayout = DetailLayout;
+
+	TSharedPtr<FComplexPropertyNode> RootPropertyNode = InRootPropertyNode;
+	check(RootPropertyNode.IsValid());
+
+	DetailLayoutHelpers::FUpdatePropertyMapArgs LayoutArgs;
+
+	LayoutArgs.LayoutData = &LayoutData;
+	LayoutArgs.InstancedPropertyTypeToDetailLayoutMap = &InstancedTypeToLayoutMap;
+	LayoutArgs.IsPropertyReadOnly = [this](const FPropertyAndParent& PropertyAndParent) { return false; };
+	LayoutArgs.IsPropertyVisible = [this](const FPropertyAndParent& PropertyAndParent) { return true; };
+	LayoutArgs.bEnableFavoriteSystem = false;
+	LayoutArgs.bUpdateFavoriteSystemOnly = false;
+
+	DetailLayoutHelpers::UpdateSinglePropertyMapRecursive(*RootPropertyNode, NAME_None, RootPropertyNode.Get(), LayoutArgs);
+
+	DetailLayoutHelpers::QueryCustomDetailLayout(LayoutData, InstancedClassToDetailLayoutMap, FOnGetDetailCustomizationInstance());
+
+	LayoutData.DetailLayout->GenerateDetailLayout();
+}
+
+
+bool FPropertyRowGenerator::ValidatePropertyNodes(const FRootPropertyNodeList& PropertyNodeList)
+{
+	if (CustomValidatePropertyNodesFunction.IsBound())
+	{
+		return CustomValidatePropertyNodesFunction.Execute(PropertyNodeList);
+	}
+	
+	bool bFullRefresh = false;
+
+	for (const TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		// Purge any objects that are marked pending kill from the object list
+		if (FObjectPropertyNode* ObjectRoot = RootPropertyNode->AsObjectNode())
+		{
+			ObjectRoot->PurgeKilledObjects();
+		}
+
+		EPropertyDataValidationResult Result = RootPropertyNode->EnsureDataIsValid();
+		if (Result == EPropertyDataValidationResult::PropertiesChanged || Result == EPropertyDataValidationResult::EditInlineNewValueChanged)
+		{
+			UpdatePropertyMaps();
+			UpdateDetailRows();
+			break;
+		}
+		else if (Result == EPropertyDataValidationResult::ArraySizeChanged || Result == EPropertyDataValidationResult::ChildrenRebuilt)
+		{
+			UpdateDetailRows();
+		}
+		else if (Result == EPropertyDataValidationResult::ObjectInvalid)
+		{
+			ForceRefresh();
+			bFullRefresh = true;
+			break;
+		}
+	}
+
+	return bFullRefresh;
+}
+
+TSharedPtr<IDetailTreeNode> FPropertyRowGenerator::FindTreeNodeRecursive(const TSharedPtr<IDetailTreeNode>& StartNode, TSharedPtr<IPropertyHandle> PropertyHandle) const
+{
+	TSharedPtr<FDetailTreeNode> TreeNodeImpl = StaticCastSharedPtr<FDetailTreeNode>(StartNode);
+	
+	TSharedPtr<FPropertyNode> PropertyNode = TreeNodeImpl->GetPropertyNode();
+	if (PropertyNode.IsValid() && PropertyNode == StaticCastSharedPtr<FPropertyHandleBase>(PropertyHandle)->GetPropertyNode())
+	{
+		return StartNode;
+	}
+
+	TArray<TSharedRef<IDetailTreeNode>> Children;
+	StartNode->GetChildren(Children);
+	for (TSharedRef<IDetailTreeNode>& Child : Children)
+	{
+		TSharedPtr<IDetailTreeNode> FoundNode = FindTreeNodeRecursive(Child, PropertyHandle);
+		if (FoundNode.IsValid())
+		{
+			return FoundNode;
+		}
+	}
+
+	return nullptr;
+}
+
+void FPropertyRowGenerator::LayoutNodeVisibilityChanged()
+{
+	UpdateDetailRows();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRowGenerator.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRowGenerator.h
new file mode 100644
index 0000000..96857e3
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyRowGenerator.h
@@ -0,0 +1,167 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakObjectPtr.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+//#include "TickableEditorObject.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IPropertyRowGenerator.h"
+#include "Tickable.h"
+
+class FStructOnScope;
+
+namespace soda
+{
+
+class FDetailCategoryImpl;
+class FDetailLayoutBuilderImpl;
+class FPropertyNode;
+class IDetailCustomization;
+class IDetailNodeTree;
+class FComplexPropertyNode;
+class FDetailTreeNode;
+class IPropertyGenerationUtilities;
+class IClassViewerFilter;
+
+struct FPropertyNodeMap
+{
+	FPropertyNodeMap()
+		: ParentProperty(NULL)
+	{}
+
+	/** Object property node which contains the properties in the node map */
+	FPropertyNode* ParentProperty;
+
+	/** Property name to property node map */
+	TMap<FName, TSharedPtr<FPropertyNode> > PropertyNameToNode;
+
+	bool Contains(FName PropertyName) const
+	{
+		return PropertyNameToNode.Contains(PropertyName);
+	}
+
+	void Add(FName PropertyName, TSharedPtr<FPropertyNode>& PropertyNode)
+	{
+		PropertyNameToNode.Add(PropertyName, PropertyNode);
+	}
+};
+
+
+/** Mapping of categories to all top level item property nodes in that category */
+typedef TMap<FName, TSharedPtr<FDetailCategoryImpl> > FCategoryMap;
+
+/** Class to properties in that class */
+typedef TMap<FName, FPropertyNodeMap> FClassInstanceToPropertyMap;
+
+/** Class to properties in that class */
+typedef TMap<FName, FClassInstanceToPropertyMap> FClassToPropertyMap;
+
+struct FDetailLayoutData
+{
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayout;
+
+	FClassToPropertyMap ClassToPropertyMap;
+
+	/** A  unique classes being viewed */
+	TSet<TWeakObjectPtr<UStruct>> ClassesWithProperties;
+
+	/** Customization class instances currently active in this view */
+	TArray<TSharedPtr<IDetailCustomization>> CustomizationClassInstances;
+};
+
+class FPropertyRowGenerator : public IPropertyRowGenerator, public FTickableGameObject/*, public FTickableEditorObject*/, public TSharedFromThis<FPropertyRowGenerator>
+{
+public:
+	FPropertyRowGenerator(const FPropertyRowGeneratorArgs& InArgs);
+
+	//UE_DEPRECATED(5.0, "FPropertyRowGenerator which takes in a thumbnail pool parameter is no longer necessary.")
+	//FPropertyRowGenerator(const FPropertyRowGeneratorArgs& InArgs, TSharedPtr<FAssetThumbnailPool> InThumbnailPool);
+
+	~FPropertyRowGenerator();
+
+	DECLARE_DERIVED_EVENT(FPropertyRowGenerator, IPropertyRowGenerator::FOnRowsRefreshed, FOnRowsRefreshed);
+
+	/** IPropertyRowGenerator interface */
+	virtual void SetObjects(const TArray<UObject*>& InObjects) override;
+	virtual void SetStructure(const TSharedPtr<FStructOnScope>& InStruct) override;
+	virtual const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const override { return SelectedObjects; }
+	virtual const TArray<TSharedRef<IDetailTreeNode>>& GetRootTreeNodes() const override;
+	virtual TSharedPtr<IDetailTreeNode> FindTreeNode(TSharedPtr<IPropertyHandle> PropertyHandle) const override;
+	virtual TArray<TSharedPtr<IDetailTreeNode>> FindTreeNodes(const TArray<TSharedPtr<IPropertyHandle>>& PropertyHandles) const override;
+	virtual FOnRowsRefreshed& OnRowsRefreshed() override { return RowsRefreshedDelegate; }
+	virtual void RegisterInstancedCustomPropertyLayout(UStruct* Class, FOnGetDetailCustomizationInstance DetailLayoutDelegate) override;
+	virtual void RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) override;
+	virtual void UnregisterInstancedCustomPropertyLayout(UStruct* Class) override;
+	virtual void UnregisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) override;
+	virtual void SetCustomValidatePropertyNodesFunction(FOnValidatePropertyRowGeneratorNodes InCustomValidatePropertyNodesFunction) override
+	{
+		CustomValidatePropertyNodesFunction = MoveTemp(InCustomValidatePropertyNodesFunction);
+	}
+	virtual void InvalidateCachedState() override;
+
+	/** FTickableGameObject interface */
+	virtual ETickableTickType GetTickableTickType() const override { return ETickableTickType::Always; }
+	virtual void Tick(float DeltaTime) override;
+	virtual TStatId GetStatId() const override;
+
+	/** IPropertyUtilities interface */
+	virtual FNotifyHook* GetNotifyHook() const { return Args.NotifyHook; }
+	virtual void EnqueueDeferredAction(FSimpleDelegate DeferredAction);	
+	virtual bool IsPropertyEditingEnabled() const;
+	virtual void ForceRefresh();
+	//virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const;
+	virtual bool HasClassDefaultObject() const { return bViewingClassDefaultObject; }
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const;
+
+	const FCustomPropertyTypeLayoutMap& GetInstancedPropertyTypeLayoutMap() const;
+	void UpdateDetailRows();
+	virtual FOnFinishedChangingProperties& OnFinishedChangingProperties() override { return OnFinishedChangingPropertiesDelegate; }
+
+private:
+	void PreSetObject(int32 NumNewObjects, bool bHasStructRoots);
+	void PostSetObject();
+	void UpdatePropertyMaps();
+	void UpdateSinglePropertyMap(TSharedPtr<FComplexPropertyNode> InRootPropertyNode, FDetailLayoutData& LayoutData);
+	bool ValidatePropertyNodes(const FRootPropertyNodeList& PropertyNodeList);
+	TSharedPtr<IDetailTreeNode> FindTreeNodeRecursive(const TSharedPtr<IDetailTreeNode>& StartNode, TSharedPtr<IPropertyHandle> PropertyHandle) const;
+	void LayoutNodeVisibilityChanged();
+
+private:
+	const FPropertyRowGeneratorArgs Args;
+	/** The root property nodes of the property tree for a specific set of UObjects */
+	FRootPropertyNodeList RootPropertyNodes;
+	/** Root tree nodes that needs to be destroyed when safe */
+	FRootPropertyNodeList RootNodesPendingKill;
+	/** Root tree nodes visible in the tree */
+	TArray<TSharedRef<IDetailTreeNode>> RootTreeNodes;
+	/** The current detail layout based on objects in this details panel.  There is one layout for each top level object node.*/
+	TArray<FDetailLayoutData> DetailLayouts;
+	/** Customization instances that need to be destroyed when safe to do so */
+	TArray<TSharedPtr<IDetailCustomization>> CustomizationClassInstancesPendingDelete;
+	/** Actions that should be executed next tick */
+	TArray<FSimpleDelegate> DeferredActions;
+	/** Currently viewed objects */
+	TArray<TWeakObjectPtr<UObject>> SelectedObjects;
+	/** Delegate to call when the user of this generator needs to know the rows are invalid */
+	FOnRowsRefreshed RowsRefreshedDelegate;
+	/** A mapping of type names to detail layout delegates, called when querying for custom detail layouts in this instance of the details view only */
+	FCustomPropertyTypeLayoutMap InstancedTypeToLayoutMap;
+	/** A mapping of classes to detail layout delegates, called when querying for custom detail layouts in this instance of the details view only*/
+	FCustomDetailLayoutMap InstancedClassToDetailLayoutMap;
+	/** Utility class for accessing commonly used helper methods from customizations */
+	TSharedRef<IPropertyUtilities> PropertyUtilities;
+	/** Utility class for accessing internal helper methods */
+	TSharedRef<IPropertyGenerationUtilities> PropertyGenerationUtilities;
+	/** Delegate called when the details panel finishes editing a property (after post edit change is called) */
+	FOnFinishedChangingProperties OnFinishedChangingPropertiesDelegate;
+	/** The ValidatePropertyNodes function can be overridden with this member, if set. Useful if your implementation doesn't require this kind of validation each Tick. */
+	FOnValidatePropertyRowGeneratorNodes CustomValidatePropertyNodesFunction;
+
+	bool bViewingClassDefaultObject;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyTextUtilities.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyTextUtilities.cpp
new file mode 100644
index 0000000..1e65c96
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyTextUtilities.cpp
@@ -0,0 +1,45 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/PropertyTextUtilities.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+
+namespace soda
+{
+
+void FPropertyTextUtilities::PropertyToTextHelper(FString& OutString, const FPropertyNode* InPropertyNode, const FProperty* Property, const uint8* ValueAddress, UObject* Object, EPropertyPortFlags PortFlags)
+{
+	if (InPropertyNode->GetArrayIndex() != INDEX_NONE || Property->ArrayDim == 1)
+	{
+		Property->ExportText_Direct(OutString, ValueAddress, ValueAddress, Object, PortFlags);
+	}
+	else
+	{
+		FArrayProperty::ExportTextInnerItem(OutString, Property, ValueAddress, Property->ArrayDim, ValueAddress, Property->ArrayDim, Object, PortFlags);
+	}
+}
+
+void FPropertyTextUtilities::PropertyToTextHelper(FString& OutString, const FPropertyNode* InPropertyNode, const FProperty* Property, const FObjectBaseAddress& ObjectAddress, EPropertyPortFlags PortFlags)
+{
+	PropertyToTextHelper(OutString, InPropertyNode, Property, ObjectAddress.BaseAddress, ObjectAddress.Object, PortFlags);
+}
+
+void FPropertyTextUtilities::TextToPropertyHelper(const TCHAR* Buffer, const FPropertyNode* InPropertyNode, const FProperty* Property, uint8* ValueAddress, UObject* Object, EPropertyPortFlags PortFlags)
+{
+	if (InPropertyNode->GetArrayIndex() != INDEX_NONE || Property->ArrayDim == 1)
+	{
+		Property->ImportText_Direct(Buffer, ValueAddress, Object, PortFlags);
+	}
+	else
+	{
+		FArrayProperty::ImportTextInnerItem(Buffer, Property, ValueAddress, PortFlags, Object);
+	}
+}
+
+void FPropertyTextUtilities::TextToPropertyHelper(const TCHAR* Buffer, const FPropertyNode* InPropertyNode, const FProperty* Property, const FObjectBaseAddress& ObjectAddress, EPropertyPortFlags PortFlags)
+{
+	TextToPropertyHelper(Buffer, InPropertyNode, Property, ObjectAddress.BaseAddress, ObjectAddress.Object, PortFlags);
+}
+
+}
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyTextUtilities.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyTextUtilities.h
new file mode 100644
index 0000000..1c6ca8e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/PropertyTextUtilities.h
@@ -0,0 +1,26 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "UObject/UnrealType.h"
+#include "UObject/PropertyPortFlags.h"
+
+namespace soda
+{
+
+class FPropertyNode;
+class FObjectBaseAddress;
+
+class FPropertyTextUtilities
+{
+public:
+	static void PropertyToTextHelper(FString& OutString, const FPropertyNode* InPropertyNode, const FProperty* Property, const uint8* ValueAddress, UObject* Object, EPropertyPortFlags PortFlags);
+	static void PropertyToTextHelper(FString& OutString, const FPropertyNode* InPropertyNode, const FProperty* Property, const FObjectBaseAddress& ObjectAddress, EPropertyPortFlags PortFlags);
+	static void TextToPropertyHelper(const TCHAR* Buffer, const FPropertyNode* InPropertyNode, const FProperty* Property, uint8* ValueAddress, UObject* Object, EPropertyPortFlags PortFlags = PPF_None);
+	static void TextToPropertyHelper(const TCHAR* Buffer, const FPropertyNode* InPropertyNode, const FProperty* Property, const FObjectBaseAddress& ObjectAddress, EPropertyPortFlags PortFlags = PPF_None);
+};
+
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SConstrainedBox.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SConstrainedBox.cpp
new file mode 100644
index 0000000..6330d19
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SConstrainedBox.cpp
@@ -0,0 +1,43 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SConstrainedBox.h"
+
+namespace soda
+{
+
+void SConstrainedBox::Construct(const FArguments& InArgs)
+{
+	MinWidth = InArgs._MinWidth;
+	MaxWidth = InArgs._MaxWidth;
+
+	ChildSlot
+	[
+		InArgs._Content.Widget
+	];
+}
+
+FVector2D SConstrainedBox::ComputeDesiredSize(float LayoutScaleMultiplier) const
+{
+	const float MinWidthVal = MinWidth.Get().Get(0.0f);
+	const float MaxWidthVal = MaxWidth.Get().Get(0.0f);
+
+	if (MinWidthVal == 0.0f && MaxWidthVal == 0.0f)
+	{
+		return SCompoundWidget::ComputeDesiredSize(LayoutScaleMultiplier);
+	}
+	else
+	{
+		FVector2D ChildSize = ChildSlot.GetWidget()->GetDesiredSize();
+
+		float XVal = FMath::Max(MinWidthVal, ChildSize.X);
+		if (MaxWidthVal > MinWidthVal)
+		{
+			XVal = FMath::Min(MaxWidthVal, XVal);
+		}
+
+		return FVector2D(XVal, ChildSize.Y);
+	}
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SConstrainedBox.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SConstrainedBox.h
new file mode 100644
index 0000000..c4619b0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SConstrainedBox.h
@@ -0,0 +1,32 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+
+namespace soda
+{
+
+class SConstrainedBox : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SConstrainedBox)
+		: _MinWidth()
+		, _MaxWidth()
+	{}
+	SLATE_DEFAULT_SLOT(FArguments, Content)
+		SLATE_ATTRIBUTE(TOptional<float>, MinWidth)
+		SLATE_ATTRIBUTE(TOptional<float>, MaxWidth)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs);
+	virtual FVector2D ComputeDesiredSize(float LayoutScaleMultiplier) const override;
+
+private:
+	TAttribute< TOptional<float> > MinWidth;
+	TAttribute< TOptional<float> > MaxWidth;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailCategoryTableRow.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailCategoryTableRow.cpp
new file mode 100644
index 0000000..9a956a0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailCategoryTableRow.cpp
@@ -0,0 +1,188 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SDetailCategoryTableRow.h"
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimePropertyEditor/SDetailExpanderArrow.h"
+#include "RuntimePropertyEditor/SDetailRowIndent.h"
+#include "Styling/StyleColors.h"
+
+namespace soda
+{
+
+void SDetailCategoryTableRow::Construct(const FArguments& InArgs, TSharedRef<FDetailTreeNode> InOwnerTreeNode, const TSharedRef<STableViewBase>& InOwnerTableView)
+{
+	OwnerTreeNode = InOwnerTreeNode;
+
+	bIsInnerCategory = InArgs._InnerCategory;
+	bShowBorder = InArgs._ShowBorder;
+
+	FDetailColumnSizeData& ColumnSizeData = InOwnerTreeNode->GetDetailsView()->GetColumnSizeData();
+
+	TSharedRef<SHorizontalBox> HeaderBox = SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Fill)
+		.AutoWidth()
+		[
+			SNew(SDetailRowIndent, SharedThis(this))
+		]
+		+ SHorizontalBox::Slot()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		.Padding(2, 0, 0, 0)
+		.AutoWidth()
+		[
+			SNew(SDetailExpanderArrow, SharedThis(this))
+		]
+		+ SHorizontalBox::Slot()
+		.VAlign(VAlign_Center)
+		.Padding(4, 0, 0, 0)
+		.FillWidth(1)
+		[
+			SNew(STextBlock)
+			.Text(InArgs._DisplayName)
+			.Font(FSodaStyle::Get().GetFontStyle(bIsInnerCategory ? PropertyEditorConstants::PropertyFontStyle : PropertyEditorConstants::CategoryFontStyle))
+			.TextStyle(FSodaStyle::Get(), "DetailsView.CategoryTextStyle")
+		];
+
+	if (InArgs._HeaderContent.IsValid())
+	{
+		HeaderBox->AddSlot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1)
+			[
+				InArgs._HeaderContent.ToSharedRef()
+			];
+	}
+
+	TWeakPtr<STableViewBase> OwnerTableViewWeak = InOwnerTableView;
+	auto GetScrollbarWellBrush = [this, OwnerTableViewWeak]()
+	{
+		return SDetailTableRowBase::IsScrollBarVisible(OwnerTableViewWeak) ?
+			FSodaStyle::Get().GetBrush("DetailsView.GridLine") :
+			this->GetBackgroundImage();
+	};
+
+	auto GetScrollbarWellTint = [this, OwnerTableViewWeak]()
+	{
+		return SDetailTableRowBase::IsScrollBarVisible(OwnerTableViewWeak) ?
+			FSlateColor(EStyleColor::White) :
+			this->GetInnerBackgroundColor();
+	};
+
+	this->ChildSlot
+	[
+		SNew(SBorder)
+		.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.GridLine"))
+		.Padding(FMargin(0, 0, 0, 1))
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.HAlign(HAlign_Fill)
+			.Padding(0)
+			[
+				SNew(SBorder)
+				.BorderImage(this, &SDetailCategoryTableRow::GetBackgroundImage)
+				.BorderBackgroundColor(this, &SDetailCategoryTableRow::GetInnerBackgroundColor)
+				.Padding(0)
+				[
+					SNew(SBox)
+					.MinDesiredHeight(PropertyEditorConstants::PropertyRowHeight)
+					.VAlign(VAlign_Center)
+					[
+						HeaderBox
+					]
+				]
+			]
+			+ SHorizontalBox::Slot()
+			.HAlign(HAlign_Right)
+			.VAlign(VAlign_Fill)
+			.Padding(0)
+			.AutoWidth()
+			[
+				SNew(SBorder)
+				.BorderImage_Lambda(GetScrollbarWellBrush)
+				.BorderBackgroundColor_Lambda(GetScrollbarWellTint)
+				.Padding(FMargin(0, 0, SDetailTableRowBase::ScrollBarPadding, 0))
+			]
+		]
+	];
+
+	STableRow< TSharedPtr< FDetailTreeNode > >::ConstructInternal(
+		STableRow::FArguments()
+		.Style(FSodaStyle::Get(), "DetailsView.TreeView.TableRow")
+		.ShowSelection(false),
+		InOwnerTableView
+	);
+}
+
+EVisibility SDetailCategoryTableRow::IsSeparatorVisible() const
+{
+	return bIsInnerCategory || IsItemExpanded() ? EVisibility::Collapsed : EVisibility::Visible;
+}
+
+const FSlateBrush* SDetailCategoryTableRow::GetBackgroundImage() const
+{
+	if (bShowBorder)
+	{
+		if (bIsInnerCategory)
+		{
+			return FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle");
+		}
+
+		// intentionally no hover on outer categories
+		return FSodaStyle::Get().GetBrush("DetailsView.CategoryTop");
+	}
+
+	return nullptr;
+}
+
+FSlateColor SDetailCategoryTableRow::GetInnerBackgroundColor() const
+{
+	if (bShowBorder && bIsInnerCategory)
+	{
+		int32 IndentLevel = -1;
+		if (OwnerTablePtr.IsValid())
+		{
+			IndentLevel = GetIndentLevel();
+		}
+
+		IndentLevel = FMath::Max(IndentLevel - 1, 0);
+
+		return PropertyEditorConstants::GetRowBackgroundColor(IndentLevel, this->IsHovered());
+	}
+
+	return FSlateColor(FLinearColor::White);
+}
+
+FSlateColor SDetailCategoryTableRow::GetOuterBackgroundColor() const
+{
+	if (IsHovered())
+	{
+		return FSodaStyle::Get().GetSlateColor("Colors.Header");
+	}
+
+	return FSodaStyle::Get().GetSlateColor("Colors.Panel");
+}
+
+FReply SDetailCategoryTableRow::OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+	{
+		ToggleExpansion();
+		return FReply::Handled();
+	}
+	else
+	{
+		return FReply::Unhandled();
+	}
+}
+
+FReply SDetailCategoryTableRow::OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent)
+{
+	return OnMouseButtonDown(InMyGeometry, InMouseEvent);
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailCategoryTableRow.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailCategoryTableRow.h
new file mode 100644
index 0000000..cb6ac2f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailCategoryTableRow.h
@@ -0,0 +1,47 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "Input/Reply.h"
+#include "Layout/Visibility.h"
+#include "RuntimePropertyEditor/SDetailTableRowBase.h"
+#include "Templates/SharedPointer.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Views/STableRow.h"
+#include "Widgets/Views/STableViewBase.h"
+
+namespace soda
+{
+
+class SDetailCategoryTableRow : public SDetailTableRowBase
+{
+public:
+	SLATE_BEGIN_ARGS(SDetailCategoryTableRow)
+		: _InnerCategory(false)
+		, _ShowBorder(true)
+	{}
+		SLATE_ARGUMENT(FText, DisplayName)
+		SLATE_ARGUMENT(bool, InnerCategory)
+		SLATE_ARGUMENT(TSharedPtr<SWidget>, HeaderContent)
+		SLATE_ARGUMENT(bool, ShowBorder)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, TSharedRef<FDetailTreeNode> InOwnerTreeNode, const TSharedRef<STableViewBase>& InOwnerTableView);
+
+private:
+	EVisibility IsSeparatorVisible() const;
+	const FSlateBrush* GetBackgroundImage() const;
+	FSlateColor GetInnerBackgroundColor() const;
+	FSlateColor GetOuterBackgroundColor() const;
+
+	FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	FReply OnMouseButtonDoubleClick(const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent) override;
+
+private:
+	bool bIsInnerCategory;
+	bool bShowBorder;
+};
+
+}
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailExpanderArrow.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailExpanderArrow.cpp
new file mode 100644
index 0000000..3ef76cc
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailExpanderArrow.cpp
@@ -0,0 +1,114 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SDetailExpanderArrow.h"
+#include "RuntimePropertyEditor/SDetailTableRowBase.h"
+#include "RuntimePropertyEditor/SConstrainedBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+
+namespace soda
+{
+
+void SDetailExpanderArrow::Construct(const FArguments& InArgs, TSharedRef<SDetailTableRowBase> DetailsRow)
+{
+	Row = DetailsRow;
+
+	ChildSlot
+	[
+		SNew(SConstrainedBox)
+		.MinWidth(12)
+		.Visibility(this, &SDetailExpanderArrow::GetExpanderVisibility)
+		[
+			SAssignNew(ExpanderArrow, SButton)
+			.ButtonStyle(FCoreStyle::Get(), "NoBorder")
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			.ClickMethod(EButtonClickMethod::MouseDown)
+			.OnClicked(this, &SDetailExpanderArrow::OnExpanderClicked)
+			.ContentPadding(0)
+			.IsFocusable(false)
+			[
+				SNew(SImage)
+				.Image(this, &SDetailExpanderArrow::GetExpanderImage)
+				.ColorAndOpacity(FSlateColor::UseSubduedForeground())
+			]
+		]
+	];
+}
+
+EVisibility SDetailExpanderArrow::GetExpanderVisibility() const
+{
+	TSharedPtr<SDetailTableRowBase> RowPtr = Row.Pin();
+	if (!RowPtr.IsValid())
+	{
+		return EVisibility::Collapsed;
+	}
+
+	return RowPtr->DoesItemHaveChildren() ? EVisibility::Visible : EVisibility::Hidden;
+}
+
+const FSlateBrush* SDetailExpanderArrow::GetExpanderImage() const
+{
+	TSharedPtr<SDetailTableRowBase> RowPtr = Row.Pin();
+	if (!RowPtr.IsValid())
+	{
+		return FAppStyle::Get().GetBrush("NoBrush");
+	}
+
+	const bool bIsItemExpanded = RowPtr->IsItemExpanded();
+
+	FName ResourceName;
+	if (bIsItemExpanded)
+	{
+		if (ExpanderArrow->IsHovered())
+		{
+			static const FName ExpandedHoveredName = "TreeArrow_Expanded_Hovered";
+			ResourceName = ExpandedHoveredName;
+		}
+		else
+		{
+			static const FName ExpandedName = "TreeArrow_Expanded";
+			ResourceName = ExpandedName;
+		}
+	}
+	else
+	{
+		if (ExpanderArrow->IsHovered())
+		{
+			static const FName CollapsedHoveredName = "TreeArrow_Collapsed_Hovered";
+			ResourceName = CollapsedHoveredName;
+		}
+		else
+		{
+			static const FName CollapsedName = "TreeArrow_Collapsed";
+			ResourceName = CollapsedName;
+		}
+	}
+
+	return FSodaStyle::Get().GetBrush(ResourceName);
+}
+
+FReply SDetailExpanderArrow::OnExpanderClicked()
+{
+	TSharedPtr<SDetailTableRowBase> RowPtr = Row.Pin();
+	if (!RowPtr.IsValid())
+	{
+		return FReply::Unhandled();
+	}
+
+	// Recurse the expansion if "shift" is being pressed
+	const FModifierKeysState ModKeyState = FSlateApplication::Get().GetModifierKeys();
+	if (ModKeyState.IsShiftDown())
+	{
+		RowPtr->Private_OnExpanderArrowShiftClicked();
+	}
+	else
+	{
+		RowPtr->ToggleExpansion();
+	}
+
+	return FReply::Handled();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailExpanderArrow.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailExpanderArrow.h
new file mode 100644
index 0000000..bc7850a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailExpanderArrow.h
@@ -0,0 +1,35 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+
+class SButton;
+
+namespace soda
+{
+
+class SDetailTableRowBase;
+
+class SDetailExpanderArrow : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SDetailExpanderArrow) {}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, TSharedRef<SDetailTableRowBase> DetailsRow);
+
+private:
+
+	EVisibility GetExpanderVisibility() const;
+	const FSlateBrush* GetExpanderImage() const;
+	FReply OnExpanderClicked();
+	
+private:
+	TWeakPtr<SDetailTableRowBase> Row;
+	TSharedPtr<SButton> ExpanderArrow;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailNameArea.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailNameArea.cpp
new file mode 100644
index 0000000..2d665b6
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailNameArea.cpp
@@ -0,0 +1,245 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SDetailNameArea.h"
+
+//#include "AssetSelection.h"
+#include "Components/ActorComponent.h"
+//#include "EditorClassUtils.h"
+#include "SodaStyleSet.h"
+#include "RuntimeEditorModule.h"
+#include "Engine/World.h"
+#include "Misc/PackageName.h"
+#include "Modules/ModuleManager.h"
+#include "Styling/SlateIconFinder.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "SodaEditorWidgets/IObjectNameEditableTextBox.h"
+#include "RuntimeEditorUtils.h"
+
+#define LOCTEXT_NAMESPACE "SDetailsView"
+
+namespace soda
+{
+
+void SDetailNameArea::Construct( const FArguments& InArgs, const TArray< TWeakObjectPtr<UObject> >* SelectedObjects )
+{
+	OnLockButtonClicked = InArgs._OnLockButtonClicked;
+	IsLocked = InArgs._IsLocked;
+	SelectionTip = InArgs._SelectionTip;
+	bShowLockButton = InArgs._ShowLockButton;
+	bShowObjectLabel = InArgs._ShowObjectLabel;
+	CustomContent = SNullWidget::NullWidget;
+}
+
+void SDetailNameArea::Refresh( const TArray< TWeakObjectPtr<UObject> >& SelectedObjects, int32 NameAreaSettings )
+{
+	TArray< TWeakObjectPtr<UObject> > FinalSelectedObjects;
+	FinalSelectedObjects.Reserve(SelectedObjects.Num());
+
+	// Apply the name area filter in priority order
+	if ((NameAreaSettings & FDetailsViewArgs::ActorsUseNameArea) && FinalSelectedObjects.Num() == 0)
+	{
+		for (const TWeakObjectPtr<UObject>& Object : SelectedObjects)
+		{
+			if (AActor* Actor = Cast<AActor>(Object.Get()))
+			{
+				FinalSelectedObjects.Add(Actor);
+			}
+		}
+	}
+	if ((NameAreaSettings & FDetailsViewArgs::ComponentsAndActorsUseNameArea) && FinalSelectedObjects.Num() == 0)
+	{
+		for (const TWeakObjectPtr<UObject>& Object : SelectedObjects)
+		{
+			if (UActorComponent* ActorComp = Cast<UActorComponent>(Object.Get()))
+			{
+				if (AActor* Actor = ActorComp->GetOwner())
+				{
+					FinalSelectedObjects.AddUnique(Actor);
+				}
+			}
+		}
+	}
+	if ((NameAreaSettings & FDetailsViewArgs::ObjectsUseNameArea) && FinalSelectedObjects.Num() == 0)
+	{
+		FinalSelectedObjects = SelectedObjects;
+	}
+
+	ChildSlot
+	[
+		BuildObjectNameArea( FinalSelectedObjects )
+	];
+}
+
+const FSlateBrush* SDetailNameArea::OnGetLockButtonImageResource() const
+{
+	if( IsLocked.Get() )
+	{
+		return FSodaStyle::GetBrush(TEXT("PropertyWindow.Locked"));
+	}
+	else
+	{
+		return FSodaStyle::GetBrush(TEXT("PropertyWindow.Unlocked"));
+	}
+}
+
+TSharedRef< SWidget > SDetailNameArea::BuildObjectNameArea( const TArray< TWeakObjectPtr<UObject> >& SelectedObjects )
+{
+	// Get the common base class of the selected objects
+	UClass* BaseClass = NULL;
+	for( int32 ObjectIndex = 0; ObjectIndex < SelectedObjects.Num(); ++ObjectIndex )
+	{
+		TWeakObjectPtr<UObject> ObjectWeakPtr = SelectedObjects[ObjectIndex];
+		if( ObjectWeakPtr.IsValid() )
+		{
+			UClass* ObjClass = ObjectWeakPtr->GetClass();
+
+			if (!BaseClass)
+			{
+				BaseClass = ObjClass;
+			}
+
+			while (!ObjClass->IsChildOf(BaseClass))
+			{
+				BaseClass = BaseClass->GetSuperClass();
+			}
+		}
+	}
+
+	TSharedRef< SHorizontalBox > ObjectNameArea = SNew( SHorizontalBox );
+
+	if (BaseClass)
+	{
+		// Get selection icon based on actor(s) classes and add before the selection label
+		const FSlateBrush* ActorIcon = FSlateIconFinder::FindIconBrushForClass(BaseClass);
+
+		ObjectNameArea->AddSlot()
+		.AutoWidth()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		.Padding(0)
+		[
+			SNew(SImage)
+			.Image(ActorIcon)
+			.ToolTip(FRuntimeEditorUtils::GetTooltip(BaseClass))
+		];
+	}
+
+
+	// Add the selected object(s) type name, along with buttons for either opening C++ code or editing blueprints
+	/*
+	const int32 NumSelectedSurfaces = AssetSelectionUtils::GetNumSelectedSurfaces( GWorld );
+	if( SelectedObjects.Num() > 0 )
+	{
+		if ( bShowObjectLabel )
+		{
+			TSharedRef<IObjectNameEditableTextBox> ObjectNameBox = IObjectNameEditableTextBox::CreateObjectNameEditableTextBox(SelectedObjects);
+			ObjectNameArea->AddSlot()
+				.FillWidth(1.0)
+				.Padding(8, 0, 3, 0)
+				[
+					SNew(SBox)
+					.WidthOverride(200.0f)
+					.VAlign(VAlign_Center)
+					[
+						ObjectNameBox
+					]
+				];
+		}
+
+		const TWeakObjectPtr< UObject > ObjectWeakPtr = SelectedObjects.Num() == 1 ? SelectedObjects[0] : NULL;
+		BuildObjectNameAreaSelectionLabel( ObjectNameArea, ObjectWeakPtr, SelectedObjects.Num() );
+
+		ObjectNameArea->AddSlot()
+		.Expose(CustomContentSlot)
+		.AutoWidth()
+		[
+			CustomContent.ToSharedRef()
+		];
+
+		if( bShowLockButton )
+		{
+			ObjectNameArea->AddSlot()
+				.HAlign(HAlign_Right)
+				.VAlign(VAlign_Center)
+				.Padding(4,0,4,0)
+				.AutoWidth()
+				[
+					SNew( SButton )
+					.ButtonStyle( FSodaStyle::Get(), "SimpleButton" )
+					.OnClicked(	OnLockButtonClicked )
+					.ContentPadding(FMargin(4,2))
+					.HAlign(HAlign_Center)
+					.VAlign(VAlign_Center)
+					.ToolTipText( LOCTEXT("LockSelectionButton_ToolTip", "Locks the current selection into the Details panel") )
+					[
+						SNew( SImage )
+						.ColorAndOpacity(FSlateColor::UseForeground())
+						.Image( this, &SDetailNameArea::OnGetLockButtonImageResource )
+					]
+				];
+		}
+	}
+	else
+	*/
+	{
+		if ( SelectionTip.Get() /* && NumSelectedSurfaces == 0*/)
+		{
+			ObjectNameArea->AddSlot()
+			.FillWidth( 1.0f )
+			.HAlign( HAlign_Center )
+			.Padding( 2.0f, 24.0f, 2.0f, 2.0f )
+			[
+				SNew( STextBlock )
+				.Text( LOCTEXT("NoObjectsSelected", "Select an object to view details.") )
+				.TextStyle( FAppStyle::Get(), "HintText")
+			];
+		}
+		else
+		{
+			// Fill the empty space
+			ObjectNameArea->AddSlot();
+		}
+	}
+	
+	return ObjectNameArea;
+}
+
+void SDetailNameArea::BuildObjectNameAreaSelectionLabel( TSharedRef< SHorizontalBox > SelectionLabelBox, const TWeakObjectPtr<UObject> ObjectWeakPtr, const int32 NumSelectedObjects ) 
+{
+	check( NumSelectedObjects > 1 || ObjectWeakPtr.IsValid() );
+
+	if (NumSelectedObjects > 1)
+	{
+		const FText SelectionText = FText::Format( LOCTEXT("MultipleObjectsSelectedFmt", "{0} objects"), FText::AsNumber(NumSelectedObjects) );
+		SelectionLabelBox->AddSlot()
+		.VAlign(VAlign_Center)
+		.HAlign( HAlign_Left )
+		.FillWidth( 1.0f )
+		[
+			SNew(STextBlock)
+			.Text( SelectionText )
+		];
+	}
+}
+
+
+void SDetailNameArea::SetCustomContent(TSharedRef<SWidget>& InCustomContent)
+{
+	CustomContent = InCustomContent;
+
+	if (CustomContentSlot != nullptr)
+	{
+		SHorizontalBox::FSlot& T = *CustomContentSlot;
+		T[InCustomContent];
+	}
+
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
+
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailNameArea.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailNameArea.h
new file mode 100644
index 0000000..74a65e8
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailNameArea.h
@@ -0,0 +1,72 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "Framework/SlateDelegates.h"
+#include "Widgets/SBoxPanel.h"
+
+class AActor;
+class UBlueprint;
+
+namespace soda
+{
+
+/** 
+ * Displays the name area which is not recreated when the detail view is refreshed
+ */
+class SDetailNameArea : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SDetailNameArea ){}
+		SLATE_EVENT( FOnClicked, OnLockButtonClicked )
+		SLATE_ARGUMENT( bool, ShowLockButton )
+		SLATE_ARGUMENT( bool, ShowObjectLabel )
+		SLATE_ATTRIBUTE( bool, IsLocked )
+		SLATE_ATTRIBUTE( bool, SelectionTip )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, const TArray< TWeakObjectPtr<UObject> >* SelectedObjects );
+
+	/**
+	 * Refreshes the name area when selection changes
+	 *
+	 * @param SelectedObjects	the new list of selected objects
+	 */
+	void Refresh( const TArray< TWeakObjectPtr<UObject> >& SelectedObjects, int32 NameAreaSettings );
+
+	/**
+	 * Inserts Custom Content (typically tool buttons) before the lock
+	 */
+	virtual void SetCustomContent(TSharedRef<SWidget>& InCustomContent);
+
+private:
+	/** @return the Slate brush to use for the lock image */
+	const FSlateBrush* OnGetLockButtonImageResource() const;
+
+	TSharedRef< SWidget > BuildObjectNameArea( const TArray< TWeakObjectPtr<UObject> >& SelectedObjects );
+
+	void BuildObjectNameAreaSelectionLabel( TSharedRef< SHorizontalBox > SelectionLabelBox, const TWeakObjectPtr<UObject> ObjectWeakPtr, const int32 NumSelectedObjects );
+
+	void OnEditBlueprintClicked( TWeakObjectPtr<UBlueprint> InBlueprint, TWeakObjectPtr<UObject> InAsset );
+private:
+	FOnClicked OnLockButtonClicked;
+	TAttribute<bool> IsLocked;
+	TAttribute<bool> SelectionTip;
+
+	TSharedPtr<SWidget> CustomContent;
+
+	bool bShowLockButton;
+	bool bShowObjectLabel;
+
+	/** Area where the customs content resides */
+	SHorizontalBox::FSlot* CustomContentSlot;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailRowIndent.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailRowIndent.cpp
new file mode 100644
index 0000000..d5d4c13
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailRowIndent.cpp
@@ -0,0 +1,80 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SDetailRowIndent.h"
+#include "RuntimePropertyEditor/SConstrainedBox.h"
+#include "RuntimePropertyEditor/SDetailTableRowBase.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "Widgets/Layout/SBox.h"
+
+namespace soda
+{
+
+void SDetailRowIndent::Construct(const FArguments& InArgs, TSharedRef<SDetailTableRowBase> DetailsRow)
+{
+	Row = DetailsRow;
+
+	ChildSlot
+	[
+		SNew(SBox)
+		.WidthOverride(this, &SDetailRowIndent::GetIndentWidth)
+	];
+}
+
+int32 SDetailRowIndent::OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const
+{
+	TSharedPtr<SDetailTableRowBase> RowPtr = Row.Pin();
+	if (!RowPtr.IsValid())
+	{
+		return LayerId;
+	}
+
+	const FSlateBrush* BackgroundBrush = FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle");
+	const FSlateBrush* DropShadowBrush = FSodaStyle::Get().GetBrush("DetailsView.ArrayDropShadow");
+
+	int32 IndentLevel = RowPtr->GetIndentLevelForBackgroundColor();
+	for (int32 i = 0; i < IndentLevel; ++i)
+	{
+		FSlateColor BackgroundColor = GetRowBackgroundColor(i);
+
+
+		FSlateDrawElement::MakeBox(
+			OutDrawElements,
+			LayerId,
+			AllottedGeometry.ToPaintGeometry(FVector2f(16.f, AllottedGeometry.GetLocalSize().Y), FSlateLayoutTransform(FVector2f(16.f * i, 0.f))),
+			BackgroundBrush,
+			ESlateDrawEffect::None,
+			BackgroundColor.GetColor(InWidgetStyle)
+		);
+
+		FSlateDrawElement::MakeBox(
+			OutDrawElements,
+			LayerId + 1,
+			AllottedGeometry.ToPaintGeometry(FVector2f(16.f, AllottedGeometry.GetLocalSize().Y), FSlateLayoutTransform(FVector2f(16.f * i, 0.f))),
+			DropShadowBrush
+		);
+	}
+		
+	return LayerId + 1;
+}
+
+FOptionalSize SDetailRowIndent::GetIndentWidth() const
+{
+	int32 IndentLevel = 0;
+
+	TSharedPtr<SDetailTableRowBase> RowPtr = Row.Pin();
+	if (RowPtr.IsValid())
+	{
+		IndentLevel = RowPtr->GetIndentLevelForBackgroundColor();
+	}
+
+	return IndentLevel * 16.0f;
+}
+
+FSlateColor SDetailRowIndent::GetRowBackgroundColor(int32 IndentLevel) const
+{
+	TSharedPtr<SDetailTableRowBase> RowPtr = Row.Pin();
+	return PropertyEditorConstants::GetRowBackgroundColor(IndentLevel, RowPtr.IsValid() && RowPtr->IsHovered());
+}
+
+}
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailRowIndent.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailRowIndent.h
new file mode 100644
index 0000000..1df4582
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailRowIndent.h
@@ -0,0 +1,34 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Styling/SlateColor.h"
+#include "Types/SlateStructs.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+
+class SHorizontalBox;
+
+namespace soda
+{
+class SDetailTableRowBase;
+
+class SDetailRowIndent : public SCompoundWidget
+{ 
+public:
+	SLATE_BEGIN_ARGS(SDetailRowIndent) {}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, TSharedRef<SDetailTableRowBase> DetailsRow);
+
+private:
+	int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const;
+	FOptionalSize GetIndentWidth() const;
+	FSlateColor GetRowBackgroundColor(int32 IndentLevel) const;
+
+private:
+	TWeakPtr<SDetailTableRowBase> Row;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailSingleItemRow.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailSingleItemRow.cpp
new file mode 100644
index 0000000..b0146ff
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailSingleItemRow.cpp
@@ -0,0 +1,1334 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SDetailSingleItemRow.h"
+
+#include "RuntimePropertyEditor/DetailGroup.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+//#include "Editor.h"
+//#include "EditorMetadataOverrides.h"
+//#include "IDetailDragDropHandler.h"
+#include "RuntimePropertyEditor/IDetailPropertyExtensionHandler.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+//#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "RuntimePropertyEditor/SConstrainedBox.h"
+#include "RuntimePropertyEditor/SDetailExpanderArrow.h"
+#include "RuntimePropertyEditor/SDetailRowIndent.h"
+#include "RuntimePropertyEditor/SResetToDefaultPropertyEditor.h"
+
+#include "HAL/PlatformApplicationMisc.h"
+#include "Modules/ModuleInterface.h"
+#include "Modules/ModuleManager.h"
+//#include "Settings/EditorExperimentalSettings.h"
+#include "Styling/StyleColors.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SComboButton.h"
+#include "RuntimePropertyEditor/PropertyEditorPermissionList.h"
+
+namespace soda
+{
+
+namespace DetailWidgetConstants
+{
+	const FMargin LeftRowPadding( 20.0f, 0.0f, 10.0f, 0.0f );
+	const FMargin RightRowPadding( 12.0f, 0.0f, 2.0f, 0.0f );
+	const float PulseAnimationLength = 0.5f;
+}
+
+namespace SDetailSingleItemRow_Helper
+{
+	// Get the node item number in case it is expand we have to recursively count all expanded children
+	void RecursivelyGetItemShow(TSharedRef<FDetailTreeNode> ParentItem, int32& ItemShowNum)
+	{
+		if (ParentItem->GetVisibility() == ENodeVisibility::Visible)
+		{
+			ItemShowNum++;
+		}
+
+		if (ParentItem->ShouldBeExpanded())
+		{
+			TArray< TSharedRef<FDetailTreeNode> > Childrens;
+			ParentItem->GetChildren(Childrens);
+			for (TSharedRef<FDetailTreeNode> ItemChild : Childrens)
+			{
+				RecursivelyGetItemShow(ItemChild, ItemShowNum);
+			}
+		}
+	}
+}
+
+/*
+void SDetailSingleItemRow::OnArrayOrCustomDragLeave(const FDragDropEvent& DragDropEvent)
+{
+	TSharedPtr<FSodaDecoratedDragDropOp> DecoratedOp = DragDropEvent.GetOperationAs<FSodaDecoratedDragDropOp>();
+	if (DecoratedOp.IsValid())
+	{
+		DecoratedOp->ResetToDefaultToolTip();
+	}
+}
+*/
+/** Compute the new index to which to move the item when it's dropped onto the given index/drop zone. */
+static int32 ComputeNewIndex(int32 OriginalIndex, int32 DropOntoIndex, EItemDropZone DropZone)
+{
+	check(DropZone != EItemDropZone::OntoItem);
+
+	int32 NewIndex = DropOntoIndex;
+	if (DropZone == EItemDropZone::BelowItem)
+	{
+		// If the drop zone is below, then we actually move it to the next item's index
+		NewIndex++;
+	}
+	if (OriginalIndex < NewIndex)
+	{
+		// If the item is moved down the list, then all the other elements below it are shifted up one
+		NewIndex--;
+	}
+
+	return ensure(NewIndex >= 0) ? NewIndex : 0;
+}
+
+bool SDetailSingleItemRow::CheckValidDrop(const TSharedPtr<SDetailSingleItemRow> RowPtr, EItemDropZone DropZone) const
+{
+	// Can't drop onto another array item; need to drop above or below
+	if (DropZone == EItemDropZone::OntoItem)
+	{
+		return false;
+	}
+
+	// Disallow dropping immediately below an expanded item (e.g. array of structs) since the drop zone is between the item and its children
+	// User can drop above the next array item instead
+	// For example:
+	// - A    <- allow drop below A because it's collapsed
+	// + B    <- don't allow drop below B because it's expanded;
+	// | - a     dropping here seems to "parent" the dropped row to B
+	// | - b
+	// - C    <- user can drop above C instead
+	if (DropZone == EItemDropZone::BelowItem && IsItemExpanded())
+	{
+		return false;
+	}
+
+	TSharedPtr<FPropertyNode> SwappingPropertyNode = RowPtr->SwappablePropertyNode;
+	if (SwappingPropertyNode.IsValid() && SwappablePropertyNode.IsValid() && SwappingPropertyNode != SwappablePropertyNode)
+	{
+		const int32 OriginalIndex = SwappingPropertyNode->GetArrayIndex();
+		const int32 NewIndex = ComputeNewIndex(OriginalIndex, SwappablePropertyNode->GetArrayIndex(), DropZone);
+
+		if (OriginalIndex != NewIndex)
+		{
+			IDetailsViewPrivate* DetailsView = OwnerTreeNode.Pin()->GetDetailsView();
+			TSharedPtr<IPropertyHandle> SwappingHandle = PropertyEditorHelpers::GetPropertyHandle(SwappingPropertyNode.ToSharedRef(), DetailsView->GetNotifyHook(), DetailsView->GetPropertyUtilities());
+			TSharedPtr<IPropertyHandleArray> ParentHandle = SwappingHandle->GetParentHandle()->AsArray();
+
+			if (ParentHandle.IsValid() && SwappablePropertyNode->GetParentNode() == SwappingPropertyNode->GetParentNode())
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+/*
+FReply SDetailSingleItemRow::OnArrayAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> TargetItem)
+{
+	TSharedPtr<FArrayRowDragDropOp> ArrayDropOp = DragDropEvent.GetOperationAs< FArrayRowDragDropOp >();
+	if (!ArrayDropOp.IsValid())
+	{
+		return FReply::Unhandled();
+	}
+
+	TSharedPtr<SDetailSingleItemRow> RowPtr = ArrayDropOp->Row.Pin();
+	if (!RowPtr.IsValid())
+	{
+		return FReply::Unhandled();
+	}
+
+	if (!CheckValidDrop(RowPtr, DropZone))
+	{
+		return FReply::Unhandled();
+	}
+
+	IDetailsViewPrivate* DetailsView = OwnerTreeNode.Pin()->GetDetailsView();
+
+	TSharedPtr<FPropertyNode> SwappingPropertyNode = RowPtr->SwappablePropertyNode;
+	TSharedPtr<IPropertyHandle> SwappingHandle = PropertyEditorHelpers::GetPropertyHandle(SwappingPropertyNode.ToSharedRef(), DetailsView->GetNotifyHook(), DetailsView->GetPropertyUtilities());
+	TSharedPtr<IPropertyHandleArray> ParentHandle = SwappingHandle->GetParentHandle()->AsArray();
+	const int32 OriginalIndex = SwappingPropertyNode->GetArrayIndex();
+	const int32 NewIndex = ComputeNewIndex(OriginalIndex, SwappablePropertyNode->GetArrayIndex(), DropZone);
+
+	// Need to swap the moving and target expansion states before saving
+	bool bOriginalSwappableExpansion = SwappablePropertyNode->HasNodeFlags(EPropertyNodeFlags::Expanded) != 0;
+	bool bOriginalSwappingExpansion = SwappingPropertyNode->HasNodeFlags(EPropertyNodeFlags::Expanded) != 0;
+	SwappablePropertyNode->SetNodeFlags(EPropertyNodeFlags::Expanded, bOriginalSwappingExpansion);
+	SwappingPropertyNode->SetNodeFlags(EPropertyNodeFlags::Expanded, bOriginalSwappableExpansion);
+
+	DetailsView->SaveExpandedItems(SwappablePropertyNode->GetParentNodeSharedPtr().ToSharedRef());
+	FScopedTransaction Transaction(NSLOCTEXT("UnrealEd", "MoveRow", "Move Row"));
+
+	SwappingHandle->GetParentHandle()->NotifyPreChange();
+
+	ParentHandle->MoveElementTo(OriginalIndex, NewIndex);
+
+	FPropertyChangedEvent MoveEvent(SwappingHandle->GetParentHandle()->GetProperty(), EPropertyChangeType::Unspecified);
+	SwappingHandle->GetParentHandle()->NotifyPostChange(EPropertyChangeType::Unspecified);
+	if (DetailsView->GetPropertyUtilities().IsValid())
+	{
+		DetailsView->GetPropertyUtilities()->NotifyFinishedChangingProperties(MoveEvent);
+	}
+
+	return FReply::Handled();
+}
+*/
+
+/*
+TOptional<EItemDropZone> SDetailSingleItemRow::OnArrayCanAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> TargetItem)
+{
+	TSharedPtr<FArrayRowDragDropOp> ArrayDropOp = DragDropEvent.GetOperationAs< FArrayRowDragDropOp >();
+	if (!ArrayDropOp.IsValid())
+	{
+		return TOptional<EItemDropZone>();
+	}
+
+	TSharedPtr<SDetailSingleItemRow> RowPtr = ArrayDropOp->Row.Pin();
+	if (!RowPtr.IsValid())
+	{
+		return TOptional<EItemDropZone>();
+	}
+
+	// Can't drop onto another array item, so recompute our own drop zone to ensure it's above or below
+	const FGeometry& Geometry = GetTickSpaceGeometry();
+	const float LocalPointerY = Geometry.AbsoluteToLocal(DragDropEvent.GetScreenSpacePosition()).Y;
+	const EItemDropZone OverrideDropZone = LocalPointerY < Geometry.GetLocalSize().Y * 0.5f ? EItemDropZone::AboveItem : EItemDropZone::BelowItem;
+
+	const bool IsValidDrop = CheckValidDrop(RowPtr, OverrideDropZone);
+
+	ArrayDropOp->SetValidTarget(IsValidDrop);
+
+	if (!IsValidDrop)
+	{
+		return TOptional<EItemDropZone>();
+	}
+
+	return OverrideDropZone;
+}
+
+FReply SDetailSingleItemRow::OnArrayHeaderAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr< FDetailTreeNode > Type)
+{
+	OnArrayOrCustomDragLeave(DragDropEvent);
+	return FReply::Handled();
+}
+
+FReply SDetailSingleItemRow::OnCustomAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> TargetItem)
+{
+	// This should only be registered as a delegate if there's a custom handler
+	if (ensure(WidgetRow.CustomDragDropHandler))
+	{
+		if (WidgetRow.CustomDragDropHandler->AcceptDrop(DragDropEvent, DropZone))
+		{
+			return FReply::Handled();
+		}
+	}
+	return FReply::Unhandled();
+}
+
+TOptional<EItemDropZone> SDetailSingleItemRow::OnCustomCanAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> Type)
+{
+	// Disallow drop between expanded parent item and its first child
+	if (DropZone == EItemDropZone::BelowItem && IsItemExpanded())
+	{
+		return TOptional<EItemDropZone>();
+	}
+
+	// This should only be registered as a delegate if there's a custom handler
+	if (ensure(WidgetRow.CustomDragDropHandler))
+	{
+		return WidgetRow.CustomDragDropHandler->CanAcceptDrop(DragDropEvent, DropZone);
+	}
+	return TOptional<EItemDropZone>();
+}
+*/
+TSharedPtr<FPropertyNode> SDetailSingleItemRow::GetPropertyNode() const
+{
+	TSharedPtr<FPropertyNode> PropertyNode = Customization->GetPropertyNode();
+	if (!PropertyNode.IsValid() && Customization->DetailGroup.IsValid())
+	{
+		PropertyNode = Customization->DetailGroup->GetHeaderPropertyNode();
+	}
+
+	// See if a custom builder has an associated node
+	if (!PropertyNode.IsValid() && Customization->HasCustomBuilder())
+	{
+		TSharedPtr<IPropertyHandle> PropertyHandle = Customization->CustomBuilderRow->GetPropertyHandle();
+		if (PropertyHandle.IsValid())
+		{
+			PropertyNode = StaticCastSharedPtr<FPropertyHandleBase>(PropertyHandle)->GetPropertyNode();
+		}
+	}
+
+	return PropertyNode;
+}
+
+TSharedPtr<IPropertyHandle> SDetailSingleItemRow::GetPropertyHandle() const
+{
+	TSharedPtr<IPropertyHandle> Handle;
+	TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode();
+	if (PropertyNode.IsValid())
+	{
+		TSharedPtr<FDetailTreeNode> OwnerTreeNodePtr = OwnerTreeNode.Pin();
+		if (OwnerTreeNodePtr.IsValid())
+		{
+			IDetailsViewPrivate* DetailsView = OwnerTreeNodePtr->GetDetailsView();
+			if (DetailsView != nullptr)
+			{
+				Handle = PropertyEditorHelpers::GetPropertyHandle(PropertyNode.ToSharedRef(), DetailsView->GetNotifyHook(), DetailsView->GetPropertyUtilities());
+			}
+		}
+	}
+	else if (WidgetRow.PropertyHandles.Num() > 0)
+	{
+		// @todo: Handle more than 1 property handle?
+		Handle = WidgetRow.PropertyHandles[0];
+	}
+
+	return Handle;
+}
+
+bool SDetailSingleItemRow::UpdateResetToDefault()
+{
+	TSharedPtr<IPropertyHandle> PropertyHandle = GetPropertyHandle();
+	if (PropertyHandle.IsValid())
+	{
+		if (PropertyHandle->HasMetaData("NoResetToDefault") || PropertyHandle->GetInstanceMetaData("NoResetToDefault"))
+		{
+			return false;
+		}
+	}
+
+	if (WidgetRow.CustomResetToDefault.IsSet())
+	{
+		return WidgetRow.CustomResetToDefault.GetValue().IsResetToDefaultVisible(PropertyHandle);
+	}
+	else if (PropertyHandle.IsValid())
+	{
+		return PropertyHandle->CanResetToDefault();
+	}
+
+	return false;
+
+}
+
+void SDetailSingleItemRow::Construct( const FArguments& InArgs, FDetailLayoutCustomization* InCustomization, bool bHasMultipleColumns, TSharedRef<FDetailTreeNode> InOwnerTreeNode, const TSharedRef<STableViewBase>& InOwnerTableView )
+{
+	OwnerTreeNode = InOwnerTreeNode;
+	bAllowFavoriteSystem = InArgs._AllowFavoriteSystem;
+	Customization = InCustomization;
+
+	TSharedRef<SWidget> Widget = SNullWidget::NullWidget;
+
+	//FOnTableRowDragLeave DragLeaveDelegate;
+	FOnAcceptDrop AcceptDropDelegate;
+	FOnCanAcceptDrop CanAcceptDropDelegate;
+
+	IDetailsViewPrivate* DetailsView = InOwnerTreeNode->GetDetailsView();
+	FDetailColumnSizeData& ColumnSizeData = DetailsView->GetColumnSizeData();
+
+	PulseAnimation.AddCurve(0.0f, DetailWidgetConstants::PulseAnimationLength, ECurveEaseFunction::CubicInOut);
+
+	// Play on construction if animation was started from a behavior the re-constructs this widget
+	if (DetailsView->IsNodeAnimating(GetPropertyNode()))
+	{
+		PulseAnimation.Play(SharedThis(this));
+	}
+
+	const bool bIsValidTreeNode = InOwnerTreeNode->GetParentCategory().IsValid() && InOwnerTreeNode->GetParentCategory()->IsParentLayoutValid();
+	if (bIsValidTreeNode)
+	{
+		if (Customization->IsValidCustomization())
+		{
+			WidgetRow = Customization->GetWidgetRow();
+
+			// Setup copy / paste actions
+			{
+				if (WidgetRow.IsCopyPasteBound())
+				{
+					CopyAction = WidgetRow.CopyMenuAction;
+					PasteAction = WidgetRow.PasteMenuAction;
+				}
+				else
+				{
+					TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode();
+					static const FName DisableCopyPasteMetaDataName("DisableCopyPaste");
+					if (PropertyNode.IsValid() && !PropertyNode->ParentOrSelfHasMetaData(DisableCopyPasteMetaDataName))
+					{
+						CopyAction.ExecuteAction = FExecuteAction::CreateSP(this, &SDetailSingleItemRow::OnCopyProperty);
+						PasteAction.ExecuteAction = FExecuteAction::CreateSP(this, &SDetailSingleItemRow::OnPasteProperty);
+						PasteAction.CanExecuteAction = FCanExecuteAction::CreateSP(this, &SDetailSingleItemRow::CanPasteProperty);
+					}
+					else
+					{
+						CopyAction.ExecuteAction = FExecuteAction::CreateLambda([]() {});
+						CopyAction.CanExecuteAction = FCanExecuteAction::CreateLambda([]() { return false; });
+						PasteAction.ExecuteAction = FExecuteAction::CreateLambda([]() {});
+						PasteAction.CanExecuteAction = FCanExecuteAction::CreateLambda([]() { return false; });
+					}
+				}
+			}
+
+			// Populate the extension content in the WidgetRow if there's an extension handler.
+			PopulateExtensionWidget();
+
+			TSharedPtr<SWidget> NameWidget = WidgetRow.NameWidget.Widget;
+
+			TSharedPtr<SWidget> ValueWidget =
+				SNew(SConstrainedBox)
+				.MinWidth(WidgetRow.ValueWidget.MinWidth)
+				.MaxWidth(WidgetRow.ValueWidget.MaxWidth)
+				[
+					WidgetRow.ValueWidget.Widget
+				];
+
+			TSharedPtr<SWidget> ExtensionWidget = WidgetRow.ExtensionWidget.Widget;
+
+			// copies of attributes for lambda captures
+			TAttribute<bool> PropertyEnabledAttribute = InOwnerTreeNode->IsPropertyEditingEnabled();
+			TAttribute<bool> RowEditConditionAttribute = WidgetRow.EditConditionValue;
+			TAttribute<bool> RowIsEnabledAttribute = WidgetRow.IsEnabledAttr;
+
+			TAttribute<bool> IsEnabledAttribute = TAttribute<bool>::CreateLambda(
+				[PropertyEnabledAttribute, RowIsEnabledAttribute, RowEditConditionAttribute]()
+				{
+					return PropertyEnabledAttribute.Get() && RowIsEnabledAttribute.Get(true) && RowEditConditionAttribute.Get(true);
+				});
+
+			TAttribute<bool> RowIsValueEnabledAttribute = WidgetRow.IsValueEnabledAttr;
+			TAttribute<bool> IsValueEnabledAttribute = TAttribute<bool>::CreateLambda(
+				[IsEnabledAttribute, RowIsValueEnabledAttribute]()
+				{
+					return IsEnabledAttribute.Get() && RowIsValueEnabledAttribute.Get(true);
+				});
+
+			NameWidget->SetEnabled(IsEnabledAttribute);
+			ValueWidget->SetEnabled(IsValueEnabledAttribute);
+			ExtensionWidget->SetEnabled(IsEnabledAttribute);
+
+			TSharedRef<SSplitter> Splitter = SNew(SSplitter)
+					.Style(FSodaStyle::Get(), "DetailsView.Splitter")
+					.PhysicalSplitterHandleSize(1.0f)
+					.HitDetectionSplitterHandleSize(5.0f)
+					.HighlightedHandleIndex(ColumnSizeData.HoveredSplitterIndex)
+					.OnHandleHovered(ColumnSizeData.OnSplitterHandleHovered);
+
+			Widget = SNew(SBorder)
+				.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle"))
+				.BorderBackgroundColor(this, &SDetailSingleItemRow::GetInnerBackgroundColor)
+				.Padding(0)
+				[
+					Splitter
+				];
+
+			// create Name column:
+			// | Name | Value | Right |
+			TSharedRef<SHorizontalBox> NameColumnBox = SNew(SHorizontalBox)
+				.Clipping(EWidgetClipping::OnDemand);
+
+			// indentation and expander arrow
+			NameColumnBox->AddSlot()
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Fill)
+				.Padding(0)
+				.AutoWidth()
+				[
+					SNew(SDetailRowIndent, SharedThis(this))
+				];
+			/*
+			if (WidgetRow.CustomDragDropHandler)
+			{
+				TSharedPtr<SDetailSingleItemRow> InRow = SharedThis(this);
+				TSharedRef<SWidget> ReorderHandle = PropertyEditorHelpers::MakePropertyReorderHandle(InRow, IsEnabledAttribute);
+				
+				NameColumnBox->AddSlot()
+					.HAlign(HAlign_Left)
+					.VAlign(VAlign_Center)
+					.Padding(-4, 0, -10, 0)
+					.AutoWidth()
+					[
+						ReorderHandle
+					];
+
+				DragLeaveDelegate = FOnTableRowDragLeave::CreateSP(this, &SDetailSingleItemRow::OnArrayOrCustomDragLeave);
+				AcceptDropDelegate = FOnAcceptDrop::CreateSP(this, &SDetailSingleItemRow::OnCustomAcceptDrop);
+				CanAcceptDropDelegate = FOnCanAcceptDrop::CreateSP(this, &SDetailSingleItemRow::OnCustomCanAcceptDrop);
+			}
+			else */
+			if (TSharedPtr<FPropertyNode> PropertyNode = Customization->GetPropertyNode())
+			{
+				if (PropertyNode->IsReorderable())
+				{
+					TSharedPtr<SDetailSingleItemRow> InRow = SharedThis(this);
+					TSharedRef<SWidget> ArrayHandle = PropertyEditorHelpers::MakePropertyReorderHandle(InRow, IsEnabledAttribute);
+
+					NameColumnBox->AddSlot()
+						.HAlign(HAlign_Left)
+						.VAlign(VAlign_Center)
+						.Padding(-4, 0, -10, 0)
+						.AutoWidth()
+						[
+							ArrayHandle
+						];
+
+					SwappablePropertyNode = PropertyNode;
+				}
+				
+				if (PropertyNode->IsReorderable() || 
+					(CastField<FArrayProperty>(PropertyNode->GetProperty()) != nullptr && 
+					CastField<FObjectProperty>(CastField<FArrayProperty>(PropertyNode->GetProperty())->Inner) != nullptr)) // Is an object array
+				{
+					//DragLeaveDelegate = FOnTableRowDragLeave::CreateSP(this, &SDetailSingleItemRow::OnArrayOrCustomDragLeave);
+					//AcceptDropDelegate = FOnAcceptDrop::CreateSP(this, PropertyNode->IsReorderable() ? &SDetailSingleItemRow::OnArrayAcceptDrop : &SDetailSingleItemRow::OnArrayHeaderAcceptDrop);
+					//CanAcceptDropDelegate = FOnCanAcceptDrop::CreateSP(this, &SDetailSingleItemRow::OnArrayCanAcceptDrop);
+				}
+			}
+
+			NameColumnBox->AddSlot()
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				.Padding(2,0,0,0)
+				.AutoWidth()
+				[
+					SNew(SDetailExpanderArrow, SharedThis(this))
+				];
+
+			NameColumnBox->AddSlot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Left)
+				.Padding(2,0,0,0)
+				.AutoWidth()
+				[
+					SNew(SEditConditionWidget)
+					.EditConditionValue(WidgetRow.EditConditionValue)
+					.OnEditConditionValueChanged(WidgetRow.OnEditConditionValueChanged)
+				];
+
+			if (bHasMultipleColumns)
+			{
+				NameColumnBox->AddSlot()
+					.HAlign(WidgetRow.NameWidget.HorizontalAlignment)
+					.VAlign(WidgetRow.NameWidget.VerticalAlignment)
+					.Padding(2,0,0,0)
+					[
+						NameWidget.ToSharedRef()
+					];
+
+				// create Name column:
+				// | Name | Value | Right |
+				Splitter->AddSlot()
+					.Value(ColumnSizeData.NameColumnWidth)
+					.OnSlotResized(ColumnSizeData.OnNameColumnResized)
+					[
+						NameColumnBox
+					];
+
+				// create Value column:
+				// | Name | Value | Right |
+				Splitter->AddSlot()
+					.Value(ColumnSizeData.ValueColumnWidth)
+					.OnSlotResized(ColumnSizeData.OnValueColumnResized) 
+					[
+						SNew(SHorizontalBox)
+						.Clipping(EWidgetClipping::OnDemand)
+						+ SHorizontalBox::Slot()
+						.HAlign(WidgetRow.ValueWidget.HorizontalAlignment)
+						.VAlign(WidgetRow.ValueWidget.VerticalAlignment)
+						.Padding(DetailWidgetConstants::RightRowPadding)
+						[
+							ValueWidget.ToSharedRef()
+						]
+						// extension widget
+						+ SHorizontalBox::Slot()
+						.HAlign(WidgetRow.ExtensionWidget.HorizontalAlignment)
+						.VAlign(WidgetRow.ExtensionWidget.VerticalAlignment)
+						.Padding(5,0,0,0)
+						.AutoWidth()
+						[
+							ExtensionWidget.ToSharedRef()
+						]
+					];
+			}
+			else
+			{
+				// create whole row widget, which takes up both the Name and Value columns:
+				// | Name | Value | Right |
+				NameColumnBox->SetEnabled(IsEnabledAttribute);
+				NameColumnBox->AddSlot()
+					.HAlign(WidgetRow.WholeRowWidget.HorizontalAlignment)
+					.VAlign(WidgetRow.WholeRowWidget.VerticalAlignment)
+					.Padding(2,0,0,0)
+					[
+						WidgetRow.WholeRowWidget.Widget
+					];
+
+				Splitter->AddSlot()
+					.Value(ColumnSizeData.PropertyColumnWidth)
+					.OnSlotResized(ColumnSizeData.OnPropertyColumnResized)
+					[
+						NameColumnBox
+					];
+			}
+
+			if(!DetailsView->ShouldHideRightColumn())
+			{
+				TArray<FPropertyRowExtensionButton> ExtensionButtons;
+
+				FPropertyRowExtensionButton& ResetToDefault = ExtensionButtons.AddDefaulted_GetRef();
+				ResetToDefault.Label = NSLOCTEXT("PropertyEditor", "ResetToDefault", "Reset to Default");
+				ResetToDefault.UIAction = FUIAction(
+					FExecuteAction::CreateSP(this, &SDetailSingleItemRow::OnResetToDefaultClicked),
+					FCanExecuteAction::CreateSP(this, &SDetailSingleItemRow::IsResetToDefaultEnabled)
+				);
+
+				// We could just collapse the Reset to Default button by setting the FIsActionButtonVisible delegate,
+				// but this would cause the reset to defaults not to reserve space in the toolbar and not be aligned across all rows.
+				// Instead, we show an empty icon and tooltip and disable the button.
+				static FSlateIcon EnabledResetToDefaultIcon(FSodaStyle::Get().GetStyleSetName(), "PropertyWindow.DiffersFromDefault");
+				static FSlateIcon DisabledResetToDefaultIcon(FAppStyle::Get().GetStyleSetName(), "NoBrush");
+				ResetToDefault.Icon = TAttribute<FSlateIcon>::Create([this]()
+				{
+					return IsResetToDefaultEnabled() ? 
+						EnabledResetToDefaultIcon :
+						DisabledResetToDefaultIcon;
+				});
+				ResetToDefault.ToolTip = TAttribute<FText>::Create([this]() 
+				{
+					return IsResetToDefaultEnabled() ?
+						NSLOCTEXT("PropertyEditor", "ResetToDefaultPropertyValueToolTip", "Reset this property to its default value.") :
+						FText::GetEmpty();
+				});
+
+				CreateGlobalExtensionWidgets(ExtensionButtons);
+
+				FSlimHorizontalToolBarBuilder ToolbarBuilder(TSharedPtr<FUICommandList>(), FMultiBoxCustomization::None);
+				ToolbarBuilder.SetLabelVisibility(EVisibility::Collapsed);
+				ToolbarBuilder.SetStyle(&FSodaStyle::Get(), "DetailsView.ExtensionToolBar");
+				ToolbarBuilder.SetIsFocusable(false);
+
+				for (const FPropertyRowExtensionButton& Extension : ExtensionButtons)
+				{
+					ToolbarBuilder.AddToolBarButton(Extension.UIAction, NAME_None, Extension.Label, Extension.ToolTip, Extension.Icon);
+				}
+
+				Splitter->AddSlot()
+					.Value(ColumnSizeData.RightColumnWidth)
+					.OnSlotResized(ColumnSizeData.OnRightColumnResized)
+					.MinSize(ColumnSizeData.RightColumnMinWidth)
+				[
+					SNew(SBorder)
+					.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle"))
+					.BorderBackgroundColor(this, &SDetailSingleItemRow::GetOuterBackgroundColor)
+					.HAlign(HAlign_Fill)
+					.VAlign(VAlign_Center)
+					.Padding(0)
+					[
+						ToolbarBuilder.MakeWidget()
+					]
+				];
+			}
+		}
+	}
+	else
+	{
+		// details panel layout became invalid.  This is probably a scenario where a widget is coming into view in the parent tree but some external event previous in the frame has invalidated the contents of the details panel.
+		// The next frame update of the details panel will fix it
+		Widget = SNew(SSpacer);
+	}
+
+	TWeakPtr<STableViewBase> OwnerTableViewWeak = InOwnerTableView;
+	auto GetScrollbarWellBrush = [this, OwnerTableViewWeak]()
+	{
+		return SDetailTableRowBase::IsScrollBarVisible(OwnerTableViewWeak) ?
+			FSodaStyle::Get().GetBrush("DetailsView.GridLine") :
+			FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle");
+	};
+
+	auto GetScrollbarWellTint = [this, OwnerTableViewWeak]()
+	{
+		return SDetailTableRowBase::IsScrollBarVisible(OwnerTableViewWeak) ?
+			FStyleColors::White : 
+			this->GetOuterBackgroundColor();
+	};
+
+	auto GetHighlightBorderPadding = [this]()
+	{
+		return this->IsHighlighted() ? FMargin(1) : FMargin(0);
+	};
+
+	this->ChildSlot
+	[
+		SNew( SBorder )
+		.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.GridLine"))
+		.Padding(FMargin(0,0,0,1))
+		.Clipping(EWidgetClipping::ClipToBounds)
+		[
+			SNew(SBox)
+			.MinDesiredHeight(PropertyEditorConstants::PropertyRowHeight)
+			[
+				SNew( SHorizontalBox )
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Fill)
+				.VAlign(VAlign_Fill)
+				[
+					SNew( SBorder )
+					.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.Highlight"))
+					.Padding_Lambda(GetHighlightBorderPadding)
+					[
+						SNew( SBorder )
+						.BorderImage(FSodaStyle::Get().GetBrush("DetailsView.CategoryMiddle"))
+						.BorderBackgroundColor(this, &SDetailSingleItemRow::GetOuterBackgroundColor)
+						.Padding(0)
+						[
+							Widget
+						]
+					]
+				]
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Right)
+				.VAlign(VAlign_Fill)
+				.AutoWidth()
+				[
+					SNew( SBorder )
+					.BorderImage_Lambda(GetScrollbarWellBrush)
+					.BorderBackgroundColor_Lambda(GetScrollbarWellTint)
+					.Padding(FMargin(0, 0, SDetailTableRowBase::ScrollBarPadding, 0))
+				]
+			]
+		]
+	];
+
+	STableRow< TSharedPtr< FDetailTreeNode > >::ConstructInternal(
+		STableRow::FArguments()
+			.Style(FSodaStyle::Get(), "DetailsView.TreeView.TableRow")
+			.ShowSelection(false)
+			//.OnDragLeave(DragLeaveDelegate)
+			.OnAcceptDrop(AcceptDropDelegate)
+			.OnCanAcceptDrop(CanAcceptDropDelegate),
+		InOwnerTableView
+	);
+}
+
+FReply SDetailSingleItemRow::OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.GetModifierKeys().IsShiftDown())
+	{
+		bool bIsHandled = false;
+		if (CopyAction.CanExecute() && MouseEvent.GetEffectingButton() == EKeys::RightMouseButton)
+		{
+			CopyAction.Execute();
+			PulseAnimation.Play(SharedThis(this));
+			bIsHandled = true;
+		}
+		else if (PasteAction.CanExecute() && MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+		{
+			PasteAction.Execute();
+			PulseAnimation.Play(SharedThis(this));
+			if(TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode())
+			{
+				// Mark property node as animating so we will animate after any potential re-construction
+				IDetailsViewPrivate* DetailsView = OwnerTreeNode.Pin()->GetDetailsView();
+				DetailsView->MarkNodeAnimating(PropertyNode, DetailWidgetConstants::PulseAnimationLength);
+			}
+			bIsHandled = true;
+		}
+
+		if (bIsHandled)
+		{
+			return FReply::Handled();
+		}
+	}
+
+	return SDetailTableRowBase::OnMouseButtonUp(MyGeometry, MouseEvent);
+}
+
+bool SDetailSingleItemRow::IsResetToDefaultEnabled() const
+{
+	return bCachedResetToDefaultEnabled;
+}
+
+void SDetailSingleItemRow::OnResetToDefaultClicked() const
+{
+	TSharedPtr<IPropertyHandle> PropertyHandle = GetPropertyHandle();
+	if (WidgetRow.CustomResetToDefault.IsSet())
+	{
+		WidgetRow.CustomResetToDefault.GetValue().OnResetToDefaultClicked(PropertyHandle);
+	}
+	else if (PropertyHandle.IsValid())
+	{
+		PropertyHandle->ResetToDefault();
+	}
+}
+
+/** Get the background color of the outer part of the row, which contains the edit condition and extension widgets. */
+FSlateColor SDetailSingleItemRow::GetOuterBackgroundColor() const
+{
+	if (IsHighlighted()/* || DragOperation.IsValid()*/)
+	{
+		return FAppStyle::Get().GetSlateColor("Colors.Hover");
+	}
+
+	return PropertyEditorConstants::GetRowBackgroundColor(0, this->IsHovered());
+}
+
+/** Get the background color of the inner part of the row, which contains the name and value widgets. */
+FSlateColor SDetailSingleItemRow::GetInnerBackgroundColor() const
+{
+	FSlateColor Color;
+
+	if (IsHighlighted())
+	{
+		Color = FAppStyle::Get().GetSlateColor("Colors.Hover");
+	}
+	else
+	{
+		const int32 IndentLevel = GetIndentLevelForBackgroundColor();
+		Color = PropertyEditorConstants::GetRowBackgroundColor(IndentLevel, this->IsHovered());
+	}
+
+	if (PulseAnimation.IsPlaying())
+	{
+		float Lerp = PulseAnimation.GetLerp();
+		return FMath::Lerp(FAppStyle::Get().GetSlateColor("Colors.Hover2").GetSpecifiedColor(), Color.GetSpecifiedColor(), Lerp);
+	}
+
+	return Color;
+}
+
+bool SDetailSingleItemRow::OnContextMenuOpening(FMenuBuilder& MenuBuilder)
+{
+	FUIAction CopyDisplayNameAction = FExecuteAction::CreateSP(this, &SDetailSingleItemRow::OnCopyPropertyDisplayName);
+
+	bool bAddedMenuEntry = false;
+	if (CopyAction.IsBound() && PasteAction.IsBound())
+	{
+		// Hide separator line if it only contains the SearchWidget, making the next 2 elements the top of the list
+		if (MenuBuilder.GetMultiBox()->GetBlocks().Num() > 1)
+		{
+			MenuBuilder.AddMenuSeparator();
+		}
+
+		bool bLongDisplayName = false;
+
+		FMenuEntryParams CopyContentParams;
+		CopyContentParams.LabelOverride = NSLOCTEXT("PropertyView", "CopyProperty", "Copy");
+		CopyContentParams.ToolTipOverride = NSLOCTEXT("PropertyView", "CopyProperty_ToolTip", "Copy this property value");
+		CopyContentParams.InputBindingOverride = FInputChord(EModifierKey::Shift, EKeys::RightMouseButton).GetInputText(bLongDisplayName);
+		CopyContentParams.IconOverride = FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "GenericCommands.Copy");
+		CopyContentParams.DirectActions = CopyAction;
+		MenuBuilder.AddMenuEntry(CopyContentParams);
+
+		FMenuEntryParams PasteContentParams;
+		PasteContentParams.LabelOverride = NSLOCTEXT("PropertyView", "PasteProperty", "Paste");
+		PasteContentParams.ToolTipOverride = NSLOCTEXT("PropertyView", "PasteProperty_ToolTip", "Paste the copied value here");
+		PasteContentParams.InputBindingOverride = FInputChord(EModifierKey::Shift, EKeys::LeftMouseButton).GetInputText(bLongDisplayName);
+		PasteContentParams.IconOverride = FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "GenericCommands.Paste");
+		PasteContentParams.DirectActions = PasteAction;
+		MenuBuilder.AddMenuEntry(PasteContentParams);
+
+		MenuBuilder.AddMenuEntry(
+			NSLOCTEXT("PropertyView", "CopyPropertyDisplayName", "Copy Display Name"),
+			NSLOCTEXT("PropertyView", "CopyPropertyDisplayName_ToolTip", "Copy this property display name"),
+			FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "GenericCommands.Copy"),
+			CopyDisplayNameAction);
+	}
+
+	if (OwnerTreeNode.Pin()->GetDetailsView()->IsFavoritingEnabled())
+	{
+		FUIAction FavoriteAction;
+		FavoriteAction.ExecuteAction = FExecuteAction::CreateSP(this, &SDetailSingleItemRow::OnFavoriteMenuToggle);
+		FavoriteAction.CanExecuteAction = FCanExecuteAction::CreateSP(this, &SDetailSingleItemRow::CanFavorite);
+
+		FText FavoriteText = NSLOCTEXT("PropertyView", "FavoriteProperty", "Add to Favorites");
+		FText FavoriteTooltipText = NSLOCTEXT("PropertyView", "FavoriteProperty_ToolTip", "Add this property to your favorites.");
+		FName FavoriteIcon = "DetailsView.PropertyIsFavorite";
+
+		if (IsFavorite())
+		{
+			FavoriteText = NSLOCTEXT("PropertyView", "RemoveFavoriteProperty", "Remove from Favorites");
+			FavoriteTooltipText = NSLOCTEXT("PropertyView", "RemoveFavoriteProperty_ToolTip", "Remove this property from your favorites.");
+			FavoriteIcon = "DetailsView.PropertyIsNotFavorite";
+		}
+
+		MenuBuilder.AddMenuEntry(
+			FavoriteText,
+			FavoriteTooltipText,
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), FavoriteIcon),
+			FavoriteAction);
+	}
+
+	if (FPropertyEditorPermissionList::Get().ShouldShowMenuEntries())
+	{
+		// Hide separator line if it only contains the SearchWidget, making the next 2 elements the top of the list
+		if (MenuBuilder.GetMultiBox()->GetBlocks().Num() > 1)
+		{
+			MenuBuilder.AddMenuSeparator();
+		}
+		
+		MenuBuilder.AddMenuEntry(
+        	NSLOCTEXT("PropertyView", "CopyRowName", "Copy internal row name"),
+        	NSLOCTEXT("PropertyView", "CopyRowName_ToolTip", "Copy the row's parent struct and internal name to use in the property editor's allow/deny lists."),
+        	FSlateIcon(),
+        	FUIAction(FExecuteAction::CreateSP(this, &SDetailSingleItemRow::CopyRowNameText)));
+
+		MenuBuilder.AddMenuEntry(
+			NSLOCTEXT("PropertyView", "AddAllowList", "Add to Allowed"),
+			NSLOCTEXT("PropertyView", "AddAllowList_ToolTip", "Add this row to the property editor's allowed properties list."),
+			FSlateIcon(),
+			FUIAction(FExecuteAction::CreateSP(this, &SDetailSingleItemRow::OnToggleAllowList), FCanExecuteAction(),
+					  FIsActionChecked::CreateSP(this, &SDetailSingleItemRow::IsAllowListChecked)),
+			NAME_None,
+			EUserInterfaceActionType::Check);
+
+		MenuBuilder.AddMenuEntry(
+			NSLOCTEXT("PropertyView", "AddDenyList", "Add to Denied"),
+			NSLOCTEXT("PropertyView", "AddDenyList_ToolTip", "Add this row to the property editor's denied properties list."),
+			FSlateIcon(),
+			FUIAction(FExecuteAction::CreateSP(this, &SDetailSingleItemRow::OnToggleDenyList), FCanExecuteAction(),
+					  FIsActionChecked::CreateSP(this, &SDetailSingleItemRow::IsDenyListChecked)),
+			NAME_None,
+			EUserInterfaceActionType::Check);
+			
+		bAddedMenuEntry = true;
+	}
+
+	if (WidgetRow.CustomMenuItems.Num() > 0)
+	{
+		// Hide separator line if it only contains the SearchWidget, making the next 2 elements the top of the list
+		if (MenuBuilder.GetMultiBox()->GetBlocks().Num() > 1)
+		{
+			MenuBuilder.AddMenuSeparator();
+		}
+
+		for (const FDetailWidgetRow::FCustomMenuData& CustomMenuData : WidgetRow.CustomMenuItems)
+		{
+			// Add the menu entry
+			MenuBuilder.AddMenuEntry(
+				CustomMenuData.Name,
+				CustomMenuData.Tooltip,
+				CustomMenuData.SlateIcon,
+				CustomMenuData.Action);
+		}
+	}
+
+	return true;
+}
+
+void SDetailSingleItemRow::OnCopyProperty()
+{
+	if (OwnerTreeNode.IsValid())
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode();
+		if (PropertyNode.IsValid())
+		{
+			IDetailsViewPrivate* DetailsView = OwnerTreeNode.Pin()->GetDetailsView();
+			TSharedPtr<IPropertyHandle> Handle = PropertyEditorHelpers::GetPropertyHandle(PropertyNode.ToSharedRef(), DetailsView->GetNotifyHook(), DetailsView->GetPropertyUtilities());
+
+			FString Value;
+			if (Handle->GetValueAsFormattedString(Value, PPF_Copy) == FPropertyAccess::Success)
+			{
+				FPlatformApplicationMisc::ClipboardCopy(*Value);
+				PulseAnimation.Play(SharedThis(this));
+			}
+		}
+	}
+}
+
+void SDetailSingleItemRow::OnCopyPropertyDisplayName()
+{
+	if (OwnerTreeNode.IsValid())
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode();
+		if (PropertyNode.IsValid())
+		{
+			FPlatformApplicationMisc::ClipboardCopy(*PropertyNode->GetDisplayName().ToString());
+		}
+	}
+}
+
+void SDetailSingleItemRow::OnPasteProperty()
+{
+	FString ClipboardContent;
+	FPlatformApplicationMisc::ClipboardPaste(ClipboardContent);
+
+	if (!ClipboardContent.IsEmpty() && OwnerTreeNode.IsValid())
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = GetPropertyNode();
+		if (!PropertyNode.IsValid() && Customization->DetailGroup.IsValid())
+		{
+			PropertyNode = Customization->DetailGroup->GetHeaderPropertyNode();
+		}
+		if (PropertyNode.IsValid())
+		{
+			//FScopedTransaction Transaction(NSLOCTEXT("UnrealEd", "PasteProperty", "Paste Property"));
+
+			IDetailsViewPrivate* DetailsView = OwnerTreeNode.Pin()->GetDetailsView();
+			TSharedPtr<IPropertyHandle> Handle = PropertyEditorHelpers::GetPropertyHandle(PropertyNode.ToSharedRef(), DetailsView->GetNotifyHook(), DetailsView->GetPropertyUtilities());
+
+			Handle->SetValueFromFormattedString(ClipboardContent, EPropertyValueSetFlags::InstanceObjects);
+
+			// Need to refresh the details panel in case a property was pasted over another.
+			OwnerTreeNode.Pin()->GetDetailsView()->ForceRefresh();
+
+			// Mark property node as animating so we will animate after re-construction
+			DetailsView->MarkNodeAnimating(PropertyNode, DetailWidgetConstants::PulseAnimationLength);
+		}
+	}
+}
+
+bool SDetailSingleItemRow::CanPasteProperty() const
+{
+	// Prevent paste from working if the property's edit condition is not met.
+	TSharedPtr<FDetailPropertyRow> PropertyRow = Customization->PropertyRow;
+	if (!PropertyRow.IsValid() && Customization->DetailGroup.IsValid())
+	{
+		PropertyRow = Customization->DetailGroup->GetHeaderPropertyRow();
+	}
+
+	if (PropertyRow.IsValid())
+	{
+		FPropertyEditor* PropertyEditor = PropertyRow->GetPropertyEditor().Get();
+		if (PropertyEditor)
+		{
+			return !PropertyEditor->IsEditConst();
+		}
+	}
+
+	FString ClipboardContent;
+	if (OwnerTreeNode.IsValid())
+	{
+		FPlatformApplicationMisc::ClipboardPaste(ClipboardContent);
+	}
+
+	return !ClipboardContent.IsEmpty();
+}
+
+// Helper function to determine which parent Struct a property comes from. If PropertyName is not a real property,
+// it will return the passed-in Struct (eg a DetailsCustomization with a custom name is a "fake" property).
+const UStruct* GetExactStructForProperty(const UStruct* MostDerivedStruct, const FName PropertyName)
+{
+	if (FProperty* Property = MostDerivedStruct->FindPropertyByName(PropertyName))
+	{
+		return Property->GetOwnerStruct();
+	}
+	return MostDerivedStruct;
+}
+
+void SDetailSingleItemRow::CopyRowNameText() const
+{
+	if (const TSharedPtr<FDetailTreeNode> Owner = OwnerTreeNode.Pin())
+	{
+		const UStruct* BaseStructure = Owner->GetParentBaseStructure();
+		if (BaseStructure)
+		{
+			const UStruct* ExactStruct = GetExactStructForProperty(Owner->GetParentBaseStructure(), Owner->GetNodeName());
+			FPlatformApplicationMisc::ClipboardCopy(*FString::Printf(TEXT("(%s, %s)"), *FSoftObjectPtr(ExactStruct).ToString(), *Owner->GetNodeName().ToString()));
+		}
+	}
+}
+
+void SDetailSingleItemRow::OnToggleAllowList() const
+{
+	const TSharedPtr<FDetailTreeNode> Owner = OwnerTreeNode.Pin();
+	if (Owner)
+	{
+		const FName OwnerName = "DetailRowContextMenu";
+		const UStruct* ExactStruct = GetExactStructForProperty(Owner->GetParentBaseStructure(), Owner->GetNodeName());
+		if (IsAllowListChecked())
+		{
+			FPropertyEditorPermissionList::Get().RemoveFromAllowList(ExactStruct, Owner->GetNodeName(), OwnerName);
+		}
+		else
+		{
+			FPropertyEditorPermissionList::Get().AddToAllowList(ExactStruct, Owner->GetNodeName(), OwnerName);
+		}
+	}
+}
+
+bool SDetailSingleItemRow::IsAllowListChecked() const
+{
+	if (const TSharedPtr<FDetailTreeNode> Owner = OwnerTreeNode.Pin())
+	{
+		const UStruct* ExactStruct = GetExactStructForProperty(Owner->GetParentBaseStructure(), Owner->GetNodeName());
+		return FPropertyEditorPermissionList::Get().IsSpecificPropertyAllowListed(ExactStruct, Owner->GetNodeName());
+	}
+	return false;
+}
+
+void SDetailSingleItemRow::OnToggleDenyList() const
+{
+	const TSharedPtr<FDetailTreeNode> Owner = OwnerTreeNode.Pin();
+	if (Owner)
+	{
+		const FName OwnerName = "DetailRowContextMenu";
+		const UStruct* ExactStruct = GetExactStructForProperty(Owner->GetParentBaseStructure(), Owner->GetNodeName());
+		if (IsDenyListChecked())
+		{
+			FPropertyEditorPermissionList::Get().RemoveFromDenyList(ExactStruct, Owner->GetNodeName(), OwnerName);
+		}
+		else
+		{
+			FPropertyEditorPermissionList::Get().AddToDenyList(ExactStruct, Owner->GetNodeName(), OwnerName);
+		}
+	}
+}
+
+bool SDetailSingleItemRow::IsDenyListChecked() const
+{
+	if (const TSharedPtr<FDetailTreeNode> Owner = OwnerTreeNode.Pin())
+    {
+    	return FPropertyEditorPermissionList::Get().IsSpecificPropertyDenyListed(Owner->GetParentBaseStructure(), Owner->GetNodeName());
+    }
+	return false;
+}
+
+void SDetailSingleItemRow::PopulateExtensionWidget()
+{
+	TSharedPtr<FDetailTreeNode> OwnerTreeNodePinned = OwnerTreeNode.Pin();
+	if (OwnerTreeNodePinned.IsValid())
+	{ 
+		IDetailsViewPrivate* DetailsView = OwnerTreeNodePinned->GetDetailsView();
+		TSharedPtr<IDetailPropertyExtensionHandler> ExtensionHandler = DetailsView->GetExtensionHandler();
+		if (Customization->HasPropertyNode() && ExtensionHandler.IsValid())
+		{
+			TSharedPtr<IPropertyHandle> Handle = PropertyEditorHelpers::GetPropertyHandle(Customization->GetPropertyNode().ToSharedRef(), nullptr, nullptr);
+			const UClass* ObjectClass = Handle->GetOuterBaseClass();
+			if (Handle->IsValidHandle() && ObjectClass && ExtensionHandler->IsPropertyExtendable(ObjectClass, *Handle))
+			{
+				FDetailLayoutBuilderImpl& DetailLayout = OwnerTreeNodePinned->GetParentCategory()->GetParentLayoutImpl();
+				ExtensionHandler->ExtendWidgetRow(WidgetRow, DetailLayout, ObjectClass, Handle);
+			}
+		}
+	}
+}
+
+bool SDetailSingleItemRow::CanFavorite() const
+{
+	if (Customization->HasPropertyNode())
+	{
+		return true;
+	}
+
+	if (Customization->HasCustomBuilder())
+	{
+		TSharedPtr<IPropertyHandle> PropertyHandle = Customization->CustomBuilderRow->GetPropertyHandle();
+		const FString& OriginalPath = Customization->CustomBuilderRow->GetOriginalPath();
+		
+		return PropertyHandle.IsValid() || !OriginalPath.IsEmpty();
+	}
+
+	return false;
+}
+
+bool SDetailSingleItemRow::IsFavorite() const
+{
+	if (Customization->HasPropertyNode())
+	{
+		return Customization->GetPropertyNode()->IsFavorite();
+	}
+
+	if (Customization->HasCustomBuilder())
+	{
+		TSharedPtr<FDetailTreeNode> OwnerTreeNodePinned = OwnerTreeNode.Pin();
+		if (OwnerTreeNodePinned.IsValid())
+		{
+			TSharedPtr<FDetailCategoryImpl> ParentCategory = OwnerTreeNodePinned->GetParentCategory();
+			if (ParentCategory.IsValid() && ParentCategory->IsFavoriteCategory())
+			{
+				return true;
+			}
+
+			TSharedPtr<IPropertyHandle> PropertyHandle = Customization->CustomBuilderRow->GetPropertyHandle();
+			if (PropertyHandle.IsValid())
+			{
+				return PropertyHandle->GetPropertyNode()->IsFavorite();
+			}
+
+			const FString& OriginalPath = Customization->CustomBuilderRow->GetOriginalPath();
+			if (!OriginalPath.IsEmpty())
+			{
+				return OwnerTreeNodePinned->GetDetailsView()->IsCustomBuilderFavorite(OriginalPath);
+			}
+		}
+	}
+
+	return false;
+}
+
+void SDetailSingleItemRow::OnFavoriteMenuToggle()
+{
+	if (!CanFavorite())
+	{
+		return; 
+	}
+
+	TSharedPtr<FDetailTreeNode> OwnerTreeNodePinned = OwnerTreeNode.Pin();
+	if (!OwnerTreeNodePinned.IsValid())
+	{
+		return;
+	}
+
+	IDetailsViewPrivate* DetailsView = OwnerTreeNodePinned->GetDetailsView();
+
+	bool bNewValue = !IsFavorite();
+	if (Customization->HasPropertyNode())
+	{
+		TSharedPtr<FPropertyNode> PropertyNode = Customization->GetPropertyNode();
+		PropertyNode->SetFavorite(bNewValue);
+	}
+	else if (Customization->HasCustomBuilder())
+	{
+		TSharedPtr<IPropertyHandle> PropertyHandle = Customization->CustomBuilderRow->GetPropertyHandle();
+		const FString& OriginalPath = Customization->CustomBuilderRow->GetOriginalPath();
+
+		if (PropertyHandle.IsValid())
+		{
+			PropertyHandle->GetPropertyNode()->SetFavorite(bNewValue); 
+		}
+		else if (!OriginalPath.IsEmpty())
+		{		
+			bNewValue = !DetailsView->IsCustomBuilderFavorite(OriginalPath);
+			DetailsView->SetCustomBuilderFavorite(OriginalPath, bNewValue);
+		}
+	}
+
+	// Calculate the scrolling offset (by item) to make sure the mouse stay over the same property
+	int32 ExpandSize = 0;
+	if (OwnerTreeNodePinned->ShouldBeExpanded())
+	{
+		SDetailSingleItemRow_Helper::RecursivelyGetItemShow(OwnerTreeNodePinned.ToSharedRef(), ExpandSize);
+	}
+	else
+	{
+		// if the item is not expand count is 1
+		ExpandSize = 1;
+	}
+
+	// Apply the calculated offset
+	DetailsView->MoveScrollOffset(bNewValue ? ExpandSize : -ExpandSize);
+
+	// Refresh the tree
+	DetailsView->ForceRefresh();
+}
+
+void SDetailSingleItemRow::CreateGlobalExtensionWidgets(TArray<FPropertyRowExtensionButton>& OutExtensions) const
+{
+	// fetch global extension widgets 
+	FRuntimeEditorModule& PropertyEditorModule = FModuleManager::Get().GetModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+
+	FOnGenerateGlobalRowExtensionArgs Args;
+	Args.OwnerTreeNode = OwnerTreeNode;
+
+	if (Customization->HasPropertyNode())
+	{
+		Args.PropertyHandle = PropertyEditorHelpers::GetPropertyHandle(Customization->GetPropertyNode().ToSharedRef(), nullptr, nullptr);
+	}
+	else if (WidgetRow.GetPropertyHandles().Num() && WidgetRow.GetPropertyHandles()[0] && WidgetRow.GetPropertyHandles()[0]->IsValidHandle())
+	{
+		Args.PropertyHandle = WidgetRow.GetPropertyHandles()[0];
+	}
+
+	PropertyEditorModule.GetGlobalRowExtensionDelegate().Broadcast(Args, OutExtensions);
+
+	TSharedPtr<FDetailTreeNode> OwnerTreeNodePinned = OwnerTreeNode.Pin();
+	if (OwnerTreeNodePinned.IsValid())
+	{
+		IDetailsViewPrivate* DetailsView = OwnerTreeNodePinned->GetDetailsView();
+		DetailsView->GetLocalRowExtensionDelegate().Broadcast(Args, OutExtensions);
+	}
+
+	
+}
+
+bool SDetailSingleItemRow::IsHighlighted() const
+{
+	TSharedPtr<FDetailTreeNode> OwnerTreeNodePtr = OwnerTreeNode.Pin();
+	return OwnerTreeNodePtr.IsValid() ? OwnerTreeNodePtr->IsHighlighted() : false;
+}
+/*
+TSharedPtr<FDragDropOperation> SDetailSingleItemRow::CreateDragDropOperation()
+{
+	if (WidgetRow.CustomDragDropHandler)
+	{
+		TSharedPtr<FDragDropOperation> DragOp = WidgetRow.CustomDragDropHandler->CreateDragDropOperation();
+		DragOperation = DragOp;
+		return DragOp;
+	}
+	else
+	{
+		TSharedPtr<FArrayRowDragDropOp> ArrayDragOp = MakeShareable(new FArrayRowDragDropOp(SharedThis(this)));
+		ArrayDragOp->Init();
+		DragOperation = ArrayDragOp;
+		return ArrayDragOp;
+	}
+}
+*/
+void SDetailSingleItemRow::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+{
+	bCachedResetToDefaultEnabled = UpdateResetToDefault();
+}
+
+void SArrayRowHandle::Construct(const FArguments& InArgs)
+{
+	ParentRow = InArgs._ParentRow;
+
+	ChildSlot
+	[
+		InArgs._Content.Widget
+	];
+}
+/*
+FReply SArrayRowHandle::OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.IsMouseButtonDown(EKeys::LeftMouseButton))
+	{
+		TSharedPtr<FDragDropOperation> DragDropOp = ParentRow.Pin()->CreateDragDropOperation();
+		if (DragDropOp.IsValid())
+		{
+			return FReply::Handled().BeginDragDrop(DragDropOp.ToSharedRef());
+		}
+	}
+
+	return FReply::Unhandled();
+}
+
+FArrayRowDragDropOp::FArrayRowDragDropOp(TSharedPtr<SDetailSingleItemRow> InRow)
+{
+	check(InRow.IsValid());
+	Row = InRow;
+	MouseCursor = EMouseCursor::GrabHandClosed;
+}
+
+void FArrayRowDragDropOp::Init()
+{
+	SetValidTarget(false);
+	SetupDefaults();
+	Construct();
+}
+
+void FArrayRowDragDropOp::SetValidTarget(bool IsValidTarget)
+{
+	if (IsValidTarget)
+	{
+		CurrentHoverText = NSLOCTEXT("ArrayDragDrop", "PlaceRowHere", "Place Row Here");
+		CurrentIconBrush = FSodaStyle::GetBrush("Graph.ConnectorFeedback.OK");
+	}
+	else
+	{
+		CurrentHoverText = NSLOCTEXT("ArrayDragDrop", "CannotPlaceRowHere", "Cannot Place Row Here");
+		CurrentIconBrush = FSodaStyle::GetBrush("Graph.ConnectorFeedback.Error");
+	}
+}
+*/
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailSingleItemRow.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailSingleItemRow.h
new file mode 100644
index 0000000..e6a2808
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailSingleItemRow.h
@@ -0,0 +1,156 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/SDetailTableRowBase.h"
+#include "RuntimePropertyEditor/SDetailsViewBase.h"
+//#include "ScopedTransaction.h"
+
+//#include "DragAndDrop/DecoratedDragDropOp.h"
+#include "Framework/Commands/Commands.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/Views/STableViewBase.h"
+
+namespace soda
+{
+
+class IDetailKeyframeHandler;
+struct FDetailLayoutCustomization;
+class SDetailSingleItemRow;
+
+class SArrayRowHandle : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SArrayRowHandle)
+	{}
+	SLATE_DEFAULT_SLOT(FArguments, Content)
+	SLATE_ARGUMENT(TSharedPtr<SDetailSingleItemRow>, ParentRow)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs);
+
+	/*
+	FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		return FReply::Handled().DetectDrag(SharedThis(this), EKeys::LeftMouseButton);
+	};
+	*/
+
+	//FReply OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+
+private:
+	TWeakPtr<SDetailSingleItemRow> ParentRow;
+};
+
+/**
+ * A widget for details that span the entire tree row and have no columns                                                              
+ */
+class SDetailSingleItemRow : public SDetailTableRowBase
+{
+public:
+	SLATE_BEGIN_ARGS( SDetailSingleItemRow )
+		: _ColumnSizeData() {}
+
+		SLATE_ARGUMENT( FDetailColumnSizeData, ColumnSizeData )
+		SLATE_ARGUMENT( bool, AllowFavoriteSystem)
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct the widget
+	 */
+	void Construct( const FArguments& InArgs, FDetailLayoutCustomization* InCustomization, bool bHasMultipleColumns, TSharedRef<FDetailTreeNode> InOwnerTreeNode, const TSharedRef<STableViewBase>& InOwnerTableView );
+
+	// ~Begin SWidget Interface
+	virtual FReply OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	// ~Begin End Interface
+
+	//TSharedPtr<FDragDropOperation> CreateDragDropOperation();
+
+	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime);
+protected:
+	virtual bool OnContextMenuOpening( FMenuBuilder& MenuBuilder ) override;
+private:
+	void OnCopyProperty();
+	void OnCopyPropertyDisplayName();
+	void OnPasteProperty();
+	bool CanPasteProperty() const;
+	FSlateColor GetOuterBackgroundColor() const;
+	FSlateColor GetInnerBackgroundColor() const;
+
+	void CreateGlobalExtensionWidgets(TArray<FPropertyRowExtensionButton>& ExtensionButtons) const;
+	void PopulateExtensionWidget();
+	void OnResetToDefaultClicked() const;
+	bool IsResetToDefaultEnabled() const;
+
+	bool IsHighlighted() const;
+
+	void OnFavoriteMenuToggle();
+	bool CanFavorite() const;
+	bool IsFavorite() const;
+
+	/** UIActions to help populate the PropertyEditorPermissionList, which must first be turned on through FPropertyEditorPermissionList::Get().SetShouldShowMenuEntries */
+	void CopyRowNameText() const;
+	void OnToggleAllowList() const;
+	bool IsAllowListChecked() const;
+	void OnToggleDenyList() const;
+	bool IsDenyListChecked() const;
+
+	/*
+	void OnArrayOrCustomDragLeave(const FDragDropEvent& DragDropEvent);
+	FReply OnArrayAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> TargetItem);
+	FReply OnArrayHeaderAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> TargetItem);
+
+	TOptional<EItemDropZone> OnArrayCanAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr< FDetailTreeNode > Type);
+
+	FReply OnCustomAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> TargetItem);
+	TOptional<EItemDropZone> OnCustomCanAcceptDrop(const FDragDropEvent& DragDropEvent, EItemDropZone DropZone, TSharedPtr<FDetailTreeNode> Type);
+	*/
+
+	/** Checks if the current drop event is being dropped into a valid location
+	 */
+	bool CheckValidDrop(const TSharedPtr<SDetailSingleItemRow> RowPtr, EItemDropZone DropZone) const;
+	
+	TSharedPtr<FPropertyNode> GetPropertyNode() const;
+	TSharedPtr<IPropertyHandle> GetPropertyHandle() const;
+
+	bool UpdateResetToDefault();
+private:
+	/** Customization for this widget */
+	FDetailLayoutCustomization* Customization;
+	FDetailWidgetRow WidgetRow;
+	bool bAllowFavoriteSystem;
+	bool bCachedResetToDefaultEnabled;
+	TSharedPtr<FPropertyNode> SwappablePropertyNode;
+	TSharedPtr<SButton> ExpanderArrow;
+	//TWeakPtr<FDragDropOperation> DragOperation; // last drag initiated by this widget
+	FUIAction CopyAction;
+	FUIAction PasteAction;
+
+	/** Animation curve for displaying pulse */
+	FCurveSequence PulseAnimation;
+};
+/*
+class FArrayRowDragDropOp : public FSodaDecoratedDragDropOp
+{
+public:
+	DRAG_DROP_OPERATOR_TYPE(FArrayRowDragDropOp, FSodaDecoratedDragDropOp)
+
+	FArrayRowDragDropOp(TSharedPtr<SDetailSingleItemRow> InRow);
+
+	//Inits the tooltip, needs to be called after constructing 
+	void Init();
+
+	// Update the drag tool tip indicating whether the current drop target is valid
+	void SetValidTarget(bool IsValidTarget);
+
+	TWeakPtr<SDetailSingleItemRow> Row;
+};
+*/
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailTableRowBase.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailTableRowBase.cpp
new file mode 100644
index 0000000..479b0bf
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailTableRowBase.cpp
@@ -0,0 +1,42 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SDetailTableRowBase.h"
+
+namespace soda
+{
+
+const float SDetailTableRowBase::ScrollBarPadding = 16.0f;
+
+int32 SDetailTableRowBase::GetIndentLevelForBackgroundColor() const
+{
+	int32 IndentLevel = 0; 
+	if (OwnerTablePtr.IsValid())
+	{
+		// every item is in a category, but we don't want to show an indent for "top-level" properties
+		IndentLevel = GetIndentLevel() - 1;
+	}
+
+	TSharedPtr<FDetailTreeNode> DetailTreeNode = OwnerTreeNode.Pin();
+	if (DetailTreeNode.IsValid() && 
+		DetailTreeNode->GetDetailsView() != nullptr && 
+		DetailTreeNode->GetDetailsView()->ContainsMultipleTopLevelObjects())
+	{
+		// if the row is in a multiple top level object display (eg. Project Settings), don't display an indent for the initial level
+		--IndentLevel;
+	}
+
+	return FMath::Max(0, IndentLevel);
+}
+
+bool SDetailTableRowBase::IsScrollBarVisible(TWeakPtr<STableViewBase> OwnerTableViewWeak)
+{
+	TSharedPtr<STableViewBase> OwnerTableView = OwnerTableViewWeak.Pin();
+	if (OwnerTableView.IsValid())
+	{
+		return OwnerTableView->GetScrollbarVisibility() == EVisibility::Visible;
+	}
+	return false;
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailTableRowBase.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailTableRowBase.h
new file mode 100644
index 0000000..7cadd04
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailTableRowBase.h
@@ -0,0 +1,106 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "RuntimePropertyEditor/IDetailsViewPrivate.h"
+#include "InputCoreTypes.h"
+#include "Framework/Application/MenuStack.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Input/Reply.h"
+#include "Layout/WidgetPath.h"
+#include "Textures/SlateIcon.h"
+#include "Widgets/Views/SListView.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+
+namespace soda
+{
+
+class SDetailTableRowBase : public STableRow< TSharedPtr< FDetailTreeNode > >
+{
+public:
+	virtual FReply OnMouseButtonUp( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent ) override
+	{
+		if( OwnerTreeNode.IsValid() && MouseEvent.GetEffectingButton() == EKeys::RightMouseButton && !StaticCastSharedRef<STableViewBase>( OwnerTablePtr.Pin()->AsWidget() )->IsRightClickScrolling() )
+		{
+			FMenuBuilder MenuBuilder( true, nullptr, nullptr, true );
+
+			FDetailNodeList VisibleChildren;
+			OwnerTreeNode.Pin()->GetChildren( VisibleChildren );
+
+			bool bShouldOpenMenu = false;
+			// Open context menu if this node can be expanded 
+			if( VisibleChildren.Num() )
+			{
+				bShouldOpenMenu = true;
+
+				FUIAction ExpandAllAction( FExecuteAction::CreateSP( this, &SDetailTableRowBase::OnExpandAllClicked ) );
+				FUIAction CollapseAllAction( FExecuteAction::CreateSP( this, &SDetailTableRowBase::OnCollapseAllClicked ) );
+
+				MenuBuilder.BeginSection( NAME_None, NSLOCTEXT("PropertyView", "ExpansionHeading", "Expansion") );
+					MenuBuilder.AddMenuEntry( NSLOCTEXT("PropertyView", "CollapseAll", "Collapse All"), NSLOCTEXT("PropertyView", "CollapseAll_ToolTip", "Collapses this item and all children"), FSlateIcon(), CollapseAllAction );
+					MenuBuilder.AddMenuEntry( NSLOCTEXT("PropertyView", "ExpandAll", "Expand All"), NSLOCTEXT("PropertyView", "ExpandAll_ToolTip", "Expands this item and all children"), FSlateIcon(), ExpandAllAction );
+				MenuBuilder.EndSection();
+
+			}
+
+			bShouldOpenMenu |= OnContextMenuOpening(MenuBuilder);
+
+			if( bShouldOpenMenu )
+			{
+				FWidgetPath WidgetPath = MouseEvent.GetEventPath() != nullptr ? *MouseEvent.GetEventPath() : FWidgetPath();
+
+				FSlateApplication::Get().PushMenu(AsShared(), WidgetPath, MenuBuilder.MakeWidget(), MouseEvent.GetScreenSpacePosition(), FPopupTransitionEffect::ContextMenu);
+
+				return FReply::Handled();
+			}
+		}
+
+		return STableRow< TSharedPtr< FDetailTreeNode > >::OnMouseButtonUp( MyGeometry, MouseEvent );
+	}
+
+	int32 GetIndentLevelForBackgroundColor() const;
+
+	static bool IsScrollBarVisible(TWeakPtr<STableViewBase> OwnerTableViewWeak);
+	static const float ScrollBarPadding;
+
+protected:
+	/**
+	 * Called when the user opens the context menu on this row
+	 *
+	 * @param MenuBuilder	The menu builder to add menu items to
+	 * @return true if menu items were added
+	 */
+	virtual bool OnContextMenuOpening( FMenuBuilder& MenuBuilder ) { return false; }
+
+private:
+	void OnExpandAllClicked()
+	{
+		TSharedPtr<FDetailTreeNode> OwnerTreeNodePin = OwnerTreeNode.Pin();
+		if( OwnerTreeNodePin.IsValid() )
+		{
+			const bool bRecursive = true;
+			const bool bIsExpanded = true;
+			OwnerTreeNodePin->GetDetailsView()->SetNodeExpansionState( OwnerTreeNodePin.ToSharedRef(), bIsExpanded, bRecursive );
+		}
+	}
+
+	void OnCollapseAllClicked()
+	{
+		TSharedPtr<FDetailTreeNode> OwnerTreeNodePin = OwnerTreeNode.Pin();
+		if( OwnerTreeNodePin.IsValid() )
+		{
+			const bool bRecursive = true;
+			const bool bIsExpanded = false;
+			OwnerTreeNodePin->GetDetailsView()->SetNodeExpansionState( OwnerTreeNodePin.ToSharedRef(), bIsExpanded, bRecursive );
+		}
+	}
+protected:
+	TWeakPtr<FDetailTreeNode> OwnerTreeNode;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsView.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsView.cpp
new file mode 100644
index 0000000..a6d420f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsView.cpp
@@ -0,0 +1,1460 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SDetailsView.h"
+
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "Classes/SodaStyleSettings.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailsViewGenericObjectFilter.h"
+#include "RuntimePropertyEditor/DetailsViewPropertyGenerationUtilities.h"
+//#include "Editor.h"
+//#include "EditorMetadataOverrides.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "GameFramework/Actor.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/SDetailNameArea.h"
+#include "Styling/StyleColors.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.h"
+#include "Widgets/Colors/SColorPicker.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "Widgets/Input/SSegmentedControl.h"
+#include "Widgets/Layout/SWrapBox.h"
+#include "Classes/SodaStyleSettings.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "SDetailsView"
+
+namespace soda
+{
+
+SDetailsView::~SDetailsView()
+{
+	const FRootPropertyNodeList& RootNodes = GetRootNodes();
+	for(const TSharedPtr<FComplexPropertyNode>& RootNode : RootNodes)
+	{
+		SaveExpandedItems(RootNode.ToSharedRef());
+	}
+
+	//FEditorDelegates::PostUndoRedo.Remove(PostUndoRedoDelegateHandle);
+};
+
+/**
+ * Constructs the widget
+ *
+ * @param InArgs   Declaration from which to construct this widget.              
+ */
+void SDetailsView::Construct(const FArguments& InArgs, const FDetailsViewArgs& InDetailsViewArgs)
+{
+	DetailsViewArgs = InDetailsViewArgs;
+
+	const FDetailsViewConfig2* ViewConfig = GetConstViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		if (ViewConfig->ValueColumnWidth != 0 && ViewConfig->ValueColumnWidth != DetailsViewArgs.ColumnWidth)
+		{
+			DetailsViewArgs.ColumnWidth = ViewConfig->ValueColumnWidth;
+		}
+
+		if (DetailsViewArgs.bShowSectionSelector)
+		{
+			DetailsViewArgs.bShowSectionSelector = ViewConfig->bShowSections;
+		}
+
+		CurrentFilter.bShowFavoritesCategory = ViewConfig->bShowFavoritesCategory;
+	}
+
+	ColumnSizeData.SetValueColumnWidth(DetailsViewArgs.ColumnWidth);
+	ColumnSizeData.SetRightColumnMinWidth(DetailsViewArgs.RightColumnMinWidth);
+
+	SetObjectFilter(InDetailsViewArgs.ObjectFilter);
+	SetClassViewerFilters(InDetailsViewArgs.ClassViewerFilters);
+
+	bViewingClassDefaultObject = false;
+
+	PropertyUtilities = MakeShareable( new FPropertyDetailsUtilities( *this ) );
+	PropertyGenerationUtilities = MakeShareable( new FDetailsViewPropertyGenerationUtilities(*this) );
+
+	//PostUndoRedoDelegateHandle = FEditorDelegates::PostUndoRedo.AddSP(this, &SDetailsView::OnPostUndoRedo);
+
+	// We want the scrollbar to always be visible when objects are selected, but not when there is no selection - however:
+	//  - We can't use AlwaysShowScrollbar for this, as this will also show the scrollbar when nothing is selected
+	//  - We can't use the Visibility construction parameter, as it gets translated into user visibility and can hide the scrollbar even when objects are selected
+	// We instead have to explicitly set the visibility after the scrollbar has been constructed to get the exact behavior we want
+	TSharedRef<SScrollBar> ExternalScrollbar = SNew(SScrollBar);
+	ExternalScrollbar->SetVisibility( TAttribute<EVisibility>( this, &SDetailsView::GetScrollBarVisibility ) );
+
+	FMenuBuilder DetailViewOptions( true, nullptr);
+
+	if (DetailsViewArgs.bShowModifiedPropertiesOption)
+	{
+		DetailViewOptions.AddMenuEntry( 
+			LOCTEXT("ShowOnlyModified", "Show Only Modified Properties"),
+			LOCTEXT("ShowOnlyModified_ToolTip", "Displays only properties which have been changed from their default"),
+			FSlateIcon(),
+			FUIAction( 
+				FExecuteAction::CreateSP( this, &SDetailsView::OnShowOnlyModifiedClicked ),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP( this, &SDetailsView::IsShowOnlyModifiedChecked )
+			),
+			NAME_None,
+			EUserInterfaceActionType::Check 
+		);
+	}
+
+	if (DetailsViewArgs.bShowCustomFilterOption)
+	{
+		TAttribute<FText> CustomFilterLabelDelegate;
+		CustomFilterLabelDelegate.BindRaw(this, &SDetailsView::GetCustomFilterLabel);
+		DetailViewOptions.AddMenuEntry(
+			CustomFilterLabelDelegate,
+			FText(),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SDetailsView::OnCustomFilterClicked),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SDetailsView::IsCustomFilterChecked)
+			),
+			NAME_None,
+			EUserInterfaceActionType::Check
+		);
+	}
+
+	if (DetailsViewArgs.bShowDifferingPropertiesOption)
+	{
+		DetailViewOptions.AddMenuEntry(
+			LOCTEXT("ShowOnlyDiffering", "Show Only Differing Properties"),
+			LOCTEXT("ShowOnlyDiffering_ToolTip", "Displays only properties in this instance which have been changed or added from the instance being compared"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SDetailsView::OnShowOnlyAllowedClicked),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SDetailsView::IsShowOnlyAllowedChecked)
+			),
+			NAME_None,
+			EUserInterfaceActionType::Check
+		);
+	}
+
+	if (DetailsViewArgs.bShowKeyablePropertiesOption)
+	{
+		DetailViewOptions.AddMenuEntry(
+			LOCTEXT("ShowOnlyKeyable", "Show Only Keyable Properties"),
+			LOCTEXT("ShowOnlyKeyable_ToolTip", "Displays only properties which are keyable"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SDetailsView::OnShowKeyableClicked),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SDetailsView::IsShowKeyableChecked)
+			),
+			NAME_None,
+			EUserInterfaceActionType::Check
+		);
+	}
+
+	if (DetailsViewArgs.bShowAnimatedPropertiesOption)
+	{
+		DetailViewOptions.AddMenuEntry(
+			LOCTEXT("ShowAnimated", "Show Only Animated Properties"),
+			LOCTEXT("ShowAnimated_ToolTip", "Displays only properties which are animated (have tracks)"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SDetailsView::OnShowAnimatedClicked),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SDetailsView::IsShowAnimatedChecked)
+			),
+			NAME_None,
+			EUserInterfaceActionType::Check
+		);
+	}
+
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("ShowAllAdvanced", "Show All Advanced Details"),
+		LOCTEXT("ShowAllAdvanced_ToolTip", "Shows all advanced detail sections in each category"),
+		FSlateIcon(),
+		FUIAction( 
+		FExecuteAction::CreateSP( this, &SDetailsView::OnShowAllAdvancedClicked ),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP( this, &SDetailsView::IsShowAllAdvancedChecked )
+			),
+		NAME_None,
+		EUserInterfaceActionType::Check
+	);
+
+	if (DetailsViewArgs.bShowHiddenPropertiesWhilePlayingOption)
+	{
+		DetailViewOptions.AddMenuEntry(
+			LOCTEXT("ShowHiddenPropertiesWhilePlaying", "Show Hidden Properties while Playing"),
+			LOCTEXT("ShowHiddenPropertiesWhilePlaying_ToolTip", "When Playing or Simulating, shows all properties (even non-visible and non-editable properties), if the object belongs to a simulating world.  This is useful for debugging."),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SDetailsView::OnShowHiddenPropertiesWhilePlayingClicked),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SDetailsView::IsShowHiddenPropertiesWhilePlayingChecked)
+			),
+			NAME_None,
+			EUserInterfaceActionType::Check
+		);
+	}
+
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("ShowAllChildrenIfCategoryMatches", "Show Child On Category Match"),
+		LOCTEXT("ShowAllChildrenIfCategoryMatches_ToolTip", "Shows children if their category matches the search criteria"),
+		FSlateIcon(),
+		FUIAction( 
+			FExecuteAction::CreateSP( this, &SDetailsView::OnShowAllChildrenIfCategoryMatchesClicked ),
+			FCanExecuteAction(),
+			FIsActionChecked::CreateSP( this, &SDetailsView::IsShowAllChildrenIfCategoryMatchesChecked )
+		),
+		NAME_None,
+		EUserInterfaceActionType::Check
+	);
+
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("ShowSections", "Show Sections"),
+		LOCTEXT("ShowSections_ToolTip", "Shows the sections list."),
+		FSlateIcon(),
+		FUIAction( 
+			FExecuteAction::CreateSP(this, &SDetailsView::OnShowSectionsClicked),
+			FCanExecuteAction(),
+			FIsActionChecked::CreateSP(this, &SDetailsView::IsShowSectionsChecked)
+		),
+		NAME_None,
+		EUserInterfaceActionType::Check
+	);		
+
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("CollapseAll", "Collapse All Categories"),
+		LOCTEXT("CollapseAll_ToolTip", "Collapses all root level categories"),
+		FSlateIcon(),
+		FUIAction(FExecuteAction::CreateSP(this, &SDetailsView::SetRootExpansionStates, /*bExpanded=*/false, /*bRecurse=*/false )));
+
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("ExpandAll", "Expand All Categories"),
+		LOCTEXT("ExpandAll_ToolTip", "Expands all root level categories"),
+		FSlateIcon(),
+		FUIAction(FExecuteAction::CreateSP(this, &SDetailsView::SetRootExpansionStates, /*bExpanded=*/true, /*bRecurse=*/false )));
+
+	TSharedRef<SVerticalBox> VerticalBox = SNew(SVerticalBox);
+		
+	// Create the name area which does not change when selection changes
+	SAssignNew(NameArea, SDetailNameArea, &SelectedObjects)
+		// the name area is only for actors
+		.Visibility(this, &SDetailsView::GetActorNameAreaVisibility)
+		.OnLockButtonClicked(this, &SDetailsView::OnLockButtonClicked)
+		.IsLocked(this, &SDetailsView::IsLocked)
+		.ShowLockButton(DetailsViewArgs.bLockable)
+		.ShowObjectLabel(DetailsViewArgs.bShowObjectLabel)
+		// only show the selection tip if we're not selecting objects
+		.SelectionTip(!DetailsViewArgs.bHideSelectionTip);
+
+	if( !DetailsViewArgs.bCustomNameAreaLocation )
+	{
+		VerticalBox->AddSlot()
+		.AutoHeight()
+		.Padding(0.0f, 0.0f, 0.0f, 4.0f)
+		[
+			NameArea.ToSharedRef()
+		];
+	}
+
+	VerticalBox->AddSlot()
+	.AutoHeight()
+	.Padding(0.0f, 0.0f, 0.0f, 0.0f)
+	[
+		SAssignNew(CustomWidgetsBox, SWrapBox)
+		.UseAllottedSize(true)
+	];
+
+	TSharedRef<SHorizontalBox> FilterRowHBox = 
+		SNew( SHorizontalBox )
+		+SHorizontalBox::Slot()
+		.Padding(6.f)
+		.FillWidth(1)
+		[
+			// Create the search box
+			SAssignNew(SearchBox, SSearchBox)
+			.HintText(LOCTEXT("SearchDetailsHint", "Search"))
+			.OnTextChanged(this, &SDetailsView::OnFilterTextChanged)
+			.OnTextCommitted(this, &SDetailsView::OnFilterTextCommitted)
+			.AddMetaData<FTagMetaData>(TEXT("Details.Search"))
+		];
+
+	if (DetailsViewArgs.bShowPropertyMatrixButton)
+	{
+		FilterRowHBox->AddSlot()
+			.Padding(0)
+			.HAlign(HAlign_Right)
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				// Create the property matrix button
+				SNew(SButton)
+				.ButtonStyle( FAppStyle::Get(), "SimpleButton" )
+				.OnClicked(this, &SDetailsView::OnOpenRawPropertyEditorClicked)
+				.IsEnabled(this, &SDetailsView::CanOpenRawPropertyEditor)
+				.ToolTipText(LOCTEXT("RawPropertyEditorButtonLabel", "Open Selection in Property Matrix"))
+				[
+					SNew(SImage)
+					.ColorAndOpacity(FSlateColor::UseForeground())
+					.Image(FSodaStyle::Get().GetBrush("DetailsView.EditRawProperties"))
+				]
+			];
+	} 
+
+	if (DetailsViewArgs.bAllowFavoriteSystem)
+	{
+		FilterRowHBox->AddSlot()
+			.Padding(0)
+			.HAlign(HAlign_Right)
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				// Create the toggle favorites button
+				SNew(SButton)
+				.ButtonStyle( FAppStyle::Get(), "SimpleButton" )
+				.OnClicked(this, &SDetailsView::OnToggleFavoritesClicked)
+				.ToolTipText(LOCTEXT("ToggleFavorites", "Toggle Favorites"))
+				[
+					SNew(SImage)
+					.ColorAndOpacity(this, &SDetailsView::GetToggleFavoritesColor)
+					.Image(FSodaStyle::Get().GetBrush("Icons.Star"))
+				]
+			];
+	}
+
+	if (DetailsViewArgs.bShowOptions)
+	{
+		FilterRowHBox->AddSlot()
+			.Padding(0)
+			.HAlign(HAlign_Right)
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				SNew( SComboButton )
+				.HasDownArrow(false)
+				.ContentPadding(0)
+				.ForegroundColor( FSlateColor::UseForeground() )
+				.ButtonStyle( FAppStyle::Get(), "SimpleButton" )
+				.AddMetaData<FTagMetaData>(FTagMetaData(TEXT("ViewOptions")))
+				.MenuContent()
+				[
+					DetailViewOptions.MakeWidget()
+				]
+				.ButtonContent()
+				[
+					SNew(SImage)
+					.ColorAndOpacity(FSlateColor::UseForeground())
+					.Image(FSodaStyle::Get().GetBrush("DetailsView.ViewOptions"))
+				]
+			];
+	}
+
+	TSharedRef<SVerticalBox> FilterRowVBox = SNew(SVerticalBox)
+		.Visibility( this, &SDetailsView::GetFilterBoxVisibility )
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		[
+			FilterRowHBox
+		];
+
+	FilterRowVBox->AddSlot()
+		.Padding(8, 2, 8, 7)
+		.AutoHeight()
+		[
+			SAssignNew(SectionSelectorBox, SWrapBox)
+			.UseAllottedSize(true)
+			.InnerSlotPadding(FVector2D(4,4))
+		];
+
+	RebuildSectionSelector();
+
+	FilterRow = FilterRowVBox;
+
+	if( !DetailsViewArgs.bCustomFilterAreaLocation )
+	{
+		VerticalBox->AddSlot()
+		.AutoHeight()
+		[
+			SNew(SBorder)
+			.BorderImage(FAppStyle::Get().GetBrush("Brushes.Panel"))
+			[
+				FilterRow.ToSharedRef()
+			]
+		];
+	}
+
+	VerticalBox->AddSlot()
+	.FillHeight(1)
+	.Padding(0)
+	[
+		SNew(SOverlay)
+		+ SOverlay::Slot()
+		[
+			ConstructTreeView(ExternalScrollbar)
+		]
+		+ SOverlay::Slot()
+		.HAlign(HAlign_Right)
+		[
+			SNew(SBox)
+			.WidthOverride(16.0f)
+			[
+				ExternalScrollbar
+			]
+		]
+		+ SOverlay::Slot()
+		.HAlign(HAlign_Center)
+		.Padding(2.0f, 24.0f, 2.0f, 2.0f)
+		[
+			SNew(STextBlock)
+			.Text(LOCTEXT("AllItemsFiltered", "All results have been filtered. Try changing your active filters above."))
+			.AutoWrapText(true)
+			.Visibility_Lambda([this]() { return ((this->GetFilterBoxVisibility() == EVisibility::Visible) && !this->CurrentFilter.IsEmptyFilter() && RootTreeNodes.Num() == 0) ? EVisibility::HitTestInvisible : EVisibility::Collapsed; })
+		]
+		+ SOverlay::Slot()
+		[
+			SNew(SImage)
+			.Image(FSodaStyle::GetBrush("Searching.SearchActiveBorder"))
+			.Visibility_Lambda([this]() { return (this->GetFilterBoxVisibility() == EVisibility::Visible) && this->HasActiveSearch() ? EVisibility::HitTestInvisible : EVisibility::Collapsed; })
+		]
+	];
+
+	ChildSlot
+	[
+		VerticalBox
+	];
+}
+
+TSharedRef<SDetailTree> SDetailsView::ConstructTreeView( TSharedRef<SScrollBar>& ScrollBar )
+{
+	check( !DetailTree.IsValid() || DetailTree.IsUnique() );
+
+	return
+		SAssignNew(DetailTree, SDetailTree)
+		.Visibility(this, &SDetailsView::GetTreeVisibility)
+		.TreeItemsSource(&RootTreeNodes)
+		.OnGetChildren(this, &SDetailsView::OnGetChildrenForDetailTree)
+		.OnSetExpansionRecursive(this, &SDetailsView::SetNodeExpansionStateRecursive)
+		.OnGenerateRow(this, &SDetailsView::OnGenerateRowForDetailTree)
+		.OnExpansionChanged(this, &SDetailsView::OnItemExpansionChanged)
+		.SelectionMode(ESelectionMode::None)
+		.HandleDirectionalNavigation(false)
+		.AllowOverscroll(DetailsViewArgs.bShowScrollBar ? EAllowOverscroll::Yes : EAllowOverscroll::No)
+		.ExternalScrollbar(ScrollBar);
+}
+
+bool SDetailsView::CanOpenRawPropertyEditor() const
+{
+	return SelectedObjects.Num() > 0 && IsPropertyEditingEnabled();
+}
+
+FReply SDetailsView::OnOpenRawPropertyEditorClicked()
+{
+	//FRuntimeEditorModule& PropertyEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>( "RuntimeEditor" );
+	//PropertyEditorModule.CreatePropertyEditorToolkit(TSharedPtr<IToolkitHost>(), SelectedObjects );
+
+	return FReply::Handled();
+}
+
+EVisibility SDetailsView::GetActorNameAreaVisibility() const
+{
+	const bool bVisible = DetailsViewArgs.NameAreaSettings != FDetailsViewArgs::HideNameArea && !bViewingClassDefaultObject;
+	return bVisible ? EVisibility::Visible : EVisibility::Collapsed; 
+}
+
+void SDetailsView::ForceRefresh()
+{
+	TArray<UObject*> NewObjectList;
+	NewObjectList.Reserve(UnfilteredSelectedObjects.Num());
+	TArray<TWeakObjectPtr<UObject>> ValidSelectedObjects;
+	ValidSelectedObjects.Reserve(UnfilteredSelectedObjects.Num());
+
+	for (const TWeakObjectPtr<UObject>& Object : UnfilteredSelectedObjects)
+	{
+		if (Object.IsValid())
+		{
+			ValidSelectedObjects.Add(Object);
+			NewObjectList.Add(Object.Get());
+		}
+	}
+
+	UnfilteredSelectedObjects = MoveTemp(ValidSelectedObjects);
+
+	SetObjectArrayPrivate(NewObjectList);
+}
+
+void SDetailsView::MoveScrollOffset(int32 DeltaOffset)
+{
+	DetailTree->AddScrollOffset((float)DeltaOffset);
+}
+
+void SDetailsView::SetObjects(const TArray<UObject*>& InObjects, bool bForceRefresh/* = false*/, bool bOverrideLock/* = false*/)
+{
+	if (!IsLocked() || bOverrideLock)
+	{
+		if( bForceRefresh || ShouldSetNewObjects(InObjects) )
+		{
+			// Keep source object list around to reapply the object filter when it changes or force refresh.
+			UnfilteredSelectedObjects.Empty(InObjects.Num());
+			for (UObject* InObject : InObjects)
+			{
+				if (InObject)
+				{
+					UnfilteredSelectedObjects.Add(InObject);
+				}
+			}
+
+			SetObjectArrayPrivate(InObjects);
+		}
+	}
+}
+
+void SDetailsView::SetObjects(const TArray<TWeakObjectPtr<UObject>>& InObjects, bool bForceRefresh/* = false*/, bool bOverrideLock/* = false*/)
+{
+	TArray<UObject*> SourceObjects;
+	SourceObjects.Reserve(InObjects.Num());
+	for (const TWeakObjectPtr<UObject>& Object : InObjects)
+	{
+		if (Object.IsValid())
+		{
+			SourceObjects.Add(Object.Get());
+		}
+	}
+
+	SetObjects(SourceObjects, bForceRefresh, bOverrideLock);
+}
+
+void SDetailsView::SetObject(UObject* InObject, bool bForceRefresh)
+{
+	TArray<UObject*> SourceObjects;
+	SourceObjects.Reserve(1);
+
+	SourceObjects.Add(InObject);
+
+	SetObjects(SourceObjects, bForceRefresh);
+}
+
+void SDetailsView::RemoveInvalidObjects()
+{
+	ForceRefresh();
+}
+
+void SDetailsView::SetObjectPackageOverrides(const TMap<TWeakObjectPtr<UObject>, TWeakObjectPtr<UPackage>>& InMapping)
+{
+	for(TSharedPtr<FComplexPropertyNode>& ComplexRootNode : RootPropertyNodes)
+	{
+		FObjectPropertyNode* RootNode = ComplexRootNode->AsObjectNode();
+		if(RootNode)
+		{
+			RootNode->SetObjectPackageOverrides(InMapping);
+		}
+	}
+}
+
+void SDetailsView::SetRootObjectCustomizationInstance(TSharedPtr<IDetailRootObjectCustomization> InRootObjectCustomization)
+{
+	RootObjectCustomization = InRootObjectCustomization;
+	RerunCurrentFilter();
+}
+
+void SDetailsView::ClearSearch()
+{
+	CurrentFilter.FilterStrings.Empty();
+	SearchBox->SetText(FText::GetEmpty());
+	RerunCurrentFilter();
+}
+
+void SDetailsView::SetObjectFilter(TSharedPtr<FDetailsViewObjectFilter> InFilter)
+{
+	ObjectFilter = InFilter;
+
+	if (!ObjectFilter.IsValid())
+	{
+		ObjectFilter = MakeShared<FDetailsViewDefaultObjectFilter>(!!DetailsViewArgs.bAllowMultipleTopLevelObjects);
+	}
+}
+
+void SDetailsView::SetClassViewerFilters(const TArray<TSharedRef<IClassViewerFilter>>& InFilters)
+{
+	ClassViewerFilters = InFilters;
+}
+
+bool SDetailsView::ShouldSetNewObjects(const TArray<UObject*>& InObjects) const
+{
+	bool bShouldSetObjects = false;
+
+	const bool bHadBSPBrushSelected = false;//SelectedActorInfo.bHaveBSPBrush;
+	if( bHadBSPBrushSelected == true )
+	{
+		// If a BSP brush was selected we need to refresh because surface could have been selected and the object set not updated
+		bShouldSetObjects = true;
+	}
+	else if( InObjects.Num() != GetNumObjects() )
+	{
+		// If the object arrays differ in size then at least one object is different so we must reset
+		bShouldSetObjects = true;
+	}
+	else if(InObjects.Num() == 0)
+	{
+		// User is likely resetting details panel
+		bShouldSetObjects = true;
+	}
+	else
+	{
+		// Check to see if the objects passed in are different. If not we do not need to set anything
+		TSet<UObject*> NewObjects;
+		NewObjects.Append(InObjects);
+
+		if(RootPropertyNodes.Num() > 1)
+		{
+			// For multiple top level node support, if the single object in each node is not found in the new object set
+			// then we need to refresh
+			for(int32 RootNodeIndex = 0; RootNodeIndex < RootPropertyNodes.Num(); ++RootNodeIndex)
+			{
+				FObjectPropertyNode* RootPropertyNode = RootPropertyNodes[RootNodeIndex]->AsObjectNode();
+				
+				if(RootPropertyNode && RootPropertyNode->GetNumObjects() > 0)
+				{
+					if(!NewObjects.Contains(RootPropertyNode->GetUObject(0)))
+					{
+						bShouldSetObjects = true;
+						break;
+					}
+				}
+				else
+				{
+					bShouldSetObjects = true;
+					break;
+				}
+			}
+		}
+		else
+		{
+			FObjectPropertyNode* RootPropertyNode = RootPropertyNodes[0]->AsObjectNode();
+			if( RootPropertyNode )
+			{
+				for(TPropObjectIterator Itor(RootPropertyNode->ObjectIterator()); Itor; ++Itor)
+				{
+					TWeakObjectPtr<UObject> Object = *Itor;
+					if(Object.IsValid() && !NewObjects.Contains(Object.Get()))
+					{
+						// An existing object is not in the list of new objects to set
+						bShouldSetObjects = true;
+						break;
+					}
+					else if(!Object.IsValid())
+					{
+						// An existing object is invalid
+						bShouldSetObjects = true;
+						break;
+					}
+				}
+			}
+			else
+			{
+				bShouldSetObjects = true;
+			}
+		}
+	}
+	
+	if (!bShouldSetObjects /* && AssetSelectionUtils::IsAnySurfaceSelected(nullptr)*/)
+	{
+		bShouldSetObjects = true;
+	}
+
+	return bShouldSetObjects;
+}
+
+int32 SDetailsView::GetNumObjects() const
+{
+	if(RootPropertyNodes.Num() > 1)
+	{
+		return RootPropertyNodes.Num();
+	}
+	else if( RootPropertyNodes.Num() > 0 && RootPropertyNodes[0]->AsObjectNode())
+	{
+		return RootPropertyNodes[0]->AsObjectNode()->GetNumObjects();
+	}
+
+	return 0;
+}
+
+void SDetailsView::SetObjectArrayPrivate(const TArray<UObject*>& InObjects)
+{
+	double StartTime = FPlatformTime::Seconds();
+
+	const TArray<FDetailsViewObjectRoot> Roots = ObjectFilter->FilterObjects(InObjects);
+
+	PreSetObject(Roots.Num());
+
+	// Selected actors for building SelectedActorInfo
+	TArray<AActor*> SelectedRawActors;
+
+	bViewingClassDefaultObject = InObjects.Num() > 0 ? true : false;
+	bool bOwnedByLockedLevel = false;
+
+	check(RootPropertyNodes.Num() == Roots.Num());
+
+	for(int32 RootIndex = 0; RootIndex < Roots.Num(); ++RootIndex)
+	{
+		const FDetailsViewObjectRoot& Root = Roots[RootIndex];
+
+		FObjectPropertyNode* RootNode = RootPropertyNodes[RootIndex]->AsObjectNode();
+
+		for(const TWeakObjectPtr<UObject> Object : Root.Objects)
+		{
+			if (Object.IsValid())
+			{
+				bViewingClassDefaultObject &= Object->HasAnyFlags(RF_ClassDefaultObject);
+
+				RootNode->AddObject(Object.Get());
+
+				SelectedObjects.Add(Object);
+				if (AActor* Actor = Cast<AActor>(Object.Get()))
+				{
+					SelectedActors.Add(Actor);
+					SelectedRawActors.Add(Actor);
+				}
+
+				// TODO: Try to invoke AddGeneratedMetadataToGlobalScope() once when object loaded
+				if (Object->GetClass()->ImplementsInterface(UEditableObject::StaticClass()))
+				{
+					FRuntimeMetaData::AddGeneratedMetadataToGlobalScope(Object->GetClass());
+				}
+			}
+		}
+	}
+
+	if(SelectedObjects.Num() == 0)
+	{
+		// Unlock the view automatically if we are viewing nothing
+		bIsLocked = false;
+	}
+
+	// Selection changed, refresh the detail area
+	NameArea->Refresh(SelectedObjects, DetailsViewArgs.NameAreaSettings);
+	
+	// When selection changes rebuild information about the selection
+	//SelectedActorInfo = AssetSelectionUtils::BuildSelectedActorInfo(SelectedRawActors);
+
+	PostSetObject(Roots);
+
+	// Set the title of the window based on the objects we are viewing
+	// Or call the delegate for handling when the title changed
+	FString Title;
+
+	if(SelectedObjects.Num() == 0 )
+	{
+		Title = NSLOCTEXT("PropertyView", "NothingSelectedTitle", "Nothing selected").ToString();
+	}
+	else if(Roots.Num() == 1 && RootPropertyNodes[0]->AsObjectNode()->GetNumObjects() == 1)
+	{
+		// if the object is the default metaobject for a UClass, use the UClass's name instead
+		UObject* Object = RootPropertyNodes[0]->AsObjectNode()->GetUObject(0);
+
+		FString ObjectName;
+		if ( Object && Object->GetClass()->GetDefaultObject() == Object )
+		{
+			ObjectName = Object->GetClass()->GetName();
+		}
+		else if( Object )
+		{
+			ObjectName = Object->GetName();
+			/*
+			// Is this an actor?  If so, it might have a friendly name to display
+			const AActor* Actor = Cast<const  AActor >( Object );
+			if( Actor != nullptr)
+			{
+				// Use the friendly label for this actor
+				ObjectName =  Actor->GetActorLabel();
+			}
+			*/
+		}
+
+		Title = ObjectName;
+	}
+	else if(Roots.Num() > 1)
+	{
+		Title = FText::Format(NSLOCTEXT("PropertyView", "MultipleToLevelObjectsSelectedFmt", "{0} selected"), Roots.Num()).ToString();
+	}
+	else
+	{
+		FObjectPropertyNode* RootPropertyNode = RootPropertyNodes[0]->AsObjectNode();
+		Title = FText::Format( NSLOCTEXT("PropertyView", "MultipleSelected", "{0} ({1} selected)"), FText::FromString(RootPropertyNode->GetObjectBaseClass()->GetName()), RootPropertyNode->GetNumObjects() ).ToString();
+	}
+
+	OnObjectArrayChanged.ExecuteIfBound(Title, InObjects);
+
+	RebuildSectionSelector();
+
+	CustomWidgetsBox->ClearChildren();
+	for (auto& Object : SelectedObjects)
+	{
+		IEditableObject* EditableObject = Cast<IEditableObject>(Object);
+		if (EditableObject)
+		{
+			if (TSharedPtr<SWidget> ToolBar = EditableObject->GenerateToolBar())
+			{
+				CustomWidgetsBox->AddSlot()
+				.FillEmptySpace(true)
+				[
+					ToolBar.ToSharedRef()
+				];
+			}
+		}
+	}
+
+	double ElapsedTime = FPlatformTime::Seconds() - StartTime;
+}
+
+void SDetailsView::ReplaceObjects(const TMap<UObject*, UObject*>& OldToNewObjectMap)
+{
+	TArray<UObject*> NewObjectList;
+	NewObjectList.Reserve(UnfilteredSelectedObjects.Num());
+	TArray<TWeakObjectPtr<UObject>> NewUnfilteredSelectedObjects;
+	NewUnfilteredSelectedObjects.Reserve(UnfilteredSelectedObjects.Num());
+
+	bool bNeedRefresh = false;
+	for (const TWeakObjectPtr<UObject>& Object : UnfilteredSelectedObjects)
+	{
+		// We could be replacing an object that has already been garbage collected, so look up the object using the raw pointer.
+		UObject* Replacement = OldToNewObjectMap.FindRef(Object.GetEvenIfUnreachable());
+		if (Replacement)
+		{
+			NewObjectList.Add(Replacement);
+			NewUnfilteredSelectedObjects.Add(Replacement);
+			bNeedRefresh = true;
+		}
+		else if (Object.IsValid())
+		{
+			NewObjectList.Add(Object.Get());
+			NewUnfilteredSelectedObjects.Add(Object);
+		}
+		else
+		{
+			bNeedRefresh = true;
+		}
+	}
+
+	if (bNeedRefresh)
+	{
+		UnfilteredSelectedObjects = MoveTemp(NewUnfilteredSelectedObjects);
+		SetObjectArrayPrivate(NewObjectList);
+	}
+}
+
+void SDetailsView::RemoveDeletedObjects(const TArray<UObject*>& DeletedObjects)
+{
+	TArray<UObject*> NewObjectList;
+	NewObjectList.Reserve(UnfilteredSelectedObjects.Num());
+	TArray<TWeakObjectPtr<UObject>> NewUnfilteredSelectedObjects;
+	NewUnfilteredSelectedObjects.Reserve(UnfilteredSelectedObjects.Num());
+
+	for (const TWeakObjectPtr<UObject>& Object : UnfilteredSelectedObjects)
+	{
+		if (Object.IsValid() && !DeletedObjects.Contains(Object.Get()))
+		{
+			NewUnfilteredSelectedObjects.Add(Object);
+			NewObjectList.Add(Object.Get());
+		}
+	}
+
+	if (NewUnfilteredSelectedObjects.Num() != UnfilteredSelectedObjects.Num())
+	{
+		UnfilteredSelectedObjects = MoveTemp(NewUnfilteredSelectedObjects);
+		SetObjectArrayPrivate(NewObjectList);
+	}
+}
+
+/** Called before during SetObjectArray before we change the objects being observed */
+void SDetailsView::PreSetObject(int32 InNewNumObjects)
+{
+	TSharedPtr<SColorPicker> ExistingColorPicker = GetColorPicker();
+	if (ExistingColorPicker.IsValid()
+		&& ExistingColorPicker->GetOptionalOwningDetailsView().IsValid()
+		&& ExistingColorPicker->GetOptionalOwningDetailsView().Get() != this)
+	{
+		DestroyColorPicker();
+	}
+
+	// Save existing expanded items first
+	for(TSharedPtr<FComplexPropertyNode>& RootNode : RootPropertyNodes)
+	{
+		SaveExpandedItems(RootNode.ToSharedRef());
+
+		RootNodesPendingKill.Add(RootNode);
+		FObjectPropertyNode* RootObjectNode = RootNode->AsObjectNode();
+		RootObjectNode->RemoveAllObjects();
+		RootObjectNode->ClearCachedReadAddresses(true);
+		RootObjectNode->ClearObjectPackageOverrides();
+	}
+
+	for(const FDetailLayoutData& Layout : DetailLayouts)
+	{
+		FRootPropertyNodeList& ExternalRootPropertyNodes = Layout.DetailLayout->GetExternalRootPropertyNodes();
+		for (TSharedPtr<FComplexPropertyNode>& ExternalRootNode : ExternalRootPropertyNodes)
+		{
+			if (ExternalRootNode.IsValid())
+			{
+				SaveExpandedItems(ExternalRootNode.ToSharedRef());
+
+				ExternalRootNode->Disconnect();
+			}
+		}
+	}
+
+	RootPropertyNodes.Empty(InNewNumObjects);
+	ExpandedDetailNodes.Empty();
+
+	for (int32 NewRootIndex = 0; NewRootIndex < InNewNumObjects; ++NewRootIndex)
+	{
+		RootPropertyNodes.Add(MakeShareable(new FObjectPropertyNode));
+	}
+
+	SelectedActors.Empty();
+	SelectedObjects.Empty();
+}
+
+
+/** Called at the end of SetObjectArray after we change the objects being observed */
+void SDetailsView::PostSetObject(const TArray<FDetailsViewObjectRoot>& Roots)
+{
+	TSharedPtr<SColorPicker> ExistingColorPicker = GetColorPicker();
+	if (ExistingColorPicker.IsValid()
+		&& (!ExistingColorPicker->GetOptionalOwningDetailsView().IsValid()
+			|| ExistingColorPicker->GetOptionalOwningDetailsView().Get() == this))
+	{
+		DestroyColorPicker();
+	}
+
+	ColorPropertyNode = nullptr;
+
+	// Are we editing PIE objects?  If the bShowHiddenPropertiesWhilePlaying setting is enabled, we may want to
+	// show all of the properties that would normally be hidden for objects that are part of the PIE world.
+	bool bAnyPIEObjects = false;
+	{
+		for( int32 RootNodeIndex = 0; RootNodeIndex < RootPropertyNodes.Num(); ++RootNodeIndex )
+		{
+			FObjectPropertyNode* RootPropertyNode = RootPropertyNodes[ RootNodeIndex ]->AsObjectNode();
+			if( RootPropertyNode != nullptr )
+			{
+				const int32 ObjectCount = RootPropertyNode->GetNumObjects();
+				for( int32 ObjectIndex = 0; ObjectIndex < ObjectCount; ++ObjectIndex )
+				{
+					UObject* Object = RootPropertyNode->GetUObject( ObjectIndex );
+					if( Object->GetOutermost()->HasAnyPackageFlags( PKG_PlayInEditor ) )
+					{
+						bAnyPIEObjects = true;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	FPropertyNodeInitParams InitParams;
+	InitParams.ParentNode = nullptr;
+	InitParams.Property = nullptr;
+	InitParams.ArrayOffset = 0;
+	InitParams.ArrayIndex = INDEX_NONE;
+	InitParams.bAllowChildren = true;
+	InitParams.bForceHiddenPropertyVisibility = 
+		FPropertySettings::Get().ShowHiddenProperties() || 
+		( GetDefault<USodaStyleSettings>()->bShowHiddenPropertiesWhilePlaying && bAnyPIEObjects ) ||
+		DetailsViewArgs.bForceHiddenPropertyVisibility;
+	InitParams.bGameModeOnlyVisible = DetailsViewArgs.bGameModeOnlyVisible;
+
+	switch ( DetailsViewArgs.DefaultsOnlyVisibility )
+	{
+	case EEditDefaultsOnlyNodeVisibility::Hide:
+		InitParams.bCreateDisableEditOnInstanceNodes = false;
+		break;
+	case EEditDefaultsOnlyNodeVisibility::Show:
+		InitParams.bCreateDisableEditOnInstanceNodes = true;
+		break;
+	case EEditDefaultsOnlyNodeVisibility::Automatic:
+		InitParams.bCreateDisableEditOnInstanceNodes = HasClassDefaultObject();
+		break;
+	default:
+		check(false);
+	}
+
+	for( TSharedPtr<FComplexPropertyNode>& ComplexRootNode : RootPropertyNodes )
+	{
+		FObjectPropertyNode* RootPropertyNode = ComplexRootNode->AsObjectNode();
+
+		RootPropertyNode->InitNode( InitParams );
+	}
+
+	RestoreAllExpandedItems();
+
+	UpdatePropertyMaps();
+	UpdateFilteredDetails();
+}
+
+void SDetailsView::SetOnObjectArrayChanged(FOnObjectArrayChanged OnObjectArrayChangedDelegate)
+{
+	OnObjectArrayChanged = OnObjectArrayChangedDelegate;
+}
+
+void SDetailsView::OnPostUndoRedo()
+{
+	InvalidateCachedState();
+}
+
+void SDetailsView::InvalidateCachedState()
+{
+	for (const TSharedPtr<FComplexPropertyNode>& RootNode : RootPropertyNodes)
+	{
+		RootNode->InvalidateCachedState();
+	}
+}
+
+bool SDetailsView::IsConnected() const
+{
+	return GetNumObjects() > 0;
+}
+
+const FSlateBrush* SDetailsView::OnGetLockButtonImageResource() const
+{
+	if (bIsLocked)
+	{
+		return FSodaStyle::GetBrush(TEXT("PropertyWindow.Locked"));
+	}
+	else
+	{
+		return FSodaStyle::GetBrush(TEXT("PropertyWindow.Unlocked"));
+	}
+}
+
+bool SDetailsView::IsShowHiddenPropertiesWhilePlayingChecked() const
+{
+	const FDetailsViewConfig2* ViewConfig = GetConstViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		return ViewConfig->bShowHiddenPropertiesWhilePlaying;
+	}
+
+	return false;
+}
+
+void SDetailsView::OnShowHiddenPropertiesWhilePlayingClicked()
+{
+	const bool bNewValue = !IsShowHiddenPropertiesWhilePlayingChecked();
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowHiddenPropertiesWhilePlaying = bNewValue;
+		SaveViewConfig();
+	}
+
+	GConfig->SetBool(TEXT("/Script/SodaStyle.SodaStyleSettings"), TEXT("bShowHiddenPropertiesWhilePlaying"), bNewValue, GEditorPerProjectIni);
+
+	// Force a refresh of the whole details panel, as the entire set of visible properties may be different
+	ForceRefresh();
+}
+
+void SDetailsView::OnShowSectionsClicked()
+{
+	DetailsViewArgs.bShowSectionSelector = !DetailsViewArgs.bShowSectionSelector;
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowSections = DetailsViewArgs.bShowSectionSelector;
+		SaveViewConfig();
+	}
+
+	if (!DetailsViewArgs.bShowSectionSelector)
+	{
+		CurrentFilter.VisibleSections.Reset();
+	}
+
+	RebuildSectionSelector();
+	UpdateFilteredDetails();
+}
+
+FSlateColor SDetailsView::GetToggleFavoritesColor() const
+{
+	if (DetailsViewArgs.bAllowFavoriteSystem && CurrentFilter.bShowFavoritesCategory)
+	{
+		return FSlateColor(EStyleColor::AccentBlue);
+	}
+	else
+	{
+		return FSlateColor(EStyleColor::Foreground);
+	}
+}
+
+FReply SDetailsView::OnToggleFavoritesClicked()
+{
+	CurrentFilter.bShowFavoritesCategory = !CurrentFilter.bShowFavoritesCategory;
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowFavoritesCategory = CurrentFilter.bShowFavoritesCategory;
+		SaveViewConfig();
+	}
+
+	RerunCurrentFilter();
+
+	return FReply::Handled();
+}
+
+/*
+static bool IsInEditorMetadataList(FName ListKey, FStringView Value, const TArray<TSharedPtr<FComplexPropertyNode>>& RootPropertyNodes)
+{
+	if (Value.IsEmpty())
+	{
+		return false;
+	}
+
+	UEditorMetadataOverrides* EditorMetadata = GEditor->GetEditorSubsystem<UEditorMetadataOverrides>();
+	if (!EditorMetadata)
+	{
+		return false;
+	}
+
+	const FString ValueString(Value);
+
+	for (const TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		const UStruct* BaseStruct = RootPropertyNode->GetBaseStructure();
+		if (BaseStruct != nullptr)
+		{
+			TArray<FString> ValueList;
+			if (EditorMetadata->GetArrayMetadata(BaseStruct, ListKey, ValueList))
+			{
+				if (ValueList.Contains(ValueString))
+				{
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+static void AddToEditorMetadataList(FName ListKey, FStringView Value, const TArray<TSharedPtr<FComplexPropertyNode>>& RootPropertyNodes)
+{
+	if (Value.IsEmpty())
+	{
+		return;
+	}
+
+	UEditorMetadataOverrides* MetadataOverrides = GEditor->GetEditorSubsystem<UEditorMetadataOverrides>();
+	if (!MetadataOverrides)
+	{
+		return;
+	}
+
+	const FString ValueString(Value);
+
+	for (const TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		const UStruct* BaseStruct = RootPropertyNode->GetBaseStructure();
+		if (BaseStruct != nullptr)
+		{
+
+			TArray<FString> ValueList;
+			if (MetadataOverrides->GetArrayMetadata(BaseStruct, ListKey, ValueList))
+			{
+				ValueList.AddUnique(ValueString);
+				MetadataOverrides->SetArrayMetadata(BaseStruct, ListKey, ValueList);
+			}
+			else
+			{
+				ValueList.Add(ValueString);
+				MetadataOverrides->SetArrayMetadata(BaseStruct, ListKey, ValueList);
+			}
+		}
+	}
+}
+
+static void RemoveFromEditorMetadataList(FName ListKey, FStringView Value, const TArray<TSharedPtr<FComplexPropertyNode>>& RootPropertyNodes)
+{
+	if (Value.IsEmpty())
+	{
+		return;
+	}
+
+	UEditorMetadataOverrides* MetadataOverrides = GEditor->GetEditorSubsystem<UEditorMetadataOverrides>();
+	if (!MetadataOverrides)
+	{
+		return;
+	}
+
+	const FString ValueString(Value);
+
+	for (const TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		const UStruct* BaseStruct = RootPropertyNode->GetBaseStructure();
+		if (BaseStruct != nullptr)
+		{
+			TArray<FString> ValueList;
+			if (MetadataOverrides->GetArrayMetadata(BaseStruct, ListKey, ValueList))
+			{
+				ValueList.Remove(ValueString);
+				MetadataOverrides->SetArrayMetadata(BaseStruct, ListKey, ValueList);
+			}
+		}
+	}
+}
+*/
+bool SDetailsView::IsGroupFavorite(FStringView GroupPath) const
+{
+	//static const FName FavoriteGroupsName("FavoriteGroups");
+	//return IsInEditorMetadataList(FavoriteGroupsName, GroupPath, RootPropertyNodes);
+	return false;
+}
+
+void SDetailsView::SetGroupFavorite(FStringView GroupPath, bool IsFavorite)
+{
+	/*
+	static const FName FavoriteGroupsName("FavoriteGroups");
+	if (IsFavorite)
+	{
+		AddToEditorMetadataList(FavoriteGroupsName, GroupPath, RootPropertyNodes);
+	}
+	else
+	{
+		RemoveFromEditorMetadataList(FavoriteGroupsName, GroupPath, RootPropertyNodes);
+	}
+	*/
+}
+
+bool SDetailsView::IsCustomBuilderFavorite(FStringView Path) const
+{
+	/*
+	static const FName FavoriteCustomBuildersName("FavoriteCustomBuilders");
+	return IsInEditorMetadataList(FavoriteCustomBuildersName, Path, RootPropertyNodes);
+	*/
+	return false;
+}
+
+void SDetailsView::SetCustomBuilderFavorite(FStringView Path, bool IsFavorite)
+{
+	/*
+	static const FName FavoriteCustomBuildersName("FavoriteCustomBuilders");
+	if (IsFavorite)
+	{
+		AddToEditorMetadataList(FavoriteCustomBuildersName, Path, RootPropertyNodes);
+	}
+	else
+	{
+		RemoveFromEditorMetadataList(FavoriteCustomBuildersName, Path, RootPropertyNodes);
+	}
+	*/
+}
+
+void SDetailsView::RebuildSectionSelector()
+{
+	SectionSelectorBox->ClearChildren();
+	SectionSelectorBox->SetVisibility(EVisibility::Collapsed);
+
+	if (!DetailsViewArgs.bShowSectionSelector)
+	{
+		return;
+	}
+
+	const TMap<FName, FText> AllSections = GetAllSections();
+	if (AllSections.IsEmpty())
+	{
+		// we've selected something that has no sections - rather than show just "All", hide the box
+		return;
+	}
+
+	auto CreateSection = [this](FName SectionName, FText SectionDisplayName) 
+		-> TSharedRef<SWidget>
+	{
+		return SNew(SBox)
+			[
+				SNew(SCheckBox)
+				.Style(FSodaStyle::Get(), "DetailsView.SectionButton")
+				.OnCheckStateChanged(this, &SDetailsView::OnSectionCheckedChanged, SectionName)
+				.IsChecked(this, &SDetailsView::IsSectionChecked, SectionName)
+				[
+					SNew(STextBlock)
+					.TextStyle(FAppStyle::Get(), "SmallText")
+					.Text(SectionDisplayName)
+				]
+			];
+	};
+
+	TArray<FName> SortedKeys;
+	AllSections.GenerateKeyArray(SortedKeys);
+	SortedKeys.Sort([](FName A, FName B)
+		{
+			static const FName General("General");
+			static const FName All("All");
+
+			// General first, All last, rest alphabetical
+			if (A.IsEqual(General) || B.IsEqual(All))
+			{
+				return true;
+			}
+			if (A.IsEqual(All) || B.IsEqual(General))
+			{
+				return false;
+			}
+			return A.LexicalLess(B);
+		});
+
+	for (const FName& Key : SortedKeys)
+	{
+		SectionSelectorBox->AddSlot()
+		[
+			CreateSection(Key, AllSections[Key])
+		];
+	}
+
+	SectionSelectorBox->AddSlot()
+	[
+		CreateSection(FName("All"), NSLOCTEXT("UObjectSection", "All", "All"))
+	];
+
+	SectionSelectorBox->SetVisibility(EVisibility::Visible);
+
+	CurrentFilter.VisibleSections.Reset();
+
+	for (const TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		const UStruct* RootBaseStruct = RootPropertyNode->GetBaseStructure();
+		const FDetailsViewConfig2* ViewConfig = GetConstViewConfig();
+		if (ViewConfig != nullptr)
+		{
+			const FDetailsSectionSelection2* SectionSelection = ViewConfig->SelectedSections.Find(RootBaseStruct->GetFName());
+			if (SectionSelection != nullptr)
+			{
+				CurrentFilter.VisibleSections = SectionSelection->SectionNames;
+			}
+		}
+	}
+}
+
+void SDetailsView::OnSectionCheckedChanged(ECheckBoxState State, FName SectionName)
+{
+	const bool IsControlDown = FSlateApplication::Get().GetModifierKeys().IsControlDown();
+
+	if (State == ECheckBoxState::Unchecked)
+	{
+		if (IsControlDown)
+		{
+			CurrentFilter.VisibleSections.Remove(SectionName);
+		}
+		else
+		{
+			CurrentFilter.VisibleSections.Reset();
+
+			if (SectionName != "All")
+			{
+				CurrentFilter.VisibleSections.Add(SectionName);
+			}
+		}
+	}
+	else if (State == ECheckBoxState::Checked)
+	{
+		if (!IsControlDown)
+		{
+			CurrentFilter.VisibleSections.Reset();
+		}
+
+		if (SectionName != "All")
+		{
+			CurrentFilter.VisibleSections.Add(SectionName);
+		}
+	}
+
+	for (const TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		const UStruct* RootBaseStruct = RootPropertyNode->GetBaseStructure();
+		FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+		if (ViewConfig != nullptr)
+		{
+			FDetailsSectionSelection2& SectionSelection = ViewConfig->SelectedSections.FindOrAdd(RootBaseStruct->GetFName());
+			SectionSelection.SectionNames = CurrentFilter.VisibleSections;
+
+			SaveViewConfig();
+		}
+	}
+
+	UpdateFilteredDetails();
+}
+
+ECheckBoxState SDetailsView::IsSectionChecked(FName Section) const
+{
+	if (CurrentFilter.VisibleSections.IsEmpty() && Section == "All")
+	{
+		return ECheckBoxState::Checked;
+	}
+
+	for (FName VisibleSection : CurrentFilter.VisibleSections)
+	{
+		if (Section == VisibleSection)
+		{
+			return ECheckBoxState::Checked;
+		}
+	}
+
+	return ECheckBoxState::Unchecked;
+}
+
+TMap<FName, FText> SDetailsView::GetAllSections() const
+{
+	static const FName PropertyEditor("RuntimeEditor");
+	FRuntimeEditorModule& PropertyModule = FModuleManager::GetModuleChecked<FRuntimeEditorModule>(PropertyEditor);
+
+	TMap<FName, FText> AllSections;
+
+	// for every category, check every base struct and find the associated section
+	// if one exists, add it to the set of valid section names
+	// we fetch the list of categories from the layouts since AllTreeNodes gets filtered
+	TArray<FName> LayoutCategories;
+	for (const FDetailLayoutData& Layout : DetailLayouts)
+	{
+		for (const TSharedRef<FDetailTreeNode>& TreeNode : Layout.DetailLayout->GetAllRootTreeNodes())
+		{
+			if (TreeNode->GetNodeType() == EDetailNodeType::Category)
+			{
+				FDetailCategoryImpl& Category = (FDetailCategoryImpl&) TreeNode.Get();
+				TArray<TSharedRef<FDetailTreeNode>> Children;
+				Category.GetGeneratedChildren(Children, true, false);
+
+				LayoutCategories.Add(TreeNode->GetNodeName());
+			}
+		}
+	}
+
+	for (const TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		const UStruct* RootBaseStruct = RootPropertyNode->GetBaseStructure();
+		
+		for (const FName& Category : LayoutCategories)
+		{
+			/*
+			TArray<TSharedPtr<FPropertySection>> SectionsForCategory = PropertyModule.FindSectionsForCategory(RootBaseStruct, Category);
+			for (const TSharedPtr<FPropertySection>& Section : SectionsForCategory)
+			{
+				AllSections.Add(Section->GetName(), Section->GetDisplayName());
+			}
+			*/
+		}
+	}
+
+	return MoveTemp(AllSections);
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsView.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsView.h
new file mode 100644
index 0000000..f4aaeb0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsView.h
@@ -0,0 +1,240 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+//#include "AssetSelection.h"
+#include "RuntimePropertyEditor/DetailsViewArgs.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "Input/Reply.h"
+#include "Layout/Visibility.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/SDetailsViewBase.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Layout/SScrollBar.h"
+
+class AActor;
+class SWrapBox;
+
+namespace soda
+{
+
+class IDetailRootObjectCustomization;
+class FDetailsViewObjectFilter;
+class IClassViewerFilter;
+
+class SDetailsView : public SDetailsViewBase
+{
+	friend class FPropertyDetailsUtilities;
+public:
+
+	SLATE_BEGIN_ARGS(SDetailsView){}
+	SLATE_END_ARGS()
+
+	virtual ~SDetailsView();
+
+	/** Causes the details view to be refreshed (new widgets generated) with the current set of objects */
+	virtual void ForceRefresh() override;
+
+	/** Invalidates cached state such as the "revert to default" arrow and edit conditions, without rebuilding the entire panel. */
+	virtual void InvalidateCachedState() override;
+
+	/** Move the scrolling offset (by item), but do not refresh the tree*/
+	void MoveScrollOffset(int32 DeltaOffset) override;
+
+	/**
+	 * Constructs the property view widgets                   
+	 */
+	void Construct(const FArguments& InArgs, const soda::FDetailsViewArgs& InDetailsViewArgs);
+
+	/** IDetailsView interface */
+	virtual void SetObjects(const TArray<UObject*>& InObjects, bool bForceRefresh = false, bool bOverrideLock = false) override;
+	virtual void SetObjects(const TArray<TWeakObjectPtr<UObject>>& InObjects, bool bForceRefresh = false, bool bOverrideLock = false) override;
+	virtual void SetObject(UObject* InObject, bool bForceRefresh = false) override;
+	virtual bool IsGroupFavorite(FStringView GroupPath) const override;
+	virtual void SetGroupFavorite(FStringView GroupPath, bool IsFavorite) override;
+	virtual bool IsCustomBuilderFavorite(FStringView Path) const override;
+	virtual void SetCustomBuilderFavorite(FStringView Path, bool IsFavorite) override;
+
+	virtual void RemoveInvalidObjects() override;
+	virtual void SetObjectPackageOverrides(const TMap<TWeakObjectPtr<UObject>, TWeakObjectPtr<UPackage>>& InMapping) override;
+	virtual void SetRootObjectCustomizationInstance(TSharedPtr<IDetailRootObjectCustomization> InRootObjectCustomization) override;
+	virtual void ClearSearch() override;
+	virtual void SetObjectFilter(TSharedPtr<FDetailsViewObjectFilter> InFilter) override;
+	virtual void SetClassViewerFilters(const TArray<TSharedRef<IClassViewerFilter>>& InFilters) override;
+
+	/**
+	 * Replaces objects being observed by the view with new objects
+	 *
+	 * @param OldToNewObjectMap	Mapping from objects to replace to their replacement
+	 */
+	void ReplaceObjects(const TMap<UObject*, UObject*>& OldToNewObjectMap);
+
+	/**
+	 * Removes objects from the view because they are about to be deleted
+	 *
+	 * @param DeletedObjects	The objects to delete
+	 */
+	void RemoveDeletedObjects(const TArray<UObject*>& DeletedObjects);
+
+	/** Sets the callback for when the property view changes */
+	virtual void SetOnObjectArrayChanged(FOnObjectArrayChanged OnObjectArrayChangedDelegate) override;
+
+	/** @return	Returns list of selected objects we're inspecting */
+	virtual const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const override
+	{
+		return SelectedObjects;
+	} 
+
+	/** @return	Returns list of selected actors we're inspecting */
+	virtual const TArray<TWeakObjectPtr<AActor>>& GetSelectedActors() const override
+	{
+		return SelectedActors;
+	}
+
+	/** @return Returns information about the selected set of actors */
+	/*
+	virtual const FSelectedActorInfo& GetSelectedActorInfo() const override
+	{
+		return SelectedActorInfo;
+	}
+	*/
+
+	virtual bool HasClassDefaultObject() const override
+	{
+		return bViewingClassDefaultObject;
+	}
+
+	virtual bool IsConnected() const override;
+
+	virtual FRootPropertyNodeList& GetRootNodes() override
+	{
+		return RootPropertyNodes;
+	}
+
+	virtual bool DontUpdateValueWhileEditing() const override
+	{ 
+		return false; 
+	}
+
+	virtual bool ContainsMultipleTopLevelObjects() const override
+	{
+		return DetailsViewArgs.bAllowMultipleTopLevelObjects && GetNumObjects() > 1;
+	}
+
+	virtual TSharedPtr<IDetailRootObjectCustomization> GetRootObjectCustomization() const override
+	{
+		return RootObjectCustomization;
+	}
+private:
+
+	void SetObjectArrayPrivate(const TArray<UObject*>& InObjects);
+
+	TSharedRef<SDetailTree> ConstructTreeView( TSharedRef<SScrollBar>& ScrollBar );
+
+	/**
+	 * Returns whether or not new objects need to be set. If the new objects being set are identical to the objects 
+	 * already in the details panel, nothing needs to be set
+	 *
+	 * @param InObjects The potential new objects to set
+	 * @return true if the new objects should be set
+	 */
+	bool ShouldSetNewObjects(const TArray<UObject*>& InObjects) const;
+
+	/**
+	 * Returns the number of objects being edited by this details panel.
+	 */
+	int32 GetNumObjects() const;
+
+	/** Called before during SetObjectArray before we change the objects being observed */
+	void PreSetObject(int32 InNewNumObjects);
+
+	/** Called at the end of SetObjectArray after we change the objects being observed */
+	void PostSetObject(const TArray<FDetailsViewObjectRoot>& Roots);
+	
+	/** Called to get the visibility of the actor name area */
+	EVisibility GetActorNameAreaVisibility() const;
+
+	/** Returns the name of the image used for the icon on the locked button */
+	const FSlateBrush* OnGetLockButtonImageResource() const;
+
+	/** Whether the property matrix button should be enabled */
+	bool CanOpenRawPropertyEditor() const;
+
+	/**
+	 * Called to open the raw property editor (property matrix)                                                              
+	 */
+	FReply OnOpenRawPropertyEditorClicked();
+
+	/** @return Returns true if show hidden properties while playing is checked */
+	bool IsShowHiddenPropertiesWhilePlayingChecked() const;
+
+	/** Called when show hidden properties while playing is clicked */
+	void OnShowHiddenPropertiesWhilePlayingClicked();
+
+	/** @return true if Show Sections is checked. */
+	bool IsShowSectionsChecked() const { return DetailsViewArgs.bShowSectionSelector; }
+
+	/** Called when Show Sections is clicked */
+	void OnShowSectionsClicked();
+
+	/** Get the color of the toggle favorites button. */
+	FSlateColor GetToggleFavoritesColor() const;
+
+	/** Called when the toggle favorites button is clicked. */
+	FReply OnToggleFavoritesClicked();
+
+	/** Called after an undo or redo operation occurs in the editor. */
+	void OnPostUndoRedo();
+
+	/** Get all section names and display names for the objects currently selected in the view. */
+	TMap<FName, FText> GetAllSections() const;
+
+	/** Get the display name for the given section. */
+	FText GetSectionDisplayName(FName SectionName) const;
+
+	/** Rebuild the section selector widget after a selection has been changed. */
+	void RebuildSectionSelector();
+
+	/** Refilter the details view after the user has selected a new section. */
+	void OnSectionCheckedChanged(ECheckBoxState State, FName NewSelection);
+
+	/** Get the currently selected section. */
+	ECheckBoxState IsSectionChecked(FName Section) const;
+
+private:
+	/** The filter for objects viewed by this details panel */
+	TSharedPtr<FDetailsViewObjectFilter> ObjectFilter;
+
+	/** Information about the current set of selected actors */
+	//FSelectedActorInfo SelectedActorInfo;
+
+	/** Set of selected objects for this detail view that were passed in through SetObjects (before the object filter is applied). */
+	TArray<TWeakObjectPtr<UObject>> UnfilteredSelectedObjects;
+
+	/** Final set of selected objects for this detail view after applying the object filter. It may be different from the set passed in through SetObjects. */
+	TArray<TWeakObjectPtr<UObject>> SelectedObjects;
+
+	/** 
+	 * Selected actors for this detail view.  Note that this is not necessarily the same editor selected actor set.  If this detail view is locked
+	 * It will only contain actors from when it was locked 
+	 */
+	TArray< TWeakObjectPtr<AActor> > SelectedActors;
+	/** The root property nodes of the property tree for a specific set of UObjects */
+	TArray<TSharedPtr<FComplexPropertyNode>> RootPropertyNodes;
+	/** Callback to send when the property view changes */
+	FOnObjectArrayChanged OnObjectArrayChanged;
+	/** Customization instance used when there are multiple top level objects in this view */
+	TSharedPtr<IDetailRootObjectCustomization> RootObjectCustomization;
+	/** True if at least one viewed object is a CDO (blueprint editing) */
+	bool bViewingClassDefaultObject;
+	/** Delegate handle for unregistering from the PostUndoRedo event. */
+	FDelegateHandle PostUndoRedoDelegateHandle;
+	/** The section selector widget to show if DetailsViewArgs.bShowSectionSelector is true. */
+	TSharedPtr<SWrapBox> SectionSelectorBox;
+
+	TSharedPtr<SWrapBox> CustomWidgetsBox;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsViewBase.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsViewBase.cpp
new file mode 100644
index 0000000..4f8af13
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsViewBase.cpp
@@ -0,0 +1,1468 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SDetailsViewBase.h"
+
+#include "Classes/SodaStyleSettings.h"
+#include "Engine/Engine.h"
+#include "GameFramework/Actor.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+//#include "Settings/EditorExperimentalSettings.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h"
+#include "Widgets/Colors/SColorPicker.h"
+#include "Widgets/Input/SSearchBox.h"
+
+#include "RuntimePropertyEditor/CategoryPropertyNode.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilderImpl.h"
+#include "RuntimePropertyEditor/DetailLayoutHelpers.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+//#include "EditConditionParser.h"
+//#include "Editor.h"
+//#include "EditorConfigSubsystem.h"
+#include "RuntimePropertyEditor/IDetailCustomization.h"
+#include "ObjectEditorUtils.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+//#include "ScopedTransaction.h"
+#include "RuntimePropertyEditor/SDetailNameArea.h"
+#include "RuntimePropertyEditor/SDetailsView.h"
+#include "RuntimePropertyEditor/PropertyEditorPermissionList.h"
+#include "RuntimePropertyEditor/DetailsViewConfig2.h"
+
+//#include "ThumbnailRendering/ThumbnailManager.h"
+
+namespace soda
+{
+
+SDetailsViewBase::SDetailsViewBase() 
+	: bHasActiveFilter(false)
+	, bIsLocked(false)
+	, bHasOpenColorPicker(false)
+	, bDisableCustomDetailLayouts( false )
+	, NumVisibleTopLevelObjectNodes(0)
+	, bPendingCleanupTimerSet(false)
+{
+	UDetailsConfig2* DetailsConfig = GetMutableDefault<UDetailsConfig2>();
+	//DetailsConfig->LoadEditorConfig();
+
+	const FDetailsViewConfig2* ViewConfig = GetConstViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		CurrentFilter.bShowAllAdvanced = ViewConfig->bShowAllAdvanced;
+		CurrentFilter.bShowAllChildrenIfCategoryMatches = ViewConfig->bShowAllChildrenIfCategoryMatches;
+		CurrentFilter.bShowOnlyAnimated = ViewConfig->bShowOnlyAnimated;
+		CurrentFilter.bShowOnlyKeyable = ViewConfig->bShowOnlyKeyable;
+		CurrentFilter.bShowOnlyModified = ViewConfig->bShowOnlyModified;
+	}
+
+	PropertyPermissionListChangedDelegate = FPropertyEditorPermissionList::Get().PermissionListUpdatedDelegate.AddLambda([this](TSoftObjectPtr<UStruct> Struct, FName Owner) { ForceRefresh(); });
+	PropertyPermissionListEnabledDelegate = FPropertyEditorPermissionList::Get().PermissionListEnabledDelegate.AddRaw(this, &SDetailsViewBase::ForceRefresh);
+}
+
+SDetailsViewBase::~SDetailsViewBase()
+{
+	FPropertyEditorPermissionList::Get().PermissionListUpdatedDelegate.Remove(PropertyPermissionListChangedDelegate);
+	FPropertyEditorPermissionList::Get().PermissionListEnabledDelegate.Remove(PropertyPermissionListEnabledDelegate);
+}
+
+void SDetailsViewBase::OnGetChildrenForDetailTree(TSharedRef<FDetailTreeNode> InTreeNode, TArray< TSharedRef<FDetailTreeNode> >& OutChildren)
+{
+	InTreeNode->GetChildren(OutChildren);
+}
+
+TSharedRef<ITableRow> SDetailsViewBase::OnGenerateRowForDetailTree(TSharedRef<FDetailTreeNode> InTreeNode, const TSharedRef<STableViewBase>& OwnerTable)
+{
+	return InTreeNode->GenerateWidgetForTableView(OwnerTable, DetailsViewArgs.bAllowFavoriteSystem);
+}
+
+void SDetailsViewBase::SetRootExpansionStates(const bool bExpand, const bool bRecurse)
+{
+	if(ContainsMultipleTopLevelObjects())
+	{
+		FDetailNodeList Children;
+		for(auto Iter = RootTreeNodes.CreateIterator(); Iter; ++Iter)
+		{
+			Children.Reset();
+			(*Iter)->GetChildren(Children);
+
+			for(TSharedRef<class FDetailTreeNode>& Child : Children)
+			{
+				SetNodeExpansionState(Child, bExpand, bRecurse);
+			}
+		}
+	}
+	else
+	{
+		for(auto Iter = RootTreeNodes.CreateIterator(); Iter; ++Iter)
+		{
+			SetNodeExpansionState(*Iter, bExpand, bRecurse);
+		}
+	}
+}
+
+void SDetailsViewBase::SetNodeExpansionState(TSharedRef<FDetailTreeNode> InTreeNode, bool bIsItemExpanded, bool bRecursive)
+{
+	TArray< TSharedRef<FDetailTreeNode> > Children;
+	InTreeNode->GetChildren(Children);
+
+	if (Children.Num())
+	{
+		RequestItemExpanded(InTreeNode, bIsItemExpanded);
+		const bool bShouldSaveState = true;
+		InTreeNode->OnItemExpansionChanged(bIsItemExpanded, bShouldSaveState);
+
+		if (bRecursive)
+		{
+			for (int32 ChildIndex = 0; ChildIndex < Children.Num(); ++ChildIndex)
+			{
+				TSharedRef<FDetailTreeNode> Child = Children[ChildIndex];
+
+				SetNodeExpansionState(Child, bIsItemExpanded, bRecursive);
+			}
+		}
+	}
+}
+
+void SDetailsViewBase::SetNodeExpansionStateRecursive(TSharedRef<FDetailTreeNode> InTreeNode, bool bIsItemExpanded)
+{
+	SetNodeExpansionState(InTreeNode, bIsItemExpanded, true);
+}
+
+void SDetailsViewBase::OnItemExpansionChanged(TSharedRef<FDetailTreeNode> InTreeNode, bool bIsItemExpanded)
+{
+	SetNodeExpansionState(InTreeNode, bIsItemExpanded, false);
+}
+
+FReply SDetailsViewBase::OnLockButtonClicked()
+{
+	bIsLocked = !bIsLocked;
+	return FReply::Handled();
+}
+
+void SDetailsViewBase::HideFilterArea(bool bHide)
+{
+	DetailsViewArgs.bAllowSearch = !bHide;
+}
+
+static void GetPropertiesInOrderDisplayedRecursive(const TArray< TSharedRef<FDetailTreeNode> >& TreeNodes, TArray< FPropertyPath > &OutLeaves)
+{
+	for( const TSharedRef<FDetailTreeNode>& TreeNode : TreeNodes )
+	{
+		const bool bIsPropertyRoot = TreeNode->IsLeaf() ||
+			(	TreeNode->GetPropertyNode() && 
+				TreeNode->GetPropertyNode()->GetProperty() );
+		if( bIsPropertyRoot )
+		{
+			FPropertyPath Path = TreeNode->GetPropertyPath();
+			// Some leaf nodes are not associated with properties, specifically the collision presets.
+			// @todo doc: investigate what we can do about this, result is that for these fields
+			// we can't highlight the property in the diff tool.
+			if( Path.GetNumProperties() != 0 )
+			{
+				OutLeaves.Push(Path);
+			}
+		}
+		else
+		{
+			TArray< TSharedRef<FDetailTreeNode> > Children;
+			TreeNode->GetChildren(Children);
+			GetPropertiesInOrderDisplayedRecursive(Children, OutLeaves);
+		}
+	}
+}
+TArray< FPropertyPath > SDetailsViewBase::GetPropertiesInOrderDisplayed() const
+{
+	TArray< FPropertyPath > Ret;
+	GetPropertiesInOrderDisplayedRecursive(RootTreeNodes, Ret);
+	return Ret;
+}
+
+// @return populates OutNodes with the leaf node corresponding to property as the first entry in the list (e.g. [leaf, parent, grandparent]):
+static void FindTreeNodeFromPropertyRecursive( const TArray< TSharedRef<FDetailTreeNode> >& Nodes, const FPropertyPath& Property, TArray< TSharedPtr< FDetailTreeNode > >& OutNodes )
+{
+	if (Property == FPropertyPath())
+	{
+		return;
+	}
+
+	for (const TSharedRef<FDetailTreeNode>& TreeNode : Nodes)
+	{
+		if (TreeNode->IsLeaf())
+		{
+			FPropertyPath tmp = TreeNode->GetPropertyPath();
+			if( Property == tmp )
+			{
+				OutNodes.Push(TreeNode);
+				return;
+			}
+		}
+
+		// Need to check children even if we're a leaf, because all DetailItemNodes are leaves, even if they may have sub-children
+		TArray< TSharedRef<FDetailTreeNode> > Children;
+		TreeNode->GetChildren(Children);
+		FindTreeNodeFromPropertyRecursive(Children, Property, OutNodes);
+		if (OutNodes.Num() > 0)
+		{
+			OutNodes.Push(TreeNode);
+			return;
+		}
+	}
+}
+
+void SDetailsViewBase::HighlightProperty(const FPropertyPath& Property)
+{
+	TSharedPtr<FDetailTreeNode> PrevHighlightedNodePtr = CurrentlyHighlightedNode.Pin();
+	if (PrevHighlightedNodePtr.IsValid())
+	{
+		PrevHighlightedNodePtr->SetIsHighlighted(false);
+	}
+
+	TSharedPtr< FDetailTreeNode > FinalNodePtr = nullptr;
+	TArray< TSharedPtr< FDetailTreeNode > > TreeNodeChain;
+	FindTreeNodeFromPropertyRecursive(RootTreeNodes, Property, TreeNodeChain);
+	if (TreeNodeChain.Num() > 0)
+	{
+		FinalNodePtr = TreeNodeChain[0];
+		check(FinalNodePtr.IsValid());
+		FinalNodePtr->SetIsHighlighted(true);
+
+		for (int ParentIndex = 1; ParentIndex < TreeNodeChain.Num(); ++ParentIndex)
+		{
+			TSharedPtr< FDetailTreeNode > CurrentParent = TreeNodeChain[ParentIndex];
+			check(CurrentParent.IsValid());
+			DetailTree->SetItemExpansion(CurrentParent.ToSharedRef(), true);
+		}
+
+		DetailTree->RequestScrollIntoView(FinalNodePtr.ToSharedRef());
+	}
+	CurrentlyHighlightedNode = FinalNodePtr;
+}
+
+void SDetailsViewBase::ShowAllAdvancedProperties()
+{
+	CurrentFilter.bShowAllAdvanced = true;
+}
+
+void SDetailsViewBase::SetOnDisplayedPropertiesChanged(FOnDisplayedPropertiesChanged InOnDisplayedPropertiesChangedDelegate)
+{
+	OnDisplayedPropertiesChangedDelegate = InOnDisplayedPropertiesChangedDelegate;
+}
+
+void SDetailsViewBase::RerunCurrentFilter()
+{
+	UpdateFilteredDetails();
+}
+
+EVisibility SDetailsViewBase::GetTreeVisibility() const
+{
+	for(const FDetailLayoutData& Data : DetailLayouts)
+	{
+		if(Data.DetailLayout.IsValid() && Data.DetailLayout->HasDetails())
+		{
+			return EVisibility::Visible;
+		}
+	}
+
+	return EVisibility::Collapsed;
+}
+
+EVisibility SDetailsViewBase::GetScrollBarVisibility() const
+{
+	const bool bHasAnythingToShow = RootTreeNodes.Num() > 0;
+	const bool bShowScrollBar = DetailsViewArgs.bShowScrollBar && bHasAnythingToShow;
+	return bShowScrollBar ? EVisibility::Visible : EVisibility::Collapsed;
+}
+
+/** Returns the image used for the icon on the filter button */
+const FSlateBrush* SDetailsViewBase::OnGetFilterButtonImageResource() const
+{
+	if (HasActiveSearch())
+	{
+		return FSodaStyle::GetBrush(TEXT("PropertyWindow.FilterCancel"));
+	}
+	else
+	{
+		return FSodaStyle::GetBrush(TEXT("PropertyWindow.FilterSearch"));
+	}
+}
+
+void SDetailsViewBase::EnqueueDeferredAction(FSimpleDelegate& DeferredAction)
+{
+	DeferredActions.Add(DeferredAction);
+}
+
+/**
+* Creates the color picker window for this property view.
+*
+* @param Node				The slate property node to edit.
+* @param bUseAlpha			Whether or not alpha is supported
+*/
+void SDetailsViewBase::CreateColorPickerWindow(const TSharedRef< FPropertyEditor >& PropertyEditor, bool bUseAlpha)
+{
+	const FProperty* Property = PropertyEditor->GetProperty();
+	check(Property);
+
+	FReadAddressList ReadAddresses;
+	PropertyEditor->GetPropertyNode()->GetReadAddress(false, ReadAddresses, false);
+
+	TOptional<FLinearColor> DefaultColor;
+	bool bClampValue = false;
+	if (ReadAddresses.Num())
+	{
+		for (int32 ColorIndex = 0; ColorIndex < ReadAddresses.Num(); ++ColorIndex)
+		{
+			const uint8* Addr = ReadAddresses.GetAddress(ColorIndex);
+			if (Addr)
+			{
+				if (CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_Color)
+				{
+					DefaultColor = *reinterpret_cast<const FColor*>(Addr);
+					bClampValue = true;
+				}
+				else
+				{
+					check(CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_LinearColor);
+					DefaultColor = *reinterpret_cast<const FLinearColor*>(Addr);
+				}
+			}
+		}
+	}
+
+	if (DefaultColor.IsSet())
+	{
+		bHasOpenColorPicker = true;
+		ColorPropertyNode = PropertyEditor->GetPropertyNode();
+
+		TWeakPtr<IPropertyHandle> WeakPropertyHandle = PropertyEditor->GetPropertyHandle();
+		FColorPickerArgs PickerArgs = FColorPickerArgs(DefaultColor.GetValue(), FOnLinearColorValueChanged::CreateSP(this, &SDetailsViewBase::SetColorPropertyFromColorPicker));
+		PickerArgs.ParentWidget = AsShared();
+		PickerArgs.bUseAlpha = bUseAlpha;
+		PickerArgs.bClampValue = bClampValue;
+		PickerArgs.DisplayGamma = TAttribute<float>::Create(TAttribute<float>::FGetter::CreateUObject(GEngine, &UEngine::GetDisplayGamma));
+		PickerArgs.OnColorPickerWindowClosed = FOnWindowClosed::CreateSP(this, &SDetailsViewBase::OnColorPickerWindowClosed);
+		PickerArgs.OptionalOwningDetailsView = AsShared();
+		OpenColorPicker(PickerArgs);
+	}
+}
+
+void SDetailsViewBase::SetColorPropertyFromColorPicker(FLinearColor NewColor)
+{
+	const TSharedPtr< FPropertyNode > PinnedColorPropertyNode = ColorPropertyNode.Pin();
+	if (ensure(PinnedColorPropertyNode.IsValid()))
+	{
+		FProperty* Property = PinnedColorPropertyNode->GetProperty();
+		check(Property);
+
+		FObjectPropertyNode* ObjectNode = PinnedColorPropertyNode->FindObjectItemParent();
+
+		if (ObjectNode && ObjectNode->GetNumObjects())
+		{
+			//FScopedTransaction Transaction(NSLOCTEXT("UnrealEd", "SetColorProperty", "Set Color Property"));
+
+			PinnedColorPropertyNode->NotifyPreChange(Property, GetNotifyHook());
+
+			FPropertyChangedEvent ChangeEvent(Property, EPropertyChangeType::ValueSet);
+			PinnedColorPropertyNode->NotifyPostChange(ChangeEvent, GetNotifyHook());
+		}
+	}
+}
+
+
+void SDetailsViewBase::UpdatePropertyMaps()
+{
+	RootTreeNodes.Empty();
+
+	for(FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		// Check uniqueness.  It is critical that detail layouts can be destroyed
+		// We need to be able to create a new detail layout and properly clean up the old one in the process
+		check(!LayoutData.DetailLayout.IsValid() || LayoutData.DetailLayout.IsUnique());
+
+		// Allow customizations to perform cleanup as the delete occurs later on
+		for (TSharedPtr<IDetailCustomization>& DetailCustomization : LayoutData.CustomizationClassInstances)
+		{
+			if (DetailCustomization.IsValid())
+			{
+				DetailCustomization->PendingDelete();
+			}
+		}
+
+		// All the current customization instances need to be deleted when it is safe
+		CustomizationClassInstancesPendingDelete.Append(LayoutData.CustomizationClassInstances);
+
+		// All the current detail layouts need to be deleted when it is safe
+		DetailLayoutsPendingDelete.Add(LayoutData.DetailLayout);
+	}
+
+	if (DetailLayouts.Num() > 0)
+	{
+		// Set timer to free memory even when widget is not visible or ticking
+		SetPendingCleanupTimer();
+	}
+
+	FRootPropertyNodeList& RootPropertyNodes = GetRootNodes();
+	
+	DetailLayouts.Empty(RootPropertyNodes.Num());
+
+	// There should be one detail layout for each root node
+	DetailLayouts.AddDefaulted(RootPropertyNodes.Num());
+
+	for(int32 RootNodeIndex = 0; RootNodeIndex < RootPropertyNodes.Num(); ++RootNodeIndex)
+	{
+		FDetailLayoutData& LayoutData = DetailLayouts[RootNodeIndex];
+		UpdateSinglePropertyMap(RootPropertyNodes[RootNodeIndex], LayoutData, false);
+	}
+}
+
+void SDetailsViewBase::UpdateSinglePropertyMap(TSharedPtr<FComplexPropertyNode> InRootPropertyNode, FDetailLayoutData& LayoutData, bool bIsExternal)
+{
+	// Reset everything
+	LayoutData.ClassToPropertyMap.Empty();
+
+	TSharedPtr<FDetailLayoutBuilderImpl> DetailLayout = MakeShareable(new FDetailLayoutBuilderImpl(InRootPropertyNode, LayoutData.ClassToPropertyMap, PropertyUtilities.ToSharedRef(), PropertyGenerationUtilities.ToSharedRef(), SharedThis(this), bIsExternal));
+	LayoutData.DetailLayout = DetailLayout;
+
+	TSharedPtr<FComplexPropertyNode> RootPropertyNode = InRootPropertyNode;
+	check(RootPropertyNode.IsValid());
+
+	const bool bEnableFavoriteSystem = IsEngineExitRequested() ? false : DetailsViewArgs.bAllowFavoriteSystem;
+
+	DetailLayoutHelpers::FUpdatePropertyMapArgs Args;
+
+	Args.LayoutData = &LayoutData;
+	Args.InstancedPropertyTypeToDetailLayoutMap = &InstancedTypeToLayoutMap;
+	Args.IsPropertyReadOnly = [this](const FPropertyAndParent& PropertyAndParent) { return IsPropertyReadOnly(PropertyAndParent); };
+	Args.IsPropertyVisible = [this](const FPropertyAndParent& PropertyAndParent) { return IsPropertyVisible(PropertyAndParent); };
+	Args.bEnableFavoriteSystem = bEnableFavoriteSystem;
+	Args.bUpdateFavoriteSystemOnly = false;
+	DetailLayoutHelpers::UpdateSinglePropertyMapRecursive(*RootPropertyNode, NAME_None, RootPropertyNode.Get(), Args);
+
+	CustomUpdatePropertyMap(LayoutData.DetailLayout);
+
+	// Ask for custom detail layouts, unless disabled. One reason for disabling custom layouts is that the custom layouts
+	// inhibit our ability to find a single property's tree node. This is problematic for the diff and merge tools, that need
+	// to display and highlight each changed property for the user. We could allow 'known good' customizations here if 
+	// we can make them work with the diff/merge tools.
+	if (!bDisableCustomDetailLayouts)
+	{
+		DetailLayoutHelpers::QueryCustomDetailLayout(LayoutData, InstancedClassToDetailLayoutMap, GenericLayoutDelegate);
+	}
+
+	if (bEnableFavoriteSystem && InRootPropertyNode->GetInstancesNum() > 0)
+	{
+		static const FName FavoritesCategoryName("Favorites");
+		FDetailCategoryImpl& FavoritesCategory = LayoutData.DetailLayout->DefaultCategory(FavoritesCategoryName);
+		FavoritesCategory.SetSortOrder(0);
+		FavoritesCategory.SetCategoryAsSpecialFavorite();
+
+		if (FavoritesCategory.GetNumCustomizations() == 0)
+		{
+			FavoritesCategory.AddCustomRow(NSLOCTEXT("DetailLayoutHelpers", "Favorites", "Favorites"))
+				.WholeRowContent()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(STextBlock)
+					.Text(NSLOCTEXT("DetailLayoutHelpers", "AddToFavoritesDescription", "Right-click on a property to add it to your Favorites."))
+					.TextStyle(FAppStyle::Get(), "HintText")
+				];
+		}
+	}
+
+	LayoutData.DetailLayout->GenerateDetailLayout();
+}
+
+void SDetailsViewBase::OnColorPickerWindowClosed(const TSharedRef<SWindow>& Window)
+{
+	const TSharedPtr< FPropertyNode > PinnedColorPropertyNode = ColorPropertyNode.Pin();
+	if (ensure(PinnedColorPropertyNode.IsValid()))
+	{
+		FProperty* Property = PinnedColorPropertyNode->GetProperty();
+		if (Property && PropertyUtilities.IsValid())
+		{
+			FPropertyChangedEvent ChangeEvent(Property, EPropertyChangeType::ArrayAdd);
+			PinnedColorPropertyNode->FixPropertiesInEvent(ChangeEvent);
+			PropertyUtilities->NotifyFinishedChangingProperties(ChangeEvent);
+		}
+	}
+
+	// A color picker window is no longer open
+	bHasOpenColorPicker = false;
+	ColorPropertyNode.Reset();
+}
+
+void SDetailsViewBase::SetIsPropertyVisibleDelegate(FIsPropertyVisible InIsPropertyVisible)
+{
+	IsPropertyVisibleDelegate = InIsPropertyVisible;
+}
+
+void SDetailsViewBase::SetIsPropertyReadOnlyDelegate(FIsPropertyReadOnly InIsPropertyReadOnly)
+{
+	IsPropertyReadOnlyDelegate = InIsPropertyReadOnly;
+}
+
+void SDetailsViewBase::SetIsCustomRowVisibleDelegate(FIsCustomRowVisible InIsCustomRowVisible)
+{
+	IsCustomRowVisibleDelegate = InIsCustomRowVisible;
+}
+
+void SDetailsViewBase::SetIsCustomRowReadOnlyDelegate(FIsCustomRowReadOnly InIsCustomRowReadOnly)
+{
+	IsCustomRowReadOnlyDelegate = InIsCustomRowReadOnly;
+}
+
+void SDetailsViewBase::SetIsPropertyEditingEnabledDelegate(FIsPropertyEditingEnabled IsPropertyEditingEnabled)
+{
+	IsPropertyEditingEnabledDelegate = IsPropertyEditingEnabled;
+}
+
+bool SDetailsViewBase::IsPropertyEditingEnabled() const
+{
+	// If the delegate is not bound assume property editing is enabled, otherwise ask the delegate
+	return !IsPropertyEditingEnabledDelegate.IsBound() || IsPropertyEditingEnabledDelegate.Execute();
+}
+
+void SDetailsViewBase::SetKeyframeHandler( TSharedPtr<class IDetailKeyframeHandler> InKeyframeHandler )
+{
+	// if we don't have a keyframe handler and a valid handler is set, add width to the right column
+	// if we do have a keyframe handler and an invalid handler is set, remove width
+	float ExtraWidth = 0;
+	if (!KeyframeHandler.IsValid() && InKeyframeHandler.IsValid())
+	{
+		ExtraWidth = 22;
+	}
+	else if (KeyframeHandler.IsValid() && !InKeyframeHandler.IsValid())
+	{
+		ExtraWidth = -22;
+	}
+	
+	const float NewWidth = ColumnSizeData.GetRightColumnMinWidth() + ExtraWidth;
+	ColumnSizeData.SetRightColumnMinWidth(NewWidth);
+
+	KeyframeHandler = InKeyframeHandler;
+	RefreshTree();
+}
+
+void SDetailsViewBase::SetExtensionHandler(TSharedPtr<class IDetailPropertyExtensionHandler> InExtensionHandler)
+{
+	ExtensionHandler = InExtensionHandler;
+}
+
+void SDetailsViewBase::SetGenericLayoutDetailsDelegate(FOnGetDetailCustomizationInstance OnGetGenericDetails)
+{
+	GenericLayoutDelegate = OnGetGenericDetails;
+}
+
+void SDetailsViewBase::RefreshRootObjectVisibility()
+{
+	RerunCurrentFilter();
+}
+/*
+TSharedPtr<FAssetThumbnailPool> SDetailsViewBase::GetThumbnailPool() const
+{
+	return UThumbnailManager::Get().GetSharedThumbnailPool();
+}
+*/
+
+const TArray<TSharedRef<IClassViewerFilter>>& SDetailsViewBase::GetClassViewerFilters() const
+{
+	return ClassViewerFilters;
+}
+
+void SDetailsViewBase::NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent)
+{
+	OnFinishedChangingPropertiesDelegate.Broadcast(PropertyChangedEvent);
+}
+
+void SDetailsViewBase::RequestItemExpanded(TSharedRef<FDetailTreeNode> TreeNode, bool bExpand)
+{
+	FilteredNodesRequestingExpansionState.Add(TreeNode, bExpand);
+}
+
+void SDetailsViewBase::RefreshTree()
+{
+	if (OnDisplayedPropertiesChangedDelegate.IsBound())
+	{
+		OnDisplayedPropertiesChangedDelegate.Execute();
+	}
+
+	DetailTree->RequestTreeRefresh();
+}
+
+void SDetailsViewBase::SaveCustomExpansionState(const FString& NodePath, bool bIsExpanded)
+{
+	if (bIsExpanded)
+	{
+		ExpandedDetailNodes.Add(NodePath);
+	}
+	else
+	{
+		ExpandedDetailNodes.Remove(NodePath);
+	}
+}
+
+bool SDetailsViewBase::GetCustomSavedExpansionState(const FString& NodePath) const
+{
+	return ExpandedDetailNodes.Contains(NodePath);
+}
+
+bool SDetailsViewBase::IsPropertyVisible( const FPropertyAndParent& PropertyAndParent ) const
+{
+	return IsPropertyVisibleDelegate.IsBound() ? IsPropertyVisibleDelegate.Execute(PropertyAndParent) : true;
+}
+
+bool SDetailsViewBase::IsPropertyReadOnly( const FPropertyAndParent& PropertyAndParent ) const
+{
+	return IsPropertyReadOnlyDelegate.IsBound() ? IsPropertyReadOnlyDelegate.Execute(PropertyAndParent) : false;
+}
+
+bool SDetailsViewBase::IsCustomRowVisible(FName InRowName, FName InParentName) const
+{
+	return IsCustomRowVisibleDelegate.IsBound() ? IsCustomRowVisibleDelegate.Execute(InRowName, InParentName) : true;
+}
+
+bool SDetailsViewBase::IsCustomRowReadOnly(FName InRowName, FName InParentName) const
+{
+	return IsCustomRowReadOnlyDelegate.IsBound() ? IsCustomRowReadOnlyDelegate.Execute(InRowName, InParentName) : false;
+}
+
+TSharedPtr<IPropertyUtilities> SDetailsViewBase::GetPropertyUtilities()
+{
+	return PropertyUtilities;
+}
+
+const FDetailsViewConfig2* SDetailsViewBase::GetConstViewConfig() const 
+{
+	if (DetailsViewArgs.ViewIdentifier.IsNone())
+	{
+		return nullptr;
+	}
+
+	const UDetailsConfig2* DetailsConfig = GetDefault<UDetailsConfig2>();
+	return DetailsConfig->Views.Find(DetailsViewArgs.ViewIdentifier);
+}
+
+FDetailsViewConfig2* SDetailsViewBase::GetMutableViewConfig()
+{ 
+	if (DetailsViewArgs.ViewIdentifier.IsNone())
+	{
+		return nullptr;
+	}
+
+	UDetailsConfig2* DetailsConfig = GetMutableDefault<UDetailsConfig2>();
+	return &DetailsConfig->Views.FindOrAdd(DetailsViewArgs.ViewIdentifier);
+}
+
+void SDetailsViewBase::SaveViewConfig()
+{
+	//GetMutableDefault<UDetailsConfig2>()->SaveEditorConfig();
+}
+
+void SDetailsViewBase::OnShowOnlyModifiedClicked()
+{
+	CurrentFilter.bShowOnlyModified = !CurrentFilter.bShowOnlyModified;
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowOnlyModified = CurrentFilter.bShowOnlyModified;
+		SaveViewConfig();
+	}
+
+	UpdateFilteredDetails();
+}
+
+void SDetailsViewBase::OnCustomFilterClicked()
+{
+	if (CustomFilterDelegate.IsBound())
+	{
+		CustomFilterDelegate.Execute();
+		bCustomFilterActive = !bCustomFilterActive;
+	}
+}
+
+void SDetailsViewBase::OnShowAllAdvancedClicked()
+{
+	CurrentFilter.bShowAllAdvanced = !CurrentFilter.bShowAllAdvanced;
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowAllAdvanced = CurrentFilter.bShowAllAdvanced;
+		SaveViewConfig();
+	}
+
+	UpdateFilteredDetails();
+}
+
+void SDetailsViewBase::OnShowOnlyAllowedClicked()
+{
+	CurrentFilter.bShowOnlyAllowed = !CurrentFilter.bShowOnlyAllowed;
+
+	UpdateFilteredDetails();
+}
+
+void SDetailsViewBase::OnShowAllChildrenIfCategoryMatchesClicked()
+{
+	CurrentFilter.bShowAllChildrenIfCategoryMatches = !CurrentFilter.bShowAllChildrenIfCategoryMatches;
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowAllChildrenIfCategoryMatches = CurrentFilter.bShowAllChildrenIfCategoryMatches;
+		SaveViewConfig();
+	}
+
+	UpdateFilteredDetails();
+}
+
+void SDetailsViewBase::OnShowKeyableClicked()
+{
+	CurrentFilter.bShowOnlyKeyable = !CurrentFilter.bShowOnlyKeyable;
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowOnlyKeyable = CurrentFilter.bShowOnlyKeyable;
+		SaveViewConfig();
+	}
+	UpdateFilteredDetails();
+}
+
+void SDetailsViewBase::OnShowAnimatedClicked()
+{
+	CurrentFilter.bShowOnlyAnimated = !CurrentFilter.bShowOnlyAnimated;
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig != nullptr)
+	{
+		ViewConfig->bShowOnlyAnimated = CurrentFilter.bShowOnlyAnimated;
+		SaveViewConfig();
+	}
+
+	UpdateFilteredDetails();
+}
+
+/** Called when the filter text changes.  This filters specific property nodes out of view */
+void SDetailsViewBase::OnFilterTextChanged(const FText& InFilterText)
+{
+	FilterView(InFilterText.ToString());
+}
+
+void SDetailsViewBase::OnFilterTextCommitted(const FText& InSearchText, ETextCommit::Type InCommitType)
+{
+	if (InCommitType == ETextCommit::OnCleared)
+	{
+		SearchBox->SetText(FText::GetEmpty());
+		OnFilterTextChanged(FText::GetEmpty());
+		FSlateApplication::Get().ClearKeyboardFocus(EFocusCause::Cleared);
+	}
+}
+
+TSharedPtr<SWidget> SDetailsViewBase::GetNameAreaWidget()
+{
+	return DetailsViewArgs.bCustomNameAreaLocation ? NameArea : nullptr;
+}
+
+void SDetailsViewBase::SetNameAreaCustomContent( TSharedRef<SWidget>& InCustomContent )
+{
+	NameArea->SetCustomContent(InCustomContent);	
+}
+
+TSharedPtr<SWidget> SDetailsViewBase::GetFilterAreaWidget()
+{
+	return DetailsViewArgs.bCustomFilterAreaLocation ? FilterRow : nullptr;
+}
+
+TSharedPtr<FUICommandList> SDetailsViewBase::GetHostCommandList() const
+{
+	return DetailsViewArgs.HostCommandList;
+}
+
+TSharedPtr<FTabManager> SDetailsViewBase::GetHostTabManager() const
+{
+	return DetailsViewArgs.HostTabManager;
+}
+
+void SDetailsViewBase::SetHostTabManager(TSharedPtr<FTabManager> InTabManager)
+{
+	DetailsViewArgs.HostTabManager = InTabManager;
+}
+
+/** 
+ * Hides or shows properties based on the passed in filter text
+ * 
+ * @param InFilter The filter text
+ */
+void SDetailsViewBase::FilterView(const FString& InFilter)
+{
+	bool bHadActiveFilter = CurrentFilter.FilterStrings.Num() > 0;
+
+	TArray<FString> CurrentFilterStrings;
+
+	FString ParseString = InFilter;
+	// Remove whitespace from the front and back of the string
+	ParseString.TrimStartAndEndInline();
+	ParseString.ParseIntoArray(CurrentFilterStrings, TEXT(" "), true);
+
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
+	bHasActiveFilter = CurrentFilterStrings.Num() > 0;
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
+	
+	CurrentFilter.FilterStrings = CurrentFilterStrings;
+
+	if (!bHadActiveFilter && CurrentFilter.FilterStrings.Num() > 0)
+	{
+		SavePreSearchExpandedItems();
+	}
+
+	UpdateFilteredDetails();
+	
+	if (bHadActiveFilter && CurrentFilter.FilterStrings.Num() == 0)
+	{
+		RestorePreSearchExpandedItems();
+	}
+}
+
+EVisibility SDetailsViewBase::GetFilterBoxVisibility() const
+{
+	EVisibility Result = EVisibility::Collapsed;
+	// Visible if we allow search and we have anything to search otherwise collapsed so it doesn't take up room	
+	if (DetailsViewArgs.bAllowSearch && IsConnected())
+	{
+		if (RootTreeNodes.Num() > 0 || HasActiveSearch() || !CurrentFilter.IsEmptyFilter())
+		{
+			Result = EVisibility::Visible;
+		}
+	}
+
+	return Result;
+}
+
+bool SDetailsViewBase::SupportsKeyboardFocus() const
+{
+	return DetailsViewArgs.bSearchInitialKeyFocus && SearchBox->SupportsKeyboardFocus() && GetFilterBoxVisibility() == EVisibility::Visible;
+}
+
+FReply SDetailsViewBase::OnFocusReceived(const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent)
+{
+	FReply Reply = FReply::Handled();
+
+	if (InFocusEvent.GetCause() != EFocusCause::Cleared)
+	{
+		Reply.SetUserFocus(SearchBox.ToSharedRef(), InFocusEvent.GetCause());
+	}
+
+	return Reply;
+}
+
+void SDetailsViewBase::SetPendingCleanupTimer()
+{
+	/*
+	if (!bPendingCleanupTimerSet)
+	{
+		if (GEditor && GEditor->IsTimerManagerValid())
+		{
+			bPendingCleanupTimerSet = true;
+			GEditor->GetTimerManager()->SetTimerForNextTick(FTimerDelegate::CreateSP(this, &SDetailsViewBase::HandlePendingCleanupTimer));
+		}
+	}
+	*/
+}
+
+void SDetailsViewBase::HandlePendingCleanupTimer()
+{
+	bPendingCleanupTimerSet = false;
+
+	HandlePendingCleanup();
+
+	for (auto It = FilteredNodesRequestingExpansionState.CreateIterator(); It; ++It)
+	{
+		if (!It->Key.IsValid())
+		{
+			It.RemoveCurrent();
+		}
+	}
+}
+
+void SDetailsViewBase::HandlePendingCleanup()
+{
+	for (int32 i = 0; i < CustomizationClassInstancesPendingDelete.Num(); ++i)
+	{
+		ensure(CustomizationClassInstancesPendingDelete[i].IsUnique());
+	}
+
+	// Release any pending kill nodes.
+	for ( TSharedPtr<FComplexPropertyNode>& PendingKillNode : RootNodesPendingKill )
+	{
+		if ( PendingKillNode.IsValid() )
+		{
+			PendingKillNode->Disconnect();
+			PendingKillNode.Reset();
+		}
+	}
+	RootNodesPendingKill.Empty();
+
+	// Empty all the customization instances that need to be deleted
+	CustomizationClassInstancesPendingDelete.Empty();
+
+	// Empty all the detail layouts that need to be deleted
+	DetailLayoutsPendingDelete.Empty();
+}
+
+/** Ticks the property view.  This function performs a data consistency check */
+void SDetailsViewBase::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	HandlePendingCleanup();
+
+	FDetailsViewConfig2* ViewConfig = GetMutableViewConfig();
+	if (ViewConfig && ViewConfig->ValueColumnWidth != ColumnSizeData.ValueColumnWidth.Get(0))
+	{
+		ViewConfig->ValueColumnWidth = ColumnSizeData.ValueColumnWidth.Get(0);
+		SaveViewConfig();
+	}
+
+	FRootPropertyNodeList& RootPropertyNodes = GetRootNodes();
+
+	bool bHadDeferredActions = DeferredActions.Num() > 0;
+	auto PreProcessRootNode = [bHadDeferredActions, this](TSharedPtr<FComplexPropertyNode> RootPropertyNode) 
+	{
+		check(RootPropertyNode.IsValid());
+
+		// Purge any objects that are marked pending kill from the object list
+		if (FObjectPropertyNode* ObjectRoot = RootPropertyNode->AsObjectNode())
+		{
+			ObjectRoot->PurgeKilledObjects();
+		}
+
+		if (bHadDeferredActions)
+		{		
+			// Any deferred actions are likely to cause the node tree to be at least partially rebuilt
+			// Save the expansion state of existing nodes so we can expand them later
+			SaveExpandedItems(RootPropertyNode.ToSharedRef());
+		}
+	};
+
+	for (TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		PreProcessRootNode(RootPropertyNode);
+	}
+
+	for (FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		FRootPropertyNodeList& ExternalRootPropertyNodes = LayoutData.DetailLayout->GetExternalRootPropertyNodes();
+		for (TSharedPtr<FComplexPropertyNode>& ExternalRootPropertyNode : ExternalRootPropertyNodes)
+		{
+			PreProcessRootNode(ExternalRootPropertyNode);
+		}
+	}
+
+	if (bHadDeferredActions)
+	{
+		TArray<FSimpleDelegate> DeferredActionsCopy;
+		
+		do
+		{
+			// Execute any deferred actions
+			DeferredActionsCopy = MoveTemp(DeferredActions);
+			DeferredActions.Reset();
+
+			// Execute any deferred actions
+			for (const FSimpleDelegate& DeferredAction : DeferredActionsCopy)
+			{
+				DeferredAction.ExecuteIfBound();
+			}
+		} while (DeferredActions.Num() > 0);
+
+		RestoreAllExpandedItems();
+	}
+
+	TSharedPtr<FComplexPropertyNode> LastRootPendingKill;
+	if (RootNodesPendingKill.Num() > 0 )
+	{
+		LastRootPendingKill = RootNodesPendingKill.Last();
+	}
+
+	bool bValidateExternalNodes = true;
+
+	int32 FoundIndex = RootPropertyNodes.Find(LastRootPendingKill);
+	bool bUpdateFilteredDetails = false;
+	if (FoundIndex != INDEX_NONE)
+	{ 
+		// Reacquire the root property nodes.  It may have been changed by the deferred actions if something like a blueprint editor forcefully resets a details panel during a posteditchange
+		ForceRefresh();
+
+		// All objects are being reset, no need to validate external nodes
+		bValidateExternalNodes = false;
+	}
+	else
+	{
+		if (CustomValidatePropertyNodesFunction.IsBound())
+		{
+			bool bIsValid = CustomValidatePropertyNodesFunction.Execute(RootPropertyNodes);
+		}
+		else // standard validation behavior
+		{
+			for (TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+			{
+				EPropertyDataValidationResult Result = RootPropertyNode->EnsureDataIsValid();
+				if (Result == EPropertyDataValidationResult::PropertiesChanged || Result == EPropertyDataValidationResult::EditInlineNewValueChanged)
+				{
+					UpdatePropertyMaps();
+					bUpdateFilteredDetails = true;
+				}
+				else if (Result == EPropertyDataValidationResult::ArraySizeChanged || Result == EPropertyDataValidationResult::ChildrenRebuilt)
+				{
+					bUpdateFilteredDetails = true;
+				}
+				else if (Result == EPropertyDataValidationResult::ObjectInvalid)
+				{
+					bValidateExternalNodes = false;
+
+					ForceRefresh();
+					break;
+				}
+			}
+		}
+	}
+
+	if (bValidateExternalNodes)
+	{
+		for (FDetailLayoutData& LayoutData : DetailLayouts)
+		{
+			FRootPropertyNodeList& ExternalRootPropertyNodes = LayoutData.DetailLayout->GetExternalRootPropertyNodes();
+
+			for (int32 NodeIndex = 0; NodeIndex < ExternalRootPropertyNodes.Num(); ++NodeIndex)
+			{
+				TSharedPtr<FPropertyNode> PropertyNode = ExternalRootPropertyNodes[NodeIndex];
+				{
+					EPropertyDataValidationResult Result = PropertyNode->EnsureDataIsValid();
+					if (Result == EPropertyDataValidationResult::PropertiesChanged || Result == EPropertyDataValidationResult::EditInlineNewValueChanged)
+					{
+						// Note this will invalidate all the external root nodes so there is no need to continue
+						ExternalRootPropertyNodes.Empty();
+
+						UpdatePropertyMaps();
+						bUpdateFilteredDetails = true;
+
+						break;
+					}
+					else if (Result == EPropertyDataValidationResult::ArraySizeChanged || Result == EPropertyDataValidationResult::ChildrenRebuilt)
+					{
+						bUpdateFilteredDetails = true;
+					}
+				}
+			}
+		}
+	}
+
+	if (bUpdateFilteredDetails)
+	{
+		UpdateFilteredDetails();
+
+		RestoreAllExpandedItems();
+	}
+
+	for(FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		if(LayoutData.DetailLayout.IsValid())
+		{
+			LayoutData.DetailLayout->Tick(InDeltaTime);
+		}
+	}
+
+	if (!ColorPropertyNode.IsValid() && bHasOpenColorPicker)
+	{
+		// Destroy the color picker window if the color property node has become invalid
+		//DestroyColorPicker();
+		bHasOpenColorPicker = false;
+	}
+
+	if (FilteredNodesRequestingExpansionState.Num() > 0)
+	{
+		// change expansion state on the nodes that request it
+		for (TMap<TWeakPtr<FDetailTreeNode>, bool>::TConstIterator It(FilteredNodesRequestingExpansionState); It; ++It)
+		{
+			TSharedPtr<FDetailTreeNode> DetailTreeNode = It.Key().Pin();
+			if (DetailTreeNode.IsValid())
+			{
+				DetailTree->SetItemExpansion(DetailTreeNode.ToSharedRef(), It.Value());
+			}
+		}
+
+		FilteredNodesRequestingExpansionState.Empty();
+	}
+}
+
+/**
+* Recursively gets expanded items for a node
+*
+* @param InPropertyNode			The node to get expanded items from
+* @param OutExpandedItems	List of expanded items that were found
+*/
+static void GetExpandedItems(TSharedPtr<FPropertyNode> InPropertyNode, TSet<FString>& OutExpandedItems)
+{
+	if (InPropertyNode->HasNodeFlags(EPropertyNodeFlags::Expanded))
+	{
+		const bool bWithArrayIndex = true;
+		FString Path;
+		Path.Empty(128);
+		InPropertyNode->GetQualifiedName(Path, bWithArrayIndex);
+
+		OutExpandedItems.Add(Path);
+	}
+
+	for (int32 ChildIndex = 0; ChildIndex < InPropertyNode->GetNumChildNodes(); ++ChildIndex)
+	{
+		GetExpandedItems(InPropertyNode->GetChildNode(ChildIndex), OutExpandedItems);
+	}
+}
+
+/**
+* Recursively sets expanded items for a node
+*
+* @param InNode			The node to set expanded items on
+* @param OutExpandedItems	List of expanded items to set
+*/
+static void SetExpandedItems(TSharedPtr<FPropertyNode> InPropertyNode, const TSet<FString>& InExpandedItems, bool bCollapseRest)
+{
+	const bool bWithArrayIndex = true;
+	FString Path;
+	Path.Empty(128);
+	InPropertyNode->GetQualifiedName(Path, bWithArrayIndex);
+
+	if (InExpandedItems.Contains(Path))
+	{
+		InPropertyNode->SetNodeFlags(EPropertyNodeFlags::Expanded, true);
+	}
+	else if (bCollapseRest)
+	{
+		InPropertyNode->SetNodeFlags(EPropertyNodeFlags::Expanded, false);
+	}
+
+	for (int32 NodeIndex = 0; NodeIndex < InPropertyNode->GetNumChildNodes(); ++NodeIndex)
+	{
+		SetExpandedItems(InPropertyNode->GetChildNode(NodeIndex), InExpandedItems, bCollapseRest);
+	}
+}
+
+void SDetailsViewBase::SavePreSearchExpandedItems()
+{
+	PreSearchExpandedItems.Reset();
+
+	FRootPropertyNodeList& RootPropertyNodes = GetRootNodes();
+
+	for (TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		GetExpandedItems(RootPropertyNode.ToSharedRef(), PreSearchExpandedItems);
+	}
+
+	for (FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		FRootPropertyNodeList& ExternalRootPropertyNodes = LayoutData.DetailLayout->GetExternalRootPropertyNodes();
+		for (TSharedPtr<FComplexPropertyNode>& ExternalRootPropertyNode : ExternalRootPropertyNodes)
+		{
+			GetExpandedItems(ExternalRootPropertyNode.ToSharedRef(), PreSearchExpandedItems);
+		}
+	}
+
+	PreSearchExpandedCategories.Reset();
+
+	for (const TSharedRef<FDetailTreeNode>& RootNode : RootTreeNodes)
+	{
+		if (RootNode->GetNodeType() == EDetailNodeType::Category)
+		{
+			FDetailCategoryImpl& Category = (FDetailCategoryImpl&) RootNode.Get();
+			if (Category.ShouldBeExpanded())
+			{
+				PreSearchExpandedCategories.Add(Category.GetCategoryPathName());
+			}
+		}
+	}
+}
+
+void SDetailsViewBase::RestorePreSearchExpandedItems()
+{
+	FRootPropertyNodeList& RootPropertyNodes = GetRootNodes();
+
+	for (TSharedPtr<FComplexPropertyNode>& RootPropertyNode : RootPropertyNodes)
+	{
+		SetExpandedItems(RootPropertyNode, PreSearchExpandedItems, true);
+	}
+
+	for (FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		FRootPropertyNodeList& ExternalRootPropertyNodes = LayoutData.DetailLayout->GetExternalRootPropertyNodes();
+		for (TSharedPtr<FComplexPropertyNode>& ExternalRootPropertyNode : ExternalRootPropertyNodes)
+		{
+			SetExpandedItems(ExternalRootPropertyNode, PreSearchExpandedItems, true);
+		}
+	}
+
+	PreSearchExpandedItems.Reset();
+
+	for (const TSharedRef<FDetailTreeNode>& RootNode : RootTreeNodes)
+	{
+		if (RootNode->GetNodeType() == EDetailNodeType::Category)
+		{
+			FDetailCategoryImpl& Category = (FDetailCategoryImpl&) RootNode.Get();
+			
+			bool bShouldBeExpanded = PreSearchExpandedCategories.Contains(Category.GetCategoryPathName());
+			RequestItemExpanded(RootNode, bShouldBeExpanded);
+		}
+	}
+
+	PreSearchExpandedCategories.Reset();
+}
+
+void SDetailsViewBase::SaveExpandedItems(TSharedRef<FPropertyNode> StartNode)
+{
+	UStruct* BestBaseStruct = StartNode->FindComplexParent()->GetBaseStructure();
+
+	TSet<FString> ExpandedPropertyItemSet;
+	GetExpandedItems(StartNode, ExpandedPropertyItemSet);
+
+	TArray<FString> ExpandedPropertyItems = ExpandedPropertyItemSet.Array();
+
+	// Handle spaces in expanded node names by wrapping them in quotes
+	for (FString& String : ExpandedPropertyItems)
+	{
+		String.InsertAt(0, '"');
+		String.AppendChar('"');
+	}
+
+	TArray<FString> ExpandedCustomItems = ExpandedDetailNodes.Array();
+
+	// Expanded custom items may have spaces but SetSingleLineArray doesn't support spaces (treats it as another element in the array)
+	// Append a '|' after each element instead
+	FString ExpandedCustomItemsString;
+	for (const FString& DetailNode : ExpandedDetailNodes)
+	{
+		ExpandedCustomItemsString += DetailNode;
+		ExpandedCustomItemsString += TEXT(",");
+	}
+
+	//while a valid class, and we're either the same as the base class (for multiple actors being selected and base class is AActor) OR we're not down to AActor yet)
+	for (UStruct* Struct = BestBaseStruct; Struct && ((BestBaseStruct == Struct) || (Struct != AActor::StaticClass())); Struct = Struct->GetSuperStruct())
+	{
+		if (StartNode->GetNumChildNodes() > 0)
+		{
+			bool bShouldSave = ExpandedPropertyItems.Num() > 0;
+			if (!bShouldSave)
+			{
+				TArray<FString> DummyExpandedPropertyItems;
+				GConfig->GetSingleLineArray(TEXT("DetailPropertyExpansion"), *Struct->GetName(), DummyExpandedPropertyItems, GEditorPerProjectIni);
+				bShouldSave = DummyExpandedPropertyItems.Num() > 0;
+			}
+
+			if (bShouldSave)
+			{
+				GConfig->SetSingleLineArray(TEXT("DetailPropertyExpansion"), *Struct->GetName(), ExpandedPropertyItems, GEditorPerProjectIni);
+			}
+		}
+	}
+
+	if (DetailLayouts.Num() > 0 && BestBaseStruct)
+	{
+		bool bShouldSave = !ExpandedCustomItemsString.IsEmpty();
+		if (!bShouldSave)
+		{
+			FString DummyExpandedCustomItemsString;
+			GConfig->GetString(TEXT("DetailCustomWidgetExpansion"), *BestBaseStruct->GetName(), DummyExpandedCustomItemsString, GEditorPerProjectIni);
+			bShouldSave = !DummyExpandedCustomItemsString.IsEmpty();
+		}
+		if (bShouldSave)
+		{
+			GConfig->SetString(TEXT("DetailCustomWidgetExpansion"), *BestBaseStruct->GetName(), *ExpandedCustomItemsString, GEditorPerProjectIni);
+		}
+	}
+}
+
+void SDetailsViewBase::RestoreAllExpandedItems()
+{
+	for (TSharedPtr<FComplexPropertyNode>& RootPropertyNode : GetRootNodes())
+	{
+		check(RootPropertyNode.IsValid());
+		RestoreExpandedItems(RootPropertyNode.ToSharedRef());
+	}
+
+	for (FDetailLayoutData& LayoutData : DetailLayouts)
+	{
+		FRootPropertyNodeList& ExternalRootPropertyNodes = LayoutData.DetailLayout->GetExternalRootPropertyNodes();
+		for (TSharedPtr<FComplexPropertyNode>& ExternalRootPropertyNode : ExternalRootPropertyNodes)
+		{
+			check(ExternalRootPropertyNode.IsValid());
+			RestoreExpandedItems(ExternalRootPropertyNode.ToSharedRef());
+		}
+	}
+}
+
+void SDetailsViewBase::RestoreExpandedItems(TSharedRef<FPropertyNode> StartNode)
+{
+	FString ExpandedCustomItems;
+
+	UStruct* BestBaseStruct = StartNode->FindComplexParent()->GetBaseStructure();
+
+	//while a valid class, and we're either the same as the base class (for multiple actors being selected and base class is AActor) OR we're not down to AActor yet)
+	TArray<FString> DetailPropertyExpansionStrings;
+	for (UStruct* Struct = BestBaseStruct; Struct && ((BestBaseStruct == Struct) || (Struct != AActor::StaticClass())); Struct = Struct->GetSuperStruct())
+	{
+		GConfig->GetSingleLineArray(TEXT("DetailPropertyExpansion"), *Struct->GetName(), DetailPropertyExpansionStrings, GEditorPerProjectIni);
+	}
+
+	TSet<FString> ExpandedPropertyItems;
+	ExpandedPropertyItems.Append(DetailPropertyExpansionStrings);
+	SetExpandedItems(StartNode, ExpandedPropertyItems, false);
+
+	if (BestBaseStruct)
+	{
+		GConfig->GetString(TEXT("DetailCustomWidgetExpansion"), *BestBaseStruct->GetName(), ExpandedCustomItems, GEditorPerProjectIni);
+		TArray<FString> ExpandedCustomItemsArray;
+		ExpandedCustomItems.ParseIntoArray(ExpandedCustomItemsArray, TEXT(","), true);
+
+		ExpandedDetailNodes.Append(ExpandedCustomItemsArray);
+	}
+}
+
+void SDetailsViewBase::MarkNodeAnimating(TSharedPtr<FPropertyNode> InNode, float InAnimationDuration)
+{
+	if (InNode.IsValid() && InAnimationDuration > 0.0f)
+	{
+		CurrentlyAnimatingNodePath = FPropertyNode::CreatePropertyPath(InNode.ToSharedRef());
+		//GEditor->GetTimerManager()->ClearTimer(AnimateNodeTimer);
+		//GEditor->GetTimerManager()->SetTimer(AnimateNodeTimer, FTimerDelegate::CreateSP(this, &SDetailsViewBase::HandleNodeAnimationComplete), InAnimationDuration, false);
+	}
+}
+
+bool SDetailsViewBase::IsNodeAnimating(TSharedPtr<FPropertyNode> InNode)
+{
+	if (CurrentlyAnimatingNodePath.IsValid() && InNode.IsValid())
+	{
+		TSharedRef<FPropertyPath> InNodePath = FPropertyNode::CreatePropertyPath(InNode.ToSharedRef());
+		return FPropertyPath::AreEqual(CurrentlyAnimatingNodePath.ToSharedRef(), InNodePath);
+	}
+
+	return false;
+}
+
+void SDetailsViewBase::HandleNodeAnimationComplete()
+{
+	CurrentlyAnimatingNodePath = nullptr;
+}
+
+void SDetailsViewBase::UpdateFilteredDetails()
+{
+	RootTreeNodes.Reset();
+
+	FDetailNodeList InitialRootNodeList;
+	
+	NumVisibleTopLevelObjectNodes = 0;
+	
+	FRootPropertyNodeList& RootPropertyNodes = GetRootNodes();
+	for(int32 RootNodeIndex = 0; RootNodeIndex < RootPropertyNodes.Num(); ++RootNodeIndex)
+	{
+		const TSharedPtr<FComplexPropertyNode>& RootPropertyNode = RootPropertyNodes[RootNodeIndex];
+		if(RootPropertyNode.IsValid())
+		{
+			RootPropertyNode->FilterNodes(CurrentFilter.FilterStrings);
+			RootPropertyNode->ProcessSeenFlags(true);
+
+			RestoreExpandedItems(RootPropertyNode.ToSharedRef());
+
+			const TSharedPtr<FDetailLayoutBuilderImpl>& DetailLayout = DetailLayouts[RootNodeIndex].DetailLayout;
+			if(DetailLayout.IsValid())
+			{
+				FRootPropertyNodeList& ExternalRootPropertyNodes = DetailLayout->GetExternalRootPropertyNodes();
+				for (const TSharedPtr<FComplexPropertyNode>& ExternalRootNode : ExternalRootPropertyNodes)
+				{
+					if (ExternalRootNode.IsValid())
+					{
+						ExternalRootNode->FilterNodes(CurrentFilter.FilterStrings);
+						ExternalRootNode->ProcessSeenFlags(true);
+
+						RestoreExpandedItems(ExternalRootNode.ToSharedRef());
+					}
+				}
+
+				DetailLayout->FilterDetailLayout(CurrentFilter);
+
+				FDetailNodeList& LayoutRoots = DetailLayout->GetFilteredRootTreeNodes();
+				if (LayoutRoots.Num() > 0)
+				{
+					// A top level object nodes has a non-filtered away root so add one to the total number we have
+					++NumVisibleTopLevelObjectNodes;
+
+					InitialRootNodeList.Append(LayoutRoots);
+				}
+			}
+		}
+	}
+
+	// for multiple top level object we need to do a secondary pass on top level object nodes after we have determined if there is any nodes visible at all.  If there are then we ask the details panel if it wants to show childen
+	for(TSharedRef<class FDetailTreeNode> RootNode : InitialRootNodeList)
+	{
+		if(RootNode->ShouldShowOnlyChildren())
+		{
+			RootNode->GetChildren(RootTreeNodes);
+		}
+		else
+		{
+			RootTreeNodes.Add(RootNode);
+		}
+	}
+
+	RefreshTree();
+}
+
+void SDetailsViewBase::RegisterInstancedCustomPropertyLayout(UStruct* Class, FOnGetDetailCustomizationInstance DetailLayoutDelegate)
+{
+	check( Class );
+
+	FDetailLayoutCallback Callback;
+	Callback.DetailLayoutDelegate = DetailLayoutDelegate;
+	// @todo: DetailsView: Fix me: this specifies the order in which detail layouts should be queried
+	Callback.Order = InstancedClassToDetailLayoutMap.Num();
+
+	InstancedClassToDetailLayoutMap.Add( Class, Callback );	
+}
+
+void SDetailsViewBase::RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier /*= nullptr*/)
+{
+	FPropertyTypeLayoutCallback Callback;
+	Callback.PropertyTypeLayoutDelegate = PropertyTypeLayoutDelegate;
+	Callback.PropertyTypeIdentifier = Identifier;
+
+	FPropertyTypeLayoutCallbackList* LayoutCallbacks = InstancedTypeToLayoutMap.Find(PropertyTypeName);
+	if (LayoutCallbacks)
+	{
+		LayoutCallbacks->Add(Callback);
+	}
+	else
+	{
+		FPropertyTypeLayoutCallbackList NewLayoutCallbacks;
+		NewLayoutCallbacks.Add(Callback);
+		InstancedTypeToLayoutMap.Add(PropertyTypeName, NewLayoutCallbacks);
+	}
+}
+
+void SDetailsViewBase::UnregisterInstancedCustomPropertyLayout(UStruct* Class)
+{
+	check( Class );
+
+	InstancedClassToDetailLayoutMap.Remove( Class );	
+}
+
+void SDetailsViewBase::UnregisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, TSharedPtr<IPropertyTypeIdentifier> Identifier /*= nullptr*/)
+{
+	FPropertyTypeLayoutCallbackList* LayoutCallbacks = InstancedTypeToLayoutMap.Find(PropertyTypeName);
+
+	if (LayoutCallbacks)
+	{
+		LayoutCallbacks->Remove(Identifier);
+	}
+}
+
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsViewBase.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsViewBase.h
new file mode 100644
index 0000000..1ca8e21
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SDetailsViewBase.h
@@ -0,0 +1,461 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+//#include "AssetThumbnail.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "RuntimePropertyEditor/IDetailsViewPrivate.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/DetailFilter.h"
+#include "RuntimePropertyEditor/DetailTreeNode.h"
+#include "RuntimePropertyEditor/DetailsViewConfig2.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/PropertyPath.h"
+#include "RuntimePropertyEditor/PropertyRowGenerator.h"
+#include "Framework/Commands/UICommandList.h"
+#include "Input/Reply.h"
+#include "Layout/Visibility.h"
+#include "Misc/Attribute.h"
+#include "Widgets/SWindow.h"
+#include "Widgets/Layout/SSplitter.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "Widgets/Views/STreeView.h"
+
+class FNotifyHook;
+class SSearchBox;
+
+namespace soda
+{
+
+class FDetailCategoryImpl;
+class FDetailLayoutBuilderImpl;
+class IDetailCustomization;
+class IDetailKeyframeHandler;
+class IDetailPropertyExtensionHandler;
+class SDetailNameArea;
+class IPropertyGenerationUtilities;
+struct FDetailsViewObjectRoot;
+class IClassViewerFilter;
+
+typedef STreeView< TSharedRef<class FDetailTreeNode> > SDetailTree;
+
+class SDetailsViewBase : public IDetailsViewPrivate
+{
+public:
+	SDetailsViewBase();
+	virtual ~SDetailsViewBase();
+
+	/**
+	* @return true of the details view can be updated from editor selection
+	*/
+	virtual bool IsUpdatable() const override
+	{
+		return DetailsViewArgs.bUpdatesFromSelection;
+	}
+
+	virtual bool HasActiveSearch() const override
+	{
+		return CurrentFilter.FilterStrings.Num() > 0;
+	}
+
+	virtual int32 GetNumVisibleTopLevelObjects() const override
+	{
+		return NumVisibleTopLevelObjectNodes;
+	}
+
+	/** @return The identifier for this details view, or NAME_None is this view is anonymous */
+	virtual FName GetIdentifier() const override
+	{
+		return DetailsViewArgs.ViewIdentifier;
+	}
+
+	/**
+	 * Sets the visible state of the filter box/property grid area
+	 */
+	virtual void HideFilterArea(bool bHide) override;
+
+	/** 
+	 * IDetailsView interface 
+	 */
+	virtual TArray< FPropertyPath > GetPropertiesInOrderDisplayed() const override;
+	virtual void HighlightProperty(const FPropertyPath& Property) override;
+	virtual void ShowAllAdvancedProperties() override;
+	virtual void SetOnDisplayedPropertiesChanged(FOnDisplayedPropertiesChanged InOnDisplayedPropertiesChangedDelegate) override;
+	virtual FOnDisplayedPropertiesChanged& GetOnDisplayedPropertiesChanged() override { return OnDisplayedPropertiesChangedDelegate; }
+	virtual void SetDisableCustomDetailLayouts( bool bInDisableCustomDetailLayouts ) override { bDisableCustomDetailLayouts = bInDisableCustomDetailLayouts; }
+	virtual void SetIsPropertyVisibleDelegate(FIsPropertyVisible InIsPropertyVisible) override;
+	virtual FIsPropertyVisible& GetIsPropertyVisibleDelegate() override { return IsPropertyVisibleDelegate; }
+	virtual void SetIsCustomRowVisibleDelegate(FIsCustomRowVisible InIsCustomRowVisible) override;
+	virtual FIsCustomRowVisible& GetIsCustomRowVisibleDelegate() override { return IsCustomRowVisibleDelegate; }
+	virtual void SetIsPropertyReadOnlyDelegate(FIsPropertyReadOnly InIsPropertyReadOnly) override;
+	virtual FIsCustomRowReadOnly& GetIsCustomRowReadOnlyDelegate() override { return IsCustomRowReadOnlyDelegate; }
+	virtual void SetIsCustomRowReadOnlyDelegate(FIsCustomRowReadOnly InIsCustomRowReadOnly) override;
+	virtual FIsPropertyReadOnly& GetIsPropertyReadOnlyDelegate() override { return IsPropertyReadOnlyDelegate; }
+	virtual void SetIsPropertyEditingEnabledDelegate(FIsPropertyEditingEnabled IsPropertyEditingEnabled) override;
+	virtual FIsPropertyEditingEnabled& GetIsPropertyEditingEnabledDelegate() override { return IsPropertyEditingEnabledDelegate; }
+	virtual bool IsPropertyEditingEnabled() const override;
+	virtual void SetKeyframeHandler(TSharedPtr<class IDetailKeyframeHandler> InKeyframeHandler) override;
+	virtual TSharedPtr<IDetailKeyframeHandler> GetKeyframeHandler() const override { return KeyframeHandler; }
+	virtual void SetExtensionHandler(TSharedPtr<class IDetailPropertyExtensionHandler> InExtensionHandler) override;
+	virtual TSharedPtr<IDetailPropertyExtensionHandler> GetExtensionHandler() const override { return ExtensionHandler; }
+	virtual bool IsPropertyVisible(const struct FPropertyAndParent& PropertyAndParent) const override;
+	virtual bool IsPropertyReadOnly(const struct FPropertyAndParent& PropertyAndParent) const override;
+	virtual bool IsCustomRowVisible(FName InRowName, FName InParentName) const override;
+	virtual bool IsCustomRowReadOnly(FName InRowName, FName InParentName) const override;
+	virtual void SetGenericLayoutDetailsDelegate(FOnGetDetailCustomizationInstance OnGetGenericDetails) override;
+	virtual FOnGetDetailCustomizationInstance& GetGenericLayoutDetailsDelegate() override { return GenericLayoutDelegate; }
+	virtual bool IsLocked() const override { return bIsLocked; }
+	virtual void RefreshRootObjectVisibility() override;
+	virtual FOnFinishedChangingProperties& OnFinishedChangingProperties() const override { return OnFinishedChangingPropertiesDelegate; }
+	virtual void RegisterInstancedCustomPropertyLayout(UStruct* Class, FOnGetDetailCustomizationInstance DetailLayoutDelegate) override;
+	virtual void RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) override;
+	virtual void UnregisterInstancedCustomPropertyLayout(UStruct* Class) override;
+	virtual void UnregisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) override;
+	virtual void SetCustomValidatePropertyNodesFunction(FOnValidatePropertyRowGeneratorNodes InCustomValidatePropertyNodesFunction) override
+	{
+		CustomValidatePropertyNodesFunction = MoveTemp(InCustomValidatePropertyNodesFunction);
+	}
+	/** IDetailsViewPrivate interface */
+	virtual bool ShouldHideRightColumn() const override { return DetailsViewArgs.bHideRightColumn; }
+	virtual void RerunCurrentFilter() override;
+	void SetNodeExpansionState(TSharedRef<FDetailTreeNode> InTreeNode, bool bIsItemExpanded, bool bRecursive) override;
+	void SaveCustomExpansionState(const FString& NodePath, bool bIsExpanded) override;
+	bool GetCustomSavedExpansionState(const FString& NodePath) const override;
+	virtual void NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent) override;
+	void RefreshTree() override;
+	//TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const override;
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const override;
+	TSharedPtr<IPropertyUtilities> GetPropertyUtilities() override;
+	void CreateColorPickerWindow(const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha) override;
+	virtual void UpdateSinglePropertyMap(TSharedPtr<FComplexPropertyNode> InRootPropertyNode, FDetailLayoutData& LayoutData, bool bIsExternal) override;
+	virtual FNotifyHook* GetNotifyHook() const override { return DetailsViewArgs.NotifyHook; }
+	virtual const FCustomPropertyTypeLayoutMap& GetCustomPropertyTypeLayoutMap() const { return InstancedTypeToLayoutMap; }
+	virtual void SaveExpandedItems( TSharedRef<FPropertyNode> StartNode ) override;
+	virtual void RestoreExpandedItems(TSharedRef<FPropertyNode> StartNode) override;
+	virtual void MarkNodeAnimating(TSharedPtr<FPropertyNode> InNode, float InAnimationDuration) override;
+	virtual bool IsNodeAnimating(TSharedPtr<FPropertyNode> InNode) override;
+	virtual FDetailColumnSizeData& GetColumnSizeData() override { return ColumnSizeData; }
+	virtual bool IsFavoritingEnabled() const override { return DetailsViewArgs.bAllowFavoriteSystem; }
+	virtual bool IsConnected() const = 0;
+	virtual FRootPropertyNodeList& GetRootNodes() = 0;
+
+	/**
+	 * Called when the open color picker window associated with this details view is closed
+	 */
+	void OnColorPickerWindowClosed(const TSharedRef<SWindow>& Window);
+
+	/**
+	 * Requests that an item in the tree be expanded or collapsed
+	 *
+	 * @param TreeNode	The tree node to expand
+	 * @param bExpand	true if the item should be expanded, false otherwise
+	 */
+	void RequestItemExpanded(TSharedRef<FDetailTreeNode> TreeNode, bool bExpand) override;
+
+	/**
+	 * Sets the expansion state all root nodes and optionally all of their children
+	 *
+	 * @param bExpand			The new expansion state
+	 * @param bRecurse			Whether or not to apply the expansion change to any children
+	 */
+	void SetRootExpansionStates(const bool bExpand, const bool bRecurse);
+
+	/**
+	 * Adds an action to execute next tick
+	 */
+	virtual void EnqueueDeferredAction(FSimpleDelegate& DeferredAction) override;
+
+	/** Restore all expanded items in root nodes and external root nodes. */
+	void RestoreAllExpandedItems();
+
+	// SWidget interface
+	virtual bool SupportsKeyboardFocus() const override;
+	virtual FReply OnFocusReceived(const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent) override;
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+	// End of SWidget interface
+
+protected:
+	/**
+	 * Called when a color property is changed from a color picker
+	 */
+	void SetColorPropertyFromColorPicker(FLinearColor NewColor);
+
+	/** Called when node animation completes */
+	void HandleNodeAnimationComplete();
+
+	/** Updates the property map for access when customizing the details view.  Generates default layout for properties */
+	void UpdatePropertyMaps();
+
+	virtual void CustomUpdatePropertyMap(TSharedPtr<FDetailLayoutBuilderImpl>& InDetailLayout) {}
+
+	/** Called to get the visibility of the tree view */
+	EVisibility GetTreeVisibility() const;
+
+	/** Called to get the visibility of the scrollbar based on options, needs to be dynamic to avoid layout changing on expansion */
+	EVisibility GetScrollBarVisibility() const;
+
+	/** Returns the name of the image used for the icon on the filter button */
+	const FSlateBrush* OnGetFilterButtonImageResource() const;
+
+	/** Called when the locked button is clicked */
+	FReply OnLockButtonClicked();
+
+	/**
+	 * Called to recursively expand/collapse the children of the given item
+	 *
+	 * @param InTreeNode		The node that was expanded or collapsed
+	 * @param bIsItemExpanded	True if the item is expanded, false if it is collapsed
+	 */
+	void SetNodeExpansionStateRecursive( TSharedRef<FDetailTreeNode> InTreeNode, bool bIsItemExpanded );
+
+	/**
+	 * Called when an item is expanded or collapsed in the detail tree
+	 *
+	 * @param InTreeNode		The node that was expanded or collapsed
+	 * @param bIsItemExpanded	True if the item is expanded, false if it is collapsed
+	 */
+	void OnItemExpansionChanged( TSharedRef<FDetailTreeNode> InTreeNode, bool bIsItemExpanded );
+
+	/** 
+	 * Function called through a delegate on the TreeView to request children of a tree node 
+	 * 
+	 * @param InTreeNode		The tree node to get children from
+	 * @param OutChildren		The list of children of InTreeNode that should be visible 
+	 */
+	void OnGetChildrenForDetailTree( TSharedRef<FDetailTreeNode> InTreeNode, TArray< TSharedRef<FDetailTreeNode> >& OutChildren );
+
+	/**
+	 * Returns an SWidget used as the visual representation of a node in the treeview.                     
+	 */
+	TSharedRef<ITableRow> OnGenerateRowForDetailTree( TSharedRef<FDetailTreeNode> InTreeNode, const TSharedRef<STableViewBase>& OwnerTable );
+
+	/** @return true if show only modified is checked */
+	bool IsShowOnlyModifiedChecked() const { return CurrentFilter.bShowOnlyModified; }
+
+	/** @return true if custom filter is checked */
+	bool IsCustomFilterChecked() const { return bCustomFilterActive; }
+
+	/** @return true if show all advanced is checked */
+	bool IsShowAllAdvancedChecked() const { return CurrentFilter.bShowAllAdvanced; }
+
+	/** @return true if show only differing is checked */
+	bool IsShowOnlyAllowedChecked() const { return CurrentFilter.bShowOnlyAllowed; }
+
+	/** @return true if show all advanced is checked */
+	bool IsShowAllChildrenIfCategoryMatchesChecked() const { return CurrentFilter.bShowAllChildrenIfCategoryMatches; }
+	
+	/** @return true if show keyable is checked */
+	bool IsShowKeyableChecked() const { return CurrentFilter.bShowOnlyKeyable; }
+	
+	/** @return true if show animated is checked */
+	bool IsShowAnimatedChecked() const { return CurrentFilter.bShowOnlyAnimated; }
+
+	/** Called when show only modified is clicked */
+	void OnShowOnlyModifiedClicked();
+
+	/** Called when custom filter is clicked */
+	void OnCustomFilterClicked();
+
+	/** Called when show all advanced is clicked */
+	void OnShowAllAdvancedClicked();
+
+	/** Called when show only differing is clicked */
+	void OnShowOnlyAllowedClicked();
+
+	/** Called when show all children if category matches is clicked */
+	void OnShowAllChildrenIfCategoryMatchesClicked();
+
+	/** Called when show keyable is clicked */
+	void OnShowKeyableClicked();
+	
+	/** Called when show animated is clicked */
+	void OnShowAnimatedClicked();
+
+	/**
+	* Updates the details with the passed in filter
+	*/
+	void UpdateFilteredDetails();
+
+	/** Called when the filter text changes.  This filters specific property nodes out of view */
+	void OnFilterTextChanged(const FText& InFilterText);
+
+	/** Called when the filter text is cleared. Resets the filters */
+	void OnFilterTextCommitted(const FText& InSearchText, ETextCommit::Type InCommitType);
+
+	/** Called when the list of currently differing properties changes */
+	virtual void UpdatePropertyAllowList(const TSet<FPropertyPath> InAllowedProperties) override { CurrentFilter.PropertyAllowList = InAllowedProperties; }
+
+	virtual TSharedPtr<SWidget> GetNameAreaWidget() override;
+	virtual void SetNameAreaCustomContent(TSharedRef<SWidget>& InCustomContent) override;
+	virtual TSharedPtr<SWidget> GetFilterAreaWidget() override;
+	virtual TSharedPtr<FUICommandList> GetHostCommandList() const override;
+	virtual TSharedPtr<FTabManager> GetHostTabManager() const override;
+	virtual void SetHostTabManager(TSharedPtr<FTabManager> InTabManager) override;
+
+	/** 
+	 * Hides or shows properties based on the passed in filter text
+	 * 
+	 * @param InFilterText	The filter text
+	 */
+	void FilterView( const FString& InFilterText );
+
+	/** Called to get the visibility of the filter box */
+	EVisibility GetFilterBoxVisibility() const;
+
+
+	virtual void SetCustomFilterDelegate(FSimpleDelegate InOverride) override
+	{
+		CustomFilterDelegate = InOverride;
+	}
+
+	virtual void SetCustomFilterLabel(FText InText) override
+	{
+		CustomFilterLabel = InText;
+	}
+
+	FText GetCustomFilterLabel() const
+	{
+		return CustomFilterLabel;
+	}
+
+	/** Free memory that is pending delete next editor tick even when widget not visible or ticking */
+	void SetPendingCleanupTimer();
+	/** Free memory that is pending delete during editor tick */
+	void HandlePendingCleanupTimer();
+	/** Free memory that is pending delete */
+	void HandlePendingCleanup();
+	
+	void SavePreSearchExpandedItems();
+	void RestorePreSearchExpandedItems();
+
+	/** 
+	 * Get a mutable version of the view config for setting values.
+	 * @returns		The view config for this view. 
+	 * @note		If DetailsViewArgs.ViewIdentifier is not set, it is not possible to store settings for this view.
+	 */
+	struct FDetailsViewConfig2* GetMutableViewConfig();
+
+	/**
+	 * Get a const version of the view config for getting values.
+	 * @returns		The view config for this view. 
+	 * @note		If DetailsViewArgs.ViewIdentifier is not set, it is not possible to retrieve settings for this view.
+	 */
+	const FDetailsViewConfig2* GetConstViewConfig() const;
+	void SaveViewConfig();
+
+	virtual const FOnGenerateGlobalRowExtension& GetLocalRowExtensionDelegate() const override { return DetailsViewArgs.OnGeneratLocalRowExtension; }
+
+protected:
+	/** The user defined args for the details view */
+	FDetailsViewArgs DetailsViewArgs;
+	/** A mapping of classes to detail layout delegates, called when querying for custom detail layouts in this instance of the details view only*/
+	FCustomDetailLayoutMap InstancedClassToDetailLayoutMap;
+	/** A mapping of type names to detail layout delegates, called when querying for custom detail layouts in this instance of the details view only */
+	FCustomPropertyTypeLayoutMap InstancedTypeToLayoutMap;
+	/** The current detail layout based on objects in this details panel.  There is one layout for each top level object node.*/
+	TArray<FDetailLayoutData> DetailLayouts;
+	/** Row for searching and view options */
+	TSharedPtr<SWidget> FilterRow;
+	/** Search box */
+	TSharedPtr<SSearchBox> SearchBox;
+	/** Customization instances that need to be destroyed when safe to do so */
+	TArray< TSharedPtr<IDetailCustomization> > CustomizationClassInstancesPendingDelete;
+	/** Detail layouts that need to be destroyed when safe to do so */
+	TArray< TSharedPtr<FDetailLayoutBuilderImpl> > DetailLayoutsPendingDelete;
+	/** Map of nodes that are requesting an automatic expansion/collapse due to being filtered */
+	TMap< TWeakPtr<FDetailTreeNode>, bool > FilteredNodesRequestingExpansionState;
+	/** Current set of expanded detail nodes (by path) that should be saved when the details panel closes */
+	TSet<FString> ExpandedDetailNodes;
+	/** Tree view */
+	TSharedPtr<SDetailTree> DetailTree;
+	/** Root tree nodes visible in the tree */
+	FDetailNodeList RootTreeNodes;
+	/** Delegate executed to determine if a property should be visible */
+	FIsPropertyVisible IsPropertyVisibleDelegate;
+	/** Delegate executed to determine if a custom row should be visible. */
+	FIsCustomRowVisible IsCustomRowVisibleDelegate;
+	/** Delegate executed to determine if a property should be read-only */
+	FIsPropertyReadOnly IsPropertyReadOnlyDelegate;
+	/** Delegate executed to determine if a custom row should be read-only. */
+	FIsCustomRowReadOnly IsCustomRowReadOnlyDelegate;
+	/** Delegate called to see if a property editing is enabled */
+	FIsPropertyEditingEnabled IsPropertyEditingEnabledDelegate;
+	/** Delegate called when the details panel finishes editing a property (after post edit change is called) */
+	mutable FOnFinishedChangingProperties OnFinishedChangingPropertiesDelegate;
+	/** Container for passing around column size data to rows in the tree (each row has a splitter which can affect the column size)*/
+	FDetailColumnSizeData ColumnSizeData;
+	/** True if there is an active filter (text in the filter box) */
+	UE_DEPRECATED(4.26, "Use HasActiveSearch function instead.")
+	bool bHasActiveFilter;
+	/** True if this property view is currently locked (I.E The objects being observed are not changed automatically due to user selection)*/
+	bool bIsLocked;
+	/** The property node that the color picker is currently editing. */
+	TWeakPtr<FPropertyNode> ColorPropertyNode;
+	/** Whether or not this instance of the details view opened a color picker and it is not closed yet */
+	bool bHasOpenColorPicker;
+	/** Settings for this view */
+	TSharedPtr<class IPropertyUtilities> PropertyUtilities;
+	/** Gets internal utilities for generating property layouts. */
+	TSharedPtr<IPropertyGenerationUtilities> PropertyGenerationUtilities;
+	/** The name area which is not recreated when selection changes */
+	TSharedPtr<class SDetailNameArea> NameArea;
+	/** The current filter */
+	FDetailFilter CurrentFilter;
+	/** Delegate called to get generic details not specific to an object being viewed */
+	FOnGetDetailCustomizationInstance GenericLayoutDelegate;
+	/** Actions that should be executed next tick */
+	TArray<FSimpleDelegate> DeferredActions;
+	/** Root tree nodes that needs to be destroyed when safe */
+	FRootPropertyNodeList RootNodesPendingKill;
+	/** The handler for the keyframe UI, determines if the key framing UI should be displayed. */
+	TSharedPtr<IDetailKeyframeHandler> KeyframeHandler;
+	/** Property extension handler returns additional UI to apply after the customization is applied to the property. */
+	TSharedPtr<IDetailPropertyExtensionHandler> ExtensionHandler;
+	/** The tree node that is currently highlighted, may be none. */
+	TWeakPtr<FDetailTreeNode> CurrentlyHighlightedNode;
+	/** The property node whose widget-equivalent should be animating, may be none. */
+	TSharedPtr<FPropertyPath> CurrentlyAnimatingNodePath;
+	/** Timer for that current node's widget animation duration. */
+	FTimerHandle AnimateNodeTimer;
+
+	TSet<FString> PreSearchExpandedItems;
+	TSet<FString> PreSearchExpandedCategories;
+
+	/** Executed when the tree is refreshed */
+	FOnDisplayedPropertiesChanged OnDisplayedPropertiesChangedDelegate;
+
+	/** True if we want to skip generation of custom layouts for displayed object */
+	bool bDisableCustomDetailLayouts;
+
+	int32 NumVisibleTopLevelObjectNodes;
+
+	/** Used to refresh the tree when the allow list filter changes */
+	FDelegateHandle PropertyPermissionListChangedDelegate;
+	FDelegateHandle PropertyPermissionListEnabledDelegate;
+
+	/** Delegate for overriding the show modified filter */
+	FSimpleDelegate CustomFilterDelegate;
+
+	/** When overriding show modified, you can't use the filter state to determine what is overridden anymore. Use this variable instead. */
+	bool bCustomFilterActive;
+
+	/** Timer has already been set to be run next tick */
+	bool bPendingCleanupTimerSet;
+
+	FText CustomFilterLabel;
+
+	mutable TSharedPtr<FEditConditionParser> EditConditionParser;
+	
+	/** Optional custom filter(s) to be applied when selecting values for class properties */
+	TArray<TSharedRef<IClassViewerFilter>> ClassViewerFilters;
+
+	/** The EnsureDataIsValid function can be skipped with this member, if set. Useful if your implementation doesn't require this kind of validation each Tick. */
+	FOnValidateDetailsViewPropertyNodes CustomValidatePropertyNodesFunction;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SResetToDefaultMenu.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SResetToDefaultMenu.cpp
new file mode 100644
index 0000000..db20a65
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SResetToDefaultMenu.cpp
@@ -0,0 +1,154 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SResetToDefaultMenu.h"
+#include "Textures/SlateIcon.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SComboButton.h"
+//#include "ScopedTransaction.h"
+
+namespace soda
+{
+
+void SResetToDefaultMenu::AddProperty( TSharedRef<IPropertyHandle> InProperty )
+{
+	// Only add properties which are valid for reading/writing
+	if( InProperty->IsValidHandle() )
+	{
+		Properties.Add( InProperty );
+	}
+}
+
+void SResetToDefaultMenu::Construct( const FArguments& InArgs )
+{
+	VisibilityWhenDefault = InArgs._VisibilityWhenDefault;
+	DiffersFromDefault = InArgs._DiffersFromDefault;
+	OnResetToDefault = InArgs._OnResetToDefault;
+	OnGetResetToDefaultText = InArgs._OnGetResetToDefaultText;
+
+	ChildSlot
+	[
+		SNew(SComboButton)
+		.ToolTipText(NSLOCTEXT( "PropertyEditor", "ResetToDefault", "Reset to Default" ))
+		.HasDownArrow(false)
+		.ButtonStyle( FSodaStyle::Get(), "NoBorder" )
+		.ContentPadding(0) 
+		.Visibility( this, &SResetToDefaultMenu::GetResetToDefaultVisibility )
+		.OnGetMenuContent( this, &SResetToDefaultMenu::OnGenerateResetToDefaultMenuContent )
+		.ButtonContent()
+		[
+			SNew(SImage)
+			.Image( FSodaStyle::GetBrush("PropertyWindow.DiffersFromDefault") )
+		]
+	];
+}
+
+void SResetToDefaultMenu::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	// Cache the reset to default visibility
+	bShouldBeVisible = DiffersFromDefault.Get();
+	for ( int32 PropIndex = 0; PropIndex < Properties.Num(); ++PropIndex )
+	{
+		TSharedRef<IPropertyHandle> Property = Properties[PropIndex];
+		if( Property->DiffersFromDefault() && !Property->IsEditConst() )
+		{
+			bShouldBeVisible = true;
+			// If one property should show reset to default, the menu must be visible
+			break;
+		}
+	}
+}
+
+
+EVisibility SResetToDefaultMenu::GetResetToDefaultVisibility() const
+{
+	return bShouldBeVisible ? EVisibility::Visible : VisibilityWhenDefault;
+}
+
+TSharedRef<SWidget> SResetToDefaultMenu::OnGenerateResetToDefaultMenuContent()
+{
+	const bool bCloseAfterSelection = true;
+	FMenuBuilder MenuBuilder( bCloseAfterSelection, NULL );
+
+	MenuBuilder.BeginSection("PropertyEditorResetToDefault", NSLOCTEXT( "PropertyEditor", "ResetToDefault", "Reset to Default" ) );
+	{
+		if(Properties.Num() > 0)
+		{
+			for ( int32 PropIndex = 0; PropIndex < Properties.Num(); ++PropIndex )
+			{
+				TSharedRef<IPropertyHandle> PropertyHandle = Properties[PropIndex];
+	
+				// Only display the reset to default option if the value actually differs from default
+				if( PropertyHandle->IsValidHandle() && PropertyHandle->DiffersFromDefault() && !PropertyHandle->IsEditConst() )
+				{
+					MenuBuilder.AddMenuEntry
+					( 
+						PropertyHandle->GetResetToDefaultLabel(),
+						NSLOCTEXT("PropertyEditor", "ResetToDefault_ToolTip", "Resets the value to its default"),
+						FSlateIcon(),
+						FUIAction( FExecuteAction::CreateSP( PropertyHandle, &IPropertyHandle::ResetToDefault ) )
+					);
+				}
+			}
+		}
+		else
+		{
+			FText ResetDescription = NSLOCTEXT("PropertyEditor", "ResetToDefault_DefaultLabel", "Reset to default");
+			if(OnGetResetToDefaultText.IsBound())
+			{
+				ResetDescription = FText::Format(NSLOCTEXT("PropertyEditor", "ResetToDefault_Label", "Reset to default: {0}"), OnGetResetToDefaultText.Execute());
+			}
+
+			MenuBuilder.AddMenuEntry
+			( 
+				ResetDescription,
+				NSLOCTEXT("PropertyEditor", "ResetToDefault_ToolTip", "Resets the value to its default"),
+				FSlateIcon(),
+				FUIAction( FExecuteAction::CreateSP( this, &SResetToDefaultMenu::ResetToDefault ) )
+			);
+		}
+	}
+	MenuBuilder.EndSection();
+
+	if(Properties.Num() > 0)
+	{
+		MenuBuilder.AddMenuEntry
+		(
+			NSLOCTEXT("PropertyEditor", "ResetAllToDefault", "Reset All"),
+			NSLOCTEXT("PropertyEditor", "ResetAllToDefault_ToolTip", "Resets all the values to default"),
+			FSlateIcon(),
+			FUIAction( FExecuteAction::CreateSP( this, &SResetToDefaultMenu::ResetAllToDefault ) )
+		);
+	}
+
+	return MenuBuilder.MakeWidget();
+
+}
+
+void SResetToDefaultMenu::ResetToDefault()
+{
+	OnResetToDefault.ExecuteIfBound();
+}
+
+void SResetToDefaultMenu::ResetAllToDefault()
+{
+	// Create a single transaction for resetting all rather than one for each reset
+	//FScopedTransaction Transaction( NSLOCTEXT("PropertyEditor", "ResetAllToDefault_Transaction", "Reset All to Default") );
+
+	for( int32 PropIndex = 0; PropIndex < Properties.Num(); ++PropIndex )
+	{
+		TSharedRef<IPropertyHandle> PropertyHandle = Properties[PropIndex];
+
+		// Only display the reset to default option if the value actually differs from default
+		if( PropertyHandle->IsValidHandle() && PropertyHandle->DiffersFromDefault() && !PropertyHandle->IsEditConst() )
+		{
+			PropertyHandle->ResetToDefault();
+		}
+	}
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SSingleProperty.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SSingleProperty.cpp
new file mode 100644
index 0000000..79d1f8a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SSingleProperty.cpp
@@ -0,0 +1,376 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SSingleProperty.h"
+
+//#include "AssetThumbnail.h"
+#include "RuntimePropertyEditor/DetailPropertyRow.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "Modules/ModuleManager.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/SResetToDefaultPropertyEditor.h"
+#include "RuntimePropertyEditor/SStandaloneCustomizedValueWidget.h"
+#include "Engine/Engine.h"
+//#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+//#include "ThumbnailRendering/ThumbnailManager.h"
+#include "UObject/UnrealType.h"
+#include "Widgets/Colors/SColorPicker.h"
+#include "Widgets/Text/STextBlock.h"
+
+namespace soda
+{
+
+
+class FSinglePropertyUtilities : public soda::IPropertyUtilities
+{
+public:
+
+	FSinglePropertyUtilities( const TWeakPtr< SSingleProperty >& InView /*, bool bInShouldDisplayThumbnail*/ )
+		: View( InView )
+		//, bShouldHideAssetThumbnail(bInShouldDisplayThumbnail)
+	{
+	}
+
+	virtual class FNotifyHook* GetNotifyHook() const override
+	{
+		TSharedPtr< SSingleProperty > PinnedView = View.Pin();
+		return PinnedView->GetNotifyHook();
+	}
+
+	virtual void CreateColorPickerWindow( const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha ) const override
+	{
+		TSharedPtr< SSingleProperty > PinnedView = View.Pin();
+
+		if ( PinnedView.IsValid() )
+		{
+			PinnedView->CreateColorPickerWindow( PropertyEditor, bUseAlpha );
+		}
+	}
+
+	virtual void EnqueueDeferredAction( FSimpleDelegate DeferredAction ) override
+	{
+		 // not implemented
+	}
+
+	virtual bool AreFavoritesEnabled() const override
+	{
+		// not implemented
+		return false;
+	}
+
+	virtual void ToggleFavorite( const TSharedRef< class FPropertyEditor >& PropertyEditor ) const override
+	{
+		// not implemented
+	}
+
+	virtual bool IsPropertyEditingEnabled() const override
+	{
+		return true;
+	}
+
+	virtual void ForceRefresh() override {}
+
+	virtual void RequestRefresh() override {}
+
+	/*
+	virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const override
+	{
+		return bShouldHideAssetThumbnail ? nullptr : UThumbnailManager::Get().GetSharedThumbnailPool();
+	}
+	*/
+
+	virtual void NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent) override
+	{}
+
+	virtual bool DontUpdateValueWhileEditing() const override
+	{
+		return false;
+	}
+
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const override
+	{
+		// not implemented
+		static TArray<TSharedRef<IClassViewerFilter>> NotImplemented;
+		return NotImplemented;
+	}
+
+	const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const override
+	{
+		static TArray<TWeakObjectPtr<UObject>> Empty;
+		return Empty;
+	}
+
+	virtual bool HasClassDefaultObject() const override
+	{
+		return false;
+	}
+
+private:
+	TWeakPtr< SSingleProperty > View;
+	//bool bShouldHideAssetThumbnail = false;
+};
+
+void SSingleProperty::Construct( const FArguments& InArgs )
+{
+	PropertyName = InArgs._PropertyName;
+	NameOverride = InArgs._NameOverride;
+	NamePlacement = InArgs._NamePlacement;
+	NotifyHook = InArgs._NotifyHook;
+	PropertyFont = InArgs._PropertyFont;
+
+	PropertyUtilities = MakeShareable( new FSinglePropertyUtilities( SharedThis( this )/*, InArgs._bShouldHideAssetThumbnail*/ ) );
+
+	SetObject( InArgs._Object );
+}
+
+void SSingleProperty::SetObject( UObject* InObject )
+{
+	DestroyColorPicker();
+
+	if( !RootPropertyNode.IsValid() )
+	{
+		RootPropertyNode = MakeShareable( new FObjectPropertyNode );
+	}
+
+	RootPropertyNode->RemoveAllObjects();
+	ValueNode.Reset();
+
+	if( InObject )
+	{
+		RootPropertyNode->AddObject( InObject );
+	}
+
+
+	FPropertyNodeInitParams InitParams;
+	InitParams.ParentNode = NULL;
+	InitParams.Property = NULL;
+	InitParams.ArrayOffset = 0;
+	InitParams.ArrayIndex = INDEX_NONE;
+	// we'll generate the children
+	InitParams.bAllowChildren = false;
+	InitParams.bForceHiddenPropertyVisibility = false;
+
+	RootPropertyNode->InitNode( InitParams );
+
+	ValueNode = RootPropertyNode->GenerateSingleChild( PropertyName );
+
+	bool bIsAcceptableProperty = false;
+	FProperty* Property = nullptr; 
+	// valid criteria for standalone properties 
+	if( ValueNode.IsValid() )
+	{
+		//TODO MaterialLayers: Remove below commenting
+		bIsAcceptableProperty = true;
+		Property = ValueNode->GetProperty();
+		check(Property);
+		// not an array property (dynamic or static)
+		//bIsAcceptableProperty &= !( Property->IsA( FArrayProperty::StaticClass() ) || (Property->ArrayDim > 1 && ValueNode->GetArrayIndex() == INDEX_NONE) );
+		// not a struct property unless its a built in type like a vector
+		//bIsAcceptableProperty &= ( !Property->IsA( FStructProperty::StaticClass() ) || PropertyEditorHelpers::IsBuiltInStructProperty( Property ) );
+		PropertyHandle = PropertyEditorHelpers::GetPropertyHandle(ValueNode.ToSharedRef(), NotifyHook, PropertyUtilities);
+	}
+
+	if( bIsAcceptableProperty )
+	{
+		ValueNode->RebuildChildren();
+
+		TSharedRef< FPropertyEditor > PropertyEditor = FPropertyEditor::Create( ValueNode.ToSharedRef(), TSharedPtr< IPropertyUtilities >( PropertyUtilities ).ToSharedRef() );
+		ValueNode->SetDisplayNameOverride( NameOverride );
+
+		TSharedPtr<SHorizontalBox> HorizontalBox;
+
+		ChildSlot
+		[
+			SAssignNew( HorizontalBox, SHorizontalBox )
+		];
+
+		if( NamePlacement != EPropertyNamePlacement::Hidden )
+		{
+			HorizontalBox->AddSlot()
+			.Padding(4.0f, 0.0f)
+			.AutoWidth()
+			.VAlign( VAlign_Center )
+			[
+				SNew( SPropertyNameWidget, PropertyEditor )
+			];
+		}
+
+		// For structs and other properties with a customized header
+		FRuntimeEditorModule& PropertyEditorModule = FModuleManager::GetModuleChecked<FRuntimeEditorModule>("RuntimeEditorModule");
+
+		if (const FPropertyTypeLayoutCallback LayoutCallback =
+				PropertyEditorModule.GetPropertyTypeCustomization(
+					Property, *PropertyHandle, FCustomPropertyTypeLayoutMap()
+				); LayoutCallback.IsValid()
+			)
+		{
+			TSharedRef<IPropertyTypeCustomization> CustomizationInstance = LayoutCallback.GetCustomizationInstance();
+			
+			HorizontalBox->AddSlot()
+			.Padding( 4.0f, 0.0f)
+			.FillWidth(1.0f)
+			.VAlign( VAlign_Center )
+			[
+				SNew( SStandaloneCustomizedValueWidget, CustomizationInstance, PropertyHandle.ToSharedRef())
+			];
+		}
+		else // For properties without customization
+		{
+
+			HorizontalBox->AddSlot()
+			.Padding( 4.0f, 0.0f)
+			.FillWidth(1.0f)
+			.VAlign( VAlign_Center )
+			[
+				SNew( SPropertyValueWidget, PropertyEditor, PropertyUtilities.ToSharedRef() )
+			];			
+		}
+
+		if (!PropertyEditor->GetPropertyHandle()->HasMetaData(TEXT("NoResetToDefault")))
+		{
+			HorizontalBox->AddSlot()
+			.Padding( 2.0f )
+			.AutoWidth()
+			.VAlign( VAlign_Center )
+			[
+				SNew( SResetToDefaultPropertyEditor,  PropertyEditor->GetPropertyHandle() )
+			];
+		}
+	}
+	else
+	{
+		ChildSlot
+		[
+			SNew(STextBlock)
+			.Font(PropertyFont)
+			.Text(NSLOCTEXT("PropertyEditor", "SinglePropertyInvalidType", "Cannot Edit Inline"))
+			.ToolTipText(NSLOCTEXT("PropertyEditor", "SinglePropertyInvalidType_Tooltip", "Properties of this type cannot be edited inline; edit it elsewhere"))
+		];
+
+		// invalid or missing property
+		RootPropertyNode->RemoveAllObjects();
+		ValueNode.Reset();
+		RootPropertyNode.Reset();
+	}
+}
+
+void SSingleProperty::SetOnPropertyValueChanged( FSimpleDelegate& InOnPropertyValueChanged )
+{
+	if( HasValidProperty() )
+	{
+		ValueNode->OnPropertyValueChanged().Add( InOnPropertyValueChanged );
+	}
+}
+
+void SSingleProperty::ReplaceObjects( const TMap<UObject*, UObject*>& OldToNewObjectMap )
+{
+	if( HasValidProperty() )
+	{
+		TArray<UObject*> NewObjectList;
+		bool bObjectsReplaced = false;
+
+		// Scan all objects and look for objects which need to be replaced
+		for ( TPropObjectIterator Itor( RootPropertyNode->ObjectIterator() ); Itor; ++Itor )
+		{
+			UObject* Replacement = OldToNewObjectMap.FindRef( Itor->Get() );
+			if( Replacement )
+			{
+				bObjectsReplaced = true;
+				NewObjectList.Add( Replacement );
+			}
+			else
+			{
+				NewObjectList.Add( Itor->Get() );
+			}
+		}
+
+		// if any objects were replaced update the observed objects
+		if( bObjectsReplaced )
+		{
+			SetObject( NewObjectList[0] );
+		}
+	}
+}
+
+void SSingleProperty::RemoveDeletedObjects( const TArray<UObject*>& DeletedObjects )
+{
+
+	if( HasValidProperty() )
+	{
+		// Scan all objects and look for objects which need to be replaced
+		for ( TPropObjectIterator Itor( RootPropertyNode->ObjectIterator() ); Itor; ++Itor )
+		{
+			if( DeletedObjects.Contains( Itor->Get() ) )
+			{
+				SetObject( NULL );
+				break;
+			}
+		}
+	}
+}
+
+void SSingleProperty::CreateColorPickerWindow( const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha )
+{
+	if (HasValidProperty())
+	{
+		TSharedRef<FPropertyNode> Node = PropertyEditor->GetPropertyNode();
+		check(&Node.Get() == ValueNode.Get());
+		FProperty* Property = Node->GetProperty();
+		check(Property);
+
+		FReadAddressList ReadAddresses;
+		Node->GetReadAddress(false, ReadAddresses, false);
+
+		// Use the first address for the initial color
+		TOptional<FLinearColor> DefaultColor;
+		bool bClampValue = false;
+		if (ReadAddresses.Num())
+		{
+			const uint8* Addr = ReadAddresses.GetAddress(0);
+			if (Addr)
+			{
+				if (CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_Color)
+				{
+					DefaultColor = *reinterpret_cast<const FColor*>(Addr);
+					bClampValue = true;
+				}
+				else
+				{
+					check(CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_LinearColor);
+					DefaultColor = *reinterpret_cast<const FLinearColor*>(Addr);
+				}
+			}
+		}
+
+		if (DefaultColor.IsSet())
+		{
+			FColorPickerArgs PickerArgs = FColorPickerArgs(DefaultColor.GetValue(), FOnLinearColorValueChanged::CreateSP(this, &SSingleProperty::SetColorPropertyFromColorPicker));
+			PickerArgs.ParentWidget = AsShared();
+			PickerArgs.bUseAlpha = bUseAlpha;
+			PickerArgs.bClampValue = bClampValue;
+			PickerArgs.DisplayGamma = TAttribute<float>::Create(TAttribute<float>::FGetter::CreateUObject(GEngine, &UEngine::GetDisplayGamma));
+
+			OpenColorPicker(PickerArgs);
+		}
+	}
+}
+
+void SSingleProperty::SetColorPropertyFromColorPicker(FLinearColor NewColor)
+{
+	if( HasValidProperty() )
+	{
+		FProperty* NodeProperty = ValueNode->GetProperty();
+		check(NodeProperty);
+
+		//@todo if multiple objects we need to iterate
+		ValueNode->NotifyPreChange(NodeProperty, GetNotifyHook());
+
+		FPropertyChangedEvent ChangeEvent(NodeProperty, EPropertyChangeType::ValueSet);
+		ValueNode->NotifyPostChange( ChangeEvent, GetNotifyHook() );
+	}
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SSingleProperty.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SSingleProperty.h
new file mode 100644
index 0000000..e0a335c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SSingleProperty.h
@@ -0,0 +1,99 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Styling/AppStyle.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimePropertyEditor/ISinglePropertyView.h"
+
+class FNotifyHook;
+
+namespace soda
+{
+
+class FObjectPropertyNode;
+class FPropertyNode;
+class FSinglePropertyUtilities;
+class IPropertyHandle;
+
+class SSingleProperty : public ISinglePropertyView
+{
+public:
+	SLATE_BEGIN_ARGS( SSingleProperty )
+		: _Object(NULL)
+		, _NotifyHook( NULL )
+		, _PropertyFont( FAppStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) ) 
+		, _NamePlacement( EPropertyNamePlacement::Left )
+		, _NameOverride()
+		, _bShouldHideAssetThumbnail(false)
+	{}
+
+		SLATE_ARGUMENT( UObject*, Object )
+		SLATE_ARGUMENT( FName, PropertyName )
+		SLATE_ARGUMENT( FNotifyHook*, NotifyHook )
+		SLATE_ARGUMENT( FSlateFontInfo, PropertyFont )
+		SLATE_ARGUMENT( EPropertyNamePlacement::Type, NamePlacement )
+		SLATE_ARGUMENT( FText, NameOverride )
+		SLATE_ARGUMENT( bool, bShouldHideAssetThumbnail )
+	SLATE_END_ARGS()	
+
+	void Construct( const FArguments& InArgs );
+
+	/** ISinglePropertyView interface */
+	virtual bool HasValidProperty() const override { return RootPropertyNode.IsValid() && ValueNode.IsValid(); }
+	virtual void SetObject( UObject* InObject ) override;
+	virtual void SetOnPropertyValueChanged( FSimpleDelegate& InOnPropertyValueChanged ) override;
+
+	/**
+	 * Replaces objects being observed by the view with new objects
+	 *
+	 * @param OldToNewObjectMap	Mapping from objects to replace to their replacement
+	 */
+	void ReplaceObjects( const TMap<UObject*, UObject*>& OldToNewObjectMap );
+
+	/**
+	 * Removes objects from the view because they are about to be deleted
+	 *
+	 * @param DeletedObjects	The objects to delete
+	 */
+	void RemoveDeletedObjects( const TArray<UObject*>& DeletedObjects );
+
+	/** Creates a color picker window for a property node */
+	void CreateColorPickerWindow( const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha );
+
+	/** @return The notify hook used by the property */
+	FNotifyHook* GetNotifyHook() const { return NotifyHook; }
+
+	virtual TSharedPtr<IPropertyHandle> GetPropertyHandle() const override { return PropertyHandle;  }
+private:
+	/**
+	 * Sets the color if this is a color property
+	 *
+	 * @param NewColor The color to set
+	 */
+	void SetColorPropertyFromColorPicker(FLinearColor NewColor);
+private:
+	/** The root property node for the value node (contains the root object */
+	TSharedPtr<FObjectPropertyNode> RootPropertyNode;
+	/** The node for the property being edited */
+	TSharedPtr<FPropertyNode> ValueNode;
+	/** Property utilities for handling common functionality of property editors */
+	TSharedPtr<FSinglePropertyUtilities> PropertyUtilities;
+	/** Name override to display instead of the property name */
+	FText NameOverride;
+	/** Font to use */
+	FSlateFontInfo PropertyFont;
+	/** Notify hook to use when editing values */
+	FNotifyHook* NotifyHook;
+	/** Name of the property */
+	FName PropertyName;
+	/** Location of the name in the view */
+	EPropertyNamePlacement::Type NamePlacement;
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SStructureDetailsView.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SStructureDetailsView.cpp
new file mode 100644
index 0000000..1d403eb
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SStructureDetailsView.cpp
@@ -0,0 +1,342 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SStructureDetailsView.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SComboButton.h"
+//#include "AssetSelection.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilderImpl.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.h"
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+#include "Widgets/Colors/SColorPicker.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "RuntimePropertyEditor/DetailsViewPropertyGenerationUtilities.h"
+
+
+#define LOCTEXT_NAMESPACE "SStructureDetailsView"
+
+namespace soda
+{
+
+
+SStructureDetailsView::~SStructureDetailsView()
+{
+	auto RootNodeLocal = GetRootNode();
+
+	if (RootNodeLocal.IsValid())
+	{
+		SaveExpandedItems(RootNodeLocal.ToSharedRef());
+	}
+}
+
+UStruct* SStructureDetailsView::GetBaseScriptStruct() const
+{
+	const UStruct* Struct = StructData.IsValid() ? StructData->GetStruct() : NULL;
+	return const_cast<UStruct*>(Struct);
+}
+
+void SStructureDetailsView::Construct(const FArguments& InArgs)
+{
+	DetailsViewArgs = InArgs._DetailsViewArgs;
+
+	ColumnSizeData.SetValueColumnWidth(DetailsViewArgs.ColumnWidth);
+	ColumnSizeData.SetRightColumnMinWidth(DetailsViewArgs.RightColumnMinWidth);
+
+	CustomName = InArgs._CustomName;
+
+	// Create the root property now
+	// Only one root node in a structure details view
+	RootNodes.Empty(1);
+	RootNodes.Add(MakeShareable(new FStructurePropertyNode));
+		
+	PropertyUtilities = MakeShareable( new FPropertyDetailsUtilities( *this ) );
+	PropertyGenerationUtilities = MakeShareable(new FDetailsViewPropertyGenerationUtilities(*this));
+	
+	TSharedRef<SScrollBar> ExternalScrollbar = SNew(SScrollBar);
+
+	// See note in SDetailsView for why visibility is set after construction
+	ExternalScrollbar->SetVisibility( TAttribute<EVisibility>(this, &SStructureDetailsView::GetScrollBarVisibility) );
+
+	FMenuBuilder DetailViewOptions( true, nullptr );
+
+	FUIAction ShowOnlyModifiedAction( 
+		FExecuteAction::CreateSP(this, &SStructureDetailsView::OnShowOnlyModifiedClicked),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SStructureDetailsView::IsShowOnlyModifiedChecked)
+	);
+
+	if (DetailsViewArgs.bShowModifiedPropertiesOption)
+	{
+		DetailViewOptions.AddMenuEntry( 
+			LOCTEXT("ShowOnlyModified", "Show Only Modified Properties"),
+			LOCTEXT("ShowOnlyModified_ToolTip", "Displays only properties which have been changed from their default"),
+			FSlateIcon(),
+			ShowOnlyModifiedAction,
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton 
+		);
+	}
+	if (DetailsViewArgs.bShowKeyablePropertiesOption)
+	{
+		DetailViewOptions.AddMenuEntry(
+			LOCTEXT("ShowOnlyKeyable", "Show Only Keyable Properties"),
+			LOCTEXT("ShowOnlyKeyable_ToolTip", "Displays only properties which are keyable"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SStructureDetailsView::OnShowKeyableClicked),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SStructureDetailsView::IsShowKeyableChecked)
+			),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+	}
+	if (DetailsViewArgs.bShowAnimatedPropertiesOption)
+	{
+		DetailViewOptions.AddMenuEntry(
+			LOCTEXT("ShowAnimated", "Show Only Animated Properties"),
+			LOCTEXT("ShowAnimated_ToolTip", "Displays only properties which are animated (have tracks)"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SStructureDetailsView::OnShowAnimatedClicked),
+				FCanExecuteAction(),
+				FIsActionChecked::CreateSP(this, &SStructureDetailsView::IsShowAnimatedChecked)
+			),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+	}
+	FUIAction ShowAllAdvancedAction( 
+		FExecuteAction::CreateSP(this, &SStructureDetailsView::OnShowAllAdvancedClicked),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SStructureDetailsView::IsShowAllAdvancedChecked)
+	);
+
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("ShowAllAdvanced", "Show All Advanced Details"),
+		LOCTEXT("ShowAllAdvanced_ToolTip", "Shows all advanced detail sections in each category"),
+		FSlateIcon(),
+		ShowAllAdvancedAction,
+		NAME_None,
+		EUserInterfaceActionType::ToggleButton 
+		);
+
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("CollapseAll", "Collapse All Categories"),
+		LOCTEXT("CollapseAll_ToolTip", "Collapses all root level categories"),
+		FSlateIcon(),
+		FUIAction(FExecuteAction::CreateSP(this, &SStructureDetailsView::SetRootExpansionStates, /*bExpanded=*/false, /*bRecurse=*/false)));
+	DetailViewOptions.AddMenuEntry(
+		LOCTEXT("ExpandAll", "Expand All Categories"),
+		LOCTEXT("ExpandAll_ToolTip", "Expands all root level categories"),
+		FSlateIcon(),
+		FUIAction(FExecuteAction::CreateSP(this, &SStructureDetailsView::SetRootExpansionStates, /*bExpanded=*/true, /*bRecurse=*/false)));
+
+	TSharedRef<SHorizontalBox> FilterBoxRow = SNew( SHorizontalBox )
+		.Visibility(this, &SStructureDetailsView::GetFilterBoxVisibility)
+		+SHorizontalBox::Slot()
+		.FillWidth( 1 )
+		.VAlign( VAlign_Center )
+		[
+			// Create the search box
+			SAssignNew( SearchBox, SSearchBox )
+			.OnTextChanged(this, &SStructureDetailsView::OnFilterTextChanged)
+		];
+
+	if (DetailsViewArgs.bShowOptions)
+	{
+		FilterBoxRow->AddSlot()
+			.HAlign(HAlign_Right)
+			.AutoWidth()
+			[
+				SNew( SComboButton )
+				.ContentPadding(0)
+				.ForegroundColor( FSlateColor::UseForeground() )
+				.ButtonStyle( FAppStyle::Get(), "ToggleButton" )
+				.MenuContent()
+				[
+					DetailViewOptions.MakeWidget()
+				]
+				.ButtonContent()
+				[
+					SNew(SImage)
+					.Image( FAppStyle::GetBrush("GenericViewButton") )
+				]
+			];
+	}
+
+	SAssignNew(DetailTree, SDetailTree)
+		.Visibility(this, &SStructureDetailsView::GetTreeVisibility)
+		.TreeItemsSource(&RootTreeNodes)
+		.OnGetChildren(this, &SStructureDetailsView::OnGetChildrenForDetailTree)
+		.OnSetExpansionRecursive(this, &SStructureDetailsView::SetNodeExpansionStateRecursive)
+		.OnGenerateRow(this, &SStructureDetailsView::OnGenerateRowForDetailTree)
+		.OnExpansionChanged(this, &SStructureDetailsView::OnItemExpansionChanged)
+		.SelectionMode(ESelectionMode::None)
+		.ExternalScrollbar(ExternalScrollbar);
+
+	ChildSlot
+	[
+		SNew( SBox )
+		.Visibility(this, &SStructureDetailsView::GetPropertyEditingVisibility)
+		[
+			SNew( SVerticalBox )
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding( 0.0f, 0.0f, 0.0f, 2.0f )
+			[
+				FilterBoxRow
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			.Padding(0)
+			[
+				SNew( SOverlay )
+				+ SOverlay::Slot()
+				[
+					DetailTree.ToSharedRef()
+				]
+				+ SOverlay::Slot()
+				.HAlign(HAlign_Right)
+				[
+					SNew( SBox )
+					.WidthOverride( 16.0f )
+					[
+						ExternalScrollbar
+					]
+				]
+			]
+		]
+	];
+}
+
+void SStructureDetailsView::SetStructureData(TSharedPtr<FStructOnScope> InStructData)
+{
+	TSharedPtr<FComplexPropertyNode> RootNode = GetRootNode();
+	//PRE SET
+	SaveExpandedItems(RootNode.ToSharedRef() );
+	RootNode->AsStructureNode()->SetStructure(TSharedPtr<FStructOnScope>(nullptr));
+	RootNodesPendingKill.Add(RootNode);
+
+	RootNodes.Empty(1);
+	ExpandedDetailNodes.Empty();
+
+	RootNode = MakeShareable(new FStructurePropertyNode);
+	RootNodes.Add(RootNode);
+
+	//SET
+	StructData = InStructData;
+	RootNode->AsStructureNode()->SetStructure(StructData);
+	if (!StructData.IsValid())
+	{
+		bIsLocked = false;
+	}
+	
+	//POST SET
+	DestroyColorPicker();
+	ColorPropertyNode = NULL;
+
+	FPropertyNodeInitParams InitParams;
+	InitParams.ParentNode = NULL;
+	InitParams.Property = NULL;
+	InitParams.ArrayOffset = 0;
+	InitParams.ArrayIndex = INDEX_NONE;
+	InitParams.bAllowChildren = true;
+	InitParams.bForceHiddenPropertyVisibility = FPropertySettings::Get().ShowHiddenProperties() || DetailsViewArgs.bForceHiddenPropertyVisibility;
+	InitParams.bCreateCategoryNodes = false;
+
+	RootNode->InitNode(InitParams);
+	RootNode->SetDisplayNameOverride(CustomName);
+
+	RestoreExpandedItems(RootNode.ToSharedRef());
+
+	UpdatePropertyMaps();
+
+	UpdateFilteredDetails();
+}
+
+void SStructureDetailsView::SetCustomName(const FText& Text)
+{
+	CustomName = Text;
+}
+
+void SStructureDetailsView::ForceRefresh()
+{
+	SetStructureData(StructData);
+}
+
+void SStructureDetailsView::ClearSearch()
+{
+	CurrentFilter.FilterStrings.Empty();
+	SearchBox->SetText(FText::GetEmpty());
+	RerunCurrentFilter();
+}
+
+
+const TArray< TWeakObjectPtr<UObject> >& SStructureDetailsView::GetSelectedObjects() const
+{
+	static const TArray< TWeakObjectPtr<UObject> > DummyRef;
+	return DummyRef;
+}
+
+const TArray< TWeakObjectPtr<AActor> >& SStructureDetailsView::GetSelectedActors() const
+{
+	static const TArray< TWeakObjectPtr<AActor> > DummyRef;
+	return DummyRef;
+}
+
+
+//const fselectedactorinfo& sstructuredetailsview::getselectedactorinfo() const
+//{
+//	static const fselectedactorinfo dummyref;
+//	return dummyref;
+//}
+
+bool SStructureDetailsView::IsConnected() const
+{
+	const FStructurePropertyNode* RootNode = GetRootNode().IsValid() ? GetRootNode()->AsStructureNode() : nullptr;
+	return StructData.IsValid() && StructData->IsValid() && RootNode && RootNode->HasValidStructData();
+}
+
+FRootPropertyNodeList& SStructureDetailsView::GetRootNodes()
+{
+	return RootNodes;
+}
+
+TSharedPtr<class FComplexPropertyNode> SStructureDetailsView::GetRootNode()
+{
+	return RootNodes[0];
+}
+
+const TSharedPtr<class FComplexPropertyNode> SStructureDetailsView::GetRootNode() const
+{
+	return RootNodes[0];
+}
+
+void SStructureDetailsView::CustomUpdatePropertyMap(TSharedPtr<FDetailLayoutBuilderImpl>& InDetailLayout)
+{
+	FName StructCategoryName = NAME_None;
+	
+	if (StructData.IsValid() && StructData->GetStruct())
+	{
+		TArray<FName> CategoryNames;
+		InDetailLayout->GetCategoryNames(CategoryNames);
+
+		int32 StructCategoryNameIndex = INDEX_NONE;
+		CategoryNames.Find(StructData->GetStruct()->GetFName(), StructCategoryNameIndex);
+		StructCategoryName = StructCategoryNameIndex != INDEX_NONE ? CategoryNames[StructCategoryNameIndex] : NAME_None;
+	}
+	
+	InDetailLayout->DefaultCategory(StructCategoryName).SetDisplayName(NAME_None, CustomName);
+}
+
+EVisibility SStructureDetailsView::GetPropertyEditingVisibility() const
+{
+	const FStructurePropertyNode* RootNode = GetRootNode().IsValid() ? GetRootNode()->AsStructureNode() : nullptr;
+	return StructData.IsValid() && StructData->IsValid() && RootNode && RootNode->HasValidStructData() ? EVisibility::Visible : EVisibility::Collapsed;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/SStructureDetailsView.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SStructureDetailsView.h
new file mode 100644
index 0000000..81d3abb
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/SStructureDetailsView.h
@@ -0,0 +1,131 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "UObject/StructOnScope.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "RuntimePropertyEditor/SDetailsViewBase.h"
+#include "RuntimePropertyEditor/IStructureDetailsView.h"
+
+class AActor;
+
+namespace soda
+{
+
+class FDetailLayoutBuilderImpl;
+class IDetailRootObjectCustomization;
+class IClassViewerFilter;
+
+class SStructureDetailsView : public SDetailsViewBase, public IStructureDetailsView
+{
+
+public:
+
+	SLATE_BEGIN_ARGS(SStructureDetailsView)
+		: _DetailsViewArgs()
+	{ }
+		/** User defined arguments for the details view */
+		SLATE_ARGUMENT(FDetailsViewArgs, DetailsViewArgs)
+
+		/** Custom name for the root property node. */
+		SLATE_ARGUMENT(FText, CustomName)
+	SLATE_END_ARGS()
+
+	/** Destructor. */
+	~SStructureDetailsView();
+
+	/** Constructs the property view widgets. */
+	void Construct(const FArguments& InArgs);
+
+	UStruct* GetBaseScriptStruct() const;
+
+	virtual bool IsConnected() const override;
+
+	virtual bool DontUpdateValueWhileEditing() const override
+	{
+		return true;
+	}
+
+	virtual bool ContainsMultipleTopLevelObjects() const override
+	{
+		return false;
+	}
+
+public:
+
+	// IStructureDetailsView interface
+
+	virtual IDetailsView* GetDetailsView() override
+	{
+		return this;
+	}
+
+	virtual TSharedPtr<SWidget> GetWidget() override
+	{
+		return AsShared();
+	}
+
+	virtual void SetStructureData(TSharedPtr<FStructOnScope> InStructData) override;
+
+	virtual FOnFinishedChangingProperties& GetOnFinishedChangingPropertiesDelegate() override
+	{
+		return OnFinishedChangingProperties();
+	}
+
+public:
+	virtual void ForceRefresh() override;
+	virtual void MoveScrollOffset(int32 DeltaOffset) override {}
+	virtual void ClearSearch() override;
+public:
+
+	// IDetailsView interface
+	virtual const TArray< TWeakObjectPtr<UObject> >& GetSelectedObjects() const override;
+	virtual const TArray< TWeakObjectPtr<AActor> >& GetSelectedActors() const override;
+	//virtual const struct FSelectedActorInfo& GetSelectedActorInfo() const override;
+
+	virtual bool HasClassDefaultObject() const override
+	{
+		return false;
+	}
+
+	virtual void SetOnObjectArrayChanged(FOnObjectArrayChanged OnObjectArrayChangedDelegate) override {}
+	virtual void SetObjects(const TArray<UObject*>& InObjects, bool bForceRefresh = false, bool bOverrideLock = false) override {}
+	virtual void SetObjects(const TArray< TWeakObjectPtr< UObject > >& InObjects, bool bForceRefresh = false, bool bOverrideLock = false) override {}
+	virtual void SetObject(UObject* InObject, bool bForceRefresh = false) override{}
+	virtual void RemoveInvalidObjects() override {}
+	virtual void SetObjectPackageOverrides(const TMap<TWeakObjectPtr<UObject>, TWeakObjectPtr<UPackage>>& InMapping) override {}
+	virtual void SetRootObjectCustomizationInstance(TSharedPtr<IDetailRootObjectCustomization> InRootObjectCustomization) override {}
+	virtual TSharedPtr<class IDetailRootObjectCustomization> GetRootObjectCustomization() const override { return nullptr; }
+	virtual void SetObjectFilter(TSharedPtr<FDetailsViewObjectFilter> InFilter) override {}
+	virtual void SetClassViewerFilters(const TArray<TSharedRef<IClassViewerFilter>>& InFilters) override {}
+	virtual bool IsGroupFavorite(FStringView GroupPath) const { return false; }
+	virtual void SetGroupFavorite(FStringView GroupPath, bool IsFavorite) {}
+	virtual bool IsCustomBuilderFavorite(FStringView Path) const { return false; }
+	virtual void SetCustomBuilderFavorite(FStringView Path, bool IsFavorite) {}
+
+	/* This is required by the base class but there is only ever one root node in a structure details view */
+	virtual FRootPropertyNodeList& GetRootNodes() override;
+
+	TSharedPtr<class FComplexPropertyNode> GetRootNode();
+	const TSharedPtr<class FComplexPropertyNode> GetRootNode() const;
+
+	virtual void SetCustomName(const FText& Text) override;
+
+protected:
+
+	virtual void CustomUpdatePropertyMap(TSharedPtr<FDetailLayoutBuilderImpl>& InDetailLayout) override;
+
+	EVisibility GetPropertyEditingVisibility() const;
+
+private:
+	TSharedPtr<class FStructOnScope> StructData;
+	FRootPropertyNodeList RootNodes;
+	FText CustomName;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/StructurePropertyNode.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/StructurePropertyNode.cpp
new file mode 100644
index 0000000..482828c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/StructurePropertyNode.cpp
@@ -0,0 +1,127 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/StructurePropertyNode.h"
+#include "RuntimePropertyEditor/ItemPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+
+namespace soda
+{
+
+	void FStructurePropertyNode::InitChildNodes()
+	{
+		const bool bShouldShowHiddenProperties = !!HasNodeFlags(EPropertyNodeFlags::ShouldShowHiddenProperties);
+		const bool bShouldShowDisableEditOnInstance = !!HasNodeFlags(EPropertyNodeFlags::ShouldShowDisableEditOnInstance);
+
+		const UStruct* Struct = GetBaseStructure();
+
+		TArray<FProperty*> StructMembers;
+
+		for (TFieldIterator<FProperty> It(Struct); It; ++It)
+		{
+			FProperty* StructMember = *It;
+			if (PropertyEditorHelpers::ShouldBeVisible(*this, StructMember))
+			{
+				StructMembers.Add(StructMember);
+			}
+		}
+
+		PropertyEditorHelpers::OrderPropertiesFromMetadata(StructMembers);
+
+		for (FProperty* StructMember : StructMembers)
+		{
+			TSharedPtr<FItemPropertyNode> NewItemNode(new FItemPropertyNode);
+
+			FPropertyNodeInitParams InitParams;
+			InitParams.ParentNode = SharedThis(this);
+			InitParams.Property = StructMember;
+			InitParams.ArrayOffset = 0;
+			InitParams.ArrayIndex = INDEX_NONE;
+			InitParams.bAllowChildren = true;
+			InitParams.bForceHiddenPropertyVisibility = bShouldShowHiddenProperties;
+			InitParams.bCreateDisableEditOnInstanceNodes = bShouldShowDisableEditOnInstance;
+			InitParams.bCreateCategoryNodes = false;
+
+			NewItemNode->InitNode(InitParams);
+			AddChildNode(NewItemNode);
+		}
+	}
+
+	uint8* FStructurePropertyNode::GetValueBaseAddress(uint8* StartAddress, bool bIsSparseData, bool bIsStruct) const
+	{
+		// If called with struct data, we expect that it is compatible with the first structure node down in the property node chain, return the address as is.
+		// This gets called usually when the calling code is dealing with a parent complex node.
+		if (bIsStruct)
+		{
+			return StartAddress;
+		}
+
+		if (StructProvider)
+		{
+			// Assume that this code gets called with an object or object sparse data.
+			//
+			// The passed object might not be the one that contains the values provided by struct provider.
+			// For example this function might get called on an edited object's template object.
+			// In that case the data structure is expected to match between the data edited by this node and the foreign object.
+
+			// If the structure provider is set up as indirection, then it knows how to translate parent node's value address to
+			// new value address even on data that is not the same as in the structure provider.
+			if (StructProvider->IsPropertyIndirection())
+			{
+				const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+				if (!ensureMsgf(ParentNode, TEXT("Expecting valid parent node when indirection structure provider is called with Object data.")))
+				{
+					return nullptr;
+				}
+				// Resolve from parent nodes data.
+				uint8* ParentValueAddress = ParentNode->GetValueAddress(StartAddress, bIsSparseData);
+				uint8* ValueAddress = StructProvider->GetValueBaseAddress(ParentValueAddress, GetBaseStructure());
+				return ValueAddress;
+			}
+
+			// The struct is really standalone, in which case we always return the standalone struct data.
+			// In that case we can only support one instance, since we cannot discern them.
+			// Note: Multiple standalone structure instances are supported when bIsStruct is true (e.g. when the structure property is root node).
+			TArray<TSharedPtr<FStructOnScope>> Instances;
+			StructProvider->GetInstances(Instances);
+			ensureMsgf(Instances.Num() <= 1, TEXT("Expecting max one instance on standalone structure provider."));
+			if (Instances.Num() == 1 && Instances[0].IsValid())
+			{
+				return Instances[0]->GetStructMemory();
+			}
+		}
+
+		return nullptr;
+	}
+
+	EPropertyDataValidationResult FStructurePropertyNode::EnsureDataIsValid()
+	{
+		CachedReadAddresses.Reset();
+
+		const UStruct* BaseStruct = GetBaseStructure();
+
+		// Check that struct node's children still belong to the current base struct.
+		for (const TSharedPtr<FPropertyNode>& ChildNode : ChildNodes)
+		{
+			if (ChildNode.IsValid())
+			{
+				if (const FProperty* ChildProperty = ChildNode->GetProperty())
+				{
+					const UStruct* OwnerStruct = ChildProperty->GetOwnerStruct();
+					if (!OwnerStruct
+						|| OwnerStruct->IsStructTrashed()
+						|| !BaseStruct
+						|| !BaseStruct->IsChildOf(OwnerStruct)) // OwnerStruct can be BaseStruct or one of structs BaseStruct is derived from.
+					{
+						RebuildChildren();
+						return EPropertyDataValidationResult::ChildrenRebuilt;
+					}
+				}
+			}
+		}
+
+		return FPropertyNode::EnsureDataIsValid();
+	}
+
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/StructurePropertyNode.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/StructurePropertyNode.h
new file mode 100644
index 0000000..86f6a8d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/StructurePropertyNode.h
@@ -0,0 +1,389 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "PropertyNode.h"
+#include "UObject/StructOnScope.h"
+#include "RuntimePropertyEditor/IStructureDataProvider.h"
+
+namespace soda
+{
+//-----------------------------------------------------------------------------
+//	FStructPropertyNode - Used for the root and various sub-nodes
+//-----------------------------------------------------------------------------
+class FStructurePropertyNode : public FComplexPropertyNode
+{
+public:
+	FStructurePropertyNode() : FComplexPropertyNode() {}
+	virtual ~FStructurePropertyNode() override {}
+
+	virtual FStructurePropertyNode* AsStructureNode() override { return this; }
+	virtual const FStructurePropertyNode* AsStructureNode() const override { return this; }
+
+	void RemoveStructure()
+	{
+		ClearCachedReadAddresses(true);
+		DestroyTree();
+		StructProvider = nullptr;
+	}
+
+	void SetStructure(TSharedPtr<FStructOnScope> InStructData)
+	{
+		RemoveStructure();
+		if (InStructData)
+		{
+			StructProvider = MakeShared<FStructOnScopeStructureDataProvider>(InStructData);
+		}
+	}
+
+	void SetStructure(TSharedPtr<IStructureDataProvider> InStructProvider)
+	{
+		RemoveStructure();
+		StructProvider = InStructProvider;
+	}
+
+	bool HasValidStructData() const
+	{
+		return StructProvider.IsValid() && StructProvider->IsValid();
+	}
+
+	// Returns just the first structure. Please use GetStructProvider() or GetAllStructureData() when dealing with multiple struct instances.
+	TSharedPtr<FStructOnScope> GetStructData() const
+	{
+		if (StructProvider)
+		{
+			TArray<TSharedPtr<FStructOnScope>> Instances;
+			StructProvider->GetInstances(Instances);
+			
+			if (Instances.Num() > 0)
+			{
+				return Instances[0];
+			}
+		}
+		return nullptr;
+	}
+
+	void GetAllStructureData(TArray<TSharedPtr<FStructOnScope>>& OutStructs) const
+	{
+		if (StructProvider)
+		{
+			StructProvider->GetInstances(OutStructs);
+		}
+	}
+
+	TSharedPtr<IStructureDataProvider> GetStructProvider() const
+	{
+		return StructProvider;
+	}
+
+	bool GetReadAddressUncached(const FPropertyNode& InPropertyNode, FReadAddressListData& OutAddresses) const override
+	{
+		if (!HasValidStructData())
+		{
+			return false;
+		}
+		check(StructProvider.IsValid());
+
+		const FProperty* InItemProperty = InPropertyNode.GetProperty();
+		if (!InItemProperty)
+		{
+			return false;
+		}
+
+		UStruct* OwnerStruct = InItemProperty->GetOwnerStruct();
+		if (!OwnerStruct || OwnerStruct->IsStructTrashed())
+		{
+			// Verify that the property is not part of an invalid trash class
+			return false;
+		}
+
+		TArray<TSharedPtr<FStructOnScope>> Instances;
+		StructProvider->GetInstances(Instances);
+		bool bHasData = false;
+
+		for (TSharedPtr<FStructOnScope>& Instance : Instances)
+		{
+			uint8* ReadAddress = Instance.IsValid() ? Instance->GetStructMemory() : nullptr;
+			if (ReadAddress)
+			{
+				OutAddresses.Add(nullptr, InPropertyNode.GetValueBaseAddress(ReadAddress, InPropertyNode.HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) != 0, /*bIsStruct=*/true), /*bIsStruct=*/true);
+				bHasData = true;
+			}
+		}
+		return bHasData;
+	}
+
+	bool GetReadAddressUncached(const FPropertyNode& InPropertyNode,
+		bool InRequiresSingleSelection,
+		FReadAddressListData* OutAddresses,
+		bool bComparePropertyContents,
+		bool bObjectForceCompare,
+		bool bArrayPropertiesCanDifferInSize) const override
+	{
+		if (!HasValidStructData())
+		{
+			return false;
+		}
+		check(StructProvider.IsValid());
+
+		const FProperty* InItemProperty = InPropertyNode.GetProperty();
+		if (!InItemProperty)
+		{
+			return false;
+		}
+
+		const UStruct* OwnerStruct = InItemProperty->GetOwnerStruct();
+		if (!OwnerStruct || OwnerStruct->IsStructTrashed())
+		{
+			// Verify that the property is not part of an invalid trash class
+			return false;
+		}
+
+		bool bAllTheSame = true;
+
+		TArray<TSharedPtr<FStructOnScope>> Instances;
+		StructProvider->GetInstances(Instances);
+		
+		if (Instances.IsEmpty())
+		{
+			return false;
+		}
+
+		if (bComparePropertyContents || bObjectForceCompare)
+		{
+			const bool bIsSparse = InPropertyNode.HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) != 0;
+			const uint8* BaseAddress = nullptr;
+			const UStruct* BaseStruct = nullptr;
+
+			for (TSharedPtr<FStructOnScope>& Instance : Instances)
+			{
+				if (Instance.IsValid())
+				{
+					if (const UStruct* Struct = Instance->GetStruct())
+					{
+						if (const uint8* ReadAddress = InPropertyNode.GetValueBaseAddress(Instance->GetStructMemory(), bIsSparse, /*bIsStruct=*/true))
+						{
+							if (!BaseAddress)
+							{
+								BaseAddress = ReadAddress;
+								BaseStruct = Struct;
+							}
+							else
+							{
+								if (BaseStruct != Struct)
+								{
+									bAllTheSame = false;
+									break;
+								}
+								if (!InItemProperty->Identical(BaseAddress, ReadAddress))
+								{
+									bAllTheSame = false;
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			// Check that all are valid or invalid.
+			const UStruct* BaseStruct = Instances[0].IsValid() ? Instances[0]->GetStruct() : nullptr;
+			for (int32 Index = 1; Index < Instances.Num(); Index++)
+			{
+				const UStruct* Struct = Instances[Index].IsValid() ? Instances[Index]->GetStruct() : nullptr;
+				if (BaseStruct != Struct)
+				{
+					bAllTheSame = false;
+					break;
+				}
+			}
+		}
+
+		if (bAllTheSame && OutAddresses)
+		{
+			for (TSharedPtr<FStructOnScope>& Instance : Instances)
+			{
+				uint8* ReadAddress = Instance.IsValid() ? Instance->GetStructMemory() : nullptr;
+				if (ReadAddress)
+				{
+					OutAddresses->Add(nullptr, InPropertyNode.GetValueBaseAddress(ReadAddress, InPropertyNode.HasNodeFlags(EPropertyNodeFlags::IsSparseClassData) != 0, /*bIsStruct=*/true), /*bIsStruct=*/true);
+				}
+			}
+		}
+
+		return bAllTheSame;
+	}
+
+	void GetOwnerPackages(TArray<UPackage*>& OutPackages) const
+	{
+		if (StructProvider)
+		{
+			TArray<TSharedPtr<FStructOnScope>> Instances;
+			StructProvider->GetInstances(Instances);
+
+			for (TSharedPtr<FStructOnScope>& Instance : Instances)
+			{
+				// Returning null for invalid instances, to match instance count.
+				OutPackages.Add(Instance.IsValid() ? Instance->GetPackage() : nullptr);
+			}
+		}
+	}
+
+	/** FComplexPropertyNode Interface */
+	virtual const UStruct* GetBaseStructure() const override
+	{ 
+		if (StructProvider)
+		{
+			return StructProvider->GetBaseStructure();
+		}
+		return nullptr; 
+	}
+	virtual UStruct* GetBaseStructure() override
+	{
+		if (StructProvider)
+		{
+			return const_cast<UStruct*>(StructProvider->GetBaseStructure());
+		}
+		return nullptr; 
+	}
+	virtual TArray<UStruct*> GetAllStructures() override
+	{
+		TArray<UStruct*> RetVal;
+		if (StructProvider)
+		{
+			TArray<TSharedPtr<FStructOnScope>> Instances;
+			StructProvider->GetInstances(Instances);
+			
+			for (TSharedPtr<FStructOnScope>& Instance : Instances)
+			{
+				const UStruct* Struct = Instance.IsValid() ? Instance->GetStruct() : nullptr;
+				if (Struct)
+				{
+					RetVal.AddUnique(const_cast<UStruct*>(Struct));
+				}
+			}
+		}
+
+		return RetVal;
+	}
+	virtual TArray<const UStruct*> GetAllStructures() const override
+	{
+		TArray<const UStruct*> RetVal;
+		if (StructProvider)
+		{
+			TArray<TSharedPtr<FStructOnScope>> Instances;
+			StructProvider->GetInstances(Instances);
+			
+			for (TSharedPtr<FStructOnScope>& Instance : Instances)
+			{
+				const UStruct* Struct = Instance.IsValid() ? Instance->GetStruct() : nullptr;
+				if (Struct)
+				{
+					RetVal.AddUnique(Struct);
+				}
+			}
+		}
+		return RetVal;
+	}
+	virtual int32 GetInstancesNum() const override
+	{
+		if (StructProvider)
+		{
+			TArray<TSharedPtr<FStructOnScope>> Instances;
+			StructProvider->GetInstances(Instances);
+			
+			return Instances.Num();
+		}
+		return 0;
+		
+	}
+	virtual uint8* GetMemoryOfInstance(int32 Index) const override
+	{
+		if (StructProvider)
+		{
+			TArray<TSharedPtr<FStructOnScope>> Instances;
+			StructProvider->GetInstances(Instances);
+			if (Instances.IsValidIndex(Index) && Instances[Index].IsValid())
+			{
+				return Instances[Index]->GetStructMemory();
+			}
+		}
+		return nullptr;
+	}
+	virtual uint8* GetValuePtrOfInstance(int32 Index, const FProperty* InProperty, const FPropertyNode* InParentNode) const override
+	{ 
+		if (InProperty == nullptr || InParentNode == nullptr)
+		{
+			return nullptr;
+		}
+
+		uint8* StructBaseAddress = GetMemoryOfInstance(Index);
+		if (StructBaseAddress == nullptr)
+		{
+			return nullptr;
+		}
+
+		uint8* ParentBaseAddress = InParentNode->GetValueAddress(StructBaseAddress, false, /*bIsStruct=*/true);
+		if (ParentBaseAddress == nullptr)
+		{
+			return nullptr;
+		}
+
+		return InProperty->ContainerPtrToValuePtr<uint8>(ParentBaseAddress);
+	}
+
+	virtual TWeakObjectPtr<UObject> GetInstanceAsUObject(int32 Index) const override
+	{
+		return nullptr;
+	}
+	virtual EPropertyType GetPropertyType() const override
+	{
+		return EPT_StandaloneStructure;
+	}
+
+	virtual void Disconnect() override
+	{
+		ClearCachedReadAddresses(true);
+		DestroyTree();
+		StructProvider = nullptr;
+	}
+
+protected:
+
+	virtual EPropertyDataValidationResult EnsureDataIsValid() override;
+
+	/** FPropertyNode interface */
+	virtual void InitChildNodes() override;
+
+	virtual uint8* GetValueBaseAddress(uint8* Base, bool bIsSparseData, bool bIsStruct) const override;
+
+	virtual bool GetQualifiedName(FString& PathPlusIndex, const bool bWithArrayIndex, const FPropertyNode* StopParent = nullptr, bool bIgnoreCategories = false) const override
+	{
+		bool bAddedAnything = false;
+		const TSharedPtr<FPropertyNode> ParentNode = ParentNodeWeakPtr.Pin();
+		if (ParentNode && StopParent != ParentNode.Get())
+		{
+			bAddedAnything = ParentNode->GetQualifiedName(PathPlusIndex, bWithArrayIndex, StopParent, bIgnoreCategories);
+		}
+
+		if (bAddedAnything)
+		{
+			PathPlusIndex += TEXT(".");
+		}
+
+		PathPlusIndex += TEXT("Struct");
+		bAddedAnything = true;
+
+		return bAddedAnything;
+	}
+
+private:
+	TSharedPtr<IStructureDataProvider> StructProvider;
+};
+
+} // namespace soda
+
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.cpp
new file mode 100644
index 0000000..57326fd
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.cpp
@@ -0,0 +1,88 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/IDetailsViewPrivate.h"
+
+namespace soda
+{
+
+FPropertyDetailsUtilities::FPropertyDetailsUtilities(IDetailsViewPrivate& InDetailsView)
+	: DetailsView( InDetailsView )
+{
+}
+
+FNotifyHook* FPropertyDetailsUtilities::GetNotifyHook() const
+{
+	return DetailsView.GetNotifyHook();
+}
+
+bool FPropertyDetailsUtilities::AreFavoritesEnabled() const
+{
+	// not implemented
+	return false;
+}
+
+void FPropertyDetailsUtilities::ToggleFavorite( const TSharedRef< FPropertyEditor >& PropertyEditor ) const
+{
+	// not implemented
+}
+
+void FPropertyDetailsUtilities::CreateColorPickerWindow( const TSharedRef< FPropertyEditor >& PropertyEditor, bool bUseAlpha ) const
+{
+	DetailsView.CreateColorPickerWindow( PropertyEditor, bUseAlpha );
+}
+
+void FPropertyDetailsUtilities::EnqueueDeferredAction( FSimpleDelegate DeferredAction )
+{
+	DetailsView.EnqueueDeferredAction( DeferredAction );
+}
+
+bool FPropertyDetailsUtilities::IsPropertyEditingEnabled() const
+{
+	return DetailsView.IsPropertyEditingEnabled();
+}
+
+void FPropertyDetailsUtilities::ForceRefresh()
+{
+	DetailsView.ForceRefresh();
+}
+
+void FPropertyDetailsUtilities::RequestRefresh()
+{
+	DetailsView.RefreshTree();
+}
+/*
+TSharedPtr<class FAssetThumbnailPool> FPropertyDetailsUtilities::GetThumbnailPool() const
+{
+	return DetailsView.GetThumbnailPool();
+}
+*/
+
+const TArray<TSharedRef<IClassViewerFilter>>& FPropertyDetailsUtilities::GetClassViewerFilters() const
+{
+	return DetailsView.GetClassViewerFilters();
+}
+
+void FPropertyDetailsUtilities::NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent)
+{
+	DetailsView.NotifyFinishedChangingProperties(PropertyChangedEvent);
+}
+
+bool FPropertyDetailsUtilities::DontUpdateValueWhileEditing() const
+{
+	return DetailsView.DontUpdateValueWhileEditing();
+}
+
+const TArray<TWeakObjectPtr<UObject>>& FPropertyDetailsUtilities::GetSelectedObjects() const
+{
+	return DetailsView.GetSelectedObjects();
+}
+
+bool FPropertyDetailsUtilities::HasClassDefaultObject() const
+{
+	return DetailsView.HasClassDefaultObject();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.h
new file mode 100644
index 0000000..7eb964f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyDetails/PropertyDetailsUtilities.h
@@ -0,0 +1,42 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+//#include "AssetThumbnail.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+
+struct FPropertyChangedEvent;
+
+namespace soda
+{
+
+class IDetailsViewPrivate;
+class IClassViewerFilter;
+
+class FPropertyDetailsUtilities : public IPropertyUtilities
+{
+public:
+	FPropertyDetailsUtilities(IDetailsViewPrivate& InDetailsView);
+	/** IPropertyUtilities interface */
+	virtual FNotifyHook* GetNotifyHook() const override;
+	virtual bool AreFavoritesEnabled() const override;
+	virtual void ToggleFavorite( const TSharedRef< class FPropertyEditor >& PropertyEditor ) const override;
+	virtual void CreateColorPickerWindow( const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha ) const override;
+	virtual void EnqueueDeferredAction( FSimpleDelegate DeferredAction ) override;
+	virtual bool IsPropertyEditingEnabled() const override;
+	virtual void ForceRefresh() override;
+	virtual void RequestRefresh() override;
+	//virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const override;
+	virtual void NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual bool DontUpdateValueWhileEditing() const override;
+	const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const override;
+	virtual bool HasClassDefaultObject() const override;
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const override;
+
+private:
+	IDetailsViewPrivate& DetailsView;
+};
+
+}
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorAssetConstants.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorAssetConstants.h
new file mode 100644
index 0000000..294f22a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorAssetConstants.h
@@ -0,0 +1,17 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+namespace PropertyEditorAssetConstants
+{
+	static const FVector2D ContentBrowserWindowSize(300.0f, 300.0f);
+	static const FVector2D SceneOutlinerWindowSize(350.0f, 300.0f);
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.cpp
new file mode 100644
index 0000000..98cd563
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.cpp
@@ -0,0 +1,57 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "SodaStyleSet.h"
+#include "Styling/StyleColors.h"
+
+namespace soda
+{
+
+const FName PropertyEditorConstants::PropertyFontStyle( TEXT("PropertyWindow.NormalFont") );
+const FName PropertyEditorConstants::CategoryFontStyle( TEXT("DetailsView.CategoryFontStyle") );
+
+const FName PropertyEditorConstants::MD_Bitmask( TEXT("Bitmask") );
+const FName PropertyEditorConstants::MD_BitmaskEnum( TEXT("BitmaskEnum") );
+const FName PropertyEditorConstants::MD_UseEnumValuesAsMaskValuesInEditor( TEXT("UseEnumValuesAsMaskValuesInEditor") );
+
+const FSlateBrush* PropertyEditorConstants::GetOverlayBrush(const TSharedRef<class FPropertyEditor> PropertyEditor )
+{
+	return FSodaStyle::GetBrush( TEXT("PropertyWindow.NoOverlayColor") );
+}
+
+FSlateColor PropertyEditorConstants::GetRowBackgroundColor(int32 IndentLevel, bool IsHovered) 
+{
+	int32 ColorIndex = 0;
+	int32 Increment = 1;
+
+	for (int i = 0; i < IndentLevel; ++i)
+	{
+		ColorIndex += Increment;
+
+		if (ColorIndex == 0 || ColorIndex == 3)
+		{
+			Increment = -Increment;
+		}
+	}
+
+	static const uint8 ColorOffsets[] =
+	{
+		0, 4, (4 + 2), (6 + 4), (10 + 6)
+	};
+
+	const FSlateColor BaseSlateColor = IsHovered ? 
+		FAppStyle::Get().GetSlateColor("Colors.Header") : 
+		FAppStyle::Get().GetSlateColor("Colors.Panel");
+
+	const FColor BaseColor = BaseSlateColor.GetSpecifiedColor().ToFColor(true);
+
+	const FColor ColorWithOffset(
+		BaseColor.R + ColorOffsets[ColorIndex], 
+		BaseColor.G + ColorOffsets[ColorIndex], 
+		BaseColor.B + ColorOffsets[ColorIndex]);
+
+	return FSlateColor(FLinearColor::FromSRGBColor(ColorWithOffset));
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h
new file mode 100644
index 0000000..c2620c1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h
@@ -0,0 +1,33 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Styling/SlateColor.h"
+#include "UObject/NameTypes.h"
+#include "Templates/SharedPointer.h"
+
+struct FSlateBrush;
+
+namespace soda
+{
+
+class PropertyEditorConstants
+{
+public:
+
+	static const FName PropertyFontStyle;
+	static const FName CategoryFontStyle;
+
+	static const FName MD_Bitmask;
+	static const FName MD_BitmaskEnum;
+	static const FName MD_UseEnumValuesAsMaskValuesInEditor;
+
+	static constexpr float PropertyRowHeight = 26.0f;
+
+	static const FSlateBrush* GetOverlayBrush(const TSharedRef<class FPropertyEditor> PropertyEditor);
+
+	static FSlateColor GetRowBackgroundColor(int32 IndentLevel, bool IsHovered);
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.cpp
new file mode 100644
index 0000000..cb174e1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.cpp
@@ -0,0 +1,231 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.h"
+#include "Widgets/SToolTip.h"
+
+#define LOCTEXT_NAMESPACE "PropertyComboBox"
+
+namespace soda
+{
+
+void SPropertyComboBox::Construct( const FArguments& InArgs )
+{
+	ComboItemList = InArgs._ComboItemList.Get();
+	RestrictedList = InArgs._RestrictedList.Get();
+	RichToolTips = InArgs._RichToolTipList;
+	OnSelectionChanged = InArgs._OnSelectionChanged;
+	ShowSearchForItemCount = InArgs._ShowSearchForItemCount;
+	Font = InArgs._Font;
+
+	// find the initially selected item, if any
+	const FString VisibleText = InArgs._VisibleText.Get();
+	TSharedPtr<FString> InitiallySelectedItem = NULL;
+	for(int32 ItemIndex = 0; ItemIndex < ComboItemList.Num(); ++ItemIndex)
+	{
+		if(*ComboItemList[ItemIndex].Get() == VisibleText)
+		{
+			if (RichToolTips.IsValidIndex(ItemIndex))
+			{
+				SetToolTip(RichToolTips[ItemIndex]);
+			}
+			else
+			{
+				SetToolTip(nullptr);
+			}
+
+			InitiallySelectedItem = ComboItemList[ItemIndex];
+			break;
+		}
+	}
+
+	auto VisibleTextAttr = InArgs._VisibleText;
+	SSearchableComboBox::Construct(SSearchableComboBox::FArguments()
+		.Content()
+		[
+			SNew( STextBlock )
+			.Text_Lambda( [=] { return (VisibleTextAttr.IsSet()) ? FText::FromString(VisibleTextAttr.Get()) : FText::GetEmpty(); } )
+			.Font( Font )
+		]
+		.OptionsSource(&ComboItemList)
+		.OnGenerateWidget(this, &SPropertyComboBox::OnGenerateComboWidget)
+		.OnSelectionChanged(this, &SPropertyComboBox::OnSelectionChangedInternal)
+		.OnComboBoxOpening(InArgs._OnComboBoxOpening)
+		.InitiallySelectedItem(InitiallySelectedItem)
+		.SearchVisibility(this, &SPropertyComboBox::GetSearchVisibility)
+		);
+}
+
+SPropertyComboBox::~SPropertyComboBox()
+{
+	if (IsOpen())
+	{
+		SetIsOpen(false);
+	}
+}
+
+void SPropertyComboBox::SetSelectedItem( const FString& InSelectedItem )
+{
+	// Look for the item, due to drag and dropping of Blueprints that may not be in this list.
+	for(int32 ItemIndex = 0; ItemIndex < ComboItemList.Num(); ++ItemIndex)
+	{
+		if(*ComboItemList[ItemIndex].Get() == InSelectedItem)
+		{
+			if(RichToolTips.IsValidIndex(ItemIndex))
+			{
+				SetToolTip(RichToolTips[ItemIndex]);
+			}
+			else
+			{
+				SetToolTip(nullptr);
+			}
+
+			SSearchableComboBox::SetSelectedItem(ComboItemList[ItemIndex]);
+			return;
+		}
+	}
+
+	// Clear selection in this case
+	SSearchableComboBox::ClearSelection();
+
+}
+
+void SPropertyComboBox::SetItemList(TArray< TSharedPtr< FString > >& InItemList, TArray< TSharedPtr< SToolTip > >& InRichTooltips, TArray<bool>& InRestrictedList)
+{
+	ComboItemList = InItemList;
+	RichToolTips = InRichTooltips;
+	RestrictedList = InRestrictedList;
+	RefreshOptions();
+}
+
+void SPropertyComboBox::OnSelectionChangedInternal( TSharedPtr<FString> InSelectedItem, ESelectInfo::Type SelectInfo )
+{
+	bool bEnabled = true;
+
+	if (!InSelectedItem.IsValid())
+	{
+		return;
+	}
+
+	if (RestrictedList.Num() > 0)
+	{
+		int32 Index = 0;
+		for( ; Index < ComboItemList.Num() ; ++Index )
+		{
+			if( *ComboItemList[Index] == *InSelectedItem )
+				break;
+		}
+
+		if ( Index < ComboItemList.Num() )
+		{
+			bEnabled = !RestrictedList[Index];
+		}
+	}
+
+	if( bEnabled )
+	{
+		OnSelectionChanged.ExecuteIfBound( InSelectedItem, SelectInfo );
+		SetSelectedItem(*InSelectedItem);
+	}
+}
+
+TSharedRef<SWidget> SPropertyComboBox::OnGenerateComboWidget( TSharedPtr<FString> InComboString )
+{
+	//Find the corresponding tool tip for this combo entry if any
+	TSharedPtr<SToolTip> RichToolTip = nullptr;
+	bool bEnabled = true;
+	if (RichToolTips.Num() > 0)
+	{
+		int32 Index = ComboItemList.IndexOfByKey(InComboString);
+		if (Index >= 0)
+		{
+			//A list of tool tips should have been populated in a 1 to 1 correspondance
+			check(ComboItemList.Num() == RichToolTips.Num());
+			RichToolTip = RichToolTips[Index];
+
+			if( RestrictedList.Num() > 0 )
+			{
+				bEnabled = !RestrictedList[Index];
+			}
+		}
+	}
+
+	return
+		SNew( STextBlock )
+		.Text( FText::FromString(*InComboString) )
+		.Font( Font )
+		.ToolTip(RichToolTip)
+		.IsEnabled(bEnabled);
+}
+
+EVisibility SPropertyComboBox::GetSearchVisibility() const
+{
+	if (ShowSearchForItemCount >= 0 && ComboItemList.Num() >= ShowSearchForItemCount)
+	{
+		return EVisibility::Visible;
+	}
+
+	return EVisibility::Collapsed;
+}
+
+FReply SPropertyComboBox::OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent )
+{
+	const FKey Key = InKeyEvent.GetKey();
+
+	if(Key == EKeys::Up)
+	{
+		const int32 SelectionIndex = ComboItemList.Find( GetSelectedItem() );
+		if ( SelectionIndex >= 1 )
+		{
+			if (RestrictedList.Num() > 0)
+			{
+				// find & select the previous unrestricted item
+				for(int32 TestIndex = SelectionIndex - 1; TestIndex >= 0; TestIndex--)
+				{
+					if(!RestrictedList[TestIndex])
+					{
+						SSearchableComboBox::SetSelectedItem(ComboItemList[TestIndex]);
+						break;
+					}
+				}
+			}
+			else
+			{
+				SSearchableComboBox::SetSelectedItem(ComboItemList[SelectionIndex - 1]);
+			}
+		}
+
+		return FReply::Handled();
+	}
+	else if(Key == EKeys::Down)
+	{
+		const int32 SelectionIndex = ComboItemList.Find( GetSelectedItem() );
+		if ( SelectionIndex < ComboItemList.Num() - 1 )
+		{
+			if (RestrictedList.Num() > 0)
+			{
+				// find & select the next unrestricted item
+				for(int32 TestIndex = SelectionIndex + 1; TestIndex < RestrictedList.Num() && TestIndex < ComboItemList.Num(); TestIndex++)
+				{
+					if(!RestrictedList[TestIndex])
+					{
+						SSearchableComboBox::SetSelectedItem(ComboItemList[TestIndex]);
+						break;
+					}
+				}
+			}
+			else
+			{
+				SSearchableComboBox::SetSelectedItem(ComboItemList[SelectionIndex + 1]);
+			}
+		}
+
+		return FReply::Handled();
+	}
+
+	return SSearchableComboBox::OnKeyDown( MyGeometry, InKeyEvent );
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.h
new file mode 100644
index 0000000..d76fdcb
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.h
@@ -0,0 +1,80 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "SSearchableComboBox.h"
+
+class SToolTip;
+
+namespace soda
+{
+
+class SPropertyComboBox : public SSearchableComboBox
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyComboBox )
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) )
+		, _ShowSearchForItemCount(-1)
+	{}
+		SLATE_ATTRIBUTE( TArray< TSharedPtr< FString > >, ComboItemList )
+		SLATE_ATTRIBUTE( TArray< bool >, RestrictedList )
+		SLATE_ATTRIBUTE( FString, VisibleText )
+		SLATE_ARGUMENT( TArray< TSharedPtr< SToolTip > >, RichToolTipList)
+		SLATE_EVENT( FOnSelectionChanged, OnSelectionChanged )
+		SLATE_EVENT( FOnComboBoxOpening, OnComboBoxOpening )
+		SLATE_ARGUMENT( FSlateFontInfo, Font )
+		SLATE_ARGUMENT( int32, ShowSearchForItemCount )
+	SLATE_END_ARGS()
+
+	
+	void Construct( const FArguments& InArgs );
+
+	~SPropertyComboBox();
+
+	/**
+	 *	Sets the currently selected item for the combo box.
+	 *	@param InSelectedItem			The name of the item to select.
+	 */
+	void SetSelectedItem( const FString& InSelectedItem );
+
+	/** 
+	 *	Sets the item list for the combo box.
+	 *	@param InItemList			The item list to use.
+	 *	@param InTooltipList		The list of tooltips to use.
+	 *	@param InRestrictedList		The list of restricted items.
+	 */
+	void SetItemList(TArray< TSharedPtr< FString > >& InItemList, TArray< TSharedPtr< SToolTip > >& InRichTooltips, TArray<bool>& InRestrictedList);
+
+
+private:
+
+	void OnSelectionChangedInternal( TSharedPtr<FString> InSelectedItem, ESelectInfo::Type SelectInfo );
+
+	TSharedRef<SWidget> OnGenerateComboWidget( TSharedPtr<FString> InComboString );
+	
+	EVisibility GetSearchVisibility() const;
+
+	/** SWidget interface */
+	FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent ) override;
+
+private:
+
+	/** List of items in our combo box. Only generated once as combo items dont change at runtime */
+	TArray< TSharedPtr<FString> > ComboItemList;
+	TArray< TSharedPtr< SToolTip > > RichToolTips;
+	FOnSelectionChanged OnSelectionChanged;
+	FSlateFontInfo Font;
+	TArray< bool > RestrictedList;
+	int32 ShowSearchForItemCount;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditor.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditor.h
new file mode 100644
index 0000000..6d63df2
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditor.h
@@ -0,0 +1,76 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/UnrealType.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "Widgets/Input/SEditableTextBox.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+class SPropertyEditor : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SPropertyEditor )
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) ) 
+	{}
+	SLATE_ATTRIBUTE( FSlateFontInfo, Font )
+		SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+	{
+		PropertyEditor = InPropertyEditor;
+
+		if( ShouldShowValue( InPropertyEditor ) )
+		{
+			ChildSlot
+			[
+				// Make a read only text box so that copy still works
+				SNew( SEditableTextBox )
+				.Text( InPropertyEditor, &FPropertyEditor::GetValueAsText )
+				.ToolTipText( InPropertyEditor, &FPropertyEditor::GetValueAsText )
+				.Font( InArgs._Font )
+				.IsReadOnly( true )
+			];
+		}
+	}
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+	{
+		OutMinDesiredWidth = 125.0f;
+		OutMaxDesiredWidth = 0.0f;
+
+		if( PropertyEditor.IsValid() )
+		{
+			const FProperty* Property = PropertyEditor->GetProperty();
+			if( Property && Property->IsA<FStructProperty>() )
+			{
+				// Struct headers with nothing in them have no min width
+				OutMinDesiredWidth = 0;
+				OutMaxDesiredWidth = 130.0f;
+			}
+			
+		}
+	}
+private:
+	bool ShouldShowValue( const TSharedRef< class FPropertyEditor >& InPropertyEditor ) const 
+	{
+		return PropertyEditor->GetProperty() && !PropertyEditor->GetProperty()->IsA<FStructProperty>();
+	}
+private:
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+};
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArray.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArray.h
new file mode 100644
index 0000000..270b069
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArray.h
@@ -0,0 +1,190 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "Widgets/Text/STextBlock.h"
+//#include "DragAndDrop/AssetDragDropOp.h"
+//#include "SDropTarget.h"
+
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+class SPropertyEditorArray : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorArray )
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) ) 
+		{}
+		SLATE_ATTRIBUTE( FSlateFontInfo, Font )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, const TSharedRef<FPropertyEditor>& InPropertyEditor )
+	{
+		PropertyEditor = InPropertyEditor;
+
+		TAttribute<FText> TextAttr;
+		if( PropertyEditorHelpers::IsStaticArray( *InPropertyEditor->GetPropertyNode() ) )
+		{
+			// Static arrays need special case handling for their values
+			TextAttr.Set( GetArrayTextValue() );
+		}
+		else
+		{
+			TextAttr.Bind( this, &SPropertyEditorArray::GetArrayTextValue );
+		}
+
+		ChildSlot
+		.Padding( 0.0f, 0.0f, 2.0f, 0.0f );
+		/*
+		[
+			SNew(SDropTarget)
+			.OnDropped(this, &SPropertyEditorArray::OnDragDropTarget)
+			.OnAllowDrop(this, &SPropertyEditorArray::WillAddValidElements)
+			.OnIsRecognized(this, &SPropertyEditorArray::IsValidAssetDropOp)
+			.Content()
+			[
+				SNew(STextBlock)
+				.Text(TextAttr)
+				.Font(InArgs._Font)
+			]
+		];
+		*/
+
+		SetEnabled( TAttribute<bool>( this, &SPropertyEditorArray::CanEdit ) );
+	}
+
+	static bool Supports( const TSharedRef<FPropertyEditor>& InPropertyEditor )
+	{
+		const FProperty* NodeProperty = InPropertyEditor->GetProperty();
+
+		return PropertyEditorHelpers::IsStaticArray( *InPropertyEditor->GetPropertyNode() ) 
+			|| PropertyEditorHelpers::IsDynamicArray( *InPropertyEditor->GetPropertyNode() );
+	}
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float &OutMaxDesiredWidth )
+	{
+		OutMinDesiredWidth = 170.0f;
+		OutMaxDesiredWidth = 170.0f;
+	}
+private:
+	FText GetArrayTextValue() const
+	{
+		FString ArrayString;
+		FPropertyAccess::Result GetValResult = PropertyEditor->GetPropertyHandle()->GetValueAsDisplayString(ArrayString);
+
+		if (GetValResult == FPropertyAccess::MultipleValues)
+		{
+			return LOCTEXT("MultipleValues", "Multiple Values");
+		}
+		return FText::Format( LOCTEXT("NumArrayItemsFmt", "{0} Array elements"), FText::AsNumber(PropertyEditor->GetPropertyNode()->GetNumChildNodes()) );
+	}
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const
+	{
+		return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+	}
+
+	/*
+	FReply OnDragDropTarget(const FGeometry& InGeometry, const FDragDropEvent& InDragDropEvent)
+	{
+		FObjectProperty* ObjectProperty = nullptr;
+		if (const FArrayProperty* ArrayProperty = CastField<FArrayProperty>(PropertyEditor->GetProperty()))
+		{
+			ObjectProperty = CastField<FObjectProperty>(ArrayProperty->Inner);
+		}
+
+		// Only try to add entries if we are dropping on an asset array
+		TSharedPtr<FDragDropOperation> DragOperation = InDragDropEvent.GetOperation();
+		if (ObjectProperty && DragOperation && DragOperation->IsOfType<FSodaDragDropOp>())
+		{
+			TSharedPtr<FSodaDragDropOp> DragDropOp = StaticCastSharedPtr<FSodaDragDropOp>(DragOperation);
+			if (DragDropOp.IsValid())
+			{
+				for (FAssetData AssetData : DragDropOp->GetAssets())
+				{
+					// if the type matches
+					if (AssetData.GetClass()->IsChildOf(ObjectProperty->PropertyClass))
+					{
+						PropertyEditor->AddGivenItem(AssetData.ObjectPath.ToString());
+					}
+				}
+				// Let this bubble up to the rest of the row
+				return FReply::Unhandled();
+
+			}
+		}
+		return FReply::Unhandled();
+	}
+
+	bool IsValidAssetDropOp(TSharedPtr<FDragDropOperation> InOperation)
+	{
+		FObjectProperty* ObjectProperty = nullptr;
+		if (const FArrayProperty* ArrayProperty = CastField<FArrayProperty>(PropertyEditor->GetProperty()))
+		{
+			ObjectProperty = CastField<FObjectProperty>(ArrayProperty->Inner);
+		}
+
+		// Only try to add entries if we are dropping on an asset array
+		if (ObjectProperty && InOperation->IsOfType<FSodaDragDropOp>())
+		{
+			return true;
+		}
+		return false;
+	}
+	
+
+	bool WillAddValidElements(TSharedPtr<FDragDropOperation> InOperation)
+	{
+		FObjectProperty* ObjectProperty = nullptr;
+
+		if (const FArrayProperty* ArrayProperty = CastField<FArrayProperty>(PropertyEditor->GetProperty()))
+		{
+			ObjectProperty = CastField<FObjectProperty>(ArrayProperty->Inner);
+		}
+
+		// Only try to add entries if we are dropping on an asset array
+		if (ObjectProperty && InOperation->IsOfType<FSodaDragDropOp>())
+		{
+			bool bHasOnlyValidElements = true;
+			TSharedPtr<FSodaDragDropOp> DragDropOp = StaticCastSharedPtr<FSodaDragDropOp>(InOperation);
+			if (DragDropOp.IsValid())
+			{
+				for (FAssetData AssetData : DragDropOp->GetAssets())
+				{
+					// if the type does not match
+					if (!AssetData.GetClass()->IsChildOf(ObjectProperty->PropertyClass))
+					{
+						bHasOnlyValidElements = false;
+						break;
+					}
+				}
+			}
+			return bHasOnlyValidElements;
+		}
+		
+		return false;
+	}
+	*/
+
+private:
+	TSharedPtr<FPropertyEditor> PropertyEditor;
+};
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.cpp
new file mode 100644
index 0000000..e68b49c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.cpp
@@ -0,0 +1,168 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.h"
+#include "UObject/UnrealType.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "Widgets/Text/STextBlock.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+
+/*static*/ TSharedPtr<FTitleMetadataFormatter> FTitleMetadataFormatter::TryParse(TSharedPtr<IPropertyHandle> RootProperty, const FString& TitlePropertyRaw)
+{
+	if (RootProperty.IsValid() && !TitlePropertyRaw.IsEmpty())
+	{
+		TSharedRef<FTitleMetadataFormatter> TitleFormatter = MakeShared<FTitleMetadataFormatter>();
+
+		// Simple solution to quickly discover if we need to do the more complex scan for FText formatting, or if
+		// we can just take what's there and use it directly.
+		if (TitlePropertyRaw.Contains(TEXT("{")))
+		{
+			TitleFormatter->Format = FText::FromString(TitlePropertyRaw);
+
+			TArray<FString> OutParameterNames;
+			FText::GetFormatPatternParameters(TitleFormatter->Format, OutParameterNames);
+			for (const FString& ParameterName : OutParameterNames)
+			{
+				TSharedPtr<IPropertyHandle> Handle = RootProperty->GetChildHandle(FName(*ParameterName), false /*bRecurse*/);
+				if (Handle.IsValid())
+				{
+					TitleFormatter->PropertyHandles.Add(Handle);
+				}
+				else
+				{
+					// title property doesn't exist, display an error message
+					TitleFormatter->PropertyHandles.Empty();
+					TitleFormatter->Format = FText::FromString(TEXT("Invalid Title Property!"));
+					break;
+				}
+			}
+		}
+		else // Support the old style where it was just a name of a property with no formatting.
+		{
+			TSharedPtr<IPropertyHandle> Handle = RootProperty->GetChildHandle(FName(*TitlePropertyRaw), false /*bRecurse*/);
+			if (Handle.IsValid())
+			{
+				TitleFormatter->PropertyHandles.Add(Handle);
+				TitleFormatter->Format = FText::FromString(TEXT("{") + TitlePropertyRaw + TEXT("}"));
+			}
+			else
+			{
+				// title property doesn't exist, display an error message
+				TitleFormatter->Format = FText::FromString(TEXT("Invalid Title Property!"));
+			}
+		}
+
+		return TitleFormatter;
+	}
+
+	return TSharedPtr<FTitleMetadataFormatter>();
+}
+
+FPropertyAccess::Result FTitleMetadataFormatter::GetDisplayText(FText& OutText) const
+{
+	FFormatNamedArguments FormatArgs;
+	for(TSharedPtr<IPropertyHandle> PropertyHandle : PropertyHandles)
+	{
+		FText ReplaceValue;
+		FPropertyAccess::Result Result = PropertyHandle->GetValueAsDisplayText(ReplaceValue);
+		if (Result == FPropertyAccess::Success)
+		{
+			FormatArgs.Add(PropertyHandle->GetProperty()->GetName(), ReplaceValue);
+		}
+		else
+		{
+			return Result;
+		}
+	}
+
+	OutText = FText::Format(Format, FormatArgs);
+
+	return FPropertyAccess::Success;
+}
+
+void SPropertyEditorArrayItem::Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor>& InPropertyEditor )
+{
+	static const FName TitlePropertyFName = FName(TEXT("TitleProperty"));
+
+	PropertyEditor = InPropertyEditor;
+
+	ChildSlot
+	.Padding( 0.0f, 0.0f, 5.0f, 0.0f )
+	[
+		SNew( STextBlock )
+		.Text( this, &SPropertyEditorArrayItem::GetValueAsString )
+		.Font( InArgs._Font )
+	];
+
+	SetEnabled( TAttribute<bool>( this, &SPropertyEditorArrayItem::CanEdit ) );
+
+	// if this is a struct property, try to find a representative element to use as our stand in
+	if (PropertyEditor->PropertyIsA( FStructProperty::StaticClass() ))
+	{
+		const FProperty* MainProperty = PropertyEditor->GetProperty();
+		const FProperty* ArrayProperty = MainProperty ? MainProperty->GetOwner<const FProperty>() : nullptr;
+		if (ArrayProperty) // should always be true
+		{
+			TitlePropertyFormatter = FTitleMetadataFormatter::TryParse(PropertyEditor->GetPropertyHandle(), FRuntimeMetaData::GetMetaData(ArrayProperty, TitlePropertyFName));
+		}
+	}
+}
+
+void SPropertyEditorArrayItem::GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+{
+	OutMinDesiredWidth = 130.0f;
+	OutMaxDesiredWidth = 500.0f;
+}
+
+bool SPropertyEditorArrayItem::Supports( const TSharedRef< class FPropertyEditor >& PropertyEditor )
+{
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+	const FProperty* Property = PropertyEditor->GetProperty();
+
+	if (!CastField<const FClassProperty>(Property) && PropertyNode->HasNodeFlags(EPropertyNodeFlags::SingleSelectOnly))
+	{
+		if (Property->GetOwner<FArrayProperty>() &&
+			!(Property->GetOwner<FArrayProperty>()->PropertyFlags & CPF_EditConst))
+		{
+			return true;
+		}
+
+		if (Property->GetOwner<FMapProperty>() &&
+			!(Property->GetOwner<FMapProperty>()->PropertyFlags & CPF_EditConst))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+FText SPropertyEditorArrayItem::GetValueAsString() const
+{
+	if (TitlePropertyFormatter.IsValid())
+	{
+		FText TextOut;
+		if (FPropertyAccess::Success == TitlePropertyFormatter->GetDisplayText(TextOut))
+		{
+			return TextOut;
+		}
+	}
+	
+	if( PropertyEditor->GetProperty() && PropertyEditor->PropertyIsA( FStructProperty::StaticClass() ) )
+	{
+		return FText::Format( NSLOCTEXT("PropertyEditor", "NumStructItems", "{0} members"), FText::AsNumber( PropertyEditor->GetPropertyNode()->GetNumChildNodes() ) );
+	}
+
+	return PropertyEditor->GetValueAsDisplayText();
+}
+
+bool SPropertyEditorArrayItem::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.h
new file mode 100644
index 0000000..95a6d70
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorArrayItem.h
@@ -0,0 +1,56 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimeEditorModule.h"
+
+namespace soda
+{
+
+class FPropertyEditor;
+class IPropertyHandle;
+
+struct FTitleMetadataFormatter
+{
+	FText Format;
+	TArray<TSharedPtr<IPropertyHandle>> PropertyHandles;
+
+	FPropertyAccess::Result GetDisplayText(FText& OutText) const;
+
+	static TSharedPtr<FTitleMetadataFormatter> TryParse(TSharedPtr<IPropertyHandle> RootProperty, const FString& TitlePropertyRaw);
+};
+
+class SPropertyEditorArrayItem : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SPropertyEditorArrayItem ) 
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) ) 
+		{}
+		SLATE_ATTRIBUTE( FSlateFontInfo, Font )
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef< class FPropertyEditor >& PropertyEditor );
+
+	void Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor>& InPropertyEditor );
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth );
+
+private:
+	FText GetValueAsString() const;
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+
+private:
+	TSharedPtr<FPropertyEditor> PropertyEditor;
+	TSharedPtr<FTitleMetadataFormatter> TitlePropertyFormatter;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.cpp
new file mode 100644
index 0000000..c759cae
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.cpp
@@ -0,0 +1,1578 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.h"
+#include "Engine/Texture.h"
+#include "Engine/SkeletalMesh.h"
+#include "Components/StaticMeshComponent.h"
+#include "Engine/StaticMesh.h"
+#include "Engine/LevelScriptActor.h"
+//#include "Editor.h"
+#include "Modules/ModuleManager.h"
+#include "UObject/UObjectHash.h"
+#include "UObject/UObjectIterator.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Particles/ParticleSystem.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+//#include "IAssetTools.h"
+//#include "IAssetTypeActions.h"
+//#include "AssetToolsModule.h"
+//#include "SAssetDropTarget.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "Engine/Selection.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+#include "HAL/PlatformApplicationMisc.h"
+//#include "Editor/UnrealEdEngine.h"
+//#include "UnrealEdGlobals.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "WorldPartition/WorldPartition.h"
+//#include "FileHelpers.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+//#include "AssetThumbnail.h"
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+DECLARE_DELEGATE( FOnCopy );
+DECLARE_DELEGATE( FOnPaste );
+
+// Helper to retrieve the correct property that has the applicable metadata.
+static const FProperty* GetActualMetadataProperty(const FProperty* Property)
+{
+	if (FProperty* OuterProperty = Property->GetOwner<FProperty>())
+	{
+		if (OuterProperty->IsA<FArrayProperty>()
+			|| OuterProperty->IsA<FSetProperty>()
+			|| OuterProperty->IsA<FMapProperty>())
+		{
+			return OuterProperty;
+		}
+	}
+
+	return Property;
+}
+
+// Helper to support both meta=(TagName) and meta=(TagName=true) syntaxes
+static bool GetTagOrBoolMetadata(const FProperty* Property, const TCHAR* TagName, bool bDefault)
+{
+	bool bResult = bDefault;
+
+	if (FRuntimeMetaData::HasMetaData(Property, TagName))
+	{
+		bResult = true;
+
+		const FString ValueString = FRuntimeMetaData::GetMetaData(Property, TagName);
+		if (!ValueString.IsEmpty())
+		{
+			if (ValueString == TEXT("true"))
+			{
+				bResult = true;
+			}
+			else if (ValueString == TEXT("false"))
+			{
+				bResult = false;
+			}
+		}
+	}
+
+	return bResult;
+}
+
+bool SPropertyEditorAsset::ShouldDisplayThumbnail(const FArguments& InArgs, const UClass* InObjectClass) const
+{
+	if (!InArgs._DisplayThumbnail /* || !InArgs._ThumbnailPool.IsValid()*/)
+	{
+		return false;
+	}
+
+	bool bShowThumbnail = InObjectClass == nullptr || !InObjectClass->IsChildOf(AActor::StaticClass());
+
+	// also check metadata for thumbnail & text display
+	const FProperty* PropertyToCheck = nullptr;
+	if (PropertyEditor.IsValid())
+	{
+		PropertyToCheck = PropertyEditor->GetProperty();
+	}
+	else if (PropertyHandle.IsValid())
+	{
+		PropertyToCheck = PropertyHandle->GetProperty();
+	}
+
+	if (PropertyToCheck != nullptr)
+	{
+		PropertyToCheck = GetActualMetadataProperty(PropertyToCheck);
+
+		return GetTagOrBoolMetadata(PropertyToCheck, TEXT("DisplayThumbnail"), bShowThumbnail);
+	}
+
+	return bShowThumbnail;
+}
+
+const FSlateBrush* SPropertyEditorAsset::GetThumbnailBorder() const
+{
+	static const FName HoveredBorderName("PropertyEditor.AssetThumbnailBorderHovered");
+	static const FName RegularBorderName("PropertyEditor.AssetThumbnailBorder");
+
+	return ThumbnailBorder->IsHovered() ? FAppStyle::Get().GetBrush(HoveredBorderName) : FAppStyle::Get().GetBrush(RegularBorderName);
+}
+
+void SPropertyEditorAsset::InitializeClassFilters(const FProperty* Property)
+{
+	if (Property == nullptr)
+	{
+		AllowedClassFilters.Add(ObjectClass);
+		return;
+	}
+
+	// Account for the allowed classes specified in the property metadata
+	const FProperty* MetadataProperty = GetActualMetadataProperty(Property);
+
+	bExactClass = GetTagOrBoolMetadata(MetadataProperty, TEXT("ExactClass"), false);
+
+	auto FindClass = [](const FString& InClassName)
+	{
+		UClass* Class = UClass::TryFindTypeSlow<UClass>(InClassName, EFindFirstObjectOptions::EnsureIfAmbiguous);
+		if (!Class)
+		{
+			Class = LoadObject<UClass>(nullptr, *InClassName);
+		}
+		return Class;
+	};
+
+	const FString AllowedClassesFilterString = FRuntimeMetaData::GetMetaData(MetadataProperty, TEXT("AllowedClasses"));
+	if (!AllowedClassesFilterString.IsEmpty())
+	{
+		TArray<FString> AllowedClassFilterNames;
+		AllowedClassesFilterString.ParseIntoArrayWS(AllowedClassFilterNames, TEXT(","), true);
+
+		for (const FString& ClassName : AllowedClassFilterNames)
+		{
+			UClass* Class = FindClass(ClassName);
+
+			if (Class)
+			{
+				// If the class is an interface, expand it to be all classes in memory that implement the class.
+				if (Class->HasAnyClassFlags(CLASS_Interface))
+				{
+					for (TObjectIterator<UClass> ClassIt; ClassIt; ++ClassIt)
+					{
+						UClass* const ClassWithInterface = (*ClassIt);
+						if (ClassWithInterface->ImplementsInterface(Class))
+						{
+							AllowedClassFilters.Add(ClassWithInterface);
+						}
+					}
+				}
+				else
+				{
+					AllowedClassFilters.Add(Class);
+				}
+			}
+		}
+	}
+	
+	if (AllowedClassFilters.Num() == 0)
+	{
+		// always add the object class to the filters
+		AllowedClassFilters.Add(ObjectClass);
+	}
+
+	const FString DisallowedClassesFilterString = FRuntimeMetaData::GetMetaData(MetadataProperty, TEXT("DisallowedClasses"));
+	if (!DisallowedClassesFilterString.IsEmpty())
+	{
+		TArray<FString> DisallowedClassFilterNames;
+		DisallowedClassesFilterString.ParseIntoArrayWS(DisallowedClassFilterNames, TEXT(","), true);
+
+		for (const FString& ClassName : DisallowedClassFilterNames)
+		{
+			UClass* Class = FindClass(ClassName);
+
+			if (Class)
+			{
+				// If the class is an interface, expand it to be all classes in memory that implement the class.
+				if (Class->HasAnyClassFlags(CLASS_Interface))
+				{
+					for (TObjectIterator<UClass> ClassIt; ClassIt; ++ClassIt)
+					{
+						UClass* const ClassWithInterface = (*ClassIt);
+						if (ClassWithInterface->ImplementsInterface(Class))
+						{
+							DisallowedClassFilters.Add(ClassWithInterface);
+						}
+					}
+				}
+				else
+				{
+					DisallowedClassFilters.Add(Class);
+				}
+			}
+		}
+	}
+}
+
+void SPropertyEditorAsset::InitializeAssetDataTags(const FProperty* Property)
+{
+	if (Property == nullptr)
+	{
+		return;
+	}
+
+	const FProperty* MetadataProperty = GetActualMetadataProperty(Property);
+	const FString DisallowedAssetDataTagsFilterString = FRuntimeMetaData::GetMetaData(MetadataProperty, TEXT("DisallowedAssetDataTags"));
+	if (!DisallowedAssetDataTagsFilterString.IsEmpty())
+	{
+		TArray<FString> DisallowedAssetDataTagsAndValues;
+		DisallowedAssetDataTagsFilterString.ParseIntoArray(DisallowedAssetDataTagsAndValues, TEXT(","), true);
+
+		for (const FString& TagAndOptionalValueString : DisallowedAssetDataTagsAndValues)
+		{
+			TArray<FString> TagAndOptionalValue;
+			TagAndOptionalValueString.ParseIntoArray(TagAndOptionalValue, TEXT("="), true);
+			size_t NumStrings = TagAndOptionalValue.Num();
+			check((NumStrings == 1) || (NumStrings == 2)); // there should be a single '=' within a tag/value pair
+
+			if (!DisallowedAssetDataTags.IsValid())
+			{
+				DisallowedAssetDataTags = MakeShared<FAssetDataTagMap>();
+			}
+			DisallowedAssetDataTags->Add(FName(*TagAndOptionalValue[0]), (NumStrings > 1) ? TagAndOptionalValue[1] : FString());
+		}
+	}
+
+	const FString RequiredAssetDataTagsFilterString = FRuntimeMetaData::GetMetaData(MetadataProperty, TEXT("RequiredAssetDataTags"));
+	if (!RequiredAssetDataTagsFilterString.IsEmpty())
+	{
+		TArray<FString> RequiredAssetDataTagsAndValues;
+		RequiredAssetDataTagsFilterString.ParseIntoArray(RequiredAssetDataTagsAndValues, TEXT(","), true);
+
+		for (const FString& TagAndOptionalValueString : RequiredAssetDataTagsAndValues)
+		{
+			TArray<FString> TagAndOptionalValue;
+			TagAndOptionalValueString.ParseIntoArray(TagAndOptionalValue, TEXT("="), true);
+			size_t NumStrings = TagAndOptionalValue.Num();
+			check((NumStrings == 1) || (NumStrings == 2)); // there should be a single '=' within a tag/value pair
+
+			if (!RequiredAssetDataTags.IsValid())
+			{
+				RequiredAssetDataTags = MakeShared<FAssetDataTagMap>();
+			}
+			RequiredAssetDataTags->Add(FName(*TagAndOptionalValue[0]), (NumStrings > 1) ? TagAndOptionalValue[1] : FString());
+		}
+	}
+}
+
+bool SPropertyEditorAsset::IsAssetAllowed(const FAssetData& InAssetData)
+{
+	if (DisallowedAssetDataTags.IsValid())
+	{
+		for (const auto& DisallowedTagAndValue : *DisallowedAssetDataTags.Get())
+		{
+			if (InAssetData.TagsAndValues.ContainsKeyValue(DisallowedTagAndValue.Key, DisallowedTagAndValue.Value))
+			{
+				return false;
+			}
+		}
+	}
+	if (RequiredAssetDataTags.IsValid())
+	{
+		for (const auto& RequiredTagAndValue : *RequiredAssetDataTags.Get())
+		{
+			if (!InAssetData.TagsAndValues.ContainsKeyValue(RequiredTagAndValue.Key, RequiredTagAndValue.Value))
+			{
+				// For backwards compatibility compare against short name version of the tag value.
+				if (!FPackageName::IsShortPackageName(RequiredTagAndValue.Value) &&
+					InAssetData.TagsAndValues.ContainsKeyValue(RequiredTagAndValue.Key, FPackageName::ObjectPathToObjectName(RequiredTagAndValue.Value)))
+				{
+					continue;
+				}
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+// Awful hack to deal with UClass::FindCommonBase taking an array of non-const classes...
+static TArray<UClass*> ConstCastClassArray(TArray<const UClass*>& Classes)
+{
+	TArray<UClass*> Result;
+	for (const UClass* Class : Classes)
+	{
+		Result.Add(const_cast<UClass*>(Class));
+	}
+
+	return Result;
+}
+
+void SPropertyEditorAsset::Construct(const FArguments& InArgs, const TSharedPtr<FPropertyEditor>& InPropertyEditor)
+{
+	PropertyEditor = InPropertyEditor;
+	PropertyHandle = InArgs._PropertyHandle;
+	OwnerAssetDataArray = InArgs._OwnerAssetDataArray;
+	OnSetObject = InArgs._OnSetObject;
+	OnShouldFilterAsset = InArgs._OnShouldFilterAsset;
+	OnShouldFilterActor = InArgs._OnShouldFilterActor;
+	ObjectPath = InArgs._ObjectPath;
+
+	FProperty* Property = nullptr;
+	if (PropertyEditor.IsValid())
+	{
+		Property = PropertyEditor->GetPropertyNode()->GetProperty();
+	}
+	else if (PropertyHandle.IsValid() && PropertyHandle->IsValidHandle())
+	{
+		Property = PropertyHandle->GetProperty();
+	}
+
+	ObjectClass = InArgs._Class != nullptr ? InArgs._Class : GetObjectPropertyClass(Property);
+	bAllowClear = InArgs._AllowClear.IsSet() ? InArgs._AllowClear.GetValue() : (Property ? !(Property->PropertyFlags & CPF_NoClear) : true);
+	bAllowCreate = InArgs._AllowCreate.IsSet() ? InArgs._AllowCreate.GetValue() : (Property ? !FRuntimeMetaData::HasMetaData(Property, "NoCreate") : true);
+
+	InitializeAssetDataTags(Property);
+	if (DisallowedAssetDataTags.IsValid() || RequiredAssetDataTags.IsValid())
+	{
+		// re-route the filter delegate to our own if we have our own asset data tags filter :
+		OnShouldFilterAsset.BindLambda([this, AssetFilter = InArgs._OnShouldFilterAsset](const FAssetData& InAssetData)
+		{
+			if (IsAssetAllowed(InAssetData))
+			{
+				return AssetFilter.IsBound() ? AssetFilter.Execute(InAssetData) : false;
+			}
+			return true;
+		});
+	}
+
+	InitializeClassFilters(Property);
+
+	// Make the ObjectClass more specific if we only have one class filter
+	// eg. if ObjectClass was set to Actor, but AllowedClasses="PointLight", we can limit it to PointLight immediately
+	if (AllowedClassFilters.Num() == 1 && DisallowedClassFilters.Num() == 0)
+	{
+		ObjectClass = const_cast<UClass*>(AllowedClassFilters[0]);
+	}
+	else
+	{
+		ObjectClass = UClass::FindCommonBase(ConstCastClassArray(AllowedClassFilters));
+	}
+
+	bIsActor = ObjectClass->IsChildOf(AActor::StaticClass());
+
+	/*
+	if (bAllowCreate)
+	{
+		if (InArgs._NewAssetFactories.IsSet())
+		{
+			NewAssetFactories = InArgs._NewAssetFactories.GetValue();
+		}
+		// If there are more allowed classes than just UObject 
+		else if (AllowedClassFilters.Num() > 1 || !AllowedClassFilters.Contains(UObject::StaticClass()))
+		{
+			NewAssetFactories = PropertyCustomizationHelpers::GetNewAssetFactoriesForClasses(AllowedClassFilters, DisallowedClassFilters);
+		}
+	}
+	*/
+	
+	TSharedPtr<SHorizontalBox> ValueContentBox = nullptr;
+	ChildSlot
+	[
+		//SNew( SAssetDropTarget )
+		//.OnAreAssetsAcceptableForDropWithReason( this, &SPropertyEditorAsset::OnAssetDraggedOver )
+		//.OnAssetsDropped( this, &SPropertyEditorAsset::OnAssetDropped )
+		//[
+			SAssignNew( ValueContentBox, SHorizontalBox )	
+		//]
+	];
+
+	TAttribute<bool> IsEnabledAttribute(this, &SPropertyEditorAsset::CanEdit);
+	TAttribute<FText> TooltipAttribute(this, &SPropertyEditorAsset::OnGetToolTip);
+
+	if (Property)
+	{
+		const FProperty* PropToConsider = GetActualMetadataProperty(Property);
+		if (PropToConsider->HasAnyPropertyFlags(CPF_EditConst | CPF_DisableEditOnTemplate))
+		{
+			TArray<UObject*> ObjectList;
+			if (PropertyEditor.IsValid())
+			{
+				PropertyEditor->GetPropertyHandle()->GetOuterObjects(ObjectList);
+			}
+
+			// NOTE: This code decides that 99% of structs are "defaults" which is not technically correct, 
+			// but we want to stop hard actor references from being set in places like data tables without banning soft references.
+			// The actor check should get refactored to be independent of EditOnTemplate and do more explicit checks for world-owned object references
+			if (ObjectList.Num() == 0)
+			{
+				IsEnabledAttribute.Set(false);
+				TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplate", "Editing this value in structure's defaults is not allowed"));
+			}
+			else
+			{
+				// Go through all the found objects and see if any are a CDO, we can't set an actor in a CDO default.
+				for (UObject* Obj : ObjectList)
+				{
+					if (Obj->IsTemplate() && !Obj->IsA<ALevelScriptActor>())
+					{
+						IsEnabledAttribute.Set(false);
+						TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplateTooltip", "Editing this value in a Class Default Object is not allowed"));
+						break;
+					}
+
+				}
+			}
+		}
+	}
+
+	bool bOldEnableAttribute = IsEnabledAttribute.Get();
+	if (bOldEnableAttribute && !InArgs._EnableContentPicker)
+	{
+		IsEnabledAttribute.Set(false);
+	}
+
+	AssetComboButton = SNew(SComboButton)
+		.ToolTipText(TooltipAttribute)
+		.OnGetMenuContent( this, &SPropertyEditorAsset::OnGetMenuContent )
+		.OnMenuOpenChanged( this, &SPropertyEditorAsset::OnMenuOpenChanged )
+		.IsEnabled(IsEnabledAttribute)
+		.ButtonContent()
+		[
+			SNew(SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.HAlign(HAlign_Left)
+			.VAlign(VAlign_Center)
+			[
+				SNew(SImage)
+				.Image( this, &SPropertyEditorAsset::GetStatusIcon )
+			]
+
+			+SHorizontalBox::Slot()
+			.FillWidth(1)
+			.VAlign(VAlign_Center)
+			[
+				// Show the name of the asset or actor
+				SNew(STextBlock)
+				.Font( FAppStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) )
+				.Text(this,&SPropertyEditorAsset::OnGetAssetName)
+			]
+		];
+
+	if (bOldEnableAttribute && !InArgs._EnableContentPicker)
+	{
+		IsEnabledAttribute.Set(true);
+	}
+
+	TSharedPtr<SWidget> ButtonBoxWrapper;
+	TSharedRef<SHorizontalBox> ButtonBox = SNew( SHorizontalBox );
+	
+	TSharedPtr<SHorizontalBox> CustomContentBox;
+
+	/*
+	if (ShouldDisplayThumbnail(InArgs, ObjectClass))
+	{
+		FObjectOrAssetData Value; 
+		GetValue( Value );
+
+		AssetThumbnail = MakeShareable( new FAssetThumbnail( Value.AssetData, InArgs._ThumbnailSize.X, InArgs._ThumbnailSize.Y, InArgs._ThumbnailPool ) );
+
+		FAssetThumbnailConfig AssetThumbnailConfig;
+		TSharedPtr<IAssetTypeActions> AssetTypeActions;
+		if (ObjectClass != nullptr)
+		{
+			FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>(TEXT("AssetTools"));
+			AssetTypeActions = AssetToolsModule.Get().GetAssetTypeActionsForClass(ObjectClass).Pin();
+
+			if (AssetTypeActions.IsValid())
+			{
+				AssetThumbnailConfig.AssetTypeColorOverride = AssetTypeActions->GetTypeColor();
+			}
+		}
+
+		ValueContentBox->AddSlot()
+		.Padding(0,3,5,0)
+		.AutoWidth()
+		.VAlign(VAlign_Center)
+		[
+			SNew(SBorder)
+			.Visibility(EVisibility::SelfHitTestInvisible)
+			.Padding(FMargin(0, 0, 4, 4))
+			.BorderImage(FAppStyle::Get().GetBrush("PropertyEditor.AssetTileItem.DropShadow"))
+			[
+				SNew(SOverlay)
+				+SOverlay::Slot()
+				.Padding(1)
+				[
+					SAssignNew(ThumbnailBorder, SBorder)
+					.Padding(0)
+					.BorderImage(FStyleDefaults::GetNoBrush())
+					.OnMouseDoubleClick(this, &SPropertyEditorAsset::OnAssetThumbnailDoubleClick)
+					[
+						SNew(SBox)
+						.ToolTipText(TooltipAttribute)
+						.WidthOverride(InArgs._ThumbnailSize.X)
+						.HeightOverride(InArgs._ThumbnailSize.Y)
+						[
+							AssetThumbnail->MakeThumbnailWidget(AssetThumbnailConfig)
+						]
+					]
+				]
+				+ SOverlay::Slot()
+				[
+					SNew(SImage)
+					.Image(this, &SPropertyEditorAsset::GetThumbnailBorder)
+					.Visibility(EVisibility::SelfHitTestInvisible)
+				]
+			]
+		];
+
+	
+		ValueContentBox->AddSlot()
+		.Padding(0)
+		.VAlign(VAlign_Center)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoHeight()
+			[
+				AssetComboButton.ToSharedRef()
+			]
+			+ SVerticalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoHeight()
+			[
+				SAssignNew(CustomContentBox, SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SAssignNew(ButtonBoxWrapper, SBox)
+					.Padding(FMargin(0.0f, 2.0f, 4.0f, 2.0f))
+					[
+						ButtonBox
+					]
+				]
+			]
+		];
+		
+	}
+	*/
+	//else
+	{
+		ValueContentBox->AddSlot()
+		[
+			SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.VAlign( VAlign_Center )
+			[
+				SNew( SHorizontalBox )
+				+ SHorizontalBox::Slot()
+				[
+					AssetComboButton.ToSharedRef()
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SAssignNew(ButtonBoxWrapper, SBox)
+					.Padding(FMargin(4.0f,0.0f))
+					[
+						ButtonBox
+					]
+				]
+			]
+			+ SVerticalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoHeight()
+			[
+				SAssignNew(CustomContentBox, SHorizontalBox)
+			]
+		];
+	}
+
+	if( InArgs._CustomContentSlot.Widget != SNullWidget::NullWidget )
+	{
+		CustomContentBox->AddSlot()
+		.VAlign( VAlign_Center )
+		.Padding( FMargin( 0.0f, 2.0f ) )
+		[
+			InArgs._CustomContentSlot.Widget
+		];
+	}
+
+	/*
+	if( !bIsActor && InArgs._DisplayUseSelected )
+	{
+		ButtonBox->AddSlot()
+		.VAlign(VAlign_Center)
+		.AutoWidth()
+		.Padding( 2.0f, 0.0f )
+		[
+			PropertyCustomizationHelpers::MakeUseSelectedButton( FSimpleDelegate::CreateSP( this, &SPropertyEditorAsset::OnUse ), FText(), IsEnabledAttribute )
+		];
+	}
+	*/
+
+	/*
+	if( InArgs._DisplayBrowse )
+	{
+		ButtonBox->AddSlot()
+		.Padding( 2.0f, 0.0f )
+		.AutoWidth()
+		.VAlign(VAlign_Center)
+		[
+			PropertyCustomizationHelpers::MakeBrowseButton(
+				FSimpleDelegate::CreateSP( this, &SPropertyEditorAsset::OnBrowse ),
+				TAttribute<FText>( this, &SPropertyEditorAsset::GetOnBrowseToolTip ),
+				true,
+				bIsActor
+				)
+		];
+	}
+	*/
+
+	/*
+	if( bIsActor )
+	{
+		TSharedRef<SWidget> ActorPicker = PropertyCustomizationHelpers::MakeInteractiveActorPicker( FOnGetAllowedClasses::CreateSP(this, &SPropertyEditorAsset::OnGetAllowedClasses), FOnShouldFilterActor::CreateSP(this, &SPropertyEditorAsset::IsFilteredActor), FOnActorSelected::CreateSP(this, &SPropertyEditorAsset::OnActorSelected));
+		ActorPicker->SetEnabled( IsEnabledAttribute );
+
+		ButtonBox->AddSlot()
+		.Padding( 2.0f, 0.0f )
+		.AutoWidth()
+		.VAlign(VAlign_Center)
+		[
+			ActorPicker
+		];
+	}
+	*/
+
+	NumButtons = ButtonBox->NumSlots();
+	
+	if (ButtonBoxWrapper.IsValid())
+	{
+		ButtonBoxWrapper->SetVisibility(NumButtons > 0 ? EVisibility::Visible : EVisibility::Collapsed);
+	}
+}
+
+void SPropertyEditorAsset::GetDesiredWidth( float& OutMinDesiredWidth, float &OutMaxDesiredWidth )
+{
+	OutMinDesiredWidth = 250.f;
+	OutMaxDesiredWidth = 350.f;
+
+	if (/*!AssetThumbnail.IsValid()*/ true)
+	{
+		static const float ButtonWidth = 20.0f /* button width */ + 4.0f /* padding */;
+
+		const float AdditionalButtonSize = NumButtons * ButtonWidth + 8.0f /* button box padding */;
+		OutMinDesiredWidth += AdditionalButtonSize;
+		OutMaxDesiredWidth += AdditionalButtonSize;
+	}
+}
+
+const FSlateBrush* SPropertyEditorAsset::GetStatusIcon() const
+{
+	static FSlateNoResource EmptyBrush = FSlateNoResource();
+
+	EActorReferenceState State = GetActorReferenceState();
+
+	if (State == EActorReferenceState::Unknown)
+	{
+		return FAppStyle::GetBrush("Icons.Warning");
+	}
+	else if (State == EActorReferenceState::Error)
+	{
+		return FAppStyle::GetBrush("Icons.Error");
+	}
+
+	return &EmptyBrush;
+}
+
+SPropertyEditorAsset::EActorReferenceState SPropertyEditorAsset::GetActorReferenceState() const
+{
+	if (bIsActor)
+	{
+		FObjectOrAssetData Value;
+		GetValue(Value);
+
+		if (Value.Object != nullptr)
+		{
+			// If this is not an actual actor, this is broken
+			if (!Value.Object->IsA(AActor::StaticClass()))
+			{
+				return EActorReferenceState::Error;
+			}
+
+			return EActorReferenceState::Loaded;
+		}
+		else if (Value.ObjectPath.IsNull())
+		{
+			return EActorReferenceState::Null;
+		}
+		else
+		{
+			// Get a path pointing to the owning map
+			FSoftObjectPath MapObjectPath = Value.ObjectPath.GetWithoutSubPath();
+
+			if (UObject* MapObject = MapObjectPath.ResolveObject())
+			{
+				UWorld* World = Cast<UWorld>(MapObject);
+
+				// In a partitioned world, the world object will exist but the actor itself can be unloaded
+				if (World && World->IsPartitionedWorld())
+				{
+					UObject* Object = nullptr;
+					if (World->ResolveSubobject(*Value.ObjectPath.GetSubPathString(), Object, /*bLoadIfExists*/false))
+					{
+						return EActorReferenceState::Exists;
+					}
+				}
+
+				return EActorReferenceState::Error;
+			}
+
+			return EActorReferenceState::Unknown;
+		}
+	}
+	return EActorReferenceState::NotAnActor;
+}
+
+void SPropertyEditorAsset::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	/*
+	if( AssetThumbnail.IsValid() && !GIsSavingPackage && !IsGarbageCollecting() )
+	{
+		// Ensure the thumbnail is up to date
+		FObjectOrAssetData Value;
+		GetValue( Value );
+
+		// If the thumbnail is not the same as the object value set the thumbnail to the new value
+		if( !(AssetThumbnail->GetAssetData() == Value.AssetData) )
+		{
+			AssetThumbnail->SetAsset( Value.AssetData );
+		}
+	}
+	*/
+}
+
+bool SPropertyEditorAsset::Supports(const TSharedRef<FPropertyEditor >& InPropertyEditor)
+{
+	const TSharedRef<FPropertyNode> PropertyNode = InPropertyEditor->GetPropertyNode();
+	if (PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew))
+	{
+		return false;
+	}
+
+	return Supports(PropertyNode->GetProperty());
+}
+
+bool SPropertyEditorAsset::Supports(const FProperty* NodeProperty)
+{
+	const FObjectPropertyBase* ObjectProperty = CastField<const FObjectPropertyBase>(NodeProperty);
+	const FInterfaceProperty* InterfaceProperty = CastField<const FInterfaceProperty>(NodeProperty);
+
+	if ((ObjectProperty != nullptr || InterfaceProperty != nullptr)
+		 && !NodeProperty->IsA(FClassProperty::StaticClass()) 
+		 && !NodeProperty->IsA(FSoftClassProperty::StaticClass()))
+	{
+		return true;
+	}
+	
+	return false;
+}
+
+TSharedRef<SWidget> SPropertyEditorAsset::OnGetMenuContent()
+{
+	FObjectOrAssetData Value;
+	GetValue(Value);
+
+	/*
+	if (bIsActor)
+	{
+		return PropertyCustomizationHelpers::MakeActorPickerWithMenu(Cast<AActor>(Value.Object),
+																	 bAllowClear,
+																	 FOnShouldFilterActor::CreateSP( this, &SPropertyEditorAsset::IsFilteredActor ),
+																	 FOnActorSelected::CreateSP( this, &SPropertyEditorAsset::OnActorSelected),
+																	 FSimpleDelegate::CreateSP( this, &SPropertyEditorAsset::CloseComboButton ),
+																	 FSimpleDelegate::CreateSP( this, &SPropertyEditorAsset::OnUse ) );
+	}
+	else
+	{
+		return PropertyCustomizationHelpers::MakeAssetPickerWithMenu(Value.AssetData,
+																	 bAllowClear,
+																	 AllowedClassFilters,
+																	 DisallowedClassFilters,
+																	 NewAssetFactories,
+																	 OnShouldFilterAsset,
+																	 FOnAssetSelected::CreateSP(this, &SPropertyEditorAsset::OnAssetSelected),
+																	 FSimpleDelegate::CreateSP(this, &SPropertyEditorAsset::CloseComboButton),
+																	 GetMostSpecificPropertyHandle(),
+																	 OwnerAssetDataArray);
+	}
+	*/
+	return SNullWidget::NullWidget;
+}
+
+void SPropertyEditorAsset::OnMenuOpenChanged(bool bOpen)
+{
+	if (bOpen == false)
+	{
+		AssetComboButton->SetMenuContent(SNullWidget::NullWidget);
+	}
+}
+
+bool SPropertyEditorAsset::IsFilteredActor( const AActor* const Actor ) const
+{
+	bool IsAllowed = Actor != nullptr && Actor->IsA(ObjectClass) && !Actor->IsChildActor() && IsClassAllowed(Actor->GetClass());
+	if (IsAllowed && OnShouldFilterActor.IsBound())
+	{
+		IsAllowed = OnShouldFilterActor.Execute(Actor);
+	}
+	return IsAllowed;
+}
+
+void SPropertyEditorAsset::CloseComboButton()
+{
+	AssetComboButton->SetIsOpen(false);
+}
+
+FText SPropertyEditorAsset::OnGetAssetName() const
+{
+	FObjectOrAssetData Value; 
+	FPropertyAccess::Result Result = GetValue( Value );
+
+	FText Name = LOCTEXT("None", "None");
+	if( Result == FPropertyAccess::Success )
+	{
+		if(Value.Object != nullptr)
+		{
+			if( bIsActor )
+			{
+				AActor* Actor = Cast<AActor>(Value.Object);
+
+				if (Actor)
+				{
+					//Name = FText::AsCultureInvariant(Actor->GetActorLabel());
+					Name = FText::AsCultureInvariant(Actor->GetName());
+				}
+				else
+				{
+					Name = FText::AsCultureInvariant(Value.Object->GetName());
+				}
+			}
+			else if (UField* AsField = Cast<UField>(Value.Object))
+			{
+				Name = FRuntimeMetaData::GetDisplayNameText(AsField);
+			}
+			else
+			{
+				Name = FText::AsCultureInvariant(Value.Object->GetName());
+			}
+		}
+		else if( Value.AssetData.IsValid() )
+		{
+			Name = FText::AsCultureInvariant(Value.AssetData.AssetName.ToString());
+		}
+		else if (Value.ObjectPath.IsValid())
+		{
+			Name = FText::AsCultureInvariant(Value.ObjectPath.ToString());
+		}
+	}
+	else if( Result == FPropertyAccess::MultipleValues )
+	{
+		Name = LOCTEXT("MultipleValues", "Multiple Values");
+	}
+
+	return Name;
+}
+
+FText SPropertyEditorAsset::OnGetAssetClassName() const
+{
+	UClass* Class = GetDisplayedClass();
+	if(Class)
+	{
+		return FText::AsCultureInvariant(Class->GetName());
+	}
+	return FText::GetEmpty();
+}
+
+FText SPropertyEditorAsset::OnGetToolTip() const
+{
+	FObjectOrAssetData Value; 
+	FPropertyAccess::Result Result = GetValue( Value );
+
+	FText ToolTipText = FText::GetEmpty();
+
+	if( Result == FPropertyAccess::Success )
+	{
+		if ( bIsActor )
+		{
+			// Always show full path instead of label
+			EActorReferenceState State = GetActorReferenceState();
+			FFormatNamedArguments Args;
+			Args.Add(TEXT("Actor"), FText::AsCultureInvariant(Value.ObjectPath.ToString()));
+			if (State == EActorReferenceState::Null)
+			{
+				ToolTipText = LOCTEXT("EmptyActorReference", "None");
+			}
+			else if (State == EActorReferenceState::Error)
+			{
+				ToolTipText = FText::Format(LOCTEXT("BrokenActorReference", "Broken reference to Actor ID '{Actor}', it was deleted or renamed"), Args);
+			}
+			else if (State == EActorReferenceState::Exists)
+			{
+				ToolTipText = FText::Format(LOCTEXT("ExistsActorReference", "Unloaded reference to Actor ID '{Actor}', use Browse to pin actor"), Args);
+			}
+			else if (State == EActorReferenceState::Unknown)
+			{
+				ToolTipText = FText::Format(LOCTEXT("UnknownActorReference", "Unloaded reference to Actor ID '{Actor}', use Browse to load level"), Args);
+			}
+			else
+			{
+				ToolTipText = FText::Format(LOCTEXT("GoodActorReference", "Reference to Actor ID '{Actor}'"), Args);
+			}
+		}
+		else if( Value.Object != nullptr )
+		{
+			// Display the package name which is a valid path to the object without redundant information
+			ToolTipText = FText::AsCultureInvariant(Value.Object->GetOutermost()->GetName());
+		}
+		else if( Value.AssetData.IsValid() )
+		{
+			ToolTipText = FText::AsCultureInvariant(Value.AssetData.PackageName.ToString());
+		}
+	}
+	else if( Result == FPropertyAccess::MultipleValues )
+	{
+		ToolTipText = LOCTEXT("MultipleValues", "Multiple Values");
+	}
+
+	if( ToolTipText.IsEmpty() )
+	{
+		ToolTipText = FText::AsCultureInvariant(ObjectPath.Get());
+	}
+
+	return ToolTipText;
+}
+
+void SPropertyEditorAsset::SetValue( const FAssetData& AssetData )
+{
+	AssetComboButton->SetIsOpen(false);
+
+	if (CanSetBasedOnCustomClasses(AssetData))
+	{
+		FText AssetReferenceFilterFailureReason;
+		if (CanSetBasedOnAssetReferenceFilter(AssetData, &AssetReferenceFilterFailureReason))
+		{
+			if (PropertyEditor.IsValid())
+			{
+				PropertyEditor->GetPropertyHandle()->SetValue(AssetData);
+			}
+
+			OnSetObject.ExecuteIfBound(AssetData);
+		}
+		else if (!AssetReferenceFilterFailureReason.IsEmpty())
+		{
+			FNotificationInfo Info(AssetReferenceFilterFailureReason);
+			Info.ExpireDuration = 4.f;
+			FSlateNotificationManager::Get().AddNotification(Info);
+		}
+	}
+}
+
+FPropertyAccess::Result SPropertyEditorAsset::GetValue( FObjectOrAssetData& OutValue ) const
+{
+	// Potentially accessing the value while garbage collecting or saving the package could trigger a crash.
+	// so we fail to get the value when that is occurring.
+	if ( GIsSavingPackage || IsGarbageCollecting() )
+	{
+		return FPropertyAccess::Fail;
+	}
+
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+
+	if( PropertyEditor.IsValid() && PropertyEditor->GetPropertyHandle()->IsValidHandle() )
+	{
+		UObject* Object = nullptr;
+		Result = PropertyEditor->GetPropertyHandle()->GetValue(Object);
+
+		if (Object == nullptr)
+		{
+			// Check to see if it's pointing to an unloaded object
+			FString CurrentObjectPath;
+			PropertyEditor->GetPropertyHandle()->GetValueAsFormattedString( CurrentObjectPath );
+
+			if (CurrentObjectPath.Len() > 0 && CurrentObjectPath != TEXT("None"))
+			{
+				FSoftObjectPath SoftObjectPath = FSoftObjectPath(CurrentObjectPath);
+
+				if (SoftObjectPath.IsAsset())
+				{
+					if (!CachedAssetData.IsValid() || CachedAssetData.GetObjectPathString() != CurrentObjectPath)
+					{
+						static FName AssetRegistryName("AssetRegistry");
+
+						FAssetRegistryModule& AssetRegistryModule = FModuleManager::Get().LoadModuleChecked<FAssetRegistryModule>(AssetRegistryName);
+						CachedAssetData = AssetRegistryModule.Get().GetAssetByObjectPath(FSoftObjectPath(CurrentObjectPath));
+					}
+
+					Result = FPropertyAccess::Success;
+					OutValue = FObjectOrAssetData(CachedAssetData);
+				}
+				else
+				{
+					// This is an actor or other subobject reference
+					if (CachedAssetData.IsValid())
+					{
+						CachedAssetData = FAssetData();
+					}
+
+					Result = FPropertyAccess::Success;
+					OutValue = FObjectOrAssetData(SoftObjectPath);
+				}
+
+				return Result;
+			}
+		}
+
+#if !UE_BUILD_SHIPPING
+		if (Object && !Object->IsValidLowLevel())
+		{
+			const FProperty* Property = PropertyEditor->GetProperty();
+			UE_LOG(LogPropertyNode, Fatal, TEXT("Property \"%s\" (%s) contains invalid data."), *Property->GetName(), *Property->GetCPPType());
+		}
+#endif
+
+		OutValue = FObjectOrAssetData( Object );
+	}
+	else
+	{
+		FSoftObjectPath SoftObjectPath;
+		UObject* Object = nullptr;
+		if (PropertyHandle.IsValid())
+		{
+			Result = PropertyHandle->GetValue(Object);
+		}
+		else
+		{
+			SoftObjectPath = FSoftObjectPath(ObjectPath.Get());
+			Object = SoftObjectPath.ResolveObject();
+
+			if (Object != nullptr)
+			{
+				Result = FPropertyAccess::Success;
+			}
+		}
+
+		if (Object != nullptr)
+		{
+#if !UE_BUILD_SHIPPING
+			if (!Object->IsValidLowLevel())
+			{
+				const FProperty* Property = PropertyEditor->GetProperty();
+				UE_LOG(LogPropertyNode, Fatal, TEXT("Property \"%s\" (%s) contains invalid data."), *Property->GetName(), *Property->GetCPPType());
+			}
+#endif
+
+			OutValue = FObjectOrAssetData(Object);
+		}
+		else
+		{
+			if (SoftObjectPath.IsNull())
+			{
+				SoftObjectPath = FSoftObjectPath(ObjectPath.Get());
+			}
+
+			if (SoftObjectPath.IsAsset())
+			{
+				const FSoftObjectPath CurrentObjectPath = SoftObjectPath;
+				if (CurrentObjectPath.IsValid() && (!CachedAssetData.IsValid() || CachedAssetData.GetSoftObjectPath() != CurrentObjectPath))
+				{
+					static FName AssetRegistryName("AssetRegistry");
+
+					FAssetRegistryModule& AssetRegistryModule = FModuleManager::Get().LoadModuleChecked<FAssetRegistryModule>(AssetRegistryName);
+					CachedAssetData = AssetRegistryModule.Get().GetAssetByObjectPath(CurrentObjectPath);
+				}
+
+				OutValue = FObjectOrAssetData(CachedAssetData);
+				Result = FPropertyAccess::Success;
+			}
+			else
+			{
+				// This is an actor or other subobject reference
+				if (CachedAssetData.IsValid())
+				{
+					CachedAssetData = FAssetData();
+				}
+
+				OutValue = FObjectOrAssetData(SoftObjectPath);
+			}
+
+			if (PropertyHandle.IsValid())
+			{
+				// No property editor was specified so check if multiple property values are associated with the property handle
+				TArray<FString> ObjectValues;
+				PropertyHandle->GetPerObjectValues(ObjectValues);
+
+				if (ObjectValues.Num() > 1)
+				{
+					for (int32 ObjectIndex = 1; ObjectIndex < ObjectValues.Num() && Result == FPropertyAccess::Success; ++ObjectIndex)
+					{
+						if (ObjectValues[ObjectIndex] != ObjectValues[0])
+						{
+							Result = FPropertyAccess::MultipleValues;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return Result;
+}
+
+UClass* SPropertyEditorAsset::GetDisplayedClass() const
+{
+	FObjectOrAssetData Value;
+	GetValue( Value );
+	if(Value.Object != nullptr)
+	{
+		return Value.Object->GetClass();
+	}
+	else
+	{
+		return ObjectClass;	
+	}
+}
+
+void SPropertyEditorAsset::OnAssetSelected( const struct FAssetData& AssetData )
+{
+	SetValue(AssetData);
+}
+
+void SPropertyEditorAsset::OnActorSelected( AActor* InActor )
+{
+	SetValue(InActor);
+}
+
+void SPropertyEditorAsset::OnGetAllowedClasses(TArray<const UClass*>& AllowedClasses)
+{
+	AllowedClasses.Append(AllowedClassFilters);
+}
+
+/*
+void SPropertyEditorAsset::OnOpenAssetEditor()
+{
+	FObjectOrAssetData Value;
+	GetValue( Value );
+
+	UObject* ObjectToEdit = Value.AssetData.GetAsset();
+	if( ObjectToEdit )
+	{
+		if (UWorld* World = Cast<UWorld>(ObjectToEdit))
+		{
+			constexpr bool bPromptUserToSave = true;
+			constexpr bool bSaveMapPackages = true;
+			constexpr bool bSaveContentPackages = true;
+			if (!FEditorFileUtils::SaveDirtyPackages(bPromptUserToSave, bSaveMapPackages, bSaveContentPackages))
+			{
+				return;
+			}
+		}
+
+		GEditor->EditObject( ObjectToEdit );
+	}
+}
+*/
+
+/*
+void SPropertyEditorAsset::OnBrowse()
+{
+	FObjectOrAssetData Value;
+	GetValue( Value );
+
+	if (bIsActor)
+	{
+		TSharedPtr<IPropertyHandle> PropertyHandleToUse = GetMostSpecificPropertyHandle();
+		if (PropertyHandleToUse)
+		{
+			// Try to resolve a potentially unloaded object
+			if (!Value.Object)
+			{
+				FSoftObjectPath MapObjectPath = Value.ObjectPath.GetWithoutSubPath();
+
+				if (UObject* MapObject = MapObjectPath.ResolveObject())
+				{
+					if (UWorld* World = Cast<UWorld>(MapObject); World && World->IsPartitionedWorld())
+					{
+						if (const FWorldPartitionActorDesc* ActorDesc = World->GetWorldPartition()->GetActorDesc(Value.ObjectPath))
+						{
+							World->GetWorldPartition()->PinActors({ ActorDesc->GetGuid() });
+							GetValue(Value);
+						}
+					}
+				}
+			}
+
+			if (Value.Object)
+			{
+				// This code only works on loaded objects
+				if (TSharedPtr<FPropertyNode> PropertyNodeToSync = PropertyHandleToUse->GetPropertyNode())
+				{
+					FPropertyEditor::SyncToObjectsInNode(PropertyNodeToSync);
+				}
+			}
+		}
+	}
+	else
+	{
+		TArray<FAssetData> AssetDataList;
+		AssetDataList.Add( Value.AssetData );
+		GEditor->SyncBrowserToObjects( AssetDataList );
+	}
+}
+*/
+
+/*
+FText SPropertyEditorAsset::GetOnBrowseToolTip() const
+{
+	FObjectOrAssetData Value;
+	GetValue( Value );
+
+	if (Value.Object)
+	{
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("Asset"), FText::AsCultureInvariant(Value.Object->GetName()));
+		if (bIsActor)
+		{
+			return FText::Format(LOCTEXT( "SelectSpecificActorInViewport", "Select '{Asset}' in the viewport"), Args);
+		}
+		else
+		{
+			return FText::Format(LOCTEXT( "BrowseToSpecificAssetInContentBrowser", "Browse to '{Asset}' in Content Browser"), Args);
+		}
+	}
+	
+	if (bIsActor)
+	{
+		return LOCTEXT("SelectActorInViewport", "Select Actor in the viewport");
+	}
+	else
+	{
+		return LOCTEXT("BrowseToAssetInContentBrowser", "Browse to Asset in Content Browser");
+	}
+}
+*/
+
+void SPropertyEditorAsset::OnUse()
+{
+	/*
+	// Use the property editor path if it is valid and there is no custom filtering required
+	if(PropertyEditor.IsValid()
+		&& !OnShouldFilterAsset.IsBound()
+		&& AllowedClassFilters.Num() == 0
+		&& DisallowedClassFilters.Num() == 0
+		&& (GEditor ? !GEditor->MakeAssetReferenceFilter(FAssetReferenceFilterContext()).IsValid() : true))
+	{
+		PropertyEditor->GetPropertyHandle()->SetObjectValueFromSelection();
+	}
+	else
+	{
+		// Load selected assets
+		FEditorDelegates::LoadSelectedAssetsIfNeeded.Broadcast();
+
+		// try to get a selected object of our class
+		UObject* Selection = nullptr;
+		if( ObjectClass && ObjectClass->IsChildOf( AActor::StaticClass() ) )
+		{
+			Selection = GEditor->GetSelectedActors()->GetTop( ObjectClass );
+		}
+		else if( ObjectClass )
+		{
+			// Get the first material selected
+			Selection = GEditor->GetSelectedObjects()->GetTop( ObjectClass );
+		}
+
+		// Check against custom asset filter
+		if (Selection != nullptr
+			&& OnShouldFilterAsset.IsBound()
+			&& OnShouldFilterAsset.Execute(FAssetData(Selection)))
+		{
+			Selection = nullptr;
+		}
+
+		if( Selection )
+		{
+			SetValue( Selection );
+		}
+	}
+	*/
+}
+
+void SPropertyEditorAsset::OnClear()
+{
+	SetValue(nullptr);
+}
+
+FSlateColor SPropertyEditorAsset::GetAssetClassColor()
+{
+	/*
+	FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>(TEXT("AssetTools"));	
+	TWeakPtr<IAssetTypeActions> AssetTypeActions = AssetToolsModule.Get().GetAssetTypeActionsForClass(GetDisplayedClass());
+	if(AssetTypeActions.IsValid())
+	{
+		return FSlateColor(AssetTypeActions.Pin()->GetTypeColor());
+	}
+	*/
+	return FSlateColor::UseForeground();
+}
+
+bool SPropertyEditorAsset::OnAssetDraggedOver( TArrayView<FAssetData> InAssets, FText& OutReason ) const
+{
+	UObject* AssetObject = InAssets[0].GetAsset();
+	if (CanEdit() && (AssetObject != nullptr) && AssetObject->IsA(ObjectClass))
+	{
+		FAssetData AssetData(InAssets[0]);
+		// Check against custom asset filter
+		if (!OnShouldFilterAsset.IsBound()
+			|| !OnShouldFilterAsset.Execute(AssetData))
+		{
+			if (CanSetBasedOnCustomClasses(AssetData))
+			{
+				return CanSetBasedOnAssetReferenceFilter(AssetData, &OutReason);
+			}
+		}
+	}
+
+	return false;
+}
+
+void SPropertyEditorAsset::OnAssetDropped( const FDragDropEvent&, TArrayView<FAssetData> InAssets )
+{
+	if( CanEdit() )
+	{
+		SetValue(InAssets[0].GetAsset());
+	}
+}
+
+
+void SPropertyEditorAsset::OnCopy()
+{
+	FObjectOrAssetData Value;
+	GetValue( Value );
+
+	if( Value.AssetData.IsValid() )
+	{
+		FPlatformApplicationMisc::ClipboardCopy(*Value.AssetData.GetExportTextName());
+	}
+	else
+	{
+		FPlatformApplicationMisc::ClipboardCopy(*Value.ObjectPath.ToString());
+	}
+}
+
+void SPropertyEditorAsset::OnPaste()
+{
+	FString DestPath;
+	FPlatformApplicationMisc::ClipboardPaste(DestPath);
+
+	if(DestPath == TEXT("None"))
+	{
+		SetValue(nullptr);
+	}
+	else
+	{
+		UObject* Object = LoadObject<UObject>(nullptr, *DestPath);
+		if(Object && Object->IsA(ObjectClass))
+		{
+			// Check against custom asset filter
+			if (!OnShouldFilterAsset.IsBound()
+				|| !OnShouldFilterAsset.Execute(FAssetData(Object)))
+			{
+				SetValue(Object);
+			}
+		}
+	}
+}
+
+bool SPropertyEditorAsset::CanPaste()
+{
+	FString ClipboardText;
+	FPlatformApplicationMisc::ClipboardPaste(ClipboardText);
+
+	const FString PossibleObjectPath = FPackageName::ExportTextPathToObjectPath(ClipboardText);
+
+	bool bCanPaste = false;
+
+	if( CanEdit() )
+	{
+		if( PossibleObjectPath == TEXT("None") )
+		{
+			bCanPaste = true;
+		}
+		else
+		{
+			FAssetRegistryModule& AssetRegistryModule = FModuleManager::Get().LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
+			bCanPaste = PossibleObjectPath.Len() < NAME_SIZE && AssetRegistryModule.Get().GetAssetByObjectPath( FSoftObjectPath(PossibleObjectPath) ).IsValid();
+		}
+	}
+
+	return bCanPaste;
+}
+
+/*
+FReply SPropertyEditorAsset::OnAssetThumbnailDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent )
+{
+	OnOpenAssetEditor();
+	return FReply::Handled();
+}
+*/
+
+bool SPropertyEditorAsset::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+bool SPropertyEditorAsset::CanSetBasedOnCustomClasses( const FAssetData& InAssetData ) const
+{
+	if (InAssetData.IsValid())
+	{
+		return IsClassAllowed(InAssetData.GetClass());
+	}
+
+	return true;
+}
+
+bool SPropertyEditorAsset::IsClassAllowed(const UClass* InClass) const
+{
+	if (!InClass)
+	{
+		// A null class will not match any filters. If we have an allow list, this means failure, otherwise it means success.
+		return AllowedClassFilters.Num() == 0;
+	}
+
+	bool bClassAllowed = true;
+	if (AllowedClassFilters.Num() > 0)
+	{
+		bClassAllowed = false;
+		for (const UClass* AllowedClass : AllowedClassFilters)
+		{
+			const bool bAllowedClassIsInterface = AllowedClass->HasAnyClassFlags(CLASS_Interface);
+			bClassAllowed = bExactClass ? InClass == AllowedClass :
+				InClass->IsChildOf(AllowedClass) || (bAllowedClassIsInterface && InClass->ImplementsInterface(AllowedClass));
+
+			if (bClassAllowed)
+			{
+				break;
+			}
+		}
+	}
+
+	if (DisallowedClassFilters.Num() > 0 && bClassAllowed)
+	{
+		for (const UClass* DisallowedClass : DisallowedClassFilters)
+		{
+			const bool bDisallowedClassIsInterface = DisallowedClass->HasAnyClassFlags(CLASS_Interface);
+			if (InClass->IsChildOf(DisallowedClass) || (bDisallowedClassIsInterface && InClass->ImplementsInterface(DisallowedClass)))
+			{
+				bClassAllowed = false;
+				break;
+			}
+		}
+	}
+
+	return bClassAllowed;
+}
+
+bool SPropertyEditorAsset::CanSetBasedOnAssetReferenceFilter( const FAssetData& InAssetData, FText* OutOptionalFailureReason) const
+{
+	/*
+	if (GEditor && InAssetData.IsValid())
+	{
+		TSharedPtr<IPropertyHandle> PropertyHandleToUse = GetMostSpecificPropertyHandle();
+		FAssetReferenceFilterContext AssetReferenceFilterContext;
+		if (PropertyHandleToUse.IsValid())
+		{
+			TArray<UObject*> ReferencingObjects;
+			PropertyHandleToUse->GetOuterObjects(ReferencingObjects);
+			for (UObject* ReferencingObject : ReferencingObjects)
+			{
+				AssetReferenceFilterContext.ReferencingAssets.Add(FAssetData(ReferencingObject));
+			}
+		}
+		
+		if(OwnerAssetDataArray.Num() > 0)
+		{
+			for (const FAssetData& AssetData : OwnerAssetDataArray)
+			{
+				if (AssetData.IsValid())
+				{
+					//Use add unique in case the PropertyHandle as already add the referencing asset
+					AssetReferenceFilterContext.ReferencingAssets.AddUnique(AssetData);
+				}
+			}
+		}
+
+		TSharedPtr<IAssetReferenceFilter> AssetReferenceFilter = GEditor->MakeAssetReferenceFilter(AssetReferenceFilterContext);
+		if (AssetReferenceFilter.IsValid() && !AssetReferenceFilter->PassesFilter(InAssetData, OutOptionalFailureReason))
+		{
+			return false;
+		}
+	}
+	*/
+
+	return true;
+}
+
+TSharedPtr<IPropertyHandle> SPropertyEditorAsset::GetMostSpecificPropertyHandle() const
+{
+	if (PropertyHandle.IsValid())
+	{
+		return PropertyHandle;
+	}
+	else if (PropertyEditor.IsValid())
+	{
+		return PropertyEditor->GetPropertyHandle();
+	}
+	
+	return TSharedPtr<IPropertyHandle>();
+}
+
+UClass* SPropertyEditorAsset::GetObjectPropertyClass(const FProperty* Property)
+{
+	UClass* Class = nullptr;
+
+	if (CastField<const FObjectPropertyBase>(Property) != nullptr)
+	{
+		Class = CastField<const FObjectPropertyBase>(Property)->PropertyClass;
+		if (Class == nullptr)
+		{
+			UE_LOG(LogPropertyNode, Warning, TEXT("Object Property (%s) has a null class, falling back to UObject"), *Property->GetFullName());
+			Class = UObject::StaticClass();
+		}
+	}
+	else if (CastField<const FInterfaceProperty>(Property) != nullptr)
+	{
+		Class = CastField<const FInterfaceProperty>(Property)->InterfaceClass;
+		if (Class == nullptr)
+		{
+			UE_LOG(LogPropertyNode, Warning, TEXT("Interface Property (%s) has a null class, falling back to UObject"), *Property->GetFullName());
+			Class = UObject::StaticClass();
+		}
+	}
+	else
+	{
+		ensureMsgf(Class != nullptr, TEXT("Property (%s) is not an object or interface class"), Property ? *Property->GetFullName() : TEXT("null"));
+		Class = UObject::StaticClass();
+	}
+	return Class;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.h
new file mode 100644
index 0000000..2fe618c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorAsset.h
@@ -0,0 +1,421 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "GameFramework/Actor.h"
+#include "Styling/SlateColor.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Styling/AppStyle.h"
+//#include "AssetRegistry/AssetData.h"
+//#include "AssetThumbnail.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+//class FAssetThumbnail;
+class SBorder;
+class SComboButton;
+//class UFactory;
+
+namespace soda
+{
+
+class FPropertyEditor;
+class IPropertyHandle;
+
+
+/**
+ * A widget used to edit Asset-type properties (UObject-derived properties).
+ * Can also be used (with a NULL FPropertyEditor) to edit a raw weak object pointer.
+ */
+class SPropertyEditorAsset : public SCompoundWidget
+{
+public:
+
+	enum class EActorReferenceState : uint8
+	{
+		// This is not pointing to an actor
+		NotAnActor,
+		// This is specifically pointing at no actor
+		Null,
+		// The pointed to actor is fully loaded in memory
+		Loaded,
+		// The pointed to actor exists because the pointed to map is loaded but not the actor
+		Exists,
+		// The pointed to actor is unknown because the pointed to map is not loaded 
+		Unknown,
+		// This is a known bad reference, the owning map is loaded but the actor does not exist
+		Error,
+	};
+
+	SLATE_BEGIN_ARGS(SPropertyEditorAsset)
+		: _DisplayThumbnail(true)
+		, _DisplayUseSelected(true)
+		, _DisplayBrowse(true)
+		, _EnableContentPicker(true)
+		, _DisplayCompactSize(true)
+		//, _ThumbnailPool(nullptr)
+		, _ThumbnailSize(FIntPoint(48, 48))
+		, _ObjectPath()
+		, _Class(nullptr)
+		, _CustomContentSlot()
+	{}
+		SLATE_ARGUMENT(TOptional<bool>, AllowClear)
+		SLATE_ARGUMENT(TOptional<bool>, AllowCreate)
+		SLATE_ARGUMENT(bool, DisplayThumbnail)
+		SLATE_ARGUMENT(bool, DisplayUseSelected)
+		SLATE_ARGUMENT(bool, DisplayBrowse)
+		SLATE_ARGUMENT(bool, EnableContentPicker)
+		SLATE_ARGUMENT(bool, DisplayCompactSize)
+		//SLATE_ARGUMENT(TSharedPtr<FAssetThumbnailPool>, ThumbnailPool)
+		SLATE_ARGUMENT(FIntPoint, ThumbnailSize)
+		SLATE_ATTRIBUTE(FString, ObjectPath)
+		SLATE_ARGUMENT(UClass*, Class)
+		//SLATE_ARGUMENT(TOptional<TArray<UFactory*>>, NewAssetFactories)
+		SLATE_EVENT(FOnSetObject, OnSetObject)
+		SLATE_EVENT(FOnShouldFilterAsset, OnShouldFilterAsset)
+		SLATE_NAMED_SLOT(FArguments, CustomContentSlot)
+		SLATE_ARGUMENT(TSharedPtr<IPropertyHandle>, PropertyHandle)
+		SLATE_ARGUMENT(TArray<FAssetData>, OwnerAssetDataArray)
+		SLATE_EVENT(FOnShouldFilterActor, OnShouldFilterActor)
+
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef<FPropertyEditor>& InPropertyEditor );
+	static bool Supports( const FProperty* NodeProperty );
+
+	/**
+	 * Construct the widget.
+	 * @param	InArgs				Arguments for widget construction
+	 * @param	InPropertyEditor	The property editor that this widget will operate on. If this is NULL, we expect
+	 *                              the Class member of InArgs to be a valid UClass, so we know what objects this 
+	 *                              widget can accept.
+	 */
+	void Construct( const FArguments& InArgs, const TSharedPtr<FPropertyEditor>& InPropertyEditor = NULL );
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float &OutMaxDesiredWidth );
+
+	/** Override the tick method so we can check for thumbnail differences & update if necessary */
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+
+private:
+	struct FObjectOrAssetData
+	{
+		UObject* Object;
+		FSoftObjectPath ObjectPath;
+		FAssetData AssetData;
+
+		FObjectOrAssetData( UObject* InObject = nullptr )
+			: Object( InObject )
+			, ObjectPath( Object )
+		{
+			AssetData = InObject != nullptr && !InObject->IsA<AActor>() ? FAssetData( InObject ) : FAssetData();
+		}
+
+		FObjectOrAssetData( const FSoftObjectPath& InObjectPath )
+			: Object(nullptr)
+			, ObjectPath(InObjectPath)
+		{}
+
+		FObjectOrAssetData( const FAssetData& InAssetData )
+			: Object( nullptr )
+			, ObjectPath( InAssetData.ToSoftObjectPath() )
+			, AssetData( InAssetData )
+		{}
+
+		bool IsValid() const
+		{
+			return Object != nullptr || ObjectPath.IsValid() || AssetData.IsValid();
+		}
+	};
+
+	/** 
+	 * Helper function for Construct - determines whether we should display a thumbnail or not
+	 * @param	InArgs	The args passed into Construct()
+	 * @returns true if we should display the thumbnail 
+	 */
+	bool ShouldDisplayThumbnail( const FArguments& InArgs, const UClass* ObjectClass ) const;
+
+	/** Gets the border brush to show around the thumbnail, changes when the user hovers on it. */
+	const FSlateBrush* GetThumbnailBorder() const;
+
+	/** Returns the status icon, empty for non actors */
+	const FSlateBrush* GetStatusIcon() const;
+
+	/** Returns the state of this actor reference */
+	EActorReferenceState GetActorReferenceState() const;
+
+	/** 
+	 * Get the content to be displayed in the asset/actor picker menu 
+	 * @returns the widget for the menu content
+	 */
+	TSharedRef<SWidget> OnGetMenuContent();
+
+	/**
+	 * Called when the asset menu is closed, we handle this to force the destruction of the asset menu to
+	 * ensure any settings the user set are saved.
+	 */
+	void OnMenuOpenChanged(bool bOpen);
+
+	/**
+	 * Returns whether the actor should be filtered out from selection.
+	 */
+	bool IsFilteredActor( const AActor* const Actor) const;
+
+	/**
+	 * Closes the combo button for the asset name.
+	 */
+	void CloseComboButton();
+
+	/** 
+	 * Get the name to be displayed for this asset
+	 * @returns the name of the asset
+	 */
+	FText OnGetAssetName() const;
+
+	/** 
+	 * Get the class name to be displayed for this asset
+	 * @returns the class name of this asset
+	 */
+	FText OnGetAssetClassName() const;
+
+	/** 
+	 * Get the tooltip to be displayed for this asset
+	 * @returns the tooltip string
+	 */
+	FText OnGetToolTip() const;
+
+	/**
+	 * Determine whether the given asset is allowed to be assigned to the property.
+	 * This is currently used to prevent non-engine assets being assigned to properties of engine assets.
+	 *
+	 * @param	AssetData	The asset to be assigned
+	 * @return	false		if the asset cannot be assigned,
+	 *			true		if it can be assigned or if this is not known (e.g. because a delegate handles the reference assignment)
+	 */
+	bool CanAssetBeAssigned(const FAssetData& AssetData) const;
+
+	/** 
+	 * Set the value of the asset referenced by this property editor.
+	 * Will set the underlying property handle if there is one.
+	 * @param	AssetData	The asset data for the object to set the reference to
+	 */
+	void SetValue( const FAssetData& AssetData );
+
+	/** 
+	 * Get the value referenced by this widget.
+	 * @returns the referenced object
+	 */
+	FPropertyAccess::Result GetValue( FObjectOrAssetData& OutValue ) const;
+
+	/** 
+	 * Get the UClass we will display in the UI.
+	 * This is the class of the object (if valid) or the property handles class (if any)
+	 * or the Class value this widget was constructed with.
+	 * @returns the UClass to display
+	 */
+	UClass* GetDisplayedClass() const;
+
+	/** 
+	 * Delegate for handling selection in the asset browser.
+	 * @param	Object	The chosen asset
+	 */
+	void OnAssetSelected( const FAssetData& AssetData );
+
+	/** 
+	 * Delegate for handling selection in the scene outliner.
+	 * @param	InActor	The chosen actor
+	 */
+	void OnActorSelected( AActor* InActor );
+
+	/** 
+	 * Delegate for handling classes of objects that can be picked.
+	 * @param	AllowedClasses	The array of classes we allow
+	 */
+	void OnGetAllowedClasses(TArray<const UClass*>& AllowedClasses);
+
+	/** 
+	 * Opens the asset editor for the viewed object
+	 */
+	//void OnOpenAssetEditor();
+
+	/** 
+	 * Browse for the object referenced by this widget, either in the Content Browser
+	 * or the scene (for Actors)
+	 */
+	//void OnBrowse();
+
+	/** 
+	 * Get the tooltip text for the Browse button
+	 */
+	//FText GetOnBrowseToolTip() const;
+
+	/** 
+	 * Use the selected object (replaces the referenced object if valid)
+	 */
+	void OnUse();
+
+	/** 
+	 * Clear the referenced object
+	 */
+	void OnClear();
+
+	/** 
+	 * Assets have an associated color, this is used to supply that color in the UI.
+	 * @returns the color to display for this asset
+	 */
+	FSlateColor GetAssetClassColor();
+
+	/** 
+	 * Delegate used to check whether we can drop an object on this widget.
+	 * @param	InObject	The object we are dragging
+	 * @param	OutReason	When returning false, the reason it was not allowed
+	 * @returns true if the object can be dropped
+	 */
+	bool OnAssetDraggedOver( TArrayView<FAssetData> InAssets, FText& OutReason ) const;
+
+	/** 
+	 * Delegate handling dropping an object on this widget
+	 * @param	InObject	The object we are dropping
+	 */
+	void OnAssetDropped( const FDragDropEvent&, TArrayView<FAssetData> InAssets );
+
+	/** 
+	 * Delegate handling ctrl+c
+	 */
+	void OnCopy();
+
+	/** 
+	 * Delegate handling ctrl+v
+	 */
+	void OnPaste();
+
+	/**
+	 * @return True of the current clipboard contents can be pasted
+	 */
+	bool CanPaste();
+
+	/** 
+	 * Handle double clicking the asset thumbnail. this 'Edits' the displayed asset 
+	 */
+	//FReply OnAssetThumbnailDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent );
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+
+	/** @return true if the passed in AssetData can be used to set the property based on the list of custom classes */
+	bool CanSetBasedOnCustomClasses( const FAssetData& InAssetData ) const;
+
+	/** @return true if the passed in AssetData can be used to set the property based on the game specific asset reference filter */
+	bool CanSetBasedOnAssetReferenceFilter( const FAssetData& InAssetData, FText* OutOptionalFailureReason = nullptr ) const;
+
+	/** @return Returns the property handle most relevant */
+	TSharedPtr<IPropertyHandle> GetMostSpecificPropertyHandle() const;
+
+	/**
+	 * Gets the class of the supplied property for use within the PropertyEditorAsset widget. Asserts if the property
+	 * is not supported by the widget.
+	 *
+	 * @param	Property	The supplied property for the widget
+	 * @return	The class of the property. Asserts if this tries to return null.
+	 */
+	static UClass* GetObjectPropertyClass(const FProperty* Property);
+
+	/**
+	 * Initialize the AllowedClasses and DisallowedClasses arrays based on the property metadata.
+	 */
+	void InitializeClassFilters(const FProperty* Property);
+
+	/** Check if the given class is allowed by the AllowedClasses and DisallowedClasses as defined in the property metadata. */
+	bool IsClassAllowed(const UClass* InClass) const;
+
+	/**
+	 * Initialize DisallowedAssetDataTags based on the property metadata.
+	 */
+	void InitializeAssetDataTags(const FProperty* Property);
+
+	/** @return Returns true if the asset is relevant for this property*/
+	bool IsAssetAllowed(const FAssetData& InAssetData);
+
+private:
+
+	/** Main combobutton */
+	TSharedPtr<SComboButton> AssetComboButton;
+
+	/** The border surrounding the thumbnail image. */
+	TSharedPtr<SBorder> ThumbnailBorder;
+
+	/** The property editor, if any */
+	TSharedPtr<FPropertyEditor> PropertyEditor;
+
+	/** Path to the object being edited instead of accessing the value directly with a property handle */
+	TAttribute<FString> ObjectPath;
+
+	/** Cached data */
+	mutable FAssetData CachedAssetData;
+
+	/** The class of the object we are editing */
+	UClass* ObjectClass;
+
+	/** Classes that can be used with this property */
+	TArray<const UClass*> AllowedClassFilters;
+
+	/** Classes that can NOT be used with this property */
+	TArray<const UClass*> DisallowedClassFilters;
+
+	/** A list of the factories we can use to create new assets */
+	//TArray<UFactory*> NewAssetFactories;
+
+	/** Tags (and eventually values) that can NOT be used with this property */
+	TSharedPtr<FAssetDataTagMap> DisallowedAssetDataTags;
+
+	/** Tags and values that must be present for an asset to be used with this property */
+	TSharedPtr<FAssetDataTagMap> RequiredAssetDataTags;
+
+	/** Whether the asset can be 'None' in this case */
+	bool bAllowClear;
+
+	/** Whether the asset can be created from the asset picker */
+	bool bAllowCreate;
+
+	/** Whether the object we are editing is an Actor (i.e. requires a Scene Outliner to be displayed) */
+	bool bIsActor;
+
+	/** Whether the classes in the AllowedClassFilters list are exact or whether valid classes can be derived. */
+	bool bExactClass;
+
+	/** The number of additional buttons this picker has. */
+	int32 NumButtons;
+
+	/** Delegate to call when our object value is set */
+	FOnSetObject OnSetObject;
+
+	/** Delegate for filtering valid assets */
+	FOnShouldFilterAsset OnShouldFilterAsset;
+
+	/** Thumbnail for the asset */
+	//TSharedPtr<FAssetThumbnail> AssetThumbnail;
+
+	/** The property handle, if any */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+
+	/** Delegate for filtering valid actors */
+	FOnShouldFilterActor OnShouldFilterActor;
+
+	/*
+	 * The reference object on which the picker will assign the picked asset, if any.
+	 * The system will test first the PropertyHandle follow by the PropertyEditor and if nothing this array of assets
+	 */
+	TArray<FAssetData> OwnerAssetDataArray;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.cpp
new file mode 100644
index 0000000..54fed21
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.cpp
@@ -0,0 +1,107 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.h"
+
+namespace soda
+{
+
+void SPropertyEditorBool::Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+{
+	PropertyEditor = InPropertyEditor;
+
+	CheckBox = SNew( SCheckBox )
+		.OnCheckStateChanged( this, &SPropertyEditorBool::OnCheckStateChanged )
+		.IsChecked( this, &SPropertyEditorBool::OnGetCheckState )
+		.Padding(0.0f);
+
+	ChildSlot
+	[	
+		CheckBox.ToSharedRef()
+	];
+
+	SetEnabled( TAttribute<bool>( this, &SPropertyEditorBool::CanEdit ) );
+}
+
+void SPropertyEditorBool::GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+{
+	// No desired width
+	OutMinDesiredWidth = 0;
+	OutMaxDesiredWidth = 0;
+}
+
+bool SPropertyEditorBool::Supports( const TSharedRef< class FPropertyEditor >& PropertyEditor )
+{
+	return PropertyEditor->PropertyIsA( FBoolProperty::StaticClass() );
+}
+
+bool SPropertyEditorBool::SupportsKeyboardFocus() const
+{
+	return CheckBox->SupportsKeyboardFocus();
+}
+
+bool SPropertyEditorBool::HasKeyboardFocus() const
+{
+	return CheckBox->HasKeyboardFocus();
+}
+
+FReply SPropertyEditorBool::OnFocusReceived( const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent )
+{
+	// Forward keyboard focus to our editable text widget
+	return FReply::Handled().SetUserFocus(CheckBox.ToSharedRef(), InFocusEvent.GetCause());
+}
+
+ECheckBoxState SPropertyEditorBool::OnGetCheckState() const
+{
+	ECheckBoxState ReturnState = ECheckBoxState::Undetermined;
+
+	bool Value;
+	const TSharedRef< IPropertyHandle > PropertyHandle = PropertyEditor->GetPropertyHandle();
+	if( PropertyHandle->GetValue( Value ) == FPropertyAccess::Success )
+	{
+		if( Value == true )
+		{
+			ReturnState = ECheckBoxState::Checked;
+		}
+		else
+		{
+			ReturnState = ECheckBoxState::Unchecked;
+		}
+	}
+
+	return ReturnState;
+}
+
+void SPropertyEditorBool::OnCheckStateChanged( ECheckBoxState InNewState )
+{
+	const TSharedRef< IPropertyHandle > PropertyHandle = PropertyEditor->GetPropertyHandle();
+	if( InNewState == ECheckBoxState::Checked || InNewState == ECheckBoxState::Undetermined )
+	{
+		PropertyHandle->SetValue( true );
+	}
+	else
+	{
+		PropertyHandle->SetValue( false );
+	}
+}
+
+FReply SPropertyEditorBool::OnMouseButtonDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent )
+{
+	if ( InMouseEvent.GetEffectingButton() == EKeys::LeftMouseButton )
+	{
+		//toggle the our checkbox
+		CheckBox->ToggleCheckedState();
+
+		// Set focus to this object, but don't capture the mouse
+		return FReply::Handled().SetUserFocus(AsShared(), EFocusCause::Mouse);
+	}
+
+	return FReply::Unhandled();
+}
+
+bool SPropertyEditorBool::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.h
new file mode 100644
index 0000000..e0bfafc
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorBool.h
@@ -0,0 +1,51 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "Widgets/Input/SCheckBox.h"
+
+namespace soda
+{
+
+class SPropertyEditorBool : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorBool ) {}
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef< class FPropertyEditor >& PropertyEditor );
+
+	void Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& PropertyEditor );
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth );
+
+	// SWidget overrides
+	virtual bool SupportsKeyboardFocus() const override;
+	virtual bool HasKeyboardFocus() const override;
+	virtual FReply OnFocusReceived( const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent ) override;
+
+private:
+
+	virtual FReply OnMouseButtonDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent ) override;
+
+	ECheckBoxState OnGetCheckState() const;
+
+	void OnCheckStateChanged( ECheckBoxState InNewState );
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+private:
+
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+
+	TSharedPtr< class SCheckBox> CheckBox;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.cpp
new file mode 100644
index 0000000..5f11e48
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.cpp
@@ -0,0 +1,533 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.h"
+#include "Engine/Blueprint.h"
+#include "Misc/FeedbackContext.h"
+#include "Modules/ModuleManager.h"
+#include "Widgets/Layout/SBox.h"
+//#include "DragAndDrop/ClassDragDropOp.h"
+//#include "DragAndDrop/AssetDragDropOp.h"
+#include "RuntimeClassViewer/ClassViewerFilter.h"
+#include "UObject/UObjectIterator.h"
+#include "RuntimePropertyEditor/PropertyRestriction.h"
+#include "RuntimeClassViewer/SClassViewer.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+class FPropertyEditorClassFilter  : public IClassViewerFilter
+{
+public:
+	virtual ~FPropertyEditorClassFilter() {}
+	/** The meta class for the property that classes must be a child-of. */
+	const UClass* ClassPropertyMetaClass;
+
+	/** The interface that must be implemented. */
+	const UClass* InterfaceThatMustBeImplemented;
+
+	/** Whether or not abstract classes are allowed. */
+	bool bAllowAbstract;
+
+	/** Classes that can be picked */
+	TArray<const UClass*> AllowedClassFilters;
+
+	/** Classes that can't be picked */
+	TArray<const UClass*> DisallowedClassFilters;
+
+	virtual bool IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef< FClassViewerFilterFuncs > InFilterFuncs) override
+	{
+		return IsClassAllowedHelper(InClass);
+	}
+	
+	
+	virtual bool IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef< const IUnloadedBlueprintData > InBlueprint, TSharedRef< FClassViewerFilterFuncs > InFilterFuncs) override
+	{
+		return IsClassAllowedHelper(InBlueprint);
+	}
+	
+
+private:
+
+	template <typename TClass>
+	bool IsClassAllowedHelper(TClass InClass)
+	{
+		bool bMatchesFlags = !InClass->HasAnyClassFlags(CLASS_Hidden | CLASS_HideDropDown | CLASS_Deprecated) &&
+			(bAllowAbstract || !InClass->HasAnyClassFlags(CLASS_Abstract));
+
+		if (bMatchesFlags && InClass->IsChildOf(ClassPropertyMetaClass)
+			&& (!InterfaceThatMustBeImplemented || InClass->ImplementsInterface(InterfaceThatMustBeImplemented)))
+		{
+			auto PredicateFn = [InClass](const UClass* Class)
+			{
+				return InClass->IsChildOf(Class);
+			};
+
+			if (DisallowedClassFilters.FindByPredicate(PredicateFn) == nullptr &&
+				(AllowedClassFilters.Num() == 0 || AllowedClassFilters.FindByPredicate(PredicateFn) != nullptr))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+};
+
+static UClass* FindOrLoadClass(const FString& ClassName)
+{
+	UClass* Class = UClass::TryFindTypeSlow<UClass>(ClassName, EFindFirstObjectOptions::EnsureIfAmbiguous);
+
+	if (!Class)
+	{
+		Class = LoadObject<UClass>(nullptr, *ClassName);
+	}
+
+	return Class;
+}
+
+void SPropertyEditorClass::GetDesiredWidth(float& OutMinDesiredWidth, float& OutMaxDesiredWidth)
+{
+	OutMinDesiredWidth = 200.0f;
+	OutMaxDesiredWidth = 400.0f;
+}
+
+bool SPropertyEditorClass::Supports(const TSharedRef< class FPropertyEditor >& InPropertyEditor)
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	const FProperty* Property = InPropertyEditor->GetProperty();
+	int32 ArrayIndex = PropertyNode->GetArrayIndex();
+
+	if ((Property->IsA(FClassProperty::StaticClass()) || Property->IsA(FSoftClassProperty::StaticClass())) 
+		&& ((ArrayIndex == -1 && Property->ArrayDim == 1) || (ArrayIndex > -1 && Property->ArrayDim > 0)))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+/** @return True if the property can be edited */
+bool SPropertyEditorClass::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+void SPropertyEditorClass::Construct(const FArguments& InArgs, const TSharedPtr< class FPropertyEditor >& InPropertyEditor)
+{
+	PropertyEditor = InPropertyEditor;
+	
+	if (PropertyEditor.IsValid())
+	{
+		const TSharedRef<FPropertyNode> PropertyNode = PropertyEditor->GetPropertyNode();
+		FProperty* const Property = PropertyNode->GetProperty();
+		if (FClassProperty* const ClassProp = CastField<FClassProperty>(Property))
+		{
+			MetaClass = ClassProp->MetaClass;
+		}
+		else if (FSoftClassProperty* const SoftClassProperty = CastField<FSoftClassProperty>(Property))
+		{
+			MetaClass = SoftClassProperty->MetaClass;
+		}
+		else
+		{
+			check(false);
+		}
+		
+		const FString* AllowAbstractString = FRuntimeMetaData::FindMetaData(Property->GetOwnerProperty(), TEXT("AllowAbstract"));
+		bAllowAbstract = AllowAbstractString && (AllowAbstractString->IsEmpty() || AllowAbstractString->ToBool());
+		
+		bAllowOnlyPlaceable = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("OnlyPlaceable"));
+		bIsBlueprintBaseOnly = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("BlueprintBaseOnly"));
+		RequiredInterface = FRuntimeMetaData::GetClassMetaData(Property->GetOwnerProperty(), TEXT("MustImplement"));
+		bAllowNone = !(Property->PropertyFlags & CPF_NoClear);
+		bShowViewOptions = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("HideViewOptions")) ? false : true;
+		bShowTree = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("ShowTreeView"));
+		bShowDisplayNames = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("ShowDisplayNames"));
+
+		auto FillClassFilters = [&](TArray<const UClass*> &ClassFilters, FName TagName)
+		{
+			const FString* ClassesFilterString = &(const FString &)FRuntimeMetaData::GetMetaData(Property, TagName);
+
+			ClassFilters.Empty();
+
+			if (!ClassesFilterString->IsEmpty())
+			{
+				TArray<FString> ClassFilterNames;
+				ClassesFilterString->ParseIntoArrayWS(ClassFilterNames, TEXT(","), true);
+
+				for (const FString& ClassName : ClassFilterNames)
+				{
+					UClass* Class = FindOrLoadClass(ClassName);
+
+					if (Class)
+					{
+						// If the class is an interface, expand it to be all classes in memory that implement the class.
+						if (Class->HasAnyClassFlags(CLASS_Interface))
+						{
+							for (TObjectIterator<UClass> ClassIt; ClassIt; ++ClassIt)
+							{
+								UClass* const ClassWithInterface = (*ClassIt);
+								if (ClassWithInterface->ImplementsInterface(Class))
+								{
+									ClassFilters.Add(ClassWithInterface);
+								}
+							}
+						}
+						else
+						{
+							ClassFilters.Add(Class);
+						}
+					}
+				}
+			}
+		};
+
+		// Filter based on UPROPERTY meta data
+		FillClassFilters(AllowedClassFilters, "AllowedClasses");
+		FillClassFilters(DisallowedClassFilters, "DisallowedClasses");
+
+		// Filter based on restrictions
+		for (const TSharedRef<const FPropertyRestriction>& ClassRestriction : PropertyNode->GetRestrictions())
+		{
+			for (TArray<FString>::TConstIterator Iter= ClassRestriction.Get().GetHiddenValuesIterator(); Iter; ++Iter)
+			{
+				if (UClass* HiddenClass = FindOrLoadClass(*Iter))
+				{
+					DisallowedClassFilters.Add(HiddenClass);
+				}
+			}
+
+			for (TArray<FString>::TConstIterator Iter = ClassRestriction.Get().GetDisabledValuesIterator(); Iter; ++Iter)
+			{
+				if (UClass* DisabledClass = FindOrLoadClass(*Iter))
+				{
+					DisallowedClassFilters.Add(DisabledClass);
+				}
+			}
+		}
+	}
+	else
+	{
+		check(InArgs._MetaClass);
+		check(InArgs._SelectedClass.IsSet());
+		check(InArgs._OnSetClass.IsBound());
+
+		MetaClass = InArgs._MetaClass;
+		RequiredInterface = InArgs._RequiredInterface;
+		bAllowAbstract = InArgs._AllowAbstract;
+		bIsBlueprintBaseOnly = InArgs._IsBlueprintBaseOnly;
+		bAllowNone = InArgs._AllowNone;
+		bAllowOnlyPlaceable = false;
+		bShowViewOptions = InArgs._ShowViewOptions;
+		bShowTree = InArgs._ShowTree;
+		bShowDisplayNames = InArgs._ShowDisplayNames;
+		AllowedClassFilters.Empty();
+		DisallowedClassFilters.Empty();
+		SelectedClass = InArgs._SelectedClass;
+		OnSetClass = InArgs._OnSetClass;
+	}
+
+	CreateClassFilter(InArgs._ClassViewerFilters);
+
+	SAssignNew(ComboButton, SComboButton)
+		.OnGetMenuContent(this, &SPropertyEditorClass::GenerateClassPicker)
+		.ToolTipText(this, &SPropertyEditorClass::GetDisplayValueAsString)
+		.ButtonContent()
+		[
+			SNew(STextBlock)
+			.Text(this, &SPropertyEditorClass::GetDisplayValueAsString)
+			.Font(InArgs._Font)
+		];
+
+	ChildSlot
+	[
+		ComboButton.ToSharedRef()
+	];
+
+	SetEnabled(TAttribute<bool>(this, &SPropertyEditorClass::CanEdit));
+}
+
+/** Util to give better names for BP generated classes */
+static FString GetClassDisplayName(const UObject* Object, bool bShowDisplayNames)
+{
+	const UClass* Class = Cast<UClass>(Object);
+	if (Class != NULL)
+	{
+#if WITH_EDITORONLY_DATA
+		UBlueprint* BP = UBlueprint::GetBlueprintFromClass(Class);
+		if(BP != NULL)
+		{
+			return BP->GetName();
+		}
+#endif
+		if (bShowDisplayNames && FRuntimeMetaData::HasMetaData(Class, TEXT("DisplayName")))
+		{
+			return FRuntimeMetaData::GetMetaData(Class, TEXT("DisplayName"));
+		}
+	}
+	return (Object) ? Object->GetName() : "None";
+}
+
+FText SPropertyEditorClass::GetDisplayValueAsString() const
+{
+	static bool bIsReentrant = false;
+
+	// Guard against re-entrancy which can happen if the delegate executed below (SelectedClass.Get()) forces a slow task dialog to open, thus causing this to lose context and regain focus later starting the loop over again
+	if( !bIsReentrant )
+	{
+		TGuardValue<bool> Guard( bIsReentrant, true );
+		if(PropertyEditor.IsValid())
+		{
+			UObject* ObjectValue = NULL;
+			FPropertyAccess::Result Result = PropertyEditor->GetPropertyHandle()->GetValue(ObjectValue);
+
+			if(Result == FPropertyAccess::Success && ObjectValue != NULL)
+			{
+				return FText::FromString(GetClassDisplayName(ObjectValue, bShowDisplayNames));
+			}
+
+			return FText::FromString(FPaths::GetBaseFilename(PropertyEditor->GetValueAsString()));
+		}
+
+		return FText::FromString(GetClassDisplayName(SelectedClass.Get(), bShowDisplayNames));
+	}
+	else
+	{
+		return FText::GetEmpty();
+	}
+	
+}
+
+void SPropertyEditorClass::CreateClassFilter(const TArray<TSharedRef<IClassViewerFilter>>& InClassFilters)
+{
+	
+	ClassViewerOptions.bShowBackgroundBorder = false;
+	ClassViewerOptions.bShowUnloadedBlueprints = true;
+	ClassViewerOptions.bShowNoneOption = bAllowNone;
+
+	if (PropertyEditor.IsValid())
+	{
+		ClassViewerOptions.PropertyHandle = PropertyEditor->GetPropertyHandle();
+	}
+
+	ClassViewerOptions.bIsBlueprintBaseOnly = bIsBlueprintBaseOnly;
+	ClassViewerOptions.bIsPlaceableOnly = bAllowOnlyPlaceable;
+	ClassViewerOptions.NameTypeToDisplay = (bShowDisplayNames ? EClassViewerNameTypeToDisplay::DisplayName : EClassViewerNameTypeToDisplay::ClassName);
+	ClassViewerOptions.DisplayMode = bShowTree ? EClassViewerDisplayMode::TreeView : EClassViewerDisplayMode::ListView;
+	ClassViewerOptions.bAllowViewOptions = bShowViewOptions;
+	ClassViewerOptions.ClassFilters.Append(InClassFilters);
+
+	TSharedRef<FPropertyEditorClassFilter> PropEdClassFilter = MakeShared<FPropertyEditorClassFilter>();
+	ClassViewerOptions.ClassFilters.Add(PropEdClassFilter);
+	
+
+	PropEdClassFilter->ClassPropertyMetaClass = MetaClass;
+	PropEdClassFilter->InterfaceThatMustBeImplemented = RequiredInterface;
+	PropEdClassFilter->bAllowAbstract = bAllowAbstract;
+	PropEdClassFilter->AllowedClassFilters = AllowedClassFilters;
+	PropEdClassFilter->DisallowedClassFilters = DisallowedClassFilters;
+	
+
+	ClassFilter = TSharedRef<IClassViewerFilter>(new FClassViewerFilter(ClassViewerOptions)); //FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateClassFilter(ClassViewerOptions);
+	ClassFilterFuncs = TSharedRef<FClassViewerFilterFuncs>(new FClassViewerFilterFuncs());// FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateFilterFuncs();
+}
+
+
+TSharedRef<SWidget> SPropertyEditorClass::GenerateClassPicker()
+{
+	FOnClassPicked OnPicked(FOnClassPicked::CreateRaw(this, &SPropertyEditorClass::OnClassPicked));
+
+	return SNew(SBox)
+		.WidthOverride(280)
+		[
+			SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			.MaxHeight(500)
+			[
+				//FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateClassViewer(ClassViewerOptions, OnPicked)
+				SNew(SClassViewer, ClassViewerOptions)
+				.OnClassPickedDelegate(OnPicked)
+			]			
+		];
+}
+
+void SPropertyEditorClass::OnClassPicked(UClass* InClass)
+{
+	if(!InClass)
+	{
+		SendToObjects(TEXT("None"));
+	}
+	else
+	{
+		SendToObjects(InClass->GetPathName());
+	}
+
+	ComboButton->SetIsOpen(false);
+}
+
+void SPropertyEditorClass::SendToObjects(const FString& NewValue)
+{
+	if(PropertyEditor.IsValid())
+	{
+		const TSharedRef<IPropertyHandle> PropertyHandle = PropertyEditor->GetPropertyHandle();
+		PropertyHandle->SetValueFromFormattedString(NewValue);
+	}
+	else if (!NewValue.IsEmpty() && NewValue != TEXT("None"))
+	{
+		UClass* NewClass = FindOrLoadClass(NewValue);
+		OnSetClass.Execute(NewClass);
+	}
+	else
+	{
+		OnSetClass.Execute(nullptr);
+	}
+}
+/*
+static UObject* LoadDragDropObject(TSharedPtr<FSodaDragDropOp> UnloadedClassOp)
+{
+	FString AssetPath;
+
+	// Find the class/blueprint path
+	if (UnloadedClassOp->HasAssets())
+	{
+		AssetPath = UnloadedClassOp->GetAssets()[0].ObjectPath.ToString();
+	}
+	else if (UnloadedClassOp->HasAssetPaths())
+	{
+		AssetPath = UnloadedClassOp->GetAssetPaths()[0];
+	}
+
+	// Check to see if the asset can be found, otherwise load it.
+	UObject* Object = FindObject<UObject>(nullptr, *AssetPath);
+	if (Object == nullptr)
+	{
+		// Load the package.
+		GWarn->BeginSlowTask(LOCTEXT("OnDrop_LoadPackage", "Fully Loading Package For Drop"), true, false);
+
+		Object = LoadObject<UObject>(nullptr, *AssetPath);
+
+		GWarn->EndSlowTask();
+	}
+
+	return Object;
+}
+
+void SPropertyEditorClass::OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	TSharedPtr<FSodaDragDropOp> UnloadedClassOp = DragDropEvent.GetOperationAs<FSodaDragDropOp>();
+	if (UnloadedClassOp.IsValid())
+	{
+		UObject* Object = LoadDragDropObject(UnloadedClassOp);
+
+		bool bOK = false;
+
+		if (UClass* Class = Cast<UClass>(Object))
+		{
+			bOK = ClassFilter->IsClassAllowed(ClassViewerOptions, Class, ClassFilterFuncs.ToSharedRef());
+		}
+		else if (UBlueprint* Blueprint = Cast<UBlueprint>(Object))
+		{
+			if (Blueprint->GeneratedClass)
+			{
+				bOK = ClassFilter->IsClassAllowed(ClassViewerOptions, Blueprint->GeneratedClass, ClassFilterFuncs.ToSharedRef());
+			}
+		}
+		
+		if (bOK)
+		{
+			UnloadedClassOp->SetToolTip(FText::GetEmpty(), FSodaStyle::GetBrush(TEXT("Graph.ConnectorFeedback.OK")));
+		}
+		else
+		{
+			UnloadedClassOp->SetToolTip(FText::GetEmpty(), FSodaStyle::GetBrush(TEXT("Graph.ConnectorFeedback.Error")));
+		}
+	}
+}
+
+void SPropertyEditorClass::OnDragLeave(const FDragDropEvent& DragDropEvent)
+{
+	TSharedPtr<FSodaDragDropOp> UnloadedClassOp = DragDropEvent.GetOperationAs<FSodaDragDropOp>();
+	if (UnloadedClassOp.IsValid())
+	{
+		UnloadedClassOp->ResetToDefaultToolTip();
+	}
+}
+
+FReply SPropertyEditorClass::OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	TSharedPtr<FClassDragDropOp> ClassOperation = DragDropEvent.GetOperationAs<FClassDragDropOp>();
+	if (ClassOperation.IsValid())
+	{
+		// We can only drop one item into the combo box, so drop the first one.
+		FString ClassPath = ClassOperation->ClassesToDrop[0]->GetPathName();
+
+		// Set the property, it will be verified as valid.
+		SendToObjects(ClassPath);
+
+		return FReply::Handled();
+	}
+	
+	TSharedPtr<FSodaDragDropOp> UnloadedClassOp = DragDropEvent.GetOperationAs<FSodaDragDropOp>();
+	if (UnloadedClassOp.IsValid())
+	{
+		bool bAllAssetWereLoaded = true;
+
+		FString AssetPath;
+
+		// Find the class/blueprint path
+		if (UnloadedClassOp->HasAssets())
+		{
+			AssetPath = UnloadedClassOp->GetAssets()[0].ObjectPath.ToString();
+		}
+		else if (UnloadedClassOp->HasAssetPaths())
+		{
+			AssetPath = UnloadedClassOp->GetAssetPaths()[0];
+		}
+
+		// Check to see if the asset can be found, otherwise load it.
+		UObject* Object = FindObject<UObject>(nullptr, *AssetPath);
+		if(Object == nullptr)
+		{
+			// Load the package.
+			GWarn->BeginSlowTask(LOCTEXT("OnDrop_LoadPackage", "Fully Loading Package For Drop"), true, false);
+
+			Object = LoadObject<UObject>(nullptr, *AssetPath);
+
+			GWarn->EndSlowTask();
+		}
+
+		if (UClass* Class = Cast<UClass>(Object))
+		{
+			if (ClassFilter->IsClassAllowed(ClassViewerOptions, Class, ClassFilterFuncs.ToSharedRef()))
+			{
+				// This was pointing to a class directly
+				SendToObjects(Class->GetPathName());
+			}
+		}
+		else if (UBlueprint* Blueprint = Cast<UBlueprint>(Object))
+		{
+			if (Blueprint->GeneratedClass)
+			{
+				if (ClassFilter->IsClassAllowed(ClassViewerOptions, Blueprint->GeneratedClass, ClassFilterFuncs.ToSharedRef()))
+				{
+					// This was pointing to a blueprint, get generated class
+					SendToObjects(Blueprint->GeneratedClass->GetPathName());
+				}
+			}
+		}
+
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+*/
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.h
new file mode 100644
index 0000000..08fb27f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorClass.h
@@ -0,0 +1,154 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "Misc/Attribute.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Input/SComboButton.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimeClassViewer/ClassViewerModule.h"
+
+namespace soda
+{
+
+class IClassViewerFilter;
+class FClassViewerFilterFuncs;
+
+/**
+ * A widget used to edit Class properties (UClass type properties).
+ * Can also be used (with a null FPropertyEditor) to edit a raw weak class pointer.
+ */
+class SPropertyEditorClass : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SPropertyEditorClass)
+		: _Font(FSodaStyle::GetFontStyle(PropertyEditorConstants::PropertyFontStyle)) 
+		, _MetaClass(UObject::StaticClass())
+		, _RequiredInterface(nullptr)
+		, _AllowAbstract(false)
+		, _IsBlueprintBaseOnly(false)
+		, _AllowNone(true)
+		, _ShowDisplayNames(false)
+		{}
+		SLATE_ARGUMENT(FSlateFontInfo, Font)
+
+		/** Arguments used when constructing this outside of a PropertyEditor (PropertyEditor == null), ignored otherwise */
+		/** The meta class that the selected class must be a child-of (required if PropertyEditor == null) */
+		SLATE_ARGUMENT(const UClass*, MetaClass)
+		/** An interface that the selected class must implement (optional) */
+		SLATE_ARGUMENT(const UClass*, RequiredInterface)
+		/** Whether or not abstract classes are allowed (optional) */
+		SLATE_ARGUMENT(bool, AllowAbstract)
+		/** Should only base blueprints be displayed? (optional) */
+		SLATE_ARGUMENT(bool, IsBlueprintBaseOnly)
+		/** Should we be able to select "None" as a class? (optional) */
+		SLATE_ARGUMENT(bool, AllowNone)
+		/** Attribute used to get the currently selected class (required if PropertyEditor == null) */
+		SLATE_ATTRIBUTE(const UClass*, SelectedClass)
+		/** Should we show the view options button at the bottom of the class picker?*/
+		SLATE_ARGUMENT(bool, ShowViewOptions)
+		/** Should we show the class picker in tree mode or list mode?*/
+		SLATE_ARGUMENT(bool, ShowTree)
+		/** Should we prettify class names on the class picker? (ie show their display name) */
+		SLATE_ARGUMENT(bool, ShowDisplayNames)
+		/** Delegate used to set the currently selected class (required if PropertyEditor == null) */
+		SLATE_EVENT(FOnSetClass, OnSetClass)
+		/** Custom class filter(s) to be applied to the class picker widget (may be empty) */
+		SLATE_ARGUMENT(TArray<TSharedRef<IClassViewerFilter>>, ClassViewerFilters)
+	SLATE_END_ARGS()
+
+	static bool Supports(const TSharedRef< class FPropertyEditor >& InPropertyEditor);
+
+	void Construct(const FArguments& InArgs, const TSharedPtr< class FPropertyEditor >& InPropertyEditor = nullptr);
+
+	void GetDesiredWidth(float& OutMinDesiredWidth, float& OutMaxDesiredWidth);
+
+private:
+	void SendToObjects(const FString& NewValue);
+
+	//virtual void OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
+	//virtual void OnDragLeave(const FDragDropEvent& DragDropEvent) override;
+	//virtual FReply OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
+
+	TSharedRef<SWidget> ConstructClassViewer();
+
+	/** 
+	 * Generates a class picker with a filter to show only classes allowed to be selected. 
+	 *
+	 * @return The Class Picker widget.
+	 */
+	TSharedRef<SWidget> GenerateClassPicker();
+
+	/** 
+	 * Callback function from the Class Picker for when a Class is picked.
+	 *
+	 * @param InClass			The class picked in the Class Picker
+	 */
+	void OnClassPicked(UClass* InClass);
+
+	/**
+	 * Gets the active display value as a string
+	 */
+	FText GetDisplayValueAsString() const;
+
+	bool CanEdit() const;
+
+private:
+	/** The property editor we were constructed for, or null if we're editing using the construction arguments */
+	TSharedPtr<class FPropertyEditor> PropertyEditor;
+
+	/** Used when the property deals with Classes and will display a Class Picker. */
+	TSharedPtr<class SComboButton> ComboButton;
+
+	/** Class filter that the class viewer is using. */
+	TSharedPtr<IClassViewerFilter> ClassFilter;
+
+	/** Filter functions for class viewer. */
+	TSharedPtr<FClassViewerFilterFuncs> ClassFilterFuncs;
+
+	/** Options used for creating the class viewer. */
+	FClassViewerInitializationOptions ClassViewerOptions;
+
+	/** The meta class that the selected class must be a child-of */
+	const UClass* MetaClass;
+	/** An interface that the selected class must implement */
+	const UClass* RequiredInterface;
+	/** Whether or not abstract classes are allowed */
+	bool bAllowAbstract;
+	/** Should only base blueprints be displayed? */
+	bool bIsBlueprintBaseOnly;
+	/** Should we be able to select "None" as a class? */
+	bool bAllowNone;
+	/** Should only placeable classes be displayed? */
+	bool bAllowOnlyPlaceable;
+	/** Should we show the view options button at the bottom of the class picker?*/
+	bool bShowViewOptions;
+	/** Should we show the class picker in tree mode or list mode?*/
+	bool bShowTree;
+	/** Should we prettify class names on the class picker? (ie show their display name) */
+	bool bShowDisplayNames;
+	/** Classes that can be picked with this property */
+	TArray<const UClass*> AllowedClassFilters;
+	/** Classes that can NOT be picked with this property */
+	TArray<const UClass*> DisallowedClassFilters;
+
+
+	/** Attribute used to get the currently selected class (required if PropertyEditor == null) */
+	TAttribute<const UClass*> SelectedClass;
+	/** Delegate used to set the currently selected class (required if PropertyEditor == null) */
+	FOnSetClass OnSetClass;
+
+	void CreateClassFilter(const TArray<TSharedRef<IClassViewerFilter>>& InClassFilters);
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorColor.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorColor.cpp
new file mode 100644
index 0000000..7a8e66e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorColor.cpp
@@ -0,0 +1,295 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorColor.h"
+#include "EngineGlobals.h"
+#include "Engine/Engine.h"
+#include "Components/LightComponent.h"
+//#include "Editor.h"
+#include "Widgets/Colors/SColorBlock.h"
+#include "Materials/MaterialExpressionConstant3Vector.h"
+#include "Widgets/Colors/SColorPicker.h"
+
+namespace soda
+{
+
+void SPropertyEditorColor::Construct( const FArguments& InArgs, const TSharedRef<FPropertyEditor>& InPropertyEditor, const TSharedRef<IPropertyUtilities>& InPropertyUtilities )
+{
+	PropertyEditor = InPropertyEditor;
+	PropertyUtilities = InPropertyUtilities;
+
+	//@todo Slate Property window: This should probably be controlled via metadata and then the actual alpha channel property hidden if its not used.
+	bIgnoreAlpha = ShouldDisplayIgnoreAlpha();
+
+	ChildSlot
+	[
+		SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.FillWidth(1)
+		[
+			ConstructColorBlock()
+		]
+		+ SHorizontalBox::Slot()
+		.FillWidth(1)
+		[
+			ConstructAlphaColorBlock()
+		]
+	];
+
+	SetEnabled( TAttribute<bool>( this, &SPropertyEditorColor::CanEdit ) );
+}
+
+bool SPropertyEditorColor::Supports( const TSharedRef<FPropertyEditor>& InPropertyEditor )
+{
+	const FProperty* NodeProperty = InPropertyEditor->GetProperty();
+	return ( CastField<const FStructProperty>(NodeProperty) && (CastField<const FStructProperty>(NodeProperty)->Struct->GetFName()==NAME_Color || CastField<const FStructProperty>(NodeProperty)->Struct->GetFName()==NAME_LinearColor) );
+}
+
+TSharedRef< SColorBlock > SPropertyEditorColor::ConstructColorBlock()
+{
+	return SNew( SColorBlock )
+		.Color( this, &SPropertyEditorColor::OnGetColor )
+		.ShowBackgroundForAlpha(true)
+		.AlphaDisplayMode(bIgnoreAlpha ? EColorBlockAlphaDisplayMode::Ignore : EColorBlockAlphaDisplayMode::Combined)
+		.OnMouseButtonDown( this, &SPropertyEditorColor::ColorBlock_OnMouseButtonDown )
+		.Size( FVector2D( 10.0f, 10.0f ) );
+}
+
+TSharedRef< SColorBlock > SPropertyEditorColor::ConstructAlphaColorBlock()
+{
+	// If the color is alpha'd, we always want to display the color as opaque as well as with the appropriate alpha.
+	return SNew( SColorBlock )
+		.Color( this, &SPropertyEditorColor::OnGetColor )
+		.ShowBackgroundForAlpha(false)
+		.AlphaDisplayMode(EColorBlockAlphaDisplayMode::Ignore)
+		.Visibility( this, &SPropertyEditorColor::GetVisibilityForOpaqueDisplay )
+		.OnMouseButtonDown( this, &SPropertyEditorColor::ColorBlock_OnMouseButtonDown )
+		.Size( FVector2D( 10.0f, 10.0f ) );
+}
+
+bool SPropertyEditorColor::ShouldDisplayIgnoreAlpha() const
+{
+	// Determines whether we should ignore the alpha value and just display the color fully opaque (such as
+	// when associated with lights, for example).
+
+	const FStructProperty* NodeStructProperty = CastField<const FStructProperty>( PropertyEditor->GetProperty() );
+	check(NodeStructProperty);
+
+	return NodeStructProperty->GetOwnerClass() && 
+		( NodeStructProperty->GetOwnerClass()->IsChildOf(ULightComponent::StaticClass()) || NodeStructProperty->GetOwnerClass()->IsChildOf(UMaterialExpressionConstant3Vector::StaticClass()));
+}
+
+EVisibility SPropertyEditorColor::GetVisibilityForOpaqueDisplay() const
+{
+	// If the color has a non-opaque alpha, we want to display half of the box as Opaque so you can always see
+	// the color even if it's mostly/entirely transparent.  But if the color is rendered as completely opaque,
+	// we might as well collapse the extra opaque display rather than drawing two separate boxes.
+
+	EVisibility OpaqueDisplayVisibility = EVisibility::Collapsed;
+	if( !bIgnoreAlpha )
+	{
+		const bool bColorIsAlreadyOpaque = (OnGetColor().A == 1.0);
+		if (bColorIsAlreadyOpaque)
+		{
+			OpaqueDisplayVisibility = EVisibility::Collapsed;
+		}
+		else
+		{
+			OpaqueDisplayVisibility = EVisibility::Visible;
+		}
+	}
+
+	return OpaqueDisplayVisibility;
+}
+
+FReply SPropertyEditorColor::ColorBlock_OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if ( MouseEvent.GetEffectingButton() != EKeys::LeftMouseButton )
+	{
+		return FReply::Unhandled();
+	}
+
+	const FProperty* Property = PropertyEditor->GetProperty();
+	check(Property);
+
+	bool bRefreshOnlyOnOk = Property->GetOwnerClass() && Property->GetOwnerClass()->IsChildOf(UMaterialExpressionConstant3Vector::StaticClass());
+	//@todo Slate Property window: This should probably be controlled via metadata and then the actual alpha channel property hidden if its not used.
+	const bool bUseAlpha = !(Property->GetOwnerClass() && (Property->GetOwnerClass()->IsChildOf(ULightComponent::StaticClass()) || bRefreshOnlyOnOk));
+	
+	CreateColorPickerWindow(PropertyEditor.ToSharedRef(), bUseAlpha, bRefreshOnlyOnOk);
+
+	return FReply::Handled();
+}
+
+FLinearColor SPropertyEditorColor::OnGetColor() const
+{
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+	const FProperty* Property = PropertyEditor->GetProperty();
+	check(Property);
+
+	FLinearColor Color;
+
+	FReadAddressList ReadAddresses;
+	PropertyNode->GetReadAddress( false, ReadAddresses, false );
+
+	if( ReadAddresses.Num() ) 
+	{
+		const uint8* Addr = ReadAddresses.GetAddress(0);
+		if( Addr )
+		{
+			if( CastField<const FStructProperty>(Property)->Struct->GetFName() == NAME_Color )
+			{
+				Color = (*(FColor*)Addr).ReinterpretAsLinear();
+			}
+			else
+			{
+				check( CastField<const FStructProperty>(Property)->Struct->GetFName() == NAME_LinearColor );
+				Color = *(FLinearColor*)Addr;
+			}
+		}
+	}
+
+	return Color;
+}
+
+void SPropertyEditorColor::CreateColorPickerWindow(const TSharedRef< class FPropertyEditor >& InPropertyEditor, bool bUseAlpha, bool bOnlyRefreshOnOk)
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+
+	FProperty* Property = PropertyNode->GetProperty();
+	check(Property);
+
+	FReadAddressList ReadAddresses;
+	PropertyNode->GetReadAddress(false, ReadAddresses, false);
+
+	FLinearColor InitialColor = FLinearColor(ForceInit);
+	if (ReadAddresses.Num())
+	{
+		OriginalColors.Empty(ReadAddresses.Num());
+		OriginalColors.AddUninitialized(ReadAddresses.Num());
+
+		bool bClampValue = false;
+		// Store off the original colors in the case that the user cancels the color picker. We'll revert to the original colors in that case
+		for (int32 AddrIndex = 0; AddrIndex < ReadAddresses.Num(); ++AddrIndex)
+		{
+
+			const uint8* Addr = ReadAddresses.GetAddress(AddrIndex);
+			if (Addr)
+			{
+				if (CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_Color)
+				{
+					OriginalColors[AddrIndex] = ((FColor*)Addr)->ReinterpretAsLinear();
+					bClampValue = true;
+				}
+				else
+				{
+					check(CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_LinearColor);
+					OriginalColors[AddrIndex] = *(FLinearColor*)Addr;
+				}
+			}
+		}
+
+		// Only one color can be the initial color.  Just use the first color property
+		InitialColor = OriginalColors[0];
+
+		FColorPickerArgs PickerArgs;
+		PickerArgs.bOnlyRefreshOnMouseUp = true;
+		PickerArgs.ParentWidget = AsShared();
+		PickerArgs.bUseAlpha = bUseAlpha;
+		PickerArgs.bOnlyRefreshOnOk = bOnlyRefreshOnOk;
+		PickerArgs.bClampValue = bClampValue;
+		PickerArgs.DisplayGamma = TAttribute<float>::Create(TAttribute<float>::FGetter::CreateUObject(GEngine, &UEngine::GetDisplayGamma));
+		PickerArgs.OnColorCommitted = FOnLinearColorValueChanged::CreateSP(this, &SPropertyEditorColor::SetColor);
+		PickerArgs.OnColorPickerCancelled = FOnColorPickerCancelled::CreateSP(this, &SPropertyEditorColor::OnColorPickerCancelled);
+		PickerArgs.InitialColor = InitialColor;
+
+		OpenColorPicker(PickerArgs);
+	}
+
+
+}
+
+void SPropertyEditorColor::SetColor(FLinearColor NewColor)
+{
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+
+	FProperty* Property = PropertyNode->GetProperty();
+	check(Property);
+	
+	FReadAddressList ReadAddresses;
+	PropertyNode->GetReadAddress( false, ReadAddresses, false );
+
+	if( ReadAddresses.Num() ) 
+	{
+		//GEditor->BeginTransaction( NSLOCTEXT("UnrealEd", "SetColorProperty", "Set Color Property") );
+
+		PropertyNode->NotifyPreChange(Property, PropertyUtilities->GetNotifyHook());
+		for( int32 AddrIndex = 0; AddrIndex <  ReadAddresses.Num(); ++AddrIndex )
+		{
+			const uint8* Addr = ReadAddresses.GetAddress(AddrIndex);
+			if( Addr )
+			{
+				if( CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_Color )
+				{
+					*(FColor*)Addr = NewColor.ToFColor(false);
+				}
+				else
+				{
+					check( CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_LinearColor );
+					*(FLinearColor*)Addr = NewColor;
+				}
+			}
+		}
+
+		FPropertyChangedEvent ChangeEvent(Property, EPropertyChangeType::ValueSet);
+		PropertyNode->NotifyPostChange( ChangeEvent, PropertyUtilities->GetNotifyHook() );
+
+		//GEditor->EndTransaction();		
+	}
+}
+
+void SPropertyEditorColor::OnColorPickerCancelled( FLinearColor OriginalColor )
+{
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+
+	FProperty* Property = PropertyNode->GetProperty();
+	check(Property);
+
+	FReadAddressList ReadAddresses;
+	PropertyNode->GetReadAddress( false, ReadAddresses, false );
+
+	if( ReadAddresses.Num() ) 
+	{
+		check( OriginalColors.Num() == ReadAddresses.Num() );
+		PropertyNode->NotifyPreChange(Property, PropertyUtilities->GetNotifyHook());
+
+		for( int32 AddrIndex = 0; AddrIndex < ReadAddresses.Num(); ++AddrIndex )
+		{
+			const uint8* Addr = ReadAddresses.GetAddress(AddrIndex);
+			if( Addr )
+			{
+				if( CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_Color )
+				{
+					*(FColor*)Addr = OriginalColors[AddrIndex].ToFColor(false);
+				}
+				else
+				{
+					check( CastField<FStructProperty>(Property)->Struct->GetFName() == NAME_LinearColor );
+					*(FLinearColor*)Addr = OriginalColors[AddrIndex];
+				}
+			}
+		}
+
+		FPropertyChangedEvent ChangeEvent(Property, EPropertyChangeType::ValueSet);
+		PropertyNode->NotifyPostChange( ChangeEvent, PropertyUtilities->GetNotifyHook() );
+	}
+
+	OriginalColors.Empty();
+}
+
+bool SPropertyEditorColor::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorColor.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorColor.h
new file mode 100644
index 0000000..9ecc097
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorColor.h
@@ -0,0 +1,95 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+
+class SColorBlock;
+
+namespace soda
+{
+
+class SPropertyEditorColor : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorColor ) {}
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef< class FPropertyEditor >& PropertyEditor );
+
+	void Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor, const TSharedRef< class IPropertyUtilities >& InPropertyUtilities );
+
+
+protected:
+
+	/**	@return A newly constructed SColorBlock */
+	TSharedRef< SColorBlock > ConstructColorBlock();
+
+	/**	@return A newly constructed SColorBlock setup specifically for handling alpha */
+	TSharedRef< SColorBlock > ConstructAlphaColorBlock();
+
+	/**
+	 * ShouldDisplayIgnoreAlpha determines whether or not to ignore the alpha value and just display the color as fully
+	 * opaque (such as when associated with lights, for example).
+	 *
+	 * @return Whether to display the color as completely opaque regardless of its alpha value.
+	 */
+	bool ShouldDisplayIgnoreAlpha() const;
+
+	/** @return Gets the color for the color block to use for its TAttribute */
+	FLinearColor OnGetColor() const;
+
+	/**
+	* The system calls this method to notify the widget that a mouse button was pressed within it. This event is bubbled.
+	* The color block will spawn a new color picker and destroy the old one if applicable.
+	*
+	* @param MyGeometry The Geometry of the widget receiving the event
+	* @param MouseEvent Information about the input event
+	*
+	* @return Whether the event was handled along with possible requests for the system to take action.
+	*/
+	FReply ColorBlock_OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent);
+
+	/**
+	 * If the color has a non-opaque alpha, we want to display half of the box as opaque so you can always see
+	 * the color even if it's mostly/entirely transparent.  But if the color is rendered as completely opaque,
+	 * we might as well collapse the extra opaque display rather than drawing two separate boxes.
+	 *
+	 * @return Whether the always-opaque part of the display is visible or collapsed (the latter is if the main
+	 * part of the display is already being rendered as opaque).
+	 */
+	EVisibility GetVisibilityForOpaqueDisplay() const;
+
+	void CreateColorPickerWindow(const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha, bool bOnlyRefreshOnOk=false);
+
+	void SetColor(FLinearColor NewColor);
+
+	/**
+	 * Called when the color picker is cancelled
+	 */
+	void OnColorPickerCancelled( FLinearColor OriginalColor );
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+
+protected:
+	/** Original colors to set in the case that the user cancel's the color picker */
+	TArray< FLinearColor > OriginalColors;
+
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+
+	TSharedPtr< class IPropertyUtilities > PropertyUtilities;
+
+	/** Whether or not alpha should be displayed.  Some color properties (such as lights) do not use alpha. */
+	bool bIgnoreAlpha;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.cpp
new file mode 100644
index 0000000..012aee6
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.cpp
@@ -0,0 +1,264 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyComboBox.h"
+
+#include "RuntimeMetaData.h"
+#include "RuntimeEditorUtils.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+static int32 FindEnumValueIndex(UEnum* Enum, FString const& ValueString)
+{
+	int32 Index = INDEX_NONE;
+	for(int32 ValIndex = 0; ValIndex < Enum->NumEnums(); ++ValIndex)
+	{
+		FString const EnumName    = Enum->GetNameStringByIndex(ValIndex);
+		FString const DisplayName = Enum->GetDisplayNameTextByIndex(ValIndex).ToString();
+
+		if (DisplayName.Len() > 0)
+		{
+			if (DisplayName == ValueString)
+			{
+				Index = ValIndex;
+				break;
+			}
+		}
+		
+		if (EnumName == ValueString)
+		{
+			Index = ValIndex;
+			break;
+		}
+	}
+	return Index;
+}
+
+void SPropertyEditorCombo::GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+{
+	OutMinDesiredWidth = 125.0f;
+	OutMaxDesiredWidth = 400.0f;
+}
+
+bool SPropertyEditorCombo::Supports( const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	const FProperty* Property = InPropertyEditor->GetProperty();
+	int32 ArrayIndex = PropertyNode->GetArrayIndex();
+
+	if(	((Property->IsA(FByteProperty::StaticClass()) && CastField<const FByteProperty>(Property)->Enum)
+		||	Property->IsA(FEnumProperty::StaticClass())
+		|| (Property->IsA(FStrProperty::StaticClass()) && FRuntimeMetaData::HasMetaData(Property, TEXT("Enum")))
+		|| !PropertyEditorHelpers::GetPropertyOptionsMetaDataKey(Property).IsNone()
+		)
+		&&	( ( ArrayIndex == -1 && Property->ArrayDim == 1 ) || ( ArrayIndex > -1 && Property->ArrayDim > 0 ) ) )
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void SPropertyEditorCombo::Construct( const FArguments& InArgs, const TSharedPtr< class FPropertyEditor >& InPropertyEditor )
+{
+	PropertyEditor = InPropertyEditor;
+	ComboArgs = InArgs._ComboArgs;
+
+	TAttribute<FText> TooltipAttribute;
+
+	if (PropertyEditor.IsValid())
+	{
+		ComboArgs.PropertyHandle = PropertyEditor->GetPropertyHandle();
+		TooltipAttribute = TAttribute<FText>::Create(TAttribute<FText>::FGetter::CreateSP(PropertyEditor.ToSharedRef(), &FPropertyEditor::GetValueAsText));
+	}
+
+	TArray<TSharedPtr<FString>> ComboItems;
+	TArray<bool> Restrictions;
+	TArray<TSharedPtr<SToolTip>> RichToolTips;
+
+	if (!ComboArgs.Font.HasValidFont())
+	{
+		ComboArgs.Font = FSodaStyle::GetFontStyle(PropertyEditorConstants::PropertyFontStyle);
+	}
+
+	GenerateComboBoxStrings(ComboItems, RichToolTips, Restrictions);
+
+	SAssignNew(ComboBox, SPropertyComboBox)
+		.Font( ComboArgs.Font )
+		.RichToolTipList( RichToolTips )
+		.ComboItemList( ComboItems )
+		.RestrictedList( Restrictions )
+		.OnSelectionChanged( this, &SPropertyEditorCombo::OnComboSelectionChanged )
+		.OnComboBoxOpening( this, &SPropertyEditorCombo::OnComboOpening )
+		.VisibleText( this, &SPropertyEditorCombo::GetDisplayValueAsString )
+		.ToolTipText( TooltipAttribute )
+		.ShowSearchForItemCount( ComboArgs.ShowSearchForItemCount );
+
+	ChildSlot
+	[
+		ComboBox.ToSharedRef()
+	];
+
+	SetEnabled( TAttribute<bool>( this, &SPropertyEditorCombo::CanEdit ) );
+}
+
+FString SPropertyEditorCombo::GetDisplayValueAsString() const
+{
+	if (ComboArgs.OnGetValue.IsBound())
+	{
+		return ComboArgs.OnGetValue.Execute();
+	}
+	else if (PropertyEditor.IsValid())
+	{
+		return (bUsesAlternateDisplayValues) ? PropertyEditor->GetValueAsDisplayString() : PropertyEditor->GetValueAsString();
+	}
+	else
+	{
+		FString ValueString;
+
+		if (bUsesAlternateDisplayValues)
+		{
+			ComboArgs.PropertyHandle->GetValueAsDisplayString(ValueString);
+		}
+		else
+		{
+			ComboArgs.PropertyHandle->GetValueAsFormattedString(ValueString);
+		}
+		return ValueString;
+	}
+}
+
+void SPropertyEditorCombo::GenerateComboBoxStrings( TArray< TSharedPtr<FString> >& OutComboBoxStrings, TArray<TSharedPtr<SToolTip>>& RichToolTips, TArray<bool>& OutRestrictedItems )
+{
+	if (ComboArgs.OnGetStrings.IsBound())
+	{
+		ComboArgs.OnGetStrings.Execute(OutComboBoxStrings, RichToolTips, OutRestrictedItems);
+		return;
+	}
+
+	TArray<FText> BasicTooltips;
+	bUsesAlternateDisplayValues = ComboArgs.PropertyHandle->GeneratePossibleValues(OutComboBoxStrings, BasicTooltips, OutRestrictedItems);
+
+	// For enums, look for rich tooltip information
+	if(ComboArgs.PropertyHandle.IsValid())
+	{
+		if(const FProperty* Property = ComboArgs.PropertyHandle->GetProperty())
+		{
+			UEnum* Enum = nullptr;
+
+			if(const FByteProperty* ByteProperty = CastField<FByteProperty>(Property))
+			{
+				Enum = ByteProperty->Enum;
+			}
+			else if(const FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property))
+			{
+				Enum = EnumProperty->GetEnum();
+			}
+
+			if(Enum)
+			{
+				TArray<FName> AllowedPropertyEnums = PropertyEditorHelpers::GetValidEnumsFromPropertyOverride(Property, Enum);
+
+				// Get enum doc link (not just GetDocumentationLink as that is the documentation for the struct we're in, not the enum documentation)
+				FString DocLink = PropertyEditorHelpers::GetEnumDocumentationLink(Property);
+
+				for(int32 EnumIdx = 0; EnumIdx < Enum->NumEnums() - 1; ++EnumIdx)
+				{
+					FString Excerpt = Enum->GetNameStringByIndex(EnumIdx);
+
+					bool bShouldBeHidden = FRuntimeMetaData::HasMetaData(Enum, TEXT("Hidden"), EnumIdx) || FRuntimeMetaData::HasMetaData(Enum, TEXT("Spacer"), EnumIdx);
+					if(!bShouldBeHidden && AllowedPropertyEnums.Num() != 0)
+					{
+						bShouldBeHidden = AllowedPropertyEnums.Find(Enum->GetNameByIndex(EnumIdx)) == INDEX_NONE;
+					}
+
+					if (!bShouldBeHidden)
+					{
+						bShouldBeHidden = ComboArgs.PropertyHandle->IsHidden(Excerpt);
+					}
+				
+					if(!bShouldBeHidden)
+					{
+						RichToolTips.Add(soda::IDocumentation::Get()->CreateToolTip(MoveTemp(BasicTooltips[EnumIdx]), nullptr, DocLink, MoveTemp(Excerpt)));
+					}
+				}
+			}
+		}
+	}
+}
+
+void SPropertyEditorCombo::OnComboSelectionChanged( TSharedPtr<FString> NewValue, ESelectInfo::Type SelectInfo )
+{
+	if ( NewValue.IsValid() )
+	{
+		SendToObjects( *NewValue );
+	}
+}
+
+void SPropertyEditorCombo::OnComboOpening()
+{
+	TArray<TSharedPtr<FString>> ComboItems;
+	TArray<TSharedPtr<SToolTip>> RichToolTips;
+	TArray<bool> Restrictions;
+	GenerateComboBoxStrings(ComboItems, RichToolTips, Restrictions);
+
+	ComboBox->SetItemList(ComboItems, RichToolTips, Restrictions);
+
+	// try and re-sync the selection in the combo list in case it was changed since Construct was called
+	// this would fail if the displayed value doesn't match the equivalent value in the combo list
+	FString CurrentDisplayValue = GetDisplayValueAsString();
+	ComboBox->SetSelectedItem(CurrentDisplayValue);
+}
+
+void SPropertyEditorCombo::SendToObjects( const FString& NewValue )
+{
+	FString Value = NewValue;
+	if (ComboArgs.OnValueSelected.IsBound())
+	{
+		ComboArgs.OnValueSelected.Execute(NewValue);
+	}
+	else if (ComboArgs.PropertyHandle.IsValid())
+	{
+		FProperty* Property = ComboArgs.PropertyHandle->GetProperty();
+
+		if (bUsesAlternateDisplayValues && !Property->IsA(FStrProperty::StaticClass()))
+		{
+			// currently only enum properties can use alternate display values; this 
+			// might change, so assert here so that if support is expanded to other 
+			// property types without updating this block of code, we'll catch it quickly
+			UEnum* Enum = nullptr;
+			if (FByteProperty* ByteProperty = CastField<FByteProperty>(Property))
+			{
+				Enum = ByteProperty->Enum;
+			}
+			else if (FEnumProperty* EnumProperty = CastField<FEnumProperty>(Property))
+			{
+				Enum = EnumProperty->GetEnum();
+			}
+			check(Enum != nullptr);
+
+			const int32 Index = FindEnumValueIndex(Enum, NewValue);
+			check(Index != INDEX_NONE);
+
+			Value = Enum->GetNameStringByIndex(Index);
+		}
+
+		ComboArgs.PropertyHandle->SetValueFromFormattedString(Value);
+	}
+}
+
+bool SPropertyEditorCombo::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.h
new file mode 100644
index 0000000..8335cd3
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorCombo.h
@@ -0,0 +1,66 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+namespace soda
+{
+
+class SPropertyComboBox;
+
+class SPropertyEditorCombo : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorCombo )
+		{}
+		SLATE_ARGUMENT( FPropertyComboBoxArgs, ComboArgs )
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef< class FPropertyEditor >& InPropertyEditor );
+
+	/** Constructs widget, if InPropertyEditor is null then PropertyHandle must be set */
+	void Construct( const FArguments& InArgs, const TSharedPtr< class FPropertyEditor >& InPropertyEditor = nullptr);
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth );
+private:
+	void GenerateComboBoxStrings( TArray< TSharedPtr<FString> >& OutComboBoxStrings, TArray<TSharedPtr<class SToolTip>>& OutToolTips, TArray<bool>& OutRestrictedItems );
+	void OnComboSelectionChanged( TSharedPtr<FString> NewValue, ESelectInfo::Type SelectInfo );
+	void OnComboOpening();
+
+	virtual void SendToObjects( const FString& NewValue );
+
+	/**
+	 * Gets the active display value as a string
+	 */
+	FString GetDisplayValueAsString() const;
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+private:
+
+	/** Property editor this was created from, may be null */
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+
+	/** Fills out with generated strings. */
+	TSharedPtr<class SPropertyComboBox> ComboBox;
+
+	/** Arguments used to construct the combo box */
+	FPropertyComboBoxArgs ComboArgs;
+
+	/**
+	 * Indicates that this combo box's values are friendly names for the real values; currently only used for enum drop-downs.
+	 */
+	bool bUsesAlternateDisplayValues;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.cpp
new file mode 100644
index 0000000..57b0822
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.cpp
@@ -0,0 +1,69 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.h"
+#include "Widgets/Input/SEditableTextBox.h"
+
+extern UScriptStruct* Z_Construct_UScriptStruct_FDateTime();	// It'd be really nice if StaticStruct() worked on types declared in Object.h
+
+namespace soda
+{
+
+void SPropertyEditorDateTime::Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+{
+	PropertyEditor = InPropertyEditor;
+
+	ChildSlot
+	[
+		SAssignNew( PrimaryWidget, SEditableTextBox )
+		.Text( InPropertyEditor, &FPropertyEditor::GetValueAsText )
+		.Font( InArgs._Font )
+		.SelectAllTextWhenFocused(true)
+		.ClearKeyboardFocusOnCommit(false)
+		.OnTextCommitted(this, &SPropertyEditorDateTime::HandleTextCommitted)
+		.SelectAllTextOnCommit(true)
+	];
+
+	if( InPropertyEditor->PropertyIsA( FObjectPropertyBase::StaticClass() ) )
+	{
+		// Object properties should display their entire text in a tooltip
+		PrimaryWidget->SetToolTipText( TAttribute<FText>( InPropertyEditor, &FPropertyEditor::GetValueAsText ) );
+	}
+
+	SetEnabled(TAttribute<bool>(this, &SPropertyEditorDateTime::CanEdit));
+}
+
+
+bool SPropertyEditorDateTime::Supports( const TSharedRef< FPropertyEditor >& InPropertyEditor )
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	const FProperty* Property = InPropertyEditor->GetProperty();
+
+	if (Property->IsA(FStructProperty::StaticClass()))
+	{
+		const FStructProperty* StructProp = CastField<const FStructProperty>(Property);
+		if (Z_Construct_UScriptStruct_FDateTime() == StructProp->Struct)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+
+void SPropertyEditorDateTime::HandleTextCommitted( const FText& NewText, ETextCommit::Type /*CommitInfo*/ )
+{
+	const TSharedRef<FPropertyNode> PropertyNode = PropertyEditor->GetPropertyNode();
+	const TSharedRef<IPropertyHandle> PropertyHandle = PropertyEditor->GetPropertyHandle();
+
+	PropertyHandle->SetValueFromFormattedString(NewText.ToString());
+}
+
+/** @return True if the property can be edited */
+bool SPropertyEditorDateTime::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.h
new file mode 100644
index 0000000..b87532a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorDateTime.h
@@ -0,0 +1,47 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Widgets/SWidget.h"
+#include "SodaStyleSet.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+
+namespace soda
+{
+
+class SPropertyEditorDateTime : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorDateTime )
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) ) 
+		{}
+		SLATE_ATTRIBUTE( FSlateFontInfo, Font )
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef< class FPropertyEditor >& InPropertyEditor );
+
+	void Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor );
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth );
+
+private:
+
+	virtual void HandleTextCommitted( const FText& NewText, ETextCommit::Type CommitInfo );
+
+	bool CanEdit() const;
+
+private:
+
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+
+	TSharedPtr< class SWidget > PrimaryWidget;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.cpp
new file mode 100644
index 0000000..32f4c53
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.cpp
@@ -0,0 +1,349 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h"
+#include "Modules/ModuleManager.h"
+#include "Widgets/Images/SImage.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+#include "RuntimePropertyEditor/PropertyHandleImpl.h"
+//#include "ClassViewerModule.h"
+//#include "ClassViewerFilter.h"
+#include "Styling/SlateIconFinder.h"
+#include "UObject/ConstructorHelpers.h"
+//#include "Editor.h"
+
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+/*
+class FPropertyEditorInlineClassFilter : public IClassViewerFilter
+{
+public:
+	// The Object Property, classes are examined for a child-of relationship of the property's class. 
+	FObjectPropertyBase* ObjProperty;
+
+	// The Interface Property, classes are examined for implementing the property's class.
+	FInterfaceProperty* IntProperty;
+
+	// Whether or not abstract classes are allowed. 
+	bool bAllowAbstract;
+
+	// Hierarchy of objects that own this property. Used to check against ClassWithin.
+	TSet< const UObject* > OwningObjects;
+
+	bool IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef< FClassViewerFilterFuncs > InFilterFuncs ) override
+	{
+		const bool bChildOfObjectClass = ObjProperty && InClass->IsChildOf(ObjProperty->PropertyClass);
+		const bool bDerivedInterfaceClass = IntProperty && InClass->ImplementsInterface(IntProperty->InterfaceClass);
+
+		const bool bMatchesFlags = InClass->HasAnyClassFlags(CLASS_EditInlineNew) && 
+			!InClass->HasAnyClassFlags(CLASS_Hidden | CLASS_HideDropDown | CLASS_Deprecated) &&
+			(bAllowAbstract || !InClass->HasAnyClassFlags(CLASS_Abstract));
+
+		if( (bChildOfObjectClass || bDerivedInterfaceClass) && bMatchesFlags )
+		{
+			// Verify that the Owners of the property satisfy the ClassWithin constraint of the given class.
+			// When ClassWithin is null, assume it can be owned by anything.
+			return InClass->ClassWithin == nullptr || InFilterFuncs->IfMatchesAll_ObjectsSetIsAClass(OwningObjects, InClass->ClassWithin) != EFilterReturn::Failed;
+		}
+
+		return false;
+	}
+
+	virtual bool IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef< const IUnloadedBlueprintData > InUnloadedClassData, TSharedRef< FClassViewerFilterFuncs > InFilterFuncs) override
+	{
+		const bool bChildOfObjectClass = InUnloadedClassData->IsChildOf(ObjProperty->PropertyClass);
+
+		const bool bMatchesFlags = InUnloadedClassData->HasAnyClassFlags(CLASS_EditInlineNew) && 
+			!InUnloadedClassData->HasAnyClassFlags(CLASS_Hidden | CLASS_HideDropDown | CLASS_Deprecated) &&
+			(bAllowAbstract || !InUnloadedClassData->HasAnyClassFlags((CLASS_Abstract)));
+
+		if (bChildOfObjectClass && bMatchesFlags)
+		{
+			const UClass* ClassWithin = InUnloadedClassData->GetClassWithin();
+
+			// Verify that the Owners of the property satisfy the ClassWithin constraint of the given class.
+			// When ClassWithin is null, assume it can be owned by anything.
+			return ClassWithin == nullptr || InFilterFuncs->IfMatchesAll_ObjectsSetIsAClass(OwningObjects, ClassWithin) != EFilterReturn::Failed;
+		}
+		return false;
+	}
+};
+*/
+
+void SPropertyEditorEditInline::Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+{
+	PropertyEditor = InPropertyEditor;
+
+	TWeakPtr<IPropertyHandle> WeakHandlePtr = InPropertyEditor->GetPropertyHandle();
+
+	ChildSlot
+	[
+		SAssignNew(ComboButton, SComboButton)
+		.IsEnabled(this, &SPropertyEditorEditInline::IsValueEnabled, WeakHandlePtr)
+		//.OnGetMenuContent(this, &SPropertyEditorEditInline::GenerateClassPicker)
+		.ContentPadding(0)
+		.ToolTipText(InPropertyEditor, &FPropertyEditor::GetValueAsText )
+		.ButtonContent()
+		[
+			SNew(SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			.Padding(0.0f, 0.0f, 4.0f, 0.0f)
+			[
+				SNew( SImage )
+				.Image( this, &SPropertyEditorEditInline::GetDisplayValueIcon )
+			]
+			+SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			[
+				SNew( STextBlock )
+				.Text( this, &SPropertyEditorEditInline::GetDisplayValueAsString )
+				.Font( InArgs._Font )
+			]
+		]
+	];
+}
+
+bool SPropertyEditorEditInline::IsValueEnabled(TWeakPtr<IPropertyHandle> WeakHandlePtr) const
+{
+	if (WeakHandlePtr.IsValid())
+	{
+		return !WeakHandlePtr.Pin()->IsEditConst();
+	}
+
+	return false;
+}
+
+FText SPropertyEditorEditInline::GetDisplayValueAsString() const
+{
+	UObject* CurrentValue = NULL;
+	FPropertyAccess::Result Result = PropertyEditor->GetPropertyHandle()->GetValue( CurrentValue );
+	if( Result == FPropertyAccess::Success && CurrentValue != NULL )
+	{
+		return FRuntimeMetaData::GetDisplayNameText(CurrentValue->GetClass());
+	}
+	else
+	{
+		return PropertyEditor->GetValueAsText();
+	}
+}
+
+const FSlateBrush* SPropertyEditorEditInline::GetDisplayValueIcon() const
+{
+	UObject* CurrentValue = nullptr;
+	FPropertyAccess::Result Result = PropertyEditor->GetPropertyHandle()->GetValue( CurrentValue );
+	if( Result == FPropertyAccess::Success && CurrentValue != nullptr )
+	{
+		return FSlateIconFinder::FindIconBrushForClass(CurrentValue->GetClass());
+	}
+
+	return nullptr;
+}
+
+void SPropertyEditorEditInline::GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+{
+	OutMinDesiredWidth = 250.0f;
+	OutMaxDesiredWidth = 600.0f;
+}
+
+bool SPropertyEditorEditInline::Supports( const FPropertyNode* InTreeNode, int32 InArrayIdx )
+{
+	return InTreeNode
+		&& InTreeNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew)
+		&& InTreeNode->FindObjectItemParent()
+		&& !InTreeNode->IsPropertyConst();
+}
+
+bool SPropertyEditorEditInline::Supports( const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	return SPropertyEditorEditInline::Supports( &PropertyNode.Get(), PropertyNode->GetArrayIndex() );
+}
+
+bool SPropertyEditorEditInline::IsClassAllowed( UClass* CheckClass, bool bAllowAbstract ) const
+{
+	check(CheckClass);
+	return PropertyEditorHelpers::IsEditInlineClassAllowed( CheckClass, bAllowAbstract ) &&  CheckClass->HasAnyClassFlags(CLASS_EditInlineNew);
+}
+/*
+TSharedRef<SWidget> SPropertyEditorEditInline::GenerateClassPicker()
+{
+	FClassViewerInitializationOptions Options;
+	Options.bShowBackgroundBorder = false;
+	Options.bShowUnloadedBlueprints = true;
+	Options.NameTypeToDisplay = EClassViewerNameTypeToDisplay::DisplayName;
+
+	TSharedPtr<FPropertyEditorInlineClassFilter> ClassFilter = MakeShareable( new FPropertyEditorInlineClassFilter );
+	Options.ClassFilters.Add(ClassFilter.ToSharedRef());
+	ClassFilter->bAllowAbstract = false;
+
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+	FProperty* Property = PropertyNode->GetProperty();
+	ClassFilter->ObjProperty = CastField<FObjectPropertyBase>( Property );
+	ClassFilter->IntProperty = CastField<FInterfaceProperty>( Property );
+	Options.bShowNoneOption = !(Property->PropertyFlags & CPF_NoClear);
+
+	FObjectPropertyNode* ObjectPropertyNode = PropertyNode->FindObjectItemParent();
+	if( ObjectPropertyNode )
+	{
+		for ( TPropObjectIterator Itor( ObjectPropertyNode->ObjectIterator() ); Itor; ++Itor )
+		{
+			UObject* OwnerObject = Itor->Get();
+			ClassFilter->OwningObjects.Add( OwnerObject );
+		}
+	}
+
+	Options.PropertyHandle = PropertyEditor->GetPropertyHandle();
+
+	FOnClassPicked OnPicked( FOnClassPicked::CreateRaw( this, &SPropertyEditorEditInline::OnClassPicked ) );
+
+	return FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateClassViewer(Options, OnPicked);
+}
+*/
+void SPropertyEditorEditInline::OnClassPicked(UClass* InClass)
+{
+	TArray<FObjectBaseAddress> ObjectsToModify;
+	TArray<FString> NewValues;
+
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+	FObjectPropertyNode* ObjectNode = PropertyNode->FindObjectItemParent();
+
+	if( ObjectNode )
+	{
+		//GEditor->BeginTransaction(TEXT("PropertyEditor"), NSLOCTEXT("PropertyEditor", "OnClassPicked", "Set Class"), nullptr /* PropertyNode->GetProperty()) */ );
+
+		auto ExtractClassAndObjectNames = [](FStringView PathName, FStringView& ClassName, FStringView& ObjectName)
+		{
+			int32 ClassEnd;
+			PathName.FindChar(TCHAR('\''), ClassEnd);
+			if (ensure(ClassEnd != INDEX_NONE))
+			{
+				ClassName = PathName.Left(ClassEnd);
+			}
+
+			int32 LastPeriod, LastColon;
+			PathName.FindLastChar(TCHAR('.'), LastPeriod);
+			PathName.FindLastChar(TCHAR(':'), LastColon);
+			const int32 ObjectNameStart = FMath::Max(LastPeriod, LastColon);
+
+			if (ensure(ObjectNameStart != INDEX_NONE))
+			{
+				ObjectName = PathName.RightChop(ObjectNameStart + 1).LeftChop(1);
+			}
+		};
+
+		FString NewObjectName;
+		UObject* NewObjectTemplate = nullptr;
+
+		// If we've picked the same class as our archetype, then we want to create an object with the same name and properties
+		if (InClass)
+		{
+			FString DefaultValue = PropertyNode->GetDefaultValueAsString(/*bUseDisplayName=*/false);
+			if (!DefaultValue.IsEmpty() && DefaultValue != FName(NAME_None).ToString())
+			{
+				FStringView ClassName, ObjectName;
+				ExtractClassAndObjectNames(DefaultValue, ClassName, ObjectName);
+				if (InClass->GetName() == ClassName)
+				{
+					NewObjectName = ObjectName;
+
+					ConstructorHelpers::StripObjectClass(DefaultValue);
+					NewObjectTemplate = StaticFindObject(InClass, nullptr, *DefaultValue);
+				}
+			}
+		}
+
+		const TSharedRef<IPropertyHandle> PropertyHandle = PropertyEditor->GetPropertyHandle();
+
+		// If this is an instanced component property collect current names so we can clean them properly if necessary
+		TArray<FString> PrevPerObjectValues;
+		FObjectProperty* ObjectProperty = CastFieldChecked<FObjectProperty>(PropertyHandle->GetProperty());
+		if (ObjectProperty && ObjectProperty->HasAnyPropertyFlags(CPF_InstancedReference))
+		{
+			PropertyHandle->GetPerObjectValues(PrevPerObjectValues);
+		}
+
+		for ( TPropObjectIterator Itor( ObjectNode->ObjectIterator() ) ; Itor ; ++Itor )
+		{
+			FString NewValue;
+			if (InClass)
+			{
+				FStringView CurClassName, CurObjectName;
+				if (PrevPerObjectValues.IsValidIndex(NewValues.Num()) && PrevPerObjectValues[NewValues.Num()] != FName(NAME_None).ToString())
+				{
+					ExtractClassAndObjectNames(PrevPerObjectValues[NewValues.Num()], CurClassName, CurObjectName);
+				}
+
+				if (CurObjectName == NewObjectName && InClass->GetName() == CurClassName)
+				{
+					NewValue = MoveTemp(PrevPerObjectValues[NewValues.Num()]);
+					PrevPerObjectValues[NewValues.Num()].Reset();
+				}
+				else
+				{
+					UObject*		Object = Itor->Get();
+					UObject*		UseOuter = (InClass->IsChildOf(UClass::StaticClass()) ? Cast<UClass>(Object)->GetDefaultObject() : Object);
+					EObjectFlags	MaskedOuterFlags = UseOuter ? UseOuter->GetMaskedFlags(RF_PropagateToSubObjects) : RF_NoFlags;
+					if (UseOuter && UseOuter->HasAnyFlags(RF_ClassDefaultObject | RF_ArchetypeObject))
+					{
+						MaskedOuterFlags |= RF_ArchetypeObject;
+					}
+
+					if (NewObjectName.Len() > 0)
+					{
+						if (UObject* SubObject = StaticFindObject(UObject::StaticClass(), UseOuter, *NewObjectName))
+						{
+							SubObject->Rename(*MakeUniqueObjectName(GetTransientPackage(), SubObject->GetClass()).ToString(), GetTransientPackage(), REN_DontCreateRedirectors);
+
+							// If we've renamed the object out of the way here, we don't need to do it again below
+							if (PrevPerObjectValues.IsValidIndex(NewValues.Num()))
+							{
+								PrevPerObjectValues[NewValues.Num()].Reset();
+							}
+						}
+					}
+
+					UObject* NewUObject = NewObject<UObject>(UseOuter, InClass, *NewObjectName, MaskedOuterFlags, NewObjectTemplate);
+
+					NewValue = NewUObject->GetPathName();
+				}
+			}
+			else
+			{
+				NewValue = FName(NAME_None).ToString();
+			}
+			NewValues.Add(MoveTemp(NewValue));
+		}
+
+		PropertyHandle->SetPerObjectValues(NewValues);
+		check(PrevPerObjectValues.Num() == 0 || PrevPerObjectValues.Num() == NewValues.Num());
+
+		for (int32 Index = 0; Index < PrevPerObjectValues.Num(); ++Index)
+		{
+			if (PrevPerObjectValues[Index].Len() > 0 && PrevPerObjectValues[Index] != NewValues[Index])
+			{
+				// Move the old subobject to the transient package so GetObjectsWithOuter will not return it
+				// This is particularly important for UActorComponent objects so resetting owned components on the parent doesn't find it
+				ConstructorHelpers::StripObjectClass(PrevPerObjectValues[Index]);
+				if (UObject* SubObject = StaticFindObject(UObject::StaticClass(), nullptr, *PrevPerObjectValues[Index]))
+				{
+					SubObject->Rename(nullptr, GetTransientOuterForRename(SubObject->GetClass()), REN_DontCreateRedirectors);
+				}
+			}
+		}
+
+		// End the transaction if we called PreChange
+		//GEditor->EndTransaction();
+
+		// Force a rebuild of the children when this node changes
+		PropertyNode->RequestRebuildChildren();
+
+		ComboButton->SetIsOpen(false);
+	}
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h
new file mode 100644
index 0000000..0af902e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorEditInline.h
@@ -0,0 +1,90 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Widgets/SWidget.h"
+#include "SodaStyleSet.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "Widgets/Input/SComboButton.h"
+
+namespace soda
+{
+
+class SPropertyEditorEditInline : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorEditInline ) 
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) )
+		{}
+		SLATE_ARGUMENT( FSlateFontInfo, Font )
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef< class FPropertyEditor >& InPropertyEditor );
+	static bool Supports( const FPropertyNode* InTreeNode, int32 InArrayIdx );
+
+	void Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor );
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth );
+
+
+private:
+	/**
+	 * Called to see if the value is enabled for editing
+	 *
+	 * @param WeakHandlePtr	Handle to the property that the new value is for
+	 *
+	 * @return	true if the property is enabled
+	 */
+	bool IsValueEnabled(TWeakPtr<IPropertyHandle> WeakHandlePtr) const;
+
+	/**
+	 * @return The current display value for the combo box as a string
+	 */
+	FText GetDisplayValueAsString() const;
+
+	/**
+	 * @return The current display value's icon, if any. Returns nullptr if we have no valid value.
+	 */
+	const FSlateBrush* GetDisplayValueIcon() const;
+
+	/**
+	 * Wrapper method for determining whether a class is valid for use by this property item input proxy.
+	 *
+	 * @param	InItem			the property window item that contains this proxy.
+	 * @param	CheckClass		the class to verify
+	 * @param	bAllowAbstract	true if abstract classes are allowed
+	 *
+	 * @return	true if CheckClass is valid to be used by this input proxy
+	 */
+	bool IsClassAllowed( UClass* CheckClass, bool bAllowAbstract ) const;
+	
+        /** 
+	 * Generates a class picker with a filter to show only classes allowed to be selected. 
+	 *
+	 * @return The Class Picker widget.
+	 */
+	//TSharedRef<SWidget> GenerateClassPicker();
+
+	/** 
+	 * Callback function from the Class Picker for when a Class is picked.
+	 *
+	 * @param InClass			The class picked in the Class Picker
+	 */
+	void OnClassPicked(UClass* InClass);
+
+
+private:
+
+	TSharedPtr<class FPropertyEditor > PropertyEditor;
+
+	TSharedPtr<class SComboButton> ComboButton;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.cpp
new file mode 100644
index 0000000..97e5670
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.cpp
@@ -0,0 +1,71 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.h"
+#include "UObject/UnrealType.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "Widgets/Text/STextBlock.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+void SPropertyEditorMap::Construct(const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor)
+{
+	PropertyEditor = InPropertyEditor;
+
+	TAttribute<FText> TextAttr(this, &SPropertyEditorMap::GetMapTextValue);
+
+	ChildSlot
+	.Padding(0.0f, 0.0f, 2.0f, 0.0f)
+	[
+		SNew(STextBlock)
+		.Text(TextAttr)
+		.Font(InArgs._Font)
+	];
+
+	SetToolTipText(GetMapTooltipText());
+
+	SetEnabled(TAttribute<bool>(this, &SPropertyEditorMap::CanEdit));
+}
+
+bool SPropertyEditorMap::Supports(const TSharedRef< FPropertyEditor >& InPropertyEditor)
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	const FProperty* Property = InPropertyEditor->GetProperty();
+
+	if (!PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew)
+		&& Property->IsA<FMapProperty>())
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void SPropertyEditorMap::GetDesiredWidth(float& OutMinDesiredWidth, float& OutMaxDesiredWidth)
+{
+	OutMinDesiredWidth = 170.0f;
+	OutMaxDesiredWidth = 170.0f;
+}
+
+FText SPropertyEditorMap::GetMapTextValue() const
+{
+	return FText::Format(LOCTEXT("NumMapItemsFmt", "{0} Map elements"), FText::AsNumber( PropertyEditor->GetPropertyNode()->GetNumChildNodes()));
+}
+
+FText SPropertyEditorMap::GetMapTooltipText() const
+{
+	return LOCTEXT("RichMapTooltipText", "Maps are associative, unordered containers that associate a set of keys with a set of values. Each key in a map must be unique, but values can be duplicated.");
+}
+
+bool SPropertyEditorMap::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.h
new file mode 100644
index 0000000..01ca641
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorMap.h
@@ -0,0 +1,45 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+
+namespace soda
+{
+
+class FPropertyEditor;
+
+class SPropertyEditorMap : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SPropertyEditorMap)
+		: _Font(FSodaStyle::GetFontStyle(PropertyEditorConstants::PropertyFontStyle))
+		{}
+		SLATE_ATTRIBUTE(FSlateFontInfo, Font)
+	SLATE_END_ARGS()
+
+	static bool Supports(const TSharedRef< class FPropertyEditor >& InPropertyEditor);
+
+	void Construct(const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor);
+
+	void GetDesiredWidth(float& OutMinDesiredWidth, float& OutMaxDesiredWidth);
+
+private:
+
+	FText GetMapTextValue() const;
+	FText GetMapTooltipText() const;
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+
+private:
+	TSharedPtr< FPropertyEditor > PropertyEditor;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.cpp
new file mode 100644
index 0000000..73fcb7e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.cpp
@@ -0,0 +1,4 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.h"
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.h
new file mode 100644
index 0000000..a659b91
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorNumeric.h
@@ -0,0 +1,694 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/Class.h"
+#include "Misc/Attribute.h"
+#include "UObject/UnrealType.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "Layout/Margin.h"
+#include "SodaStyleSet.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Styling/SlateTypes.h"
+#include "Styling/CoreStyle.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "Textures/SlateIcon.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/PropertyEditorHelpers.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+//#include "Editor.h"
+#include "Widgets/Input/NumericTypeInterface.h"
+#include "Widgets/Input/SNumericEntryBox.h"
+#include "Widgets/Input/SComboButton.h"
+#include "RuntimePropertyEditor/ObjectPropertyNode.h"
+
+#include "Math/UnitConversion.h"
+#include "Widgets/Input/NumericUnitTypeInterface.inl"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+template <typename NumericType>
+class SPropertyEditorNumeric : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorNumeric<NumericType> )
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) ) 
+		{}
+		SLATE_ATTRIBUTE( FSlateFontInfo, Font )
+	SLATE_END_ARGS()
+	
+	void Construct( const FArguments& InArgs, const TSharedRef<FPropertyEditor>& InPropertyEditor )
+	{
+		bIsUsingSlider = false;
+
+		PropertyEditor = InPropertyEditor;
+
+		const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+		const FProperty* Property = InPropertyEditor->GetProperty();
+
+		if(!Property->IsA(FFloatProperty::StaticClass()) && !Property->IsA(FDoubleProperty::StaticClass()) && FRuntimeMetaData::HasMetaData(Property, PropertyEditorConstants::MD_Bitmask))
+		{
+			auto CreateBitmaskFlagsArray = [](const FProperty* Prop)
+			{
+				const int32 BitmaskBitCount = sizeof(NumericType) << 3;
+
+				TArray<FBitmaskFlagInfo> Result;
+				Result.Empty(BitmaskBitCount);
+
+				const UEnum* BitmaskEnum = nullptr;
+				const FString& BitmaskEnumName = FRuntimeMetaData::GetMetaData(Prop, PropertyEditorConstants::MD_BitmaskEnum);
+				if (!BitmaskEnumName.IsEmpty())
+				{
+					// @TODO: Potentially replace this with a parameter passed in from a member variable on the FProperty (e.g. FByteProperty::Enum)
+					BitmaskEnum = UClass::TryFindTypeSlow<UEnum>(BitmaskEnumName);
+				}
+
+				if (BitmaskEnum)
+				{
+					const bool bUseEnumValuessAsMaskValues = FRuntimeMetaData::GetBoolMetaData(BitmaskEnum, PropertyEditorConstants::MD_UseEnumValuesAsMaskValuesInEditor);
+					auto AddNewBitmaskFlagLambda = [BitmaskEnum, &Result](int32 InEnumIndex, int64 InFlagValue)
+					{
+						Result.Emplace();
+						FBitmaskFlagInfo* BitmaskFlag = &Result.Last();
+
+						BitmaskFlag->Value = InFlagValue;
+						BitmaskFlag->DisplayName = FRuntimeMetaData::GetDisplayNameTextByIndex(BitmaskEnum, InEnumIndex);
+						BitmaskFlag->ToolTipText = FRuntimeMetaData::GetToolTipTextByIndex(BitmaskEnum, InEnumIndex);
+						if (BitmaskFlag->ToolTipText.IsEmpty())
+						{
+							BitmaskFlag->ToolTipText = FText::Format(LOCTEXT("BitmaskDefaultFlagToolTipText", "Toggle {0} on/off"), BitmaskFlag->DisplayName);
+						}
+					};
+
+					const TArray<FName> AllowedPropertyEnums = PropertyEditorHelpers::GetValidEnumsFromPropertyOverride(Prop, BitmaskEnum);
+					// Note: This loop doesn't include (BitflagsEnum->NumEnums() - 1) in order to skip the implicit "MAX" value that gets added to the enum type at compile time.
+					for (int32 BitmaskEnumIndex = 0; BitmaskEnumIndex < BitmaskEnum->NumEnums() - 1; ++BitmaskEnumIndex)
+					{
+						const int64 EnumValue = BitmaskEnum->GetValueByIndex(BitmaskEnumIndex);
+						bool bShouldBeHidden = FRuntimeMetaData::HasMetaData(BitmaskEnum, TEXT("Hidden"), BitmaskEnumIndex);
+						if (!bShouldBeHidden && AllowedPropertyEnums.Num() > 0)
+						{
+							bShouldBeHidden = AllowedPropertyEnums.Find(BitmaskEnum->GetNameByIndex(BitmaskEnumIndex)) == INDEX_NONE;
+						}
+						if (EnumValue >= 0 && !bShouldBeHidden)
+						{
+							if (bUseEnumValuessAsMaskValues)
+							{
+								if (EnumValue < MAX_int64 && FMath::IsPowerOfTwo(EnumValue))
+								{
+									AddNewBitmaskFlagLambda(BitmaskEnumIndex, EnumValue);
+								}
+							}
+							else if (EnumValue < BitmaskBitCount)
+							{
+								AddNewBitmaskFlagLambda(BitmaskEnumIndex, TBitmaskValueHelpers<NumericType>::LeftShift(static_cast<NumericType>(1), EnumValue));
+							}
+						}
+					}
+				}
+				else
+				{
+					for (int32 BitmaskFlagIndex = 0; BitmaskFlagIndex < BitmaskBitCount; ++BitmaskFlagIndex)
+					{
+						Result.Emplace();
+						FBitmaskFlagInfo* BitmaskFlag = &Result.Last();
+
+						BitmaskFlag->Value = TBitmaskValueHelpers<NumericType>::LeftShift(static_cast<NumericType>(1), BitmaskFlagIndex);
+						BitmaskFlag->DisplayName = FText::Format(LOCTEXT("BitmaskDefaultFlagDisplayName", "Flag {0}"), FText::AsNumber(BitmaskFlagIndex + 1));
+						BitmaskFlag->ToolTipText = FText::Format(LOCTEXT("BitmaskDefaultFlagToolTipText", "Toggle {0} on/off"), BitmaskFlag->DisplayName);
+					}
+				}
+
+				return Result;
+			};
+
+			const FComboBoxStyle& ComboBoxStyle = FCoreStyle::Get().GetWidgetStyle< FComboBoxStyle >("ComboBox");
+
+			const auto& GetComboButtonText = [this, CreateBitmaskFlagsArray, Property]() -> FText
+			{
+				TOptional<NumericType> Value = OnGetValue();
+				if (Value.IsSet())
+				{
+					NumericType BitmaskValue = Value.GetValue();
+					if (BitmaskValue != 0)
+					{
+						TArray<FBitmaskFlagInfo> BitmaskFlags = CreateBitmaskFlagsArray(Property);
+
+						TArray<FText> SetFlags;
+						SetFlags.Reserve(BitmaskFlags.Num());
+
+						for (const FBitmaskFlagInfo& FlagInfo : BitmaskFlags)
+						{
+							if (TBitmaskValueHelpers<NumericType>::BitwiseAND(Value.GetValue(), FlagInfo.Value))
+							{
+								SetFlags.Add(FlagInfo.DisplayName);
+							}
+						}
+						if (SetFlags.Num() > 3)
+						{
+							SetFlags.SetNum(3);
+							SetFlags.Add(FText::FromString("..."));
+						}
+
+						return FText::Join(FText::FromString(" | "), SetFlags);
+					}
+
+					return LOCTEXT("BitmaskButtonContentNoFlagsSet", "(No Flags Set)");
+				}
+				else
+				{
+					return LOCTEXT("MultipleValues", "Multiple Values");
+				}
+			};
+
+			// Constructs the UI for bitmask property editing.
+			SAssignNew(PrimaryWidget, SComboButton)
+			.ComboButtonStyle(&ComboBoxStyle.ComboButtonStyle)
+			.ToolTipText_Lambda([this, CreateBitmaskFlagsArray, Property]
+			{
+				TOptional<NumericType> Value = OnGetValue();
+				if (Value.IsSet())
+				{
+					TArray<FBitmaskFlagInfo> BitmaskFlags = CreateBitmaskFlagsArray(Property);
+
+					TArray<FText> SetFlags;
+					SetFlags.Reserve(BitmaskFlags.Num());
+
+					for (const FBitmaskFlagInfo& FlagInfo : BitmaskFlags)
+					{
+						if (TBitmaskValueHelpers<NumericType>::BitwiseAND(Value.GetValue(), FlagInfo.Value))
+						{
+							SetFlags.Add(FlagInfo.DisplayName);
+						}
+					}
+
+					return FText::Join(FText::FromString(" | "), SetFlags);
+				}
+
+				return FText::GetEmpty();
+			})
+			.ButtonContent()
+			[
+				SNew(STextBlock)
+				.Font(InArgs._Font)
+				.Text_Lambda(GetComboButtonText)
+			]
+			.OnGetMenuContent_Lambda([this, CreateBitmaskFlagsArray, Property]()
+			{
+				FMenuBuilder MenuBuilder(false, nullptr);
+
+				TArray<FBitmaskFlagInfo> BitmaskFlags = CreateBitmaskFlagsArray(Property);
+				for (int i = 0; i < BitmaskFlags.Num(); ++i)
+				{
+					MenuBuilder.AddMenuEntry(
+						BitmaskFlags[i].DisplayName,
+						BitmaskFlags[i].ToolTipText,
+						FSlateIcon(),
+						FUIAction
+						(
+							FExecuteAction::CreateLambda([this, i, BitmaskFlags]()
+							{
+								TOptional<NumericType> Value = OnGetValue();
+								if (Value.IsSet())
+								{
+									OnValueCommitted(TBitmaskValueHelpers<NumericType>::BitwiseXOR(Value.GetValue(), BitmaskFlags[i].Value), ETextCommit::Default);
+								}
+							}),
+							FCanExecuteAction(),
+							FIsActionChecked::CreateLambda([this, i, BitmaskFlags]() -> bool
+							{
+								TOptional<NumericType> Value = OnGetValue();
+								if (Value.IsSet())
+								{
+									return TBitmaskValueHelpers<NumericType>::BitwiseAND(Value.GetValue(), BitmaskFlags[i].Value) != static_cast<NumericType>(0);
+								}
+
+								return false;
+							})
+						),
+						NAME_None,
+						EUserInterfaceActionType::Check);
+				}
+
+				return MenuBuilder.MakeWidget();
+			});
+
+			ChildSlot.AttachWidget(PrimaryWidget.ToSharedRef());
+		}
+		else
+		{
+			// Instance metadata overrides per-class metadata.
+			auto GetMetaDataFromKey = [&PropertyNode, &Property](const FName& Key) -> const FString&
+			{
+				const FString* InstanceValue = PropertyNode->GetInstanceMetaData(Key);
+				return (InstanceValue != nullptr) ? *InstanceValue : (const FString&)FRuntimeMetaData::GetMetaData(Property, Key);
+			};
+
+			const FString& MetaUIMinString = GetMetaDataFromKey("UIMin");
+			const FString& MetaUIMaxString = GetMetaDataFromKey("UIMax");
+			const FString& SliderExponentString = GetMetaDataFromKey("SliderExponent");
+			const FString& LinearDeltaSensitivityString = GetMetaDataFromKey("LinearDeltaSensitivity");
+			const FString& DeltaString = GetMetaDataFromKey("Delta");
+			const FString& ClampMinString = GetMetaDataFromKey("ClampMin");
+			const FString& ClampMaxString = GetMetaDataFromKey("ClampMax");
+
+			// If no UIMin/Max was specified then use the clamp string
+			const FString& UIMinString = MetaUIMinString.Len() ? MetaUIMinString : ClampMinString;
+			const FString& UIMaxString = MetaUIMaxString.Len() ? MetaUIMaxString : ClampMaxString;
+
+			NumericType ClampMin = TNumericLimits<NumericType>::Lowest();
+			NumericType ClampMax = TNumericLimits<NumericType>::Max();
+
+			if (!ClampMinString.IsEmpty())
+			{
+				TTypeFromString<NumericType>::FromString(ClampMin, *ClampMinString);
+			}
+
+			if (!ClampMaxString.IsEmpty())
+			{
+				TTypeFromString<NumericType>::FromString(ClampMax, *ClampMaxString);
+			}
+
+			NumericType UIMin = TNumericLimits<NumericType>::Lowest();
+			NumericType UIMax = TNumericLimits<NumericType>::Max();
+			TTypeFromString<NumericType>::FromString(UIMin, *UIMinString);
+			TTypeFromString<NumericType>::FromString(UIMax, *UIMaxString);
+
+			NumericType SliderExponent = NumericType(1);
+			if (SliderExponentString.Len())
+			{
+				TTypeFromString<NumericType>::FromString(SliderExponent, *SliderExponentString);
+			}
+
+			NumericType Delta = NumericType(0);
+			if (DeltaString.Len())
+			{
+				TTypeFromString<NumericType>::FromString(Delta, *DeltaString);
+			}
+
+			int32 LinearDeltaSensitivity = 0;
+			if (LinearDeltaSensitivityString.Len())
+			{
+				TTypeFromString<int32>::FromString(LinearDeltaSensitivity, *LinearDeltaSensitivityString);
+			}
+			// LinearDeltaSensitivity only works in SSpinBox if delta is provided, so add it in if it wasn't.
+			Delta = (LinearDeltaSensitivity != 0 && Delta == NumericType(0)) ? NumericType(1) : Delta;
+
+			if (ClampMin >= ClampMax && (ClampMinString.Len() || ClampMaxString.Len()))
+			{
+				UE_LOG(LogPropertyNode, Warning, TEXT("Clamp Min (%s) >= Clamp Max (%s) for Ranged Numeric property %s"), *ClampMinString, *ClampMaxString, *Property->GetPathName());
+			}
+
+			const NumericType ActualUIMin = FMath::Max(UIMin, ClampMin);
+			const NumericType ActualUIMax = FMath::Min(UIMax, ClampMax);
+
+			TOptional<NumericType> MinValue = ClampMinString.Len() ? ClampMin : TOptional<NumericType>();
+			TOptional<NumericType> MaxValue = ClampMaxString.Len() ? ClampMax : TOptional<NumericType>();
+			TOptional<NumericType> SliderMinValue = (UIMinString.Len()) ? ActualUIMin : TOptional<NumericType>();
+			TOptional<NumericType> SliderMaxValue = (UIMaxString.Len()) ? ActualUIMax : TOptional<NumericType>();
+
+			if ((ActualUIMin >= ActualUIMax) && (SliderMinValue.IsSet() && SliderMaxValue.IsSet()))
+			{
+				UE_LOG(LogPropertyNode, Warning, TEXT("UI Min (%s) >= UI Max (%s) for Ranged Numeric property %s"), *UIMinString, *UIMaxString, *Property->GetPathName());
+			}
+
+			FObjectPropertyNode* ObjectPropertyNode = PropertyNode->FindObjectItemParent();
+			const bool bAllowSpin = (!ObjectPropertyNode || (1 == ObjectPropertyNode->GetNumObjects()))
+				&& !FRuntimeMetaData::GetBoolMetaData(PropertyNode->GetProperty(), "NoSpinbox");
+
+			// Set up the correct type interface if we want to display units on the property editor
+
+			// First off, check for ForceUnits= meta data. This meta tag tells us to interpret, and always display the value in these units. FUnitConversion::Settings().ShouldDisplayUnits does not apply to such properties
+			const FString& ForcedUnits = FRuntimeMetaData::GetMetaData(InPropertyEditor->GetProperty(), TEXT("ForceUnits"));
+			auto PropertyUnits = FUnitConversion::UnitFromString(*ForcedUnits);
+			if (PropertyUnits.IsSet())
+			{
+				// Create the type interface and set up the default input units if they are compatible
+				TypeInterface = MakeShareable(new TNumericUnitTypeInterface<NumericType>(PropertyUnits.GetValue()));
+				TypeInterface->FixedDisplayUnits = PropertyUnits.GetValue();
+			}
+			// If that's not set, we fall back to Units=xxx which calculates the most appropriate unit to display in
+			else
+			{
+				if (FUnitConversion::Settings().ShouldDisplayUnits())
+				{
+					const FString& DynamicUnits = FRuntimeMetaData::GetMetaData(InPropertyEditor->GetProperty(), TEXT("Units"));
+					if (!DynamicUnits.IsEmpty())
+					{
+						PropertyUnits = FUnitConversion::UnitFromString(*DynamicUnits);
+					}
+					else
+					{
+						PropertyUnits = FUnitConversion::UnitFromString(*GetMetaDataFromKey("Units"));
+					}
+				}
+
+				if (!PropertyUnits.IsSet())
+				{
+					PropertyUnits = EUnit::Unspecified;
+				}
+
+				// Create the type interface and set up the default input units if they are compatible
+				TypeInterface = MakeShareable(new TNumericUnitTypeInterface<NumericType>(PropertyUnits.GetValue()));
+				auto Value = OnGetValue();
+
+				if (Value.IsSet())
+				{
+					TypeInterface->SetupFixedDisplay(Value.GetValue());
+				}
+			}
+
+			ChildSlot
+			[
+				SAssignNew(PrimaryWidget, SNumericEntryBox<NumericType>)
+				// Only allow spinning if we have a single value
+				.AllowSpin(bAllowSpin)
+				.Value(this, &SPropertyEditorNumeric<NumericType>::OnGetValue)
+				.Font(InArgs._Font)
+				.MinValue(MinValue)
+				.MaxValue(MaxValue)
+				.MinSliderValue(SliderMinValue)
+				.MaxSliderValue(SliderMaxValue)
+				.SliderExponent(SliderExponent)
+				.Delta(Delta)
+				// LinearDeltaSensitivity needs to be left unset if not provided, rather than being set to some default
+				.LinearDeltaSensitivity(LinearDeltaSensitivity != 0 ? LinearDeltaSensitivity : TAttribute<int32>())
+				.UndeterminedString(LOCTEXT("MultipleValues", "Multiple Values"))
+				.OnValueChanged(this, &SPropertyEditorNumeric<NumericType>::OnValueChanged)
+				.OnValueCommitted(this, &SPropertyEditorNumeric<NumericType>::OnValueCommitted)
+				.OnUndeterminedValueCommitted(this, &SPropertyEditorNumeric<NumericType>::OnUndeterminedValueCommitted)
+				.OnBeginSliderMovement(this, &SPropertyEditorNumeric<NumericType>::OnBeginSliderMovement)
+				.OnEndSliderMovement(this, &SPropertyEditorNumeric<NumericType>::OnEndSliderMovement)
+				.TypeInterface(TypeInterface)
+			];
+		}
+
+		SetEnabled(TAttribute<bool>(this, &SPropertyEditorNumeric<NumericType>::CanEdit));
+	}
+
+	virtual bool SupportsKeyboardFocus() const override
+	{
+		return PrimaryWidget.IsValid() && PrimaryWidget->SupportsKeyboardFocus();
+	}
+
+	virtual FReply OnFocusReceived( const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent ) override
+	{
+		// Forward keyboard focus to our editable text widget
+		return FReply::Handled().SetUserFocus(PrimaryWidget.ToSharedRef(), InFocusEvent.GetCause());
+	}
+	
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+	{
+		const FProperty* Property = PropertyEditor->GetProperty();
+		const bool bIsBitmask = (!Property->IsA(FFloatProperty::StaticClass()) && FRuntimeMetaData::HasMetaData(Property, PropertyEditorConstants::MD_Bitmask));
+		const bool bIsNonEnumByte = (Property->IsA(FByteProperty::StaticClass()) && CastField<const FByteProperty>(Property)->Enum == NULL);
+
+		if( bIsNonEnumByte && !bIsBitmask )
+		{
+			OutMinDesiredWidth = 75.0f;
+			OutMaxDesiredWidth = 75.0f;
+		}
+		else
+		{
+			OutMinDesiredWidth = 125.0f;
+			OutMaxDesiredWidth = bIsBitmask ? 400.0f : 125.0f;
+		}
+	}
+
+	static bool Supports( const TSharedRef< FPropertyEditor >& PropertyEditor ) 
+	{ 
+		const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+		
+		if (!PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew))
+		{
+			return TTypeToProperty<NumericType>::Match(PropertyEditor->GetProperty());
+		}
+		
+		return false;
+	}
+
+private:
+	/**
+	 *	Helper to provide mapping for a given FProperty object to a property editor type
+	 */ 
+	template<typename T, typename U = void> 
+	struct TTypeToProperty 
+	{ 
+		static bool Match(const FProperty* InProperty) { return false; } 
+	};
+	
+	template<typename U> 
+	struct TTypeToProperty<float, U> 
+	{	
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FFloatProperty::StaticClass()); } 
+	};
+
+	template<typename U>
+	struct TTypeToProperty<double, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FDoubleProperty::StaticClass()); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<int8, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FInt8Property::StaticClass()); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<int16, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FInt16Property::StaticClass()); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<int32, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FIntProperty::StaticClass()); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<int64, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FInt64Property::StaticClass()); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<uint8, U>
+	{
+		static bool Match(const FProperty* InProperty) { return (InProperty->IsA(FByteProperty::StaticClass()) && CastField<const FByteProperty>(InProperty)->Enum == NULL); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<uint16, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FUInt16Property::StaticClass()); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<uint32, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FUInt32Property::StaticClass()); }
+	};
+
+	template<typename U>
+	struct TTypeToProperty<uint64, U>
+	{
+		static bool Match(const FProperty* InProperty) { return InProperty->IsA(FUInt64Property::StaticClass()); }
+	};
+		
+	
+	/** @return The value or unset if properties with multiple values are viewed */
+	TOptional<NumericType> OnGetValue() const
+	{
+		NumericType NumericVal;
+		const TSharedRef< IPropertyHandle > PropertyHandle = PropertyEditor->GetPropertyHandle();
+
+		if (PropertyHandle->GetValue( NumericVal ) == FPropertyAccess::Success )
+		{
+			return NumericVal;
+		}
+
+		// Return an unset value so it displays the "multiple values" indicator instead
+		return TOptional<NumericType>();
+	}
+
+	void OnValueChanged( NumericType NewValue )
+	{
+		if( bIsUsingSlider )
+		{
+			const TSharedRef< IPropertyHandle > PropertyHandle = PropertyEditor->GetPropertyHandle();
+
+			NumericType OrgValue(0);
+			if (PropertyHandle->GetValue(OrgValue) != FPropertyAccess::Fail)
+			{
+				// Value hasn't changed, so lets return now
+				if (OrgValue == NewValue)
+				{ 
+					return;
+				}
+			}
+
+			// We don't create a transaction for each property change when using the slider.  Only once when the slider first is moved
+			EPropertyValueSetFlags::Type Flags = (EPropertyValueSetFlags::InteractiveChange | EPropertyValueSetFlags::NotTransactable);
+			PropertyHandle->SetValue( NewValue, Flags );
+
+			if (TypeInterface.IsValid() && !TypeInterface->FixedDisplayUnits.IsSet())
+			{
+				TypeInterface->SetupFixedDisplay(NewValue);
+			}
+		}
+	}
+
+	void OnValueCommitted( NumericType NewValue, ETextCommit::Type CommitInfo )
+	{
+		const TSharedRef< IPropertyHandle > PropertyHandle = PropertyEditor->GetPropertyHandle();
+		NumericType OrgValue(0);
+		if (bIsUsingSlider || (PropertyHandle->GetValue(OrgValue) == FPropertyAccess::Fail || OrgValue != NewValue))
+		{
+			PropertyHandle->SetValue(NewValue);
+			LastSliderCommittedValue = NewValue;
+		}
+
+		if (TypeInterface.IsValid() && !TypeInterface->FixedDisplayUnits.IsSet())
+		{
+			TypeInterface->SetupFixedDisplay(NewValue);
+		}
+	}
+
+	void OnUndeterminedValueCommitted( FText NewValue, ETextCommit::Type CommitType )
+	{
+		const TSharedRef<IPropertyHandle> PropertyHandle = PropertyEditor->GetPropertyHandle();
+		const FString NewValueString = NewValue.ToString();
+		TArray<FString> PerObjectValues;
+		
+		// evaluate expression for each property value
+		PropertyHandle->GetPerObjectValues(PerObjectValues);
+
+		for (auto& Value : PerObjectValues)
+		{
+			NumericType OldNumericValue;
+			TTypeFromString<NumericType>::FromString(OldNumericValue, *Value);
+			TOptional<NumericType> NewNumericValue = TypeInterface->FromString(NewValueString, OldNumericValue);
+
+			if (NewNumericValue.IsSet())
+			{
+				Value = TTypeToString<NumericType>::ToString(NewNumericValue.GetValue());
+			}
+		}
+
+		PropertyHandle->SetPerObjectValues(PerObjectValues);
+	}
+	
+	/**
+	 * Called when the slider begins to move.  We create a transaction here to undo the property
+	 */
+	void OnBeginSliderMovement()
+	{
+		bIsUsingSlider = true;
+
+		const TSharedRef<IPropertyHandle> PropertyHandle = PropertyEditor->GetPropertyHandle();
+		PropertyHandle->GetValue(LastSliderCommittedValue);
+		
+		//GEditor->BeginTransaction(TEXT("PropertyEditor"), FText::Format(NSLOCTEXT("PropertyEditor", "SetNumericPropertyTransaction", "Edit {0}"), PropertyEditor->GetDisplayName()), nullptr /** PropertyEditor->GetPropertyHandle()->GetProperty() */ );
+	}
+
+
+	/**
+	 * Called when the slider stops moving.  We end the previously created transaction
+	 */
+	void OnEndSliderMovement( NumericType NewValue )
+	{
+		bIsUsingSlider = false;
+
+		// When the slider end, we may have not called SetValue(NewValue) without the InteractiveChange|NotTransactable flags.
+		//That prevents some transaction and callback to be triggered like the NotifyHook.
+		if (LastSliderCommittedValue != NewValue)
+		{
+			const TSharedRef<IPropertyHandle> PropertyHandle = PropertyEditor->GetPropertyHandle();
+			PropertyHandle->SetValue(NewValue);
+		}
+		else
+		{
+			//GEditor->EndTransaction();
+		}
+	}
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const
+	{
+		return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+	}
+
+	/** Flag data for bitmasks. */
+	struct FBitmaskFlagInfo
+	{
+		NumericType Value;
+		FText DisplayName;
+		FText ToolTipText;
+	};
+
+	/** Integral bitmask value helper methods. */
+	template<typename T>
+	struct TBitmaskValueHelpers
+	{
+		static T BitwiseAND(T Base, T Mask) { return Base & Mask; }
+		static T BitwiseXOR(T Base, T Mask) { return Base ^ Mask; }
+		template <typename U>
+		static T LeftShift(T Base, U Shift) { return Base << Shift; }
+	};
+
+	/** Explicit specialization for numeric 'float' types (these will not be used). */
+	template<>
+	struct TBitmaskValueHelpers<float>
+	{
+		static float BitwiseAND(float Base, float Mask) { return 0.0f; }
+		static float BitwiseXOR(float Base, float Mask) { return 0.0f; }
+		template <typename U>
+		static float LeftShift(float Base, U Shift) { return 0.0f; }
+	};
+
+	/** Explicit specialization for numeric 'double' types (these will not be used). */
+	template<>
+	struct TBitmaskValueHelpers<double>
+	{
+		static double BitwiseAND(double Base, double Mask) { return 0.0f; }
+		static double BitwiseXOR(double Base, double Mask) { return 0.0f; }
+		template <typename U>
+		static double LeftShift(double Base, U Shift)  { return 0.0f; }
+	};
+
+private:
+
+	TSharedPtr<TNumericUnitTypeInterface<NumericType>> TypeInterface;	
+
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+
+	TSharedPtr< class SWidget > PrimaryWidget;
+
+	/** True if the slider is being used to change the value of the property */
+	bool bIsUsingSlider;
+
+	/** When using the slider, what was the last committed value */
+	NumericType LastSliderCommittedValue;
+};
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.cpp
new file mode 100644
index 0000000..c049591
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.cpp
@@ -0,0 +1,71 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.h"
+#include "UObject/UnrealType.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "Widgets/Text/STextBlock.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+void SPropertyEditorSet::Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+{
+	PropertyEditor = InPropertyEditor;
+
+	TAttribute<FText> TextAttr(this, &SPropertyEditorSet::GetSetTextValue);
+
+	ChildSlot
+	.Padding(0.0f, 0.0f, 2.0f, 0.0f)
+	[
+		SNew(STextBlock)
+		.Text(TextAttr)
+		.Font(InArgs._Font)
+	];
+
+	SetToolTipText(GetSetTooltipText());
+
+	SetEnabled(TAttribute<bool>(this, &SPropertyEditorSet::CanEdit));
+}
+
+bool SPropertyEditorSet::Supports( const TSharedRef< FPropertyEditor >& InPropertyEditor)
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	const FProperty* Property = InPropertyEditor->GetProperty();
+
+	if (!PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew)
+		&& Property->IsA<FSetProperty>())
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void SPropertyEditorSet::GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+{
+	OutMinDesiredWidth = 170.0f;
+	OutMaxDesiredWidth = 170.0f;
+}
+
+FText SPropertyEditorSet::GetSetTextValue() const
+{
+	return FText::Format(LOCTEXT("NumSetItemsFmt", "{0} Set elements"), FText::AsNumber(PropertyEditor->GetPropertyNode()->GetNumChildNodes()));
+}
+
+FText SPropertyEditorSet::GetSetTooltipText() const
+{
+	return LOCTEXT("RichSetTooltipText", "Sets are unordered containers. Each element in a set must be unique.");
+}
+
+bool SPropertyEditorSet::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.h
new file mode 100644
index 0000000..99ee9d2
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorSet.h
@@ -0,0 +1,45 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+
+namespace soda
+{
+
+class FPropertyEditor;
+
+class SPropertyEditorSet : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SPropertyEditorSet)
+		: _Font(FSodaStyle::GetFontStyle(PropertyEditorConstants::PropertyFontStyle))
+		{}
+		SLATE_ATTRIBUTE(FSlateFontInfo, Font)
+	SLATE_END_ARGS()
+
+	static bool Supports(const TSharedRef< class FPropertyEditor >& InPropertyEditor);
+
+	void Construct(const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor);
+
+	void GetDesiredWidth(float& OutMinDesiredWidth, float& OutMaxDesiredWidth);
+
+private:
+
+	FText GetSetTextValue() const;
+	FText GetSetTooltipText() const;
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+
+private:
+	TSharedPtr< FPropertyEditor > PropertyEditor;
+};
+
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.cpp
new file mode 100644
index 0000000..f94cf3f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.cpp
@@ -0,0 +1,349 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.h"
+#include "Misc/FeedbackContext.h"
+#include "Modules/ModuleManager.h"
+#include "Widgets/Layout/SBox.h"
+
+//#include "DragAndDrop/AssetDragDropOp.h"
+//#include "StructViewerModule.h"
+//#include "StructViewerFilter.h"
+#include "Engine/UserDefinedStruct.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+class FPropertyEditorStructFilter/* : public IStructViewerFilter*/
+{
+public:
+	/** The meta struct for the property that classes must be a child-of. */
+	const UScriptStruct* MetaStruct = nullptr;
+
+	// TODO: Have a flag controlling whether we allow UserDefinedStructs, even when a MetaClass is set (as they cannot support inheritance, but may still be allowed (eg, data tables))?
+
+	virtual bool IsStructAllowed(/*const FStructViewerInitializationOptions& InInitOptions, */const UScriptStruct* InStruct/*, TSharedRef<FStructViewerFilterFuncs> InFilterFuncs*/) //override
+	{
+		if (InStruct->IsA<UUserDefinedStruct>())
+		{
+			// User Defined Structs don't support inheritance, so only include them if we have don't a MetaStruct set
+			return MetaStruct == nullptr;
+		}
+
+		// Query the native struct to see if it has the correct parent type (if any)
+		return !MetaStruct || InStruct->IsChildOf(MetaStruct);
+	}
+
+	virtual bool IsUnloadedStructAllowed(/*const FStructViewerInitializationOptions& InInitOptions, const FName InStructPath, TSharedRef<FStructViewerFilterFuncs> InFilterFuncs*/) //override
+	{
+		// User Defined Structs don't support inheritance, so only include them if we have don't a MetaStruct set
+		return MetaStruct == nullptr;
+	}
+};
+
+void SPropertyEditorStruct::GetDesiredWidth(float& OutMinDesiredWidth, float& OutMaxDesiredWidth)
+{
+	OutMinDesiredWidth = 125.0f;
+	OutMaxDesiredWidth = 400.0f;
+}
+
+bool SPropertyEditorStruct::Supports(const TSharedRef< class FPropertyEditor >& InPropertyEditor)
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	const FProperty* Property = InPropertyEditor->GetProperty();
+	int32 ArrayIndex = PropertyNode->GetArrayIndex();
+
+	if (Supports(Property) && ((ArrayIndex == -1 && Property->ArrayDim == 1) || (ArrayIndex > -1 && Property->ArrayDim > 0)))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+bool SPropertyEditorStruct::Supports(const FProperty* InProperty)
+{
+	const FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(InProperty);
+	return ObjectProperty && ObjectProperty->PropertyClass && ObjectProperty->PropertyClass->IsChildOf(UScriptStruct::StaticClass());
+}
+
+void SPropertyEditorStruct::Construct(const FArguments& InArgs, const TSharedPtr< class FPropertyEditor >& InPropertyEditor)
+{
+	PropertyEditor = InPropertyEditor;
+	
+	if (PropertyEditor.IsValid())
+	{
+		const TSharedRef<FPropertyNode> PropertyNode = PropertyEditor->GetPropertyNode();
+		FProperty* const Property = PropertyNode->GetProperty();
+		if (const FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(Property))
+		{
+			// Read the MetaStruct from the property meta-data
+			MetaStruct = nullptr;
+			{
+				const FString& MetaStructName = FRuntimeMetaData::GetMetaData(Property->GetOwnerProperty(), TEXT("MetaStruct"));
+				if (!MetaStructName.IsEmpty())
+				{
+					MetaStruct = UClass::TryFindTypeSlow<UScriptStruct>(MetaStructName, EFindFirstObjectOptions::EnsureIfAmbiguous);
+					if (!MetaStruct)
+					{
+						MetaStruct = LoadObject<UScriptStruct>(nullptr, *MetaStructName);
+					}
+				}
+			}
+		}
+		else
+		{
+			check(false);
+		}
+		
+		bAllowNone = !(Property->PropertyFlags & CPF_NoClear);
+		bShowViewOptions = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("HideViewOptions")) ? false : true;
+		bShowTree = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("ShowTreeView"));
+		bShowDisplayNames = FRuntimeMetaData::HasMetaData(Property->GetOwnerProperty(), TEXT("ShowDisplayNames"));
+	}
+	else
+	{
+		check(InArgs._SelectedStruct.IsSet());
+		check(InArgs._OnSetStruct.IsBound());
+
+		MetaStruct = InArgs._MetaStruct;
+		bAllowNone = InArgs._AllowNone;
+		bShowViewOptions = InArgs._ShowViewOptions;
+		bShowTree = InArgs._ShowTree;
+		bShowDisplayNames = InArgs._ShowDisplayNames;
+
+		SelectedStruct = InArgs._SelectedStruct;
+		OnSetStruct = InArgs._OnSetStruct;
+	}
+	
+	SAssignNew(ComboButton, SComboButton)
+		//.OnGetMenuContent(this, &SPropertyEditorStruct::GenerateStructPicker)
+		.ContentPadding(FMargin(2.0f, 2.0f))
+		.ToolTipText(this, &SPropertyEditorStruct::GetDisplayValue)
+		.ButtonContent()
+		[
+			SNew(STextBlock)
+			.Text(this, &SPropertyEditorStruct::GetDisplayValue)
+			.Font(InArgs._Font)
+		];
+
+	ChildSlot
+	[
+		ComboButton.ToSharedRef()
+	];
+
+	SetEnabled(TAttribute<bool>(this, &SPropertyEditorStruct::CanEdit));
+}
+
+FText SPropertyEditorStruct::GetDisplayValue() const
+{
+	static bool bIsReentrant = false;
+
+	auto GetStructDisplayName = [this](const UObject* InObject) -> FText
+	{
+		if (const UScriptStruct* Struct = Cast<UScriptStruct>(InObject))
+		{
+			return bShowDisplayNames
+				? FRuntimeMetaData::GetDisplayNameText(Struct)
+				: FText::AsCultureInvariant(Struct->GetName());
+		}
+		return LOCTEXT("None", "None");
+	};
+
+	// Guard against re-entrancy which can happen if the delegate executed below (SelectedStruct.Get()) forces a slow task dialog to open, thus causing this to lose context and regain focus later starting the loop over again
+	if (!bIsReentrant)
+	{
+		TGuardValue<bool> Guard(bIsReentrant, true);
+
+		if (PropertyEditor.IsValid())
+		{
+			UObject* ObjectValue = NULL;
+			FPropertyAccess::Result Result = PropertyEditor->GetPropertyHandle()->GetValue(ObjectValue);
+
+			if (Result == FPropertyAccess::Success && ObjectValue != NULL)
+			{
+				return GetStructDisplayName(ObjectValue);
+			}
+
+			return FText::AsCultureInvariant(FPaths::GetBaseFilename(PropertyEditor->GetValueAsString()));
+		}
+
+		return GetStructDisplayName(SelectedStruct.Get());
+	}
+	else
+	{
+		return FText::GetEmpty();
+	}
+}
+
+/*
+TSharedRef<SWidget> SPropertyEditorStruct::GenerateStructPicker()
+{
+	
+	FStructViewerInitializationOptions Options;
+	Options.bShowUnloadedStructs = true;
+	Options.bShowNoneOption = bAllowNone; 
+
+	if (PropertyEditor.IsValid())
+	{
+		Options.PropertyHandle = PropertyEditor->GetPropertyHandle();
+	}
+
+	TSharedRef<FPropertyEditorStructFilter> StructFilter = MakeShared<FPropertyEditorStructFilter>();
+	Options.StructFilter = StructFilter;
+	StructFilter->MetaStruct = MetaStruct;
+	Options.NameTypeToDisplay = (bShowDisplayNames ? EStructViewerNameTypeToDisplay::DisplayName : EStructViewerNameTypeToDisplay::StructName);
+	Options.DisplayMode = bShowTree ? EStructViewerDisplayMode::TreeView : EStructViewerDisplayMode::ListView;
+	Options.bAllowViewOptions = bShowViewOptions;
+
+	FOnStructPicked OnPicked(FOnStructPicked::CreateRaw(this, &SPropertyEditorStruct::OnStructPicked));
+
+	return SNew(SBox)
+		.WidthOverride(280)
+		[
+			SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			.MaxHeight(500)
+			[
+				FModuleManager::LoadModuleChecked<FStructViewerModule>("StructViewer").CreateStructViewer(Options, OnPicked)
+			]			
+		];
+	
+}
+*/
+
+void SPropertyEditorStruct::OnStructPicked(const UScriptStruct* InStruct)
+{
+	SendToObjects(InStruct ? InStruct->GetPathName() : TEXT("None"));
+	ComboButton->SetIsOpen(false);
+}
+
+void SPropertyEditorStruct::SendToObjects(const FString& NewValue)
+{
+	if(PropertyEditor.IsValid())
+	{
+		const TSharedRef<IPropertyHandle> PropertyHandle = PropertyEditor->GetPropertyHandle();
+		PropertyHandle->SetValueFromFormattedString(NewValue);
+	}
+	else if (!NewValue.IsEmpty() && NewValue != TEXT("None"))
+	{
+		const UScriptStruct* NewStruct = FindObject<UScriptStruct>(nullptr, *NewValue);
+		if (!NewStruct)
+		{
+			NewStruct = LoadObject<UScriptStruct>(nullptr, *NewValue);
+		}
+		OnSetStruct.Execute(NewStruct);
+	}
+	else
+	{
+		OnSetStruct.Execute(nullptr);
+	}
+}
+/*
+void SPropertyEditorStruct::OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	TSharedPtr<FSodaDragDropOp> UnloadedStructOp = DragDropEvent.GetOperationAs<FSodaDragDropOp>();
+	if (UnloadedStructOp.IsValid())
+	{
+		FString AssetPath;
+		FString PathName;
+
+		// Find the struct path
+		if (UnloadedStructOp->HasAssets())
+		{
+			AssetPath = UnloadedStructOp->GetAssets()[0].ObjectPath.ToString();
+		}
+		else if (UnloadedStructOp->HasAssetPaths())
+		{
+			AssetPath = UnloadedStructOp->GetAssetPaths()[0];
+		}
+
+		// Check to see if the asset can be found, otherwise load it.
+		UObject* Object = FindObject<UObject>(nullptr, *AssetPath);
+		if (Object == nullptr)
+		{
+			// Load the package.
+			GWarn->BeginSlowTask(LOCTEXT("OnDrop_LoadPackage", "Fully Loading Package For Drop"), true, false);
+
+			Object = LoadObject<UObject>(nullptr, *AssetPath);
+
+			GWarn->EndSlowTask();
+		}
+
+		if (const UScriptStruct* Struct = Cast<UScriptStruct>(Object))
+		{
+			// This was pointing to a struct directly
+			UnloadedStructOp->SetToolTip(FText::GetEmpty(), FSodaStyle::GetBrush(TEXT("Graph.ConnectorFeedback.OK")));
+		}
+		else
+		{
+			UnloadedStructOp->SetToolTip(FText::GetEmpty(), FSodaStyle::GetBrush(TEXT("Graph.ConnectorFeedback.Error")));
+		}
+	}
+}
+
+void SPropertyEditorStruct::OnDragLeave(const FDragDropEvent& DragDropEvent)
+{
+	TSharedPtr<FSodaDragDropOp> UnloadedStructOp = DragDropEvent.GetOperationAs<FSodaDragDropOp>();
+	if (UnloadedStructOp.IsValid())
+	{
+		UnloadedStructOp->ResetToDefaultToolTip();
+	}
+}
+
+FReply SPropertyEditorStruct::OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	TSharedPtr<FSodaDragDropOp> UnloadedStructOp = DragDropEvent.GetOperationAs<FSodaDragDropOp>();
+	if (UnloadedStructOp.IsValid())
+	{
+		FString AssetPath;
+
+		// Find the struct path
+		if (UnloadedStructOp->HasAssets())
+		{
+			AssetPath = UnloadedStructOp->GetAssets()[0].ObjectPath.ToString();
+		}
+		else if (UnloadedStructOp->HasAssetPaths())
+		{
+			AssetPath = UnloadedStructOp->GetAssetPaths()[0];
+		}
+
+		// Check to see if the asset can be found, otherwise load it.
+		UObject* Object = FindObject<UObject>(nullptr, *AssetPath);
+		if(Object == nullptr)
+		{
+			// Load the package.
+			GWarn->BeginSlowTask(LOCTEXT("OnDrop_LoadPackage", "Fully Loading Package For Drop"), true, false);
+
+			Object = LoadObject<UObject>(nullptr, *AssetPath);
+
+			GWarn->EndSlowTask();
+		}
+
+		if (const UScriptStruct* Struct = Cast<UScriptStruct>(Object))
+		{
+			// This was pointing to a struct directly
+			SendToObjects(Struct->GetPathName());
+		}
+
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+*/
+
+/** @return True if the property can be edited */
+bool SPropertyEditorStruct::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.h
new file mode 100644
index 0000000..f7d756a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorStruct.h
@@ -0,0 +1,114 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "Misc/Attribute.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Input/SComboButton.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+namespace soda
+{
+
+/**
+ * A widget used to edit struct type properties (UObject type properties, with a sub-type of UScriptStuct).
+ * Can also be used (with a null FPropertyEditor) to edit a raw weak struct pointer.
+ */
+class SPropertyEditorStruct : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SPropertyEditorStruct)
+		: _Font(FSodaStyle::GetFontStyle(PropertyEditorConstants::PropertyFontStyle)) 
+		, _MetaStruct(nullptr)
+		, _AllowNone(true)
+		, _ShowDisplayNames(false)
+		{}
+		SLATE_ARGUMENT(FSlateFontInfo, Font)
+		/** Arguments used when constructing this outside of a PropertyEditor (PropertyEditor == null), ignored otherwise */
+
+		/** The meta struct that the selected struct must be a child-of (optional) */
+		SLATE_ARGUMENT(const UScriptStruct*, MetaStruct)
+		/** Should we be able to select "None" as a struct? (optional) */
+		SLATE_ARGUMENT(bool, AllowNone)
+		/** Attribute used to get the currently selected struct (required if PropertyEditor == null) */
+		SLATE_ATTRIBUTE(const UScriptStruct*, SelectedStruct)
+		/** Should we show the view options button at the bottom of the struct picker?*/
+		SLATE_ARGUMENT(bool, ShowViewOptions)
+		/** Should we show the struct picker in tree mode or list mode?*/
+		SLATE_ARGUMENT(bool, ShowTree)
+		/** Should we prettify struct names on the struct picker? (ie show their display name) */
+		SLATE_ARGUMENT(bool, ShowDisplayNames)
+		/** Delegate used to set the currently selected struct (required if PropertyEditor == null) */
+		SLATE_EVENT(FOnSetStruct, OnSetStruct)
+	SLATE_END_ARGS()
+
+	static bool Supports(const TSharedRef< class FPropertyEditor >& InPropertyEditor);
+	static bool Supports(const FProperty* InProperty);
+
+	void Construct(const FArguments& InArgs, const TSharedPtr< class FPropertyEditor >& InPropertyEditor = nullptr);
+
+	void GetDesiredWidth(float& OutMinDesiredWidth, float& OutMaxDesiredWidth);
+
+private:
+	void SendToObjects(const FString& NewValue);
+
+	//virtual void OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
+	//virtual void OnDragLeave(const FDragDropEvent& DragDropEvent) override;
+	//virtual FReply OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
+
+	/** 
+	 * Generates a struct picker with a filter to show only structs allowed to be selected. 
+	 *
+	 * @return The Struct Picker widget.
+	 */
+	//TSharedRef<SWidget> GenerateStructPicker();
+
+	/** 
+	 * Callback function from the Struct Picker for when a struct is picked.
+	 *
+	 * @param InStruct		The struct picked in the Struct Picker
+	 */
+	void OnStructPicked(const UScriptStruct* InStruct);
+
+	/**
+	 * Gets the active display value
+	 */
+	FText GetDisplayValue() const;
+
+	bool CanEdit() const;
+
+private:
+	/** The property editor we were constructed for, or null if we're editing using the construction arguments */
+	TSharedPtr<class FPropertyEditor> PropertyEditor;
+
+	/** Used when the property deals with structs and will display a Struct Picker. */
+	TSharedPtr<class SComboButton> ComboButton;
+
+	/** The meta struct that the selected class must be a child-of */
+	const UScriptStruct* MetaStruct;
+	/** Should we be able to select "None" as a struct? */
+	bool bAllowNone;
+	/** Should we show the view options button at the bottom of the struct picker? */
+	bool bShowViewOptions;
+	/** Should we show the struct picker in tree mode or list mode?*/
+	bool bShowTree;
+	/** Should we prettify struct names on the struct picker? (ie show their display name) */
+	bool bShowDisplayNames;
+
+	/** Attribute used to get the currently selected struct (required if PropertyEditor == null) */
+	TAttribute<const UScriptStruct*> SelectedStruct;
+	/** Delegate used to set the currently selected struct (required if PropertyEditor == null) */
+	FOnSetStruct OnSetStruct;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.cpp
new file mode 100644
index 0000000..cf60194
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.cpp
@@ -0,0 +1,183 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.h"
+#include "UObject/TextProperty.h"
+#include "Widgets/Input/SMultiLineEditableTextBox.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+void SPropertyEditorText::Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor )
+{
+	PropertyEditor = InPropertyEditor;
+
+	bIsFNameProperty = InPropertyEditor->PropertyIsA(FNameProperty::StaticClass());
+	bIsMultiLine = FRuntimeMetaData::GetBoolMetaData(InPropertyEditor->GetPropertyHandle()->GetMetaDataProperty(), "MultiLine");
+
+	const bool bIsPassword = FRuntimeMetaData::GetBoolMetaData(InPropertyEditor->GetPropertyHandle()->GetMetaDataProperty(), "PasswordField");
+	
+	TSharedPtr<SHorizontalBox> HorizontalBox;
+	if(bIsMultiLine)
+	{
+		ChildSlot
+		[
+			SAssignNew(HorizontalBox, SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.FillWidth(1.0f)
+			[
+				SAssignNew(MultiLineWidget, SMultiLineEditableTextBox)
+				.Text(InPropertyEditor, &FPropertyEditor::GetValueAsText)
+				.Font(InArgs._Font)
+				.SelectAllTextWhenFocused(false)
+				.ClearKeyboardFocusOnCommit(false)
+				.OnTextCommitted(this, &SPropertyEditorText::OnTextCommitted)
+				.OnTextChanged(this, &SPropertyEditorText::OnMultiLineTextChanged)
+				.SelectAllTextOnCommit(false)
+				.IsReadOnly(this, &SPropertyEditorText::IsReadOnly)
+				.AutoWrapText(true)
+				.ModiferKeyForNewLine(EModifierKey::Shift)
+				//.IsPassword( bIsPassword )
+			]
+		];
+
+		PrimaryWidget = MultiLineWidget;
+	}
+	else
+	{
+		ChildSlot
+		[
+			SAssignNew(HorizontalBox, SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.FillWidth(1.0f)
+			[
+				SAssignNew( SingleLineWidget, SEditableTextBox )
+				.Text( InPropertyEditor, &FPropertyEditor::GetValueAsText )
+				.Font( InArgs._Font )
+				.SelectAllTextWhenFocused( true )
+				.ClearKeyboardFocusOnCommit(false)
+				.OnTextCommitted( this, &SPropertyEditorText::OnTextCommitted )
+				.OnTextChanged( this, &SPropertyEditorText::OnSingleLineTextChanged )
+				.SelectAllTextOnCommit( true )
+				.IsReadOnly(this, &SPropertyEditorText::IsReadOnly)
+				.IsPassword( bIsPassword )
+			]
+		];
+
+		PrimaryWidget = SingleLineWidget;
+	}
+
+	if (bIsPassword)
+	{
+		// Passwords should be obfuscated rather than reveal the property value in the tooltip
+		PrimaryWidget->SetToolTipText(LOCTEXT("PasswordToolTip", "<hidden>"));
+	}
+	else if (InPropertyEditor->PropertyIsA(FObjectPropertyBase::StaticClass()))
+	{
+		// Object properties should display their entire text in a tooltip
+		PrimaryWidget->SetToolTipText(TAttribute<FText>(InPropertyEditor, &FPropertyEditor::GetValueAsText));
+	}
+}
+
+void SPropertyEditorText::GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth )
+{
+	if(bIsMultiLine)
+	{
+		OutMinDesiredWidth = 250.0f;
+	}
+	else
+	{
+		OutMinDesiredWidth = 125.0f;
+	}
+	
+	OutMaxDesiredWidth = 600.0f;
+}
+
+bool SPropertyEditorText::Supports( const TSharedRef< FPropertyEditor >& InPropertyEditor )
+{
+	const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+	const FProperty* Property = InPropertyEditor->GetProperty();
+
+	if(	!PropertyNode->HasNodeFlags(EPropertyNodeFlags::EditInlineNew)
+		&&	( (Property->IsA(FNameProperty::StaticClass()) && Property->GetFName() != NAME_InitialState)
+		||	Property->IsA(FStrProperty::StaticClass())
+		||	Property->IsA(FTextProperty::StaticClass())
+		||	(Property->IsA(FObjectPropertyBase::StaticClass()) && !Property->HasAnyPropertyFlags(CPF_InstancedReference))
+		) )
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void SPropertyEditorText::OnTextCommitted( const FText& NewText, ETextCommit::Type /*CommitInfo*/ )
+{
+	const TSharedRef< FPropertyNode > PropertyNode = PropertyEditor->GetPropertyNode();
+	const TSharedRef< IPropertyHandle > PropertyHandle = PropertyEditor->GetPropertyHandle();
+
+	FText CurrentText;
+	if( (PropertyHandle->GetValueAsFormattedText( CurrentText ) != FPropertyAccess::MultipleValues || NewText.ToString() != FPropertyEditor::MultipleValuesDisplayName)
+		&& !NewText.ToString().Equals(CurrentText.ToString(), ESearchCase::CaseSensitive))
+	{
+		PropertyHandle->SetValueFromFormattedString( NewText.ToString() );
+	}
+}
+
+static FText ValidateNameLength( const FText& Text )
+{
+	if( Text.ToString().Len() >= NAME_SIZE )
+	{
+		static FText ErrorString = FText::Format( LOCTEXT("NamePropertySizeTooLongError", "Name properties may only be a maximum of {0} characters"), FText::AsNumber( NAME_SIZE ) );
+		return ErrorString;
+	}
+
+	return FText::GetEmpty();
+}
+
+void SPropertyEditorText::OnMultiLineTextChanged( const FText& NewText )
+{
+	if( bIsFNameProperty )
+	{
+		FText ErrorMessage = ValidateNameLength( NewText );
+		MultiLineWidget->SetError( ErrorMessage );
+	}
+}
+
+void SPropertyEditorText::OnSingleLineTextChanged( const FText& NewText )
+{
+	if( bIsFNameProperty )
+	{
+		FText ErrorMessage = ValidateNameLength( NewText );
+		SingleLineWidget->SetError( ErrorMessage );
+	}
+}
+
+bool SPropertyEditorText::SupportsKeyboardFocus() const
+{
+	return PrimaryWidget.IsValid() && PrimaryWidget->SupportsKeyboardFocus() && CanEdit();
+}
+
+FReply SPropertyEditorText::OnFocusReceived( const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent )
+{
+	// Forward keyboard focus to our editable text widget
+	return FReply::Handled().SetUserFocus(PrimaryWidget.ToSharedRef(), InFocusEvent.GetCause());
+}
+
+bool SPropertyEditorText::CanEdit() const
+{
+	return PropertyEditor.IsValid() ? !PropertyEditor->IsEditConst() : true;
+}
+
+bool SPropertyEditorText::IsReadOnly() const
+{
+	return !CanEdit();
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.h
new file mode 100644
index 0000000..d60cdcb
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorText.h
@@ -0,0 +1,77 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "SodaStyleSet.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+
+class SMultiLineEditableTextBox;
+class SEditableTextBox;
+
+namespace soda
+{
+
+class SPropertyEditorText : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorText )
+		: _Font( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) ) 
+		{}
+		SLATE_ATTRIBUTE( FSlateFontInfo, Font )
+	SLATE_END_ARGS()
+
+	static bool Supports( const TSharedRef< class FPropertyEditor >& InPropertyEditor );
+
+	void Construct( const FArguments& InArgs, const TSharedRef< class FPropertyEditor >& InPropertyEditor );
+
+	void GetDesiredWidth( float& OutMinDesiredWidth, float& OutMaxDesiredWidth );
+
+	bool SupportsKeyboardFocus() const override;
+
+	FReply OnFocusReceived( const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent ) override;
+
+private:
+
+	void OnTextCommitted( const FText& NewText, ETextCommit::Type CommitInfo );
+
+	/** Called if the single line widget text changes */
+	void OnSingleLineTextChanged( const FText& NewText );
+
+	/** Called if the multi line widget text changes */
+	void OnMultiLineTextChanged( const FText& NewText );
+
+	/** @return True if the property can be edited */
+	bool CanEdit() const;
+
+	/** @return True if the property is Read Only */
+	bool IsReadOnly() const;
+
+private:
+
+	TSharedPtr< class FPropertyEditor > PropertyEditor;
+
+	TSharedPtr< class SWidget > PrimaryWidget;
+
+	/** Widget used for the multiline version of the text property */
+	TSharedPtr<SMultiLineEditableTextBox> MultiLineWidget;
+
+	/** Widget used for the single line version of the text property */
+	TSharedPtr<SEditableTextBox> SingleLineWidget;
+
+	/** Cached flag as we would like multi-line text widgets to be slightly larger */
+	bool bIsMultiLine;
+	
+	/** True if property is an FName property which causes us to run extra size validation checks */
+	bool bIsFNameProperty;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorTitle.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorTitle.h
new file mode 100644
index 0000000..c51e740
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyEditorTitle.h
@@ -0,0 +1,150 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "InputCoreTypes.h"
+#include "Input/Reply.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "RuntimePropertyEditor/PropertyNode.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/Presentation/PropertyEditor/PropertyEditor.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorConstants.h"
+#include "Widgets/Text/STextBlock.h"
+
+#include "RuntimeMetaData.h"
+
+namespace soda
+{
+
+class SPropertyEditorTitle : public SCompoundWidget
+{
+
+public:
+
+	SLATE_BEGIN_ARGS( SPropertyEditorTitle )
+		: _PropertyFont( FSodaStyle::GetFontStyle( PropertyEditorConstants::PropertyFontStyle ) )
+		, _CategoryFont( FSodaStyle::GetFontStyle( PropertyEditorConstants::CategoryFontStyle ) )
+		{}
+		SLATE_ATTRIBUTE( FSlateFontInfo, PropertyFont )
+		SLATE_ATTRIBUTE( FSlateFontInfo, CategoryFont )
+		SLATE_EVENT( FOnClicked, OnDoubleClicked )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, const TSharedRef<FPropertyEditor>& InPropertyEditor )
+	{
+		PropertyEditor = InPropertyEditor;
+		OnDoubleClicked = InArgs._OnDoubleClicked;
+
+		const TSharedRef< FPropertyNode > PropertyNode = InPropertyEditor->GetPropertyNode();
+		const bool bIsCategory = PropertyNode->AsCategoryNode() != nullptr;
+		const TAttribute<FSlateFontInfo> NameFont = bIsCategory ? InArgs._CategoryFont : InArgs._PropertyFont;
+
+		TSharedPtr<STextBlock> NameTextBlock;
+
+		// If our property has title support we want to fetch the value every tick, otherwise we can just use a static value
+		static const FName NAME_TitleProperty = FName(TEXT("TitleProperty"));
+		const bool bHasTitleProperty = InPropertyEditor->GetProperty() && FRuntimeMetaData::HasMetaData(InPropertyEditor->GetProperty(), NAME_TitleProperty);
+		if (bHasTitleProperty)
+		{
+			NameTextBlock =
+				SNew(STextBlock)
+				.Text(InPropertyEditor, &FPropertyEditor::GetDisplayName)
+				.Font(NameFont);
+		}		
+		else
+		{
+			NameTextBlock =
+				SNew(STextBlock)
+				.Text(InPropertyEditor->GetDisplayName())
+				.Font(NameFont);
+		}
+
+		NameTextBlock->SetOverflowPolicy(ETextOverflowPolicy::Ellipsis);
+
+		TSharedPtr<SWidget> NameWidget = NameTextBlock;
+		const bool bInArray = PropertyNode->GetProperty() != nullptr && PropertyNode->GetArrayIndex() != INDEX_NONE;
+		if (bInArray && !bHasTitleProperty)
+		{
+			const bool bNameIsIndex = NameTextBlock->GetText().EqualTo(FText::AsNumber(PropertyNode->GetArrayIndex()));
+			if (bNameIsIndex)
+			{
+				NameWidget = SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				.Padding(0, 0, 3, 0)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.Text(NSLOCTEXT("PropertyEditor", "Index", "Index"))
+					.Font(NameFont)
+					.ColorAndOpacity(FSlateColor::UseSubduedForeground())
+				]
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				.Padding(0, 0, 3, 0)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.Text(NSLOCTEXT("PropertyEditor", "OpenBracket", "["))
+					.Font(NameFont)
+					.ColorAndOpacity(FSlateColor::UseSubduedForeground())
+				]
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				.Padding(0, 0, 3, 0)
+				.AutoWidth()
+				[
+					NameTextBlock.ToSharedRef()
+				]
+				+ SHorizontalBox::Slot()
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.Text(NSLOCTEXT("PropertyEditor", "CloseBracket", "]"))
+					.Font(NameFont)
+					.ColorAndOpacity(FSlateColor::UseSubduedForeground())
+				];
+			}
+		}
+
+		ChildSlot
+		[
+			NameWidget.ToSharedRef()
+		];
+	}
+
+private:
+
+	FReply OnMouseButtonDoubleClick( const FGeometry& InMyGeometry, const FPointerEvent& InMouseEvent )
+	{
+		if ( InMouseEvent.GetEffectingButton() == EKeys::LeftMouseButton )
+		{
+			if( OnDoubleClicked.IsBound() )
+			{
+				OnDoubleClicked.Execute();
+				return FReply::Handled();
+			}
+		}
+
+		return FReply::Unhandled();
+	}
+
+
+private:
+
+	/** The delegate to execute when this text is double clicked */
+	FOnClicked OnDoubleClicked;
+
+	TSharedPtr<FPropertyEditor> PropertyEditor;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.cpp
new file mode 100644
index 0000000..ffac8f8
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.cpp
@@ -0,0 +1,255 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.h"
+
+#include "Modules/ModuleManager.h"
+#include "Textures/SlateIcon.h"
+#include "Framework/Commands/UIAction.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SBox.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "SodaStyleSet.h"
+#include "GameFramework/Actor.h"
+#include "AssetRegistry/AssetData.h"
+//#include "Editor.h"
+//#include "Editor/SceneOutliner/Public/SceneOutlinerPublicTypes.h"
+//#include "Editor/SceneOutliner/Public/SceneOutlinerModule.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "RuntimePropertyEditor/UserInterface/PropertyEditor/PropertyEditorAssetConstants.h"
+#include "HAL/PlatformApplicationMisc.h"
+//#include "SceneOutlinerPublicTypes.h"
+//#include "ActorTreeItem.h"
+//#include "ComponentTreeItem.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+void SPropertyMenuComponentPicker::Construct(const FArguments& InArgs)
+{
+	InitialComponent = InArgs._InitialComponent;
+	bAllowClear = InArgs._AllowClear;
+	ActorFilter = InArgs._ActorFilter;
+	ComponentFilter = InArgs._ComponentFilter;
+	OnSet = InArgs._OnSet;
+	OnClose = InArgs._OnClose;
+
+	FMenuBuilder MenuBuilder(true, NULL);
+
+	MenuBuilder.BeginSection(NAME_None, LOCTEXT("CurrentComponentOperationsHeader", "Current Component"));
+	{
+		if (InitialComponent)
+		{
+			MenuBuilder.AddMenuEntry(
+				LOCTEXT("EditComponent", "Edit"),
+				LOCTEXT("EditComponent_Tooltip", "Edit this component"),
+				FSlateIcon(),
+				FUIAction(FExecuteAction::CreateSP(this, &SPropertyMenuComponentPicker::OnEdit)));
+		}
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("CopyComponent", "Copy"),
+			LOCTEXT("CopyComponent_Tooltip", "Copies the component to the clipboard"),
+			FSlateIcon(),
+			FUIAction(FExecuteAction::CreateSP(this, &SPropertyMenuComponentPicker::OnCopy))
+			);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("PasteComponent", "Paste"),
+			LOCTEXT("PasteComponent_Tooltip", "Pastes an component from the clipboard to this field"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SPropertyMenuComponentPicker::OnPaste),
+				FCanExecuteAction::CreateSP(this, &SPropertyMenuComponentPicker::CanPaste))
+			);
+
+		if (bAllowClear)
+		{
+			MenuBuilder.AddMenuEntry(
+				LOCTEXT("ClearComponent", "Clear"),
+				LOCTEXT("ClearComponent_ToolTip", "Clears the component set on this field"),
+				FSlateIcon(),
+				FUIAction(FExecuteAction::CreateSP(this, &SPropertyMenuComponentPicker::OnClear))
+			);
+		}
+	}
+	MenuBuilder.EndSection();
+
+	/*
+	MenuBuilder.BeginSection(NAME_None, LOCTEXT("BrowseHeader", "Browse"));
+	{
+		TSharedPtr<SWidget> MenuContent;
+
+		FSceneOutlinerModule& SceneOutlinerModule = FModuleManager::Get().LoadModuleChecked<FSceneOutlinerModule>(TEXT("SceneOutliner"));
+
+		FSceneOutlinerInitializationOptions InitOptions;
+		InitOptions.bFocusSearchBoxWhenOpened = true;
+
+		struct FPickerFilter : public FSceneOutlinerFilter
+		{
+			FPickerFilter(const FOnShouldFilterActor& InActorFilter, const FOnShouldFilterComponent& InComponentFilter)
+				: FSceneOutlinerFilter(FSceneOutlinerFilter::EDefaultBehaviour::Fail)
+				, ActorFilter(InActorFilter)
+				, ComponentFilter(InComponentFilter)
+			{}
+
+			virtual bool PassesFilter(const ISceneOutlinerTreeItem& InItem) const override
+			{
+				if (const FActorTreeItem* ActorItem = InItem.CastTo<FActorTreeItem>())
+				{
+					return ActorItem->IsValid() && ActorFilter.Execute(ActorItem->Actor.Get());
+				}
+				else if (const FComponentTreeItem* ComponentItem = InItem.CastTo<FComponentTreeItem>())
+				{
+					return ComponentItem->IsValid() && ComponentFilter.Execute(ComponentItem->Component.Get());
+				}
+
+				return DefaultBehaviour == FSceneOutlinerFilter::EDefaultBehaviour::Pass;
+			}
+
+			virtual bool GetInteractiveState(const ISceneOutlinerTreeItem& InItem) const override
+			{
+				// All components which pass the filter are interactive
+				if (const FComponentTreeItem* ComponentItem = InItem.CastTo<FComponentTreeItem>())
+				{
+					return true;
+				}
+				return DefaultBehaviour == FSceneOutlinerFilter::EDefaultBehaviour::Pass;
+			}
+
+			FOnShouldFilterActor ActorFilter;
+			FOnShouldFilterComponent ComponentFilter;
+		};
+
+		TSharedRef<FSceneOutlinerFilter> Filter = MakeShared<FPickerFilter>(ActorFilter, ComponentFilter);
+		InitOptions.Filters->Add(Filter);
+
+		InitOptions.ColumnMap.Add(FSceneOutlinerBuiltInColumnTypes::Label(), FSceneOutlinerColumnInfo(ESceneOutlinerColumnVisibility::Visible, 0));
+
+		MenuContent =
+			SNew(SBox)
+			.WidthOverride(PropertyEditorAssetConstants::SceneOutlinerWindowSize.X)
+			.HeightOverride(PropertyEditorAssetConstants::SceneOutlinerWindowSize.Y)
+			[
+				SNew(SBorder)
+				.BorderImage(FEditorStyle::GetBrush("Menu.Background"))
+				[
+					SceneOutlinerModule.CreateComponentPicker(InitOptions, FOnComponentPicked::CreateSP(this, &SPropertyMenuComponentPicker::OnItemSelected))
+				]
+			];
+
+		MenuBuilder.AddWidget(MenuContent.ToSharedRef(), FText::GetEmpty(), true);
+
+	}
+	MenuBuilder.EndSection();
+	*/
+
+	ChildSlot
+	[
+		MenuBuilder.MakeWidget()
+	];
+}
+
+void SPropertyMenuComponentPicker::OnEdit()
+{
+	if (InitialComponent)
+	{
+		//GEditor->EditObject(InitialComponent);
+	}
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuComponentPicker::OnCopy()
+{
+	if (InitialComponent)
+	{
+		FPlatformApplicationMisc::ClipboardCopy(*FString::Printf(TEXT("%s %s"), *InitialComponent->GetClass()->GetPathName(), *InitialComponent->GetPathName()));
+	}
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuComponentPicker::OnPaste()
+{
+	FString ClipboardText;
+	FPlatformApplicationMisc::ClipboardPaste(ClipboardText);
+
+	bool bFound = false;
+
+	int32 SpaceIndex = INDEX_NONE;
+	if (ClipboardText.FindChar(TEXT(' '), SpaceIndex))
+	{
+		FString ClassPath = ClipboardText.Left(SpaceIndex);
+		FString PossibleObjectPath = ClipboardText.Mid(SpaceIndex);
+
+		if (UClass* ClassPtr = LoadClass<UActorComponent>(nullptr, *ClassPath))
+		{
+			UActorComponent* Component = FindObject<UActorComponent>(nullptr, *PossibleObjectPath);
+			if (Component && Component->IsA(ClassPtr) && Component->GetOwner() && (!ComponentFilter.IsBound() || ComponentFilter.Execute(Component)))
+			{
+				if (!ActorFilter.IsBound() || ActorFilter.Execute(Component->GetOwner()))
+				{
+					SetValue(Component);
+					bFound = true;
+				}
+			}
+		}
+	}
+
+	if (!bFound)
+	{
+		SetValue(nullptr);
+	}
+
+	OnClose.ExecuteIfBound();
+}
+
+bool SPropertyMenuComponentPicker::CanPaste()
+{
+	FString ClipboardText;
+	FPlatformApplicationMisc::ClipboardPaste(ClipboardText);
+
+	bool bCanPaste = false;
+
+	int32 SpaceIndex = INDEX_NONE;
+	if (ClipboardText.FindChar(TEXT(' '), SpaceIndex))
+	{
+		FString Class = ClipboardText.Left(SpaceIndex);
+		FString PossibleObjectPath = ClipboardText.Mid(SpaceIndex);
+
+		bCanPaste = !Class.IsEmpty() && !PossibleObjectPath.IsEmpty();
+		if (bCanPaste)
+		{
+			bCanPaste = LoadClass<UActorComponent>(nullptr, *Class) != nullptr;
+		}
+		if (bCanPaste)
+		{
+			bCanPaste = FindObject<UActorComponent>(nullptr, *PossibleObjectPath) != nullptr;
+		}
+	}
+
+	return bCanPaste;
+}
+
+void SPropertyMenuComponentPicker::OnClear()
+{
+	SetValue(nullptr);
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuComponentPicker::OnItemSelected(UActorComponent* Component)
+{
+	SetValue(Component);
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuComponentPicker::SetValue(UActorComponent* InComponent)
+{
+	OnSet.ExecuteIfBound(InComponent);
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.h b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.h
new file mode 100644
index 0000000..129c83d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SPropertyMenuComponentPicker.h
@@ -0,0 +1,102 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+class UActorComponent;
+
+/*
+namespace SceneOutliner
+{
+	struct ISceneOutlinerTreeItem;
+}
+*/
+
+namespace soda
+{
+
+class SPropertyMenuComponentPicker : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SPropertyMenuComponentPicker)
+		: _InitialComponent(nullptr)
+		, _AllowClear(true)
+		, _ActorFilter()
+	{}
+		SLATE_ARGUMENT(UActorComponent*, InitialComponent)
+		SLATE_ARGUMENT(bool, AllowClear)
+		SLATE_ARGUMENT(FOnShouldFilterActor, ActorFilter)
+		SLATE_ARGUMENT(FOnShouldFilterComponent, ComponentFilter)
+		SLATE_EVENT(FOnComponentSelected, OnSet)
+		SLATE_EVENT(FSimpleDelegate, OnClose)
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct the widget.
+	 * @param	InArgs				Arguments for widget construction
+	 * @param	InPropertyHandle	The property handle that this widget will operate on.
+	 */
+	void Construct(const FArguments& InArgs);
+
+private:
+	/**
+	 * Edit the object referenced by this widget
+	 */
+	void OnEdit();
+
+	/**
+	 * Delegate handling ctrl+c
+	 */
+	void OnCopy();
+
+	/**
+	 * Delegate handling ctrl+v
+	 */
+	void OnPaste();
+
+	/**
+	 * @return True of the current clipboard contents can be pasted
+	 */
+	bool CanPaste();
+
+	/**
+	 * Clear the referenced object
+	 */
+	void OnClear();
+
+	/**
+	 * Delegate for handling selection by the actor picker.
+	 * @param	Component The chosen component
+	 */
+	void OnItemSelected(UActorComponent* Component);
+
+	/**
+	 * Set the value of the asset referenced by this property editor.
+	 * Will set the underlying property handle if there is one.
+	 * @param	InObject	The object to set the reference to
+	 */
+	void SetValue(UActorComponent* InComponent);
+
+private:
+	UActorComponent* InitialComponent;
+
+	/** Whether the asset can be 'None' in this case */
+	bool bAllowClear;
+
+	/** Delegate used to test whether a item should be displayed or not */
+	FOnShouldFilterActor ActorFilter;
+	FOnShouldFilterComponent ComponentFilter;
+
+	/** Delegate to call when our object value should be set */
+	FOnComponentSelected OnSet;
+
+	/** Delegate for closing the containing menu */
+	FSimpleDelegate OnClose;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SResetToDefaultPropertyEditor.cpp b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SResetToDefaultPropertyEditor.cpp
new file mode 100644
index 0000000..ef8cb4f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/RuntimePropertyEditor/UserInterface/PropertyEditor/SResetToDefaultPropertyEditor.cpp
@@ -0,0 +1,111 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "RuntimePropertyEditor/SResetToDefaultPropertyEditor.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+
+#define LOCTEXT_NAMESPACE "ResetToDefaultPropertyEditor"
+
+namespace soda
+{
+
+SResetToDefaultPropertyEditor::~SResetToDefaultPropertyEditor()
+{
+	if (PropertyHandle.IsValid() && OptionalCustomResetToDefault.IsSet())
+	{
+		PropertyHandle->ClearResetToDefaultCustomized();
+	}
+}
+
+void SResetToDefaultPropertyEditor::Construct(const FArguments& InArgs, const TSharedPtr<IPropertyHandle>& InPropertyHandle)
+{
+	PropertyHandle = InPropertyHandle;
+	NonVisibleState = InArgs._NonVisibleState;
+	bValueDiffersFromDefault = false;
+	OptionalCustomResetToDefault = InArgs._CustomResetToDefault;
+
+	if (InPropertyHandle.IsValid() && OptionalCustomResetToDefault.IsSet())
+	{
+		InPropertyHandle->MarkResetToDefaultCustomized();
+	}
+
+	// Indicator for a value that differs from default. Also offers the option to reset to default.
+	ChildSlot
+	[
+		SNew(SButton)
+		.IsFocusable(false)
+		.ToolTipText(this, &SResetToDefaultPropertyEditor::GetResetToolTip)
+		.ButtonStyle(FAppStyle::Get(), "SimpleButton")
+		.ContentPadding(0) 
+		.Visibility(this, &SResetToDefaultPropertyEditor::GetDiffersFromDefaultAsVisibility )
+		.OnClicked(this, &SResetToDefaultPropertyEditor::OnResetClicked)
+		.Content()
+		[
+			SNew(SImage)
+			.Image(FSodaStyle::GetBrush("PropertyWindow.DiffersFromDefault"))
+			.ColorAndOpacity(FSlateColor::UseForeground())
+		]
+	];
+
+	UpdateDiffersFromDefaultState();
+}
+
+void SResetToDefaultPropertyEditor::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+{
+	UpdateDiffersFromDefaultState();
+}
+
+FText SResetToDefaultPropertyEditor::GetResetToolTip() const
+{
+	FString Tooltip;
+	Tooltip = LOCTEXT("ResetToDefaultToolTip", "Reset to Default").ToString();
+
+	if( PropertyHandle.IsValid() && !PropertyHandle->IsEditConst() && PropertyHandle->DiffersFromDefault() )
+	{
+		FString DefaultLabel = PropertyHandle->GetResetToDefaultLabel().ToString();
+
+		if (DefaultLabel.Len() > 0)
+		{
+			Tooltip += "\n";
+			Tooltip += DefaultLabel;
+		}
+	}
+
+	return FText::FromString(Tooltip);
+}
+
+FReply SResetToDefaultPropertyEditor::OnResetClicked()
+{
+	if (OptionalCustomResetToDefault.IsSet())
+	{
+		OptionalCustomResetToDefault.GetValue().OnResetToDefaultClicked(PropertyHandle);
+	}
+	else if (PropertyHandle.IsValid())
+	{
+		PropertyHandle->ResetToDefault();
+	}
+
+	return FReply::Handled();
+}
+
+void SResetToDefaultPropertyEditor::UpdateDiffersFromDefaultState()
+{
+	if (OptionalCustomResetToDefault.IsSet())
+	{
+		bValueDiffersFromDefault = OptionalCustomResetToDefault.GetValue().IsResetToDefaultVisible(PropertyHandle);
+	}
+	else if (PropertyHandle.IsValid())
+	{
+		bValueDiffersFromDefault = PropertyHandle->CanResetToDefault();
+	}
+}
+
+EVisibility SResetToDefaultPropertyEditor::GetDiffersFromDefaultAsVisibility() const
+{
+	return bValueDiffersFromDefault ? EVisibility::Visible : NonVisibleState;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorComponentDetails.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorComponentDetails.cpp
new file mode 100644
index 0000000..6a47fdd
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorComponentDetails.cpp
@@ -0,0 +1,86 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/ActorComponentDetails.h"
+#include "Layout/Visibility.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "SodaStyleSet.h"
+#include "Engine/EngineBaseTypes.h"
+#include "Components/ActorComponent.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+//#include "ObjectEditorUtils.h"
+#include "Widgets/SToolTip.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+
+#define LOCTEXT_NAMESPACE "ActorComponentDetails"
+
+namespace soda
+{
+
+TSharedRef<IDetailCustomization> FActorComponentDetails::MakeInstance()
+{
+	return MakeShareable( new FActorComponentDetails );
+}
+
+void FActorComponentDetails::CustomizeDetails( IDetailLayoutBuilder& DetailBuilder )
+{
+	TSharedPtr<IPropertyHandle> PrimaryTickProperty = DetailBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(UActorComponent, PrimaryComponentTick));
+
+	// Defaults only show tick properties
+	if (PrimaryTickProperty->IsValidHandle() && DetailBuilder.HasClassDefaultObject())
+	{
+		IDetailCategoryBuilder& TickCategory = DetailBuilder.EditCategory("ComponentTick");
+
+		TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, bStartWithTickEnabled)));
+		TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, TickInterval)));
+		TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, bTickEvenWhenPaused)), EPropertyLocation::Advanced);
+		TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, bAllowTickOnDedicatedServer)), EPropertyLocation::Advanced);
+		TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, TickGroup)), EPropertyLocation::Advanced);
+	}
+
+	PrimaryTickProperty->MarkHiddenByCustomization();
+
+	TArray<TWeakObjectPtr<UObject>> WeakObjectsBeingCustomized;
+	DetailBuilder.GetObjectsBeingCustomized(WeakObjectsBeingCustomized);
+
+	bool bHideReplicates = false;
+	for (TWeakObjectPtr<UObject>& WeakObjectBeingCustomized : WeakObjectsBeingCustomized)
+	{
+		if (UObject* ObjectBeingCustomized = WeakObjectBeingCustomized.Get())
+		{
+			if (UActorComponent* Component = Cast<UActorComponent>(ObjectBeingCustomized))
+			{
+				if (!Component->GetComponentClassCanReplicate())
+				{
+					bHideReplicates = true;
+					break;
+				}
+			}
+			else
+			{
+				bHideReplicates = true;
+				break;
+			}
+		}
+	}
+
+	/*
+	if (bHideReplicates)
+	{
+		TSharedPtr<IPropertyHandle> ReplicatesProperty = DetailBuilder.GetProperty(UActorComponent::GetReplicatesPropertyName());
+		ReplicatesProperty->MarkHiddenByCustomization();
+	}
+	*/
+}
+
+} // namespace soda
+
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorComponentDetails.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorComponentDetails.h
new file mode 100644
index 0000000..ece857c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorComponentDetails.h
@@ -0,0 +1,23 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/IDetailCustomization.h"
+
+namespace soda
+{
+class IDetailLayoutBuilder;
+
+class FActorComponentDetails : public IDetailCustomization
+{
+public:
+	/** Makes a new instance of this detail layout class for a specific detail view requesting it */
+	static TSharedRef<IDetailCustomization> MakeInstance();
+
+	/** IDetailCustomization interface */
+	virtual void CustomizeDetails( IDetailLayoutBuilder& DetailBuilder ) override;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetails.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetails.cpp
new file mode 100644
index 0000000..d5ca504
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetails.cpp
@@ -0,0 +1,861 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/ActorDetails.h"
+#include "Engine/EngineBaseTypes.h"
+#include "Engine/Level.h"
+#include "UObject/UnrealType.h"
+#include "GameFramework/Actor.h"
+#include "Modules/ModuleManager.h"
+#include "Misc/PackageName.h"
+#include "Misc/MessageDialog.h"
+#include "Widgets/SNullWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SBoxPanel.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Textures/SlateIcon.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/Commands/UICommandList.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBox.h"
+#include "ToolMenus.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SComboButton.h"
+#include "SodaStyleSet.h"
+#include "Engine/Blueprint.h"
+#include "Engine/Brush.h"
+//#include "Editor/UnrealEdEngine.h"
+#include "GameFramework/Volume.h"
+#include "GameFramework/WorldSettings.h"
+#include "Components/BillboardComponent.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "Engine/Selection.h"
+//#include "EditorModeManager.h"
+//#include "EditorModes.h"
+//#include "UnrealEdGlobals.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+//#include "Editor/Layers/Public/LayersModule.h"
+//#include "LevelEditor.h"
+//#include "ClassViewerModule.h"
+//#include "ClassViewerFilter.h"
+//#include "Kismet2/KismetEditorUtilities.h"
+//#include "EdGraphSchema_K2.h"
+#include "SodaDetailCustomizations/ComponentTransformDetails.h"
+#include "Widgets/SToolTip.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "Engine/BrushShape.h"
+//#include "SodaDetailCustomizations/ActorDetailsDelegates.h"
+//#include "EditorCategoryUtils.h"
+#include "Widgets/Input/SHyperlink.h"
+//#include "ObjectEditorUtils.h"
+#include "Misc/MessageDialog.h"
+//#include "ScopedTransaction.h"
+#include "WorldPartition/WorldPartitionSubsystem.h"
+//#include "Settings/EditorExperimentalSettings.h"
+#include "Algo/AnyOf.h"
+
+#//include "Kismet2/BlueprintEditorUtils.h"
+//#include "K2Node_AddDelegate.h"
+//#include "EdGraphSchema_K2_Actions.h"
+
+#define LOCTEXT_NAMESPACE "ActorDetails"
+
+namespace soda
+{
+
+//FExtendActorDetails OnExtendActorDetails;
+
+TSharedRef<IDetailCustomization> FActorDetails::MakeInstance()
+{
+	return MakeShared<FActorDetails>();
+}
+
+FActorDetails::~FActorDetails()
+{
+}
+
+void FActorDetails::CustomizeDetails( IDetailLayoutBuilder& DetailLayout )
+{
+	// Get the list of hidden categories
+	//TArray<FString> HideCategories;
+	//if (DetailLayout.GetBaseClass())
+	{
+		//FEditorCategoryUtils::GetClassHideCategories(DetailLayout.GetBaseClass(), HideCategories);
+	}
+
+	// These details only apply when adding an instance of the actor in a level
+	if (!DetailLayout.HasClassDefaultObject() && DetailLayout.GetDetailsView() /* && DetailLayout.GetDetailsView()->GetSelectedActorInfo().NumSelected > 0*/)
+	{
+		// Build up a list of unique blueprints in the selection set (recording the first actor in the set for each one)
+		//TMap<UBlueprint*, UObject*> UniqueBlueprints;
+
+		// Per level Actor Counts
+		TMap<ULevel*, int32> ActorsPerLevelCount;
+
+		bool bHasBillboardComponent = false;
+		const TArray< TWeakObjectPtr<UObject> >& SelectedObjects = DetailLayout.GetSelectedObjects();
+		for (int32 ObjectIndex = 0; ObjectIndex < SelectedObjects.Num(); ++ObjectIndex)
+		{
+			AActor* Actor = Cast<AActor>( SelectedObjects[ObjectIndex].Get() );
+
+			if (Actor != NULL)
+			{
+				// Store the selected actors for use later. Its fine to do this when CustomizeDetails is called because if the selected actors changes, CustomizeDetails will be called again on a new instance
+				// and our current resource would be destroyed.
+				SelectedActors.Add( Actor );
+
+				// Record the level that contains this actor and increment it's actor count
+				ULevel* Level = Actor->GetLevel();
+				if (Level != NULL)
+				{
+					int32& ActorCountForThisLevel = ActorsPerLevelCount.FindOrAdd(Level);
+					++ActorCountForThisLevel;
+				}
+
+				// Add to the unique blueprint map if the actor is generated from a blueprint
+				/*
+				if (UBlueprint* Blueprint = Cast<UBlueprint>(Actor->GetClass()->ClassGeneratedBy))
+				{
+					if (!UniqueBlueprints.Find(Blueprint))
+					{
+						UniqueBlueprints.Add(Blueprint, Actor);
+					}
+				}
+				*/
+
+				if (!bHasBillboardComponent)
+				{
+					bHasBillboardComponent = Actor->FindComponentByClass<UBillboardComponent>() != NULL;
+				}
+			}
+		}
+
+		if (!bHasBillboardComponent)
+		{
+			// Actor billboard scale is not relevant if the actor doesn't have a billboard component
+			//DetailLayout.HideProperty( GET_MEMBER_NAME_CHECKED(AActor, SpriteScale) );
+		}
+
+		if(/*!HideCategories.Contains(TEXT("Transform")) && */SelectedActors.Num())
+		{
+			AddTransformCategory(DetailLayout);
+		}
+		
+		/*
+		if (!HideCategories.Contains(TEXT("Actor")))
+		{
+			AddActorCategory(DetailLayout, ActorsPerLevelCount);
+		}
+		*/
+
+		// Hide World Partition specific properties in non WP levels
+		const bool bShouldDisplayWorldPartitionProperties = Algo::AnyOf(SelectedActors, [](const TWeakObjectPtr<AActor> Actor)
+		{
+			UWorld* World = Actor.IsValid() ? Actor->GetTypedOuter<UWorld>() : nullptr;
+			return World != nullptr && UWorld::HasSubsystem<UWorldPartitionSubsystem>(World);
+		});
+
+		if (!bShouldDisplayWorldPartitionProperties)
+		{
+			//DetailLayout.HideProperty(DetailLayout.GetProperty(AActor::GetRuntimeGridPropertyName(), AActor::StaticClass()));
+			//DetailLayout.HideProperty(DetailLayout.GetProperty(AActor::GetIsSpatiallyLoadedPropertyName(), AActor::StaticClass()));
+			//DetailLayout.HideProperty(DetailLayout.GetProperty(AActor::GetDataLayerAssetsPropertyName(), AActor::StaticClass()));
+			//DetailLayout.HideProperty(DetailLayout.GetProperty(AActor::GetDataLayerPropertyName(), AActor::StaticClass()));
+			//DetailLayout.HideProperty(DetailLayout.GetProperty(AActor::GetHLODLayerPropertyName(), AActor::StaticClass()));
+		}
+
+		//OnExtendActorDetails.Broadcast(DetailLayout, FGetSelectedActors::CreateSP(this, &FActorDetails::GetSelectedActors));
+	}
+
+	TSharedPtr<IPropertyHandle> PrimaryTickProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(AActor, PrimaryActorTick));
+
+	// Defaults only show tick properties
+	if (DetailLayout.HasClassDefaultObject())
+	{
+		/*
+		if (!HideCategories.Contains(TEXT("Tick")))
+		{
+			// Note: the category is renamed to differentiate between 
+			IDetailCategoryBuilder& TickCategory = DetailLayout.EditCategory("Tick", LOCTEXT("TickCategoryName", "Actor Tick") );
+
+			TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, bStartWithTickEnabled)));
+			TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, TickInterval)));
+			TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, bTickEvenWhenPaused)), EPropertyLocation::Advanced);
+			TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, bAllowTickOnDedicatedServer)), EPropertyLocation::Advanced);
+			TickCategory.AddProperty(PrimaryTickProperty->GetChildHandle(GET_MEMBER_NAME_CHECKED(FTickFunction, TickGroup)), EPropertyLocation::Advanced);
+		}
+		*/
+		
+		/*
+		if (!HideCategories.Contains(TEXT("Events")))
+		{
+			AddEventsCategory(DetailLayout);
+		}
+		*/
+	}
+
+	PrimaryTickProperty->MarkHiddenByCustomization();
+}
+
+/*
+void FActorDetails::OnConvertActor(UClass* ChosenClass)
+{
+	if (ChosenClass)
+	{
+		// Check each selected actor's pointer.
+		TArray<AActor*> SelectedActorsRaw;
+		for (int32 i=0; i<SelectedActors.Num(); i++)
+		{
+			if (SelectedActors[i].IsValid())
+			{
+				SelectedActorsRaw.Add(SelectedActors[i].Get());
+			}
+		}
+
+		// If there are valid pointers, convert the actors.
+		if (SelectedActorsRaw.Num())
+		{
+			// Dismiss the menu BEFORE converting actors as it can refresh the details panel and if the menu is still open
+			// it will be parented to an invalid actor details widget
+			FSlateApplication::Get().DismissAllMenus();
+
+			GEditor->ConvertActors(SelectedActorsRaw, ChosenClass, TSet<FString>(), true);
+		}
+	}
+}
+*/
+
+/*
+class FConvertToClassFilter : public IClassViewerFilter
+{
+public:
+	// All classes in this set will be allowed. 
+	TSet< const UClass* > AllowedClasses;
+
+	// All classes in this set will be disallowed. 
+	TSet< const UClass* > DisallowedClasses;
+
+	// Allowed ChildOf relationship. 
+	TSet< const UClass* > AllowedChildOfRelationship;
+
+	virtual bool IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef< FClassViewerFilterFuncs > InFilterFuncs ) override
+	{
+		EFilterReturn::Type eState = InFilterFuncs->IfInClassesSet(AllowedClasses, InClass);
+		if(eState == EFilterReturn::NoItems)
+		{
+			eState = InFilterFuncs->IfInChildOfClassesSet(AllowedChildOfRelationship, InClass);
+		}
+
+		// As long as it has not failed to be on an allowed list, check if it is on a disallowed list.
+		if(eState == EFilterReturn::Passed)
+		{
+			eState = InFilterFuncs->IfInClassesSet(DisallowedClasses, InClass);
+
+			// If it passes, it's on the disallowed list, so we do not want it.
+			if(eState == EFilterReturn::Passed)
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	virtual bool IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef< const IUnloadedBlueprintData > InUnloadedClassData, TSharedRef< FClassViewerFilterFuncs > InFilterFuncs) override
+	{
+		EFilterReturn::Type eState = InFilterFuncs->IfInClassesSet(AllowedClasses, InUnloadedClassData);
+		if(eState == EFilterReturn::NoItems)
+		{
+			eState = InFilterFuncs->IfInChildOfClassesSet(AllowedChildOfRelationship, InUnloadedClassData);
+		}
+
+		// As long as it has not failed to be on an allowed list, check if it is on a disallowed list.
+		if(eState == EFilterReturn::Passed)
+		{
+			eState = InFilterFuncs->IfInClassesSet(DisallowedClasses, InUnloadedClassData);
+
+			// If it passes, it's on the disallowed list, so we do not want it.
+			if(eState == EFilterReturn::Passed)
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+};
+*/
+
+/*
+UClass* FActorDetails::GetConversionRoot( UClass* InCurrentClass ) const
+{
+	UClass* ParentClass = InCurrentClass;
+
+	while(ParentClass)
+	{
+		if( ParentClass->GetBoolMetaData(FName(TEXT("IsConversionRoot"))) )
+		{
+			break;
+		}
+		ParentClass = ParentClass->GetSuperClass();
+	}
+
+	return ParentClass;
+}
+*/
+/*
+void FActorDetails::CreateClassPickerConvertActorFilter(const TWeakObjectPtr<AActor> ConvertActor, class FClassViewerInitializationOptions* ClassPickerOptions)
+{
+	// Shouldn't ever be overwriting an already established filter
+	check( ConvertActor.IsValid() )
+	check( ClassPickerOptions != nullptr && ClassPickerOptions->ClassFilters.IsEmpty() );
+	TSharedRef<FConvertToClassFilter> Filter = MakeShared<FConvertToClassFilter>();
+	ClassPickerOptions->ClassFilters.Add(Filter);
+
+	UClass* ConvertClass = ConvertActor->GetClass();
+	UClass* RootConversionClass = GetConversionRoot(ConvertClass);
+
+	if(RootConversionClass)
+	{
+		Filter->AllowedChildOfRelationship.Add(RootConversionClass);
+	}
+
+	// Never convert to the same class
+	Filter->DisallowedClasses.Add(ConvertClass);
+
+	if( ConvertActor->IsA<ABrush>() )
+	{
+		// Volumes cannot be converted to brushes or brush shapes or the abstract type
+		Filter->DisallowedClasses.Add(ABrush::StaticClass());
+		Filter->DisallowedClasses.Add(ABrushShape::StaticClass());
+		Filter->DisallowedClasses.Add(AVolume::StaticClass());
+	}
+}
+*/
+
+/*
+TSharedRef<SWidget> FActorDetails::OnGetConvertContent()
+{
+	// Build a class picker widget
+
+	// Fill in options
+	FClassViewerInitializationOptions Options;
+
+	Options.bShowUnloadedBlueprints = true;
+	Options.bIsActorsOnly = true;
+	Options.bIsPlaceableOnly = true;
+
+	// All selected actors are of the same class, so just need to use one to generate the filter
+	if ( SelectedActors.Num() > 0 )
+	{
+		CreateClassPickerConvertActorFilter(SelectedActors.Top(), &Options);
+	}
+
+	Options.Mode = EClassViewerMode::ClassPicker;
+	Options.DisplayMode = EClassViewerDisplayMode::ListView;
+
+	TSharedRef<SWidget> ClassPicker = FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateClassViewer(Options, FOnClassPicked::CreateSP(this, &FActorDetails::OnConvertActor));
+
+	return
+		SNew(SBox)
+		.WidthOverride(280)
+		.MaxDesiredHeight(500)
+		[
+			ClassPicker
+		];
+}
+*/
+/*
+EVisibility FActorDetails::GetConvertMenuVisibility() const
+{
+	return GLevelEditorModeTools().EnsureNotInMode(FBuiltinEditorModes::EM_InterpEdit) ?
+		EVisibility::Visible :
+		EVisibility::Collapsed;
+}
+*/
+
+/*
+TSharedRef<SWidget> FActorDetails::MakeConvertMenu( const FSelectedActorInfo& SelectedActorInfo )
+{
+	UClass* RootConversionClass = GetConversionRoot(SelectedActorInfo.SelectionClass);
+	return
+		SNew(SComboButton)
+		.ContentPadding(2)
+		.IsEnabled(RootConversionClass != NULL)
+		.Visibility(this, &FActorDetails::GetConvertMenuVisibility)
+		.OnGetMenuContent(this, &FActorDetails::OnGetConvertContent)
+		.ButtonContent()
+		[
+			SNew(STextBlock)
+			.Text(LOCTEXT("SelectAType", "Select a Type"))
+			.Font(IDetailLayoutBuilder::GetDetailFont())
+		];
+
+}
+*/
+
+/*
+void FActorDetails::OnNarrowSelectionSetToSpecificLevel( TWeakObjectPtr<ULevel> LevelToNarrowInto )
+{
+	if (ULevel* RequiredLevel = LevelToNarrowInto.Get())
+	{
+		// Remove any selected objects that aren't in the specified level
+		TArray<AActor*> ActorsToDeselect;
+		for ( TArray< TWeakObjectPtr<AActor> >::TConstIterator Iter(SelectedActors); Iter; ++Iter)
+		{ 
+			if( (*Iter).IsValid() )
+			{
+				AActor* Actor = (*Iter).Get();
+				if (!Actor->IsIn(RequiredLevel))
+				{
+					ActorsToDeselect.Add(Actor);
+				}
+			}
+		}
+
+		for (TArray<AActor*>::TIterator DeselectIt(ActorsToDeselect); DeselectIt; ++DeselectIt)
+		{
+			AActor* Actor = *DeselectIt;
+			GEditor->SelectActor(Actor, false,  false);
+		}
+
+		// Tell the editor selection status was changed.
+		GEditor->NoteSelectionChange();
+	}
+}
+*/
+
+/*
+bool FActorDetails::IsActorValidForLevelScript() const
+{
+	AActor* Actor = GEditor->GetSelectedActors()->GetTop<AActor>();
+	return FKismetEditorUtilities::IsActorValidForLevelScript(Actor);
+}
+*/
+
+/*
+FReply FActorDetails::FindSelectedActorsInLevelScript()
+{
+	GUnrealEd->FindSelectedActorsInLevelScript();
+	return FReply::Handled();
+};
+*/
+
+/*
+bool FActorDetails::AreAnySelectedActorsInLevelScript() const
+{
+	return GUnrealEd->AreAnySelectedActorsInLevelScript();
+};
+*/
+
+/** Util to create a menu for events we can add for the selected actor */
+/*
+TSharedRef<SWidget> FActorDetails::MakeEventOptionsWidgetFromSelection()
+{
+	UToolMenus* ToolMenus = UToolMenus::Get();
+	static const FName MenuName("DetailCustomizations.EventOptions");
+	if (!ToolMenus->IsMenuRegistered(MenuName))
+	{
+		ToolMenus->RegisterMenu(MenuName);
+	}
+
+	FToolMenuContext Context;
+	UToolMenu* Menu = ToolMenus->GenerateMenu(MenuName, Context);
+	AActor* Actor = SelectedActors[0].Get();
+	FKismetEditorUtilities::AddLevelScriptEventOptionsForActor(Menu, SelectedActors[0], true, true, false);
+	return ToolMenus->GenerateWidget(Menu);
+}
+*/
+
+/*
+void FActorDetails::AddLayersCategory( IDetailLayoutBuilder& DetailBuilder )
+{
+	if( !FModuleManager::Get().IsModuleLoaded( TEXT("Layers") ) )
+	{
+		return;
+	}
+
+	FLayersModule& LayersModule = FModuleManager::LoadModuleChecked< FLayersModule >( TEXT("Layers") );
+
+	const FText LayerCategory = LOCTEXT("LayersCategory", "Layers");
+
+	DetailBuilder.EditCategory( "Layers", LayerCategory, ECategoryPriority::Uncommon )
+	.AddCustomRow( FText::GetEmpty() )
+	[
+		LayersModule.CreateLayerCloud( SelectedActors )
+	];
+}
+*/
+
+void FActorDetails::AddTransformCategory( IDetailLayoutBuilder& DetailBuilder )
+{
+	//const FSelectedActorInfo& SelectedActorInfo = DetailBuilder.GetDetailsView()->GetSelectedActorInfo();
+
+	//bool bAreBrushesSelected = SelectedActorInfo.bHaveBrush;
+	bool bIsOnlyWorldPropsSelected =  SelectedActors.Num() == 1 && SelectedActors[0].IsValid() && SelectedActors[0]->IsA<AWorldSettings>();
+	bool bLacksRootComponent = SelectedActors[0].IsValid() && (SelectedActors[0]->GetRootComponent()==NULL);
+
+	// Don't show the Transform details if the only actor selected is world properties, or if they have no RootComponent
+	if ( bIsOnlyWorldPropsSelected || bLacksRootComponent )
+	{
+		return;
+	}
+	
+	TSharedRef<FComponentTransformDetails> TransformDetails = MakeShareable( new FComponentTransformDetails( DetailBuilder.GetSelectedObjects(), DetailBuilder ) );
+
+	IDetailCategoryBuilder& TransformCategory = DetailBuilder.EditCategory( "TransformCommon", LOCTEXT("TransformCommonCategory", "Transform"), ECategoryPriority::Transform );
+
+	TransformCategory.AddCustomBuilder( TransformDetails );
+}
+
+/*
+void FActorDetails::AddEventsCategory(IDetailLayoutBuilder& DetailBuilder)
+{
+	// Get the currently selected actor, which would be the "Default__Actor" 
+	const TArray<TWeakObjectPtr<UObject>>& Selected = DetailBuilder.GetSelectedObjects();
+	if(Selected.IsEmpty())
+	{
+		return;
+	}
+
+	AActor* Actor = Cast<AActor>(Selected[0].Get());
+	UBlueprint* Blueprint = Actor ? Cast<UBlueprint>(Actor->GetClass()->ClassGeneratedBy) : nullptr;
+
+	if(!Actor || !Blueprint || !FBlueprintEditorUtils::DoesSupportEventGraphs(Blueprint))
+	{
+		return;
+	}
+
+	IDetailCategoryBuilder& EventsCategory = DetailBuilder.EditCategory("Events", FText::GetEmpty(), ECategoryPriority::Uncommon);
+	static const FName HideInDetailPanelName("HideInDetailPanel");
+
+	// Find all the Multicast delegate properties and give a binding button for them
+	for (TFieldIterator<FMulticastDelegateProperty> PropertyIt(Actor->GetClass(), EFieldIteratorFlags::IncludeSuper); PropertyIt; ++PropertyIt)
+	{
+		FMulticastDelegateProperty* Property = *PropertyIt;
+		
+		// Only show BP assiangable, non-hidden delegates		
+		if (!Property->HasAnyPropertyFlags(CPF_Parm) && Property->HasAllPropertyFlags(CPF_BlueprintAssignable) && !Property->HasMetaData(HideInDetailPanelName))
+		{
+			const FName EventName = Property->GetFName();
+			FText EventText = Property->GetDisplayNameText();
+
+			EventsCategory.AddCustomRow(EventText)
+			.NameContent()
+			[
+				SNew(SHorizontalBox)
+				.ToolTipText(Property->GetToolTipText())
+
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.Padding(0.0f, 0.0f, 5.0f, 0.0f)
+				[
+					SNew(SImage)
+					.Image(FEditorStyle::GetBrush("GraphEditor.Event_16x"))
+				]
+
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+					.Text(EventText)
+				]
+			]
+			// A green "Plus" button to add a binding. For dynamic delegates on the CDO, you can always
+			// make a new binding, so always display the "Plus"
+			.ValueContent()
+			.MinDesiredWidth(150.0f)
+			.MaxDesiredWidth(200.0f)
+			[
+				SNew(SButton)
+				.ButtonStyle(FEditorStyle::Get(), "FlatButton.Success")
+				.HAlign(HAlign_Center)
+				.OnClicked(this, &FActorDetails::HandleAddOrViewEventForVariable, Blueprint, Property)
+				.ForegroundColor(FSlateColor::UseForeground())
+				[			
+					SNew(SImage)
+					.Image(FEditorStyle::GetBrush("Plus"))			
+				]
+			];
+		}
+	}
+}
+*/
+
+/*
+FReply FActorDetails::HandleAddOrViewEventForVariable(UBlueprint* BP, FMulticastDelegateProperty* Property)
+{
+	const UFunction* SignatureFunction = Property ? Property->SignatureFunction : nullptr;
+	UEdGraph* EventGraph = BP ? FBlueprintEditorUtils::FindEventGraph(BP) : nullptr;
+
+	if (EventGraph && SignatureFunction)
+	{
+		const FVector2D SpawnPos = EventGraph->GetGoodPlaceForNewNode();
+
+		// Adding a bound dynatic delegate from the Actor that is based off this BP will always be in a self context
+		UK2Node_AddDelegate* TemplateNode = NewObject<UK2Node_AddDelegate>();
+		TemplateNode->SetFromProperty(Property,  true, Property->GetOwnerClass());
+
+		UEdGraphNode* SpawnedDelegate = FEdGraphSchemaAction_K2AssignDelegate::AssignDelegate(TemplateNode, EventGraph, nullptr, SpawnPos, true);
+		FKismetEditorUtilities::BringKismetToFocusAttentionOnObject(SpawnedDelegate, false);
+	}
+
+	return FReply::Handled();
+}
+*/
+
+namespace ActorDetailsUtil
+{
+	constexpr int32 MultipleValuesIndicator = 2;
+
+	FText GetActorPackagingModeText(int32 Mode)
+	{
+		switch (Mode)
+		{
+			// false: internal
+		case 0:
+			return LOCTEXT("InternalActorPackaging", "Internal");
+			// true: external
+		case 1:
+			return LOCTEXT("ExternalActorPackaging", "External");
+		case MultipleValuesIndicator:
+			return LOCTEXT("MultipleValues", "Multiple Values");
+		default:
+			return LOCTEXT("InternalActorPackaging", "Internal");
+		}
+	}
+}
+
+/*
+void FActorDetails::AddActorCategory( IDetailLayoutBuilder& DetailBuilder, const TMap<ULevel*, int32>& ActorsPerLevelCount )
+{		
+	FLevelEditorModule& LevelEditor = FModuleManager::GetModuleChecked<FLevelEditorModule>( TEXT("LevelEditor") );
+
+	const FLevelEditorCommands& Commands = LevelEditor.GetLevelEditorCommands();
+	TSharedRef<const FUICommandList> CommandBindings = LevelEditor.GetGlobalLevelEditorActions();
+
+	const FSelectedActorInfo& SelectedActorInfo = DetailBuilder.GetDetailsView()->GetSelectedActorInfo();
+	TSharedPtr<SVerticalBox> LevelBox;
+
+	IDetailCategoryBuilder& ActorCategory = DetailBuilder.EditCategory("Actor", FText::GetEmpty(), ECategoryPriority::Uncommon );
+
+	if (GetSelectedActors().Num() == 1)
+	{
+		if (AActor* Actor = GEditor->GetSelectedActors()->GetTop<AActor>())
+		{
+			const FText ActorGuidText = FText::FromString(Actor->GetActorGuid().ToString());
+			ActorCategory.AddCustomRow( LOCTEXT("ActorGuid", "ActorGuid") )
+				.NameContent()
+				[
+					SNew(STextBlock)
+					.Text(LOCTEXT("ActorGuid2", "Actor Guid"))
+					.ToolTipText(LOCTEXT("ActorGuid_ToolTip", "Actor Guid"))
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+				]
+				.ValueContent()
+				[
+					SNew(STextBlock)
+						.Text(ActorGuidText)
+						.Font(IDetailLayoutBuilder::GetDetailFont())
+						.IsEnabled(false)
+				];
+		}
+	};
+
+#if 1
+	// Create the info buttons per level
+	for ( auto LevelIt( ActorsPerLevelCount.CreateConstIterator() ); LevelIt; ++LevelIt)
+	{
+		ULevel* Level = LevelIt.Key();
+		int32 SelectedActorCountInLevel = LevelIt.Value();
+		
+		// Get a description of the level
+		FText LevelDescription = FText::FromString( FPackageName::GetShortName( Level->GetOutermost()->GetFName() ) );
+		if (Level == Level->OwningWorld->PersistentLevel)
+		{
+			LevelDescription = NSLOCTEXT("UnrealEd", "PersistentLevel", "Persistent Level");
+		}
+
+		// Create a description and tooltip for the actor count/selection hyperlink
+		const FText ActorCountDescription = FText::Format( LOCTEXT("SelectedActorsInOneLevel", "{0} selected in"), FText::AsNumber( SelectedActorCountInLevel ) );
+
+		const FText Tooltip = FText::Format( LOCTEXT("SelectedActorsHyperlinkTooltip", "Narrow the selection set to just the actors in {0}"), LevelDescription);
+
+		// Create the row for this level
+		TWeakObjectPtr<ULevel> WeakLevelPtr = Level;
+
+		ActorCategory.AddCustomRow( LOCTEXT("SelectionFilter", "Selected") )
+		.NameContent()
+		[
+			SNew(SHyperlink)
+				.Style(FEditorStyle::Get(), "HoverOnlyHyperlink")
+				.OnNavigate(this, &FActorDetails::OnNarrowSelectionSetToSpecificLevel, WeakLevelPtr)
+				.Text(ActorCountDescription)
+				.TextStyle(FEditorStyle::Get(), "DetailsView.HyperlinkStyle")
+				.ToolTipText(Tooltip)
+		]
+		.ValueContent()
+		.MaxDesiredWidth(0)
+		[
+			SNew(STextBlock)
+				.Text(LevelDescription)
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+		];
+
+	}
+#endif
+
+	// Convert Actor Menu
+	// WorldSettings should never convert to another class type
+	if( SelectedActorInfo.SelectionClass != AWorldSettings::StaticClass() && SelectedActorInfo.HasConvertableAsset() )
+	{
+		ActorCategory.AddCustomRow( LOCTEXT("ConvertMenu", "Convert") )
+		.NameContent()
+		[
+			SNew(STextBlock)
+			.Text(LOCTEXT("ConvertActor", "Convert Actor"))
+			.ToolTipText(LOCTEXT("ConvertActor_ToolTip", "Convert actors to different types"))
+			.Font(IDetailLayoutBuilder::GetDetailFont())
+		]
+		.ValueContent()
+		[
+			MakeConvertMenu( SelectedActorInfo )
+		];
+	}
+
+	if (GetDefault<UEditorExperimentalSettings>()->bEnableOneFilePerActorSupport)
+	{
+		// WorldSettings should not be packaged externally
+		if (SelectedActorInfo.SelectionClass != AWorldSettings::StaticClass())
+		{
+			// Actor Packaging Mode
+			const bool bIsPartitionedWorld = UWorld::HasSubsystem<UWorldPartitionSubsystem>(SelectedActorInfo.SharedWorld);
+
+			auto OnGetMenuContent = [=]() -> TSharedRef<SWidget> {
+				FMenuBuilder MenuBuilder(true, nullptr);
+				MenuBuilder.AddMenuEntry(ActorDetailsUtil::GetActorPackagingModeText(0), FText(), FSlateIcon(), FExecuteAction::CreateSP(this, &FActorDetails::OnActorPackagingModeChanged, false));
+				MenuBuilder.AddMenuEntry(ActorDetailsUtil::GetActorPackagingModeText(1), FText(), FSlateIcon(), FExecuteAction::CreateSP(this, &FActorDetails::OnActorPackagingModeChanged, true));
+				return MenuBuilder.MakeWidget();
+			};
+
+			ActorCategory.AddCustomRow( LOCTEXT("ActorPackagingModeRow", "ActorPackagingMode"), true)
+				.NameContent()
+				[
+					SNew(STextBlock)
+					.Text(LOCTEXT("ActorPackagingMode", "Packaging Mode"))
+					.ToolTipText(LOCTEXT("ActorPackagingMode_ToolTip", "Change the actor packaging mode. This will indicate if the actor is packaged alongside its level or in an external package."))
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+				]
+				.ValueContent()
+				[
+					SNew(SComboButton)
+					.ContentPadding(2)
+					.OnGetMenuContent_Lambda(OnGetMenuContent)
+					.IsEnabled(this, &FActorDetails::IsActorPackagingModeEditable)
+					.ButtonContent()
+					[
+						SNew(STextBlock)
+						.Text(this, &FActorDetails::GetCurrentActorPackagingMode)
+						.Font(IDetailLayoutBuilder::GetDetailFont())
+					]
+					.IsEnabled(!bIsPartitionedWorld)
+				];
+		}
+	}
+}
+*/
+/*
+bool FActorDetails::IsActorPackagingModeEditable() const
+{
+	for (TWeakObjectPtr<AActor> Actor : SelectedActors)
+	{
+		if (Actor.IsValid() && Actor->GetLevel())
+		{
+			if (!Actor->SupportsExternalPackaging())
+			{
+				return false;
+			}
+		}
+	}
+	return true;
+}
+*/
+
+FText FActorDetails::GetCurrentActorPackagingMode() const
+{
+	int32 PackagingMode = -1;
+	for (TWeakObjectPtr<AActor> Actor : SelectedActors)
+	{
+		if (Actor.IsValid())
+		{
+			// If loading strategy is `Count` initialize it, otherwise set it to `None` if different between selected actors
+			PackagingMode = PackagingMode == -1 ? (int32)Actor->IsPackageExternal() : (PackagingMode != (int32)Actor->IsPackageExternal() ? ActorDetailsUtil::MultipleValuesIndicator : PackagingMode);
+		}
+	}
+	return ActorDetailsUtil::GetActorPackagingModeText(PackagingMode);
+}
+
+/*
+void FActorDetails::OnActorPackagingModeChanged(bool bExternal)
+{
+	// Validate all actors are in a saved map
+	TArray<AActor*> ActorsToConvert;
+	for (TWeakObjectPtr<AActor> Actor : SelectedActors)
+	{
+		if (Actor.IsValid() && Actor->GetLevel())
+		{
+			ULevel* Level = Actor->GetLevel();
+			UPackage* LevelPackage = Level->GetOutermost();
+			FString LevelName = LevelPackage->GetName();
+			if (LevelPackage == GetTransientPackage()
+				|| LevelPackage->HasAnyFlags(RF_Transient)
+				|| !FPackageName::IsValidLongPackageName(LevelName))
+			{
+				FText Message = FText::Format(LOCTEXT("ActorPackagingModeSaveMap", "You need to save level {0} before changing packaging mode on its actors."), FText::FromString(LevelName));
+				FMessageDialog::Open(EAppMsgType::Ok, Message);
+				return;
+			}
+			else if (Actor->SupportsExternalPackaging())
+			{
+				ActorsToConvert.Add(Actor.Get());
+			}
+			else
+			{
+				UE_LOG(LogLevel, Warning, TEXT("Can't convert %s to external packaging."), *Actor->GetName());
+			}
+		}
+	}
+
+	//FScopedTransaction Transaction(LOCTEXT("ActorSetPackageExternal", "Change Actors Assigned Package"));
+	
+	for (AActor* Actor : ActorsToConvert)
+	{
+		Actor->SetPackageExternal(bExternal);
+	}
+	
+}
+*/
+
+const TArray< TWeakObjectPtr<AActor> >& FActorDetails::GetSelectedActors() const
+{
+	return SelectedActors;
+}
+
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetails.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetails.h
new file mode 100644
index 0000000..138de9f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetails.h
@@ -0,0 +1,122 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakObjectPtr.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "RuntimePropertyEditor/IDetailCustomization.h"
+
+class AActor;
+class UBlueprint;
+class ULevel;
+//struct FSelectedActorInfo;
+struct FSlateBrush;
+
+namespace soda
+{
+
+class IDetailLayoutBuilder;
+
+class FActorDetails : public IDetailCustomization
+{
+public:
+	virtual ~FActorDetails();
+
+	/** Makes a new instance of this detail layout class for a specific detail view requesting it */
+	static TSharedRef<IDetailCustomization> MakeInstance();
+
+	/** IDetailCustomization interface */
+	virtual void CustomizeDetails( IDetailLayoutBuilder& DetailLayout ) override;
+private:
+	/** Delegate that returns an icon */
+	DECLARE_DELEGATE_RetVal(const FSlateBrush*, FGetBrushImage);
+
+	/** Delegate that returns a tooltip or other text field */
+	DECLARE_DELEGATE_RetVal(FText, FGetText);
+
+	/**
+	 * Returns the conversion root class of the passed in class
+	 *
+	 * @param InCurrentClass		The class to find the conversion root of
+	 *
+	 * @return						Going up the class hierarchy, the first class found to have "IsConversionRoot" metadata (NULL if none is found)
+	 */
+	//UClass* GetConversionRoot( UClass* InCurrentClass ) const;
+
+	/**
+	 * Callback from the Class Picker when a class is picked.
+	 *
+	 * @param ChosenClass		The class chosen to convert to
+	 */
+	//void OnConvertActor(UClass* ChosenClass);
+
+	/** 
+	 * Creates the filters for displaying valid classes to convert to
+	 *
+	 * @param ConvertActor			The actor being converted
+	 * @param ClassPickerOptions	Options for the Class Picker being generated, to be given a newly created filter
+	 */
+	//void CreateClassPickerConvertActorFilter(const TWeakObjectPtr<AActor> ConvertActor, class FClassViewerInitializationOptions* ClassPickerOptions);
+
+	/** Retrieves the content for the Convert combo button */
+	//TSharedRef<SWidget> OnGetConvertContent();
+
+	/** Returns the visibility of the Convert menu */
+	//EVisibility GetConvertMenuVisibility() const;
+
+	/** Create the Convert combo button */
+	//TSharedRef<SWidget> MakeConvertMenu( const FSelectedActorInfo& SelectedActorInfo );
+
+	//void OnNarrowSelectionSetToSpecificLevel( TWeakObjectPtr<ULevel> LevelToNarrowInto );
+
+	//bool IsActorValidForLevelScript() const;
+
+	//FReply FindSelectedActorsInLevelScript();
+
+	//bool AreAnySelectedActorsInLevelScript() const;
+
+	/** Util to create a menu for events we can add for the selected actor */
+	//TSharedRef<SWidget> MakeEventOptionsWidgetFromSelection();
+
+	//void AddActorCategory( IDetailLayoutBuilder& DetailBuilder, const TMap<ULevel*, int32>& ActorsPerLevelCount );
+
+	void AddBlueprintCategory( IDetailLayoutBuilder& DetailBuilder, const TMap<UBlueprint*, UObject*>& UniqueBlueprints );
+
+	//void AddLayersCategory( IDetailLayoutBuilder& DetailBuilder );
+
+	void AddTransformCategory( IDetailLayoutBuilder& DetailBuilder );
+
+	/** Display a category with all dynamic delegates on a CDO */
+	//void AddEventsCategory(IDetailLayoutBuilder& DetailBuilder);
+
+	/** Handle the creation of a bound event from a dynamic delegate on a CDO */
+	//FReply HandleAddOrViewEventForVariable(UBlueprint* BP, class FMulticastDelegateProperty* Property);
+
+	const TArray< TWeakObjectPtr<AActor> >& GetSelectedActors() const;
+
+	// Functions for actor loading strategy details
+private:
+	// Functions to handle actor packaging mode (i.e. external or internal)
+	//bool IsActorPackagingModeEditable() const;
+	FText GetCurrentActorPackagingMode() const;
+	//void OnActorPackagingModeChanged(bool bExternal);
+
+
+	/** Bring up the menu for user to select the path to create blueprint at */
+	FReply OnPickBlueprintPathClicked(bool bHavest);
+
+	/** Bring up the menu for user to select the path to create blueprint at */
+	void   OnSelectBlueprintPath(const FString& );
+
+	/** The path the user has selected to create a blueprint at*/
+	FString PathForActorBlueprint;
+
+	/** List of currently selected actors*/
+	TArray< TWeakObjectPtr<AActor> > SelectedActors;
+};
+
+} //namespace soda
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetailsDelegates.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetailsDelegates.h
new file mode 100644
index 0000000..6a6b61f
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ActorDetailsDelegates.h
@@ -0,0 +1,16 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+class AActor;
+
+/** Delegate that returns a const& to an array of actors this view is inspecting */
+DECLARE_DELEGATE_RetVal( const TArray< TWeakObjectPtr<AActor> >&, FGetSelectedActors );
+
+DECLARE_MULTICAST_DELEGATE_TwoParams(FExtendActorDetails, class IDetailLayoutBuilder&, const FGetSelectedActors&);
+
+/** Delegate that is invoked to extend the actor details view */
+extern DETAILCUSTOMIZATIONS_API FExtendActorDetails OnExtendActorDetails;
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentEditorUtils.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentEditorUtils.cpp
new file mode 100644
index 0000000..baeb21c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentEditorUtils.cpp
@@ -0,0 +1,283 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/ComponentEditorUtils.h"
+//#include "HAL/FileManager.h"
+#include "Misc/Paths.h"
+#include "UObject/PropertyPortFlags.h"
+#include "Textures/SlateIcon.h"
+#include "Framework/Commands/UIAction.h"
+//#include "EditorStyleSet.h"
+#include "Components/PrimitiveComponent.h"
+#include "Components/MeshComponent.h"
+//#include "Exporters/Exporter.h"
+//#include "Materials/Material.h"
+//#include "Editor/UnrealEdEngine.h"
+//#include "Components/DecalComponent.h"
+//#include "UnrealEdGlobals.h"
+//#include "ScopedTransaction.h"
+//#include "EdGraphSchema_K2.h"
+//#include "Kismet2/BlueprintEditorUtils.h"
+//#include "Kismet2/KismetEditorUtilities.h"
+//#include "Factories.h"
+//#include "UnrealExporter.h"
+//#include "Framework/Commands/GenericCommands.h"
+//#include "SourceCodeNavigation.h"
+//#include "Styling/SlateIconFinder.h"
+//#include "Framework/MultiBox/MultiBoxBuilder.h"
+//#include "Editor.h"
+
+//#include "HAL/PlatformApplicationMisc.h"
+//#include "ToolMenus.h"
+//#include "Kismet2/ComponentEditorContextMenuContex.h"
+//#include "Subsystems/AssetEditorSubsystem.h"
+
+#define LOCTEXT_NAMESPACE "ComponentEditorUtils"
+
+namespace soda
+{
+
+bool FComponentEditorUtils::CanEditComponentInstance(const UActorComponent* ActorComp, const UActorComponent* ParentSceneComp, bool bAllowUserContructionScript)
+{
+	// Exclude nested DSOs attached to BP-constructed instances, which are not mutable.
+	return (ActorComp != nullptr
+		//&& (!ActorComp->IsVisualizationComponent())
+		&& (ActorComp->CreationMethod != EComponentCreationMethod::UserConstructionScript || bAllowUserContructionScript)
+		&& (ParentSceneComp == nullptr || !ParentSceneComp->IsCreatedByConstructionScript() || !ActorComp->HasAnyFlags(RF_DefaultSubObject)))
+		&& (ActorComp->CreationMethod != EComponentCreationMethod::Native || FComponentEditorUtils::GetPropertyForEditableNativeComponent(ActorComp));
+}
+
+FName FComponentEditorUtils::FindVariableNameGivenComponentInstance(const UActorComponent* ComponentInstance)
+{
+	check(ComponentInstance != nullptr);
+
+	// When names mismatch, try finding a differently named variable pointing to the the component (the mismatch should only be possible for native components)
+	auto FindPropertyReferencingComponent = [](const UActorComponent* Component) -> FProperty*
+	{
+		if (AActor* OwnerActor = Component->GetOwner())
+		{
+			UClass* OwnerClass = OwnerActor->GetClass();
+			AActor* OwnerCDO = CastChecked<AActor>(OwnerClass->GetDefaultObject());
+			check(OwnerCDO->HasAnyFlags(RF_ClassDefaultObject));
+
+			for (TFieldIterator<FObjectProperty> PropIt(OwnerClass, EFieldIteratorFlags::IncludeSuper); PropIt; ++PropIt)
+			{
+				FObjectProperty* TestProperty = *PropIt;
+				if (Component->GetClass()->IsChildOf(TestProperty->PropertyClass))
+				{
+					void* TestPropertyInstanceAddress = TestProperty->ContainerPtrToValuePtr<void>(OwnerCDO);
+					UObject* ObjectPointedToByProperty = TestProperty->GetObjectPropertyValue(TestPropertyInstanceAddress);
+					if (ObjectPointedToByProperty == Component)
+					{
+						// This property points to the component archetype, so it's an anchor even if it was named wrong
+						return TestProperty;
+					}
+				}
+			}
+
+			for (TFieldIterator<FArrayProperty> PropIt(OwnerClass, EFieldIteratorFlags::IncludeSuper); PropIt; ++PropIt)
+			{
+				FArrayProperty* TestProperty = *PropIt;
+				void* ArrayPropInstAddress = TestProperty->ContainerPtrToValuePtr<void>(OwnerCDO);
+
+				FObjectProperty* ArrayEntryProp = CastField<FObjectProperty>(TestProperty->Inner);
+				if ((ArrayEntryProp == nullptr) || !ArrayEntryProp->PropertyClass->IsChildOf<UActorComponent>())
+				{
+					continue;
+				}
+
+				FScriptArrayHelper ArrayHelper(TestProperty, ArrayPropInstAddress);
+				for (int32 ComponentIndex = 0; ComponentIndex < ArrayHelper.Num(); ++ComponentIndex)
+				{
+					UObject* ArrayElement = ArrayEntryProp->GetObjectPropertyValue(ArrayHelper.GetRawPtr(ComponentIndex));
+					if (ArrayElement == Component)
+					{
+						return TestProperty;
+					}
+				}
+			}
+		}
+
+		return nullptr;
+	};
+
+	// First see if the name just works
+	if (AActor* OwnerActor = ComponentInstance->GetOwner())
+	{
+		UClass* OwnerActorClass = OwnerActor->GetClass();
+		if (FObjectProperty* TestProperty = FindFProperty<FObjectProperty>(OwnerActorClass, ComponentInstance->GetFName()))
+		{
+			if (ComponentInstance->GetClass()->IsChildOf(TestProperty->PropertyClass))
+					{
+						return TestProperty->GetFName();
+					}
+				}
+
+		if (FProperty* ReferencingProp = FindPropertyReferencingComponent(ComponentInstance))
+		{
+			return ReferencingProp->GetFName();
+		}
+			}
+
+	if (UActorComponent* Archetype = Cast<UActorComponent>(ComponentInstance->GetArchetype()))
+	{
+		if (FProperty* ReferencingProp = FindPropertyReferencingComponent(Archetype))
+		{
+			return ReferencingProp->GetFName();
+		}
+	}
+
+	return NAME_None;
+}
+
+FComponentReference FComponentEditorUtils::MakeComponentReference(const AActor* InExpectedComponentOwner, const UActorComponent* InComponent)
+{
+	FComponentReference Result;
+	if (InComponent)
+	{
+		AActor* ComponentOwner = InComponent->GetOwner();
+		const AActor* Owner = InExpectedComponentOwner;
+		if (ComponentOwner && ComponentOwner != Owner)
+		{
+			Result.OtherActor = ComponentOwner;
+			Owner = ComponentOwner;
+		}
+
+		if (InComponent->CreationMethod == EComponentCreationMethod::Native || InComponent->CreationMethod == EComponentCreationMethod::SimpleConstructionScript)
+		{
+			Result.ComponentProperty = FComponentEditorUtils::FindVariableNameGivenComponentInstance(InComponent);
+		}
+		if (Result.ComponentProperty.IsNone() && InComponent->CreationMethod != EComponentCreationMethod::UserConstructionScript)
+		{
+			Result.PathToComponent = InComponent->GetPathName(ComponentOwner);
+		}
+	}
+	return Result;
+}
+
+FProperty* FComponentEditorUtils::GetPropertyForEditableNativeComponent(const UActorComponent* NativeComponent)
+{
+	// A native component can be edited if it is bound to a member variable and that variable is marked as visible in the editor
+	// Note: We aren't concerned with whether the component is marked editable - the component itself is responsible for determining which of its properties are editable	
+	UObject* ComponentOuter = (NativeComponent ? NativeComponent->GetOuter() : nullptr);
+	UClass* OwnerClass = (ComponentOuter ? ComponentOuter->GetClass() : nullptr);
+	UObject* OwnerCDO = (OwnerClass ? OwnerClass->GetDefaultObject() : nullptr);
+
+	if (OwnerClass != nullptr)
+	{
+		for (TFieldIterator<FObjectProperty> It(OwnerClass); It; ++It)
+		{
+			FObjectProperty* ObjectProp = *It;
+
+			// Must be visible - note CPF_Edit is set for all properties that should be visible, not just those that are editable
+			if ((ObjectProp->PropertyFlags & (CPF_Edit)) == 0)
+			{
+				continue;
+			}
+
+			UObject* Object = ObjectProp->GetObjectPropertyValue(ObjectProp->ContainerPtrToValuePtr<void>(ComponentOuter));
+			if (Object != nullptr && Object->GetFName() == NativeComponent->GetFName())
+			{
+				return ObjectProp;
+			}
+		}
+
+		// We have to check for array properties as well because they are not FObjectProperties and we want to be able to
+		// edit the inside of it
+		if (OwnerCDO != nullptr)
+		{
+			for (TFieldIterator<FArrayProperty> PropIt(OwnerClass, EFieldIteratorFlags::IncludeSuper); PropIt; ++PropIt)
+			{
+				FArrayProperty* TestProperty = *PropIt;
+				void* ArrayPropInstAddress = TestProperty->ContainerPtrToValuePtr<void>(OwnerCDO);
+
+				// Ensure that this property is valid
+				FObjectProperty* ArrayEntryProp = CastField<FObjectProperty>(TestProperty->Inner);
+				if ((ArrayEntryProp == nullptr) || !ArrayEntryProp->PropertyClass->IsChildOf<UActorComponent>() || ((TestProperty->PropertyFlags & CPF_Edit) == 0))
+				{
+					continue;
+				}
+
+				// For each object in this array
+				FScriptArrayHelper ArrayHelper(TestProperty, ArrayPropInstAddress);
+				for (int32 ComponentIndex = 0; ComponentIndex < ArrayHelper.Num(); ++ComponentIndex)
+				{
+					// If this object is the native component we are looking for, then we should be allowed to edit it
+					const uint8* ArrayValRawPtr = ArrayHelper.GetRawPtr(ComponentIndex);
+					UObject* ArrayElement = ArrayEntryProp->GetObjectPropertyValue(ArrayValRawPtr);
+
+					if (ArrayElement != nullptr && ArrayElement->GetFName() == NativeComponent->GetFName())
+					{
+						return ArrayEntryProp;
+					}
+				}
+			}
+
+			// Check for map properties as well
+			for (TFieldIterator<FMapProperty> PropIt(OwnerClass, EFieldIteratorFlags::IncludeSuper); PropIt; ++PropIt)
+			{
+				FMapProperty* TestProperty = *PropIt;
+				void* MapPropInstAddress = TestProperty->ContainerPtrToValuePtr<void>(OwnerCDO);
+
+				// Ensure that this property is valid and that it is marked as visible in the editor
+				FObjectProperty* MapValProp = CastField<FObjectProperty>(TestProperty->ValueProp);
+				if ((MapValProp == nullptr) || !MapValProp->PropertyClass->IsChildOf<UActorComponent>() || ((TestProperty->PropertyFlags & CPF_Edit) == 0))
+				{
+					continue;
+				}
+
+				FScriptMapHelper MapHelper(TestProperty, MapPropInstAddress);
+				for (int32 MapSparseIndex = 0; MapSparseIndex < MapHelper.GetMaxIndex(); ++MapSparseIndex)
+				{
+					// For each value in the map (don't bother checking the keys, they won't be what the user can edit in this case)
+					if (MapHelper.IsValidIndex(MapSparseIndex))
+					{
+						const uint8* MapValueData = MapHelper.GetValuePtr(MapSparseIndex);
+						UObject* ValueElement = MapValProp->GetObjectPropertyValue(MapValueData);
+						if (ValueElement != nullptr && ValueElement->GetFName() == NativeComponent->GetFName())
+						{
+							return MapValProp;
+						}
+					}
+				}
+			}
+
+			// Finally we should check for set properties
+			for (TFieldIterator<FSetProperty> PropIt(OwnerClass, EFieldIteratorFlags::IncludeSuper); PropIt; ++PropIt)
+			{
+				FSetProperty* TestProperty = *PropIt;
+				void* SetPropInstAddress = TestProperty->ContainerPtrToValuePtr<void>(OwnerCDO);
+
+				// Ensure that this property is valid and that it is marked visible
+				FObjectProperty* SetValProp = CastField<FObjectProperty>(TestProperty->ElementProp);
+				if ((SetValProp == nullptr) || !SetValProp->PropertyClass->IsChildOf<UActorComponent>() || ((TestProperty->PropertyFlags & CPF_Edit) == 0))
+				{
+					continue;
+				}
+
+				// For each item in the set
+				FScriptSetHelper SetHelper(TestProperty, SetPropInstAddress);
+				for (int32 i = 0; i < SetHelper.Num(); ++i)
+				{
+					if (SetHelper.IsValidIndex(i))
+					{
+						const uint8* SetValData = SetHelper.GetElementPtr(i);
+						UObject* SetValueElem = SetValProp->GetObjectPropertyValue(SetValData);
+
+						if (SetValueElem != nullptr && SetValueElem->GetFName() == NativeComponent->GetFName())
+						{
+							return SetValProp;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return nullptr;
+}
+
+}
+
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentEditorUtils.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentEditorUtils.h
new file mode 100644
index 0000000..1e18973
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentEditorUtils.h
@@ -0,0 +1,159 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Templates/SubclassOf.h"
+#include "Components/ActorComponent.h"
+#include "Engine/EngineTypes.h"
+#include "GameFramework/Actor.h"
+#include "UObject/UObjectHash.h"
+
+namespace soda
+{
+
+class FComponentEditorUtils
+{
+public:
+
+	// Given a template and a property, propagates a default value change to all instances (only if applicable)
+	template<typename T>
+	static void PropagateDefaultValueChange(class USceneComponent* InSceneComponentTemplate, const class FProperty* InProperty, const T& OldDefaultValue, const T& NewDefaultValue, TSet<class USceneComponent*>& UpdatedInstances, int32 PropertyOffset = INDEX_NONE)
+	{
+		TArray<UObject*> ArchetypeInstances;
+		if(InSceneComponentTemplate->HasAnyFlags(RF_ArchetypeObject))
+		{
+			InSceneComponentTemplate->GetArchetypeInstances(ArchetypeInstances);
+			for(int32 InstanceIndex = 0; InstanceIndex < ArchetypeInstances.Num(); ++InstanceIndex)
+			{
+				USceneComponent* InstancedSceneComponent = static_cast<USceneComponent*>(ArchetypeInstances[InstanceIndex]);
+				if(InstancedSceneComponent != nullptr && !UpdatedInstances.Contains(InstancedSceneComponent) && ApplyDefaultValueChange(InstancedSceneComponent, InProperty, OldDefaultValue, NewDefaultValue, PropertyOffset))
+				{
+					UpdatedInstances.Add(InstancedSceneComponent);
+				}
+			}
+		}
+		else if(UObject* Outer = InSceneComponentTemplate->GetOuter())
+		{
+			Outer->GetArchetypeInstances(ArchetypeInstances);
+			for(int32 InstanceIndex = 0; InstanceIndex < ArchetypeInstances.Num(); ++InstanceIndex)
+			{
+				USceneComponent* InstancedSceneComponent = static_cast<USceneComponent*>(FindObjectWithOuter(ArchetypeInstances[InstanceIndex], InSceneComponentTemplate->GetClass(), InSceneComponentTemplate->GetFName()));
+				if(InstancedSceneComponent != nullptr && !UpdatedInstances.Contains(InstancedSceneComponent) && ApplyDefaultValueChange(InstancedSceneComponent, InProperty, OldDefaultValue, NewDefaultValue, PropertyOffset))
+				{
+					UpdatedInstances.Add(InstancedSceneComponent);
+				}
+			}
+		}
+	}
+
+	// Given an instance of a template and a property, set a default value change to the instance (only if applicable)
+	template<typename T>
+	static bool ApplyDefaultValueChange(class USceneComponent* InSceneComponent, const class FProperty* InProperty, const T& OldDefaultValue, const T& NewDefaultValue, int32 PropertyOffset)
+	{
+		check(InProperty != nullptr);
+		check(InSceneComponent != nullptr);
+
+		ensureMsgf(CastField<FBoolProperty>(InProperty) == nullptr, TEXT("ApplyDefaultValueChange cannot be safely called on a bool property with a non-bool value, becuase of bitfields"));
+
+		T* CurrentValue = PropertyOffset == INDEX_NONE ? InProperty->ContainerPtrToValuePtr<T>(InSceneComponent) : (T*)((uint8*)InSceneComponent + PropertyOffset);
+		check(CurrentValue);
+
+		return ApplyDefaultValueChange(InSceneComponent, *CurrentValue, OldDefaultValue, NewDefaultValue);
+	}
+
+	// Bool specialization so it can properly handle bitfields
+	static bool ApplyDefaultValueChange(class USceneComponent* InSceneComponent, const class FProperty* InProperty, const bool& OldDefaultValue, const bool& NewDefaultValue, int32 PropertyOffset)
+	{
+		check(InProperty != nullptr);
+		check(InSceneComponent != nullptr);
+		
+		// Only bool properties can have bool values
+		const FBoolProperty* BoolProperty = CastField<FBoolProperty>(InProperty);
+		check(BoolProperty);
+
+		uint8* CurrentValue = PropertyOffset == INDEX_NONE ? InProperty->ContainerPtrToValuePtr<uint8>(InSceneComponent) : ((uint8*)InSceneComponent + PropertyOffset);
+		check(CurrentValue);
+
+		bool CurrentBool = BoolProperty->GetPropertyValue(CurrentValue);
+		if (ApplyDefaultValueChange(InSceneComponent, CurrentBool, OldDefaultValue, NewDefaultValue, false))
+		{
+			BoolProperty->SetPropertyValue(CurrentValue, CurrentBool);
+
+			InSceneComponent->ReregisterComponent();
+
+			return true;
+		}
+
+		return false;
+	}
+
+	// Given an instance of a template and a current value, propagates a default value change to the instance (only if applicable)
+	template<typename T>
+	static bool ApplyDefaultValueChange(class USceneComponent* InSceneComponent, T& CurrentValue, const T& OldDefaultValue, const T& NewDefaultValue, bool bReregisterComponent = true)
+	{
+		check(InSceneComponent != nullptr);
+
+		// Propagate the change only if the current instanced value matches the previous default value (otherwise this could overwrite any per-instance override)
+		if(NewDefaultValue != OldDefaultValue && CurrentValue == OldDefaultValue)
+		{
+			// Ensure that this instance will be included in any undo/redo operations, and record it into the transaction buffer.
+			// Note: We don't do this for components that originate from script, because they will be re-instanced from the template after an undo, so there is no need to record them.
+			if (!InSceneComponent->IsCreatedByConstructionScript())
+			{
+				InSceneComponent->SetFlags(RF_Transactional);
+				InSceneComponent->Modify();
+			}
+
+			// We must also modify the owner, because we'll need script components to be reconstructed as part of an undo operation.
+			AActor* Owner = InSceneComponent->GetOwner();
+			if(Owner != nullptr)
+			{
+				Owner->Modify();
+			}
+
+			// Modify the value
+			CurrentValue = NewDefaultValue;
+
+			if (bReregisterComponent && InSceneComponent->IsRegistered())
+			{
+				// Re-register the component with the scene so that transforms are updated for display
+				if (InSceneComponent->AllowReregistration())
+				{
+					InSceneComponent->ReregisterComponent();
+				}
+				else
+				{
+					InSceneComponent->UpdateComponentToWorld();
+				}
+			}
+			
+			return true;
+		}
+
+		return false;
+	}
+
+	// Try to find the correct variable name for a given native component template or instance (which can have a mismatch)
+	static FName FindVariableNameGivenComponentInstance(const UActorComponent* ComponentInstance);
+
+	/** Is the instance component is editable */
+	static bool CanEditComponentInstance(const UActorComponent* ActorComp, const UActorComponent* ParentSceneComp, bool bAllowUserContructionScript);
+
+	/**
+	 * Make a FComponentReference from a component pointer.
+	 * @param ExpectedComponentOwner The expected component owner. Should be the same as OwningActor from FComponentReference::GetComponent().
+	 * @param Component The component we would like to initialize the FComponentReference with.
+	 */
+	static FComponentReference MakeComponentReference(const AActor* ExpectedComponentOwner, const UActorComponent* Component);
+
+	/**
+	* Test if the native component is editable. If it is, return a valid pointer to it's FProperty
+	* Otherwise, return nullptr. A native component is editable if it is marked as EditAnywhere
+	* via meta data tags or is within an editable property container
+	*/
+	static FProperty* GetPropertyForEditableNativeComponent(const UActorComponent* NativeComponent);
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentReferenceCustomization.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentReferenceCustomization.cpp
new file mode 100644
index 0000000..c8cc12e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentReferenceCustomization.cpp
@@ -0,0 +1,650 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/ComponentReferenceCustomization.h"
+
+#include "Components/SceneComponent.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "SodaStyleSet.h"
+#include "Engine/LevelScriptActor.h"
+#include "RuntimePropertyEditor/IDetailChildrenBuilder.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+//#include "Kismet2/ComponentEditorUtils.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Styling/SlateIconFinder.h"
+#include "UObject/UObjectIterator.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Layout/SWidgetSwitcher.h"
+#include "Widgets/Text/STextBlock.h"
+
+#include "SodaDetailCustomizations/ComponentEditorUtils.h"
+
+namespace soda
+{
+
+static const FName NAME_AllowAnyActor = "AllowAnyActor";
+static const FName NAME_AllowedClasses = "AllowedClasses";
+static const FName NAME_DisallowedClasses = "DisallowedClasses";
+static const FName NAME_UseComponentPicker = "UseComponentPicker";
+
+#define LOCTEXT_NAMESPACE "ComponentReferenceCustomization"
+
+TSharedRef<IPropertyTypeCustomization> FComponentReferenceCustomization::MakeInstance()
+{
+	return MakeShareable( new FComponentReferenceCustomization);
+}
+
+void FComponentReferenceCustomization::CustomizeHeader(TSharedRef<IPropertyHandle> InPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& CustomizationUtils)
+{
+	PropertyHandle = InPropertyHandle;
+
+	CachedSubobject.Reset();
+	CachedFirstOuterActor.Reset();
+	CachedPropertyAccess = FPropertyAccess::Fail;
+
+	bAllowClear = false;
+	bAllowAnyActor = false;
+	bUseComponentPicker = PropertyHandle->HasMetaData(NAME_UseComponentPicker);
+
+	if (bUseComponentPicker)
+	{
+		FProperty* Property = InPropertyHandle->GetProperty();
+		check(CastField<FStructProperty>(Property) && FComponentReference::StaticStruct() == CastFieldChecked<const FStructProperty>(Property)->Struct);
+
+		bAllowClear = !(InPropertyHandle->GetMetaDataProperty()->PropertyFlags & CPF_NoClear);
+		bAllowAnyActor = InPropertyHandle->HasMetaData(NAME_AllowAnyActor);
+
+		BuildClassFilters();
+		BuildComboBox();
+
+		InPropertyHandle->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(this, &FComponentReferenceCustomization::OnPropertyValueChanged));
+
+		// set cached values
+		{
+			CachedSubobject.Reset();
+			CachedFirstOuterActor = GetFirstOuterActor();
+
+			FComponentReference TmpComponentReference;
+			CachedPropertyAccess = GetValue(TmpComponentReference);
+			if (CachedPropertyAccess == FPropertyAccess::Success)
+			{
+				CachedSubobject = TmpComponentReference.GetComponent(CachedFirstOuterActor.Get());
+				if (!IsComponentReferenceValid(TmpComponentReference))
+				{
+					CachedSubobject.Reset();
+				}
+			}
+		}
+
+		HeaderRow.NameContent()
+		[
+			InPropertyHandle->CreatePropertyNameWidget()
+		]
+		.ValueContent()
+		[
+			SubobjectComboButton.ToSharedRef()
+		]
+		.IsEnabled(MakeAttributeSP(this, &FComponentReferenceCustomization::CanEdit));
+	}
+	else
+	{
+		HeaderRow.NameContent()
+		[
+			InPropertyHandle->CreatePropertyNameWidget()
+		]
+		.ValueContent()
+		[
+			InPropertyHandle->CreatePropertyValueWidget()
+		]
+		.IsEnabled(MakeAttributeSP(this, &FComponentReferenceCustomization::CanEdit));
+	}
+}
+
+void FComponentReferenceCustomization::CustomizeChildren(TSharedRef<IPropertyHandle> InStructPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils)
+{
+	uint32 NumberOfChild;
+	if (InStructPropertyHandle->GetNumChildren(NumberOfChild) == FPropertyAccess::Success)
+	{
+		for (uint32 Index = 0; Index < NumberOfChild; ++Index)
+		{
+			TSharedRef<IPropertyHandle> ChildPropertyHandle = InStructPropertyHandle->GetChildHandle(Index).ToSharedRef();
+			if (bUseComponentPicker)
+			{
+				ChildPropertyHandle->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(this, &FComponentReferenceCustomization::OnPropertyValueChanged));
+				StructBuilder.AddProperty(ChildPropertyHandle)
+					.ShowPropertyButtons(true)
+					.IsEnabled(MakeAttributeSP(this, &FComponentReferenceCustomization::CanEditChildren));
+			}
+			else
+			{
+				StructBuilder.AddProperty(ChildPropertyHandle)
+					.ShowPropertyButtons(true)
+					.IsEnabled(MakeAttributeSP(this, &FComponentReferenceCustomization::CanEditChildren));
+			}
+		}
+	}
+}
+
+void FComponentReferenceCustomization::BuildClassFilters()
+{
+	auto AddToClassFilters = [this](const UClass* Class, TArray<const UClass*>& ActorList, TArray<const UClass*>& ComponentList)
+	{
+		if (bAllowAnyActor && Class->IsChildOf(AActor::StaticClass()))
+		{
+			ActorList.Add(Class);
+		}
+		else if (Class->IsChildOf(UActorComponent::StaticClass()))
+		{
+			ComponentList.Add(Class);
+		}
+	};
+
+	auto ParseClassFilters = [this, AddToClassFilters](const FString& MetaDataString, TArray<const UClass*>& ActorList, TArray<const UClass*>& ComponentList)
+	{
+		if (!MetaDataString.IsEmpty())
+		{
+			TArray<FString> ClassFilterNames;
+			MetaDataString.ParseIntoArrayWS(ClassFilterNames, TEXT(","), true);
+
+			for (const FString& ClassName : ClassFilterNames)
+			{
+				UClass* Class = UClass::TryFindTypeSlow<UClass>(ClassName);
+				if (!Class)
+				{
+					Class = LoadObject<UClass>(nullptr, *ClassName);
+				}
+
+				if (Class)
+				{
+					// If the class is an interface, expand it to be all classes in memory that implement the class.
+					if (Class->HasAnyClassFlags(CLASS_Interface))
+					{
+						for (TObjectIterator<UClass> ClassIt; ClassIt; ++ClassIt)
+						{
+							UClass* const ClassWithInterface = (*ClassIt);
+							if (ClassWithInterface->ImplementsInterface(Class))
+							{
+								AddToClassFilters(ClassWithInterface, ActorList, ComponentList);
+							}
+						}
+					}
+					else
+					{
+						AddToClassFilters(Class, ActorList, ComponentList);
+					}
+				}
+			}
+		}
+	};
+
+	// Account for the allowed classes specified in the property metadata
+	const FString& AllowedClassesFilterString = PropertyHandle->GetMetaData(NAME_AllowedClasses);
+	ParseClassFilters(AllowedClassesFilterString, AllowedActorClassFilters, AllowedComponentClassFilters);
+
+	const FString& DisallowedClassesFilterString = PropertyHandle->GetMetaData(NAME_DisallowedClasses);
+	ParseClassFilters(DisallowedClassesFilterString, DisallowedActorClassFilters, DisallowedComponentClassFilters);
+}
+
+void FComponentReferenceCustomization::BuildComboBox()
+{
+	TAttribute<bool> IsEnabledAttribute(this, &FComponentReferenceCustomization::CanEdit);
+	TAttribute<FText> TooltipAttribute;
+	if (PropertyHandle->GetMetaDataProperty()->HasAnyPropertyFlags(CPF_EditConst | CPF_DisableEditOnTemplate))
+	{
+		TArray<UObject*> ObjectList;
+		PropertyHandle->GetOuterObjects(ObjectList);
+
+		// If there is no objects, that means we must have a struct asset managing this property
+		if (ObjectList.Num() == 0)
+		{
+			IsEnabledAttribute.Set(false);
+			TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplate", "Editing this value in structure's defaults is not allowed"));
+		}
+		else
+		{
+			// Go through all the found objects and see if any are a CDO, we can't set an actor in a CDO default.
+			for (UObject* Obj : ObjectList)
+			{
+				if (Obj->IsTemplate() && !Obj->IsA<ALevelScriptActor>())
+				{
+					IsEnabledAttribute.Set(false);
+					TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplateTooltip", "Editing this value in a Class Default Object is not allowed"));
+					break;
+				}
+
+			}
+		}
+	}
+
+	TSharedRef<SVerticalBox> ObjectContent = SNew(SVerticalBox);
+	if (bAllowAnyActor)
+	{
+		ObjectContent->AddSlot()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.HAlign(HAlign_Left)
+			.VAlign(VAlign_Center)
+			[
+				SNew(SImage)
+				.Image(this, &FComponentReferenceCustomization::GetActorIcon)
+			]
+			+ SHorizontalBox::Slot()
+			.FillWidth(1)
+			.VAlign(VAlign_Center)
+			[
+				// Show the name of the asset or actor
+				SNew(STextBlock)
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+				.Text(this, &FComponentReferenceCustomization::OnGetActorName)
+			]
+		];
+	}
+
+	ObjectContent->AddSlot()
+	[
+		SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		[
+			SNew(SImage)
+			.Image(this, &FComponentReferenceCustomization::GetComponentIcon)
+		]
+		+ SHorizontalBox::Slot()
+		.FillWidth(1)
+		.VAlign(VAlign_Center)
+		[
+			// Show the name of the asset or actor
+			SNew(STextBlock)
+			.Font(IDetailLayoutBuilder::GetDetailFont())
+			.Text(this, &FComponentReferenceCustomization::OnGetSubobjectName)
+		]
+	];
+
+	TSharedRef<SHorizontalBox> ComboButtonContent = SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		[
+			SNew(SImage)
+			.Image(this, &FComponentReferenceCustomization::GetStatusIcon)
+		]
+		+ SHorizontalBox::Slot()
+		.FillWidth(1)
+		.VAlign(VAlign_Center)
+		[
+			ObjectContent
+		];
+
+	SubobjectComboButton = SNew(SComboButton)
+		.ToolTipText(TooltipAttribute)
+		.ButtonStyle(FSodaStyle::Get(), "PropertyEditor.AssetComboStyle")
+		.ForegroundColor(FSodaStyle::GetColor("PropertyEditor.AssetName.ColorAndOpacity"))
+		.OnGetMenuContent(this, &FComponentReferenceCustomization::OnGetMenuContent)
+		.OnMenuOpenChanged(this, &FComponentReferenceCustomization::OnMenuOpenChanged)
+		.IsEnabled(IsEnabledAttribute)
+		.ContentPadding(2.0f)
+		.ButtonContent()
+		[
+			SNew(SWidgetSwitcher)
+			.WidgetIndex(this, &FComponentReferenceCustomization::OnGetComboContentWidgetIndex)
+			+ SWidgetSwitcher::Slot()
+			[
+				SNew(STextBlock)
+				.Text(LOCTEXT("MultipleValuesText", "<multiple values>"))
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+			]
+			+ SWidgetSwitcher::Slot()
+			[
+				ComboButtonContent
+			]
+		];
+}
+
+
+AActor* FComponentReferenceCustomization::GetFirstOuterActor() const
+{
+	TArray<UObject*> ObjectList;
+	PropertyHandle->GetOuterObjects(ObjectList);
+	for (UObject* Obj : ObjectList)
+	{
+		while (Obj)
+		{
+			if (AActor* Actor = Cast<AActor>(Obj))
+			{
+				return Actor;
+			}
+			if (UActorComponent* Component = Cast<UActorComponent>(Obj))
+			{
+				if (Component->GetOwner())
+				{
+					return Component->GetOwner();
+				}
+			}
+			Obj = Obj->GetOuter();
+		}
+	}
+	return nullptr;
+}
+
+void FComponentReferenceCustomization::SetValue(const FComponentReference& Value)
+{
+	SubobjectComboButton->SetIsOpen(false);
+
+	const bool bIsEmpty = Value == FComponentReference();
+	const bool bAllowedToSetBasedOnFilter = IsComponentReferenceValid(Value);
+	if (bIsEmpty || bAllowedToSetBasedOnFilter)
+	{
+		FString TextValue;
+		CastFieldChecked<const FStructProperty>(PropertyHandle->GetProperty())->Struct->ExportText(TextValue, &Value, &Value, nullptr, EPropertyPortFlags::PPF_None, nullptr);
+		ensure(PropertyHandle->SetValueFromFormattedString(TextValue) == FPropertyAccess::Result::Success);
+	}
+}
+
+FPropertyAccess::Result FComponentReferenceCustomization::GetValue(FComponentReference& OutValue) const
+{
+	// Potentially accessing the value while garbage collecting or saving the package could trigger a crash.
+	// so we fail to get the value when that is occurring.
+	if (GIsSavingPackage || IsGarbageCollecting())
+	{
+		return FPropertyAccess::Fail;
+	}
+
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (PropertyHandle.IsValid() && PropertyHandle->IsValidHandle())
+	{
+		TArray<void*> RawData;
+		PropertyHandle->AccessRawData(RawData);
+		UActorComponent* CurrentComponent = nullptr;
+		AActor* CurrentActor = CachedFirstOuterActor.Get();
+		for (const void* RawPtr : RawData)
+		{
+			if (RawPtr)
+			{
+				const FComponentReference& ThisReference = *reinterpret_cast<const FComponentReference*>(RawPtr);
+				if (Result == FPropertyAccess::Success)
+				{
+					if (ThisReference.GetComponent(CurrentActor) != CurrentComponent)
+					{
+						Result = FPropertyAccess::MultipleValues;
+						break;
+					}
+				}
+				else
+				{
+					OutValue = ThisReference;
+					CurrentComponent = OutValue.GetComponent(CurrentActor);
+					Result = FPropertyAccess::Success;
+				}
+			}
+			else if (Result == FPropertyAccess::Success)
+			{
+				Result = FPropertyAccess::MultipleValues;
+				break;
+			}
+		}
+	}
+	return Result;
+}
+
+bool FComponentReferenceCustomization::IsComponentReferenceValid(const FComponentReference& Value) const
+{
+	if (!bAllowAnyActor && Value.OtherActor.IsValid())
+	{
+		return false;
+	}
+
+	AActor* CachedActor = CachedFirstOuterActor.Get();
+	if (UActorComponent* NewComponent = Value.GetComponent(CachedActor))
+	{
+		if (!IsFilteredComponent(NewComponent))
+		{
+			return false;
+		}
+
+
+		if (bAllowAnyActor)
+		{
+			if (NewComponent->GetOwner() == nullptr)
+			{
+				return false;
+			}
+
+
+			TArray<UObject*> ObjectList;
+			PropertyHandle->GetOuterObjects(ObjectList);
+
+			// Is the Outer object in the same world/level
+			for (UObject* Obj : ObjectList)
+			{
+				AActor* Actor = Cast<AActor>(Obj);
+				if (Actor == nullptr)
+				{
+					if (UActorComponent* ActorComponent = Cast<UActorComponent>(Obj))
+					{
+						Actor = ActorComponent->GetOwner();
+					}
+				}
+
+				if (Actor)
+				{
+					if (NewComponent->GetOwner()->GetLevel() != Actor->GetLevel())
+					{
+						return false;
+					}
+				}
+			}
+		}
+	}
+
+	return true;
+}
+
+void FComponentReferenceCustomization::OnPropertyValueChanged()
+{
+	CachedSubobject.Reset();
+	CachedFirstOuterActor = GetFirstOuterActor();
+
+	FComponentReference TmpComponentReference;
+	CachedPropertyAccess = GetValue(TmpComponentReference);
+	if (CachedPropertyAccess == FPropertyAccess::Success)
+	{
+		CachedSubobject = TmpComponentReference.GetComponent(CachedFirstOuterActor.Get());
+		if (!IsComponentReferenceValid(TmpComponentReference))
+		{
+			CachedSubobject.Reset();
+			if (!(TmpComponentReference == FComponentReference()))
+			{
+				SetValue(FComponentReference());
+			}
+		}
+	}
+}
+
+int32 FComponentReferenceCustomization::OnGetComboContentWidgetIndex() const
+{
+	switch (CachedPropertyAccess)
+	{
+	case FPropertyAccess::MultipleValues: return 0;
+	case FPropertyAccess::Success:
+	default:
+		return 1;
+	}
+}
+
+bool FComponentReferenceCustomization::CanEdit() const
+{
+	return PropertyHandle.IsValid() ? !PropertyHandle->IsEditConst() : true;
+}
+
+bool FComponentReferenceCustomization::CanEditChildren() const
+{
+	return CanEdit() && (!bUseComponentPicker || !CachedFirstOuterActor.IsValid());
+}
+
+const FSlateBrush* FComponentReferenceCustomization::GetActorIcon() const
+{
+	if (UActorComponent* Component = CachedSubobject.Get())
+	{
+		if (AActor* Owner = Component->GetOwner())
+		{
+			return FSlateIconFinder::FindIconBrushForClass(Owner->GetClass());
+		}
+	}
+	return FSlateIconFinder::FindIconBrushForClass(AActor::StaticClass());;
+}
+
+FText FComponentReferenceCustomization::OnGetActorName() const
+{
+	if (UActorComponent* Component = CachedSubobject.Get())
+	{
+		if (AActor* Owner = Component->GetOwner())
+		{
+			return FText::FromString(Owner->GetName()); //FText::AsCultureInvariant(Owner->GetActorLabel());
+		}
+	}
+	return LOCTEXT("NoActor", "None");
+}
+
+const FSlateBrush* FComponentReferenceCustomization::GetComponentIcon() const
+{
+	if (const UActorComponent* ActorComponent = CachedSubobject.Get())
+	{
+		return FSlateIconFinder::FindIconBrushForClass(ActorComponent->GetClass());
+	}
+	return FSlateIconFinder::FindIconBrushForClass(UActorComponent::StaticClass());
+}
+
+FText FComponentReferenceCustomization::OnGetSubobjectName() const
+{
+	if (CachedPropertyAccess == FPropertyAccess::Success)
+	{
+		if (UActorComponent* ActorComponent = CachedSubobject.Get())
+		{
+			const FName ComponentName = FComponentEditorUtils::FindVariableNameGivenComponentInstance(ActorComponent);
+			const bool bIsArrayVariable = !ComponentName.IsNone() && ActorComponent->GetOwner() != nullptr && FindFProperty<FArrayProperty>(ActorComponent->GetOwner()->GetClass(), ComponentName);
+
+			if (!ComponentName.IsNone() && !bIsArrayVariable)
+			{
+				return FText::FromName(ComponentName);
+			}
+			return FText::AsCultureInvariant(ActorComponent->GetName());
+		}
+	}
+	else if (CachedPropertyAccess == FPropertyAccess::MultipleValues)
+	{
+		return LOCTEXT("MultipleValues", "Multiple Values");
+	}
+	return LOCTEXT("NoComponent", "None");
+}
+
+const FSlateBrush* FComponentReferenceCustomization::GetStatusIcon() const
+{
+	static FSlateNoResource EmptyBrush = FSlateNoResource();
+
+	if (CachedPropertyAccess == FPropertyAccess::Fail)
+	{
+		return FSodaStyle::GetBrush("Icons.Error");
+	}
+	return &EmptyBrush;
+}
+
+TSharedRef<SWidget> FComponentReferenceCustomization::OnGetMenuContent()
+{
+	UActorComponent* InitialComponent = CachedSubobject.Get();
+
+	return PropertyCustomizationHelpers::MakeComponentPickerWithMenu(InitialComponent
+		, bAllowClear
+		, FOnShouldFilterActor::CreateSP(this, &FComponentReferenceCustomization::IsFilteredActor)
+		, FOnShouldFilterComponent::CreateSP(this, &FComponentReferenceCustomization::IsFilteredComponent)
+		, FOnComponentSelected::CreateSP(this, &FComponentReferenceCustomization::OnComponentSelected)
+		, FSimpleDelegate::CreateSP(this, &FComponentReferenceCustomization::CloseComboButton));
+}
+
+void FComponentReferenceCustomization::OnMenuOpenChanged(bool bOpen)
+{
+	if (!bOpen)
+	{
+		SubobjectComboButton->SetMenuContent(SNullWidget::NullWidget);
+	}
+}
+
+bool FComponentReferenceCustomization::IsFilteredActor(const AActor* const Actor) const
+{
+	return bAllowAnyActor || Actor == CachedFirstOuterActor.Get();
+}
+
+bool FComponentReferenceCustomization::IsFilteredComponent(const UActorComponent* const Component) const
+{
+	const USceneComponent* SceneComp = Cast<USceneComponent>(Component);
+	const USceneComponent* ParentSceneComp = SceneComp != nullptr ? SceneComp->GetAttachParent() : nullptr;
+	const AActor* OuterActor = CachedFirstOuterActor.Get();
+
+	return Component->GetOwner()
+		&& (bAllowAnyActor || Component->GetOwner() == CachedFirstOuterActor.Get())
+		&& (!bAllowAnyActor || (OuterActor && Component->GetOwner()->GetLevel() == OuterActor->GetLevel()))
+		&& FComponentEditorUtils::CanEditComponentInstance(Component, SceneComp, false)
+		&& IsFilteredObject(Component, AllowedComponentClassFilters, DisallowedComponentClassFilters)
+		&& IsFilteredObject(Component->GetOwner(), AllowedActorClassFilters, DisallowedActorClassFilters);
+}
+
+bool FComponentReferenceCustomization::IsFilteredObject(const UObject* const Object, const TArray<const UClass*>& AllowedFilters, const TArray<const UClass*>& DisallowedFilters)
+{
+	bool bAllowedToSetBasedOnFilter = true;
+
+	const UClass* ObjectClass = Object->GetClass();
+	if (AllowedFilters.Num() > 0)
+	{
+		bAllowedToSetBasedOnFilter = false;
+		for (const UClass* AllowedClass : AllowedFilters)
+		{
+			const bool bAllowedClassIsInterface = AllowedClass->HasAnyClassFlags(CLASS_Interface);
+			if (ObjectClass->IsChildOf(AllowedClass) || (bAllowedClassIsInterface && ObjectClass->ImplementsInterface(AllowedClass)))
+			{
+				bAllowedToSetBasedOnFilter = true;
+				break;
+			}
+		}
+	}
+
+	if (DisallowedFilters.Num() > 0 && bAllowedToSetBasedOnFilter)
+	{
+		for (const UClass* DisallowedClass : DisallowedFilters)
+		{
+			const bool bDisallowedClassIsInterface = DisallowedClass->HasAnyClassFlags(CLASS_Interface);
+			if (ObjectClass->IsChildOf(DisallowedClass) || (bDisallowedClassIsInterface && ObjectClass->ImplementsInterface(DisallowedClass)))
+			{
+				bAllowedToSetBasedOnFilter = false;
+				break;
+			}
+		}
+	}
+
+	return bAllowedToSetBasedOnFilter;
+}
+
+void FComponentReferenceCustomization::OnComponentSelected(const UActorComponent* InComponent)
+{
+	SubobjectComboButton->SetIsOpen(false);
+
+	FComponentReference ComponentReference = FComponentEditorUtils::MakeComponentReference(CachedFirstOuterActor.Get(), InComponent);
+	SetValue(ComponentReference);
+}
+
+void FComponentReferenceCustomization::CloseComboButton()
+{
+	SubobjectComboButton->SetIsOpen(false);
+}
+
+} // namespace arival
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentReferenceCustomization.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentReferenceCustomization.h
new file mode 100644
index 0000000..9e298d5
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentReferenceCustomization.h
@@ -0,0 +1,135 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Components/ActorComponent.h"
+#include "Engine/EngineTypes.h"
+#include "GameFramework/Actor.h"
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+#include "RuntimeEditorModule.h"
+
+class SComboButton;
+class SWidget;
+struct FSlateBrush;
+
+namespace soda
+{
+
+class FComponentReferenceCustomization : public IPropertyTypeCustomization
+{
+public:
+	/** Makes a new instance of this customization for a specific detail view requesting it */
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance();
+
+	/** IPropertyTypeCustomization interface */
+	virtual void CustomizeHeader(TSharedRef<class IPropertyHandle> InPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& PropertyTypeCustomizationUtils) override;
+	virtual void CustomizeChildren(TSharedRef<class IPropertyHandle> InPropertyHandle, class IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& PropertyTypeCustomizationUtils) override;
+
+private:
+	/** From the property metadata, build the list of allowed and disallowed class. */
+	void BuildClassFilters();
+
+	/** Build the combobox widget. */
+	void BuildComboBox();
+
+	/**
+	 * From the Detail panel outer hierarchy, find the first actor or component owner we find.
+	 * This is use in case we want only component on the Self actor and to check if we did a cross-level reference.
+	 */
+	AActor* GetFirstOuterActor() const;
+
+	/**
+	 * Set the value of the asset referenced by this property editor.
+	 * Will set the underlying property handle if there is one.
+	 */
+	void SetValue(const FComponentReference& Value);
+
+	/** Get the value referenced by this widget. */
+	FPropertyAccess::Result GetValue(FComponentReference& OutValue) const;
+
+	/** Is the Value valid */
+	bool IsComponentReferenceValid(const FComponentReference& Value) const;
+
+	/** Callback when the property value changed. */
+	void OnPropertyValueChanged();
+
+private:
+	/**
+	 * Return 0, if we have multiple values to edit.
+	 * Return 1, if we display the widget normally.
+	 */
+	int32 OnGetComboContentWidgetIndex() const;
+
+	bool CanEdit() const;
+	bool CanEditChildren() const;
+
+	const FSlateBrush* GetActorIcon() const;
+	FText OnGetActorName() const;
+	const FSlateBrush* GetComponentIcon() const;
+	FText OnGetSubobjectName() const;
+	const FSlateBrush* GetStatusIcon() const;
+
+	/**
+	 * Get the content to be displayed in the asset/actor picker menu
+	 * @returns the widget for the menu content
+	 */
+	TSharedRef<SWidget> OnGetMenuContent();
+
+	/**
+	 * Called when the asset menu is closed, we handle this to force the destruction of the asset menu to
+	 * ensure any settings the user set are saved.
+	 */
+	void OnMenuOpenChanged(bool bOpen);
+
+	/**
+	 * Returns whether the actor/component should be filtered out from selection.
+	 */
+	bool IsFilteredActor(const AActor* const Actor) const;
+	bool IsFilteredComponent(const UActorComponent* const Component) const;
+	static bool IsFilteredObject(const UObject* const Object, const TArray<const UClass*>& AllowedFilters, const TArray<const UClass*>& DisallowedFilters);
+
+	/**
+	 * Delegate for handling selection in the scene outliner.
+	 * @param	InActor	The chosen component
+	 */
+	void OnComponentSelected(const UActorComponent* InComponent);
+
+	/**
+	 * Closes the combo button.
+	 */
+	void CloseComboButton();
+
+private:
+	/** The property handle we are customizing */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+
+	/** Main combo button */
+	TSharedPtr<SComboButton> SubobjectComboButton;
+
+	/** Classes that can be used with this property */
+	TArray<const UClass*> AllowedActorClassFilters;
+	TArray<const UClass*> AllowedComponentClassFilters;
+
+	/** Classes that can NOT be used with this property */
+	TArray<const UClass*> DisallowedActorClassFilters;
+	TArray<const UClass*> DisallowedComponentClassFilters;
+
+	/** Whether the asset can be 'None' in this case */
+	bool bAllowClear;
+
+	/** Can the actor be different/selected */
+	bool bAllowAnyActor;
+
+	/** Do it has the UseComponentPicker metadata */
+	bool bUseComponentPicker;
+
+	/** Cached ComponentReference */
+	TWeakObjectPtr<AActor> CachedFirstOuterActor;
+	TWeakObjectPtr<UActorComponent> CachedSubobject;
+	FPropertyAccess::Result CachedPropertyAccess;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentTransformDetails.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentTransformDetails.cpp
new file mode 100644
index 0000000..0d28524
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentTransformDetails.cpp
@@ -0,0 +1,1499 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/ComponentTransformDetails.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SBoxPanel.h"
+#include "Textures/SlateIcon.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/IDetailChildrenBuilder.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "UObject/UnrealType.h"
+#include "Components/SceneComponent.h"
+#include "GameFramework/Actor.h"
+#include "Misc/ConfigCacheIni.h"
+#include "SlateOptMacros.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBox.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Input/SCheckBox.h"
+//#include "Editor/UnrealEdEngine.h"
+//#include "Kismet2/ComponentEditorUtils.h"
+//#include "Editor.h"
+//#include "UnrealEdGlobals.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+#include "Widgets/Input/SVectorInputBox.h"
+#include "Widgets/Input/SRotatorInputBox.h"
+//#include "ScopedTransaction.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+#include "Math/UnitConversion.h"
+#include "Widgets/Input/NumericUnitTypeInterface.inl"
+//#include "Settings/EditorProjectSettings.h"
+#include "HAL/PlatformApplicationMisc.h"
+#include "Algo/Transform.h"
+#include "Misc/NotifyHook.h"
+
+#include "SodaDetailCustomizations/ComponentEditorUtils.h"
+#include "IEditableObject.h"
+
+#define LOCTEXT_NAMESPACE "FComponentTransformDetails"
+
+namespace soda
+{
+
+/*
+class FScopedSwitchWorldForObject
+{
+public:
+	FScopedSwitchWorldForObject( UObject* Object )
+		: PrevWorld( NULL )
+	{
+		bool bRequiresPlayWorld = false;
+		if( GUnrealEd->PlayWorld && !GIsPlayInEditorWorld )
+		{
+			UPackage* ObjectPackage = Object->GetOutermost();
+			bRequiresPlayWorld = ObjectPackage->HasAnyPackageFlags(PKG_PlayInEditor);
+		}
+
+		if( bRequiresPlayWorld )
+		{
+			PrevWorld = SetPlayInEditorWorld( GUnrealEd->PlayWorld );
+		}
+	}
+
+	~FScopedSwitchWorldForObject()
+	{
+		if( PrevWorld )
+		{
+			RestoreEditorWorld( PrevWorld );
+		}
+	}
+
+private:
+	UWorld* PrevWorld;
+};
+*/
+
+static USceneComponent* GetSceneComponentFromDetailsObject(UObject* InObject)
+{
+	AActor* Actor = Cast<AActor>(InObject);
+	if(Actor)
+	{
+		return Actor->GetRootComponent();
+	}
+	
+	return Cast<USceneComponent>(InObject);
+}
+
+FComponentTransformDetails::FComponentTransformDetails( const TArray< TWeakObjectPtr<UObject> >& InSelectedObjects, /*const FSelectedActorInfo& InSelectedActorInfo,*/ IDetailLayoutBuilder& DetailBuilder)
+	: TNumericUnitTypeInterface(EUnit::Centimeters)
+	//, SelectedActorInfo( InSelectedActorInfo )
+	, SelectedObjects( InSelectedObjects )
+	, NotifyHook( DetailBuilder.GetPropertyUtilities()->GetNotifyHook() )
+	, bPreserveScaleRatio( false )
+	, bEditingRotationInUI( false )
+	, bIsSliderTransaction( false )
+	, HiddenFieldMask( 0 )
+{
+	GConfig->GetBool(TEXT("SelectionDetails"), TEXT("PreserveScaleRatio"), bPreserveScaleRatio, GEditorPerProjectIni);
+	//FCoreUObjectDelegates::OnObjectsReplaced.AddRaw(this, &FComponentTransformDetails::OnObjectsReplaced);
+}
+
+FComponentTransformDetails::~FComponentTransformDetails()
+{
+	//FCoreUObjectDelegates::OnObjectsReplaced.RemoveAll(this);
+}
+
+TSharedRef<SWidget> FComponentTransformDetails::BuildTransformFieldLabel( ETransformField::Type TransformField )
+{
+	FText Label;
+	switch( TransformField )
+	{
+	case ETransformField::Rotation:
+		Label = LOCTEXT( "RotationLabel", "Rotation");
+		break;
+	case ETransformField::Scale:
+		Label = LOCTEXT( "ScaleLabel", "Scale" );
+		break;
+	case ETransformField::Location:
+	default:
+		Label = LOCTEXT("LocationLabel", "Location");
+		break;
+	}
+
+	FMenuBuilder MenuBuilder( true, NULL, NULL );
+
+	FUIAction SetRelativeLocationAction
+	(
+		FExecuteAction::CreateSP( this, &FComponentTransformDetails::OnSetAbsoluteTransform, TransformField, false ),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP( this, &FComponentTransformDetails::IsAbsoluteTransformChecked, TransformField, false )
+	);
+
+	FUIAction SetWorldLocationAction
+	(
+		FExecuteAction::CreateSP( this, &FComponentTransformDetails::OnSetAbsoluteTransform, TransformField, true ),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP( this, &FComponentTransformDetails::IsAbsoluteTransformChecked, TransformField, true )
+	);
+
+	MenuBuilder.BeginSection( TEXT("TransformType"), FText::Format( LOCTEXT("TransformType", "{0} Type"), Label ) );
+
+	MenuBuilder.AddMenuEntry
+	(
+		FText::Format( LOCTEXT( "RelativeLabel", "Relative"), Label ),
+		FText::Format( LOCTEXT( "RelativeLabel_ToolTip", "{0} is relative to its parent"), Label ),
+		FSlateIcon(),
+		SetRelativeLocationAction,
+		NAME_None, 
+		EUserInterfaceActionType::RadioButton
+	);
+
+	MenuBuilder.AddMenuEntry
+	(
+		FText::Format( LOCTEXT( "WorldLabel", "World"), Label ),
+		FText::Format( LOCTEXT( "WorldLabel_ToolTip", "{0} is relative to the world"), Label ),
+		FSlateIcon(),
+		SetWorldLocationAction,
+		NAME_None,
+		EUserInterfaceActionType::RadioButton
+	);
+
+	MenuBuilder.EndSection();
+
+	TSharedRef<SWidget> NameContent =
+		SNew(SComboButton)
+		.ContentPadding(0)
+		.MenuContent()
+		[
+			MenuBuilder.MakeWidget()
+		]
+		.ButtonContent()
+		[
+			SNew( SBox )
+			.Padding( FMargin( 0.0f, 0.0f, 2.0f, 0.0f ) )
+			.MinDesiredWidth(50.f)
+			[
+				SNew(STextBlock)
+				.Text(this, &FComponentTransformDetails::GetTransformFieldText, TransformField)
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+			]
+		];
+
+	if(TransformField == ETransformField::Scale)
+	{
+		NameContent =
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			[
+				NameContent
+			]
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.VAlign(VAlign_Center)
+			.Padding(FMargin(4.0f, 0.0f, 0.0f, 0.0f))
+			[
+				// Add a checkbox to toggle between preserving the ratio of x,y,z components of scale when a value is entered
+				SNew(SCheckBox)
+				.IsChecked(this, &FComponentTransformDetails::IsPreserveScaleRatioChecked)
+				.IsEnabled(this, &FComponentTransformDetails::GetIsEnabled)
+				.OnCheckStateChanged(this, &FComponentTransformDetails::OnPreserveScaleRatioToggled)
+				.Style(FSodaStyle::Get(), "TransparentCheckBox")
+				.ToolTipText(LOCTEXT("PreserveScaleToolTip", "When locked, scales uniformly based on the current xyz scale values so the object maintains its shape in each direction when scaled"))
+				[
+					SNew(SImage)
+					.Image(this, &FComponentTransformDetails::GetPreserveScaleRatioImage)
+					.ColorAndOpacity(FSlateColor::UseForeground())
+				]
+			];
+	}
+
+	return NameContent;
+}
+
+FText FComponentTransformDetails::GetTransformFieldText( ETransformField::Type TransformField ) const
+{
+	switch (TransformField)
+	{
+	case ETransformField::Location:
+		return GetLocationText();
+		break;
+	case ETransformField::Rotation:
+		return GetRotationText();
+		break;
+	case ETransformField::Scale:
+		return GetScaleText();
+		break;
+	default:
+		return FText::GetEmpty();
+		break;
+	}
+}
+
+bool FComponentTransformDetails::OnCanCopy( ETransformField::Type TransformField ) const
+{
+	// We can only copy values if the whole field is set.  If multiple values are defined we do not copy since we are unable to determine the value
+	switch (TransformField)
+	{
+	case ETransformField::Location:
+		return CachedLocation.IsSet();
+		break;
+	case ETransformField::Rotation:
+		return CachedRotation.IsSet();
+		break;
+	case ETransformField::Scale:
+		return CachedScale.IsSet();
+		break;
+	default:
+		return false;
+		break;
+	}
+}
+
+void FComponentTransformDetails::OnCopy( ETransformField::Type TransformField )
+{
+	CacheTransform();
+
+	FString CopyStr;
+	switch (TransformField)
+	{
+	case ETransformField::Location:
+		CopyStr = FString::Printf(TEXT("(X=%f,Y=%f,Z=%f)"), CachedLocation.X.GetValue(), CachedLocation.Y.GetValue(), CachedLocation.Z.GetValue());
+		break;
+	case ETransformField::Rotation:
+		CopyStr = FString::Printf(TEXT("(Pitch=%f,Yaw=%f,Roll=%f)"), CachedRotation.Y.GetValue(), CachedRotation.Z.GetValue(), CachedRotation.X.GetValue());
+		break;
+	case ETransformField::Scale:
+		CopyStr = FString::Printf(TEXT("(X=%f,Y=%f,Z=%f)"), CachedScale.X.GetValue(), CachedScale.Y.GetValue(), CachedScale.Z.GetValue());
+		break;
+	default:
+		break;
+	}
+
+	if( !CopyStr.IsEmpty() )
+	{
+		FPlatformApplicationMisc::ClipboardCopy( *CopyStr );
+	}
+}
+
+void FComponentTransformDetails::OnPaste( ETransformField::Type TransformField )
+{
+	FString PastedText;
+	FPlatformApplicationMisc::ClipboardPaste(PastedText);
+
+	switch (TransformField)
+	{
+		case ETransformField::Location:
+		{
+			FVector Location;
+			if (Location.InitFromString(PastedText))
+			{
+				//FScopedTransaction Transaction(LOCTEXT("PasteLocation", "Paste Location"));
+				OnSetTransform(ETransformField::Location, EAxisList::All, Location, false, true);
+			}
+		}
+		break;
+	case ETransformField::Rotation:
+		{
+			FRotator Rotation;
+			PastedText.ReplaceInline(TEXT("Pitch="), TEXT("P="));
+			PastedText.ReplaceInline(TEXT("Yaw="), TEXT("Y="));
+			PastedText.ReplaceInline(TEXT("Roll="), TEXT("R="));
+			if (Rotation.InitFromString(PastedText))
+			{
+				//FScopedTransaction Transaction(LOCTEXT("PasteRotation", "Paste Rotation"));
+				OnSetTransform(ETransformField::Rotation, EAxisList::All, Rotation.Euler(), false, true);
+			}
+		}
+		break;
+	case ETransformField::Scale:
+		{
+			FVector Scale;
+			if (Scale.InitFromString(PastedText))
+			{
+				//FScopedTransaction Transaction(LOCTEXT("PasteScale", "Paste Scale"));
+				OnSetTransform(ETransformField::Scale, EAxisList::All, Scale, false, true);
+			}
+		}
+		break;
+	default:
+		break;
+	}
+}
+
+FUIAction FComponentTransformDetails::CreateCopyAction( ETransformField::Type TransformField ) const
+{
+	return
+		FUIAction
+		(
+			FExecuteAction::CreateSP(const_cast<FComponentTransformDetails*>(this), &FComponentTransformDetails::OnCopy, TransformField ),
+			FCanExecuteAction::CreateSP(const_cast<FComponentTransformDetails*>(this), &FComponentTransformDetails::OnCanCopy, TransformField )
+		);
+}
+
+FUIAction FComponentTransformDetails::CreatePasteAction( ETransformField::Type TransformField ) const
+{
+	return 
+		 FUIAction( FExecuteAction::CreateSP(const_cast<FComponentTransformDetails*>(this), &FComponentTransformDetails::OnPaste, TransformField ) );
+}
+
+BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
+void FComponentTransformDetails::GenerateChildContent( IDetailChildrenBuilder& ChildrenBuilder )
+{
+	UClass* SceneComponentClass = USceneComponent::StaticClass();
+		
+	FSlateFontInfo FontInfo = IDetailLayoutBuilder::GetDetailFont();
+
+	const bool bHideLocationField = ( HiddenFieldMask & ( 1 << ETransformField::Location ) ) != 0;
+	const bool bHideRotationField = ( HiddenFieldMask & ( 1 << ETransformField::Rotation ) ) != 0;
+	const bool bHideScaleField = ( HiddenFieldMask & ( 1 << ETransformField::Scale ) ) != 0;
+
+	// Location
+	if(!bHideLocationField)
+	{
+		TSharedPtr<INumericTypeInterface<FVector::FReal>> TypeInterface;
+		if( FUnitConversion::Settings().ShouldDisplayUnits() )
+		{
+			TypeInterface = SharedThis(this);
+		}
+
+		ChildrenBuilder.AddCustomRow( LOCTEXT("LocationFilter", "Location") )
+		.RowTag("Location")
+		.CopyAction( CreateCopyAction( ETransformField::Location ) )
+		.PasteAction( CreatePasteAction( ETransformField::Location ) )
+		.OverrideResetToDefault(FResetToDefaultOverride::Create(TAttribute<bool>(this, &FComponentTransformDetails::GetLocationResetVisibility), FSimpleDelegate::CreateSP(this, &FComponentTransformDetails::OnLocationResetClicked)))
+		.PropertyHandleList({ GeneratePropertyHandle(USceneComponent::GetRelativeLocationPropertyName(), ChildrenBuilder) })
+		.NameContent()
+		.VAlign(VAlign_Center)
+		[
+			BuildTransformFieldLabel( ETransformField::Location )
+		]
+		.ValueContent()
+		.MinDesiredWidth(125.0f * 3.0f)
+		.MaxDesiredWidth(125.0f * 3.0f)
+		.VAlign(VAlign_Center)
+		[
+			SNew(SNumericVectorInputBox<FVector::FReal>)
+			.X(this, &FComponentTransformDetails::GetLocationX)
+			.Y(this, &FComponentTransformDetails::GetLocationY)
+			.Z(this, &FComponentTransformDetails::GetLocationZ)
+			.bColorAxisLabels(true)
+			.IsEnabled(this, &FComponentTransformDetails::GetIsEnabled)
+			.OnXChanged(this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Location, EAxisList::X, false)
+			.OnYChanged(this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Location, EAxisList::Y, false)
+			.OnZChanged(this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Location, EAxisList::Z, false)
+			.OnXCommitted(this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Location, EAxisList::X, true)
+			.OnYCommitted(this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Location, EAxisList::Y, true)
+			.OnZCommitted(this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Location, EAxisList::Z, true)
+			.Font(FontInfo)
+			.TypeInterface(TypeInterface)
+			.AllowSpin(SelectedObjects.Num() == 1)
+			.SpinDelta(1)
+			.OnBeginSliderMovement(this, &FComponentTransformDetails::OnBeginLocationSlider)
+			.OnEndSliderMovement(this, &FComponentTransformDetails::OnEndLocationSlider)
+		];
+	}
+	
+	// Rotation
+	if(!bHideRotationField)
+	{
+		TSharedPtr<INumericTypeInterface<FRotator::FReal>> TypeInterface;
+		if( FUnitConversion::Settings().ShouldDisplayUnits() )
+		{
+			TypeInterface = MakeShareable( new TNumericUnitTypeInterface<FRotator::FReal>(EUnit::Degrees) );
+		}
+
+		ChildrenBuilder.AddCustomRow( LOCTEXT("RotationFilter", "Rotation") )
+		.RowTag("Rotation")
+		.CopyAction( CreateCopyAction(ETransformField::Rotation) )
+		.PasteAction( CreatePasteAction(ETransformField::Rotation) )
+		.OverrideResetToDefault(FResetToDefaultOverride::Create(TAttribute<bool>(this, &FComponentTransformDetails::GetRotationResetVisibility), FSimpleDelegate::CreateSP(this, &FComponentTransformDetails::OnRotationResetClicked)))
+		.PropertyHandleList({ GeneratePropertyHandle(USceneComponent::GetRelativeRotationPropertyName(), ChildrenBuilder) })
+		.NameContent()
+		.VAlign(VAlign_Center)
+		[
+			BuildTransformFieldLabel(ETransformField::Rotation)
+		]
+		.ValueContent()
+		.MinDesiredWidth(125.0f * 3.0f)
+		.MaxDesiredWidth(125.0f * 3.0f)
+		.VAlign(VAlign_Center)
+		[
+			SNew( SNumericRotatorInputBox<FRotator::FReal> )
+			.AllowSpin( SelectedObjects.Num() == 1 ) 
+			.Roll( this, &FComponentTransformDetails::GetRotationX )
+			.Pitch( this, &FComponentTransformDetails::GetRotationY )
+			.Yaw( this, &FComponentTransformDetails::GetRotationZ )
+			.bColorAxisLabels( true )
+			.IsEnabled( this, &FComponentTransformDetails::GetIsEnabled )
+			.OnBeginSliderMovement( this, &FComponentTransformDetails::OnBeginRotationSlider )
+			.OnEndSliderMovement( this, &FComponentTransformDetails::OnEndRotationSlider )
+			.OnRollChanged( this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Rotation, EAxisList::X, false )
+			.OnPitchChanged( this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Rotation, EAxisList::Y, false )
+			.OnYawChanged( this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Rotation, EAxisList::Z, false )
+			.OnRollCommitted( this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Rotation, EAxisList::X, true )
+			.OnPitchCommitted( this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Rotation, EAxisList::Y, true )
+			.OnYawCommitted( this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Rotation, EAxisList::Z, true )
+			.TypeInterface( TypeInterface )
+			.Font( FontInfo )
+		];
+	}
+	
+	// Scale
+	if(!bHideScaleField)
+	{
+		ChildrenBuilder.AddCustomRow( LOCTEXT("ScaleFilter", "Scale") )
+		.RowTag("Scale")
+		.CopyAction( CreateCopyAction(ETransformField::Scale) )
+		.PasteAction( CreatePasteAction(ETransformField::Scale) )
+		.OverrideResetToDefault(FResetToDefaultOverride::Create(TAttribute<bool>(this, &FComponentTransformDetails::GetScaleResetVisibility), FSimpleDelegate::CreateSP(this, &FComponentTransformDetails::OnScaleResetClicked)))
+		.PropertyHandleList({ GeneratePropertyHandle(USceneComponent::GetRelativeScale3DPropertyName(), ChildrenBuilder) })
+		.NameContent()
+		.VAlign(VAlign_Center)
+		[
+			BuildTransformFieldLabel(ETransformField::Scale)
+		]
+		.ValueContent()
+		.MinDesiredWidth(125.0f * 3.0f)
+		.MaxDesiredWidth(125.0f * 3.0f)
+		.VAlign(VAlign_Center)
+		[
+			SNew( SNumericVectorInputBox<FVector::FReal> )
+			.X( this, &FComponentTransformDetails::GetScaleX )
+			.Y( this, &FComponentTransformDetails::GetScaleY )
+			.Z( this, &FComponentTransformDetails::GetScaleZ )
+			.bColorAxisLabels( true )
+			.IsEnabled( this, &FComponentTransformDetails::GetIsEnabled )
+			.OnXChanged( this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Scale, EAxisList::X, false )
+			.OnYChanged( this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Scale, EAxisList::Y, false )
+			.OnZChanged( this, &FComponentTransformDetails::OnSetTransformAxis, ETextCommit::Default, ETransformField::Scale, EAxisList::Z, false )
+			.OnXCommitted( this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Scale, EAxisList::X, true )
+			.OnYCommitted( this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Scale, EAxisList::Y, true )
+			.OnZCommitted( this, &FComponentTransformDetails::OnSetTransformAxis, ETransformField::Scale, EAxisList::Z, true )
+			.ContextMenuExtenderX( this, &FComponentTransformDetails::ExtendXScaleContextMenu )
+			.ContextMenuExtenderY( this, &FComponentTransformDetails::ExtendYScaleContextMenu )
+			.ContextMenuExtenderZ( this, &FComponentTransformDetails::ExtendZScaleContextMenu )
+			.Font( FontInfo )
+			.AllowSpin( SelectedObjects.Num() == 1 )
+			.SpinDelta( 0.0025f )
+			.OnBeginSliderMovement( this, &FComponentTransformDetails::OnBeginScaleSlider )
+			.OnEndSliderMovement(this, &FComponentTransformDetails::OnEndScaleSlider)
+		];
+	}
+}
+END_SLATE_FUNCTION_BUILD_OPTIMIZATION
+
+void FComponentTransformDetails::Tick( float DeltaTime ) 
+{
+	CacheTransform();
+	if (!FixedDisplayUnits.IsSet())
+	{
+		CacheCommonLocationUnits();
+	}
+}
+
+void FComponentTransformDetails::CacheCommonLocationUnits()
+{
+	float LargestValue = 0.f;
+	if (CachedLocation.X.IsSet() && CachedLocation.X.GetValue() > LargestValue)
+	{
+		LargestValue = CachedLocation.X.GetValue();
+	}
+	if (CachedLocation.Y.IsSet() && CachedLocation.Y.GetValue() > LargestValue)
+	{
+		LargestValue = CachedLocation.Y.GetValue();
+	}
+	if (CachedLocation.Z.IsSet() && CachedLocation.Z.GetValue() > LargestValue)
+	{
+		LargestValue = CachedLocation.Z.GetValue();
+	}
+
+	SetupFixedDisplay(LargestValue);
+}
+
+TSharedPtr<IPropertyHandle> FComponentTransformDetails::GeneratePropertyHandle(FName PropertyName, IDetailChildrenBuilder& ChildrenBuilder)
+{
+	// Try finding the property handle in the details panel's property map first.
+	IDetailLayoutBuilder& LayoutBuilder = ChildrenBuilder.GetParentCategory().GetParentLayout();
+	TSharedPtr<IPropertyHandle> PropertyHandle = LayoutBuilder.GetProperty(PropertyName, USceneComponent::StaticClass());
+	if (!PropertyHandle || !PropertyHandle->IsValidHandle())
+	{
+		// If it wasn't found, add a collapsed row which contains the property node.
+		TArray<UObject*> SceneComponents;
+		Algo::Transform(SelectedObjects, SceneComponents, [](TWeakObjectPtr<UObject> Obj) { return GetSceneComponentFromDetailsObject(Obj.Get()); });
+		PropertyHandle = LayoutBuilder.AddObjectPropertyData(SceneComponents, PropertyName);
+		CachedHandlesObjects.Append(SceneComponents);
+	}
+
+	PropertyHandles.Add(PropertyHandle);
+	return PropertyHandle;
+}
+
+void FComponentTransformDetails::UpdatePropertyHandlesObjects(const TArray<UObject*> NewSceneComponents)
+{
+	// Cached the old handles objects.
+	CachedHandlesObjects.Reset(NewSceneComponents.Num());
+	Algo::Transform(NewSceneComponents, CachedHandlesObjects, [](UObject* Obj) { return TWeakObjectPtr<UObject>(Obj); });
+
+	for (TSharedPtr<IPropertyHandle>& Handle : PropertyHandles)
+	{
+		if (Handle && Handle->IsValidHandle())
+		{
+			Handle->ReplaceOuterObjects(NewSceneComponents);
+		}
+	}
+}
+
+bool FComponentTransformDetails::GetIsEnabled() const
+{
+	return true; //!GEditor->HasLockedActors() || SelectedActorInfo.NumSelected == 0;
+}
+
+const FSlateBrush* FComponentTransformDetails::GetPreserveScaleRatioImage() const
+{
+	return bPreserveScaleRatio ? FSodaStyle::GetBrush( TEXT("Icons.Lock") ) : FSodaStyle::GetBrush( TEXT("Icons.Unlock") ) ;
+}
+
+ECheckBoxState FComponentTransformDetails::IsPreserveScaleRatioChecked() const
+{
+	return bPreserveScaleRatio ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+}
+
+void FComponentTransformDetails::OnPreserveScaleRatioToggled( ECheckBoxState NewState )
+{
+	//bPreserveScaleRatio = (NewState == ECheckBoxState::Checked) ? true : false;
+	//GConfig->SetBool(TEXT("SelectionDetails"), TEXT("PreserveScaleRatio"), bPreserveScaleRatio, GEditorPerProjectIni);
+}
+
+FText FComponentTransformDetails::GetLocationText() const
+{
+	return bAbsoluteLocation ? LOCTEXT( "AbsoluteLocation", "Absolute Location" ) : LOCTEXT( "Location", "Location" );
+}
+
+FText FComponentTransformDetails::GetRotationText() const
+{
+	return bAbsoluteRotation ? LOCTEXT( "AbsoluteRotation", "Absolute Rotation" ) : LOCTEXT( "Rotation", "Rotation" );
+}
+
+FText FComponentTransformDetails::GetScaleText() const
+{
+	return bAbsoluteScale ? LOCTEXT( "AbsoluteScale", "Absolute Scale" ) : LOCTEXT( "Scale", "Scale" );
+}
+
+void FComponentTransformDetails::OnSetAbsoluteTransform(ETransformField::Type TransformField, bool bAbsoluteEnabled)
+{
+	FBoolProperty* AbsoluteProperty = nullptr;
+	FText TransactionText;
+
+	switch (TransformField)
+	{
+	case ETransformField::Location:
+		AbsoluteProperty = FindFProperty<FBoolProperty>(USceneComponent::StaticClass(), USceneComponent::GetAbsoluteLocationPropertyName());
+		TransactionText = LOCTEXT("ToggleAbsoluteLocation", "Toggle Absolute Location");
+		break;
+	case ETransformField::Rotation:
+		AbsoluteProperty = FindFProperty<FBoolProperty>(USceneComponent::StaticClass(), USceneComponent::GetAbsoluteRotationPropertyName());
+		TransactionText = LOCTEXT("ToggleAbsoluteRotation", "Toggle Absolute Rotation");
+		break;
+	case ETransformField::Scale:
+		AbsoluteProperty = FindFProperty<FBoolProperty>(USceneComponent::StaticClass(), USceneComponent::GetAbsoluteScalePropertyName());
+		TransactionText = LOCTEXT("ToggleAbsoluteScale", "Toggle Absolute Scale");
+		break;
+	default:
+		return;
+	}
+
+	bool bBeganTransaction = false;
+	TArray<UObject*> ModifiedObjects;
+	for (int32 ObjectIndex = 0; ObjectIndex < SelectedObjects.Num(); ++ObjectIndex)
+	{
+		TWeakObjectPtr<UObject> ObjectPtr = SelectedObjects[ObjectIndex];
+		if (ObjectPtr.IsValid())
+		{
+			UObject* Object = ObjectPtr.Get();
+			USceneComponent* SceneComponent = GetSceneComponentFromDetailsObject(Object);
+			if (SceneComponent)
+			{
+				bool bOldValue = TransformField == ETransformField::Location ? SceneComponent->IsUsingAbsoluteLocation() : (TransformField == ETransformField::Rotation ? SceneComponent->IsUsingAbsoluteRotation() : SceneComponent->IsUsingAbsoluteScale());
+
+				if (bOldValue == bAbsoluteEnabled)
+				{
+					// Already the desired value
+					continue;
+				}
+
+				if (!bBeganTransaction)
+				{
+					// NOTE: One transaction per change, not per actor
+					//GEditor->BeginTransaction(TransactionText);
+					bBeganTransaction = true;
+				}
+
+				//FScopedSwitchWorldForObject WorldSwitcher(Object);
+
+				if (SceneComponent->HasAnyFlags(RF_DefaultSubObject))
+				{
+					// Default subobjects must be included in any undo/redo operations
+					SceneComponent->SetFlags(RF_Transactional);
+				}
+
+				//SceneComponent->PreEditChange(AbsoluteProperty);
+				if (IEditableObject* EditableObject = Cast<IEditableObject>(SceneComponent))
+				{
+					EditableObject->RuntimePreEditChange(AbsoluteProperty);
+				}
+
+				if (NotifyHook)
+				{
+					NotifyHook->NotifyPreChange(AbsoluteProperty);
+				}
+
+				switch (TransformField)
+				{
+				case ETransformField::Location:
+					SceneComponent->SetUsingAbsoluteLocation(bAbsoluteEnabled);
+
+					// Update RelativeLocation to maintain/stabilize position when switching between relative and world.
+					if (SceneComponent->GetAttachParent())
+					{
+						if (SceneComponent->IsUsingAbsoluteLocation())
+						{
+							SceneComponent->SetRelativeLocation_Direct(SceneComponent->GetComponentTransform().GetTranslation());
+						}
+						else
+						{
+							FTransform ParentToWorld = SceneComponent->GetAttachParent()->GetSocketTransform(SceneComponent->GetAttachSocketName());
+							FTransform RelativeTM = SceneComponent->GetComponentTransform().GetRelativeTransform(ParentToWorld);
+							SceneComponent->SetRelativeLocation_Direct(RelativeTM.GetTranslation());
+						}
+					}
+					break;
+				case ETransformField::Rotation:
+					SceneComponent->SetUsingAbsoluteRotation(bAbsoluteEnabled);
+					break;
+				case ETransformField::Scale:
+					SceneComponent->SetUsingAbsoluteScale(bAbsoluteEnabled);
+					break;
+				}
+
+				ModifiedObjects.Add(Object);
+			}
+		}
+	}
+
+	if (bBeganTransaction)
+	{
+		FPropertyChangedEvent PropertyChangedEvent(AbsoluteProperty, EPropertyChangeType::ValueSet, MakeArrayView(ModifiedObjects));
+
+		for (UObject* Object : ModifiedObjects)
+		{
+			USceneComponent* SceneComponent = GetSceneComponentFromDetailsObject(Object);
+			if (SceneComponent)
+			{
+				//SceneComponent->PostEditChangeProperty(PropertyChangedEvent);
+				if (IEditableObject* EditableObject = Cast<IEditableObject>(SceneComponent))
+				{
+					EditableObject->RuntimePostEditChangeProperty(PropertyChangedEvent);
+				}
+
+				// If it's a template, propagate the change out to any current instances of the object
+				if (SceneComponent->IsTemplate())
+				{
+					bool NewValue = bAbsoluteEnabled;
+					bool OldValue = !NewValue;
+					TSet<USceneComponent*> UpdatedInstances;
+					FComponentEditorUtils::PropagateDefaultValueChange(SceneComponent, AbsoluteProperty, OldValue, NewValue, UpdatedInstances);
+				}
+			}
+		}
+
+		if (NotifyHook)
+		{
+			NotifyHook->NotifyPostChange(PropertyChangedEvent, AbsoluteProperty);
+		}
+
+		//GEditor->EndTransaction();
+
+		//GUnrealEd->RedrawLevelEditingViewports();
+	}
+}
+
+bool FComponentTransformDetails::IsAbsoluteTransformChecked(ETransformField::Type TransformField, bool bAbsoluteEnabled) const
+{
+	switch (TransformField)
+	{
+	case ETransformField::Location:
+		return bAbsoluteLocation == bAbsoluteEnabled;
+		break;
+	case ETransformField::Rotation:
+		return bAbsoluteRotation == bAbsoluteEnabled;
+		break;
+	case ETransformField::Scale:
+		return bAbsoluteScale == bAbsoluteEnabled;
+		break;
+	default:
+		return false;
+		break;
+	}
+}
+
+struct FGetRootComponentArchetype
+{
+	static USceneComponent* Get(UObject* Object)
+	{
+		auto RootComponent = Object ? GetSceneComponentFromDetailsObject(Object) : nullptr;
+		return RootComponent ? Cast<USceneComponent>(RootComponent->GetArchetype()) : nullptr;
+	}
+};
+
+bool FComponentTransformDetails::GetLocationResetVisibility() const
+{
+	const USceneComponent* Archetype = FGetRootComponentArchetype::Get(SelectedObjects[0].Get());
+	const FVector Data = Archetype ? Archetype->GetRelativeLocation() : FVector::ZeroVector;
+
+	// unset means multiple differing values, so show "Reset to Default" in that case
+	return CachedLocation.IsSet() && CachedLocation.X.GetValue() == Data.X && CachedLocation.Y.GetValue() == Data.Y && CachedLocation.Z.GetValue() == Data.Z ? false : true;
+}
+
+void FComponentTransformDetails::OnLocationResetClicked()
+{
+	const FText TransactionName = LOCTEXT("ResetLocation", "Reset Location");
+	//FScopedTransaction Transaction(TransactionName);
+
+	const USceneComponent* Archetype = FGetRootComponentArchetype::Get(SelectedObjects[0].Get());
+	const FVector Data = Archetype ? Archetype->GetRelativeLocation() : FVector::ZeroVector;
+
+	OnSetTransform(ETransformField::Location, EAxisList::All, Data, false, true);
+}
+
+bool FComponentTransformDetails::GetRotationResetVisibility() const
+{
+	const USceneComponent* Archetype = FGetRootComponentArchetype::Get(SelectedObjects[0].Get());
+	const FVector Data = Archetype ? Archetype->GetRelativeRotation().Euler() : FVector::ZeroVector;
+
+	// unset means multiple differing values, so show "Reset to Default" in that case
+	return CachedRotation.IsSet() && CachedRotation.X.GetValue() == Data.X && CachedRotation.Y.GetValue() == Data.Y && CachedRotation.Z.GetValue() == Data.Z ? false : true;
+}
+
+void FComponentTransformDetails::OnRotationResetClicked()
+{
+	const FText TransactionName = LOCTEXT("ResetRotation", "Reset Rotation");
+	//FScopedTransaction Transaction(TransactionName);
+
+	const USceneComponent* Archetype = FGetRootComponentArchetype::Get(SelectedObjects[0].Get());
+	const FVector Data = Archetype ? Archetype->GetRelativeRotation().Euler() : FVector::ZeroVector;
+
+	OnSetTransform(ETransformField::Rotation, EAxisList::All, Data, false, true);
+}
+
+bool FComponentTransformDetails::GetScaleResetVisibility() const
+{
+	const USceneComponent* Archetype = FGetRootComponentArchetype::Get(SelectedObjects[0].Get());
+	const FVector Data = Archetype ? Archetype->GetRelativeScale3D() : FVector(1.0f);
+
+	// unset means multiple differing values, so show "Reset to Default" in that case
+	return CachedScale.IsSet() && CachedScale.X.GetValue() == Data.X && CachedScale.Y.GetValue() == Data.Y && CachedScale.Z.GetValue() == Data.Z ? false : true;
+}
+
+void FComponentTransformDetails::OnScaleResetClicked()
+{
+	const FText TransactionName = LOCTEXT("ResetScale", "Reset Scale");
+	//FScopedTransaction Transaction(TransactionName);
+
+	const USceneComponent* Archetype = FGetRootComponentArchetype::Get(SelectedObjects[0].Get());
+	const FVector Data = Archetype ? Archetype->GetRelativeScale3D() : FVector(1.0f);
+
+	OnSetTransform(ETransformField::Scale, EAxisList::All, Data, false, true);
+}
+
+void FComponentTransformDetails::ExtendXScaleContextMenu( FMenuBuilder& MenuBuilder )
+{
+	MenuBuilder.BeginSection( "ScaleOperations", LOCTEXT( "ScaleOperations", "Scale Operations" ) );
+	MenuBuilder.AddMenuEntry( 
+		LOCTEXT( "MirrorValueX", "Mirror X" ),  
+		LOCTEXT( "MirrorValueX_Tooltip", "Mirror scale value on the X axis" ), 
+		FSlateIcon(), 		
+		FUIAction( FExecuteAction::CreateSP( this, &FComponentTransformDetails::OnXScaleMirrored ), FCanExecuteAction() )
+	);
+	MenuBuilder.EndSection();
+}
+
+void FComponentTransformDetails::ExtendYScaleContextMenu( FMenuBuilder& MenuBuilder )
+{
+	MenuBuilder.BeginSection( "ScaleOperations", LOCTEXT( "ScaleOperations", "Scale Operations" ) );
+	MenuBuilder.AddMenuEntry( 
+		LOCTEXT( "MirrorValueY", "Mirror Y" ),  
+		LOCTEXT( "MirrorValueY_Tooltip", "Mirror scale value on the Y axis" ), 
+		FSlateIcon(), 		
+		FUIAction( FExecuteAction::CreateSP( this, &FComponentTransformDetails::OnYScaleMirrored ), FCanExecuteAction() )
+	);
+	MenuBuilder.EndSection();
+}
+
+void FComponentTransformDetails::ExtendZScaleContextMenu( FMenuBuilder& MenuBuilder )
+{
+	MenuBuilder.BeginSection( "ScaleOperations", LOCTEXT( "ScaleOperations", "Scale Operations" ) );
+	MenuBuilder.AddMenuEntry( 
+		LOCTEXT( "MirrorValueZ", "Mirror Z" ),  
+		LOCTEXT( "MirrorValueZ_Tooltip", "Mirror scale value on the Z axis" ), 
+		FSlateIcon(), 		
+		FUIAction( FExecuteAction::CreateSP( this, &FComponentTransformDetails::OnZScaleMirrored ), FCanExecuteAction() )
+	);
+	MenuBuilder.EndSection();
+}
+
+void FComponentTransformDetails::OnXScaleMirrored()
+{
+	FSlateApplication::Get().ClearKeyboardFocus(EFocusCause::Mouse);
+	//FScopedTransaction Transaction(LOCTEXT("MirrorActorScaleX", "Mirror actor scale X"));
+	OnSetTransform(ETransformField::Scale, EAxisList::X, FVector(1.0f), true, true);
+}
+
+void FComponentTransformDetails::OnYScaleMirrored()
+{
+	FSlateApplication::Get().ClearKeyboardFocus(EFocusCause::Mouse);
+	//FScopedTransaction Transaction(LOCTEXT("MirrorActorScaleY", "Mirror actor scale Y"));
+	OnSetTransform(ETransformField::Scale, EAxisList::Y, FVector(1.0f), true, true);
+}
+
+void FComponentTransformDetails::OnZScaleMirrored()
+{
+	FSlateApplication::Get().ClearKeyboardFocus(EFocusCause::Mouse);
+	//FScopedTransaction Transaction(LOCTEXT("MirrorActorScaleZ", "Mirror actor scale Z"));
+	OnSetTransform(ETransformField::Scale, EAxisList::Z, FVector(1.0f), true, true);
+}
+
+void FComponentTransformDetails::CacheTransform()
+{
+	FVector CurLoc;
+	FRotator CurRot;
+	FVector CurScale;
+
+	for( int32 ObjectIndex = 0; ObjectIndex < SelectedObjects.Num(); ++ObjectIndex )
+	{
+		TWeakObjectPtr<UObject> ObjectPtr = SelectedObjects[ObjectIndex];
+		if( ObjectPtr.IsValid() )
+		{
+			UObject* Object = ObjectPtr.Get();
+			USceneComponent* SceneComponent = GetSceneComponentFromDetailsObject( Object );
+
+			FVector Loc;
+			FRotator Rot;
+			FVector Scale;
+			if( SceneComponent )
+			{
+				Loc = SceneComponent->GetRelativeLocation();
+				FRotator* FoundRotator = ObjectToRelativeRotationMap.Find(SceneComponent);
+				Rot = (bEditingRotationInUI && !Object->IsTemplate() && FoundRotator) ? *FoundRotator : SceneComponent->GetRelativeRotation();
+				Scale = SceneComponent->GetRelativeScale3D();
+
+				if( ObjectIndex == 0 )
+				{
+					// Cache the current values from the first actor to see if any values differ among other actors
+					CurLoc = Loc;
+					CurRot = Rot;
+					CurScale = Scale;
+
+					CachedLocation.Set( Loc );
+					CachedRotation.Set( Rot );
+					CachedScale.Set( Scale );
+
+					bAbsoluteLocation = SceneComponent->IsUsingAbsoluteLocation();
+					bAbsoluteScale = SceneComponent->IsUsingAbsoluteScale();
+					bAbsoluteRotation = SceneComponent->IsUsingAbsoluteRotation();
+				}
+				else if( CurLoc != Loc || CurRot != Rot || CurScale != Scale )
+				{
+					// Check which values differ and unset the different values
+					CachedLocation.X = Loc.X == CurLoc.X && CachedLocation.X.IsSet() ? Loc.X : TOptional<FVector::FReal>();
+					CachedLocation.Y = Loc.Y == CurLoc.Y && CachedLocation.Y.IsSet() ? Loc.Y : TOptional<FVector::FReal>();
+					CachedLocation.Z = Loc.Z == CurLoc.Z && CachedLocation.Z.IsSet() ? Loc.Z : TOptional<FVector::FReal>();
+
+					CachedRotation.X = Rot.Roll == CurRot.Roll && CachedRotation.X.IsSet() ? Rot.Roll : TOptional<FRotator::FReal>();
+					CachedRotation.Y = Rot.Pitch == CurRot.Pitch && CachedRotation.Y.IsSet() ? Rot.Pitch : TOptional<FRotator::FReal>();
+					CachedRotation.Z = Rot.Yaw == CurRot.Yaw && CachedRotation.Z.IsSet() ? Rot.Yaw : TOptional<FRotator::FReal>();
+
+					CachedScale.X = Scale.X == CurScale.X && CachedScale.X.IsSet() ? Scale.X : TOptional<FVector::FReal>();
+					CachedScale.Y = Scale.Y == CurScale.Y && CachedScale.Y.IsSet() ? Scale.Y : TOptional<FVector::FReal>();
+					CachedScale.Z = Scale.Z == CurScale.Z && CachedScale.Z.IsSet() ? Scale.Z : TOptional<FVector::FReal>();
+
+					// If all values are unset all values are different and we can stop looking
+					const bool bAllValuesDiffer = !CachedLocation.IsSet() && !CachedRotation.IsSet() && !CachedScale.IsSet();
+					if( bAllValuesDiffer )
+					{
+						break;
+					}
+				}
+			}
+		}
+	}
+}
+
+FVector FComponentTransformDetails::GetAxisFilteredVector(EAxisList::Type Axis, const FVector& NewValue, const FVector& OldValue)
+{
+	return FVector((Axis & EAxisList::X) ? NewValue.X : OldValue.X,
+		(Axis & EAxisList::Y) ? NewValue.Y : OldValue.Y,
+		(Axis & EAxisList::Z) ? NewValue.Z : OldValue.Z);
+}
+
+void FComponentTransformDetails::OnSetTransform(ETransformField::Type TransformField, EAxisList::Type Axis, FVector NewValue, bool bMirror, bool bCommitted)
+{
+	if (!bCommitted && SelectedObjects.Num() > 1)
+	{
+		// Ignore interactive changes when we have more than one selected object
+		return;
+	}
+
+	FText TransactionText;
+	FProperty* ValueProperty = nullptr;
+	FProperty* AxisProperty = nullptr;
+	
+	switch (TransformField)
+	{
+	case ETransformField::Location:
+		TransactionText = LOCTEXT("OnSetLocation", "Set Location");
+		ValueProperty = FindFProperty<FProperty>(USceneComponent::StaticClass(), USceneComponent::GetRelativeLocationPropertyName());
+		
+		// Only set axis property for single axis set
+		if (Axis == EAxisList::X)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FVector>::Get(), GET_MEMBER_NAME_CHECKED(FVector, X));
+		}
+		else if (Axis == EAxisList::Y)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FVector>::Get(), GET_MEMBER_NAME_CHECKED(FVector, Y));
+		}
+		else if (Axis == EAxisList::Z)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FVector>::Get(), GET_MEMBER_NAME_CHECKED(FVector, Z));
+		}
+		break;
+	case ETransformField::Rotation:
+		TransactionText = LOCTEXT("OnSetRotation", "Set Rotation");
+		ValueProperty = FindFProperty<FProperty>(USceneComponent::StaticClass(), USceneComponent::GetRelativeRotationPropertyName());
+		
+		// Only set axis property for single axis set
+		if (Axis == EAxisList::X)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FRotator>::Get(), GET_MEMBER_NAME_CHECKED(FRotator, Roll));
+		}
+		else if (Axis == EAxisList::Y)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FRotator>::Get(), GET_MEMBER_NAME_CHECKED(FRotator, Pitch));
+		}
+		else if (Axis == EAxisList::Z)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FRotator>::Get(), GET_MEMBER_NAME_CHECKED(FRotator, Yaw));
+		}
+		break;
+	case ETransformField::Scale:
+		TransactionText = LOCTEXT("OnSetScale", "Set Scale");
+		ValueProperty = FindFProperty<FProperty>(USceneComponent::StaticClass(), USceneComponent::GetRelativeScale3DPropertyName());
+
+		// If keep scale is set, don't set axis property
+		if (!bPreserveScaleRatio && Axis == EAxisList::X)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FVector>::Get(), GET_MEMBER_NAME_CHECKED(FVector, X));
+		}
+		else if (!bPreserveScaleRatio && Axis == EAxisList::Y)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FVector>::Get(), GET_MEMBER_NAME_CHECKED(FVector, Y));
+		}
+		else if (!bPreserveScaleRatio && Axis == EAxisList::Z)
+		{
+			AxisProperty = FindFProperty<FFloatProperty>(TBaseStructure<FVector>::Get(), GET_MEMBER_NAME_CHECKED(FVector, Z));
+		}
+		break;
+	default:
+		return;
+	}
+
+	bool bBeganTransaction = false;
+	TArray<UObject*> ModifiedObjects;
+
+	FPropertyChangedEvent PropertyChangedEvent(ValueProperty, !bCommitted ? EPropertyChangeType::Interactive : EPropertyChangeType::ValueSet, MakeArrayView(ModifiedObjects));
+	FEditPropertyChain PropertyChain;
+
+	if (AxisProperty)
+	{
+		PropertyChain.AddHead(AxisProperty);
+	}
+	PropertyChain.AddHead(ValueProperty);
+	FPropertyChangedChainEvent PropertyChangedChainEvent(PropertyChain, PropertyChangedEvent);
+
+	for (int32 ObjectIndex = 0; ObjectIndex < SelectedObjects.Num(); ++ObjectIndex)
+	{
+		TWeakObjectPtr<UObject> ObjectPtr = SelectedObjects[ObjectIndex];
+		if (ObjectPtr.IsValid())
+		{
+			UObject* Object = ObjectPtr.Get();
+			USceneComponent* SceneComponent = GetSceneComponentFromDetailsObject(Object);
+			if (SceneComponent)
+			{
+				AActor* EditedActor = SceneComponent->GetOwner();
+				const bool bIsEditingTemplateObject = Object->IsTemplate();
+
+				FVector OldComponentValue;
+				FVector NewComponentValue;
+
+				switch (TransformField)
+				{
+				case ETransformField::Location:
+					OldComponentValue = SceneComponent->GetRelativeLocation();
+					break;
+				case ETransformField::Rotation:
+					// Pull from the actual component or from the cache
+					OldComponentValue = SceneComponent->GetRelativeRotation().Euler();
+					if (bEditingRotationInUI && !bIsEditingTemplateObject && ObjectToRelativeRotationMap.Find(SceneComponent))
+					{
+						OldComponentValue = ObjectToRelativeRotationMap.Find(SceneComponent)->Euler();
+					}
+					break;
+				case ETransformField::Scale:
+					OldComponentValue = SceneComponent->GetRelativeScale3D();
+					break;
+				}
+
+				// Set the incoming value
+				if (bMirror)
+				{
+					NewComponentValue = GetAxisFilteredVector(Axis, -OldComponentValue, OldComponentValue);
+				}
+				else
+				{
+					NewComponentValue = GetAxisFilteredVector(Axis, NewValue, OldComponentValue);
+				}
+
+				// If we're committing during a slider transaction then we need to force it, in order that PostEditChangeChainProperty be called.
+				// Note: this will even happen if the slider hasn't changed the value.
+				if (OldComponentValue != NewComponentValue || (bCommitted && bIsSliderTransaction))
+				{
+					if (!bBeganTransaction && bCommitted)
+					{
+						// NOTE: One transaction per change, not per actor
+						//GEditor->BeginTransaction(TransactionText);
+						bBeganTransaction = true;
+					}
+
+					//FScopedSwitchWorldForObject WorldSwitcher(Object);
+
+					if (bCommitted)
+					{
+						if (!bIsEditingTemplateObject)
+						{
+							/*
+							// Broadcast the first time an actor is about to move
+							GEditor->BroadcastBeginObjectMovement(*SceneComponent);
+							if (EditedActor && EditedActor->GetRootComponent() == SceneComponent)
+							{
+								GEditor->BroadcastBeginObjectMovement(*EditedActor);
+							}
+							*/
+						}
+
+						if (SceneComponent->HasAnyFlags(RF_DefaultSubObject))
+						{
+							// Default subobjects must be included in any undo/redo operations
+							SceneComponent->SetFlags(RF_Transactional);
+						}
+					}
+
+					// Have to downcast here because of function overloading and inheritance not playing nicely
+					/*
+					((UObject*)SceneComponent)->PreEditChange(PropertyChain);
+					if (EditedActor && EditedActor->GetRootComponent() == SceneComponent)
+					{
+						((UObject*)EditedActor)->PreEditChange(PropertyChain);
+					}
+					*/
+
+					if (IEditableObject* EditableObject = Cast<IEditableObject>((UObject*)SceneComponent))
+					{
+						EditableObject->RuntimePreEditChange(PropertyChain);
+					}
+					if (EditedActor && EditedActor->GetRootComponent() == SceneComponent)
+					{
+						if (IEditableObject* EditableObject = Cast<IEditableObject>((UObject*)EditedActor))
+						{
+							EditableObject->RuntimePreEditChange(PropertyChain);
+						}
+					}
+
+					if (NotifyHook)
+					{
+						NotifyHook->NotifyPreChange(ValueProperty);
+					}
+
+					switch (TransformField)
+					{
+					case ETransformField::Location:
+						{
+							if (!bIsEditingTemplateObject)
+							{
+								// Update local cache for restoring later
+								ObjectToRelativeRotationMap.FindOrAdd(SceneComponent) = SceneComponent->GetRelativeRotation();
+							}
+
+							SceneComponent->SetRelativeLocation(NewComponentValue);
+
+							// Also forcibly set it as the cache may have changed it slightly
+							SceneComponent->SetRelativeLocation_Direct(NewComponentValue);
+
+							// If it's a template, propagate the change out to any current instances of the object
+							if (bIsEditingTemplateObject)
+							{
+								TSet<USceneComponent*> UpdatedInstances;
+								FComponentEditorUtils::PropagateDefaultValueChange(SceneComponent, ValueProperty, OldComponentValue, NewComponentValue, UpdatedInstances);
+							}
+
+							break;
+						}
+					case ETransformField::Rotation:
+						{
+							FRotator NewRotation = FRotator::MakeFromEuler(NewComponentValue);
+
+							if (!bIsEditingTemplateObject)
+							{
+								// Update local cache for restoring later
+								ObjectToRelativeRotationMap.FindOrAdd(SceneComponent) = NewRotation;
+							}
+
+							SceneComponent->SetRelativeRotationExact(NewRotation);
+
+							// If it's a template, propagate the change out to any current instances of the object
+							if (bIsEditingTemplateObject)
+							{
+								TSet<USceneComponent*> UpdatedInstances;
+								FComponentEditorUtils::PropagateDefaultValueChange(SceneComponent, ValueProperty, FRotator::MakeFromEuler(OldComponentValue), NewRotation, UpdatedInstances);
+							}
+
+							break;
+						}
+					case ETransformField::Scale:
+						{
+							if (bPreserveScaleRatio)
+							{
+								// If we set a single axis, scale the others
+								float Ratio = 0.0f;
+
+								switch (Axis)
+								{
+								case EAxisList::X:
+									if (bIsSliderTransaction)
+									{
+										Ratio = SliderScaleRatio.X == 0.0f ? SliderScaleRatio.Y : (SliderScaleRatio.Y / SliderScaleRatio.X);
+										NewComponentValue.Y = NewComponentValue.X * Ratio;
+
+										Ratio = SliderScaleRatio.X == 0.0f ? SliderScaleRatio.Z : (SliderScaleRatio.Z / SliderScaleRatio.X);
+										NewComponentValue.Z = NewComponentValue.X * Ratio;
+									}
+									else
+									{
+										Ratio = OldComponentValue.X == 0.0f ? NewComponentValue.Z : NewComponentValue.X / OldComponentValue.X;
+										NewComponentValue.Y *= Ratio;
+										NewComponentValue.Z *= Ratio;
+									}
+									break;
+								case EAxisList::Y:
+									if (bIsSliderTransaction)
+									{
+										Ratio = SliderScaleRatio.Y == 0.0f ? SliderScaleRatio.X : (SliderScaleRatio.X / SliderScaleRatio.Y);
+										NewComponentValue.X = NewComponentValue.Y * Ratio;
+
+										Ratio = SliderScaleRatio.Y == 0.0f ? SliderScaleRatio.Z : (SliderScaleRatio.Z / SliderScaleRatio.Y);
+										NewComponentValue.Z = NewComponentValue.Y * Ratio;
+									}
+									else
+									{
+										Ratio = OldComponentValue.Y == 0.0f ? NewComponentValue.Z : NewComponentValue.Y / OldComponentValue.Y;
+										NewComponentValue.X *= Ratio;
+										NewComponentValue.Z *= Ratio;
+									}
+									break;
+								case EAxisList::Z:
+									if (bIsSliderTransaction)
+									{
+										Ratio = SliderScaleRatio.Z == 0.0f ? SliderScaleRatio.X : (SliderScaleRatio.X / SliderScaleRatio.Z);
+										NewComponentValue.X = NewComponentValue.Z * Ratio;
+
+										Ratio = SliderScaleRatio.Z == 0.0f ? SliderScaleRatio.Y : (SliderScaleRatio.Y / SliderScaleRatio.Z);
+										NewComponentValue.Y = NewComponentValue.Z * Ratio;
+									}
+									else
+									{
+										Ratio = OldComponentValue.Z == 0.0f ? NewComponentValue.Z : NewComponentValue.Z / OldComponentValue.Z;
+										NewComponentValue.X *= Ratio;
+										NewComponentValue.Y *= Ratio;
+									}
+									break;
+								default:
+									// Do nothing, this set multiple axis at once
+									break;
+								}
+							}
+
+							SceneComponent->SetRelativeScale3D(NewComponentValue);
+
+							// If it's a template, propagate the change out to any current instances of the object
+							if (bIsEditingTemplateObject)
+							{
+								TSet<USceneComponent*> UpdatedInstances;
+								FComponentEditorUtils::PropagateDefaultValueChange(SceneComponent, ValueProperty, OldComponentValue, NewComponentValue, UpdatedInstances);
+							}
+
+							break;
+						}
+					}
+
+					ModifiedObjects.Add(Object);
+				}
+			}
+		}
+	}
+
+	if (ModifiedObjects.Num())
+	{
+		for (UObject* Object : ModifiedObjects)
+		{
+			USceneComponent* SceneComponent = GetSceneComponentFromDetailsObject(Object);
+			USceneComponent* OldSceneComponent = SceneComponent;
+
+			if (SceneComponent)
+			{
+				AActor* EditedActor = SceneComponent->GetOwner();
+				FString SceneComponentPath = SceneComponent->GetPathName(EditedActor);
+				
+				// This can invalidate OldSceneComponent
+				//OldSceneComponent->PostEditChangeChainProperty(PropertyChangedChainEvent);
+				if (IEditableObject* EditableObject = Cast<IEditableObject>(OldSceneComponent))
+				{
+					EditableObject->RuntimePostEditChangeChainProperty(PropertyChangedChainEvent);
+				}
+
+				if (!bCommitted)
+				{
+					const FProperty* ConstValueProperty = ValueProperty;
+					SnapshotTransactionBuffer(OldSceneComponent, MakeArrayView(&ConstValueProperty, 1));
+				}
+
+				SceneComponent = FindObject<USceneComponent>(EditedActor, *SceneComponentPath);
+
+				if (EditedActor && EditedActor->GetRootComponent() == SceneComponent)
+				{
+					//EditedActor->PostEditChangeChainProperty(PropertyChangedChainEvent);
+					if (IEditableObject* EditableObject = Cast<IEditableObject>(EditedActor))
+					{
+						EditableObject->RuntimePostEditChangeChainProperty(PropertyChangedChainEvent);
+					}
+
+					SceneComponent = FindObject<USceneComponent>(EditedActor, *SceneComponentPath);
+
+					if (!bCommitted && OldSceneComponent != SceneComponent)
+					{
+						const FProperty* ConstValueProperty = ValueProperty;
+						SnapshotTransactionBuffer(SceneComponent, MakeArrayView(&ConstValueProperty, 1));
+					}
+				}
+				
+				if (!Object->IsTemplate())
+				{
+					if (TransformField == ETransformField::Rotation || TransformField == ETransformField::Location)
+					{
+						FRotator* FoundRotator = ObjectToRelativeRotationMap.Find(OldSceneComponent);
+
+						if (FoundRotator)
+						{
+							FQuat OldQuat = FoundRotator->GetDenormalized().Quaternion();
+							FQuat NewQuat = SceneComponent->GetRelativeRotation().GetDenormalized().Quaternion();
+
+							if (OldQuat.Equals(NewQuat))
+							{
+								// Need to restore the manually set rotation as it was modified by quat conversion
+								SceneComponent->SetRelativeRotation_Direct(*FoundRotator);
+							}
+						}
+					}
+
+					if (bCommitted)
+					{
+						/*
+						// Broadcast when the actor is done moving
+						GEditor->BroadcastEndObjectMovement(*SceneComponent);
+						if (EditedActor && EditedActor->GetRootComponent() == SceneComponent)
+						{
+							GEditor->BroadcastEndObjectMovement(*EditedActor);
+						}
+						*/
+					}
+				}
+			}
+		}
+
+		if (NotifyHook)
+		{
+			NotifyHook->NotifyPostChange(PropertyChangedEvent, ValueProperty);
+		}
+	}
+
+	if (bCommitted && bBeganTransaction)
+	{
+		//GEditor->EndTransaction();
+		CacheTransform();
+	}
+
+	//GUnrealEd->UpdatePivotLocationForSelection();
+	//GUnrealEd->SetPivotMovedIndependently(false);
+	// Redraw
+	//GUnrealEd->RedrawLevelEditingViewports();
+}
+
+void FComponentTransformDetails::OnSetTransformAxis(FVector::FReal NewValue, ETextCommit::Type CommitInfo, ETransformField::Type TransformField, EAxisList::Type Axis, bool bCommitted)
+{
+	FVector NewVector = GetAxisFilteredVector(Axis, FVector(NewValue), FVector::ZeroVector);
+	OnSetTransform(TransformField, Axis, NewVector, false, bCommitted);
+}
+
+void FComponentTransformDetails::BeginSliderTransaction(FText ActorTransaction, FText ComponentTransaction) const
+{
+	bool bBeganTransaction = false;
+	for (TWeakObjectPtr<UObject> ObjectPtr : SelectedObjects)
+	{
+		if (ObjectPtr.IsValid())
+		{
+			UObject* Object = ObjectPtr.Get();
+
+			// Start a new transaction when a slider begins to change
+			// We'll end it when the slider is released
+			// NOTE: One transaction per change, not per actor
+			if (!bBeganTransaction)
+			{
+				if (Object->IsA<AActor>())
+				{
+					//GEditor->BeginTransaction(ActorTransaction);
+				}
+				else
+				{
+					//GEditor->BeginTransaction(ComponentTransaction);
+				}
+
+				bBeganTransaction = true;
+			}
+
+			USceneComponent* SceneComponent = GetSceneComponentFromDetailsObject(Object);
+			if (SceneComponent)
+			{
+				//FScopedSwitchWorldForObject WorldSwitcher(Object);
+
+				if (SceneComponent->HasAnyFlags(RF_DefaultSubObject))
+				{
+					// Default subobjects must be included in any undo/redo operations
+					SceneComponent->SetFlags(RF_Transactional);
+				}
+
+				// Call modify but not PreEdit, we don't do the proper "Edit" until it's committed
+				SceneComponent->Modify();
+			}
+		}
+	}
+
+	// Just in case we couldn't start a new transaction for some reason
+	if (!bBeganTransaction)
+	{
+		//GEditor->BeginTransaction(ActorTransaction);
+	}
+}
+
+void FComponentTransformDetails::OnBeginRotationSlider()
+{
+	FText ActorTransaction = LOCTEXT("OnSetRotation", "Set Rotation");
+	FText ComponentTransaction = LOCTEXT("OnSetRotation_ComponentDirect", "Modify Component(s)");
+	BeginSliderTransaction(ActorTransaction, ComponentTransaction);
+
+	bEditingRotationInUI = true;
+	bIsSliderTransaction = true;
+
+	for (TWeakObjectPtr<UObject> ObjectPtr : SelectedObjects)
+	{
+		if (ObjectPtr.IsValid())
+		{
+			UObject* Object = ObjectPtr.Get();
+
+			USceneComponent* SceneComponent = GetSceneComponentFromDetailsObject(Object);
+			if (SceneComponent)
+			{
+				//FScopedSwitchWorldForObject WorldSwitcher(Object);
+
+				// Add/update cached rotation value prior to slider interaction
+				ObjectToRelativeRotationMap.FindOrAdd(SceneComponent) = SceneComponent->GetRelativeRotation();
+			}
+		}
+	}
+}
+
+void FComponentTransformDetails::OnEndRotationSlider(FRotator::FReal NewValue)
+{
+	// Commit gets called right before this, only need to end the transaction
+	bEditingRotationInUI = false;
+	bIsSliderTransaction = false;
+	//GEditor->EndTransaction();
+}
+
+void FComponentTransformDetails::OnBeginLocationSlider()
+{
+	bIsSliderTransaction = true;
+	FText ActorTransaction = LOCTEXT("OnSetLocation", "Set Location");
+	FText ComponentTransaction = LOCTEXT("OnSetLocation_ComponentDirect", "Modify Component Location");
+	BeginSliderTransaction(ActorTransaction, ComponentTransaction);
+}
+
+void FComponentTransformDetails::OnEndLocationSlider(FVector::FReal NewValue)
+{
+	bIsSliderTransaction = false;
+	//GEditor->EndTransaction();
+}
+
+void FComponentTransformDetails::OnBeginScaleSlider()
+{
+	// Assumption: slider isn't usable if multiple objects are selected
+	SliderScaleRatio.X = CachedScale.X.GetValue();
+	SliderScaleRatio.Y = CachedScale.Y.GetValue();
+	SliderScaleRatio.Z = CachedScale.Z.GetValue();
+
+	bIsSliderTransaction = true;
+	FText ActorTransaction = LOCTEXT("OnSetScale", "Set Scale");
+	FText ComponentTransaction = LOCTEXT("OnSetScale_ComponentDirect", "Modify Component Scale");
+	BeginSliderTransaction(ActorTransaction, ComponentTransaction);
+}
+
+void FComponentTransformDetails::OnEndScaleSlider(FVector::FReal NewValue)
+{
+	bIsSliderTransaction = false;
+	//GEditor->EndTransaction();
+}
+
+void FComponentTransformDetails::OnObjectsReplaced(const TMap<UObject*, UObject*>& ReplacementMap)
+{
+	TArray<UObject*> NewSceneComponents;
+	for (const TWeakObjectPtr<UObject> Obj : CachedHandlesObjects)
+	{
+		if (UObject* Replacement = ReplacementMap.FindRef(Obj.GetEvenIfUnreachable()))
+		{
+			NewSceneComponents.Add(Replacement);
+		}
+	}
+
+	if (NewSceneComponents.Num())
+	{
+		UpdatePropertyHandlesObjects(NewSceneComponents);
+	}
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentTransformDetails.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentTransformDetails.h
new file mode 100644
index 0000000..89d389c
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ComponentTransformDetails.h
@@ -0,0 +1,323 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Input/Reply.h"
+#include "Layout/Visibility.h"
+#include "Widgets/SWidget.h"
+#include "Framework/Commands/UIAction.h"
+#include "RuntimePropertyEditor/IDetailCustomNodeBuilder.h"
+#include "Widgets/Input/NumericTypeInterface.h"
+//#include "AssetSelection.h"
+
+class FNotifyHook;
+class FMenuBuilder;
+
+namespace soda
+{
+class FDetailWidgetRow;
+class IDetailChildrenBuilder;
+class IDetailLayoutBuilder;
+class IDetailCategoryBuilder;
+class IPropertyHandle;
+
+namespace ETransformField
+{
+	enum Type
+	{
+		Location,
+		Rotation,
+		Scale
+	};
+}
+/**
+ * Manages the Transform section of a details view                    
+ */
+class FComponentTransformDetails : public TSharedFromThis<FComponentTransformDetails>, public IDetailCustomNodeBuilder, public TNumericUnitTypeInterface<FVector::FReal>
+{
+public:
+	FComponentTransformDetails( const TArray< TWeakObjectPtr<UObject> >& InSelectedObjects, /*const FSelectedActorInfo& InSelectedActorInfo,*/ IDetailLayoutBuilder& DetailBuilder);
+	~FComponentTransformDetails();
+
+	/**
+	 * Caches the representation of the actor transform for the user input boxes                   
+	 */
+	void CacheTransform();
+
+	virtual void GenerateHeaderRowContent( FDetailWidgetRow& NodeRow ) override {}
+	virtual void GenerateChildContent( IDetailChildrenBuilder& ChildrenBuilder ) override;
+	virtual bool RequiresTick() const override { return true; }
+	virtual FName GetName() const override { return "Transform"; }
+	virtual bool InitiallyCollapsed() const override { return false; }
+	virtual void Tick( float DeltaTime ) override;
+	virtual void SetOnRebuildChildren( FSimpleDelegate OnRebuildChildren ) override{}
+
+	void HideTransformField(const ETransformField::Type InTransformField)
+	{
+		HiddenFieldMask |= (1 << InTransformField);
+	}
+
+private:
+	/** @return Whether the transform details panel should be enabled (editable) or not (read-only / greyed out) */
+	bool GetIsEnabled() const;
+
+	/** Sets a vector based on two source vectors and an axis list */
+	FVector GetAxisFilteredVector(EAxisList::Type Axis, const FVector& NewValue, const FVector& OldValue);
+
+	/**
+	 * Sets the selected object(s) axis to passed in value
+	 *
+	 * @param TransformField	The field (location/rotation/scale) to modify
+	 * @param Axis				Bitfield of which axis to set, can be multiple
+	 * @param NewValue			The new vector values, it only uses the ones with specified axis
+	 * @param bMirror			If true, set the value to it's inverse instead of using NewValue
+	 * @param bCommittted		True if the value was committed, false is the value comes from the slider
+	 */
+	void OnSetTransform(ETransformField::Type TransformField, EAxisList::Type Axis, FVector NewValue, bool bMirror, bool bCommitted);
+
+	/**
+	 * Sets a single axis value, called from UI
+	 *
+	 * @param TransformField	The field (location/rotation/scale) to modify
+	 * @param NewValue			The new translation value
+	 * @param CommitInfo		Whether or not this was committed from pressing enter or losing focus
+	 * @param Axis				Bitfield of which axis to set, can be multiple
+	 * @param bCommittted		true if the value was committed, false is the value comes from the slider
+	 */
+	void OnSetTransformAxis(FVector::FReal NewValue, ETextCommit::Type CommitInfo, ETransformField::Type TransformField, EAxisList::Type Axis, bool bCommitted);
+
+	/** 
+	 * Helper to begin a new transaction for a slider interaction. 
+	 * @param ActorTransaction		The name to give the transaction when changing an actor transform.
+	 * @param ComponentTransaction	The name to give the transaction when directly editing a component transform.
+	 */
+	void BeginSliderTransaction(FText ActorTransaction, FText ComponentTransaction) const;
+
+	/** Called when the one of the axis sliders for object rotation begins to change for the first time */
+	void OnBeginRotationSlider();
+
+	/** Called when the one of the axis sliders for object rotation is released */
+	void OnEndRotationSlider(FRotator::FReal NewValue);
+
+	/** Called when one of the axis sliders for object location begins to change */
+	void OnBeginLocationSlider();
+
+	/** Called when one of the axis sliders for object location is released */
+	void OnEndLocationSlider(FVector::FReal NewValue);
+
+	/** Called when one of the axis sliders for object scale begins to change */
+	void OnBeginScaleSlider();
+
+	/** Called when one of the axis sliders for object scale is released */
+	void OnEndScaleSlider(FVector::FReal NewValue);
+
+	/** @return Icon to use in the preserve scale ratio check box */
+	const FSlateBrush* GetPreserveScaleRatioImage() const;
+
+	/** @return The state of the preserve scale ratio checkbox */
+	ECheckBoxState IsPreserveScaleRatioChecked() const;
+
+	/**
+	 * Called when the preserve scale ratio checkbox is toggled
+	 */
+	void OnPreserveScaleRatioToggled( ECheckBoxState NewState );
+
+	/**
+	 * Builds a transform field label
+	 *
+	 * @param TransformField The field to build the label for
+	 * @return The label widget
+	 */
+	TSharedRef<SWidget> BuildTransformFieldLabel( ETransformField::Type TransformField );
+
+	/**
+	 * Gets display text for a transform field
+	 *
+	 * @param TransformField	The field to get the text for
+	 * @return The text label for TransformField
+	 */
+	FText GetTransformFieldText( ETransformField::Type TransformField ) const;
+
+	/**
+	 * @return the text to display for translation                   
+	 */
+	FText GetLocationText() const;
+
+	/**
+	 * @return the text to display for rotation                   
+	 */
+	FText GetRotationText() const;
+
+	/**
+	 * @return the text to display for scale                   
+	 */
+	FText GetScaleText() const;
+
+	/**
+	 * Sets relative transform on the specified field
+	 *
+	 * @param The field that should be set to relative
+	 */
+	void OnSetAbsoluteTransform( ETransformField::Type TransformField, bool bAbsoluteEnabled);
+
+	/** @return true if Absolute flag of transform type matches passed in bCheckAbsolute*/
+	bool IsAbsoluteTransformChecked( ETransformField::Type TransformField, bool bAbsoluteEnabled=true) const;
+
+	/** @return true of copy is enabled for the specified field */
+	bool OnCanCopy( ETransformField::Type TransformField ) const;
+
+	/**
+	 * Copies the specified transform field to the clipboard
+	 */
+	void OnCopy( ETransformField::Type TransformField );
+
+	/**
+	 * Pastes the specified transform field from the clipboard
+	 */
+	void OnPaste( ETransformField::Type TransformField );
+
+	/**
+	 * Creates a UI action for copying a specified transform field
+	 */
+	FUIAction CreateCopyAction( ETransformField::Type TransformField ) const;
+
+	/**
+	 * Creates a UI action for pasting a specified transform field
+	 */
+	FUIAction CreatePasteAction( ETransformField::Type TransformField ) const;
+
+	/** Called when the "Reset to Default" button for the location has been clicked */
+	void OnLocationResetClicked();
+
+	/** Called when the "Reset to Default" button for the rotation has been clicked */
+	void OnRotationResetClicked();
+
+	/** Called when the "Reset to Default" button for the scale has been clicked */
+	void OnScaleResetClicked();
+
+	/** Extend the context menu for the X component */
+	void ExtendXScaleContextMenu( FMenuBuilder& MenuBuilder );
+	/** Extend the context menu for the Y component */
+	void ExtendYScaleContextMenu( FMenuBuilder& MenuBuilder );
+	/** Extend the context menu for the Z component */
+	void ExtendZScaleContextMenu( FMenuBuilder& MenuBuilder );
+
+	/** Called when the X axis scale is mirrored */
+	void OnXScaleMirrored();
+	/** Called when the Y axis scale is mirrored */
+	void OnYScaleMirrored();
+	/** Called when the Z axis scale is mirrored */
+	void OnZScaleMirrored();
+
+	/** @return The X component of location */
+	TOptional<FVector::FReal> GetLocationX() const { return CachedLocation.X; }
+	/** @return The Y component of location */
+	TOptional<FVector::FReal> GetLocationY() const { return CachedLocation.Y; }
+	/** @return The Z component of location */
+	TOptional<FVector::FReal> GetLocationZ() const { return CachedLocation.Z; }
+	/** @return The visibility of the "Reset to Default" button for the location component */
+	bool GetLocationResetVisibility() const;
+
+	/** @return The X component of rotation */
+	TOptional<FRotator::FReal> GetRotationX() const { return CachedRotation.X; }
+	/** @return The Y component of rotation */
+	TOptional<FRotator::FReal> GetRotationY() const { return CachedRotation.Y; }
+	/** @return The Z component of rotation */
+	TOptional<FRotator::FReal> GetRotationZ() const { return CachedRotation.Z; }
+	/** @return The visibility of the "Reset to Default" button for the rotation component */
+	bool GetRotationResetVisibility() const;
+
+	/** @return The X component of scale */
+	TOptional<FVector::FReal> GetScaleX() const { return CachedScale.X; }
+	/** @return The Y component of scale */
+	TOptional<FVector::FReal> GetScaleY() const { return CachedScale.Y; }
+	/** @return The Z component of scale */
+	TOptional<FVector::FReal> GetScaleZ() const { return CachedScale.Z; }
+	/** @return The visibility of the "Reset to Default" button for the scale component */
+	bool GetScaleResetVisibility() const;
+
+	/** Cache a single unit to display all location components in */
+	void CacheCommonLocationUnits();
+
+	/** Generate a property handle from a property name. */
+	TSharedPtr<IPropertyHandle> GeneratePropertyHandle(FName PropertyName, IDetailChildrenBuilder& ChildrenBuilder);
+	/** Update the outer objects of the property handles generated from this transform. */
+	void UpdatePropertyHandlesObjects(const TArray<UObject*> NewSceneComponents);
+
+	/** Delegate called when the OnObjectsReplaced is broadcast by the engine. */
+	void OnObjectsReplaced(const TMap<UObject*, UObject*>& ReplacementMap);
+private:
+	/** A vector where it may optionally be unset */
+	template <typename NumericType>
+	struct FOptionalVector
+	{
+		/**
+		 * Sets the value from an FVector                   
+		 */
+		void Set( const FVector& InVec )
+		{
+			X = InVec.X;
+			Y = InVec.Y;
+			Z = InVec.Z;
+		}
+
+		/**
+		 * Sets the value from an FRotator
+		 */
+		void Set(const FRotator& InRot)
+		{
+			X = InRot.Roll;
+			Y = InRot.Pitch;
+			Z = InRot.Yaw;
+		}
+		
+		/** @return Whether or not the value is set */
+		bool IsSet() const
+		{
+			// The vector is set if all values are set
+			return X.IsSet() && Y.IsSet() && Z.IsSet();
+		}
+
+		TOptional<NumericType> X;
+		TOptional<NumericType> Y;
+		TOptional<NumericType> Z;
+	};
+	
+	//FSelectedActorInfo SelectedActorInfo;
+	/** Copy of selected actor references in the details view */
+	TArray< TWeakObjectPtr<UObject> > SelectedObjects;
+	/** Cache translation value of the selected set */
+	FOptionalVector<FVector::FReal> CachedLocation;
+	/** Cache rotation value of the selected set */
+	FOptionalVector<FRotator::FReal> CachedRotation;
+	/** Cache scale value of the selected set */
+	FOptionalVector<FVector::FReal> CachedScale;
+	/** Notify hook to use */
+	FNotifyHook* NotifyHook;
+	/** Mapping from object to relative rotation values which are not affected by Quat->Rotator conversions during transform calculations */
+	TMap< UObject*, FRotator > ObjectToRelativeRotationMap;
+	/** Whether or not we are in absolute translation mode */
+	bool bAbsoluteLocation;
+	/** Whether or not we are in absolute rotation mode */
+	bool bAbsoluteRotation;
+	/** Whether or not we are in absolute scale mode */
+	bool bAbsoluteScale;
+	/** Whether or not to preserve scale ratios */
+	bool bPreserveScaleRatio;
+	/** Scale ratio to use when we are using the sliders with bPreserveScaleRatio set. */
+	FVector SliderScaleRatio;
+	/** Flag to indicate we are currently editing the rotation in the UI, so we should rely on the cached value in objectToRelativeRotationMap, not the value from the object */
+	bool bEditingRotationInUI;
+	/** Flag to indicate we are currently performing a slider transaction */
+	bool bIsSliderTransaction;
+	/** Bitmask to indicate which fields should be hidden (if any) */
+	uint8 HiddenFieldMask;
+	/** Holds this transform's property handles. */
+	TArray< TSharedPtr< IPropertyHandle> > PropertyHandles;
+	/** Holds the property handles' outer objects. Used to update the handles' objects when the actor construction script runs. */
+	TArray< TWeakObjectPtr<UObject> > CachedHandlesObjects;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/DetailCustomizations.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/DetailCustomizations.h
new file mode 100644
index 0000000..cf9fbc1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/DetailCustomizations.h
@@ -0,0 +1,57 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Modules/ModuleInterface.h"
+#include "PropertyEditorDelegates.h"
+
+class FDetailCustomizationsModule : public IModuleInterface
+{
+public:
+	/**
+	 * Called right after the module DLL has been loaded and the module object has been created
+	 */
+	virtual void StartupModule() override;
+
+	/**
+	 * Called before the module is unloaded, right before the module object is destroyed.
+	 */
+	virtual void ShutdownModule() override;
+
+	/**
+	 * Override this to set whether your module is allowed to be unloaded on the fly
+	 *
+	 * @return	Whether the module supports shutdown separate from the rest of the engine.
+	 */
+	virtual bool SupportsDynamicReloading() override
+	{
+		return true;
+	}
+
+private:
+	void RegisterPropertyTypeCustomizations();
+	void RegisterObjectCustomizations();
+	void RegisterSectionMappings();
+
+	/**
+	 * Registers a custom class
+	 *
+	 * @param ClassName				The class name to register for property customization
+	 * @param DetailLayoutDelegate	The delegate to call to get the custom detail layout instance
+	 */
+	void RegisterCustomClassLayout(FName ClassName, FOnGetDetailCustomizationInstance DetailLayoutDelegate );
+
+	/**
+	* Registers a custom struct
+	*
+	* @param StructName				The name of the struct to register for property customization
+	* @param StructLayoutDelegate	The delegate to call to get the custom detail layout instance
+	*/
+	void RegisterCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate );
+private:
+	/** List of registered class that we must unregister when the module shuts down */
+	TSet< FName > RegisteredClassNames;
+	TSet< FName > RegisteredPropertyTypes;
+};
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/KeyStructCustomization.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/KeyStructCustomization.cpp
new file mode 100644
index 0000000..286f0f3
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/KeyStructCustomization.cpp
@@ -0,0 +1,120 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/KeyStructCustomization.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+//#include "InputSettingsDetails.h"
+#include "SodaEditorWidgets/SKeySelector.h"
+#include "UObject/UnrealType.h"
+
+#define LOCTEXT_NAMESPACE "FKeyStructCustomization"
+
+namespace soda
+{
+
+namespace InputConstants
+{
+	const FMargin PropertyPadding(2.0f, 0.0f, 2.0f, 0.0f);
+	const float TextBoxWidth = 250.0f;
+	const float ScaleBoxWidth = 50.0f;
+}
+
+/* FKeyStructCustomization static interface
+ *****************************************************************************/
+
+TSharedRef<IPropertyTypeCustomization> FKeyStructCustomization::MakeInstance( )
+{
+	return MakeShareable(new FKeyStructCustomization);
+}
+
+/* IPropertyTypeCustomization interface
+ *****************************************************************************/
+
+void FKeyStructCustomization::CustomizeHeader( TSharedRef<class IPropertyHandle> StructPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils )
+{
+	PropertyHandle = StructPropertyHandle;
+
+	// create struct header
+	HeaderRow.NameContent()
+	[
+		StructPropertyHandle->CreatePropertyNameWidget()
+	]
+	.ValueContent()
+	.MinDesiredWidth(125.0f)
+	.MaxDesiredWidth(325.0f)
+	[
+		SNew(SKeySelector)
+		.CurrentKey(this, &FKeyStructCustomization::GetCurrentKey)
+		.OnKeyChanged(this, &FKeyStructCustomization::OnKeyChanged)
+		.Font(StructCustomizationUtils.GetRegularFont())
+		.AllowClear(!StructPropertyHandle->GetProperty()->HasAnyPropertyFlags(CPF_NoClear))
+		.FilterBlueprintBindable(false)
+	];
+}
+
+void FKeyStructCustomization::CustomizeHeaderOnlyWithButton(TSharedRef<class IPropertyHandle> StructPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils, TSharedRef<SWidget> Button)
+{
+	PropertyHandle = StructPropertyHandle;
+
+	// create struct header
+	HeaderRow.NameContent()
+	.MinDesiredWidth(125.0f)
+	.MaxDesiredWidth(325.0f)
+	[
+		SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.Padding(InputConstants::PropertyPadding)
+		//.AutoWidth()
+		[
+			SNew(SKeySelector)
+			.CurrentKey(this, &FKeyStructCustomization::GetCurrentKey)
+			.OnKeyChanged(this, &FKeyStructCustomization::OnKeyChanged)
+			.Font(StructCustomizationUtils.GetRegularFont())
+			.AllowClear(!StructPropertyHandle->GetProperty()->HasAnyPropertyFlags(CPF_NoClear))
+		    .FilterBlueprintBindable(false)
+		]
+		+ SHorizontalBox::Slot()
+		.Padding(InputConstants::PropertyPadding)
+		.HAlign(HAlign_Center)
+		.VAlign(VAlign_Center)
+		.AutoWidth()
+		[
+			Button
+		]
+	];
+}
+
+TOptional<FKey> FKeyStructCustomization::GetCurrentKey() const
+{
+	TArray<void*> StructPtrs;
+	PropertyHandle->AccessRawData(StructPtrs);
+
+	if (StructPtrs.Num() > 0)
+	{
+		FKey* SelectedKey = (FKey*)StructPtrs[0];
+
+		if (SelectedKey)
+		{
+			for(int32 StructPtrIndex = 1; StructPtrIndex < StructPtrs.Num(); ++StructPtrIndex)
+			{
+				if (*(FKey*)StructPtrs[StructPtrIndex] != *SelectedKey)
+				{
+					return TOptional<FKey>();
+				}
+			}
+
+			return *SelectedKey;
+		}
+	}
+
+	return FKey();
+}
+
+void FKeyStructCustomization::OnKeyChanged(TSharedPtr<FKey> SelectedKey)
+{
+	PropertyHandle->SetValueFromFormattedString(SelectedKey->ToString());
+}
+
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/KeyStructCustomization.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/KeyStructCustomization.h
new file mode 100644
index 0000000..536e8b0
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/KeyStructCustomization.h
@@ -0,0 +1,53 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "InputCoreTypes.h"
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+
+namespace soda
+{
+
+/**
+ * Implements a details panel customization for FKey structures.
+ * As  "Key"				<SKeySelector>
+ */
+class  FKeyStructCustomization
+	: public IPropertyTypeCustomization
+{
+public:
+	// IPropertyTypeCustomization interface
+
+	virtual void CustomizeHeader(TSharedRef<class IPropertyHandle> StructPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils) override;
+	virtual void CustomizeChildren(TSharedRef<IPropertyHandle> StructPropertyHandle, class IDetailChildrenBuilder& ChildBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils) override { };
+	virtual bool ShouldInlineKey() const override { return true; }
+
+	// Helper variant that generates the key struct in the header and appends a single button at the end
+	// TODO: Is there a better way?
+	void CustomizeHeaderOnlyWithButton(TSharedRef<class IPropertyHandle> StructPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils, TSharedRef<SWidget> Button);
+
+public:
+
+	/**
+	 * Creates a new instance.
+	 *
+	 * @return A new struct customization for Keys.
+	 */
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance( );
+
+protected:
+
+	/** Gets the current Key being edited. */
+	TOptional<FKey> GetCurrentKey() const;
+
+	/** Updates the property when a new key is selected. */
+	void OnKeyChanged(TSharedPtr<FKey> SelectedKey);
+
+	/** Holds a handle to the property being edited. */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+};
+
+} //namespace soda
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ObjectDetails.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ObjectDetails.cpp
new file mode 100644
index 0000000..4acd151
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ObjectDetails.cpp
@@ -0,0 +1,244 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/ObjectDetails.h"
+//#include "ScopedTransaction.h"
+#include "Engine/EngineBaseTypes.h"
+#include "UObject/UnrealType.h"
+#include "SodaStyleSet.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Layout/SWrapBox.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+//#include "SWarningOrErrorBox.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+//#include "EdGraphSchema_K2.h"
+//#include "Kismet2/BlueprintEditorUtils.h"
+#include "Widgets/SToolTip.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+//#include "ObjectEditorUtils.h"
+
+#include "RuntimeMetaData.h"
+
+#define LOCTEXT_NAMESPACE "ObjectDetails"
+
+namespace soda
+{
+static const FName MD_FunctionCategory(TEXT("Category"));
+static const FName MD_CallInEditor(TEXT("CallInRuntime"));
+
+TSharedRef<IDetailCustomization> FObjectDetails::MakeInstance()
+{
+	return MakeShareable(new FObjectDetails);
+}
+
+void FObjectDetails::CustomizeDetails(IDetailLayoutBuilder& DetailBuilder)
+{
+	AddExperimentalWarningCategory(DetailBuilder);
+	AddCallInEditorMethods(DetailBuilder);
+}
+
+void FObjectDetails::AddExperimentalWarningCategory(IDetailLayoutBuilder& DetailBuilder)
+{
+	/*
+	bool bBaseClassIsExperimental = false;
+	bool bBaseClassIsEarlyAccess = false;
+	FString MostDerivedDevelopmentClassName;
+	FObjectEditorUtils::GetClassDevelopmentStatus(DetailBuilder.GetBaseClass(), bBaseClassIsExperimental, bBaseClassIsEarlyAccess, MostDerivedDevelopmentClassName);
+
+	
+	if (bBaseClassIsExperimental || bBaseClassIsEarlyAccess)
+	{
+		const FName CategoryName(TEXT("Warning"));
+		const FText CategoryDisplayName = LOCTEXT("WarningCategoryDisplayName", "Warning");
+		const FText WarningText = bBaseClassIsExperimental ? FText::Format( LOCTEXT("ExperimentalClassWarning", "Uses experimental class: {0}") , FText::FromString(MostDerivedDevelopmentClassName) )
+			: FText::Format( LOCTEXT("EarlyAccessClassWarning", "Uses beta class {0}"), FText::FromString(MostDerivedDevelopmentClassName) );
+		const FText SearchString = WarningText;
+
+		IDetailCategoryBuilder& WarningCategory = DetailBuilder.EditCategory(CategoryName, CategoryDisplayName, ECategoryPriority::Transform);
+
+		FDetailWidgetRow& WarningRow = WarningCategory.AddCustomRow(SearchString)
+			.WholeRowContent()
+			[
+				SNew(SBox)
+				.Padding(FMargin(0.f, 4.f))
+				[
+					SNew(SWarningOrErrorBox)
+					.MessageStyle(EMessageStyle::Warning)
+					.Message(WarningText)
+				]
+			];
+	}
+	*/
+}
+
+void FObjectDetails::AddCallInEditorMethods(IDetailLayoutBuilder& DetailBuilder)
+{
+	// metadata tag for defining sort order of function buttons within a Category
+	static const FName NAME_DisplayPriority("DisplayPriority");
+
+	// Get all of the functions we need to display (done ahead of time so we can sort them)
+	TArray<UFunction*, TInlineAllocator<8>> CallInEditorFunctions;
+	for (TFieldIterator<UFunction> FunctionIter(DetailBuilder.GetBaseClass(), EFieldIteratorFlags::IncludeSuper); FunctionIter; ++FunctionIter)
+	{
+		UFunction* TestFunction = *FunctionIter;
+
+		if (FRuntimeMetaData::GetBoolMetaData(TestFunction, MD_CallInEditor) && (TestFunction->ParmsSize == 0))
+		{
+			/*
+			if (UClass* TestFunctionOwnerClass = TestFunction->GetOwnerClass())
+			{
+				if (UBlueprint* Blueprint = Cast<UBlueprint>(TestFunctionOwnerClass->ClassGeneratedBy))
+				{
+					if (FBlueprintEditorUtils::IsEditorUtilityBlueprint(Blueprint))
+					{
+						// Skip Blutilities as these are handled by FEditorUtilityInstanceDetails
+						continue;
+					}
+				}
+			}
+			*/
+
+			const FName FunctionName = TestFunction->GetFName();
+			if (!CallInEditorFunctions.FindByPredicate([&FunctionName](const UFunction* Func) { return Func->GetFName() == FunctionName; }))
+			{
+				CallInEditorFunctions.Add(*FunctionIter);
+			}
+		}
+	}
+
+	if (CallInEditorFunctions.Num() > 0)
+	{
+		// Copy off the objects being customized so we can invoke a function on them later, removing any that are a CDO
+		DetailBuilder.GetObjectsBeingCustomized(/*out*/ SelectedObjectsList);
+		SelectedObjectsList.RemoveAllSwap([](TWeakObjectPtr<UObject> ObjPtr) { UObject* Obj = ObjPtr.Get(); return (Obj == nullptr) || Obj->HasAnyFlags(RF_ArchetypeObject); });
+		if (SelectedObjectsList.Num() == 0)
+		{
+			return;
+		}
+
+		// Sort the functions by category and then by DisplayPriority meta tag, and then by name
+		CallInEditorFunctions.Sort([](UFunction& A, UFunction& B)
+		{
+			const int32 CategorySort = FRuntimeMetaData::GetMetaData(&A, MD_FunctionCategory).Compare(FRuntimeMetaData::GetMetaData(&B, MD_FunctionCategory));
+			if (CategorySort != 0)
+			{
+				return (CategorySort <= 0);
+			}
+			else 
+			{
+				FString DisplayPriorityAStr = FRuntimeMetaData::GetMetaData(&A, NAME_DisplayPriority);
+				int32 DisplayPriorityA = (DisplayPriorityAStr.IsEmpty() ? MAX_int32 : FCString::Atoi(*DisplayPriorityAStr));
+				if (DisplayPriorityA == 0 && !FCString::IsNumeric(*DisplayPriorityAStr))
+				{
+					DisplayPriorityA = MAX_int32;
+				}
+
+				FString DisplayPriorityBStr = FRuntimeMetaData::GetMetaData(&B, NAME_DisplayPriority);
+				int32 DisplayPriorityB = (DisplayPriorityBStr.IsEmpty() ? MAX_int32 : FCString::Atoi(*DisplayPriorityBStr));
+				if (DisplayPriorityB == 0 && !FCString::IsNumeric(*DisplayPriorityBStr))
+				{
+					DisplayPriorityB = MAX_int32;
+				}
+
+				return (DisplayPriorityA == DisplayPriorityB) ? (A.GetName() <= B.GetName()) : (DisplayPriorityA <= DisplayPriorityB);
+			}
+		});
+
+		struct FCategoryEntry
+		{
+			FName CategoryName;
+			FName RowTag;
+			TSharedPtr<SWrapBox> WrapBox;
+			FTextBuilder FunctionSearchText;
+
+			FCategoryEntry(FName InCategoryName)
+				: CategoryName(InCategoryName)
+			{
+				WrapBox = SNew(SWrapBox).UseAllottedSize(true);
+			}
+		};
+
+		// Build up a set of functions for each category, accumulating search text and buttons in a wrap box
+		FName ActiveCategory;
+		TArray<FCategoryEntry, TInlineAllocator<8>> CategoryList;
+		for (UFunction* Function : CallInEditorFunctions)
+		{
+			FName FunctionCategoryName(NAME_Default);
+			if (FRuntimeMetaData::HasMetaData(Function, MD_FunctionCategory))
+			{
+				FunctionCategoryName = FName(*FRuntimeMetaData::GetMetaData(Function, MD_FunctionCategory));
+			}
+
+			if (FunctionCategoryName != ActiveCategory)
+			{
+				ActiveCategory = FunctionCategoryName;
+				CategoryList.Emplace(FunctionCategoryName);
+			}
+			FCategoryEntry& CategoryEntry = CategoryList.Last();
+
+			//@TODO: Expose the code in UK2Node_CallFunction::GetUserFacingFunctionName / etc...
+			const FText ButtonCaption = FText::FromString(FName::NameToDisplayString(*Function->GetName(), false));
+			FText FunctionTooltip;// = Function->GetToolTipText();
+			if (FunctionTooltip.IsEmpty())
+			{
+				FunctionTooltip = FText::FromString(Function->GetName());
+			}
+			
+
+			TWeakObjectPtr<UFunction> WeakFunctionPtr(Function);
+			CategoryEntry.WrapBox->AddSlot()
+			.Padding(0.0f, 0.0f, 5.0f, 3.0f)
+			[
+				SNew(SButton)
+				.Text(ButtonCaption)
+				.OnClicked(FOnClicked::CreateSP(this, &FObjectDetails::OnExecuteCallInEditorFunction, WeakFunctionPtr))
+				.ToolTipText(FText::Format(LOCTEXT("CallInEditorTooltip", "Call an event on the selected object(s)\n\n\n{0}"), FunctionTooltip))
+			];
+
+			CategoryEntry.RowTag = Function->GetFName();
+			CategoryEntry.FunctionSearchText.AppendLine(ButtonCaption);
+			CategoryEntry.FunctionSearchText.AppendLine(FunctionTooltip);
+		}
+		
+		// Now edit the categories, adding the button strips to the details panel
+		for (FCategoryEntry& CategoryEntry : CategoryList)
+		{
+			IDetailCategoryBuilder& CategoryBuilder = DetailBuilder.EditCategory(CategoryEntry.CategoryName);
+			CategoryBuilder.AddCustomRow(CategoryEntry.FunctionSearchText.ToText())
+			.RowTag(CategoryEntry.RowTag)
+			[
+				CategoryEntry.WrapBox.ToSharedRef()
+			];
+		}
+	}
+}
+
+FReply FObjectDetails::OnExecuteCallInEditorFunction(TWeakObjectPtr<UFunction> WeakFunctionPtr)
+{
+	if (UFunction* Function = WeakFunctionPtr.Get())
+	{
+		//@TODO: Consider naming the transaction scope after the fully qualified function name for better UX
+		//FScopedTransaction Transaction(LOCTEXT("ExecuteCallInEditorMethod", "Call In Editor Action"));
+
+		FEditorScriptExecutionGuard ScriptGuard;
+		for (TWeakObjectPtr<UObject> SelectedObjectPtr : SelectedObjectsList)
+		{
+			if (UObject* Object = SelectedObjectPtr.Get())
+			{
+				Object->ProcessEvent(Function, nullptr);
+			}
+		}
+	}
+
+	return FReply::Handled();
+}
+
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/ObjectDetails.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ObjectDetails.h
new file mode 100644
index 0000000..0299c73
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/ObjectDetails.h
@@ -0,0 +1,43 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakObjectPtr.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "RuntimePropertyEditor/IDetailCustomization.h"
+
+namespace soda
+{
+
+class IDetailLayoutBuilder;
+
+class FObjectDetails : public IDetailCustomization
+{
+public:
+	// Creates an instance of FObjectDetails
+	static TSharedRef<IDetailCustomization> MakeInstance();
+
+	// IDetailCustomization interface
+	virtual void CustomizeDetails(IDetailLayoutBuilder& DetailLayout) override;
+	// End of IDetailCustomization interface
+
+private:
+	// Adds a warning banner if the class is marked as Experimental or EarlyAccessPreview
+	void AddExperimentalWarningCategory(IDetailLayoutBuilder& DetailBuilder);
+
+	// Creates a button strip in each category that contains reflected functions marked as CallInEditor
+	void AddCallInEditorMethods(IDetailLayoutBuilder& DetailBuilder);
+
+	// Executes the specified method on the selected objects
+	FReply OnExecuteCallInEditorFunction(TWeakObjectPtr<UFunction> WeakFunctionPtr);
+
+private:
+	// The list of selected objects, used when invoking a CallInEditor method
+	TArray<TWeakObjectPtr<UObject>> SelectedObjectsList;
+};
+
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/SceneComponentDetails.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SceneComponentDetails.cpp
new file mode 100644
index 0000000..0526f38
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SceneComponentDetails.cpp
@@ -0,0 +1,359 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/SceneComponentDetails.h"
+#include "UObject/Class.h"
+#include "Components/SceneComponent.h"
+#include "GameFramework/Actor.h"
+#include "Engine/Blueprint.h"
+#include "Components/LightComponentBase.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "Engine/SimpleConstructionScript.h"
+#include "Engine/SCS_Node.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+//#include "Customizations/MobilityCustomization.h"
+#include "RuntimePropertyEditor/PropertyRestriction.h"
+#include "SodaDetailCustomizations/ComponentTransformDetails.h"
+#include "Engine/InheritableComponentHandler.h"
+#include "ComponentUtils.h"
+
+#define LOCTEXT_NAMESPACE "SceneComponentDetails"
+
+namespace soda
+{
+
+/**
+ * Walks the scene hierarchy looking for inherited components (like ones from
+ * a parent class). If it finds one, this returns its mobility setting. 
+ * 
+ * @param  SceneComponent	The child component who's ancestor hierarchy you want to traverse.
+ * @return The mobility of the first scene-component ancestor (EComponentMobility::Static if one wasn't found).
+ */
+static EComponentMobility::Type GetInheritedMobility(USceneComponent const* const SceneComponent)
+{
+	// default to "static" since it doesn't restrict anything (in case we don't inherit any at all)
+	EComponentMobility::Type InheritedMobility = EComponentMobility::Static;
+
+	USCS_Node* ComponentNode = ComponentUtils::FindCorrespondingSCSNode(SceneComponent);
+	
+	if(ComponentNode == NULL)
+	{
+		return EComponentMobility::Static;
+	}
+
+	USimpleConstructionScript const* const SceneSCS = ComponentNode->GetSCS();
+	check(SceneSCS != NULL);
+	
+	do 
+	{
+		bool const bIsParentInherited = !ComponentNode->ParentComponentOwnerClassName.IsNone();
+		// if we can't alter the parent component's mobility from the current blueprint
+		if (bIsParentInherited)
+		{
+			USCS_Node const* ParentNode = NULL;
+
+			UClass* ParentClass = SceneSCS->GetOwnerClass();
+			// ParentNode should be null, so we need to find it in the class that owns it...
+			// first, find the class:
+			while((ParentClass != NULL) && (ParentClass->GetFName() != ComponentNode->ParentComponentOwnerClassName))
+			{
+				ParentClass = ParentClass->GetSuperClass();
+			}
+			// now look through this blueprint and find the inherited parent node
+			if (UBlueprintGeneratedClass* BlueprintClass = Cast<UBlueprintGeneratedClass>(ParentClass))
+			{
+				for (USCS_Node const* Node : BlueprintClass->SimpleConstructionScript->GetAllNodes())
+				{
+					check(Node); // fix for this bug: https://connect.microsoft.com/VisualStudio/feedback/details/3081898
+					if (Node->GetVariableName() == ComponentNode->ParentComponentOrVariableName)
+					{
+						ParentNode = Node;
+						break;
+					}
+				}
+			}
+
+			if (ParentNode != NULL)
+			{
+				if (USceneComponent const* const ParentComponent = Cast<USceneComponent>(ParentNode->ComponentTemplate))
+				{
+					InheritedMobility = ParentComponent->Mobility;
+					break;
+				}
+			}
+		}
+		ComponentNode = SceneSCS->FindParentNode(ComponentNode);
+
+	} while (ComponentNode != NULL);
+
+	return InheritedMobility;
+}
+
+
+/**
+ * Checks to see if the specified mobility is valid for the passed USceneComponent.
+ * 
+ * @param  MobilityValue		The mobility you wish to validate.
+ * @param  SceneComponent		The component you want to check for.
+ * @param  ProhibitedReasonOut	If the mobility is invalid, this will explain why.
+ * @return False if the mobility in question is valid, true if it is invalid.
+ */
+static bool IsMobilitySettingProhibited(EComponentMobility::Type const MobilityValue, USceneComponent const* const SceneComponent, FText& ProhibitedReasonOut)
+{
+	bool bIsProhibited = false;
+
+	switch (MobilityValue)
+	{
+	case EComponentMobility::Movable:
+		{
+			// movable is always an option (parent components can't prevent this from being movable)
+			bIsProhibited = false;
+			break;
+		}
+
+	case EComponentMobility::Stationary:
+		{
+			if (GetInheritedMobility(SceneComponent) == EComponentMobility::Movable)
+			{
+				ProhibitedReasonOut = LOCTEXT("ParentMoreMobileRestriction", "Selected objects cannot be less mobile than their inherited parents.");
+				// can't be less movable than what we've inherited
+				bIsProhibited = true;
+			}
+			break;
+		}
+
+	case EComponentMobility::Static:
+		{
+			if (GetInheritedMobility(SceneComponent) != EComponentMobility::Static)
+			{
+				ProhibitedReasonOut = LOCTEXT("ParentMoreMobileRestriction", "Selected objects cannot be less mobile than their inherited parents.");
+				// can't be less movable than what we've inherited
+				bIsProhibited = true;
+			}
+		}
+	};	
+
+	return bIsProhibited;
+};
+
+TSharedRef<IDetailCustomization> FSceneComponentDetails::MakeInstance()
+{
+	return MakeShareable( new FSceneComponentDetails );
+}
+
+void FSceneComponentDetails::CustomizeDetails( IDetailLayoutBuilder& DetailBuilder )
+{
+	MakeTransformDetails( DetailBuilder );
+
+	// Put mobility property in Transform section
+	IDetailCategoryBuilder& TransformCategory = DetailBuilder.EditCategory( "TransformCommon", LOCTEXT("TransformCommonCategory", "Transform"), ECategoryPriority::Transform );
+	//TSharedRef<IPropertyHandle> MobilityHandle = DetailBuilder.GetProperty("Mobility");
+	/*
+	if(MobilityHandle->IsValidHandle())
+	{
+		uint8 RestrictedMobilityBits = 0u;
+		bool bAnySelectedIsLight = false;
+
+		TArray< TWeakObjectPtr<UObject> > SelectedSceneComponents;
+
+		// see if any of the selected objects have mobility restrictions
+		DetailBuilder.GetObjectsBeingCustomized(SelectedSceneComponents);
+
+		for (TArray<TWeakObjectPtr<UObject>>::TConstIterator ObjectIt(SelectedSceneComponents); ObjectIt; ++ObjectIt)
+		{
+			if (!ObjectIt->IsValid())
+			{
+				continue;
+			}
+
+			USceneComponent const* SceneComponent = Cast<USceneComponent>((*ObjectIt).Get());
+			if (SceneComponent == NULL)
+			{
+				continue;
+			}
+
+			if (SceneComponent->IsA(ULightComponentBase::StaticClass()))
+			{
+				bAnySelectedIsLight = true;
+			}
+
+			// if we haven't restricted the "Static" option yet
+			if (!(RestrictedMobilityBits & FMobilityCustomization::StaticMobilityBitMask))
+			{
+				FText RestrictReason;
+				if (IsMobilitySettingProhibited(EComponentMobility::Static, SceneComponent, RestrictReason))
+				{
+					TSharedPtr<FPropertyRestriction> StaticRestriction = MakeShareable(new FPropertyRestriction(MoveTemp(RestrictReason)));
+					const UEnum* const ComponentMobilityEnum = StaticEnum<EComponentMobility::Type>();
+					StaticRestriction->AddDisabledValue(ComponentMobilityEnum->GetNameStringByValue((uint8)EComponentMobility::Static));
+					MobilityHandle->AddRestriction(StaticRestriction.ToSharedRef());
+
+					RestrictedMobilityBits |= FMobilityCustomization::StaticMobilityBitMask;
+				}
+			}
+
+			// if we haven't restricted the "Stationary" option yet
+			if (!(RestrictedMobilityBits & FMobilityCustomization::StationaryMobilityBitMask))
+			{
+				FText RestrictReason;
+				if (IsMobilitySettingProhibited(EComponentMobility::Stationary, SceneComponent, RestrictReason))
+				{
+					TSharedPtr<FPropertyRestriction> StationaryRestriction = MakeShareable(new FPropertyRestriction(MoveTemp(RestrictReason)));
+					const UEnum* const ComponentMobilityEnum = StaticEnum<EComponentMobility::Type>();
+					StationaryRestriction->AddDisabledValue(ComponentMobilityEnum->GetNameStringByValue((uint8)EComponentMobility::Stationary));
+					MobilityHandle->AddRestriction(StationaryRestriction.ToSharedRef());
+
+					RestrictedMobilityBits |= FMobilityCustomization::StationaryMobilityBitMask;
+				}
+			}
+
+			// no need to go through all of them if we can't restrict any more
+			if ((RestrictedMobilityBits & FMobilityCustomization::StaticMobilityBitMask) && (RestrictedMobilityBits & FMobilityCustomization::StationaryMobilityBitMask))
+			{
+				break;
+			}
+		}
+
+		TransformCategory.AddCustomBuilder(MakeShared<FMobilityCustomization>(MobilityHandle, RestrictedMobilityBits, bAnySelectedIsLight));
+	}
+	*/
+
+	// Only display bHiddenInGame if the property is being flattened in to an Actor.
+	// Details panel for BP component will have the base class be the Actor due to how the SKismetInspector works, but in that case we
+	// have a class default object selected, so use that to infer that this is the component directly selected and since BPs do not do
+	// property flattening it all kind of works
+	if (DetailBuilder.GetBaseClass()->IsChildOf<AActor>() && DetailBuilder.GetDetailsView() && !DetailBuilder.GetDetailsView()->HasClassDefaultObject())
+	{
+		TSharedPtr<IPropertyHandle> ComponentHiddenInGameProperty = DetailBuilder.GetProperty(GET_MEMBER_NAME_CHECKED(USceneComponent, bHiddenInGame));
+		ComponentHiddenInGameProperty->MarkHiddenByCustomization();
+	}
+}
+
+void FSceneComponentDetails::MakeTransformDetails( IDetailLayoutBuilder& DetailBuilder )
+{
+	int SelectedActorsNum = 0;
+	//const FSelectedActorInfo* SelectedActorInfoPtr = nullptr;
+
+	const IDetailsView* DetailsView = DetailBuilder.GetDetailsView();
+	if (DetailsView)
+	{
+		SelectedActorsNum = DetailsView->GetSelectedActors().Num();
+		//SelectedActorInfoPtr = &DetailsView->GetSelectedActorInfo();
+	}
+
+	// Hide the transform properties so they don't show up
+	DetailBuilder.HideProperty(DetailBuilder.GetProperty(USceneComponent::GetAbsoluteLocationPropertyName()));
+	DetailBuilder.HideProperty(DetailBuilder.GetProperty(USceneComponent::GetAbsoluteRotationPropertyName()));
+	DetailBuilder.HideProperty(DetailBuilder.GetProperty(USceneComponent::GetAbsoluteScalePropertyName()));
+	DetailBuilder.HideProperty(DetailBuilder.GetProperty(USceneComponent::GetRelativeLocationPropertyName()));
+	DetailBuilder.HideProperty(DetailBuilder.GetProperty(USceneComponent::GetRelativeRotationPropertyName()));
+	DetailBuilder.HideProperty(DetailBuilder.GetProperty(USceneComponent::GetRelativeScale3DPropertyName()));
+
+	// Determine whether or not we are editing Class Defaults through the CDO
+	bool bIsEditingBlueprintDefaults = false;
+	const TArray<TWeakObjectPtr<UObject> >& SelectedObjects = DetailBuilder.GetSelectedObjects();
+	for(int32 ObjectIndex = 0; ObjectIndex < SelectedObjects.Num(); ++ObjectIndex)
+	{
+		UObject* SelectedObject = SelectedObjects[ObjectIndex].Get();
+		if(SelectedObject && SelectedObject->HasAnyFlags(RF_ClassDefaultObject))
+		{
+			bIsEditingBlueprintDefaults = false;//!!UBlueprint::GetBlueprintFromClass(SelectedObject->GetClass());
+			if(!bIsEditingBlueprintDefaults)
+			{
+				break;
+			}
+		}
+	}
+
+	// If there are any actors selected and we're not editing Class Defaults, the transform section is shown as part of the actor customization
+	if(SelectedActorsNum == 0 || bIsEditingBlueprintDefaults)
+	{
+		TArray< TWeakObjectPtr<UObject> > SceneComponentObjects;
+		DetailBuilder.GetObjectsBeingCustomized( SceneComponentObjects );
+
+		// Default to showing the transform for all components unless we are viewing a non-Blueprint class default object (the transform is not used in that case)
+		bool bShouldShowTransform = true;
+		if (DetailsView)
+		{
+			bShouldShowTransform  = !DetailsView->HasClassDefaultObject() || bIsEditingBlueprintDefaults;
+		}
+
+		for (int32 ComponentIndex = 0; bShouldShowTransform && ComponentIndex < SceneComponentObjects.Num(); ++ComponentIndex)
+		{
+			USceneComponent* SceneComponent = Cast<USceneComponent>(SceneComponentObjects[ComponentIndex].Get());
+			if (SceneComponent == nullptr)
+			{
+				continue;
+			}
+
+			if (SceneComponent->GetAttachParent() == NULL && SceneComponent->GetOuter()->HasAnyFlags(RF_ClassDefaultObject))
+			{
+				bShouldShowTransform = false;
+			}
+			else if (const USimpleConstructionScript* SCS = ComponentUtils::GetSimpleConstructionScript(SceneComponent))
+			{
+				const TArray<USCS_Node*>& RootNodes = SCS->GetRootNodes();
+				for(int32 RootNodeIndex = 0; bShouldShowTransform && RootNodeIndex < RootNodes.Num(); ++RootNodeIndex)
+				{
+					USCS_Node* RootNode = RootNodes[RootNodeIndex];
+					check(RootNode);
+
+					if(RootNode->ComponentTemplate == SceneComponent && RootNode->ParentComponentOrVariableName == NAME_None)
+					{
+						bShouldShowTransform = false;
+					}
+				}
+			}
+			/*
+			if (bShouldShowTransform && SceneComponent->HasAnyFlags(RF_InheritableComponentTemplate))
+			{
+				UClass* OwnerClass = Cast<UClass>(SceneComponent->GetOuter());
+				if (UBlueprint* Blueprint = UBlueprint::GetBlueprintFromClass(OwnerClass))
+				{
+					if (UInheritableComponentHandler* InheritableComponentHandler = Blueprint->GetInheritableComponentHandler(false))
+					{
+						FComponentKey ComponentKey = InheritableComponentHandler->FindKey(SceneComponent);
+						if (ComponentKey.IsValid())
+						{
+							if (USCS_Node* SCSNode = ComponentKey.FindSCSNode())
+							{
+								const bool bProperRootNodeFound = SCSNode->IsRootNode() && (SCSNode->ParentComponentOrVariableName == NAME_None);
+								if (bProperRootNodeFound)
+								{
+									bShouldShowTransform = false;
+								}
+							}
+						}
+					}
+				}
+			}
+			*/
+		}
+
+		//const FSelectedActorInfo& SelectedActorInfo = SelectedActorInfoPtr ? *SelectedActorInfoPtr : FSelectedActorInfo();
+		const TArray< TWeakObjectPtr<UObject> >& SelectedObjects2 = bIsEditingBlueprintDefaults ? SceneComponentObjects : DetailBuilder.GetSelectedObjects();
+
+		if (SelectedObjects2.Num())
+		{
+
+			TSharedRef<FComponentTransformDetails> TransformDetails = MakeShareable(new FComponentTransformDetails(SelectedObjects2, DetailBuilder));
+
+			if (!bShouldShowTransform)
+			{
+				TransformDetails->HideTransformField(ETransformField::Location);
+				TransformDetails->HideTransformField(ETransformField::Rotation);
+			}
+
+			IDetailCategoryBuilder& TransformCategory = DetailBuilder.EditCategory("TransformCommon", LOCTEXT("TransformCommonCategory", "Transform"), ECategoryPriority::Transform);
+
+			TransformCategory.AddCustomBuilder(TransformDetails);
+		}
+	}
+
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/SceneComponentDetails.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SceneComponentDetails.h
new file mode 100644
index 0000000..32e4e70
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SceneComponentDetails.h
@@ -0,0 +1,27 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/IDetailCustomization.h"
+
+namespace soda
+{
+
+class IDetailLayoutBuilder;
+
+class FSceneComponentDetails : public IDetailCustomization
+{
+public:
+	/** Makes a new instance of this detail layout class for a specific detail view requesting it */
+	static TSharedRef<IDetailCustomization> MakeInstance();
+
+	/** IDetailCustomization interface */
+	virtual void CustomizeDetails( IDetailLayoutBuilder& DetailBuilder ) override;
+	
+private:
+	void MakeTransformDetails( IDetailLayoutBuilder& DetailBuilder );
+};
+
+}
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/SoftObjectPathCustomization.cpp b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SoftObjectPathCustomization.cpp
new file mode 100644
index 0000000..1b88b67
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SoftObjectPathCustomization.cpp
@@ -0,0 +1,61 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDetailCustomizations/SoftObjectPathCustomization.h"
+
+#include "Containers/UnrealString.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+//#include "EditorClassUtils.h"
+#include "HAL/PlatformCrt.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "UObject/Object.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "RuntimeEditorUtils.h"
+
+class IDetailChildrenBuilder;
+class UClass;
+
+namespace soda
+{
+
+void FSoftObjectPathCustomization::CustomizeHeader( TSharedRef<IPropertyHandle> InStructPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils )
+{
+	StructPropertyHandle = InStructPropertyHandle;
+	
+	const FString& MetaClassName = InStructPropertyHandle->GetMetaData("MetaClass");
+	UClass* MetaClass = !MetaClassName.IsEmpty()
+		? FRuntimeEditorUtils::GetClassFromString(MetaClassName)
+		: UObject::StaticClass();
+
+	TSharedRef<SObjectPropertyEntryBox> ObjectPropertyEntryBox = SNew(SObjectPropertyEntryBox)
+		.AllowedClass(MetaClass)
+		.PropertyHandle(InStructPropertyHandle)
+		//.ThumbnailPool(StructCustomizationUtils.GetThumbnailPool())
+		;
+
+	float MinDesiredWidth, MaxDesiredWidth;
+	ObjectPropertyEntryBox->GetDesiredWidth(MinDesiredWidth, MaxDesiredWidth);
+
+	HeaderRow
+	.NameContent()
+	[
+		InStructPropertyHandle->CreatePropertyNameWidget()
+	]
+	.ValueContent()
+	.MinDesiredWidth(MinDesiredWidth)
+	.MaxDesiredWidth(MaxDesiredWidth)
+	[
+		// Add an object entry box.  Even though this isn't an object entry, we will simulate one
+		ObjectPropertyEntryBox
+	];
+
+	// This avoids making duplicate reset boxes
+	StructPropertyHandle->MarkResetToDefaultCustomized();
+}
+
+void FSoftObjectPathCustomization::CustomizeChildren(TSharedRef<IPropertyHandle> InStructPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils)
+{
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/SoftObjectPathCustomization.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SoftObjectPathCustomization.h
new file mode 100644
index 0000000..9f3140d
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/SoftObjectPathCustomization.h
@@ -0,0 +1,34 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "Templates/SharedPointer.h"
+
+namespace soda
+{
+
+class IPropertyHandle;
+
+/**
+ * Customizes a soft object path to look like a UObject property
+ */
+class FSoftObjectPathCustomization : public IPropertyTypeCustomization
+{
+public:
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance() 
+	{
+		return MakeShareable( new FSoftObjectPathCustomization );
+	}
+
+	/** IPropertyTypeCustomization interface */
+	virtual void CustomizeHeader( TSharedRef<class IPropertyHandle> InStructPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils ) override;
+	virtual void CustomizeChildren( TSharedRef<class IPropertyHandle> InStructPropertyHandle, class IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils ) override;
+
+private:
+	/** Handle to the struct property being customized */
+	TSharedPtr<IPropertyHandle> StructPropertyHandle;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/ColorStructCustomization.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/ColorStructCustomization.h
new file mode 100644
index 0000000..87b3c60
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/ColorStructCustomization.h
@@ -0,0 +1,187 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "IPropertyTypeCustomization.h"
+#include "PropertyHandle.h"
+#include "MathStructCustomizations.h"
+
+class FDetailWidgetRow;
+class SColorPicker;
+class SBorder;
+
+/**
+ * Base class for color struct customization (FColor,FLinearColor).
+ */
+class DETAILCUSTOMIZATIONS_API FColorStructCustomization
+	: public FMathStructCustomization
+{
+public:
+
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance();
+	~FColorStructCustomization();
+
+protected:
+
+	FColorStructCustomization()
+		: bIgnoreAlpha(false)
+		, bIsInlineColorPickerVisible(false)
+		, bIsInteractive(false)
+		, bDontUpdateWhileEditing(false)
+
+	{}
+
+protected:
+
+	/** Creates the color widget that when clicked spawns the color picker window. */
+	TSharedRef<SWidget> CreateColorWidget(TWeakPtr<IPropertyHandle>);
+
+	/**
+	 * Get the color used by this struct as a linear color value
+	 * @param InColor To be filled with the color value used by this struct, or white if this struct is being used to edit multiple values  
+	 * @return The result of trying to get the color value
+	 */
+	FPropertyAccess::Result GetColorAsLinear(FLinearColor& InColor) const;
+
+	/**
+	 * Does this struct have multiple values?
+	 * @return EVisibility::Visible if it does, EVisibility::Collapsed otherwise
+	 */
+	EVisibility GetMultipleValuesTextVisibility() const;
+
+	/**
+	 * Creates a new color picker for interactively selecting the color
+	 *
+	 * @param bUseAlpha If true alpha will be displayed, otherwise it is ignored
+	 * @param bOnlyRefreshOnOk If true the value of the property will only be refreshed when the user clicks OK in the color picker
+	 */
+	void CreateColorPicker(bool bUseAlpha);
+	
+	/** Creates a new color picker for interactively selecting color */
+	TSharedRef<SColorPicker> CreateInlineColorPicker(TWeakPtr<IPropertyHandle>);
+
+	/**
+	 * Called when the property is set from the color picker 
+	 * 
+	 * @param NewColor The new color value
+	 */
+	void OnSetColorFromColorPicker(FLinearColor NewColor);
+	
+	/**
+	 * Called to reset all colors to before the color picker spawned
+	 */
+	void ResetColors();
+
+	/**
+	 * Called when the user clicks cancel in the color picker
+	 * The values are reset to their original state when this happens
+	 *
+	 * @param OriginalColor Original color of the property
+	 */
+	void OnColorPickerCancelled(FLinearColor OriginalColor);
+
+	/**
+	 * Called when the color picker window is clsoed
+	 */
+	void OnColorPickerWindowClosed(const TSharedRef<SWindow>& Window);
+
+	/**
+	 * Called when the user enters an interactive color change (dragging something in the picker)
+	 */
+	void OnColorPickerInteractiveBegin();
+
+	/**
+	 * Called when the user completes an interactive color change (dragging something in the picker)
+	 */
+	void OnColorPickerInteractiveEnd();
+
+	/**
+	 * @return The color that should be displayed in the color block                                                              
+	 */
+	FLinearColor OnGetColorForColorBlock() const;
+	
+	/**
+	 * @return The color that should be displayed in the color block in slate color format                                                           
+	 */
+	FSlateColor  OnGetSlateColorForBlock() const;
+
+	/**
+	 * @return The border color encompassing the entire color block                                                         
+	 */
+	FSlateColor GetColorWidgetBorderColor() const;
+	/**
+	 * Called when the user clicks in the color block (opens inline color picker)
+	 */
+	FReply OnMouseButtonDownColorBlock(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent);
+	
+	/** Called when the user clicks on the the button to get the full color picker */
+	FReply OnOpenFullColorPickerClicked();
+
+protected:
+
+	// FMathStructCustomization interface
+
+	virtual void CustomizeHeader(TSharedRef<IPropertyHandle> StructPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils) override;
+	virtual void MakeHeaderRow(TSharedRef<IPropertyHandle>& InStructPropertyHandle, FDetailWidgetRow& Row) override;
+	virtual void GetSortedChildren(TSharedRef<IPropertyHandle> StructPropertyHandle, TArray< TSharedRef<IPropertyHandle> >& OutChildren) override;
+
+protected:
+	/** Stores a linear or srb color without converting between the two. Only one is valid at a time */
+	struct FLinearOrSrgbColor
+	{
+		FLinearOrSrgbColor(const FLinearColor& InLinearColor)
+			: LinearColor(InLinearColor)
+		{}
+
+		FLinearOrSrgbColor(const FColor& InSrgbColor)
+			: SrgbColor(InSrgbColor)
+		{}
+
+		FLinearColor GetLinear() const { return LinearColor; }
+		FColor GetSrgb() const { return SrgbColor; }
+	private:
+		FLinearColor LinearColor;
+		FColor SrgbColor;
+	};
+
+	/** Saved per struct colors in case the user clicks cancel in the color picker */
+	TArray<FLinearOrSrgbColor> SavedPreColorPickerColors;
+
+	/** Color struct handle */
+	TSharedPtr<IPropertyHandle> StructPropertyHandle;
+
+	/** Cached widget for the color picker to use as a parent */
+	TSharedPtr<SWidget> ColorPickerParentWidget;
+
+	TSharedPtr<SWidget > ColorWidgetBackgroundBorder;
+
+	/** Overrides the default state of the sRGB check box */
+	TOptional<bool> sRGBOverride;
+
+	/** True if the property is a linear color property */
+	bool bIsLinearColor;
+
+	/** True if the property wants to ignore the alpha component */
+	bool bIgnoreAlpha;
+
+	/** True if the inline color picker is visible */
+	bool bIsInlineColorPickerVisible;
+
+	/** True if the user is performing an interactive color change */
+	bool bIsInteractive;
+
+	/** Last color set from color picker as string*/
+	FString LastPickerColorString;
+
+
+	/** The value won;t be updated while editing */
+	bool bDontUpdateWhileEditing;
+
+
+	
+};
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/MathStructCustomizations.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/MathStructCustomizations.h
new file mode 100644
index 0000000..9dc108a
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/MathStructCustomizations.h
@@ -0,0 +1,195 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "IPropertyTypeCustomization.h"
+#include "PropertyHandle.h"
+
+class FDetailWidgetRow;
+class IDetailChildrenBuilder;
+
+/**
+ * Base class for math struct customization (e.g, vector, rotator, color)                                                              
+ */
+class DETAILCUSTOMIZATIONS_API FMathStructCustomization
+	: public IPropertyTypeCustomization
+{
+public:
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance();
+
+	/** Notification when the max/min slider values are changed (only apply if SupportDynamicSliderMaxValue or SupportDynamicSliderMinValue are true) */
+	DECLARE_MULTICAST_DELEGATE_FourParams(FOnNumericEntryBoxDynamicSliderMinMaxValueChanged, float, TWeakPtr<SWidget>, bool, bool);
+
+	FMathStructCustomization()
+		: bIsUsingSlider(false)
+		, bPreserveScaleRatio(false)
+	{ }
+
+	virtual ~FMathStructCustomization() {}
+
+	/** IPropertyTypeCustomization instance */
+	virtual void CustomizeHeader(TSharedRef<IPropertyHandle> StructPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils) override;
+	virtual void CustomizeChildren(TSharedRef<IPropertyHandle> StructPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils) override;
+
+	/** Return max/min slider value changed delegate (only apply if SupportDynamicSliderMaxValue or SupportDynamicSliderMinValue are true) */
+	FOnNumericEntryBoxDynamicSliderMinMaxValueChanged& GetOnNumericEntryBoxDynamicSliderMaxValueChangedDelegate() { return OnNumericEntryBoxDynamicSliderMaxValueChanged; }
+	FOnNumericEntryBoxDynamicSliderMinMaxValueChanged& GetOnNumericEntryBoxDynamicSliderMinValueChangedDelegate() { return OnNumericEntryBoxDynamicSliderMinValueChanged; }
+
+	/** Callback when the max/min spinner value are changed (only apply if SupportDynamicSliderMaxValue or SupportDynamicSliderMinValue are true) */
+	template <typename NumericType>
+	void OnDynamicSliderMaxValueChanged(NumericType NewMaxSliderValue, TWeakPtr<SWidget> InValueChangedSourceWidget, bool IsOriginator, bool UpdateOnlyIfHigher);
+
+	template <typename NumericType>
+	void OnDynamicSliderMinValueChanged(NumericType NewMinSliderValue, TWeakPtr<SWidget> InValueChangedSourceWidget, bool IsOriginator, bool UpdateOnlyIfLower);
+
+	/**
+	* Called to see if the value is enabled for editing
+	*
+	* @param WeakHandlePtr	Handle to the property that the new value is for
+	*/
+	bool IsValueEnabled(TWeakPtr<IPropertyHandle> WeakHandlePtr) const;
+	
+	// Argument struct for ExtractNumericMetadata, to make it easier to add new metadata to extract.
+	template <typename NumericType>
+	struct FNumericMetadata
+	{
+		TOptional<NumericType> MinValue;
+		TOptional<NumericType> MaxValue;
+		TOptional<NumericType> SliderMinValue;
+		TOptional<NumericType> SliderMaxValue;
+		NumericType SliderExponent;
+		NumericType Delta;
+		int32 LinearDeltaSensitivity;
+		int32 ShiftMouseMovePixelPerDelta;
+		bool bSupportDynamicSliderMaxValue;
+		bool bSupportDynamicSliderMinValue;
+	};
+
+	/** Utility function that will extract common Math related numeric metadata */	
+	template <typename NumericType>
+	DETAILCUSTOMIZATIONS_API static void ExtractNumericMetadata(TSharedRef<IPropertyHandle>& PropertyHandle, FNumericMetadata<NumericType>& MetadataOut);
+
+	template <typename NumericType>
+	UE_DEPRECATED(5.0, "Use ExtractNumericMetadata overload with struct argument instead.")
+	DETAILCUSTOMIZATIONS_API static void ExtractNumericMetadata(TSharedRef<IPropertyHandle>& PropertyHandle, TOptional<NumericType>& MinValue, 
+		TOptional<NumericType>& MaxValue, TOptional<NumericType>& SliderMinValue, TOptional<NumericType>& SliderMaxValue,
+		NumericType& SliderExponent, NumericType& Delta, int32& ShiftMouseMovePixelPerDelta, 
+		bool& bSupportDynamicSliderMaxValue, bool& bSupportDynamicSliderMinValue);
+
+protected:
+
+	/**
+	 * Makes the header row for the customization
+	 *
+	 * @param StructPropertyHandle	Handle to the struct property
+	 * @param Row	The header row to add widgets to
+	 */
+	virtual void MakeHeaderRow(TSharedRef<IPropertyHandle>& StructPropertyHandle, FDetailWidgetRow& Row);
+
+	/**
+	 * Gets the sorted children for the struct
+	 *
+	 * @param StructPropertyHandle	The handle to the struct property
+	 * @param OutChildren			The child array that should be populated in the order that children should be displayed
+	 */
+	virtual void GetSortedChildren(TSharedRef<IPropertyHandle> StructPropertyHandle, TArray< TSharedRef<IPropertyHandle> >& OutChildren);
+
+	/**
+	 * Constructs a widget for the property handle 
+	 *
+	 * @param StructurePropertyHandle	handle of the struct property
+	 * @param PropertyHandle	Child handle of the struct property
+	 */
+	virtual TSharedRef<SWidget> MakeChildWidget(
+		TSharedRef<IPropertyHandle>& StructurePropertyHandle,
+		TSharedRef<IPropertyHandle>& PropertyHandle);
+
+	/**
+	 * Gets the value as a float for the provided property handle
+	 *
+	 * @param WeakHandlePtr	Handle to the property to get the value from
+	 * @return The value or unset if it could not be accessed
+	 */
+	template<typename NumericType>
+	TOptional<NumericType> OnGetValue(TWeakPtr<IPropertyHandle> WeakHandlePtr) const;
+
+	/**
+	 * Called when the value is committed from the property editor
+	 *
+	 * @param NewValue		The new value of the property as a float
+	 * @param CommitType	How the value was committed (unused)
+	 * @param WeakHandlePtr	Handle to the property that the new value is for
+	 */
+	template<typename NumericType>
+	void OnValueCommitted(NumericType NewValue, ETextCommit::Type CommitType, TWeakPtr<IPropertyHandle> WeakHandlePtr);
+	
+
+	/**
+	 * Called when the value is changed in the property editor
+	 *
+	 * @param NewValue		The new value of the property as a float
+	 * @param WeakHandlePtr	Handle to the property that the new value is for
+	 */
+	template<typename NumericType>
+	void OnValueChanged(NumericType NewValue, TWeakPtr<IPropertyHandle> WeakHandlePtr);
+
+	/**
+	 * Called to set the value of the property handle.
+	 *
+	 * @param NewValue		The new value of the property as a float
+	 * @param Flags         The flags to pass when setting the value on the property handle.
+	 * @param WeakHandlePtr	Handle to the property that the new value is for
+	 */
+	template<typename NumericType>
+	void SetValue(NumericType NewValue, EPropertyValueSetFlags::Type Flags, TWeakPtr<IPropertyHandle> WeakHandlePtr);
+
+	/**
+	 * Gets the tooltip for the value. Displays the property name and the current value
+	 * 
+	 * @praram WeakHandlePtr Handle to the property to get the value from
+	 */
+	template <typename NumericType>
+	FText OnGetValueToolTip(TWeakPtr<IPropertyHandle> WeakHandlePtr) const;
+private:
+
+	/** Gets the brush to use for the lock icon. */
+	const FSlateBrush* GetPreserveScaleRatioImage() const;
+
+	/** Gets the checked value of the preserve scale ratio option */
+	ECheckBoxState IsPreserveScaleRatioChecked() const;
+
+	/** Called when the user toggles preserve ratio. */
+	void OnPreserveScaleRatioToggled(ECheckBoxState NewState, TWeakPtr<IPropertyHandle> PropertyHandle);
+
+private:
+
+	/** Called when a value starts to be changed by a slider */
+	void OnBeginSliderMovement();
+
+	/** Called when a value stops being changed by a slider */
+	template<typename NumericType>
+	void OnEndSliderMovement(NumericType NewValue);
+
+	template<typename NumericType>
+	TSharedRef<SWidget> MakeNumericWidget(TSharedRef<IPropertyHandle>& StructurePropertyHandle, TSharedRef<IPropertyHandle>& PropertyHandle);
+
+protected:
+
+	FOnNumericEntryBoxDynamicSliderMinMaxValueChanged OnNumericEntryBoxDynamicSliderMaxValueChanged;
+	FOnNumericEntryBoxDynamicSliderMinMaxValueChanged OnNumericEntryBoxDynamicSliderMinValueChanged;
+
+	/** All the sorted children of the struct that should be displayed */
+	TArray< TSharedRef<IPropertyHandle> > SortedChildHandles;
+
+	/** All created numeric entry box widget for this customization */
+	TArray<TWeakPtr<SWidget>> NumericEntryBoxWidgetList;
+
+	/** True if a value is being changed by dragging a slider */
+	bool bIsUsingSlider;
+
+	/** True if the ratio is locked when scaling occurs (uniform scaling) */
+	bool bPreserveScaleRatio;
+};
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/MobilityCustomization.h b/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/MobilityCustomization.h
new file mode 100644
index 0000000..d18312e
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaDetailCustomizations/_Customizations/MobilityCustomization.h
@@ -0,0 +1,42 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Engine/EngineTypes.h"
+#include "Styling/SlateColor.h"
+#include "IDetailCustomNodeBuilder.h"
+
+class IDetailCategoryBuilder;
+class IPropertyHandle;
+enum class ECheckBoxState : uint8;
+
+// Helper class to create a Mobility customization for the specified Property in the specified CategoryBuilder.
+class DETAILCUSTOMIZATIONS_API FMobilityCustomization : public IDetailCustomNodeBuilder, public TSharedFromThis<FMobilityCustomization>
+{
+public:
+	enum
+	{
+		StaticMobilityBitMask = (1u << EComponentMobility::Static),
+		StationaryMobilityBitMask = (1u << EComponentMobility::Stationary),
+		MovableMobilityBitMask = (1u << EComponentMobility::Movable),
+	};
+
+	FMobilityCustomization(TSharedPtr<IPropertyHandle> InMobilityHandle, uint8 InRestrictedMobilityBits, bool InForLight);
+
+	virtual void GenerateHeaderRowContent(FDetailWidgetRow& WidgetRow) override;
+	virtual FName GetName() const override;
+	virtual TSharedPtr<IPropertyHandle> GetPropertyHandle() const override { return MobilityHandle; }
+
+private:
+
+	EComponentMobility::Type GetActiveMobility() const;
+	FSlateColor GetMobilityTextColor(EComponentMobility::Type InMobility) const;
+	void OnMobilityChanged(EComponentMobility::Type InMobility);
+	FText GetMobilityToolTip() const;
+
+	TSharedPtr<IPropertyHandle> MobilityHandle;
+	bool bForLight;
+	uint8 RestrictedMobilityBits;
+};
diff --git a/Source/RuntimeEditor/Private/SodaEditorWidgets/IObjectNameEditableTextBox.cpp b/Source/RuntimeEditor/Private/SodaEditorWidgets/IObjectNameEditableTextBox.cpp
new file mode 100644
index 0000000..e94c368
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaEditorWidgets/IObjectNameEditableTextBox.cpp
@@ -0,0 +1,16 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaEditorWidgets/IObjectNameEditableTextBox.h"
+#include "SodaEditorWidgets/SObjectNameEditableTextBox.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+
+namespace soda
+{
+
+TSharedRef<IObjectNameEditableTextBox> IObjectNameEditableTextBox::CreateObjectNameEditableTextBox(const TArray<TWeakObjectPtr<UObject>>& Objects)
+{
+	TSharedRef<SObjectNameEditableTextBox> Widget = SNew(SObjectNameEditableTextBox).Objects(Objects);
+	return Widget;
+}
+}
diff --git a/Source/RuntimeEditor/Private/SodaEditorWidgets/SKeySelector.cpp b/Source/RuntimeEditor/Private/SodaEditorWidgets/SKeySelector.cpp
new file mode 100644
index 0000000..2ff8bf8
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaEditorWidgets/SKeySelector.cpp
@@ -0,0 +1,555 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaEditorWidgets/SKeySelector.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Input/SComboBox.h"
+//#include "ScopedTransaction.h"
+#include "Widgets/SToolTip.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "Styling/CoreStyle.h"
+#include "SodaEditorWidgets/SListViewSelectorDropdownMenu.h"
+#include "RuntimeEditorUtils.h"
+
+#define LOCTEXT_NAMESPACE "KeySelector"
+
+namespace soda
+{
+
+static const FString BigTooltipDocLink = TEXT("Shared/Editor/ProjectSettings");
+
+class FKeyTreeInfo
+{
+public:
+	/** This data item's children */
+	TArray< TSharedPtr<FKeyTreeInfo> > Children;
+
+private:
+	/** This data item's name */
+	FText Name;
+
+	/** The actual key associated with this item */
+	TSharedPtr<FKey> Key;
+
+public:
+	FKeyTreeInfo(FText InName, TSharedPtr<FKey> InKey)
+	: Name(InName)
+	, Key(InKey)
+	{
+	}
+
+	FKeyTreeInfo(TSharedPtr<FKeyTreeInfo> InInfo)
+	: Name(InInfo->Name)
+	, Key(InInfo->Key)
+	{
+	}
+
+	FText GetDescription() const
+	{
+		if (Key.IsValid())
+		{
+			return Key->GetDisplayName();
+		}
+		else
+		{
+			return Name;
+		}
+	}
+
+	TSharedPtr<FKey> GetKey() const
+	{
+		return Key;
+	}
+
+	bool MatchesSearchTokens(const TArray<FString>& SearchTokens)
+	{
+		FString Description = GetDescription().ToString();
+
+		for (auto Token : SearchTokens)
+		{
+			if (!Description.Contains(Token))
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+};
+
+void SKeySelector::Construct(const FArguments& InArgs)
+{
+	SearchText = FText::GetEmpty();
+
+	OnKeyChanged = InArgs._OnKeyChanged;
+	CurrentKey = InArgs._CurrentKey;
+
+	TMap<FName, FKeyTreeItem> TreeRootsForCatgories;
+
+	// Ensure that Gamepad, Keyboard, and Mouse will appear at the top of the list, other categories will dynamically get added as the keys are encountered
+	TreeRootsForCatgories.Add(EKeys::NAME_GamepadCategory, *new (KeyTreeRoot) FKeyTreeItem(MakeShareable(new FKeyTreeInfo(EKeys::GetMenuCategoryDisplayName(EKeys::NAME_GamepadCategory), nullptr))));
+	TreeRootsForCatgories.Add(EKeys::NAME_KeyboardCategory, *new (KeyTreeRoot) FKeyTreeItem(MakeShareable(new FKeyTreeInfo(EKeys::GetMenuCategoryDisplayName(EKeys::NAME_KeyboardCategory), nullptr))));
+	TreeRootsForCatgories.Add(EKeys::NAME_MouseCategory, *new (KeyTreeRoot) FKeyTreeItem(MakeShareable(new FKeyTreeInfo(EKeys::GetMenuCategoryDisplayName(EKeys::NAME_MouseCategory), nullptr))));
+
+	TArray<FKey> AllKeys;
+	EKeys::GetAllKeys(AllKeys);
+
+	for (FKey Key : AllKeys)
+	{
+		if (Key.IsBindableToActions() && (!InArgs._FilterBlueprintBindable || Key.IsBindableInBlueprints()))
+		{
+			const FName KeyMenuCategory = Key.GetMenuCategory();
+			FKeyTreeItem* KeyCategory = TreeRootsForCatgories.Find(KeyMenuCategory);
+			if (KeyCategory == nullptr)
+			{
+				KeyCategory = new (KeyTreeRoot) FKeyTreeItem(MakeShareable(new FKeyTreeInfo(EKeys::GetMenuCategoryDisplayName(KeyMenuCategory), nullptr)));
+				TreeRootsForCatgories.Add(KeyMenuCategory, *KeyCategory);
+			}
+			(*KeyCategory)->Children.Add(MakeShareable(new FKeyTreeInfo(FText(), MakeShareable(new FKey(Key)))));
+		}
+	}
+
+	// if we allow NoClear, add a "None" option to be able to clear out a binding
+	if (InArgs._AllowClear)
+	{
+		new (KeyTreeRoot) FKeyTreeItem(MakeShareable(new FKeyTreeInfo(FText(), MakeShareable(new FKey(EKeys::Invalid)))));
+	}
+
+	TreeViewWidth = InArgs._TreeViewWidth;
+	TreeViewHeight = InArgs._TreeViewHeight;
+	CategoryFont = FCoreStyle::GetDefaultFontStyle("Bold", 9);
+	KeyFont = FCoreStyle::GetDefaultFontStyle("Regular", 10);
+
+	FilteredKeyTreeRoot = KeyTreeRoot;
+
+	this->ChildSlot
+	[
+		SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		[
+			SNew(SButton)
+			.PressMethod(EButtonPressMethod::DownAndUp)
+			.ToolTipText(this, &SKeySelector::GetKeyTooltip)
+			.OnClicked(this, &SKeySelector::ListenForInput)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SImage)
+					.Image(this, &SKeySelector::GetKeyIconImage)
+					.ColorAndOpacity(this, &SKeySelector::GetKeyIconColor)
+				]
+			]
+		]
+		+ SHorizontalBox::Slot()
+		.HAlign(HAlign_Fill)
+		[
+			SAssignNew(KeyComboButton, SComboButton)
+			.OnGetMenuContent(this, &SKeySelector::GetMenuContent)
+			.ContentPadding(0)
+			.ToolTipText(this, &SKeySelector::GetKeyDescription)	// Longer key descriptions can overrun the visible space in the combo button if the parent width is constrained, so we reflect them in the tooltip too.
+			.ButtonContent()
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.Padding(2.f, 0.f)
+				.AutoWidth()
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Left)
+				[
+					SNew(STextBlock)
+					.Text(this, &SKeySelector::GetKeyDescription)
+					.Font(InArgs._Font)
+				]
+			]
+		]
+
+	];
+}
+
+//=======================================================================
+// Attribute Helpers
+
+FText SKeySelector::GetKeyDescription() const
+{
+	TOptional<FKey> CurrentKeyValue = CurrentKey.Get();
+	if (CurrentKeyValue.IsSet())
+	{
+		return CurrentKeyValue.GetValue().GetDisplayName();
+	}
+	return LOCTEXT("MultipleValues", "Multiple Values");
+}
+
+const FSlateBrush* SKeySelector::GetKeyIconImage() const
+{
+	TOptional<FKey> CurrentKeyValue = CurrentKey.Get();
+	if (CurrentKeyValue.IsSet())
+	{
+		const FKey& Key = CurrentKeyValue.GetValue();
+		if (Key.IsValid() && (Key.IsDeprecated() || !Key.IsBindableToActions()))
+		{
+			return FSodaStyle::GetBrush("Icons.Warning");
+		}
+		return GetIconFromKey(CurrentKeyValue.GetValue());
+	}
+	return nullptr;
+}
+
+FText SKeySelector::GetKeyTooltip() const
+{
+	TOptional<FKey> CurrentKeyValue = CurrentKey.Get();
+	if (CurrentKeyValue.IsSet())
+	{
+		const FKey& Key = CurrentKeyValue.GetValue();
+		if (Key.IsValid())
+		{
+			if (Key.IsDeprecated())
+			{
+				return LOCTEXT("KeySelectorDeprecated", "The selected key has been deprecated.");
+			}
+			else if (!Key.IsBindableToActions())
+			{
+				return LOCTEXT("KeySelectorNotBindable", "The selected key can't be bound to actions.");
+			}
+		}
+	}
+	return LOCTEXT("KeySelector", "Select the key value.");
+}
+
+FSlateColor SKeySelector::GetKeyIconColor() const
+{
+	// Orange when listening for input
+	return bListenForNextInput ? FLinearColor(0.953f, 0.612f, 0.071f) : FLinearColor::White;
+}
+
+//=======================================================================
+// Input Capture Helpers
+
+FReply SKeySelector::ListenForInput()
+{
+	if (!bListenForNextInput)
+	{
+		bListenForNextInput = true;
+		return FReply::Handled().CaptureMouse(SharedThis(this)).SetUserFocus(SharedThis(this));
+	}
+	return FReply::Unhandled();
+}
+
+FReply SKeySelector::ProcessHeardInput(FKey KeyHeard)
+{
+	if (bListenForNextInput)	// TODO: Unnecessary. Keep it for safety?
+	{
+		//const FScopedTransaction Transaction(LOCTEXT("ChangeKey", "Change Key Value"));
+		OnKeyChanged.ExecuteIfBound(MakeShareable(new FKey(KeyHeard)));
+
+		bListenForNextInput = false;
+		return FReply::Handled().ReleaseMouseCapture().ClearUserFocus(EFocusCause::Cleared);
+	}
+	return FReply::Unhandled();
+}
+
+FReply SKeySelector::OnKeyDown(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent)
+{
+	if (bListenForNextInput)
+	{
+		// In the case of axis inputs emulating button key presses we ignore the key press in favor of the axis. Key variants will need to be set from the combo box if required.
+		if (InKeyEvent.GetKey().IsButtonAxis())
+		{
+			return FReply::Unhandled();
+		}
+
+		return ProcessHeardInput(InKeyEvent.GetKey());
+	}
+	return SCompoundWidget::OnKeyDown(MyGeometry, InKeyEvent);
+}
+
+FReply SKeySelector::OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (bListenForNextInput)
+	{
+		return ProcessHeardInput(MouseEvent.GetEffectingButton());
+	}
+	return SCompoundWidget::OnMouseButtonDown(MyGeometry, MouseEvent);
+}
+
+FReply SKeySelector::OnMouseWheel(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (bListenForNextInput)
+	{
+		// We prefer to bind the axis over EKeys::MouseWheelUp/Down.
+		return ProcessHeardInput(EKeys::MouseWheelAxis);
+	}
+	return SCompoundWidget::OnMouseWheel(MyGeometry, MouseEvent);
+}
+
+FReply SKeySelector::OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	// TODO: Support detecting mouse movement?
+	// This is difficult to get right for all users and may lead to accidental mouse axis selections, so we'll ignore it for now.
+	return SCompoundWidget::OnMouseMove(MyGeometry, MouseEvent);
+}
+
+FReply SKeySelector::OnAnalogValueChanged(const FGeometry& MyGeometry, const FAnalogInputEvent& InAnalogInputEvent)
+{
+	if (bListenForNextInput)
+	{
+		// We require a (substantial) minimum axis value before triggering the axis to account for dead zones and improve axes selection.
+		if (FMath::Abs(InAnalogInputEvent.GetAnalogValue()) < 0.5f)
+		{
+			return FReply::Handled();
+		}
+
+		return ProcessHeardInput(InAnalogInputEvent.GetKey());
+	}
+	return SCompoundWidget::OnAnalogValueChanged(MyGeometry, InAnalogInputEvent);
+}
+
+//=======================================================================
+// Key TreeView Support
+TSharedRef<ITableRow> SKeySelector::GenerateKeyTreeRow(FKeyTreeItem InItem, const TSharedRef<STableViewBase>& OwnerTree)
+{
+	const bool bIsCategory = !InItem->GetKey().IsValid();
+	const FText Description = InItem->GetDescription();
+
+	// Determine the best icon the to represents this item
+	const FSlateBrush* IconBrush = nullptr;
+	if (InItem->GetKey().IsValid())
+	{
+		IconBrush = GetIconFromKey(*InItem->GetKey().Get());
+	}
+
+	return SNew(SComboRow<FKeyTreeItem>, OwnerTree)
+		.ToolTip(IDocumentation::Get()->CreateToolTip(Description, nullptr, BigTooltipDocLink, Description.ToString()))
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(1.f)
+			[
+				SNew(SImage)
+				.Image(IconBrush)
+				.Visibility(bIsCategory ? EVisibility::Collapsed : EVisibility::Visible)
+			]
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(1.f)
+			[
+				SNew(STextBlock)
+				.Text(Description)
+				.HighlightText(SearchText)
+				.Font(bIsCategory ? CategoryFont : KeyFont)
+			]
+		];
+}
+
+void SKeySelector::OnKeySelectionChanged(FKeyTreeItem Selection, ESelectInfo::Type SelectInfo)
+{
+	// When the user is navigating, do not act upon the selection change
+	if (SelectInfo == ESelectInfo::OnNavigation)
+	{
+		return;
+	}
+
+	// Only handle selection for non-read only items, since STreeViewItem doesn't actually support read-only
+	if (Selection.IsValid())
+	{
+		if (Selection->GetKey().IsValid())
+		{
+			//const FScopedTransaction Transaction(LOCTEXT("ChangeKey", "Change Key Value"));
+
+			KeyComboButton->SetIsOpen(false);
+
+			OnKeyChanged.ExecuteIfBound(Selection->GetKey());
+		}
+		else
+		{
+			// Expand / contract the category, if applicable
+			if (Selection->Children.Num() > 0)
+			{
+				const bool bIsExpanded = KeyTreeView->IsItemExpanded(Selection);
+				KeyTreeView->SetItemExpansion(Selection, !bIsExpanded);
+
+				if (SelectInfo == ESelectInfo::OnMouseClick)
+				{
+					KeyTreeView->ClearSelection();
+				}
+			}
+		}
+	}
+}
+
+void SKeySelector::GetKeyChildren(FKeyTreeItem InItem, TArray<FKeyTreeItem>& OutChildren)
+{
+	OutChildren = InItem->Children;
+}
+
+TSharedRef<SWidget>	SKeySelector::GetMenuContent()
+{
+	if (!MenuContent.IsValid())
+	{
+		// Pre-build the tree view and search box as it is needed as a parameter for the context menu's container.
+		SAssignNew(KeyTreeView, SKeyTreeView)
+			.TreeItemsSource(&FilteredKeyTreeRoot)
+			.SelectionMode(ESelectionMode::Single)
+			.OnGenerateRow(this, &SKeySelector::GenerateKeyTreeRow)
+			.OnSelectionChanged(this, &SKeySelector::OnKeySelectionChanged)
+			.OnGetChildren(this, &SKeySelector::GetKeyChildren);
+
+		SAssignNew(FilterTextBox, SSearchBox)
+			.OnTextChanged(this, &SKeySelector::OnFilterTextChanged)
+			.OnTextCommitted(this, &SKeySelector::OnFilterTextCommitted);
+
+		MenuContent = SNew(soda::SListViewSelectorDropdownMenu<FKeyTreeItem>, FilterTextBox, KeyTreeView)
+			[
+				SNew(SVerticalBox)
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				.Padding(4.f, 4.f, 4.f, 4.f)
+				[
+					FilterTextBox.ToSharedRef()
+				]
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				.Padding(4.f, 4.f, 4.f, 4.f)
+				[
+					SNew(SBox)
+					.HeightOverride(TreeViewHeight)
+					.WidthOverride(TreeViewWidth)
+					[
+						KeyTreeView.ToSharedRef()
+					]
+				]
+			];
+
+
+		KeyComboButton->SetMenuContentWidgetToFocus(FilterTextBox);
+	}
+	else
+	{
+		// Clear the selection in such a way as to also clear the keyboard selector
+		KeyTreeView->SetSelection(NULL, ESelectInfo::OnNavigation);
+		KeyTreeView->ClearExpandedItems();
+	}
+
+	// Clear the filter text box with each opening
+	if (FilterTextBox.IsValid())
+	{
+		FilterTextBox->SetText(FText::GetEmpty());
+	}
+
+	return MenuContent.ToSharedRef();
+}
+
+//=======================================================================
+// Search Support
+void SKeySelector::OnFilterTextChanged(const FText& NewText)
+{
+	SearchText = NewText;
+	FilteredKeyTreeRoot.Empty();
+
+	TArray<FString> Tokens;
+	GetSearchTokens(SearchText.ToString(), Tokens);
+
+	GetChildrenMatchingSearch(Tokens, KeyTreeRoot, FilteredKeyTreeRoot);
+	KeyTreeView->RequestTreeRefresh();
+
+	// Select the first non-category item
+	auto SelectedItems = KeyTreeView->GetSelectedItems();
+	if (FilteredKeyTreeRoot.Num() > 0)
+	{
+		// Categories have children, we don't want to select categories
+		if (FilteredKeyTreeRoot[0]->Children.Num() > 0)
+		{
+			KeyTreeView->SetSelection(FilteredKeyTreeRoot[0]->Children[0], ESelectInfo::OnNavigation);
+		}
+		else
+		{
+			KeyTreeView->SetSelection(FilteredKeyTreeRoot[0], ESelectInfo::OnNavigation);
+		}
+	}
+}
+
+void SKeySelector::OnFilterTextCommitted(const FText& NewText, ETextCommit::Type CommitInfo)
+{
+	if (CommitInfo == ETextCommit::OnEnter)
+	{
+		auto SelectedItems = KeyTreeView->GetSelectedItems();
+		if (SelectedItems.Num() > 0)
+		{
+			KeyTreeView->SetSelection(SelectedItems[0]);
+		}
+	}
+}
+
+void SKeySelector::GetSearchTokens(const FString& SearchString, TArray<FString>& OutTokens) const
+{
+	if (SearchString.Contains("\"") && SearchString.ParseIntoArray(OutTokens, TEXT("\""), true) > 0)
+	{
+		for (auto &TokenIt : OutTokens)
+		{
+			// we have the token, we don't need the quotes anymore, they'll just confused the comparison later on
+			TokenIt = TokenIt.TrimQuotes();
+			// We remove the spaces as all later comparison strings will also be de-spaced
+			TokenIt = TokenIt.Replace(TEXT(" "), TEXT(""));
+		}
+
+		// due to being able to handle multiple quoted blocks like ("Make Epic" "Game Now") we can end up with
+		// and empty string between (" ") blocks so this simply removes them
+		struct FRemoveMatchingStrings
+		{
+			bool operator()(const FString& RemovalCandidate) const
+			{
+				return RemovalCandidate.IsEmpty();
+			}
+		};
+		OutTokens.RemoveAll(FRemoveMatchingStrings());
+	}
+	else
+	{
+		// unquoted search equivalent to a match-any-of search
+		SearchString.ParseIntoArray(OutTokens, TEXT(" "), true);
+	}
+}
+
+bool SKeySelector::GetChildrenMatchingSearch(const TArray<FString>& InSearchTokens, const TArray<FKeyTreeItem>& UnfilteredList, TArray<FKeyTreeItem>& OutFilteredList)
+{
+	bool bReturnVal = false;
+
+	for (auto it = UnfilteredList.CreateConstIterator(); it; ++it)
+	{
+		FKeyTreeItem Item = *it;
+		FKeyTreeItem NewInfo = MakeShareable(new FKeyTreeInfo(Item));
+		TArray<FKeyTreeItem> ValidChildren;
+
+		// Have to run GetChildrenMatchingSearch first, so that we can make sure we get valid children for the list!
+		if (GetChildrenMatchingSearch(InSearchTokens, Item->Children, ValidChildren)
+			|| InSearchTokens.Num() == 0
+			|| Item->MatchesSearchTokens(InSearchTokens))
+		{
+			NewInfo->Children = ValidChildren;
+			OutFilteredList.Add(NewInfo);
+
+			KeyTreeView->SetItemExpansion(NewInfo, InSearchTokens.Num() > 0);
+
+			bReturnVal = true;
+		}
+	}
+
+	return bReturnVal;
+}
+
+const FSlateBrush* SKeySelector::GetIconFromKey(FKey Key) const
+{
+	return FSodaStyle::GetBrush(EKeys::GetMenuCategoryPaletteIcon(Key.GetMenuCategory()));
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaEditorWidgets/SObjectNameEditableTextBox.cpp b/Source/RuntimeEditor/Private/SodaEditorWidgets/SObjectNameEditableTextBox.cpp
new file mode 100644
index 0000000..ed58020
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaEditorWidgets/SObjectNameEditableTextBox.cpp
@@ -0,0 +1,453 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaEditorWidgets/SObjectNameEditableTextBox.h"
+#include "Rendering/DrawElements.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "SodaStyleSet.h"
+#include "GameFramework/Actor.h"
+//#include "ScopedTransaction.h"
+//#include "ActorEditorUtils.h"
+//#include "Editor/EditorEngine.h"
+//#include "EditorClassUtils.h"
+
+#include "RuntimeEditorUtils.h"
+#include "EngineUtils.h"
+
+namespace soda
+{
+
+const float SObjectNameEditableTextBox::HighlightRectLeftOffset = 0.0f;
+const float SObjectNameEditableTextBox::HighlightRectRightOffset = 0.0f;
+const float SObjectNameEditableTextBox::HighlightTargetSpringConstant = 25.0f;
+const float SObjectNameEditableTextBox::HighlightTargetEffectDuration = 0.5f;
+const float SObjectNameEditableTextBox::HighlightTargetOpacity = 0.8f;
+const float SObjectNameEditableTextBox::CommittingAnimOffsetPercent = 0.2f;
+
+#define LOCTEXT_NAMESPACE "EditorWidgets"
+
+void SObjectNameEditableTextBox::Construct( const FArguments& InArgs )
+{
+	LastCommittedTime = 0.0;
+	bUpdateHighlightSpring = false;
+
+	Objects = InArgs._Objects;
+
+	ChildSlot
+		[
+			SAssignNew(TextBox, SEditableTextBox)
+			.Text( this, &SObjectNameEditableTextBox::GetNameText )
+			.ToolTipText( this, &SObjectNameEditableTextBox::GetNameTooltipText )
+			.Visibility( this, &SObjectNameEditableTextBox::GetNameVisibility )
+			.HintText( this, &SObjectNameEditableTextBox::GetNameHintText )
+			.OnTextCommitted( this, &SObjectNameEditableTextBox::OnNameTextCommitted )
+			.IsReadOnly( this, &SObjectNameEditableTextBox::CannotEditNameText )
+			.SelectAllTextWhenFocused( this, &SObjectNameEditableTextBox::CanEditNameText )
+			.OnTextChanged(this, &SObjectNameEditableTextBox::OnTextChanged )
+			.RevertTextOnEscape( true )
+		];
+}
+
+EActiveTimerReturnType SObjectNameEditableTextBox::UpdateHighlightSpringState( double InCurrentTime, float InDeltaTime )
+{
+	if ( (float)(InCurrentTime - LastCommittedTime) <= HighlightTargetEffectDuration )
+	{
+		bUpdateHighlightSpring = true;
+	}
+	else
+	{
+		bUpdateHighlightSpring = false;
+	}
+
+	return bUpdateHighlightSpring ? EActiveTimerReturnType::Continue : EActiveTimerReturnType::Stop;
+}
+
+void SObjectNameEditableTextBox::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	const bool bShouldAppearFocused = HasKeyboardFocus();
+
+	if ( bUpdateHighlightSpring || bShouldAppearFocused )
+	{
+		// Update highlight 'target' effect
+		const float HighlightLeftX = HighlightRectLeftOffset;
+		const float HighlightRightX = HighlightRectRightOffset + AllottedGeometry.GetLocalSize().X;
+
+		HighlightTargetLeftSpring.SetTarget( HighlightLeftX );
+		HighlightTargetRightSpring.SetTarget( HighlightRightX );
+
+		HighlightTargetLeftSpring.Tick( InDeltaTime );
+		HighlightTargetRightSpring.Tick( InDeltaTime );
+	}
+}
+
+int32 SObjectNameEditableTextBox::OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const
+{
+	int32 StartLayer = SCompoundWidget::OnPaint( Args, AllottedGeometry, MyCullingRect, OutDrawElements, LayerId, InWidgetStyle, bParentEnabled );
+
+	const int32 TextLayer = 1;
+
+	// See if a disabled effect should be used
+	bool bEnabled = ShouldBeEnabled( bParentEnabled );
+	ESlateDrawEffect DrawEffects = (bEnabled) ? ESlateDrawEffect::None : ESlateDrawEffect::DisabledEffect;
+
+	const double CurrentTime = FSlateApplication::Get().GetCurrentTime();
+
+	// Draw highlight targeting effect
+	const float TimeSinceHighlightInteraction = (float)( CurrentTime - LastCommittedTime );
+	if( TimeSinceHighlightInteraction <= HighlightTargetEffectDuration )
+	{
+		// Compute animation progress
+		float EffectAlpha = FMath::Clamp( TimeSinceHighlightInteraction / HighlightTargetEffectDuration, 0.0f, 1.0f );
+		EffectAlpha = 1.0f - EffectAlpha * EffectAlpha;  // Inverse square falloff (looks nicer!)
+
+		float EffectOpacity = EffectAlpha;
+
+		// Figure out a universally visible highlight color.
+		FLinearColor HighlightTargetColorAndOpacity = ( (FLinearColor::White - GetColorAndOpacity())*0.5f + FLinearColor(+0.4f, +0.1f, -0.2f)) * InWidgetStyle.GetColorAndOpacityTint();
+		HighlightTargetColorAndOpacity.A = HighlightTargetOpacity * EffectOpacity * 255.0f;
+
+		// Compute the bounds offset of the highlight target from where the highlight target spring
+		// extents currently lie.  This is used to "grow" or "shrink" the highlight as needed.
+		const float CommittingAnimOffset = CommittingAnimOffsetPercent * AllottedGeometry.GetLocalSize().Y;
+
+		// Choose an offset amount depending on whether we're highlighting, or clearing highlight
+		const float EffectOffset = EffectAlpha * CommittingAnimOffset;
+
+		const float HighlightLeftX = HighlightTargetLeftSpring.GetPosition() - EffectOffset;
+		const float HighlightRightX = HighlightTargetRightSpring.GetPosition() + EffectOffset;
+		const float HighlightTopY = 0.0f - EffectOffset;
+		const float HighlightBottomY = AllottedGeometry.GetLocalSize().Y + EffectOffset;
+
+		const FVector2D DrawPosition = FVector2D( HighlightLeftX, HighlightTopY );
+		const FVector2D DrawSize = FVector2D( HighlightRightX - HighlightLeftX, HighlightBottomY - HighlightTopY );
+
+		const FSlateBrush* StyleInfo = FSodaStyle::GetBrush("DetailsView.NameChangeCommitted");
+
+		// NOTE: We rely on scissor clipping for the highlight rectangle
+		FSlateDrawElement::MakeBox(
+			OutDrawElements,
+			LayerId + TextLayer,
+			AllottedGeometry.ToPaintGeometry( DrawPosition, DrawSize ),	// Position, Size, Scale
+			StyleInfo,													// Style
+			DrawEffects,												// Effects to use
+			HighlightTargetColorAndOpacity );							// Color
+	}
+
+	return LayerId + TextLayer;
+}
+
+FText SObjectNameEditableTextBox::GetNameText() const
+{
+	FString Result;
+
+	if (Objects.Num() == 1)
+	{
+		Result = GetObjectDisplayName(Objects[0]);
+	}
+	else if (Objects.Num() > 1)
+	{
+		if (!UserSetCommonName.IsEmpty())
+		{
+			Result = UserSetCommonName;
+		}
+	}
+
+	return FText::FromString(Result);
+}
+
+FText SObjectNameEditableTextBox::GetNameTooltipText() const
+{
+	FText Result = FText::GetEmpty();
+
+	if (Objects.Num() == 0)
+	{
+		Result = LOCTEXT("EditableActorLabel_NoObjectsTooltip", "Nothing selected");
+	}
+	else if (Objects.Num() == 1 && Objects[0].IsValid())
+	{
+		if (CanEditNameText())
+		{
+			Result = FText::Format(LOCTEXT("EditableActorLabel_ActorTooltipFmt", "Rename the selected {0}"), FText::FromString(Objects[0].Get()->GetClass()->GetName()));
+		}
+		else if (Objects[0].Get()->IsA(AActor::StaticClass()))
+		{
+			Result = LOCTEXT("EditableActorLabel_NoEditActorTooltip", "Can't rename selected actor (its label isn't editable)");
+		}
+		else
+		{
+			Result = LOCTEXT("EditableActorLabel_NoEditObjectTooltip", "Can't rename selected object (only actors can have editable labels)");
+		}
+	}
+	else if (Objects.Num() > 1)
+	{
+		if (CanEditNameText())
+		{
+			Result = LOCTEXT("EditableActorLabel_MultIToolActortip", "Rename multiple selected actors at once");
+		}
+		else
+		{
+			Result = LOCTEXT("EditableActorLabel_NoEditMultiObjectTooltip", "Can't rename selected objects (one or more aren't actors with editable labels)");
+		}
+	}
+
+	return Result;
+}
+
+EVisibility SObjectNameEditableTextBox::GetNameVisibility() const
+{
+	if (Objects.Num() == 1 && Objects[0].IsValid())
+	{
+		if (CanEditNameText())
+		{
+			return EVisibility::Visible;
+		}
+		else if (Objects[0].Get()->IsA(AActor::StaticClass()))
+		{
+			return EVisibility::Visible;
+		}
+		else
+		{
+			return EVisibility::Collapsed;
+		}
+	}
+	else if (Objects.Num() > 1)
+	{
+		if (CanEditNameText())
+		{
+			return EVisibility::Visible;
+		}
+		else
+		{
+			return EVisibility::Collapsed;
+		}
+	}
+
+	return EVisibility::Collapsed;
+}
+
+FText SObjectNameEditableTextBox::GetNameHintText() const
+{
+	FText Result;
+
+	if (Objects.Num() == 0)
+	{
+		Result = LOCTEXT("EditableActorLabel_NoObjectsHint", "<Nothing Selected>");
+	}
+	else if (Objects.Num() == 1 && Objects[0].IsValid())
+	{
+		Result = FText::Format(LOCTEXT("EditableActorLabel_MultiObjectsHint_SameType", "<Selected {0}>"), FText::FromName(Objects[0].Get()->GetClass()->GetFName()));
+	}
+	else if (Objects.Num() > 1)
+	{
+		Result = LOCTEXT("EditableActorLabel_MultiObjectsHint_DifferentTypes", "<Selected Objects>");
+	}
+
+	return Result;
+}
+
+void SObjectNameEditableTextBox::OnNameTextCommitted(const FText& NewText, ETextCommit::Type InTextCommit)
+{
+	auto AllowActorName = [](const UWorld* World, const FText& NewText)
+	{
+		for (TActorIterator<AActor> It(World); It; ++It)
+		{
+			if (It->GetName() == NewText.ToString()) return false;
+		}
+		return true;
+	};
+
+	auto AllowComponentName = [](const AActor* Owner, const FText& NewText)
+	{
+		for (auto& Component : Owner->GetComponents())
+		{
+			if (Component->GetName() == NewText.ToString()) return false;
+		}
+		return true;
+	};
+
+
+	// Don't apply the change if the TextCommit type is OnCleared - this will only be the case if the keyboard focus was cleared due to
+	// Enter being pressed, in which case we will already have been here once with a TextCommit type of OnEnter.
+	FText ErrorMessage;
+	if (InTextCommit != ETextCommit::OnCleared && FRuntimeEditorUtils::ValidateActorName(NewText, ErrorMessage))
+	{
+		FText TrimmedText = FText::TrimPrecedingAndTrailing(NewText);
+
+		if (!TrimmedText.IsEmpty())
+		{
+			if (Objects.Num() == 1)
+			{
+				if(AActor* Actor = Cast<AActor>(Objects[0].Get()))
+				{
+					/*
+					if (Actor->IsActorLabelEditable())
+					{
+						Actor->SetActorLabel(TrimmedText.ToString());
+						LastCommittedTime = FSlateApplication::Get().GetCurrentTime();
+						RegisterActiveTimer( 0.f, FWidgetActiveTimerDelegate::CreateSP( this, &SObjectNameEditableTextBox::UpdateHighlightSpringState ) );
+					}
+					*/
+
+					if (AllowActorName(Actor->GetWorld(), NewText))
+					{
+						if (Actor->Rename(*TrimmedText.ToString()))
+						{
+							LastCommittedTime = FSlateApplication::Get().GetCurrentTime();
+							RegisterActiveTimer( 0.f, FWidgetActiveTimerDelegate::CreateSP( this, &SObjectNameEditableTextBox::UpdateHighlightSpringState));
+						}
+					}
+				}
+				else if (UActorComponent* ActorComponent = Cast<UActorComponent>(Objects[0].Get()))
+				{
+					if (AllowComponentName(ActorComponent->GetOwner(), NewText))
+					{
+						if (ActorComponent->Rename(*TrimmedText.ToString()))
+						{
+							LastCommittedTime = FSlateApplication::Get().GetCurrentTime();
+							RegisterActiveTimer( 0.f, FWidgetActiveTimerDelegate::CreateSP( this, &SObjectNameEditableTextBox::UpdateHighlightSpringState));
+						}
+					}
+				}
+			}
+			else if (Objects.Num() > 1)
+			{
+
+				UserSetCommonName = TrimmedText.ToString();
+
+				for (int32 i=0; i<Objects.Num(); i++)
+				{
+					// Apply the change to the selected actor
+					if(Objects[i].IsValid() && Objects[i].Get()->IsA(AActor::StaticClass()))
+					{
+						/*
+						AActor* Actor = (AActor*)Objects[i].Get();
+						if (Actor->IsActorLabelEditable())
+						{
+							Actor->SetActorLabel(TrimmedText.ToString());
+							LastCommittedTime = FSlateApplication::Get().GetCurrentTime();
+							RegisterActiveTimer( 0.f, FWidgetActiveTimerDelegate::CreateSP( this, &SObjectNameEditableTextBox::UpdateHighlightSpringState));
+						}
+						*/
+						if (AActor* Actor = Cast<AActor>(Objects[i].Get()))
+						{
+							/*
+							if (Actor->IsActorLabelEditable())
+							{
+								Actor->SetActorLabel(TrimmedText.ToString());
+								LastCommittedTime = FSlateApplication::Get().GetCurrentTime();
+								RegisterActiveTimer( 0.f, FWidgetActiveTimerDelegate::CreateSP( this, &SObjectNameEditableTextBox::UpdateHighlightSpringState ) );
+							}
+							*/
+
+							if (AllowActorName(Actor->GetWorld(), NewText))
+							{
+								if (Actor->Rename(*TrimmedText.ToString()))
+								{
+									LastCommittedTime = FSlateApplication::Get().GetCurrentTime();
+									RegisterActiveTimer(0.f, FWidgetActiveTimerDelegate::CreateSP(this, &SObjectNameEditableTextBox::UpdateHighlightSpringState));
+								}
+							}
+						}
+						else if (UActorComponent* ActorComponent = Cast<UActorComponent>(Objects[i].Get()))
+						{
+							if (AllowComponentName(ActorComponent->GetOwner(), NewText))
+							{
+								if (ActorComponent->Rename(*TrimmedText.ToString()))
+								{
+									LastCommittedTime = FSlateApplication::Get().GetCurrentTime();
+									RegisterActiveTimer(0.f, FWidgetActiveTimerDelegate::CreateSP(this, &SObjectNameEditableTextBox::UpdateHighlightSpringState));
+								}
+							}
+						}
+
+					}
+				}
+			}
+		}
+		// Remove ourselves from the window focus so we don't get automatically reselected when scrolling around the context menu.
+		TSharedPtr< SWindow > ParentWindow = FSlateApplication::Get().FindWidgetWindow( SharedThis(this) );
+		if( ParentWindow.IsValid() )
+		{
+			ParentWindow->SetWidgetToFocusOnActivate( NULL );
+		}
+	}
+
+	// Clear Error 
+	TextBox->SetError(FText::GetEmpty());
+}
+
+void SObjectNameEditableTextBox::OnTextChanged( const FText& InLabel )
+{
+	FText OutErrorMessage;
+
+	if(!FRuntimeEditorUtils::ValidateActorName(InLabel, OutErrorMessage))
+	{
+		TextBox->SetError(OutErrorMessage);
+	}
+	else
+	{
+		TextBox->SetError( FText::GetEmpty() );
+	}
+}
+
+bool SObjectNameEditableTextBox::CanEditNameText() const
+{
+	bool Result = false;
+
+	if (Objects.Num() > 0)
+	{
+		Result = true;
+		for (int32 i=0; i<Objects.Num(); i++)
+		{
+			if(Objects[i].IsValid())
+			{
+				if (Objects[i].Get()->IsA(AActor::StaticClass()))
+				{
+					/*
+					AActor* Actor = (AActor*)Objects[i].Get();
+					if (!Actor->IsActorLabelEditable())
+					{
+						// can't edit the name when a non-editable actor is selected
+						Result = false;
+						break;
+					}
+					*/
+				}
+				else
+				{
+					// can't edit the name when a non-actor is selected
+					Result = false;
+					break;
+				}
+			}
+		}
+	}
+
+	return Result;
+}
+
+FString SObjectNameEditableTextBox::GetObjectDisplayName(TWeakObjectPtr<UObject> Object)
+{
+	FString Result;
+	if(Object.IsValid())
+	{
+		UObject* ObjectPtr = Object.Get();
+		/*
+		if (ObjectPtr->IsA(AActor::StaticClass()))
+		{
+			Result =  ((AActor*)ObjectPtr)->GetActorLabel();
+		}
+		else
+		*/
+		{
+			Result = ObjectPtr->GetName();
+		}
+	}
+	return Result;
+}
+
+}
+
+// No code beyond this point
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/RuntimeEditor/Private/SodaEditorWidgets/SObjectNameEditableTextBox.h b/Source/RuntimeEditor/Private/SodaEditorWidgets/SObjectNameEditableTextBox.h
new file mode 100644
index 0000000..3d76be1
--- /dev/null
+++ b/Source/RuntimeEditor/Private/SodaEditorWidgets/SObjectNameEditableTextBox.h
@@ -0,0 +1,114 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakObjectPtr.h"
+#include "Layout/Visibility.h"
+#include "Animation/SlateSprings.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "SodaEditorWidgets/IObjectNameEditableTextBox.h"
+
+class FPaintArgs;
+class FSlateWindowElementList;
+class SEditableTextBox;
+
+namespace soda
+{
+
+/** Widget wraps an editable text box for viewing the names of objects or editing the labels of actors */
+class SObjectNameEditableTextBox : public IObjectNameEditableTextBox
+{
+public:
+	SLATE_BEGIN_ARGS(SObjectNameEditableTextBox){}
+
+		SLATE_ARGUMENT(TArray<TWeakObjectPtr<UObject>>, Objects)
+
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct this widget
+	 *
+	 * @param	InArgs	The declaration data for this widget
+	 */
+	void Construct( const FArguments& InArgs );
+
+protected:
+
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+
+	virtual int32 OnPaint( const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled ) const override;
+
+private:
+	/** Updates whether the highlight spring effect is happening */
+	EActiveTimerReturnType UpdateHighlightSpringState( double InCurrentTime, float InDeltaTime );
+
+	/** Getter for the Text attribute of the editable text inside this widget */
+	FText GetNameText() const;
+
+	/** Should the name editing text box even be visible? */
+	EVisibility GetNameVisibility() const;
+
+	/** Getter for the ToolTipText attribute of the editable text inside this widget */
+	FText GetNameTooltipText() const;
+
+	/** Getter for the HintText attribute of the editable text inside this widget */
+	FText GetNameHintText() const;
+
+	/** Getter for the OnTextCommitted event of the editable text inside this widget */
+	void OnNameTextCommitted(const FText& NewText, ETextCommit::Type InTextCommit);
+
+	/** Getter for the IsReadOnly attribute of the editable text inside this widget */
+	bool CanEditNameText() const;
+
+	/** Getter for the SelectAllTextWhenFocused attribute of the editable text inside this widget */
+	bool CannotEditNameText() const { return !CanEditNameText(); }
+
+	/** Callback to verify a text change */
+	void OnTextChanged( const FText& InLabel );
+
+	/** Helper class the get the object name or the actor label if an object is an actor */
+	static FString GetObjectDisplayName(TWeakObjectPtr<UObject> Object);
+
+	/** The list of objects whose names are edited by the widget */
+	TArray<TWeakObjectPtr<UObject>> Objects;
+
+	/** The current user-entered text for a list of more than one object */
+	FString UserSetCommonName;
+
+	/** How many pixels to extend the highlight rectangle's left side horizontally */
+	static const float HighlightRectLeftOffset;
+
+	/** How many pixels to extend the highlight rectangle's right side horizontally */
+	static const float HighlightRectRightOffset;
+
+	/** How quickly the highlight 'targeting' rectangle will slide around.  Larger is faster. */
+	static const float HighlightTargetSpringConstant;
+
+	/** Duration of animation highlight target effects */
+	static const float HighlightTargetEffectDuration;
+
+	/** Opacity of the highlight target effect overlay */
+	static const float HighlightTargetOpacity;
+
+	/** How large the highlight target effect will be when highlighting, as a scalar percentage of font height */
+	static const float CommittingAnimOffsetPercent;
+
+	/** Highlight "targeting" visual effect left position */
+	FFloatSpring1D HighlightTargetLeftSpring;
+
+	/** Highlight "targeting" visual effect right position */
+	FFloatSpring1D HighlightTargetRightSpring;
+
+	/** Last time that the user had a major interaction with the highlight */
+	double LastCommittedTime;
+
+	/** The text box used to edit object names */ 
+	TSharedPtr< SEditableTextBox > TextBox;
+
+	// Temp flag to trigger a highlight spring update in the passive tick (because that's where the geometry is)
+	bool bUpdateHighlightSpring;
+};
+
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/IEditableObject.h b/Source/RuntimeEditor/Public/IEditableObject.h
new file mode 100644
index 0000000..2cf09ec
--- /dev/null
+++ b/Source/RuntimeEditor/Public/IEditableObject.h
@@ -0,0 +1,131 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Interface.h"
+#include "Widgets/SWidget.h"
+#include "Templates/SharedPointer.h"
+#include "IEditableObject.generated.h"
+
+USTRUCT(BlueprintType)
+struct RUNTIMEEDITOR_API FRuntimeMetadataField
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	TMap<FString, FString> MetadataMap;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	FString DisplayName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	FString ToolTip_Depricated;
+
+};
+
+FArchive& operator<<(FArchive& Ar, FRuntimeMetadataField& This);
+void operator << (FStructuredArchive::FSlot Slot, FRuntimeMetadataField& This);
+
+USTRUCT(BlueprintType)
+struct RUNTIMEEDITOR_API FRuntimeMetadataObject
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	TMap<FString, FRuntimeMetadataField> Fields;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	TMap<FString, FString> MetadataMap;
+};
+
+FArchive& operator<<(FArchive& Ar, FRuntimeMetadataObject& This);
+void operator << (FStructuredArchive::FSlot Slot, FRuntimeMetadataObject& This);
+
+/**
+ * FPropertyChangedEventBP
+ * Just a wrapper for FPropertyChangedEvent and FPropertyChangedChainEvent for use them in BP
+ */
+USTRUCT(BlueprintType)
+struct FPropertyChangedEventBP
+{
+	GENERATED_BODY()
+
+	FPropertyChangedEventBP()
+	{}
+
+	FPropertyChangedEventBP(FPropertyChangedEvent* InPropertyChangedEvent) :
+		PropertyChangedEvent(InPropertyChangedEvent)
+	{}
+
+	FPropertyChangedEventBP(FPropertyChangedChainEvent* InPropertyChangedChainEvent) :
+		PropertyChangedChainEvent(InPropertyChangedChainEvent)
+	{}
+
+	FPropertyChangedEvent* PropertyChangedEvent = nullptr;
+	FPropertyChangedChainEvent * PropertyChangedChainEvent = nullptr;
+};
+
+UINTERFACE(BlueprintType)
+class RUNTIMEEDITOR_API UEditableObject: public UInterface
+{
+	GENERATED_BODY()
+};
+
+/**
+ * IEditableObject
+ * The purpose of this interface is to “bring back” some functions from Object that are only available in editor mode to runtime mode.
+ * All "brougt back" functions have the prefix "Runtime". For example PostEditChangeProperty -> RuntimePostEditChangeProperty
+ */
+class RUNTIMEEDITOR_API IEditableObject
+{
+	GENERATED_BODY()
+
+public:
+	/**
+	 * Same as UObject::RuntimePostEditChangeProperty(FPropertyChangedEvent& ) but for the runtime
+	 */
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent);
+
+	/**
+	 * Same as UObject::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& ) but for the runtime
+	 */
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent);
+
+	/**
+	 * Same as UObject::RuntimePreEditChange(FProperty& ) but for the runtime
+	 */
+	virtual void RuntimePreEditChange(FProperty* PropertyAboutToChange);
+
+	/**
+	 * Same as UObject::CanEditChange(FEditPropertyChain* ) but for the runtime
+	 */
+	virtual void RuntimePreEditChange(FEditPropertyChain& PropertyAboutToChange);
+
+	/**
+	 * Same as UObject::CanEditChange( const FProperty* ) but for the runtime
+	 */
+	virtual bool RuntimeCanEditChange(const FProperty* InProperty) const;
+
+	/**
+	 * Same as UObject::CanEditChange( const FEditPropertyChain* ) but for the runtime
+	 */
+	virtual bool RuntimeCanEditChange(const FEditPropertyChain& PropertyChain) const;
+
+	/**
+	 * Generate additional widget in the head in soda::IDetailsView
+	 */
+	virtual TSharedPtr<SWidget> GenerateToolBar();
+
+	/** Add addition metadata for object */
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Editable Object")
+	void GenerateMetadata(FRuntimeMetadataObject & Metadata);
+
+	/** 
+	 * BP version of RuntimePostEditChangeProperty and RuntimePostEditChangeChainProperty. 
+	 * Avalible only if this object inherited from C++ IEditableObject  
+	 */
+	UFUNCTION(BlueprintImplementableEvent, Category = "Editable Object", meta=(DisplayName = "PostEditChangeProperty"))
+	void ReceivePostEditChangeProperty(const FPropertyChangedEventBP & PropertyChangedEven);
+};
+
diff --git a/Source/RuntimeEditor/Public/MetadataPrimaryAsset.h b/Source/RuntimeEditor/Public/MetadataPrimaryAsset.h
new file mode 100644
index 0000000..340645f
--- /dev/null
+++ b/Source/RuntimeEditor/Public/MetadataPrimaryAsset.h
@@ -0,0 +1,45 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/AssetManagerTypes.h"
+#include "Engine/EngineTypes.h"
+#include "Engine/DataAsset.h"
+#include "IEditableObject.h"
+#include "MetadataPrimaryAsset.generated.h"
+
+/**
+ * UMetadataPrimaryAsset saved metadata for all CPP classes, structures, enums, properties and functuins during cooking of an uproject. 
+ * To access the metadata use the appropriate methods in FRuntimeMetaData. 
+ * TODO: Add filter to find metadata to save by path
+ */
+UCLASS(BlueprintType, Blueprintable)
+class RUNTIMEEDITOR_API UMetadataPrimaryAsset : public UDataAsset
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, Category = "MetadataPrimaryAsset")
+	bool bSaveAllCPPMetadata = false;
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId(FName("MetadataPrimaryAsset"), FPackageName::GetShortFName(GetOutermost()->GetName()));
+	}
+
+	virtual void PreSave(FObjectPreSaveContext ObjectSaveContext) override;
+	virtual void Serialize(FArchive& Ar) override;
+	//virtual void Serialize(FStructuredArchive::FRecord Record) override;
+	virtual void PostLoad() override;
+
+	virtual const TMap<FString, FRuntimeMetadataObject>& GetMetadataScope() const { return MetadataGlobalScope; }
+
+protected:
+#if WITH_EDITOR
+	virtual bool AddStructToMetadataGlobalScope(const UStruct* Struct);
+	virtual void UpdateMetadataGlobalScope();
+#endif
+
+	UPROPERTY()
+	TMap<FString, FRuntimeMetadataObject> MetadataGlobalScope;
+};
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimeClassViewer/ClassViewerFilter.h b/Source/RuntimeEditor/Public/RuntimeClassViewer/ClassViewerFilter.h
new file mode 100644
index 0000000..6b25b4b
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeClassViewer/ClassViewerFilter.h
@@ -0,0 +1,375 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Array.h"
+#include "Containers/Set.h"
+#include "CoreMinimal.h"
+#include "CoreTypes.h"
+#include "Delegates/Delegate.h"
+#include "Engine/EngineTypes.h"
+#include "Internationalization/Text.h"
+#include "Misc/Attribute.h"
+//#include "Settings/ClassViewerSettings.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/NameTypes.h"
+#include "UObject/SoftObjectPath.h"
+#include "UObject/TopLevelAssetPath.h"
+
+class FString;
+class FTextFilterExpressionEvaluator;
+//class IAssetReferenceFilter;
+class IAssetRegistry;
+class UClass;
+class UObject;
+
+namespace soda
+{
+class FClassViewerFilterFuncs;
+class FClassViewerInitializationOptions;
+class FClassViewerNode;
+
+/** Delegate used to respond to a filter option change. The argument will indicate whether the option was enabled or disabled. */
+DECLARE_DELEGATE_OneParam(FOnClassViewerFilterOptionChanged, bool);
+
+/** Used to define a custom class viewer filter option. */
+class FClassViewerFilterOption
+{
+public:
+	/** Whether or not the option is currently enabled (default = true). */
+	bool bEnabled = true;
+
+	/** Localized label text to use for the option in the class viewer's filter menu. */
+	TAttribute<FText> LabelText;
+
+	/** Localized tooltip text to use for the option in the class viewer's filter menu. */
+	TAttribute<FText> ToolTipText;
+
+	/** Optional external delegate that will be invoked when this filter option is changed. */
+	FOnClassViewerFilterOptionChanged OnOptionChanged;
+};
+
+/** Interface class for creating filters for the Class Viewer. */
+class IClassViewerFilter
+{
+public:
+	virtual ~IClassViewerFilter() {}
+
+	/**
+	 * Checks if a class is allowed by this filter.
+	 *
+	 * @param InInitOptions				The Class Viewer/Picker options.
+	 * @param InClass					The class to be tested.
+	 * @param InFilterFuncs				Useful functions for filtering.
+	 */
+	virtual bool IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef< class FClassViewerFilterFuncs > InFilterFuncs ) = 0;
+
+	/**
+	 * Checks if a class is allowed by this filter.
+	 *
+	 * @param InInitOptions				The Class Viewer/Picker options.
+	 * @param InUnloadedClassData		The information for the unloaded class to be tested.
+	 * @param InFilterFuncs				Useful functions for filtering.
+	 */
+	virtual bool IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef< const class IUnloadedBlueprintData > InUnloadedClassData, TSharedRef< class FClassViewerFilterFuncs > InFilterFuncs) = 0;
+
+	/**
+	 * Can be optionally implemented to gather additional filter flags. If present, these
+	 * will be added into the View Options menu where they can be toggled on/off by the user.
+	 * 
+	 * Example:
+	 *	In the following case, we define a custom filter option to allow the user to toggle the entire filter on/off. This is
+	 *	synced with a global config setting (MyFilterConfigSettings->bIsCustomFilterEnabled) that is checked at filtering time.
+	 * 
+	 *		void FMyCustomClassFilter::GetFilterOptions(TArray<TSharedRef<FClassViewerFilterOption>>& OutFilterOptions)
+	 *		{
+	 *			TSharedRef<FClassViewerFilterOption> MyFilterOption = MakeShared<FClassViewerFilterOption>();
+	 *			MyFilterOption->bEnabled = MyFilterConfigSettings->bIsCustomFilterEnabled;
+	 *			MyFilterOption->LabelText = LOCTEXT("MyCustomFilterOptionLabel", "My Custom Filter");
+	 *			MyFilterOption->ToolTipText = LOCTEXT("MyCustomFilterOptionToolTip", "Enable or disable my custom class filter.");
+	 *			MyFilterOption->OnOptionChanged = FOnClassViewerFilterOptionChanged::CreateSP(this, &FMyCustomClassFilter::OnOptionChanged);
+	 * 
+	 *			OutFilterOptions.Add(MyFilterOption);
+	 *		}
+	 *		
+	 *		void FMyCustomClassFilter::OnOptionChanged(bool bIsEnabled)
+	 *		{
+	 *			// Updates the filter's config setting whenever the user changes the option.
+	 *			MyFilterConfigSettings->bIsCustomFilterEnabled = bIsEnabled;
+	 *		}
+	 * 
+	 *		bool FMyCustomClassFilter::IsClassAllowed(...)
+	 *		{
+	 *			if(!MyFilterConfigSettings->bIsCustomFilterEnabled)
+	 *			{
+	 *				// Filter is disabled; always allow the class.
+	 *				return true;
+	 *			}
+	 * 
+	 *			// ...
+	 *		}
+	 *
+	 * @param OutFilterOptions		On output, contains the set of options to be added into the filter menu.
+	 *								The Class Viewer requires these to be allocated so that each option can
+	 *								be safely referenced by each menu item widget in the View Options menu.
+	 */
+	virtual void GetFilterOptions(TArray<TSharedRef<FClassViewerFilterOption>>& OutFilterOptions) {}
+};
+
+/** Filter class that performs many common checks. */
+class FClassViewerFilter : public IClassViewerFilter
+{
+public:
+	FClassViewerFilter(const FClassViewerInitializationOptions& InInitOptions);
+
+	/**
+	 * This function checks whether a node passes the filter defined by IsClassAllowed/IsUnloadedClassAllowed.
+	 *
+	 * @param InInitOptions				The Class Viewer/Picker options.
+	 * @param Node						The Node to check.
+	 * @param bCheckTextFilter			Whether to check the TextFilter. Disabling it could be useful e.g., to verify that the parent class of a IsNodeAllowed() object is also valid (regardless of the TextFilter, which will likely fail to pass).
+	 */
+	virtual bool IsNodeAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef<FClassViewerNode>& Node, const bool bCheckTextFilter);
+
+	virtual bool IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef< class FClassViewerFilterFuncs > InFilterFuncs ) override;
+	virtual bool IsClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const UClass* InClass, TSharedRef< class FClassViewerFilterFuncs > InFilterFuncs, const bool bCheckTextFilter);
+	virtual bool IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef< const class IUnloadedBlueprintData > InUnloadedClassData, TSharedRef< class FClassViewerFilterFuncs > InFilterFuncs) override;
+	virtual bool IsUnloadedClassAllowed(const FClassViewerInitializationOptions& InInitOptions, const TSharedRef< const class IUnloadedBlueprintData > InUnloadedClassData, TSharedRef< class FClassViewerFilterFuncs > InFilterFuncs, const bool bCheckTextFilter);
+
+	TArray<UClass*> InternalClasses;
+	TArray<FDirectoryPath> InternalPaths;
+
+	TSharedRef<FTextFilterExpressionEvaluator> TextFilter;
+	TSharedRef<FClassViewerFilterFuncs> FilterFunctions;
+	//TSharedPtr<IAssetReferenceFilter> AssetReferenceFilter;
+	const IAssetRegistry& AssetRegistry;
+};
+
+namespace EFilterReturn
+{
+	enum Type{ Failed = 0, Passed, NoItems };
+}
+class RUNTIMEEDITOR_API FClassViewerFilterFuncs
+{
+public:
+
+	virtual ~FClassViewerFilterFuncs() {}
+
+	/** 
+	 * Checks if the given Class is a child-of any of the classes in a set.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if it is a child-of a class in the set, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfInChildOfClassesSet(TSet< const UClass* >& InSet, const UClass* InClass);
+
+	/** 
+	 * Checks if the given Class is a child-of any of the classes in a set.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if it is a child-of a class in the set, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfInChildOfClassesSet(TSet< const UClass* >& InSet, const TSharedPtr< const class IUnloadedBlueprintData > InClass);
+
+	/** 
+	 * Checks if the given Class is a child-of ALL of the classes in a set.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if it is a child-of ALL the classes in the set, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatchesAllInChildOfClassesSet(TSet< const UClass* >& InSet, const UClass* InClass);
+
+	/** 
+	 * Checks if the given Class is a child-of ALL of the classes in a set.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if it is a child-of ALL the classes in the set, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatchesAllInChildOfClassesSet(TSet< const UClass* >& InSet, const TSharedPtr< const class IUnloadedBlueprintData > InClass);
+
+	/** 
+	 * Checks if ALL the Objects has a Is-A relationship with the passed in class.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if ALL the Objects set IsA the passed class, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatchesAll_ObjectsSetIsAClass(TSet< const UObject* >& InSet, const UClass* InClass);
+
+	/** 
+	 * Checks if ALL the Objects has a Is-A relationship with the passed in class.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if ALL the Objects set IsA the passed class, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatchesAll_ObjectsSetIsAClass(TSet< const UObject* >& InSet, const TSharedPtr< const class IUnloadedBlueprintData > InClass);
+
+	/** 
+	 * Checks if ALL the Classes set has a Is-A relationship with the passed in class.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if ALL the Classes set IsA the passed class, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatchesAll_ClassesSetIsAClass(TSet< const UClass* >& InSet, const UClass* InClass);
+
+	/** 
+	 * Checks if ALL the Classes set has a Is-A relationship with the passed in class.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if ALL the Classes set IsA the passed class, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatchesAll_ClassesSetIsAClass(TSet< const UClass* >& InSet, const TSharedPtr< const class IUnloadedBlueprintData > InClass);
+
+	/** 
+	 * Checks if any in the Classes set has a Is-A relationship with the passed in class.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if the Classes set IsA the passed class, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatches_ClassesSetIsAClass(TSet< const UClass* >& InSet, const UClass* InClass);
+
+	/** 
+	 * Checks if any in the Classes set has a Is-A relationship with the passed in class.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if the Classes set IsA the passed class, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfMatches_ClassesSetIsAClass(TSet< const UClass* >& InSet, const TSharedPtr< const class IUnloadedBlueprintData > InClass);
+
+	/** 
+	 * Checks if the Class is in the Classes set.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if the Class is in the Classes set, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfInClassesSet(TSet< const UClass* >& InSet, const UClass* InClass);
+
+	/** 
+	 * Checks if the Class is in the Classes set.
+	 *
+	 * @param InSet				The set to test against.
+	 * @param InClass			The class to test against.
+	 *
+	 * @return					EFilterReturn::Passed if the Class is in the Classes set, EFilterReturn::Failed if it is not, EFilterReturn::NoItems if the set is empty.
+	 */
+	virtual EFilterReturn::Type IfInClassesSet(TSet< const UClass* >& InSet, const TSharedPtr< const class IUnloadedBlueprintData > InClass);
+};
+
+class IUnloadedBlueprintData
+{
+public:
+
+	/**
+	 * Used to safely check whether the passed in flag is set.
+	 *
+	 * @param	InFlagsToCheck		Class flag to check for
+	 *
+	 * @return	true if the passed in flag is set, false otherwise
+	 *			(including no flag passed in, unless the FlagsToCheck is CLASS_AllFlags)
+	 */
+	virtual bool HasAnyClassFlags( uint32 InFlagsToCheck ) const = 0;
+
+	/**
+	 * Used to safely check whether all of the passed in flags are set.
+	 *
+	 * @param InFlagsToCheck	Class flags to check for
+	 * @return true if all of the passed in flags are set (including no flags passed in), false otherwise
+	 */
+	virtual bool HasAllClassFlags( uint32 InFlagsToCheck ) const = 0;
+
+	/** 
+	 * Sets the flags for this class.
+	 *
+	 * @param InFlags		The flags to be set to.
+	 */
+	virtual void SetClassFlags(uint32 InFlags) = 0;
+
+	/** 
+	 * This will return whether or not this class implements the passed in class / interface 
+	 *
+	 * @param InInterface - the interface to check and see if this class implements it
+	 **/
+	virtual bool ImplementsInterface(const UClass* InInterface) const = 0;
+
+	/**
+	 * Checks whether or not the class is a child-of the passed in class.
+	 *
+	 * @param InClass		The class to check against.
+	 *
+	 * @return				true if it is a child-of the passed in class.
+	 */
+	virtual bool IsChildOf(const UClass* InClass) const = 0;
+
+	/** 
+	 * Checks whether or not the class has an Is-A relationship with the passed in class.
+	 *
+	 * @param InClass		The class to check against.
+	 *
+	 * @return				true if it has an Is-A relationship to the passed in class.
+	 */
+	virtual bool IsA(const UClass* InClass) const = 0;
+
+	/**
+	 * Attempts to get the ClassWithin property for this class.
+	 *
+	 * @return ClassWithin of the child most Native class in the hierarchy.
+	 */
+	virtual const UClass* GetClassWithin() const = 0;
+
+	/**
+	 * Attempts to get the child-most Native class in the hierarchy.
+	 *
+	 * @return The child-most Native class in the hierarchy.
+	 */
+	virtual const UClass* GetNativeParent() const = 0;
+
+	/** 
+	 * Set whether or not this blueprint is a normal blueprint.
+	 */
+	virtual void SetNormalBlueprintType(bool bInNormalBPType) = 0;
+
+	/** 
+	 * Get whether or not this blueprint is a normal blueprint. 
+	 */
+	virtual bool IsNormalBlueprintType() const = 0;
+
+	/**
+	 * Get the generated class name of this blueprint.
+	 */
+	virtual TSharedPtr<FString> GetClassName() const = 0;
+
+	/**
+	 * Get the class path of this blueprint.
+	 */
+	UE_DEPRECATED(5.1, "Class names are now represented by path names. Please use GetClassPathName.")
+	virtual FName GetClassPath() const = 0;
+
+	/**
+	 * Get the class path of this blueprint.
+	 */
+	virtual FTopLevelAssetPath GetClassPathName() const = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimeClassViewer/ClassViewerModule.h b/Source/RuntimeEditor/Public/RuntimeClassViewer/ClassViewerModule.h
new file mode 100644
index 0000000..435133b
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeClassViewer/ClassViewerModule.h
@@ -0,0 +1,177 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "AssetRegistry/AssetData.h"
+#include "Containers/Array.h"
+#include "CoreMinimal.h"
+#include "CoreTypes.h"
+#include "Delegates/Delegate.h"
+#include "Internationalization/Text.h"
+#include "Logging/LogMacros.h"
+#include "Modules/ModuleInterface.h"
+#include "Templates/SharedPointer.h"
+
+
+class SWidget;
+class UClass;
+
+namespace soda
+{
+
+class IPropertyHandle;
+class FClassViewerFilterFuncs;
+class IClassViewerFilter;
+
+DEFINE_LOG_CATEGORY_STATIC(LogEditorClassViewer, Log, All);
+
+/** Delegate used with the Class Viewer in 'class picking' mode.  You'll bind a delegate when the
+    class viewer widget is created, which will be fired off when a class is selected in the list */
+DECLARE_DELEGATE_OneParam( FOnClassPicked, UClass* );
+
+namespace EClassViewerMode
+{
+	enum Type
+	{
+		/** Allows all classes to be browsed and selected; syncs selection with the editor; drag and drop attachment, etc. */
+		ClassBrowsing,
+
+		/** Sets the class viewer to operate as a class 'picker'. */
+		ClassPicker,
+	};
+}
+
+namespace EClassViewerDisplayMode
+{
+	enum Type
+	{
+		/** Default will choose what view mode based on if in Viewer or Picker mode. */
+		DefaultView,
+
+		/** Displays all classes as a tree. */
+		TreeView,
+
+		/** Displays all classes as a list. */
+		ListView,
+	};
+}
+
+enum class EClassViewerNameTypeToDisplay : uint8
+{
+	/** Display both the display name and class name if they're available and different. */
+	Dynamic,
+
+	/** Always use the display name */
+	DisplayName,
+
+	/** Always use the class name */
+	ClassName,
+};
+
+/**
+ * Settings for the Class Viewer set by the programmer before spawning an instance of the widget.  This
+ * is used to modify the class viewer's behavior in various ways, such as filtering in or out specific classes.
+ */
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
+class FClassViewerInitializationOptions
+{
+
+public:
+	/** [Deprecated] The filter to use on classes in this instance. */
+	UE_DEPRECATED(5.0, "Please add to the ClassFilters array member instead.")
+	TSharedPtr<IClassViewerFilter> ClassFilter;
+
+	/** The filter(s) to use on classes in this instance. */
+	TArray<TSharedRef<IClassViewerFilter>> ClassFilters;
+
+	/** Mode to operate in */
+	EClassViewerMode::Type Mode;
+
+	/** Mode to display the classes using. */
+	EClassViewerDisplayMode::Type DisplayMode;
+
+	/** Filters so only actors will be displayed. */
+	bool bIsActorsOnly;
+
+	/** Filters so only placeable actors will be displayed. Forces bIsActorsOnly to true. */
+	bool bIsPlaceableOnly;
+
+	/** Filters so only base blueprints will be displayed. */
+	bool bIsBlueprintBaseOnly;
+
+	/** Shows unloaded blueprints. Will not be filtered out based on non-bool filter options. */
+	bool bShowUnloadedBlueprints;
+
+	/** Shows a "None" option, only available in Picker mode. */
+	bool bShowNoneOption;
+
+	/** true will show the UObject root class. */
+	bool bShowObjectRootClass;
+
+	/** If true, root nodes will be expanded by default. */
+	bool bExpandRootNodes;
+
+	/** If true, all nodes will be expanded by default. */
+	bool bExpandAllNodes;
+
+	/** true allows class dynamic loading on selection */
+	bool bEnableClassDynamicLoading;
+
+	/** Controls what name is shown for classes */
+	EClassViewerNameTypeToDisplay NameTypeToDisplay;
+
+	/** the title string of the class viewer if required. */
+	FText ViewerTitleString;
+
+	/** The property this class viewer be working on. */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+
+	/** The passed in property handle will be used to gather referencing assets. If additional referencing assets should be reported, supply them here. */
+	TArray<FAssetData> AdditionalReferencingAssets;
+
+	/** true (the default) shows the view options at the bottom of the class picker */
+	bool bAllowViewOptions;
+
+	/** true (the default) shows a background border behind the class viewer widget. */
+	bool bShowBackgroundBorder = true;
+
+	/** Defines additional classes you want listed in the "Common Classes" section for the picker. */
+	TArray<UClass*> ExtraPickerCommonClasses;
+
+	/** false by default, restricts the class picker to only showing editor module classes */
+	bool bEditorClassesOnly;
+
+	/** Will set the initially selected row, if possible, to this class when the viewer is created */
+	UClass* InitiallySelectedClass;
+
+	/** (true) Will show the default classes if they exist. */
+	bool bShowDefaultClasses;
+
+public:
+
+	/** Constructor */
+	FClassViewerInitializationOptions()	
+		: Mode( EClassViewerMode::ClassPicker )
+		, DisplayMode(EClassViewerDisplayMode::DefaultView)
+		, bIsActorsOnly(false)
+		, bIsPlaceableOnly(false)
+		, bIsBlueprintBaseOnly(false)
+		, bShowUnloadedBlueprints(true)
+		, bShowNoneOption(false)
+		, bShowObjectRootClass(false)
+		, bExpandRootNodes(true)
+		, bExpandAllNodes(false)
+		, bEnableClassDynamicLoading(true)
+		, NameTypeToDisplay(EClassViewerNameTypeToDisplay::ClassName)
+		, bAllowViewOptions(true)
+		, bEditorClassesOnly(false)
+		, InitiallySelectedClass(nullptr)
+		, bShowDefaultClasses(true)
+	{
+	}
+};
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
+
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimeClassViewer/SClassViewer.h b/Source/RuntimeEditor/Public/RuntimeClassViewer/SClassViewer.h
new file mode 100644
index 0000000..548f399
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeClassViewer/SClassViewer.h
@@ -0,0 +1,324 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimeClassViewer/ClassViewerModule.h"
+#include "Containers/Array.h"
+#include "Containers/BitArray.h"
+#include "Containers/Map.h"
+#include "Containers/Set.h"
+#include "Containers/SparseArray.h"
+#include "CoreMinimal.h"
+#include "Delegates/Delegate.h"
+#include "Engine/EngineTypes.h"
+#include "HAL/Platform.h"
+#include "HAL/PlatformCrt.h"
+#include "Input/Reply.h"
+#include "Internationalization/Text.h"
+#include "Misc/Optional.h"
+//#include "Settings/ClassViewerSettings.h"
+#include "SlateFwd.h"
+#include "Templates/SharedPointer.h"
+#include "Templates/TypeHash.h"
+#include "Templates/UnrealTemplate.h"
+#include "Types/SlateEnums.h"
+#include "UObject/NameTypes.h"
+#include "UObject/SoftObjectPath.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/Views/SListView.h"
+#include "Widgets/Views/STableRow.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STreeView.h"
+
+class FMenuBuilder;
+class FString;
+class FTextFilterExpressionEvaluator;
+class ITableRow;
+class SComboButton;
+class SSearchBox;
+class SWidget;
+class UBlueprint;
+class UClass;
+struct FDirectoryPath;
+struct FFocusEvent;
+struct FGeometry;
+struct FKeyEvent;
+struct FPointerEvent;
+struct FSoftClassPath;
+
+namespace soda
+{
+
+class FClassViewerFilter;
+class FClassViewerFilterOption;
+class FClassViewerNode;
+
+//////////////////////////////////////////////////////////////////////////
+// SClassViewer
+
+class SClassViewer : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SClassViewer )
+	{
+	}
+
+	SLATE_ARGUMENT( FOnClassPicked, OnClassPickedDelegate )
+
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct the widget
+	 *
+	 * @param	InArgs			A declaration from which to construct the widget
+	 * @param	InitOptions		Programmer-driven initialization options for this widget
+	 */
+	void Construct(const FArguments& InArgs, const FClassViewerInitializationOptions& InInitOptions);
+
+	/** Gets the widget contents of the app */
+	virtual TSharedRef<SWidget> GetContent();
+
+	virtual ~SClassViewer();
+
+	/** Empty the selection set. */
+	virtual void ClearSelection();
+
+	/** SWidget interface */
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+	virtual FReply OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent ) override;
+	virtual FReply OnFocusReceived( const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent ) override;
+	virtual bool SupportsKeyboardFocus() const override;
+
+	/** Test to see whether the given class would be allowed by this class viewer */
+	virtual bool IsClassAllowed(const UClass* InClass) const;
+
+	/** Sends a requests to the Class Viewer to refresh itself the next chance it gets */
+	RUNTIMEEDITOR_API void Refresh();
+
+	/** Requests a repopulation of the internal Class Hierarchy database */
+	RUNTIMEEDITOR_API static void RequestPopulateClassHierarchy();
+
+	/** Destroys the internal Class Hierarchy database */
+	static void DestroyClassHierarchy();
+private:
+	/** Retrieves the children for the input node.
+	 *	@param InParent				The parent node to retrieve the children from.
+	 *	@param OutChildren			List of children for the parent node.
+	 *
+	 */
+	void OnGetChildrenForClassViewerTree( TSharedPtr<FClassViewerNode> InParent, TArray< TSharedPtr< FClassViewerNode > >& OutChildren );
+
+	/** Creates the row widget when called by Slate when an item appears on the tree. */
+	TSharedRef< ITableRow > OnGenerateRowForClassViewer( TSharedPtr<FClassViewerNode> Item, const TSharedRef< STableViewBase >& OwnerTable );
+
+	/** Invoked when the user attempts to drag an item out of the class browser */
+	//FReply OnDragDetected( const FGeometry& Geometry, const FPointerEvent& PointerEvent ) override;
+
+	/** Called by Slate when the filter box changes text. */
+	void OnFilterTextChanged( const FText& InFilterText );
+
+	/** Called when enter is hit in search box */
+	void OnFilterTextCommitted(const FText& InText, ETextCommit::Type CommitInfo);
+
+	/** Called by Slate when an item is selected from the tree/list. */
+	void OnClassViewerSelectionChanged( TSharedPtr<FClassViewerNode> Item, ESelectInfo::Type SelectInfo );
+
+	/** Called by Slate when an item is expanded/collapsed from the tree/list. */
+	void OnClassViewerExpansionChanged(TSharedPtr<FClassViewerNode> Item, bool bExpanded);
+
+	/** A simple function for the filters to keep them enabled. */
+	bool Menu_CanExecute() const;
+
+	/** Toggles "Actors Only" true/false. */
+	void MenuActorsOnly_Execute();
+
+	/** Returns the state of "Actors Only". */
+	bool MenuActorsOnly_IsChecked() const;
+
+	/** Toggles "Placeable Only" true/false. */
+	void MenuPlaceableOnly_Execute();
+
+	/** Returns the state of "Placeable Only". */
+	bool MenuPlaceableOnly_IsChecked() const;
+
+	/** Toggles "Blueprint Bases Only" true/false. */
+	void MenuBlueprintBasesOnly_Execute();
+
+	/** Returns the state of "Blueprint Bases Only". */
+	bool MenuBlueprintBasesOnly_IsChecked() const;
+
+	/** Fills in the filter menu. */
+	TSharedRef<SWidget> FillFilterEntries();
+
+	/** 
+	 *	Sets all expansion states in the tree.
+	 *
+	 *	@param bInExpansionState			The expansion state to set the tree to.
+	 */
+	void SetAllExpansionStates(bool bInExpansionState);
+
+	/**
+	 *	A helper function to recursively set the tree.
+	 *
+	 *	@param	InNode						The current node in the tree.
+	 *	@param	bInExpansionState			The expansion state to set the tree to.
+	 */
+	void SetAllExpansionStates_Helper(TSharedPtr< FClassViewerNode > InNode, bool bInExpansionState);
+
+	/**
+	 *	A helper function to toggle expansion state of a single node
+	 *
+	 *	@param	InNode						The node to toggle expansion.
+	 */
+	void ToggleExpansionState_Helper(TSharedPtr< FClassViewerNode > InNode);
+
+	/** Builds the right click menu widget for the selected node. */
+	TSharedPtr< SWidget > BuildMenuWidget();
+
+	/** Menu context option to open the currently selected Blueprint in the editor. */
+	void OnOpenBlueprintTool();
+
+	/** Menu context option to find the selected object in the content browser. */
+	void FindInContentBrowser();
+
+	/** Recursive function to expand nodes not filtered out of the tree
+	*	@param	InNode				The current node to inspect for expansion.
+	*
+	*	@return bool				true if the child expanded, thus the parent should.
+	*/
+	bool ExpandFilteredInNodes(TSharedPtr<FClassViewerNode> InNode);
+
+	/** Recursive function to map the expansion states of items in the tree. 
+	 *	@param InItem		The current item to examine the expansion state of.
+	 */
+	void MapExpansionStatesInTree( TSharedPtr<FClassViewerNode> InItem );
+
+	/** Recursive function to set the expansion states of items in the tree. 
+	 *	@param InItem		The current item to set the expansion state of.
+	 */
+	void SetExpansionStatesInTree( TSharedPtr<FClassViewerNode> InItem );
+
+	/** Populates the tree with items based on the current filter. */
+	void Populate();
+
+	/** Creates a "None" option for the tree/list. */
+	TSharedPtr<FClassViewerNode> CreateNoneOption();
+
+	/** Returns an array of the currently selected ClassViewerNodes */
+	const TArray< TSharedPtr< FClassViewerNode > > GetSelectedItems() const;
+
+	/** Expands all of the root nodes */
+	virtual void ExpandRootNodes();
+
+
+
+	/** Handler for when the view combo button is clicked */
+	TSharedRef<SWidget> GetViewButtonContent();
+
+	/** Gets the text for the class count label */
+	FText GetClassCountText() const;
+
+	/** Sets the view type and updates lists accordingly */
+	//void SetCurrentDeveloperViewType(EClassViewerDeveloperType NewType);
+
+	/** Clears the reference to the current view and creates a new one, based on CurrentViewType */
+	void CreateCurrentDeveloperView();
+
+	/** Gets the current view type (list or tile) */
+	//EClassViewerDeveloperType GetCurrentDeveloperViewType() const;
+
+	/** Returns true if ViewType is the current view type */
+	//bool IsCurrentDeveloperViewType(EClassViewerDeveloperType ViewType) const;
+
+	/** Toggle whether internal use classes should be shown or not */
+	void ToggleShowInternalClasses();
+
+	/** Whether or not it's possible to show internal use classes */
+	bool IsShowingInternalClasses() const;
+	
+	/** Whether or not it's possible to show internal use classes */
+	bool IsToggleShowInternalClassesAllowed() const;
+
+	/** Toggle whether a custom class filter option is enabled */
+	//void ToggleCustomFilterOption(TSharedRef<FClassViewerFilterOption> FilterOption);
+
+	/** Returns whether a custom class filter option is currently enabled */
+	//bool IsCustomFilterOptionEnabled(TSharedRef<FClassViewerFilterOption> FilterOption) const;
+
+	/** Get the total number of classes passing the current filters.*/
+	const int GetNumItems() const;
+
+	/** Count the number of tree items in the specified hierarchy*/
+	int32 CountTreeItems(FClassViewerNode* Node);
+
+	/** Handle the settings for ClassViewer changing.*/
+	void HandleSettingChanged(FName PropertyName);
+
+	/** Accessor for the classnames that have been marked as internal only in settings */
+	void GetInternalOnlyClasses(TArray<FSoftClassPath>& Classes);
+	
+	/** Accessor for the class paths that have been marked as internal only in settings */
+	void GetInternalOnlyPaths(TArray<FDirectoryPath>& Paths);
+private:
+	/** Init options, cached */
+	FClassViewerInitializationOptions InitOptions;
+
+	/** Filter to use to determine what classes are valid. */
+	TSharedPtr<FClassViewerFilter> ClassFilter;
+
+	/** The items to be displayed in the tree. */
+	TArray< TSharedPtr< FClassViewerNode > > RootTreeItems;
+
+	/** Holds the Slate Tree widget which holds the classes for the Class Viewer. */
+	TSharedPtr<STreeView<TSharedPtr< FClassViewerNode > >> ClassTree;
+
+	/** Holds the Slate List widget which holds the classes for the Class Viewer. */
+	TSharedPtr<SListView<TSharedPtr< FClassViewerNode > >> ClassList;
+
+	/** The Class Search Box, used for filtering the classes visible. */
+	TSharedPtr<SSearchBox> SearchBox;
+
+	/** true to allow class dynamic loading. */
+	bool bEnableClassDynamicLoading;
+
+	/** Callback that's fired when a class is selected while in 'class picking' mode */
+	FOnClassPicked OnClassPicked;
+
+	/** The class currently right clicked on. */
+	UClass* RightClickClass;
+
+	/** The blueprint currently right clicked on. */
+	UBlueprint* RightClickBlueprint;
+
+	/** The index of the class currently right clicked on. */
+	int32 RightClickClassIndex;
+
+	/** true if expansions states should be saved when compiling. */
+	bool bSaveExpansionStates;
+
+	/** The map holding the expansion state map for the tree. */
+	TMap< FString, bool > ExpansionStateMap;
+
+	/** True if the Class Viewer needs to be repopulated at the next appropriate opportunity, occurs whenever classes are added, removed, renamed, etc. */
+	bool bNeedsRefresh;
+
+	/** True if the search box will take keyboard focus next frame */
+	bool bPendingFocusNextFrame;
+
+	/** True if we need to set the tree expansion states according to our local copy next tick */
+	bool bPendingSetExpansionStates;
+
+	/** The button that displays view options */
+	TSharedPtr<SComboButton> ViewOptionsComboButton;
+
+	/** Number of classes that passed the filter*/
+	int NumClasses;
+
+	/** Custom filter options for the View Options menu */
+	//TArray<TSharedRef<FClassViewerFilterOption>> CustomClassFilterOptions;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimeDocumentation/IDocumentation.h b/Source/RuntimeEditor/Public/RuntimeDocumentation/IDocumentation.h
new file mode 100644
index 0000000..e18c35f
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeDocumentation/IDocumentation.h
@@ -0,0 +1,215 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SBoxPanel.h"
+#include "Modules/ModuleManager.h"
+//#include "IDocumentationModule.h"
+#include "RuntimeEditorModule.h"
+
+template< typename ObjectType > class TAttribute;
+
+namespace soda
+{
+
+/** Invoked when someone clicks on a hyperlink. */
+DECLARE_DELEGATE_OneParam( FOnNavigate, const FString& )
+
+class FDocumentationStyle
+{
+public:
+	FDocumentationStyle()
+		: ContentStyleName(TEXT("Documentation.Content"))
+		, BoldContentStyleName(TEXT("Documentation.BoldContent"))
+		, NumberedContentStyleName(TEXT("Documentation.NumberedContent"))
+		, Header1StyleName(TEXT("Documentation.Header1"))
+		, Header2StyleName(TEXT("Documentation.Header2"))
+		, HyperlinkStyleName(TEXT("Documentation.Hyperlink"))
+		, HyperlinkButtonStyleName(TEXT("Documentation.Hyperlink.Button"))
+		, HyperlinkTextStyleName(TEXT("Documentation.Hyperlink.Text"))
+		, SeparatorStyleName(TEXT("Documentation.Separator"))
+	{
+	}
+
+	/** Set the content style for this documentation */
+	FDocumentationStyle& ContentStyle(const FName& InName) 
+	{
+		ContentStyleName = InName;
+		return *this;
+	}
+
+	/** Set the bold content style for this documentation */
+	FDocumentationStyle& BoldContentStyle(const FName& InName) 
+	{
+		BoldContentStyleName = InName;
+		return *this;
+	}
+
+	/** Set the numbered content style for this documentation */
+	FDocumentationStyle& NumberedContentStyle(const FName& InName) 
+	{
+		NumberedContentStyleName = InName;
+		return *this;
+	}
+
+	/** Set the header 1 style for this documentation */
+	FDocumentationStyle& Header1Style(const FName& InName) 
+	{
+		Header1StyleName = InName;
+		return *this;
+	}
+
+	/** Set the header 2 style for this documentation */
+	FDocumentationStyle& Header2Style(const FName& InName) 
+	{
+		Header2StyleName = InName;
+		return *this;
+	}
+
+	/** Set the hyperlink button style for this documentation */
+	FDocumentationStyle& HyperlinkStyle(const FName& InName) 
+	{
+		HyperlinkStyleName = InName;
+		return *this;
+	}
+
+	/** Set the hyperlink button style for this documentation */
+	FDocumentationStyle& HyperlinkButtonStyle(const FName& InName) 
+	{
+		HyperlinkButtonStyleName = InName;
+		return *this;
+	}
+
+	/** Set the hyperlink text style for this documentation */
+	FDocumentationStyle& HyperlinkTextStyle(const FName& InName) 
+	{
+		HyperlinkTextStyleName = InName;
+		return *this;
+	}
+
+	/** Set the separator style for this documentation */
+	FDocumentationStyle& SeparatorStyle(const FName& InName) 
+	{
+		SeparatorStyleName = InName;
+		return *this;
+	}
+
+	/** Content text style */
+	FName ContentStyleName;
+
+	/** Bold content text style */
+	FName BoldContentStyleName;
+
+	/** Numbered content text style */
+	FName NumberedContentStyleName;
+
+	/** Header1 text style */
+	FName Header1StyleName;
+
+	/** Header2 text style */
+	FName Header2StyleName;
+
+	/** Hyperlink style */
+	FName HyperlinkStyleName;
+
+	/** Hyperlink button style */
+	FName HyperlinkButtonStyleName;
+
+	/** Hyperlink text style */
+	FName HyperlinkTextStyleName;
+
+	/** Separator style name */
+	FName SeparatorStyleName;
+};
+
+class FParserConfiguration
+{
+public:
+	static TSharedRef< FParserConfiguration > Create()
+	{
+		return MakeShareable( new FParserConfiguration() );
+	}
+
+public:
+	~FParserConfiguration() {}
+
+	FOnNavigate OnNavigate;
+
+private:
+	FParserConfiguration() {}
+};
+
+
+struct FDocumentationSourceInfo
+{
+public:
+	FString Source;
+	FString Medium;
+	FString Campaign;
+
+	FDocumentationSourceInfo() {};
+	FDocumentationSourceInfo(FString const& InCampaign) 
+		: Source(TEXT("editor")), Medium(TEXT("docs")), Campaign(InCampaign)
+	{};
+	FDocumentationSourceInfo(FString const& InSource, FString const& InMedium, FString const& InCampaign)
+		: Source(InSource), Medium(InMedium), Campaign(InCampaign)
+	{}
+
+	/** Returns true if there is NO valid source info in the struct, false otherwise. */
+	bool IsEmpty() const
+	{
+		return Campaign.IsEmpty() && Source.IsEmpty() && Medium.IsEmpty();
+	}
+};
+
+
+class IDocumentation
+{
+public:
+
+	static inline TSharedRef< IDocumentation > Get()
+	{
+		FRuntimeEditorModule& Module = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+		return Module.GetDocumentation();
+	}
+
+	static inline bool IsAvailable()
+	{
+		return FModuleManager::Get().IsModuleLoaded( "RuntimeEditor" );
+	}
+
+public:
+
+	virtual bool OpenHome(FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString& BaseUrlId = FString()) const = 0;
+
+	virtual bool OpenHome(const FCultureRef& Culture, FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString & BaseUrlId = FString()) const = 0;
+
+	virtual bool OpenAPIHome(FDocumentationSourceInfo Source = FDocumentationSourceInfo()) const = 0;
+
+	virtual bool Open(const FString& Link, FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString& BaseUrlId = FString()) const = 0;
+
+	virtual bool Open(const FString& Link, const FCultureRef& Culture, FDocumentationSourceInfo Source = FDocumentationSourceInfo(), const FString& BaseUrlId = FString()) const = 0;
+
+	virtual TSharedRef< class SWidget > CreateAnchor( const TAttribute<FString>& Link, const FString& PreviewLink = FString(), const FString& PreviewExcerptName = FString(), const TAttribute<FString>& BaseUrlId = FString()) const = 0;
+
+	virtual TSharedRef< class IDocumentationPage > GetPage( const FString& Link, const TSharedPtr< FParserConfiguration >& Config, const FDocumentationStyle& Style = FDocumentationStyle() ) = 0;
+
+	virtual bool PageExists(const FString& Link) const = 0;
+
+	virtual bool PageExists(const FString& Link, const FCultureRef& Culture) const = 0;
+
+	virtual const TArray < FString >& GetSourcePaths() const = 0;
+
+	virtual TSharedRef< class SToolTip > CreateToolTip( const TAttribute<FText>& Text, const TSharedPtr<SWidget>& OverrideContent, const FString& Link, const FString& ExcerptName ) const = 0;
+
+	virtual TSharedRef< class SToolTip > CreateToolTip(const TAttribute<FText>& Text, const TSharedRef<SWidget>& OverrideContent, const TSharedPtr<class SVerticalBox>& DocVerticalBox, const FString& Link, const FString& ExcerptName) const = 0;
+
+	virtual bool RegisterBaseUrl(const FString& Id, const FString& Url) = 0;
+
+	virtual FString GetBaseUrl(const FString& Id) const = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimeDocumentation/IDocumentationPage.h b/Source/RuntimeEditor/Public/RuntimeDocumentation/IDocumentationPage.h
new file mode 100644
index 0000000..c946fa4
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeDocumentation/IDocumentationPage.h
@@ -0,0 +1,78 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+
+class SWidget;
+
+namespace soda
+{
+
+struct FExcerpt
+{
+	/** FExcerpt constructor */
+	FExcerpt()
+		: LineNumber( INDEX_NONE )
+	{}
+
+	/** FExcerpt overloaded constructor */
+	FExcerpt( const FString& InName, const TSharedPtr< SWidget >& InContent, const TMap< FString, FString >& InVariables, int32 InLineNumber )
+		: Name( InName )
+		, Content( InContent )
+		, Variables( InVariables )
+		, LineNumber( InLineNumber )
+	{}
+
+	FExcerpt(const FString& InName, const TSharedPtr< SWidget >& InContent, const TMap< FString, FString >& InVariables, int32 InLineNumber, const FString& InSourcePath)
+		: Name(InName)
+		, Content(InContent)
+		, Variables(InVariables)
+		, LineNumber(InLineNumber)
+		, SourcePath(InSourcePath)
+	{}
+
+	/** The name of the excerpt, as specified in the [EXCERPT:NAME] line at the top of the excerpt. */
+	FString Name;
+	/** The Slate content generated for the excerpt. */
+	TSharedPtr<SWidget> Content;
+	/** The content of the [VAR] sections read from the excerpt. The keys are the names from the [VAR:NAME] lines
+		that start the variables, and the value for each key is the text inside the [VAR:NAME].....[/VAR] block. */
+	TMap< FString, FString > Variables;
+	/** The line number that this excerpt begins within its source file. */
+	int32 LineNumber;
+	/** A rich text version of the excerpt content. */
+	FString RichText;
+	/** The path to the file that this excerpt was read from. */
+	FString SourcePath;
+};
+
+class IDocumentationPage
+{
+public:
+
+	/** Returns true if this page contains a match for the ExcerptName */
+	virtual bool HasExcerpt( const FString& ExcerptName ) = 0;
+	/** Return the number of excerpts this page holds */
+	virtual int32 GetNumExcerpts() const = 0;
+	/** Populates the argument excerpt with this content found using the excer */
+	virtual bool GetExcerpt( const FString& ExcerptName, FExcerpt& Excerpt) = 0;
+	/** Populates the argument TArray with Excerpts this page contains */
+	virtual void GetExcerpts( /*OUT*/ TArray< FExcerpt >& Excerpts ) = 0;
+	/** Builds the Excerpt content using the excerpt name from the argument */
+	virtual bool GetExcerptContent( FExcerpt& Excerpt ) = 0;
+
+	/** Returns the title of the excerpt */
+	virtual FText GetTitle() = 0;
+
+	/** Rebuilds the excerpt content */
+	virtual void Reload() = 0;
+
+	/** Sets the argument as the width control for text wrap in the excerpt widgets */
+	virtual void SetTextWrapAt( TAttribute<float> WrapAt ) = 0;
+
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimeDocumentation/RuntimeDocumentationSettings.h b/Source/RuntimeEditor/Public/RuntimeDocumentation/RuntimeDocumentationSettings.h
new file mode 100644
index 0000000..7ea651b
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeDocumentation/RuntimeDocumentationSettings.h
@@ -0,0 +1,47 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/DeveloperSettings.h"
+#include "RuntimeDocumentation/IDocumentation.h"
+
+#include "RuntimeDocumentationSettings.generated.h"
+
+
+USTRUCT()
+struct FRuntimeDocumentationBaseUrl
+{
+	GENERATED_USTRUCT_BODY()
+
+public:
+	UPROPERTY()
+	FString Id;
+
+	UPROPERTY()
+	FString Url;
+
+	FRuntimeDocumentationBaseUrl() {};
+
+	FRuntimeDocumentationBaseUrl(FString const& InId, FString const& InUrl)
+		: Id(InId), Url(InUrl)
+	{};
+
+	/** Returns true if either the ID or URL is unset. */
+	bool IsEmpty() const
+	{
+		return Id.IsEmpty() || Url.IsEmpty();
+	}
+};
+
+
+UCLASS(config=Editor)
+class URuntimeDocumentationSettings : public UDeveloperSettings
+{
+	GENERATED_BODY()
+
+public:
+	// Array of base URLs for documentation links that are loaded on startup
+	UPROPERTY(Config)
+	TArray<FRuntimeDocumentationBaseUrl> DocumentationBaseUrls;
+};
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimeDocumentation/SDocumentationToolTip.h b/Source/RuntimeEditor/Public/RuntimeDocumentation/SDocumentationToolTip.h
new file mode 100644
index 0000000..953cad9
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeDocumentation/SDocumentationToolTip.h
@@ -0,0 +1,146 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/UnrealString.h"
+#include "CoreMinimal.h"
+#include "HAL/Platform.h"
+#include "Input/Reply.h"
+#include "Internationalization/Text.h"
+#include "Layout/Margin.h"
+#include "Math/Color.h"
+#include "Misc/Attribute.h"
+#include "Styling/SlateColor.h"
+#include "Styling/SlateTypes.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/NameTypes.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+
+class SBox;
+class SVerticalBox;
+class SWidget;
+struct FGeometry;
+
+namespace soda
+{
+
+class IDocumentationPage;
+
+class RUNTIMEEDITOR_API SDocumentationToolTip : public SCompoundWidget
+{
+
+public:
+
+	SLATE_BEGIN_ARGS( SDocumentationToolTip )
+		: _Text()
+		, _Style( TEXT("Documentation.SDocumentationTooltip") )
+		, _SubduedStyle( TEXT("Documentation.SDocumentationTooltipSubdued") )
+		, _HyperlinkTextStyle( TEXT("Documentation.SDocumentationTooltipHyperlinkText") )
+		, _HyperlinkButtonStyle( TEXT("Documentation.SDocumentationTooltipHyperlinkButton") )
+		, _ColorAndOpacity( FLinearColor::Black )
+		, _AddDocumentation( true )
+		, _DocumentationMargin(0)
+		, _Content()
+		{}
+
+		/** The text displayed in this tool tip */
+		SLATE_ATTRIBUTE( FText, Text )
+
+		/** The text style to use for this tool tip */
+		SLATE_ARGUMENT( FName, Style )
+		
+		/** The text style to use for subdued footer text in this tool tip */
+		SLATE_ARGUMENT( FName, SubduedStyle )
+		
+		/** The text style to use for hyperlinks in this tool tip */
+		SLATE_ARGUMENT( FName, HyperlinkTextStyle )
+
+		/** Hyperlink button style */
+		SLATE_ARGUMENT( FName, HyperlinkButtonStyle )
+
+		/** Font color and opacity */
+		SLATE_ATTRIBUTE( FSlateColor, ColorAndOpacity )
+
+		/**  */
+		SLATE_ARGUMENT( bool, AddDocumentation )
+
+		SLATE_ARGUMENT( FMargin, DocumentationMargin )
+
+		/**  */
+		SLATE_ARGUMENT( FString, DocumentationLink )
+
+		/**  */
+		SLATE_ARGUMENT( FString, ExcerptName )
+
+		/** Arbitrary content to be displayed in the tool tip; overrides any text that may be set. */
+		SLATE_DEFAULT_SLOT( FArguments, Content )
+
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct this widget
+	 *
+	 * @param	InArgs	The declaration data for this widget
+	 */
+	void Construct( const FArguments& InArgs );
+
+	void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime );
+
+	bool IsInteractive() const;
+
+	virtual const FText& GetTextTooltip() const
+	{
+		return TextContent.Get();
+	}
+
+	/**
+	 * Adds slots to the provided Vertical Box containing the documentation information.
+	 * If you specify not to add it (AddDocumentation = false) you may call this externally to do custom tooltip layout
+	 *
+	 * @param	VerticalBox	The vertical box to add it to
+	 */
+	void AddDocumentation(TSharedPtr< SVerticalBox > VerticalBox);
+
+private:
+
+	void ConstructSimpleTipContent();
+
+	void ConstructFullTipContent();
+
+	FReply ReloadDocumentation();
+
+	void CreateExcerpt( FString FileSource, FString ExcerptName );
+
+private:
+
+	/** Text block widget */
+	TAttribute< FText > TextContent;
+	TSharedPtr< SWidget > OverrideContent;
+	FTextBlockStyle StyleInfo;
+	FTextBlockStyle SubduedStyleInfo;
+	FTextBlockStyle HyperlinkTextStyleInfo;
+	FButtonStyle HyperlinkButtonStyleInfo;
+	TAttribute< FSlateColor > ColorAndOpacity;
+
+	/** The link to the documentation */
+	FString DocumentationLink;
+	FString ExcerptName;
+
+	/** Content widget */
+	TSharedPtr< SBox > WidgetContent;
+
+	TSharedPtr< SWidget > SimpleTipContent;
+	bool IsDisplayingDocumentationLink;
+
+	TSharedPtr< SWidget > FullTipContent;
+
+	TSharedPtr< IDocumentationPage > DocumentationPage;
+	bool IsShowingFullTip;
+
+	bool bAddDocumentation;
+	FMargin DocumentationMargin;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimeDocumentation/TutorialMetaData.h b/Source/RuntimeEditor/Public/RuntimeDocumentation/TutorialMetaData.h
new file mode 100644
index 0000000..f6c0705
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeDocumentation/TutorialMetaData.h
@@ -0,0 +1,55 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Guid.h"
+#include "Types/ISlateMetaData.h"
+
+namespace soda
+{
+
+class FTutorialMetaData : public FTagMetaData
+{
+public:
+	SLATE_METADATA_TYPE(FTutorialMetaData, FTagMetaData)
+
+	FTutorialMetaData(FName InTag, FString InTabType, FString InFriendlyName = FString())
+		: FTagMetaData(InTag)
+		, TabTypeToOpen(InTabType)
+		, FriendlyName(InFriendlyName)
+		{
+		}
+	
+	FTutorialMetaData(FName InTag)
+		: FTagMetaData(InTag)
+		{
+		}
+	/* The type of tab we want to open for this widget where relevant. */
+	FString TabTypeToOpen;
+
+	/** User friendly display name */
+	FString FriendlyName;
+};
+
+class FGraphNodeMetaData : public FTutorialMetaData
+{
+public:
+	SLATE_METADATA_TYPE(FGraphNodeMetaData, FTutorialMetaData)
+
+	FGraphNodeMetaData(FName InTag, FString InFriendlyName = FString(), FString InOuterName = FString(), FString InTabType = FString())
+		: FTutorialMetaData(InTag, InTabType, InFriendlyName)
+		, OuterName(InOuterName)
+		{
+		}
+
+	/** GUID for the node */
+	FGuid GUID;
+
+	/** Name of the outer (which should be the blueprint) */
+	FString OuterName;
+
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimeEditorModule.h b/Source/RuntimeEditor/Public/RuntimeEditorModule.h
new file mode 100644
index 0000000..24a8674
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeEditorModule.h
@@ -0,0 +1,346 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SWindow.h"
+#include "Modules/ModuleInterface.h"
+#include "UObject/StructOnScope.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "RuntimePropertyEditor/PropertyEditorDelegates.h"
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+
+class FNotifyHook;
+class SWindow;
+
+namespace soda
+{
+
+class FAssetEditorToolkit;
+class IPropertyHandle;
+class IPropertyTable;
+class IPropertyTableCellPresenter;
+class ISinglePropertyView;
+class SDetailsView;
+class SPropertyTreeViewImpl;
+class SSingleProperty;
+class IPropertyTypeCustomization;
+class IDetailsView;
+class IStructureDetailsView;
+class IPropertyRowGenerator;
+struct FDetailsViewArgs;
+struct FSinglePropertyParams;
+struct FStructureDetailsViewArgs;
+struct FPropertyRowGeneratorArgs;
+
+/**
+ * The location of a property name relative to its editor widget                   
+ */
+namespace EPropertyNamePlacement
+{
+	enum Type
+	{
+		/** Do not show the property name */
+		Hidden,
+		/** Show the property name to the left of the widget */
+		Left,
+		/** Show the property name to the right of the widget */
+		Right,
+		/** Inside the property editor edit box (unused for properties that dont have edit boxes ) */
+		Inside,
+	};
+}
+
+
+/**
+ * Potential results from accessing the values of properties                   
+ */
+namespace FPropertyAccess
+{
+	enum Result
+	{
+		/** Multiple values were found so the value could not be read */
+		MultipleValues,
+		/** Failed to set or get the value */
+		Fail,
+		/** Successfully set the got the value */
+		Success,
+	};
+}
+
+
+
+
+
+/**
+ * Base class for adding an extra data to identify a custom property type
+ */
+class IPropertyTypeIdentifier
+{
+public:
+	virtual ~IPropertyTypeIdentifier() {}
+
+	/**
+	 * Called to identify if a property type is customized
+	 *
+	 * @param IPropertyHandle	Handle to the property being tested
+	 */
+	virtual bool IsPropertyTypeCustomized( const IPropertyHandle& PropertyHandle ) const = 0;
+};
+
+typedef TMap< TWeakObjectPtr<UStruct>, FDetailLayoutCallback > FCustomDetailLayoutMap;
+typedef TMap< FName, FDetailLayoutCallback > FCustomDetailLayoutNameMap;
+
+
+
+/** Struct used to control the visibility of properties in a Structure Detail View */
+struct FStructureDetailsViewArgs
+{
+	FStructureDetailsViewArgs()
+		: bShowObjects(false)
+		, bShowAssets(true)
+		, bShowClasses(true)
+		, bShowInterfaces(false)
+	{
+	}
+
+	/** True if we should show general object properties in the details view */
+	bool bShowObjects : 1;
+
+	/** True if we should show asset properties in the details view */
+	bool bShowAssets : 1;
+
+	/** True if we should show class properties in the details view */
+	bool bShowClasses : 1;
+
+	/** True if we should show interface properties in the details view */
+	bool bShowInterfaces : 1;
+};
+
+class IDocumentation;
+
+} // namespace soda
+
+
+class RUNTIMEEDITOR_API FRuntimeEditorModule : public IModuleInterface
+{
+public:
+
+
+	//virtual TSharedRef<class FSlateStyleSet> CreateSodaStyleInstance() const;
+	
+	/**
+	 * Called right after the module has been loaded                   
+	 */
+	virtual void StartupModule();
+
+	/**
+	 * Called by the module manager right before this module is unloaded
+	 */
+	virtual void ShutdownModule();
+
+	/**
+	 * Refreshes property windows with a new list of objects to view
+	 * 
+	 * @param NewObjectList	The list of objects each property window should view
+	 */
+	//virtual void UpdatePropertyViews( const TArray<UObject*>& NewObjectList );
+
+	/**
+	 * Replaces objects being viewed by open property views with new objects
+	 *
+	 * @param OldToNewObjectMap	A mapping between object to replace and its replacement
+	 */
+	//virtual void ReplaceViewedObjects( const TMap<UObject*, UObject*>& OldToNewObjectMap );
+
+	/**
+	 * Removes deleted objects from property views that are observing them
+	 *
+	 * @param DeletedObjects	The objects to delete
+	 */
+	//virtual void RemoveDeletedObjects( TArray<UObject*>& DeletedObjects );
+
+	/**
+	 * Returns true if there is an unlocked detail view
+	 */
+	//virtual bool HasUnlockedDetailViews() const;
+
+	/**
+	 * Registers a custom detail layout delegate for a specific class
+	 *
+	 * @param ClassName	The name of the class that the custom detail layout is for
+	 * @param DetailLayoutDelegate	The delegate to call when querying for custom detail layouts for the classes properties
+	 */
+	virtual void RegisterCustomClassLayout( FName ClassName, soda::FOnGetDetailCustomizationInstance DetailLayoutDelegate );
+
+	/**
+	 * Unregisters a custom detail layout delegate for a specific class name
+	 *
+	 * @param ClassName	The class name with the custom detail layout delegate to remove
+	 */
+	virtual void UnregisterCustomClassLayout( FName ClassName );
+
+
+	/**
+	 * Registers a property type customization
+	 * A property type is a specific FProperty type, a struct, or enum type
+	 *
+	 * @param PropertyTypeName		The name of the property type to customize.  For structs and enums this is the name of the struct class or enum	(not StructProperty or ByteProperty) 
+	 * @param PropertyTypeLayoutDelegate	The delegate to call when querying for a custom layout of the property type
+	 * @param Identifier			An identifier to use to differentiate between two customizations on the same type
+	 */
+	virtual void RegisterCustomPropertyTypeLayout( FName PropertyTypeName, soda::FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<soda::IPropertyTypeIdentifier> Identifier = nullptr);
+
+	/**
+	 * Unregisters a custom detail layout for a properrty type
+	 *
+	 * @param PropertyTypeName 	The name of the property type that was registered
+	 * @param Identifier 		An identifier to use to differentiate between two customizations on the same type
+	 */
+	virtual void UnregisterCustomPropertyTypeLayout( FName PropertyTypeName, TSharedPtr<soda::IPropertyTypeIdentifier> InIdentifier = nullptr);
+
+	/**
+	 * Customization modules should call this when that module has been unloaded, loaded, etc...
+	 * so the property module can clean up its data.  Needed to support dynamic reloading of modules
+	 */
+	virtual void NotifyCustomizationModuleChanged();
+
+	/**
+	 * Creates a new detail view
+	 *
+ 	 * @param DetailsViewArgs		The struct containing all the user definable details view arguments
+	 * @return The new detail view
+	 */
+	virtual TSharedRef<soda::IDetailsView> CreateDetailView( const soda::FDetailsViewArgs& DetailsViewArgs );
+
+	/**
+	 * Find an existing detail view
+	 *
+ 	 * @param ViewIdentifier	The name of the details view to find
+	 * @return The existing detail view, or null if it wasn't found
+	 */
+	//virtual TSharedPtr<class soda::IDetailsView> FindDetailView( const FName ViewIdentifier ) const;
+
+	/**
+	 *  Convenience method for creating a new floating details window (a details view with its own top level window)
+	 *
+	 * @param InObjects			The objects to create the detail view for.
+	 * @param bIsLockable		True if the property view can be locked.
+	 * @return The new details view window.
+	 */
+	virtual TSharedRef<SWindow> CreateFloatingDetailsView( const TArray< UObject* >& InObjects, bool bIsLockable );
+
+	/**
+	 * Creates a standalone widget for a single property
+	 *
+	 * @param InObject			The object to view
+	 * @param InPropertyName	The name of the property to display
+	 * @param InitParams		Optional init params for a single property
+	 * @return The new property if valid or null
+	 */
+	virtual TSharedPtr<soda::ISinglePropertyView> CreateSingleProperty( UObject* InObject, FName InPropertyName, const soda::FSinglePropertyParams& InitParams );
+
+	virtual TSharedRef<soda::IStructureDetailsView> CreateStructureDetailView(const soda::FDetailsViewArgs& DetailsViewArgs, const soda::FStructureDetailsViewArgs& StructureDetailsViewArgs, TSharedPtr<class FStructOnScope> StructData, const FText& CustomName = FText::GetEmpty());
+
+	virtual TSharedRef<soda::IPropertyRowGenerator> CreatePropertyRowGenerator(const soda::FPropertyRowGeneratorArgs& InArgs);
+
+	/**
+	 * Creates a property change listener that notifies users via a  delegate when a property on an object changes
+	 *
+	 * @return The new property change listener
+	 */
+	//virtual TSharedRef<class IPropertyChangeListener> CreatePropertyChangeListener();
+
+	//virtual TSharedRef< class soda::IPropertyTable > CreatePropertyTable();
+
+	//virtual TSharedRef< SWidget > CreatePropertyTableWidget( const TSharedRef< class soda::IPropertyTable >& PropertyTable );
+
+	//virtual TSharedRef< SWidget > CreatePropertyTableWidget( const TSharedRef< class soda::IPropertyTable >& PropertyTable, const TArray< TSharedRef< class soda::IPropertyTableCustomColumn > >& Customizations );
+	//virtual TSharedRef< class soda::IPropertyTableWidgetHandle > CreatePropertyTableWidgetHandle( const TSharedRef< soda::IPropertyTable >& PropertyTable );
+	//virtual TSharedRef< class soda::IPropertyTableWidgetHandle > CreatePropertyTableWidgetHandle( const TSharedRef< soda::IPropertyTable >& PropertyTable, const TArray< TSharedRef< class soda::IPropertyTableCustomColumn > >& Customizations );
+
+	//virtual TSharedRef< soda::IPropertyTableCellPresenter > CreateTextPropertyCellPresenter( const TSharedRef< class soda::FPropertyNode >& InPropertyNode, const TSharedRef< class soda::IPropertyTableUtilities >& InPropertyUtilities,const FSlateFontInfo* InFontPtr = NULL);
+
+	/**
+	 * Register a floating struct on scope so that the details panel may use it as a property
+	 *
+	 * @param StructOnScope		The struct to register
+	 * @return The struct property that may may be associated with the details panel
+ 	 */
+	virtual FStructProperty* RegisterStructOnScopeProperty(TSharedRef<FStructOnScope> StructOnScope);
+
+	/**
+	 *
+	 */
+
+
+	
+	soda::FPropertyTypeLayoutCallback FindPropertyTypeLayoutCallback(FName PropertyTypeName, const soda::IPropertyHandle& PropertyHandle, const soda::FCustomPropertyTypeLayoutMap& InstancedPropertyTypeLayoutMapp);
+
+
+	//DECLARE_EVENT(PropertyEditorModule, FPropertyEditorOpenedEvent);
+	//virtual FPropertyEditorOpenedEvent& OnPropertyEditorOpened() { return PropertyEditorOpened; }
+
+	//virtual TSharedRef< soda::FAssetEditorToolkit > CreatePropertyEditorToolkit(const EToolkitMode::Type Mode, const TSharedPtr< class IToolkitHost >& InitToolkitHost, UObject* ObjectToEdit);
+	//virtual TSharedRef< soda::FAssetEditorToolkit > CreatePropertyEditorToolkit(const EToolkitMode::Type Mode, const TSharedPtr< IToolkitHost >& InitToolkitHost, const TArray< UObject* >& ObjectsToEdit);
+	//virtual TSharedRef< soda::FAssetEditorToolkit > CreatePropertyEditorToolkit(const EToolkitMode::Type Mode, const TSharedPtr< IToolkitHost >& InitToolkitHost, const TArray< TWeakObjectPtr< UObject > >& ObjectsToEdit);
+
+	const soda::FCustomDetailLayoutNameMap& GetClassNameToDetailLayoutNameMap() const { return ClassNameToDetailLayoutNameMap; }
+	soda::FPropertyTypeLayoutCallback GetPropertyTypeCustomization(const FProperty* InProperty, const soda::IPropertyHandle& PropertyHandle, const soda::FCustomPropertyTypeLayoutMap& InstancedPropertyTypeLayoutMap);
+
+	/** Get the global row extension generators. */
+	soda::FOnGenerateGlobalRowExtension& GetGlobalRowExtensionDelegate() { return OnGenerateGlobalRowExtension; }
+
+	bool IsCustomizedStruct(const UStruct* Struct, const soda::FCustomPropertyTypeLayoutMap& InstancePropertyTypeLayoutMap) const;
+
+
+	class TSharedRef< soda::IDocumentation > GetDocumentation() const;
+
+private:
+
+	/**
+	 * Creates and returns a property view widget for embedding property views in other widgets
+	 * NOTE: At this time these MUST not be referenced by the caller of CreatePropertyView when the property module unloads
+	 * 
+	 * @param	InObject						The UObject that the property view should observe(Optional)
+	 * @param	bAllowFavorites					Whether the property view should save favorites
+	 * @param	bIsLockable						Whether or not the property view is lockable
+	 * @param	bAllowSearch					Whether or not the property window allows searching it
+	 * @param	InNotifyHook					Notify hook to call on some property change events
+	 * @param	ColumnWidth						The width of the name column
+	 * @param	OnPropertySelectionChanged		Delegate for notifying when the property selection has changed.
+	 * @return	The newly created SPropertyTreeViewImpl widget
+	 */
+	//virtual TSharedRef<soda::SPropertyTreeViewImpl> CreatePropertyView( UObject* InObject, bool bAllowFavorites, bool bIsLockable, bool bHiddenPropertyVisibility, bool bAllowSearch, bool ShowTopLevelNodes, FNotifyHook* InNotifyHook, float InNameColumnWidth, soda::FOnPropertySelectionChanged OnPropertySelectionChanged, soda::FOnPropertyClicked OnPropertyMiddleClicked, soda::FConstructExternalColumnHeaders ConstructExternalColumnHeaders, soda::FConstructExternalColumnCell soda::ConstructExternalColumnCell );
+
+	//TSharedPtr<FAssetThumbnailPool> GetThumbnailPool();
+
+	void RegisterObjectCustomizations();
+	void RegisterPropertyTypeCustomizations();
+
+private:
+	/** All created detail views */
+	TArray< TWeakPtr<soda::SDetailsView> > AllDetailViews;
+	/** All created single property views */
+	TArray< TWeakPtr<soda::SSingleProperty> > AllSinglePropertyViews;
+	/** A mapping of class names to detail layout delegates, called when querying for custom detail layouts */
+	soda::FCustomDetailLayoutNameMap ClassNameToDetailLayoutNameMap;
+	/** A mapping of property names to property type layout delegates, called when querying for custom property layouts */
+	soda::FCustomPropertyTypeLayoutMap GlobalPropertyTypeToLayoutMap;
+	/** Event to be called when a property editor is opened */
+	//soda::FPropertyEditorOpenedEvent PropertyEditorOpened;
+	/** Mapping of registered floating UStructs to their struct proxy so they show correctly in the details panel */
+	TMap<FName, FStructProperty*> RegisteredStructToProxyMap;
+	/** Shared thumbnail pool used by property row generators */
+	//TSharedPtr<class FAssetThumbnailPool> GlobalThumbnailPool;
+	/** Container for ScopeOnStruct FStructProperty objects */
+	UStruct* StructOnScopePropertyOwner;
+	/** Delegate called to extend the name column widget on a property row. */
+	soda::FOnGenerateGlobalRowExtension OnGenerateGlobalRowExtension;
+
+
+	bool bUsingStarshipStyle = false;
+
+	TSharedPtr< soda::IDocumentation > Documentation;
+};
diff --git a/Source/RuntimeEditor/Public/RuntimeEditorUtils.h b/Source/RuntimeEditor/Public/RuntimeEditorUtils.h
new file mode 100644
index 0000000..931b025
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeEditorUtils.h
@@ -0,0 +1,199 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SToolTip.h"
+
+
+namespace FRuntimeEditorUtils
+{
+	/**
+	 * Gets the page that documentation for this class is contained on
+	 *
+	 * @param	InClass		Class we want to find the documentation page of
+	 * @return				Path to the documentation page
+	 */
+	RUNTIMEEDITOR_API FString GetDocumentationPage(const UClass* Class);
+
+	/**
+	 * Gets the excerpt to use for this class
+	 * Excerpt will be contained on the page returned by GetDocumentationPage
+	 *
+	 * @param	InClass		Class we want to find the documentation excerpt of
+	 * @return				Name of the to the documentation excerpt
+	 */
+	RUNTIMEEDITOR_API FString GetDocumentationExcerpt(const UClass* Class);
+
+	/**
+	 * Gets the tooltip to display for a given class
+	 *
+	 * @param	InClass		Class we want to build a tooltip for
+	 * @return				Shared reference to the constructed tooltip
+	 */
+	RUNTIMEEDITOR_API TSharedRef<SToolTip> GetTooltip(const UClass* Class);
+
+	/**
+	 * Gets the tooltip to display for a given class with specified text for the tooltip
+	 *
+	 * @param	InClass			Class we want to build a tooltip for
+	 * @param	OverrideText	The text to display on the standard tooltip
+	 * @return					Shared reference to the constructed tooltip
+	 */
+	RUNTIMEEDITOR_API TSharedRef<SToolTip> GetTooltip(const UClass* Class, const TAttribute<FText>& OverrideText);
+
+	//RUNTIMEEDITOR_API TSharedRef< class SToolTip > CreateDocToolTip(const TAttribute<FText>& Text, const TSharedPtr<SWidget>& OverrideContent, const FString& Link= "", const FString& ExcerptName="");
+
+	//RUNTIMEEDITOR_API TSharedRef< class SToolTip > CreateDocToolTip(const TAttribute<FText>& Text, const TSharedRef<SWidget>& OverrideContent, const TSharedPtr<SVerticalBox>& DocVerticalBox, const FString& Link="", const FString& ExcerptName="");
+
+	/**
+	 * Fetches a UClass from the string name of the class
+	 *
+	 * @param	ClassName		Name of the class we want the UClass for
+	 * @return					UClass pointer if it exists
+	 */
+	RUNTIMEEDITOR_API UClass* GetClassFromString(const FString& ClassName);
+
+	RUNTIMEEDITOR_API bool ValidateActorName(const FText& InName, FText& OutErrorMessage);
+
+
+	RUNTIMEEDITOR_API FText GetCategoryText(const FField* InField);
+
+	RUNTIMEEDITOR_API FText GetCategoryText(const UField* InField);
+
+
+	RUNTIMEEDITOR_API FString GetCategory(const FField* InField);
+
+	RUNTIMEEDITOR_API FString GetCategory(const UField* InField);
+
+	RUNTIMEEDITOR_API FName GetCategoryFName(const FField* InField);
+
+	RUNTIMEEDITOR_API FName GetCategoryFName(const UField* InField);
+
+	RUNTIMEEDITOR_API bool CanCreateBlueprintOfClass(const UClass* Class);
+
+	RUNTIMEEDITOR_API FString GetFriendlyName(const FProperty* Property, UStruct* OwnerStruct = NULL);
+
+
+
+	/**
+	 * Checks to see if the specified category is hidden from the supplied class.
+	 *
+	 * @param  Class	The class you want to query.
+	 * @param  Category A category path that you want to check.
+	 * @return True if the category is hidden, false if not.
+	 */
+	RUNTIMEEDITOR_API bool IsCategoryHiddenFromClass(const UStruct* Class, const FText& Category);
+
+	/**
+	 * Checks to see if the specified category is hidden from the supplied class.
+	 *
+	 * @param  Class	The class you want to query.
+	 * @param  Category A category path that you want to check.
+	 * @return True if the category is hidden, false if not.
+	 */
+	RUNTIMEEDITOR_API bool IsCategoryHiddenFromClass(const UStruct* Class, const FString& Category);
+
+	/**
+	 * Checks to see if the specified category is hidden from the supplied Class, avoids recalculation of ClassHideCategories.
+	 * Useful when checking the same class over and over again with different categories.
+	 *
+	 * @param ClassHideCategories	The categories tht have been hidden for the class
+	 * @param  Class	The class you want to query.
+	 * @param  Category A category path that you want to check.
+	 * @return True if the category is hidden, false if not.
+	 */
+	RUNTIMEEDITOR_API bool IsCategoryHiddenFromClass(const TArray<FString>& ClassHideCategories, const UStruct* Class, const FString& Category);
+
+	/**
+	 * Parses out the class's "HideCategories" metadata, and returns it
+	 * segmented and sanitized.
+	 *
+	 * @param  Class			The class you want to pull data from.
+	 * @param  CategoriesOut	An array that will be filled with a list of hidden categories.
+	 * @param  bHomogenize		Determines if the categories should be ran through expansion and display sanitation (useful even when not being displayed, for comparisons)
+	 */
+	RUNTIMEEDITOR_API void GetClassHideCategories(const UStruct* Class, TArray<FString>& CategoriesOut, bool bHomogenize = true);
+
+	/**
+	 * Expands any keys found in the category string (any terms found in square
+	 * brackets), and sanitizes the name (spacing individual words, etc.).
+	 *
+	 * @param  RootCategory	An id denoting the root category that you want prefixing the result.
+	 * @param  SubCategory	A sub-category that you want postfixing the result.
+	 * @return A concatenated text string, with the two categories separated by a pipe, '|', character.
+	 */
+	RUNTIMEEDITOR_API FText GetCategoryDisplayString(const FText& UnsanitizedCategory);
+
+	/**
+	 * Expands any keys found in the category string (any terms found in square
+	 * brackets), and sanitizes the name (spacing individual words, etc.).
+	 *
+	 * @param  RootCategory	An id denoting the root category that you want prefixing the result.
+	 * @param  SubCategory	A sub-category that you want postfixing the result.
+	 * @return A concatenated string, with the two categories separated by a pipe, '|', character.
+	 */
+	RUNTIMEEDITOR_API FString GetCategoryDisplayString(const FString& UnsanitizedCategory);
+
+	/**
+	 * Parses out the class's "ShowCategories" metadata, and returns it
+	 * segmented and sanitized.
+	 *
+	 * @param  Class			The class you want to pull data from.
+	 * @param  CategoriesOut	An array that will be filled with a list of shown categories.
+	 */
+	RUNTIMEEDITOR_API void GetClassShowCategories(const UStruct* Class, TArray<FString>& CategoriesOut);
+
+	/**
+	 * Performs a lookup into the category key table, retrieving a fully
+	 * qualified category path for the specified key.
+	 *
+	 * @param  Key	The key you want a category path for.
+	 * @return The category display string associated with the specified key (an empty string if an entry wasn't found).
+	 */
+	RUNTIMEEDITOR_API const FText& GetCategory(const FString& Key);
+
+	/**
+	 * Returns whether the specified asset is a UBlueprint or UBlueprintGeneratedClass (or any of their derived classes)
+	 *
+	 * @param	InAssetData		Reference to an asset data entry
+	 * @param	bOutIsBPGC		Outputs whether the asset is a BlueprintGeneratedClass (or any of its derived classes)
+	 * @return					Whether the specified asset is a UBlueprint or UBlueprintGeneratedClass (or any of their derived classes)
+	 */
+	RUNTIMEEDITOR_API bool IsBlueprintAsset(const FAssetData& InAssetData, bool* bOutIsBPGC = nullptr);
+
+	/**
+	 * Gets the class path from the asset tag (i.e. GeneratedClassPath tag on blueprints)
+	 *
+	 * @param	InAssetData		Reference to an asset data entry.
+	 * @return					Class path or None if the asset cannot or doesn't have a class associated with it
+	 */
+	RUNTIMEEDITOR_API FTopLevelAssetPath GetClassPathNameFromAssetTag(const FAssetData& InAssetData);
+
+	/**
+	 * Gets the object path of the class associated with the specified asset
+	 * (i.e. the BlueprintGeneratedClass of a Blueprint asset or the BlueprintGeneratedClass asset itself)
+	 *
+	 * @param	InAssetData					Reference to an asset data entry
+	 * @param	bGenerateClassPathIfMissing	Whether to generate a class path if the class is missing (and the asset can have a class associated with it)
+	 * @return								Class path or None if the asset cannot or doesn't have a class associated with it
+	 */
+	RUNTIMEEDITOR_API FTopLevelAssetPath GetClassPathNameFromAsset(const FAssetData& InAssetData, bool bGenerateClassPathIfMissing = false);
+
+	/**
+	 * Fetches the set of interface class object paths from an asset data entry containing the appropriate asset tag(s).
+	 *
+	 * @param	InAssetData		Reference to an asset data entry.
+	 * @param	OutClassPaths	One or more interface class object paths, or empty if the corresponding asset tag(s) were not found.
+	 */
+	RUNTIMEEDITOR_API void GetImplementedInterfaceClassPathsFromAsset(const FAssetData& InAssetData, TArray<FString>& OutClassPaths);
+
+
+	/** Check to see if a given class is blueprint skeleton class. */
+	RUNTIMEEDITOR_API bool IsClassABlueprintSkeleton(const UClass* Class);
+
+	RUNTIMEEDITOR_API FString GetDisplayNameHelper(const UObject& Object);
+	RUNTIMEEDITOR_API FString GetDisplayNameHelper(const FField& Object);
+};
+
diff --git a/Source/RuntimeEditor/Public/RuntimeMetaData.h b/Source/RuntimeEditor/Public/RuntimeMetaData.h
new file mode 100644
index 0000000..e0ae192
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeMetaData.h
@@ -0,0 +1,69 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "IEditableObject.h"
+
+DECLARE_LOG_CATEGORY_EXTERN(LogMetaData, Log, All);
+
+class UMetadataPrimaryAsset; 
+
+class RUNTIMEEDITOR_API FRuntimeMetaData
+{
+public:
+	/* FField & UField */
+	static const FString* FindMetaData(const FField* Field, const TCHAR* Key);
+	static const FString* FindMetaData(const FField* Field, const FName& Key);
+	static const FString* FindMetaData(const UField* Field, const TCHAR* Key);
+	static const FString* FindMetaData(const UField* Field, const FName& Key);
+	static bool HasMetaData(const UField* Field, const TCHAR* Key);
+	static bool HasMetaData(const UField* Field, const FName& Key);
+	static bool HasMetaData(const FField* Field, const TCHAR* Key);
+	static bool HasMetaData(const FField* Field, const FName& Key);
+	static const FString& GetMetaData(const UField* Field, const TCHAR* Key);
+	static const FString& GetMetaData(const FField* Field, const TCHAR* Key);
+	static const FString& GetMetaData(const UField* Field, const FName& Key);
+	static const FString& GetMetaData(const FField* Field, const FName& Key);
+	static FText GetDisplayNameText(const FField* Field);
+	static FText GetDisplayNameText(const UField* Field);
+	static FText GetToolTipText(const UField* Field, bool bShortTooltip);
+	static FText GetToolTipText(const FField* Field, bool bShortTooltip);
+	static bool GetBoolMetaData(const UField* Field, const TCHAR* Key);
+	static bool GetBoolMetaData(const UField* Field, const FName& Key);
+	static bool GetBoolMetaData(const FField* Field, const TCHAR* Key);
+	static bool GetBoolMetaData(const FField* Field, const FName& Key);
+	static UClass* GetClassMetaData(const FField* Field, const TCHAR* Key);
+	static UClass* GetClassMetaData(const FField* Field, const FName& Key);
+	static float GetFloatMetaData(const FField* Field, const TCHAR* Key);
+	static float GetFloatMetaData(const FField* Field, const FName& Key);
+	static int32 GetIntMetaData(const FField* Field, const TCHAR* Key);
+	static int32 GetIntMetaData(const FField* Field, const FName& Key);
+
+	/* UClass */
+	static bool IsAutoExpandCategory(const UClass* Class, const TCHAR* InCategory);
+	static bool IsAutoCollapseCategory(const UClass* Class, const TCHAR* InCategory);
+
+	/* UEnum */
+	static bool HasMetaData(const UEnum *Enum, const TCHAR* Key, int32 NameIndex = INDEX_NONE);
+	static FString GetMetaData(const UEnum* Enum, const TCHAR* Key, int32 NameIndex = INDEX_NONE, bool bAllowRemap = true);
+	static FText GetToolTipTextByIndex(const UEnum* Enum, int32 NameIndex);
+	static FText GetDisplayNameTextByIndex(const UEnum* Enum, int32 NameIndex);
+
+	/**  Add custom metadata generated from IEditableObject::GenerateMetadata() to the MetadataGlobalScope */
+	static bool AddGeneratedMetadataToGlobalScope(UClass* Class);
+
+	/** Find all UMetadataPrimaryAsset and add metadata to MetadataGlobalScope */
+	static void RegisterMetadataPrimaryAssets(); 
+
+private:
+	static const FString * TryGetMetaData(const UField* Field, const TCHAR* Key);
+	static const FString * TryGetMetaData(const FField* Field, const TCHAR* Key);
+
+	static const FRuntimeMetadataField* FindField(const UField* Field);
+	static const FRuntimeMetadataField* FindField(const FField* Field);
+
+	//static void PrimaryAssetsLoaded(FPrimaryAssetId AssetId);
+
+	static TMap<FString, FRuntimeMetadataObject> MetadataGlobalScope;
+};
diff --git a/Source/RuntimeEditor/Public/RuntimeMetaDataStatic.h b/Source/RuntimeEditor/Public/RuntimeMetaDataStatic.h
new file mode 100644
index 0000000..6661736
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimeMetaDataStatic.h
@@ -0,0 +1,53 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Kismet/BlueprintFunctionLibrary.h"
+#include "IEditableObject.h"
+#include "RuntimeMetaDataStatic.generated.h"
+
+USTRUCT(BlueprintType)
+struct RUNTIMEEDITOR_API FRuntimeMetadataPropertyBuilder
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	FString DisplayName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	FString ToolTip;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	bool bIsInitialize;
+};
+
+USTRUCT(BlueprintType)
+struct RUNTIMEEDITOR_API FRuntimeMetadataButtonBuilder
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	FString DisplayName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	FString ToolTip;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Metadata)
+	bool bIsInitialize;
+};
+
+UCLASS(Category = "Soda")
+class RUNTIMEEDITOR_API URuntimeMetaDataStatic: public UBlueprintFunctionLibrary
+{
+	GENERATED_BODY()
+
+public:
+	UFUNCTION(BlueprintPure, Category = "RuntimeMetaData")
+	static void MakeRuntimeMetadataProperties(const FString& CategoryName, const TMap<FString, FRuntimeMetadataPropertyBuilder>& In, FRuntimeMetadataObject& Out);
+
+	UFUNCTION(BlueprintPure, Category = "RuntimeMetaData")
+	static void MakeRuntimeMetadataButtons(const FString& CategoryName, const TMap<FString, FRuntimeMetadataButtonBuilder>& In, FRuntimeMetadataObject& Out);
+
+	UFUNCTION(BlueprintPure, Category = "RuntimeMetaData")
+	static void MergeRuntimeMetadata(const TArray<FRuntimeMetadataObject> & In, FRuntimeMetadataObject& Out);
+};
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailBuilderTypes.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailBuilderTypes.h
new file mode 100644
index 0000000..a9b8654
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailBuilderTypes.h
@@ -0,0 +1,135 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreTypes.h"
+#include "UObject/NameTypes.h"
+#include "Misc/Optional.h"
+
+namespace soda
+{
+
+/**
+ * Parameters required for specifying behavior when adding external properties from detail customizations
+ */
+struct FAddPropertyParams
+{
+	FAddPropertyParams()
+		: bForceShowProperty(false)
+		, bHideRootObjectNode(false)
+	{}
+
+
+	/**
+	 * Forcibly show the property, even if it does not have CPF_Edit
+	 */
+	FAddPropertyParams& ForceShowProperty()
+	{
+		bForceShowProperty = true;
+		return *this;
+	}
+
+
+	/**
+	 * Override whether the property node should allow children or not. If not overridden the default is implementation defined.
+	 */
+	FAddPropertyParams& AllowChildren(bool bAllowChildren)
+	{
+		bAllowChildrenOverride = bAllowChildren;
+		return *this;
+	}
+
+
+	/**
+	 * Override whether the property node should create category nodes or not. If not overridden the default is implementation defined.
+	 */
+	FAddPropertyParams& CreateCategoryNodes(bool bCreateCategoryNodes)
+	{
+		bCreateCategoryNodesOverride = bCreateCategoryNodes;
+		return *this;
+	}
+
+
+	/**
+	 * Set a unique name for this property, allowing it to correctly save expansion states and other persistent UI state
+	 */
+	FAddPropertyParams& UniqueId(FName InUniqueId)
+	{
+		UniqueIdName = InUniqueId;
+		return *this;
+	}
+
+
+	/**
+	 * Override whether the root object node should be shown for external object properties. This only applies when adding an entire uobject's properties to the details panel rather than an individual row or struct
+	 */
+	FAddPropertyParams& HideRootObjectNode(bool bInHideRootObjectNode)
+	{
+		bHideRootObjectNode = bInHideRootObjectNode;
+		return *this;
+	}
+
+	/**
+	 * Check whether to forcibly show the property, even if it does not have CPF_Edit
+	 */
+	bool ShouldForcePropertyVisible() const
+	{
+		return bForceShowProperty;
+	}
+
+	bool ShouldHideRootObjectNode() const { return bHideRootObjectNode; }
+
+	/**
+	 * Conditionally overwrites the specified boolean with a value specifying whether to allow child properties or not.
+	 * Only overrides the value if the calling code specified an override
+	 */
+	void OverrideAllowChildren(bool& OutAllowChildren) const
+	{
+		if (bAllowChildrenOverride.IsSet())
+		{
+			OutAllowChildren = bAllowChildrenOverride.GetValue();
+		}
+	}
+
+
+	/**
+	 * Conditionally overwrites the specified boolean with a value specifying whether to create category nodes or not
+	 * Only overrides the value if the calling code specified an override
+	 */
+	void OverrideCreateCategoryNodes(bool& OutCreateCategoryNodes) const
+	{
+		if (bCreateCategoryNodesOverride.IsSet())
+		{
+			OutCreateCategoryNodes = bCreateCategoryNodesOverride.GetValue();
+		}
+	}
+
+
+	/**
+	 * Get this property's unique ID name
+	 */
+	FName GetUniqueId() const
+	{
+		return UniqueIdName;
+	}
+
+private:
+
+	/** When true, the property will be forcefully shown, even if it does not have CPF_Edit. When false the property will only be created if it has CPF_Edit. */
+	bool bForceShowProperty : 1;
+
+	/** When true any root ObjectPropertyNode generated from an external UObject being added will be hidden from view and only its children are shown */
+	bool bHideRootObjectNode : 1;
+
+	/** Tristate override for allowing children - if value is true: Allow Children, false: Disallow Children, unset: no override */
+	TOptional<bool> bAllowChildrenOverride;
+
+	/** Tristate override for allowing children - if value is true: create category nodes, false: do not create category nodes, unset: no override */
+	TOptional<bool> bCreateCategoryNodesOverride;
+
+	/** Unique ID name that is used for saving persistent UI state such as expansion */
+	FName UniqueIdName;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailCategoryBuilder.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailCategoryBuilder.h
new file mode 100644
index 0000000..aeb875f
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailCategoryBuilder.h
@@ -0,0 +1,210 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "Framework/SlateDelegates.h"
+#include "UObject/StructOnScope.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/IDetailCustomNodeBuilder.h"
+#include "RuntimePropertyEditor/DetailBuilderTypes.h"
+
+namespace soda
+{
+
+class FDetailWidgetRow;
+class IDetailGroup;
+class IDetailPropertyRow;
+
+/** Interface for the various types of rows that can be created through a detail layout customization */
+class IDetailLayoutRow
+{
+	virtual FName GetRowName() const = 0;
+};
+
+/** The location of a property within a category */
+namespace EPropertyLocation
+{
+	enum Type
+	{
+		/** The property appears in the simple area of a category (displayed by default) */
+		Common,
+		/** The property appears in the advanced area of a category(collapsed by default) */
+		Advanced,
+		/** The property appears in the default way specified in the UPROPERTY class flag */
+		Default,
+	};
+}
+
+/**
+ * Represents a category for the a details view
+ */
+class IDetailCategoryBuilder
+{
+public:
+	virtual ~IDetailCategoryBuilder() {}
+	/**
+	 * Whether or not the category should be initially collapsed
+	 */
+	virtual IDetailCategoryBuilder& InitiallyCollapsed(bool bShouldBeInitiallyCollapsed) = 0;
+
+	/**
+	 * Adds a delegate to the category which is called when the category expansion state changes
+	 */
+	virtual IDetailCategoryBuilder& OnExpansionChanged(FOnBooleanValueChanged InOnExpansionChanged) = 0;
+
+	/**
+	 * Sets whether or not the expansion state should be restored between sessions
+	 */
+	virtual IDetailCategoryBuilder& RestoreExpansionState(bool bRestore) = 0;
+
+	/**
+	 * Adds header content to the category
+	 *
+	 * @param InHeaderContent	The header content widget
+	 */
+	virtual IDetailCategoryBuilder& HeaderContent(TSharedRef<SWidget> InHeaderContent) = 0;
+
+	/**
+	 * Gets the current sort order of the category
+	 */
+	virtual int32 GetSortOrder() const = 0;
+
+	/**
+	 * Sets the sort order of the category
+	 */
+	virtual void SetSortOrder(int32 InSortOrder) = 0;
+
+	/**
+	 * Adds a property, shown in the default way to the category
+	 *
+	 * @param Path						The path to the property.  Can be just a name of the property or a path in the format outer.outer.value[optional_index_for_static_arrays]
+	 * @param ClassOutermost			Optional outer class if accessing a property outside of the current class being customized
+	 * @param InstanceName				Optional instance name if multiple FProperty's of the same type exist. such as two identical structs, the instance name is one of the struct variable names)
+	 * @param Location				The location within the category where the property is shown
+	 * See IDetailCategoryBuilder::GetProperty for clarification of parameters
+	 */
+	virtual IDetailPropertyRow& AddProperty(FName PropertyPath, UClass* ClassOutermost = nullptr, FName InstanceName = NAME_None, EPropertyLocation::Type Location = EPropertyLocation::Default) = 0;
+
+	/**
+	 * Adds a property, shown in the default way to the category
+	 *
+	 * @param PropertyHandle		The handle to the property to add
+	 * @param Location				The location within the category where the property is shown
+	 */
+	virtual IDetailPropertyRow& AddProperty(TSharedPtr<IPropertyHandle> PropertyHandle, EPropertyLocation::Type Location = EPropertyLocation::Default) = 0;
+
+	/**
+	 * Adds an entire external object to this category.  The object should not be one of the objects already visible by this details panel
+	 *
+	 * @param Objects		List of objects that contain the property
+	 * @param Location		The location within the category where the property is shown
+	 * @return A property row for customizing the property or NULL if the property could not be found
+	 */
+	virtual IDetailPropertyRow* AddExternalObjects(const TArray<UObject*>& Objects, EPropertyLocation::Type Location = EPropertyLocation::Default, const FAddPropertyParams& Params = FAddPropertyParams()) = 0;
+
+	/**
+	 * Adds an external object property that is not a property on the object(s) being customized
+	 *
+	 * @param Objects		List of objects that contain the property
+	 * @param PropertyName	Optional name of the property to view.  If this is empty, the entire set of properties on the objects are added
+	 * @param Location		The location within the category where the property is shown
+	 * @return A property row for customizing the property or NULL if the property could not be found
+	 */
+	virtual IDetailPropertyRow* AddExternalObjectProperty(const TArray<UObject*>& Objects, FName PropertyName, EPropertyLocation::Type Location = EPropertyLocation::Default, const FAddPropertyParams& Params = FAddPropertyParams()) = 0;
+
+	/**
+	 * Adds an external standalone structure to this details panel
+	 *
+	 * @param StructData		Struct data to find the property within
+	 * @param Location			The location within the category where the property is shown
+	 * @return A property row for customizing the property or NULL if the property could not be found
+	 */
+	virtual IDetailPropertyRow* AddExternalStructure(TSharedPtr<FStructOnScope> StructData, EPropertyLocation::Type Location = EPropertyLocation::Default) = 0;
+
+	/**
+	 * Adds an external property, that is contained within a UStruct, that is not a property on the object(s) being customized
+	 *
+	 * @param StructData		Struct data to find the property within
+	 * @param PropertyName		The name of the property to view.  If this is empty the entire structure is added
+	 * @param Location			The location within the category where the property is shown
+	 * @return A property row for customizing the property or NULL if the property could not be found
+	 */
+	virtual IDetailPropertyRow* AddExternalStructureProperty(TSharedPtr<FStructOnScope> StructData, FName PropertyName, EPropertyLocation::Type Location = EPropertyLocation::Default, const FAddPropertyParams& Params = FAddPropertyParams()) = 0;
+
+	/**
+	 * Adds all properties for the specified external structure to this category
+	 *
+	 * @param StructData		External struct data to add to the root
+	 * @param Location			The location within the category where the properties are to be shown
+	 * @return Array of all properties added to this category
+	 */
+	virtual TArray<TSharedPtr<IPropertyHandle>> AddAllExternalStructureProperties(TSharedRef<FStructOnScope> StructData, EPropertyLocation::Type Location = EPropertyLocation::Default) = 0;
+
+	/**
+	 * Adds a custom widget row to the category
+	 *
+	 * @param FilterString	 A string which is used to filter this custom row when a user types into the details panel search box
+	 * @param bForAdvanced	 Whether the widget should appear in the advanced section
+	 */
+	virtual FDetailWidgetRow& AddCustomRow(const FText& FilterString, bool bForAdvanced = false) = 0;
+
+	/**
+	 * Adds a custom builder to the category (for more complicated layouts)
+	 *
+	 * @param InCustomBuilder				The custom builder to add
+	 * @param bForAdvanced					true if this builder is for the advanced section of the category
+	 */
+	virtual void AddCustomBuilder(TSharedRef<IDetailCustomNodeBuilder> InCustomBuilder, bool bForAdvanced = false) = 0;
+
+	/**
+	 * Adds a group to the category
+	 *
+	 * @param GroupName	The name of the group
+	 * @param LocalizedDisplayName	The display name of the group
+	 * @param true if the group should appear in the advanced section of the category
+	 * @param true if the group should start expanded
+	 */
+	virtual IDetailGroup& AddGroup(FName GroupName, const FText& LocalizedDisplayName, bool bForAdvanced = false, bool bStartExpanded = false) = 0;
+
+	/**
+	 * Gets the default propeties of this category
+	 *
+	 * @param OutAllProperties		The list of property handles that will be populated
+	 * @param bSimpleProperties		true to get simple properties
+	 * @param bAdvancedProperties	true to get advanded properties
+	 */
+	virtual void GetDefaultProperties(TArray<TSharedRef<IPropertyHandle> >& OutAllProperties, bool bSimpleProperties = true, bool bAdvancedProperties = true) = 0;
+
+	/**
+	 * @return The parent layout builder of this class
+	 */
+	virtual class IDetailLayoutBuilder& GetParentLayout() const = 0;
+
+	/**
+	 * @return true if the parent layout is valid or has been destroyed by a refresh.
+	 */
+	virtual bool IsParentLayoutValid() const = 0;
+
+
+	/**
+	 * @return The localized display name of the category
+	 */
+	virtual const FText& GetDisplayName() const = 0;
+
+	/**
+	 * Sets whether or not this category is hidden or shown
+	 * This is designed to be used for dynamic category visibility after construction of the category
+	 */
+	virtual void SetCategoryVisibility(bool bVisible) = 0;
+
+	/**
+	* Sets whether or not this category should show its advanced properties.
+	* This is designed to be used for dynamic display of advanced properties.
+	*/
+	virtual void SetShowAdvanced(bool bShowAdvanced) = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailLayoutBuilder.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailLayoutBuilder.h
new file mode 100644
index 0000000..2754c3d
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailLayoutBuilder.h
@@ -0,0 +1,264 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+
+namespace soda
+{
+
+class IDetailCategoryBuilder;
+class IDetailsView;
+
+namespace ECategoryPriority
+{
+	enum Type
+	{
+
+		// Highest sort priority
+		Variable = 0,
+		Transform,
+		Important,
+		TypeSpecific,
+		Default,
+		// Lowest sort priority
+		Uncommon,
+	};
+}
+
+/**
+ * The builder for laying custom details
+ */
+class IDetailLayoutBuilder
+{
+	
+public:
+	using FOnCategorySortOrderFunction = TFunction<void(const TMap<FName, IDetailCategoryBuilder*>& /* AllCategoryMap */)>;
+
+	virtual ~IDetailLayoutBuilder(){}
+
+	/**
+	 * @return the font used for properties and details
+	 */ 
+	static FSlateFontInfo GetDetailFont() { return FSodaStyle::GetFontStyle( TEXT("PropertyWindow.NormalFont") ); }
+
+	/**
+	 * @return the bold font used for properties and details
+	 */ 
+	static FSlateFontInfo GetDetailFontBold() { return FSodaStyle::GetFontStyle( TEXT("PropertyWindow.BoldFont") ); }
+	
+	/**
+	 * @return the italic font used for properties and details
+	 */ 
+	static FSlateFontInfo GetDetailFontItalic() { return FSodaStyle::GetFontStyle( TEXT("PropertyWindow.ItalicFont") ); }
+	
+	/**
+	 * @return the parent detail view for this layout builder
+	 */
+	virtual const IDetailsView* GetDetailsView() const = 0;
+
+	/**
+	 * @return the parent detail view for this layout builder
+	 */
+	virtual IDetailsView* GetDetailsView() = 0;
+
+	/**
+	 * @return The base class of the objects being customized in this detail layout
+	 */
+	virtual UClass* GetBaseClass() const = 0;
+	
+	/**
+	 * Get the root objects observed by this layout.  
+	 * This is not guaranteed to be the same as the objects customized by this builder.  See GetObjectsBeingCustomized for that.
+	 */
+	virtual const TArray< TWeakObjectPtr<UObject> >& GetSelectedObjects() const = 0;
+
+	/**
+	 * Gets the current object(s) being customized by this builder
+	 *
+	 * If this is a sub-object customization it will return those sub objects.  Otherwise the root objects will be returned.
+	 */
+	virtual void GetObjectsBeingCustomized( TArray< TWeakObjectPtr<UObject> >& OutObjects ) const = 0;
+
+	/**
+	 * Gets the current struct(s) being customized by this builder
+	 *
+	 * If this is a sub-struct customization it will return those sub struct.  Otherwise the root struct will be returned.
+	 */
+	virtual void GetStructsBeingCustomized( TArray< TSharedPtr<FStructOnScope> >& OutStructs ) const = 0;
+
+	/**
+	 *	@return the utilities various widgets need access to certain features of PropertyDetails
+	 */
+	virtual const TSharedRef< class IPropertyUtilities > GetPropertyUtilities() const = 0; 
+
+
+	/**
+	 * Edits an existing category or creates a new one
+	 * 
+	 * @param CategoryName				The name of the category
+	 * @param NewLocalizedDisplayName	The new display name of the category (optional)
+	 * @param CategoryType				Category type to define sort order.  Category display order is sorted by this type (optional)
+	 */
+	virtual IDetailCategoryBuilder& EditCategory(FName CategoryName, const FText& NewLocalizedDisplayName = FText::GetEmpty(), ECategoryPriority::Type CategoryType = ECategoryPriority::Default) = 0;
+
+	/**
+	 * Gets the current set of existing category names. This includes both categories derived from properties and categories added via EditCategory.
+	 * @param	OutCategoryNames	 The array of category names
+	 */
+	virtual void GetCategoryNames(TArray<FName>& OutCategoryNames) const = 0;
+
+	/**
+	 * Adds sort algorythm which overrides standard algorythm with that provided by the caller.
+	 * Function called on each category after all categories have been added, and provides caller
+	 * with ability to override sort order.
+	 * @param 	SortFunction Function called on final pass of detail panel build, which provides map of all categories to set final sort order on.
+	 */
+	virtual void SortCategories(const FOnCategorySortOrderFunction& SortFunction) = 0;
+
+	/** 
+	 * Adds the property to its given category automatically. Useful in detail customizations which want to preserve categories.
+	 * @param InPropertyHandle			The handle to the property that you want to add to its own category.
+	 * @return the property row with which the property was added.
+	 */
+	virtual IDetailPropertyRow& AddPropertyToCategory(TSharedPtr<IPropertyHandle> InPropertyHandle) = 0;
+
+	/**
+	 * Adds a custom row to the property's category automatically. Useful in detail customizations which want to preserve categories.
+	 * @param InPropertyHandle			The handle to the property that you want to add to its own category.
+	 * @param InCustomSearchString		A string which is used to filter this custom row when a user types into the details panel search box.
+	 * @return the detail widget that can be further customized.
+	 */
+	virtual FDetailWidgetRow& AddCustomRowToCategory(TSharedPtr<IPropertyHandle> InPropertyHandle, const FText& InCustomSearchString, bool bForAdvanced = false) = 0;
+
+	/**
+	 * Adds an external object's property to this details panel's PropertyMap.
+	 * Allows getting the property handle for the property without having to generate a row widget.
+	 *
+	 * @param Objects		List of objects that contain the property.
+	 * @param PropertyName	Name of the property to generate a node from.
+	 * @return The property handle created tied to generated property node.
+	 */	
+	virtual TSharedPtr<IPropertyHandle> AddObjectPropertyData(TConstArrayView<UObject*> Objects, FName PropertyName) = 0;
+
+	/**
+	 * Adds an external structure's property data to this details panel's PropertyMap.
+	 * Allows getting the property handle for the property without having to generate a row widget.
+	 *
+	 * @param StructData    Struct data to find the property within.
+	 * @param PropertyName	Name of the property to generate a node from.
+	 * @return			    The property handle tied to the generated property node.
+	 */
+	virtual TSharedPtr<IPropertyHandle> AddStructurePropertyData(const TSharedPtr<FStructOnScope>& StructData, FName PropertyName) = 0;
+
+	/**
+	 * Allows for the customization of a property row for a property that already exists on a class being edited in the details panel
+	 * The property will remain in the default location but the widget or other attributes for the property can be changed 
+	 * Note This cannot be used to customize other customizations
+
+	 * @param InPropertyHandle	The handle to the property that you want to add to its own category.
+	 * @return					The property row to edit or nullptr if the property row does not exist
+	 */
+	virtual IDetailPropertyRow* EditDefaultProperty(TSharedPtr<IPropertyHandle> InPropertyHandle) = 0;
+
+	/**
+	 * Hides an entire category
+	 *
+	 * @param CategoryName	The name of the category to hide
+	 */
+	virtual void HideCategory( FName CategoryName ) = 0;
+	
+	/**
+	 * Gets a handle to a property which can be used to read and write the property value and identify the property in other detail customization interfaces.
+	 * Instructions
+	 *
+	 * @param Path	The path to the property.  Can be just a name of the property or a path in the format outer.outer.value[optional_index_for_static_arrays]
+	 * @param ClassOutermost	Optional outer class if accessing a property outside of the current class being customized
+	 * @param InstanceName		Optional instance name if multiple FProperty's of the same type exist. such as two identical structs, the instance name is one of the struct variable names)
+	    Examples:
+
+		struct MyStruct
+		{ 
+			int32 StaticArray[3];
+			float FloatVar;
+		}
+
+		class MyActor
+		{ 
+			MyStruct Struct1;
+			MyStruct Struct2;
+			float MyFloat
+		}
+		
+		To access StaticArray at index 2 from Struct2 in MyActor, your path would be MyStruct.StaticArray[2]" and your instance name is "Struct2"
+		To access MyFloat in MyActor you can just pass in "MyFloat" because the name of the property is unambiguous
+	 */
+	virtual TSharedRef<IPropertyHandle> GetProperty( const FName PropertyPath, const UStruct* ClassOutermost = NULL, FName InstanceName = NAME_None ) const = 0;
+
+	/**
+	 * Gets the top level property, for showing the warning for experimental or early access class
+	 * 
+	 * @return the top level property name
+	 */
+
+	virtual FName GetTopLevelProperty() = 0;
+
+	/**
+	 * Hides a property from view 
+	 *
+	 * @param PropertyHandle	The handle of the property to hide from view
+	 */
+	virtual void HideProperty( const TSharedPtr<IPropertyHandle> PropertyHandle ) = 0;
+
+	/**
+	 * Hides a property from view
+	 *
+	 * @param Path						The path to the property.  Can be just a name of the property or a path in the format outer.outer.value[optional_index_for_static_arrays]
+	 * @param NewLocalizedDisplayName	Optional display name to show instead of the default name
+	 * @param ClassOutermost			Optional outer class if accessing a property outside of the current class being customized
+	 * @param InstanceName				Optional instance name if multiple FProperty's of the same type exist. such as two identical structs, the instance name is one of the struct variable names)
+	 * See IDetailCategoryBuilder::GetProperty for clarification of parameters
+	 */
+	virtual void HideProperty( FName PropertyPath, const UStruct* ClassOutermost = NULL, FName InstanceName = NAME_None ) = 0;
+
+	/**
+	 * Refreshes the details view and regenerates all the customized layouts
+	 * Use only when you need to remove or add complicated dynamic items
+	 */
+	virtual void ForceRefreshDetails() = 0;
+
+	/**
+	 * Gets the thumbnail pool that should be used for rendering thumbnails in the details view                   
+	 */
+	//virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const = 0;
+
+	/**
+	 * @return true if the property should be visible in the details panel or false if the specific details panel is not showing this property
+	 */
+	virtual bool IsPropertyVisible( TSharedRef<IPropertyHandle> PropertyHandle ) const = 0;
+
+	/**
+	 * @return true if the property should be visible in the details panel or false if the specific details panel is not showing this property
+	 */
+	virtual bool IsPropertyVisible( const struct FPropertyAndParent& PropertyAndParent ) const = 0;
+
+	/**
+	 * @return True if an object in the builder is a class default object
+	 */
+	virtual bool HasClassDefaultObject() const = 0;
+
+	/**
+	 * Registers a custom detail layout delegate for a specific type in this layout only
+	 *
+	 * @param PropertyTypeName	The type the custom detail layout is for
+	 * @param DetailLayoutDelegate	The delegate to call when querying for custom detail layouts for the classes properties
+	 */
+	virtual void RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailWidgetRow.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailWidgetRow.h
new file mode 100644
index 0000000..8981402
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailWidgetRow.h
@@ -0,0 +1,398 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Framework/Commands/UIAction.h"
+#include "Layout/Visibility.h"
+#include "Misc/Attribute.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "RuntimePropertyEditor/DetailCategoryBuilder.h"
+
+namespace soda
+{
+class FDetailWidgetRow;
+class FResetToDefaultOverride;
+class IDetailDragDropHandler;
+
+/** Widget declaration for custom widgets in a widget row */
+class FDetailWidgetDecl
+{
+public:
+	
+	FDetailWidgetDecl( class FDetailWidgetRow& InParentDecl, float InMinWidth, float InMaxWidth, EHorizontalAlignment InHAlign, EVerticalAlignment InVAlign )
+		: Widget( SNew( SInvalidDetailWidget ) )
+		, HorizontalAlignment( InHAlign )
+		, VerticalAlignment( InVAlign )
+		, MinWidth( InMinWidth )
+		, MaxWidth( InMaxWidth )
+		, ParentDecl( &InParentDecl )
+	{
+	}
+
+	FDetailWidgetDecl( class FDetailWidgetRow& InParentDecl, const FDetailWidgetDecl& Other )
+		: Widget( Other.Widget )
+		, HorizontalAlignment( Other.HorizontalAlignment )
+		, VerticalAlignment( Other.VerticalAlignment )
+		, MinWidth( Other.MinWidth )
+		, MaxWidth( Other.MaxWidth )
+		, ParentDecl( &InParentDecl )
+	{
+	}
+
+	FDetailWidgetRow& operator[]( TSharedRef<SWidget> InWidget )
+	{
+		Widget = InWidget;
+		return *ParentDecl;
+	}
+
+	FDetailWidgetDecl& VAlign( EVerticalAlignment InAlignment )
+	{
+		VerticalAlignment = InAlignment;
+		return *this;
+	}
+
+	FDetailWidgetDecl& HAlign( EHorizontalAlignment InAlignment )
+	{
+		HorizontalAlignment = InAlignment;
+		return *this;
+	}
+
+	FDetailWidgetDecl& MinDesiredWidth( TOptional<float> InMinWidth )
+	{
+		MinWidth = InMinWidth;
+		return *this;
+	}
+
+	FDetailWidgetDecl& MaxDesiredWidth( TOptional<float> InMaxWidth )
+	{
+		MaxWidth = InMaxWidth;
+		return *this;
+	}
+
+private:
+	class SInvalidDetailWidget : public SSpacer
+	{
+		SLATE_BEGIN_ARGS( SInvalidDetailWidget )
+		{}
+		SLATE_END_ARGS()
+
+		void Construct( const FArguments& InArgs )
+		{
+			SetVisibility(EVisibility::Collapsed);
+		}
+
+	};
+public:
+	TSharedRef<SWidget> Widget;
+	EHorizontalAlignment HorizontalAlignment;
+	EVerticalAlignment VerticalAlignment;
+	TOptional<float> MinWidth;
+	TOptional<float> MaxWidth;
+private:
+	class FDetailWidgetRow* ParentDecl;
+};
+
+
+static FName InvalidDetailWidgetName = TEXT("SInvalidDetailWidget");
+
+/**
+ * Represents a single row of custom widgets in a details panel 
+ */
+class FDetailWidgetRow : public IDetailLayoutRow
+{
+public:
+	RUNTIMEEDITOR_API const static float DefaultValueMinWidth;
+	RUNTIMEEDITOR_API const static float DefaultValueMaxWidth;
+
+	FDetailWidgetRow()
+		: NameWidget( *this, 0.0f, 0.0f, HAlign_Left, VAlign_Center )
+		, ValueWidget( *this, DefaultValueMinWidth, DefaultValueMaxWidth, HAlign_Left, VAlign_Center )
+		, ExtensionWidget( *this, 0.0f, 0.0f, HAlign_Right, VAlign_Center)
+		, WholeRowWidget( *this, 0.0f, 0.0f, HAlign_Fill, VAlign_Fill )
+		, VisibilityAttr( EVisibility::Visible )
+		, IsEnabledAttr( true )
+		, FilterTextString()
+		, CopyMenuAction()
+		, PasteMenuAction()
+		, RowTagName()
+	{
+	}
+	FDetailWidgetRow& operator=(const FDetailWidgetRow& Other)
+	{
+		NameWidget = FDetailWidgetDecl(*this, Other.NameWidget);
+		ValueWidget = FDetailWidgetDecl(*this, Other.ValueWidget);
+		ExtensionWidget = FDetailWidgetDecl(*this, Other.ExtensionWidget);
+		WholeRowWidget = FDetailWidgetDecl(*this, Other.WholeRowWidget);
+		VisibilityAttr = Other.VisibilityAttr;
+		IsEnabledAttr = Other.IsEnabledAttr;
+		IsValueEnabledAttr = Other.IsValueEnabledAttr;
+		FilterTextString = Other.FilterTextString;
+		CopyMenuAction = Other.CopyMenuAction;
+		PasteMenuAction = Other.PasteMenuAction;
+		CustomMenuItems = Other.CustomMenuItems;
+		RowTagName = Other.RowTagName;
+		CustomResetToDefault = Other.CustomResetToDefault;
+		EditConditionValue = Other.EditConditionValue;
+		OnEditConditionValueChanged = Other.OnEditConditionValueChanged;
+		CustomDragDropHandler = Other.CustomDragDropHandler;
+		PropertyHandles = Other.PropertyHandles;
+		return *this;
+	}
+
+	virtual ~FDetailWidgetRow() {}
+
+	/** IDetailLayoutRow interface */
+	virtual FName GetRowName() const override { return RowTagName; }
+
+	/**
+	 * Assigns content to the entire row
+	 */
+	FDetailWidgetRow& operator[]( TSharedRef<SWidget> InWidget )
+	{
+		WholeRowWidget.Widget = InWidget;
+		return *this;
+	}
+
+	/**
+	* Assigns content to the whole slot, this is an explicit alternative to using []
+	*/
+	FDetailWidgetDecl& WholeRowContent()
+	{
+		return WholeRowWidget;
+	}
+
+	/**
+	 * Assigns content to just the name slot
+	 */
+	FDetailWidgetDecl& NameContent()
+	{
+		return NameWidget;
+	}
+
+	/**
+	 * Assigns content to the value slot
+	 */
+	FDetailWidgetDecl& ValueContent()
+	{
+		return ValueWidget;
+	}
+
+	/**
+     * Assigns content to the extension (right) slot
+	 */
+	FDetailWidgetDecl& ExtensionContent()
+	{
+		return ExtensionWidget;
+	}
+
+	/**
+	 * Sets a string which should be used to filter the content when a user searches
+	 */
+	FDetailWidgetRow& FilterString( const FText& InFilterString )
+	{
+		FilterTextString = InFilterString;
+		return *this;
+	}
+
+	/**
+	 * Sets the visibility of the entire row
+	 */
+	FDetailWidgetRow& Visibility( const TAttribute<EVisibility>& InVisibility )
+	{
+		VisibilityAttr = InVisibility;
+		return *this;
+	}
+
+	/**
+	 * Sets the enabled state of the entire row
+	 */
+	FDetailWidgetRow& IsEnabled( const TAttribute<bool>& InIsEnabled )
+	{
+		IsEnabledAttr = InIsEnabled;
+		return *this;
+	}
+
+    /**
+     * Sets the enabled state of the value widget only
+     */
+	FDetailWidgetRow& IsValueEnabled( const TAttribute<bool>& InIsEnabled )
+	{
+		IsValueEnabledAttr = InIsEnabled;
+		return *this;
+	}
+
+	/**
+	 * Sets a custom copy action to take when copying the data from this row
+	 */
+	FDetailWidgetRow& CopyAction( const FUIAction& InCopyAction )
+	{
+		CopyMenuAction = InCopyAction;
+		return *this;
+	}
+
+	/**
+	 * Sets a custom paste action to take when copying the data from this row
+	 */
+	FDetailWidgetRow& PasteAction( const FUIAction& InPasteAction  )
+	{
+		PasteMenuAction = InPasteAction;
+		return *this;
+	}
+
+	/**
+	* Add a custom action to the row context menu
+	*/
+	FDetailWidgetRow& AddCustomContextMenuAction(const FUIAction& Action, const FText& Name, const FText& Tooltip = FText(), const FSlateIcon& SlateIcon = FSlateIcon())
+	{
+		CustomMenuItems.Add(FCustomMenuData(Action, Name, Tooltip, SlateIcon));
+		return *this;
+	}
+
+	bool HasNameContent() const 
+	{
+		return NameWidget.Widget->GetType() != InvalidDetailWidgetName;
+	}
+
+	bool HasValueContent() const
+	{
+		return ValueWidget.Widget->GetType() != InvalidDetailWidgetName;
+	}
+
+	bool HasExtensionContent() const
+	{
+		return ExtensionWidget.Widget->GetType() != InvalidDetailWidgetName;
+	}
+
+	/**
+	 * @return true if the row has columns, false if it spans the entire row
+	 */
+	bool HasColumns() const
+	{
+		return HasNameContent() || HasValueContent();
+	}
+
+	/**
+	 * @return true of the row has any content
+	 */
+	bool HasAnyContent() const
+	{
+		return WholeRowWidget.Widget->GetType() != InvalidDetailWidgetName || HasColumns();
+	}
+
+	/** @return true if a custom copy/paste is bound on this row */
+	bool IsCopyPasteBound() const
+	{
+		return CopyMenuAction.ExecuteAction.IsBound() && PasteMenuAction.ExecuteAction.IsBound();
+	}
+
+	/**
+	* Sets a tag which can be used to identify this row 
+	*/
+	FDetailWidgetRow& RowTag(const FName& InRowTagName)
+	{
+		RowTagName = InRowTagName;
+		return *this;
+	}
+
+	/**
+	* Sets flag to indicate if property value differs from the default
+	*/
+	FDetailWidgetRow& OverrideResetToDefault(const FResetToDefaultOverride& InResetToDefaultOverride)
+	{
+		CustomResetToDefault = InResetToDefaultOverride;
+		return *this;
+	}
+
+	/** 
+	 * Override the edit condition.
+	 */ 
+	FDetailWidgetRow& EditCondition(TAttribute<bool> InEditConditionValue, FOnBooleanValueChanged InOnEditConditionValueChanged)
+	{
+		EditConditionValue = InEditConditionValue;
+		OnEditConditionValueChanged = InOnEditConditionValueChanged;
+		return *this;
+	}
+	
+	/**
+	 * Sets a handler for the row to be a source or target of drag-and-drop operations.
+	 */
+	FDetailWidgetRow& DragDropHandler(TSharedPtr<IDetailDragDropHandler> InDragDropHandler)
+	{
+		CustomDragDropHandler = InDragDropHandler;
+		return *this;
+	}
+
+	/**
+	* Used to provide all the property handles this WidgetRow represent
+	*/
+	FDetailWidgetRow& PropertyHandleList(const TArray<TSharedPtr<IPropertyHandle>>& InPropertyHandles)
+	{
+		PropertyHandles = InPropertyHandles;
+		return *this;
+	}
+
+	/**
+	* Return all the property handles this WidgetRow represent
+	*/
+	const TArray<TSharedPtr<IPropertyHandle>>& GetPropertyHandles() const { return PropertyHandles;  }
+
+public:
+	/** Name column content */
+	FDetailWidgetDecl NameWidget;
+	/** Value column content */
+	FDetailWidgetDecl ValueWidget;
+	/** Extension (right) column content */
+	FDetailWidgetDecl ExtensionWidget;
+	/** Whole row content */
+	FDetailWidgetDecl WholeRowWidget;
+	/** Visibility of the row */
+	TAttribute<EVisibility> VisibilityAttr;
+	/** IsEnabled of the row */
+	TAttribute<bool> IsEnabledAttr;
+    /** IsEnabled of the value widget only */
+	TAttribute<bool> IsValueEnabledAttr;
+	/** String to filter with */
+	FText FilterTextString;
+	/** Action for coping data on this row */
+	FUIAction CopyMenuAction;
+	/** Action for pasting data on this row */
+	FUIAction PasteMenuAction;
+
+	struct FCustomMenuData
+	{
+		FCustomMenuData(const FUIAction& InAction, const FText& InName, const FText& InTooltip, const FSlateIcon& InSlateIcon)
+			: Action(InAction)
+			, Name(InName)
+			, Tooltip(InTooltip)
+			, SlateIcon(InSlateIcon)
+		{}
+
+		const FUIAction Action;
+		const FText Name;
+		const FText Tooltip;
+		const FSlateIcon SlateIcon;
+	};
+	/** Custom Action on this row */
+	TArray<FCustomMenuData> CustomMenuItems;
+	/* Tag to identify this row */
+	FName RowTagName;
+	/** Custom reset to default handler */
+	TOptional<FResetToDefaultOverride> CustomResetToDefault;
+	/** Custom edit condition value. */
+	TAttribute<bool> EditConditionValue;
+	/** Custom edit condition value changed handler. */
+	FOnBooleanValueChanged OnEditConditionValueChanged;
+	/** Custom handler for drag-and-drop of the row */
+	TSharedPtr<IDetailDragDropHandler> CustomDragDropHandler;
+	/* All property handle that this custom widget represent */
+	TArray<TSharedPtr<IPropertyHandle>> PropertyHandles;
+};
+
+} // namespace soda
+
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailsViewArgs.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailsViewArgs.h
new file mode 100644
index 0000000..4d22465
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailsViewArgs.h
@@ -0,0 +1,183 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyEditorDelegates.h"
+
+class FNotifyHook;
+class FUICommandList;
+class FTabManager;
+
+namespace soda
+{
+
+class FDetailsViewObjectFilter;
+class IClassViewerFilter;
+
+enum class EEditDefaultsOnlyNodeVisibility : uint8
+{
+	/** Always show nodes that have the EditDefaultsOnly aka CPF_DisableEditOnInstance flag. */
+	Show,
+	/** Always hide nodes that have the EditDefaultsOnly aka CPF_DisableEditOnInstance flag. */
+	Hide,
+	/** Let the details panel control it. If the CDO is selected EditDefaultsOnly nodes will be visible, otherwise false. */
+	Automatic,
+};
+
+/**
+ * Init params for a details view widget
+ */
+struct FDetailsViewArgs
+{
+	enum ENameAreaSettings
+	{
+		/** The name area should never be displayed */
+		HideNameArea = 0,
+		/** All object types use the name area */
+		ObjectsUseNameArea = 1<<0,
+		/** Actors prioritize using the name area */
+		ActorsUseNameArea = 1<<1,
+		/** Components and actors prioritize using the name area. Components will display their actor owner as the name */
+		ComponentsAndActorsUseNameArea = 1<<2 | ActorsUseNameArea,
+	};
+
+	/** Controls how CPF_DisableEditOnInstance nodes will be treated */
+	EEditDefaultsOnlyNodeVisibility DefaultsOnlyVisibility;
+	/** The command list from the host of the details view, allowing child widgets to bind actions with a bound chord */
+	TSharedPtr<FUICommandList> HostCommandList;
+	/** The tab manager from the host of the details view, allowing child widgets to spawn tabs */
+	TSharedPtr<FTabManager> HostTabManager;
+	/** Optional object filter to use for more complex handling of what a details panel is viewing. */
+	TSharedPtr<FDetailsViewObjectFilter> ObjectFilter;
+	/** Optional custom filter(s) to apply to the class viewer widget for class object property values. */
+	TArray<TSharedRef<IClassViewerFilter>> ClassViewerFilters;
+
+	/** Identifier for this details view; NAME_None if this view is anonymous */
+	FName ViewIdentifier;
+	/** Notify hook to call when properties are changed */
+	FNotifyHook* NotifyHook;
+	/** Settings for displaying the name area (@see ENameAreaSettings) */
+	int32 NameAreaSettings;
+	/** The default value column width, as a percentage, 0-1. */
+	float ColumnWidth;
+	/** Hide Right Column */
+	bool bHideRightColumn : 1;
+	/** The minimum width of the right column in Slate units. */
+	float RightColumnMinWidth;
+	/** True if the viewed objects updates from editor selection */
+	bool bUpdatesFromSelection : 1;
+	/** True if this property view can be locked */
+	bool bLockable : 1;
+	/** True if we allow searching */
+	bool bAllowSearch : 1;
+	/** True if you want to not show the tip when no objects are selected (should only be used if viewing actors properties or bObjectsUseNameArea is true ) */
+	bool bHideSelectionTip : 1;
+	/** True if you want the search box to have initial keyboard focus */
+	bool bSearchInitialKeyFocus : 1;
+	/** True if the 'Open Selection in Property Matrix' button should be shown */
+	bool bShowPropertyMatrixButton : 1;
+	/** Allow options to be changed */
+	bool bShowOptions : 1;
+	/** True if you want to show the object label */
+	bool bShowObjectLabel : 1;
+	UE_DEPRECATED(5.0, "bShowActorLabel has been renamed bShowObjectLabel")
+	bool bShowActorLabel : 1;
+	/** True if you want to show the 'Show Only Modified Properties' option. Only valid in conjunction with bShowOptions */
+	bool bShowModifiedPropertiesOption : 1;
+	/** True if you want to show the 'Show Only Differing Properties' option. Only valid in conjunction with bShowOptions. */
+	bool bShowDifferingPropertiesOption : 1;
+	/** True if you want to show the 'Show Hidden Properties While Playing' option. Only valid in conjunction with bShowOptions. */
+	bool bShowHiddenPropertiesWhilePlayingOption : 1;	
+	/** If true, the name area will be created but will not be displayed so it can be placed in a custom location.  */
+	bool bCustomNameAreaLocation : 1;
+	/** If true, the filter area will be created but will not be displayed so it can be placed in a custom location.  */
+	bool bCustomFilterAreaLocation : 1;
+	/** If false, the current properties editor will never display the favorite system */
+	bool bAllowFavoriteSystem : 1;
+	/** If true the details panel will assume each object passed in through SetObjects will be a unique object shown in the tree and not combined with other objects */
+	bool bAllowMultipleTopLevelObjects : 1;
+	/** If false, the details panel's scrollbar will always be hidden. Useful when embedding details panels in widgets that either grow to accommodate them, or with scrollbars of their own. */
+	bool bShowScrollBar : 1;
+	/** If true, all properties will be visible, not just those with CPF_Edit */
+	bool bForceHiddenPropertyVisibility : 1;
+	/** True if you want to show the 'Show Only Keyable Properties'. Only valid in conjunction with bShowOptions */
+	bool bShowKeyablePropertiesOption : 1;
+	/** True if you want to show the 'Show Only Animated Properties'. Only valid in conjunction with bShowOptions */
+	bool bShowAnimatedPropertiesOption: 1;
+	/** True if you want to show a custom filter. */
+	bool bShowCustomFilterOption : 1;
+	/** True if the section selector should be shown. */
+	bool bShowSectionSelector : 1;
+	/** */
+	bool bGameModeOnlyVisible : 1;
+	/** */
+	soda::FOnGenerateGlobalRowExtension OnGeneratLocalRowExtension;
+public:
+
+	FDetailsViewArgs()
+		: DefaultsOnlyVisibility(EEditDefaultsOnlyNodeVisibility::Show)
+		, ViewIdentifier(NAME_None)
+		, NotifyHook(nullptr)
+		, NameAreaSettings(ActorsUseNameArea)
+		, ColumnWidth(.6f)
+		, bHideRightColumn(false)
+		, RightColumnMinWidth(22)
+		, bUpdatesFromSelection(false)
+		, bLockable(false)
+		, bAllowSearch(true)
+		, bHideSelectionTip(false)
+		, bSearchInitialKeyFocus(false)
+		, bShowPropertyMatrixButton(true)
+		, bShowOptions(true)
+		, bShowObjectLabel(true)
+		, bShowModifiedPropertiesOption(true)
+		, bShowDifferingPropertiesOption(false)
+		, bShowHiddenPropertiesWhilePlayingOption(true)
+		, bCustomNameAreaLocation(false)
+		, bCustomFilterAreaLocation(false)
+		, bAllowFavoriteSystem(false)	
+		, bAllowMultipleTopLevelObjects(false)
+		, bShowScrollBar(true)
+		, bForceHiddenPropertyVisibility(false)
+		, bShowKeyablePropertiesOption(true)
+		, bShowAnimatedPropertiesOption(true)
+		, bShowCustomFilterOption(false)
+		, bShowSectionSelector(false)
+		, bGameModeOnlyVisible(false)
+	{
+	}
+
+	/** Default constructor */
+	UE_DEPRECATED(5.0, "This constructor is deprecated, please create an empty FDetailsViewArgs and explicitly set any values that you wish to change.")
+	FDetailsViewArgs( const bool InUpdateFromSelection
+					, const bool InLockable = false
+					, const bool InAllowSearch = true
+					, const ENameAreaSettings InNameAreaSettings = ActorsUseNameArea
+					, const bool InHideSelectionTip = false
+					, FNotifyHook* InNotifyHook = NULL
+					, const bool InSearchInitialKeyFocus = false
+					, FName InViewIdentifier = NAME_None )
+		: FDetailsViewArgs()
+	{
+		bUpdatesFromSelection = InUpdateFromSelection;
+		bLockable = InLockable;
+		bAllowSearch = InAllowSearch;
+		NameAreaSettings = InNameAreaSettings;
+		bHideSelectionTip = InHideSelectionTip;
+		NotifyHook = InNotifyHook;
+		bSearchInitialKeyFocus = InSearchInitialKeyFocus;
+		ViewIdentifier = InViewIdentifier;
+	}
+
+	FDetailsViewArgs(const FDetailsViewArgs&);
+	FDetailsViewArgs& operator=(const FDetailsViewArgs&);
+};
+
+PRAGMA_DISABLE_DEPRECATION_WARNINGS
+inline FDetailsViewArgs::FDetailsViewArgs(const FDetailsViewArgs&) = default;
+inline FDetailsViewArgs& FDetailsViewArgs::operator=(const FDetailsViewArgs&) = default;
+PRAGMA_ENABLE_DEPRECATION_WARNINGS
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailsViewObjectFilter.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailsViewObjectFilter.h
new file mode 100644
index 0000000..4d8ab40
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/DetailsViewObjectFilter.h
@@ -0,0 +1,51 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+/**
+ * An object root is a collection of UObjects that represent a top level set of properties in a details panel
+ * When there are multiple objects in the root, the common base class for all those objects are found and the properties on that common base class are displayed
+ * When a user edits one of those properties, it will propagate the result to all objects in the root.  
+ * If multiple differing values are found on a single property, the details panel UI displays "multiple values" 
+ */
+struct FDetailsViewObjectRoot
+{
+	FDetailsViewObjectRoot()
+	{}
+
+	FDetailsViewObjectRoot(UObject* InObject)
+	{
+		Objects.Add(InObject);
+	}
+
+	FDetailsViewObjectRoot(const TArray<UObject*>& InObjects)
+	{
+		Objects.Reserve(InObjects.Num());
+		for (UObject* Object : InObjects)
+		{
+			Objects.Add(Object);
+		}
+	}
+
+	TArray<UObject*> Objects;
+};
+
+/**
+ * An object filter determines the root objects that should be displayed from a set of given source objects passed to the details panel
+ */
+class FDetailsViewObjectFilter
+{
+public:
+	virtual ~FDetailsViewObjectFilter() {}
+
+	virtual TArray<FDetailsViewObjectRoot> FilterObjects(const TArray<UObject*>& SourceObjects) = 0;
+
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailChildrenBuilder.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailChildrenBuilder.h
new file mode 100644
index 0000000..2e647d0
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailChildrenBuilder.h
@@ -0,0 +1,147 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/DetailBuilderTypes.h"
+
+class SWidget;
+class FStructOnScope;
+
+namespace soda
+{
+class IPropertyHandle;
+class IDetailCategoryBuilder;
+class IDetailCustomNodeBuilder;
+
+/**
+ * Builder for adding children to a detail customization
+ */
+class IDetailChildrenBuilder
+{
+public:
+	virtual ~IDetailChildrenBuilder() {}
+
+
+	/**
+	 * Adds a custom builder as a child
+	 *
+	 * @param InCustomBuilder		The custom builder to add
+	 */
+	virtual IDetailChildrenBuilder& AddCustomBuilder(TSharedRef<IDetailCustomNodeBuilder> InCustomBuilder) = 0;
+
+	/**
+	 * Adds a group to the category
+	 *
+	 * @param GroupName	The name of the group
+	 * @param LocalizedDisplayName	The display name of the group
+	 * @param true if the group should appear in the advanced section of the category
+	 */
+	virtual class IDetailGroup& AddGroup(FName GroupName, const FText& LocalizedDisplayName) = 0;
+
+	/**
+	 * Adds new custom content as a child to the struct
+	 *
+	 * @param SearchString	Search string that will be matched when users search in the details panel.  If the search string doesnt match what the user types, this row will be hidden
+	 * @return A row that accepts widgets
+	 */
+
+	virtual class FDetailWidgetRow& AddCustomRow(const FText& SearchString) = 0;
+
+	/**
+	 * Adds a property to the struct
+	 *
+	 * @param PropertyHandle	The handle to the property to add
+	 * @return An interface to the property row that can be used to customize the appearance of the property
+	 */
+	virtual class IDetailPropertyRow& AddProperty(TSharedRef<IPropertyHandle> PropertyHandle) = 0;
+
+	/**
+	 * Adds a set of objects to as a child.  Similar to details panels, all objects will be visible in the details panel as set of properties from the common base class from the list of objects
+	 *
+	 * @param  Objects			The objects to add
+	 * @param  UniqueIdName		Optional identifier that uniquely identifies this object among other objects of the same type.  If this is empty, saving and restoring expansion state of this object may not work
+	 * @return The header row generated for this set of objects by the details panel
+	 */
+	virtual class IDetailPropertyRow* AddExternalObjects(const TArray<UObject*>& Objects, FName UniqueIdName = NAME_None) = 0;
+
+	/**
+	 * Adds a set of objects to as a child.  Similar to details panels, all objects will be visible in the details panel as set of properties from the common base class from the list of objects
+	 *
+	 * @param  Objects			The objects to add
+	 * @param  PropertyName		Name of a property inside the object(s) to add.
+	 * @param  UniqueIdName		Optional identifier that uniquely identifies this object among other objects of the same type.  If this is empty, saving and restoring expansion state of this object may not work
+	 * @param  bAllowChildrenOverride Allows customization of how the new root property node is expanded when this is added. 
+	 * @param  bCreateCategoryNodesOverride Allows customization of how the new root node's category is displayed (or not). 
+	 * @return The header row generated for this set of objects by the details panel
+	 */
+	virtual IDetailPropertyRow* AddExternalObjectProperty(const TArray<UObject*>& Objects, FName PropertyName, const FAddPropertyParams& Params = FAddPropertyParams()) = 0;
+
+
+	/**
+	 * Adds a property from a custom structure as a child
+	 *
+	 * @param ChildStructure	The structure to add
+	 * @param PropertyName		Optional name of a property inside the Child structure to add.  If this is empty, the entire structure will be added
+	 * @param UniqueIdName		Optional identifier that uniquely identifies this structure among other structures of the same type.  If this is empty, saving and restoring expansion state of this structure may not work
+	 */
+	virtual IDetailPropertyRow* AddExternalStructureProperty(TSharedRef<FStructOnScope> ChildStructure, FName PropertyName, const FAddPropertyParams& Params = FAddPropertyParams()) = 0;
+
+	/**
+	 * Adds a custom structure as a child
+	 *
+	 * @param ChildStructure	The structure to add
+	 * @param UniqueIdName		Optional identifier that uniquely identifies this structure among other structures of the same type.  If this is empty, saving and restoring expansion state of this structure may not work
+	 */
+	virtual class IDetailPropertyRow* AddExternalStructure(TSharedRef<FStructOnScope> ChildStructure, FName UniqueIdName = NAME_None) = 0;
+
+	/**
+	 * Adds all the properties of an external structure as a children
+	 *
+	 * @param ChildStructure	The structure containing the properties to add
+	 * @return An array of interfaces to the properties that were added
+	 */
+	virtual TArray<TSharedPtr<IPropertyHandle>> AddAllExternalStructureProperties(TSharedRef<FStructOnScope> ChildStructure) = 0;
+
+	/**
+	 * Generates a value widget from a customized struct
+	 * If the customized struct has no value widget an empty widget will be returned
+	 *
+	 * @param StructPropertyHandle	The handle to the struct property to generate the value widget from
+	 */
+	virtual TSharedRef<SWidget> GenerateStructValueWidget(TSharedRef<IPropertyHandle> StructPropertyHandle) = 0;
+
+	/**
+	 * @return the parent category on the customized object that this children is in.
+	 */
+	virtual IDetailCategoryBuilder& GetParentCategory() const = 0;
+
+	/**
+	* @return the parent group on the customized object that this children is in (if there is one)
+	*/
+	virtual IDetailGroup* GetParentGroup() const = 0;
+
+	UE_DEPRECATED(4.24, "Please use the overload that accepts an FAddPropertyParams structure")
+	IDetailPropertyRow* AddExternalObjectProperty(const TArray<UObject*>& Objects, FName PropertyName, FName UniqueIdName = NAME_None, TOptional<bool> bAllowChildrenOverride = TOptional<bool>(), TOptional<bool> bCreateCategoryNodesOverride = TOptional<bool>())
+	{
+		FAddPropertyParams Params;
+		Params.UniqueId(UniqueIdName);
+		if (bAllowChildrenOverride.IsSet())
+		{
+			Params.AllowChildren(bAllowChildrenOverride.GetValue());
+		}
+		if (bCreateCategoryNodesOverride.IsSet())
+		{
+			Params.CreateCategoryNodes(bCreateCategoryNodesOverride.GetValue());
+		}
+		return AddExternalObjectProperty(Objects, PropertyName, Params);
+	}
+	UE_DEPRECATED(4.24, "Please use the overload that accepts an FAddPropertyParams structure")
+	IDetailPropertyRow* AddExternalStructureProperty(TSharedRef<FStructOnScope> ChildStructure, FName PropertyName, FName UniqueIdName)
+	{
+		return AddExternalStructureProperty(ChildStructure, PropertyName, FAddPropertyParams().UniqueId(UniqueIdName));
+	}
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailCustomNodeBuilder.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailCustomNodeBuilder.h
new file mode 100644
index 0000000..c363f6c
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailCustomNodeBuilder.h
@@ -0,0 +1,79 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class FDetailWidgetRow;
+class IDetailChildrenBuilder;
+class IPropertyHandle;
+
+DECLARE_DELEGATE_OneParam(FOnToggleNodeExpansion, bool)
+/**
+ * A custom node that can be given to a details panel category to customize widgets
+ */
+class IDetailCustomNodeBuilder
+{
+public:
+	virtual ~IDetailCustomNodeBuilder(){};
+
+	/**
+	 * Sets a delegate that should be used when the custom node needs to rebuild children
+	 *
+	 * @param A delegate to invoke when the tree should rebuild this nodes children
+	 */
+	virtual void SetOnRebuildChildren(FSimpleDelegate InOnRegenerateChildren) {}
+
+	/**
+	 * Sets a delegate that should be used when the custom node wants to expand
+	 *
+	 * @param A delegate to invoke when the tree should expand
+	 */
+	virtual void SetOnToggleExpansion(FOnToggleNodeExpansion InOnToggleExpansion) {}
+
+	/**
+	 * Called to generate content in the header of this node ( the actual node content ). 
+	 * Only called if HasHeaderRow is true
+	 *
+	 * @param NodeRow The row to put content in
+	 */
+	virtual void GenerateHeaderRowContent( FDetailWidgetRow& NodeRow ) = 0;
+
+	/**
+	 * Called to generate child content of this node
+	 *
+	 * @param ChildrenBuilder The builder to add child rows to.
+	 */
+	virtual void GenerateChildContent( IDetailChildrenBuilder& ChildrenBuilder ) {}
+
+	/**
+	 * Called each tick if RequiresTick is true
+	 */
+	virtual void Tick(float DeltaTime) {}
+
+	/**
+	 * @return true if this node requires tick, false otherwise
+	 */
+	virtual bool RequiresTick() const { return false; }
+
+	/**
+	 * @return true if this node should be collapsed in the tree
+	 */
+	virtual bool InitiallyCollapsed() const { return true; }
+
+	/**
+	 * @return The name of this custom builder.  This is used as an identifier to save expansion state if needed
+	 */
+	virtual FName GetName() const = 0;
+
+	/**
+	 * @return The property associated with this builder (if any).
+	 */
+	virtual TSharedPtr<IPropertyHandle> GetPropertyHandle() const { return nullptr; }
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailCustomization.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailCustomization.h
new file mode 100644
index 0000000..120a0c1
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailCustomization.h
@@ -0,0 +1,35 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class IDetailLayoutBuilder;
+
+/** 
+ * Interface for any class that lays out details for a specific class
+ */
+class IDetailCustomization : public TSharedFromThis<IDetailCustomization>
+{
+public:
+	virtual ~IDetailCustomization() {}
+
+	/** Called when no longer used and will be deleted */
+	virtual void PendingDelete() {}
+
+	/** Called when details should be customized */
+	virtual void CustomizeDetails( IDetailLayoutBuilder& DetailBuilder ) = 0;
+
+	/** 
+	 * Called when details should be customized, this version allows the customization to store a weak ptr to the layout builder.
+	 * This allows property changes to trigger a force refresh of the detail panel.
+	 */
+	virtual void CustomizeDetails( const TSharedPtr<IDetailLayoutBuilder>& DetailBuilder )  { CustomizeDetails(*DetailBuilder); }
+
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailGroup.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailGroup.h
new file mode 100644
index 0000000..8168f3a
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailGroup.h
@@ -0,0 +1,97 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+
+namespace soda
+{
+
+class FDetailWidgetRow;
+class IDetailPropertyRow;
+
+/**
+ * A group in the details panel that can have children                                                              
+ */
+class IDetailGroup
+{
+public:
+	/**
+	* Delegate called when user press the Group Reset ui
+	*/
+	DECLARE_MULTICAST_DELEGATE(FDetailGroupReset);
+
+	virtual ~IDetailGroup(){}
+
+	/**
+	 * Makes a custom row for the groups header
+	 *
+	 * @return a new row for customizing the header
+	 */
+	virtual FDetailWidgetRow& HeaderRow() = 0;
+
+	/**
+	 * Adds a property as the groups header      
+	 */
+	virtual IDetailPropertyRow& HeaderProperty( TSharedRef<IPropertyHandle> PropertyHandle ) = 0;
+
+	/** 
+	 * Adds a new row for custom widgets *
+	 * 
+	 * @return a new row for adding widgets
+	 */
+	virtual class FDetailWidgetRow& AddWidgetRow() = 0;
+
+	/**
+	 * Adds a new row for a property
+	 *
+	 * @return an interface for customizing the appearance of the property row
+	 */
+	virtual class IDetailPropertyRow& AddPropertyRow( TSharedRef<IPropertyHandle> PropertyHandle ) = 0;
+
+	/**
+	 * Adds a group to the category
+	 *
+	 * @param NewGroupName	The name of the group
+	 * @param LocalizedDisplayName	The display name of the group
+	 * @param true if the group should start expanded
+	 */
+	virtual IDetailGroup& AddGroup(FName NewGroupName, const FText& InLocalizedDisplayName, bool bInStartExpanded = false) = 0;
+
+	/**
+	 * Toggles expansion on the group
+	 *
+	 * @param bExpand	true to expand the group, false to collapse
+	 */
+	virtual void ToggleExpansion( bool bExpand ) = 0;
+
+	/**
+	 * Gets the current state of expansion for the group
+	 */
+	virtual bool GetExpansionState() const = 0;
+
+
+	/**
+	* Permit resetting the properties in this group
+	*/
+	virtual void EnableReset(bool InValue) = 0;
+
+	/**
+	* Return the delegate called when user press the Group Reset ui
+	*/
+	virtual FDetailGroupReset& GetOnDetailGroupReset() = 0;
+
+	/**
+	* Return the name associated with this group
+	*/
+	virtual FName GetGroupName() const = 0;
+
+	/**
+	* Return the property row associated with the specified property handle
+	*/
+	virtual TSharedPtr<IDetailPropertyRow> FindPropertyRow(TSharedRef<IPropertyHandle> PropertyHandle) const = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailKeyframeHandler.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailKeyframeHandler.h
new file mode 100644
index 0000000..998b9ce
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailKeyframeHandler.h
@@ -0,0 +1,28 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class IPropertyHandle;
+
+class IDetailKeyframeHandler
+{
+public:
+	virtual ~IDetailKeyframeHandler(){}
+
+	virtual bool IsPropertyKeyable(const UClass* InObjectClass, const IPropertyHandle& PropertyHandle) const = 0;
+
+	virtual bool IsPropertyKeyingEnabled() const = 0;
+
+	virtual void OnKeyPropertyClicked(const IPropertyHandle& KeyedPropertyHandle) = 0;
+
+	virtual bool IsPropertyAnimated(const IPropertyHandle& PropertyHandle, UObject* ParentObject) const = 0;
+
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailPropertyExtensionHandler.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailPropertyExtensionHandler.h
new file mode 100644
index 0000000..ddb6502
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailPropertyExtensionHandler.h
@@ -0,0 +1,59 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "Widgets/SWidget.h"
+
+namespace soda
+{
+
+class IPropertyHandle;
+class IDetailLayoutBuilder;
+
+class IDetailPropertyExtensionHandler
+{
+public:
+	virtual ~IDetailPropertyExtensionHandler(){ }
+
+	virtual bool IsPropertyExtendable(const UClass* InObjectClass, const class IPropertyHandle& PropertyHandle) const = 0;
+
+	UE_DEPRECATED(4.24, "Please use ExtendWidgetRow")
+	virtual TSharedRef<SWidget> GenerateExtensionWidget(const UClass* InObjectClass, TSharedPtr<IPropertyHandle> PropertyHandle) 
+	{ 
+		return SNullWidget::NullWidget;
+	}
+
+	UE_DEPRECATED(5.0, "Please use ExtendWidgetRow")
+	virtual TSharedRef<SWidget> GenerateExtensionWidget(const IDetailLayoutBuilder& InDetailBuilder, const UClass* InObjectClass, TSharedPtr<IPropertyHandle> PropertyHandle)
+	{
+	PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		// Call old deprecated path for back-compat
+		return GenerateExtensionWidget(InObjectClass, PropertyHandle);
+	PRAGMA_ENABLE_DEPRECATION_WARNINGS
+	}
+
+	/**
+	 * Gives the extension handler a chance to add extension widgets to the widget row.
+	 * Typically, an extension handler can do so by using InWidgetRow.ExtensionContent(),
+	 * but it can also modify other aspects of the widget row as well.
+	 */
+	virtual void ExtendWidgetRow(FDetailWidgetRow& InWidgetRow, const IDetailLayoutBuilder& InDetailBuilder, const UClass* InObjectClass, TSharedPtr<IPropertyHandle> PropertyHandle)
+	{
+	PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		// Call old deprecated path for back-compat
+		TSharedRef<SWidget> ExtensionWidget = GenerateExtensionWidget(InDetailBuilder, InObjectClass, PropertyHandle);
+	PRAGMA_ENABLE_DEPRECATION_WARNINGS
+
+		if (ExtensionWidget != SNullWidget::NullWidget)
+		{
+			InWidgetRow.ExtensionContent()[
+				ExtensionWidget
+			];
+		}
+	}
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailPropertyRow.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailPropertyRow.h
new file mode 100644
index 0000000..4288fad
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailPropertyRow.h
@@ -0,0 +1,364 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+
+#include "Layout/Visibility.h"
+#include "Framework/SlateDelegates.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Widgets/Layout/SSplitter.h"
+
+namespace soda
+{
+class FDetailWidgetRow;
+class FDetailWidgetDecl;
+class IDetailDragDropHandler;
+
+class FDetailColumnSizeData
+{
+public:
+	
+	FDetailColumnSizeData()
+	{
+		ValueColumnWidthValue = 0.7f;
+		RightColumnWidthValue = 0;
+		HoveredSplitterIndexValue = INDEX_NONE;
+
+		NameColumnWidth.BindRaw(this, &FDetailColumnSizeData::GetNameColumnWidth);
+		ValueColumnWidth.BindRaw(this, &FDetailColumnSizeData::GetValueColumnWidth);
+		PropertyColumnWidth.BindRaw(this, &FDetailColumnSizeData::GetPropertyColumnWidth);
+		RightColumnWidth.BindRaw(this, &FDetailColumnSizeData::GetRightColumnWidth);
+		RightColumnMinWidth.BindRaw(this, &FDetailColumnSizeData::GetRightColumnMinWidth);
+		HoveredSplitterIndex.BindRaw(this, &FDetailColumnSizeData::GetHoveredSplitterIndex);
+		OnValueColumnResized.BindRaw(this, &FDetailColumnSizeData::SetValueColumnWidth);
+		OnRightColumnResized.BindRaw(this, &FDetailColumnSizeData::OnSetRightColumnWidth);
+		OnSplitterHandleHovered.BindRaw(this, &FDetailColumnSizeData::OnSetHoveredSplitterIndex);
+
+		// these are intentionally left no-op, since the widths are derived from the other column width
+		OnPropertyColumnResized.BindLambda([](float) {});
+		OnNameColumnResized.BindLambda([](float) {}); 
+	}
+
+	// don't change these attributes directly - they're here only to be forwarded to the details view
+	TAttribute<float> NameColumnWidth;
+	TAttribute<float> ValueColumnWidth;
+	TAttribute<float> PropertyColumnWidth;
+	TAttribute<float> RightColumnWidth;
+	TAttribute<float> RightColumnMinWidth;
+	TAttribute<int32> HoveredSplitterIndex;
+	SSplitter::FOnSlotResized OnNameColumnResized; 
+	SSplitter::FOnSlotResized OnValueColumnResized;
+	SSplitter::FOnSlotResized OnPropertyColumnResized; 
+	SSplitter::FOnSlotResized OnRightColumnResized;
+	SSplitter::FOnHandleHovered OnSplitterHandleHovered;
+
+	void SetValueColumnWidth(float NewWidth)
+	{ 
+		ensureAlways(NewWidth <= 1.0f);
+		ValueColumnWidthValue = NewWidth;
+	}
+
+	float GetRightColumnMinWidth() const { return RightColumnMinWidthValue; }
+	void SetRightColumnMinWidth(float NewWidth)
+	{ 
+		RightColumnMinWidthValue = NewWidth;
+	}
+
+private:
+	float ValueColumnWidthValue;
+	float RightColumnWidthValue;
+	float RightColumnMinWidthValue;
+	int HoveredSplitterIndexValue;
+
+	float GetNameColumnWidth() const { return 1.0f - (ValueColumnWidthValue + RightColumnWidthValue); }
+	float GetValueColumnWidth() const { return ValueColumnWidthValue; }
+	float GetRightColumnWidth() const { return RightColumnWidthValue; }
+	float GetPropertyColumnWidth() const { return 1.0f - RightColumnWidthValue; }
+	int32 GetHoveredSplitterIndex() const { return HoveredSplitterIndexValue; }
+	
+	void OnSetRightColumnWidth(float NewWidth)
+	{
+		RightColumnWidthValue = NewWidth;
+	}
+
+	void OnSetHoveredSplitterIndex(int32 HoveredIndex)
+	{
+		HoveredSplitterIndexValue = HoveredIndex;
+	}
+};
+
+DECLARE_DELEGATE_RetVal_OneParam(bool, FIsResetToDefaultVisible, TSharedPtr<IPropertyHandle> /* PropertyHandle */);
+DECLARE_DELEGATE_OneParam(FResetToDefaultHandler, TSharedPtr<IPropertyHandle> /* PropertyHandle*/);
+
+/**
+ * Structure describing the delegates needed to override the behavior of reset to default in detail properties
+ */
+class FResetToDefaultOverride
+{
+public:
+	/** Creates a FResetToDefaultOverride in which the the reset to default is always visible */
+	static FResetToDefaultOverride Create(FResetToDefaultHandler InResetToDefaultClicked, const bool InPropagateToChildren = false)
+	{
+		FResetToDefaultOverride ResetToDefault;
+		ResetToDefault.bForceShow = true;
+		ResetToDefault.OnClickedPropertyDelegate = InResetToDefaultClicked;
+		ResetToDefault.bPropagateToChildren = InPropagateToChildren;
+		ResetToDefault.bForceHide = false;
+		return ResetToDefault;
+	}
+
+	/** Creates a FResetToDefaultOverride from visibility and click handler callback delegates */
+	static FResetToDefaultOverride Create(FIsResetToDefaultVisible InIsResetToDefaultVisible, FResetToDefaultHandler InResetToDefaultClicked, const bool InPropagateToChildren = false)
+	{
+		FResetToDefaultOverride ResetToDefault;
+		ResetToDefault.bForceShow = false;
+		ResetToDefault.IsVisiblePropertyDelegate = InIsResetToDefaultVisible;
+		ResetToDefault.OnClickedPropertyDelegate = InResetToDefaultClicked;
+		ResetToDefault.bPropagateToChildren = InPropagateToChildren;
+		ResetToDefault.bForceHide = false;
+		return ResetToDefault;
+	} 
+
+	/** Create a FResetToDefaultOverride from a visibility attribute. */
+	static FResetToDefaultOverride Create(TAttribute<bool> InIsResetToDefaultVisible, const bool InPropagateToChildren = false)
+	{
+		FResetToDefaultOverride ResetToDefault;
+		ResetToDefault.bForceShow = false;
+		ResetToDefault.IsVisibleAttribute = InIsResetToDefaultVisible;
+		ResetToDefault.bPropagateToChildren = InPropagateToChildren;
+		ResetToDefault.bForceHide = false;
+		return ResetToDefault;
+	}
+
+	/** Create a FResetToDefaultOverride from a visibility attribute and a simple delegate. */
+	static FResetToDefaultOverride Create(TAttribute<bool> InIsResetToDefaultVisible, FSimpleDelegate InResetToDefaultClicked, const bool InPropagateToChildren = false)
+	{
+		FResetToDefaultOverride ResetToDefault;
+		ResetToDefault.bForceShow = false;
+		ResetToDefault.IsVisibleAttribute = InIsResetToDefaultVisible;
+		ResetToDefault.OnClickedDelegate = InResetToDefaultClicked;
+		ResetToDefault.bPropagateToChildren = InPropagateToChildren;
+		ResetToDefault.bForceHide = false;
+		return ResetToDefault;
+	}
+
+	/** Create a FResetToDefaultOverride from a simple delegate. */
+	static FResetToDefaultOverride Create(FSimpleDelegate InResetToDefaultClicked, const bool InPropagateToChildren = false)
+	{
+		FResetToDefaultOverride ResetToDefault;
+		ResetToDefault.bForceShow = true;
+		ResetToDefault.OnClickedDelegate = InResetToDefaultClicked;
+		ResetToDefault.bPropagateToChildren = InPropagateToChildren;
+		ResetToDefault.bForceHide = false;
+		return ResetToDefault;
+	}
+
+	/** Creates a FResetToDefaultOverride in which reset to default is never visible */
+	static FResetToDefaultOverride Hide(const bool InPropagateToChildren = false)
+	{
+		FResetToDefaultOverride HideResetToDefault;
+		HideResetToDefault.bForceShow = false;
+		HideResetToDefault.bForceHide = true;
+		HideResetToDefault.bPropagateToChildren = InPropagateToChildren;
+		return HideResetToDefault;
+	}
+
+	/** Called by the UI to show/hide the reset widgets */
+	bool IsResetToDefaultVisible(TSharedPtr<IPropertyHandle> Property) const
+	{
+		if (bForceShow)
+		{
+			return true;
+		}
+
+		if (bForceHide)
+		{
+			return false;
+		}
+
+		if (IsVisiblePropertyDelegate.IsBound() && Property.IsValid())
+		{
+			return IsVisiblePropertyDelegate.Execute(Property);
+		}
+
+		if (IsVisibleAttribute.IsSet())
+		{
+			return IsVisibleAttribute.Get();
+		}
+		
+		return false;
+	}
+
+	/** Does this have a custom reset to default handler? */
+	bool HasResetToDefaultHandler() const
+	{
+		return OnClickedPropertyDelegate.IsBound() || OnClickedDelegate.IsBound();
+	}
+
+	/** Called by the property editor to actually reset the property to default */
+	void OnResetToDefaultClicked(TSharedPtr<IPropertyHandle> PropertyHandle) const
+	{
+		if (PropertyHandle.IsValid() && OnClickedPropertyDelegate.IsBound())
+		{
+			PropertyHandle->ExecuteCustomResetToDefault(*this);
+		} 
+		else
+		{
+			OnClickedDelegate.ExecuteIfBound();
+		}
+	}
+
+	/** Get the actual delegate bound to this reset to default handler. */
+	FResetToDefaultHandler GetPropertyResetToDefaultDelegate() const { return OnClickedPropertyDelegate; }
+
+	/** Called by properties to determine whether this override should set on their children */
+	bool PropagatesToChildren() const
+	{
+		return bPropagateToChildren;
+	}
+
+private:
+	/** Callback to indicate whether or not reset to default is visible */
+	FIsResetToDefaultVisible IsVisiblePropertyDelegate;
+
+	/** Delegate called when reset to default is clicked */
+	FResetToDefaultHandler OnClickedPropertyDelegate;
+
+	/** Attribute to determine whether or not reset to default is visible */
+	TAttribute<bool> IsVisibleAttribute; 
+
+	/** Delegate called when reset to default is clicked */
+	FSimpleDelegate OnClickedDelegate;
+
+	/** Should properties pass this on to their children? */
+	bool bPropagateToChildren;
+
+	/** Ignore the visibility delegate and always show the reset to default widgets? */
+	bool bForceShow;
+
+	/** Ignore the visibility delegate and never show the reset to default widgets? */
+	bool bForceHide;
+};
+
+/**
+ * A single row for a property in a details panel                                                              
+ */
+class IDetailPropertyRow
+{
+public:
+	virtual ~IDetailPropertyRow(){}
+
+	/** @return the property handle for the property on this row */
+	virtual TSharedPtr<IPropertyHandle> GetPropertyHandle() const = 0;
+
+	/**
+	 * Sets the localized display name of the property
+	 *
+	 * @param InDisplayName	The name of the property
+	 */
+	virtual IDetailPropertyRow& DisplayName( const FText& InDisplayName ) = 0;
+
+	/**
+	 * Sets the localized tooltip of the property
+	 *
+	 * @param InToolTip	The tooltip of the property
+	 */
+	virtual IDetailPropertyRow& ToolTip( const FText& InToolTip ) = 0;
+
+	/**
+	 * Sets whether or not we show the default property editing buttons for this property
+	 *
+	 * @param bShowPropertyButtons	if true property buttons for this property will be shown.  
+	 */
+	virtual IDetailPropertyRow& ShowPropertyButtons( bool bShowPropertyButtons ) = 0;
+
+	/**
+	 * Sets an edit condition for this property.  If the edit condition fails, the property is not editable
+	 * This will add a checkbox before the name of the property that users can click to toggle the edit condition
+	 * Properties with built in edit conditions will override this automatically.  If the 
+	 *
+	 * @param EditConditionValue			Attribute for the value of the edit condition (true indicates that the edit condition passes)
+	 * @param OnEditConditionValueChanged	Delegate called when the edit condition value changes
+	 */
+	virtual IDetailPropertyRow& EditCondition( TAttribute<bool> EditConditionValue, FOnBooleanValueChanged OnEditConditionValueChanged ) = 0;
+
+	/**
+	 * Sets whether or not this property is enabled
+	 *
+	 * @param InIsEnabled	Attribute for the enabled state of the property (true to enable the property)
+	 */
+	virtual IDetailPropertyRow& IsEnabled( TAttribute<bool> InIsEnabled ) = 0;
+	
+
+	/**
+	 * Sets whether or not this property should auto-expand
+	 *
+	 * @param bForceExpansion	true to force the property to be expanded
+	 */
+	virtual IDetailPropertyRow& ShouldAutoExpand(bool bForceExpansion = true) = 0;
+
+	/**
+	 * Sets the visibility of this property
+	 *
+	 * @param Visibility	Attribute for the visibility of this property
+	 */
+	virtual IDetailPropertyRow& Visibility( TAttribute<EVisibility> Visibility ) = 0;
+
+	/**
+	 * Overrides the behavior of reset to default
+	 *
+	 * @param ResetToDefault	Contains the delegates needed to override the behavior of reset to default
+	 */
+	virtual IDetailPropertyRow& OverrideResetToDefault(const FResetToDefaultOverride& ResetToDefault) = 0;
+
+	/**
+	 * Sets a handler for this property row to be a source or target of drag-and-drop operations
+	 * 
+	 * @param InDragDropHandler	Handler used when starting a drag or accepting a drop operation
+	 */
+	virtual IDetailPropertyRow& DragDropHandler(TSharedPtr<IDetailDragDropHandler> InDragDropHandler) = 0;
+
+	/**
+	 * Returns the name and value widget of this property row.  You can use this widget to apply further customization to existing widgets (by using this  with CustomWidget)
+	 *
+	 * @param OutNameWidget		The default name widget
+	 * @param OutValueWidget	The default value widget
+	 */
+	virtual void GetDefaultWidgets( TSharedPtr<SWidget>& OutNameWidget, TSharedPtr<SWidget>& OutValueWidget, bool bAddWidgetDecoration = false ) = 0;
+
+	/**
+	 * Returns the name and value widget of this property row.  You can use this widget to apply further customization to existing widgets (by using this  with CustomWidget)
+	 *
+	 * @param OutNameWidget		The default name widget
+	 * @param OutValueWidget	The default value widget
+	 * @param OutCustomRow		The default widget row
+	 */
+	virtual void GetDefaultWidgets( TSharedPtr<SWidget>& OutNameWidget, TSharedPtr<SWidget>& OutValueWidget, FDetailWidgetRow& Row, bool bAddWidgetDecoration = false ) = 0;
+
+	/**
+	 * Overrides the property widget. Destroys any existing custom property widgets.
+	 *
+	 * @param bShowChildren	Whether or not to still show any children of this property
+	 * @return a row for the property that custom widgets can be added to
+	 */
+	virtual FDetailWidgetRow& CustomWidget( bool bShowChildren = false ) = 0;
+
+	/**
+	 * Gives a non-owning pointer to name widget on existing custom property widget if it exists.
+	 *
+	 * @return	Pointer to name widget if custom property widget already exists, nullptr otherwise
+	 */
+	virtual FDetailWidgetDecl* CustomNameWidget() = 0;
+
+	/**
+	 * Gives a non-owning pointer to value widget on existing custom property widget if it exists.
+	 *
+	 * @return	Pointer to value widget if custom property widget already exists, nullptr otherwise
+	 */
+	virtual FDetailWidgetDecl* CustomValueWidget() = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailRootObjectCustomization.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailRootObjectCustomization.h
new file mode 100644
index 0000000..00c217f
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailRootObjectCustomization.h
@@ -0,0 +1,119 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+class SWidget;
+class ITableRow;
+
+namespace soda
+{
+
+/** Defines a set of objects and a common base class between them for a root object customization */
+struct FDetailsObjectSet
+{
+	/** List of objects that represent the root in the details panel */
+	TArray<const UObject*> RootObjects;
+
+	/** The most common base class between all root objects */
+	const UClass* CommonBaseClass;
+};
+
+/** 
+ * Interface for any class that lays out details for a specific class
+ */
+class IDetailRootObjectCustomization : public TSharedFromThis<IDetailRootObjectCustomization>
+{
+public:
+	enum EExpansionArrowUsage
+	{
+		Custom,
+		Default,
+		None,
+	};
+
+	virtual ~IDetailRootObjectCustomization() {}
+
+	/**
+	 * Called when the details panel wants to display an object header widget for a given object
+	 *
+	 * @param	InRootObjects	The object set whose header is being customized
+	 */
+	virtual TSharedPtr<SWidget> CustomizeObjectHeader(const FDetailsObjectSet& InRootObjectSet)
+	{ 
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		return CustomizeObjectHeader(InRootObjectSet.RootObjects[0]);
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS
+	}
+
+	/** 
+	 * Called when the details panel wants to display an object header widget for a given object
+	 *
+	 * @param	InRootObjects	The object set whose header is being customized
+	 * @param	InTableRow		The ITableRow object (table views to talk to their rows) that will use the current IDetailRootObjectCustomization element.  This may be null if the customization is not being shown in a table view
+ 	 */
+	virtual TSharedPtr<SWidget> CustomizeObjectHeader(const FDetailsObjectSet& InRootObjectSet, const TSharedPtr<ITableRow>& InTableRow)
+	{
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		return CustomizeObjectHeader(InRootObjectSet.RootObjects[0], InTableRow);
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS
+	}
+
+	/**
+	 * Whether or not the objects and all of its children should be visible in the details panel
+	 */
+	virtual bool AreObjectsVisible(const FDetailsObjectSet& InRootObjectSet) const
+	{
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		return IsObjectVisible(InRootObjectSet.RootObjects[0]);
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS
+	}
+
+	/**
+	 * Whether or not the object should have a header displayed or just show the children directly
+	 *
+	 * @return true if the this customization should be displayed or false to just show the children directly
+	 */
+	virtual bool ShouldDisplayHeader(const FDetailsObjectSet& InRootObjectSet) const
+	{
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		return ShouldDisplayHeader(InRootObjectSet.RootObjects[0]);
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS
+	}
+
+	UE_DEPRECATED(4.25, "Please use the CustomizeObjectHeader version which takes in an array of root objects")
+	virtual TSharedPtr<SWidget> CustomizeObjectHeader(const UObject* InRootObject)
+	{
+		return nullptr;
+	}
+
+	UE_DEPRECATED(4.25, "Please use the CustomizeObjectHeader version which takes in an array of root objects")
+	virtual TSharedPtr<SWidget> CustomizeObjectHeader(const UObject* InRootObject, const TSharedPtr<ITableRow>& InTableRow)
+	{
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		return CustomizeObjectHeader(InRootObject);
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS
+	}
+
+	UE_DEPRECATED(4.25, "Please use the AreObjectsVisible instead")
+	virtual bool IsObjectVisible(const UObject* InRootObject) const { return true; }
+
+	UE_DEPRECATED(4.25, "Please use the ShouldDisplayHeader version which takes in an array of objects instead")
+	virtual bool ShouldDisplayHeader(const UObject* InRootObject) const
+	{
+		return true;
+	}
+
+	/**
+	 * Gets the setup for expansion arrows in this customization
+	 */
+	virtual EExpansionArrowUsage GetExpansionArrowUsage() const
+	{ 
+		// Note: Returns none for backwards compatibility
+		return EExpansionArrowUsage::None; 
+	}
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailTreeNode.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailTreeNode.h
new file mode 100644
index 0000000..8f99b60
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailTreeNode.h
@@ -0,0 +1,184 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Types/SlateEnums.h"
+#include "Framework/Commands/UIAction.h"
+#include "Textures/SlateIcon.h"
+
+class SWidget;
+
+namespace soda
+{
+
+class IDetailsView;
+class IDetailPropertyRow;
+class IPropertyHandle;
+
+enum class EDetailNodeType
+{
+	/** Node represents a category */
+	Category,
+	/** Node represents an item such as a property or widget */
+	Item,
+	/** Node represents an advanced dropdown */
+	Advanced,
+	/** Represents a top level object node if a view supports multiple root objects */
+	Object,
+};
+
+/** Layout data for node's content widgets. */
+struct FNodeWidgetLayoutData
+{
+	FNodeWidgetLayoutData()
+	{
+	}
+
+	FNodeWidgetLayoutData(EHorizontalAlignment InHorizontalAlignment, EVerticalAlignment InVerticalAlignment, TOptional<float> InMinWidth, TOptional<float> InMaxWidth)
+		: HorizontalAlignment(InHorizontalAlignment)
+		, VerticalAlignment(InVerticalAlignment)
+		, MinWidth(InMinWidth)
+		, MaxWidth(InMaxWidth)
+	{
+	}
+
+	/** The horizontal alignment requested by the widget. */
+	EHorizontalAlignment HorizontalAlignment;
+
+	/** The vertical alignment requested by the widget. */
+	EVerticalAlignment VerticalAlignment;
+
+	/** An optional minimum width requested by the widget. */
+	TOptional<float> MinWidth;
+
+	/** An optional maximum width requested by the widget. */
+	TOptional<float> MaxWidth;
+};
+
+/* Defines a custom menu action which can be performed on a detail tree node. */
+struct FNodeWidgetActionsCustomMenuData
+{
+	FNodeWidgetActionsCustomMenuData(const FUIAction& InAction, const FText& InName, const FText& InTooltip, const FSlateIcon& InSlateIcon)
+		: Action(InAction)
+		, Name(InName)
+		, Tooltip(InTooltip)
+		, SlateIcon(InSlateIcon)
+	{
+	}
+
+	/* The action to be performed. */
+	const FUIAction Action;
+
+	/* The name to display for the menu item. */
+	const FText Name;
+
+	/* The tooltip to the display for the menu item. */
+	const FText Tooltip;
+
+	/* The icon to display for the menu item. */
+	const FSlateIcon SlateIcon;
+};
+
+/** Defines actions which can be performed on node widgets. */
+struct FNodeWidgetActions
+{
+	/** Action for copying data on this node */
+	FUIAction CopyMenuAction;
+
+	/** Action for pasting data on this node */
+	FUIAction PasteMenuAction;
+
+	/** Custom Actions on this node */
+	TArray<FNodeWidgetActionsCustomMenuData> CustomMenuItems;
+};
+
+/** The widget contents of the node.  Any of these can be null depending on how the row was generated */
+struct FNodeWidgets
+{
+	/** Widget for the name column */
+	TSharedPtr<SWidget> NameWidget;
+
+	/** Layout data for the widget in the name column. */
+	FNodeWidgetLayoutData NameWidgetLayoutData;
+
+	/** Widget for the value column*/
+	TSharedPtr<SWidget> ValueWidget;
+
+	/** Layout data for the widget in the value column. */
+	FNodeWidgetLayoutData ValueWidgetLayoutData;
+
+	/** Widget that spans the entire row.  Mutually exclusive with name/value widget */
+	TSharedPtr<SWidget> WholeRowWidget;
+
+	/** Layout data for the whole row widget. */
+	FNodeWidgetLayoutData WholeRowWidgetLayoutData;
+
+	/** Edit condition widget. */
+	TSharedPtr<SWidget> EditConditionWidget;
+
+	/** The actions which can be performed on the node widgets. */
+	FNodeWidgetActions Actions;
+};
+
+class IDetailTreeNode
+{
+public:
+	virtual ~IDetailTreeNode() {}
+
+	/** 
+	 * @return Get the details view that this node is contained in.
+	 */
+	virtual IDetailsView* GetNodeDetailsView() const = 0;
+
+	/**
+	 * @return The type of this node.  Should be used to determine any external styling to apply to the generated r ow
+	 */
+	virtual EDetailNodeType GetNodeType() const = 0;
+
+	/** 
+	 * Creates a handle to the property on this row if the row represents a property. Only compatible with item node types that are properties
+	 * 
+	 * @return The property handle for the row or null if the node doesn't have a property 
+	 */
+	virtual TSharedPtr<IPropertyHandle> CreatePropertyHandle() const = 0;
+
+	/**
+	 * Creates the slate widgets for this row. 
+	 *
+	 * @return the node widget structure with either name/value pair or a whole row widget
+	 */
+	virtual FNodeWidgets CreateNodeWidgets() const = 0;
+
+	/**
+	 * Gets the children of this tree node    
+	 * Note: Customizations can determine the visibility of children.  This will only return visible children
+	 *
+	 * @param OutChildren	The generated children
+	 */
+	virtual void GetChildren(TArray<TSharedRef<IDetailTreeNode>>& OutChildren) = 0;
+
+	/**
+	 * Gets an identifier name for this node.  This is not a name formatted for display purposes, but can be useful for storing
+	 * UI state like if this row is expanded.
+	 */
+	virtual FName GetNodeName() const = 0;
+
+	/**
+	 * Get the property row that this node is represented by.
+	 */
+	virtual TSharedPtr<IDetailPropertyRow> GetRow() const = 0;
+
+	/**
+	 * Gets the filter strings for this node in the tree.
+	 */
+	virtual void GetFilterStrings(TArray<FString>& OutFilterStrings) const = 0;
+
+	/**
+	 * Gets if this node should be initially collapsed by default.
+	 */
+	virtual bool GetInitiallyCollapsed() const = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailsView.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailsView.h
new file mode 100644
index 0000000..a0ff98d
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IDetailsView.h
@@ -0,0 +1,270 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/PropertyEditorDelegates.h"
+#include "Framework/Commands/UICommandList.h"
+#include "RuntimePropertyEditor/DetailsViewArgs.h"
+
+class AActor;
+class FNotifyHook;
+class FTabManager;
+class FUICommandList;
+
+namespace soda
+{
+class FPropertyPath;
+class IDetailKeyframeHandler;
+class IDetailPropertyExtensionHandler;
+class IDetailRootObjectCustomization;
+class IPropertyTypeIdentifier;
+class FDetailsViewObjectFilter;
+class FComplexPropertyNode;
+
+typedef TArray<TSharedPtr<FComplexPropertyNode>> FRootPropertyNodeList;
+
+DECLARE_DELEGATE_RetVal_OneParam(bool, FOnValidateDetailsViewPropertyNodes, const FRootPropertyNodeList&)
+
+/**
+ * Interface class for all detail views
+ */
+class IDetailsView : public SCompoundWidget
+{
+public:
+	/** Sets the callback for when the property view changes */
+	virtual void SetOnObjectArrayChanged(FOnObjectArrayChanged OnObjectArrayChangedDelegate) = 0;
+
+	/** List of all selected objects we are inspecting */
+	virtual const TArray< TWeakObjectPtr<UObject> >& GetSelectedObjects() const = 0;
+
+	/** @return	Returns list of selected actors we are inspecting */
+	virtual const TArray< TWeakObjectPtr<AActor> >& GetSelectedActors() const = 0;
+
+	/** @return Returns information about the selected set of actors */
+	//virtual const struct FSelectedActorInfo& GetSelectedActorInfo() const = 0;
+
+	/** @return Whether or not the details view is viewing a CDO */
+	virtual bool HasClassDefaultObject() const = 0;
+
+	/**
+	 * Registers a custom detail layout delegate for a specific class in this instance of the details view only
+	 *
+	 * @param Class	The class the custom detail layout is for
+	 * @param DetailLayoutDelegate	The delegate to call when querying for custom detail layouts for the classes properties
+	 */
+	virtual void RegisterInstancedCustomPropertyLayout(UStruct* Class, FOnGetDetailCustomizationInstance DetailLayoutDelegate) = 0;
+	virtual void RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) = 0; 
+
+	/**
+	 * Unregisters a custom detail layout delegate for a specific class in this instance of the details view only
+	 *
+	 * @param Class	The class with the custom detail layout delegate to remove
+	 */
+	virtual void UnregisterInstancedCustomPropertyLayout(UStruct* Class) = 0;
+	virtual void UnregisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) = 0;
+
+	/**
+	 * Registers a customization that will be used only if this details panel contains multiple top level objects.
+	 * I.E it was created with bAllowMultipleTopLevelObjects = true.	This interface will be used to customize the header for each top level object in the details panel
+	 *
+	 * @param InRootObjectCustomization	If null is passed in, the customization will be removed
+	 */
+	virtual void SetRootObjectCustomizationInstance(TSharedPtr<class IDetailRootObjectCustomization> InRootObjectCustomization) = 0;
+
+	/**
+	 * Sets the objects this details view is viewing
+	 *
+	 * @param InObjects		The list of objects to observe
+	 * @param bForceRefresh	If true, doesn't check if new objects are being set
+	 * @param bOverrideLock	If true, will set the objects even if the details view is locked
+	 */
+	virtual void SetObjects( const TArray<UObject*>& InObjects, bool bForceRefresh = false, bool bOverrideLock = false ) = 0;
+	virtual void SetObjects( const TArray< TWeakObjectPtr< UObject > >& InObjects, bool bForceRefresh = false, bool bOverrideLock = false ) = 0;
+
+	/**
+	 * Sets a single object that details view is viewing
+	 *
+	 * @param InObject		The object to view
+	 * @param bForceRefresh	If true, doesn't check if new objects are being set
+	 */
+	virtual void SetObject( UObject* InObject, bool bForceRefresh = false ) = 0;
+
+	/** Removes all invalid objects being observed by this details panel */
+	virtual void RemoveInvalidObjects() = 0;
+
+	/** Set overrides that should be used when looking for packages that contain the given object (used when editing a transient copy of an object, but you need access to th real package) */
+	virtual void SetObjectPackageOverrides(const TMap<TWeakObjectPtr<UObject>, TWeakObjectPtr<UPackage>>& InMapping) = 0;
+
+	/**
+	 * Returns true if the details view is locked and cant have its observed objects changed 
+	 */
+	virtual bool IsLocked() const = 0;
+
+	/**
+	 * @return true if the details view can be updated from editor selection
+	 */
+	virtual bool IsUpdatable() const = 0;
+
+	/**
+	 * @return True if there is any filter of properties active in this details panel
+	 */
+	virtual bool HasActiveSearch() const = 0;
+	
+	/** 
+	 * Clears any search terms in the current filter
+	 */
+	virtual void ClearSearch() = 0;
+
+	/**
+	 * @return The number of visible top level objects. This value is affected by filtering. 
+	 * Note: this value will always be 1 if this details panel was not created with bAllowMultipleTopLevelObjects=true
+	 */
+	virtual int32 GetNumVisibleTopLevelObjects() const = 0;
+
+	/** @return The identifier for this details view, or NAME_None is this view is anonymous */
+	virtual FName GetIdentifier() const = 0;
+
+	/**
+	 * Sets a delegate to call to determine if a specific property should be visible in this instance of the details view
+	 */ 
+	virtual void SetIsPropertyVisibleDelegate( FIsPropertyVisible InIsPropertyVisible ) = 0;
+	virtual FIsPropertyVisible& GetIsPropertyVisibleDelegate() = 0;
+
+	/**
+	 * Sets a delegate to call to determine if a specific property should be read-only in this instance of the details view
+	 */ 
+	virtual void SetIsPropertyReadOnlyDelegate( FIsPropertyReadOnly InIsPropertyReadOnly ) = 0;
+	virtual FIsPropertyReadOnly& GetIsPropertyReadOnlyDelegate() = 0;
+
+	/**
+	 * Sets a delegate to call to determine if a specific custom row should be visible in this instance of the details view
+	 */
+	virtual void SetIsCustomRowVisibleDelegate(FIsCustomRowVisible InIsCustomRowVisible) = 0;
+	virtual FIsCustomRowVisible& GetIsCustomRowVisibleDelegate() = 0;
+
+	/**
+	 * Sets a delegate to call to determine if a specific custom row should be visible in this instance of the details view
+	 */
+	virtual void SetIsCustomRowReadOnlyDelegate(FIsCustomRowReadOnly InIsCustomRowVisible) = 0;
+	virtual FIsCustomRowReadOnly& GetIsCustomRowReadOnlyDelegate() = 0;
+
+	/**
+	 * Sets a delegate to call to layout generic details not specific to an object being viewed
+	 */ 
+	virtual void SetGenericLayoutDetailsDelegate( FOnGetDetailCustomizationInstance OnGetGenericDetails ) = 0;
+	virtual FOnGetDetailCustomizationInstance& GetGenericLayoutDetailsDelegate() = 0;
+
+	/**
+	 * Sets a delegate to call to determine if the properties  editing is enabled
+	 */ 
+	virtual void SetIsPropertyEditingEnabledDelegate( FIsPropertyEditingEnabled IsPropertyEditingEnabled ) = 0;
+	virtual FIsPropertyEditingEnabled& GetIsPropertyEditingEnabledDelegate() = 0;
+
+	virtual void SetKeyframeHandler( TSharedPtr<IDetailKeyframeHandler> InKeyframeHandler ) = 0;
+	virtual TSharedPtr<IDetailKeyframeHandler> GetKeyframeHandler() const = 0;
+
+	virtual void SetExtensionHandler(TSharedPtr<IDetailPropertyExtensionHandler> InExtensionHandler) = 0;
+	virtual TSharedPtr<IDetailPropertyExtensionHandler> GetExtensionHandler() const = 0;
+
+	/**
+	 * @return true if property editing is enabled (based on the FIsPropertyEditingEnabled delegate)
+	 */ 
+	virtual bool IsPropertyEditingEnabled() const = 0;
+
+	/**
+	 * A delegate which is called after properties have been edited and PostEditChange has been called on all objects.
+	 * This can be used to safely make changes to data that the details panel is observing instead of during PostEditChange (which is
+	 * unsafe)
+	 */
+	virtual FOnFinishedChangingProperties& OnFinishedChangingProperties() const = 0;
+
+	/** 
+	 * Sets the visible state of the filter box/property grid area
+	 */
+	virtual void HideFilterArea(bool bIsVisible) = 0;
+
+	/**
+	 * Returns a list of all the properties displayed (via full path), order in list corresponds to draw order:
+	 */
+	virtual TArray< FPropertyPath > GetPropertiesInOrderDisplayed() const = 0;
+
+	/**
+	 * Creates a box around the treenode corresponding to Property and scrolls the treenode into view
+	 */
+	virtual void HighlightProperty(const FPropertyPath& Property) = 0;
+	
+	/**
+	 * Forces all advanced property sections to be in expanded state:
+	 */
+	virtual void ShowAllAdvancedProperties() = 0;
+	
+	/**
+	 * Refreshes the visibility of root objects in this details view. 
+	 * Note: This method has no effect if the details panel is viewing a single top-level object set only
+	 */
+	virtual void RefreshRootObjectVisibility() = 0;
+	/**
+	 * Assigns delegate called when view is filtered, useful for updating external control logic:
+	 */
+	virtual void SetOnDisplayedPropertiesChanged(FOnDisplayedPropertiesChanged InOnDisplayedPropertiesChangedDelegate) = 0;
+	virtual FOnDisplayedPropertiesChanged& GetOnDisplayedPropertiesChanged() = 0;
+
+	/**
+	 * Disables or enables customization of the details view:
+	 */
+	virtual void SetDisableCustomDetailLayouts(bool bInDisableCustomDetailLayouts) = 0;
+
+	/**
+	 * Sets the set of properties that are considered differing, used when filtering out identical properties
+	 */
+	virtual void UpdatePropertyAllowList(const TSet<FPropertyPath> InAllowedProperties) = 0;
+
+	/** Returns the name area widget used to display object naming functionality so it can be placed in a custom location.  Note FDetailsViewArgs.bCustomNameAreaLocation must be true */
+	virtual TSharedPtr<SWidget> GetNameAreaWidget() = 0;
+
+	/** Optionally add custom tools into the NameArea */
+	virtual void SetNameAreaCustomContent(TSharedRef<SWidget>& InCustomContent) = 0;
+
+	/** Returns the search area widget used to display search and view options so it can be placed in a custom location.  Note FDetailsViewArgs.bCustomFilterAreaLocation must be true */
+	virtual TSharedPtr<SWidget> GetFilterAreaWidget() = 0;
+
+	/** Returns the command list of the hosting toolkit (can be nullptr if the widget that contains the details panel didn't route a command list in) */
+	virtual TSharedPtr<FUICommandList> GetHostCommandList() const = 0;
+
+	/** Returns the tab manager of the hosting toolkit (can be nullptr if the details panel is not hosted within a tab) */
+	virtual TSharedPtr<FTabManager> GetHostTabManager() const = 0;
+
+	/** Sets the tab manager of the hosting toolkit (can be nullptr if the details panel is not hosted within a tab) */
+	virtual void SetHostTabManager(TSharedPtr<FTabManager> InTabManager) = 0;
+
+	/** Force refresh */
+	virtual void ForceRefresh() = 0;
+
+	/** Invalidates any cached state without necessarily doing a complete rebuild. */
+	virtual void InvalidateCachedState()
+	{
+		ForceRefresh();
+	}
+	
+	/** Sets an optional object filter to use for more complex handling of what a details panel is viewing. */
+	virtual void SetObjectFilter(TSharedPtr<FDetailsViewObjectFilter> InFilter) = 0;
+
+	/** Sets the custom filter(s) to be used when selecting values for class properties in this view. */
+	virtual void SetClassViewerFilters(const TArray<TSharedRef<class IClassViewerFilter>>& InFilters) = 0;
+
+	/** Allows other systems to add a custom filter in the details panel */
+	virtual void SetCustomFilterDelegate(FSimpleDelegate InDelegate) = 0;
+
+	virtual void SetCustomFilterLabel(FText InText) = 0;
+
+		/* Use this function to set a callback for SDetailsView that will skip the EnsureDataIsValid call in Tick.
+	 * This is useful if your implementation doesn't need to validate nodes every tick or needs to perform some other form of validation. */
+	virtual void SetCustomValidatePropertyNodesFunction(FOnValidateDetailsViewPropertyNodes InCustomValidatePropertyNodesFunction) = 0;
+
+
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyChangeListener.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyChangeListener.h
new file mode 100644
index 0000000..8f3ed72
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyChangeListener.h
@@ -0,0 +1,62 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+struct FPropertyListenerSettings
+{
+	/** Flags a property must have to be observed for changes */
+	uint64 RequiredPropertyFlags;
+	
+	/** Flags that a property must not have to be observed for changes */
+	uint64 DisallowedPropertyFlags;
+
+	/** Whether or not to ignore object properties */
+	bool bIgnoreObjectProperties;
+
+	/** Whether or not to ignore arrays (not the array elements but the array property itself */
+	bool bIgnoreArrayProperties;
+};
+
+/**
+ * Interface to a property change listener that broadcasts notifications when a property changes
+ */
+class IPropertyChangeListener
+{
+public:
+	/** Delegate called when a property changes */
+	DECLARE_MULTICAST_DELEGATE_TwoParams( FOnPropertyChanged, const TArray<UObject*>&, const class IPropertyHandle&  );
+
+	/**
+	 * Sets the object that should be listened to for changes
+	 *
+	 * @param Object						The object to listen to
+	 * @param InPropertyListenerSettings	Settings for which properties should be listened to
+	 */
+	virtual void SetObject( UObject& Object, const FPropertyListenerSettings& InPropertyListenerSettings ) = 0;
+
+	/**
+	 * Scans properties for changes
+	 *
+	 * @param bRecacheNewValues	If true recaches new values found for the next scan
+	 * @return true if any changes were found
+	 */
+	virtual bool ScanForChanges( bool bRecacheNewValues = true ) = 0;
+	
+	/**
+	 * Triggers all property changed delegates to fire
+	 */
+	virtual void TriggerAllPropertiesChangedDelegate() = 0;
+
+	/**
+	 * @return A delegate to call when a property changes
+	 */
+	virtual FOnPropertyChanged& GetOnPropertyChangedDelegate() = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyRowGenerator.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyRowGenerator.h
new file mode 100644
index 0000000..119415e
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyRowGenerator.h
@@ -0,0 +1,126 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimeEditorModule.h"
+
+class FStructOnScope;
+
+namespace soda
+{
+
+class IDetailTreeNode;
+class FComplexPropertyNode;
+
+DECLARE_DELEGATE_RetVal_OneParam(bool, FOnValidatePropertyRowGeneratorNodes, const FRootPropertyNodeList&)
+
+struct FPropertyRowGeneratorArgs
+{
+	FPropertyRowGeneratorArgs()
+		: NotifyHook(nullptr)
+		, DefaultsOnlyVisibility(EEditDefaultsOnlyNodeVisibility::Show)
+		, bAllowMultipleTopLevelObjects(false)
+		, bShouldShowHiddenProperties(false)
+		, bAllowEditingClassDefaultObjects(true)
+		, bGameModeOnlyVisible(false)
+	{}
+
+	/** Notify hook to call when properties are changed */
+	FNotifyHook* NotifyHook;
+
+	/** Controls how CPF_DisableEditOnInstance nodes will be treated */
+	EEditDefaultsOnlyNodeVisibility DefaultsOnlyVisibility;
+
+	/** Whether the root node should contain multiple objects. */
+	bool bAllowMultipleTopLevelObjects;
+
+	/** Whether the generator should generate hidden properties. */
+	bool bShouldShowHiddenProperties;
+
+	/** Whether the generator should allow editing CDOs. */
+	bool bAllowEditingClassDefaultObjects;
+
+	/** */
+	bool bGameModeOnlyVisible;
+};
+
+class IPropertyRowGenerator
+{
+public:
+	virtual ~IPropertyRowGenerator() {}
+
+	/**
+	 * Sets the objects that should be used to generate rows
+	 *
+	 * @param InObjects	The list of objects to generate rows from.  Note unless FPropertyRowGeneratorArgs.bAllowMultipleTopLevelObjects is set to true, the properties used will be the common base class of all passed in objects
+	 */
+	virtual void SetObjects(const TArray<UObject*>& InObjects) = 0;
+
+	/**
+	 * Sets the structure that should be used to generate rows
+	 *
+	 * @param InStruct The structure used to generate rows from.
+	 */
+	virtual void SetStructure(const TSharedPtr<FStructOnScope>& InStruct) = 0;
+
+	/**
+	 * Get the list of objects that were used to generate detail tree nodes
+	 * @return A list of weak pointers to this generator's objects.
+	 */
+	virtual const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const = 0;
+
+	/**
+	 * Delegate called when rows have been refreshed.  This delegate should always be bound to something because once this is called, none of the rows previously generated can be trusted
+	 */
+	DECLARE_EVENT(IPropertyRowGenerator, FOnRowsRefreshed);
+	virtual FOnRowsRefreshed& OnRowsRefreshed() = 0;
+
+	/** 
+	 * @return The list of root tree nodes that have been generated.  Note: There will only be one root node unless  FPropertyRowGeneratorArgs.bAllowMultipleTopLevelObjects was set to true when the generator was created
+	 */
+	virtual const TArray<TSharedRef<IDetailTreeNode>>& GetRootTreeNodes() const = 0;
+
+	/**
+	 * Finds a tree node by property handle.  
+	 * 
+	 * @return The found tree node or null if the node cannot be found
+	 */
+	virtual TSharedPtr<IDetailTreeNode> FindTreeNode(TSharedPtr<IPropertyHandle> PropertyHandle) const = 0;
+
+	/**
+	* Finds tree nodes by property handles.
+	* 
+	* @return The found tree nodes (in the same order, a pointer will be null if the node cannot be found)
+	*/
+	virtual TArray<TSharedPtr<IDetailTreeNode>> FindTreeNodes(const TArray<TSharedPtr<IPropertyHandle>>& PropertyHandles) const = 0;
+
+	/**
+	 * Registers a custom detail layout delegate for a specific class in this instance of the generator only
+	 *
+	 * @param Class	The class the custom detail layout is for
+	 * @param DetailLayoutDelegate	The delegate to call when querying for custom detail layouts for the classes properties
+	 */
+	virtual void RegisterInstancedCustomPropertyLayout(UStruct* Class, FOnGetDetailCustomizationInstance DetailLayoutDelegate) = 0;
+	virtual void RegisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) = 0;
+
+	/**
+	 * Unregisters a custom detail layout delegate for a specific class in this instance of the generator only
+	 *
+	 * @param Class	The class with the custom detail layout delegate to remove
+	 */
+	virtual void UnregisterInstancedCustomPropertyLayout(UStruct* Class) = 0;
+	virtual void UnregisterInstancedCustomPropertyTypeLayout(FName PropertyTypeName, TSharedPtr<IPropertyTypeIdentifier> Identifier = nullptr) = 0;
+
+	virtual FOnFinishedChangingProperties& OnFinishedChangingProperties() = 0;
+
+	/* Use this function to set a callback on FPropertyRowGenerator that will override the ValidatePropertyNodes function.
+	 * This is useful if your implementation doesn't need to validate nodes every tick or needs to perform some other form of validation. */
+	virtual void SetCustomValidatePropertyNodesFunction(FOnValidatePropertyRowGeneratorNodes InCustomValidatePropertyNodesFunction) = 0;
+
+	/* Invalidates internal cached state.  Common use of this API is to synchronize the viewed object with changes made by external code. */
+	virtual void InvalidateCachedState() = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTable.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTable.h
new file mode 100644
index 0000000..22fc49f
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTable.h
@@ -0,0 +1,168 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "UObject/UnrealType.h"
+#include "Widgets/Views/SHeaderRow.h"
+#include "Framework/Views/ITypedTableView.h"
+#include "RuntimePropertyEditor/IPropertyTableUtilities.h"
+#include "UObject/WeakFieldPtr.h"
+
+namespace soda
+{
+
+class FPropertyPath;
+class IPropertyTableCell;
+class IPropertyTableColumn;
+class IPropertyTableRow;
+
+namespace EPropertyTableSelectionUnit
+{
+	enum Type
+	{
+		None = 0x00,
+		Row  = 0x01,
+		Cell = 0x03
+	};
+}
+
+
+namespace EPropertyTableOrientation
+{
+	enum Type
+	{
+		AlignPropertiesInColumns, // Items and all their properties are in rows
+		AlignPropertiesInRows, // Items and all their properties are in columns
+	};
+}
+
+class IDataSource
+{
+public:
+
+	virtual TWeakObjectPtr< UObject > AsUObject() const = 0;
+	virtual TSharedPtr< class FPropertyPath > AsPropertyPath() const = 0;
+
+	virtual bool IsValid() const = 0;
+};
+
+class IPropertyTable : public IPropertyTableUtilities
+{
+public: 
+
+	virtual void Tick() = 0;
+
+	virtual void ForceRefresh() = 0;
+	virtual void RequestRefresh() = 0;
+
+	virtual void AddColumn( const TWeakObjectPtr< class UObject >& Object ) = 0;
+	virtual void AddColumn( const TWeakFieldPtr< class FProperty >& Property ) = 0;
+	virtual void AddColumn( const TSharedRef< class FPropertyPath >& PropertyPath ) = 0;
+	virtual void AddColumn( const TSharedRef< class IPropertyTableColumn >& Column ) = 0;
+	virtual void RemoveColumn( const TSharedRef< class IPropertyTableColumn >& Column ) = 0;
+
+	virtual void AddRow( const TWeakObjectPtr< UObject >& Object ) = 0;
+	virtual void AddRow( const TWeakFieldPtr< FProperty >& Property ) = 0;
+	virtual void AddRow( const TSharedRef< FPropertyPath >& PropertyPath ) = 0;
+	virtual void AddRow( const TSharedRef< class IPropertyTableRow >& Row ) = 0;
+	virtual void RemoveRow( const TSharedRef< class IPropertyTableRow >& Row ) = 0;
+
+	virtual const EPropertyTableOrientation::Type GetOrientation() const = 0;
+	virtual void SetOrientation( EPropertyTableOrientation::Type InOrientation ) = 0;
+
+	virtual bool GetIsUserAllowedToChangeRoot() = 0;
+	virtual void SetIsUserAllowedToChangeRoot( bool InAllowUserToChangeRoot ) = 0;
+
+	virtual void SetRootPath( const TSharedPtr< FPropertyPath >& Path ) = 0;
+	virtual TSharedRef< FPropertyPath> GetRootPath() const = 0;
+	virtual TArray< struct FPropertyInfo > GetPossibleExtensionsForPath( const TSharedRef< FPropertyPath >& Path ) const = 0;
+
+	virtual void GetSelectedTableObjects( TArray< TWeakObjectPtr< UObject > >& OutSelectedObjects) const = 0;
+
+	virtual void SetObjects( const TArray< TWeakObjectPtr< UObject > >& Objects ) = 0;
+	virtual void SetObjects( const TArray< UObject* >& Objects ) = 0;
+
+	virtual TSharedRef< class FObjectPropertyNode > GetObjectPropertyNode( const TSharedRef< class IPropertyTableColumn >& Column, const TSharedRef< class IPropertyTableRow >& Row ) = 0;
+	virtual TSharedRef< class FObjectPropertyNode > GetObjectPropertyNode( const TWeakObjectPtr< UObject >& Object ) = 0;
+
+	virtual bool GetShowRowHeader() const = 0;
+	virtual void SetShowRowHeader( const bool ShowRowHeader ) = 0;
+
+	virtual bool GetShowObjectName() const = 0;
+	virtual void SetShowObjectName( const bool ShowObjectName ) = 0;
+
+	virtual const TArray< TSharedRef< class IPropertyTableColumn > >& GetColumns() = 0;
+
+	virtual void SelectCellRange( const TSharedRef< class IPropertyTableCell >& StartingCell, const TSharedRef< class IPropertyTableCell >& EndingCell ) = 0;
+
+	virtual TArray< TSharedRef< class IPropertyTableRow > >& GetRows() = 0;
+	virtual const TSet< TSharedRef< class IPropertyTableRow > >& GetSelectedRows() = 0;
+	virtual void SetSelectedRows( const TSet< TSharedRef< class IPropertyTableRow > >& InSelectedRows ) = 0;
+
+	virtual const TSet< TSharedRef< class IPropertyTableCell > >& GetSelectedCells() = 0;
+	virtual void SetSelectedCells( const TSet< TSharedRef< class IPropertyTableCell > >& InSelectedCells ) = 0;
+
+	virtual float GetItemHeight() const = 0;
+	virtual void SetItemHeight( float NewItemHeight ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetLastClickedCell() const = 0;
+	virtual void SetLastClickedCell( const TSharedPtr< class IPropertyTableCell >& Cell ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetCurrentCell() const = 0;
+	virtual void SetCurrentCell( const TSharedPtr< class IPropertyTableCell >& Cell ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableColumn > GetCurrentColumn() const = 0;
+	virtual void SetCurrentColumn( const TSharedPtr< class IPropertyTableColumn >& Column ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableRow > GetCurrentRow() const = 0;
+	virtual void SetCurrentRow( const TSharedPtr< class IPropertyTableRow >& Row ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInSelection() = 0;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInSelection() = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetNextCellInRow( const TSharedRef< class IPropertyTableCell >& Cell ) = 0;
+	virtual TSharedPtr< class IPropertyTableCell > GetPreviousCellInRow( const TSharedRef< class IPropertyTableCell >& Cell ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetNextCellInColumn( const TSharedRef< class IPropertyTableCell >& Cell ) = 0;
+	virtual TSharedPtr< class IPropertyTableCell > GetPreviousCellInColumn( const TSharedRef< class IPropertyTableCell >& Cell ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInRow( const TSharedRef< class IPropertyTableRow >& Row ) = 0;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInRow( const TSharedRef< class IPropertyTableRow >& Row ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInColumn( const TSharedRef< class IPropertyTableColumn >& Column ) = 0;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInColumn( const TSharedRef< class IPropertyTableColumn >& Column ) = 0;
+
+	virtual TSharedPtr< class IPropertyTableCell > GetFirstCellInTable() = 0;
+	virtual TSharedPtr< class IPropertyTableCell > GetLastCellInTable() = 0;
+
+	virtual EPropertyTableSelectionUnit::Type GetSelectionUnit() const = 0;
+	virtual void SetSelectionUnit( const EPropertyTableSelectionUnit::Type Unit ) = 0;
+
+	virtual ESelectionMode::Type GetSelectionMode() const = 0;
+	virtual void SetSelectionMode( const ESelectionMode::Type Mode ) = 0;
+
+	virtual EColumnSortPriority::Type GetColumnSortPriority(const TSharedRef< class IPropertyTableColumn > Column) const = 0;
+	virtual EColumnSortMode::Type GetColumnSortMode( const TSharedRef< class IPropertyTableColumn > Column ) const = 0;
+	virtual void SortByColumnWithId( const EColumnSortPriority::Type SortPriority, const FName& ColumnId, const EColumnSortMode::Type SortMode ) = 0;
+	virtual void SortByColumn( const TSharedRef< class IPropertyTableColumn >& Column, EColumnSortMode::Type SortMode, const EColumnSortPriority::Type SortPriority) = 0;
+
+	virtual void PasteTextAtCell( const FString& Text, const TSharedRef< class IPropertyTableCell >& Cell ) = 0;
+
+	DECLARE_EVENT( IPropertyTable, FSelectionChanged );
+	virtual FSelectionChanged* OnSelectionChanged() = 0;
+
+	DECLARE_EVENT( IPropertyTable, FColumnsChanged );
+	virtual FColumnsChanged* OnColumnsChanged() = 0;
+
+	DECLARE_EVENT( IPropertyTable, FRowsChanged );
+	virtual FRowsChanged* OnRowsChanged() = 0;
+
+	DECLARE_EVENT( IPropertyTable, FRootPathChanged );
+	virtual FRootPathChanged* OnRootPathChanged() = 0;
+};
+
+} // namespace soda
+
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableCell.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableCell.h
new file mode 100644
index 0000000..ea9d012
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableCell.h
@@ -0,0 +1,51 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+
+namespace soda
+{
+class FPropertyNode;
+class IPropertyTableColumn;
+class IPropertyTableRow;
+class IPropertyTable;
+class IPropertyHandle;
+
+
+class IPropertyTableCell
+{
+public:
+	virtual ~IPropertyTableCell() { }
+
+	virtual void Refresh() = 0;
+
+	virtual bool IsReadOnly() const = 0;
+	virtual bool IsBound() const = 0;
+	virtual bool InEditMode() const = 0;
+	virtual bool IsValid() const = 0;
+
+	virtual FString GetValueAsString() const = 0;
+	virtual FText GetValueAsText() const = 0;
+	virtual void SetValueFromString( const FString& InString ) = 0;
+
+	virtual TWeakObjectPtr< UObject > GetObject() const = 0;
+	virtual TSharedPtr< class FPropertyNode > GetNode() const = 0;
+	virtual TSharedRef< class IPropertyTableColumn > GetColumn() const = 0;
+	virtual TSharedRef< class IPropertyTableRow > GetRow() const = 0;
+	virtual TSharedRef< class IPropertyTable > GetTable() const = 0;
+	virtual TSharedPtr< class IPropertyHandle > GetPropertyHandle() const = 0;
+
+	virtual void EnterEditMode() = 0;
+	virtual void ExitEditMode() = 0;
+
+	DECLARE_EVENT( IPropertyTableCell, FEnteredEditModeEvent );
+	virtual FEnteredEditModeEvent& OnEnteredEditMode() = 0;
+
+	DECLARE_EVENT( IPropertyTableCell, FExitedEditModeEvent );
+	virtual FExitedEditModeEvent& OnExitedEditMode() = 0;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableCellPresenter.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableCellPresenter.h
new file mode 100644
index 0000000..dc1fc0b
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableCellPresenter.h
@@ -0,0 +1,33 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class IPropertyTableCellPresenter
+{
+public:
+	virtual ~IPropertyTableCellPresenter() { }
+
+	virtual TSharedRef< class SWidget > ConstructDisplayWidget() = 0;
+
+	virtual bool RequiresDropDown() = 0;
+
+	virtual TSharedRef< class SWidget > ConstructEditModeCellWidget() = 0;
+
+	virtual TSharedRef< class SWidget > ConstructEditModeDropDownWidget() = 0;
+
+	virtual TSharedRef< class SWidget > WidgetToFocusOnEdit() = 0;
+
+	virtual FString GetValueAsString() = 0;
+
+	virtual FText GetValueAsText() = 0;
+
+	virtual bool HasReadOnlyEditMode() = 0;
+};
+
+} //namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableColumn.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableColumn.h
new file mode 100644
index 0000000..c8fa77c
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableColumn.h
@@ -0,0 +1,73 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/Views/SHeaderRow.h"
+
+namespace soda
+{
+class IPropertyTable;
+class IDataSource;
+class FPropertyPath;
+class IPropertyTableCell;
+class IPropertyTableRow;
+
+namespace EPropertyTableColumnSizeMode
+{
+	enum Type
+	{
+		Fill,
+		Fixed,
+	};
+}
+
+class IPropertyTableColumn
+{
+public:
+
+	virtual FName GetId() const = 0;
+
+	virtual FText GetDisplayName() const = 0;
+
+	virtual TSharedRef< IDataSource > GetDataSource() const = 0;
+
+	virtual TSharedRef< FPropertyPath > GetPartialPath() const = 0;
+
+	virtual TSharedRef< IPropertyTableCell > GetCell( const TSharedRef< IPropertyTableRow >& Row ) = 0;
+
+	virtual void RemoveCellsForRow( const TSharedRef< IPropertyTableRow >& Row ) = 0;
+
+	virtual TSharedRef< IPropertyTable > GetTable() const = 0;
+
+	virtual bool CanSelectCells() const = 0;
+
+	virtual EPropertyTableColumnSizeMode::Type GetSizeMode() const = 0;
+
+	virtual void SetSizeMode(EPropertyTableColumnSizeMode::Type InSizeMode) = 0;
+
+	virtual float GetWidth() const = 0;
+	virtual void SetWidth( float InWidth ) = 0;
+
+	virtual bool IsHidden() const = 0;
+	virtual void SetHidden( bool IsHidden ) = 0;
+
+	virtual bool IsFrozen() const = 0;
+	virtual void SetFrozen( bool IsFrozen ) = 0;
+
+	virtual bool CanSortBy() const = 0;
+	virtual void Sort( TArray< TSharedRef< IPropertyTableRow > >& Rows, const EColumnSortMode::Type PrimarySortMode, const TSharedPtr<IPropertyTableColumn>& SecondarySortColumn, const EColumnSortMode::Type SecondarySortMode ) = 0;
+
+	virtual TSharedPtr<struct FCompareRowByColumnBase> GetPropertySorter(FProperty* Property, EColumnSortMode::Type SortMode) = 0;
+
+	/**
+	 * Tick the property column each frame
+	 */
+	virtual void Tick() = 0;
+
+	DECLARE_EVENT_OneParam( IPropertyTableColumn, FFrozenStateChanged, const TSharedRef< IPropertyTableColumn >& );
+	virtual FFrozenStateChanged* OnFrozenStateChanged() = 0;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableRow.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableRow.h
new file mode 100644
index 0000000..abb15fc
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableRow.h
@@ -0,0 +1,35 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class IPropertyTableRow
+{
+public:
+
+	virtual TSharedRef< class IDataSource > GetDataSource() const = 0;
+	
+	virtual bool HasChildren() const = 0;
+
+	virtual void GetChildRows( TArray< TSharedRef< class IPropertyTableRow > >& OutChildren ) const = 0;
+
+	virtual TSharedRef< class IPropertyTable > GetTable() const = 0;
+
+	virtual bool HasCells() const = 0;
+
+	virtual TSharedRef< class FPropertyPath > GetPartialPath() const = 0;
+
+	virtual void Tick() = 0;
+
+	virtual void Refresh() = 0;
+
+	DECLARE_EVENT( IPropertyTableRow, FRefreshed );
+	virtual FRefreshed* OnRefresh() = 0;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableUtilities.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableUtilities.h
new file mode 100644
index 0000000..07d27a3
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableUtilities.h
@@ -0,0 +1,20 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "RuntimePropertyEditor/IPropertyUtilities.h"
+
+namespace soda
+{
+
+class IPropertyTableUtilities : public IPropertyUtilities
+{
+public:
+
+	virtual void RemoveColumn( const TSharedRef< class IPropertyTableColumn >& Column ) = 0;
+
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableWidgetHandle.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableWidgetHandle.h
new file mode 100644
index 0000000..4234f74
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTableWidgetHandle.h
@@ -0,0 +1,20 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class IPropertyTableWidgetHandle
+{
+public: 
+
+	virtual void RequestRefresh() = 0;
+	virtual TSharedRef<class SWidget> GetWidget() = 0;
+
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTreeRow.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTreeRow.h
new file mode 100644
index 0000000..2937487
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTreeRow.h
@@ -0,0 +1,22 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class FPropertyPath;
+
+class IPropertyTreeRow
+{
+public: 
+
+	virtual TSharedPtr< FPropertyPath > GetPropertyPath() const = 0;
+
+	virtual bool IsCursorHovering() const = 0;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTypeCustomization.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTypeCustomization.h
new file mode 100644
index 0000000..89892e8
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyTypeCustomization.h
@@ -0,0 +1,127 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Fonts/SlateFontInfo.h"
+#include "SodaStyleSet.h"
+
+//class FAssetThumbnailPool;
+
+namespace soda
+{
+
+class FDetailWidgetRow;
+class IDetailChildrenBuilder;
+class IPropertyHandle;
+class IPropertyTypeCustomizationUtils;
+class IPropertyUtilities;
+
+/**
+ * Base class for property type customizations
+ */
+class IPropertyTypeCustomization
+	: public TSharedFromThis<IPropertyTypeCustomization>
+{
+public:
+	virtual ~IPropertyTypeCustomization() {}
+
+	/**
+	 * Called when the header of the property (the row in the details panel where the property is shown)
+	 * If nothing is added to the row, the header is not displayed
+	 *
+	 * @param PropertyHandle			Handle to the property being customized
+	 * @param HeaderRow					A row that widgets can be added to
+	 * @param StructCustomizationUtils	Utilities for customization
+	 */
+	virtual void CustomizeHeader( TSharedRef<IPropertyHandle> PropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& CustomizationUtils ) = 0;
+
+	/**
+	 * Called when the children of the property should be customized or extra rows added
+	 *
+	 * @param PropertyHandle			Handle to the property being customized
+	 * @param StructBuilder				A builder for adding children
+	 * @param StructCustomizationUtils	Utilities for customization
+	 */
+	virtual void CustomizeChildren( TSharedRef<IPropertyHandle> PropertyHandle, IDetailChildrenBuilder& ChildBuilder, IPropertyTypeCustomizationUtils& CustomizationUtils ) = 0;
+
+	
+	/**
+	 * @return whether or not this customisation should be inlined when used as a key within a row
+	 */
+	virtual bool ShouldInlineKey() const
+	{
+		return false;
+	}
+};
+
+
+/**
+ * Utilities for property type customization
+ */
+class IPropertyTypeCustomizationUtils
+{
+public:
+	virtual ~IPropertyTypeCustomizationUtils(){};
+
+	/**
+	 * @return the font used for properties and details
+	 */ 
+	static FSlateFontInfo GetRegularFont() { return FSodaStyle::GetFontStyle( TEXT("PropertyWindow.NormalFont") ); }
+
+	/**
+	 * @return the bold font used for properties and details
+	 */ 
+	static FSlateFontInfo GetBoldFont() { return FSodaStyle::GetFontStyle( TEXT("PropertyWindow.BoldFont") ); }
+	
+	/**
+	 * Gets the thumbnail pool that should be used for rendering thumbnails in the struct                  
+	 */
+	//virtual TSharedPtr<FAssetThumbnailPool> GetThumbnailPool() const = 0;
+
+	/**
+	*	@return the utilities various widgets need access to certain features of PropertyDetails
+	*/
+	virtual TSharedPtr<IPropertyUtilities> GetPropertyUtilities() const { return nullptr; }
+};
+
+
+/** Deprecated IStructCustomizationUtils interface */
+typedef IPropertyTypeCustomizationUtils IStructCustomizationUtils;
+
+/** Deprecated IStructCustomization interface */
+class IStructCustomization : public IPropertyTypeCustomization
+{
+public:
+	virtual void CustomizeHeader( TSharedRef<IPropertyHandle> PropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& CustomizationUtils )
+	{
+		CustomizeStructHeader( PropertyHandle, HeaderRow, CustomizationUtils );
+	}
+
+	virtual void CustomizeChildren( TSharedRef<IPropertyHandle> PropertyHandle, IDetailChildrenBuilder& ChildBuilder, IPropertyTypeCustomizationUtils& CustomizationUtils ) 
+	{
+		CustomizeStructChildren( PropertyHandle, ChildBuilder, CustomizationUtils );
+	}
+
+	/**
+	 * Called when the header of the struct (usually where the name of the struct and information about the struct as a whole is added)
+	 * If nothing is added to the row, the header is not displayed
+	 *
+	 * @param StructPropertyHandle		Handle to the struct property
+	 * @param HeaderRow					A row that widgets can be added to
+	 * @param StructCustomizationUtils	Utilities for struct customization
+	 */
+	virtual void CustomizeStructHeader( TSharedRef<IPropertyHandle> StructPropertyHandle, class FDetailWidgetRow& HeaderRow, IStructCustomizationUtils& StructCustomizationUtils ) = 0;
+
+	/**
+	 * Called when the children of the struct should be customized
+	 *
+	 * @param StructPropertyHandle		Handle to the struct property
+	 * @param StructBuilder				A builder for customizing the struct children
+	 * @param StructCustomizationUtils	Utilities for struct customization
+	 */
+	virtual void CustomizeStructChildren( TSharedRef<IPropertyHandle> StructPropertyHandle, class IDetailChildrenBuilder& ChildBuilder, IStructCustomizationUtils& StructCustomizationUtils ) = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyUtilities.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyUtilities.h
new file mode 100644
index 0000000..ceee6d7
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IPropertyUtilities.h
@@ -0,0 +1,43 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+//#include "AssetThumbnail.h"
+
+struct FPropertyChangedEvent;
+class FNotifyHook;
+
+namespace soda
+{
+
+class FEditConditionParser;
+class IClassViewerFilter;
+
+/**
+ * Settings for property editor widgets that call up to the base container for the widgets
+ * without knowing information about that container
+ */
+class IPropertyUtilities
+{
+public:
+	virtual ~IPropertyUtilities(){}
+	virtual FNotifyHook* GetNotifyHook() const = 0;
+	virtual bool AreFavoritesEnabled() const = 0;
+	virtual void ToggleFavorite( const TSharedRef< class FPropertyEditor >& PropertyEditor ) const = 0;
+	virtual void CreateColorPickerWindow( const TSharedRef< class FPropertyEditor >& PropertyEditor, bool bUseAlpha ) const = 0;
+	virtual void EnqueueDeferredAction( FSimpleDelegate DeferredAction ) = 0;
+	virtual bool IsPropertyEditingEnabled() const = 0;
+	virtual void ForceRefresh() = 0;
+	virtual void RequestRefresh() = 0;
+	//virtual TSharedPtr<class FAssetThumbnailPool> GetThumbnailPool() const = 0;
+	virtual void NotifyFinishedChangingProperties(const FPropertyChangedEvent& PropertyChangedEvent) = 0;
+	virtual bool HasClassDefaultObject() const = 0;
+	virtual const TArray<TWeakObjectPtr<UObject>>& GetSelectedObjects() const = 0;
+	/** If a customization standalone widget is used, the value should be update only once, when its window is closed */
+	virtual bool DontUpdateValueWhileEditing() const = 0;
+	virtual const TArray<TSharedRef<IClassViewerFilter>>& GetClassViewerFilters() const = 0;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/ISinglePropertyView.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/ISinglePropertyView.h
new file mode 100644
index 0000000..0910e0b
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/ISinglePropertyView.h
@@ -0,0 +1,66 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Fonts/SlateFontInfo.h"
+#include "RuntimeEditorModule.h"
+
+class FNotifyHook;
+
+namespace soda
+{
+
+/**
+ * Init params for a single property
+ */
+struct FSinglePropertyParams
+{
+	/** Override for the property name that will be displayed instead of the property name */
+	FText NameOverride;
+
+	/** Font to use instead of the default property font */
+	FSlateFontInfo Font;
+
+	/** Notify hook interface to use for some property change events */
+	FNotifyHook* NotifyHook;
+
+	/** Whether or not to show the name */
+	EPropertyNamePlacement::Type NamePlacement;
+
+	/** Whether to hide an asset thumbnail, if available */
+	bool bHideAssetThumbnail;
+		
+	FSinglePropertyParams()
+		: NameOverride(FText::GetEmpty())
+		, Font()
+		, NotifyHook( NULL )
+		, NamePlacement( EPropertyNamePlacement::Left )
+		, bHideAssetThumbnail( false )
+	{
+	}
+};
+
+
+/**
+ * Represents a single property not in a property tree or details view for a single object
+ * Structs and Array properties cannot be used with this method
+ */
+class ISinglePropertyView : public SCompoundWidget
+{
+public:
+	/** Sets the object to view/edit on the widget */
+	virtual void SetObject( UObject* InObject ) = 0;
+
+	/** Sets a delegate called when the property value changes */
+	virtual void SetOnPropertyValueChanged( FSimpleDelegate& InOnPropertyValueChanged ) = 0;
+
+	/** Whether or not this widget has a valid property */	
+	virtual bool HasValidProperty() const = 0;
+
+	virtual TSharedPtr<class IPropertyHandle> GetPropertyHandle() const = 0;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/IStructureDetailsView.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IStructureDetailsView.h
new file mode 100644
index 0000000..bac5ca4
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/IStructureDetailsView.h
@@ -0,0 +1,61 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "UObject/StructOnScope.h"
+#include "PropertyEditorDelegates.h"
+
+namespace soda
+{
+
+class IDetailsView;
+
+/**
+ * Interface class for all detail views
+ */
+class IStructureDetailsView
+{
+public:
+
+	/**
+	 * Get an interface the underlying details view.
+	 *
+	 * @return Details view interface.
+	 */
+	virtual IDetailsView* GetDetailsView() = 0;
+
+	/**
+	 * Get this view's Slate widget.
+	 *
+	 * @return The widget for this view.
+	 */
+	virtual TSharedPtr<class SWidget> GetWidget() = 0;
+
+	/**
+	 * Set the structure data to be displayed in this view.
+	 *
+	 * @param StructData The structure data to display.
+	 */
+	virtual void SetStructureData(TSharedPtr<class FStructOnScope> StructData) = 0;
+
+	/**
+	 * Set the CustomName used for display purposes.
+	 *
+	 * @param Text The FText to use for setting the Name
+	 */
+	virtual void SetCustomName(const FText& Text) = 0;
+
+public:
+
+	/**
+	 * Get a delegate that is executed when the view has finished changing properties.
+	 *
+	 * @return The delegate.
+	 */
+	virtual FOnFinishedChangingProperties& GetOnFinishedChangingPropertiesDelegate() = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyCustomizationHelpers.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyCustomizationHelpers.h
new file mode 100644
index 0000000..a2fabe3
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyCustomizationHelpers.h
@@ -0,0 +1,820 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Object.h"
+#include "Misc/Attribute.h"
+#include "Layout/Margin.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/SBoxPanel.h"
+#include "Framework/SlateDelegates.h"
+#include "Materials/MaterialInterface.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/IDetailCustomNodeBuilder.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/SResetToDefaultMenu.h"
+//#include "ActorPickerMode.h"
+//#include "SceneDepthPickerMode.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+
+//class AActor;
+struct FAssetData;
+//class FAssetThumbnailPool;
+class UActorComponent;
+class UFactory;
+class SToolTip;
+
+namespace soda
+{
+class FPropertyEditor;
+class IDetailChildrenBuilder;
+class IDetailLayoutBuilder;
+class SPropertyEditorAsset;
+class SPropertyEditorClass;
+class SPropertyEditorStruct;
+class IPropertyHandle;
+class IDetailGroup;
+class IDetailCategoryBuilder;
+//struct FSceneOutlinerFilters;
+
+DECLARE_DELEGATE_RetVal_OneParam(bool, FOnShouldFilterActor, const AActor*);
+
+DECLARE_DELEGATE_OneParam(FOnAssetSelected, const FAssetData& /*AssetData*/);
+DECLARE_DELEGATE_RetVal_OneParam(bool, FOnShouldSetAsset, const FAssetData& /*AssetData*/);
+DECLARE_DELEGATE_RetVal_OneParam(bool, FOnShouldFilterAsset, const FAssetData& /*AssetData*/);
+DECLARE_DELEGATE_OneParam(FOnComponentSelected, const UActorComponent* /*ActorComponent*/);
+DECLARE_DELEGATE_RetVal_OneParam(bool, FOnShouldFilterComponent, const UActorComponent* /*ActorComponent*/);
+//DECLARE_DELEGATE_OneParam( FOnGetActorFilters, TSharedPtr<FSceneOutlinerFilters>& );
+DECLARE_DELEGATE_ThreeParams(FOnGetPropertyComboBoxStrings, TArray< TSharedPtr<FString> >&, TArray<TSharedPtr<SToolTip>>&, TArray<bool>&);
+DECLARE_DELEGATE_RetVal(FString, FOnGetPropertyComboBoxValue);
+DECLARE_DELEGATE_OneParam(FOnPropertyComboBoxValueSelected, const FString&);
+DECLARE_DELEGATE_ThreeParams(FOnInstancedPropertyIteration, IDetailCategoryBuilder&, IDetailGroup*, TSharedRef<IPropertyHandle>&);
+DECLARE_DELEGATE_RetVal(bool, FOnIsEnabled);
+
+/** Collects advanced arguments for MakePropertyComboBox */
+struct FPropertyComboBoxArgs
+{
+	/** If set, the combo box will bind to a specific property. If this is null, the following 3 delegates must be set */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+
+	/** Delegate that is called to generate the list of possible strings inside the combo box list. If not set it will generate using the property handle */
+	FOnGetPropertyComboBoxStrings OnGetStrings;
+
+	/** Delegate that is called to get the current string value to display as the combo box label. If not set it will generate using the property handle */
+	FOnGetPropertyComboBoxValue OnGetValue;
+
+	/** Delegate called when a string is selected. If not set it will modify what is bound to the property handle */
+	FOnPropertyComboBoxValueSelected OnValueSelected;
+
+	/** If number of items in combo box is >= this, it will show a search box to allow filtering. -1 means to never show it */
+	int32 ShowSearchForItemCount = 20;
+
+	/** Font to use for text display. If not set it will use the default property editor font */
+	FSlateFontInfo Font;
+
+	/** Default constructor, the caller will need to fill in values manually */
+	FPropertyComboBoxArgs()
+	{}
+
+	/** Constructor using original function arguments */
+	FPropertyComboBoxArgs(const TSharedPtr<IPropertyHandle>& InPropertyHandle,
+		FOnGetPropertyComboBoxStrings InOnGetStrings = FOnGetPropertyComboBoxStrings(),
+		FOnGetPropertyComboBoxValue InOnGetValue = FOnGetPropertyComboBoxValue(),
+		FOnPropertyComboBoxValueSelected InOnValueSelected = FOnPropertyComboBoxValueSelected())
+		: PropertyHandle(InPropertyHandle)
+		, OnGetStrings(InOnGetStrings)
+		, OnGetValue(InOnGetValue)
+		, OnValueSelected(InOnValueSelected)
+	{}
+};
+
+namespace PropertyCustomizationHelpers
+{
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeResetButton(FSimpleDelegate OnResetClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true);
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeAddButton( FSimpleDelegate OnAddClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeRemoveButton( FSimpleDelegate OnRemoveClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeEmptyButton( FSimpleDelegate OnEmptyClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeInsertDeleteDuplicateButton( FExecuteAction OnInsertClicked, FExecuteAction OnDeleteClicked, FExecuteAction OnDuplicateClicked );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeDeleteButton( FSimpleDelegate OnDeleteClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeClearButton( FSimpleDelegate OnClearClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeVisibilityButton(FOnClicked OnVisibilityClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> VisibilityDelegate = true);
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeNewBlueprintButton( FSimpleDelegate OnNewBlueprintClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeUseSelectedButton( FSimpleDelegate OnUseSelectedClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeBrowseButton( FSimpleDelegate OnFindClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true, const bool IsActor = false);
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeAssetPickerAnchorButton( FOnGetAllowedClasses OnGetAllowedClasses, FOnAssetSelected OnAssetSelectedFromPicker, const TSharedPtr<IPropertyHandle>& PropertyHandle = TSharedPtr<IPropertyHandle>());
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeAssetPickerWithMenu( const FAssetData& InitialObject, const bool AllowClear, const TArray<const UClass*>& AllowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle = TSharedPtr<IPropertyHandle>(), const TArray<FAssetData>& OwnerAssetArray = TArray<FAssetData>());
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeAssetPickerWithMenu( const FAssetData& InitialObject, const bool AllowClear, const TArray<const UClass*>& AllowedClasses, const TArray<const UClass*>& DisallowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle = TSharedPtr<IPropertyHandle>(), const TArray<FAssetData>& OwnerAssetArray = TArray<FAssetData>());
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeAssetPickerWithMenu( const FAssetData& InitialObject, const bool AllowClear, const bool AllowCopyPaste, const TArray<const UClass*>& AllowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle = TSharedPtr<IPropertyHandle>(), const TArray<FAssetData>& OwnerAssetArray = TArray<FAssetData>());
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeAssetPickerWithMenu( const FAssetData& InitialObject, const bool AllowClear, const bool AllowCopyPaste, const TArray<const UClass*>& AllowedClasses, const TArray<const UClass*>& DisallowedClasses, const TArray<UFactory*>& NewAssetFactories, FOnShouldFilterAsset OnShouldFilterAsset, FOnAssetSelected OnSet, FSimpleDelegate OnClose, const TSharedPtr<IPropertyHandle>& PropertyHandle = TSharedPtr<IPropertyHandle>(), const TArray<FAssetData>& OwnerAssetArray = TArray<FAssetData>());
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeActorPickerAnchorButton( FOnGetActorFilters OnGetActorFilters, FOnActorSelected OnActorSelectedFromPicker );
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeActorPickerWithMenu( AActor* const InitialActor, const bool AllowClear, FOnShouldFilterActor ActorFilter, FOnActorSelected OnSet, FSimpleDelegate OnClose, FSimpleDelegate OnUseSelected );
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeComponentPickerWithMenu( UActorComponent* const InitialComponent, const bool AllowClear, FOnShouldFilterActor ActorFilter, FOnShouldFilterComponent ComponentFilter, FOnComponentSelected OnSet, FSimpleDelegate OnClose );
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeInteractiveActorPicker(FOnGetAllowedClasses OnGetAllowedClasses, FOnShouldFilterActor OnShouldFilterActor, FOnActorSelected OnActorSelectedFromPicker);
+	//RUNTIMEEDITOR_API TSharedRef<SWidget> MakeSceneDepthPicker(FOnSceneDepthLocationSelected OnSceneDepthLocationSelected);
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeEditConfigHierarchyButton(FSimpleDelegate OnEditConfigClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true);
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeDocumentationButton(const TSharedRef<FPropertyEditor>& InPropertyEditor);
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakeSaveButton(FSimpleDelegate OnSaveClicked, TAttribute<FText> OptionalToolTipText = FText(), TAttribute<bool> IsEnabled = true);
+
+	/** @return the FBoolProperty edit condition property if one exists. */
+	RUNTIMEEDITOR_API FBoolProperty* GetEditConditionProperty(const FProperty* InProperty, bool& bNegate);
+
+	/** Returns a list of factories which can be used to create new assets, based on the supplied class */
+	RUNTIMEEDITOR_API TArray<UFactory*> GetNewAssetFactoriesForClasses(const TArray<const UClass*>& Classes);
+
+	/** Returns a list of factories which can be used to create new assets, based on the supplied classes and respecting the disallowed set */
+	RUNTIMEEDITOR_API TArray<UFactory*> GetNewAssetFactoriesForClasses(const TArray<const UClass*>& Classes, const TArray<const UClass*>& DisallowedClasses);
+
+	/**
+	 * Build a combo button that you bind to a Name/String/Enum property or display using general delegates, using an arguments structure
+	 *
+	 * @param InArgs Options used to create combo box
+	 */
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakePropertyComboBox(const FPropertyComboBoxArgs& InArgs);
+
+	/** 
+	 * Build a combo button that you bind to a Name/String/Enum property or display using general delegates
+	 * 
+	 * @param InPropertyHandle	If set, will bind to a specific property. If this is null, all 3 delegates must be set
+	 * @param OnGetStrings		Delegate that will generate the list of possible strings. If not set will generate using property handle
+	 * @param OnGetValue		Delegate that is called to get the current string value to display. If not set will generate using property handle
+	 * @param OnValueSelected	Delegate called when a string is selected. If not set will set the property handle
+	 */
+	RUNTIMEEDITOR_API TSharedRef<SWidget> MakePropertyComboBox(const TSharedPtr<IPropertyHandle>& InPropertyHandle, FOnGetPropertyComboBoxStrings OnGetStrings = FOnGetPropertyComboBoxStrings(), FOnGetPropertyComboBoxValue OnGetValue = FOnGetPropertyComboBoxValue(), FOnPropertyComboBoxValueSelected OnValueSelected = FOnPropertyComboBoxValueSelected());
+
+	/**
+	 * Loops through all of an instanced object property's child properties and call AddRowDelegate on properties that needs to be added to the UI to let us customize it.
+	 *
+	 * @param ExistingGroup  A map used internally to determine the existing group categories. Should be empty.
+	 * @param BaseCategory   The category that will be used as the root of the instanced object properties.
+	 * @param BaseProperty   The instanced class property.
+	 * @param AddRowDelegate The delegate that will be called on each child property.
+	 */
+	RUNTIMEEDITOR_API void MakeInstancedPropertyCustomUI(TMap<FName, IDetailGroup*>& ExistingGroup, IDetailCategoryBuilder& BaseCategory, TSharedRef<IPropertyHandle>& BaseProperty, FOnInstancedPropertyIteration AddRowDelegate);
+}
+
+
+/** Delegate used to get a generic object */
+DECLARE_DELEGATE_RetVal( const UObject*, FOnGetObject );
+
+/** Delegate used to set a generic object */
+DECLARE_DELEGATE_OneParam( FOnSetObject, const FAssetData& );
+
+
+/**
+ * Simulates an object property field 
+ * Can be used when a property should act like a FObjectProperty but it isn't one
+ */
+
+
+class SObjectPropertyEntryBox : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SObjectPropertyEntryBox )
+		: _AllowedClass( UObject::StaticClass() )
+		, _AllowClear( true )
+		, _DisplayUseSelected( true )
+		, _DisplayBrowse( true )
+		, _EnableContentPicker(true)
+		, _DisplayCompactSize(false)
+		//, _DisplayThumbnail(true)
+	{}
+		/** The path to the object */
+		SLATE_ATTRIBUTE( FString, ObjectPath )
+		/** Optional property handle that can be used instead of the object path */
+		SLATE_ARGUMENT( TSharedPtr<IPropertyHandle>, PropertyHandle )
+		/** Optional, array of the objects path, in case the property handle is not valid we will use this one to pass additional object to the picker config*/
+		SLATE_ARGUMENT(TArray<FAssetData>, OwnerAssetDataArray)
+		/** Thumbnail pool */
+		//SLATE_ARGUMENT( TSharedPtr<FAssetThumbnailPool>, ThumbnailPool )
+		/** Class that is allowed in the asset picker */
+		SLATE_ARGUMENT( UClass*, AllowedClass )
+		/** Optional list of factories which may be used to create new assets */
+		SLATE_ARGUMENT( TOptional<TArray<UFactory*>>, NewAssetFactories )
+		/** Called to check if an asset should be set */
+		SLATE_EVENT(FOnShouldSetAsset, OnShouldSetAsset)
+		/** Called when the object value changes */
+		SLATE_EVENT(FOnSetObject, OnObjectChanged)
+		/** Called to check if an asset is valid to use */
+		SLATE_EVENT(FOnShouldFilterAsset, OnShouldFilterAsset)
+		/** Called to check if the asset should be enabled. */
+		SLATE_EVENT(FOnIsEnabled, OnIsEnabled)
+		/** Whether the asset can be 'None' */
+		SLATE_ARGUMENT(bool, AllowClear)
+		/** Whether to show the 'Use Selected' button */
+		SLATE_ARGUMENT(bool, DisplayUseSelected)
+		/** Whether to show the 'Browse' button */
+		SLATE_ARGUMENT(bool, DisplayBrowse)
+		/** Whether to enable the content Picker */
+		SLATE_ARGUMENT(bool, EnableContentPicker)
+		/** Whether or not to display a smaller, compact size for the asset thumbnail */ 
+		SLATE_ARGUMENT(bool, DisplayCompactSize)
+		/** Whether or not to display the asset thumbnail */ 
+		SLATE_ARGUMENT(bool, DisplayThumbnail)
+		/** A custom content slot for widgets */ 
+		SLATE_NAMED_SLOT(FArguments, CustomContentSlot)
+		SLATE_ATTRIBUTE(FIntPoint, ThumbnailSizeOverride)
+	SLATE_END_ARGS()
+
+	RUNTIMEEDITOR_API void Construct( const FArguments& InArgs );
+
+	RUNTIMEEDITOR_API void GetDesiredWidth(float& OutMinDesiredWidth, float &OutMaxDesiredWidth);
+
+private:
+	/**
+	 * Delegate function called when an object is changed
+	 */
+	void OnSetObject(const FAssetData& InObject);
+
+	/** @return the object path for the object we are viewing */
+	FString OnGetObjectPath() const;
+
+	bool IsEnabled() const;
+
+private:
+	/** Delegate to call to determine whether the asset should be set */
+	FOnShouldSetAsset OnShouldSetAsset;
+	/** Delegate to call when the object changes */
+	FOnSetObject OnObjectChanged;
+	/** Delegate to call to check if this widget should be enabled. */
+	FOnIsEnabled OnIsEnabled;
+	/** Path to the object */
+	TAttribute<FString> ObjectPath;
+	/** Handle to a property we modify (if any)*/
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+	/** The widget used to edit the object 'property' */
+	TSharedPtr<SPropertyEditorAsset> PropertyEditorAsset;
+};
+
+
+/** Delegate used to set a class */
+DECLARE_DELEGATE_OneParam( FOnSetClass, const UClass* );
+
+
+/**
+ * Simulates a class property field 
+ * Can be used when a property should act like a FClassProperty but it isn't one
+ */
+
+#if 0
+class SClassPropertyEntryBox : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SClassPropertyEntryBox)
+		: _MetaClass(UObject::StaticClass())
+		, _RequiredInterface(nullptr)
+		, _AllowAbstract(false)
+		, _IsBlueprintBaseOnly(false)
+		, _AllowNone(true)
+		, _HideViewOptions(false)
+		, _ShowDisplayNames(false)
+		, _ShowTreeView(false)
+	{}
+		/** The meta class that the selected class must be a child-of (required) */
+		SLATE_ARGUMENT(const UClass*, MetaClass)
+		/** An interface that the selected class must implement (optional) */
+		SLATE_ARGUMENT(const UClass*, RequiredInterface)
+		/** Whether or not abstract classes are allowed (optional) */
+		SLATE_ARGUMENT(bool, AllowAbstract)
+		/** Should only base blueprints be displayed? (optional) */
+		SLATE_ARGUMENT(bool, IsBlueprintBaseOnly)
+		/** Should we be able to select "None" as a class? (optional) */
+		SLATE_ARGUMENT(bool, AllowNone)
+		/** Show the View Options part of the class picker dialog*/
+		SLATE_ARGUMENT(bool, HideViewOptions)
+		/** true to show class display names rather than their native names, false otherwise */
+		SLATE_ARGUMENT(bool, ShowDisplayNames)
+		/** Show the class picker as a tree view rather than a list*/
+		SLATE_ARGUMENT(bool, ShowTreeView)
+		/** Attribute used to get the currently selected class (required) */
+		SLATE_ATTRIBUTE(const UClass*, SelectedClass)
+		/** Delegate used to set the currently selected class (required) */
+		SLATE_EVENT(FOnSetClass, OnSetClass)
+	SLATE_END_ARGS()
+
+	RUNTIMEEDITOR_API void Construct(const FArguments& InArgs);
+
+private:
+	/** The widget used to edit the class 'property' */
+	TSharedPtr<SPropertyEditorClass> PropertyEditorClass;
+};
+#endif
+
+/** Delegate used to set a struct */
+DECLARE_DELEGATE_OneParam(FOnSetStruct, const UScriptStruct*);
+
+
+/**
+ * Simulates a struct type property field 
+ * Can be used when a property should act like a struct type but it isn't one
+ */
+
+#if 0
+class SStructPropertyEntryBox : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SStructPropertyEntryBox)
+		: _MetaStruct(nullptr)
+		, _AllowNone(true)
+		, _HideViewOptions(false)
+		, _ShowDisplayNames(false)
+		, _ShowTreeView(false)
+	{}
+		/** The meta class that the selected struct must be a child-of (optional) */
+		SLATE_ARGUMENT(const UScriptStruct*, MetaStruct)
+		/** Should we be able to select "None" as a struct? (optional) */
+		SLATE_ARGUMENT(bool, AllowNone)
+		/** Show the View Options part of the struct picker dialog*/
+		SLATE_ARGUMENT(bool, HideViewOptions)
+		/** true to show struct display names rather than their native names, false otherwise */
+		SLATE_ARGUMENT(bool, ShowDisplayNames)
+		/** Show the struct picker as a tree view rather than a list*/
+		SLATE_ARGUMENT(bool, ShowTreeView)
+		/** Attribute used to get the currently selected struct (required) */
+		SLATE_ATTRIBUTE(const UScriptStruct*, SelectedStruct)
+		/** Delegate used to set the currently selected struct (required) */
+		SLATE_EVENT(FOnSetStruct, OnSetStruct)
+	SLATE_END_ARGS()
+
+	RUNTIMEEDITOR_API void Construct(const FArguments& InArgs);
+
+private:
+	/** The widget used to edit the struct 'property' */
+	TSharedPtr<SPropertyEditorStruct> PropertyEditorStruct;
+};
+#endif
+
+
+/**
+ * Represents a widget that can display a FProperty 
+ * With the ability to customize the look of the property                 
+ */
+#if 0
+class SProperty
+	: public SCompoundWidget
+{
+public:
+	DECLARE_DELEGATE( FOnPropertyValueChanged );
+
+	SLATE_BEGIN_ARGS( SProperty )
+		: _ShouldDisplayName( true )
+		, _DisplayResetToDefault( true )
+		{}
+		/** The display name to use in the default property widget */
+		SLATE_ATTRIBUTE( FText, DisplayName )
+		/** Whether or not to display the property name */
+		SLATE_ARGUMENT( bool, ShouldDisplayName )
+		/** The widget to display for this property instead of the default */
+		SLATE_DEFAULT_SLOT( FArguments, CustomWidget )
+		/** Whether or not to display the default reset to default button.  Note this value has no affect if overriding the widget */
+		SLATE_ARGUMENT( bool, DisplayResetToDefault )
+	SLATE_END_ARGS()
+
+	virtual ~SProperty(){}
+	RUNTIMEEDITOR_API void Construct( const FArguments& InArgs, TSharedPtr<IPropertyHandle> InPropertyHandle );
+
+	/**
+	 * Resets the property to default                   
+	 */
+	RUNTIMEEDITOR_API virtual void ResetToDefault();
+
+	/**
+	 * @return Whether or not the reset to default option should be visible                    
+	 */
+	RUNTIMEEDITOR_API virtual bool ShouldShowResetToDefault() const;
+
+	/**
+	 * @return a label suitable for displaying in a reset to default menu
+	 */
+	RUNTIMEEDITOR_API virtual FText GetResetToDefaultLabel() const;
+
+	/**
+	 * Returns whether or not this property is valid.  Sometimes property widgets are created even when their FProperty is not exposed to the user.  In that case the property is invalid
+	 * Properties can also become invalid if selection changes in the detail view and this value is stored somewhere.
+	 * @return Whether or not the property is valid.                   
+	 */
+	RUNTIMEEDITOR_API virtual bool IsValidProperty() const;
+
+protected:
+	/** The handle being accessed by this widget */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+};
+#endif
+
+DECLARE_DELEGATE_ThreeParams( FOnGenerateArrayElementWidget, TSharedRef<IPropertyHandle>, int32, IDetailChildrenBuilder& );
+
+#if 0
+class FDetailArrayBuilder
+	: public IDetailCustomNodeBuilder
+{
+public:
+
+	FDetailArrayBuilder(TSharedRef<IPropertyHandle> InBaseProperty, bool InGenerateHeader = true, bool InDisplayResetToDefault = true, bool InDisplayElementNum = true)
+		: ArrayProperty( InBaseProperty->AsArray() )
+		, BaseProperty( InBaseProperty )
+		, bGenerateHeader( InGenerateHeader)
+		, bDisplayResetToDefault(InDisplayResetToDefault)
+		, bDisplayElementNum(InDisplayElementNum)
+	{
+		check( ArrayProperty.IsValid() );
+
+		// Delegate for when the number of children in the array changes
+		FSimpleDelegate OnNumChildrenChanged = FSimpleDelegate::CreateRaw( this, &FDetailArrayBuilder::OnNumChildrenChanged );
+		ArrayProperty->SetOnNumElementsChanged( OnNumChildrenChanged );
+
+		BaseProperty->MarkHiddenByCustomization();
+	}
+	
+	~FDetailArrayBuilder()
+	{
+		FSimpleDelegate Empty;
+		ArrayProperty->SetOnNumElementsChanged( Empty );
+	}
+
+	void SetDisplayName( const FText& InDisplayName )
+	{
+		DisplayName = InDisplayName;
+	}
+
+	void OnGenerateArrayElementWidget( FOnGenerateArrayElementWidget InOnGenerateArrayElementWidget )
+	{
+		OnGenerateArrayElementWidgetDelegate = InOnGenerateArrayElementWidget;
+	}
+
+	virtual bool RequiresTick() const override { return false; }
+
+	virtual void Tick( float DeltaTime ) override {}
+
+	virtual FName GetName() const override
+	{
+		return BaseProperty->GetProperty()->GetFName();
+	}
+	
+	virtual bool InitiallyCollapsed() const override { return false; }
+
+	virtual void GenerateHeaderRowContent( FDetailWidgetRow& NodeRow ) override
+	{
+		if (bGenerateHeader)
+		{
+			const bool bDisplayResetToDefaultInNameContent = false;
+
+			TSharedPtr<SHorizontalBox> ContentHorizontalBox;
+			SAssignNew(ContentHorizontalBox, SHorizontalBox);
+			if (bDisplayElementNum)
+			{
+				ContentHorizontalBox->AddSlot()
+				[
+					BaseProperty->CreatePropertyValueWidget()
+				];
+			}
+
+			FUIAction CopyAction;
+			FUIAction PasteAction;
+			BaseProperty->CreateDefaultPropertyCopyPasteActions(CopyAction, PasteAction);
+
+			NodeRow
+			.FilterString(!DisplayName.IsEmpty() ? DisplayName : BaseProperty->GetPropertyDisplayName())
+			.NameContent()
+			[
+				BaseProperty->CreatePropertyNameWidget(DisplayName, FText::GetEmpty(), bDisplayResetToDefaultInNameContent)
+			]
+			.ValueContent()
+			[
+				ContentHorizontalBox.ToSharedRef()
+			]
+			.CopyAction(CopyAction)
+			.PasteAction(PasteAction);
+
+			if (bDisplayResetToDefault)
+			{
+				TSharedPtr<SResetToDefaultMenu> ResetToDefaultMenu;
+				ContentHorizontalBox->AddSlot()
+				.AutoWidth()
+				.Padding(FMargin(2.0f, 0.0f, 0.0f, 0.0f))
+				[
+					SAssignNew(ResetToDefaultMenu, SResetToDefaultMenu)
+				];
+				ResetToDefaultMenu->AddProperty(BaseProperty);
+			}
+		}
+	}
+
+	virtual void GenerateChildContent( IDetailChildrenBuilder& ChildrenBuilder ) override
+	{
+		uint32 NumChildren = 0;
+		ArrayProperty->GetNumElements( NumChildren );
+
+		for( uint32 ChildIndex = 0; ChildIndex < NumChildren; ++ChildIndex )
+		{
+			TSharedRef<IPropertyHandle> ElementHandle = ArrayProperty->GetElement( ChildIndex );
+
+			OnGenerateArrayElementWidgetDelegate.Execute( ElementHandle, ChildIndex, ChildrenBuilder );
+		}
+	}
+
+	virtual void RefreshChildren()
+	{
+		OnRebuildChildren.ExecuteIfBound();
+	}
+
+	virtual TSharedPtr<IPropertyHandle> GetPropertyHandle() const
+	{
+		return BaseProperty;
+	}
+
+protected:
+
+	virtual void SetOnRebuildChildren( FSimpleDelegate InOnRebuildChildren  ) override { OnRebuildChildren = InOnRebuildChildren; } 
+
+	void OnNumChildrenChanged()
+	{
+		OnRebuildChildren.ExecuteIfBound();
+	}
+
+private:
+
+	FText DisplayName;
+	FOnGenerateArrayElementWidget OnGenerateArrayElementWidgetDelegate;
+	TSharedPtr<IPropertyHandleArray> ArrayProperty;
+	TSharedRef<IPropertyHandle> BaseProperty;
+	FSimpleDelegate OnRebuildChildren;
+	bool bGenerateHeader;
+	bool bDisplayResetToDefault;
+	bool bDisplayElementNum;
+};
+#endif
+
+/**
+ * Helper class to create a material slot name widget for material lists
+ */
+#if 0
+class SMaterialSlotWidget : public SCompoundWidget
+{
+	SLATE_BEGIN_ARGS(SMaterialSlotWidget)
+	{}
+		SLATE_ATTRIBUTE(FText, MaterialName)
+		SLATE_EVENT(FOnTextChanged, OnMaterialNameChanged)
+		SLATE_EVENT(FOnTextCommitted, OnMaterialNameCommitted)
+		SLATE_ATTRIBUTE(bool, CanDeleteMaterialSlot)
+		SLATE_EVENT(FSimpleDelegate, OnDeleteMaterialSlot)
+	SLATE_END_ARGS()
+
+	RUNTIMEEDITOR_API void Construct(const FArguments& InArgs, int32 SlotIndex, bool bIsMaterialUsed);
+};
+#endif
+//////////////////////////////////////////////////////////////////////////
+//
+// SECTION LIST
+
+/**
+* Delegate called when we need to get new sections for the list
+*/
+DECLARE_DELEGATE_OneParam(FOnGetSections, class ISectionListBuilder&);
+
+/**
+* Delegate called when a user changes the Section
+*/
+DECLARE_DELEGATE_FourParams(FOnSectionChanged, int32, int32, int32, FName);
+
+DECLARE_DELEGATE_RetVal_TwoParams(TSharedRef<SWidget>, FOnGenerateWidgetsForSection, int32, int32);
+
+DECLARE_DELEGATE_TwoParams(FOnResetSectionToDefaultClicked, int32, int32);
+
+DECLARE_DELEGATE_RetVal_OneParam(TSharedRef<SWidget>, FOnGenerateLODComboBox, int32);
+
+DECLARE_DELEGATE_RetVal(bool, FOnCanCopySectionList);
+DECLARE_DELEGATE(FOnCopySectionList);
+DECLARE_DELEGATE(FOnPasteSectionList);
+
+DECLARE_DELEGATE_RetVal_TwoParams(bool, FOnCanCopySectionItem, int32, int32);
+DECLARE_DELEGATE_TwoParams(FOnCopySectionItem, int32, int32);
+DECLARE_DELEGATE_TwoParams(FOnPasteSectionItem, int32, int32);
+DECLARE_DELEGATE_ThreeParams(FOnEnableSectionItem, int32, int32, bool);
+
+#if 0
+struct FSectionListDelegates
+{
+	FSectionListDelegates()
+		: OnGetSections()
+		, OnSectionChanged()
+		, OnGenerateCustomNameWidgets()
+		, OnGenerateCustomSectionWidgets()
+		, OnResetSectionToDefaultClicked()
+	{}
+
+	/** Delegate called to populate the list with Sections */
+	FOnGetSections OnGetSections;
+	/** Delegate called when a user changes the Section */
+	FOnSectionChanged OnSectionChanged;
+	/** Delegate called to generate custom widgets under the name of in the left column of a details panel*/
+	FOnGenerateWidgetsForSection OnGenerateCustomNameWidgets;
+	/** Delegate called to generate custom widgets under each Section */
+	FOnGenerateWidgetsForSection OnGenerateCustomSectionWidgets;
+	/** Delegate called when a Section list item should be reset to default */
+	FOnResetSectionToDefaultClicked OnResetSectionToDefaultClicked;
+
+	/** Delegate called Copying a section list */
+	FOnCopySectionList OnCopySectionList;
+	/** Delegate called to know if we can copy a section list */
+	FOnCanCopySectionList OnCanCopySectionList;
+	/** Delegate called Pasting a section list */
+	FOnPasteSectionList OnPasteSectionList;
+
+	/** Delegate called Copying a section item */
+	FOnCopySectionItem OnCopySectionItem;
+	/** Delegate called To know if we can copy a section item */
+	FOnCanCopySectionItem OnCanCopySectionItem;
+	/** Delegate called Pasting a section item */
+	FOnPasteSectionItem OnPasteSectionItem;
+	/** Delegate called when enabling/disabling a section item */
+	FOnEnableSectionItem OnEnableSectionItem;
+};
+#endif
+/**
+* Builds up a list of unique Sections while creating some information about the Sections
+*/
+
+#if 0
+class ISectionListBuilder
+{
+public:
+	virtual ~ISectionListBuilder() {};
+	/**
+	* Adds a new Section to the list
+	*
+	* @param SlotIndex		The slot (usually mesh element index) where the Section is located on the component
+	* @param Section		The Section being used
+	* @param bCanBeReplced	Whether or not the Section can be replaced by a user
+	*/
+	virtual void AddSection(int32 LodIndex, int32 SectionIndex, FName InMaterialSlotName, int32 InMaterialSlotIndex, FName InOriginalMaterialSlotName, const TMap<int32, FName> &InAvailableMaterialSlotName, const UMaterialInterface* Material, bool IsSectionUsingCloth, bool bIsChunkSection, int32 DefaultMaterialIndex) = 0;
+};
+#endif
+
+/**
+* A Section item in a Section list slot
+*/
+#if 0
+struct FSectionListItem
+{
+	/** LodIndex of the Section*/
+	int32 LodIndex;
+	/** Section index */
+	int32 SectionIndex;
+
+	/* Is this section is using cloth */
+	bool IsSectionUsingCloth;
+
+	/* Size of the preview material thumbnail */
+	int32 ThumbnailSize;
+
+	/** Material being readonly view in the list */
+	TWeakObjectPtr<UMaterialInterface> Material;
+
+	/* Material Slot Name */
+	FName MaterialSlotName;
+	int32 MaterialSlotIndex;
+	FName OriginalMaterialSlotName;
+
+	/* Available material slot name*/
+	TMap<int32, FName> AvailableMaterialSlotName;
+
+	bool bIsChunkSection;
+	int32 DefaultMaterialIndex;
+
+
+	FSectionListItem(int32 InLodIndex, int32 InSectionIndex, FName InMaterialSlotName, int32 InMaterialSlotIndex, FName InOriginalMaterialSlotName, const TMap<int32, FName> &InAvailableMaterialSlotName, const UMaterialInterface* InMaterial, bool InIsSectionUsingCloth, int32 InThumbnailSize, bool InIsChunkSection, int32 InDefaultMaterialIndex)
+		: LodIndex(InLodIndex)
+		, SectionIndex(InSectionIndex)
+		, IsSectionUsingCloth(InIsSectionUsingCloth)
+		, ThumbnailSize(InThumbnailSize)
+		, Material(const_cast<UMaterialInterface*>(InMaterial))
+		, MaterialSlotName(InMaterialSlotName)
+		, MaterialSlotIndex(InMaterialSlotIndex)
+		, OriginalMaterialSlotName(InOriginalMaterialSlotName)
+		, AvailableMaterialSlotName(InAvailableMaterialSlotName)
+		, bIsChunkSection(InIsChunkSection)
+		, DefaultMaterialIndex(InDefaultMaterialIndex)
+	{}
+
+	bool operator==(const FSectionListItem& Other) const
+	{
+		bool IsSectionItemEqual = LodIndex == Other.LodIndex
+			&& SectionIndex == Other.SectionIndex
+			&& MaterialSlotIndex == Other.MaterialSlotIndex
+			&& MaterialSlotName == Other.MaterialSlotName
+			&& Material == Other.Material
+			&& AvailableMaterialSlotName.Num() == Other.AvailableMaterialSlotName.Num()
+			&& IsSectionUsingCloth == Other.IsSectionUsingCloth
+			&& bIsChunkSection == Other.bIsChunkSection
+			&& DefaultMaterialIndex == Other.DefaultMaterialIndex;
+		if (IsSectionItemEqual)
+		{
+			for (auto Kvp : AvailableMaterialSlotName)
+			{
+				if (!Other.AvailableMaterialSlotName.Contains(Kvp.Key))
+				{
+					IsSectionItemEqual = false;
+					break;
+				}
+				FName OtherName = *(Other.AvailableMaterialSlotName.Find(Kvp.Key));
+				if (Kvp.Value != OtherName)
+				{
+					IsSectionItemEqual = false;
+					break;
+				}
+			}
+		}
+		return IsSectionItemEqual;
+	}
+
+	bool operator!=(const FSectionListItem& Other) const
+	{
+		return !(*this == Other);
+	}
+};
+#endif
+
+#if 0
+class FSectionList : public IDetailCustomNodeBuilder, public TSharedFromThis<FSectionList>
+{
+public:
+	RUNTIMEEDITOR_API FSectionList(IDetailLayoutBuilder& InDetailLayoutBuilder, FSectionListDelegates& SectionListDelegates, bool bInInitiallyCollapsed, int32 InThumbnailSize, int32 InSectionsLodIndex, FName InSectionListName);
+
+	/**
+	* @return true if Sections are being displayed
+	*/
+	bool IsDisplayingSections() const { return true; }
+private:
+	/**
+	* Called when a user expands all materials in a slot
+	*/
+	void OnDisplaySectionsForLod(int32 LodIndex);
+
+	/**
+	* Called when a user hides all materials in a slot
+	*/
+	void OnHideSectionsForLod(int32 LodIndex);
+
+	/** IDetailCustomNodeBuilder interface */
+	virtual void SetOnRebuildChildren(FSimpleDelegate InOnRebuildChildren) override { OnRebuildChildren = InOnRebuildChildren; }
+	virtual bool RequiresTick() const override { return true; }
+	virtual void Tick(float DeltaTime) override;
+	virtual void GenerateHeaderRowContent(FDetailWidgetRow& NodeRow) override;
+	virtual void GenerateChildContent(IDetailChildrenBuilder& ChildrenBuilder) override;
+	virtual FName GetName() const override { return SectionListName; }
+	virtual bool InitiallyCollapsed() const override
+	{
+		return bInitiallyCollapsed;
+	}
+
+	/**
+	* Adds a new Section item to the list
+	*
+	* @param Row			The row to add the item to
+	* @param LodIndex		The Lod of the section
+	* @param Item			The Section item to add
+	* @param bDisplayLink	If a link to the Section should be displayed instead of the actual item (for multiple Sections)
+	*/
+	void AddSectionItem(class FDetailWidgetRow& Row, int32 LodIndex, const struct FSectionListItem& Item, bool bDisplayLink);
+
+private:
+	bool OnCanCopySectionList() const;
+	void OnCopySectionList();
+	void OnPasteSectionList();
+
+	bool OnCanCopySectionItem(int32 LODIndex, int32 SectionIndex) const;
+	void OnCopySectionItem(int32 LODIndex, int32 SectionIndex);
+	void OnPasteSectionItem(int32 LODIndex, int32 SectionIndex);
+	void OnEnableSectionItem(int32 LodIndex, int32 SectionIndex, bool bEnable);
+
+	/** Delegates for the Section list */
+	FSectionListDelegates SectionListDelegates;
+	/** Called to rebuild the children of the detail tree */
+	FSimpleDelegate OnRebuildChildren;
+	/** Parent detail layout this list is in */
+	IDetailLayoutBuilder& DetailLayoutBuilder;
+	/** Set of all unique displayed Sections */
+	TArray< FSectionListItem > DisplayedSections;
+	/** Set of all Sections currently in view (may be less than DisplayedSections) */
+	TArray< TSharedRef<class FSectionItemView> > ViewedSections;
+	/** Set of all expanded slots */
+	TSet<uint32> ExpandedSlots;
+	/** Section list builder used to generate Sections */
+	TSharedRef<class FSectionListBuilder> SectionListBuilder;
+
+	/** Set the initial state of the collapse. */
+	bool bInitiallyCollapsed;
+
+	FName SectionListName;
+
+	int32 ThumbnailSize;
+	int32 SectionsLodIndex;
+};
+
+#endif
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyEditorDelegates.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyEditorDelegates.h
new file mode 100644
index 0000000..3d067eb
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyEditorDelegates.h
@@ -0,0 +1,186 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Framework/Commands/UIAction.h"
+#include "Textures/SlateIcon.h"
+#include "UObject/WeakObjectPtr.h"
+
+struct FPropertyChangedEvent;
+class SWidget;
+class SHeaderRow;
+
+namespace soda
+{
+class FPropertyPath;
+class IDetailCustomization;
+class IDetailTreeNode;
+class IPropertyTypeIdentifier;
+class IPropertyTypeCustomization;
+class IPropertyHandle;
+class FPropertyNode;
+
+struct FPropertyAndParent
+{
+	explicit FPropertyAndParent(const TSharedRef<IPropertyHandle>& InPropertyHandle);
+	explicit FPropertyAndParent(const TSharedRef<FPropertyNode>& InPropertyNode);
+
+	/** The property always exists */
+	const FProperty& Property;
+
+	/** The array index of this property if applicable, otherwise INDEX_NONE. */
+	int32 ArrayIndex;
+
+	/** The entire chain of parent properties, all the way to the property root. ParentProperties[0] is the immediate parent.*/
+	TArray< const FProperty* > ParentProperties;
+
+	/**
+	 * Array indices in parent properties where applicable, otherwise INDEX_NONE.
+	 * The size of this array is always equal to the size of ParentProperties.
+	 */
+	TArray<int32> ParentArrayIndices;
+
+	/** The objects for these properties */
+	TArray< TWeakObjectPtr< UObject > > Objects;
+
+private:
+	void Initialize(const TSharedRef<FPropertyNode>& InPropertyNode);
+};
+
+/** Delegate called to see if a property should be visible */
+DECLARE_DELEGATE_RetVal_OneParam( bool, FIsPropertyVisible, const FPropertyAndParent& );
+
+/** Delegate called to see if a property should be read-only */
+DECLARE_DELEGATE_RetVal_OneParam( bool, FIsPropertyReadOnly, const FPropertyAndParent& );
+
+/** Delegate called to determine if a custom row should be visible. */
+DECLARE_DELEGATE_RetVal_TwoParams(bool, FIsCustomRowVisible, FName /*InRowName*/, FName /*InParentName*/);
+
+/** Delegate called to determine if a custom row should be read-only. */
+DECLARE_DELEGATE_RetVal_TwoParams(bool, FIsCustomRowReadOnly, FName /*InRowName*/, FName /*InParentName*/);
+
+/** Delegate called to get a detail layout for a specific object class */
+DECLARE_DELEGATE_RetVal( TSharedRef<IDetailCustomization>, FOnGetDetailCustomizationInstance );
+
+/** Delegate called to get a property layout for a specific property type */
+DECLARE_DELEGATE_RetVal( TSharedRef<IPropertyTypeCustomization>, FOnGetPropertyTypeCustomizationInstance );
+
+/** Notification for when a property view changes */
+DECLARE_DELEGATE_TwoParams( FOnObjectArrayChanged, const FString&, const TArray<UObject*>& );
+
+/** Notification for when displayed properties changes (for instance, because the user has filtered some properties */
+DECLARE_DELEGATE( FOnDisplayedPropertiesChanged );
+
+/** Notification for when a property selection changes. */
+DECLARE_DELEGATE_OneParam( FOnPropertySelectionChanged, FProperty* )
+
+/** Notification for when a property is double clicked by the user*/
+DECLARE_DELEGATE_OneParam( FOnPropertyDoubleClicked, FProperty* )
+
+/** Notification for when a property is clicked by the user*/
+DECLARE_DELEGATE_OneParam( FOnPropertyClicked, const TSharedPtr<FPropertyPath >& )
+
+/** */
+DECLARE_DELEGATE_OneParam( FConstructExternalColumnHeaders, const TSharedRef< SHeaderRow >& )
+
+DECLARE_DELEGATE_RetVal_TwoParams( TSharedRef< SWidget >, FConstructExternalColumnCell,  const FName& /*ColumnName*/, const TSharedRef< class IPropertyTreeRow >& /*RowWidget*/)
+
+/** Delegate called to see if a property editing is enabled */
+DECLARE_DELEGATE_RetVal(bool, FIsPropertyEditingEnabled );
+
+/**
+ * A delegate which is called after properties have been edited and PostEditChange has been called on all objects.
+ * This can be used to safely make changes to data that the details panel is observing instead of during PostEditChange (which is
+ * unsafe)
+ */
+DECLARE_MULTICAST_DELEGATE_OneParam(FOnFinishedChangingProperties, const FPropertyChangedEvent&);
+
+/**
+ * A property row extension arguments is displayed at the end of a property row, either inline or as a button.
+ */
+struct FOnGenerateGlobalRowExtensionArgs
+{	
+	/** The detail row's property handle. */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+
+	/** The detail row's owner tree node. */
+	TWeakPtr<IDetailTreeNode> OwnerTreeNode;
+
+	/** Owner object for the property extension */
+	UObject* OwnerObject = nullptr;
+
+	/** Path of the exposed property */
+	FString PropertyPath = TEXT("");
+
+	/** Exposed property */
+	FProperty* Property = nullptr;
+};
+
+/** 
+ * A property row extension button is displayed at the end of a property row, either inline as a button, 
+ * or in a dropdown when not all buttons can fit.
+ */
+struct FPropertyRowExtensionButton
+{
+	/** The icon to display for the button. */
+	TAttribute<FSlateIcon> Icon;
+	/** The label to display for the button when shown in the dropdown. */
+	TAttribute<FText> Label;
+	/** The tooltip to display for the button. */
+	TAttribute<FText> ToolTip;
+	/** The UIAction to use for the button - this includes on execute, can execute and visibility handlers. */
+	FUIAction UIAction;
+};
+
+/**
+ * Delegate called to get add an extension to a property row's name column.
+ * To use, bind an handler to the delegate that adds an extension to the out array parameter.
+ * When called, EWidgetPosition indicates the position for which the delegate is gathering extensions.
+ * ie. The favorite system is implemented by adding the star widget when the delegate is called with the left position.
+ */
+DECLARE_MULTICAST_DELEGATE_TwoParams(FOnGenerateGlobalRowExtension, const FOnGenerateGlobalRowExtensionArgs& /*InArgs*/, TArray<FPropertyRowExtensionButton>& /*OutExtensions*/);
+
+/**
+ * Callback executed to query the custom layout of details
+ */
+struct FDetailLayoutCallback
+{
+	/** Delegate to call to query custom layout of details */
+	FOnGetDetailCustomizationInstance DetailLayoutDelegate;
+	/** The order of this class in the map of callbacks to send (callbacks sent in the order they are received) */
+	int32 Order;
+};
+
+struct FPropertyTypeLayoutCallback
+{
+	FOnGetPropertyTypeCustomizationInstance PropertyTypeLayoutDelegate;
+
+	TSharedPtr<IPropertyTypeIdentifier> PropertyTypeIdentifier;
+
+	bool IsValid() const { return PropertyTypeLayoutDelegate.IsBound(); }
+
+	TSharedRef<IPropertyTypeCustomization> GetCustomizationInstance() const;
+};
+
+
+struct FPropertyTypeLayoutCallbackList
+{
+	/** The base callback is a registered callback with a null identifier */
+	FPropertyTypeLayoutCallback BaseCallback;
+
+	/** List of registered callbacks with a non null identifier */
+	TArray< FPropertyTypeLayoutCallback > IdentifierList;
+
+	void Add(const FPropertyTypeLayoutCallback& NewCallback);
+
+	void Remove(const TSharedPtr<IPropertyTypeIdentifier>& InIdentifier);
+
+	const FPropertyTypeLayoutCallback& Find(const IPropertyHandle& PropertyHandle) const;
+};
+
+/** This is a multimap as there many be more than one customization per property type */
+typedef TMap< FName, FPropertyTypeLayoutCallbackList > FCustomPropertyTypeLayoutMap;
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyEditorPermissionList.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyEditorPermissionList.h
new file mode 100644
index 0000000..a10ef48
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyEditorPermissionList.h
@@ -0,0 +1,128 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/SoftObjectPtr.h"
+#include "UObject/WeakObjectPtr.h"
+#include "Misc/NamePermissionList.h"
+
+namespace soda
+{
+
+/** Struct, OwnerName */
+DECLARE_MULTICAST_DELEGATE_TwoParams(FPermissionListUpdated, TSoftObjectPtr<UStruct>, FName);
+
+/**
+ * A hierarchical set of rules that can be used to PermissionList all properties of specific Structs without
+ * having to manually add every single property in those Structs. These rules are applied in order from
+ * the base Struct to the leaf Struct. UseExistingPermissionList has dual-functionality to alternatively
+ * inherit the parent Struct's rule if no PermissionList is manually defined.
+ * 
+ * For example, if you have:
+ * class A - (UseExistingPermissionList "MyProp")						PermissionList = "MyProp"
+ * class B : public class A - (AllowListListAllProperties)				PermissionList = "MyProp","PropA1","PropA2"
+ * class C : public class B - (UseExistingPermissionList "AnotherProp")	PermissionList = "MyProp","PropA1","PropA2","AnotherProp"
+ * class D : public class B - (UseExistingPermissionList)				PermissionList = "MyProp","PropA1","PropA2","PropD1","PropD2"
+ * Note that because class C manually defines a PermissionList, it does not inherit the AllowListAllProperties rule from class B, while
+ * class D does not define a PermissionList, so it does inherit the rule, causing all of class D's properties to also get added to the AllowList.
+ */
+enum class EPropertyEditorPermissionListRules : uint8
+{
+	// If a PermissionList is manually defined for this struct, PermissionList those properties. Otherwise, use the parent Struct's rule.
+	UseExistingPermissionList,
+	// If no PermissionList is manually defined for this Struct, AllowList all properties from this Struct and its subclasses
+	AllowListAllProperties,
+	// If a PermissionList is manually defined for this Struct, AllowList all properties from this Struct's subclasses.
+	// If this functionality is needed without any properties to AllowList, a fake property must be added to AllowList instead.
+	AllowListAllSubclassProperties
+};
+
+struct FPropertyEditorPermissionListEntry
+{
+    FNamePermissionList PermissionList;
+    EPropertyEditorPermissionListRules Rules = EPropertyEditorPermissionListRules::UseExistingPermissionList;
+};
+
+class RUNTIMEEDITOR_API FPropertyEditorPermissionList
+{
+public:
+	static FPropertyEditorPermissionList& Get()
+	{
+		static FPropertyEditorPermissionList PermissionList;
+		return PermissionList;
+	}
+
+	/** Add a set of rules for a specific base UStruct to determine which properties are visible in all details panels */
+	void AddPermissionList(TSoftObjectPtr<UStruct> Struct, const FNamePermissionList& PermissionList, EPropertyEditorPermissionListRules Rules = EPropertyEditorPermissionListRules::UseExistingPermissionList);
+	/** Remove a set of rules for a specific base UStruct to determine which properties are visible in all details panels */
+	void RemovePermissionList(TSoftObjectPtr<UStruct> Struct);
+	/** Remove all rules */
+	void ClearPermissionList();
+
+	/** Add a specific property to a UStruct's AllowList */
+	void AddToAllowList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner = NAME_None);
+	/** Remove a specific property from a UStruct's AllowList */
+	void RemoveFromAllowList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner = NAME_None);
+	/** Add a specific property to a UStruct's DenyList */
+	void AddToDenyList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner = NAME_None);
+	/** Remove a specific property from a UStruct's DenyList */
+    void RemoveFromDenyList(TSoftObjectPtr<UStruct> Struct, const FName PropertyName, const FName Owner = NAME_None);
+
+	/** When the PermissionList or DenyList for any struct was added to or removed from. */
+    FPermissionListUpdated PermissionListUpdatedDelegate;
+    
+	/** When the entire PermissionList is enabled or disabled */
+	FSimpleMulticastDelegate PermissionListEnabledDelegate;
+
+	/** Controls whether DoesPropertyPassFilter always returns true or performs property-based filtering. */
+	bool IsEnabled() const { return bEnablePropertyEditorPermissionList; }
+	/** Turn on or off the property editor PermissionList. DoesPropertyPassFilter will always return true if disabled. */
+	void SetEnabled(bool bEnable);
+
+	/** Whether the Details View should show special menu entries to add/remove items in the PermissionList */
+	bool ShouldShowMenuEntries() const { return bShouldShowMenuEntries;}
+	/** Turn on or off menu entries to modify the PermissionList from a Details View */
+	void SetShouldShowMenuEntries(bool bShow) { bShouldShowMenuEntries = bShow; }
+
+	/**
+	 * Checks if a property passes the PermissionList/DenyList filtering specified by PropertyEditorPermissionLists
+	 * This should be relatively fast as it maintains a flattened cache of all inherited PermissionLists for every UStruct (which is generated lazily).
+	 */
+	bool DoesPropertyPassFilter(const UStruct* ObjectStruct, FName PropertyName) const;
+
+	/** Check whether a property exists on the PermissionList for a specific Struct - this will return false if the property is AllowListed on a parent Struct */
+	bool IsSpecificPropertyAllowListed(const UStruct* ObjectStruct, FName PropertyName) const;
+	/** Check whether a property exists on the DenyList for a specific Struct - this will return false if the property is DenyListed on a parent Struct */
+	bool IsSpecificPropertyDenyListed(const UStruct* ObjectStruct, FName PropertyName) const;
+
+	/** Gets a read-only copy of the original, un-flattened PermissionList. */
+	const TMap<TSoftObjectPtr<UStruct>, FPropertyEditorPermissionListEntry>& GetRawPermissionList() const { return RawPropertyEditorPermissionList; }
+
+	/** Clear CachedPropertyEditorPermissionList to cause the PermissionListed property list to be regenerated next time it's queried */
+	void ClearCache();
+
+private:
+	FPropertyEditorPermissionList();
+	~FPropertyEditorPermissionList();
+
+	void RegisterOnBlueprintCompiled();
+	
+	/** Whether DoesPropertyPassFilter should perform its PermissionList check or always return true */
+	bool bEnablePropertyEditorPermissionList = false;
+	/** Whether SDetailSingleItemRow should add menu items to add/remove properties to/from the PermissionList */
+	bool bShouldShowMenuEntries = false;
+	
+	/** Stores assigned PermissionLists from AddPermissionList(), which are later flattened and stored in CachedPropertyEditorPermissionList. */
+	TMap<TSoftObjectPtr<UStruct>, FPropertyEditorPermissionListEntry> RawPropertyEditorPermissionList;
+
+	/** Lazily-constructed combined cache of both the flattened class PermissionList and struct PermissionList */
+	mutable TMap<TWeakObjectPtr<const UStruct>, FNamePermissionList> CachedPropertyEditorPermissionList;
+
+	/** Get or create the cached PermissionList for a specific UStruct */
+	const FNamePermissionList& GetCachedPermissionListForStruct(const UStruct* Struct) const;
+	const FNamePermissionList& GetCachedPermissionListForStructHelper(const UStruct* Struct, bool& bInOutShouldAllowListAllProperties) const;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyHandle.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyHandle.h
new file mode 100644
index 0000000..a26b604
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyHandle.h
@@ -0,0 +1,832 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/UnrealType.h"
+#include "Widgets/SWidget.h"
+#include "RuntimeEditorModule.h"
+#include "UObject/PropertyPortFlags.h"
+
+struct FAssetData;
+
+namespace soda
+{
+class FPropertyNode;
+class IPropertyHandleArray;
+class IPropertyHandleMap;
+class IPropertyHandleSet;
+class FResetToDefaultOverride;
+class FPropertyRestriction;
+
+namespace EPropertyValueSetFlags
+{
+	typedef uint32 Type;
+
+	/** Normal way to call set value (make a transaction, call posteditchange) */
+	const Type DefaultFlags = 0;
+	/** No transaction will be created when setting this value (no undo/redo) */
+	const Type NotTransactable = 1 << 0;
+	/** When PostEditChange is called mark the change as interactive (e.g, user is spinning a value in a spin box) */
+	const Type InteractiveChange = 1 << 1;
+	/** If the property being imported to is an instanced object, create a new object rather than simply setting the value literally */
+	const Type InstanceObjects = 1 << 2;
+
+};
+
+/**
+ * A handle to a property which is used to read and write the value without needing to handle Pre/PostEditChange, transactions, package modification
+ * A handle also is used to identify the property in detail customization interfaces
+ */
+class IPropertyHandle : public TSharedFromThis<IPropertyHandle>
+{
+public:
+	virtual ~IPropertyHandle(){}
+
+	/**
+	 * @return Whether or not the handle points to a valid property node. This can be true but GetProperty may still return null
+	 */
+	virtual bool IsValidHandle() const = 0;
+	
+	/**
+	 * @return Whether or not the property is edit const (can't be changed)
+	 */
+	virtual bool IsEditConst() const = 0;
+
+	/**
+	* @return The opposite of IsEditConst
+	*/
+	virtual bool IsEditable() const = 0;
+
+	/**
+	 * Gets the class of the property being edited
+	 */
+	virtual const FFieldClass* GetPropertyClass() const = 0;
+
+	/**
+	 * Gets the property being edited
+	 */
+	virtual FProperty* GetProperty() const = 0;
+
+	/**
+	 * Gets the property node being edited.
+	 */
+	virtual TSharedPtr<FPropertyNode> GetPropertyNode() const = 0;
+
+	/**
+	 * Gets the property we should use to read meta-data
+	 */
+	virtual FProperty* GetMetaDataProperty() const = 0;
+
+	/**
+	 * Determines if the property has any metadata associated with the key
+	 * 
+	 * @param Key The key to lookup in the metadata
+	 * @return true if there is a (possibly blank) value associated with this key
+	 */
+	virtual bool HasMetaData(const FName& Key) const = 0;
+
+	/**
+	 * Find the metadata value associated with the key
+	 * 
+	 * @param Key The key to lookup in the metadata
+	 * @return The value associated with the key
+	 */
+	virtual const FString& GetMetaData(const FName& Key) const = 0;
+
+	/**
+	 * Find the metadata value associated with the key and return bool
+	 *
+	 * @param Key The key to lookup in the metadata
+	 * @return return true if the value was true (case insensitive)
+	 */
+	virtual bool GetBoolMetaData(const FName& Key) const = 0;
+
+	/**
+	 * Find the metadata value associated with the key and return int32
+	 *
+	 * @param Key The key to lookup in the metadata
+	 * @return the int value stored in the metadata.
+	 */
+	virtual int32 GetIntMetaData(const FName& Key) const = 0;
+
+	/**
+	 * Find the metadata value associated with the key and return float
+	 *
+	 * @param Key The key to lookup in the metadata
+	 * @return the float value stored in the metadata.
+	 */
+	virtual float GetFloatMetaData(const FName& Key) const = 0;
+
+	/**
+	 * Find the metadata value associated with the key and return UClass*
+	 *
+	 * @param Key The key to lookup in the metadata
+	 * @return the UClass value stored in the metadata.
+	 */
+	virtual UClass* GetClassMetaData(const FName& Key) const = 0;
+
+	/** Set metadata value for 'Key' to 'Value' on this property instance (as opposed to the class) */
+	virtual void SetInstanceMetaData(const FName& Key, const FString& Value) = 0;
+
+	/**
+	 * Get metadata value for 'Key' for this property instance (as opposed to the class)
+	 * 
+	 * @return Pointer to metadata value; nullptr if Key not found
+	 */
+	virtual const FString* GetInstanceMetaData(const FName& Key) const = 0;
+
+	/**
+	 * Get metadata map for this property instance (as opposed to the class)
+	 * 
+	 * @return Map ptr containing metadata pairs; nullptr if property node is invalid
+	 */
+	virtual const TMap<FName, FString>* GetInstanceMetaDataMap() const = 0;
+
+	/**
+	 * Gets the property tool tip text.
+	 */
+	virtual FText GetToolTipText() const = 0;
+	
+	/**
+	 * Sets the tooltip shown for this property
+	 *
+	 * @param ToolTip	The tool tip to show
+	 */
+	virtual void SetToolTipText(const FText& ToolTip) = 0;
+
+	/**
+	 * @return True if this property has custom documentation, false otherwise
+	 */
+	virtual bool HasDocumentation() = 0;
+
+	/**
+	 * @return The custom documentation link for this property
+	 */
+	virtual FString GetDocumentationLink() = 0;
+
+	/**
+	 * @return The custom documentation except name for this property
+	 */
+	virtual FString GetDocumentationExcerptName() = 0;
+
+	/**
+	* Calculates the memory address for the data associated with this item's value.
+	*
+	* @param Base The location to use as the starting point for the calculation; typically the address of an object.
+	*
+	* @return A pointer to a FProperty value or UObject.
+	*/
+	virtual uint8* GetValueBaseAddress( uint8* Base ) const = 0;
+
+	/**
+	 * Gets the value formatted as a string.
+	 *
+	 * @param OutValue		String where the value is stored.  Remains unchanged if the value could not be set
+	 * @param PortFlags		Property flags to determine how the string is retrieved. Defaults to PPF_PropertyWindow
+	 * @return The result of attempting to get the value
+	 */
+	virtual FPropertyAccess::Result GetValueAsFormattedString( FString& OutValue, EPropertyPortFlags PortFlags = PPF_PropertyWindow ) const = 0;
+
+	/**
+	 * Gets the value formatted as a string, possibly using an alternate form more suitable for display in the UI
+	 *
+	 * @param OutValue		String where the value is stored.  Remains unchanged if the value could not be set
+	 * @param PortFlags		Property flags to determine how the string is retrieved. Defaults to PPF_PropertyWindow
+	 * @return The result of attempting to get the value
+	 */
+	virtual FPropertyAccess::Result GetValueAsDisplayString( FString& OutValue, EPropertyPortFlags PortFlags = PPF_PropertyWindow ) const = 0;
+
+	/**
+	 * Gets the value formatted as a string, as Text.
+	 *
+	 * @param OutValue	Text where the value is stored.  Remains unchanged if the value could not be set
+	 * @return The result of attempting to get the value
+	 */
+	virtual FPropertyAccess::Result GetValueAsFormattedText( FText& OutValue ) const = 0;
+
+	/**
+	 * Gets the value formatted as a string, as Text, possibly using an alternate form more suitable for display in the UI
+	 *
+	 * @param OutValue	Text where the value is stored.  Remains unchanged if the value could not be set
+	 * @return The result of attempting to get the value
+	 */
+	virtual FPropertyAccess::Result GetValueAsDisplayText( FText& OutValue ) const = 0;
+
+	/**
+	 * Sets the value formatted as a string.
+	 *
+	 * @param OutValue	String where the value is stored.  Is unchanged if the value could not be set
+	 * @return The result of attempting to set the value
+	 */
+	virtual FPropertyAccess::Result SetValueFromFormattedString( const FString& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	
+	/**
+	 * Sets a delegate to call when the value of the property is changed
+	 *
+	 * @param InOnPropertyValueChanged	The delegate to call
+	 */
+	virtual void SetOnPropertyValueChanged( const FSimpleDelegate& InOnPropertyValueChanged ) = 0;
+	
+	/**
+	 * Sets a delegate to call when the value of the property of a child is changed
+	 * 
+	 * @param InOnChildPropertyValueChanged	The delegate to call
+	 */
+	virtual void SetOnChildPropertyValueChanged( const FSimpleDelegate& InOnChildPropertyValueChanged ) = 0;
+
+	/**
+	 * Sets a delegate to call when the value of the property is about to be changed
+	 *
+	 * @param InOnPropertyValuePreChange	The delegate to call
+	 */
+	virtual void SetOnPropertyValuePreChange(const FSimpleDelegate& InOnPropertyValuePreChange) = 0;
+
+	/**
+	 * Sets a delegate to call when the value of the property of a child is about to be changed
+	 *
+	 * @param InOnChildPropertyValuePreChange	The delegate to call
+	 */
+	virtual void SetOnChildPropertyValuePreChange(const FSimpleDelegate& InOnChildPropertyValuePreChange) = 0;
+
+	/**
+	 * Sets a delegate to call when the property is reset to default
+	 *
+	 * @param InOnPropertyResetToDefault	The delegate to call
+	 */
+	virtual void SetOnPropertyResetToDefault(const FSimpleDelegate& InOnPropertyResetToDefault) = 0;
+
+	/**
+	 * Gets the typed value of a property.  
+	 * If the property does not support the value type FPropertyAccess::Fail is returned
+	 *
+	 * @param OutValue	The value that will be set if successful
+	 * @return The result of attempting to get the value
+	 */
+	virtual FPropertyAccess::Result GetValue( float& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( double& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( bool& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( int8& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( int16& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( int32& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( int64& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( uint8& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( uint16& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( uint32& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( uint64& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FString& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FText& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FName& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FVector& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FVector2D& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FVector4& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FQuat& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FRotator& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( UObject*& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( const UObject*& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValue( FAssetData& OutValue ) const = 0;
+	virtual FPropertyAccess::Result GetValueData( void*& OutAddress ) const = 0;
+	virtual FPropertyAccess::Result GetValue(FProperty*& OutValue) const = 0;
+	virtual FPropertyAccess::Result GetValue(const FProperty*& OutValue) const = 0;
+	/**
+	 * Sets the typed value of a property.  
+	 * If the property does not support the value type FPropertyAccess::Fail is returned
+	 *
+	 * @param InValue	The value to set
+	 * @return The result of attempting to set the value
+	 */
+	virtual FPropertyAccess::Result SetValue( const float& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const double& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const bool& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const int8& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const int16& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const int32& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const int64& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const uint8& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const uint16& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const uint32& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const uint64& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FString& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FText& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FName& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FVector& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FVector2D& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FVector4& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FQuat& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FRotator& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( UObject* const& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const UObject* const& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const FAssetData& InValue,  EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( const TCHAR* InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+	virtual FPropertyAccess::Result SetValue( FProperty* const& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) = 0;
+	virtual FPropertyAccess::Result SetValue( const FProperty* const& InValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags) = 0;
+
+	/**
+	 * Called to manually notify root objects that this property is about to change
+	 * This does not need to be called when SetValue functions are used since it will be called automatically
+	 */
+	virtual void NotifyPreChange() = 0;
+
+	/**
+	 * Called to manually notify root objects that this property has changed
+	 * This does not need to be called when SetValue functions are used since it will be called automatically
+	 */
+	virtual void NotifyPostChange(EPropertyChangeType::Type ChangeType) = 0;
+
+	/**
+	 * Called to manually notify root objects that this property has finished changing
+	 * This does not need to be called when SetValue functions are used since it will be called automatically
+	 */
+	virtual void NotifyFinishedChangingProperties() = 0;
+
+	/**
+	 * Sets the object value from the current editor selection
+	 * Will fail if this handle isn't an object property
+	 */
+	virtual FPropertyAccess::Result SetObjectValueFromSelection() = 0;
+
+	/**
+	 * Gets the number of objects that this handle is editing
+	 */
+	virtual int32 GetNumPerObjectValues() const = 0;
+
+	/**
+	 * Sets a unique value for each object this handle is editing
+	 *
+	 * @param PerObjectValues	The per object values as a formatted string.  There must be one entry per object or the return value is FPropertyAccess::Fail
+	 */
+	virtual FPropertyAccess::Result SetPerObjectValues( const TArray<FString>& PerObjectValues, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+
+	/**
+	 * Gets a unique value for each object this handle is editing
+	 */
+	virtual FPropertyAccess::Result GetPerObjectValues( TArray<FString>& OutPerObjectValues ) const = 0;
+
+	/**
+	 * Sets a value on the specified object that this handle is editing
+	 *
+	 * @param ObjectIndex		The index of the object to set the value of
+	 * @param ObjectValue		The value to set on the given object
+	 */
+	virtual FPropertyAccess::Result SetPerObjectValue( const int32 ObjectIndex, const FString& ObjectValue, EPropertyValueSetFlags::Type Flags = EPropertyValueSetFlags::DefaultFlags ) = 0;
+
+	/**
+	 * Gets a value for the specified object that this handle is editing
+	 *
+	 * @param ObjectIndex		The index of the object to get the value of
+	 * @param OutObjectValue	Filled with the value for this object
+	 */
+	virtual FPropertyAccess::Result GetPerObjectValue( const int32 ObjectIndex, FString& OutObjectValue ) const = 0;
+
+	/**
+	 * @return The index of this element in an array if it is in one.  INDEX_NONE otherwise                                                              
+	 */
+	virtual int32 GetIndexInArray() const = 0;
+
+	/**
+	 * Gets a child handle of this handle.  Useful for accessing properties in structs.  
+	 * Array elements cannot be accessed in this way  
+	 *
+	 * @param ChildName The name of the child
+	 * @param bRecurse	Whether or not to recurse into children of children and so on. If false will only search all immediate children
+	 * @return The property handle for the child if it exists
+	 */
+	virtual TSharedPtr<IPropertyHandle> GetChildHandle( FName ChildName, bool bRecurse = true ) const = 0;
+
+	/**
+	 * Gets a child handle of this handle.  Useful for accessing properties in structs.  
+	 *
+	 * @param The index of the child
+	 * @return The property handle for the child if it exists
+	 */
+	virtual TSharedPtr<IPropertyHandle> GetChildHandle( uint32 Index ) const = 0;
+	
+	/**
+	 * @return a handle to the parent property 
+	 * This parent handle may not contain a valid FProperty if the parent is the uobject.
+	 */
+	virtual TSharedPtr<IPropertyHandle> GetParentHandle() const = 0;
+
+	/**
+	 * @return The property handle to the key element for this value if this is a map element
+	 */
+	virtual TSharedPtr<IPropertyHandle> GetKeyHandle() const = 0;
+
+	/**
+	 * @return The number of children the property handle has
+	 */
+	virtual FPropertyAccess::Result GetNumChildren( uint32& OutNumChildren ) const = 0;
+
+	/**
+	 * @return Get the number objects that contain this property and are being observed in the property editor
+	 */
+	virtual uint32 GetNumOuterObjects() const = 0;
+	
+	/**
+	 * Get the objects that contain this property 
+	 *
+	 * @param OuterObjects	An array that will be populated with the outer objects 
+	 */
+	virtual void GetOuterObjects( TArray<UObject*>& OuterObjects ) const = 0;
+
+	/**
+	 * Get the shared base class of the objects that contain this property.
+	 *
+	 * @return The shared base class of the outer objects, or null if none are selected.
+	 */
+	virtual const UClass* GetOuterBaseClass() const = 0;
+
+	/**
+	 * Set the outer objects for this property
+	 *
+	 * @param OuterObjects An array that contains the new outer objects
+	 */
+	virtual void ReplaceOuterObjects( const TArray<UObject*>& OuterObjects ) = 0;
+
+
+	/**
+	 * Get the packages that contain this property
+	 *
+	 * @param OuterPackages	An array that will be populated with the outer packages
+	 */
+	virtual void GetOuterPackages(TArray<UPackage*>& OuterPackages) const = 0;
+
+	/**
+	 * Enumerate the raw data of this property.  (Each pointer can be cast to the property data type)
+	 *
+	 * @param InRawDataCallback		The function to call for each data
+	 */ 
+	typedef TFunctionRef<bool(void* /*RawData*/, const int32 /*DataIndex*/, const int32 /*NumDatas*/)> EnumerateRawDataFuncRef; /** Return true to continue enumeration */
+	typedef TFunctionRef<bool(const void* /*RawData*/, const int32 /*DataIndex*/, const int32 /*NumDatas*/)> EnumerateConstRawDataFuncRef; /** Return true to continue enumeration */
+	virtual void EnumerateRawData( const EnumerateRawDataFuncRef& InRawDataCallback ) = 0;
+	virtual void EnumerateConstRawData( const EnumerateConstRawDataFuncRef& InRawDataCallback ) const = 0;
+
+	/**
+	 * Accesses the raw data of this property.  (Each pointer can be cast to the property data type)
+	 *
+	 * @param RawData	An array of raw data.  The elements in this array are the raw data for this property on each of the objects in the  property editor
+	 */ 
+	virtual void AccessRawData( TArray<void*>& RawData ) = 0;
+	virtual void AccessRawData( TArray<const void*>& RawData ) const = 0;
+
+	/**
+	 * Returns this handle as an array if possible
+	 *
+	 * @return the handle as an array if it is an array (static or dynamic)
+	 */
+	virtual TSharedPtr<class IPropertyHandleArray> AsArray() = 0;
+
+	/**
+	 * @return This handle as a set if possible
+	 */
+	virtual TSharedPtr<class IPropertyHandleSet> AsSet() = 0;
+
+	/**
+	 * @return This handle as a map if possible
+	 */
+	virtual TSharedPtr<class IPropertyHandleMap> AsMap() = 0;
+
+	/**
+	 * @return The display name of the property
+	 */
+	virtual FText GetPropertyDisplayName() const = 0;
+
+	/** 
+	* Allows the handle to override the node's display name
+	*/
+	virtual void SetPropertyDisplayName(FText InDisplayName) = 0;
+	
+	/**
+	 * Resets the value to its default
+	 */
+	virtual void ResetToDefault() = 0;
+
+	/**
+	 * @return Whether or not the value differs from its default                   
+	 */
+	virtual bool DiffersFromDefault() const = 0;
+
+	/**
+	 * @return A label suitable for displaying the reset to default value
+	 */
+	virtual FText GetResetToDefaultLabel() const = 0;
+
+	/**
+	 * Generates a list of possible enum/class options for the property
+	 */
+	virtual bool GeneratePossibleValues(TArray< TSharedPtr<FString> >& OutOptionStrings, TArray< FText >& OutToolTips, TArray<bool>& OutRestrictedItems) = 0;
+
+	/**
+	 * Marks this property has hidden by customizaton (will not show up in the default place)
+	 */
+	virtual void MarkHiddenByCustomization() = 0;
+
+	/**
+	 * Marks this property has having a custom reset to default (reset to default will not show up in the default place)
+	 */
+	virtual void MarkResetToDefaultCustomized(bool bCustomized = true) = 0;
+
+	/**
+	 * Marks this property as not having a custom reset to default (useful when a widget customizing reset to default goes away)
+	 */
+	virtual void ClearResetToDefaultCustomized() = 0;
+
+	/**
+	 * @return True if this property's UI is customized                                                              
+	 */
+	virtual bool IsCustomized() const = 0;
+
+	/**
+	 * @return True if this property's reset to default UI is customized (but not necessarialy the property UI itself)
+	 */
+	virtual bool IsResetToDefaultCustomized() const = 0;
+
+	/**
+	 * Generates a path from the parent UObject class to this property
+	 *
+	 * @return The path to this property
+	 */
+	virtual FString GeneratePathToProperty() const = 0;
+
+	/**
+	 * Creates a name widget for this property
+	 * @param NameOverride				The name override to use instead of the property name
+	 * @param ToolTipOverride			The tooltip override to use instead of the property name
+	 * @param bDisplayResetToDefault	Whether or not to display the reset to default button
+	 * @param bDisplayText				Whether or not to display the text name of the property
+	 * @param bDisplayThumbnail			Whether or not to display the thumbnail for the property (if any)
+	 * @return the name widget for this property
+	 */
+	virtual TSharedRef<SWidget> CreatePropertyNameWidget( const FText& NameOverride = FText::GetEmpty(), const FText& ToolTipOverride = FText::GetEmpty(), bool bDisplayResetToDefault = false, bool bDisplayText = true, bool bDisplayThumbnail = true ) const = 0;
+
+	/**
+	 * Creates a value widget for this property
+
+	 * @return the value widget for this property
+	 */
+	virtual TSharedRef<SWidget> CreatePropertyValueWidget( bool bDisplayDefaultPropertyButtons = true ) const = 0;
+
+	/**
+	 * Creates the default buttons which appear next to value widgets.  This is useful when creating customizations
+	 * which don't use CreatePropertyValueWidget but you still want array item behaviors and reset to default capabilities.
+	 */
+	virtual TSharedRef<SWidget> CreateDefaultPropertyButtonWidgets() const = 0;
+
+	/**
+	 * Creates the default copy and paste actions for a single property.  This is useful when creating customizations which use
+	 * custom node builders since they can't implement copy/paste by default because the contents of the rows is not known,
+	 * but frequently you're using the handles on each row to generate this UI.
+	 */
+	virtual void CreateDefaultPropertyCopyPasteActions(FUIAction& OutCopyAction, FUIAction& OutPasteAction) const = 0;
+
+	/**
+	 * Adds a restriction to the possible values for this property.
+	 * @param Restriction	The restriction being added to this property.
+	 */
+	virtual void AddRestriction( TSharedRef<const FPropertyRestriction> Restriction ) = 0;
+
+	/**
+	* Tests if a value is restricted for this property
+	* @param Value			The value to test for restriction.
+	* @return				True if this value is restricted.
+	*/
+	virtual bool IsRestricted(const FString& Value) const = 0;
+
+	/**
+	* Tests if a value is restricted for this property.
+	* @param Value			The value to test for restriction.
+	 * @param OutReasons	Outputs an array of the reasons why this value is restricted.
+	* @return				True if this value is restricted.
+	*/
+	virtual bool IsRestricted(const FString& Value, TArray<FText>& OutReasons) const = 0;
+
+	/**
+	 * Generates a consistent tooltip describing this restriction for use in the editor.
+	 * @param Value			The value to test for restriction and generate the tooltip from.
+	 * @param OutTooltip	The tooltip describing why this value is restricted.
+	 * @return				True if this value is restricted.
+	 */
+	virtual bool GenerateRestrictionToolTip(const FString& Value, FText& OutTooltip) const = 0;
+
+	/**
+	* Tests if a value is disabled for this property
+	* @param Value			The value to test whether it is disabled.
+	* @return				True if this value is disabled.
+	*/
+	virtual bool IsDisabled(const FString& Value) const = 0;
+
+	/**
+	* Tests if a value is disabled for this property.
+	* @param Value			The value to test whether it is disabled.
+	* @param OutReasons	Outputs an array of the reasons why this value is disabled.
+	* @return				True if this value is disabled.
+	*/
+	virtual bool IsDisabled(const FString& Value, TArray<FText>& OutReasons) const = 0;
+
+	/**
+	* Tests if a value is hidden for this property
+	* @param Value			The value to test whether it is hidden.
+	* @return				True if this value is hidden.
+	*/
+	virtual bool IsHidden(const FString& Value) const = 0;
+
+	/**
+	* Tests if a value is hidden for this property.
+	* @param Value			The value to test whether it is hidden.
+	* @param OutReasons	Outputs an array of the reasons why this value is hidden.
+	* @return				True if this value is hidden.
+	*/
+	virtual bool IsHidden(const FString& Value, TArray<FText>& OutReasons) const = 0;
+
+	 /** 
+	  * Sets whether or not data validation should occur for this property and all of its children. It is generally unsafe to set this value unless you know what you are doing.  Data validation done by the details panel ensures changes to properties out from under the details panel are known
+	  * This should only ever be set for extremely large arrays or other costly validation checks where validation is handled by the customizer
+	  */
+	virtual void SetIgnoreValidation(bool bInIgnore) = 0;
+	
+	/**
+	 * Adds a child structure
+	 * 
+	 * @param ChildStructure	The structure to add
+	 * @return An array of interfaces to the properties that were added
+	 */
+	virtual TArray<TSharedPtr<IPropertyHandle>> AddChildStructure( TSharedRef<FStructOnScope> ChildStructure ) = 0;
+
+	/**
+	 * Returns whether or not the property can be set to default
+	 * 
+	 * @return If this property can be reset to default
+	 */
+	virtual bool CanResetToDefault() const = 0;
+	
+	/**
+	 * Sets an override for this property's reset to default behavior
+	 */
+	virtual void ExecuteCustomResetToDefault(const FResetToDefaultOverride& OnCustomResetToDefault) = 0;
+
+	/**
+	 * Gets the category FName that a property is in at the default location defined by the class the property is in
+	 * It does not handle the property being moved to another category during customization
+	 */
+	virtual FName GetDefaultCategoryName() const = 0;
+
+	/**
+	* Gets the category display name that a property is in at the default location defined by the class the property is in
+	* It does not handle the property being moved to another category during customization
+	*/
+	virtual FText GetDefaultCategoryText() const = 0;
+};
+
+/**
+ * A handle to an array property which allows you to manipulate the array                                                              
+ */
+class IPropertyHandleArray
+{
+public:
+	virtual ~IPropertyHandleArray(){}
+	
+	/**
+	 * Adds an item to the end of the array
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result AddItem() = 0;
+
+	/**
+	 * Empty the array
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result EmptyArray() = 0;
+
+	/**
+	 * Inserts an item into the array at the specified index
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result Insert( int32 Index ) = 0;
+
+	/**
+	 * Duplicates the item at the specified index in the array.
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result DuplicateItem( int32 Index ) = 0;
+
+	/**
+	 * Deletes the item at the specified index of the array
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result DeleteItem( int32 Index ) = 0;
+
+	/**
+	 * Swaps two items
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result SwapItems( int32 FirstIndex, int32 SecondIndex ) = 0;
+
+	/**
+	 * @return The number of elements in the array
+	 */
+	virtual FPropertyAccess::Result GetNumElements( uint32& OutNumItems ) const = 0;
+
+	/**
+	 * @return a handle to the element at the specified index                                                              
+	 */
+	virtual TSharedRef<IPropertyHandle> GetElement( int32 Index ) const = 0;
+
+	/**
+	* Moves an element from OriginalIndex to NewIndex
+	* @return Whether or not this was successful
+	*/
+	virtual FPropertyAccess::Result MoveElementTo(int32 OriginalIndex, int32 NewIndex) = 0;
+
+
+	/**
+	 * Sets a delegate to call when the number of elements changes                                                  
+	 */
+	virtual void SetOnNumElementsChanged( FSimpleDelegate& InOnNumElementsChanged ) = 0;
+};
+
+/**
+ * A handle to a property which allows you to manipulate a Set
+ */
+class IPropertyHandleSet
+{
+public:
+	virtual ~IPropertyHandleSet(){}
+
+	/**
+	 * @return True if the set contains an element with a default value, false otherwise
+	 */
+	virtual bool HasDefaultElement() = 0;
+
+	/**
+	 * Adds an item to the set.
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result AddItem() = 0;
+
+	/**
+	 * Empties the set
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result Empty() = 0;
+
+	/**
+	* Deletes the item in the set with the specified internal index
+	* @return Whether or not this was successful
+	*/
+	virtual FPropertyAccess::Result DeleteItem(int32 Index) = 0;
+
+	/**
+	 * @return The number of elements in the set
+	 */
+	virtual FPropertyAccess::Result GetNumElements(uint32& OutNumElements) = 0;
+
+	/**
+	 * Sets a delegate to call when the number of elements changes
+	 */
+	virtual void SetOnNumElementsChanged(FSimpleDelegate& InOnNumElementsChanged) = 0;
+};
+
+/**
+ * A handle to a property which allows you to manipulate a Map
+ */
+class IPropertyHandleMap
+{
+public:
+	virtual ~IPropertyHandleMap() {}
+
+	/**
+	 * @return True if the map contains a key with a default value, false otherwise
+	 */
+	virtual bool HasDefaultKey() = 0;
+
+	/**
+	 * Adds an item to the map.
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result AddItem() = 0;
+
+	/**
+	 * Empties the map
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result Empty() = 0;
+
+	/**
+	 * Deletes the item in the map with the specified internal index
+	 * @return Whether or not this was successful
+	 */
+	virtual FPropertyAccess::Result DeleteItem(int32 Index) = 0;
+
+	/**
+	 * @return The number of elements in the map
+	 */
+	virtual FPropertyAccess::Result GetNumElements(uint32& OutNumElements) = 0;
+
+	/**
+	 * Sets a delegate to call when the number of elements changes
+	 */
+	virtual void SetOnNumElementsChanged(FSimpleDelegate& InOnNumElementsChanged) = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyPath.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyPath.h
new file mode 100644
index 0000000..add0ac3
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyPath.h
@@ -0,0 +1,242 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/UnrealType.h"
+#include "UObject/WeakFieldPtr.h"
+
+namespace soda
+{
+
+struct FPropertyInfo
+{
+public:
+
+	FPropertyInfo()
+		: Property()
+		, ArrayIndex(INDEX_NONE)
+	{}
+
+	FPropertyInfo(TWeakFieldPtr< FProperty > InProperty, int32 InArrayIndex = INDEX_NONE)
+		: Property(InProperty)
+		, ArrayIndex(InArrayIndex)
+	{}
+
+	bool operator==( const FPropertyInfo& Other ) const 
+	{
+		return Property == Other.Property && ArrayIndex == Other.ArrayIndex;
+	}
+
+	bool operator!=( const FPropertyInfo& Other ) const 
+	{
+		return !(*this == Other);
+	}
+
+	TWeakFieldPtr<FProperty> Property;
+	int32 ArrayIndex;
+};
+
+
+class FPropertyPath
+{
+public:
+
+	static TSharedRef< FPropertyPath > CreateEmpty()
+	{
+		return MakeShareable( new FPropertyPath() );
+	}
+
+	static TSharedRef< FPropertyPath > Create( const TWeakFieldPtr<FProperty> Property )
+	{
+		TSharedRef< FPropertyPath > NewPath = MakeShareable( new FPropertyPath() );
+
+		FPropertyInfo NewPropInfo;
+		NewPropInfo.Property = Property;
+		NewPropInfo.ArrayIndex = INDEX_NONE;
+
+		NewPath->Properties.Add( NewPropInfo );
+
+		return NewPath;
+	}
+
+	int32 GetNumProperties() const 
+	{ 
+		return Properties.Num(); 
+	}
+
+	const FPropertyInfo& GetPropertyInfo( int32 index ) const
+	{
+		return Properties[ index ];
+	}
+
+	const FPropertyInfo& GetLeafMostProperty() const
+	{
+		return Properties[ Properties.Num() - 1 ];
+	}
+
+	const FPropertyInfo& GetRootProperty() const
+	{
+		return Properties[ 0 ];
+	}
+
+	TSharedRef< FPropertyPath > ExtendPath( const FPropertyInfo& NewLeaf )
+	{
+		TSharedRef< FPropertyPath > NewPath = MakeShareable( new FPropertyPath() );
+
+		NewPath->Properties = Properties;
+		NewPath->Properties.Add( NewLeaf );
+		
+		return NewPath;
+	}
+
+	TSharedRef< FPropertyPath > ExtendPath( const TSharedRef< FPropertyPath >& Extension )
+	{
+		TSharedRef< FPropertyPath > NewPath = MakeShareable( new FPropertyPath() );
+
+		NewPath->Properties = Properties;
+
+		for (int Index = Extension->GetNumProperties() - 1; Index >= 0 ; Index--)
+		{
+			NewPath->Properties.Add( Extension->GetPropertyInfo( Index ) );
+		}
+
+		return NewPath;
+	}
+
+	TSharedRef< FPropertyPath > TrimPath( const int32 AmountToTrim )
+	{
+		TSharedRef< FPropertyPath > NewPath = MakeShareable( new FPropertyPath() );
+
+		NewPath->Properties = Properties;
+
+		for (int Count = 0; Count < AmountToTrim; Count++)
+		{
+			NewPath->Properties.Pop();
+		}
+
+		return NewPath;
+	}
+
+	TSharedRef< FPropertyPath > TrimRoot( const int32 AmountToTrim )
+	{
+		TSharedRef< FPropertyPath > NewPath = MakeShareable( new FPropertyPath() );
+
+		for (int Count = AmountToTrim; Count < Properties.Num(); Count++)
+		{
+			NewPath->Properties.Add( Properties[ Count ] );
+		}
+
+		return NewPath;
+	}
+
+	FString ToString(const TCHAR* Separator = TEXT("->")) const
+	{
+		FString NewDisplayName;
+		bool FirstAddition = true;
+		for (int PropertyIndex = 0; PropertyIndex < Properties.Num(); PropertyIndex++)
+		{
+			const FPropertyInfo& PropInfo = Properties[ PropertyIndex ];
+			if ( !(PropInfo.Property->IsA( FArrayProperty::StaticClass() ) && PropertyIndex != Properties.Num() - 1 ) )
+			{
+				if ( !FirstAddition )
+				{
+					NewDisplayName += Separator;
+				}
+
+				NewDisplayName += PropInfo.Property->GetFName().ToString();
+
+				if ( PropInfo.ArrayIndex != INDEX_NONE )
+				{
+					NewDisplayName += FString::Printf( TEXT( "[%d]" ), PropInfo.ArrayIndex );
+				}
+
+				FirstAddition = false;
+			}
+		}
+
+		return NewDisplayName;
+	}
+
+	/**
+	 * Add another property to be associated with this path
+	 */
+	void AddProperty( const FPropertyInfo& InProperty )
+	{
+		Properties.Add( InProperty );
+	}
+
+
+	static bool AreEqual( const TSharedRef< FPropertyPath >& PathLhs, const TSharedRef< FPropertyPath >& PathRhs )
+	{
+		bool Result = false;
+
+		if ( PathLhs->GetNumProperties() == PathRhs->GetNumProperties() )
+		{
+			bool FoundMatch = true;
+			for( int Index = PathLhs->GetNumProperties() - 1; Index >= 0; --Index )
+			{
+				const FPropertyInfo& LhsPropInfo = PathLhs->GetPropertyInfo( Index );
+				const FPropertyInfo& RhsPropInfo = PathRhs->GetPropertyInfo( Index );
+
+				if ( LhsPropInfo.Property != RhsPropInfo.Property ||
+					LhsPropInfo.ArrayIndex != RhsPropInfo.ArrayIndex )
+				{
+					FoundMatch = false;
+					break;
+				}
+			}
+
+			if ( FoundMatch )
+			{
+				Result = true;
+			}
+		}
+
+		return Result;
+	}
+
+private:
+
+	TArray< FPropertyInfo > Properties;
+};
+
+FORCEINLINE bool operator==( const FPropertyPath& LHS, const FPropertyPath& RHS )
+{
+	if( LHS.GetNumProperties() != RHS.GetNumProperties() )
+	{
+		return false;
+	}
+
+	for( int32 i = 0, end = RHS.GetNumProperties(); i != end; ++i )
+	{
+		if( LHS.GetPropertyInfo(i) != RHS.GetPropertyInfo(i) )
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+FORCEINLINE bool operator!=(const FPropertyPath& LHS, const FPropertyPath& RHS)
+{
+	return !(LHS == RHS);
+}
+
+FORCEINLINE uint32 GetTypeHash(FPropertyPath const& Path)
+{
+	//lets concat the name and just hash the string
+	uint32 Ret = 0;
+	for( int32 i = 0, end = Path.GetNumProperties(); i != end; ++i )
+	{
+		if( Path.GetPropertyInfo(i).Property.IsValid() )
+		{
+			Ret = Ret ^ GetTypeHash(Path.GetPropertyInfo(i).Property->GetFName());
+		}
+	}
+	return Ret;
+}
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyRestriction.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyRestriction.h
new file mode 100644
index 0000000..93803ab
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/PropertyRestriction.h
@@ -0,0 +1,48 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+namespace soda
+{
+
+class RUNTIMEEDITOR_API FPropertyRestriction
+{
+public:
+
+	FPropertyRestriction(const FText& InReason)
+		: Reason(InReason)
+	{
+	}
+
+	const FText& GetReason() const { return Reason; }
+
+	bool IsValueHidden(const FString& Value) const;
+	bool IsValueDisabled(const FString& Value) const;
+	void AddHiddenValue(FString Value);
+	void AddDisabledValue(FString Value);
+
+	void RemoveHiddenValue(FString Value);
+	void RemoveDisabledValue(FString Value);
+	void RemoveAll();
+
+	TArray<FString>::TConstIterator GetHiddenValuesIterator() const 
+	{
+		return HiddenValues.CreateConstIterator();
+	}
+
+	TArray<FString>::TConstIterator GetDisabledValuesIterator() const
+	{
+		return DisabledValues.CreateConstIterator();
+	}
+
+private:
+
+	TArray<FString> HiddenValues;
+	TArray<FString> DisabledValues;
+	FText Reason;
+};
+
+}
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/SResetToDefaultMenu.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/SResetToDefaultMenu.h
new file mode 100644
index 0000000..4cd9c20
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/SResetToDefaultMenu.h
@@ -0,0 +1,106 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Layout/Visibility.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+
+namespace soda
+{
+
+class IPropertyHandle;
+
+/** 
+ * Delegate used to get the text to display when resetting our value
+ * This will only be used when we are not using a property handle.
+ */
+DECLARE_DELEGATE_RetVal(FText, FOnGetResetToDefaultText);
+
+/**
+ * Displays a reset to default menu for a set of properties
+ * Will hide itself automatically when all of the properties being observed are already at their default values
+ */
+class RUNTIMEEDITOR_API SResetToDefaultMenu : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SResetToDefaultMenu )
+		: _VisibilityWhenDefault( EVisibility::Hidden )
+		, _DiffersFromDefault( false )
+	{}
+		/** 
+		 * The visibility of this widget when the value is default 
+		 * and the reset to default option does need to be shown
+		 */
+		SLATE_ARGUMENT( EVisibility, VisibilityWhenDefault )
+
+		/** 
+		 * Attribute used to determine whether we are different from the default. Only used
+		 * when we do not have a valid property handle
+		 */
+		SLATE_ATTRIBUTE( bool, DiffersFromDefault )
+
+		/** Delegate fired when we reset to default - only used when we don't have a property handle */
+		SLATE_ARGUMENT(FSimpleDelegate, OnResetToDefault)
+
+		/** Delegate used to get the text to display when resetting our value - only used when we don't have a property handle */
+		SLATE_ARGUMENT(FOnGetResetToDefaultText, OnGetResetToDefaultText)
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs );
+
+	/**
+	 * Adds a new property to the menu that is displayed when a user clicks the reset to default button
+	 *
+	 * @param InProperty	The property handle to display
+	 */
+	void AddProperty( TSharedRef<IPropertyHandle> InProperty );
+
+private:
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+
+	/**
+	 * @return The visibility of the reset to default widget
+	 */
+	EVisibility GetResetToDefaultVisibility() const;
+
+	/**
+	 * Called when the menu is open to regenerate the default menu content
+	 */
+	TSharedRef<class SWidget> OnGenerateResetToDefaultMenuContent();
+
+	/**
+	 * Resets property to default, only used when our property handle is not valid.
+	 */
+	void ResetToDefault();
+
+	/**
+	 * Resets all properties to default
+	 */
+	void ResetAllToDefault();
+private:
+
+	/** Properties that should be displayed in the menu */
+	TArray< TSharedRef<IPropertyHandle> > Properties;
+
+	/** The visibility to use when the properties are already the default */
+	EVisibility VisibilityWhenDefault;
+
+	/** Whether or this menu should be visible */
+	bool bShouldBeVisible;
+
+	/** Attribute used to determine whether we are different from the default */
+	TAttribute<bool> DiffersFromDefault;
+
+	/** Delegate fired when we reset to default - only used when we don't have a property handle */
+	FSimpleDelegate OnResetToDefault;
+
+	/** Delegate used to get the text to display when resetting our value - only used when we don't have a property handle */
+	FOnGetResetToDefaultText OnGetResetToDefaultText;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/SResetToDefaultPropertyEditor.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/SResetToDefaultPropertyEditor.h
new file mode 100644
index 0000000..37c33be
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/SResetToDefaultPropertyEditor.h
@@ -0,0 +1,56 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+
+namespace soda
+{
+
+// Forward decl
+class FResetToDefaultOverride;
+
+/** Widget showing the reset to default value button */
+class RUNTIMEEDITOR_API SResetToDefaultPropertyEditor : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS( SResetToDefaultPropertyEditor )
+		: _NonVisibleState( EVisibility::Hidden )
+		{}
+		SLATE_ARGUMENT( EVisibility, NonVisibleState )
+		SLATE_ARGUMENT( TOptional<FResetToDefaultOverride>, CustomResetToDefault )
+	SLATE_END_ARGS()
+
+	~SResetToDefaultPropertyEditor();
+
+	void Construct( const FArguments& InArgs, const TSharedPtr< class IPropertyHandle>& InPropertyHandle );
+
+private:
+	FText GetResetToolTip() const;
+
+	EVisibility GetDiffersFromDefaultAsVisibility() const;
+
+	void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime );
+
+	FReply OnResetClicked();
+
+	void UpdateDiffersFromDefaultState();
+
+private:
+	TOptional<FResetToDefaultOverride> OptionalCustomResetToDefault;
+
+	TSharedPtr< class IPropertyHandle > PropertyHandle;
+
+	EVisibility NonVisibleState;
+
+	bool bValueDiffersFromDefault;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/RuntimePropertyEditor/SStandaloneCustomizedValueWidget.h b/Source/RuntimeEditor/Public/RuntimePropertyEditor/SStandaloneCustomizedValueWidget.h
new file mode 100644
index 0000000..23130c7
--- /dev/null
+++ b/Source/RuntimeEditor/Public/RuntimePropertyEditor/SStandaloneCustomizedValueWidget.h
@@ -0,0 +1,59 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/DetailGroup.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "Widgets/SCompoundWidget.h"
+
+namespace soda
+{
+
+/**
+ * Generates the header widget for a customized struct or other type.
+ * This widget is generally used in the property editor to display a struct as a single row, like with an FColor.
+ * Properties passed in that do not have a header customization will return a null widget.
+ */
+class RUNTIMEEDITOR_API SStandaloneCustomizedValueWidget : public SCompoundWidget, public IPropertyTypeCustomizationUtils
+{
+public:
+	SLATE_BEGIN_ARGS( SStandaloneCustomizedValueWidget )
+	{}
+		/** Optional Parent Detail Category, useful to access Thumbnail Pool. */
+		SLATE_ARGUMENT( TSharedPtr<FDetailCategoryImpl>, ParentCategory)
+	SLATE_END_ARGS()
+	
+	void Construct( const FArguments& InArgs,
+		TSharedPtr<IPropertyTypeCustomization> InCustomizationInterface, TSharedRef<IPropertyHandle> InPropertyHandle)
+	{
+		ParentCategory = InArgs._ParentCategory;
+		
+		CustomizationInterface = InCustomizationInterface;
+		PropertyHandle = InPropertyHandle;
+		CustomPropertyWidget = MakeShareable(new FDetailWidgetRow);
+
+		CustomizationInterface->CustomizeHeader(InPropertyHandle, *CustomPropertyWidget, *this);
+
+		ChildSlot
+		[
+			CustomPropertyWidget->ValueWidget.Widget
+		];
+	}
+
+	/*
+	virtual TSharedPtr<FAssetThumbnailPool> GetThumbnailPool() const override
+	{
+		TSharedPtr<FDetailCategoryImpl> ParentCategoryPinned = ParentCategory.Pin();
+		return ParentCategoryPinned.IsValid() ? ParentCategoryPinned->GetParentLayout().GetThumbnailPool() : NULL;
+	}
+	*/
+
+private:
+	TWeakPtr<FDetailCategoryImpl> ParentCategory;
+	TSharedPtr<IPropertyTypeCustomization> CustomizationInterface;
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+	TSharedPtr<FDetailWidgetRow> CustomPropertyWidget;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/Public/SodaEditorWidgets/IObjectNameEditableTextBox.h b/Source/RuntimeEditor/Public/SodaEditorWidgets/IObjectNameEditableTextBox.h
new file mode 100644
index 0000000..de40b45
--- /dev/null
+++ b/Source/RuntimeEditor/Public/SodaEditorWidgets/IObjectNameEditableTextBox.h
@@ -0,0 +1,21 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "Layout/Margin.h"
+#include "Widgets/SCompoundWidget.h"
+
+namespace soda
+{
+
+/** Interface for the widget that wraps an editable text box for viewing the names of objects or editing the labels of actors */
+class IObjectNameEditableTextBox : public SCompoundWidget
+{
+public:
+	static TSharedRef<IObjectNameEditableTextBox> CreateObjectNameEditableTextBox(const TArray<TWeakObjectPtr<UObject>>& Objects);
+};
+
+}
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/SodaEditorWidgets/SKeySelector.h b/Source/RuntimeEditor/Public/SodaEditorWidgets/SKeySelector.h
new file mode 100644
index 0000000..e0d6505
--- /dev/null
+++ b/Source/RuntimeEditor/Public/SodaEditorWidgets/SKeySelector.h
@@ -0,0 +1,141 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SlateFwd.h"
+#include "Misc/Attribute.h"
+#include "InputCoreTypes.h"
+#include "Types/SlateStructs.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "Widgets/Views/STreeView.h"
+#include "SodaStyleSet.h"
+
+class SComboButton;
+
+namespace soda
+{
+class FKeyTreeInfo;
+
+DECLARE_DELEGATE_OneParam(FOnKeyChanged, TSharedPtr<FKey>)
+
+//////////////////////////////////////////////////////////////////////////
+// SKeySelector
+
+typedef TSharedPtr<FKeyTreeInfo> FKeyTreeItem;
+typedef STreeView<FKeyTreeItem> SKeyTreeView;
+
+/** Widget for selecting an input key */
+class RUNTIMEEDITOR_API SKeySelector : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SKeySelector )
+		: _CurrentKey(FKey())
+		, _TreeViewWidth(300.f)
+		, _TreeViewHeight(400.f)
+		, _Font( FSodaStyle::GetFontStyle( TEXT("NormalFont") ) )
+		, _FilterBlueprintBindable( true )
+		, _AllowClear( true )
+		{}
+		SLATE_ATTRIBUTE( TOptional<FKey>, CurrentKey )
+		SLATE_ATTRIBUTE( FOptionalSize, TreeViewWidth )
+		SLATE_ATTRIBUTE( FOptionalSize, TreeViewHeight )
+		SLATE_EVENT( FOnKeyChanged, OnKeyChanged )
+		SLATE_ATTRIBUTE( FSlateFontInfo, Font )
+		SLATE_ARGUMENT( bool, FilterBlueprintBindable )
+		SLATE_ARGUMENT( bool, AllowClear )
+	SLATE_END_ARGS()
+public:
+	void Construct(const FArguments& InArgs);
+
+protected:
+	/** Gets the icon for the key being manipulated */
+	const FSlateBrush* GetKeyIconImage() const;
+	/** Toggles the icon's color when in listen mode */
+	FSlateColor GetKeyIconColor() const;
+
+	/** Gets a succinct description for the key being manipulated */
+	FText GetKeyDescription() const;
+	/** Gets a tooltip for the selected key */
+	FText GetKeyTooltip() const;
+
+	/** Treeview support functions */
+	virtual TSharedRef<ITableRow> GenerateKeyTreeRow(FKeyTreeItem InItem, const TSharedRef<STableViewBase>& OwnerTree);
+	void OnKeySelectionChanged(FKeyTreeItem Selection, ESelectInfo::Type SelectInfo);
+	void GetKeyChildren(FKeyTreeItem InItem, TArray<FKeyTreeItem>& OutChildren);
+
+	/** Gets the Menu Content, setting it up if necessary */
+	virtual TSharedRef<SWidget>	GetMenuContent();
+
+	/** Key searching support */
+	void OnFilterTextChanged(const FText& NewText);
+	void OnFilterTextCommitted(const FText& NewText, ETextCommit::Type CommitInfo);
+	void GetSearchTokens(const FString& SearchString, TArray<FString>& OutTokens) const;
+
+	/** Helper to generate the filtered list of keys, based on the search string matching */
+	bool GetChildrenMatchingSearch(const TArray<FString>& SearchTokens, const TArray<FKeyTreeItem>& UnfilteredList, TArray<FKeyTreeItem>& OutFilteredList);
+
+	/** Start listening for the next key press */
+	FReply ListenForInput();
+	/** Assigns the heard input as the current key */
+	FReply ProcessHeardInput(FKey KeyHeard);
+
+	virtual bool SupportsKeyboardFocus() const override { return bListenForNextInput; }
+
+	/** Input listeners */
+	virtual FReply OnKeyDown(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent) override;
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual FReply OnMouseWheel(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual FReply OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual FReply OnAnalogValueChanged(const FGeometry& MyGeometry, const FAnalogInputEvent& InAnalogInputEvent) override;
+
+	/** 
+	 * Determine the best icon to represent the given key.
+	 *
+	 * @param Key		The key to get the icon for.
+	 * @param returns a brush that best represents the icon
+	 */
+	const FSlateBrush* GetIconFromKey(FKey Key) const;
+
+protected:
+	/** Combo Button that shows current key and icon */
+	TSharedPtr<SComboButton>	KeyComboButton;
+
+	/** Reference to the menu content that's displayed when the key button is clicked on */
+	TSharedPtr<SWidget>			MenuContent;
+	TSharedPtr<SSearchBox>		FilterTextBox;
+	TSharedPtr<SKeyTreeView>	KeyTreeView;
+	FText						SearchText;
+
+	/** The key attribute that we're modifying with this widget, or an empty optional if the key contains multiple values */
+	TAttribute<TOptional<FKey>>	CurrentKey;
+
+	/** Delegate that is called every time the key changes. */
+	FOnKeyChanged				OnKeyChanged;
+
+	/** Desired width of the tree view widget */
+	TAttribute<FOptionalSize>	TreeViewWidth;
+	/** Desired height of the tree view widget */
+	TAttribute<FOptionalSize>	TreeViewHeight;
+
+	/** Font used for category tree entries */
+	FSlateFontInfo				CategoryFont;
+	/** Font used for key tree entries */
+	FSlateFontInfo				KeyFont;
+
+	/** Array containing the unfiltered list of all values this key could possibly have */
+	TArray<FKeyTreeItem>		KeyTreeRoot;
+	/** Array containing a filtered list, according to the text in the searchbox */
+	TArray<FKeyTreeItem>		FilteredKeyTreeRoot;
+
+	bool bListenForNextInput = false;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/RuntimeEditor/Public/SodaEditorWidgets/SListViewSelectorDropdownMenu.h b/Source/RuntimeEditor/Public/SodaEditorWidgets/SListViewSelectorDropdownMenu.h
new file mode 100644
index 0000000..e983af8
--- /dev/null
+++ b/Source/RuntimeEditor/Public/SodaEditorWidgets/SListViewSelectorDropdownMenu.h
@@ -0,0 +1,92 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "InputCoreTypes.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Input/Events.h"
+#include "Input/Reply.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Views/STableRow.h"
+#include "Widgets/Input/SSearchBox.h"
+
+namespace soda
+{
+/** This is a container widget to help refocus to a listview widget from a searchbox or other text box widgets that are used in conjunction.
+	Will refocus when the up or down arrows are pressed, and will commit a selection when enter is pressed regardless of where focus is. */
+template <typename ListType>
+class SListViewSelectorDropdownMenu : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SListViewSelectorDropdownMenu )
+		{}
+		SLATE_DEFAULT_SLOT( FArguments, Content )
+	SLATE_END_ARGS()
+public:
+	/**
+	 * @param InDefaultfocusWidget		The default widget to give focus to when the listview does not handle an action
+	 * @param InTargetListView			If the SListViewSelectorDropdownMenu is handling the KeyDown event, focus will be applied to the TargetListView for certain keys that it can handle
+	 */
+	void Construct(const FArguments& InArgs, TSharedPtr<SSearchBox> InDefaultFocusWidget, TSharedPtr< SListView< ListType > > InTargetListView)
+	{
+		check(InTargetListView.IsValid());
+
+		TargetListView = InTargetListView;
+		DefaultFocusWidget = InDefaultFocusWidget;
+
+		if (DefaultFocusWidget.IsValid())
+		{
+			// We have some overrides for OnKeyDown handling of the SSearchBox to provide the seamless functionality
+			InDefaultFocusWidget->SetOnKeyDownHandler(FOnKeyDown::CreateSP(this, &SListViewSelectorDropdownMenu<ListType>::OnKeyDown));
+		}
+
+		this->ChildSlot
+		[
+			InArgs._Content.Widget
+		];
+	}
+
+	// SWidget interface
+	virtual FReply OnKeyDown(const FGeometry& MyGeometry, const FKeyEvent& KeyEvent) override
+	{
+		TSharedPtr< SListView< ListType > > TargetListViewPtr = TargetListView.Pin();
+
+		if (KeyEvent.GetKey() == EKeys::Up || KeyEvent.GetKey() == EKeys::Down)
+		{
+			// Deliver focus to the tree view, so the user can use the arrow keys to move through the items
+			return TargetListViewPtr->OnKeyDown(FindChildGeometry(MyGeometry, TargetListViewPtr.ToSharedRef()), KeyEvent);
+		}
+		else if(KeyEvent.GetKey() == EKeys::Enter)
+		{
+			// If there is anything selected, re-select it "direct" so that the menu will act upon the selection
+			if(TargetListViewPtr->GetNumItemsSelected() > 0)
+			{
+				TargetListViewPtr->SetSelection(TargetListViewPtr->GetSelectedItems()[0]);
+			}
+			return FReply::Handled();
+		}
+		else if (DefaultFocusWidget.IsValid())
+		{
+			TSharedPtr< SWidget > DefaultFocusWidgetPtr = DefaultFocusWidget.Pin();
+			FReply Reply = DefaultFocusWidgetPtr->OnKeyDown(FindChildGeometry(MyGeometry, TargetListViewPtr.ToSharedRef()), KeyEvent);
+
+			if (!DefaultFocusWidgetPtr->HasKeyboardFocus())
+			{
+				Reply.SetUserFocus(DefaultFocusWidgetPtr.ToSharedRef(), EFocusCause::OtherWidgetLostFocus);
+			}
+			return Reply;
+		}
+		return FReply::Unhandled();
+	}
+	// End of SWidget interface
+
+private:
+	/** The type tree view widget this is handling keyboard input for */
+	TWeakPtr< SListView<ListType> > TargetListView;
+	/** Widget to revert focus back to when this widget does not handle (or forward) a key input */
+	TWeakPtr< SSearchBox > DefaultFocusWidget;
+};
+
+} // namespace soda
diff --git a/Source/RuntimeEditor/RuntimeEditor.Build.cs b/Source/RuntimeEditor/RuntimeEditor.Build.cs
new file mode 100644
index 0000000..3e03f35
--- /dev/null
+++ b/Source/RuntimeEditor/RuntimeEditor.Build.cs
@@ -0,0 +1,89 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+using UnrealBuildTool;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.IO;
+using System;
+
+public class RuntimeEditor : ModuleRules
+{
+	public RuntimeEditor(ReadOnlyTargetRules Target) : base(Target)
+	{
+        PublicIncludePaths.AddRange(
+			new string[] 
+			{
+				Path.Combine(ModuleDirectory, "Public"),
+			}
+		);
+
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				Path.Combine(ModuleDirectory, "Private"),
+			}
+		);
+
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+				"Engine",
+				"PropertyPath",
+				"DesktopPlatform",
+				"AppFramework",
+				"ApplicationCore",
+				"InputCore",
+				"Slate",
+				"SlateCore",
+				"Json",
+				"JsonUtilities",
+				"SodaStyle"
+			}
+		);
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"ToolWidgets",
+				"RHI",
+				//"Settings",
+				//"MainFrame"
+				"Projects",
+                "DeveloperSettings",
+                "AssetRegistry"
+            }
+		);
+		
+		//bEnableExceptions = true;
+		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+		//bEnableUndefinedIdentifierWarnings = false;
+		//bUseRTTI = true;
+		//MinFilesUsingPrecompiledHeaderOverride = 1;
+		//bFasterWithoutUnity = true;
+		//bUsePrecompiled = true;
+		bUseUnity = false;
+
+		// The Shipping configuration isn't supported yet
+		/*
+        if (Target.Configuration != UnrealTargetConfiguration.Shipping)
+        {
+            PrecompileForTargets = PrecompileTargetsType.Any;
+        }
+        else
+        {
+            PrecompileForTargets = PrecompileTargetsType.None;
+        }
+		*/
+
+		if (Target.Configuration == UnrealTargetConfiguration.Shipping)
+		{
+			throw new NullReferenceException("The Shipping configuration isn't supported yet");
+        }
+
+        if (!Directory.Exists(ModuleDirectory + "/Private"))
+        {
+            bUsePrecompiled = true;
+        }
+    }
+}
diff --git a/Source/SodaJoystick/Private/JoystickGameSettings.cpp b/Source/SodaJoystick/Private/JoystickGameSettings.cpp
new file mode 100644
index 0000000..e359d56
--- /dev/null
+++ b/Source/SodaJoystick/Private/JoystickGameSettings.cpp
@@ -0,0 +1,33 @@
+// Copyright 2015 Moritz Wundke. All Rights Reserved.
+// Released under MIT.
+
+#include "JoystickGameSettings.h"
+
+UJoystickGameSettings::UJoystickGameSettings(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer),
+	VirtualAxesNum(18),
+	VirtualButtonsNum(16)
+{
+	SetAnalogAxesNum(VirtualAxesNum);
+}
+
+FAxisStruct* UJoystickGameSettings::GetAxisSettings(int i)
+{
+	if (AnalogAxes.Num() > i)
+	{
+		return &AnalogAxes[i];
+	}
+	else
+	{
+		return NULL;
+	}
+}
+
+void UJoystickGameSettings::SetAnalogAxesNum(int num)
+{
+	if (num > VirtualAxesNum)
+	{
+		VirtualAxesNum = num;
+	}
+	AnalogAxes.SetNum(VirtualAxesNum);
+	CurrentAxesValues.SetNum(VirtualAxesNum);
+}
diff --git a/Source/SodaJoystick/Private/SDLJoystickDevice.cpp b/Source/SodaJoystick/Private/SDLJoystickDevice.cpp
new file mode 100644
index 0000000..bacd456
--- /dev/null
+++ b/Source/SodaJoystick/Private/SDLJoystickDevice.cpp
@@ -0,0 +1,442 @@
+// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
+
+#include "SDLJoystickDevice.h"
+#include "Framework/Application/SlateApplication.h"
+#include "SodaJoystickPrivatePCH.h"
+#include "IInputInterface.h"
+#include <algorithm>
+
+DEFINE_LOG_CATEGORY(SodaSDLJoystickDevice);
+
+
+FSDLJoystickDevice::FSDLJoystickDevice(const TSharedRef<FGenericApplicationMessageHandler>& InMessageHandler) :
+	MessageHandler(InMessageHandler)
+{
+	Settings = GetMutableDefault<UJoystickGameSettings>();
+
+	if (SDL_WasInit(0) != 0)
+	{
+	//	UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_WasInit(0) - SDL already loaded"));
+	}
+	else
+	{
+	//	UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDLJoystickDevice::InitSDL() SDL init 0"));
+		SDL_Init(0);
+	}
+	
+	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
+
+	// Initialize the joystick subsystem
+	int result = SDL_InitSubSystem(SDL_INIT_JOYSTICK);
+	result = SDL_InitSubSystem(SDL_INIT_HAPTIC);
+
+	if (!SDLStartup())
+	{
+	//	ActualizeAxesNum();
+	//	ActualizeButtonsNum();
+	}
+}
+
+
+void FSDLJoystickDevice::SetCentringForce(int Percent)
+{
+	CentringForceMax = Percent;
+}
+
+
+FSDLJoystickDevice::~FSDLJoystickDevice()
+{
+	// Close your device here
+}
+
+
+void FSDLJoystickDevice::Tick(float DeltaTime)
+{
+	if (!Joys.Num())
+	{
+		if (NoJoyWaitTimer < 0)
+		{
+			SDLStartup();
+			NoJoyWaitTimer = NoJoyWaitTime;
+		}
+		else
+			NoJoyWaitTimer -= DeltaTime;
+	}
+}
+
+
+void FSDLJoystickDevice::SendControllerEvents()
+{
+	if (SDL_NumJoysticks() <= 0 || !Joys.Num())
+		return;
+
+	// Poll your device here and fire off events related to its current state
+	SDL_JoystickUpdate();
+
+	FInputDeviceId PrimaryInputDevice = IPlatformInputDeviceMapper::Get().GetPrimaryInputDeviceForUser(FSlateApplicationBase::SlateAppPrimaryPlatformUser);
+
+	for (int i = 0; i < AxesNum; ++i)
+	{
+		int AxixValue = (int)SDL_JoystickGetAxis(Joys[AnalogAxes[i].DeviceIndex], AnalogAxes[i].Index);
+		FSlateApplication::Get().OnControllerAnalog(*(AnalogAxes[i].Name), FSlateApplicationBase::SlateAppPrimaryPlatformUser, PrimaryInputDevice, AnalogAxes[i].SettingsStruct->GetScaledValue(AxixValue));
+		if (Settings)
+		{
+			Settings->CurrentAxesValues[i] = AnalogAxes[i].SettingsStruct->GetScaledValue(AxixValue);
+		}
+
+		//		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Sending dummy analog controller event! Name = %s,  Value = %d"), *(AnalogAxes[i].Name), AxixValue);
+	}
+
+	for (int i = 0; i < ButtonsNum; ++i)
+	{
+		int ButtonValue = SDL_JoystickGetButton(Joys[Buttons[i].DeviceIndex], i);
+		FSlateApplication::Get().OnControllerAnalog(*Buttons[i].Name, FSlateApplicationBase::SlateAppPrimaryPlatformUser, PrimaryInputDevice, ButtonValue);
+
+		if (ButtonValue && Settings)
+		{
+			Settings->LastButtonDown = FText::FromString(FString::Printf(TEXT("%s"), *Buttons[i].Key.ToString()));
+		}
+
+		//		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Button %d: Value = %d"), i, ButtonValue);
+	}
+}
+
+
+void FSDLJoystickDevice::SetMessageHandler(const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler)
+{
+	MessageHandler = InMessageHandler;
+}
+
+
+bool FSDLJoystickDevice::Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar)
+{
+	// Nothing necessary to do (boilerplate code to complete the interface)
+	return false;
+}
+
+
+void FSDLJoystickDevice::SetChannelValue(int32 ControllerId, FForceFeedbackChannelType ChannelType, float Value)
+{
+	//	UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SetChannelValue"));
+		// Nothing necessary to do (boilerplate code to complete the interface)
+}
+
+
+void FSDLJoystickDevice::SetChannelValues(int32 ControllerId, const FForceFeedbackValues& values)
+{
+	//	UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SetChannelValues"));
+		// Nothing necessary to do (boilerplate code to complete the interface)
+}
+
+void FSDLJoystickDevice::UpdateEKeys(int NumAxes, int NumButtons)
+{
+#define LOCTEXT_NAMESPACE "InputKeys"
+
+	for (int i = RegisteredAxesNum; i < NumAxes; ++i)
+	{
+		EKeys::AddKey(FKeyDetails(
+			FKey(*FString::Printf(TEXT("SodaAxis%d"), i)),
+			FText::Format(LOCTEXT("Soda axis", "Soda Analog Axis {0}"), i),
+			FKeyDetails::GamepadKey | FKeyDetails::Axis1D,
+			TEXT("SodaJoy")));
+	}
+
+	for (int i = RegisteredButtonsNum; i < NumButtons; ++i)
+	{
+		EKeys::AddKey(FKeyDetails(
+			FKey(*FString::Printf(TEXT("SodaButton%d"), i)),
+			FText::Format(LOCTEXT("Soda button", "Soda Button {0}"), i),
+			FKeyDetails::GamepadKey,
+			TEXT("SodaJoy")));
+	}
+#undef LOCTEXT_NAMESPACE
+
+	RegisteredAxesNum = std::max(RegisteredAxesNum, NumAxes);
+	RegisteredButtonsNum = std::max(RegisteredButtonsNum, NumButtons);
+}
+
+bool FSDLJoystickDevice::SDLStartup()
+{
+	if (SDL_NumJoysticks() <= 0)
+	{
+		UpdateEKeys(20, 20); //Registre 20 Axes & 20 Butonts by default
+		return false;
+	}
+
+	AxesNum = 0;
+	ButtonsNum = 0;
+
+	UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDLStartup"));
+	UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Found %d joysticks:\n"), SDL_NumJoysticks());
+	for (size_t i = 0; i < SDL_NumJoysticks(); i++)
+	{
+		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("\tJoystick %d: %s"), i, *FString(SDL_JoystickNameForIndex(i)));
+		if (SDL_IsGameController(i))
+		{
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT(" - game controller.\n"));
+		}
+		else
+		{
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT(".\n"));
+		}
+	}
+	int CurAxis = 0;
+	int CurButton = 0;
+
+	// Check for joystick
+	for (int i = 0; i < SDL_NumJoysticks(); ++i) 
+	{
+
+		if (SDL_IsGameController(i))
+		{
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Selected joystick %d is game controller and will by opened by UE4.\n"), i);
+			return false;
+		}
+		// Open joystick
+		Joys.Add(SDL_JoystickOpen(i));
+
+		if (Joys.Last()) {
+			AxesNum += SDL_JoystickNumAxes(Joys.Last());
+			ButtonsNum += SDL_JoystickNumButtons(Joys.Last());
+
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Opened Joystick %d\n"), i);
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("\tName: %s\n"), *FString(SDL_JoystickNameForIndex(i)));
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("\tNumber of Axes: %d\n"), SDL_JoystickNumAxes(Joys.Last()));
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("\tNumber of Buttons: %d\n"), SDL_JoystickNumButtons(Joys.Last()));
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("\tNumber of Balls: %d\n"), SDL_JoystickNumBalls(Joys.Last()));
+		}
+		else {
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Couldn't open Joystick %\n"), i);
+		}
+
+		Settings->SetAnalogAxesNum(AxesNum);
+
+		for (int j = 0; j < SDL_JoystickNumAxes(Joys.Last()); ++j)
+		{
+			AnalogAxes.push_back(UAxis(*FString::Printf(TEXT("SodaAxis%d"), CurAxis), i, j));
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("AddKey %s"), *(AnalogAxes.back().Name));
+			AnalogAxes.back().SettingsStruct = Settings->GetAxisSettings(CurAxis);
+			if (AnalogAxes.back().SettingsStruct) AnalogAxes.back().SettingsStruct->Name = AnalogAxes.back().Name;
+			CurAxis++;
+		}
+
+		if (Settings->VirtualButtonsNum < ButtonsNum)
+		{
+			Settings->VirtualButtonsNum = ButtonsNum;
+		}
+
+		for (int b = 0; b < SDL_JoystickNumButtons(Joys.Last()); ++b)
+		{
+			Buttons.push_back(UAxis(*FString::Printf(TEXT("SodaButton%d"), CurButton), i, b));
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("AddKey %s"), *Buttons.back().Name);
+			CurButton++;
+		}
+
+		// Open the device
+		Haptics.Add(SDL_HapticOpenFromJoystick(Joys.Last()));
+		if (Haptics.Last() == 0)
+			UE_LOG(SodaSDLJoystickDevice, Error, TEXT("SDL_HapticOpenFromJoystick[%d] - %s"), i, SDL_GetError());
+		if (Haptics.Num() > i)
+		{
+			SDL_HapticSetAutocenter(Haptics[i], 0);
+
+			// Check to see what it supports
+			unsigned int haptic_query = 0; //Properties of the haptic device
+			UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuerycrequest for Joy[%d]:"), Haptics.Num() - 1);
+			haptic_query = SDL_HapticQuery(Haptics[i]);
+
+			if (haptic_query & SDL_HAPTIC_CONSTANT)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_CONSTANT"));
+			if (haptic_query & SDL_HAPTIC_SINE)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_SINE"));
+			if (haptic_query & SDL_HAPTIC_TRIANGLE)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_TRIANGLE"));
+			if (haptic_query & SDL_HAPTIC_SAWTOOTHUP)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_SAWTOOTHUP"));
+			if (haptic_query & SDL_HAPTIC_SAWTOOTHDOWN)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_SAWTOOTHDOWN "));
+			if (haptic_query & SDL_HAPTIC_SPRING)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_SPRING  "));
+			if (haptic_query & SDL_HAPTIC_DAMPER)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_DAMPER"));
+			if (haptic_query & SDL_HAPTIC_INERTIA)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_INERTIA"));
+			if (haptic_query & SDL_HAPTIC_FRICTION)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_FRICTION"));
+			if (haptic_query & SDL_HAPTIC_CUSTOM)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_CUSTOM"));
+			if (haptic_query & SDL_HAPTIC_GAIN)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_GAIN"));
+			if (haptic_query & SDL_HAPTIC_AUTOCENTER)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_AUTOCENTER"));
+			if (haptic_query & SDL_HAPTIC_STATUS)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_STATUS"));
+			if (haptic_query & SDL_HAPTIC_PAUSE)
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticQuery - SDL_HAPTIC_PAUSE "));
+
+			EffectConstant.type = SDL_HAPTIC_CONSTANT;
+			EffectConstant.constant.direction.type = SDL_HAPTIC_CARTESIAN;
+			EffectConstant.constant.direction.dir[0] = 0;
+			EffectConstant.constant.direction.dir[1] = 0;
+
+			/* Replay */
+			EffectConstant.constant.length = 0xffff;
+			EffectConstant.constant.delay = 0;
+
+			/* Trigger */
+			EffectConstant.constant.button = 0;
+			EffectConstant.constant.interval = 0;
+
+			/* Constant */
+			EffectConstant.constant.level = 0;
+			/* Envelope */
+			EffectConstant.constant.attack_length = 0;   /**< Duration of the attack. */
+			EffectConstant.constant.attack_level = 0;    /**< Level at the start of the attack. */
+			EffectConstant.constant.fade_length = 0;     /**< Duration of the fade. */
+			EffectConstant.constant.fade_level = 0;      /**< Level at the end of the fade. */
+
+			EffectConstantIds.Add(SDL_HapticNewEffect(Haptics[i], &EffectConstant));
+
+			if (EffectConstantIds.Last() < 0)
+			{
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticNewEffect - failed for Joy [%d]"), i);
+			}
+
+			EffectBump.type = SDL_HAPTIC_RAMP;
+			EffectBump.ramp.attack_length = 150;
+			EffectBump.ramp.attack_level = 0;
+			EffectBump.ramp.fade_length = 200;
+			EffectBump.ramp.fade_level = 0;
+			EffectBump.ramp.length = 300;
+			EffectBump.ramp.delay = 0;
+			EffectBump.ramp.button = 0;
+			EffectBump.ramp.interval = 0;
+			EffectBump.ramp.direction.type = SDL_HAPTIC_CARTESIAN;
+			EffectBump.ramp.direction.dir[0] = 0;
+			EffectBump.ramp.direction.dir[1] = 0;
+
+			EffectBumpIds.Add(SDL_HapticNewEffect(Haptics[i], &EffectBump));
+			if (EffectBumpIds.Last() < 0)
+			{
+				UE_LOG(SodaSDLJoystickDevice, Log, TEXT("SDL_HapticNewEffect - failed to add EffectBump for Joy [%d]"), i);
+			}
+		}
+	}
+
+	UpdateEKeys(AxesNum, ButtonsNum);
+
+	return true;
+}
+
+void FSDLJoystickDevice::RotateToPosition(float TargetPosition)
+{
+	for (size_t i = 0; i < Haptics.Num() && i < EffectConstantIds.Num(); ++i)
+	{
+		if (Haptics[i] && EffectConstantIds[i] != -1)
+		{
+			float CurrentPosition = Settings->CurrentAxesValues[0];
+			EffectConstant.constant.level = FMath::Clamp((int)((TargetPosition - CurrentPosition) * Settings->RotatingForce), -32768, 32767);
+			//		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("RotateToPosition force level: %d"), EffectConstant.constant.level);
+			SDL_HapticUpdateEffect(Haptics[i], EffectConstantIds[i], &EffectConstant);
+			SDL_HapticRunEffect(Haptics[i], EffectConstantIds[i], 1);
+		}
+	}
+}
+
+void FSDLJoystickDevice::ApplyConstantForce(int ForceVal)
+{
+	for (size_t i = 0; i < Haptics.Num() && i < EffectConstantIds.Num(); ++i)
+	{
+		if (Haptics[i] && EffectConstantIds[i] != -1)
+		{
+			EffectConstant.constant.level = FMath::Clamp(ForceVal, -32768, 32767);
+			//		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Appling force level: %d"), EffectConstant.constant.level);
+			SDL_HapticUpdateEffect(Haptics[i], EffectConstantIds[i], &EffectConstant);
+			SDL_HapticRunEffect(Haptics[i], EffectConstantIds[i], 1);
+		}
+	}
+}
+
+void FSDLJoystickDevice::StopConstantForceEffect()
+{
+	for (size_t i = 0; i < Haptics.Num() && i < EffectConstantIds.Num(); ++i)
+	{
+		if (Haptics[i] && EffectConstantIds[i] != -1)
+		{
+			SDL_HapticStopEffect(Haptics[i], EffectConstantIds[i]);
+		}
+	}
+}
+
+void FSDLJoystickDevice::ApplyBumpEffect(int ForceVal, int Len)
+{
+	for (size_t i = 0; i < Haptics.Num() && i < EffectBumpIds.Num(); ++i)
+	{
+		if (Haptics[i] && EffectBumpIds[i] != -1)
+		{
+			EffectBump.ramp.attack_length = Len / 2;
+			EffectBump.ramp.attack_level = 0;
+			EffectBump.ramp.fade_length = Len / 3;
+			EffectBump.ramp.fade_level = 0;
+			EffectBump.ramp.length = Len;
+			EffectBump.ramp.start = FMath::Clamp(ForceVal, -32768, 32767) / 2;
+			EffectBump.ramp.end = FMath::Clamp(ForceVal, -32768, 32767);
+			//		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("Appling bump level: %d"), ForceVal);
+			SDL_HapticUpdateEffect(Haptics[i], EffectBumpIds[i], &EffectBump);
+			SDL_HapticRunEffect(Haptics[i], EffectBumpIds[i], 1);
+		}
+	}
+}
+
+void FSDLJoystickDevice::ActualizeAxesNum()
+{
+/*	Settings->SetAnalogAxesNum(AxesNum);
+#define LOCTEXT_NAMESPACE "InputKeys"
+	// Register the FKeys (Gamepad key for controllers, Mouse for mice, FloatAxis for non binary values e.t.c.)
+
+	for (int i = 0; i < AxesNum; ++i)
+	{
+		AnalogAxes.push_back(UAxis(*FString::Printf(TEXT("SodaAxis%d"), DeviceIndex, i), i));
+		EKeys::AddKey(FKeyDetails(AnalogAxes.back().Key, FText::Format(LOCTEXT("Soda axis", "Soda Analog Axis {0}"), i), FKeyDetails::GamepadKey | FKeyDetails::FloatAxis));
+		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("AddKey %s"), *(AnalogAxes.back().Name));
+		AnalogAxes.back().SettingsStruct = Settings->GetAxisSettings(DeviceIndex, i);
+		if (AnalogAxes.back().SettingsStruct)
+			AnalogAxes.back().SettingsStruct->Name = AnalogAxes.back().Name;
+	}
+#undef LOCTEXT_NAMESPACE*/
+}
+
+void FSDLJoystickDevice::ActualizeButtonsNum()
+{
+/*	if (Settings->VirtualButtonsNum < ButtonsNum)
+	{
+		Settings->VirtualButtonsNum = ButtonsNum;
+	}
+#define LOCTEXT_NAMESPACE "InputKeys"
+	for (int i = Buttons.size(); i < Settings->VirtualButtonsNum; ++i)
+	{
+		Buttons.push_back(UAxis(*FString::Printf(TEXT("SodaButton%d_%d"), DeviceIndex, i), i));
+		EKeys::AddKey(FKeyDetails(Buttons.back().Key, FText::Format(LOCTEXT("Soda button", "Soda Button {0}"), i), FKeyDetails::GamepadKey));
+		UE_LOG(SodaSDLJoystickDevice, Log, TEXT("AddKey %s"), *Buttons.back().Name);
+	}
+#undef LOCTEXT_NAMESPACE*/
+}
+
+void FSDLJoystickDevice::CloseDevice()
+{
+	for (size_t i = 0; i < Haptics.Num() && i < EffectConstantIds.Num(); ++i)
+	{
+		if (Haptics[i] && EffectConstantIds[i] >= 0)
+		{
+			SDL_HapticStopEffect(Haptics[i], EffectConstantIds[i]);
+		}
+	}
+
+	for (SDL_Joystick* Joy : Joys)
+	{
+		if (Joy && SDL_JoystickGetAttached(Joy))
+		{
+			SDL_JoystickClose(Joy);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/SodaJoystick/Private/SDLJoystickDevice.h b/Source/SodaJoystick/Private/SDLJoystickDevice.h
new file mode 100644
index 0000000..22357d9
--- /dev/null
+++ b/Source/SodaJoystick/Private/SDLJoystickDevice.h
@@ -0,0 +1,106 @@
+#pragma once
+
+#include "IInputDevice.h"
+#include "InputCoreTypes.h"
+#include <vector>
+#include "UAxisStruct.h"
+#include "JoystickGameSettings.h"
+#if defined(_MSC_VER)
+#	pragma warning( push )
+#	pragma warning(disable: 4668)
+#endif
+#include "ThirdParty/SDL2/SDL-gui-backend/include/SDL.h"
+#if defined(_MSC_VER)
+#	pragma warning( pop )
+#endif
+
+DECLARE_LOG_CATEGORY_EXTERN(SodaSDLJoystickDevice, Log, All);
+
+class FSDLJoystickDevice : public IInputDevice
+{
+	struct UAxis
+	{
+		FKey Key;
+		int DeviceIndex;
+		int Index;
+		FString Name;
+		FAxisStruct* SettingsStruct;
+
+		UAxis(FString NewName = "", int NewDeviceIndex = 0, int NewIndex = 0) : 
+			Key(*NewName),
+			DeviceIndex(NewDeviceIndex),
+			Index(NewIndex),
+			Name(NewName),
+			SettingsStruct(NULL)
+		{};
+	};
+
+public:
+	FSDLJoystickDevice(const TSharedRef<FGenericApplicationMessageHandler>& InMessageHandler);
+	~FSDLJoystickDevice();
+
+	/** Tick the interface (e.g. check for new controllers) */
+	virtual void Tick(float DeltaTime) override;
+
+	/** Poll for controller state and send events if needed */
+	virtual void SendControllerEvents() override;
+
+	/** Set which MessageHandler will get the events from SendControllerEvents. */
+	virtual void SetMessageHandler(const TSharedRef< FGenericApplicationMessageHandler >& InMessageHandler) override;
+
+	/** Exec handler to allow console commands to be passed through for debugging */
+	virtual bool Exec(UWorld* InWorld, const TCHAR* Cmd, FOutputDevice& Ar) override;
+
+	/** IForceFeedbackSystem pass through functions **/
+	virtual void SetChannelValue(int32 ControllerId, FForceFeedbackChannelType ChannelType, float Value) override;
+	virtual void SetChannelValues(int32 ControllerId, const FForceFeedbackValues &values) override;
+
+	void SetCentringForce(int percent); // Set power of CentringForce effect in percent (0 to 100). Set 0 to disable CentringForce effect.
+
+	void RotateToPosition(float position); // Rotate steering wheel to given position (-1.f to 1.f) applying Constant Force effect. Call on each frame.
+
+	void ApplyConstantForce(int ForceVal); // -32768 to 32767
+	void StopConstantForceEffect();
+
+	void ApplyBumpEffect(int ForceVal, int Len); // -32768 to 32767
+
+	void CloseDevice();
+
+	void ActualizeAxesNum();
+	void ActualizeButtonsNum();
+
+	int GetJoyNum() const { return Joys.Num(); }
+
+private:
+	bool SDLStartup();
+	void UpdateEKeys(int NumAxes, int NumButtons);
+
+private:
+	/* Message handler */
+	TSharedRef<FGenericApplicationMessageHandler> MessageHandler;
+
+	TArray<SDL_Joystick *> Joys;
+
+	TArray < SDL_Haptic *> Haptics;
+
+	SDL_HapticEffect EffectConstant;
+	SDL_HapticEffect EffectBump;
+	TArray<int> EffectConstantIds;
+	TArray<int> EffectBumpIds;
+
+	float CentringForceMax = 0;
+
+	int AxesNum = 0;
+	int ButtonsNum = 0;
+
+	std::vector <UAxis> Buttons;
+	std::vector <UAxis> AnalogAxes;
+
+	UJoystickGameSettings* Settings;
+
+	float NoJoyWaitTimer = 0;
+	const float NoJoyWaitTime = 1.f;
+
+	int RegisteredAxesNum = 0;
+	int RegisteredButtonsNum = 0;
+};
\ No newline at end of file
diff --git a/Source/SodaJoystick/Private/SodaJoystick.cpp b/Source/SodaJoystick/Private/SodaJoystick.cpp
new file mode 100644
index 0000000..4e8d5d3
--- /dev/null
+++ b/Source/SodaJoystick/Private/SodaJoystick.cpp
@@ -0,0 +1,175 @@
+#include "SodaJoystick.h"
+#include "SDLJoystickDevice.h"
+
+// Settings
+#include "JoystickGameSettings.h"
+#include "Developer/Settings/Public/ISettingsModule.h"
+#include "Developer/Settings/Public/ISettingsSection.h"
+#include "Developer/Settings/Public/ISettingsContainer.h"
+
+#define LOCTEXT_NAMESPACE "FSodaJoystickPlugin"
+
+DEFINE_LOG_CATEGORY(SodaJoystick);
+
+class FSodaJoystick : public ISodaJoystickPlugin
+{
+public:
+	/** Implements the rest of the IInputDeviceModule interface **/
+	
+	/** Creates a new instance of the IInputDevice associated with this IInputDeviceModule **/
+	virtual TSharedPtr<class IInputDevice> CreateInputDevice(const TSharedRef<FGenericApplicationMessageHandler>& InMessageHandler) override;
+
+	virtual void StartupModule() override
+	{
+		ISodaJoystickPlugin::StartupModule();
+		RegisterSettings();
+	}
+
+	void RegisterSettings()
+	{
+		// Registering some settings is just a matter of exposing the default UObject of
+		// your desired class, feel free to add here all those settings you want to expose
+		// to your LDs or artists.
+
+		if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
+		{
+			// Create the new category
+			ISettingsContainerPtr SettingsContainer = SettingsModule->GetContainer("Editor");
+
+			SettingsContainer->DescribeCategory("JoystickSettings",
+				LOCTEXT("RuntimeWDCategoryName", "JoystickSettings"),
+				LOCTEXT("RuntimeWDCategoryDescription", "Game configuration for the JoystickSettings game module"));
+
+			// Register the settings
+			ISettingsSectionPtr SettingsSection = SettingsModule->RegisterSettings("Editor", "JoystickSettings", "General",
+				LOCTEXT("RuntimeGeneralSettingsName", "General"),
+				LOCTEXT("RuntimeGeneralSettingsDescription", "Configuration for Soda Joystick Plugin."),
+				GetMutableDefault<UJoystickGameSettings>()
+				);
+
+			// Register the save handler to your settings, you might want to use it to
+			// validate those or just act to settings changes.
+			if (SettingsSection.IsValid())
+			{
+				SettingsSection->OnModified().BindRaw(this, &FSodaJoystick::HandleSettingsApplyedAndSaved);
+			}
+		}
+	}
+
+	void UnregisterSettings()
+	{
+		// Ensure to unregister all of your registered settings here, hot-reload would
+		// otherwise yield unexpected results.
+
+		if (ISettingsModule* SettingsModule = FModuleManager::GetModulePtr<ISettingsModule>("Settings"))
+		{
+			SettingsModule->UnregisterSettings("Editor", "JoystickSettings", "General");
+		}
+	}
+
+	virtual bool SupportsDynamicReloading() override
+	{
+		return true;
+	}
+
+	virtual void RotateToPosition(float Position) override
+	{
+		if (SDLJoystickDevice.IsValid())
+			SDLJoystickDevice->RotateToPosition(Position);
+	}
+
+	virtual void ApplyConstantForce(int ForceVal) override
+	{
+		if (SDLJoystickDevice.IsValid())
+			SDLJoystickDevice->ApplyConstantForce(ForceVal);
+	}
+
+	virtual void StopConstantForceEffect() override
+	{
+		if (SDLJoystickDevice.IsValid())
+			SDLJoystickDevice->StopConstantForceEffect();
+	}
+
+	virtual void ApplyBumpEffect(int ForceVal, int Len) override
+	{
+		if (SDLJoystickDevice.IsValid())
+			SDLJoystickDevice->ApplyBumpEffect(ForceVal, Len);
+	}
+
+	virtual int GetJoyNum() const override
+	{
+		if (SDLJoystickDevice.IsValid())
+			return SDLJoystickDevice->GetJoyNum();
+		return 0;
+	}
+
+	virtual void Reset() override
+	{
+		if (SDLJoystickDevice.IsValid())
+			return SDLJoystickDevice->CloseDevice();
+	}
+
+	virtual void UpdateSettings() override
+	{
+		if (SDLJoystickDevice.IsValid())
+		{
+			UJoystickGameSettings* Settings = GetMutableDefault<UJoystickGameSettings>();
+			if (Settings->GetAnalogAxesNum() > 0 && SDLJoystickDevice)
+			{
+				check(SDLJoystickDevice.IsValid());
+				SDLJoystickDevice->SetCentringForce(Settings->CentringForcePercent);
+				SDLJoystickDevice->ActualizeAxesNum();
+				SDLJoystickDevice->ActualizeButtonsNum();
+			}
+		}
+	}
+
+private:
+
+	// Callback for when the settings were saved.
+	bool HandleSettingsApplyedAndSaved()
+	{
+		UJoystickGameSettings* Settings = GetMutableDefault<UJoystickGameSettings>();
+		Settings->SaveConfig();
+		UpdateSettings();
+		return true;
+	}
+
+	/** Called before the module is unloaded, right before the module object is destroyed. **/
+	virtual void ShutdownModule() override;
+
+	TSharedPtr< class FSDLJoystickDevice > SDLJoystickDevice;
+};
+
+TSharedPtr<class IInputDevice> FSodaJoystick::CreateInputDevice(const TSharedRef<FGenericApplicationMessageHandler>& InMessageHandler)
+{
+	UE_LOG(SodaJoystick, Log, TEXT("Created new input device!"));
+
+	// See GenericInputDevice.h for the definition of the IInputDevice we are returning here
+	SDLJoystickDevice = MakeShareable(new FSDLJoystickDevice(InMessageHandler));
+
+	check(SDLJoystickDevice.IsValid());
+	return SDLJoystickDevice;
+}
+
+void FSodaJoystick::ShutdownModule()
+{
+	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
+	// we call this function before unloading the module.
+
+	UE_LOG(SodaJoystick, Log, TEXT("Shutdown Module"));
+
+	if (UObjectInitialized())
+	{
+		UnregisterSettings();
+	}
+
+	// Close if opened
+	
+	if (SDLJoystickDevice.IsValid())
+		SDLJoystickDevice->CloseDevice();
+}
+
+#undef LOCTEXT_NAMESPACE
+	
+IMPLEMENT_MODULE(FSodaJoystick, SodaJoystick)
\ No newline at end of file
diff --git a/Source/SodaJoystick/Private/SodaJoystickPrivatePCH.h b/Source/SodaJoystick/Private/SodaJoystickPrivatePCH.h
new file mode 100644
index 0000000..e1f1c0f
--- /dev/null
+++ b/Source/SodaJoystick/Private/SodaJoystickPrivatePCH.h
@@ -0,0 +1,4 @@
+#include "SodaJoystick.h"
+
+// You should place include statements to your module's private header files here.  You only need to
+// add includes for headers that are used in most of your module's source files though.
diff --git a/Source/SodaJoystick/Public/JoystickGameSettings.h b/Source/SodaJoystick/Public/JoystickGameSettings.h
new file mode 100644
index 0000000..14bcf19
--- /dev/null
+++ b/Source/SodaJoystick/Public/JoystickGameSettings.h
@@ -0,0 +1,51 @@
+#pragma once
+
+
+#include "UAxisStruct.h"
+#include "JoystickGameSettings.generated.h"
+
+/**
+ * Setting object used to hold both config settings and editable ones in one place
+ * To ensure the settings are saved to the specified config file make sure to add
+ * props using the globalconfig or config meta.
+ */
+UCLASS(config = Joystick, defaultconfig)
+class SODAJOYSTICK_API UJoystickGameSettings : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	UJoystickGameSettings(const FObjectInitializer& ObjectInitializer);
+
+	/** Or add min, max or clamp values to the settings */
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Custom, meta = (UIMin = 0, ClampMin = 0, UIMax = 100, ClampMax = 100, EditInRuntime))
+	int32 CentringForcePercent;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Custom, meta = (UIMin = -32768, ClampMin = -32768, UIMax = 32767, ClampMax = 32767, EditInRuntime))
+	int32 RotatingForce;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Custom, meta = (UIMin = 0, ClampMin = 0, UIMax = 32, ClampMax = 32, EditInRuntime))
+	int32 VirtualAxesNum;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Custom, meta = (UIMin = 0, ClampMin = 0, UIMax = 32, ClampMax = 32, EditInRuntime))
+	int32 VirtualButtonsNum;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, EditFixedSize, Category = Custom, meta = (EditInRuntime))
+	TArray<FAxisStruct> AnalogAxes;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, EditFixedSize, Category = Custom, meta = (EditInRuntime))
+	TArray<float> CurrentAxesValues;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, EditFixedSize, Category = Custom, meta = (EditInRuntime))
+	FText LastButtonDown;
+
+	void SetAnalogAxesNum(int num);
+	int GetAnalogAxesNum() { return AnalogAxes.Num(); }
+
+	void SetCurrentAxesValuesNum(int NewNum)
+	{
+		CurrentAxesValues.SetNum(NewNum);
+	}
+
+	FAxisStruct* GetAxisSettings(int i);
+};
diff --git a/Source/SodaJoystick/Public/SodaJoystick.h b/Source/SodaJoystick/Public/SodaJoystick.h
new file mode 100644
index 0000000..80ecf38
--- /dev/null
+++ b/Source/SodaJoystick/Public/SodaJoystick.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Modules/ModuleManager.h"
+#include "IInputDeviceModule.h"
+
+//Joystick Plugin log
+DECLARE_LOG_CATEGORY_EXTERN(SodaJoystick, Log, All);
+
+class SODAJOYSTICK_API ISodaJoystickPlugin : public IInputDeviceModule
+{
+public:
+/**
+	 * Singleton-like access to this module's interface.  This is just for convenience!
+	 * Beware of calling this during the shutdown phase, though.  Your module might have been unloaded already.
+	 *
+	 * @return Returns singleton instance, loading the module on demand if needed
+	 */
+	static inline ISodaJoystickPlugin& Get()
+	{
+		return FModuleManager::LoadModuleChecked< ISodaJoystickPlugin >( "SodaJoystick" );
+	}
+
+	/**
+	 * Checks to see if this module is loaded and ready.  It is only valid to call Get() if IsAvailable() returns true.
+	 *
+	 * @return True if the module is loaded and ready to use
+	 */
+	static inline bool IsAvailable()
+	{
+		return FModuleManager::Get().IsModuleLoaded( "SodaJoystick" );
+	}
+
+	virtual void RotateToPosition(float position) = 0; // -1.f to 1.f
+	virtual void ApplyConstantForce(int ForceVal) = 0; // -32768 to 32767
+	virtual void StopConstantForceEffect() = 0;
+	virtual void ApplyBumpEffect(int ForceVal, int Len) = 0; // -32768 to 32767
+	virtual int GetJoyNum() const = 0;
+	virtual void Reset() = 0;
+	virtual void UpdateSettings() = 0;
+};
diff --git a/Source/SodaJoystick/Public/UAxisStruct.h b/Source/SodaJoystick/Public/UAxisStruct.h
new file mode 100644
index 0000000..b28ba33
--- /dev/null
+++ b/Source/SodaJoystick/Public/UAxisStruct.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UAxisStruct.generated.h"
+
+USTRUCT(BlueprintType)
+struct SODAJOYSTICK_API FAxisStruct
+{
+public:
+	GENERATED_USTRUCT_BODY()
+
+    FAxisStruct() : 
+		Name("DefaultAxisName"),
+        InMin(-32767),
+	    InMax(32767),
+		OutMin(-1.f),
+		OutMax(1.f)
+	{};
+
+   
+	UPROPERTY(EditAnywhere, Category = UAxisStruct)
+	FString Name;
+	UPROPERTY(EditAnywhere, Category = UAxisStruct)
+	int32 InMin;
+	UPROPERTY(EditAnywhere, Category = UAxisStruct)
+	int32 InMax;
+	UPROPERTY(EditAnywhere, Category = UAxisStruct)
+	float OutMin;
+	UPROPERTY(EditAnywhere, Category = UAxisStruct)
+	float OutMax;
+
+	float GetScaledValue(int RawValue)
+	{
+  		return (RawValue - InMin) * (OutMax - OutMin) / (InMax - InMin) + OutMin;
+	};
+};
diff --git a/Source/SodaJoystick/SodaJoystick.Build.cs b/Source/SodaJoystick/SodaJoystick.Build.cs
new file mode 100644
index 0000000..0a08a02
--- /dev/null
+++ b/Source/SodaJoystick/SodaJoystick.Build.cs
@@ -0,0 +1,65 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+using System.IO;
+using UnrealBuildTool;
+
+public class SodaJoystick : ModuleRules
+{
+	public SodaJoystick(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+		
+		PublicIncludePaths.AddRange(
+			new string[] {
+				"Runtime/ApplicationCore/Public/GenericPlatform",
+			}
+		);
+				
+		
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				"SodaJoystick/Private",
+			}
+		);
+			
+		
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+				"Engine",
+				"InputCore",
+				"InputDevice",
+				"Slate",
+				"SlateCore",
+			}
+		);
+
+        PrivateDependencyModuleNames.AddRange(
+            new string[]
+            {
+                "CoreUObject",
+                "Engine",
+                "Slate",
+                "SlateCore",
+                "ApplicationCore"
+            }
+        );
+
+        if (Target.Platform == UnrealTargetPlatform.Win64)
+		{
+			PublicDependencyModuleNames.Add("SDL2_2010");
+		}
+			
+		if (Target.Platform == UnrealTargetPlatform.Linux)
+		{
+			PrivateDependencyModuleNames.Add("SDL2");
+		}
+
+        if (!Directory.Exists(ModuleDirectory + "/Private"))
+        {
+            bUsePrecompiled = true;
+        }
+    }
+}
diff --git a/Source/SodaLoadingScreen/Private/SodaLoadingScreen.cpp b/Source/SodaLoadingScreen/Private/SodaLoadingScreen.cpp
new file mode 100644
index 0000000..d6aa33d
--- /dev/null
+++ b/Source/SodaLoadingScreen/Private/SodaLoadingScreen.cpp
@@ -0,0 +1,163 @@
+
+#include "SodaLoadingScreen.h"
+#include "MoviePlayer.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Materials/Material.h"
+#include "Modules/ModuleManager.h"
+#include "PixelShaderUtils.h"
+#include "RHIStaticStates.h"
+#include "ScreenRendering.h"
+#include "SlateMaterialBrush.h"
+#include "Brushes/SlateImageBrush.h"
+#include "Widgets/Layout/SBackgroundBlur.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/SOverlay.h"
+#include "Engine/Texture2D.h"
+#include "Materials/MaterialInterface.h"
+
+#define LOCTEXT_NAMESPACE "FSodaLoadingScreenModule"
+
+class SSodaLoadingScreen : public SCompoundWidget
+{
+	SLATE_BEGIN_ARGS(SSodaLoadingScreen)
+	{}
+	SLATE_END_ARGS()
+	
+	void Construct(const FArguments& InArgs)
+	{
+		if (UTexture2D* Tex = Cast<UTexture2D>(SodaLoadingMaterialPath.TryLoad()))
+		//if(UMaterialInterface* Tex = Cast<UMaterialInterface>(SodaLoadingMaterialPath.TryLoad()))
+		{ 
+			SodaLoadingBrush = MakeShareable(new FSlateImageBrush(Tex, FVector2D(1024 * 0.3, 512 * 0.3)));
+			//SodaLoadingBrush = MakeShareable(new FSlateMaterialBrush(*Tex, FVector2D(1024 * 0.3, 512 * 0.3)));
+			check(SodaLoadingBrush.IsValid());
+
+			ChildSlot
+			.HAlign(HAlign_Fill)
+			.VAlign(VAlign_Fill)
+			[
+				SNew(SBorder)
+				.BorderBackgroundColor(FColor(0,0, 0))
+				.BorderImage(FCoreStyle::Get().GetBrush("WhiteBrush"))
+				[
+					SNew(SOverlay)
+					+ SOverlay::Slot()
+					[
+						SNew(SBox)
+						.HAlign(HAlign_Center)
+						.VAlign(VAlign_Center)
+						[
+							SNew(SImage)
+							.Image(SodaLoadingBrush.Get())
+						]
+					]
+					+ SOverlay::Slot()
+					[
+						SAssignNew(BackgroundBlur, SBackgroundBlur)
+						.BlurStrength(4)
+						.CornerRadius(FVector4(4.0f, 4.0f, 4.0f, 4.0f))
+					]
+					+ SOverlay::Slot()
+					[
+						SNew(SBox)
+						.HAlign(HAlign_Center)
+						.VAlign(VAlign_Center)
+						[
+							SNew(SImage)
+							.Image(SodaLoadingBrush.Get())
+						]
+					]
+				]
+			];
+		}
+	}
+
+	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override
+	{
+		SCompoundWidget::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+
+		if (BackgroundBlur)
+		{
+			const float Period = 3.0f;
+			const float Amplitude = 15.0f;
+
+			BackgroundBlur->SetBlurStrength(FMath::Cos(InCurrentTime / (2 * PI) * Period) * Amplitude);
+		}
+	}
+
+	SSodaLoadingScreen()
+		:SodaLoadingMaterialPath(TEXT("/SodaSim/Assets/CPP/ScreenLoading/Logo"))
+	{}
+
+	virtual ~SSodaLoadingScreen()
+	{
+		if (SodaLoadingBrush.IsValid())
+		{
+			SodaLoadingBrush->SetResourceObject(nullptr);
+		}
+	}
+
+private:
+	FSoftObjectPath SodaLoadingMaterialPath;
+	TSharedPtr<FSlateBrush> SodaLoadingBrush;
+	TSharedPtr<SBackgroundBlur> BackgroundBlur;
+};
+
+void FSodaLoadingScreenModule::StartupModule()
+{
+	// This code will execute after your module is loaded into memory; the exact timing is specified in the .uplugin file per-module
+	if (!IsRunningDedicatedServer() && FSlateApplication::IsInitialized())
+	{
+
+		if (IsMoviePlayerEnabled())
+		{
+			GetMoviePlayer()->OnPrepareLoadingScreen().AddRaw(this, &FSodaLoadingScreenModule::PreSetupLoadingScreen);
+		}
+
+		SetupLoadingScreen();
+	}	
+}
+
+void FSodaLoadingScreenModule::ShutdownModule()
+{
+	// This function may be called during shutdown to clean up your module.  For modules that support dynamic reloading,
+	// we call this function before unloading the module.
+
+	if (!IsRunningDedicatedServer())
+	{
+		// TODO: Unregister later
+		GetMoviePlayer()->OnPrepareLoadingScreen().RemoveAll(this);
+	}
+}
+
+bool FSodaLoadingScreenModule::IsGameModule() const
+{
+	return true;
+}
+
+void FSodaLoadingScreenModule::PreSetupLoadingScreen()
+{
+	SetupLoadingScreen();
+}
+
+void FSodaLoadingScreenModule::SetupLoadingScreen()
+{
+	FLoadingScreenAttributes LoadingScreen;
+	LoadingScreen.MinimumLoadingScreenDisplayTime = -1;
+	LoadingScreen.bAutoCompleteWhenLoadingCompletes = true;
+	LoadingScreen.bMoviesAreSkippable = true;
+	LoadingScreen.bWaitForManualStop = false;
+	LoadingScreen.bAllowInEarlyStartup = true;
+	LoadingScreen.bAllowEngineTick = true;
+	LoadingScreen.PlaybackType = EMoviePlaybackType::MT_Normal;
+	LoadingScreen.WidgetLoadingScreen = SNew(SSodaLoadingScreen);
+
+	GetMoviePlayer()->SetupLoadingScreen(LoadingScreen);
+}
+
+
+#undef LOCTEXT_NAMESPACE
+	
+IMPLEMENT_MODULE(FSodaLoadingScreenModule, SodaLoadingScreen)
\ No newline at end of file
diff --git a/Source/SodaLoadingScreen/Public/SodaLoadingScreen.h b/Source/SodaLoadingScreen/Public/SodaLoadingScreen.h
new file mode 100644
index 0000000..72a94a1
--- /dev/null
+++ b/Source/SodaLoadingScreen/Public/SodaLoadingScreen.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "Modules/ModuleManager.h"
+
+class SODALOADINGSCREEN_API FSodaLoadingScreenModule : public IModuleInterface
+{
+public:
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+	virtual bool IsGameModule() const override;
+
+private:
+	/**
+	 * Loading screen callback, it won't be called if we've already explicitly setup the loading screen
+	 */
+	void PreSetupLoadingScreen();
+
+	/**
+	 * Setup loading screen settings 
+	 */
+	void SetupLoadingScreen();
+};
diff --git a/Source/SodaLoadingScreen/SodaLoadingScreen.Build.cs b/Source/SodaLoadingScreen/SodaLoadingScreen.Build.cs
new file mode 100644
index 0000000..e083ba8
--- /dev/null
+++ b/Source/SodaLoadingScreen/SodaLoadingScreen.Build.cs
@@ -0,0 +1,35 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+using System.IO;
+using UnrealBuildTool;
+
+public class SodaLoadingScreen : ModuleRules
+{
+	public SodaLoadingScreen(ReadOnlyTargetRules Target) : base(Target)
+	{		
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core"
+			}
+		);
+			
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"CoreUObject",
+				"Engine",
+				"Slate",
+				"SlateCore",
+				"MoviePlayer",
+			}
+		);
+
+        PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+
+        if (!Directory.Exists(ModuleDirectory + "/Private"))
+        {
+            bUsePrecompiled = true;
+        }
+    }
+}
diff --git a/Source/SodaSimEditor/Private/AnimGraphNode_GhostWheelController.cpp b/Source/SodaSimEditor/Private/AnimGraphNode_GhostWheelController.cpp
new file mode 100644
index 0000000..8edef87
--- /dev/null
+++ b/Source/SodaSimEditor/Private/AnimGraphNode_GhostWheelController.cpp
@@ -0,0 +1,57 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "AnimGraphNode_GhostWheelController.h"
+#include "Kismet2/BlueprintEditorUtils.h"
+#include "Kismet2/CompilerResultsLog.h"
+#include "Soda/Actors/GhostVehicle/GhostVehicle.h"
+
+#define LOCTEXT_NAMESPACE "A3Nodes"
+
+UAnimGraphNode_GhostWheelController::UAnimGraphNode_GhostWheelController(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+FText UAnimGraphNode_GhostWheelController::GetControllerDescription() const
+{
+	return LOCTEXT("AnimGraphNode_GhostWheelController", "Wheel Controller for AGhostVehicle");
+}
+
+FText UAnimGraphNode_GhostWheelController::GetTooltipText() const
+{
+	return LOCTEXT("AnimGraphNode_GhostWheelController_Tooltip", "This alters the wheel transform based on set up in Wheeled Vehicle. This only works when the owner is WheeledVehicle.");
+}
+
+FText UAnimGraphNode_GhostWheelController::GetNodeTitle(ENodeTitleType::Type TitleType) const
+{
+	FText NodeTitle;
+	if (TitleType == ENodeTitleType::ListView || TitleType == ENodeTitleType::MenuTitle)
+	{
+		NodeTitle = GetControllerDescription();
+	}
+	else
+	{
+		// we don't have any run-time information, so it's limited to print  
+		// anymore than what it is it would be nice to print more data such as 
+		// name of bones for wheels, but it's not available in Persona
+		NodeTitle = FText(LOCTEXT("UAnimGraphNode_GhostWheelController_Title", "Wheel Controller"));
+	}	
+	return NodeTitle;
+}
+
+void UAnimGraphNode_GhostWheelController::ValidateAnimNodePostCompile(class FCompilerResultsLog& MessageLog, class UAnimBlueprintGeneratedClass* CompiledClass, int32 CompiledNodeIndex)
+{
+	// we only support vehicle anim instance
+	if ( CompiledClass->IsChildOf(UGhostVehicleAnimationInstance::StaticClass())  == false )
+	{
+		MessageLog.Error(TEXT("@@ is only allowwed in AGhostVehicleAnimInstance. If this is for vehicle, please change parent to be VehicleAnimInstance (Reparent Class)."), this);
+	}
+}
+
+bool UAnimGraphNode_GhostWheelController::IsCompatibleWithGraph(const UEdGraph* TargetGraph) const
+{
+	UBlueprint* Blueprint = FBlueprintEditorUtils::FindBlueprintForGraph(TargetGraph);
+	return (Blueprint != nullptr) && Blueprint->ParentClass->IsChildOf<UGhostVehicleAnimationInstance>() && Super::IsCompatibleWithGraph(TargetGraph);
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/SodaSimEditor/Private/AnimGraphNode_StageCoachGhostWheelController.cpp b/Source/SodaSimEditor/Private/AnimGraphNode_StageCoachGhostWheelController.cpp
new file mode 100644
index 0000000..ee3e95f
--- /dev/null
+++ b/Source/SodaSimEditor/Private/AnimGraphNode_StageCoachGhostWheelController.cpp
@@ -0,0 +1,57 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "AnimGraphNode_StageCoachGhostWheelController.h"
+#include "Kismet2/BlueprintEditorUtils.h"
+#include "Kismet2/CompilerResultsLog.h"
+#include "Soda/Actors/GhostVehicle/GhostVehicle.h"
+
+#define LOCTEXT_NAMESPACE "A3Nodes"
+
+UAnimGraphNode_StageCoachGhostWheelController::UAnimGraphNode_StageCoachGhostWheelController(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+FText UAnimGraphNode_StageCoachGhostWheelController::GetControllerDescription() const
+{
+	return LOCTEXT("AnimGraphNode_StageCoachGhostWheelController", "Stagecoach Effect Wheel Controller for ChaosWheeledVehicle");
+}
+
+FText UAnimGraphNode_StageCoachGhostWheelController::GetTooltipText() const
+{
+	return LOCTEXT("AnimGraphNode_StageCoachGhostWheelController_Tooltip", "This alters the wheel transform based on set up in Wheeled Vehicle. This only works when the owner is ChaosWheeledVehicle.");
+}
+
+FText UAnimGraphNode_StageCoachGhostWheelController::GetNodeTitle(ENodeTitleType::Type TitleType) const
+{
+	FText NodeTitle;
+	if (TitleType == ENodeTitleType::ListView || TitleType == ENodeTitleType::MenuTitle)
+	{
+		NodeTitle = GetControllerDescription();
+	}
+	else
+	{
+		// we don't have any run-time information, so it's limited to print  
+		// anymore than what it is it would be nice to print more data such as 
+		// name of bones for wheels but it's not available in Persona
+		NodeTitle = FText(LOCTEXT("UAnimGraphNode_StageCoachGhostWheelController_Title", "Stagecoach Effect Wheel Controller"));
+	}	
+	return NodeTitle;
+}
+
+void UAnimGraphNode_StageCoachGhostWheelController::ValidateAnimNodePostCompile(class FCompilerResultsLog& MessageLog, class UAnimBlueprintGeneratedClass* CompiledClass, int32 CompiledNodeIndex)
+{
+	// we only support vehicle anim instance
+	if ( CompiledClass->IsChildOf(UGhostVehicleAnimationInstance::StaticClass())  == false )
+	{
+		MessageLog.Error(TEXT("@@ is only allowed in AGhostVehicleAnimInstance. If this is for vehicle, please change parent to be VehicleAnimInstance (Reparent Class)."), this);
+	}
+}
+
+bool UAnimGraphNode_StageCoachGhostWheelController::IsCompatibleWithGraph(const UEdGraph* TargetGraph) const
+{
+	UBlueprint* Blueprint = FBlueprintEditorUtils::FindBlueprintForGraph(TargetGraph);
+	return (Blueprint != nullptr) && Blueprint->ParentClass->IsChildOf<UGhostVehicleAnimationInstance>() && Super::IsCompatibleWithGraph(TargetGraph);
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/SodaSimEditor/Private/SodaSimEditor.cpp b/Source/SodaSimEditor/Private/SodaSimEditor.cpp
new file mode 100644
index 0000000..fc9a0f7
--- /dev/null
+++ b/Source/SodaSimEditor/Private/SodaSimEditor.cpp
@@ -0,0 +1,20 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "CoreMinimal.h"
+#include "Modules/ModuleInterface.h"
+#include "Modules/ModuleManager.h"
+
+class FSodaSimEditor : public IModuleInterface
+{
+
+public:
+	virtual void StartupModule() override
+	{
+	}
+
+	virtual void ShutdownModule() override
+	{
+	}
+};
+
+IMPLEMENT_MODULE(FSodaSimEditor, SodaSimEditor)
\ No newline at end of file
diff --git a/Source/SodaSimEditor/Public/AnimGraphNode_GhostWheelController.h b/Source/SodaSimEditor/Public/AnimGraphNode_GhostWheelController.h
new file mode 100644
index 0000000..4eb5163
--- /dev/null
+++ b/Source/SodaSimEditor/Public/AnimGraphNode_GhostWheelController.h
@@ -0,0 +1,35 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "AnimGraphNode_SkeletalControlBase.h"
+#include "Soda/Actors/GhostVehicle/AnimNode_GhostWheelController.h"
+#include "AnimGraphNode_GhostWheelController.generated.h"
+
+class UEdGraph;
+
+UCLASS(MinimalAPI, meta=(Keywords = "Modify Wheel Vehicle"))
+class UAnimGraphNode_GhostWheelController : public UAnimGraphNode_SkeletalControlBase
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, Category=Settings)
+	FAnimNode_GhostWheelController Node;
+
+public:
+	// UEdGraphNode interface
+	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
+	virtual FText GetTooltipText() const override;
+	// validate if this is within VehicleAnimInstance
+	virtual void ValidateAnimNodePostCompile(class FCompilerResultsLog& MessageLog, class UAnimBlueprintGeneratedClass* CompiledClass, int32 CompiledNodeIndex) override;
+	virtual bool IsCompatibleWithGraph(const UEdGraph* TargetGraph) const override;
+	// End of UEdGraphNode interface
+
+protected:
+	// UAnimGraphNode_SkeletalControlBase interface
+	virtual FText GetControllerDescription() const override;
+	virtual const FAnimNode_SkeletalControlBase* GetNode() const override { return &Node; }
+	// End of UAnimGraphNode_SkeletalControlBase interface
+};
diff --git a/Source/SodaSimEditor/Public/AnimGraphNode_StageCoachGhostWheelController.h b/Source/SodaSimEditor/Public/AnimGraphNode_StageCoachGhostWheelController.h
new file mode 100644
index 0000000..c93e3c2
--- /dev/null
+++ b/Source/SodaSimEditor/Public/AnimGraphNode_StageCoachGhostWheelController.h
@@ -0,0 +1,35 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "AnimGraphNode_SkeletalControlBase.h"
+#include "Soda/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.h"
+#include "AnimGraphNode_StageCoachGhostWheelController.generated.h"
+
+class UEdGraph;
+
+UCLASS(MinimalAPI, meta=(Keywords = "Modify Wheel Vehicle"))
+class UAnimGraphNode_StageCoachGhostWheelController : public UAnimGraphNode_SkeletalControlBase
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, Category=Settings)
+	FAnimNode_StageCoachGhostWheelController Node;
+
+public:
+	// UEdGraphNode interface
+	virtual FText GetNodeTitle(ENodeTitleType::Type TitleType) const override;
+	virtual FText GetTooltipText() const override;
+	// validate if this is within VehicleAnimInstance
+	virtual void ValidateAnimNodePostCompile(class FCompilerResultsLog& MessageLog, class UAnimBlueprintGeneratedClass* CompiledClass, int32 CompiledNodeIndex) override;
+	virtual bool IsCompatibleWithGraph(const UEdGraph* TargetGraph) const override;
+	// End of UEdGraphNode interface
+
+protected:
+	// UAnimGraphNode_SkeletalControlBase interface
+	virtual FText GetControllerDescription() const override;
+	virtual const FAnimNode_SkeletalControlBase* GetNode() const override { return &Node; }
+	// End of UAnimGraphNode_SkeletalControlBase interface
+};
diff --git a/Source/SodaSimEditor/SodaSimEditor.Build.cs b/Source/SodaSimEditor/SodaSimEditor.Build.cs
new file mode 100644
index 0000000..b886dde
--- /dev/null
+++ b/Source/SodaSimEditor/SodaSimEditor.Build.cs
@@ -0,0 +1,39 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using UnrealBuildTool;
+
+public class SodaSimEditor : ModuleRules
+{
+    public SodaSimEditor(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+				"Engine",
+				"UnrealSoda",
+				"AnimGraphRuntime",
+				"AnimGraph",
+                "UnrealEd",
+                "EditorFramework",
+                "BlueprintGraph",
+            }
+		);
+
+		bEnableExceptions = true;
+		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+		bEnableUndefinedIdentifierWarnings = false;
+		SetupModulePhysicsSupport(Target);
+		//bUsePrecompiled = true;
+		bUseUnity = false;
+
+        if (!Directory.Exists(ModuleDirectory + "/Private"))
+        {
+            bUsePrecompiled = true;
+        }
+    }
+}
diff --git a/Source/SodaSimProto b/Source/SodaSimProto
new file mode 160000
index 0000000..cdeef0f
--- /dev/null
+++ b/Source/SodaSimProto
@@ -0,0 +1 @@
+Subproject commit cdeef0fed554a6159a7bdb7e1c758813799e2f29
diff --git a/Source/SodaStyle/Private/SodaFontGlyphs.cpp b/Source/SodaStyle/Private/SodaFontGlyphs.cpp
new file mode 100644
index 0000000..d3d3f08
--- /dev/null
+++ b/Source/SodaStyle/Private/SodaFontGlyphs.cpp
@@ -0,0 +1,99 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+
+#include "SodaFontGlyphs.h"
+
+FText FSodaFontGlyphs::Angle_Double_Left(FText::FromString(FString(TEXT("\xf100"))));
+FText FSodaFontGlyphs::Angle_Double_Right(FText::FromString(FString(TEXT("\xf101"))));
+FText FSodaFontGlyphs::Angle_Left(FText::FromString(FString(TEXT("\xf104"))));
+FText FSodaFontGlyphs::Angle_Right(FText::FromString(FString(TEXT("\xf105"))));
+FText FSodaFontGlyphs::Angle_Up(FText::FromString(FString(TEXT("\xf106"))));
+FText FSodaFontGlyphs::Archive(FText::FromString(FString(TEXT("\xf187"))));
+FText FSodaFontGlyphs::Arrow_Circle_O_Right(FText::FromString(FString(TEXT("\xf18e"))));
+FText FSodaFontGlyphs::Arrow_Left(FText::FromString(FString(TEXT("\xf060"))));
+FText FSodaFontGlyphs::Arrow_Right(FText::FromString(FString(TEXT("\xf061"))));
+FText FSodaFontGlyphs::Arrows(FText::FromString(FString(TEXT("\xf047"))));
+FText FSodaFontGlyphs::Ban(FText::FromString(FString(TEXT("\xf05e"))));
+FText FSodaFontGlyphs::Bars(FText::FromString(FString(TEXT("\xf0c9"))));
+FText FSodaFontGlyphs::Book(FText::FromString(FString(TEXT("\xf02d"))));
+FText FSodaFontGlyphs::Bug(FText::FromString(FString(TEXT("\xf188"))));
+FText FSodaFontGlyphs::Car(FText::FromString(FString(TEXT("\xf1b9"))));
+FText FSodaFontGlyphs::Caret_Down(FText::FromString(FString(TEXT("\xf0d7"))));
+FText FSodaFontGlyphs::Caret_Right(FText::FromString(FString(TEXT("\xf0da"))));
+FText FSodaFontGlyphs::Caret_Square_O_Down(FText::FromString(FString(TEXT("\xf150"))));
+FText FSodaFontGlyphs::Caret_Square_O_Left(FText::FromString(FString(TEXT("\xf191"))));
+FText FSodaFontGlyphs::Caret_Square_O_Right(FText::FromString(FString(TEXT("\xf152"))));
+FText FSodaFontGlyphs::Caret_Square_O_Up(FText::FromString(FString(TEXT("\xf151"))));
+FText FSodaFontGlyphs::Caret_Up(FText::FromString(FString(TEXT("\xf0d8"))));
+FText FSodaFontGlyphs::Check(FText::FromString(FString(TEXT("\xf00c"))));
+FText FSodaFontGlyphs::Check_Circle(FText::FromString(FString(TEXT("\xf058"))));
+FText FSodaFontGlyphs::Circle(FText::FromString(FString(TEXT("\xf111"))));
+FText FSodaFontGlyphs::Circle_O(FText::FromString(FString(TEXT("\xf10c"))));
+FText FSodaFontGlyphs::Clock_O(FText::FromString(FString(TEXT("\xf017"))));
+FText FSodaFontGlyphs::Cog(FText::FromString(FString(TEXT("\xf013"))));
+FText FSodaFontGlyphs::Cogs(FText::FromString(FString(TEXT("\xf085"))));
+FText FSodaFontGlyphs::Crosshairs(FText::FromString(FString(TEXT("\xf05b"))));
+FText FSodaFontGlyphs::Database(FText::FromString(FString(TEXT("\xf1c0"))));
+FText FSodaFontGlyphs::Download(FText::FromString(FString(TEXT("\xf019"))));
+FText FSodaFontGlyphs::Eraser(FText::FromString(FString(TEXT("\xf12d"))));
+FText FSodaFontGlyphs::Exchange(FText::FromString(FString(TEXT("\xf0ec"))));
+FText FSodaFontGlyphs::Exclamation(FText::FromString(FString(TEXT("\xf12a"))));
+FText FSodaFontGlyphs::Exclamation_Triangle(FText::FromString(FString(TEXT("\xf071"))));
+FText FSodaFontGlyphs::Expand(FText::FromString(FString(TEXT("\xf065"))));
+FText FSodaFontGlyphs::External_Link(FText::FromString(FString(TEXT("\xf08e"))));
+FText FSodaFontGlyphs::Eye(FText::FromString(FString(TEXT("\xf06e"))));
+FText FSodaFontGlyphs::Eye_Slash(FText::FromString(FString(TEXT("\xf070"))));
+FText FSodaFontGlyphs::Fast_Forward(FText::FromString(FString(TEXT("\xf050"))));
+FText FSodaFontGlyphs::File(FText::FromString(FString(TEXT("\xf15b"))));
+FText FSodaFontGlyphs::Film(FText::FromString(FString(TEXT("\xf008"))));
+FText FSodaFontGlyphs::Filter(FText::FromString(FString(TEXT("\xf0b0"))));
+FText FSodaFontGlyphs::Floppy_O(FText::FromString(FString(TEXT("\xf0c7"))));
+FText FSodaFontGlyphs::Folder(FText::FromString(FString(TEXT("\xf07b"))));
+FText FSodaFontGlyphs::Folder_Open(FText::FromString(FString(TEXT("\xf07c"))));
+FText FSodaFontGlyphs::Hourglass(FText::FromString(FString(TEXT("\xf254"))));
+FText FSodaFontGlyphs::Hourglass_O(FText::FromString(FString(TEXT("\xf250"))));
+FText FSodaFontGlyphs::Info(FText::FromString(FString(TEXT("\xf129"))));
+FText FSodaFontGlyphs::Info_Circle(FText::FromString(FString(TEXT("\xf05a"))));
+FText FSodaFontGlyphs::Level_Down(FText::FromString(FString(TEXT("\xf149"))));
+FText FSodaFontGlyphs::Level_Up(FText::FromString(FString(TEXT("\xf148"))));
+FText FSodaFontGlyphs::Lightbulb_O(FText::FromString(FString(TEXT("\xf0eb"))));
+FText FSodaFontGlyphs::Line_Chart(FText::FromString(FString(TEXT("\xf201"))));
+FText FSodaFontGlyphs::Link(FText::FromString(FString(TEXT("\xf0c1"))));
+FText FSodaFontGlyphs::Lock(FText::FromString(FString(TEXT("\xf023"))));
+FText FSodaFontGlyphs::Long_Arrow_Down(FText::FromString(FString(TEXT("\xf175"))));
+FText FSodaFontGlyphs::Long_Arrow_Right(FText::FromString(FString(TEXT("\xf178"))));
+FText FSodaFontGlyphs::Map(FText::FromString(FString(TEXT("\xf279"))));
+FText FSodaFontGlyphs::Map_Marker(FText::FromString(FString(TEXT("\xf041"))));
+FText FSodaFontGlyphs::Minus(FText::FromString(FString(TEXT("\xf068"))));
+FText FSodaFontGlyphs::Minus_Circle(FText::FromString(FString(TEXT("\xf056"))));
+FText FSodaFontGlyphs::Paper_Plane(FText::FromString(FString(TEXT("\xf1d8"))));
+FText FSodaFontGlyphs::Pause(FText::FromString(FString(TEXT("\xf04c"))));
+FText FSodaFontGlyphs::Pause_Circle(FText::FromString(FString(TEXT("\xf28b"))));
+FText FSodaFontGlyphs::Pencil(FText::FromString(FString(TEXT("\xf040"))));
+FText FSodaFontGlyphs::Pencil_Square(FText::FromString(FString(TEXT("\xf14b"))));
+FText FSodaFontGlyphs::Play(FText::FromString(FString(TEXT("\xf04b"))));
+FText FSodaFontGlyphs::Play_Circle(FText::FromString(FString(TEXT("\xf144"))));
+FText FSodaFontGlyphs::Plug(FText::FromString(FString(TEXT("\xf1e6"))));
+FText FSodaFontGlyphs::Plus(FText::FromString(FString(TEXT("\xf067"))));
+FText FSodaFontGlyphs::Plus_Circle(FText::FromString(FString(TEXT("\xf055"))));
+FText FSodaFontGlyphs::Question(FText::FromString(FString(TEXT("\xf128"))));
+FText FSodaFontGlyphs::Random(FText::FromString(FString(TEXT("\xf074"))));
+FText FSodaFontGlyphs::Recycle(FText::FromString(FString(TEXT("\xf1b8"))));
+FText FSodaFontGlyphs::Refresh(FText::FromString(FString(TEXT("\xf021"))));
+FText FSodaFontGlyphs::Share(FText::FromString(FString(TEXT("\xf064"))));
+FText FSodaFontGlyphs::Share_Alt(FText::FromString(FString(TEXT("\xf1e0"))));
+FText FSodaFontGlyphs::Sign_In(FText::FromString(FString(TEXT("\xf090"))));
+FText FSodaFontGlyphs::Sign_Out(FText::FromString(FString(TEXT("\xf08b"))));
+FText FSodaFontGlyphs::Square(FText::FromString(FString(TEXT("\xf0c8"))));
+FText FSodaFontGlyphs::Star(FText::FromString(FString(TEXT("\xf005"))));
+FText FSodaFontGlyphs::Step_Forward(FText::FromString(FString(TEXT("\xf051"))));
+FText FSodaFontGlyphs::Stop(FText::FromString(FString(TEXT("\xf04d"))));
+FText FSodaFontGlyphs::Terminal(FText::FromString(FString(TEXT("\xf120"))));
+FText FSodaFontGlyphs::Th(FText::FromString(FString(TEXT("\xf00a"))));
+FText FSodaFontGlyphs::Thumb_Tack(FText::FromString(FString(TEXT("\xf08d"))));
+FText FSodaFontGlyphs::Times(FText::FromString(FString(TEXT("\xf00d"))));
+FText FSodaFontGlyphs::Times_Circle(FText::FromString(FString(TEXT("\xf057"))));
+FText FSodaFontGlyphs::Trash(FText::FromString(FString(TEXT("\xf1f8"))));
+FText FSodaFontGlyphs::Undo(FText::FromString(FString(TEXT("\xf0e2"))));
+FText FSodaFontGlyphs::Unlock(FText::FromString(FString(TEXT("\xf09c"))));
+FText FSodaFontGlyphs::Video_Camera(FText::FromString(FString(TEXT("\xf03d"))));
\ No newline at end of file
diff --git a/Source/SodaStyle/Private/SodaStyle.cpp b/Source/SodaStyle/Private/SodaStyle.cpp
new file mode 100644
index 0000000..9d5d5cb
--- /dev/null
+++ b/Source/SodaStyle/Private/SodaStyle.cpp
@@ -0,0 +1,2678 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaStyle.h"
+#include "Misc/CommandLine.h"
+#include "Styling/StarshipCoreStyle.h"
+#include "Classes/SodaStyleSettings.h"
+#include "SlateOptMacros.h"
+#include "Styling/SlateStyleMacros.h"
+#include "Styling/ToolBarStyle.h"
+#include "Styling/SegmentedControlStyle.h"
+#include "Styling/StyleColors.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Interfaces/IPluginManager.h"
+
+#define ICON_FONT(...) FSlateFontInfo(RootToContentDir("Fonts/FontAwesome", TEXT(".ttf")), __VA_ARGS__)
+
+#define LOCTEXT_NAMESPACE "SodaStyle"
+
+void FStarshipSodaStyle::Initialize()
+{
+	LLM_SCOPE_BYNAME(TEXT("FStarshipSodaStyle"));
+	Settings = NULL;
+
+	FSlateApplication::InitializeCoreStyle();
+
+	const FString ThemesSubDir = TEXT("Slate/Themes");
+
+	StyleInstance = Create(Settings);
+	SetStyle(StyleInstance.ToSharedRef());
+}
+
+void FStarshipSodaStyle::Shutdown()
+{
+	StyleInstance.Reset();
+}
+
+BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
+
+
+TSharedPtr< FStarshipSodaStyle::FStyle > FStarshipSodaStyle::StyleInstance = NULL;
+TWeakObjectPtr< USodaStyleSettings > FStarshipSodaStyle::Settings = NULL;
+
+void FStarshipSodaStyle::FStyle::SetColor(const TSharedRef< FLinearColor >& Source, const FLinearColor& Value)
+{
+	Source->R = Value.R;
+	Source->G = Value.G;
+	Source->B = Value.B;
+	Source->A = Value.A;
+}
+
+/* FStarshipSodaStyle interface
+ *****************************************************************************/
+
+FStarshipSodaStyle::FStyle::FStyle( const TWeakObjectPtr< USodaStyleSettings >& InSettings )
+	: FSlateStyleSet("SodaStyle")
+
+	// Note, these sizes are in Slate Units.
+	// Slate Units do NOT have to map to pixels.
+	, Icon7x16(7.0f, 16.0f)
+	, Icon8x4(8.0f, 4.0f)
+	, Icon16x4(16.0f, 4.0f)
+	, Icon8x8(8.0f, 8.0f)
+	, Icon10x10(10.0f, 10.0f)
+	, Icon12x12(12.0f, 12.0f)
+	, Icon12x16(12.0f, 16.0f)
+	, Icon14x14(14.0f, 14.0f)
+	, Icon16x16(16.0f, 16.0f)
+	, Icon16x20(16.0f, 20.0f)
+	, Icon20x20(20.0f, 20.0f)
+	, Icon22x22(22.0f, 22.0f)
+	, Icon24x24(24.0f, 24.0f)
+	, Icon25x25(25.0f, 25.0f)
+	, Icon32x32(32.0f, 32.0f)
+	, Icon40x40(40.0f, 40.0f)
+	, Icon48x48(48.0f, 48.0f)
+	, Icon64x64(64.0f, 64.0f)
+	, Icon36x24(36.0f, 24.0f)
+	, Icon128x128(128.0f, 128.0f)
+
+	// These are the colors that are updated by the user style customizations
+	, SelectionColor_Subdued_LinearRef(MakeShareable(new FLinearColor(0.807f, 0.596f, 0.388f)))
+	, HighlightColor_LinearRef( MakeShareable( new FLinearColor(0.068f, 0.068f, 0.068f) ) ) 
+	, WindowHighlightColor_LinearRef(MakeShareable(new FLinearColor(0,0,0,0)))
+
+
+
+	// These are the Slate colors which reference those above; these are the colors to put into the style
+	, SelectionColor_Subdued( SelectionColor_Subdued_LinearRef )
+	, HighlightColor( HighlightColor_LinearRef )
+	, WindowHighlightColor(WindowHighlightColor_LinearRef)
+	, LogColor_SelectionBackground(EStyleColor::User2)
+	, LogColor_Normal(EStyleColor::User3)
+	, LogColor_Command(EStyleColor::User4)
+
+	, InheritedFromBlueprintTextColor(FLinearColor(0.25f, 0.5f, 1.0f))
+
+	, Settings( InSettings )
+{
+}
+
+
+void FStarshipSodaStyle::FStyle::SettingsChanged(UObject* ChangedObject, FPropertyChangedEvent& PropertyChangedEvent)
+{
+	if ( ChangedObject == Settings.Get() )
+	{
+		SyncSettings();
+	}
+}
+
+void FStarshipSodaStyle::FStyle::SyncSettings()
+{
+	if (Settings.IsValid())
+	{
+		// The subdued selection color is derived from the selection color
+		auto SubduedSelectionColor = Settings->GetSubduedSelectionColor();
+		SetColor(SelectionColor_Subdued_LinearRef, SubduedSelectionColor);
+
+		// Also sync the colors used by FStarshipCoreStyle, as FSodaStyle isn't yet being used as an override everywhere
+	/*	FStarshipCoreStyle::SetSelectorColor(Settings->KeyboardFocusColor);
+		FStarshipCoreStyle::SetSelectionColor(Settings->SelectionColor);
+		FStarshipCoreStyle::SetInactiveSelectionColor(Settings->InactiveSelectionColor);
+		FStarshipCoreStyle::SetPressedSelectionColor(Settings->PressedSelectionColor);
+*/
+
+		// Sync the window background settings
+		FWindowStyle& WindowStyle = const_cast<FWindowStyle&>(FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FWindowStyle>("Window"));
+
+		if (Settings->bEnableEditorWindowBackgroundColor)
+		{
+			SetColor(WindowHighlightColor_LinearRef, Settings->EditorWindowBackgroundColor);
+		}
+		else
+		{
+			SetColor(WindowHighlightColor_LinearRef, FLinearColor(0, 0, 0, 0));
+		}
+	}
+}
+
+void FStarshipSodaStyle::FStyle::SyncParentStyles()
+{
+	const ISlateStyle* ParentStyle = GetParentStyle();
+
+	// Get the scrollbar style from the core style as it is referenced by the editor style
+	ScrollBar = ParentStyle->GetWidgetStyle<FScrollBarStyle>("ScrollBar");
+	NoBorder = ParentStyle->GetWidgetStyle<FButtonStyle>("NoBorder");
+	NormalFont = ParentStyle->GetFontStyle("NormalFont");
+	NormalText = ParentStyle->GetWidgetStyle<FTextBlockStyle>("NormalText");
+	Button = ParentStyle->GetWidgetStyle<FButtonStyle>("Button");
+	NormalEditableTextBoxStyle = ParentStyle->GetWidgetStyle<FEditableTextBoxStyle>("NormalEditableTextBox");
+	NormalTableRowStyle = ParentStyle->GetWidgetStyle<FTableRowStyle>("TableView.Row");
+
+	DefaultForeground = ParentStyle->GetSlateColor("DefaultForeground");
+	InvertedForeground = ParentStyle->GetSlateColor("InvertedForeground");
+
+	SelectorColor = ParentStyle->GetSlateColor("SelectorColor");
+	SelectionColor = ParentStyle->GetSlateColor("SelectionColor");
+	SelectionColor_Inactive = ParentStyle->GetSlateColor("SelectionColor_Inactive");
+	SelectionColor_Pressed = ParentStyle->GetSlateColor("SelectionColor_Pressed");
+}
+
+static void AuditDuplicatedCoreStyles(const ISlateStyle& SodaStyle)
+{
+	const ISlateStyle& CoreStyle = FStarshipCoreStyle::GetCoreStyle();
+	TSet<FName> CoreStyleKeys = CoreStyle.GetStyleKeys();
+
+	TSet<FName> SodaStyleKeys = SodaStyle.GetStyleKeys();
+
+	TSet<FName> DuplicatedNames = CoreStyleKeys.Intersect(SodaStyleKeys);
+
+	DuplicatedNames.Sort(FNameLexicalLess());
+	for (FName& Name : DuplicatedNames)
+	{
+		UE_LOG(LogSlate, Log, TEXT("%s"), *Name.ToString());
+	}
+}
+
+void FStarshipSodaStyle::FStyle::Initialize()
+{
+	SetParentStyleName("CoreStyle");
+
+	// Sync styles from the parent style that will be used as templates for styles defined here
+	SyncParentStyles();
+	SetContentRoot(IPluginManager::Get().FindPlugin(TEXT("SodaSim"))->GetContentDir() / TEXT("Slate"));
+	SetCoreContentRoot(FPaths::EngineContentDir() / TEXT("Slate"));
+
+	SetupGeneralStyles();
+	SetupViewportStyles();
+	SetupMenuBarStyles();
+	SetupGeneralIcons();
+	SetupWindowStyles();
+	SetupPropertySodaStyles();
+	SetupGraphSodaStyles();
+	SetupLevelSodaStyle();
+	SetupPersonaStyle();
+	SetupClassIconsAndThumbnails();
+	SetupColorPickerStyle();
+	SetupTutorialStyles();
+	SetupScenarioEditorStyle();
+
+	AuditDuplicatedCoreStyles(*this);
+	
+	SyncSettings();
+}
+
+void FStarshipSodaStyle::FStyle::SetupGeneralStyles()
+{
+	Set("MenuWindow.Caption", new FSlateRoundedBoxBrush(FStyleColors::Recessed, 12.f, FLinearColor(0, 0, 0, .8), 1.0));
+	Set("MenuWindow.Border", new FSlateRoundedBoxBrush(FStyleColors::Dropdown, 12.f, FLinearColor(0, 0, 0, .8), 1.0));
+	Set("MenuWindow.Content", new FSlateRoundedBoxBrush(FStyleColors::Recessed, 12.f, FLinearColor(0, 0, 0, .8), 1.0));
+
+	FButtonStyle CloseMenuWindowButton = FButtonStyle()
+		.SetNormal(IMAGE_BRUSH("Common/X", Icon16x16, FLinearColor(1, 1, 1, 0.4)))
+		.SetHovered(IMAGE_BRUSH("Common/X", Icon16x16, FLinearColor(1, 1, 1, 1.0)))
+		.SetPressed(IMAGE_BRUSH("Common/X", Icon16x16, FLinearColor(1, 1, 1, 0.8)));
+		//.SetNormalPadding(FMargin(0, 0, 0, 1))
+		//.SetPressedPadding(FMargin(0, 1, 0, 0));
+	Set("MenuWindow.CloseButton", CloseMenuWindowButton);
+
+	FButtonStyle DeleteButton = FButtonStyle()
+		.SetNormal(CORE_IMAGE_BRUSH_SVG("Starship/Common/Delete", Icon16x16, FLinearColor(1, 1, 1, 0.4)))
+		.SetHovered(CORE_IMAGE_BRUSH_SVG("Starship/Common/Delete", Icon16x16, FLinearColor(1, 1, 1, 1.0)))
+		.SetPressed(CORE_IMAGE_BRUSH_SVG("Starship/Common/Delete", Icon16x16, FLinearColor(1, 1, 1, 0.8)));
+	//.SetNormalPadding(FMargin(0, 0, 0, 1))
+	//.SetPressedPadding(FMargin(0, 1, 0, 0));
+	Set("MenuWindow.DeleteButton", DeleteButton);
+
+	FButtonStyle AddButton = FButtonStyle()
+		.SetNormal(CORE_IMAGE_BRUSH_SVG("Starship/Common/plus", Icon16x16, FLinearColor(1, 1, 1, 0.4)))
+		.SetHovered(CORE_IMAGE_BRUSH_SVG("Starship/Common/plus", Icon16x16, FLinearColor(1, 1, 1, 1.0)))
+		.SetPressed(CORE_IMAGE_BRUSH_SVG("Starship/Common/plus", Icon16x16, FLinearColor(1, 1, 1, 0.8)));
+	//.SetNormalPadding(FMargin(0, 0, 0, 1))
+	//.SetPressedPadding(FMargin(0, 1, 0, 0));
+	Set("MenuWindow.AddButton", AddButton);
+
+	FButtonStyle SaveButton = FButtonStyle()
+		.SetNormal(CORE_IMAGE_BRUSH_SVG("Starship/Common/save", Icon16x16, FLinearColor(1, 1, 1, 0.4)))
+		.SetHovered(CORE_IMAGE_BRUSH_SVG("Starship/Common/save", Icon16x16, FLinearColor(1, 1, 1, 1.0)))
+		.SetPressed(CORE_IMAGE_BRUSH_SVG("Starship/Common/save", Icon16x16, FLinearColor(1, 1, 1, 0.8)));
+	//.SetNormalPadding(FMargin(0, 0, 0, 1))
+	//.SetPressedPadding(FMargin(0, 1, 0, 0));
+	Set("MenuWindow.SaveButton", SaveButton);
+
+	Set("RowButton", FButtonStyle(Button)
+		.SetNormal(FSlateNoResource())
+		.SetHovered(BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, SelectionColor))
+		.SetPressed(BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, SelectionColor))
+	);
+
+	Set("RowButtonSelected", FButtonStyle(Button)
+		.SetNormal(BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, SelectionColor_Pressed))
+		.SetHovered(FSlateNoResource())
+		.SetPressed(FSlateNoResource())
+	);
+
+	// Normal Text
+	{
+		Set( "RichTextBlock.TextHighlight", FTextBlockStyle(NormalText)
+			.SetColorAndOpacity( FLinearColor( 1.0f, 1.0f, 1.0f ) ) );
+		Set( "RichTextBlock.Bold", FTextBlockStyle(NormalText)
+			.SetFont( DEFAULT_FONT("Bold", FStarshipCoreStyle::RegularTextSize )) );
+		Set( "RichTextBlock.BoldHighlight", FTextBlockStyle(NormalText)
+			.SetFont( DEFAULT_FONT("Bold", FStarshipCoreStyle::RegularTextSize ))
+			.SetColorAndOpacity( FLinearColor( 1.0f, 1.0f, 1.0f ) ) );
+		Set("RichTextBlock.Italic", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Italic", FStarshipCoreStyle::RegularTextSize)));
+		Set("RichTextBlock.ItalicHighlight", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Italic", FStarshipCoreStyle::RegularTextSize))
+			.SetColorAndOpacity(FLinearColor(1.0f, 1.0f, 1.0f)));
+
+		Set( "TextBlock.HighlightShape",  new BOX_BRUSH( "Common/TextBlockHighlightShape", FMargin(3.f/8.f) ));
+		Set( "TextBlock.HighlighColor", FLinearColor( 0.02f, 0.3f, 0.0f ) );
+
+		Set("TextBlock.ShadowedText", FTextBlockStyle(NormalText)
+			.SetShadowOffset(FVector2D(1.0f, 1.0f))
+			.SetShadowColorAndOpacity(FLinearColor(0.0f, 0.0f, 0.0f)));
+
+		Set("TextBlock.ShadowedTextWarning", FTextBlockStyle(NormalText)
+			.SetColorAndOpacity(FStyleColors::Warning)
+			.SetShadowOffset(FVector2D(1.0f, 1.0f))
+			.SetShadowColorAndOpacity(FLinearColor(0.0f, 0.0f, 0.0f)));
+
+		Set("NormalText.Subdued", FTextBlockStyle(NormalText)
+			.SetColorAndOpacity(FSlateColor::UseSubduedForeground()));
+
+		Set("NormalText.Important", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Bold", FStarshipCoreStyle::RegularTextSize))
+			.SetColorAndOpacity(FLinearColor(1.0f, 1.0f, 1.0f))
+			.SetHighlightColor(FLinearColor(1.0f, 1.0f, 1.0f))
+			.SetShadowOffset(FVector2D(1, 1))
+			.SetShadowColorAndOpacity(FLinearColor(0, 0, 0, 0.9f)));
+
+		Set("SmallText.Subdued", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Regular", FStarshipCoreStyle::SmallTextSize))
+			.SetColorAndOpacity(FSlateColor::UseSubduedForeground()));
+
+		Set("TinyText", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Regular", FStarshipCoreStyle::SmallTextSize)));
+
+		Set("TinyText.Subdued", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Regular", FStarshipCoreStyle::SmallTextSize))
+			.SetColorAndOpacity(FSlateColor::UseSubduedForeground()));
+
+		Set("LargeText", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Bold", 11))
+			.SetColorAndOpacity(FLinearColor(1.0f, 1.0f, 1.0f))
+			.SetHighlightColor(FLinearColor(1.0f, 1.0f, 1.0f))
+			.SetShadowOffset(FVector2D(1, 1))
+			.SetShadowColorAndOpacity(FLinearColor(0, 0, 0, 0.9f)));
+	}
+
+	// Rendering resources that never change
+	{
+		Set( "None", new FSlateNoResource() );
+	}
+
+
+
+	Set("PlainBorder", new BORDER_BRUSH("Common/PlainBorder", 2.f / 8.f));
+
+	Set( "WideDash.Horizontal", new CORE_IMAGE_BRUSH("Starship/Common/Dash_Horizontal", FVector2D(10, 1), FLinearColor::White, ESlateBrushTileType::Horizontal));
+	Set( "WideDash.Vertical", new CORE_IMAGE_BRUSH("Starship/Common/Dash_Vertical", FVector2D(1, 10), FLinearColor::White, ESlateBrushTileType::Vertical));
+
+	Set("DropTarget.Background", new CORE_BOX_BRUSH("Starship/Common/DropTargetBackground", FMargin(6.0f / 64.0f)));
+
+	Set("ThinLine.Horizontal", new IMAGE_BRUSH("Common/ThinLine_Horizontal", FVector2D(11, 2), FLinearColor::White, ESlateBrushTileType::Horizontal));
+
+
+	// Buttons that only provide a hover hint.
+	HoverHintOnly = FButtonStyle()
+			.SetNormal( FSlateNoResource() )
+			.SetHovered( BOX_BRUSH( "Common/ButtonHoverHint", FMargin(4/16.0f), FLinearColor(1,1,1,0.15f) ) )
+			.SetPressed( BOX_BRUSH( "Common/ButtonHoverHint", FMargin(4/16.0f), FLinearColor(1,1,1,0.25f) ) )
+			.SetNormalPadding( FMargin(0,0,0,1) )
+			.SetPressedPadding( FMargin(0,1,0,0) );
+	Set( "HoverHintOnly", HoverHintOnly );
+
+
+	FButtonStyle SimpleSharpButton = FButtonStyle()
+		.SetNormal(BOX_BRUSH("Common/Button/simple_sharp_normal", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+		.SetHovered(BOX_BRUSH("Common/Button/simple_sharp_hovered", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+		.SetPressed(BOX_BRUSH("Common/Button/simple_sharp_hovered", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+		.SetNormalPadding(FMargin(0, 0, 0, 1))
+		.SetPressedPadding(FMargin(0, 1, 0, 0));
+	Set("SimpleSharpButton", SimpleSharpButton);
+
+	FButtonStyle SimpleRoundButton = FButtonStyle()
+		.SetNormal(BOX_BRUSH("Common/Button/simple_round_normal", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+		.SetHovered(BOX_BRUSH("Common/Button/simple_round_hovered", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+		.SetPressed(BOX_BRUSH("Common/Button/simple_round_hovered", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+		.SetNormalPadding(FMargin(0, 0, 0, 1))
+		.SetPressedPadding(FMargin(0, 1, 0, 0));
+	Set("SimpleRoundButton", SimpleRoundButton);
+
+	// Common glyphs
+	{
+		Set( "Symbols.SearchGlass", new IMAGE_BRUSH( "Common/SearchGlass", Icon16x16 ) );
+		Set( "Symbols.X", new IMAGE_BRUSH( "Common/X", Icon16x16 ) );
+		Set( "Symbols.VerticalPipe", new BOX_BRUSH( "Common/VerticalPipe", FMargin(0) ) );
+		Set( "Symbols.UpArrow", new IMAGE_BRUSH( "Common/UpArrow", Icon8x8 ) );
+		Set( "Symbols.DoubleUpArrow", new IMAGE_BRUSH( "Common/UpArrow2", Icon8x8 ) );
+		Set( "Symbols.DownArrow", new IMAGE_BRUSH( "Common/DownArrow", Icon8x8 ) );
+		Set( "Symbols.DoubleDownArrow", new IMAGE_BRUSH( "Common/DownArrow2", Icon8x8 ) );
+		Set( "Symbols.RightArrow", new IMAGE_BRUSH("Common/SubmenuArrow", Icon8x8));
+		Set( "Symbols.Check", new IMAGE_BRUSH( "Common/Check", Icon16x16 ) );
+	}
+
+	// Common icons
+	{
+		Set("Icons.Crop", new IMAGE_BRUSH_SVG("Starship/Common/Crop", Icon16x16));
+		Set("Icons.Fullscreen", new IMAGE_BRUSH_SVG("Starship/Common/EnableFullscreen", Icon16x16));
+		Set("Icons.Save", new IMAGE_BRUSH_SVG( "Starship/Common/SaveCurrent", Icon16x16 ) );
+		Set("Icons.SaveChanged", new IMAGE_BRUSH_SVG( "Starship/Common/SaveChanged", Icon16x16 ) );
+
+		Set("Icons.DirtyBadge", new IMAGE_BRUSH_SVG("Starship/Common/DirtyBadge", Icon12x12));
+		Set("Icons.MakeStaticMesh", new IMAGE_BRUSH_SVG("Starship/Common/MakeStaticMesh", Icon16x16));
+		Set("Icons.Documentation", new IMAGE_BRUSH_SVG("Starship/Common/Documentation", Icon16x16));
+		Set("Icons.Support", new IMAGE_BRUSH_SVG("Starship/Common/Support", Icon16x16));
+		Set("Icons.Package", new IMAGE_BRUSH_SVG("Starship/Common/ProjectPackage", Icon16x16));
+		Set("Icons.Comment", new IMAGE_BRUSH_SVG("Starship/Common/Comment", Icon16x16));
+		Set("Icons.SelectInViewport", new IMAGE_BRUSH_SVG("Starship/Common/SelectInViewport", Icon16x16));
+		Set("Icons.BrowseContent", new IMAGE_BRUSH_SVG("Starship/Common/BrowseContent", Icon16x16));
+		Set("Icons.Use", new IMAGE_BRUSH_SVG("Starship/Common/use-circle", Icon16x16));
+		Set("Icons.Advanced", new IMAGE_BRUSH_SVG("Starship/Common/Advanced", Icon16x16));
+		Set("Icons.Launch", new IMAGE_BRUSH_SVG("Starship/Common/ProjectLauncher", Icon16x16));
+		Set("Icons.Next", new IMAGE_BRUSH_SVG("Starship/Common/NextArrow", Icon16x16));
+		Set("Icons.Previous", new IMAGE_BRUSH_SVG("Starship/Common/PreviousArrow", Icon16x16));
+		Set("Icons.Visibility", new IMAGE_BRUSH_SVG("Starship/Common/Visibility", Icon20x20));
+		Set("Icons.World", new IMAGE_BRUSH_SVG("Starship/Common/World", Icon20x20));
+		Set("Icons.Details", new IMAGE_BRUSH_SVG("Starship/Common/Details", Icon16x16));
+		Set("Icons.Convert", new IMAGE_BRUSH_SVG("Starship/Common/convert", Icon20x20));
+		Set("Icons.Adjust", new IMAGE_BRUSH_SVG("Starship/Common/Adjust", Icon16x16));
+		Set("Icons.PlaceActors", new IMAGE_BRUSH_SVG("Starship/Common/PlaceActors", Icon16x16));
+		Set("Icons.ReplaceActor", new IMAGE_BRUSH_SVG("Starship/Common/ReplaceActors", Icon16x16));
+		Set("Icons.GroupActors", new IMAGE_BRUSH_SVG("Starship/Common/GroupActors", Icon16x16));
+		Set("Icons.Transform", new IMAGE_BRUSH_SVG("Starship/Common/transform-local", Icon16x16));
+		Set("Icons.SetShowPivot", new IMAGE_BRUSH_SVG("Starship/Common/SetShowPivot", Icon16x16));
+		Set("Icons.Snap", new IMAGE_BRUSH_SVG("Starship/Common/Snap", Icon16x16));
+		Set("Icons.Event", new IMAGE_BRUSH_SVG("Starship/Common/Event", Icon16x16));
+		Set("Icons.JumpToEvent", new IMAGE_BRUSH_SVG("Starship/Common/JumpToEvent", Icon16x16));
+		Set("Icons.Merge", new IMAGE_BRUSH_SVG("Starship/Common/Merge", Icon16x16));
+		Set("Icons.Level", new IMAGE_BRUSH_SVG("Starship/Common/Levels", Icon16x16));
+		Set("Icons.Play", new IMAGE_BRUSH_SVG("Starship/Common/play", Icon16x16));
+		Set("Icons.Localization", new IMAGE_BRUSH_SVG("Starship/Common/LocalizationDashboard", Icon16x16));
+		Set("Icons.Audit", new IMAGE_BRUSH_SVG("Starship/Common/AssetAudit", Icon16x16));
+		Set("Icons.Blueprint", new IMAGE_BRUSH_SVG("Starship/Common/blueprint", Icon16x16));
+		Set("Icons.Color", new IMAGE_BRUSH_SVG("Starship/Common/color", Icon16x16));
+		Set("Icons.LOD", new IMAGE_BRUSH_SVG("Starship/Common/LOD", Icon16x16));
+		Set("Icons.SkeletalMesh", new IMAGE_BRUSH_SVG("Starship/Common/SkeletalMesh", Icon16x16));
+		Set("Icons.OpenInExternalEditor", new IMAGE_BRUSH_SVG("Starship/Common/OpenInExternalEditor", Icon16x16));
+		Set("Icons.OpenSourceLocation", new IMAGE_BRUSH_SVG("Starship/Common/OpenSourceLocation", Icon16x16));
+		Set("Icons.Find", new IMAGE_BRUSH_SVG("Starship/Common/Find", Icon16x16));
+		Set("Icons.Validate", new IMAGE_BRUSH_SVG("Starship/Common/validate", Icon16x16));
+		Set("Icons.Pinned", new IMAGE_BRUSH_SVG("Starship/Common/Pinned", Icon16x16));
+		Set("Icons.Unpinned", new IMAGE_BRUSH_SVG("Starship/Common/Unpinned", Icon16x16));
+
+		Set("Icons.Tree", new IMAGE_BRUSH_SVG("Starship/Common/WorldOutliner", Icon16x16));
+		Set("Icons.Reset", new IMAGE_BRUSH_SVG("Starship/Common/Update", Icon16x16));
+		Set("Icons.Box", new IMAGE_BRUSH_SVG("Starship/Common/ViewPerspective", Icon16x16));
+		Set("Icons.Animation", new IMAGE_BRUSH_SVG("Starship/Common/Animation", Icon16x16));
+		Set("Icons.Loop", new IMAGE_BRUSH_SVG("Starship/Common/Loop", Icon16x16));
+		Set("Icons.Step", new IMAGE_BRUSH_SVG("Starship/MainToolbar/SingleFrameAdvance", Icon16x16));
+		Set("Icons.Sequence", new IMAGE_BRUSH_SVG("Starship/AssetIcons/LevelSequenceActor_16", Icon16x16));
+
+		Set("Icons.Function", new IMAGE_BRUSH_SVG("Starship/Blueprints/icon_Blueprint_Function", Icon16x16));
+		Set("Icons.AddFunction", new IMAGE_BRUSH_SVG("Starship/Blueprints/icon_Blueprint_AddFunction", Icon16x16));
+		Set("Icons.Pillset", new IMAGE_BRUSH_SVG("Starship/Blueprints/pillset", Icon16x16));
+
+		Set("Icons.Log", new IMAGE_BRUSH_SVG("Starship/Common/Log", Icon16x16)); 
+
+		Set("Icons.Toolbar.Play", new IMAGE_BRUSH_SVG("Starship/Common/play", Icon16x16, FStyleColors::AccentGreen));
+		Set("Icons.Toolbar.Pause", new IMAGE_BRUSH_SVG("Starship/MainToolbar/pause", Icon16x16));
+		Set("Icons.Toolbar.Stop", new IMAGE_BRUSH_SVG("Starship/MainToolbar/stop", Icon16x16, FStyleColors::AccentRed));
+		Set("Icons.Toolbar.Settings", new CORE_IMAGE_BRUSH_SVG( "Starship/Common/Settings", Icon16x16));
+		Set("Icons.Toolbar.Details", new IMAGE_BRUSH_SVG("Starship/Common/Details", Icon16x16));
+		Set("Icons.Toolbar.EditorMode", new IMAGE_BRUSH_SVG("Starship/Common/EditorModes", Icon16x16));
+		Set("Icons.Toolbar.FreeMode", new IMAGE_BRUSH_SVG("SodaIcons/car", Icon16x16));
+	}
+
+	// Soda Icons
+	{
+		Set("SodaIcons.AI", new IMAGE_BRUSH_SVG("SodaIcons/ai", Icon16x16));
+		Set("SodaIcons.Car", new IMAGE_BRUSH_SVG("SodaIcons/car", Icon16x16));
+		Set("SodaIcons.Keyboard", new IMAGE_BRUSH_SVG("SodaIcons/keyboard", Icon16x16));
+		Set("SodaIcons.Point", new IMAGE_BRUSH_SVG("SodaIcons/point", Icon16x16));
+		Set("SodaIcons.Terminal", new IMAGE_BRUSH_SVG("SodaIcons/terminal", Icon16x16));
+		Set("SodaIcons.Action", new IMAGE_BRUSH_SVG("SodaIcons/action", Icon16x16));
+		Set("SodaIcons.Compass", new IMAGE_BRUSH_SVG("SodaIcons/compass", Icon16x16));
+		Set("SodaIcons.LapCount", new IMAGE_BRUSH_SVG("SodaIcons/lap-count", Icon16x16));
+		Set("SodaIcons.RaceTrack", new IMAGE_BRUSH_SVG("SodaIcons/race-track", Icon16x16));
+		Set("SodaIcons.Tool", new IMAGE_BRUSH_SVG("SodaIcons/tool", Icon16x16));
+		Set("SodaIcons.Arrival", new IMAGE_BRUSH_SVG("SodaIcons/arrival", Icon16x16));
+		Set("SodaIcons.Soda", new IMAGE_BRUSH_SVG("SodaIcons/soda", Icon16x16));
+		Set("SodaIcons.Device", new IMAGE_BRUSH_SVG("SodaIcons/device", Icon16x16));
+		Set("SodaIcons.Lidar", new IMAGE_BRUSH_SVG("SodaIcons/lidar", Icon16x16));
+		Set("SodaIcons.Radar", new IMAGE_BRUSH_SVG("SodaIcons/radar", Icon16x16));
+		Set("SodaIcons.Ultrasonic", new IMAGE_BRUSH_SVG("SodaIcons/ultrasonic", Icon16x16));
+		Set("SodaIcons.Braking", new IMAGE_BRUSH_SVG("SodaIcons/braking", Icon16x16));
+		Set("SodaIcons.External", new IMAGE_BRUSH_SVG("SodaIcons/external", Icon16x16));
+		Set("SodaIcons.Mechanics", new IMAGE_BRUSH_SVG("SodaIcons/mechanics", Icon16x16));
+		Set("SodaIcons.Road", new IMAGE_BRUSH_SVG("SodaIcons/road", Icon16x16));
+		Set("SodaIcons.Van", new IMAGE_BRUSH_SVG("SodaIcons/van", Icon16x16));
+		Set("SodaIcons.Bus", new IMAGE_BRUSH_SVG("SodaIcons/bus", Icon16x16));
+		Set("SodaIcons.GPS", new IMAGE_BRUSH_SVG("SodaIcons/gps", Icon16x16));
+		Set("SodaIcons.Modem", new IMAGE_BRUSH_SVG("SodaIcons/modem", Icon16x16));
+		Set("SodaIcons.Route", new IMAGE_BRUSH_SVG("SodaIcons/route", Icon16x16));
+		Set("SodaIcons.Weather", new IMAGE_BRUSH_SVG("SodaIcons/weather", Icon16x16));
+		Set("SodaIcons.CAN", new IMAGE_BRUSH_SVG("SodaIcons/can", Icon16x16));
+		Set("SodaIcons.Net", new IMAGE_BRUSH_SVG("SodaIcons/net", Icon16x16));
+		Set("SodaIcons.IMU", new IMAGE_BRUSH_SVG("SodaIcons/imu", Icon16x16));
+		Set("SodaIcons.Motor", new IMAGE_BRUSH_SVG("SodaIcons/motor", Icon16x16));
+		Set("SodaIcons.Sensor", new IMAGE_BRUSH_SVG("SodaIcons/sensor", Icon16x16));
+		Set("SodaIcons.Camera", new IMAGE_BRUSH_SVG("SodaIcons/camera", Icon16x16));
+		Set("SodaIcons.Joystick", new IMAGE_BRUSH_SVG("SodaIcons/joystick", Icon16x16));
+		Set("SodaIcons.Path", new IMAGE_BRUSH_SVG("SodaIcons/path", Icon16x16));
+		Set("SodaIcons.Steering", new IMAGE_BRUSH_SVG("SodaIcons/steering", Icon16x16));
+		Set("SodaIcons.CircleBoard", new IMAGE_BRUSH_SVG("SodaIcons/circle-board", Icon16x16));
+		Set("SodaIcons.ArUco", new IMAGE_BRUSH_SVG("SodaIcons/aruco", Icon16x16));
+		Set("SodaIcons.ChessBoard", new IMAGE_BRUSH_SVG("SodaIcons/chess-board", Icon16x16));
+		Set("SodaIcons.Walking", new IMAGE_BRUSH_SVG("SodaIcons/walking", Icon16x16));
+		Set("SodaIcons.Region", new IMAGE_BRUSH_SVG("SodaIcons/region", Icon16x16));
+		Set("SodaIcons.Differential", new IMAGE_BRUSH_SVG("SodaIcons/differential", Icon16x16));
+		Set("SodaIcons.Critical", new IMAGE_BRUSH_SVG("SodaIcons/critical", Icon16x16));
+		Set("SodaIcons.Hourglass", new IMAGE_BRUSH_SVG("SodaIcons/hourglass", Icon16x16));
+		Set("SodaIcons.WTF", new IMAGE_BRUSH_SVG("SodaIcons/wtf", Icon16x16));
+		Set("SodaIcons.Bike", new IMAGE_BRUSH_SVG("SodaIcons/bike", Icon16x16));
+		Set("SodaIcons.Motorbike", new IMAGE_BRUSH_SVG("SodaIcons/motorbike", Icon16x16));
+		Set("SodaIcons.Tire", new IMAGE_BRUSH_SVG("SodaIcons/tire", Icon16x16));
+		Set("SodaIcons.RoadSign", new IMAGE_BRUSH_SVG("SodaIcons/road-sign", Icon16x16));
+		Set("SodaIcons.Forever", new IMAGE_BRUSH_SVG("SodaIcons/forever", Icon16x16));
+		Set("SodaIcons.DownStream", new IMAGE_BRUSH_SVG("SodaIcons/down-stream", Icon16x16));
+		Set("SodaIcons.DownStream32", new IMAGE_BRUSH_SVG("SodaIcons/down-stream", Icon32x32));
+		Set("SodaIcons.GearBox", new IMAGE_BRUSH_SVG("SodaIcons/gear-box", Icon16x16));
+		Set("SodaIcons.Hive", new IMAGE_BRUSH_SVG("SodaIcons/hive", Icon16x16));
+		
+
+		Set("SodaIcons.DB.ConnectingBG", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_UpDownBG", Icon16x16));
+		Set("SodaIcons.DB.Connecting", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_UpDown", Icon16x16, FLinearColor(0.3, 0.3, 0.3, 1.0)));
+		Set("SodaIcons.DB.ConnectingFull", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_UpDownFull", Icon16x16));
+		Set("SodaIcons.DB.ConnectedBG", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_IdleBG", Icon16x16));
+		Set("SodaIcons.DB.Connected", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_Idle", Icon16x16, EStyleColor::AccentGreen));
+		Set("SodaIcons.DB.WarningBG", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_WarningBG", Icon16x16));
+		Set("SodaIcons.DB.Warning", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_Warning", Icon16x16, EStyleColor::Warning));
+		Set("SodaIcons.DB.DisabledBG", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_DisabledBG", Icon16x16));
+		Set("SodaIcons.DB.Disabled", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_Disabled", Icon16x16, FLinearColor(0.3, 0.3, 0.3, 1.0)));
+		Set("SodaIcons.DB.DisabledFull", new IMAGE_BRUSH_SVG("Starship/DerivedData/DD_RemoteCache_DisabledFull", Icon16x16));
+	}
+
+	Set("UnrealDefaultThumbnail", new IMAGE_BRUSH("Starship/Common/Unreal_DefaultThumbnail", FVector2D(256, 256)));
+
+	Set( "WarningStripe", new IMAGE_BRUSH( "Common/WarningStripe", FVector2D(20,6), FLinearColor::White, ESlateBrushTileType::Horizontal ) );
+	
+	Set("RoundedWarning", new FSlateRoundedBoxBrush(FStyleColors::Transparent, 4.0f, FStyleColors::Warning, 1.0f));
+	Set("RoundedError", new FSlateRoundedBoxBrush(FStyleColors::Transparent, 4.0f, FStyleColors::Error, 1.0f));
+
+	Set( "Button.Disabled", new BOX_BRUSH( "Common/Button_Disabled", 8.0f/32.0f ) );
+	
+
+	// Toggle button
+	{
+		Set( "ToggleButton", FButtonStyle(Button)
+			.SetNormal(FSlateNoResource())
+			.SetHovered(BOX_BRUSH( "Common/RoundedSelection_16x", 4.0f/16.0f, SelectionColor ))
+			.SetPressed(BOX_BRUSH( "Common/RoundedSelection_16x", 4.0f/16.0f, SelectionColor_Pressed ))
+		);
+
+		//FSlateColorBrush(FLinearColor::White)
+
+		Set("RoundButton", FButtonStyle(Button)
+			.SetNormal(BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, FLinearColor(1, 1, 1, 0.1f)))
+			.SetHovered(BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, SelectionColor))
+			.SetPressed(BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, SelectionColor_Pressed))
+			);
+
+		Set("FlatButton", FButtonStyle(Button)
+			.SetNormal(FSlateNoResource())
+			.SetHovered(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, SelectionColor))
+			.SetPressed(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, SelectionColor_Pressed))
+			);
+
+		Set("FlatButton.Dark", FButtonStyle(Button)
+			.SetNormal(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, FLinearColor(0.125f, 0.125f, 0.125f, 0.8f)))
+			.SetHovered(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, SelectionColor))
+			.SetPressed(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, SelectionColor_Pressed))
+			);
+
+		Set("FlatButton.DarkGrey", FButtonStyle(Button)
+			.SetNormal(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, FLinearColor(0.05f, 0.05f, 0.05f, 0.8f)))
+			.SetHovered(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, SelectionColor))
+			.SetPressed(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, SelectionColor_Pressed))
+		);
+
+
+		Set("FlatButton.Default", GetWidgetStyle<FButtonStyle>("FlatButton.Dark"));
+
+		Set("FlatButton.DefaultTextStyle", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Bold", 10))
+			.SetColorAndOpacity(FLinearColor(1.0f, 1.0f, 1.0f))
+			.SetHighlightColor(FLinearColor(1.0f, 1.0f, 1.0f))
+			.SetShadowOffset(FVector2D(1, 1))
+			.SetShadowColorAndOpacity(FLinearColor(0, 0, 0, 0.9f)));
+
+		struct ButtonColor
+		{
+		public:
+			FName Name;
+			FLinearColor Normal;
+			FLinearColor Hovered;
+			FLinearColor Pressed;
+
+			ButtonColor(const FName& InName, const FLinearColor& Color) : Name(InName)
+			{
+				Normal = Color * 0.8f;
+				Normal.A = Color.A;
+				Hovered = Color * 1.0f;
+				Hovered.A = Color.A;
+				Pressed = Color * 0.6f;
+				Pressed.A = Color.A;
+			}
+		};
+
+		TArray< ButtonColor > FlatButtons;
+		FlatButtons.Add(ButtonColor("FlatButton.Primary", FLinearColor(0.02899, 0.19752, 0.48195)));
+		FlatButtons.Add(ButtonColor("FlatButton.Success", FLinearColor(0.10616, 0.48777, 0.10616)));
+		FlatButtons.Add(ButtonColor("FlatButton.Info", FLinearColor(0.10363, 0.53564, 0.7372)));
+		FlatButtons.Add(ButtonColor("FlatButton.Warning", FLinearColor(0.87514, 0.42591, 0.07383)));
+		FlatButtons.Add(ButtonColor("FlatButton.Danger", FLinearColor(0.70117, 0.08464, 0.07593)));
+
+		for ( const ButtonColor& Entry : FlatButtons )
+		{
+			Set(Entry.Name, FButtonStyle(Button)
+				.SetNormal(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, Entry.Normal))
+				.SetHovered(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, Entry.Hovered))
+				.SetPressed(BOX_BRUSH("Common/FlatButton", 2.0f / 8.0f, Entry.Pressed))
+				);
+		}
+
+		Set("FontAwesome.7", ICON_FONT(7));
+		Set("FontAwesome.8", ICON_FONT(8));
+		Set("FontAwesome.9", ICON_FONT(9));
+		Set("FontAwesome.10", ICON_FONT(10));
+		Set("FontAwesome.11", ICON_FONT(11));
+		Set("FontAwesome.12", ICON_FONT(12));
+		Set("FontAwesome.14", ICON_FONT(14));
+		Set("FontAwesome.16", ICON_FONT(16));
+		Set("FontAwesome.18", ICON_FONT(18));
+
+		/* Create a checkbox style for "ToggleButton" but with the images used by a normal checkbox (see "Checkbox" below) ... */
+		const FCheckBoxStyle CheckboxLookingToggleButtonStyle = FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage( IMAGE_BRUSH( "Common/CheckBox", Icon16x16 ) )
+			.SetUncheckedHoveredImage( IMAGE_BRUSH( "Common/CheckBox", Icon16x16 ) )
+			.SetUncheckedPressedImage( IMAGE_BRUSH( "Common/CheckBox_Hovered", Icon16x16, FLinearColor( 0.5f, 0.5f, 0.5f ) ) )
+			.SetCheckedImage( IMAGE_BRUSH( "Common/CheckBox_Checked_Hovered", Icon16x16 ) )
+			.SetCheckedHoveredImage( IMAGE_BRUSH( "Common/CheckBox_Checked_Hovered", Icon16x16, FLinearColor( 0.5f, 0.5f, 0.5f ) ) )
+			.SetCheckedPressedImage( IMAGE_BRUSH( "Common/CheckBox_Checked", Icon16x16 ) )
+			.SetUndeterminedImage( IMAGE_BRUSH( "Common/CheckBox_Undetermined", Icon16x16 ) )
+			.SetUndeterminedHoveredImage( IMAGE_BRUSH( "Common/CheckBox_Undetermined_Hovered", Icon16x16 ) )
+			.SetUndeterminedPressedImage( IMAGE_BRUSH( "Common/CheckBox_Undetermined_Hovered", Icon16x16, FLinearColor( 0.5f, 0.5f, 0.5f ) ) )
+			.SetPadding(1.0f);
+		/* ... and set new style */
+		Set( "CheckboxLookToggleButtonCheckbox", CheckboxLookingToggleButtonStyle );
+
+
+		Set( "ToggleButton.LabelFont", DEFAULT_FONT( "Regular", 9 ) );
+		Set( "ToggleButtonCheckbox.LabelFont", DEFAULT_FONT( "Regular", 9 ) );
+	}
+
+	// Combo Button, Combo Box
+	{
+		// Legacy style; still being used by some editor widgets
+		Set( "ComboButton.Arrow", new IMAGE_BRUSH("Common/ComboArrow", Icon8x8 ) );
+
+
+		FComboButtonStyle ToolbarComboButton = FComboButtonStyle()
+			.SetButtonStyle( GetWidgetStyle<FButtonStyle>( "ToggleButton" ) )
+			.SetDownArrowImage( IMAGE_BRUSH( "Common/ShadowComboArrow", Icon8x8 ) )
+			.SetMenuBorderBrush(FSlateNoResource())
+			.SetMenuBorderPadding( FMargin( 0.0f ) );
+		Set( "ToolbarComboButton", ToolbarComboButton );
+
+		Set("GenericFilters.ComboButtonStyle", ToolbarComboButton);
+
+		Set("GenericFilters.TextStyle", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Bold", 9))
+			.SetColorAndOpacity(FLinearColor(1.0f, 1.0f, 1.0f, 0.9f))
+			.SetShadowOffset(FVector2D(1, 1))
+			.SetShadowColorAndOpacity(FLinearColor(0, 0, 0, 0.9f)));
+
+	}
+
+	// Error Reporting
+	{
+		Set( "InfoReporting.BackgroundColor", FLinearColor(0.1f, 0.33f, 1.0f));
+
+	}
+
+	// EditableTextBox
+	{
+		Set( "EditableTextBox.Background.Normal", new BOX_BRUSH( "Common/TextBox", FMargin(4.0f/16.0f) ) );
+		Set( "EditableTextBox.Background.Hovered", new BOX_BRUSH( "Common/TextBox_Hovered", FMargin(4.0f/16.0f) ) );
+		Set( "EditableTextBox.Background.Focused", new BOX_BRUSH( "Common/TextBox_Hovered", FMargin(4.0f/16.0f) ) );
+		Set( "EditableTextBox.Background.ReadOnly", new BOX_BRUSH( "Common/TextBox_ReadOnly", FMargin(4.0f/16.0f) ) );
+		Set( "EditableTextBox.BorderPadding", FMargin(4.0f, 2.0f) );
+	}
+
+	// EditableTextBox Special
+	{
+		FSlateBrush* SpecialEditableTextImageNormal = new BOX_BRUSH( "Common/TextBox_Special", FMargin(8.0f/32.0f) );
+		Set( "SpecialEditableTextImageNormal", SpecialEditableTextImageNormal );
+
+		const FEditableTextBoxStyle SpecialEditableTextBoxStyle = FEditableTextBoxStyle()
+			.SetBackgroundImageNormal( *SpecialEditableTextImageNormal )
+			.SetBackgroundImageHovered( BOX_BRUSH( "Common/TextBox_Special_Hovered", FMargin(8.0f/32.0f) ) )
+			.SetBackgroundImageFocused( BOX_BRUSH( "Common/TextBox_Special_Hovered", FMargin(8.0f/32.0f) ) )
+			.SetBackgroundImageReadOnly( BOX_BRUSH( "Common/TextBox_ReadOnly", FMargin(4.0f/16.0f) ) )
+			.SetScrollBarStyle( ScrollBar );
+		Set( "SpecialEditableTextBox", SpecialEditableTextBoxStyle );
+
+		Set( "SearchBox.ActiveBorder", new BOX_BRUSH( "Common/TextBox_Special_Active", FMargin(8.0f/32.0f) ) );
+	}
+
+	// Filtering/Searching feedback
+	{
+		const FLinearColor ActiveFilterColor = FLinearColor(1.0f,0.55f,0.0f,1.0f);
+		Set("Searching.SearchActiveTab",    new FSlateNoResource());
+		Set("Searching.SearchActiveBorder", new FSlateRoundedBoxBrush(FLinearColor::Transparent, 0.0, FStyleColors::Primary, 1.f));
+	}
+
+	// Images sizes are specified in Slate Screen Units. These do not necessarily correspond to pixels!
+	// An IMAGE_BRUSH( "SomeImage", FVector2D(32,32)) will have a desired size of 16x16 Slate Screen Units.
+	// This allows the original resource to be scaled up or down as needed.
+
+	Set( "WhiteTexture", new IMAGE_BRUSH( "Old/White", Icon16x16 ) );
+
+	Set( "BoldFont", DEFAULT_FONT( "Bold", FStarshipCoreStyle::RegularTextSize ) );
+
+	Set( "MarqueeSelection", new BORDER_BRUSH( "Old/DashedBorder", FMargin(6.0f/32.0f) ) );
+
+	Set( "Border", new BOX_BRUSH( "Old/Border", 4.0f/16.0f ) );
+
+	Set( "FilledBorder", new BOX_BRUSH( "Old/FilledBorder", 4.0f/16.0f ) );
+
+	Set("GenericLink", new IMAGE_BRUSH("Common/link", Icon16x16));
+
+
+	{
+		// Dark Hyperlink - for use on light backgrounds
+		FButtonStyle DarkHyperlinkButton = FButtonStyle()
+			.SetNormal ( BORDER_BRUSH( "Old/HyperlinkDotted", FMargin(0,0,0,3/16.0f), FLinearColor::Black ) )
+			.SetPressed( FSlateNoResource() )
+			.SetHovered( BORDER_BRUSH( "Old/HyperlinkUnderline", FMargin(0,0,0,3/16.0f), FLinearColor::Black ) );
+		FHyperlinkStyle DarkHyperlink = FHyperlinkStyle()
+			.SetUnderlineStyle(DarkHyperlinkButton)
+			.SetTextStyle(NormalText)
+			.SetPadding(FMargin(0.0f));
+		Set("DarkHyperlink", DarkHyperlink);
+
+		// Visible on hover hyper link
+		FButtonStyle HoverOnlyHyperlinkButton = FButtonStyle()
+			.SetNormal(FSlateNoResource() )
+			.SetPressed(FSlateNoResource() )
+			.SetHovered(BORDER_BRUSH( "Old/HyperlinkUnderline", FMargin(0,0,0,3/16.0f) ) );
+		Set("HoverOnlyHyperlinkButton", HoverOnlyHyperlinkButton);
+
+		FHyperlinkStyle HoverOnlyHyperlink = FHyperlinkStyle()
+			.SetUnderlineStyle(HoverOnlyHyperlinkButton)
+			.SetTextStyle(NormalText)
+			.SetPadding(FMargin(0.0f));
+		Set("HoverOnlyHyperlink", HoverOnlyHyperlink);
+	}
+
+	Set( "DashedBorder", new BORDER_BRUSH( "Old/DashedBorder", FMargin(6.0f/32.0f) ) );
+
+	Set( "UniformShadow", new BORDER_BRUSH( "Common/UniformShadow", FMargin( 16.0f / 64.0f ) ) );
+	Set( "UniformShadow_Tint", new BORDER_BRUSH( "Common/UniformShadow_Tint", FMargin( 16.0f / 64.0f ) ) );
+
+	{
+		Set ("SplitterDark", FSplitterStyle()
+			.SetHandleNormalBrush( FSlateColorBrush( FLinearColor(FColor( 32, 32, 32) ) ) )
+			.SetHandleHighlightBrush( FSlateColorBrush( FLinearColor(FColor( 96, 96, 96) ) ) ) 
+			);
+	}
+
+	// Lists, Trees
+	{
+
+		const FTableViewStyle DefaultTreeViewStyle = FTableViewStyle()
+			.SetBackgroundBrush(FSlateColorBrush(FStyleColors::Recessed));
+		Set("ListView", DefaultTreeViewStyle);
+
+		const FTableViewStyle DefaultTableViewStyle = FTableViewStyle()
+			.SetBackgroundBrush(FSlateColorBrush(FStyleColors::Recessed));
+		Set("TreeView", DefaultTableViewStyle);
+
+		Set( "TableView.Row", FTableRowStyle( NormalTableRowStyle) );
+		Set( "TableView.DarkRow",FTableRowStyle( NormalTableRowStyle)
+			.SetEvenRowBackgroundBrush(IMAGE_BRUSH("PropertyView/DetailCategoryMiddle", FVector2D(16, 16)))
+			.SetEvenRowBackgroundHoveredBrush(IMAGE_BRUSH("PropertyView/DetailCategoryMiddle_Hovered", FVector2D(16, 16)))
+			.SetOddRowBackgroundBrush(IMAGE_BRUSH("PropertyView/DetailCategoryMiddle", FVector2D(16, 16)))
+			.SetOddRowBackgroundHoveredBrush(IMAGE_BRUSH("PropertyView/DetailCategoryMiddle_Hovered", FVector2D(16, 16)))
+			.SetSelectorFocusedBrush(BORDER_BRUSH("Common/Selector", FMargin(4.f / 16.f), SelectorColor))
+			.SetActiveBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor))
+			.SetActiveHoveredBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor))
+			.SetInactiveBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor_Inactive))
+			.SetInactiveHoveredBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor_Inactive))
+		);
+		Set("TableView.NoHoverTableRow", FTableRowStyle(NormalTableRowStyle)
+			.SetEvenRowBackgroundHoveredBrush(FSlateNoResource())
+			.SetOddRowBackgroundHoveredBrush(FSlateNoResource())
+			.SetActiveHoveredBrush(FSlateNoResource())
+			.SetInactiveHoveredBrush(FSlateNoResource())
+			);
+	}
+	
+	// Spinboxes
+	{
+
+		// Legacy styles; used by other editor widgets
+		Set( "SpinBox.Background", new BOX_BRUSH( "Common/Spinbox", FMargin(4.0f/16.0f) ) );
+		Set( "SpinBox.Background.Hovered", new BOX_BRUSH( "Common/Spinbox_Hovered", FMargin(4.0f/16.0f) ) );
+		Set( "SpinBox.Fill", new BOX_BRUSH( "Common/Spinbox_Fill", FMargin(4.0f/16.0f, 4.0f/16.0f, 8.0f/16.0f, 4.0f/16.0f) ) );
+		Set( "SpinBox.Fill.Hovered", new BOX_BRUSH( "Common/Spinbox_Fill_Hovered", FMargin(4.0f/16.0f) ) );
+		Set( "SpinBox.Arrows", new IMAGE_BRUSH( "Common/SpinArrows", Icon12x12 ) );
+		Set( "SpinBox.TextMargin", FMargin(1.0f,2.0f) );
+	}	
+
+	// Message Log
+	{
+		Set( "MessageLog.Action", new IMAGE_BRUSH( "Icons/icon_file_choosepackages_16px", Icon16x16) );
+		Set( "MessageLog.Docs", new IMAGE_BRUSH( "Icons/icon_Docs_16x", Icon16x16) );
+		Set( "MessageLog.Tutorial", new IMAGE_BRUSH( "Icons/icon_Blueprint_Enum_16x", Icon16x16 ) );
+		Set( "MessageLog.Url", new IMAGE_BRUSH( "Icons/icon_world_16x", Icon16x16 ) );
+		Set( "MessageLog.TabIcon", new IMAGE_BRUSH_SVG( "Starship/Common/MessageLog", Icon16x16 ) );
+		Set( "MessageLog.ListBorder", new BOX_BRUSH( "/Docking/AppTabContentArea", FMargin(4/16.0f) ) );
+	}
+
+	// Output Log Window
+	{
+		const int32 LogFontSize = Settings.IsValid() ? Settings->LogFontSize : 9;
+
+		const FTextBlockStyle NormalLogText = FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Mono", LogFontSize))
+			.SetColorAndOpacity(LogColor_Normal)
+			.SetSelectedBackgroundColor(LogColor_SelectionBackground)
+			.SetHighlightColor(FStyleColors::Black);
+
+		Set("Log.Normal", NormalLogText );
+
+		Set("Log.Command", FTextBlockStyle(NormalLogText)
+			.SetColorAndOpacity( LogColor_Command )
+			);
+
+		Set("Log.Warning", FTextBlockStyle(NormalLogText)
+			.SetColorAndOpacity(FStyleColors::Warning)
+			);
+
+		Set("Log.Error", FTextBlockStyle(NormalLogText)
+			.SetColorAndOpacity(FStyleColors::Error)
+			);
+
+		Set("Log.TabIcon", new IMAGE_BRUSH_SVG( "Starship/Common/OutputLog", Icon16x16 ) );
+
+		Set("Log.TextBox", FEditableTextBoxStyle(NormalEditableTextBoxStyle)
+			.SetBackgroundImageNormal( BOX_BRUSH( "Common/WhiteGroupBorder", FMargin(4.0f/16.0f) ) )
+			.SetBackgroundImageHovered( BOX_BRUSH( "Common/WhiteGroupBorder", FMargin(4.0f/16.0f) ) )
+			.SetBackgroundImageFocused( BOX_BRUSH( "Common/WhiteGroupBorder", FMargin(4.0f/16.0f) ) )
+			.SetBackgroundImageReadOnly( BOX_BRUSH( "Common/WhiteGroupBorder", FMargin(4.0f/16.0f) ) )
+			.SetBackgroundColor(FStyleColors::Recessed)
+			);
+
+		Set("DebugConsole.Background", new FSlateNoResource());
+
+		const FButtonStyle DebugConsoleButton = FButtonStyle(FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FButtonStyle>("NoBorder"))
+			.SetNormalForeground(FStyleColors::Foreground)
+			.SetNormalPadding(FMargin(2, 2, 2, 2))
+			.SetPressedPadding(FMargin(2, 3, 2, 1));
+
+		const FComboButtonStyle DebugConsoleComboButton = FComboButtonStyle(FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FComboButtonStyle>("ComboButton"))
+			.SetDownArrowImage(FSlateNoResource())
+			.SetButtonStyle(DebugConsoleButton);
+
+		Set("DebugConsole.ComboButton", DebugConsoleComboButton);
+
+		Set("DebugConsole.Icon", new IMAGE_BRUSH_SVG("Starship/Common/Console", Icon16x16));
+	}
+
+	// Output Log Window (override)
+	{
+		
+		const int32 LogFontSize = Settings.IsValid() ? Settings->LogFontSize : 9;
+
+		const FTextBlockStyle NormalLogText = FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Mono", LogFontSize))
+			.SetColorAndOpacity(FStyleColors::Foreground)
+			.SetSelectedBackgroundColor(FStyleColors::Highlight)
+			.SetHighlightColor(FStyleColors::Black);
+
+		Set("Log.Normal", NormalLogText);
+
+		Set("Log.Command", FTextBlockStyle(NormalLogText)
+			.SetColorAndOpacity(FStyleColors::AccentGreen)
+		);
+
+		Set("Log.Warning", FTextBlockStyle(NormalLogText)
+			.SetColorAndOpacity(FStyleColors::Warning)
+		);
+
+		Set("Log.Error", FTextBlockStyle(NormalLogText)
+			.SetColorAndOpacity(FStyleColors::Error)
+		);
+
+		Set("DebugConsole.Icon", new IMAGE_BRUSH_SVG("Starship/Common/Console", Icon16x16));
+		
+	}
+
+	// Main frame
+	{
+		Set( "MainFrame.AutoSaveImage", 	       new IMAGE_BRUSH_SVG( "Starship/Common/SaveCurrent", Icon16x16 ) );
+		Set( "MainFrame.SaveAll",                  new IMAGE_BRUSH_SVG( "Starship/Common/SaveAll", Icon16x16 ) );
+		Set( "MainFrame.ChoosePackagesToSave",     new IMAGE_BRUSH_SVG( "Starship/Common/SaveChoose", Icon16x16 ) );
+		Set( "MainFrame.NewProject",               new IMAGE_BRUSH_SVG( "Starship/Common/ProjectNew", Icon16x16 ) );
+		Set( "MainFrame.OpenProject",              new IMAGE_BRUSH_SVG( "Starship/Common/ProjectOpen", Icon16x16 ) );
+		Set( "MainFrame.AddCodeToProject",         new IMAGE_BRUSH_SVG( "Starship/Common/ProjectC++", Icon16x16 ) );
+		Set( "MainFrame.Exit",                     new IMAGE_BRUSH_SVG( "Starship/Common/Exit", Icon16x16 ) );
+		Set( "MainFrame.CookContent",              new IMAGE_BRUSH_SVG( "Starship/Common/CookContent", Icon16x16 ) );
+		Set( "MainFrame.OpenVisualStudio",         new IMAGE_BRUSH_SVG( "Starship/Common/VisualStudio", Icon16x16 ) );
+		Set( "MainFrame.RefreshVisualStudio",      new IMAGE_BRUSH_SVG( "Starship/Common/RefreshVisualStudio", Icon16x16 ) );
+		Set( "MainFrame.OpenSourceCodeEditor",     new IMAGE_BRUSH_SVG( "Starship/Common/SourceCodeEditor", Icon16x16));
+		Set( "MainFrame.RefreshSourceCodeEditor",  new IMAGE_BRUSH_SVG( "Starship/Common/RefreshSourceCodeEditor", Icon16x16));
+		Set( "MainFrame.PackageProject",           new IMAGE_BRUSH_SVG( "Starship/Common/ProjectPackage", Icon16x16 ) );
+		Set( "MainFrame.RecentProjects",           new IMAGE_BRUSH_SVG( "Starship/Common/ProjectsRecent", Icon16x16 ) );
+		Set( "MainFrame.RecentLevels",             new IMAGE_BRUSH_SVG( "Starship/Common/LevelRecent", Icon16x16 ) );
+		Set( "MainFrame.FavoriteLevels",           new IMAGE_BRUSH_SVG( "Starship/Common/LevelFavorite", Icon16x16 ) );
+		Set( "MainFrame.ZipUpProject", 		       new IMAGE_BRUSH_SVG( "Starship/Common/ZipProject", Icon16x16 ) );
+
+		Set( "MainFrame.ChooseFilesToSave",       new IMAGE_BRUSH_SVG( "Starship/Common/SaveChoose", Icon16x16 ) );
+		Set( "MainFrame.ConnectToSourceControl",  new CORE_IMAGE_BRUSH_SVG("Starship/SourceControl/SourceControl", Icon16x16) );
+		Set( "MainFrame.OpenMarketplace",			new IMAGE_BRUSH_SVG("Starship/MainToolbar/marketplace", Icon16x16));
+
+		Set( "MainFrame.DebugTools.SmallFont", DEFAULT_FONT( "Regular", 8 ) );
+		Set( "MainFrame.DebugTools.NormalFont", DEFAULT_FONT( "Regular", 9 ) );
+		Set( "MainFrame.DebugTools.LabelFont", DEFAULT_FONT( "Regular", 8 ) );
+	}
+
+	// Main frame
+	{
+		Set("MainFrame.StatusInfoButton", FButtonStyle(Button)
+			.SetNormal( IMAGE_BRUSH( "Icons/StatusInfo_16x", Icon16x16 ) )
+			.SetHovered( IMAGE_BRUSH( "Icons/StatusInfo_16x", Icon16x16 ) )
+			.SetPressed( IMAGE_BRUSH( "Icons/StatusInfo_16x", Icon16x16 ) )
+			.SetNormalPadding(0)
+			.SetPressedPadding(0)
+		);
+	}
+
+	{
+		Set("Level.VisibleIcon16x", new CORE_IMAGE_BRUSH_SVG("Starship/Common/visible", Icon16x16));
+		Set("Level.VisibleHighlightIcon16x", new CORE_IMAGE_BRUSH_SVG("Starship/Common/visible", Icon16x16));
+		Set("Level.NotVisibleIcon16x", new CORE_IMAGE_BRUSH_SVG("Starship/Common/hidden", Icon16x16));
+		Set("Level.NotVisibleHighlightIcon16x", new CORE_IMAGE_BRUSH_SVG("Starship/Common/hidden", Icon16x16));
+	}
+
+	// Mode ToolPalette 
+	{
+
+		FToolBarStyle PaletteToolBarStyle = FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FToolBarStyle>("SlimToolBar");
+
+		FTextBlockStyle PaletteToolbarLabelStyle = FTextBlockStyle(GetParentStyle()->GetWidgetStyle<FTextBlockStyle>("SmallText"));
+		PaletteToolbarLabelStyle.SetOverflowPolicy(ETextOverflowPolicy::Ellipsis);
+
+		PaletteToolBarStyle.SetLabelStyle(PaletteToolbarLabelStyle);
+
+		PaletteToolBarStyle.SetBackground(FSlateColorBrush(FStyleColors::Recessed));
+
+		PaletteToolBarStyle.SetLabelPadding(FMargin(0.0f, 1.0f, 0.0f, 0.0f));
+
+		PaletteToolBarStyle.SetButtonPadding(FMargin(0.0f, 0.0f));
+		PaletteToolBarStyle.SetCheckBoxPadding(FMargin(0.0f, 0.0f));
+		PaletteToolBarStyle.SetComboButtonPadding(FMargin(0.0f, 0.0f));
+		PaletteToolBarStyle.SetIndentedBlockPadding(FMargin(0.0f, 0.0f));
+		PaletteToolBarStyle.SetBlockPadding(FMargin(0.0f, 0.0f));
+		PaletteToolBarStyle.ToggleButton.SetPadding(FMargin(0.0f, 6.0f));
+		PaletteToolBarStyle.ButtonStyle.SetNormalPadding(FMargin(2.0f, 6.0f));
+		PaletteToolBarStyle.ButtonStyle.SetPressedPadding(FMargin(2.0f, 6.0f));
+
+		Set("PaletteToolBar.Tab", FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+
+			.SetCheckedImage(FSlateRoundedBoxBrush(FStyleColors::Primary, 2.0f))
+			.SetCheckedHoveredImage(FSlateRoundedBoxBrush(FStyleColors::PrimaryHover, 2.0f))
+			.SetCheckedPressedImage(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 2.0f))
+
+			.SetUncheckedImage(FSlateRoundedBoxBrush(FStyleColors::Secondary, 2.0f))
+			.SetUncheckedHoveredImage(FSlateRoundedBoxBrush(FStyleColors::Hover, 2.0f))
+			.SetUncheckedPressedImage(FSlateRoundedBoxBrush(FStyleColors::Secondary, 2.0f))
+
+			.SetForegroundColor(FStyleColors::Foreground)
+			.SetHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetPadding(FMargin(2.f, 6.f))
+		);
+
+		Set("PaletteToolBar.MaxUniformToolbarSize", 48.f);
+		Set("PaletteToolBar.MinUniformToolbarSize", 48.f);
+
+		Set("PaletteToolBar.ExpandableAreaHeader", new FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(4.0, 4.0, 0.0, 0.0)));
+		Set("PaletteToolBar.ExpandableAreaBody", new FSlateRoundedBoxBrush(FStyleColors::Recessed, FVector4(0.0, 0.0, 4.0, 4.0)));
+
+
+		Set("PaletteToolBar", PaletteToolBarStyle);
+
+		Set("EditorModesPanel.CategoryFontStyle", DEFAULT_FONT("Bold", 10));
+		Set("EditorModesPanel.ToolDescriptionFont", DEFAULT_FONT("Italic", 10));
+
+	}
+
+	// Vertical ToolPalette 
+	{
+		FToolBarStyle VerticalToolBarStyle = FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FToolBarStyle>("SlimToolBar");
+
+		FTextBlockStyle VerticalToolBarLabelStyle = FTextBlockStyle(GetParentStyle()->GetWidgetStyle<FTextBlockStyle>("SmallText"));
+		VerticalToolBarLabelStyle.SetOverflowPolicy(ETextOverflowPolicy::Ellipsis);
+
+		VerticalToolBarStyle.SetLabelStyle(VerticalToolBarLabelStyle);
+
+		VerticalToolBarStyle.SetBackground(FSlateColorBrush(FStyleColors::Recessed));
+
+		VerticalToolBarStyle.SetLabelPadding(FMargin(0.0f, 1.0f, 0.0f, 0.0f));
+
+		VerticalToolBarStyle.SetButtonPadding(FMargin(0.0f, 0.0f));
+		VerticalToolBarStyle.SetCheckBoxPadding(FMargin(0.0f, 0.0f));
+		VerticalToolBarStyle.SetComboButtonPadding(FMargin(0.0f, 0.0f));
+		VerticalToolBarStyle.SetIndentedBlockPadding(FMargin(0.0f, 0.0f));
+		VerticalToolBarStyle.SetBlockPadding(FMargin(0.0f, 0.0f));
+		VerticalToolBarStyle.SetBackgroundPadding(FMargin(4.0f, 2.0f));
+		VerticalToolBarStyle.ToggleButton.SetPadding(FMargin(0.0f, 6.0f));
+		VerticalToolBarStyle.ButtonStyle.SetNormalPadding(FMargin(2.0f, 6.0f));
+		VerticalToolBarStyle.ButtonStyle.SetPressedPadding(FMargin(2.0f, 6.0f));
+
+		Set("VerticalToolBar.Tab", FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+
+			.SetCheckedImage(FSlateRoundedBoxBrush(FStyleColors::Input, 2.0f))
+			.SetCheckedHoveredImage(FSlateRoundedBoxBrush(FStyleColors::Input, 2.0f))
+			.SetCheckedPressedImage(FSlateRoundedBoxBrush(FStyleColors::Input, 2.0f))
+
+			.SetUncheckedImage(FSlateRoundedBoxBrush(FStyleColors::Secondary, 2.0f))
+			.SetUncheckedHoveredImage(FSlateRoundedBoxBrush(FStyleColors::Hover, 2.0f))
+			.SetUncheckedPressedImage(FSlateRoundedBoxBrush(FStyleColors::Secondary, 2.0f))
+
+			.SetForegroundColor(FStyleColors::Foreground)
+			.SetHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedForegroundColor(FStyleColors::Primary)
+			.SetCheckedHoveredForegroundColor(FStyleColors::PrimaryHover)
+			.SetPadding(FMargin(2.f, 6.f))
+		);
+
+		Set("VerticalToolBar.MaxUniformToolbarSize", 48.f);
+		Set("VerticalToolBar.MinUniformToolbarSize", 48.f);
+
+		Set("VerticalToolBar.ExpandableAreaHeader", new FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(4.0, 4.0, 0.0, 0.0)));
+		Set("VerticalToolBar.ExpandableAreaBody", new FSlateRoundedBoxBrush(FStyleColors::Recessed, FVector4(0.0, 0.0, 4.0, 4.0)));
+
+		Set("VerticalToolBar", VerticalToolBarStyle);
+	}
+}
+
+void FStarshipSodaStyle::FStyle::SetupViewportStyles()
+{
+	{
+		FToolBarStyle ViewportToolbarStyle = FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FToolBarStyle>("SlimToolBar");
+
+		FMargin ViewportMarginLeft(6.f, 4.f, 3.f, 4.f);
+		FMargin ViewportMarginCenter(6.f, 4.f, 3.f, 4.f);
+		FMargin ViewportMarginRight(4.f, 4.f, 5.f, 4.f);
+
+		const FCheckBoxStyle ViewportToggleButton = FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetCheckedImage(FSlateNoResource())
+			.SetCheckedHoveredImage(FSlateNoResource())
+			.SetCheckedPressedImage(FSlateNoResource())
+			.SetUncheckedImage(FSlateNoResource())
+			.SetUncheckedHoveredImage(FSlateNoResource())
+			.SetUncheckedPressedImage(FSlateNoResource())
+			.SetForegroundColor(FStyleColors::Foreground)
+			.SetHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetPadding(0);
+
+
+		FLinearColor ToolbarBackgroundColor = FStyleColors::Dropdown.GetSpecifiedColor();
+		ToolbarBackgroundColor.A = .80f;
+
+		FLinearColor ToolbarPressedColor = FStyleColors::Recessed.GetSpecifiedColor();
+		ToolbarPressedColor.A = .80f;
+
+		FSlateRoundedBoxBrush* ViewportGroupBrush = new FSlateRoundedBoxBrush(ToolbarBackgroundColor, 12.f, FLinearColor(0,0,0,.8), 1.0);
+		Set("EditorViewportToolBar.Group", ViewportGroupBrush);
+
+		FSlateRoundedBoxBrush* ViewportGroupPressedBrush = new FSlateRoundedBoxBrush(ToolbarPressedColor, 12.f, FLinearColor(0, 0, 0, .8), 1.0);
+		Set("EditorViewportToolBar.Group.Pressed", ViewportGroupPressedBrush);
+
+		FButtonStyle ViewportMenuButton = FButtonStyle()
+			.SetNormal(*ViewportGroupBrush)
+			.SetHovered(*ViewportGroupBrush)
+			.SetPressed(*ViewportGroupPressedBrush)
+			.SetNormalForeground(FStyleColors::Foreground)
+			.SetHoveredForeground(FStyleColors::ForegroundHover)
+			.SetPressedForeground(FStyleColors::ForegroundHover)
+			.SetDisabledForeground(FStyleColors::Foreground)
+			.SetNormalPadding(FMargin(4.0f, 4.0f, 3.0f, 4.0f))
+			.SetPressedPadding(FMargin(4.0f, 4.0f, 3.0f, 4.0f));
+		Set("EditorViewportToolBar.Button", ViewportMenuButton);
+
+		const FCheckBoxStyle ViewportMenuToggleLeftButtonStyle = FCheckBoxStyle(ViewportToggleButton)
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage(		  BOX_BRUSH("Starship/EditorViewport/ToolBarLeftGroup", 12.f/25.f, FStyleColors::Dropdown))
+			.SetUncheckedPressedImage(BOX_BRUSH("Starship/EditorViewport/ToolBarLeftGroup", 12.f/25.f,FStyleColors::Recessed))
+			.SetUncheckedHoveredImage(BOX_BRUSH("Starship/EditorViewport/ToolBarLeftGroup", 12.f/25.f, FStyleColors::Hover))
+			.SetCheckedHoveredImage(  BOX_BRUSH("Starship/EditorViewport/ToolBarLeftGroup", 12.f/25.f, FStyleColors::PrimaryHover))
+			.SetCheckedPressedImage(  BOX_BRUSH("Starship/EditorViewport/ToolBarLeftGroup", 12.f/25.f, FStyleColors::PrimaryPress))
+			.SetCheckedImage(         BOX_BRUSH("Starship/EditorViewport/ToolBarLeftGroup", 12.f/25.f, FStyleColors::Primary))
+			.SetPadding(ViewportMarginLeft);
+		Set("EditorViewportToolBar.ToggleButton.Start", ViewportMenuToggleLeftButtonStyle);
+
+		const FCheckBoxStyle ViewportMenuToggleMiddleButtonStyle = FCheckBoxStyle(ViewportToggleButton)
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage(		  BOX_BRUSH("Starship/EditorViewport/ToolBarMiddleGroup", 12.f/25.f, FStyleColors::Dropdown))
+			.SetUncheckedPressedImage(BOX_BRUSH("Starship/EditorViewport/ToolBarMiddleGroup", 12.f/25.f, FStyleColors::Recessed))
+			.SetUncheckedHoveredImage(BOX_BRUSH("Starship/EditorViewport/ToolBarMiddleGroup", 12.f/25.f, FStyleColors::Hover))
+			.SetCheckedHoveredImage(  BOX_BRUSH("Starship/EditorViewport/ToolBarMiddleGroup", 12.f/25.f, FStyleColors::PrimaryHover))
+			.SetCheckedPressedImage(  BOX_BRUSH("Starship/EditorViewport/ToolBarMiddleGroup", 12.f/25.f, FStyleColors::PrimaryPress))
+			.SetCheckedImage(         BOX_BRUSH("Starship/EditorViewport/ToolBarMiddleGroup", 12.f/25.f, FStyleColors::Primary))
+			.SetPadding(ViewportMarginCenter);
+		Set("EditorViewportToolBar.ToggleButton.Middle", ViewportMenuToggleMiddleButtonStyle);
+
+		const FCheckBoxStyle ViewportMenuToggleRightButtonStyle = FCheckBoxStyle(ViewportToggleButton)
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage(		  BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::Dropdown))
+			.SetUncheckedPressedImage(BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::Recessed))
+			.SetUncheckedHoveredImage(BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::Hover))
+			.SetCheckedHoveredImage(  BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::PrimaryHover))
+			.SetCheckedPressedImage(  BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::PrimaryPress))
+			.SetCheckedImage(         BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::Primary))
+			.SetPadding(ViewportMarginRight);
+		Set("EditorViewportToolBar.ToggleButton.End", ViewportMenuToggleRightButtonStyle);
+
+		// We want a background-less version as the ComboMenu has its own unified background
+		const FToolBarStyle& SlimCoreToolBarStyle = FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FToolBarStyle>("SlimToolBar");
+
+		FButtonStyle ComboMenuButtonStyle = FButtonStyle(SlimCoreToolBarStyle.ButtonStyle)
+			.SetNormal(BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::Dropdown))
+			.SetPressed(BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::Recessed))
+			.SetHovered(BOX_BRUSH("Starship/EditorViewport/ToolBarRightGroup", 12.f/25.f, FStyleColors::Hover))
+			.SetNormalPadding(0.0)
+			.SetPressedPadding(0.0);
+
+		Set("EditorViewportToolBar.ComboMenu.ButtonStyle", ComboMenuButtonStyle);
+		Set("EditorViewportToolBar.ComboMenu.ToggleButton", ViewportToggleButton);
+		Set("EditorViewportToolBar.ComboMenu.LabelStyle", SlimCoreToolBarStyle.LabelStyle);
+
+		FCheckBoxStyle MaximizeRestoreButton = FCheckBoxStyle(ViewportToolbarStyle.ToggleButton)
+			.SetUncheckedImage(*ViewportGroupBrush)
+			.SetUncheckedPressedImage(*ViewportGroupPressedBrush)
+			.SetUncheckedHoveredImage(*ViewportGroupBrush)
+			.SetCheckedImage(*ViewportGroupBrush)
+			.SetCheckedHoveredImage(*ViewportGroupBrush)
+			.SetCheckedPressedImage(*ViewportGroupPressedBrush)
+			.SetForegroundColor(FStyleColors::Foreground)
+			.SetPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedForegroundColor(FStyleColors::Foreground)
+			.SetCheckedPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetPadding(FMargin(4.0f, 4.0f, 3.0f, 4.0f));
+		Set("EditorViewportToolBar.MaximizeRestoreButton", MaximizeRestoreButton);
+
+		Set("EditorViewportToolBar.Heading.Padding", FMargin(4.f));
+
+
+		// SComboBox 
+		FComboButtonStyle ViewportComboButton = FComboButtonStyle()
+			.SetButtonStyle(ViewportMenuButton)
+			.SetContentPadding(ViewportMarginCenter);
+
+		// Non-grouped Toggle Button
+		FCheckBoxStyle SoloToggleButton = FCheckBoxStyle(ViewportToolbarStyle.ToggleButton)
+			.SetUncheckedImage(*ViewportGroupBrush)
+			.SetUncheckedPressedImage(*ViewportGroupPressedBrush)
+			.SetUncheckedHoveredImage(*ViewportGroupBrush)
+			.SetCheckedImage(FSlateRoundedBoxBrush(FStyleColors::Primary, 12.f, FLinearColor(0, 0, 0, .8), 1.0))
+			.SetCheckedHoveredImage(FSlateRoundedBoxBrush(FStyleColors::PrimaryHover, 12.f, FLinearColor(0, 0, 0, .8), 1.0))
+			.SetCheckedPressedImage(FSlateRoundedBoxBrush(FStyleColors::PrimaryPress, 12.f, FLinearColor(0, 0, 0, .8), 1.0))
+			.SetForegroundColor(FStyleColors::Foreground)
+			.SetPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedForegroundColor(FStyleColors::Foreground)
+			.SetCheckedPressedForegroundColor(FStyleColors::ForegroundHover)
+			.SetCheckedHoveredForegroundColor(FStyleColors::ForegroundHover)
+			.SetPadding(FMargin(6.0f, 4.0f, 6.0f, 4.0f));
+
+
+		ViewportToolbarStyle
+			.SetBackground(FSlateNoResource())
+			.SetIconSize(Icon16x16)
+			.SetBackgroundPadding(FMargin(0))
+			.SetLabelPadding(FMargin(0))
+			.SetComboButtonPadding(FMargin(4.f, 0.0f))
+			.SetBlockPadding(FMargin(0.0f,0.0f))
+			.SetIndentedBlockPadding(FMargin(0))
+			.SetButtonPadding(FMargin(0))
+			.SetCheckBoxPadding(FMargin(4.0f, 0.0f))
+			//.SetComboButtonStyle(ViewportComboButton)
+			.SetToggleButtonStyle(SoloToggleButton)
+			.SetButtonStyle(ViewportMenuButton)
+			.SetSeparatorBrush(FSlateNoResource())
+			.SetSeparatorPadding(FMargin(2.0f, 0.0f))
+			.SetExpandBrush(IMAGE_BRUSH("Icons/toolbar_expand_16x", Icon8x8));
+		Set("EditorViewportToolBar", ViewportToolbarStyle);
+
+		FButtonStyle ViewportMenuWarningButton = FButtonStyle(ViewportMenuButton)
+			.SetNormalForeground(FStyleColors::AccentYellow)
+			.SetHoveredForeground(FStyleColors::ForegroundHover)
+			.SetPressedForeground(FStyleColors::ForegroundHover)
+			.SetDisabledForeground(FStyleColors::AccentYellow);
+		Set("EditorViewportToolBar.WarningButton", ViewportMenuWarningButton);
+
+		Set("EditorViewportToolBar.Background", new FSlateNoResource());
+		Set("EditorViewportToolBar.OptionsDropdown", new IMAGE_BRUSH_SVG("Starship/EditorViewport/menu", Icon16x16));
+
+		Set("EditorViewportToolBar.Font", FStyleFonts::Get().Normal);
+
+		Set("EditorViewportToolBar.MenuButton", FButtonStyle(Button)
+			.SetNormal(BOX_BRUSH("Common/SmallRoundedButton", FMargin(7.f / 16.f), FLinearColor(1, 1, 1, 0.75f)))
+			.SetHovered(BOX_BRUSH("Common/SmallRoundedButton", FMargin(7.f / 16.f), FLinearColor(1, 1, 1, 1.0f)))
+			.SetPressed(BOX_BRUSH("Common/SmallRoundedButton", FMargin(7.f / 16.f)))
+		);
+
+		
+		Set("EditorViewportToolBar.MenuDropdown", new IMAGE_BRUSH("Common/ComboArrow", Icon8x8));
+		Set("EditorViewportToolBar.Maximize.Normal", new IMAGE_BRUSH_SVG("Starship/EditorViewport/square", Icon16x16));
+		Set("EditorViewportToolBar.Maximize.Checked", new IMAGE_BRUSH_SVG("Starship/EditorViewport/quad", Icon16x16));
+		Set("EditorViewportToolBar.RestoreFromImmersive.Normal", new IMAGE_BRUSH("Icons/icon_RestoreFromImmersive_16px", Icon16x16));
+
+		FLinearColor ViewportOverlayColor = FStyleColors::Input.GetSpecifiedColor();
+		ViewportOverlayColor.A = 0.75f;
+
+		Set("SodaViewport.OverlayBrush", new FSlateRoundedBoxBrush(ViewportOverlayColor, 8.0, FStyleColors::Dropdown, 1.0));
+
+		Set("LevelEditor.OpenAddContent.Background", new IMAGE_BRUSH_SVG("Starship/MainToolbar/PlaceActorsBase", Icon20x20));
+		Set("LevelEditor.OpenAddContent.Overlay", new IMAGE_BRUSH_SVG("Starship/MainToolbar/ToolBadgePlus", Icon20x20, FStyleColors::AccentGreen));
+
+	}
+}
+
+void FStarshipSodaStyle::FStyle::SetupMenuBarStyles()
+{
+	// MenuBar
+	{
+		Set("Menu.Label.Padding", FMargin(0.0f, 0.0f, 0.0f, 0.0f));
+		Set("Menu.Label.ContentPadding", FMargin(10.0f, 2.0f));
+	}
+}
+
+void FStarshipSodaStyle::FStyle::SetupGeneralIcons()
+{
+	Set("Plus", new IMAGE_BRUSH("Icons/PlusSymbol_12x", Icon12x12));
+	Set("Cross", new IMAGE_BRUSH("Icons/Cross_12x", Icon12x12));
+	Set("ArrowUp", new IMAGE_BRUSH("Icons/ArrowUp_12x", Icon12x12));
+	Set("ArrowDown", new IMAGE_BRUSH("Icons/ArrowDown_12x", Icon12x12));
+	Set("AssetEditor.SaveThumbnail", new IMAGE_BRUSH_SVG("Starship/AssetEditors/SaveThumbnail", Icon20x20));
+	Set("AssetEditor.ToggleShowBounds", new IMAGE_BRUSH_SVG("Starship/Common/SetShowBounds", Icon20x20));
+	Set("AssetEditor.Apply", new IMAGE_BRUSH_SVG("Starship/Common/Apply", Icon20x20));
+	Set("AssetEditor.Simulate", new IMAGE_BRUSH_SVG("Starship/MainToolbar/simulate", Icon20x20));
+	Set("AssetEditor.ToggleStats", new IMAGE_BRUSH_SVG("Starship/Common/Statistics", Icon20x20));
+	Set("AssetEditor.CompileStatus.Background", new IMAGE_BRUSH_SVG("Starship/Blueprints/CompileStatus_Background", Icon20x20));
+	Set("AssetEditor.CompileStatus.Overlay.Unknown", new IMAGE_BRUSH_SVG("Starship/Blueprints/CompileStatus_Unknown_Badge", Icon20x20, FStyleColors::AccentYellow));
+	Set("AssetEditor.CompileStatus.Overlay.Warning", new IMAGE_BRUSH_SVG("Starship/Blueprints/CompileStatus_Warning_Badge", Icon20x20, FStyleColors::Warning));
+	Set("AssetEditor.CompileStatus.Overlay.Good", new IMAGE_BRUSH_SVG("Starship/Blueprints/CompileStatus_Good_Badge", Icon20x20, FStyleColors::AccentGreen));
+	Set("AssetEditor.CompileStatus.Overlay.Error", new IMAGE_BRUSH_SVG("Starship/Blueprints/CompileStatus_Fail_Badge", Icon20x20, FStyleColors::Error));
+	
+	Set("Debug", new IMAGE_BRUSH_SVG( "Starship/Common/Debug", Icon16x16 ) );
+	Set("Modules", new IMAGE_BRUSH_SVG( "Starship/Common/Modules", Icon16x16 ) );
+	Set("Versions", new IMAGE_BRUSH_SVG("Starship/Common/Versions", Icon20x20));
+}
+
+void FStarshipSodaStyle::FStyle::SetupWindowStyles()
+{
+	// Window styling
+	{
+		EditorWindowHighlightBrush = CORE_IMAGE_BRUSH("Common/Window/WindowTitle", FVector2D(74, 74), FLinearColor::White, ESlateBrushTileType::Horizontal);
+	}
+}
+
+void FStarshipSodaStyle::FStyle::SetupPropertySodaStyles()
+	{
+	// Property / details Window / PropertyTable 
+	{
+		Set( "PropertyEditor.Grid.TabIcon", new IMAGE_BRUSH( "Icons/icon_PropertyMatrix_16px", Icon16x16 ) );
+		Set( "PropertyEditor.Properties.TabIcon", new IMAGE_BRUSH( "Icons/icon_tab_SelectionDetails_16x", Icon16x16 ) );
+
+		Set( "PropertyEditor.RemoveColumn", new IMAGE_BRUSH( "Common/PushPin_Down", Icon16x16, FColor( 96, 194, 253, 255 ).ReinterpretAsLinear() ) );
+		Set( "PropertyEditor.AddColumn", new IMAGE_BRUSH( "Common/PushPin_Up", Icon16x16, FColor( 96, 194, 253, 255 ).ReinterpretAsLinear() ) );
+
+		Set( "PropertyEditor.AddColumnOverlay",	new IMAGE_BRUSH( "Common/TinyChalkArrow", FVector2D( 71, 20 ), FColor( 96, 194, 253, 255 ).ReinterpretAsLinear() ) );
+		Set( "PropertyEditor.AddColumnMessage", FTextBlockStyle(NormalText)
+			.SetFont( DEFAULT_FONT( "BoldCondensedItalic", 10 ) )
+			.SetColorAndOpacity(FColor( 96, 194, 253, 255 ).ReinterpretAsLinear())
+		);
+	
+
+		Set( "PropertyEditor.AssetName.ColorAndOpacity", FLinearColor::White );
+
+		Set("PropertyEditor.AssetThumbnailBorder", new FSlateRoundedBoxBrush(FStyleColors::Transparent, 4.0f, FStyleColors::InputOutline, 1.0f));
+		Set("PropertyEditor.AssetThumbnailBorderHovered", new FSlateRoundedBoxBrush(FStyleColors::Transparent, 4.0f, FStyleColors::Hover2, 1.0f));
+		Set("PropertyEditor.AssetTileItem.DropShadow", new BOX_BRUSH("Starship/ContentBrowser/drop-shadow", FMargin(4.0f / 64.0f)));
+
+		Set( "PropertyEditor.AssetClass", FTextBlockStyle(NormalText)
+			.SetFont( DEFAULT_FONT( "Regular", 10 ) )
+			.SetColorAndOpacity( FLinearColor::White )
+			.SetShadowOffset( FVector2D(1,1) )
+			.SetShadowColorAndOpacity( FLinearColor::Black )
+		);
+
+		const FButtonStyle AssetComboStyle = FButtonStyle()
+			.SetNormal( BOX_BRUSH( "Common/ButtonHoverHint", FMargin(4/16.0f), FLinearColor(1,1,1,0.15f) ) )
+			.SetHovered( BOX_BRUSH( "Common/ButtonHoverHint", FMargin(4/16.0f), FLinearColor(1,1,1,0.25f) ) )
+			.SetPressed( BOX_BRUSH( "Common/ButtonHoverHint", FMargin(4/16.0f), FLinearColor(1,1,1,0.30f) ) )
+			.SetNormalPadding( FMargin(0,0,0,1) )
+			.SetPressedPadding( FMargin(0,1,0,0) );
+		Set( "PropertyEditor.AssetComboStyle", AssetComboStyle );
+
+		Set( "PropertyEditor.HorizontalDottedLine",		new IMAGE_BRUSH( "Common/HorizontalDottedLine_16x1px", FVector2D(16.0f, 1.0f), FLinearColor::White, ESlateBrushTileType::Horizontal ) );
+		Set( "PropertyEditor.VerticalDottedLine",		new IMAGE_BRUSH( "Common/VerticalDottedLine_1x16px", FVector2D(1.0f, 16.0f), FLinearColor::White, ESlateBrushTileType::Vertical ) );
+		Set( "PropertyEditor.SlateBrushPreview",		new BOX_BRUSH( "PropertyView/SlateBrushPreview_32px", Icon32x32, FMargin(3.f/32.f, 3.f/32.f, 15.f/32.f, 13.f/32.f) ) );
+
+		Set( "PropertyTable.TableRow", FTableRowStyle()
+			.SetEvenRowBackgroundBrush( FSlateColorBrush( FLinearColor( 0.70f, 0.70f, 0.70f, 255 ) ) )
+			.SetEvenRowBackgroundHoveredBrush( IMAGE_BRUSH( "Common/Selection", Icon8x8, SelectionColor_Inactive ) )
+			.SetOddRowBackgroundBrush( FSlateColorBrush( FLinearColor( 0.80f, 0.80f, 0.80f, 255 ) ) )
+			.SetOddRowBackgroundHoveredBrush( IMAGE_BRUSH( "Common/Selection", Icon8x8, SelectionColor_Inactive ) )
+			.SetSelectorFocusedBrush( BORDER_BRUSH( "Common/Selector", FMargin(4.f/16.f), SelectorColor ) )
+			.SetActiveBrush( IMAGE_BRUSH( "Common/Selection", Icon8x8, SelectionColor ) )
+			.SetActiveHoveredBrush( IMAGE_BRUSH( "Common/Selection", Icon8x8, SelectionColor ) )
+			.SetInactiveBrush( IMAGE_BRUSH( "Common/Selection", Icon8x8, SelectionColor_Inactive ) )
+			.SetInactiveHoveredBrush( IMAGE_BRUSH( "Common/Selection", Icon8x8, SelectionColor_Inactive ) )
+			.SetTextColor( DefaultForeground )
+			.SetSelectedTextColor( InvertedForeground )
+			);
+
+		const FTableColumnHeaderStyle PropertyTableColumnHeaderStyle = FTableColumnHeaderStyle()
+			.SetSortPrimaryAscendingImage(IMAGE_BRUSH("Common/SortUpArrow", Icon8x4))
+			.SetSortPrimaryDescendingImage(IMAGE_BRUSH("Common/SortDownArrow", Icon8x4))
+			.SetSortSecondaryAscendingImage(IMAGE_BRUSH("Common/SortUpArrows", Icon16x4))
+			.SetSortSecondaryDescendingImage(IMAGE_BRUSH("Common/SortDownArrows", Icon16x4))
+			.SetNormalBrush( BOX_BRUSH( "Common/ColumnHeader", 4.f/32.f ) )
+			.SetHoveredBrush( BOX_BRUSH( "Common/ColumnHeader_Hovered", 4.f/32.f ) )
+			.SetMenuDropdownImage( IMAGE_BRUSH( "Common/ColumnHeader_Arrow", Icon8x8 ) )
+			.SetMenuDropdownNormalBorderBrush( BOX_BRUSH( "Common/ColumnHeaderMenuButton_Normal", 4.f/32.f ) )
+			.SetMenuDropdownHoveredBorderBrush( BOX_BRUSH( "Common/ColumnHeaderMenuButton_Hovered", 4.f/32.f ) );
+
+		const FTableColumnHeaderStyle PropertyTableLastColumnHeaderStyle = FTableColumnHeaderStyle()
+			.SetSortPrimaryAscendingImage(IMAGE_BRUSH("Common/SortUpArrow", Icon8x4))
+			.SetSortPrimaryDescendingImage(IMAGE_BRUSH("Common/SortDownArrow", Icon8x4))
+			.SetSortSecondaryAscendingImage(IMAGE_BRUSH("Common/SortUpArrows", Icon16x4))
+			.SetSortSecondaryDescendingImage(IMAGE_BRUSH("Common/SortDownArrows", Icon16x4))
+			.SetNormalBrush( FSlateNoResource() )
+			.SetHoveredBrush( BOX_BRUSH( "Common/LastColumnHeader_Hovered", 4.f/32.f ) )
+			.SetMenuDropdownImage( IMAGE_BRUSH( "Common/ColumnHeader_Arrow", Icon8x8 ) )
+			.SetMenuDropdownNormalBorderBrush( BOX_BRUSH( "Common/ColumnHeaderMenuButton_Normal", 4.f/32.f ) )
+			.SetMenuDropdownHoveredBorderBrush( BOX_BRUSH( "Common/ColumnHeaderMenuButton_Hovered", 4.f/32.f ) );
+
+		const FSplitterStyle PropertyTableHeaderSplitterStyle = FSplitterStyle()
+			.SetHandleNormalBrush( FSlateNoResource() )
+			.SetHandleHighlightBrush( IMAGE_BRUSH( "Common/HeaderSplitterGrip", Icon8x8 ) );
+
+		Set( "PropertyTable.HeaderRow", FHeaderRowStyle()
+			.SetColumnStyle( PropertyTableColumnHeaderStyle )
+			.SetLastColumnStyle( PropertyTableLastColumnHeaderStyle )
+			.SetColumnSplitterStyle( PropertyTableHeaderSplitterStyle )
+			.SetBackgroundBrush( BOX_BRUSH( "Common/TableViewHeader", 4.f/32.f ) )
+			.SetForegroundColor( DefaultForeground )
+			);
+
+		FWindowStyle InViewportDecoratorWindow = FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FWindowStyle>("Window");
+		InViewportDecoratorWindow.SetCornerRadius(4);
+
+		Set("InViewportDecoratorWindow", InViewportDecoratorWindow);
+		FLinearColor TransparentBackground = FStyleColors::Background.GetSpecifiedColor();
+		TransparentBackground.A = 0.8f;
+		Set("PropertyTable.InViewport.Header", new FSlateRoundedBoxBrush(FStyleColors::Title, FVector4(4.0f, 4.0f, 0.0f, 0.0f)));
+		Set("PropertyTable.InViewport.Background", new FSlateRoundedBoxBrush(FSlateColor(TransparentBackground), 4.0f));
+		// InViewportToolbar
+		{
+			FToolBarStyle InViewportToolbar = FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FToolBarStyle>("SlimToolBar");
+			InViewportToolbar.SetBackground(FSlateColorBrush(FStyleColors::Panel));
+			InViewportToolbar.SetBackgroundPadding(FMargin(4.0f, 0.0f));
+			InViewportToolbar.SetButtonPadding(0.0f);
+			InViewportToolbar.SetIconSize(Icon16x16);
+			InViewportToolbar.ButtonStyle.SetNormalPadding(FMargin(4, 4, 4, 4));
+			InViewportToolbar.ButtonStyle.SetPressedPadding(FMargin(4, 5, 4, 3));
+			Set("InViewportToolbar", InViewportToolbar);
+		}
+		const FTableViewStyle InViewportViewStyle = FTableViewStyle()
+			.SetBackgroundBrush(FSlateNoResource());
+		Set("PropertyTable.InViewport.ListView", InViewportViewStyle);
+
+		Set("PropertyTable.InViewport.Row", FTableRowStyle(NormalTableRowStyle)
+			.SetEvenRowBackgroundBrush(FSlateNoResource())
+			.SetEvenRowBackgroundHoveredBrush(FSlateNoResource())
+			.SetOddRowBackgroundBrush(FSlateNoResource())
+			.SetOddRowBackgroundHoveredBrush(FSlateNoResource())
+			.SetSelectorFocusedBrush(FSlateNoResource())
+			.SetActiveBrush(FSlateNoResource())
+			.SetActiveHoveredBrush(FSlateNoResource())
+			.SetInactiveBrush(FSlateNoResource())
+			.SetInactiveHoveredBrush(FSlateNoResource())
+		);
+
+		const FSplitterStyle TransparentSplitterStyle = FSplitterStyle()
+			.SetHandleNormalBrush(FSlateNoResource())
+			.SetHandleHighlightBrush(FSlateNoResource());
+		Set("PropertyTable.InViewport.Splitter", TransparentSplitterStyle);
+
+		Set( "PropertyTable.Selection.Active",						new IMAGE_BRUSH( "Common/Selection", Icon8x8, SelectionColor ) );
+
+		Set( "PropertyTable.HeaderRow.Column.PathDelimiter",		new IMAGE_BRUSH( "Common/SmallArrowRight", Icon10x10 ) );
+
+		Set( "PropertyTable.RowHeader.Background",					new BOX_BRUSH( "Old/Menu_Background", FMargin(4.f/64.f) ) );
+		Set( "PropertyTable.RowHeader.BackgroundActive",			new BOX_BRUSH( "Old/Menu_Background", FMargin(4.f/64.f), SelectionColor_Inactive ) );
+		Set( "PropertyTable.ColumnBorder",							new BOX_BRUSH( "Common/ColumnBorder", FMargin(4.f/16.f), FLinearColor(0.1f, 0.1f, 0.1f, 0.5f) ) );
+		Set( "PropertyTable.CellBorder",							new BOX_BRUSH( "Common/CellBorder", FMargin(4.f/16.f), FLinearColor(0.1f, 0.1f, 0.1f, 0.5f) ) );
+		Set( "PropertyTable.ReadOnlyEditModeCellBorder",			new BORDER_BRUSH( "Common/ReadOnlyEditModeCellBorder", FMargin(6.f/32.f), SelectionColor ) );
+		Set( "PropertyTable.ReadOnlyCellBorder",					new BOX_BRUSH( "Common/ReadOnlyCellBorder", FMargin(4.f/16.f), FLinearColor(0.1f, 0.1f, 0.1f, 0.5f) ) );
+		Set( "PropertyTable.CurrentCellBorder",						new BOX_BRUSH( "Common/CurrentCellBorder", FMargin(4.f/16.f), FLinearColor(0.0f, 0.0f, 0.0f, 1.0f) ) );
+		Set( "PropertyTable.ReadOnlySelectedCellBorder",			new BOX_BRUSH( "Common/ReadOnlySelectedCellBorder", FMargin(4.f/16.f), FLinearColor(0.0f, 0.0f, 0.0f, 1.0f) ) );
+		Set( "PropertyTable.ReadOnlyCurrentCellBorder",				new BOX_BRUSH( "Common/ReadOnlyCurrentCellBorder", FMargin(4.f/16.f), FLinearColor(0.0f, 0.0f, 0.0f, 1.0f) ) );
+		Set( "PropertyTable.Cell.DropDown.Background",				new BOX_BRUSH( "Common/GroupBorder", FMargin(4.f/16.f) ) );
+		Set( "PropertyTable.ContentBorder",							new BOX_BRUSH( "Common/GroupBorder", FMargin(4.0f/16.0f) ) );	
+		Set( "PropertyTable.NormalFont",							DEFAULT_FONT( "Regular", 9 ) );
+		Set( "PropertyTable.BoldFont",								DEFAULT_FONT( "Bold", 9 ) );
+		Set( "PropertyTable.FilterFont",							DEFAULT_FONT( "Regular", 10 ) );
+
+		Set( "PropertyWindow.FilterSearch", new IMAGE_BRUSH( "Old/FilterSearch", Icon16x16 ) );
+		Set( "PropertyWindow.FilterCancel", new IMAGE_BRUSH( "Old/FilterCancel", Icon16x16 ) );
+		Set( "PropertyWindow.Favorites_Disabled", new IMAGE_BRUSH( "Icons/EmptyStar_16x", Icon16x16 ) );
+		Set( "PropertyWindow.Locked", new CORE_IMAGE_BRUSH_SVG( "Starship/Common/lock", Icon16x16 ) );
+		Set( "PropertyWindow.Unlocked", new CORE_IMAGE_BRUSH_SVG( "Starship/Common/lock-unlocked", Icon16x16 ) );
+		Set( "PropertyWindow.DiffersFromDefault", new IMAGE_BRUSH_SVG( "Starship/Common/ResetToDefault", Icon16x16) ) ;
+		
+		Set( "PropertyWindow.NormalFont", FStyleFonts::Get().Small);
+		Set( "PropertyWindow.BoldFont",FStyleFonts::Get().SmallBold);
+		Set( "PropertyWindow.ItalicFont", DEFAULT_FONT( "Italic", 8 ) );
+		Set( "PropertyWindow.FilterFont", DEFAULT_FONT( "Regular", 10 ) );
+
+		FSlateFontInfo MobilityFont = FStyleFonts::Get().Small;
+		MobilityFont.LetterSpacing = 100;
+
+		Set("PropertyWindow.MobilityFont", MobilityFont );
+		Set("PropertyWindow.MobilityStatic", new IMAGE_BRUSH_SVG("Starship/Common/MobilityStatic", Icon16x16));
+		Set("PropertyWindow.MobilityStationary", new IMAGE_BRUSH_SVG("Starship/Common/MobilityStationary", Icon16x16));
+		Set("PropertyWindow.MobilityMoveable", new IMAGE_BRUSH_SVG("Starship/Common/MobilityMoveable", Icon16x16));
+
+		Set( "PropertyWindow.NoOverlayColor", new FSlateNoResource() );
+		Set( "PropertyWindow.EditConstColor", new FSlateColorBrush( FColor( 152, 152, 152, 80 ) ) );
+		Set( "PropertyWindow.FilteredColor", new FSlateColorBrush( FColor( 0, 255, 0, 80 ) ) );
+		Set( "PropertyWindow.FilteredEditConstColor", new FSlateColorBrush( FColor( 152, 152, 152, 80 ).ReinterpretAsLinear() * FColor(0,255,0,255).ReinterpretAsLinear() ) );
+		Set( "PropertyWindow.CategoryBackground", new BOX_BRUSH( "/PropertyView/CategoryBackground", FMargin(4.f/16.f) ) );
+		Set( "PropertyWindow.CategoryForeground", FLinearColor::Black );
+		Set( "PropertyWindow.Button_Clear", new IMAGE_BRUSH( "Icons/Cross_12x", Icon12x12 ) );
+		Set( "PropertyWindow.Button_Ellipsis", new IMAGE_BRUSH( "Icons/ellipsis_12x", Icon12x12 ) );
+		Set( "PropertyWindow.Button_PickAsset", new IMAGE_BRUSH( "Icons/pillarray_12x", Icon12x12 ) );
+		Set( "PropertyWindow.Button_PickActor", new IMAGE_BRUSH( "Icons/levels_16x", Icon12x12 ) );
+
+		Set( "PropertyWindow.WindowBorder", new BOX_BRUSH( "Common/GroupBorder", FMargin(4.0f/16.0f) ) );
+
+		FInlineEditableTextBlockStyle NameStyle(FCoreStyle::Get().GetWidgetStyle<FInlineEditableTextBlockStyle>("InlineEditableTextBlockStyle"));
+		NameStyle.EditableTextBoxStyle.SetFont(DEFAULT_FONT("Regular", 11))
+			.SetForegroundColor(FSlateColor(EStyleColor::White));
+		NameStyle.TextStyle.SetFont(DEFAULT_FONT("Regular", 11))
+			.SetColorAndOpacity(FSlateColor(EStyleColor::White));
+		Set( "DetailsView.ConstantTextBlockStyle", NameStyle.TextStyle);
+		Set( "DetailsView.NameTextBlockStyle",  NameStyle );
+
+		Set( "DetailsView.NameChangeCommitted", new BOX_BRUSH( "Common/EditableTextSelectionBackground", FMargin(4.f/16.f) ) );
+		Set( "DetailsView.HyperlinkStyle", FTextBlockStyle(NormalText) .SetFont( DEFAULT_FONT( "Regular", 8 ) ) );
+
+		FTextBlockStyle BPWarningMessageTextStyle = FTextBlockStyle(NormalText) .SetFont(DEFAULT_FONT("Regular", 8));
+		FTextBlockStyle BPWarningMessageHyperlinkTextStyle = FTextBlockStyle(BPWarningMessageTextStyle).SetColorAndOpacity(FLinearColor(0.25f, 0.5f, 1.0f));
+
+		FButtonStyle EditBPHyperlinkButton = FButtonStyle()
+			.SetNormal(BORDER_BRUSH("Old/HyperlinkDotted", FMargin(0, 0, 0, 3 / 16.0f), FLinearColor(0.25f, 0.5f, 1.0f)))
+			.SetPressed(FSlateNoResource())
+			.SetHovered(BORDER_BRUSH("Old/HyperlinkUnderline", FMargin(0, 0, 0, 3 / 16.0f), FLinearColor(0.25f, 0.5f, 1.0f)));
+
+		FHyperlinkStyle BPWarningMessageHyperlinkStyle = FHyperlinkStyle()
+			.SetUnderlineStyle(EditBPHyperlinkButton)
+			.SetTextStyle(BPWarningMessageHyperlinkTextStyle)
+			.SetPadding(FMargin(0.0f));
+
+		Set( "DetailsView.BPMessageHyperlinkStyle", BPWarningMessageHyperlinkStyle );
+		Set( "DetailsView.BPMessageTextStyle", BPWarningMessageTextStyle );
+
+		Set( "DetailsView.GroupSection",              new FSlateNoResource());
+
+		Set( "DetailsView.PulldownArrow.Down",        new CORE_IMAGE_BRUSH_SVG("Starship/Common/chevron-down", Icon16x16, FStyleColors::Foreground)); 
+		Set( "DetailsView.PulldownArrow.Down.Hovered",new CORE_IMAGE_BRUSH_SVG("Starship/Common/chevron-down", Icon16x16, FStyleColors::ForegroundHover)); 
+		Set( "DetailsView.PulldownArrow.Up",          new CORE_IMAGE_BRUSH_SVG("Starship/Common/chevron-up",   Icon16x16, FStyleColors::Foreground)); 
+		Set( "DetailsView.PulldownArrow.Up.Hovered",  new CORE_IMAGE_BRUSH_SVG("Starship/Common/chevron-up",   Icon16x16, FStyleColors::ForegroundHover)); 
+
+		Set( "DetailsView.EditRawProperties",         new CORE_IMAGE_BRUSH_SVG("Starship/Common/layout-spreadsheet",  Icon16x16, FLinearColor::White) );
+		Set( "DetailsView.ViewOptions",         	  new CORE_IMAGE_BRUSH_SVG("Starship/Common/settings",  Icon16x16, FLinearColor::White) );
+		Set( "DetailsView.EditConfigProperties",      new IMAGE_BRUSH("Icons/icon_PropertyMatrix_16px",  Icon16x16, FLinearColor::White ) );
+
+		Set( "DetailsView.CollapsedCategory",         new FSlateColorBrush(FStyleColors::Header));
+		Set( "DetailsView.CollapsedCategory_Hovered", new FSlateColorBrush(FStyleColors::Hover));
+		Set( "DetailsView.CategoryTop",               new FSlateColorBrush(FStyleColors::Header));
+		Set( "DetailsView.CategoryTop_Hovered",       new FSlateColorBrush(FStyleColors::Hover));
+		Set( "DetailsView.CategoryBottom",            new FSlateColorBrush(FStyleColors::Recessed));
+		
+		// these are not actually displayed as white, see PropertyEditorConstants::GetRowBackgroundColor
+		Set( "DetailsView.CategoryMiddle",            new FSlateColorBrush(FStyleColors::White));
+		Set( "DetailsView.Highlight",				  new FSlateRoundedBoxBrush(FStyleColors::Transparent, 0.0f, FStyleColors::AccentBlue, 1.0f));
+
+		Set( "DetailsView.PropertyIsFavorite", new IMAGE_BRUSH("PropertyView/Favorites_Enabled", Icon12x12));
+		Set( "DetailsView.PropertyIsNotFavorite", new IMAGE_BRUSH("PropertyView/Favorites_Disabled", Icon12x12));
+		Set( "DetailsView.NoFavoritesSystem", new IMAGE_BRUSH("PropertyView/NoFavoritesSystem", Icon12x12));
+
+		Set( "DetailsView.Splitter", FSplitterStyle()
+			.SetHandleNormalBrush(FSlateColorBrush(FStyleColors::Recessed))                   
+			.SetHandleHighlightBrush(FSlateColorBrush(FStyleColors::Recessed))
+		);
+
+		Set( "DetailsView.GridLine", new FSlateColorBrush(FStyleColors::Recessed) );
+		Set( "DetailsView.SectionButton", FCheckBoxStyle( FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FCheckBoxStyle>("ToggleButtonCheckbox"))
+			.SetUncheckedImage(FSlateRoundedBoxBrush(FStyleColors::Header, 4.0f, FStyleColors::Input, 1.0f))
+			.SetUncheckedHoveredImage(FSlateRoundedBoxBrush(FStyleColors::Hover, 4.0f, FStyleColors::Input, 1.0f))
+			.SetUncheckedPressedImage(FSlateRoundedBoxBrush(FStyleColors::Hover, 4.0f, FStyleColors::Input, 1.0f))
+			.SetCheckedImage(FSlateRoundedBoxBrush(FStyleColors::Primary, 4.0f, FStyleColors::Input, 1.0f))
+			.SetCheckedHoveredImage(FSlateRoundedBoxBrush(FStyleColors::PrimaryHover, 4.0f, FStyleColors::Input, 1.0f))
+			.SetCheckedPressedImage(FSlateRoundedBoxBrush(FStyleColors::PrimaryHover, 4.0f, FStyleColors::Input, 1.0f))
+			.SetPadding(FMargin(16, 4))
+		);
+
+		Set( "DetailsView.CategoryFontStyle", FStyleFonts::Get().SmallBold);
+		Set( "DetailsView.CategoryTextStyle", FTextBlockStyle(NormalText)
+			.SetFont(GetFontStyle("DetailsView.CategoryFontStyle"))
+			.SetColorAndOpacity(FStyleColors::ForegroundHeader)
+		);
+
+		Set("DetailsView.CategoryTextStyleUpdate", FTextBlockStyle(NormalText)
+			.SetFont(FStyleFonts::Get().Small)
+			.SetColorAndOpacity(FStyleColors::ForegroundHeader)
+			.SetTransformPolicy(ETextTransformPolicy::ToUpper)
+		);
+
+		FButtonStyle DetailsExtensionMenuButton = FButtonStyle(FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FButtonStyle>("NoBorder"))
+			.SetNormalForeground(FStyleColors::Foreground)
+			.SetHoveredForeground(FStyleColors::ForegroundHover)
+			.SetPressedForeground(FStyleColors::ForegroundHover)
+			.SetDisabledForeground(FStyleColors::Foreground)
+			.SetNormalPadding(FMargin(2, 2, 2, 2))
+			.SetPressedPadding(FMargin(2, 3, 2, 1));
+
+		Set("DetailsView.ExtensionToolBar.Button", DetailsExtensionMenuButton);
+
+		FToolBarStyle DetailsExtensionToolBarStyle = FToolBarStyle(FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FToolBarStyle>("SlimToolBar"))
+			.SetButtonStyle(DetailsExtensionMenuButton)
+			.SetExpandBrush(CORE_IMAGE_BRUSH_SVG("Starship/Common/ellipsis-vertical-narrow", FVector2D(4, 16)))
+			.SetIconSize(Icon16x16)
+			.SetBackground(FSlateNoResource())
+			.SetLabelPadding(FMargin(0))
+			.SetComboButtonPadding(FMargin(0))
+			.SetBlockPadding(FMargin(0))
+			.SetIndentedBlockPadding(FMargin(0))
+			.SetBackgroundPadding(FMargin(0))
+			.SetButtonPadding(FMargin(0))
+			.SetCheckBoxPadding(FMargin(0))
+			.SetSeparatorBrush(FSlateNoResource())
+			.SetSeparatorPadding(FMargin(0));
+
+		Set("DetailsView.ExtensionToolBar", DetailsExtensionToolBarStyle);
+
+		Set("DetailsView.ArrayDropShadow", new IMAGE_BRUSH("Common/ArrayDropShadow", FVector2D(32,2)));
+
+		Set( "DetailsView.TreeView.TableRow", FTableRowStyle()
+			.SetEvenRowBackgroundBrush( FSlateNoResource() )
+			.SetEvenRowBackgroundHoveredBrush( FSlateNoResource() )
+			.SetOddRowBackgroundBrush( FSlateNoResource() )
+			.SetOddRowBackgroundHoveredBrush( FSlateNoResource() )
+			.SetSelectorFocusedBrush( FSlateNoResource() )
+			.SetActiveBrush( FSlateNoResource() )
+			.SetActiveHoveredBrush( FSlateNoResource() )
+			.SetInactiveBrush( FSlateNoResource() )
+			.SetInactiveHoveredBrush( FSlateNoResource() )
+			.SetTextColor( DefaultForeground )
+			.SetSelectedTextColor( InvertedForeground )
+			.SetDropIndicator_Above(BOX_BRUSH("Common/DropZoneIndicator_Above", FMargin(10.0f / 16.0f, 10.0f / 16.0f, 0.f, 0.f), SelectionColor))
+			.SetDropIndicator_Onto(BOX_BRUSH("Common/DropZoneIndicator_Onto", FMargin(4.0f / 16.0f), SelectionColor))
+			.SetDropIndicator_Below(BOX_BRUSH("Common/DropZoneIndicator_Below", FMargin(10.0f / 16.0f, 0.f, 0.f, 10.0f / 16.0f), SelectionColor))
+			);
+
+		Set("DetailsView.DropZone.Below", new BOX_BRUSH("Common/VerticalBoxDropZoneIndicator_Below", FMargin(10.0f / 16.0f, 0, 0, 10.0f / 16.0f), SelectionColor_Subdued));
+
+		FButtonStyle NameAreaButton = FButtonStyle(Button)
+			.SetNormalPadding(FMargin(6, 3))
+			.SetPressedPadding(FMargin(6, 3));
+		Set("DetailsView.NameAreaButton", NameAreaButton);
+
+		Set("DetailsView.NameAreaComboButton", FComboButtonStyle(GetWidgetStyle<FComboButtonStyle>("ComboButton"))
+			.SetButtonStyle(NameAreaButton)
+			.SetDownArrowPadding(FMargin(4, 0, 0, 0))
+			.SetContentPadding(FMargin(4, 0, 0, 0))
+		);
+
+	}
+	}
+	
+void FStarshipSodaStyle::FStyle::SetupGraphSodaStyles()
+{
+	Set("Graph.ConnectorFeedback.Border", new BOX_BRUSH("Old/Menu_Background", FMargin(8.0f / 64.0f)));
+	Set("Graph.ConnectorFeedback.OK", new IMAGE_BRUSH("Old/Graph/Feedback_OK", Icon16x16));
+	Set("Graph.ConnectorFeedback.OKWarn", new IMAGE_BRUSH("Old/Graph/Feedback_OKWarn", Icon16x16));
+	Set("Graph.ConnectorFeedback.Error", new IMAGE_BRUSH("Old/Graph/Feedback_Error", Icon16x16));
+	Set("Graph.ConnectorFeedback.NewNode", new IMAGE_BRUSH("Old/Graph/Feedback_NewNode", Icon16x16));
+	Set("Graph.ConnectorFeedback.ViaCast", new IMAGE_BRUSH("Old/Graph/Feedback_ConnectViaCast", Icon16x16));
+	Set("Graph.ConnectorFeedback.ShowNode", new IMAGE_BRUSH("Graph/Feedback_ShowNode", Icon16x16));
+
+	Set("ClassIcon.K2Node_CallFunction",	new IMAGE_BRUSH_SVG("Starship/Blueprints/icon_Blueprint_Function", Icon16x16));
+	Set("ClassIcon.K2Node_FunctionEntry",	new IMAGE_BRUSH_SVG("Starship/Blueprints/icon_Blueprint_Function", Icon16x16));
+	Set("ClassIcon.K2Node_CustomEvent",		new IMAGE_BRUSH_SVG("Starship/Common/Event", Icon16x16));
+	Set("ClassIcon.K2Node_Event",			new IMAGE_BRUSH_SVG("Starship/Common/Event", Icon16x16));
+	Set("ClassIcon.K2Node_Variable",		new IMAGE_BRUSH_SVG("Starship/GraphEditors/Node", Icon16x16, FLinearColor::White));
+	Set("ClassIcon.K2Node_VariableGet",		new IMAGE_BRUSH_SVG("Starship/GraphEditors/VarGet", Icon16x16, FLinearColor::White));
+	Set("ClassIcon.K2Node_VariableSet",		new IMAGE_BRUSH_SVG("Starship/GraphEditors/VarSet", Icon16x16, FLinearColor::White));
+	Set("ClassIcon.K2Node_DynamicCast",		new IMAGE_BRUSH_SVG("Starship/GraphEditors/Cast", Icon16x16));
+
+	Set("GraphEditor.Default_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Node", Icon16x16));
+	Set("GraphEditor.InterfaceFunction_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/InterfaceFunction", Icon16x16));
+	Set("GraphEditor.PureFunction_16x", new IMAGE_BRUSH_SVG("Starship/Blueprints/icon_Blueprint_Function", Icon16x16));
+	Set("GraphEditor.PotentialOverrideFunction_16x", new IMAGE_BRUSH_SVG("Starship/Blueprints/icon_Blueprint_OverrideFunction", Icon16x16));
+	Set("GraphEditor.OverridePureFunction_16x", new IMAGE_BRUSH_SVG("Starship/Blueprints/icon_Blueprint_OverrideFunction", Icon16x16));
+	Set("GraphEditor.SubGraph_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/SubGraph", Icon16x16));
+	Set("GraphEditor.Animation_16x", new IMAGE_BRUSH_SVG("Starship/Common/Animation", Icon16x16));
+	Set("GraphEditor.Conduit_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Conduit", Icon16x16));
+	Set("GraphEditor.Rule_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Rule", Icon16x16));
+	Set("GraphEditor.State_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/State", Icon16x16));
+	Set("GraphEditor.StateMachine_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/StateMachine", Icon16x16));
+	Set("GraphEditor.Event_16x", new IMAGE_BRUSH_SVG("Starship/Common/Event", Icon16x16));
+	Set("GraphEditor.CustomEvent_16x", new IMAGE_BRUSH_SVG("Starship/Common/Event", Icon16x16));
+	Set("GraphEditor.CallInEditorEvent_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/CallInEditorEvent", Icon16x16));
+	Set("GraphEditor.Timeline_16x", new IMAGE_BRUSH_SVG("Starship/Common/Timecode", Icon16x16));
+	Set("GraphEditor.Documentation_16x", new IMAGE_BRUSH_SVG("Starship/Common/Documentation", Icon16x16));
+	Set("GraphEditor.Switch_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Switch", Icon16x16));
+	Set("GraphEditor.BreakStruct_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/BreakStruct", Icon16x16));
+	Set("GraphEditor.MakeStruct_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/MakeStruct", Icon16x16));
+	Set("GraphEditor.Sequence_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Sequence", Icon16x16));
+	Set("GraphEditor.Branch_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Branch", Icon16x16));
+	Set("GraphEditor.SpawnActor_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/SpawnActor", Icon16x16));
+	Set("GraphEditor.PadEvent_16x", new IMAGE_BRUSH_SVG("Starship/Common/PlayerController", Icon16x16));
+	Set("GraphEditor.MouseEvent_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/MouseEvent", Icon16x16));
+	Set("GraphEditor.KeyEvent_16x", new IMAGE_BRUSH_SVG("Starship/Common/ViewportControls", Icon16x16));
+	Set("GraphEditor.TouchEvent_16x", new IMAGE_BRUSH_SVG("Starship/Common/TouchInterface", Icon16x16));
+	Set("GraphEditor.MakeArray_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/MakeArray", Icon16x16));
+	Set("GraphEditor.MakeSet_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/MakeSet", Icon16x16));
+	Set("GraphEditor.MakeMap_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/MakeMap", Icon16x16));
+	Set("GraphEditor.Enum_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Enum", Icon16x16));
+	Set("GraphEditor.Select_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Select", Icon16x16));
+	Set("GraphEditor.Cast_16x", new IMAGE_BRUSH_SVG("Starship/GraphEditors/Cast", Icon16x16));
+
+}
+
+void FStarshipSodaStyle::FStyle::SetupLevelSodaStyle()
+{
+	// Level editor tool bar icons
+
+	{
+		Set("MainFrame.ToggleFullscreen",           new IMAGE_BRUSH_SVG("Starship/Common/EnableFullscreen", Icon16x16));
+		Set("MainFrame.LoadLayout",                 new IMAGE_BRUSH_SVG("Starship/Common/LayoutLoad", Icon16x16));
+		Set("MainFrame.SaveLayout",                 new IMAGE_BRUSH_SVG("Starship/Common/LayoutSave", Icon16x16));
+		Set("MainFrame.RemoveLayout",               new IMAGE_BRUSH_SVG("Starship/Common/LayoutRemove", Icon16x16));
+
+		Set("MainFrame.OpenIssueTracker",           new IMAGE_BRUSH_SVG("Starship/Common/IssueTracker", Icon16x16));
+		Set("MainFrame.ReportABug",                 new IMAGE_BRUSH_SVG("Starship/Common/Bug", Icon16x16));
+
+		Set("SystemWideCommands.OpenDocumentation", new IMAGE_BRUSH_SVG("Starship/Common/Documentation", Icon16x16));
+		Set("MainFrame.DocumentationHome",	        new IMAGE_BRUSH_SVG("Starship/Common/Documentation", Icon16x16));
+		Set("MainFrame.BrowseAPIReference",         new IMAGE_BRUSH_SVG("Starship/Common/Documentation", Icon16x16));
+		Set("MainFrame.BrowseCVars",                new IMAGE_BRUSH_SVG("Starship/Common/Console", Icon16x16));
+		Set("MainFrame.VisitOnlineLearning",		new IMAGE_BRUSH_SVG("Starship/Common/Tutorials", Icon16x16));
+		Set("MainFrame.VisitForums",                new IMAGE_BRUSH_SVG("Starship/Common/Forums", Icon16x16));
+		Set("MainFrame.VisitSearchForAnswersPage",  new IMAGE_BRUSH_SVG("Starship/Common/QuestionAnswer", Icon16x16));
+		Set("MainFrame.VisitSupportWebSite",        new IMAGE_BRUSH_SVG("Starship/Common/Support", Icon16x16));
+		Set("MainFrame.CreditsUnrealEd",            new IMAGE_BRUSH_SVG("Starship/Common/Credits", Icon16x16));
+
+		Set("SodaViewport.SelectMode", new IMAGE_BRUSH_SVG("Starship/EditorViewport/select", Icon16x16) );
+		Set("SodaViewport.TranslateMode", new IMAGE_BRUSH_SVG( "Starship/EditorViewport/translate", Icon16x16 ) );
+		Set("SodaViewport.RotateMode", new IMAGE_BRUSH_SVG("Starship/EditorViewport/rotate", Icon16x16 ) );
+		Set("SodaViewport.ScaleMode", new IMAGE_BRUSH_SVG( "Starship/EditorViewport/scale", Icon16x16 ) );
+		Set("SodaViewport.TranslateRotateMode", new IMAGE_BRUSH_SVG("Starship/EditorViewport/TranslateRotate3D", Icon16x16 ) );
+		Set("SodaViewport.TranslateRotate2DMode", new IMAGE_BRUSH_SVG("Starship/EditorViewport/TranslateRotate2D", Icon16x16 ) );
+		Set("SodaViewport.ToggleRealTime", new IMAGE_BRUSH_SVG("Starship/Common/Realtime", Icon16x16));
+		Set("SodaViewport.LocationGridSnap", new IMAGE_BRUSH_SVG("Starship/EditorViewport/grid", Icon16x16));
+		Set("SodaViewport.RotationGridSnap", new IMAGE_BRUSH_SVG("Starship/EditorViewport/angle", Icon16x16));
+		Set("SodaViewport.ScaleGridSnap", new IMAGE_BRUSH_SVG( "Starship/EditorViewport/scale-grid-snap", Icon16x16 ) );
+		Set("SodaViewport.ToggleSurfaceSnapping", new IMAGE_BRUSH_SVG( "Starship/EditorViewport/surface-snap", Icon16x16 ) );
+		Set("SodaViewport.ToggleSurfaceSnapping", new IMAGE_BRUSH_SVG("Starship/EditorViewport/surface-snap", Icon16x16));
+		Set("SodaViewport.RelativeCoordinateSystem_World", new IMAGE_BRUSH_SVG( "Starship/EditorViewport/globe", Icon16x16 ) );
+		Set("SodaViewport.CamSpeedSetting", new IMAGE_BRUSH_SVG( "Starship/EditorViewport/camera", Icon16x16) );
+		Set("SodaViewport.LitMode",            	  new IMAGE_BRUSH_SVG("Starship/Common/LitCube", Icon16x16 ) );
+		Set("SodaViewport.UnlitMode",          	  new IMAGE_BRUSH_SVG("Starship/Common/UnlitCube", Icon16x16 ) );
+		Set("SodaViewport.WireframeMode",      	  new IMAGE_BRUSH_SVG("Starship/Common/BrushWireframe", Icon16x16 ) );
+		Set("SodaViewport.DetailLightingMode", 	  new IMAGE_BRUSH_SVG("Starship/Common/DetailLighting", Icon16x16 ) );
+		Set("SodaViewport.LightingOnlyMode",   	  new IMAGE_BRUSH_SVG("Starship/Common/LightBulb", Icon16x16 ) );
+		Set("SodaViewport.PathTracingMode",   	  new IMAGE_BRUSH_SVG("Starship/Common/PathTracing", Icon16x16 ) );
+		Set("SodaViewport.RayTracingDebugMode",    new IMAGE_BRUSH_SVG("Starship/Common/RayTracingDebug", Icon16x16 ) );
+		Set("SodaViewport.QuadOverdrawMode", new IMAGE_BRUSH_SVG("Starship/Common/OptimizationViewmodes", Icon16x16 ) );	
+		Set("SodaViewport.GroupLODColorationMode", new IMAGE_BRUSH_SVG("Starship/Common/LODColorization", Icon16x16) );
+		Set("SodaViewport.VisualizeGBufferMode",   new IMAGE_BRUSH_SVG("Starship/Common/BufferVisualization", Icon16x16) );
+		Set("SodaViewport.Visualizers", 			  new IMAGE_BRUSH_SVG("Starship/Common/Visualizer", Icon16x16) );
+		Set("SodaViewport.LOD", 			  		  new IMAGE_BRUSH_SVG("Starship/Common/LOD", Icon16x16) );
+		Set("SodaViewport.ReflectionOverrideMode", new IMAGE_BRUSH_SVG("Starship/Common/Reflections", Icon16x16 ) );
+		Set("SodaViewport.VisualizeBufferMode",    new IMAGE_BRUSH_SVG("Starship/Common/BufferVisualization", Icon16x16 ) );
+		Set("SodaViewport.VisualizeNaniteMode",    new IMAGE_BRUSH_SVG("Starship/Common/BufferVisualization", Icon16x16 ) );
+		Set("SodaViewport.VisualizeLumenMode",    new IMAGE_BRUSH_SVG("Starship/Common/BufferVisualization", Icon16x16 ) );
+		Set("SodaViewport.VisualizeVirtualShadowMapMode", new IMAGE_BRUSH_SVG("Starship/Common/BufferVisualization", Icon16x16 ) );
+		Set("SodaViewport.CollisionPawn",          new IMAGE_BRUSH_SVG("Starship/Common/PlayerCollision", Icon16x16 ) );
+		Set("SodaViewport.CollisionVisibility",    new IMAGE_BRUSH_SVG("Starship/Common/VisibilityCollision", Icon16x16 ) );
+		Set("SodaViewport.Perspective",      new IMAGE_BRUSH_SVG("Starship/Common/ViewPerspective", Icon16x16 ) );
+		Set("SodaViewport.OrthographicFree", new IMAGE_BRUSH_SVG("Starship/Common/ViewPerspective", Icon16x16));
+		Set("SodaViewport.Top",         new IMAGE_BRUSH_SVG("Starship/Common/ViewTop", Icon16x16 ) );
+		Set("SodaViewport.Left",        new IMAGE_BRUSH_SVG("Starship/Common/ViewLeft", Icon16x16 ) );
+		Set("SodaViewport.Front",       new IMAGE_BRUSH_SVG("Starship/Common/ViewFront", Icon16x16 ) );
+		Set("SodaViewport.Bottom",      new IMAGE_BRUSH_SVG("Starship/Common/ViewBottom", Icon16x16 ) );
+		Set("SodaViewport.Right",       new IMAGE_BRUSH_SVG("Starship/Common/ViewRight", Icon16x16 ) );
+		Set("SodaViewport.Back",        new IMAGE_BRUSH_SVG("Starship/Common/ViewBack", Icon16x16 ) );
+		Set("SodaViewport.ToggleStats", new IMAGE_BRUSH_SVG("Starship/Common/Statistics", Icon16x16)); 
+		Set("SodaViewport.ToggleFPS", new IMAGE_BRUSH_SVG("Starship/Common/FPS", Icon16x16));
+		Set("SodaViewport.ToggleVehiclePanel", new IMAGE_BRUSH_SVG("Starship/Common/Debug", Icon16x16));
+		Set("SodaViewport.ToggleFullScreen", new IMAGE_BRUSH_SVG("Starship/Common/Screen", Icon16x16));
+		Set("SodaViewport.ToggleViewportToolbar", new IMAGE_BRUSH_SVG("Starship/Common/Toolbar", Icon16x16));
+		Set("SodaViewport.RestartLevel", new IMAGE_BRUSH_SVG("Starship/Common/Update", Icon16x16));
+		Set("SodaViewport.ClearLevel", new CORE_IMAGE_BRUSH_SVG("Starship/Common/file", Icon16x16));
+		Set("SodaViewport.SubMenu.Stats", new IMAGE_BRUSH_SVG("Starship/Common/Statistics", Icon16x16));
+		Set("SodaViewport.SubMenu.Bookmarks", new IMAGE_BRUSH_SVG("Starship/Common/Bookmarks", Icon16x16));
+		Set("SodaViewport.SubMenu.CreateCamera", new IMAGE_BRUSH_SVG("Starship/Common/CreateCamera", Icon16x16));
+		Set("SodaViewport.SubMenu.Layouts", new IMAGE_BRUSH_SVG("Starship/Common/Layout", Icon16x16));
+		Set("SodaViewport.RecordDataset", new CORE_IMAGE_BRUSH_SVG("Starship/Common/file", Icon16x16));
+		Set("SodaViewport.AutoConnectDB", new CORE_IMAGE_BRUSH_SVG("Starship/Insights/Connection", Icon16x16));
+		Set("SodaViewport.TagActors", new IMAGE_BRUSH_SVG("SodaIcons/hive", Icon16x16));
+		Set("SodaViewport.ActiveBorderColor", FStyleColors::Primary);
+		Set("SodaViewport.ToggleSpectatorMode", new IMAGE_BRUSH_SVG("Starship/Common/Visibility", Icon16x16));
+		Set("SodaViewport.PossesNextVehicle", new IMAGE_BRUSH_SVG("SodaIcons/car", Icon16x16));
+		Set("SodaViewport.Exit", new IMAGE_BRUSH_SVG("Starship/Common/Exit", Icon16x16));
+		
+
+		Set( "ToolPalette.DockingTab", FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetPadding( FMargin(16.0f, 2.0f, 16.0f, 2.0f ) )
+			.SetCheckedImage(         CORE_BOX_BRUSH("Docking/Tab_Shape",  2.f/8.0f, FLinearColor(FColor(62, 62, 62)) ) )
+			.SetCheckedHoveredImage(  CORE_BOX_BRUSH("Docking/Tab_Shape",  2.f/8.0f, FLinearColor(FColor(62, 62, 62)) ) )
+			.SetCheckedPressedImage(  CORE_BOX_BRUSH("Docking/Tab_Shape",  2.f/8.0f, FLinearColor(FColor(62, 62, 62)) ) )
+			.SetUncheckedImage(       CORE_BOX_BRUSH("Docking/Tab_Shape",  2.f/8.0f, FLinearColor(FColor(45, 45, 45)) ) )
+			.SetUncheckedHoveredImage(CORE_BOX_BRUSH("Docking/Tab_Shape",2.f/8.0f, FLinearColor(FColor(54, 54, 54)) ) )
+			.SetUncheckedPressedImage(CORE_BOX_BRUSH("Docking/Tab_Shape",2.f/8.0f, FLinearColor(FColor(54, 54, 54)) ) )
+			.SetUndeterminedImage(        FSlateNoResource() )
+			.SetUndeterminedHoveredImage( FSlateNoResource() )
+			.SetUndeterminedPressedImage( FSlateNoResource() )
+		);	
+		Set( "ToolPalette.DockingWell", new FSlateColorBrush(FLinearColor(FColor(34, 34, 34, 255))));
+
+		Set( "ToolPalette.DockingLabel", FTextBlockStyle(NormalText)
+			.SetFont( DEFAULT_FONT( "Regular", 9 ) ) 
+			.SetShadowOffset(FVector2D(1, 1))
+			.SetShadowColorAndOpacity(FLinearColor(0, 0, 0, 0.9f))
+		);
+
+		// Top level Actors Menu
+		Set( "Actors.Attach", new IMAGE_BRUSH_SVG("Starship/Actors/attach", Icon16x16));
+		Set( "Actors.Detach", new IMAGE_BRUSH_SVG("Starship/Actors/detach", Icon16x16));
+		Set( "Actors.TakeRecorder", new IMAGE_BRUSH_SVG("Starship/Actors/take-recorder", Icon16x16));
+		Set( "Actors.GoHere", new IMAGE_BRUSH_SVG("Starship/Actors/go-here", Icon16x16));
+		Set( "Actors.SnapViewToObject", new IMAGE_BRUSH_SVG("Starship/Actors/snap-view-to-object", Icon16x16));
+		Set( "Actors.SnapObjectToView", new IMAGE_BRUSH_SVG("Starship/Actors/snap-object-to-view", Icon16x16));
+		Set( "Actors.ScripterActorActions", new IMAGE_BRUSH_SVG("Starship/Actors/scripted-actor-actions", Icon16x16));
+	}
+
+	{
+		Set( "AssetDeleteDialog.Background", new IMAGE_BRUSH( "Common/Selection", Icon8x8, FLinearColor( 0.016, 0.016, 0.016 ) ) );
+	}
+
+	{
+
+		Set( "SodaLevelViewport.DebugBorder", new BOX_BRUSH( "Old/Window/ViewportDebugBorder", 0.8f, FLinearColor(.7,0,0,.5) ) );
+		Set( "SodaLevelViewport.BlackBackground", new FSlateColorBrush( FLinearColor::Black ) ); 
+		Set( "SodaLevelViewport.StartingPlayInEditorBorder", new BOX_BRUSH( "Old/Window/ViewportDebugBorder", 0.8f, FLinearColor(0.1f,1.0f,0.1f,1.0f) ) );
+		Set( "SodaLevelViewport.StartingSimulateBorder", new BOX_BRUSH( "Old/Window/ViewportDebugBorder", 0.8f, FLinearColor(1.0f,1.0f,0.1f,1.0f) ) );
+		Set( "SodaLevelViewport.NonMaximizedBorder", new BORDER_BRUSH("Common/PlainBorder", 2.f / 8.f, FStyleColors::Black));
+		Set( "SodaLevelViewport.ReturningToEditorBorder", new BOX_BRUSH( "Old/Window/ViewportDebugBorder", 0.8f, FLinearColor(0.1f,0.1f,1.0f,1.0f) ) );
+
+		Set( "LevelViewportContextMenu.ActorType.Text", FTextBlockStyle(NormalText)
+			.SetFont( DEFAULT_FONT( "Regular", 7 ) )
+			.SetColorAndOpacity( FSlateColor::UseSubduedForeground() ) );
+
+		Set( "LevelViewportContextMenu.AssetLabel.Text", FTextBlockStyle(NormalText)
+			.SetFont( DEFAULT_FONT( "Regular", 9 ) )
+			.SetColorAndOpacity( FSlateColor::UseForeground() ) );
+
+		Set( "LevelViewportContextMenu.AssetTileItem.ThumbnailAreaBackground", new FSlateRoundedBoxBrush(FStyleColors::Recessed, 4.0f) );
+		
+		FLinearColor TransparentRecessed = FStyleColors::Recessed.GetSpecifiedColor();
+		TransparentRecessed.A = 0.3f;
+		Set( "LevelViewportContextMenu.AssetTileItem.NameAreaBackground", new FSlateRoundedBoxBrush(TransparentRecessed, 4.0f) );
+
+		Set( "SodaLevelViewport.CursorIcon", new IMAGE_BRUSH( "Common/Cursor", Icon16x16 ) );
+	}
+
+	// Show flags menus
+	{
+		Set( "ShowFlagsMenu.AntiAliasing", new IMAGE_BRUSH_SVG( "Starship/Common/AntiAliasing", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Atmosphere", new IMAGE_BRUSH_SVG( "Starship/Common/Atmosphere", Icon16x16 ) );
+		Set( "ShowFlagsMenu.BSP", new IMAGE_BRUSH_SVG( "Starship/Common/BSP", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Collision", new IMAGE_BRUSH_SVG( "Starship/Common/Collision", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Decals", new IMAGE_BRUSH_SVG( "Starship/Common/Decals", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Fog", new IMAGE_BRUSH_SVG( "Starship/Common/Fog", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Grid", new IMAGE_BRUSH_SVG( "Starship/Common/Grid", Icon16x16 ) );
+		Set( "ShowFlagsMenu.MediaPlanes", new IMAGE_BRUSH_SVG( "Starship/Common/MediaPlanes", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Navigation", new IMAGE_BRUSH_SVG( "Starship/Common/Navigation", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Particles", new IMAGE_BRUSH_SVG( "Starship/Common/ParticleSprites", Icon16x16 ) );
+		Set( "ShowFlagsMenu.SkeletalMeshes", new IMAGE_BRUSH_SVG( "Starship/Common/SkeletalMesh", Icon16x16 ) );
+		Set( "ShowFlagsMenu.StaticMeshes", new IMAGE_BRUSH_SVG( "Starship/Common/StaticMesh", Icon16x16 ) );
+		Set( "ShowFlagsMenu.Translucency", new IMAGE_BRUSH_SVG( "Starship/Common/Transparency", Icon16x16 ) );
+		Set( "ShowFlagsMenu.WidgetComponents", new IMAGE_BRUSH_SVG( "Starship/Common/WidgetComponents", Icon16x16 ) );
+
+		Set("ShowFlagsMenu.SubMenu.PostProcessing", new IMAGE_BRUSH_SVG("Starship/Common/PostProcessing", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.LightTypes", new IMAGE_BRUSH_SVG("Starship/Common/LightTypes", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.LightingComponents", new IMAGE_BRUSH_SVG("Starship/Common/LightingComponents", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.LightingFeatures", new IMAGE_BRUSH_SVG("Starship/Common/LightingFeatures", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.Lumen", new IMAGE_BRUSH_SVG("Starship/Common/LightingFeatures", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.Developer", new IMAGE_BRUSH_SVG("Starship/Common/Developer", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.Visualize", new IMAGE_BRUSH_SVG("Starship/Common/Visualize", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.Advanced", new IMAGE_BRUSH_SVG("Starship/Common/Advanced", Icon16x16));
+
+		Set("ShowFlagsMenu.SubMenu.Volumes", new IMAGE_BRUSH_SVG("Starship/Common/Volume", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.Layers", new IMAGE_BRUSH_SVG("Starship/Common/Layers", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.FoliageTypes", new IMAGE_BRUSH_SVG("Starship/Common/FoliageTypes", Icon16x16));
+		Set("ShowFlagsMenu.SubMenu.Sprites", new IMAGE_BRUSH_SVG("Starship/Common/Sprite", Icon16x16));
+	}
+
+
+	// Mobility Icons
+	{
+		Set("Mobility.Movable", new IMAGE_BRUSH("/Icons/Mobility/Movable_16x", Icon16x16));
+		Set("Mobility.Stationary", new IMAGE_BRUSH("/Icons/Mobility/Adjustable_16x", Icon16x16));
+		Set("Mobility.Static", new IMAGE_BRUSH("/Icons/Mobility/Static_16x", Icon16x16));
+
+		const FString SmallRoundedButton(TEXT("Common/SmallRoundedToggle"));
+		const FString SmallRoundedButtonStart(TEXT("Common/SmallRoundedToggleLeft"));
+		const FString SmallRoundedButtonMiddle(TEXT("Common/SmallRoundedToggleCenter"));
+		const FString SmallRoundedButtonEnd(TEXT("Common/SmallRoundedToggleRight"));
+
+		const FLinearColor NormalColor(0.15, 0.15, 0.15, 1);
+
+		Set("Property.ToggleButton", FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage(BOX_BRUSH(*SmallRoundedButton, FMargin(7.f / 16.f), NormalColor))
+			.SetUncheckedPressedImage(BOX_BRUSH(*SmallRoundedButton, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetUncheckedHoveredImage(BOX_BRUSH(*SmallRoundedButton, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetCheckedHoveredImage(BOX_BRUSH(*SmallRoundedButton, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedPressedImage(BOX_BRUSH(*SmallRoundedButton, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedImage(BOX_BRUSH(*SmallRoundedButton, FMargin(7.f / 16.f), SelectionColor)));
+
+		Set("Property.ToggleButton.Start", FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage(BOX_BRUSH(*SmallRoundedButtonStart, FMargin(7.f / 16.f), NormalColor))
+			.SetUncheckedPressedImage(BOX_BRUSH(*SmallRoundedButtonStart, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetUncheckedHoveredImage(BOX_BRUSH(*SmallRoundedButtonStart, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetCheckedHoveredImage(BOX_BRUSH(*SmallRoundedButtonStart, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedPressedImage(BOX_BRUSH(*SmallRoundedButtonStart, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedImage(BOX_BRUSH(*SmallRoundedButtonStart, FMargin(7.f / 16.f), SelectionColor)));
+
+		Set("Property.ToggleButton.Middle", FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage(BOX_BRUSH(*SmallRoundedButtonMiddle, FMargin(7.f / 16.f), NormalColor))
+			.SetUncheckedPressedImage(BOX_BRUSH(*SmallRoundedButtonMiddle, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetUncheckedHoveredImage(BOX_BRUSH(*SmallRoundedButtonMiddle, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetCheckedHoveredImage(BOX_BRUSH(*SmallRoundedButtonMiddle, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedPressedImage(BOX_BRUSH(*SmallRoundedButtonMiddle, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedImage(BOX_BRUSH(*SmallRoundedButtonMiddle, FMargin(7.f / 16.f), SelectionColor)));
+
+		Set("Property.ToggleButton.End", FCheckBoxStyle()
+			.SetCheckBoxType(ESlateCheckBoxType::ToggleButton)
+			.SetUncheckedImage(BOX_BRUSH(*SmallRoundedButtonEnd, FMargin(7.f / 16.f), NormalColor))
+			.SetUncheckedPressedImage(BOX_BRUSH(*SmallRoundedButtonEnd, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetUncheckedHoveredImage(BOX_BRUSH(*SmallRoundedButtonEnd, FMargin(7.f / 16.f), SelectionColor_Pressed))
+			.SetCheckedHoveredImage(BOX_BRUSH(*SmallRoundedButtonEnd, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedPressedImage(BOX_BRUSH(*SmallRoundedButtonEnd, FMargin(7.f / 16.f), SelectionColor))
+			.SetCheckedImage(BOX_BRUSH(*SmallRoundedButtonEnd, FMargin(7.f / 16.f), SelectionColor)));
+	}
+
+}
+
+void FStarshipSodaStyle::FStyle::SetupPersonaStyle()
+{
+
+
+	// Play in editor / play in world
+	{
+		// Leftmost button for backplate style toolbar buttons
+		FToolBarStyle MainToolbarLeftButton = FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FToolBarStyle>("AssetEditorToolbar");
+
+		const FButtonStyle LeftToolbarButton = FButtonStyle(MainToolbarLeftButton.ButtonStyle)
+			.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(4.0f, 0.0f, 0.0f, 4.0f)))
+			.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(4.0f, 0.0f, 0.0f, 4.0f)))
+			.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(4.0f, 0.0f, 0.0f, 4.0f)))
+			.SetDisabled(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(4.0f, 0.0f, 0.0f, 4.0f)))
+			.SetNormalPadding(FMargin(8.f, 2.f, 6.f, 2.f))
+			.SetPressedPadding(FMargin(8.f, 2.f, 6.f, 2.f));
+
+
+		MainToolbarLeftButton.SetButtonStyle(LeftToolbarButton);
+		MainToolbarLeftButton.SetButtonPadding(FMargin(10.f, 0.0f, 0.0f, 0.0f));
+		MainToolbarLeftButton.SetSeparatorPadding(FMargin(0.f, 0.f, 8.f, 0.f));
+
+		Set("Toolbar.BackplateLeft", MainToolbarLeftButton);
+
+		// Specialized Play Button (Left button with green color)
+		FLinearColor GreenHSV = FStyleColors::AccentGreen.GetSpecifiedColor().LinearRGBToHSV();
+		FLinearColor GreenHover = FLinearColor(GreenHSV.R, GreenHSV.G * .5, GreenHSV.B, GreenHSV.A).HSVToLinearRGB();
+		FLinearColor GreenPress = FLinearColor(GreenHSV.R, GreenHSV.G, GreenHSV.B*.5, GreenHSV.A).HSVToLinearRGB(); 
+
+		FToolBarStyle MainToolbarPlayButton = MainToolbarLeftButton;
+
+		const FButtonStyle PlayToolbarButton = FButtonStyle(MainToolbarPlayButton.ButtonStyle)
+			.SetNormalForeground(FStyleColors::AccentGreen)
+			.SetPressedForeground(GreenPress)
+			.SetHoveredForeground(GreenHover);
+
+		MainToolbarPlayButton.SetButtonStyle(PlayToolbarButton);
+
+		Set("Toolbar.BackplateLeftPlay", MainToolbarPlayButton);
+
+		// Center Buttons for backplate style toolbar buttons
+		FToolBarStyle MainToolbarCenterButton = MainToolbarLeftButton;
+
+		const FButtonStyle CenterToolbarButton = FButtonStyle(MainToolbarCenterButton.ButtonStyle)
+			.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 0.0f, 0.0f, 0.0f)))
+			.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 0.0f, 0.0f, 0.0f)))
+			.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 0.0f, 0.0f, 0.0f)))
+			.SetDisabled(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 0.0f, 0.0f, 0.0f)))
+			.SetNormalPadding(FMargin(2.f, 2.f, 6.f, 2.f))
+			.SetPressedPadding(FMargin(2.f, 2.f, 6.f, 2.f));
+
+		MainToolbarCenterButton.SetButtonPadding(0.0f);
+		MainToolbarCenterButton.SetButtonStyle(CenterToolbarButton);
+
+		Set("Toolbar.BackplateCenter", MainToolbarCenterButton);
+
+		// Specialized Stop Button (Center button + Red color)
+
+		FLinearColor RedHSV = FStyleColors::AccentRed.GetSpecifiedColor().LinearRGBToHSV();
+
+		FLinearColor RedHover = FLinearColor(RedHSV.R, RedHSV.G * .5, RedHSV.B, RedHSV.A).HSVToLinearRGB();
+		FLinearColor RedPress = FLinearColor(RedHSV.R, RedHSV.G, RedHSV.B * .5, RedHSV.A).HSVToLinearRGB();
+
+		FToolBarStyle MainToolbarStopButton = MainToolbarCenterButton;
+
+		const FButtonStyle StopToolbarButton = FButtonStyle(MainToolbarStopButton.ButtonStyle)
+			.SetNormalForeground(FStyleColors::AccentRed)
+			.SetPressedForeground(RedPress)
+			.SetHoveredForeground(RedHover);
+
+		MainToolbarStopButton.SetButtonStyle(StopToolbarButton);
+
+		Set("Toolbar.BackplateCenterStop", MainToolbarStopButton);
+
+		// Rightmost button for backplate style toolbar buttons
+		FToolBarStyle MainToolbarRightButton = MainToolbarLeftButton;
+
+		const FButtonStyle RightToolbarButton = FButtonStyle(MainToolbarRightButton.ButtonStyle)
+			.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetDisabled(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetNormalPadding(FMargin(2.f, 2.f, 8.f, 2.f))
+			.SetPressedPadding(FMargin(2.f, 2.f, 8.f, 2.f));
+
+		MainToolbarRightButton.SetButtonStyle(RightToolbarButton);
+		MainToolbarRightButton.SetButtonPadding(FMargin(0.0f, 0.0f, 4.0f, 0.0f));
+		MainToolbarRightButton.SetSeparatorPadding(FMargin(4.f, -5.f, 8.f, -5.f));
+
+		Set("Toolbar.BackplateRight", MainToolbarRightButton);
+
+		// Rightmost button for backplate style toolbar buttons as a combo button
+		FToolBarStyle MainToolbarRightComboButton = MainToolbarLeftButton;
+
+		const FButtonStyle RightToolbarComboButton = FButtonStyle(MainToolbarRightComboButton.ButtonStyle)
+			.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetDisabled(FSlateRoundedBoxBrush(FStyleColors::Dropdown, FVector4(0.0f, 4.0f, 4.0f, 0.0f)))
+			.SetNormalPadding(FMargin(7.f, 2.f, 6.f, 2.f))
+			.SetPressedPadding(FMargin(7.f, 2.f, 6.f, 2.f));
+
+		FComboButtonStyle PlayToolbarComboButton = FComboButtonStyle(FStarshipCoreStyle::GetCoreStyle().GetWidgetStyle<FComboButtonStyle>("ComboButton"))
+			.SetDownArrowPadding(FMargin(-19.f, 0.f, 2.f, 0.f))
+			.SetDownArrowImage(CORE_IMAGE_BRUSH_SVG("Starship/Common/ellipsis-vertical-narrow", FVector2D(6, 24)));
+		PlayToolbarComboButton.ButtonStyle = RightToolbarComboButton;
+
+		MainToolbarRightComboButton.SetButtonStyle(RightToolbarComboButton);
+		MainToolbarRightComboButton.SetComboButtonStyle(PlayToolbarComboButton);
+		MainToolbarRightComboButton.SetSeparatorPadding(FMargin(8.f, 0.f, 8.f, 0.f));
+		MainToolbarRightComboButton.SetComboButtonPadding(FMargin(1.0f, 0.0f, 8.0f, 0.0f));
+
+		Set("Toolbar.BackplateRightCombo", MainToolbarRightComboButton);
+
+	}
+
+	
+	// Property Access 
+	{
+		Set("PropertyAccess.CompiledContext.Text", FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Italic", 8))
+			.SetColorAndOpacity(FLinearColor(218.0f/255.0f,218.0f/255.0f,96.0f/255.0f, 0.5f))
+		);
+
+		Set("PropertyAccess.CompiledContext.Border", new FSlateRoundedBoxBrush(FStyleColors::DropdownOutline, 2.0f));
+	}
+
+	Set("SodaVehicleBar.Save", new IMAGE_BRUSH_SVG("Starship/Common/SaveCurrent", Icon20x20));
+	Set("SodaVehicleBar.Export", new CORE_IMAGE_BRUSH_SVG("Starship/Common/export_20", Icon20x20));
+	Set("SodaVehicleBar.Import", new CORE_IMAGE_BRUSH_SVG("Starship/Common/import_20", Icon20x20));
+	Set("SodaVehicleBar.Components", new IMAGE_BRUSH_SVG("Starship/Common/WorldOutliner", Icon20x20));
+	Set("SodaVehicleBar.Reset", new IMAGE_BRUSH_SVG("Starship/Common/Update", Icon20x20));
+}
+
+void FStarshipSodaStyle::FStyle::SetupClassIconsAndThumbnails()
+{
+	// Actor Classes Outliner
+	{
+
+		struct FClassIconInfo
+		{
+			FClassIconInfo(const TCHAR* InType, bool bInHas64Size = true)
+				: Type(InType)
+				, bHas64Size(bInHas64Size)
+			{}
+
+			const TCHAR* Type;
+			bool bHas64Size;
+		};
+
+		Set("ClassIcon.Light", new IMAGE_BRUSH("Icons/ActorIcons/LightActor_16x", Icon16x16));
+		Set("ClassIcon.BrushAdditive", new IMAGE_BRUSH("Icons/ActorIcons/Brush_Add_16x", Icon16x16));
+		Set("ClassIcon.BrushSubtractive", new IMAGE_BRUSH("Icons/ActorIcons/Brush_Subtract_16x", Icon16x16));
+		Set("ClassIcon.Deleted", new IMAGE_BRUSH("Icons/ActorIcons/DeletedActor_16px", Icon16x16));
+
+		// Component classes
+	
+		Set("ClassIcon.BlueprintCore", new IMAGE_BRUSH("Icons/AssetIcons/Blueprint_16x", Icon16x16));
+		Set("ClassIcon.LightComponent", new IMAGE_BRUSH("Icons/ActorIcons/LightActor_16x", Icon16x16));
+		Set("ClassIcon.ArrowComponent", new IMAGE_BRUSH("Icons/ActorIcons/Arrow_16px", Icon16x16));
+		Set("ClassIcon.MaterialBillboardComponent", new IMAGE_BRUSH("Icons/ActorIcons/MaterialSprite_16px", Icon16x16));
+		Set("ClassIcon.BillboardComponent", new IMAGE_BRUSH("Icons/ActorIcons/SpriteComponent_16px", Icon16x16));
+		Set("ClassIcon.TimelineComponent", new IMAGE_BRUSH("Icons/ActorIcons/TimelineComponent_16px", Icon16x16));
+		Set("ClassIcon.ChildActorComponent", new IMAGE_BRUSH("Icons/ActorIcons/ChildActorComponent_16px", Icon16x16));
+
+		Set("ClassIcon.AudioComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/Audio_16", Icon16x16));
+		Set("ClassIcon.BoxComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/BoxCollision_16", Icon16x16));
+		Set("ClassIcon.CapsuleComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/CapsuleCollision_16", Icon16x16));
+		Set("ClassIcon.SphereComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/SphereCollision_16", Icon16x16));
+		Set("ClassIcon.SplineComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/Spline_16", Icon16x16));
+
+		Set("ClassIcon.AtmosphericFogComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/AtmosphericFog_16", Icon16x16));
+		Set("ClassIcon.BrushComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/Brush_16", Icon16x16));
+		Set("ClassIcon.CableComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/CableActor_16", Icon16x16));
+		Set("ClassIcon.CameraComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/CameraActor_16", Icon16x16));
+		Set("ClassIcon.DecalComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/DecalActor_16", Icon16x16));
+		Set("ClassIcon.DirectionalLightComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/DirectionalLight_16", Icon16x16));
+		Set("ClassIcon.ExponentialHeightFogComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/ExponentialHeightFog_16", Icon16x16));
+		Set("ClassIcon.ForceFeedbackComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/ForceFeedbackEffect_16", Icon16x16));
+		Set("ClassIcon.ParticleSystemComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/Emitter_16", Icon16x16));
+		Set("ClassIcon.PlanarReflectionComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/PlanarReflectionCapture_16", Icon16x16));
+		Set("ClassIcon.PointLightComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/PointLight_16", Icon16x16));
+		Set("ClassIcon.RectLightComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/RectLight_16", Icon16x16));
+		Set("ClassIcon.RadialForceComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/RadialForceActor_16", Icon16x16));
+		Set("ClassIcon.SceneCaptureComponent2D", new IMAGE_BRUSH_SVG("Starship/AssetIcons/SceneCapture2D_16", Icon16x16));
+		Set("ClassIcon.SceneCaptureComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/SphereReflectionCapture_16", Icon16x16));
+		Set("ClassIcon.SingleAnimSkeletalComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/SkeletalMesh_16", Icon16x16));
+		Set("ClassIcon.SkyAtmosphereComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/SkyAtmosphere_16", Icon16x16));
+		Set("ClassIcon.SkeletalMeshComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/SkeletalMesh_16", Icon16x16));
+		Set("ClassIcon.SpotLightComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/SpotLight_16", Icon16x16));
+		Set("ClassIcon.StaticMeshComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/StaticMesh_16", Icon16x16));
+		Set("ClassIcon.TextRenderComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/TextRenderActor_16", Icon16x16));
+		Set("ClassIcon.VectorFieldComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/VectorFieldVolume_16", Icon16x16));
+		Set("ClassIcon.VolumetricCloudComponent", new IMAGE_BRUSH_SVG("Starship/AssetIcons/VolumetricCloud_16", Icon16x16));
+
+		Set("ClassIcon.MovableMobilityIcon", new IMAGE_BRUSH("Icons/ActorIcons/Light_Movable_16x", Icon16x16));
+		Set("ClassIcon.StationaryMobilityIcon", new IMAGE_BRUSH("Icons/ActorIcons/Light_Adjustable_16x", Icon16x16));
+		Set("ClassIcon.ComponentMobilityHeaderIcon", new IMAGE_BRUSH("Icons/ActorIcons/ComponentMobilityHeader_7x16", Icon7x16));
+
+		// Asset Type Classes
+		const TCHAR* AssetTypes[] = {
+
+			TEXT("AbilitySystemComponent"),
+			TEXT("AIPerceptionComponent"),
+			TEXT("CameraAnim"),
+			TEXT("Default"),
+			TEXT("DirectionalLightMovable"),
+			TEXT("DirectionalLightStatic"),
+			TEXT("DirectionalLightStationary"),
+			TEXT("FontFace"),
+			TEXT("ForceFeedbackEffect"),
+			TEXT("InterpData"),
+			TEXT("LevelSequence"),
+			TEXT("LightmassCharacterIndirectDetailVolume"),
+			TEXT("MassiveLODOverrideVolume"),
+			TEXT("MaterialParameterCollection"),
+			TEXT("MultiFont"),
+			TEXT("ParticleSystem"),
+			TEXT("PhysicsConstraintComponent"),
+			TEXT("PhysicsThrusterComponent"),
+			TEXT("SkyLightComponent"),
+			TEXT("SlateWidgetStyleAsset"),
+			TEXT("StringTable"),
+			TEXT("SpotLightMovable"),
+			TEXT("SpotLightStatic"),
+			TEXT("SpotLightStationary"),
+			TEXT("Cube"),
+			TEXT("Sphere"),
+			TEXT("Cylinder"),
+			TEXT("Cone"),
+			TEXT("Plane"),
+		};
+
+		for (int32 TypeIndex = 0; TypeIndex < UE_ARRAY_COUNT(AssetTypes); ++TypeIndex)
+		{
+			const TCHAR* Type = AssetTypes[TypeIndex];
+			Set( *FString::Printf(TEXT("ClassIcon.%s"), Type),		new IMAGE_BRUSH(FString::Printf(TEXT("Icons/AssetIcons/%s_%dx"), Type, 16), Icon16x16 ) );
+		}
+
+		const FClassIconInfo AssetTypesSVG[] = {
+			{TEXT("Actor")},
+			{TEXT("ActorComponent")},
+			{TEXT("AIController")},
+			{TEXT("AimOffsetBlendSpace")},
+			{TEXT("AimOffsetBlendSpace1D")},
+			{TEXT("AmbientSound")},
+			{TEXT("AnimationModifier")},
+			{TEXT("AnimationSharingSetup")},
+			{TEXT("AnimBlueprint")},
+			{TEXT("AnimComposite")},
+			{TEXT("AnimInstance")},
+			{TEXT("AnimLayerInterface")},
+			{TEXT("AnimMontage")},
+			{TEXT("AnimSequence")},
+			{TEXT("ApplicationLifecycleComponent")},
+			{TEXT("AtmosphericFog")},
+			{TEXT("AudioVolume")},
+			{TEXT("BehaviorTree")},
+			{TEXT("BlackboardData")},
+			{TEXT("BlendSpace")},
+			{TEXT("BlendSpace1D")},
+			{TEXT("BlockingVolume")},
+			{TEXT("Blueprint")},
+			{TEXT("BlueprintFunctionLibrary")},
+			{TEXT("BlueprintGeneratedClass")},
+			{TEXT("BlueprintInterface")},
+			{TEXT("BlueprintMacroLibrary")},
+			{TEXT("BoxReflectionCapture")},
+			{TEXT("Brush")},
+			{TEXT("ButtonStyleAsset")},
+			{TEXT("CableActor")},
+			{TEXT("CameraActor")},
+			{TEXT("CameraBlockingVolume")},
+			{TEXT("CameraRig_Crane")},
+			{TEXT("CameraRig_Rail")},
+			{TEXT("Character")},
+			{TEXT("CharacterMovementComponent")},
+			{TEXT("CineCameraActor")},
+			{TEXT("Class")},
+			{TEXT("CompositingElement")},
+			{TEXT("CullDistanceVolume")},
+			{TEXT("CurveBase")},
+			{TEXT("DataAsset")},
+			{TEXT("DataTable")},
+			{TEXT("DecalActor")},
+			{TEXT("DefaultPawn")},
+			{TEXT("DialogueVoice")},
+			{TEXT("DialogueWave")},
+			{TEXT("DirectionalLight")},
+			{TEXT("DocumentationActor")},
+			{TEXT("EditorTutorial")},
+			{TEXT("EnvQuery")},
+			{TEXT("Emitter")},
+			{TEXT("EmptyActor")},
+			{TEXT("ExponentialHeightFog")},
+			{TEXT("FileMediaOutput")},
+			{TEXT("FileMediaSource")},
+			{TEXT("FoliageType_Actor")},
+			{TEXT("Font")},
+			{TEXT("ForceFeedback")},
+			{TEXT("GameModeBase")},
+			{TEXT("GameStateBase")},
+			{TEXT("GeometryCollection")},
+			{TEXT("GroupActor")},
+			{TEXT("HierarchicalInstancedStaticMeshComponent")},
+			{TEXT("HUD")},
+			{TEXT("ImagePlate")},
+			{TEXT("InstancedStaticMeshComponent")},
+			{TEXT("Interface")},
+			{TEXT("KillZVolume")},
+			{TEXT("LevelBounds")},
+			{TEXT("LevelInstance")},
+			{TEXT("LevelInstancePivot")},
+			{TEXT("PackedLevelActor")},
+			{TEXT("LevelScriptActor")},
+			{TEXT("LevelSequenceActor")},
+			{TEXT("LevelStreamingVolume")},
+			{TEXT("LightmassCharacterDetailIndirectVolume")},
+			{TEXT("LightmassImportanceVolume")},
+			{TEXT("LightmassVolume")},
+			{TEXT("LiveLinkPreset")},
+			{TEXT("Material")},
+			{TEXT("MaterialFunction")},
+			{TEXT("MaterialInstanceActor")},
+			{TEXT("MaterialInstanceConstant")},
+			{TEXT("MediaPlayer")},
+			{TEXT("MediaTexture")},
+			{TEXT("MirrorDataTable")},
+			{TEXT("ModularSynthPresetBank")},
+			{TEXT("NavLink")},
+			{TEXT("NavLinkProxy")},
+			{TEXT("NavMeshBoundsVolume")},
+			{TEXT("NavModifierComponent")},
+			{TEXT("NavModifierVolume")},
+			{TEXT("Note")},
+			{TEXT("Object")},
+			{TEXT("ObjectLibrary")},
+			{TEXT("PainCausingVolume")},
+			{TEXT("Pawn")},
+			{TEXT("PawnNoiseEmitterComponent")},
+			{TEXT("PawnSensingComponent")},
+			{TEXT("PhysicalMaterial")},
+			{TEXT("PhysicsAsset")},
+			{TEXT("PhysicsConstraintActor")},
+			{TEXT("PhysicsHandleComponent")},
+			{TEXT("PhysicsThruster")},
+			{TEXT("PhysicsVolume")},
+			{TEXT("PlanarReflectionCapture")},
+			{TEXT("PlatformMediaSource")},
+			{TEXT("PlayerController")},
+			{TEXT("PlayerStart")},
+			{TEXT("PointLight")},
+			{TEXT("PoseAsset")},
+			{TEXT("PostProcessVolume")},
+			{TEXT("PrecomputedVisibilityOverrideVolume")},
+			{TEXT("PrecomputedVisibilityVolume")},
+			{TEXT("ProceduralFoliageBlockingVolume")},
+			{TEXT("ProceduralFoliageVolume")},
+			{TEXT("ProjectileMovementComponent")},
+			{TEXT("RadialForceActor")},
+			{TEXT("RectLight")},
+			{TEXT("ReflectionCapture")},
+			{TEXT("ReverbEffect")},
+			{TEXT("RotatingMovementComponent")},
+			{TEXT("SceneCapture2D")},
+			{TEXT("SceneCaptureCube")},
+			{TEXT("SceneComponent")},
+			{TEXT("SkeletalMeshActor")},
+			{TEXT("Skeleton")},
+			{TEXT("SkyAtmosphere")},
+			{TEXT("SkyLight")},
+			{TEXT("SlateBrushAsset")},
+			{TEXT("SoundAttenuation")},
+			{TEXT("SoundClass")},
+			{TEXT("SoundConcurrency")},
+			{TEXT("SoundCue")},
+			{TEXT("SoundEffectSourcePreset")},
+			{TEXT("SoundMix")},
+			{TEXT("SoundSubmix") },
+			{TEXT("SphereReflectionCapture")},
+			{TEXT("SpotLight")},
+			{TEXT("SpringArmComponent")},
+			{TEXT("StaticMesh")},
+			{TEXT("StaticMeshActor")},
+			{TEXT("StreamMediaSource")},
+			{TEXT("SubsurfaceProfile")},
+			{TEXT("TargetPoint")},
+			{TEXT("TemplateSequence")},
+			{TEXT("TextRenderActor")},
+			{TEXT("Texture2D")},
+			{TEXT("TextureRenderTarget2D")},
+			{TEXT("TextureRenderTargetCube")},
+			{TEXT("TimeCodeSynchronizer")},
+			{TEXT("TouchInterface")},
+			{TEXT("TriggerBase")},
+			{TEXT("TriggerBox")},
+			{TEXT("TriggerCapsule")},
+			{TEXT("TriggerSphere")},
+			{TEXT("TriggerVolume")},
+			{TEXT("UserDefinedCaptureProtocol")},
+			{TEXT("UserDefinedEnum")},
+			{TEXT("UserDefinedStruct") },
+			{TEXT("UserWidget")},
+			{TEXT("VectorField")},
+			{TEXT("VectorFieldVolume")},
+			{TEXT("Volume")},
+			{TEXT("VolumetricCloud"), false},
+			{TEXT("VolumetricLightmapDensityVolume")},
+			{TEXT("WidgetBlueprint")},
+			{TEXT("WidgetBlueprintGeneratedClass")},
+			{TEXT("WindDirectionalSource")},
+			{TEXT("World")},
+		};
+	
+		// SVG Asset icons
+		{
+			for (int32 TypeIndex = 0; TypeIndex < UE_ARRAY_COUNT(AssetTypesSVG); ++TypeIndex)
+			{
+				const FClassIconInfo& Info = AssetTypesSVG[TypeIndex];
+
+				// Look up if the brush already exists to audit old vs new icons during starship development.
+				FString ClassIconName = FString::Printf(TEXT("ClassIcon.%s"), Info.Type);
+				if (GetOptionalBrush(*ClassIconName, nullptr, nullptr))
+				{
+					UE_LOG(LogSlate, Log, TEXT("%s already found"), *ClassIconName);
+				}
+
+				Set(*FString::Printf(TEXT("ClassIcon.%s"), Info.Type), new IMAGE_BRUSH_SVG(FString::Printf(TEXT("Starship/AssetIcons/%s_%d"), Info.Type, 16), Icon16x16));
+				if (Info.bHas64Size)
+				{
+					Set(*FString::Printf(TEXT("ClassThumbnail.%s"), Info.Type), new IMAGE_BRUSH_SVG(FString::Printf(TEXT("Starship/AssetIcons/%s_%d"), Info.Type, 64), Icon64x64));
+				}
+				else
+				{
+					// Temp to avoid missing icons while in progress. use the 64 variant for 16 for now.  
+					Set(*FString::Printf(TEXT("ClassThumbnail.%s"), Info.Type), new IMAGE_BRUSH_SVG(FString::Printf(TEXT("Starship/AssetIcons/%s_%d"), Info.Type, 16), Icon64x64));
+				}
+			}
+		}
+	}
+
+}
+
+void FStarshipSodaStyle::FStyle::SetupColorPickerStyle()
+{
+	Set("ColorPicker.ColorThemes", new IMAGE_BRUSH_SVG("Starship/ColorPicker/ColorThemes", Icon16x16));
+}
+
+
+void FStarshipSodaStyle::FStyle::SetupTutorialStyles()
+{
+	// Documentation tooltip defaults
+	const FSlateColor HyperlinkColor(FLinearColor(0.1f, 0.1f, 0.5f));
+	{
+		const FTextBlockStyle DocumentationTooltipText = FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Regular", 9))
+			.SetColorAndOpacity(FLinearColor::Black);
+		Set("Documentation.SDocumentationTooltip", FTextBlockStyle(DocumentationTooltipText));
+
+		const FTextBlockStyle DocumentationTooltipTextSubdued = FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Regular", 8))
+			.SetColorAndOpacity(FLinearColor(0.1f, 0.1f, 0.1f));
+		Set("Documentation.SDocumentationTooltipSubdued", FTextBlockStyle(DocumentationTooltipTextSubdued));
+
+		const FTextBlockStyle DocumentationTooltipHyperlinkText = FTextBlockStyle(NormalText)
+			.SetFont(DEFAULT_FONT("Regular", 8))
+			.SetColorAndOpacity(HyperlinkColor);
+		Set("Documentation.SDocumentationTooltipHyperlinkText", FTextBlockStyle(DocumentationTooltipHyperlinkText));
+
+		const FButtonStyle DocumentationTooltipHyperlinkButton = FButtonStyle()
+			.SetNormal(BORDER_BRUSH("Old/HyperlinkDotted", FMargin(0, 0, 0, 3 / 16.0f), HyperlinkColor))
+			.SetPressed(FSlateNoResource())
+			.SetHovered(BORDER_BRUSH("Old/HyperlinkUnderline", FMargin(0, 0, 0, 3 / 16.0f), HyperlinkColor));
+		Set("Documentation.SDocumentationTooltipHyperlinkButton", FButtonStyle(DocumentationTooltipHyperlinkButton));
+	}
+
+
+	// Documentation defaults
+	const FTextBlockStyle DocumentationText = FTextBlockStyle(NormalText)
+		.SetColorAndOpacity(FLinearColor::Black)
+		.SetFont(DEFAULT_FONT("Regular", 11));
+
+	const FTextBlockStyle DocumentationHyperlinkText = FTextBlockStyle(DocumentationText)
+		.SetColorAndOpacity(HyperlinkColor);
+
+	const FTextBlockStyle DocumentationHeaderText = FTextBlockStyle(NormalText)
+		.SetColorAndOpacity(FLinearColor::Black)
+		.SetFont(DEFAULT_FONT("Black", 32));
+
+	const FButtonStyle DocumentationHyperlinkButton = FButtonStyle()
+		.SetNormal(BORDER_BRUSH("Old/HyperlinkDotted", FMargin(0, 0, 0, 3 / 16.0f), HyperlinkColor))
+		.SetPressed(FSlateNoResource())
+		.SetHovered(BORDER_BRUSH("Old/HyperlinkUnderline", FMargin(0, 0, 0, 3 / 16.0f), HyperlinkColor));
+
+	// Documentation
+	{
+		Set("Documentation.Content", FTextBlockStyle(DocumentationText));
+
+		const FHyperlinkStyle DocumentationHyperlink = FHyperlinkStyle()
+			.SetUnderlineStyle(DocumentationHyperlinkButton)
+			.SetTextStyle(DocumentationText)
+			.SetPadding(FMargin(0.0f));
+		Set("Documentation.Hyperlink", DocumentationHyperlink);
+
+		Set("Documentation.Hyperlink.Button", FButtonStyle(DocumentationHyperlinkButton));
+		Set("Documentation.Hyperlink.Text", FTextBlockStyle(DocumentationHyperlinkText));
+		Set("Documentation.NumberedContent", FTextBlockStyle(DocumentationText));
+		Set("Documentation.BoldContent", FTextBlockStyle(DocumentationText)
+			.SetTypefaceFontName(TEXT("Bold")));
+
+		Set("Documentation.Header1", FTextBlockStyle(DocumentationHeaderText)
+			.SetFontSize(32));
+
+		Set("Documentation.Header2", FTextBlockStyle(DocumentationHeaderText)
+			.SetFontSize(24));
+
+		Set("Documentation.Separator", new BOX_BRUSH("Common/Separator", 1 / 4.0f, FLinearColor(1, 1, 1, 0.5f)));
+	}
+
+	// Tutorials
+	{
+		const FLinearColor TutorialButtonColor = FLinearColor(0.15f, 0.15f, 0.15f, 1.0f);
+		const FLinearColor TutorialSelectionColor = FLinearColor(0.19f, 0.33f, 0.72f);
+		const FLinearColor TutorialNavigationButtonColor = FLinearColor(0.0f, 0.59f, 0.14f, 1.0f);
+		const FLinearColor TutorialNavigationButtonHoverColor = FLinearColor(0.2f, 0.79f, 0.34f, 1.0f);
+		const FLinearColor TutorialNavigationBackButtonColor = TutorialNavigationButtonColor;
+		const FLinearColor TutorialNavigationBackButtonHoverColor = TutorialNavigationButtonHoverColor;
+
+		const FTextBlockStyle TutorialText = FTextBlockStyle(DocumentationText)
+			.SetColorAndOpacity(FLinearColor::Black)
+			.SetHighlightColor(TutorialSelectionColor);
+
+		const FTextBlockStyle TutorialHeaderText = FTextBlockStyle(DocumentationHeaderText)
+			.SetColorAndOpacity(FLinearColor::Black)
+			.SetHighlightColor(TutorialSelectionColor);
+
+		const FTextBlockStyle TutorialBrowserText = FTextBlockStyle(TutorialText)
+			.SetColorAndOpacity(FSlateColor::UseForeground())
+			.SetHighlightColor(TutorialSelectionColor);
+
+		Set("Tutorials.Browser.Text", TutorialBrowserText);
+
+		Set("Tutorials.Browser.WelcomeHeader", FTextBlockStyle(TutorialBrowserText)
+			.SetFontSize(20));
+
+		Set("Tutorials.Browser.SummaryHeader", FTextBlockStyle(TutorialBrowserText)
+			.SetFontSize(16));
+
+		Set("Tutorials.Browser.SummaryText", FTextBlockStyle(TutorialBrowserText)
+			.SetFontSize(10));
+
+		Set("Tutorials.Browser.HighlightTextColor", TutorialSelectionColor);
+
+		Set("Tutorials.Browser.Button", FButtonStyle()
+			.SetNormal(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(0.05f, 0.05f, 0.05f, 1)))
+			.SetHovered(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(0.07f, 0.07f, 0.07f, 1)))
+			.SetPressed(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(0.08f, 0.08f, 0.08f, 1)))
+			.SetNormalPadding(FMargin(0, 0, 0, 1))
+			.SetPressedPadding(FMargin(0, 1, 0, 0)));
+
+		Set("Tutorials.Browser.BackButton", FButtonStyle()
+			.SetNormal(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(1.0f, 1.0f, 1.0f, 0.0f)))
+			.SetHovered(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(1.0f, 1.0f, 1.0f, 0.05f)))
+			.SetPressed(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(1.0f, 1.0f, 1.0f, 0.05f)))
+			.SetNormalPadding(FMargin(0, 0, 0, 1))
+			.SetPressedPadding(FMargin(0, 1, 0, 0)));
+
+		Set("Tutorials.Content.Button", FButtonStyle()
+			.SetNormal(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(0, 0, 0, 0)))
+			.SetHovered(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+			.SetPressed(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(1, 1, 1, 1)))
+			.SetNormalPadding(FMargin(0, 0, 0, 1))
+			.SetPressedPadding(FMargin(0, 1, 0, 0)));
+
+		Set("Tutorials.Content.NavigationButtonWrapper", FButtonStyle()
+			.SetNormal(FSlateNoResource())
+			.SetHovered(FSlateNoResource())
+			.SetPressed(FSlateNoResource())
+			.SetNormalPadding(FMargin(0, 0, 0, 1))
+			.SetPressedPadding(FMargin(0, 1, 0, 0)));
+
+		Set("Tutorials.Content.NavigationButton", FButtonStyle()
+			.SetNormal(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), TutorialNavigationButtonColor))
+			.SetHovered(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), TutorialNavigationButtonHoverColor))
+			.SetPressed(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), TutorialNavigationButtonHoverColor))
+			.SetNormalPadding(FMargin(0, 0, 0, 1))
+			.SetPressedPadding(FMargin(0, 1, 0, 0)));
+
+		Set("Tutorials.Content.NavigationBackButton", FButtonStyle()
+			.SetNormal(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), TutorialNavigationBackButtonColor))
+			.SetHovered(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), TutorialNavigationBackButtonHoverColor))
+			.SetPressed(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), TutorialNavigationBackButtonHoverColor))
+			.SetNormalPadding(FMargin(0, 0, 0, 1))
+			.SetPressedPadding(FMargin(0, 1, 0, 0)));
+
+		Set("Tutorials.Content.NavigationText", FTextBlockStyle(TutorialText));
+
+		Set("Tutorials.Content.Color", FLinearColor(1.0f, 1.0f, 1.0f, 0.9f));
+		Set("Tutorials.Content.Color.Hovered", FLinearColor(1.0f, 1.0f, 1.0f, 1.0f));
+
+		Set("Tutorials.Navigation.Button", FButtonStyle()
+			.SetNormal(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(0, 0, 0, 0)))
+			.SetHovered(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(0, 0, 0, 0)))
+			.SetPressed(BOX_BRUSH("Common/ButtonHoverHint", FMargin(4 / 16.0f), FLinearColor(0, 0, 0, 0)))
+			.SetNormalPadding(FMargin(0, 0, 0, 1))
+			.SetPressedPadding(FMargin(0, 1, 0, 0)));
+
+		Set("Tutorials.WidgetContent", FTextBlockStyle(TutorialText)
+			.SetFontSize(10));
+
+		Set("Tutorials.ButtonColor", TutorialButtonColor);
+		Set("Tutorials.ButtonHighlightColor", TutorialSelectionColor);
+		Set("Tutorials.ButtonDisabledColor", SelectionColor_Inactive);
+
+		Set("Tutorials.PageHeader", FTextBlockStyle(TutorialHeaderText)
+			.SetFontSize(22));
+
+		Set("Tutorials.CurrentExcerpt", FTextBlockStyle(TutorialHeaderText)
+			.SetFontSize(16));
+
+		Set("Tutorials.NavigationButtons", FTextBlockStyle(TutorialHeaderText)
+			.SetFontSize(16));
+
+		// UDN documentation styles
+		Set("Tutorials.Content", FTextBlockStyle(TutorialText)
+			.SetColorAndOpacity(FSlateColor::UseForeground()));
+		Set("Tutorials.Hyperlink.Text", FTextBlockStyle(DocumentationHyperlinkText));
+		Set("Tutorials.NumberedContent", FTextBlockStyle(TutorialText));
+		Set("Tutorials.BoldContent", FTextBlockStyle(TutorialText)
+			.SetTypefaceFontName(TEXT("Bold")));
+
+		Set("Tutorials.Header1", FTextBlockStyle(TutorialHeaderText)
+			.SetFontSize(32));
+
+		Set("Tutorials.Header2", FTextBlockStyle(TutorialHeaderText)
+			.SetFontSize(24));
+
+		Set("Tutorials.Hyperlink.Button", FButtonStyle(DocumentationHyperlinkButton)
+			.SetNormal(BORDER_BRUSH("Old/HyperlinkDotted", FMargin(0, 0, 0, 3 / 16.0f), FLinearColor::Black))
+			.SetHovered(BORDER_BRUSH("Old/HyperlinkUnderline", FMargin(0, 0, 0, 3 / 16.0f), FLinearColor::Black)));
+
+		Set("Tutorials.Separator", new BOX_BRUSH("Common/Separator", 1 / 4.0f, FLinearColor::Black));
+
+		Set("Tutorials.ProgressBar", FProgressBarStyle()
+			.SetBackgroundImage(BOX_BRUSH("Common/ProgressBar_Background", FMargin(5.f / 12.f)))
+			.SetFillImage(BOX_BRUSH("Common/ProgressBar_NeutralFill", FMargin(5.f / 12.f)))
+			.SetMarqueeImage(IMAGE_BRUSH("Common/ProgressBar_Marquee", FVector2D(20, 12), FLinearColor::White, ESlateBrushTileType::Horizontal))
+		);
+
+		// Default text styles
+		{
+			const FTextBlockStyle RichTextNormal = FTextBlockStyle()
+				.SetFont(DEFAULT_FONT("Regular", 11))
+				.SetColorAndOpacity(FSlateColor::UseForeground())
+				.SetShadowOffset(FVector2D::ZeroVector)
+				.SetShadowColorAndOpacity(FLinearColor::Black)
+				.SetHighlightColor(FLinearColor(0.02f, 0.3f, 0.0f))
+				.SetHighlightShape(BOX_BRUSH("Common/TextBlockHighlightShape", FMargin(3.f / 8.f)));
+			Set("Tutorials.Content.Text", RichTextNormal);
+
+			Set("Tutorials.Content.TextBold", FTextBlockStyle(RichTextNormal)
+				.SetFont(DEFAULT_FONT("Bold", 11)));
+
+			Set("Tutorials.Content.HeaderText1", FTextBlockStyle(RichTextNormal)
+				.SetFontSize(20));
+
+			Set("Tutorials.Content.HeaderText2", FTextBlockStyle(RichTextNormal)
+				.SetFontSize(16));
+
+			{
+				const FButtonStyle RichTextHyperlinkButton = FButtonStyle()
+					.SetNormal(BORDER_BRUSH("Old/HyperlinkDotted", FMargin(0, 0, 0, 3 / 16.0f), FLinearColor::Blue))
+					.SetPressed(FSlateNoResource())
+					.SetHovered(BORDER_BRUSH("Old/HyperlinkUnderline", FMargin(0, 0, 0, 3 / 16.0f), FLinearColor::Blue));
+
+				const FTextBlockStyle RichTextHyperlinkText = FTextBlockStyle(RichTextNormal)
+					.SetColorAndOpacity(FLinearColor::Blue);
+
+				Set("Tutorials.Content.HyperlinkText", RichTextHyperlinkText);
+
+				// legacy style
+				Set("TutorialEditableText.Editor.HyperlinkText", RichTextHyperlinkText);
+
+				const FHyperlinkStyle RichTextHyperlink = FHyperlinkStyle()
+					.SetUnderlineStyle(RichTextHyperlinkButton)
+					.SetTextStyle(RichTextHyperlinkText)
+					.SetPadding(FMargin(0.0f));
+				Set("Tutorials.Content.Hyperlink", RichTextHyperlink);
+
+				// legacy style
+				Set("TutorialEditableText.Editor.Hyperlink", RichTextHyperlink);
+			}
+		}
+
+		// Toolbar
+		{
+			const FLinearColor NormalColor(FColor(0xffeff3f3));
+			const FLinearColor SelectedColor(FColor(0xffdbe4d5));
+			const FLinearColor HoverColor(FColor(0xffdbe4e4));
+			const FLinearColor DisabledColor(FColor(0xaaaaaa));
+			const FLinearColor TextColor(FColor(0xff2c3e50));
+
+			Set("TutorialEditableText.RoundedBackground", new BOX_BRUSH("Common/RoundedSelection_16x", 4.0f / 16.0f, FLinearColor(FColor(0xffeff3f3))));
+
+			Set("TutorialEditableText.Toolbar.TextColor", TextColor);
+
+			Set("TutorialEditableText.Toolbar.Text", FTextBlockStyle(NormalText)
+				.SetFont(DEFAULT_FONT("Regular", 10))
+				.SetColorAndOpacity(TextColor)
+			);
+
+			Set("TutorialEditableText.Toolbar.BoldText", FTextBlockStyle(NormalText)
+				.SetFont(DEFAULT_FONT("Bold", 10))
+				.SetColorAndOpacity(TextColor)
+			);
+
+			Set("TutorialEditableText.Toolbar.ItalicText", FTextBlockStyle(NormalText)
+				.SetFont(DEFAULT_FONT("Italic", 10))
+				.SetColorAndOpacity(TextColor)
+			);
+
+			Set("TutorialEditableText.Toolbar.Checkbox", FCheckBoxStyle()
+				.SetCheckBoxType(ESlateCheckBoxType::CheckBox)
+				.SetUncheckedImage(IMAGE_BRUSH("Common/CheckBox", Icon16x16, FLinearColor::White))
+				.SetUncheckedHoveredImage(IMAGE_BRUSH("Common/CheckBox", Icon16x16, HoverColor))
+				.SetUncheckedPressedImage(IMAGE_BRUSH("Common/CheckBox_Hovered", Icon16x16, HoverColor))
+				.SetCheckedImage(IMAGE_BRUSH("Common/CheckBox_Checked_Hovered", Icon16x16, FLinearColor::White))
+				.SetCheckedHoveredImage(IMAGE_BRUSH("Common/CheckBox_Checked_Hovered", Icon16x16, HoverColor))
+				.SetCheckedPressedImage(IMAGE_BRUSH("Common/CheckBox_Checked", Icon16x16, HoverColor))
+				.SetUndeterminedImage(IMAGE_BRUSH("Common/CheckBox_Undetermined", Icon16x16, FLinearColor::White))
+				.SetUndeterminedHoveredImage(IMAGE_BRUSH("Common/CheckBox_Undetermined_Hovered", Icon16x16, HoverColor))
+				.SetUndeterminedPressedImage(IMAGE_BRUSH("Common/CheckBox_Undetermined_Hovered", Icon16x16, FLinearColor::White))
+			);
+		}
+
+	}
+}
+
+void FStarshipSodaStyle::FStyle::SetupScenarioEditorStyle()
+{
+	Set("ScenarioAction.EventNode", new FSlateRoundedBoxBrush(FStyleColors::Recessed, 12.f, FStyleColors::AccentRed, 1.0));
+	Set("ScenarioAction.ConditionalNode", new FSlateRoundedBoxBrush(FStyleColors::Recessed, 12.f, FStyleColors::AccentOrange, 1.0));
+	Set("ScenarioAction.ActionNode", new FSlateRoundedBoxBrush(FStyleColors::Panel, 12.f, FStyleColors::AccentGreen, 1.0));
+
+	Set("ScenarioAction.EventMark", new FSlateRoundedBoxBrush(FStyleColors::AccentRed, 2.f, FStyleColors::AccentRed, 1.0));
+	Set("ScenarioAction.ConditionalMark", new FSlateRoundedBoxBrush(FStyleColors::AccentOrange, 2.f, FStyleColors::AccentOrange, 1.0));
+	Set("ScenarioAction.ActionMark", new FSlateRoundedBoxBrush(FStyleColors::AccentGreen, 2.f, FStyleColors::AccentGreen, 1.0));
+
+	Set("ScenarioAction.AddConditionalButton", FButtonStyle(Button)
+		.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Recessed, 12.f, FStyleColors::AccentOrange, 1.0))
+		.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 12.f, FStyleColors::AccentOrange, 1.0))
+		.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 12.f, FStyleColors::AccentOrange, 1.0))
+	);
+
+	Set("ScenarioAction.AddEventButton", FButtonStyle(Button)
+		.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Recessed, 12.f, FStyleColors::AccentRed, 1.0))
+		.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 12.f, FStyleColors::AccentRed, 1.0))
+		.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 12.f, FStyleColors::AccentRed, 1.0))
+	);
+
+	Set("ScenarioAction.AddActionButton", FButtonStyle(Button)
+		.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Recessed, 12.f, FStyleColors::AccentGreen, 1.0))
+		.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 12.f, FStyleColors::AccentGreen, 1.0))
+		.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 12.f, FStyleColors::AccentGreen, 1.0))
+	);
+
+	Set("ScenarioAction.ConditionalSeparator", new FSlateRoundedBoxBrush(FStyleColors::Dropdown, 2.f, FStyleColors::Dropdown, 0));
+
+	Set("ScenarioAction.ActionRowDefault", FTableRowStyle(NormalTableRowStyle)
+		.SetEvenRowBackgroundBrush(FSlateColorBrush(FStyleColors::Panel))
+		.SetEvenRowBackgroundHoveredBrush(FSlateColorBrush(FStyleColors::Header))
+		.SetOddRowBackgroundBrush(FSlateColorBrush(FStyleColors::Panel))
+		.SetOddRowBackgroundHoveredBrush(FSlateColorBrush(FStyleColors::Header)));
+		//.SetSelectorFocusedBrush(BORDER_BRUSH("Common/Selector", FMargin(4.f / 16.f), SelectorColor))
+		//.SetActiveBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor))
+		//.SetActiveHoveredBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor))
+		//.SetInactiveBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor_Inactive))
+		//.SetInactiveHoveredBrush(IMAGE_BRUSH("Common/Selection", Icon8x8, SelectionColor_Inactive)));
+
+	Set("ScenarioAction.ActionRowContent", FTableRowStyle(NormalTableRowStyle)
+		.SetEvenRowBackgroundBrush(FSlateNoResource())
+		.SetEvenRowBackgroundHoveredBrush(FSlateNoResource())
+		.SetOddRowBackgroundBrush(FSlateNoResource())
+		.SetOddRowBackgroundHoveredBrush(FSlateNoResource())
+		.SetSelectorFocusedBrush(FSlateNoResource())
+		.SetActiveBrush(FSlateNoResource())
+		.SetActiveHoveredBrush(FSlateNoResource())
+		.SetInactiveBrush(FSlateNoResource())
+		.SetInactiveHoveredBrush(FSlateNoResource()));
+
+	Set("ScenarioAction.ButtonAddRow", FButtonStyle(Button)
+		.SetNormal(FSlateRoundedBoxBrush(FStyleColors::Transparent, 4.0f, FStyleColors::Transparent, 1))
+		.SetHovered(FSlateRoundedBoxBrush(FStyleColors::Hover, 4.0f, FStyleColors::Transparent, 1))
+		.SetPressed(FSlateRoundedBoxBrush(FStyleColors::Header, 4.0f, FStyleColors::Transparent, 1))
+		.SetDisabled(FSlateRoundedBoxBrush(FStyleColors::Dropdown, 4.0f, FStyleColors::Transparent, 1))
+		.SetNormalForeground(FStyleColors::Transparent)
+		.SetHoveredForeground(FStyleColors::ForegroundHover)
+		.SetPressedForeground(FStyleColors::ForegroundHover)
+		.SetDisabledForeground(FStyleColors::Foreground));
+		//.SetNormalPadding(ButtonMargins)
+		//.SetPressedPadding(PressedButtonMargins));
+
+	Set("ScenarioAction.OpenEditor", new IMAGE_BRUSH_SVG("Starship/AssetIcons/LevelSequenceActor_16", Icon20x20));
+}
+
+#undef DEFAULT_FONT
+#undef ICON_FONT
+#undef LOCTEXT_NAMESPACE
+
+END_SLATE_FUNCTION_BUILD_OPTIMIZATION
diff --git a/Source/SodaStyle/Private/SodaStyle.h b/Source/SodaStyle/Private/SodaStyle.h
new file mode 100644
index 0000000..80220ff
--- /dev/null
+++ b/Source/SodaStyle/Private/SodaStyle.h
@@ -0,0 +1,135 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/UObjectGlobals.h"
+#include "Modules/ModuleManager.h"
+#include "Styling/SlateColor.h"
+#include "Styling/SlateStyle.h"
+#include "Styling/SlateTypes.h"
+#include "SodaStyleSet.h"
+#include "Classes/SodaStyleSettings.h"
+//#include "ISettingsModule.h"
+//#include "SodaStyleSettingsCustomization.h"
+#include "SodaStyleModule.h"
+
+struct FPropertyChangedEvent;
+
+/**
+ * Declares the Editor's visual style.
+ */
+class FStarshipSodaStyle
+	: public FSodaStyle
+{
+public:
+
+	static void Initialize();
+	static void Shutdown();
+
+	static void SyncCustomizations()
+	{
+		FStarshipSodaStyle::StyleInstance->SyncSettings();
+	}
+
+	class FStyle : public FSlateStyleSet
+	{
+	public:
+		FStyle(const TWeakObjectPtr< USodaStyleSettings >& InSettings);
+
+		void Initialize();
+		void SetupGeneralStyles();
+		void SetupViewportStyles();
+		void SetupMenuBarStyles();
+		void SetupGeneralIcons();
+		void SetupWindowStyles();
+		void SetupPropertySodaStyles();
+		void SetupGraphSodaStyles();
+		void SetupLevelSodaStyle();
+		void SetupPersonaStyle();
+		void SetupClassIconsAndThumbnails();
+		void SetupColorPickerStyle();
+		void SetupTutorialStyles();
+		void SetupScenarioEditorStyle();
+
+		void SettingsChanged(UObject* ChangedObject, FPropertyChangedEvent& PropertyChangedEvent);
+		void SyncSettings();
+		void SyncParentStyles();
+
+		static void SetColor(const TSharedRef<FLinearColor>& Source, const FLinearColor& Value);
+
+		const FVector2D Icon7x16;
+		const FVector2D Icon8x4;
+		const FVector2D Icon16x4;
+		const FVector2D Icon8x8;
+		const FVector2D Icon10x10;
+		const FVector2D Icon12x12;
+		const FVector2D Icon12x16;
+		const FVector2D Icon14x14;
+		const FVector2D Icon16x16;
+		const FVector2D Icon16x20;
+		const FVector2D Icon20x20;
+		const FVector2D Icon22x22;
+		const FVector2D Icon24x24;
+		const FVector2D Icon25x25;
+		const FVector2D Icon32x32;
+		const FVector2D Icon40x40;
+		const FVector2D Icon48x48;
+		const FVector2D Icon64x64;
+		const FVector2D Icon36x24;
+		const FVector2D Icon128x128;
+
+		// These are the colors that are updated by the user style customizations
+		const TSharedRef< FLinearColor > SelectionColor_Subdued_LinearRef;
+		const TSharedRef< FLinearColor > HighlightColor_LinearRef;
+		const TSharedRef< FLinearColor > WindowHighlightColor_LinearRef;
+
+		// These are the Slate colors which reference those above; these are the colors to put into the style
+		// Most of these are owned by our parent style
+		FSlateColor DefaultForeground;
+		FSlateColor InvertedForeground;
+		FSlateColor SelectorColor;
+		FSlateColor SelectionColor;
+		FSlateColor SelectionColor_Inactive;
+		FSlateColor SelectionColor_Pressed;
+
+		const FSlateColor SelectionColor_Subdued;
+		const FSlateColor HighlightColor;
+		const FSlateColor WindowHighlightColor;
+
+		const FSlateColor LogColor_SelectionBackground;
+		const FSlateColor LogColor_Normal;
+		const FSlateColor LogColor_Command;
+
+		// These are common colors used thruout the editor in mutliple style elements
+		const FSlateColor InheritedFromBlueprintTextColor;
+
+		// Styles inherited from the parent style
+		FTextBlockStyle NormalText;
+		FEditableTextBoxStyle NormalEditableTextBoxStyle;
+		FTableRowStyle NormalTableRowStyle;
+		FButtonStyle Button;
+		FButtonStyle HoverHintOnly;
+		FButtonStyle NoBorder;
+		FScrollBarStyle ScrollBar;
+		FSlateFontInfo NormalFont;
+		FSlateBrush EditorWindowHighlightBrush;
+
+		TWeakObjectPtr< USodaStyleSettings > Settings;
+	};
+
+	static TSharedRef<class FStarshipSodaStyle::FStyle> Create(const TWeakObjectPtr< USodaStyleSettings >& InCustomization)
+	{
+		TSharedRef<class FStarshipSodaStyle::FStyle> NewStyle = MakeShareable(new FStarshipSodaStyle::FStyle(InCustomization));
+		NewStyle->Initialize();
+
+#if WITH_EDITOR
+		FCoreUObjectDelegates::OnObjectPropertyChanged.AddSP(NewStyle, &FStarshipSodaStyle::FStyle::SettingsChanged);
+#endif
+
+		return NewStyle;
+	}
+
+	static TSharedPtr<FStarshipSodaStyle::FStyle> StyleInstance;
+	static TWeakObjectPtr<USodaStyleSettings> Settings;
+};
diff --git a/Source/SodaStyle/Private/SodaStyleClasses.cpp b/Source/SodaStyle/Private/SodaStyleClasses.cpp
new file mode 100644
index 0000000..0e698f5
--- /dev/null
+++ b/Source/SodaStyle/Private/SodaStyleClasses.cpp
@@ -0,0 +1,36 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "CoreMinimal.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Classes/SodaStyleSettings.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Modules/ModuleManager.h"
+
+//#if WITH_EDITOR
+	#include "UObject/UnrealType.h"
+//#endif
+
+
+
+/* USodaStyleSettings interface
+ *****************************************************************************/
+
+USodaStyleSettings::USodaStyleSettings( const FObjectInitializer& ObjectInitializer )
+	: Super(ObjectInitializer)
+{
+	SelectionColor = FLinearColor(0.828f, 0.364f, 0.003f);
+	EditorWindowBackgroundColor = FLinearColor::White;
+	bCycleToOutputLogDrawer = true;
+	bShowFriendlyNames = true;
+}
+
+
+FLinearColor USodaStyleSettings::GetSubduedSelectionColor() const
+{
+	FLinearColor SubduedSelectionColor = SelectionColor.LinearRGBToHSV();
+	SubduedSelectionColor.G *= 0.55f;		// take the saturation 
+	SubduedSelectionColor.B *= 0.8f;		// and brightness down
+
+	return SubduedSelectionColor.HSVToLinearRGB();
+}
+
diff --git a/Source/SodaStyle/Private/SodaStyleModule.cpp b/Source/SodaStyle/Private/SodaStyleModule.cpp
new file mode 100644
index 0000000..410743a
--- /dev/null
+++ b/Source/SodaStyle/Private/SodaStyleModule.cpp
@@ -0,0 +1,17 @@
+#include "SodaStyleModule.h"
+#include "SodaStyle.h"
+#include "Styling/CoreStyle.h"
+
+void FSodaStyleModule::StartupModule()
+{
+	check(FCoreStyle::IsStarshipStyle());
+	FStarshipSodaStyle::Initialize();
+}
+
+void FSodaStyleModule::ShutdownModule()
+{
+	FStarshipSodaStyle::Shutdown();
+}
+
+IMPLEMENT_MODULE(FSodaStyleModule, SodaStyle);
+
diff --git a/Source/SodaStyle/Private/SodaStyleSet.cpp b/Source/SodaStyle/Private/SodaStyleSet.cpp
new file mode 100644
index 0000000..c4de9cf
--- /dev/null
+++ b/Source/SodaStyle/Private/SodaStyleSet.cpp
@@ -0,0 +1,34 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaStyleSet.h"
+#include "Styling/SlateStyleRegistry.h"
+#include "Styling/CoreStyle.h"
+
+TSharedPtr< ISlateStyle > FSodaStyle::Instance = NULL;
+
+void FSodaStyle::ResetToDefault()
+{
+	SetStyle( FCoreStyle::Create("SodaStyle") );
+}
+
+void FSodaStyle::SetStyle( const TSharedRef< ISlateStyle >& NewStyle )
+{
+	if( Instance != NewStyle )
+	{
+		if ( Instance.IsValid() )
+		{
+			FSlateStyleRegistry::UnRegisterSlateStyle( *Instance.Get() );
+		}
+
+		Instance = NewStyle;
+
+		if ( Instance.IsValid() )
+		{
+			FSlateStyleRegistry::RegisterSlateStyle( *Instance.Get() );
+		}
+		else
+		{
+			ResetToDefault();
+		}
+	}
+}
diff --git a/Source/SodaStyle/Public/Classes/SodaStyleSettings.h b/Source/SodaStyle/Public/Classes/SodaStyleSettings.h
new file mode 100644
index 0000000..5071fac
--- /dev/null
+++ b/Source/SodaStyle/Public/Classes/SodaStyleSettings.h
@@ -0,0 +1,57 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/Object.h"
+#include "Styling/SlateBrush.h"
+#include "Rendering/RenderingCommon.h"
+#include "SodaStyleSettings.generated.h"
+
+UCLASS(config= SodaStyleSettings)
+class SODASTYLE_API USodaStyleSettings : public UObject
+{
+public:
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	/** The color used to represent selection */
+	UPROPERTY(EditAnywhere, config, Category=Colors, meta=(DisplayName="Viewport Selection Color"))
+	FLinearColor SelectionColor;
+
+	UPROPERTY(config)
+	bool bEnableEditorWindowBackgroundColor;
+
+	/** The color used to tint the editor window backgrounds */
+	UPROPERTY(EditAnywhere, config, Category=Colors, meta=(EditCondition="bEnableEditorWindowBackgroundColor"))
+	FLinearColor EditorWindowBackgroundColor;
+
+	/** When enabled, the C++ names for properties and functions will be displayed in a format that is easier to read */
+	UPROPERTY(EditAnywhere, config, Category=UserInterface, meta=(DisplayName="Show Friendly Variable Names"))
+	uint32 bShowFriendlyNames:1;
+
+	/** When Playing or Simulating, shows all properties (even non-visible and non-editable properties), if the object belongs to a simulating world.  This is useful for debugging. */
+	UPROPERTY(config)
+	uint32 bShowHiddenPropertiesWhilePlaying : 1;
+
+	/** The font size used in the output log */
+	UPROPERTY(EditAnywhere, config, Category="Output Log", meta=(DisplayName="Log Font Size", ConfigRestartRequired=true))
+	int32 LogFontSize;
+
+	/**
+	 * If checked pressing the console command shortcut will cycle between focusing the status bar console, opening the output log drawer, and back to the previous focus target. 
+	 * If unchecked, the console command shortcut will only focus the status bar console
+	 */
+	UPROPERTY(EditAnywhere, config, Category = "Output Log", meta = (DisplayName = "Open Output Log Drawer with Console Command Shortcut"))
+	bool bCycleToOutputLogDrawer;
+
+
+public:
+
+	/** @return A subdued version of the users selection color (for use with inactive selection)*/
+	FLinearColor GetSubduedSelectionColor() const;
+protected:
+
+};
diff --git a/Source/SodaStyle/Public/SodaFontGlyphs.h b/Source/SodaStyle/Public/SodaFontGlyphs.h
new file mode 100644
index 0000000..23c9cb7
--- /dev/null
+++ b/Source/SodaStyle/Public/SodaFontGlyphs.h
@@ -0,0 +1,294 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+
+class SODASTYLE_API FSodaFontGlyphs
+{
+public:
+	// (laquo, quote, previous, back) http://fortawesome.github.io/Font-Awesome/icon/angle-double-left/
+	static FText Angle_Double_Left;
+
+	// (raquo, quote, next, forward) http://fortawesome.github.io/Font-Awesome/icon/angle-double-right/
+	static FText Angle_Double_Right;
+
+	// (previous, back) http://fortawesome.github.io/Font-Awesome/icon/angle-left/
+	static FText Angle_Left;
+
+	// (next, forward) http://fortawesome.github.io/Font-Awesome/icon/angle-right/
+	static FText Angle_Right;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/angle-up/
+	static FText Angle_Up;
+
+	// (box, storage) http://fortawesome.github.io/Font-Awesome/icon/archive/
+	static FText Archive;
+
+	// (next, forward) http://fortawesome.github.io/Font-Awesome/icon/arrow-circle-o-right/
+	static FText Arrow_Circle_O_Right;
+
+	// (download) http://fortawesome.github.io/Font-Awesome/icon/arrow-down/
+	static FText Arrow_Down;
+
+	// (previous, back) http://fortawesome.github.io/Font-Awesome/icon/arrow-left/
+	static FText Arrow_Left;
+
+	// (next, forward) http://fortawesome.github.io/Font-Awesome/icon/arrow-right/
+	static FText Arrow_Right;
+
+	// (move, reorder, resize) http://fortawesome.github.io/Font-Awesome/icon/arrows/
+	static FText Arrows;
+
+	// (delete, remove, trash, hide, block, stop, abort, cancel) http://fortawesome.github.io/Font-Awesome/icon/ban/
+	static FText Ban;
+
+	// (menu, drag, reorder, settings, list, ul, ol, checklist, todo, list, hamburger) http://fortawesome.github.io/Font-Awesome/icon/bars/
+	static FText Bars;
+
+	// (read, documentation) http://fortawesome.github.io/Font-Awesome/icon/book/
+	static FText Book;
+
+	// (report, insect) http://fortawesome.github.io/Font-Awesome/icon/bug/
+	static FText Bug;
+
+	// (vehicle) http://fortawesome.github.io/Font-Awesome/icon/car/
+	static FText Car;
+
+	// (more, dropdown, menu, triangle down) http://fortawesome.github.io/Font-Awesome/icon/caret-down/
+	static FText Caret_Down;
+
+	// (next, forward, triangle right) http://fortawesome.github.io/Font-Awesome/icon/caret-right/
+	static FText Caret_Right;
+
+	// (more, dropdown, menu) http://fortawesome.github.io/Font-Awesome/icon/caret-square-o-down/
+	static FText Caret_Square_O_Down;
+
+	// (previous, back) http://fortawesome.github.io/Font-Awesome/icon/caret-square-o-left/
+	static FText Caret_Square_O_Left;
+
+	// (next, forward) http://fortawesome.github.io/Font-Awesome/icon/caret-square-o-right/
+	static FText Caret_Square_O_Right;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/caret-square-o-up/
+	static FText Caret_Square_O_Up;
+
+	// (triangle up) http://fortawesome.github.io/Font-Awesome/icon/caret-up/
+	static FText Caret_Up;
+
+	// (checkmark, done, todo, agree, accept, confirm, tick) http://fortawesome.github.io/Font-Awesome/icon/check/
+	static FText Check;
+
+	// (todo, done, agree, accept, confirm) http://fortawesome.github.io/Font-Awesome/icon/check-circle/
+	static FText Check_Circle;
+
+	// (dot, notification) http://fortawesome.github.io/Font-Awesome/icon/circle/
+	static FText Circle;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/circle-o/
+	static FText Circle_O;
+
+	// (watch, timer, late, timestamp) http://fortawesome.github.io/Font-Awesome/icon/clock-o/
+	static FText Clock_O;
+
+	// (settings) http://fortawesome.github.io/Font-Awesome/icon/cog/
+	static FText Cog;
+
+	// (settings) http://fortawesome.github.io/Font-Awesome/icon/cogs/
+	static FText Cogs;
+
+	// (picker) http://fortawesome.github.io/Font-Awesome/icon/crosshairs/
+	static FText Crosshairs;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/database/
+	static FText Database;
+
+	// (import) http://fortawesome.github.io/Font-Awesome/icon/download/
+	static FText Download;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/eraser/
+	static FText Eraser;
+
+	// (transfer, arrows) http://fortawesome.github.io/Font-Awesome/icon/exchange/
+	static FText Exchange;
+
+	// (warning, error, problem, notification, notify, alert) http://fortawesome.github.io/Font-Awesome/icon/exclamation/
+	static FText Exclamation;
+
+	// (warning, error, problem, notification, alert) http://fortawesome.github.io/Font-Awesome/icon/exclamation-triangle/
+	static FText Exclamation_Triangle;
+
+	// (enlarge, bigger, resize) http://fortawesome.github.io/Font-Awesome/icon/expand/
+	static FText Expand;
+
+	// (open, new) http://fortawesome.github.io/Font-Awesome/icon/external-link/
+	static FText External_Link;
+
+	// (show, visible, views) http://fortawesome.github.io/Font-Awesome/icon/eye/
+	static FText Eye;
+
+	// (toggle, show, hide, visible, visiblity, views) http://fortawesome.github.io/Font-Awesome/icon/eye-slash/
+	static FText Eye_Slash;
+
+	// (next, end, last) http://fortawesome.github.io/Font-Awesome/icon/fast-forward/
+	static FText Fast_Forward;
+
+	// (new, page, pdf, document) http://fortawesome.github.io/Font-Awesome/icon/file/
+	static FText File;
+
+	// (movie) http://fortawesome.github.io/Font-Awesome/icon/film/
+	static FText Film;
+
+	// (funnel, options) http://fortawesome.github.io/Font-Awesome/icon/filter/
+	static FText Filter;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/floppy-o/
+	static FText Floppy_O;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/folder/
+	static FText Folder;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/folder-open/
+	static FText Folder_Open;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/hourglass/
+	static FText Hourglass;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/hourglass-o/
+	static FText Hourglass_O;
+
+	// (help, information, more, details) http://fortawesome.github.io/Font-Awesome/icon/info/
+	static FText Info;
+
+	// (help, information, more, details) http://fortawesome.github.io/Font-Awesome/icon/info-circle/
+	static FText Info_Circle;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/level-down/
+	static FText Level_Down;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/level-up/
+	static FText Level_Up;
+
+	// (idea, inspiration) http://fortawesome.github.io/Font-Awesome/icon/lightbulb-o/
+	static FText Lightbulb_O;
+
+	// (graph, analytics) http://fortawesome.github.io/Font-Awesome/icon/line-chart/
+	static FText Line_Chart;
+
+	// (chain) http://fortawesome.github.io/Font-Awesome/icon/link/
+	static FText Link;
+
+	// (protect, admin) http://fortawesome.github.io/Font-Awesome/icon/lock/
+	static FText Lock;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/long-arrow-down/
+	static FText Long_Arrow_Down;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/long-arrow-right/
+	static FText Long_Arrow_Right;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/map/
+	static FText Map;
+
+	// (map, pin, location, coordinates, localize, address, travel, where, place) http://fortawesome.github.io/Font-Awesome/icon/map-marker/
+	static FText Map_Marker;
+
+	// (hide, minify, delete, remove, trash, hide, collapse) http://fortawesome.github.io/Font-Awesome/icon/minus/
+	static FText Minus;
+
+	// (delete, remove, trash, hide) http://fortawesome.github.io/Font-Awesome/icon/minus-circle/
+	static FText Minus_Circle;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/paper-plane/
+	static FText Paper_Plane;
+
+	// (wait) http://fortawesome.github.io/Font-Awesome/icon/pause/
+	static FText Pause;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/pause-circle/
+	static FText Pause_Circle;
+
+	// (write, edit, update) http://fortawesome.github.io/Font-Awesome/icon/pencil/
+	static FText Pencil;
+
+	// (write, edit, update) http://fortawesome.github.io/Font-Awesome/icon/pencil-square/
+	static FText Pencil_Square;
+
+	// (start, playing, music, sound) http://fortawesome.github.io/Font-Awesome/icon/play/
+	static FText Play;
+
+	// (start, playing) http://fortawesome.github.io/Font-Awesome/icon/play-circle/
+	static FText Play_Circle;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/plug/
+	static FText Plug;
+
+	// (add, new, create, expand) http://fortawesome.github.io/Font-Awesome/icon/plus/
+	static FText Plus;
+
+	// (add, new, create, expand) http://fortawesome.github.io/Font-Awesome/icon/plus-circle/
+	static FText Plus_Circle;
+
+	// (help, information, unknown, support) http://fortawesome.github.io/Font-Awesome/icon/question/
+	static FText Question;
+
+	// (sort, shuffle) http://fortawesome.github.io/Font-Awesome/icon/random/
+	static FText Random;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/recycle/
+	static FText Recycle;
+
+	// (reload, sync) http://fortawesome.github.io/Font-Awesome/icon/refresh/
+	static FText Refresh;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/share/
+	static FText Share;
+
+	// http://fortawesome.github.io/Font-Awesome/icon/share-alt/
+	static FText Share_Alt;
+
+	// (enter, join, log in, login, sign up, sign in, signin, signup, arrow) http://fortawesome.github.io/Font-Awesome/icon/sign-in/
+	static FText Sign_In;
+
+	// (log out, logout, leave, exit, arrow) http://fortawesome.github.io/Font-Awesome/icon/sign-out/
+	static FText Sign_Out;
+
+	// (block, box) http://fortawesome.github.io/Font-Awesome/icon/square/
+	static FText Square;
+
+	// (award, achievement, night, rating, score) http://fortawesome.github.io/Font-Awesome/icon/star/
+	static FText Star;
+
+	// (next, end, last) http://fortawesome.github.io/Font-Awesome/icon/step-forward/
+	static FText Step_Forward;
+
+	// (block, box, square) http://fortawesome.github.io/Font-Awesome/icon/stop/
+	static FText Stop;
+
+	// (command, prompt, code) http://fortawesome.github.io/Font-Awesome/icon/terminal/
+	static FText Terminal;
+
+	// (blocks, squares, boxes) http://fortawesome.github.io/Font-Awesome/icon/th/
+	static FText Th;
+
+	// (marker, pin, location, coordinates) http://fortawesome.github.io/Font-Awesome/icon/thumb-tack/
+	static FText Thumb_Tack;
+
+	// (close, exit, x, cross) http://fortawesome.github.io/Font-Awesome/icon/times/
+	static FText Times;
+
+	// (close, exit, x) http://fortawesome.github.io/Font-Awesome/icon/times-circle/
+	static FText Times_Circle;
+
+	// (garbage, delete, remove, hide) http://fortawesome.github.io/Font-Awesome/icon/trash/
+	static FText Trash;
+
+	// (back) http://fortawesome.github.io/Font-Awesome/icon/undo/
+	static FText Undo;
+
+	// (protect, admin, password, lock) http://fortawesome.github.io/Font-Awesome/icon/unlock/
+	static FText Unlock;
+
+	// (film, movie, record) http://fortawesome.github.io/Font-Awesome/icon/video-camera/
+	static FText Video_Camera;
+};
\ No newline at end of file
diff --git a/Source/SodaStyle/Public/SodaFontGlyphs.tps b/Source/SodaStyle/Public/SodaFontGlyphs.tps
new file mode 100644
index 0000000..25bf731
--- /dev/null
+++ b/Source/SodaStyle/Public/SodaFontGlyphs.tps
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Notification>
+Redirect: ../../../../Content/Editor/Slate/Fonts/FontAwesome4.5.tps
+Notes:
+</Notification>
+</TpsData>
\ No newline at end of file
diff --git a/Source/SodaStyle/Public/SodaStyle.h b/Source/SodaStyle/Public/SodaStyle.h
new file mode 100644
index 0000000..35dc878
--- /dev/null
+++ b/Source/SodaStyle/Public/SodaStyle.h
@@ -0,0 +1,32 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+
+/* Boilerplate
+ *****************************************************************************/
+
+#include "Misc/MonolithicHeaderBoilerplate.h"
+MONOLITHIC_HEADER_BOILERPLATE()
+
+
+/* Dependencies
+ *****************************************************************************/
+
+#include "CoreUObject.h"
+#include "Modules/ModuleInterface.h"
+#include "SlateBasics.h"
+
+
+/* Interfaces
+ *****************************************************************************/
+
+//#include "Interfaces/ISodaStyleModule.h"
+#include "SodaStyleSet.h"
+
+
+/* Classes
+ *****************************************************************************/
+
+#include "Classes/SodaStyleSettings.h"
+#include "SodaFontGlyphs.h"
diff --git a/Source/SodaStyle/Public/SodaStyleModule.h b/Source/SodaStyle/Public/SodaStyleModule.h
new file mode 100644
index 0000000..5302b4f
--- /dev/null
+++ b/Source/SodaStyle/Public/SodaStyleModule.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "Modules/ModuleManager.h"
+
+class SODASTYLE_API FSodaStyleModule : public IModuleInterface
+{
+public:
+	virtual void StartupModule();
+	virtual void ShutdownModule();
+};
diff --git a/Source/SodaStyle/Public/SodaStyleSet.h b/Source/SodaStyle/Public/SodaStyleSet.h
new file mode 100644
index 0000000..3632d64
--- /dev/null
+++ b/Source/SodaStyle/Public/SodaStyleSet.h
@@ -0,0 +1,158 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Styling/SlateColor.h"
+#include "Fonts/SlateFontInfo.h"
+#include "Styling/StyleDefaults.h"
+#include "Styling/ISlateStyle.h"
+#include "Styling/AppStyle.h"
+
+struct FSlateDynamicImageBrush;
+
+/**
+ * A collection of named properties that guide the appearance of Slate.
+ */
+class SODASTYLE_API FSodaStyle
+{
+public:
+
+	/** 
+	* @return the Application Style 
+	*
+	* NOTE: Until the Editor can be fully updated, calling FSodaStyle::Get() or any of its 
+	* static convenience functions will will return the AppStyle instead of the style definied in this class.  
+	*
+	* Using the AppStyle is preferred in most cases as it allows the style to be changed 
+	* on an application level.
+	*
+	* In cases requiring explicit use of the SodaStyle where a Slate Widget should not take on
+	* the appearance of the rest of the application, use FSodaStyle::GetSodaStyle().
+	*
+	*/
+
+	static const ISlateStyle& Get()
+	{
+		if (Instance) return *Instance.Get();
+		return FAppStyle::Get();
+	}
+
+	template< class T >            
+	static const T& GetWidgetStyle( FName PropertyName, const ANSICHAR* Specifier = NULL  ) 
+	{
+		return Get().GetWidgetStyle< T >( PropertyName, Specifier );
+	}
+
+	static float GetFloat( FName PropertyName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetFloat( PropertyName, Specifier );
+	}
+
+	static FVector2D GetVector( FName PropertyName, const ANSICHAR* Specifier = NULL ) 
+	{
+		return Get().GetVector( PropertyName, Specifier );
+	}
+
+	static const FLinearColor& GetColor( FName PropertyName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetColor( PropertyName, Specifier );
+	}
+
+	static const FSlateColor GetSlateColor( FName PropertyName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetSlateColor( PropertyName, Specifier );
+	}
+
+	static const FMargin& GetMargin( FName PropertyName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetMargin( PropertyName, Specifier );
+	}
+
+	static const FSlateBrush* GetBrush( FName PropertyName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetBrush( PropertyName, Specifier );
+	}
+
+	static const TSharedPtr< FSlateDynamicImageBrush > GetDynamicImageBrush( FName BrushTemplate, FName TextureName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetDynamicImageBrush( BrushTemplate, TextureName, Specifier );
+	}
+
+	static const TSharedPtr< FSlateDynamicImageBrush > GetDynamicImageBrush( FName BrushTemplate, const ANSICHAR* Specifier, class UTexture2D* TextureResource, FName TextureName )
+	{
+		return Get().GetDynamicImageBrush( BrushTemplate, Specifier, TextureResource, TextureName );
+	}
+
+	static const TSharedPtr< FSlateDynamicImageBrush > GetDynamicImageBrush( FName BrushTemplate, class UTexture2D* TextureResource, FName TextureName )
+	{
+		return Get().GetDynamicImageBrush( BrushTemplate, TextureResource, TextureName );
+	}
+
+	static const FSlateSound& GetSound( FName PropertyName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetSound( PropertyName, Specifier );
+	}
+	
+	static FSlateFontInfo GetFontStyle( FName PropertyName, const ANSICHAR* Specifier = NULL )
+	{
+		return Get().GetFontStyle( PropertyName, Specifier );
+	}
+
+	static const FSlateBrush* GetDefaultBrush()
+	{
+		return Get().GetDefaultBrush();
+	}
+
+	static const FSlateBrush* GetNoBrush()
+	{
+		return FStyleDefaults::GetNoBrush();
+	}
+
+	static const FSlateBrush* GetOptionalBrush( FName PropertyName, const ANSICHAR* Specifier = NULL, const FSlateBrush* const DefaultBrush = FStyleDefaults::GetNoBrush() )
+	{
+		return Get().GetOptionalBrush( PropertyName, Specifier, DefaultBrush );
+	}
+
+	static void GetResources( TArray< const FSlateBrush* >& OutResources )
+	{
+		return Get().GetResources( OutResources );
+	}
+
+	static const FName& GetStyleSetName()
+	{
+		return Instance->GetStyleSetName();
+	}
+
+	/**
+	 * Concatenates two FNames.e If A and B are "Path.To" and ".Something"
+	 * the result "Path.To.Something".
+	 *
+	 * @param A  First FName
+	 * @param B  Second name
+	 *
+	 * @return New FName that is A concatenated with B.
+	 */
+	static FName Join( FName A, const ANSICHAR* B )
+	{
+		if( B == NULL )
+		{
+			return A;
+		}
+		else
+		{
+			return FName( *( A.ToString() + B ) );
+		}
+	}
+
+	static void ResetToDefault();
+
+
+protected:
+
+	static void SetStyle( const TSharedRef< class ISlateStyle >& NewStyle );
+
+private:
+
+	/** Singleton instance of the slate style */
+	static TSharedPtr< class ISlateStyle > Instance;
+};
diff --git a/Source/SodaStyle/SodaStyle.Build.cs b/Source/SodaStyle/SodaStyle.Build.cs
new file mode 100644
index 0000000..3c95c15
--- /dev/null
+++ b/Source/SodaStyle/SodaStyle.Build.cs
@@ -0,0 +1,76 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+using UnrealBuildTool;
+using System.Diagnostics;
+using System.Collections.Generic;
+using System.IO;
+using System;
+
+public class SodaStyle : ModuleRules
+{
+	public SodaStyle(ReadOnlyTargetRules Target) : base(Target)
+	{
+        PublicIncludePaths.AddRange(
+			new string[] 
+			{
+				Path.Combine(ModuleDirectory, "Public"),
+			}
+		);
+
+		PrivateIncludePaths.AddRange(
+			new string[] {
+				Path.Combine(ModuleDirectory, "Private"),
+			}
+		);
+
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+				"Engine",
+				"Slate",
+				"SlateCore",
+			}
+		);
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"DesktopPlatform",
+				"Projects"
+			}
+		);
+		
+		//bEnableExceptions = true;
+		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+		//bEnableUndefinedIdentifierWarnings = false;
+		//bUseRTTI = true;
+		//MinFilesUsingPrecompiledHeaderOverride = 1;
+		//bFasterWithoutUnity = true;
+		//bUsePrecompiled = true;
+		bUseUnity = false;
+
+        // The Shipping configuration isn't supported yet
+        /*
+        if (Target.Configuration != UnrealTargetConfiguration.Shipping)
+        {
+            PrecompileForTargets = PrecompileTargetsType.Any;
+        }
+        else
+        {
+            PrecompileForTargets = PrecompileTargetsType.None;
+        }
+		*/
+
+        if (Target.Configuration == UnrealTargetConfiguration.Shipping)
+        {
+            throw new NullReferenceException("The Shipping configuration isn't supported yet");
+        }
+
+        if (!Directory.Exists(ModuleDirectory + "/Private"))
+        {
+            bUsePrecompiled = true;
+        }
+    }
+}
diff --git a/Source/ThirdParty/SDL2-2.0.10/BUGS.txt b/Source/ThirdParty/SDL2-2.0.10/BUGS.txt
new file mode 100644
index 0000000..a8e6b95
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/BUGS.txt
@@ -0,0 +1,16 @@
+
+Bugs are now managed in the SDL bug tracker, here:
+
+    https://bugzilla.libsdl.org/
+
+You may report bugs there, and search to see if a given issue has already
+ been reported, discussed, and maybe even fixed.
+
+
+You may also find help at the SDL forums/mailing list:
+
+    https://discourse.libsdl.org/
+
+Bug reports are welcome here, but we really appreciate if you use Bugzilla, as
+ bugs discussed on the mailing list may be forgotten or missed.
+
diff --git a/Source/ThirdParty/SDL2-2.0.10/COPYING.txt b/Source/ThirdParty/SDL2-2.0.10/COPYING.txt
new file mode 100644
index 0000000..9cdb5f8
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/COPYING.txt
@@ -0,0 +1,20 @@
+
+Simple DirectMedia Layer
+Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+  
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+  
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required. 
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
diff --git a/Source/ThirdParty/SDL2-2.0.10/README-SDL.txt b/Source/ThirdParty/SDL2-2.0.10/README-SDL.txt
new file mode 100644
index 0000000..8d92955
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/README-SDL.txt
@@ -0,0 +1,13 @@
+
+Please distribute this file with the SDL runtime environment:
+
+The Simple DirectMedia Layer (SDL for short) is a cross-platform library
+designed to make it easy to write multi-media software, such as games
+and emulators.
+
+The Simple DirectMedia Layer library source code is available from:
+https://www.libsdl.org/
+
+This library is distributed under the terms of the zlib license:
+http://www.zlib.net/zlib_license.html
+
diff --git a/Source/ThirdParty/SDL2-2.0.10/README.txt b/Source/ThirdParty/SDL2-2.0.10/README.txt
new file mode 100644
index 0000000..431ba0e
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/README.txt
@@ -0,0 +1,21 @@
+
+                         Simple DirectMedia Layer
+
+                                  (SDL)
+
+                                Version 2.0
+
+---
+https://www.libsdl.org/
+
+Simple DirectMedia Layer is a cross-platform development library designed
+to provide low level access to audio, keyboard, mouse, joystick, and graphics
+hardware via OpenGL and Direct3D. It is used by video playback software,
+emulators, and popular games including Valve's award winning catalog
+and many Humble Bundle games.
+
+More extensive documentation is available in the docs directory, starting
+with README.md
+
+Enjoy!
+	Sam Lantinga				(slouken@libsdl.org)
diff --git a/Source/ThirdParty/SDL2-2.0.10/SDL2_2010.Build.cs b/Source/ThirdParty/SDL2-2.0.10/SDL2_2010.Build.cs
new file mode 100644
index 0000000..c8283f5
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/SDL2_2010.Build.cs
@@ -0,0 +1,39 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+using System.IO;
+using UnrealBuildTool;
+
+public class SDL2_2010 : ModuleRules
+{
+	private string BinariesPath
+	{
+		get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../../../Binaries/", Target.Platform.ToString())); }
+	}
+
+	public SDL2_2010(ReadOnlyTargetRules Target) : base(Target)
+	{
+		Type = ModuleType.External;
+
+		if (Target.Platform == UnrealTargetPlatform.Win64)
+		{
+			//PublicDefinitions.Add("SDL_STATIC=0");
+			//PublicDefinitions.Add("SDL_SHARED=1");
+			//PublicDefinitions.Add("EPIC_EXTENSIONS=0");
+			//PublicDefinitions.Add("SDL_DEPRECATED=1");
+			PublicDefinitions.Add("SDL_WITH_EPIC_EXTENSIONS=1");
+			PublicDefinitions.Add("WIN32");
+
+			string includePath = Path.Combine(ModuleDirectory, "include");
+			PublicIncludePaths.AddRange(new string[] { includePath });
+
+			// Add the import library
+			PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib", "x64","SDL2.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib", "x64","SDL2main.lib"));
+			//PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib", "x64","Version.lib"));
+
+			// Delay-load the DLL, so we can load it from the right place first
+			RuntimeDependencies.Add(Path.Combine(BinariesPath, "SDL2.dll"));
+            PublicDelayLoadDLLs.Add("SDL2.dll");
+        }
+	}
+}
diff --git a/Source/ThirdParty/SDL2-2.0.10/SDL2_2010.tps b/Source/ThirdParty/SDL2-2.0.10/SDL2_2010.tps
new file mode 100644
index 0000000..5bfce86
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/SDL2_2010.tps
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TpsData xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<Notification>
+Notes: This is a sample module and not actually third party.
+</Notification>
+</TpsData>
diff --git a/Source/ThirdParty/SDL2-2.0.10/WhatsNew.txt b/Source/ThirdParty/SDL2-2.0.10/WhatsNew.txt
new file mode 100644
index 0000000..7f30501
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/WhatsNew.txt
@@ -0,0 +1,466 @@
+
+This is a list of major changes in SDL's version history.
+
+---------------------------------------------------------------------------
+2.0.10:
+---------------------------------------------------------------------------
+
+General:
+* The SDL_RW* macros have been turned into functions that are available only in 2.0.10 and onward
+* Added SDL_SIMDGetAlignment(), SDL_SIMDAlloc(), and SDL_SIMDFree(), to allocate memory aligned for SIMD operations for the current CPU
+* Added SDL_RenderDrawPointF(), SDL_RenderDrawPointsF(), SDL_RenderDrawLineF(), SDL_RenderDrawLinesF(), SDL_RenderDrawRectF(), SDL_RenderDrawRectsF(), SDL_RenderFillRectF(), SDL_RenderFillRectsF(), SDL_RenderCopyF(), SDL_RenderCopyExF(), to allow floating point precision in the SDL rendering API.
+* Added SDL_GetTouchDeviceType() to get the type of a touch device, which can be a touch screen or a trackpad in relative or absolute coordinate mode.
+* The SDL rendering API now uses batched rendering by default, for improved performance
+* Added SDL_RenderFlush() to force batched render commands to execute, if you're going to mix SDL rendering with native rendering
+* Added the hint SDL_HINT_RENDER_BATCHING to control whether batching should be used for the rendering API. This defaults to "1" if you don't specify what rendering driver to use when creating the renderer.
+* Added the hint SDL_HINT_EVENT_LOGGING to enable logging of SDL events for debugging purposes
+* Added the hint SDL_HINT_GAMECONTROLLERCONFIG_FILE to specify a file that will be loaded at joystick initialization with game controller bindings
+* Added the hint SDL_HINT_MOUSE_TOUCH_EVENTS to control whether SDL will synthesize touch events from mouse events
+* Improved handling of malformed WAVE and BMP files, fixing potential security exploits
+
+Linux:
+* Removed the Mir video driver in favor of Wayland
+
+iOS / tvOS:
+* Added support for Xbox and PS4 wireless controllers in iOS 13 and tvOS 13
+* Added support for text input using Bluetooth keyboards
+
+Android:
+* Added low latency audio using OpenSL ES
+* Removed SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH (replaced by SDL_HINT_MOUSE_TOUCH_EVENTS and SDL_HINT_TOUCH_MOUSE_EVENTS)
+  SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH=1, should be replaced by setting both previous hints to 0.
+  SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH=0, should be replaced by setting both previous hints to 1.
+* Added the hint SDL_HINT_ANDROID_BLOCK_ON_PAUSE to set whether the event loop will block itself when the app is paused.
+
+
+---------------------------------------------------------------------------
+2.0.9:
+---------------------------------------------------------------------------
+
+General:
+* Added a new sensor API, initialized by passing SDL_INIT_SENSOR to SDL_Init(), and defined in SDL_sensor.h
+* Added an event SDL_SENSORUPDATE which is sent when a sensor is updated
+* Added SDL_GetDisplayOrientation() to return the current display orientation
+* Added an event SDL_DISPLAYEVENT which is sent when the display orientation changes
+* Added HIDAPI joystick drivers for more consistent support for Xbox, PS4 and Nintendo Switch Pro controller support across platforms. (Thanks to Valve for contributing the PS4 and Nintendo Switch Pro controller support)
+* Added support for many other popular game controllers
+* Added SDL_JoystickGetDevicePlayerIndex(), SDL_JoystickGetPlayerIndex(), and SDL_GameControllerGetPlayerIndex() to get the player index for a controller. For XInput controllers this returns the XInput index for the controller.
+* Added SDL_GameControllerRumble() and SDL_JoystickRumble() which allow simple rumble without using the haptics API
+* Added SDL_GameControllerMappingForDeviceIndex() to get the mapping for a controller before it's opened
+* Added the hint SDL_HINT_MOUSE_DOUBLE_CLICK_TIME to control the mouse double-click time
+* Added the hint SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS to control the mouse double-click radius, in pixels
+* Added SDL_HasColorKey() to return whether a surface has a colorkey active
+* Added SDL_HasAVX512F() to return whether the CPU has AVX-512F features
+* Added SDL_IsTablet() to return whether the application is running on a tablet
+* Added SDL_THREAD_PRIORITY_TIME_CRITICAL for threads that must run at the highest priority
+
+Mac OS X:
+* Fixed black screen at start on Mac OS X Mojave
+
+Linux:
+* Added SDL_LinuxSetThreadPriority() to allow adjusting the thread priority of native threads using RealtimeKit if available.
+
+iOS:
+* Fixed Asian IME input
+
+Android:
+* Updated required Android SDK to API 26, to match Google's new App Store requirements
+* Added support for wired USB Xbox, PS4, and Nintendo Switch Pro controllers
+* Added support for relative mouse mode on Android 7.0 and newer (except where it's broken, on Chromebooks and when in DeX mode with Samsung Experience 9.0)
+* Added support for custom mouse cursors on Android 7.0 and newer
+* Added the hint SDL_HINT_ANDROID_TRAP_BACK_BUTTON to control whether the back button will back out of the app (the default) or be passed to the application as SDL_SCANCODE_AC_BACK
+* Added SDL_AndroidBackButton() to trigger the Android system back button behavior when handling the back button in the application
+* Added SDL_IsChromebook() to return whether the app is running in the Chromebook Android runtime
+* Added SDL_IsDeXMode() to return whether the app is running while docked in the Samsung DeX
+
+
+---------------------------------------------------------------------------
+2.0.8:
+---------------------------------------------------------------------------
+
+General:
+* Added SDL_fmod() and SDL_log10()
+* Each of the SDL math functions now has the corresponding float version
+* Added SDL_SetYUVConversionMode() and SDL_GetYUVConversionMode() to control the formula used when converting to and from YUV colorspace. The options are JPEG, BT.601, and BT.709
+
+Windows:
+* Implemented WASAPI support on Windows UWP and removed the deprecated XAudio2 implementation
+* Added resampling support on WASAPI on Windows 7 and above
+
+Windows UWP:
+* Added SDL_WinRTGetDeviceFamily() to find out what type of device your application is running on
+
+Mac OS X:
+* Added support for the Vulkan SDK for Mac:
+  https://www.lunarg.com/lunarg-releases-vulkan-sdk-1-0-69-0-for-mac/
+* Added support for OpenGL ES using ANGLE when it's available
+
+Mac OS X / iOS / tvOS:
+* Added a Metal 2D render implementation
+* Added SDL_RenderGetMetalLayer() and SDL_RenderGetMetalCommandEncoder() to insert your own drawing into SDL rendering when using the Metal implementation
+
+iOS:
+* Added the hint SDL_HINT_IOS_HIDE_HOME_INDICATOR to control whether the home indicator bar on iPhone X should be hidden. This defaults to dimming the indicator for fullscreen applications and showing the indicator for windowed applications.
+
+iOS / Android:
+* Added the hint SDL_HINT_RETURN_KEY_HIDES_IME to control whether the return key on the software keyboard should hide the keyboard or send a key event (the default)
+
+Android:
+* SDL now supports building with Android Studio and Gradle by default, and the old Ant project is available in android-project-ant
+* SDL now requires the API 19 SDK to build, but can still target devices down to API 14 (Android 4.0.1)
+* Added SDL_IsAndroidTV() to tell whether the application is running on Android TV
+
+Android / tvOS:
+* Added the hint SDL_HINT_TV_REMOTE_AS_JOYSTICK to control whether TV remotes should be listed as joystick devices (the default) or send keyboard events.
+
+Linux:
+* Added the hint SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR to control whether the X server should skip the compositor for the SDL application. This defaults to "1"
+* Added the hint SDL_HINT_VIDEO_DOUBLE_BUFFER to control whether the Raspberry Pi and KMSDRM video drivers should use double or triple buffering (the default)
+
+
+---------------------------------------------------------------------------
+2.0.7:
+---------------------------------------------------------------------------
+
+General:
+* Added audio stream conversion functions:
+	SDL_NewAudioStream
+	SDL_AudioStreamPut
+	SDL_AudioStreamGet
+	SDL_AudioStreamAvailable
+	SDL_AudioStreamFlush
+	SDL_AudioStreamClear
+	SDL_FreeAudioStream
+* Added functions to query and set the SDL memory allocation functions:
+	SDL_GetMemoryFunctions()
+	SDL_SetMemoryFunctions()
+	SDL_GetNumAllocations()
+* Added locking functions for multi-threaded access to the joystick and game controller APIs:
+	SDL_LockJoysticks()
+	SDL_UnlockJoysticks()
+* The following functions are now thread-safe:
+	SDL_SetEventFilter()
+	SDL_GetEventFilter()
+	SDL_AddEventWatch()
+	SDL_DelEventWatch()
+
+
+General:
+---------------------------------------------------------------------------
+2.0.6:
+---------------------------------------------------------------------------
+
+General:
+* Added cross-platform Vulkan graphics support in SDL_vulkan.h
+	SDL_Vulkan_LoadLibrary()
+	SDL_Vulkan_GetVkGetInstanceProcAddr()
+	SDL_Vulkan_GetInstanceExtensions()
+	SDL_Vulkan_CreateSurface()
+	SDL_Vulkan_GetDrawableSize()
+	SDL_Vulkan_UnloadLibrary()
+  This is all the platform-specific code you need to bring up Vulkan on all SDL platforms. You can look at an example in test/testvulkan.c
+* Added SDL_ComposeCustomBlendMode() to create custom blend modes for 2D rendering
+* Added SDL_HasNEON() which returns whether the CPU has NEON instruction support
+* Added support for many game controllers, including the Nintendo Switch Pro Controller
+* Added support for inverted axes and separate axis directions in game controller mappings
+* Added functions to return information about a joystick before it's opened:
+	SDL_JoystickGetDeviceVendor()
+	SDL_JoystickGetDeviceProduct()
+	SDL_JoystickGetDeviceProductVersion()
+	SDL_JoystickGetDeviceType()
+	SDL_JoystickGetDeviceInstanceID()
+* Added functions to return information about an open joystick:
+	SDL_JoystickGetVendor()
+	SDL_JoystickGetProduct()
+	SDL_JoystickGetProductVersion()
+	SDL_JoystickGetType()
+	SDL_JoystickGetAxisInitialState()
+* Added functions to return information about an open game controller:
+	SDL_GameControllerGetVendor()
+	SDL_GameControllerGetProduct()
+	SDL_GameControllerGetProductVersion()
+* Added SDL_GameControllerNumMappings() and SDL_GameControllerMappingForIndex() to be able to enumerate the built-in game controller mappings
+* Added SDL_LoadFile() and SDL_LoadFile_RW() to load a file into memory
+* Added SDL_DuplicateSurface() to make a copy of a surface
+* Added an experimental JACK audio driver
+* Implemented non-power-of-two audio resampling, optionally using libsamplerate to perform the resampling
+* Added the hint SDL_HINT_AUDIO_RESAMPLING_MODE to control the quality of resampling
+* Added the hint SDL_HINT_RENDER_LOGICAL_SIZE_MODE to control the scaling policy for SDL_RenderSetLogicalSize():
+	"0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen (the default)
+	"1" or "overscan"  - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen
+* Added the hints SDL_HINT_MOUSE_NORMAL_SPEED_SCALE and SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE to scale the mouse speed when being read from raw mouse input
+* Added the hint SDL_HINT_TOUCH_MOUSE_EVENTS to control whether SDL will synthesize mouse events from touch events
+
+Windows:
+* The new default audio driver on Windows is WASAPI and supports hot-plugging devices and changing the default audio device
+* The old XAudio2 audio driver is deprecated and will be removed in the next release
+* Added hints SDL_HINT_WINDOWS_INTRESOURCE_ICON and SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL to specify a custom icon resource ID for SDL windows
+* The hint SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING is now on by default for compatibility with .NET languages and various Windows debuggers
+* Updated the GUID format for game controller mappings, older mappings will be automatically converted on load
+* Implemented the SDL_WINDOW_ALWAYS_ON_TOP flag on Windows
+
+Linux:
+* Added an experimental KMS/DRM video driver for embedded development
+
+iOS:
+* Added a hint SDL_HINT_AUDIO_CATEGORY to control the audio category, determining whether the phone mute switch affects the audio
+
+---------------------------------------------------------------------------
+2.0.5:
+---------------------------------------------------------------------------
+
+General:
+* Implemented audio capture support for some platforms
+* Added SDL_DequeueAudio() to retrieve audio when buffer queuing is turned on for audio capture
+* Added events for dragging and dropping text
+* Added events for dragging and dropping multiple items
+* By default the click raising a window will not be delivered to the SDL application. You can set the hint SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH to "1" to allow that click through to the window.
+* Saving a surface with an alpha channel as a BMP will use a newer BMP format that supports alpha information. You can set the hint SDL_HINT_BMP_SAVE_LEGACY_FORMAT to "1" to use the old format.
+* Added SDL_GetHintBoolean() to get the boolean value of a hint
+* Added SDL_RenderSetIntegerScale() to set whether to smoothly scale or use integral multiples of the viewport size when scaling the rendering output
+* Added SDL_CreateRGBSurfaceWithFormat() and SDL_CreateRGBSurfaceWithFormatFrom() to create an SDL surface with a specific pixel format
+* Added SDL_GetDisplayUsableBounds() which returns the area usable for windows. For example, on Mac OS X, this subtracts the area occupied by the menu bar and dock.
+* Added SDL_GetWindowBordersSize() which returns the size of the window's borders around the client area
+* Added a window event SDL_WINDOWEVENT_HIT_TEST when a window had a hit test that wasn't SDL_HITTEST_NORMAL (e.g. in the title bar or window frame)
+* Added SDL_SetWindowResizable() to change whether a window is resizable
+* Added SDL_SetWindowOpacity() and SDL_GetWindowOpacity() to affect the window transparency
+* Added SDL_SetWindowModalFor() to set a window as modal for another window
+* Added support for AUDIO_U16LSB and AUDIO_U16MSB to SDL_MixAudioFormat()
+* Fixed flipped images when reading back from target textures when using the OpenGL renderer
+* Fixed texture color modulation with SDL_BLENDMODE_NONE when using the OpenGL renderer
+* Fixed bug where the alpha value of colorkeys was ignored when blitting in some cases
+
+Windows:
+* Added a hint SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING to prevent SDL from raising a debugger exception to name threads. This exception can cause problems with .NET applications when running under a debugger.
+* The hint SDL_HINT_THREAD_STACK_SIZE is now supported on Windows
+* Fixed XBox controller triggers automatically being pulled at startup
+* The first icon from the executable is used as the default window icon at runtime
+* Fixed SDL log messages being printed twice if SDL was built with C library support
+* Reset dead keys when the SDL window loses focus, so dead keys pressed in SDL applications don't affect text input into other applications.
+
+Mac OS X:
+* Fixed selecting the dummy video driver
+* The caps lock key now generates a pressed event when pressed and a released event when released, instead of a press/release event pair when pressed.
+* Fixed mouse wheel events on Mac OS X 10.12
+* The audio driver has been updated to use AVFoundation for better compatibility with newer versions of Mac OS X
+
+Linux:
+* Added support for the Fcitx IME
+* Added a window event SDL_WINDOWEVENT_TAKE_FOCUS when a window manager asks the SDL window whether it wants to take focus.
+* Refresh rates are now rounded instead of truncated, e.g. 59.94 Hz is rounded up to 60 Hz instead of 59.
+* Added initial support for touchscreens on Raspberry Pi
+
+OpenBSD:
+* SDL_GetBasePath() is now implemented on OpenBSD
+
+iOS:
+* Added support for dynamically loaded objects on iOS 8 and newer
+
+tvOS:
+* Added support for Apple TV
+* Added a hint SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION to control whether he Apple TV remote's joystick axes will automatically match the rotation of the remote.  
+
+Android:
+* Fixed SDL not resizing window when Android screen resolution changes
+* Corrected the joystick Z axis reporting for the accelerometer
+
+Emscripten (running in a web browser):
+* Many bug fixes and improvements
+
+
+---------------------------------------------------------------------------
+2.0.4:
+---------------------------------------------------------------------------
+
+General:
+* Added support for web applications using Emscripten, see docs/README-emscripten.md for more information
+* Added support for web applications using Native Client (NaCl), see docs/README-nacl.md for more information
+* Added an API to queue audio instead of using the audio callback:
+    SDL_QueueAudio(), SDL_GetQueuedAudioSize(), SDL_ClearQueuedAudio()
+* Added events for audio device hot plug support:
+    SDL_AUDIODEVICEADDED, SDL_AUDIODEVICEREMOVED
+* Added SDL_PointInRect()
+* Added SDL_HasAVX2() to detect CPUs with AVX2 support
+* Added SDL_SetWindowHitTest() to let apps treat parts of their SDL window like traditional window decorations (drag areas, resize areas)
+* Added SDL_GetGrabbedWindow() to get the window that currently has input grab, if any
+* Added SDL_RenderIsClipEnabled() to tell whether clipping is currently enabled in a renderer
+* Added SDL_CaptureMouse() to capture the mouse to get events while the mouse is not in your window
+* Added SDL_WarpMouseGlobal() to warp the mouse cursor in global screen space
+* Added SDL_GetGlobalMouseState() to get the current mouse state outside of an SDL window
+* Added a direction field to mouse wheel events to tell whether they are flipped (natural) or not
+* Added GL_CONTEXT_RELEASE_BEHAVIOR GL attribute (maps to [WGL|GLX]_ARB_context_flush_control extension)
+* Added EGL_KHR_create_context support to allow OpenGL ES version selection on some platforms
+* Added NV12 and NV21 YUV texture support for OpenGL and OpenGL ES 2.0 renderers
+* Added a Vivante video driver that is used on various SoC platforms
+* Added an event SDL_RENDER_DEVICE_RESET that is sent from the D3D renderers when the D3D device is lost, and from Android's event loop when the GLES context had to be recreated
+* Added a hint SDL_HINT_NO_SIGNAL_HANDLERS to disable SDL's built in signal handling
+* Added a hint SDL_HINT_THREAD_STACK_SIZE to set the stack size of SDL's threads
+* Added SDL_sqrtf(), SDL_tan(), and SDL_tanf() to the stdlib routines
+* Improved support for WAV and BMP files with unusual chunks in them
+* Renamed SDL_assert_data to SDL_AssertData and SDL_assert_state to SDL_AssertState
+* Added a hint SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN to prevent window interaction while cursor is hidden
+* Added SDL_GetDisplayDPI() to get the DPI information for a display
+* Added SDL_JoystickCurrentPowerLevel() to get the battery level of a joystick
+* Added SDL_JoystickFromInstanceID(), as a helper function, to get the SDL_Joystick* that an event is referring to.
+* Added SDL_GameControllerFromInstanceID(), as a helper function, to get the SDL_GameController* that an event is referring to.
+
+Windows:
+* Added support for Windows Phone 8.1 and Windows 10/UWP (Universal Windows Platform)
+* Timer resolution is now 1 ms by default, adjustable with the SDL_HINT_TIMER_RESOLUTION hint
+* SDLmain no longer depends on the C runtime, so you can use the same .lib in both Debug and Release builds
+* Added SDL_SetWindowsMessageHook() to set a function to be called for every windows message before TranslateMessage()
+* Added a hint SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP to control whether SDL_PumpEvents() processes the Windows message loop
+* You can distinguish between real mouse and touch events by looking for SDL_TOUCH_MOUSEID in the mouse event "which" field
+* SDL_SysWMinfo now contains the window HDC
+* Added support for Unicode command line options
+* Prevent beeping when Alt-key combos are pressed
+* SDL_SetTextInputRect() re-positions the OS-rendered IME
+* Added a hint SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 to prevent generating SDL_WINDOWEVENT_CLOSE events when Alt-F4 is pressed
+* Added a hint SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING to use the old axis and button mapping for XInput devices (deprecated)
+
+Mac OS X:
+* Implemented drag-and-drop support
+* Improved joystick hot-plug detection
+* The SDL_WINDOWEVENT_EXPOSED window event is triggered in the appropriate situations
+* Fixed relative mouse mode when the application loses/regains focus
+* Fixed bugs related to transitioning to and from Spaces-aware fullscreen-desktop mode
+* Fixed the refresh rate of display modes
+* SDL_SysWMInfo is now ARC-compatible
+* Added a hint SDL_HINT_MAC_BACKGROUND_APP to prevent forcing the application to become a foreground process
+
+Linux:
+* Enabled building with Mir and Wayland support by default.
+* Added IBus IME support
+* Added a hint SDL_HINT_IME_INTERNAL_EDITING to control whether IBus should handle text editing internally instead of sending SDL_TEXTEDITING events
+* Added a hint SDL_HINT_VIDEO_X11_NET_WM_PING to allow disabling _NET_WM_PING protocol handling in SDL_CreateWindow()
+* Added support for multiple audio devices when using Pulseaudio
+* Fixed duplicate mouse events when using relative mouse motion
+
+iOS:
+* Added support for iOS 8
+* The SDL_WINDOW_ALLOW_HIGHDPI window flag now enables high-dpi support, and SDL_GL_GetDrawableSize() or SDL_GetRendererOutputSize() gets the window resolution in pixels
+* SDL_GetWindowSize() and display mode sizes are in the "DPI-independent points" / "screen coordinates" coordinate space rather than pixels (matches OS X behavior)
+* Added native resolution support for the iPhone 6 Plus
+* Added support for MFi game controllers
+* Added support for the hint SDL_HINT_ACCELEROMETER_AS_JOYSTICK
+* Added sRGB OpenGL ES context support on iOS 7+
+* Added support for SDL_DisableScreenSaver(), SDL_EnableScreenSaver() and the hint SDL_HINT_VIDEO_ALLOW_SCREENSAVER
+* SDL_SysWMinfo now contains the OpenGL ES framebuffer and color renderbuffer objects used by the window's active GLES view
+* Fixed various rotation and orientation issues
+* Fixed memory leaks
+
+Android:
+* Added a hint SDL_HINT_ANDROID_SEPARATE_MOUSE_AND_TOUCH to prevent mouse events from being registered as touch events
+* Added hints SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION and SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION
+* Added support for SDL_DisableScreenSaver(), SDL_EnableScreenSaver() and the hint SDL_HINT_VIDEO_ALLOW_SCREENSAVER
+* Added support for SDL_ShowMessageBox() and SDL_ShowSimpleMessageBox()
+
+Raspberry Pi:
+* Added support for the Raspberry Pi 2
+
+
+---------------------------------------------------------------------------
+2.0.3:
+---------------------------------------------------------------------------
+
+Mac OS X:
+* Fixed creating an OpenGL context by default on Mac OS X 10.6
+
+
+---------------------------------------------------------------------------
+2.0.2:
+---------------------------------------------------------------------------
+General:
+* Added SDL_GL_ResetAttributes() to reset OpenGL attributes to default values
+* Added an API to load a database of game controller mappings from a file:
+    SDL_GameControllerAddMappingsFromFile(), SDL_GameControllerAddMappingsFromRW()
+* Added game controller mappings for the PS4 and OUYA controllers
+* Added SDL_GetDefaultAssertionHandler() and SDL_GetAssertionHandler()
+* Added SDL_DetachThread()
+* Added SDL_HasAVX() to determine if the CPU has AVX features
+* Added SDL_vsscanf(), SDL_acos(), and SDL_asin() to the stdlib routines
+* EGL can now create/manage OpenGL and OpenGL ES 1.x/2.x contexts, and share
+  them using SDL_GL_SHARE_WITH_CURRENT_CONTEXT
+* Added a field "clicks" to the mouse button event which records whether the event is a single click, double click, etc.
+* The screensaver is now disabled by default, and there is a hint SDL_HINT_VIDEO_ALLOW_SCREENSAVER that can change that behavior.
+* Added a hint SDL_HINT_MOUSE_RELATIVE_MODE_WARP to specify whether mouse relative mode should be emulated using mouse warping.
+* testgl2 does not need to link with libGL anymore
+* Added testgles2 test program to demonstrate working with OpenGL ES 2.0
+* Added controllermap test program to visually map a game controller
+
+Windows:
+* Support for OpenGL ES 2.x contexts using either WGL or EGL (natively via
+  the driver or emulated through ANGLE)
+* Added a hint SDL_HINT_VIDEO_WIN_D3DCOMPILER to specify which D3D shader compiler to use for OpenGL ES 2 support through ANGLE
+* Added a hint SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT that is useful when creating multiple windows that should share the same OpenGL context.
+* Added an event SDL_RENDER_TARGETS_RESET that is sent when D3D9 render targets are reset after the device has been restored.
+
+Mac OS X:
+* Added a hint SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK to control whether Ctrl+click should be treated as a right click on Mac OS X. This is off by default.
+
+Linux:
+* Fixed fullscreen and focused behavior when receiving NotifyGrab events
+* Added experimental Wayland and Mir support, disabled by default
+
+Android:
+* Joystick support (minimum SDK version required to build SDL is now 12, 
+  the required runtime version remains at 10, but on such devices joystick 
+  support won't be available).
+* Hotplugging support for joysticks
+* Added a hint SDL_HINT_ACCELEROMETER_AS_JOYSTICK to control whether the accelerometer should be listed as a 3 axis joystick, which it will by default.
+
+
+---------------------------------------------------------------------------
+2.0.1:
+---------------------------------------------------------------------------
+
+General:
+* Added an API to get common filesystem paths in SDL_filesystem.h:
+    SDL_GetBasePath(), SDL_GetPrefPath()
+* Added an API to do optimized YV12 and IYUV texture updates:
+    SDL_UpdateYUVTexture()
+* Added an API to get the amount of RAM on the system:
+    SDL_GetSystemRAM()
+* Added a macro to perform timestamp comparisons with SDL_GetTicks():
+    SDL_TICKS_PASSED()
+* Dramatically improved OpenGL ES 2.0 rendering performance
+* Added OpenGL attribute SDL_GL_FRAMEBUFFER_SRGB_CAPABLE
+
+Windows:
+* Created a static library configuration for the Visual Studio 2010 project
+* Added a hint to create the Direct3D device with support for multi-threading:
+    SDL_HINT_RENDER_DIRECT3D_THREADSAFE
+* Added a function to get the D3D9 adapter index for a display:
+    SDL_Direct3D9GetAdapterIndex()
+* Added a function to get the D3D9 device for a D3D9 renderer:
+    SDL_RenderGetD3D9Device()
+* Fixed building SDL with the mingw32 toolchain (mingw-w64 is preferred)
+* Fixed crash when using two XInput controllers at the same time
+* Fixed detecting a mixture of XInput and DirectInput controllers
+* Fixed clearing a D3D render target larger than the window
+* Improved support for format specifiers in SDL_snprintf()
+
+Mac OS X:
+* Added support for retina displays:
+  Create your window with the SDL_WINDOW_ALLOW_HIGHDPI flag, and then use SDL_GL_GetDrawableSize() to find the actual drawable size. You are responsible for scaling mouse and drawing coordinates appropriately.
+* Fixed mouse warping in fullscreen mode
+* Right mouse click is emulated by holding the Ctrl key while left clicking
+
+Linux:
+* Fixed float audio support with the PulseAudio driver
+* Fixed missing line endpoints in the OpenGL renderer on some drivers
+* X11 symbols are no longer defined to avoid collisions when linking statically
+
+iOS:
+* Fixed status bar visibility on iOS 7
+* Flipped the accelerometer Y axis to match expected values
+
+Android:
+IMPORTANT: You MUST get the updated SDLActivity.java to match C code
+* Moved EGL initialization to native code 
+* Fixed the accelerometer axis rotation relative to the device rotation
+* Fixed race conditions when handling the EGL context on pause/resume
+* Touch devices are available for enumeration immediately after init
+
+Raspberry Pi:
+* Added support for the Raspberry Pi, see README-raspberrypi.txt for details
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL.h
new file mode 100644
index 0000000..88dce0c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL.h
@@ -0,0 +1,135 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL.h
+ *
+ *  Main include header for the SDL library
+ */
+
+
+#ifndef SDL_h_
+#define SDL_h_
+
+#include "SDL_main.h"
+#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+#include "SDL_atomic.h"
+#include "SDL_audio.h"
+#include "SDL_clipboard.h"
+#include "SDL_cpuinfo.h"
+#include "SDL_endian.h"
+#include "SDL_error.h"
+#include "SDL_events.h"
+#include "SDL_filesystem.h"
+#include "SDL_gamecontroller.h"
+#include "SDL_haptic.h"
+#include "SDL_hints.h"
+#include "SDL_joystick.h"
+#include "SDL_loadso.h"
+#include "SDL_log.h"
+#include "SDL_messagebox.h"
+#include "SDL_mutex.h"
+#include "SDL_power.h"
+#include "SDL_render.h"
+#include "SDL_rwops.h"
+#include "SDL_sensor.h"
+#include "SDL_shape.h"
+#include "SDL_system.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
+#include "SDL_version.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* As of version 0.5, SDL is loaded dynamically into the application */
+
+/**
+ *  \name SDL_INIT_*
+ *
+ *  These are the flags which may be passed to SDL_Init().  You should
+ *  specify the subsystems which you will be using in your application.
+ */
+/* @{ */
+#define SDL_INIT_TIMER          0x00000001u
+#define SDL_INIT_AUDIO          0x00000010u
+#define SDL_INIT_VIDEO          0x00000020u  /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
+#define SDL_INIT_JOYSTICK       0x00000200u  /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
+#define SDL_INIT_HAPTIC         0x00001000u
+#define SDL_INIT_GAMECONTROLLER 0x00002000u  /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
+#define SDL_INIT_EVENTS         0x00004000u
+#define SDL_INIT_SENSOR         0x00008000u
+#define SDL_INIT_NOPARACHUTE    0x00100000u  /**< compatibility; this flag is ignored. */
+#define SDL_INIT_EVERYTHING ( \
+                SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
+                SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER | SDL_INIT_SENSOR \
+            )
+/* @} */
+
+/**
+ *  This function initializes  the subsystems specified by \c flags
+ */
+extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
+
+/**
+ *  This function initializes specific SDL subsystems
+ *
+ *  Subsystem initialization is ref-counted, you must call
+ *  SDL_QuitSubSystem() for each SDL_InitSubSystem() to correctly
+ *  shutdown a subsystem manually (or call SDL_Quit() to force shutdown).
+ *  If a subsystem is already loaded then this call will
+ *  increase the ref-count and return.
+ */
+extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
+
+/**
+ *  This function cleans up specific SDL subsystems
+ */
+extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
+
+/**
+ *  This function returns a mask of the specified subsystems which have
+ *  previously been initialized.
+ *
+ *  If \c flags is 0, it returns a mask of all initialized subsystems.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
+
+/**
+ *  This function cleans up all initialized subsystems. You should
+ *  call it upon all exit conditions.
+ */
+extern DECLSPEC void SDLCALL SDL_Quit(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_assert.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_assert.h
new file mode 100644
index 0000000..75b9592
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_assert.h
@@ -0,0 +1,291 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_assert_h_
+#define SDL_assert_h_
+
+#include "SDL_config.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef SDL_ASSERT_LEVEL
+#ifdef SDL_DEFAULT_ASSERT_LEVEL
+#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
+#elif defined(_DEBUG) || defined(DEBUG) || \
+      (defined(__GNUC__) && !defined(__OPTIMIZE__))
+#define SDL_ASSERT_LEVEL 2
+#else
+#define SDL_ASSERT_LEVEL 1
+#endif
+#endif /* SDL_ASSERT_LEVEL */
+
+/*
+These are macros and not first class functions so that the debugger breaks
+on the assertion line and not in some random guts of SDL, and so each
+assert can have unique static variables associated with it.
+*/
+
+#if defined(_MSC_VER)
+/* Don't include intrin.h here because it contains C++ code */
+    extern void __cdecl __debugbreak(void);
+    #define SDL_TriggerBreakpoint() __debugbreak()
+#elif ( (!defined(__NACL__)) && ((defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__))) )
+    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
+#elif defined(__386__) && defined(__WATCOMC__)
+    #define SDL_TriggerBreakpoint() { _asm { int 0x03 } }
+#elif defined(HAVE_SIGNAL_H) && !defined(__WATCOMC__)
+    #include <signal.h>
+    #define SDL_TriggerBreakpoint() raise(SIGTRAP)
+#else
+    /* How do we trigger breakpoints on this platform? */
+    #define SDL_TriggerBreakpoint()
+#endif
+
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
+#   define SDL_FUNCTION __func__
+#elif (defined(__GNUC__) && (__GNUC__ >= 2) || defined(_MSC_VER) || defined (__WATCOMC__))
+#   define SDL_FUNCTION __FUNCTION__
+#else
+#   define SDL_FUNCTION "???"
+#endif
+#define SDL_FILE    __FILE__
+#define SDL_LINE    __LINE__
+
+/*
+sizeof (x) makes the compiler still parse the expression even without
+assertions enabled, so the code is always checked at compile time, but
+doesn't actually generate code for it, so there are no side effects or
+expensive checks at run time, just the constant size of what x WOULD be,
+which presumably gets optimized out as unused.
+This also solves the problem of...
+
+    int somevalue = blah();
+    SDL_assert(somevalue == 1);
+
+...which would cause compiles to complain that somevalue is unused if we
+disable assertions.
+*/
+
+/* "while (0,0)" fools Microsoft's compiler's /W4 warning level into thinking
+    this condition isn't constant. And looks like an owl's face! */
+#ifdef _MSC_VER  /* stupid /W4 warnings. */
+#define SDL_NULL_WHILE_LOOP_CONDITION (0,0)
+#else
+#define SDL_NULL_WHILE_LOOP_CONDITION (0)
+#endif
+
+#define SDL_disabled_assert(condition) \
+    do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION)
+
+typedef enum
+{
+    SDL_ASSERTION_RETRY,  /**< Retry the assert immediately. */
+    SDL_ASSERTION_BREAK,  /**< Make the debugger trigger a breakpoint. */
+    SDL_ASSERTION_ABORT,  /**< Terminate the program. */
+    SDL_ASSERTION_IGNORE,  /**< Ignore the assert. */
+    SDL_ASSERTION_ALWAYS_IGNORE  /**< Ignore the assert from now on. */
+} SDL_AssertState;
+
+typedef struct SDL_AssertData
+{
+    int always_ignore;
+    unsigned int trigger_count;
+    const char *condition;
+    const char *filename;
+    int linenum;
+    const char *function;
+    const struct SDL_AssertData *next;
+} SDL_AssertData;
+
+#if (SDL_ASSERT_LEVEL > 0)
+
+/* Never call this directly. Use the SDL_assert* macros. */
+extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *,
+                                                             const char *,
+                                                             const char *, int)
+#if defined(__clang__)
+#if __has_feature(attribute_analyzer_noreturn)
+/* this tells Clang's static analysis that we're a custom assert function,
+   and that the analyzer should assume the condition was always true past this
+   SDL_assert test. */
+   __attribute__((analyzer_noreturn))
+#endif
+#endif
+;
+
+/* the do {} while(0) avoids dangling else problems:
+    if (x) SDL_assert(y); else blah();
+       ... without the do/while, the "else" could attach to this macro's "if".
+   We try to handle just the minimum we need here in a macro...the loop,
+   the static vars, and break points. The heavy lifting is handled in
+   SDL_ReportAssertion(), in SDL_assert.c.
+*/
+#define SDL_enabled_assert(condition) \
+    do { \
+        while ( !(condition) ) { \
+            static struct SDL_AssertData sdl_assert_data = { \
+                0, 0, #condition, 0, 0, 0, 0 \
+            }; \
+            const SDL_AssertState sdl_assert_state = SDL_ReportAssertion(&sdl_assert_data, SDL_FUNCTION, SDL_FILE, SDL_LINE); \
+            if (sdl_assert_state == SDL_ASSERTION_RETRY) { \
+                continue; /* go again. */ \
+            } else if (sdl_assert_state == SDL_ASSERTION_BREAK) { \
+                SDL_TriggerBreakpoint(); \
+            } \
+            break; /* not retrying. */ \
+        } \
+    } while (SDL_NULL_WHILE_LOOP_CONDITION)
+
+#endif  /* enabled assertions support code */
+
+/* Enable various levels of assertions. */
+#if SDL_ASSERT_LEVEL == 0   /* assertions disabled */
+#   define SDL_assert(condition) SDL_disabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_disabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
+#elif SDL_ASSERT_LEVEL == 1  /* release settings. */
+#   define SDL_assert(condition) SDL_disabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
+#elif SDL_ASSERT_LEVEL == 2  /* normal settings. */
+#   define SDL_assert(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_disabled_assert(condition)
+#elif SDL_ASSERT_LEVEL == 3  /* paranoid settings. */
+#   define SDL_assert(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_release(condition) SDL_enabled_assert(condition)
+#   define SDL_assert_paranoid(condition) SDL_enabled_assert(condition)
+#else
+#   error Unknown assertion level.
+#endif
+
+/* this assertion is never disabled at any level. */
+#define SDL_assert_always(condition) SDL_enabled_assert(condition)
+
+
+typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)(
+                                 const SDL_AssertData* data, void* userdata);
+
+/**
+ *  \brief Set an application-defined assertion handler.
+ *
+ *  This allows an app to show its own assertion UI and/or force the
+ *  response to an assertion failure. If the app doesn't provide this, SDL
+ *  will try to do the right thing, popping up a system-specific GUI dialog,
+ *  and probably minimizing any fullscreen windows.
+ *
+ *  This callback may fire from any thread, but it runs wrapped in a mutex, so
+ *  it will only fire from one thread at a time.
+ *
+ *  Setting the callback to NULL restores SDL's original internal handler.
+ *
+ *  This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
+ *
+ *  Return SDL_AssertState value of how to handle the assertion failure.
+ *
+ *  \param handler Callback function, called when an assertion fails.
+ *  \param userdata A pointer passed to the callback as-is.
+ */
+extern DECLSPEC void SDLCALL SDL_SetAssertionHandler(
+                                            SDL_AssertionHandler handler,
+                                            void *userdata);
+
+/**
+ *  \brief Get the default assertion handler.
+ *
+ *  This returns the function pointer that is called by default when an
+ *   assertion is triggered. This is an internal function provided by SDL,
+ *   that is used for assertions when SDL_SetAssertionHandler() hasn't been
+ *   used to provide a different function.
+ *
+ *  \return The default SDL_AssertionHandler that is called when an assert triggers.
+ */
+extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void);
+
+/**
+ *  \brief Get the current assertion handler.
+ *
+ *  This returns the function pointer that is called when an assertion is
+ *   triggered. This is either the value last passed to
+ *   SDL_SetAssertionHandler(), or if no application-specified function is
+ *   set, is equivalent to calling SDL_GetDefaultAssertionHandler().
+ *
+ *   \param puserdata Pointer to a void*, which will store the "userdata"
+ *                    pointer that was passed to SDL_SetAssertionHandler().
+ *                    This value will always be NULL for the default handler.
+ *                    If you don't care about this data, it is safe to pass
+ *                    a NULL pointer to this function to ignore it.
+ *  \return The SDL_AssertionHandler that is called when an assert triggers.
+ */
+extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata);
+
+/**
+ *  \brief Get a list of all assertion failures.
+ *
+ *  Get all assertions triggered since last call to SDL_ResetAssertionReport(),
+ *  or the start of the program.
+ *
+ *  The proper way to examine this data looks something like this:
+ *
+ *  <code>
+ *  const SDL_AssertData *item = SDL_GetAssertionReport();
+ *  while (item) {
+ *      printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n",
+ *             item->condition, item->function, item->filename,
+ *             item->linenum, item->trigger_count,
+ *             item->always_ignore ? "yes" : "no");
+ *      item = item->next;
+ *  }
+ *  </code>
+ *
+ *  \return List of all assertions.
+ *  \sa SDL_ResetAssertionReport
+ */
+extern DECLSPEC const SDL_AssertData * SDLCALL SDL_GetAssertionReport(void);
+
+/**
+ *  \brief Reset the list of all assertion failures.
+ *
+ *  Reset list of all assertions triggered.
+ *
+ *  \sa SDL_GetAssertionReport
+ */
+extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
+
+
+/* these had wrong naming conventions until 2.0.4. Please update your app! */
+#define SDL_assert_state SDL_AssertState
+#define SDL_assert_data SDL_AssertData
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_assert_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_atomic.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_atomic.h
new file mode 100644
index 0000000..deee35f
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_atomic.h
@@ -0,0 +1,295 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file SDL_atomic.h
+ *
+ * Atomic operations.
+ *
+ * IMPORTANT:
+ * If you are not an expert in concurrent lockless programming, you should
+ * only be using the atomic lock and reference counting functions in this
+ * file.  In all other cases you should be protecting your data structures
+ * with full mutexes.
+ *
+ * The list of "safe" functions to use are:
+ *  SDL_AtomicLock()
+ *  SDL_AtomicUnlock()
+ *  SDL_AtomicIncRef()
+ *  SDL_AtomicDecRef()
+ *
+ * Seriously, here be dragons!
+ * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ *
+ * You can find out a little more about lockless programming and the
+ * subtle issues that can arise here:
+ * http://msdn.microsoft.com/en-us/library/ee418650%28v=vs.85%29.aspx
+ *
+ * There's also lots of good information here:
+ * http://www.1024cores.net/home/lock-free-algorithms
+ * http://preshing.com/
+ *
+ * These operations may or may not actually be implemented using
+ * processor specific atomic operations. When possible they are
+ * implemented as true processor specific atomic operations. When that
+ * is not possible the are implemented using locks that *do* use the
+ * available atomic operations.
+ *
+ * All of the atomic operations that modify memory are full memory barriers.
+ */
+
+#ifndef SDL_atomic_h_
+#define SDL_atomic_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_platform.h"
+
+#include "begin_code.h"
+
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \name SDL AtomicLock
+ *
+ * The atomic locks are efficient spinlocks using CPU instructions,
+ * but are vulnerable to starvation and can spin forever if a thread
+ * holding a lock has been terminated.  For this reason you should
+ * minimize the code executed inside an atomic lock and never do
+ * expensive things like API or system calls while holding them.
+ *
+ * The atomic locks are not safe to lock recursively.
+ *
+ * Porting Note:
+ * The spin lock functions and type are required and can not be
+ * emulated because they are used in the atomic emulation code.
+ */
+/* @{ */
+
+typedef int SDL_SpinLock;
+
+/**
+ * \brief Try to lock a spin lock by setting it to a non-zero value.
+ *
+ * \param lock Points to the lock.
+ *
+ * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock);
+
+/**
+ * \brief Lock a spin lock by setting it to a non-zero value.
+ *
+ * \param lock Points to the lock.
+ */
+extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
+
+/**
+ * \brief Unlock a spin lock by setting it to 0. Always returns immediately
+ *
+ * \param lock Points to the lock.
+ */
+extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock);
+
+/* @} *//* SDL AtomicLock */
+
+
+/**
+ * The compiler barrier prevents the compiler from reordering
+ * reads and writes to globally visible variables across the call.
+ */
+#if defined(_MSC_VER) && (_MSC_VER > 1200) && !defined(__clang__)
+void _ReadWriteBarrier(void);
+#pragma intrinsic(_ReadWriteBarrier)
+#define SDL_CompilerBarrier()   _ReadWriteBarrier()
+#elif (defined(__GNUC__) && !defined(__EMSCRIPTEN__)) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5120))
+/* This is correct for all CPUs when using GCC or Solaris Studio 12.1+. */
+#define SDL_CompilerBarrier()   __asm__ __volatile__ ("" : : : "memory")
+#elif defined(__WATCOMC__)
+extern _inline void SDL_CompilerBarrier (void);
+#pragma aux SDL_CompilerBarrier = "" parm [] modify exact [];
+#else
+#define SDL_CompilerBarrier()   \
+{ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); }
+#endif
+
+/**
+ * Memory barriers are designed to prevent reads and writes from being
+ * reordered by the compiler and being seen out of order on multi-core CPUs.
+ *
+ * A typical pattern would be for thread A to write some data and a flag,
+ * and for thread B to read the flag and get the data. In this case you
+ * would insert a release barrier between writing the data and the flag,
+ * guaranteeing that the data write completes no later than the flag is
+ * written, and you would insert an acquire barrier between reading the
+ * flag and reading the data, to ensure that all the reads associated
+ * with the flag have completed.
+ *
+ * In this pattern you should always see a release barrier paired with
+ * an acquire barrier and you should gate the data reads/writes with a
+ * single flag variable.
+ *
+ * For more information on these semantics, take a look at the blog post:
+ * http://preshing.com/20120913/acquire-and-release-semantics
+ */
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierReleaseFunction(void);
+extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquireFunction(void);
+
+#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("lwsync" : : : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("lwsync" : : : "memory")
+#elif defined(__GNUC__) && defined(__aarch64__)
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("dmb ish" : : : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("dmb ish" : : : "memory")
+#elif defined(__GNUC__) && defined(__arm__)
+#if 0 /* defined(__LINUX__) || defined(__ANDROID__) */
+/* Information from:
+   https://chromium.googlesource.com/chromium/chromium/+/trunk/base/atomicops_internals_arm_gcc.h#19
+
+   The Linux kernel provides a helper function which provides the right code for a memory barrier,
+   hard-coded at address 0xffff0fa0
+*/
+typedef void (*SDL_KernelMemoryBarrierFunc)();
+#define SDL_MemoryBarrierRelease()	((SDL_KernelMemoryBarrierFunc)0xffff0fa0)()
+#define SDL_MemoryBarrierAcquire()	((SDL_KernelMemoryBarrierFunc)0xffff0fa0)()
+#elif 0 /* defined(__QNXNTO__) */
+#include <sys/cpuinline.h>
+
+#define SDL_MemoryBarrierRelease()   __cpu_membarrier()
+#define SDL_MemoryBarrierAcquire()   __cpu_membarrier()
+#else
+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) || defined(__ARM_ARCH_8A__)
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("dmb ish" : : : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("dmb ish" : : : "memory")
+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_5TE__)
+#ifdef __thumb__
+/* The mcr instruction isn't available in thumb mode, use real functions */
+#define SDL_MEMORY_BARRIER_USES_FUNCTION
+#define SDL_MemoryBarrierRelease()   SDL_MemoryBarrierReleaseFunction()
+#define SDL_MemoryBarrierAcquire()   SDL_MemoryBarrierAcquireFunction()
+#else
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory")
+#endif /* __thumb__ */
+#else
+#define SDL_MemoryBarrierRelease()   __asm__ __volatile__ ("" : : : "memory")
+#define SDL_MemoryBarrierAcquire()   __asm__ __volatile__ ("" : : : "memory")
+#endif /* __LINUX__ || __ANDROID__ */
+#endif /* __GNUC__ && __arm__ */
+#else
+#if (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5120))
+/* This is correct for all CPUs on Solaris when using Solaris Studio 12.1+. */
+#include <mbarrier.h>
+#define SDL_MemoryBarrierRelease()  __machine_rel_barrier()
+#define SDL_MemoryBarrierAcquire()  __machine_acq_barrier()
+#else
+/* This is correct for the x86 and x64 CPUs, and we'll expand this over time. */
+#define SDL_MemoryBarrierRelease()  SDL_CompilerBarrier()
+#define SDL_MemoryBarrierAcquire()  SDL_CompilerBarrier()
+#endif
+#endif
+
+/**
+ * \brief A type representing an atomic integer value.  It is a struct
+ *        so people don't accidentally use numeric operations on it.
+ */
+typedef struct { int value; } SDL_atomic_t;
+
+/**
+ * \brief Set an atomic variable to a new value if it is currently an old value.
+ *
+ * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise.
+ *
+ * \note If you don't know what this function is for, you shouldn't use it!
+*/
+extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval);
+
+/**
+ * \brief Set an atomic variable to a value.
+ *
+ * \return The previous value of the atomic variable.
+ */
+extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v);
+
+/**
+ * \brief Get the value of an atomic variable
+ */
+extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a);
+
+/**
+ * \brief Add to an atomic variable.
+ *
+ * \return The previous value of the atomic variable.
+ *
+ * \note This same style can be used for any number operation
+ */
+extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v);
+
+/**
+ * \brief Increment an atomic variable used as a reference count.
+ */
+#ifndef SDL_AtomicIncRef
+#define SDL_AtomicIncRef(a)    SDL_AtomicAdd(a, 1)
+#endif
+
+/**
+ * \brief Decrement an atomic variable used as a reference count.
+ *
+ * \return SDL_TRUE if the variable reached zero after decrementing,
+ *         SDL_FALSE otherwise
+ */
+#ifndef SDL_AtomicDecRef
+#define SDL_AtomicDecRef(a)    (SDL_AtomicAdd(a, -1) == 1)
+#endif
+
+/**
+ * \brief Set a pointer to a new value if it is currently an old value.
+ *
+ * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise.
+ *
+ * \note If you don't know what this function is for, you shouldn't use it!
+*/
+extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval);
+
+/**
+ * \brief Set a pointer to a value atomically.
+ *
+ * \return The previous value of the pointer.
+ */
+extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v);
+
+/**
+ * \brief Get the value of a pointer atomically.
+ */
+extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+
+#include "close_code.h"
+
+#endif /* SDL_atomic_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_audio.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_audio.h
new file mode 100644
index 0000000..305c01a
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_audio.h
@@ -0,0 +1,859 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_audio.h
+ *
+ *  Access to the raw audio mixing buffer for the SDL library.
+ */
+
+#ifndef SDL_audio_h_
+#define SDL_audio_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_endian.h"
+#include "SDL_mutex.h"
+#include "SDL_thread.h"
+#include "SDL_rwops.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Audio format flags.
+ *
+ *  These are what the 16 bits in SDL_AudioFormat currently mean...
+ *  (Unspecified bits are always zero).
+ *
+ *  \verbatim
+    ++-----------------------sample is signed if set
+    ||
+    ||       ++-----------sample is bigendian if set
+    ||       ||
+    ||       ||          ++---sample is float if set
+    ||       ||          ||
+    ||       ||          || +---sample bit size---+
+    ||       ||          || |                     |
+    15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
+    \endverbatim
+ *
+ *  There are macros in SDL 2.0 and later to query these bits.
+ */
+typedef Uint16 SDL_AudioFormat;
+
+/**
+ *  \name Audio flags
+ */
+/* @{ */
+
+#define SDL_AUDIO_MASK_BITSIZE       (0xFF)
+#define SDL_AUDIO_MASK_DATATYPE      (1<<8)
+#define SDL_AUDIO_MASK_ENDIAN        (1<<12)
+#define SDL_AUDIO_MASK_SIGNED        (1<<15)
+#define SDL_AUDIO_BITSIZE(x)         (x & SDL_AUDIO_MASK_BITSIZE)
+#define SDL_AUDIO_ISFLOAT(x)         (x & SDL_AUDIO_MASK_DATATYPE)
+#define SDL_AUDIO_ISBIGENDIAN(x)     (x & SDL_AUDIO_MASK_ENDIAN)
+#define SDL_AUDIO_ISSIGNED(x)        (x & SDL_AUDIO_MASK_SIGNED)
+#define SDL_AUDIO_ISINT(x)           (!SDL_AUDIO_ISFLOAT(x))
+#define SDL_AUDIO_ISLITTLEENDIAN(x)  (!SDL_AUDIO_ISBIGENDIAN(x))
+#define SDL_AUDIO_ISUNSIGNED(x)      (!SDL_AUDIO_ISSIGNED(x))
+
+/**
+ *  \name Audio format flags
+ *
+ *  Defaults to LSB byte order.
+ */
+/* @{ */
+#define AUDIO_U8        0x0008  /**< Unsigned 8-bit samples */
+#define AUDIO_S8        0x8008  /**< Signed 8-bit samples */
+#define AUDIO_U16LSB    0x0010  /**< Unsigned 16-bit samples */
+#define AUDIO_S16LSB    0x8010  /**< Signed 16-bit samples */
+#define AUDIO_U16MSB    0x1010  /**< As above, but big-endian byte order */
+#define AUDIO_S16MSB    0x9010  /**< As above, but big-endian byte order */
+#define AUDIO_U16       AUDIO_U16LSB
+#define AUDIO_S16       AUDIO_S16LSB
+/* @} */
+
+/**
+ *  \name int32 support
+ */
+/* @{ */
+#define AUDIO_S32LSB    0x8020  /**< 32-bit integer samples */
+#define AUDIO_S32MSB    0x9020  /**< As above, but big-endian byte order */
+#define AUDIO_S32       AUDIO_S32LSB
+/* @} */
+
+/**
+ *  \name float32 support
+ */
+/* @{ */
+#define AUDIO_F32LSB    0x8120  /**< 32-bit floating point samples */
+#define AUDIO_F32MSB    0x9120  /**< As above, but big-endian byte order */
+#define AUDIO_F32       AUDIO_F32LSB
+/* @} */
+
+/**
+ *  \name Native audio byte ordering
+ */
+/* @{ */
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+#define AUDIO_U16SYS    AUDIO_U16LSB
+#define AUDIO_S16SYS    AUDIO_S16LSB
+#define AUDIO_S32SYS    AUDIO_S32LSB
+#define AUDIO_F32SYS    AUDIO_F32LSB
+#else
+#define AUDIO_U16SYS    AUDIO_U16MSB
+#define AUDIO_S16SYS    AUDIO_S16MSB
+#define AUDIO_S32SYS    AUDIO_S32MSB
+#define AUDIO_F32SYS    AUDIO_F32MSB
+#endif
+/* @} */
+
+/**
+ *  \name Allow change flags
+ *
+ *  Which audio format changes are allowed when opening a device.
+ */
+/* @{ */
+#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE    0x00000001
+#define SDL_AUDIO_ALLOW_FORMAT_CHANGE       0x00000002
+#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE     0x00000004
+#define SDL_AUDIO_ALLOW_SAMPLES_CHANGE      0x00000008
+#define SDL_AUDIO_ALLOW_ANY_CHANGE          (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE|SDL_AUDIO_ALLOW_SAMPLES_CHANGE)
+/* @} */
+
+/* @} *//* Audio flags */
+
+/**
+ *  This function is called when the audio device needs more data.
+ *
+ *  \param userdata An application-specific parameter saved in
+ *                  the SDL_AudioSpec structure
+ *  \param stream A pointer to the audio data buffer.
+ *  \param len    The length of that buffer in bytes.
+ *
+ *  Once the callback returns, the buffer will no longer be valid.
+ *  Stereo samples are stored in a LRLRLR ordering.
+ *
+ *  You can choose to avoid callbacks and use SDL_QueueAudio() instead, if
+ *  you like. Just open your audio device with a NULL callback.
+ */
+typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream,
+                                            int len);
+
+/**
+ *  The calculated values in this structure are calculated by SDL_OpenAudio().
+ *
+ *  For multi-channel audio, the default SDL channel mapping is:
+ *  2:  FL FR                       (stereo)
+ *  3:  FL FR LFE                   (2.1 surround)
+ *  4:  FL FR BL BR                 (quad)
+ *  5:  FL FR FC BL BR              (quad + center)
+ *  6:  FL FR FC LFE SL SR          (5.1 surround - last two can also be BL BR)
+ *  7:  FL FR FC LFE BC SL SR       (6.1 surround)
+ *  8:  FL FR FC LFE BL BR SL SR    (7.1 surround)
+ */
+typedef struct SDL_AudioSpec
+{
+    int freq;                   /**< DSP frequency -- samples per second */
+    SDL_AudioFormat format;     /**< Audio data format */
+    Uint8 channels;             /**< Number of channels: 1 mono, 2 stereo */
+    Uint8 silence;              /**< Audio buffer silence value (calculated) */
+    Uint16 samples;             /**< Audio buffer size in sample FRAMES (total samples divided by channel count) */
+    Uint16 padding;             /**< Necessary for some compile environments */
+    Uint32 size;                /**< Audio buffer size in bytes (calculated) */
+    SDL_AudioCallback callback; /**< Callback that feeds the audio device (NULL to use SDL_QueueAudio()). */
+    void *userdata;             /**< Userdata passed to callback (ignored for NULL callbacks). */
+} SDL_AudioSpec;
+
+
+struct SDL_AudioCVT;
+typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt,
+                                          SDL_AudioFormat format);
+
+/**
+ *  \brief Upper limit of filters in SDL_AudioCVT
+ *
+ *  The maximum number of SDL_AudioFilter functions in SDL_AudioCVT is
+ *  currently limited to 9. The SDL_AudioCVT.filters array has 10 pointers,
+ *  one of which is the terminating NULL pointer.
+ */
+#define SDL_AUDIOCVT_MAX_FILTERS 9
+
+/**
+ *  \struct SDL_AudioCVT
+ *  \brief A structure to hold a set of audio conversion filters and buffers.
+ *
+ *  Note that various parts of the conversion pipeline can take advantage
+ *  of SIMD operations (like SSE2, for example). SDL_AudioCVT doesn't require
+ *  you to pass it aligned data, but can possibly run much faster if you
+ *  set both its (buf) field to a pointer that is aligned to 16 bytes, and its
+ *  (len) field to something that's a multiple of 16, if possible.
+ */
+#ifdef __GNUC__
+/* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't
+   pad it out to 88 bytes to guarantee ABI compatibility between compilers.
+   vvv
+   The next time we rev the ABI, make sure to size the ints and add padding.
+*/
+#define SDL_AUDIOCVT_PACKED __attribute__((packed))
+#else
+#define SDL_AUDIOCVT_PACKED
+#endif
+/* */
+typedef struct SDL_AudioCVT
+{
+    int needed;                 /**< Set to 1 if conversion possible */
+    SDL_AudioFormat src_format; /**< Source audio format */
+    SDL_AudioFormat dst_format; /**< Target audio format */
+    double rate_incr;           /**< Rate conversion increment */
+    Uint8 *buf;                 /**< Buffer to hold entire audio data */
+    int len;                    /**< Length of original audio buffer */
+    int len_cvt;                /**< Length of converted audio buffer */
+    int len_mult;               /**< buffer must be len*len_mult big */
+    double len_ratio;           /**< Given len, final size is len*len_ratio */
+    SDL_AudioFilter filters[SDL_AUDIOCVT_MAX_FILTERS + 1]; /**< NULL-terminated list of filter functions */
+    int filter_index;           /**< Current audio conversion function */
+} SDL_AUDIOCVT_PACKED SDL_AudioCVT;
+
+
+/* Function prototypes */
+
+/**
+ *  \name Driver discovery functions
+ *
+ *  These functions return the list of built in audio drivers, in the
+ *  order that they are normally initialized by default.
+ */
+/* @{ */
+extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void);
+extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index);
+/* @} */
+
+/**
+ *  \name Initialization and cleanup
+ *
+ *  \internal These functions are used internally, and should not be used unless
+ *            you have a specific need to specify the audio driver you want to
+ *            use.  You should normally use SDL_Init() or SDL_InitSubSystem().
+ */
+/* @{ */
+extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name);
+extern DECLSPEC void SDLCALL SDL_AudioQuit(void);
+/* @} */
+
+/**
+ *  This function returns the name of the current audio driver, or NULL
+ *  if no driver has been initialized.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void);
+
+/**
+ *  This function opens the audio device with the desired parameters, and
+ *  returns 0 if successful, placing the actual hardware parameters in the
+ *  structure pointed to by \c obtained.  If \c obtained is NULL, the audio
+ *  data passed to the callback function will be guaranteed to be in the
+ *  requested format, and will be automatically converted to the hardware
+ *  audio format if necessary.  This function returns -1 if it failed
+ *  to open the audio device, or couldn't set up the audio thread.
+ *
+ *  When filling in the desired audio spec structure,
+ *    - \c desired->freq should be the desired audio frequency in samples-per-
+ *      second.
+ *    - \c desired->format should be the desired audio format.
+ *    - \c desired->samples is the desired size of the audio buffer, in
+ *      samples.  This number should be a power of two, and may be adjusted by
+ *      the audio driver to a value more suitable for the hardware.  Good values
+ *      seem to range between 512 and 8096 inclusive, depending on the
+ *      application and CPU speed.  Smaller values yield faster response time,
+ *      but can lead to underflow if the application is doing heavy processing
+ *      and cannot fill the audio buffer in time.  A stereo sample consists of
+ *      both right and left channels in LR ordering.
+ *      Note that the number of samples is directly related to time by the
+ *      following formula:  \code ms = (samples*1000)/freq \endcode
+ *    - \c desired->size is the size in bytes of the audio buffer, and is
+ *      calculated by SDL_OpenAudio().
+ *    - \c desired->silence is the value used to set the buffer to silence,
+ *      and is calculated by SDL_OpenAudio().
+ *    - \c desired->callback should be set to a function that will be called
+ *      when the audio device is ready for more data.  It is passed a pointer
+ *      to the audio buffer, and the length in bytes of the audio buffer.
+ *      This function usually runs in a separate thread, and so you should
+ *      protect data structures that it accesses by calling SDL_LockAudio()
+ *      and SDL_UnlockAudio() in your code. Alternately, you may pass a NULL
+ *      pointer here, and call SDL_QueueAudio() with some frequency, to queue
+ *      more audio samples to be played (or for capture devices, call
+ *      SDL_DequeueAudio() with some frequency, to obtain audio samples).
+ *    - \c desired->userdata is passed as the first parameter to your callback
+ *      function. If you passed a NULL callback, this value is ignored.
+ *
+ *  The audio device starts out playing silence when it's opened, and should
+ *  be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready
+ *  for your audio callback function to be called.  Since the audio driver
+ *  may modify the requested size of the audio buffer, you should allocate
+ *  any local mixing buffers after you open the audio device.
+ */
+extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired,
+                                          SDL_AudioSpec * obtained);
+
+/**
+ *  SDL Audio Device IDs.
+ *
+ *  A successful call to SDL_OpenAudio() is always device id 1, and legacy
+ *  SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls
+ *  always returns devices >= 2 on success. The legacy calls are good both
+ *  for backwards compatibility and when you don't care about multiple,
+ *  specific, or capture devices.
+ */
+typedef Uint32 SDL_AudioDeviceID;
+
+/**
+ *  Get the number of available devices exposed by the current driver.
+ *  Only valid after a successfully initializing the audio subsystem.
+ *  Returns -1 if an explicit list of devices can't be determined; this is
+ *  not an error. For example, if SDL is set up to talk to a remote audio
+ *  server, it can't list every one available on the Internet, but it will
+ *  still allow a specific host to be specified to SDL_OpenAudioDevice().
+ *
+ *  In many common cases, when this function returns a value <= 0, it can still
+ *  successfully open the default device (NULL for first argument of
+ *  SDL_OpenAudioDevice()).
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture);
+
+/**
+ *  Get the human-readable name of a specific audio device.
+ *  Must be a value between 0 and (number of audio devices-1).
+ *  Only valid after a successfully initializing the audio subsystem.
+ *  The values returned by this function reflect the latest call to
+ *  SDL_GetNumAudioDevices(); recall that function to redetect available
+ *  hardware.
+ *
+ *  The string returned by this function is UTF-8 encoded, read-only, and
+ *  managed internally. You are not to free it. If you need to keep the
+ *  string for any length of time, you should make your own copy of it, as it
+ *  will be invalid next time any of several other SDL functions is called.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index,
+                                                           int iscapture);
+
+
+/**
+ *  Open a specific audio device. Passing in a device name of NULL requests
+ *  the most reasonable default (and is equivalent to calling SDL_OpenAudio()).
+ *
+ *  The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but
+ *  some drivers allow arbitrary and driver-specific strings, such as a
+ *  hostname/IP address for a remote audio server, or a filename in the
+ *  diskaudio driver.
+ *
+ *  \return 0 on error, a valid device ID that is >= 2 on success.
+ *
+ *  SDL_OpenAudio(), unlike this function, always acts on device ID 1.
+ */
+extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
+                                                              *device,
+                                                              int iscapture,
+                                                              const
+                                                              SDL_AudioSpec *
+                                                              desired,
+                                                              SDL_AudioSpec *
+                                                              obtained,
+                                                              int
+                                                              allowed_changes);
+
+
+
+/**
+ *  \name Audio state
+ *
+ *  Get the current audio state.
+ */
+/* @{ */
+typedef enum
+{
+    SDL_AUDIO_STOPPED = 0,
+    SDL_AUDIO_PLAYING,
+    SDL_AUDIO_PAUSED
+} SDL_AudioStatus;
+extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void);
+
+extern DECLSPEC SDL_AudioStatus SDLCALL
+SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev);
+/* @} *//* Audio State */
+
+/**
+ *  \name Pause audio functions
+ *
+ *  These functions pause and unpause the audio callback processing.
+ *  They should be called with a parameter of 0 after opening the audio
+ *  device to start playing sound.  This is so you can safely initialize
+ *  data for your callback function after opening the audio device.
+ *  Silence will be written to the audio device during the pause.
+ */
+/* @{ */
+extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on);
+extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev,
+                                                  int pause_on);
+/* @} *//* Pause audio functions */
+
+/**
+ *  \brief Load the audio data of a WAVE file into memory
+ *
+ *  Loading a WAVE file requires \c src, \c spec, \c audio_buf and \c audio_len
+ *  to be valid pointers. The entire data portion of the file is then loaded
+ *  into memory and decoded if necessary.
+ *
+ *  If \c freesrc is non-zero, the data source gets automatically closed and
+ *  freed before the function returns.
+ *
+ *  Supported are RIFF WAVE files with the formats PCM (8, 16, 24, and 32 bits),
+ *  IEEE Float (32 bits), Microsoft ADPCM and IMA ADPCM (4 bits), and A-law and
+ *  µ-law (8 bits). Other formats are currently unsupported and cause an error.
+ *
+ *  If this function succeeds, the pointer returned by it is equal to \c spec
+ *  and the pointer to the audio data allocated by the function is written to
+ *  \c audio_buf and its length in bytes to \c audio_len. The \ref SDL_AudioSpec
+ *  members \c freq, \c channels, and \c format are set to the values of the
+ *  audio data in the buffer. The \c samples member is set to a sane default and
+ *  all others are set to zero.
+ *
+ *  It's necessary to use SDL_FreeWAV() to free the audio data returned in
+ *  \c audio_buf when it is no longer used.
+ *
+ *  Because of the underspecification of the Waveform format, there are many
+ *  problematic files in the wild that cause issues with strict decoders. To
+ *  provide compatibility with these files, this decoder is lenient in regards
+ *  to the truncation of the file, the fact chunk, and the size of the RIFF
+ *  chunk. The hints SDL_HINT_WAVE_RIFF_CHUNK_SIZE, SDL_HINT_WAVE_TRUNCATION,
+ *  and SDL_HINT_WAVE_FACT_CHUNK can be used to tune the behavior of the
+ *  loading process.
+ *
+ *  Any file that is invalid (due to truncation, corruption, or wrong values in
+ *  the headers), too big, or unsupported causes an error. Additionally, any
+ *  critical I/O error from the data source will terminate the loading process
+ *  with an error. The function returns NULL on error and in all cases (with the
+ *  exception of \c src being NULL), an appropriate error message will be set.
+ *
+ *  It is required that the data source supports seeking.
+ *
+ *  Example:
+ *  \code
+ *      SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
+ *  \endcode
+ *
+ *  \param src The data source with the WAVE data
+ *  \param freesrc A integer value that makes the function close the data source if non-zero
+ *  \param spec A pointer filled with the audio format of the audio data
+ *  \param audio_buf A pointer filled with the audio data allocated by the function
+ *  \param audio_len A pointer filled with the length of the audio data buffer in bytes
+ *  \return NULL on error, or non-NULL on success.
+ */
+extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src,
+                                                      int freesrc,
+                                                      SDL_AudioSpec * spec,
+                                                      Uint8 ** audio_buf,
+                                                      Uint32 * audio_len);
+
+/**
+ *  Loads a WAV from a file.
+ *  Compatibility convenience function.
+ */
+#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
+    SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
+
+/**
+ *  This function frees data previously allocated with SDL_LoadWAV_RW()
+ */
+extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf);
+
+/**
+ *  This function takes a source format and rate and a destination format
+ *  and rate, and initializes the \c cvt structure with information needed
+ *  by SDL_ConvertAudio() to convert a buffer of audio data from one format
+ *  to the other. An unsupported format causes an error and -1 will be returned.
+ *
+ *  \return 0 if no conversion is needed, 1 if the audio filter is set up,
+ *  or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt,
+                                              SDL_AudioFormat src_format,
+                                              Uint8 src_channels,
+                                              int src_rate,
+                                              SDL_AudioFormat dst_format,
+                                              Uint8 dst_channels,
+                                              int dst_rate);
+
+/**
+ *  Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(),
+ *  created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of
+ *  audio data in the source format, this function will convert it in-place
+ *  to the desired format.
+ *
+ *  The data conversion may expand the size of the audio data, so the buffer
+ *  \c cvt->buf should be allocated after the \c cvt structure is initialized by
+ *  SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long.
+ *
+ *  \return 0 on success or -1 if \c cvt->buf is NULL.
+ */
+extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt);
+
+/* SDL_AudioStream is a new audio conversion interface.
+   The benefits vs SDL_AudioCVT:
+    - it can handle resampling data in chunks without generating
+      artifacts, when it doesn't have the complete buffer available.
+    - it can handle incoming data in any variable size.
+    - You push data as you have it, and pull it when you need it
+ */
+/* this is opaque to the outside world. */
+struct _SDL_AudioStream;
+typedef struct _SDL_AudioStream SDL_AudioStream;
+
+/**
+ *  Create a new audio stream
+ *
+ *  \param src_format The format of the source audio
+ *  \param src_channels The number of channels of the source audio
+ *  \param src_rate The sampling rate of the source audio
+ *  \param dst_format The format of the desired audio output
+ *  \param dst_channels The number of channels of the desired audio output
+ *  \param dst_rate The sampling rate of the desired audio output
+ *  \return 0 on success, or -1 on error.
+ *
+ *  \sa SDL_AudioStreamPut
+ *  \sa SDL_AudioStreamGet
+ *  \sa SDL_AudioStreamAvailable
+ *  \sa SDL_AudioStreamFlush
+ *  \sa SDL_AudioStreamClear
+ *  \sa SDL_FreeAudioStream
+ */
+extern DECLSPEC SDL_AudioStream * SDLCALL SDL_NewAudioStream(const SDL_AudioFormat src_format,
+                                           const Uint8 src_channels,
+                                           const int src_rate,
+                                           const SDL_AudioFormat dst_format,
+                                           const Uint8 dst_channels,
+                                           const int dst_rate);
+
+/**
+ *  Add data to be converted/resampled to the stream
+ *
+ *  \param stream The stream the audio data is being added to
+ *  \param buf A pointer to the audio data to add
+ *  \param len The number of bytes to write to the stream
+ *  \return 0 on success, or -1 on error.
+ *
+ *  \sa SDL_NewAudioStream
+ *  \sa SDL_AudioStreamGet
+ *  \sa SDL_AudioStreamAvailable
+ *  \sa SDL_AudioStreamFlush
+ *  \sa SDL_AudioStreamClear
+ *  \sa SDL_FreeAudioStream
+ */
+extern DECLSPEC int SDLCALL SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, int len);
+
+/**
+ *  Get converted/resampled data from the stream
+ *
+ *  \param stream The stream the audio is being requested from
+ *  \param buf A buffer to fill with audio data
+ *  \param len The maximum number of bytes to fill
+ *  \return The number of bytes read from the stream, or -1 on error
+ *
+ *  \sa SDL_NewAudioStream
+ *  \sa SDL_AudioStreamPut
+ *  \sa SDL_AudioStreamAvailable
+ *  \sa SDL_AudioStreamFlush
+ *  \sa SDL_AudioStreamClear
+ *  \sa SDL_FreeAudioStream
+ */
+extern DECLSPEC int SDLCALL SDL_AudioStreamGet(SDL_AudioStream *stream, void *buf, int len);
+
+/**
+ * Get the number of converted/resampled bytes available. The stream may be
+ *  buffering data behind the scenes until it has enough to resample
+ *  correctly, so this number might be lower than what you expect, or even
+ *  be zero. Add more data or flush the stream if you need the data now.
+ *
+ *  \sa SDL_NewAudioStream
+ *  \sa SDL_AudioStreamPut
+ *  \sa SDL_AudioStreamGet
+ *  \sa SDL_AudioStreamFlush
+ *  \sa SDL_AudioStreamClear
+ *  \sa SDL_FreeAudioStream
+ */
+extern DECLSPEC int SDLCALL SDL_AudioStreamAvailable(SDL_AudioStream *stream);
+
+/**
+ * Tell the stream that you're done sending data, and anything being buffered
+ *  should be converted/resampled and made available immediately.
+ *
+ * It is legal to add more data to a stream after flushing, but there will
+ *  be audio gaps in the output. Generally this is intended to signal the
+ *  end of input, so the complete output becomes available.
+ *
+ *  \sa SDL_NewAudioStream
+ *  \sa SDL_AudioStreamPut
+ *  \sa SDL_AudioStreamGet
+ *  \sa SDL_AudioStreamAvailable
+ *  \sa SDL_AudioStreamClear
+ *  \sa SDL_FreeAudioStream
+ */
+extern DECLSPEC int SDLCALL SDL_AudioStreamFlush(SDL_AudioStream *stream);
+
+/**
+ *  Clear any pending data in the stream without converting it
+ *
+ *  \sa SDL_NewAudioStream
+ *  \sa SDL_AudioStreamPut
+ *  \sa SDL_AudioStreamGet
+ *  \sa SDL_AudioStreamAvailable
+ *  \sa SDL_AudioStreamFlush
+ *  \sa SDL_FreeAudioStream
+ */
+extern DECLSPEC void SDLCALL SDL_AudioStreamClear(SDL_AudioStream *stream);
+
+/**
+ * Free an audio stream
+ *
+ *  \sa SDL_NewAudioStream
+ *  \sa SDL_AudioStreamPut
+ *  \sa SDL_AudioStreamGet
+ *  \sa SDL_AudioStreamAvailable
+ *  \sa SDL_AudioStreamFlush
+ *  \sa SDL_AudioStreamClear
+ */
+extern DECLSPEC void SDLCALL SDL_FreeAudioStream(SDL_AudioStream *stream);
+
+#define SDL_MIX_MAXVOLUME 128
+/**
+ *  This takes two audio buffers of the playing audio format and mixes
+ *  them, performing addition, volume adjustment, and overflow clipping.
+ *  The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME
+ *  for full audio volume.  Note this does not change hardware volume.
+ *  This is provided for convenience -- you can mix your own audio data.
+ */
+extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src,
+                                          Uint32 len, int volume);
+
+/**
+ *  This works like SDL_MixAudio(), but you specify the audio format instead of
+ *  using the format of audio device 1. Thus it can be used when no audio
+ *  device is open at all.
+ */
+extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst,
+                                                const Uint8 * src,
+                                                SDL_AudioFormat format,
+                                                Uint32 len, int volume);
+
+/**
+ *  Queue more audio on non-callback devices.
+ *
+ *  (If you are looking to retrieve queued audio from a non-callback capture
+ *  device, you want SDL_DequeueAudio() instead. This will return -1 to
+ *  signify an error if you use it with capture devices.)
+ *
+ *  SDL offers two ways to feed audio to the device: you can either supply a
+ *  callback that SDL triggers with some frequency to obtain more audio
+ *  (pull method), or you can supply no callback, and then SDL will expect
+ *  you to supply data at regular intervals (push method) with this function.
+ *
+ *  There are no limits on the amount of data you can queue, short of
+ *  exhaustion of address space. Queued data will drain to the device as
+ *  necessary without further intervention from you. If the device needs
+ *  audio but there is not enough queued, it will play silence to make up
+ *  the difference. This means you will have skips in your audio playback
+ *  if you aren't routinely queueing sufficient data.
+ *
+ *  This function copies the supplied data, so you are safe to free it when
+ *  the function returns. This function is thread-safe, but queueing to the
+ *  same device from two threads at once does not promise which buffer will
+ *  be queued first.
+ *
+ *  You may not queue audio on a device that is using an application-supplied
+ *  callback; doing so returns an error. You have to use the audio callback
+ *  or queue audio with this function, but not both.
+ *
+ *  You should not call SDL_LockAudio() on the device before queueing; SDL
+ *  handles locking internally for this function.
+ *
+ *  \param dev The device ID to which we will queue audio.
+ *  \param data The data to queue to the device for later playback.
+ *  \param len The number of bytes (not samples!) to which (data) points.
+ *  \return 0 on success, or -1 on error.
+ *
+ *  \sa SDL_GetQueuedAudioSize
+ *  \sa SDL_ClearQueuedAudio
+ */
+extern DECLSPEC int SDLCALL SDL_QueueAudio(SDL_AudioDeviceID dev, const void *data, Uint32 len);
+
+/**
+ *  Dequeue more audio on non-callback devices.
+ *
+ *  (If you are looking to queue audio for output on a non-callback playback
+ *  device, you want SDL_QueueAudio() instead. This will always return 0
+ *  if you use it with playback devices.)
+ *
+ *  SDL offers two ways to retrieve audio from a capture device: you can
+ *  either supply a callback that SDL triggers with some frequency as the
+ *  device records more audio data, (push method), or you can supply no
+ *  callback, and then SDL will expect you to retrieve data at regular
+ *  intervals (pull method) with this function.
+ *
+ *  There are no limits on the amount of data you can queue, short of
+ *  exhaustion of address space. Data from the device will keep queuing as
+ *  necessary without further intervention from you. This means you will
+ *  eventually run out of memory if you aren't routinely dequeueing data.
+ *
+ *  Capture devices will not queue data when paused; if you are expecting
+ *  to not need captured audio for some length of time, use
+ *  SDL_PauseAudioDevice() to stop the capture device from queueing more
+ *  data. This can be useful during, say, level loading times. When
+ *  unpaused, capture devices will start queueing data from that point,
+ *  having flushed any capturable data available while paused.
+ *
+ *  This function is thread-safe, but dequeueing from the same device from
+ *  two threads at once does not promise which thread will dequeued data
+ *  first.
+ *
+ *  You may not dequeue audio from a device that is using an
+ *  application-supplied callback; doing so returns an error. You have to use
+ *  the audio callback, or dequeue audio with this function, but not both.
+ *
+ *  You should not call SDL_LockAudio() on the device before queueing; SDL
+ *  handles locking internally for this function.
+ *
+ *  \param dev The device ID from which we will dequeue audio.
+ *  \param data A pointer into where audio data should be copied.
+ *  \param len The number of bytes (not samples!) to which (data) points.
+ *  \return number of bytes dequeued, which could be less than requested.
+ *
+ *  \sa SDL_GetQueuedAudioSize
+ *  \sa SDL_ClearQueuedAudio
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_DequeueAudio(SDL_AudioDeviceID dev, void *data, Uint32 len);
+
+/**
+ *  Get the number of bytes of still-queued audio.
+ *
+ *  For playback device:
+ *
+ *    This is the number of bytes that have been queued for playback with
+ *    SDL_QueueAudio(), but have not yet been sent to the hardware. This
+ *    number may shrink at any time, so this only informs of pending data.
+ *
+ *    Once we've sent it to the hardware, this function can not decide the
+ *    exact byte boundary of what has been played. It's possible that we just
+ *    gave the hardware several kilobytes right before you called this
+ *    function, but it hasn't played any of it yet, or maybe half of it, etc.
+ *
+ *  For capture devices:
+ *
+ *    This is the number of bytes that have been captured by the device and
+ *    are waiting for you to dequeue. This number may grow at any time, so
+ *    this only informs of the lower-bound of available data.
+ *
+ *  You may not queue audio on a device that is using an application-supplied
+ *  callback; calling this function on such a device always returns 0.
+ *  You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use
+ *  the audio callback, but not both.
+ *
+ *  You should not call SDL_LockAudio() on the device before querying; SDL
+ *  handles locking internally for this function.
+ *
+ *  \param dev The device ID of which we will query queued audio size.
+ *  \return Number of bytes (not samples!) of queued audio.
+ *
+ *  \sa SDL_QueueAudio
+ *  \sa SDL_ClearQueuedAudio
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetQueuedAudioSize(SDL_AudioDeviceID dev);
+
+/**
+ *  Drop any queued audio data. For playback devices, this is any queued data
+ *  still waiting to be submitted to the hardware. For capture devices, this
+ *  is any data that was queued by the device that hasn't yet been dequeued by
+ *  the application.
+ *
+ *  Immediately after this call, SDL_GetQueuedAudioSize() will return 0. For
+ *  playback devices, the hardware will start playing silence if more audio
+ *  isn't queued. Unpaused capture devices will start filling the queue again
+ *  as soon as they have more data available (which, depending on the state
+ *  of the hardware and the thread, could be before this function call
+ *  returns!).
+ *
+ *  This will not prevent playback of queued audio that's already been sent
+ *  to the hardware, as we can not undo that, so expect there to be some
+ *  fraction of a second of audio that might still be heard. This can be
+ *  useful if you want to, say, drop any pending music during a level change
+ *  in your game.
+ *
+ *  You may not queue audio on a device that is using an application-supplied
+ *  callback; calling this function on such a device is always a no-op.
+ *  You have to queue audio with SDL_QueueAudio()/SDL_DequeueAudio(), or use
+ *  the audio callback, but not both.
+ *
+ *  You should not call SDL_LockAudio() on the device before clearing the
+ *  queue; SDL handles locking internally for this function.
+ *
+ *  This function always succeeds and thus returns void.
+ *
+ *  \param dev The device ID of which to clear the audio queue.
+ *
+ *  \sa SDL_QueueAudio
+ *  \sa SDL_GetQueuedAudioSize
+ */
+extern DECLSPEC void SDLCALL SDL_ClearQueuedAudio(SDL_AudioDeviceID dev);
+
+
+/**
+ *  \name Audio lock functions
+ *
+ *  The lock manipulated by these functions protects the callback function.
+ *  During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that
+ *  the callback function is not running.  Do not call these from the callback
+ *  function or you will cause deadlock.
+ */
+/* @{ */
+extern DECLSPEC void SDLCALL SDL_LockAudio(void);
+extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev);
+extern DECLSPEC void SDLCALL SDL_UnlockAudio(void);
+extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev);
+/* @} *//* Audio lock functions */
+
+/**
+ *  This function shuts down audio processing and closes the audio device.
+ */
+extern DECLSPEC void SDLCALL SDL_CloseAudio(void);
+extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_audio_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_bits.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_bits.h
new file mode 100644
index 0000000..b116cc8
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_bits.h
@@ -0,0 +1,121 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_bits.h
+ *
+ *  Functions for fiddling with bits and bitmasks.
+ */
+
+#ifndef SDL_bits_h_
+#define SDL_bits_h_
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_bits.h
+ */
+
+/**
+ *  Get the index of the most significant bit. Result is undefined when called
+ *  with 0. This operation can also be stated as "count leading zeroes" and
+ *  "log base 2".
+ *
+ *  \return Index of the most significant bit, or -1 if the value is 0.
+ */
+#if defined(__WATCOMC__) && defined(__386__)
+extern _inline int _SDL_clz_watcom (Uint32);
+#pragma aux _SDL_clz_watcom = \
+    "bsr eax, eax" \
+    "xor eax, 31" \
+    parm [eax] nomemory \
+    value [eax] \
+    modify exact [eax] nomemory;
+#endif
+
+SDL_FORCE_INLINE int
+SDL_MostSignificantBitIndex32(Uint32 x)
+{
+#if defined(__GNUC__) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+    /* Count Leading Zeroes builtin in GCC.
+     * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html
+     */
+    if (x == 0) {
+        return -1;
+    }
+    return 31 - __builtin_clz(x);
+#elif defined(__WATCOMC__) && defined(__386__)
+    if (x == 0) {
+        return -1;
+    }
+    return 31 - _SDL_clz_watcom(x);
+#else
+    /* Based off of Bit Twiddling Hacks by Sean Eron Anderson
+     * <seander@cs.stanford.edu>, released in the public domain.
+     * http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog
+     */
+    const Uint32 b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000};
+    const int    S[] = {1, 2, 4, 8, 16};
+
+    int msbIndex = 0;
+    int i;
+
+    if (x == 0) {
+        return -1;
+    }
+
+    for (i = 4; i >= 0; i--)
+    {
+        if (x & b[i])
+        {
+            x >>= S[i];
+            msbIndex |= S[i];
+        }
+    }
+
+    return msbIndex;
+#endif
+}
+
+SDL_FORCE_INLINE SDL_bool
+SDL_HasExactlyOneBitSet32(Uint32 x)
+{
+    if (x && !(x & (x - 1))) {
+        return SDL_TRUE;
+    }
+    return SDL_FALSE;
+}
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_bits_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_blendmode.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_blendmode.h
new file mode 100644
index 0000000..6f0a22b
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_blendmode.h
@@ -0,0 +1,120 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_blendmode.h
+ *
+ *  Header file declaring the SDL_BlendMode enumeration
+ */
+
+#ifndef SDL_blendmode_h_
+#define SDL_blendmode_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief The blend mode used in SDL_RenderCopy() and drawing operations.
+ */
+typedef enum
+{
+    SDL_BLENDMODE_NONE = 0x00000000,     /**< no blending
+                                              dstRGBA = srcRGBA */
+    SDL_BLENDMODE_BLEND = 0x00000001,    /**< alpha blending
+                                              dstRGB = (srcRGB * srcA) + (dstRGB * (1-srcA))
+                                              dstA = srcA + (dstA * (1-srcA)) */
+    SDL_BLENDMODE_ADD = 0x00000002,      /**< additive blending
+                                              dstRGB = (srcRGB * srcA) + dstRGB
+                                              dstA = dstA */
+    SDL_BLENDMODE_MOD = 0x00000004,      /**< color modulate
+                                              dstRGB = srcRGB * dstRGB
+                                              dstA = dstA */
+    SDL_BLENDMODE_INVALID = 0x7FFFFFFF
+
+    /* Additional custom blend modes can be returned by SDL_ComposeCustomBlendMode() */
+
+} SDL_BlendMode;
+
+/**
+ *  \brief The blend operation used when combining source and destination pixel components
+ */
+typedef enum
+{
+    SDL_BLENDOPERATION_ADD              = 0x1,  /**< dst + src: supported by all renderers */
+    SDL_BLENDOPERATION_SUBTRACT         = 0x2,  /**< dst - src : supported by D3D9, D3D11, OpenGL, OpenGLES */
+    SDL_BLENDOPERATION_REV_SUBTRACT     = 0x3,  /**< src - dst : supported by D3D9, D3D11, OpenGL, OpenGLES */
+    SDL_BLENDOPERATION_MINIMUM          = 0x4,  /**< min(dst, src) : supported by D3D11 */
+    SDL_BLENDOPERATION_MAXIMUM          = 0x5   /**< max(dst, src) : supported by D3D11 */
+
+} SDL_BlendOperation;
+
+/**
+ *  \brief The normalized factor used to multiply pixel components
+ */
+typedef enum
+{
+    SDL_BLENDFACTOR_ZERO                = 0x1,  /**< 0, 0, 0, 0 */
+    SDL_BLENDFACTOR_ONE                 = 0x2,  /**< 1, 1, 1, 1 */
+    SDL_BLENDFACTOR_SRC_COLOR           = 0x3,  /**< srcR, srcG, srcB, srcA */
+    SDL_BLENDFACTOR_ONE_MINUS_SRC_COLOR = 0x4,  /**< 1-srcR, 1-srcG, 1-srcB, 1-srcA */
+    SDL_BLENDFACTOR_SRC_ALPHA           = 0x5,  /**< srcA, srcA, srcA, srcA */
+    SDL_BLENDFACTOR_ONE_MINUS_SRC_ALPHA = 0x6,  /**< 1-srcA, 1-srcA, 1-srcA, 1-srcA */
+    SDL_BLENDFACTOR_DST_COLOR           = 0x7,  /**< dstR, dstG, dstB, dstA */
+    SDL_BLENDFACTOR_ONE_MINUS_DST_COLOR = 0x8,  /**< 1-dstR, 1-dstG, 1-dstB, 1-dstA */
+    SDL_BLENDFACTOR_DST_ALPHA           = 0x9,  /**< dstA, dstA, dstA, dstA */
+    SDL_BLENDFACTOR_ONE_MINUS_DST_ALPHA = 0xA   /**< 1-dstA, 1-dstA, 1-dstA, 1-dstA */
+
+} SDL_BlendFactor;
+
+/**
+ *  \brief Create a custom blend mode, which may or may not be supported by a given renderer
+ *
+ *  \param srcColorFactor source color factor
+ *  \param dstColorFactor destination color factor
+ *  \param colorOperation color operation
+ *  \param srcAlphaFactor source alpha factor
+ *  \param dstAlphaFactor destination alpha factor
+ *  \param alphaOperation alpha operation
+ *
+ *  The result of the blend mode operation will be:
+ *      dstRGB = dstRGB * dstColorFactor colorOperation srcRGB * srcColorFactor
+ *  and
+ *      dstA = dstA * dstAlphaFactor alphaOperation srcA * srcAlphaFactor
+ */
+extern DECLSPEC SDL_BlendMode SDLCALL SDL_ComposeCustomBlendMode(SDL_BlendFactor srcColorFactor,
+                                                                 SDL_BlendFactor dstColorFactor,
+                                                                 SDL_BlendOperation colorOperation,
+                                                                 SDL_BlendFactor srcAlphaFactor,
+                                                                 SDL_BlendFactor dstAlphaFactor,
+                                                                 SDL_BlendOperation alphaOperation);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_blendmode_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_clipboard.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_clipboard.h
new file mode 100644
index 0000000..c4f8766
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_clipboard.h
@@ -0,0 +1,71 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ * \file SDL_clipboard.h
+ *
+ * Include file for SDL clipboard handling
+ */
+
+#ifndef SDL_clipboard_h_
+#define SDL_clipboard_h_
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Function prototypes */
+
+/**
+ * \brief Put UTF-8 text into the clipboard
+ *
+ * \sa SDL_GetClipboardText()
+ */
+extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text);
+
+/**
+ * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free()
+ *
+ * \sa SDL_SetClipboardText()
+ */
+extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void);
+
+/**
+ * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty
+ *
+ * \sa SDL_GetClipboardText()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_clipboard_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h
new file mode 100644
index 0000000..395ad7c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h
@@ -0,0 +1,257 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_windows_h_
+#define SDL_config_windows_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+/* This is a set of defines to configure the SDL features */
+
+#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
+#define HAVE_STDINT_H   1
+#elif defined(_MSC_VER)
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#ifndef _UINTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
+typedef unsigned int uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#endif
+#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#endif
+#else /* !__GNUC__ && !_MSC_VER */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#ifndef _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#endif
+typedef unsigned int uintptr_t;
+#endif /* __GNUC__ || _MSC_VER */
+#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
+
+#ifdef _WIN64
+# define SIZEOF_VOIDP 8
+#else
+# define SIZEOF_VOIDP 4
+#endif
+
+#define HAVE_DDRAW_H 1
+#define HAVE_DINPUT_H 1
+#define HAVE_DSOUND_H 1
+#define HAVE_DXGI_H 1
+#define HAVE_XINPUT_H 1
+#define HAVE_MMDEVICEAPI_H 1
+#define HAVE_AUDIOCLIENT_H 1
+#define HAVE_ENDPOINTVOLUME_H 1
+
+/* This is disabled by default to avoid C runtime dependencies and manifest requirements */
+#ifdef HAVE_LIBC
+/* Useful headers */
+#define STDC_HEADERS 1
+#define HAVE_CTYPE_H 1
+#define HAVE_FLOAT_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STRING_H 1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE__STRREV 1
+/* These functions have security warnings, so we won't use them */
+/* #undef HAVE__STRUPR */
+/* #undef HAVE__STRLWR */
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+/* These functions have security warnings, so we won't use them */
+/* #undef HAVE__LTOA */
+/* #undef HAVE__ULTOA */
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE__STRICMP 1
+#define HAVE__STRNICMP 1
+#define HAVE_ACOS   1
+#define HAVE_ACOSF  1
+#define HAVE_ASIN   1
+#define HAVE_ASINF  1
+#define HAVE_ATAN   1
+#define HAVE_ATANF  1
+#define HAVE_ATAN2  1
+#define HAVE_ATAN2F 1
+#define HAVE_CEILF  1
+#define HAVE__COPYSIGN  1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_EXP    1
+#define HAVE_EXPF   1
+#define HAVE_FABS   1
+#define HAVE_FABSF  1
+#define HAVE_FLOOR  1
+#define HAVE_FLOORF 1
+#define HAVE_FMOD   1
+#define HAVE_FMODF  1
+#define HAVE_LOG    1
+#define HAVE_LOGF   1
+#define HAVE_LOG10  1
+#define HAVE_LOG10F 1
+#define HAVE_POW    1
+#define HAVE_POWF   1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SQRTF  1
+#define HAVE_TAN    1
+#define HAVE_TANF   1
+#if defined(_MSC_VER)
+/* These functions were added with the VC++ 2013 C runtime library */
+#if _MSC_VER >= 1800
+#define HAVE_STRTOLL 1
+#define HAVE_VSSCANF 1
+#define HAVE_SCALBN 1
+#define HAVE_SCALBNF    1
+#endif
+/* This function is available with at least the VC++ 2008 C runtime library */
+#if _MSC_VER >= 1400
+#define HAVE__FSEEKI64 1
+#endif
+#endif
+#if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES)
+#define HAVE_M_PI 1
+#endif
+#else
+#define HAVE_STDARG_H   1
+#define HAVE_STDDEF_H   1
+#endif
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_WASAPI 1
+#define SDL_AUDIO_DRIVER_DSOUND 1
+#define SDL_AUDIO_DRIVER_WINMM  1
+#define SDL_AUDIO_DRIVER_DISK   1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_DINPUT 1
+#define SDL_JOYSTICK_XINPUT 1
+#define SDL_JOYSTICK_HIDAPI 1
+#define SDL_HAPTIC_DINPUT   1
+#define SDL_HAPTIC_XINPUT   1
+
+/* Enable the dummy sensor driver */
+#define SDL_SENSOR_DUMMY  1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_WINDOWS  1
+
+/* Enable various threading systems */
+#define SDL_THREAD_WINDOWS  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_WINDOWS   1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_DUMMY  1
+#define SDL_VIDEO_DRIVER_WINDOWS    1
+
+#ifndef SDL_VIDEO_RENDER_D3D
+#define SDL_VIDEO_RENDER_D3D    1
+#endif
+#ifndef SDL_VIDEO_RENDER_D3D11
+#define SDL_VIDEO_RENDER_D3D11  0
+#endif
+
+/* Enable OpenGL support */
+#ifndef SDL_VIDEO_OPENGL
+#define SDL_VIDEO_OPENGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_WGL
+#define SDL_VIDEO_OPENGL_WGL    1
+#endif
+#ifndef SDL_VIDEO_RENDER_OGL
+#define SDL_VIDEO_RENDER_OGL    1
+#endif
+#ifndef SDL_VIDEO_RENDER_OGL_ES2
+#define SDL_VIDEO_RENDER_OGL_ES2    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_ES2
+#define SDL_VIDEO_OPENGL_ES2    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_EGL
+#define SDL_VIDEO_OPENGL_EGL    1
+#endif
+
+/* Enable Vulkan support */
+#define SDL_VIDEO_VULKAN 1
+
+/* Enable system power support */
+#define SDL_POWER_WINDOWS 1
+
+/* Enable filesystem support */
+#define SDL_FILESYSTEM_WINDOWS  1
+
+/* Enable assembly routines (Win64 doesn't have inline asm) */
+#ifndef _WIN64
+#define SDL_ASSEMBLY_ROUTINES   1
+#endif
+
+#endif /* SDL_config_windows_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h.cmake b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h.cmake
new file mode 100644
index 0000000..c57266c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h.cmake
@@ -0,0 +1,445 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_h_
+#define SDL_config_h_
+
+/**
+ *  \file SDL_config.h.in
+ *
+ *  This is a set of defines to configure the SDL features
+ */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+/* C language features */
+#cmakedefine const @HAVE_CONST@
+#cmakedefine inline @HAVE_INLINE@
+#cmakedefine volatile @HAVE_VOLATILE@
+
+/* C datatypes */
+/* Define SIZEOF_VOIDP for 64/32 architectures */
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
+#cmakedefine HAVE_GCC_ATOMICS @HAVE_GCC_ATOMICS@
+#cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET @HAVE_GCC_SYNC_LOCK_TEST_AND_SET@
+
+#cmakedefine HAVE_D3D_H @HAVE_D3D_H@
+#cmakedefine HAVE_D3D11_H @HAVE_D3D11_H@
+#cmakedefine HAVE_DDRAW_H @HAVE_DDRAW_H@
+#cmakedefine HAVE_DSOUND_H @HAVE_DSOUND_H@
+#cmakedefine HAVE_DINPUT_H @HAVE_DINPUT_H@
+#cmakedefine HAVE_XAUDIO2_H @HAVE_XAUDIO2_H@
+#cmakedefine HAVE_XINPUT_H @HAVE_XINPUT_H@
+#cmakedefine HAVE_DXGI_H @HAVE_DXGI_H@
+#cmakedefine HAVE_XINPUT_GAMEPAD_EX @HAVE_XINPUT_GAMEPAD_EX@
+#cmakedefine HAVE_XINPUT_STATE_EX @HAVE_XINPUT_STATE_EX@
+
+/* Comment this if you want to build without any C library requirements */
+#cmakedefine HAVE_LIBC 1
+#if HAVE_LIBC
+
+/* Useful headers */
+#cmakedefine HAVE_ALLOCA_H 1
+#cmakedefine HAVE_SYS_TYPES_H 1
+#cmakedefine HAVE_STDIO_H 1
+#cmakedefine STDC_HEADERS 1
+#cmakedefine HAVE_STDLIB_H 1
+#cmakedefine HAVE_STDARG_H 1
+#cmakedefine HAVE_MALLOC_H 1
+#cmakedefine HAVE_MEMORY_H 1
+#cmakedefine HAVE_STRING_H 1
+#cmakedefine HAVE_STRINGS_H 1
+#cmakedefine HAVE_WCHAR_H 1
+#cmakedefine HAVE_INTTYPES_H 1
+#cmakedefine HAVE_STDINT_H 1
+#cmakedefine HAVE_CTYPE_H 1
+#cmakedefine HAVE_MATH_H 1
+#cmakedefine HAVE_ICONV_H 1
+#cmakedefine HAVE_SIGNAL_H 1
+#cmakedefine HAVE_ALTIVEC_H 1
+#cmakedefine HAVE_PTHREAD_NP_H 1
+#cmakedefine HAVE_LIBUDEV_H 1
+#cmakedefine HAVE_DBUS_DBUS_H 1
+#cmakedefine HAVE_IBUS_IBUS_H 1
+#cmakedefine HAVE_FCITX_FRONTEND_H 1
+#cmakedefine HAVE_LIBSAMPLERATE_H 1
+
+/* C library functions */
+#cmakedefine HAVE_MALLOC 1
+#cmakedefine HAVE_CALLOC 1
+#cmakedefine HAVE_REALLOC 1
+#cmakedefine HAVE_FREE 1
+#cmakedefine HAVE_ALLOCA 1
+#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
+#cmakedefine HAVE_GETENV 1
+#cmakedefine HAVE_SETENV 1
+#cmakedefine HAVE_PUTENV 1
+#cmakedefine HAVE_UNSETENV 1
+#endif
+#cmakedefine HAVE_QSORT 1
+#cmakedefine HAVE_ABS 1
+#cmakedefine HAVE_BCOPY 1
+#cmakedefine HAVE_MEMSET 1
+#cmakedefine HAVE_MEMCPY 1
+#cmakedefine HAVE_MEMMOVE 1
+#cmakedefine HAVE_MEMCMP 1
+#cmakedefine HAVE_WCSLEN 1
+#cmakedefine HAVE_WCSLCPY 1
+#cmakedefine HAVE_WCSLCAT 1
+#cmakedefine HAVE_WCSCMP 1
+#cmakedefine HAVE_STRLEN 1
+#cmakedefine HAVE_STRLCPY 1
+#cmakedefine HAVE_STRLCAT 1
+#cmakedefine HAVE_STRDUP 1
+#cmakedefine HAVE__STRREV 1
+#cmakedefine HAVE__STRUPR 1
+#cmakedefine HAVE__STRLWR 1
+#cmakedefine HAVE_INDEX 1
+#cmakedefine HAVE_RINDEX 1
+#cmakedefine HAVE_STRCHR 1
+#cmakedefine HAVE_STRRCHR 1
+#cmakedefine HAVE_STRSTR 1
+#cmakedefine HAVE_ITOA 1
+#cmakedefine HAVE__LTOA 1
+#cmakedefine HAVE__UITOA 1
+#cmakedefine HAVE__ULTOA 1
+#cmakedefine HAVE_STRTOL 1
+#cmakedefine HAVE_STRTOUL 1
+#cmakedefine HAVE__I64TOA 1
+#cmakedefine HAVE__UI64TOA 1
+#cmakedefine HAVE_STRTOLL 1
+#cmakedefine HAVE_STRTOULL 1
+#cmakedefine HAVE_STRTOD 1
+#cmakedefine HAVE_ATOI 1
+#cmakedefine HAVE_ATOF 1
+#cmakedefine HAVE_STRCMP 1
+#cmakedefine HAVE_STRNCMP 1
+#cmakedefine HAVE__STRICMP 1
+#cmakedefine HAVE_STRCASECMP 1
+#cmakedefine HAVE__STRNICMP 1
+#cmakedefine HAVE_STRNCASECMP 1
+#cmakedefine HAVE_VSSCANF 1
+#cmakedefine HAVE_VSNPRINTF 1
+#cmakedefine HAVE_M_PI 1
+#cmakedefine HAVE_ATAN 1
+#cmakedefine HAVE_ATAN2 1
+#cmakedefine HAVE_ACOS 1
+#cmakedefine HAVE_ASIN 1
+#cmakedefine HAVE_CEIL 1
+#cmakedefine HAVE_COPYSIGN 1
+#cmakedefine HAVE_COS 1
+#cmakedefine HAVE_COSF 1
+#cmakedefine HAVE_FABS 1
+#cmakedefine HAVE_FLOOR 1
+#cmakedefine HAVE_LOG 1
+#cmakedefine HAVE_POW 1
+#cmakedefine HAVE_SCALBN 1
+#cmakedefine HAVE_SIN 1
+#cmakedefine HAVE_SINF 1
+#cmakedefine HAVE_SQRT 1
+#cmakedefine HAVE_SQRTF 1
+#cmakedefine HAVE_TAN 1
+#cmakedefine HAVE_TANF 1
+#cmakedefine HAVE_FOPEN64 1
+#cmakedefine HAVE_FSEEKO 1
+#cmakedefine HAVE_FSEEKO64 1
+#cmakedefine HAVE_SIGACTION 1
+#cmakedefine HAVE_SA_SIGACTION 1
+#cmakedefine HAVE_SETJMP 1
+#cmakedefine HAVE_NANOSLEEP 1
+#cmakedefine HAVE_SYSCONF 1
+#cmakedefine HAVE_SYSCTLBYNAME 1
+#cmakedefine HAVE_CLOCK_GETTIME 1
+#cmakedefine HAVE_GETPAGESIZE 1
+#cmakedefine HAVE_MPROTECT 1
+#cmakedefine HAVE_ICONV 1
+#cmakedefine HAVE_PTHREAD_SETNAME_NP 1
+#cmakedefine HAVE_PTHREAD_SET_NAME_NP 1
+#cmakedefine HAVE_SEM_TIMEDWAIT 1
+#cmakedefine HAVE_GETAUXVAL 1
+#cmakedefine HAVE_POLL 1
+
+#elif __WIN32__
+#cmakedefine HAVE_STDARG_H 1
+#cmakedefine HAVE_STDDEF_H 1
+#else
+/* We may need some replacement for stdarg.h here */
+#include <stdarg.h>
+#endif /* HAVE_LIBC */
+
+/* SDL internal assertion support */
+#cmakedefine SDL_DEFAULT_ASSERT_LEVEL @SDL_DEFAULT_ASSERT_LEVEL@
+
+/* Allow disabling of core subsystems */
+#cmakedefine SDL_ATOMIC_DISABLED @SDL_ATOMIC_DISABLED@
+#cmakedefine SDL_AUDIO_DISABLED @SDL_AUDIO_DISABLED@
+#cmakedefine SDL_CPUINFO_DISABLED @SDL_CPUINFO_DISABLED@
+#cmakedefine SDL_EVENTS_DISABLED @SDL_EVENTS_DISABLED@
+#cmakedefine SDL_FILE_DISABLED @SDL_FILE_DISABLED@
+#cmakedefine SDL_JOYSTICK_DISABLED @SDL_JOYSTICK_DISABLED@
+#cmakedefine SDL_HAPTIC_DISABLED @SDL_HAPTIC_DISABLED@
+#cmakedefine SDL_LOADSO_DISABLED @SDL_LOADSO_DISABLED@
+#cmakedefine SDL_RENDER_DISABLED @SDL_RENDER_DISABLED@
+#cmakedefine SDL_THREADS_DISABLED @SDL_THREADS_DISABLED@
+#cmakedefine SDL_TIMERS_DISABLED @SDL_TIMERS_DISABLED@
+#cmakedefine SDL_VIDEO_DISABLED @SDL_VIDEO_DISABLED@
+#cmakedefine SDL_POWER_DISABLED @SDL_POWER_DISABLED@
+#cmakedefine SDL_FILESYSTEM_DISABLED @SDL_FILESYSTEM_DISABLED@
+
+/* Enable various audio drivers */
+#cmakedefine SDL_AUDIO_DRIVER_ALSA @SDL_AUDIO_DRIVER_ALSA@
+#cmakedefine SDL_AUDIO_DRIVER_ALSA_DYNAMIC @SDL_AUDIO_DRIVER_ALSA_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_ANDROID @SDL_AUDIO_DRIVER_ANDROID@
+#cmakedefine SDL_AUDIO_DRIVER_ARTS @SDL_AUDIO_DRIVER_ARTS@
+#cmakedefine SDL_AUDIO_DRIVER_ARTS_DYNAMIC @SDL_AUDIO_DRIVER_ARTS_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_COREAUDIO @SDL_AUDIO_DRIVER_COREAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_DISK @SDL_AUDIO_DRIVER_DISK@
+#cmakedefine SDL_AUDIO_DRIVER_DSOUND @SDL_AUDIO_DRIVER_DSOUND@
+#cmakedefine SDL_AUDIO_DRIVER_DUMMY @SDL_AUDIO_DRIVER_DUMMY@
+#cmakedefine SDL_AUDIO_DRIVER_EMSCRIPTEN @SDL_AUDIO_DRIVER_EMSCRIPTEN@
+#cmakedefine SDL_AUDIO_DRIVER_ESD @SDL_AUDIO_DRIVER_ESD@
+#cmakedefine SDL_AUDIO_DRIVER_ESD_DYNAMIC @SDL_AUDIO_DRIVER_ESD_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_FUSIONSOUND @SDL_AUDIO_DRIVER_FUSIONSOUND@
+#cmakedefine SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC @SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_HAIKU @SDL_AUDIO_DRIVER_HAIKU@
+#cmakedefine SDL_AUDIO_DRIVER_JACK @SDL_AUDIO_DRIVER_JACK@
+#cmakedefine SDL_AUDIO_DRIVER_JACK_DYNAMIC @SDL_AUDIO_DRIVER_JACK_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_NAS @SDL_AUDIO_DRIVER_NAS@
+#cmakedefine SDL_AUDIO_DRIVER_NAS_DYNAMIC @SDL_AUDIO_DRIVER_NAS_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_NETBSD @SDL_AUDIO_DRIVER_NETBSD@
+#cmakedefine SDL_AUDIO_DRIVER_OSS @SDL_AUDIO_DRIVER_OSS@
+#cmakedefine SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H @SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H@
+#cmakedefine SDL_AUDIO_DRIVER_PAUDIO @SDL_AUDIO_DRIVER_PAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO @SDL_AUDIO_DRIVER_PULSEAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC @SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_QSA @SDL_AUDIO_DRIVER_QSA@
+#cmakedefine SDL_AUDIO_DRIVER_SNDIO @SDL_AUDIO_DRIVER_SNDIO@
+#cmakedefine SDL_AUDIO_DRIVER_SNDIO_DYNAMIC @SDL_AUDIO_DRIVER_SNDIO_DYNAMIC@
+#cmakedefine SDL_AUDIO_DRIVER_SUNAUDIO @SDL_AUDIO_DRIVER_SUNAUDIO@
+#cmakedefine SDL_AUDIO_DRIVER_WASAPI @SDL_AUDIO_DRIVER_WASAPI@
+#cmakedefine SDL_AUDIO_DRIVER_WINMM @SDL_AUDIO_DRIVER_WINMM@
+#cmakedefine SDL_AUDIO_DRIVER_XAUDIO2 @SDL_AUDIO_DRIVER_XAUDIO2@
+
+/* Enable various input drivers */
+#cmakedefine SDL_INPUT_LINUXEV @SDL_INPUT_LINUXEV@
+#cmakedefine SDL_INPUT_LINUXKD @SDL_INPUT_LINUXKD@
+#cmakedefine SDL_INPUT_TSLIB @SDL_INPUT_TSLIB@
+#cmakedefine SDL_JOYSTICK_ANDROID @SDL_JOYSTICK_ANDROID@
+#cmakedefine SDL_JOYSTICK_HAIKU @SDL_JOYSTICK_HAIKU@
+#cmakedefine SDL_JOYSTICK_DINPUT @SDL_JOYSTICK_DINPUT@
+#cmakedefine SDL_JOYSTICK_XINPUT @SDL_JOYSTICK_XINPUT@
+#cmakedefine SDL_JOYSTICK_DUMMY @SDL_JOYSTICK_DUMMY@
+#cmakedefine SDL_JOYSTICK_IOKIT @SDL_JOYSTICK_IOKIT@
+#cmakedefine SDL_JOYSTICK_MFI @SDL_JOYSTICK_MFI@
+#cmakedefine SDL_JOYSTICK_LINUX @SDL_JOYSTICK_LINUX@
+#cmakedefine SDL_JOYSTICK_WINMM @SDL_JOYSTICK_WINMM@
+#cmakedefine SDL_JOYSTICK_USBHID @SDL_JOYSTICK_USBHID@
+#cmakedefine SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H @SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H@
+#cmakedefine SDL_JOYSTICK_EMSCRIPTEN @SDL_JOYSTICK_EMSCRIPTEN@
+#cmakedefine SDL_HAPTIC_DUMMY @SDL_HAPTIC_DUMMY@
+#cmakedefine SDL_HAPTIC_LINUX @SDL_HAPTIC_LINUX@
+#cmakedefine SDL_HAPTIC_IOKIT @SDL_HAPTIC_IOKIT@
+#cmakedefine SDL_HAPTIC_DINPUT @SDL_HAPTIC_DINPUT@
+#cmakedefine SDL_HAPTIC_XINPUT @SDL_HAPTIC_XINPUT@
+#cmakedefine SDL_HAPTIC_ANDROID @SDL_HAPTIC_ANDROID@
+
+/* Enable various shared object loading systems */
+#cmakedefine SDL_LOADSO_DLOPEN @SDL_LOADSO_DLOPEN@
+#cmakedefine SDL_LOADSO_DUMMY @SDL_LOADSO_DUMMY@
+#cmakedefine SDL_LOADSO_LDG @SDL_LOADSO_LDG@
+#cmakedefine SDL_LOADSO_WINDOWS @SDL_LOADSO_WINDOWS@
+
+/* Enable various threading systems */
+#cmakedefine SDL_THREAD_PTHREAD @SDL_THREAD_PTHREAD@
+#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX @SDL_THREAD_PTHREAD_RECURSIVE_MUTEX@
+#cmakedefine SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP @SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP@
+#cmakedefine SDL_THREAD_WINDOWS @SDL_THREAD_WINDOWS@
+
+/* Enable various timer systems */
+#cmakedefine SDL_TIMER_HAIKU @SDL_TIMER_HAIKU@
+#cmakedefine SDL_TIMER_DUMMY @SDL_TIMER_DUMMY@
+#cmakedefine SDL_TIMER_UNIX @SDL_TIMER_UNIX@
+#cmakedefine SDL_TIMER_WINDOWS @SDL_TIMER_WINDOWS@
+#cmakedefine SDL_TIMER_WINCE @SDL_TIMER_WINCE@
+
+/* Enable various video drivers */
+#cmakedefine SDL_VIDEO_DRIVER_ANDROID @SDL_VIDEO_DRIVER_ANDROID@
+#cmakedefine SDL_VIDEO_DRIVER_HAIKU @SDL_VIDEO_DRIVER_HAIKU@
+#cmakedefine SDL_VIDEO_DRIVER_COCOA @SDL_VIDEO_DRIVER_COCOA@
+#cmakedefine SDL_VIDEO_DRIVER_DIRECTFB @SDL_VIDEO_DRIVER_DIRECTFB@
+#cmakedefine SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC @SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_DUMMY @SDL_VIDEO_DRIVER_DUMMY@
+#cmakedefine SDL_VIDEO_DRIVER_WINDOWS @SDL_VIDEO_DRIVER_WINDOWS@
+#cmakedefine SDL_VIDEO_DRIVER_WAYLAND @SDL_VIDEO_DRIVER_WAYLAND@
+#cmakedefine SDL_VIDEO_DRIVER_RPI @SDL_VIDEO_DRIVER_RPI@
+#cmakedefine SDL_VIDEO_DRIVER_VIVANTE @SDL_VIDEO_DRIVER_VIVANTE@
+#cmakedefine SDL_VIDEO_DRIVER_VIVANTE_VDK @SDL_VIDEO_DRIVER_VIVANTE_VDK@
+
+#cmakedefine SDL_VIDEO_DRIVER_KMSDRM @SDL_VIDEO_DRIVER_KMSDRM@
+#cmakedefine SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC @SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM @SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM@
+
+#cmakedefine SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH @SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH@
+#cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL@
+#cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR@
+#cmakedefine SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON @SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON@
+
+#cmakedefine SDL_VIDEO_DRIVER_MIR @SDL_VIDEO_DRIVER_MIR@
+#cmakedefine SDL_VIDEO_DRIVER_MIR_DYNAMIC @SDL_VIDEO_DRIVER_MIR_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON @SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON@
+#cmakedefine SDL_VIDEO_DRIVER_EMSCRIPTEN @SDL_VIDEO_DRIVER_EMSCRIPTEN@
+#cmakedefine SDL_VIDEO_DRIVER_X11 @SDL_VIDEO_DRIVER_X11@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC @SDL_VIDEO_DRIVER_X11_DYNAMIC@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT @SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR @SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA @SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 @SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR @SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS @SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS@
+#cmakedefine SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE @SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XCURSOR @SDL_VIDEO_DRIVER_X11_XCURSOR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XDBE @SDL_VIDEO_DRIVER_X11_XDBE@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XINERAMA @SDL_VIDEO_DRIVER_X11_XINERAMA@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2 @SDL_VIDEO_DRIVER_X11_XINPUT2@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH @SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XRANDR @SDL_VIDEO_DRIVER_X11_XRANDR@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XSCRNSAVER @SDL_VIDEO_DRIVER_X11_XSCRNSAVER@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@
+#cmakedefine SDL_VIDEO_DRIVER_X11_XVIDMODE @SDL_VIDEO_DRIVER_X11_XVIDMODE@
+#cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@
+#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY@
+#cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM@
+
+#cmakedefine SDL_VIDEO_RENDER_D3D @SDL_VIDEO_RENDER_D3D@
+#cmakedefine SDL_VIDEO_RENDER_D3D11 @SDL_VIDEO_RENDER_D3D11@
+#cmakedefine SDL_VIDEO_RENDER_OGL @SDL_VIDEO_RENDER_OGL@
+#cmakedefine SDL_VIDEO_RENDER_OGL_ES @SDL_VIDEO_RENDER_OGL_ES@
+#cmakedefine SDL_VIDEO_RENDER_OGL_ES2 @SDL_VIDEO_RENDER_OGL_ES2@
+#cmakedefine SDL_VIDEO_RENDER_DIRECTFB @SDL_VIDEO_RENDER_DIRECTFB@
+
+/* Enable OpenGL support */
+#cmakedefine SDL_VIDEO_OPENGL @SDL_VIDEO_OPENGL@
+#cmakedefine SDL_VIDEO_OPENGL_ES @SDL_VIDEO_OPENGL_ES@
+#cmakedefine SDL_VIDEO_OPENGL_ES2 @SDL_VIDEO_OPENGL_ES2@
+#cmakedefine SDL_VIDEO_OPENGL_BGL @SDL_VIDEO_OPENGL_BGL@
+#cmakedefine SDL_VIDEO_OPENGL_CGL @SDL_VIDEO_OPENGL_CGL@
+#cmakedefine SDL_VIDEO_OPENGL_GLX @SDL_VIDEO_OPENGL_GLX@
+#cmakedefine SDL_VIDEO_OPENGL_WGL @SDL_VIDEO_OPENGL_WGL@
+#cmakedefine SDL_VIDEO_OPENGL_EGL @SDL_VIDEO_OPENGL_EGL@
+#cmakedefine SDL_VIDEO_OPENGL_OSMESA @SDL_VIDEO_OPENGL_OSMESA@
+#cmakedefine SDL_VIDEO_OPENGL_OSMESA_DYNAMIC @SDL_VIDEO_OPENGL_OSMESA_DYNAMIC@
+
+/* Enable Vulkan support */
+#cmakedefine SDL_VIDEO_VULKAN @SDL_VIDEO_VULKAN@
+
+/* Enable system power support */
+#cmakedefine SDL_POWER_ANDROID @SDL_POWER_ANDROID@
+#cmakedefine SDL_POWER_LINUX @SDL_POWER_LINUX@
+#cmakedefine SDL_POWER_WINDOWS @SDL_POWER_WINDOWS@
+#cmakedefine SDL_POWER_MACOSX @SDL_POWER_MACOSX@
+#cmakedefine SDL_POWER_HAIKU @SDL_POWER_HAIKU@
+#cmakedefine SDL_POWER_EMSCRIPTEN @SDL_POWER_EMSCRIPTEN@
+#cmakedefine SDL_POWER_HARDWIRED @SDL_POWER_HARDWIRED@
+
+/* Enable system filesystem support */
+#cmakedefine SDL_FILESYSTEM_ANDROID @SDL_FILESYSTEM_ANDROID@
+#cmakedefine SDL_FILESYSTEM_HAIKU @SDL_FILESYSTEM_HAIKU@
+#cmakedefine SDL_FILESYSTEM_COCOA @SDL_FILESYSTEM_COCOA@
+#cmakedefine SDL_FILESYSTEM_DUMMY @SDL_FILESYSTEM_DUMMY@
+#cmakedefine SDL_FILESYSTEM_UNIX @SDL_FILESYSTEM_UNIX@
+#cmakedefine SDL_FILESYSTEM_WINDOWS @SDL_FILESYSTEM_WINDOWS@
+#cmakedefine SDL_FILESYSTEM_EMSCRIPTEN @SDL_FILESYSTEM_EMSCRIPTEN@
+
+/* Enable assembly routines */
+#cmakedefine SDL_ASSEMBLY_ROUTINES @SDL_ASSEMBLY_ROUTINES@
+#cmakedefine SDL_ALTIVEC_BLITTERS @SDL_ALTIVEC_BLITTERS@
+
+/* Enable dynamic libsamplerate support */
+#cmakedefine SDL_LIBSAMPLERATE_DYNAMIC @SDL_LIBSAMPLERATE_DYNAMIC@
+
+/* Platform specific definitions */
+#if !defined(__WIN32__)
+#  if !defined(_STDINT_H_) && !defined(_STDINT_H) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H)
+typedef unsigned int size_t;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+typedef unsigned long uintptr_t;
+#  endif /* if (stdint.h isn't available) */
+#else /* __WIN32__ */
+#  if !defined(_STDINT_H_) && !defined(HAVE_STDINT_H) && !defined(_HAVE_STDINT_H)
+#    if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
+#define HAVE_STDINT_H	1
+#    elif defined(_MSC_VER)
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#      ifndef _UINTPTR_T_DEFINED
+#        ifdef  _WIN64
+typedef unsigned __int64 uintptr_t;
+#          else
+typedef unsigned int uintptr_t;
+#        endif
+#define _UINTPTR_T_DEFINED
+#      endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#      if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#      endif
+#      if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#      endif
+#    else /* !__GNUC__ && !_MSC_VER */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#      ifndef _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#      endif
+typedef unsigned int uintptr_t;
+#    endif /* __GNUC__ || _MSC_VER */
+#  endif /* !_STDINT_H_ && !HAVE_STDINT_H */
+#endif /* __WIN32__ */
+
+#endif /* SDL_config_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h.in b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h.in
new file mode 100644
index 0000000..8b3d208
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config.h.in
@@ -0,0 +1,389 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_h_
+#define SDL_config_h_
+
+/**
+ *  \file SDL_config.h.in
+ *
+ *  This is a set of defines to configure the SDL features
+ */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+/* Make sure that this isn't included by Visual C++ */
+#ifdef _MSC_VER
+#error You should run hg revert SDL_config.h 
+#endif
+
+/* C language features */
+#undef const
+#undef inline
+#undef volatile
+
+/* C datatypes */
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+#undef HAVE_GCC_ATOMICS
+#undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET
+
+#undef HAVE_DDRAW_H
+#undef HAVE_DINPUT_H
+#undef HAVE_DSOUND_H
+#undef HAVE_DXGI_H
+#undef HAVE_XINPUT_H
+#undef HAVE_XINPUT_GAMEPAD_EX
+#undef HAVE_XINPUT_STATE_EX
+
+/* Comment this if you want to build without any C library requirements */
+#undef HAVE_LIBC
+#if HAVE_LIBC
+
+/* Useful headers */
+#undef HAVE_ALLOCA_H
+#undef HAVE_SYS_TYPES_H
+#undef HAVE_STDIO_H
+#undef STDC_HEADERS
+#undef HAVE_STDLIB_H
+#undef HAVE_STDARG_H
+#undef HAVE_MALLOC_H
+#undef HAVE_MEMORY_H
+#undef HAVE_STRING_H
+#undef HAVE_STRINGS_H
+#undef HAVE_WCHAR_H
+#undef HAVE_INTTYPES_H
+#undef HAVE_STDINT_H
+#undef HAVE_CTYPE_H
+#undef HAVE_MATH_H
+#undef HAVE_ICONV_H
+#undef HAVE_SIGNAL_H
+#undef HAVE_ALTIVEC_H
+#undef HAVE_PTHREAD_NP_H
+#undef HAVE_LIBUDEV_H
+#undef HAVE_DBUS_DBUS_H
+#undef HAVE_IBUS_IBUS_H
+#undef HAVE_FCITX_FRONTEND_H
+#undef HAVE_LIBSAMPLERATE_H
+
+/* C library functions */
+#undef HAVE_MALLOC
+#undef HAVE_CALLOC
+#undef HAVE_REALLOC
+#undef HAVE_FREE
+#undef HAVE_ALLOCA
+#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
+#undef HAVE_GETENV
+#undef HAVE_SETENV
+#undef HAVE_PUTENV
+#undef HAVE_UNSETENV
+#endif
+#undef HAVE_QSORT
+#undef HAVE_ABS
+#undef HAVE_BCOPY
+#undef HAVE_MEMSET
+#undef HAVE_MEMCPY
+#undef HAVE_MEMMOVE
+#undef HAVE_MEMCMP
+#undef HAVE_WCSLEN
+#undef HAVE_WCSLCPY
+#undef HAVE_WCSLCAT
+#undef HAVE_WCSCMP
+#undef HAVE_STRLEN
+#undef HAVE_STRLCPY
+#undef HAVE_STRLCAT
+#undef HAVE_STRDUP
+#undef HAVE__STRREV
+#undef HAVE__STRUPR
+#undef HAVE__STRLWR
+#undef HAVE_INDEX
+#undef HAVE_RINDEX
+#undef HAVE_STRCHR
+#undef HAVE_STRRCHR
+#undef HAVE_STRSTR
+#undef HAVE_ITOA
+#undef HAVE__LTOA
+#undef HAVE__UITOA
+#undef HAVE__ULTOA
+#undef HAVE_STRTOL
+#undef HAVE_STRTOUL
+#undef HAVE__I64TOA
+#undef HAVE__UI64TOA
+#undef HAVE_STRTOLL
+#undef HAVE_STRTOULL
+#undef HAVE_STRTOD
+#undef HAVE_ATOI
+#undef HAVE_ATOF
+#undef HAVE_STRCMP
+#undef HAVE_STRNCMP
+#undef HAVE__STRICMP
+#undef HAVE_STRCASECMP
+#undef HAVE__STRNICMP
+#undef HAVE_STRNCASECMP
+#undef HAVE_SSCANF
+#undef HAVE_VSSCANF
+#undef HAVE_SNPRINTF
+#undef HAVE_VSNPRINTF
+#undef HAVE_M_PI
+#undef HAVE_ATAN
+#undef HAVE_ATAN2
+#undef HAVE_ACOS
+#undef HAVE_ASIN
+#undef HAVE_CEIL
+#undef HAVE_COPYSIGN
+#undef HAVE_COS
+#undef HAVE_COSF
+#undef HAVE_FABS
+#undef HAVE_FLOOR
+#undef HAVE_LOG
+#undef HAVE_POW
+#undef HAVE_SCALBN
+#undef HAVE_SIN
+#undef HAVE_SINF
+#undef HAVE_SQRT
+#undef HAVE_SQRTF
+#undef HAVE_TAN
+#undef HAVE_TANF
+#undef HAVE_FOPEN64
+#undef HAVE_FSEEKO
+#undef HAVE_FSEEKO64
+#undef HAVE_SIGACTION
+#undef HAVE_SA_SIGACTION
+#undef HAVE_SETJMP
+#undef HAVE_NANOSLEEP
+#undef HAVE_SYSCONF
+#undef HAVE_SYSCTLBYNAME
+#undef HAVE_CLOCK_GETTIME
+#undef HAVE_GETPAGESIZE
+#undef HAVE_MPROTECT
+#undef HAVE_ICONV
+#undef HAVE_PTHREAD_SETNAME_NP
+#undef HAVE_PTHREAD_SET_NAME_NP
+#undef HAVE_SEM_TIMEDWAIT
+#undef HAVE_GETAUXVAL
+#undef HAVE_POLL
+
+#else
+#define HAVE_STDARG_H   1
+#define HAVE_STDDEF_H   1
+#define HAVE_STDINT_H   1
+#endif /* HAVE_LIBC */
+
+/* SDL internal assertion support */
+#undef SDL_DEFAULT_ASSERT_LEVEL
+
+/* Allow disabling of core subsystems */
+#undef SDL_ATOMIC_DISABLED
+#undef SDL_AUDIO_DISABLED
+#undef SDL_CPUINFO_DISABLED
+#undef SDL_EVENTS_DISABLED
+#undef SDL_FILE_DISABLED
+#undef SDL_JOYSTICK_DISABLED
+#undef SDL_HAPTIC_DISABLED
+#undef SDL_LOADSO_DISABLED
+#undef SDL_RENDER_DISABLED
+#undef SDL_THREADS_DISABLED
+#undef SDL_TIMERS_DISABLED
+#undef SDL_VIDEO_DISABLED
+#undef SDL_POWER_DISABLED
+#undef SDL_FILESYSTEM_DISABLED
+
+/* Enable various audio drivers */
+#undef SDL_AUDIO_DRIVER_ALSA
+#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
+#undef SDL_AUDIO_DRIVER_ANDROID
+#undef SDL_AUDIO_DRIVER_ARTS
+#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
+#undef SDL_AUDIO_DRIVER_COREAUDIO
+#undef SDL_AUDIO_DRIVER_DISK
+#undef SDL_AUDIO_DRIVER_DSOUND
+#undef SDL_AUDIO_DRIVER_DUMMY
+#undef SDL_AUDIO_DRIVER_EMSCRIPTEN
+#undef SDL_AUDIO_DRIVER_ESD
+#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
+#undef SDL_AUDIO_DRIVER_FUSIONSOUND
+#undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC
+#undef SDL_AUDIO_DRIVER_HAIKU
+#undef SDL_AUDIO_DRIVER_JACK
+#undef SDL_AUDIO_DRIVER_JACK_DYNAMIC
+#undef SDL_AUDIO_DRIVER_NACL
+#undef SDL_AUDIO_DRIVER_NAS
+#undef SDL_AUDIO_DRIVER_NAS_DYNAMIC
+#undef SDL_AUDIO_DRIVER_NETBSD
+#undef SDL_AUDIO_DRIVER_OSS
+#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
+#undef SDL_AUDIO_DRIVER_PAUDIO
+#undef SDL_AUDIO_DRIVER_PULSEAUDIO
+#undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC
+#undef SDL_AUDIO_DRIVER_QSA
+#undef SDL_AUDIO_DRIVER_SNDIO
+#undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC
+#undef SDL_AUDIO_DRIVER_SUNAUDIO
+#undef SDL_AUDIO_DRIVER_WASAPI
+#undef SDL_AUDIO_DRIVER_WINMM
+#undef SDL_AUDIO_DRIVER_XAUDIO2
+
+/* Enable various input drivers */
+#undef SDL_INPUT_LINUXEV
+#undef SDL_INPUT_LINUXKD
+#undef SDL_INPUT_TSLIB
+#undef SDL_JOYSTICK_HAIKU
+#undef SDL_JOYSTICK_DINPUT
+#undef SDL_JOYSTICK_XINPUT
+#undef SDL_JOYSTICK_DUMMY
+#undef SDL_JOYSTICK_IOKIT
+#undef SDL_JOYSTICK_LINUX
+#undef SDL_JOYSTICK_ANDROID
+#undef SDL_JOYSTICK_WINMM
+#undef SDL_JOYSTICK_USBHID
+#undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
+#undef SDL_JOYSTICK_EMSCRIPTEN
+#undef SDL_HAPTIC_DUMMY
+#undef SDL_HAPTIC_LINUX
+#undef SDL_HAPTIC_IOKIT
+#undef SDL_HAPTIC_DINPUT
+#undef SDL_HAPTIC_XINPUT
+
+/* Enable various shared object loading systems */
+#undef SDL_LOADSO_DLOPEN
+#undef SDL_LOADSO_DUMMY
+#undef SDL_LOADSO_LDG
+#undef SDL_LOADSO_WINDOWS
+
+/* Enable various threading systems */
+#undef SDL_THREAD_PTHREAD
+#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
+#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
+#undef SDL_THREAD_WINDOWS
+
+/* Enable various timer systems */
+#undef SDL_TIMER_HAIKU
+#undef SDL_TIMER_DUMMY
+#undef SDL_TIMER_UNIX
+#undef SDL_TIMER_WINDOWS
+
+/* Enable various video drivers */
+#undef SDL_VIDEO_DRIVER_HAIKU
+#undef SDL_VIDEO_DRIVER_COCOA
+#undef SDL_VIDEO_DRIVER_DIRECTFB
+#undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC
+#undef SDL_VIDEO_DRIVER_DUMMY
+#undef SDL_VIDEO_DRIVER_WINDOWS
+#undef SDL_VIDEO_DRIVER_WAYLAND
+#undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR
+#undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON
+#undef SDL_VIDEO_DRIVER_MIR
+#undef SDL_VIDEO_DRIVER_MIR_DYNAMIC
+#undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON
+#undef SDL_VIDEO_DRIVER_X11
+#undef SDL_VIDEO_DRIVER_RPI
+#undef SDL_VIDEO_DRIVER_KMSDRM
+#undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC
+#undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM
+#undef SDL_VIDEO_DRIVER_ANDROID
+#undef SDL_VIDEO_DRIVER_EMSCRIPTEN
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE
+#undef SDL_VIDEO_DRIVER_X11_XCURSOR
+#undef SDL_VIDEO_DRIVER_X11_XDBE
+#undef SDL_VIDEO_DRIVER_X11_XINERAMA
+#undef SDL_VIDEO_DRIVER_X11_XINPUT2
+#undef SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH
+#undef SDL_VIDEO_DRIVER_X11_XRANDR
+#undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER
+#undef SDL_VIDEO_DRIVER_X11_XSHAPE
+#undef SDL_VIDEO_DRIVER_X11_XVIDMODE
+#undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY
+#undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+#undef SDL_VIDEO_DRIVER_NACL
+#undef SDL_VIDEO_DRIVER_VIVANTE
+#undef SDL_VIDEO_DRIVER_VIVANTE_VDK
+#undef SDL_VIDEO_DRIVER_QNX
+
+#undef SDL_VIDEO_RENDER_D3D
+#undef SDL_VIDEO_RENDER_D3D11
+#undef SDL_VIDEO_RENDER_OGL
+#undef SDL_VIDEO_RENDER_OGL_ES
+#undef SDL_VIDEO_RENDER_OGL_ES2
+#undef SDL_VIDEO_RENDER_DIRECTFB
+
+/* Enable OpenGL support */
+#undef SDL_VIDEO_OPENGL
+#undef SDL_VIDEO_OPENGL_ES
+#undef SDL_VIDEO_OPENGL_ES2
+#undef SDL_VIDEO_OPENGL_BGL
+#undef SDL_VIDEO_OPENGL_CGL
+#undef SDL_VIDEO_OPENGL_EGL
+#undef SDL_VIDEO_OPENGL_GLX
+#undef SDL_VIDEO_OPENGL_WGL
+#undef SDL_VIDEO_OPENGL_OSMESA
+#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
+
+/* Enable Vulkan support */
+#undef SDL_VIDEO_VULKAN
+
+/* Enable system power support */
+#undef SDL_POWER_LINUX
+#undef SDL_POWER_WINDOWS
+#undef SDL_POWER_MACOSX
+#undef SDL_POWER_HAIKU
+#undef SDL_POWER_ANDROID
+#undef SDL_POWER_EMSCRIPTEN
+#undef SDL_POWER_HARDWIRED
+
+/* Enable system filesystem support */
+#undef SDL_FILESYSTEM_HAIKU
+#undef SDL_FILESYSTEM_COCOA
+#undef SDL_FILESYSTEM_DUMMY
+#undef SDL_FILESYSTEM_UNIX
+#undef SDL_FILESYSTEM_WINDOWS
+#undef SDL_FILESYSTEM_NACL
+#undef SDL_FILESYSTEM_ANDROID
+#undef SDL_FILESYSTEM_EMSCRIPTEN
+
+/* Enable assembly routines */
+#undef SDL_ASSEMBLY_ROUTINES
+#undef SDL_ALTIVEC_BLITTERS
+
+/* Enable ime support */
+#undef SDL_USE_IME
+
+/* Enable dynamic udev support */
+#undef SDL_UDEV_DYNAMIC
+
+/* Enable dynamic libsamplerate support */
+#undef SDL_LIBSAMPLERATE_DYNAMIC
+
+#endif /* SDL_config_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_android.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_android.h
new file mode 100644
index 0000000..361bad8
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_android.h
@@ -0,0 +1,157 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_android_h_
+#define SDL_config_android_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+/**
+ *  \file SDL_config_android.h
+ *
+ *  This is a configuration that can be used to build SDL for Android
+ */
+
+#include <stdarg.h>
+
+#define HAVE_GCC_ATOMICS    1
+
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H 1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_M_PI   1
+#define HAVE_ATAN   1
+#define HAVE_ATAN2  1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SQRTF  1
+#define HAVE_TAN    1
+#define HAVE_TANF   1
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+#define HAVE_CLOCK_GETTIME	1
+
+#define SIZEOF_VOIDP 4
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_ANDROID    1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_ANDROID    1
+#define SDL_HAPTIC_ANDROID    1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_DLOPEN   1
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD  1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX  1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_ANDROID 1
+
+/* Enable OpenGL ES */
+#define SDL_VIDEO_OPENGL_ES 1
+#define SDL_VIDEO_OPENGL_ES2 1
+#define SDL_VIDEO_OPENGL_EGL 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_RENDER_OGL_ES2    1
+
+/* Enable Vulkan support */
+/* Android does not support Vulkan in native code using the "armeabi" ABI. */
+#if defined(__ARM_ARCH) && __ARM_ARCH < 7
+#define SDL_VIDEO_VULKAN 0
+#else
+#define SDL_VIDEO_VULKAN 1
+#endif
+
+/* Enable system power support */
+#define SDL_POWER_ANDROID 1
+
+/* Enable the filesystem driver */
+#define SDL_FILESYSTEM_ANDROID   1
+
+#endif /* SDL_config_android_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_iphoneos.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_iphoneos.h
new file mode 100644
index 0000000..deea030
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_iphoneos.h
@@ -0,0 +1,166 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_iphoneos_h_
+#define SDL_config_iphoneos_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
+#define HAVE_GCC_ATOMICS    1
+
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_M_PI   1
+#define HAVE_ATAN   1
+#define HAVE_ATAN2  1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SQRTF  1
+#define HAVE_TAN    1
+#define HAVE_TANF   1
+#define HAVE_SIGACTION  1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+#define HAVE_SYSCTLBYNAME 1
+
+/* enable iPhone version of Core Audio driver */
+#define SDL_AUDIO_DRIVER_COREAUDIO 1
+/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
+#define SDL_HAPTIC_DUMMY 1
+
+/* Enable MFi joystick support */
+#define SDL_JOYSTICK_MFI 1
+
+/* Enable Unix style SO loading */
+#define SDL_LOADSO_DLOPEN 1
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD  1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX  1
+
+/* Supported video drivers */
+#define SDL_VIDEO_DRIVER_UIKIT  1
+#define SDL_VIDEO_DRIVER_DUMMY  1
+
+/* enable OpenGL ES */
+#define SDL_VIDEO_OPENGL_ES2 1
+#define SDL_VIDEO_OPENGL_ES 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_RENDER_OGL_ES2    1
+
+/* Enable Vulkan support */
+#if !TARGET_OS_SIMULATOR && !TARGET_CPU_ARM // Only 64-bit devices have Metal
+#define SDL_VIDEO_VULKAN 1
+#else
+#define SDL_VIDEO_VULKAN 0
+#endif
+
+/* Enable system power support */
+#define SDL_POWER_UIKIT 1
+
+/* enable iPhone keyboard support */
+#define SDL_IPHONE_KEYBOARD 1
+
+/* enable iOS extended launch screen */
+#define SDL_IPHONE_LAUNCHSCREEN 1
+
+/* Set max recognized G-force from accelerometer
+   See src/joystick/uikit/SDL_sysjoystick.m for notes on why this is needed
+ */
+#define SDL_IPHONE_MAX_GFORCE 5.0
+
+/* enable filesystem support */
+#define SDL_FILESYSTEM_COCOA   1
+
+#endif /* SDL_config_iphoneos_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_macosx.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_macosx.h
new file mode 100644
index 0000000..9b09899
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_macosx.h
@@ -0,0 +1,197 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_macosx_h_
+#define SDL_config_macosx_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
+#include <AvailabilityMacros.h>
+
+/* This is a set of defines to configure the SDL features */
+
+#ifdef __LP64__
+    #define SIZEOF_VOIDP 8
+#else
+    #define SIZEOF_VOIDP 4
+#endif
+
+/* Useful headers */
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SQRTF  1
+#define HAVE_TAN    1
+#define HAVE_TANF   1
+#define HAVE_SIGACTION  1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+#define HAVE_SYSCTLBYNAME 1
+#define HAVE_ATAN 1
+#define HAVE_ATAN2 1
+#define HAVE_ACOS 1
+#define HAVE_ASIN 1
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_COREAUDIO  1
+#define SDL_AUDIO_DRIVER_DISK   1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_IOKIT  1
+#define SDL_HAPTIC_IOKIT    1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_DLOPEN   1
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD  1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX  1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_COCOA  1
+#define SDL_VIDEO_DRIVER_DUMMY  1
+#undef SDL_VIDEO_DRIVER_X11
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_XDBE 1
+#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
+#define SDL_VIDEO_DRIVER_X11_XRANDR 1
+#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
+#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
+#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
+#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
+
+#ifdef MAC_OS_X_VERSION_10_8
+/*
+ * No matter the versions targeted, this is the 10.8 or later SDK, so you have
+ *  to use the external Xquartz, which is a more modern Xlib. Previous SDKs
+ *  used an older Xlib.
+ */
+#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
+#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
+#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
+#endif
+
+#ifndef SDL_VIDEO_RENDER_OGL
+#define SDL_VIDEO_RENDER_OGL    1
+#endif
+
+/* Enable OpenGL support */
+#ifndef SDL_VIDEO_OPENGL
+#define SDL_VIDEO_OPENGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_CGL
+#define SDL_VIDEO_OPENGL_CGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_GLX
+#define SDL_VIDEO_OPENGL_GLX    1
+#endif
+
+/* Enable Vulkan support */
+/* Metal/MoltenVK/Vulkan only supported on 64-bit architectures with 10.11+ */
+#if TARGET_CPU_X86_64 && (MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
+#define SDL_VIDEO_VULKAN 1
+#else
+#define  SDL_VIDEO_VULKAN 0
+#endif
+
+/* Enable system power support */
+#define SDL_POWER_MACOSX 1
+
+/* enable filesystem support */
+#define SDL_FILESYSTEM_COCOA   1
+
+/* Enable assembly routines */
+#define SDL_ASSEMBLY_ROUTINES   1
+#ifdef __ppc__
+#define SDL_ALTIVEC_BLITTERS    1
+#endif
+
+#endif /* SDL_config_macosx_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_macosx.h.orig b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_macosx.h.orig
new file mode 100644
index 0000000..f03f1ae
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_macosx.h.orig
@@ -0,0 +1,197 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_macosx_h_
+#define SDL_config_macosx_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
+#include <AvailabilityMacros.h>
+
+/* This is a set of defines to configure the SDL features */
+
+#ifdef __LP64__
+    #define SIZEOF_VOIDP 8
+#else
+    #define SIZEOF_VOIDP 4
+#endif
+
+/* Useful headers */
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SQRTF  1
+#define HAVE_TAN    1
+#define HAVE_TANF   1
+#define HAVE_SIGACTION  1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+#define HAVE_SYSCTLBYNAME 1
+#define HAVE_ATAN 1
+#define HAVE_ATAN2 1
+#define HAVE_ACOS 1
+#define HAVE_ASIN 1
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_COREAUDIO  1
+#define SDL_AUDIO_DRIVER_DISK   1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_IOKIT  1
+#define SDL_HAPTIC_IOKIT    1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_DLOPEN   1
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD  1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_UNIX  1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_COCOA  1
+#define SDL_VIDEO_DRIVER_DUMMY  1
+#undef SDL_VIDEO_DRIVER_X11
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
+#define SDL_VIDEO_DRIVER_X11_XDBE 1
+#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
+#define SDL_VIDEO_DRIVER_X11_XRANDR 1
+#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
+#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
+#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
+#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
+
+#ifdef MAC_OS_X_VERSION_10_8
+/*
+ * No matter the versions targeted, this is the 10.8 or later SDK, so you have
+ *  to use the external Xquartz, which is a more modern Xlib. Previous SDKs
+ *  used an older Xlib.
+ */
+#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
+#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
+#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
+#endif
+
+#ifndef SDL_VIDEO_RENDER_OGL
+#define SDL_VIDEO_RENDER_OGL    1
+#endif
+
+/* Enable OpenGL support */
+#ifndef SDL_VIDEO_OPENGL
+#define SDL_VIDEO_OPENGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_CGL
+#define SDL_VIDEO_OPENGL_CGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_GLX
+#define SDL_VIDEO_OPENGL_GLX    1
+#endif
+
+/* Enable Vulkan support */
+/* Metal/MoltenVK/Vulkan only supported on 64-bit architectures and 10.11+ */
+#if TARGET_CPU_X86_64
+#define SDL_VIDEO_VULKAN 1
+#else
+#define  SDL_VIDEO_VULKAN 0
+#endif
+
+/* Enable system power support */
+#define SDL_POWER_MACOSX 1
+
+/* enable filesystem support */
+#define SDL_FILESYSTEM_COCOA   1
+
+/* Enable assembly routines */
+#define SDL_ASSEMBLY_ROUTINES   1
+#ifdef __ppc__
+#define SDL_ALTIVEC_BLITTERS    1
+#endif
+
+#endif /* SDL_config_macosx_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_minimal.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_minimal.h
new file mode 100644
index 0000000..3112700
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_minimal.h
@@ -0,0 +1,82 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_minimal_h_
+#define SDL_config_minimal_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+/**
+ *  \file SDL_config_minimal.h
+ *
+ *  This is the minimal configuration that can be used to build SDL.
+ */
+
+#define HAVE_STDARG_H   1
+#define HAVE_STDDEF_H   1
+
+/* Most everything except Visual Studio 2008 and earlier has stdint.h now */
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
+/* Here are some reasonable defaults */
+typedef unsigned int size_t;
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+typedef unsigned long uintptr_t;
+#else
+#define HAVE_STDINT_H 1
+#endif /* Visual Studio 2008 */
+
+#ifdef __GNUC__
+#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1
+#endif
+
+/* Enable the dummy audio driver (src/audio/dummy/\*.c) */
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
+#define SDL_JOYSTICK_DISABLED   1
+
+/* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
+#define SDL_HAPTIC_DISABLED 1
+
+/* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
+#define SDL_LOADSO_DISABLED 1
+
+/* Enable the stub thread support (src/thread/generic/\*.c) */
+#define SDL_THREADS_DISABLED    1
+
+/* Enable the stub timer support (src/timer/dummy/\*.c) */
+#define SDL_TIMERS_DISABLED 1
+
+/* Enable the dummy video driver (src/video/dummy/\*.c) */
+#define SDL_VIDEO_DRIVER_DUMMY  1
+
+/* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */
+#define SDL_FILESYSTEM_DUMMY  1
+
+#endif /* SDL_config_minimal_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_pandora.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_pandora.h
new file mode 100644
index 0000000..ea62fe5
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_pandora.h
@@ -0,0 +1,128 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_pandora_h_
+#define SDL_config_pandora_h_
+#define SDL_config_h_
+
+/* This is a set of defines to configure the SDL features */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+
+#define SDL_BYTEORDER 1234
+
+#define HAVE_ALLOCA_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_ICONV_H 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_BCOPY 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_STRLEN 1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_M_PI 1
+#define HAVE_CEIL 1
+#define HAVE_COPYSIGN 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_SCALBN 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE_SQRTF 1
+#define HAVE_TAN 1
+#define HAVE_TANF 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+
+#define SDL_AUDIO_DRIVER_DUMMY 1
+#define SDL_AUDIO_DRIVER_OSS 1
+
+#define SDL_INPUT_LINUXEV 1
+#define SDL_INPUT_TSLIB 1
+#define SDL_JOYSTICK_LINUX 1
+#define SDL_HAPTIC_LINUX 1
+
+#define SDL_LOADSO_DLOPEN 1
+
+#define SDL_THREAD_PTHREAD 1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1
+
+#define SDL_TIMER_UNIX 1
+#define SDL_FILESYSTEM_UNIX 1
+
+#define SDL_VIDEO_DRIVER_DUMMY 1
+#define SDL_VIDEO_DRIVER_X11 1
+#define SDL_VIDEO_DRIVER_PANDORA 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_OPENGL_ES 1
+
+#endif /* SDL_config_pandora_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_psp.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_psp.h
new file mode 100644
index 0000000..28efb4c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_psp.h
@@ -0,0 +1,144 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_psp_h_
+#define SDL_config_psp_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+
+
+#ifdef __GNUC__
+#define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1
+#endif
+
+#define HAVE_GCC_ATOMICS    1
+
+#define HAVE_ALLOCA_H       1
+#define HAVE_SYS_TYPES_H    1
+#define HAVE_STDIO_H    1
+#define STDC_HEADERS    1
+#define HAVE_STRING_H   1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H   1
+#define HAVE_CTYPE_H    1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H   1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_SETENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRLCPY    1
+#define HAVE_STRLCAT    1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_M_PI   1
+#define HAVE_ATAN   1
+#define HAVE_ATAN2  1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL   1
+#define HAVE_COPYSIGN   1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_FABS   1
+#define HAVE_FLOOR  1
+#define HAVE_LOG    1
+#define HAVE_POW    1
+#define HAVE_SCALBN 1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SQRTF  1
+#define HAVE_TAN    1
+#define HAVE_TANF   1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+/* #define HAVE_SYSCONF  1 */
+/* #define HAVE_SIGACTION    1 */
+
+
+/* PSP isn't that sophisticated */
+#define LACKS_SYS_MMAN_H 1
+
+/* Enable the stub thread support (src/thread/psp/\*.c) */
+#define SDL_THREAD_PSP  1
+
+/* Enable the stub timer support (src/timer/psp/\*.c) */
+#define SDL_TIMERS_PSP  1
+
+/* Enable the stub joystick driver (src/joystick/psp/\*.c) */
+#define SDL_JOYSTICK_PSP        1
+
+/* Enable the stub audio driver (src/audio/psp/\*.c) */
+#define SDL_AUDIO_DRIVER_PSP    1
+
+/* PSP video dirver */
+#define SDL_VIDEO_DRIVER_PSP   1
+
+/* PSP render dirver */
+#define SDL_VIDEO_RENDER_PSP   1
+
+#define SDL_POWER_PSP          1
+
+/* !!! FIXME: what does PSP do for filesystem stuff? */
+#define SDL_FILESYSTEM_DUMMY   1
+
+/* PSP doesn't have haptic device (src/haptic/dummy/\*.c) */
+#define SDL_HAPTIC_DISABLED    1
+
+/* PSP can't load shared object (src/loadso/dummy/\*.c) */
+#define SDL_LOADSO_DISABLED    1
+
+
+#endif /* SDL_config_psp_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_windows.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_windows.h
new file mode 100644
index 0000000..2456c84
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_windows.h
@@ -0,0 +1,225 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_windows_h_
+#define SDL_config_windows_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+/* This is a set of defines to configure the SDL features */
+
+#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
+#define HAVE_STDINT_H   1
+#elif defined(_MSC_VER)
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#ifndef _UINTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
+typedef unsigned int uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#endif
+#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#endif
+#else /* !__GNUC__ && !_MSC_VER */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#ifndef _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#endif
+typedef unsigned int uintptr_t;
+#endif /* __GNUC__ || _MSC_VER */
+#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
+
+#ifdef _WIN64
+# define SIZEOF_VOIDP 8
+#else
+# define SIZEOF_VOIDP 4
+#endif
+
+#define HAVE_DDRAW_H 1
+#define HAVE_DINPUT_H 1
+#define HAVE_DSOUND_H 1
+#define HAVE_DXGI_H 1
+#define HAVE_XINPUT_H 1
+
+/* This is disabled by default to avoid C runtime dependencies and manifest requirements */
+#ifdef HAVE_LIBC
+/* Useful headers */
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STRING_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H 1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE__STRREV 1
+#define HAVE__STRUPR 1
+#define HAVE__STRLWR 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE__LTOA 1
+#define HAVE__ULTOA 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE__STRICMP 1
+#define HAVE__STRNICMP 1
+#define HAVE_ATAN 1
+#define HAVE_ATAN2 1
+#define HAVE_ACOS  1
+#define HAVE_ASIN  1
+#define HAVE_CEIL 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_POW 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE_SQRTF 1
+#define HAVE_TAN 1
+#define HAVE_TANF 1
+#if _MSC_VER >= 1800
+#define HAVE_STRTOLL 1
+#define HAVE_VSSCANF 1
+#define HAVE_COPYSIGN 1
+#define HAVE_SCALBN 1
+#endif
+#if !defined(_MSC_VER) || defined(_USE_MATH_DEFINES)
+#define HAVE_M_PI 1
+#endif
+#else
+#define HAVE_STDARG_H   1
+#define HAVE_STDDEF_H   1
+#endif
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_WASAPI 1
+#define SDL_AUDIO_DRIVER_DSOUND 1
+#define SDL_AUDIO_DRIVER_XAUDIO2    0
+#define SDL_AUDIO_DRIVER_WINMM  1
+#define SDL_AUDIO_DRIVER_DISK   1
+#define SDL_AUDIO_DRIVER_DUMMY  1
+
+/* Enable various input drivers */
+#define SDL_JOYSTICK_DINPUT 1
+#define SDL_JOYSTICK_XINPUT 1
+#define SDL_HAPTIC_DINPUT   1
+#define SDL_HAPTIC_XINPUT   1
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_WINDOWS  1
+
+/* Enable various threading systems */
+#define SDL_THREAD_WINDOWS  1
+
+/* Enable various timer systems */
+#define SDL_TIMER_WINDOWS   1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_DUMMY  1
+#define SDL_VIDEO_DRIVER_WINDOWS    1
+
+#ifndef SDL_VIDEO_RENDER_D3D
+#define SDL_VIDEO_RENDER_D3D    1
+#endif
+#ifndef SDL_VIDEO_RENDER_D3D11
+#define SDL_VIDEO_RENDER_D3D11	0
+#endif
+
+/* Enable OpenGL support */
+#ifndef SDL_VIDEO_OPENGL
+#define SDL_VIDEO_OPENGL    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_WGL
+#define SDL_VIDEO_OPENGL_WGL    1
+#endif
+#ifndef SDL_VIDEO_RENDER_OGL
+#define SDL_VIDEO_RENDER_OGL    1
+#endif
+#ifndef SDL_VIDEO_RENDER_OGL_ES2
+#define SDL_VIDEO_RENDER_OGL_ES2    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_ES2
+#define SDL_VIDEO_OPENGL_ES2    1
+#endif
+#ifndef SDL_VIDEO_OPENGL_EGL
+#define SDL_VIDEO_OPENGL_EGL    1
+#endif
+
+/* Enable Vulkan support */
+#define SDL_VIDEO_VULKAN 1
+
+/* Enable system power support */
+#define SDL_POWER_WINDOWS 1
+
+/* Enable filesystem support */
+#define SDL_FILESYSTEM_WINDOWS  1
+
+/* Enable assembly routines (Win64 doesn't have inline asm) */
+#ifndef _WIN64
+#define SDL_ASSEMBLY_ROUTINES   1
+#endif
+
+#endif /* SDL_config_windows_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_winrt.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_winrt.h
new file mode 100644
index 0000000..24f9e17
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_winrt.h
@@ -0,0 +1,215 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_winrt_h_
+#define SDL_config_winrt_h_
+#define SDL_config_h_
+
+#include "SDL_platform.h"
+
+/* Make sure the Windows SDK's NTDDI_VERSION macro gets defined.  This is used
+   by SDL to determine which version of the Windows SDK is being used.
+*/
+#include <sdkddkver.h>
+
+/* Define possibly-undefined NTDDI values (used when compiling SDL against
+   older versions of the Windows SDK.
+*/
+#ifndef NTDDI_WINBLUE
+#define NTDDI_WINBLUE 0x06030000
+#endif
+#ifndef NTDDI_WIN10
+#define NTDDI_WIN10 0x0A000000
+#endif
+
+/* This is a set of defines to configure the SDL features */
+
+#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
+#if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
+#define HAVE_STDINT_H	1
+#elif defined(_MSC_VER)
+typedef signed __int8 int8_t;
+typedef unsigned __int8 uint8_t;
+typedef signed __int16 int16_t;
+typedef unsigned __int16 uint16_t;
+typedef signed __int32 int32_t;
+typedef unsigned __int32 uint32_t;
+typedef signed __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#ifndef _UINTPTR_T_DEFINED
+#ifdef  _WIN64
+typedef unsigned __int64 uintptr_t;
+#else
+typedef unsigned int uintptr_t;
+#endif
+#define _UINTPTR_T_DEFINED
+#endif
+/* Older Visual C++ headers don't have the Win64-compatible typedefs... */
+#if ((_MSC_VER <= 1200) && (!defined(DWORD_PTR)))
+#define DWORD_PTR DWORD
+#endif
+#if ((_MSC_VER <= 1200) && (!defined(LONG_PTR)))
+#define LONG_PTR LONG
+#endif
+#else /* !__GNUC__ && !_MSC_VER */
+typedef signed char int8_t;
+typedef unsigned char uint8_t;
+typedef signed short int16_t;
+typedef unsigned short uint16_t;
+typedef signed int int32_t;
+typedef unsigned int uint32_t;
+typedef signed long long int64_t;
+typedef unsigned long long uint64_t;
+#ifndef _SIZE_T_DEFINED_
+#define _SIZE_T_DEFINED_
+typedef unsigned int size_t;
+#endif
+typedef unsigned int uintptr_t;
+#endif /* __GNUC__ || _MSC_VER */
+#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
+
+#ifdef _WIN64
+# define SIZEOF_VOIDP 8
+#else
+# define SIZEOF_VOIDP 4
+#endif
+
+/* Useful headers */
+#define HAVE_DXGI_H 1
+#if WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP
+#define HAVE_XINPUT_H 1
+#endif
+#define HAVE_LIBC 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STRING_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_FLOAT_H 1
+#define HAVE_SIGNAL_H 1
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE__STRREV 1
+#define HAVE__STRUPR 1
+//#define HAVE__STRLWR 1	// TODO, WinRT: consider using _strlwr_s instead
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+//#define HAVE_ITOA 1   // TODO, WinRT: consider using _itoa_s instead
+//#define HAVE__LTOA 1	// TODO, WinRT: consider using _ltoa_s instead
+//#define HAVE__ULTOA 1	// TODO, WinRT: consider using _ultoa_s instead
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+//#define HAVE_STRTOLL 1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE__STRICMP 1
+#define HAVE__STRNICMP 1
+#define HAVE_VSNPRINTF 1
+//#define HAVE_SSCANF 1	// TODO, WinRT: consider using sscanf_s instead
+#define HAVE_M_PI 1
+#define HAVE_ATAN 1
+#define HAVE_ATAN2 1
+#define HAVE_CEIL 1
+#define HAVE__COPYSIGN 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_POW 1
+//#define HAVE_SCALBN 1
+#define HAVE__SCALB 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE_SQRTF 1
+#define HAVE_TAN 1
+#define HAVE_TANF 1
+#define HAVE__FSEEKI64 1
+
+/* Enable various audio drivers */
+#define SDL_AUDIO_DRIVER_XAUDIO2	1
+#define SDL_AUDIO_DRIVER_DISK	1
+#define SDL_AUDIO_DRIVER_DUMMY	1
+
+/* Enable various input drivers */
+#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP
+#define SDL_JOYSTICK_DISABLED 1
+#define SDL_HAPTIC_DISABLED	1
+#else
+#define SDL_JOYSTICK_XINPUT 1
+#define SDL_HAPTIC_XINPUT   1
+#endif
+
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_WINDOWS	1
+
+/* Enable various threading systems */
+#if (NTDDI_VERSION >= NTDDI_WINBLUE)
+#define SDL_THREAD_WINDOWS  1
+#else
+/* WinRT on Windows 8.0 and Windows Phone 8.0 don't support CreateThread() */
+#define SDL_THREAD_STDCPP   1
+#endif
+
+/* Enable various timer systems */
+#define SDL_TIMER_WINDOWS	1
+
+/* Enable various video drivers */
+#define SDL_VIDEO_DRIVER_WINRT	1
+#define SDL_VIDEO_DRIVER_DUMMY  1
+
+/* Enable OpenGL ES 2.0 (via a modified ANGLE library) */
+#define SDL_VIDEO_OPENGL_ES2 1
+#define SDL_VIDEO_OPENGL_EGL 1
+
+/* Enable appropriate renderer(s) */
+#define SDL_VIDEO_RENDER_D3D11  1
+
+#if SDL_VIDEO_OPENGL_ES2
+#define SDL_VIDEO_RENDER_OGL_ES2 1
+#endif
+
+/* Enable system power support */
+#define SDL_POWER_WINRT 1
+
+/* Enable assembly routines (Win64 doesn't have inline asm) */
+#ifndef _WIN64
+#define SDL_ASSEMBLY_ROUTINES	1
+#endif
+
+#endif /* SDL_config_winrt_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_wiz.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_wiz.h
new file mode 100644
index 0000000..5bb845a
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_config_wiz.h
@@ -0,0 +1,121 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_config_wiz_h_
+#define SDL_config_wiz_h_
+#define SDL_config_h_
+
+/* This is a set of defines to configure the SDL features */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+#define SDL_BYTEORDER 1234
+
+#define HAVE_ALLOCA_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_ICONV_H 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_BCOPY 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_STRLEN 1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_M_PI 1
+#define HAVE_CEIL 1
+#define HAVE_COPYSIGN 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_SCALBN 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE_SQRTF 1
+#define HAVE_TAN 1
+#define HAVE_TANF 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_POW 1
+
+#define SDL_AUDIO_DRIVER_DUMMY 1
+#define SDL_AUDIO_DRIVER_OSS 1
+
+#define SDL_INPUT_LINUXEV 1
+#define SDL_INPUT_TSLIB 1
+#define SDL_JOYSTICK_LINUX 1
+#define SDL_HAPTIC_LINUX 1
+
+#define SDL_LOADSO_DLOPEN 1
+
+#define SDL_THREAD_PTHREAD 1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1
+
+#define SDL_TIMER_UNIX 1
+
+#define SDL_VIDEO_DRIVER_DUMMY 1
+#define SDL_VIDEO_DRIVER_PANDORA 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_OPENGL_ES 1
+
+#endif /* SDL_config_wiz_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_copying.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_copying.h
new file mode 100644
index 0000000..8f60af6
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_copying.h
@@ -0,0 +1,20 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_cpuinfo.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_cpuinfo.h
new file mode 100644
index 0000000..296df01
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_cpuinfo.h
@@ -0,0 +1,270 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_cpuinfo.h
+ *
+ *  CPU feature detection for SDL.
+ */
+
+#ifndef SDL_cpuinfo_h_
+#define SDL_cpuinfo_h_
+
+#include "SDL_stdinc.h"
+
+/* Need to do this here because intrin.h has C++ code in it */
+/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
+#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64))
+#ifdef __clang__
+/* Many of the intrinsics SDL uses are not implemented by clang with Visual Studio */
+#undef __MMX__
+#undef __SSE__
+#undef __SSE2__
+#else
+#include <intrin.h>
+#ifndef _WIN64
+#ifndef __MMX__
+#define __MMX__
+#endif
+#ifndef __3dNOW__
+#define __3dNOW__
+#endif
+#endif
+#ifndef __SSE__
+#define __SSE__
+#endif
+#ifndef __SSE2__
+#define __SSE2__
+#endif
+#endif /* __clang__ */
+#elif defined(__MINGW64_VERSION_MAJOR)
+#include <intrin.h>
+#else
+/* altivec.h redefining bool causes a number of problems, see bugs 3993 and 4392, so you need to explicitly define SDL_ENABLE_ALTIVEC_H to have it included. */
+#if defined(HAVE_ALTIVEC_H) && defined(__ALTIVEC__) && !defined(__APPLE_ALTIVEC__) && defined(SDL_ENABLE_ALTIVEC_H)
+#include <altivec.h>
+#endif
+#if !defined(SDL_DISABLE_ARM_NEON_H)
+#  if defined(__ARM_NEON)
+#    include <arm_neon.h>
+#  elif defined(__WINDOWS__) || defined(__WINRT__)
+/* Visual Studio doesn't define __ARM_ARCH, but _M_ARM (if set, always 7), and _M_ARM64 (if set, always 1). */
+#    if defined(_M_ARM)
+#      include <armintr.h>
+#      include <arm_neon.h>
+#      define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */
+#    endif
+#    if defined (_M_ARM64)
+#      include <armintr.h>
+#      include <arm_neon.h>
+#      define __ARM_NEON 1 /* Set __ARM_NEON so that it can be used elsewhere, at compile time */
+#    endif
+#  endif
+#endif
+#if defined(__3dNOW__) && !defined(SDL_DISABLE_MM3DNOW_H)
+#include <mm3dnow.h>
+#endif
+#if defined(HAVE_IMMINTRIN_H) && !defined(SDL_DISABLE_IMMINTRIN_H)
+#include <immintrin.h>
+#else
+#if defined(__MMX__) && !defined(SDL_DISABLE_MMINTRIN_H)
+#include <mmintrin.h>
+#endif
+#if defined(__SSE__) && !defined(SDL_DISABLE_XMMINTRIN_H)
+#include <xmmintrin.h>
+#endif
+#if defined(__SSE2__) && !defined(SDL_DISABLE_EMMINTRIN_H)
+#include <emmintrin.h>
+#endif
+#if defined(__SSE3__) && !defined(SDL_DISABLE_PMMINTRIN_H)
+#include <pmmintrin.h>
+#endif
+#endif /* HAVE_IMMINTRIN_H */
+#endif /* compiler version */
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* This is a guess for the cacheline size used for padding.
+ * Most x86 processors have a 64 byte cache line.
+ * The 64-bit PowerPC processors have a 128 byte cache line.
+ * We'll use the larger value to be generally safe.
+ */
+#define SDL_CACHELINE_SIZE  128
+
+/**
+ *  This function returns the number of CPU cores available.
+ */
+extern DECLSPEC int SDLCALL SDL_GetCPUCount(void);
+
+/**
+ *  This function returns the L1 cache line size of the CPU
+ *
+ *  This is useful for determining multi-threaded structure padding
+ *  or SIMD prefetch sizes.
+ */
+extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void);
+
+/**
+ *  This function returns true if the CPU has the RDTSC instruction.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void);
+
+/**
+ *  This function returns true if the CPU has AltiVec features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void);
+
+/**
+ *  This function returns true if the CPU has MMX features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void);
+
+/**
+ *  This function returns true if the CPU has 3DNow! features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void);
+
+/**
+ *  This function returns true if the CPU has SSE features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void);
+
+/**
+ *  This function returns true if the CPU has SSE2 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void);
+
+/**
+ *  This function returns true if the CPU has SSE3 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void);
+
+/**
+ *  This function returns true if the CPU has SSE4.1 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void);
+
+/**
+ *  This function returns true if the CPU has SSE4.2 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void);
+
+/**
+ *  This function returns true if the CPU has AVX features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void);
+
+/**
+ *  This function returns true if the CPU has AVX2 features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void);
+
+/**
+ *  This function returns true if the CPU has AVX-512F (foundation) features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX512F(void);
+
+/**
+ *  This function returns true if the CPU has NEON (ARM SIMD) features.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void);
+
+/**
+ *  This function returns the amount of RAM configured in the system, in MB.
+ */
+extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);
+
+/**
+ * \brief Report the alignment this system needs for SIMD allocations.
+ *
+ * This will return the minimum number of bytes to which a pointer must be
+ *  aligned to be compatible with SIMD instructions on the current machine.
+ *  For example, if the machine supports SSE only, it will return 16, but if
+ *  it supports AVX-512F, it'll return 64 (etc). This only reports values for
+ *  instruction sets SDL knows about, so if your SDL build doesn't have
+ *  SDL_HasAVX512F(), then it might return 16 for the SSE support it sees and
+ *  not 64 for the AVX-512 instructions that exist but SDL doesn't know about.
+ *  Plan accordingly.
+ */
+extern DECLSPEC size_t SDLCALL SDL_SIMDGetAlignment(void);
+
+/**
+ * \brief Allocate memory in a SIMD-friendly way.
+ *
+ * This will allocate a block of memory that is suitable for use with SIMD
+ *  instructions. Specifically, it will be properly aligned and padded for
+ *  the system's supported vector instructions.
+ *
+ * The memory returned will be padded such that it is safe to read or write
+ *  an incomplete vector at the end of the memory block. This can be useful
+ *  so you don't have to drop back to a scalar fallback at the end of your
+ *  SIMD processing loop to deal with the final elements without overflowing
+ *  the allocated buffer.
+ *
+ * You must free this memory with SDL_FreeSIMD(), not free() or SDL_free()
+ *  or delete[], etc.
+ *
+ * Note that SDL will only deal with SIMD instruction sets it is aware of;
+ *  for example, SDL 2.0.8 knows that SSE wants 16-byte vectors
+ *  (SDL_HasSSE()), and AVX2 wants 32 bytes (SDL_HasAVX2()), but doesn't
+ *  know that AVX-512 wants 64. To be clear: if you can't decide to use an
+ *  instruction set with an SDL_Has*() function, don't use that instruction
+ *  set with memory allocated through here.
+ *
+ * SDL_AllocSIMD(0) will return a non-NULL pointer, assuming the system isn't
+ *  out of memory.
+ *
+ *  \param len The length, in bytes, of the block to allocated. The actual
+ *             allocated block might be larger due to padding, etc.
+ * \return Pointer to newly-allocated block, NULL if out of memory.
+ *
+ * \sa SDL_SIMDAlignment
+ * \sa SDL_SIMDFree
+ */
+extern DECLSPEC void * SDLCALL SDL_SIMDAlloc(const size_t len);
+
+/**
+ * \brief Deallocate memory obtained from SDL_SIMDAlloc
+ *
+ * It is not valid to use this function on a pointer from anything but
+ *  SDL_SIMDAlloc(). It can't be used on pointers from malloc, realloc,
+ *  SDL_malloc, memalign, new[], etc.
+ *
+ * However, SDL_SIMDFree(NULL) is a legal no-op.
+ *
+ * \sa SDL_SIMDAlloc
+ */
+extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr);
+
+/* vi: set ts=4 sw=4 expandtab: */
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_cpuinfo_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_egl.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_egl.h
new file mode 100644
index 0000000..f50fa5c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_egl.h
@@ -0,0 +1,1673 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_egl.h
+ *
+ *  This is a simple file to encapsulate the EGL API headers.
+ */
+#if !defined(_MSC_VER) && !defined(__ANDROID__)
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
+#else /* _MSC_VER */
+
+/* EGL headers for Visual Studio */
+
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+*
+* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
+*
+* Adopters may modify this file to suit their platform. Adopters are
+* encouraged to submit platform specific modifications to the Khronos
+* group so that they can be included in future versions of this file.
+* Please submit changes by sending them to the public Khronos Bugzilla
+* (http://khronos.org/bugzilla) by filing a bug against product
+* "Khronos (general)" component "Registry".
+*
+* A predefined template which fills in some of the bug fields can be
+* reached using http://tinyurl.com/khrplatform-h-bugreport, but you
+* must create a Bugzilla login first.
+*
+*
+* See the Implementer's Guidelines for information about where this file
+* should be located on your system and for more details of its use:
+*    http://www.khronos.org/registry/implementers_guide.pdf
+*
+* This file should be included as
+*        #include <KHR/khrplatform.h>
+* by Khronos client API header files that use its types and defines.
+*
+* The types in khrplatform.h should only be used to define API-specific types.
+*
+* Types defined in khrplatform.h:
+*    khronos_int8_t              signed   8  bit
+*    khronos_uint8_t             unsigned 8  bit
+*    khronos_int16_t             signed   16 bit
+*    khronos_uint16_t            unsigned 16 bit
+*    khronos_int32_t             signed   32 bit
+*    khronos_uint32_t            unsigned 32 bit
+*    khronos_int64_t             signed   64 bit
+*    khronos_uint64_t            unsigned 64 bit
+*    khronos_intptr_t            signed   same number of bits as a pointer
+*    khronos_uintptr_t           unsigned same number of bits as a pointer
+*    khronos_ssize_t             signed   size
+*    khronos_usize_t             unsigned size
+*    khronos_float_t             signed   32 bit floating point
+*    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+*    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+*                                         nanoseconds
+*    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+*    khronos_boolean_enum_t      enumerated boolean type. This should
+*      only be used as a base type when a client API's boolean type is
+*      an enum. Client APIs which use an integer or other type for
+*      booleans cannot use this as the base type for their boolean.
+*
+* Tokens defined in khrplatform.h:
+*
+*    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+*
+*    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+*    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+*
+* Calling convention macros defined in this file:
+*    KHRONOS_APICALL
+*    KHRONOS_APIENTRY
+*    KHRONOS_APIATTRIBUTES
+*
+* These may be used in function prototypes as:
+*
+*      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+*                                  int arg1,
+*                                  int arg2) KHRONOS_APIATTRIBUTES;
+*/
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APICALL
+*-------------------------------------------------------------------------
+* This precedes the return type of the function in the function prototype.
+*/
+#if defined(_WIN32) && !defined(__SCITECH_SNAP__) && !defined(SDL_VIDEO_STATIC_ANGLE)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APIENTRY
+*-------------------------------------------------------------------------
+* This follows the return type of the function  and precedes the function
+* name in the function prototype.
+*/
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+/* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+* Definition of KHRONOS_APIATTRIBUTES
+*-------------------------------------------------------------------------
+* This follows the closing parenthesis of the function prototype arguments.
+*/
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+* basic type definitions
+*-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+* Using <stdint.h>
+*/
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+* Using <inttypes.h>
+*/
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+* Win32
+*/
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+* Sun or Digital
+*/
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+* Hypothetical platform with no float or int64 support
+*/
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+* Generic fallback
+*/
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+* Types that are (so far) the same on all platforms
+*/
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+* Types that differ between LLP64 and LP64 architectures - in LLP64,
+* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+* to be the only LLP64 architecture in current use.
+*/
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+* Float type
+*/
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+*
+* These types can be used to represent a time interval in nanoseconds or
+* an absolute Unadjusted System Time.  Unadjusted System Time is the number
+* of nanoseconds since some arbitrary system event (e.g. since the last
+* time the system booted).  The Unadjusted System Time is an unsigned
+* 64 bit value that wraps back to 0 every 584 years.  Time intervals
+* may be either signed or unsigned.
+*/
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+* Dummy value used to pad enum types to 32 bits.
+*/
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+* Enumerated boolean type
+*
+* Values other than zero should be considered to be true.  Therefore
+* comparisons should not be made against KHRONOS_TRUE.
+*/
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */
+
+
+#ifndef __eglplatform_h_
+#define __eglplatform_h_
+
+/*
+** Copyright (c) 2007-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Platform-specific types and definitions for egl.h
+* $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
+*
+* Adopters may modify khrplatform.h and this file to suit their platform.
+* You are encouraged to submit all modifications to the Khronos group so that
+* they can be included in future versions of this file.  Please submit changes
+* by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
+* by filing a bug against product "EGL" component "Registry".
+*/
+
+/*#include <KHR/khrplatform.h>*/
+
+/* Macros used in EGL function prototype declarations.
+*
+* EGL functions should be prototyped as:
+*
+* EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
+* typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
+*
+* KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
+*/
+
+#ifndef EGLAPI
+#define EGLAPI KHRONOS_APICALL
+#endif
+
+#ifndef EGLAPIENTRY
+#define EGLAPIENTRY  KHRONOS_APIENTRY
+#endif
+#define EGLAPIENTRYP EGLAPIENTRY*
+
+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
+* are aliases of window-system-dependent types, such as X Display * or
+* Windows Device Context. They must be defined in platform-specific
+* code below. The EGL-prefixed versions of Native*Type are the same
+* types, renamed in EGL 1.3 so all types in the API start with "EGL".
+*
+* Khronos STRONGLY RECOMMENDS that you use the default definitions
+* provided below, since these changes affect both binary and source
+* portability of applications using EGL running on different EGL
+* implementations.
+*/
+
+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+
+#if __WINRT__
+#include <Unknwn.h>
+typedef IUnknown * EGLNativeWindowType;
+typedef IUnknown * EGLNativePixmapType;
+typedef IUnknown * EGLNativeDisplayType;
+#else
+typedef HDC     EGLNativeDisplayType;
+typedef HBITMAP EGLNativePixmapType;
+typedef HWND    EGLNativeWindowType;
+#endif
+
+#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
+
+typedef int   EGLNativeDisplayType;
+typedef void *EGLNativeWindowType;
+typedef void *EGLNativePixmapType;
+
+#elif defined(WL_EGL_PLATFORM)
+
+typedef struct wl_display     *EGLNativeDisplayType;
+typedef struct wl_egl_pixmap  *EGLNativePixmapType;
+typedef struct wl_egl_window  *EGLNativeWindowType;
+
+#elif defined(__GBM__)
+
+typedef struct gbm_device  *EGLNativeDisplayType;
+typedef struct gbm_bo      *EGLNativePixmapType;
+typedef void               *EGLNativeWindowType;
+
+#elif defined(__ANDROID__) /* Android */
+
+struct ANativeWindow;
+struct egl_native_pixmap_t;
+
+typedef struct ANativeWindow        *EGLNativeWindowType;
+typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
+typedef void                        *EGLNativeDisplayType;
+
+#elif defined(MIR_EGL_PLATFORM)
+
+#include <mir_toolkit/mir_client_library.h>
+typedef MirEGLNativeDisplayType EGLNativeDisplayType;
+typedef void                   *EGLNativePixmapType;
+typedef MirEGLNativeWindowType  EGLNativeWindowType;
+
+#elif defined(__unix__)
+
+#ifdef MESA_EGL_NO_X11_HEADERS
+
+typedef void            *EGLNativeDisplayType;
+typedef khronos_uintptr_t EGLNativePixmapType;
+typedef khronos_uintptr_t EGLNativeWindowType;
+
+#else
+
+/* X11 (tentative)  */
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+typedef Display *EGLNativeDisplayType;
+typedef Pixmap   EGLNativePixmapType;
+typedef Window   EGLNativeWindowType;
+
+#endif /* MESA_EGL_NO_X11_HEADERS */
+
+#else
+#error "Platform not recognized"
+#endif
+
+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
+typedef EGLNativeDisplayType NativeDisplayType;
+typedef EGLNativePixmapType  NativePixmapType;
+typedef EGLNativeWindowType  NativeWindowType;
+
+
+/* Define EGLint. This must be a signed integral type large enough to contain
+* all legal attribute names and values passed into and out of EGL, whether
+* their type is boolean, bitmask, enumerant (symbolic constant), integer,
+* handle, or other.  While in general a 32-bit integer will suffice, if
+* handles are 64 bit types, then EGLint should be defined as a signed 64-bit
+* integer type.
+*/
+typedef khronos_int32_t EGLint;
+
+#endif /* __eglplatform_h */
+
+#ifndef __egl_h_
+#define __egl_h_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2013-2015 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+/*
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
+** used to make the header, and the header can be found at
+**   http://www.opengl.org/registry/
+**
+** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $
+*/
+
+/*#include <EGL/eglplatform.h>*/
+
+/* Generated on date 20150623 */
+
+/* Generated C header for:
+ * API: egl
+ * Versions considered: .*
+ * Versions emitted: .*
+ * Default extensions included: None
+ * Additional extensions included: _nomatch_^
+ * Extensions removed: _nomatch_^
+ */
+
+#ifndef EGL_VERSION_1_0
+#define EGL_VERSION_1_0 1
+typedef unsigned int EGLBoolean;
+typedef void *EGLDisplay;
+typedef void *EGLConfig;
+typedef void *EGLSurface;
+typedef void *EGLContext;
+typedef void (*__eglMustCastToProperFunctionPointerType)(void);
+#define EGL_ALPHA_SIZE                    0x3021
+#define EGL_BAD_ACCESS                    0x3002
+#define EGL_BAD_ALLOC                     0x3003
+#define EGL_BAD_ATTRIBUTE                 0x3004
+#define EGL_BAD_CONFIG                    0x3005
+#define EGL_BAD_CONTEXT                   0x3006
+#define EGL_BAD_CURRENT_SURFACE           0x3007
+#define EGL_BAD_DISPLAY                   0x3008
+#define EGL_BAD_MATCH                     0x3009
+#define EGL_BAD_NATIVE_PIXMAP             0x300A
+#define EGL_BAD_NATIVE_WINDOW             0x300B
+#define EGL_BAD_PARAMETER                 0x300C
+#define EGL_BAD_SURFACE                   0x300D
+#define EGL_BLUE_SIZE                     0x3022
+#define EGL_BUFFER_SIZE                   0x3020
+#define EGL_CONFIG_CAVEAT                 0x3027
+#define EGL_CONFIG_ID                     0x3028
+#define EGL_CORE_NATIVE_ENGINE            0x305B
+#define EGL_DEPTH_SIZE                    0x3025
+#define EGL_DONT_CARE                     ((EGLint)-1)
+#define EGL_DRAW                          0x3059
+#define EGL_EXTENSIONS                    0x3055
+#define EGL_FALSE                         0
+#define EGL_GREEN_SIZE                    0x3023
+#define EGL_HEIGHT                        0x3056
+#define EGL_LARGEST_PBUFFER               0x3058
+#define EGL_LEVEL                         0x3029
+#define EGL_MAX_PBUFFER_HEIGHT            0x302A
+#define EGL_MAX_PBUFFER_PIXELS            0x302B
+#define EGL_MAX_PBUFFER_WIDTH             0x302C
+#define EGL_NATIVE_RENDERABLE             0x302D
+#define EGL_NATIVE_VISUAL_ID              0x302E
+#define EGL_NATIVE_VISUAL_TYPE            0x302F
+#define EGL_NONE                          0x3038
+#define EGL_NON_CONFORMANT_CONFIG         0x3051
+#define EGL_NOT_INITIALIZED               0x3001
+#define EGL_NO_CONTEXT                    ((EGLContext)0)
+#define EGL_NO_DISPLAY                    ((EGLDisplay)0)
+#define EGL_NO_SURFACE                    ((EGLSurface)0)
+#define EGL_PBUFFER_BIT                   0x0001
+#define EGL_PIXMAP_BIT                    0x0002
+#define EGL_READ                          0x305A
+#define EGL_RED_SIZE                      0x3024
+#define EGL_SAMPLES                       0x3031
+#define EGL_SAMPLE_BUFFERS                0x3032
+#define EGL_SLOW_CONFIG                   0x3050
+#define EGL_STENCIL_SIZE                  0x3026
+#define EGL_SUCCESS                       0x3000
+#define EGL_SURFACE_TYPE                  0x3033
+#define EGL_TRANSPARENT_BLUE_VALUE        0x3035
+#define EGL_TRANSPARENT_GREEN_VALUE       0x3036
+#define EGL_TRANSPARENT_RED_VALUE         0x3037
+#define EGL_TRANSPARENT_RGB               0x3052
+#define EGL_TRANSPARENT_TYPE              0x3034
+#define EGL_TRUE                          1
+#define EGL_VENDOR                        0x3053
+#define EGL_VERSION                       0x3054
+#define EGL_WIDTH                         0x3057
+#define EGL_WINDOW_BIT                    0x0004
+EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig (EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
+EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers (EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
+EGLAPI EGLContext EGLAPIENTRY eglCreateContext (EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface (EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface (EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list);
+EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface (EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext (EGLDisplay dpy, EGLContext ctx);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface (EGLDisplay dpy, EGLSurface surface);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib (EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs (EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
+EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay (void);
+EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface (EGLint readdraw);
+EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay (EGLNativeDisplayType display_id);
+EGLAPI EGLint EGLAPIENTRY eglGetError (void);
+EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress (const char *procname);
+EGLAPI EGLBoolean EGLAPIENTRY eglInitialize (EGLDisplay dpy, EGLint *major, EGLint *minor);
+EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent (EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext (EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
+EGLAPI const char *EGLAPIENTRY eglQueryString (EGLDisplay dpy, EGLint name);
+EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers (EGLDisplay dpy, EGLSurface surface);
+EGLAPI EGLBoolean EGLAPIENTRY eglTerminate (EGLDisplay dpy);
+EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL (void);
+EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative (EGLint engine);
+#endif /* EGL_VERSION_1_0 */
+
+#ifndef EGL_VERSION_1_1
+#define EGL_VERSION_1_1 1
+#define EGL_BACK_BUFFER                   0x3084
+#define EGL_BIND_TO_TEXTURE_RGB           0x3039
+#define EGL_BIND_TO_TEXTURE_RGBA          0x303A
+#define EGL_CONTEXT_LOST                  0x300E
+#define EGL_MIN_SWAP_INTERVAL             0x303B
+#define EGL_MAX_SWAP_INTERVAL             0x303C
+#define EGL_MIPMAP_TEXTURE                0x3082
+#define EGL_MIPMAP_LEVEL                  0x3083
+#define EGL_NO_TEXTURE                    0x305C
+#define EGL_TEXTURE_2D                    0x305F
+#define EGL_TEXTURE_FORMAT                0x3080
+#define EGL_TEXTURE_RGB                   0x305D
+#define EGL_TEXTURE_RGBA                  0x305E
+#define EGL_TEXTURE_TARGET                0x3081
+EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
+EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
+EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval (EGLDisplay dpy, EGLint interval);
+#endif /* EGL_VERSION_1_1 */
+
+#ifndef EGL_VERSION_1_2
+#define EGL_VERSION_1_2 1
+typedef unsigned int EGLenum;
+typedef void *EGLClientBuffer;
+#define EGL_ALPHA_FORMAT                  0x3088
+#define EGL_ALPHA_FORMAT_NONPRE           0x308B
+#define EGL_ALPHA_FORMAT_PRE              0x308C
+#define EGL_ALPHA_MASK_SIZE               0x303E
+#define EGL_BUFFER_PRESERVED              0x3094
+#define EGL_BUFFER_DESTROYED              0x3095
+#define EGL_CLIENT_APIS                   0x308D
+#define EGL_COLORSPACE                    0x3087
+#define EGL_COLORSPACE_sRGB               0x3089
+#define EGL_COLORSPACE_LINEAR             0x308A
+#define EGL_COLOR_BUFFER_TYPE             0x303F
+#define EGL_CONTEXT_CLIENT_TYPE           0x3097
+#define EGL_DISPLAY_SCALING               10000
+#define EGL_HORIZONTAL_RESOLUTION         0x3090
+#define EGL_LUMINANCE_BUFFER              0x308F
+#define EGL_LUMINANCE_SIZE                0x303D
+#define EGL_OPENGL_ES_BIT                 0x0001
+#define EGL_OPENVG_BIT                    0x0002
+#define EGL_OPENGL_ES_API                 0x30A0
+#define EGL_OPENVG_API                    0x30A1
+#define EGL_OPENVG_IMAGE                  0x3096
+#define EGL_PIXEL_ASPECT_RATIO            0x3092
+#define EGL_RENDERABLE_TYPE               0x3040
+#define EGL_RENDER_BUFFER                 0x3086
+#define EGL_RGB_BUFFER                    0x308E
+#define EGL_SINGLE_BUFFER                 0x3085
+#define EGL_SWAP_BEHAVIOR                 0x3093
+#define EGL_UNKNOWN                       ((EGLint)-1)
+#define EGL_VERTICAL_RESOLUTION           0x3091
+EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI (EGLenum api);
+EGLAPI EGLenum EGLAPIENTRY eglQueryAPI (void);
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer (EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread (void);
+EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient (void);
+#endif /* EGL_VERSION_1_2 */
+
+#ifndef EGL_VERSION_1_3
+#define EGL_VERSION_1_3 1
+#define EGL_CONFORMANT                    0x3042
+#define EGL_CONTEXT_CLIENT_VERSION        0x3098
+#define EGL_MATCH_NATIVE_PIXMAP           0x3041
+#define EGL_OPENGL_ES2_BIT                0x0004
+#define EGL_VG_ALPHA_FORMAT               0x3088
+#define EGL_VG_ALPHA_FORMAT_NONPRE        0x308B
+#define EGL_VG_ALPHA_FORMAT_PRE           0x308C
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT       0x0040
+#define EGL_VG_COLORSPACE                 0x3087
+#define EGL_VG_COLORSPACE_sRGB            0x3089
+#define EGL_VG_COLORSPACE_LINEAR          0x308A
+#define EGL_VG_COLORSPACE_LINEAR_BIT      0x0020
+#endif /* EGL_VERSION_1_3 */
+
+#ifndef EGL_VERSION_1_4
+#define EGL_VERSION_1_4 1
+#define EGL_DEFAULT_DISPLAY               ((EGLNativeDisplayType)0)
+#define EGL_MULTISAMPLE_RESOLVE_BOX_BIT   0x0200
+#define EGL_MULTISAMPLE_RESOLVE           0x3099
+#define EGL_MULTISAMPLE_RESOLVE_DEFAULT   0x309A
+#define EGL_MULTISAMPLE_RESOLVE_BOX       0x309B
+#define EGL_OPENGL_API                    0x30A2
+#define EGL_OPENGL_BIT                    0x0008
+#define EGL_SWAP_BEHAVIOR_PRESERVED_BIT   0x0400
+EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext (void);
+#endif /* EGL_VERSION_1_4 */
+
+#ifndef EGL_VERSION_1_5
+#define EGL_VERSION_1_5 1
+typedef void *EGLSync;
+typedef intptr_t EGLAttrib;
+typedef khronos_utime_nanoseconds_t EGLTime;
+typedef void *EGLImage;
+#define EGL_CONTEXT_MAJOR_VERSION         0x3098
+#define EGL_CONTEXT_MINOR_VERSION         0x30FB
+#define EGL_CONTEXT_OPENGL_PROFILE_MASK   0x30FD
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY 0x31BD
+#define EGL_NO_RESET_NOTIFICATION         0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET         0x31BF
+#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT 0x00000001
+#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define EGL_CONTEXT_OPENGL_DEBUG          0x31B0
+#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE 0x31B1
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS  0x31B2
+#define EGL_OPENGL_ES3_BIT                0x00000040
+#define EGL_CL_EVENT_HANDLE               0x309C
+#define EGL_SYNC_CL_EVENT                 0x30FE
+#define EGL_SYNC_CL_EVENT_COMPLETE        0x30FF
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE  0x30F0
+#define EGL_SYNC_TYPE                     0x30F7
+#define EGL_SYNC_STATUS                   0x30F1
+#define EGL_SYNC_CONDITION                0x30F8
+#define EGL_SIGNALED                      0x30F2
+#define EGL_UNSIGNALED                    0x30F3
+#define EGL_SYNC_FLUSH_COMMANDS_BIT       0x0001
+#define EGL_FOREVER                       0xFFFFFFFFFFFFFFFFull
+#define EGL_TIMEOUT_EXPIRED               0x30F5
+#define EGL_CONDITION_SATISFIED           0x30F6
+#define EGL_NO_SYNC                       ((EGLSync)0)
+#define EGL_SYNC_FENCE                    0x30F9
+#define EGL_GL_COLORSPACE                 0x309D
+#define EGL_GL_COLORSPACE_SRGB            0x3089
+#define EGL_GL_COLORSPACE_LINEAR          0x308A
+#define EGL_GL_RENDERBUFFER               0x30B9
+#define EGL_GL_TEXTURE_2D                 0x30B1
+#define EGL_GL_TEXTURE_LEVEL              0x30BC
+#define EGL_GL_TEXTURE_3D                 0x30B2
+#define EGL_GL_TEXTURE_ZOFFSET            0x30BD
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x30B3
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x30B4
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x30B5
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x30B6
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x30B7
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x30B8
+#define EGL_IMAGE_PRESERVED               0x30D2
+#define EGL_NO_IMAGE                      ((EGLImage)0)
+EGLAPI EGLSync EGLAPIENTRY eglCreateSync (EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySync (EGLDisplay dpy, EGLSync sync);
+EGLAPI EGLint EGLAPIENTRY eglClientWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttrib (EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value);
+EGLAPI EGLImage EGLAPIENTRY eglCreateImage (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImage (EGLDisplay dpy, EGLImage image);
+EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplay (EGLenum platform, void *native_display, const EGLAttrib *attrib_list);
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list);
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglWaitSync (EGLDisplay dpy, EGLSync sync, EGLint flags);
+#endif /* EGL_VERSION_1_5 */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __egl_h_ */
+
+
+
+#ifndef __eglext_h_
+#define __eglext_h_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2013-2015 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+/*
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
+** used to make the header, and the header can be found at
+**   http://www.opengl.org/registry/
+**
+** Khronos $Revision: 31566 $ on $Date: 2015-06-23 08:48:48 -0700 (Tue, 23 Jun 2015) $
+*/
+
+/*#include <EGL/eglplatform.h>*/
+
+#define EGL_EGLEXT_VERSION 20150623
+
+/* Generated C header for:
+ * API: egl
+ * Versions considered: .*
+ * Versions emitted: _nomatch_^
+ * Default extensions included: egl
+ * Additional extensions included: _nomatch_^
+ * Extensions removed: _nomatch_^
+ */
+
+#ifndef EGL_KHR_cl_event
+#define EGL_KHR_cl_event 1
+#define EGL_CL_EVENT_HANDLE_KHR           0x309C
+#define EGL_SYNC_CL_EVENT_KHR             0x30FE
+#define EGL_SYNC_CL_EVENT_COMPLETE_KHR    0x30FF
+#endif /* EGL_KHR_cl_event */
+
+#ifndef EGL_KHR_cl_event2
+#define EGL_KHR_cl_event2 1
+typedef void *EGLSyncKHR;
+typedef intptr_t EGLAttribKHR;
+typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNC64KHRPROC) (EGLDisplay dpy, EGLenum type, const EGLAttribKHR *attrib_list);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSync64KHR (EGLDisplay dpy, EGLenum type, const EGLAttribKHR *attrib_list);
+#endif
+#endif /* EGL_KHR_cl_event2 */
+
+#ifndef EGL_KHR_client_get_all_proc_addresses
+#define EGL_KHR_client_get_all_proc_addresses 1
+#endif /* EGL_KHR_client_get_all_proc_addresses */
+
+#ifndef EGL_KHR_config_attribs
+#define EGL_KHR_config_attribs 1
+#define EGL_CONFORMANT_KHR                0x3042
+#define EGL_VG_COLORSPACE_LINEAR_BIT_KHR  0x0020
+#define EGL_VG_ALPHA_FORMAT_PRE_BIT_KHR   0x0040
+#endif /* EGL_KHR_config_attribs */
+
+#ifndef EGL_KHR_create_context
+#define EGL_KHR_create_context 1
+#define EGL_CONTEXT_MAJOR_VERSION_KHR     0x3098
+#define EGL_CONTEXT_MINOR_VERSION_KHR     0x30FB
+#define EGL_CONTEXT_FLAGS_KHR             0x30FC
+#define EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR 0x30FD
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR 0x31BD
+#define EGL_NO_RESET_NOTIFICATION_KHR     0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET_KHR     0x31BF
+#define EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR  0x00000001
+#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR 0x00000002
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR 0x00000004
+#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR 0x00000001
+#define EGL_CONTEXT_OPENGL_COMPATIBILITY_PROFILE_BIT_KHR 0x00000002
+#define EGL_OPENGL_ES3_BIT_KHR            0x00000040
+#endif /* EGL_KHR_create_context */
+
+#ifndef EGL_KHR_create_context_no_error
+#define EGL_KHR_create_context_no_error 1
+#define EGL_CONTEXT_OPENGL_NO_ERROR_KHR   0x31B3
+#endif /* EGL_KHR_create_context_no_error */
+
+#ifndef EGL_KHR_fence_sync
+#define EGL_KHR_fence_sync 1
+typedef khronos_utime_nanoseconds_t EGLTimeKHR;
+#ifdef KHRONOS_SUPPORT_INT64
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_KHR 0x30F0
+#define EGL_SYNC_CONDITION_KHR            0x30F8
+#define EGL_SYNC_FENCE_KHR                0x30F9
+typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESYNCKHRPROC) (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync);
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateSyncKHR (EGLDisplay dpy, EGLenum type, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncKHR (EGLDisplay dpy, EGLSyncKHR sync);
+EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags, EGLTimeKHR timeout);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLint attribute, EGLint *value);
+#endif
+#endif /* KHRONOS_SUPPORT_INT64 */
+#endif /* EGL_KHR_fence_sync */
+
+#ifndef EGL_KHR_get_all_proc_addresses
+#define EGL_KHR_get_all_proc_addresses 1
+#endif /* EGL_KHR_get_all_proc_addresses */
+
+#ifndef EGL_KHR_gl_colorspace
+#define EGL_KHR_gl_colorspace 1
+#define EGL_GL_COLORSPACE_KHR             0x309D
+#define EGL_GL_COLORSPACE_SRGB_KHR        0x3089
+#define EGL_GL_COLORSPACE_LINEAR_KHR      0x308A
+#endif /* EGL_KHR_gl_colorspace */
+
+#ifndef EGL_KHR_gl_renderbuffer_image
+#define EGL_KHR_gl_renderbuffer_image 1
+#define EGL_GL_RENDERBUFFER_KHR           0x30B9
+#endif /* EGL_KHR_gl_renderbuffer_image */
+
+#ifndef EGL_KHR_gl_texture_2D_image
+#define EGL_KHR_gl_texture_2D_image 1
+#define EGL_GL_TEXTURE_2D_KHR             0x30B1
+#define EGL_GL_TEXTURE_LEVEL_KHR          0x30BC
+#endif /* EGL_KHR_gl_texture_2D_image */
+
+#ifndef EGL_KHR_gl_texture_3D_image
+#define EGL_KHR_gl_texture_3D_image 1
+#define EGL_GL_TEXTURE_3D_KHR             0x30B2
+#define EGL_GL_TEXTURE_ZOFFSET_KHR        0x30BD
+#endif /* EGL_KHR_gl_texture_3D_image */
+
+#ifndef EGL_KHR_gl_texture_cubemap_image
+#define EGL_KHR_gl_texture_cubemap_image 1
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR 0x30B3
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_X_KHR 0x30B4
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Y_KHR 0x30B5
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_KHR 0x30B6
+#define EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_Z_KHR 0x30B7
+#define EGL_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_KHR 0x30B8
+#endif /* EGL_KHR_gl_texture_cubemap_image */
+
+#ifndef EGL_KHR_image
+#define EGL_KHR_image 1
+typedef void *EGLImageKHR;
+#define EGL_NATIVE_PIXMAP_KHR             0x30B0
+#define EGL_NO_IMAGE_KHR                  ((EGLImageKHR)0)
+typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEIMAGEKHRPROC) (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYIMAGEKHRPROC) (EGLDisplay dpy, EGLImageKHR image);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR (EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR (EGLDisplay dpy, EGLImageKHR image);
+#endif
+#endif /* EGL_KHR_image */
+
+#ifndef EGL_KHR_image_base
+#define EGL_KHR_image_base 1
+#define EGL_IMAGE_PRESERVED_KHR           0x30D2
+#endif /* EGL_KHR_image_base */
+
+#ifndef EGL_KHR_image_pixmap
+#define EGL_KHR_image_pixmap 1
+#endif /* EGL_KHR_image_pixmap */
+
+#ifndef EGL_KHR_lock_surface
+#define EGL_KHR_lock_surface 1
+#define EGL_READ_SURFACE_BIT_KHR          0x0001
+#define EGL_WRITE_SURFACE_BIT_KHR         0x0002
+#define EGL_LOCK_SURFACE_BIT_KHR          0x0080
+#define EGL_OPTIMAL_FORMAT_BIT_KHR        0x0100
+#define EGL_MATCH_FORMAT_KHR              0x3043
+#define EGL_FORMAT_RGB_565_EXACT_KHR      0x30C0
+#define EGL_FORMAT_RGB_565_KHR            0x30C1
+#define EGL_FORMAT_RGBA_8888_EXACT_KHR    0x30C2
+#define EGL_FORMAT_RGBA_8888_KHR          0x30C3
+#define EGL_MAP_PRESERVE_PIXELS_KHR       0x30C4
+#define EGL_LOCK_USAGE_HINT_KHR           0x30C5
+#define EGL_BITMAP_POINTER_KHR            0x30C6
+#define EGL_BITMAP_PITCH_KHR              0x30C7
+#define EGL_BITMAP_ORIGIN_KHR             0x30C8
+#define EGL_BITMAP_PIXEL_RED_OFFSET_KHR   0x30C9
+#define EGL_BITMAP_PIXEL_GREEN_OFFSET_KHR 0x30CA
+#define EGL_BITMAP_PIXEL_BLUE_OFFSET_KHR  0x30CB
+#define EGL_BITMAP_PIXEL_ALPHA_OFFSET_KHR 0x30CC
+#define EGL_BITMAP_PIXEL_LUMINANCE_OFFSET_KHR 0x30CD
+#define EGL_LOWER_LEFT_KHR                0x30CE
+#define EGL_UPPER_LEFT_KHR                0x30CF
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLLOCKSURFACEKHRPROC) (EGLDisplay dpy, EGLSurface surface, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLUNLOCKSURFACEKHRPROC) (EGLDisplay dpy, EGLSurface surface);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglLockSurfaceKHR (EGLDisplay dpy, EGLSurface surface, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglUnlockSurfaceKHR (EGLDisplay dpy, EGLSurface surface);
+#endif
+#endif /* EGL_KHR_lock_surface */
+
+#ifndef EGL_KHR_lock_surface2
+#define EGL_KHR_lock_surface2 1
+#define EGL_BITMAP_PIXEL_SIZE_KHR         0x3110
+#endif /* EGL_KHR_lock_surface2 */
+
+#ifndef EGL_KHR_lock_surface3
+#define EGL_KHR_lock_surface3 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACE64KHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLAttribKHR *value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface64KHR (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLAttribKHR *value);
+#endif
+#endif /* EGL_KHR_lock_surface3 */
+
+#ifndef EGL_KHR_partial_update
+#define EGL_KHR_partial_update 1
+#define EGL_BUFFER_AGE_KHR                0x313D
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSETDAMAGEREGIONKHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSetDamageRegionKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#endif
+#endif /* EGL_KHR_partial_update */
+
+#ifndef EGL_KHR_platform_android
+#define EGL_KHR_platform_android 1
+#define EGL_PLATFORM_ANDROID_KHR          0x3141
+#endif /* EGL_KHR_platform_android */
+
+#ifndef EGL_KHR_platform_gbm
+#define EGL_KHR_platform_gbm 1
+#define EGL_PLATFORM_GBM_KHR              0x31D7
+#endif /* EGL_KHR_platform_gbm */
+
+#ifndef EGL_KHR_platform_wayland
+#define EGL_KHR_platform_wayland 1
+#define EGL_PLATFORM_WAYLAND_KHR          0x31D8
+#endif /* EGL_KHR_platform_wayland */
+
+#ifndef EGL_KHR_platform_x11
+#define EGL_KHR_platform_x11 1
+#define EGL_PLATFORM_X11_KHR              0x31D5
+#define EGL_PLATFORM_X11_SCREEN_KHR       0x31D6
+#endif /* EGL_KHR_platform_x11 */
+
+#ifndef EGL_KHR_reusable_sync
+#define EGL_KHR_reusable_sync 1
+#ifdef KHRONOS_SUPPORT_INT64
+#define EGL_SYNC_STATUS_KHR               0x30F1
+#define EGL_SIGNALED_KHR                  0x30F2
+#define EGL_UNSIGNALED_KHR                0x30F3
+#define EGL_TIMEOUT_EXPIRED_KHR           0x30F5
+#define EGL_CONDITION_SATISFIED_KHR       0x30F6
+#define EGL_SYNC_TYPE_KHR                 0x30F7
+#define EGL_SYNC_REUSABLE_KHR             0x30FA
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_KHR   0x0001
+#define EGL_FOREVER_KHR                   0xFFFFFFFFFFFFFFFFull
+#define EGL_NO_SYNC_KHR                   ((EGLSyncKHR)0)
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
+#endif
+#endif /* KHRONOS_SUPPORT_INT64 */
+#endif /* EGL_KHR_reusable_sync */
+
+#ifndef EGL_KHR_stream
+#define EGL_KHR_stream 1
+typedef void *EGLStreamKHR;
+typedef khronos_uint64_t EGLuint64KHR;
+#ifdef KHRONOS_SUPPORT_INT64
+#define EGL_NO_STREAM_KHR                 ((EGLStreamKHR)0)
+#define EGL_CONSUMER_LATENCY_USEC_KHR     0x3210
+#define EGL_PRODUCER_FRAME_KHR            0x3212
+#define EGL_CONSUMER_FRAME_KHR            0x3213
+#define EGL_STREAM_STATE_KHR              0x3214
+#define EGL_STREAM_STATE_CREATED_KHR      0x3215
+#define EGL_STREAM_STATE_CONNECTING_KHR   0x3216
+#define EGL_STREAM_STATE_EMPTY_KHR        0x3217
+#define EGL_STREAM_STATE_NEW_FRAME_AVAILABLE_KHR 0x3218
+#define EGL_STREAM_STATE_OLD_FRAME_AVAILABLE_KHR 0x3219
+#define EGL_STREAM_STATE_DISCONNECTED_KHR 0x321A
+#define EGL_BAD_STREAM_KHR                0x321B
+#define EGL_BAD_STATE_KHR                 0x321C
+typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMKHRPROC) (EGLDisplay dpy, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSTREAMKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMATTRIBKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint *value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMU64KHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLuint64KHR *value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamKHR (EGLDisplay dpy, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroyStreamKHR (EGLDisplay dpy, EGLStreamKHR stream);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamAttribKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLint *value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamu64KHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLuint64KHR *value);
+#endif
+#endif /* KHRONOS_SUPPORT_INT64 */
+#endif /* EGL_KHR_stream */
+
+#ifndef EGL_KHR_stream_consumer_gltexture
+#define EGL_KHR_stream_consumer_gltexture 1
+#ifdef EGL_KHR_stream
+#define EGL_CONSUMER_ACQUIRE_TIMEOUT_USEC_KHR 0x321E
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERGLTEXTUREEXTERNALKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERACQUIREKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMERRELEASEKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerGLTextureExternalKHR (EGLDisplay dpy, EGLStreamKHR stream);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerAcquireKHR (EGLDisplay dpy, EGLStreamKHR stream);
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerReleaseKHR (EGLDisplay dpy, EGLStreamKHR stream);
+#endif
+#endif /* EGL_KHR_stream */
+#endif /* EGL_KHR_stream_consumer_gltexture */
+
+#ifndef EGL_KHR_stream_cross_process_fd
+#define EGL_KHR_stream_cross_process_fd 1
+typedef int EGLNativeFileDescriptorKHR;
+#ifdef EGL_KHR_stream
+#define EGL_NO_FILE_DESCRIPTOR_KHR        ((EGLNativeFileDescriptorKHR)(-1))
+typedef EGLNativeFileDescriptorKHR (EGLAPIENTRYP PFNEGLGETSTREAMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream);
+typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC) (EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLNativeFileDescriptorKHR EGLAPIENTRY eglGetStreamFileDescriptorKHR (EGLDisplay dpy, EGLStreamKHR stream);
+EGLAPI EGLStreamKHR EGLAPIENTRY eglCreateStreamFromFileDescriptorKHR (EGLDisplay dpy, EGLNativeFileDescriptorKHR file_descriptor);
+#endif
+#endif /* EGL_KHR_stream */
+#endif /* EGL_KHR_stream_cross_process_fd */
+
+#ifndef EGL_KHR_stream_fifo
+#define EGL_KHR_stream_fifo 1
+#ifdef EGL_KHR_stream
+#define EGL_STREAM_FIFO_LENGTH_KHR        0x31FC
+#define EGL_STREAM_TIME_NOW_KHR           0x31FD
+#define EGL_STREAM_TIME_CONSUMER_KHR      0x31FE
+#define EGL_STREAM_TIME_PRODUCER_KHR      0x31FF
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMTIMEKHRPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLTimeKHR *value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryStreamTimeKHR (EGLDisplay dpy, EGLStreamKHR stream, EGLenum attribute, EGLTimeKHR *value);
+#endif
+#endif /* EGL_KHR_stream */
+#endif /* EGL_KHR_stream_fifo */
+
+#ifndef EGL_KHR_stream_producer_aldatalocator
+#define EGL_KHR_stream_producer_aldatalocator 1
+#ifdef EGL_KHR_stream
+#endif /* EGL_KHR_stream */
+#endif /* EGL_KHR_stream_producer_aldatalocator */
+
+#ifndef EGL_KHR_stream_producer_eglsurface
+#define EGL_KHR_stream_producer_eglsurface 1
+#ifdef EGL_KHR_stream
+#define EGL_STREAM_BIT_KHR                0x0800
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATESTREAMPRODUCERSURFACEKHRPROC) (EGLDisplay dpy, EGLConfig config, EGLStreamKHR stream, const EGLint *attrib_list);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSurface EGLAPIENTRY eglCreateStreamProducerSurfaceKHR (EGLDisplay dpy, EGLConfig config, EGLStreamKHR stream, const EGLint *attrib_list);
+#endif
+#endif /* EGL_KHR_stream */
+#endif /* EGL_KHR_stream_producer_eglsurface */
+
+#ifndef EGL_KHR_surfaceless_context
+#define EGL_KHR_surfaceless_context 1
+#endif /* EGL_KHR_surfaceless_context */
+
+#ifndef EGL_KHR_swap_buffers_with_damage
+#define EGL_KHR_swap_buffers_with_damage 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#endif
+#endif /* EGL_KHR_swap_buffers_with_damage */
+
+#ifndef EGL_KHR_vg_parent_image
+#define EGL_KHR_vg_parent_image 1
+#define EGL_VG_PARENT_IMAGE_KHR           0x30BA
+#endif /* EGL_KHR_vg_parent_image */
+
+#ifndef EGL_KHR_wait_sync
+#define EGL_KHR_wait_sync 1
+typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCKHRPROC) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags);
+#endif
+#endif /* EGL_KHR_wait_sync */
+
+#ifndef EGL_ANDROID_blob_cache
+#define EGL_ANDROID_blob_cache 1
+typedef khronos_ssize_t EGLsizeiANDROID;
+typedef void (*EGLSetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, const void *value, EGLsizeiANDROID valueSize);
+typedef EGLsizeiANDROID (*EGLGetBlobFuncANDROID) (const void *key, EGLsizeiANDROID keySize, void *value, EGLsizeiANDROID valueSize);
+typedef void (EGLAPIENTRYP PFNEGLSETBLOBCACHEFUNCSANDROIDPROC) (EGLDisplay dpy, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI void EGLAPIENTRY eglSetBlobCacheFuncsANDROID (EGLDisplay dpy, EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
+#endif
+#endif /* EGL_ANDROID_blob_cache */
+
+#ifndef EGL_ANDROID_framebuffer_target
+#define EGL_ANDROID_framebuffer_target 1
+#define EGL_FRAMEBUFFER_TARGET_ANDROID    0x3147
+#endif /* EGL_ANDROID_framebuffer_target */
+
+#ifndef EGL_ANDROID_image_native_buffer
+#define EGL_ANDROID_image_native_buffer 1
+#define EGL_NATIVE_BUFFER_ANDROID         0x3140
+#endif /* EGL_ANDROID_image_native_buffer */
+
+#ifndef EGL_ANDROID_native_fence_sync
+#define EGL_ANDROID_native_fence_sync 1
+#define EGL_SYNC_NATIVE_FENCE_ANDROID     0x3144
+#define EGL_SYNC_NATIVE_FENCE_FD_ANDROID  0x3145
+#define EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID 0x3146
+#define EGL_NO_NATIVE_FENCE_FD_ANDROID    -1
+typedef EGLint (EGLAPIENTRYP PFNEGLDUPNATIVEFENCEFDANDROIDPROC) (EGLDisplay dpy, EGLSyncKHR sync);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLint EGLAPIENTRY eglDupNativeFenceFDANDROID (EGLDisplay dpy, EGLSyncKHR sync);
+#endif
+#endif /* EGL_ANDROID_native_fence_sync */
+
+#ifndef EGL_ANDROID_recordable
+#define EGL_ANDROID_recordable 1
+#define EGL_RECORDABLE_ANDROID            0x3142
+#endif /* EGL_ANDROID_recordable */
+
+#ifndef EGL_ANGLE_d3d_share_handle_client_buffer
+#define EGL_ANGLE_d3d_share_handle_client_buffer 1
+#define EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE 0x3200
+#endif /* EGL_ANGLE_d3d_share_handle_client_buffer */
+
+#ifndef EGL_ANGLE_device_d3d
+#define EGL_ANGLE_device_d3d 1
+#define EGL_D3D9_DEVICE_ANGLE             0x33A0
+#define EGL_D3D11_DEVICE_ANGLE            0x33A1
+#endif /* EGL_ANGLE_device_d3d */
+
+#ifndef EGL_ANGLE_query_surface_pointer
+#define EGL_ANGLE_query_surface_pointer 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSURFACEPOINTERANGLEPROC) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE (EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value);
+#endif
+#endif /* EGL_ANGLE_query_surface_pointer */
+
+#ifndef EGL_ANGLE_surface_d3d_texture_2d_share_handle
+#define EGL_ANGLE_surface_d3d_texture_2d_share_handle 1
+#endif /* EGL_ANGLE_surface_d3d_texture_2d_share_handle */
+
+#ifndef EGL_ANGLE_window_fixed_size
+#define EGL_ANGLE_window_fixed_size 1
+#define EGL_FIXED_SIZE_ANGLE              0x3201
+#endif /* EGL_ANGLE_window_fixed_size */
+
+#ifndef EGL_ARM_pixmap_multisample_discard
+#define EGL_ARM_pixmap_multisample_discard 1
+#define EGL_DISCARD_SAMPLES_ARM           0x3286
+#endif /* EGL_ARM_pixmap_multisample_discard */
+
+#ifndef EGL_EXT_buffer_age
+#define EGL_EXT_buffer_age 1
+#define EGL_BUFFER_AGE_EXT                0x313D
+#endif /* EGL_EXT_buffer_age */
+
+#ifndef EGL_EXT_client_extensions
+#define EGL_EXT_client_extensions 1
+#endif /* EGL_EXT_client_extensions */
+
+#ifndef EGL_EXT_create_context_robustness
+#define EGL_EXT_create_context_robustness 1
+#define EGL_CONTEXT_OPENGL_ROBUST_ACCESS_EXT 0x30BF
+#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT 0x3138
+#define EGL_NO_RESET_NOTIFICATION_EXT     0x31BE
+#define EGL_LOSE_CONTEXT_ON_RESET_EXT     0x31BF
+#endif /* EGL_EXT_create_context_robustness */
+
+#ifndef EGL_EXT_device_base
+#define EGL_EXT_device_base 1
+typedef void *EGLDeviceEXT;
+#define EGL_NO_DEVICE_EXT                 ((EGLDeviceEXT)(0))
+#define EGL_BAD_DEVICE_EXT                0x322B
+#define EGL_DEVICE_EXT                    0x322C
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICEATTRIBEXTPROC) (EGLDeviceEXT device, EGLint attribute, EGLAttrib *value);
+typedef const char *(EGLAPIENTRYP PFNEGLQUERYDEVICESTRINGEXTPROC) (EGLDeviceEXT device, EGLint name);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDEVICESEXTPROC) (EGLint max_devices, EGLDeviceEXT *devices, EGLint *num_devices);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDISPLAYATTRIBEXTPROC) (EGLDisplay dpy, EGLint attribute, EGLAttrib *value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDeviceAttribEXT (EGLDeviceEXT device, EGLint attribute, EGLAttrib *value);
+EGLAPI const char *EGLAPIENTRY eglQueryDeviceStringEXT (EGLDeviceEXT device, EGLint name);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDevicesEXT (EGLint max_devices, EGLDeviceEXT *devices, EGLint *num_devices);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT (EGLDisplay dpy, EGLint attribute, EGLAttrib *value);
+#endif
+#endif /* EGL_EXT_device_base */
+
+#ifndef EGL_EXT_device_drm
+#define EGL_EXT_device_drm 1
+#define EGL_DRM_DEVICE_FILE_EXT           0x3233
+#endif /* EGL_EXT_device_drm */
+
+#ifndef EGL_EXT_device_enumeration
+#define EGL_EXT_device_enumeration 1
+#endif /* EGL_EXT_device_enumeration */
+
+#ifndef EGL_EXT_device_openwf
+#define EGL_EXT_device_openwf 1
+#define EGL_OPENWF_DEVICE_ID_EXT          0x3237
+#endif /* EGL_EXT_device_openwf */
+
+#ifndef EGL_EXT_device_query
+#define EGL_EXT_device_query 1
+#endif /* EGL_EXT_device_query */
+
+#ifndef EGL_EXT_image_dma_buf_import
+#define EGL_EXT_image_dma_buf_import 1
+#define EGL_LINUX_DMA_BUF_EXT             0x3270
+#define EGL_LINUX_DRM_FOURCC_EXT          0x3271
+#define EGL_DMA_BUF_PLANE0_FD_EXT         0x3272
+#define EGL_DMA_BUF_PLANE0_OFFSET_EXT     0x3273
+#define EGL_DMA_BUF_PLANE0_PITCH_EXT      0x3274
+#define EGL_DMA_BUF_PLANE1_FD_EXT         0x3275
+#define EGL_DMA_BUF_PLANE1_OFFSET_EXT     0x3276
+#define EGL_DMA_BUF_PLANE1_PITCH_EXT      0x3277
+#define EGL_DMA_BUF_PLANE2_FD_EXT         0x3278
+#define EGL_DMA_BUF_PLANE2_OFFSET_EXT     0x3279
+#define EGL_DMA_BUF_PLANE2_PITCH_EXT      0x327A
+#define EGL_YUV_COLOR_SPACE_HINT_EXT      0x327B
+#define EGL_SAMPLE_RANGE_HINT_EXT         0x327C
+#define EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT 0x327D
+#define EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT 0x327E
+#define EGL_ITU_REC601_EXT                0x327F
+#define EGL_ITU_REC709_EXT                0x3280
+#define EGL_ITU_REC2020_EXT               0x3281
+#define EGL_YUV_FULL_RANGE_EXT            0x3282
+#define EGL_YUV_NARROW_RANGE_EXT          0x3283
+#define EGL_YUV_CHROMA_SITING_0_EXT       0x3284
+#define EGL_YUV_CHROMA_SITING_0_5_EXT     0x3285
+#endif /* EGL_EXT_image_dma_buf_import */
+
+#ifndef EGL_EXT_multiview_window
+#define EGL_EXT_multiview_window 1
+#define EGL_MULTIVIEW_VIEW_COUNT_EXT      0x3134
+#endif /* EGL_EXT_multiview_window */
+
+#ifndef EGL_EXT_output_base
+#define EGL_EXT_output_base 1
+typedef void *EGLOutputLayerEXT;
+typedef void *EGLOutputPortEXT;
+#define EGL_NO_OUTPUT_LAYER_EXT           ((EGLOutputLayerEXT)0)
+#define EGL_NO_OUTPUT_PORT_EXT            ((EGLOutputPortEXT)0)
+#define EGL_BAD_OUTPUT_LAYER_EXT          0x322D
+#define EGL_BAD_OUTPUT_PORT_EXT           0x322E
+#define EGL_SWAP_INTERVAL_EXT             0x322F
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETOUTPUTLAYERSEXTPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputLayerEXT *layers, EGLint max_layers, EGLint *num_layers);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETOUTPUTPORTSEXTPROC) (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputPortEXT *ports, EGLint max_ports, EGLint *num_ports);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLOUTPUTLAYERATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYOUTPUTLAYERATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib *value);
+typedef const char *(EGLAPIENTRYP PFNEGLQUERYOUTPUTLAYERSTRINGEXTPROC) (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint name);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLOUTPUTPORTATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib value);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYOUTPUTPORTATTRIBEXTPROC) (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib *value);
+typedef const char *(EGLAPIENTRYP PFNEGLQUERYOUTPUTPORTSTRINGEXTPROC) (EGLDisplay dpy, EGLOutputPortEXT port, EGLint name);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglGetOutputLayersEXT (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputLayerEXT *layers, EGLint max_layers, EGLint *num_layers);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetOutputPortsEXT (EGLDisplay dpy, const EGLAttrib *attrib_list, EGLOutputPortEXT *ports, EGLint max_ports, EGLint *num_ports);
+EGLAPI EGLBoolean EGLAPIENTRY eglOutputLayerAttribEXT (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryOutputLayerAttribEXT (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint attribute, EGLAttrib *value);
+EGLAPI const char *EGLAPIENTRY eglQueryOutputLayerStringEXT (EGLDisplay dpy, EGLOutputLayerEXT layer, EGLint name);
+EGLAPI EGLBoolean EGLAPIENTRY eglOutputPortAttribEXT (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib value);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryOutputPortAttribEXT (EGLDisplay dpy, EGLOutputPortEXT port, EGLint attribute, EGLAttrib *value);
+EGLAPI const char *EGLAPIENTRY eglQueryOutputPortStringEXT (EGLDisplay dpy, EGLOutputPortEXT port, EGLint name);
+#endif
+#endif /* EGL_EXT_output_base */
+
+#ifndef EGL_EXT_output_drm
+#define EGL_EXT_output_drm 1
+#define EGL_DRM_CRTC_EXT                  0x3234
+#define EGL_DRM_PLANE_EXT                 0x3235
+#define EGL_DRM_CONNECTOR_EXT             0x3236
+#endif /* EGL_EXT_output_drm */
+
+#ifndef EGL_EXT_output_openwf
+#define EGL_EXT_output_openwf 1
+#define EGL_OPENWF_PIPELINE_ID_EXT        0x3238
+#define EGL_OPENWF_PORT_ID_EXT            0x3239
+#endif /* EGL_EXT_output_openwf */
+
+#ifndef EGL_EXT_platform_base
+#define EGL_EXT_platform_base 1
+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT (EGLenum platform, void *native_display, const EGLint *attrib_list);
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurfaceEXT (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list);
+#endif
+#endif /* EGL_EXT_platform_base */
+
+#ifndef EGL_EXT_platform_device
+#define EGL_EXT_platform_device 1
+#define EGL_PLATFORM_DEVICE_EXT           0x313F
+#endif /* EGL_EXT_platform_device */
+
+#ifndef EGL_EXT_platform_wayland
+#define EGL_EXT_platform_wayland 1
+#define EGL_PLATFORM_WAYLAND_EXT          0x31D8
+#endif /* EGL_EXT_platform_wayland */
+
+#ifndef EGL_EXT_platform_x11
+#define EGL_EXT_platform_x11 1
+#define EGL_PLATFORM_X11_EXT              0x31D5
+#define EGL_PLATFORM_X11_SCREEN_EXT       0x31D6
+#endif /* EGL_EXT_platform_x11 */
+
+#ifndef EGL_EXT_protected_surface
+#define EGL_EXT_protected_surface 1
+#define EGL_PROTECTED_CONTENT_EXT         0x32C0
+#endif /* EGL_EXT_protected_surface */
+
+#ifndef EGL_EXT_stream_consumer_egloutput
+#define EGL_EXT_stream_consumer_egloutput 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSTREAMCONSUMEROUTPUTEXTPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLOutputLayerEXT layer);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglStreamConsumerOutputEXT (EGLDisplay dpy, EGLStreamKHR stream, EGLOutputLayerEXT layer);
+#endif
+#endif /* EGL_EXT_stream_consumer_egloutput */
+
+#ifndef EGL_EXT_swap_buffers_with_damage
+#define EGL_EXT_swap_buffers_with_damage 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEEXTPROC) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageEXT (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
+#endif
+#endif /* EGL_EXT_swap_buffers_with_damage */
+
+#ifndef EGL_EXT_yuv_surface
+#define EGL_EXT_yuv_surface 1
+#define EGL_YUV_ORDER_EXT                 0x3301
+#define EGL_YUV_NUMBER_OF_PLANES_EXT      0x3311
+#define EGL_YUV_SUBSAMPLE_EXT             0x3312
+#define EGL_YUV_DEPTH_RANGE_EXT           0x3317
+#define EGL_YUV_CSC_STANDARD_EXT          0x330A
+#define EGL_YUV_PLANE_BPP_EXT             0x331A
+#define EGL_YUV_BUFFER_EXT                0x3300
+#define EGL_YUV_ORDER_YUV_EXT             0x3302
+#define EGL_YUV_ORDER_YVU_EXT             0x3303
+#define EGL_YUV_ORDER_YUYV_EXT            0x3304
+#define EGL_YUV_ORDER_UYVY_EXT            0x3305
+#define EGL_YUV_ORDER_YVYU_EXT            0x3306
+#define EGL_YUV_ORDER_VYUY_EXT            0x3307
+#define EGL_YUV_ORDER_AYUV_EXT            0x3308
+#define EGL_YUV_SUBSAMPLE_4_2_0_EXT       0x3313
+#define EGL_YUV_SUBSAMPLE_4_2_2_EXT       0x3314
+#define EGL_YUV_SUBSAMPLE_4_4_4_EXT       0x3315
+#define EGL_YUV_DEPTH_RANGE_LIMITED_EXT   0x3318
+#define EGL_YUV_DEPTH_RANGE_FULL_EXT      0x3319
+#define EGL_YUV_CSC_STANDARD_601_EXT      0x330B
+#define EGL_YUV_CSC_STANDARD_709_EXT      0x330C
+#define EGL_YUV_CSC_STANDARD_2020_EXT     0x330D
+#define EGL_YUV_PLANE_BPP_0_EXT           0x331B
+#define EGL_YUV_PLANE_BPP_8_EXT           0x331C
+#define EGL_YUV_PLANE_BPP_10_EXT          0x331D
+#endif /* EGL_EXT_yuv_surface */
+
+#ifndef EGL_HI_clientpixmap
+#define EGL_HI_clientpixmap 1
+struct EGLClientPixmapHI {
+    void  *pData;
+    EGLint iWidth;
+    EGLint iHeight;
+    EGLint iStride;
+};
+#define EGL_CLIENT_PIXMAP_POINTER_HI      0x8F74
+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPIXMAPSURFACEHIPROC) (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI *pixmap);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurfaceHI (EGLDisplay dpy, EGLConfig config, struct EGLClientPixmapHI *pixmap);
+#endif
+#endif /* EGL_HI_clientpixmap */
+
+#ifndef EGL_HI_colorformats
+#define EGL_HI_colorformats 1
+#define EGL_COLOR_FORMAT_HI               0x8F70
+#define EGL_COLOR_RGB_HI                  0x8F71
+#define EGL_COLOR_RGBA_HI                 0x8F72
+#define EGL_COLOR_ARGB_HI                 0x8F73
+#endif /* EGL_HI_colorformats */
+
+#ifndef EGL_IMG_context_priority
+#define EGL_IMG_context_priority 1
+#define EGL_CONTEXT_PRIORITY_LEVEL_IMG    0x3100
+#define EGL_CONTEXT_PRIORITY_HIGH_IMG     0x3101
+#define EGL_CONTEXT_PRIORITY_MEDIUM_IMG   0x3102
+#define EGL_CONTEXT_PRIORITY_LOW_IMG      0x3103
+#endif /* EGL_IMG_context_priority */
+
+#ifndef EGL_MESA_drm_image
+#define EGL_MESA_drm_image 1
+#define EGL_DRM_BUFFER_FORMAT_MESA        0x31D0
+#define EGL_DRM_BUFFER_USE_MESA           0x31D1
+#define EGL_DRM_BUFFER_FORMAT_ARGB32_MESA 0x31D2
+#define EGL_DRM_BUFFER_MESA               0x31D3
+#define EGL_DRM_BUFFER_STRIDE_MESA        0x31D4
+#define EGL_DRM_BUFFER_USE_SCANOUT_MESA   0x00000001
+#define EGL_DRM_BUFFER_USE_SHARE_MESA     0x00000002
+typedef EGLImageKHR (EGLAPIENTRYP PFNEGLCREATEDRMIMAGEMESAPROC) (EGLDisplay dpy, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDRMIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLImageKHR EGLAPIENTRY eglCreateDRMImageMESA (EGLDisplay dpy, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglExportDRMImageMESA (EGLDisplay dpy, EGLImageKHR image, EGLint *name, EGLint *handle, EGLint *stride);
+#endif
+#endif /* EGL_MESA_drm_image */
+
+#ifndef EGL_MESA_image_dma_buf_export
+#define EGL_MESA_image_dma_buf_export 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC) (EGLDisplay dpy, EGLImageKHR image, int *fourcc, int *num_planes, EGLuint64KHR *modifiers);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLEXPORTDMABUFIMAGEMESAPROC) (EGLDisplay dpy, EGLImageKHR image, int *fds, EGLint *strides, EGLint *offsets);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageQueryMESA (EGLDisplay dpy, EGLImageKHR image, int *fourcc, int *num_planes, EGLuint64KHR *modifiers);
+EGLAPI EGLBoolean EGLAPIENTRY eglExportDMABUFImageMESA (EGLDisplay dpy, EGLImageKHR image, int *fds, EGLint *strides, EGLint *offsets);
+#endif
+#endif /* EGL_MESA_image_dma_buf_export */
+
+#ifndef EGL_MESA_platform_gbm
+#define EGL_MESA_platform_gbm 1
+#define EGL_PLATFORM_GBM_MESA             0x31D7
+#endif /* EGL_MESA_platform_gbm */
+
+#ifndef EGL_NOK_swap_region
+#define EGL_NOK_swap_region 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGIONNOKPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegionNOK (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects);
+#endif
+#endif /* EGL_NOK_swap_region */
+
+#ifndef EGL_NOK_swap_region2
+#define EGL_NOK_swap_region2 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSWAPBUFFERSREGION2NOKPROC) (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersRegion2NOK (EGLDisplay dpy, EGLSurface surface, EGLint numRects, const EGLint *rects);
+#endif
+#endif /* EGL_NOK_swap_region2 */
+
+#ifndef EGL_NOK_texture_from_pixmap
+#define EGL_NOK_texture_from_pixmap 1
+#define EGL_Y_INVERTED_NOK                0x307F
+#endif /* EGL_NOK_texture_from_pixmap */
+
+#ifndef EGL_NV_3dvision_surface
+#define EGL_NV_3dvision_surface 1
+#define EGL_AUTO_STEREO_NV                0x3136
+#endif /* EGL_NV_3dvision_surface */
+
+#ifndef EGL_NV_coverage_sample
+#define EGL_NV_coverage_sample 1
+#define EGL_COVERAGE_BUFFERS_NV           0x30E0
+#define EGL_COVERAGE_SAMPLES_NV           0x30E1
+#endif /* EGL_NV_coverage_sample */
+
+#ifndef EGL_NV_coverage_sample_resolve
+#define EGL_NV_coverage_sample_resolve 1
+#define EGL_COVERAGE_SAMPLE_RESOLVE_NV    0x3131
+#define EGL_COVERAGE_SAMPLE_RESOLVE_DEFAULT_NV 0x3132
+#define EGL_COVERAGE_SAMPLE_RESOLVE_NONE_NV 0x3133
+#endif /* EGL_NV_coverage_sample_resolve */
+
+#ifndef EGL_NV_cuda_event
+#define EGL_NV_cuda_event 1
+#define EGL_CUDA_EVENT_HANDLE_NV          0x323B
+#define EGL_SYNC_CUDA_EVENT_NV            0x323C
+#define EGL_SYNC_CUDA_EVENT_COMPLETE_NV   0x323D
+#endif /* EGL_NV_cuda_event */
+
+#ifndef EGL_NV_depth_nonlinear
+#define EGL_NV_depth_nonlinear 1
+#define EGL_DEPTH_ENCODING_NV             0x30E2
+#define EGL_DEPTH_ENCODING_NONE_NV        0
+#define EGL_DEPTH_ENCODING_NONLINEAR_NV   0x30E3
+#endif /* EGL_NV_depth_nonlinear */
+
+#ifndef EGL_NV_device_cuda
+#define EGL_NV_device_cuda 1
+#define EGL_CUDA_DEVICE_NV                0x323A
+#endif /* EGL_NV_device_cuda */
+
+#ifndef EGL_NV_native_query
+#define EGL_NV_native_query 1
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYNATIVEDISPLAYNVPROC) (EGLDisplay dpy, EGLNativeDisplayType *display_id);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYNATIVEWINDOWNVPROC) (EGLDisplay dpy, EGLSurface surf, EGLNativeWindowType *window);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYNATIVEPIXMAPNVPROC) (EGLDisplay dpy, EGLSurface surf, EGLNativePixmapType *pixmap);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativeDisplayNV (EGLDisplay dpy, EGLNativeDisplayType *display_id);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativeWindowNV (EGLDisplay dpy, EGLSurface surf, EGLNativeWindowType *window);
+EGLAPI EGLBoolean EGLAPIENTRY eglQueryNativePixmapNV (EGLDisplay dpy, EGLSurface surf, EGLNativePixmapType *pixmap);
+#endif
+#endif /* EGL_NV_native_query */
+
+#ifndef EGL_NV_post_convert_rounding
+#define EGL_NV_post_convert_rounding 1
+#endif /* EGL_NV_post_convert_rounding */
+
+#ifndef EGL_NV_post_sub_buffer
+#define EGL_NV_post_sub_buffer 1
+#define EGL_POST_SUB_BUFFER_SUPPORTED_NV  0x30BE
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLPOSTSUBBUFFERNVPROC) (EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglPostSubBufferNV (EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height);
+#endif
+#endif /* EGL_NV_post_sub_buffer */
+
+#ifndef EGL_NV_stream_sync
+#define EGL_NV_stream_sync 1
+#define EGL_SYNC_NEW_FRAME_NV             0x321F
+typedef EGLSyncKHR (EGLAPIENTRYP PFNEGLCREATESTREAMSYNCNVPROC) (EGLDisplay dpy, EGLStreamKHR stream, EGLenum type, const EGLint *attrib_list);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSyncKHR EGLAPIENTRY eglCreateStreamSyncNV (EGLDisplay dpy, EGLStreamKHR stream, EGLenum type, const EGLint *attrib_list);
+#endif
+#endif /* EGL_NV_stream_sync */
+
+#ifndef EGL_NV_sync
+#define EGL_NV_sync 1
+typedef void *EGLSyncNV;
+typedef khronos_utime_nanoseconds_t EGLTimeNV;
+#ifdef KHRONOS_SUPPORT_INT64
+#define EGL_SYNC_PRIOR_COMMANDS_COMPLETE_NV 0x30E6
+#define EGL_SYNC_STATUS_NV                0x30E7
+#define EGL_SIGNALED_NV                   0x30E8
+#define EGL_UNSIGNALED_NV                 0x30E9
+#define EGL_SYNC_FLUSH_COMMANDS_BIT_NV    0x0001
+#define EGL_FOREVER_NV                    0xFFFFFFFFFFFFFFFFull
+#define EGL_ALREADY_SIGNALED_NV           0x30EA
+#define EGL_TIMEOUT_EXPIRED_NV            0x30EB
+#define EGL_CONDITION_SATISFIED_NV        0x30EC
+#define EGL_SYNC_TYPE_NV                  0x30ED
+#define EGL_SYNC_CONDITION_NV             0x30EE
+#define EGL_SYNC_FENCE_NV                 0x30EF
+#define EGL_NO_SYNC_NV                    ((EGLSyncNV)0)
+typedef EGLSyncNV (EGLAPIENTRYP PFNEGLCREATEFENCESYNCNVPROC) (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLDESTROYSYNCNVPROC) (EGLSyncNV sync);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLFENCENVPROC) (EGLSyncNV sync);
+typedef EGLint (EGLAPIENTRYP PFNEGLCLIENTWAITSYNCNVPROC) (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLSIGNALSYNCNVPROC) (EGLSyncNV sync, EGLenum mode);
+typedef EGLBoolean (EGLAPIENTRYP PFNEGLGETSYNCATTRIBNVPROC) (EGLSyncNV sync, EGLint attribute, EGLint *value);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLSyncNV EGLAPIENTRY eglCreateFenceSyncNV (EGLDisplay dpy, EGLenum condition, const EGLint *attrib_list);
+EGLAPI EGLBoolean EGLAPIENTRY eglDestroySyncNV (EGLSyncNV sync);
+EGLAPI EGLBoolean EGLAPIENTRY eglFenceNV (EGLSyncNV sync);
+EGLAPI EGLint EGLAPIENTRY eglClientWaitSyncNV (EGLSyncNV sync, EGLint flags, EGLTimeNV timeout);
+EGLAPI EGLBoolean EGLAPIENTRY eglSignalSyncNV (EGLSyncNV sync, EGLenum mode);
+EGLAPI EGLBoolean EGLAPIENTRY eglGetSyncAttribNV (EGLSyncNV sync, EGLint attribute, EGLint *value);
+#endif
+#endif /* KHRONOS_SUPPORT_INT64 */
+#endif /* EGL_NV_sync */
+
+#ifndef EGL_NV_system_time
+#define EGL_NV_system_time 1
+typedef khronos_utime_nanoseconds_t EGLuint64NV;
+#ifdef KHRONOS_SUPPORT_INT64
+typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC) (void);
+typedef EGLuint64NV (EGLAPIENTRYP PFNEGLGETSYSTEMTIMENVPROC) (void);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeFrequencyNV (void);
+EGLAPI EGLuint64NV EGLAPIENTRY eglGetSystemTimeNV (void);
+#endif
+#endif /* KHRONOS_SUPPORT_INT64 */
+#endif /* EGL_NV_system_time */
+
+#ifndef EGL_TIZEN_image_native_buffer
+#define EGL_TIZEN_image_native_buffer 1
+#define EGL_NATIVE_BUFFER_TIZEN           0x32A0
+#endif /* EGL_TIZEN_image_native_buffer */
+
+#ifndef EGL_TIZEN_image_native_surface
+#define EGL_TIZEN_image_native_surface 1
+#define EGL_NATIVE_SURFACE_TIZEN          0x32A1
+#endif /* EGL_TIZEN_image_native_surface */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __eglext_h_ */
+
+
+#endif /* _MSC_VER */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_endian.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_endian.h
new file mode 100644
index 0000000..54d5d48
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_endian.h
@@ -0,0 +1,260 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_endian.h
+ *
+ *  Functions for reading and writing endian-specific values
+ */
+
+#ifndef SDL_endian_h_
+#define SDL_endian_h_
+
+#include "SDL_stdinc.h"
+
+/**
+ *  \name The two types of endianness
+ */
+/* @{ */
+#define SDL_LIL_ENDIAN  1234
+#define SDL_BIG_ENDIAN  4321
+/* @} */
+
+#ifndef SDL_BYTEORDER           /* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux__ */
+#if defined(__hppa__) || \
+    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
+    (defined(__MIPS__) && defined(__MISPEB__)) || \
+    defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
+    defined(__sparc__)
+#define SDL_BYTEORDER   SDL_BIG_ENDIAN
+#else
+#define SDL_BYTEORDER   SDL_LIL_ENDIAN
+#endif
+#endif /* __linux__ */
+#endif /* !SDL_BYTEORDER */
+
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_endian.h
+ */
+#if defined(__GNUC__) && defined(__i386__) && \
+   !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+  __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+  __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+    int result;
+
+  __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
+    return (Uint16)result;
+}
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+  __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc");
+    return x;
+}
+#elif defined(__WATCOMC__) && defined(__386__)
+extern _inline Uint16 SDL_Swap16(Uint16);
+#pragma aux SDL_Swap16 = \
+  "xchg al, ah" \
+  parm   [ax]   \
+  modify [ax];
+#else
+SDL_FORCE_INLINE Uint16
+SDL_Swap16(Uint16 x)
+{
+    return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
+}
+#endif
+
+#if defined(__GNUC__) && defined(__i386__)
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+  __asm__("bswap %0": "=r"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+  __asm__("bswapl %0": "=r"(x):"0"(x));
+    return x;
+}
+#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+    Uint32 result;
+
+  __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
+  __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
+  __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
+    return result;
+}
+#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+  __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc");
+    return x;
+}
+#elif defined(__WATCOMC__) && defined(__386__)
+extern _inline Uint32 SDL_Swap32(Uint32);
+#ifndef __SW_3 /* 486+ */
+#pragma aux SDL_Swap32 = \
+  "bswap eax"  \
+  parm   [eax] \
+  modify [eax];
+#else  /* 386-only */
+#pragma aux SDL_Swap32 = \
+  "xchg al, ah"  \
+  "ror  eax, 16" \
+  "xchg al, ah"  \
+  parm   [eax]   \
+  modify [eax];
+#endif
+#else
+SDL_FORCE_INLINE Uint32
+SDL_Swap32(Uint32 x)
+{
+    return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
+                                    ((x >> 8) & 0x0000FF00) | (x >> 24)));
+}
+#endif
+
+#if defined(__GNUC__) && defined(__i386__)
+SDL_FORCE_INLINE Uint64
+SDL_Swap64(Uint64 x)
+{
+    union
+    {
+        struct
+        {
+            Uint32 a, b;
+        } s;
+        Uint64 u;
+    } v;
+    v.u = x;
+  __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
+            "1"(v.s.
+                b));
+    return v.u;
+}
+#elif defined(__GNUC__) && defined(__x86_64__)
+SDL_FORCE_INLINE Uint64
+SDL_Swap64(Uint64 x)
+{
+  __asm__("bswapq %0": "=r"(x):"0"(x));
+    return x;
+}
+#else
+SDL_FORCE_INLINE Uint64
+SDL_Swap64(Uint64 x)
+{
+    Uint32 hi, lo;
+
+    /* Separate into high and low 32-bit values and swap them */
+    lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
+    x >>= 32;
+    hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
+    x = SDL_Swap32(lo);
+    x <<= 32;
+    x |= SDL_Swap32(hi);
+    return (x);
+}
+#endif
+
+
+SDL_FORCE_INLINE float
+SDL_SwapFloat(float x)
+{
+    union
+    {
+        float f;
+        Uint32 ui32;
+    } swapper;
+    swapper.f = x;
+    swapper.ui32 = SDL_Swap32(swapper.ui32);
+    return swapper.f;
+}
+
+
+/**
+ *  \name Swap to native
+ *  Byteswap item from the specified endianness to the native endianness.
+ */
+/* @{ */
+#if SDL_BYTEORDER == SDL_LIL_ENDIAN
+#define SDL_SwapLE16(X) (X)
+#define SDL_SwapLE32(X) (X)
+#define SDL_SwapLE64(X) (X)
+#define SDL_SwapFloatLE(X)  (X)
+#define SDL_SwapBE16(X) SDL_Swap16(X)
+#define SDL_SwapBE32(X) SDL_Swap32(X)
+#define SDL_SwapBE64(X) SDL_Swap64(X)
+#define SDL_SwapFloatBE(X)  SDL_SwapFloat(X)
+#else
+#define SDL_SwapLE16(X) SDL_Swap16(X)
+#define SDL_SwapLE32(X) SDL_Swap32(X)
+#define SDL_SwapLE64(X) SDL_Swap64(X)
+#define SDL_SwapFloatLE(X)  SDL_SwapFloat(X)
+#define SDL_SwapBE16(X) (X)
+#define SDL_SwapBE32(X) (X)
+#define SDL_SwapBE64(X) (X)
+#define SDL_SwapFloatBE(X)  (X)
+#endif
+/* @} *//* Swap to native */
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_endian_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_error.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_error.h
new file mode 100644
index 0000000..24416e6
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_error.h
@@ -0,0 +1,76 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_error.h
+ *
+ *  Simple error message routines for SDL.
+ */
+
+#ifndef SDL_error_h_
+#define SDL_error_h_
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Public functions */
+/* SDL_SetError() unconditionally returns -1. */
+extern DECLSPEC int SDLCALL SDL_SetError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1);
+extern DECLSPEC const char *SDLCALL SDL_GetError(void);
+extern DECLSPEC void SDLCALL SDL_ClearError(void);
+
+/**
+ *  \name Internal error functions
+ *
+ *  \internal
+ *  Private error reporting function - used internally.
+ */
+/* @{ */
+#define SDL_OutOfMemory()   SDL_Error(SDL_ENOMEM)
+#define SDL_Unsupported()   SDL_Error(SDL_UNSUPPORTED)
+#define SDL_InvalidParamError(param)    SDL_SetError("Parameter '%s' is invalid", (param))
+typedef enum
+{
+    SDL_ENOMEM,
+    SDL_EFREAD,
+    SDL_EFWRITE,
+    SDL_EFSEEK,
+    SDL_UNSUPPORTED,
+    SDL_LASTERROR
+} SDL_errorcode;
+/* SDL_Error() unconditionally returns -1. */
+extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
+/* @} *//* Internal error functions */
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_error_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_events.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_events.h
new file mode 100644
index 0000000..282b9fb
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_events.h
@@ -0,0 +1,791 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_events.h
+ *
+ *  Include file for SDL event handling.
+ */
+
+#ifndef SDL_events_h_
+#define SDL_events_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+#include "SDL_keyboard.h"
+#include "SDL_mouse.h"
+#include "SDL_joystick.h"
+#include "SDL_gamecontroller.h"
+#include "SDL_quit.h"
+#include "SDL_gesture.h"
+#include "SDL_touch.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* General keyboard/mouse state definitions */
+#define SDL_RELEASED    0
+#define SDL_PRESSED 1
+
+/**
+ * \brief The types of events that can be delivered.
+ */
+typedef enum
+{
+    SDL_FIRSTEVENT     = 0,     /**< Unused (do not remove) */
+
+    /* Application events */
+    SDL_QUIT           = 0x100, /**< User-requested quit */
+
+    /* These application events have special meaning on iOS, see README-ios.md for details */
+    SDL_APP_TERMINATING,        /**< The application is being terminated by the OS
+                                     Called on iOS in applicationWillTerminate()
+                                     Called on Android in onDestroy()
+                                */
+    SDL_APP_LOWMEMORY,          /**< The application is low on memory, free memory if possible.
+                                     Called on iOS in applicationDidReceiveMemoryWarning()
+                                     Called on Android in onLowMemory()
+                                */
+    SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background
+                                     Called on iOS in applicationWillResignActive()
+                                     Called on Android in onPause()
+                                */
+    SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time
+                                     Called on iOS in applicationDidEnterBackground()
+                                     Called on Android in onPause()
+                                */
+    SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground
+                                     Called on iOS in applicationWillEnterForeground()
+                                     Called on Android in onResume()
+                                */
+    SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive
+                                     Called on iOS in applicationDidBecomeActive()
+                                     Called on Android in onResume()
+                                */
+
+    /* Display events */
+    SDL_DISPLAYEVENT   = 0x150,  /**< Display state change */
+
+    /* Window events */
+    SDL_WINDOWEVENT    = 0x200, /**< Window state change */
+    SDL_SYSWMEVENT,             /**< System specific event */
+
+    /* Keyboard events */
+    SDL_KEYDOWN        = 0x300, /**< Key pressed */
+    SDL_KEYUP,                  /**< Key released */
+    SDL_TEXTEDITING,            /**< Keyboard text editing (composition) */
+    SDL_TEXTINPUT,              /**< Keyboard text input */
+    SDL_KEYMAPCHANGED,          /**< Keymap changed due to a system event such as an
+                                     input language or keyboard layout change.
+                                */
+
+    /* Mouse events */
+    SDL_MOUSEMOTION    = 0x400, /**< Mouse moved */
+    SDL_MOUSEBUTTONDOWN,        /**< Mouse button pressed */
+    SDL_MOUSEBUTTONUP,          /**< Mouse button released */
+    SDL_MOUSEWHEEL,             /**< Mouse wheel motion */
+
+    /* Joystick events */
+    SDL_JOYAXISMOTION  = 0x600, /**< Joystick axis motion */
+    SDL_JOYBALLMOTION,          /**< Joystick trackball motion */
+    SDL_JOYHATMOTION,           /**< Joystick hat position change */
+    SDL_JOYBUTTONDOWN,          /**< Joystick button pressed */
+    SDL_JOYBUTTONUP,            /**< Joystick button released */
+    SDL_JOYDEVICEADDED,         /**< A new joystick has been inserted into the system */
+    SDL_JOYDEVICEREMOVED,       /**< An opened joystick has been removed */
+
+    /* Game controller events */
+    SDL_CONTROLLERAXISMOTION  = 0x650, /**< Game controller axis motion */
+    SDL_CONTROLLERBUTTONDOWN,          /**< Game controller button pressed */
+    SDL_CONTROLLERBUTTONUP,            /**< Game controller button released */
+    SDL_CONTROLLERDEVICEADDED,         /**< A new Game controller has been inserted into the system */
+    SDL_CONTROLLERDEVICEREMOVED,       /**< An opened Game controller has been removed */
+    SDL_CONTROLLERDEVICEREMAPPED,      /**< The controller mapping was updated */
+
+    /* Touch events */
+    SDL_FINGERDOWN      = 0x700,
+    SDL_FINGERUP,
+    SDL_FINGERMOTION,
+
+    /* Gesture events */
+    SDL_DOLLARGESTURE   = 0x800,
+    SDL_DOLLARRECORD,
+    SDL_MULTIGESTURE,
+
+    /* Clipboard events */
+    SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */
+
+    /* Drag and drop events */
+    SDL_DROPFILE        = 0x1000, /**< The system requests a file open */
+    SDL_DROPTEXT,                 /**< text/plain drag-and-drop event */
+    SDL_DROPBEGIN,                /**< A new set of drops is beginning (NULL filename) */
+    SDL_DROPCOMPLETE,             /**< Current set of drops is now complete (NULL filename) */
+
+    /* Audio hotplug events */
+    SDL_AUDIODEVICEADDED = 0x1100, /**< A new audio device is available */
+    SDL_AUDIODEVICEREMOVED,        /**< An audio device has been removed. */
+
+    /* Sensor events */
+    SDL_SENSORUPDATE = 0x1200,     /**< A sensor was updated */
+
+    /* Render events */
+    SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset and their contents need to be updated */
+    SDL_RENDER_DEVICE_RESET, /**< The device has been reset and all textures need to be recreated */
+
+    /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use,
+     *  and should be allocated with SDL_RegisterEvents()
+     */
+    SDL_USEREVENT    = 0x8000,
+
+    /**
+     *  This last event is only for bounding internal arrays
+     */
+    SDL_LASTEVENT    = 0xFFFF
+} SDL_EventType;
+
+/**
+ *  \brief Fields shared by every event
+ */
+typedef struct SDL_CommonEvent
+{
+    Uint32 type;
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+} SDL_CommonEvent;
+
+/**
+ *  \brief Display state change event data (event.display.*)
+ */
+typedef struct SDL_DisplayEvent
+{
+    Uint32 type;        /**< ::SDL_DISPLAYEVENT */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 display;     /**< The associated display index */
+    Uint8 event;        /**< ::SDL_DisplayEventID */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint32 data1;       /**< event dependent data */
+} SDL_DisplayEvent;
+
+/**
+ *  \brief Window state change event data (event.window.*)
+ */
+typedef struct SDL_WindowEvent
+{
+    Uint32 type;        /**< ::SDL_WINDOWEVENT */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;    /**< The associated window */
+    Uint8 event;        /**< ::SDL_WindowEventID */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint32 data1;       /**< event dependent data */
+    Sint32 data2;       /**< event dependent data */
+} SDL_WindowEvent;
+
+/**
+ *  \brief Keyboard button event structure (event.key.*)
+ */
+typedef struct SDL_KeyboardEvent
+{
+    Uint32 type;        /**< ::SDL_KEYDOWN or ::SDL_KEYUP */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;    /**< The window with keyboard focus, if any */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 repeat;       /**< Non-zero if this is a key repeat */
+    Uint8 padding2;
+    Uint8 padding3;
+    SDL_Keysym keysym;  /**< The key that was pressed or released */
+} SDL_KeyboardEvent;
+
+#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
+/**
+ *  \brief Keyboard text editing event structure (event.edit.*)
+ */
+typedef struct SDL_TextEditingEvent
+{
+    Uint32 type;                                /**< ::SDL_TEXTEDITING */
+    Uint32 timestamp;                           /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;                            /**< The window with keyboard focus, if any */
+    char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
+    Sint32 start;                               /**< The start cursor of selected editing text */
+    Sint32 length;                              /**< The length of selected editing text */
+} SDL_TextEditingEvent;
+
+
+#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32)
+/**
+ *  \brief Keyboard text input event structure (event.text.*)
+ */
+typedef struct SDL_TextInputEvent
+{
+    Uint32 type;                              /**< ::SDL_TEXTINPUT */
+    Uint32 timestamp;                         /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;                          /**< The window with keyboard focus, if any */
+    char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
+} SDL_TextInputEvent;
+
+/**
+ *  \brief Mouse motion event structure (event.motion.*)
+ */
+typedef struct SDL_MouseMotionEvent
+{
+    Uint32 type;        /**< ::SDL_MOUSEMOTION */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;    /**< The window with mouse focus, if any */
+    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
+    Uint32 state;       /**< The current button state */
+    Sint32 x;           /**< X coordinate, relative to window */
+    Sint32 y;           /**< Y coordinate, relative to window */
+    Sint32 xrel;        /**< The relative motion in the X direction */
+    Sint32 yrel;        /**< The relative motion in the Y direction */
+} SDL_MouseMotionEvent;
+
+/**
+ *  \brief Mouse button event structure (event.button.*)
+ */
+typedef struct SDL_MouseButtonEvent
+{
+    Uint32 type;        /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;    /**< The window with mouse focus, if any */
+    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
+    Uint8 button;       /**< The mouse button index */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 clicks;       /**< 1 for single-click, 2 for double-click, etc. */
+    Uint8 padding1;
+    Sint32 x;           /**< X coordinate, relative to window */
+    Sint32 y;           /**< Y coordinate, relative to window */
+} SDL_MouseButtonEvent;
+
+/**
+ *  \brief Mouse wheel event structure (event.wheel.*)
+ */
+typedef struct SDL_MouseWheelEvent
+{
+    Uint32 type;        /**< ::SDL_MOUSEWHEEL */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;    /**< The window with mouse focus, if any */
+    Uint32 which;       /**< The mouse instance id, or SDL_TOUCH_MOUSEID */
+    Sint32 x;           /**< The amount scrolled horizontally, positive to the right and negative to the left */
+    Sint32 y;           /**< The amount scrolled vertically, positive away from the user and negative toward the user */
+    Uint32 direction;   /**< Set to one of the SDL_MOUSEWHEEL_* defines. When FLIPPED the values in X and Y will be opposite. Multiply by -1 to change them back */
+} SDL_MouseWheelEvent;
+
+/**
+ *  \brief Joystick axis motion event structure (event.jaxis.*)
+ */
+typedef struct SDL_JoyAxisEvent
+{
+    Uint32 type;        /**< ::SDL_JOYAXISMOTION */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 axis;         /**< The joystick axis index */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint16 value;       /**< The axis value (range: -32768 to 32767) */
+    Uint16 padding4;
+} SDL_JoyAxisEvent;
+
+/**
+ *  \brief Joystick trackball motion event structure (event.jball.*)
+ */
+typedef struct SDL_JoyBallEvent
+{
+    Uint32 type;        /**< ::SDL_JOYBALLMOTION */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 ball;         /**< The joystick trackball index */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint16 xrel;        /**< The relative motion in the X direction */
+    Sint16 yrel;        /**< The relative motion in the Y direction */
+} SDL_JoyBallEvent;
+
+/**
+ *  \brief Joystick hat position change event structure (event.jhat.*)
+ */
+typedef struct SDL_JoyHatEvent
+{
+    Uint32 type;        /**< ::SDL_JOYHATMOTION */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 hat;          /**< The joystick hat index */
+    Uint8 value;        /**< The hat position value.
+                         *   \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP
+                         *   \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT
+                         *   \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN
+                         *
+                         *   Note that zero means the POV is centered.
+                         */
+    Uint8 padding1;
+    Uint8 padding2;
+} SDL_JoyHatEvent;
+
+/**
+ *  \brief Joystick button event structure (event.jbutton.*)
+ */
+typedef struct SDL_JoyButtonEvent
+{
+    Uint32 type;        /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 button;       /**< The joystick button index */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 padding1;
+    Uint8 padding2;
+} SDL_JoyButtonEvent;
+
+/**
+ *  \brief Joystick device event structure (event.jdevice.*)
+ */
+typedef struct SDL_JoyDeviceEvent
+{
+    Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
+} SDL_JoyDeviceEvent;
+
+
+/**
+ *  \brief Game controller axis motion event structure (event.caxis.*)
+ */
+typedef struct SDL_ControllerAxisEvent
+{
+    Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 axis;         /**< The controller axis (SDL_GameControllerAxis) */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+    Sint16 value;       /**< The axis value (range: -32768 to 32767) */
+    Uint16 padding4;
+} SDL_ControllerAxisEvent;
+
+
+/**
+ *  \brief Game controller button event structure (event.cbutton.*)
+ */
+typedef struct SDL_ControllerButtonEvent
+{
+    Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_JoystickID which; /**< The joystick instance id */
+    Uint8 button;       /**< The controller button (SDL_GameControllerButton) */
+    Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
+    Uint8 padding1;
+    Uint8 padding2;
+} SDL_ControllerButtonEvent;
+
+
+/**
+ *  \brief Controller device event structure (event.cdevice.*)
+ */
+typedef struct SDL_ControllerDeviceEvent
+{
+    Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
+} SDL_ControllerDeviceEvent;
+
+/**
+ *  \brief Audio device event structure (event.adevice.*)
+ */
+typedef struct SDL_AudioDeviceEvent
+{
+    Uint32 type;        /**< ::SDL_AUDIODEVICEADDED, or ::SDL_AUDIODEVICEREMOVED */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 which;       /**< The audio device index for the ADDED event (valid until next SDL_GetNumAudioDevices() call), SDL_AudioDeviceID for the REMOVED event */
+    Uint8 iscapture;    /**< zero if an output device, non-zero if a capture device. */
+    Uint8 padding1;
+    Uint8 padding2;
+    Uint8 padding3;
+} SDL_AudioDeviceEvent;
+
+
+/**
+ *  \brief Touch finger event structure (event.tfinger.*)
+ */
+typedef struct SDL_TouchFingerEvent
+{
+    Uint32 type;        /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_TouchID touchId; /**< The touch device id */
+    SDL_FingerID fingerId;
+    float x;            /**< Normalized in the range 0...1 */
+    float y;            /**< Normalized in the range 0...1 */
+    float dx;           /**< Normalized in the range -1...1 */
+    float dy;           /**< Normalized in the range -1...1 */
+    float pressure;     /**< Normalized in the range 0...1 */
+} SDL_TouchFingerEvent;
+
+
+/**
+ *  \brief Multiple Finger Gesture Event (event.mgesture.*)
+ */
+typedef struct SDL_MultiGestureEvent
+{
+    Uint32 type;        /**< ::SDL_MULTIGESTURE */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_TouchID touchId; /**< The touch device id */
+    float dTheta;
+    float dDist;
+    float x;
+    float y;
+    Uint16 numFingers;
+    Uint16 padding;
+} SDL_MultiGestureEvent;
+
+
+/**
+ * \brief Dollar Gesture Event (event.dgesture.*)
+ */
+typedef struct SDL_DollarGestureEvent
+{
+    Uint32 type;        /**< ::SDL_DOLLARGESTURE or ::SDL_DOLLARRECORD */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_TouchID touchId; /**< The touch device id */
+    SDL_GestureID gestureId;
+    Uint32 numFingers;
+    float error;
+    float x;            /**< Normalized center of gesture */
+    float y;            /**< Normalized center of gesture */
+} SDL_DollarGestureEvent;
+
+
+/**
+ *  \brief An event used to request a file open by the system (event.drop.*)
+ *         This event is enabled by default, you can disable it with SDL_EventState().
+ *  \note If this event is enabled, you must free the filename in the event.
+ */
+typedef struct SDL_DropEvent
+{
+    Uint32 type;        /**< ::SDL_DROPBEGIN or ::SDL_DROPFILE or ::SDL_DROPTEXT or ::SDL_DROPCOMPLETE */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    char *file;         /**< The file name, which should be freed with SDL_free(), is NULL on begin/complete */
+    Uint32 windowID;    /**< The window that was dropped on, if any */
+} SDL_DropEvent;
+
+
+/**
+ *  \brief Sensor event structure (event.sensor.*)
+ */
+typedef struct SDL_SensorEvent
+{
+    Uint32 type;        /**< ::SDL_SENSORUPDATE */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Sint32 which;       /**< The instance ID of the sensor */
+    float data[6];      /**< Up to 6 values from the sensor - additional values can be queried using SDL_SensorGetData() */
+} SDL_SensorEvent;
+
+/**
+ *  \brief The "quit requested" event
+ */
+typedef struct SDL_QuitEvent
+{
+    Uint32 type;        /**< ::SDL_QUIT */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+} SDL_QuitEvent;
+
+/**
+ *  \brief OS Specific event
+ */
+typedef struct SDL_OSEvent
+{
+    Uint32 type;        /**< ::SDL_QUIT */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+} SDL_OSEvent;
+
+/**
+ *  \brief A user-defined event type (event.user.*)
+ */
+typedef struct SDL_UserEvent
+{
+    Uint32 type;        /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    Uint32 windowID;    /**< The associated window if any */
+    Sint32 code;        /**< User defined event code */
+    void *data1;        /**< User defined data pointer */
+    void *data2;        /**< User defined data pointer */
+} SDL_UserEvent;
+
+
+struct SDL_SysWMmsg;
+typedef struct SDL_SysWMmsg SDL_SysWMmsg;
+
+/**
+ *  \brief A video driver dependent system event (event.syswm.*)
+ *         This event is disabled by default, you can enable it with SDL_EventState()
+ *
+ *  \note If you want to use this event, you should include SDL_syswm.h.
+ */
+typedef struct SDL_SysWMEvent
+{
+    Uint32 type;        /**< ::SDL_SYSWMEVENT */
+    Uint32 timestamp;   /**< In milliseconds, populated using SDL_GetTicks() */
+    SDL_SysWMmsg *msg;  /**< driver dependent data, defined in SDL_syswm.h */
+} SDL_SysWMEvent;
+
+/**
+ *  \brief General event structure
+ */
+typedef union SDL_Event
+{
+    Uint32 type;                    /**< Event type, shared with all events */
+    SDL_CommonEvent common;         /**< Common event data */
+    SDL_DisplayEvent display;       /**< Window event data */
+    SDL_WindowEvent window;         /**< Window event data */
+    SDL_KeyboardEvent key;          /**< Keyboard event data */
+    SDL_TextEditingEvent edit;      /**< Text editing event data */
+    SDL_TextInputEvent text;        /**< Text input event data */
+    SDL_MouseMotionEvent motion;    /**< Mouse motion event data */
+    SDL_MouseButtonEvent button;    /**< Mouse button event data */
+    SDL_MouseWheelEvent wheel;      /**< Mouse wheel event data */
+    SDL_JoyAxisEvent jaxis;         /**< Joystick axis event data */
+    SDL_JoyBallEvent jball;         /**< Joystick ball event data */
+    SDL_JoyHatEvent jhat;           /**< Joystick hat event data */
+    SDL_JoyButtonEvent jbutton;     /**< Joystick button event data */
+    SDL_JoyDeviceEvent jdevice;     /**< Joystick device change event data */
+    SDL_ControllerAxisEvent caxis;      /**< Game Controller axis event data */
+    SDL_ControllerButtonEvent cbutton;  /**< Game Controller button event data */
+    SDL_ControllerDeviceEvent cdevice;  /**< Game Controller device event data */
+    SDL_AudioDeviceEvent adevice;   /**< Audio device event data */
+    SDL_SensorEvent sensor;         /**< Sensor event data */
+    SDL_QuitEvent quit;             /**< Quit request event data */
+    SDL_UserEvent user;             /**< Custom event data */
+    SDL_SysWMEvent syswm;           /**< System dependent window event data */
+    SDL_TouchFingerEvent tfinger;   /**< Touch finger event data */
+    SDL_MultiGestureEvent mgesture; /**< Gesture event data */
+    SDL_DollarGestureEvent dgesture; /**< Gesture event data */
+    SDL_DropEvent drop;             /**< Drag and drop event data */
+
+    /* This is necessary for ABI compatibility between Visual C++ and GCC
+       Visual C++ will respect the push pack pragma and use 52 bytes for
+       this structure, and GCC will use the alignment of the largest datatype
+       within the union, which is 8 bytes.
+
+       So... we'll add padding to force the size to be 56 bytes for both.
+    */
+    Uint8 padding[56];
+} SDL_Event;
+
+/* Make sure we haven't broken binary compatibility */
+SDL_COMPILE_TIME_ASSERT(SDL_Event, sizeof(SDL_Event) == 56);
+
+
+/* Function prototypes */
+
+/**
+ *  Pumps the event loop, gathering events from the input devices.
+ *
+ *  This function updates the event queue and internal input device state.
+ *
+ *  This should only be run in the thread that sets the video mode.
+ */
+extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
+
+/* @{ */
+typedef enum
+{
+    SDL_ADDEVENT,
+    SDL_PEEKEVENT,
+    SDL_GETEVENT
+} SDL_eventaction;
+
+/**
+ *  Checks the event queue for messages and optionally returns them.
+ *
+ *  If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to
+ *  the back of the event queue.
+ *
+ *  If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front
+ *  of the event queue, within the specified minimum and maximum type,
+ *  will be returned and will not be removed from the queue.
+ *
+ *  If \c action is ::SDL_GETEVENT, up to \c numevents events at the front
+ *  of the event queue, within the specified minimum and maximum type,
+ *  will be returned and will be removed from the queue.
+ *
+ *  \return The number of events actually stored, or -1 if there was an error.
+ *
+ *  This function is thread-safe.
+ */
+extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
+                                           SDL_eventaction action,
+                                           Uint32 minType, Uint32 maxType);
+/* @} */
+
+/**
+ *  Checks to see if certain event types are in the event queue.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type);
+extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType);
+
+/**
+ *  This function clears events from the event queue
+ *  This function only affects currently queued events. If you want to make
+ *  sure that all pending OS events are flushed, you can call SDL_PumpEvents()
+ *  on the main thread immediately before the flush call.
+ */
+extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type);
+extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType);
+
+/**
+ *  \brief Polls for currently pending events.
+ *
+ *  \return 1 if there are any pending events, or 0 if there are none available.
+ *
+ *  \param event If not NULL, the next event is removed from the queue and
+ *               stored in that area.
+ */
+extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event);
+
+/**
+ *  \brief Waits indefinitely for the next available event.
+ *
+ *  \return 1, or 0 if there was an error while waiting for events.
+ *
+ *  \param event If not NULL, the next event is removed from the queue and
+ *               stored in that area.
+ */
+extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event);
+
+/**
+ *  \brief Waits until the specified timeout (in milliseconds) for the next
+ *         available event.
+ *
+ *  \return 1, or 0 if there was an error while waiting for events.
+ *
+ *  \param event If not NULL, the next event is removed from the queue and
+ *               stored in that area.
+ *  \param timeout The timeout (in milliseconds) to wait for next event.
+ */
+extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event,
+                                                 int timeout);
+
+/**
+ *  \brief Add an event to the event queue.
+ *
+ *  \return 1 on success, 0 if the event was filtered, or -1 if the event queue
+ *          was full or there was some other error.
+ */
+extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event);
+
+typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event);
+
+/**
+ *  Sets up a filter to process all events before they change internal state and
+ *  are posted to the internal event queue.
+ *
+ *  The filter is prototyped as:
+ *  \code
+ *      int SDL_EventFilter(void *userdata, SDL_Event * event);
+ *  \endcode
+ *
+ *  If the filter returns 1, then the event will be added to the internal queue.
+ *  If it returns 0, then the event will be dropped from the queue, but the
+ *  internal state will still be updated.  This allows selective filtering of
+ *  dynamically arriving events.
+ *
+ *  \warning  Be very careful of what you do in the event filter function, as
+ *            it may run in a different thread!
+ *
+ *  There is one caveat when dealing with the ::SDL_QuitEvent event type.  The
+ *  event filter is only called when the window manager desires to close the
+ *  application window.  If the event filter returns 1, then the window will
+ *  be closed, otherwise the window will remain open if possible.
+ *
+ *  If the quit event is generated by an interrupt signal, it will bypass the
+ *  internal queue and be delivered to the application at the next event poll.
+ */
+extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter,
+                                                void *userdata);
+
+/**
+ *  Return the current event filter - can be used to "chain" filters.
+ *  If there is no event filter set, this function returns SDL_FALSE.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter,
+                                                    void **userdata);
+
+/**
+ *  Add a function which is called when an event is added to the queue.
+ */
+extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter,
+                                               void *userdata);
+
+/**
+ *  Remove an event watch function added with SDL_AddEventWatch()
+ */
+extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter,
+                                               void *userdata);
+
+/**
+ *  Run the filter function on the current event queue, removing any
+ *  events for which the filter returns 0.
+ */
+extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter,
+                                              void *userdata);
+
+/* @{ */
+#define SDL_QUERY   -1
+#define SDL_IGNORE   0
+#define SDL_DISABLE  0
+#define SDL_ENABLE   1
+
+/**
+ *  This function allows you to set the state of processing certain events.
+ *   - If \c state is set to ::SDL_IGNORE, that event will be automatically
+ *     dropped from the event queue and will not be filtered.
+ *   - If \c state is set to ::SDL_ENABLE, that event will be processed
+ *     normally.
+ *   - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the
+ *     current processing state of the specified event.
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
+/* @} */
+#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY)
+
+/**
+ *  This function allocates a set of user-defined events, and returns
+ *  the beginning event number for that set of events.
+ *
+ *  If there aren't enough user-defined events left, this function
+ *  returns (Uint32)-1
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_events_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_filesystem.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_filesystem.h
new file mode 100644
index 0000000..6d97e58
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_filesystem.h
@@ -0,0 +1,136 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_filesystem.h
+ *
+ *  \brief Include file for filesystem SDL API functions
+ */
+
+#ifndef SDL_filesystem_h_
+#define SDL_filesystem_h_
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Get the path where the application resides.
+ *
+ * Get the "base path". This is the directory where the application was run
+ *  from, which is probably the installation directory, and may or may not
+ *  be the process's current working directory.
+ *
+ * This returns an absolute path in UTF-8 encoding, and is guaranteed to
+ *  end with a path separator ('\\' on Windows, '/' most other places).
+ *
+ * The pointer returned by this function is owned by you. Please call
+ *  SDL_free() on the pointer when you are done with it, or it will be a
+ *  memory leak. This is not necessarily a fast call, though, so you should
+ *  call this once near startup and save the string if you need it.
+ *
+ * Some platforms can't determine the application's path, and on other
+ *  platforms, this might be meaningless. In such cases, this function will
+ *  return NULL.
+ *
+ *  \return String of base dir in UTF-8 encoding, or NULL on error.
+ *
+ * \sa SDL_GetPrefPath
+ */
+extern DECLSPEC char *SDLCALL SDL_GetBasePath(void);
+
+/**
+ * \brief Get the user-and-app-specific path where files can be written.
+ *
+ * Get the "pref dir". This is meant to be where users can write personal
+ *  files (preferences and save games, etc) that are specific to your
+ *  application. This directory is unique per user, per application.
+ *
+ * This function will decide the appropriate location in the native filesystem,
+ *  create the directory if necessary, and return a string of the absolute
+ *  path to the directory in UTF-8 encoding.
+ *
+ * On Windows, the string might look like:
+ *  "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\"
+ *
+ * On Linux, the string might look like:
+ *  "/home/bob/.local/share/My Program Name/"
+ *
+ * On Mac OS X, the string might look like:
+ *  "/Users/bob/Library/Application Support/My Program Name/"
+ *
+ * (etc.)
+ *
+ * You specify the name of your organization (if it's not a real organization,
+ *  your name or an Internet domain you own might do) and the name of your
+ *  application. These should be untranslated proper names.
+ *
+ * Both the org and app strings may become part of a directory name, so
+ *  please follow these rules:
+ *
+ *    - Try to use the same org string (including case-sensitivity) for
+ *      all your applications that use this function.
+ *    - Always use a unique app string for each one, and make sure it never
+ *      changes for an app once you've decided on it.
+ *    - Unicode characters are legal, as long as it's UTF-8 encoded, but...
+ *    - ...only use letters, numbers, and spaces. Avoid punctuation like
+ *      "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient.
+ *
+ * This returns an absolute path in UTF-8 encoding, and is guaranteed to
+ *  end with a path separator ('\\' on Windows, '/' most other places).
+ *
+ * The pointer returned by this function is owned by you. Please call
+ *  SDL_free() on the pointer when you are done with it, or it will be a
+ *  memory leak. This is not necessarily a fast call, though, so you should
+ *  call this once near startup and save the string if you need it.
+ *
+ * You should assume the path returned by this function is the only safe
+ *  place to write files (and that SDL_GetBasePath(), while it might be
+ *  writable, or even the parent of the returned path, aren't where you
+ *  should be writing things).
+ *
+ * Some platforms can't determine the pref path, and on other
+ *  platforms, this might be meaningless. In such cases, this function will
+ *  return NULL.
+ *
+ *   \param org The name of your organization.
+ *   \param app The name of your application.
+ *  \return UTF-8 string of user dir in platform-dependent notation. NULL
+ *          if there's a problem (creating directory failed, etc).
+ *
+ * \sa SDL_GetBasePath
+ */
+extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_filesystem_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_gamecontroller.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_gamecontroller.h
new file mode 100644
index 0000000..ebde387
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_gamecontroller.h
@@ -0,0 +1,390 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_gamecontroller.h
+ *
+ *  Include file for SDL game controller event handling
+ */
+
+#ifndef SDL_gamecontroller_h_
+#define SDL_gamecontroller_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_rwops.h"
+#include "SDL_joystick.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_gamecontroller.h
+ *
+ *  In order to use these functions, SDL_Init() must have been called
+ *  with the ::SDL_INIT_GAMECONTROLLER flag.  This causes SDL to scan the system
+ *  for game controllers, and load appropriate drivers.
+ *
+ *  If you would like to receive controller updates while the application
+ *  is in the background, you should set the following hint before calling
+ *  SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
+ */
+
+/**
+ * The gamecontroller structure used to identify an SDL game controller
+ */
+struct _SDL_GameController;
+typedef struct _SDL_GameController SDL_GameController;
+
+
+typedef enum
+{
+    SDL_CONTROLLER_BINDTYPE_NONE = 0,
+    SDL_CONTROLLER_BINDTYPE_BUTTON,
+    SDL_CONTROLLER_BINDTYPE_AXIS,
+    SDL_CONTROLLER_BINDTYPE_HAT
+} SDL_GameControllerBindType;
+
+/**
+ *  Get the SDL joystick layer binding for this controller button/axis mapping
+ */
+typedef struct SDL_GameControllerButtonBind
+{
+    SDL_GameControllerBindType bindType;
+    union
+    {
+        int button;
+        int axis;
+        struct {
+            int hat;
+            int hat_mask;
+        } hat;
+    } value;
+
+} SDL_GameControllerButtonBind;
+
+
+/**
+ *  To count the number of game controllers in the system for the following:
+ *  int nJoysticks = SDL_NumJoysticks();
+ *  int nGameControllers = 0;
+ *  for (int i = 0; i < nJoysticks; i++) {
+ *      if (SDL_IsGameController(i)) {
+ *          nGameControllers++;
+ *      }
+ *  }
+ *
+ *  Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping() you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is:
+ *  guid,name,mappings
+ *
+ *  Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones.
+ *  Under Windows there is a reserved GUID of "xinput" that covers any XInput devices.
+ *  The mapping format for joystick is:
+ *      bX - a joystick button, index X
+ *      hX.Y - hat X with value Y
+ *      aX - axis X of the joystick
+ *  Buttons can be used as a controller axis and vice versa.
+ *
+ *  This string shows an example of a valid mapping for a controller
+ *  "03000000341a00003608000000000000,PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7",
+ *
+ */
+
+/**
+ *  Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform()
+ *  A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt
+ *
+ *  If \c freerw is non-zero, the stream will be closed after being read.
+ * 
+ * \return number of mappings added, -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW(SDL_RWops * rw, int freerw);
+
+/**
+ *  Load a set of mappings from a file, filtered by the current SDL_GetPlatform()
+ *
+ *  Convenience macro.
+ */
+#define SDL_GameControllerAddMappingsFromFile(file)   SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1)
+
+/**
+ *  Add or update an existing mapping configuration
+ *
+ * \return 1 if mapping is added, 0 if updated, -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping(const char* mappingString);
+
+/**
+ *  Get the number of mappings installed
+ *
+ *  \return the number of mappings
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerNumMappings(void);
+
+/**
+ *  Get the mapping at a particular index.
+ *
+ *  \return the mapping string.  Must be freed with SDL_free().  Returns NULL if the index is out of range.
+ */
+extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForIndex(int mapping_index);
+
+/**
+ *  Get a mapping string for a GUID
+ *
+ *  \return the mapping string.  Must be freed with SDL_free().  Returns NULL if no mapping is available
+ */
+extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID(SDL_JoystickGUID guid);
+
+/**
+ *  Get a mapping string for an open GameController
+ *
+ *  \return the mapping string.  Must be freed with SDL_free().  Returns NULL if no mapping is available
+ */
+extern DECLSPEC char * SDLCALL SDL_GameControllerMapping(SDL_GameController * gamecontroller);
+
+/**
+ *  Is the joystick on this index supported by the game controller interface?
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index);
+
+/**
+ *  Get the implementation dependent name of a game controller.
+ *  This can be called before any controllers are opened.
+ *  If no name can be found, this function returns NULL.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index);
+
+/**
+ *  Get the mapping of a game controller.
+ *  This can be called before any controllers are opened.
+ *
+ *  \return the mapping string.  Must be freed with SDL_free().  Returns NULL if no mapping is available
+ */
+extern DECLSPEC char *SDLCALL SDL_GameControllerMappingForDeviceIndex(int joystick_index);
+
+/**
+ *  Open a game controller for use.
+ *  The index passed as an argument refers to the N'th game controller on the system.
+ *  This index is not the value which will identify this controller in future
+ *  controller events.  The joystick's instance id (::SDL_JoystickID) will be
+ *  used there instead.
+ *
+ *  \return A controller identifier, or NULL if an error occurred.
+ */
+extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index);
+
+/**
+ * Return the SDL_GameController associated with an instance id.
+ */
+extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerFromInstanceID(SDL_JoystickID joyid);
+
+/**
+ *  Return the name for this currently opened controller
+ */
+extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller);
+
+/**
+ *  Get the player index of an opened game controller, or -1 if it's not available
+ *
+ *  For XInput controllers this returns the XInput user index.
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerGetPlayerIndex(SDL_GameController *gamecontroller);
+
+/**
+ *  Get the USB vendor ID of an opened controller, if available.
+ *  If the vendor ID isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetVendor(SDL_GameController * gamecontroller);
+
+/**
+ *  Get the USB product ID of an opened controller, if available.
+ *  If the product ID isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProduct(SDL_GameController * gamecontroller);
+
+/**
+ *  Get the product version of an opened controller, if available.
+ *  If the product version isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_GameControllerGetProductVersion(SDL_GameController * gamecontroller);
+
+/**
+ *  Returns SDL_TRUE if the controller has been opened and currently connected,
+ *  or SDL_FALSE if it has not.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller);
+
+/**
+ *  Get the underlying joystick object used by a controller
+ */
+extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller);
+
+/**
+ *  Enable/disable controller event polling.
+ *
+ *  If controller events are disabled, you must call SDL_GameControllerUpdate()
+ *  yourself and check the state of the controller when you want controller
+ *  information.
+ *
+ *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state);
+
+/**
+ *  Update the current state of the open game controllers.
+ *
+ *  This is called automatically by the event loop if any game controller
+ *  events are enabled.
+ */
+extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void);
+
+
+/**
+ *  The list of axes available from a controller
+ *
+ *  Thumbstick axis values range from SDL_JOYSTICK_AXIS_MIN to SDL_JOYSTICK_AXIS_MAX,
+ *  and are centered within ~8000 of zero, though advanced UI will allow users to set
+ *  or autodetect the dead zone, which varies between controllers.
+ *
+ *  Trigger axis values range from 0 to SDL_JOYSTICK_AXIS_MAX.
+ */
+typedef enum
+{
+    SDL_CONTROLLER_AXIS_INVALID = -1,
+    SDL_CONTROLLER_AXIS_LEFTX,
+    SDL_CONTROLLER_AXIS_LEFTY,
+    SDL_CONTROLLER_AXIS_RIGHTX,
+    SDL_CONTROLLER_AXIS_RIGHTY,
+    SDL_CONTROLLER_AXIS_TRIGGERLEFT,
+    SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
+    SDL_CONTROLLER_AXIS_MAX
+} SDL_GameControllerAxis;
+
+/**
+ *  turn this string into a axis mapping
+ */
+extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString);
+
+/**
+ *  turn this axis enum into a string mapping
+ */
+extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis);
+
+/**
+ *  Get the SDL joystick layer binding for this controller button mapping
+ */
+extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
+SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller,
+                                 SDL_GameControllerAxis axis);
+
+/**
+ *  Get the current state of an axis control on a game controller.
+ *
+ *  The state is a value ranging from -32768 to 32767 (except for the triggers,
+ *  which range from 0 to 32767).
+ *
+ *  The axis indices start at index 0.
+ */
+extern DECLSPEC Sint16 SDLCALL
+SDL_GameControllerGetAxis(SDL_GameController *gamecontroller,
+                          SDL_GameControllerAxis axis);
+
+/**
+ *  The list of buttons available from a controller
+ */
+typedef enum
+{
+    SDL_CONTROLLER_BUTTON_INVALID = -1,
+    SDL_CONTROLLER_BUTTON_A,
+    SDL_CONTROLLER_BUTTON_B,
+    SDL_CONTROLLER_BUTTON_X,
+    SDL_CONTROLLER_BUTTON_Y,
+    SDL_CONTROLLER_BUTTON_BACK,
+    SDL_CONTROLLER_BUTTON_GUIDE,
+    SDL_CONTROLLER_BUTTON_START,
+    SDL_CONTROLLER_BUTTON_LEFTSTICK,
+    SDL_CONTROLLER_BUTTON_RIGHTSTICK,
+    SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
+    SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
+    SDL_CONTROLLER_BUTTON_DPAD_UP,
+    SDL_CONTROLLER_BUTTON_DPAD_DOWN,
+    SDL_CONTROLLER_BUTTON_DPAD_LEFT,
+    SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
+    SDL_CONTROLLER_BUTTON_MAX
+} SDL_GameControllerButton;
+
+/**
+ *  turn this string into a button mapping
+ */
+extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString);
+
+/**
+ *  turn this button enum into a string mapping
+ */
+extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button);
+
+/**
+ *  Get the SDL joystick layer binding for this controller button mapping
+ */
+extern DECLSPEC SDL_GameControllerButtonBind SDLCALL
+SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller,
+                                   SDL_GameControllerButton button);
+
+
+/**
+ *  Get the current state of a button on a game controller.
+ *
+ *  The button indices start at index 0.
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller,
+                                                          SDL_GameControllerButton button);
+
+/**
+ *  Trigger a rumble effect
+ *  Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling.
+ *
+ *  \param gamecontroller The controller to vibrate
+ *  \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF
+ *  \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF
+ *  \param duration_ms The duration of the rumble effect, in milliseconds
+ *
+ *  \return 0, or -1 if rumble isn't supported on this joystick
+ */
+extern DECLSPEC int SDLCALL SDL_GameControllerRumble(SDL_GameController *gamecontroller, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms);
+
+/**
+ *  Close a controller previously opened with SDL_GameControllerOpen().
+ */
+extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_gamecontroller_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_gesture.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_gesture.h
new file mode 100644
index 0000000..9d25e9c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_gesture.h
@@ -0,0 +1,87 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_gesture.h
+ *
+ *  Include file for SDL gesture event handling.
+ */
+
+#ifndef SDL_gesture_h_
+#define SDL_gesture_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+
+#include "SDL_touch.h"
+
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef Sint64 SDL_GestureID;
+
+/* Function prototypes */
+
+/**
+ *  \brief Begin Recording a gesture on the specified touch, or all touches (-1)
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId);
+
+
+/**
+ *  \brief Save all currently loaded Dollar Gesture templates
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst);
+
+/**
+ *  \brief Save a currently loaded Dollar Gesture template
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst);
+
+
+/**
+ *  \brief Load Dollar Gesture templates from a file
+ *
+ *
+ */
+extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_gesture_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_haptic.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_haptic.h
new file mode 100644
index 0000000..0756276
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_haptic.h
@@ -0,0 +1,1238 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_haptic.h
+ *
+ *  \brief The SDL haptic subsystem allows you to control haptic (force feedback)
+ *         devices.
+ *
+ *  The basic usage is as follows:
+ *   - Initialize the subsystem (::SDL_INIT_HAPTIC).
+ *   - Open a haptic device.
+ *    - SDL_HapticOpen() to open from index.
+ *    - SDL_HapticOpenFromJoystick() to open from an existing joystick.
+ *   - Create an effect (::SDL_HapticEffect).
+ *   - Upload the effect with SDL_HapticNewEffect().
+ *   - Run the effect with SDL_HapticRunEffect().
+ *   - (optional) Free the effect with SDL_HapticDestroyEffect().
+ *   - Close the haptic device with SDL_HapticClose().
+ *
+ * \par Simple rumble example:
+ * \code
+ *    SDL_Haptic *haptic;
+ *
+ *    // Open the device
+ *    haptic = SDL_HapticOpen( 0 );
+ *    if (haptic == NULL)
+ *       return -1;
+ *
+ *    // Initialize simple rumble
+ *    if (SDL_HapticRumbleInit( haptic ) != 0)
+ *       return -1;
+ *
+ *    // Play effect at 50% strength for 2 seconds
+ *    if (SDL_HapticRumblePlay( haptic, 0.5, 2000 ) != 0)
+ *       return -1;
+ *    SDL_Delay( 2000 );
+ *
+ *    // Clean up
+ *    SDL_HapticClose( haptic );
+ * \endcode
+ *
+ * \par Complete example:
+ * \code
+ * int test_haptic( SDL_Joystick * joystick ) {
+ *    SDL_Haptic *haptic;
+ *    SDL_HapticEffect effect;
+ *    int effect_id;
+ *
+ *    // Open the device
+ *    haptic = SDL_HapticOpenFromJoystick( joystick );
+ *    if (haptic == NULL) return -1; // Most likely joystick isn't haptic
+ *
+ *    // See if it can do sine waves
+ *    if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) {
+ *       SDL_HapticClose(haptic); // No sine effect
+ *       return -1;
+ *    }
+ *
+ *    // Create the effect
+ *    memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default
+ *    effect.type = SDL_HAPTIC_SINE;
+ *    effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates
+ *    effect.periodic.direction.dir[0] = 18000; // Force comes from south
+ *    effect.periodic.period = 1000; // 1000 ms
+ *    effect.periodic.magnitude = 20000; // 20000/32767 strength
+ *    effect.periodic.length = 5000; // 5 seconds long
+ *    effect.periodic.attack_length = 1000; // Takes 1 second to get max strength
+ *    effect.periodic.fade_length = 1000; // Takes 1 second to fade away
+ *
+ *    // Upload the effect
+ *    effect_id = SDL_HapticNewEffect( haptic, &effect );
+ *
+ *    // Test the effect
+ *    SDL_HapticRunEffect( haptic, effect_id, 1 );
+ *    SDL_Delay( 5000); // Wait for the effect to finish
+ *
+ *    // We destroy the effect, although closing the device also does this
+ *    SDL_HapticDestroyEffect( haptic, effect_id );
+ *
+ *    // Close the device
+ *    SDL_HapticClose(haptic);
+ *
+ *    return 0; // Success
+ * }
+ * \endcode
+ */
+
+#ifndef SDL_haptic_h_
+#define SDL_haptic_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_joystick.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/* FIXME: For SDL 2.1, adjust all the magnitude variables to be Uint16 (0xFFFF).
+ *
+ * At the moment the magnitude variables are mixed between signed/unsigned, and
+ * it is also not made clear that ALL of those variables expect a max of 0x7FFF.
+ *
+ * Some platforms may have higher precision than that (Linux FF, Windows XInput)
+ * so we should fix the inconsistency in favor of higher possible precision,
+ * adjusting for platforms that use different scales.
+ * -flibit
+ */
+
+/**
+ *  \typedef SDL_Haptic
+ *
+ *  \brief The haptic structure used to identify an SDL haptic.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticOpenFromJoystick
+ *  \sa SDL_HapticClose
+ */
+struct _SDL_Haptic;
+typedef struct _SDL_Haptic SDL_Haptic;
+
+
+/**
+ *  \name Haptic features
+ *
+ *  Different haptic features a device can have.
+ */
+/* @{ */
+
+/**
+ *  \name Haptic effects
+ */
+/* @{ */
+
+/**
+ *  \brief Constant effect supported.
+ *
+ *  Constant haptic effect.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_CONSTANT   (1u<<0)
+
+/**
+ *  \brief Sine wave effect supported.
+ *
+ *  Periodic haptic effect that simulates sine waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_SINE       (1u<<1)
+
+/**
+ *  \brief Left/Right effect supported.
+ *
+ *  Haptic effect for direct control over high/low frequency motors.
+ *
+ *  \sa SDL_HapticLeftRight
+ * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry,
+ *          we ran out of bits, and this is important for XInput devices.
+ */
+#define SDL_HAPTIC_LEFTRIGHT     (1u<<2)
+
+/* !!! FIXME: put this back when we have more bits in 2.1 */
+/* #define SDL_HAPTIC_SQUARE     (1<<2) */
+
+/**
+ *  \brief Triangle wave effect supported.
+ *
+ *  Periodic haptic effect that simulates triangular waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_TRIANGLE   (1u<<3)
+
+/**
+ *  \brief Sawtoothup wave effect supported.
+ *
+ *  Periodic haptic effect that simulates saw tooth up waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_SAWTOOTHUP (1u<<4)
+
+/**
+ *  \brief Sawtoothdown wave effect supported.
+ *
+ *  Periodic haptic effect that simulates saw tooth down waves.
+ *
+ *  \sa SDL_HapticPeriodic
+ */
+#define SDL_HAPTIC_SAWTOOTHDOWN (1u<<5)
+
+/**
+ *  \brief Ramp effect supported.
+ *
+ *  Ramp haptic effect.
+ *
+ *  \sa SDL_HapticRamp
+ */
+#define SDL_HAPTIC_RAMP       (1u<<6)
+
+/**
+ *  \brief Spring effect supported - uses axes position.
+ *
+ *  Condition haptic effect that simulates a spring.  Effect is based on the
+ *  axes position.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_SPRING     (1u<<7)
+
+/**
+ *  \brief Damper effect supported - uses axes velocity.
+ *
+ *  Condition haptic effect that simulates dampening.  Effect is based on the
+ *  axes velocity.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_DAMPER     (1u<<8)
+
+/**
+ *  \brief Inertia effect supported - uses axes acceleration.
+ *
+ *  Condition haptic effect that simulates inertia.  Effect is based on the axes
+ *  acceleration.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_INERTIA    (1u<<9)
+
+/**
+ *  \brief Friction effect supported - uses axes movement.
+ *
+ *  Condition haptic effect that simulates friction.  Effect is based on the
+ *  axes movement.
+ *
+ *  \sa SDL_HapticCondition
+ */
+#define SDL_HAPTIC_FRICTION   (1u<<10)
+
+/**
+ *  \brief Custom effect is supported.
+ *
+ *  User defined custom haptic effect.
+ */
+#define SDL_HAPTIC_CUSTOM     (1u<<11)
+
+/* @} *//* Haptic effects */
+
+/* These last few are features the device has, not effects */
+
+/**
+ *  \brief Device can set global gain.
+ *
+ *  Device supports setting the global gain.
+ *
+ *  \sa SDL_HapticSetGain
+ */
+#define SDL_HAPTIC_GAIN       (1u<<12)
+
+/**
+ *  \brief Device can set autocenter.
+ *
+ *  Device supports setting autocenter.
+ *
+ *  \sa SDL_HapticSetAutocenter
+ */
+#define SDL_HAPTIC_AUTOCENTER (1u<<13)
+
+/**
+ *  \brief Device can be queried for effect status.
+ *
+ *  Device supports querying effect status.
+ *
+ *  \sa SDL_HapticGetEffectStatus
+ */
+#define SDL_HAPTIC_STATUS     (1u<<14)
+
+/**
+ *  \brief Device can be paused.
+ *
+ *  Devices supports being paused.
+ *
+ *  \sa SDL_HapticPause
+ *  \sa SDL_HapticUnpause
+ */
+#define SDL_HAPTIC_PAUSE      (1u<<15)
+
+
+/**
+ * \name Direction encodings
+ */
+/* @{ */
+
+/**
+ *  \brief Uses polar coordinates for the direction.
+ *
+ *  \sa SDL_HapticDirection
+ */
+#define SDL_HAPTIC_POLAR      0
+
+/**
+ *  \brief Uses cartesian coordinates for the direction.
+ *
+ *  \sa SDL_HapticDirection
+ */
+#define SDL_HAPTIC_CARTESIAN  1
+
+/**
+ *  \brief Uses spherical coordinates for the direction.
+ *
+ *  \sa SDL_HapticDirection
+ */
+#define SDL_HAPTIC_SPHERICAL  2
+
+/* @} *//* Direction encodings */
+
+/* @} *//* Haptic features */
+
+/*
+ * Misc defines.
+ */
+
+/**
+ * \brief Used to play a device an infinite number of times.
+ *
+ * \sa SDL_HapticRunEffect
+ */
+#define SDL_HAPTIC_INFINITY   4294967295U
+
+
+/**
+ *  \brief Structure that represents a haptic direction.
+ *
+ *  This is the direction where the force comes from,
+ *  instead of the direction in which the force is exerted.
+ *
+ *  Directions can be specified by:
+ *   - ::SDL_HAPTIC_POLAR : Specified by polar coordinates.
+ *   - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates.
+ *   - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates.
+ *
+ *  Cardinal directions of the haptic device are relative to the positioning
+ *  of the device.  North is considered to be away from the user.
+ *
+ *  The following diagram represents the cardinal directions:
+ *  \verbatim
+                 .--.
+                 |__| .-------.
+                 |=.| |.-----.|
+                 |--| ||     ||
+                 |  | |'-----'|
+                 |__|~')_____('
+                   [ COMPUTER ]
+
+
+                     North (0,-1)
+                         ^
+                         |
+                         |
+   (-1,0)  West <----[ HAPTIC ]----> East (1,0)
+                         |
+                         |
+                         v
+                      South (0,1)
+
+
+                      [ USER ]
+                        \|||/
+                        (o o)
+                  ---ooO-(_)-Ooo---
+    \endverbatim
+ *
+ *  If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a
+ *  degree starting north and turning clockwise.  ::SDL_HAPTIC_POLAR only uses
+ *  the first \c dir parameter.  The cardinal directions would be:
+ *   - North: 0 (0 degrees)
+ *   - East: 9000 (90 degrees)
+ *   - South: 18000 (180 degrees)
+ *   - West: 27000 (270 degrees)
+ *
+ *  If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions
+ *  (X axis, Y axis and Z axis (with 3 axes)).  ::SDL_HAPTIC_CARTESIAN uses
+ *  the first three \c dir parameters.  The cardinal directions would be:
+ *   - North:  0,-1, 0
+ *   - East:   1, 0, 0
+ *   - South:  0, 1, 0
+ *   - West:  -1, 0, 0
+ *
+ *  The Z axis represents the height of the effect if supported, otherwise
+ *  it's unused.  In cartesian encoding (1, 2) would be the same as (2, 4), you
+ *  can use any multiple you want, only the direction matters.
+ *
+ *  If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations.
+ *  The first two \c dir parameters are used.  The \c dir parameters are as
+ *  follows (all values are in hundredths of degrees):
+ *   - Degrees from (1, 0) rotated towards (0, 1).
+ *   - Degrees towards (0, 0, 1) (device needs at least 3 axes).
+ *
+ *
+ *  Example of force coming from the south with all encodings (force coming
+ *  from the south means the user will have to pull the stick to counteract):
+ *  \code
+ *  SDL_HapticDirection direction;
+ *
+ *  // Cartesian directions
+ *  direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding.
+ *  direction.dir[0] = 0; // X position
+ *  direction.dir[1] = 1; // Y position
+ *  // Assuming the device has 2 axes, we don't need to specify third parameter.
+ *
+ *  // Polar directions
+ *  direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding.
+ *  direction.dir[0] = 18000; // Polar only uses first parameter
+ *
+ *  // Spherical coordinates
+ *  direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding
+ *  direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters.
+ *  \endcode
+ *
+ *  \sa SDL_HAPTIC_POLAR
+ *  \sa SDL_HAPTIC_CARTESIAN
+ *  \sa SDL_HAPTIC_SPHERICAL
+ *  \sa SDL_HapticEffect
+ *  \sa SDL_HapticNumAxes
+ */
+typedef struct SDL_HapticDirection
+{
+    Uint8 type;         /**< The type of encoding. */
+    Sint32 dir[3];      /**< The encoded direction. */
+} SDL_HapticDirection;
+
+
+/**
+ *  \brief A structure containing a template for a Constant effect.
+ *
+ *  This struct is exclusively for the ::SDL_HAPTIC_CONSTANT effect.
+ *
+ *  A constant effect applies a constant force in the specified direction
+ *  to the joystick.
+ *
+ *  \sa SDL_HAPTIC_CONSTANT
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticConstant
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_CONSTANT */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Constant */
+    Sint16 level;           /**< Strength of the constant effect. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length;     /**< Duration of the fade. */
+    Uint16 fade_level;      /**< Level at the end of the fade. */
+} SDL_HapticConstant;
+
+/**
+ *  \brief A structure containing a template for a Periodic effect.
+ *
+ *  The struct handles the following effects:
+ *   - ::SDL_HAPTIC_SINE
+ *   - ::SDL_HAPTIC_LEFTRIGHT
+ *   - ::SDL_HAPTIC_TRIANGLE
+ *   - ::SDL_HAPTIC_SAWTOOTHUP
+ *   - ::SDL_HAPTIC_SAWTOOTHDOWN
+ *
+ *  A periodic effect consists in a wave-shaped effect that repeats itself
+ *  over time.  The type determines the shape of the wave and the parameters
+ *  determine the dimensions of the wave.
+ *
+ *  Phase is given by hundredth of a degree meaning that giving the phase a value
+ *  of 9000 will displace it 25% of its period.  Here are sample values:
+ *   -     0: No phase displacement.
+ *   -  9000: Displaced 25% of its period.
+ *   - 18000: Displaced 50% of its period.
+ *   - 27000: Displaced 75% of its period.
+ *   - 36000: Displaced 100% of its period, same as 0, but 0 is preferred.
+ *
+ *  Examples:
+ *  \verbatim
+    SDL_HAPTIC_SINE
+      __      __      __      __
+     /  \    /  \    /  \    /
+    /    \__/    \__/    \__/
+
+    SDL_HAPTIC_SQUARE
+     __    __    __    __    __
+    |  |  |  |  |  |  |  |  |  |
+    |  |__|  |__|  |__|  |__|  |
+
+    SDL_HAPTIC_TRIANGLE
+      /\    /\    /\    /\    /\
+     /  \  /  \  /  \  /  \  /
+    /    \/    \/    \/    \/
+
+    SDL_HAPTIC_SAWTOOTHUP
+      /|  /|  /|  /|  /|  /|  /|
+     / | / | / | / | / | / | / |
+    /  |/  |/  |/  |/  |/  |/  |
+
+    SDL_HAPTIC_SAWTOOTHDOWN
+    \  |\  |\  |\  |\  |\  |\  |
+     \ | \ | \ | \ | \ | \ | \ |
+      \|  \|  \|  \|  \|  \|  \|
+    \endverbatim
+ *
+ *  \sa SDL_HAPTIC_SINE
+ *  \sa SDL_HAPTIC_LEFTRIGHT
+ *  \sa SDL_HAPTIC_TRIANGLE
+ *  \sa SDL_HAPTIC_SAWTOOTHUP
+ *  \sa SDL_HAPTIC_SAWTOOTHDOWN
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticPeriodic
+{
+    /* Header */
+    Uint16 type;        /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT,
+                             ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or
+                             ::SDL_HAPTIC_SAWTOOTHDOWN */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;      /**< Duration of the effect. */
+    Uint16 delay;       /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;      /**< Button that triggers the effect. */
+    Uint16 interval;    /**< How soon it can be triggered again after button. */
+
+    /* Periodic */
+    Uint16 period;      /**< Period of the wave. */
+    Sint16 magnitude;   /**< Peak value; if negative, equivalent to 180 degrees extra phase shift. */
+    Sint16 offset;      /**< Mean value of the wave. */
+    Uint16 phase;       /**< Positive phase shift given by hundredth of a degree. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length; /**< Duration of the fade. */
+    Uint16 fade_level;  /**< Level at the end of the fade. */
+} SDL_HapticPeriodic;
+
+/**
+ *  \brief A structure containing a template for a Condition effect.
+ *
+ *  The struct handles the following effects:
+ *   - ::SDL_HAPTIC_SPRING: Effect based on axes position.
+ *   - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity.
+ *   - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration.
+ *   - ::SDL_HAPTIC_FRICTION: Effect based on axes movement.
+ *
+ *  Direction is handled by condition internals instead of a direction member.
+ *  The condition effect specific members have three parameters.  The first
+ *  refers to the X axis, the second refers to the Y axis and the third
+ *  refers to the Z axis.  The right terms refer to the positive side of the
+ *  axis and the left terms refer to the negative side of the axis.  Please
+ *  refer to the ::SDL_HapticDirection diagram for which side is positive and
+ *  which is negative.
+ *
+ *  \sa SDL_HapticDirection
+ *  \sa SDL_HAPTIC_SPRING
+ *  \sa SDL_HAPTIC_DAMPER
+ *  \sa SDL_HAPTIC_INERTIA
+ *  \sa SDL_HAPTIC_FRICTION
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticCondition
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER,
+                                 ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */
+    SDL_HapticDirection direction;  /**< Direction of the effect - Not used ATM. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Condition */
+    Uint16 right_sat[3];    /**< Level when joystick is to the positive side; max 0xFFFF. */
+    Uint16 left_sat[3];     /**< Level when joystick is to the negative side; max 0xFFFF. */
+    Sint16 right_coeff[3];  /**< How fast to increase the force towards the positive side. */
+    Sint16 left_coeff[3];   /**< How fast to increase the force towards the negative side. */
+    Uint16 deadband[3];     /**< Size of the dead zone; max 0xFFFF: whole axis-range when 0-centered. */
+    Sint16 center[3];       /**< Position of the dead zone. */
+} SDL_HapticCondition;
+
+/**
+ *  \brief A structure containing a template for a Ramp effect.
+ *
+ *  This struct is exclusively for the ::SDL_HAPTIC_RAMP effect.
+ *
+ *  The ramp effect starts at start strength and ends at end strength.
+ *  It augments in linear fashion.  If you use attack and fade with a ramp
+ *  the effects get added to the ramp effect making the effect become
+ *  quadratic instead of linear.
+ *
+ *  \sa SDL_HAPTIC_RAMP
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticRamp
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_RAMP */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Ramp */
+    Sint16 start;           /**< Beginning strength level. */
+    Sint16 end;             /**< Ending strength level. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length;     /**< Duration of the fade. */
+    Uint16 fade_level;      /**< Level at the end of the fade. */
+} SDL_HapticRamp;
+
+/**
+ * \brief A structure containing a template for a Left/Right effect.
+ *
+ * This struct is exclusively for the ::SDL_HAPTIC_LEFTRIGHT effect.
+ *
+ * The Left/Right effect is used to explicitly control the large and small
+ * motors, commonly found in modern game controllers. The small (right) motor
+ * is high frequency, and the large (left) motor is low frequency.
+ *
+ * \sa SDL_HAPTIC_LEFTRIGHT
+ * \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticLeftRight
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_LEFTRIGHT */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect in milliseconds. */
+
+    /* Rumble */
+    Uint16 large_magnitude; /**< Control of the large controller motor. */
+    Uint16 small_magnitude; /**< Control of the small controller motor. */
+} SDL_HapticLeftRight;
+
+/**
+ *  \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
+ *
+ *  This struct is exclusively for the ::SDL_HAPTIC_CUSTOM effect.
+ *
+ *  A custom force feedback effect is much like a periodic effect, where the
+ *  application can define its exact shape.  You will have to allocate the
+ *  data yourself.  Data should consist of channels * samples Uint16 samples.
+ *
+ *  If channels is one, the effect is rotated using the defined direction.
+ *  Otherwise it uses the samples in data for the different axes.
+ *
+ *  \sa SDL_HAPTIC_CUSTOM
+ *  \sa SDL_HapticEffect
+ */
+typedef struct SDL_HapticCustom
+{
+    /* Header */
+    Uint16 type;            /**< ::SDL_HAPTIC_CUSTOM */
+    SDL_HapticDirection direction;  /**< Direction of the effect. */
+
+    /* Replay */
+    Uint32 length;          /**< Duration of the effect. */
+    Uint16 delay;           /**< Delay before starting the effect. */
+
+    /* Trigger */
+    Uint16 button;          /**< Button that triggers the effect. */
+    Uint16 interval;        /**< How soon it can be triggered again after button. */
+
+    /* Custom */
+    Uint8 channels;         /**< Axes to use, minimum of one. */
+    Uint16 period;          /**< Sample periods. */
+    Uint16 samples;         /**< Amount of samples. */
+    Uint16 *data;           /**< Should contain channels*samples items. */
+
+    /* Envelope */
+    Uint16 attack_length;   /**< Duration of the attack. */
+    Uint16 attack_level;    /**< Level at the start of the attack. */
+    Uint16 fade_length;     /**< Duration of the fade. */
+    Uint16 fade_level;      /**< Level at the end of the fade. */
+} SDL_HapticCustom;
+
+/**
+ *  \brief The generic template for any haptic effect.
+ *
+ *  All values max at 32767 (0x7FFF).  Signed values also can be negative.
+ *  Time values unless specified otherwise are in milliseconds.
+ *
+ *  You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767
+ *  value.  Neither delay, interval, attack_length nor fade_length support
+ *  ::SDL_HAPTIC_INFINITY.  Fade will also not be used since effect never ends.
+ *
+ *  Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of
+ *  ::SDL_HAPTIC_INFINITY.
+ *
+ *  Button triggers may not be supported on all devices, it is advised to not
+ *  use them if possible.  Buttons start at index 1 instead of index 0 like
+ *  the joystick.
+ *
+ *  If both attack_length and fade_level are 0, the envelope is not used,
+ *  otherwise both values are used.
+ *
+ *  Common parts:
+ *  \code
+ *  // Replay - All effects have this
+ *  Uint32 length;        // Duration of effect (ms).
+ *  Uint16 delay;         // Delay before starting effect.
+ *
+ *  // Trigger - All effects have this
+ *  Uint16 button;        // Button that triggers effect.
+ *  Uint16 interval;      // How soon before effect can be triggered again.
+ *
+ *  // Envelope - All effects except condition effects have this
+ *  Uint16 attack_length; // Duration of the attack (ms).
+ *  Uint16 attack_level;  // Level at the start of the attack.
+ *  Uint16 fade_length;   // Duration of the fade out (ms).
+ *  Uint16 fade_level;    // Level at the end of the fade.
+ *  \endcode
+ *
+ *
+ *  Here we have an example of a constant effect evolution in time:
+ *  \verbatim
+    Strength
+    ^
+    |
+    |    effect level -->  _________________
+    |                     /                 \
+    |                    /                   \
+    |                   /                     \
+    |                  /                       \
+    | attack_level --> |                        \
+    |                  |                        |  <---  fade_level
+    |
+    +--------------------------------------------------> Time
+                       [--]                 [---]
+                       attack_length        fade_length
+
+    [------------------][-----------------------]
+    delay               length
+    \endverbatim
+ *
+ *  Note either the attack_level or the fade_level may be above the actual
+ *  effect level.
+ *
+ *  \sa SDL_HapticConstant
+ *  \sa SDL_HapticPeriodic
+ *  \sa SDL_HapticCondition
+ *  \sa SDL_HapticRamp
+ *  \sa SDL_HapticLeftRight
+ *  \sa SDL_HapticCustom
+ */
+typedef union SDL_HapticEffect
+{
+    /* Common for all force feedback effects */
+    Uint16 type;                    /**< Effect type. */
+    SDL_HapticConstant constant;    /**< Constant effect. */
+    SDL_HapticPeriodic periodic;    /**< Periodic effect. */
+    SDL_HapticCondition condition;  /**< Condition effect. */
+    SDL_HapticRamp ramp;            /**< Ramp effect. */
+    SDL_HapticLeftRight leftright;  /**< Left/Right effect. */
+    SDL_HapticCustom custom;        /**< Custom effect. */
+} SDL_HapticEffect;
+
+
+/* Function prototypes */
+/**
+ *  \brief Count the number of haptic devices attached to the system.
+ *
+ *  \return Number of haptic devices detected on the system.
+ */
+extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
+
+/**
+ *  \brief Get the implementation dependent name of a haptic device.
+ *
+ *  This can be called before any joysticks are opened.
+ *  If no name can be found, this function returns NULL.
+ *
+ *  \param device_index Index of the device to get its name.
+ *  \return Name of the device or NULL on error.
+ *
+ *  \sa SDL_NumHaptics
+ */
+extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index);
+
+/**
+ *  \brief Opens a haptic device for use.
+ *
+ *  The index passed as an argument refers to the N'th haptic device on this
+ *  system.
+ *
+ *  When opening a haptic device, its gain will be set to maximum and
+ *  autocenter will be disabled.  To modify these values use
+ *  SDL_HapticSetGain() and SDL_HapticSetAutocenter().
+ *
+ *  \param device_index Index of the device to open.
+ *  \return Device identifier or NULL on error.
+ *
+ *  \sa SDL_HapticIndex
+ *  \sa SDL_HapticOpenFromMouse
+ *  \sa SDL_HapticOpenFromJoystick
+ *  \sa SDL_HapticClose
+ *  \sa SDL_HapticSetGain
+ *  \sa SDL_HapticSetAutocenter
+ *  \sa SDL_HapticPause
+ *  \sa SDL_HapticStopAll
+ */
+extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index);
+
+/**
+ *  \brief Checks if the haptic device at index has been opened.
+ *
+ *  \param device_index Index to check to see if it has been opened.
+ *  \return 1 if it has been opened or 0 if it hasn't.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticIndex
+ */
+extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index);
+
+/**
+ *  \brief Gets the index of a haptic device.
+ *
+ *  \param haptic Haptic device to get the index of.
+ *  \return The index of the haptic device or -1 on error.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticOpened
+ */
+extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic);
+
+/**
+ *  \brief Gets whether or not the current mouse has haptic capabilities.
+ *
+ *  \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't.
+ *
+ *  \sa SDL_HapticOpenFromMouse
+ */
+extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void);
+
+/**
+ *  \brief Tries to open a haptic device from the current mouse.
+ *
+ *  \return The haptic device identifier or NULL on error.
+ *
+ *  \sa SDL_MouseIsHaptic
+ *  \sa SDL_HapticOpen
+ */
+extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void);
+
+/**
+ *  \brief Checks to see if a joystick has haptic features.
+ *
+ *  \param joystick Joystick to test for haptic capabilities.
+ *  \return SDL_TRUE if the joystick is haptic, SDL_FALSE if it isn't
+ *          or -1 if an error occurred.
+ *
+ *  \sa SDL_HapticOpenFromJoystick
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
+
+/**
+ *  \brief Opens a haptic device for use from a joystick device.
+ *
+ *  You must still close the haptic device separately.  It will not be closed
+ *  with the joystick.
+ *
+ *  When opening from a joystick you should first close the haptic device before
+ *  closing the joystick device.  If not, on some implementations the haptic
+ *  device will also get unallocated and you'll be unable to use force feedback
+ *  on that device.
+ *
+ *  \param joystick Joystick to create a haptic device from.
+ *  \return A valid haptic device identifier on success or NULL on error.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticClose
+ */
+extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick *
+                                                               joystick);
+
+/**
+ *  \brief Closes a haptic device previously opened with SDL_HapticOpen().
+ *
+ *  \param haptic Haptic device to close.
+ */
+extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic);
+
+/**
+ *  \brief Returns the number of effects a haptic device can store.
+ *
+ *  On some platforms this isn't fully supported, and therefore is an
+ *  approximation.  Always check to see if your created effect was actually
+ *  created and do not rely solely on SDL_HapticNumEffects().
+ *
+ *  \param haptic The haptic device to query effect max.
+ *  \return The number of effects the haptic device can store or
+ *          -1 on error.
+ *
+ *  \sa SDL_HapticNumEffectsPlaying
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic);
+
+/**
+ *  \brief Returns the number of effects a haptic device can play at the same
+ *         time.
+ *
+ *  This is not supported on all platforms, but will always return a value.
+ *  Added here for the sake of completeness.
+ *
+ *  \param haptic The haptic device to query maximum playing effects.
+ *  \return The number of effects the haptic device can play at the same time
+ *          or -1 on error.
+ *
+ *  \sa SDL_HapticNumEffects
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic);
+
+/**
+ *  \brief Gets the haptic device's supported features in bitwise manner.
+ *
+ *  Example:
+ *  \code
+ *  if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) {
+ *      printf("We have constant haptic effect!\n");
+ *  }
+ *  \endcode
+ *
+ *  \param haptic The haptic device to query.
+ *  \return Haptic features in bitwise manner (OR'd).
+ *
+ *  \sa SDL_HapticNumEffects
+ *  \sa SDL_HapticEffectSupported
+ */
+extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic);
+
+
+/**
+ *  \brief Gets the number of haptic axes the device has.
+ *
+ *  \sa SDL_HapticDirection
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic);
+
+/**
+ *  \brief Checks to see if effect is supported by haptic.
+ *
+ *  \param haptic Haptic device to check on.
+ *  \param effect Effect to check to see if it is supported.
+ *  \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error.
+ *
+ *  \sa SDL_HapticQuery
+ *  \sa SDL_HapticNewEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic,
+                                                      SDL_HapticEffect *
+                                                      effect);
+
+/**
+ *  \brief Creates a new haptic effect on the device.
+ *
+ *  \param haptic Haptic device to create the effect on.
+ *  \param effect Properties of the effect to create.
+ *  \return The identifier of the effect on success or -1 on error.
+ *
+ *  \sa SDL_HapticUpdateEffect
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticDestroyEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic,
+                                                SDL_HapticEffect * effect);
+
+/**
+ *  \brief Updates the properties of an effect.
+ *
+ *  Can be used dynamically, although behavior when dynamically changing
+ *  direction may be strange.  Specifically the effect may reupload itself
+ *  and start playing from the start.  You cannot change the type either when
+ *  running SDL_HapticUpdateEffect().
+ *
+ *  \param haptic Haptic device that has the effect.
+ *  \param effect Identifier of the effect to update.
+ *  \param data New effect properties to use.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticNewEffect
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticDestroyEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic,
+                                                   int effect,
+                                                   SDL_HapticEffect * data);
+
+/**
+ *  \brief Runs the haptic effect on its associated haptic device.
+ *
+ *  If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over
+ *  repeating the envelope (attack and fade) every time.  If you only want the
+ *  effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length
+ *  parameter.
+ *
+ *  \param haptic Haptic device to run the effect on.
+ *  \param effect Identifier of the haptic effect to run.
+ *  \param iterations Number of iterations to run the effect. Use
+ *         ::SDL_HAPTIC_INFINITY for infinity.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticStopEffect
+ *  \sa SDL_HapticDestroyEffect
+ *  \sa SDL_HapticGetEffectStatus
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic,
+                                                int effect,
+                                                Uint32 iterations);
+
+/**
+ *  \brief Stops the haptic effect on its associated haptic device.
+ *
+ *  \param haptic Haptic device to stop the effect on.
+ *  \param effect Identifier of the effect to stop.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticDestroyEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic,
+                                                 int effect);
+
+/**
+ *  \brief Destroys a haptic effect on the device.
+ *
+ *  This will stop the effect if it's running.  Effects are automatically
+ *  destroyed when the device is closed.
+ *
+ *  \param haptic Device to destroy the effect on.
+ *  \param effect Identifier of the effect to destroy.
+ *
+ *  \sa SDL_HapticNewEffect
+ */
+extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic,
+                                                     int effect);
+
+/**
+ *  \brief Gets the status of the current effect on the haptic device.
+ *
+ *  Device must support the ::SDL_HAPTIC_STATUS feature.
+ *
+ *  \param haptic Haptic device to query the effect status on.
+ *  \param effect Identifier of the effect to query its status.
+ *  \return 0 if it isn't playing, 1 if it is playing or -1 on error.
+ *
+ *  \sa SDL_HapticRunEffect
+ *  \sa SDL_HapticStopEffect
+ */
+extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic,
+                                                      int effect);
+
+/**
+ *  \brief Sets the global gain of the device.
+ *
+ *  Device must support the ::SDL_HAPTIC_GAIN feature.
+ *
+ *  The user may specify the maximum gain by setting the environment variable
+ *  SDL_HAPTIC_GAIN_MAX which should be between 0 and 100.  All calls to
+ *  SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the
+ *  maximum.
+ *
+ *  \param haptic Haptic device to set the gain on.
+ *  \param gain Value to set the gain to, should be between 0 and 100.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
+
+/**
+ *  \brief Sets the global autocenter of the device.
+ *
+ *  Autocenter should be between 0 and 100.  Setting it to 0 will disable
+ *  autocentering.
+ *
+ *  Device must support the ::SDL_HAPTIC_AUTOCENTER feature.
+ *
+ *  \param haptic Haptic device to set autocentering on.
+ *  \param autocenter Value to set autocenter to, 0 disables autocentering.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticQuery
+ */
+extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic,
+                                                    int autocenter);
+
+/**
+ *  \brief Pauses a haptic device.
+ *
+ *  Device must support the ::SDL_HAPTIC_PAUSE feature.  Call
+ *  SDL_HapticUnpause() to resume playback.
+ *
+ *  Do not modify the effects nor add new ones while the device is paused.
+ *  That can cause all sorts of weird errors.
+ *
+ *  \param haptic Haptic device to pause.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticUnpause
+ */
+extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic);
+
+/**
+ *  \brief Unpauses a haptic device.
+ *
+ *  Call to unpause after SDL_HapticPause().
+ *
+ *  \param haptic Haptic device to unpause.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticPause
+ */
+extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic);
+
+/**
+ *  \brief Stops all the currently playing effects on a haptic device.
+ *
+ *  \param haptic Haptic device to stop.
+ *  \return 0 on success or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic);
+
+/**
+ *  \brief Checks to see if rumble is supported on a haptic device.
+ *
+ *  \param haptic Haptic device to check to see if it supports rumble.
+ *  \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error.
+ *
+ *  \sa SDL_HapticRumbleInit
+ *  \sa SDL_HapticRumblePlay
+ *  \sa SDL_HapticRumbleStop
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic);
+
+/**
+ *  \brief Initializes the haptic device for simple rumble playback.
+ *
+ *  \param haptic Haptic device to initialize for simple rumble playback.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticOpen
+ *  \sa SDL_HapticRumbleSupported
+ *  \sa SDL_HapticRumblePlay
+ *  \sa SDL_HapticRumbleStop
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic);
+
+/**
+ *  \brief Runs simple rumble on a haptic device
+ *
+ *  \param haptic Haptic device to play rumble effect on.
+ *  \param strength Strength of the rumble to play as a 0-1 float value.
+ *  \param length Length of the rumble to play in milliseconds.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticRumbleSupported
+ *  \sa SDL_HapticRumbleInit
+ *  \sa SDL_HapticRumbleStop
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length );
+
+/**
+ *  \brief Stops the simple rumble on a haptic device.
+ *
+ *  \param haptic Haptic to stop the rumble on.
+ *  \return 0 on success or -1 on error.
+ *
+ *  \sa SDL_HapticRumbleSupported
+ *  \sa SDL_HapticRumbleInit
+ *  \sa SDL_HapticRumblePlay
+ */
+extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_haptic_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_hints.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_hints.h
new file mode 100644
index 0000000..8fa0dd6
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_hints.h
@@ -0,0 +1,1266 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_hints.h
+ *
+ *  Official documentation for SDL configuration variables
+ *
+ *  This file contains functions to set and get configuration hints,
+ *  as well as listing each of them alphabetically.
+ *
+ *  The convention for naming hints is SDL_HINT_X, where "SDL_X" is
+ *  the environment variable that can be used to override the default.
+ *
+ *  In general these hints are just that - they may or may not be
+ *  supported or applicable on any given platform, but they provide
+ *  a way for an application or user to give the library a hint as
+ *  to how they would like the library to work.
+ */
+
+#ifndef SDL_hints_h_
+#define SDL_hints_h_
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief  A variable controlling how 3D acceleration is used to accelerate the SDL screen surface.
+ *
+ *  SDL can try to accelerate the SDL screen surface by using streaming
+ *  textures with a 3D rendering engine.  This variable controls whether and
+ *  how this is done.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable 3D acceleration
+ *    "1"       - Enable 3D acceleration, using the default renderer.
+ *    "X"       - Enable 3D acceleration, using X where X is one of the valid rendering drivers.  (e.g. "direct3d", "opengl", etc.)
+ *
+ *  By default SDL tries to make a best guess for each platform whether
+ *  to use acceleration or not.
+ */
+#define SDL_HINT_FRAMEBUFFER_ACCELERATION   "SDL_FRAMEBUFFER_ACCELERATION"
+
+/**
+ *  \brief  A variable specifying which render driver to use.
+ *
+ *  If the application doesn't pick a specific renderer to use, this variable
+ *  specifies the name of the preferred renderer.  If the preferred renderer
+ *  can't be initialized, the normal default renderer is used.
+ *
+ *  This variable is case insensitive and can be set to the following values:
+ *    "direct3d"
+ *    "opengl"
+ *    "opengles2"
+ *    "opengles"
+ *    "metal"
+ *    "software"
+ *
+ *  The default varies by platform, but it's the first one in the list that
+ *  is available on the current platform.
+ */
+#define SDL_HINT_RENDER_DRIVER              "SDL_RENDER_DRIVER"
+
+/**
+ *  \brief  A variable controlling whether the OpenGL render driver uses shaders if they are available.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable shaders
+ *    "1"       - Enable shaders
+ *
+ *  By default shaders are used if OpenGL supports them.
+ */
+#define SDL_HINT_RENDER_OPENGL_SHADERS      "SDL_RENDER_OPENGL_SHADERS"
+
+/**
+ *  \brief  A variable controlling whether the Direct3D device is initialized for thread-safe operations.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Thread-safety is not enabled (faster)
+ *    "1"       - Thread-safety is enabled
+ *
+ *  By default the Direct3D device is created with thread-safety disabled.
+ */
+#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE"
+
+/**
+ *  \brief  A variable controlling whether to enable Direct3D 11+'s Debug Layer.
+ *
+ *  This variable does not have any effect on the Direct3D 9 based renderer.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable Debug Layer use
+ *    "1"       - Enable Debug Layer use
+ *
+ *  By default, SDL does not use Direct3D Debug Layer.
+ */
+#define SDL_HINT_RENDER_DIRECT3D11_DEBUG    "SDL_RENDER_DIRECT3D11_DEBUG"
+
+/**
+ *  \brief  A variable controlling the scaling policy for SDL_RenderSetLogicalSize.
+ *
+ *  This variable can be set to the following values:
+ *    "0" or "letterbox" - Uses letterbox/sidebars to fit the entire rendering on screen
+ *    "1" or "overscan"  - Will zoom the rendering so it fills the entire screen, allowing edges to be drawn offscreen
+ *
+ *  By default letterbox is used
+ */
+#define SDL_HINT_RENDER_LOGICAL_SIZE_MODE       "SDL_RENDER_LOGICAL_SIZE_MODE"
+
+/**
+ *  \brief  A variable controlling the scaling quality
+ *
+ *  This variable can be set to the following values:
+ *    "0" or "nearest" - Nearest pixel sampling
+ *    "1" or "linear"  - Linear filtering (supported by OpenGL and Direct3D)
+ *    "2" or "best"    - Currently this is the same as "linear"
+ *
+ *  By default nearest pixel sampling is used
+ */
+#define SDL_HINT_RENDER_SCALE_QUALITY       "SDL_RENDER_SCALE_QUALITY"
+
+/**
+ *  \brief  A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable vsync
+ *    "1"       - Enable vsync
+ *
+ *  By default SDL does not sync screen surface updates with vertical refresh.
+ */
+#define SDL_HINT_RENDER_VSYNC               "SDL_RENDER_VSYNC"
+
+/**
+ *  \brief  A variable controlling whether the screensaver is enabled. 
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable screensaver
+ *    "1"       - Enable screensaver
+ *
+ *  By default SDL will disable the screensaver.
+ */
+#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER    "SDL_VIDEO_ALLOW_SCREENSAVER"
+
+/**
+ *  \brief  A variable controlling whether the X11 VidMode extension should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable XVidMode
+ *    "1"       - Enable XVidMode
+ *
+ *  By default SDL will use XVidMode if it is available.
+ */
+#define SDL_HINT_VIDEO_X11_XVIDMODE         "SDL_VIDEO_X11_XVIDMODE"
+
+/**
+ *  \brief  A variable controlling whether the X11 Xinerama extension should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable Xinerama
+ *    "1"       - Enable Xinerama
+ *
+ *  By default SDL will use Xinerama if it is available.
+ */
+#define SDL_HINT_VIDEO_X11_XINERAMA         "SDL_VIDEO_X11_XINERAMA"
+
+/**
+ *  \brief  A variable controlling whether the X11 XRandR extension should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable XRandR
+ *    "1"       - Enable XRandR
+ *
+ *  By default SDL will not use XRandR because of window manager issues.
+ */
+#define SDL_HINT_VIDEO_X11_XRANDR           "SDL_VIDEO_X11_XRANDR"
+
+/**
+ *  \brief  A variable controlling whether the X11 _NET_WM_PING protocol should be supported.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Disable _NET_WM_PING
+ *    "1"       - Enable _NET_WM_PING
+ *
+ *  By default SDL will use _NET_WM_PING, but for applications that know they
+ *  will not always be able to respond to ping requests in a timely manner they can
+ *  turn it off to avoid the window manager thinking the app is hung.
+ *  The hint is checked in CreateWindow.
+ */
+#define SDL_HINT_VIDEO_X11_NET_WM_PING      "SDL_VIDEO_X11_NET_WM_PING"
+
+/**
+ * \brief A variable controlling whether the X11 _NET_WM_BYPASS_COMPOSITOR hint should be used.
+ * 
+ * This variable can be set to the following values:
+ * "0" - Disable _NET_WM_BYPASS_COMPOSITOR
+ * "1" - Enable _NET_WM_BYPASS_COMPOSITOR
+ * 
+ * By default SDL will use _NET_WM_BYPASS_COMPOSITOR
+ * 
+ */
+#define SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR "SDL_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR"
+
+/**
+ *  \brief  A variable controlling whether the window frame and title bar are interactive when the cursor is hidden 
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - The window frame is not interactive when the cursor is hidden (no move, resize, etc)
+ *    "1"       - The window frame is interactive when the cursor is hidden
+ *
+ *  By default SDL will allow interaction with the window frame when the cursor is hidden
+ */
+#define SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN    "SDL_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN"
+
+/**
+ * \brief A variable to specify custom icon resource id from RC file on Windows platform 
+ */
+#define SDL_HINT_WINDOWS_INTRESOURCE_ICON       "SDL_WINDOWS_INTRESOURCE_ICON"
+#define SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL "SDL_WINDOWS_INTRESOURCE_ICON_SMALL"
+
+/**
+ *  \brief  A variable controlling whether the windows message loop is processed by SDL 
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - The window message loop is not run
+ *    "1"       - The window message loop is processed in SDL_PumpEvents()
+ *
+ *  By default SDL will process the windows message loop
+ */
+#define SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP "SDL_WINDOWS_ENABLE_MESSAGELOOP"
+
+/**
+ *  \brief  A variable controlling whether grabbing input grabs the keyboard
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Grab will affect only the mouse
+ *    "1"       - Grab will affect mouse and keyboard
+ *
+ *  By default SDL will not grab the keyboard so system shortcuts still work.
+ */
+#define SDL_HINT_GRAB_KEYBOARD              "SDL_GRAB_KEYBOARD"
+
+/**
+ *  \brief  A variable setting the double click time, in milliseconds.
+ */
+#define SDL_HINT_MOUSE_DOUBLE_CLICK_TIME    "SDL_MOUSE_DOUBLE_CLICK_TIME"
+
+/**
+ *  \brief  A variable setting the double click radius, in pixels.
+ */
+#define SDL_HINT_MOUSE_DOUBLE_CLICK_RADIUS    "SDL_MOUSE_DOUBLE_CLICK_RADIUS"
+
+/**
+ *  \brief  A variable setting the speed scale for mouse motion, in floating point, when the mouse is not in relative mode
+ */
+#define SDL_HINT_MOUSE_NORMAL_SPEED_SCALE    "SDL_MOUSE_NORMAL_SPEED_SCALE"
+
+/**
+ *  \brief  A variable setting the scale for mouse motion, in floating point, when the mouse is in relative mode
+ */
+#define SDL_HINT_MOUSE_RELATIVE_SPEED_SCALE    "SDL_MOUSE_RELATIVE_SPEED_SCALE"
+
+/**
+ *  \brief  A variable controlling whether relative mouse mode is implemented using mouse warping
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Relative mouse mode uses raw input
+ *    "1"       - Relative mouse mode uses mouse warping
+ *
+ *  By default SDL will use raw input for relative mouse mode
+ */
+#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP    "SDL_MOUSE_RELATIVE_MODE_WARP"
+
+/**
+ *  \brief Allow mouse click events when clicking to focus an SDL window
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Ignore mouse clicks that activate a window
+ *    "1"       - Generate events for mouse clicks that activate a window
+ *
+ *  By default SDL will ignore mouse clicks that activate a window
+ */
+#define SDL_HINT_MOUSE_FOCUS_CLICKTHROUGH "SDL_MOUSE_FOCUS_CLICKTHROUGH"
+
+/**
+ *  \brief  A variable controlling whether touch events should generate synthetic mouse events
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Touch events will not generate mouse events
+ *    "1"       - Touch events will generate mouse events
+ *
+ *  By default SDL will generate mouse events for touch events
+ */
+#define SDL_HINT_TOUCH_MOUSE_EVENTS    "SDL_TOUCH_MOUSE_EVENTS"
+
+/**
+ *  \brief  A variable controlling whether mouse events should generate synthetic touch events
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Mouse events will not generate touch events (default for desktop platforms)
+ *    "1"       - Mouse events will generate touch events (default for mobile platforms, such as Android and iOS)
+ */
+
+#define SDL_HINT_MOUSE_TOUCH_EVENTS    "SDL_MOUSE_TOUCH_EVENTS"
+
+/**
+ *  \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true.
+ *
+ */
+#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS   "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"
+
+/**
+ *  \brief  A variable controlling whether the idle timer is disabled on iOS.
+ *
+ *  When an iOS app does not receive touches for some time, the screen is
+ *  dimmed automatically. For games where the accelerometer is the only input
+ *  this is problematic. This functionality can be disabled by setting this
+ *  hint.
+ *
+ *  As of SDL 2.0.4, SDL_EnableScreenSaver() and SDL_DisableScreenSaver()
+ *  accomplish the same thing on iOS. They should be preferred over this hint.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Enable idle timer
+ *    "1"       - Disable idle timer
+ */
+#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED"
+
+/**
+ *  \brief  A variable controlling which orientations are allowed on iOS/Android.
+ *
+ *  In some circumstances it is necessary to be able to explicitly control
+ *  which UI orientations are allowed.
+ *
+ *  This variable is a space delimited list of the following values:
+ *    "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown"
+ */
+#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS"
+
+/**
+ *  \brief  A variable controlling whether controllers used with the Apple TV
+ *  generate UI events.
+ *
+ * When UI events are generated by controller input, the app will be
+ * backgrounded when the Apple TV remote's menu button is pressed, and when the
+ * pause or B buttons on gamepads are pressed.
+ *
+ * More information about properly making use of controllers for the Apple TV
+ * can be found here:
+ * https://developer.apple.com/tvos/human-interface-guidelines/remote-and-controllers/
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Controller input does not generate UI events (the default).
+ *    "1"       - Controller input generates UI events.
+ */
+#define SDL_HINT_APPLE_TV_CONTROLLER_UI_EVENTS "SDL_APPLE_TV_CONTROLLER_UI_EVENTS"
+
+/**
+ * \brief  A variable controlling whether the Apple TV remote's joystick axes
+ *         will automatically match the rotation of the remote.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Remote orientation does not affect joystick axes (the default).
+ *    "1"       - Joystick axes are based on the orientation of the remote.
+ */
+#define SDL_HINT_APPLE_TV_REMOTE_ALLOW_ROTATION "SDL_APPLE_TV_REMOTE_ALLOW_ROTATION"
+
+/**
+ * \brief  A variable controlling whether the home indicator bar on iPhone X
+ *         should be hidden.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - The indicator bar is not hidden (default for windowed applications)
+ *    "1"       - The indicator bar is hidden and is shown when the screen is touched (useful for movie playback applications)
+ *    "2"       - The indicator bar is dim and the first swipe makes it visible and the second swipe performs the "home" action (default for fullscreen applications)
+ */
+#define SDL_HINT_IOS_HIDE_HOME_INDICATOR "SDL_IOS_HIDE_HOME_INDICATOR"
+
+/**
+ *  \brief  A variable controlling whether the Android / iOS built-in
+ *  accelerometer should be listed as a joystick device.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - The accelerometer is not listed as a joystick
+ *    "1"       - The accelerometer is available as a 3 axis joystick (the default).
+ */
+#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK"
+
+/**
+ *  \brief  A variable controlling whether the Android / tvOS remotes
+ *  should be listed as joystick devices, instead of sending keyboard events.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Remotes send enter/escape/arrow key events
+ *    "1"       - Remotes are available as 2 axis, 2 button joysticks (the default).
+ */
+#define SDL_HINT_TV_REMOTE_AS_JOYSTICK "SDL_TV_REMOTE_AS_JOYSTICK"
+
+/**
+ *  \brief  A variable that lets you disable the detection and use of Xinput gamepad devices
+ *
+ *  The variable can be set to the following values:
+ *    "0"       - Disable XInput detection (only uses direct input)
+ *    "1"       - Enable XInput detection (the default)
+ */
+#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED"
+
+/**
+ *  \brief  A variable that causes SDL to use the old axis and button mapping for XInput devices.
+ *
+ *  This hint is for backwards compatibility only and will be removed in SDL 2.1
+ *
+ *  The default value is "0".  This hint must be set before SDL_Init()
+ */
+#define SDL_HINT_XINPUT_USE_OLD_JOYSTICK_MAPPING "SDL_XINPUT_USE_OLD_JOYSTICK_MAPPING"
+
+/**
+ *  \brief  A variable that lets you manually hint extra gamecontroller db entries.
+ *
+ *  The variable should be newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h
+ *
+ *  This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER)
+ *  You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping()
+ */
+#define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG"
+
+/**
+ *  \brief  A variable that lets you provide a file with extra gamecontroller db entries.
+ *
+ *  The file should contain lines of gamecontroller config data, see SDL_gamecontroller.h
+ *
+ *  This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER)
+ *  You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping()
+ */
+#define SDL_HINT_GAMECONTROLLERCONFIG_FILE "SDL_GAMECONTROLLERCONFIG_FILE"
+
+/**
+ *  \brief  A variable containing a list of devices to skip when scanning for game controllers.
+ *
+ *  The format of the string is a comma separated list of USB VID/PID pairs
+ *  in hexadecimal form, e.g.
+ *
+ *      0xAAAA/0xBBBB,0xCCCC/0xDDDD
+ *
+ *  The variable can also take the form of @file, in which case the named
+ *  file will be loaded and interpreted as the value of the variable.
+ */
+#define SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES "SDL_GAMECONTROLLER_IGNORE_DEVICES"
+
+/**
+ *  \brief  If set, all devices will be skipped when scanning for game controllers except for the ones listed in this variable.
+ *
+ *  The format of the string is a comma separated list of USB VID/PID pairs
+ *  in hexadecimal form, e.g.
+ *
+ *      0xAAAA/0xBBBB,0xCCCC/0xDDDD
+ *
+ *  The variable can also take the form of @file, in which case the named
+ *  file will be loaded and interpreted as the value of the variable.
+ */
+#define SDL_HINT_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT "SDL_GAMECONTROLLER_IGNORE_DEVICES_EXCEPT"
+
+/**
+ *  \brief  A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background.
+ *
+ *  The variable can be set to the following values:
+ *    "0"       - Disable joystick & gamecontroller input events when the
+ *                application is in the background.
+ *    "1"       - Enable joystick & gamecontroller input events when the
+ *                application is in the background.
+ *
+ *  The default value is "0".  This hint may be set at any time.
+ */
+#define SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS"
+
+/**
+ *  \brief  A variable controlling whether the HIDAPI joystick drivers should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - HIDAPI drivers are not used
+ *    "1"       - HIDAPI drivers are used (the default)
+ *
+ *  This variable is the default for all drivers, but can be overridden by the hints for specific drivers below.
+ */
+#define SDL_HINT_JOYSTICK_HIDAPI "SDL_JOYSTICK_HIDAPI"
+
+/**
+ *  \brief  A variable controlling whether the HIDAPI driver for PS4 controllers should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - HIDAPI driver is not used
+ *    "1"       - HIDAPI driver is used
+ *
+ *  The default is the value of SDL_HINT_JOYSTICK_HIDAPI
+ */
+#define SDL_HINT_JOYSTICK_HIDAPI_PS4 "SDL_JOYSTICK_HIDAPI_PS4"
+
+/**
+ *  \brief  A variable controlling whether extended input reports should be used for PS4 controllers when using the HIDAPI driver.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - extended reports are not enabled (the default)
+ *    "1"       - extended reports
+ *
+ *  Extended input reports allow rumble on Bluetooth PS4 controllers, but
+ *  break DirectInput handling for applications that don't use SDL.
+ *
+ *  Once extended reports are enabled, they can not be disabled without
+ *  power cycling the controller.
+ */
+#define SDL_HINT_JOYSTICK_HIDAPI_PS4_RUMBLE "SDL_JOYSTICK_HIDAPI_PS4_RUMBLE"
+
+/**
+ *  \brief  A variable controlling whether the HIDAPI driver for Steam Controllers should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - HIDAPI driver is not used
+ *    "1"       - HIDAPI driver is used
+ *
+ *  The default is the value of SDL_HINT_JOYSTICK_HIDAPI
+ */
+#define SDL_HINT_JOYSTICK_HIDAPI_STEAM "SDL_JOYSTICK_HIDAPI_STEAM"
+
+/**
+ *  \brief  A variable controlling whether the HIDAPI driver for Nintendo Switch controllers should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - HIDAPI driver is not used
+ *    "1"       - HIDAPI driver is used
+ *
+ *  The default is the value of SDL_HINT_JOYSTICK_HIDAPI
+ */
+#define SDL_HINT_JOYSTICK_HIDAPI_SWITCH "SDL_JOYSTICK_HIDAPI_SWITCH"
+
+/**
+ *  \brief  A variable controlling whether the HIDAPI driver for XBox controllers should be used.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - HIDAPI driver is not used
+ *    "1"       - HIDAPI driver is used
+ *
+ *  The default is the value of SDL_HINT_JOYSTICK_HIDAPI
+ */
+#define SDL_HINT_JOYSTICK_HIDAPI_XBOX   "SDL_JOYSTICK_HIDAPI_XBOX"
+
+/**
+ *  \brief  A variable that controls whether Steam Controllers should be exposed using the SDL joystick and game controller APIs
+ *
+ *  The variable can be set to the following values:
+ *    "0"       - Do not scan for Steam Controllers
+ *    "1"       - Scan for Steam Controllers (the default)
+ *
+ *  The default value is "1".  This hint must be set before initializing the joystick subsystem.
+ */
+#define SDL_HINT_ENABLE_STEAM_CONTROLLERS "SDL_ENABLE_STEAM_CONTROLLERS"
+
+
+/**
+ *  \brief If set to "0" then never set the top most bit on a SDL Window, even if the video mode expects it.
+ *      This is a debugging aid for developers and not expected to be used by end users. The default is "1"
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - don't allow topmost
+ *    "1"       - allow topmost
+ */
+#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST"
+
+/**
+ *  \brief A variable that controls the timer resolution, in milliseconds.
+ *
+ *  The higher resolution the timer, the more frequently the CPU services
+ *  timer interrupts, and the more precise delays are, but this takes up
+ *  power and CPU time.  This hint is only used on Windows 7 and earlier.
+ *
+ *  See this blog post for more information:
+ *  http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/
+ *
+ *  If this variable is set to "0", the system timer resolution is not set.
+ *
+ *  The default value is "1". This hint may be set at any time.
+ */
+#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION"
+
+
+/**
+ *  \brief  A variable describing the content orientation on QtWayland-based platforms.
+ *
+ *  On QtWayland platforms, windows are rotated client-side to allow for custom
+ *  transitions. In order to correctly position overlays (e.g. volume bar) and
+ *  gestures (e.g. events view, close/minimize gestures), the system needs to
+ *  know in which orientation the application is currently drawing its contents.
+ *
+ *  This does not cause the window to be rotated or resized, the application
+ *  needs to take care of drawing the content in the right orientation (the
+ *  framebuffer is always in portrait mode).
+ *
+ *  This variable can be one of the following values:
+ *    "primary" (default), "portrait", "landscape", "inverted-portrait", "inverted-landscape"
+ */
+#define SDL_HINT_QTWAYLAND_CONTENT_ORIENTATION "SDL_QTWAYLAND_CONTENT_ORIENTATION"
+
+/**
+ *  \brief  Flags to set on QtWayland windows to integrate with the native window manager.
+ *
+ *  On QtWayland platforms, this hint controls the flags to set on the windows.
+ *  For example, on Sailfish OS "OverridesSystemGestures" disables swipe gestures.
+ *
+ *  This variable is a space-separated list of the following values (empty = no flags):
+ *    "OverridesSystemGestures", "StaysOnTop", "BypassWindowManager"
+ */
+#define SDL_HINT_QTWAYLAND_WINDOW_FLAGS "SDL_QTWAYLAND_WINDOW_FLAGS"
+
+/**
+*  \brief  A string specifying SDL's threads stack size in bytes or "0" for the backend's default size
+*
+*  Use this hint in case you need to set SDL's threads stack size to other than the default.
+*  This is specially useful if you build SDL against a non glibc libc library (such as musl) which
+*  provides a relatively small default thread stack size (a few kilobytes versus the default 8MB glibc uses).
+*  Support for this hint is currently available only in the pthread, Windows, and PSP backend.
+*
+*  Instead of this hint, in 2.0.9 and later, you can use
+*  SDL_CreateThreadWithStackSize(). This hint only works with the classic
+*  SDL_CreateThread().
+*/
+#define SDL_HINT_THREAD_STACK_SIZE              "SDL_THREAD_STACK_SIZE"
+
+/**
+ *  \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac and iOS)
+ */
+#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED"
+
+/**
+ *  \brief A variable that determines whether ctrl+click should generate a right-click event on Mac
+ *
+ *  If present, holding ctrl while left clicking will generate a right click
+ *  event when on Mac.
+ */
+#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK"
+
+/**
+*  \brief  A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries
+*
+*  SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It
+*  can use two different sets of binaries, those compiled by the user from source
+*  or those provided by the Chrome browser. In the later case, these binaries require
+*  that SDL loads a DLL providing the shader compiler.
+*
+*  This variable can be set to the following values:
+*    "d3dcompiler_46.dll" - default, best for Vista or later.
+*    "d3dcompiler_43.dll" - for XP support.
+*    "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries.
+*
+*/
+#define SDL_HINT_VIDEO_WIN_D3DCOMPILER              "SDL_VIDEO_WIN_D3DCOMPILER"
+
+/**
+*  \brief  A variable that is the address of another SDL_Window* (as a hex string formatted with "%p").
+*  
+*  If this hint is set before SDL_CreateWindowFrom() and the SDL_Window* it is set to has
+*  SDL_WINDOW_OPENGL set (and running on WGL only, currently), then two things will occur on the newly 
+*  created SDL_Window:
+*
+*  1. Its pixel format will be set to the same pixel format as this SDL_Window.  This is
+*  needed for example when sharing an OpenGL context across multiple windows.
+*
+*  2. The flag SDL_WINDOW_OPENGL will be set on the new window so it can be used for
+*  OpenGL rendering.
+*
+*  This variable can be set to the following values:
+*    The address (as a string "%p") of the SDL_Window* that new windows created with SDL_CreateWindowFrom() should
+*    share a pixel format with.
+*/
+#define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT    "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT"
+
+/**
+ *  \brief A URL to a WinRT app's privacy policy
+ *
+ *  All network-enabled WinRT apps must make a privacy policy available to its
+ *  users.  On Windows 8, 8.1, and RT, Microsoft mandates that this policy be
+ *  be available in the Windows Settings charm, as accessed from within the app.
+ *  SDL provides code to add a URL-based link there, which can point to the app's
+ *  privacy policy.
+ *
+ *  To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL
+ *  before calling any SDL_Init() functions.  The contents of the hint should
+ *  be a valid URL.  For example, "http://www.example.com".
+ *
+ *  The default value is "", which will prevent SDL from adding a privacy policy
+ *  link to the Settings charm.  This hint should only be set during app init.
+ *
+ *  The label text of an app's "Privacy Policy" link may be customized via another
+ *  hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL.
+ *
+ *  Please note that on Windows Phone, Microsoft does not provide standard UI
+ *  for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL
+ *  will not get used on that platform.  Network-enabled phone apps should display
+ *  their privacy policy through some other, in-app means.
+ */
+#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_WINRT_PRIVACY_POLICY_URL"
+
+/** \brief Label text for a WinRT app's privacy policy link
+ *
+ *  Network-enabled WinRT apps must include a privacy policy.  On Windows 8, 8.1, and RT,
+ *  Microsoft mandates that this policy be available via the Windows Settings charm.
+ *  SDL provides code to add a link there, with its label text being set via the
+ *  optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL.
+ *
+ *  Please note that a privacy policy's contents are not set via this hint.  A separate
+ *  hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the
+ *  policy.
+ *
+ *  The contents of this hint should be encoded as a UTF8 string.
+ *
+ *  The default value is "Privacy Policy".  This hint should only be set during app
+ *  initialization, preferably before any calls to SDL_Init().
+ *
+ *  For additional information on linking to a privacy policy, see the documentation for
+ *  SDL_HINT_WINRT_PRIVACY_POLICY_URL.
+ */
+#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_WINRT_PRIVACY_POLICY_LABEL"
+
+/** \brief Allows back-button-press events on Windows Phone to be marked as handled
+ *
+ *  Windows Phone devices typically feature a Back button.  When pressed,
+ *  the OS will emit back-button-press events, which apps are expected to
+ *  handle in an appropriate manner.  If apps do not explicitly mark these
+ *  events as 'Handled', then the OS will invoke its default behavior for
+ *  unhandled back-button-press events, which on Windows Phone 8 and 8.1 is to
+ *  terminate the app (and attempt to switch to the previous app, or to the
+ *  device's home screen).
+ *
+ *  Setting the SDL_HINT_WINRT_HANDLE_BACK_BUTTON hint to "1" will cause SDL
+ *  to mark back-button-press events as Handled, if and when one is sent to
+ *  the app.
+ *
+ *  Internally, Windows Phone sends back button events as parameters to
+ *  special back-button-press callback functions.  Apps that need to respond
+ *  to back-button-press events are expected to register one or more
+ *  callback functions for such, shortly after being launched (during the
+ *  app's initialization phase).  After the back button is pressed, the OS
+ *  will invoke these callbacks.  If the app's callback(s) do not explicitly
+ *  mark the event as handled by the time they return, or if the app never
+ *  registers one of these callback, the OS will consider the event
+ *  un-handled, and it will apply its default back button behavior (terminate
+ *  the app).
+ *
+ *  SDL registers its own back-button-press callback with the Windows Phone
+ *  OS.  This callback will emit a pair of SDL key-press events (SDL_KEYDOWN
+ *  and SDL_KEYUP), each with a scancode of SDL_SCANCODE_AC_BACK, after which
+ *  it will check the contents of the hint, SDL_HINT_WINRT_HANDLE_BACK_BUTTON.
+ *  If the hint's value is set to "1", the back button event's Handled
+ *  property will get set to 'true'.  If the hint's value is set to something
+ *  else, or if it is unset, SDL will leave the event's Handled property
+ *  alone.  (By default, the OS sets this property to 'false', to note.)
+ *
+ *  SDL apps can either set SDL_HINT_WINRT_HANDLE_BACK_BUTTON well before a
+ *  back button is pressed, or can set it in direct-response to a back button
+ *  being pressed.
+ *
+ *  In order to get notified when a back button is pressed, SDL apps should
+ *  register a callback function with SDL_AddEventWatch(), and have it listen
+ *  for SDL_KEYDOWN events that have a scancode of SDL_SCANCODE_AC_BACK.
+ *  (Alternatively, SDL_KEYUP events can be listened-for.  Listening for
+ *  either event type is suitable.)  Any value of SDL_HINT_WINRT_HANDLE_BACK_BUTTON
+ *  set by such a callback, will be applied to the OS' current
+ *  back-button-press event.
+ *
+ *  More details on back button behavior in Windows Phone apps can be found
+ *  at the following page, on Microsoft's developer site:
+ *  http://msdn.microsoft.com/en-us/library/windowsphone/develop/jj247550(v=vs.105).aspx
+ */
+#define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_WINRT_HANDLE_BACK_BUTTON"
+
+/**
+ *  \brief  A variable that dictates policy for fullscreen Spaces on Mac OS X.
+ *
+ *  This hint only applies to Mac OS X.
+ *
+ *  The variable can be set to the following values:
+ *    "0"       - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and
+ *                SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen"
+ *                button on their titlebars).
+ *    "1"       - Enable Spaces support (FULLSCREEN_DESKTOP will use them and
+ *                SDL_WINDOW_RESIZABLE windows will offer the "fullscreen"
+ *                button on their titlebars).
+ *
+ *  The default value is "1". Spaces are disabled regardless of this hint if
+ *   the OS isn't at least Mac OS X Lion (10.7). This hint must be set before
+ *   any windows are created.
+ */
+#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES    "SDL_VIDEO_MAC_FULLSCREEN_SPACES"
+
+/**
+*  \brief  When set don't force the SDL app to become a foreground process
+*
+*  This hint only applies to Mac OS X.
+*
+*/
+#define SDL_HINT_MAC_BACKGROUND_APP    "SDL_MAC_BACKGROUND_APP"
+
+/**
+ * \brief Android APK expansion main file version. Should be a string number like "1", "2" etc.
+ *
+ * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION.
+ *
+ * If both hints were set then SDL_RWFromFile() will look into expansion files
+ * after a given relative path was not found in the internal storage and assets.
+ *
+ * By default this hint is not set and the APK expansion files are not searched.
+ */
+#define SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION"
+ 
+/**
+ * \brief Android APK expansion patch file version. Should be a string number like "1", "2" etc.
+ *
+ * Must be set together with SDL_HINT_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION.
+ *
+ * If both hints were set then SDL_RWFromFile() will look into expansion files
+ * after a given relative path was not found in the internal storage and assets.
+ *
+ * By default this hint is not set and the APK expansion files are not searched.
+ */
+#define SDL_HINT_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION "SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION"
+
+/**
+ * \brief A variable to control whether certain IMEs should handle text editing internally instead of sending SDL_TEXTEDITING events.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - SDL_TEXTEDITING events are sent, and it is the application's
+ *               responsibility to render the text from these events and 
+ *               differentiate it somehow from committed text. (default)
+ *   "1"       - If supported by the IME then SDL_TEXTEDITING events are not sent, 
+ *               and text that is being composed will be rendered in its own UI.
+ */
+#define SDL_HINT_IME_INTERNAL_EDITING "SDL_IME_INTERNAL_EDITING"
+
+/**
+ * \brief A variable to control whether we trap the Android back button to handle it manually.
+ *        This is necessary for the right mouse button to work on some Android devices, or
+ *        to be able to trap the back button for use in your code reliably.  If set to true,
+ *        the back button will show up as an SDL_KEYDOWN / SDL_KEYUP pair with a keycode of 
+ *        SDL_SCANCODE_AC_BACK.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - Back button will be handled as usual for system. (default)
+ *   "1"       - Back button will be trapped, allowing you to handle the key press
+ *               manually.  (This will also let right mouse click work on systems 
+ *               where the right mouse button functions as back.)
+ *
+ * The value of this hint is used at runtime, so it can be changed at any time.
+ */
+#define SDL_HINT_ANDROID_TRAP_BACK_BUTTON "SDL_ANDROID_TRAP_BACK_BUTTON"
+
+/**
+ * \brief A variable to control whether the event loop will block itself when the app is paused.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - Non blocking.
+ *   "1"       - Blocking. (default)
+ *
+ * The value should be set before SDL is initialized.
+ */
+#define SDL_HINT_ANDROID_BLOCK_ON_PAUSE "SDL_ANDROID_BLOCK_ON_PAUSE"
+
+ /**
+ * \brief A variable to control whether the return key on the soft keyboard
+ *        should hide the soft keyboard on Android and iOS.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - The return key will be handled as a key event. This is the behaviour of SDL <= 2.0.3. (default)
+ *   "1"       - The return key will hide the keyboard.
+ *
+ * The value of this hint is used at runtime, so it can be changed at any time.
+ */
+#define SDL_HINT_RETURN_KEY_HIDES_IME "SDL_RETURN_KEY_HIDES_IME"
+
+/**
+ *  \brief override the binding element for keyboard inputs for Emscripten builds
+ *
+ * This hint only applies to the emscripten platform
+ *
+ * The variable can be one of
+ *    "#window"      - The javascript window object (this is the default)
+ *    "#document"    - The javascript document object
+ *    "#screen"      - the javascript window.screen object
+ *    "#canvas"      - the WebGL canvas element
+ *    any other string without a leading # sign applies to the element on the page with that ID.
+ */
+#define SDL_HINT_EMSCRIPTEN_KEYBOARD_ELEMENT   "SDL_EMSCRIPTEN_KEYBOARD_ELEMENT"
+
+/**
+ *  \brief Tell SDL not to catch the SIGINT or SIGTERM signals.
+ *
+ * This hint only applies to Unix-like platforms.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - SDL will install a SIGINT and SIGTERM handler, and when it
+ *               catches a signal, convert it into an SDL_QUIT event.
+ *   "1"       - SDL will not install a signal handler at all.
+ */
+#define SDL_HINT_NO_SIGNAL_HANDLERS   "SDL_NO_SIGNAL_HANDLERS"
+
+/**
+ *  \brief Tell SDL not to generate window-close events for Alt+F4 on Windows.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - SDL will generate a window-close event when it sees Alt+F4.
+ *   "1"       - SDL will only do normal key handling for Alt+F4.
+ */
+#define SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4 "SDL_WINDOWS_NO_CLOSE_ON_ALT_F4"
+
+/**
+ *  \brief Prevent SDL from using version 4 of the bitmap header when saving BMPs.
+ *
+ * The bitmap header version 4 is required for proper alpha channel support and
+ * SDL will use it when required. Should this not be desired, this hint can
+ * force the use of the 40 byte header version which is supported everywhere.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - Surfaces with a colorkey or an alpha channel are saved to a
+ *               32-bit BMP file with an alpha mask. SDL will use the bitmap
+ *               header version 4 and set the alpha mask accordingly.
+ *   "1"       - Surfaces with a colorkey or an alpha channel are saved to a
+ *               32-bit BMP file without an alpha mask. The alpha channel data
+ *               will be in the file, but applications are going to ignore it.
+ *
+ * The default value is "0".
+ */
+#define SDL_HINT_BMP_SAVE_LEGACY_FORMAT "SDL_BMP_SAVE_LEGACY_FORMAT"
+
+/**
+ * \brief Tell SDL not to name threads on Windows with the 0x406D1388 Exception.
+ *        The 0x406D1388 Exception is a trick used to inform Visual Studio of a
+ *        thread's name, but it tends to cause problems with other debuggers,
+ *        and the .NET runtime. Note that SDL 2.0.6 and later will still use
+ *        the (safer) SetThreadDescription API, introduced in the Windows 10
+ *        Creators Update, if available.
+ *
+ * The variable can be set to the following values:
+ *   "0"       - SDL will raise the 0x406D1388 Exception to name threads.
+ *               This is the default behavior of SDL <= 2.0.4.
+ *   "1"       - SDL will not raise this exception, and threads will be unnamed. (default)
+ *               This is necessary with .NET languages or debuggers that aren't Visual Studio.
+ */
+#define SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING "SDL_WINDOWS_DISABLE_THREAD_NAMING"
+
+/**
+ * \brief Tell SDL which Dispmanx layer to use on a Raspberry PI
+ *
+ * Also known as Z-order. The variable can take a negative or positive value.
+ * The default is 10000.
+ */
+#define SDL_HINT_RPI_VIDEO_LAYER           "SDL_RPI_VIDEO_LAYER"
+
+/**
+ * \brief Tell the video driver that we only want a double buffer.
+ *
+ * By default, most lowlevel 2D APIs will use a triple buffer scheme that 
+ * wastes no CPU time on waiting for vsync after issuing a flip, but
+ * introduces a frame of latency. On the other hand, using a double buffer
+ * scheme instead is recommended for cases where low latency is an important
+ * factor because we save a whole frame of latency.
+ * We do so by waiting for vsync immediately after issuing a flip, usually just
+ * after eglSwapBuffers call in the backend's *_SwapWindow function.
+ *
+ * Since it's driver-specific, it's only supported where possible and
+ * implemented. Currently supported the following drivers:
+ * - KMSDRM (kmsdrm)
+ * - Raspberry Pi (raspberrypi)
+ */
+#define SDL_HINT_VIDEO_DOUBLE_BUFFER      "SDL_VIDEO_DOUBLE_BUFFER"
+
+/**
+ *  \brief  A variable controlling what driver to use for OpenGL ES contexts.
+ *
+ *  On some platforms, currently Windows and X11, OpenGL drivers may support
+ *  creating contexts with an OpenGL ES profile. By default SDL uses these
+ *  profiles, when available, otherwise it attempts to load an OpenGL ES
+ *  library, e.g. that provided by the ANGLE project. This variable controls
+ *  whether SDL follows this default behaviour or will always load an
+ *  OpenGL ES library.
+ *
+ *  Circumstances where this is useful include
+ *  - Testing an app with a particular OpenGL ES implementation, e.g ANGLE,
+ *    or emulator, e.g. those from ARM, Imagination or Qualcomm.
+ *  - Resolving OpenGL ES function addresses at link time by linking with
+ *    the OpenGL ES library instead of querying them at run time with
+ *    SDL_GL_GetProcAddress().
+ *
+ *  Caution: for an application to work with the default behaviour across
+ *  different OpenGL drivers it must query the OpenGL ES function
+ *  addresses at run time using SDL_GL_GetProcAddress().
+ *
+ *  This variable is ignored on most platforms because OpenGL ES is native
+ *  or not supported.
+ *
+ *  This variable can be set to the following values:
+ *    "0"       - Use ES profile of OpenGL, if available. (Default when not set.)
+ *    "1"       - Load OpenGL ES library using the default library names.
+ *
+ */
+#define SDL_HINT_OPENGL_ES_DRIVER   "SDL_OPENGL_ES_DRIVER"
+
+/**
+ *  \brief  A variable controlling speed/quality tradeoff of audio resampling.
+ *
+ *  If available, SDL can use libsamplerate ( http://www.mega-nerd.com/SRC/ )
+ *  to handle audio resampling. There are different resampling modes available
+ *  that produce different levels of quality, using more CPU.
+ *
+ *  If this hint isn't specified to a valid setting, or libsamplerate isn't
+ *  available, SDL will use the default, internal resampling algorithm.
+ *
+ *  Note that this is currently only applicable to resampling audio that is
+ *  being written to a device for playback or audio being read from a device
+ *  for capture. SDL_AudioCVT always uses the default resampler (although this
+ *  might change for SDL 2.1).
+ *
+ *  This hint is currently only checked at audio subsystem initialization.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "0" or "default" - Use SDL's internal resampling (Default when not set - low quality, fast)
+ *    "1" or "fast"    - Use fast, slightly higher quality resampling, if available
+ *    "2" or "medium"  - Use medium quality resampling, if available
+ *    "3" or "best"    - Use high quality resampling, if available
+ */
+#define SDL_HINT_AUDIO_RESAMPLING_MODE   "SDL_AUDIO_RESAMPLING_MODE"
+
+/**
+ *  \brief  A variable controlling the audio category on iOS and Mac OS X
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "ambient"     - Use the AVAudioSessionCategoryAmbient audio category, will be muted by the phone mute switch (default)
+ *    "playback"    - Use the AVAudioSessionCategoryPlayback category
+ *
+ *  For more information, see Apple's documentation:
+ *  https://developer.apple.com/library/content/documentation/Audio/Conceptual/AudioSessionProgrammingGuide/AudioSessionCategoriesandModes/AudioSessionCategoriesandModes.html
+ */
+#define SDL_HINT_AUDIO_CATEGORY   "SDL_AUDIO_CATEGORY"
+
+/**
+ *  \brief  A variable controlling whether the 2D render API is compatible or efficient.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "0"     - Don't use batching to make rendering more efficient.
+ *    "1"     - Use batching, but might cause problems if app makes its own direct OpenGL calls.
+ *
+ *  Up to SDL 2.0.9, the render API would draw immediately when requested. Now
+ *  it batches up draw requests and sends them all to the GPU only when forced
+ *  to (during SDL_RenderPresent, when changing render targets, by updating a
+ *  texture that the batch needs, etc). This is significantly more efficient,
+ *  but it can cause problems for apps that expect to render on top of the
+ *  render API's output. As such, SDL will disable batching if a specific
+ *  render backend is requested (since this might indicate that the app is
+ *  planning to use the underlying graphics API directly). This hint can
+ *  be used to explicitly request batching in this instance. It is a contract
+ *  that you will either never use the underlying graphics API directly, or
+ *  if you do, you will call SDL_RenderFlush() before you do so any current
+ *  batch goes to the GPU before your work begins. Not following this contract
+ *  will result in undefined behavior.
+ */
+#define SDL_HINT_RENDER_BATCHING  "SDL_RENDER_BATCHING"
+
+
+/**
+ *  \brief  A variable controlling whether SDL logs all events pushed onto its internal queue.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "0"     - Don't log any events (default)
+ *    "1"     - Log all events except mouse and finger motion, which are pretty spammy.
+ *    "2"     - Log all events.
+ *
+ *  This is generally meant to be used to debug SDL itself, but can be useful
+ *  for application developers that need better visibility into what is going
+ *  on in the event queue. Logged events are sent through SDL_Log(), which
+ *  means by default they appear on stdout on most platforms or maybe
+ *  OutputDebugString() on Windows, and can be funneled by the app with
+ *  SDL_LogSetOutputFunction(), etc.
+ *
+ *  This hint can be toggled on and off at runtime, if you only need to log
+ *  events for a small subset of program execution.
+ */
+#define SDL_HINT_EVENT_LOGGING   "SDL_EVENT_LOGGING"
+
+
+
+/**
+ *  \brief  Controls how the size of the RIFF chunk affects the loading of a WAVE file.
+ *
+ *  The size of the RIFF chunk (which includes all the sub-chunks of the WAVE
+ *  file) is not always reliable. In case the size is wrong, it's possible to
+ *  just ignore it and step through the chunks until a fixed limit is reached.
+ *
+ *  Note that files that have trailing data unrelated to the WAVE file or
+ *  corrupt files may slow down the loading process without a reliable boundary.
+ *  By default, SDL stops after 10000 chunks to prevent wasting time. Use the
+ *  environment variable SDL_WAVE_CHUNK_LIMIT to adjust this value.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "force"        - Always use the RIFF chunk size as a boundary for the chunk search
+ *    "ignorezero"   - Like "force", but a zero size searches up to 4 GiB (default)
+ *    "ignore"       - Ignore the RIFF chunk size and always search up to 4 GiB
+ *    "maximum"      - Search for chunks until the end of file (not recommended)
+ */
+#define SDL_HINT_WAVE_RIFF_CHUNK_SIZE   "SDL_WAVE_RIFF_CHUNK_SIZE"
+
+/**
+ *  \brief  Controls how a truncated WAVE file is handled.
+ *
+ *  A WAVE file is considered truncated if any of the chunks are incomplete or
+ *  the data chunk size is not a multiple of the block size. By default, SDL
+ *  decodes until the first incomplete block, as most applications seem to do.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "verystrict" - Raise an error if the file is truncated
+ *    "strict"     - Like "verystrict", but the size of the RIFF chunk is ignored
+ *    "dropframe"  - Decode until the first incomplete sample frame
+ *    "dropblock"  - Decode until the first incomplete block (default)
+ */
+#define SDL_HINT_WAVE_TRUNCATION   "SDL_WAVE_TRUNCATION"
+
+/**
+ *  \brief  Controls how the fact chunk affects the loading of a WAVE file.
+ *
+ *  The fact chunk stores information about the number of samples of a WAVE
+ *  file. The Standards Update from Microsoft notes that this value can be used
+ *  to 'determine the length of the data in seconds'. This is especially useful
+ *  for compressed formats (for which this is a mandatory chunk) if they produce
+ *  multiple sample frames per block and truncating the block is not allowed.
+ *  The fact chunk can exactly specify how many sample frames there should be
+ *  in this case.
+ *
+ *  Unfortunately, most application seem to ignore the fact chunk and so SDL
+ *  ignores it by default as well.
+ *
+ *  This variable can be set to the following values:
+ *
+ *    "truncate"    - Use the number of samples to truncate the wave data if
+ *                    the fact chunk is present and valid
+ *    "strict"      - Like "truncate", but raise an error if the fact chunk
+ *                    is invalid, not present for non-PCM formats, or if the
+ *                    data chunk doesn't have that many samples
+ *    "ignorezero"  - Like "truncate", but ignore fact chunk if the number of
+ *                    samples is zero
+ *    "ignore"      - Ignore fact chunk entirely (default)
+ */
+#define SDL_HINT_WAVE_FACT_CHUNK   "SDL_WAVE_FACT_CHUNK"
+
+/**
+ *  \brief  An enumeration of hint priorities
+ */
+typedef enum
+{
+    SDL_HINT_DEFAULT,
+    SDL_HINT_NORMAL,
+    SDL_HINT_OVERRIDE
+} SDL_HintPriority;
+
+
+/**
+ *  \brief Set a hint with a specific priority
+ *
+ *  The priority controls the behavior when setting a hint that already
+ *  has a value.  Hints will replace existing hints of their priority and
+ *  lower.  Environment variables are considered to have override priority.
+ *
+ *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name,
+                                                         const char *value,
+                                                         SDL_HintPriority priority);
+
+/**
+ *  \brief Set a hint with normal priority
+ *
+ *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name,
+                                             const char *value);
+
+/**
+ *  \brief Get a hint
+ *
+ *  \return The string value of a hint variable.
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name);
+
+/**
+ *  \brief Get a hint
+ *
+ *  \return The boolean value of a hint variable.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetHintBoolean(const char *name, SDL_bool default_value);
+
+/**
+ * \brief type definition of the hint callback function.
+ */
+typedef void (SDLCALL *SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue);
+
+/**
+ *  \brief Add a function to watch a particular hint
+ *
+ *  \param name The hint to watch
+ *  \param callback The function to call when the hint value changes
+ *  \param userdata A pointer to pass to the callback function
+ */
+extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name,
+                                                 SDL_HintCallback callback,
+                                                 void *userdata);
+
+/**
+ *  \brief Remove a function watching a particular hint
+ *
+ *  \param name The hint being watched
+ *  \param callback The function being called when the hint value changes
+ *  \param userdata A pointer being passed to the callback function
+ */
+extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name,
+                                                 SDL_HintCallback callback,
+                                                 void *userdata);
+
+/**
+ *  \brief  Clear all hints
+ *
+ *  This function is called during SDL_Quit() to free stored hints.
+ */
+extern DECLSPEC void SDLCALL SDL_ClearHints(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_hints_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_joystick.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_joystick.h
new file mode 100644
index 0000000..3a4c5d1
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_joystick.h
@@ -0,0 +1,408 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_joystick.h
+ *
+ *  Include file for SDL joystick event handling
+ *
+ * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks(), with the exact joystick
+ *   behind a device_index changing as joysticks are plugged and unplugged.
+ *
+ * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted
+ *   then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in.
+ *
+ * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of
+ *   the device (a X360 wired controller for example). This identifier is platform dependent.
+ *
+ *
+ */
+
+#ifndef SDL_joystick_h_
+#define SDL_joystick_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \file SDL_joystick.h
+ *
+ *  In order to use these functions, SDL_Init() must have been called
+ *  with the ::SDL_INIT_JOYSTICK flag.  This causes SDL to scan the system
+ *  for joysticks, and load appropriate drivers.
+ *
+ *  If you would like to receive joystick updates while the application
+ *  is in the background, you should set the following hint before calling
+ *  SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS
+ */
+
+/**
+ * The joystick structure used to identify an SDL joystick
+ */
+struct _SDL_Joystick;
+typedef struct _SDL_Joystick SDL_Joystick;
+
+/* A structure that encodes the stable unique id for a joystick device */
+typedef struct {
+    Uint8 data[16];
+} SDL_JoystickGUID;
+
+/**
+ * This is a unique ID for a joystick for the time it is connected to the system,
+ * and is never reused for the lifetime of the application. If the joystick is
+ * disconnected and reconnected, it will get a new ID.
+ *
+ * The ID value starts at 0 and increments from there. The value -1 is an invalid ID.
+ */
+typedef Sint32 SDL_JoystickID;
+
+typedef enum
+{
+    SDL_JOYSTICK_TYPE_UNKNOWN,
+    SDL_JOYSTICK_TYPE_GAMECONTROLLER,
+    SDL_JOYSTICK_TYPE_WHEEL,
+    SDL_JOYSTICK_TYPE_ARCADE_STICK,
+    SDL_JOYSTICK_TYPE_FLIGHT_STICK,
+    SDL_JOYSTICK_TYPE_DANCE_PAD,
+    SDL_JOYSTICK_TYPE_GUITAR,
+    SDL_JOYSTICK_TYPE_DRUM_KIT,
+    SDL_JOYSTICK_TYPE_ARCADE_PAD,
+    SDL_JOYSTICK_TYPE_THROTTLE
+} SDL_JoystickType;
+
+typedef enum
+{
+    SDL_JOYSTICK_POWER_UNKNOWN = -1,
+    SDL_JOYSTICK_POWER_EMPTY,   /* <= 5% */
+    SDL_JOYSTICK_POWER_LOW,     /* <= 20% */
+    SDL_JOYSTICK_POWER_MEDIUM,  /* <= 70% */
+    SDL_JOYSTICK_POWER_FULL,    /* <= 100% */
+    SDL_JOYSTICK_POWER_WIRED,
+    SDL_JOYSTICK_POWER_MAX
+} SDL_JoystickPowerLevel;
+
+/* Function prototypes */
+
+/**
+ * Locking for multi-threaded access to the joystick API
+ *
+ * If you are using the joystick API or handling events from multiple threads
+ * you should use these locking functions to protect access to the joysticks.
+ *
+ * In particular, you are guaranteed that the joystick list won't change, so
+ * the API functions that take a joystick index will be valid, and joystick
+ * and game controller events will not be delivered.
+ */
+extern DECLSPEC void SDLCALL SDL_LockJoysticks(void);
+extern DECLSPEC void SDLCALL SDL_UnlockJoysticks(void);
+
+/**
+ *  Count the number of joysticks attached to the system right now
+ */
+extern DECLSPEC int SDLCALL SDL_NumJoysticks(void);
+
+/**
+ *  Get the implementation dependent name of a joystick.
+ *  This can be called before any joysticks are opened.
+ *  If no name can be found, this function returns NULL.
+ */
+extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index);
+
+/**
+ *  Get the player index of a joystick, or -1 if it's not available
+ *  This can be called before any joysticks are opened.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickGetDevicePlayerIndex(int device_index);
+
+/**
+ *  Return the GUID for the joystick at this index
+ *  This can be called before any joysticks are opened.
+ */
+extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index);
+
+/**
+ *  Get the USB vendor ID of a joystick, if available.
+ *  This can be called before any joysticks are opened.
+ *  If the vendor ID isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceVendor(int device_index);
+
+/**
+ *  Get the USB product ID of a joystick, if available.
+ *  This can be called before any joysticks are opened.
+ *  If the product ID isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProduct(int device_index);
+
+/**
+ *  Get the product version of a joystick, if available.
+ *  This can be called before any joysticks are opened.
+ *  If the product version isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetDeviceProductVersion(int device_index);
+
+/**
+ *  Get the type of a joystick, if available.
+ *  This can be called before any joysticks are opened.
+ */
+extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetDeviceType(int device_index);
+
+/**
+ *  Get the instance ID of a joystick.
+ *  This can be called before any joysticks are opened.
+ *  If the index is out of range, this function will return -1.
+ */
+extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickGetDeviceInstanceID(int device_index);
+
+/**
+ *  Open a joystick for use.
+ *  The index passed as an argument refers to the N'th joystick on the system.
+ *  This index is not the value which will identify this joystick in future
+ *  joystick events.  The joystick's instance id (::SDL_JoystickID) will be used
+ *  there instead.
+ *
+ *  \return A joystick identifier, or NULL if an error occurred.
+ */
+extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index);
+
+/**
+ * Return the SDL_Joystick associated with an instance id.
+ */
+extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickFromInstanceID(SDL_JoystickID joyid);
+
+/**
+ *  Return the name for this currently opened joystick.
+ *  If no name can be found, this function returns NULL.
+ */
+extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick);
+
+/**
+ *  Get the player index of an opened joystick, or -1 if it's not available
+ *
+ *  For XInput controllers this returns the XInput user index.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickGetPlayerIndex(SDL_Joystick * joystick);
+
+/**
+ *  Return the GUID for this opened joystick
+ */
+extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick);
+
+/**
+ *  Get the USB vendor ID of an opened joystick, if available.
+ *  If the vendor ID isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetVendor(SDL_Joystick * joystick);
+
+/**
+ *  Get the USB product ID of an opened joystick, if available.
+ *  If the product ID isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProduct(SDL_Joystick * joystick);
+
+/**
+ *  Get the product version of an opened joystick, if available.
+ *  If the product version isn't available this function returns 0.
+ */
+extern DECLSPEC Uint16 SDLCALL SDL_JoystickGetProductVersion(SDL_Joystick * joystick);
+
+/**
+ *  Get the type of an opened joystick.
+ */
+extern DECLSPEC SDL_JoystickType SDLCALL SDL_JoystickGetType(SDL_Joystick * joystick);
+
+/**
+ *  Return a string representation for this guid. pszGUID must point to at least 33 bytes
+ *  (32 for the string plus a NULL terminator).
+ */
+extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID);
+
+/**
+ *  Convert a string into a joystick guid
+ */
+extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID);
+
+/**
+ *  Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick);
+
+/**
+ *  Get the instance ID of an opened joystick or -1 if the joystick is invalid.
+ */
+extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of general axis controls on a joystick.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of trackballs on a joystick.
+ *
+ *  Joystick trackballs have only relative motion events associated
+ *  with them and their state cannot be polled.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of POV hats on a joystick.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick);
+
+/**
+ *  Get the number of buttons on a joystick.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick);
+
+/**
+ *  Update the current state of the open joysticks.
+ *
+ *  This is called automatically by the event loop if any joystick
+ *  events are enabled.
+ */
+extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void);
+
+/**
+ *  Enable/disable joystick event polling.
+ *
+ *  If joystick events are disabled, you must call SDL_JoystickUpdate()
+ *  yourself and check the state of the joystick when you want joystick
+ *  information.
+ *
+ *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
+
+#define SDL_JOYSTICK_AXIS_MAX   32767
+#define SDL_JOYSTICK_AXIS_MIN   -32768
+/**
+ *  Get the current state of an axis control on a joystick.
+ *
+ *  The state is a value ranging from -32768 to 32767.
+ *
+ *  The axis indices start at index 0.
+ */
+extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
+                                                   int axis);
+
+/**
+ *  Get the initial state of an axis control on a joystick.
+ *
+ *  The state is a value ranging from -32768 to 32767.
+ *
+ *  The axis indices start at index 0.
+ *
+ *  \return SDL_TRUE if this axis has any initial value, or SDL_FALSE if not.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAxisInitialState(SDL_Joystick * joystick,
+                                                   int axis, Sint16 *state);
+
+/**
+ *  \name Hat positions
+ */
+/* @{ */
+#define SDL_HAT_CENTERED    0x00
+#define SDL_HAT_UP          0x01
+#define SDL_HAT_RIGHT       0x02
+#define SDL_HAT_DOWN        0x04
+#define SDL_HAT_LEFT        0x08
+#define SDL_HAT_RIGHTUP     (SDL_HAT_RIGHT|SDL_HAT_UP)
+#define SDL_HAT_RIGHTDOWN   (SDL_HAT_RIGHT|SDL_HAT_DOWN)
+#define SDL_HAT_LEFTUP      (SDL_HAT_LEFT|SDL_HAT_UP)
+#define SDL_HAT_LEFTDOWN    (SDL_HAT_LEFT|SDL_HAT_DOWN)
+/* @} */
+
+/**
+ *  Get the current state of a POV hat on a joystick.
+ *
+ *  The hat indices start at index 0.
+ *
+ *  \return The return value is one of the following positions:
+ *           - ::SDL_HAT_CENTERED
+ *           - ::SDL_HAT_UP
+ *           - ::SDL_HAT_RIGHT
+ *           - ::SDL_HAT_DOWN
+ *           - ::SDL_HAT_LEFT
+ *           - ::SDL_HAT_RIGHTUP
+ *           - ::SDL_HAT_RIGHTDOWN
+ *           - ::SDL_HAT_LEFTUP
+ *           - ::SDL_HAT_LEFTDOWN
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick,
+                                                 int hat);
+
+/**
+ *  Get the ball axis change since the last poll.
+ *
+ *  \return 0, or -1 if you passed it invalid parameters.
+ *
+ *  The ball indices start at index 0.
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick,
+                                                int ball, int *dx, int *dy);
+
+/**
+ *  Get the current state of a button on a joystick.
+ *
+ *  The button indices start at index 0.
+ */
+extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick,
+                                                    int button);
+
+/**
+ *  Trigger a rumble effect
+ *  Each call to this function cancels any previous rumble effect, and calling it with 0 intensity stops any rumbling.
+ *
+ *  \param joystick The joystick to vibrate
+ *  \param low_frequency_rumble The intensity of the low frequency (left) rumble motor, from 0 to 0xFFFF
+ *  \param high_frequency_rumble The intensity of the high frequency (right) rumble motor, from 0 to 0xFFFF
+ *  \param duration_ms The duration of the rumble effect, in milliseconds
+ *
+ *  \return 0, or -1 if rumble isn't supported on this joystick
+ */
+extern DECLSPEC int SDLCALL SDL_JoystickRumble(SDL_Joystick * joystick, Uint16 low_frequency_rumble, Uint16 high_frequency_rumble, Uint32 duration_ms);
+
+/**
+ *  Close a joystick previously opened with SDL_JoystickOpen().
+ */
+extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick);
+
+/**
+ *  Return the battery level of this joystick
+ */
+extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL_Joystick * joystick);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_joystick_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_keyboard.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_keyboard.h
new file mode 100644
index 0000000..4b2a055
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_keyboard.h
@@ -0,0 +1,217 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_keyboard.h
+ *
+ *  Include file for SDL keyboard event handling
+ */
+
+#ifndef SDL_keyboard_h_
+#define SDL_keyboard_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_keycode.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief The SDL keysym structure, used in key events.
+ *
+ *  \note  If you are looking for translated character input, see the ::SDL_TEXTINPUT event.
+ */
+typedef struct SDL_Keysym
+{
+    SDL_Scancode scancode;      /**< SDL physical key code - see ::SDL_Scancode for details */
+    SDL_Keycode sym;            /**< SDL virtual key code - see ::SDL_Keycode for details */
+    Uint16 mod;                 /**< current key modifiers */
+    Uint32 unused;
+} SDL_Keysym;
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the window which currently has keyboard focus.
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void);
+
+/**
+ *  \brief Get a snapshot of the current state of the keyboard.
+ *
+ *  \param numkeys if non-NULL, receives the length of the returned array.
+ *
+ *  \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values.
+ *
+ *  \b Example:
+ *  \code
+ *  const Uint8 *state = SDL_GetKeyboardState(NULL);
+ *  if ( state[SDL_SCANCODE_RETURN] )   {
+ *      printf("<RETURN> is pressed.\n");
+ *  }
+ *  \endcode
+ */
+extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys);
+
+/**
+ *  \brief Get the current key modifier state for the keyboard.
+ */
+extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void);
+
+/**
+ *  \brief Set the current key modifier state for the keyboard.
+ *
+ *  \note This does not change the keyboard state, only the key modifier flags.
+ */
+extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate);
+
+/**
+ *  \brief Get the key code corresponding to the given scancode according
+ *         to the current keyboard layout.
+ *
+ *  See ::SDL_Keycode for details.
+ *
+ *  \sa SDL_GetKeyName()
+ */
+extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);
+
+/**
+ *  \brief Get the scancode corresponding to the given key code according to the
+ *         current keyboard layout.
+ *
+ *  See ::SDL_Scancode for details.
+ *
+ *  \sa SDL_GetScancodeName()
+ */
+extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key);
+
+/**
+ *  \brief Get a human-readable name for a scancode.
+ *
+ *  \return A pointer to the name for the scancode.
+ *          If the scancode doesn't have a name, this function returns
+ *          an empty string ("").
+ *
+ *  \sa SDL_Scancode
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode);
+
+/**
+ *  \brief Get a scancode from a human-readable name
+ *
+ *  \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized
+ *
+ *  \sa SDL_Scancode
+ */
+extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name);
+
+/**
+ *  \brief Get a human-readable name for a key.
+ *
+ *  \return A pointer to a UTF-8 string that stays valid at least until the next
+ *          call to this function. If you need it around any longer, you must
+ *          copy it.  If the key doesn't have a name, this function returns an
+ *          empty string ("").
+ *
+ *  \sa SDL_Keycode
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key);
+
+/**
+ *  \brief Get a key code from a human-readable name
+ *
+ *  \return key code, or SDLK_UNKNOWN if the name wasn't recognized
+ *
+ *  \sa SDL_Keycode
+ */
+extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name);
+
+/**
+ *  \brief Start accepting Unicode text input events.
+ *         This function will show the on-screen keyboard if supported.
+ *
+ *  \sa SDL_StopTextInput()
+ *  \sa SDL_SetTextInputRect()
+ *  \sa SDL_HasScreenKeyboardSupport()
+ */
+extern DECLSPEC void SDLCALL SDL_StartTextInput(void);
+
+/**
+ *  \brief Return whether or not Unicode text input events are enabled.
+ *
+ *  \sa SDL_StartTextInput()
+ *  \sa SDL_StopTextInput()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void);
+
+/**
+ *  \brief Stop receiving any text input events.
+ *         This function will hide the on-screen keyboard if supported.
+ *
+ *  \sa SDL_StartTextInput()
+ *  \sa SDL_HasScreenKeyboardSupport()
+ */
+extern DECLSPEC void SDLCALL SDL_StopTextInput(void);
+
+/**
+ *  \brief Set the rectangle used to type Unicode text inputs.
+ *         This is used as a hint for IME and on-screen keyboard placement.
+ *
+ *  \sa SDL_StartTextInput()
+ */
+extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect);
+
+/**
+ *  \brief Returns whether the platform has some screen keyboard support.
+ *
+ *  \return SDL_TRUE if some keyboard support is available else SDL_FALSE.
+ *
+ *  \note Not all screen keyboard functions are supported on all platforms.
+ *
+ *  \sa SDL_IsScreenKeyboardShown()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void);
+
+/**
+ *  \brief Returns whether the screen keyboard is shown for given window.
+ *
+ *  \param window The window for which screen keyboard should be queried.
+ *
+ *  \return SDL_TRUE if screen keyboard is shown else SDL_FALSE.
+ *
+ *  \sa SDL_HasScreenKeyboardSupport()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_keyboard_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_keycode.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_keycode.h
new file mode 100644
index 0000000..3bceb41
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_keycode.h
@@ -0,0 +1,349 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_keycode.h
+ *
+ *  Defines constants which identify keyboard keys and modifiers.
+ */
+
+#ifndef SDL_keycode_h_
+#define SDL_keycode_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_scancode.h"
+
+/**
+ *  \brief The SDL virtual key representation.
+ *
+ *  Values of this type are used to represent keyboard keys using the current
+ *  layout of the keyboard.  These values include Unicode values representing
+ *  the unmodified character that would be generated by pressing the key, or
+ *  an SDLK_* constant for those keys that do not generate characters.
+ *
+ *  A special exception is the number keys at the top of the keyboard which
+ *  always map to SDLK_0...SDLK_9, regardless of layout.
+ */
+typedef Sint32 SDL_Keycode;
+
+#define SDLK_SCANCODE_MASK (1<<30)
+#define SDL_SCANCODE_TO_KEYCODE(X)  (X | SDLK_SCANCODE_MASK)
+
+enum
+{
+    SDLK_UNKNOWN = 0,
+
+    SDLK_RETURN = '\r',
+    SDLK_ESCAPE = '\033',
+    SDLK_BACKSPACE = '\b',
+    SDLK_TAB = '\t',
+    SDLK_SPACE = ' ',
+    SDLK_EXCLAIM = '!',
+    SDLK_QUOTEDBL = '"',
+    SDLK_HASH = '#',
+    SDLK_PERCENT = '%',
+    SDLK_DOLLAR = '$',
+    SDLK_AMPERSAND = '&',
+    SDLK_QUOTE = '\'',
+    SDLK_LEFTPAREN = '(',
+    SDLK_RIGHTPAREN = ')',
+    SDLK_ASTERISK = '*',
+    SDLK_PLUS = '+',
+    SDLK_COMMA = ',',
+    SDLK_MINUS = '-',
+    SDLK_PERIOD = '.',
+    SDLK_SLASH = '/',
+    SDLK_0 = '0',
+    SDLK_1 = '1',
+    SDLK_2 = '2',
+    SDLK_3 = '3',
+    SDLK_4 = '4',
+    SDLK_5 = '5',
+    SDLK_6 = '6',
+    SDLK_7 = '7',
+    SDLK_8 = '8',
+    SDLK_9 = '9',
+    SDLK_COLON = ':',
+    SDLK_SEMICOLON = ';',
+    SDLK_LESS = '<',
+    SDLK_EQUALS = '=',
+    SDLK_GREATER = '>',
+    SDLK_QUESTION = '?',
+    SDLK_AT = '@',
+    /*
+       Skip uppercase letters
+     */
+    SDLK_LEFTBRACKET = '[',
+    SDLK_BACKSLASH = '\\',
+    SDLK_RIGHTBRACKET = ']',
+    SDLK_CARET = '^',
+    SDLK_UNDERSCORE = '_',
+    SDLK_BACKQUOTE = '`',
+    SDLK_a = 'a',
+    SDLK_b = 'b',
+    SDLK_c = 'c',
+    SDLK_d = 'd',
+    SDLK_e = 'e',
+    SDLK_f = 'f',
+    SDLK_g = 'g',
+    SDLK_h = 'h',
+    SDLK_i = 'i',
+    SDLK_j = 'j',
+    SDLK_k = 'k',
+    SDLK_l = 'l',
+    SDLK_m = 'm',
+    SDLK_n = 'n',
+    SDLK_o = 'o',
+    SDLK_p = 'p',
+    SDLK_q = 'q',
+    SDLK_r = 'r',
+    SDLK_s = 's',
+    SDLK_t = 't',
+    SDLK_u = 'u',
+    SDLK_v = 'v',
+    SDLK_w = 'w',
+    SDLK_x = 'x',
+    SDLK_y = 'y',
+    SDLK_z = 'z',
+
+    SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK),
+
+    SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1),
+    SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2),
+    SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3),
+    SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4),
+    SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5),
+    SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6),
+    SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7),
+    SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8),
+    SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9),
+    SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10),
+    SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11),
+    SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12),
+
+    SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN),
+    SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK),
+    SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE),
+    SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT),
+    SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME),
+    SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP),
+    SDLK_DELETE = '\177',
+    SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END),
+    SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN),
+    SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT),
+    SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT),
+    SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN),
+    SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP),
+
+    SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR),
+    SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE),
+    SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY),
+    SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS),
+    SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS),
+    SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER),
+    SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1),
+    SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2),
+    SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3),
+    SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4),
+    SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5),
+    SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6),
+    SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7),
+    SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8),
+    SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9),
+    SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0),
+    SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD),
+
+    SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION),
+    SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER),
+    SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS),
+    SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13),
+    SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14),
+    SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15),
+    SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16),
+    SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17),
+    SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18),
+    SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19),
+    SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20),
+    SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21),
+    SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22),
+    SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23),
+    SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24),
+    SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE),
+    SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP),
+    SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU),
+    SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT),
+    SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP),
+    SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN),
+    SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO),
+    SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT),
+    SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY),
+    SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE),
+    SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND),
+    SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE),
+    SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP),
+    SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN),
+    SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA),
+    SDLK_KP_EQUALSAS400 =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400),
+
+    SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE),
+    SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ),
+    SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL),
+    SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR),
+    SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR),
+    SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2),
+    SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR),
+    SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT),
+    SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER),
+    SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN),
+    SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL),
+    SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL),
+
+    SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00),
+    SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000),
+    SDLK_THOUSANDSSEPARATOR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR),
+    SDLK_DECIMALSEPARATOR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR),
+    SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT),
+    SDLK_CURRENCYSUBUNIT =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT),
+    SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN),
+    SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN),
+    SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE),
+    SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE),
+    SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB),
+    SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE),
+    SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A),
+    SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B),
+    SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C),
+    SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D),
+    SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E),
+    SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F),
+    SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR),
+    SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER),
+    SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT),
+    SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS),
+    SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER),
+    SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND),
+    SDLK_KP_DBLAMPERSAND =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND),
+    SDLK_KP_VERTICALBAR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR),
+    SDLK_KP_DBLVERTICALBAR =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR),
+    SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON),
+    SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH),
+    SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE),
+    SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT),
+    SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM),
+    SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE),
+    SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL),
+    SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR),
+    SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD),
+    SDLK_KP_MEMSUBTRACT =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT),
+    SDLK_KP_MEMMULTIPLY =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY),
+    SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE),
+    SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS),
+    SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR),
+    SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY),
+    SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY),
+    SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL),
+    SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL),
+    SDLK_KP_HEXADECIMAL =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL),
+
+    SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL),
+    SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT),
+    SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT),
+    SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI),
+    SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL),
+    SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT),
+    SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT),
+    SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI),
+
+    SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE),
+
+    SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT),
+    SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV),
+    SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP),
+    SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY),
+    SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE),
+    SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT),
+    SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW),
+    SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL),
+    SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR),
+    SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER),
+    SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH),
+    SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME),
+    SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK),
+    SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD),
+    SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP),
+    SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH),
+    SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS),
+
+    SDLK_BRIGHTNESSDOWN =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN),
+    SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP),
+    SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH),
+    SDLK_KBDILLUMTOGGLE =
+        SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE),
+    SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN),
+    SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP),
+    SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT),
+    SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP),
+    SDLK_APP1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APP1),
+    SDLK_APP2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APP2),
+
+    SDLK_AUDIOREWIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOREWIND),
+    SDLK_AUDIOFASTFORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOFASTFORWARD)
+};
+
+/**
+ * \brief Enumeration of valid key mods (possibly OR'd together).
+ */
+typedef enum
+{
+    KMOD_NONE = 0x0000,
+    KMOD_LSHIFT = 0x0001,
+    KMOD_RSHIFT = 0x0002,
+    KMOD_LCTRL = 0x0040,
+    KMOD_RCTRL = 0x0080,
+    KMOD_LALT = 0x0100,
+    KMOD_RALT = 0x0200,
+    KMOD_LGUI = 0x0400,
+    KMOD_RGUI = 0x0800,
+    KMOD_NUM = 0x1000,
+    KMOD_CAPS = 0x2000,
+    KMOD_MODE = 0x4000,
+    KMOD_RESERVED = 0x8000
+} SDL_Keymod;
+
+#define KMOD_CTRL   (KMOD_LCTRL|KMOD_RCTRL)
+#define KMOD_SHIFT  (KMOD_LSHIFT|KMOD_RSHIFT)
+#define KMOD_ALT    (KMOD_LALT|KMOD_RALT)
+#define KMOD_GUI    (KMOD_LGUI|KMOD_RGUI)
+
+#endif /* SDL_keycode_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_loadso.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_loadso.h
new file mode 100644
index 0000000..793ba53
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_loadso.h
@@ -0,0 +1,81 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_loadso.h
+ *
+ *  System dependent library loading routines
+ *
+ *  Some things to keep in mind:
+ *  \li These functions only work on C function names.  Other languages may
+ *      have name mangling and intrinsic language support that varies from
+ *      compiler to compiler.
+ *  \li Make sure you declare your function pointers with the same calling
+ *      convention as the actual library function.  Your code will crash
+ *      mysteriously if you do not do this.
+ *  \li Avoid namespace collisions.  If you load a symbol from the library,
+ *      it is not defined whether or not it goes into the global symbol
+ *      namespace for the application.  If it does and it conflicts with
+ *      symbols in your code or other shared libraries, you will not get
+ *      the results you expect. :)
+ */
+
+#ifndef SDL_loadso_h_
+#define SDL_loadso_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  This function dynamically loads a shared object and returns a pointer
+ *  to the object handle (or NULL if there was an error).
+ *  The 'sofile' parameter is a system dependent name of the object file.
+ */
+extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile);
+
+/**
+ *  Given an object handle, this function looks up the address of the
+ *  named function in the shared object and returns it.  This address
+ *  is no longer valid after calling SDL_UnloadObject().
+ */
+extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle,
+                                               const char *name);
+
+/**
+ *  Unload a shared object from memory.
+ */
+extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_loadso_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_log.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_log.h
new file mode 100644
index 0000000..40f768d
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_log.h
@@ -0,0 +1,211 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_log.h
+ *
+ *  Simple log messages with categories and priorities.
+ *
+ *  By default logs are quiet, but if you're debugging SDL you might want:
+ *
+ *      SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN);
+ *
+ *  Here's where the messages go on different platforms:
+ *      Windows: debug output stream
+ *      Android: log output
+ *      Others: standard error output (stderr)
+ */
+
+#ifndef SDL_log_h_
+#define SDL_log_h_
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ *  \brief The maximum size of a log message
+ *
+ *  Messages longer than the maximum size will be truncated
+ */
+#define SDL_MAX_LOG_MESSAGE 4096
+
+/**
+ *  \brief The predefined log categories
+ *
+ *  By default the application category is enabled at the INFO level,
+ *  the assert category is enabled at the WARN level, test is enabled
+ *  at the VERBOSE level and all other categories are enabled at the
+ *  CRITICAL level.
+ */
+enum
+{
+    SDL_LOG_CATEGORY_APPLICATION,
+    SDL_LOG_CATEGORY_ERROR,
+    SDL_LOG_CATEGORY_ASSERT,
+    SDL_LOG_CATEGORY_SYSTEM,
+    SDL_LOG_CATEGORY_AUDIO,
+    SDL_LOG_CATEGORY_VIDEO,
+    SDL_LOG_CATEGORY_RENDER,
+    SDL_LOG_CATEGORY_INPUT,
+    SDL_LOG_CATEGORY_TEST,
+
+    /* Reserved for future SDL library use */
+    SDL_LOG_CATEGORY_RESERVED1,
+    SDL_LOG_CATEGORY_RESERVED2,
+    SDL_LOG_CATEGORY_RESERVED3,
+    SDL_LOG_CATEGORY_RESERVED4,
+    SDL_LOG_CATEGORY_RESERVED5,
+    SDL_LOG_CATEGORY_RESERVED6,
+    SDL_LOG_CATEGORY_RESERVED7,
+    SDL_LOG_CATEGORY_RESERVED8,
+    SDL_LOG_CATEGORY_RESERVED9,
+    SDL_LOG_CATEGORY_RESERVED10,
+
+    /* Beyond this point is reserved for application use, e.g.
+       enum {
+           MYAPP_CATEGORY_AWESOME1 = SDL_LOG_CATEGORY_CUSTOM,
+           MYAPP_CATEGORY_AWESOME2,
+           MYAPP_CATEGORY_AWESOME3,
+           ...
+       };
+     */
+    SDL_LOG_CATEGORY_CUSTOM
+};
+
+/**
+ *  \brief The predefined log priorities
+ */
+typedef enum
+{
+    SDL_LOG_PRIORITY_VERBOSE = 1,
+    SDL_LOG_PRIORITY_DEBUG,
+    SDL_LOG_PRIORITY_INFO,
+    SDL_LOG_PRIORITY_WARN,
+    SDL_LOG_PRIORITY_ERROR,
+    SDL_LOG_PRIORITY_CRITICAL,
+    SDL_NUM_LOG_PRIORITIES
+} SDL_LogPriority;
+
+
+/**
+ *  \brief Set the priority of all log categories
+ */
+extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority);
+
+/**
+ *  \brief Set the priority of a particular log category
+ */
+extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category,
+                                                SDL_LogPriority priority);
+
+/**
+ *  \brief Get the priority of a particular log category
+ */
+extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category);
+
+/**
+ *  \brief Reset all priorities to default.
+ *
+ *  \note This is called in SDL_Quit().
+ */
+extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void);
+
+/**
+ *  \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO
+ */
+extern DECLSPEC void SDLCALL SDL_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_VERBOSE
+ */
+extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_DEBUG
+ */
+extern DECLSPEC void SDLCALL SDL_LogDebug(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_INFO
+ */
+extern DECLSPEC void SDLCALL SDL_LogInfo(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_WARN
+ */
+extern DECLSPEC void SDLCALL SDL_LogWarn(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_ERROR
+ */
+extern DECLSPEC void SDLCALL SDL_LogError(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ *  \brief Log a message with SDL_LOG_PRIORITY_CRITICAL
+ */
+extern DECLSPEC void SDLCALL SDL_LogCritical(int category, SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ *  \brief Log a message with the specified category and priority.
+ */
+extern DECLSPEC void SDLCALL SDL_LogMessage(int category,
+                                            SDL_LogPriority priority,
+                                            SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(3);
+
+/**
+ *  \brief Log a message with the specified category and priority.
+ */
+extern DECLSPEC void SDLCALL SDL_LogMessageV(int category,
+                                             SDL_LogPriority priority,
+                                             const char *fmt, va_list ap);
+
+/**
+ *  \brief The prototype for the log output function
+ */
+typedef void (SDLCALL *SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message);
+
+/**
+ *  \brief Get the current log output function.
+ */
+extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata);
+
+/**
+ *  \brief This function allows you to replace the default log output
+ *         function with one of your own.
+ */
+extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_log_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_main.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_main.h
new file mode 100644
index 0000000..623f2d0
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_main.h
@@ -0,0 +1,180 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_main_h_
+#define SDL_main_h_
+
+#include "SDL_stdinc.h"
+
+/**
+ *  \file SDL_main.h
+ *
+ *  Redefine main() on some platforms so that it is called by SDL.
+ */
+
+#ifndef SDL_MAIN_HANDLED
+#if defined(__WIN32__)
+/* On Windows SDL provides WinMain(), which parses the command line and passes
+   the arguments to your main function.
+
+   If you provide your own WinMain(), you may define SDL_MAIN_HANDLED
+ */
+#define SDL_MAIN_AVAILABLE
+
+#elif defined(__WINRT__)
+/* On WinRT, SDL provides a main function that initializes CoreApplication,
+   creating an instance of IFrameworkView in the process.
+
+   Please note that #include'ing SDL_main.h is not enough to get a main()
+   function working.  In non-XAML apps, the file,
+   src/main/winrt/SDL_WinRT_main_NonXAML.cpp, or a copy of it, must be compiled
+   into the app itself.  In XAML apps, the function, SDL_WinRTRunApp must be
+   called, with a pointer to the Direct3D-hosted XAML control passed in.
+*/
+#define SDL_MAIN_NEEDED
+
+#elif defined(__IPHONEOS__)
+/* On iOS SDL provides a main function that creates an application delegate
+   and starts the iOS application run loop.
+
+   If you link with SDL dynamically on iOS, the main function can't be in a
+   shared library, so you need to link with libSDLmain.a, which includes a
+   stub main function that calls into the shared library to start execution.
+
+   See src/video/uikit/SDL_uikitappdelegate.m for more details.
+ */
+#define SDL_MAIN_NEEDED
+
+#elif defined(__ANDROID__)
+/* On Android SDL provides a Java class in SDLActivity.java that is the
+   main activity entry point.
+
+   See docs/README-android.md for more details on extending that class.
+ */
+#define SDL_MAIN_NEEDED
+
+/* We need to export SDL_main so it can be launched from Java */
+#define SDLMAIN_DECLSPEC    DECLSPEC
+
+#elif defined(__NACL__)
+/* On NACL we use ppapi_simple to set up the application helper code,
+   then wait for the first PSE_INSTANCE_DIDCHANGEVIEW event before 
+   starting the user main function.
+   All user code is run in a separate thread by ppapi_simple, thus 
+   allowing for blocking io to take place via nacl_io
+*/
+#define SDL_MAIN_NEEDED
+
+#endif
+#endif /* SDL_MAIN_HANDLED */
+
+#ifndef SDLMAIN_DECLSPEC
+#define SDLMAIN_DECLSPEC
+#endif
+
+/**
+ *  \file SDL_main.h
+ *
+ *  The application's main() function must be called with C linkage,
+ *  and should be declared like this:
+ *  \code
+ *  #ifdef __cplusplus
+ *  extern "C"
+ *  #endif
+ *  int main(int argc, char *argv[])
+ *  {
+ *  }
+ *  \endcode
+ */
+
+#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE)
+#define main    SDL_main
+#endif
+
+#include "begin_code.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  The prototype for the application's main() function
+ */
+typedef int (*SDL_main_func)(int argc, char *argv[]);
+extern SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[]);
+
+
+/**
+ *  This is called by the real SDL main function to let the rest of the
+ *  library know that initialization was done properly.
+ *
+ *  Calling this yourself without knowing what you're doing can cause
+ *  crashes and hard to diagnose problems with your application.
+ */
+extern DECLSPEC void SDLCALL SDL_SetMainReady(void);
+
+#ifdef __WIN32__
+
+/**
+ *  This can be called to set the application class at startup
+ */
+extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, void *hInst);
+extern DECLSPEC void SDLCALL SDL_UnregisterApp(void);
+
+#endif /* __WIN32__ */
+
+
+#ifdef __WINRT__
+
+/**
+ *  \brief Initializes and launches an SDL/WinRT application.
+ *
+ *  \param mainFunction The SDL app's C-style main().
+ *  \param reserved Reserved for future use; should be NULL
+ *  \return 0 on success, -1 on failure.  On failure, use SDL_GetError to retrieve more
+ *      information on the failure.
+ */
+extern DECLSPEC int SDLCALL SDL_WinRTRunApp(SDL_main_func mainFunction, void * reserved);
+
+#endif /* __WINRT__ */
+
+#if defined(__IPHONEOS__)
+
+/**
+ *  \brief Initializes and launches an SDL application.
+ *
+ *  \param argc The argc parameter from the application's main() function
+ *  \param argv The argv parameter from the application's main() function
+ *  \param mainFunction The SDL app's C-style main().
+ *  \return the return value from mainFunction
+ */
+extern DECLSPEC int SDLCALL SDL_UIKitRunApp(int argc, char *argv[], SDL_main_func mainFunction);
+
+#endif /* __IPHONEOS__ */
+
+
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_main_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_messagebox.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_messagebox.h
new file mode 100644
index 0000000..e34b554
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_messagebox.h
@@ -0,0 +1,144 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_messagebox_h_
+#define SDL_messagebox_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_video.h"      /* For SDL_Window */
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief SDL_MessageBox flags. If supported will display warning icon, etc.
+ */
+typedef enum
+{
+    SDL_MESSAGEBOX_ERROR        = 0x00000010,   /**< error dialog */
+    SDL_MESSAGEBOX_WARNING      = 0x00000020,   /**< warning dialog */
+    SDL_MESSAGEBOX_INFORMATION  = 0x00000040    /**< informational dialog */
+} SDL_MessageBoxFlags;
+
+/**
+ * \brief Flags for SDL_MessageBoxButtonData.
+ */
+typedef enum
+{
+    SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001,  /**< Marks the default button when return is hit */
+    SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002   /**< Marks the default button when escape is hit */
+} SDL_MessageBoxButtonFlags;
+
+/**
+ *  \brief Individual button data.
+ */
+typedef struct
+{
+    Uint32 flags;       /**< ::SDL_MessageBoxButtonFlags */
+    int buttonid;       /**< User defined button id (value returned via SDL_ShowMessageBox) */
+    const char * text;  /**< The UTF-8 button text */
+} SDL_MessageBoxButtonData;
+
+/**
+ * \brief RGB value used in a message box color scheme
+ */
+typedef struct
+{
+    Uint8 r, g, b;
+} SDL_MessageBoxColor;
+
+typedef enum
+{
+    SDL_MESSAGEBOX_COLOR_BACKGROUND,
+    SDL_MESSAGEBOX_COLOR_TEXT,
+    SDL_MESSAGEBOX_COLOR_BUTTON_BORDER,
+    SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND,
+    SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED,
+    SDL_MESSAGEBOX_COLOR_MAX
+} SDL_MessageBoxColorType;
+
+/**
+ * \brief A set of colors to use for message box dialogs
+ */
+typedef struct
+{
+    SDL_MessageBoxColor colors[SDL_MESSAGEBOX_COLOR_MAX];
+} SDL_MessageBoxColorScheme;
+
+/**
+ *  \brief MessageBox structure containing title, text, window, etc.
+ */
+typedef struct
+{
+    Uint32 flags;                       /**< ::SDL_MessageBoxFlags */
+    SDL_Window *window;                 /**< Parent window, can be NULL */
+    const char *title;                  /**< UTF-8 title */
+    const char *message;                /**< UTF-8 message text */
+
+    int numbuttons;
+    const SDL_MessageBoxButtonData *buttons;
+
+    const SDL_MessageBoxColorScheme *colorScheme;   /**< ::SDL_MessageBoxColorScheme, can be NULL to use system settings */
+} SDL_MessageBoxData;
+
+/**
+ *  \brief Create a modal message box.
+ *
+ *  \param messageboxdata The SDL_MessageBoxData structure with title, text, etc.
+ *  \param buttonid The pointer to which user id of hit button should be copied.
+ *
+ *  \return -1 on error, otherwise 0 and buttonid contains user id of button
+ *          hit or -1 if dialog was closed.
+ *
+ *  \note This function should be called on the thread that created the parent
+ *        window, or on the main thread if the messagebox has no parent.  It will
+ *        block execution of that thread until the user clicks a button or
+ *        closes the messagebox.
+ */
+extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
+
+/**
+ *  \brief Create a simple modal message box
+ *
+ *  \param flags    ::SDL_MessageBoxFlags
+ *  \param title    UTF-8 title text
+ *  \param message  UTF-8 message text
+ *  \param window   The parent window, or NULL for no parent
+ *
+ *  \return 0 on success, -1 on error
+ *
+ *  \sa SDL_ShowMessageBox
+ */
+extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_messagebox_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_mouse.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_mouse.h
new file mode 100644
index 0000000..277559d
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_mouse.h
@@ -0,0 +1,302 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_mouse.h
+ *
+ *  Include file for SDL mouse event handling.
+ */
+
+#ifndef SDL_mouse_h_
+#define SDL_mouse_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct SDL_Cursor SDL_Cursor;   /**< Implementation dependent */
+
+/**
+ * \brief Cursor types for SDL_CreateSystemCursor().
+ */
+typedef enum
+{
+    SDL_SYSTEM_CURSOR_ARROW,     /**< Arrow */
+    SDL_SYSTEM_CURSOR_IBEAM,     /**< I-beam */
+    SDL_SYSTEM_CURSOR_WAIT,      /**< Wait */
+    SDL_SYSTEM_CURSOR_CROSSHAIR, /**< Crosshair */
+    SDL_SYSTEM_CURSOR_WAITARROW, /**< Small wait cursor (or Wait if not available) */
+    SDL_SYSTEM_CURSOR_SIZENWSE,  /**< Double arrow pointing northwest and southeast */
+    SDL_SYSTEM_CURSOR_SIZENESW,  /**< Double arrow pointing northeast and southwest */
+    SDL_SYSTEM_CURSOR_SIZEWE,    /**< Double arrow pointing west and east */
+    SDL_SYSTEM_CURSOR_SIZENS,    /**< Double arrow pointing north and south */
+    SDL_SYSTEM_CURSOR_SIZEALL,   /**< Four pointed arrow pointing north, south, east, and west */
+    SDL_SYSTEM_CURSOR_NO,        /**< Slashed circle or crossbones */
+    SDL_SYSTEM_CURSOR_HAND,      /**< Hand */
+    SDL_NUM_SYSTEM_CURSORS
+} SDL_SystemCursor;
+
+/**
+ * \brief Scroll direction types for the Scroll event
+ */
+typedef enum
+{
+    SDL_MOUSEWHEEL_NORMAL,    /**< The scroll direction is normal */
+    SDL_MOUSEWHEEL_FLIPPED    /**< The scroll direction is flipped / natural */
+} SDL_MouseWheelDirection;
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the window which currently has mouse focus.
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void);
+
+/**
+ *  \brief Retrieve the current state of the mouse.
+ *
+ *  The current button state is returned as a button bitmask, which can
+ *  be tested using the SDL_BUTTON(X) macros, and x and y are set to the
+ *  mouse cursor position relative to the focus window for the currently
+ *  selected mouse.  You can pass NULL for either x or y.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y);
+
+/**
+ *  \brief Get the current state of the mouse, in relation to the desktop
+ *
+ *  This works just like SDL_GetMouseState(), but the coordinates will be
+ *  reported relative to the top-left of the desktop. This can be useful if
+ *  you need to track the mouse outside of a specific window and
+ *  SDL_CaptureMouse() doesn't fit your needs. For example, it could be
+ *  useful if you need to track the mouse while dragging a window, where
+ *  coordinates relative to a window might not be in sync at all times.
+ *
+ *  \note SDL_GetMouseState() returns the mouse position as SDL understands
+ *        it from the last pump of the event queue. This function, however,
+ *        queries the OS for the current mouse position, and as such, might
+ *        be a slightly less efficient function. Unless you know what you're
+ *        doing and have a good reason to use this function, you probably want
+ *        SDL_GetMouseState() instead.
+ *
+ *  \param x Returns the current X coord, relative to the desktop. Can be NULL.
+ *  \param y Returns the current Y coord, relative to the desktop. Can be NULL.
+ *  \return The current button state as a bitmask, which can be tested using the SDL_BUTTON(X) macros.
+ *
+ *  \sa SDL_GetMouseState
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetGlobalMouseState(int *x, int *y);
+
+/**
+ *  \brief Retrieve the relative state of the mouse.
+ *
+ *  The current button state is returned as a button bitmask, which can
+ *  be tested using the SDL_BUTTON(X) macros, and x and y are set to the
+ *  mouse deltas since the last call to SDL_GetRelativeMouseState().
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y);
+
+/**
+ *  \brief Moves the mouse to the given position within the window.
+ *
+ *  \param window The window to move the mouse into, or NULL for the current mouse focus
+ *  \param x The x coordinate within the window
+ *  \param y The y coordinate within the window
+ *
+ *  \note This function generates a mouse motion event
+ */
+extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window,
+                                                   int x, int y);
+
+/**
+ *  \brief Moves the mouse to the given position in global screen space.
+ *
+ *  \param x The x coordinate
+ *  \param y The y coordinate
+ *  \return 0 on success, -1 on error (usually: unsupported by a platform).
+ *
+ *  \note This function generates a mouse motion event
+ */
+extern DECLSPEC int SDLCALL SDL_WarpMouseGlobal(int x, int y);
+
+/**
+ *  \brief Set relative mouse mode.
+ *
+ *  \param enabled Whether or not to enable relative mode
+ *
+ *  \return 0 on success, or -1 if relative mode is not supported.
+ *
+ *  While the mouse is in relative mode, the cursor is hidden, and the
+ *  driver will try to report continuous motion in the current window.
+ *  Only relative motion events will be delivered, the mouse position
+ *  will not change.
+ *
+ *  \note This function will flush any pending mouse motion.
+ *
+ *  \sa SDL_GetRelativeMouseMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled);
+
+/**
+ *  \brief Capture the mouse, to track input outside an SDL window.
+ *
+ *  \param enabled Whether or not to enable capturing
+ *
+ *  Capturing enables your app to obtain mouse events globally, instead of
+ *  just within your window. Not all video targets support this function.
+ *  When capturing is enabled, the current window will get all mouse events,
+ *  but unlike relative mode, no change is made to the cursor and it is
+ *  not restrained to your window.
+ *
+ *  This function may also deny mouse input to other windows--both those in
+ *  your application and others on the system--so you should use this
+ *  function sparingly, and in small bursts. For example, you might want to
+ *  track the mouse while the user is dragging something, until the user
+ *  releases a mouse button. It is not recommended that you capture the mouse
+ *  for long periods of time, such as the entire time your app is running.
+ *
+ *  While captured, mouse events still report coordinates relative to the
+ *  current (foreground) window, but those coordinates may be outside the
+ *  bounds of the window (including negative values). Capturing is only
+ *  allowed for the foreground window. If the window loses focus while
+ *  capturing, the capture will be disabled automatically.
+ *
+ *  While capturing is enabled, the current window will have the
+ *  SDL_WINDOW_MOUSE_CAPTURE flag set.
+ *
+ *  \return 0 on success, or -1 if not supported.
+ */
+extern DECLSPEC int SDLCALL SDL_CaptureMouse(SDL_bool enabled);
+
+/**
+ *  \brief Query whether relative mouse mode is enabled.
+ *
+ *  \sa SDL_SetRelativeMouseMode()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void);
+
+/**
+ *  \brief Create a cursor, using the specified bitmap data and
+ *         mask (in MSB format).
+ *
+ *  The cursor width must be a multiple of 8 bits.
+ *
+ *  The cursor is created in black and white according to the following:
+ *  <table>
+ *  <tr><td> data </td><td> mask </td><td> resulting pixel on screen </td></tr>
+ *  <tr><td>  0   </td><td>  1   </td><td> White </td></tr>
+ *  <tr><td>  1   </td><td>  1   </td><td> Black </td></tr>
+ *  <tr><td>  0   </td><td>  0   </td><td> Transparent </td></tr>
+ *  <tr><td>  1   </td><td>  0   </td><td> Inverted color if possible, black
+ *                                         if not. </td></tr>
+ *  </table>
+ *
+ *  \sa SDL_FreeCursor()
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data,
+                                                     const Uint8 * mask,
+                                                     int w, int h, int hot_x,
+                                                     int hot_y);
+
+/**
+ *  \brief Create a color cursor.
+ *
+ *  \sa SDL_FreeCursor()
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface,
+                                                          int hot_x,
+                                                          int hot_y);
+
+/**
+ *  \brief Create a system cursor.
+ *
+ *  \sa SDL_FreeCursor()
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id);
+
+/**
+ *  \brief Set the active cursor.
+ */
+extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor);
+
+/**
+ *  \brief Return the active cursor.
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void);
+
+/**
+ *  \brief Return the default cursor.
+ */
+extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void);
+
+/**
+ *  \brief Frees a cursor created with SDL_CreateCursor() or similar functions.
+ *
+ *  \sa SDL_CreateCursor()
+ *  \sa SDL_CreateColorCursor()
+ *  \sa SDL_CreateSystemCursor()
+ */
+extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor);
+
+/**
+ *  \brief Toggle whether or not the cursor is shown.
+ *
+ *  \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current
+ *                state.
+ *
+ *  \return 1 if the cursor is shown, or 0 if the cursor is hidden.
+ */
+extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
+
+/**
+ *  Used as a mask when testing buttons in buttonstate.
+ *   - Button 1:  Left mouse button
+ *   - Button 2:  Middle mouse button
+ *   - Button 3:  Right mouse button
+ */
+#define SDL_BUTTON(X)       (1 << ((X)-1))
+#define SDL_BUTTON_LEFT     1
+#define SDL_BUTTON_MIDDLE   2
+#define SDL_BUTTON_RIGHT    3
+#define SDL_BUTTON_X1       4
+#define SDL_BUTTON_X2       5
+#define SDL_BUTTON_LMASK    SDL_BUTTON(SDL_BUTTON_LEFT)
+#define SDL_BUTTON_MMASK    SDL_BUTTON(SDL_BUTTON_MIDDLE)
+#define SDL_BUTTON_RMASK    SDL_BUTTON(SDL_BUTTON_RIGHT)
+#define SDL_BUTTON_X1MASK   SDL_BUTTON(SDL_BUTTON_X1)
+#define SDL_BUTTON_X2MASK   SDL_BUTTON(SDL_BUTTON_X2)
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_mouse_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_mutex.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_mutex.h
new file mode 100644
index 0000000..970e787
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_mutex.h
@@ -0,0 +1,251 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_mutex_h_
+#define SDL_mutex_h_
+
+/**
+ *  \file SDL_mutex.h
+ *
+ *  Functions to provide thread synchronization primitives.
+ */
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  Synchronization functions which can time out return this value
+ *  if they time out.
+ */
+#define SDL_MUTEX_TIMEDOUT  1
+
+/**
+ *  This is the timeout value which corresponds to never time out.
+ */
+#define SDL_MUTEX_MAXWAIT   (~(Uint32)0)
+
+
+/**
+ *  \name Mutex functions
+ */
+/* @{ */
+
+/* The SDL mutex structure, defined in SDL_sysmutex.c */
+struct SDL_mutex;
+typedef struct SDL_mutex SDL_mutex;
+
+/**
+ *  Create a mutex, initialized unlocked.
+ */
+extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void);
+
+/**
+ *  Lock the mutex.
+ *
+ *  \return 0, or -1 on error.
+ */
+#define SDL_mutexP(m)   SDL_LockMutex(m)
+extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex);
+
+/**
+ *  Try to lock the mutex
+ *
+ *  \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex);
+
+/**
+ *  Unlock the mutex.
+ *
+ *  \return 0, or -1 on error.
+ *
+ *  \warning It is an error to unlock a mutex that has not been locked by
+ *           the current thread, and doing so results in undefined behavior.
+ */
+#define SDL_mutexV(m)   SDL_UnlockMutex(m)
+extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex);
+
+/**
+ *  Destroy a mutex.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex);
+
+/* @} *//* Mutex functions */
+
+
+/**
+ *  \name Semaphore functions
+ */
+/* @{ */
+
+/* The SDL semaphore structure, defined in SDL_syssem.c */
+struct SDL_semaphore;
+typedef struct SDL_semaphore SDL_sem;
+
+/**
+ *  Create a semaphore, initialized with value, returns NULL on failure.
+ */
+extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value);
+
+/**
+ *  Destroy a semaphore.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem);
+
+/**
+ *  This function suspends the calling thread until the semaphore pointed
+ *  to by \c sem has a positive count. It then atomically decreases the
+ *  semaphore count.
+ */
+extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem);
+
+/**
+ *  Non-blocking variant of SDL_SemWait().
+ *
+ *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would
+ *          block, and -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem);
+
+/**
+ *  Variant of SDL_SemWait() with a timeout in milliseconds.
+ *
+ *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not
+ *          succeed in the allotted time, and -1 on error.
+ *
+ *  \warning On some platforms this function is implemented by looping with a
+ *           delay of 1 ms, and so should be avoided if possible.
+ */
+extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms);
+
+/**
+ *  Atomically increases the semaphore's count (not blocking).
+ *
+ *  \return 0, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem);
+
+/**
+ *  Returns the current count of the semaphore.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem);
+
+/* @} *//* Semaphore functions */
+
+
+/**
+ *  \name Condition variable functions
+ */
+/* @{ */
+
+/* The SDL condition variable structure, defined in SDL_syscond.c */
+struct SDL_cond;
+typedef struct SDL_cond SDL_cond;
+
+/**
+ *  Create a condition variable.
+ *
+ *  Typical use of condition variables:
+ *
+ *  Thread A:
+ *    SDL_LockMutex(lock);
+ *    while ( ! condition ) {
+ *        SDL_CondWait(cond, lock);
+ *    }
+ *    SDL_UnlockMutex(lock);
+ *
+ *  Thread B:
+ *    SDL_LockMutex(lock);
+ *    ...
+ *    condition = true;
+ *    ...
+ *    SDL_CondSignal(cond);
+ *    SDL_UnlockMutex(lock);
+ *
+ *  There is some discussion whether to signal the condition variable
+ *  with the mutex locked or not.  There is some potential performance
+ *  benefit to unlocking first on some platforms, but there are some
+ *  potential race conditions depending on how your code is structured.
+ *
+ *  In general it's safer to signal the condition variable while the
+ *  mutex is locked.
+ */
+extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void);
+
+/**
+ *  Destroy a condition variable.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond);
+
+/**
+ *  Restart one of the threads that are waiting on the condition variable.
+ *
+ *  \return 0 or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond);
+
+/**
+ *  Restart all threads that are waiting on the condition variable.
+ *
+ *  \return 0 or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond);
+
+/**
+ *  Wait on the condition variable, unlocking the provided mutex.
+ *
+ *  \warning The mutex must be locked before entering this function!
+ *
+ *  The mutex is re-locked once the condition variable is signaled.
+ *
+ *  \return 0 when it is signaled, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
+
+/**
+ *  Waits for at most \c ms milliseconds, and returns 0 if the condition
+ *  variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not
+ *  signaled in the allotted time, and -1 on error.
+ *
+ *  \warning On some platforms this function is implemented by looping with a
+ *           delay of 1 ms, and so should be avoided if possible.
+ */
+extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
+                                                SDL_mutex * mutex, Uint32 ms);
+
+/* @} *//* Condition variable functions */
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_mutex_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_name.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_name.h
new file mode 100644
index 0000000..690a819
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_name.h
@@ -0,0 +1,33 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDLname_h_
+#define SDLname_h_
+
+#if defined(__STDC__) || defined(__cplusplus)
+#define NeedFunctionPrototypes 1
+#endif
+
+#define SDL_NAME(X) SDL_##X
+
+#endif /* SDLname_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengl.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengl.h
new file mode 100644
index 0000000..6685be7
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengl.h
@@ -0,0 +1,2183 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_opengl.h
+ *
+ *  This is a simple file to encapsulate the OpenGL API headers.
+ */
+
+/**
+ *  \def NO_SDL_GLEXT
+ *
+ *  Define this if you have your own version of glext.h and want to disable the
+ *  version included in SDL_opengl.h.
+ */
+
+#ifndef SDL_opengl_h_
+#define SDL_opengl_h_
+
+#include "SDL_config.h"
+
+#ifndef __IPHONEOS__  /* No OpenGL on iOS. */
+
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#ifndef __gl_h_
+#define __gl_h_
+
+#if defined(USE_MGL_NAMESPACE)
+#include "gl_mangle.h"
+#endif
+
+
+/**********************************************************************
+ * Begin system-specific stuff.
+ */
+
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__)
+#define __WIN32__
+#endif
+
+#if defined(__WIN32__) && !defined(__CYGWIN__)
+#  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
+#    define GLAPI __declspec(dllexport)
+#  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
+#    define GLAPI __declspec(dllimport)
+#  else /* for use with static link lib build of Win32 edition only */
+#    define GLAPI extern
+#  endif /* _STATIC_MESA support */
+#  if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE)  /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */
+#    define GLAPIENTRY 
+#  else
+#    define GLAPIENTRY __stdcall
+#  endif
+#elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
+#  define GLAPI extern
+#  define GLAPIENTRY __stdcall
+#elif defined(__OS2__) || defined(__EMX__) /* native os/2 opengl */
+#  define GLAPI extern
+#  define GLAPIENTRY _System
+#  define APIENTRY _System
+#  if defined(__GNUC__) && !defined(_System)
+#    define _System
+#  endif
+#elif (defined(__GNUC__) && __GNUC__ >= 4) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#  define GLAPI __attribute__((visibility("default")))
+#  define GLAPIENTRY
+#endif /* WIN32 && !CYGWIN */
+
+/*
+ * WINDOWS: Include windows.h here to define APIENTRY.
+ * It is also useful when applications include this file by
+ * including only glut.h, since glut.h depends on windows.h.
+ * Applications needing to include windows.h with parms other
+ * than "WIN32_LEAN_AND_MEAN" may include windows.h before
+ * glut.h or gl.h.
+ */
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#ifndef NOMINMAX   /* don't define min() and max(). */
+#define NOMINMAX
+#endif
+#include <windows.h>
+#endif
+
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY GLAPIENTRY
+#endif
+
+/* "P" suffix to be used for a pointer to a function */
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export on
+#endif
+
+/*
+ * End system-specific stuff.
+ **********************************************************************/
+
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+
+#define GL_VERSION_1_1   1
+#define GL_VERSION_1_2   1
+#define GL_VERSION_1_3   1
+#define GL_ARB_imaging   1
+
+
+/*
+ * Datatypes
+ */
+typedef unsigned int	GLenum;
+typedef unsigned char	GLboolean;
+typedef unsigned int	GLbitfield;
+typedef void		GLvoid;
+typedef signed char	GLbyte;		/* 1-byte signed */
+typedef short		GLshort;	/* 2-byte signed */
+typedef int		GLint;		/* 4-byte signed */
+typedef unsigned char	GLubyte;	/* 1-byte unsigned */
+typedef unsigned short	GLushort;	/* 2-byte unsigned */
+typedef unsigned int	GLuint;		/* 4-byte unsigned */
+typedef int		GLsizei;	/* 4-byte signed */
+typedef float		GLfloat;	/* single precision float */
+typedef float		GLclampf;	/* single precision float in [0,1] */
+typedef double		GLdouble;	/* double precision float */
+typedef double		GLclampd;	/* double precision float in [0,1] */
+
+
+
+/*
+ * Constants
+ */
+
+/* Boolean values */
+#define GL_FALSE				0
+#define GL_TRUE					1
+
+/* Data types */
+#define GL_BYTE					0x1400
+#define GL_UNSIGNED_BYTE			0x1401
+#define GL_SHORT				0x1402
+#define GL_UNSIGNED_SHORT			0x1403
+#define GL_INT					0x1404
+#define GL_UNSIGNED_INT				0x1405
+#define GL_FLOAT				0x1406
+#define GL_2_BYTES				0x1407
+#define GL_3_BYTES				0x1408
+#define GL_4_BYTES				0x1409
+#define GL_DOUBLE				0x140A
+
+/* Primitives */
+#define GL_POINTS				0x0000
+#define GL_LINES				0x0001
+#define GL_LINE_LOOP				0x0002
+#define GL_LINE_STRIP				0x0003
+#define GL_TRIANGLES				0x0004
+#define GL_TRIANGLE_STRIP			0x0005
+#define GL_TRIANGLE_FAN				0x0006
+#define GL_QUADS				0x0007
+#define GL_QUAD_STRIP				0x0008
+#define GL_POLYGON				0x0009
+
+/* Vertex Arrays */
+#define GL_VERTEX_ARRAY				0x8074
+#define GL_NORMAL_ARRAY				0x8075
+#define GL_COLOR_ARRAY				0x8076
+#define GL_INDEX_ARRAY				0x8077
+#define GL_TEXTURE_COORD_ARRAY			0x8078
+#define GL_EDGE_FLAG_ARRAY			0x8079
+#define GL_VERTEX_ARRAY_SIZE			0x807A
+#define GL_VERTEX_ARRAY_TYPE			0x807B
+#define GL_VERTEX_ARRAY_STRIDE			0x807C
+#define GL_NORMAL_ARRAY_TYPE			0x807E
+#define GL_NORMAL_ARRAY_STRIDE			0x807F
+#define GL_COLOR_ARRAY_SIZE			0x8081
+#define GL_COLOR_ARRAY_TYPE			0x8082
+#define GL_COLOR_ARRAY_STRIDE			0x8083
+#define GL_INDEX_ARRAY_TYPE			0x8085
+#define GL_INDEX_ARRAY_STRIDE			0x8086
+#define GL_TEXTURE_COORD_ARRAY_SIZE		0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE		0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE		0x808A
+#define GL_EDGE_FLAG_ARRAY_STRIDE		0x808C
+#define GL_VERTEX_ARRAY_POINTER			0x808E
+#define GL_NORMAL_ARRAY_POINTER			0x808F
+#define GL_COLOR_ARRAY_POINTER			0x8090
+#define GL_INDEX_ARRAY_POINTER			0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER		0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER		0x8093
+#define GL_V2F					0x2A20
+#define GL_V3F					0x2A21
+#define GL_C4UB_V2F				0x2A22
+#define GL_C4UB_V3F				0x2A23
+#define GL_C3F_V3F				0x2A24
+#define GL_N3F_V3F				0x2A25
+#define GL_C4F_N3F_V3F				0x2A26
+#define GL_T2F_V3F				0x2A27
+#define GL_T4F_V4F				0x2A28
+#define GL_T2F_C4UB_V3F				0x2A29
+#define GL_T2F_C3F_V3F				0x2A2A
+#define GL_T2F_N3F_V3F				0x2A2B
+#define GL_T2F_C4F_N3F_V3F			0x2A2C
+#define GL_T4F_C4F_N3F_V4F			0x2A2D
+
+/* Matrix Mode */
+#define GL_MATRIX_MODE				0x0BA0
+#define GL_MODELVIEW				0x1700
+#define GL_PROJECTION				0x1701
+#define GL_TEXTURE				0x1702
+
+/* Points */
+#define GL_POINT_SMOOTH				0x0B10
+#define GL_POINT_SIZE				0x0B11
+#define GL_POINT_SIZE_GRANULARITY 		0x0B13
+#define GL_POINT_SIZE_RANGE			0x0B12
+
+/* Lines */
+#define GL_LINE_SMOOTH				0x0B20
+#define GL_LINE_STIPPLE				0x0B24
+#define GL_LINE_STIPPLE_PATTERN			0x0B25
+#define GL_LINE_STIPPLE_REPEAT			0x0B26
+#define GL_LINE_WIDTH				0x0B21
+#define GL_LINE_WIDTH_GRANULARITY		0x0B23
+#define GL_LINE_WIDTH_RANGE			0x0B22
+
+/* Polygons */
+#define GL_POINT				0x1B00
+#define GL_LINE					0x1B01
+#define GL_FILL					0x1B02
+#define GL_CW					0x0900
+#define GL_CCW					0x0901
+#define GL_FRONT				0x0404
+#define GL_BACK					0x0405
+#define GL_POLYGON_MODE				0x0B40
+#define GL_POLYGON_SMOOTH			0x0B41
+#define GL_POLYGON_STIPPLE			0x0B42
+#define GL_EDGE_FLAG				0x0B43
+#define GL_CULL_FACE				0x0B44
+#define GL_CULL_FACE_MODE			0x0B45
+#define GL_FRONT_FACE				0x0B46
+#define GL_POLYGON_OFFSET_FACTOR		0x8038
+#define GL_POLYGON_OFFSET_UNITS			0x2A00
+#define GL_POLYGON_OFFSET_POINT			0x2A01
+#define GL_POLYGON_OFFSET_LINE			0x2A02
+#define GL_POLYGON_OFFSET_FILL			0x8037
+
+/* Display Lists */
+#define GL_COMPILE				0x1300
+#define GL_COMPILE_AND_EXECUTE			0x1301
+#define GL_LIST_BASE				0x0B32
+#define GL_LIST_INDEX				0x0B33
+#define GL_LIST_MODE				0x0B30
+
+/* Depth buffer */
+#define GL_NEVER				0x0200
+#define GL_LESS					0x0201
+#define GL_EQUAL				0x0202
+#define GL_LEQUAL				0x0203
+#define GL_GREATER				0x0204
+#define GL_NOTEQUAL				0x0205
+#define GL_GEQUAL				0x0206
+#define GL_ALWAYS				0x0207
+#define GL_DEPTH_TEST				0x0B71
+#define GL_DEPTH_BITS				0x0D56
+#define GL_DEPTH_CLEAR_VALUE			0x0B73
+#define GL_DEPTH_FUNC				0x0B74
+#define GL_DEPTH_RANGE				0x0B70
+#define GL_DEPTH_WRITEMASK			0x0B72
+#define GL_DEPTH_COMPONENT			0x1902
+
+/* Lighting */
+#define GL_LIGHTING				0x0B50
+#define GL_LIGHT0				0x4000
+#define GL_LIGHT1				0x4001
+#define GL_LIGHT2				0x4002
+#define GL_LIGHT3				0x4003
+#define GL_LIGHT4				0x4004
+#define GL_LIGHT5				0x4005
+#define GL_LIGHT6				0x4006
+#define GL_LIGHT7				0x4007
+#define GL_SPOT_EXPONENT			0x1205
+#define GL_SPOT_CUTOFF				0x1206
+#define GL_CONSTANT_ATTENUATION			0x1207
+#define GL_LINEAR_ATTENUATION			0x1208
+#define GL_QUADRATIC_ATTENUATION		0x1209
+#define GL_AMBIENT				0x1200
+#define GL_DIFFUSE				0x1201
+#define GL_SPECULAR				0x1202
+#define GL_SHININESS				0x1601
+#define GL_EMISSION				0x1600
+#define GL_POSITION				0x1203
+#define GL_SPOT_DIRECTION			0x1204
+#define GL_AMBIENT_AND_DIFFUSE			0x1602
+#define GL_COLOR_INDEXES			0x1603
+#define GL_LIGHT_MODEL_TWO_SIDE			0x0B52
+#define GL_LIGHT_MODEL_LOCAL_VIEWER		0x0B51
+#define GL_LIGHT_MODEL_AMBIENT			0x0B53
+#define GL_FRONT_AND_BACK			0x0408
+#define GL_SHADE_MODEL				0x0B54
+#define GL_FLAT					0x1D00
+#define GL_SMOOTH				0x1D01
+#define GL_COLOR_MATERIAL			0x0B57
+#define GL_COLOR_MATERIAL_FACE			0x0B55
+#define GL_COLOR_MATERIAL_PARAMETER		0x0B56
+#define GL_NORMALIZE				0x0BA1
+
+/* User clipping planes */
+#define GL_CLIP_PLANE0				0x3000
+#define GL_CLIP_PLANE1				0x3001
+#define GL_CLIP_PLANE2				0x3002
+#define GL_CLIP_PLANE3				0x3003
+#define GL_CLIP_PLANE4				0x3004
+#define GL_CLIP_PLANE5				0x3005
+
+/* Accumulation buffer */
+#define GL_ACCUM_RED_BITS			0x0D58
+#define GL_ACCUM_GREEN_BITS			0x0D59
+#define GL_ACCUM_BLUE_BITS			0x0D5A
+#define GL_ACCUM_ALPHA_BITS			0x0D5B
+#define GL_ACCUM_CLEAR_VALUE			0x0B80
+#define GL_ACCUM				0x0100
+#define GL_ADD					0x0104
+#define GL_LOAD					0x0101
+#define GL_MULT					0x0103
+#define GL_RETURN				0x0102
+
+/* Alpha testing */
+#define GL_ALPHA_TEST				0x0BC0
+#define GL_ALPHA_TEST_REF			0x0BC2
+#define GL_ALPHA_TEST_FUNC			0x0BC1
+
+/* Blending */
+#define GL_BLEND				0x0BE2
+#define GL_BLEND_SRC				0x0BE1
+#define GL_BLEND_DST				0x0BE0
+#define GL_ZERO					0
+#define GL_ONE					1
+#define GL_SRC_COLOR				0x0300
+#define GL_ONE_MINUS_SRC_COLOR			0x0301
+#define GL_SRC_ALPHA				0x0302
+#define GL_ONE_MINUS_SRC_ALPHA			0x0303
+#define GL_DST_ALPHA				0x0304
+#define GL_ONE_MINUS_DST_ALPHA			0x0305
+#define GL_DST_COLOR				0x0306
+#define GL_ONE_MINUS_DST_COLOR			0x0307
+#define GL_SRC_ALPHA_SATURATE			0x0308
+
+/* Render Mode */
+#define GL_FEEDBACK				0x1C01
+#define GL_RENDER				0x1C00
+#define GL_SELECT				0x1C02
+
+/* Feedback */
+#define GL_2D					0x0600
+#define GL_3D					0x0601
+#define GL_3D_COLOR				0x0602
+#define GL_3D_COLOR_TEXTURE			0x0603
+#define GL_4D_COLOR_TEXTURE			0x0604
+#define GL_POINT_TOKEN				0x0701
+#define GL_LINE_TOKEN				0x0702
+#define GL_LINE_RESET_TOKEN			0x0707
+#define GL_POLYGON_TOKEN			0x0703
+#define GL_BITMAP_TOKEN				0x0704
+#define GL_DRAW_PIXEL_TOKEN			0x0705
+#define GL_COPY_PIXEL_TOKEN			0x0706
+#define GL_PASS_THROUGH_TOKEN			0x0700
+#define GL_FEEDBACK_BUFFER_POINTER		0x0DF0
+#define GL_FEEDBACK_BUFFER_SIZE			0x0DF1
+#define GL_FEEDBACK_BUFFER_TYPE			0x0DF2
+
+/* Selection */
+#define GL_SELECTION_BUFFER_POINTER		0x0DF3
+#define GL_SELECTION_BUFFER_SIZE		0x0DF4
+
+/* Fog */
+#define GL_FOG					0x0B60
+#define GL_FOG_MODE				0x0B65
+#define GL_FOG_DENSITY				0x0B62
+#define GL_FOG_COLOR				0x0B66
+#define GL_FOG_INDEX				0x0B61
+#define GL_FOG_START				0x0B63
+#define GL_FOG_END				0x0B64
+#define GL_LINEAR				0x2601
+#define GL_EXP					0x0800
+#define GL_EXP2					0x0801
+
+/* Logic Ops */
+#define GL_LOGIC_OP				0x0BF1
+#define GL_INDEX_LOGIC_OP			0x0BF1
+#define GL_COLOR_LOGIC_OP			0x0BF2
+#define GL_LOGIC_OP_MODE			0x0BF0
+#define GL_CLEAR				0x1500
+#define GL_SET					0x150F
+#define GL_COPY					0x1503
+#define GL_COPY_INVERTED			0x150C
+#define GL_NOOP					0x1505
+#define GL_INVERT				0x150A
+#define GL_AND					0x1501
+#define GL_NAND					0x150E
+#define GL_OR					0x1507
+#define GL_NOR					0x1508
+#define GL_XOR					0x1506
+#define GL_EQUIV				0x1509
+#define GL_AND_REVERSE				0x1502
+#define GL_AND_INVERTED				0x1504
+#define GL_OR_REVERSE				0x150B
+#define GL_OR_INVERTED				0x150D
+
+/* Stencil */
+#define GL_STENCIL_BITS				0x0D57
+#define GL_STENCIL_TEST				0x0B90
+#define GL_STENCIL_CLEAR_VALUE			0x0B91
+#define GL_STENCIL_FUNC				0x0B92
+#define GL_STENCIL_VALUE_MASK			0x0B93
+#define GL_STENCIL_FAIL				0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL		0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS		0x0B96
+#define GL_STENCIL_REF				0x0B97
+#define GL_STENCIL_WRITEMASK			0x0B98
+#define GL_STENCIL_INDEX			0x1901
+#define GL_KEEP					0x1E00
+#define GL_REPLACE				0x1E01
+#define GL_INCR					0x1E02
+#define GL_DECR					0x1E03
+
+/* Buffers, Pixel Drawing/Reading */
+#define GL_NONE					0
+#define GL_LEFT					0x0406
+#define GL_RIGHT				0x0407
+/*GL_FRONT					0x0404 */
+/*GL_BACK					0x0405 */
+/*GL_FRONT_AND_BACK				0x0408 */
+#define GL_FRONT_LEFT				0x0400
+#define GL_FRONT_RIGHT				0x0401
+#define GL_BACK_LEFT				0x0402
+#define GL_BACK_RIGHT				0x0403
+#define GL_AUX0					0x0409
+#define GL_AUX1					0x040A
+#define GL_AUX2					0x040B
+#define GL_AUX3					0x040C
+#define GL_COLOR_INDEX				0x1900
+#define GL_RED					0x1903
+#define GL_GREEN				0x1904
+#define GL_BLUE					0x1905
+#define GL_ALPHA				0x1906
+#define GL_LUMINANCE				0x1909
+#define GL_LUMINANCE_ALPHA			0x190A
+#define GL_ALPHA_BITS				0x0D55
+#define GL_RED_BITS				0x0D52
+#define GL_GREEN_BITS				0x0D53
+#define GL_BLUE_BITS				0x0D54
+#define GL_INDEX_BITS				0x0D51
+#define GL_SUBPIXEL_BITS			0x0D50
+#define GL_AUX_BUFFERS				0x0C00
+#define GL_READ_BUFFER				0x0C02
+#define GL_DRAW_BUFFER				0x0C01
+#define GL_DOUBLEBUFFER				0x0C32
+#define GL_STEREO				0x0C33
+#define GL_BITMAP				0x1A00
+#define GL_COLOR				0x1800
+#define GL_DEPTH				0x1801
+#define GL_STENCIL				0x1802
+#define GL_DITHER				0x0BD0
+#define GL_RGB					0x1907
+#define GL_RGBA					0x1908
+
+/* Implementation limits */
+#define GL_MAX_LIST_NESTING			0x0B31
+#define GL_MAX_EVAL_ORDER			0x0D30
+#define GL_MAX_LIGHTS				0x0D31
+#define GL_MAX_CLIP_PLANES			0x0D32
+#define GL_MAX_TEXTURE_SIZE			0x0D33
+#define GL_MAX_PIXEL_MAP_TABLE			0x0D34
+#define GL_MAX_ATTRIB_STACK_DEPTH		0x0D35
+#define GL_MAX_MODELVIEW_STACK_DEPTH		0x0D36
+#define GL_MAX_NAME_STACK_DEPTH			0x0D37
+#define GL_MAX_PROJECTION_STACK_DEPTH		0x0D38
+#define GL_MAX_TEXTURE_STACK_DEPTH		0x0D39
+#define GL_MAX_VIEWPORT_DIMS			0x0D3A
+#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH	0x0D3B
+
+/* Gets */
+#define GL_ATTRIB_STACK_DEPTH			0x0BB0
+#define GL_CLIENT_ATTRIB_STACK_DEPTH		0x0BB1
+#define GL_COLOR_CLEAR_VALUE			0x0C22
+#define GL_COLOR_WRITEMASK			0x0C23
+#define GL_CURRENT_INDEX			0x0B01
+#define GL_CURRENT_COLOR			0x0B00
+#define GL_CURRENT_NORMAL			0x0B02
+#define GL_CURRENT_RASTER_COLOR			0x0B04
+#define GL_CURRENT_RASTER_DISTANCE		0x0B09
+#define GL_CURRENT_RASTER_INDEX			0x0B05
+#define GL_CURRENT_RASTER_POSITION		0x0B07
+#define GL_CURRENT_RASTER_TEXTURE_COORDS	0x0B06
+#define GL_CURRENT_RASTER_POSITION_VALID	0x0B08
+#define GL_CURRENT_TEXTURE_COORDS		0x0B03
+#define GL_INDEX_CLEAR_VALUE			0x0C20
+#define GL_INDEX_MODE				0x0C30
+#define GL_INDEX_WRITEMASK			0x0C21
+#define GL_MODELVIEW_MATRIX			0x0BA6
+#define GL_MODELVIEW_STACK_DEPTH		0x0BA3
+#define GL_NAME_STACK_DEPTH			0x0D70
+#define GL_PROJECTION_MATRIX			0x0BA7
+#define GL_PROJECTION_STACK_DEPTH		0x0BA4
+#define GL_RENDER_MODE				0x0C40
+#define GL_RGBA_MODE				0x0C31
+#define GL_TEXTURE_MATRIX			0x0BA8
+#define GL_TEXTURE_STACK_DEPTH			0x0BA5
+#define GL_VIEWPORT				0x0BA2
+
+/* Evaluators */
+#define GL_AUTO_NORMAL				0x0D80
+#define GL_MAP1_COLOR_4				0x0D90
+#define GL_MAP1_INDEX				0x0D91
+#define GL_MAP1_NORMAL				0x0D92
+#define GL_MAP1_TEXTURE_COORD_1			0x0D93
+#define GL_MAP1_TEXTURE_COORD_2			0x0D94
+#define GL_MAP1_TEXTURE_COORD_3			0x0D95
+#define GL_MAP1_TEXTURE_COORD_4			0x0D96
+#define GL_MAP1_VERTEX_3			0x0D97
+#define GL_MAP1_VERTEX_4			0x0D98
+#define GL_MAP2_COLOR_4				0x0DB0
+#define GL_MAP2_INDEX				0x0DB1
+#define GL_MAP2_NORMAL				0x0DB2
+#define GL_MAP2_TEXTURE_COORD_1			0x0DB3
+#define GL_MAP2_TEXTURE_COORD_2			0x0DB4
+#define GL_MAP2_TEXTURE_COORD_3			0x0DB5
+#define GL_MAP2_TEXTURE_COORD_4			0x0DB6
+#define GL_MAP2_VERTEX_3			0x0DB7
+#define GL_MAP2_VERTEX_4			0x0DB8
+#define GL_MAP1_GRID_DOMAIN			0x0DD0
+#define GL_MAP1_GRID_SEGMENTS			0x0DD1
+#define GL_MAP2_GRID_DOMAIN			0x0DD2
+#define GL_MAP2_GRID_SEGMENTS			0x0DD3
+#define GL_COEFF				0x0A00
+#define GL_ORDER				0x0A01
+#define GL_DOMAIN				0x0A02
+
+/* Hints */
+#define GL_PERSPECTIVE_CORRECTION_HINT		0x0C50
+#define GL_POINT_SMOOTH_HINT			0x0C51
+#define GL_LINE_SMOOTH_HINT			0x0C52
+#define GL_POLYGON_SMOOTH_HINT			0x0C53
+#define GL_FOG_HINT				0x0C54
+#define GL_DONT_CARE				0x1100
+#define GL_FASTEST				0x1101
+#define GL_NICEST				0x1102
+
+/* Scissor box */
+#define GL_SCISSOR_BOX				0x0C10
+#define GL_SCISSOR_TEST				0x0C11
+
+/* Pixel Mode / Transfer */
+#define GL_MAP_COLOR				0x0D10
+#define GL_MAP_STENCIL				0x0D11
+#define GL_INDEX_SHIFT				0x0D12
+#define GL_INDEX_OFFSET				0x0D13
+#define GL_RED_SCALE				0x0D14
+#define GL_RED_BIAS				0x0D15
+#define GL_GREEN_SCALE				0x0D18
+#define GL_GREEN_BIAS				0x0D19
+#define GL_BLUE_SCALE				0x0D1A
+#define GL_BLUE_BIAS				0x0D1B
+#define GL_ALPHA_SCALE				0x0D1C
+#define GL_ALPHA_BIAS				0x0D1D
+#define GL_DEPTH_SCALE				0x0D1E
+#define GL_DEPTH_BIAS				0x0D1F
+#define GL_PIXEL_MAP_S_TO_S_SIZE		0x0CB1
+#define GL_PIXEL_MAP_I_TO_I_SIZE		0x0CB0
+#define GL_PIXEL_MAP_I_TO_R_SIZE		0x0CB2
+#define GL_PIXEL_MAP_I_TO_G_SIZE		0x0CB3
+#define GL_PIXEL_MAP_I_TO_B_SIZE		0x0CB4
+#define GL_PIXEL_MAP_I_TO_A_SIZE		0x0CB5
+#define GL_PIXEL_MAP_R_TO_R_SIZE		0x0CB6
+#define GL_PIXEL_MAP_G_TO_G_SIZE		0x0CB7
+#define GL_PIXEL_MAP_B_TO_B_SIZE		0x0CB8
+#define GL_PIXEL_MAP_A_TO_A_SIZE		0x0CB9
+#define GL_PIXEL_MAP_S_TO_S			0x0C71
+#define GL_PIXEL_MAP_I_TO_I			0x0C70
+#define GL_PIXEL_MAP_I_TO_R			0x0C72
+#define GL_PIXEL_MAP_I_TO_G			0x0C73
+#define GL_PIXEL_MAP_I_TO_B			0x0C74
+#define GL_PIXEL_MAP_I_TO_A			0x0C75
+#define GL_PIXEL_MAP_R_TO_R			0x0C76
+#define GL_PIXEL_MAP_G_TO_G			0x0C77
+#define GL_PIXEL_MAP_B_TO_B			0x0C78
+#define GL_PIXEL_MAP_A_TO_A			0x0C79
+#define GL_PACK_ALIGNMENT			0x0D05
+#define GL_PACK_LSB_FIRST			0x0D01
+#define GL_PACK_ROW_LENGTH			0x0D02
+#define GL_PACK_SKIP_PIXELS			0x0D04
+#define GL_PACK_SKIP_ROWS			0x0D03
+#define GL_PACK_SWAP_BYTES			0x0D00
+#define GL_UNPACK_ALIGNMENT			0x0CF5
+#define GL_UNPACK_LSB_FIRST			0x0CF1
+#define GL_UNPACK_ROW_LENGTH			0x0CF2
+#define GL_UNPACK_SKIP_PIXELS			0x0CF4
+#define GL_UNPACK_SKIP_ROWS			0x0CF3
+#define GL_UNPACK_SWAP_BYTES			0x0CF0
+#define GL_ZOOM_X				0x0D16
+#define GL_ZOOM_Y				0x0D17
+
+/* Texture mapping */
+#define GL_TEXTURE_ENV				0x2300
+#define GL_TEXTURE_ENV_MODE			0x2200
+#define GL_TEXTURE_1D				0x0DE0
+#define GL_TEXTURE_2D				0x0DE1
+#define GL_TEXTURE_WRAP_S			0x2802
+#define GL_TEXTURE_WRAP_T			0x2803
+#define GL_TEXTURE_MAG_FILTER			0x2800
+#define GL_TEXTURE_MIN_FILTER			0x2801
+#define GL_TEXTURE_ENV_COLOR			0x2201
+#define GL_TEXTURE_GEN_S			0x0C60
+#define GL_TEXTURE_GEN_T			0x0C61
+#define GL_TEXTURE_GEN_R			0x0C62
+#define GL_TEXTURE_GEN_Q			0x0C63
+#define GL_TEXTURE_GEN_MODE			0x2500
+#define GL_TEXTURE_BORDER_COLOR			0x1004
+#define GL_TEXTURE_WIDTH			0x1000
+#define GL_TEXTURE_HEIGHT			0x1001
+#define GL_TEXTURE_BORDER			0x1005
+#define GL_TEXTURE_COMPONENTS			0x1003
+#define GL_TEXTURE_RED_SIZE			0x805C
+#define GL_TEXTURE_GREEN_SIZE			0x805D
+#define GL_TEXTURE_BLUE_SIZE			0x805E
+#define GL_TEXTURE_ALPHA_SIZE			0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE		0x8060
+#define GL_TEXTURE_INTENSITY_SIZE		0x8061
+#define GL_NEAREST_MIPMAP_NEAREST		0x2700
+#define GL_NEAREST_MIPMAP_LINEAR		0x2702
+#define GL_LINEAR_MIPMAP_NEAREST		0x2701
+#define GL_LINEAR_MIPMAP_LINEAR			0x2703
+#define GL_OBJECT_LINEAR			0x2401
+#define GL_OBJECT_PLANE				0x2501
+#define GL_EYE_LINEAR				0x2400
+#define GL_EYE_PLANE				0x2502
+#define GL_SPHERE_MAP				0x2402
+#define GL_DECAL				0x2101
+#define GL_MODULATE				0x2100
+#define GL_NEAREST				0x2600
+#define GL_REPEAT				0x2901
+#define GL_CLAMP				0x2900
+#define GL_S					0x2000
+#define GL_T					0x2001
+#define GL_R					0x2002
+#define GL_Q					0x2003
+
+/* Utility */
+#define GL_VENDOR				0x1F00
+#define GL_RENDERER				0x1F01
+#define GL_VERSION				0x1F02
+#define GL_EXTENSIONS				0x1F03
+
+/* Errors */
+#define GL_NO_ERROR 				0
+#define GL_INVALID_ENUM				0x0500
+#define GL_INVALID_VALUE			0x0501
+#define GL_INVALID_OPERATION			0x0502
+#define GL_STACK_OVERFLOW			0x0503
+#define GL_STACK_UNDERFLOW			0x0504
+#define GL_OUT_OF_MEMORY			0x0505
+
+/* glPush/PopAttrib bits */
+#define GL_CURRENT_BIT				0x00000001
+#define GL_POINT_BIT				0x00000002
+#define GL_LINE_BIT				0x00000004
+#define GL_POLYGON_BIT				0x00000008
+#define GL_POLYGON_STIPPLE_BIT			0x00000010
+#define GL_PIXEL_MODE_BIT			0x00000020
+#define GL_LIGHTING_BIT				0x00000040
+#define GL_FOG_BIT				0x00000080
+#define GL_DEPTH_BUFFER_BIT			0x00000100
+#define GL_ACCUM_BUFFER_BIT			0x00000200
+#define GL_STENCIL_BUFFER_BIT			0x00000400
+#define GL_VIEWPORT_BIT				0x00000800
+#define GL_TRANSFORM_BIT			0x00001000
+#define GL_ENABLE_BIT				0x00002000
+#define GL_COLOR_BUFFER_BIT			0x00004000
+#define GL_HINT_BIT				0x00008000
+#define GL_EVAL_BIT				0x00010000
+#define GL_LIST_BIT				0x00020000
+#define GL_TEXTURE_BIT				0x00040000
+#define GL_SCISSOR_BIT				0x00080000
+#define GL_ALL_ATTRIB_BITS			0x000FFFFF
+
+
+/* OpenGL 1.1 */
+#define GL_PROXY_TEXTURE_1D			0x8063
+#define GL_PROXY_TEXTURE_2D			0x8064
+#define GL_TEXTURE_PRIORITY			0x8066
+#define GL_TEXTURE_RESIDENT			0x8067
+#define GL_TEXTURE_BINDING_1D			0x8068
+#define GL_TEXTURE_BINDING_2D			0x8069
+#define GL_TEXTURE_INTERNAL_FORMAT		0x1003
+#define GL_ALPHA4				0x803B
+#define GL_ALPHA8				0x803C
+#define GL_ALPHA12				0x803D
+#define GL_ALPHA16				0x803E
+#define GL_LUMINANCE4				0x803F
+#define GL_LUMINANCE8				0x8040
+#define GL_LUMINANCE12				0x8041
+#define GL_LUMINANCE16				0x8042
+#define GL_LUMINANCE4_ALPHA4			0x8043
+#define GL_LUMINANCE6_ALPHA2			0x8044
+#define GL_LUMINANCE8_ALPHA8			0x8045
+#define GL_LUMINANCE12_ALPHA4			0x8046
+#define GL_LUMINANCE12_ALPHA12			0x8047
+#define GL_LUMINANCE16_ALPHA16			0x8048
+#define GL_INTENSITY				0x8049
+#define GL_INTENSITY4				0x804A
+#define GL_INTENSITY8				0x804B
+#define GL_INTENSITY12				0x804C
+#define GL_INTENSITY16				0x804D
+#define GL_R3_G3_B2				0x2A10
+#define GL_RGB4					0x804F
+#define GL_RGB5					0x8050
+#define GL_RGB8					0x8051
+#define GL_RGB10				0x8052
+#define GL_RGB12				0x8053
+#define GL_RGB16				0x8054
+#define GL_RGBA2				0x8055
+#define GL_RGBA4				0x8056
+#define GL_RGB5_A1				0x8057
+#define GL_RGBA8				0x8058
+#define GL_RGB10_A2				0x8059
+#define GL_RGBA12				0x805A
+#define GL_RGBA16				0x805B
+#define GL_CLIENT_PIXEL_STORE_BIT		0x00000001
+#define GL_CLIENT_VERTEX_ARRAY_BIT		0x00000002
+#define GL_ALL_CLIENT_ATTRIB_BITS 		0xFFFFFFFF
+#define GL_CLIENT_ALL_ATTRIB_BITS 		0xFFFFFFFF
+
+
+
+/*
+ * Miscellaneous
+ */
+
+GLAPI void GLAPIENTRY glClearIndex( GLfloat c );
+
+GLAPI void GLAPIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glClear( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glIndexMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
+
+GLAPI void GLAPIENTRY glAlphaFunc( GLenum func, GLclampf ref );
+
+GLAPI void GLAPIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor );
+
+GLAPI void GLAPIENTRY glLogicOp( GLenum opcode );
+
+GLAPI void GLAPIENTRY glCullFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glFrontFace( GLenum mode );
+
+GLAPI void GLAPIENTRY glPointSize( GLfloat size );
+
+GLAPI void GLAPIENTRY glLineWidth( GLfloat width );
+
+GLAPI void GLAPIENTRY glLineStipple( GLint factor, GLushort pattern );
+
+GLAPI void GLAPIENTRY glPolygonMode( GLenum face, GLenum mode );
+
+GLAPI void GLAPIENTRY glPolygonOffset( GLfloat factor, GLfloat units );
+
+GLAPI void GLAPIENTRY glPolygonStipple( const GLubyte *mask );
+
+GLAPI void GLAPIENTRY glGetPolygonStipple( GLubyte *mask );
+
+GLAPI void GLAPIENTRY glEdgeFlag( GLboolean flag );
+
+GLAPI void GLAPIENTRY glEdgeFlagv( const GLboolean *flag );
+
+GLAPI void GLAPIENTRY glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
+
+GLAPI void GLAPIENTRY glClipPlane( GLenum plane, const GLdouble *equation );
+
+GLAPI void GLAPIENTRY glGetClipPlane( GLenum plane, GLdouble *equation );
+
+GLAPI void GLAPIENTRY glDrawBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glReadBuffer( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnable( GLenum cap );
+
+GLAPI void GLAPIENTRY glDisable( GLenum cap );
+
+GLAPI GLboolean GLAPIENTRY glIsEnabled( GLenum cap );
+
+
+GLAPI void GLAPIENTRY glEnableClientState( GLenum cap );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glDisableClientState( GLenum cap );  /* 1.1 */
+
+
+GLAPI void GLAPIENTRY glGetBooleanv( GLenum pname, GLboolean *params );
+
+GLAPI void GLAPIENTRY glGetDoublev( GLenum pname, GLdouble *params );
+
+GLAPI void GLAPIENTRY glGetFloatv( GLenum pname, GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetIntegerv( GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glPushAttrib( GLbitfield mask );
+
+GLAPI void GLAPIENTRY glPopAttrib( void );
+
+
+GLAPI void GLAPIENTRY glPushClientAttrib( GLbitfield mask );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glPopClientAttrib( void );  /* 1.1 */
+
+
+GLAPI GLint GLAPIENTRY glRenderMode( GLenum mode );
+
+GLAPI GLenum GLAPIENTRY glGetError( void );
+
+GLAPI const GLubyte * GLAPIENTRY glGetString( GLenum name );
+
+GLAPI void GLAPIENTRY glFinish( void );
+
+GLAPI void GLAPIENTRY glFlush( void );
+
+GLAPI void GLAPIENTRY glHint( GLenum target, GLenum mode );
+
+
+/*
+ * Depth Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearDepth( GLclampd depth );
+
+GLAPI void GLAPIENTRY glDepthFunc( GLenum func );
+
+GLAPI void GLAPIENTRY glDepthMask( GLboolean flag );
+
+GLAPI void GLAPIENTRY glDepthRange( GLclampd near_val, GLclampd far_val );
+
+
+/*
+ * Accumulation Buffer
+ */
+
+GLAPI void GLAPIENTRY glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
+
+GLAPI void GLAPIENTRY glAccum( GLenum op, GLfloat value );
+
+
+/*
+ * Transformation
+ */
+
+GLAPI void GLAPIENTRY glMatrixMode( GLenum mode );
+
+GLAPI void GLAPIENTRY glOrtho( GLdouble left, GLdouble right,
+                                 GLdouble bottom, GLdouble top,
+                                 GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glFrustum( GLdouble left, GLdouble right,
+                                   GLdouble bottom, GLdouble top,
+                                   GLdouble near_val, GLdouble far_val );
+
+GLAPI void GLAPIENTRY glViewport( GLint x, GLint y,
+                                    GLsizei width, GLsizei height );
+
+GLAPI void GLAPIENTRY glPushMatrix( void );
+
+GLAPI void GLAPIENTRY glPopMatrix( void );
+
+GLAPI void GLAPIENTRY glLoadIdentity( void );
+
+GLAPI void GLAPIENTRY glLoadMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glLoadMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glMultMatrixd( const GLdouble *m );
+GLAPI void GLAPIENTRY glMultMatrixf( const GLfloat *m );
+
+GLAPI void GLAPIENTRY glRotated( GLdouble angle,
+                                   GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRotatef( GLfloat angle,
+                                   GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glScaled( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glScalef( GLfloat x, GLfloat y, GLfloat z );
+
+GLAPI void GLAPIENTRY glTranslated( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glTranslatef( GLfloat x, GLfloat y, GLfloat z );
+
+
+/*
+ * Display Lists
+ */
+
+GLAPI GLboolean GLAPIENTRY glIsList( GLuint list );
+
+GLAPI void GLAPIENTRY glDeleteLists( GLuint list, GLsizei range );
+
+GLAPI GLuint GLAPIENTRY glGenLists( GLsizei range );
+
+GLAPI void GLAPIENTRY glNewList( GLuint list, GLenum mode );
+
+GLAPI void GLAPIENTRY glEndList( void );
+
+GLAPI void GLAPIENTRY glCallList( GLuint list );
+
+GLAPI void GLAPIENTRY glCallLists( GLsizei n, GLenum type,
+                                     const GLvoid *lists );
+
+GLAPI void GLAPIENTRY glListBase( GLuint base );
+
+
+/*
+ * Drawing Functions
+ */
+
+GLAPI void GLAPIENTRY glBegin( GLenum mode );
+
+GLAPI void GLAPIENTRY glEnd( void );
+
+
+GLAPI void GLAPIENTRY glVertex2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glVertex2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glVertex2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glVertex2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glVertex3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glVertex3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glVertex3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glVertex3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glVertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glVertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glVertex4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glVertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glVertex2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex2iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex3iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glVertex4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glVertex4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glVertex4iv( const GLint *v );
+GLAPI void GLAPIENTRY glVertex4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glNormal3b( GLbyte nx, GLbyte ny, GLbyte nz );
+GLAPI void GLAPIENTRY glNormal3d( GLdouble nx, GLdouble ny, GLdouble nz );
+GLAPI void GLAPIENTRY glNormal3f( GLfloat nx, GLfloat ny, GLfloat nz );
+GLAPI void GLAPIENTRY glNormal3i( GLint nx, GLint ny, GLint nz );
+GLAPI void GLAPIENTRY glNormal3s( GLshort nx, GLshort ny, GLshort nz );
+
+GLAPI void GLAPIENTRY glNormal3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glNormal3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glNormal3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glNormal3iv( const GLint *v );
+GLAPI void GLAPIENTRY glNormal3sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glIndexd( GLdouble c );
+GLAPI void GLAPIENTRY glIndexf( GLfloat c );
+GLAPI void GLAPIENTRY glIndexi( GLint c );
+GLAPI void GLAPIENTRY glIndexs( GLshort c );
+GLAPI void GLAPIENTRY glIndexub( GLubyte c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glIndexdv( const GLdouble *c );
+GLAPI void GLAPIENTRY glIndexfv( const GLfloat *c );
+GLAPI void GLAPIENTRY glIndexiv( const GLint *c );
+GLAPI void GLAPIENTRY glIndexsv( const GLshort *c );
+GLAPI void GLAPIENTRY glIndexubv( const GLubyte *c );  /* 1.1 */
+
+GLAPI void GLAPIENTRY glColor3b( GLbyte red, GLbyte green, GLbyte blue );
+GLAPI void GLAPIENTRY glColor3d( GLdouble red, GLdouble green, GLdouble blue );
+GLAPI void GLAPIENTRY glColor3f( GLfloat red, GLfloat green, GLfloat blue );
+GLAPI void GLAPIENTRY glColor3i( GLint red, GLint green, GLint blue );
+GLAPI void GLAPIENTRY glColor3s( GLshort red, GLshort green, GLshort blue );
+GLAPI void GLAPIENTRY glColor3ub( GLubyte red, GLubyte green, GLubyte blue );
+GLAPI void GLAPIENTRY glColor3ui( GLuint red, GLuint green, GLuint blue );
+GLAPI void GLAPIENTRY glColor3us( GLushort red, GLushort green, GLushort blue );
+
+GLAPI void GLAPIENTRY glColor4b( GLbyte red, GLbyte green,
+                                   GLbyte blue, GLbyte alpha );
+GLAPI void GLAPIENTRY glColor4d( GLdouble red, GLdouble green,
+                                   GLdouble blue, GLdouble alpha );
+GLAPI void GLAPIENTRY glColor4f( GLfloat red, GLfloat green,
+                                   GLfloat blue, GLfloat alpha );
+GLAPI void GLAPIENTRY glColor4i( GLint red, GLint green,
+                                   GLint blue, GLint alpha );
+GLAPI void GLAPIENTRY glColor4s( GLshort red, GLshort green,
+                                   GLshort blue, GLshort alpha );
+GLAPI void GLAPIENTRY glColor4ub( GLubyte red, GLubyte green,
+                                    GLubyte blue, GLubyte alpha );
+GLAPI void GLAPIENTRY glColor4ui( GLuint red, GLuint green,
+                                    GLuint blue, GLuint alpha );
+GLAPI void GLAPIENTRY glColor4us( GLushort red, GLushort green,
+                                    GLushort blue, GLushort alpha );
+
+
+GLAPI void GLAPIENTRY glColor3bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor3iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor3sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor3ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor3uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor3usv( const GLushort *v );
+
+GLAPI void GLAPIENTRY glColor4bv( const GLbyte *v );
+GLAPI void GLAPIENTRY glColor4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glColor4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glColor4iv( const GLint *v );
+GLAPI void GLAPIENTRY glColor4sv( const GLshort *v );
+GLAPI void GLAPIENTRY glColor4ubv( const GLubyte *v );
+GLAPI void GLAPIENTRY glColor4uiv( const GLuint *v );
+GLAPI void GLAPIENTRY glColor4usv( const GLushort *v );
+
+
+GLAPI void GLAPIENTRY glTexCoord1d( GLdouble s );
+GLAPI void GLAPIENTRY glTexCoord1f( GLfloat s );
+GLAPI void GLAPIENTRY glTexCoord1i( GLint s );
+GLAPI void GLAPIENTRY glTexCoord1s( GLshort s );
+
+GLAPI void GLAPIENTRY glTexCoord2d( GLdouble s, GLdouble t );
+GLAPI void GLAPIENTRY glTexCoord2f( GLfloat s, GLfloat t );
+GLAPI void GLAPIENTRY glTexCoord2i( GLint s, GLint t );
+GLAPI void GLAPIENTRY glTexCoord2s( GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glTexCoord3d( GLdouble s, GLdouble t, GLdouble r );
+GLAPI void GLAPIENTRY glTexCoord3f( GLfloat s, GLfloat t, GLfloat r );
+GLAPI void GLAPIENTRY glTexCoord3i( GLint s, GLint t, GLint r );
+GLAPI void GLAPIENTRY glTexCoord3s( GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glTexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+GLAPI void GLAPIENTRY glTexCoord4f( GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+GLAPI void GLAPIENTRY glTexCoord4i( GLint s, GLint t, GLint r, GLint q );
+GLAPI void GLAPIENTRY glTexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glTexCoord1dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord1fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord1iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord1sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord2iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord3iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glTexCoord4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glTexCoord4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glTexCoord4iv( const GLint *v );
+GLAPI void GLAPIENTRY glTexCoord4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRasterPos2d( GLdouble x, GLdouble y );
+GLAPI void GLAPIENTRY glRasterPos2f( GLfloat x, GLfloat y );
+GLAPI void GLAPIENTRY glRasterPos2i( GLint x, GLint y );
+GLAPI void GLAPIENTRY glRasterPos2s( GLshort x, GLshort y );
+
+GLAPI void GLAPIENTRY glRasterPos3d( GLdouble x, GLdouble y, GLdouble z );
+GLAPI void GLAPIENTRY glRasterPos3f( GLfloat x, GLfloat y, GLfloat z );
+GLAPI void GLAPIENTRY glRasterPos3i( GLint x, GLint y, GLint z );
+GLAPI void GLAPIENTRY glRasterPos3s( GLshort x, GLshort y, GLshort z );
+
+GLAPI void GLAPIENTRY glRasterPos4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
+GLAPI void GLAPIENTRY glRasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w );
+GLAPI void GLAPIENTRY glRasterPos4i( GLint x, GLint y, GLint z, GLint w );
+GLAPI void GLAPIENTRY glRasterPos4s( GLshort x, GLshort y, GLshort z, GLshort w );
+
+GLAPI void GLAPIENTRY glRasterPos2dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos2fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos2iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos2sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos3dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos3fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos3iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos3sv( const GLshort *v );
+
+GLAPI void GLAPIENTRY glRasterPos4dv( const GLdouble *v );
+GLAPI void GLAPIENTRY glRasterPos4fv( const GLfloat *v );
+GLAPI void GLAPIENTRY glRasterPos4iv( const GLint *v );
+GLAPI void GLAPIENTRY glRasterPos4sv( const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glRectd( GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2 );
+GLAPI void GLAPIENTRY glRectf( GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2 );
+GLAPI void GLAPIENTRY glRecti( GLint x1, GLint y1, GLint x2, GLint y2 );
+GLAPI void GLAPIENTRY glRects( GLshort x1, GLshort y1, GLshort x2, GLshort y2 );
+
+
+GLAPI void GLAPIENTRY glRectdv( const GLdouble *v1, const GLdouble *v2 );
+GLAPI void GLAPIENTRY glRectfv( const GLfloat *v1, const GLfloat *v2 );
+GLAPI void GLAPIENTRY glRectiv( const GLint *v1, const GLint *v2 );
+GLAPI void GLAPIENTRY glRectsv( const GLshort *v1, const GLshort *v2 );
+
+
+/*
+ * Vertex Arrays  (1.1)
+ */
+
+GLAPI void GLAPIENTRY glVertexPointer( GLint size, GLenum type,
+                                       GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glNormalPointer( GLenum type, GLsizei stride,
+                                       const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glColorPointer( GLint size, GLenum type,
+                                      GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glIndexPointer( GLenum type, GLsizei stride,
+                                      const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glTexCoordPointer( GLint size, GLenum type,
+                                         GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glEdgeFlagPointer( GLsizei stride, const GLvoid *ptr );
+
+GLAPI void GLAPIENTRY glGetPointerv( GLenum pname, GLvoid **params );
+
+GLAPI void GLAPIENTRY glArrayElement( GLint i );
+
+GLAPI void GLAPIENTRY glDrawArrays( GLenum mode, GLint first, GLsizei count );
+
+GLAPI void GLAPIENTRY glDrawElements( GLenum mode, GLsizei count,
+                                      GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glInterleavedArrays( GLenum format, GLsizei stride,
+                                           const GLvoid *pointer );
+
+/*
+ * Lighting
+ */
+
+GLAPI void GLAPIENTRY glShadeModel( GLenum mode );
+
+GLAPI void GLAPIENTRY glLightf( GLenum light, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLighti( GLenum light, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightfv( GLenum light, GLenum pname,
+                                 const GLfloat *params );
+GLAPI void GLAPIENTRY glLightiv( GLenum light, GLenum pname,
+                                 const GLint *params );
+
+GLAPI void GLAPIENTRY glGetLightfv( GLenum light, GLenum pname,
+                                    GLfloat *params );
+GLAPI void GLAPIENTRY glGetLightiv( GLenum light, GLenum pname,
+                                    GLint *params );
+
+GLAPI void GLAPIENTRY glLightModelf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glLightModeli( GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glLightModelfv( GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glLightModeliv( GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glMaterialf( GLenum face, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glMateriali( GLenum face, GLenum pname, GLint param );
+GLAPI void GLAPIENTRY glMaterialfv( GLenum face, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glMaterialiv( GLenum face, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetMaterialfv( GLenum face, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetMaterialiv( GLenum face, GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glColorMaterial( GLenum face, GLenum mode );
+
+
+/*
+ * Raster functions
+ */
+
+GLAPI void GLAPIENTRY glPixelZoom( GLfloat xfactor, GLfloat yfactor );
+
+GLAPI void GLAPIENTRY glPixelStoref( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelStorei( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelTransferf( GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glPixelTransferi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glPixelMapfv( GLenum map, GLsizei mapsize,
+                                    const GLfloat *values );
+GLAPI void GLAPIENTRY glPixelMapuiv( GLenum map, GLsizei mapsize,
+                                     const GLuint *values );
+GLAPI void GLAPIENTRY glPixelMapusv( GLenum map, GLsizei mapsize,
+                                     const GLushort *values );
+
+GLAPI void GLAPIENTRY glGetPixelMapfv( GLenum map, GLfloat *values );
+GLAPI void GLAPIENTRY glGetPixelMapuiv( GLenum map, GLuint *values );
+GLAPI void GLAPIENTRY glGetPixelMapusv( GLenum map, GLushort *values );
+
+GLAPI void GLAPIENTRY glBitmap( GLsizei width, GLsizei height,
+                                GLfloat xorig, GLfloat yorig,
+                                GLfloat xmove, GLfloat ymove,
+                                const GLubyte *bitmap );
+
+GLAPI void GLAPIENTRY glReadPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glDrawPixels( GLsizei width, GLsizei height,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glCopyPixels( GLint x, GLint y,
+                                    GLsizei width, GLsizei height,
+                                    GLenum type );
+
+/*
+ * Stenciling
+ */
+
+GLAPI void GLAPIENTRY glStencilFunc( GLenum func, GLint ref, GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilMask( GLuint mask );
+
+GLAPI void GLAPIENTRY glStencilOp( GLenum fail, GLenum zfail, GLenum zpass );
+
+GLAPI void GLAPIENTRY glClearStencil( GLint s );
+
+
+
+/*
+ * Texture mapping
+ */
+
+GLAPI void GLAPIENTRY glTexGend( GLenum coord, GLenum pname, GLdouble param );
+GLAPI void GLAPIENTRY glTexGenf( GLenum coord, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexGeni( GLenum coord, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexGendv( GLenum coord, GLenum pname, const GLdouble *params );
+GLAPI void GLAPIENTRY glTexGenfv( GLenum coord, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexGeniv( GLenum coord, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexGendv( GLenum coord, GLenum pname, GLdouble *params );
+GLAPI void GLAPIENTRY glGetTexGenfv( GLenum coord, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexGeniv( GLenum coord, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexEnvf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexEnvi( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexEnvfv( GLenum target, GLenum pname, const GLfloat *params );
+GLAPI void GLAPIENTRY glTexEnviv( GLenum target, GLenum pname, const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexEnvfv( GLenum target, GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexEnviv( GLenum target, GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexParameterf( GLenum target, GLenum pname, GLfloat param );
+GLAPI void GLAPIENTRY glTexParameteri( GLenum target, GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glTexParameterfv( GLenum target, GLenum pname,
+                                          const GLfloat *params );
+GLAPI void GLAPIENTRY glTexParameteriv( GLenum target, GLenum pname,
+                                          const GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexParameterfv( GLenum target,
+                                           GLenum pname, GLfloat *params);
+GLAPI void GLAPIENTRY glGetTexParameteriv( GLenum target,
+                                           GLenum pname, GLint *params );
+
+GLAPI void GLAPIENTRY glGetTexLevelParameterfv( GLenum target, GLint level,
+                                                GLenum pname, GLfloat *params );
+GLAPI void GLAPIENTRY glGetTexLevelParameteriv( GLenum target, GLint level,
+                                                GLenum pname, GLint *params );
+
+
+GLAPI void GLAPIENTRY glTexImage1D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLint border,
+                                    GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexImage2D( GLenum target, GLint level,
+                                    GLint internalFormat,
+                                    GLsizei width, GLsizei height,
+                                    GLint border, GLenum format, GLenum type,
+                                    const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glGetTexImage( GLenum target, GLint level,
+                                     GLenum format, GLenum type,
+                                     GLvoid *pixels );
+
+
+/* 1.1 functions */
+
+GLAPI void GLAPIENTRY glGenTextures( GLsizei n, GLuint *textures );
+
+GLAPI void GLAPIENTRY glDeleteTextures( GLsizei n, const GLuint *textures);
+
+GLAPI void GLAPIENTRY glBindTexture( GLenum target, GLuint texture );
+
+GLAPI void GLAPIENTRY glPrioritizeTextures( GLsizei n,
+                                            const GLuint *textures,
+                                            const GLclampf *priorities );
+
+GLAPI GLboolean GLAPIENTRY glAreTexturesResident( GLsizei n,
+                                                  const GLuint *textures,
+                                                  GLboolean *residences );
+
+GLAPI GLboolean GLAPIENTRY glIsTexture( GLuint texture );
+
+
+GLAPI void GLAPIENTRY glTexSubImage1D( GLenum target, GLint level,
+                                       GLint xoffset,
+                                       GLsizei width, GLenum format,
+                                       GLenum type, const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glTexSubImage2D( GLenum target, GLint level,
+                                       GLint xoffset, GLint yoffset,
+                                       GLsizei width, GLsizei height,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *pixels );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage1D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexImage2D( GLenum target, GLint level,
+                                        GLenum internalformat,
+                                        GLint x, GLint y,
+                                        GLsizei width, GLsizei height,
+                                        GLint border );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage1D( GLenum target, GLint level,
+                                           GLint xoffset, GLint x, GLint y,
+                                           GLsizei width );
+
+
+GLAPI void GLAPIENTRY glCopyTexSubImage2D( GLenum target, GLint level,
+                                           GLint xoffset, GLint yoffset,
+                                           GLint x, GLint y,
+                                           GLsizei width, GLsizei height );
+
+
+/*
+ * Evaluators
+ */
+
+GLAPI void GLAPIENTRY glMap1d( GLenum target, GLdouble u1, GLdouble u2,
+                               GLint stride,
+                               GLint order, const GLdouble *points );
+GLAPI void GLAPIENTRY glMap1f( GLenum target, GLfloat u1, GLfloat u2,
+                               GLint stride,
+                               GLint order, const GLfloat *points );
+
+GLAPI void GLAPIENTRY glMap2d( GLenum target,
+		     GLdouble u1, GLdouble u2, GLint ustride, GLint uorder,
+		     GLdouble v1, GLdouble v2, GLint vstride, GLint vorder,
+		     const GLdouble *points );
+GLAPI void GLAPIENTRY glMap2f( GLenum target,
+		     GLfloat u1, GLfloat u2, GLint ustride, GLint uorder,
+		     GLfloat v1, GLfloat v2, GLint vstride, GLint vorder,
+		     const GLfloat *points );
+
+GLAPI void GLAPIENTRY glGetMapdv( GLenum target, GLenum query, GLdouble *v );
+GLAPI void GLAPIENTRY glGetMapfv( GLenum target, GLenum query, GLfloat *v );
+GLAPI void GLAPIENTRY glGetMapiv( GLenum target, GLenum query, GLint *v );
+
+GLAPI void GLAPIENTRY glEvalCoord1d( GLdouble u );
+GLAPI void GLAPIENTRY glEvalCoord1f( GLfloat u );
+
+GLAPI void GLAPIENTRY glEvalCoord1dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord1fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glEvalCoord2d( GLdouble u, GLdouble v );
+GLAPI void GLAPIENTRY glEvalCoord2f( GLfloat u, GLfloat v );
+
+GLAPI void GLAPIENTRY glEvalCoord2dv( const GLdouble *u );
+GLAPI void GLAPIENTRY glEvalCoord2fv( const GLfloat *u );
+
+GLAPI void GLAPIENTRY glMapGrid1d( GLint un, GLdouble u1, GLdouble u2 );
+GLAPI void GLAPIENTRY glMapGrid1f( GLint un, GLfloat u1, GLfloat u2 );
+
+GLAPI void GLAPIENTRY glMapGrid2d( GLint un, GLdouble u1, GLdouble u2,
+                                   GLint vn, GLdouble v1, GLdouble v2 );
+GLAPI void GLAPIENTRY glMapGrid2f( GLint un, GLfloat u1, GLfloat u2,
+                                   GLint vn, GLfloat v1, GLfloat v2 );
+
+GLAPI void GLAPIENTRY glEvalPoint1( GLint i );
+
+GLAPI void GLAPIENTRY glEvalPoint2( GLint i, GLint j );
+
+GLAPI void GLAPIENTRY glEvalMesh1( GLenum mode, GLint i1, GLint i2 );
+
+GLAPI void GLAPIENTRY glEvalMesh2( GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 );
+
+
+/*
+ * Fog
+ */
+
+GLAPI void GLAPIENTRY glFogf( GLenum pname, GLfloat param );
+
+GLAPI void GLAPIENTRY glFogi( GLenum pname, GLint param );
+
+GLAPI void GLAPIENTRY glFogfv( GLenum pname, const GLfloat *params );
+
+GLAPI void GLAPIENTRY glFogiv( GLenum pname, const GLint *params );
+
+
+/*
+ * Selection and Feedback
+ */
+
+GLAPI void GLAPIENTRY glFeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer );
+
+GLAPI void GLAPIENTRY glPassThrough( GLfloat token );
+
+GLAPI void GLAPIENTRY glSelectBuffer( GLsizei size, GLuint *buffer );
+
+GLAPI void GLAPIENTRY glInitNames( void );
+
+GLAPI void GLAPIENTRY glLoadName( GLuint name );
+
+GLAPI void GLAPIENTRY glPushName( GLuint name );
+
+GLAPI void GLAPIENTRY glPopName( void );
+
+
+
+/*
+ * OpenGL 1.2
+ */
+
+#define GL_RESCALE_NORMAL			0x803A
+#define GL_CLAMP_TO_EDGE			0x812F
+#define GL_MAX_ELEMENTS_VERTICES		0x80E8
+#define GL_MAX_ELEMENTS_INDICES			0x80E9
+#define GL_BGR					0x80E0
+#define GL_BGRA					0x80E1
+#define GL_UNSIGNED_BYTE_3_3_2			0x8032
+#define GL_UNSIGNED_BYTE_2_3_3_REV		0x8362
+#define GL_UNSIGNED_SHORT_5_6_5			0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV		0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4		0x8033
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV		0x8365
+#define GL_UNSIGNED_SHORT_5_5_5_1		0x8034
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV		0x8366
+#define GL_UNSIGNED_INT_8_8_8_8			0x8035
+#define GL_UNSIGNED_INT_8_8_8_8_REV		0x8367
+#define GL_UNSIGNED_INT_10_10_10_2		0x8036
+#define GL_UNSIGNED_INT_2_10_10_10_REV		0x8368
+#define GL_LIGHT_MODEL_COLOR_CONTROL		0x81F8
+#define GL_SINGLE_COLOR				0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR		0x81FA
+#define GL_TEXTURE_MIN_LOD			0x813A
+#define GL_TEXTURE_MAX_LOD			0x813B
+#define GL_TEXTURE_BASE_LEVEL			0x813C
+#define GL_TEXTURE_MAX_LEVEL			0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE		0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY	0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE		0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY	0x0B23
+#define GL_ALIASED_POINT_SIZE_RANGE		0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE		0x846E
+#define GL_PACK_SKIP_IMAGES			0x806B
+#define GL_PACK_IMAGE_HEIGHT			0x806C
+#define GL_UNPACK_SKIP_IMAGES			0x806D
+#define GL_UNPACK_IMAGE_HEIGHT			0x806E
+#define GL_TEXTURE_3D				0x806F
+#define GL_PROXY_TEXTURE_3D			0x8070
+#define GL_TEXTURE_DEPTH			0x8071
+#define GL_TEXTURE_WRAP_R			0x8072
+#define GL_MAX_3D_TEXTURE_SIZE			0x8073
+#define GL_TEXTURE_BINDING_3D			0x806A
+
+GLAPI void GLAPIENTRY glDrawRangeElements( GLenum mode, GLuint start,
+	GLuint end, GLsizei count, GLenum type, const GLvoid *indices );
+
+GLAPI void GLAPIENTRY glTexImage3D( GLenum target, GLint level,
+                                      GLint internalFormat,
+                                      GLsizei width, GLsizei height,
+                                      GLsizei depth, GLint border,
+                                      GLenum format, GLenum type,
+                                      const GLvoid *pixels );
+
+GLAPI void GLAPIENTRY glTexSubImage3D( GLenum target, GLint level,
+                                         GLint xoffset, GLint yoffset,
+                                         GLint zoffset, GLsizei width,
+                                         GLsizei height, GLsizei depth,
+                                         GLenum format,
+                                         GLenum type, const GLvoid *pixels);
+
+GLAPI void GLAPIENTRY glCopyTexSubImage3D( GLenum target, GLint level,
+                                             GLint xoffset, GLint yoffset,
+                                             GLint zoffset, GLint x,
+                                             GLint y, GLsizei width,
+                                             GLsizei height );
+
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+
+
+/*
+ * GL_ARB_imaging
+ */
+
+#define GL_CONSTANT_COLOR			0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR		0x8002
+#define GL_CONSTANT_ALPHA			0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA		0x8004
+#define GL_COLOR_TABLE				0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE		0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE	0x80D2
+#define GL_PROXY_COLOR_TABLE			0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE	0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE	0x80D5
+#define GL_COLOR_TABLE_SCALE			0x80D6
+#define GL_COLOR_TABLE_BIAS			0x80D7
+#define GL_COLOR_TABLE_FORMAT			0x80D8
+#define GL_COLOR_TABLE_WIDTH			0x80D9
+#define GL_COLOR_TABLE_RED_SIZE			0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE		0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE		0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE		0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE		0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE		0x80DF
+#define GL_CONVOLUTION_1D			0x8010
+#define GL_CONVOLUTION_2D			0x8011
+#define GL_SEPARABLE_2D				0x8012
+#define GL_CONVOLUTION_BORDER_MODE		0x8013
+#define GL_CONVOLUTION_FILTER_SCALE		0x8014
+#define GL_CONVOLUTION_FILTER_BIAS		0x8015
+#define GL_REDUCE				0x8016
+#define GL_CONVOLUTION_FORMAT			0x8017
+#define GL_CONVOLUTION_WIDTH			0x8018
+#define GL_CONVOLUTION_HEIGHT			0x8019
+#define GL_MAX_CONVOLUTION_WIDTH		0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT		0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE		0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE		0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE		0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE		0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS		0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS		0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS		0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS		0x8023
+#define GL_CONSTANT_BORDER			0x8151
+#define GL_REPLICATE_BORDER			0x8153
+#define GL_CONVOLUTION_BORDER_COLOR		0x8154
+#define GL_COLOR_MATRIX				0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH		0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH		0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE		0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE	0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE		0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE	0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS		0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS		0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS		0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS		0x80BB
+#define GL_HISTOGRAM				0x8024
+#define GL_PROXY_HISTOGRAM			0x8025
+#define GL_HISTOGRAM_WIDTH			0x8026
+#define GL_HISTOGRAM_FORMAT			0x8027
+#define GL_HISTOGRAM_RED_SIZE			0x8028
+#define GL_HISTOGRAM_GREEN_SIZE			0x8029
+#define GL_HISTOGRAM_BLUE_SIZE			0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE			0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE		0x802C
+#define GL_HISTOGRAM_SINK			0x802D
+#define GL_MINMAX				0x802E
+#define GL_MINMAX_FORMAT			0x802F
+#define GL_MINMAX_SINK				0x8030
+#define GL_TABLE_TOO_LARGE			0x8031
+#define GL_BLEND_EQUATION			0x8009
+#define GL_MIN					0x8007
+#define GL_MAX					0x8008
+#define GL_FUNC_ADD				0x8006
+#define GL_FUNC_SUBTRACT			0x800A
+#define GL_FUNC_REVERSE_SUBTRACT		0x800B
+#define GL_BLEND_COLOR				0x8005
+
+
+GLAPI void GLAPIENTRY glColorTable( GLenum target, GLenum internalformat,
+                                    GLsizei width, GLenum format,
+                                    GLenum type, const GLvoid *table );
+
+GLAPI void GLAPIENTRY glColorSubTable( GLenum target,
+                                       GLsizei start, GLsizei count,
+                                       GLenum format, GLenum type,
+                                       const GLvoid *data );
+
+GLAPI void GLAPIENTRY glColorTableParameteriv(GLenum target, GLenum pname,
+                                              const GLint *params);
+
+GLAPI void GLAPIENTRY glColorTableParameterfv(GLenum target, GLenum pname,
+                                              const GLfloat *params);
+
+GLAPI void GLAPIENTRY glCopyColorSubTable( GLenum target, GLsizei start,
+                                           GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyColorTable( GLenum target, GLenum internalformat,
+                                        GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glGetColorTable( GLenum target, GLenum format,
+                                       GLenum type, GLvoid *table );
+
+GLAPI void GLAPIENTRY glGetColorTableParameterfv( GLenum target, GLenum pname,
+                                                  GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetColorTableParameteriv( GLenum target, GLenum pname,
+                                                  GLint *params );
+
+GLAPI void GLAPIENTRY glBlendEquation( GLenum mode );
+
+GLAPI void GLAPIENTRY glBlendColor( GLclampf red, GLclampf green,
+                                    GLclampf blue, GLclampf alpha );
+
+GLAPI void GLAPIENTRY glHistogram( GLenum target, GLsizei width,
+				   GLenum internalformat, GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetHistogram( GLenum target );
+
+GLAPI void GLAPIENTRY glGetHistogram( GLenum target, GLboolean reset,
+				      GLenum format, GLenum type,
+				      GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetHistogramParameterfv( GLenum target, GLenum pname,
+						 GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetHistogramParameteriv( GLenum target, GLenum pname,
+						 GLint *params );
+
+GLAPI void GLAPIENTRY glMinmax( GLenum target, GLenum internalformat,
+				GLboolean sink );
+
+GLAPI void GLAPIENTRY glResetMinmax( GLenum target );
+
+GLAPI void GLAPIENTRY glGetMinmax( GLenum target, GLboolean reset,
+                                   GLenum format, GLenum types,
+                                   GLvoid *values );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameterfv( GLenum target, GLenum pname,
+					      GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetMinmaxParameteriv( GLenum target, GLenum pname,
+					      GLint *params );
+
+GLAPI void GLAPIENTRY glConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLsizei width, GLenum format, GLenum type,
+	const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *image );
+
+GLAPI void GLAPIENTRY glConvolutionParameterf( GLenum target, GLenum pname,
+	GLfloat params );
+
+GLAPI void GLAPIENTRY glConvolutionParameterfv( GLenum target, GLenum pname,
+	const GLfloat *params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteri( GLenum target, GLenum pname,
+	GLint params );
+
+GLAPI void GLAPIENTRY glConvolutionParameteriv( GLenum target, GLenum pname,
+	const GLint *params );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter1D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width );
+
+GLAPI void GLAPIENTRY glCopyConvolutionFilter2D( GLenum target,
+	GLenum internalformat, GLint x, GLint y, GLsizei width,
+	GLsizei height);
+
+GLAPI void GLAPIENTRY glGetConvolutionFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *image );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameterfv( GLenum target, GLenum pname,
+	GLfloat *params );
+
+GLAPI void GLAPIENTRY glGetConvolutionParameteriv( GLenum target, GLenum pname,
+	GLint *params );
+
+GLAPI void GLAPIENTRY glSeparableFilter2D( GLenum target,
+	GLenum internalformat, GLsizei width, GLsizei height, GLenum format,
+	GLenum type, const GLvoid *row, const GLvoid *column );
+
+GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format,
+	GLenum type, GLvoid *row, GLvoid *column, GLvoid *span );
+
+
+
+
+/*
+ * OpenGL 1.3
+ */
+
+/* multitexture */
+#define GL_TEXTURE0				0x84C0
+#define GL_TEXTURE1				0x84C1
+#define GL_TEXTURE2				0x84C2
+#define GL_TEXTURE3				0x84C3
+#define GL_TEXTURE4				0x84C4
+#define GL_TEXTURE5				0x84C5
+#define GL_TEXTURE6				0x84C6
+#define GL_TEXTURE7				0x84C7
+#define GL_TEXTURE8				0x84C8
+#define GL_TEXTURE9				0x84C9
+#define GL_TEXTURE10				0x84CA
+#define GL_TEXTURE11				0x84CB
+#define GL_TEXTURE12				0x84CC
+#define GL_TEXTURE13				0x84CD
+#define GL_TEXTURE14				0x84CE
+#define GL_TEXTURE15				0x84CF
+#define GL_TEXTURE16				0x84D0
+#define GL_TEXTURE17				0x84D1
+#define GL_TEXTURE18				0x84D2
+#define GL_TEXTURE19				0x84D3
+#define GL_TEXTURE20				0x84D4
+#define GL_TEXTURE21				0x84D5
+#define GL_TEXTURE22				0x84D6
+#define GL_TEXTURE23				0x84D7
+#define GL_TEXTURE24				0x84D8
+#define GL_TEXTURE25				0x84D9
+#define GL_TEXTURE26				0x84DA
+#define GL_TEXTURE27				0x84DB
+#define GL_TEXTURE28				0x84DC
+#define GL_TEXTURE29				0x84DD
+#define GL_TEXTURE30				0x84DE
+#define GL_TEXTURE31				0x84DF
+#define GL_ACTIVE_TEXTURE			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE		0x84E1
+#define GL_MAX_TEXTURE_UNITS			0x84E2
+/* texture_cube_map */
+#define GL_NORMAL_MAP				0x8511
+#define GL_REFLECTION_MAP			0x8512
+#define GL_TEXTURE_CUBE_MAP			0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP		0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X		0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X		0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y		0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y		0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z		0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z		0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP		0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE		0x851C
+/* texture_compression */
+#define GL_COMPRESSED_ALPHA			0x84E9
+#define GL_COMPRESSED_LUMINANCE			0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA		0x84EB
+#define GL_COMPRESSED_INTENSITY			0x84EC
+#define GL_COMPRESSED_RGB			0x84ED
+#define GL_COMPRESSED_RGBA			0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT		0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE	0x86A0
+#define GL_TEXTURE_COMPRESSED			0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS	0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS		0x86A3
+/* multisample */
+#define GL_MULTISAMPLE				0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE		0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE			0x809F
+#define GL_SAMPLE_COVERAGE			0x80A0
+#define GL_SAMPLE_BUFFERS			0x80A8
+#define GL_SAMPLES				0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE		0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT		0x80AB
+#define GL_MULTISAMPLE_BIT			0x20000000
+/* transpose_matrix */
+#define GL_TRANSPOSE_MODELVIEW_MATRIX		0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX		0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX		0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX		0x84E6
+/* texture_env_combine */
+#define GL_COMBINE				0x8570
+#define GL_COMBINE_RGB				0x8571
+#define GL_COMBINE_ALPHA			0x8572
+#define GL_SOURCE0_RGB				0x8580
+#define GL_SOURCE1_RGB				0x8581
+#define GL_SOURCE2_RGB				0x8582
+#define GL_SOURCE0_ALPHA			0x8588
+#define GL_SOURCE1_ALPHA			0x8589
+#define GL_SOURCE2_ALPHA			0x858A
+#define GL_OPERAND0_RGB				0x8590
+#define GL_OPERAND1_RGB				0x8591
+#define GL_OPERAND2_RGB				0x8592
+#define GL_OPERAND0_ALPHA			0x8598
+#define GL_OPERAND1_ALPHA			0x8599
+#define GL_OPERAND2_ALPHA			0x859A
+#define GL_RGB_SCALE				0x8573
+#define GL_ADD_SIGNED				0x8574
+#define GL_INTERPOLATE				0x8575
+#define GL_SUBTRACT				0x84E7
+#define GL_CONSTANT				0x8576
+#define GL_PRIMARY_COLOR			0x8577
+#define GL_PREVIOUS				0x8578
+/* texture_env_dot3 */
+#define GL_DOT3_RGB				0x86AE
+#define GL_DOT3_RGBA				0x86AF
+/* texture_border_clamp */
+#define GL_CLAMP_TO_BORDER			0x812D
+
+GLAPI void GLAPIENTRY glActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glClientActiveTexture( GLenum texture );
+
+GLAPI void GLAPIENTRY glCompressedTexImage1D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage2D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexImage3D( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glCompressedTexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data );
+
+GLAPI void GLAPIENTRY glGetCompressedTexImage( GLenum target, GLint lod, GLvoid *img );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1d( GLenum target, GLdouble s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1f( GLenum target, GLfloat s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1i( GLenum target, GLint s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1s( GLenum target, GLshort s );
+
+GLAPI void GLAPIENTRY glMultiTexCoord1sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2d( GLenum target, GLdouble s, GLdouble t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2f( GLenum target, GLfloat s, GLfloat t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2i( GLenum target, GLint s, GLint t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2s( GLenum target, GLshort s, GLshort t );
+
+GLAPI void GLAPIENTRY glMultiTexCoord2sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3d( GLenum target, GLdouble s, GLdouble t, GLdouble r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3f( GLenum target, GLfloat s, GLfloat t, GLfloat r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3i( GLenum target, GLint s, GLint t, GLint r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3s( GLenum target, GLshort s, GLshort t, GLshort r );
+
+GLAPI void GLAPIENTRY glMultiTexCoord3sv( GLenum target, const GLshort *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4d( GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4dv( GLenum target, const GLdouble *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4f( GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4fv( GLenum target, const GLfloat *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4i( GLenum target, GLint s, GLint t, GLint r, GLint q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4iv( GLenum target, const GLint *v );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4s( GLenum target, GLshort s, GLshort t, GLshort r, GLshort q );
+
+GLAPI void GLAPIENTRY glMultiTexCoord4sv( GLenum target, const GLshort *v );
+
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glLoadTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixd( const GLdouble m[16] );
+
+GLAPI void GLAPIENTRY glMultTransposeMatrixf( const GLfloat m[16] );
+
+GLAPI void GLAPIENTRY glSampleCoverage( GLclampf value, GLboolean invert );
+
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img);
+
+
+
+/*
+ * GL_ARB_multitexture (ARB extension 1 and OpenGL 1.2.1)
+ */
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+
+#define GL_TEXTURE0_ARB				0x84C0
+#define GL_TEXTURE1_ARB				0x84C1
+#define GL_TEXTURE2_ARB				0x84C2
+#define GL_TEXTURE3_ARB				0x84C3
+#define GL_TEXTURE4_ARB				0x84C4
+#define GL_TEXTURE5_ARB				0x84C5
+#define GL_TEXTURE6_ARB				0x84C6
+#define GL_TEXTURE7_ARB				0x84C7
+#define GL_TEXTURE8_ARB				0x84C8
+#define GL_TEXTURE9_ARB				0x84C9
+#define GL_TEXTURE10_ARB			0x84CA
+#define GL_TEXTURE11_ARB			0x84CB
+#define GL_TEXTURE12_ARB			0x84CC
+#define GL_TEXTURE13_ARB			0x84CD
+#define GL_TEXTURE14_ARB			0x84CE
+#define GL_TEXTURE15_ARB			0x84CF
+#define GL_TEXTURE16_ARB			0x84D0
+#define GL_TEXTURE17_ARB			0x84D1
+#define GL_TEXTURE18_ARB			0x84D2
+#define GL_TEXTURE19_ARB			0x84D3
+#define GL_TEXTURE20_ARB			0x84D4
+#define GL_TEXTURE21_ARB			0x84D5
+#define GL_TEXTURE22_ARB			0x84D6
+#define GL_TEXTURE23_ARB			0x84D7
+#define GL_TEXTURE24_ARB			0x84D8
+#define GL_TEXTURE25_ARB			0x84D9
+#define GL_TEXTURE26_ARB			0x84DA
+#define GL_TEXTURE27_ARB			0x84DB
+#define GL_TEXTURE28_ARB			0x84DC
+#define GL_TEXTURE29_ARB			0x84DD
+#define GL_TEXTURE30_ARB			0x84DE
+#define GL_TEXTURE31_ARB			0x84DF
+#define GL_ACTIVE_TEXTURE_ARB			0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB		0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB		0x84E2
+
+GLAPI void GLAPIENTRY glActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glClientActiveTextureARB(GLenum texture);
+GLAPI void GLAPIENTRY glMultiTexCoord1dARB(GLenum target, GLdouble s);
+GLAPI void GLAPIENTRY glMultiTexCoord1dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1fARB(GLenum target, GLfloat s);
+GLAPI void GLAPIENTRY glMultiTexCoord1fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1iARB(GLenum target, GLint s);
+GLAPI void GLAPIENTRY glMultiTexCoord1ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord1sARB(GLenum target, GLshort s);
+GLAPI void GLAPIENTRY glMultiTexCoord1svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
+GLAPI void GLAPIENTRY glMultiTexCoord2dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2fARB(GLenum target, GLfloat s, GLfloat t);
+GLAPI void GLAPIENTRY glMultiTexCoord2fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2iARB(GLenum target, GLint s, GLint t);
+GLAPI void GLAPIENTRY glMultiTexCoord2ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
+GLAPI void GLAPIENTRY glMultiTexCoord2svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void GLAPIENTRY glMultiTexCoord3dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void GLAPIENTRY glMultiTexCoord3fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
+GLAPI void GLAPIENTRY glMultiTexCoord3ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void GLAPIENTRY glMultiTexCoord3svARB(GLenum target, const GLshort *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void GLAPIENTRY glMultiTexCoord4dvARB(GLenum target, const GLdouble *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4fARB(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void GLAPIENTRY glMultiTexCoord4fvARB(GLenum target, const GLfloat *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void GLAPIENTRY glMultiTexCoord4ivARB(GLenum target, const GLint *v);
+GLAPI void GLAPIENTRY glMultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void GLAPIENTRY glMultiTexCoord4svARB(GLenum target, const GLshort *v);
+
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+
+#endif /* GL_ARB_multitexture */
+
+
+
+/*
+ * Define this token if you want "old-style" header file behaviour (extensions
+ * defined in gl.h).  Otherwise, extensions will be included from glext.h.
+ */
+#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY)
+#include "SDL_opengl_glext.h"
+#endif  /* GL_GLEXT_LEGACY */
+
+
+
+/*
+ * ???. GL_MESA_packed_depth_stencil
+ * XXX obsolete
+ */
+#ifndef GL_MESA_packed_depth_stencil
+#define GL_MESA_packed_depth_stencil 1
+
+#define GL_DEPTH_STENCIL_MESA			0x8750
+#define GL_UNSIGNED_INT_24_8_MESA		0x8751
+#define GL_UNSIGNED_INT_8_24_REV_MESA		0x8752
+#define GL_UNSIGNED_SHORT_15_1_MESA		0x8753
+#define GL_UNSIGNED_SHORT_1_15_REV_MESA		0x8754
+
+#endif /* GL_MESA_packed_depth_stencil */
+
+
+#ifndef GL_ATI_blend_equation_separate
+#define GL_ATI_blend_equation_separate 1
+
+#define GL_ALPHA_BLEND_EQUATION_ATI	        0x883D
+
+GLAPI void GLAPIENTRY glBlendEquationSeparateATI( GLenum modeRGB, GLenum modeA );
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLenum modeA);
+
+#endif /* GL_ATI_blend_equation_separate */
+
+
+/* GL_OES_EGL_image */
+#ifndef GL_OES_EGL_image
+typedef void* GLeglImageOES;
+#endif
+
+#ifndef GL_OES_EGL_image
+#define GL_OES_EGL_image 1
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
+GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
+#endif
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
+typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
+#endif
+
+
+/**
+ ** NOTE!!!!!  If you add new functions to this file, or update
+ ** glext.h be sure to regenerate the gl_mangle.h file.  See comments
+ ** in that file for details.
+ **/
+
+
+
+/**********************************************************************
+ * Begin system-specific stuff
+ */
+#if defined(PRAGMA_EXPORT_SUPPORTED)
+#pragma export off
+#endif
+
+/*
+ * End system-specific stuff
+ **********************************************************************/
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl_h_ */
+
+#endif /* !__IPHONEOS__ */
+
+#endif /* SDL_opengl_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengl_glext.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengl_glext.h
new file mode 100644
index 0000000..cd3869f
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengl_glext.h
@@ -0,0 +1,11177 @@
+#ifndef __glext_h_
+#define __glext_h_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+** Copyright (c) 2013-2014 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+/*
+** This header is generated from the Khronos OpenGL / OpenGL ES XML
+** API Registry. The current version of the Registry, generator scripts
+** used to make the header, and the header can be found at
+**   http://www.opengl.org/registry/
+**
+** Khronos $Revision: 26745 $ on $Date: 2014-05-21 03:12:26 -0700 (Wed, 21 May 2014) $
+*/
+
+#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+#ifndef GLAPI
+#define GLAPI extern
+#endif
+
+#define GL_GLEXT_VERSION 20140521
+
+/* Generated C header for:
+ * API: gl
+ * Profile: compatibility
+ * Versions considered: .*
+ * Versions emitted: 1\.[2-9]|[234]\.[0-9]
+ * Default extensions included: gl
+ * Additional extensions included: _nomatch_^
+ * Extensions removed: _nomatch_^
+ */
+
+#ifndef GL_VERSION_1_2
+#define GL_VERSION_1_2 1
+#define GL_UNSIGNED_BYTE_3_3_2            0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_INT_8_8_8_8           0x8035
+#define GL_UNSIGNED_INT_10_10_10_2        0x8036
+#define GL_TEXTURE_BINDING_3D             0x806A
+#define GL_PACK_SKIP_IMAGES               0x806B
+#define GL_PACK_IMAGE_HEIGHT              0x806C
+#define GL_UNPACK_SKIP_IMAGES             0x806D
+#define GL_UNPACK_IMAGE_HEIGHT            0x806E
+#define GL_TEXTURE_3D                     0x806F
+#define GL_PROXY_TEXTURE_3D               0x8070
+#define GL_TEXTURE_DEPTH                  0x8071
+#define GL_TEXTURE_WRAP_R                 0x8072
+#define GL_MAX_3D_TEXTURE_SIZE            0x8073
+#define GL_UNSIGNED_BYTE_2_3_3_REV        0x8362
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+#define GL_UNSIGNED_SHORT_5_6_5_REV       0x8364
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV     0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV     0x8366
+#define GL_UNSIGNED_INT_8_8_8_8_REV       0x8367
+#define GL_UNSIGNED_INT_2_10_10_10_REV    0x8368
+#define GL_BGR                            0x80E0
+#define GL_BGRA                           0x80E1
+#define GL_MAX_ELEMENTS_VERTICES          0x80E8
+#define GL_MAX_ELEMENTS_INDICES           0x80E9
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_TEXTURE_MIN_LOD                0x813A
+#define GL_TEXTURE_MAX_LOD                0x813B
+#define GL_TEXTURE_BASE_LEVEL             0x813C
+#define GL_TEXTURE_MAX_LEVEL              0x813D
+#define GL_SMOOTH_POINT_SIZE_RANGE        0x0B12
+#define GL_SMOOTH_POINT_SIZE_GRANULARITY  0x0B13
+#define GL_SMOOTH_LINE_WIDTH_RANGE        0x0B22
+#define GL_SMOOTH_LINE_WIDTH_GRANULARITY  0x0B23
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#define GL_RESCALE_NORMAL                 0x803A
+#define GL_LIGHT_MODEL_COLOR_CONTROL      0x81F8
+#define GL_SINGLE_COLOR                   0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR        0x81FA
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_VERSION_1_2 */
+
+#ifndef GL_VERSION_1_3
+#define GL_VERSION_1_3 1
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+#define GL_MULTISAMPLE                    0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE            0x809F
+#define GL_SAMPLE_COVERAGE                0x80A0
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP         0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+#define GL_COMPRESSED_RGB                 0x84ED
+#define GL_COMPRESSED_RGBA                0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT       0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE  0x86A0
+#define GL_TEXTURE_COMPRESSED             0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+#define GL_CLAMP_TO_BORDER                0x812D
+#define GL_CLIENT_ACTIVE_TEXTURE          0x84E1
+#define GL_MAX_TEXTURE_UNITS              0x84E2
+#define GL_TRANSPOSE_MODELVIEW_MATRIX     0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX    0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX       0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX         0x84E6
+#define GL_MULTISAMPLE_BIT                0x20000000
+#define GL_NORMAL_MAP                     0x8511
+#define GL_REFLECTION_MAP                 0x8512
+#define GL_COMPRESSED_ALPHA               0x84E9
+#define GL_COMPRESSED_LUMINANCE           0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA     0x84EB
+#define GL_COMPRESSED_INTENSITY           0x84EC
+#define GL_COMBINE                        0x8570
+#define GL_COMBINE_RGB                    0x8571
+#define GL_COMBINE_ALPHA                  0x8572
+#define GL_SOURCE0_RGB                    0x8580
+#define GL_SOURCE1_RGB                    0x8581
+#define GL_SOURCE2_RGB                    0x8582
+#define GL_SOURCE0_ALPHA                  0x8588
+#define GL_SOURCE1_ALPHA                  0x8589
+#define GL_SOURCE2_ALPHA                  0x858A
+#define GL_OPERAND0_RGB                   0x8590
+#define GL_OPERAND1_RGB                   0x8591
+#define GL_OPERAND2_RGB                   0x8592
+#define GL_OPERAND0_ALPHA                 0x8598
+#define GL_OPERAND1_ALPHA                 0x8599
+#define GL_OPERAND2_ALPHA                 0x859A
+#define GL_RGB_SCALE                      0x8573
+#define GL_ADD_SIGNED                     0x8574
+#define GL_INTERPOLATE                    0x8575
+#define GL_SUBTRACT                       0x84E7
+#define GL_CONSTANT                       0x8576
+#define GL_PRIMARY_COLOR                  0x8577
+#define GL_PREVIOUS                       0x8578
+#define GL_DOT3_RGB                       0x86AE
+#define GL_DOT3_RGBA                      0x86AF
+typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, void *img);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTexture (GLenum texture);
+GLAPI void APIENTRY glSampleCoverage (GLfloat value, GLboolean invert);
+GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, void *img);
+GLAPI void APIENTRY glClientActiveTexture (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m);
+#endif
+#endif /* GL_VERSION_1_3 */
+
+#ifndef GL_VERSION_1_4
+#define GL_VERSION_1_4 1
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_POINT_FADE_THRESHOLD_SIZE      0x8128
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_DEPTH_COMPONENT24              0x81A6
+#define GL_DEPTH_COMPONENT32              0x81A7
+#define GL_MIRRORED_REPEAT                0x8370
+#define GL_MAX_TEXTURE_LOD_BIAS           0x84FD
+#define GL_TEXTURE_LOD_BIAS               0x8501
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+#define GL_TEXTURE_DEPTH_SIZE             0x884A
+#define GL_TEXTURE_COMPARE_MODE           0x884C
+#define GL_TEXTURE_COMPARE_FUNC           0x884D
+#define GL_POINT_SIZE_MIN                 0x8126
+#define GL_POINT_SIZE_MAX                 0x8127
+#define GL_POINT_DISTANCE_ATTENUATION     0x8129
+#define GL_GENERATE_MIPMAP                0x8191
+#define GL_GENERATE_MIPMAP_HINT           0x8192
+#define GL_FOG_COORDINATE_SOURCE          0x8450
+#define GL_FOG_COORDINATE                 0x8451
+#define GL_FRAGMENT_DEPTH                 0x8452
+#define GL_CURRENT_FOG_COORDINATE         0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE      0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE    0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER   0x8456
+#define GL_FOG_COORDINATE_ARRAY           0x8457
+#define GL_COLOR_SUM                      0x8458
+#define GL_CURRENT_SECONDARY_COLOR        0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE     0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE     0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE   0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER  0x845D
+#define GL_SECONDARY_COLOR_ARRAY          0x845E
+#define GL_TEXTURE_FILTER_CONTROL         0x8500
+#define GL_DEPTH_TEXTURE_MODE             0x884B
+#define GL_COMPARE_R_TO_TEXTURE           0x884E
+#define GL_FUNC_ADD                       0x8006
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+#define GL_MIN                            0x8007
+#define GL_MAX                            0x8008
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount);
+GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount);
+GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFogCoordf (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoordd (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2sv (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3iv (const GLint *v);
+GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3sv (const GLshort *v);
+GLAPI void APIENTRY glBlendColor (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+GLAPI void APIENTRY glBlendEquation (GLenum mode);
+#endif
+#endif /* GL_VERSION_1_4 */
+
+#ifndef GL_VERSION_1_5
+#define GL_VERSION_1_5 1
+#include <stddef.h>
+#ifdef __MACOSX__
+typedef long GLsizeiptr;
+typedef long GLintptr;
+#else
+typedef ptrdiff_t GLsizeiptr;
+typedef ptrdiff_t GLintptr;
+#endif
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+#define GL_QUERY_COUNTER_BITS             0x8864
+#define GL_CURRENT_QUERY                  0x8865
+#define GL_QUERY_RESULT                   0x8866
+#define GL_QUERY_RESULT_AVAILABLE         0x8867
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+#define GL_READ_ONLY                      0x88B8
+#define GL_WRITE_ONLY                     0x88B9
+#define GL_READ_WRITE                     0x88BA
+#define GL_BUFFER_ACCESS                  0x88BB
+#define GL_BUFFER_MAPPED                  0x88BC
+#define GL_BUFFER_MAP_POINTER             0x88BD
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STREAM_READ                    0x88E1
+#define GL_STREAM_COPY                    0x88E2
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_STATIC_READ                    0x88E5
+#define GL_STATIC_COPY                    0x88E6
+#define GL_DYNAMIC_DRAW                   0x88E8
+#define GL_DYNAMIC_READ                   0x88E9
+#define GL_DYNAMIC_COPY                   0x88EA
+#define GL_SAMPLES_PASSED                 0x8914
+#define GL_SRC1_ALPHA                     0x8589
+#define GL_VERTEX_ARRAY_BUFFER_BINDING    0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING    0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING     0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING     0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING    0x889E
+#define GL_FOG_COORD_SRC                  0x8450
+#define GL_FOG_COORD                      0x8451
+#define GL_CURRENT_FOG_COORD              0x8453
+#define GL_FOG_COORD_ARRAY_TYPE           0x8454
+#define GL_FOG_COORD_ARRAY_STRIDE         0x8455
+#define GL_FOG_COORD_ARRAY_POINTER        0x8456
+#define GL_FOG_COORD_ARRAY                0x8457
+#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D
+#define GL_SRC0_RGB                       0x8580
+#define GL_SRC1_RGB                       0x8581
+#define GL_SRC2_RGB                       0x8582
+#define GL_SRC0_ALPHA                     0x8588
+#define GL_SRC2_ALPHA                     0x858A
+typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQuery (GLuint id);
+GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQuery (GLenum target);
+GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer);
+GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void *APIENTRY glMapBuffer (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target);
+GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_VERSION_1_5 */
+
+#ifndef GL_VERSION_2_0
+#define GL_VERSION_2_0 1
+typedef char GLchar;
+#define GL_BLEND_EQUATION_RGB             0x8009
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED    0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE       0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE     0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE       0x8625
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE      0x8642
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER    0x8645
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_MAX_DRAW_BUFFERS               0x8824
+#define GL_DRAW_BUFFER0                   0x8825
+#define GL_DRAW_BUFFER1                   0x8826
+#define GL_DRAW_BUFFER2                   0x8827
+#define GL_DRAW_BUFFER3                   0x8828
+#define GL_DRAW_BUFFER4                   0x8829
+#define GL_DRAW_BUFFER5                   0x882A
+#define GL_DRAW_BUFFER6                   0x882B
+#define GL_DRAW_BUFFER7                   0x882C
+#define GL_DRAW_BUFFER8                   0x882D
+#define GL_DRAW_BUFFER9                   0x882E
+#define GL_DRAW_BUFFER10                  0x882F
+#define GL_DRAW_BUFFER11                  0x8830
+#define GL_DRAW_BUFFER12                  0x8831
+#define GL_DRAW_BUFFER13                  0x8832
+#define GL_DRAW_BUFFER14                  0x8833
+#define GL_DRAW_BUFFER15                  0x8834
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+#define GL_MAX_VERTEX_ATTRIBS             0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
+#define GL_MAX_TEXTURE_IMAGE_UNITS        0x8872
+#define GL_FRAGMENT_SHADER                0x8B30
+#define GL_VERTEX_SHADER                  0x8B31
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS  0x8B4A
+#define GL_MAX_VARYING_FLOATS             0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_SHADER_TYPE                    0x8B4F
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_1D                     0x8B5D
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_3D                     0x8B5F
+#define GL_SAMPLER_CUBE                   0x8B60
+#define GL_SAMPLER_1D_SHADOW              0x8B61
+#define GL_SAMPLER_2D_SHADOW              0x8B62
+#define GL_DELETE_STATUS                  0x8B80
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_LINK_STATUS                    0x8B82
+#define GL_VALIDATE_STATUS                0x8B83
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_ATTACHED_SHADERS               0x8B85
+#define GL_ACTIVE_UNIFORMS                0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH      0x8B87
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_ACTIVE_ATTRIBUTES              0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH    0x8B8A
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
+#define GL_CURRENT_PROGRAM                0x8B8D
+#define GL_POINT_SPRITE_COORD_ORIGIN      0x8CA0
+#define GL_LOWER_LEFT                     0x8CA1
+#define GL_UPPER_LEFT                     0x8CA2
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#define GL_VERTEX_PROGRAM_TWO_SIDE        0x8643
+#define GL_POINT_SPRITE                   0x8861
+#define GL_COORD_REPLACE                  0x8862
+#define GL_MAX_TEXTURE_COORDS             0x8871
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask);
+typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader);
+typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program);
+typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader);
+typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name);
+GLAPI void APIENTRY glCompileShader (GLuint shader);
+GLAPI GLuint APIENTRY glCreateProgram (void);
+GLAPI GLuint APIENTRY glCreateShader (GLenum type);
+GLAPI void APIENTRY glDeleteProgram (GLuint program);
+GLAPI void APIENTRY glDeleteShader (GLuint shader);
+GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader);
+GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index);
+GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *shaders);
+GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source);
+GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgram (GLuint program);
+GLAPI GLboolean APIENTRY glIsShader (GLuint shader);
+GLAPI void APIENTRY glLinkProgram (GLuint program);
+GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar *const*string, const GLint *length);
+GLAPI void APIENTRY glUseProgram (GLuint program);
+GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1i (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glValidateProgram (GLuint program);
+GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_VERSION_2_0 */
+
+#ifndef GL_VERSION_2_1
+#define GL_VERSION_2_1 1
+#define GL_PIXEL_PACK_BUFFER              0x88EB
+#define GL_PIXEL_UNPACK_BUFFER            0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING      0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING    0x88EF
+#define GL_FLOAT_MAT2x3                   0x8B65
+#define GL_FLOAT_MAT2x4                   0x8B66
+#define GL_FLOAT_MAT3x2                   0x8B67
+#define GL_FLOAT_MAT3x4                   0x8B68
+#define GL_FLOAT_MAT4x2                   0x8B69
+#define GL_FLOAT_MAT4x3                   0x8B6A
+#define GL_SRGB                           0x8C40
+#define GL_SRGB8                          0x8C41
+#define GL_SRGB_ALPHA                     0x8C42
+#define GL_SRGB8_ALPHA8                   0x8C43
+#define GL_COMPRESSED_SRGB                0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA          0x8C49
+#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F
+#define GL_SLUMINANCE_ALPHA               0x8C44
+#define GL_SLUMINANCE8_ALPHA8             0x8C45
+#define GL_SLUMINANCE                     0x8C46
+#define GL_SLUMINANCE8                    0x8C47
+#define GL_COMPRESSED_SLUMINANCE          0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA    0x8C4B
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+#endif
+#endif /* GL_VERSION_2_1 */
+
+#ifndef GL_VERSION_3_0
+#define GL_VERSION_3_0 1
+typedef unsigned short GLhalf;
+#define GL_COMPARE_REF_TO_TEXTURE         0x884E
+#define GL_CLIP_DISTANCE0                 0x3000
+#define GL_CLIP_DISTANCE1                 0x3001
+#define GL_CLIP_DISTANCE2                 0x3002
+#define GL_CLIP_DISTANCE3                 0x3003
+#define GL_CLIP_DISTANCE4                 0x3004
+#define GL_CLIP_DISTANCE5                 0x3005
+#define GL_CLIP_DISTANCE6                 0x3006
+#define GL_CLIP_DISTANCE7                 0x3007
+#define GL_MAX_CLIP_DISTANCES             0x0D32
+#define GL_MAJOR_VERSION                  0x821B
+#define GL_MINOR_VERSION                  0x821C
+#define GL_NUM_EXTENSIONS                 0x821D
+#define GL_CONTEXT_FLAGS                  0x821E
+#define GL_COMPRESSED_RED                 0x8225
+#define GL_COMPRESSED_RG                  0x8226
+#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x00000001
+#define GL_RGBA32F                        0x8814
+#define GL_RGB32F                         0x8815
+#define GL_RGBA16F                        0x881A
+#define GL_RGB16F                         0x881B
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER    0x88FD
+#define GL_MAX_ARRAY_TEXTURE_LAYERS       0x88FF
+#define GL_MIN_PROGRAM_TEXEL_OFFSET       0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET       0x8905
+#define GL_CLAMP_READ_COLOR               0x891C
+#define GL_FIXED_ONLY                     0x891D
+#define GL_MAX_VARYING_COMPONENTS         0x8B4B
+#define GL_TEXTURE_1D_ARRAY               0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY         0x8C19
+#define GL_TEXTURE_2D_ARRAY               0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY         0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY       0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY       0x8C1D
+#define GL_R11F_G11F_B10F                 0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV   0x8C3B
+#define GL_RGB9_E5                        0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV       0x8C3E
+#define GL_TEXTURE_SHARED_SIZE            0x8C3F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS    0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85
+#define GL_PRIMITIVES_GENERATED           0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88
+#define GL_RASTERIZER_DISCARD             0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS            0x8C8C
+#define GL_SEPARATE_ATTRIBS               0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER      0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F
+#define GL_RGBA32UI                       0x8D70
+#define GL_RGB32UI                        0x8D71
+#define GL_RGBA16UI                       0x8D76
+#define GL_RGB16UI                        0x8D77
+#define GL_RGBA8UI                        0x8D7C
+#define GL_RGB8UI                         0x8D7D
+#define GL_RGBA32I                        0x8D82
+#define GL_RGB32I                         0x8D83
+#define GL_RGBA16I                        0x8D88
+#define GL_RGB16I                         0x8D89
+#define GL_RGBA8I                         0x8D8E
+#define GL_RGB8I                          0x8D8F
+#define GL_RED_INTEGER                    0x8D94
+#define GL_GREEN_INTEGER                  0x8D95
+#define GL_BLUE_INTEGER                   0x8D96
+#define GL_RGB_INTEGER                    0x8D98
+#define GL_RGBA_INTEGER                   0x8D99
+#define GL_BGR_INTEGER                    0x8D9A
+#define GL_BGRA_INTEGER                   0x8D9B
+#define GL_SAMPLER_1D_ARRAY               0x8DC0
+#define GL_SAMPLER_2D_ARRAY               0x8DC1
+#define GL_SAMPLER_1D_ARRAY_SHADOW        0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW        0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW            0x8DC5
+#define GL_UNSIGNED_INT_VEC2              0x8DC6
+#define GL_UNSIGNED_INT_VEC3              0x8DC7
+#define GL_UNSIGNED_INT_VEC4              0x8DC8
+#define GL_INT_SAMPLER_1D                 0x8DC9
+#define GL_INT_SAMPLER_2D                 0x8DCA
+#define GL_INT_SAMPLER_3D                 0x8DCB
+#define GL_INT_SAMPLER_CUBE               0x8DCC
+#define GL_INT_SAMPLER_1D_ARRAY           0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY           0x8DCF
+#define GL_UNSIGNED_INT_SAMPLER_1D        0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D        0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D        0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE      0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY  0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY  0x8DD7
+#define GL_QUERY_WAIT                     0x8E13
+#define GL_QUERY_NO_WAIT                  0x8E14
+#define GL_QUERY_BY_REGION_WAIT           0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT        0x8E16
+#define GL_BUFFER_ACCESS_FLAGS            0x911F
+#define GL_BUFFER_MAP_LENGTH              0x9120
+#define GL_BUFFER_MAP_OFFSET              0x9121
+#define GL_DEPTH_COMPONENT32F             0x8CAC
+#define GL_DEPTH32F_STENCIL8              0x8CAD
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217
+#define GL_FRAMEBUFFER_DEFAULT            0x8218
+#define GL_FRAMEBUFFER_UNDEFINED          0x8219
+#define GL_DEPTH_STENCIL_ATTACHMENT       0x821A
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+#define GL_DEPTH_STENCIL                  0x84F9
+#define GL_UNSIGNED_INT_24_8              0x84FA
+#define GL_DEPTH24_STENCIL8               0x88F0
+#define GL_TEXTURE_STENCIL_SIZE           0x88F1
+#define GL_TEXTURE_RED_TYPE               0x8C10
+#define GL_TEXTURE_GREEN_TYPE             0x8C11
+#define GL_TEXTURE_BLUE_TYPE              0x8C12
+#define GL_TEXTURE_ALPHA_TYPE             0x8C13
+#define GL_TEXTURE_DEPTH_TYPE             0x8C16
+#define GL_UNSIGNED_NORMALIZED            0x8C17
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_DRAW_FRAMEBUFFER_BINDING       0x8CA6
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_READ_FRAMEBUFFER               0x8CA8
+#define GL_DRAW_FRAMEBUFFER               0x8CA9
+#define GL_READ_FRAMEBUFFER_BINDING       0x8CAA
+#define GL_RENDERBUFFER_SAMPLES           0x8CAB
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE           0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED        0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS          0x8CDF
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_COLOR_ATTACHMENT1              0x8CE1
+#define GL_COLOR_ATTACHMENT2              0x8CE2
+#define GL_COLOR_ATTACHMENT3              0x8CE3
+#define GL_COLOR_ATTACHMENT4              0x8CE4
+#define GL_COLOR_ATTACHMENT5              0x8CE5
+#define GL_COLOR_ATTACHMENT6              0x8CE6
+#define GL_COLOR_ATTACHMENT7              0x8CE7
+#define GL_COLOR_ATTACHMENT8              0x8CE8
+#define GL_COLOR_ATTACHMENT9              0x8CE9
+#define GL_COLOR_ATTACHMENT10             0x8CEA
+#define GL_COLOR_ATTACHMENT11             0x8CEB
+#define GL_COLOR_ATTACHMENT12             0x8CEC
+#define GL_COLOR_ATTACHMENT13             0x8CED
+#define GL_COLOR_ATTACHMENT14             0x8CEE
+#define GL_COLOR_ATTACHMENT15             0x8CEF
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_STENCIL_INDEX1                 0x8D46
+#define GL_STENCIL_INDEX4                 0x8D47
+#define GL_STENCIL_INDEX8                 0x8D48
+#define GL_STENCIL_INDEX16                0x8D49
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56
+#define GL_MAX_SAMPLES                    0x8D57
+#define GL_INDEX                          0x8222
+#define GL_TEXTURE_LUMINANCE_TYPE         0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE         0x8C15
+#define GL_FRAMEBUFFER_SRGB               0x8DB9
+#define GL_HALF_FLOAT                     0x140B
+#define GL_MAP_READ_BIT                   0x0001
+#define GL_MAP_WRITE_BIT                  0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT       0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT      0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT         0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT         0x0020
+#define GL_COMPRESSED_RED_RGTC1           0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1    0x8DBC
+#define GL_COMPRESSED_RG_RGTC2            0x8DBD
+#define GL_COMPRESSED_SIGNED_RG_RGTC2     0x8DBE
+#define GL_RG                             0x8227
+#define GL_RG_INTEGER                     0x8228
+#define GL_R8                             0x8229
+#define GL_R16                            0x822A
+#define GL_RG8                            0x822B
+#define GL_RG16                           0x822C
+#define GL_R16F                           0x822D
+#define GL_R32F                           0x822E
+#define GL_RG16F                          0x822F
+#define GL_RG32F                          0x8230
+#define GL_R8I                            0x8231
+#define GL_R8UI                           0x8232
+#define GL_R16I                           0x8233
+#define GL_R16UI                          0x8234
+#define GL_R32I                           0x8235
+#define GL_R32UI                          0x8236
+#define GL_RG8I                           0x8237
+#define GL_RG8UI                          0x8238
+#define GL_RG16I                          0x8239
+#define GL_RG16UI                         0x823A
+#define GL_RG32I                          0x823B
+#define GL_RG32UI                         0x823C
+#define GL_VERTEX_ARRAY_BINDING           0x85B5
+#define GL_CLAMP_VERTEX_COLOR             0x891A
+#define GL_CLAMP_FRAGMENT_COLOR           0x891B
+#define GL_ALPHA_INTEGER                  0x8D97
+typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp);
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+typedef const GLubyte *(APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void *(APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glEnablei (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisablei (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index);
+GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedback (void);
+GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp);
+GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRender (void);
+GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value);
+GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value);
+GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value);
+GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GLAPI const GLubyte *APIENTRY glGetStringi (GLenum name, GLuint index);
+GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmap (GLenum target);
+GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void *APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glBindVertexArray (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array);
+#endif
+#endif /* GL_VERSION_3_0 */
+
+#ifndef GL_VERSION_3_1
+#define GL_VERSION_3_1 1
+#define GL_SAMPLER_2D_RECT                0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW         0x8B64
+#define GL_SAMPLER_BUFFER                 0x8DC2
+#define GL_INT_SAMPLER_2D_RECT            0x8DCD
+#define GL_INT_SAMPLER_BUFFER             0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT   0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER    0x8DD8
+#define GL_TEXTURE_BUFFER                 0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE        0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER         0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D
+#define GL_TEXTURE_RECTANGLE              0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE      0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE        0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE     0x84F8
+#define GL_R8_SNORM                       0x8F94
+#define GL_RG8_SNORM                      0x8F95
+#define GL_RGB8_SNORM                     0x8F96
+#define GL_RGBA8_SNORM                    0x8F97
+#define GL_R16_SNORM                      0x8F98
+#define GL_RG16_SNORM                     0x8F99
+#define GL_RGB16_SNORM                    0x8F9A
+#define GL_RGBA16_SNORM                   0x8F9B
+#define GL_SIGNED_NORMALIZED              0x8F9C
+#define GL_PRIMITIVE_RESTART              0x8F9D
+#define GL_PRIMITIVE_RESTART_INDEX        0x8F9E
+#define GL_COPY_READ_BUFFER               0x8F36
+#define GL_COPY_WRITE_BUFFER              0x8F37
+#define GL_UNIFORM_BUFFER                 0x8A11
+#define GL_UNIFORM_BUFFER_BINDING         0x8A28
+#define GL_UNIFORM_BUFFER_START           0x8A29
+#define GL_UNIFORM_BUFFER_SIZE            0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS      0x8A2B
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS    0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS    0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS    0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE         0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS          0x8A36
+#define GL_UNIFORM_TYPE                   0x8A37
+#define GL_UNIFORM_SIZE                   0x8A38
+#define GL_UNIFORM_NAME_LENGTH            0x8A39
+#define GL_UNIFORM_BLOCK_INDEX            0x8A3A
+#define GL_UNIFORM_OFFSET                 0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE           0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE          0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR           0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING          0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE        0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH      0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS  0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46
+#define GL_INVALID_INDEX                  0xFFFFFFFFu
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei instancecount);
+GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount);
+GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index);
+GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar *const*uniformNames, GLuint *uniformIndices);
+GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName);
+GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName);
+GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName);
+GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+#endif
+#endif /* GL_VERSION_3_1 */
+
+#ifndef GL_VERSION_3_2
+#define GL_VERSION_3_2 1
+typedef struct __GLsync *GLsync;
+#ifndef GLEXT_64_TYPES_DEFINED
+/* This code block is duplicated in glxext.h, so must be protected */
+#define GLEXT_64_TYPES_DEFINED
+/* Define int32_t, int64_t, and uint64_t types for UST/MSC */
+/* (as used in the GL_EXT_timer_query extension). */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+#elif defined(__sun__) || defined(__digital__)
+#include <inttypes.h>
+#if defined(__STDC__)
+#if defined(__arch64__) || defined(_LP64)
+typedef long int int64_t;
+typedef unsigned long int uint64_t;
+#else
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#endif /* __arch64__ */
+#endif /* __STDC__ */
+#elif defined( __VMS ) || defined(__sgi)
+#include <inttypes.h>
+#elif defined(__SCO__) || defined(__USLC__)
+#include <stdint.h>
+#elif defined(__UNIXOS2__) || defined(__SOL64__)
+typedef long int int32_t;
+typedef long long int int64_t;
+typedef unsigned long long int uint64_t;
+#elif defined(_WIN32) && defined(__GNUC__)
+#include <stdint.h>
+#elif defined(_WIN32)
+typedef __int32 int32_t;
+typedef __int64 int64_t;
+typedef unsigned __int64 uint64_t;
+#else
+/* Fallback if nothing above works */
+#include <inttypes.h>
+#endif
+#endif
+typedef uint64_t GLuint64;
+typedef int64_t GLint64;
+#define GL_CONTEXT_CORE_PROFILE_BIT       0x00000001
+#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002
+#define GL_LINES_ADJACENCY                0x000A
+#define GL_LINE_STRIP_ADJACENCY           0x000B
+#define GL_TRIANGLES_ADJACENCY            0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY       0x000D
+#define GL_PROGRAM_POINT_SIZE             0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8
+#define GL_GEOMETRY_SHADER                0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT          0x8916
+#define GL_GEOMETRY_INPUT_TYPE            0x8917
+#define GL_GEOMETRY_OUTPUT_TYPE           0x8918
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES   0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1
+#define GL_MAX_VERTEX_OUTPUT_COMPONENTS   0x9122
+#define GL_MAX_GEOMETRY_INPUT_COMPONENTS  0x9123
+#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124
+#define GL_MAX_FRAGMENT_INPUT_COMPONENTS  0x9125
+#define GL_CONTEXT_PROFILE_MASK           0x9126
+#define GL_DEPTH_CLAMP                    0x864F
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION        0x8E4D
+#define GL_LAST_VERTEX_CONVENTION         0x8E4E
+#define GL_PROVOKING_VERTEX               0x8E4F
+#define GL_TEXTURE_CUBE_MAP_SEAMLESS      0x884F
+#define GL_MAX_SERVER_WAIT_TIMEOUT        0x9111
+#define GL_OBJECT_TYPE                    0x9112
+#define GL_SYNC_CONDITION                 0x9113
+#define GL_SYNC_STATUS                    0x9114
+#define GL_SYNC_FLAGS                     0x9115
+#define GL_SYNC_FENCE                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
+#define GL_UNSIGNALED                     0x9118
+#define GL_SIGNALED                       0x9119
+#define GL_ALREADY_SIGNALED               0x911A
+#define GL_TIMEOUT_EXPIRED                0x911B
+#define GL_CONDITION_SATISFIED            0x911C
+#define GL_WAIT_FAILED                    0x911D
+#define GL_TIMEOUT_IGNORED                0xFFFFFFFFFFFFFFFFull
+#define GL_SYNC_FLUSH_COMMANDS_BIT        0x00000001
+#define GL_SAMPLE_POSITION                0x8E50
+#define GL_SAMPLE_MASK                    0x8E51
+#define GL_SAMPLE_MASK_VALUE              0x8E52
+#define GL_MAX_SAMPLE_MASK_WORDS          0x8E59
+#define GL_TEXTURE_2D_MULTISAMPLE         0x9100
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE   0x9101
+#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY   0x9102
+#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104
+#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105
+#define GL_TEXTURE_SAMPLES                0x9106
+#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107
+#define GL_SAMPLER_2D_MULTISAMPLE         0x9108
+#define GL_INT_SAMPLER_2D_MULTISAMPLE     0x9109
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A
+#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY   0x910B
+#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C
+#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D
+#define GL_MAX_COLOR_TEXTURE_SAMPLES      0x910E
+#define GL_MAX_DEPTH_TEXTURE_SAMPLES      0x910F
+#define GL_MAX_INTEGER_SAMPLES            0x9110
+typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode);
+typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync);
+typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync);
+typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint maskNumber, GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
+GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei drawcount, const GLint *basevertex);
+GLAPI void APIENTRY glProvokingVertex (GLenum mode);
+GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags);
+GLAPI GLboolean APIENTRY glIsSync (GLsync sync);
+GLAPI void APIENTRY glDeleteSync (GLsync sync);
+GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *data);
+GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data);
+GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaski (GLuint maskNumber, GLbitfield mask);
+#endif
+#endif /* GL_VERSION_3_2 */
+
+#ifndef GL_VERSION_3_3
+#define GL_VERSION_3_3 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR    0x88FE
+#define GL_SRC1_COLOR                     0x88F9
+#define GL_ONE_MINUS_SRC1_COLOR           0x88FA
+#define GL_ONE_MINUS_SRC1_ALPHA           0x88FB
+#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS   0x88FC
+#define GL_ANY_SAMPLES_PASSED             0x8C2F
+#define GL_SAMPLER_BINDING                0x8919
+#define GL_RGB10_A2UI                     0x906F
+#define GL_TEXTURE_SWIZZLE_R              0x8E42
+#define GL_TEXTURE_SWIZZLE_G              0x8E43
+#define GL_TEXTURE_SWIZZLE_B              0x8E44
+#define GL_TEXTURE_SWIZZLE_A              0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA           0x8E46
+#define GL_TIME_ELAPSED                   0x88BF
+#define GL_TIMESTAMP                      0x8E28
+#define GL_INT_2_10_10_10_REV             0x8D9F
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers);
+typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers);
+typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler);
+typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value);
+typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords);
+typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords);
+typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers);
+GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers);
+GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler);
+GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler);
+GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param);
+GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param);
+GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param);
+GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target);
+GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params);
+GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor);
+GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value);
+GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value);
+GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value);
+GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value);
+GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords);
+GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords);
+GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords);
+GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color);
+GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color);
+GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color);
+#endif
+#endif /* GL_VERSION_3_3 */
+
+#ifndef GL_VERSION_4_0
+#define GL_VERSION_4_0 1
+#define GL_SAMPLE_SHADING                 0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE       0x8C37
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F
+#define GL_TEXTURE_CUBE_MAP_ARRAY         0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY   0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY         0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW  0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY     0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F
+#define GL_DRAW_INDIRECT_BUFFER           0x8F3F
+#define GL_DRAW_INDIRECT_BUFFER_BINDING   0x8F43
+#define GL_GEOMETRY_SHADER_INVOCATIONS    0x887F
+#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C
+#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D
+#define GL_MAX_VERTEX_STREAMS             0x8E71
+#define GL_DOUBLE_VEC2                    0x8FFC
+#define GL_DOUBLE_VEC3                    0x8FFD
+#define GL_DOUBLE_VEC4                    0x8FFE
+#define GL_DOUBLE_MAT2                    0x8F46
+#define GL_DOUBLE_MAT3                    0x8F47
+#define GL_DOUBLE_MAT4                    0x8F48
+#define GL_DOUBLE_MAT2x3                  0x8F49
+#define GL_DOUBLE_MAT2x4                  0x8F4A
+#define GL_DOUBLE_MAT3x2                  0x8F4B
+#define GL_DOUBLE_MAT3x4                  0x8F4C
+#define GL_DOUBLE_MAT4x2                  0x8F4D
+#define GL_DOUBLE_MAT4x3                  0x8F4E
+#define GL_ACTIVE_SUBROUTINES             0x8DE5
+#define GL_ACTIVE_SUBROUTINE_UNIFORMS     0x8DE6
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47
+#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH   0x8E48
+#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49
+#define GL_MAX_SUBROUTINES                0x8DE7
+#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8
+#define GL_NUM_COMPATIBLE_SUBROUTINES     0x8E4A
+#define GL_COMPATIBLE_SUBROUTINES         0x8E4B
+#define GL_PATCHES                        0x000E
+#define GL_PATCH_VERTICES                 0x8E72
+#define GL_PATCH_DEFAULT_INNER_LEVEL      0x8E73
+#define GL_PATCH_DEFAULT_OUTER_LEVEL      0x8E74
+#define GL_TESS_CONTROL_OUTPUT_VERTICES   0x8E75
+#define GL_TESS_GEN_MODE                  0x8E76
+#define GL_TESS_GEN_SPACING               0x8E77
+#define GL_TESS_GEN_VERTEX_ORDER          0x8E78
+#define GL_TESS_GEN_POINT_MODE            0x8E79
+#define GL_ISOLINES                       0x8E7A
+#define GL_FRACTIONAL_ODD                 0x8E7B
+#define GL_FRACTIONAL_EVEN                0x8E7C
+#define GL_MAX_PATCH_VERTICES             0x8E7D
+#define GL_MAX_TESS_GEN_LEVEL             0x8E7E
+#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F
+#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80
+#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81
+#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82
+#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83
+#define GL_MAX_TESS_PATCH_COMPONENTS      0x8E84
+#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85
+#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86
+#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89
+#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A
+#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C
+#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D
+#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E
+#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1
+#define GL_TESS_EVALUATION_SHADER         0x8E87
+#define GL_TESS_CONTROL_SHADER            0x8E88
+#define GL_TRANSFORM_FEEDBACK             0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING     0x8E25
+#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLfloat value);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect);
+typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params);
+typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices);
+typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values);
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream);
+typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShading (GLfloat value);
+GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const void *indirect);
+GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect);
+GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x);
+GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params);
+GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values);
+GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices);
+GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params);
+GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values);
+GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value);
+GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values);
+GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedback (void);
+GLAPI void APIENTRY glResumeTransformFeedback (void);
+GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id);
+GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream);
+GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id);
+GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_VERSION_4_0 */
+
+#ifndef GL_VERSION_4_1
+#define GL_VERSION_4_1 1
+#define GL_FIXED                          0x140C
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+#define GL_LOW_FLOAT                      0x8DF0
+#define GL_MEDIUM_FLOAT                   0x8DF1
+#define GL_HIGH_FLOAT                     0x8DF2
+#define GL_LOW_INT                        0x8DF3
+#define GL_MEDIUM_INT                     0x8DF4
+#define GL_HIGH_INT                       0x8DF5
+#define GL_SHADER_COMPILER                0x8DFA
+#define GL_SHADER_BINARY_FORMATS          0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
+#define GL_MAX_VERTEX_UNIFORM_VECTORS     0x8DFB
+#define GL_MAX_VARYING_VECTORS            0x8DFC
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS   0x8DFD
+#define GL_RGB565                         0x8D62
+#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257
+#define GL_PROGRAM_BINARY_LENGTH          0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+#define GL_PROGRAM_BINARY_FORMATS         0x87FF
+#define GL_VERTEX_SHADER_BIT              0x00000001
+#define GL_FRAGMENT_SHADER_BIT            0x00000002
+#define GL_GEOMETRY_SHADER_BIT            0x00000004
+#define GL_TESS_CONTROL_SHADER_BIT        0x00000008
+#define GL_TESS_EVALUATION_SHADER_BIT     0x00000010
+#define GL_ALL_SHADER_BITS                0xFFFFFFFF
+#define GL_PROGRAM_SEPARABLE              0x8258
+#define GL_ACTIVE_PROGRAM                 0x8259
+#define GL_PROGRAM_PIPELINE_BINDING       0x825A
+#define GL_MAX_VIEWPORTS                  0x825B
+#define GL_VIEWPORT_SUBPIXEL_BITS         0x825C
+#define GL_VIEWPORT_BOUNDS_RANGE          0x825D
+#define GL_LAYER_PROVOKING_VERTEX         0x825E
+#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F
+#define GL_UNDEFINED_VERTEX               0x8260
+typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void);
+typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLfloat d);
+typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar *const*strings);
+typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines);
+typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline);
+typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLdouble n, GLdouble f);
+typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReleaseShaderCompiler (void);
+GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
+GLAPI void APIENTRY glDepthRangef (GLfloat n, GLfloat f);
+GLAPI void APIENTRY glClearDepthf (GLfloat d);
+GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, void *binary);
+GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length);
+GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program);
+GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar *const*strings);
+GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines);
+GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines);
+GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0);
+GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1);
+GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2);
+GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3);
+GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline);
+GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h);
+GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v);
+GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v);
+GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLdouble n, GLdouble f);
+GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data);
+#endif
+#endif /* GL_VERSION_4_1 */
+
+#ifndef GL_VERSION_4_2
+#define GL_VERSION_4_2 1
+#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH  0x9127
+#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128
+#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH  0x9129
+#define GL_UNPACK_COMPRESSED_BLOCK_SIZE   0x912A
+#define GL_PACK_COMPRESSED_BLOCK_WIDTH    0x912B
+#define GL_PACK_COMPRESSED_BLOCK_HEIGHT   0x912C
+#define GL_PACK_COMPRESSED_BLOCK_DEPTH    0x912D
+#define GL_PACK_COMPRESSED_BLOCK_SIZE     0x912E
+#define GL_NUM_SAMPLE_COUNTS              0x9380
+#define GL_MIN_MAP_BUFFER_ALIGNMENT       0x90BC
+#define GL_ATOMIC_COUNTER_BUFFER          0x92C0
+#define GL_ATOMIC_COUNTER_BUFFER_BINDING  0x92C1
+#define GL_ATOMIC_COUNTER_BUFFER_START    0x92C2
+#define GL_ATOMIC_COUNTER_BUFFER_SIZE     0x92C3
+#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5
+#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB
+#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0
+#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1
+#define GL_MAX_VERTEX_ATOMIC_COUNTERS     0x92D2
+#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3
+#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4
+#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS   0x92D5
+#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS   0x92D6
+#define GL_MAX_COMBINED_ATOMIC_COUNTERS   0x92D7
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8
+#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC
+#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS  0x92D9
+#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA
+#define GL_UNSIGNED_INT_ATOMIC_COUNTER    0x92DB
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT      0x00000002
+#define GL_UNIFORM_BARRIER_BIT            0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT      0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020
+#define GL_COMMAND_BARRIER_BIT            0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT       0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT     0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT      0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT        0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT     0x00001000
+#define GL_ALL_BARRIER_BITS               0xFFFFFFFF
+#define GL_MAX_IMAGE_UNITS                0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39
+#define GL_IMAGE_BINDING_NAME             0x8F3A
+#define GL_IMAGE_BINDING_LEVEL            0x8F3B
+#define GL_IMAGE_BINDING_LAYERED          0x8F3C
+#define GL_IMAGE_BINDING_LAYER            0x8F3D
+#define GL_IMAGE_BINDING_ACCESS           0x8F3E
+#define GL_IMAGE_1D                       0x904C
+#define GL_IMAGE_2D                       0x904D
+#define GL_IMAGE_3D                       0x904E
+#define GL_IMAGE_2D_RECT                  0x904F
+#define GL_IMAGE_CUBE                     0x9050
+#define GL_IMAGE_BUFFER                   0x9051
+#define GL_IMAGE_1D_ARRAY                 0x9052
+#define GL_IMAGE_2D_ARRAY                 0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY           0x9054
+#define GL_IMAGE_2D_MULTISAMPLE           0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY     0x9056
+#define GL_INT_IMAGE_1D                   0x9057
+#define GL_INT_IMAGE_2D                   0x9058
+#define GL_INT_IMAGE_3D                   0x9059
+#define GL_INT_IMAGE_2D_RECT              0x905A
+#define GL_INT_IMAGE_CUBE                 0x905B
+#define GL_INT_IMAGE_BUFFER               0x905C
+#define GL_INT_IMAGE_1D_ARRAY             0x905D
+#define GL_INT_IMAGE_2D_ARRAY             0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY       0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE       0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D          0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D          0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D          0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT     0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE        0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER      0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY    0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY    0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C
+#define GL_MAX_IMAGE_SAMPLES              0x906D
+#define GL_IMAGE_BINDING_FORMAT           0x906E
+#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8
+#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9
+#define GL_MAX_VERTEX_IMAGE_UNIFORMS      0x90CA
+#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB
+#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC
+#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS    0x90CD
+#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS    0x90CE
+#define GL_MAX_COMBINED_IMAGE_UNIFORMS    0x90CF
+#define GL_COMPRESSED_RGBA_BPTC_UNORM     0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F
+#define GL_TEXTURE_IMMUTABLE_FORMAT       0x912F
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIERPROC) (GLbitfield barriers);
+typedef void (APIENTRYP PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei instancecount);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedBaseInstance (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance);
+GLAPI void APIENTRY glDrawElementsInstancedBaseVertexBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance);
+GLAPI void APIENTRY glGetInternalformativ (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetActiveAtomicCounterBufferiv (GLuint program, GLuint bufferIndex, GLenum pname, GLint *params);
+GLAPI void APIENTRY glBindImageTexture (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format);
+GLAPI void APIENTRY glMemoryBarrier (GLbitfield barriers);
+GLAPI void APIENTRY glTexStorage1D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTexStorage2D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTexStorage3D (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glDrawTransformFeedbackInstanced (GLenum mode, GLuint id, GLsizei instancecount);
+GLAPI void APIENTRY glDrawTransformFeedbackStreamInstanced (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount);
+#endif
+#endif /* GL_VERSION_4_2 */
+
+#ifndef GL_VERSION_4_3
+#define GL_VERSION_4_3 1
+typedef void (APIENTRY  *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_NUM_SHADING_LANGUAGE_VERSIONS  0x82E9
+#define GL_VERTEX_ATTRIB_ARRAY_LONG       0x874E
+#define GL_COMPRESSED_RGB8_ETC2           0x9274
+#define GL_COMPRESSED_SRGB8_ETC2          0x9275
+#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276
+#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277
+#define GL_COMPRESSED_RGBA8_ETC2_EAC      0x9278
+#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279
+#define GL_COMPRESSED_R11_EAC             0x9270
+#define GL_COMPRESSED_SIGNED_R11_EAC      0x9271
+#define GL_COMPRESSED_RG11_EAC            0x9272
+#define GL_COMPRESSED_SIGNED_RG11_EAC     0x9273
+#define GL_PRIMITIVE_RESTART_FIXED_INDEX  0x8D69
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A
+#define GL_MAX_ELEMENT_INDEX              0x8D6B
+#define GL_COMPUTE_SHADER                 0x91B9
+#define GL_MAX_COMPUTE_UNIFORM_BLOCKS     0x91BB
+#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC
+#define GL_MAX_COMPUTE_IMAGE_UNIFORMS     0x91BD
+#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262
+#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263
+#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264
+#define GL_MAX_COMPUTE_ATOMIC_COUNTERS    0x8265
+#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266
+#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB
+#define GL_MAX_COMPUTE_WORK_GROUP_COUNT   0x91BE
+#define GL_MAX_COMPUTE_WORK_GROUP_SIZE    0x91BF
+#define GL_COMPUTE_WORK_GROUP_SIZE        0x8267
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC
+#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED
+#define GL_DISPATCH_INDIRECT_BUFFER       0x90EE
+#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS       0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION        0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM      0x8245
+#define GL_DEBUG_SOURCE_API               0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM     0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER   0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY       0x8249
+#define GL_DEBUG_SOURCE_APPLICATION       0x824A
+#define GL_DEBUG_SOURCE_OTHER             0x824B
+#define GL_DEBUG_TYPE_ERROR               0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR  0x824E
+#define GL_DEBUG_TYPE_PORTABILITY         0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE         0x8250
+#define GL_DEBUG_TYPE_OTHER               0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH       0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES      0x9144
+#define GL_DEBUG_LOGGED_MESSAGES          0x9145
+#define GL_DEBUG_SEVERITY_HIGH            0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM          0x9147
+#define GL_DEBUG_SEVERITY_LOW             0x9148
+#define GL_DEBUG_TYPE_MARKER              0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP          0x8269
+#define GL_DEBUG_TYPE_POP_GROUP           0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION    0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH    0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH        0x826D
+#define GL_BUFFER                         0x82E0
+#define GL_SHADER                         0x82E1
+#define GL_PROGRAM                        0x82E2
+#define GL_QUERY                          0x82E3
+#define GL_PROGRAM_PIPELINE               0x82E4
+#define GL_SAMPLER                        0x82E6
+#define GL_MAX_LABEL_LENGTH               0x82E8
+#define GL_DEBUG_OUTPUT                   0x92E0
+#define GL_CONTEXT_FLAG_DEBUG_BIT         0x00000002
+#define GL_MAX_UNIFORM_LOCATIONS          0x826E
+#define GL_FRAMEBUFFER_DEFAULT_WIDTH      0x9310
+#define GL_FRAMEBUFFER_DEFAULT_HEIGHT     0x9311
+#define GL_FRAMEBUFFER_DEFAULT_LAYERS     0x9312
+#define GL_FRAMEBUFFER_DEFAULT_SAMPLES    0x9313
+#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314
+#define GL_MAX_FRAMEBUFFER_WIDTH          0x9315
+#define GL_MAX_FRAMEBUFFER_HEIGHT         0x9316
+#define GL_MAX_FRAMEBUFFER_LAYERS         0x9317
+#define GL_MAX_FRAMEBUFFER_SAMPLES        0x9318
+#define GL_INTERNALFORMAT_SUPPORTED       0x826F
+#define GL_INTERNALFORMAT_PREFERRED       0x8270
+#define GL_INTERNALFORMAT_RED_SIZE        0x8271
+#define GL_INTERNALFORMAT_GREEN_SIZE      0x8272
+#define GL_INTERNALFORMAT_BLUE_SIZE       0x8273
+#define GL_INTERNALFORMAT_ALPHA_SIZE      0x8274
+#define GL_INTERNALFORMAT_DEPTH_SIZE      0x8275
+#define GL_INTERNALFORMAT_STENCIL_SIZE    0x8276
+#define GL_INTERNALFORMAT_SHARED_SIZE     0x8277
+#define GL_INTERNALFORMAT_RED_TYPE        0x8278
+#define GL_INTERNALFORMAT_GREEN_TYPE      0x8279
+#define GL_INTERNALFORMAT_BLUE_TYPE       0x827A
+#define GL_INTERNALFORMAT_ALPHA_TYPE      0x827B
+#define GL_INTERNALFORMAT_DEPTH_TYPE      0x827C
+#define GL_INTERNALFORMAT_STENCIL_TYPE    0x827D
+#define GL_MAX_WIDTH                      0x827E
+#define GL_MAX_HEIGHT                     0x827F
+#define GL_MAX_DEPTH                      0x8280
+#define GL_MAX_LAYERS                     0x8281
+#define GL_MAX_COMBINED_DIMENSIONS        0x8282
+#define GL_COLOR_COMPONENTS               0x8283
+#define GL_DEPTH_COMPONENTS               0x8284
+#define GL_STENCIL_COMPONENTS             0x8285
+#define GL_COLOR_RENDERABLE               0x8286
+#define GL_DEPTH_RENDERABLE               0x8287
+#define GL_STENCIL_RENDERABLE             0x8288
+#define GL_FRAMEBUFFER_RENDERABLE         0x8289
+#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A
+#define GL_FRAMEBUFFER_BLEND              0x828B
+#define GL_READ_PIXELS                    0x828C
+#define GL_READ_PIXELS_FORMAT             0x828D
+#define GL_READ_PIXELS_TYPE               0x828E
+#define GL_TEXTURE_IMAGE_FORMAT           0x828F
+#define GL_TEXTURE_IMAGE_TYPE             0x8290
+#define GL_GET_TEXTURE_IMAGE_FORMAT       0x8291
+#define GL_GET_TEXTURE_IMAGE_TYPE         0x8292
+#define GL_MIPMAP                         0x8293
+#define GL_MANUAL_GENERATE_MIPMAP         0x8294
+#define GL_AUTO_GENERATE_MIPMAP           0x8295
+#define GL_COLOR_ENCODING                 0x8296
+#define GL_SRGB_READ                      0x8297
+#define GL_SRGB_WRITE                     0x8298
+#define GL_FILTER                         0x829A
+#define GL_VERTEX_TEXTURE                 0x829B
+#define GL_TESS_CONTROL_TEXTURE           0x829C
+#define GL_TESS_EVALUATION_TEXTURE        0x829D
+#define GL_GEOMETRY_TEXTURE               0x829E
+#define GL_FRAGMENT_TEXTURE               0x829F
+#define GL_COMPUTE_TEXTURE                0x82A0
+#define GL_TEXTURE_SHADOW                 0x82A1
+#define GL_TEXTURE_GATHER                 0x82A2
+#define GL_TEXTURE_GATHER_SHADOW          0x82A3
+#define GL_SHADER_IMAGE_LOAD              0x82A4
+#define GL_SHADER_IMAGE_STORE             0x82A5
+#define GL_SHADER_IMAGE_ATOMIC            0x82A6
+#define GL_IMAGE_TEXEL_SIZE               0x82A7
+#define GL_IMAGE_COMPATIBILITY_CLASS      0x82A8
+#define GL_IMAGE_PIXEL_FORMAT             0x82A9
+#define GL_IMAGE_PIXEL_TYPE               0x82AA
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD
+#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE
+#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF
+#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1
+#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2
+#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE  0x82B3
+#define GL_CLEAR_BUFFER                   0x82B4
+#define GL_TEXTURE_VIEW                   0x82B5
+#define GL_VIEW_COMPATIBILITY_CLASS       0x82B6
+#define GL_FULL_SUPPORT                   0x82B7
+#define GL_CAVEAT_SUPPORT                 0x82B8
+#define GL_IMAGE_CLASS_4_X_32             0x82B9
+#define GL_IMAGE_CLASS_2_X_32             0x82BA
+#define GL_IMAGE_CLASS_1_X_32             0x82BB
+#define GL_IMAGE_CLASS_4_X_16             0x82BC
+#define GL_IMAGE_CLASS_2_X_16             0x82BD
+#define GL_IMAGE_CLASS_1_X_16             0x82BE
+#define GL_IMAGE_CLASS_4_X_8              0x82BF
+#define GL_IMAGE_CLASS_2_X_8              0x82C0
+#define GL_IMAGE_CLASS_1_X_8              0x82C1
+#define GL_IMAGE_CLASS_11_11_10           0x82C2
+#define GL_IMAGE_CLASS_10_10_10_2         0x82C3
+#define GL_VIEW_CLASS_128_BITS            0x82C4
+#define GL_VIEW_CLASS_96_BITS             0x82C5
+#define GL_VIEW_CLASS_64_BITS             0x82C6
+#define GL_VIEW_CLASS_48_BITS             0x82C7
+#define GL_VIEW_CLASS_32_BITS             0x82C8
+#define GL_VIEW_CLASS_24_BITS             0x82C9
+#define GL_VIEW_CLASS_16_BITS             0x82CA
+#define GL_VIEW_CLASS_8_BITS              0x82CB
+#define GL_VIEW_CLASS_S3TC_DXT1_RGB       0x82CC
+#define GL_VIEW_CLASS_S3TC_DXT1_RGBA      0x82CD
+#define GL_VIEW_CLASS_S3TC_DXT3_RGBA      0x82CE
+#define GL_VIEW_CLASS_S3TC_DXT5_RGBA      0x82CF
+#define GL_VIEW_CLASS_RGTC1_RED           0x82D0
+#define GL_VIEW_CLASS_RGTC2_RG            0x82D1
+#define GL_VIEW_CLASS_BPTC_UNORM          0x82D2
+#define GL_VIEW_CLASS_BPTC_FLOAT          0x82D3
+#define GL_UNIFORM                        0x92E1
+#define GL_UNIFORM_BLOCK                  0x92E2
+#define GL_PROGRAM_INPUT                  0x92E3
+#define GL_PROGRAM_OUTPUT                 0x92E4
+#define GL_BUFFER_VARIABLE                0x92E5
+#define GL_SHADER_STORAGE_BLOCK           0x92E6
+#define GL_VERTEX_SUBROUTINE              0x92E8
+#define GL_TESS_CONTROL_SUBROUTINE        0x92E9
+#define GL_TESS_EVALUATION_SUBROUTINE     0x92EA
+#define GL_GEOMETRY_SUBROUTINE            0x92EB
+#define GL_FRAGMENT_SUBROUTINE            0x92EC
+#define GL_COMPUTE_SUBROUTINE             0x92ED
+#define GL_VERTEX_SUBROUTINE_UNIFORM      0x92EE
+#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF
+#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0
+#define GL_GEOMETRY_SUBROUTINE_UNIFORM    0x92F1
+#define GL_FRAGMENT_SUBROUTINE_UNIFORM    0x92F2
+#define GL_COMPUTE_SUBROUTINE_UNIFORM     0x92F3
+#define GL_TRANSFORM_FEEDBACK_VARYING     0x92F4
+#define GL_ACTIVE_RESOURCES               0x92F5
+#define GL_MAX_NAME_LENGTH                0x92F6
+#define GL_MAX_NUM_ACTIVE_VARIABLES       0x92F7
+#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8
+#define GL_NAME_LENGTH                    0x92F9
+#define GL_TYPE                           0x92FA
+#define GL_ARRAY_SIZE                     0x92FB
+#define GL_OFFSET                         0x92FC
+#define GL_BLOCK_INDEX                    0x92FD
+#define GL_ARRAY_STRIDE                   0x92FE
+#define GL_MATRIX_STRIDE                  0x92FF
+#define GL_IS_ROW_MAJOR                   0x9300
+#define GL_ATOMIC_COUNTER_BUFFER_INDEX    0x9301
+#define GL_BUFFER_BINDING                 0x9302
+#define GL_BUFFER_DATA_SIZE               0x9303
+#define GL_NUM_ACTIVE_VARIABLES           0x9304
+#define GL_ACTIVE_VARIABLES               0x9305
+#define GL_REFERENCED_BY_VERTEX_SHADER    0x9306
+#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307
+#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308
+#define GL_REFERENCED_BY_GEOMETRY_SHADER  0x9309
+#define GL_REFERENCED_BY_FRAGMENT_SHADER  0x930A
+#define GL_REFERENCED_BY_COMPUTE_SHADER   0x930B
+#define GL_TOP_LEVEL_ARRAY_SIZE           0x930C
+#define GL_TOP_LEVEL_ARRAY_STRIDE         0x930D
+#define GL_LOCATION                       0x930E
+#define GL_LOCATION_INDEX                 0x930F
+#define GL_IS_PER_PATCH                   0x92E7
+#define GL_SHADER_STORAGE_BUFFER          0x90D2
+#define GL_SHADER_STORAGE_BUFFER_BINDING  0x90D3
+#define GL_SHADER_STORAGE_BUFFER_START    0x90D4
+#define GL_SHADER_STORAGE_BUFFER_SIZE     0x90D5
+#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6
+#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7
+#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8
+#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9
+#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA
+#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB
+#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC
+#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD
+#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE  0x90DE
+#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF
+#define GL_SHADER_STORAGE_BARRIER_BIT     0x00002000
+#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39
+#define GL_DEPTH_STENCIL_TEXTURE_MODE     0x90EA
+#define GL_TEXTURE_BUFFER_OFFSET          0x919D
+#define GL_TEXTURE_BUFFER_SIZE            0x919E
+#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F
+#define GL_TEXTURE_VIEW_MIN_LEVEL         0x82DB
+#define GL_TEXTURE_VIEW_NUM_LEVELS        0x82DC
+#define GL_TEXTURE_VIEW_MIN_LAYER         0x82DD
+#define GL_TEXTURE_VIEW_NUM_LAYERS        0x82DE
+#define GL_TEXTURE_IMMUTABLE_LEVELS       0x82DF
+#define GL_VERTEX_ATTRIB_BINDING          0x82D4
+#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET  0x82D5
+#define GL_VERTEX_BINDING_DIVISOR         0x82D6
+#define GL_VERTEX_BINDING_OFFSET          0x82D7
+#define GL_VERTEX_BINDING_STRIDE          0x82D8
+#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9
+#define GL_MAX_VERTEX_ATTRIB_BINDINGS     0x82DA
+#define GL_VERTEX_BINDING_BUFFER          0x8F4F
+#define GL_DISPLAY_LIST                   0x82E7
+typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect);
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
+typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name);
+typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void);
+typedef void (APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearBufferData (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearBufferSubData (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z);
+GLAPI void APIENTRY glDispatchComputeIndirect (GLintptr indirect);
+GLAPI void APIENTRY glCopyImageSubData (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth);
+GLAPI void APIENTRY glFramebufferParameteri (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetFramebufferParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params);
+GLAPI void APIENTRY glInvalidateTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glInvalidateTexImage (GLuint texture, GLint level);
+GLAPI void APIENTRY glInvalidateBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glInvalidateBufferData (GLuint buffer);
+GLAPI void APIENTRY glInvalidateFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+GLAPI void APIENTRY glInvalidateSubFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glMultiDrawArraysIndirect (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride);
+GLAPI void APIENTRY glGetProgramInterfaceiv (GLuint program, GLenum programInterface, GLenum pname, GLint *params);
+GLAPI GLuint APIENTRY glGetProgramResourceIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceName (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name);
+GLAPI void APIENTRY glGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params);
+GLAPI GLint APIENTRY glGetProgramResourceLocation (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI GLint APIENTRY glGetProgramResourceLocationIndex (GLuint program, GLenum programInterface, const GLchar *name);
+GLAPI void APIENTRY glShaderStorageBlockBinding (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding);
+GLAPI void APIENTRY glTexBufferRange (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTexStorage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTexStorage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureView (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers);
+GLAPI void APIENTRY glBindVertexBuffer (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormat (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribIFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribLFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexAttribBinding (GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexBindingDivisor (GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+GLAPI void APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+GLAPI void APIENTRY glPopDebugGroup (void);
+GLAPI void APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+GLAPI void APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_VERSION_4_3 */
+
+#ifndef GL_VERSION_4_4
+#define GL_VERSION_4_4 1
+#define GL_MAX_VERTEX_ATTRIB_STRIDE       0x82E5
+#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221
+#define GL_TEXTURE_BUFFER_BINDING         0x8C2A
+#define GL_MAP_PERSISTENT_BIT             0x0040
+#define GL_MAP_COHERENT_BIT               0x0080
+#define GL_DYNAMIC_STORAGE_BIT            0x0100
+#define GL_CLIENT_STORAGE_BIT             0x0200
+#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000
+#define GL_BUFFER_IMMUTABLE_STORAGE       0x821F
+#define GL_BUFFER_STORAGE_FLAGS           0x8220
+#define GL_CLEAR_TEXTURE                  0x9365
+#define GL_LOCATION_COMPONENT             0x934A
+#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B
+#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C
+#define GL_QUERY_BUFFER                   0x9192
+#define GL_QUERY_BUFFER_BARRIER_BIT       0x00008000
+#define GL_QUERY_BUFFER_BINDING           0x9193
+#define GL_QUERY_RESULT_NO_WAIT           0x9194
+#define GL_MIRROR_CLAMP_TO_EDGE           0x8743
+typedef void (APIENTRYP PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+typedef void (APIENTRYP PFNGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint *samplers);
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint *textures);
+typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferStorage (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearTexImage (GLuint texture, GLint level, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glBindBuffersBase (GLenum target, GLuint first, GLsizei count, const GLuint *buffers);
+GLAPI void APIENTRY glBindBuffersRange (GLenum target, GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizeiptr *sizes);
+GLAPI void APIENTRY glBindTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindSamplers (GLuint first, GLsizei count, const GLuint *samplers);
+GLAPI void APIENTRY glBindImageTextures (GLuint first, GLsizei count, const GLuint *textures);
+GLAPI void APIENTRY glBindVertexBuffers (GLuint first, GLsizei count, const GLuint *buffers, const GLintptr *offsets, const GLsizei *strides);
+#endif
+#endif /* GL_VERSION_4_4 */
+
+#ifndef GL_ARB_ES2_compatibility
+#define GL_ARB_ES2_compatibility 1
+#endif /* GL_ARB_ES2_compatibility */
+
+#ifndef GL_ARB_ES3_compatibility
+#define GL_ARB_ES3_compatibility 1
+#endif /* GL_ARB_ES3_compatibility */
+
+#ifndef GL_ARB_arrays_of_arrays
+#define GL_ARB_arrays_of_arrays 1
+#endif /* GL_ARB_arrays_of_arrays */
+
+#ifndef GL_ARB_base_instance
+#define GL_ARB_base_instance 1
+#endif /* GL_ARB_base_instance */
+
+#ifndef GL_ARB_bindless_texture
+#define GL_ARB_bindless_texture 1
+typedef uint64_t GLuint64EXT;
+#define GL_UNSIGNED_INT64_ARB             0x140F
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleARB (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleARB (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentARB (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleARB (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentARB (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64ARB (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vARB (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64ARB (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vARB (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentARB (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentARB (GLuint64 handle);
+GLAPI void APIENTRY glVertexAttribL1ui64ARB (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL1ui64vARB (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLui64vARB (GLuint index, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_ARB_bindless_texture */
+
+#ifndef GL_ARB_blend_func_extended
+#define GL_ARB_blend_func_extended 1
+#endif /* GL_ARB_blend_func_extended */
+
+#ifndef GL_ARB_buffer_storage
+#define GL_ARB_buffer_storage 1
+#endif /* GL_ARB_buffer_storage */
+
+#ifndef GL_ARB_cl_event
+#define GL_ARB_cl_event 1
+struct _cl_context;
+struct _cl_event;
+#define GL_SYNC_CL_EVENT_ARB              0x8240
+#define GL_SYNC_CL_EVENT_COMPLETE_ARB     0x8241
+typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context *context, struct _cl_event *event, GLbitfield flags);
+#endif
+#endif /* GL_ARB_cl_event */
+
+#ifndef GL_ARB_clear_buffer_object
+#define GL_ARB_clear_buffer_object 1
+#endif /* GL_ARB_clear_buffer_object */
+
+#ifndef GL_ARB_clear_texture
+#define GL_ARB_clear_texture 1
+#endif /* GL_ARB_clear_texture */
+
+#ifndef GL_ARB_color_buffer_float
+#define GL_ARB_color_buffer_float 1
+#define GL_RGBA_FLOAT_MODE_ARB            0x8820
+#define GL_CLAMP_VERTEX_COLOR_ARB         0x891A
+#define GL_CLAMP_FRAGMENT_COLOR_ARB       0x891B
+#define GL_CLAMP_READ_COLOR_ARB           0x891C
+#define GL_FIXED_ONLY_ARB                 0x891D
+typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp);
+#endif
+#endif /* GL_ARB_color_buffer_float */
+
+#ifndef GL_ARB_compatibility
+#define GL_ARB_compatibility 1
+#endif /* GL_ARB_compatibility */
+
+#ifndef GL_ARB_compressed_texture_pixel_storage
+#define GL_ARB_compressed_texture_pixel_storage 1
+#endif /* GL_ARB_compressed_texture_pixel_storage */
+
+#ifndef GL_ARB_compute_shader
+#define GL_ARB_compute_shader 1
+#define GL_COMPUTE_SHADER_BIT             0x00000020
+#endif /* GL_ARB_compute_shader */
+
+#ifndef GL_ARB_compute_variable_group_size
+#define GL_ARB_compute_variable_group_size 1
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344
+#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB
+#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345
+#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF
+typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDispatchComputeGroupSizeARB (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z);
+#endif
+#endif /* GL_ARB_compute_variable_group_size */
+
+#ifndef GL_ARB_conservative_depth
+#define GL_ARB_conservative_depth 1
+#endif /* GL_ARB_conservative_depth */
+
+#ifndef GL_ARB_copy_buffer
+#define GL_ARB_copy_buffer 1
+#define GL_COPY_READ_BUFFER_BINDING       0x8F36
+#define GL_COPY_WRITE_BUFFER_BINDING      0x8F37
+#endif /* GL_ARB_copy_buffer */
+
+#ifndef GL_ARB_copy_image
+#define GL_ARB_copy_image 1
+#endif /* GL_ARB_copy_image */
+
+#ifndef GL_ARB_debug_output
+#define GL_ARB_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB   0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION_ARB    0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM_ARB  0x8245
+#define GL_DEBUG_SOURCE_API_ARB           0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB   0x8249
+#define GL_DEBUG_SOURCE_APPLICATION_ARB   0x824A
+#define GL_DEBUG_SOURCE_OTHER_ARB         0x824B
+#define GL_DEBUG_TYPE_ERROR_ARB           0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E
+#define GL_DEBUG_TYPE_PORTABILITY_ARB     0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE_ARB     0x8250
+#define GL_DEBUG_TYPE_OTHER_ARB           0x8251
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_ARB      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_ARB        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_ARB      0x9147
+#define GL_DEBUG_SEVERITY_LOW_ARB         0x9148
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufSize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+#endif
+#endif /* GL_ARB_debug_output */
+
+#ifndef GL_ARB_depth_buffer_float
+#define GL_ARB_depth_buffer_float 1
+#endif /* GL_ARB_depth_buffer_float */
+
+#ifndef GL_ARB_depth_clamp
+#define GL_ARB_depth_clamp 1
+#endif /* GL_ARB_depth_clamp */
+
+#ifndef GL_ARB_depth_texture
+#define GL_ARB_depth_texture 1
+#define GL_DEPTH_COMPONENT16_ARB          0x81A5
+#define GL_DEPTH_COMPONENT24_ARB          0x81A6
+#define GL_DEPTH_COMPONENT32_ARB          0x81A7
+#define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
+#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+#endif /* GL_ARB_depth_texture */
+
+#ifndef GL_ARB_draw_buffers
+#define GL_ARB_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ARB           0x8824
+#define GL_DRAW_BUFFER0_ARB               0x8825
+#define GL_DRAW_BUFFER1_ARB               0x8826
+#define GL_DRAW_BUFFER2_ARB               0x8827
+#define GL_DRAW_BUFFER3_ARB               0x8828
+#define GL_DRAW_BUFFER4_ARB               0x8829
+#define GL_DRAW_BUFFER5_ARB               0x882A
+#define GL_DRAW_BUFFER6_ARB               0x882B
+#define GL_DRAW_BUFFER7_ARB               0x882C
+#define GL_DRAW_BUFFER8_ARB               0x882D
+#define GL_DRAW_BUFFER9_ARB               0x882E
+#define GL_DRAW_BUFFER10_ARB              0x882F
+#define GL_DRAW_BUFFER11_ARB              0x8830
+#define GL_DRAW_BUFFER12_ARB              0x8831
+#define GL_DRAW_BUFFER13_ARB              0x8832
+#define GL_DRAW_BUFFER14_ARB              0x8833
+#define GL_DRAW_BUFFER15_ARB              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ARB_draw_buffers */
+
+#ifndef GL_ARB_draw_buffers_blend
+#define GL_ARB_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+#endif
+#endif /* GL_ARB_draw_buffers_blend */
+
+#ifndef GL_ARB_draw_elements_base_vertex
+#define GL_ARB_draw_elements_base_vertex 1
+#endif /* GL_ARB_draw_elements_base_vertex */
+
+#ifndef GL_ARB_draw_indirect
+#define GL_ARB_draw_indirect 1
+#endif /* GL_ARB_draw_indirect */
+
+#ifndef GL_ARB_draw_instanced
+#define GL_ARB_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_ARB_draw_instanced */
+
+#ifndef GL_ARB_enhanced_layouts
+#define GL_ARB_enhanced_layouts 1
+#endif /* GL_ARB_enhanced_layouts */
+
+#ifndef GL_ARB_explicit_attrib_location
+#define GL_ARB_explicit_attrib_location 1
+#endif /* GL_ARB_explicit_attrib_location */
+
+#ifndef GL_ARB_explicit_uniform_location
+#define GL_ARB_explicit_uniform_location 1
+#endif /* GL_ARB_explicit_uniform_location */
+
+#ifndef GL_ARB_fragment_coord_conventions
+#define GL_ARB_fragment_coord_conventions 1
+#endif /* GL_ARB_fragment_coord_conventions */
+
+#ifndef GL_ARB_fragment_layer_viewport
+#define GL_ARB_fragment_layer_viewport 1
+#endif /* GL_ARB_fragment_layer_viewport */
+
+#ifndef GL_ARB_fragment_program
+#define GL_ARB_fragment_program 1
+#define GL_FRAGMENT_PROGRAM_ARB           0x8804
+#define GL_PROGRAM_FORMAT_ASCII_ARB       0x8875
+#define GL_PROGRAM_LENGTH_ARB             0x8627
+#define GL_PROGRAM_FORMAT_ARB             0x8876
+#define GL_PROGRAM_BINDING_ARB            0x8677
+#define GL_PROGRAM_INSTRUCTIONS_ARB       0x88A0
+#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB   0x88A1
+#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2
+#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3
+#define GL_PROGRAM_TEMPORARIES_ARB        0x88A4
+#define GL_MAX_PROGRAM_TEMPORARIES_ARB    0x88A5
+#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6
+#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7
+#define GL_PROGRAM_PARAMETERS_ARB         0x88A8
+#define GL_MAX_PROGRAM_PARAMETERS_ARB     0x88A9
+#define GL_PROGRAM_NATIVE_PARAMETERS_ARB  0x88AA
+#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB
+#define GL_PROGRAM_ATTRIBS_ARB            0x88AC
+#define GL_MAX_PROGRAM_ATTRIBS_ARB        0x88AD
+#define GL_PROGRAM_NATIVE_ATTRIBS_ARB     0x88AE
+#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF
+#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4
+#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5
+#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6
+#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB   0x8805
+#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB   0x8806
+#define GL_PROGRAM_TEX_INDIRECTIONS_ARB   0x8807
+#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808
+#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809
+#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A
+#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B
+#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C
+#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D
+#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E
+#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F
+#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810
+#define GL_PROGRAM_STRING_ARB             0x8628
+#define GL_PROGRAM_ERROR_POSITION_ARB     0x864B
+#define GL_CURRENT_MATRIX_ARB             0x8641
+#define GL_TRANSPOSE_CURRENT_MATRIX_ARB   0x88B7
+#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640
+#define GL_MAX_PROGRAM_MATRICES_ARB       0x862F
+#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E
+#define GL_MAX_TEXTURE_COORDS_ARB         0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB    0x8872
+#define GL_PROGRAM_ERROR_STRING_ARB       0x8874
+#define GL_MATRIX0_ARB                    0x88C0
+#define GL_MATRIX1_ARB                    0x88C1
+#define GL_MATRIX2_ARB                    0x88C2
+#define GL_MATRIX3_ARB                    0x88C3
+#define GL_MATRIX4_ARB                    0x88C4
+#define GL_MATRIX5_ARB                    0x88C5
+#define GL_MATRIX6_ARB                    0x88C6
+#define GL_MATRIX7_ARB                    0x88C7
+#define GL_MATRIX8_ARB                    0x88C8
+#define GL_MATRIX9_ARB                    0x88C9
+#define GL_MATRIX10_ARB                   0x88CA
+#define GL_MATRIX11_ARB                   0x88CB
+#define GL_MATRIX12_ARB                   0x88CC
+#define GL_MATRIX13_ARB                   0x88CD
+#define GL_MATRIX14_ARB                   0x88CE
+#define GL_MATRIX15_ARB                   0x88CF
+#define GL_MATRIX16_ARB                   0x88D0
+#define GL_MATRIX17_ARB                   0x88D1
+#define GL_MATRIX18_ARB                   0x88D2
+#define GL_MATRIX19_ARB                   0x88D3
+#define GL_MATRIX20_ARB                   0x88D4
+#define GL_MATRIX21_ARB                   0x88D5
+#define GL_MATRIX22_ARB                   0x88D6
+#define GL_MATRIX23_ARB                   0x88D7
+#define GL_MATRIX24_ARB                   0x88D8
+#define GL_MATRIX25_ARB                   0x88D9
+#define GL_MATRIX26_ARB                   0x88DA
+#define GL_MATRIX27_ARB                   0x88DB
+#define GL_MATRIX28_ARB                   0x88DC
+#define GL_MATRIX29_ARB                   0x88DD
+#define GL_MATRIX30_ARB                   0x88DE
+#define GL_MATRIX31_ARB                   0x88DF
+typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program);
+GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, void *string);
+GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program);
+#endif
+#endif /* GL_ARB_fragment_program */
+
+#ifndef GL_ARB_fragment_program_shadow
+#define GL_ARB_fragment_program_shadow 1
+#endif /* GL_ARB_fragment_program_shadow */
+
+#ifndef GL_ARB_fragment_shader
+#define GL_ARB_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ARB            0x8B30
+#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B
+#endif /* GL_ARB_fragment_shader */
+
+#ifndef GL_ARB_framebuffer_no_attachments
+#define GL_ARB_framebuffer_no_attachments 1
+#endif /* GL_ARB_framebuffer_no_attachments */
+
+#ifndef GL_ARB_framebuffer_object
+#define GL_ARB_framebuffer_object 1
+#endif /* GL_ARB_framebuffer_object */
+
+#ifndef GL_ARB_framebuffer_sRGB
+#define GL_ARB_framebuffer_sRGB 1
+#endif /* GL_ARB_framebuffer_sRGB */
+
+#ifndef GL_KHR_context_flush_control
+#define GL_CONTEXT_RELEASE_BEHAVIOR       0x82FB
+#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC
+#endif /* GL_KHR_context_flush_control */
+
+#ifndef GL_ARB_geometry_shader4
+#define GL_ARB_geometry_shader4 1
+#define GL_LINES_ADJACENCY_ARB            0x000A
+#define GL_LINE_STRIP_ADJACENCY_ARB       0x000B
+#define GL_TRIANGLES_ADJACENCY_ARB        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_ARB   0x000D
+#define GL_PROGRAM_POINT_SIZE_ARB         0x8642
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9
+#define GL_GEOMETRY_SHADER_ARB            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_ARB      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_ARB        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_ARB       0x8DDC
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value);
+GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_ARB_geometry_shader4 */
+
+#ifndef GL_ARB_get_program_binary
+#define GL_ARB_get_program_binary 1
+#endif /* GL_ARB_get_program_binary */
+
+#ifndef GL_ARB_gpu_shader5
+#define GL_ARB_gpu_shader5 1
+#endif /* GL_ARB_gpu_shader5 */
+
+#ifndef GL_ARB_gpu_shader_fp64
+#define GL_ARB_gpu_shader_fp64 1
+#endif /* GL_ARB_gpu_shader_fp64 */
+
+#ifndef GL_ARB_half_float_pixel
+#define GL_ARB_half_float_pixel 1
+typedef unsigned short GLhalfARB;
+#define GL_HALF_FLOAT_ARB                 0x140B
+#endif /* GL_ARB_half_float_pixel */
+
+#ifndef GL_ARB_half_float_vertex
+#define GL_ARB_half_float_vertex 1
+#endif /* GL_ARB_half_float_vertex */
+
+#ifndef GL_ARB_imaging
+#define GL_ARB_imaging 1
+#define GL_BLEND_COLOR                    0x8005
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_CONVOLUTION_1D                 0x8010
+#define GL_CONVOLUTION_2D                 0x8011
+#define GL_SEPARABLE_2D                   0x8012
+#define GL_CONVOLUTION_BORDER_MODE        0x8013
+#define GL_CONVOLUTION_FILTER_SCALE       0x8014
+#define GL_CONVOLUTION_FILTER_BIAS        0x8015
+#define GL_REDUCE                         0x8016
+#define GL_CONVOLUTION_FORMAT             0x8017
+#define GL_CONVOLUTION_WIDTH              0x8018
+#define GL_CONVOLUTION_HEIGHT             0x8019
+#define GL_MAX_CONVOLUTION_WIDTH          0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT         0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE     0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE   0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE    0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE   0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS      0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS    0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS     0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS    0x8023
+#define GL_HISTOGRAM                      0x8024
+#define GL_PROXY_HISTOGRAM                0x8025
+#define GL_HISTOGRAM_WIDTH                0x8026
+#define GL_HISTOGRAM_FORMAT               0x8027
+#define GL_HISTOGRAM_RED_SIZE             0x8028
+#define GL_HISTOGRAM_GREEN_SIZE           0x8029
+#define GL_HISTOGRAM_BLUE_SIZE            0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE           0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE       0x802C
+#define GL_HISTOGRAM_SINK                 0x802D
+#define GL_MINMAX                         0x802E
+#define GL_MINMAX_FORMAT                  0x802F
+#define GL_MINMAX_SINK                    0x8030
+#define GL_TABLE_TOO_LARGE                0x8031
+#define GL_COLOR_MATRIX                   0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH       0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH   0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE    0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE  0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE   0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE  0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS     0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS   0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS    0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS   0x80BB
+#define GL_COLOR_TABLE                    0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE   0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE  0x80D2
+#define GL_PROXY_COLOR_TABLE              0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5
+#define GL_COLOR_TABLE_SCALE              0x80D6
+#define GL_COLOR_TABLE_BIAS               0x80D7
+#define GL_COLOR_TABLE_FORMAT             0x80D8
+#define GL_COLOR_TABLE_WIDTH              0x80D9
+#define GL_COLOR_TABLE_RED_SIZE           0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE         0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE          0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE         0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE     0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE     0x80DF
+#define GL_CONSTANT_BORDER                0x8151
+#define GL_REPLICATE_BORDER               0x8153
+#define GL_CONVOLUTION_BORDER_COLOR       0x8154
+typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogram (GLenum target);
+GLAPI void APIENTRY glResetMinmax (GLenum target);
+#endif
+#endif /* GL_ARB_imaging */
+
+#ifndef GL_ARB_indirect_parameters
+#define GL_ARB_indirect_parameters 1
+#define GL_PARAMETER_BUFFER_ARB           0x80EE
+#define GL_PARAMETER_BUFFER_BINDING_ARB   0x80EF
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectCountARB (GLenum mode, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectCountARB (GLenum mode, GLenum type, GLintptr indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride);
+#endif
+#endif /* GL_ARB_indirect_parameters */
+
+#ifndef GL_ARB_instanced_arrays
+#define GL_ARB_instanced_arrays 1
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE
+typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor);
+#endif
+#endif /* GL_ARB_instanced_arrays */
+
+#ifndef GL_ARB_internalformat_query
+#define GL_ARB_internalformat_query 1
+#endif /* GL_ARB_internalformat_query */
+
+#ifndef GL_ARB_internalformat_query2
+#define GL_ARB_internalformat_query2 1
+#define GL_SRGB_DECODE_ARB                0x8299
+#endif /* GL_ARB_internalformat_query2 */
+
+#ifndef GL_ARB_invalidate_subdata
+#define GL_ARB_invalidate_subdata 1
+#endif /* GL_ARB_invalidate_subdata */
+
+#ifndef GL_ARB_map_buffer_alignment
+#define GL_ARB_map_buffer_alignment 1
+#endif /* GL_ARB_map_buffer_alignment */
+
+#ifndef GL_ARB_map_buffer_range
+#define GL_ARB_map_buffer_range 1
+#endif /* GL_ARB_map_buffer_range */
+
+#ifndef GL_ARB_matrix_palette
+#define GL_ARB_matrix_palette 1
+#define GL_MATRIX_PALETTE_ARB             0x8840
+#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841
+#define GL_MAX_PALETTE_MATRICES_ARB       0x8842
+#define GL_CURRENT_PALETTE_MATRIX_ARB     0x8843
+#define GL_MATRIX_INDEX_ARRAY_ARB         0x8844
+#define GL_CURRENT_MATRIX_INDEX_ARB       0x8845
+#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB    0x8846
+#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB    0x8847
+#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB  0x8848
+#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849
+typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices);
+typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index);
+GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices);
+GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices);
+GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices);
+GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_ARB_matrix_palette */
+
+#ifndef GL_ARB_multi_bind
+#define GL_ARB_multi_bind 1
+#endif /* GL_ARB_multi_bind */
+
+#ifndef GL_ARB_multi_draw_indirect
+#define GL_ARB_multi_draw_indirect 1
+#endif /* GL_ARB_multi_draw_indirect */
+
+#ifndef GL_ARB_multisample
+#define GL_ARB_multisample 1
+#define GL_MULTISAMPLE_ARB                0x809D
+#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB   0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_ARB        0x809F
+#define GL_SAMPLE_COVERAGE_ARB            0x80A0
+#define GL_SAMPLE_BUFFERS_ARB             0x80A8
+#define GL_SAMPLES_ARB                    0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE_ARB      0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT_ARB     0x80AB
+#define GL_MULTISAMPLE_BIT_ARB            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLfloat value, GLboolean invert);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleCoverageARB (GLfloat value, GLboolean invert);
+#endif
+#endif /* GL_ARB_multisample */
+
+#ifndef GL_ARB_multitexture
+#define GL_ARB_multitexture 1
+#define GL_TEXTURE0_ARB                   0x84C0
+#define GL_TEXTURE1_ARB                   0x84C1
+#define GL_TEXTURE2_ARB                   0x84C2
+#define GL_TEXTURE3_ARB                   0x84C3
+#define GL_TEXTURE4_ARB                   0x84C4
+#define GL_TEXTURE5_ARB                   0x84C5
+#define GL_TEXTURE6_ARB                   0x84C6
+#define GL_TEXTURE7_ARB                   0x84C7
+#define GL_TEXTURE8_ARB                   0x84C8
+#define GL_TEXTURE9_ARB                   0x84C9
+#define GL_TEXTURE10_ARB                  0x84CA
+#define GL_TEXTURE11_ARB                  0x84CB
+#define GL_TEXTURE12_ARB                  0x84CC
+#define GL_TEXTURE13_ARB                  0x84CD
+#define GL_TEXTURE14_ARB                  0x84CE
+#define GL_TEXTURE15_ARB                  0x84CF
+#define GL_TEXTURE16_ARB                  0x84D0
+#define GL_TEXTURE17_ARB                  0x84D1
+#define GL_TEXTURE18_ARB                  0x84D2
+#define GL_TEXTURE19_ARB                  0x84D3
+#define GL_TEXTURE20_ARB                  0x84D4
+#define GL_TEXTURE21_ARB                  0x84D5
+#define GL_TEXTURE22_ARB                  0x84D6
+#define GL_TEXTURE23_ARB                  0x84D7
+#define GL_TEXTURE24_ARB                  0x84D8
+#define GL_TEXTURE25_ARB                  0x84D9
+#define GL_TEXTURE26_ARB                  0x84DA
+#define GL_TEXTURE27_ARB                  0x84DB
+#define GL_TEXTURE28_ARB                  0x84DC
+#define GL_TEXTURE29_ARB                  0x84DD
+#define GL_TEXTURE30_ARB                  0x84DE
+#define GL_TEXTURE31_ARB                  0x84DF
+#define GL_ACTIVE_TEXTURE_ARB             0x84E0
+#define GL_CLIENT_ACTIVE_TEXTURE_ARB      0x84E1
+#define GL_MAX_TEXTURE_UNITS_ARB          0x84E2
+typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture);
+GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s);
+GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s);
+GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s);
+GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s);
+GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t);
+GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t);
+GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t);
+GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t);
+GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r);
+GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r);
+GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r);
+GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r);
+GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v);
+GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q);
+GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v);
+GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);
+GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v);
+GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q);
+GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v);
+GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q);
+GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v);
+#endif
+#endif /* GL_ARB_multitexture */
+
+#ifndef GL_ARB_occlusion_query
+#define GL_ARB_occlusion_query 1
+#define GL_QUERY_COUNTER_BITS_ARB         0x8864
+#define GL_CURRENT_QUERY_ARB              0x8865
+#define GL_QUERY_RESULT_ARB               0x8866
+#define GL_QUERY_RESULT_AVAILABLE_ARB     0x8867
+#define GL_SAMPLES_PASSED_ARB             0x8914
+typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id);
+GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id);
+GLAPI void APIENTRY glEndQueryARB (GLenum target);
+GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_ARB_occlusion_query */
+
+#ifndef GL_ARB_occlusion_query2
+#define GL_ARB_occlusion_query2 1
+#endif /* GL_ARB_occlusion_query2 */
+
+#ifndef GL_ARB_pixel_buffer_object
+#define GL_ARB_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_ARB          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_ARB        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_ARB  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF
+#endif /* GL_ARB_pixel_buffer_object */
+
+#ifndef GL_ARB_point_parameters
+#define GL_ARB_point_parameters 1
+#define GL_POINT_SIZE_MIN_ARB             0x8126
+#define GL_POINT_SIZE_MAX_ARB             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_ARB  0x8128
+#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_ARB_point_parameters */
+
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif /* GL_ARB_point_sprite */
+
+#ifndef GL_ARB_program_interface_query
+#define GL_ARB_program_interface_query 1
+#endif /* GL_ARB_program_interface_query */
+
+#ifndef GL_ARB_provoking_vertex
+#define GL_ARB_provoking_vertex 1
+#endif /* GL_ARB_provoking_vertex */
+
+#ifndef GL_ARB_query_buffer_object
+#define GL_ARB_query_buffer_object 1
+#endif /* GL_ARB_query_buffer_object */
+
+#ifndef GL_ARB_robust_buffer_access_behavior
+#define GL_ARB_robust_buffer_access_behavior 1
+#endif /* GL_ARB_robust_buffer_access_behavior */
+
+#ifndef GL_ARB_robustness
+#define GL_ARB_robustness 1
+#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004
+#define GL_LOSE_CONTEXT_ON_RESET_ARB      0x8252
+#define GL_GUILTY_CONTEXT_RESET_ARB       0x8253
+#define GL_INNOCENT_CONTEXT_RESET_ARB     0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_ARB      0x8255
+#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256
+#define GL_NO_RESET_NOTIFICATION_ARB      0x8261
+typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void);
+typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void *img);
+typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values);
+typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values);
+typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern);
+typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void);
+GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data);
+GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, void *img);
+GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params);
+GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params);
+GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v);
+GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v);
+GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v);
+GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values);
+GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values);
+GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values);
+GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern);
+GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *table);
+GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void *image);
+GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void *row, GLsizei columnBufSize, void *column, void *span);
+GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void *values);
+#endif
+#endif /* GL_ARB_robustness */
+
+#ifndef GL_ARB_robustness_isolation
+#define GL_ARB_robustness_isolation 1
+#endif /* GL_ARB_robustness_isolation */
+
+#ifndef GL_ARB_sample_shading
+#define GL_ARB_sample_shading 1
+#define GL_SAMPLE_SHADING_ARB             0x8C36
+#define GL_MIN_SAMPLE_SHADING_VALUE_ARB   0x8C37
+typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLfloat value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMinSampleShadingARB (GLfloat value);
+#endif
+#endif /* GL_ARB_sample_shading */
+
+#ifndef GL_ARB_sampler_objects
+#define GL_ARB_sampler_objects 1
+#endif /* GL_ARB_sampler_objects */
+
+#ifndef GL_ARB_seamless_cube_map
+#define GL_ARB_seamless_cube_map 1
+#endif /* GL_ARB_seamless_cube_map */
+
+#ifndef GL_ARB_seamless_cubemap_per_texture
+#define GL_ARB_seamless_cubemap_per_texture 1
+#endif /* GL_ARB_seamless_cubemap_per_texture */
+
+#ifndef GL_ARB_separate_shader_objects
+#define GL_ARB_separate_shader_objects 1
+#endif /* GL_ARB_separate_shader_objects */
+
+#ifndef GL_ARB_shader_atomic_counters
+#define GL_ARB_shader_atomic_counters 1
+#endif /* GL_ARB_shader_atomic_counters */
+
+#ifndef GL_ARB_shader_bit_encoding
+#define GL_ARB_shader_bit_encoding 1
+#endif /* GL_ARB_shader_bit_encoding */
+
+#ifndef GL_ARB_shader_draw_parameters
+#define GL_ARB_shader_draw_parameters 1
+#endif /* GL_ARB_shader_draw_parameters */
+
+#ifndef GL_ARB_shader_group_vote
+#define GL_ARB_shader_group_vote 1
+#endif /* GL_ARB_shader_group_vote */
+
+#ifndef GL_ARB_shader_image_load_store
+#define GL_ARB_shader_image_load_store 1
+#endif /* GL_ARB_shader_image_load_store */
+
+#ifndef GL_ARB_shader_image_size
+#define GL_ARB_shader_image_size 1
+#endif /* GL_ARB_shader_image_size */
+
+#ifndef GL_ARB_shader_objects
+#define GL_ARB_shader_objects 1
+#ifdef __APPLE__
+typedef void *GLhandleARB;
+#else
+typedef unsigned int GLhandleARB;
+#endif
+typedef char GLcharARB;
+#define GL_PROGRAM_OBJECT_ARB             0x8B40
+#define GL_SHADER_OBJECT_ARB              0x8B48
+#define GL_OBJECT_TYPE_ARB                0x8B4E
+#define GL_OBJECT_SUBTYPE_ARB             0x8B4F
+#define GL_FLOAT_VEC2_ARB                 0x8B50
+#define GL_FLOAT_VEC3_ARB                 0x8B51
+#define GL_FLOAT_VEC4_ARB                 0x8B52
+#define GL_INT_VEC2_ARB                   0x8B53
+#define GL_INT_VEC3_ARB                   0x8B54
+#define GL_INT_VEC4_ARB                   0x8B55
+#define GL_BOOL_ARB                       0x8B56
+#define GL_BOOL_VEC2_ARB                  0x8B57
+#define GL_BOOL_VEC3_ARB                  0x8B58
+#define GL_BOOL_VEC4_ARB                  0x8B59
+#define GL_FLOAT_MAT2_ARB                 0x8B5A
+#define GL_FLOAT_MAT3_ARB                 0x8B5B
+#define GL_FLOAT_MAT4_ARB                 0x8B5C
+#define GL_SAMPLER_1D_ARB                 0x8B5D
+#define GL_SAMPLER_2D_ARB                 0x8B5E
+#define GL_SAMPLER_3D_ARB                 0x8B5F
+#define GL_SAMPLER_CUBE_ARB               0x8B60
+#define GL_SAMPLER_1D_SHADOW_ARB          0x8B61
+#define GL_SAMPLER_2D_SHADOW_ARB          0x8B62
+#define GL_SAMPLER_2D_RECT_ARB            0x8B63
+#define GL_SAMPLER_2D_RECT_SHADOW_ARB     0x8B64
+#define GL_OBJECT_DELETE_STATUS_ARB       0x8B80
+#define GL_OBJECT_COMPILE_STATUS_ARB      0x8B81
+#define GL_OBJECT_LINK_STATUS_ARB         0x8B82
+#define GL_OBJECT_VALIDATE_STATUS_ARB     0x8B83
+#define GL_OBJECT_INFO_LOG_LENGTH_ARB     0x8B84
+#define GL_OBJECT_ATTACHED_OBJECTS_ARB    0x8B85
+#define GL_OBJECT_ACTIVE_UNIFORMS_ARB     0x8B86
+#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87
+#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88
+typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj);
+typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType);
+typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj);
+typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void);
+typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj);
+typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj);
+typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params);
+typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj);
+GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname);
+GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj);
+GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType);
+GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length);
+GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj);
+GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void);
+GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj);
+GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj);
+GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj);
+GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0);
+GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0);
+GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog);
+GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj);
+GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params);
+GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params);
+GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source);
+#endif
+#endif /* GL_ARB_shader_objects */
+
+#ifndef GL_ARB_shader_precision
+#define GL_ARB_shader_precision 1
+#endif /* GL_ARB_shader_precision */
+
+#ifndef GL_ARB_shader_stencil_export
+#define GL_ARB_shader_stencil_export 1
+#endif /* GL_ARB_shader_stencil_export */
+
+#ifndef GL_ARB_shader_storage_buffer_object
+#define GL_ARB_shader_storage_buffer_object 1
+#endif /* GL_ARB_shader_storage_buffer_object */
+
+#ifndef GL_ARB_shader_subroutine
+#define GL_ARB_shader_subroutine 1
+#endif /* GL_ARB_shader_subroutine */
+
+#ifndef GL_ARB_shader_texture_lod
+#define GL_ARB_shader_texture_lod 1
+#endif /* GL_ARB_shader_texture_lod */
+
+#ifndef GL_ARB_shading_language_100
+#define GL_ARB_shading_language_100 1
+#define GL_SHADING_LANGUAGE_VERSION_ARB   0x8B8C
+#endif /* GL_ARB_shading_language_100 */
+
+#ifndef GL_ARB_shading_language_420pack
+#define GL_ARB_shading_language_420pack 1
+#endif /* GL_ARB_shading_language_420pack */
+
+#ifndef GL_ARB_shading_language_include
+#define GL_ARB_shading_language_include 1
+#define GL_SHADER_INCLUDE_ARB             0x8DAE
+#define GL_NAMED_STRING_LENGTH_ARB        0x8DE9
+#define GL_NAMED_STRING_TYPE_ARB          0x8DEA
+typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string);
+GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar *const*path, const GLint *length);
+GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name);
+GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string);
+GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ARB_shading_language_include */
+
+#ifndef GL_ARB_shading_language_packing
+#define GL_ARB_shading_language_packing 1
+#endif /* GL_ARB_shading_language_packing */
+
+#ifndef GL_ARB_shadow
+#define GL_ARB_shadow 1
+#define GL_TEXTURE_COMPARE_MODE_ARB       0x884C
+#define GL_TEXTURE_COMPARE_FUNC_ARB       0x884D
+#define GL_COMPARE_R_TO_TEXTURE_ARB       0x884E
+#endif /* GL_ARB_shadow */
+
+#ifndef GL_ARB_shadow_ambient
+#define GL_ARB_shadow_ambient 1
+#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF
+#endif /* GL_ARB_shadow_ambient */
+
+#ifndef GL_ARB_sparse_texture
+#define GL_ARB_sparse_texture 1
+#define GL_TEXTURE_SPARSE_ARB             0x91A6
+#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB    0x91A7
+#define GL_MIN_SPARSE_LEVEL_ARB           0x919B
+#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB     0x91A8
+#define GL_VIRTUAL_PAGE_SIZE_X_ARB        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_ARB        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_ARB        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A
+#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9
+typedef void (APIENTRYP PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexPageCommitmentARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident);
+#endif
+#endif /* GL_ARB_sparse_texture */
+
+#ifndef GL_ARB_stencil_texturing
+#define GL_ARB_stencil_texturing 1
+#endif /* GL_ARB_stencil_texturing */
+
+#ifndef GL_ARB_sync
+#define GL_ARB_sync 1
+#endif /* GL_ARB_sync */
+
+#ifndef GL_ARB_tessellation_shader
+#define GL_ARB_tessellation_shader 1
+#endif /* GL_ARB_tessellation_shader */
+
+#ifndef GL_ARB_texture_border_clamp
+#define GL_ARB_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_ARB            0x812D
+#endif /* GL_ARB_texture_border_clamp */
+
+#ifndef GL_ARB_texture_buffer_object
+#define GL_ARB_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_ARB             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_ARB     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_ARB      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_ARB_texture_buffer_object */
+
+#ifndef GL_ARB_texture_buffer_object_rgb32
+#define GL_ARB_texture_buffer_object_rgb32 1
+#endif /* GL_ARB_texture_buffer_object_rgb32 */
+
+#ifndef GL_ARB_texture_buffer_range
+#define GL_ARB_texture_buffer_range 1
+#endif /* GL_ARB_texture_buffer_range */
+
+#ifndef GL_ARB_texture_compression
+#define GL_ARB_texture_compression 1
+#define GL_COMPRESSED_ALPHA_ARB           0x84E9
+#define GL_COMPRESSED_LUMINANCE_ARB       0x84EA
+#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB
+#define GL_COMPRESSED_INTENSITY_ARB       0x84EC
+#define GL_COMPRESSED_RGB_ARB             0x84ED
+#define GL_COMPRESSED_RGBA_ARB            0x84EE
+#define GL_TEXTURE_COMPRESSION_HINT_ARB   0x84EF
+#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0
+#define GL_TEXTURE_COMPRESSED_ARB         0x86A1
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, void *img);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data);
+GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, void *img);
+#endif
+#endif /* GL_ARB_texture_compression */
+
+#ifndef GL_ARB_texture_compression_bptc
+#define GL_ARB_texture_compression_bptc 1
+#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C
+#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
+#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
+#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
+#endif /* GL_ARB_texture_compression_bptc */
+
+#ifndef GL_ARB_texture_compression_rgtc
+#define GL_ARB_texture_compression_rgtc 1
+#endif /* GL_ARB_texture_compression_rgtc */
+
+#ifndef GL_ARB_texture_cube_map
+#define GL_ARB_texture_cube_map 1
+#define GL_NORMAL_MAP_ARB                 0x8511
+#define GL_REFLECTION_MAP_ARB             0x8512
+#define GL_TEXTURE_CUBE_MAP_ARB           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARB   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARB     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB  0x851C
+#endif /* GL_ARB_texture_cube_map */
+
+#ifndef GL_ARB_texture_cube_map_array
+#define GL_ARB_texture_cube_map_array 1
+#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB     0x9009
+#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A
+#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B
+#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB     0x900C
+#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D
+#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F
+#endif /* GL_ARB_texture_cube_map_array */
+
+#ifndef GL_ARB_texture_env_add
+#define GL_ARB_texture_env_add 1
+#endif /* GL_ARB_texture_env_add */
+
+#ifndef GL_ARB_texture_env_combine
+#define GL_ARB_texture_env_combine 1
+#define GL_COMBINE_ARB                    0x8570
+#define GL_COMBINE_RGB_ARB                0x8571
+#define GL_COMBINE_ALPHA_ARB              0x8572
+#define GL_SOURCE0_RGB_ARB                0x8580
+#define GL_SOURCE1_RGB_ARB                0x8581
+#define GL_SOURCE2_RGB_ARB                0x8582
+#define GL_SOURCE0_ALPHA_ARB              0x8588
+#define GL_SOURCE1_ALPHA_ARB              0x8589
+#define GL_SOURCE2_ALPHA_ARB              0x858A
+#define GL_OPERAND0_RGB_ARB               0x8590
+#define GL_OPERAND1_RGB_ARB               0x8591
+#define GL_OPERAND2_RGB_ARB               0x8592
+#define GL_OPERAND0_ALPHA_ARB             0x8598
+#define GL_OPERAND1_ALPHA_ARB             0x8599
+#define GL_OPERAND2_ALPHA_ARB             0x859A
+#define GL_RGB_SCALE_ARB                  0x8573
+#define GL_ADD_SIGNED_ARB                 0x8574
+#define GL_INTERPOLATE_ARB                0x8575
+#define GL_SUBTRACT_ARB                   0x84E7
+#define GL_CONSTANT_ARB                   0x8576
+#define GL_PRIMARY_COLOR_ARB              0x8577
+#define GL_PREVIOUS_ARB                   0x8578
+#endif /* GL_ARB_texture_env_combine */
+
+#ifndef GL_ARB_texture_env_crossbar
+#define GL_ARB_texture_env_crossbar 1
+#endif /* GL_ARB_texture_env_crossbar */
+
+#ifndef GL_ARB_texture_env_dot3
+#define GL_ARB_texture_env_dot3 1
+#define GL_DOT3_RGB_ARB                   0x86AE
+#define GL_DOT3_RGBA_ARB                  0x86AF
+#endif /* GL_ARB_texture_env_dot3 */
+
+#ifndef GL_ARB_texture_float
+#define GL_ARB_texture_float 1
+#define GL_TEXTURE_RED_TYPE_ARB           0x8C10
+#define GL_TEXTURE_GREEN_TYPE_ARB         0x8C11
+#define GL_TEXTURE_BLUE_TYPE_ARB          0x8C12
+#define GL_TEXTURE_ALPHA_TYPE_ARB         0x8C13
+#define GL_TEXTURE_LUMINANCE_TYPE_ARB     0x8C14
+#define GL_TEXTURE_INTENSITY_TYPE_ARB     0x8C15
+#define GL_TEXTURE_DEPTH_TYPE_ARB         0x8C16
+#define GL_UNSIGNED_NORMALIZED_ARB        0x8C17
+#define GL_RGBA32F_ARB                    0x8814
+#define GL_RGB32F_ARB                     0x8815
+#define GL_ALPHA32F_ARB                   0x8816
+#define GL_INTENSITY32F_ARB               0x8817
+#define GL_LUMINANCE32F_ARB               0x8818
+#define GL_LUMINANCE_ALPHA32F_ARB         0x8819
+#define GL_RGBA16F_ARB                    0x881A
+#define GL_RGB16F_ARB                     0x881B
+#define GL_ALPHA16F_ARB                   0x881C
+#define GL_INTENSITY16F_ARB               0x881D
+#define GL_LUMINANCE16F_ARB               0x881E
+#define GL_LUMINANCE_ALPHA16F_ARB         0x881F
+#endif /* GL_ARB_texture_float */
+
+#ifndef GL_ARB_texture_gather
+#define GL_ARB_texture_gather 1
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F
+#endif /* GL_ARB_texture_gather */
+
+#ifndef GL_ARB_texture_mirror_clamp_to_edge
+#define GL_ARB_texture_mirror_clamp_to_edge 1
+#endif /* GL_ARB_texture_mirror_clamp_to_edge */
+
+#ifndef GL_ARB_texture_mirrored_repeat
+#define GL_ARB_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_ARB            0x8370
+#endif /* GL_ARB_texture_mirrored_repeat */
+
+#ifndef GL_ARB_texture_multisample
+#define GL_ARB_texture_multisample 1
+#endif /* GL_ARB_texture_multisample */
+
+#ifndef GL_ARB_texture_non_power_of_two
+#define GL_ARB_texture_non_power_of_two 1
+#endif /* GL_ARB_texture_non_power_of_two */
+
+#ifndef GL_ARB_texture_query_levels
+#define GL_ARB_texture_query_levels 1
+#endif /* GL_ARB_texture_query_levels */
+
+#ifndef GL_ARB_texture_query_lod
+#define GL_ARB_texture_query_lod 1
+#endif /* GL_ARB_texture_query_lod */
+
+#ifndef GL_ARB_texture_rectangle
+#define GL_ARB_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_ARB          0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_ARB  0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_ARB    0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
+#endif /* GL_ARB_texture_rectangle */
+
+#ifndef GL_ARB_texture_rg
+#define GL_ARB_texture_rg 1
+#endif /* GL_ARB_texture_rg */
+
+#ifndef GL_ARB_texture_rgb10_a2ui
+#define GL_ARB_texture_rgb10_a2ui 1
+#endif /* GL_ARB_texture_rgb10_a2ui */
+
+#ifndef GL_ARB_texture_stencil8
+#define GL_ARB_texture_stencil8 1
+#endif /* GL_ARB_texture_stencil8 */
+
+#ifndef GL_ARB_texture_storage
+#define GL_ARB_texture_storage 1
+#endif /* GL_ARB_texture_storage */
+
+#ifndef GL_ARB_texture_storage_multisample
+#define GL_ARB_texture_storage_multisample 1
+#endif /* GL_ARB_texture_storage_multisample */
+
+#ifndef GL_ARB_texture_swizzle
+#define GL_ARB_texture_swizzle 1
+#endif /* GL_ARB_texture_swizzle */
+
+#ifndef GL_ARB_texture_view
+#define GL_ARB_texture_view 1
+#endif /* GL_ARB_texture_view */
+
+#ifndef GL_ARB_timer_query
+#define GL_ARB_timer_query 1
+#endif /* GL_ARB_timer_query */
+
+#ifndef GL_ARB_transform_feedback2
+#define GL_ARB_transform_feedback2 1
+#define GL_TRANSFORM_FEEDBACK_PAUSED      0x8E23
+#define GL_TRANSFORM_FEEDBACK_ACTIVE      0x8E24
+#endif /* GL_ARB_transform_feedback2 */
+
+#ifndef GL_ARB_transform_feedback3
+#define GL_ARB_transform_feedback3 1
+#endif /* GL_ARB_transform_feedback3 */
+
+#ifndef GL_ARB_transform_feedback_instanced
+#define GL_ARB_transform_feedback_instanced 1
+#endif /* GL_ARB_transform_feedback_instanced */
+
+#ifndef GL_ARB_transpose_matrix
+#define GL_ARB_transpose_matrix 1
+#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3
+#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4
+#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB   0x84E5
+#define GL_TRANSPOSE_COLOR_MATRIX_ARB     0x84E6
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m);
+GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m);
+GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m);
+#endif
+#endif /* GL_ARB_transpose_matrix */
+
+#ifndef GL_ARB_uniform_buffer_object
+#define GL_ARB_uniform_buffer_object 1
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS    0x8A2C
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45
+#endif /* GL_ARB_uniform_buffer_object */
+
+#ifndef GL_ARB_vertex_array_bgra
+#define GL_ARB_vertex_array_bgra 1
+#endif /* GL_ARB_vertex_array_bgra */
+
+#ifndef GL_ARB_vertex_array_object
+#define GL_ARB_vertex_array_object 1
+#endif /* GL_ARB_vertex_array_object */
+
+#ifndef GL_ARB_vertex_attrib_64bit
+#define GL_ARB_vertex_attrib_64bit 1
+#endif /* GL_ARB_vertex_attrib_64bit */
+
+#ifndef GL_ARB_vertex_attrib_binding
+#define GL_ARB_vertex_attrib_binding 1
+#endif /* GL_ARB_vertex_attrib_binding */
+
+#ifndef GL_ARB_vertex_blend
+#define GL_ARB_vertex_blend 1
+#define GL_MAX_VERTEX_UNITS_ARB           0x86A4
+#define GL_ACTIVE_VERTEX_UNITS_ARB        0x86A5
+#define GL_WEIGHT_SUM_UNITY_ARB           0x86A6
+#define GL_VERTEX_BLEND_ARB               0x86A7
+#define GL_CURRENT_WEIGHT_ARB             0x86A8
+#define GL_WEIGHT_ARRAY_TYPE_ARB          0x86A9
+#define GL_WEIGHT_ARRAY_STRIDE_ARB        0x86AA
+#define GL_WEIGHT_ARRAY_SIZE_ARB          0x86AB
+#define GL_WEIGHT_ARRAY_POINTER_ARB       0x86AC
+#define GL_WEIGHT_ARRAY_ARB               0x86AD
+#define GL_MODELVIEW0_ARB                 0x1700
+#define GL_MODELVIEW1_ARB                 0x850A
+#define GL_MODELVIEW2_ARB                 0x8722
+#define GL_MODELVIEW3_ARB                 0x8723
+#define GL_MODELVIEW4_ARB                 0x8724
+#define GL_MODELVIEW5_ARB                 0x8725
+#define GL_MODELVIEW6_ARB                 0x8726
+#define GL_MODELVIEW7_ARB                 0x8727
+#define GL_MODELVIEW8_ARB                 0x8728
+#define GL_MODELVIEW9_ARB                 0x8729
+#define GL_MODELVIEW10_ARB                0x872A
+#define GL_MODELVIEW11_ARB                0x872B
+#define GL_MODELVIEW12_ARB                0x872C
+#define GL_MODELVIEW13_ARB                0x872D
+#define GL_MODELVIEW14_ARB                0x872E
+#define GL_MODELVIEW15_ARB                0x872F
+#define GL_MODELVIEW16_ARB                0x8730
+#define GL_MODELVIEW17_ARB                0x8731
+#define GL_MODELVIEW18_ARB                0x8732
+#define GL_MODELVIEW19_ARB                0x8733
+#define GL_MODELVIEW20_ARB                0x8734
+#define GL_MODELVIEW21_ARB                0x8735
+#define GL_MODELVIEW22_ARB                0x8736
+#define GL_MODELVIEW23_ARB                0x8737
+#define GL_MODELVIEW24_ARB                0x8738
+#define GL_MODELVIEW25_ARB                0x8739
+#define GL_MODELVIEW26_ARB                0x873A
+#define GL_MODELVIEW27_ARB                0x873B
+#define GL_MODELVIEW28_ARB                0x873C
+#define GL_MODELVIEW29_ARB                0x873D
+#define GL_MODELVIEW30_ARB                0x873E
+#define GL_MODELVIEW31_ARB                0x873F
+typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights);
+typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights);
+typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights);
+GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights);
+GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights);
+GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights);
+GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights);
+GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights);
+GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights);
+GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights);
+GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexBlendARB (GLint count);
+#endif
+#endif /* GL_ARB_vertex_blend */
+
+#ifndef GL_ARB_vertex_buffer_object
+#define GL_ARB_vertex_buffer_object 1
+#ifdef __MACOSX__ /* The OS X headers haven't caught up with Khronos yet */
+typedef long GLsizeiptrARB;
+typedef long GLintptrARB;
+#else
+typedef ptrdiff_t GLsizeiptrARB;
+typedef ptrdiff_t GLintptrARB;
+#endif
+#define GL_BUFFER_SIZE_ARB                0x8764
+#define GL_BUFFER_USAGE_ARB               0x8765
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_ELEMENT_ARRAY_BUFFER_ARB       0x8893
+#define GL_ARRAY_BUFFER_BINDING_ARB       0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895
+#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896
+#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897
+#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898
+#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899
+#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A
+#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B
+#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C
+#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D
+#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F
+#define GL_READ_ONLY_ARB                  0x88B8
+#define GL_WRITE_ONLY_ARB                 0x88B9
+#define GL_READ_WRITE_ARB                 0x88BA
+#define GL_BUFFER_ACCESS_ARB              0x88BB
+#define GL_BUFFER_MAPPED_ARB              0x88BC
+#define GL_BUFFER_MAP_POINTER_ARB         0x88BD
+#define GL_STREAM_DRAW_ARB                0x88E0
+#define GL_STREAM_READ_ARB                0x88E1
+#define GL_STREAM_COPY_ARB                0x88E2
+#define GL_STATIC_DRAW_ARB                0x88E4
+#define GL_STATIC_READ_ARB                0x88E5
+#define GL_STATIC_COPY_ARB                0x88E6
+#define GL_DYNAMIC_DRAW_ARB               0x88E8
+#define GL_DYNAMIC_READ_ARB               0x88E9
+#define GL_DYNAMIC_COPY_ARB               0x88EA
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+typedef void *(APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer);
+GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers);
+GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers);
+GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer);
+GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage);
+GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data);
+GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data);
+GLAPI void *APIENTRY glMapBufferARB (GLenum target, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target);
+GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_ARB_vertex_buffer_object */
+
+#ifndef GL_ARB_vertex_program
+#define GL_ARB_vertex_program 1
+#define GL_COLOR_SUM_ARB                  0x8458
+#define GL_VERTEX_PROGRAM_ARB             0x8620
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB   0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB   0x8625
+#define GL_CURRENT_VERTEX_ATTRIB_ARB      0x8626
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB    0x8643
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645
+#define GL_MAX_VERTEX_ATTRIBS_ARB         0x8869
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A
+#define GL_PROGRAM_ADDRESS_REGISTERS_ARB  0x88B0
+#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1
+#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2
+#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index);
+GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, void **pointer);
+#endif
+#endif /* GL_ARB_vertex_program */
+
+#ifndef GL_ARB_vertex_shader
+#define GL_ARB_vertex_shader 1
+#define GL_VERTEX_SHADER_ARB              0x8B31
+#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A
+#define GL_MAX_VARYING_FLOATS_ARB         0x8B4B
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D
+#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB   0x8B89
+#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A
+typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name);
+GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name);
+GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name);
+#endif
+#endif /* GL_ARB_vertex_shader */
+
+#ifndef GL_ARB_vertex_type_10f_11f_11f_rev
+#define GL_ARB_vertex_type_10f_11f_11f_rev 1
+#endif /* GL_ARB_vertex_type_10f_11f_11f_rev */
+
+#ifndef GL_ARB_vertex_type_2_10_10_10_rev
+#define GL_ARB_vertex_type_2_10_10_10_rev 1
+#endif /* GL_ARB_vertex_type_2_10_10_10_rev */
+
+#ifndef GL_ARB_viewport_array
+#define GL_ARB_viewport_array 1
+#endif /* GL_ARB_viewport_array */
+
+#ifndef GL_ARB_window_pos
+#define GL_ARB_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v);
+#endif
+#endif /* GL_ARB_window_pos */
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+#endif /* GL_KHR_debug */
+
+#ifndef GL_KHR_texture_compression_astc_hdr
+#define GL_KHR_texture_compression_astc_hdr 1
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR   0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR   0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR   0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR   0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR   0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR   0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR   0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR   0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR  0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR  0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR  0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD
+#endif /* GL_KHR_texture_compression_astc_hdr */
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_KHR_texture_compression_astc_ldr 1
+#endif /* GL_KHR_texture_compression_astc_ldr */
+
+#ifndef GL_OES_byte_coordinates
+#define GL_OES_byte_coordinates 1
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BOESPROC) (GLenum texture, GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4BVOESPROC) (GLenum texture, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD1BOESPROC) (GLbyte s);
+typedef void (APIENTRYP PFNGLTEXCOORD1BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2BOESPROC) (GLbyte s, GLbyte t);
+typedef void (APIENTRYP PFNGLTEXCOORD2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3BOESPROC) (GLbyte s, GLbyte t, GLbyte r);
+typedef void (APIENTRYP PFNGLTEXCOORD3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4BOESPROC) (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+typedef void (APIENTRYP PFNGLTEXCOORD4BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX2BOESPROC) (GLbyte x);
+typedef void (APIENTRYP PFNGLVERTEX2BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX3BOESPROC) (GLbyte x, GLbyte y);
+typedef void (APIENTRYP PFNGLVERTEX3BVOESPROC) (const GLbyte *coords);
+typedef void (APIENTRYP PFNGLVERTEX4BOESPROC) (GLbyte x, GLbyte y, GLbyte z);
+typedef void (APIENTRYP PFNGLVERTEX4BVOESPROC) (const GLbyte *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiTexCoord1bOES (GLenum texture, GLbyte s);
+GLAPI void APIENTRY glMultiTexCoord1bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord2bOES (GLenum texture, GLbyte s, GLbyte t);
+GLAPI void APIENTRY glMultiTexCoord2bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord3bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glMultiTexCoord3bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glMultiTexCoord4bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glMultiTexCoord4bvOES (GLenum texture, const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord1bOES (GLbyte s);
+GLAPI void APIENTRY glTexCoord1bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord2bOES (GLbyte s, GLbyte t);
+GLAPI void APIENTRY glTexCoord2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord3bOES (GLbyte s, GLbyte t, GLbyte r);
+GLAPI void APIENTRY glTexCoord3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glTexCoord4bOES (GLbyte s, GLbyte t, GLbyte r, GLbyte q);
+GLAPI void APIENTRY glTexCoord4bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex2bOES (GLbyte x);
+GLAPI void APIENTRY glVertex2bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex3bOES (GLbyte x, GLbyte y);
+GLAPI void APIENTRY glVertex3bvOES (const GLbyte *coords);
+GLAPI void APIENTRY glVertex4bOES (GLbyte x, GLbyte y, GLbyte z);
+GLAPI void APIENTRY glVertex4bvOES (const GLbyte *coords);
+#endif
+#endif /* GL_OES_byte_coordinates */
+
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_OES_compressed_paletted_texture 1
+#define GL_PALETTE4_RGB8_OES              0x8B90
+#define GL_PALETTE4_RGBA8_OES             0x8B91
+#define GL_PALETTE4_R5_G6_B5_OES          0x8B92
+#define GL_PALETTE4_RGBA4_OES             0x8B93
+#define GL_PALETTE4_RGB5_A1_OES           0x8B94
+#define GL_PALETTE8_RGB8_OES              0x8B95
+#define GL_PALETTE8_RGBA8_OES             0x8B96
+#define GL_PALETTE8_R5_G6_B5_OES          0x8B97
+#define GL_PALETTE8_RGBA4_OES             0x8B98
+#define GL_PALETTE8_RGB5_A1_OES           0x8B99
+#endif /* GL_OES_compressed_paletted_texture */
+
+#ifndef GL_OES_fixed_point
+#define GL_OES_fixed_point 1
+typedef GLint GLfixed;
+#define GL_FIXED_OES                      0x140C
+typedef void (APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref);
+typedef void (APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARDEPTHXOESPROC) (GLfixed depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation);
+typedef void (APIENTRYP PFNGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLDEPTHRANGEXOESPROC) (GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLFOGXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLFOGXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLFRUSTUMXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEXOESPROC) (GLenum plane, GLfixed *equation);
+typedef void (APIENTRYP PFNGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXENVXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLLINEWIDTHXOESPROC) (GLfixed width);
+typedef void (APIENTRYP PFNGLLOADMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *param);
+typedef void (APIENTRYP PFNGLMULTMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz);
+typedef void (APIENTRYP PFNGLORTHOXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size);
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units);
+typedef void (APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLSAMPLECOVERAGEOESPROC) (GLfixed value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLACCUMXOESPROC) (GLenum op, GLfixed value);
+typedef void (APIENTRYP PFNGLBITMAPXOESPROC) (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+typedef void (APIENTRYP PFNGLBLENDCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCLEARACCUMXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+typedef void (APIENTRYP PFNGLCOLOR3XOESPROC) (GLfixed red, GLfixed green, GLfixed blue);
+typedef void (APIENTRYP PFNGLCOLOR3XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCOLOR4XVOESPROC) (const GLfixed *components);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLEVALCOORD1XOESPROC) (GLfixed u);
+typedef void (APIENTRYP PFNGLEVALCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLEVALCOORD2XOESPROC) (GLfixed u, GLfixed v);
+typedef void (APIENTRYP PFNGLEVALCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLFEEDBACKBUFFERXOESPROC) (GLsizei n, GLenum type, const GLfixed *buffer);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETMAPXVOESPROC) (GLenum target, GLenum query, GLfixed *v);
+typedef void (APIENTRYP PFNGLGETMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLGETPIXELMAPXVPROC) (GLenum map, GLint size, GLfixed *values);
+typedef void (APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERXVOESPROC) (GLenum target, GLint level, GLenum pname, GLfixed *params);
+typedef void (APIENTRYP PFNGLINDEXXOESPROC) (GLfixed component);
+typedef void (APIENTRYP PFNGLINDEXXVOESPROC) (const GLfixed *component);
+typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMAP1XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+typedef void (APIENTRYP PFNGLMAP2XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+typedef void (APIENTRYP PFNGLMAPGRID1XOESPROC) (GLint n, GLfixed u1, GLfixed u2);
+typedef void (APIENTRYP PFNGLMAPGRID2XOESPROC) (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXXOESPROC) (const GLfixed *m);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XOESPROC) (GLenum texture, GLfixed s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XOESPROC) (GLenum texture, GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4XVOESPROC) (GLenum texture, const GLfixed *coords);
+typedef void (APIENTRYP PFNGLNORMAL3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLPASSTHROUGHXOESPROC) (GLfixed token);
+typedef void (APIENTRYP PFNGLPIXELMAPXPROC) (GLenum map, GLint size, const GLfixed *values);
+typedef void (APIENTRYP PFNGLPIXELSTOREXPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFERXOESPROC) (GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLPIXELZOOMXOESPROC) (GLfixed xfactor, GLfixed yfactor);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESXOESPROC) (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+typedef void (APIENTRYP PFNGLRASTERPOS2XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLRASTERPOS2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS3XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLRASTERPOS3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRASTERPOS4XOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+typedef void (APIENTRYP PFNGLRASTERPOS4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLRECTXOESPROC) (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+typedef void (APIENTRYP PFNGLRECTXVOESPROC) (const GLfixed *v1, const GLfixed *v2);
+typedef void (APIENTRYP PFNGLTEXCOORD1XOESPROC) (GLfixed s);
+typedef void (APIENTRYP PFNGLTEXCOORD1XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD2XOESPROC) (GLfixed s, GLfixed t);
+typedef void (APIENTRYP PFNGLTEXCOORD2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD3XOESPROC) (GLfixed s, GLfixed t, GLfixed r);
+typedef void (APIENTRYP PFNGLTEXCOORD3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXCOORD4XOESPROC) (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+typedef void (APIENTRYP PFNGLTEXCOORD4XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param);
+typedef void (APIENTRYP PFNGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params);
+typedef void (APIENTRYP PFNGLVERTEX2XOESPROC) (GLfixed x);
+typedef void (APIENTRYP PFNGLVERTEX2XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX3XOESPROC) (GLfixed x, GLfixed y);
+typedef void (APIENTRYP PFNGLVERTEX3XVOESPROC) (const GLfixed *coords);
+typedef void (APIENTRYP PFNGLVERTEX4XOESPROC) (GLfixed x, GLfixed y, GLfixed z);
+typedef void (APIENTRYP PFNGLVERTEX4XVOESPROC) (const GLfixed *coords);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAlphaFuncxOES (GLenum func, GLfixed ref);
+GLAPI void APIENTRY glClearColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearDepthxOES (GLfixed depth);
+GLAPI void APIENTRY glClipPlanexOES (GLenum plane, const GLfixed *equation);
+GLAPI void APIENTRY glColor4xOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glDepthRangexOES (GLfixed n, GLfixed f);
+GLAPI void APIENTRY glFogxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glFogxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glFrustumxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glGetClipPlanexOES (GLenum plane, GLfixed *equation);
+GLAPI void APIENTRY glGetFixedvOES (GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexEnvxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glLightModelxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightModelxvOES (GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glLightxOES (GLenum light, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glLightxvOES (GLenum light, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glLineWidthxOES (GLfixed width);
+GLAPI void APIENTRY glLoadMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glMaterialxvOES (GLenum face, GLenum pname, const GLfixed *param);
+GLAPI void APIENTRY glMultMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord4xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glNormal3xOES (GLfixed nx, GLfixed ny, GLfixed nz);
+GLAPI void APIENTRY glOrthoxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f);
+GLAPI void APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glPointSizexOES (GLfixed size);
+GLAPI void APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units);
+GLAPI void APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glSampleCoverageOES (GLfixed value, GLboolean invert);
+GLAPI void APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTexParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glTranslatexOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glAccumxOES (GLenum op, GLfixed value);
+GLAPI void APIENTRY glBitmapxOES (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap);
+GLAPI void APIENTRY glBlendColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glClearAccumxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+GLAPI void APIENTRY glColor3xOES (GLfixed red, GLfixed green, GLfixed blue);
+GLAPI void APIENTRY glColor3xvOES (const GLfixed *components);
+GLAPI void APIENTRY glColor4xvOES (const GLfixed *components);
+GLAPI void APIENTRY glConvolutionParameterxOES (GLenum target, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glConvolutionParameterxvOES (GLenum target, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glEvalCoord1xOES (GLfixed u);
+GLAPI void APIENTRY glEvalCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glEvalCoord2xOES (GLfixed u, GLfixed v);
+GLAPI void APIENTRY glEvalCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glFeedbackBufferxOES (GLsizei n, GLenum type, const GLfixed *buffer);
+GLAPI void APIENTRY glGetConvolutionParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetHistogramParameterxvOES (GLenum target, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetLightxOES (GLenum light, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetMapxvOES (GLenum target, GLenum query, GLfixed *v);
+GLAPI void APIENTRY glGetMaterialxOES (GLenum face, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glGetPixelMapxv (GLenum map, GLint size, GLfixed *values);
+GLAPI void APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glGetTexLevelParameterxvOES (GLenum target, GLint level, GLenum pname, GLfixed *params);
+GLAPI void APIENTRY glIndexxOES (GLfixed component);
+GLAPI void APIENTRY glIndexxvOES (const GLfixed *component);
+GLAPI void APIENTRY glLoadTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMap1xOES (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points);
+GLAPI void APIENTRY glMap2xOES (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points);
+GLAPI void APIENTRY glMapGrid1xOES (GLint n, GLfixed u1, GLfixed u2);
+GLAPI void APIENTRY glMapGrid2xOES (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2);
+GLAPI void APIENTRY glMultTransposeMatrixxOES (const GLfixed *m);
+GLAPI void APIENTRY glMultiTexCoord1xOES (GLenum texture, GLfixed s);
+GLAPI void APIENTRY glMultiTexCoord1xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord2xOES (GLenum texture, GLfixed s, GLfixed t);
+GLAPI void APIENTRY glMultiTexCoord2xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord3xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glMultiTexCoord3xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glMultiTexCoord4xvOES (GLenum texture, const GLfixed *coords);
+GLAPI void APIENTRY glNormal3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glPassThroughxOES (GLfixed token);
+GLAPI void APIENTRY glPixelMapx (GLenum map, GLint size, const GLfixed *values);
+GLAPI void APIENTRY glPixelStorex (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelTransferxOES (GLenum pname, GLfixed param);
+GLAPI void APIENTRY glPixelZoomxOES (GLfixed xfactor, GLfixed yfactor);
+GLAPI void APIENTRY glPrioritizeTexturesxOES (GLsizei n, const GLuint *textures, const GLfixed *priorities);
+GLAPI void APIENTRY glRasterPos2xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glRasterPos2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos3xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glRasterPos3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRasterPos4xOES (GLfixed x, GLfixed y, GLfixed z, GLfixed w);
+GLAPI void APIENTRY glRasterPos4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glRectxOES (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2);
+GLAPI void APIENTRY glRectxvOES (const GLfixed *v1, const GLfixed *v2);
+GLAPI void APIENTRY glTexCoord1xOES (GLfixed s);
+GLAPI void APIENTRY glTexCoord1xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord2xOES (GLfixed s, GLfixed t);
+GLAPI void APIENTRY glTexCoord2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord3xOES (GLfixed s, GLfixed t, GLfixed r);
+GLAPI void APIENTRY glTexCoord3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexCoord4xOES (GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+GLAPI void APIENTRY glTexCoord4xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glTexGenxOES (GLenum coord, GLenum pname, GLfixed param);
+GLAPI void APIENTRY glTexGenxvOES (GLenum coord, GLenum pname, const GLfixed *params);
+GLAPI void APIENTRY glVertex2xOES (GLfixed x);
+GLAPI void APIENTRY glVertex2xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex3xOES (GLfixed x, GLfixed y);
+GLAPI void APIENTRY glVertex3xvOES (const GLfixed *coords);
+GLAPI void APIENTRY glVertex4xOES (GLfixed x, GLfixed y, GLfixed z);
+GLAPI void APIENTRY glVertex4xvOES (const GLfixed *coords);
+#endif
+#endif /* GL_OES_fixed_point */
+
+#ifndef GL_OES_query_matrix
+#define GL_OES_query_matrix 1
+typedef GLbitfield (APIENTRYP PFNGLQUERYMATRIXXOESPROC) (GLfixed *mantissa, GLint *exponent);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLbitfield APIENTRY glQueryMatrixxOES (GLfixed *mantissa, GLint *exponent);
+#endif
+#endif /* GL_OES_query_matrix */
+
+#ifndef GL_OES_read_format
+#define GL_OES_read_format 1
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B
+#endif /* GL_OES_read_format */
+
+#ifndef GL_OES_single_precision
+#define GL_OES_single_precision 1
+typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampf depth);
+typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation);
+typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f);
+typedef void (APIENTRYP PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+typedef void (APIENTRYP PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat *equation);
+typedef void (APIENTRYP PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glClearDepthfOES (GLclampf depth);
+GLAPI void APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation);
+GLAPI void APIENTRY glDepthRangefOES (GLclampf n, GLclampf f);
+GLAPI void APIENTRY glFrustumfOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+GLAPI void APIENTRY glGetClipPlanefOES (GLenum plane, GLfloat *equation);
+GLAPI void APIENTRY glOrthofOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f);
+#endif
+#endif /* GL_OES_single_precision */
+
+#ifndef GL_3DFX_multisample
+#define GL_3DFX_multisample 1
+#define GL_MULTISAMPLE_3DFX               0x86B2
+#define GL_SAMPLE_BUFFERS_3DFX            0x86B3
+#define GL_SAMPLES_3DFX                   0x86B4
+#define GL_MULTISAMPLE_BIT_3DFX           0x20000000
+#endif /* GL_3DFX_multisample */
+
+#ifndef GL_3DFX_tbuffer
+#define GL_3DFX_tbuffer 1
+typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask);
+#endif
+#endif /* GL_3DFX_tbuffer */
+
+#ifndef GL_3DFX_texture_compression_FXT1
+#define GL_3DFX_texture_compression_FXT1 1
+#define GL_COMPRESSED_RGB_FXT1_3DFX       0x86B0
+#define GL_COMPRESSED_RGBA_FXT1_3DFX      0x86B1
+#endif /* GL_3DFX_texture_compression_FXT1 */
+
+#ifndef GL_AMD_blend_minmax_factor
+#define GL_AMD_blend_minmax_factor 1
+#define GL_FACTOR_MIN_AMD                 0x901C
+#define GL_FACTOR_MAX_AMD                 0x901D
+#endif /* GL_AMD_blend_minmax_factor */
+
+#ifndef GL_AMD_conservative_depth
+#define GL_AMD_conservative_depth 1
+#endif /* GL_AMD_conservative_depth */
+
+#ifndef GL_AMD_debug_output
+#define GL_AMD_debug_output 1
+typedef void (APIENTRY  *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,void *userParam);
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD   0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD  0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_AMD      0x9145
+#define GL_DEBUG_SEVERITY_HIGH_AMD        0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_AMD      0x9147
+#define GL_DEBUG_SEVERITY_LOW_AMD         0x9148
+#define GL_DEBUG_CATEGORY_API_ERROR_AMD   0x9149
+#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A
+#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B
+#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C
+#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D
+#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E
+#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F
+#define GL_DEBUG_CATEGORY_OTHER_AMD       0x9150
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam);
+typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf);
+GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, void *userParam);
+GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message);
+#endif
+#endif /* GL_AMD_debug_output */
+
+#ifndef GL_AMD_depth_clamp_separate
+#define GL_AMD_depth_clamp_separate 1
+#define GL_DEPTH_CLAMP_NEAR_AMD           0x901E
+#define GL_DEPTH_CLAMP_FAR_AMD            0x901F
+#endif /* GL_AMD_depth_clamp_separate */
+
+#ifndef GL_AMD_draw_buffers_blend
+#define GL_AMD_draw_buffers_blend 1
+typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst);
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode);
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst);
+GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode);
+GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_AMD_draw_buffers_blend */
+
+#ifndef GL_AMD_gcn_shader
+#define GL_AMD_gcn_shader 1
+#endif /* GL_AMD_gcn_shader */
+
+#ifndef GL_AMD_gpu_shader_int64
+#define GL_AMD_gpu_shader_int64 1
+typedef int64_t GLint64EXT;
+#define GL_INT64_NV                       0x140E
+#define GL_UNSIGNED_INT64_NV              0x140F
+#define GL_INT8_NV                        0x8FE0
+#define GL_INT8_VEC2_NV                   0x8FE1
+#define GL_INT8_VEC3_NV                   0x8FE2
+#define GL_INT8_VEC4_NV                   0x8FE3
+#define GL_INT16_NV                       0x8FE4
+#define GL_INT16_VEC2_NV                  0x8FE5
+#define GL_INT16_VEC3_NV                  0x8FE6
+#define GL_INT16_VEC4_NV                  0x8FE7
+#define GL_INT64_VEC2_NV                  0x8FE9
+#define GL_INT64_VEC3_NV                  0x8FEA
+#define GL_INT64_VEC4_NV                  0x8FEB
+#define GL_UNSIGNED_INT8_NV               0x8FEC
+#define GL_UNSIGNED_INT8_VEC2_NV          0x8FED
+#define GL_UNSIGNED_INT8_VEC3_NV          0x8FEE
+#define GL_UNSIGNED_INT8_VEC4_NV          0x8FEF
+#define GL_UNSIGNED_INT16_NV              0x8FF0
+#define GL_UNSIGNED_INT16_VEC2_NV         0x8FF1
+#define GL_UNSIGNED_INT16_VEC3_NV         0x8FF2
+#define GL_UNSIGNED_INT16_VEC4_NV         0x8FF3
+#define GL_UNSIGNED_INT64_VEC2_NV         0x8FF5
+#define GL_UNSIGNED_INT64_VEC3_NV         0x8FF6
+#define GL_UNSIGNED_INT64_VEC4_NV         0x8FF7
+#define GL_FLOAT16_NV                     0x8FF8
+#define GL_FLOAT16_VEC2_NV                0x8FF9
+#define GL_FLOAT16_VEC3_NV                0x8FFA
+#define GL_FLOAT16_VEC4_NV                0x8FFB
+typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x);
+GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params);
+GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params);
+GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x);
+GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value);
+GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x);
+GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_AMD_gpu_shader_int64 */
+
+#ifndef GL_AMD_interleaved_elements
+#define GL_AMD_interleaved_elements 1
+#define GL_VERTEX_ELEMENT_SWIZZLE_AMD     0x91A4
+#define GL_VERTEX_ID_SWIZZLE_AMD          0x91A5
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPARAMETERIAMDPROC) (GLuint index, GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribParameteriAMD (GLuint index, GLenum pname, GLint param);
+#endif
+#endif /* GL_AMD_interleaved_elements */
+
+#ifndef GL_AMD_multi_draw_indirect
+#define GL_AMD_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectAMD (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride);
+GLAPI void APIENTRY glMultiDrawElementsIndirectAMD (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride);
+#endif
+#endif /* GL_AMD_multi_draw_indirect */
+
+#ifndef GL_AMD_name_gen_delete
+#define GL_AMD_name_gen_delete 1
+#define GL_DATA_BUFFER_AMD                0x9151
+#define GL_PERFORMANCE_MONITOR_AMD        0x9152
+#define GL_QUERY_OBJECT_AMD               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_AMD        0x9154
+#define GL_SAMPLER_OBJECT_AMD             0x9155
+typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names);
+typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names);
+typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names);
+GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names);
+GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name);
+#endif
+#endif /* GL_AMD_name_gen_delete */
+
+#ifndef GL_AMD_occlusion_query_event
+#define GL_AMD_occlusion_query_event 1
+#define GL_OCCLUSION_QUERY_EVENT_MASK_AMD 0x874F
+#define GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD 0x00000001
+#define GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD 0x00000002
+#define GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD 0x00000004
+#define GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD 0x00000008
+#define GL_QUERY_ALL_EVENT_BITS_AMD       0xFFFFFFFF
+typedef void (APIENTRYP PFNGLQUERYOBJECTPARAMETERUIAMDPROC) (GLenum target, GLuint id, GLenum pname, GLuint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glQueryObjectParameteruiAMD (GLenum target, GLuint id, GLenum pname, GLuint param);
+#endif
+#endif /* GL_AMD_occlusion_query_event */
+
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#define GL_COUNTER_TYPE_AMD               0x8BC0
+#define GL_COUNTER_RANGE_AMD              0x8BC1
+#define GL_UNSIGNED_INT64_AMD             0x8BC2
+#define GL_PERCENTAGE_AMD                 0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD   0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD        0x8BC5
+#define GL_PERFMON_RESULT_AMD             0x8BC6
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data);
+typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, void *data);
+GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList);
+GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+#endif /* GL_AMD_performance_monitor */
+
+#ifndef GL_AMD_pinned_memory
+#define GL_AMD_pinned_memory 1
+#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160
+#endif /* GL_AMD_pinned_memory */
+
+#ifndef GL_AMD_query_buffer_object
+#define GL_AMD_query_buffer_object 1
+#define GL_QUERY_BUFFER_AMD               0x9192
+#define GL_QUERY_BUFFER_BINDING_AMD       0x9193
+#define GL_QUERY_RESULT_NO_WAIT_AMD       0x9194
+#endif /* GL_AMD_query_buffer_object */
+
+#ifndef GL_AMD_sample_positions
+#define GL_AMD_sample_positions 1
+#define GL_SUBSAMPLE_DISTANCE_AMD         0x883F
+typedef void (APIENTRYP PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat *val);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSetMultisamplefvAMD (GLenum pname, GLuint index, const GLfloat *val);
+#endif
+#endif /* GL_AMD_sample_positions */
+
+#ifndef GL_AMD_seamless_cubemap_per_texture
+#define GL_AMD_seamless_cubemap_per_texture 1
+#endif /* GL_AMD_seamless_cubemap_per_texture */
+
+#ifndef GL_AMD_shader_atomic_counter_ops
+#define GL_AMD_shader_atomic_counter_ops 1
+#endif /* GL_AMD_shader_atomic_counter_ops */
+
+#ifndef GL_AMD_shader_stencil_export
+#define GL_AMD_shader_stencil_export 1
+#endif /* GL_AMD_shader_stencil_export */
+
+#ifndef GL_AMD_shader_trinary_minmax
+#define GL_AMD_shader_trinary_minmax 1
+#endif /* GL_AMD_shader_trinary_minmax */
+
+#ifndef GL_AMD_sparse_texture
+#define GL_AMD_sparse_texture 1
+#define GL_VIRTUAL_PAGE_SIZE_X_AMD        0x9195
+#define GL_VIRTUAL_PAGE_SIZE_Y_AMD        0x9196
+#define GL_VIRTUAL_PAGE_SIZE_Z_AMD        0x9197
+#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD    0x9198
+#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199
+#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A
+#define GL_MIN_SPARSE_LEVEL_AMD           0x919B
+#define GL_MIN_LOD_WARNING_AMD            0x919C
+#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001
+typedef void (APIENTRYP PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexStorageSparseAMD (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+GLAPI void APIENTRY glTextureStorageSparseAMD (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags);
+#endif
+#endif /* GL_AMD_sparse_texture */
+
+#ifndef GL_AMD_stencil_operation_extended
+#define GL_AMD_stencil_operation_extended 1
+#define GL_SET_AMD                        0x874A
+#define GL_REPLACE_VALUE_AMD              0x874B
+#define GL_STENCIL_OP_VALUE_AMD           0x874C
+#define GL_STENCIL_BACK_OP_VALUE_AMD      0x874D
+typedef void (APIENTRYP PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpValueAMD (GLenum face, GLuint value);
+#endif
+#endif /* GL_AMD_stencil_operation_extended */
+
+#ifndef GL_AMD_texture_texture4
+#define GL_AMD_texture_texture4 1
+#endif /* GL_AMD_texture_texture4 */
+
+#ifndef GL_AMD_transform_feedback3_lines_triangles
+#define GL_AMD_transform_feedback3_lines_triangles 1
+#endif /* GL_AMD_transform_feedback3_lines_triangles */
+
+#ifndef GL_AMD_transform_feedback4
+#define GL_AMD_transform_feedback4 1
+#define GL_STREAM_RASTERIZATION_AMD       0x91A0
+#endif /* GL_AMD_transform_feedback4 */
+
+#ifndef GL_AMD_vertex_shader_layer
+#define GL_AMD_vertex_shader_layer 1
+#endif /* GL_AMD_vertex_shader_layer */
+
+#ifndef GL_AMD_vertex_shader_tessellator
+#define GL_AMD_vertex_shader_tessellator 1
+#define GL_SAMPLER_BUFFER_AMD             0x9001
+#define GL_INT_SAMPLER_BUFFER_AMD         0x9002
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003
+#define GL_TESSELLATION_MODE_AMD          0x9004
+#define GL_TESSELLATION_FACTOR_AMD        0x9005
+#define GL_DISCRETE_AMD                   0x9006
+#define GL_CONTINUOUS_AMD                 0x9007
+typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor);
+GLAPI void APIENTRY glTessellationModeAMD (GLenum mode);
+#endif
+#endif /* GL_AMD_vertex_shader_tessellator */
+
+#ifndef GL_AMD_vertex_shader_viewport_index
+#define GL_AMD_vertex_shader_viewport_index 1
+#endif /* GL_AMD_vertex_shader_viewport_index */
+
+#ifndef GL_APPLE_aux_depth_stencil
+#define GL_APPLE_aux_depth_stencil 1
+#define GL_AUX_DEPTH_STENCIL_APPLE        0x8A14
+#endif /* GL_APPLE_aux_depth_stencil */
+
+#ifndef GL_APPLE_client_storage
+#define GL_APPLE_client_storage 1
+#define GL_UNPACK_CLIENT_STORAGE_APPLE    0x85B2
+#endif /* GL_APPLE_client_storage */
+
+#ifndef GL_APPLE_element_array
+#define GL_APPLE_element_array 1
+#define GL_ELEMENT_ARRAY_APPLE            0x8A0C
+#define GL_ELEMENT_ARRAY_TYPE_APPLE       0x8A0D
+#define GL_ELEMENT_ARRAY_POINTER_APPLE    0x8A0E
+typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count);
+GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount);
+#endif
+#endif /* GL_APPLE_element_array */
+
+#ifndef GL_APPLE_fence
+#define GL_APPLE_fence 1
+#define GL_DRAW_PIXELS_APPLE              0x8A0A
+#define GL_FENCE_APPLE                    0x8A0B
+typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences);
+typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name);
+typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences);
+GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence);
+GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence);
+GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name);
+GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name);
+#endif
+#endif /* GL_APPLE_fence */
+
+#ifndef GL_APPLE_float_pixels
+#define GL_APPLE_float_pixels 1
+#define GL_HALF_APPLE                     0x140B
+#define GL_RGBA_FLOAT32_APPLE             0x8814
+#define GL_RGB_FLOAT32_APPLE              0x8815
+#define GL_ALPHA_FLOAT32_APPLE            0x8816
+#define GL_INTENSITY_FLOAT32_APPLE        0x8817
+#define GL_LUMINANCE_FLOAT32_APPLE        0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE  0x8819
+#define GL_RGBA_FLOAT16_APPLE             0x881A
+#define GL_RGB_FLOAT16_APPLE              0x881B
+#define GL_ALPHA_FLOAT16_APPLE            0x881C
+#define GL_INTENSITY_FLOAT16_APPLE        0x881D
+#define GL_LUMINANCE_FLOAT16_APPLE        0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE  0x881F
+#define GL_COLOR_FLOAT_APPLE              0x8A0F
+#endif /* GL_APPLE_float_pixels */
+
+#ifndef GL_APPLE_flush_buffer_range
+#define GL_APPLE_flush_buffer_range 1
+#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12
+#define GL_BUFFER_FLUSHING_UNMAP_APPLE    0x8A13
+typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size);
+#endif
+#endif /* GL_APPLE_flush_buffer_range */
+
+#ifndef GL_APPLE_object_purgeable
+#define GL_APPLE_object_purgeable 1
+#define GL_BUFFER_OBJECT_APPLE            0x85B3
+#define GL_RELEASED_APPLE                 0x8A19
+#define GL_VOLATILE_APPLE                 0x8A1A
+#define GL_RETAINED_APPLE                 0x8A1B
+#define GL_UNDEFINED_APPLE                0x8A1C
+#define GL_PURGEABLE_APPLE                0x8A1D
+typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option);
+typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option);
+GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params);
+#endif
+#endif /* GL_APPLE_object_purgeable */
+
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#define GL_RGB_422_APPLE                  0x8A1F
+#define GL_UNSIGNED_SHORT_8_8_APPLE       0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE   0x85BB
+#define GL_RGB_RAW_422_APPLE              0x8A51
+#endif /* GL_APPLE_rgb_422 */
+
+#ifndef GL_APPLE_row_bytes
+#define GL_APPLE_row_bytes 1
+#define GL_PACK_ROW_BYTES_APPLE           0x8A15
+#define GL_UNPACK_ROW_BYTES_APPLE         0x8A16
+#endif /* GL_APPLE_row_bytes */
+
+#ifndef GL_APPLE_specular_vector
+#define GL_APPLE_specular_vector 1
+#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0
+#endif /* GL_APPLE_specular_vector */
+
+#ifndef GL_APPLE_texture_range
+#define GL_APPLE_texture_range 1
+#define GL_TEXTURE_RANGE_LENGTH_APPLE     0x85B7
+#define GL_TEXTURE_RANGE_POINTER_APPLE    0x85B8
+#define GL_TEXTURE_STORAGE_HINT_APPLE     0x85BC
+#define GL_STORAGE_PRIVATE_APPLE          0x85BD
+#define GL_STORAGE_CACHED_APPLE           0x85BE
+#define GL_STORAGE_SHARED_APPLE           0x85BF
+typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, void **params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, void **params);
+#endif
+#endif /* GL_APPLE_texture_range */
+
+#ifndef GL_APPLE_transform_hint
+#define GL_APPLE_transform_hint 1
+#define GL_TRANSFORM_HINT_APPLE           0x85B1
+#endif /* GL_APPLE_transform_hint */
+
+#ifndef GL_APPLE_vertex_array_object
+#define GL_APPLE_vertex_array_object 1
+#define GL_VERTEX_ARRAY_BINDING_APPLE     0x85B5
+typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array);
+typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays);
+typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array);
+GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays);
+GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays);
+GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array);
+#endif
+#endif /* GL_APPLE_vertex_array_object */
+
+#ifndef GL_APPLE_vertex_array_range
+#define GL_APPLE_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_APPLE       0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E
+#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F
+#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521
+#define GL_STORAGE_CLIENT_APPLE           0x85B4
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, void *pointer);
+GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param);
+#endif
+#endif /* GL_APPLE_vertex_array_range */
+
+#ifndef GL_APPLE_vertex_program_evaluators
+#define GL_APPLE_vertex_program_evaluators 1
+#define GL_VERTEX_ATTRIB_MAP1_APPLE       0x8A00
+#define GL_VERTEX_ATTRIB_MAP2_APPLE       0x8A01
+#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE  0x8A02
+#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03
+#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04
+#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05
+#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE  0x8A06
+#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07
+#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08
+#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09
+typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname);
+typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname);
+GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname);
+GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points);
+GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points);
+GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points);
+#endif
+#endif /* GL_APPLE_vertex_program_evaluators */
+
+#ifndef GL_APPLE_ycbcr_422
+#define GL_APPLE_ycbcr_422 1
+#define GL_YCBCR_422_APPLE                0x85B9
+#endif /* GL_APPLE_ycbcr_422 */
+
+#ifndef GL_ATI_draw_buffers
+#define GL_ATI_draw_buffers 1
+#define GL_MAX_DRAW_BUFFERS_ATI           0x8824
+#define GL_DRAW_BUFFER0_ATI               0x8825
+#define GL_DRAW_BUFFER1_ATI               0x8826
+#define GL_DRAW_BUFFER2_ATI               0x8827
+#define GL_DRAW_BUFFER3_ATI               0x8828
+#define GL_DRAW_BUFFER4_ATI               0x8829
+#define GL_DRAW_BUFFER5_ATI               0x882A
+#define GL_DRAW_BUFFER6_ATI               0x882B
+#define GL_DRAW_BUFFER7_ATI               0x882C
+#define GL_DRAW_BUFFER8_ATI               0x882D
+#define GL_DRAW_BUFFER9_ATI               0x882E
+#define GL_DRAW_BUFFER10_ATI              0x882F
+#define GL_DRAW_BUFFER11_ATI              0x8830
+#define GL_DRAW_BUFFER12_ATI              0x8831
+#define GL_DRAW_BUFFER13_ATI              0x8832
+#define GL_DRAW_BUFFER14_ATI              0x8833
+#define GL_DRAW_BUFFER15_ATI              0x8834
+typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs);
+#endif
+#endif /* GL_ATI_draw_buffers */
+
+#ifndef GL_ATI_element_array
+#define GL_ATI_element_array 1
+#define GL_ELEMENT_ARRAY_ATI              0x8768
+#define GL_ELEMENT_ARRAY_TYPE_ATI         0x8769
+#define GL_ELEMENT_ARRAY_POINTER_ATI      0x876A
+typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count);
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glElementPointerATI (GLenum type, const void *pointer);
+GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count);
+GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count);
+#endif
+#endif /* GL_ATI_element_array */
+
+#ifndef GL_ATI_envmap_bumpmap
+#define GL_ATI_envmap_bumpmap 1
+#define GL_BUMP_ROT_MATRIX_ATI            0x8775
+#define GL_BUMP_ROT_MATRIX_SIZE_ATI       0x8776
+#define GL_BUMP_NUM_TEX_UNITS_ATI         0x8777
+#define GL_BUMP_TEX_UNITS_ATI             0x8778
+#define GL_DUDV_ATI                       0x8779
+#define GL_DU8DV8_ATI                     0x877A
+#define GL_BUMP_ENVMAP_ATI                0x877B
+#define GL_BUMP_TARGET_ATI                0x877C
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param);
+typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param);
+GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param);
+GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param);
+#endif
+#endif /* GL_ATI_envmap_bumpmap */
+
+#ifndef GL_ATI_fragment_shader
+#define GL_ATI_fragment_shader 1
+#define GL_FRAGMENT_SHADER_ATI            0x8920
+#define GL_REG_0_ATI                      0x8921
+#define GL_REG_1_ATI                      0x8922
+#define GL_REG_2_ATI                      0x8923
+#define GL_REG_3_ATI                      0x8924
+#define GL_REG_4_ATI                      0x8925
+#define GL_REG_5_ATI                      0x8926
+#define GL_REG_6_ATI                      0x8927
+#define GL_REG_7_ATI                      0x8928
+#define GL_REG_8_ATI                      0x8929
+#define GL_REG_9_ATI                      0x892A
+#define GL_REG_10_ATI                     0x892B
+#define GL_REG_11_ATI                     0x892C
+#define GL_REG_12_ATI                     0x892D
+#define GL_REG_13_ATI                     0x892E
+#define GL_REG_14_ATI                     0x892F
+#define GL_REG_15_ATI                     0x8930
+#define GL_REG_16_ATI                     0x8931
+#define GL_REG_17_ATI                     0x8932
+#define GL_REG_18_ATI                     0x8933
+#define GL_REG_19_ATI                     0x8934
+#define GL_REG_20_ATI                     0x8935
+#define GL_REG_21_ATI                     0x8936
+#define GL_REG_22_ATI                     0x8937
+#define GL_REG_23_ATI                     0x8938
+#define GL_REG_24_ATI                     0x8939
+#define GL_REG_25_ATI                     0x893A
+#define GL_REG_26_ATI                     0x893B
+#define GL_REG_27_ATI                     0x893C
+#define GL_REG_28_ATI                     0x893D
+#define GL_REG_29_ATI                     0x893E
+#define GL_REG_30_ATI                     0x893F
+#define GL_REG_31_ATI                     0x8940
+#define GL_CON_0_ATI                      0x8941
+#define GL_CON_1_ATI                      0x8942
+#define GL_CON_2_ATI                      0x8943
+#define GL_CON_3_ATI                      0x8944
+#define GL_CON_4_ATI                      0x8945
+#define GL_CON_5_ATI                      0x8946
+#define GL_CON_6_ATI                      0x8947
+#define GL_CON_7_ATI                      0x8948
+#define GL_CON_8_ATI                      0x8949
+#define GL_CON_9_ATI                      0x894A
+#define GL_CON_10_ATI                     0x894B
+#define GL_CON_11_ATI                     0x894C
+#define GL_CON_12_ATI                     0x894D
+#define GL_CON_13_ATI                     0x894E
+#define GL_CON_14_ATI                     0x894F
+#define GL_CON_15_ATI                     0x8950
+#define GL_CON_16_ATI                     0x8951
+#define GL_CON_17_ATI                     0x8952
+#define GL_CON_18_ATI                     0x8953
+#define GL_CON_19_ATI                     0x8954
+#define GL_CON_20_ATI                     0x8955
+#define GL_CON_21_ATI                     0x8956
+#define GL_CON_22_ATI                     0x8957
+#define GL_CON_23_ATI                     0x8958
+#define GL_CON_24_ATI                     0x8959
+#define GL_CON_25_ATI                     0x895A
+#define GL_CON_26_ATI                     0x895B
+#define GL_CON_27_ATI                     0x895C
+#define GL_CON_28_ATI                     0x895D
+#define GL_CON_29_ATI                     0x895E
+#define GL_CON_30_ATI                     0x895F
+#define GL_CON_31_ATI                     0x8960
+#define GL_MOV_ATI                        0x8961
+#define GL_ADD_ATI                        0x8963
+#define GL_MUL_ATI                        0x8964
+#define GL_SUB_ATI                        0x8965
+#define GL_DOT3_ATI                       0x8966
+#define GL_DOT4_ATI                       0x8967
+#define GL_MAD_ATI                        0x8968
+#define GL_LERP_ATI                       0x8969
+#define GL_CND_ATI                        0x896A
+#define GL_CND0_ATI                       0x896B
+#define GL_DOT2_ADD_ATI                   0x896C
+#define GL_SECONDARY_INTERPOLATOR_ATI     0x896D
+#define GL_NUM_FRAGMENT_REGISTERS_ATI     0x896E
+#define GL_NUM_FRAGMENT_CONSTANTS_ATI     0x896F
+#define GL_NUM_PASSES_ATI                 0x8970
+#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI  0x8971
+#define GL_NUM_INSTRUCTIONS_TOTAL_ATI     0x8972
+#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973
+#define GL_NUM_LOOPBACK_COMPONENTS_ATI    0x8974
+#define GL_COLOR_ALPHA_PAIRING_ATI        0x8975
+#define GL_SWIZZLE_STR_ATI                0x8976
+#define GL_SWIZZLE_STQ_ATI                0x8977
+#define GL_SWIZZLE_STR_DR_ATI             0x8978
+#define GL_SWIZZLE_STQ_DQ_ATI             0x8979
+#define GL_SWIZZLE_STRQ_ATI               0x897A
+#define GL_SWIZZLE_STRQ_DQ_ATI            0x897B
+#define GL_RED_BIT_ATI                    0x00000001
+#define GL_GREEN_BIT_ATI                  0x00000002
+#define GL_BLUE_BIT_ATI                   0x00000004
+#define GL_2X_BIT_ATI                     0x00000001
+#define GL_4X_BIT_ATI                     0x00000002
+#define GL_8X_BIT_ATI                     0x00000004
+#define GL_HALF_BIT_ATI                   0x00000008
+#define GL_QUARTER_BIT_ATI                0x00000010
+#define GL_EIGHTH_BIT_ATI                 0x00000020
+#define GL_SATURATE_BIT_ATI               0x00000040
+#define GL_COMP_BIT_ATI                   0x00000002
+#define GL_NEGATE_BIT_ATI                 0x00000004
+#define GL_BIAS_BIT_ATI                   0x00000008
+typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void);
+typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle);
+typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range);
+GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id);
+GLAPI void APIENTRY glBeginFragmentShaderATI (void);
+GLAPI void APIENTRY glEndFragmentShaderATI (void);
+GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle);
+GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle);
+GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod);
+GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod);
+GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod);
+GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value);
+#endif
+#endif /* GL_ATI_fragment_shader */
+
+#ifndef GL_ATI_map_object_buffer
+#define GL_ATI_map_object_buffer 1
+typedef void *(APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void *APIENTRY glMapObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer);
+#endif
+#endif /* GL_ATI_map_object_buffer */
+
+#ifndef GL_ATI_meminfo
+#define GL_ATI_meminfo 1
+#define GL_VBO_FREE_MEMORY_ATI            0x87FB
+#define GL_TEXTURE_FREE_MEMORY_ATI        0x87FC
+#define GL_RENDERBUFFER_FREE_MEMORY_ATI   0x87FD
+#endif /* GL_ATI_meminfo */
+
+#ifndef GL_ATI_pixel_format_float
+#define GL_ATI_pixel_format_float 1
+#define GL_RGBA_FLOAT_MODE_ATI            0x8820
+#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835
+#endif /* GL_ATI_pixel_format_float */
+
+#ifndef GL_ATI_pn_triangles
+#define GL_ATI_pn_triangles 1
+#define GL_PN_TRIANGLES_ATI               0x87F0
+#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1
+#define GL_PN_TRIANGLES_POINT_MODE_ATI    0x87F2
+#define GL_PN_TRIANGLES_NORMAL_MODE_ATI   0x87F3
+#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4
+#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5
+#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6
+#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
+#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_pn_triangles */
+
+#ifndef GL_ATI_separate_stencil
+#define GL_ATI_separate_stencil 1
+#define GL_STENCIL_BACK_FUNC_ATI          0x8800
+#define GL_STENCIL_BACK_FAIL_ATI          0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803
+typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass);
+GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+#endif
+#endif /* GL_ATI_separate_stencil */
+
+#ifndef GL_ATI_text_fragment_shader
+#define GL_ATI_text_fragment_shader 1
+#define GL_TEXT_FRAGMENT_SHADER_ATI       0x8200
+#endif /* GL_ATI_text_fragment_shader */
+
+#ifndef GL_ATI_texture_env_combine3
+#define GL_ATI_texture_env_combine3 1
+#define GL_MODULATE_ADD_ATI               0x8744
+#define GL_MODULATE_SIGNED_ADD_ATI        0x8745
+#define GL_MODULATE_SUBTRACT_ATI          0x8746
+#endif /* GL_ATI_texture_env_combine3 */
+
+#ifndef GL_ATI_texture_float
+#define GL_ATI_texture_float 1
+#define GL_RGBA_FLOAT32_ATI               0x8814
+#define GL_RGB_FLOAT32_ATI                0x8815
+#define GL_ALPHA_FLOAT32_ATI              0x8816
+#define GL_INTENSITY_FLOAT32_ATI          0x8817
+#define GL_LUMINANCE_FLOAT32_ATI          0x8818
+#define GL_LUMINANCE_ALPHA_FLOAT32_ATI    0x8819
+#define GL_RGBA_FLOAT16_ATI               0x881A
+#define GL_RGB_FLOAT16_ATI                0x881B
+#define GL_ALPHA_FLOAT16_ATI              0x881C
+#define GL_INTENSITY_FLOAT16_ATI          0x881D
+#define GL_LUMINANCE_FLOAT16_ATI          0x881E
+#define GL_LUMINANCE_ALPHA_FLOAT16_ATI    0x881F
+#endif /* GL_ATI_texture_float */
+
+#ifndef GL_ATI_texture_mirror_once
+#define GL_ATI_texture_mirror_once 1
+#define GL_MIRROR_CLAMP_ATI               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_ATI       0x8743
+#endif /* GL_ATI_texture_mirror_once */
+
+#ifndef GL_ATI_vertex_array_object
+#define GL_ATI_vertex_array_object 1
+#define GL_STATIC_ATI                     0x8760
+#define GL_DYNAMIC_ATI                    0x8761
+#define GL_PRESERVE_ATI                   0x8762
+#define GL_DISCARD_ATI                    0x8763
+#define GL_OBJECT_BUFFER_SIZE_ATI         0x8764
+#define GL_OBJECT_BUFFER_USAGE_ATI        0x8765
+#define GL_ARRAY_OBJECT_BUFFER_ATI        0x8766
+#define GL_ARRAY_OBJECT_OFFSET_ATI        0x8767
+typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void *pointer, GLenum usage);
+typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const void *pointer, GLenum usage);
+GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve);
+GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer);
+GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params);
+GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_array_object */
+
+#ifndef GL_ATI_vertex_attrib_array_object
+#define GL_ATI_vertex_attrib_array_object 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params);
+#endif
+#endif /* GL_ATI_vertex_attrib_array_object */
+
+#ifndef GL_ATI_vertex_streams
+#define GL_ATI_vertex_streams 1
+#define GL_MAX_VERTEX_STREAMS_ATI         0x876B
+#define GL_VERTEX_STREAM0_ATI             0x876C
+#define GL_VERTEX_STREAM1_ATI             0x876D
+#define GL_VERTEX_STREAM2_ATI             0x876E
+#define GL_VERTEX_STREAM3_ATI             0x876F
+#define GL_VERTEX_STREAM4_ATI             0x8770
+#define GL_VERTEX_STREAM5_ATI             0x8771
+#define GL_VERTEX_STREAM6_ATI             0x8772
+#define GL_VERTEX_STREAM7_ATI             0x8773
+#define GL_VERTEX_SOURCE_ATI              0x8774
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords);
+typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x);
+GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x);
+GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x);
+GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x);
+GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y);
+GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz);
+GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords);
+GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz);
+GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords);
+GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz);
+GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords);
+GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz);
+GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords);
+GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz);
+GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords);
+GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream);
+GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param);
+GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param);
+#endif
+#endif /* GL_ATI_vertex_streams */
+
+#ifndef GL_EXT_422_pixels
+#define GL_EXT_422_pixels 1
+#define GL_422_EXT                        0x80CC
+#define GL_422_REV_EXT                    0x80CD
+#define GL_422_AVERAGE_EXT                0x80CE
+#define GL_422_REV_AVERAGE_EXT            0x80CF
+#endif /* GL_EXT_422_pixels */
+
+#ifndef GL_EXT_abgr
+#define GL_EXT_abgr 1
+#define GL_ABGR_EXT                       0x8000
+#endif /* GL_EXT_abgr */
+
+#ifndef GL_EXT_bgra
+#define GL_EXT_bgra 1
+#define GL_BGR_EXT                        0x80E0
+#define GL_BGRA_EXT                       0x80E1
+#endif /* GL_EXT_bgra */
+
+#ifndef GL_EXT_bindable_uniform
+#define GL_EXT_bindable_uniform 1
+#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2
+#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3
+#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4
+#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT  0x8DED
+#define GL_UNIFORM_BUFFER_EXT             0x8DEE
+#define GL_UNIFORM_BUFFER_BINDING_EXT     0x8DEF
+typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer);
+typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location);
+typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer);
+GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location);
+GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location);
+#endif
+#endif /* GL_EXT_bindable_uniform */
+
+#ifndef GL_EXT_blend_color
+#define GL_EXT_blend_color 1
+#define GL_CONSTANT_COLOR_EXT             0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR_EXT   0x8002
+#define GL_CONSTANT_ALPHA_EXT             0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT   0x8004
+#define GL_BLEND_COLOR_EXT                0x8005
+typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendColorEXT (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
+#endif
+#endif /* GL_EXT_blend_color */
+
+#ifndef GL_EXT_blend_equation_separate
+#define GL_EXT_blend_equation_separate 1
+#define GL_BLEND_EQUATION_RGB_EXT         0x8009
+#define GL_BLEND_EQUATION_ALPHA_EXT       0x883D
+typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha);
+#endif
+#endif /* GL_EXT_blend_equation_separate */
+
+#ifndef GL_EXT_blend_func_separate
+#define GL_EXT_blend_func_separate 1
+#define GL_BLEND_DST_RGB_EXT              0x80C8
+#define GL_BLEND_SRC_RGB_EXT              0x80C9
+#define GL_BLEND_DST_ALPHA_EXT            0x80CA
+#define GL_BLEND_SRC_ALPHA_EXT            0x80CB
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_EXT_blend_func_separate */
+
+#ifndef GL_EXT_blend_logic_op
+#define GL_EXT_blend_logic_op 1
+#endif /* GL_EXT_blend_logic_op */
+
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#define GL_MIN_EXT                        0x8007
+#define GL_MAX_EXT                        0x8008
+#define GL_FUNC_ADD_EXT                   0x8006
+#define GL_BLEND_EQUATION_EXT             0x8009
+typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendEquationEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_blend_minmax */
+
+#ifndef GL_EXT_blend_subtract
+#define GL_EXT_blend_subtract 1
+#define GL_FUNC_SUBTRACT_EXT              0x800A
+#define GL_FUNC_REVERSE_SUBTRACT_EXT      0x800B
+#endif /* GL_EXT_blend_subtract */
+
+#ifndef GL_EXT_clip_volume_hint
+#define GL_EXT_clip_volume_hint 1
+#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT  0x80F0
+#endif /* GL_EXT_clip_volume_hint */
+
+#ifndef GL_EXT_cmyka
+#define GL_EXT_cmyka 1
+#define GL_CMYK_EXT                       0x800C
+#define GL_CMYKA_EXT                      0x800D
+#define GL_PACK_CMYK_HINT_EXT             0x800E
+#define GL_UNPACK_CMYK_HINT_EXT           0x800F
+#endif /* GL_EXT_cmyka */
+
+#ifndef GL_EXT_color_subtable
+#define GL_EXT_color_subtable 1
+typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width);
+#endif
+#endif /* GL_EXT_color_subtable */
+
+#ifndef GL_EXT_compiled_vertex_array
+#define GL_EXT_compiled_vertex_array 1
+#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT   0x81A8
+#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT   0x81A9
+typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count);
+GLAPI void APIENTRY glUnlockArraysEXT (void);
+#endif
+#endif /* GL_EXT_compiled_vertex_array */
+
+#ifndef GL_EXT_convolution
+#define GL_EXT_convolution 1
+#define GL_CONVOLUTION_1D_EXT             0x8010
+#define GL_CONVOLUTION_2D_EXT             0x8011
+#define GL_SEPARABLE_2D_EXT               0x8012
+#define GL_CONVOLUTION_BORDER_MODE_EXT    0x8013
+#define GL_CONVOLUTION_FILTER_SCALE_EXT   0x8014
+#define GL_CONVOLUTION_FILTER_BIAS_EXT    0x8015
+#define GL_REDUCE_EXT                     0x8016
+#define GL_CONVOLUTION_FORMAT_EXT         0x8017
+#define GL_CONVOLUTION_WIDTH_EXT          0x8018
+#define GL_CONVOLUTION_HEIGHT_EXT         0x8019
+#define GL_MAX_CONVOLUTION_WIDTH_EXT      0x801A
+#define GL_MAX_CONVOLUTION_HEIGHT_EXT     0x801B
+#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C
+#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D
+#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E
+#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F
+#define GL_POST_CONVOLUTION_RED_BIAS_EXT  0x8020
+#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021
+#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022
+#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params);
+typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *image);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image);
+GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params);
+GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params);
+GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, void *image);
+GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span);
+GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column);
+#endif
+#endif /* GL_EXT_convolution */
+
+#ifndef GL_EXT_coordinate_frame
+#define GL_EXT_coordinate_frame 1
+#define GL_TANGENT_ARRAY_EXT              0x8439
+#define GL_BINORMAL_ARRAY_EXT             0x843A
+#define GL_CURRENT_TANGENT_EXT            0x843B
+#define GL_CURRENT_BINORMAL_EXT           0x843C
+#define GL_TANGENT_ARRAY_TYPE_EXT         0x843E
+#define GL_TANGENT_ARRAY_STRIDE_EXT       0x843F
+#define GL_BINORMAL_ARRAY_TYPE_EXT        0x8440
+#define GL_BINORMAL_ARRAY_STRIDE_EXT      0x8441
+#define GL_TANGENT_ARRAY_POINTER_EXT      0x8442
+#define GL_BINORMAL_ARRAY_POINTER_EXT     0x8443
+#define GL_MAP1_TANGENT_EXT               0x8444
+#define GL_MAP2_TANGENT_EXT               0x8445
+#define GL_MAP1_BINORMAL_EXT              0x8446
+#define GL_MAP2_BINORMAL_EXT              0x8447
+typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz);
+typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz);
+typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz);
+typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz);
+typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz);
+typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz);
+typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz);
+typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz);
+typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz);
+typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz);
+typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz);
+GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz);
+GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz);
+GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz);
+GLAPI void APIENTRY glTangent3ivEXT (const GLint *v);
+GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz);
+GLAPI void APIENTRY glTangent3svEXT (const GLshort *v);
+GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz);
+GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz);
+GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz);
+GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz);
+GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v);
+GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz);
+GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v);
+GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_coordinate_frame */
+
+#ifndef GL_EXT_copy_texture
+#define GL_EXT_copy_texture 1
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_copy_texture */
+
+#ifndef GL_EXT_cull_vertex
+#define GL_EXT_cull_vertex 1
+#define GL_CULL_VERTEX_EXT                0x81AA
+#define GL_CULL_VERTEX_EYE_POSITION_EXT   0x81AB
+#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC
+typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_cull_vertex */
+
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT    0x8A4F
+#define GL_PROGRAM_OBJECT_EXT             0x8B40
+#define GL_SHADER_OBJECT_EXT              0x8B48
+#define GL_BUFFER_OBJECT_EXT              0x9151
+#define GL_QUERY_OBJECT_EXT               0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT        0x9154
+typedef void (APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+typedef void (APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+GLAPI void APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+#endif /* GL_EXT_debug_label */
+
+#ifndef GL_EXT_debug_marker
+#define GL_EXT_debug_marker 1
+typedef void (APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
+GLAPI void APIENTRY glPopGroupMarkerEXT (void);
+#endif
+#endif /* GL_EXT_debug_marker */
+
+#ifndef GL_EXT_depth_bounds_test
+#define GL_EXT_depth_bounds_test 1
+#define GL_DEPTH_BOUNDS_TEST_EXT          0x8890
+#define GL_DEPTH_BOUNDS_EXT               0x8891
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax);
+#endif
+#endif /* GL_EXT_depth_bounds_test */
+
+#ifndef GL_EXT_direct_state_access
+#define GL_EXT_direct_state_access 1
+#define GL_PROGRAM_MATRIX_EXT             0x8E2D
+#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT   0x8E2E
+#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F
+typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data);
+typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void **data);
+typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index);
+typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data);
+typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, void *img);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m);
+typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access);
+typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index);
+typedef void (APIENTRYP PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void **params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target);
+typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array);
+typedef void (APIENTRYP PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void **param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+typedef void (APIENTRYP PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void **param);
+typedef void *(APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+typedef void (APIENTRYP PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+typedef void (APIENTRYP PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident);
+typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glMatrixPopEXT (GLenum mode);
+GLAPI void APIENTRY glMatrixPushEXT (GLenum mode);
+GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask);
+GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture);
+GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param);
+GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params);
+GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border);
+GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels);
+GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params);
+GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data);
+GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data);
+GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, void **data);
+GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index);
+GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index);
+GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data);
+GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data);
+GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *bits);
+GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, void *img);
+GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m);
+GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m);
+GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage);
+GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data);
+GLAPI void *APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access);
+GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer);
+GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, void **params);
+GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data);
+GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0);
+GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1);
+GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2);
+GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3);
+GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0);
+GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1);
+GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2);
+GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer);
+GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0);
+GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glEnableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glDisableClientStateiEXT (GLenum array, GLuint index);
+GLAPI void APIENTRY glGetFloati_vEXT (GLenum pname, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetDoublei_vEXT (GLenum pname, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetPointeri_vEXT (GLenum pname, GLuint index, void **params);
+GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params);
+GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params);
+GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, void *string);
+GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target);
+GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target);
+GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target);
+GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs);
+GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode);
+GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
+GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face);
+GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glVertexArrayVertexOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayEdgeFlagOffsetEXT (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayIndexOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayNormalOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayMultiTexCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayFogCoordOffsetEXT (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArraySecondaryColorOffsetEXT (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glEnableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glDisableVertexArrayEXT (GLuint vaobj, GLenum array);
+GLAPI void APIENTRY glEnableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glDisableVertexArrayAttribEXT (GLuint vaobj, GLuint index);
+GLAPI void APIENTRY glGetVertexArrayIntegervEXT (GLuint vaobj, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointervEXT (GLuint vaobj, GLenum pname, void **param);
+GLAPI void APIENTRY glGetVertexArrayIntegeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, GLint *param);
+GLAPI void APIENTRY glGetVertexArrayPointeri_vEXT (GLuint vaobj, GLuint index, GLenum pname, void **param);
+GLAPI void *APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length);
+GLAPI void APIENTRY glNamedBufferStorageEXT (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags);
+GLAPI void APIENTRY glClearNamedBufferDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLsizeiptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data);
+GLAPI void APIENTRY glNamedFramebufferParameteriEXT (GLuint framebuffer, GLenum pname, GLint param);
+GLAPI void APIENTRY glGetNamedFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params);
+GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x);
+GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value);
+GLAPI void APIENTRY glTextureBufferRangeEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GLAPI void APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GLAPI void APIENTRY glTextureStorage2DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glTextureStorage3DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations);
+GLAPI void APIENTRY glVertexArrayBindVertexBufferEXT (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride);
+GLAPI void APIENTRY glVertexArrayVertexAttribFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribIFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribLFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset);
+GLAPI void APIENTRY glVertexArrayVertexAttribBindingEXT (GLuint vaobj, GLuint attribindex, GLuint bindingindex);
+GLAPI void APIENTRY glVertexArrayVertexBindingDivisorEXT (GLuint vaobj, GLuint bindingindex, GLuint divisor);
+GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset);
+GLAPI void APIENTRY glTexturePageCommitmentEXT (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean resident);
+GLAPI void APIENTRY glVertexArrayVertexAttribDivisorEXT (GLuint vaobj, GLuint index, GLuint divisor);
+#endif
+#endif /* GL_EXT_direct_state_access */
+
+#ifndef GL_EXT_draw_buffers2
+#define GL_EXT_draw_buffers2 1
+typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a);
+#endif
+#endif /* GL_EXT_draw_buffers2 */
+
+#ifndef GL_EXT_draw_instanced
+#define GL_EXT_draw_instanced 1
+typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount);
+GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_draw_instanced */
+
+#ifndef GL_EXT_draw_range_elements
+#define GL_EXT_draw_range_elements 1
+#define GL_MAX_ELEMENTS_VERTICES_EXT      0x80E8
+#define GL_MAX_ELEMENTS_INDICES_EXT       0x80E9
+typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices);
+#endif
+#endif /* GL_EXT_draw_range_elements */
+
+#ifndef GL_EXT_fog_coord
+#define GL_EXT_fog_coord 1
+#define GL_FOG_COORDINATE_SOURCE_EXT      0x8450
+#define GL_FOG_COORDINATE_EXT             0x8451
+#define GL_FRAGMENT_DEPTH_EXT             0x8452
+#define GL_CURRENT_FOG_COORDINATE_EXT     0x8453
+#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT  0x8454
+#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455
+#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456
+#define GL_FOG_COORDINATE_ARRAY_EXT       0x8457
+typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord);
+typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord);
+typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord);
+GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord);
+GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord);
+GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord);
+GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_fog_coord */
+
+#ifndef GL_EXT_framebuffer_blit
+#define GL_EXT_framebuffer_blit 1
+#define GL_READ_FRAMEBUFFER_EXT           0x8CA8
+#define GL_DRAW_FRAMEBUFFER_EXT           0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_EXT   0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_EXT   0x8CAA
+typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+#endif /* GL_EXT_framebuffer_blit */
+
+#ifndef GL_EXT_framebuffer_multisample
+#define GL_EXT_framebuffer_multisample 1
+#define GL_RENDERBUFFER_SAMPLES_EXT       0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56
+#define GL_MAX_SAMPLES_EXT                0x8D57
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_EXT_framebuffer_multisample */
+
+#ifndef GL_EXT_framebuffer_multisample_blit_scaled
+#define GL_EXT_framebuffer_multisample_blit_scaled 1
+#define GL_SCALED_RESOLVE_FASTEST_EXT     0x90BA
+#define GL_SCALED_RESOLVE_NICEST_EXT      0x90BB
+#endif /* GL_EXT_framebuffer_multisample_blit_scaled */
+
+#ifndef GL_EXT_framebuffer_object
+#define GL_EXT_framebuffer_object 1
+#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506
+#define GL_MAX_RENDERBUFFER_SIZE_EXT      0x84E8
+#define GL_FRAMEBUFFER_BINDING_EXT        0x8CA6
+#define GL_RENDERBUFFER_BINDING_EXT       0x8CA7
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4
+#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
+#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
+#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
+#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
+#define GL_FRAMEBUFFER_UNSUPPORTED_EXT    0x8CDD
+#define GL_MAX_COLOR_ATTACHMENTS_EXT      0x8CDF
+#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT          0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT          0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT          0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT          0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT          0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT          0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT          0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT          0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT          0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT         0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT         0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT         0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT         0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT         0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT         0x8CEF
+#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
+#define GL_STENCIL_ATTACHMENT_EXT         0x8D20
+#define GL_FRAMEBUFFER_EXT                0x8D40
+#define GL_RENDERBUFFER_EXT               0x8D41
+#define GL_RENDERBUFFER_WIDTH_EXT         0x8D42
+#define GL_RENDERBUFFER_HEIGHT_EXT        0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44
+#define GL_STENCIL_INDEX1_EXT             0x8D46
+#define GL_STENCIL_INDEX4_EXT             0x8D47
+#define GL_STENCIL_INDEX8_EXT             0x8D48
+#define GL_STENCIL_INDEX16_EXT            0x8D49
+#define GL_RENDERBUFFER_RED_SIZE_EXT      0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE_EXT    0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE_EXT     0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE_EXT    0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE_EXT    0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE_EXT  0x8D55
+typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers);
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer);
+typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer);
+typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers);
+typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers);
+typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer);
+GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer);
+GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers);
+GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers);
+GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer);
+GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer);
+GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers);
+GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers);
+GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target);
+GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target);
+#endif
+#endif /* GL_EXT_framebuffer_object */
+
+#ifndef GL_EXT_framebuffer_sRGB
+#define GL_EXT_framebuffer_sRGB 1
+#define GL_FRAMEBUFFER_SRGB_EXT           0x8DB9
+#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT   0x8DBA
+#endif /* GL_EXT_framebuffer_sRGB */
+
+#ifndef GL_EXT_geometry_shader4
+#define GL_EXT_geometry_shader4 1
+#define GL_GEOMETRY_SHADER_EXT            0x8DD9
+#define GL_GEOMETRY_VERTICES_OUT_EXT      0x8DDA
+#define GL_GEOMETRY_INPUT_TYPE_EXT        0x8DDB
+#define GL_GEOMETRY_OUTPUT_TYPE_EXT       0x8DDC
+#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29
+#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD
+#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE
+#define GL_MAX_VARYING_COMPONENTS_EXT     0x8B4B
+#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF
+#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0
+#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1
+#define GL_LINES_ADJACENCY_EXT            0x000A
+#define GL_LINE_STRIP_ADJACENCY_EXT       0x000B
+#define GL_TRIANGLES_ADJACENCY_EXT        0x000C
+#define GL_TRIANGLE_STRIP_ADJACENCY_EXT   0x000D
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8
+#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9
+#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4
+#define GL_PROGRAM_POINT_SIZE_EXT         0x8642
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+#endif
+#endif /* GL_EXT_geometry_shader4 */
+
+#ifndef GL_EXT_gpu_program_parameters
+#define GL_EXT_gpu_program_parameters 1
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+#endif
+#endif /* GL_EXT_gpu_program_parameters */
+
+#ifndef GL_EXT_gpu_shader4
+#define GL_EXT_gpu_shader4 1
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD
+#define GL_SAMPLER_1D_ARRAY_EXT           0x8DC0
+#define GL_SAMPLER_2D_ARRAY_EXT           0x8DC1
+#define GL_SAMPLER_BUFFER_EXT             0x8DC2
+#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT    0x8DC3
+#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT    0x8DC4
+#define GL_SAMPLER_CUBE_SHADOW_EXT        0x8DC5
+#define GL_UNSIGNED_INT_VEC2_EXT          0x8DC6
+#define GL_UNSIGNED_INT_VEC3_EXT          0x8DC7
+#define GL_UNSIGNED_INT_VEC4_EXT          0x8DC8
+#define GL_INT_SAMPLER_1D_EXT             0x8DC9
+#define GL_INT_SAMPLER_2D_EXT             0x8DCA
+#define GL_INT_SAMPLER_3D_EXT             0x8DCB
+#define GL_INT_SAMPLER_CUBE_EXT           0x8DCC
+#define GL_INT_SAMPLER_2D_RECT_EXT        0x8DCD
+#define GL_INT_SAMPLER_1D_ARRAY_EXT       0x8DCE
+#define GL_INT_SAMPLER_2D_ARRAY_EXT       0x8DCF
+#define GL_INT_SAMPLER_BUFFER_EXT         0x8DD0
+#define GL_UNSIGNED_INT_SAMPLER_1D_EXT    0x8DD1
+#define GL_UNSIGNED_INT_SAMPLER_2D_EXT    0x8DD2
+#define GL_UNSIGNED_INT_SAMPLER_3D_EXT    0x8DD3
+#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT  0x8DD4
+#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5
+#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6
+#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7
+#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_EXT   0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_EXT   0x8905
+typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params);
+typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0);
+typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1);
+typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2);
+typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params);
+GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name);
+GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0);
+GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1);
+GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2);
+GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value);
+GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value);
+#endif
+#endif /* GL_EXT_gpu_shader4 */
+
+#ifndef GL_EXT_histogram
+#define GL_EXT_histogram 1
+#define GL_HISTOGRAM_EXT                  0x8024
+#define GL_PROXY_HISTOGRAM_EXT            0x8025
+#define GL_HISTOGRAM_WIDTH_EXT            0x8026
+#define GL_HISTOGRAM_FORMAT_EXT           0x8027
+#define GL_HISTOGRAM_RED_SIZE_EXT         0x8028
+#define GL_HISTOGRAM_GREEN_SIZE_EXT       0x8029
+#define GL_HISTOGRAM_BLUE_SIZE_EXT        0x802A
+#define GL_HISTOGRAM_ALPHA_SIZE_EXT       0x802B
+#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT   0x802C
+#define GL_HISTOGRAM_SINK_EXT             0x802D
+#define GL_MINMAX_EXT                     0x802E
+#define GL_MINMAX_FORMAT_EXT              0x802F
+#define GL_MINMAX_SINK_EXT                0x8030
+#define GL_TABLE_TOO_LARGE_EXT            0x8031
+typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink);
+typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values);
+GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink);
+GLAPI void APIENTRY glResetHistogramEXT (GLenum target);
+GLAPI void APIENTRY glResetMinmaxEXT (GLenum target);
+#endif
+#endif /* GL_EXT_histogram */
+
+#ifndef GL_EXT_index_array_formats
+#define GL_EXT_index_array_formats 1
+#define GL_IUI_V2F_EXT                    0x81AD
+#define GL_IUI_V3F_EXT                    0x81AE
+#define GL_IUI_N3F_V2F_EXT                0x81AF
+#define GL_IUI_N3F_V3F_EXT                0x81B0
+#define GL_T2F_IUI_V2F_EXT                0x81B1
+#define GL_T2F_IUI_V3F_EXT                0x81B2
+#define GL_T2F_IUI_N3F_V2F_EXT            0x81B3
+#define GL_T2F_IUI_N3F_V3F_EXT            0x81B4
+#endif /* GL_EXT_index_array_formats */
+
+#ifndef GL_EXT_index_func
+#define GL_EXT_index_func 1
+#define GL_INDEX_TEST_EXT                 0x81B5
+#define GL_INDEX_TEST_FUNC_EXT            0x81B6
+#define GL_INDEX_TEST_REF_EXT             0x81B7
+typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref);
+#endif
+#endif /* GL_EXT_index_func */
+
+#ifndef GL_EXT_index_material
+#define GL_EXT_index_material 1
+#define GL_INDEX_MATERIAL_EXT             0x81B8
+#define GL_INDEX_MATERIAL_PARAMETER_EXT   0x81B9
+#define GL_INDEX_MATERIAL_FACE_EXT        0x81BA
+typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_index_material */
+
+#ifndef GL_EXT_index_texture
+#define GL_EXT_index_texture 1
+#endif /* GL_EXT_index_texture */
+
+#ifndef GL_EXT_light_texture
+#define GL_EXT_light_texture 1
+#define GL_FRAGMENT_MATERIAL_EXT          0x8349
+#define GL_FRAGMENT_NORMAL_EXT            0x834A
+#define GL_FRAGMENT_COLOR_EXT             0x834C
+#define GL_ATTENUATION_EXT                0x834D
+#define GL_SHADOW_ATTENUATION_EXT         0x834E
+#define GL_TEXTURE_APPLICATION_MODE_EXT   0x834F
+#define GL_TEXTURE_LIGHT_EXT              0x8350
+#define GL_TEXTURE_MATERIAL_FACE_EXT      0x8351
+#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352
+typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode);
+typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname);
+typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glApplyTextureEXT (GLenum mode);
+GLAPI void APIENTRY glTextureLightEXT (GLenum pname);
+GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode);
+#endif
+#endif /* GL_EXT_light_texture */
+
+#ifndef GL_EXT_misc_attribute
+#define GL_EXT_misc_attribute 1
+#endif /* GL_EXT_misc_attribute */
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount);
+#endif
+#endif /* GL_EXT_multi_draw_arrays */
+
+#ifndef GL_EXT_multisample
+#define GL_EXT_multisample 1
+#define GL_MULTISAMPLE_EXT                0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_EXT       0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_EXT        0x809F
+#define GL_SAMPLE_MASK_EXT                0x80A0
+#define GL_1PASS_EXT                      0x80A1
+#define GL_2PASS_0_EXT                    0x80A2
+#define GL_2PASS_1_EXT                    0x80A3
+#define GL_4PASS_0_EXT                    0x80A4
+#define GL_4PASS_1_EXT                    0x80A5
+#define GL_4PASS_2_EXT                    0x80A6
+#define GL_4PASS_3_EXT                    0x80A7
+#define GL_SAMPLE_BUFFERS_EXT             0x80A8
+#define GL_SAMPLES_EXT                    0x80A9
+#define GL_SAMPLE_MASK_VALUE_EXT          0x80AA
+#define GL_SAMPLE_MASK_INVERT_EXT         0x80AB
+#define GL_SAMPLE_PATTERN_EXT             0x80AC
+#define GL_MULTISAMPLE_BIT_EXT            0x20000000
+typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern);
+#endif
+#endif /* GL_EXT_multisample */
+
+#ifndef GL_EXT_packed_depth_stencil
+#define GL_EXT_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_EXT              0x84F9
+#define GL_UNSIGNED_INT_24_8_EXT          0x84FA
+#define GL_DEPTH24_STENCIL8_EXT           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE_EXT       0x88F1
+#endif /* GL_EXT_packed_depth_stencil */
+
+#ifndef GL_EXT_packed_float
+#define GL_EXT_packed_float 1
+#define GL_R11F_G11F_B10F_EXT             0x8C3A
+#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B
+#define GL_RGBA_SIGNED_COMPONENTS_EXT     0x8C3C
+#endif /* GL_EXT_packed_float */
+
+#ifndef GL_EXT_packed_pixels
+#define GL_EXT_packed_pixels 1
+#define GL_UNSIGNED_BYTE_3_3_2_EXT        0x8032
+#define GL_UNSIGNED_SHORT_4_4_4_4_EXT     0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1_EXT     0x8034
+#define GL_UNSIGNED_INT_8_8_8_8_EXT       0x8035
+#define GL_UNSIGNED_INT_10_10_10_2_EXT    0x8036
+#endif /* GL_EXT_packed_pixels */
+
+#ifndef GL_EXT_paletted_texture
+#define GL_EXT_paletted_texture 1
+#define GL_COLOR_INDEX1_EXT               0x80E2
+#define GL_COLOR_INDEX2_EXT               0x80E3
+#define GL_COLOR_INDEX4_EXT               0x80E4
+#define GL_COLOR_INDEX8_EXT               0x80E5
+#define GL_COLOR_INDEX12_EXT              0x80E6
+#define GL_COLOR_INDEX16_EXT              0x80E7
+#define GL_TEXTURE_INDEX_SIZE_EXT         0x80ED
+typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void *data);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, void *data);
+GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_paletted_texture */
+
+#ifndef GL_EXT_pixel_buffer_object
+#define GL_EXT_pixel_buffer_object 1
+#define GL_PIXEL_PACK_BUFFER_EXT          0x88EB
+#define GL_PIXEL_UNPACK_BUFFER_EXT        0x88EC
+#define GL_PIXEL_PACK_BUFFER_BINDING_EXT  0x88ED
+#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF
+#endif /* GL_EXT_pixel_buffer_object */
+
+#ifndef GL_EXT_pixel_transform
+#define GL_EXT_pixel_transform 1
+#define GL_PIXEL_TRANSFORM_2D_EXT         0x8330
+#define GL_PIXEL_MAG_FILTER_EXT           0x8331
+#define GL_PIXEL_MIN_FILTER_EXT           0x8332
+#define GL_PIXEL_CUBIC_WEIGHT_EXT         0x8333
+#define GL_CUBIC_EXT                      0x8334
+#define GL_AVERAGE_EXT                    0x8335
+#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336
+#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337
+#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT  0x8338
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTransformParameterivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTransformParameterfvEXT (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_EXT_pixel_transform */
+
+#ifndef GL_EXT_pixel_transform_color_table
+#define GL_EXT_pixel_transform_color_table 1
+#endif /* GL_EXT_pixel_transform_color_table */
+
+#ifndef GL_EXT_point_parameters
+#define GL_EXT_point_parameters 1
+#define GL_POINT_SIZE_MIN_EXT             0x8126
+#define GL_POINT_SIZE_MAX_EXT             0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_EXT  0x8128
+#define GL_DISTANCE_ATTENUATION_EXT       0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_EXT_point_parameters */
+
+#ifndef GL_EXT_polygon_offset
+#define GL_EXT_polygon_offset 1
+#define GL_POLYGON_OFFSET_EXT             0x8037
+#define GL_POLYGON_OFFSET_FACTOR_EXT      0x8038
+#define GL_POLYGON_OFFSET_BIAS_EXT        0x8039
+typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias);
+#endif
+#endif /* GL_EXT_polygon_offset */
+
+#ifndef GL_EXT_provoking_vertex
+#define GL_EXT_provoking_vertex 1
+#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C
+#define GL_FIRST_VERTEX_CONVENTION_EXT    0x8E4D
+#define GL_LAST_VERTEX_CONVENTION_EXT     0x8E4E
+#define GL_PROVOKING_VERTEX_EXT           0x8E4F
+typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_provoking_vertex */
+
+#ifndef GL_EXT_rescale_normal
+#define GL_EXT_rescale_normal 1
+#define GL_RESCALE_NORMAL_EXT             0x803A
+#endif /* GL_EXT_rescale_normal */
+
+#ifndef GL_EXT_secondary_color
+#define GL_EXT_secondary_color 1
+#define GL_COLOR_SUM_EXT                  0x8458
+#define GL_CURRENT_SECONDARY_COLOR_EXT    0x8459
+#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A
+#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B
+#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C
+#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D
+#define GL_SECONDARY_COLOR_ARRAY_EXT      0x845E
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue);
+GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v);
+GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue);
+GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v);
+GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue);
+GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v);
+GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue);
+GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v);
+GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue);
+GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v);
+GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue);
+GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v);
+GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue);
+GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v);
+GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue);
+GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v);
+GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_secondary_color */
+
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#define GL_ACTIVE_PROGRAM_EXT             0x8B8D
+typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program);
+typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program);
+typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program);
+GLAPI void APIENTRY glActiveProgramEXT (GLuint program);
+GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string);
+#endif
+#endif /* GL_EXT_separate_shader_objects */
+
+#ifndef GL_EXT_separate_specular_color
+#define GL_EXT_separate_specular_color 1
+#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT  0x81F8
+#define GL_SINGLE_COLOR_EXT               0x81F9
+#define GL_SEPARATE_SPECULAR_COLOR_EXT    0x81FA
+#endif /* GL_EXT_separate_specular_color */
+
+#ifndef GL_EXT_shader_image_load_formatted
+#define GL_EXT_shader_image_load_formatted 1
+#endif /* GL_EXT_shader_image_load_formatted */
+
+#ifndef GL_EXT_shader_image_load_store
+#define GL_EXT_shader_image_load_store 1
+#define GL_MAX_IMAGE_UNITS_EXT            0x8F38
+#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39
+#define GL_IMAGE_BINDING_NAME_EXT         0x8F3A
+#define GL_IMAGE_BINDING_LEVEL_EXT        0x8F3B
+#define GL_IMAGE_BINDING_LAYERED_EXT      0x8F3C
+#define GL_IMAGE_BINDING_LAYER_EXT        0x8F3D
+#define GL_IMAGE_BINDING_ACCESS_EXT       0x8F3E
+#define GL_IMAGE_1D_EXT                   0x904C
+#define GL_IMAGE_2D_EXT                   0x904D
+#define GL_IMAGE_3D_EXT                   0x904E
+#define GL_IMAGE_2D_RECT_EXT              0x904F
+#define GL_IMAGE_CUBE_EXT                 0x9050
+#define GL_IMAGE_BUFFER_EXT               0x9051
+#define GL_IMAGE_1D_ARRAY_EXT             0x9052
+#define GL_IMAGE_2D_ARRAY_EXT             0x9053
+#define GL_IMAGE_CUBE_MAP_ARRAY_EXT       0x9054
+#define GL_IMAGE_2D_MULTISAMPLE_EXT       0x9055
+#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056
+#define GL_INT_IMAGE_1D_EXT               0x9057
+#define GL_INT_IMAGE_2D_EXT               0x9058
+#define GL_INT_IMAGE_3D_EXT               0x9059
+#define GL_INT_IMAGE_2D_RECT_EXT          0x905A
+#define GL_INT_IMAGE_CUBE_EXT             0x905B
+#define GL_INT_IMAGE_BUFFER_EXT           0x905C
+#define GL_INT_IMAGE_1D_ARRAY_EXT         0x905D
+#define GL_INT_IMAGE_2D_ARRAY_EXT         0x905E
+#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT   0x905F
+#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT   0x9060
+#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061
+#define GL_UNSIGNED_INT_IMAGE_1D_EXT      0x9062
+#define GL_UNSIGNED_INT_IMAGE_2D_EXT      0x9063
+#define GL_UNSIGNED_INT_IMAGE_3D_EXT      0x9064
+#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065
+#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT    0x9066
+#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT  0x9067
+#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068
+#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069
+#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B
+#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C
+#define GL_MAX_IMAGE_SAMPLES_EXT          0x906D
+#define GL_IMAGE_BINDING_FORMAT_EXT       0x906E
+#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001
+#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT  0x00000002
+#define GL_UNIFORM_BARRIER_BIT_EXT        0x00000004
+#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT  0x00000008
+#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020
+#define GL_COMMAND_BARRIER_BIT_EXT        0x00000040
+#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT   0x00000080
+#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100
+#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT  0x00000200
+#define GL_FRAMEBUFFER_BARRIER_BIT_EXT    0x00000400
+#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800
+#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000
+#define GL_ALL_BARRIER_BITS_EXT           0xFFFFFFFF
+typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format);
+GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers);
+#endif
+#endif /* GL_EXT_shader_image_load_store */
+
+#ifndef GL_EXT_shader_integer_mix
+#define GL_EXT_shader_integer_mix 1
+#endif /* GL_EXT_shader_integer_mix */
+
+#ifndef GL_EXT_shadow_funcs
+#define GL_EXT_shadow_funcs 1
+#endif /* GL_EXT_shadow_funcs */
+
+#ifndef GL_EXT_shared_texture_palette
+#define GL_EXT_shared_texture_palette 1
+#define GL_SHARED_TEXTURE_PALETTE_EXT     0x81FB
+#endif /* GL_EXT_shared_texture_palette */
+
+#ifndef GL_EXT_stencil_clear_tag
+#define GL_EXT_stencil_clear_tag 1
+#define GL_STENCIL_TAG_BITS_EXT           0x88F2
+#define GL_STENCIL_CLEAR_TAG_VALUE_EXT    0x88F3
+typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag);
+#endif
+#endif /* GL_EXT_stencil_clear_tag */
+
+#ifndef GL_EXT_stencil_two_side
+#define GL_EXT_stencil_two_side 1
+#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
+#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
+typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face);
+#endif
+#endif /* GL_EXT_stencil_two_side */
+
+#ifndef GL_EXT_stencil_wrap
+#define GL_EXT_stencil_wrap 1
+#define GL_INCR_WRAP_EXT                  0x8507
+#define GL_DECR_WRAP_EXT                  0x8508
+#endif /* GL_EXT_stencil_wrap */
+
+#ifndef GL_EXT_subtexture
+#define GL_EXT_subtexture 1
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_subtexture */
+
+#ifndef GL_EXT_texture
+#define GL_EXT_texture 1
+#define GL_ALPHA4_EXT                     0x803B
+#define GL_ALPHA8_EXT                     0x803C
+#define GL_ALPHA12_EXT                    0x803D
+#define GL_ALPHA16_EXT                    0x803E
+#define GL_LUMINANCE4_EXT                 0x803F
+#define GL_LUMINANCE8_EXT                 0x8040
+#define GL_LUMINANCE12_EXT                0x8041
+#define GL_LUMINANCE16_EXT                0x8042
+#define GL_LUMINANCE4_ALPHA4_EXT          0x8043
+#define GL_LUMINANCE6_ALPHA2_EXT          0x8044
+#define GL_LUMINANCE8_ALPHA8_EXT          0x8045
+#define GL_LUMINANCE12_ALPHA4_EXT         0x8046
+#define GL_LUMINANCE12_ALPHA12_EXT        0x8047
+#define GL_LUMINANCE16_ALPHA16_EXT        0x8048
+#define GL_INTENSITY_EXT                  0x8049
+#define GL_INTENSITY4_EXT                 0x804A
+#define GL_INTENSITY8_EXT                 0x804B
+#define GL_INTENSITY12_EXT                0x804C
+#define GL_INTENSITY16_EXT                0x804D
+#define GL_RGB2_EXT                       0x804E
+#define GL_RGB4_EXT                       0x804F
+#define GL_RGB5_EXT                       0x8050
+#define GL_RGB8_EXT                       0x8051
+#define GL_RGB10_EXT                      0x8052
+#define GL_RGB12_EXT                      0x8053
+#define GL_RGB16_EXT                      0x8054
+#define GL_RGBA2_EXT                      0x8055
+#define GL_RGBA4_EXT                      0x8056
+#define GL_RGB5_A1_EXT                    0x8057
+#define GL_RGBA8_EXT                      0x8058
+#define GL_RGB10_A2_EXT                   0x8059
+#define GL_RGBA12_EXT                     0x805A
+#define GL_RGBA16_EXT                     0x805B
+#define GL_TEXTURE_RED_SIZE_EXT           0x805C
+#define GL_TEXTURE_GREEN_SIZE_EXT         0x805D
+#define GL_TEXTURE_BLUE_SIZE_EXT          0x805E
+#define GL_TEXTURE_ALPHA_SIZE_EXT         0x805F
+#define GL_TEXTURE_LUMINANCE_SIZE_EXT     0x8060
+#define GL_TEXTURE_INTENSITY_SIZE_EXT     0x8061
+#define GL_REPLACE_EXT                    0x8062
+#define GL_PROXY_TEXTURE_1D_EXT           0x8063
+#define GL_PROXY_TEXTURE_2D_EXT           0x8064
+#define GL_TEXTURE_TOO_LARGE_EXT          0x8065
+#endif /* GL_EXT_texture */
+
+#ifndef GL_EXT_texture3D
+#define GL_EXT_texture3D 1
+#define GL_PACK_SKIP_IMAGES_EXT           0x806B
+#define GL_PACK_IMAGE_HEIGHT_EXT          0x806C
+#define GL_UNPACK_SKIP_IMAGES_EXT         0x806D
+#define GL_UNPACK_IMAGE_HEIGHT_EXT        0x806E
+#define GL_TEXTURE_3D_EXT                 0x806F
+#define GL_PROXY_TEXTURE_3D_EXT           0x8070
+#define GL_TEXTURE_DEPTH_EXT              0x8071
+#define GL_TEXTURE_WRAP_R_EXT             0x8072
+#define GL_MAX_3D_TEXTURE_SIZE_EXT        0x8073
+typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_EXT_texture3D */
+
+#ifndef GL_EXT_texture_array
+#define GL_EXT_texture_array 1
+#define GL_TEXTURE_1D_ARRAY_EXT           0x8C18
+#define GL_PROXY_TEXTURE_1D_ARRAY_EXT     0x8C19
+#define GL_TEXTURE_2D_ARRAY_EXT           0x8C1A
+#define GL_PROXY_TEXTURE_2D_ARRAY_EXT     0x8C1B
+#define GL_TEXTURE_BINDING_1D_ARRAY_EXT   0x8C1C
+#define GL_TEXTURE_BINDING_2D_ARRAY_EXT   0x8C1D
+#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT   0x88FF
+#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E
+#endif /* GL_EXT_texture_array */
+
+#ifndef GL_EXT_texture_buffer_object
+#define GL_EXT_texture_buffer_object 1
+#define GL_TEXTURE_BUFFER_EXT             0x8C2A
+#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT    0x8C2B
+#define GL_TEXTURE_BINDING_BUFFER_EXT     0x8C2C
+#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D
+#define GL_TEXTURE_BUFFER_FORMAT_EXT      0x8C2E
+typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer);
+#endif
+#endif /* GL_EXT_texture_buffer_object */
+
+#ifndef GL_EXT_texture_compression_latc
+#define GL_EXT_texture_compression_latc 1
+#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
+#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
+#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
+#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
+#endif /* GL_EXT_texture_compression_latc */
+
+#ifndef GL_EXT_texture_compression_rgtc
+#define GL_EXT_texture_compression_rgtc 1
+#define GL_COMPRESSED_RED_RGTC1_EXT       0x8DBB
+#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
+#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
+#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
+#endif /* GL_EXT_texture_compression_rgtc */
+
+#ifndef GL_EXT_texture_compression_s3tc
+#define GL_EXT_texture_compression_s3tc 1
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT   0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT  0x83F1
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT  0x83F2
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT  0x83F3
+#endif /* GL_EXT_texture_compression_s3tc */
+
+#ifndef GL_EXT_texture_cube_map
+#define GL_EXT_texture_cube_map 1
+#define GL_NORMAL_MAP_EXT                 0x8511
+#define GL_REFLECTION_MAP_EXT             0x8512
+#define GL_TEXTURE_CUBE_MAP_EXT           0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP_EXT   0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A
+#define GL_PROXY_TEXTURE_CUBE_MAP_EXT     0x851B
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT  0x851C
+#endif /* GL_EXT_texture_cube_map */
+
+#ifndef GL_EXT_texture_env_add
+#define GL_EXT_texture_env_add 1
+#endif /* GL_EXT_texture_env_add */
+
+#ifndef GL_EXT_texture_env_combine
+#define GL_EXT_texture_env_combine 1
+#define GL_COMBINE_EXT                    0x8570
+#define GL_COMBINE_RGB_EXT                0x8571
+#define GL_COMBINE_ALPHA_EXT              0x8572
+#define GL_RGB_SCALE_EXT                  0x8573
+#define GL_ADD_SIGNED_EXT                 0x8574
+#define GL_INTERPOLATE_EXT                0x8575
+#define GL_CONSTANT_EXT                   0x8576
+#define GL_PRIMARY_COLOR_EXT              0x8577
+#define GL_PREVIOUS_EXT                   0x8578
+#define GL_SOURCE0_RGB_EXT                0x8580
+#define GL_SOURCE1_RGB_EXT                0x8581
+#define GL_SOURCE2_RGB_EXT                0x8582
+#define GL_SOURCE0_ALPHA_EXT              0x8588
+#define GL_SOURCE1_ALPHA_EXT              0x8589
+#define GL_SOURCE2_ALPHA_EXT              0x858A
+#define GL_OPERAND0_RGB_EXT               0x8590
+#define GL_OPERAND1_RGB_EXT               0x8591
+#define GL_OPERAND2_RGB_EXT               0x8592
+#define GL_OPERAND0_ALPHA_EXT             0x8598
+#define GL_OPERAND1_ALPHA_EXT             0x8599
+#define GL_OPERAND2_ALPHA_EXT             0x859A
+#endif /* GL_EXT_texture_env_combine */
+
+#ifndef GL_EXT_texture_env_dot3
+#define GL_EXT_texture_env_dot3 1
+#define GL_DOT3_RGB_EXT                   0x8740
+#define GL_DOT3_RGBA_EXT                  0x8741
+#endif /* GL_EXT_texture_env_dot3 */
+
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT     0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+#endif /* GL_EXT_texture_filter_anisotropic */
+
+#ifndef GL_EXT_texture_integer
+#define GL_EXT_texture_integer 1
+#define GL_RGBA32UI_EXT                   0x8D70
+#define GL_RGB32UI_EXT                    0x8D71
+#define GL_ALPHA32UI_EXT                  0x8D72
+#define GL_INTENSITY32UI_EXT              0x8D73
+#define GL_LUMINANCE32UI_EXT              0x8D74
+#define GL_LUMINANCE_ALPHA32UI_EXT        0x8D75
+#define GL_RGBA16UI_EXT                   0x8D76
+#define GL_RGB16UI_EXT                    0x8D77
+#define GL_ALPHA16UI_EXT                  0x8D78
+#define GL_INTENSITY16UI_EXT              0x8D79
+#define GL_LUMINANCE16UI_EXT              0x8D7A
+#define GL_LUMINANCE_ALPHA16UI_EXT        0x8D7B
+#define GL_RGBA8UI_EXT                    0x8D7C
+#define GL_RGB8UI_EXT                     0x8D7D
+#define GL_ALPHA8UI_EXT                   0x8D7E
+#define GL_INTENSITY8UI_EXT               0x8D7F
+#define GL_LUMINANCE8UI_EXT               0x8D80
+#define GL_LUMINANCE_ALPHA8UI_EXT         0x8D81
+#define GL_RGBA32I_EXT                    0x8D82
+#define GL_RGB32I_EXT                     0x8D83
+#define GL_ALPHA32I_EXT                   0x8D84
+#define GL_INTENSITY32I_EXT               0x8D85
+#define GL_LUMINANCE32I_EXT               0x8D86
+#define GL_LUMINANCE_ALPHA32I_EXT         0x8D87
+#define GL_RGBA16I_EXT                    0x8D88
+#define GL_RGB16I_EXT                     0x8D89
+#define GL_ALPHA16I_EXT                   0x8D8A
+#define GL_INTENSITY16I_EXT               0x8D8B
+#define GL_LUMINANCE16I_EXT               0x8D8C
+#define GL_LUMINANCE_ALPHA16I_EXT         0x8D8D
+#define GL_RGBA8I_EXT                     0x8D8E
+#define GL_RGB8I_EXT                      0x8D8F
+#define GL_ALPHA8I_EXT                    0x8D90
+#define GL_INTENSITY8I_EXT                0x8D91
+#define GL_LUMINANCE8I_EXT                0x8D92
+#define GL_LUMINANCE_ALPHA8I_EXT          0x8D93
+#define GL_RED_INTEGER_EXT                0x8D94
+#define GL_GREEN_INTEGER_EXT              0x8D95
+#define GL_BLUE_INTEGER_EXT               0x8D96
+#define GL_ALPHA_INTEGER_EXT              0x8D97
+#define GL_RGB_INTEGER_EXT                0x8D98
+#define GL_RGBA_INTEGER_EXT               0x8D99
+#define GL_BGR_INTEGER_EXT                0x8D9A
+#define GL_BGRA_INTEGER_EXT               0x8D9B
+#define GL_LUMINANCE_INTEGER_EXT          0x8D9C
+#define GL_LUMINANCE_ALPHA_INTEGER_EXT    0x8D9D
+#define GL_RGBA_INTEGER_MODE_EXT          0x8D9E
+typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha);
+typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params);
+GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha);
+GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha);
+#endif
+#endif /* GL_EXT_texture_integer */
+
+#ifndef GL_EXT_texture_lod_bias
+#define GL_EXT_texture_lod_bias 1
+#define GL_MAX_TEXTURE_LOD_BIAS_EXT       0x84FD
+#define GL_TEXTURE_FILTER_CONTROL_EXT     0x8500
+#define GL_TEXTURE_LOD_BIAS_EXT           0x8501
+#endif /* GL_EXT_texture_lod_bias */
+
+#ifndef GL_EXT_texture_mirror_clamp
+#define GL_EXT_texture_mirror_clamp 1
+#define GL_MIRROR_CLAMP_EXT               0x8742
+#define GL_MIRROR_CLAMP_TO_EDGE_EXT       0x8743
+#define GL_MIRROR_CLAMP_TO_BORDER_EXT     0x8912
+#endif /* GL_EXT_texture_mirror_clamp */
+
+#ifndef GL_EXT_texture_object
+#define GL_EXT_texture_object 1
+#define GL_TEXTURE_PRIORITY_EXT           0x8066
+#define GL_TEXTURE_RESIDENT_EXT           0x8067
+#define GL_TEXTURE_1D_BINDING_EXT         0x8068
+#define GL_TEXTURE_2D_BINDING_EXT         0x8069
+#define GL_TEXTURE_3D_BINDING_EXT         0x806A
+typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures);
+typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences);
+GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture);
+GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures);
+GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures);
+GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture);
+GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities);
+#endif
+#endif /* GL_EXT_texture_object */
+
+#ifndef GL_EXT_texture_perturb_normal
+#define GL_EXT_texture_perturb_normal 1
+#define GL_PERTURB_EXT                    0x85AE
+#define GL_TEXTURE_NORMAL_EXT             0x85AF
+typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureNormalEXT (GLenum mode);
+#endif
+#endif /* GL_EXT_texture_perturb_normal */
+
+#ifndef GL_EXT_texture_sRGB
+#define GL_EXT_texture_sRGB 1
+#define GL_SRGB_EXT                       0x8C40
+#define GL_SRGB8_EXT                      0x8C41
+#define GL_SRGB_ALPHA_EXT                 0x8C42
+#define GL_SRGB8_ALPHA8_EXT               0x8C43
+#define GL_SLUMINANCE_ALPHA_EXT           0x8C44
+#define GL_SLUMINANCE8_ALPHA8_EXT         0x8C45
+#define GL_SLUMINANCE_EXT                 0x8C46
+#define GL_SLUMINANCE8_EXT                0x8C47
+#define GL_COMPRESSED_SRGB_EXT            0x8C48
+#define GL_COMPRESSED_SRGB_ALPHA_EXT      0x8C49
+#define GL_COMPRESSED_SLUMINANCE_EXT      0x8C4A
+#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT  0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F
+#endif /* GL_EXT_texture_sRGB */
+
+#ifndef GL_EXT_texture_sRGB_decode
+#define GL_EXT_texture_sRGB_decode 1
+#define GL_TEXTURE_SRGB_DECODE_EXT        0x8A48
+#define GL_DECODE_EXT                     0x8A49
+#define GL_SKIP_DECODE_EXT                0x8A4A
+#endif /* GL_EXT_texture_sRGB_decode */
+
+#ifndef GL_EXT_texture_shared_exponent
+#define GL_EXT_texture_shared_exponent 1
+#define GL_RGB9_E5_EXT                    0x8C3D
+#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT   0x8C3E
+#define GL_TEXTURE_SHARED_SIZE_EXT        0x8C3F
+#endif /* GL_EXT_texture_shared_exponent */
+
+#ifndef GL_EXT_texture_snorm
+#define GL_EXT_texture_snorm 1
+#define GL_ALPHA_SNORM                    0x9010
+#define GL_LUMINANCE_SNORM                0x9011
+#define GL_LUMINANCE_ALPHA_SNORM          0x9012
+#define GL_INTENSITY_SNORM                0x9013
+#define GL_ALPHA8_SNORM                   0x9014
+#define GL_LUMINANCE8_SNORM               0x9015
+#define GL_LUMINANCE8_ALPHA8_SNORM        0x9016
+#define GL_INTENSITY8_SNORM               0x9017
+#define GL_ALPHA16_SNORM                  0x9018
+#define GL_LUMINANCE16_SNORM              0x9019
+#define GL_LUMINANCE16_ALPHA16_SNORM      0x901A
+#define GL_INTENSITY16_SNORM              0x901B
+#define GL_RED_SNORM                      0x8F90
+#define GL_RG_SNORM                       0x8F91
+#define GL_RGB_SNORM                      0x8F92
+#define GL_RGBA_SNORM                     0x8F93
+#endif /* GL_EXT_texture_snorm */
+
+#ifndef GL_EXT_texture_swizzle
+#define GL_EXT_texture_swizzle 1
+#define GL_TEXTURE_SWIZZLE_R_EXT          0x8E42
+#define GL_TEXTURE_SWIZZLE_G_EXT          0x8E43
+#define GL_TEXTURE_SWIZZLE_B_EXT          0x8E44
+#define GL_TEXTURE_SWIZZLE_A_EXT          0x8E45
+#define GL_TEXTURE_SWIZZLE_RGBA_EXT       0x8E46
+#endif /* GL_EXT_texture_swizzle */
+
+#ifndef GL_EXT_timer_query
+#define GL_EXT_timer_query 1
+#define GL_TIME_ELAPSED_EXT               0x88BF
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64 *params);
+GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+#endif /* GL_EXT_timer_query */
+
+#ifndef GL_EXT_transform_feedback
+#define GL_EXT_transform_feedback 1
+#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT  0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F
+#define GL_INTERLEAVED_ATTRIBS_EXT        0x8C8C
+#define GL_SEPARATE_ATTRIBS_EXT           0x8C8D
+#define GL_PRIMITIVES_GENERATED_EXT       0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88
+#define GL_RASTERIZER_DISCARD_EXT         0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F
+#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackEXT (void);
+GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar *const*varyings, GLenum bufferMode);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+#endif
+#endif /* GL_EXT_transform_feedback */
+
+#ifndef GL_EXT_vertex_array
+#define GL_EXT_vertex_array 1
+#define GL_VERTEX_ARRAY_EXT               0x8074
+#define GL_NORMAL_ARRAY_EXT               0x8075
+#define GL_COLOR_ARRAY_EXT                0x8076
+#define GL_INDEX_ARRAY_EXT                0x8077
+#define GL_TEXTURE_COORD_ARRAY_EXT        0x8078
+#define GL_EDGE_FLAG_ARRAY_EXT            0x8079
+#define GL_VERTEX_ARRAY_SIZE_EXT          0x807A
+#define GL_VERTEX_ARRAY_TYPE_EXT          0x807B
+#define GL_VERTEX_ARRAY_STRIDE_EXT        0x807C
+#define GL_VERTEX_ARRAY_COUNT_EXT         0x807D
+#define GL_NORMAL_ARRAY_TYPE_EXT          0x807E
+#define GL_NORMAL_ARRAY_STRIDE_EXT        0x807F
+#define GL_NORMAL_ARRAY_COUNT_EXT         0x8080
+#define GL_COLOR_ARRAY_SIZE_EXT           0x8081
+#define GL_COLOR_ARRAY_TYPE_EXT           0x8082
+#define GL_COLOR_ARRAY_STRIDE_EXT         0x8083
+#define GL_COLOR_ARRAY_COUNT_EXT          0x8084
+#define GL_INDEX_ARRAY_TYPE_EXT           0x8085
+#define GL_INDEX_ARRAY_STRIDE_EXT         0x8086
+#define GL_INDEX_ARRAY_COUNT_EXT          0x8087
+#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT   0x8088
+#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT   0x8089
+#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A
+#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT  0x808B
+#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT     0x808C
+#define GL_EDGE_FLAG_ARRAY_COUNT_EXT      0x808D
+#define GL_VERTEX_ARRAY_POINTER_EXT       0x808E
+#define GL_NORMAL_ARRAY_POINTER_EXT       0x808F
+#define GL_COLOR_ARRAY_POINTER_EXT        0x8090
+#define GL_INDEX_ARRAY_POINTER_EXT        0x8091
+#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092
+#define GL_EDGE_FLAG_ARRAY_POINTER_EXT    0x8093
+typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i);
+typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer);
+typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, void **params);
+typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glArrayElementEXT (GLint i);
+GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count);
+GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer);
+GLAPI void APIENTRY glGetPointervEXT (GLenum pname, void **params);
+GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_array */
+
+#ifndef GL_EXT_vertex_array_bgra
+#define GL_EXT_vertex_array_bgra 1
+#endif /* GL_EXT_vertex_array_bgra */
+
+#ifndef GL_EXT_vertex_attrib_64bit
+#define GL_EXT_vertex_attrib_64bit 1
+#define GL_DOUBLE_VEC2_EXT                0x8FFC
+#define GL_DOUBLE_VEC3_EXT                0x8FFD
+#define GL_DOUBLE_VEC4_EXT                0x8FFE
+#define GL_DOUBLE_MAT2_EXT                0x8F46
+#define GL_DOUBLE_MAT3_EXT                0x8F47
+#define GL_DOUBLE_MAT4_EXT                0x8F48
+#define GL_DOUBLE_MAT2x3_EXT              0x8F49
+#define GL_DOUBLE_MAT2x4_EXT              0x8F4A
+#define GL_DOUBLE_MAT3x2_EXT              0x8F4B
+#define GL_DOUBLE_MAT3x4_EXT              0x8F4C
+#define GL_DOUBLE_MAT4x2_EXT              0x8F4D
+#define GL_DOUBLE_MAT4x3_EXT              0x8F4E
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params);
+#endif
+#endif /* GL_EXT_vertex_attrib_64bit */
+
+#ifndef GL_EXT_vertex_shader
+#define GL_EXT_vertex_shader 1
+#define GL_VERTEX_SHADER_EXT              0x8780
+#define GL_VERTEX_SHADER_BINDING_EXT      0x8781
+#define GL_OP_INDEX_EXT                   0x8782
+#define GL_OP_NEGATE_EXT                  0x8783
+#define GL_OP_DOT3_EXT                    0x8784
+#define GL_OP_DOT4_EXT                    0x8785
+#define GL_OP_MUL_EXT                     0x8786
+#define GL_OP_ADD_EXT                     0x8787
+#define GL_OP_MADD_EXT                    0x8788
+#define GL_OP_FRAC_EXT                    0x8789
+#define GL_OP_MAX_EXT                     0x878A
+#define GL_OP_MIN_EXT                     0x878B
+#define GL_OP_SET_GE_EXT                  0x878C
+#define GL_OP_SET_LT_EXT                  0x878D
+#define GL_OP_CLAMP_EXT                   0x878E
+#define GL_OP_FLOOR_EXT                   0x878F
+#define GL_OP_ROUND_EXT                   0x8790
+#define GL_OP_EXP_BASE_2_EXT              0x8791
+#define GL_OP_LOG_BASE_2_EXT              0x8792
+#define GL_OP_POWER_EXT                   0x8793
+#define GL_OP_RECIP_EXT                   0x8794
+#define GL_OP_RECIP_SQRT_EXT              0x8795
+#define GL_OP_SUB_EXT                     0x8796
+#define GL_OP_CROSS_PRODUCT_EXT           0x8797
+#define GL_OP_MULTIPLY_MATRIX_EXT         0x8798
+#define GL_OP_MOV_EXT                     0x8799
+#define GL_OUTPUT_VERTEX_EXT              0x879A
+#define GL_OUTPUT_COLOR0_EXT              0x879B
+#define GL_OUTPUT_COLOR1_EXT              0x879C
+#define GL_OUTPUT_TEXTURE_COORD0_EXT      0x879D
+#define GL_OUTPUT_TEXTURE_COORD1_EXT      0x879E
+#define GL_OUTPUT_TEXTURE_COORD2_EXT      0x879F
+#define GL_OUTPUT_TEXTURE_COORD3_EXT      0x87A0
+#define GL_OUTPUT_TEXTURE_COORD4_EXT      0x87A1
+#define GL_OUTPUT_TEXTURE_COORD5_EXT      0x87A2
+#define GL_OUTPUT_TEXTURE_COORD6_EXT      0x87A3
+#define GL_OUTPUT_TEXTURE_COORD7_EXT      0x87A4
+#define GL_OUTPUT_TEXTURE_COORD8_EXT      0x87A5
+#define GL_OUTPUT_TEXTURE_COORD9_EXT      0x87A6
+#define GL_OUTPUT_TEXTURE_COORD10_EXT     0x87A7
+#define GL_OUTPUT_TEXTURE_COORD11_EXT     0x87A8
+#define GL_OUTPUT_TEXTURE_COORD12_EXT     0x87A9
+#define GL_OUTPUT_TEXTURE_COORD13_EXT     0x87AA
+#define GL_OUTPUT_TEXTURE_COORD14_EXT     0x87AB
+#define GL_OUTPUT_TEXTURE_COORD15_EXT     0x87AC
+#define GL_OUTPUT_TEXTURE_COORD16_EXT     0x87AD
+#define GL_OUTPUT_TEXTURE_COORD17_EXT     0x87AE
+#define GL_OUTPUT_TEXTURE_COORD18_EXT     0x87AF
+#define GL_OUTPUT_TEXTURE_COORD19_EXT     0x87B0
+#define GL_OUTPUT_TEXTURE_COORD20_EXT     0x87B1
+#define GL_OUTPUT_TEXTURE_COORD21_EXT     0x87B2
+#define GL_OUTPUT_TEXTURE_COORD22_EXT     0x87B3
+#define GL_OUTPUT_TEXTURE_COORD23_EXT     0x87B4
+#define GL_OUTPUT_TEXTURE_COORD24_EXT     0x87B5
+#define GL_OUTPUT_TEXTURE_COORD25_EXT     0x87B6
+#define GL_OUTPUT_TEXTURE_COORD26_EXT     0x87B7
+#define GL_OUTPUT_TEXTURE_COORD27_EXT     0x87B8
+#define GL_OUTPUT_TEXTURE_COORD28_EXT     0x87B9
+#define GL_OUTPUT_TEXTURE_COORD29_EXT     0x87BA
+#define GL_OUTPUT_TEXTURE_COORD30_EXT     0x87BB
+#define GL_OUTPUT_TEXTURE_COORD31_EXT     0x87BC
+#define GL_OUTPUT_FOG_EXT                 0x87BD
+#define GL_SCALAR_EXT                     0x87BE
+#define GL_VECTOR_EXT                     0x87BF
+#define GL_MATRIX_EXT                     0x87C0
+#define GL_VARIANT_EXT                    0x87C1
+#define GL_INVARIANT_EXT                  0x87C2
+#define GL_LOCAL_CONSTANT_EXT             0x87C3
+#define GL_LOCAL_EXT                      0x87C4
+#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5
+#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6
+#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7
+#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8
+#define GL_MAX_VERTEX_SHADER_LOCALS_EXT   0x87C9
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD
+#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE
+#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF
+#define GL_VERTEX_SHADER_VARIANTS_EXT     0x87D0
+#define GL_VERTEX_SHADER_INVARIANTS_EXT   0x87D1
+#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2
+#define GL_VERTEX_SHADER_LOCALS_EXT       0x87D3
+#define GL_VERTEX_SHADER_OPTIMIZED_EXT    0x87D4
+#define GL_X_EXT                          0x87D5
+#define GL_Y_EXT                          0x87D6
+#define GL_Z_EXT                          0x87D7
+#define GL_W_EXT                          0x87D8
+#define GL_NEGATIVE_X_EXT                 0x87D9
+#define GL_NEGATIVE_Y_EXT                 0x87DA
+#define GL_NEGATIVE_Z_EXT                 0x87DB
+#define GL_NEGATIVE_W_EXT                 0x87DC
+#define GL_ZERO_EXT                       0x87DD
+#define GL_ONE_EXT                        0x87DE
+#define GL_NEGATIVE_ONE_EXT               0x87DF
+#define GL_NORMALIZED_RANGE_EXT           0x87E0
+#define GL_FULL_RANGE_EXT                 0x87E1
+#define GL_CURRENT_VERTEX_EXT             0x87E2
+#define GL_MVP_MATRIX_EXT                 0x87E3
+#define GL_VARIANT_VALUE_EXT              0x87E4
+#define GL_VARIANT_DATATYPE_EXT           0x87E5
+#define GL_VARIANT_ARRAY_STRIDE_EXT       0x87E6
+#define GL_VARIANT_ARRAY_TYPE_EXT         0x87E7
+#define GL_VARIANT_ARRAY_EXT              0x87E8
+#define GL_VARIANT_ARRAY_POINTER_EXT      0x87E9
+#define GL_INVARIANT_VALUE_EXT            0x87EA
+#define GL_INVARIANT_DATATYPE_EXT         0x87EB
+#define GL_LOCAL_CONSTANT_VALUE_EXT       0x87EC
+#define GL_LOCAL_CONSTANT_DATATYPE_EXT    0x87ED
+typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void);
+typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range);
+typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1);
+typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num);
+typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const void *addr);
+typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr);
+typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr);
+typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr);
+typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr);
+typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr);
+typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr);
+typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr);
+typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const void *addr);
+typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id);
+typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value);
+typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value);
+typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap);
+typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, void **data);
+typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data);
+typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVertexShaderEXT (void);
+GLAPI void APIENTRY glEndVertexShaderEXT (void);
+GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id);
+GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range);
+GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id);
+GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1);
+GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2);
+GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3);
+GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW);
+GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num);
+GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components);
+GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const void *addr);
+GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr);
+GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr);
+GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr);
+GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr);
+GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr);
+GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr);
+GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr);
+GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr);
+GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const void *addr);
+GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id);
+GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id);
+GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value);
+GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value);
+GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value);
+GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value);
+GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value);
+GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap);
+GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, void **data);
+GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data);
+GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data);
+GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data);
+#endif
+#endif /* GL_EXT_vertex_shader */
+
+#ifndef GL_EXT_vertex_weighting
+#define GL_EXT_vertex_weighting 1
+#define GL_MODELVIEW0_STACK_DEPTH_EXT     0x0BA3
+#define GL_MODELVIEW1_STACK_DEPTH_EXT     0x8502
+#define GL_MODELVIEW0_MATRIX_EXT          0x0BA6
+#define GL_MODELVIEW1_MATRIX_EXT          0x8506
+#define GL_VERTEX_WEIGHTING_EXT           0x8509
+#define GL_MODELVIEW0_EXT                 0x1700
+#define GL_MODELVIEW1_EXT                 0x850A
+#define GL_CURRENT_VERTEX_WEIGHT_EXT      0x850B
+#define GL_VERTEX_WEIGHT_ARRAY_EXT        0x850C
+#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT   0x850D
+#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT   0x850E
+#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F
+#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight);
+GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight);
+GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei stride, const void *pointer);
+#endif
+#endif /* GL_EXT_vertex_weighting */
+
+#ifndef GL_EXT_x11_sync_object
+#define GL_EXT_x11_sync_object 1
+#define GL_SYNC_X11_FENCE_EXT             0x90E1
+typedef GLsync (APIENTRYP PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLsync APIENTRY glImportSyncEXT (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags);
+#endif
+#endif /* GL_EXT_x11_sync_object */
+
+#ifndef GL_GREMEDY_frame_terminator
+#define GL_GREMEDY_frame_terminator 1
+typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameTerminatorGREMEDY (void);
+#endif
+#endif /* GL_GREMEDY_frame_terminator */
+
+#ifndef GL_GREMEDY_string_marker
+#define GL_GREMEDY_string_marker 1
+typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void *string);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const void *string);
+#endif
+#endif /* GL_GREMEDY_string_marker */
+
+#ifndef GL_HP_convolution_border_modes
+#define GL_HP_convolution_border_modes 1
+#define GL_IGNORE_BORDER_HP               0x8150
+#define GL_CONSTANT_BORDER_HP             0x8151
+#define GL_REPLICATE_BORDER_HP            0x8153
+#define GL_CONVOLUTION_BORDER_COLOR_HP    0x8154
+#endif /* GL_HP_convolution_border_modes */
+
+#ifndef GL_HP_image_transform
+#define GL_HP_image_transform 1
+#define GL_IMAGE_SCALE_X_HP               0x8155
+#define GL_IMAGE_SCALE_Y_HP               0x8156
+#define GL_IMAGE_TRANSLATE_X_HP           0x8157
+#define GL_IMAGE_TRANSLATE_Y_HP           0x8158
+#define GL_IMAGE_ROTATE_ANGLE_HP          0x8159
+#define GL_IMAGE_ROTATE_ORIGIN_X_HP       0x815A
+#define GL_IMAGE_ROTATE_ORIGIN_Y_HP       0x815B
+#define GL_IMAGE_MAG_FILTER_HP            0x815C
+#define GL_IMAGE_MIN_FILTER_HP            0x815D
+#define GL_IMAGE_CUBIC_WEIGHT_HP          0x815E
+#define GL_CUBIC_HP                       0x815F
+#define GL_AVERAGE_HP                     0x8160
+#define GL_IMAGE_TRANSFORM_2D_HP          0x8161
+#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162
+#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param);
+GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_HP_image_transform */
+
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+#define GL_OCCLUSION_TEST_HP              0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP       0x8166
+#endif /* GL_HP_occlusion_test */
+
+#ifndef GL_HP_texture_lighting
+#define GL_HP_texture_lighting 1
+#define GL_TEXTURE_LIGHTING_MODE_HP       0x8167
+#define GL_TEXTURE_POST_SPECULAR_HP       0x8168
+#define GL_TEXTURE_PRE_SPECULAR_HP        0x8169
+#endif /* GL_HP_texture_lighting */
+
+#ifndef GL_IBM_cull_vertex
+#define GL_IBM_cull_vertex 1
+#define GL_CULL_VERTEX_IBM                103050
+#endif /* GL_IBM_cull_vertex */
+
+#ifndef GL_IBM_multimode_draw_arrays
+#define GL_IBM_multimode_draw_arrays 1
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, GLint modestride);
+#endif
+#endif /* GL_IBM_multimode_draw_arrays */
+
+#ifndef GL_IBM_rasterpos_clip
+#define GL_IBM_rasterpos_clip 1
+#define GL_RASTER_POSITION_UNCLIPPED_IBM  0x19262
+#endif /* GL_IBM_rasterpos_clip */
+
+#ifndef GL_IBM_static_data
+#define GL_IBM_static_data 1
+#define GL_ALL_STATIC_DATA_IBM            103060
+#define GL_STATIC_VERTEX_ARRAY_IBM        103061
+typedef void (APIENTRYP PFNGLFLUSHSTATICDATAIBMPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushStaticDataIBM (GLenum target);
+#endif
+#endif /* GL_IBM_static_data */
+
+#ifndef GL_IBM_texture_mirrored_repeat
+#define GL_IBM_texture_mirrored_repeat 1
+#define GL_MIRRORED_REPEAT_IBM            0x8370
+#endif /* GL_IBM_texture_mirrored_repeat */
+
+#ifndef GL_IBM_vertex_array_lists
+#define GL_IBM_vertex_array_lists 1
+#define GL_VERTEX_ARRAY_LIST_IBM          103070
+#define GL_NORMAL_ARRAY_LIST_IBM          103071
+#define GL_COLOR_ARRAY_LIST_IBM           103072
+#define GL_INDEX_ARRAY_LIST_IBM           103073
+#define GL_TEXTURE_COORD_ARRAY_LIST_IBM   103074
+#define GL_EDGE_FLAG_ARRAY_LIST_IBM       103075
+#define GL_FOG_COORDINATE_ARRAY_LIST_IBM  103076
+#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077
+#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM   103080
+#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM   103081
+#define GL_COLOR_ARRAY_LIST_STRIDE_IBM    103082
+#define GL_INDEX_ARRAY_LIST_STRIDE_IBM    103083
+#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084
+#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085
+#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086
+#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087
+typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean **pointer, GLint ptrstride);
+GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const void **pointer, GLint ptrstride);
+#endif
+#endif /* GL_IBM_vertex_array_lists */
+
+#ifndef GL_INGR_blend_func_separate
+#define GL_INGR_blend_func_separate 1
+typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+#endif
+#endif /* GL_INGR_blend_func_separate */
+
+#ifndef GL_INGR_color_clamp
+#define GL_INGR_color_clamp 1
+#define GL_RED_MIN_CLAMP_INGR             0x8560
+#define GL_GREEN_MIN_CLAMP_INGR           0x8561
+#define GL_BLUE_MIN_CLAMP_INGR            0x8562
+#define GL_ALPHA_MIN_CLAMP_INGR           0x8563
+#define GL_RED_MAX_CLAMP_INGR             0x8564
+#define GL_GREEN_MAX_CLAMP_INGR           0x8565
+#define GL_BLUE_MAX_CLAMP_INGR            0x8566
+#define GL_ALPHA_MAX_CLAMP_INGR           0x8567
+#endif /* GL_INGR_color_clamp */
+
+#ifndef GL_INGR_interlace_read
+#define GL_INGR_interlace_read 1
+#define GL_INTERLACE_READ_INGR            0x8568
+#endif /* GL_INGR_interlace_read */
+
+#ifndef GL_INTEL_fragment_shader_ordering
+#define GL_INTEL_fragment_shader_ordering 1
+#endif /* GL_INTEL_fragment_shader_ordering */
+
+#ifndef GL_INTEL_map_texture
+#define GL_INTEL_map_texture 1
+#define GL_TEXTURE_MEMORY_LAYOUT_INTEL    0x83FF
+#define GL_LAYOUT_DEFAULT_INTEL           0
+#define GL_LAYOUT_LINEAR_INTEL            1
+#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2
+typedef void (APIENTRYP PFNGLSYNCTEXTUREINTELPROC) (GLuint texture);
+typedef void (APIENTRYP PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level);
+typedef void *(APIENTRYP PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSyncTextureINTEL (GLuint texture);
+GLAPI void APIENTRY glUnmapTexture2DINTEL (GLuint texture, GLint level);
+GLAPI void *APIENTRY glMapTexture2DINTEL (GLuint texture, GLint level, GLbitfield access, GLint *stride, GLenum *layout);
+#endif
+#endif /* GL_INTEL_map_texture */
+
+#ifndef GL_INTEL_parallel_arrays
+#define GL_INTEL_parallel_arrays 1
+#define GL_PARALLEL_ARRAYS_INTEL          0x83F4
+#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5
+#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6
+#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7
+#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8
+typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const void **pointer);
+GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const void **pointer);
+GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const void **pointer);
+#endif
+#endif /* GL_INTEL_parallel_arrays */
+
+#ifndef GL_INTEL_performance_query
+#define GL_INTEL_performance_query 1
+#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x00000000
+#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x00000001
+#define GL_PERFQUERY_WAIT_INTEL           0x83FB
+#define GL_PERFQUERY_FLUSH_INTEL          0x83FA
+#define GL_PERFQUERY_DONOT_FLUSH_INTEL    0x83F9
+#define GL_PERFQUERY_COUNTER_EVENT_INTEL  0x94F0
+#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1
+#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2
+#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3
+#define GL_PERFQUERY_COUNTER_RAW_INTEL    0x94F4
+#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5
+#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8
+#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9
+#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA
+#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB
+#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC
+#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD
+#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE
+#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF
+#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500
+typedef void (APIENTRYP PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint *queryHandle);
+typedef void (APIENTRYP PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle);
+typedef void (APIENTRYP PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint *nextQueryId);
+typedef void (APIENTRYP PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+typedef void (APIENTRYP PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+typedef void (APIENTRYP PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar *queryName, GLuint *queryId);
+typedef void (APIENTRYP PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glCreatePerfQueryINTEL (GLuint queryId, GLuint *queryHandle);
+GLAPI void APIENTRY glDeletePerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glEndPerfQueryINTEL (GLuint queryHandle);
+GLAPI void APIENTRY glGetFirstPerfQueryIdINTEL (GLuint *queryId);
+GLAPI void APIENTRY glGetNextPerfQueryIdINTEL (GLuint queryId, GLuint *nextQueryId);
+GLAPI void APIENTRY glGetPerfCounterInfoINTEL (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar *counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue);
+GLAPI void APIENTRY glGetPerfQueryDataINTEL (GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid *data, GLuint *bytesWritten);
+GLAPI void APIENTRY glGetPerfQueryIdByNameINTEL (GLchar *queryName, GLuint *queryId);
+GLAPI void APIENTRY glGetPerfQueryInfoINTEL (GLuint queryId, GLuint queryNameLength, GLchar *queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask);
+#endif
+#endif /* GL_INTEL_performance_query */
+
+#ifndef GL_MESAX_texture_stack
+#define GL_MESAX_texture_stack 1
+#define GL_TEXTURE_1D_STACK_MESAX         0x8759
+#define GL_TEXTURE_2D_STACK_MESAX         0x875A
+#define GL_PROXY_TEXTURE_1D_STACK_MESAX   0x875B
+#define GL_PROXY_TEXTURE_2D_STACK_MESAX   0x875C
+#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D
+#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E
+#endif /* GL_MESAX_texture_stack */
+
+#ifndef GL_MESA_pack_invert
+#define GL_MESA_pack_invert 1
+#define GL_PACK_INVERT_MESA               0x8758
+#endif /* GL_MESA_pack_invert */
+
+#ifndef GL_MESA_resize_buffers
+#define GL_MESA_resize_buffers 1
+typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glResizeBuffersMESA (void);
+#endif
+#endif /* GL_MESA_resize_buffers */
+
+#ifndef GL_MESA_window_pos
+#define GL_MESA_window_pos 1
+typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y);
+GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y);
+GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y);
+GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y);
+GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v);
+GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v);
+GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v);
+GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v);
+GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v);
+#endif
+#endif /* GL_MESA_window_pos */
+
+#ifndef GL_MESA_ycbcr_texture
+#define GL_MESA_ycbcr_texture 1
+#define GL_UNSIGNED_SHORT_8_8_MESA        0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_MESA    0x85BB
+#define GL_YCBCR_MESA                     0x8757
+#endif /* GL_MESA_ycbcr_texture */
+
+#ifndef GL_NVX_conditional_render
+#define GL_NVX_conditional_render 1
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNVX (GLuint id);
+GLAPI void APIENTRY glEndConditionalRenderNVX (void);
+#endif
+#endif /* GL_NVX_conditional_render */
+
+#ifndef GL_NVX_gpu_memory_info
+#define GL_NVX_gpu_memory_info 1
+#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047
+#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048
+#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049
+#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A
+#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B
+#endif /* GL_NVX_gpu_memory_info */
+
+#ifndef GL_NV_bindless_multi_draw_indirect
+#define GL_NV_bindless_multi_draw_indirect 1
+typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMultiDrawArraysIndirectBindlessNV (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+GLAPI void APIENTRY glMultiDrawElementsIndirectBindlessNV (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount);
+#endif
+#endif /* GL_NV_bindless_multi_draw_indirect */
+
+#ifndef GL_NV_bindless_texture
+#define GL_NV_bindless_texture 1
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture);
+typedef GLuint64 (APIENTRYP PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef GLuint64 (APIENTRYP PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64 *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+typedef GLboolean (APIENTRYP PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle);
+typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint64 APIENTRY glGetTextureHandleNV (GLuint texture);
+GLAPI GLuint64 APIENTRY glGetTextureSamplerHandleNV (GLuint texture, GLuint sampler);
+GLAPI void APIENTRY glMakeTextureHandleResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glMakeTextureHandleNonResidentNV (GLuint64 handle);
+GLAPI GLuint64 APIENTRY glGetImageHandleNV (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format);
+GLAPI void APIENTRY glMakeImageHandleResidentNV (GLuint64 handle, GLenum access);
+GLAPI void APIENTRY glMakeImageHandleNonResidentNV (GLuint64 handle);
+GLAPI void APIENTRY glUniformHandleui64NV (GLint location, GLuint64 value);
+GLAPI void APIENTRY glUniformHandleui64vNV (GLint location, GLsizei count, const GLuint64 *value);
+GLAPI void APIENTRY glProgramUniformHandleui64NV (GLuint program, GLint location, GLuint64 value);
+GLAPI void APIENTRY glProgramUniformHandleui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64 *values);
+GLAPI GLboolean APIENTRY glIsTextureHandleResidentNV (GLuint64 handle);
+GLAPI GLboolean APIENTRY glIsImageHandleResidentNV (GLuint64 handle);
+#endif
+#endif /* GL_NV_bindless_texture */
+
+#ifndef GL_NV_blend_equation_advanced
+#define GL_NV_blend_equation_advanced 1
+#define GL_BLEND_OVERLAP_NV               0x9281
+#define GL_BLEND_PREMULTIPLIED_SRC_NV     0x9280
+#define GL_BLUE_NV                        0x1905
+#define GL_COLORBURN_NV                   0x929A
+#define GL_COLORDODGE_NV                  0x9299
+#define GL_CONJOINT_NV                    0x9284
+#define GL_CONTRAST_NV                    0x92A1
+#define GL_DARKEN_NV                      0x9297
+#define GL_DIFFERENCE_NV                  0x929E
+#define GL_DISJOINT_NV                    0x9283
+#define GL_DST_ATOP_NV                    0x928F
+#define GL_DST_IN_NV                      0x928B
+#define GL_DST_NV                         0x9287
+#define GL_DST_OUT_NV                     0x928D
+#define GL_DST_OVER_NV                    0x9289
+#define GL_EXCLUSION_NV                   0x92A0
+#define GL_GREEN_NV                       0x1904
+#define GL_HARDLIGHT_NV                   0x929B
+#define GL_HARDMIX_NV                     0x92A9
+#define GL_HSL_COLOR_NV                   0x92AF
+#define GL_HSL_HUE_NV                     0x92AD
+#define GL_HSL_LUMINOSITY_NV              0x92B0
+#define GL_HSL_SATURATION_NV              0x92AE
+#define GL_INVERT_OVG_NV                  0x92B4
+#define GL_INVERT_RGB_NV                  0x92A3
+#define GL_LIGHTEN_NV                     0x9298
+#define GL_LINEARBURN_NV                  0x92A5
+#define GL_LINEARDODGE_NV                 0x92A4
+#define GL_LINEARLIGHT_NV                 0x92A7
+#define GL_MINUS_CLAMPED_NV               0x92B3
+#define GL_MINUS_NV                       0x929F
+#define GL_MULTIPLY_NV                    0x9294
+#define GL_OVERLAY_NV                     0x9296
+#define GL_PINLIGHT_NV                    0x92A8
+#define GL_PLUS_CLAMPED_ALPHA_NV          0x92B2
+#define GL_PLUS_CLAMPED_NV                0x92B1
+#define GL_PLUS_DARKER_NV                 0x9292
+#define GL_PLUS_NV                        0x9291
+#define GL_RED_NV                         0x1903
+#define GL_SCREEN_NV                      0x9295
+#define GL_SOFTLIGHT_NV                   0x929C
+#define GL_SRC_ATOP_NV                    0x928E
+#define GL_SRC_IN_NV                      0x928A
+#define GL_SRC_NV                         0x9286
+#define GL_SRC_OUT_NV                     0x928C
+#define GL_SRC_OVER_NV                    0x9288
+#define GL_UNCORRELATED_NV                0x9282
+#define GL_VIVIDLIGHT_NV                  0x92A6
+#define GL_XOR_NV                         0x1506
+typedef void (APIENTRYP PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLBLENDBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBlendParameteriNV (GLenum pname, GLint value);
+GLAPI void APIENTRY glBlendBarrierNV (void);
+#endif
+#endif /* GL_NV_blend_equation_advanced */
+
+#ifndef GL_NV_blend_equation_advanced_coherent
+#define GL_NV_blend_equation_advanced_coherent 1
+#define GL_BLEND_ADVANCED_COHERENT_NV     0x9285
+#endif /* GL_NV_blend_equation_advanced_coherent */
+
+#ifndef GL_NV_blend_square
+#define GL_NV_blend_square 1
+#endif /* GL_NV_blend_square */
+
+#ifndef GL_NV_compute_program5
+#define GL_NV_compute_program5 1
+#define GL_COMPUTE_PROGRAM_NV             0x90FB
+#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC
+#endif /* GL_NV_compute_program5 */
+
+#ifndef GL_NV_conditional_render
+#define GL_NV_conditional_render 1
+#define GL_QUERY_WAIT_NV                  0x8E13
+#define GL_QUERY_NO_WAIT_NV               0x8E14
+#define GL_QUERY_BY_REGION_WAIT_NV        0x8E15
+#define GL_QUERY_BY_REGION_NO_WAIT_NV     0x8E16
+typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode);
+typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode);
+GLAPI void APIENTRY glEndConditionalRenderNV (void);
+#endif
+#endif /* GL_NV_conditional_render */
+
+#ifndef GL_NV_copy_depth_to_color
+#define GL_NV_copy_depth_to_color 1
+#define GL_DEPTH_STENCIL_TO_RGBA_NV       0x886E
+#define GL_DEPTH_STENCIL_TO_BGRA_NV       0x886F
+#endif /* GL_NV_copy_depth_to_color */
+
+#ifndef GL_NV_copy_image
+#define GL_NV_copy_image 1
+typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+#endif /* GL_NV_copy_image */
+
+#ifndef GL_NV_deep_texture3D
+#define GL_NV_deep_texture3D 1
+#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0
+#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV   0x90D1
+#endif /* GL_NV_deep_texture3D */
+
+#ifndef GL_NV_depth_buffer_float
+#define GL_NV_depth_buffer_float 1
+#define GL_DEPTH_COMPONENT32F_NV          0x8DAB
+#define GL_DEPTH32F_STENCIL8_NV           0x8DAC
+#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD
+#define GL_DEPTH_BUFFER_FLOAT_MODE_NV     0x8DAF
+typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar);
+typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth);
+typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar);
+GLAPI void APIENTRY glClearDepthdNV (GLdouble depth);
+GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax);
+#endif
+#endif /* GL_NV_depth_buffer_float */
+
+#ifndef GL_NV_depth_clamp
+#define GL_NV_depth_clamp 1
+#define GL_DEPTH_CLAMP_NV                 0x864F
+#endif /* GL_NV_depth_clamp */
+
+#ifndef GL_NV_draw_texture
+#define GL_NV_draw_texture 1
+typedef void (APIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawTextureNV (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1);
+#endif
+#endif /* GL_NV_draw_texture */
+
+#ifndef GL_NV_evaluators
+#define GL_NV_evaluators 1
+#define GL_EVAL_2D_NV                     0x86C0
+#define GL_EVAL_TRIANGULAR_2D_NV          0x86C1
+#define GL_MAP_TESSELLATION_NV            0x86C2
+#define GL_MAP_ATTRIB_U_ORDER_NV          0x86C3
+#define GL_MAP_ATTRIB_V_ORDER_NV          0x86C4
+#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5
+#define GL_EVAL_VERTEX_ATTRIB0_NV         0x86C6
+#define GL_EVAL_VERTEX_ATTRIB1_NV         0x86C7
+#define GL_EVAL_VERTEX_ATTRIB2_NV         0x86C8
+#define GL_EVAL_VERTEX_ATTRIB3_NV         0x86C9
+#define GL_EVAL_VERTEX_ATTRIB4_NV         0x86CA
+#define GL_EVAL_VERTEX_ATTRIB5_NV         0x86CB
+#define GL_EVAL_VERTEX_ATTRIB6_NV         0x86CC
+#define GL_EVAL_VERTEX_ATTRIB7_NV         0x86CD
+#define GL_EVAL_VERTEX_ATTRIB8_NV         0x86CE
+#define GL_EVAL_VERTEX_ATTRIB9_NV         0x86CF
+#define GL_EVAL_VERTEX_ATTRIB10_NV        0x86D0
+#define GL_EVAL_VERTEX_ATTRIB11_NV        0x86D1
+#define GL_EVAL_VERTEX_ATTRIB12_NV        0x86D2
+#define GL_EVAL_VERTEX_ATTRIB13_NV        0x86D3
+#define GL_EVAL_VERTEX_ATTRIB14_NV        0x86D4
+#define GL_EVAL_VERTEX_ATTRIB15_NV        0x86D5
+#define GL_MAX_MAP_TESSELLATION_NV        0x86D6
+#define GL_MAX_RATIONAL_EVAL_ORDER_NV     0x86D7
+typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points);
+GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points);
+GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode);
+#endif
+#endif /* GL_NV_evaluators */
+
+#ifndef GL_NV_explicit_multisample
+#define GL_NV_explicit_multisample 1
+#define GL_SAMPLE_POSITION_NV             0x8E50
+#define GL_SAMPLE_MASK_NV                 0x8E51
+#define GL_SAMPLE_MASK_VALUE_NV           0x8E52
+#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53
+#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54
+#define GL_TEXTURE_RENDERBUFFER_NV        0x8E55
+#define GL_SAMPLER_RENDERBUFFER_NV        0x8E56
+#define GL_INT_SAMPLER_RENDERBUFFER_NV    0x8E57
+#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58
+#define GL_MAX_SAMPLE_MASK_WORDS_NV       0x8E59
+typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val);
+typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask);
+typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val);
+GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask);
+GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer);
+#endif
+#endif /* GL_NV_explicit_multisample */
+
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#define GL_ALL_COMPLETED_NV               0x84F2
+#define GL_FENCE_STATUS_NV                0x84F3
+#define GL_FENCE_CONDITION_NV             0x84F4
+typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
+GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
+GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence);
+GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence);
+GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
+GLAPI void APIENTRY glFinishFenceNV (GLuint fence);
+GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
+#endif
+#endif /* GL_NV_fence */
+
+#ifndef GL_NV_float_buffer
+#define GL_NV_float_buffer 1
+#define GL_FLOAT_R_NV                     0x8880
+#define GL_FLOAT_RG_NV                    0x8881
+#define GL_FLOAT_RGB_NV                   0x8882
+#define GL_FLOAT_RGBA_NV                  0x8883
+#define GL_FLOAT_R16_NV                   0x8884
+#define GL_FLOAT_R32_NV                   0x8885
+#define GL_FLOAT_RG16_NV                  0x8886
+#define GL_FLOAT_RG32_NV                  0x8887
+#define GL_FLOAT_RGB16_NV                 0x8888
+#define GL_FLOAT_RGB32_NV                 0x8889
+#define GL_FLOAT_RGBA16_NV                0x888A
+#define GL_FLOAT_RGBA32_NV                0x888B
+#define GL_TEXTURE_FLOAT_COMPONENTS_NV    0x888C
+#define GL_FLOAT_CLEAR_COLOR_VALUE_NV     0x888D
+#define GL_FLOAT_RGBA_MODE_NV             0x888E
+#endif /* GL_NV_float_buffer */
+
+#ifndef GL_NV_fog_distance
+#define GL_NV_fog_distance 1
+#define GL_FOG_DISTANCE_MODE_NV           0x855A
+#define GL_EYE_RADIAL_NV                  0x855B
+#define GL_EYE_PLANE_ABSOLUTE_NV          0x855C
+#endif /* GL_NV_fog_distance */
+
+#ifndef GL_NV_fragment_program
+#define GL_NV_fragment_program 1
+#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868
+#define GL_FRAGMENT_PROGRAM_NV            0x8870
+#define GL_MAX_TEXTURE_COORDS_NV          0x8871
+#define GL_MAX_TEXTURE_IMAGE_UNITS_NV     0x8872
+#define GL_FRAGMENT_PROGRAM_BINDING_NV    0x8873
+#define GL_PROGRAM_ERROR_STRING_NV        0x8874
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v);
+GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v);
+GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
+GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
+#endif
+#endif /* GL_NV_fragment_program */
+
+#ifndef GL_NV_fragment_program2
+#define GL_NV_fragment_program2 1
+#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4
+#define GL_MAX_PROGRAM_CALL_DEPTH_NV      0x88F5
+#define GL_MAX_PROGRAM_IF_DEPTH_NV        0x88F6
+#define GL_MAX_PROGRAM_LOOP_DEPTH_NV      0x88F7
+#define GL_MAX_PROGRAM_LOOP_COUNT_NV      0x88F8
+#endif /* GL_NV_fragment_program2 */
+
+#ifndef GL_NV_fragment_program4
+#define GL_NV_fragment_program4 1
+#endif /* GL_NV_fragment_program4 */
+
+#ifndef GL_NV_fragment_program_option
+#define GL_NV_fragment_program_option 1
+#endif /* GL_NV_fragment_program_option */
+
+#ifndef GL_NV_framebuffer_multisample_coverage
+#define GL_NV_framebuffer_multisample_coverage 1
+#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
+#define GL_RENDERBUFFER_COLOR_SAMPLES_NV  0x8E10
+#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11
+#define GL_MULTISAMPLE_COVERAGE_MODES_NV  0x8E12
+typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+#endif /* GL_NV_framebuffer_multisample_coverage */
+
+#ifndef GL_NV_geometry_program4
+#define GL_NV_geometry_program4 1
+#define GL_GEOMETRY_PROGRAM_NV            0x8C26
+#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27
+#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28
+typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit);
+GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level);
+GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face);
+#endif
+#endif /* GL_NV_geometry_program4 */
+
+#ifndef GL_NV_geometry_shader4
+#define GL_NV_geometry_shader4 1
+#endif /* GL_NV_geometry_shader4 */
+
+#ifndef GL_NV_gpu_program4
+#define GL_NV_gpu_program4 1
+#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV    0x8904
+#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV    0x8905
+#define GL_PROGRAM_ATTRIB_COMPONENTS_NV   0x8906
+#define GL_PROGRAM_RESULT_COMPONENTS_NV   0x8907
+#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908
+#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909
+#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5
+#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params);
+typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params);
+GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params);
+GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params);
+#endif
+#endif /* GL_NV_gpu_program4 */
+
+#ifndef GL_NV_gpu_program5
+#define GL_NV_gpu_program5 1
+#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A
+#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B
+#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C
+#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D
+#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E
+#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F
+#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44
+#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV  0x8F45
+typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params);
+GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param);
+#endif
+#endif /* GL_NV_gpu_program5 */
+
+#ifndef GL_NV_gpu_program5_mem_extended
+#define GL_NV_gpu_program5_mem_extended 1
+#endif /* GL_NV_gpu_program5_mem_extended */
+
+#ifndef GL_NV_gpu_shader5
+#define GL_NV_gpu_shader5 1
+#endif /* GL_NV_gpu_shader5 */
+
+#ifndef GL_NV_half_float
+#define GL_NV_half_float 1
+typedef unsigned short GLhalfNV;
+#define GL_HALF_FLOAT_NV                  0x140B
+typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s);
+typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog);
+typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight);
+typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz);
+GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha);
+GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s);
+GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s);
+GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t);
+GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r);
+GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q);
+GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v);
+GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog);
+GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog);
+GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue);
+GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v);
+GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight);
+GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight);
+GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x);
+GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y);
+GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z);
+GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w);
+GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v);
+#endif
+#endif /* GL_NV_half_float */
+
+#ifndef GL_NV_light_max_exponent
+#define GL_NV_light_max_exponent 1
+#define GL_MAX_SHININESS_NV               0x8504
+#define GL_MAX_SPOT_EXPONENT_NV           0x8505
+#endif /* GL_NV_light_max_exponent */
+
+#ifndef GL_NV_multisample_coverage
+#define GL_NV_multisample_coverage 1
+#define GL_COLOR_SAMPLES_NV               0x8E20
+#endif /* GL_NV_multisample_coverage */
+
+#ifndef GL_NV_multisample_filter_hint
+#define GL_NV_multisample_filter_hint 1
+#define GL_MULTISAMPLE_FILTER_HINT_NV     0x8534
+#endif /* GL_NV_multisample_filter_hint */
+
+#ifndef GL_NV_occlusion_query
+#define GL_NV_occlusion_query 1
+#define GL_PIXEL_COUNTER_BITS_NV          0x8864
+#define GL_CURRENT_OCCLUSION_QUERY_ID_NV  0x8865
+#define GL_PIXEL_COUNT_NV                 0x8866
+#define GL_PIXEL_COUNT_AVAILABLE_NV       0x8867
+typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids);
+typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids);
+GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids);
+GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id);
+GLAPI void APIENTRY glEndOcclusionQueryNV (void);
+GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_NV_occlusion_query */
+
+#ifndef GL_NV_packed_depth_stencil
+#define GL_NV_packed_depth_stencil 1
+#define GL_DEPTH_STENCIL_NV               0x84F9
+#define GL_UNSIGNED_INT_24_8_NV           0x84FA
+#endif /* GL_NV_packed_depth_stencil */
+
+#ifndef GL_NV_parameter_buffer_object
+#define GL_NV_parameter_buffer_object 1
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0
+#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1
+#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2
+#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3
+#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params);
+GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params);
+GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params);
+#endif
+#endif /* GL_NV_parameter_buffer_object */
+
+#ifndef GL_NV_parameter_buffer_object2
+#define GL_NV_parameter_buffer_object2 1
+#endif /* GL_NV_parameter_buffer_object2 */
+
+#ifndef GL_NV_path_rendering
+#define GL_NV_path_rendering 1
+#define GL_PATH_FORMAT_SVG_NV             0x9070
+#define GL_PATH_FORMAT_PS_NV              0x9071
+#define GL_STANDARD_FONT_NAME_NV          0x9072
+#define GL_SYSTEM_FONT_NAME_NV            0x9073
+#define GL_FILE_NAME_NV                   0x9074
+#define GL_PATH_STROKE_WIDTH_NV           0x9075
+#define GL_PATH_END_CAPS_NV               0x9076
+#define GL_PATH_INITIAL_END_CAP_NV        0x9077
+#define GL_PATH_TERMINAL_END_CAP_NV       0x9078
+#define GL_PATH_JOIN_STYLE_NV             0x9079
+#define GL_PATH_MITER_LIMIT_NV            0x907A
+#define GL_PATH_DASH_CAPS_NV              0x907B
+#define GL_PATH_INITIAL_DASH_CAP_NV       0x907C
+#define GL_PATH_TERMINAL_DASH_CAP_NV      0x907D
+#define GL_PATH_DASH_OFFSET_NV            0x907E
+#define GL_PATH_CLIENT_LENGTH_NV          0x907F
+#define GL_PATH_FILL_MODE_NV              0x9080
+#define GL_PATH_FILL_MASK_NV              0x9081
+#define GL_PATH_FILL_COVER_MODE_NV        0x9082
+#define GL_PATH_STROKE_COVER_MODE_NV      0x9083
+#define GL_PATH_STROKE_MASK_NV            0x9084
+#define GL_COUNT_UP_NV                    0x9088
+#define GL_COUNT_DOWN_NV                  0x9089
+#define GL_PATH_OBJECT_BOUNDING_BOX_NV    0x908A
+#define GL_CONVEX_HULL_NV                 0x908B
+#define GL_BOUNDING_BOX_NV                0x908D
+#define GL_TRANSLATE_X_NV                 0x908E
+#define GL_TRANSLATE_Y_NV                 0x908F
+#define GL_TRANSLATE_2D_NV                0x9090
+#define GL_TRANSLATE_3D_NV                0x9091
+#define GL_AFFINE_2D_NV                   0x9092
+#define GL_AFFINE_3D_NV                   0x9094
+#define GL_TRANSPOSE_AFFINE_2D_NV         0x9096
+#define GL_TRANSPOSE_AFFINE_3D_NV         0x9098
+#define GL_UTF8_NV                        0x909A
+#define GL_UTF16_NV                       0x909B
+#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C
+#define GL_PATH_COMMAND_COUNT_NV          0x909D
+#define GL_PATH_COORD_COUNT_NV            0x909E
+#define GL_PATH_DASH_ARRAY_COUNT_NV       0x909F
+#define GL_PATH_COMPUTED_LENGTH_NV        0x90A0
+#define GL_PATH_FILL_BOUNDING_BOX_NV      0x90A1
+#define GL_PATH_STROKE_BOUNDING_BOX_NV    0x90A2
+#define GL_SQUARE_NV                      0x90A3
+#define GL_ROUND_NV                       0x90A4
+#define GL_TRIANGULAR_NV                  0x90A5
+#define GL_BEVEL_NV                       0x90A6
+#define GL_MITER_REVERT_NV                0x90A7
+#define GL_MITER_TRUNCATE_NV              0x90A8
+#define GL_SKIP_MISSING_GLYPH_NV          0x90A9
+#define GL_USE_MISSING_GLYPH_NV           0x90AA
+#define GL_PATH_ERROR_POSITION_NV         0x90AB
+#define GL_PATH_FOG_GEN_MODE_NV           0x90AC
+#define GL_ACCUM_ADJACENT_PAIRS_NV        0x90AD
+#define GL_ADJACENT_PAIRS_NV              0x90AE
+#define GL_FIRST_TO_REST_NV               0x90AF
+#define GL_PATH_GEN_MODE_NV               0x90B0
+#define GL_PATH_GEN_COEFF_NV              0x90B1
+#define GL_PATH_GEN_COLOR_FORMAT_NV       0x90B2
+#define GL_PATH_GEN_COMPONENTS_NV         0x90B3
+#define GL_PATH_STENCIL_FUNC_NV           0x90B7
+#define GL_PATH_STENCIL_REF_NV            0x90B8
+#define GL_PATH_STENCIL_VALUE_MASK_NV     0x90B9
+#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD
+#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE
+#define GL_PATH_COVER_DEPTH_FUNC_NV       0x90BF
+#define GL_PATH_DASH_OFFSET_RESET_NV      0x90B4
+#define GL_MOVE_TO_RESETS_NV              0x90B5
+#define GL_MOVE_TO_CONTINUES_NV           0x90B6
+#define GL_CLOSE_PATH_NV                  0x00
+#define GL_MOVE_TO_NV                     0x02
+#define GL_RELATIVE_MOVE_TO_NV            0x03
+#define GL_LINE_TO_NV                     0x04
+#define GL_RELATIVE_LINE_TO_NV            0x05
+#define GL_HORIZONTAL_LINE_TO_NV          0x06
+#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07
+#define GL_VERTICAL_LINE_TO_NV            0x08
+#define GL_RELATIVE_VERTICAL_LINE_TO_NV   0x09
+#define GL_QUADRATIC_CURVE_TO_NV          0x0A
+#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B
+#define GL_CUBIC_CURVE_TO_NV              0x0C
+#define GL_RELATIVE_CUBIC_CURVE_TO_NV     0x0D
+#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV   0x0E
+#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F
+#define GL_SMOOTH_CUBIC_CURVE_TO_NV       0x10
+#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11
+#define GL_SMALL_CCW_ARC_TO_NV            0x12
+#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV   0x13
+#define GL_SMALL_CW_ARC_TO_NV             0x14
+#define GL_RELATIVE_SMALL_CW_ARC_TO_NV    0x15
+#define GL_LARGE_CCW_ARC_TO_NV            0x16
+#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV   0x17
+#define GL_LARGE_CW_ARC_TO_NV             0x18
+#define GL_RELATIVE_LARGE_CW_ARC_TO_NV    0x19
+#define GL_RESTART_PATH_NV                0xF0
+#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV    0xF2
+#define GL_DUP_LAST_CUBIC_CURVE_TO_NV     0xF4
+#define GL_RECT_NV                        0xF6
+#define GL_CIRCULAR_CCW_ARC_TO_NV         0xF8
+#define GL_CIRCULAR_CW_ARC_TO_NV          0xFA
+#define GL_CIRCULAR_TANGENT_ARC_TO_NV     0xFC
+#define GL_ARC_TO_NV                      0xFE
+#define GL_RELATIVE_ARC_TO_NV             0xFF
+#define GL_BOLD_BIT_NV                    0x01
+#define GL_ITALIC_BIT_NV                  0x02
+#define GL_GLYPH_WIDTH_BIT_NV             0x01
+#define GL_GLYPH_HEIGHT_BIT_NV            0x02
+#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04
+#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08
+#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10
+#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20
+#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40
+#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80
+#define GL_GLYPH_HAS_KERNING_BIT_NV       0x100
+#define GL_FONT_X_MIN_BOUNDS_BIT_NV       0x00010000
+#define GL_FONT_Y_MIN_BOUNDS_BIT_NV       0x00020000
+#define GL_FONT_X_MAX_BOUNDS_BIT_NV       0x00040000
+#define GL_FONT_Y_MAX_BOUNDS_BIT_NV       0x00080000
+#define GL_FONT_UNITS_PER_EM_BIT_NV       0x00100000
+#define GL_FONT_ASCENDER_BIT_NV           0x00200000
+#define GL_FONT_DESCENDER_BIT_NV          0x00400000
+#define GL_FONT_HEIGHT_BIT_NV             0x00800000
+#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV  0x01000000
+#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000
+#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000
+#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000
+#define GL_FONT_HAS_KERNING_BIT_NV        0x10000000
+#define GL_PRIMARY_COLOR_NV               0x852C
+#define GL_SECONDARY_COLOR_NV             0x852D
+typedef GLuint (APIENTRYP PFNGLGENPATHSNVPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISPATHNVPROC) (GLuint path);
+typedef void (APIENTRYP PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+typedef void (APIENTRYP PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString);
+typedef void (APIENTRYP PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+typedef void (APIENTRYP PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+typedef void (APIENTRYP PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath);
+typedef void (APIENTRYP PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+typedef void (APIENTRYP PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat *value);
+typedef void (APIENTRYP PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value);
+typedef void (APIENTRYP PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask);
+typedef void (APIENTRYP PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask);
+typedef void (APIENTRYP PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum func);
+typedef void (APIENTRYP PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+typedef void (APIENTRYP PFNGLPATHFOGGENNVPROC) (GLenum genMode);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode);
+typedef void (APIENTRYP PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte *commands);
+typedef void (APIENTRYP PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat *coords);
+typedef void (APIENTRYP PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat *dashArray);
+typedef void (APIENTRYP PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+typedef void (APIENTRYP PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint *value);
+typedef void (APIENTRYP PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat *value);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+typedef GLboolean (APIENTRYP PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y);
+typedef GLfloat (APIENTRYP PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments);
+typedef GLboolean (APIENTRYP PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLuint APIENTRY glGenPathsNV (GLsizei range);
+GLAPI void APIENTRY glDeletePathsNV (GLuint path, GLsizei range);
+GLAPI GLboolean APIENTRY glIsPathNV (GLuint path);
+GLAPI void APIENTRY glPathCommandsNV (GLuint path, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathCoordsNV (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCommandsNV (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte *commands, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathSubCoordsNV (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords);
+GLAPI void APIENTRY glPathStringNV (GLuint path, GLenum format, GLsizei length, const void *pathString);
+GLAPI void APIENTRY glPathGlyphsNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void *charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glPathGlyphRangeNV (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale);
+GLAPI void APIENTRY glWeightPathsNV (GLuint resultPath, GLsizei numPaths, const GLuint *paths, const GLfloat *weights);
+GLAPI void APIENTRY glCopyPathNV (GLuint resultPath, GLuint srcPath);
+GLAPI void APIENTRY glInterpolatePathsNV (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight);
+GLAPI void APIENTRY glTransformPathNV (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathParameterivNV (GLuint path, GLenum pname, const GLint *value);
+GLAPI void APIENTRY glPathParameteriNV (GLuint path, GLenum pname, GLint value);
+GLAPI void APIENTRY glPathParameterfvNV (GLuint path, GLenum pname, const GLfloat *value);
+GLAPI void APIENTRY glPathParameterfNV (GLuint path, GLenum pname, GLfloat value);
+GLAPI void APIENTRY glPathDashArrayNV (GLuint path, GLsizei dashCount, const GLfloat *dashArray);
+GLAPI void APIENTRY glPathStencilFuncNV (GLenum func, GLint ref, GLuint mask);
+GLAPI void APIENTRY glPathStencilDepthOffsetNV (GLfloat factor, GLfloat units);
+GLAPI void APIENTRY glStencilFillPathNV (GLuint path, GLenum fillMode, GLuint mask);
+GLAPI void APIENTRY glStencilStrokePathNV (GLuint path, GLint reference, GLuint mask);
+GLAPI void APIENTRY glStencilFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glStencilStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glPathCoverDepthFuncNV (GLenum func);
+GLAPI void APIENTRY glPathColorGenNV (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathTexGenNV (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat *coeffs);
+GLAPI void APIENTRY glPathFogGenNV (GLenum genMode);
+GLAPI void APIENTRY glCoverFillPathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverStrokePathNV (GLuint path, GLenum coverMode);
+GLAPI void APIENTRY glCoverFillPathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glCoverStrokePathInstancedNV (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues);
+GLAPI void APIENTRY glGetPathParameterivNV (GLuint path, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathParameterfvNV (GLuint path, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathCommandsNV (GLuint path, GLubyte *commands);
+GLAPI void APIENTRY glGetPathCoordsNV (GLuint path, GLfloat *coords);
+GLAPI void APIENTRY glGetPathDashArrayNV (GLuint path, GLfloat *dashArray);
+GLAPI void APIENTRY glGetPathMetricsNV (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathMetricRangeNV (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat *metrics);
+GLAPI void APIENTRY glGetPathSpacingNV (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing);
+GLAPI void APIENTRY glGetPathColorGenivNV (GLenum color, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathColorGenfvNV (GLenum color, GLenum pname, GLfloat *value);
+GLAPI void APIENTRY glGetPathTexGenivNV (GLenum texCoordSet, GLenum pname, GLint *value);
+GLAPI void APIENTRY glGetPathTexGenfvNV (GLenum texCoordSet, GLenum pname, GLfloat *value);
+GLAPI GLboolean APIENTRY glIsPointInFillPathNV (GLuint path, GLuint mask, GLfloat x, GLfloat y);
+GLAPI GLboolean APIENTRY glIsPointInStrokePathNV (GLuint path, GLfloat x, GLfloat y);
+GLAPI GLfloat APIENTRY glGetPathLengthNV (GLuint path, GLsizei startSegment, GLsizei numSegments);
+GLAPI GLboolean APIENTRY glPointAlongPathNV (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat *x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY);
+#endif
+#endif /* GL_NV_path_rendering */
+
+#ifndef GL_NV_pixel_data_range
+#define GL_NV_pixel_data_range 1
+#define GL_WRITE_PIXEL_DATA_RANGE_NV      0x8878
+#define GL_READ_PIXEL_DATA_RANGE_NV       0x8879
+#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A
+#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B
+#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C
+#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D
+typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, const void *pointer);
+typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, const void *pointer);
+GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target);
+#endif
+#endif /* GL_NV_pixel_data_range */
+
+#ifndef GL_NV_point_sprite
+#define GL_NV_point_sprite 1
+#define GL_POINT_SPRITE_NV                0x8861
+#define GL_COORD_REPLACE_NV               0x8862
+#define GL_POINT_SPRITE_R_MODE_NV         0x8863
+typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_NV_point_sprite */
+
+#ifndef GL_NV_present_video
+#define GL_NV_present_video 1
+#define GL_FRAME_NV                       0x8E26
+#define GL_FIELDS_NV                      0x8E27
+#define GL_CURRENT_TIME_NV                0x8E28
+#define GL_NUM_FILL_STREAMS_NV            0x8E29
+#define GL_PRESENT_TIME_NV                0x8E2A
+#define GL_PRESENT_DURATION_NV            0x8E2B
+typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1);
+GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3);
+GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params);
+GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params);
+#endif
+#endif /* GL_NV_present_video */
+
+#ifndef GL_NV_primitive_restart
+#define GL_NV_primitive_restart 1
+#define GL_PRIMITIVE_RESTART_NV           0x8558
+#define GL_PRIMITIVE_RESTART_INDEX_NV     0x8559
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void);
+typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPrimitiveRestartNV (void);
+GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index);
+#endif
+#endif /* GL_NV_primitive_restart */
+
+#ifndef GL_NV_register_combiners
+#define GL_NV_register_combiners 1
+#define GL_REGISTER_COMBINERS_NV          0x8522
+#define GL_VARIABLE_A_NV                  0x8523
+#define GL_VARIABLE_B_NV                  0x8524
+#define GL_VARIABLE_C_NV                  0x8525
+#define GL_VARIABLE_D_NV                  0x8526
+#define GL_VARIABLE_E_NV                  0x8527
+#define GL_VARIABLE_F_NV                  0x8528
+#define GL_VARIABLE_G_NV                  0x8529
+#define GL_CONSTANT_COLOR0_NV             0x852A
+#define GL_CONSTANT_COLOR1_NV             0x852B
+#define GL_SPARE0_NV                      0x852E
+#define GL_SPARE1_NV                      0x852F
+#define GL_DISCARD_NV                     0x8530
+#define GL_E_TIMES_F_NV                   0x8531
+#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532
+#define GL_UNSIGNED_IDENTITY_NV           0x8536
+#define GL_UNSIGNED_INVERT_NV             0x8537
+#define GL_EXPAND_NORMAL_NV               0x8538
+#define GL_EXPAND_NEGATE_NV               0x8539
+#define GL_HALF_BIAS_NORMAL_NV            0x853A
+#define GL_HALF_BIAS_NEGATE_NV            0x853B
+#define GL_SIGNED_IDENTITY_NV             0x853C
+#define GL_SIGNED_NEGATE_NV               0x853D
+#define GL_SCALE_BY_TWO_NV                0x853E
+#define GL_SCALE_BY_FOUR_NV               0x853F
+#define GL_SCALE_BY_ONE_HALF_NV           0x8540
+#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV   0x8541
+#define GL_COMBINER_INPUT_NV              0x8542
+#define GL_COMBINER_MAPPING_NV            0x8543
+#define GL_COMBINER_COMPONENT_USAGE_NV    0x8544
+#define GL_COMBINER_AB_DOT_PRODUCT_NV     0x8545
+#define GL_COMBINER_CD_DOT_PRODUCT_NV     0x8546
+#define GL_COMBINER_MUX_SUM_NV            0x8547
+#define GL_COMBINER_SCALE_NV              0x8548
+#define GL_COMBINER_BIAS_NV               0x8549
+#define GL_COMBINER_AB_OUTPUT_NV          0x854A
+#define GL_COMBINER_CD_OUTPUT_NV          0x854B
+#define GL_COMBINER_SUM_OUTPUT_NV         0x854C
+#define GL_MAX_GENERAL_COMBINERS_NV       0x854D
+#define GL_NUM_GENERAL_COMBINERS_NV       0x854E
+#define GL_COLOR_SUM_CLAMP_NV             0x854F
+#define GL_COMBINER0_NV                   0x8550
+#define GL_COMBINER1_NV                   0x8551
+#define GL_COMBINER2_NV                   0x8552
+#define GL_COMBINER3_NV                   0x8553
+#define GL_COMBINER4_NV                   0x8554
+#define GL_COMBINER5_NV                   0x8555
+#define GL_COMBINER6_NV                   0x8556
+#define GL_COMBINER7_NV                   0x8557
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param);
+GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum);
+GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage);
+GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params);
+#endif
+#endif /* GL_NV_register_combiners */
+
+#ifndef GL_NV_register_combiners2
+#define GL_NV_register_combiners2 1
+#define GL_PER_STAGE_CONSTANTS_NV         0x8535
+typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_NV_register_combiners2 */
+
+#ifndef GL_NV_shader_atomic_counters
+#define GL_NV_shader_atomic_counters 1
+#endif /* GL_NV_shader_atomic_counters */
+
+#ifndef GL_NV_shader_atomic_float
+#define GL_NV_shader_atomic_float 1
+#endif /* GL_NV_shader_atomic_float */
+
+#ifndef GL_NV_shader_buffer_load
+#define GL_NV_shader_buffer_load 1
+#define GL_BUFFER_GPU_ADDRESS_NV          0x8F1D
+#define GL_GPU_ADDRESS_NV                 0x8F34
+#define GL_MAX_SHADER_BUFFER_ADDRESS_NV   0x8F35
+typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access);
+typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target);
+typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access);
+typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer);
+typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer);
+typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result);
+typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value);
+typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access);
+GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target);
+GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target);
+GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access);
+GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer);
+GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer);
+GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result);
+GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value);
+GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value);
+GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value);
+#endif
+#endif /* GL_NV_shader_buffer_load */
+
+#ifndef GL_NV_shader_buffer_store
+#define GL_NV_shader_buffer_store 1
+#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010
+#endif /* GL_NV_shader_buffer_store */
+
+#ifndef GL_NV_shader_storage_buffer_object
+#define GL_NV_shader_storage_buffer_object 1
+#endif /* GL_NV_shader_storage_buffer_object */
+
+#ifndef GL_NV_shader_thread_group
+#define GL_NV_shader_thread_group 1
+#define GL_WARP_SIZE_NV                   0x9339
+#define GL_WARPS_PER_SM_NV                0x933A
+#define GL_SM_COUNT_NV                    0x933B
+#endif /* GL_NV_shader_thread_group */
+
+#ifndef GL_NV_shader_thread_shuffle
+#define GL_NV_shader_thread_shuffle 1
+#endif /* GL_NV_shader_thread_shuffle */
+
+#ifndef GL_NV_tessellation_program5
+#define GL_NV_tessellation_program5 1
+#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV   0x86D8
+#define GL_TESS_CONTROL_PROGRAM_NV        0x891E
+#define GL_TESS_EVALUATION_PROGRAM_NV     0x891F
+#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74
+#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75
+#endif /* GL_NV_tessellation_program5 */
+
+#ifndef GL_NV_texgen_emboss
+#define GL_NV_texgen_emboss 1
+#define GL_EMBOSS_LIGHT_NV                0x855D
+#define GL_EMBOSS_CONSTANT_NV             0x855E
+#define GL_EMBOSS_MAP_NV                  0x855F
+#endif /* GL_NV_texgen_emboss */
+
+#ifndef GL_NV_texgen_reflection
+#define GL_NV_texgen_reflection 1
+#define GL_NORMAL_MAP_NV                  0x8511
+#define GL_REFLECTION_MAP_NV              0x8512
+#endif /* GL_NV_texgen_reflection */
+
+#ifndef GL_NV_texture_barrier
+#define GL_NV_texture_barrier 1
+typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureBarrierNV (void);
+#endif
+#endif /* GL_NV_texture_barrier */
+
+#ifndef GL_NV_texture_compression_vtc
+#define GL_NV_texture_compression_vtc 1
+#endif /* GL_NV_texture_compression_vtc */
+
+#ifndef GL_NV_texture_env_combine4
+#define GL_NV_texture_env_combine4 1
+#define GL_COMBINE4_NV                    0x8503
+#define GL_SOURCE3_RGB_NV                 0x8583
+#define GL_SOURCE3_ALPHA_NV               0x858B
+#define GL_OPERAND3_RGB_NV                0x8593
+#define GL_OPERAND3_ALPHA_NV              0x859B
+#endif /* GL_NV_texture_env_combine4 */
+
+#ifndef GL_NV_texture_expand_normal
+#define GL_NV_texture_expand_normal 1
+#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F
+#endif /* GL_NV_texture_expand_normal */
+
+#ifndef GL_NV_texture_multisample
+#define GL_NV_texture_multisample 1
+#define GL_TEXTURE_COVERAGE_SAMPLES_NV    0x9045
+#define GL_TEXTURE_COLOR_SAMPLES_NV       0x9046
+typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage2DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTexImage3DMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleNV (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage2DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations);
+GLAPI void APIENTRY glTextureImage3DMultisampleCoverageNV (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations);
+#endif
+#endif /* GL_NV_texture_multisample */
+
+#ifndef GL_NV_texture_rectangle
+#define GL_NV_texture_rectangle 1
+#define GL_TEXTURE_RECTANGLE_NV           0x84F5
+#define GL_TEXTURE_BINDING_RECTANGLE_NV   0x84F6
+#define GL_PROXY_TEXTURE_RECTANGLE_NV     0x84F7
+#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV  0x84F8
+#endif /* GL_NV_texture_rectangle */
+
+#ifndef GL_NV_texture_shader
+#define GL_NV_texture_shader 1
+#define GL_OFFSET_TEXTURE_RECTANGLE_NV    0x864C
+#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D
+#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E
+#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9
+#define GL_UNSIGNED_INT_S8_S8_8_8_NV      0x86DA
+#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV  0x86DB
+#define GL_DSDT_MAG_INTENSITY_NV          0x86DC
+#define GL_SHADER_CONSISTENT_NV           0x86DD
+#define GL_TEXTURE_SHADER_NV              0x86DE
+#define GL_SHADER_OPERATION_NV            0x86DF
+#define GL_CULL_MODES_NV                  0x86E0
+#define GL_OFFSET_TEXTURE_MATRIX_NV       0x86E1
+#define GL_OFFSET_TEXTURE_SCALE_NV        0x86E2
+#define GL_OFFSET_TEXTURE_BIAS_NV         0x86E3
+#define GL_OFFSET_TEXTURE_2D_MATRIX_NV    0x86E1
+#define GL_OFFSET_TEXTURE_2D_SCALE_NV     0x86E2
+#define GL_OFFSET_TEXTURE_2D_BIAS_NV      0x86E3
+#define GL_PREVIOUS_TEXTURE_INPUT_NV      0x86E4
+#define GL_CONST_EYE_NV                   0x86E5
+#define GL_PASS_THROUGH_NV                0x86E6
+#define GL_CULL_FRAGMENT_NV               0x86E7
+#define GL_OFFSET_TEXTURE_2D_NV           0x86E8
+#define GL_DEPENDENT_AR_TEXTURE_2D_NV     0x86E9
+#define GL_DEPENDENT_GB_TEXTURE_2D_NV     0x86EA
+#define GL_DOT_PRODUCT_NV                 0x86EC
+#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV   0x86ED
+#define GL_DOT_PRODUCT_TEXTURE_2D_NV      0x86EE
+#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0
+#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1
+#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2
+#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3
+#define GL_HILO_NV                        0x86F4
+#define GL_DSDT_NV                        0x86F5
+#define GL_DSDT_MAG_NV                    0x86F6
+#define GL_DSDT_MAG_VIB_NV                0x86F7
+#define GL_HILO16_NV                      0x86F8
+#define GL_SIGNED_HILO_NV                 0x86F9
+#define GL_SIGNED_HILO16_NV               0x86FA
+#define GL_SIGNED_RGBA_NV                 0x86FB
+#define GL_SIGNED_RGBA8_NV                0x86FC
+#define GL_SIGNED_RGB_NV                  0x86FE
+#define GL_SIGNED_RGB8_NV                 0x86FF
+#define GL_SIGNED_LUMINANCE_NV            0x8701
+#define GL_SIGNED_LUMINANCE8_NV           0x8702
+#define GL_SIGNED_LUMINANCE_ALPHA_NV      0x8703
+#define GL_SIGNED_LUMINANCE8_ALPHA8_NV    0x8704
+#define GL_SIGNED_ALPHA_NV                0x8705
+#define GL_SIGNED_ALPHA8_NV               0x8706
+#define GL_SIGNED_INTENSITY_NV            0x8707
+#define GL_SIGNED_INTENSITY8_NV           0x8708
+#define GL_DSDT8_NV                       0x8709
+#define GL_DSDT8_MAG8_NV                  0x870A
+#define GL_DSDT8_MAG8_INTENSITY8_NV       0x870B
+#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV   0x870C
+#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D
+#define GL_HI_SCALE_NV                    0x870E
+#define GL_LO_SCALE_NV                    0x870F
+#define GL_DS_SCALE_NV                    0x8710
+#define GL_DT_SCALE_NV                    0x8711
+#define GL_MAGNITUDE_SCALE_NV             0x8712
+#define GL_VIBRANCE_SCALE_NV              0x8713
+#define GL_HI_BIAS_NV                     0x8714
+#define GL_LO_BIAS_NV                     0x8715
+#define GL_DS_BIAS_NV                     0x8716
+#define GL_DT_BIAS_NV                     0x8717
+#define GL_MAGNITUDE_BIAS_NV              0x8718
+#define GL_VIBRANCE_BIAS_NV               0x8719
+#define GL_TEXTURE_BORDER_VALUES_NV       0x871A
+#define GL_TEXTURE_HI_SIZE_NV             0x871B
+#define GL_TEXTURE_LO_SIZE_NV             0x871C
+#define GL_TEXTURE_DS_SIZE_NV             0x871D
+#define GL_TEXTURE_DT_SIZE_NV             0x871E
+#define GL_TEXTURE_MAG_SIZE_NV            0x871F
+#endif /* GL_NV_texture_shader */
+
+#ifndef GL_NV_texture_shader2
+#define GL_NV_texture_shader2 1
+#define GL_DOT_PRODUCT_TEXTURE_3D_NV      0x86EF
+#endif /* GL_NV_texture_shader2 */
+
+#ifndef GL_NV_texture_shader3
+#define GL_NV_texture_shader3 1
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850
+#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852
+#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853
+#define GL_OFFSET_HILO_TEXTURE_2D_NV      0x8854
+#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856
+#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857
+#define GL_DEPENDENT_HILO_TEXTURE_2D_NV   0x8858
+#define GL_DEPENDENT_RGB_TEXTURE_3D_NV    0x8859
+#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A
+#define GL_DOT_PRODUCT_PASS_THROUGH_NV    0x885B
+#define GL_DOT_PRODUCT_TEXTURE_1D_NV      0x885C
+#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D
+#define GL_HILO8_NV                       0x885E
+#define GL_SIGNED_HILO8_NV                0x885F
+#define GL_FORCE_BLUE_TO_ONE_NV           0x8860
+#endif /* GL_NV_texture_shader3 */
+
+#ifndef GL_NV_transform_feedback
+#define GL_NV_transform_feedback 1
+#define GL_BACK_PRIMARY_COLOR_NV          0x8C77
+#define GL_BACK_SECONDARY_COLOR_NV        0x8C78
+#define GL_TEXTURE_COORD_NV               0x8C79
+#define GL_CLIP_DISTANCE_NV               0x8C7A
+#define GL_VERTEX_ID_NV                   0x8C7B
+#define GL_PRIMITIVE_ID_NV                0x8C7C
+#define GL_GENERIC_ATTRIB_NV              0x8C7D
+#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV  0x8C7E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80
+#define GL_ACTIVE_VARYINGS_NV             0x8C81
+#define GL_ACTIVE_VARYING_MAX_LENGTH_NV   0x8C82
+#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83
+#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84
+#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85
+#define GL_TRANSFORM_FEEDBACK_RECORD_NV   0x8C86
+#define GL_PRIMITIVES_GENERATED_NV        0x8C87
+#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88
+#define GL_RASTERIZER_DISCARD_NV          0x8C89
+#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A
+#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B
+#define GL_INTERLEAVED_ATTRIBS_NV         0x8C8C
+#define GL_SEPARATE_ATTRIBS_NV            0x8C8D
+#define GL_TRANSFORM_FEEDBACK_BUFFER_NV   0x8C8E
+#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F
+#define GL_LAYER_NV                       0x8DAA
+#define GL_NEXT_BUFFER_NV                 -2
+#define GL_SKIP_COMPONENTS4_NV            -3
+#define GL_SKIP_COMPONENTS3_NV            -4
+#define GL_SKIP_COMPONENTS2_NV            -5
+#define GL_SKIP_COMPONENTS1_NV            -6
+typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode);
+typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name);
+typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name);
+typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location);
+typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode);
+GLAPI void APIENTRY glEndTransformFeedbackNV (void);
+GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode);
+GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
+GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset);
+GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer);
+GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode);
+GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name);
+GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name);
+GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name);
+GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location);
+GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode);
+#endif
+#endif /* GL_NV_transform_feedback */
+
+#ifndef GL_NV_transform_feedback2
+#define GL_NV_transform_feedback2 1
+#define GL_TRANSFORM_FEEDBACK_NV          0x8E22
+#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23
+#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24
+#define GL_TRANSFORM_FEEDBACK_BINDING_NV  0x8E25
+typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids);
+typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids);
+typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void);
+typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids);
+GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids);
+GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id);
+GLAPI void APIENTRY glPauseTransformFeedbackNV (void);
+GLAPI void APIENTRY glResumeTransformFeedbackNV (void);
+GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id);
+#endif
+#endif /* GL_NV_transform_feedback2 */
+
+#ifndef GL_NV_vdpau_interop
+#define GL_NV_vdpau_interop 1
+typedef GLintptr GLvdpauSurfaceNV;
+#define GL_SURFACE_STATE_NV               0x86EB
+#define GL_SURFACE_REGISTERED_NV          0x86FD
+#define GL_SURFACE_MAPPED_NV              0x8700
+#define GL_WRITE_DISCARD_NV               0x88BE
+typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const void *vdpDevice, const void *getProcAddress);
+typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+typedef GLboolean (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface);
+typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access);
+typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVDPAUInitNV (const void *vdpDevice, const void *getProcAddress);
+GLAPI void APIENTRY glVDPAUFiniNV (void);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (const void *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames);
+GLAPI GLboolean APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface);
+GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access);
+GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces);
+GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
+#endif
+#endif /* GL_NV_vdpau_interop */
+
+#ifndef GL_NV_vertex_array_range
+#define GL_NV_vertex_array_range 1
+#define GL_VERTEX_ARRAY_RANGE_NV          0x851D
+#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV   0x851E
+#define GL_VERTEX_ARRAY_RANGE_VALID_NV    0x851F
+#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520
+#define GL_VERTEX_ARRAY_RANGE_POINTER_NV  0x8521
+typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void);
+typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const void *pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushVertexArrayRangeNV (void);
+GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const void *pointer);
+#endif
+#endif /* GL_NV_vertex_array_range */
+
+#ifndef GL_NV_vertex_array_range2
+#define GL_NV_vertex_array_range2 1
+#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533
+#endif /* GL_NV_vertex_array_range2 */
+
+#ifndef GL_NV_vertex_attrib_integer_64bit
+#define GL_NV_vertex_attrib_integer_64bit 1
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x);
+GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y);
+GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z);
+GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w);
+GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v);
+GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params);
+GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params);
+GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+#endif
+#endif /* GL_NV_vertex_attrib_integer_64bit */
+
+#ifndef GL_NV_vertex_buffer_unified_memory
+#define GL_NV_vertex_buffer_unified_memory 1
+#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E
+#define GL_ELEMENT_ARRAY_UNIFIED_NV       0x8F1F
+#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20
+#define GL_VERTEX_ARRAY_ADDRESS_NV        0x8F21
+#define GL_NORMAL_ARRAY_ADDRESS_NV        0x8F22
+#define GL_COLOR_ARRAY_ADDRESS_NV         0x8F23
+#define GL_INDEX_ARRAY_ADDRESS_NV         0x8F24
+#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25
+#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV     0x8F26
+#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27
+#define GL_FOG_COORD_ARRAY_ADDRESS_NV     0x8F28
+#define GL_ELEMENT_ARRAY_ADDRESS_NV       0x8F29
+#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV  0x8F2A
+#define GL_VERTEX_ARRAY_LENGTH_NV         0x8F2B
+#define GL_NORMAL_ARRAY_LENGTH_NV         0x8F2C
+#define GL_COLOR_ARRAY_LENGTH_NV          0x8F2D
+#define GL_INDEX_ARRAY_LENGTH_NV          0x8F2E
+#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV  0x8F2F
+#define GL_EDGE_FLAG_ARRAY_LENGTH_NV      0x8F30
+#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31
+#define GL_FOG_COORD_ARRAY_LENGTH_NV      0x8F32
+#define GL_ELEMENT_ARRAY_LENGTH_NV        0x8F33
+#define GL_DRAW_INDIRECT_UNIFIED_NV       0x8F40
+#define GL_DRAW_INDIRECT_ADDRESS_NV       0x8F41
+#define GL_DRAW_INDIRECT_LENGTH_NV        0x8F42
+typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride);
+typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride);
+typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length);
+GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride);
+GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride);
+GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride);
+GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result);
+#endif
+#endif /* GL_NV_vertex_buffer_unified_memory */
+
+#ifndef GL_NV_vertex_program
+#define GL_NV_vertex_program 1
+#define GL_VERTEX_PROGRAM_NV              0x8620
+#define GL_VERTEX_STATE_PROGRAM_NV        0x8621
+#define GL_ATTRIB_ARRAY_SIZE_NV           0x8623
+#define GL_ATTRIB_ARRAY_STRIDE_NV         0x8624
+#define GL_ATTRIB_ARRAY_TYPE_NV           0x8625
+#define GL_CURRENT_ATTRIB_NV              0x8626
+#define GL_PROGRAM_LENGTH_NV              0x8627
+#define GL_PROGRAM_STRING_NV              0x8628
+#define GL_MODELVIEW_PROJECTION_NV        0x8629
+#define GL_IDENTITY_NV                    0x862A
+#define GL_INVERSE_NV                     0x862B
+#define GL_TRANSPOSE_NV                   0x862C
+#define GL_INVERSE_TRANSPOSE_NV           0x862D
+#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E
+#define GL_MAX_TRACK_MATRICES_NV          0x862F
+#define GL_MATRIX0_NV                     0x8630
+#define GL_MATRIX1_NV                     0x8631
+#define GL_MATRIX2_NV                     0x8632
+#define GL_MATRIX3_NV                     0x8633
+#define GL_MATRIX4_NV                     0x8634
+#define GL_MATRIX5_NV                     0x8635
+#define GL_MATRIX6_NV                     0x8636
+#define GL_MATRIX7_NV                     0x8637
+#define GL_CURRENT_MATRIX_STACK_DEPTH_NV  0x8640
+#define GL_CURRENT_MATRIX_NV              0x8641
+#define GL_VERTEX_PROGRAM_POINT_SIZE_NV   0x8642
+#define GL_VERTEX_PROGRAM_TWO_SIDE_NV     0x8643
+#define GL_PROGRAM_PARAMETER_NV           0x8644
+#define GL_ATTRIB_ARRAY_POINTER_NV        0x8645
+#define GL_PROGRAM_TARGET_NV              0x8646
+#define GL_PROGRAM_RESIDENT_NV            0x8647
+#define GL_TRACK_MATRIX_NV                0x8648
+#define GL_TRACK_MATRIX_TRANSFORM_NV      0x8649
+#define GL_VERTEX_PROGRAM_BINDING_NV      0x864A
+#define GL_PROGRAM_ERROR_POSITION_NV      0x864B
+#define GL_VERTEX_ATTRIB_ARRAY0_NV        0x8650
+#define GL_VERTEX_ATTRIB_ARRAY1_NV        0x8651
+#define GL_VERTEX_ATTRIB_ARRAY2_NV        0x8652
+#define GL_VERTEX_ATTRIB_ARRAY3_NV        0x8653
+#define GL_VERTEX_ATTRIB_ARRAY4_NV        0x8654
+#define GL_VERTEX_ATTRIB_ARRAY5_NV        0x8655
+#define GL_VERTEX_ATTRIB_ARRAY6_NV        0x8656
+#define GL_VERTEX_ATTRIB_ARRAY7_NV        0x8657
+#define GL_VERTEX_ATTRIB_ARRAY8_NV        0x8658
+#define GL_VERTEX_ATTRIB_ARRAY9_NV        0x8659
+#define GL_VERTEX_ATTRIB_ARRAY10_NV       0x865A
+#define GL_VERTEX_ATTRIB_ARRAY11_NV       0x865B
+#define GL_VERTEX_ATTRIB_ARRAY12_NV       0x865C
+#define GL_VERTEX_ATTRIB_ARRAY13_NV       0x865D
+#define GL_VERTEX_ATTRIB_ARRAY14_NV       0x865E
+#define GL_VERTEX_ATTRIB_ARRAY15_NV       0x865F
+#define GL_MAP1_VERTEX_ATTRIB0_4_NV       0x8660
+#define GL_MAP1_VERTEX_ATTRIB1_4_NV       0x8661
+#define GL_MAP1_VERTEX_ATTRIB2_4_NV       0x8662
+#define GL_MAP1_VERTEX_ATTRIB3_4_NV       0x8663
+#define GL_MAP1_VERTEX_ATTRIB4_4_NV       0x8664
+#define GL_MAP1_VERTEX_ATTRIB5_4_NV       0x8665
+#define GL_MAP1_VERTEX_ATTRIB6_4_NV       0x8666
+#define GL_MAP1_VERTEX_ATTRIB7_4_NV       0x8667
+#define GL_MAP1_VERTEX_ATTRIB8_4_NV       0x8668
+#define GL_MAP1_VERTEX_ATTRIB9_4_NV       0x8669
+#define GL_MAP1_VERTEX_ATTRIB10_4_NV      0x866A
+#define GL_MAP1_VERTEX_ATTRIB11_4_NV      0x866B
+#define GL_MAP1_VERTEX_ATTRIB12_4_NV      0x866C
+#define GL_MAP1_VERTEX_ATTRIB13_4_NV      0x866D
+#define GL_MAP1_VERTEX_ATTRIB14_4_NV      0x866E
+#define GL_MAP1_VERTEX_ATTRIB15_4_NV      0x866F
+#define GL_MAP2_VERTEX_ATTRIB0_4_NV       0x8670
+#define GL_MAP2_VERTEX_ATTRIB1_4_NV       0x8671
+#define GL_MAP2_VERTEX_ATTRIB2_4_NV       0x8672
+#define GL_MAP2_VERTEX_ATTRIB3_4_NV       0x8673
+#define GL_MAP2_VERTEX_ATTRIB4_4_NV       0x8674
+#define GL_MAP2_VERTEX_ATTRIB5_4_NV       0x8675
+#define GL_MAP2_VERTEX_ATTRIB6_4_NV       0x8676
+#define GL_MAP2_VERTEX_ATTRIB7_4_NV       0x8677
+#define GL_MAP2_VERTEX_ATTRIB8_4_NV       0x8678
+#define GL_MAP2_VERTEX_ATTRIB9_4_NV       0x8679
+#define GL_MAP2_VERTEX_ATTRIB10_4_NV      0x867A
+#define GL_MAP2_VERTEX_ATTRIB11_4_NV      0x867B
+#define GL_MAP2_VERTEX_ATTRIB12_4_NV      0x867C
+#define GL_MAP2_VERTEX_ATTRIB13_4_NV      0x867D
+#define GL_MAP2_VERTEX_ATTRIB14_4_NV      0x867E
+#define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
+typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
+typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
+typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program);
+typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, void **pointer);
+typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id);
+typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
+typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences);
+GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id);
+GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params);
+GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs);
+GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program);
+GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params);
+GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, void **pointer);
+GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id);
+GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program);
+GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs);
+GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform);
+GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x);
+GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x);
+GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x);
+GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y);
+GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y);
+GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z);
+GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z);
+GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w);
+GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w);
+GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w);
+GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v);
+GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v);
+GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v);
+#endif
+#endif /* GL_NV_vertex_program */
+
+#ifndef GL_NV_vertex_program1_1
+#define GL_NV_vertex_program1_1 1
+#endif /* GL_NV_vertex_program1_1 */
+
+#ifndef GL_NV_vertex_program2
+#define GL_NV_vertex_program2 1
+#endif /* GL_NV_vertex_program2 */
+
+#ifndef GL_NV_vertex_program2_option
+#define GL_NV_vertex_program2_option 1
+#endif /* GL_NV_vertex_program2_option */
+
+#ifndef GL_NV_vertex_program3
+#define GL_NV_vertex_program3 1
+#endif /* GL_NV_vertex_program3 */
+
+#ifndef GL_NV_vertex_program4
+#define GL_NV_vertex_program4 1
+#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v);
+typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x);
+GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y);
+GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z);
+GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w);
+GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x);
+GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y);
+GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z);
+GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v);
+GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v);
+GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v);
+GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v);
+GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v);
+GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v);
+GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer);
+GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params);
+#endif
+#endif /* GL_NV_vertex_program4 */
+
+#ifndef GL_NV_video_capture
+#define GL_NV_video_capture 1
+#define GL_VIDEO_BUFFER_NV                0x9020
+#define GL_VIDEO_BUFFER_BINDING_NV        0x9021
+#define GL_FIELD_UPPER_NV                 0x9022
+#define GL_FIELD_LOWER_NV                 0x9023
+#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV   0x9024
+#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025
+#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026
+#define GL_LAST_VIDEO_CAPTURE_STATUS_NV   0x9027
+#define GL_VIDEO_BUFFER_PITCH_NV          0x9028
+#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029
+#define GL_VIDEO_COLOR_CONVERSION_MAX_NV  0x902A
+#define GL_VIDEO_COLOR_CONVERSION_MIN_NV  0x902B
+#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C
+#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D
+#define GL_PARTIAL_SUCCESS_NV             0x902E
+#define GL_SUCCESS_NV                     0x902F
+#define GL_FAILURE_NV                     0x9030
+#define GL_YCBYCR8_422_NV                 0x9031
+#define GL_YCBAYCR8A_4224_NV              0x9032
+#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV  0x9033
+#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034
+#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV  0x9035
+#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036
+#define GL_Z4Y12Z4CB12Z4CR12_444_NV       0x9037
+#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV   0x9038
+#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV  0x9039
+#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A
+#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B
+#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C
+typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset);
+GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture);
+GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot);
+GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params);
+GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time);
+GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params);
+#endif
+#endif /* GL_NV_video_capture */
+
+#ifndef GL_OML_interlace
+#define GL_OML_interlace 1
+#define GL_INTERLACE_OML                  0x8980
+#define GL_INTERLACE_READ_OML             0x8981
+#endif /* GL_OML_interlace */
+
+#ifndef GL_OML_resample
+#define GL_OML_resample 1
+#define GL_PACK_RESAMPLE_OML              0x8984
+#define GL_UNPACK_RESAMPLE_OML            0x8985
+#define GL_RESAMPLE_REPLICATE_OML         0x8986
+#define GL_RESAMPLE_ZERO_FILL_OML         0x8987
+#define GL_RESAMPLE_AVERAGE_OML           0x8988
+#define GL_RESAMPLE_DECIMATE_OML          0x8989
+#endif /* GL_OML_resample */
+
+#ifndef GL_OML_subsample
+#define GL_OML_subsample 1
+#define GL_FORMAT_SUBSAMPLE_24_24_OML     0x8982
+#define GL_FORMAT_SUBSAMPLE_244_244_OML   0x8983
+#endif /* GL_OML_subsample */
+
+#ifndef GL_PGI_misc_hints
+#define GL_PGI_misc_hints 1
+#define GL_PREFER_DOUBLEBUFFER_HINT_PGI   0x1A1F8
+#define GL_CONSERVE_MEMORY_HINT_PGI       0x1A1FD
+#define GL_RECLAIM_MEMORY_HINT_PGI        0x1A1FE
+#define GL_NATIVE_GRAPHICS_HANDLE_PGI     0x1A202
+#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203
+#define GL_NATIVE_GRAPHICS_END_HINT_PGI   0x1A204
+#define GL_ALWAYS_FAST_HINT_PGI           0x1A20C
+#define GL_ALWAYS_SOFT_HINT_PGI           0x1A20D
+#define GL_ALLOW_DRAW_OBJ_HINT_PGI        0x1A20E
+#define GL_ALLOW_DRAW_WIN_HINT_PGI        0x1A20F
+#define GL_ALLOW_DRAW_FRG_HINT_PGI        0x1A210
+#define GL_ALLOW_DRAW_MEM_HINT_PGI        0x1A211
+#define GL_STRICT_DEPTHFUNC_HINT_PGI      0x1A216
+#define GL_STRICT_LIGHTING_HINT_PGI       0x1A217
+#define GL_STRICT_SCISSOR_HINT_PGI        0x1A218
+#define GL_FULL_STIPPLE_HINT_PGI          0x1A219
+#define GL_CLIP_NEAR_HINT_PGI             0x1A220
+#define GL_CLIP_FAR_HINT_PGI              0x1A221
+#define GL_WIDE_LINE_HINT_PGI             0x1A222
+#define GL_BACK_NORMALS_HINT_PGI          0x1A223
+typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode);
+#endif
+#endif /* GL_PGI_misc_hints */
+
+#ifndef GL_PGI_vertex_hints
+#define GL_PGI_vertex_hints 1
+#define GL_VERTEX_DATA_HINT_PGI           0x1A22A
+#define GL_VERTEX_CONSISTENT_HINT_PGI     0x1A22B
+#define GL_MATERIAL_SIDE_HINT_PGI         0x1A22C
+#define GL_MAX_VERTEX_HINT_PGI            0x1A22D
+#define GL_COLOR3_BIT_PGI                 0x00010000
+#define GL_COLOR4_BIT_PGI                 0x00020000
+#define GL_EDGEFLAG_BIT_PGI               0x00040000
+#define GL_INDEX_BIT_PGI                  0x00080000
+#define GL_MAT_AMBIENT_BIT_PGI            0x00100000
+#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000
+#define GL_MAT_DIFFUSE_BIT_PGI            0x00400000
+#define GL_MAT_EMISSION_BIT_PGI           0x00800000
+#define GL_MAT_COLOR_INDEXES_BIT_PGI      0x01000000
+#define GL_MAT_SHININESS_BIT_PGI          0x02000000
+#define GL_MAT_SPECULAR_BIT_PGI           0x04000000
+#define GL_NORMAL_BIT_PGI                 0x08000000
+#define GL_TEXCOORD1_BIT_PGI              0x10000000
+#define GL_TEXCOORD2_BIT_PGI              0x20000000
+#define GL_TEXCOORD3_BIT_PGI              0x40000000
+#define GL_TEXCOORD4_BIT_PGI              0x80000000
+#define GL_VERTEX23_BIT_PGI               0x00000004
+#define GL_VERTEX4_BIT_PGI                0x00000008
+#endif /* GL_PGI_vertex_hints */
+
+#ifndef GL_REND_screen_coordinates
+#define GL_REND_screen_coordinates 1
+#define GL_SCREEN_COORDINATES_REND        0x8490
+#define GL_INVERTED_SCREEN_W_REND         0x8491
+#endif /* GL_REND_screen_coordinates */
+
+#ifndef GL_S3_s3tc
+#define GL_S3_s3tc 1
+#define GL_RGB_S3TC                       0x83A0
+#define GL_RGB4_S3TC                      0x83A1
+#define GL_RGBA_S3TC                      0x83A2
+#define GL_RGBA4_S3TC                     0x83A3
+#define GL_RGBA_DXT5_S3TC                 0x83A4
+#define GL_RGBA4_DXT5_S3TC                0x83A5
+#endif /* GL_S3_s3tc */
+
+#ifndef GL_SGIS_detail_texture
+#define GL_SGIS_detail_texture 1
+#define GL_DETAIL_TEXTURE_2D_SGIS         0x8095
+#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096
+#define GL_LINEAR_DETAIL_SGIS             0x8097
+#define GL_LINEAR_DETAIL_ALPHA_SGIS       0x8098
+#define GL_LINEAR_DETAIL_COLOR_SGIS       0x8099
+#define GL_DETAIL_TEXTURE_LEVEL_SGIS      0x809A
+#define GL_DETAIL_TEXTURE_MODE_SGIS       0x809B
+#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C
+typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_detail_texture */
+
+#ifndef GL_SGIS_fog_function
+#define GL_SGIS_fog_function 1
+#define GL_FOG_FUNC_SGIS                  0x812A
+#define GL_FOG_FUNC_POINTS_SGIS           0x812B
+#define GL_MAX_FOG_FUNC_POINTS_SGIS       0x812C
+typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points);
+#endif
+#endif /* GL_SGIS_fog_function */
+
+#ifndef GL_SGIS_generate_mipmap
+#define GL_SGIS_generate_mipmap 1
+#define GL_GENERATE_MIPMAP_SGIS           0x8191
+#define GL_GENERATE_MIPMAP_HINT_SGIS      0x8192
+#endif /* GL_SGIS_generate_mipmap */
+
+#ifndef GL_SGIS_multisample
+#define GL_SGIS_multisample 1
+#define GL_MULTISAMPLE_SGIS               0x809D
+#define GL_SAMPLE_ALPHA_TO_MASK_SGIS      0x809E
+#define GL_SAMPLE_ALPHA_TO_ONE_SGIS       0x809F
+#define GL_SAMPLE_MASK_SGIS               0x80A0
+#define GL_1PASS_SGIS                     0x80A1
+#define GL_2PASS_0_SGIS                   0x80A2
+#define GL_2PASS_1_SGIS                   0x80A3
+#define GL_4PASS_0_SGIS                   0x80A4
+#define GL_4PASS_1_SGIS                   0x80A5
+#define GL_4PASS_2_SGIS                   0x80A6
+#define GL_4PASS_3_SGIS                   0x80A7
+#define GL_SAMPLE_BUFFERS_SGIS            0x80A8
+#define GL_SAMPLES_SGIS                   0x80A9
+#define GL_SAMPLE_MASK_VALUE_SGIS         0x80AA
+#define GL_SAMPLE_MASK_INVERT_SGIS        0x80AB
+#define GL_SAMPLE_PATTERN_SGIS            0x80AC
+typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert);
+typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert);
+GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern);
+#endif
+#endif /* GL_SGIS_multisample */
+
+#ifndef GL_SGIS_pixel_texture
+#define GL_SGIS_pixel_texture 1
+#define GL_PIXEL_TEXTURE_SGIS             0x8353
+#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354
+#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355
+#define GL_PIXEL_GROUP_COLOR_SGIS         0x8356
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param);
+GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params);
+#endif
+#endif /* GL_SGIS_pixel_texture */
+
+#ifndef GL_SGIS_point_line_texgen
+#define GL_SGIS_point_line_texgen 1
+#define GL_EYE_DISTANCE_TO_POINT_SGIS     0x81F0
+#define GL_OBJECT_DISTANCE_TO_POINT_SGIS  0x81F1
+#define GL_EYE_DISTANCE_TO_LINE_SGIS      0x81F2
+#define GL_OBJECT_DISTANCE_TO_LINE_SGIS   0x81F3
+#define GL_EYE_POINT_SGIS                 0x81F4
+#define GL_OBJECT_POINT_SGIS              0x81F5
+#define GL_EYE_LINE_SGIS                  0x81F6
+#define GL_OBJECT_LINE_SGIS               0x81F7
+#endif /* GL_SGIS_point_line_texgen */
+
+#ifndef GL_SGIS_point_parameters
+#define GL_SGIS_point_parameters 1
+#define GL_POINT_SIZE_MIN_SGIS            0x8126
+#define GL_POINT_SIZE_MAX_SGIS            0x8127
+#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128
+#define GL_DISTANCE_ATTENUATION_SGIS      0x8129
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params);
+#endif
+#endif /* GL_SGIS_point_parameters */
+
+#ifndef GL_SGIS_sharpen_texture
+#define GL_SGIS_sharpen_texture 1
+#define GL_LINEAR_SHARPEN_SGIS            0x80AD
+#define GL_LINEAR_SHARPEN_ALPHA_SGIS      0x80AE
+#define GL_LINEAR_SHARPEN_COLOR_SGIS      0x80AF
+#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0
+typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points);
+typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points);
+GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points);
+#endif
+#endif /* GL_SGIS_sharpen_texture */
+
+#ifndef GL_SGIS_texture4D
+#define GL_SGIS_texture4D 1
+#define GL_PACK_SKIP_VOLUMES_SGIS         0x8130
+#define GL_PACK_IMAGE_DEPTH_SGIS          0x8131
+#define GL_UNPACK_SKIP_VOLUMES_SGIS       0x8132
+#define GL_UNPACK_IMAGE_DEPTH_SGIS        0x8133
+#define GL_TEXTURE_4D_SGIS                0x8134
+#define GL_PROXY_TEXTURE_4D_SGIS          0x8135
+#define GL_TEXTURE_4DSIZE_SGIS            0x8136
+#define GL_TEXTURE_WRAP_Q_SGIS            0x8137
+#define GL_MAX_4D_TEXTURE_SIZE_SGIS       0x8138
+#define GL_TEXTURE_4D_BINDING_SGIS        0x814F
+typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const void *pixels);
+GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const void *pixels);
+#endif
+#endif /* GL_SGIS_texture4D */
+
+#ifndef GL_SGIS_texture_border_clamp
+#define GL_SGIS_texture_border_clamp 1
+#define GL_CLAMP_TO_BORDER_SGIS           0x812D
+#endif /* GL_SGIS_texture_border_clamp */
+
+#ifndef GL_SGIS_texture_color_mask
+#define GL_SGIS_texture_color_mask 1
+#define GL_TEXTURE_COLOR_WRITEMASK_SGIS   0x81EF
+typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+#endif
+#endif /* GL_SGIS_texture_color_mask */
+
+#ifndef GL_SGIS_texture_edge_clamp
+#define GL_SGIS_texture_edge_clamp 1
+#define GL_CLAMP_TO_EDGE_SGIS             0x812F
+#endif /* GL_SGIS_texture_edge_clamp */
+
+#ifndef GL_SGIS_texture_filter4
+#define GL_SGIS_texture_filter4 1
+#define GL_FILTER4_SGIS                   0x8146
+#define GL_TEXTURE_FILTER4_SIZE_SGIS      0x8147
+typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights);
+typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights);
+GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights);
+#endif
+#endif /* GL_SGIS_texture_filter4 */
+
+#ifndef GL_SGIS_texture_lod
+#define GL_SGIS_texture_lod 1
+#define GL_TEXTURE_MIN_LOD_SGIS           0x813A
+#define GL_TEXTURE_MAX_LOD_SGIS           0x813B
+#define GL_TEXTURE_BASE_LEVEL_SGIS        0x813C
+#define GL_TEXTURE_MAX_LEVEL_SGIS         0x813D
+#endif /* GL_SGIS_texture_lod */
+
+#ifndef GL_SGIS_texture_select
+#define GL_SGIS_texture_select 1
+#define GL_DUAL_ALPHA4_SGIS               0x8110
+#define GL_DUAL_ALPHA8_SGIS               0x8111
+#define GL_DUAL_ALPHA12_SGIS              0x8112
+#define GL_DUAL_ALPHA16_SGIS              0x8113
+#define GL_DUAL_LUMINANCE4_SGIS           0x8114
+#define GL_DUAL_LUMINANCE8_SGIS           0x8115
+#define GL_DUAL_LUMINANCE12_SGIS          0x8116
+#define GL_DUAL_LUMINANCE16_SGIS          0x8117
+#define GL_DUAL_INTENSITY4_SGIS           0x8118
+#define GL_DUAL_INTENSITY8_SGIS           0x8119
+#define GL_DUAL_INTENSITY12_SGIS          0x811A
+#define GL_DUAL_INTENSITY16_SGIS          0x811B
+#define GL_DUAL_LUMINANCE_ALPHA4_SGIS     0x811C
+#define GL_DUAL_LUMINANCE_ALPHA8_SGIS     0x811D
+#define GL_QUAD_ALPHA4_SGIS               0x811E
+#define GL_QUAD_ALPHA8_SGIS               0x811F
+#define GL_QUAD_LUMINANCE4_SGIS           0x8120
+#define GL_QUAD_LUMINANCE8_SGIS           0x8121
+#define GL_QUAD_INTENSITY4_SGIS           0x8122
+#define GL_QUAD_INTENSITY8_SGIS           0x8123
+#define GL_DUAL_TEXTURE_SELECT_SGIS       0x8124
+#define GL_QUAD_TEXTURE_SELECT_SGIS       0x8125
+#endif /* GL_SGIS_texture_select */
+
+#ifndef GL_SGIX_async
+#define GL_SGIX_async 1
+#define GL_ASYNC_MARKER_SGIX              0x8329
+typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker);
+typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp);
+typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp);
+typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range);
+typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range);
+typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker);
+GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp);
+GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp);
+GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range);
+GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range);
+GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker);
+#endif
+#endif /* GL_SGIX_async */
+
+#ifndef GL_SGIX_async_histogram
+#define GL_SGIX_async_histogram 1
+#define GL_ASYNC_HISTOGRAM_SGIX           0x832C
+#define GL_MAX_ASYNC_HISTOGRAM_SGIX       0x832D
+#endif /* GL_SGIX_async_histogram */
+
+#ifndef GL_SGIX_async_pixel
+#define GL_SGIX_async_pixel 1
+#define GL_ASYNC_TEX_IMAGE_SGIX           0x835C
+#define GL_ASYNC_DRAW_PIXELS_SGIX         0x835D
+#define GL_ASYNC_READ_PIXELS_SGIX         0x835E
+#define GL_MAX_ASYNC_TEX_IMAGE_SGIX       0x835F
+#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX     0x8360
+#define GL_MAX_ASYNC_READ_PIXELS_SGIX     0x8361
+#endif /* GL_SGIX_async_pixel */
+
+#ifndef GL_SGIX_blend_alpha_minmax
+#define GL_SGIX_blend_alpha_minmax 1
+#define GL_ALPHA_MIN_SGIX                 0x8320
+#define GL_ALPHA_MAX_SGIX                 0x8321
+#endif /* GL_SGIX_blend_alpha_minmax */
+
+#ifndef GL_SGIX_calligraphic_fragment
+#define GL_SGIX_calligraphic_fragment 1
+#define GL_CALLIGRAPHIC_FRAGMENT_SGIX     0x8183
+#endif /* GL_SGIX_calligraphic_fragment */
+
+#ifndef GL_SGIX_clipmap
+#define GL_SGIX_clipmap 1
+#define GL_LINEAR_CLIPMAP_LINEAR_SGIX     0x8170
+#define GL_TEXTURE_CLIPMAP_CENTER_SGIX    0x8171
+#define GL_TEXTURE_CLIPMAP_FRAME_SGIX     0x8172
+#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX    0x8173
+#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174
+#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175
+#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX     0x8176
+#define GL_MAX_CLIPMAP_DEPTH_SGIX         0x8177
+#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178
+#define GL_NEAREST_CLIPMAP_NEAREST_SGIX   0x844D
+#define GL_NEAREST_CLIPMAP_LINEAR_SGIX    0x844E
+#define GL_LINEAR_CLIPMAP_NEAREST_SGIX    0x844F
+#endif /* GL_SGIX_clipmap */
+
+#ifndef GL_SGIX_convolution_accuracy
+#define GL_SGIX_convolution_accuracy 1
+#define GL_CONVOLUTION_HINT_SGIX          0x8316
+#endif /* GL_SGIX_convolution_accuracy */
+
+#ifndef GL_SGIX_depth_pass_instrument
+#define GL_SGIX_depth_pass_instrument 1
+#endif /* GL_SGIX_depth_pass_instrument */
+
+#ifndef GL_SGIX_depth_texture
+#define GL_SGIX_depth_texture 1
+#define GL_DEPTH_COMPONENT16_SGIX         0x81A5
+#define GL_DEPTH_COMPONENT24_SGIX         0x81A6
+#define GL_DEPTH_COMPONENT32_SGIX         0x81A7
+#endif /* GL_SGIX_depth_texture */
+
+#ifndef GL_SGIX_flush_raster
+#define GL_SGIX_flush_raster 1
+typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFlushRasterSGIX (void);
+#endif
+#endif /* GL_SGIX_flush_raster */
+
+#ifndef GL_SGIX_fog_offset
+#define GL_SGIX_fog_offset 1
+#define GL_FOG_OFFSET_SGIX                0x8198
+#define GL_FOG_OFFSET_VALUE_SGIX          0x8199
+#endif /* GL_SGIX_fog_offset */
+
+#ifndef GL_SGIX_fragment_lighting
+#define GL_SGIX_fragment_lighting 1
+#define GL_FRAGMENT_LIGHTING_SGIX         0x8400
+#define GL_FRAGMENT_COLOR_MATERIAL_SGIX   0x8401
+#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402
+#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403
+#define GL_MAX_FRAGMENT_LIGHTS_SGIX       0x8404
+#define GL_MAX_ACTIVE_LIGHTS_SGIX         0x8405
+#define GL_CURRENT_RASTER_NORMAL_SGIX     0x8406
+#define GL_LIGHT_ENV_MODE_SGIX            0x8407
+#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408
+#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409
+#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A
+#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B
+#define GL_FRAGMENT_LIGHT0_SGIX           0x840C
+#define GL_FRAGMENT_LIGHT1_SGIX           0x840D
+#define GL_FRAGMENT_LIGHT2_SGIX           0x840E
+#define GL_FRAGMENT_LIGHT3_SGIX           0x840F
+#define GL_FRAGMENT_LIGHT4_SGIX           0x8410
+#define GL_FRAGMENT_LIGHT5_SGIX           0x8411
+#define GL_FRAGMENT_LIGHT6_SGIX           0x8412
+#define GL_FRAGMENT_LIGHT7_SGIX           0x8413
+typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode);
+GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params);
+GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param);
+GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params);
+GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params);
+GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param);
+#endif
+#endif /* GL_SGIX_fragment_lighting */
+
+#ifndef GL_SGIX_framezoom
+#define GL_SGIX_framezoom 1
+#define GL_FRAMEZOOM_SGIX                 0x818B
+#define GL_FRAMEZOOM_FACTOR_SGIX          0x818C
+#define GL_MAX_FRAMEZOOM_FACTOR_SGIX      0x818D
+typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFrameZoomSGIX (GLint factor);
+#endif
+#endif /* GL_SGIX_framezoom */
+
+#ifndef GL_SGIX_igloo_interface
+#define GL_SGIX_igloo_interface 1
+typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const void *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const void *params);
+#endif
+#endif /* GL_SGIX_igloo_interface */
+
+#ifndef GL_SGIX_instruments
+#define GL_SGIX_instruments 1
+#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180
+#define GL_INSTRUMENT_MEASUREMENTS_SGIX   0x8181
+typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer);
+typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p);
+typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker);
+typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void);
+typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI GLint APIENTRY glGetInstrumentsSGIX (void);
+GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer);
+GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p);
+GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker);
+GLAPI void APIENTRY glStartInstrumentsSGIX (void);
+GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker);
+#endif
+#endif /* GL_SGIX_instruments */
+
+#ifndef GL_SGIX_interlace
+#define GL_SGIX_interlace 1
+#define GL_INTERLACE_SGIX                 0x8094
+#endif /* GL_SGIX_interlace */
+
+#ifndef GL_SGIX_ir_instrument1
+#define GL_SGIX_ir_instrument1 1
+#define GL_IR_INSTRUMENT1_SGIX            0x817F
+#endif /* GL_SGIX_ir_instrument1 */
+
+#ifndef GL_SGIX_list_priority
+#define GL_SGIX_list_priority 1
+#define GL_LIST_PRIORITY_SGIX             0x8182
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params);
+GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param);
+GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param);
+GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_list_priority */
+
+#ifndef GL_SGIX_pixel_texture
+#define GL_SGIX_pixel_texture 1
+#define GL_PIXEL_TEX_GEN_SGIX             0x8139
+#define GL_PIXEL_TEX_GEN_MODE_SGIX        0x832B
+typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode);
+#endif
+#endif /* GL_SGIX_pixel_texture */
+
+#ifndef GL_SGIX_pixel_tiles
+#define GL_SGIX_pixel_tiles 1
+#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E
+#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F
+#define GL_PIXEL_TILE_WIDTH_SGIX          0x8140
+#define GL_PIXEL_TILE_HEIGHT_SGIX         0x8141
+#define GL_PIXEL_TILE_GRID_WIDTH_SGIX     0x8142
+#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX    0x8143
+#define GL_PIXEL_TILE_GRID_DEPTH_SGIX     0x8144
+#define GL_PIXEL_TILE_CACHE_SIZE_SGIX     0x8145
+#endif /* GL_SGIX_pixel_tiles */
+
+#ifndef GL_SGIX_polynomial_ffd
+#define GL_SGIX_polynomial_ffd 1
+#define GL_TEXTURE_DEFORMATION_BIT_SGIX   0x00000001
+#define GL_GEOMETRY_DEFORMATION_BIT_SGIX  0x00000002
+#define GL_GEOMETRY_DEFORMATION_SGIX      0x8194
+#define GL_TEXTURE_DEFORMATION_SGIX       0x8195
+#define GL_DEFORMATIONS_MASK_SGIX         0x8196
+#define GL_MAX_DEFORMATION_ORDER_SGIX     0x8197
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask);
+typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points);
+GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points);
+GLAPI void APIENTRY glDeformSGIX (GLbitfield mask);
+GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask);
+#endif
+#endif /* GL_SGIX_polynomial_ffd */
+
+#ifndef GL_SGIX_reference_plane
+#define GL_SGIX_reference_plane 1
+#define GL_REFERENCE_PLANE_SGIX           0x817D
+#define GL_REFERENCE_PLANE_EQUATION_SGIX  0x817E
+typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation);
+#endif
+#endif /* GL_SGIX_reference_plane */
+
+#ifndef GL_SGIX_resample
+#define GL_SGIX_resample 1
+#define GL_PACK_RESAMPLE_SGIX             0x842C
+#define GL_UNPACK_RESAMPLE_SGIX           0x842D
+#define GL_RESAMPLE_REPLICATE_SGIX        0x842E
+#define GL_RESAMPLE_ZERO_FILL_SGIX        0x842F
+#define GL_RESAMPLE_DECIMATE_SGIX         0x8430
+#endif /* GL_SGIX_resample */
+
+#ifndef GL_SGIX_scalebias_hint
+#define GL_SGIX_scalebias_hint 1
+#define GL_SCALEBIAS_HINT_SGIX            0x8322
+#endif /* GL_SGIX_scalebias_hint */
+
+#ifndef GL_SGIX_shadow
+#define GL_SGIX_shadow 1
+#define GL_TEXTURE_COMPARE_SGIX           0x819A
+#define GL_TEXTURE_COMPARE_OPERATOR_SGIX  0x819B
+#define GL_TEXTURE_LEQUAL_R_SGIX          0x819C
+#define GL_TEXTURE_GEQUAL_R_SGIX          0x819D
+#endif /* GL_SGIX_shadow */
+
+#ifndef GL_SGIX_shadow_ambient
+#define GL_SGIX_shadow_ambient 1
+#define GL_SHADOW_AMBIENT_SGIX            0x80BF
+#endif /* GL_SGIX_shadow_ambient */
+
+#ifndef GL_SGIX_sprite
+#define GL_SGIX_sprite 1
+#define GL_SPRITE_SGIX                    0x8148
+#define GL_SPRITE_MODE_SGIX               0x8149
+#define GL_SPRITE_AXIS_SGIX               0x814A
+#define GL_SPRITE_TRANSLATION_SGIX        0x814B
+#define GL_SPRITE_AXIAL_SGIX              0x814C
+#define GL_SPRITE_OBJECT_ALIGNED_SGIX     0x814D
+#define GL_SPRITE_EYE_ALIGNED_SGIX        0x814E
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param);
+GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param);
+GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params);
+#endif
+#endif /* GL_SGIX_sprite */
+
+#ifndef GL_SGIX_subsample
+#define GL_SGIX_subsample 1
+#define GL_PACK_SUBSAMPLE_RATE_SGIX       0x85A0
+#define GL_UNPACK_SUBSAMPLE_RATE_SGIX     0x85A1
+#define GL_PIXEL_SUBSAMPLE_4444_SGIX      0x85A2
+#define GL_PIXEL_SUBSAMPLE_2424_SGIX      0x85A3
+#define GL_PIXEL_SUBSAMPLE_4242_SGIX      0x85A4
+#endif /* GL_SGIX_subsample */
+
+#ifndef GL_SGIX_tag_sample_buffer
+#define GL_SGIX_tag_sample_buffer 1
+typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glTagSampleBufferSGIX (void);
+#endif
+#endif /* GL_SGIX_tag_sample_buffer */
+
+#ifndef GL_SGIX_texture_add_env
+#define GL_SGIX_texture_add_env 1
+#define GL_TEXTURE_ENV_BIAS_SGIX          0x80BE
+#endif /* GL_SGIX_texture_add_env */
+
+#ifndef GL_SGIX_texture_coordinate_clamp
+#define GL_SGIX_texture_coordinate_clamp 1
+#define GL_TEXTURE_MAX_CLAMP_S_SGIX       0x8369
+#define GL_TEXTURE_MAX_CLAMP_T_SGIX       0x836A
+#define GL_TEXTURE_MAX_CLAMP_R_SGIX       0x836B
+#endif /* GL_SGIX_texture_coordinate_clamp */
+
+#ifndef GL_SGIX_texture_lod_bias
+#define GL_SGIX_texture_lod_bias 1
+#define GL_TEXTURE_LOD_BIAS_S_SGIX        0x818E
+#define GL_TEXTURE_LOD_BIAS_T_SGIX        0x818F
+#define GL_TEXTURE_LOD_BIAS_R_SGIX        0x8190
+#endif /* GL_SGIX_texture_lod_bias */
+
+#ifndef GL_SGIX_texture_multi_buffer
+#define GL_SGIX_texture_multi_buffer 1
+#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E
+#endif /* GL_SGIX_texture_multi_buffer */
+
+#ifndef GL_SGIX_texture_scale_bias
+#define GL_SGIX_texture_scale_bias 1
+#define GL_POST_TEXTURE_FILTER_BIAS_SGIX  0x8179
+#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A
+#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B
+#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C
+#endif /* GL_SGIX_texture_scale_bias */
+
+#ifndef GL_SGIX_vertex_preclip
+#define GL_SGIX_vertex_preclip 1
+#define GL_VERTEX_PRECLIP_SGIX            0x83EE
+#define GL_VERTEX_PRECLIP_HINT_SGIX       0x83EF
+#endif /* GL_SGIX_vertex_preclip */
+
+#ifndef GL_SGIX_ycrcb
+#define GL_SGIX_ycrcb 1
+#define GL_YCRCB_422_SGIX                 0x81BB
+#define GL_YCRCB_444_SGIX                 0x81BC
+#endif /* GL_SGIX_ycrcb */
+
+#ifndef GL_SGIX_ycrcb_subsample
+#define GL_SGIX_ycrcb_subsample 1
+#endif /* GL_SGIX_ycrcb_subsample */
+
+#ifndef GL_SGIX_ycrcba
+#define GL_SGIX_ycrcba 1
+#define GL_YCRCB_SGIX                     0x8318
+#define GL_YCRCBA_SGIX                    0x8319
+#endif /* GL_SGIX_ycrcba */
+
+#ifndef GL_SGI_color_matrix
+#define GL_SGI_color_matrix 1
+#define GL_COLOR_MATRIX_SGI               0x80B1
+#define GL_COLOR_MATRIX_STACK_DEPTH_SGI   0x80B2
+#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3
+#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4
+#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5
+#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6
+#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7
+#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8
+#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9
+#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA
+#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB
+#endif /* GL_SGI_color_matrix */
+
+#ifndef GL_SGI_color_table
+#define GL_SGI_color_table 1
+#define GL_COLOR_TABLE_SGI                0x80D0
+#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1
+#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2
+#define GL_PROXY_COLOR_TABLE_SGI          0x80D3
+#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4
+#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5
+#define GL_COLOR_TABLE_SCALE_SGI          0x80D6
+#define GL_COLOR_TABLE_BIAS_SGI           0x80D7
+#define GL_COLOR_TABLE_FORMAT_SGI         0x80D8
+#define GL_COLOR_TABLE_WIDTH_SGI          0x80D9
+#define GL_COLOR_TABLE_RED_SIZE_SGI       0x80DA
+#define GL_COLOR_TABLE_GREEN_SIZE_SGI     0x80DB
+#define GL_COLOR_TABLE_BLUE_SIZE_SGI      0x80DC
+#define GL_COLOR_TABLE_ALPHA_SIZE_SGI     0x80DD
+#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE
+#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF
+typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params);
+typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params);
+typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void *table);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params);
+typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table);
+GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params);
+GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params);
+GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width);
+GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, void *table);
+GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params);
+GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params);
+#endif
+#endif /* GL_SGI_color_table */
+
+#ifndef GL_SGI_texture_color_table
+#define GL_SGI_texture_color_table 1
+#define GL_TEXTURE_COLOR_TABLE_SGI        0x80BC
+#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI  0x80BD
+#endif /* GL_SGI_texture_color_table */
+
+#ifndef GL_SUNX_constant_data
+#define GL_SUNX_constant_data 1
+#define GL_UNPACK_CONSTANT_DATA_SUNX      0x81D5
+#define GL_TEXTURE_CONSTANT_DATA_SUNX     0x81D6
+typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFinishTextureSUNX (void);
+#endif
+#endif /* GL_SUNX_constant_data */
+
+#ifndef GL_SUN_convolution_border_modes
+#define GL_SUN_convolution_border_modes 1
+#define GL_WRAP_BORDER_SUN                0x81D4
+#endif /* GL_SUN_convolution_border_modes */
+
+#ifndef GL_SUN_global_alpha
+#define GL_SUN_global_alpha 1
+#define GL_GLOBAL_ALPHA_SUN               0x81D9
+#define GL_GLOBAL_ALPHA_FACTOR_SUN        0x81DA
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor);
+typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor);
+GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor);
+GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor);
+GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor);
+GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor);
+GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor);
+#endif
+#endif /* GL_SUN_global_alpha */
+
+#ifndef GL_SUN_mesh_array
+#define GL_SUN_mesh_array 1
+#define GL_QUAD_MESH_SUN                  0x8614
+#define GL_TRIANGLE_MESH_SUN              0x8615
+typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width);
+#endif
+#endif /* GL_SUN_mesh_array */
+
+#ifndef GL_SUN_slice_accum
+#define GL_SUN_slice_accum 1
+#define GL_SLICE_ACCUM_SUN                0x85CC
+#endif /* GL_SUN_slice_accum */
+
+#ifndef GL_SUN_triangle_list
+#define GL_SUN_triangle_list 1
+#define GL_RESTART_SUN                    0x0001
+#define GL_REPLACE_MIDDLE_SUN             0x0002
+#define GL_REPLACE_OLDEST_SUN             0x0003
+#define GL_TRIANGLE_LIST_SUN              0x81D7
+#define GL_REPLACEMENT_CODE_SUN           0x81D8
+#define GL_REPLACEMENT_CODE_ARRAY_SUN     0x85C0
+#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1
+#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2
+#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3
+#define GL_R1UI_V3F_SUN                   0x85C4
+#define GL_R1UI_C4UB_V3F_SUN              0x85C5
+#define GL_R1UI_C3F_V3F_SUN               0x85C6
+#define GL_R1UI_N3F_V3F_SUN               0x85C7
+#define GL_R1UI_C4F_N3F_V3F_SUN           0x85C8
+#define GL_R1UI_T2F_V3F_SUN               0x85C9
+#define GL_R1UI_T2F_N3F_V3F_SUN           0x85CA
+#define GL_R1UI_T2F_C4F_N3F_V3F_SUN       0x85CB
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void **pointer);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code);
+GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code);
+GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code);
+GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code);
+GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code);
+GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code);
+GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const void **pointer);
+#endif
+#endif /* GL_SUN_triangle_list */
+
+#ifndef GL_SUN_vertex
+#define GL_SUN_vertex 1
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y);
+GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z);
+GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v);
+#endif
+#endif /* GL_SUN_vertex */
+
+#ifndef GL_WIN_phong_shading
+#define GL_WIN_phong_shading 1
+#define GL_PHONG_WIN                      0x80EA
+#define GL_PHONG_HINT_WIN                 0x80EB
+#endif /* GL_WIN_phong_shading */
+
+#ifndef GL_WIN_specular_fog
+#define GL_WIN_specular_fog 1
+#define GL_FOG_SPECULAR_TEXTURE_WIN       0x80EC
+#endif /* GL_WIN_specular_fog */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles.h
new file mode 100644
index 0000000..1e0660c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles.h
@@ -0,0 +1,39 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_opengles.h
+ *
+ *  This is a simple file to encapsulate the OpenGL ES 1.X API headers.
+ */
+#include "SDL_config.h"
+
+#ifdef __IPHONEOS__
+#include <OpenGLES/ES1/gl.h>
+#include <OpenGLES/ES1/glext.h>
+#else
+#include <GLES/gl.h>
+#include <GLES/glext.h>
+#endif
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2.h
new file mode 100644
index 0000000..df29d38
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2.h
@@ -0,0 +1,52 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_opengles2.h
+ *
+ *  This is a simple file to encapsulate the OpenGL ES 2.0 API headers.
+ */
+#include "SDL_config.h"
+
+#ifndef _MSC_VER
+
+#ifdef __IPHONEOS__
+#include <OpenGLES/ES2/gl.h>
+#include <OpenGLES/ES2/glext.h>
+#else
+#include <GLES2/gl2platform.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#endif
+
+#else /* _MSC_VER */
+
+/* OpenGL ES2 headers for Visual Studio */
+#include "SDL_opengles2_khrplatform.h"
+#include "SDL_opengles2_gl2platform.h"
+#include "SDL_opengles2_gl2.h"
+#include "SDL_opengles2_gl2ext.h"
+
+#endif /* _MSC_VER */
+
+#ifndef APIENTRY
+#define APIENTRY GL_APIENTRY
+#endif
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2.h
new file mode 100644
index 0000000..c62fb0a
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2.h
@@ -0,0 +1,621 @@
+#ifndef __gl2_h_
+#define __gl2_h_
+
+/* $Revision: 20555 $ on $Date:: 2013-02-12 14:32:47 -0800 #$ */
+
+/*#include <GLES2/gl2platform.h>*/
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/*-------------------------------------------------------------------------
+ * Data type definitions
+ *-----------------------------------------------------------------------*/
+
+typedef void             GLvoid;
+typedef char             GLchar;
+typedef unsigned int     GLenum;
+typedef unsigned char    GLboolean;
+typedef unsigned int     GLbitfield;
+typedef khronos_int8_t   GLbyte;
+typedef short            GLshort;
+typedef int              GLint;
+typedef int              GLsizei;
+typedef khronos_uint8_t  GLubyte;
+typedef unsigned short   GLushort;
+typedef unsigned int     GLuint;
+typedef khronos_float_t  GLfloat;
+typedef khronos_float_t  GLclampf;
+typedef khronos_int32_t  GLfixed;
+
+/* GL types for handling large vertex buffer objects */
+typedef khronos_intptr_t GLintptr;
+typedef khronos_ssize_t  GLsizeiptr;
+
+/* OpenGL ES core versions */
+#define GL_ES_VERSION_2_0                 1
+
+/* ClearBufferMask */
+#define GL_DEPTH_BUFFER_BIT               0x00000100
+#define GL_STENCIL_BUFFER_BIT             0x00000400
+#define GL_COLOR_BUFFER_BIT               0x00004000
+
+/* Boolean */
+#define GL_FALSE                          0
+#define GL_TRUE                           1
+
+/* BeginMode */
+#define GL_POINTS                         0x0000
+#define GL_LINES                          0x0001
+#define GL_LINE_LOOP                      0x0002
+#define GL_LINE_STRIP                     0x0003
+#define GL_TRIANGLES                      0x0004
+#define GL_TRIANGLE_STRIP                 0x0005
+#define GL_TRIANGLE_FAN                   0x0006
+
+/* AlphaFunction (not supported in ES20) */
+/*      GL_NEVER */
+/*      GL_LESS */
+/*      GL_EQUAL */
+/*      GL_LEQUAL */
+/*      GL_GREATER */
+/*      GL_NOTEQUAL */
+/*      GL_GEQUAL */
+/*      GL_ALWAYS */
+
+/* BlendingFactorDest */
+#define GL_ZERO                           0
+#define GL_ONE                            1
+#define GL_SRC_COLOR                      0x0300
+#define GL_ONE_MINUS_SRC_COLOR            0x0301
+#define GL_SRC_ALPHA                      0x0302
+#define GL_ONE_MINUS_SRC_ALPHA            0x0303
+#define GL_DST_ALPHA                      0x0304
+#define GL_ONE_MINUS_DST_ALPHA            0x0305
+
+/* BlendingFactorSrc */
+/*      GL_ZERO */
+/*      GL_ONE */
+#define GL_DST_COLOR                      0x0306
+#define GL_ONE_MINUS_DST_COLOR            0x0307
+#define GL_SRC_ALPHA_SATURATE             0x0308
+/*      GL_SRC_ALPHA */
+/*      GL_ONE_MINUS_SRC_ALPHA */
+/*      GL_DST_ALPHA */
+/*      GL_ONE_MINUS_DST_ALPHA */
+
+/* BlendEquationSeparate */
+#define GL_FUNC_ADD                       0x8006
+#define GL_BLEND_EQUATION                 0x8009
+#define GL_BLEND_EQUATION_RGB             0x8009    /* same as BLEND_EQUATION */
+#define GL_BLEND_EQUATION_ALPHA           0x883D
+
+/* BlendSubtract */
+#define GL_FUNC_SUBTRACT                  0x800A
+#define GL_FUNC_REVERSE_SUBTRACT          0x800B
+
+/* Separate Blend Functions */
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#define GL_CONSTANT_COLOR                 0x8001
+#define GL_ONE_MINUS_CONSTANT_COLOR       0x8002
+#define GL_CONSTANT_ALPHA                 0x8003
+#define GL_ONE_MINUS_CONSTANT_ALPHA       0x8004
+#define GL_BLEND_COLOR                    0x8005
+
+/* Buffer Objects */
+#define GL_ARRAY_BUFFER                   0x8892
+#define GL_ELEMENT_ARRAY_BUFFER           0x8893
+#define GL_ARRAY_BUFFER_BINDING           0x8894
+#define GL_ELEMENT_ARRAY_BUFFER_BINDING   0x8895
+
+#define GL_STREAM_DRAW                    0x88E0
+#define GL_STATIC_DRAW                    0x88E4
+#define GL_DYNAMIC_DRAW                   0x88E8
+
+#define GL_BUFFER_SIZE                    0x8764
+#define GL_BUFFER_USAGE                   0x8765
+
+#define GL_CURRENT_VERTEX_ATTRIB          0x8626
+
+/* CullFaceMode */
+#define GL_FRONT                          0x0404
+#define GL_BACK                           0x0405
+#define GL_FRONT_AND_BACK                 0x0408
+
+/* DepthFunction */
+/*      GL_NEVER */
+/*      GL_LESS */
+/*      GL_EQUAL */
+/*      GL_LEQUAL */
+/*      GL_GREATER */
+/*      GL_NOTEQUAL */
+/*      GL_GEQUAL */
+/*      GL_ALWAYS */
+
+/* EnableCap */
+#define GL_TEXTURE_2D                     0x0DE1
+#define GL_CULL_FACE                      0x0B44
+#define GL_BLEND                          0x0BE2
+#define GL_DITHER                         0x0BD0
+#define GL_STENCIL_TEST                   0x0B90
+#define GL_DEPTH_TEST                     0x0B71
+#define GL_SCISSOR_TEST                   0x0C11
+#define GL_POLYGON_OFFSET_FILL            0x8037
+#define GL_SAMPLE_ALPHA_TO_COVERAGE       0x809E
+#define GL_SAMPLE_COVERAGE                0x80A0
+
+/* ErrorCode */
+#define GL_NO_ERROR                       0
+#define GL_INVALID_ENUM                   0x0500
+#define GL_INVALID_VALUE                  0x0501
+#define GL_INVALID_OPERATION              0x0502
+#define GL_OUT_OF_MEMORY                  0x0505
+
+/* FrontFaceDirection */
+#define GL_CW                             0x0900
+#define GL_CCW                            0x0901
+
+/* GetPName */
+#define GL_LINE_WIDTH                     0x0B21
+#define GL_ALIASED_POINT_SIZE_RANGE       0x846D
+#define GL_ALIASED_LINE_WIDTH_RANGE       0x846E
+#define GL_CULL_FACE_MODE                 0x0B45
+#define GL_FRONT_FACE                     0x0B46
+#define GL_DEPTH_RANGE                    0x0B70
+#define GL_DEPTH_WRITEMASK                0x0B72
+#define GL_DEPTH_CLEAR_VALUE              0x0B73
+#define GL_DEPTH_FUNC                     0x0B74
+#define GL_STENCIL_CLEAR_VALUE            0x0B91
+#define GL_STENCIL_FUNC                   0x0B92
+#define GL_STENCIL_FAIL                   0x0B94
+#define GL_STENCIL_PASS_DEPTH_FAIL        0x0B95
+#define GL_STENCIL_PASS_DEPTH_PASS        0x0B96
+#define GL_STENCIL_REF                    0x0B97
+#define GL_STENCIL_VALUE_MASK             0x0B93
+#define GL_STENCIL_WRITEMASK              0x0B98
+#define GL_STENCIL_BACK_FUNC              0x8800
+#define GL_STENCIL_BACK_FAIL              0x8801
+#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
+#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
+#define GL_STENCIL_BACK_REF               0x8CA3
+#define GL_STENCIL_BACK_VALUE_MASK        0x8CA4
+#define GL_STENCIL_BACK_WRITEMASK         0x8CA5
+#define GL_VIEWPORT                       0x0BA2
+#define GL_SCISSOR_BOX                    0x0C10
+/*      GL_SCISSOR_TEST */
+#define GL_COLOR_CLEAR_VALUE              0x0C22
+#define GL_COLOR_WRITEMASK                0x0C23
+#define GL_UNPACK_ALIGNMENT               0x0CF5
+#define GL_PACK_ALIGNMENT                 0x0D05
+#define GL_MAX_TEXTURE_SIZE               0x0D33
+#define GL_MAX_VIEWPORT_DIMS              0x0D3A
+#define GL_SUBPIXEL_BITS                  0x0D50
+#define GL_RED_BITS                       0x0D52
+#define GL_GREEN_BITS                     0x0D53
+#define GL_BLUE_BITS                      0x0D54
+#define GL_ALPHA_BITS                     0x0D55
+#define GL_DEPTH_BITS                     0x0D56
+#define GL_STENCIL_BITS                   0x0D57
+#define GL_POLYGON_OFFSET_UNITS           0x2A00
+/*      GL_POLYGON_OFFSET_FILL */
+#define GL_POLYGON_OFFSET_FACTOR          0x8038
+#define GL_TEXTURE_BINDING_2D             0x8069
+#define GL_SAMPLE_BUFFERS                 0x80A8
+#define GL_SAMPLES                        0x80A9
+#define GL_SAMPLE_COVERAGE_VALUE          0x80AA
+#define GL_SAMPLE_COVERAGE_INVERT         0x80AB
+
+/* GetTextureParameter */
+/*      GL_TEXTURE_MAG_FILTER */
+/*      GL_TEXTURE_MIN_FILTER */
+/*      GL_TEXTURE_WRAP_S */
+/*      GL_TEXTURE_WRAP_T */
+
+#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2
+#define GL_COMPRESSED_TEXTURE_FORMATS     0x86A3
+
+/* HintMode */
+#define GL_DONT_CARE                      0x1100
+#define GL_FASTEST                        0x1101
+#define GL_NICEST                         0x1102
+
+/* HintTarget */
+#define GL_GENERATE_MIPMAP_HINT            0x8192
+
+/* DataType */
+#define GL_BYTE                           0x1400
+#define GL_UNSIGNED_BYTE                  0x1401
+#define GL_SHORT                          0x1402
+#define GL_UNSIGNED_SHORT                 0x1403
+#define GL_INT                            0x1404
+#define GL_UNSIGNED_INT                   0x1405
+#define GL_FLOAT                          0x1406
+#define GL_FIXED                          0x140C
+
+/* PixelFormat */
+#define GL_DEPTH_COMPONENT                0x1902
+#define GL_ALPHA                          0x1906
+#define GL_RGB                            0x1907
+#define GL_RGBA                           0x1908
+#define GL_LUMINANCE                      0x1909
+#define GL_LUMINANCE_ALPHA                0x190A
+
+/* PixelType */
+/*      GL_UNSIGNED_BYTE */
+#define GL_UNSIGNED_SHORT_4_4_4_4         0x8033
+#define GL_UNSIGNED_SHORT_5_5_5_1         0x8034
+#define GL_UNSIGNED_SHORT_5_6_5           0x8363
+
+/* Shaders */
+#define GL_FRAGMENT_SHADER                  0x8B30
+#define GL_VERTEX_SHADER                    0x8B31
+#define GL_MAX_VERTEX_ATTRIBS               0x8869
+#define GL_MAX_VERTEX_UNIFORM_VECTORS       0x8DFB
+#define GL_MAX_VARYING_VECTORS              0x8DFC
+#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D
+#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS   0x8B4C
+#define GL_MAX_TEXTURE_IMAGE_UNITS          0x8872
+#define GL_MAX_FRAGMENT_UNIFORM_VECTORS     0x8DFD
+#define GL_SHADER_TYPE                      0x8B4F
+#define GL_DELETE_STATUS                    0x8B80
+#define GL_LINK_STATUS                      0x8B82
+#define GL_VALIDATE_STATUS                  0x8B83
+#define GL_ATTACHED_SHADERS                 0x8B85
+#define GL_ACTIVE_UNIFORMS                  0x8B86
+#define GL_ACTIVE_UNIFORM_MAX_LENGTH        0x8B87
+#define GL_ACTIVE_ATTRIBUTES                0x8B89
+#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH      0x8B8A
+#define GL_SHADING_LANGUAGE_VERSION         0x8B8C
+#define GL_CURRENT_PROGRAM                  0x8B8D
+
+/* StencilFunction */
+#define GL_NEVER                          0x0200
+#define GL_LESS                           0x0201
+#define GL_EQUAL                          0x0202
+#define GL_LEQUAL                         0x0203
+#define GL_GREATER                        0x0204
+#define GL_NOTEQUAL                       0x0205
+#define GL_GEQUAL                         0x0206
+#define GL_ALWAYS                         0x0207
+
+/* StencilOp */
+/*      GL_ZERO */
+#define GL_KEEP                           0x1E00
+#define GL_REPLACE                        0x1E01
+#define GL_INCR                           0x1E02
+#define GL_DECR                           0x1E03
+#define GL_INVERT                         0x150A
+#define GL_INCR_WRAP                      0x8507
+#define GL_DECR_WRAP                      0x8508
+
+/* StringName */
+#define GL_VENDOR                         0x1F00
+#define GL_RENDERER                       0x1F01
+#define GL_VERSION                        0x1F02
+#define GL_EXTENSIONS                     0x1F03
+
+/* TextureMagFilter */
+#define GL_NEAREST                        0x2600
+#define GL_LINEAR                         0x2601
+
+/* TextureMinFilter */
+/*      GL_NEAREST */
+/*      GL_LINEAR */
+#define GL_NEAREST_MIPMAP_NEAREST         0x2700
+#define GL_LINEAR_MIPMAP_NEAREST          0x2701
+#define GL_NEAREST_MIPMAP_LINEAR          0x2702
+#define GL_LINEAR_MIPMAP_LINEAR           0x2703
+
+/* TextureParameterName */
+#define GL_TEXTURE_MAG_FILTER             0x2800
+#define GL_TEXTURE_MIN_FILTER             0x2801
+#define GL_TEXTURE_WRAP_S                 0x2802
+#define GL_TEXTURE_WRAP_T                 0x2803
+
+/* TextureTarget */
+/*      GL_TEXTURE_2D */
+#define GL_TEXTURE                        0x1702
+
+#define GL_TEXTURE_CUBE_MAP               0x8513
+#define GL_TEXTURE_BINDING_CUBE_MAP       0x8514
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_X    0x8515
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X    0x8516
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y    0x8517
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y    0x8518
+#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z    0x8519
+#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z    0x851A
+#define GL_MAX_CUBE_MAP_TEXTURE_SIZE      0x851C
+
+/* TextureUnit */
+#define GL_TEXTURE0                       0x84C0
+#define GL_TEXTURE1                       0x84C1
+#define GL_TEXTURE2                       0x84C2
+#define GL_TEXTURE3                       0x84C3
+#define GL_TEXTURE4                       0x84C4
+#define GL_TEXTURE5                       0x84C5
+#define GL_TEXTURE6                       0x84C6
+#define GL_TEXTURE7                       0x84C7
+#define GL_TEXTURE8                       0x84C8
+#define GL_TEXTURE9                       0x84C9
+#define GL_TEXTURE10                      0x84CA
+#define GL_TEXTURE11                      0x84CB
+#define GL_TEXTURE12                      0x84CC
+#define GL_TEXTURE13                      0x84CD
+#define GL_TEXTURE14                      0x84CE
+#define GL_TEXTURE15                      0x84CF
+#define GL_TEXTURE16                      0x84D0
+#define GL_TEXTURE17                      0x84D1
+#define GL_TEXTURE18                      0x84D2
+#define GL_TEXTURE19                      0x84D3
+#define GL_TEXTURE20                      0x84D4
+#define GL_TEXTURE21                      0x84D5
+#define GL_TEXTURE22                      0x84D6
+#define GL_TEXTURE23                      0x84D7
+#define GL_TEXTURE24                      0x84D8
+#define GL_TEXTURE25                      0x84D9
+#define GL_TEXTURE26                      0x84DA
+#define GL_TEXTURE27                      0x84DB
+#define GL_TEXTURE28                      0x84DC
+#define GL_TEXTURE29                      0x84DD
+#define GL_TEXTURE30                      0x84DE
+#define GL_TEXTURE31                      0x84DF
+#define GL_ACTIVE_TEXTURE                 0x84E0
+
+/* TextureWrapMode */
+#define GL_REPEAT                         0x2901
+#define GL_CLAMP_TO_EDGE                  0x812F
+#define GL_MIRRORED_REPEAT                0x8370
+
+/* Uniform Types */
+#define GL_FLOAT_VEC2                     0x8B50
+#define GL_FLOAT_VEC3                     0x8B51
+#define GL_FLOAT_VEC4                     0x8B52
+#define GL_INT_VEC2                       0x8B53
+#define GL_INT_VEC3                       0x8B54
+#define GL_INT_VEC4                       0x8B55
+#define GL_BOOL                           0x8B56
+#define GL_BOOL_VEC2                      0x8B57
+#define GL_BOOL_VEC3                      0x8B58
+#define GL_BOOL_VEC4                      0x8B59
+#define GL_FLOAT_MAT2                     0x8B5A
+#define GL_FLOAT_MAT3                     0x8B5B
+#define GL_FLOAT_MAT4                     0x8B5C
+#define GL_SAMPLER_2D                     0x8B5E
+#define GL_SAMPLER_CUBE                   0x8B60
+
+/* Vertex Arrays */
+#define GL_VERTEX_ATTRIB_ARRAY_ENABLED        0x8622
+#define GL_VERTEX_ATTRIB_ARRAY_SIZE           0x8623
+#define GL_VERTEX_ATTRIB_ARRAY_STRIDE         0x8624
+#define GL_VERTEX_ATTRIB_ARRAY_TYPE           0x8625
+#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED     0x886A
+#define GL_VERTEX_ATTRIB_ARRAY_POINTER        0x8645
+#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
+
+/* Read Format */
+#define GL_IMPLEMENTATION_COLOR_READ_TYPE   0x8B9A
+#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B
+
+/* Shader Source */
+#define GL_COMPILE_STATUS                 0x8B81
+#define GL_INFO_LOG_LENGTH                0x8B84
+#define GL_SHADER_SOURCE_LENGTH           0x8B88
+#define GL_SHADER_COMPILER                0x8DFA
+
+/* Shader Binary */
+#define GL_SHADER_BINARY_FORMATS          0x8DF8
+#define GL_NUM_SHADER_BINARY_FORMATS      0x8DF9
+
+/* Shader Precision-Specified Types */
+#define GL_LOW_FLOAT                      0x8DF0
+#define GL_MEDIUM_FLOAT                   0x8DF1
+#define GL_HIGH_FLOAT                     0x8DF2
+#define GL_LOW_INT                        0x8DF3
+#define GL_MEDIUM_INT                     0x8DF4
+#define GL_HIGH_INT                       0x8DF5
+
+/* Framebuffer Object. */
+#define GL_FRAMEBUFFER                    0x8D40
+#define GL_RENDERBUFFER                   0x8D41
+
+#define GL_RGBA4                          0x8056
+#define GL_RGB5_A1                        0x8057
+#define GL_RGB565                         0x8D62
+#define GL_DEPTH_COMPONENT16              0x81A5
+#define GL_STENCIL_INDEX8                 0x8D48
+
+#define GL_RENDERBUFFER_WIDTH             0x8D42
+#define GL_RENDERBUFFER_HEIGHT            0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT   0x8D44
+#define GL_RENDERBUFFER_RED_SIZE          0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE        0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE         0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE        0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE        0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE      0x8D55
+
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE           0x8CD0
+#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME           0x8CD1
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL         0x8CD2
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3
+
+#define GL_COLOR_ATTACHMENT0              0x8CE0
+#define GL_DEPTH_ATTACHMENT               0x8D00
+#define GL_STENCIL_ATTACHMENT             0x8D20
+
+#define GL_NONE                           0
+
+#define GL_FRAMEBUFFER_COMPLETE                      0x8CD5
+#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         0x8CD6
+#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
+#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         0x8CD9
+#define GL_FRAMEBUFFER_UNSUPPORTED                   0x8CDD
+
+#define GL_FRAMEBUFFER_BINDING            0x8CA6
+#define GL_RENDERBUFFER_BINDING           0x8CA7
+#define GL_MAX_RENDERBUFFER_SIZE          0x84E8
+
+#define GL_INVALID_FRAMEBUFFER_OPERATION  0x0506
+
+/*-------------------------------------------------------------------------
+ * GL core functions.
+ *-----------------------------------------------------------------------*/
+
+GL_APICALL void         GL_APIENTRY glActiveTexture (GLenum texture);
+GL_APICALL void         GL_APIENTRY glAttachShader (GLuint program, GLuint shader);
+GL_APICALL void         GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name);
+GL_APICALL void         GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer);
+GL_APICALL void         GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer);
+GL_APICALL void         GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer);
+GL_APICALL void         GL_APIENTRY glBindTexture (GLenum target, GLuint texture);
+GL_APICALL void         GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GL_APICALL void         GL_APIENTRY glBlendEquation ( GLenum mode );
+GL_APICALL void         GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha);
+GL_APICALL void         GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor);
+GL_APICALL void         GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha);
+GL_APICALL void         GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage);
+GL_APICALL void         GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data);
+GL_APICALL GLenum       GL_APIENTRY glCheckFramebufferStatus (GLenum target);
+GL_APICALL void         GL_APIENTRY glClear (GLbitfield mask);
+GL_APICALL void         GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
+GL_APICALL void         GL_APIENTRY glClearDepthf (GLclampf depth);
+GL_APICALL void         GL_APIENTRY glClearStencil (GLint s);
+GL_APICALL void         GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
+GL_APICALL void         GL_APIENTRY glCompileShader (GLuint shader);
+GL_APICALL void         GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void         GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void         GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border);
+GL_APICALL void         GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL GLuint       GL_APIENTRY glCreateProgram (void);
+GL_APICALL GLuint       GL_APIENTRY glCreateShader (GLenum type);
+GL_APICALL void         GL_APIENTRY glCullFace (GLenum mode);
+GL_APICALL void         GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers);
+GL_APICALL void         GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers);
+GL_APICALL void         GL_APIENTRY glDeleteProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers);
+GL_APICALL void         GL_APIENTRY glDeleteShader (GLuint shader);
+GL_APICALL void         GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures);
+GL_APICALL void         GL_APIENTRY glDepthFunc (GLenum func);
+GL_APICALL void         GL_APIENTRY glDepthMask (GLboolean flag);
+GL_APICALL void         GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar);
+GL_APICALL void         GL_APIENTRY glDetachShader (GLuint program, GLuint shader);
+GL_APICALL void         GL_APIENTRY glDisable (GLenum cap);
+GL_APICALL void         GL_APIENTRY glDisableVertexAttribArray (GLuint index);
+GL_APICALL void         GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count);
+GL_APICALL void         GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices);
+GL_APICALL void         GL_APIENTRY glEnable (GLenum cap);
+GL_APICALL void         GL_APIENTRY glEnableVertexAttribArray (GLuint index);
+GL_APICALL void         GL_APIENTRY glFinish (void);
+GL_APICALL void         GL_APIENTRY glFlush (void);
+GL_APICALL void         GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+GL_APICALL void         GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+GL_APICALL void         GL_APIENTRY glFrontFace (GLenum mode);
+GL_APICALL void         GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers);
+GL_APICALL void         GL_APIENTRY glGenerateMipmap (GLenum target);
+GL_APICALL void         GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers);
+GL_APICALL void         GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers);
+GL_APICALL void         GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
+GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
+GL_APICALL GLint        GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
+GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL GLenum       GL_APIENTRY glGetError (void);
+GL_APICALL void         GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog);
+GL_APICALL void         GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog);
+GL_APICALL void         GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision);
+GL_APICALL void         GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source);
+GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name);
+GL_APICALL void         GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
+GL_APICALL GLint        GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
+GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
+GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
+GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
+GL_APICALL void         GL_APIENTRY glHint (GLenum target, GLenum mode);
+GL_APICALL GLboolean    GL_APIENTRY glIsBuffer (GLuint buffer);
+GL_APICALL GLboolean    GL_APIENTRY glIsEnabled (GLenum cap);
+GL_APICALL GLboolean    GL_APIENTRY glIsFramebuffer (GLuint framebuffer);
+GL_APICALL GLboolean    GL_APIENTRY glIsProgram (GLuint program);
+GL_APICALL GLboolean    GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer);
+GL_APICALL GLboolean    GL_APIENTRY glIsShader (GLuint shader);
+GL_APICALL GLboolean    GL_APIENTRY glIsTexture (GLuint texture);
+GL_APICALL void         GL_APIENTRY glLineWidth (GLfloat width);
+GL_APICALL void         GL_APIENTRY glLinkProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glPixelStorei (GLenum pname, GLint param);
+GL_APICALL void         GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units);
+GL_APICALL void         GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels);
+GL_APICALL void         GL_APIENTRY glReleaseShaderCompiler (void);
+GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
+GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
+GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
+GL_APICALL void         GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask);
+GL_APICALL void         GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass);
+GL_APICALL void         GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass);
+GL_APICALL void         GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void         GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param);
+GL_APICALL void         GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params);
+GL_APICALL void         GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param);
+GL_APICALL void         GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params);
+GL_APICALL void         GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void         GL_APIENTRY glUniform1f (GLint location, GLfloat x);
+GL_APICALL void         GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform1i (GLint location, GLint x);
+GL_APICALL void         GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y);
+GL_APICALL void         GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y);
+GL_APICALL void         GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void         GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z);
+GL_APICALL void         GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void         GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v);
+GL_APICALL void         GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w);
+GL_APICALL void         GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v);
+GL_APICALL void         GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void         GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void         GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
+GL_APICALL void         GL_APIENTRY glUseProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glValidateProgram (GLuint program);
+GL_APICALL void         GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x);
+GL_APICALL void         GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y);
+GL_APICALL void         GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void         GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void         GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
+GL_APICALL void         GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr);
+GL_APICALL void         GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl2_h_ */
+
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2ext.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2ext.h
new file mode 100644
index 0000000..e8ca8b1
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2ext.h
@@ -0,0 +1,2050 @@
+#ifndef __gl2ext_h_
+#define __gl2ext_h_
+
+/* $Revision: 22801 $ on $Date:: 2013-08-21 03:20:48 -0700 #$ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+#ifndef GL_APIENTRYP
+#   define GL_APIENTRYP GL_APIENTRY*
+#endif
+
+/* New types shared by several extensions */
+
+#ifndef __gl3_h_
+/* These are defined with respect to <inttypes.h> in the
+ * Apple extension spec, but they are also used by non-APPLE
+ * extensions, and in the Khronos header we use the Khronos
+ * portable types in khrplatform.h, which must be defined.
+ */
+typedef khronos_int64_t GLint64;
+typedef khronos_uint64_t GLuint64;
+typedef struct __GLsync *GLsync;
+#endif
+
+
+/*------------------------------------------------------------------------*
+ * OES extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_OES_compressed_ETC1_RGB8_texture */
+#ifndef GL_OES_compressed_ETC1_RGB8_texture
+#define GL_ETC1_RGB8_OES                                        0x8D64
+#endif
+
+/* GL_OES_compressed_paletted_texture */
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_PALETTE4_RGB8_OES                                    0x8B90
+#define GL_PALETTE4_RGBA8_OES                                   0x8B91
+#define GL_PALETTE4_R5_G6_B5_OES                                0x8B92
+#define GL_PALETTE4_RGBA4_OES                                   0x8B93
+#define GL_PALETTE4_RGB5_A1_OES                                 0x8B94
+#define GL_PALETTE8_RGB8_OES                                    0x8B95
+#define GL_PALETTE8_RGBA8_OES                                   0x8B96
+#define GL_PALETTE8_R5_G6_B5_OES                                0x8B97
+#define GL_PALETTE8_RGBA4_OES                                   0x8B98
+#define GL_PALETTE8_RGB5_A1_OES                                 0x8B99
+#endif
+
+/* GL_OES_depth24 */
+#ifndef GL_OES_depth24
+#define GL_DEPTH_COMPONENT24_OES                                0x81A6
+#endif
+
+/* GL_OES_depth32 */
+#ifndef GL_OES_depth32
+#define GL_DEPTH_COMPONENT32_OES                                0x81A7
+#endif
+
+/* GL_OES_depth_texture */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_EGL_image */
+#ifndef GL_OES_EGL_image
+typedef void* GLeglImageOES;
+#endif
+
+/* GL_OES_EGL_image_external */
+#ifndef GL_OES_EGL_image_external
+/* GLeglImageOES defined in GL_OES_EGL_image already. */
+#define GL_TEXTURE_EXTERNAL_OES                                 0x8D65
+#define GL_SAMPLER_EXTERNAL_OES                                 0x8D66
+#define GL_TEXTURE_BINDING_EXTERNAL_OES                         0x8D67
+#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES                     0x8D68
+#endif
+
+/* GL_OES_element_index_uint */
+#ifndef GL_OES_element_index_uint
+#define GL_UNSIGNED_INT                                         0x1405
+#endif
+
+/* GL_OES_get_program_binary */
+#ifndef GL_OES_get_program_binary
+#define GL_PROGRAM_BINARY_LENGTH_OES                            0x8741
+#define GL_NUM_PROGRAM_BINARY_FORMATS_OES                       0x87FE
+#define GL_PROGRAM_BINARY_FORMATS_OES                           0x87FF
+#endif
+
+/* GL_OES_mapbuffer */
+#ifndef GL_OES_mapbuffer
+#define GL_WRITE_ONLY_OES                                       0x88B9
+#define GL_BUFFER_ACCESS_OES                                    0x88BB
+#define GL_BUFFER_MAPPED_OES                                    0x88BC
+#define GL_BUFFER_MAP_POINTER_OES                               0x88BD
+#endif
+
+/* GL_OES_packed_depth_stencil */
+#ifndef GL_OES_packed_depth_stencil
+#define GL_DEPTH_STENCIL_OES                                    0x84F9
+#define GL_UNSIGNED_INT_24_8_OES                                0x84FA
+#define GL_DEPTH24_STENCIL8_OES                                 0x88F0
+#endif
+
+/* GL_OES_required_internalformat */
+#ifndef GL_OES_required_internalformat
+#define GL_ALPHA8_OES                                           0x803C
+#define GL_DEPTH_COMPONENT16_OES                                0x81A5
+/* reuse GL_DEPTH_COMPONENT24_OES */
+/* reuse GL_DEPTH24_STENCIL8_OES */
+/* reuse GL_DEPTH_COMPONENT32_OES */
+#define GL_LUMINANCE4_ALPHA4_OES                                0x8043
+#define GL_LUMINANCE8_ALPHA8_OES                                0x8045
+#define GL_LUMINANCE8_OES                                       0x8040
+#define GL_RGBA4_OES                                            0x8056
+#define GL_RGB5_A1_OES                                          0x8057
+#define GL_RGB565_OES                                           0x8D62
+/* reuse GL_RGB8_OES */
+/* reuse GL_RGBA8_OES */
+/* reuse GL_RGB10_EXT */
+/* reuse GL_RGB10_A2_EXT */
+#endif
+
+/* GL_OES_rgb8_rgba8 */
+#ifndef GL_OES_rgb8_rgba8
+#define GL_RGB8_OES                                             0x8051
+#define GL_RGBA8_OES                                            0x8058
+#endif
+
+/* GL_OES_standard_derivatives */
+#ifndef GL_OES_standard_derivatives
+#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES                  0x8B8B
+#endif
+
+/* GL_OES_stencil1 */
+#ifndef GL_OES_stencil1
+#define GL_STENCIL_INDEX1_OES                                   0x8D46
+#endif
+
+/* GL_OES_stencil4 */
+#ifndef GL_OES_stencil4
+#define GL_STENCIL_INDEX4_OES                                   0x8D47
+#endif
+
+#ifndef GL_OES_surfaceless_context
+#define GL_FRAMEBUFFER_UNDEFINED_OES                            0x8219
+#endif
+
+/* GL_OES_texture_3D */
+#ifndef GL_OES_texture_3D
+#define GL_TEXTURE_WRAP_R_OES                                   0x8072
+#define GL_TEXTURE_3D_OES                                       0x806F
+#define GL_TEXTURE_BINDING_3D_OES                               0x806A
+#define GL_MAX_3D_TEXTURE_SIZE_OES                              0x8073
+#define GL_SAMPLER_3D_OES                                       0x8B5F
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES        0x8CD4
+#endif
+
+/* GL_OES_texture_float */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_texture_float_linear */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_texture_half_float */
+#ifndef GL_OES_texture_half_float
+#define GL_HALF_FLOAT_OES                                       0x8D61
+#endif
+
+/* GL_OES_texture_half_float_linear */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_texture_npot */
+/* No new tokens introduced by this extension. */
+
+/* GL_OES_vertex_array_object */
+#ifndef GL_OES_vertex_array_object
+#define GL_VERTEX_ARRAY_BINDING_OES                             0x85B5
+#endif
+
+/* GL_OES_vertex_half_float */
+/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */
+
+/* GL_OES_vertex_type_10_10_10_2 */
+#ifndef GL_OES_vertex_type_10_10_10_2
+#define GL_UNSIGNED_INT_10_10_10_2_OES                          0x8DF6
+#define GL_INT_10_10_10_2_OES                                   0x8DF7
+#endif
+
+/*------------------------------------------------------------------------*
+ * KHR extension tokens
+ *------------------------------------------------------------------------*/
+
+#ifndef GL_KHR_debug
+typedef void (GL_APIENTRYP GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam);
+#define GL_DEBUG_OUTPUT_SYNCHRONOUS_KHR                         0x8242
+#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_KHR                 0x8243
+#define GL_DEBUG_CALLBACK_FUNCTION_KHR                          0x8244
+#define GL_DEBUG_CALLBACK_USER_PARAM_KHR                        0x8245
+#define GL_DEBUG_SOURCE_API_KHR                                 0x8246
+#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_KHR                       0x8247
+#define GL_DEBUG_SOURCE_SHADER_COMPILER_KHR                     0x8248
+#define GL_DEBUG_SOURCE_THIRD_PARTY_KHR                         0x8249
+#define GL_DEBUG_SOURCE_APPLICATION_KHR                         0x824A
+#define GL_DEBUG_SOURCE_OTHER_KHR                               0x824B
+#define GL_DEBUG_TYPE_ERROR_KHR                                 0x824C
+#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_KHR                   0x824D
+#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_KHR                    0x824E
+#define GL_DEBUG_TYPE_PORTABILITY_KHR                           0x824F
+#define GL_DEBUG_TYPE_PERFORMANCE_KHR                           0x8250
+#define GL_DEBUG_TYPE_OTHER_KHR                                 0x8251
+#define GL_DEBUG_TYPE_MARKER_KHR                                0x8268
+#define GL_DEBUG_TYPE_PUSH_GROUP_KHR                            0x8269
+#define GL_DEBUG_TYPE_POP_GROUP_KHR                             0x826A
+#define GL_DEBUG_SEVERITY_NOTIFICATION_KHR                      0x826B
+#define GL_MAX_DEBUG_GROUP_STACK_DEPTH_KHR                      0x826C
+#define GL_DEBUG_GROUP_STACK_DEPTH_KHR                          0x826D
+#define GL_BUFFER_KHR                                           0x82E0
+#define GL_SHADER_KHR                                           0x82E1
+#define GL_PROGRAM_KHR                                          0x82E2
+#define GL_QUERY_KHR                                            0x82E3
+/* PROGRAM_PIPELINE only in GL */
+#define GL_SAMPLER_KHR                                          0x82E6
+/* DISPLAY_LIST only in GL */
+#define GL_MAX_LABEL_LENGTH_KHR                                 0x82E8
+#define GL_MAX_DEBUG_MESSAGE_LENGTH_KHR                         0x9143
+#define GL_MAX_DEBUG_LOGGED_MESSAGES_KHR                        0x9144
+#define GL_DEBUG_LOGGED_MESSAGES_KHR                            0x9145
+#define GL_DEBUG_SEVERITY_HIGH_KHR                              0x9146
+#define GL_DEBUG_SEVERITY_MEDIUM_KHR                            0x9147
+#define GL_DEBUG_SEVERITY_LOW_KHR                               0x9148
+#define GL_DEBUG_OUTPUT_KHR                                     0x92E0
+#define GL_CONTEXT_FLAG_DEBUG_BIT_KHR                           0x00000002
+#define GL_STACK_OVERFLOW_KHR                                   0x0503
+#define GL_STACK_UNDERFLOW_KHR                                  0x0504
+#endif
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR                         0x93B0
+#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR                         0x93B1
+#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR                         0x93B2
+#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR                         0x93B3
+#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR                         0x93B4
+#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR                         0x93B5
+#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR                         0x93B6
+#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR                         0x93B7
+#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR                        0x93B8
+#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR                        0x93B9
+#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR                        0x93BA
+#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR                       0x93BB
+#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR                       0x93BC
+#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR                       0x93BD
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR                 0x93D0
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR                 0x93D1
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR                 0x93D2
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR                 0x93D3
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR                 0x93D4
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR                 0x93D5
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR                 0x93D6
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR                 0x93D7
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR                0x93D8
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR                0x93D9
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR                0x93DA
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR               0x93DB
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR               0x93DC
+#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR               0x93DD
+#endif
+
+/*------------------------------------------------------------------------*
+ * AMD extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_AMD_compressed_3DC_texture */
+#ifndef GL_AMD_compressed_3DC_texture
+#define GL_3DC_X_AMD                                            0x87F9
+#define GL_3DC_XY_AMD                                           0x87FA
+#endif
+
+/* GL_AMD_compressed_ATC_texture */
+#ifndef GL_AMD_compressed_ATC_texture
+#define GL_ATC_RGB_AMD                                          0x8C92
+#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD                          0x8C93
+#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD                      0x87EE
+#endif
+
+/* GL_AMD_performance_monitor */
+#ifndef GL_AMD_performance_monitor
+#define GL_COUNTER_TYPE_AMD                                     0x8BC0
+#define GL_COUNTER_RANGE_AMD                                    0x8BC1
+#define GL_UNSIGNED_INT64_AMD                                   0x8BC2
+#define GL_PERCENTAGE_AMD                                       0x8BC3
+#define GL_PERFMON_RESULT_AVAILABLE_AMD                         0x8BC4
+#define GL_PERFMON_RESULT_SIZE_AMD                              0x8BC5
+#define GL_PERFMON_RESULT_AMD                                   0x8BC6
+#endif
+
+/* GL_AMD_program_binary_Z400 */
+#ifndef GL_AMD_program_binary_Z400
+#define GL_Z400_BINARY_AMD                                      0x8740
+#endif
+
+/*------------------------------------------------------------------------*
+ * ANGLE extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_ANGLE_depth_texture */
+#ifndef GL_ANGLE_depth_texture
+#define GL_DEPTH_COMPONENT                                      0x1902
+#define GL_DEPTH_STENCIL_OES                                    0x84F9
+#define GL_UNSIGNED_SHORT                                       0x1403
+#define GL_UNSIGNED_INT                                         0x1405
+#define GL_UNSIGNED_INT_24_8_OES                                0x84FA
+#define GL_DEPTH_COMPONENT16                                    0x81A5
+#define GL_DEPTH_COMPONENT32_OES                                0x81A7
+#define GL_DEPTH24_STENCIL8_OES                                 0x88F0
+#endif
+
+/* GL_ANGLE_framebuffer_blit */
+#ifndef GL_ANGLE_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_ANGLE                               0x8CA8
+#define GL_DRAW_FRAMEBUFFER_ANGLE                               0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE                       0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_ANGLE                       0x8CAA
+#endif
+
+/* GL_ANGLE_framebuffer_multisample */
+#ifndef GL_ANGLE_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_ANGLE                           0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE             0x8D56
+#define GL_MAX_SAMPLES_ANGLE                                    0x8D57
+#endif
+
+/* GL_ANGLE_instanced_arrays */
+#ifndef GL_ANGLE_instanced_arrays
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE                    0x88FE
+#endif
+
+/* GL_ANGLE_pack_reverse_row_order */
+#ifndef GL_ANGLE_pack_reverse_row_order
+#define GL_PACK_REVERSE_ROW_ORDER_ANGLE                         0x93A4
+#endif
+
+/* GL_ANGLE_program_binary */
+#ifndef GL_ANGLE_program_binary
+#define GL_PROGRAM_BINARY_ANGLE                                 0x93A6
+#endif
+
+/* GL_ANGLE_texture_compression_dxt3 */
+#ifndef GL_ANGLE_texture_compression_dxt3
+#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE                      0x83F2
+#endif
+
+/* GL_ANGLE_texture_compression_dxt5 */
+#ifndef GL_ANGLE_texture_compression_dxt5
+#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE                      0x83F3
+#endif
+
+/* GL_ANGLE_texture_usage */
+#ifndef GL_ANGLE_texture_usage
+#define GL_TEXTURE_USAGE_ANGLE                                  0x93A2
+#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE                         0x93A3
+#endif
+
+/* GL_ANGLE_translated_shader_source */
+#ifndef GL_ANGLE_translated_shader_source
+#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE                0x93A0
+#endif
+
+/*------------------------------------------------------------------------*
+ * APPLE extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_APPLE_copy_texture_levels */
+/* No new tokens introduced by this extension. */
+
+/* GL_APPLE_framebuffer_multisample */
+#ifndef GL_APPLE_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_APPLE                           0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE             0x8D56
+#define GL_MAX_SAMPLES_APPLE                                    0x8D57
+#define GL_READ_FRAMEBUFFER_APPLE                               0x8CA8
+#define GL_DRAW_FRAMEBUFFER_APPLE                               0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE                       0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_APPLE                       0x8CAA
+#endif
+
+/* GL_APPLE_rgb_422 */
+#ifndef GL_APPLE_rgb_422
+#define GL_RGB_422_APPLE                                        0x8A1F
+#define GL_UNSIGNED_SHORT_8_8_APPLE                             0x85BA
+#define GL_UNSIGNED_SHORT_8_8_REV_APPLE                         0x85BB
+#endif
+
+/* GL_APPLE_sync */
+#ifndef GL_APPLE_sync
+
+#define GL_SYNC_OBJECT_APPLE                                    0x8A53
+#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE                        0x9111
+#define GL_OBJECT_TYPE_APPLE                                    0x9112
+#define GL_SYNC_CONDITION_APPLE                                 0x9113
+#define GL_SYNC_STATUS_APPLE                                    0x9114
+#define GL_SYNC_FLAGS_APPLE                                     0x9115
+#define GL_SYNC_FENCE_APPLE                                     0x9116
+#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE                     0x9117
+#define GL_UNSIGNALED_APPLE                                     0x9118
+#define GL_SIGNALED_APPLE                                       0x9119
+#define GL_ALREADY_SIGNALED_APPLE                               0x911A
+#define GL_TIMEOUT_EXPIRED_APPLE                                0x911B
+#define GL_CONDITION_SATISFIED_APPLE                            0x911C
+#define GL_WAIT_FAILED_APPLE                                    0x911D
+#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE                        0x00000001
+#define GL_TIMEOUT_IGNORED_APPLE                                0xFFFFFFFFFFFFFFFFull
+#endif
+
+/* GL_APPLE_texture_format_BGRA8888 */
+#ifndef GL_APPLE_texture_format_BGRA8888
+#define GL_BGRA_EXT                                             0x80E1
+#endif
+
+/* GL_APPLE_texture_max_level */
+#ifndef GL_APPLE_texture_max_level
+#define GL_TEXTURE_MAX_LEVEL_APPLE                              0x813D
+#endif
+
+/*------------------------------------------------------------------------*
+ * ARM extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_ARM_mali_program_binary */
+#ifndef GL_ARM_mali_program_binary
+#define GL_MALI_PROGRAM_BINARY_ARM                              0x8F61
+#endif
+
+/* GL_ARM_mali_shader_binary */
+#ifndef GL_ARM_mali_shader_binary
+#define GL_MALI_SHADER_BINARY_ARM                               0x8F60
+#endif
+
+/* GL_ARM_rgba8 */
+/* No new tokens introduced by this extension. */
+
+/*------------------------------------------------------------------------*
+ * EXT extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_EXT_blend_minmax */
+#ifndef GL_EXT_blend_minmax
+#define GL_MIN_EXT                                              0x8007
+#define GL_MAX_EXT                                              0x8008
+#endif
+
+/* GL_EXT_color_buffer_half_float */
+#ifndef GL_EXT_color_buffer_half_float
+#define GL_RGBA16F_EXT                                          0x881A
+#define GL_RGB16F_EXT                                           0x881B
+#define GL_RG16F_EXT                                            0x822F
+#define GL_R16F_EXT                                             0x822D
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT            0x8211
+#define GL_UNSIGNED_NORMALIZED_EXT                              0x8C17
+#endif
+
+/* GL_EXT_debug_label */
+#ifndef GL_EXT_debug_label
+#define GL_PROGRAM_PIPELINE_OBJECT_EXT                          0x8A4F
+#define GL_PROGRAM_OBJECT_EXT                                   0x8B40
+#define GL_SHADER_OBJECT_EXT                                    0x8B48
+#define GL_BUFFER_OBJECT_EXT                                    0x9151
+#define GL_QUERY_OBJECT_EXT                                     0x9153
+#define GL_VERTEX_ARRAY_OBJECT_EXT                              0x9154
+#endif
+
+/* GL_EXT_debug_marker */
+/* No new tokens introduced by this extension. */
+
+/* GL_EXT_discard_framebuffer */
+#ifndef GL_EXT_discard_framebuffer
+#define GL_COLOR_EXT                                            0x1800
+#define GL_DEPTH_EXT                                            0x1801
+#define GL_STENCIL_EXT                                          0x1802
+#endif
+
+#ifndef GL_EXT_disjoint_timer_query
+#define GL_QUERY_COUNTER_BITS_EXT                               0x8864
+#define GL_CURRENT_QUERY_EXT                                    0x8865
+#define GL_QUERY_RESULT_EXT                                     0x8866
+#define GL_QUERY_RESULT_AVAILABLE_EXT                           0x8867
+#define GL_TIME_ELAPSED_EXT                                     0x88BF
+#define GL_TIMESTAMP_EXT                                        0x8E28
+#define GL_GPU_DISJOINT_EXT                                     0x8FBB
+#endif
+
+#ifndef GL_EXT_draw_buffers
+#define GL_EXT_draw_buffers 1
+#define GL_MAX_COLOR_ATTACHMENTS_EXT                            0x8CDF
+#define GL_MAX_DRAW_BUFFERS_EXT                                 0x8824
+#define GL_DRAW_BUFFER0_EXT                                     0x8825
+#define GL_DRAW_BUFFER1_EXT                                     0x8826
+#define GL_DRAW_BUFFER2_EXT                                     0x8827
+#define GL_DRAW_BUFFER3_EXT                                     0x8828
+#define GL_DRAW_BUFFER4_EXT                                     0x8829
+#define GL_DRAW_BUFFER5_EXT                                     0x882A
+#define GL_DRAW_BUFFER6_EXT                                     0x882B
+#define GL_DRAW_BUFFER7_EXT                                     0x882C
+#define GL_DRAW_BUFFER8_EXT                                     0x882D
+#define GL_DRAW_BUFFER9_EXT                                     0x882E
+#define GL_DRAW_BUFFER10_EXT                                    0x882F
+#define GL_DRAW_BUFFER11_EXT                                    0x8830
+#define GL_DRAW_BUFFER12_EXT                                    0x8831
+#define GL_DRAW_BUFFER13_EXT                                    0x8832
+#define GL_DRAW_BUFFER14_EXT                                    0x8833
+#define GL_DRAW_BUFFER15_EXT                                    0x8834
+#define GL_COLOR_ATTACHMENT0_EXT                                0x8CE0
+#define GL_COLOR_ATTACHMENT1_EXT                                0x8CE1
+#define GL_COLOR_ATTACHMENT2_EXT                                0x8CE2
+#define GL_COLOR_ATTACHMENT3_EXT                                0x8CE3
+#define GL_COLOR_ATTACHMENT4_EXT                                0x8CE4
+#define GL_COLOR_ATTACHMENT5_EXT                                0x8CE5
+#define GL_COLOR_ATTACHMENT6_EXT                                0x8CE6
+#define GL_COLOR_ATTACHMENT7_EXT                                0x8CE7
+#define GL_COLOR_ATTACHMENT8_EXT                                0x8CE8
+#define GL_COLOR_ATTACHMENT9_EXT                                0x8CE9
+#define GL_COLOR_ATTACHMENT10_EXT                               0x8CEA
+#define GL_COLOR_ATTACHMENT11_EXT                               0x8CEB
+#define GL_COLOR_ATTACHMENT12_EXT                               0x8CEC
+#define GL_COLOR_ATTACHMENT13_EXT                               0x8CED
+#define GL_COLOR_ATTACHMENT14_EXT                               0x8CEE
+#define GL_COLOR_ATTACHMENT15_EXT                               0x8CEF
+#endif
+
+/* GL_EXT_map_buffer_range */
+#ifndef GL_EXT_map_buffer_range
+#define GL_MAP_READ_BIT_EXT                                     0x0001
+#define GL_MAP_WRITE_BIT_EXT                                    0x0002
+#define GL_MAP_INVALIDATE_RANGE_BIT_EXT                         0x0004
+#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT                        0x0008
+#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT                           0x0010
+#define GL_MAP_UNSYNCHRONIZED_BIT_EXT                           0x0020
+#endif
+
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT           0x8D6C
+/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */
+#define GL_RENDERBUFFER_SAMPLES_EXT                             0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT               0x8D56
+#define GL_MAX_SAMPLES_EXT                                      0x8D57
+#endif
+
+/* GL_EXT_multiview_draw_buffers */
+#ifndef GL_EXT_multiview_draw_buffers
+#define GL_COLOR_ATTACHMENT_EXT                                 0x90F0
+#define GL_MULTIVIEW_EXT                                        0x90F1
+#define GL_DRAW_BUFFER_EXT                                      0x0C01
+#define GL_READ_BUFFER_EXT                                      0x0C02
+#define GL_MAX_MULTIVIEW_BUFFERS_EXT                            0x90F2
+#endif
+
+/* GL_EXT_multi_draw_arrays */
+/* No new tokens introduced by this extension. */
+
+/* GL_EXT_occlusion_query_boolean */
+#ifndef GL_EXT_occlusion_query_boolean
+#define GL_ANY_SAMPLES_PASSED_EXT                               0x8C2F
+#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT                  0x8D6A
+#define GL_CURRENT_QUERY_EXT                                    0x8865
+#define GL_QUERY_RESULT_EXT                                     0x8866
+#define GL_QUERY_RESULT_AVAILABLE_EXT                           0x8867
+#endif
+
+/* GL_EXT_read_format_bgra */
+#ifndef GL_EXT_read_format_bgra
+#define GL_BGRA_EXT                                             0x80E1
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT                       0x8365
+#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT                       0x8366
+#endif
+
+/* GL_EXT_robustness */
+#ifndef GL_EXT_robustness
+/* reuse GL_NO_ERROR */
+#define GL_GUILTY_CONTEXT_RESET_EXT                             0x8253
+#define GL_INNOCENT_CONTEXT_RESET_EXT                           0x8254
+#define GL_UNKNOWN_CONTEXT_RESET_EXT                            0x8255
+#define GL_CONTEXT_ROBUST_ACCESS_EXT                            0x90F3
+#define GL_RESET_NOTIFICATION_STRATEGY_EXT                      0x8256
+#define GL_LOSE_CONTEXT_ON_RESET_EXT                            0x8252
+#define GL_NO_RESET_NOTIFICATION_EXT                            0x8261
+#endif
+
+/* GL_EXT_separate_shader_objects */
+#ifndef GL_EXT_separate_shader_objects
+#define GL_VERTEX_SHADER_BIT_EXT                                0x00000001
+#define GL_FRAGMENT_SHADER_BIT_EXT                              0x00000002
+#define GL_ALL_SHADER_BITS_EXT                                  0xFFFFFFFF
+#define GL_PROGRAM_SEPARABLE_EXT                                0x8258
+#define GL_ACTIVE_PROGRAM_EXT                                   0x8259
+#define GL_PROGRAM_PIPELINE_BINDING_EXT                         0x825A
+#endif
+
+/* GL_EXT_shader_framebuffer_fetch */
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT                 0x8A52
+#endif
+
+/* GL_EXT_shader_texture_lod */
+/* No new tokens introduced by this extension. */
+
+/* GL_EXT_shadow_samplers */
+#ifndef GL_EXT_shadow_samplers
+#define GL_TEXTURE_COMPARE_MODE_EXT                             0x884C
+#define GL_TEXTURE_COMPARE_FUNC_EXT                             0x884D
+#define GL_COMPARE_REF_TO_TEXTURE_EXT                           0x884E
+#define GL_SAMPLER_2D_SHADOW_EXT                                0x8B62
+#endif
+
+/* GL_EXT_sRGB */
+#ifndef GL_EXT_sRGB
+#define GL_SRGB_EXT                                             0x8C40
+#define GL_SRGB_ALPHA_EXT                                       0x8C42
+#define GL_SRGB8_ALPHA8_EXT                                     0x8C43
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT            0x8210
+#endif
+
+/* GL_EXT_sRGB_write_control */
+#ifndef GL_EXT_sRGB_write_control
+#define GL_EXT_sRGB_write_control 1
+#define GL_FRAMEBUFFER_SRGB_EXT                                 0x8DB9
+#endif
+
+/* GL_EXT_texture_compression_dxt1 */
+#ifndef GL_EXT_texture_compression_dxt1
+#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT                         0x83F0
+#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT                        0x83F1
+#endif
+
+/* GL_EXT_texture_filter_anisotropic */
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_TEXTURE_MAX_ANISOTROPY_EXT                           0x84FE
+#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT                       0x84FF
+#endif
+
+/* GL_EXT_texture_format_BGRA8888 */
+#ifndef GL_EXT_texture_format_BGRA8888
+#define GL_BGRA_EXT                                             0x80E1
+#endif
+
+/* GL_EXT_texture_rg */
+#ifndef GL_EXT_texture_rg
+#define GL_RED_EXT                                              0x1903
+#define GL_RG_EXT                                               0x8227
+#define GL_R8_EXT                                               0x8229
+#define GL_RG8_EXT                                              0x822B
+#endif
+
+/* GL_EXT_texture_sRGB_decode */
+#ifndef GL_EXT_texture_sRGB_decode
+#define GL_EXT_texture_sRGB_decode 1
+#define GL_TEXTURE_SRGB_DECODE_EXT                              0x8A48
+#define GL_DECODE_EXT                                           0x8A49
+#define GL_SKIP_DECODE_EXT                                      0x8A4A
+#endif
+
+/* GL_EXT_texture_storage */
+#ifndef GL_EXT_texture_storage
+#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT                         0x912F
+#define GL_ALPHA8_EXT                                           0x803C
+#define GL_LUMINANCE8_EXT                                       0x8040
+#define GL_LUMINANCE8_ALPHA8_EXT                                0x8045
+#define GL_RGBA32F_EXT                                          0x8814
+#define GL_RGB32F_EXT                                           0x8815
+#define GL_ALPHA32F_EXT                                         0x8816
+#define GL_LUMINANCE32F_EXT                                     0x8818
+#define GL_LUMINANCE_ALPHA32F_EXT                               0x8819
+/* reuse GL_RGBA16F_EXT */
+/* reuse GL_RGB16F_EXT */
+#define GL_ALPHA16F_EXT                                         0x881C
+#define GL_LUMINANCE16F_EXT                                     0x881E
+#define GL_LUMINANCE_ALPHA16F_EXT                               0x881F
+#define GL_RGB10_A2_EXT                                         0x8059
+#define GL_RGB10_EXT                                            0x8052
+#define GL_BGRA8_EXT                                            0x93A1
+#define GL_R8_EXT                                               0x8229
+#define GL_RG8_EXT                                              0x822B
+#define GL_R32F_EXT                                             0x822E
+#define GL_RG32F_EXT                                            0x8230
+#define GL_R16F_EXT                                             0x822D
+#define GL_RG16F_EXT                                            0x822F
+#endif
+
+/* GL_EXT_texture_type_2_10_10_10_REV */
+#ifndef GL_EXT_texture_type_2_10_10_10_REV
+#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT                      0x8368
+#endif
+
+/* GL_EXT_unpack_subimage */
+#ifndef GL_EXT_unpack_subimage
+#define GL_UNPACK_ROW_LENGTH_EXT                                0x0CF2
+#define GL_UNPACK_SKIP_ROWS_EXT                                 0x0CF3
+#define GL_UNPACK_SKIP_PIXELS_EXT                               0x0CF4
+#endif
+
+/*------------------------------------------------------------------------*
+ * DMP extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_DMP_shader_binary */
+#ifndef GL_DMP_shader_binary
+#define GL_SHADER_BINARY_DMP                                    0x9250
+#endif
+
+/*------------------------------------------------------------------------*
+ * FJ extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_FJ_shader_binary_GCCSO */
+#ifndef GL_FJ_shader_binary_GCCSO
+#define GL_GCCSO_SHADER_BINARY_FJ                               0x9260
+#endif
+
+/*------------------------------------------------------------------------*
+ * IMG extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_IMG_program_binary */
+#ifndef GL_IMG_program_binary
+#define GL_SGX_PROGRAM_BINARY_IMG                               0x9130
+#endif
+
+/* GL_IMG_read_format */
+#ifndef GL_IMG_read_format
+#define GL_BGRA_IMG                                             0x80E1
+#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG                       0x8365
+#endif
+
+/* GL_IMG_shader_binary */
+#ifndef GL_IMG_shader_binary
+#define GL_SGX_BINARY_IMG                                       0x8C0A
+#endif
+
+/* GL_IMG_texture_compression_pvrtc */
+#ifndef GL_IMG_texture_compression_pvrtc
+#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG                      0x8C00
+#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG                      0x8C01
+#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG                     0x8C02
+#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG                     0x8C03
+#endif
+
+/* GL_IMG_texture_compression_pvrtc2 */
+#ifndef GL_IMG_texture_compression_pvrtc2
+#define GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG                     0x9137
+#define GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG                     0x9138
+#endif
+
+/* GL_IMG_multisampled_render_to_texture */
+#ifndef GL_IMG_multisampled_render_to_texture
+#define GL_RENDERBUFFER_SAMPLES_IMG                             0x9133
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG               0x9134
+#define GL_MAX_SAMPLES_IMG                                      0x9135
+#define GL_TEXTURE_SAMPLES_IMG                                  0x9136
+#endif
+
+/*------------------------------------------------------------------------*
+ * NV extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_NV_coverage_sample */
+#ifndef GL_NV_coverage_sample
+#define GL_COVERAGE_COMPONENT_NV                                0x8ED0
+#define GL_COVERAGE_COMPONENT4_NV                               0x8ED1
+#define GL_COVERAGE_ATTACHMENT_NV                               0x8ED2
+#define GL_COVERAGE_BUFFERS_NV                                  0x8ED3
+#define GL_COVERAGE_SAMPLES_NV                                  0x8ED4
+#define GL_COVERAGE_ALL_FRAGMENTS_NV                            0x8ED5
+#define GL_COVERAGE_EDGE_FRAGMENTS_NV                           0x8ED6
+#define GL_COVERAGE_AUTOMATIC_NV                                0x8ED7
+#define GL_COVERAGE_BUFFER_BIT_NV                               0x00008000
+#endif
+
+/* GL_NV_depth_nonlinear */
+#ifndef GL_NV_depth_nonlinear
+#define GL_DEPTH_COMPONENT16_NONLINEAR_NV                       0x8E2C
+#endif
+
+/* GL_NV_draw_buffers */
+#ifndef GL_NV_draw_buffers
+#define GL_MAX_DRAW_BUFFERS_NV                                  0x8824
+#define GL_DRAW_BUFFER0_NV                                      0x8825
+#define GL_DRAW_BUFFER1_NV                                      0x8826
+#define GL_DRAW_BUFFER2_NV                                      0x8827
+#define GL_DRAW_BUFFER3_NV                                      0x8828
+#define GL_DRAW_BUFFER4_NV                                      0x8829
+#define GL_DRAW_BUFFER5_NV                                      0x882A
+#define GL_DRAW_BUFFER6_NV                                      0x882B
+#define GL_DRAW_BUFFER7_NV                                      0x882C
+#define GL_DRAW_BUFFER8_NV                                      0x882D
+#define GL_DRAW_BUFFER9_NV                                      0x882E
+#define GL_DRAW_BUFFER10_NV                                     0x882F
+#define GL_DRAW_BUFFER11_NV                                     0x8830
+#define GL_DRAW_BUFFER12_NV                                     0x8831
+#define GL_DRAW_BUFFER13_NV                                     0x8832
+#define GL_DRAW_BUFFER14_NV                                     0x8833
+#define GL_DRAW_BUFFER15_NV                                     0x8834
+#define GL_COLOR_ATTACHMENT0_NV                                 0x8CE0
+#define GL_COLOR_ATTACHMENT1_NV                                 0x8CE1
+#define GL_COLOR_ATTACHMENT2_NV                                 0x8CE2
+#define GL_COLOR_ATTACHMENT3_NV                                 0x8CE3
+#define GL_COLOR_ATTACHMENT4_NV                                 0x8CE4
+#define GL_COLOR_ATTACHMENT5_NV                                 0x8CE5
+#define GL_COLOR_ATTACHMENT6_NV                                 0x8CE6
+#define GL_COLOR_ATTACHMENT7_NV                                 0x8CE7
+#define GL_COLOR_ATTACHMENT8_NV                                 0x8CE8
+#define GL_COLOR_ATTACHMENT9_NV                                 0x8CE9
+#define GL_COLOR_ATTACHMENT10_NV                                0x8CEA
+#define GL_COLOR_ATTACHMENT11_NV                                0x8CEB
+#define GL_COLOR_ATTACHMENT12_NV                                0x8CEC
+#define GL_COLOR_ATTACHMENT13_NV                                0x8CED
+#define GL_COLOR_ATTACHMENT14_NV                                0x8CEE
+#define GL_COLOR_ATTACHMENT15_NV                                0x8CEF
+#endif
+
+/* GL_NV_draw_instanced */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_fbo_color_attachments */
+#ifndef GL_NV_fbo_color_attachments
+#define GL_MAX_COLOR_ATTACHMENTS_NV                             0x8CDF
+/* GL_COLOR_ATTACHMENT{0-15}_NV defined in GL_NV_draw_buffers already. */
+#endif
+
+/* GL_NV_fence */
+#ifndef GL_NV_fence
+#define GL_ALL_COMPLETED_NV                                     0x84F2
+#define GL_FENCE_STATUS_NV                                      0x84F3
+#define GL_FENCE_CONDITION_NV                                   0x84F4
+#endif
+
+/* GL_NV_framebuffer_blit */
+#ifndef GL_NV_framebuffer_blit
+#define GL_READ_FRAMEBUFFER_NV                                  0x8CA8
+#define GL_DRAW_FRAMEBUFFER_NV                                  0x8CA9
+#define GL_DRAW_FRAMEBUFFER_BINDING_NV                          0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING_NV                          0x8CAA
+#endif
+
+/* GL_NV_framebuffer_multisample */
+#ifndef GL_NV_framebuffer_multisample
+#define GL_RENDERBUFFER_SAMPLES_NV                              0x8CAB
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV                0x8D56
+#define GL_MAX_SAMPLES_NV                                       0x8D57
+#endif
+
+/* GL_NV_generate_mipmap_sRGB */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_instanced_arrays */
+#ifndef GL_NV_instanced_arrays
+#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV                       0x88FE
+#endif
+
+/* GL_NV_read_buffer */
+#ifndef GL_NV_read_buffer
+#define GL_READ_BUFFER_NV                                       0x0C02
+#endif
+
+/* GL_NV_read_buffer_front */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_read_depth */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_read_depth_stencil */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_read_stencil */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_shadow_samplers_array */
+#ifndef GL_NV_shadow_samplers_array
+#define GL_SAMPLER_2D_ARRAY_SHADOW_NV                           0x8DC4
+#endif
+
+/* GL_NV_shadow_samplers_cube */
+#ifndef GL_NV_shadow_samplers_cube
+#define GL_SAMPLER_CUBE_SHADOW_NV                               0x8DC5
+#endif
+
+/* GL_NV_sRGB_formats */
+#ifndef GL_NV_sRGB_formats
+#define GL_SLUMINANCE_NV                                        0x8C46
+#define GL_SLUMINANCE_ALPHA_NV                                  0x8C44
+#define GL_SRGB8_NV                                             0x8C41
+#define GL_SLUMINANCE8_NV                                       0x8C47
+#define GL_SLUMINANCE8_ALPHA8_NV                                0x8C45
+#define GL_COMPRESSED_SRGB_S3TC_DXT1_NV                         0x8C4C
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV                   0x8C4D
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV                   0x8C4E
+#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV                   0x8C4F
+#define GL_ETC1_SRGB8_NV                                        0x88EE
+#endif
+
+/* GL_NV_texture_border_clamp */
+#ifndef GL_NV_texture_border_clamp
+#define GL_TEXTURE_BORDER_COLOR_NV                              0x1004
+#define GL_CLAMP_TO_BORDER_NV                                   0x812D
+#endif
+
+/* GL_NV_texture_compression_s3tc_update */
+/* No new tokens introduced by this extension. */
+
+/* GL_NV_texture_npot_2D_mipmap */
+/* No new tokens introduced by this extension. */
+
+/*------------------------------------------------------------------------*
+ * QCOM extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_QCOM_alpha_test */
+#ifndef GL_QCOM_alpha_test
+#define GL_ALPHA_TEST_QCOM                                      0x0BC0
+#define GL_ALPHA_TEST_FUNC_QCOM                                 0x0BC1
+#define GL_ALPHA_TEST_REF_QCOM                                  0x0BC2
+#endif
+
+/* GL_QCOM_binning_control */
+#ifndef GL_QCOM_binning_control
+#define GL_BINNING_CONTROL_HINT_QCOM                            0x8FB0
+#define GL_CPU_OPTIMIZED_QCOM                                   0x8FB1
+#define GL_GPU_OPTIMIZED_QCOM                                   0x8FB2
+#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM                    0x8FB3
+#endif
+
+/* GL_QCOM_driver_control */
+/* No new tokens introduced by this extension. */
+
+/* GL_QCOM_extended_get */
+#ifndef GL_QCOM_extended_get
+#define GL_TEXTURE_WIDTH_QCOM                                   0x8BD2
+#define GL_TEXTURE_HEIGHT_QCOM                                  0x8BD3
+#define GL_TEXTURE_DEPTH_QCOM                                   0x8BD4
+#define GL_TEXTURE_INTERNAL_FORMAT_QCOM                         0x8BD5
+#define GL_TEXTURE_FORMAT_QCOM                                  0x8BD6
+#define GL_TEXTURE_TYPE_QCOM                                    0x8BD7
+#define GL_TEXTURE_IMAGE_VALID_QCOM                             0x8BD8
+#define GL_TEXTURE_NUM_LEVELS_QCOM                              0x8BD9
+#define GL_TEXTURE_TARGET_QCOM                                  0x8BDA
+#define GL_TEXTURE_OBJECT_VALID_QCOM                            0x8BDB
+#define GL_STATE_RESTORE                                        0x8BDC
+#endif
+
+/* GL_QCOM_extended_get2 */
+/* No new tokens introduced by this extension. */
+
+/* GL_QCOM_perfmon_global_mode */
+#ifndef GL_QCOM_perfmon_global_mode
+#define GL_PERFMON_GLOBAL_MODE_QCOM                             0x8FA0
+#endif
+
+/* GL_QCOM_writeonly_rendering */
+#ifndef GL_QCOM_writeonly_rendering
+#define GL_WRITEONLY_RENDERING_QCOM                             0x8823
+#endif
+
+/* GL_QCOM_tiled_rendering */
+#ifndef GL_QCOM_tiled_rendering
+#define GL_COLOR_BUFFER_BIT0_QCOM                               0x00000001
+#define GL_COLOR_BUFFER_BIT1_QCOM                               0x00000002
+#define GL_COLOR_BUFFER_BIT2_QCOM                               0x00000004
+#define GL_COLOR_BUFFER_BIT3_QCOM                               0x00000008
+#define GL_COLOR_BUFFER_BIT4_QCOM                               0x00000010
+#define GL_COLOR_BUFFER_BIT5_QCOM                               0x00000020
+#define GL_COLOR_BUFFER_BIT6_QCOM                               0x00000040
+#define GL_COLOR_BUFFER_BIT7_QCOM                               0x00000080
+#define GL_DEPTH_BUFFER_BIT0_QCOM                               0x00000100
+#define GL_DEPTH_BUFFER_BIT1_QCOM                               0x00000200
+#define GL_DEPTH_BUFFER_BIT2_QCOM                               0x00000400
+#define GL_DEPTH_BUFFER_BIT3_QCOM                               0x00000800
+#define GL_DEPTH_BUFFER_BIT4_QCOM                               0x00001000
+#define GL_DEPTH_BUFFER_BIT5_QCOM                               0x00002000
+#define GL_DEPTH_BUFFER_BIT6_QCOM                               0x00004000
+#define GL_DEPTH_BUFFER_BIT7_QCOM                               0x00008000
+#define GL_STENCIL_BUFFER_BIT0_QCOM                             0x00010000
+#define GL_STENCIL_BUFFER_BIT1_QCOM                             0x00020000
+#define GL_STENCIL_BUFFER_BIT2_QCOM                             0x00040000
+#define GL_STENCIL_BUFFER_BIT3_QCOM                             0x00080000
+#define GL_STENCIL_BUFFER_BIT4_QCOM                             0x00100000
+#define GL_STENCIL_BUFFER_BIT5_QCOM                             0x00200000
+#define GL_STENCIL_BUFFER_BIT6_QCOM                             0x00400000
+#define GL_STENCIL_BUFFER_BIT7_QCOM                             0x00800000
+#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM                         0x01000000
+#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM                         0x02000000
+#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM                         0x04000000
+#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM                         0x08000000
+#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM                         0x10000000
+#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM                         0x20000000
+#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM                         0x40000000
+#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM                         0x80000000
+#endif
+
+/*------------------------------------------------------------------------*
+ * VIV extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_VIV_shader_binary */
+#ifndef GL_VIV_shader_binary
+#define GL_SHADER_BINARY_VIV                                    0x8FC4
+#endif
+
+/*------------------------------------------------------------------------*
+ * End of extension tokens, start of corresponding extension functions
+ *------------------------------------------------------------------------*/
+
+/*------------------------------------------------------------------------*
+ * OES extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_OES_compressed_ETC1_RGB8_texture */
+#ifndef GL_OES_compressed_ETC1_RGB8_texture
+#define GL_OES_compressed_ETC1_RGB8_texture 1
+#endif
+
+/* GL_OES_compressed_paletted_texture */
+#ifndef GL_OES_compressed_paletted_texture
+#define GL_OES_compressed_paletted_texture 1
+#endif
+
+/* GL_OES_depth24 */
+#ifndef GL_OES_depth24
+#define GL_OES_depth24 1
+#endif
+
+/* GL_OES_depth32 */
+#ifndef GL_OES_depth32
+#define GL_OES_depth32 1
+#endif
+
+/* GL_OES_depth_texture */
+#ifndef GL_OES_depth_texture
+#define GL_OES_depth_texture 1
+#endif
+
+/* GL_OES_EGL_image */
+#ifndef GL_OES_EGL_image
+#define GL_OES_EGL_image 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
+GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
+#endif
+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
+typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
+#endif
+
+/* GL_OES_EGL_image_external */
+#ifndef GL_OES_EGL_image_external
+#define GL_OES_EGL_image_external 1
+/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */
+#endif
+
+/* GL_OES_element_index_uint */
+#ifndef GL_OES_element_index_uint
+#define GL_OES_element_index_uint 1
+#endif
+
+/* GL_OES_fbo_render_mipmap */
+#ifndef GL_OES_fbo_render_mipmap
+#define GL_OES_fbo_render_mipmap 1
+#endif
+
+/* GL_OES_fragment_precision_high */
+#ifndef GL_OES_fragment_precision_high
+#define GL_OES_fragment_precision_high 1
+#endif
+
+/* GL_OES_get_program_binary */
+#ifndef GL_OES_get_program_binary
+#define GL_OES_get_program_binary 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length);
+#endif
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length);
+#endif
+
+/* GL_OES_mapbuffer */
+#ifndef GL_OES_mapbuffer
+#define GL_OES_mapbuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access);
+GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target);
+GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid **params);
+#endif
+typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access);
+typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target);
+typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid **params);
+#endif
+
+/* GL_OES_packed_depth_stencil */
+#ifndef GL_OES_packed_depth_stencil
+#define GL_OES_packed_depth_stencil 1
+#endif
+
+/* GL_OES_required_internalformat */
+#ifndef GL_OES_required_internalformat
+#define GL_OES_required_internalformat 1
+#endif
+
+/* GL_OES_rgb8_rgba8 */
+#ifndef GL_OES_rgb8_rgba8
+#define GL_OES_rgb8_rgba8 1
+#endif
+
+/* GL_OES_standard_derivatives */
+#ifndef GL_OES_standard_derivatives
+#define GL_OES_standard_derivatives 1
+#endif
+
+/* GL_OES_stencil1 */
+#ifndef GL_OES_stencil1
+#define GL_OES_stencil1 1
+#endif
+
+/* GL_OES_stencil4 */
+#ifndef GL_OES_stencil4
+#define GL_OES_stencil4 1
+#endif
+
+#ifndef GL_OES_surfaceless_context
+#define GL_OES_surfaceless_context 1
+#endif
+
+/* GL_OES_texture_3D */
+#ifndef GL_OES_texture_3D
+#define GL_OES_texture_3D 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
+GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
+GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+#endif
+typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
+typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
+typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
+typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOESPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
+#endif
+
+/* GL_OES_texture_float */
+#ifndef GL_OES_texture_float
+#define GL_OES_texture_float 1
+#endif
+
+/* GL_OES_texture_float_linear */
+#ifndef GL_OES_texture_float_linear
+#define GL_OES_texture_float_linear 1
+#endif
+
+/* GL_OES_texture_half_float */
+#ifndef GL_OES_texture_half_float
+#define GL_OES_texture_half_float 1
+#endif
+
+/* GL_OES_texture_half_float_linear */
+#ifndef GL_OES_texture_half_float_linear
+#define GL_OES_texture_half_float_linear 1
+#endif
+
+/* GL_OES_texture_npot */
+#ifndef GL_OES_texture_npot
+#define GL_OES_texture_npot 1
+#endif
+
+/* GL_OES_vertex_array_object */
+#ifndef GL_OES_vertex_array_object
+#define GL_OES_vertex_array_object 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array);
+GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays);
+GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays);
+GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array);
+#endif
+typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array);
+typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays);
+typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays);
+typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array);
+#endif
+
+/* GL_OES_vertex_half_float */
+#ifndef GL_OES_vertex_half_float
+#define GL_OES_vertex_half_float 1
+#endif
+
+/* GL_OES_vertex_type_10_10_10_2 */
+#ifndef GL_OES_vertex_type_10_10_10_2
+#define GL_OES_vertex_type_10_10_10_2 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * KHR extension functions
+ *------------------------------------------------------------------------*/
+
+#ifndef GL_KHR_debug
+#define GL_KHR_debug 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDebugMessageControlKHR (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+GL_APICALL void GL_APIENTRY glDebugMessageInsertKHR (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+GL_APICALL void GL_APIENTRY glDebugMessageCallbackKHR (GLDEBUGPROCKHR callback, const void *userParam);
+GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLogKHR (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+GL_APICALL void GL_APIENTRY glPushDebugGroupKHR (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+GL_APICALL void GL_APIENTRY glPopDebugGroupKHR (void);
+GL_APICALL void GL_APIENTRY glObjectLabelKHR (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+GL_APICALL void GL_APIENTRY glGetObjectLabelKHR (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+GL_APICALL void GL_APIENTRY glObjectPtrLabelKHR (const void *ptr, GLsizei length, const GLchar *label);
+GL_APICALL void GL_APIENTRY glGetObjectPtrLabelKHR (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, GLvoid **params);
+#endif
+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLKHRPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTKHRPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
+typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKKHRPROC) (GLDEBUGPROCKHR callback, const void *userParam);
+typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGKHRPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
+typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPKHRPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message);
+typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPKHRPROC) (void);
+typedef void (GL_APIENTRYP PFNGLOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELKHRPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei length, const GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELKHRPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETPOINTERVKHRPROC) (GLenum pname, GLvoid **params);
+#endif
+
+#ifndef GL_KHR_texture_compression_astc_ldr
+#define GL_KHR_texture_compression_astc_ldr 1
+#endif
+
+
+/*------------------------------------------------------------------------*
+ * AMD extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_AMD_compressed_3DC_texture */
+#ifndef GL_AMD_compressed_3DC_texture
+#define GL_AMD_compressed_3DC_texture 1
+#endif
+
+/* GL_AMD_compressed_ATC_texture */
+#ifndef GL_AMD_compressed_ATC_texture
+#define GL_AMD_compressed_ATC_texture 1
+#endif
+
+/* AMD_performance_monitor */
+#ifndef GL_AMD_performance_monitor
+#define GL_AMD_performance_monitor 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
+GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors);
+GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
+GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor);
+GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor);
+GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data);
+typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors);
+typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList);
+typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor);
+typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten);
+#endif
+
+/* GL_AMD_program_binary_Z400 */
+#ifndef GL_AMD_program_binary_Z400
+#define GL_AMD_program_binary_Z400 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * ANGLE extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_ANGLE_depth_texture */
+#ifndef GL_ANGLE_depth_texture
+#define GL_ANGLE_depth_texture 1
+#endif
+
+/* GL_ANGLE_framebuffer_blit */
+#ifndef GL_ANGLE_framebuffer_blit
+#define GL_ANGLE_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+/* GL_ANGLE_framebuffer_multisample */
+#ifndef GL_ANGLE_framebuffer_multisample
+#define GL_ANGLE_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+#ifndef GL_ANGLE_instanced_arrays
+#define GL_ANGLE_instanced_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor);
+#endif
+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount);
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor);
+#endif
+
+/* GL_ANGLE_pack_reverse_row_order */
+#ifndef GL_ANGLE_pack_reverse_row_order
+#define GL_ANGLE_pack_reverse_row_order 1
+#endif
+
+/* GL_ANGLE_program_binary */
+#ifndef GL_ANGLE_program_binary
+#define GL_ANGLE_program_binary 1
+#endif
+
+/* GL_ANGLE_texture_compression_dxt3 */
+#ifndef GL_ANGLE_texture_compression_dxt3
+#define GL_ANGLE_texture_compression_dxt3 1
+#endif
+
+/* GL_ANGLE_texture_compression_dxt5 */
+#ifndef GL_ANGLE_texture_compression_dxt5
+#define GL_ANGLE_texture_compression_dxt5 1
+#endif
+
+/* GL_ANGLE_texture_usage */
+#ifndef GL_ANGLE_texture_usage
+#define GL_ANGLE_texture_usage 1
+#endif
+
+#ifndef GL_ANGLE_translated_shader_source
+#define GL_ANGLE_translated_shader_source 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
+#endif
+typedef void (GL_APIENTRYP PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source);
+#endif
+
+/*------------------------------------------------------------------------*
+ * APPLE extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_APPLE_copy_texture_levels */
+#ifndef GL_APPLE_copy_texture_levels
+#define GL_APPLE_copy_texture_levels 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
+#endif
+typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount);
+#endif
+
+/* GL_APPLE_framebuffer_multisample */
+#ifndef GL_APPLE_framebuffer_multisample
+#define GL_APPLE_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void);
+#endif
+
+/* GL_APPLE_rgb_422 */
+#ifndef GL_APPLE_rgb_422
+#define GL_APPLE_rgb_422 1
+#endif
+
+/* GL_APPLE_sync */
+#ifndef GL_APPLE_sync
+#define GL_APPLE_sync 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags);
+GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync);
+GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync);
+GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout);
+GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params);
+GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags);
+typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync);
+typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync);
+typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout);
+typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params);
+typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values);
+#endif
+
+/* GL_APPLE_texture_format_BGRA8888 */
+#ifndef GL_APPLE_texture_format_BGRA8888
+#define GL_APPLE_texture_format_BGRA8888 1
+#endif
+
+/* GL_APPLE_texture_max_level */
+#ifndef GL_APPLE_texture_max_level
+#define GL_APPLE_texture_max_level 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * ARM extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_ARM_mali_program_binary */
+#ifndef GL_ARM_mali_program_binary
+#define GL_ARM_mali_program_binary 1
+#endif
+
+/* GL_ARM_mali_shader_binary */
+#ifndef GL_ARM_mali_shader_binary
+#define GL_ARM_mali_shader_binary 1
+#endif
+
+/* GL_ARM_rgba8 */
+#ifndef GL_ARM_rgba8
+#define GL_ARM_rgba8 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * EXT extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_EXT_blend_minmax */
+#ifndef GL_EXT_blend_minmax
+#define GL_EXT_blend_minmax 1
+#endif
+
+/* GL_EXT_color_buffer_half_float */
+#ifndef GL_EXT_color_buffer_half_float
+#define GL_EXT_color_buffer_half_float 1
+#endif
+
+/* GL_EXT_debug_label */
+#ifndef GL_EXT_debug_label
+#define GL_EXT_debug_label 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label);
+typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label);
+#endif
+
+/* GL_EXT_debug_marker */
+#ifndef GL_EXT_debug_marker
+#define GL_EXT_debug_marker 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker);
+GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker);
+GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void);
+#endif
+typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker);
+typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void);
+#endif
+
+/* GL_EXT_discard_framebuffer */
+#ifndef GL_EXT_discard_framebuffer
+#define GL_EXT_discard_framebuffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+#endif
+typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments);
+#endif
+
+#ifndef GL_EXT_disjoint_timer_query
+#define GL_EXT_disjoint_timer_query 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids);
+GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids);
+GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id);
+GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id);
+GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target);
+GL_APICALL void GL_APIENTRY glQueryCounterEXT (GLuint id, GLenum target);
+GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glGetQueryObjectivEXT (GLuint id, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params);
+GL_APICALL void GL_APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64 *params);
+GL_APICALL void GL_APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64 *params);
+#endif
+typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids);
+typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids);
+typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id);
+typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id);
+typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target);
+typedef void (GL_APIENTRYP PFNGLQUERYCOUNTEREXTPROC) (GLuint id, GLenum target);
+typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTIVEXTPROC) (GLuint id, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params);
+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64 *params);
+typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64 *params);
+#endif /* GL_EXT_disjoint_timer_query */
+
+#ifndef GL_EXT_draw_buffers
+#define GL_EXT_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDrawBuffersEXT (GLsizei n, const GLenum *bufs);
+#endif
+typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSEXTPROC) (GLsizei n, const GLenum *bufs);
+#endif /* GL_EXT_draw_buffers */
+
+/* GL_EXT_map_buffer_range */
+#ifndef GL_EXT_map_buffer_range
+#define GL_EXT_map_buffer_range 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length);
+#endif
+
+/* GL_EXT_multisampled_render_to_texture */
+#ifndef GL_EXT_multisampled_render_to_texture
+#define GL_EXT_multisampled_render_to_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);             
+GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+
+/* GL_EXT_multiview_draw_buffers */
+#ifndef GL_EXT_multiview_draw_buffers
+#define GL_EXT_multiview_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index);
+GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices);
+GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data);
+#endif
+typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index);
+typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices);
+typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data);
+#endif
+
+#ifndef GL_EXT_multi_draw_arrays
+#define GL_EXT_multi_draw_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+#endif /* GL_GLEXT_PROTOTYPES */
+typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount);
+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount);
+#endif
+
+/* GL_EXT_occlusion_query_boolean */
+#ifndef GL_EXT_occlusion_query_boolean
+#define GL_EXT_occlusion_query_boolean 1
+/* All entry points also exist in GL_EXT_disjoint_timer_query */
+#endif
+
+/* GL_EXT_read_format_bgra */
+#ifndef GL_EXT_read_format_bgra
+#define GL_EXT_read_format_bgra 1
+#endif
+
+/* GL_EXT_robustness */
+#ifndef GL_EXT_robustness
+#define GL_EXT_robustness 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void);
+GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
+GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+#endif
+typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void);
+typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data);
+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params);
+typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params);
+#endif
+
+/* GL_EXT_separate_shader_objects */
+#ifndef GL_EXT_separate_shader_objects
+#define GL_EXT_separate_shader_objects 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program);
+GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program);
+GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings);
+GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline);
+GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines);
+GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines);
+GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline);
+GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value);
+GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint x);
+GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint x, GLint y);
+GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z);
+GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat x);
+GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat x, GLfloat y);
+GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value);
+GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline);
+GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+#endif
+typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program);
+typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program);
+typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings);
+typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
+typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines);
+typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines);
+typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
+typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value);
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint x);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint x, GLint y);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat x);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value);
+typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline);
+typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog);
+#endif
+
+/* GL_EXT_shader_framebuffer_fetch */
+#ifndef GL_EXT_shader_framebuffer_fetch
+#define GL_EXT_shader_framebuffer_fetch 1
+#endif
+
+/* GL_EXT_shader_texture_lod */
+#ifndef GL_EXT_shader_texture_lod
+#define GL_EXT_shader_texture_lod 1
+#endif
+
+/* GL_EXT_shadow_samplers */
+#ifndef GL_EXT_shadow_samplers
+#define GL_EXT_shadow_samplers 1
+#endif
+
+/* GL_EXT_sRGB */
+#ifndef GL_EXT_sRGB
+#define GL_EXT_sRGB 1
+#endif
+
+/* GL_EXT_texture_compression_dxt1 */
+#ifndef GL_EXT_texture_compression_dxt1
+#define GL_EXT_texture_compression_dxt1 1
+#endif
+
+/* GL_EXT_texture_filter_anisotropic */
+#ifndef GL_EXT_texture_filter_anisotropic
+#define GL_EXT_texture_filter_anisotropic 1
+#endif
+
+/* GL_EXT_texture_format_BGRA8888 */
+#ifndef GL_EXT_texture_format_BGRA8888
+#define GL_EXT_texture_format_BGRA8888 1
+#endif
+
+/* GL_EXT_texture_rg */
+#ifndef GL_EXT_texture_rg
+#define GL_EXT_texture_rg 1
+#endif
+
+/* GL_EXT_texture_storage */
+#ifndef GL_EXT_texture_storage
+#define GL_EXT_texture_storage 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
+#endif
+
+/* GL_EXT_texture_type_2_10_10_10_REV */
+#ifndef GL_EXT_texture_type_2_10_10_10_REV
+#define GL_EXT_texture_type_2_10_10_10_REV 1
+#endif
+
+/* GL_EXT_unpack_subimage */
+#ifndef GL_EXT_unpack_subimage
+#define GL_EXT_unpack_subimage 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * DMP extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_DMP_shader_binary */
+#ifndef GL_DMP_shader_binary
+#define GL_DMP_shader_binary 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * FJ extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_FJ_shader_binary_GCCSO */
+#ifndef GL_FJ_shader_binary_GCCSO
+#define GL_FJ_shader_binary_GCCSO 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * IMG extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_IMG_program_binary */
+#ifndef GL_IMG_program_binary
+#define GL_IMG_program_binary 1
+#endif
+
+/* GL_IMG_read_format */
+#ifndef GL_IMG_read_format
+#define GL_IMG_read_format 1
+#endif
+
+/* GL_IMG_shader_binary */
+#ifndef GL_IMG_shader_binary
+#define GL_IMG_shader_binary 1
+#endif
+
+/* GL_IMG_texture_compression_pvrtc */
+#ifndef GL_IMG_texture_compression_pvrtc
+#define GL_IMG_texture_compression_pvrtc 1
+#endif
+
+/* GL_IMG_texture_compression_pvrtc2 */
+#ifndef GL_IMG_texture_compression_pvrtc2
+#define GL_IMG_texture_compression_pvrtc2 1
+#endif
+
+/* GL_IMG_multisampled_render_to_texture */
+#ifndef GL_IMG_multisampled_render_to_texture
+#define GL_IMG_multisampled_render_to_texture 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples);
+#endif
+
+/*------------------------------------------------------------------------*
+ * NV extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_NV_coverage_sample */
+#ifndef GL_NV_coverage_sample
+#define GL_NV_coverage_sample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask);
+GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation);
+#endif
+typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask);
+typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation);
+#endif
+
+/* GL_NV_depth_nonlinear */
+#ifndef GL_NV_depth_nonlinear
+#define GL_NV_depth_nonlinear 1
+#endif
+
+/* GL_NV_draw_buffers */
+#ifndef GL_NV_draw_buffers
+#define GL_NV_draw_buffers 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs);
+#endif
+typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs);
+#endif
+
+/* GL_NV_draw_instanced */
+#ifndef GL_NV_draw_instanced
+#define GL_NV_draw_instanced 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDrawArraysInstancedNV (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+GL_APICALL void GL_APIENTRY glDrawElementsInstancedNV (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDNVPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount);
+typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDNVPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount);
+#endif
+
+/* GL_NV_fbo_color_attachments */
+#ifndef GL_NV_fbo_color_attachments
+#define GL_NV_fbo_color_attachments 1
+#endif
+
+/* GL_NV_fence */
+#ifndef GL_NV_fence
+#define GL_NV_fence 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences);
+GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei n, GLuint *fences);
+GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint fence);
+GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint fence);
+GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint fence);
+GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint fence, GLenum condition);
+#endif
+typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences);
+typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences);
+typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence);
+typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence);
+typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence);
+typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition);
+#endif
+
+/* GL_NV_framebuffer_blit */
+#ifndef GL_NV_framebuffer_blit
+#define GL_NV_framebuffer_blit 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glBlitFramebufferNV (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERNVPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+#endif
+
+/* GL_NV_framebuffer_multisample */
+#ifndef GL_NV_framebuffer_multisample
+#define GL_NV_framebuffer_multisample 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleNV ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLENVPROC) ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+#endif
+
+/* GL_NV_generate_mipmap_sRGB */
+#ifndef GL_NV_generate_mipmap_sRGB
+#define GL_NV_generate_mipmap_sRGB 1
+#endif
+
+/* GL_NV_instanced_arrays */
+#ifndef GL_NV_instanced_arrays
+#define GL_NV_instanced_arrays 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glVertexAttribDivisorNV (GLuint index, GLuint divisor);
+#endif
+typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORNVPROC) (GLuint index, GLuint divisor);
+#endif
+
+/* GL_NV_read_buffer */
+#ifndef GL_NV_read_buffer
+#define GL_NV_read_buffer 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode);
+#endif
+typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode);
+#endif
+
+/* GL_NV_read_buffer_front */
+#ifndef GL_NV_read_buffer_front
+#define GL_NV_read_buffer_front 1
+#endif
+
+/* GL_NV_read_depth */
+#ifndef GL_NV_read_depth
+#define GL_NV_read_depth 1
+#endif
+
+/* GL_NV_read_depth_stencil */
+#ifndef GL_NV_read_depth_stencil
+#define GL_NV_read_depth_stencil 1
+#endif
+
+/* GL_NV_read_stencil */
+#ifndef GL_NV_read_stencil
+#define GL_NV_read_stencil 1
+#endif
+
+/* GL_NV_shadow_samplers_array */
+#ifndef GL_NV_shadow_samplers_array
+#define GL_NV_shadow_samplers_array 1
+#endif
+
+/* GL_NV_shadow_samplers_cube */
+#ifndef GL_NV_shadow_samplers_cube
+#define GL_NV_shadow_samplers_cube 1
+#endif
+
+/* GL_NV_sRGB_formats */
+#ifndef GL_NV_sRGB_formats
+#define GL_NV_sRGB_formats 1
+#endif
+
+/* GL_NV_texture_border_clamp */
+#ifndef GL_NV_texture_border_clamp
+#define GL_NV_texture_border_clamp 1
+#endif
+
+/* GL_NV_texture_compression_s3tc_update */
+#ifndef GL_NV_texture_compression_s3tc_update
+#define GL_NV_texture_compression_s3tc_update 1
+#endif
+
+/* GL_NV_texture_npot_2D_mipmap */
+#ifndef GL_NV_texture_npot_2D_mipmap
+#define GL_NV_texture_npot_2D_mipmap 1
+#endif
+
+/*------------------------------------------------------------------------*
+ * QCOM extension functions
+ *------------------------------------------------------------------------*/
+
+/* GL_QCOM_alpha_test */
+#ifndef GL_QCOM_alpha_test
+#define GL_QCOM_alpha_test 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref);
+#endif
+typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref);
+#endif
+
+/* GL_QCOM_binning_control */
+#ifndef GL_QCOM_binning_control
+#define GL_QCOM_binning_control 1
+#endif
+
+/* GL_QCOM_driver_control */
+#ifndef GL_QCOM_driver_control
+#define GL_QCOM_driver_control 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls);
+GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
+GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl);
+GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl);
+#endif
+typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls);
+typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString);
+typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
+typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl);
+#endif
+
+/* GL_QCOM_extended_get */
+#ifndef GL_QCOM_extended_get
+#define GL_QCOM_extended_get 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures);
+GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
+GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
+GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
+GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
+GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param);
+GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels);
+GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, GLvoid **params);
+#endif
+typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures);
+typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers);
+typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers);
+typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers);
+typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params);
+typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param);
+typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels);
+typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, GLvoid **params);
+#endif
+
+/* GL_QCOM_extended_get2 */
+#ifndef GL_QCOM_extended_get2
+#define GL_QCOM_extended_get2 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders);
+GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
+GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program);
+GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
+#endif
+typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders);
+typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms);
+typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program);
+typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length);
+#endif
+
+/* GL_QCOM_perfmon_global_mode */
+#ifndef GL_QCOM_perfmon_global_mode
+#define GL_QCOM_perfmon_global_mode 1
+#endif
+
+/* GL_QCOM_writeonly_rendering */
+#ifndef GL_QCOM_writeonly_rendering
+#define GL_QCOM_writeonly_rendering 1
+#endif
+
+/* GL_QCOM_tiled_rendering */
+#ifndef GL_QCOM_tiled_rendering
+#define GL_QCOM_tiled_rendering 1
+#ifdef GL_GLEXT_PROTOTYPES
+GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
+GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask);
+#endif
+typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask);
+typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask);
+#endif
+
+/*------------------------------------------------------------------------*
+ * VIV extension tokens
+ *------------------------------------------------------------------------*/
+
+/* GL_VIV_shader_binary */
+#ifndef GL_VIV_shader_binary
+#define GL_VIV_shader_binary 1
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gl2ext_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2platform.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2platform.h
new file mode 100644
index 0000000..c325686
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_gl2platform.h
@@ -0,0 +1,30 @@
+#ifndef __gl2platform_h_
+#define __gl2platform_h_
+
+/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */
+
+/*
+ * This document is licensed under the SGI Free Software B License Version
+ * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
+ */
+
+/* Platform-specific types and definitions for OpenGL ES 2.X  gl2.h
+ *
+ * Adopters may modify khrplatform.h and this file to suit their platform.
+ * You are encouraged to submit all modifications to the Khronos group so that
+ * they can be included in future versions of this file.  Please submit changes
+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
+ * by filing a bug against product "OpenGL-ES" component "Registry".
+ */
+
+/*#include <KHR/khrplatform.h>*/
+
+#ifndef GL_APICALL
+#define GL_APICALL  KHRONOS_APICALL
+#endif
+
+#ifndef GL_APIENTRY
+#define GL_APIENTRY KHRONOS_APIENTRY
+#endif
+
+#endif /* __gl2platform_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_khrplatform.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_khrplatform.h
new file mode 100644
index 0000000..c9e6f17
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_opengles2_khrplatform.h
@@ -0,0 +1,282 @@
+#ifndef __khrplatform_h_
+#define __khrplatform_h_
+
+/*
+** Copyright (c) 2008-2009 The Khronos Group Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and/or associated documentation files (the
+** "Materials"), to deal in the Materials without restriction, including
+** without limitation the rights to use, copy, modify, merge, publish,
+** distribute, sublicense, and/or sell copies of the Materials, and to
+** permit persons to whom the Materials are furnished to do so, subject to
+** the following conditions:
+**
+** The above copyright notice and this permission notice shall be included
+** in all copies or substantial portions of the Materials.
+**
+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
+*/
+
+/* Khronos platform-specific types and definitions.
+ *
+ * $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $
+ *
+ * Adopters may modify this file to suit their platform. Adopters are
+ * encouraged to submit platform specific modifications to the Khronos
+ * group so that they can be included in future versions of this file.
+ * Please submit changes by sending them to the public Khronos Bugzilla
+ * (http://khronos.org/bugzilla) by filing a bug against product
+ * "Khronos (general)" component "Registry".
+ *
+ * A predefined template which fills in some of the bug fields can be
+ * reached using http://tinyurl.com/khrplatform-h-bugreport, but you
+ * must create a Bugzilla login first.
+ *
+ *
+ * See the Implementer's Guidelines for information about where this file
+ * should be located on your system and for more details of its use:
+ *    http://www.khronos.org/registry/implementers_guide.pdf
+ *
+ * This file should be included as
+ *        #include <KHR/khrplatform.h>
+ * by Khronos client API header files that use its types and defines.
+ *
+ * The types in khrplatform.h should only be used to define API-specific types.
+ *
+ * Types defined in khrplatform.h:
+ *    khronos_int8_t              signed   8  bit
+ *    khronos_uint8_t             unsigned 8  bit
+ *    khronos_int16_t             signed   16 bit
+ *    khronos_uint16_t            unsigned 16 bit
+ *    khronos_int32_t             signed   32 bit
+ *    khronos_uint32_t            unsigned 32 bit
+ *    khronos_int64_t             signed   64 bit
+ *    khronos_uint64_t            unsigned 64 bit
+ *    khronos_intptr_t            signed   same number of bits as a pointer
+ *    khronos_uintptr_t           unsigned same number of bits as a pointer
+ *    khronos_ssize_t             signed   size
+ *    khronos_usize_t             unsigned size
+ *    khronos_float_t             signed   32 bit floating point
+ *    khronos_time_ns_t           unsigned 64 bit time in nanoseconds
+ *    khronos_utime_nanoseconds_t unsigned time interval or absolute time in
+ *                                         nanoseconds
+ *    khronos_stime_nanoseconds_t signed time interval in nanoseconds
+ *    khronos_boolean_enum_t      enumerated boolean type. This should
+ *      only be used as a base type when a client API's boolean type is
+ *      an enum. Client APIs which use an integer or other type for
+ *      booleans cannot use this as the base type for their boolean.
+ *
+ * Tokens defined in khrplatform.h:
+ *
+ *    KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
+ *
+ *    KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
+ *    KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
+ *
+ * Calling convention macros defined in this file:
+ *    KHRONOS_APICALL
+ *    KHRONOS_APIENTRY
+ *    KHRONOS_APIATTRIBUTES
+ *
+ * These may be used in function prototypes as:
+ *
+ *      KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
+ *                                  int arg1,
+ *                                  int arg2) KHRONOS_APIATTRIBUTES;
+ */
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APICALL
+ *-------------------------------------------------------------------------
+ * This precedes the return type of the function in the function prototype.
+ */
+#if defined(_WIN32) && !defined(__SCITECH_SNAP__)
+#   define KHRONOS_APICALL __declspec(dllimport)
+#elif defined (__SYMBIAN32__)
+#   define KHRONOS_APICALL IMPORT_C
+#else
+#   define KHRONOS_APICALL
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIENTRY
+ *-------------------------------------------------------------------------
+ * This follows the return type of the function  and precedes the function
+ * name in the function prototype.
+ */
+#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
+    /* Win32 but not WinCE */
+#   define KHRONOS_APIENTRY __stdcall
+#else
+#   define KHRONOS_APIENTRY
+#endif
+
+/*-------------------------------------------------------------------------
+ * Definition of KHRONOS_APIATTRIBUTES
+ *-------------------------------------------------------------------------
+ * This follows the closing parenthesis of the function prototype arguments.
+ */
+#if defined (__ARMCC_2__)
+#define KHRONOS_APIATTRIBUTES __softfp
+#else
+#define KHRONOS_APIATTRIBUTES
+#endif
+
+/*-------------------------------------------------------------------------
+ * basic type definitions
+ *-----------------------------------------------------------------------*/
+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
+
+
+/*
+ * Using <stdint.h>
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__VMS ) || defined(__sgi)
+
+/*
+ * Using <inttypes.h>
+ */
+#include <inttypes.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
+
+/*
+ * Win32
+ */
+typedef __int32                 khronos_int32_t;
+typedef unsigned __int32        khronos_uint32_t;
+typedef __int64                 khronos_int64_t;
+typedef unsigned __int64        khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif defined(__sun__) || defined(__digital__)
+
+/*
+ * Sun or Digital
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#if defined(__arch64__) || defined(_LP64)
+typedef long int                khronos_int64_t;
+typedef unsigned long int       khronos_uint64_t;
+#else
+typedef long long int           khronos_int64_t;
+typedef unsigned long long int  khronos_uint64_t;
+#endif /* __arch64__ */
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#elif 0
+
+/*
+ * Hypothetical platform with no float or int64 support
+ */
+typedef int                     khronos_int32_t;
+typedef unsigned int            khronos_uint32_t;
+#define KHRONOS_SUPPORT_INT64   0
+#define KHRONOS_SUPPORT_FLOAT   0
+
+#else
+
+/*
+ * Generic fallback
+ */
+#include <stdint.h>
+typedef int32_t                 khronos_int32_t;
+typedef uint32_t                khronos_uint32_t;
+typedef int64_t                 khronos_int64_t;
+typedef uint64_t                khronos_uint64_t;
+#define KHRONOS_SUPPORT_INT64   1
+#define KHRONOS_SUPPORT_FLOAT   1
+
+#endif
+
+
+/*
+ * Types that are (so far) the same on all platforms
+ */
+typedef signed   char          khronos_int8_t;
+typedef unsigned char          khronos_uint8_t;
+typedef signed   short int     khronos_int16_t;
+typedef unsigned short int     khronos_uint16_t;
+
+/*
+ * Types that differ between LLP64 and LP64 architectures - in LLP64, 
+ * pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
+ * to be the only LLP64 architecture in current use.
+ */
+#ifdef _WIN64
+typedef signed   long long int khronos_intptr_t;
+typedef unsigned long long int khronos_uintptr_t;
+typedef signed   long long int khronos_ssize_t;
+typedef unsigned long long int khronos_usize_t;
+#else
+typedef signed   long  int     khronos_intptr_t;
+typedef unsigned long  int     khronos_uintptr_t;
+typedef signed   long  int     khronos_ssize_t;
+typedef unsigned long  int     khronos_usize_t;
+#endif
+
+#if KHRONOS_SUPPORT_FLOAT
+/*
+ * Float type
+ */
+typedef          float         khronos_float_t;
+#endif
+
+#if KHRONOS_SUPPORT_INT64
+/* Time types
+ *
+ * These types can be used to represent a time interval in nanoseconds or
+ * an absolute Unadjusted System Time.  Unadjusted System Time is the number
+ * of nanoseconds since some arbitrary system event (e.g. since the last
+ * time the system booted).  The Unadjusted System Time is an unsigned
+ * 64 bit value that wraps back to 0 every 584 years.  Time intervals
+ * may be either signed or unsigned.
+ */
+typedef khronos_uint64_t       khronos_utime_nanoseconds_t;
+typedef khronos_int64_t        khronos_stime_nanoseconds_t;
+#endif
+
+/*
+ * Dummy value used to pad enum types to 32 bits.
+ */
+#ifndef KHRONOS_MAX_ENUM
+#define KHRONOS_MAX_ENUM 0x7FFFFFFF
+#endif
+
+/*
+ * Enumerated boolean type
+ *
+ * Values other than zero should be considered to be true.  Therefore
+ * comparisons should not be made against KHRONOS_TRUE.
+ */
+typedef enum {
+    KHRONOS_FALSE = 0,
+    KHRONOS_TRUE  = 1,
+    KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
+} khronos_boolean_enum_t;
+
+#endif /* __khrplatform_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_pixels.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_pixels.h
new file mode 100644
index 0000000..dcb7a98
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_pixels.h
@@ -0,0 +1,470 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_pixels.h
+ *
+ *  Header for the enumerated pixel format definitions.
+ */
+
+#ifndef SDL_pixels_h_
+#define SDL_pixels_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_endian.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \name Transparency definitions
+ *
+ *  These define alpha as the opacity of a surface.
+ */
+/* @{ */
+#define SDL_ALPHA_OPAQUE 255
+#define SDL_ALPHA_TRANSPARENT 0
+/* @} */
+
+/** Pixel type. */
+enum
+{
+    SDL_PIXELTYPE_UNKNOWN,
+    SDL_PIXELTYPE_INDEX1,
+    SDL_PIXELTYPE_INDEX4,
+    SDL_PIXELTYPE_INDEX8,
+    SDL_PIXELTYPE_PACKED8,
+    SDL_PIXELTYPE_PACKED16,
+    SDL_PIXELTYPE_PACKED32,
+    SDL_PIXELTYPE_ARRAYU8,
+    SDL_PIXELTYPE_ARRAYU16,
+    SDL_PIXELTYPE_ARRAYU32,
+    SDL_PIXELTYPE_ARRAYF16,
+    SDL_PIXELTYPE_ARRAYF32
+};
+
+/** Bitmap pixel order, high bit -> low bit. */
+enum
+{
+    SDL_BITMAPORDER_NONE,
+    SDL_BITMAPORDER_4321,
+    SDL_BITMAPORDER_1234
+};
+
+/** Packed component order, high bit -> low bit. */
+enum
+{
+    SDL_PACKEDORDER_NONE,
+    SDL_PACKEDORDER_XRGB,
+    SDL_PACKEDORDER_RGBX,
+    SDL_PACKEDORDER_ARGB,
+    SDL_PACKEDORDER_RGBA,
+    SDL_PACKEDORDER_XBGR,
+    SDL_PACKEDORDER_BGRX,
+    SDL_PACKEDORDER_ABGR,
+    SDL_PACKEDORDER_BGRA
+};
+
+/** Array component order, low byte -> high byte. */
+/* !!! FIXME: in 2.1, make these not overlap differently with
+   !!! FIXME:  SDL_PACKEDORDER_*, so we can simplify SDL_ISPIXELFORMAT_ALPHA */
+enum
+{
+    SDL_ARRAYORDER_NONE,
+    SDL_ARRAYORDER_RGB,
+    SDL_ARRAYORDER_RGBA,
+    SDL_ARRAYORDER_ARGB,
+    SDL_ARRAYORDER_BGR,
+    SDL_ARRAYORDER_BGRA,
+    SDL_ARRAYORDER_ABGR
+};
+
+/** Packed component layout. */
+enum
+{
+    SDL_PACKEDLAYOUT_NONE,
+    SDL_PACKEDLAYOUT_332,
+    SDL_PACKEDLAYOUT_4444,
+    SDL_PACKEDLAYOUT_1555,
+    SDL_PACKEDLAYOUT_5551,
+    SDL_PACKEDLAYOUT_565,
+    SDL_PACKEDLAYOUT_8888,
+    SDL_PACKEDLAYOUT_2101010,
+    SDL_PACKEDLAYOUT_1010102
+};
+
+#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D)
+
+#define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \
+    ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \
+     ((bits) << 8) | ((bytes) << 0))
+
+#define SDL_PIXELFLAG(X)    (((X) >> 28) & 0x0F)
+#define SDL_PIXELTYPE(X)    (((X) >> 24) & 0x0F)
+#define SDL_PIXELORDER(X)   (((X) >> 20) & 0x0F)
+#define SDL_PIXELLAYOUT(X)  (((X) >> 16) & 0x0F)
+#define SDL_BITSPERPIXEL(X) (((X) >> 8) & 0xFF)
+#define SDL_BYTESPERPIXEL(X) \
+    (SDL_ISPIXELFORMAT_FOURCC(X) ? \
+        ((((X) == SDL_PIXELFORMAT_YUY2) || \
+          ((X) == SDL_PIXELFORMAT_UYVY) || \
+          ((X) == SDL_PIXELFORMAT_YVYU)) ? 2 : 1) : (((X) >> 0) & 0xFF))
+
+#define SDL_ISPIXELFORMAT_INDEXED(format)   \
+    (!SDL_ISPIXELFORMAT_FOURCC(format) && \
+     ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8)))
+
+#define SDL_ISPIXELFORMAT_PACKED(format) \
+    (!SDL_ISPIXELFORMAT_FOURCC(format) && \
+     ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_PACKED8) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_PACKED16) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_PACKED32)))
+
+#define SDL_ISPIXELFORMAT_ARRAY(format) \
+    (!SDL_ISPIXELFORMAT_FOURCC(format) && \
+     ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_ARRAYU8) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_ARRAYU16) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_ARRAYU32) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_ARRAYF16) || \
+      (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_ARRAYF32)))
+
+#define SDL_ISPIXELFORMAT_ALPHA(format)   \
+    ((SDL_ISPIXELFORMAT_PACKED(format) && \
+     ((SDL_PIXELORDER(format) == SDL_PACKEDORDER_ARGB) || \
+      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_RGBA) || \
+      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \
+      (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA))) || \
+    (SDL_ISPIXELFORMAT_ARRAY(format) && \
+     ((SDL_PIXELORDER(format) == SDL_ARRAYORDER_ARGB) || \
+      (SDL_PIXELORDER(format) == SDL_ARRAYORDER_RGBA) || \
+      (SDL_PIXELORDER(format) == SDL_ARRAYORDER_ABGR) || \
+      (SDL_PIXELORDER(format) == SDL_ARRAYORDER_BGRA))))
+
+/* The flag is set to 1 because 0x1? is not in the printable ASCII range */
+#define SDL_ISPIXELFORMAT_FOURCC(format)    \
+    ((format) && (SDL_PIXELFLAG(format) != 1))
+
+/* Note: If you modify this list, update SDL_GetPixelFormatName() */
+typedef enum
+{
+    SDL_PIXELFORMAT_UNKNOWN,
+    SDL_PIXELFORMAT_INDEX1LSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0,
+                               1, 0),
+    SDL_PIXELFORMAT_INDEX1MSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0,
+                               1, 0),
+    SDL_PIXELFORMAT_INDEX4LSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0,
+                               4, 0),
+    SDL_PIXELFORMAT_INDEX4MSB =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0,
+                               4, 0),
+    SDL_PIXELFORMAT_INDEX8 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1),
+    SDL_PIXELFORMAT_RGB332 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_332, 8, 1),
+    SDL_PIXELFORMAT_RGB444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_4444, 12, 2),
+    SDL_PIXELFORMAT_RGB555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_1555, 15, 2),
+    SDL_PIXELFORMAT_BGR555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR,
+                               SDL_PACKEDLAYOUT_1555, 15, 2),
+    SDL_PIXELFORMAT_ARGB4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_RGBA4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_ABGR4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_BGRA4444 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA,
+                               SDL_PACKEDLAYOUT_4444, 16, 2),
+    SDL_PIXELFORMAT_ARGB1555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_1555, 16, 2),
+    SDL_PIXELFORMAT_RGBA5551 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA,
+                               SDL_PACKEDLAYOUT_5551, 16, 2),
+    SDL_PIXELFORMAT_ABGR1555 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR,
+                               SDL_PACKEDLAYOUT_1555, 16, 2),
+    SDL_PIXELFORMAT_BGRA5551 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA,
+                               SDL_PACKEDLAYOUT_5551, 16, 2),
+    SDL_PIXELFORMAT_RGB565 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_565, 16, 2),
+    SDL_PIXELFORMAT_BGR565 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR,
+                               SDL_PACKEDLAYOUT_565, 16, 2),
+    SDL_PIXELFORMAT_RGB24 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0,
+                               24, 3),
+    SDL_PIXELFORMAT_BGR24 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0,
+                               24, 3),
+    SDL_PIXELFORMAT_RGB888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_RGBX8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_BGR888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_BGRX8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX,
+                               SDL_PACKEDLAYOUT_8888, 24, 4),
+    SDL_PIXELFORMAT_ARGB8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_RGBA8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_ABGR8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_BGRA8888 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA,
+                               SDL_PACKEDLAYOUT_8888, 32, 4),
+    SDL_PIXELFORMAT_ARGB2101010 =
+        SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB,
+                               SDL_PACKEDLAYOUT_2101010, 32, 4),
+
+    /* Aliases for RGBA byte arrays of color data, for the current platform */
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+    SDL_PIXELFORMAT_RGBA32 = SDL_PIXELFORMAT_RGBA8888,
+    SDL_PIXELFORMAT_ARGB32 = SDL_PIXELFORMAT_ARGB8888,
+    SDL_PIXELFORMAT_BGRA32 = SDL_PIXELFORMAT_BGRA8888,
+    SDL_PIXELFORMAT_ABGR32 = SDL_PIXELFORMAT_ABGR8888,
+#else
+    SDL_PIXELFORMAT_RGBA32 = SDL_PIXELFORMAT_ABGR8888,
+    SDL_PIXELFORMAT_ARGB32 = SDL_PIXELFORMAT_BGRA8888,
+    SDL_PIXELFORMAT_BGRA32 = SDL_PIXELFORMAT_ARGB8888,
+    SDL_PIXELFORMAT_ABGR32 = SDL_PIXELFORMAT_RGBA8888,
+#endif
+
+    SDL_PIXELFORMAT_YV12 =      /**< Planar mode: Y + V + U  (3 planes) */
+        SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'),
+    SDL_PIXELFORMAT_IYUV =      /**< Planar mode: Y + U + V  (3 planes) */
+        SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'),
+    SDL_PIXELFORMAT_YUY2 =      /**< Packed mode: Y0+U0+Y1+V0 (1 plane) */
+        SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'),
+    SDL_PIXELFORMAT_UYVY =      /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */
+        SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'),
+    SDL_PIXELFORMAT_YVYU =      /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */
+        SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U'),
+    SDL_PIXELFORMAT_NV12 =      /**< Planar mode: Y + U/V interleaved  (2 planes) */
+        SDL_DEFINE_PIXELFOURCC('N', 'V', '1', '2'),
+    SDL_PIXELFORMAT_NV21 =      /**< Planar mode: Y + V/U interleaved  (2 planes) */
+        SDL_DEFINE_PIXELFOURCC('N', 'V', '2', '1'),
+    SDL_PIXELFORMAT_EXTERNAL_OES =      /**< Android video texture format */
+        SDL_DEFINE_PIXELFOURCC('O', 'E', 'S', ' ')
+} SDL_PixelFormatEnum;
+
+typedef struct SDL_Color
+{
+    Uint8 r;
+    Uint8 g;
+    Uint8 b;
+    Uint8 a;
+} SDL_Color;
+#define SDL_Colour SDL_Color
+
+typedef struct SDL_Palette
+{
+    int ncolors;
+    SDL_Color *colors;
+    Uint32 version;
+    int refcount;
+} SDL_Palette;
+
+/**
+ *  \note Everything in the pixel format structure is read-only.
+ */
+typedef struct SDL_PixelFormat
+{
+    Uint32 format;
+    SDL_Palette *palette;
+    Uint8 BitsPerPixel;
+    Uint8 BytesPerPixel;
+    Uint8 padding[2];
+    Uint32 Rmask;
+    Uint32 Gmask;
+    Uint32 Bmask;
+    Uint32 Amask;
+    Uint8 Rloss;
+    Uint8 Gloss;
+    Uint8 Bloss;
+    Uint8 Aloss;
+    Uint8 Rshift;
+    Uint8 Gshift;
+    Uint8 Bshift;
+    Uint8 Ashift;
+    int refcount;
+    struct SDL_PixelFormat *next;
+} SDL_PixelFormat;
+
+/**
+ * \brief Get the human readable name of a pixel format
+ */
+extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format);
+
+/**
+ *  \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks.
+ *
+ *  \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible.
+ *
+ *  \sa SDL_MasksToPixelFormatEnum()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format,
+                                                            int *bpp,
+                                                            Uint32 * Rmask,
+                                                            Uint32 * Gmask,
+                                                            Uint32 * Bmask,
+                                                            Uint32 * Amask);
+
+/**
+ *  \brief Convert a bpp and RGBA masks to an enumerated pixel format.
+ *
+ *  \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion
+ *          wasn't possible.
+ *
+ *  \sa SDL_PixelFormatEnumToMasks()
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp,
+                                                          Uint32 Rmask,
+                                                          Uint32 Gmask,
+                                                          Uint32 Bmask,
+                                                          Uint32 Amask);
+
+/**
+ *  \brief Create an SDL_PixelFormat structure from a pixel format enum.
+ */
+extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format);
+
+/**
+ *  \brief Free an SDL_PixelFormat structure.
+ */
+extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format);
+
+/**
+ *  \brief Create a palette structure with the specified number of color
+ *         entries.
+ *
+ *  \return A new palette, or NULL if there wasn't enough memory.
+ *
+ *  \note The palette entries are initialized to white.
+ *
+ *  \sa SDL_FreePalette()
+ */
+extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors);
+
+/**
+ *  \brief Set the palette for a pixel format structure.
+ */
+extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format,
+                                                      SDL_Palette *palette);
+
+/**
+ *  \brief Set a range of colors in a palette.
+ *
+ *  \param palette    The palette to modify.
+ *  \param colors     An array of colors to copy into the palette.
+ *  \param firstcolor The index of the first palette entry to modify.
+ *  \param ncolors    The number of entries to modify.
+ *
+ *  \return 0 on success, or -1 if not all of the colors could be set.
+ */
+extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette,
+                                                 const SDL_Color * colors,
+                                                 int firstcolor, int ncolors);
+
+/**
+ *  \brief Free a palette created with SDL_AllocPalette().
+ *
+ *  \sa SDL_AllocPalette()
+ */
+extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette);
+
+/**
+ *  \brief Maps an RGB triple to an opaque pixel value for a given pixel format.
+ *
+ *  \sa SDL_MapRGBA
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format,
+                                          Uint8 r, Uint8 g, Uint8 b);
+
+/**
+ *  \brief Maps an RGBA quadruple to a pixel value for a given pixel format.
+ *
+ *  \sa SDL_MapRGB
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format,
+                                           Uint8 r, Uint8 g, Uint8 b,
+                                           Uint8 a);
+
+/**
+ *  \brief Get the RGB components from a pixel of the specified format.
+ *
+ *  \sa SDL_GetRGBA
+ */
+extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel,
+                                        const SDL_PixelFormat * format,
+                                        Uint8 * r, Uint8 * g, Uint8 * b);
+
+/**
+ *  \brief Get the RGBA components from a pixel of the specified format.
+ *
+ *  \sa SDL_GetRGB
+ */
+extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
+                                         const SDL_PixelFormat * format,
+                                         Uint8 * r, Uint8 * g, Uint8 * b,
+                                         Uint8 * a);
+
+/**
+ *  \brief Calculate a 256 entry gamma ramp for a gamma value.
+ */
+extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_pixels_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_platform.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_platform.h
new file mode 100644
index 0000000..c2cbc6b
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_platform.h
@@ -0,0 +1,198 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_platform.h
+ *
+ *  Try to get a standard set of platform defines.
+ */
+
+#ifndef SDL_platform_h_
+#define SDL_platform_h_
+
+#if defined(_AIX)
+#undef __AIX__
+#define __AIX__     1
+#endif
+#if defined(__HAIKU__)
+#undef __HAIKU__
+#define __HAIKU__   1
+#endif
+#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
+#undef __BSDI__
+#define __BSDI__    1
+#endif
+#if defined(_arch_dreamcast)
+#undef __DREAMCAST__
+#define __DREAMCAST__   1
+#endif
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+#undef __FREEBSD__
+#define __FREEBSD__ 1
+#endif
+#if defined(hpux) || defined(__hpux) || defined(__hpux__)
+#undef __HPUX__
+#define __HPUX__    1
+#endif
+#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
+#undef __IRIX__
+#define __IRIX__    1
+#endif
+#if (defined(linux) || defined(__linux) || defined(__linux__))
+#undef __LINUX__
+#define __LINUX__   1
+#endif
+#if defined(ANDROID) || defined(__ANDROID__)
+#undef __ANDROID__
+#undef __LINUX__ /* do we need to do this? */
+#define __ANDROID__ 1
+#endif
+
+#if defined(__APPLE__)
+/* lets us know what version of Mac OS X we're compiling on */
+#include "AvailabilityMacros.h"
+#include "TargetConditionals.h"
+#if TARGET_OS_TV
+#undef __TVOS__
+#define __TVOS__ 1
+#endif
+#if TARGET_OS_IPHONE
+/* if compiling for iOS */
+#undef __IPHONEOS__
+#define __IPHONEOS__ 1
+#undef __MACOSX__
+#else
+/* if not compiling for iOS */
+#undef __MACOSX__
+#define __MACOSX__  1
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+# error SDL for Mac OS X only supports deploying on 10.6 and above.
+#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1060 */
+#endif /* TARGET_OS_IPHONE */
+#endif /* defined(__APPLE__) */
+
+#if defined(__NetBSD__)
+#undef __NETBSD__
+#define __NETBSD__  1
+#endif
+#if defined(__OpenBSD__)
+#undef __OPENBSD__
+#define __OPENBSD__ 1
+#endif
+#if defined(__OS2__) || defined(__EMX__)
+#undef __OS2__
+#define __OS2__     1
+#endif
+#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
+#undef __OSF__
+#define __OSF__     1
+#endif
+#if defined(__QNXNTO__)
+#undef __QNXNTO__
+#define __QNXNTO__  1
+#endif
+#if defined(riscos) || defined(__riscos) || defined(__riscos__)
+#undef __RISCOS__
+#define __RISCOS__  1
+#endif
+#if defined(__sun) && defined(__SVR4)
+#undef __SOLARIS__
+#define __SOLARIS__ 1
+#endif
+
+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+/* Try to find out if we're compiling for WinRT or non-WinRT */
+#if defined(_MSC_VER) && defined(__has_include)
+#if __has_include(<winapifamily.h>)
+#define HAVE_WINAPIFAMILY_H 1
+#else
+#define HAVE_WINAPIFAMILY_H 0
+#endif
+
+/* If _USING_V110_SDK71_ is defined it means we are using the Windows XP toolset. */
+#elif defined(_MSC_VER) && (_MSC_VER >= 1700 && !_USING_V110_SDK71_)    /* _MSC_VER == 1700 for Visual Studio 2012 */
+#define HAVE_WINAPIFAMILY_H 1
+#else
+#define HAVE_WINAPIFAMILY_H 0
+#endif
+
+#if HAVE_WINAPIFAMILY_H
+#include <winapifamily.h>
+#define WINAPI_FAMILY_WINRT (!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP))
+#else
+#define WINAPI_FAMILY_WINRT 0
+#endif /* HAVE_WINAPIFAMILY_H */
+
+#if WINAPI_FAMILY_WINRT
+#undef __WINRT__
+#define __WINRT__ 1
+#else
+#undef __WINDOWS__
+#define __WINDOWS__ 1
+#endif
+#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */
+
+#if defined(__WINDOWS__)
+#undef __WIN32__
+#define __WIN32__ 1
+#endif
+#if defined(__PSP__)
+#undef __PSP__
+#define __PSP__ 1
+#endif
+
+/* The NACL compiler defines __native_client__ and __pnacl__
+ * Ref: http://www.chromium.org/nativeclient/pnacl/stability-of-the-pnacl-bitcode-abi
+ */
+#if defined(__native_client__)
+#undef __LINUX__
+#undef __NACL__
+#define __NACL__ 1
+#endif
+#if defined(__pnacl__)
+#undef __LINUX__
+#undef __PNACL__
+#define __PNACL__ 1
+/* PNACL with newlib supports static linking only */
+#define __SDL_NOGETPROCADDR__
+#endif
+
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Gets the name of the platform.
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_platform_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_power.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_power.h
new file mode 100644
index 0000000..4831cb7
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_power.h
@@ -0,0 +1,75 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_power_h_
+#define SDL_power_h_
+
+/**
+ *  \file SDL_power.h
+ *
+ *  Header for the SDL power management routines.
+ */
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief The basic state for the system's power supply.
+ */
+typedef enum
+{
+    SDL_POWERSTATE_UNKNOWN,      /**< cannot determine power status */
+    SDL_POWERSTATE_ON_BATTERY,   /**< Not plugged in, running on the battery */
+    SDL_POWERSTATE_NO_BATTERY,   /**< Plugged in, no battery available */
+    SDL_POWERSTATE_CHARGING,     /**< Plugged in, charging battery */
+    SDL_POWERSTATE_CHARGED       /**< Plugged in, battery charged */
+} SDL_PowerState;
+
+
+/**
+ *  \brief Get the current power supply details.
+ *
+ *  \param secs Seconds of battery life left. You can pass a NULL here if
+ *              you don't care. Will return -1 if we can't determine a
+ *              value, or we're not running on a battery.
+ *
+ *  \param pct Percentage of battery life left, between 0 and 100. You can
+ *             pass a NULL here if you don't care. Will return -1 if we
+ *             can't determine a value, or we're not running on a battery.
+ *
+ *  \return The state of the battery (if any).
+ */
+extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_power_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_quit.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_quit.h
new file mode 100644
index 0000000..c979983
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_quit.h
@@ -0,0 +1,58 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_quit.h
+ *
+ *  Include file for SDL quit event handling.
+ */
+
+#ifndef SDL_quit_h_
+#define SDL_quit_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+/**
+ *  \file SDL_quit.h
+ *
+ *  An ::SDL_QUIT event is generated when the user tries to close the application
+ *  window.  If it is ignored or filtered out, the window will remain open.
+ *  If it is not ignored or filtered, it is queued normally and the window
+ *  is allowed to close.  When the window is closed, screen updates will
+ *  complete, but have no effect.
+ *
+ *  SDL_Init() installs signal handlers for SIGINT (keyboard interrupt)
+ *  and SIGTERM (system termination request), if handlers do not already
+ *  exist, that generate ::SDL_QUIT events as well.  There is no way
+ *  to determine the cause of an ::SDL_QUIT event, but setting a signal
+ *  handler in your application will override the default generation of
+ *  quit events for that signal.
+ *
+ *  \sa SDL_Quit()
+ */
+
+/* There are no functions directly affecting the quit event */
+
+#define SDL_QuitRequested() \
+        (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0))
+
+#endif /* SDL_quit_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_rect.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_rect.h
new file mode 100644
index 0000000..71a4115
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_rect.h
@@ -0,0 +1,174 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_rect.h
+ *
+ *  Header file for SDL_rect definition and management functions.
+ */
+
+#ifndef SDL_rect_h_
+#define SDL_rect_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_pixels.h"
+#include "SDL_rwops.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief  The structure that defines a point (integer)
+ *
+ *  \sa SDL_EnclosePoints
+ *  \sa SDL_PointInRect
+ */
+typedef struct SDL_Point
+{
+    int x;
+    int y;
+} SDL_Point;
+
+/**
+ *  \brief  The structure that defines a point (floating point)
+ *
+ *  \sa SDL_EnclosePoints
+ *  \sa SDL_PointInRect
+ */
+typedef struct SDL_FPoint
+{
+    float x;
+    float y;
+} SDL_FPoint;
+
+
+/**
+ *  \brief A rectangle, with the origin at the upper left (integer).
+ *
+ *  \sa SDL_RectEmpty
+ *  \sa SDL_RectEquals
+ *  \sa SDL_HasIntersection
+ *  \sa SDL_IntersectRect
+ *  \sa SDL_UnionRect
+ *  \sa SDL_EnclosePoints
+ */
+typedef struct SDL_Rect
+{
+    int x, y;
+    int w, h;
+} SDL_Rect;
+
+
+/**
+ *  \brief A rectangle, with the origin at the upper left (floating point).
+ */
+typedef struct SDL_FRect
+{
+    float x;
+    float y;
+    float w;
+    float h;
+} SDL_FRect;
+
+
+/**
+ *  \brief Returns true if point resides inside a rectangle.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_PointInRect(const SDL_Point *p, const SDL_Rect *r)
+{
+    return ( (p->x >= r->x) && (p->x < (r->x + r->w)) &&
+             (p->y >= r->y) && (p->y < (r->y + r->h)) ) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ *  \brief Returns true if the rectangle has no area.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r)
+{
+    return ((!r) || (r->w <= 0) || (r->h <= 0)) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ *  \brief Returns true if the two rectangles are equal.
+ */
+SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b)
+{
+    return (a && b && (a->x == b->x) && (a->y == b->y) &&
+            (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE;
+}
+
+/**
+ *  \brief Determine whether two rectangles intersect.
+ *
+ *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A,
+                                                     const SDL_Rect * B);
+
+/**
+ *  \brief Calculate the intersection of two rectangles.
+ *
+ *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A,
+                                                   const SDL_Rect * B,
+                                                   SDL_Rect * result);
+
+/**
+ *  \brief Calculate the union of two rectangles.
+ */
+extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A,
+                                           const SDL_Rect * B,
+                                           SDL_Rect * result);
+
+/**
+ *  \brief Calculate a minimal rectangle enclosing a set of points
+ *
+ *  \return SDL_TRUE if any points were within the clipping rect
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points,
+                                                   int count,
+                                                   const SDL_Rect * clip,
+                                                   SDL_Rect * result);
+
+/**
+ *  \brief Calculate the intersection of a rectangle and line segment.
+ *
+ *  \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect *
+                                                          rect, int *X1,
+                                                          int *Y1, int *X2,
+                                                          int *Y2);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_rect_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_render.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_render.h
new file mode 100644
index 0000000..096b4a5
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_render.h
@@ -0,0 +1,1098 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_render.h
+ *
+ *  Header file for SDL 2D rendering functions.
+ *
+ *  This API supports the following features:
+ *      * single pixel points
+ *      * single pixel lines
+ *      * filled rectangles
+ *      * texture images
+ *
+ *  The primitives may be drawn in opaque, blended, or additive modes.
+ *
+ *  The texture images may be drawn in opaque, blended, or additive modes.
+ *  They can have an additional color tint or alpha modulation applied to
+ *  them, and may also be stretched with linear interpolation.
+ *
+ *  This API is designed to accelerate simple 2D operations. You may
+ *  want more functionality such as polygons and particle effects and
+ *  in that case you should use SDL's OpenGL/Direct3D support or one
+ *  of the many good 3D engines.
+ *
+ *  These functions must be called from the main thread.
+ *  See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995
+ */
+
+#ifndef SDL_render_h_
+#define SDL_render_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_rect.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Flags used when creating a rendering context
+ */
+typedef enum
+{
+    SDL_RENDERER_SOFTWARE = 0x00000001,         /**< The renderer is a software fallback */
+    SDL_RENDERER_ACCELERATED = 0x00000002,      /**< The renderer uses hardware
+                                                     acceleration */
+    SDL_RENDERER_PRESENTVSYNC = 0x00000004,     /**< Present is synchronized
+                                                     with the refresh rate */
+    SDL_RENDERER_TARGETTEXTURE = 0x00000008     /**< The renderer supports
+                                                     rendering to texture */
+} SDL_RendererFlags;
+
+/**
+ *  \brief Information on the capabilities of a render driver or context.
+ */
+typedef struct SDL_RendererInfo
+{
+    const char *name;           /**< The name of the renderer */
+    Uint32 flags;               /**< Supported ::SDL_RendererFlags */
+    Uint32 num_texture_formats; /**< The number of available texture formats */
+    Uint32 texture_formats[16]; /**< The available texture formats */
+    int max_texture_width;      /**< The maximum texture width */
+    int max_texture_height;     /**< The maximum texture height */
+} SDL_RendererInfo;
+
+/**
+ *  \brief The access pattern allowed for a texture.
+ */
+typedef enum
+{
+    SDL_TEXTUREACCESS_STATIC,    /**< Changes rarely, not lockable */
+    SDL_TEXTUREACCESS_STREAMING, /**< Changes frequently, lockable */
+    SDL_TEXTUREACCESS_TARGET     /**< Texture can be used as a render target */
+} SDL_TextureAccess;
+
+/**
+ *  \brief The texture channel modulation used in SDL_RenderCopy().
+ */
+typedef enum
+{
+    SDL_TEXTUREMODULATE_NONE = 0x00000000,     /**< No modulation */
+    SDL_TEXTUREMODULATE_COLOR = 0x00000001,    /**< srcC = srcC * color */
+    SDL_TEXTUREMODULATE_ALPHA = 0x00000002     /**< srcA = srcA * alpha */
+} SDL_TextureModulate;
+
+/**
+ *  \brief Flip constants for SDL_RenderCopyEx
+ */
+typedef enum
+{
+    SDL_FLIP_NONE = 0x00000000,     /**< Do not flip */
+    SDL_FLIP_HORIZONTAL = 0x00000001,    /**< flip horizontally */
+    SDL_FLIP_VERTICAL = 0x00000002     /**< flip vertically */
+} SDL_RendererFlip;
+
+/**
+ *  \brief A structure representing rendering state
+ */
+struct SDL_Renderer;
+typedef struct SDL_Renderer SDL_Renderer;
+
+/**
+ *  \brief An efficient driver-specific representation of pixel data
+ */
+struct SDL_Texture;
+typedef struct SDL_Texture SDL_Texture;
+
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the number of 2D rendering drivers available for the current
+ *         display.
+ *
+ *  A render driver is a set of code that handles rendering and texture
+ *  management on a particular display.  Normally there is only one, but
+ *  some drivers may have several available with different capabilities.
+ *
+ *  \sa SDL_GetRenderDriverInfo()
+ *  \sa SDL_CreateRenderer()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void);
+
+/**
+ *  \brief Get information about a specific 2D rendering driver for the current
+ *         display.
+ *
+ *  \param index The index of the driver to query information about.
+ *  \param info  A pointer to an SDL_RendererInfo struct to be filled with
+ *               information on the rendering driver.
+ *
+ *  \return 0 on success, -1 if the index was out of range.
+ *
+ *  \sa SDL_CreateRenderer()
+ */
+extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index,
+                                                    SDL_RendererInfo * info);
+
+/**
+ *  \brief Create a window and default renderer
+ *
+ *  \param width    The width of the window
+ *  \param height   The height of the window
+ *  \param window_flags The flags used to create the window
+ *  \param window   A pointer filled with the window, or NULL on error
+ *  \param renderer A pointer filled with the renderer, or NULL on error
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer(
+                                int width, int height, Uint32 window_flags,
+                                SDL_Window **window, SDL_Renderer **renderer);
+
+
+/**
+ *  \brief Create a 2D rendering context for a window.
+ *
+ *  \param window The window where rendering is displayed.
+ *  \param index    The index of the rendering driver to initialize, or -1 to
+ *                  initialize the first one supporting the requested flags.
+ *  \param flags    ::SDL_RendererFlags.
+ *
+ *  \return A valid rendering context or NULL if there was an error.
+ *
+ *  \sa SDL_CreateSoftwareRenderer()
+ *  \sa SDL_GetRendererInfo()
+ *  \sa SDL_DestroyRenderer()
+ */
+extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window,
+                                               int index, Uint32 flags);
+
+/**
+ *  \brief Create a 2D software rendering context for a surface.
+ *
+ *  \param surface The surface where rendering is done.
+ *
+ *  \return A valid rendering context or NULL if there was an error.
+ *
+ *  \sa SDL_CreateRenderer()
+ *  \sa SDL_DestroyRenderer()
+ */
+extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface);
+
+/**
+ *  \brief Get the renderer associated with a window.
+ */
+extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window);
+
+/**
+ *  \brief Get information about a rendering context.
+ */
+extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer,
+                                                SDL_RendererInfo * info);
+
+/**
+ *  \brief Get the output size in pixels of a rendering context.
+ */
+extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer,
+                                                      int *w, int *h);
+
+/**
+ *  \brief Create a texture for a rendering context.
+ *
+ *  \param renderer The renderer.
+ *  \param format The format of the texture.
+ *  \param access One of the enumerated values in ::SDL_TextureAccess.
+ *  \param w      The width of the texture in pixels.
+ *  \param h      The height of the texture in pixels.
+ *
+ *  \return The created texture is returned, or NULL if no rendering context was
+ *          active,  the format was unsupported, or the width or height were out
+ *          of range.
+ *
+ *  \note The contents of the texture are not defined at creation.
+ *
+ *  \sa SDL_QueryTexture()
+ *  \sa SDL_UpdateTexture()
+ *  \sa SDL_DestroyTexture()
+ */
+extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer,
+                                                        Uint32 format,
+                                                        int access, int w,
+                                                        int h);
+
+/**
+ *  \brief Create a texture from an existing surface.
+ *
+ *  \param renderer The renderer.
+ *  \param surface The surface containing pixel data used to fill the texture.
+ *
+ *  \return The created texture is returned, or NULL on error.
+ *
+ *  \note The surface is not modified or freed by this function.
+ *
+ *  \sa SDL_QueryTexture()
+ *  \sa SDL_DestroyTexture()
+ */
+extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface);
+
+/**
+ *  \brief Query the attributes of a texture
+ *
+ *  \param texture A texture to be queried.
+ *  \param format  A pointer filled in with the raw format of the texture.  The
+ *                 actual format may differ, but pixel transfers will use this
+ *                 format.
+ *  \param access  A pointer filled in with the actual access to the texture.
+ *  \param w       A pointer filled in with the width of the texture in pixels.
+ *  \param h       A pointer filled in with the height of the texture in pixels.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ */
+extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture,
+                                             Uint32 * format, int *access,
+                                             int *w, int *h);
+
+/**
+ *  \brief Set an additional color value used in render copy operations.
+ *
+ *  \param texture The texture to update.
+ *  \param r       The red color value multiplied into copy operations.
+ *  \param g       The green color value multiplied into copy operations.
+ *  \param b       The blue color value multiplied into copy operations.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or color modulation
+ *          is not supported.
+ *
+ *  \sa SDL_GetTextureColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture,
+                                                   Uint8 r, Uint8 g, Uint8 b);
+
+
+/**
+ *  \brief Get the additional color value used in render copy operations.
+ *
+ *  \param texture The texture to query.
+ *  \param r         A pointer filled in with the current red color value.
+ *  \param g         A pointer filled in with the current green color value.
+ *  \param b         A pointer filled in with the current blue color value.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \sa SDL_SetTextureColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture,
+                                                   Uint8 * r, Uint8 * g,
+                                                   Uint8 * b);
+
+/**
+ *  \brief Set an additional alpha value used in render copy operations.
+ *
+ *  \param texture The texture to update.
+ *  \param alpha     The alpha value multiplied into copy operations.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or alpha modulation
+ *          is not supported.
+ *
+ *  \sa SDL_GetTextureAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture,
+                                                   Uint8 alpha);
+
+/**
+ *  \brief Get the additional alpha value used in render copy operations.
+ *
+ *  \param texture The texture to query.
+ *  \param alpha     A pointer filled in with the current alpha value.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \sa SDL_SetTextureAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture,
+                                                   Uint8 * alpha);
+
+/**
+ *  \brief Set the blend mode used for texture copy operations.
+ *
+ *  \param texture The texture to update.
+ *  \param blendMode ::SDL_BlendMode to use for texture blending.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or the blend mode is
+ *          not supported.
+ *
+ *  \note If the blend mode is not supported, the closest supported mode is
+ *        chosen.
+ *
+ *  \sa SDL_GetTextureBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture,
+                                                    SDL_BlendMode blendMode);
+
+/**
+ *  \brief Get the blend mode used for texture copy operations.
+ *
+ *  \param texture   The texture to query.
+ *  \param blendMode A pointer filled in with the current blend mode.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \sa SDL_SetTextureBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture,
+                                                    SDL_BlendMode *blendMode);
+
+/**
+ *  \brief Update the given texture rectangle with new pixel data.
+ *
+ *  \param texture   The texture to update
+ *  \param rect      A pointer to the rectangle of pixels to update, or NULL to
+ *                   update the entire texture.
+ *  \param pixels    The raw pixel data in the format of the texture.
+ *  \param pitch     The number of bytes in a row of pixel data, including padding between lines.
+ *
+ *  The pixel data must be in the format of the texture. The pixel format can be
+ *  queried with SDL_QueryTexture.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \note This is a fairly slow function.
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture,
+                                              const SDL_Rect * rect,
+                                              const void *pixels, int pitch);
+
+/**
+ *  \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data.
+ *
+ *  \param texture   The texture to update
+ *  \param rect      A pointer to the rectangle of pixels to update, or NULL to
+ *                   update the entire texture.
+ *  \param Yplane    The raw pixel data for the Y plane.
+ *  \param Ypitch    The number of bytes between rows of pixel data for the Y plane.
+ *  \param Uplane    The raw pixel data for the U plane.
+ *  \param Upitch    The number of bytes between rows of pixel data for the U plane.
+ *  \param Vplane    The raw pixel data for the V plane.
+ *  \param Vpitch    The number of bytes between rows of pixel data for the V plane.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid.
+ *
+ *  \note You can use SDL_UpdateTexture() as long as your pixel data is
+ *        a contiguous block of Y and U/V planes in the proper order, but
+ *        this function is available if your pixel data is not contiguous.
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture,
+                                                 const SDL_Rect * rect,
+                                                 const Uint8 *Yplane, int Ypitch,
+                                                 const Uint8 *Uplane, int Upitch,
+                                                 const Uint8 *Vplane, int Vpitch);
+
+/**
+ *  \brief Lock a portion of the texture for write-only pixel access.
+ *
+ *  \param texture   The texture to lock for access, which was created with
+ *                   ::SDL_TEXTUREACCESS_STREAMING.
+ *  \param rect      A pointer to the rectangle to lock for access. If the rect
+ *                   is NULL, the entire texture will be locked.
+ *  \param pixels    This is filled in with a pointer to the locked pixels,
+ *                   appropriately offset by the locked area.
+ *  \param pitch     This is filled in with the pitch of the locked pixels.
+ *
+ *  \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING.
+ *
+ *  \sa SDL_UnlockTexture()
+ */
+extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture,
+                                            const SDL_Rect * rect,
+                                            void **pixels, int *pitch);
+
+/**
+ *  \brief Unlock a texture, uploading the changes to video memory, if needed.
+ *
+ *  \sa SDL_LockTexture()
+ */
+extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture);
+
+/**
+ * \brief Determines whether a window supports the use of render targets
+ *
+ * \param renderer The renderer that will be checked
+ *
+ * \return SDL_TRUE if supported, SDL_FALSE if not.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer);
+
+/**
+ * \brief Set a texture as the current rendering target.
+ *
+ * \param renderer The renderer.
+ * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target
+ *
+ * \return 0 on success, or -1 on error
+ *
+ *  \sa SDL_GetRenderTarget()
+ */
+extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer,
+                                                SDL_Texture *texture);
+
+/**
+ * \brief Get the current render target or NULL for the default render target.
+ *
+ * \return The current render target
+ *
+ *  \sa SDL_SetRenderTarget()
+ */
+extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer);
+
+/**
+ *  \brief Set device independent resolution for rendering
+ *
+ *  \param renderer The renderer for which resolution should be set.
+ *  \param w      The width of the logical resolution
+ *  \param h      The height of the logical resolution
+ *
+ *  This function uses the viewport and scaling functionality to allow a fixed logical
+ *  resolution for rendering, regardless of the actual output resolution.  If the actual
+ *  output resolution doesn't have the same aspect ratio the output rendering will be
+ *  centered within the output display.
+ *
+ *  If the output display is a window, mouse events in the window will be filtered
+ *  and scaled so they seem to arrive within the logical resolution.
+ *
+ *  \note If this function results in scaling or subpixel drawing by the
+ *        rendering backend, it will be handled using the appropriate
+ *        quality hints.
+ *
+ *  \sa SDL_RenderGetLogicalSize()
+ *  \sa SDL_RenderSetScale()
+ *  \sa SDL_RenderSetViewport()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h);
+
+/**
+ *  \brief Get device independent resolution for rendering
+ *
+ *  \param renderer The renderer from which resolution should be queried.
+ *  \param w      A pointer filled with the width of the logical resolution
+ *  \param h      A pointer filled with the height of the logical resolution
+ *
+ *  \sa SDL_RenderSetLogicalSize()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h);
+
+/**
+ *  \brief Set whether to force integer scales for resolution-independent rendering
+ *
+ *  \param renderer The renderer for which integer scaling should be set.
+ *  \param enable   Enable or disable integer scaling
+ *
+ *  This function restricts the logical viewport to integer values - that is, when
+ *  a resolution is between two multiples of a logical size, the viewport size is
+ *  rounded down to the lower multiple.
+ *
+ *  \sa SDL_RenderSetLogicalSize()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetIntegerScale(SDL_Renderer * renderer,
+                                                      SDL_bool enable);
+
+/**
+ *  \brief Get whether integer scales are forced for resolution-independent rendering
+ *
+ *  \param renderer The renderer from which integer scaling should be queried.
+ *
+ *  \sa SDL_RenderSetIntegerScale()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_RenderGetIntegerScale(SDL_Renderer * renderer);
+
+/**
+ *  \brief Set the drawing area for rendering on the current target.
+ *
+ *  \param renderer The renderer for which the drawing area should be set.
+ *  \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target.
+ *
+ *  The x,y of the viewport rect represents the origin for rendering.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \note If the window associated with the renderer is resized, the viewport is automatically reset.
+ *
+ *  \sa SDL_RenderGetViewport()
+ *  \sa SDL_RenderSetLogicalSize()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer,
+                                                  const SDL_Rect * rect);
+
+/**
+ *  \brief Get the drawing area for the current target.
+ *
+ *  \sa SDL_RenderSetViewport()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer,
+                                                   SDL_Rect * rect);
+
+/**
+ *  \brief Set the clip rectangle for the current target.
+ *
+ *  \param renderer The renderer for which clip rectangle should be set.
+ *  \param rect   A pointer to the rectangle to set as the clip rectangle, or
+ *                NULL to disable clipping.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \sa SDL_RenderGetClipRect()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer,
+                                                  const SDL_Rect * rect);
+
+/**
+ *  \brief Get the clip rectangle for the current target.
+ *
+ *  \param renderer The renderer from which clip rectangle should be queried.
+ *  \param rect   A pointer filled in with the current clip rectangle, or
+ *                an empty rectangle if clipping is disabled.
+ *
+ *  \sa SDL_RenderSetClipRect()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer,
+                                                   SDL_Rect * rect);
+
+/**
+ *  \brief Get whether clipping is enabled on the given renderer.
+ *
+ *  \param renderer The renderer from which clip state should be queried.
+ *
+ *  \sa SDL_RenderGetClipRect()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_RenderIsClipEnabled(SDL_Renderer * renderer);
+
+
+/**
+ *  \brief Set the drawing scale for rendering on the current target.
+ *
+ *  \param renderer The renderer for which the drawing scale should be set.
+ *  \param scaleX The horizontal scaling factor
+ *  \param scaleY The vertical scaling factor
+ *
+ *  The drawing coordinates are scaled by the x/y scaling factors
+ *  before they are used by the renderer.  This allows resolution
+ *  independent drawing with a single coordinate system.
+ *
+ *  \note If this results in scaling or subpixel drawing by the
+ *        rendering backend, it will be handled using the appropriate
+ *        quality hints.  For best results use integer scaling factors.
+ *
+ *  \sa SDL_RenderGetScale()
+ *  \sa SDL_RenderSetLogicalSize()
+ */
+extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer,
+                                               float scaleX, float scaleY);
+
+/**
+ *  \brief Get the drawing scale for the current target.
+ *
+ *  \param renderer The renderer from which drawing scale should be queried.
+ *  \param scaleX A pointer filled in with the horizontal scaling factor
+ *  \param scaleY A pointer filled in with the vertical scaling factor
+ *
+ *  \sa SDL_RenderSetScale()
+ */
+extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer,
+                                               float *scaleX, float *scaleY);
+
+/**
+ *  \brief Set the color used for drawing operations (Rect, Line and Clear).
+ *
+ *  \param renderer The renderer for which drawing color should be set.
+ *  \param r The red value used to draw on the rendering target.
+ *  \param g The green value used to draw on the rendering target.
+ *  \param b The blue value used to draw on the rendering target.
+ *  \param a The alpha value used to draw on the rendering target, usually
+ *           ::SDL_ALPHA_OPAQUE (255).
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer,
+                                           Uint8 r, Uint8 g, Uint8 b,
+                                           Uint8 a);
+
+/**
+ *  \brief Get the color used for drawing operations (Rect, Line and Clear).
+ *
+ *  \param renderer The renderer from which drawing color should be queried.
+ *  \param r A pointer to the red value used to draw on the rendering target.
+ *  \param g A pointer to the green value used to draw on the rendering target.
+ *  \param b A pointer to the blue value used to draw on the rendering target.
+ *  \param a A pointer to the alpha value used to draw on the rendering target,
+ *           usually ::SDL_ALPHA_OPAQUE (255).
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer,
+                                           Uint8 * r, Uint8 * g, Uint8 * b,
+                                           Uint8 * a);
+
+/**
+ *  \brief Set the blend mode used for drawing operations (Fill and Line).
+ *
+ *  \param renderer The renderer for which blend mode should be set.
+ *  \param blendMode ::SDL_BlendMode to use for blending.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \note If the blend mode is not supported, the closest supported mode is
+ *        chosen.
+ *
+ *  \sa SDL_GetRenderDrawBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer,
+                                                       SDL_BlendMode blendMode);
+
+/**
+ *  \brief Get the blend mode used for drawing operations.
+ *
+ *  \param renderer The renderer from which blend mode should be queried.
+ *  \param blendMode A pointer filled in with the current blend mode.
+ *
+ *  \return 0 on success, or -1 on error
+ *
+ *  \sa SDL_SetRenderDrawBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer,
+                                                       SDL_BlendMode *blendMode);
+
+/**
+ *  \brief Clear the current rendering target with the drawing color
+ *
+ *  This function clears the entire rendering target, ignoring the viewport and
+ *  the clip rectangle.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer);
+
+/**
+ *  \brief Draw a point on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a point.
+ *  \param x The x coordinate of the point.
+ *  \param y The y coordinate of the point.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer,
+                                                int x, int y);
+
+/**
+ *  \brief Draw multiple points on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple points.
+ *  \param points The points to draw
+ *  \param count The number of points to draw
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer,
+                                                 const SDL_Point * points,
+                                                 int count);
+
+/**
+ *  \brief Draw a line on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a line.
+ *  \param x1 The x coordinate of the start point.
+ *  \param y1 The y coordinate of the start point.
+ *  \param x2 The x coordinate of the end point.
+ *  \param y2 The y coordinate of the end point.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer,
+                                               int x1, int y1, int x2, int y2);
+
+/**
+ *  \brief Draw a series of connected lines on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple lines.
+ *  \param points The points along the lines
+ *  \param count The number of points, drawing count-1 lines
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer,
+                                                const SDL_Point * points,
+                                                int count);
+
+/**
+ *  \brief Draw a rectangle on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a rectangle.
+ *  \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer,
+                                               const SDL_Rect * rect);
+
+/**
+ *  \brief Draw some number of rectangles on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple rectangles.
+ *  \param rects A pointer to an array of destination rectangles.
+ *  \param count The number of rectangles.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer,
+                                                const SDL_Rect * rects,
+                                                int count);
+
+/**
+ *  \brief Fill a rectangle on the current rendering target with the drawing color.
+ *
+ *  \param renderer The renderer which should fill a rectangle.
+ *  \param rect A pointer to the destination rectangle, or NULL for the entire
+ *              rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer,
+                                               const SDL_Rect * rect);
+
+/**
+ *  \brief Fill some number of rectangles on the current rendering target with the drawing color.
+ *
+ *  \param renderer The renderer which should fill multiple rectangles.
+ *  \param rects A pointer to an array of destination rectangles.
+ *  \param count The number of rectangles.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer,
+                                                const SDL_Rect * rects,
+                                                int count);
+
+/**
+ *  \brief Copy a portion of the texture to the current rendering target.
+ *
+ *  \param renderer The renderer which should copy parts of a texture.
+ *  \param texture The source texture.
+ *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
+ *                   texture.
+ *  \param dstrect   A pointer to the destination rectangle, or NULL for the
+ *                   entire rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer,
+                                           SDL_Texture * texture,
+                                           const SDL_Rect * srcrect,
+                                           const SDL_Rect * dstrect);
+
+/**
+ *  \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center
+ *
+ *  \param renderer The renderer which should copy parts of a texture.
+ *  \param texture The source texture.
+ *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
+ *                   texture.
+ *  \param dstrect   A pointer to the destination rectangle, or NULL for the
+ *                   entire rendering target.
+ *  \param angle    An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction
+ *  \param center   A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2).
+ *  \param flip     An SDL_RendererFlip value stating which flipping actions should be performed on the texture
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer,
+                                           SDL_Texture * texture,
+                                           const SDL_Rect * srcrect,
+                                           const SDL_Rect * dstrect,
+                                           const double angle,
+                                           const SDL_Point *center,
+                                           const SDL_RendererFlip flip);
+
+
+/**
+ *  \brief Draw a point on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a point.
+ *  \param x The x coordinate of the point.
+ *  \param y The y coordinate of the point.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawPointF(SDL_Renderer * renderer,
+                                                 float x, float y);
+
+/**
+ *  \brief Draw multiple points on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple points.
+ *  \param points The points to draw
+ *  \param count The number of points to draw
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawPointsF(SDL_Renderer * renderer,
+                                                  const SDL_FPoint * points,
+                                                  int count);
+
+/**
+ *  \brief Draw a line on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a line.
+ *  \param x1 The x coordinate of the start point.
+ *  \param y1 The y coordinate of the start point.
+ *  \param x2 The x coordinate of the end point.
+ *  \param y2 The y coordinate of the end point.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawLineF(SDL_Renderer * renderer,
+                                                float x1, float y1, float x2, float y2);
+
+/**
+ *  \brief Draw a series of connected lines on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple lines.
+ *  \param points The points along the lines
+ *  \param count The number of points, drawing count-1 lines
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawLinesF(SDL_Renderer * renderer,
+                                                const SDL_FPoint * points,
+                                                int count);
+
+/**
+ *  \brief Draw a rectangle on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw a rectangle.
+ *  \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawRectF(SDL_Renderer * renderer,
+                                               const SDL_FRect * rect);
+
+/**
+ *  \brief Draw some number of rectangles on the current rendering target.
+ *
+ *  \param renderer The renderer which should draw multiple rectangles.
+ *  \param rects A pointer to an array of destination rectangles.
+ *  \param count The number of rectangles.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderDrawRectsF(SDL_Renderer * renderer,
+                                                 const SDL_FRect * rects,
+                                                 int count);
+
+/**
+ *  \brief Fill a rectangle on the current rendering target with the drawing color.
+ *
+ *  \param renderer The renderer which should fill a rectangle.
+ *  \param rect A pointer to the destination rectangle, or NULL for the entire
+ *              rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderFillRectF(SDL_Renderer * renderer,
+                                                const SDL_FRect * rect);
+
+/**
+ *  \brief Fill some number of rectangles on the current rendering target with the drawing color.
+ *
+ *  \param renderer The renderer which should fill multiple rectangles.
+ *  \param rects A pointer to an array of destination rectangles.
+ *  \param count The number of rectangles.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderFillRectsF(SDL_Renderer * renderer,
+                                                 const SDL_FRect * rects,
+                                                 int count);
+
+/**
+ *  \brief Copy a portion of the texture to the current rendering target.
+ *
+ *  \param renderer The renderer which should copy parts of a texture.
+ *  \param texture The source texture.
+ *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
+ *                   texture.
+ *  \param dstrect   A pointer to the destination rectangle, or NULL for the
+ *                   entire rendering target.
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderCopyF(SDL_Renderer * renderer,
+                                            SDL_Texture * texture,
+                                            const SDL_Rect * srcrect,
+                                            const SDL_FRect * dstrect);
+
+/**
+ *  \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center
+ *
+ *  \param renderer The renderer which should copy parts of a texture.
+ *  \param texture The source texture.
+ *  \param srcrect   A pointer to the source rectangle, or NULL for the entire
+ *                   texture.
+ *  \param dstrect   A pointer to the destination rectangle, or NULL for the
+ *                   entire rendering target.
+ *  \param angle    An angle in degrees that indicates the rotation that will be applied to dstrect, rotating it in a clockwise direction
+ *  \param center   A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done around dstrect.w/2, dstrect.h/2).
+ *  \param flip     An SDL_RendererFlip value stating which flipping actions should be performed on the texture
+ *
+ *  \return 0 on success, or -1 on error
+ */
+extern DECLSPEC int SDLCALL SDL_RenderCopyExF(SDL_Renderer * renderer,
+                                            SDL_Texture * texture,
+                                            const SDL_Rect * srcrect,
+                                            const SDL_FRect * dstrect,
+                                            const double angle,
+                                            const SDL_FPoint *center,
+                                            const SDL_RendererFlip flip);
+
+/**
+ *  \brief Read pixels from the current rendering target.
+ *
+ *  \param renderer The renderer from which pixels should be read.
+ *  \param rect   A pointer to the rectangle to read, or NULL for the entire
+ *                render target.
+ *  \param format The desired format of the pixel data, or 0 to use the format
+ *                of the rendering target
+ *  \param pixels A pointer to be filled in with the pixel data
+ *  \param pitch  The pitch of the pixels parameter.
+ *
+ *  \return 0 on success, or -1 if pixel reading is not supported.
+ *
+ *  \warning This is a very slow operation, and should not be used frequently.
+ */
+extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer,
+                                                 const SDL_Rect * rect,
+                                                 Uint32 format,
+                                                 void *pixels, int pitch);
+
+/**
+ *  \brief Update the screen with rendering performed.
+ */
+extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer);
+
+/**
+ *  \brief Destroy the specified texture.
+ *
+ *  \sa SDL_CreateTexture()
+ *  \sa SDL_CreateTextureFromSurface()
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture);
+
+/**
+ *  \brief Destroy the rendering context for a window and free associated
+ *         textures.
+ *
+ *  \sa SDL_CreateRenderer()
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer);
+
+/**
+ *  \brief Force the rendering context to flush any pending commands to the
+ *         underlying rendering API.
+ *
+ *  You do not need to (and in fact, shouldn't) call this function unless
+ *  you are planning to call into OpenGL/Direct3D/Metal/whatever directly
+ *  in addition to using an SDL_Renderer.
+ *
+ *  This is for a very-specific case: if you are using SDL's render API,
+ *  you asked for a specific renderer backend (OpenGL, Direct3D, etc),
+ *  you set SDL_HINT_RENDER_BATCHING to "1", and you plan to make
+ *  OpenGL/D3D/whatever calls in addition to SDL render API calls. If all of
+ *  this applies, you should call SDL_RenderFlush() between calls to SDL's
+ *  render API and the low-level API you're using in cooperation.
+ *
+ *  In all other cases, you can ignore this function. This is only here to
+ *  get maximum performance out of a specific situation. In all other cases,
+ *  SDL will do the right thing, perhaps at a performance loss.
+ *
+ *  This function is first available in SDL 2.0.10, and is not needed in
+ *  2.0.9 and earlier, as earlier versions did not queue rendering commands
+ *  at all, instead flushing them to the OS immediately.
+ */
+extern DECLSPEC int SDLCALL SDL_RenderFlush(SDL_Renderer * renderer);
+
+
+/**
+ *  \brief Bind the texture to the current OpenGL/ES/ES2 context for use with
+ *         OpenGL instructions.
+ *
+ *  \param texture  The SDL texture to bind
+ *  \param texw     A pointer to a float that will be filled with the texture width
+ *  \param texh     A pointer to a float that will be filled with the texture height
+ *
+ *  \return 0 on success, or -1 if the operation is not supported
+ */
+extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh);
+
+/**
+ *  \brief Unbind a texture from the current OpenGL/ES/ES2 context.
+ *
+ *  \param texture  The SDL texture to unbind
+ *
+ *  \return 0 on success, or -1 if the operation is not supported
+ */
+extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture);
+
+/**
+ *  \brief Get the CAMetalLayer associated with the given Metal renderer
+ *
+ *  \param renderer The renderer to query
+ *
+ *  \return CAMetalLayer* on success, or NULL if the renderer isn't a Metal renderer
+ *
+ *  \sa SDL_RenderGetMetalCommandEncoder()
+ */
+extern DECLSPEC void *SDLCALL SDL_RenderGetMetalLayer(SDL_Renderer * renderer);
+
+/**
+ *  \brief Get the Metal command encoder for the current frame
+ *
+ *  \param renderer The renderer to query
+ *
+ *  \return id<MTLRenderCommandEncoder> on success, or NULL if the renderer isn't a Metal renderer
+ *
+ *  \sa SDL_RenderGetMetalLayer()
+ */
+extern DECLSPEC void *SDLCALL SDL_RenderGetMetalCommandEncoder(SDL_Renderer * renderer);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_render_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_revision.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_revision.h
new file mode 100644
index 0000000..3b3fc85
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_revision.h
@@ -0,0 +1,2 @@
+#define SDL_REVISION "hg-12952:bc90ce38f1e2"
+#define SDL_REVISION_NUMBER 12952
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_rwops.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_rwops.h
new file mode 100644
index 0000000..f66119f
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_rwops.h
@@ -0,0 +1,291 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_rwops.h
+ *
+ *  This file provides a general interface for SDL to read and write
+ *  data streams.  It can easily be extended to files, memory, etc.
+ */
+
+#ifndef SDL_rwops_h_
+#define SDL_rwops_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* RWops Types */
+#define SDL_RWOPS_UNKNOWN   0U  /**< Unknown stream type */
+#define SDL_RWOPS_WINFILE   1U  /**< Win32 file */
+#define SDL_RWOPS_STDFILE   2U  /**< Stdio file */
+#define SDL_RWOPS_JNIFILE   3U  /**< Android asset */
+#define SDL_RWOPS_MEMORY    4U  /**< Memory stream */
+#define SDL_RWOPS_MEMORY_RO 5U  /**< Read-Only memory stream */
+
+/**
+ * This is the read/write operation structure -- very basic.
+ */
+typedef struct SDL_RWops
+{
+    /**
+     *  Return the size of the file in this rwops, or -1 if unknown
+     */
+    Sint64 (SDLCALL * size) (struct SDL_RWops * context);
+
+    /**
+     *  Seek to \c offset relative to \c whence, one of stdio's whence values:
+     *  RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END
+     *
+     *  \return the final offset in the data stream, or -1 on error.
+     */
+    Sint64 (SDLCALL * seek) (struct SDL_RWops * context, Sint64 offset,
+                             int whence);
+
+    /**
+     *  Read up to \c maxnum objects each of size \c size from the data
+     *  stream to the area pointed at by \c ptr.
+     *
+     *  \return the number of objects read, or 0 at error or end of file.
+     */
+    size_t (SDLCALL * read) (struct SDL_RWops * context, void *ptr,
+                             size_t size, size_t maxnum);
+
+    /**
+     *  Write exactly \c num objects each of size \c size from the area
+     *  pointed at by \c ptr to data stream.
+     *
+     *  \return the number of objects written, or 0 at error or end of file.
+     */
+    size_t (SDLCALL * write) (struct SDL_RWops * context, const void *ptr,
+                              size_t size, size_t num);
+
+    /**
+     *  Close and free an allocated SDL_RWops structure.
+     *
+     *  \return 0 if successful or -1 on write error when flushing data.
+     */
+    int (SDLCALL * close) (struct SDL_RWops * context);
+
+    Uint32 type;
+    union
+    {
+#if defined(__ANDROID__)
+        struct
+        {
+            void *fileNameRef;
+            void *inputStreamRef;
+            void *readableByteChannelRef;
+            void *readMethod;
+            void *assetFileDescriptorRef;
+            long position;
+            long size;
+            long offset;
+            int fd;
+        } androidio;
+#elif defined(__WIN32__)
+        struct
+        {
+            SDL_bool append;
+            void *h;
+            struct
+            {
+                void *data;
+                size_t size;
+                size_t left;
+            } buffer;
+        } windowsio;
+#endif
+
+#ifdef HAVE_STDIO_H
+        struct
+        {
+            SDL_bool autoclose;
+            FILE *fp;
+        } stdio;
+#endif
+        struct
+        {
+            Uint8 *base;
+            Uint8 *here;
+            Uint8 *stop;
+        } mem;
+        struct
+        {
+            void *data1;
+            void *data2;
+        } unknown;
+    } hidden;
+
+} SDL_RWops;
+
+
+/**
+ *  \name RWFrom functions
+ *
+ *  Functions to create SDL_RWops structures from various data streams.
+ */
+/* @{ */
+
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file,
+                                                  const char *mode);
+
+#ifdef HAVE_STDIO_H
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp,
+                                                SDL_bool autoclose);
+#else
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp,
+                                                SDL_bool autoclose);
+#endif
+
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size);
+extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem,
+                                                      int size);
+
+/* @} *//* RWFrom functions */
+
+
+extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void);
+extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area);
+
+#define RW_SEEK_SET 0       /**< Seek from the beginning of data */
+#define RW_SEEK_CUR 1       /**< Seek relative to current read point */
+#define RW_SEEK_END 2       /**< Seek relative to the end of data */
+
+/**
+ *  Return the size of the file in this rwops, or -1 if unknown
+ */
+extern DECLSPEC Sint64 SDLCALL SDL_RWsize(SDL_RWops *context);
+
+/**
+ *  Seek to \c offset relative to \c whence, one of stdio's whence values:
+ *  RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END
+ *
+ *  \return the final offset in the data stream, or -1 on error.
+ */
+extern DECLSPEC Sint64 SDLCALL SDL_RWseek(SDL_RWops *context,
+                                          Sint64 offset, int whence);
+
+/**
+ *  Return the current offset in the data stream, or -1 on error.
+ */
+extern DECLSPEC Sint64 SDLCALL SDL_RWtell(SDL_RWops *context);
+
+/**
+ *  Read up to \c maxnum objects each of size \c size from the data
+ *  stream to the area pointed at by \c ptr.
+ *
+ *  \return the number of objects read, or 0 at error or end of file.
+ */
+extern DECLSPEC size_t SDLCALL SDL_RWread(SDL_RWops *context,
+                                          void *ptr, size_t size, size_t maxnum);
+
+/**
+ *  Write exactly \c num objects each of size \c size from the area
+ *  pointed at by \c ptr to data stream.
+ *
+ *  \return the number of objects written, or 0 at error or end of file.
+ */
+extern DECLSPEC size_t SDLCALL SDL_RWwrite(SDL_RWops *context,
+                                           const void *ptr, size_t size, size_t num);
+
+/**
+ *  Close and free an allocated SDL_RWops structure.
+ *
+ *  \return 0 if successful or -1 on write error when flushing data.
+ */
+extern DECLSPEC int SDLCALL SDL_RWclose(SDL_RWops *context);
+
+/**
+ *  Load all the data from an SDL data stream.
+ *
+ *  The data is allocated with a zero byte at the end (null terminated)
+ *
+ *  If \c datasize is not NULL, it is filled with the size of the data read.
+ *
+ *  If \c freesrc is non-zero, the stream will be closed after being read.
+ *
+ *  The data should be freed with SDL_free().
+ *
+ *  \return the data, or NULL if there was an error.
+ */
+extern DECLSPEC void *SDLCALL SDL_LoadFile_RW(SDL_RWops * src, size_t *datasize,
+                                                    int freesrc);
+
+/**
+ *  Load an entire file.
+ *
+ *  The data is allocated with a zero byte at the end (null terminated)
+ *
+ *  If \c datasize is not NULL, it is filled with the size of the data read.
+ *
+ *  If \c freesrc is non-zero, the stream will be closed after being read.
+ *
+ *  The data should be freed with SDL_free().
+ *
+ *  \return the data, or NULL if there was an error.
+ */
+extern DECLSPEC void *SDLCALL SDL_LoadFile(const char *file, size_t *datasize);
+
+/**
+ *  \name Read endian functions
+ *
+ *  Read an item of the specified endianness and return in native format.
+ */
+/* @{ */
+extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src);
+extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src);
+extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src);
+extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src);
+extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src);
+extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src);
+extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src);
+/* @} *//* Read endian functions */
+
+/**
+ *  \name Write endian functions
+ *
+ *  Write an item of native format to the specified endianness.
+ */
+/* @{ */
+extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value);
+extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
+/* @} *//* Write endian functions */
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_rwops_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_scancode.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_scancode.h
new file mode 100644
index 0000000..a50305f
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_scancode.h
@@ -0,0 +1,413 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_scancode.h
+ *
+ *  Defines keyboard scancodes.
+ */
+
+#ifndef SDL_scancode_h_
+#define SDL_scancode_h_
+
+#include "SDL_stdinc.h"
+
+/**
+ *  \brief The SDL keyboard scancode representation.
+ *
+ *  Values of this type are used to represent keyboard keys, among other places
+ *  in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the
+ *  SDL_Event structure.
+ *
+ *  The values in this enumeration are based on the USB usage page standard:
+ *  https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf
+ */
+typedef enum
+{
+    SDL_SCANCODE_UNKNOWN = 0,
+
+    /**
+     *  \name Usage page 0x07
+     *
+     *  These values are from usage page 0x07 (USB keyboard page).
+     */
+    /* @{ */
+
+    SDL_SCANCODE_A = 4,
+    SDL_SCANCODE_B = 5,
+    SDL_SCANCODE_C = 6,
+    SDL_SCANCODE_D = 7,
+    SDL_SCANCODE_E = 8,
+    SDL_SCANCODE_F = 9,
+    SDL_SCANCODE_G = 10,
+    SDL_SCANCODE_H = 11,
+    SDL_SCANCODE_I = 12,
+    SDL_SCANCODE_J = 13,
+    SDL_SCANCODE_K = 14,
+    SDL_SCANCODE_L = 15,
+    SDL_SCANCODE_M = 16,
+    SDL_SCANCODE_N = 17,
+    SDL_SCANCODE_O = 18,
+    SDL_SCANCODE_P = 19,
+    SDL_SCANCODE_Q = 20,
+    SDL_SCANCODE_R = 21,
+    SDL_SCANCODE_S = 22,
+    SDL_SCANCODE_T = 23,
+    SDL_SCANCODE_U = 24,
+    SDL_SCANCODE_V = 25,
+    SDL_SCANCODE_W = 26,
+    SDL_SCANCODE_X = 27,
+    SDL_SCANCODE_Y = 28,
+    SDL_SCANCODE_Z = 29,
+
+    SDL_SCANCODE_1 = 30,
+    SDL_SCANCODE_2 = 31,
+    SDL_SCANCODE_3 = 32,
+    SDL_SCANCODE_4 = 33,
+    SDL_SCANCODE_5 = 34,
+    SDL_SCANCODE_6 = 35,
+    SDL_SCANCODE_7 = 36,
+    SDL_SCANCODE_8 = 37,
+    SDL_SCANCODE_9 = 38,
+    SDL_SCANCODE_0 = 39,
+
+    SDL_SCANCODE_RETURN = 40,
+    SDL_SCANCODE_ESCAPE = 41,
+    SDL_SCANCODE_BACKSPACE = 42,
+    SDL_SCANCODE_TAB = 43,
+    SDL_SCANCODE_SPACE = 44,
+
+    SDL_SCANCODE_MINUS = 45,
+    SDL_SCANCODE_EQUALS = 46,
+    SDL_SCANCODE_LEFTBRACKET = 47,
+    SDL_SCANCODE_RIGHTBRACKET = 48,
+    SDL_SCANCODE_BACKSLASH = 49, /**< Located at the lower left of the return
+                                  *   key on ISO keyboards and at the right end
+                                  *   of the QWERTY row on ANSI keyboards.
+                                  *   Produces REVERSE SOLIDUS (backslash) and
+                                  *   VERTICAL LINE in a US layout, REVERSE
+                                  *   SOLIDUS and VERTICAL LINE in a UK Mac
+                                  *   layout, NUMBER SIGN and TILDE in a UK
+                                  *   Windows layout, DOLLAR SIGN and POUND SIGN
+                                  *   in a Swiss German layout, NUMBER SIGN and
+                                  *   APOSTROPHE in a German layout, GRAVE
+                                  *   ACCENT and POUND SIGN in a French Mac
+                                  *   layout, and ASTERISK and MICRO SIGN in a
+                                  *   French Windows layout.
+                                  */
+    SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code
+                                  *   instead of 49 for the same key, but all
+                                  *   OSes I've seen treat the two codes
+                                  *   identically. So, as an implementor, unless
+                                  *   your keyboard generates both of those
+                                  *   codes and your OS treats them differently,
+                                  *   you should generate SDL_SCANCODE_BACKSLASH
+                                  *   instead of this code. As a user, you
+                                  *   should not rely on this code because SDL
+                                  *   will never generate it with most (all?)
+                                  *   keyboards.
+                                  */
+    SDL_SCANCODE_SEMICOLON = 51,
+    SDL_SCANCODE_APOSTROPHE = 52,
+    SDL_SCANCODE_GRAVE = 53, /**< Located in the top left corner (on both ANSI
+                              *   and ISO keyboards). Produces GRAVE ACCENT and
+                              *   TILDE in a US Windows layout and in US and UK
+                              *   Mac layouts on ANSI keyboards, GRAVE ACCENT
+                              *   and NOT SIGN in a UK Windows layout, SECTION
+                              *   SIGN and PLUS-MINUS SIGN in US and UK Mac
+                              *   layouts on ISO keyboards, SECTION SIGN and
+                              *   DEGREE SIGN in a Swiss German layout (Mac:
+                              *   only on ISO keyboards), CIRCUMFLEX ACCENT and
+                              *   DEGREE SIGN in a German layout (Mac: only on
+                              *   ISO keyboards), SUPERSCRIPT TWO and TILDE in a
+                              *   French Windows layout, COMMERCIAL AT and
+                              *   NUMBER SIGN in a French Mac layout on ISO
+                              *   keyboards, and LESS-THAN SIGN and GREATER-THAN
+                              *   SIGN in a Swiss German, German, or French Mac
+                              *   layout on ANSI keyboards.
+                              */
+    SDL_SCANCODE_COMMA = 54,
+    SDL_SCANCODE_PERIOD = 55,
+    SDL_SCANCODE_SLASH = 56,
+
+    SDL_SCANCODE_CAPSLOCK = 57,
+
+    SDL_SCANCODE_F1 = 58,
+    SDL_SCANCODE_F2 = 59,
+    SDL_SCANCODE_F3 = 60,
+    SDL_SCANCODE_F4 = 61,
+    SDL_SCANCODE_F5 = 62,
+    SDL_SCANCODE_F6 = 63,
+    SDL_SCANCODE_F7 = 64,
+    SDL_SCANCODE_F8 = 65,
+    SDL_SCANCODE_F9 = 66,
+    SDL_SCANCODE_F10 = 67,
+    SDL_SCANCODE_F11 = 68,
+    SDL_SCANCODE_F12 = 69,
+
+    SDL_SCANCODE_PRINTSCREEN = 70,
+    SDL_SCANCODE_SCROLLLOCK = 71,
+    SDL_SCANCODE_PAUSE = 72,
+    SDL_SCANCODE_INSERT = 73, /**< insert on PC, help on some Mac keyboards (but
+                                   does send code 73, not 117) */
+    SDL_SCANCODE_HOME = 74,
+    SDL_SCANCODE_PAGEUP = 75,
+    SDL_SCANCODE_DELETE = 76,
+    SDL_SCANCODE_END = 77,
+    SDL_SCANCODE_PAGEDOWN = 78,
+    SDL_SCANCODE_RIGHT = 79,
+    SDL_SCANCODE_LEFT = 80,
+    SDL_SCANCODE_DOWN = 81,
+    SDL_SCANCODE_UP = 82,
+
+    SDL_SCANCODE_NUMLOCKCLEAR = 83, /**< num lock on PC, clear on Mac keyboards
+                                     */
+    SDL_SCANCODE_KP_DIVIDE = 84,
+    SDL_SCANCODE_KP_MULTIPLY = 85,
+    SDL_SCANCODE_KP_MINUS = 86,
+    SDL_SCANCODE_KP_PLUS = 87,
+    SDL_SCANCODE_KP_ENTER = 88,
+    SDL_SCANCODE_KP_1 = 89,
+    SDL_SCANCODE_KP_2 = 90,
+    SDL_SCANCODE_KP_3 = 91,
+    SDL_SCANCODE_KP_4 = 92,
+    SDL_SCANCODE_KP_5 = 93,
+    SDL_SCANCODE_KP_6 = 94,
+    SDL_SCANCODE_KP_7 = 95,
+    SDL_SCANCODE_KP_8 = 96,
+    SDL_SCANCODE_KP_9 = 97,
+    SDL_SCANCODE_KP_0 = 98,
+    SDL_SCANCODE_KP_PERIOD = 99,
+
+    SDL_SCANCODE_NONUSBACKSLASH = 100, /**< This is the additional key that ISO
+                                        *   keyboards have over ANSI ones,
+                                        *   located between left shift and Y.
+                                        *   Produces GRAVE ACCENT and TILDE in a
+                                        *   US or UK Mac layout, REVERSE SOLIDUS
+                                        *   (backslash) and VERTICAL LINE in a
+                                        *   US or UK Windows layout, and
+                                        *   LESS-THAN SIGN and GREATER-THAN SIGN
+                                        *   in a Swiss German, German, or French
+                                        *   layout. */
+    SDL_SCANCODE_APPLICATION = 101, /**< windows contextual menu, compose */
+    SDL_SCANCODE_POWER = 102, /**< The USB document says this is a status flag,
+                               *   not a physical key - but some Mac keyboards
+                               *   do have a power key. */
+    SDL_SCANCODE_KP_EQUALS = 103,
+    SDL_SCANCODE_F13 = 104,
+    SDL_SCANCODE_F14 = 105,
+    SDL_SCANCODE_F15 = 106,
+    SDL_SCANCODE_F16 = 107,
+    SDL_SCANCODE_F17 = 108,
+    SDL_SCANCODE_F18 = 109,
+    SDL_SCANCODE_F19 = 110,
+    SDL_SCANCODE_F20 = 111,
+    SDL_SCANCODE_F21 = 112,
+    SDL_SCANCODE_F22 = 113,
+    SDL_SCANCODE_F23 = 114,
+    SDL_SCANCODE_F24 = 115,
+    SDL_SCANCODE_EXECUTE = 116,
+    SDL_SCANCODE_HELP = 117,
+    SDL_SCANCODE_MENU = 118,
+    SDL_SCANCODE_SELECT = 119,
+    SDL_SCANCODE_STOP = 120,
+    SDL_SCANCODE_AGAIN = 121,   /**< redo */
+    SDL_SCANCODE_UNDO = 122,
+    SDL_SCANCODE_CUT = 123,
+    SDL_SCANCODE_COPY = 124,
+    SDL_SCANCODE_PASTE = 125,
+    SDL_SCANCODE_FIND = 126,
+    SDL_SCANCODE_MUTE = 127,
+    SDL_SCANCODE_VOLUMEUP = 128,
+    SDL_SCANCODE_VOLUMEDOWN = 129,
+/* not sure whether there's a reason to enable these */
+/*     SDL_SCANCODE_LOCKINGCAPSLOCK = 130,  */
+/*     SDL_SCANCODE_LOCKINGNUMLOCK = 131, */
+/*     SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */
+    SDL_SCANCODE_KP_COMMA = 133,
+    SDL_SCANCODE_KP_EQUALSAS400 = 134,
+
+    SDL_SCANCODE_INTERNATIONAL1 = 135, /**< used on Asian keyboards, see
+                                            footnotes in USB doc */
+    SDL_SCANCODE_INTERNATIONAL2 = 136,
+    SDL_SCANCODE_INTERNATIONAL3 = 137, /**< Yen */
+    SDL_SCANCODE_INTERNATIONAL4 = 138,
+    SDL_SCANCODE_INTERNATIONAL5 = 139,
+    SDL_SCANCODE_INTERNATIONAL6 = 140,
+    SDL_SCANCODE_INTERNATIONAL7 = 141,
+    SDL_SCANCODE_INTERNATIONAL8 = 142,
+    SDL_SCANCODE_INTERNATIONAL9 = 143,
+    SDL_SCANCODE_LANG1 = 144, /**< Hangul/English toggle */
+    SDL_SCANCODE_LANG2 = 145, /**< Hanja conversion */
+    SDL_SCANCODE_LANG3 = 146, /**< Katakana */
+    SDL_SCANCODE_LANG4 = 147, /**< Hiragana */
+    SDL_SCANCODE_LANG5 = 148, /**< Zenkaku/Hankaku */
+    SDL_SCANCODE_LANG6 = 149, /**< reserved */
+    SDL_SCANCODE_LANG7 = 150, /**< reserved */
+    SDL_SCANCODE_LANG8 = 151, /**< reserved */
+    SDL_SCANCODE_LANG9 = 152, /**< reserved */
+
+    SDL_SCANCODE_ALTERASE = 153, /**< Erase-Eaze */
+    SDL_SCANCODE_SYSREQ = 154,
+    SDL_SCANCODE_CANCEL = 155,
+    SDL_SCANCODE_CLEAR = 156,
+    SDL_SCANCODE_PRIOR = 157,
+    SDL_SCANCODE_RETURN2 = 158,
+    SDL_SCANCODE_SEPARATOR = 159,
+    SDL_SCANCODE_OUT = 160,
+    SDL_SCANCODE_OPER = 161,
+    SDL_SCANCODE_CLEARAGAIN = 162,
+    SDL_SCANCODE_CRSEL = 163,
+    SDL_SCANCODE_EXSEL = 164,
+
+    SDL_SCANCODE_KP_00 = 176,
+    SDL_SCANCODE_KP_000 = 177,
+    SDL_SCANCODE_THOUSANDSSEPARATOR = 178,
+    SDL_SCANCODE_DECIMALSEPARATOR = 179,
+    SDL_SCANCODE_CURRENCYUNIT = 180,
+    SDL_SCANCODE_CURRENCYSUBUNIT = 181,
+    SDL_SCANCODE_KP_LEFTPAREN = 182,
+    SDL_SCANCODE_KP_RIGHTPAREN = 183,
+    SDL_SCANCODE_KP_LEFTBRACE = 184,
+    SDL_SCANCODE_KP_RIGHTBRACE = 185,
+    SDL_SCANCODE_KP_TAB = 186,
+    SDL_SCANCODE_KP_BACKSPACE = 187,
+    SDL_SCANCODE_KP_A = 188,
+    SDL_SCANCODE_KP_B = 189,
+    SDL_SCANCODE_KP_C = 190,
+    SDL_SCANCODE_KP_D = 191,
+    SDL_SCANCODE_KP_E = 192,
+    SDL_SCANCODE_KP_F = 193,
+    SDL_SCANCODE_KP_XOR = 194,
+    SDL_SCANCODE_KP_POWER = 195,
+    SDL_SCANCODE_KP_PERCENT = 196,
+    SDL_SCANCODE_KP_LESS = 197,
+    SDL_SCANCODE_KP_GREATER = 198,
+    SDL_SCANCODE_KP_AMPERSAND = 199,
+    SDL_SCANCODE_KP_DBLAMPERSAND = 200,
+    SDL_SCANCODE_KP_VERTICALBAR = 201,
+    SDL_SCANCODE_KP_DBLVERTICALBAR = 202,
+    SDL_SCANCODE_KP_COLON = 203,
+    SDL_SCANCODE_KP_HASH = 204,
+    SDL_SCANCODE_KP_SPACE = 205,
+    SDL_SCANCODE_KP_AT = 206,
+    SDL_SCANCODE_KP_EXCLAM = 207,
+    SDL_SCANCODE_KP_MEMSTORE = 208,
+    SDL_SCANCODE_KP_MEMRECALL = 209,
+    SDL_SCANCODE_KP_MEMCLEAR = 210,
+    SDL_SCANCODE_KP_MEMADD = 211,
+    SDL_SCANCODE_KP_MEMSUBTRACT = 212,
+    SDL_SCANCODE_KP_MEMMULTIPLY = 213,
+    SDL_SCANCODE_KP_MEMDIVIDE = 214,
+    SDL_SCANCODE_KP_PLUSMINUS = 215,
+    SDL_SCANCODE_KP_CLEAR = 216,
+    SDL_SCANCODE_KP_CLEARENTRY = 217,
+    SDL_SCANCODE_KP_BINARY = 218,
+    SDL_SCANCODE_KP_OCTAL = 219,
+    SDL_SCANCODE_KP_DECIMAL = 220,
+    SDL_SCANCODE_KP_HEXADECIMAL = 221,
+
+    SDL_SCANCODE_LCTRL = 224,
+    SDL_SCANCODE_LSHIFT = 225,
+    SDL_SCANCODE_LALT = 226, /**< alt, option */
+    SDL_SCANCODE_LGUI = 227, /**< windows, command (apple), meta */
+    SDL_SCANCODE_RCTRL = 228,
+    SDL_SCANCODE_RSHIFT = 229,
+    SDL_SCANCODE_RALT = 230, /**< alt gr, option */
+    SDL_SCANCODE_RGUI = 231, /**< windows, command (apple), meta */
+
+    SDL_SCANCODE_MODE = 257,    /**< I'm not sure if this is really not covered
+                                 *   by any of the above, but since there's a
+                                 *   special KMOD_MODE for it I'm adding it here
+                                 */
+
+    /* @} *//* Usage page 0x07 */
+
+    /**
+     *  \name Usage page 0x0C
+     *
+     *  These values are mapped from usage page 0x0C (USB consumer page).
+     */
+    /* @{ */
+
+    SDL_SCANCODE_AUDIONEXT = 258,
+    SDL_SCANCODE_AUDIOPREV = 259,
+    SDL_SCANCODE_AUDIOSTOP = 260,
+    SDL_SCANCODE_AUDIOPLAY = 261,
+    SDL_SCANCODE_AUDIOMUTE = 262,
+    SDL_SCANCODE_MEDIASELECT = 263,
+    SDL_SCANCODE_WWW = 264,
+    SDL_SCANCODE_MAIL = 265,
+    SDL_SCANCODE_CALCULATOR = 266,
+    SDL_SCANCODE_COMPUTER = 267,
+    SDL_SCANCODE_AC_SEARCH = 268,
+    SDL_SCANCODE_AC_HOME = 269,
+    SDL_SCANCODE_AC_BACK = 270,
+    SDL_SCANCODE_AC_FORWARD = 271,
+    SDL_SCANCODE_AC_STOP = 272,
+    SDL_SCANCODE_AC_REFRESH = 273,
+    SDL_SCANCODE_AC_BOOKMARKS = 274,
+
+    /* @} *//* Usage page 0x0C */
+
+    /**
+     *  \name Walther keys
+     *
+     *  These are values that Christian Walther added (for mac keyboard?).
+     */
+    /* @{ */
+
+    SDL_SCANCODE_BRIGHTNESSDOWN = 275,
+    SDL_SCANCODE_BRIGHTNESSUP = 276,
+    SDL_SCANCODE_DISPLAYSWITCH = 277, /**< display mirroring/dual display
+                                           switch, video mode switch */
+    SDL_SCANCODE_KBDILLUMTOGGLE = 278,
+    SDL_SCANCODE_KBDILLUMDOWN = 279,
+    SDL_SCANCODE_KBDILLUMUP = 280,
+    SDL_SCANCODE_EJECT = 281,
+    SDL_SCANCODE_SLEEP = 282,
+
+    SDL_SCANCODE_APP1 = 283,
+    SDL_SCANCODE_APP2 = 284,
+
+    /* @} *//* Walther keys */
+
+    /**
+     *  \name Usage page 0x0C (additional media keys)
+     *
+     *  These values are mapped from usage page 0x0C (USB consumer page).
+     */
+    /* @{ */
+
+    SDL_SCANCODE_AUDIOREWIND = 285,
+    SDL_SCANCODE_AUDIOFASTFORWARD = 286,
+
+    /* @} *//* Usage page 0x0C (additional media keys) */
+
+    /* Add any other keys here. */
+
+    SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes
+                                 for array bounds */
+} SDL_Scancode;
+
+#endif /* SDL_scancode_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_sensor.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_sensor.h
new file mode 100644
index 0000000..966adbf
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_sensor.h
@@ -0,0 +1,251 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_sensor.h
+ *
+ *  Include file for SDL sensor event handling
+ *
+ */
+
+#ifndef SDL_sensor_h_
+#define SDL_sensor_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+extern "C" {
+/* *INDENT-ON* */
+#endif
+
+/**
+ *  \brief SDL_sensor.h
+ *
+ *  In order to use these functions, SDL_Init() must have been called
+ *  with the ::SDL_INIT_SENSOR flag.  This causes SDL to scan the system
+ *  for sensors, and load appropriate drivers.
+ */
+
+struct _SDL_Sensor;
+typedef struct _SDL_Sensor SDL_Sensor;
+
+/**
+ * This is a unique ID for a sensor for the time it is connected to the system,
+ * and is never reused for the lifetime of the application.
+ *
+ * The ID value starts at 0 and increments from there. The value -1 is an invalid ID.
+ */
+typedef Sint32 SDL_SensorID;
+
+/* The different sensors defined by SDL
+ *
+ * Additional sensors may be available, using platform dependent semantics.
+ *
+ * Hare are the additional Android sensors:
+ * https://developer.android.com/reference/android/hardware/SensorEvent.html#values
+ */
+typedef enum
+{
+    SDL_SENSOR_INVALID = -1,    /**< Returned for an invalid sensor */
+    SDL_SENSOR_UNKNOWN,         /**< Unknown sensor type */
+    SDL_SENSOR_ACCEL,           /**< Accelerometer */
+    SDL_SENSOR_GYRO             /**< Gyroscope */
+} SDL_SensorType;
+
+/**
+ * Accelerometer sensor
+ *
+ * The accelerometer returns the current acceleration in SI meters per
+ * second squared. This includes gravity, so a device at rest will have
+ * an acceleration of SDL_STANDARD_GRAVITY straight down.
+ *
+ * values[0]: Acceleration on the x axis
+ * values[1]: Acceleration on the y axis
+ * values[2]: Acceleration on the z axis
+ *
+ * For phones held in portrait mode, the axes are defined as follows:
+ * -X ... +X : left ... right
+ * -Y ... +Y : bottom ... top
+ * -Z ... +Z : farther ... closer
+ * 
+ * The axis data is not changed when the phone is rotated.
+ *
+ * \sa SDL_GetDisplayOrientation()
+ */
+#define SDL_STANDARD_GRAVITY    9.80665f
+
+/**
+ * Gyroscope sensor
+ *
+ * The gyroscope returns the current rate of rotation in radians per second.
+ * The rotation is positive in the counter-clockwise direction. That is,
+ * an observer looking from a positive location on one of the axes would
+ * see positive rotation on that axis when it appeared to be rotating
+ * counter-clockwise.
+ *
+ * values[0]: Angular speed around the x axis
+ * values[1]: Angular speed around the y axis
+ * values[2]: Angular speed around the z axis
+ *
+ * For phones held in portrait mode, the axes are defined as follows:
+ * -X ... +X : left ... right
+ * -Y ... +Y : bottom ... top
+ * -Z ... +Z : farther ... closer
+ * 
+ * The axis data is not changed when the phone is rotated.
+ *
+ * \sa SDL_GetDisplayOrientation()
+ */
+
+/* Function prototypes */
+
+/**
+ *  \brief Count the number of sensors attached to the system right now
+ */
+extern DECLSPEC int SDLCALL SDL_NumSensors(void);
+
+/**
+ *  \brief Get the implementation dependent name of a sensor.
+ *
+ *  This can be called before any sensors are opened.
+ * 
+ *  \return The sensor name, or NULL if device_index is out of range.
+ */
+extern DECLSPEC const char *SDLCALL SDL_SensorGetDeviceName(int device_index);
+
+/**
+ *  \brief Get the type of a sensor.
+ *
+ *  This can be called before any sensors are opened.
+ *
+ *  \return The sensor type, or SDL_SENSOR_INVALID if device_index is out of range.
+ */
+extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetDeviceType(int device_index);
+
+/**
+ *  \brief Get the platform dependent type of a sensor.
+ *
+ *  This can be called before any sensors are opened.
+ *
+ *  \return The sensor platform dependent type, or -1 if device_index is out of range.
+ */
+extern DECLSPEC int SDLCALL SDL_SensorGetDeviceNonPortableType(int device_index);
+
+/**
+ *  \brief Get the instance ID of a sensor.
+ *
+ *  This can be called before any sensors are opened.
+ *
+ *  \return The sensor instance ID, or -1 if device_index is out of range.
+ */
+extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetDeviceInstanceID(int device_index);
+
+/**
+ *  \brief Open a sensor for use.
+ *
+ *  The index passed as an argument refers to the N'th sensor on the system.
+ *
+ *  \return A sensor identifier, or NULL if an error occurred.
+ */
+extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorOpen(int device_index);
+
+/**
+ * Return the SDL_Sensor associated with an instance id.
+ */
+extern DECLSPEC SDL_Sensor *SDLCALL SDL_SensorFromInstanceID(SDL_SensorID instance_id);
+
+/**
+ *  \brief Get the implementation dependent name of a sensor.
+ *
+ *  \return The sensor name, or NULL if the sensor is NULL.
+ */
+extern DECLSPEC const char *SDLCALL SDL_SensorGetName(SDL_Sensor *sensor);
+
+/**
+ *  \brief Get the type of a sensor.
+ *
+ *  This can be called before any sensors are opened.
+ *
+ *  \return The sensor type, or SDL_SENSOR_INVALID if the sensor is NULL.
+ */
+extern DECLSPEC SDL_SensorType SDLCALL SDL_SensorGetType(SDL_Sensor *sensor);
+
+/**
+ *  \brief Get the platform dependent type of a sensor.
+ *
+ *  This can be called before any sensors are opened.
+ *
+ *  \return The sensor platform dependent type, or -1 if the sensor is NULL.
+ */
+extern DECLSPEC int SDLCALL SDL_SensorGetNonPortableType(SDL_Sensor *sensor);
+
+/**
+ *  \brief Get the instance ID of a sensor.
+ *
+ *  This can be called before any sensors are opened.
+ *
+ *  \return The sensor instance ID, or -1 if the sensor is NULL.
+ */
+extern DECLSPEC SDL_SensorID SDLCALL SDL_SensorGetInstanceID(SDL_Sensor *sensor);
+
+/**
+ *  Get the current state of an opened sensor.
+ *
+ *  The number of values and interpretation of the data is sensor dependent.
+ *
+ *  \param sensor The sensor to query
+ *  \param data A pointer filled with the current sensor state
+ *  \param num_values The number of values to write to data
+ *
+ *  \return 0 or -1 if an error occurred.
+ */
+extern DECLSPEC int SDLCALL SDL_SensorGetData(SDL_Sensor * sensor, float *data, int num_values);
+
+/**
+ *  Close a sensor previously opened with SDL_SensorOpen()
+ */
+extern DECLSPEC void SDLCALL SDL_SensorClose(SDL_Sensor * sensor);
+
+/**
+ *  Update the current state of the open sensors.
+ *
+ *  This is called automatically by the event loop if sensor events are enabled.
+ *
+ *  This needs to be called from the thread that initialized the sensor subsystem.
+ */
+extern DECLSPEC void SDLCALL SDL_SensorUpdate(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+/* *INDENT-OFF* */
+}
+/* *INDENT-ON* */
+#endif
+#include "close_code.h"
+
+#endif /* SDL_sensor_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_shape.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_shape.h
new file mode 100644
index 0000000..2ab43fc
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_shape.h
@@ -0,0 +1,144 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_shape_h_
+#define SDL_shape_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_surface.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \file SDL_shape.h
+ *
+ * Header file for the shaped window API.
+ */
+
+#define SDL_NONSHAPEABLE_WINDOW -1
+#define SDL_INVALID_SHAPE_ARGUMENT -2
+#define SDL_WINDOW_LACKS_SHAPE -3
+
+/**
+ *  \brief Create a window that can be shaped with the specified position, dimensions, and flags.
+ *
+ *  \param title The title of the window, in UTF-8 encoding.
+ *  \param x     The x position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param y     The y position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param w     The width of the window.
+ *  \param h     The height of the window.
+ *  \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following:
+ *               ::SDL_WINDOW_OPENGL,     ::SDL_WINDOW_INPUT_GRABBED,
+ *               ::SDL_WINDOW_HIDDEN,     ::SDL_WINDOW_RESIZABLE,
+ *               ::SDL_WINDOW_MAXIMIZED,  ::SDL_WINDOW_MINIMIZED,
+ *       ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset.
+ *
+ *  \return The window created, or NULL if window creation failed.
+ *
+ *  \sa SDL_DestroyWindow()
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags);
+
+/**
+ * \brief Return whether the given window is a shaped window.
+ *
+ * \param window The window to query for being shaped.
+ *
+ * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL.
+ *
+ * \sa SDL_CreateShapedWindow
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window);
+
+/** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */
+typedef enum {
+    /** \brief The default mode, a binarized alpha cutoff of 1. */
+    ShapeModeDefault,
+    /** \brief A binarized alpha cutoff with a given integer value. */
+    ShapeModeBinarizeAlpha,
+    /** \brief A binarized alpha cutoff with a given integer value, but with the opposite comparison. */
+    ShapeModeReverseBinarizeAlpha,
+    /** \brief A color key is applied. */
+    ShapeModeColorKey
+} WindowShapeMode;
+
+#define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha)
+
+/** \brief A union containing parameters for shaped windows. */
+typedef union {
+    /** \brief A cutoff alpha value for binarization of the window shape's alpha channel. */
+    Uint8 binarizationCutoff;
+    SDL_Color colorKey;
+} SDL_WindowShapeParams;
+
+/** \brief A struct that tags the SDL_WindowShapeParams union with an enum describing the type of its contents. */
+typedef struct SDL_WindowShapeMode {
+    /** \brief The mode of these window-shape parameters. */
+    WindowShapeMode mode;
+    /** \brief Window-shape parameters. */
+    SDL_WindowShapeParams parameters;
+} SDL_WindowShapeMode;
+
+/**
+ * \brief Set the shape and parameters of a shaped window.
+ *
+ * \param window The shaped window whose parameters should be set.
+ * \param shape A surface encoding the desired shape for the window.
+ * \param shape_mode The parameters to set for the shaped window.
+ *
+ * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW
+ *           if the SDL_Window given does not reference a valid shaped window.
+ *
+ * \sa SDL_WindowShapeMode
+ * \sa SDL_GetShapedWindowMode.
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode);
+
+/**
+ * \brief Get the shape parameters of a shaped window.
+ *
+ * \param window The shaped window whose parameters should be retrieved.
+ * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape.
+ *
+ * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode
+ *           data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if
+ *           the SDL_Window given is a shapeable window currently lacking a shape.
+ *
+ * \sa SDL_WindowShapeMode
+ * \sa SDL_SetWindowShape
+ */
+extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_shape_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_stdinc.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_stdinc.h
new file mode 100644
index 0000000..28bb7b9
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_stdinc.h
@@ -0,0 +1,607 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_stdinc.h
+ *
+ *  This is a general header that includes C language support.
+ */
+
+#ifndef SDL_stdinc_h_
+#define SDL_stdinc_h_
+
+#include "SDL_config.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_STDIO_H
+#include <stdio.h>
+#endif
+#if defined(STDC_HEADERS)
+# include <stdlib.h>
+# include <stddef.h>
+# include <stdarg.h>
+#else
+# if defined(HAVE_STDLIB_H)
+#  include <stdlib.h>
+# elif defined(HAVE_MALLOC_H)
+#  include <malloc.h>
+# endif
+# if defined(HAVE_STDDEF_H)
+#  include <stddef.h>
+# endif
+# if defined(HAVE_STDARG_H)
+#  include <stdarg.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+#if defined(HAVE_INTTYPES_H)
+# include <inttypes.h>
+#elif defined(HAVE_STDINT_H)
+# include <stdint.h>
+#endif
+#ifdef HAVE_CTYPE_H
+# include <ctype.h>
+#endif
+#ifdef HAVE_MATH_H
+# if defined(__WINRT__)
+/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on
+   WinRT.  See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx
+   for more information.
+*/
+#  define _USE_MATH_DEFINES
+# endif
+# include <math.h>
+#endif
+#ifdef HAVE_FLOAT_H
+# include <float.h>
+#endif
+#if defined(HAVE_ALLOCA) && !defined(alloca)
+# if defined(HAVE_ALLOCA_H)
+#  include <alloca.h>
+# elif defined(__GNUC__)
+#  define alloca __builtin_alloca
+# elif defined(_MSC_VER)
+#  include <malloc.h>
+#  define alloca _alloca
+# elif defined(__WATCOMC__)
+#  include <malloc.h>
+# elif defined(__BORLANDC__)
+#  include <malloc.h>
+# elif defined(__DMC__)
+#  include <stdlib.h>
+# elif defined(__AIX__)
+#pragma alloca
+# elif defined(__MRC__)
+void *alloca(unsigned);
+# else
+char *alloca();
+# endif
+#endif
+
+/**
+ *  The number of elements in an array.
+ */
+#define SDL_arraysize(array)    (sizeof(array)/sizeof(array[0]))
+#define SDL_TABLESIZE(table)    SDL_arraysize(table)
+
+/**
+ *  Macro useful for building other macros with strings in them
+ *
+ *  e.g. #define LOG_ERROR(X) OutputDebugString(SDL_STRINGIFY_ARG(__FUNCTION__) ": " X "\n")
+ */
+#define SDL_STRINGIFY_ARG(arg)  #arg
+
+/**
+ *  \name Cast operators
+ *
+ *  Use proper C++ casts when compiled as C++ to be compatible with the option
+ *  -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above).
+ */
+/* @{ */
+#ifdef __cplusplus
+#define SDL_reinterpret_cast(type, expression) reinterpret_cast<type>(expression)
+#define SDL_static_cast(type, expression) static_cast<type>(expression)
+#define SDL_const_cast(type, expression) const_cast<type>(expression)
+#else
+#define SDL_reinterpret_cast(type, expression) ((type)(expression))
+#define SDL_static_cast(type, expression) ((type)(expression))
+#define SDL_const_cast(type, expression) ((type)(expression))
+#endif
+/* @} *//* Cast operators */
+
+/* Define a four character code as a Uint32 */
+#define SDL_FOURCC(A, B, C, D) \
+    ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \
+     (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24))
+
+/**
+ *  \name Basic data types
+ */
+/* @{ */
+
+#ifdef __CC_ARM
+/* ARM's compiler throws warnings if we use an enum: like "SDL_bool x = a < b;" */
+#define SDL_FALSE 0
+#define SDL_TRUE 1
+typedef int SDL_bool;
+#else
+typedef enum
+{
+    SDL_FALSE = 0,
+    SDL_TRUE = 1
+} SDL_bool;
+#endif
+
+/**
+ * \brief A signed 8-bit integer type.
+ */
+#define SDL_MAX_SINT8   ((Sint8)0x7F)           /* 127 */
+#define SDL_MIN_SINT8   ((Sint8)(~0x7F))        /* -128 */
+typedef int8_t Sint8;
+/**
+ * \brief An unsigned 8-bit integer type.
+ */
+#define SDL_MAX_UINT8   ((Uint8)0xFF)           /* 255 */
+#define SDL_MIN_UINT8   ((Uint8)0x00)           /* 0 */
+typedef uint8_t Uint8;
+/**
+ * \brief A signed 16-bit integer type.
+ */
+#define SDL_MAX_SINT16  ((Sint16)0x7FFF)        /* 32767 */
+#define SDL_MIN_SINT16  ((Sint16)(~0x7FFF))     /* -32768 */
+typedef int16_t Sint16;
+/**
+ * \brief An unsigned 16-bit integer type.
+ */
+#define SDL_MAX_UINT16  ((Uint16)0xFFFF)        /* 65535 */
+#define SDL_MIN_UINT16  ((Uint16)0x0000)        /* 0 */
+typedef uint16_t Uint16;
+/**
+ * \brief A signed 32-bit integer type.
+ */
+#define SDL_MAX_SINT32  ((Sint32)0x7FFFFFFF)    /* 2147483647 */
+#define SDL_MIN_SINT32  ((Sint32)(~0x7FFFFFFF)) /* -2147483648 */
+typedef int32_t Sint32;
+/**
+ * \brief An unsigned 32-bit integer type.
+ */
+#define SDL_MAX_UINT32  ((Uint32)0xFFFFFFFFu)   /* 4294967295 */
+#define SDL_MIN_UINT32  ((Uint32)0x00000000)    /* 0 */
+typedef uint32_t Uint32;
+
+/**
+ * \brief A signed 64-bit integer type.
+ */
+#define SDL_MAX_SINT64  ((Sint64)0x7FFFFFFFFFFFFFFFll)      /* 9223372036854775807 */
+#define SDL_MIN_SINT64  ((Sint64)(~0x7FFFFFFFFFFFFFFFll))   /* -9223372036854775808 */
+typedef int64_t Sint64;
+/**
+ * \brief An unsigned 64-bit integer type.
+ */
+#define SDL_MAX_UINT64  ((Uint64)0xFFFFFFFFFFFFFFFFull)     /* 18446744073709551615 */
+#define SDL_MIN_UINT64  ((Uint64)(0x0000000000000000ull))   /* 0 */
+typedef uint64_t Uint64;
+
+/* @} *//* Basic data types */
+
+/* Make sure we have macros for printing 64 bit values.
+ * <stdint.h> should define these but this is not true all platforms.
+ * (for example win32) */
+#ifndef SDL_PRIs64
+#ifdef PRIs64
+#define SDL_PRIs64 PRIs64
+#elif defined(__WIN32__)
+#define SDL_PRIs64 "I64d"
+#elif defined(__LINUX__) && defined(__LP64__)
+#define SDL_PRIs64 "ld"
+#else
+#define SDL_PRIs64 "lld"
+#endif
+#endif
+#ifndef SDL_PRIu64
+#ifdef PRIu64
+#define SDL_PRIu64 PRIu64
+#elif defined(__WIN32__)
+#define SDL_PRIu64 "I64u"
+#elif defined(__LINUX__) && defined(__LP64__)
+#define SDL_PRIu64 "lu"
+#else
+#define SDL_PRIu64 "llu"
+#endif
+#endif
+#ifndef SDL_PRIx64
+#ifdef PRIx64
+#define SDL_PRIx64 PRIx64
+#elif defined(__WIN32__)
+#define SDL_PRIx64 "I64x"
+#elif defined(__LINUX__) && defined(__LP64__)
+#define SDL_PRIx64 "lx"
+#else
+#define SDL_PRIx64 "llx"
+#endif
+#endif
+#ifndef SDL_PRIX64
+#ifdef PRIX64
+#define SDL_PRIX64 PRIX64
+#elif defined(__WIN32__)
+#define SDL_PRIX64 "I64X"
+#elif defined(__LINUX__) && defined(__LP64__)
+#define SDL_PRIX64 "lX"
+#else
+#define SDL_PRIX64 "llX"
+#endif
+#endif
+
+/* Annotations to help code analysis tools */
+#ifdef SDL_DISABLE_ANALYZE_MACROS
+#define SDL_IN_BYTECAP(x)
+#define SDL_INOUT_Z_CAP(x)
+#define SDL_OUT_Z_CAP(x)
+#define SDL_OUT_CAP(x)
+#define SDL_OUT_BYTECAP(x)
+#define SDL_OUT_Z_BYTECAP(x)
+#define SDL_PRINTF_FORMAT_STRING
+#define SDL_SCANF_FORMAT_STRING
+#define SDL_PRINTF_VARARG_FUNC( fmtargnumber )
+#define SDL_SCANF_VARARG_FUNC( fmtargnumber )
+#else
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) /* VS 2010 and above */
+#include <sal.h>
+
+#define SDL_IN_BYTECAP(x) _In_bytecount_(x)
+#define SDL_INOUT_Z_CAP(x) _Inout_z_cap_(x)
+#define SDL_OUT_Z_CAP(x) _Out_z_cap_(x)
+#define SDL_OUT_CAP(x) _Out_cap_(x)
+#define SDL_OUT_BYTECAP(x) _Out_bytecap_(x)
+#define SDL_OUT_Z_BYTECAP(x) _Out_z_bytecap_(x)
+
+#define SDL_PRINTF_FORMAT_STRING _Printf_format_string_
+#define SDL_SCANF_FORMAT_STRING _Scanf_format_string_impl_
+#else
+#define SDL_IN_BYTECAP(x)
+#define SDL_INOUT_Z_CAP(x)
+#define SDL_OUT_Z_CAP(x)
+#define SDL_OUT_CAP(x)
+#define SDL_OUT_BYTECAP(x)
+#define SDL_OUT_Z_BYTECAP(x)
+#define SDL_PRINTF_FORMAT_STRING
+#define SDL_SCANF_FORMAT_STRING
+#endif
+#if defined(__GNUC__)
+#define SDL_PRINTF_VARARG_FUNC( fmtargnumber ) __attribute__ (( format( __printf__, fmtargnumber, fmtargnumber+1 )))
+#define SDL_SCANF_VARARG_FUNC( fmtargnumber ) __attribute__ (( format( __scanf__, fmtargnumber, fmtargnumber+1 )))
+#else
+#define SDL_PRINTF_VARARG_FUNC( fmtargnumber )
+#define SDL_SCANF_VARARG_FUNC( fmtargnumber )
+#endif
+#endif /* SDL_DISABLE_ANALYZE_MACROS */
+
+#define SDL_COMPILE_TIME_ASSERT(name, x)               \
+       typedef int SDL_compile_time_assert_ ## name[(x) * 2 - 1]
+/** \cond */
+#ifndef DOXYGEN_SHOULD_IGNORE_THIS
+SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1);
+SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1);
+SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
+SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
+SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
+SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
+SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8);
+SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
+#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
+/** \endcond */
+
+/* Check to make sure enums are the size of ints, for structure packing.
+   For both Watcom C/C++ and Borland C/C++ the compiler option that makes
+   enums having the size of an int must be enabled.
+   This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11).
+*/
+
+/** \cond */
+#ifndef DOXYGEN_SHOULD_IGNORE_THIS
+#if !defined(__ANDROID__)
+   /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
+typedef enum
+{
+    DUMMY_ENUM_VALUE
+} SDL_DUMMY_ENUM;
+
+SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
+#endif
+#endif /* DOXYGEN_SHOULD_IGNORE_THIS */
+/** \endcond */
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef HAVE_ALLOCA
+#define SDL_stack_alloc(type, count)    (type*)alloca(sizeof(type)*(count))
+#define SDL_stack_free(data)
+#else
+#define SDL_stack_alloc(type, count)    (type*)SDL_malloc(sizeof(type)*(count))
+#define SDL_stack_free(data)            SDL_free(data)
+#endif
+
+extern DECLSPEC void *SDLCALL SDL_malloc(size_t size);
+extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size);
+extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size);
+extern DECLSPEC void SDLCALL SDL_free(void *mem);
+
+typedef void *(SDLCALL *SDL_malloc_func)(size_t size);
+typedef void *(SDLCALL *SDL_calloc_func)(size_t nmemb, size_t size);
+typedef void *(SDLCALL *SDL_realloc_func)(void *mem, size_t size);
+typedef void (SDLCALL *SDL_free_func)(void *mem);
+
+/**
+ *  \brief Get the current set of SDL memory functions
+ */
+extern DECLSPEC void SDLCALL SDL_GetMemoryFunctions(SDL_malloc_func *malloc_func,
+                                                    SDL_calloc_func *calloc_func,
+                                                    SDL_realloc_func *realloc_func,
+                                                    SDL_free_func *free_func);
+
+/**
+ *  \brief Replace SDL's memory allocation functions with a custom set
+ *
+ *  \note If you are replacing SDL's memory functions, you should call
+ *        SDL_GetNumAllocations() and be very careful if it returns non-zero.
+ *        That means that your free function will be called with memory
+ *        allocated by the previous memory allocation functions.
+ */
+extern DECLSPEC int SDLCALL SDL_SetMemoryFunctions(SDL_malloc_func malloc_func,
+                                                   SDL_calloc_func calloc_func,
+                                                   SDL_realloc_func realloc_func,
+                                                   SDL_free_func free_func);
+
+/**
+ *  \brief Get the number of outstanding (unfreed) allocations
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumAllocations(void);
+
+extern DECLSPEC char *SDLCALL SDL_getenv(const char *name);
+extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, int overwrite);
+
+extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *));
+
+extern DECLSPEC int SDLCALL SDL_abs(int x);
+
+/* !!! FIXME: these have side effects. You probably shouldn't use them. */
+/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */
+#define SDL_min(x, y) (((x) < (y)) ? (x) : (y))
+#define SDL_max(x, y) (((x) > (y)) ? (x) : (y))
+
+extern DECLSPEC int SDLCALL SDL_isdigit(int x);
+extern DECLSPEC int SDLCALL SDL_isspace(int x);
+extern DECLSPEC int SDLCALL SDL_toupper(int x);
+extern DECLSPEC int SDLCALL SDL_tolower(int x);
+
+extern DECLSPEC void *SDLCALL SDL_memset(SDL_OUT_BYTECAP(len) void *dst, int c, size_t len);
+
+#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x)))
+#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x)))
+
+/* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */
+SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords)
+{
+#if defined(__GNUC__) && defined(i386)
+    int u0, u1, u2;
+    __asm__ __volatile__ (
+        "cld \n\t"
+        "rep ; stosl \n\t"
+        : "=&D" (u0), "=&a" (u1), "=&c" (u2)
+        : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, dwords))
+        : "memory"
+    );
+#else
+    size_t _n = (dwords + 3) / 4;
+    Uint32 *_p = SDL_static_cast(Uint32 *, dst);
+    Uint32 _val = (val);
+    if (dwords == 0)
+        return;
+    switch (dwords % 4)
+    {
+        case 0: do {    *_p++ = _val;   /* fallthrough */
+        case 3:         *_p++ = _val;   /* fallthrough */
+        case 2:         *_p++ = _val;   /* fallthrough */
+        case 1:         *_p++ = _val;   /* fallthrough */
+        } while ( --_n );
+    }
+#endif
+}
+
+extern DECLSPEC void *SDLCALL SDL_memcpy(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len);
+
+extern DECLSPEC void *SDLCALL SDL_memmove(SDL_OUT_BYTECAP(len) void *dst, SDL_IN_BYTECAP(len) const void *src, size_t len);
+extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len);
+
+extern DECLSPEC wchar_t *SDLCALL SDL_wcsdup(const wchar_t *wstr);
+extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr);
+extern DECLSPEC size_t SDLCALL SDL_wcslcpy(SDL_OUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen);
+extern DECLSPEC size_t SDLCALL SDL_wcslcat(SDL_INOUT_Z_CAP(maxlen) wchar_t *dst, const wchar_t *src, size_t maxlen);
+extern DECLSPEC int SDLCALL SDL_wcscmp(const wchar_t *str1, const wchar_t *str2);
+
+extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str);
+extern DECLSPEC size_t SDLCALL SDL_strlcpy(SDL_OUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen);
+extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(SDL_OUT_Z_CAP(dst_bytes) char *dst, const char *src, size_t dst_bytes);
+extern DECLSPEC size_t SDLCALL SDL_strlcat(SDL_INOUT_Z_CAP(maxlen) char *dst, const char *src, size_t maxlen);
+extern DECLSPEC char *SDLCALL SDL_strdup(const char *str);
+extern DECLSPEC char *SDLCALL SDL_strrev(char *str);
+extern DECLSPEC char *SDLCALL SDL_strupr(char *str);
+extern DECLSPEC char *SDLCALL SDL_strlwr(char *str);
+extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c);
+extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c);
+extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle);
+extern DECLSPEC size_t SDLCALL SDL_utf8strlen(const char *str);
+
+extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_uitoa(unsigned int value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *str, int radix);
+extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *str, int radix);
+
+extern DECLSPEC int SDLCALL SDL_atoi(const char *str);
+extern DECLSPEC double SDLCALL SDL_atof(const char *str);
+extern DECLSPEC long SDLCALL SDL_strtol(const char *str, char **endp, int base);
+extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *str, char **endp, int base);
+extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *str, char **endp, int base);
+extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *str, char **endp, int base);
+extern DECLSPEC double SDLCALL SDL_strtod(const char *str, char **endp);
+
+extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2);
+extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen);
+extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2);
+extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t len);
+
+extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, SDL_SCANF_FORMAT_STRING const char *fmt, ...) SDL_SCANF_VARARG_FUNC(2);
+extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap);
+extern DECLSPEC int SDLCALL SDL_snprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, SDL_PRINTF_FORMAT_STRING const char *fmt, ... ) SDL_PRINTF_VARARG_FUNC(3);
+extern DECLSPEC int SDLCALL SDL_vsnprintf(SDL_OUT_Z_CAP(maxlen) char *text, size_t maxlen, const char *fmt, va_list ap);
+
+#ifndef HAVE_M_PI
+#ifndef M_PI
+#define M_PI    3.14159265358979323846264338327950288   /**< pi */
+#endif
+#endif
+
+extern DECLSPEC double SDLCALL SDL_acos(double x);
+extern DECLSPEC float SDLCALL SDL_acosf(float x);
+extern DECLSPEC double SDLCALL SDL_asin(double x);
+extern DECLSPEC float SDLCALL SDL_asinf(float x);
+extern DECLSPEC double SDLCALL SDL_atan(double x);
+extern DECLSPEC float SDLCALL SDL_atanf(float x);
+extern DECLSPEC double SDLCALL SDL_atan2(double x, double y);
+extern DECLSPEC float SDLCALL SDL_atan2f(float x, float y);
+extern DECLSPEC double SDLCALL SDL_ceil(double x);
+extern DECLSPEC float SDLCALL SDL_ceilf(float x);
+extern DECLSPEC double SDLCALL SDL_copysign(double x, double y);
+extern DECLSPEC float SDLCALL SDL_copysignf(float x, float y);
+extern DECLSPEC double SDLCALL SDL_cos(double x);
+extern DECLSPEC float SDLCALL SDL_cosf(float x);
+extern DECLSPEC double SDLCALL SDL_exp(double x);
+extern DECLSPEC float SDLCALL SDL_expf(float x);
+extern DECLSPEC double SDLCALL SDL_fabs(double x);
+extern DECLSPEC float SDLCALL SDL_fabsf(float x);
+extern DECLSPEC double SDLCALL SDL_floor(double x);
+extern DECLSPEC float SDLCALL SDL_floorf(float x);
+extern DECLSPEC double SDLCALL SDL_fmod(double x, double y);
+extern DECLSPEC float SDLCALL SDL_fmodf(float x, float y);
+extern DECLSPEC double SDLCALL SDL_log(double x);
+extern DECLSPEC float SDLCALL SDL_logf(float x);
+extern DECLSPEC double SDLCALL SDL_log10(double x);
+extern DECLSPEC float SDLCALL SDL_log10f(float x);
+extern DECLSPEC double SDLCALL SDL_pow(double x, double y);
+extern DECLSPEC float SDLCALL SDL_powf(float x, float y);
+extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n);
+extern DECLSPEC float SDLCALL SDL_scalbnf(float x, int n);
+extern DECLSPEC double SDLCALL SDL_sin(double x);
+extern DECLSPEC float SDLCALL SDL_sinf(float x);
+extern DECLSPEC double SDLCALL SDL_sqrt(double x);
+extern DECLSPEC float SDLCALL SDL_sqrtf(float x);
+extern DECLSPEC double SDLCALL SDL_tan(double x);
+extern DECLSPEC float SDLCALL SDL_tanf(float x);
+
+/* The SDL implementation of iconv() returns these error codes */
+#define SDL_ICONV_ERROR     (size_t)-1
+#define SDL_ICONV_E2BIG     (size_t)-2
+#define SDL_ICONV_EILSEQ    (size_t)-3
+#define SDL_ICONV_EINVAL    (size_t)-4
+
+/* SDL_iconv_* are now always real symbols/types, not macros or inlined. */
+typedef struct _SDL_iconv_t *SDL_iconv_t;
+extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode,
+                                                   const char *fromcode);
+extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd);
+extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf,
+                                         size_t * inbytesleft, char **outbuf,
+                                         size_t * outbytesleft);
+/**
+ *  This function converts a string between encodings in one pass, returning a
+ *  string that must be freed with SDL_free() or NULL on error.
+ */
+extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode,
+                                               const char *fromcode,
+                                               const char *inbuf,
+                                               size_t inbytesleft);
+#define SDL_iconv_utf8_locale(S)    SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1)
+#define SDL_iconv_utf8_ucs2(S)      (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
+#define SDL_iconv_utf8_ucs4(S)      (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1)
+
+/* force builds using Clang's static analysis tools to use literal C runtime
+   here, since there are possibly tests that are ineffective otherwise. */
+#if defined(__clang_analyzer__) && !defined(SDL_DISABLE_ANALYZE_MACROS)
+#define SDL_malloc malloc
+#define SDL_calloc calloc
+#define SDL_realloc realloc
+#define SDL_free free
+#define SDL_memset memset
+#define SDL_memcpy memcpy
+#define SDL_memmove memmove
+#define SDL_memcmp memcmp
+#define SDL_strlen strlen
+#define SDL_strlcpy strlcpy
+#define SDL_strlcat strlcat
+#define SDL_strdup strdup
+#define SDL_strchr strchr
+#define SDL_strrchr strrchr
+#define SDL_strstr strstr
+#define SDL_strcmp strcmp
+#define SDL_strncmp strncmp
+#define SDL_strcasecmp strcasecmp
+#define SDL_strncasecmp strncasecmp
+#define SDL_sscanf sscanf
+#define SDL_vsscanf vsscanf
+#define SDL_snprintf snprintf
+#define SDL_vsnprintf vsnprintf
+#endif
+
+SDL_FORCE_INLINE void *SDL_memcpy4(SDL_OUT_BYTECAP(dwords*4) void *dst, SDL_IN_BYTECAP(dwords*4) const void *src, size_t dwords)
+{
+    return SDL_memcpy(dst, src, dwords * 4);
+}
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_stdinc_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_surface.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_surface.h
new file mode 100644
index 0000000..51a1283
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_surface.h
@@ -0,0 +1,554 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_surface.h
+ *
+ *  Header file for ::SDL_Surface definition and management functions.
+ */
+
+#ifndef SDL_surface_h_
+#define SDL_surface_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_blendmode.h"
+#include "SDL_rwops.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \name Surface flags
+ *
+ *  These are the currently supported flags for the ::SDL_Surface.
+ *
+ *  \internal
+ *  Used internally (read-only).
+ */
+/* @{ */
+#define SDL_SWSURFACE       0           /**< Just here for compatibility */
+#define SDL_PREALLOC        0x00000001  /**< Surface uses preallocated memory */
+#define SDL_RLEACCEL        0x00000002  /**< Surface is RLE encoded */
+#define SDL_DONTFREE        0x00000004  /**< Surface is referenced internally */
+#define SDL_SIMD_ALIGNED    0x00000008  /**< Surface uses aligned memory */
+/* @} *//* Surface flags */
+
+/**
+ *  Evaluates to true if the surface needs to be locked before access.
+ */
+#define SDL_MUSTLOCK(S) (((S)->flags & SDL_RLEACCEL) != 0)
+
+/**
+ * \brief A collection of pixels used in software blitting.
+ *
+ * \note  This structure should be treated as read-only, except for \c pixels,
+ *        which, if not NULL, contains the raw pixel data for the surface.
+ */
+typedef struct SDL_Surface
+{
+    Uint32 flags;               /**< Read-only */
+    SDL_PixelFormat *format;    /**< Read-only */
+    int w, h;                   /**< Read-only */
+    int pitch;                  /**< Read-only */
+    void *pixels;               /**< Read-write */
+
+    /** Application data associated with the surface */
+    void *userdata;             /**< Read-write */
+
+    /** information needed for surfaces requiring locks */
+    int locked;                 /**< Read-only */
+    void *lock_data;            /**< Read-only */
+
+    /** clipping information */
+    SDL_Rect clip_rect;         /**< Read-only */
+
+    /** info for fast blit mapping to other surfaces */
+    struct SDL_BlitMap *map;    /**< Private */
+
+    /** Reference count -- used when freeing surface */
+    int refcount;               /**< Read-mostly */
+} SDL_Surface;
+
+/**
+ * \brief The type of function used for surface blitting functions.
+ */
+typedef int (SDLCALL *SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect,
+                                 struct SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ * \brief The formula used for converting between YUV and RGB
+ */
+typedef enum
+{
+    SDL_YUV_CONVERSION_JPEG,        /**< Full range JPEG */
+    SDL_YUV_CONVERSION_BT601,       /**< BT.601 (the default) */
+    SDL_YUV_CONVERSION_BT709,       /**< BT.709 */
+    SDL_YUV_CONVERSION_AUTOMATIC    /**< BT.601 for SD content, BT.709 for HD content */
+} SDL_YUV_CONVERSION_MODE;
+
+/**
+ *  Allocate and free an RGB surface.
+ *
+ *  If the depth is 4 or 8 bits, an empty palette is allocated for the surface.
+ *  If the depth is greater than 8 bits, the pixel format is set using the
+ *  flags '[RGB]mask'.
+ *
+ *  If the function runs out of memory, it will return NULL.
+ *
+ *  \param flags The \c flags are obsolete and should be set to 0.
+ *  \param width The width in pixels of the surface to create.
+ *  \param height The height in pixels of the surface to create.
+ *  \param depth The depth in bits of the surface to create.
+ *  \param Rmask The red mask of the surface to create.
+ *  \param Gmask The green mask of the surface to create.
+ *  \param Bmask The blue mask of the surface to create.
+ *  \param Amask The alpha mask of the surface to create.
+ */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface
+    (Uint32 flags, int width, int height, int depth,
+     Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask);
+
+/* !!! FIXME for 2.1: why does this ask for depth? Format provides that. */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormat
+    (Uint32 flags, int width, int height, int depth, Uint32 format);
+
+extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels,
+                                                              int width,
+                                                              int height,
+                                                              int depth,
+                                                              int pitch,
+                                                              Uint32 Rmask,
+                                                              Uint32 Gmask,
+                                                              Uint32 Bmask,
+                                                              Uint32 Amask);
+extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceWithFormatFrom
+    (void *pixels, int width, int height, int depth, int pitch, Uint32 format);
+extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface);
+
+/**
+ *  \brief Set the palette used by a surface.
+ *
+ *  \return 0, or -1 if the surface format doesn't use a palette.
+ *
+ *  \note A single palette can be shared with many surfaces.
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface,
+                                                  SDL_Palette * palette);
+
+/**
+ *  \brief Sets up a surface for directly accessing the pixels.
+ *
+ *  Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write
+ *  to and read from \c surface->pixels, using the pixel format stored in
+ *  \c surface->format.  Once you are done accessing the surface, you should
+ *  use SDL_UnlockSurface() to release it.
+ *
+ *  Not all surfaces require locking.  If SDL_MUSTLOCK(surface) evaluates
+ *  to 0, then you can read and write to the surface at any time, and the
+ *  pixel format of the surface will not change.
+ *
+ *  No operating system or library calls should be made between lock/unlock
+ *  pairs, as critical system locks may be held during this time.
+ *
+ *  SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked.
+ *
+ *  \sa SDL_UnlockSurface()
+ */
+extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface);
+/** \sa SDL_LockSurface() */
+extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface);
+
+/**
+ *  Load a surface from a seekable SDL data stream (memory or file).
+ *
+ *  If \c freesrc is non-zero, the stream will be closed after being read.
+ *
+ *  The new surface should be freed with SDL_FreeSurface().
+ *
+ *  \return the new surface, or NULL if there was an error.
+ */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src,
+                                                    int freesrc);
+
+/**
+ *  Load a surface from a file.
+ *
+ *  Convenience macro.
+ */
+#define SDL_LoadBMP(file)   SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1)
+
+/**
+ *  Save a surface to a seekable SDL data stream (memory or file).
+ *
+ *  Surfaces with a 24-bit, 32-bit and paletted 8-bit format get saved in the
+ *  BMP directly. Other RGB formats with 8-bit or higher get converted to a
+ *  24-bit surface or, if they have an alpha mask or a colorkey, to a 32-bit
+ *  surface before they are saved. YUV and paletted 1-bit and 4-bit formats are
+ *  not supported.
+ *
+ *  If \c freedst is non-zero, the stream will be closed after being written.
+ *
+ *  \return 0 if successful or -1 if there was an error.
+ */
+extern DECLSPEC int SDLCALL SDL_SaveBMP_RW
+    (SDL_Surface * surface, SDL_RWops * dst, int freedst);
+
+/**
+ *  Save a surface to a file.
+ *
+ *  Convenience macro.
+ */
+#define SDL_SaveBMP(surface, file) \
+        SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1)
+
+/**
+ *  \brief Sets the RLE acceleration hint for a surface.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid
+ *
+ *  \note If RLE is enabled, colorkey and alpha blending blits are much faster,
+ *        but the surface must be locked before directly accessing the pixels.
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface,
+                                              int flag);
+
+/**
+ *  \brief Sets the color key (transparent pixel) in a blittable surface.
+ *
+ *  \param surface The surface to update
+ *  \param flag Non-zero to enable colorkey and 0 to disable colorkey
+ *  \param key The transparent pixel in the native surface format
+ *
+ *  \return 0 on success, or -1 if the surface is not valid
+ *
+ *  You can pass SDL_RLEACCEL to enable RLE accelerated blits.
+ */
+extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface,
+                                            int flag, Uint32 key);
+
+/**
+ *  \brief Returns whether the surface has a color key
+ *
+ *  \return SDL_TRUE if the surface has a color key, or SDL_FALSE if the surface is NULL or has no color key
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_HasColorKey(SDL_Surface * surface);
+
+/**
+ *  \brief Gets the color key (transparent pixel) in a blittable surface.
+ *
+ *  \param surface The surface to update
+ *  \param key A pointer filled in with the transparent pixel in the native
+ *             surface format
+ *
+ *  \return 0 on success, or -1 if the surface is not valid or colorkey is not
+ *          enabled.
+ */
+extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface,
+                                            Uint32 * key);
+
+/**
+ *  \brief Set an additional color value used in blit operations.
+ *
+ *  \param surface The surface to update.
+ *  \param r The red color value multiplied into blit operations.
+ *  \param g The green color value multiplied into blit operations.
+ *  \param b The blue color value multiplied into blit operations.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_GetSurfaceColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface,
+                                                   Uint8 r, Uint8 g, Uint8 b);
+
+
+/**
+ *  \brief Get the additional color value used in blit operations.
+ *
+ *  \param surface The surface to query.
+ *  \param r A pointer filled in with the current red color value.
+ *  \param g A pointer filled in with the current green color value.
+ *  \param b A pointer filled in with the current blue color value.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_SetSurfaceColorMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface,
+                                                   Uint8 * r, Uint8 * g,
+                                                   Uint8 * b);
+
+/**
+ *  \brief Set an additional alpha value used in blit operations.
+ *
+ *  \param surface The surface to update.
+ *  \param alpha The alpha value multiplied into blit operations.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_GetSurfaceAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface,
+                                                   Uint8 alpha);
+
+/**
+ *  \brief Get the additional alpha value used in blit operations.
+ *
+ *  \param surface The surface to query.
+ *  \param alpha A pointer filled in with the current alpha value.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_SetSurfaceAlphaMod()
+ */
+extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface,
+                                                   Uint8 * alpha);
+
+/**
+ *  \brief Set the blend mode used for blit operations.
+ *
+ *  \param surface The surface to update.
+ *  \param blendMode ::SDL_BlendMode to use for blit blending.
+ *
+ *  \return 0 on success, or -1 if the parameters are not valid.
+ *
+ *  \sa SDL_GetSurfaceBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface,
+                                                    SDL_BlendMode blendMode);
+
+/**
+ *  \brief Get the blend mode used for blit operations.
+ *
+ *  \param surface   The surface to query.
+ *  \param blendMode A pointer filled in with the current blend mode.
+ *
+ *  \return 0 on success, or -1 if the surface is not valid.
+ *
+ *  \sa SDL_SetSurfaceBlendMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface,
+                                                    SDL_BlendMode *blendMode);
+
+/**
+ *  Sets the clipping rectangle for the destination surface in a blit.
+ *
+ *  If the clip rectangle is NULL, clipping will be disabled.
+ *
+ *  If the clip rectangle doesn't intersect the surface, the function will
+ *  return SDL_FALSE and blits will be completely clipped.  Otherwise the
+ *  function returns SDL_TRUE and blits to the surface will be clipped to
+ *  the intersection of the surface area and the clipping rectangle.
+ *
+ *  Note that blits are automatically clipped to the edges of the source
+ *  and destination surfaces.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface,
+                                                 const SDL_Rect * rect);
+
+/**
+ *  Gets the clipping rectangle for the destination surface in a blit.
+ *
+ *  \c rect must be a pointer to a valid rectangle which will be filled
+ *  with the correct values.
+ */
+extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface,
+                                             SDL_Rect * rect);
+
+/*
+ * Creates a new surface identical to the existing surface
+ */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_DuplicateSurface(SDL_Surface * surface);
+
+/**
+ *  Creates a new surface of the specified format, and then copies and maps
+ *  the given surface to it so the blit of the converted surface will be as
+ *  fast as possible.  If this function fails, it returns NULL.
+ *
+ *  The \c flags parameter is passed to SDL_CreateRGBSurface() and has those
+ *  semantics.  You can also pass ::SDL_RLEACCEL in the flags parameter and
+ *  SDL will try to RLE accelerate colorkey and alpha blits in the resulting
+ *  surface.
+ */
+extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface
+    (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags);
+extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat
+    (SDL_Surface * src, Uint32 pixel_format, Uint32 flags);
+
+/**
+ * \brief Copy a block of pixels of one format to another format
+ *
+ *  \return 0 on success, or -1 if there was an error
+ */
+extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height,
+                                              Uint32 src_format,
+                                              const void * src, int src_pitch,
+                                              Uint32 dst_format,
+                                              void * dst, int dst_pitch);
+
+/**
+ *  Performs a fast fill of the given rectangle with \c color.
+ *
+ *  If \c rect is NULL, the whole surface will be filled with \c color.
+ *
+ *  The color should be a pixel of the format used by the surface, and
+ *  can be generated by the SDL_MapRGB() function.
+ *
+ *  \return 0 on success, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_FillRect
+    (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color);
+extern DECLSPEC int SDLCALL SDL_FillRects
+    (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color);
+
+/**
+ *  Performs a fast blit from the source surface to the destination surface.
+ *
+ *  This assumes that the source and destination rectangles are
+ *  the same size.  If either \c srcrect or \c dstrect are NULL, the entire
+ *  surface (\c src or \c dst) is copied.  The final blit rectangles are saved
+ *  in \c srcrect and \c dstrect after all clipping is performed.
+ *
+ *  \return If the blit is successful, it returns 0, otherwise it returns -1.
+ *
+ *  The blit function should not be called on a locked surface.
+ *
+ *  The blit semantics for surfaces with and without blending and colorkey
+ *  are defined as follows:
+ *  \verbatim
+    RGBA->RGB:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source alpha-channel and per-surface alpha)
+        SDL_SRCCOLORKEY ignored.
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy RGB.
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        RGB values of the source color key, ignoring alpha in the
+        comparison.
+
+    RGB->RGBA:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source per-surface alpha)
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy RGB, set destination alpha to source per-surface alpha value.
+      both:
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        source color key.
+
+    RGBA->RGBA:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source alpha-channel and per-surface alpha)
+        SDL_SRCCOLORKEY ignored.
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy all of RGBA to the destination.
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        RGB values of the source color key, ignoring alpha in the
+        comparison.
+
+    RGB->RGB:
+      Source surface blend mode set to SDL_BLENDMODE_BLEND:
+        alpha-blend (using the source per-surface alpha)
+      Source surface blend mode set to SDL_BLENDMODE_NONE:
+        copy RGB.
+      both:
+        if SDL_SRCCOLORKEY set, only copy the pixels matching the
+        source color key.
+    \endverbatim
+ *
+ *  You should call SDL_BlitSurface() unless you know exactly how SDL
+ *  blitting works internally and how to use the other blit functions.
+ */
+#define SDL_BlitSurface SDL_UpperBlit
+
+/**
+ *  This is the public blit function, SDL_BlitSurface(), and it performs
+ *  rectangle validation and clipping before passing it to SDL_LowerBlit()
+ */
+extern DECLSPEC int SDLCALL SDL_UpperBlit
+    (SDL_Surface * src, const SDL_Rect * srcrect,
+     SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  This is a semi-private blit function and it performs low-level surface
+ *  blitting only.
+ */
+extern DECLSPEC int SDLCALL SDL_LowerBlit
+    (SDL_Surface * src, SDL_Rect * srcrect,
+     SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  \brief Perform a fast, low quality, stretch blit between two surfaces of the
+ *         same pixel format.
+ *
+ *  \note This function uses a static buffer, and is not thread-safe.
+ */
+extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src,
+                                            const SDL_Rect * srcrect,
+                                            SDL_Surface * dst,
+                                            const SDL_Rect * dstrect);
+
+#define SDL_BlitScaled SDL_UpperBlitScaled
+
+/**
+ *  This is the public scaled blit function, SDL_BlitScaled(), and it performs
+ *  rectangle validation and clipping before passing it to SDL_LowerBlitScaled()
+ */
+extern DECLSPEC int SDLCALL SDL_UpperBlitScaled
+    (SDL_Surface * src, const SDL_Rect * srcrect,
+    SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  This is a semi-private blit function and it performs low-level surface
+ *  scaled blitting only.
+ */
+extern DECLSPEC int SDLCALL SDL_LowerBlitScaled
+    (SDL_Surface * src, SDL_Rect * srcrect,
+    SDL_Surface * dst, SDL_Rect * dstrect);
+
+/**
+ *  \brief Set the YUV conversion mode
+ */
+extern DECLSPEC void SDLCALL SDL_SetYUVConversionMode(SDL_YUV_CONVERSION_MODE mode);
+
+/**
+ *  \brief Get the YUV conversion mode
+ */
+extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionMode(void);
+
+/**
+ *  \brief Get the YUV conversion mode, returning the correct mode for the resolution when the current conversion mode is SDL_YUV_CONVERSION_AUTOMATIC
+ */
+extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResolution(int width, int height);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_surface_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_system.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_system.h
new file mode 100644
index 0000000..3b08407
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_system.h
@@ -0,0 +1,279 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_system.h
+ *
+ *  Include file for platform specific SDL API functions
+ */
+
+#ifndef SDL_system_h_
+#define SDL_system_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_keyboard.h"
+#include "SDL_render.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Platform specific functions for Windows */
+#ifdef __WIN32__
+	
+/**
+   \brief Set a function that is called for every windows message, before TranslateMessage()
+*/
+typedef void (SDLCALL * SDL_WindowsMessageHook)(void *userdata, void *hWnd, unsigned int message, Uint64 wParam, Sint64 lParam);
+extern DECLSPEC void SDLCALL SDL_SetWindowsMessageHook(SDL_WindowsMessageHook callback, void *userdata);
+
+/**
+   \brief Returns the D3D9 adapter index that matches the specified display index.
+
+   This adapter index can be passed to IDirect3D9::CreateDevice and controls
+   on which monitor a full screen application will appear.
+*/
+extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex );
+
+typedef struct IDirect3DDevice9 IDirect3DDevice9;
+/**
+   \brief Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer.
+
+   Once you are done using the device, you should release it to avoid a resource leak.
+ */
+extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer);
+
+/**
+   \brief Returns the DXGI Adapter and Output indices for the specified display index.
+
+   These can be passed to EnumAdapters and EnumOutputs respectively to get the objects
+   required to create a DX10 or DX11 device and swap chain.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex );
+
+#endif /* __WIN32__ */
+
+
+/* Platform specific functions for Linux */
+#ifdef __LINUX__
+
+/**
+   \brief Sets the UNIX nice value for a thread, using setpriority() if possible, and RealtimeKit if available.
+
+   \return 0 on success, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_LinuxSetThreadPriority(Sint64 threadID, int priority);
+ 
+#endif /* __LINUX__ */
+	
+/* Platform specific functions for iOS */
+#if defined(__IPHONEOS__) && __IPHONEOS__
+
+#define SDL_iOSSetAnimationCallback(window, interval, callback, callbackParam) SDL_iPhoneSetAnimationCallback(window, interval, callback, callbackParam)
+extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
+
+#define SDL_iOSSetEventPump(enabled) SDL_iPhoneSetEventPump(enabled)
+extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled);
+
+#endif /* __IPHONEOS__ */
+
+
+/* Platform specific functions for Android */
+#if defined(__ANDROID__) && __ANDROID__
+
+/**
+   \brief Get the JNI environment for the current thread
+
+   This returns JNIEnv*, but the prototype is void* so we don't need jni.h
+ */
+extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(void);
+
+/**
+   \brief Get the SDL Activity object for the application
+
+   This returns jobject, but the prototype is void* so we don't need jni.h
+   The jobject returned by SDL_AndroidGetActivity is a local reference.
+   It is the caller's responsibility to properly release it
+   (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef)
+ */
+extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(void);
+
+/**
+   \brief Return true if the application is running on Android TV
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsAndroidTV(void);
+
+/**
+   \brief Return true if the application is running on a Chromebook
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsChromebook(void);
+
+/**
+  \brief Return true is the application is running on a Samsung DeX docking station
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsDeXMode(void);
+
+/**
+ \brief Trigger the Android system back button behavior.
+ */
+extern DECLSPEC void SDLCALL SDL_AndroidBackButton(void);
+
+/**
+   See the official Android developer guide for more information:
+   http://developer.android.com/guide/topics/data/data-storage.html
+*/
+#define SDL_ANDROID_EXTERNAL_STORAGE_READ   0x01
+#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE  0x02
+
+/**
+   \brief Get the path used for internal storage for this application.
+
+   This path is unique to your application and cannot be written to
+   by other applications.
+ */
+extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath(void);
+
+/**
+   \brief Get the current state of external storage, a bitmask of these values:
+    SDL_ANDROID_EXTERNAL_STORAGE_READ
+    SDL_ANDROID_EXTERNAL_STORAGE_WRITE
+
+   If external storage is currently unavailable, this will return 0.
+*/
+extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(void);
+
+/**
+   \brief Get the path used for external storage for this application.
+
+   This path is unique to your application, but is public and can be
+   written to by other applications.
+ */
+extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(void);
+
+#endif /* __ANDROID__ */
+
+/* Platform specific functions for WinRT */
+#if defined(__WINRT__) && __WINRT__
+
+/**
+ *  \brief WinRT / Windows Phone path types
+ */
+typedef enum
+{
+    /** \brief The installed app's root directory.
+        Files here are likely to be read-only. */
+    SDL_WINRT_PATH_INSTALLED_LOCATION,
+
+    /** \brief The app's local data store.  Files may be written here */
+    SDL_WINRT_PATH_LOCAL_FOLDER,
+
+    /** \brief The app's roaming data store.  Unsupported on Windows Phone.
+        Files written here may be copied to other machines via a network
+        connection.
+    */
+    SDL_WINRT_PATH_ROAMING_FOLDER,
+
+    /** \brief The app's temporary data store.  Unsupported on Windows Phone.
+        Files written here may be deleted at any time. */
+    SDL_WINRT_PATH_TEMP_FOLDER
+} SDL_WinRT_Path;
+
+
+/**
+ *  \brief WinRT Device Family
+ */
+typedef enum
+{
+    /** \brief Unknown family  */
+    SDL_WINRT_DEVICEFAMILY_UNKNOWN,
+
+    /** \brief Desktop family*/
+    SDL_WINRT_DEVICEFAMILY_DESKTOP,
+
+    /** \brief Mobile family (for example smartphone) */
+    SDL_WINRT_DEVICEFAMILY_MOBILE,
+
+    /** \brief XBox family */
+    SDL_WINRT_DEVICEFAMILY_XBOX,
+} SDL_WinRT_DeviceFamily;
+
+
+/**
+ *  \brief Retrieves a WinRT defined path on the local file system
+ *
+ *  \note Documentation on most app-specific path types on WinRT
+ *      can be found on MSDN, at the URL:
+ *      http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
+ *
+ *  \param pathType The type of path to retrieve.
+ *  \return A UCS-2 string (16-bit, wide-char) containing the path, or NULL
+ *      if the path is not available for any reason.  Not all paths are
+ *      available on all versions of Windows.  This is especially true on
+ *      Windows Phone.  Check the documentation for the given
+ *      SDL_WinRT_Path for more information on which path types are
+ *      supported where.
+ */
+extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType);
+
+/**
+ *  \brief Retrieves a WinRT defined path on the local file system
+ *
+ *  \note Documentation on most app-specific path types on WinRT
+ *      can be found on MSDN, at the URL:
+ *      http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx
+ *
+ *  \param pathType The type of path to retrieve.
+ *  \return A UTF-8 string (8-bit, multi-byte) containing the path, or NULL
+ *      if the path is not available for any reason.  Not all paths are
+ *      available on all versions of Windows.  This is especially true on
+ *      Windows Phone.  Check the documentation for the given
+ *      SDL_WinRT_Path for more information on which path types are
+ *      supported where.
+ */
+extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType);
+
+/**
+ *  \brief Detects the device family of WinRT plattform on runtime
+ *
+ *  \return Device family
+ */
+extern DECLSPEC SDL_WinRT_DeviceFamily SDLCALL SDL_WinRTGetDeviceFamily();
+
+#endif /* __WINRT__ */
+
+/**
+ \brief Return true if the current device is a tablet.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsTablet(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_system_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_syswm.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_syswm.h
new file mode 100644
index 0000000..7aa8c68
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_syswm.h
@@ -0,0 +1,327 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_syswm.h
+ *
+ *  Include file for SDL custom system window manager hooks.
+ */
+
+#ifndef SDL_syswm_h_
+#define SDL_syswm_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+#include "SDL_version.h"
+
+/**
+ *  \brief SDL_syswm.h
+ *
+ *  Your application has access to a special type of event ::SDL_SYSWMEVENT,
+ *  which contains window-manager specific information and arrives whenever
+ *  an unhandled window event occurs.  This event is ignored by default, but
+ *  you can enable it with SDL_EventState().
+ */
+struct SDL_SysWMinfo;
+
+#if !defined(SDL_PROTOTYPES_ONLY)
+
+#if defined(SDL_VIDEO_DRIVER_WINDOWS)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_WINRT)
+#include <Inspectable.h>
+#endif
+
+/* This is the structure for custom window manager events */
+#if defined(SDL_VIDEO_DRIVER_X11)
+#if defined(__APPLE__) && defined(__MACH__)
+/* conflicts with Quickdraw.h */
+#define Cursor X11Cursor
+#endif
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+
+#if defined(__APPLE__) && defined(__MACH__)
+/* matches the re-define above */
+#undef Cursor
+#endif
+
+#endif /* defined(SDL_VIDEO_DRIVER_X11) */
+
+#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
+#include <directfb.h>
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_COCOA)
+#ifdef __OBJC__
+@class NSWindow;
+#else
+typedef struct _NSWindow NSWindow;
+#endif
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_UIKIT)
+#ifdef __OBJC__
+#include <UIKit/UIKit.h>
+#else
+typedef struct _UIWindow UIWindow;
+typedef struct _UIViewController UIViewController;
+#endif
+typedef Uint32 GLuint;
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_ANDROID)
+typedef struct ANativeWindow ANativeWindow;
+typedef void *EGLSurface;
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_VIVANTE)
+#include "SDL_egl.h"
+#endif
+#endif /* SDL_PROTOTYPES_ONLY */
+
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined(SDL_PROTOTYPES_ONLY)
+/**
+ *  These are the various supported windowing subsystems
+ */
+typedef enum
+{
+    SDL_SYSWM_UNKNOWN,
+    SDL_SYSWM_WINDOWS,
+    SDL_SYSWM_X11,
+    SDL_SYSWM_DIRECTFB,
+    SDL_SYSWM_COCOA,
+    SDL_SYSWM_UIKIT,
+    SDL_SYSWM_WAYLAND,
+    SDL_SYSWM_MIR,  /* no longer available, left for API/ABI compatibility. Remove in 2.1! */
+    SDL_SYSWM_WINRT,
+    SDL_SYSWM_ANDROID,
+    SDL_SYSWM_VIVANTE,
+    SDL_SYSWM_OS2
+} SDL_SYSWM_TYPE;
+
+/**
+ *  The custom event structure.
+ */
+struct SDL_SysWMmsg
+{
+    SDL_version version;
+    SDL_SYSWM_TYPE subsystem;
+    union
+    {
+#if defined(SDL_VIDEO_DRIVER_WINDOWS)
+        struct {
+            HWND hwnd;                  /**< The window for the message */
+            UINT msg;                   /**< The type of message */
+            WPARAM wParam;              /**< WORD message parameter */
+            LPARAM lParam;              /**< LONG message parameter */
+        } win;
+#endif
+#if defined(SDL_VIDEO_DRIVER_X11)
+        struct {
+            XEvent event;
+        } x11;
+#endif
+#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
+        struct {
+            DFBEvent event;
+        } dfb;
+#endif
+#if defined(SDL_VIDEO_DRIVER_COCOA)
+        struct
+        {
+            /* Latest version of Xcode clang complains about empty structs in C v. C++:
+                 error: empty struct has size 0 in C, size 1 in C++
+             */
+            int dummy;
+            /* No Cocoa window events yet */
+        } cocoa;
+#endif
+#if defined(SDL_VIDEO_DRIVER_UIKIT)
+        struct
+        {
+            int dummy;
+            /* No UIKit window events yet */
+        } uikit;
+#endif
+#if defined(SDL_VIDEO_DRIVER_VIVANTE)
+        struct
+        {
+            int dummy;
+            /* No Vivante window events yet */
+        } vivante;
+#endif
+        /* Can't have an empty union */
+        int dummy;
+    } msg;
+};
+
+/**
+ *  The custom window manager information structure.
+ *
+ *  When this structure is returned, it holds information about which
+ *  low level system it is using, and will be one of SDL_SYSWM_TYPE.
+ */
+struct SDL_SysWMinfo
+{
+    SDL_version version;
+    SDL_SYSWM_TYPE subsystem;
+    union
+    {
+#if defined(SDL_VIDEO_DRIVER_WINDOWS)
+        struct
+        {
+            HWND window;                /**< The window handle */
+            HDC hdc;                    /**< The window device context */
+            HINSTANCE hinstance;        /**< The instance handle */
+        } win;
+#endif
+#if defined(SDL_VIDEO_DRIVER_WINRT)
+        struct
+        {
+            IInspectable * window;      /**< The WinRT CoreWindow */
+        } winrt;
+#endif
+#if defined(SDL_VIDEO_DRIVER_X11)
+        struct
+        {
+            Display *display;           /**< The X11 display */
+            Window window;              /**< The X11 window */
+        } x11;
+#endif
+#if defined(SDL_VIDEO_DRIVER_DIRECTFB)
+        struct
+        {
+            IDirectFB *dfb;             /**< The directfb main interface */
+            IDirectFBWindow *window;    /**< The directfb window handle */
+            IDirectFBSurface *surface;  /**< The directfb client surface */
+        } dfb;
+#endif
+#if defined(SDL_VIDEO_DRIVER_COCOA)
+        struct
+        {
+#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc)
+            NSWindow __unsafe_unretained *window; /**< The Cocoa window */
+#else
+            NSWindow *window;                     /**< The Cocoa window */
+#endif
+        } cocoa;
+#endif
+#if defined(SDL_VIDEO_DRIVER_UIKIT)
+        struct
+        {
+#if defined(__OBJC__) && defined(__has_feature) && __has_feature(objc_arc)
+            UIWindow __unsafe_unretained *window; /**< The UIKit window */
+#else
+            UIWindow *window;                     /**< The UIKit window */
+#endif
+            GLuint framebuffer; /**< The GL view's Framebuffer Object. It must be bound when rendering to the screen using GL. */
+            GLuint colorbuffer; /**< The GL view's color Renderbuffer Object. It must be bound when SDL_GL_SwapWindow is called. */
+            GLuint resolveFramebuffer; /**< The Framebuffer Object which holds the resolve color Renderbuffer, when MSAA is used. */
+        } uikit;
+#endif
+#if defined(SDL_VIDEO_DRIVER_WAYLAND)
+        struct
+        {
+            struct wl_display *display;            /**< Wayland display */
+            struct wl_surface *surface;            /**< Wayland surface */
+            struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */
+        } wl;
+#endif
+#if defined(SDL_VIDEO_DRIVER_MIR)  /* no longer available, left for API/ABI compatibility. Remove in 2.1! */
+        struct
+        {
+            void *connection;  /**< Mir display server connection */
+            void *surface;  /**< Mir surface */
+        } mir;
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_ANDROID)
+        struct
+        {
+            ANativeWindow *window;
+            EGLSurface surface;
+        } android;
+#endif
+
+#if defined(SDL_VIDEO_DRIVER_VIVANTE)
+        struct
+        {
+            EGLNativeDisplayType display;
+            EGLNativeWindowType window;
+        } vivante;
+#endif
+
+        /* Make sure this union is always 64 bytes (8 64-bit pointers). */
+        /* Be careful not to overflow this if you add a new target! */
+        Uint8 dummy[64];
+    } info;
+};
+
+#endif /* SDL_PROTOTYPES_ONLY */
+
+typedef struct SDL_SysWMinfo SDL_SysWMinfo;
+
+/* Function prototypes */
+/**
+ *  \brief This function allows access to driver-dependent window information.
+ *
+ *  \param window The window about which information is being requested
+ *  \param info This structure must be initialized with the SDL version, and is
+ *              then filled in with information about the given window.
+ *
+ *  \return SDL_TRUE if the function is implemented and the version member of
+ *          the \c info struct is valid, SDL_FALSE otherwise.
+ *
+ *  You typically use this function like this:
+ *  \code
+ *  SDL_SysWMinfo info;
+ *  SDL_VERSION(&info.version);
+ *  if ( SDL_GetWindowWMInfo(window, &info) ) { ... }
+ *  \endcode
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window,
+                                                     SDL_SysWMinfo * info);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_syswm_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test.h
new file mode 100644
index 0000000..17a33dc
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test.h
@@ -0,0 +1,69 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+#ifndef SDL_test_h_
+#define SDL_test_h_
+
+#include "SDL.h"
+#include "SDL_test_assert.h"
+#include "SDL_test_common.h"
+#include "SDL_test_compare.h"
+#include "SDL_test_crc32.h"
+#include "SDL_test_font.h"
+#include "SDL_test_fuzzer.h"
+#include "SDL_test_harness.h"
+#include "SDL_test_images.h"
+#include "SDL_test_log.h"
+#include "SDL_test_md5.h"
+#include "SDL_test_memory.h"
+#include "SDL_test_random.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Global definitions */
+
+/*
+ * Note: Maximum size of SDLTest log message is less than SDL's limit
+ * to ensure we can fit additional information such as the timestamp.
+ */
+#define SDLTEST_MAX_LOGMESSAGE_LENGTH   3584
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_assert.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_assert.h
new file mode 100644
index 0000000..b3ebb62
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_assert.h
@@ -0,0 +1,105 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_assert.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+ *
+ * Assert API for test code and test cases
+ *
+ */
+
+#ifndef SDL_test_assert_h_
+#define SDL_test_assert_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Fails the assert.
+ */
+#define ASSERT_FAIL     0
+
+/**
+ * \brief Passes the assert.
+ */
+#define ASSERT_PASS     1
+
+/**
+ * \brief Assert that logs and break execution flow on failures.
+ *
+ * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0).
+ * \param assertDescription Message to log with the assert describing it.
+ */
+void SDLTest_Assert(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *assertDescription, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ * \brief Assert for test cases that logs but does not break execution flow on failures. Updates assertion counters.
+ *
+ * \param assertCondition Evaluated condition or variable to assert; fail (==0) or pass (!=0).
+ * \param assertDescription Message to log with the assert describing it.
+ *
+ * \returns Returns the assertCondition so it can be used to externally to break execution flow if desired.
+ */
+int SDLTest_AssertCheck(int assertCondition, SDL_PRINTF_FORMAT_STRING const char *assertDescription, ...) SDL_PRINTF_VARARG_FUNC(2);
+
+/**
+ * \brief Explicitly pass without checking an assertion condition. Updates assertion counter.
+ *
+ * \param assertDescription Message to log with the assert describing it.
+ */
+void SDLTest_AssertPass(SDL_PRINTF_FORMAT_STRING const char *assertDescription, ...) SDL_PRINTF_VARARG_FUNC(1);
+
+/**
+ * \brief Resets the assert summary counters to zero.
+ */
+void SDLTest_ResetAssertSummary(void);
+
+/**
+ * \brief Logs summary of all assertions (total, pass, fail) since last reset as INFO or ERROR.
+ */
+void SDLTest_LogAssertSummary(void);
+
+
+/**
+ * \brief Converts the current assert summary state to a test result.
+ *
+ * \returns TEST_RESULT_PASSED, TEST_RESULT_FAILED, or TEST_RESULT_NO_ASSERT
+ */
+int SDLTest_AssertSummaryToTestResult(void);
+
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_assert_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_common.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_common.h
new file mode 100644
index 0000000..c34d0d1
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_common.h
@@ -0,0 +1,205 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_common.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/* Ported from original test\common.h file. */
+
+#ifndef SDL_test_common_h_
+#define SDL_test_common_h_
+
+#include "SDL.h"
+
+#if defined(__PSP__)
+#define DEFAULT_WINDOW_WIDTH  480
+#define DEFAULT_WINDOW_HEIGHT 272
+#else
+#define DEFAULT_WINDOW_WIDTH  640
+#define DEFAULT_WINDOW_HEIGHT 480
+#endif
+
+#define VERBOSE_VIDEO   0x00000001
+#define VERBOSE_MODES   0x00000002
+#define VERBOSE_RENDER  0x00000004
+#define VERBOSE_EVENT   0x00000008
+#define VERBOSE_AUDIO   0x00000010
+
+typedef struct
+{
+    /* SDL init flags */
+    char **argv;
+    Uint32 flags;
+    Uint32 verbose;
+
+    /* Video info */
+    const char *videodriver;
+    int display;
+    const char *window_title;
+    const char *window_icon;
+    Uint32 window_flags;
+    int window_x;
+    int window_y;
+    int window_w;
+    int window_h;
+    int window_minW;
+    int window_minH;
+    int window_maxW;
+    int window_maxH;
+    int logical_w;
+    int logical_h;
+    float scale;
+    int depth;
+    int refresh_rate;
+    int num_windows;
+    SDL_Window **windows;
+
+    /* Renderer info */
+    const char *renderdriver;
+    Uint32 render_flags;
+    SDL_bool skip_renderer;
+    SDL_Renderer **renderers;
+    SDL_Texture **targets;
+
+    /* Audio info */
+    const char *audiodriver;
+    SDL_AudioSpec audiospec;
+
+    /* GL settings */
+    int gl_red_size;
+    int gl_green_size;
+    int gl_blue_size;
+    int gl_alpha_size;
+    int gl_buffer_size;
+    int gl_depth_size;
+    int gl_stencil_size;
+    int gl_double_buffer;
+    int gl_accum_red_size;
+    int gl_accum_green_size;
+    int gl_accum_blue_size;
+    int gl_accum_alpha_size;
+    int gl_stereo;
+    int gl_multisamplebuffers;
+    int gl_multisamplesamples;
+    int gl_retained_backing;
+    int gl_accelerated;
+    int gl_major_version;
+    int gl_minor_version;
+    int gl_debug;
+    int gl_profile_mask;
+} SDLTest_CommonState;
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Function prototypes */
+
+/**
+ * \brief Parse command line parameters and create common state.
+ *
+ * \param argv Array of command line parameters
+ * \param flags Flags indicating which subsystem to initialize (i.e. SDL_INIT_VIDEO | SDL_INIT_AUDIO)
+ *
+ * \returns Returns a newly allocated common state object.
+ */
+SDLTest_CommonState *SDLTest_CommonCreateState(char **argv, Uint32 flags);
+
+/**
+ * \brief Process one common argument.
+ *
+ * \param state The common state describing the test window to create.
+ * \param index The index of the argument to process in argv[].
+ *
+ * \returns The number of arguments processed (i.e. 1 for --fullscreen, 2 for --video [videodriver], or -1 on error.
+ */
+int SDLTest_CommonArg(SDLTest_CommonState * state, int index);
+
+
+/**
+ * \brief Logs command line usage info.
+ *
+ * This logs the appropriate command line options for the subsystems in use
+ *  plus other common options, and then any application-specific options.
+ *  This uses the SDL_Log() function and splits up output to be friendly to
+ *  80-character-wide terminals.
+ *
+ * \param state The common state describing the test window for the app.
+ * \param argv0 argv[0], as passed to main/SDL_main.
+ * \param options an array of strings for application specific options. The last element of the array should be NULL.
+ */
+void SDLTest_CommonLogUsage(SDLTest_CommonState * state, const char *argv0, const char **options);
+
+/**
+ * \brief Open test window.
+ *
+ * \param state The common state describing the test window to create.
+ *
+ * \returns True if initialization succeeded, false otherwise
+ */
+SDL_bool SDLTest_CommonInit(SDLTest_CommonState * state);
+
+/**
+ * \brief Easy argument handling when test app doesn't need any custom args.
+ *
+ * \param state The common state describing the test window to create.
+ * \param argc argc, as supplied to SDL_main
+ * \param argv argv, as supplied to SDL_main
+ *
+ * \returns False if app should quit, true otherwise.
+ */
+SDL_bool SDLTest_CommonDefaultArgs(SDLTest_CommonState * state, const int argc, char **argv);
+
+/**
+ * \brief Common event handler for test windows.
+ *
+ * \param state The common state used to create test window.
+ * \param event The event to handle.
+ * \param done Flag indicating we are done.
+ *
+ */
+void SDLTest_CommonEvent(SDLTest_CommonState * state, SDL_Event * event, int *done);
+
+/**
+ * \brief Close test window.
+ *
+ * \param state The common state used to create test window.
+ *
+ */
+void SDLTest_CommonQuit(SDLTest_CommonState * state);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_common_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_compare.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_compare.h
new file mode 100644
index 0000000..1f751c8
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_compare.h
@@ -0,0 +1,69 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_compare.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ Defines comparison functions (i.e. for surfaces).
+
+*/
+
+#ifndef SDL_test_compare_h_
+#define SDL_test_compare_h_
+
+#include "SDL.h"
+
+#include "SDL_test_images.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Compares a surface and with reference image data for equality
+ *
+ * \param surface Surface used in comparison
+ * \param referenceSurface Test Surface used in comparison
+ * \param allowable_error Allowable difference (=sum of squared difference for each RGB component) in blending accuracy.
+ *
+ * \returns 0 if comparison succeeded, >0 (=number of pixels for which the comparison failed) if comparison failed, -1 if any of the surfaces were NULL, -2 if the surface sizes differ.
+ */
+int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface, int allowable_error);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_compare_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_crc32.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_crc32.h
new file mode 100644
index 0000000..e615d89
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_crc32.h
@@ -0,0 +1,124 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_crc32.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ Implements CRC32 calculations (default output is Perl String::CRC32 compatible).
+
+*/
+
+#ifndef SDL_test_crc32_h_
+#define SDL_test_crc32_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* ------------ Definitions --------- */
+
+/* Definition shared by all CRC routines */
+
+#ifndef CrcUint32
+ #define CrcUint32  unsigned int
+#endif
+#ifndef CrcUint8
+ #define CrcUint8   unsigned char
+#endif
+
+#ifdef ORIGINAL_METHOD
+ #define CRC32_POLY 0x04c11db7   /* AUTODIN II, Ethernet, & FDDI */
+#else
+ #define CRC32_POLY 0xEDB88320   /* Perl String::CRC32 compatible */
+#endif
+
+/**
+ * Data structure for CRC32 (checksum) computation
+ */
+  typedef struct {
+    CrcUint32    crc32_table[256]; /* CRC table */
+  } SDLTest_Crc32Context;
+
+/* ---------- Function Prototypes ------------- */
+
+/**
+ * \brief Initialize the CRC context
+ *
+ * Note: The function initializes the crc table required for all crc calculations.
+ *
+ * \param crcContext        pointer to context variable
+ *
+ * \returns 0 for OK, -1 on error
+ *
+ */
+ int SDLTest_Crc32Init(SDLTest_Crc32Context * crcContext);
+
+
+/**
+ * \brief calculate a crc32 from a data block
+ *
+ * \param crcContext         pointer to context variable
+ * \param inBuf              input buffer to checksum
+ * \param inLen              length of input buffer
+ * \param crc32              pointer to Uint32 to store the final CRC into
+ *
+ * \returns 0 for OK, -1 on error
+ *
+ */
+int SDLTest_Crc32Calc(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32);
+
+/* Same routine broken down into three steps */
+int SDLTest_Crc32CalcStart(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32);
+int SDLTest_Crc32CalcEnd(SDLTest_Crc32Context * crcContext, CrcUint32 *crc32);
+int SDLTest_Crc32CalcBuffer(SDLTest_Crc32Context * crcContext, CrcUint8 *inBuf, CrcUint32 inLen, CrcUint32 *crc32);
+
+
+/**
+ * \brief clean up CRC context
+ *
+ * \param crcContext        pointer to context variable
+ *
+ * \returns 0 for OK, -1 on error
+ *
+*/
+
+int SDLTest_Crc32Done(SDLTest_Crc32Context * crcContext);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_crc32_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_font.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_font.h
new file mode 100644
index 0000000..8fa0784
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_font.h
@@ -0,0 +1,81 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_font.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+#ifndef SDL_test_font_h_
+#define SDL_test_font_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Function prototypes */
+
+#define FONT_CHARACTER_SIZE  8
+
+/**
+ *  \brief Draw a string in the currently set font.
+ *
+ *  \param renderer The renderer to draw on.
+ *  \param x The X coordinate of the upper left corner of the character.
+ *  \param y The Y coordinate of the upper left corner of the character.
+ *  \param c The character to draw.
+ *
+ *  \returns Returns 0 on success, -1 on failure.
+ */
+int SDLTest_DrawCharacter(SDL_Renderer *renderer, int x, int y, char c);
+
+/**
+ *  \brief Draw a string in the currently set font.
+ *
+ *  \param renderer The renderer to draw on.
+ *  \param x The X coordinate of the upper left corner of the string.
+ *  \param y The Y coordinate of the upper left corner of the string.
+ *  \param s The string to draw.
+ *
+ *  \returns Returns 0 on success, -1 on failure.
+ */
+int SDLTest_DrawString(SDL_Renderer *renderer, int x, int y, const char *s);
+
+
+/**
+ *  \brief Cleanup textures used by font drawing functions.
+ */
+void SDLTest_CleanupTextDrawing(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_font_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_fuzzer.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_fuzzer.h
new file mode 100644
index 0000000..7259685
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_fuzzer.h
@@ -0,0 +1,384 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_fuzzer.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+  Data generators for fuzzing test data in a reproducible way.
+
+*/
+
+#ifndef SDL_test_fuzzer_h_
+#define SDL_test_fuzzer_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+  Based on GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
+*/
+
+
+/**
+ * \file
+ * Note: The fuzzer implementation uses a static instance of random context
+ * internally which makes it thread-UNsafe.
+ */
+
+/**
+ * Initializes the fuzzer for a test
+ *
+ * \param execKey Execution "Key" that initializes the random number generator uniquely for the test.
+ *
+ */
+void SDLTest_FuzzerInit(Uint64 execKey);
+
+
+/**
+ * Returns a random Uint8
+ *
+ * \returns Generated integer
+ */
+Uint8 SDLTest_RandomUint8(void);
+
+/**
+ * Returns a random Sint8
+ *
+ * \returns Generated signed integer
+ */
+Sint8 SDLTest_RandomSint8(void);
+
+
+/**
+ * Returns a random Uint16
+ *
+ * \returns Generated integer
+ */
+Uint16 SDLTest_RandomUint16(void);
+
+/**
+ * Returns a random Sint16
+ *
+ * \returns Generated signed integer
+ */
+Sint16 SDLTest_RandomSint16(void);
+
+
+/**
+ * Returns a random integer
+ *
+ * \returns Generated integer
+ */
+Sint32 SDLTest_RandomSint32(void);
+
+
+/**
+ * Returns a random positive integer
+ *
+ * \returns Generated integer
+ */
+Uint32 SDLTest_RandomUint32(void);
+
+/**
+ * Returns random Uint64.
+ *
+ * \returns Generated integer
+ */
+Uint64 SDLTest_RandomUint64(void);
+
+
+/**
+ * Returns random Sint64.
+ *
+ * \returns Generated signed integer
+ */
+Sint64 SDLTest_RandomSint64(void);
+
+/**
+ * \returns random float in range [0.0 - 1.0[
+ */
+float SDLTest_RandomUnitFloat(void);
+
+/**
+ * \returns random double in range [0.0 - 1.0[
+ */
+double SDLTest_RandomUnitDouble(void);
+
+/**
+ * \returns random float.
+ *
+ */
+float SDLTest_RandomFloat(void);
+
+/**
+ * \returns random double.
+ *
+ */
+double SDLTest_RandomDouble(void);
+
+/**
+ * Returns a random boundary value for Uint8 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint8BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint8BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint8BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint8BoundaryValue(0, 255, SDL_FALSE) returns 0 (error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint8 SDLTest_RandomUint8BoundaryValue(Uint8 boundary1, Uint8 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Uint16 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint16BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint16BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint16BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint16BoundaryValue(0, 0xFFFF, SDL_FALSE) returns 0 (error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint16 SDLTest_RandomUint16BoundaryValue(Uint16 boundary1, Uint16 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Uint32 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint32BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint32BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint32BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint32BoundaryValue(0, 0xFFFFFFFF, SDL_FALSE) returns 0 (with error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint32 SDLTest_RandomUint32BoundaryValue(Uint32 boundary1, Uint32 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Uint64 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomUint64BoundaryValue(10, 20, SDL_TRUE) returns 10, 11, 19 or 20
+ * RandomUint64BoundaryValue(1, 20, SDL_FALSE) returns 0 or 21
+ * RandomUint64BoundaryValue(0, 99, SDL_FALSE) returns 100
+ * RandomUint64BoundaryValue(0, 0xFFFFFFFFFFFFFFFF, SDL_FALSE) returns 0 (with error set)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or 0 with error set
+ */
+Uint64 SDLTest_RandomUint64BoundaryValue(Uint64 boundary1, Uint64 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Sint8 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint8BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint8BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint8BoundaryValue(SINT8_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint8BoundaryValue(SINT8_MIN, SINT8_MAX, SDL_FALSE) returns SINT8_MIN (== error value) with error set
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT8_MIN with error set
+ */
+Sint8 SDLTest_RandomSint8BoundaryValue(Sint8 boundary1, Sint8 boundary2, SDL_bool validDomain);
+
+
+/**
+ * Returns a random boundary value for Sint16 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint16BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint16BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint16BoundaryValue(SINT16_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint16BoundaryValue(SINT16_MIN, SINT16_MAX, SDL_FALSE) returns SINT16_MIN (== error value) with error set
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT16_MIN with error set
+ */
+Sint16 SDLTest_RandomSint16BoundaryValue(Sint16 boundary1, Sint16 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Sint32 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint32BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint32BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint32BoundaryValue(SINT32_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint32BoundaryValue(SINT32_MIN, SINT32_MAX, SDL_FALSE) returns SINT32_MIN (== error value)
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT32_MIN with error set
+ */
+Sint32 SDLTest_RandomSint32BoundaryValue(Sint32 boundary1, Sint32 boundary2, SDL_bool validDomain);
+
+/**
+ * Returns a random boundary value for Sint64 within the given boundaries.
+ * Boundaries are inclusive, see the usage examples below. If validDomain
+ * is true, the function will only return valid boundaries, otherwise non-valid
+ * boundaries are also possible.
+ * If boundary1 > boundary2, the values are swapped
+ *
+ * Usage examples:
+ * RandomSint64BoundaryValue(-10, 20, SDL_TRUE) returns -11, -10, 19 or 20
+ * RandomSint64BoundaryValue(-100, -10, SDL_FALSE) returns -101 or -9
+ * RandomSint64BoundaryValue(SINT64_MIN, 99, SDL_FALSE) returns 100
+ * RandomSint64BoundaryValue(SINT64_MIN, SINT64_MAX, SDL_FALSE) returns SINT64_MIN (== error value) and error set
+ *
+ * \param boundary1 Lower boundary limit
+ * \param boundary2 Upper boundary limit
+ * \param validDomain Should the generated boundary be valid (=within the bounds) or not?
+ *
+ * \returns Random boundary value for the given range and domain or SINT64_MIN with error set
+ */
+Sint64 SDLTest_RandomSint64BoundaryValue(Sint64 boundary1, Sint64 boundary2, SDL_bool validDomain);
+
+
+/**
+ * Returns integer in range [min, max] (inclusive).
+ * Min and max values can be negative values.
+ * If Max in smaller than min, then the values are swapped.
+ * Min and max are the same value, that value will be returned.
+ *
+ * \param min Minimum inclusive value of returned random number
+ * \param max Maximum inclusive value of returned random number
+ *
+ * \returns Generated random integer in range
+ */
+Sint32 SDLTest_RandomIntegerInRange(Sint32 min, Sint32 max);
+
+
+/**
+ * Generates random null-terminated string. The minimum length for
+ * the string is 1 character, maximum length for the string is 255
+ * characters and it can contain ASCII characters from 32 to 126.
+ *
+ * Note: Returned string needs to be deallocated.
+ *
+ * \returns Newly allocated random string; or NULL if length was invalid or string could not be allocated.
+ */
+char * SDLTest_RandomAsciiString(void);
+
+
+/**
+ * Generates random null-terminated string. The maximum length for
+ * the string is defined by the maxLength parameter.
+ * String can contain ASCII characters from 32 to 126.
+ *
+ * Note: Returned string needs to be deallocated.
+ *
+ * \param maxLength The maximum length of the generated string.
+ *
+ * \returns Newly allocated random string; or NULL if maxLength was invalid or string could not be allocated.
+ */
+char * SDLTest_RandomAsciiStringWithMaximumLength(int maxLength);
+
+
+/**
+ * Generates random null-terminated string. The length for
+ * the string is defined by the size parameter.
+ * String can contain ASCII characters from 32 to 126.
+ *
+ * Note: Returned string needs to be deallocated.
+ *
+ * \param size The length of the generated string
+ *
+ * \returns Newly allocated random string; or NULL if size was invalid or string could not be allocated.
+ */
+char * SDLTest_RandomAsciiStringOfSize(int size);
+
+/**
+ * Returns the invocation count for the fuzzer since last ...FuzzerInit.
+ */
+int SDLTest_GetFuzzerInvocationCount(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_fuzzer_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_harness.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_harness.h
new file mode 100644
index 0000000..f5ae92c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_harness.h
@@ -0,0 +1,134 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_harness.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+  Defines types for test case definitions and the test execution harness API.
+
+  Based on original GSOC code by Markus Kauppila <markus.kauppila@gmail.com>
+*/
+
+#ifndef SDL_test_h_arness_h
+#define SDL_test_h_arness_h
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* ! Definitions for test case structures */
+#define TEST_ENABLED  1
+#define TEST_DISABLED 0
+
+/* ! Definition of all the possible test return values of the test case method */
+#define TEST_ABORTED        -1
+#define TEST_STARTED         0
+#define TEST_COMPLETED       1
+#define TEST_SKIPPED         2
+
+/* ! Definition of all the possible test results for the harness */
+#define TEST_RESULT_PASSED              0
+#define TEST_RESULT_FAILED              1
+#define TEST_RESULT_NO_ASSERT           2
+#define TEST_RESULT_SKIPPED             3
+#define TEST_RESULT_SETUP_FAILURE       4
+
+/* !< Function pointer to a test case setup function (run before every test) */
+typedef void (*SDLTest_TestCaseSetUpFp)(void *arg);
+
+/* !< Function pointer to a test case function */
+typedef int (*SDLTest_TestCaseFp)(void *arg);
+
+/* !< Function pointer to a test case teardown function (run after every test) */
+typedef void  (*SDLTest_TestCaseTearDownFp)(void *arg);
+
+/**
+ * Holds information about a single test case.
+ */
+typedef struct SDLTest_TestCaseReference {
+    /* !< Func2Stress */
+    SDLTest_TestCaseFp testCase;
+    /* !< Short name (or function name) "Func2Stress" */
+    char *name;
+    /* !< Long name or full description "This test pushes func2() to the limit." */
+    char *description;
+    /* !< Set to TEST_ENABLED or TEST_DISABLED (test won't be run) */
+    int enabled;
+} SDLTest_TestCaseReference;
+
+/**
+ * Holds information about a test suite (multiple test cases).
+ */
+typedef struct SDLTest_TestSuiteReference {
+    /* !< "PlatformSuite" */
+    char *name;
+    /* !< The function that is run before each test. NULL skips. */
+    SDLTest_TestCaseSetUpFp testSetUp;
+    /* !< The test cases that are run as part of the suite. Last item should be NULL. */
+    const SDLTest_TestCaseReference **testCases;
+    /* !< The function that is run after each test. NULL skips. */
+    SDLTest_TestCaseTearDownFp testTearDown;
+} SDLTest_TestSuiteReference;
+
+
+/**
+ * \brief Generates a random run seed string for the harness. The generated seed will contain alphanumeric characters (0-9A-Z).
+ *
+ * Note: The returned string needs to be deallocated by the caller.
+ *
+ * \param length The length of the seed string to generate
+ *
+ * \returns The generated seed string
+ */
+char *SDLTest_GenerateRunSeed(const int length);
+
+/**
+ * \brief Execute a test suite using the given run seed and execution key.
+ *
+ * \param testSuites Suites containing the test case.
+ * \param userRunSeed Custom run seed provided by user, or NULL to autogenerate one.
+ * \param userExecKey Custom execution key provided by user, or 0 to autogenerate one.
+ * \param filter Filter specification. NULL disables. Case sensitive.
+ * \param testIterations Number of iterations to run each test case.
+ *
+ * \returns Test run result; 0 when all tests passed, 1 if any tests failed.
+ */
+int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *userRunSeed, Uint64 userExecKey, const char *filter, int testIterations);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_h_arness_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_images.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_images.h
new file mode 100644
index 0000000..b893481
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_images.h
@@ -0,0 +1,78 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_images.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ Defines some images for tests.
+
+*/
+
+#ifndef SDL_test_images_h_
+#define SDL_test_images_h_
+
+#include "SDL.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *Type for test images.
+ */
+typedef struct SDLTest_SurfaceImage_s {
+  int width;
+  int height;
+  unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */
+  const char *pixel_data;
+} SDLTest_SurfaceImage_t;
+
+/* Test images */
+SDL_Surface *SDLTest_ImageBlit(void);
+SDL_Surface *SDLTest_ImageBlitColor(void);
+SDL_Surface *SDLTest_ImageBlitAlpha(void);
+SDL_Surface *SDLTest_ImageBlitBlendAdd(void);
+SDL_Surface *SDLTest_ImageBlitBlend(void);
+SDL_Surface *SDLTest_ImageBlitBlendMod(void);
+SDL_Surface *SDLTest_ImageBlitBlendNone(void);
+SDL_Surface *SDLTest_ImageBlitBlendAll(void);
+SDL_Surface *SDLTest_ImageFace(void);
+SDL_Surface *SDLTest_ImagePrimitives(void);
+SDL_Surface *SDLTest_ImagePrimitivesBlend(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_images_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_log.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_log.h
new file mode 100644
index 0000000..01d0fed
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_log.h
@@ -0,0 +1,67 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_log.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+ *
+ *  Wrapper to log in the TEST category
+ *
+ */
+
+#ifndef SDL_test_log_h_
+#define SDL_test_log_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Prints given message with a timestamp in the TEST category and INFO priority.
+ *
+ * \param fmt Message to be logged
+ */
+void SDLTest_Log(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1);
+
+/**
+ * \brief Prints given message with a timestamp in the TEST category and the ERROR priority.
+ *
+ * \param fmt Message to be logged
+ */
+void SDLTest_LogError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_VARARG_FUNC(1);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_log_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_md5.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_md5.h
new file mode 100644
index 0000000..2bfd7df
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_md5.h
@@ -0,0 +1,129 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_md5.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+ ***********************************************************************
+ ** Header file for implementation of MD5                             **
+ ** RSA Data Security, Inc. MD5 Message-Digest Algorithm              **
+ ** Created: 2/17/90 RLR                                              **
+ ** Revised: 12/27/90 SRD,AJ,BSK,JT Reference C version               **
+ ** Revised (for MD5): RLR 4/27/91                                    **
+ **   -- G modified to have y&~z instead of y&z                       **
+ **   -- FF, GG, HH modified to add in last register done             **
+ **   -- Access pattern: round 2 works mod 5, round 3 works mod 3     **
+ **   -- distinct additive constant for each step                     **
+ **   -- round 4 added, working mod 7                                 **
+ ***********************************************************************
+*/
+
+/*
+ ***********************************************************************
+ **  Message-digest routines:                                         **
+ **  To form the message digest for a message M                       **
+ **    (1) Initialize a context buffer mdContext using MD5Init        **
+ **    (2) Call MD5Update on mdContext and M                          **
+ **    (3) Call MD5Final on mdContext                                 **
+ **  The message digest is now in mdContext->digest[0...15]           **
+ ***********************************************************************
+*/
+
+#ifndef SDL_test_md5_h_
+#define SDL_test_md5_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ------------ Definitions --------- */
+
+/* typedef a 32-bit type */
+  typedef unsigned long int MD5UINT4;
+
+/* Data structure for MD5 (Message-Digest) computation */
+  typedef struct {
+    MD5UINT4  i[2];     /* number of _bits_ handled mod 2^64 */
+    MD5UINT4  buf[4];       /* scratch buffer */
+    unsigned char in[64];   /* input buffer */
+    unsigned char digest[16];   /* actual digest after Md5Final call */
+  } SDLTest_Md5Context;
+
+/* ---------- Function Prototypes ------------- */
+
+/**
+ * \brief initialize the context
+ *
+ * \param  mdContext        pointer to context variable
+ *
+ * Note: The function initializes the message-digest context
+ *       mdContext. Call before each new use of the context -
+ *       all fields are set to zero.
+ */
+ void SDLTest_Md5Init(SDLTest_Md5Context * mdContext);
+
+
+/**
+ * \brief update digest from variable length data
+ *
+ * \param  mdContext       pointer to context variable
+ * \param  inBuf           pointer to data array/string
+ * \param  inLen           length of data array/string
+ *
+ * Note: The function updates the message-digest context to account
+ *       for the presence of each of the characters inBuf[0..inLen-1]
+ *       in the message whose digest is being computed.
+*/
+
+ void SDLTest_Md5Update(SDLTest_Md5Context * mdContext, unsigned char *inBuf,
+                 unsigned int inLen);
+
+
+/**
+ * \brief complete digest computation
+ *
+ * \param mdContext     pointer to context variable
+ *
+ * Note: The function terminates the message-digest computation and
+ *       ends with the desired message digest in mdContext.digest[0..15].
+ *       Always call before using the digest[] variable.
+*/
+
+ void SDLTest_Md5Final(SDLTest_Md5Context * mdContext);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_md5_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_memory.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_memory.h
new file mode 100644
index 0000000..5d4d39e
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_memory.h
@@ -0,0 +1,63 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_memory.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+#ifndef SDL_test_memory_h_
+#define SDL_test_memory_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * \brief Start tracking SDL memory allocations
+ * 
+ * \note This should be called before any other SDL functions for complete tracking coverage
+ */
+int SDLTest_TrackAllocations(void);
+
+/**
+ * \brief Print a log of any outstanding allocations
+ *
+ * \note This can be called after SDL_Quit()
+ */
+void SDLTest_LogAllocations(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_memory_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_random.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_random.h
new file mode 100644
index 0000000..71e9c70
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_test_random.h
@@ -0,0 +1,115 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_test_random.h
+ *
+ *  Include file for SDL test framework.
+ *
+ *  This code is a part of the SDL2_test library, not the main SDL library.
+ */
+
+/*
+
+ A "32-bit Multiply with carry random number generator. Very fast.
+ Includes a list of recommended multipliers.
+
+ multiply-with-carry generator: x(n) = a*x(n-1) + carry mod 2^32.
+ period: (a*2^31)-1
+
+*/
+
+#ifndef SDL_test_random_h_
+#define SDL_test_random_h_
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* --- Definitions */
+
+/*
+ * Macros that return a random number in a specific format.
+ */
+#define SDLTest_RandomInt(c)        ((int)SDLTest_Random(c))
+
+/*
+ * Context structure for the random number generator state.
+ */
+  typedef struct {
+    unsigned int a;
+    unsigned int x;
+    unsigned int c;
+    unsigned int ah;
+    unsigned int al;
+  } SDLTest_RandomContext;
+
+
+/* --- Function prototypes */
+
+/**
+ *  \brief Initialize random number generator with two integers.
+ *
+ *  Note: The random sequence of numbers returned by ...Random() is the
+ *  same for the same two integers and has a period of 2^31.
+ *
+ *  \param rndContext     pointer to context structure
+ *  \param xi         integer that defines the random sequence
+ *  \param ci         integer that defines the random sequence
+ *
+ */
+ void SDLTest_RandomInit(SDLTest_RandomContext * rndContext, unsigned int xi,
+                  unsigned int ci);
+
+/**
+ *  \brief Initialize random number generator based on current system time.
+ *
+ *  \param rndContext     pointer to context structure
+ *
+ */
+ void SDLTest_RandomInitTime(SDLTest_RandomContext *rndContext);
+
+
+/**
+ *  \brief Initialize random number generator based on current system time.
+ *
+ *  Note: ...RandomInit() or ...RandomInitTime() must have been called
+ *  before using this function.
+ *
+ *  \param rndContext     pointer to context structure
+ *
+ *  \returns A random number (32bit unsigned integer)
+ *
+ */
+ unsigned int SDLTest_Random(SDLTest_RandomContext *rndContext);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_test_random_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_thread.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_thread.h
new file mode 100644
index 0000000..f78b114
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_thread.h
@@ -0,0 +1,343 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_thread_h_
+#define SDL_thread_h_
+
+/**
+ *  \file SDL_thread.h
+ *
+ *  Header for the SDL thread management routines.
+ */
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+/* Thread synchronization primitives */
+#include "SDL_atomic.h"
+#include "SDL_mutex.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* The SDL thread structure, defined in SDL_thread.c */
+struct SDL_Thread;
+typedef struct SDL_Thread SDL_Thread;
+
+/* The SDL thread ID */
+typedef unsigned long SDL_threadID;
+
+/* Thread local storage ID, 0 is the invalid ID */
+typedef unsigned int SDL_TLSID;
+
+/**
+ *  The SDL thread priority.
+ *
+ *  \note On many systems you require special privileges to set high or time critical priority.
+ */
+typedef enum {
+    SDL_THREAD_PRIORITY_LOW,
+    SDL_THREAD_PRIORITY_NORMAL,
+    SDL_THREAD_PRIORITY_HIGH,
+    SDL_THREAD_PRIORITY_TIME_CRITICAL
+} SDL_ThreadPriority;
+
+/**
+ *  The function passed to SDL_CreateThread().
+ *  It is passed a void* user context parameter and returns an int.
+ */
+typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
+
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
+/**
+ *  \file SDL_thread.h
+ *
+ *  We compile SDL into a DLL. This means, that it's the DLL which
+ *  creates a new thread for the calling process with the SDL_CreateThread()
+ *  API. There is a problem with this, that only the RTL of the SDL2.DLL will
+ *  be initialized for those threads, and not the RTL of the calling
+ *  application!
+ *
+ *  To solve this, we make a little hack here.
+ *
+ *  We'll always use the caller's _beginthread() and _endthread() APIs to
+ *  start a new thread. This way, if it's the SDL2.DLL which uses this API,
+ *  then the RTL of SDL2.DLL will be used to create the new thread, and if it's
+ *  the application, then the RTL of the application will be used.
+ *
+ *  So, in short:
+ *  Always use the _beginthread() and _endthread() of the calling runtime
+ *  library!
+ */
+#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
+#include <process.h> /* _beginthreadex() and _endthreadex() */
+
+typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread)
+                   (void *, unsigned, unsigned (__stdcall *func)(void *),
+                    void * /*arg*/, unsigned, unsigned * /* threadID */);
+typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code);
+
+/**
+ *  Create a thread.
+ */
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data,
+                 pfnSDL_CurrentBeginThread pfnBeginThread,
+                 pfnSDL_CurrentEndThread pfnEndThread);
+
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThreadWithStackSize(int (SDLCALL * fn) (void *),
+                 const char *name, const size_t stacksize, void *data,
+                 pfnSDL_CurrentBeginThread pfnBeginThread,
+                 pfnSDL_CurrentEndThread pfnEndThread);
+
+
+/**
+ *  Create a thread.
+ */
+#if defined(SDL_CreateThread) && SDL_DYNAMIC_API
+#undef SDL_CreateThread
+#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
+#undef SDL_CreateThreadWithStackSize
+#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
+#else
+#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
+#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex)
+#endif
+
+#elif defined(__OS2__)
+/*
+ * just like the windows case above:  We compile SDL2
+ * into a dll with Watcom's runtime statically linked.
+ */
+#define SDL_PASSED_BEGINTHREAD_ENDTHREAD
+#ifndef __EMX__
+#include <process.h>
+#else
+#include <stdlib.h>
+#endif
+typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void * /*arg*/);
+typedef void (*pfnSDL_CurrentEndThread)(void);
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data,
+                 pfnSDL_CurrentBeginThread pfnBeginThread,
+                 pfnSDL_CurrentEndThread pfnEndThread);
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data,
+                 pfnSDL_CurrentBeginThread pfnBeginThread,
+                 pfnSDL_CurrentEndThread pfnEndThread);
+#if defined(SDL_CreateThread) && SDL_DYNAMIC_API
+#undef SDL_CreateThread
+#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread)
+#undef SDL_CreateThreadWithStackSize
+#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread)
+#else
+#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread)
+#define SDL_CreateThreadWithStackSize(fn, name, stacksize, data) SDL_CreateThreadWithStackSize(fn, name, stacksize, data, (pfnSDL_CurrentBeginThread)_beginthread, (pfnSDL_CurrentEndThread)_endthread)
+#endif
+
+#else
+
+/**
+ *  Create a thread with a default stack size.
+ *
+ *  This is equivalent to calling:
+ *  SDL_CreateThreadWithStackSize(fn, name, 0, data);
+ */
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data);
+
+/**
+ *  Create a thread.
+ *
+ *   Thread naming is a little complicated: Most systems have very small
+ *    limits for the string length (Haiku has 32 bytes, Linux currently has 16,
+ *    Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll
+ *    have to see what happens with your system's debugger. The name should be
+ *    UTF-8 (but using the naming limits of C identifiers is a better bet).
+ *   There are no requirements for thread naming conventions, so long as the
+ *    string is null-terminated UTF-8, but these guidelines are helpful in
+ *    choosing a name:
+ *
+ *    http://stackoverflow.com/questions/149932/naming-conventions-for-threads
+ *
+ *   If a system imposes requirements, SDL will try to munge the string for
+ *    it (truncate, etc), but the original string contents will be available
+ *    from SDL_GetThreadName().
+ *
+ *   The size (in bytes) of the new stack can be specified. Zero means "use
+ *    the system default" which might be wildly different between platforms
+ *    (x86 Linux generally defaults to eight megabytes, an embedded device
+ *    might be a few kilobytes instead).
+ *
+ *   In SDL 2.1, stacksize will be folded into the original SDL_CreateThread
+ *    function.
+ */
+extern DECLSPEC SDL_Thread *SDLCALL
+SDL_CreateThreadWithStackSize(SDL_ThreadFunction fn, const char *name, const size_t stacksize, void *data);
+
+#endif
+
+/**
+ * Get the thread name, as it was specified in SDL_CreateThread().
+ *  This function returns a pointer to a UTF-8 string that names the
+ *  specified thread, or NULL if it doesn't have a name. This is internal
+ *  memory, not to be free()'d by the caller, and remains valid until the
+ *  specified thread is cleaned up by SDL_WaitThread().
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread);
+
+/**
+ *  Get the thread identifier for the current thread.
+ */
+extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void);
+
+/**
+ *  Get the thread identifier for the specified thread.
+ *
+ *  Equivalent to SDL_ThreadID() if the specified thread is NULL.
+ */
+extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread);
+
+/**
+ *  Set the priority for the current thread
+ */
+extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority);
+
+/**
+ *  Wait for a thread to finish. Threads that haven't been detached will
+ *  remain (as a "zombie") until this function cleans them up. Not doing so
+ *  is a resource leak.
+ *
+ *  Once a thread has been cleaned up through this function, the SDL_Thread
+ *  that references it becomes invalid and should not be referenced again.
+ *  As such, only one thread may call SDL_WaitThread() on another.
+ *
+ *  The return code for the thread function is placed in the area
+ *  pointed to by \c status, if \c status is not NULL.
+ *
+ *  You may not wait on a thread that has been used in a call to
+ *  SDL_DetachThread(). Use either that function or this one, but not
+ *  both, or behavior is undefined.
+ *
+ *  It is safe to pass NULL to this function; it is a no-op.
+ */
+extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status);
+
+/**
+ *  A thread may be "detached" to signify that it should not remain until
+ *  another thread has called SDL_WaitThread() on it. Detaching a thread
+ *  is useful for long-running threads that nothing needs to synchronize
+ *  with or further manage. When a detached thread is done, it simply
+ *  goes away.
+ *
+ *  There is no way to recover the return code of a detached thread. If you
+ *  need this, don't detach the thread and instead use SDL_WaitThread().
+ *
+ *  Once a thread is detached, you should usually assume the SDL_Thread isn't
+ *  safe to reference again, as it will become invalid immediately upon
+ *  the detached thread's exit, instead of remaining until someone has called
+ *  SDL_WaitThread() to finally clean it up. As such, don't detach the same
+ *  thread more than once.
+ *
+ *  If a thread has already exited when passed to SDL_DetachThread(), it will
+ *  stop waiting for a call to SDL_WaitThread() and clean up immediately.
+ *  It is not safe to detach a thread that might be used with SDL_WaitThread().
+ *
+ *  You may not call SDL_WaitThread() on a thread that has been detached.
+ *  Use either that function or this one, but not both, or behavior is
+ *  undefined.
+ *
+ *  It is safe to pass NULL to this function; it is a no-op.
+ */
+extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread);
+
+/**
+ *  \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific.
+ *
+ *  \return The newly created thread local storage identifier, or 0 on error
+ *
+ *  \code
+ *  static SDL_SpinLock tls_lock;
+ *  static SDL_TLSID thread_local_storage;
+ * 
+ *  void SetMyThreadData(void *value)
+ *  {
+ *      if (!thread_local_storage) {
+ *          SDL_AtomicLock(&tls_lock);
+ *          if (!thread_local_storage) {
+ *              thread_local_storage = SDL_TLSCreate();
+ *          }
+ *          SDL_AtomicUnlock(&tls_lock);
+ *      }
+ *      SDL_TLSSet(thread_local_storage, value, 0);
+ *  }
+ *  
+ *  void *GetMyThreadData(void)
+ *  {
+ *      return SDL_TLSGet(thread_local_storage);
+ *  }
+ *  \endcode
+ *
+ *  \sa SDL_TLSGet()
+ *  \sa SDL_TLSSet()
+ */
+extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void);
+
+/**
+ *  \brief Get the value associated with a thread local storage ID for the current thread.
+ *
+ *  \param id The thread local storage ID
+ *
+ *  \return The value associated with the ID for the current thread, or NULL if no value has been set.
+ *
+ *  \sa SDL_TLSCreate()
+ *  \sa SDL_TLSSet()
+ */
+extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id);
+
+/**
+ *  \brief Set the value associated with a thread local storage ID for the current thread.
+ *
+ *  \param id The thread local storage ID
+ *  \param value The value to associate with the ID for the current thread
+ *  \param destructor A function called when the thread exits, to free the value.
+ *
+ *  \return 0 on success, -1 on error
+ *
+ *  \sa SDL_TLSCreate()
+ *  \sa SDL_TLSGet()
+ */
+extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (SDLCALL *destructor)(void*));
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_thread_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_timer.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_timer.h
new file mode 100644
index 0000000..2a47b04
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_timer.h
@@ -0,0 +1,115 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_timer_h_
+#define SDL_timer_h_
+
+/**
+ *  \file SDL_timer.h
+ *
+ *  Header for the SDL time management routines.
+ */
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * \brief Get the number of milliseconds since the SDL library initialization.
+ *
+ * \note This value wraps if the program runs for more than ~49 days.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void);
+
+/**
+ * \brief Compare SDL ticks values, and return true if A has passed B
+ *
+ * e.g. if you want to wait 100 ms, you could do this:
+ *  Uint32 timeout = SDL_GetTicks() + 100;
+ *  while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) {
+ *      ... do work until timeout has elapsed
+ *  }
+ */
+#define SDL_TICKS_PASSED(A, B)  ((Sint32)((B) - (A)) <= 0)
+
+/**
+ * \brief Get the current value of the high resolution counter
+ */
+extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void);
+
+/**
+ * \brief Get the count per second of the high resolution counter
+ */
+extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void);
+
+/**
+ * \brief Wait a specified number of milliseconds before returning.
+ */
+extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms);
+
+/**
+ *  Function prototype for the timer callback function.
+ *
+ *  The callback function is passed the current timer interval and returns
+ *  the next timer interval.  If the returned value is the same as the one
+ *  passed in, the periodic alarm continues, otherwise a new alarm is
+ *  scheduled.  If the callback returns 0, the periodic alarm is cancelled.
+ */
+typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param);
+
+/**
+ * Definition of the timer ID type.
+ */
+typedef int SDL_TimerID;
+
+/**
+ * \brief Add a new timer to the pool of timers already running.
+ *
+ * \return A timer ID, or 0 when an error occurs.
+ */
+extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval,
+                                                 SDL_TimerCallback callback,
+                                                 void *param);
+
+/**
+ * \brief Remove a timer knowing its ID.
+ *
+ * \return A boolean value indicating success or failure.
+ *
+ * \warning It is not safe to remove a timer multiple times.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_timer_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_touch.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_touch.h
new file mode 100644
index 0000000..99dbcb8
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_touch.h
@@ -0,0 +1,102 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_touch.h
+ *
+ *  Include file for SDL touch event handling.
+ */
+
+#ifndef SDL_touch_h_
+#define SDL_touch_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef Sint64 SDL_TouchID;
+typedef Sint64 SDL_FingerID;
+
+typedef enum
+{
+    SDL_TOUCH_DEVICE_INVALID = -1,
+    SDL_TOUCH_DEVICE_DIRECT,            /* touch screen with window-relative coordinates */
+    SDL_TOUCH_DEVICE_INDIRECT_ABSOLUTE, /* trackpad with absolute device coordinates */
+    SDL_TOUCH_DEVICE_INDIRECT_RELATIVE  /* trackpad with screen cursor-relative coordinates */
+} SDL_TouchDeviceType;
+
+typedef struct SDL_Finger
+{
+    SDL_FingerID id;
+    float x;
+    float y;
+    float pressure;
+} SDL_Finger;
+
+/* Used as the device ID for mouse events simulated with touch input */
+#define SDL_TOUCH_MOUSEID ((Uint32)-1)
+
+/* Used as the SDL_TouchID for touch events simulated with mouse input */
+#define SDL_MOUSE_TOUCHID ((Sint64)-1)
+
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the number of registered touch devices.
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void);
+
+/**
+ *  \brief Get the touch ID with the given index, or 0 if the index is invalid.
+ */
+extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index);
+
+/**
+ * \brief Get the type of the given touch device.
+ */
+extern DECLSPEC SDL_TouchDeviceType SDLCALL SDL_GetTouchDeviceType(SDL_TouchID touchID);
+
+/**
+ *  \brief Get the number of active fingers for a given touch device.
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID);
+
+/**
+ *  \brief Get the finger object of the given touch, with the given index.
+ */
+extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_touch_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_types.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_types.h
new file mode 100644
index 0000000..9c3e989
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_types.h
@@ -0,0 +1,29 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_types.h
+ *
+ *  \deprecated
+ */
+
+/* DEPRECATED */
+#include "SDL_stdinc.h"
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_version.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_version.h
new file mode 100644
index 0000000..6c7499d
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_version.h
@@ -0,0 +1,162 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_version.h
+ *
+ *  This header defines the current SDL version.
+ */
+
+#ifndef SDL_version_h_
+#define SDL_version_h_
+
+#include "SDL_stdinc.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief Information the version of SDL in use.
+ *
+ *  Represents the library's version as three levels: major revision
+ *  (increments with massive changes, additions, and enhancements),
+ *  minor revision (increments with backwards-compatible changes to the
+ *  major revision), and patchlevel (increments with fixes to the minor
+ *  revision).
+ *
+ *  \sa SDL_VERSION
+ *  \sa SDL_GetVersion
+ */
+typedef struct SDL_version
+{
+    Uint8 major;        /**< major version */
+    Uint8 minor;        /**< minor version */
+    Uint8 patch;        /**< update version */
+} SDL_version;
+
+/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL
+*/
+#define SDL_MAJOR_VERSION   2
+#define SDL_MINOR_VERSION   0
+#define SDL_PATCHLEVEL      10
+
+/**
+ *  \brief Macro to determine SDL version program was compiled against.
+ *
+ *  This macro fills in a SDL_version structure with the version of the
+ *  library you compiled against. This is determined by what header the
+ *  compiler uses. Note that if you dynamically linked the library, you might
+ *  have a slightly newer or older version at runtime. That version can be
+ *  determined with SDL_GetVersion(), which, unlike SDL_VERSION(),
+ *  is not a macro.
+ *
+ *  \param x A pointer to a SDL_version struct to initialize.
+ *
+ *  \sa SDL_version
+ *  \sa SDL_GetVersion
+ */
+#define SDL_VERSION(x)                          \
+{                                   \
+    (x)->major = SDL_MAJOR_VERSION;                 \
+    (x)->minor = SDL_MINOR_VERSION;                 \
+    (x)->patch = SDL_PATCHLEVEL;                    \
+}
+
+/**
+ *  This macro turns the version numbers into a numeric value:
+ *  \verbatim
+    (1,2,3) -> (1203)
+    \endverbatim
+ *
+ *  This assumes that there will never be more than 100 patchlevels.
+ */
+#define SDL_VERSIONNUM(X, Y, Z)                     \
+    ((X)*1000 + (Y)*100 + (Z))
+
+/**
+ *  This is the version number macro for the current SDL version.
+ */
+#define SDL_COMPILEDVERSION \
+    SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL)
+
+/**
+ *  This macro will evaluate to true if compiled with SDL at least X.Y.Z.
+ */
+#define SDL_VERSION_ATLEAST(X, Y, Z) \
+    (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z))
+
+/**
+ *  \brief Get the version of SDL that is linked against your program.
+ *
+ *  If you are linking to SDL dynamically, then it is possible that the
+ *  current version will be different than the version you compiled against.
+ *  This function returns the current version, while SDL_VERSION() is a
+ *  macro that tells you what version you compiled with.
+ *
+ *  \code
+ *  SDL_version compiled;
+ *  SDL_version linked;
+ *
+ *  SDL_VERSION(&compiled);
+ *  SDL_GetVersion(&linked);
+ *  printf("We compiled against SDL version %d.%d.%d ...\n",
+ *         compiled.major, compiled.minor, compiled.patch);
+ *  printf("But we linked against SDL version %d.%d.%d.\n",
+ *         linked.major, linked.minor, linked.patch);
+ *  \endcode
+ *
+ *  This function may be called safely at any time, even before SDL_Init().
+ *
+ *  \sa SDL_VERSION
+ */
+extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver);
+
+/**
+ *  \brief Get the code revision of SDL that is linked against your program.
+ *
+ *  Returns an arbitrary string (a hash value) uniquely identifying the
+ *  exact revision of the SDL library in use, and is only useful in comparing
+ *  against other revisions. It is NOT an incrementing number.
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
+
+/**
+ *  \brief Get the revision number of SDL that is linked against your program.
+ *
+ *  Returns a number uniquely identifying the exact revision of the SDL
+ *  library in use. It is an incrementing number based on commits to
+ *  hg.libsdl.org.
+ */
+extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void);
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_version_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_video.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_video.h
new file mode 100644
index 0000000..352afd4
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_video.h
@@ -0,0 +1,1276 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_video.h
+ *
+ *  Header file for SDL video functions.
+ */
+
+#ifndef SDL_video_h_
+#define SDL_video_h_
+
+#include "SDL_stdinc.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_surface.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ *  \brief  The structure that defines a display mode
+ *
+ *  \sa SDL_GetNumDisplayModes()
+ *  \sa SDL_GetDisplayMode()
+ *  \sa SDL_GetDesktopDisplayMode()
+ *  \sa SDL_GetCurrentDisplayMode()
+ *  \sa SDL_GetClosestDisplayMode()
+ *  \sa SDL_SetWindowDisplayMode()
+ *  \sa SDL_GetWindowDisplayMode()
+ */
+typedef struct
+{
+    Uint32 format;              /**< pixel format */
+    int w;                      /**< width, in screen coordinates */
+    int h;                      /**< height, in screen coordinates */
+    int refresh_rate;           /**< refresh rate (or zero for unspecified) */
+    void *driverdata;           /**< driver-specific data, initialize to 0 */
+} SDL_DisplayMode;
+
+/**
+ *  \brief The type used to identify a window
+ *
+ *  \sa SDL_CreateWindow()
+ *  \sa SDL_CreateWindowFrom()
+ *  \sa SDL_DestroyWindow()
+ *  \sa SDL_GetWindowData()
+ *  \sa SDL_GetWindowFlags()
+ *  \sa SDL_GetWindowGrab()
+ *  \sa SDL_GetWindowPosition()
+ *  \sa SDL_GetWindowSize()
+ *  \sa SDL_GetWindowTitle()
+ *  \sa SDL_HideWindow()
+ *  \sa SDL_MaximizeWindow()
+ *  \sa SDL_MinimizeWindow()
+ *  \sa SDL_RaiseWindow()
+ *  \sa SDL_RestoreWindow()
+ *  \sa SDL_SetWindowData()
+ *  \sa SDL_SetWindowFullscreen()
+ *  \sa SDL_SetWindowGrab()
+ *  \sa SDL_SetWindowIcon()
+ *  \sa SDL_SetWindowPosition()
+ *  \sa SDL_SetWindowSize()
+ *  \sa SDL_SetWindowBordered()
+ *  \sa SDL_SetWindowResizable()
+ *  \sa SDL_SetWindowTitle()
+ *  \sa SDL_ShowWindow()
+ */
+typedef struct SDL_Window SDL_Window;
+
+/**
+ *  \brief The flags on a window
+ *
+ *  \sa SDL_GetWindowFlags()
+ */
+typedef enum
+{
+    /* !!! FIXME: change this to name = (1<<x). */
+    SDL_WINDOW_FULLSCREEN = 0x00000001,         /**< fullscreen window */
+    SDL_WINDOW_OPENGL = 0x00000002,             /**< window usable with OpenGL context */
+    SDL_WINDOW_SHOWN = 0x00000004,              /**< window is visible */
+    SDL_WINDOW_HIDDEN = 0x00000008,             /**< window is not visible */
+    SDL_WINDOW_BORDERLESS = 0x00000010,         /**< no window decoration */
+    SDL_WINDOW_RESIZABLE = 0x00000020,          /**< window can be resized */
+    SDL_WINDOW_MINIMIZED = 0x00000040,          /**< window is minimized */
+    SDL_WINDOW_MAXIMIZED = 0x00000080,          /**< window is maximized */
+    SDL_WINDOW_INPUT_GRABBED = 0x00000100,      /**< window has grabbed input focus */
+    SDL_WINDOW_INPUT_FOCUS = 0x00000200,        /**< window has input focus */
+    SDL_WINDOW_MOUSE_FOCUS = 0x00000400,        /**< window has mouse focus */
+    SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ),
+    SDL_WINDOW_FOREIGN = 0x00000800,            /**< window not created by SDL */
+    SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000,      /**< window should be created in high-DPI mode if supported.
+                                                     On macOS NSHighResolutionCapable must be set true in the
+                                                     application's Info.plist for this to have any effect. */
+    SDL_WINDOW_MOUSE_CAPTURE = 0x00004000,      /**< window has mouse captured (unrelated to INPUT_GRABBED) */
+    SDL_WINDOW_ALWAYS_ON_TOP = 0x00008000,      /**< window should always be above others */
+    SDL_WINDOW_SKIP_TASKBAR  = 0x00010000,      /**< window should not be added to the taskbar */
+    SDL_WINDOW_UTILITY       = 0x00020000,      /**< window should be treated as a utility window */
+    SDL_WINDOW_TOOLTIP       = 0x00040000,      /**< window should be treated as a tooltip */
+    SDL_WINDOW_POPUP_MENU    = 0x00080000,      /**< window should be treated as a popup menu */
+    SDL_WINDOW_VULKAN        = 0x10000000       /**< window usable for Vulkan surface */
+} SDL_WindowFlags;
+
+/**
+ *  \brief Used to indicate that you don't care what the window position is.
+ */
+#define SDL_WINDOWPOS_UNDEFINED_MASK    0x1FFF0000u
+#define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X)  (SDL_WINDOWPOS_UNDEFINED_MASK|(X))
+#define SDL_WINDOWPOS_UNDEFINED         SDL_WINDOWPOS_UNDEFINED_DISPLAY(0)
+#define SDL_WINDOWPOS_ISUNDEFINED(X)    \
+            (((X)&0xFFFF0000) == SDL_WINDOWPOS_UNDEFINED_MASK)
+
+/**
+ *  \brief Used to indicate that the window position should be centered.
+ */
+#define SDL_WINDOWPOS_CENTERED_MASK    0x2FFF0000u
+#define SDL_WINDOWPOS_CENTERED_DISPLAY(X)  (SDL_WINDOWPOS_CENTERED_MASK|(X))
+#define SDL_WINDOWPOS_CENTERED         SDL_WINDOWPOS_CENTERED_DISPLAY(0)
+#define SDL_WINDOWPOS_ISCENTERED(X)    \
+            (((X)&0xFFFF0000) == SDL_WINDOWPOS_CENTERED_MASK)
+
+/**
+ *  \brief Event subtype for window events
+ */
+typedef enum
+{
+    SDL_WINDOWEVENT_NONE,           /**< Never used */
+    SDL_WINDOWEVENT_SHOWN,          /**< Window has been shown */
+    SDL_WINDOWEVENT_HIDDEN,         /**< Window has been hidden */
+    SDL_WINDOWEVENT_EXPOSED,        /**< Window has been exposed and should be
+                                         redrawn */
+    SDL_WINDOWEVENT_MOVED,          /**< Window has been moved to data1, data2
+                                     */
+    SDL_WINDOWEVENT_RESIZED,        /**< Window has been resized to data1xdata2 */
+    SDL_WINDOWEVENT_SIZE_CHANGED,   /**< The window size has changed, either as
+                                         a result of an API call or through the
+                                         system or user changing the window size. */
+    SDL_WINDOWEVENT_MINIMIZED,      /**< Window has been minimized */
+    SDL_WINDOWEVENT_MAXIMIZED,      /**< Window has been maximized */
+    SDL_WINDOWEVENT_RESTORED,       /**< Window has been restored to normal size
+                                         and position */
+    SDL_WINDOWEVENT_ENTER,          /**< Window has gained mouse focus */
+    SDL_WINDOWEVENT_LEAVE,          /**< Window has lost mouse focus */
+    SDL_WINDOWEVENT_FOCUS_GAINED,   /**< Window has gained keyboard focus */
+    SDL_WINDOWEVENT_FOCUS_LOST,     /**< Window has lost keyboard focus */
+    SDL_WINDOWEVENT_CLOSE,          /**< The window manager requests that the window be closed */
+    SDL_WINDOWEVENT_TAKE_FOCUS,     /**< Window is being offered a focus (should SetWindowInputFocus() on itself or a subwindow, or ignore) */
+    SDL_WINDOWEVENT_HIT_TEST        /**< Window had a hit test that wasn't SDL_HITTEST_NORMAL. */
+} SDL_WindowEventID;
+
+/**
+ *  \brief Event subtype for display events
+ */
+typedef enum
+{
+    SDL_DISPLAYEVENT_NONE,          /**< Never used */
+    SDL_DISPLAYEVENT_ORIENTATION    /**< Display orientation has changed to data1 */
+} SDL_DisplayEventID;
+
+typedef enum
+{
+    SDL_ORIENTATION_UNKNOWN,            /**< The display orientation can't be determined */
+    SDL_ORIENTATION_LANDSCAPE,          /**< The display is in landscape mode, with the right side up, relative to portrait mode */
+    SDL_ORIENTATION_LANDSCAPE_FLIPPED,  /**< The display is in landscape mode, with the left side up, relative to portrait mode */
+    SDL_ORIENTATION_PORTRAIT,           /**< The display is in portrait mode */
+    SDL_ORIENTATION_PORTRAIT_FLIPPED    /**< The display is in portrait mode, upside down */
+} SDL_DisplayOrientation;
+
+/**
+ *  \brief An opaque handle to an OpenGL context.
+ */
+typedef void *SDL_GLContext;
+
+/**
+ *  \brief OpenGL configuration attributes
+ */
+typedef enum
+{
+    SDL_GL_RED_SIZE,
+    SDL_GL_GREEN_SIZE,
+    SDL_GL_BLUE_SIZE,
+    SDL_GL_ALPHA_SIZE,
+    SDL_GL_BUFFER_SIZE,
+    SDL_GL_DOUBLEBUFFER,
+    SDL_GL_DEPTH_SIZE,
+    SDL_GL_STENCIL_SIZE,
+    SDL_GL_ACCUM_RED_SIZE,
+    SDL_GL_ACCUM_GREEN_SIZE,
+    SDL_GL_ACCUM_BLUE_SIZE,
+    SDL_GL_ACCUM_ALPHA_SIZE,
+    SDL_GL_STEREO,
+    SDL_GL_MULTISAMPLEBUFFERS,
+    SDL_GL_MULTISAMPLESAMPLES,
+    SDL_GL_ACCELERATED_VISUAL,
+    SDL_GL_RETAINED_BACKING,
+    SDL_GL_CONTEXT_MAJOR_VERSION,
+    SDL_GL_CONTEXT_MINOR_VERSION,
+    SDL_GL_CONTEXT_EGL,
+    SDL_GL_CONTEXT_FLAGS,
+    SDL_GL_CONTEXT_PROFILE_MASK,
+    SDL_GL_SHARE_WITH_CURRENT_CONTEXT,
+    SDL_GL_FRAMEBUFFER_SRGB_CAPABLE,
+    SDL_GL_CONTEXT_RELEASE_BEHAVIOR,
+    SDL_GL_CONTEXT_RESET_NOTIFICATION,
+    SDL_GL_CONTEXT_NO_ERROR
+} SDL_GLattr;
+
+typedef enum
+{
+    SDL_GL_CONTEXT_PROFILE_CORE           = 0x0001,
+    SDL_GL_CONTEXT_PROFILE_COMPATIBILITY  = 0x0002,
+    SDL_GL_CONTEXT_PROFILE_ES             = 0x0004 /**< GLX_CONTEXT_ES2_PROFILE_BIT_EXT */
+} SDL_GLprofile;
+
+typedef enum
+{
+    SDL_GL_CONTEXT_DEBUG_FLAG              = 0x0001,
+    SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002,
+    SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG      = 0x0004,
+    SDL_GL_CONTEXT_RESET_ISOLATION_FLAG    = 0x0008
+} SDL_GLcontextFlag;
+
+typedef enum
+{
+    SDL_GL_CONTEXT_RELEASE_BEHAVIOR_NONE   = 0x0000,
+    SDL_GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH  = 0x0001
+} SDL_GLcontextReleaseFlag;
+
+typedef enum
+{
+    SDL_GL_CONTEXT_RESET_NO_NOTIFICATION = 0x0000,
+    SDL_GL_CONTEXT_RESET_LOSE_CONTEXT    = 0x0001
+} SDL_GLContextResetNotification;
+
+/* Function prototypes */
+
+/**
+ *  \brief Get the number of video drivers compiled into SDL
+ *
+ *  \sa SDL_GetVideoDriver()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void);
+
+/**
+ *  \brief Get the name of a built in video driver.
+ *
+ *  \note The video drivers are presented in the order in which they are
+ *        normally checked during initialization.
+ *
+ *  \sa SDL_GetNumVideoDrivers()
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index);
+
+/**
+ *  \brief Initialize the video subsystem, optionally specifying a video driver.
+ *
+ *  \param driver_name Initialize a specific driver by name, or NULL for the
+ *                     default video driver.
+ *
+ *  \return 0 on success, -1 on error
+ *
+ *  This function initializes the video subsystem; setting up a connection
+ *  to the window manager, etc, and determines the available display modes
+ *  and pixel formats, but does not initialize a window or graphics mode.
+ *
+ *  \sa SDL_VideoQuit()
+ */
+extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name);
+
+/**
+ *  \brief Shuts down the video subsystem.
+ *
+ *  This function closes all windows, and restores the original video mode.
+ *
+ *  \sa SDL_VideoInit()
+ */
+extern DECLSPEC void SDLCALL SDL_VideoQuit(void);
+
+/**
+ *  \brief Returns the name of the currently initialized video driver.
+ *
+ *  \return The name of the current video driver or NULL if no driver
+ *          has been initialized
+ *
+ *  \sa SDL_GetNumVideoDrivers()
+ *  \sa SDL_GetVideoDriver()
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void);
+
+/**
+ *  \brief Returns the number of available video displays.
+ *
+ *  \sa SDL_GetDisplayBounds()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void);
+
+/**
+ *  \brief Get the name of a display in UTF-8 encoding
+ *
+ *  \return The name of a display, or NULL for an invalid display index.
+ *
+ *  \sa SDL_GetNumVideoDisplays()
+ */
+extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex);
+
+/**
+ *  \brief Get the desktop area represented by a display, with the primary
+ *         display located at 0,0
+ *
+ *  \return 0 on success, or -1 if the index is out of range.
+ *
+ *  \sa SDL_GetNumVideoDisplays()
+ */
+extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect);
+
+/**
+ *  \brief Get the usable desktop area represented by a display, with the
+ *         primary display located at 0,0
+ *
+ *  This is the same area as SDL_GetDisplayBounds() reports, but with portions
+ *  reserved by the system removed. For example, on Mac OS X, this subtracts
+ *  the area occupied by the menu bar and dock.
+ *
+ *  Setting a window to be fullscreen generally bypasses these unusable areas,
+ *  so these are good guidelines for the maximum space available to a
+ *  non-fullscreen window.
+ *
+ *  \return 0 on success, or -1 if the index is out of range.
+ *
+ *  \sa SDL_GetDisplayBounds()
+ *  \sa SDL_GetNumVideoDisplays()
+ */
+extern DECLSPEC int SDLCALL SDL_GetDisplayUsableBounds(int displayIndex, SDL_Rect * rect);
+
+/**
+ *  \brief Get the dots/pixels-per-inch for a display
+ *
+ *  \note Diagonal, horizontal and vertical DPI can all be optionally
+ *        returned if the parameter is non-NULL.
+ *
+ *  \return 0 on success, or -1 if no DPI information is available or the index is out of range.
+ *
+ *  \sa SDL_GetNumVideoDisplays()
+ */
+extern DECLSPEC int SDLCALL SDL_GetDisplayDPI(int displayIndex, float * ddpi, float * hdpi, float * vdpi);
+
+/**
+ *  \brief Get the orientation of a display
+ *
+ *  \return The orientation of the display, or SDL_ORIENTATION_UNKNOWN if it isn't available.
+ *
+ *  \sa SDL_GetNumVideoDisplays()
+ */
+extern DECLSPEC SDL_DisplayOrientation SDLCALL SDL_GetDisplayOrientation(int displayIndex);
+
+/**
+ *  \brief Returns the number of available display modes.
+ *
+ *  \sa SDL_GetDisplayMode()
+ */
+extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex);
+
+/**
+ *  \brief Fill in information about a specific display mode.
+ *
+ *  \note The display modes are sorted in this priority:
+ *        \li bits per pixel -> more colors to fewer colors
+ *        \li width -> largest to smallest
+ *        \li height -> largest to smallest
+ *        \li refresh rate -> highest to lowest
+ *
+ *  \sa SDL_GetNumDisplayModes()
+ */
+extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex,
+                                               SDL_DisplayMode * mode);
+
+/**
+ *  \brief Fill in information about the desktop display mode.
+ */
+extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode);
+
+/**
+ *  \brief Fill in information about the current display mode.
+ */
+extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode);
+
+
+/**
+ *  \brief Get the closest match to the requested display mode.
+ *
+ *  \param displayIndex The index of display from which mode should be queried.
+ *  \param mode The desired display mode
+ *  \param closest A pointer to a display mode to be filled in with the closest
+ *                 match of the available display modes.
+ *
+ *  \return The passed in value \c closest, or NULL if no matching video mode
+ *          was available.
+ *
+ *  The available display modes are scanned, and \c closest is filled in with the
+ *  closest mode matching the requested mode and returned.  The mode format and
+ *  refresh_rate default to the desktop mode if they are 0.  The modes are
+ *  scanned with size being first priority, format being second priority, and
+ *  finally checking the refresh_rate.  If all the available modes are too
+ *  small, then NULL is returned.
+ *
+ *  \sa SDL_GetNumDisplayModes()
+ *  \sa SDL_GetDisplayMode()
+ */
+extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest);
+
+/**
+ *  \brief Get the display index associated with a window.
+ *
+ *  \return the display index of the display containing the center of the
+ *          window, or -1 on error.
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window);
+
+/**
+ *  \brief Set the display mode used when a fullscreen window is visible.
+ *
+ *  By default the window's dimensions and the desktop format and refresh rate
+ *  are used.
+ *
+ *  \param window The window for which the display mode should be set.
+ *  \param mode The mode to use, or NULL for the default mode.
+ *
+ *  \return 0 on success, or -1 if setting the display mode failed.
+ *
+ *  \sa SDL_GetWindowDisplayMode()
+ *  \sa SDL_SetWindowFullscreen()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window,
+                                                     const SDL_DisplayMode
+                                                         * mode);
+
+/**
+ *  \brief Fill in information about the display mode used when a fullscreen
+ *         window is visible.
+ *
+ *  \sa SDL_SetWindowDisplayMode()
+ *  \sa SDL_SetWindowFullscreen()
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window,
+                                                     SDL_DisplayMode * mode);
+
+/**
+ *  \brief Get the pixel format associated with the window.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window);
+
+/**
+ *  \brief Create a window with the specified position, dimensions, and flags.
+ *
+ *  \param title The title of the window, in UTF-8 encoding.
+ *  \param x     The x position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param y     The y position of the window, ::SDL_WINDOWPOS_CENTERED, or
+ *               ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param w     The width of the window, in screen coordinates.
+ *  \param h     The height of the window, in screen coordinates.
+ *  \param flags The flags for the window, a mask of any of the following:
+ *               ::SDL_WINDOW_FULLSCREEN,    ::SDL_WINDOW_OPENGL,
+ *               ::SDL_WINDOW_HIDDEN,        ::SDL_WINDOW_BORDERLESS,
+ *               ::SDL_WINDOW_RESIZABLE,     ::SDL_WINDOW_MAXIMIZED,
+ *               ::SDL_WINDOW_MINIMIZED,     ::SDL_WINDOW_INPUT_GRABBED,
+ *               ::SDL_WINDOW_ALLOW_HIGHDPI, ::SDL_WINDOW_VULKAN.
+ *
+ *  \return The created window, or NULL if window creation failed.
+ *
+ *  If the window is created with the SDL_WINDOW_ALLOW_HIGHDPI flag, its size
+ *  in pixels may differ from its size in screen coordinates on platforms with
+ *  high-DPI support (e.g. iOS and Mac OS X). Use SDL_GetWindowSize() to query
+ *  the client area's size in screen coordinates, and SDL_GL_GetDrawableSize(),
+ *  SDL_Vulkan_GetDrawableSize(), or SDL_GetRendererOutputSize() to query the
+ *  drawable size in pixels.
+ *
+ *  If the window is created with any of the SDL_WINDOW_OPENGL or
+ *  SDL_WINDOW_VULKAN flags, then the corresponding LoadLibrary function
+ *  (SDL_GL_LoadLibrary or SDL_Vulkan_LoadLibrary) is called and the
+ *  corresponding UnloadLibrary function is called by SDL_DestroyWindow().
+ *
+ *  If SDL_WINDOW_VULKAN is specified and there isn't a working Vulkan driver,
+ *  SDL_CreateWindow() will fail because SDL_Vulkan_LoadLibrary() will fail.
+ *
+ *  \note On non-Apple devices, SDL requires you to either not link to the
+ *        Vulkan loader or link to a dynamic library version. This limitation
+ *        may be removed in a future version of SDL.
+ *
+ *  \sa SDL_DestroyWindow()
+ *  \sa SDL_GL_LoadLibrary()
+ *  \sa SDL_Vulkan_LoadLibrary()
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title,
+                                                      int x, int y, int w,
+                                                      int h, Uint32 flags);
+
+/**
+ *  \brief Create an SDL window from an existing native window.
+ *
+ *  \param data A pointer to driver-dependent window creation data
+ *
+ *  \return The created window, or NULL if window creation failed.
+ *
+ *  \sa SDL_DestroyWindow()
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data);
+
+/**
+ *  \brief Get the numeric ID of a window, for logging purposes.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window);
+
+/**
+ *  \brief Get a window from a stored ID, or NULL if it doesn't exist.
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id);
+
+/**
+ *  \brief Get the window flags.
+ */
+extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window);
+
+/**
+ *  \brief Set the title of a window, in UTF-8 format.
+ *
+ *  \sa SDL_GetWindowTitle()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window,
+                                                const char *title);
+
+/**
+ *  \brief Get the title of a window, in UTF-8 format.
+ *
+ *  \sa SDL_SetWindowTitle()
+ */
+extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window);
+
+/**
+ *  \brief Set the icon for a window.
+ *
+ *  \param window The window for which the icon should be set.
+ *  \param icon The icon for the window.
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window,
+                                               SDL_Surface * icon);
+
+/**
+ *  \brief Associate an arbitrary named pointer with a window.
+ *
+ *  \param window   The window to associate with the pointer.
+ *  \param name     The name of the pointer.
+ *  \param userdata The associated pointer.
+ *
+ *  \return The previous value associated with 'name'
+ *
+ *  \note The name is case-sensitive.
+ *
+ *  \sa SDL_GetWindowData()
+ */
+extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window,
+                                                const char *name,
+                                                void *userdata);
+
+/**
+ *  \brief Retrieve the data pointer associated with a window.
+ *
+ *  \param window   The window to query.
+ *  \param name     The name of the pointer.
+ *
+ *  \return The value associated with 'name'
+ *
+ *  \sa SDL_SetWindowData()
+ */
+extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window,
+                                                const char *name);
+
+/**
+ *  \brief Set the position of a window.
+ *
+ *  \param window   The window to reposition.
+ *  \param x        The x coordinate of the window in screen coordinates, or
+ *                  ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED.
+ *  \param y        The y coordinate of the window in screen coordinates, or
+ *                  ::SDL_WINDOWPOS_CENTERED or ::SDL_WINDOWPOS_UNDEFINED.
+ *
+ *  \note The window coordinate origin is the upper left of the display.
+ *
+ *  \sa SDL_GetWindowPosition()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window,
+                                                   int x, int y);
+
+/**
+ *  \brief Get the position of a window.
+ *
+ *  \param window   The window to query.
+ *  \param x        Pointer to variable for storing the x position, in screen
+ *                  coordinates. May be NULL.
+ *  \param y        Pointer to variable for storing the y position, in screen
+ *                  coordinates. May be NULL.
+ *
+ *  \sa SDL_SetWindowPosition()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window,
+                                                   int *x, int *y);
+
+/**
+ *  \brief Set the size of a window's client area.
+ *
+ *  \param window   The window to resize.
+ *  \param w        The width of the window, in screen coordinates. Must be >0.
+ *  \param h        The height of the window, in screen coordinates. Must be >0.
+ *
+ *  \note Fullscreen windows automatically match the size of the display mode,
+ *        and you should use SDL_SetWindowDisplayMode() to change their size.
+ *
+ *  The window size in screen coordinates may differ from the size in pixels, if
+ *  the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with
+ *  high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or
+ *  SDL_GetRendererOutputSize() to get the real client area size in pixels.
+ *
+ *  \sa SDL_GetWindowSize()
+ *  \sa SDL_SetWindowDisplayMode()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w,
+                                               int h);
+
+/**
+ *  \brief Get the size of a window's client area.
+ *
+ *  \param window   The window to query.
+ *  \param w        Pointer to variable for storing the width, in screen
+ *                  coordinates. May be NULL.
+ *  \param h        Pointer to variable for storing the height, in screen
+ *                  coordinates. May be NULL.
+ *
+ *  The window size in screen coordinates may differ from the size in pixels, if
+ *  the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a platform with
+ *  high-dpi support (e.g. iOS or OS X). Use SDL_GL_GetDrawableSize() or
+ *  SDL_GetRendererOutputSize() to get the real client area size in pixels.
+ *
+ *  \sa SDL_SetWindowSize()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w,
+                                               int *h);
+
+/**
+ *  \brief Get the size of a window's borders (decorations) around the client area.
+ *
+ *  \param window The window to query.
+ *  \param top Pointer to variable for storing the size of the top border. NULL is permitted.
+ *  \param left Pointer to variable for storing the size of the left border. NULL is permitted.
+ *  \param bottom Pointer to variable for storing the size of the bottom border. NULL is permitted.
+ *  \param right Pointer to variable for storing the size of the right border. NULL is permitted.
+ *
+ *  \return 0 on success, or -1 if getting this information is not supported.
+ *
+ *  \note if this function fails (returns -1), the size values will be
+ *        initialized to 0, 0, 0, 0 (if a non-NULL pointer is provided), as
+ *        if the window in question was borderless.
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowBordersSize(SDL_Window * window,
+                                                     int *top, int *left,
+                                                     int *bottom, int *right);
+
+/**
+ *  \brief Set the minimum size of a window's client area.
+ *
+ *  \param window    The window to set a new minimum size.
+ *  \param min_w     The minimum width of the window, must be >0
+ *  \param min_h     The minimum height of the window, must be >0
+ *
+ *  \note You can't change the minimum size of a fullscreen window, it
+ *        automatically matches the size of the display mode.
+ *
+ *  \sa SDL_GetWindowMinimumSize()
+ *  \sa SDL_SetWindowMaximumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window,
+                                                      int min_w, int min_h);
+
+/**
+ *  \brief Get the minimum size of a window's client area.
+ *
+ *  \param window   The window to query.
+ *  \param w        Pointer to variable for storing the minimum width, may be NULL
+ *  \param h        Pointer to variable for storing the minimum height, may be NULL
+ *
+ *  \sa SDL_GetWindowMaximumSize()
+ *  \sa SDL_SetWindowMinimumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window,
+                                                      int *w, int *h);
+
+/**
+ *  \brief Set the maximum size of a window's client area.
+ *
+ *  \param window    The window to set a new maximum size.
+ *  \param max_w     The maximum width of the window, must be >0
+ *  \param max_h     The maximum height of the window, must be >0
+ *
+ *  \note You can't change the maximum size of a fullscreen window, it
+ *        automatically matches the size of the display mode.
+ *
+ *  \sa SDL_GetWindowMaximumSize()
+ *  \sa SDL_SetWindowMinimumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window,
+                                                      int max_w, int max_h);
+
+/**
+ *  \brief Get the maximum size of a window's client area.
+ *
+ *  \param window   The window to query.
+ *  \param w        Pointer to variable for storing the maximum width, may be NULL
+ *  \param h        Pointer to variable for storing the maximum height, may be NULL
+ *
+ *  \sa SDL_GetWindowMinimumSize()
+ *  \sa SDL_SetWindowMaximumSize()
+ */
+extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window,
+                                                      int *w, int *h);
+
+/**
+ *  \brief Set the border state of a window.
+ *
+ *  This will add or remove the window's SDL_WINDOW_BORDERLESS flag and
+ *  add or remove the border from the actual window. This is a no-op if the
+ *  window's border already matches the requested state.
+ *
+ *  \param window The window of which to change the border state.
+ *  \param bordered SDL_FALSE to remove border, SDL_TRUE to add border.
+ *
+ *  \note You can't change the border state of a fullscreen window.
+ *
+ *  \sa SDL_GetWindowFlags()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window,
+                                                   SDL_bool bordered);
+
+/**
+ *  \brief Set the user-resizable state of a window.
+ *
+ *  This will add or remove the window's SDL_WINDOW_RESIZABLE flag and
+ *  allow/disallow user resizing of the window. This is a no-op if the
+ *  window's resizable state already matches the requested state.
+ *
+ *  \param window The window of which to change the resizable state.
+ *  \param resizable SDL_TRUE to allow resizing, SDL_FALSE to disallow.
+ *
+ *  \note You can't change the resizable state of a fullscreen window.
+ *
+ *  \sa SDL_GetWindowFlags()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowResizable(SDL_Window * window,
+                                                    SDL_bool resizable);
+
+/**
+ *  \brief Show a window.
+ *
+ *  \sa SDL_HideWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window);
+
+/**
+ *  \brief Hide a window.
+ *
+ *  \sa SDL_ShowWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window);
+
+/**
+ *  \brief Raise a window above other windows and set the input focus.
+ */
+extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window);
+
+/**
+ *  \brief Make a window as large as possible.
+ *
+ *  \sa SDL_RestoreWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window);
+
+/**
+ *  \brief Minimize a window to an iconic representation.
+ *
+ *  \sa SDL_RestoreWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window);
+
+/**
+ *  \brief Restore the size and position of a minimized or maximized window.
+ *
+ *  \sa SDL_MaximizeWindow()
+ *  \sa SDL_MinimizeWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window);
+
+/**
+ *  \brief Set a window's fullscreen state.
+ *
+ *  \return 0 on success, or -1 if setting the display mode failed.
+ *
+ *  \sa SDL_SetWindowDisplayMode()
+ *  \sa SDL_GetWindowDisplayMode()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window,
+                                                    Uint32 flags);
+
+/**
+ *  \brief Get the SDL surface associated with the window.
+ *
+ *  \return The window's framebuffer surface, or NULL on error.
+ *
+ *  A new surface will be created with the optimal format for the window,
+ *  if necessary. This surface will be freed when the window is destroyed.
+ *
+ *  \note You may not combine this with 3D or the rendering API on this window.
+ *
+ *  \sa SDL_UpdateWindowSurface()
+ *  \sa SDL_UpdateWindowSurfaceRects()
+ */
+extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window);
+
+/**
+ *  \brief Copy the window surface to the screen.
+ *
+ *  \return 0 on success, or -1 on error.
+ *
+ *  \sa SDL_GetWindowSurface()
+ *  \sa SDL_UpdateWindowSurfaceRects()
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window);
+
+/**
+ *  \brief Copy a number of rectangles on the window surface to the screen.
+ *
+ *  \return 0 on success, or -1 on error.
+ *
+ *  \sa SDL_GetWindowSurface()
+ *  \sa SDL_UpdateWindowSurface()
+ */
+extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window,
+                                                         const SDL_Rect * rects,
+                                                         int numrects);
+
+/**
+ *  \brief Set a window's input grab mode.
+ *
+ *  \param window The window for which the input grab mode should be set.
+ *  \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input.
+ *
+ *  If the caller enables a grab while another window is currently grabbed,
+ *  the other window loses its grab in favor of the caller's window.
+ *
+ *  \sa SDL_GetWindowGrab()
+ */
+extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window,
+                                               SDL_bool grabbed);
+
+/**
+ *  \brief Get a window's input grab mode.
+ *
+ *  \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise.
+ *
+ *  \sa SDL_SetWindowGrab()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window);
+
+/**
+ *  \brief Get the window that currently has an input grab enabled.
+ *
+ *  \return This returns the window if input is grabbed, and NULL otherwise.
+ *
+ *  \sa SDL_SetWindowGrab()
+ */
+extern DECLSPEC SDL_Window * SDLCALL SDL_GetGrabbedWindow(void);
+
+/**
+ *  \brief Set the brightness (gamma correction) for a window.
+ *
+ *  \return 0 on success, or -1 if setting the brightness isn't supported.
+ *
+ *  \sa SDL_GetWindowBrightness()
+ *  \sa SDL_SetWindowGammaRamp()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness);
+
+/**
+ *  \brief Get the brightness (gamma correction) for a window.
+ *
+ *  \return The last brightness value passed to SDL_SetWindowBrightness()
+ *
+ *  \sa SDL_SetWindowBrightness()
+ */
+extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window);
+
+/**
+ *  \brief Set the opacity for a window
+ *
+ *  \param window The window which will be made transparent or opaque
+ *  \param opacity Opacity (0.0f - transparent, 1.0f - opaque) This will be
+ *                 clamped internally between 0.0f and 1.0f.
+ *
+ *  \return 0 on success, or -1 if setting the opacity isn't supported.
+ *
+ *  \sa SDL_GetWindowOpacity()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowOpacity(SDL_Window * window, float opacity);
+
+/**
+ *  \brief Get the opacity of a window.
+ *
+ *  If transparency isn't supported on this platform, opacity will be reported
+ *  as 1.0f without error.
+ *
+ *  \param window The window in question.
+ *  \param out_opacity Opacity (0.0f - transparent, 1.0f - opaque)
+ *
+ *  \return 0 on success, or -1 on error (invalid window, etc).
+ *
+ *  \sa SDL_SetWindowOpacity()
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowOpacity(SDL_Window * window, float * out_opacity);
+
+/**
+ *  \brief Sets the window as a modal for another window (TODO: reconsider this function and/or its name)
+ *
+ *  \param modal_window The window that should be modal
+ *  \param parent_window The parent window
+ *
+ *  \return 0 on success, or -1 otherwise.
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowModalFor(SDL_Window * modal_window, SDL_Window * parent_window);
+
+/**
+ *  \brief Explicitly sets input focus to the window.
+ *
+ *  You almost certainly want SDL_RaiseWindow() instead of this function. Use
+ *  this with caution, as you might give focus to a window that's completely
+ *  obscured by other windows.
+ *
+ *  \param window The window that should get the input focus
+ *
+ *  \return 0 on success, or -1 otherwise.
+ *  \sa SDL_RaiseWindow()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowInputFocus(SDL_Window * window);
+
+/**
+ *  \brief Set the gamma ramp for a window.
+ *
+ *  \param window The window for which the gamma ramp should be set.
+ *  \param red The translation table for the red channel, or NULL.
+ *  \param green The translation table for the green channel, or NULL.
+ *  \param blue The translation table for the blue channel, or NULL.
+ *
+ *  \return 0 on success, or -1 if gamma ramps are unsupported.
+ *
+ *  Set the gamma translation table for the red, green, and blue channels
+ *  of the video hardware.  Each table is an array of 256 16-bit quantities,
+ *  representing a mapping between the input and output for that channel.
+ *  The input is the index into the array, and the output is the 16-bit
+ *  gamma value at that index, scaled to the output color precision.
+ *
+ *  \sa SDL_GetWindowGammaRamp()
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window,
+                                                   const Uint16 * red,
+                                                   const Uint16 * green,
+                                                   const Uint16 * blue);
+
+/**
+ *  \brief Get the gamma ramp for a window.
+ *
+ *  \param window The window from which the gamma ramp should be queried.
+ *  \param red   A pointer to a 256 element array of 16-bit quantities to hold
+ *               the translation table for the red channel, or NULL.
+ *  \param green A pointer to a 256 element array of 16-bit quantities to hold
+ *               the translation table for the green channel, or NULL.
+ *  \param blue  A pointer to a 256 element array of 16-bit quantities to hold
+ *               the translation table for the blue channel, or NULL.
+ *
+ *  \return 0 on success, or -1 if gamma ramps are unsupported.
+ *
+ *  \sa SDL_SetWindowGammaRamp()
+ */
+extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window,
+                                                   Uint16 * red,
+                                                   Uint16 * green,
+                                                   Uint16 * blue);
+
+/**
+ *  \brief Possible return values from the SDL_HitTest callback.
+ *
+ *  \sa SDL_HitTest
+ */
+typedef enum
+{
+    SDL_HITTEST_NORMAL,  /**< Region is normal. No special properties. */
+    SDL_HITTEST_DRAGGABLE,  /**< Region can drag entire window. */
+    SDL_HITTEST_RESIZE_TOPLEFT,
+    SDL_HITTEST_RESIZE_TOP,
+    SDL_HITTEST_RESIZE_TOPRIGHT,
+    SDL_HITTEST_RESIZE_RIGHT,
+    SDL_HITTEST_RESIZE_BOTTOMRIGHT,
+    SDL_HITTEST_RESIZE_BOTTOM,
+    SDL_HITTEST_RESIZE_BOTTOMLEFT,
+    SDL_HITTEST_RESIZE_LEFT
+} SDL_HitTestResult;
+
+/**
+ *  \brief Callback used for hit-testing.
+ *
+ *  \sa SDL_SetWindowHitTest
+ */
+typedef SDL_HitTestResult (SDLCALL *SDL_HitTest)(SDL_Window *win,
+                                                 const SDL_Point *area,
+                                                 void *data);
+
+/**
+ *  \brief Provide a callback that decides if a window region has special properties.
+ *
+ *  Normally windows are dragged and resized by decorations provided by the
+ *  system window manager (a title bar, borders, etc), but for some apps, it
+ *  makes sense to drag them from somewhere else inside the window itself; for
+ *  example, one might have a borderless window that wants to be draggable
+ *  from any part, or simulate its own title bar, etc.
+ *
+ *  This function lets the app provide a callback that designates pieces of
+ *  a given window as special. This callback is run during event processing
+ *  if we need to tell the OS to treat a region of the window specially; the
+ *  use of this callback is known as "hit testing."
+ *
+ *  Mouse input may not be delivered to your application if it is within
+ *  a special area; the OS will often apply that input to moving the window or
+ *  resizing the window and not deliver it to the application.
+ *
+ *  Specifying NULL for a callback disables hit-testing. Hit-testing is
+ *  disabled by default.
+ *
+ *  Platforms that don't support this functionality will return -1
+ *  unconditionally, even if you're attempting to disable hit-testing.
+ *
+ *  Your callback may fire at any time, and its firing does not indicate any
+ *  specific behavior (for example, on Windows, this certainly might fire
+ *  when the OS is deciding whether to drag your window, but it fires for lots
+ *  of other reasons, too, some unrelated to anything you probably care about
+ *  _and when the mouse isn't actually at the location it is testing_).
+ *  Since this can fire at any time, you should try to keep your callback
+ *  efficient, devoid of allocations, etc.
+ *
+ *  \param window The window to set hit-testing on.
+ *  \param callback The callback to call when doing a hit-test.
+ *  \param callback_data An app-defined void pointer passed to the callback.
+ *  \return 0 on success, -1 on error (including unsupported).
+ */
+extern DECLSPEC int SDLCALL SDL_SetWindowHitTest(SDL_Window * window,
+                                                 SDL_HitTest callback,
+                                                 void *callback_data);
+
+/**
+ *  \brief Destroy a window.
+ */
+extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window);
+
+
+/**
+ *  \brief Returns whether the screensaver is currently enabled (default off).
+ *
+ *  \sa SDL_EnableScreenSaver()
+ *  \sa SDL_DisableScreenSaver()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void);
+
+/**
+ *  \brief Allow the screen to be blanked by a screensaver
+ *
+ *  \sa SDL_IsScreenSaverEnabled()
+ *  \sa SDL_DisableScreenSaver()
+ */
+extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void);
+
+/**
+ *  \brief Prevent the screen from being blanked by a screensaver
+ *
+ *  \sa SDL_IsScreenSaverEnabled()
+ *  \sa SDL_EnableScreenSaver()
+ */
+extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void);
+
+
+/**
+ *  \name OpenGL support functions
+ */
+/* @{ */
+
+/**
+ *  \brief Dynamically load an OpenGL library.
+ *
+ *  \param path The platform dependent OpenGL library name, or NULL to open the
+ *              default OpenGL library.
+ *
+ *  \return 0 on success, or -1 if the library couldn't be loaded.
+ *
+ *  This should be done after initializing the video driver, but before
+ *  creating any OpenGL windows.  If no OpenGL library is loaded, the default
+ *  library will be loaded upon creation of the first OpenGL window.
+ *
+ *  \note If you do this, you need to retrieve all of the GL functions used in
+ *        your program from the dynamic library using SDL_GL_GetProcAddress().
+ *
+ *  \sa SDL_GL_GetProcAddress()
+ *  \sa SDL_GL_UnloadLibrary()
+ */
+extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path);
+
+/**
+ *  \brief Get the address of an OpenGL function.
+ */
+extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc);
+
+/**
+ *  \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary().
+ *
+ *  \sa SDL_GL_LoadLibrary()
+ */
+extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void);
+
+/**
+ *  \brief Return true if an OpenGL extension is supported for the current
+ *         context.
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char
+                                                           *extension);
+
+/**
+ *  \brief Reset all previously set OpenGL context attributes to their default values
+ */
+extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void);
+
+/**
+ *  \brief Set an OpenGL window attribute before window creation.
+ *
+ *  \return 0 on success, or -1 if the attribute could not be set.
+ */
+extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value);
+
+/**
+ *  \brief Get the actual value for an attribute from the current context.
+ *
+ *  \return 0 on success, or -1 if the attribute could not be retrieved.
+ *          The integer at \c value will be modified in either case.
+ */
+extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value);
+
+/**
+ *  \brief Create an OpenGL context for use with an OpenGL window, and make it
+ *         current.
+ *
+ *  \sa SDL_GL_DeleteContext()
+ */
+extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window *
+                                                           window);
+
+/**
+ *  \brief Set up an OpenGL context for rendering into an OpenGL window.
+ *
+ *  \note The context must have been created with a compatible window.
+ */
+extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window,
+                                               SDL_GLContext context);
+
+/**
+ *  \brief Get the currently active OpenGL window.
+ */
+extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void);
+
+/**
+ *  \brief Get the currently active OpenGL context.
+ */
+extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void);
+
+/**
+ *  \brief Get the size of a window's underlying drawable in pixels (for use
+ *         with glViewport).
+ *
+ *  \param window   Window from which the drawable size should be queried
+ *  \param w        Pointer to variable for storing the width in pixels, may be NULL
+ *  \param h        Pointer to variable for storing the height in pixels, may be NULL
+ *
+ * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI
+ * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a
+ * platform with high-DPI support (Apple calls this "Retina"), and not disabled
+ * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint.
+ *
+ *  \sa SDL_GetWindowSize()
+ *  \sa SDL_CreateWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w,
+                                                    int *h);
+
+/**
+ *  \brief Set the swap interval for the current OpenGL context.
+ *
+ *  \param interval 0 for immediate updates, 1 for updates synchronized with the
+ *                  vertical retrace. If the system supports it, you may
+ *                  specify -1 to allow late swaps to happen immediately
+ *                  instead of waiting for the next retrace.
+ *
+ *  \return 0 on success, or -1 if setting the swap interval is not supported.
+ *
+ *  \sa SDL_GL_GetSwapInterval()
+ */
+extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval);
+
+/**
+ *  \brief Get the swap interval for the current OpenGL context.
+ *
+ *  \return 0 if there is no vertical retrace synchronization, 1 if the buffer
+ *          swap is synchronized with the vertical retrace, and -1 if late
+ *          swaps happen immediately instead of waiting for the next retrace.
+ *          If the system can't determine the swap interval, or there isn't a
+ *          valid current context, this will return 0 as a safe default.
+ *
+ *  \sa SDL_GL_SetSwapInterval()
+ */
+extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void);
+
+/**
+ * \brief Swap the OpenGL buffers for a window, if double-buffering is
+ *        supported.
+ */
+extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window);
+
+/**
+ *  \brief Delete an OpenGL context.
+ *
+ *  \sa SDL_GL_CreateContext()
+ */
+extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
+
+/* @} *//* OpenGL support functions */
+
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_video_h_ */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/SDL_vulkan.h b/Source/ThirdParty/SDL2-2.0.10/include/SDL_vulkan.h
new file mode 100644
index 0000000..d69a436
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/SDL_vulkan.h
@@ -0,0 +1,278 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 2017, Mark Callow
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file SDL_vulkan.h
+ *
+ *  Header file for functions to creating Vulkan surfaces on SDL windows.
+ */
+
+#ifndef SDL_vulkan_h_
+#define SDL_vulkan_h_
+
+#include "SDL_video.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Avoid including vulkan.h, don't define VkInstance if it's already included */
+#ifdef VULKAN_H_
+#define NO_SDL_VULKAN_TYPEDEFS
+#endif
+#ifndef NO_SDL_VULKAN_TYPEDEFS
+#define VK_DEFINE_HANDLE(object) typedef struct object##_T* object;
+
+#if defined(__LP64__) || defined(_WIN64) || defined(__x86_64__) || defined(_M_X64) || defined(__ia64) || defined (_M_IA64) || defined(__aarch64__) || defined(__powerpc64__)
+#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef struct object##_T *object;
+#else
+#define VK_DEFINE_NON_DISPATCHABLE_HANDLE(object) typedef uint64_t object;
+#endif
+
+VK_DEFINE_HANDLE(VkInstance)
+VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
+
+#endif /* !NO_SDL_VULKAN_TYPEDEFS */
+
+typedef VkInstance SDL_vulkanInstance;
+typedef VkSurfaceKHR SDL_vulkanSurface; /* for compatibility with Tizen */
+
+/**
+ *  \name Vulkan support functions
+ *
+ *  \note SDL_Vulkan_GetInstanceExtensions & SDL_Vulkan_CreateSurface API
+ *        is compatable with Tizen's implementation of Vulkan in SDL.
+ */
+/* @{ */
+
+/**
+ *  \brief Dynamically load a Vulkan loader library.
+ *
+ *  \param [in] path The platform dependent Vulkan loader library name, or
+ *              \c NULL.
+ *
+ *  \return \c 0 on success, or \c -1 if the library couldn't be loaded.
+ *
+ *  If \a path is NULL SDL will use the value of the environment variable
+ *  \c SDL_VULKAN_LIBRARY, if set, otherwise it loads the default Vulkan
+ *  loader library.
+ *
+ *  This should be called after initializing the video driver, but before
+ *  creating any Vulkan windows. If no Vulkan loader library is loaded, the
+ *  default library will be loaded upon creation of the first Vulkan window.
+ *
+ *  \note It is fairly common for Vulkan applications to link with \a libvulkan
+ *        instead of explicitly loading it at run time. This will work with
+ *        SDL provided the application links to a dynamic library and both it
+ *        and SDL use the same search path.
+ *
+ *  \note If you specify a non-NULL \c path, an application should retrieve all
+ *        of the Vulkan functions it uses from the dynamic library using
+ *        \c SDL_Vulkan_GetVkGetInstanceProcAddr() unless you can guarantee
+ *        \c path points to the same vulkan loader library the application
+ *        linked to.
+ *
+ *  \note On Apple devices, if \a path is NULL, SDL will attempt to find
+ *        the vkGetInstanceProcAddr address within all the mach-o images of
+ *        the current process. This is because it is fairly common for Vulkan
+ *        applications to link with libvulkan (and historically MoltenVK was
+ *        provided as a static library). If it is not found then, on macOS, SDL
+ *        will attempt to load \c vulkan.framework/vulkan, \c libvulkan.1.dylib,
+ *        followed by \c libvulkan.dylib, in that order.
+ *        On iOS SDL will attempt to load \c libvulkan.dylib only. Applications
+ *        using a dynamic framework or .dylib must ensure it is included in its
+ *        application bundle.
+ *
+ *  \note On non-Apple devices, application linking with a static libvulkan is
+ *        not supported. Either do not link to the Vulkan loader or link to a
+ *        dynamic library version.
+ *
+ *  \note This function will fail if there are no working Vulkan drivers
+ *        installed.
+ *
+ *  \sa SDL_Vulkan_GetVkGetInstanceProcAddr()
+ *  \sa SDL_Vulkan_UnloadLibrary()
+ */
+extern DECLSPEC int SDLCALL SDL_Vulkan_LoadLibrary(const char *path);
+
+/**
+ *  \brief Get the address of the \c vkGetInstanceProcAddr function.
+ *
+ *  \note This should be called after either calling SDL_Vulkan_LoadLibrary
+ *        or creating an SDL_Window with the SDL_WINDOW_VULKAN flag.
+ */
+extern DECLSPEC void *SDLCALL SDL_Vulkan_GetVkGetInstanceProcAddr(void);
+
+/**
+ *  \brief Unload the Vulkan loader library previously loaded by
+ *         \c SDL_Vulkan_LoadLibrary().
+ *
+ *  \sa SDL_Vulkan_LoadLibrary()
+ */
+extern DECLSPEC void SDLCALL SDL_Vulkan_UnloadLibrary(void);
+
+/**
+ *  \brief Get the names of the Vulkan instance extensions needed to create
+ *         a surface with \c SDL_Vulkan_CreateSurface().
+ *
+ *  \param [in]     \c NULL or window Window for which the required Vulkan instance
+ *                  extensions should be retrieved
+ *  \param [in,out] pCount pointer to an \c unsigned related to the number of
+ *                  required Vulkan instance extensions
+ *  \param [out]    pNames \c NULL or a pointer to an array to be filled with the
+ *                  required Vulkan instance extensions
+ *
+ *  \return \c SDL_TRUE on success, \c SDL_FALSE on error.
+ *
+ *  If \a pNames is \c NULL, then the number of required Vulkan instance
+ *  extensions is returned in pCount. Otherwise, \a pCount must point to a
+ *  variable set to the number of elements in the \a pNames array, and on
+ *  return the variable is overwritten with the number of names actually
+ *  written to \a pNames. If \a pCount is less than the number of required
+ *  extensions, at most \a pCount structures will be written. If \a pCount
+ *  is smaller than the number of required extensions, \c SDL_FALSE will be
+ *  returned instead of \c SDL_TRUE, to indicate that not all the required
+ *  extensions were returned.
+ *
+ *  \note If \c window is not NULL, it will be checked against its creation
+ *        flags to ensure that the Vulkan flag is present. This parameter
+ *        will be removed in a future major release.
+ *
+ *  \note The returned list of extensions will contain \c VK_KHR_surface
+ *        and zero or more platform specific extensions
+ *
+ *  \note The extension names queried here must be enabled when calling
+ *        VkCreateInstance, otherwise surface creation will fail.
+ *
+ *  \note \c window should have been created with the \c SDL_WINDOW_VULKAN flag
+ *        or be \c NULL
+ *
+ *  \code
+ *  unsigned int count;
+ *  // get count of required extensions
+ *  if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, NULL))
+ *      handle_error();
+ *
+ *  static const char *const additionalExtensions[] =
+ *  {
+ *      VK_EXT_DEBUG_REPORT_EXTENSION_NAME, // example additional extension
+ *  };
+ *  size_t additionalExtensionsCount = sizeof(additionalExtensions) / sizeof(additionalExtensions[0]);
+ *  size_t extensionCount = count + additionalExtensionsCount;
+ *  const char **names = malloc(sizeof(const char *) * extensionCount);
+ *  if(!names)
+ *      handle_error();
+ *
+ *  // get names of required extensions
+ *  if(!SDL_Vulkan_GetInstanceExtensions(NULL, &count, names))
+ *      handle_error();
+ *
+ *  // copy additional extensions after required extensions
+ *  for(size_t i = 0; i < additionalExtensionsCount; i++)
+ *      names[i + count] = additionalExtensions[i];
+ *
+ *  VkInstanceCreateInfo instanceCreateInfo = {};
+ *  instanceCreateInfo.enabledExtensionCount = extensionCount;
+ *  instanceCreateInfo.ppEnabledExtensionNames = names;
+ *  // fill in rest of instanceCreateInfo
+ *
+ *  VkInstance instance;
+ *  // create the Vulkan instance
+ *  VkResult result = vkCreateInstance(&instanceCreateInfo, NULL, &instance);
+ *  free(names);
+ *  \endcode
+ *
+ *  \sa SDL_Vulkan_CreateSurface()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_GetInstanceExtensions(
+														SDL_Window *window,
+														unsigned int *pCount,
+														const char **pNames);
+
+/**
+ *  \brief Create a Vulkan rendering surface for a window.
+ *
+ *  \param [in]  window   SDL_Window to which to attach the rendering surface.
+ *  \param [in]  instance handle to the Vulkan instance to use.
+ *  \param [out] surface  pointer to a VkSurfaceKHR handle to receive the
+ *                        handle of the newly created surface.
+ *
+ *  \return \c SDL_TRUE on success, \c SDL_FALSE on error.
+ *
+ *  \code
+ *  VkInstance instance;
+ *  SDL_Window *window;
+ *
+ *  // create instance and window
+ *
+ *  // create the Vulkan surface
+ *  VkSurfaceKHR surface;
+ *  if(!SDL_Vulkan_CreateSurface(window, instance, &surface))
+ *      handle_error();
+ *  \endcode
+ *
+ *  \note \a window should have been created with the \c SDL_WINDOW_VULKAN flag.
+ *
+ *  \note \a instance should have been created with the extensions returned
+ *        by \c SDL_Vulkan_CreateSurface() enabled.
+ *
+ *  \sa SDL_Vulkan_GetInstanceExtensions()
+ */
+extern DECLSPEC SDL_bool SDLCALL SDL_Vulkan_CreateSurface(
+												SDL_Window *window,
+												VkInstance instance,
+												VkSurfaceKHR* surface);
+
+/**
+ *  \brief Get the size of a window's underlying drawable in pixels (for use
+ *         with setting viewport, scissor & etc).
+ *
+ *  \param window   SDL_Window from which the drawable size should be queried
+ *  \param w        Pointer to variable for storing the width in pixels,
+ *                  may be NULL
+ *  \param h        Pointer to variable for storing the height in pixels,
+ *                  may be NULL
+ *
+ * This may differ from SDL_GetWindowSize() if we're rendering to a high-DPI
+ * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a
+ * platform with high-DPI support (Apple calls this "Retina"), and not disabled
+ * by the \c SDL_HINT_VIDEO_HIGHDPI_DISABLED hint.
+ *
+ *  \note On macOS high-DPI support must be enabled for an application by
+ *        setting NSHighResolutionCapable to true in its Info.plist.
+ *
+ *  \sa SDL_GetWindowSize()
+ *  \sa SDL_CreateWindow()
+ */
+extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window * window,
+                                                        int *w, int *h);
+
+/* @} *//* Vulkan support functions */
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* SDL_vulkan_h_ */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/begin_code.h b/Source/ThirdParty/SDL2-2.0.10/include/begin_code.h
new file mode 100644
index 0000000..22c997c
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/begin_code.h
@@ -0,0 +1,170 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file begin_code.h
+ *
+ *  This file sets things up for C dynamic library function definitions,
+ *  static inlined functions, and structures aligned at 4-byte alignment.
+ *  If you don't like ugly C preprocessor code, don't look at this file. :)
+ */
+
+/* This shouldn't be nested -- included it around code only. */
+#ifdef _begin_code_h
+#error Nested inclusion of begin_code.h
+#endif
+#define _begin_code_h
+
+#ifndef SDL_DEPRECATED
+#  if (__GNUC__ >= 4)  /* technically, this arrived in gcc 3.1, but oh well. */
+#    define SDL_DEPRECATED __attribute__((deprecated))
+#  else
+#    define SDL_DEPRECATED
+#  endif
+#endif
+
+#ifndef SDL_UNUSED
+#  ifdef __GNUC__
+#    define SDL_UNUSED __attribute__((unused))
+#  else
+#    define SDL_UNUSED
+#  endif
+#endif
+
+/* Some compilers use a special export keyword */
+#ifndef DECLSPEC
+# if defined(__WIN32__) || defined(__WINRT__)
+#  ifdef __BORLANDC__
+#   ifdef BUILD_SDL
+#    define DECLSPEC
+#   else
+#    define DECLSPEC    __declspec(dllimport)
+#   endif
+#  else
+#   define DECLSPEC __declspec(dllexport)
+#  endif
+# elif defined(__OS2__)
+#   ifdef BUILD_SDL
+#    define DECLSPEC    __declspec(dllexport)
+#   else
+#    define DECLSPEC
+#   endif
+# else
+#  if defined(__GNUC__) && __GNUC__ >= 4
+#   define DECLSPEC __attribute__ ((visibility("default")))
+#  else
+#   define DECLSPEC
+#  endif
+# endif
+#endif
+
+/* By default SDL uses the C calling convention */
+#ifndef SDLCALL
+#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__)
+#define SDLCALL __cdecl
+#elif defined(__OS2__) || defined(__EMX__)
+#define SDLCALL _System
+# if defined (__GNUC__) && !defined(_System)
+#  define _System /* for old EMX/GCC compat.  */
+# endif
+#else
+#define SDLCALL
+#endif
+#endif /* SDLCALL */
+
+/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */
+#ifdef __SYMBIAN32__
+#undef DECLSPEC
+#define DECLSPEC
+#endif /* __SYMBIAN32__ */
+
+/* Force structure packing at 4 byte alignment.
+   This is necessary if the header is included in code which has structure
+   packing set to an alternate value, say for loading structures from disk.
+   The packing is reset to the previous value in close_code.h
+ */
+#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
+#ifdef _MSC_VER
+#pragma warning(disable: 4103)
+#endif
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wpragma-pack"
+#endif
+#ifdef __BORLANDC__
+#pragma nopackwarning
+#endif
+#ifdef _M_X64
+/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
+#pragma pack(push,8)
+#else
+#pragma pack(push,4)
+#endif
+#endif /* Compiler needs structure packing set */
+
+#ifndef SDL_INLINE
+#if defined(__GNUC__)
+#define SDL_INLINE __inline__
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || \
+      defined(__DMC__) || defined(__SC__) || \
+      defined(__WATCOMC__) || defined(__LCC__) || \
+      defined(__DECC) || defined(__CC_ARM)
+#define SDL_INLINE __inline
+#ifndef __inline__
+#define __inline__ __inline
+#endif
+#else
+#define SDL_INLINE inline
+#ifndef __inline__
+#define __inline__ inline
+#endif
+#endif
+#endif /* SDL_INLINE not defined */
+
+#ifndef SDL_FORCE_INLINE
+#if defined(_MSC_VER)
+#define SDL_FORCE_INLINE __forceinline
+#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) )
+#define SDL_FORCE_INLINE __attribute__((always_inline)) static __inline__
+#else
+#define SDL_FORCE_INLINE static SDL_INLINE
+#endif
+#endif /* SDL_FORCE_INLINE not defined */
+
+#ifndef SDL_NORETURN
+#if defined(__GNUC__)
+#define SDL_NORETURN __attribute__((noreturn))
+#elif defined(_MSC_VER)
+#define SDL_NORETURN __declspec(noreturn)
+#else
+#define SDL_NORETURN
+#endif
+#endif /* SDL_NORETURN not defined */
+
+/* Apparently this is needed by several Windows compilers */
+#if !defined(__MACH__)
+#ifndef NULL
+#ifdef __cplusplus
+#define NULL 0
+#else
+#define NULL ((void *)0)
+#endif
+#endif /* NULL */
+#endif /* ! Mac OS X - breaks precompiled headers */
diff --git a/Source/ThirdParty/SDL2-2.0.10/include/close_code.h b/Source/ThirdParty/SDL2-2.0.10/include/close_code.h
new file mode 100644
index 0000000..8e4cac3
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/include/close_code.h
@@ -0,0 +1,40 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2019 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+/**
+ *  \file close_code.h
+ *
+ *  This file reverses the effects of begin_code.h and should be included
+ *  after you finish any function and structure declarations in your headers
+ */
+
+#ifndef _begin_code_h
+#error close_code.h included without matching begin_code.h
+#endif
+#undef _begin_code_h
+
+/* Reset structure packing at previous byte alignment */
+#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__)
+#ifdef __BORLANDC__
+#pragma nopackwarning
+#endif
+#pragma pack(pop)
+#endif /* Compiler needs structure packing set */
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2.dll b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2.dll
new file mode 100644
index 0000000..125b00b
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5d66bd7c48a61ff952475ec3492fcad67a81e626d849f00824d2b6442adf8d2f
+size 1401344
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2.lib b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2.lib
new file mode 100644
index 0000000..62846e2
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cd212af9dfc43b430b6c88d4d425fb1ced4f43cd366bf03306ddf20097e3ea6
+size 145280
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2main.lib b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2main.lib
new file mode 100644
index 0000000..7a06a98
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2main.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:05d2ab8b6ad41f19130848c7189d49b1a1efbb1419b344df9fae96aa1dd65ce0
+size 41244
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2test.lib b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2test.lib
new file mode 100644
index 0000000..0ba8be8
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x64/SDL2test.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a958ff1a548dbefeed087e41867368adc48f1253707f953ba8be8c76b9b28fe
+size 924400
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2.dll b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2.dll
new file mode 100644
index 0000000..0470e42
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ffbf5aa7d13fed5d12ba68ba3af930a15aa5d0ff97cfb50a5965a498a941a6dd
+size 1156096
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2.lib b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2.lib
new file mode 100644
index 0000000..155f4d7
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5cf15ba408e29af8a3b82e70cb421d97f011b3cdc23b6e4b3efc264629945b7
+size 148700
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2main.lib b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2main.lib
new file mode 100644
index 0000000..6f055d0
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2main.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ce24b20a5f9c0d281a5b645a13c21cc57b02c1cc29b19a1c7422440d139a1682
+size 41932
diff --git a/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2test.lib b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2test.lib
new file mode 100644
index 0000000..f550a78
--- /dev/null
+++ b/Source/ThirdParty/SDL2-2.0.10/lib/x86/SDL2test.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f0b2261b71015c2717ad0eea4f54f27b0a9449f9b6f02bcc0352fd9ef9ec4e4
+size 897336
diff --git a/Source/ThirdParty/dbcppp/.gitignore b/Source/ThirdParty/dbcppp/.gitignore
new file mode 100644
index 0000000..e831038
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/.gitignore
@@ -0,0 +1 @@
+src
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Attribute.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Attribute.h
new file mode 100644
index 0000000..fce4582
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Attribute.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <string>
+#include <cstddef>
+#include <variant>
+
+#include "Export.h"
+#include "AttributeDefinition.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IAttribute
+    {
+    public:
+        using hex_value_t = int64_t;
+        using value_t = std::variant<int64_t, double, std::string>;
+
+        static std::unique_ptr<IAttribute> Create(
+              std::string&& name
+            , IAttributeDefinition::EObjectType object_type
+            , value_t value);
+            
+        virtual std::unique_ptr<IAttribute> Clone() const = 0;
+
+        virtual ~IAttribute() = default;
+        virtual const std::string& Name() const = 0;
+        virtual IAttributeDefinition::EObjectType ObjectType() const = 0;
+        virtual const value_t& Value() const = 0;
+
+        virtual bool operator==(const IAttribute& rhs) const = 0;
+        virtual bool operator!=(const IAttribute& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/AttributeDefinition.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/AttributeDefinition.h
new file mode 100644
index 0000000..8e3c41b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/AttributeDefinition.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <vector>
+#include <functional>
+#include <variant>
+#include <memory>
+
+#include "Export.h"
+#include "Iterator.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IAttributeDefinition
+    {
+    public:
+        enum class EObjectType
+        {
+            Network,
+            Node,
+            Message,
+            Signal,
+            EnvironmentVariable,
+        };
+        struct ValueTypeInt
+        {
+            int64_t minimum;
+            int64_t maximum;
+        };
+        struct ValueTypeHex
+        {
+            int64_t minimum;
+            int64_t maximum;
+        };
+        struct ValueTypeFloat
+        {
+            double minimum;
+            double maximum;
+        };
+        struct ValueTypeString
+        {
+        };
+        struct ValueTypeEnum
+        {
+            std::vector<std::string> values;
+        };
+        using value_type_t = std::variant<ValueTypeInt, ValueTypeHex, ValueTypeFloat, ValueTypeString, ValueTypeEnum>;
+        
+        static std::unique_ptr<IAttributeDefinition> Create(
+              std::string&& name
+            , EObjectType object_type
+            , value_type_t&& value_type);
+            
+        virtual std::unique_ptr<IAttributeDefinition> Clone() const = 0;
+
+        virtual ~IAttributeDefinition() = default;
+        virtual EObjectType ObjectType() const = 0;
+        virtual const std::string& Name() const = 0;
+        virtual const value_type_t& ValueType() const = 0;
+        
+        virtual bool operator==(const IAttributeDefinition& rhs) const = 0;
+        virtual bool operator!=(const IAttributeDefinition& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/BitTiming.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/BitTiming.h
new file mode 100644
index 0000000..f07ea2d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/BitTiming.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <memory>
+#include <cstdint>
+
+#include "Export.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IBitTiming
+    {
+    public:
+        static std::unique_ptr<IBitTiming> Create(uint64_t baudrate, uint64_t BTR1, uint64_t BTR2);
+        
+        virtual std::unique_ptr<IBitTiming> Clone() const = 0;
+
+        virtual ~IBitTiming() = default;
+        virtual uint64_t Baudrate() const = 0;
+        virtual uint64_t BTR1() const = 0;
+        virtual uint64_t BTR2() const = 0;
+        
+        virtual bool operator==(const IBitTiming& rhs) const = 0;
+        virtual bool operator!=(const IBitTiming& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/CApi.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/CApi.h
new file mode 100644
index 0000000..24c22a0
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/CApi.h
@@ -0,0 +1,307 @@
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#include "Export.h"
+#include <stdint.h>
+
+    typedef enum
+    {
+        dbcppp_ObjectType_Network,
+        dbcppp_ObjectType_Node,
+        dbcppp_ObjectType_Message,
+        dbcppp_ObjectType_Signal,
+        dbcppp_ObjectType_EnvironmentVariable
+    } dbcppp_EObjectType;
+    typedef enum
+    {
+        dbcppp_AttributeValueType_Int,
+        dbcppp_AttributeValueType_Double,
+        dbcppp_AttributeValueType_String
+    } dbcppp_EAttributeValueType;
+    typedef enum
+    {
+        dbcppp_AttributeDefinitionValueTypeInt,
+        dbcppp_AttributeDefinitionValueTypeHex,
+        dbcppp_AttributeDefinitionValueTypeFloat,
+        dbcppp_AttributeDefinitionValueTypeString,
+        dbcppp_AttributeDefinitionValueTypeEnum
+    } dbcppp_EAttributeDefinitionValueType;
+    typedef enum
+    {
+        dbcppp_EnvironmentVariableVarTypeInteger,
+        dbcppp_EnvironmentVariableVarTypeFloat,
+        dbcppp_EnvironmentVariableVarTypeString,
+        dbcppp_EnvironmentVariableVarTypeData
+    } dbcppp_EEnvironmentVariableVarType;
+    typedef enum
+    {
+        dbcppp_EnvironmentVariableAccessTypeUnrestricted,
+        dbcppp_EnvironmentVariableAccessTypeRead,
+        dbcppp_EnvironmentVariableAccessTypeWrite,
+        dbcppp_EnvironmentVariableAccessTypeReadWrite
+    } dbcppp_EEnvironmentVariableAccessType;
+    typedef enum
+    {
+        dbcppp_SignalMultiplexerNoMux,
+        dbcppp_SignalMultiplexerMuxSwitch,
+        dbcppp_SignalMultiplexerMuxValue
+    } dbcppp_ESignalMultiplexer;
+    typedef enum
+    {
+        dbcppp_SignalByteOrderLittleEndian,
+        dbcppp_SignalByteOrderBigEndian
+    } dbcppp_ESignalByteOrder;
+    typedef enum
+    {
+        dbcppp_SignalValueTypeSigned,
+        dbcppp_SignalValueTypeUnsigned
+    } dbcppp_ESignalValueType;
+    typedef enum
+    {
+        dbcppp_SignalExtendedValueTypeInteger,
+        dbcppp_SignalExtendedValueTypeFloat, 
+        dbcppp_SignalExtendedValueTypeDouble
+    } dbcppp_ESignalExtendedValueType;
+
+    typedef struct {} dbcppp_Network;
+    typedef struct {} dbcppp_BitTiming;
+    typedef struct {} dbcppp_Node;
+    typedef struct {} dbcppp_ValueTable;
+    typedef struct {} dbcppp_Message;
+    typedef struct {} dbcppp_EnvironmentVariable;
+    typedef struct {} dbcppp_AttributeDefinition;
+    typedef struct {} dbcppp_Attribute;
+    typedef struct {} dbcppp_SignalType;
+    typedef struct {} dbcppp_Signal;
+    typedef struct {} dbcppp_SignalMultiplexerValue;
+    typedef struct {
+        uint64_t from;
+        uint64_t to;
+    } dbcppp_ValueRange;
+    typedef struct {} dbcppp_ValueEncodingDescription;
+    
+    DBCPPP_API const dbcppp_Attribute* dbcppp_AttributeCreate(
+        const char* name,
+        dbcppp_EObjectType object_type,
+        dbcppp_EAttributeValueType value_type,
+        const void* value);
+    DBCPPP_API void dbcppp_AttributeFree(const dbcppp_Attribute* attribute);
+    DBCPPP_API const char* dbcppp_AttributeName(const dbcppp_Attribute* attribute);
+    DBCPPP_API dbcppp_EObjectType dbcppp_AttributeObjectType(const dbcppp_Attribute* attribute);
+    DBCPPP_API dbcppp_EAttributeValueType dbcppp_AttributeValueType(const dbcppp_Attribute* attribute);
+    DBCPPP_API int64_t dbcppp_AttributeValueAsInt(const dbcppp_Attribute* attribute);
+    DBCPPP_API double dbcppp_AttributeValueAsDouble(const dbcppp_Attribute* attribute);
+    DBCPPP_API const char* dbcppp_AttributeValueAsString(const dbcppp_Attribute* attribute);
+    
+    DBCPPP_API dbcppp_AttributeDefinition* dbcppp_AttributeDefinitionCreate(
+          const char* name
+        , dbcppp_EObjectType object_type
+        , dbcppp_EAttributeDefinitionValueType value_type
+        , const void* value);
+    DBCPPP_API void dbcppp_AttributeDefinitionFree(const dbcppp_AttributeDefinition* attribute_defintion);
+    DBCPPP_API dbcppp_EObjectType dbcppp_AttributeDefinitionObjectType(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API const char* dbcppp_AttributeDefinitionName(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API dbcppp_EAttributeDefinitionValueType dbcppp_AttributeDefinitionValueType(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API int64_t dbcppp_AttributeDefinitionValueTypeAsInt_Minimum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API int64_t dbcppp_AttributeDefinitionValueTypeAsInt_Maximum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API uint64_t dbcppp_AttributeDefinitionValueTypeAsHex_Minimum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API uint64_t dbcppp_AttributeDefinitionValueTypeAsHex_Maximum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API double dbcppp_AttributeDefinitionValueTypeAsFloat_Minimum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API double dbcppp_AttributeDefinitionValueTypeAsFloat_Maximum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API const char* dbcppp_AttributeDefinitionValueTypeAsEnum_Get(const dbcppp_AttributeDefinition* attribute_definition, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_AttributeDefinitionValueTypeAsEnum_Size(const dbcppp_AttributeDefinition* attribute_definition);
+
+    DBCPPP_API const dbcppp_BitTiming* dbcppp_BitTimingCreate(uint64_t baudrate, uint64_t BTR1, uint64_t BTR2);
+    DBCPPP_API void dbcppp_BitTimingFree(const dbcppp_BitTiming* bit_timing);
+    DBCPPP_API uint64_t dbcppp_BitTimingBaudrate(const dbcppp_BitTiming* bit_timing);
+    DBCPPP_API uint64_t dbcppp_BitTimingBTR1(const dbcppp_BitTiming* bit_timing);
+    DBCPPP_API uint64_t dbcppp_BitTimingBTR2(const dbcppp_BitTiming* bit_timing);
+
+    DBCPPP_API const dbcppp_EnvironmentVariable* dbcppp_EnvironmentVariableCreate(
+          const char* name
+        , dbcppp_EEnvironmentVariableVarType var_type
+        , double minimum
+        , double maximum
+        , const char* unit
+        , double initial_value
+        , uint64_t ev_id
+        , dbcppp_EEnvironmentVariableAccessType access_type
+        , const char** access_nodes
+        , dbcppp_ValueEncodingDescription** value_encoding_descriptions
+        , uint64_t data_size
+        , dbcppp_Attribute** attribute_values
+        , const char* comment);
+    DBCPPP_API void dbcppp_EnvironmentVariableFree(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableName(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API dbcppp_EEnvironmentVariableVarType dbcppp_EnvironmentVariableVarType(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API double dbcppp_EnvironmentVariableMinimum(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API double dbcppp_EnvironmentVariableMaximum(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableUnit(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API double dbcppp_EnvironmentVariableInitialValue(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableEvId(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API dbcppp_EEnvironmentVariableAccessType dbcppp_EnvironmentVariableAccessType(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableAccessNodes_Get(const dbcppp_EnvironmentVariable* env_var, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableAccessNodes_Size(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableValueEncodingDescriptions_GetValue(const dbcppp_EnvironmentVariable* env_var, int64_t i);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableValueEncodingDescriptions_GetDescription(const dbcppp_EnvironmentVariable* env_var, int64_t i);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableValueEncodingDescriptions_Size(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableDataSize(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_EnvironmentVariableAttributeValues_Get(const dbcppp_EnvironmentVariable* env_var, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableAttributeValues_Size(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableComment(const dbcppp_EnvironmentVariable* env_var);
+
+    DBCPPP_API const dbcppp_Message* dbcppp_MessageCreate(
+          uint64_t id
+        , const char* name
+        , uint64_t message_size
+        , const char* transmitter
+        , const char** message_transmitters
+        , dbcppp_Signal** signals
+        , dbcppp_Attribute** attribute_values
+        , const char* comment);
+    DBCPPP_API void dbcppp_MessageFree(const dbcppp_Message* msg);
+    DBCPPP_API uint64_t dbcppp_MessageId(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageName(const dbcppp_Message* msg);
+    DBCPPP_API uint64_t dbcppp_MessageMessageSize(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageTransmitter(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageTransmitters_Get(const dbcppp_Message* msg, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_MessageTransmitters_Size(const dbcppp_Message* msg);
+    DBCPPP_API const dbcppp_Signal* dbcppp_MessageSignals_Get(const dbcppp_Message* msg, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_MessageSignals_Size(const dbcppp_Message* msg);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_MessageAttributeValues_Get(const dbcppp_Message* msg, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_MessageAttributeValues_Size(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageComment(const dbcppp_Message* msg);
+    
+    DBCPPP_API const dbcppp_Network* dbcppp_NetworkLoadDBCFromFile(const char* filename);
+    DBCPPP_API const dbcppp_Network* dbcppp_NetworkLoadDBCFromMemory(const char* data);
+    DBCPPP_API const dbcppp_Network* dbcppp_NetworkCreate(
+          const char* version
+        , const char** new_symbols
+        , dbcppp_BitTiming* bit_timing
+        , dbcppp_Node** nodes
+        , dbcppp_ValueTable** value_tables
+        , dbcppp_Message** messages
+        , dbcppp_EnvironmentVariable** environment_variables
+        , dbcppp_AttributeDefinition** attribute_definitions
+        , dbcppp_Attribute** attribute_defaults
+        , dbcppp_Attribute** attribute_values
+        , const char* comment);
+    DBCPPP_API void dbcppp_NetworkFree(const dbcppp_Network* network);
+    DBCPPP_API const char* dbcppp_NetworkVersion(const dbcppp_Network* net);
+    DBCPPP_API const char* dbcppp_NetworkNewSymbols_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkNewSymbols_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_BitTiming* dbcppp_NetworkBitTiming(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Node* dbcppp_NetworkNodes_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkNodes_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_ValueTable* dbcppp_NetworkValueTables_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkValueTables_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Message* dbcppp_NetworkMessages_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkMessages_Size(const dbcppp_Network* net);    
+    DBCPPP_API const dbcppp_EnvironmentVariable* dbcppp_NetworkEnvironmentVariables_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkEnvironmentVariables_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_AttributeDefinition* dbcppp_NetworkAttributeDefinitions_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkAttributeDefinitions_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_NetworkAttributeDefaults_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkAttributeDefaults_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_NetworkAttributeValues_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkAttributeValues_Size(const dbcppp_Network* net);
+    DBCPPP_API const char* dbcppp_NetworkComment(const dbcppp_Network* net);
+
+    DBCPPP_API const dbcppp_Node* dbcppp_NodeCreate(const char* name, const char* comment, dbcppp_Attribute** attributes);
+    DBCPPP_API void dbcppp_NodeFree(const dbcppp_Node* node);
+    DBCPPP_API const char* dbcppp_NodeName(const dbcppp_Node* node);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_NodeAttributeValues_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NodeAttributeValues_Size(const dbcppp_Network* net);
+    DBCPPP_API const char* dbcppp_NodeComment(const dbcppp_Node* node);
+
+    DBCPPP_API const dbcppp_Signal* dbcppp_SignalCreate(
+          uint64_t message_size
+        , const char* name
+        , dbcppp_ESignalMultiplexer multiplexer_indicator
+        , uint64_t multiplexer_switch_value
+        , uint64_t start_bit
+        , uint64_t bit_size
+        , dbcppp_ESignalByteOrder byte_order
+        , dbcppp_ESignalValueType value_type
+        , double factor
+        , double offset
+        , double minimum
+        , double maximum
+        , const char* unit
+        , const char** receivers
+        , dbcppp_Attribute** attribute_values
+        , dbcppp_ValueEncodingDescription** value_descriptions
+        , const char* comment
+        , dbcppp_ESignalExtendedValueType extended_value_type);
+    DBCPPP_API const char* dbcppp_SignalName(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalMultiplexer dbcppp_SignalMultiplexerIndicator(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalMultiplexerSwitchValue(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalMultiplexerValues_Size(const dbcppp_Signal* sig);
+    DBCPPP_API const dbcppp_SignalMultiplexerValue* dbcppp_SignalMultiplexerValues_Get(const dbcppp_Signal* sig, uint64_t i);
+    DBCPPP_API const char* dbcppp_SignalMultiplexerValue_SwitchName(const dbcppp_SignalMultiplexerValue* mux_val);
+    DBCPPP_API uint64_t dbcppp_SignalMultiplexerValue_ValueRanges_Size(const dbcppp_SignalMultiplexerValue* mux_val);
+    DBCPPP_API const dbcppp_ValueRange* dbcppp_SignalMultiplexerValue_ValueRanges_Get(const dbcppp_SignalMultiplexerValue* mux_val, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalStartBit(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalBitSize(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalByteOrder dbcppp_SignalByteOrder(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalValueType dbcppp_SignalValueType(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalFactor(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalOffset(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalMinimum(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalMaximum(const dbcppp_Signal* sig);
+    DBCPPP_API const char* dbcppp_SignalUnit(const dbcppp_Signal* sig);
+    DBCPPP_API const char* dbcppp_SignalReceivers_Get(const dbcppp_Signal* signal, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalReceivers_Size(const dbcppp_Signal* signal);
+    DBCPPP_API const dbcppp_ValueEncodingDescription* dbcppp_SignalValueEncodingDescriptions_Get(const dbcppp_Signal* signal, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalValueEncodingDescriptions_Size(const dbcppp_Signal* signal);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_SignalAttributeValues_Get(const dbcppp_Signal* signal, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalAttributeValues_Size(const dbcppp_Signal* signal);
+    DBCPPP_API const char* dbcppp_SignalComment(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalExtendedValueType dbcppp_SignalExtended_ValueType(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalDecode(const dbcppp_Signal* sig, const void* bytes);
+    DBCPPP_API void dbcppp_SignalEncode(const dbcppp_Signal* sig, uint64_t raw, void* buffer);
+    DBCPPP_API double dbcppp_SignalRawToPhys(const dbcppp_Signal* sig, uint64_t raw);
+    DBCPPP_API uint64_t dbcppp_SignalPhysToRaw(const dbcppp_Signal* sig, double phys);
+
+    DBCPPP_API const dbcppp_SignalType* dbcppp_SignalTypeCreate(
+          const char* name
+        , uint64_t signal_size
+        , dbcppp_ESignalByteOrder byte_order
+        , dbcppp_ESignalValueType value_type
+        , double factor
+        , double offset
+        , double minimum
+        , double maximum
+        , const char* unit
+        , double default_value
+        , const char* value_table);
+    DBCPPP_API const char* dbcppp_SignalTypeName(const dbcppp_SignalType* sig_type);
+    DBCPPP_API uint64_t dbcppp_SignalTypeSignalSize(const dbcppp_SignalType* sig_type);
+    DBCPPP_API dbcppp_ESignalByteOrder dbcppp_SignalTypeByteOrder(const dbcppp_SignalType* sig_type);
+    DBCPPP_API dbcppp_ESignalValueType dbcppp_SignalTypeValueType(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeFactor(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeOffset(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeMinimum(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeMaximum(const dbcppp_SignalType* sig_type);
+    DBCPPP_API const char* dbcppp_SignalTypeUnit(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeDefaultValue(const dbcppp_SignalType* sig_type);
+    DBCPPP_API const char* dbcppp_SignalTypeValueTable(const dbcppp_SignalType* sig_type);
+    DBCPPP_API const dbcppp_ValueTable* dbcppp_ValueTableCreate(const char* name, dbcppp_SignalType* signal_type, dbcppp_ValueEncodingDescription** pairs);
+    DBCPPP_API void dbcppp_ValueTableFree(const dbcppp_ValueTable* value_table);
+    DBCPPP_API const char* dbcppp_ValueTableName(const dbcppp_ValueTable* value_table);
+    DBCPPP_API const dbcppp_SignalType* dbcppp_ValueTableSignalType(const dbcppp_ValueTable* value_table);
+    DBCPPP_API const dbcppp_ValueEncodingDescription* dbcppp_ValueTableValueEncodingDescription_Get(const dbcppp_ValueTable* value_table, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_ValueTableValueEncodingDescription_Size(const dbcppp_ValueTable* value_table);
+    
+    DBCPPP_API const dbcppp_ValueEncodingDescription* dbcppp_ValueEncodingDescriptionCreate(uint64_t value, const char* desc);
+    DBCPPP_API void dbcppp_ValueEncodingDescriptionFree(const dbcppp_ValueEncodingDescription* ved);
+    DBCPPP_API uint64_t dbcppp_ValueEncodingDescriptionValue(const dbcppp_ValueEncodingDescription* ved);
+    DBCPPP_API const char* dbcppp_ValueEncodingDescriptionDescription(const dbcppp_ValueEncodingDescription* ved);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/EnvironmentVariable.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/EnvironmentVariable.h
new file mode 100644
index 0000000..4d4ebd4
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/EnvironmentVariable.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+#include <cstddef>
+#include <functional>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Node.h"
+#include "Attribute.h"
+#include "ValueEncodingDescription.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IEnvironmentVariable
+    {
+    public:
+        enum class EVarType
+        {
+            Integer, Float, String, Data
+        };
+        enum class EAccessType
+        {
+            Unrestricted    = 0x0000,
+            Read            = 0x0001,
+            Write           = 0x0002,
+            ReadWrite       = 0x0003,
+            Unrestricted_   = 0x8000,
+            Read_           = 0x8001,
+            Write_          = 0x8002,
+            ReadWrite_      = 0x8003
+        };
+
+        static std::unique_ptr<IEnvironmentVariable> Create(
+              std::string&& name
+            , EVarType var_type
+            , double minimum
+            , double maximum
+            , std::string&& unit
+            , double initial_value
+            , uint64_t ev_id
+            , EAccessType access_type
+            , std::vector<std::string>&& access_nodes
+            , std::vector<std::unique_ptr<IValueEncodingDescription>>&& value_encoding_descriptions
+            , uint64_t data_size
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::string&& comment);
+            
+        virtual std::unique_ptr<IEnvironmentVariable> Clone() const = 0;
+
+        virtual ~IEnvironmentVariable() = default;
+        virtual const std::string& Name() const = 0;
+        virtual EVarType VarType() const = 0;
+        virtual double Minimum() const = 0;
+        virtual double Maximum() const = 0;
+        virtual const std::string& Unit() const = 0;
+        virtual double InitialValue() const = 0;
+        virtual uint64_t EvId() const = 0;
+        virtual EAccessType AccessType() const = 0;
+        virtual const std::string& AccessNodes_Get(std::size_t i) const = 0;
+        virtual uint64_t AccessNodes_Size() const = 0;
+        virtual const IValueEncodingDescription& ValueEncodingDescriptions_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueEncodingDescriptions_Size() const = 0;
+        virtual uint64_t DataSize() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        
+        DBCPPP_MAKE_ITERABLE(IEnvironmentVariable, AccessNodes, std::string);
+        DBCPPP_MAKE_ITERABLE(IEnvironmentVariable, ValueEncodingDescriptions, IValueEncodingDescription);
+        DBCPPP_MAKE_ITERABLE(IEnvironmentVariable, AttributeValues, IAttribute);
+
+        virtual bool operator==(const IEnvironmentVariable& rhs) const = 0;
+        virtual bool operator!=(const IEnvironmentVariable& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Export.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Export.h
new file mode 100644
index 0000000..82febff
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Export.h
@@ -0,0 +1,16 @@
+
+#pragma once
+
+#ifdef DBCPPP_STATIC
+#    define DBCPPP_API
+#else
+#    ifdef _WIN32
+#        ifdef DBCPPP_EXPORT
+#            define DBCPPP_API __declspec(dllexport)
+#        else
+#            define DBCPPP_API __declspec(dllimport)
+#        endif
+#    else
+#        define DBCPPP_API
+#    endif
+#endif
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Iterator.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Iterator.h
new file mode 100644
index 0000000..916761b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Iterator.h
@@ -0,0 +1,102 @@
+
+#pragma once
+
+#include <functional>
+
+namespace dbcppp
+{
+    template <class T>
+    class Iterator
+    {
+    public:
+        using self_t            = Iterator<T>;
+        using iterator_category = std::random_access_iterator_tag;
+        using difference_type   = std::ptrdiff_t;
+        using value_type        = T;
+        using pointer           = const value_type*;
+        using reference         = const value_type&;
+        using get_t             = std::function<reference (std::size_t)>;
+
+        Iterator(get_t get, std::size_t i)
+            : _get(get)
+            , _i(i)
+        {}
+        reference operator*() const
+        {
+            return _get(_i);
+        }
+        pointer operator->() const
+        {
+            return &_get(_i);
+        }
+        self_t& operator++()
+        {
+            _i++;
+            return *this;
+        }
+        self_t operator+(std::size_t o)
+        {
+            return {_get, _i + o};
+        }
+        self_t operator-(std::size_t o)
+        {
+            return {_get, _i + o};
+        }
+        difference_type operator-(const self_t& rhs)
+        {
+            return _i - rhs._i;
+        }
+        self_t& operator+=(std::size_t o)
+        {
+            _i += o;
+            return *this;
+        }
+        self_t& operator-=(std::size_t o)
+        {
+            _i -= o;
+            return *this;
+        }
+
+        bool operator==(const self_t& rhs) const
+        {
+            return _i == rhs._i;
+        }
+        bool operator!=(const self_t& rhs) const
+        {
+            return !(*this == rhs);
+        }
+
+    private:
+        get_t _get;
+        std::size_t _i;
+    };
+    template <class Iterator>
+    class Iterable
+    {
+    public:
+        Iterable(Iterator begin, Iterator end)
+            : _begin(begin)
+            , _end(end)
+        {}
+        Iterator& begin()
+        {
+            return _begin;
+        }
+        Iterator& end()
+        {
+            return _end;
+        }
+
+    private:
+        Iterator _begin;
+        Iterator _end;
+    };
+}
+#define DBCPPP_MAKE_ITERABLE(ClassName, Name, Type)                                 \
+    auto Name() const                                                               \
+    {                                                                               \
+        auto get = std::bind(&ClassName::Name##_Get, this, std::placeholders::_1);  \
+        Iterator<Type> begin(get, 0);                                               \
+        Iterator<Type> end(get, Name##_Size());                                     \
+        return Iterable(begin, end);                                                \
+    }
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Message.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Message.h
new file mode 100644
index 0000000..bbdeef0
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Message.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <memory>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Node.h"
+#include "Signal.h"
+#include "Attribute.h"
+#include "SignalGroup.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IMessage
+    {
+    public:
+        enum class EErrorCode
+            : uint64_t
+        {
+            NoError,
+            MuxValeWithoutMuxSignal
+        };
+
+        static std::unique_ptr<IMessage> Create(
+              uint64_t id
+            , std::string&& name
+            , uint64_t message_size
+            , std::string&& transmitter
+            , std::vector<std::string>&& message_transmitters
+            , std::vector<std::unique_ptr<ISignal>>&& signals_
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::string&& comment
+            , std::vector<std::unique_ptr<ISignalGroup>>&& signal_groups);
+
+        virtual std::unique_ptr<IMessage> Clone() const = 0;
+
+        virtual ~IMessage() = default;
+        virtual uint64_t Id() const = 0;
+        virtual const std::string& Name() const = 0;
+        virtual uint64_t MessageSize() const = 0;
+        virtual const std::string& Transmitter() const = 0;
+        virtual const std::string& MessageTransmitters_Get(std::size_t i) const = 0;
+        virtual uint64_t MessageTransmitters_Size() const = 0;
+        virtual const ISignal& Signals_Get(std::size_t i) const = 0;
+        virtual uint64_t Signals_Size() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        virtual const ISignalGroup& SignalGroups_Get(std::size_t i) const = 0;
+        virtual uint64_t SignalGroups_Size() const = 0;
+        virtual const ISignal* MuxSignal() const = 0;
+        
+        DBCPPP_MAKE_ITERABLE(IMessage, MessageTransmitters, std::string);
+        DBCPPP_MAKE_ITERABLE(IMessage, Signals, ISignal);
+        DBCPPP_MAKE_ITERABLE(IMessage, AttributeValues, IAttribute);
+        DBCPPP_MAKE_ITERABLE(IMessage, SignalGroups, ISignalGroup);
+        
+        virtual bool operator==(const IMessage& message) const = 0;
+        virtual bool operator!=(const IMessage& message) const = 0;
+
+        virtual EErrorCode Error() const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Network.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Network.h
new file mode 100644
index 0000000..34459e9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Network.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <memory>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <istream>
+#include <functional>
+#include <unordered_map>
+#include <filesystem>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "BitTiming.h"
+#include "ValueTable.h"
+#include "Node.h"
+#include "Message.h"
+#include "EnvironmentVariable.h"
+#include "SignalType.h"
+#include "AttributeDefinition.h"
+#include "Attribute.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API INetwork
+    {
+    public:
+        static std::unique_ptr<INetwork> Create(
+              std::string&& version
+            , std::vector<std::string>&& new_symbols
+            , std::unique_ptr<IBitTiming>&& bit_timing
+            , std::vector<std::unique_ptr<INode>>&& nodes
+            , std::vector<std::unique_ptr<IValueTable>>&& value_tables
+            , std::vector<std::unique_ptr<IMessage>>&& messages
+            , std::vector<std::unique_ptr<IEnvironmentVariable>>&& environment_variables
+            , std::vector<std::unique_ptr<IAttributeDefinition>>&& attribute_definitions
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_defaults
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::string&& comment);
+        static std::map<std::string, std::unique_ptr<INetwork>> LoadNetworkFromFile(const std::filesystem::path& filename);
+        static std::unique_ptr<INetwork> LoadDBCFromIs(std::istream& is);
+        static std::map<std::string, std::unique_ptr<INetwork>> LoadKCDFromIs(std::istream& is);
+        
+        virtual std::unique_ptr<INetwork> Clone() const = 0;
+
+        virtual ~INetwork() = default;
+        virtual const std::string& Version() const = 0;
+        virtual const std::string& NewSymbols_Get(std::size_t i) const = 0;
+        virtual uint64_t NewSymbols_Size() const = 0;
+        virtual const IBitTiming& BitTiming() const = 0;
+        virtual const INode& Nodes_Get(std::size_t i) const = 0;
+        virtual uint64_t Nodes_Size() const = 0;
+        virtual const IValueTable& ValueTables_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueTables_Size() const = 0;
+        virtual const IMessage& Messages_Get(std::size_t i) const = 0;
+        virtual uint64_t Messages_Size() const = 0;
+        virtual const IEnvironmentVariable& EnvironmentVariables_Get(std::size_t i) const = 0;
+        virtual uint64_t EnvironmentVariables_Size() const = 0;
+        virtual const IAttributeDefinition& AttributeDefinitions_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeDefinitions_Size() const = 0;
+        virtual const IAttribute& AttributeDefaults_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeDefaults_Size() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        
+        DBCPPP_MAKE_ITERABLE(INetwork, NewSymbols, std::string);
+        DBCPPP_MAKE_ITERABLE(INetwork, Nodes, INode);
+        DBCPPP_MAKE_ITERABLE(INetwork, ValueTables, IValueTable);
+        DBCPPP_MAKE_ITERABLE(INetwork, Messages, IMessage);
+        DBCPPP_MAKE_ITERABLE(INetwork, EnvironmentVariables, IEnvironmentVariable);
+        DBCPPP_MAKE_ITERABLE(INetwork, AttributeDefinitions, IAttributeDefinition);
+        DBCPPP_MAKE_ITERABLE(INetwork, AttributeDefaults, IAttribute);
+        DBCPPP_MAKE_ITERABLE(INetwork, AttributeValues, IAttribute);
+
+        virtual const IMessage* ParentMessage(const ISignal* sig) const = 0;
+
+        virtual bool operator==(const INetwork& rhs) const = 0;
+        virtual bool operator!=(const INetwork& rhs) const = 0;
+
+        void Merge(std::unique_ptr<INetwork>&& other);
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Network2Functions.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Network2Functions.h
new file mode 100644
index 0000000..c428c73
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Network2Functions.h
@@ -0,0 +1,37 @@
+
+#pragma once
+
+#include <boost/format.hpp>
+#include <ostream>
+#include <tuple>
+#include <ostream>
+
+#include "Export.h"
+#include "../../include/dbcppp/Network.h"
+
+namespace dbcppp
+{
+    namespace Network2C
+    {
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INetwork& net);
+    }
+    namespace Network2DBC
+    {
+        using na_t = std::tuple<const INetwork&, const IAttribute&>;
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const na_t& na);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IAttributeDefinition& ad);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IBitTiming& bt);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IEnvironmentVariable& ev);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IMessage& m);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INetwork& net);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INode& n);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const ISignal& s);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const ISignalType& st);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IValueTable& vt);
+    }
+    namespace Network2Human
+    {
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INetwork& net);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IMessage& msg);
+    }
+}
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Node.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Node.h
new file mode 100644
index 0000000..2203b21
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Node.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <map>
+#include <string>
+#include <memory>
+#include <functional>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Attribute.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API INode
+    {
+    public:
+        static std::unique_ptr<INode> Create(
+            std::string&& name,
+            std::string&& comment,
+            std::vector<std::unique_ptr<IAttribute>>&& attribute_values);
+            
+        virtual std::unique_ptr<INode> Clone() const = 0;
+
+        virtual ~INode() = default;
+        virtual const std::string& Name() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(INode, AttributeValues, IAttribute);
+        
+        virtual bool operator==(const dbcppp::INode& rhs) const = 0;
+        virtual bool operator!=(const dbcppp::INode& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Signal.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Signal.h
new file mode 100644
index 0000000..7097a84
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/Signal.h
@@ -0,0 +1,133 @@
+#pragma once
+
+#include <set>
+#include <map>
+#include <memory>
+#include <string>
+#include <cstddef>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Node.h"
+#include "Attribute.h"
+#include "SignalMultiplexerValue.h"
+#include "ValueEncodingDescription.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API ISignal
+    {
+    public:
+        enum class EErrorCode
+            : uint64_t
+        {
+            NoError,
+            MaschinesFloatEncodingNotSupported = 1,
+            MaschinesDoubleEncodingNotSupported = 2,
+            SignalExceedsMessageSize = 4,
+            WrongBitSizeForExtendedDataType = 8
+        };
+        enum class EMultiplexer
+        {
+            NoMux, MuxSwitch, MuxValue
+        };
+        enum class EByteOrder
+        {
+            BigEndian = 0,
+            LittleEndian = 1
+        };
+        enum class EValueType
+        {
+            Signed, Unsigned
+        };
+        enum class EExtendedValueType
+        {
+            Integer, Float, Double
+        };
+        
+        static std::unique_ptr<ISignal> Create(
+              uint64_t message_size
+            , std::string&& name
+            , EMultiplexer multiplexer_indicator
+            , uint64_t multiplexer_switch_value
+            , uint64_t start_bit
+            , uint64_t bit_size
+            , EByteOrder byte_order
+            , EValueType value_type
+            , double factor
+            , double offset
+            , double minimum
+            , double maximum
+            , std::string&& unit
+            , std::vector<std::string>&& receivers
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::vector<std::unique_ptr<IValueEncodingDescription>>&& value_encoding_description
+            , std::string&& comment
+            , EExtendedValueType extended_value_type
+            , std::vector<std::unique_ptr<ISignalMultiplexerValue>>&& signal_multiplexer_values);
+            
+        virtual std::unique_ptr<ISignal> Clone() const = 0;
+
+        virtual ~ISignal() = default;
+        virtual const std::string& Name() const = 0;
+        virtual EMultiplexer MultiplexerIndicator() const = 0;
+        virtual uint64_t MultiplexerSwitchValue() const = 0;
+        virtual uint64_t StartBit() const = 0;
+        virtual uint64_t BitSize() const = 0;
+        virtual EByteOrder ByteOrder() const = 0;
+        virtual EValueType ValueType() const = 0;
+        virtual double Factor() const = 0;
+        virtual double Offset() const = 0;
+        virtual double Minimum() const = 0;
+        virtual double Maximum() const = 0;
+        virtual const std::string& Unit() const = 0;
+        virtual const std::string& Receivers_Get(std::size_t i) const = 0;
+        virtual uint64_t Receivers_Size() const = 0;
+        virtual const IValueEncodingDescription& ValueEncodingDescriptions_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueEncodingDescriptions_Size() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        virtual EExtendedValueType ExtendedValueType() const = 0;
+        virtual const ISignalMultiplexerValue& SignalMultiplexerValues_Get(std::size_t i) const = 0;
+        virtual uint64_t SignalMultiplexerValues_Size() const = 0;
+
+        virtual bool Error(EErrorCode code) const = 0;
+        
+        virtual bool operator==(const ISignal& rhs) const = 0;
+        virtual bool operator!=(const ISignal& rhs) const = 0;
+        
+        /// \brief Extracts the raw value from a given n byte array
+        ///
+        /// This function uses a optimized method of reversing the byte order and extracting
+        /// the value from the given data.
+        /// !!! Note: This function takes at least 8 bytes and at least as many as the signal needs to be represented,
+        ///     if you pass less, the program ends up in undefined behaviour! !!!
+        ///
+        /// @param nbyte a n byte array (!!! at least 8 bytes !!!) which is representing the can data.
+        ///               the data must be in this order:
+        ///               bit_0  - bit_7:  bytes[0]
+        ///               bit_8  - bit_15: bytes[1]
+        ///               ...
+        ///               bit_n-7 - bit_n: bytes[n / 8]
+        ///               (like the Unix CAN frame does store the data)
+        using raw_t = uint64_t;
+        inline raw_t Decode(const void* bytes) const noexcept { return _decode(this, bytes); }
+        inline void Encode(raw_t raw, void* buffer) const noexcept { return _encode(this, raw, buffer); }
+
+        inline double RawToPhys(raw_t raw) const noexcept { return _raw_to_phys(this, raw); }
+        inline raw_t PhysToRaw(double phys) const noexcept { return _phys_to_raw(this, phys); }
+        
+        DBCPPP_MAKE_ITERABLE(ISignal, Receivers, std::string);
+        DBCPPP_MAKE_ITERABLE(ISignal, ValueEncodingDescriptions, IValueEncodingDescription);
+        DBCPPP_MAKE_ITERABLE(ISignal, AttributeValues, IAttribute);
+        DBCPPP_MAKE_ITERABLE(ISignal, SignalMultiplexerValues, ISignalMultiplexerValue);
+
+    protected:
+        // instead of using virtuals dynamic dispatching use function pointers
+        raw_t (*_decode)(const ISignal* sig, const void* bytes) noexcept {nullptr};
+        void (*_encode)(const ISignal* sig, raw_t raw, void* buffer) noexcept {nullptr};
+        double (*_raw_to_phys)(const ISignal* sig, raw_t raw) noexcept {nullptr};
+        raw_t (*_phys_to_raw)(const ISignal* sig, double phys) noexcept {nullptr};
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalGroup.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalGroup.h
new file mode 100644
index 0000000..cf707c2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalGroup.h
@@ -0,0 +1,37 @@
+
+#pragma once
+
+#include <vector>
+#include <string>
+#include <memory>
+#include <functional>
+
+#include "Export.h"
+#include "Iterator.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API ISignalGroup
+    {
+    public:
+        static std::unique_ptr<ISignalGroup> Create(
+              uint64_t message_id
+            , std::string&& name
+            , uint64_t repetitions
+            , std::vector<std::string>&& signal_names);
+
+        virtual std::unique_ptr<ISignalGroup> Clone() const = 0;
+
+        virtual ~ISignalGroup() = default;
+        virtual uint64_t MessageId() const = 0;
+        virtual const std::string& Name() const = 0;
+        virtual uint64_t Repetitions() const = 0;
+        virtual const std::string& SignalNames_Get(std::size_t i) const = 0;
+        virtual uint64_t SignalNames_Size() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(ISignalGroup, SignalNames, std::string);
+        
+        virtual bool operator==(const ISignalGroup& rhs) const = 0;
+        virtual bool operator!=(const ISignalGroup& rhs) const = 0;
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalMultiplexerValue.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalMultiplexerValue.h
new file mode 100644
index 0000000..5c69fa9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalMultiplexerValue.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include <string>
+#include <cstddef>
+#include <memory>
+#include <vector>
+#include <functional>
+
+#include "Iterator.h"
+
+namespace dbcppp
+{
+    class ISignalMultiplexerValue
+    {
+    public:
+        struct Range
+        {
+            std::size_t from;
+            std::size_t to;
+        };
+        
+        static std::unique_ptr<ISignalMultiplexerValue> Create(
+              std::string&& switch_name
+            , std::vector<Range>&& value_ranges);
+        
+        virtual std::unique_ptr<ISignalMultiplexerValue> Clone() const = 0;
+
+        virtual ~ISignalMultiplexerValue() = default;
+        virtual const std::string& SwitchName() const = 0;
+        virtual const Range& ValueRanges_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueRanges_Size() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(ISignalMultiplexerValue, ValueRanges, Range);
+
+        virtual bool operator==(const ISignalMultiplexerValue& rhs) const = 0;
+        virtual bool operator!=(const ISignalMultiplexerValue& rhs) const = 0;
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalType.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalType.h
new file mode 100644
index 0000000..ec5fd0c
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/SignalType.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <memory>
+
+#include "Export.h"
+#include "Signal.h"
+
+namespace dbcppp
+{
+    class ISignalType
+    {
+    public:
+        static std::unique_ptr<ISignalType> Create(
+              std::string&& name
+            , uint64_t signal_size
+            , ISignal::EByteOrder byte_order
+            , ISignal::EValueType value_type
+            , double factor
+            , double offset
+            , double minimum
+            , double maximum
+            , std::string&& unit
+            , double default_value
+            , std::string&& value_table);
+            
+        virtual std::unique_ptr<ISignalType> Clone() const = 0;
+
+        virtual ~ISignalType() = default;
+        virtual const std::string& Name() const = 0;
+        virtual uint64_t SignalSize() const = 0;
+        virtual ISignal::EByteOrder ByteOrder() const = 0;
+        virtual ISignal::EValueType ValueType() const = 0;
+        virtual double Factor() const = 0;
+        virtual double Offset() const = 0;
+        virtual double Minimum() const = 0;
+        virtual double Maximum() const = 0;
+        virtual const std::string& Unit() const = 0;
+        virtual double DefaultValue() const = 0;
+        virtual const std::string& ValueTable() const = 0;
+        
+        virtual bool operator==(const ISignalType& rhs) const = 0;
+        virtual bool operator!=(const ISignalType& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/ValueEncodingDescription.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/ValueEncodingDescription.h
new file mode 100644
index 0000000..8eecf08
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/ValueEncodingDescription.h
@@ -0,0 +1,24 @@
+
+#pragma once
+
+#include <string>
+#include <memory>
+
+#include "Export.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IValueEncodingDescription
+    {
+    public:
+        static std::unique_ptr<IValueEncodingDescription> Create(int64_t value, std::string&& description);
+        virtual std::unique_ptr<IValueEncodingDescription> Clone() const = 0;
+        virtual ~IValueEncodingDescription() = default;
+
+        virtual int64_t Value() const = 0;
+        virtual const std::string& Description() const = 0;
+
+        virtual bool operator==(const IValueEncodingDescription& rhs) const = 0;
+        virtual bool operator!=(const IValueEncodingDescription& rhs) const = 0;
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Linux/include/dbcppp/ValueTable.h b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/ValueTable.h
new file mode 100644
index 0000000..ee8212d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/dbcppp/ValueTable.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <memory>
+#include <optional>
+
+#include "Export.h"
+#include "SignalType.h"
+#include "ValueEncodingDescription.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IValueTable
+    {
+    public:
+        static std::unique_ptr<IValueTable> Create(
+              std::string&& name
+            , std::optional<std::unique_ptr<ISignalType>>&& signal_type
+            , std::vector<std::unique_ptr<IValueEncodingDescription>>&& value_encoding_descriptions);
+            
+        virtual std::unique_ptr<IValueTable> Clone() const = 0;
+
+        virtual ~IValueTable() = default;
+        virtual const std::string& Name() const = 0;
+        virtual std::optional<std::reference_wrapper<const ISignalType>> SignalType() const = 0;
+        virtual const IValueEncodingDescription& ValueEncodingDescriptions_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueEncodingDescriptions_Size() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(IValueTable, ValueEncodingDescriptions, IValueEncodingDescription);
+        
+        virtual bool operator==(const IValueTable& rhs) const = 0;
+        virtual bool operator!=(const IValueTable& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/DOCBparser.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/DOCBparser.h
new file mode 100644
index 0000000..9394fa7
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/DOCBparser.h
@@ -0,0 +1,96 @@
+/*
+ * Summary: old DocBook SGML parser
+ * Description: interface for a DocBook SGML non-verifying parser
+ * This code is DEPRECATED, and should not be used anymore.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __DOCB_PARSER_H__
+#define __DOCB_PARSER_H__
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_DOCB_ENABLED
+
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+
+#ifndef IN_LIBXML
+#ifdef __GNUC__
+#warning "The DOCBparser module has been deprecated in libxml2-2.6.0"
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Most of the back-end structures from XML and SGML are shared.
+ */
+typedef xmlParserCtxt docbParserCtxt;
+typedef xmlParserCtxtPtr docbParserCtxtPtr;
+typedef xmlSAXHandler docbSAXHandler;
+typedef xmlSAXHandlerPtr docbSAXHandlerPtr;
+typedef xmlParserInput docbParserInput;
+typedef xmlParserInputPtr docbParserInputPtr;
+typedef xmlDocPtr docbDocPtr;
+
+/*
+ * There is only few public functions.
+ */
+XMLPUBFUN int XMLCALL
+		     docbEncodeEntities(unsigned char *out,
+                                        int *outlen,
+                                        const unsigned char *in,
+                                        int *inlen, int quoteChar);
+
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbSAXParseDoc   (xmlChar *cur,
+                                        const char *encoding,
+                                        docbSAXHandlerPtr sax,
+                                        void *userData);
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbParseDoc      (xmlChar *cur,
+                                        const char *encoding);
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbSAXParseFile  (const char *filename,
+                                        const char *encoding,
+                                        docbSAXHandlerPtr sax,
+                                        void *userData);
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbParseFile     (const char *filename,
+                                        const char *encoding);
+
+/**
+ * Interfaces for the Push mode.
+ */
+XMLPUBFUN void XMLCALL
+		     docbFreeParserCtxt      (docbParserCtxtPtr ctxt);
+XMLPUBFUN docbParserCtxtPtr XMLCALL
+		     docbCreatePushParserCtxt(docbSAXHandlerPtr sax,
+                                              void *user_data,
+                                              const char *chunk,
+                                              int size,
+                                              const char *filename,
+                                              xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+		     docbParseChunk          (docbParserCtxtPtr ctxt,
+                                              const char *chunk,
+                                              int size,
+                                              int terminate);
+XMLPUBFUN docbParserCtxtPtr XMLCALL
+		     docbCreateFileParserCtxt(const char *filename,
+                                              const char *encoding);
+XMLPUBFUN int XMLCALL
+		     docbParseDocument       (docbParserCtxtPtr ctxt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_DOCB_ENABLED */
+
+#endif /* __DOCB_PARSER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/HTMLparser.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/HTMLparser.h
new file mode 100644
index 0000000..1d4fec2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/HTMLparser.h
@@ -0,0 +1,306 @@
+/*
+ * Summary: interface for an HTML 4.0 non-verifying parser
+ * Description: this module implements an HTML 4.0 non-verifying parser
+ *              with API compatible with the XML parser ones. It should
+ *              be able to parse "real world" HTML, even if severely
+ *              broken from a specification point of view.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __HTML_PARSER_H__
+#define __HTML_PARSER_H__
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+
+#ifdef LIBXML_HTML_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Most of the back-end structures from XML and HTML are shared.
+ */
+typedef xmlParserCtxt htmlParserCtxt;
+typedef xmlParserCtxtPtr htmlParserCtxtPtr;
+typedef xmlParserNodeInfo htmlParserNodeInfo;
+typedef xmlSAXHandler htmlSAXHandler;
+typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;
+typedef xmlParserInput htmlParserInput;
+typedef xmlParserInputPtr htmlParserInputPtr;
+typedef xmlDocPtr htmlDocPtr;
+typedef xmlNodePtr htmlNodePtr;
+
+/*
+ * Internal description of an HTML element, representing HTML 4.01
+ * and XHTML 1.0 (which share the same structure).
+ */
+typedef struct _htmlElemDesc htmlElemDesc;
+typedef htmlElemDesc *htmlElemDescPtr;
+struct _htmlElemDesc {
+    const char *name;	/* The tag name */
+    char startTag;      /* Whether the start tag can be implied */
+    char endTag;        /* Whether the end tag can be implied */
+    char saveEndTag;    /* Whether the end tag should be saved */
+    char empty;         /* Is this an empty element ? */
+    char depr;          /* Is this a deprecated element ? */
+    char dtd;           /* 1: only in Loose DTD, 2: only Frameset one */
+    char isinline;      /* is this a block 0 or inline 1 element */
+    const char *desc;   /* the description */
+
+/* NRK Jan.2003
+ * New fields encapsulating HTML structure
+ *
+ * Bugs:
+ *	This is a very limited representation.  It fails to tell us when
+ *	an element *requires* subelements (we only have whether they're
+ *	allowed or not), and it doesn't tell us where CDATA and PCDATA
+ *	are allowed.  Some element relationships are not fully represented:
+ *	these are flagged with the word MODIFIER
+ */
+    const char** subelts;		/* allowed sub-elements of this element */
+    const char* defaultsubelt;	/* subelement for suggested auto-repair
+					   if necessary or NULL */
+    const char** attrs_opt;		/* Optional Attributes */
+    const char** attrs_depr;		/* Additional deprecated attributes */
+    const char** attrs_req;		/* Required attributes */
+};
+
+/*
+ * Internal description of an HTML entity.
+ */
+typedef struct _htmlEntityDesc htmlEntityDesc;
+typedef htmlEntityDesc *htmlEntityDescPtr;
+struct _htmlEntityDesc {
+    unsigned int value;	/* the UNICODE value for the character */
+    const char *name;	/* The entity name */
+    const char *desc;   /* the description */
+};
+
+/*
+ * There is only few public functions.
+ */
+XMLPUBFUN const htmlElemDesc * XMLCALL
+			htmlTagLookup	(const xmlChar *tag);
+XMLPUBFUN const htmlEntityDesc * XMLCALL
+			htmlEntityLookup(const xmlChar *name);
+XMLPUBFUN const htmlEntityDesc * XMLCALL
+			htmlEntityValueLookup(unsigned int value);
+
+XMLPUBFUN int XMLCALL
+			htmlIsAutoClosed(htmlDocPtr doc,
+					 htmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+			htmlAutoCloseTag(htmlDocPtr doc,
+					 const xmlChar *name,
+					 htmlNodePtr elem);
+XMLPUBFUN const htmlEntityDesc * XMLCALL
+			htmlParseEntityRef(htmlParserCtxtPtr ctxt,
+					 const xmlChar **str);
+XMLPUBFUN int XMLCALL
+			htmlParseCharRef(htmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			htmlParseElement(htmlParserCtxtPtr ctxt);
+
+XMLPUBFUN htmlParserCtxtPtr XMLCALL
+			htmlNewParserCtxt(void);
+
+XMLPUBFUN htmlParserCtxtPtr XMLCALL
+			htmlCreateMemoryParserCtxt(const char *buffer,
+						   int size);
+
+XMLPUBFUN int XMLCALL
+			htmlParseDocument(htmlParserCtxtPtr ctxt);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlSAXParseDoc	(const xmlChar *cur,
+					 const char *encoding,
+					 htmlSAXHandlerPtr sax,
+					 void *userData);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlParseDoc	(const xmlChar *cur,
+					 const char *encoding);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlSAXParseFile(const char *filename,
+					 const char *encoding,
+					 htmlSAXHandlerPtr sax,
+					 void *userData);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlParseFile	(const char *filename,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+			UTF8ToHtml	(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen);
+XMLPUBFUN int XMLCALL
+			htmlEncodeEntities(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen, int quoteChar);
+XMLPUBFUN int XMLCALL
+			htmlIsScriptAttribute(const xmlChar *name);
+XMLPUBFUN int XMLCALL
+			htmlHandleOmittedElem(int val);
+
+#ifdef LIBXML_PUSH_ENABLED
+/**
+ * Interfaces for the Push mode.
+ */
+XMLPUBFUN htmlParserCtxtPtr XMLCALL
+			htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax,
+						 void *user_data,
+						 const char *chunk,
+						 int size,
+						 const char *filename,
+						 xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+			htmlParseChunk		(htmlParserCtxtPtr ctxt,
+						 const char *chunk,
+						 int size,
+						 int terminate);
+#endif /* LIBXML_PUSH_ENABLED */
+
+XMLPUBFUN void XMLCALL
+			htmlFreeParserCtxt	(htmlParserCtxtPtr ctxt);
+
+/*
+ * New set of simpler/more flexible APIs
+ */
+/**
+ * xmlParserOption:
+ *
+ * This is the set of XML parser options that can be passed down
+ * to the xmlReadDoc() and similar calls.
+ */
+typedef enum {
+    HTML_PARSE_RECOVER  = 1<<0, /* Relaxed parsing */
+    HTML_PARSE_NODEFDTD = 1<<2, /* do not default a doctype if not found */
+    HTML_PARSE_NOERROR	= 1<<5,	/* suppress error reports */
+    HTML_PARSE_NOWARNING= 1<<6,	/* suppress warning reports */
+    HTML_PARSE_PEDANTIC	= 1<<7,	/* pedantic error reporting */
+    HTML_PARSE_NOBLANKS	= 1<<8,	/* remove blank nodes */
+    HTML_PARSE_NONET	= 1<<11,/* Forbid network access */
+    HTML_PARSE_NOIMPLIED= 1<<13,/* Do not add implied html/body... elements */
+    HTML_PARSE_COMPACT  = 1<<16,/* compact small text nodes */
+    HTML_PARSE_IGNORE_ENC=1<<21 /* ignore internal document encoding hint */
+} htmlParserOption;
+
+XMLPUBFUN void XMLCALL
+		htmlCtxtReset		(htmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		htmlCtxtUseOptions	(htmlParserCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadDoc		(const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadFile		(const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadMemory		(const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadFd		(int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadIO		(xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadDoc		(xmlParserCtxtPtr ctxt,
+					 const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadFile		(xmlParserCtxtPtr ctxt,
+					 const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadMemory		(xmlParserCtxtPtr ctxt,
+					 const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadFd		(xmlParserCtxtPtr ctxt,
+					 int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadIO		(xmlParserCtxtPtr ctxt,
+					 xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+
+/* NRK/Jan2003: further knowledge of HTML structure
+ */
+typedef enum {
+  HTML_NA = 0 ,		/* something we don't check at all */
+  HTML_INVALID = 0x1 ,
+  HTML_DEPRECATED = 0x2 ,
+  HTML_VALID = 0x4 ,
+  HTML_REQUIRED = 0xc /* VALID bit set so ( & HTML_VALID ) is TRUE */
+} htmlStatus ;
+
+/* Using htmlElemDesc rather than name here, to emphasise the fact
+   that otherwise there's a lookup overhead
+*/
+XMLPUBFUN htmlStatus XMLCALL htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int) ;
+XMLPUBFUN int XMLCALL htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ;
+XMLPUBFUN htmlStatus XMLCALL htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ;
+XMLPUBFUN htmlStatus XMLCALL htmlNodeStatus(const htmlNodePtr, int) ;
+/**
+ * htmlDefaultSubelement:
+ * @elt: HTML element
+ *
+ * Returns the default subelement for this element
+ */
+#define htmlDefaultSubelement(elt) elt->defaultsubelt
+/**
+ * htmlElementAllowedHereDesc:
+ * @parent: HTML parent element
+ * @elt: HTML element
+ *
+ * Checks whether an HTML element description may be a
+ * direct child of the specified element.
+ *
+ * Returns 1 if allowed; 0 otherwise.
+ */
+#define htmlElementAllowedHereDesc(parent,elt) \
+	htmlElementAllowedHere((parent), (elt)->name)
+/**
+ * htmlRequiredAttrs:
+ * @elt: HTML element
+ *
+ * Returns the attributes required for the specified element.
+ */
+#define htmlRequiredAttrs(elt) (elt)->attrs_req
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_HTML_ENABLED */
+#endif /* __HTML_PARSER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/HTMLtree.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/HTMLtree.h
new file mode 100644
index 0000000..c0e1103
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/HTMLtree.h
@@ -0,0 +1,147 @@
+/*
+ * Summary: specific APIs to process HTML tree, especially serialization
+ * Description: this module implements a few function needed to process
+ *              tree in an HTML specific way.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __HTML_TREE_H__
+#define __HTML_TREE_H__
+
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/HTMLparser.h>
+
+#ifdef LIBXML_HTML_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * HTML_TEXT_NODE:
+ *
+ * Macro. A text node in a HTML document is really implemented
+ * the same way as a text node in an XML document.
+ */
+#define HTML_TEXT_NODE		XML_TEXT_NODE
+/**
+ * HTML_ENTITY_REF_NODE:
+ *
+ * Macro. An entity reference in a HTML document is really implemented
+ * the same way as an entity reference in an XML document.
+ */
+#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE
+/**
+ * HTML_COMMENT_NODE:
+ *
+ * Macro. A comment in a HTML document is really implemented
+ * the same way as a comment in an XML document.
+ */
+#define HTML_COMMENT_NODE	XML_COMMENT_NODE
+/**
+ * HTML_PRESERVE_NODE:
+ *
+ * Macro. A preserved node in a HTML document is really implemented
+ * the same way as a CDATA section in an XML document.
+ */
+#define HTML_PRESERVE_NODE	XML_CDATA_SECTION_NODE
+/**
+ * HTML_PI_NODE:
+ *
+ * Macro. A processing instruction in a HTML document is really implemented
+ * the same way as a processing instruction in an XML document.
+ */
+#define HTML_PI_NODE		XML_PI_NODE
+
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlNewDoc		(const xmlChar *URI,
+					 const xmlChar *ExternalID);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlNewDocNoDtD		(const xmlChar *URI,
+					 const xmlChar *ExternalID);
+XMLPUBFUN const xmlChar * XMLCALL
+		htmlGetMetaEncoding	(htmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		htmlSetMetaEncoding	(htmlDocPtr doc,
+					 const xmlChar *encoding);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		htmlDocDumpMemory	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size);
+XMLPUBFUN void XMLCALL
+		htmlDocDumpMemoryFormat	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size,
+					 int format);
+XMLPUBFUN int XMLCALL
+		htmlDocDump		(FILE *f,
+					 xmlDocPtr cur);
+XMLPUBFUN int XMLCALL
+		htmlSaveFile		(const char *filename,
+					 xmlDocPtr cur);
+XMLPUBFUN int XMLCALL
+		htmlNodeDump		(xmlBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
+XMLPUBFUN void XMLCALL
+		htmlNodeDumpFile	(FILE *out,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
+XMLPUBFUN int XMLCALL
+		htmlNodeDumpFileFormat	(FILE *out,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 const char *encoding,
+					 int format);
+XMLPUBFUN int XMLCALL
+		htmlSaveFileEnc		(const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+		htmlSaveFileFormat	(const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding,
+					 int format);
+
+XMLPUBFUN void XMLCALL
+		htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 const char *encoding,
+					 int format);
+XMLPUBFUN void XMLCALL
+		htmlDocContentDumpOutput(xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+					 const char *encoding);
+XMLPUBFUN void XMLCALL
+		htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+					 const char *encoding,
+					 int format);
+XMLPUBFUN void XMLCALL
+		htmlNodeDumpOutput	(xmlOutputBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 const char *encoding);
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+XMLPUBFUN int XMLCALL
+		htmlIsBooleanAttr	(const xmlChar *name);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_HTML_ENABLED */
+
+#endif /* __HTML_TREE_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/SAX.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/SAX.h
new file mode 100644
index 0000000..20093ce
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/SAX.h
@@ -0,0 +1,173 @@
+/*
+ * Summary: Old SAX version 1 handler, deprecated
+ * Description: DEPRECATED set of SAX version 1 interfaces used to
+ *              build the DOM tree.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SAX_H__
+#define __XML_SAX_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/xlink.h>
+
+#ifdef LIBXML_LEGACY_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN const xmlChar * XMLCALL
+		getPublicId			(void *ctx);
+XMLPUBFUN const xmlChar * XMLCALL
+		getSystemId			(void *ctx);
+XMLPUBFUN void XMLCALL
+		setDocumentLocator		(void *ctx,
+						 xmlSAXLocatorPtr loc);
+
+XMLPUBFUN int XMLCALL
+		getLineNumber			(void *ctx);
+XMLPUBFUN int XMLCALL
+		getColumnNumber			(void *ctx);
+
+XMLPUBFUN int XMLCALL
+		isStandalone			(void *ctx);
+XMLPUBFUN int XMLCALL
+		hasInternalSubset		(void *ctx);
+XMLPUBFUN int XMLCALL
+		hasExternalSubset		(void *ctx);
+
+XMLPUBFUN void XMLCALL
+		internalSubset			(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN void XMLCALL
+		externalSubset			(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		getEntity			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		getParameterEntity		(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		resolveEntity			(void *ctx,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+
+XMLPUBFUN void XMLCALL
+		entityDecl			(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 xmlChar *content);
+XMLPUBFUN void XMLCALL
+		attributeDecl			(void *ctx,
+						 const xmlChar *elem,
+						 const xmlChar *fullname,
+						 int type,
+						 int def,
+						 const xmlChar *defaultValue,
+						 xmlEnumerationPtr tree);
+XMLPUBFUN void XMLCALL
+		elementDecl			(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		notationDecl			(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+XMLPUBFUN void XMLCALL
+		unparsedEntityDecl		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 const xmlChar *notationName);
+
+XMLPUBFUN void XMLCALL
+		startDocument			(void *ctx);
+XMLPUBFUN void XMLCALL
+		endDocument			(void *ctx);
+XMLPUBFUN void XMLCALL
+		attribute			(void *ctx,
+						 const xmlChar *fullname,
+						 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		startElement			(void *ctx,
+						 const xmlChar *fullname,
+						 const xmlChar **atts);
+XMLPUBFUN void XMLCALL
+		endElement			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		reference			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		characters			(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		ignorableWhitespace		(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		processingInstruction		(void *ctx,
+						 const xmlChar *target,
+						 const xmlChar *data);
+XMLPUBFUN void XMLCALL
+		globalNamespace			(void *ctx,
+						 const xmlChar *href,
+						 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		setNamespace			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlNsPtr XMLCALL
+		getNamespace			(void *ctx);
+XMLPUBFUN int XMLCALL
+		checkNamespace			(void *ctx,
+						 xmlChar *nameSpace);
+XMLPUBFUN void XMLCALL
+		namespaceDecl			(void *ctx,
+						 const xmlChar *href,
+						 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		comment				(void *ctx,
+						 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		cdataBlock			(void *ctx,
+						 const xmlChar *value,
+						 int len);
+
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN void XMLCALL
+		initxmlDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr,
+						 int warning);
+#ifdef LIBXML_HTML_ENABLED
+XMLPUBFUN void XMLCALL
+		inithtmlDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr);
+#endif
+#ifdef LIBXML_DOCB_ENABLED
+XMLPUBFUN void XMLCALL
+		initdocbDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr);
+#endif
+#endif /* LIBXML_SAX1_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_LEGACY_ENABLED */
+
+#endif /* __XML_SAX_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/SAX2.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/SAX2.h
new file mode 100644
index 0000000..a55212e
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/SAX2.h
@@ -0,0 +1,178 @@
+/*
+ * Summary: SAX2 parser interface used to build the DOM tree
+ * Description: those are the default SAX2 interfaces used by
+ *              the library when building DOM tree.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SAX2_H__
+#define __XML_SAX2_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/xlink.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSAX2GetPublicId		(void *ctx);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSAX2GetSystemId		(void *ctx);
+XMLPUBFUN void XMLCALL
+		xmlSAX2SetDocumentLocator	(void *ctx,
+						 xmlSAXLocatorPtr loc);
+
+XMLPUBFUN int XMLCALL
+		xmlSAX2GetLineNumber		(void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSAX2GetColumnNumber		(void *ctx);
+
+XMLPUBFUN int XMLCALL
+		xmlSAX2IsStandalone		(void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSAX2HasInternalSubset	(void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSAX2HasExternalSubset	(void *ctx);
+
+XMLPUBFUN void XMLCALL
+		xmlSAX2InternalSubset		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN void XMLCALL
+		xmlSAX2ExternalSubset		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		xmlSAX2GetEntity		(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		xmlSAX2GetParameterEntity	(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		xmlSAX2ResolveEntity		(void *ctx,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+
+XMLPUBFUN void XMLCALL
+		xmlSAX2EntityDecl		(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 xmlChar *content);
+XMLPUBFUN void XMLCALL
+		xmlSAX2AttributeDecl		(void *ctx,
+						 const xmlChar *elem,
+						 const xmlChar *fullname,
+						 int type,
+						 int def,
+						 const xmlChar *defaultValue,
+						 xmlEnumerationPtr tree);
+XMLPUBFUN void XMLCALL
+		xmlSAX2ElementDecl		(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		xmlSAX2NotationDecl		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+XMLPUBFUN void XMLCALL
+		xmlSAX2UnparsedEntityDecl	(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 const xmlChar *notationName);
+
+XMLPUBFUN void XMLCALL
+		xmlSAX2StartDocument		(void *ctx);
+XMLPUBFUN void XMLCALL
+		xmlSAX2EndDocument		(void *ctx);
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || \
+    defined(LIBXML_LEGACY_ENABLED)
+XMLPUBFUN void XMLCALL
+		xmlSAX2StartElement		(void *ctx,
+						 const xmlChar *fullname,
+						 const xmlChar **atts);
+XMLPUBFUN void XMLCALL
+		xmlSAX2EndElement		(void *ctx,
+						 const xmlChar *name);
+#endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED or LIBXML_LEGACY_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlSAX2StartElementNs		(void *ctx,
+						 const xmlChar *localname,
+						 const xmlChar *prefix,
+						 const xmlChar *URI,
+						 int nb_namespaces,
+						 const xmlChar **namespaces,
+						 int nb_attributes,
+						 int nb_defaulted,
+						 const xmlChar **attributes);
+XMLPUBFUN void XMLCALL
+		xmlSAX2EndElementNs		(void *ctx,
+						 const xmlChar *localname,
+						 const xmlChar *prefix,
+						 const xmlChar *URI);
+XMLPUBFUN void XMLCALL
+		xmlSAX2Reference		(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		xmlSAX2Characters		(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		xmlSAX2IgnorableWhitespace	(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		xmlSAX2ProcessingInstruction	(void *ctx,
+						 const xmlChar *target,
+						 const xmlChar *data);
+XMLPUBFUN void XMLCALL
+		xmlSAX2Comment			(void *ctx,
+						 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		xmlSAX2CDataBlock		(void *ctx,
+						 const xmlChar *value,
+						 int len);
+
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlSAXDefaultVersion		(int version);
+#endif /* LIBXML_SAX1_ENABLED */
+
+XMLPUBFUN int XMLCALL
+		xmlSAXVersion			(xmlSAXHandler *hdlr,
+						 int version);
+XMLPUBFUN void XMLCALL
+		xmlSAX2InitDefaultSAXHandler    (xmlSAXHandler *hdlr,
+						 int warning);
+#ifdef LIBXML_HTML_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlSAX2InitHtmlDefaultSAXHandler(xmlSAXHandler *hdlr);
+XMLPUBFUN void XMLCALL
+		htmlDefaultSAXHandlerInit	(void);
+#endif
+#ifdef LIBXML_DOCB_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlSAX2InitDocbDefaultSAXHandler(xmlSAXHandler *hdlr);
+XMLPUBFUN void XMLCALL
+		docbDefaultSAXHandlerInit	(void);
+#endif
+XMLPUBFUN void XMLCALL
+		xmlDefaultSAXHandlerInit	(void);
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_SAX2_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/c14n.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/c14n.h
new file mode 100644
index 0000000..af93de6
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/c14n.h
@@ -0,0 +1,128 @@
+/*
+ * Summary: Provide Canonical XML and Exclusive XML Canonicalization
+ * Description: the c14n modules provides a
+ *
+ * "Canonical XML" implementation
+ * http://www.w3.org/TR/xml-c14n
+ *
+ * and an
+ *
+ * "Exclusive XML Canonicalization" implementation
+ * http://www.w3.org/TR/xml-exc-c14n
+
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Aleksey Sanin <aleksey@aleksey.com>
+ */
+#ifndef __XML_C14N_H__
+#define __XML_C14N_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_C14N_ENABLED
+#ifdef LIBXML_OUTPUT_ENABLED
+
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*
+ * XML Canonicalization
+ * http://www.w3.org/TR/xml-c14n
+ *
+ * Exclusive XML Canonicalization
+ * http://www.w3.org/TR/xml-exc-c14n
+ *
+ * Canonical form of an XML document could be created if and only if
+ *  a) default attributes (if any) are added to all nodes
+ *  b) all character and parsed entity references are resolved
+ * In order to achieve this in libxml2 the document MUST be loaded with
+ * following global settings:
+ *
+ *    xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
+ *    xmlSubstituteEntitiesDefault(1);
+ *
+ * or corresponding parser context setting:
+ *    xmlParserCtxtPtr ctxt;
+ *
+ *    ...
+ *    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
+ *    ctxt->replaceEntities = 1;
+ *    ...
+ */
+
+/*
+ * xmlC14NMode:
+ *
+ * Predefined values for C14N modes
+ *
+ */
+typedef enum {
+    XML_C14N_1_0            = 0,    /* Original C14N 1.0 spec */
+    XML_C14N_EXCLUSIVE_1_0  = 1,    /* Exclusive C14N 1.0 spec */
+    XML_C14N_1_1            = 2     /* C14N 1.1 spec */
+} xmlC14NMode;
+
+XMLPUBFUN int XMLCALL
+		xmlC14NDocSaveTo	(xmlDocPtr doc,
+					 xmlNodeSetPtr nodes,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 xmlOutputBufferPtr buf);
+
+XMLPUBFUN int XMLCALL
+		xmlC14NDocDumpMemory	(xmlDocPtr doc,
+					 xmlNodeSetPtr nodes,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 xmlChar **doc_txt_ptr);
+
+XMLPUBFUN int XMLCALL
+		xmlC14NDocSave		(xmlDocPtr doc,
+					 xmlNodeSetPtr nodes,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 const char* filename,
+					 int compression);
+
+
+/**
+ * This is the core C14N function
+ */
+/**
+ * xmlC14NIsVisibleCallback:
+ * @user_data: user data
+ * @node: the current node
+ * @parent: the parent node
+ *
+ * Signature for a C14N callback on visible nodes
+ *
+ * Returns 1 if the node should be included
+ */
+typedef int (*xmlC14NIsVisibleCallback)	(void* user_data,
+					 xmlNodePtr node,
+					 xmlNodePtr parent);
+
+XMLPUBFUN int XMLCALL
+		xmlC14NExecute		(xmlDocPtr doc,
+					 xmlC14NIsVisibleCallback is_visible_callback,
+					 void* user_data,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 xmlOutputBufferPtr buf);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+#endif /* LIBXML_C14N_ENABLED */
+#endif /* __XML_C14N_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/catalog.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/catalog.h
new file mode 100644
index 0000000..26b178d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/catalog.h
@@ -0,0 +1,182 @@
+/**
+ * Summary: interfaces to the Catalog handling system
+ * Description: the catalog module implements the support for
+ * XML Catalogs and SGML catalogs
+ *
+ * SGML Open Technical Resolution TR9401:1997.
+ * http://www.jclark.com/sp/catalog.htm
+ *
+ * XML Catalogs Working Draft 06 August 2001
+ * http://www.oasis-open.org/committees/entity/spec-2001-08-06.html
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_CATALOG_H__
+#define __XML_CATALOG_H__
+
+#include <stdio.h>
+
+#include <libxml/xmlversion.h>
+#include <libxml/xmlstring.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_CATALOG_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * XML_CATALOGS_NAMESPACE:
+ *
+ * The namespace for the XML Catalogs elements.
+ */
+#define XML_CATALOGS_NAMESPACE					\
+    (const xmlChar *) "urn:oasis:names:tc:entity:xmlns:xml:catalog"
+/**
+ * XML_CATALOG_PI:
+ *
+ * The specific XML Catalog Processing Instruction name.
+ */
+#define XML_CATALOG_PI						\
+    (const xmlChar *) "oasis-xml-catalog"
+
+/*
+ * The API is voluntarily limited to general cataloging.
+ */
+typedef enum {
+    XML_CATA_PREFER_NONE = 0,
+    XML_CATA_PREFER_PUBLIC = 1,
+    XML_CATA_PREFER_SYSTEM
+} xmlCatalogPrefer;
+
+typedef enum {
+    XML_CATA_ALLOW_NONE = 0,
+    XML_CATA_ALLOW_GLOBAL = 1,
+    XML_CATA_ALLOW_DOCUMENT = 2,
+    XML_CATA_ALLOW_ALL = 3
+} xmlCatalogAllow;
+
+typedef struct _xmlCatalog xmlCatalog;
+typedef xmlCatalog *xmlCatalogPtr;
+
+/*
+ * Operations on a given catalog.
+ */
+XMLPUBFUN xmlCatalogPtr XMLCALL
+		xmlNewCatalog		(int sgml);
+XMLPUBFUN xmlCatalogPtr XMLCALL
+		xmlLoadACatalog		(const char *filename);
+XMLPUBFUN xmlCatalogPtr XMLCALL
+		xmlLoadSGMLSuperCatalog	(const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlConvertSGMLCatalog	(xmlCatalogPtr catal);
+XMLPUBFUN int XMLCALL
+		xmlACatalogAdd		(xmlCatalogPtr catal,
+					 const xmlChar *type,
+					 const xmlChar *orig,
+					 const xmlChar *replace);
+XMLPUBFUN int XMLCALL
+		xmlACatalogRemove	(xmlCatalogPtr catal,
+					 const xmlChar *value);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolve	(xmlCatalogPtr catal,
+					 const xmlChar *pubID,
+	                                 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolveSystem(xmlCatalogPtr catal,
+					 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolvePublic(xmlCatalogPtr catal,
+					 const xmlChar *pubID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolveURI	(xmlCatalogPtr catal,
+					 const xmlChar *URI);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlACatalogDump		(xmlCatalogPtr catal,
+					 FILE *out);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeCatalog		(xmlCatalogPtr catal);
+XMLPUBFUN int XMLCALL
+		xmlCatalogIsEmpty	(xmlCatalogPtr catal);
+
+/*
+ * Global operations.
+ */
+XMLPUBFUN void XMLCALL
+		xmlInitializeCatalog	(void);
+XMLPUBFUN int XMLCALL
+		xmlLoadCatalog		(const char *filename);
+XMLPUBFUN void XMLCALL
+		xmlLoadCatalogs		(const char *paths);
+XMLPUBFUN void XMLCALL
+		xmlCatalogCleanup	(void);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlCatalogDump		(FILE *out);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolve	(const xmlChar *pubID,
+	                                 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolveSystem	(const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolvePublic	(const xmlChar *pubID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolveURI	(const xmlChar *URI);
+XMLPUBFUN int XMLCALL
+		xmlCatalogAdd		(const xmlChar *type,
+					 const xmlChar *orig,
+					 const xmlChar *replace);
+XMLPUBFUN int XMLCALL
+		xmlCatalogRemove	(const xmlChar *value);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseCatalogFile	(const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlCatalogConvert	(void);
+
+/*
+ * Strictly minimal interfaces for per-document catalogs used
+ * by the parser.
+ */
+XMLPUBFUN void XMLCALL
+		xmlCatalogFreeLocal	(void *catalogs);
+XMLPUBFUN void * XMLCALL
+		xmlCatalogAddLocal	(void *catalogs,
+					 const xmlChar *URL);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogLocalResolve	(void *catalogs,
+					 const xmlChar *pubID,
+	                                 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogLocalResolveURI(void *catalogs,
+					 const xmlChar *URI);
+/*
+ * Preference settings.
+ */
+XMLPUBFUN int XMLCALL
+		xmlCatalogSetDebug	(int level);
+XMLPUBFUN xmlCatalogPrefer XMLCALL
+		xmlCatalogSetDefaultPrefer(xmlCatalogPrefer prefer);
+XMLPUBFUN void XMLCALL
+		xmlCatalogSetDefaults	(xmlCatalogAllow allow);
+XMLPUBFUN xmlCatalogAllow XMLCALL
+		xmlCatalogGetDefaults	(void);
+
+
+/* DEPRECATED interfaces */
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlCatalogGetSystem	(const xmlChar *sysID);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlCatalogGetPublic	(const xmlChar *pubID);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* LIBXML_CATALOG_ENABLED */
+#endif /* __XML_CATALOG_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/chvalid.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/chvalid.h
new file mode 100644
index 0000000..fb43016
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/chvalid.h
@@ -0,0 +1,230 @@
+/*
+ * Summary: Unicode character range checking
+ * Description: this module exports interfaces for the character
+ *               range validation APIs
+ *
+ * This file is automatically generated from the cvs source
+ * definition files using the genChRanges.py Python script
+ *
+ * Generation date: Mon Mar 27 11:09:48 2006
+ * Sources: chvalid.def
+ * Author: William Brack <wbrack@mmm.com.hk>
+ */
+
+#ifndef __XML_CHVALID_H__
+#define __XML_CHVALID_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Define our typedefs and structures
+ *
+ */
+typedef struct _xmlChSRange xmlChSRange;
+typedef xmlChSRange *xmlChSRangePtr;
+struct _xmlChSRange {
+    unsigned short	low;
+    unsigned short	high;
+};
+
+typedef struct _xmlChLRange xmlChLRange;
+typedef xmlChLRange *xmlChLRangePtr;
+struct _xmlChLRange {
+    unsigned int	low;
+    unsigned int	high;
+};
+
+typedef struct _xmlChRangeGroup xmlChRangeGroup;
+typedef xmlChRangeGroup *xmlChRangeGroupPtr;
+struct _xmlChRangeGroup {
+    int			nbShortRange;
+    int			nbLongRange;
+    const xmlChSRange	*shortRange;	/* points to an array of ranges */
+    const xmlChLRange	*longRange;
+};
+
+/**
+ * Range checking routine
+ */
+XMLPUBFUN int XMLCALL
+		xmlCharInRange(unsigned int val, const xmlChRangeGroup *group);
+
+
+/**
+ * xmlIsBaseChar_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBaseChar_ch(c)	(((0x41 <= (c)) && ((c) <= 0x5a)) || \
+				 ((0x61 <= (c)) && ((c) <= 0x7a)) || \
+				 ((0xc0 <= (c)) && ((c) <= 0xd6)) || \
+				 ((0xd8 <= (c)) && ((c) <= 0xf6)) || \
+				  (0xf8 <= (c)))
+
+/**
+ * xmlIsBaseCharQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBaseCharQ(c)	(((c) < 0x100) ? \
+				 xmlIsBaseChar_ch((c)) : \
+				 xmlCharInRange((c), &xmlIsBaseCharGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsBaseCharGroup;
+
+/**
+ * xmlIsBlank_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBlank_ch(c)	(((c) == 0x20) || \
+				 ((0x9 <= (c)) && ((c) <= 0xa)) || \
+				 ((c) == 0xd))
+
+/**
+ * xmlIsBlankQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBlankQ(c)		(((c) < 0x100) ? \
+				 xmlIsBlank_ch((c)) : 0)
+
+
+/**
+ * xmlIsChar_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsChar_ch(c)		(((0x9 <= (c)) && ((c) <= 0xa)) || \
+				 ((c) == 0xd) || \
+				  (0x20 <= (c)))
+
+/**
+ * xmlIsCharQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsCharQ(c)		(((c) < 0x100) ? \
+				 xmlIsChar_ch((c)) :\
+				(((0x100 <= (c)) && ((c) <= 0xd7ff)) || \
+				 ((0xe000 <= (c)) && ((c) <= 0xfffd)) || \
+				 ((0x10000 <= (c)) && ((c) <= 0x10ffff))))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsCharGroup;
+
+/**
+ * xmlIsCombiningQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsCombiningQ(c)	(((c) < 0x100) ? \
+				 0 : \
+				 xmlCharInRange((c), &xmlIsCombiningGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsCombiningGroup;
+
+/**
+ * xmlIsDigit_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsDigit_ch(c)	(((0x30 <= (c)) && ((c) <= 0x39)))
+
+/**
+ * xmlIsDigitQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsDigitQ(c)		(((c) < 0x100) ? \
+				 xmlIsDigit_ch((c)) : \
+				 xmlCharInRange((c), &xmlIsDigitGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsDigitGroup;
+
+/**
+ * xmlIsExtender_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsExtender_ch(c)	(((c) == 0xb7))
+
+/**
+ * xmlIsExtenderQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsExtenderQ(c)	(((c) < 0x100) ? \
+				 xmlIsExtender_ch((c)) : \
+				 xmlCharInRange((c), &xmlIsExtenderGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsExtenderGroup;
+
+/**
+ * xmlIsIdeographicQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsIdeographicQ(c)	(((c) < 0x100) ? \
+				 0 :\
+				(((0x4e00 <= (c)) && ((c) <= 0x9fa5)) || \
+				 ((c) == 0x3007) || \
+				 ((0x3021 <= (c)) && ((c) <= 0x3029))))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsIdeographicGroup;
+XMLPUBVAR const unsigned char xmlIsPubidChar_tab[256];
+
+/**
+ * xmlIsPubidChar_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsPubidChar_ch(c)	(xmlIsPubidChar_tab[(c)])
+
+/**
+ * xmlIsPubidCharQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsPubidCharQ(c)	(((c) < 0x100) ? \
+				 xmlIsPubidChar_ch((c)) : 0)
+
+XMLPUBFUN int XMLCALL
+		xmlIsBaseChar(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsBlank(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsChar(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsCombining(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsDigit(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsExtender(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsIdeographic(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsPubidChar(unsigned int ch);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_CHVALID_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/debugXML.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/debugXML.h
new file mode 100644
index 0000000..5b3be13
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/debugXML.h
@@ -0,0 +1,217 @@
+/*
+ * Summary: Tree debugging APIs
+ * Description: Interfaces to a set of routines used for debugging the tree
+ *              produced by the XML parser.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __DEBUG_XML__
+#define __DEBUG_XML__
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_DEBUG_ENABLED
+
+#include <libxml/xpath.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The standard Dump routines.
+ */
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpString	(FILE *output,
+				 const xmlChar *str);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpAttr	(FILE *output,
+				 xmlAttrPtr attr,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpAttrList	(FILE *output,
+				 xmlAttrPtr attr,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpOneNode	(FILE *output,
+				 xmlNodePtr node,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpNode	(FILE *output,
+				 xmlNodePtr node,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpNodeList	(FILE *output,
+				 xmlNodePtr node,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpDocumentHead(FILE *output,
+				 xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpDocument	(FILE *output,
+				 xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpDTD		(FILE *output,
+				 xmlDtdPtr dtd);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpEntities	(FILE *output,
+				 xmlDocPtr doc);
+
+/****************************************************************
+ *								*
+ *			Checking routines			*
+ *								*
+ ****************************************************************/
+
+XMLPUBFUN int XMLCALL
+	xmlDebugCheckDocument	(FILE * output,
+				 xmlDocPtr doc);
+
+/****************************************************************
+ *								*
+ *			XML shell helpers			*
+ *								*
+ ****************************************************************/
+
+XMLPUBFUN void XMLCALL
+	xmlLsOneNode		(FILE *output, xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+	xmlLsCountNode		(xmlNodePtr node);
+
+XMLPUBFUN const char * XMLCALL
+	xmlBoolToText		(int boolval);
+
+/****************************************************************
+ *								*
+ *	 The XML shell related structures and functions		*
+ *								*
+ ****************************************************************/
+
+#ifdef LIBXML_XPATH_ENABLED
+/**
+ * xmlShellReadlineFunc:
+ * @prompt:  a string prompt
+ *
+ * This is a generic signature for the XML shell input function.
+ *
+ * Returns a string which will be freed by the Shell.
+ */
+typedef char * (* xmlShellReadlineFunc)(char *prompt);
+
+/**
+ * xmlShellCtxt:
+ *
+ * A debugging shell context.
+ * TODO: add the defined function tables.
+ */
+typedef struct _xmlShellCtxt xmlShellCtxt;
+typedef xmlShellCtxt *xmlShellCtxtPtr;
+struct _xmlShellCtxt {
+    char *filename;
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    xmlXPathContextPtr pctxt;
+    int loaded;
+    FILE *output;
+    xmlShellReadlineFunc input;
+};
+
+/**
+ * xmlShellCmd:
+ * @ctxt:  a shell context
+ * @arg:  a string argument
+ * @node:  a first node
+ * @node2:  a second node
+ *
+ * This is a generic signature for the XML shell functions.
+ *
+ * Returns an int, negative returns indicating errors.
+ */
+typedef int (* xmlShellCmd) (xmlShellCtxtPtr ctxt,
+                             char *arg,
+			     xmlNodePtr node,
+			     xmlNodePtr node2);
+
+XMLPUBFUN void XMLCALL
+	xmlShellPrintXPathError	(int errorType,
+				 const char *arg);
+XMLPUBFUN void XMLCALL
+	xmlShellPrintXPathResult(xmlXPathObjectPtr list);
+XMLPUBFUN int XMLCALL
+	xmlShellList		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellBase		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellDir		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellLoad		(xmlShellCtxtPtr ctxt,
+				 char *filename,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+	xmlShellPrintNode	(xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+	xmlShellCat		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellWrite		(xmlShellCtxtPtr ctxt,
+				 char *filename,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellSave		(xmlShellCtxtPtr ctxt,
+				 char *filename,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+#endif /* LIBXML_OUTPUT_ENABLED */
+#ifdef LIBXML_VALID_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlShellValidate	(xmlShellCtxtPtr ctxt,
+				 char *dtd,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+#endif /* LIBXML_VALID_ENABLED */
+XMLPUBFUN int XMLCALL
+	xmlShellDu		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr tree,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellPwd		(xmlShellCtxtPtr ctxt,
+				 char *buffer,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+
+/*
+ * The Shell interface.
+ */
+XMLPUBFUN void XMLCALL
+	xmlShell		(xmlDocPtr doc,
+				 char *filename,
+				 xmlShellReadlineFunc input,
+				 FILE *output);
+
+#endif /* LIBXML_XPATH_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_DEBUG_ENABLED */
+#endif /* __DEBUG_XML__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/dict.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/dict.h
new file mode 100644
index 0000000..cf54af1
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/dict.h
@@ -0,0 +1,79 @@
+/*
+ * Summary: string dictionary
+ * Description: dictionary of reusable strings, just used to avoid allocation
+ *         and freeing operations.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_DICT_H__
+#define __XML_DICT_H__
+
+#include <stddef.h>
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The dictionary.
+ */
+typedef struct _xmlDict xmlDict;
+typedef xmlDict *xmlDictPtr;
+
+/*
+ * Initializer
+ */
+XMLPUBFUN int XMLCALL  xmlInitializeDict(void);
+
+/*
+ * Constructor and destructor.
+ */
+XMLPUBFUN xmlDictPtr XMLCALL
+			xmlDictCreate	(void);
+XMLPUBFUN size_t XMLCALL
+			xmlDictSetLimit	(xmlDictPtr dict,
+                                         size_t limit);
+XMLPUBFUN size_t XMLCALL
+			xmlDictGetUsage (xmlDictPtr dict);
+XMLPUBFUN xmlDictPtr XMLCALL
+			xmlDictCreateSub(xmlDictPtr sub);
+XMLPUBFUN int XMLCALL
+			xmlDictReference(xmlDictPtr dict);
+XMLPUBFUN void XMLCALL
+			xmlDictFree	(xmlDictPtr dict);
+
+/*
+ * Lookup of entry in the dictionary.
+ */
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlDictLookup	(xmlDictPtr dict,
+		                         const xmlChar *name,
+		                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlDictExists	(xmlDictPtr dict,
+		                         const xmlChar *name,
+		                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlDictQLookup	(xmlDictPtr dict,
+		                         const xmlChar *prefix,
+		                         const xmlChar *name);
+XMLPUBFUN int XMLCALL
+			xmlDictOwns	(xmlDictPtr dict,
+					 const xmlChar *str);
+XMLPUBFUN int XMLCALL
+			xmlDictSize	(xmlDictPtr dict);
+
+/*
+ * Cleanup function
+ */
+XMLPUBFUN void XMLCALL
+                        xmlDictCleanup  (void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* ! __XML_DICT_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/encoding.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/encoding.h
new file mode 100644
index 0000000..c875af6
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/encoding.h
@@ -0,0 +1,245 @@
+/*
+ * Summary: interface for the encoding conversion functions
+ * Description: interface for the encoding conversion functions needed for
+ *              XML basic encoding and iconv() support.
+ *
+ * Related specs are
+ * rfc2044        (UTF-8 and UTF-16) F. Yergeau Alis Technologies
+ * [ISO-10646]    UTF-8 and UTF-16 in Annexes
+ * [ISO-8859-1]   ISO Latin-1 characters codes.
+ * [UNICODE]      The Unicode Consortium, "The Unicode Standard --
+ *                Worldwide Character Encoding -- Version 1.0", Addison-
+ *                Wesley, Volume 1, 1991, Volume 2, 1992.  UTF-8 is
+ *                described in Unicode Technical Report #4.
+ * [US-ASCII]     Coded Character Set--7-bit American Standard Code for
+ *                Information Interchange, ANSI X3.4-1986.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_CHAR_ENCODING_H__
+#define __XML_CHAR_ENCODING_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_ICONV_ENABLED
+#include <iconv.h>
+#endif
+#ifdef LIBXML_ICU_ENABLED
+#include <unicode/ucnv.h>
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * xmlCharEncoding:
+ *
+ * Predefined values for some standard encodings.
+ * Libxml does not do beforehand translation on UTF8 and ISOLatinX.
+ * It also supports ASCII, ISO-8859-1, and UTF16 (LE and BE) by default.
+ *
+ * Anything else would have to be translated to UTF8 before being
+ * given to the parser itself. The BOM for UTF16 and the encoding
+ * declaration are looked at and a converter is looked for at that
+ * point. If not found the parser stops here as asked by the XML REC. A
+ * converter can be registered by the user using xmlRegisterCharEncodingHandler
+ * but the current form doesn't allow stateful transcoding (a serious
+ * problem agreed !). If iconv has been found it will be used
+ * automatically and allow stateful transcoding, the simplest is then
+ * to be sure to enable iconv and to provide iconv libs for the encoding
+ * support needed.
+ *
+ * Note that the generic "UTF-16" is not a predefined value.  Instead, only
+ * the specific UTF-16LE and UTF-16BE are present.
+ */
+typedef enum {
+    XML_CHAR_ENCODING_ERROR=   -1, /* No char encoding detected */
+    XML_CHAR_ENCODING_NONE=	0, /* No char encoding detected */
+    XML_CHAR_ENCODING_UTF8=	1, /* UTF-8 */
+    XML_CHAR_ENCODING_UTF16LE=	2, /* UTF-16 little endian */
+    XML_CHAR_ENCODING_UTF16BE=	3, /* UTF-16 big endian */
+    XML_CHAR_ENCODING_UCS4LE=	4, /* UCS-4 little endian */
+    XML_CHAR_ENCODING_UCS4BE=	5, /* UCS-4 big endian */
+    XML_CHAR_ENCODING_EBCDIC=	6, /* EBCDIC uh! */
+    XML_CHAR_ENCODING_UCS4_2143=7, /* UCS-4 unusual ordering */
+    XML_CHAR_ENCODING_UCS4_3412=8, /* UCS-4 unusual ordering */
+    XML_CHAR_ENCODING_UCS2=	9, /* UCS-2 */
+    XML_CHAR_ENCODING_8859_1=	10,/* ISO-8859-1 ISO Latin 1 */
+    XML_CHAR_ENCODING_8859_2=	11,/* ISO-8859-2 ISO Latin 2 */
+    XML_CHAR_ENCODING_8859_3=	12,/* ISO-8859-3 */
+    XML_CHAR_ENCODING_8859_4=	13,/* ISO-8859-4 */
+    XML_CHAR_ENCODING_8859_5=	14,/* ISO-8859-5 */
+    XML_CHAR_ENCODING_8859_6=	15,/* ISO-8859-6 */
+    XML_CHAR_ENCODING_8859_7=	16,/* ISO-8859-7 */
+    XML_CHAR_ENCODING_8859_8=	17,/* ISO-8859-8 */
+    XML_CHAR_ENCODING_8859_9=	18,/* ISO-8859-9 */
+    XML_CHAR_ENCODING_2022_JP=  19,/* ISO-2022-JP */
+    XML_CHAR_ENCODING_SHIFT_JIS=20,/* Shift_JIS */
+    XML_CHAR_ENCODING_EUC_JP=   21,/* EUC-JP */
+    XML_CHAR_ENCODING_ASCII=    22 /* pure ASCII */
+} xmlCharEncoding;
+
+/**
+ * xmlCharEncodingInputFunc:
+ * @out:  a pointer to an array of bytes to store the UTF-8 result
+ * @outlen:  the length of @out
+ * @in:  a pointer to an array of chars in the original encoding
+ * @inlen:  the length of @in
+ *
+ * Take a block of chars in the original encoding and try to convert
+ * it to an UTF-8 block of chars out.
+ *
+ * Returns the number of bytes written, -1 if lack of space, or -2
+ *     if the transcoding failed.
+ * The value of @inlen after return is the number of octets consumed
+ *     if the return value is positive, else unpredictiable.
+ * The value of @outlen after return is the number of octets consumed.
+ */
+typedef int (* xmlCharEncodingInputFunc)(unsigned char *out, int *outlen,
+                                         const unsigned char *in, int *inlen);
+
+
+/**
+ * xmlCharEncodingOutputFunc:
+ * @out:  a pointer to an array of bytes to store the result
+ * @outlen:  the length of @out
+ * @in:  a pointer to an array of UTF-8 chars
+ * @inlen:  the length of @in
+ *
+ * Take a block of UTF-8 chars in and try to convert it to another
+ * encoding.
+ * Note: a first call designed to produce heading info is called with
+ * in = NULL. If stateful this should also initialize the encoder state.
+ *
+ * Returns the number of bytes written, -1 if lack of space, or -2
+ *     if the transcoding failed.
+ * The value of @inlen after return is the number of octets consumed
+ *     if the return value is positive, else unpredictiable.
+ * The value of @outlen after return is the number of octets produced.
+ */
+typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
+                                          const unsigned char *in, int *inlen);
+
+
+/*
+ * Block defining the handlers for non UTF-8 encodings.
+ * If iconv is supported, there are two extra fields.
+ */
+#ifdef LIBXML_ICU_ENABLED
+/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
+#define ICU_PIVOT_BUF_SIZE 1024
+struct _uconv_t {
+  UConverter *uconv; /* for conversion between an encoding and UTF-16 */
+  UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
+  UChar      pivot_buf[ICU_PIVOT_BUF_SIZE];
+  UChar      *pivot_source;
+  UChar      *pivot_target;
+};
+typedef struct _uconv_t uconv_t;
+#endif
+
+typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler;
+typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
+struct _xmlCharEncodingHandler {
+    char                       *name;
+    xmlCharEncodingInputFunc   input;
+    xmlCharEncodingOutputFunc  output;
+#ifdef LIBXML_ICONV_ENABLED
+    iconv_t                    iconv_in;
+    iconv_t                    iconv_out;
+#endif /* LIBXML_ICONV_ENABLED */
+#ifdef LIBXML_ICU_ENABLED
+    uconv_t                    *uconv_in;
+    uconv_t                    *uconv_out;
+#endif /* LIBXML_ICU_ENABLED */
+};
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/tree.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Interfaces for encoding handlers.
+ */
+XMLPUBFUN void XMLCALL
+	xmlInitCharEncodingHandlers	(void);
+XMLPUBFUN void XMLCALL
+	xmlCleanupCharEncodingHandlers	(void);
+XMLPUBFUN void XMLCALL
+	xmlRegisterCharEncodingHandler	(xmlCharEncodingHandlerPtr handler);
+XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
+	xmlGetCharEncodingHandler	(xmlCharEncoding enc);
+XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
+	xmlFindCharEncodingHandler	(const char *name);
+XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
+	xmlNewCharEncodingHandler	(const char *name,
+					 xmlCharEncodingInputFunc input,
+					 xmlCharEncodingOutputFunc output);
+
+/*
+ * Interfaces for encoding names and aliases.
+ */
+XMLPUBFUN int XMLCALL
+	xmlAddEncodingAlias		(const char *name,
+					 const char *alias);
+XMLPUBFUN int XMLCALL
+	xmlDelEncodingAlias		(const char *alias);
+XMLPUBFUN const char * XMLCALL
+	xmlGetEncodingAlias		(const char *alias);
+XMLPUBFUN void XMLCALL
+	xmlCleanupEncodingAliases	(void);
+XMLPUBFUN xmlCharEncoding XMLCALL
+	xmlParseCharEncoding		(const char *name);
+XMLPUBFUN const char * XMLCALL
+	xmlGetCharEncodingName		(xmlCharEncoding enc);
+
+/*
+ * Interfaces directly used by the parsers.
+ */
+XMLPUBFUN xmlCharEncoding XMLCALL
+	xmlDetectCharEncoding		(const unsigned char *in,
+					 int len);
+
+XMLPUBFUN int XMLCALL
+	xmlCharEncOutFunc		(xmlCharEncodingHandler *handler,
+					 xmlBufferPtr out,
+					 xmlBufferPtr in);
+
+XMLPUBFUN int XMLCALL
+	xmlCharEncInFunc		(xmlCharEncodingHandler *handler,
+					 xmlBufferPtr out,
+					 xmlBufferPtr in);
+XMLPUBFUN int XMLCALL
+	xmlCharEncFirstLine		(xmlCharEncodingHandler *handler,
+					 xmlBufferPtr out,
+					 xmlBufferPtr in);
+XMLPUBFUN int XMLCALL
+	xmlCharEncCloseFunc		(xmlCharEncodingHandler *handler);
+
+/*
+ * Export a few useful functions
+ */
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN int XMLCALL
+	UTF8Toisolat1			(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN int XMLCALL
+	isolat1ToUTF8			(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_CHAR_ENCODING_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/entities.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/entities.h
new file mode 100644
index 0000000..47b4573
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/entities.h
@@ -0,0 +1,151 @@
+/*
+ * Summary: interface for the XML entities handling
+ * Description: this module provides some of the entity API needed
+ *              for the parser and applications.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_ENTITIES_H__
+#define __XML_ENTITIES_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The different valid entity types.
+ */
+typedef enum {
+    XML_INTERNAL_GENERAL_ENTITY = 1,
+    XML_EXTERNAL_GENERAL_PARSED_ENTITY = 2,
+    XML_EXTERNAL_GENERAL_UNPARSED_ENTITY = 3,
+    XML_INTERNAL_PARAMETER_ENTITY = 4,
+    XML_EXTERNAL_PARAMETER_ENTITY = 5,
+    XML_INTERNAL_PREDEFINED_ENTITY = 6
+} xmlEntityType;
+
+/*
+ * An unit of storage for an entity, contains the string, the value
+ * and the linkind data needed for the linking in the hash table.
+ */
+
+struct _xmlEntity {
+    void           *_private;	        /* application data */
+    xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
+    const xmlChar          *name;	/* Entity name */
+    struct _xmlNode    *children;	/* First child link */
+    struct _xmlNode        *last;	/* Last child link */
+    struct _xmlDtd       *parent;	/* -> DTD */
+    struct _xmlNode        *next;	/* next sibling link  */
+    struct _xmlNode        *prev;	/* previous sibling link  */
+    struct _xmlDoc          *doc;       /* the containing document */
+
+    xmlChar                *orig;	/* content without ref substitution */
+    xmlChar             *content;	/* content or ndata if unparsed */
+    int                   length;	/* the content length */
+    xmlEntityType          etype;	/* The entity type */
+    const xmlChar    *ExternalID;	/* External identifier for PUBLIC */
+    const xmlChar      *SystemID;	/* URI for a SYSTEM or PUBLIC Entity */
+
+    struct _xmlEntity     *nexte;	/* unused */
+    const xmlChar           *URI;	/* the full URI as computed */
+    int                    owner;	/* does the entity own the childrens */
+    int			 checked;	/* was the entity content checked */
+					/* this is also used to count entities
+					 * references done from that entity
+					 * and if it contains '<' */
+};
+
+/*
+ * All entities are stored in an hash table.
+ * There is 2 separate hash tables for global and parameter entities.
+ */
+
+typedef struct _xmlHashTable xmlEntitiesTable;
+typedef xmlEntitiesTable *xmlEntitiesTablePtr;
+
+/*
+ * External functions:
+ */
+
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlInitializePredefinedEntities	(void);
+#endif /* LIBXML_LEGACY_ENABLED */
+
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlNewEntity		(xmlDocPtr doc,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID,
+						 const xmlChar *content);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlAddDocEntity		(xmlDocPtr doc,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID,
+						 const xmlChar *content);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlAddDtdEntity		(xmlDocPtr doc,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID,
+						 const xmlChar *content);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetPredefinedEntity	(const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetDocEntity		(const xmlDoc *doc,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetDtdEntity		(xmlDocPtr doc,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetParameterEntity	(xmlDocPtr doc,
+						 const xmlChar *name);
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlEncodeEntities	(xmlDocPtr doc,
+						 const xmlChar *input);
+#endif /* LIBXML_LEGACY_ENABLED */
+XMLPUBFUN xmlChar * XMLCALL
+			xmlEncodeEntitiesReentrant(xmlDocPtr doc,
+						 const xmlChar *input);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlEncodeSpecialChars	(const xmlDoc *doc,
+						 const xmlChar *input);
+XMLPUBFUN xmlEntitiesTablePtr XMLCALL
+			xmlCreateEntitiesTable	(void);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlEntitiesTablePtr XMLCALL
+			xmlCopyEntitiesTable	(xmlEntitiesTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+			xmlFreeEntitiesTable	(xmlEntitiesTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+			xmlDumpEntitiesTable	(xmlBufferPtr buf,
+						 xmlEntitiesTablePtr table);
+XMLPUBFUN void XMLCALL
+			xmlDumpEntityDecl	(xmlBufferPtr buf,
+						 xmlEntityPtr ent);
+#endif /* LIBXML_OUTPUT_ENABLED */
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN void XMLCALL
+			xmlCleanupPredefinedEntities(void);
+#endif /* LIBXML_LEGACY_ENABLED */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+# endif /* __XML_ENTITIES_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/globals.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/globals.h
new file mode 100644
index 0000000..5e41b7b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/globals.h
@@ -0,0 +1,508 @@
+/*
+ * Summary: interface for all global variables of the library
+ * Description: all the global variables and thread handling for
+ *              those variables is handled by this module.
+ *
+ * The bottom of this file is automatically generated by build_glob.py
+ * based on the description file global.data
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Gary Pennington <Gary.Pennington@uk.sun.com>, Daniel Veillard
+ */
+
+#ifndef __XML_GLOBALS_H
+#define __XML_GLOBALS_H
+
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/xmlerror.h>
+#include <libxml/SAX2.h>
+#include <libxml/xmlmemory.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+XMLPUBFUN void XMLCALL xmlInitGlobals(void);
+XMLPUBFUN void XMLCALL xmlCleanupGlobals(void);
+
+/**
+ * xmlParserInputBufferCreateFilenameFunc:
+ * @URI: the URI to read from
+ * @enc: the requested source encoding
+ *
+ * Signature for the function doing the lookup for a suitable input method
+ * corresponding to an URI.
+ *
+ * Returns the new xmlParserInputBufferPtr in case of success or NULL if no
+ *         method was found.
+ */
+typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI,
+									   xmlCharEncoding enc);
+
+
+/**
+ * xmlOutputBufferCreateFilenameFunc:
+ * @URI: the URI to write to
+ * @enc: the requested target encoding
+ *
+ * Signature for the function doing the lookup for a suitable output method
+ * corresponding to an URI.
+ *
+ * Returns the new xmlOutputBufferPtr in case of success or NULL if no
+ *         method was found.
+ */
+typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI,
+								 xmlCharEncodingHandlerPtr encoder,
+								 int compression);
+
+XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
+XMLCALL xmlParserInputBufferCreateFilenameDefault (xmlParserInputBufferCreateFilenameFunc func);
+XMLPUBFUN xmlOutputBufferCreateFilenameFunc
+XMLCALL xmlOutputBufferCreateFilenameDefault (xmlOutputBufferCreateFilenameFunc func);
+
+/*
+ * Externally global symbols which need to be protected for backwards
+ * compatibility support.
+ */
+
+#undef	docbDefaultSAXHandler
+#undef	htmlDefaultSAXHandler
+#undef	oldXMLWDcompatibility
+#undef	xmlBufferAllocScheme
+#undef	xmlDefaultBufferSize
+#undef	xmlDefaultSAXHandler
+#undef	xmlDefaultSAXLocator
+#undef	xmlDoValidityCheckingDefaultValue
+#undef	xmlFree
+#undef	xmlGenericError
+#undef	xmlStructuredError
+#undef	xmlGenericErrorContext
+#undef	xmlStructuredErrorContext
+#undef	xmlGetWarningsDefaultValue
+#undef	xmlIndentTreeOutput
+#undef  xmlTreeIndentString
+#undef	xmlKeepBlanksDefaultValue
+#undef	xmlLineNumbersDefaultValue
+#undef	xmlLoadExtDtdDefaultValue
+#undef	xmlMalloc
+#undef	xmlMallocAtomic
+#undef	xmlMemStrdup
+#undef	xmlParserDebugEntities
+#undef	xmlParserVersion
+#undef	xmlPedanticParserDefaultValue
+#undef	xmlRealloc
+#undef	xmlSaveNoEmptyTags
+#undef	xmlSubstituteEntitiesDefaultValue
+#undef  xmlRegisterNodeDefaultValue
+#undef  xmlDeregisterNodeDefaultValue
+#undef  xmlLastError
+#undef  xmlParserInputBufferCreateFilenameValue
+#undef  xmlOutputBufferCreateFilenameValue
+
+/**
+ * xmlRegisterNodeFunc:
+ * @node: the current node
+ *
+ * Signature for the registration callback of a created node
+ */
+typedef void (*xmlRegisterNodeFunc) (xmlNodePtr node);
+/**
+ * xmlDeregisterNodeFunc:
+ * @node: the current node
+ *
+ * Signature for the deregistration callback of a discarded node
+ */
+typedef void (*xmlDeregisterNodeFunc) (xmlNodePtr node);
+
+typedef struct _xmlGlobalState xmlGlobalState;
+typedef xmlGlobalState *xmlGlobalStatePtr;
+struct _xmlGlobalState
+{
+	const char *xmlParserVersion;
+
+	xmlSAXLocator xmlDefaultSAXLocator;
+	xmlSAXHandlerV1 xmlDefaultSAXHandler;
+	xmlSAXHandlerV1 docbDefaultSAXHandler;
+	xmlSAXHandlerV1 htmlDefaultSAXHandler;
+
+	xmlFreeFunc xmlFree;
+	xmlMallocFunc xmlMalloc;
+	xmlStrdupFunc xmlMemStrdup;
+	xmlReallocFunc xmlRealloc;
+
+	xmlGenericErrorFunc xmlGenericError;
+	xmlStructuredErrorFunc xmlStructuredError;
+	void *xmlGenericErrorContext;
+
+	int oldXMLWDcompatibility;
+
+	xmlBufferAllocationScheme xmlBufferAllocScheme;
+	int xmlDefaultBufferSize;
+
+	int xmlSubstituteEntitiesDefaultValue;
+	int xmlDoValidityCheckingDefaultValue;
+	int xmlGetWarningsDefaultValue;
+	int xmlKeepBlanksDefaultValue;
+	int xmlLineNumbersDefaultValue;
+	int xmlLoadExtDtdDefaultValue;
+	int xmlParserDebugEntities;
+	int xmlPedanticParserDefaultValue;
+
+	int xmlSaveNoEmptyTags;
+	int xmlIndentTreeOutput;
+	const char *xmlTreeIndentString;
+
+	xmlRegisterNodeFunc xmlRegisterNodeDefaultValue;
+	xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue;
+
+	xmlMallocFunc xmlMallocAtomic;
+	xmlError xmlLastError;
+
+	xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue;
+	xmlOutputBufferCreateFilenameFunc xmlOutputBufferCreateFilenameValue;
+
+	void *xmlStructuredErrorContext;
+};
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/threads.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+XMLPUBFUN void XMLCALL	xmlInitializeGlobalState(xmlGlobalStatePtr gs);
+
+XMLPUBFUN void XMLCALL xmlThrDefSetGenericErrorFunc(void *ctx, xmlGenericErrorFunc handler);
+
+XMLPUBFUN void XMLCALL xmlThrDefSetStructuredErrorFunc(void *ctx, xmlStructuredErrorFunc handler);
+
+XMLPUBFUN xmlRegisterNodeFunc XMLCALL xmlRegisterNodeDefault(xmlRegisterNodeFunc func);
+XMLPUBFUN xmlRegisterNodeFunc XMLCALL xmlThrDefRegisterNodeDefault(xmlRegisterNodeFunc func);
+XMLPUBFUN xmlDeregisterNodeFunc XMLCALL xmlDeregisterNodeDefault(xmlDeregisterNodeFunc func);
+XMLPUBFUN xmlDeregisterNodeFunc XMLCALL xmlThrDefDeregisterNodeDefault(xmlDeregisterNodeFunc func);
+
+XMLPUBFUN xmlOutputBufferCreateFilenameFunc XMLCALL
+	xmlThrDefOutputBufferCreateFilenameDefault(xmlOutputBufferCreateFilenameFunc func);
+XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL
+	xmlThrDefParserInputBufferCreateFilenameDefault(
+				xmlParserInputBufferCreateFilenameFunc func);
+
+/** DOC_DISABLE */
+/*
+ * In general the memory allocation entry points are not kept
+ * thread specific but this can be overridden by LIBXML_THREAD_ALLOC_ENABLED
+ *    - xmlMalloc
+ *    - xmlMallocAtomic
+ *    - xmlRealloc
+ *    - xmlMemStrdup
+ *    - xmlFree
+ */
+
+#ifdef LIBXML_THREAD_ALLOC_ENABLED
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlMallocFunc * XMLCALL __xmlMalloc(void);
+#define xmlMalloc \
+(*(__xmlMalloc()))
+#else
+XMLPUBVAR xmlMallocFunc xmlMalloc;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlMallocFunc * XMLCALL __xmlMallocAtomic(void);
+#define xmlMallocAtomic \
+(*(__xmlMallocAtomic()))
+#else
+XMLPUBVAR xmlMallocFunc xmlMallocAtomic;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlReallocFunc * XMLCALL __xmlRealloc(void);
+#define xmlRealloc \
+(*(__xmlRealloc()))
+#else
+XMLPUBVAR xmlReallocFunc xmlRealloc;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlFreeFunc * XMLCALL __xmlFree(void);
+#define xmlFree \
+(*(__xmlFree()))
+#else
+XMLPUBVAR xmlFreeFunc xmlFree;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlStrdupFunc * XMLCALL __xmlMemStrdup(void);
+#define xmlMemStrdup \
+(*(__xmlMemStrdup()))
+#else
+XMLPUBVAR xmlStrdupFunc xmlMemStrdup;
+#endif
+
+#else /* !LIBXML_THREAD_ALLOC_ENABLED */
+XMLPUBVAR xmlMallocFunc xmlMalloc;
+XMLPUBVAR xmlMallocFunc xmlMallocAtomic;
+XMLPUBVAR xmlReallocFunc xmlRealloc;
+XMLPUBVAR xmlFreeFunc xmlFree;
+XMLPUBVAR xmlStrdupFunc xmlMemStrdup;
+#endif /* LIBXML_THREAD_ALLOC_ENABLED */
+
+#ifdef LIBXML_DOCB_ENABLED
+XMLPUBFUN  xmlSAXHandlerV1 * XMLCALL __docbDefaultSAXHandler(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define docbDefaultSAXHandler \
+(*(__docbDefaultSAXHandler()))
+#else
+XMLPUBVAR xmlSAXHandlerV1 docbDefaultSAXHandler;
+#endif
+#endif
+
+#ifdef LIBXML_HTML_ENABLED
+XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define htmlDefaultSAXHandler \
+(*(__htmlDefaultSAXHandler()))
+#else
+XMLPUBVAR xmlSAXHandlerV1 htmlDefaultSAXHandler;
+#endif
+#endif
+
+XMLPUBFUN xmlError * XMLCALL __xmlLastError(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlLastError \
+(*(__xmlLastError()))
+#else
+XMLPUBVAR xmlError xmlLastError;
+#endif
+
+/*
+ * Everything starting from the line below is
+ * Automatically generated by build_glob.py.
+ * Do not modify the previous line.
+ */
+
+
+XMLPUBFUN int * XMLCALL __oldXMLWDcompatibility(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define oldXMLWDcompatibility \
+(*(__oldXMLWDcompatibility()))
+#else
+XMLPUBVAR int oldXMLWDcompatibility;
+#endif
+
+XMLPUBFUN xmlBufferAllocationScheme * XMLCALL __xmlBufferAllocScheme(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlBufferAllocScheme \
+(*(__xmlBufferAllocScheme()))
+#else
+XMLPUBVAR xmlBufferAllocationScheme xmlBufferAllocScheme;
+#endif
+XMLPUBFUN xmlBufferAllocationScheme XMLCALL
+	xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v);
+
+XMLPUBFUN int * XMLCALL __xmlDefaultBufferSize(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDefaultBufferSize \
+(*(__xmlDefaultBufferSize()))
+#else
+XMLPUBVAR int xmlDefaultBufferSize;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefDefaultBufferSize(int v);
+
+XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __xmlDefaultSAXHandler(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDefaultSAXHandler \
+(*(__xmlDefaultSAXHandler()))
+#else
+XMLPUBVAR xmlSAXHandlerV1 xmlDefaultSAXHandler;
+#endif
+
+XMLPUBFUN xmlSAXLocator * XMLCALL __xmlDefaultSAXLocator(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDefaultSAXLocator \
+(*(__xmlDefaultSAXLocator()))
+#else
+XMLPUBVAR xmlSAXLocator xmlDefaultSAXLocator;
+#endif
+
+XMLPUBFUN int * XMLCALL __xmlDoValidityCheckingDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDoValidityCheckingDefaultValue \
+(*(__xmlDoValidityCheckingDefaultValue()))
+#else
+XMLPUBVAR int xmlDoValidityCheckingDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefDoValidityCheckingDefaultValue(int v);
+
+XMLPUBFUN xmlGenericErrorFunc * XMLCALL __xmlGenericError(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlGenericError \
+(*(__xmlGenericError()))
+#else
+XMLPUBVAR xmlGenericErrorFunc xmlGenericError;
+#endif
+
+XMLPUBFUN xmlStructuredErrorFunc * XMLCALL __xmlStructuredError(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlStructuredError \
+(*(__xmlStructuredError()))
+#else
+XMLPUBVAR xmlStructuredErrorFunc xmlStructuredError;
+#endif
+
+XMLPUBFUN void * * XMLCALL __xmlGenericErrorContext(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlGenericErrorContext \
+(*(__xmlGenericErrorContext()))
+#else
+XMLPUBVAR void * xmlGenericErrorContext;
+#endif
+
+XMLPUBFUN void * * XMLCALL __xmlStructuredErrorContext(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlStructuredErrorContext \
+(*(__xmlStructuredErrorContext()))
+#else
+XMLPUBVAR void * xmlStructuredErrorContext;
+#endif
+
+XMLPUBFUN int * XMLCALL __xmlGetWarningsDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlGetWarningsDefaultValue \
+(*(__xmlGetWarningsDefaultValue()))
+#else
+XMLPUBVAR int xmlGetWarningsDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefGetWarningsDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlIndentTreeOutput(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlIndentTreeOutput \
+(*(__xmlIndentTreeOutput()))
+#else
+XMLPUBVAR int xmlIndentTreeOutput;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefIndentTreeOutput(int v);
+
+XMLPUBFUN const char * * XMLCALL __xmlTreeIndentString(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlTreeIndentString \
+(*(__xmlTreeIndentString()))
+#else
+XMLPUBVAR const char * xmlTreeIndentString;
+#endif
+XMLPUBFUN const char * XMLCALL xmlThrDefTreeIndentString(const char * v);
+
+XMLPUBFUN int * XMLCALL __xmlKeepBlanksDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlKeepBlanksDefaultValue \
+(*(__xmlKeepBlanksDefaultValue()))
+#else
+XMLPUBVAR int xmlKeepBlanksDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefKeepBlanksDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlLineNumbersDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlLineNumbersDefaultValue \
+(*(__xmlLineNumbersDefaultValue()))
+#else
+XMLPUBVAR int xmlLineNumbersDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefLineNumbersDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlLoadExtDtdDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlLoadExtDtdDefaultValue \
+(*(__xmlLoadExtDtdDefaultValue()))
+#else
+XMLPUBVAR int xmlLoadExtDtdDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefLoadExtDtdDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlParserDebugEntities(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlParserDebugEntities \
+(*(__xmlParserDebugEntities()))
+#else
+XMLPUBVAR int xmlParserDebugEntities;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefParserDebugEntities(int v);
+
+XMLPUBFUN const char * * XMLCALL __xmlParserVersion(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlParserVersion \
+(*(__xmlParserVersion()))
+#else
+XMLPUBVAR const char * xmlParserVersion;
+#endif
+
+XMLPUBFUN int * XMLCALL __xmlPedanticParserDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlPedanticParserDefaultValue \
+(*(__xmlPedanticParserDefaultValue()))
+#else
+XMLPUBVAR int xmlPedanticParserDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefPedanticParserDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlSaveNoEmptyTags(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlSaveNoEmptyTags \
+(*(__xmlSaveNoEmptyTags()))
+#else
+XMLPUBVAR int xmlSaveNoEmptyTags;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefSaveNoEmptyTags(int v);
+
+XMLPUBFUN int * XMLCALL __xmlSubstituteEntitiesDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlSubstituteEntitiesDefaultValue \
+(*(__xmlSubstituteEntitiesDefaultValue()))
+#else
+XMLPUBVAR int xmlSubstituteEntitiesDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefSubstituteEntitiesDefaultValue(int v);
+
+XMLPUBFUN xmlRegisterNodeFunc * XMLCALL __xmlRegisterNodeDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlRegisterNodeDefaultValue \
+(*(__xmlRegisterNodeDefaultValue()))
+#else
+XMLPUBVAR xmlRegisterNodeFunc xmlRegisterNodeDefaultValue;
+#endif
+
+XMLPUBFUN xmlDeregisterNodeFunc * XMLCALL __xmlDeregisterNodeDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDeregisterNodeDefaultValue \
+(*(__xmlDeregisterNodeDefaultValue()))
+#else
+XMLPUBVAR xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue;
+#endif
+
+XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL \
+				__xmlParserInputBufferCreateFilenameValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlParserInputBufferCreateFilenameValue \
+(*(__xmlParserInputBufferCreateFilenameValue()))
+#else
+XMLPUBVAR xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue;
+#endif
+
+XMLPUBFUN xmlOutputBufferCreateFilenameFunc * XMLCALL __xmlOutputBufferCreateFilenameValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlOutputBufferCreateFilenameValue \
+(*(__xmlOutputBufferCreateFilenameValue()))
+#else
+XMLPUBVAR xmlOutputBufferCreateFilenameFunc xmlOutputBufferCreateFilenameValue;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_GLOBALS_H */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/hash.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/hash.h
new file mode 100644
index 0000000..b682b6b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/hash.h
@@ -0,0 +1,236 @@
+/*
+ * Summary: Chained hash tables
+ * Description: This module implements the hash table support used in
+ *		various places in the library.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Bjorn Reese <bjorn.reese@systematic.dk>
+ */
+
+#ifndef __XML_HASH_H__
+#define __XML_HASH_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The hash table.
+ */
+typedef struct _xmlHashTable xmlHashTable;
+typedef xmlHashTable *xmlHashTablePtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/dict.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Recent version of gcc produce a warning when a function pointer is assigned
+ * to an object pointer, or vice versa.  The following macro is a dirty hack
+ * to allow suppression of the warning.  If your architecture has function
+ * pointers which are a different size than a void pointer, there may be some
+ * serious trouble within the library.
+ */
+/**
+ * XML_CAST_FPTR:
+ * @fptr:  pointer to a function
+ *
+ * Macro to do a casting from an object pointer to a
+ * function pointer without encountering a warning from
+ * gcc
+ *
+ * #define XML_CAST_FPTR(fptr) (*(void **)(&fptr))
+ * This macro violated ISO C aliasing rules (gcc4 on s390 broke)
+ * so it is disabled now
+ */
+
+#define XML_CAST_FPTR(fptr) fptr
+
+
+/*
+ * function types:
+ */
+/**
+ * xmlHashDeallocator:
+ * @payload:  the data in the hash
+ * @name:  the name associated
+ *
+ * Callback to free data from a hash.
+ */
+typedef void (*xmlHashDeallocator)(void *payload, const xmlChar *name);
+/**
+ * xmlHashCopier:
+ * @payload:  the data in the hash
+ * @name:  the name associated
+ *
+ * Callback to copy data from a hash.
+ *
+ * Returns a copy of the data or NULL in case of error.
+ */
+typedef void *(*xmlHashCopier)(void *payload, const xmlChar *name);
+/**
+ * xmlHashScanner:
+ * @payload:  the data in the hash
+ * @data:  extra scanner data
+ * @name:  the name associated
+ *
+ * Callback when scanning data in a hash with the simple scanner.
+ */
+typedef void (*xmlHashScanner)(void *payload, void *data, const xmlChar *name);
+/**
+ * xmlHashScannerFull:
+ * @payload:  the data in the hash
+ * @data:  extra scanner data
+ * @name:  the name associated
+ * @name2:  the second name associated
+ * @name3:  the third name associated
+ *
+ * Callback when scanning data in a hash with the full scanner.
+ */
+typedef void (*xmlHashScannerFull)(void *payload, void *data,
+				   const xmlChar *name, const xmlChar *name2,
+				   const xmlChar *name3);
+
+/*
+ * Constructor and destructor.
+ */
+XMLPUBFUN xmlHashTablePtr XMLCALL
+			xmlHashCreate	(int size);
+XMLPUBFUN xmlHashTablePtr XMLCALL
+			xmlHashCreateDict(int size,
+					 xmlDictPtr dict);
+XMLPUBFUN void XMLCALL
+			xmlHashFree	(xmlHashTablePtr table,
+					 xmlHashDeallocator f);
+XMLPUBFUN void XMLCALL
+			xmlHashDefaultDeallocator(void *entry,
+					 const xmlChar *name);
+
+/*
+ * Add a new entry to the hash table.
+ */
+XMLPUBFUN int XMLCALL
+			xmlHashAddEntry	(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         void *userdata);
+XMLPUBFUN int XMLCALL
+			xmlHashUpdateEntry(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         void *userdata,
+					 xmlHashDeallocator f);
+XMLPUBFUN int XMLCALL
+			xmlHashAddEntry2(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         void *userdata);
+XMLPUBFUN int XMLCALL
+			xmlHashUpdateEntry2(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         void *userdata,
+					 xmlHashDeallocator f);
+XMLPUBFUN int XMLCALL
+			xmlHashAddEntry3(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         const xmlChar *name3,
+		                         void *userdata);
+XMLPUBFUN int XMLCALL
+			xmlHashUpdateEntry3(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         const xmlChar *name3,
+		                         void *userdata,
+					 xmlHashDeallocator f);
+
+/*
+ * Remove an entry from the hash table.
+ */
+XMLPUBFUN int XMLCALL
+			xmlHashRemoveEntry(xmlHashTablePtr table, const xmlChar *name,
+                           xmlHashDeallocator f);
+XMLPUBFUN int XMLCALL
+			xmlHashRemoveEntry2(xmlHashTablePtr table, const xmlChar *name,
+                            const xmlChar *name2, xmlHashDeallocator f);
+XMLPUBFUN int  XMLCALL
+			xmlHashRemoveEntry3(xmlHashTablePtr table, const xmlChar *name,
+                            const xmlChar *name2, const xmlChar *name3,
+                            xmlHashDeallocator f);
+
+/*
+ * Retrieve the userdata.
+ */
+XMLPUBFUN void * XMLCALL
+			xmlHashLookup	(xmlHashTablePtr table,
+					 const xmlChar *name);
+XMLPUBFUN void * XMLCALL
+			xmlHashLookup2	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2);
+XMLPUBFUN void * XMLCALL
+			xmlHashLookup3	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2,
+					 const xmlChar *name3);
+XMLPUBFUN void * XMLCALL
+			xmlHashQLookup	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *prefix);
+XMLPUBFUN void * XMLCALL
+			xmlHashQLookup2	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *prefix,
+					 const xmlChar *name2,
+					 const xmlChar *prefix2);
+XMLPUBFUN void * XMLCALL
+			xmlHashQLookup3	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *prefix,
+					 const xmlChar *name2,
+					 const xmlChar *prefix2,
+					 const xmlChar *name3,
+					 const xmlChar *prefix3);
+
+/*
+ * Helpers.
+ */
+XMLPUBFUN xmlHashTablePtr XMLCALL
+			xmlHashCopy	(xmlHashTablePtr table,
+					 xmlHashCopier f);
+XMLPUBFUN int XMLCALL
+			xmlHashSize	(xmlHashTablePtr table);
+XMLPUBFUN void XMLCALL
+			xmlHashScan	(xmlHashTablePtr table,
+					 xmlHashScanner f,
+					 void *data);
+XMLPUBFUN void XMLCALL
+			xmlHashScan3	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2,
+					 const xmlChar *name3,
+					 xmlHashScanner f,
+					 void *data);
+XMLPUBFUN void XMLCALL
+			xmlHashScanFull	(xmlHashTablePtr table,
+					 xmlHashScannerFull f,
+					 void *data);
+XMLPUBFUN void XMLCALL
+			xmlHashScanFull3(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2,
+					 const xmlChar *name3,
+					 xmlHashScannerFull f,
+					 void *data);
+#ifdef __cplusplus
+}
+#endif
+#endif /* ! __XML_HASH_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/list.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/list.h
new file mode 100644
index 0000000..3211c75
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/list.h
@@ -0,0 +1,137 @@
+/*
+ * Summary: lists interfaces
+ * Description: this module implement the list support used in
+ * various place in the library.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Gary Pennington <Gary.Pennington@uk.sun.com>
+ */
+
+#ifndef __XML_LINK_INCLUDE__
+#define __XML_LINK_INCLUDE__
+
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _xmlLink xmlLink;
+typedef xmlLink *xmlLinkPtr;
+
+typedef struct _xmlList xmlList;
+typedef xmlList *xmlListPtr;
+
+/**
+ * xmlListDeallocator:
+ * @lk:  the data to deallocate
+ *
+ * Callback function used to free data from a list.
+ */
+typedef void (*xmlListDeallocator) (xmlLinkPtr lk);
+/**
+ * xmlListDataCompare:
+ * @data0: the first data
+ * @data1: the second data
+ *
+ * Callback function used to compare 2 data.
+ *
+ * Returns 0 is equality, -1 or 1 otherwise depending on the ordering.
+ */
+typedef int  (*xmlListDataCompare) (const void *data0, const void *data1);
+/**
+ * xmlListWalker:
+ * @data: the data found in the list
+ * @user: extra user provided data to the walker
+ *
+ * Callback function used when walking a list with xmlListWalk().
+ *
+ * Returns 0 to stop walking the list, 1 otherwise.
+ */
+typedef int (*xmlListWalker) (const void *data, void *user);
+
+/* Creation/Deletion */
+XMLPUBFUN xmlListPtr XMLCALL
+		xmlListCreate		(xmlListDeallocator deallocator,
+	                                 xmlListDataCompare compare);
+XMLPUBFUN void XMLCALL
+		xmlListDelete		(xmlListPtr l);
+
+/* Basic Operators */
+XMLPUBFUN void * XMLCALL
+		xmlListSearch		(xmlListPtr l,
+					 void *data);
+XMLPUBFUN void * XMLCALL
+		xmlListReverseSearch	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListInsert		(xmlListPtr l,
+					 void *data) ;
+XMLPUBFUN int XMLCALL
+		xmlListAppend		(xmlListPtr l,
+					 void *data) ;
+XMLPUBFUN int XMLCALL
+		xmlListRemoveFirst	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListRemoveLast	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListRemoveAll	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN void XMLCALL
+		xmlListClear		(xmlListPtr l);
+XMLPUBFUN int XMLCALL
+		xmlListEmpty		(xmlListPtr l);
+XMLPUBFUN xmlLinkPtr XMLCALL
+		xmlListFront		(xmlListPtr l);
+XMLPUBFUN xmlLinkPtr XMLCALL
+		xmlListEnd		(xmlListPtr l);
+XMLPUBFUN int XMLCALL
+		xmlListSize		(xmlListPtr l);
+
+XMLPUBFUN void XMLCALL
+		xmlListPopFront		(xmlListPtr l);
+XMLPUBFUN void XMLCALL
+		xmlListPopBack		(xmlListPtr l);
+XMLPUBFUN int XMLCALL
+		xmlListPushFront	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListPushBack		(xmlListPtr l,
+					 void *data);
+
+/* Advanced Operators */
+XMLPUBFUN void XMLCALL
+		xmlListReverse		(xmlListPtr l);
+XMLPUBFUN void XMLCALL
+		xmlListSort		(xmlListPtr l);
+XMLPUBFUN void XMLCALL
+		xmlListWalk		(xmlListPtr l,
+					 xmlListWalker walker,
+					 void *user);
+XMLPUBFUN void XMLCALL
+		xmlListReverseWalk	(xmlListPtr l,
+					 xmlListWalker walker,
+					 void *user);
+XMLPUBFUN void XMLCALL
+		xmlListMerge		(xmlListPtr l1,
+					 xmlListPtr l2);
+XMLPUBFUN xmlListPtr XMLCALL
+		xmlListDup		(const xmlListPtr old);
+XMLPUBFUN int XMLCALL
+		xmlListCopy		(xmlListPtr cur,
+					 const xmlListPtr old);
+/* Link operators */
+XMLPUBFUN void * XMLCALL
+		xmlLinkGetData          (xmlLinkPtr lk);
+
+/* xmlListUnique() */
+/* xmlListSwap */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_LINK_INCLUDE__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/nanoftp.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/nanoftp.h
new file mode 100644
index 0000000..7335faf
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/nanoftp.h
@@ -0,0 +1,163 @@
+/*
+ * Summary: minimal FTP implementation
+ * Description: minimal FTP implementation allowing to fetch resources
+ *              like external subset.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __NANO_FTP_H__
+#define __NANO_FTP_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_FTP_ENABLED
+
+/* Needed for portability to Windows 64 bits */
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <winsock2.h>
+#else
+/**
+ * SOCKET:
+ *
+ * macro used to provide portability of code to windows sockets
+ */
+#define SOCKET int
+/**
+ * INVALID_SOCKET:
+ *
+ * macro used to provide portability of code to windows sockets
+ * the value to be used when the socket is not valid
+ */
+#undef  INVALID_SOCKET
+#define INVALID_SOCKET (-1)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * ftpListCallback:
+ * @userData:  user provided data for the callback
+ * @filename:  the file name (including "->" when links are shown)
+ * @attrib:  the attribute string
+ * @owner:  the owner string
+ * @group:  the group string
+ * @size:  the file size
+ * @links:  the link count
+ * @year:  the year
+ * @month:  the month
+ * @day:  the day
+ * @hour:  the hour
+ * @minute:  the minute
+ *
+ * A callback for the xmlNanoFTPList command.
+ * Note that only one of year and day:minute are specified.
+ */
+typedef void (*ftpListCallback) (void *userData,
+	                         const char *filename, const char *attrib,
+	                         const char *owner, const char *group,
+				 unsigned long size, int links, int year,
+				 const char *month, int day, int hour,
+				 int minute);
+/**
+ * ftpDataCallback:
+ * @userData: the user provided context
+ * @data: the data received
+ * @len: its size in bytes
+ *
+ * A callback for the xmlNanoFTPGet command.
+ */
+typedef void (*ftpDataCallback) (void *userData,
+				 const char *data,
+				 int len);
+
+/*
+ * Init
+ */
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPInit		(void);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPCleanup	(void);
+
+/*
+ * Creating/freeing contexts.
+ */
+XMLPUBFUN void * XMLCALL
+	xmlNanoFTPNewCtxt	(const char *URL);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPFreeCtxt	(void * ctx);
+XMLPUBFUN void * XMLCALL
+	xmlNanoFTPConnectTo	(const char *server,
+				 int port);
+/*
+ * Opening/closing session connections.
+ */
+XMLPUBFUN void * XMLCALL
+	xmlNanoFTPOpen		(const char *URL);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPConnect	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPClose		(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPQuit		(void *ctx);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPScanProxy	(const char *URL);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPProxy		(const char *host,
+				 int port,
+				 const char *user,
+				 const char *passwd,
+				 int type);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPUpdateURL	(void *ctx,
+				 const char *URL);
+
+/*
+ * Rather internal commands.
+ */
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPGetResponse	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPCheckResponse	(void *ctx);
+
+/*
+ * CD/DIR/GET handlers.
+ */
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPCwd		(void *ctx,
+				 const char *directory);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPDele		(void *ctx,
+				 const char *file);
+
+XMLPUBFUN SOCKET XMLCALL
+	xmlNanoFTPGetConnection	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPCloseConnection(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPList		(void *ctx,
+				 ftpListCallback callback,
+				 void *userData,
+				 const char *filename);
+XMLPUBFUN SOCKET XMLCALL
+	xmlNanoFTPGetSocket	(void *ctx,
+				 const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPGet		(void *ctx,
+				 ftpDataCallback callback,
+				 void *userData,
+				 const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPRead		(void *ctx,
+				 void *dest,
+				 int len);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* LIBXML_FTP_ENABLED */
+#endif /* __NANO_FTP_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/nanohttp.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/nanohttp.h
new file mode 100644
index 0000000..22b8fb4
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/nanohttp.h
@@ -0,0 +1,81 @@
+/*
+ * Summary: minimal HTTP implementation
+ * Description: minimal HTTP implementation allowing to fetch resources
+ *              like external subset.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __NANO_HTTP_H__
+#define __NANO_HTTP_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_HTTP_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPInit		(void);
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPCleanup	(void);
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPScanProxy	(const char *URL);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPFetch	(const char *URL,
+				 const char *filename,
+				 char **contentType);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPMethod	(const char *URL,
+				 const char *method,
+				 const char *input,
+				 char **contentType,
+				 const char *headers,
+				 int   ilen);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPMethodRedir	(const char *URL,
+				 const char *method,
+				 const char *input,
+				 char **contentType,
+				 char **redir,
+				 const char *headers,
+				 int   ilen);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPOpen		(const char *URL,
+				 char **contentType);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPOpenRedir	(const char *URL,
+				 char **contentType,
+				 char **redir);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPReturnCode	(void *ctx);
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPAuthHeader	(void *ctx);
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPRedir	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPContentLength( void * ctx );
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPEncoding	(void *ctx);
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPMimeType	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPRead		(void *ctx,
+				 void *dest,
+				 int len);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPSave		(void *ctxt,
+				 const char *filename);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPClose	(void *ctx);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_HTTP_ENABLED */
+#endif /* __NANO_HTTP_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/parser.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/parser.h
new file mode 100644
index 0000000..1c86a97
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/parser.h
@@ -0,0 +1,1241 @@
+/*
+ * Summary: the core parser module
+ * Description: Interfaces, constants and types related to the XML parser
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_PARSER_H__
+#define __XML_PARSER_H__
+
+#include <stdarg.h>
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/dict.h>
+#include <libxml/hash.h>
+#include <libxml/valid.h>
+#include <libxml/entities.h>
+#include <libxml/xmlerror.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * XML_DEFAULT_VERSION:
+ *
+ * The default version of XML used: 1.0
+ */
+#define XML_DEFAULT_VERSION	"1.0"
+
+/**
+ * xmlParserInput:
+ *
+ * An xmlParserInput is an input flow for the XML processor.
+ * Each entity parsed is associated an xmlParserInput (except the
+ * few predefined ones). This is the case both for internal entities
+ * - in which case the flow is already completely in memory - or
+ * external entities - in which case we use the buf structure for
+ * progressive reading and I18N conversions to the internal UTF-8 format.
+ */
+
+/**
+ * xmlParserInputDeallocate:
+ * @str:  the string to deallocate
+ *
+ * Callback for freeing some parser input allocations.
+ */
+typedef void (* xmlParserInputDeallocate)(xmlChar *str);
+
+struct _xmlParserInput {
+    /* Input buffer */
+    xmlParserInputBufferPtr buf;      /* UTF-8 encoded buffer */
+
+    const char *filename;             /* The file analyzed, if any */
+    const char *directory;            /* the directory/base of the file */
+    const xmlChar *base;              /* Base of the array to parse */
+    const xmlChar *cur;               /* Current char being parsed */
+    const xmlChar *end;               /* end of the array to parse */
+    int length;                       /* length if known */
+    int line;                         /* Current line */
+    int col;                          /* Current column */
+    /*
+     * NOTE: consumed is only tested for equality in the parser code,
+     *       so even if there is an overflow this should not give troubles
+     *       for parsing very large instances.
+     */
+    unsigned long consumed;           /* How many xmlChars already consumed */
+    xmlParserInputDeallocate free;    /* function to deallocate the base */
+    const xmlChar *encoding;          /* the encoding string for entity */
+    const xmlChar *version;           /* the version string for entity */
+    int standalone;                   /* Was that entity marked standalone */
+    int id;                           /* an unique identifier for the entity */
+};
+
+/**
+ * xmlParserNodeInfo:
+ *
+ * The parser can be asked to collect Node information, i.e. at what
+ * place in the file they were detected.
+ * NOTE: This is off by default and not very well tested.
+ */
+typedef struct _xmlParserNodeInfo xmlParserNodeInfo;
+typedef xmlParserNodeInfo *xmlParserNodeInfoPtr;
+
+struct _xmlParserNodeInfo {
+  const struct _xmlNode* node;
+  /* Position & line # that text that created the node begins & ends on */
+  unsigned long begin_pos;
+  unsigned long begin_line;
+  unsigned long end_pos;
+  unsigned long end_line;
+};
+
+typedef struct _xmlParserNodeInfoSeq xmlParserNodeInfoSeq;
+typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;
+struct _xmlParserNodeInfoSeq {
+  unsigned long maximum;
+  unsigned long length;
+  xmlParserNodeInfo* buffer;
+};
+
+/**
+ * xmlParserInputState:
+ *
+ * The parser is now working also as a state based parser.
+ * The recursive one use the state info for entities processing.
+ */
+typedef enum {
+    XML_PARSER_EOF = -1,	/* nothing is to be parsed */
+    XML_PARSER_START = 0,	/* nothing has been parsed */
+    XML_PARSER_MISC,		/* Misc* before int subset */
+    XML_PARSER_PI,		/* Within a processing instruction */
+    XML_PARSER_DTD,		/* within some DTD content */
+    XML_PARSER_PROLOG,		/* Misc* after internal subset */
+    XML_PARSER_COMMENT,		/* within a comment */
+    XML_PARSER_START_TAG,	/* within a start tag */
+    XML_PARSER_CONTENT,		/* within the content */
+    XML_PARSER_CDATA_SECTION,	/* within a CDATA section */
+    XML_PARSER_END_TAG,		/* within a closing tag */
+    XML_PARSER_ENTITY_DECL,	/* within an entity declaration */
+    XML_PARSER_ENTITY_VALUE,	/* within an entity value in a decl */
+    XML_PARSER_ATTRIBUTE_VALUE,	/* within an attribute value */
+    XML_PARSER_SYSTEM_LITERAL,	/* within a SYSTEM value */
+    XML_PARSER_EPILOG,		/* the Misc* after the last end tag */
+    XML_PARSER_IGNORE,		/* within an IGNORED section */
+    XML_PARSER_PUBLIC_LITERAL	/* within a PUBLIC value */
+} xmlParserInputState;
+
+/**
+ * XML_DETECT_IDS:
+ *
+ * Bit in the loadsubset context field to tell to do ID/REFs lookups.
+ * Use it to initialize xmlLoadExtDtdDefaultValue.
+ */
+#define XML_DETECT_IDS		2
+
+/**
+ * XML_COMPLETE_ATTRS:
+ *
+ * Bit in the loadsubset context field to tell to do complete the
+ * elements attributes lists with the ones defaulted from the DTDs.
+ * Use it to initialize xmlLoadExtDtdDefaultValue.
+ */
+#define XML_COMPLETE_ATTRS	4
+
+/**
+ * XML_SKIP_IDS:
+ *
+ * Bit in the loadsubset context field to tell to not do ID/REFs registration.
+ * Used to initialize xmlLoadExtDtdDefaultValue in some special cases.
+ */
+#define XML_SKIP_IDS		8
+
+/**
+ * xmlParserMode:
+ *
+ * A parser can operate in various modes
+ */
+typedef enum {
+    XML_PARSE_UNKNOWN = 0,
+    XML_PARSE_DOM = 1,
+    XML_PARSE_SAX = 2,
+    XML_PARSE_PUSH_DOM = 3,
+    XML_PARSE_PUSH_SAX = 4,
+    XML_PARSE_READER = 5
+} xmlParserMode;
+
+/**
+ * xmlParserCtxt:
+ *
+ * The parser context.
+ * NOTE This doesn't completely define the parser state, the (current ?)
+ *      design of the parser uses recursive function calls since this allow
+ *      and easy mapping from the production rules of the specification
+ *      to the actual code. The drawback is that the actual function call
+ *      also reflect the parser state. However most of the parsing routines
+ *      takes as the only argument the parser context pointer, so migrating
+ *      to a state based parser for progressive parsing shouldn't be too hard.
+ */
+struct _xmlParserCtxt {
+    struct _xmlSAXHandler *sax;       /* The SAX handler */
+    void            *userData;        /* For SAX interface only, used by DOM build */
+    xmlDocPtr           myDoc;        /* the document being built */
+    int            wellFormed;        /* is the document well formed */
+    int       replaceEntities;        /* shall we replace entities ? */
+    const xmlChar    *version;        /* the XML version string */
+    const xmlChar   *encoding;        /* the declared encoding, if any */
+    int            standalone;        /* standalone document */
+    int                  html;        /* an HTML(1)/Docbook(2) document
+                                       * 3 is HTML after <head>
+                                       * 10 is HTML after <body>
+                                       */
+
+    /* Input stream stack */
+    xmlParserInputPtr  input;         /* Current input stream */
+    int                inputNr;       /* Number of current input streams */
+    int                inputMax;      /* Max number of input streams */
+    xmlParserInputPtr *inputTab;      /* stack of inputs */
+
+    /* Node analysis stack only used for DOM building */
+    xmlNodePtr         node;          /* Current parsed Node */
+    int                nodeNr;        /* Depth of the parsing stack */
+    int                nodeMax;       /* Max depth of the parsing stack */
+    xmlNodePtr        *nodeTab;       /* array of nodes */
+
+    int record_info;                  /* Whether node info should be kept */
+    xmlParserNodeInfoSeq node_seq;    /* info about each node parsed */
+
+    int errNo;                        /* error code */
+
+    int     hasExternalSubset;        /* reference and external subset */
+    int             hasPErefs;        /* the internal subset has PE refs */
+    int              external;        /* are we parsing an external entity */
+
+    int                 valid;        /* is the document valid */
+    int              validate;        /* shall we try to validate ? */
+    xmlValidCtxt        vctxt;        /* The validity context */
+
+    xmlParserInputState instate;      /* current type of input */
+    int                 token;        /* next char look-ahead */
+
+    char           *directory;        /* the data directory */
+
+    /* Node name stack */
+    const xmlChar     *name;          /* Current parsed Node */
+    int                nameNr;        /* Depth of the parsing stack */
+    int                nameMax;       /* Max depth of the parsing stack */
+    const xmlChar *   *nameTab;       /* array of nodes */
+
+    long               nbChars;       /* unused */
+    long            checkIndex;       /* used by progressive parsing lookup */
+    int             keepBlanks;       /* ugly but ... */
+    int             disableSAX;       /* SAX callbacks are disabled */
+    int               inSubset;       /* Parsing is in int 1/ext 2 subset */
+    const xmlChar *    intSubName;    /* name of subset */
+    xmlChar *          extSubURI;     /* URI of external subset */
+    xmlChar *          extSubSystem;  /* SYSTEM ID of external subset */
+
+    /* xml:space values */
+    int *              space;         /* Should the parser preserve spaces */
+    int                spaceNr;       /* Depth of the parsing stack */
+    int                spaceMax;      /* Max depth of the parsing stack */
+    int *              spaceTab;      /* array of space infos */
+
+    int                depth;         /* to prevent entity substitution loops */
+    xmlParserInputPtr  entity;        /* used to check entities boundaries */
+    int                charset;       /* encoding of the in-memory content
+				         actually an xmlCharEncoding */
+    int                nodelen;       /* Those two fields are there to */
+    int                nodemem;       /* Speed up large node parsing */
+    int                pedantic;      /* signal pedantic warnings */
+    void              *_private;      /* For user data, libxml won't touch it */
+
+    int                loadsubset;    /* should the external subset be loaded */
+    int                linenumbers;   /* set line number in element content */
+    void              *catalogs;      /* document's own catalog */
+    int                recovery;      /* run in recovery mode */
+    int                progressive;   /* is this a progressive parsing */
+    xmlDictPtr         dict;          /* dictionary for the parser */
+    const xmlChar *   *atts;          /* array for the attributes callbacks */
+    int                maxatts;       /* the size of the array */
+    int                docdict;       /* use strings from dict to build tree */
+
+    /*
+     * pre-interned strings
+     */
+    const xmlChar *str_xml;
+    const xmlChar *str_xmlns;
+    const xmlChar *str_xml_ns;
+
+    /*
+     * Everything below is used only by the new SAX mode
+     */
+    int                sax2;          /* operating in the new SAX mode */
+    int                nsNr;          /* the number of inherited namespaces */
+    int                nsMax;         /* the size of the arrays */
+    const xmlChar *   *nsTab;         /* the array of prefix/namespace name */
+    int               *attallocs;     /* which attribute were allocated */
+    void *            *pushTab;       /* array of data for push */
+    xmlHashTablePtr    attsDefault;   /* defaulted attributes if any */
+    xmlHashTablePtr    attsSpecial;   /* non-CDATA attributes if any */
+    int                nsWellFormed;  /* is the document XML Namespace okay */
+    int                options;       /* Extra options */
+
+    /*
+     * Those fields are needed only for streaming parsing so far
+     */
+    int               dictNames;    /* Use dictionary names for the tree */
+    int               freeElemsNr;  /* number of freed element nodes */
+    xmlNodePtr        freeElems;    /* List of freed element nodes */
+    int               freeAttrsNr;  /* number of freed attributes nodes */
+    xmlAttrPtr        freeAttrs;    /* List of freed attributes nodes */
+
+    /*
+     * the complete error information for the last error.
+     */
+    xmlError          lastError;
+    xmlParserMode     parseMode;    /* the parser mode */
+    unsigned long    nbentities;    /* number of entities references */
+    unsigned long  sizeentities;    /* size of parsed entities */
+
+    /* for use by HTML non-recursive parser */
+    xmlParserNodeInfo *nodeInfo;      /* Current NodeInfo */
+    int                nodeInfoNr;    /* Depth of the parsing stack */
+    int                nodeInfoMax;   /* Max depth of the parsing stack */
+    xmlParserNodeInfo *nodeInfoTab;   /* array of nodeInfos */
+
+    int                input_id;      /* we need to label inputs */
+    unsigned long      sizeentcopy;   /* volume of entity copy */
+};
+
+/**
+ * xmlSAXLocator:
+ *
+ * A SAX Locator.
+ */
+struct _xmlSAXLocator {
+    const xmlChar *(*getPublicId)(void *ctx);
+    const xmlChar *(*getSystemId)(void *ctx);
+    int (*getLineNumber)(void *ctx);
+    int (*getColumnNumber)(void *ctx);
+};
+
+/**
+ * xmlSAXHandler:
+ *
+ * A SAX handler is bunch of callbacks called by the parser when processing
+ * of the input generate data or structure information.
+ */
+
+/**
+ * resolveEntitySAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ *
+ * Callback:
+ * The entity loader, to control the loading of external entities,
+ * the application can either:
+ *    - override this resolveEntity() callback in the SAX block
+ *    - or better use the xmlSetExternalEntityLoader() function to
+ *      set up it's own entity resolution routine
+ *
+ * Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
+ */
+typedef xmlParserInputPtr (*resolveEntitySAXFunc) (void *ctx,
+				const xmlChar *publicId,
+				const xmlChar *systemId);
+/**
+ * internalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the root element name
+ * @ExternalID:  the external ID
+ * @SystemID:  the SYSTEM ID (e.g. filename or URL)
+ *
+ * Callback on internal subset declaration.
+ */
+typedef void (*internalSubsetSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar *ExternalID,
+				const xmlChar *SystemID);
+/**
+ * externalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the root element name
+ * @ExternalID:  the external ID
+ * @SystemID:  the SYSTEM ID (e.g. filename or URL)
+ *
+ * Callback on external subset declaration.
+ */
+typedef void (*externalSubsetSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar *ExternalID,
+				const xmlChar *SystemID);
+/**
+ * getEntitySAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The entity name
+ *
+ * Get an entity by name.
+ *
+ * Returns the xmlEntityPtr if found.
+ */
+typedef xmlEntityPtr (*getEntitySAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * getParameterEntitySAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The entity name
+ *
+ * Get a parameter entity by name.
+ *
+ * Returns the xmlEntityPtr if found.
+ */
+typedef xmlEntityPtr (*getParameterEntitySAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * entityDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the entity name
+ * @type:  the entity type
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ * @content: the entity value (without processing).
+ *
+ * An entity definition has been parsed.
+ */
+typedef void (*entityDeclSAXFunc) (void *ctx,
+				const xmlChar *name,
+				int type,
+				const xmlChar *publicId,
+				const xmlChar *systemId,
+				xmlChar *content);
+/**
+ * notationDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The name of the notation
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ *
+ * What to do when a notation declaration has been parsed.
+ */
+typedef void (*notationDeclSAXFunc)(void *ctx,
+				const xmlChar *name,
+				const xmlChar *publicId,
+				const xmlChar *systemId);
+/**
+ * attributeDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @elem:  the name of the element
+ * @fullname:  the attribute name
+ * @type:  the attribute type
+ * @def:  the type of default value
+ * @defaultValue: the attribute default value
+ * @tree:  the tree of enumerated value set
+ *
+ * An attribute definition has been parsed.
+ */
+typedef void (*attributeDeclSAXFunc)(void *ctx,
+				const xmlChar *elem,
+				const xmlChar *fullname,
+				int type,
+				int def,
+				const xmlChar *defaultValue,
+				xmlEnumerationPtr tree);
+/**
+ * elementDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the element name
+ * @type:  the element type
+ * @content: the element value tree
+ *
+ * An element definition has been parsed.
+ */
+typedef void (*elementDeclSAXFunc)(void *ctx,
+				const xmlChar *name,
+				int type,
+				xmlElementContentPtr content);
+/**
+ * unparsedEntityDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The name of the entity
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ * @notationName: the name of the notation
+ *
+ * What to do when an unparsed entity declaration is parsed.
+ */
+typedef void (*unparsedEntityDeclSAXFunc)(void *ctx,
+				const xmlChar *name,
+				const xmlChar *publicId,
+				const xmlChar *systemId,
+				const xmlChar *notationName);
+/**
+ * setDocumentLocatorSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @loc: A SAX Locator
+ *
+ * Receive the document locator at startup, actually xmlDefaultSAXLocator.
+ * Everything is available on the context, so this is useless in our case.
+ */
+typedef void (*setDocumentLocatorSAXFunc) (void *ctx,
+				xmlSAXLocatorPtr loc);
+/**
+ * startDocumentSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Called when the document start being processed.
+ */
+typedef void (*startDocumentSAXFunc) (void *ctx);
+/**
+ * endDocumentSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Called when the document end has been detected.
+ */
+typedef void (*endDocumentSAXFunc) (void *ctx);
+/**
+ * startElementSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The element name, including namespace prefix
+ * @atts:  An array of name/value attributes pairs, NULL terminated
+ *
+ * Called when an opening tag has been processed.
+ */
+typedef void (*startElementSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar **atts);
+/**
+ * endElementSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The element name
+ *
+ * Called when the end of an element has been detected.
+ */
+typedef void (*endElementSAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * attributeSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The attribute name, including namespace prefix
+ * @value:  The attribute value
+ *
+ * Handle an attribute that has been read by the parser.
+ * The default handling is to convert the attribute into an
+ * DOM subtree and past it in a new xmlAttr element added to
+ * the element.
+ */
+typedef void (*attributeSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar *value);
+/**
+ * referenceSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The entity name
+ *
+ * Called when an entity reference is detected.
+ */
+typedef void (*referenceSAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * charactersSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @ch:  a xmlChar string
+ * @len: the number of xmlChar
+ *
+ * Receiving some chars from the parser.
+ */
+typedef void (*charactersSAXFunc) (void *ctx,
+				const xmlChar *ch,
+				int len);
+/**
+ * ignorableWhitespaceSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @ch:  a xmlChar string
+ * @len: the number of xmlChar
+ *
+ * Receiving some ignorable whitespaces from the parser.
+ * UNUSED: by default the DOM building will use characters.
+ */
+typedef void (*ignorableWhitespaceSAXFunc) (void *ctx,
+				const xmlChar *ch,
+				int len);
+/**
+ * processingInstructionSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @target:  the target name
+ * @data: the PI data's
+ *
+ * A processing instruction has been parsed.
+ */
+typedef void (*processingInstructionSAXFunc) (void *ctx,
+				const xmlChar *target,
+				const xmlChar *data);
+/**
+ * commentSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @value:  the comment content
+ *
+ * A comment has been parsed.
+ */
+typedef void (*commentSAXFunc) (void *ctx,
+				const xmlChar *value);
+/**
+ * cdataBlockSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @value:  The pcdata content
+ * @len:  the block length
+ *
+ * Called when a pcdata block has been parsed.
+ */
+typedef void (*cdataBlockSAXFunc) (
+	                        void *ctx,
+				const xmlChar *value,
+				int len);
+/**
+ * warningSAXFunc:
+ * @ctx:  an XML parser context
+ * @msg:  the message to display/transmit
+ * @...:  extra parameters for the message display
+ *
+ * Display and format a warning messages, callback.
+ */
+typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * errorSAXFunc:
+ * @ctx:  an XML parser context
+ * @msg:  the message to display/transmit
+ * @...:  extra parameters for the message display
+ *
+ * Display and format an error messages, callback.
+ */
+typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * fatalErrorSAXFunc:
+ * @ctx:  an XML parser context
+ * @msg:  the message to display/transmit
+ * @...:  extra parameters for the message display
+ *
+ * Display and format fatal error messages, callback.
+ * Note: so far fatalError() SAX callbacks are not used, error()
+ *       get all the callbacks for errors.
+ */
+typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx,
+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * isStandaloneSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Is this document tagged standalone?
+ *
+ * Returns 1 if true
+ */
+typedef int (*isStandaloneSAXFunc) (void *ctx);
+/**
+ * hasInternalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Does this document has an internal subset.
+ *
+ * Returns 1 if true
+ */
+typedef int (*hasInternalSubsetSAXFunc) (void *ctx);
+
+/**
+ * hasExternalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Does this document has an external subset?
+ *
+ * Returns 1 if true
+ */
+typedef int (*hasExternalSubsetSAXFunc) (void *ctx);
+
+/************************************************************************
+ *									*
+ *			The SAX version 2 API extensions		*
+ *									*
+ ************************************************************************/
+/**
+ * XML_SAX2_MAGIC:
+ *
+ * Special constant found in SAX2 blocks initialized fields
+ */
+#define XML_SAX2_MAGIC 0xDEEDBEAF
+
+/**
+ * startElementNsSAX2Func:
+ * @ctx:  the user data (XML parser context)
+ * @localname:  the local name of the element
+ * @prefix:  the element namespace prefix if available
+ * @URI:  the element namespace name if available
+ * @nb_namespaces:  number of namespace definitions on that node
+ * @namespaces:  pointer to the array of prefix/URI pairs namespace definitions
+ * @nb_attributes:  the number of attributes on that node
+ * @nb_defaulted:  the number of defaulted attributes. The defaulted
+ *                  ones are at the end of the array
+ * @attributes:  pointer to the array of (localname/prefix/URI/value/end)
+ *               attribute values.
+ *
+ * SAX2 callback when an element start has been detected by the parser.
+ * It provides the namespace information for the element, as well as
+ * the new namespace declarations on the element.
+ */
+
+typedef void (*startElementNsSAX2Func) (void *ctx,
+					const xmlChar *localname,
+					const xmlChar *prefix,
+					const xmlChar *URI,
+					int nb_namespaces,
+					const xmlChar **namespaces,
+					int nb_attributes,
+					int nb_defaulted,
+					const xmlChar **attributes);
+
+/**
+ * endElementNsSAX2Func:
+ * @ctx:  the user data (XML parser context)
+ * @localname:  the local name of the element
+ * @prefix:  the element namespace prefix if available
+ * @URI:  the element namespace name if available
+ *
+ * SAX2 callback when an element end has been detected by the parser.
+ * It provides the namespace information for the element.
+ */
+
+typedef void (*endElementNsSAX2Func)   (void *ctx,
+					const xmlChar *localname,
+					const xmlChar *prefix,
+					const xmlChar *URI);
+
+
+struct _xmlSAXHandler {
+    internalSubsetSAXFunc internalSubset;
+    isStandaloneSAXFunc isStandalone;
+    hasInternalSubsetSAXFunc hasInternalSubset;
+    hasExternalSubsetSAXFunc hasExternalSubset;
+    resolveEntitySAXFunc resolveEntity;
+    getEntitySAXFunc getEntity;
+    entityDeclSAXFunc entityDecl;
+    notationDeclSAXFunc notationDecl;
+    attributeDeclSAXFunc attributeDecl;
+    elementDeclSAXFunc elementDecl;
+    unparsedEntityDeclSAXFunc unparsedEntityDecl;
+    setDocumentLocatorSAXFunc setDocumentLocator;
+    startDocumentSAXFunc startDocument;
+    endDocumentSAXFunc endDocument;
+    startElementSAXFunc startElement;
+    endElementSAXFunc endElement;
+    referenceSAXFunc reference;
+    charactersSAXFunc characters;
+    ignorableWhitespaceSAXFunc ignorableWhitespace;
+    processingInstructionSAXFunc processingInstruction;
+    commentSAXFunc comment;
+    warningSAXFunc warning;
+    errorSAXFunc error;
+    fatalErrorSAXFunc fatalError; /* unused error() get all the errors */
+    getParameterEntitySAXFunc getParameterEntity;
+    cdataBlockSAXFunc cdataBlock;
+    externalSubsetSAXFunc externalSubset;
+    unsigned int initialized;
+    /* The following fields are extensions available only on version 2 */
+    void *_private;
+    startElementNsSAX2Func startElementNs;
+    endElementNsSAX2Func endElementNs;
+    xmlStructuredErrorFunc serror;
+};
+
+/*
+ * SAX Version 1
+ */
+typedef struct _xmlSAXHandlerV1 xmlSAXHandlerV1;
+typedef xmlSAXHandlerV1 *xmlSAXHandlerV1Ptr;
+struct _xmlSAXHandlerV1 {
+    internalSubsetSAXFunc internalSubset;
+    isStandaloneSAXFunc isStandalone;
+    hasInternalSubsetSAXFunc hasInternalSubset;
+    hasExternalSubsetSAXFunc hasExternalSubset;
+    resolveEntitySAXFunc resolveEntity;
+    getEntitySAXFunc getEntity;
+    entityDeclSAXFunc entityDecl;
+    notationDeclSAXFunc notationDecl;
+    attributeDeclSAXFunc attributeDecl;
+    elementDeclSAXFunc elementDecl;
+    unparsedEntityDeclSAXFunc unparsedEntityDecl;
+    setDocumentLocatorSAXFunc setDocumentLocator;
+    startDocumentSAXFunc startDocument;
+    endDocumentSAXFunc endDocument;
+    startElementSAXFunc startElement;
+    endElementSAXFunc endElement;
+    referenceSAXFunc reference;
+    charactersSAXFunc characters;
+    ignorableWhitespaceSAXFunc ignorableWhitespace;
+    processingInstructionSAXFunc processingInstruction;
+    commentSAXFunc comment;
+    warningSAXFunc warning;
+    errorSAXFunc error;
+    fatalErrorSAXFunc fatalError; /* unused error() get all the errors */
+    getParameterEntitySAXFunc getParameterEntity;
+    cdataBlockSAXFunc cdataBlock;
+    externalSubsetSAXFunc externalSubset;
+    unsigned int initialized;
+};
+
+
+/**
+ * xmlExternalEntityLoader:
+ * @URL: The System ID of the resource requested
+ * @ID: The Public ID of the resource requested
+ * @context: the XML parser context
+ *
+ * External entity loaders types.
+ *
+ * Returns the entity input parser.
+ */
+typedef xmlParserInputPtr (*xmlExternalEntityLoader) (const char *URL,
+					 const char *ID,
+					 xmlParserCtxtPtr context);
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <libxml/encoding.h>
+#include <libxml/xmlIO.h>
+#include <libxml/globals.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * Init/Cleanup
+ */
+XMLPUBFUN void XMLCALL
+		xmlInitParser		(void);
+XMLPUBFUN void XMLCALL
+		xmlCleanupParser	(void);
+
+/*
+ * Input functions
+ */
+XMLPUBFUN int XMLCALL
+		xmlParserInputRead	(xmlParserInputPtr in,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlParserInputGrow	(xmlParserInputPtr in,
+					 int len);
+
+/*
+ * Basic parsing Interfaces
+ */
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseDoc		(const xmlChar *cur);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseFile		(const char *filename);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseMemory		(const char *buffer,
+					 int size);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN int XMLCALL
+		xmlSubstituteEntitiesDefault(int val);
+XMLPUBFUN int XMLCALL
+		xmlKeepBlanksDefault	(int val);
+XMLPUBFUN void XMLCALL
+		xmlStopParser		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlPedanticParserDefault(int val);
+XMLPUBFUN int XMLCALL
+		xmlLineNumbersDefault	(int val);
+
+#ifdef LIBXML_SAX1_ENABLED
+/*
+ * Recovery mode
+ */
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlRecoverDoc		(const xmlChar *cur);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlRecoverMemory	(const char *buffer,
+					 int size);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlRecoverFile		(const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
+
+/*
+ * Less common routines and SAX interfaces
+ */
+XMLPUBFUN int XMLCALL
+		xmlParseDocument	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlParseExtParsedEnt	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlSAXUserParseFile	(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlSAXUserParseMemory	(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 const char *buffer,
+					 int size);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseDoc		(xmlSAXHandlerPtr sax,
+					 const xmlChar *cur,
+					 int recovery);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseMemory	(xmlSAXHandlerPtr sax,
+					 const char *buffer,
+					 int size,
+					 int recovery);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseMemoryWithData (xmlSAXHandlerPtr sax,
+					 const char *buffer,
+					 int size,
+					 int recovery,
+					 void *data);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseFile		(xmlSAXHandlerPtr sax,
+					 const char *filename,
+					 int recovery);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseFileWithData	(xmlSAXHandlerPtr sax,
+					 const char *filename,
+					 int recovery,
+					 void *data);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseEntity	(xmlSAXHandlerPtr sax,
+					 const char *filename);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseEntity		(const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
+
+#ifdef LIBXML_VALID_ENABLED
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlSAXParseDTD		(xmlSAXHandlerPtr sax,
+					 const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlParseDTD		(const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlIOParseDTD		(xmlSAXHandlerPtr sax,
+					 xmlParserInputBufferPtr input,
+					 xmlCharEncoding enc);
+#endif /* LIBXML_VALID_ENABLE */
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlParseBalancedChunkMemory(xmlDocPtr doc,
+					 xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 int depth,
+					 const xmlChar *string,
+					 xmlNodePtr *lst);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN xmlParserErrors XMLCALL
+		xmlParseInNodeContext	(xmlNodePtr node,
+					 const char *data,
+					 int datalen,
+					 int options,
+					 xmlNodePtr *lst);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
+                     xmlSAXHandlerPtr sax,
+                     void *user_data,
+                     int depth,
+                     const xmlChar *string,
+                     xmlNodePtr *lst,
+                     int recover);
+XMLPUBFUN int XMLCALL
+		xmlParseExternalEntity	(xmlDocPtr doc,
+					 xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 int depth,
+					 const xmlChar *URL,
+					 const xmlChar *ID,
+					 xmlNodePtr *lst);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN int XMLCALL
+		xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx,
+					 const xmlChar *URL,
+					 const xmlChar *ID,
+					 xmlNodePtr *lst);
+
+/*
+ * Parser contexts handling.
+ */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlNewParserCtxt	(void);
+XMLPUBFUN int XMLCALL
+		xmlInitParserCtxt	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlClearParserCtxt	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlFreeParserCtxt	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlSetupParserForBuffer	(xmlParserCtxtPtr ctxt,
+					 const xmlChar* buffer,
+					 const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlCreateDocParserCtxt	(const xmlChar *cur);
+
+#ifdef LIBXML_LEGACY_ENABLED
+/*
+ * Reading/setting optional parsing features.
+ */
+XMLPUBFUN int XMLCALL
+		xmlGetFeaturesList	(int *len,
+					 const char **result);
+XMLPUBFUN int XMLCALL
+		xmlGetFeature		(xmlParserCtxtPtr ctxt,
+					 const char *name,
+					 void *result);
+XMLPUBFUN int XMLCALL
+		xmlSetFeature		(xmlParserCtxtPtr ctxt,
+					 const char *name,
+					 void *value);
+#endif /* LIBXML_LEGACY_ENABLED */
+
+#ifdef LIBXML_PUSH_ENABLED
+/*
+ * Interfaces for the Push mode.
+ */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 const char *chunk,
+					 int size,
+					 const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlParseChunk		(xmlParserCtxtPtr ctxt,
+					 const char *chunk,
+					 int size,
+					 int terminate);
+#endif /* LIBXML_PUSH_ENABLED */
+
+/*
+ * Special I/O mode.
+ */
+
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlCreateIOParserCtxt	(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 xmlInputReadCallback   ioread,
+					 xmlInputCloseCallback  ioclose,
+					 void *ioctx,
+					 xmlCharEncoding enc);
+
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		xmlNewIOInputStream	(xmlParserCtxtPtr ctxt,
+					 xmlParserInputBufferPtr input,
+					 xmlCharEncoding enc);
+
+/*
+ * Node infos.
+ */
+XMLPUBFUN const xmlParserNodeInfo* XMLCALL
+		xmlParserFindNodeInfo	(const xmlParserCtxtPtr ctxt,
+				         const xmlNodePtr node);
+XMLPUBFUN void XMLCALL
+		xmlInitNodeInfoSeq	(xmlParserNodeInfoSeqPtr seq);
+XMLPUBFUN void XMLCALL
+		xmlClearNodeInfoSeq	(xmlParserNodeInfoSeqPtr seq);
+XMLPUBFUN unsigned long XMLCALL
+		xmlParserFindNodeInfoIndex(const xmlParserNodeInfoSeqPtr seq,
+                                         const xmlNodePtr node);
+XMLPUBFUN void XMLCALL
+		xmlParserAddNodeInfo	(xmlParserCtxtPtr ctxt,
+					 const xmlParserNodeInfoPtr info);
+
+/*
+ * External entities handling actually implemented in xmlIO.
+ */
+
+XMLPUBFUN void XMLCALL
+		xmlSetExternalEntityLoader(xmlExternalEntityLoader f);
+XMLPUBFUN xmlExternalEntityLoader XMLCALL
+		xmlGetExternalEntityLoader(void);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		xmlLoadExternalEntity	(const char *URL,
+					 const char *ID,
+					 xmlParserCtxtPtr ctxt);
+
+/*
+ * Index lookup, actually implemented in the encoding module
+ */
+XMLPUBFUN long XMLCALL
+		xmlByteConsumed		(xmlParserCtxtPtr ctxt);
+
+/*
+ * New set of simpler/more flexible APIs
+ */
+/**
+ * xmlParserOption:
+ *
+ * This is the set of XML parser options that can be passed down
+ * to the xmlReadDoc() and similar calls.
+ */
+typedef enum {
+    XML_PARSE_RECOVER	= 1<<0,	/* recover on errors */
+    XML_PARSE_NOENT	= 1<<1,	/* substitute entities */
+    XML_PARSE_DTDLOAD	= 1<<2,	/* load the external subset */
+    XML_PARSE_DTDATTR	= 1<<3,	/* default DTD attributes */
+    XML_PARSE_DTDVALID	= 1<<4,	/* validate with the DTD */
+    XML_PARSE_NOERROR	= 1<<5,	/* suppress error reports */
+    XML_PARSE_NOWARNING	= 1<<6,	/* suppress warning reports */
+    XML_PARSE_PEDANTIC	= 1<<7,	/* pedantic error reporting */
+    XML_PARSE_NOBLANKS	= 1<<8,	/* remove blank nodes */
+    XML_PARSE_SAX1	= 1<<9,	/* use the SAX1 interface internally */
+    XML_PARSE_XINCLUDE	= 1<<10,/* Implement XInclude substitution  */
+    XML_PARSE_NONET	= 1<<11,/* Forbid network access */
+    XML_PARSE_NODICT	= 1<<12,/* Do not reuse the context dictionary */
+    XML_PARSE_NSCLEAN	= 1<<13,/* remove redundant namespaces declarations */
+    XML_PARSE_NOCDATA	= 1<<14,/* merge CDATA as text nodes */
+    XML_PARSE_NOXINCNODE= 1<<15,/* do not generate XINCLUDE START/END nodes */
+    XML_PARSE_COMPACT   = 1<<16,/* compact small text nodes; no modification of
+                                   the tree allowed afterwards (will possibly
+				   crash if you try to modify the tree) */
+    XML_PARSE_OLD10	= 1<<17,/* parse using XML-1.0 before update 5 */
+    XML_PARSE_NOBASEFIX = 1<<18,/* do not fixup XINCLUDE xml:base uris */
+    XML_PARSE_HUGE      = 1<<19,/* relax any hardcoded limit from the parser */
+    XML_PARSE_OLDSAX    = 1<<20,/* parse using SAX2 interface before 2.7.0 */
+    XML_PARSE_IGNORE_ENC= 1<<21,/* ignore internal document encoding hint */
+    XML_PARSE_BIG_LINES = 1<<22 /* Store big lines numbers in text PSVI field */
+} xmlParserOption;
+
+XMLPUBFUN void XMLCALL
+		xmlCtxtReset		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlCtxtResetPush	(xmlParserCtxtPtr ctxt,
+					 const char *chunk,
+					 int size,
+					 const char *filename,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+		xmlCtxtUseOptions	(xmlParserCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadDoc		(const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadFile		(const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadMemory		(const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadFd		(int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadIO		(xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadDoc		(xmlParserCtxtPtr ctxt,
+					 const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadFile		(xmlParserCtxtPtr ctxt,
+					 const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadMemory		(xmlParserCtxtPtr ctxt,
+					 const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadFd		(xmlParserCtxtPtr ctxt,
+					 int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadIO		(xmlParserCtxtPtr ctxt,
+					 xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+
+/*
+ * Library wide options
+ */
+/**
+ * xmlFeature:
+ *
+ * Used to examine the existence of features that can be enabled
+ * or disabled at compile-time.
+ * They used to be called XML_FEATURE_xxx but this clashed with Expat
+ */
+typedef enum {
+    XML_WITH_THREAD = 1,
+    XML_WITH_TREE = 2,
+    XML_WITH_OUTPUT = 3,
+    XML_WITH_PUSH = 4,
+    XML_WITH_READER = 5,
+    XML_WITH_PATTERN = 6,
+    XML_WITH_WRITER = 7,
+    XML_WITH_SAX1 = 8,
+    XML_WITH_FTP = 9,
+    XML_WITH_HTTP = 10,
+    XML_WITH_VALID = 11,
+    XML_WITH_HTML = 12,
+    XML_WITH_LEGACY = 13,
+    XML_WITH_C14N = 14,
+    XML_WITH_CATALOG = 15,
+    XML_WITH_XPATH = 16,
+    XML_WITH_XPTR = 17,
+    XML_WITH_XINCLUDE = 18,
+    XML_WITH_ICONV = 19,
+    XML_WITH_ISO8859X = 20,
+    XML_WITH_UNICODE = 21,
+    XML_WITH_REGEXP = 22,
+    XML_WITH_AUTOMATA = 23,
+    XML_WITH_EXPR = 24,
+    XML_WITH_SCHEMAS = 25,
+    XML_WITH_SCHEMATRON = 26,
+    XML_WITH_MODULES = 27,
+    XML_WITH_DEBUG = 28,
+    XML_WITH_DEBUG_MEM = 29,
+    XML_WITH_DEBUG_RUN = 30,
+    XML_WITH_ZLIB = 31,
+    XML_WITH_ICU = 32,
+    XML_WITH_LZMA = 33,
+    XML_WITH_NONE = 99999 /* just to be sure of allocation size */
+} xmlFeature;
+
+XMLPUBFUN int XMLCALL
+		xmlHasFeature		(xmlFeature feature);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_PARSER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/parserInternals.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/parserInternals.h
new file mode 100644
index 0000000..1f26ce2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/parserInternals.h
@@ -0,0 +1,644 @@
+/*
+ * Summary: internals routines and limits exported by the parser.
+ * Description: this module exports a number of internal parsing routines
+ *              they are not really all intended for applications but
+ *              can prove useful doing low level processing.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_PARSER_INTERNALS_H__
+#define __XML_PARSER_INTERNALS_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/HTMLparser.h>
+#include <libxml/chvalid.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlParserMaxDepth:
+ *
+ * arbitrary depth limit for the XML documents that we allow to
+ * process. This is not a limitation of the parser but a safety
+ * boundary feature, use XML_PARSE_HUGE option to override it.
+ */
+XMLPUBVAR unsigned int xmlParserMaxDepth;
+
+/**
+ * XML_MAX_TEXT_LENGTH:
+ *
+ * Maximum size allowed for a single text node when building a tree.
+ * This is not a limitation of the parser but a safety boundary feature,
+ * use XML_PARSE_HUGE option to override it.
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_TEXT_LENGTH 10000000
+
+/**
+ * XML_MAX_NAME_LENGTH:
+ *
+ * Maximum size allowed for a markup identifier.
+ * This is not a limitation of the parser but a safety boundary feature,
+ * use XML_PARSE_HUGE option to override it.
+ * Note that with the use of parsing dictionaries overriding the limit
+ * may result in more runtime memory usage in face of "unfriendly' content
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_NAME_LENGTH 50000
+
+/**
+ * XML_MAX_DICTIONARY_LIMIT:
+ *
+ * Maximum size allowed by the parser for a dictionary by default
+ * This is not a limitation of the parser but a safety boundary feature,
+ * use XML_PARSE_HUGE option to override it.
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_DICTIONARY_LIMIT 10000000
+
+/**
+ * XML_MAX_LOOKUP_LIMIT:
+ *
+ * Maximum size allowed by the parser for ahead lookup
+ * This is an upper boundary enforced by the parser to avoid bad
+ * behaviour on "unfriendly' content
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_LOOKUP_LIMIT 10000000
+
+/**
+ * XML_MAX_NAMELEN:
+ *
+ * Identifiers can be longer, but this will be more costly
+ * at runtime.
+ */
+#define XML_MAX_NAMELEN 100
+
+/**
+ * INPUT_CHUNK:
+ *
+ * The parser tries to always have that amount of input ready.
+ * One of the point is providing context when reporting errors.
+ */
+#define INPUT_CHUNK	250
+
+/************************************************************************
+ *									*
+ * UNICODE version of the macros.					*
+ *									*
+ ************************************************************************/
+/**
+ * IS_BYTE_CHAR:
+ * @c:  an byte value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [2] Char ::= #x9 | #xA | #xD | [#x20...]
+ * any byte character in the accepted range
+ */
+#define IS_BYTE_CHAR(c)	 xmlIsChar_ch(c)
+
+/**
+ * IS_CHAR:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+ *                  | [#x10000-#x10FFFF]
+ * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
+ */
+#define IS_CHAR(c)   xmlIsCharQ(c)
+
+/**
+ * IS_CHAR_CH:
+ * @c: an xmlChar (usually an unsigned char)
+ *
+ * Behaves like IS_CHAR on single-byte value
+ */
+#define IS_CHAR_CH(c)  xmlIsChar_ch(c)
+
+/**
+ * IS_BLANK:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [3] S ::= (#x20 | #x9 | #xD | #xA)+
+ */
+#define IS_BLANK(c)  xmlIsBlankQ(c)
+
+/**
+ * IS_BLANK_CH:
+ * @c:  an xmlChar value (normally unsigned char)
+ *
+ * Behaviour same as IS_BLANK
+ */
+#define IS_BLANK_CH(c)  xmlIsBlank_ch(c)
+
+/**
+ * IS_BASECHAR:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [85] BaseChar ::= ... long list see REC ...
+ */
+#define IS_BASECHAR(c) xmlIsBaseCharQ(c)
+
+/**
+ * IS_DIGIT:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [88] Digit ::= ... long list see REC ...
+ */
+#define IS_DIGIT(c) xmlIsDigitQ(c)
+
+/**
+ * IS_DIGIT_CH:
+ * @c:  an xmlChar value (usually an unsigned char)
+ *
+ * Behaves like IS_DIGIT but with a single byte argument
+ */
+#define IS_DIGIT_CH(c)  xmlIsDigit_ch(c)
+
+/**
+ * IS_COMBINING:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [87] CombiningChar ::= ... long list see REC ...
+ */
+#define IS_COMBINING(c) xmlIsCombiningQ(c)
+
+/**
+ * IS_COMBINING_CH:
+ * @c:  an xmlChar (usually an unsigned char)
+ *
+ * Always false (all combining chars > 0xff)
+ */
+#define IS_COMBINING_CH(c) 0
+
+/**
+ * IS_EXTENDER:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [89] Extender ::= #x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 |
+ *                   #x0E46 | #x0EC6 | #x3005 | [#x3031-#x3035] |
+ *                   [#x309D-#x309E] | [#x30FC-#x30FE]
+ */
+#define IS_EXTENDER(c) xmlIsExtenderQ(c)
+
+/**
+ * IS_EXTENDER_CH:
+ * @c:  an xmlChar value (usually an unsigned char)
+ *
+ * Behaves like IS_EXTENDER but with a single-byte argument
+ */
+#define IS_EXTENDER_CH(c)  xmlIsExtender_ch(c)
+
+/**
+ * IS_IDEOGRAPHIC:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [86] Ideographic ::= [#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029]
+ */
+#define IS_IDEOGRAPHIC(c) xmlIsIdeographicQ(c)
+
+/**
+ * IS_LETTER:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [84] Letter ::= BaseChar | Ideographic
+ */
+#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))
+
+/**
+ * IS_LETTER_CH:
+ * @c:  an xmlChar value (normally unsigned char)
+ *
+ * Macro behaves like IS_LETTER, but only check base chars
+ *
+ */
+#define IS_LETTER_CH(c) xmlIsBaseChar_ch(c)
+
+/**
+ * IS_ASCII_LETTER:
+ * @c: an xmlChar value
+ *
+ * Macro to check [a-zA-Z]
+ *
+ */
+#define IS_ASCII_LETTER(c)	(((0x41 <= (c)) && ((c) <= 0x5a)) || \
+				 ((0x61 <= (c)) && ((c) <= 0x7a)))
+
+/**
+ * IS_ASCII_DIGIT:
+ * @c: an xmlChar value
+ *
+ * Macro to check [0-9]
+ *
+ */
+#define IS_ASCII_DIGIT(c)	((0x30 <= (c)) && ((c) <= 0x39))
+
+/**
+ * IS_PUBIDCHAR:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]
+ */
+#define IS_PUBIDCHAR(c)	xmlIsPubidCharQ(c)
+
+/**
+ * IS_PUBIDCHAR_CH:
+ * @c:  an xmlChar value (normally unsigned char)
+ *
+ * Same as IS_PUBIDCHAR but for single-byte value
+ */
+#define IS_PUBIDCHAR_CH(c) xmlIsPubidChar_ch(c)
+
+/**
+ * SKIP_EOL:
+ * @p:  and UTF8 string pointer
+ *
+ * Skips the end of line chars.
+ */
+#define SKIP_EOL(p)							\
+    if (*(p) == 0x13) { p++ ; if (*(p) == 0x10) p++; }			\
+    if (*(p) == 0x10) { p++ ; if (*(p) == 0x13) p++; }
+
+/**
+ * MOVETO_ENDTAG:
+ * @p:  and UTF8 string pointer
+ *
+ * Skips to the next '>' char.
+ */
+#define MOVETO_ENDTAG(p)						\
+    while ((*p) && (*(p) != '>')) (p)++
+
+/**
+ * MOVETO_STARTTAG:
+ * @p:  and UTF8 string pointer
+ *
+ * Skips to the next '<' char.
+ */
+#define MOVETO_STARTTAG(p)						\
+    while ((*p) && (*(p) != '<')) (p)++
+
+/**
+ * Global variables used for predefined strings.
+ */
+XMLPUBVAR const xmlChar xmlStringText[];
+XMLPUBVAR const xmlChar xmlStringTextNoenc[];
+XMLPUBVAR const xmlChar xmlStringComment[];
+
+/*
+ * Function to finish the work of the macros where needed.
+ */
+XMLPUBFUN int XMLCALL                   xmlIsLetter     (int c);
+
+/**
+ * Parser context.
+ */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateFileParserCtxt	(const char *filename);
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateURLParserCtxt	(const char *filename,
+						 int options);
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateMemoryParserCtxt(const char *buffer,
+						 int size);
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateEntityParserCtxt(const xmlChar *URL,
+						 const xmlChar *ID,
+						 const xmlChar *base);
+XMLPUBFUN int XMLCALL
+			xmlSwitchEncoding	(xmlParserCtxtPtr ctxt,
+						 xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+			xmlSwitchToEncoding	(xmlParserCtxtPtr ctxt,
+					 xmlCharEncodingHandlerPtr handler);
+XMLPUBFUN int XMLCALL
+			xmlSwitchInputEncoding	(xmlParserCtxtPtr ctxt,
+						 xmlParserInputPtr input,
+					 xmlCharEncodingHandlerPtr handler);
+
+#ifdef IN_LIBXML
+/* internal error reporting */
+XMLPUBFUN void XMLCALL
+			__xmlErrEncoding	(xmlParserCtxtPtr ctxt,
+						 xmlParserErrors xmlerr,
+						 const char *msg,
+						 const xmlChar * str1,
+						 const xmlChar * str2) LIBXML_ATTR_FORMAT(3,0);
+#endif
+
+/**
+ * Input Streams.
+ */
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewStringInputStream	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *buffer);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewEntityInputStream	(xmlParserCtxtPtr ctxt,
+						 xmlEntityPtr entity);
+XMLPUBFUN int XMLCALL
+			xmlPushInput		(xmlParserCtxtPtr ctxt,
+						 xmlParserInputPtr input);
+XMLPUBFUN xmlChar XMLCALL
+			xmlPopInput		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlFreeInputStream	(xmlParserInputPtr input);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewInputFromFile	(xmlParserCtxtPtr ctxt,
+						 const char *filename);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewInputStream	(xmlParserCtxtPtr ctxt);
+
+/**
+ * Namespaces.
+ */
+XMLPUBFUN xmlChar * XMLCALL
+			xmlSplitQName		(xmlParserCtxtPtr ctxt,
+						 const xmlChar *name,
+						 xmlChar **prefix);
+
+/**
+ * Generic production rules.
+ */
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseName		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseNmtoken		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseEntityValue	(xmlParserCtxtPtr ctxt,
+						 xmlChar **orig);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseAttValue	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseSystemLiteral	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParsePubidLiteral	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseCharData	(xmlParserCtxtPtr ctxt,
+						 int cdata);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseExternalID	(xmlParserCtxtPtr ctxt,
+						 xmlChar **publicID,
+						 int strict);
+XMLPUBFUN void XMLCALL
+			xmlParseComment		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParsePITarget	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParsePI		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseNotationDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseEntityDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseDefaultDecl	(xmlParserCtxtPtr ctxt,
+						 xmlChar **value);
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+			xmlParseNotationType	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+			xmlParseEnumerationType	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseEnumeratedType	(xmlParserCtxtPtr ctxt,
+						 xmlEnumerationPtr *tree);
+XMLPUBFUN int XMLCALL
+			xmlParseAttributeType	(xmlParserCtxtPtr ctxt,
+						 xmlEnumerationPtr *tree);
+XMLPUBFUN void XMLCALL
+			xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+			xmlParseElementMixedContentDecl
+						(xmlParserCtxtPtr ctxt,
+						 int inputchk);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+			xmlParseElementChildrenContentDecl
+						(xmlParserCtxtPtr ctxt,
+						 int inputchk);
+XMLPUBFUN int XMLCALL
+			xmlParseElementContentDecl(xmlParserCtxtPtr ctxt,
+						 const xmlChar *name,
+						 xmlElementContentPtr *result);
+XMLPUBFUN int XMLCALL
+			xmlParseElementDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseMarkupDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseCharRef		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlParseEntityRef	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseReference	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParsePEReference	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseDocTypeDecl	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseAttribute	(xmlParserCtxtPtr ctxt,
+						 xmlChar **value);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseStartTag	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseEndTag		(xmlParserCtxtPtr ctxt);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN void XMLCALL
+			xmlParseCDSect		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseContent		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseElement		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseVersionNum	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseVersionInfo	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseEncName		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseEncodingDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseSDDecl		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseXMLDecl		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseTextDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseMisc		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseExternalSubset	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+/**
+ * XML_SUBSTITUTE_NONE:
+ *
+ * If no entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_NONE	0
+/**
+ * XML_SUBSTITUTE_REF:
+ *
+ * Whether general entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_REF	1
+/**
+ * XML_SUBSTITUTE_PEREF:
+ *
+ * Whether parameter entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_PEREF	2
+/**
+ * XML_SUBSTITUTE_BOTH:
+ *
+ * Both general and parameter entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_BOTH	3
+
+XMLPUBFUN xmlChar * XMLCALL
+		xmlStringDecodeEntities		(xmlParserCtxtPtr ctxt,
+						 const xmlChar *str,
+						 int what,
+						 xmlChar end,
+						 xmlChar  end2,
+						 xmlChar end3);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlStringLenDecodeEntities	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *str,
+						 int len,
+						 int what,
+						 xmlChar end,
+						 xmlChar  end2,
+						 xmlChar end3);
+
+/*
+ * Generated by MACROS on top of parser.c c.f. PUSH_AND_POP.
+ */
+XMLPUBFUN int XMLCALL			nodePush		(xmlParserCtxtPtr ctxt,
+						 xmlNodePtr value);
+XMLPUBFUN xmlNodePtr XMLCALL		nodePop			(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			inputPush		(xmlParserCtxtPtr ctxt,
+						 xmlParserInputPtr value);
+XMLPUBFUN xmlParserInputPtr XMLCALL	inputPop		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN const xmlChar * XMLCALL	namePop			(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			namePush		(xmlParserCtxtPtr ctxt,
+						 const xmlChar *value);
+
+/*
+ * other commodities shared between parser.c and parserInternals.
+ */
+XMLPUBFUN int XMLCALL			xmlSkipBlankChars	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			xmlStringCurrentChar	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *cur,
+						 int *len);
+XMLPUBFUN void XMLCALL			xmlParserHandlePEReference(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			xmlCheckLanguageID	(const xmlChar *lang);
+
+/*
+ * Really core function shared with HTML parser.
+ */
+XMLPUBFUN int XMLCALL			xmlCurrentChar		(xmlParserCtxtPtr ctxt,
+						 int *len);
+XMLPUBFUN int XMLCALL		xmlCopyCharMultiByte	(xmlChar *out,
+						 int val);
+XMLPUBFUN int XMLCALL			xmlCopyChar		(int len,
+						 xmlChar *out,
+						 int val);
+XMLPUBFUN void XMLCALL			xmlNextChar		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL			xmlParserInputShrink	(xmlParserInputPtr in);
+
+#ifdef LIBXML_HTML_ENABLED
+/*
+ * Actually comes from the HTML parser but launched from the init stuff.
+ */
+XMLPUBFUN void XMLCALL			htmlInitAutoClose	(void);
+XMLPUBFUN htmlParserCtxtPtr XMLCALL	htmlCreateFileParserCtxt(const char *filename,
+	                                         const char *encoding);
+#endif
+
+/*
+ * Specific function to keep track of entities references
+ * and used by the XSLT debugger.
+ */
+#ifdef LIBXML_LEGACY_ENABLED
+/**
+ * xmlEntityReferenceFunc:
+ * @ent: the entity
+ * @firstNode:  the fist node in the chunk
+ * @lastNode:  the last nod in the chunk
+ *
+ * Callback function used when one needs to be able to track back the
+ * provenance of a chunk of nodes inherited from an entity replacement.
+ */
+typedef	void	(*xmlEntityReferenceFunc)	(xmlEntityPtr ent,
+						 xmlNodePtr firstNode,
+						 xmlNodePtr lastNode);
+
+XMLPUBFUN void XMLCALL		xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func);
+
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseQuotedString	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+                        xmlParseNamespace       (xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlNamespaceParseNSDef	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlScanName		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlNamespaceParseNCName	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL	xmlParserHandleReference(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlNamespaceParseQName	(xmlParserCtxtPtr ctxt,
+						 xmlChar **prefix);
+/**
+ * Entities
+ */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlDecodeEntities		(xmlParserCtxtPtr ctxt,
+						 int len,
+						 int what,
+						 xmlChar end,
+						 xmlChar  end2,
+						 xmlChar end3);
+XMLPUBFUN void XMLCALL
+			xmlHandleEntity		(xmlParserCtxtPtr ctxt,
+						 xmlEntityPtr entity);
+
+#endif /* LIBXML_LEGACY_ENABLED */
+
+#ifdef IN_LIBXML
+/*
+ * internal only
+ */
+XMLPUBFUN void XMLCALL
+	xmlErrMemory		(xmlParserCtxtPtr ctxt,
+				 const char *extra);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_PARSER_INTERNALS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/pattern.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/pattern.h
new file mode 100644
index 0000000..97d2cd2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/pattern.h
@@ -0,0 +1,100 @@
+/*
+ * Summary: pattern expression handling
+ * Description: allows to compile and test pattern expressions for nodes
+ *              either in a tree or based on a parser state.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_PATTERN_H__
+#define __XML_PATTERN_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/dict.h>
+
+#ifdef LIBXML_PATTERN_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlPattern:
+ *
+ * A compiled (XPath based) pattern to select nodes
+ */
+typedef struct _xmlPattern xmlPattern;
+typedef xmlPattern *xmlPatternPtr;
+
+/**
+ * xmlPatternFlags:
+ *
+ * This is the set of options affecting the behaviour of pattern
+ * matching with this module
+ *
+ */
+typedef enum {
+    XML_PATTERN_DEFAULT		= 0,	/* simple pattern match */
+    XML_PATTERN_XPATH		= 1<<0,	/* standard XPath pattern */
+    XML_PATTERN_XSSEL		= 1<<1,	/* XPath subset for schema selector */
+    XML_PATTERN_XSFIELD		= 1<<2	/* XPath subset for schema field */
+} xmlPatternFlags;
+
+XMLPUBFUN void XMLCALL
+			xmlFreePattern		(xmlPatternPtr comp);
+
+XMLPUBFUN void XMLCALL
+			xmlFreePatternList	(xmlPatternPtr comp);
+
+XMLPUBFUN xmlPatternPtr XMLCALL
+			xmlPatterncompile	(const xmlChar *pattern,
+						 xmlDict *dict,
+						 int flags,
+						 const xmlChar **namespaces);
+XMLPUBFUN int XMLCALL
+			xmlPatternMatch		(xmlPatternPtr comp,
+						 xmlNodePtr node);
+
+/* streaming interfaces */
+typedef struct _xmlStreamCtxt xmlStreamCtxt;
+typedef xmlStreamCtxt *xmlStreamCtxtPtr;
+
+XMLPUBFUN int XMLCALL
+			xmlPatternStreamable	(xmlPatternPtr comp);
+XMLPUBFUN int XMLCALL
+			xmlPatternMaxDepth	(xmlPatternPtr comp);
+XMLPUBFUN int XMLCALL
+			xmlPatternMinDepth	(xmlPatternPtr comp);
+XMLPUBFUN int XMLCALL
+			xmlPatternFromRoot	(xmlPatternPtr comp);
+XMLPUBFUN xmlStreamCtxtPtr XMLCALL
+			xmlPatternGetStreamCtxt	(xmlPatternPtr comp);
+XMLPUBFUN void XMLCALL
+			xmlFreeStreamCtxt	(xmlStreamCtxtPtr stream);
+XMLPUBFUN int XMLCALL
+			xmlStreamPushNode	(xmlStreamCtxtPtr stream,
+						 const xmlChar *name,
+						 const xmlChar *ns,
+						 int nodeType);
+XMLPUBFUN int XMLCALL
+			xmlStreamPush		(xmlStreamCtxtPtr stream,
+						 const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN int XMLCALL
+			xmlStreamPushAttr	(xmlStreamCtxtPtr stream,
+						 const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN int XMLCALL
+			xmlStreamPop		(xmlStreamCtxtPtr stream);
+XMLPUBFUN int XMLCALL
+			xmlStreamWantsAnyNode	(xmlStreamCtxtPtr stream);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_PATTERN_ENABLED */
+
+#endif /* __XML_PATTERN_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/relaxng.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/relaxng.h
new file mode 100644
index 0000000..f269c9e
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/relaxng.h
@@ -0,0 +1,217 @@
+/*
+ * Summary: implementation of the Relax-NG validation
+ * Description: implementation of the Relax-NG validation
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_RELAX_NG__
+#define __XML_RELAX_NG__
+
+#include <libxml/xmlversion.h>
+#include <libxml/hash.h>
+#include <libxml/xmlstring.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _xmlRelaxNG xmlRelaxNG;
+typedef xmlRelaxNG *xmlRelaxNGPtr;
+
+
+/**
+ * xmlRelaxNGValidityErrorFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of an error callback from a Relax-NG validation
+ */
+typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx,
+						      const char *msg,
+						      ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * xmlRelaxNGValidityWarningFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of a warning callback from a Relax-NG validation
+ */
+typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx,
+							const char *msg,
+							...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * A schemas validation context
+ */
+typedef struct _xmlRelaxNGParserCtxt xmlRelaxNGParserCtxt;
+typedef xmlRelaxNGParserCtxt *xmlRelaxNGParserCtxtPtr;
+
+typedef struct _xmlRelaxNGValidCtxt xmlRelaxNGValidCtxt;
+typedef xmlRelaxNGValidCtxt *xmlRelaxNGValidCtxtPtr;
+
+/*
+ * xmlRelaxNGValidErr:
+ *
+ * List of possible Relax NG validation errors
+ */
+typedef enum {
+    XML_RELAXNG_OK = 0,
+    XML_RELAXNG_ERR_MEMORY,
+    XML_RELAXNG_ERR_TYPE,
+    XML_RELAXNG_ERR_TYPEVAL,
+    XML_RELAXNG_ERR_DUPID,
+    XML_RELAXNG_ERR_TYPECMP,
+    XML_RELAXNG_ERR_NOSTATE,
+    XML_RELAXNG_ERR_NODEFINE,
+    XML_RELAXNG_ERR_LISTEXTRA,
+    XML_RELAXNG_ERR_LISTEMPTY,
+    XML_RELAXNG_ERR_INTERNODATA,
+    XML_RELAXNG_ERR_INTERSEQ,
+    XML_RELAXNG_ERR_INTEREXTRA,
+    XML_RELAXNG_ERR_ELEMNAME,
+    XML_RELAXNG_ERR_ATTRNAME,
+    XML_RELAXNG_ERR_ELEMNONS,
+    XML_RELAXNG_ERR_ATTRNONS,
+    XML_RELAXNG_ERR_ELEMWRONGNS,
+    XML_RELAXNG_ERR_ATTRWRONGNS,
+    XML_RELAXNG_ERR_ELEMEXTRANS,
+    XML_RELAXNG_ERR_ATTREXTRANS,
+    XML_RELAXNG_ERR_ELEMNOTEMPTY,
+    XML_RELAXNG_ERR_NOELEM,
+    XML_RELAXNG_ERR_NOTELEM,
+    XML_RELAXNG_ERR_ATTRVALID,
+    XML_RELAXNG_ERR_CONTENTVALID,
+    XML_RELAXNG_ERR_EXTRACONTENT,
+    XML_RELAXNG_ERR_INVALIDATTR,
+    XML_RELAXNG_ERR_DATAELEM,
+    XML_RELAXNG_ERR_VALELEM,
+    XML_RELAXNG_ERR_LISTELEM,
+    XML_RELAXNG_ERR_DATATYPE,
+    XML_RELAXNG_ERR_VALUE,
+    XML_RELAXNG_ERR_LIST,
+    XML_RELAXNG_ERR_NOGRAMMAR,
+    XML_RELAXNG_ERR_EXTRADATA,
+    XML_RELAXNG_ERR_LACKDATA,
+    XML_RELAXNG_ERR_INTERNAL,
+    XML_RELAXNG_ERR_ELEMWRONG,
+    XML_RELAXNG_ERR_TEXTWRONG
+} xmlRelaxNGValidErr;
+
+/*
+ * xmlRelaxNGParserFlags:
+ *
+ * List of possible Relax NG Parser flags
+ */
+typedef enum {
+    XML_RELAXNGP_NONE = 0,
+    XML_RELAXNGP_FREE_DOC = 1,
+    XML_RELAXNGP_CRNG = 2
+} xmlRelaxNGParserFlag;
+
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGInitTypes		(void);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGCleanupTypes	(void);
+
+/*
+ * Interfaces for parsing.
+ */
+XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
+		    xmlRelaxNGNewParserCtxt	(const char *URL);
+XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
+		    xmlRelaxNGNewMemParserCtxt	(const char *buffer,
+						 int size);
+XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
+		    xmlRelaxNGNewDocParserCtxt	(xmlDocPtr doc);
+
+XMLPUBFUN int XMLCALL
+		    xmlRelaxParserSetFlag	(xmlRelaxNGParserCtxtPtr ctxt,
+						 int flag);
+
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGFreeParserCtxt	(xmlRelaxNGParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc err,
+					 xmlRelaxNGValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc *err,
+					 xmlRelaxNGValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGSetParserStructuredErrors(
+					 xmlRelaxNGParserCtxtPtr ctxt,
+					 xmlStructuredErrorFunc serror,
+					 void *ctx);
+XMLPUBFUN xmlRelaxNGPtr XMLCALL
+		    xmlRelaxNGParse		(xmlRelaxNGParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGFree		(xmlRelaxNGPtr schema);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGDump		(FILE *output,
+					 xmlRelaxNGPtr schema);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGDumpTree	(FILE * output,
+					 xmlRelaxNGPtr schema);
+#endif /* LIBXML_OUTPUT_ENABLED */
+/*
+ * Interfaces for validating
+ */
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc err,
+					 xmlRelaxNGValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc *err,
+					 xmlRelaxNGValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN void XMLCALL
+			xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt,
+					  xmlStructuredErrorFunc serror, void *ctx);
+XMLPUBFUN xmlRelaxNGValidCtxtPtr XMLCALL
+		    xmlRelaxNGNewValidCtxt	(xmlRelaxNGPtr schema);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGFreeValidCtxt	(xmlRelaxNGValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidateDoc	(xmlRelaxNGValidCtxtPtr ctxt,
+						 xmlDocPtr doc);
+/*
+ * Interfaces for progressive validation when possible
+ */
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidatePushElement	(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidatePushCData	(xmlRelaxNGValidCtxtPtr ctxt,
+					 const xmlChar *data,
+					 int len);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidatePopElement	(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidateFullElement	(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+
+#endif /* __XML_RELAX_NG__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/schemasInternals.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/schemasInternals.h
new file mode 100644
index 0000000..c521d1c
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/schemasInternals.h
@@ -0,0 +1,958 @@
+/*
+ * Summary: internal interfaces for XML Schemas
+ * Description: internal interfaces for the XML Schemas handling
+ *              and schema validity checking
+ *		The Schemas development is a Work In Progress.
+ *              Some of those interfaces are not guaranteed to be API or ABI stable !
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMA_INTERNALS_H__
+#define __XML_SCHEMA_INTERNALS_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#include <libxml/xmlregexp.h>
+#include <libxml/hash.h>
+#include <libxml/dict.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    XML_SCHEMAS_UNKNOWN = 0,
+    XML_SCHEMAS_STRING = 1,
+    XML_SCHEMAS_NORMSTRING = 2,
+    XML_SCHEMAS_DECIMAL = 3,
+    XML_SCHEMAS_TIME = 4,
+    XML_SCHEMAS_GDAY = 5,
+    XML_SCHEMAS_GMONTH = 6,
+    XML_SCHEMAS_GMONTHDAY = 7,
+    XML_SCHEMAS_GYEAR = 8,
+    XML_SCHEMAS_GYEARMONTH = 9,
+    XML_SCHEMAS_DATE = 10,
+    XML_SCHEMAS_DATETIME = 11,
+    XML_SCHEMAS_DURATION = 12,
+    XML_SCHEMAS_FLOAT = 13,
+    XML_SCHEMAS_DOUBLE = 14,
+    XML_SCHEMAS_BOOLEAN = 15,
+    XML_SCHEMAS_TOKEN = 16,
+    XML_SCHEMAS_LANGUAGE = 17,
+    XML_SCHEMAS_NMTOKEN = 18,
+    XML_SCHEMAS_NMTOKENS = 19,
+    XML_SCHEMAS_NAME = 20,
+    XML_SCHEMAS_QNAME = 21,
+    XML_SCHEMAS_NCNAME = 22,
+    XML_SCHEMAS_ID = 23,
+    XML_SCHEMAS_IDREF = 24,
+    XML_SCHEMAS_IDREFS = 25,
+    XML_SCHEMAS_ENTITY = 26,
+    XML_SCHEMAS_ENTITIES = 27,
+    XML_SCHEMAS_NOTATION = 28,
+    XML_SCHEMAS_ANYURI = 29,
+    XML_SCHEMAS_INTEGER = 30,
+    XML_SCHEMAS_NPINTEGER = 31,
+    XML_SCHEMAS_NINTEGER = 32,
+    XML_SCHEMAS_NNINTEGER = 33,
+    XML_SCHEMAS_PINTEGER = 34,
+    XML_SCHEMAS_INT = 35,
+    XML_SCHEMAS_UINT = 36,
+    XML_SCHEMAS_LONG = 37,
+    XML_SCHEMAS_ULONG = 38,
+    XML_SCHEMAS_SHORT = 39,
+    XML_SCHEMAS_USHORT = 40,
+    XML_SCHEMAS_BYTE = 41,
+    XML_SCHEMAS_UBYTE = 42,
+    XML_SCHEMAS_HEXBINARY = 43,
+    XML_SCHEMAS_BASE64BINARY = 44,
+    XML_SCHEMAS_ANYTYPE = 45,
+    XML_SCHEMAS_ANYSIMPLETYPE = 46
+} xmlSchemaValType;
+
+/*
+ * XML Schemas defines multiple type of types.
+ */
+typedef enum {
+    XML_SCHEMA_TYPE_BASIC = 1, /* A built-in datatype */
+    XML_SCHEMA_TYPE_ANY,
+    XML_SCHEMA_TYPE_FACET,
+    XML_SCHEMA_TYPE_SIMPLE,
+    XML_SCHEMA_TYPE_COMPLEX,
+    XML_SCHEMA_TYPE_SEQUENCE = 6,
+    XML_SCHEMA_TYPE_CHOICE,
+    XML_SCHEMA_TYPE_ALL,
+    XML_SCHEMA_TYPE_SIMPLE_CONTENT,
+    XML_SCHEMA_TYPE_COMPLEX_CONTENT,
+    XML_SCHEMA_TYPE_UR,
+    XML_SCHEMA_TYPE_RESTRICTION,
+    XML_SCHEMA_TYPE_EXTENSION,
+    XML_SCHEMA_TYPE_ELEMENT,
+    XML_SCHEMA_TYPE_ATTRIBUTE,
+    XML_SCHEMA_TYPE_ATTRIBUTEGROUP,
+    XML_SCHEMA_TYPE_GROUP,
+    XML_SCHEMA_TYPE_NOTATION,
+    XML_SCHEMA_TYPE_LIST,
+    XML_SCHEMA_TYPE_UNION,
+    XML_SCHEMA_TYPE_ANY_ATTRIBUTE,
+    XML_SCHEMA_TYPE_IDC_UNIQUE,
+    XML_SCHEMA_TYPE_IDC_KEY,
+    XML_SCHEMA_TYPE_IDC_KEYREF,
+    XML_SCHEMA_TYPE_PARTICLE = 25,
+    XML_SCHEMA_TYPE_ATTRIBUTE_USE,
+    XML_SCHEMA_FACET_MININCLUSIVE = 1000,
+    XML_SCHEMA_FACET_MINEXCLUSIVE,
+    XML_SCHEMA_FACET_MAXINCLUSIVE,
+    XML_SCHEMA_FACET_MAXEXCLUSIVE,
+    XML_SCHEMA_FACET_TOTALDIGITS,
+    XML_SCHEMA_FACET_FRACTIONDIGITS,
+    XML_SCHEMA_FACET_PATTERN,
+    XML_SCHEMA_FACET_ENUMERATION,
+    XML_SCHEMA_FACET_WHITESPACE,
+    XML_SCHEMA_FACET_LENGTH,
+    XML_SCHEMA_FACET_MAXLENGTH,
+    XML_SCHEMA_FACET_MINLENGTH,
+    XML_SCHEMA_EXTRA_QNAMEREF = 2000,
+    XML_SCHEMA_EXTRA_ATTR_USE_PROHIB
+} xmlSchemaTypeType;
+
+typedef enum {
+    XML_SCHEMA_CONTENT_UNKNOWN = 0,
+    XML_SCHEMA_CONTENT_EMPTY = 1,
+    XML_SCHEMA_CONTENT_ELEMENTS,
+    XML_SCHEMA_CONTENT_MIXED,
+    XML_SCHEMA_CONTENT_SIMPLE,
+    XML_SCHEMA_CONTENT_MIXED_OR_ELEMENTS, /* Obsolete */
+    XML_SCHEMA_CONTENT_BASIC,
+    XML_SCHEMA_CONTENT_ANY
+} xmlSchemaContentType;
+
+typedef struct _xmlSchemaVal xmlSchemaVal;
+typedef xmlSchemaVal *xmlSchemaValPtr;
+
+typedef struct _xmlSchemaType xmlSchemaType;
+typedef xmlSchemaType *xmlSchemaTypePtr;
+
+typedef struct _xmlSchemaFacet xmlSchemaFacet;
+typedef xmlSchemaFacet *xmlSchemaFacetPtr;
+
+/**
+ * Annotation
+ */
+typedef struct _xmlSchemaAnnot xmlSchemaAnnot;
+typedef xmlSchemaAnnot *xmlSchemaAnnotPtr;
+struct _xmlSchemaAnnot {
+    struct _xmlSchemaAnnot *next;
+    xmlNodePtr content;         /* the annotation */
+};
+
+/**
+ * XML_SCHEMAS_ANYATTR_SKIP:
+ *
+ * Skip unknown attribute from validation
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ANYATTR_SKIP        1
+/**
+ * XML_SCHEMAS_ANYATTR_LAX:
+ *
+ * Ignore validation non definition on attributes
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ANYATTR_LAX                2
+/**
+ * XML_SCHEMAS_ANYATTR_STRICT:
+ *
+ * Apply strict validation rules on attributes
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ANYATTR_STRICT        3
+/**
+ * XML_SCHEMAS_ANY_SKIP:
+ *
+ * Skip unknown attribute from validation
+ */
+#define XML_SCHEMAS_ANY_SKIP        1
+/**
+ * XML_SCHEMAS_ANY_LAX:
+ *
+ * Used by wildcards.
+ * Validate if type found, don't worry if not found
+ */
+#define XML_SCHEMAS_ANY_LAX                2
+/**
+ * XML_SCHEMAS_ANY_STRICT:
+ *
+ * Used by wildcards.
+ * Apply strict validation rules
+ */
+#define XML_SCHEMAS_ANY_STRICT        3
+/**
+ * XML_SCHEMAS_ATTR_USE_PROHIBITED:
+ *
+ * Used by wildcards.
+ * The attribute is prohibited.
+ */
+#define XML_SCHEMAS_ATTR_USE_PROHIBITED 0
+/**
+ * XML_SCHEMAS_ATTR_USE_REQUIRED:
+ *
+ * The attribute is required.
+ */
+#define XML_SCHEMAS_ATTR_USE_REQUIRED 1
+/**
+ * XML_SCHEMAS_ATTR_USE_OPTIONAL:
+ *
+ * The attribute is optional.
+ */
+#define XML_SCHEMAS_ATTR_USE_OPTIONAL 2
+/**
+ * XML_SCHEMAS_ATTR_GLOBAL:
+ *
+ * allow elements in no namespace
+ */
+#define XML_SCHEMAS_ATTR_GLOBAL        1 << 0
+/**
+ * XML_SCHEMAS_ATTR_NSDEFAULT:
+ *
+ * allow elements in no namespace
+ */
+#define XML_SCHEMAS_ATTR_NSDEFAULT        1 << 7
+/**
+ * XML_SCHEMAS_ATTR_INTERNAL_RESOLVED:
+ *
+ * this is set when the "type" and "ref" references
+ * have been resolved.
+ */
+#define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED        1 << 8
+/**
+ * XML_SCHEMAS_ATTR_FIXED:
+ *
+ * the attribute has a fixed value
+ */
+#define XML_SCHEMAS_ATTR_FIXED        1 << 9
+
+/**
+ * xmlSchemaAttribute:
+ * An attribute definition.
+ */
+
+typedef struct _xmlSchemaAttribute xmlSchemaAttribute;
+typedef xmlSchemaAttribute *xmlSchemaAttributePtr;
+struct _xmlSchemaAttribute {
+    xmlSchemaTypeType type;
+    struct _xmlSchemaAttribute *next; /* the next attribute (not used?) */
+    const xmlChar *name; /* the name of the declaration */
+    const xmlChar *id; /* Deprecated; not used */
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    const xmlChar *typeName; /* the local name of the type definition */
+    const xmlChar *typeNs; /* the ns URI of the type definition */
+    xmlSchemaAnnotPtr annot;
+
+    xmlSchemaTypePtr base; /* Deprecated; not used */
+    int occurs; /* Deprecated; not used */
+    const xmlChar *defValue; /* The initial value of the value constraint */
+    xmlSchemaTypePtr subtypes; /* the type definition */
+    xmlNodePtr node;
+    const xmlChar *targetNamespace;
+    int flags;
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaValPtr defVal; /* The compiled value constraint */
+    xmlSchemaAttributePtr refDecl; /* Deprecated; not used */
+};
+
+/**
+ * xmlSchemaAttributeLink:
+ * Used to build a list of attribute uses on complexType definitions.
+ * WARNING: Deprecated; not used.
+ */
+typedef struct _xmlSchemaAttributeLink xmlSchemaAttributeLink;
+typedef xmlSchemaAttributeLink *xmlSchemaAttributeLinkPtr;
+struct _xmlSchemaAttributeLink {
+    struct _xmlSchemaAttributeLink *next;/* the next attribute link ... */
+    struct _xmlSchemaAttribute *attr;/* the linked attribute */
+};
+
+/**
+ * XML_SCHEMAS_WILDCARD_COMPLETE:
+ *
+ * If the wildcard is complete.
+ */
+#define XML_SCHEMAS_WILDCARD_COMPLETE 1 << 0
+
+/**
+ * xmlSchemaCharValueLink:
+ * Used to build a list of namespaces on wildcards.
+ */
+typedef struct _xmlSchemaWildcardNs xmlSchemaWildcardNs;
+typedef xmlSchemaWildcardNs *xmlSchemaWildcardNsPtr;
+struct _xmlSchemaWildcardNs {
+    struct _xmlSchemaWildcardNs *next;/* the next constraint link ... */
+    const xmlChar *value;/* the value */
+};
+
+/**
+ * xmlSchemaWildcard.
+ * A wildcard.
+ */
+typedef struct _xmlSchemaWildcard xmlSchemaWildcard;
+typedef xmlSchemaWildcard *xmlSchemaWildcardPtr;
+struct _xmlSchemaWildcard {
+    xmlSchemaTypeType type;        /* The kind of type */
+    const xmlChar *id; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+    xmlNodePtr node;
+    int minOccurs; /* Deprecated; not used */
+    int maxOccurs; /* Deprecated; not used */
+    int processContents;
+    int any; /* Indicates if the ns constraint is of ##any */
+    xmlSchemaWildcardNsPtr nsSet; /* The list of allowed namespaces */
+    xmlSchemaWildcardNsPtr negNsSet; /* The negated namespace */
+    int flags;
+};
+
+/**
+ * XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED:
+ *
+ * The attribute wildcard has been built.
+ */
+#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED 1 << 0
+/**
+ * XML_SCHEMAS_ATTRGROUP_GLOBAL:
+ *
+ * The attribute group has been defined.
+ */
+#define XML_SCHEMAS_ATTRGROUP_GLOBAL 1 << 1
+/**
+ * XML_SCHEMAS_ATTRGROUP_MARKED:
+ *
+ * Marks the attr group as marked; used for circular checks.
+ */
+#define XML_SCHEMAS_ATTRGROUP_MARKED 1 << 2
+
+/**
+ * XML_SCHEMAS_ATTRGROUP_REDEFINED:
+ *
+ * The attr group was redefined.
+ */
+#define XML_SCHEMAS_ATTRGROUP_REDEFINED 1 << 3
+/**
+ * XML_SCHEMAS_ATTRGROUP_HAS_REFS:
+ *
+ * Whether this attr. group contains attr. group references.
+ */
+#define XML_SCHEMAS_ATTRGROUP_HAS_REFS 1 << 4
+
+/**
+ * An attribute group definition.
+ *
+ * xmlSchemaAttribute and xmlSchemaAttributeGroup start of structures
+ * must be kept similar
+ */
+typedef struct _xmlSchemaAttributeGroup xmlSchemaAttributeGroup;
+typedef xmlSchemaAttributeGroup *xmlSchemaAttributeGroupPtr;
+struct _xmlSchemaAttributeGroup {
+    xmlSchemaTypeType type;        /* The kind of type */
+    struct _xmlSchemaAttribute *next;/* the next attribute if in a group ... */
+    const xmlChar *name;
+    const xmlChar *id;
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+
+    xmlSchemaAttributePtr attributes; /* Deprecated; not used */
+    xmlNodePtr node;
+    int flags;
+    xmlSchemaWildcardPtr attributeWildcard;
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaAttributeGroupPtr refItem; /* Deprecated; not used */
+    const xmlChar *targetNamespace;
+    void *attrUses;
+};
+
+/**
+ * xmlSchemaTypeLink:
+ * Used to build a list of types (e.g. member types of
+ * simpleType with variety "union").
+ */
+typedef struct _xmlSchemaTypeLink xmlSchemaTypeLink;
+typedef xmlSchemaTypeLink *xmlSchemaTypeLinkPtr;
+struct _xmlSchemaTypeLink {
+    struct _xmlSchemaTypeLink *next;/* the next type link ... */
+    xmlSchemaTypePtr type;/* the linked type */
+};
+
+/**
+ * xmlSchemaFacetLink:
+ * Used to build a list of facets.
+ */
+typedef struct _xmlSchemaFacetLink xmlSchemaFacetLink;
+typedef xmlSchemaFacetLink *xmlSchemaFacetLinkPtr;
+struct _xmlSchemaFacetLink {
+    struct _xmlSchemaFacetLink *next;/* the next facet link ... */
+    xmlSchemaFacetPtr facet;/* the linked facet */
+};
+
+/**
+ * XML_SCHEMAS_TYPE_MIXED:
+ *
+ * the element content type is mixed
+ */
+#define XML_SCHEMAS_TYPE_MIXED                1 << 0
+/**
+ * XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION:
+ *
+ * the simple or complex type has a derivation method of "extension".
+ */
+#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION                1 << 1
+/**
+ * XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION:
+ *
+ * the simple or complex type has a derivation method of "restriction".
+ */
+#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION                1 << 2
+/**
+ * XML_SCHEMAS_TYPE_GLOBAL:
+ *
+ * the type is global
+ */
+#define XML_SCHEMAS_TYPE_GLOBAL                1 << 3
+/**
+ * XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD:
+ *
+ * the complexType owns an attribute wildcard, i.e.
+ * it can be freed by the complexType
+ */
+#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD    1 << 4 /* Obsolete. */
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_ABSENT:
+ *
+ * the simpleType has a variety of "absent".
+ * TODO: Actually not necessary :-/, since if
+ * none of the variety flags occur then it's
+ * automatically absent.
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_ABSENT    1 << 5
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_LIST:
+ *
+ * the simpleType has a variety of "list".
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_LIST    1 << 6
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_UNION:
+ *
+ * the simpleType has a variety of "union".
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_UNION    1 << 7
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_ATOMIC:
+ *
+ * the simpleType has a variety of "union".
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_ATOMIC    1 << 8
+/**
+ * XML_SCHEMAS_TYPE_FINAL_EXTENSION:
+ *
+ * the complexType has a final of "extension".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_EXTENSION    1 << 9
+/**
+ * XML_SCHEMAS_TYPE_FINAL_RESTRICTION:
+ *
+ * the simpleType/complexType has a final of "restriction".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_RESTRICTION    1 << 10
+/**
+ * XML_SCHEMAS_TYPE_FINAL_LIST:
+ *
+ * the simpleType has a final of "list".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_LIST    1 << 11
+/**
+ * XML_SCHEMAS_TYPE_FINAL_UNION:
+ *
+ * the simpleType has a final of "union".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_UNION    1 << 12
+/**
+ * XML_SCHEMAS_TYPE_FINAL_DEFAULT:
+ *
+ * the simpleType has a final of "default".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_DEFAULT    1 << 13
+/**
+ * XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE:
+ *
+ * Marks the item as a builtin primitive.
+ */
+#define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE    1 << 14
+/**
+ * XML_SCHEMAS_TYPE_MARKED:
+ *
+ * Marks the item as marked; used for circular checks.
+ */
+#define XML_SCHEMAS_TYPE_MARKED        1 << 16
+/**
+ * XML_SCHEMAS_TYPE_BLOCK_DEFAULT:
+ *
+ * the complexType did not specify 'block' so use the default of the
+ * <schema> item.
+ */
+#define XML_SCHEMAS_TYPE_BLOCK_DEFAULT    1 << 17
+/**
+ * XML_SCHEMAS_TYPE_BLOCK_EXTENSION:
+ *
+ * the complexType has a 'block' of "extension".
+ */
+#define XML_SCHEMAS_TYPE_BLOCK_EXTENSION    1 << 18
+/**
+ * XML_SCHEMAS_TYPE_BLOCK_RESTRICTION:
+ *
+ * the complexType has a 'block' of "restriction".
+ */
+#define XML_SCHEMAS_TYPE_BLOCK_RESTRICTION    1 << 19
+/**
+ * XML_SCHEMAS_TYPE_ABSTRACT:
+ *
+ * the simple/complexType is abstract.
+ */
+#define XML_SCHEMAS_TYPE_ABSTRACT    1 << 20
+/**
+ * XML_SCHEMAS_TYPE_FACETSNEEDVALUE:
+ *
+ * indicates if the facets need a computed value
+ */
+#define XML_SCHEMAS_TYPE_FACETSNEEDVALUE    1 << 21
+/**
+ * XML_SCHEMAS_TYPE_INTERNAL_RESOLVED:
+ *
+ * indicates that the type was typefixed
+ */
+#define XML_SCHEMAS_TYPE_INTERNAL_RESOLVED    1 << 22
+/**
+ * XML_SCHEMAS_TYPE_INTERNAL_INVALID:
+ *
+ * indicates that the type is invalid
+ */
+#define XML_SCHEMAS_TYPE_INTERNAL_INVALID    1 << 23
+/**
+ * XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE:
+ *
+ * a whitespace-facet value of "preserve"
+ */
+#define XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE    1 << 24
+/**
+ * XML_SCHEMAS_TYPE_WHITESPACE_REPLACE:
+ *
+ * a whitespace-facet value of "replace"
+ */
+#define XML_SCHEMAS_TYPE_WHITESPACE_REPLACE    1 << 25
+/**
+ * XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE:
+ *
+ * a whitespace-facet value of "collapse"
+ */
+#define XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE    1 << 26
+/**
+ * XML_SCHEMAS_TYPE_HAS_FACETS:
+ *
+ * has facets
+ */
+#define XML_SCHEMAS_TYPE_HAS_FACETS    1 << 27
+/**
+ * XML_SCHEMAS_TYPE_NORMVALUENEEDED:
+ *
+ * indicates if the facets (pattern) need a normalized value
+ */
+#define XML_SCHEMAS_TYPE_NORMVALUENEEDED    1 << 28
+
+/**
+ * XML_SCHEMAS_TYPE_FIXUP_1:
+ *
+ * First stage of fixup was done.
+ */
+#define XML_SCHEMAS_TYPE_FIXUP_1    1 << 29
+
+/**
+ * XML_SCHEMAS_TYPE_REDEFINED:
+ *
+ * The type was redefined.
+ */
+#define XML_SCHEMAS_TYPE_REDEFINED    1 << 30
+/**
+ * XML_SCHEMAS_TYPE_REDEFINING:
+ *
+ * The type redefines an other type.
+ */
+/* #define XML_SCHEMAS_TYPE_REDEFINING    1 << 31 */
+
+/**
+ * _xmlSchemaType:
+ *
+ * Schemas type definition.
+ */
+struct _xmlSchemaType {
+    xmlSchemaTypeType type; /* The kind of type */
+    struct _xmlSchemaType *next; /* the next type if in a sequence ... */
+    const xmlChar *name;
+    const xmlChar *id ; /* Deprecated; not used */
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaTypePtr subtypes;
+    xmlSchemaAttributePtr attributes; /* Deprecated; not used */
+    xmlNodePtr node;
+    int minOccurs; /* Deprecated; not used */
+    int maxOccurs; /* Deprecated; not used */
+
+    int flags;
+    xmlSchemaContentType contentType;
+    const xmlChar *base; /* Base type's local name */
+    const xmlChar *baseNs; /* Base type's target namespace */
+    xmlSchemaTypePtr baseType; /* The base type component */
+    xmlSchemaFacetPtr facets; /* Local facets */
+    struct _xmlSchemaType *redef; /* Deprecated; not used */
+    int recurse; /* Obsolete */
+    xmlSchemaAttributeLinkPtr *attributeUses; /* Deprecated; not used */
+    xmlSchemaWildcardPtr attributeWildcard;
+    int builtInType; /* Type of built-in types. */
+    xmlSchemaTypeLinkPtr memberTypes; /* member-types if a union type. */
+    xmlSchemaFacetLinkPtr facetSet; /* All facets (incl. inherited) */
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaTypePtr contentTypeDef; /* Used for the simple content of complex types.
+                                        Could we use @subtypes for this? */
+    xmlRegexpPtr contModel; /* Holds the automaton of the content model */
+    const xmlChar *targetNamespace;
+    void *attrUses;
+};
+
+/*
+ * xmlSchemaElement:
+ * An element definition.
+ *
+ * xmlSchemaType, xmlSchemaFacet and xmlSchemaElement start of
+ * structures must be kept similar
+ */
+/**
+ * XML_SCHEMAS_ELEM_NILLABLE:
+ *
+ * the element is nillable
+ */
+#define XML_SCHEMAS_ELEM_NILLABLE        1 << 0
+/**
+ * XML_SCHEMAS_ELEM_GLOBAL:
+ *
+ * the element is global
+ */
+#define XML_SCHEMAS_ELEM_GLOBAL                1 << 1
+/**
+ * XML_SCHEMAS_ELEM_DEFAULT:
+ *
+ * the element has a default value
+ */
+#define XML_SCHEMAS_ELEM_DEFAULT        1 << 2
+/**
+ * XML_SCHEMAS_ELEM_FIXED:
+ *
+ * the element has a fixed value
+ */
+#define XML_SCHEMAS_ELEM_FIXED                1 << 3
+/**
+ * XML_SCHEMAS_ELEM_ABSTRACT:
+ *
+ * the element is abstract
+ */
+#define XML_SCHEMAS_ELEM_ABSTRACT        1 << 4
+/**
+ * XML_SCHEMAS_ELEM_TOPLEVEL:
+ *
+ * the element is top level
+ * obsolete: use XML_SCHEMAS_ELEM_GLOBAL instead
+ */
+#define XML_SCHEMAS_ELEM_TOPLEVEL        1 << 5
+/**
+ * XML_SCHEMAS_ELEM_REF:
+ *
+ * the element is a reference to a type
+ */
+#define XML_SCHEMAS_ELEM_REF                1 << 6
+/**
+ * XML_SCHEMAS_ELEM_NSDEFAULT:
+ *
+ * allow elements in no namespace
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ELEM_NSDEFAULT        1 << 7
+/**
+ * XML_SCHEMAS_ELEM_INTERNAL_RESOLVED:
+ *
+ * this is set when "type", "ref", "substitutionGroup"
+ * references have been resolved.
+ */
+#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED        1 << 8
+ /**
+ * XML_SCHEMAS_ELEM_CIRCULAR:
+ *
+ * a helper flag for the search of circular references.
+ */
+#define XML_SCHEMAS_ELEM_CIRCULAR        1 << 9
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_ABSENT:
+ *
+ * the "block" attribute is absent
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_ABSENT        1 << 10
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_EXTENSION:
+ *
+ * disallowed substitutions are absent
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_EXTENSION        1 << 11
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_RESTRICTION:
+ *
+ * disallowed substitutions: "restriction"
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION        1 << 12
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION:
+ *
+ * disallowed substitutions: "substitution"
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION        1 << 13
+/**
+ * XML_SCHEMAS_ELEM_FINAL_ABSENT:
+ *
+ * substitution group exclusions are absent
+ */
+#define XML_SCHEMAS_ELEM_FINAL_ABSENT        1 << 14
+/**
+ * XML_SCHEMAS_ELEM_FINAL_EXTENSION:
+ *
+ * substitution group exclusions: "extension"
+ */
+#define XML_SCHEMAS_ELEM_FINAL_EXTENSION        1 << 15
+/**
+ * XML_SCHEMAS_ELEM_FINAL_RESTRICTION:
+ *
+ * substitution group exclusions: "restriction"
+ */
+#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION        1 << 16
+/**
+ * XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD:
+ *
+ * the declaration is a substitution group head
+ */
+#define XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD        1 << 17
+/**
+ * XML_SCHEMAS_ELEM_INTERNAL_CHECKED:
+ *
+ * this is set when the elem decl has been checked against
+ * all constraints
+ */
+#define XML_SCHEMAS_ELEM_INTERNAL_CHECKED        1 << 18
+
+typedef struct _xmlSchemaElement xmlSchemaElement;
+typedef xmlSchemaElement *xmlSchemaElementPtr;
+struct _xmlSchemaElement {
+    xmlSchemaTypeType type; /* The kind of type */
+    struct _xmlSchemaType *next; /* Not used? */
+    const xmlChar *name;
+    const xmlChar *id; /* Deprecated; not used */
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaTypePtr subtypes; /* the type definition */
+    xmlSchemaAttributePtr attributes;
+    xmlNodePtr node;
+    int minOccurs; /* Deprecated; not used */
+    int maxOccurs; /* Deprecated; not used */
+
+    int flags;
+    const xmlChar *targetNamespace;
+    const xmlChar *namedType;
+    const xmlChar *namedTypeNs;
+    const xmlChar *substGroup;
+    const xmlChar *substGroupNs;
+    const xmlChar *scope;
+    const xmlChar *value; /* The original value of the value constraint. */
+    struct _xmlSchemaElement *refDecl; /* This will now be used for the
+                                          substitution group affiliation */
+    xmlRegexpPtr contModel; /* Obsolete for WXS, maybe used for RelaxNG */
+    xmlSchemaContentType contentType;
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaValPtr defVal; /* The compiled value constraint. */
+    void *idcs; /* The identity-constraint defs */
+};
+
+/*
+ * XML_SCHEMAS_FACET_UNKNOWN:
+ *
+ * unknown facet handling
+ */
+#define XML_SCHEMAS_FACET_UNKNOWN        0
+/*
+ * XML_SCHEMAS_FACET_PRESERVE:
+ *
+ * preserve the type of the facet
+ */
+#define XML_SCHEMAS_FACET_PRESERVE        1
+/*
+ * XML_SCHEMAS_FACET_REPLACE:
+ *
+ * replace the type of the facet
+ */
+#define XML_SCHEMAS_FACET_REPLACE        2
+/*
+ * XML_SCHEMAS_FACET_COLLAPSE:
+ *
+ * collapse the types of the facet
+ */
+#define XML_SCHEMAS_FACET_COLLAPSE        3
+/**
+ * A facet definition.
+ */
+struct _xmlSchemaFacet {
+    xmlSchemaTypeType type;        /* The kind of type */
+    struct _xmlSchemaFacet *next;/* the next type if in a sequence ... */
+    const xmlChar *value; /* The original value */
+    const xmlChar *id; /* Obsolete */
+    xmlSchemaAnnotPtr annot;
+    xmlNodePtr node;
+    int fixed; /* XML_SCHEMAS_FACET_PRESERVE, etc. */
+    int whitespace;
+    xmlSchemaValPtr val; /* The compiled value */
+    xmlRegexpPtr    regexp; /* The regex for patterns */
+};
+
+/**
+ * A notation definition.
+ */
+typedef struct _xmlSchemaNotation xmlSchemaNotation;
+typedef xmlSchemaNotation *xmlSchemaNotationPtr;
+struct _xmlSchemaNotation {
+    xmlSchemaTypeType type; /* The kind of type */
+    const xmlChar *name;
+    xmlSchemaAnnotPtr annot;
+    const xmlChar *identifier;
+    const xmlChar *targetNamespace;
+};
+
+/*
+* TODO: Actually all those flags used for the schema should sit
+* on the schema parser context, since they are used only
+* during parsing an XML schema document, and not available
+* on the component level as per spec.
+*/
+/**
+ * XML_SCHEMAS_QUALIF_ELEM:
+ *
+ * Reflects elementFormDefault == qualified in
+ * an XML schema document.
+ */
+#define XML_SCHEMAS_QUALIF_ELEM                1 << 0
+/**
+ * XML_SCHEMAS_QUALIF_ATTR:
+ *
+ * Reflects attributeFormDefault == qualified in
+ * an XML schema document.
+ */
+#define XML_SCHEMAS_QUALIF_ATTR            1 << 1
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_EXTENSION:
+ *
+ * the schema has "extension" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION        1 << 2
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION:
+ *
+ * the schema has "restriction" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION            1 << 3
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_LIST:
+ *
+ * the schema has "list" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_LIST            1 << 4
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_UNION:
+ *
+ * the schema has "union" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_UNION            1 << 5
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION:
+ *
+ * the schema has "extension" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION            1 << 6
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION:
+ *
+ * the schema has "restriction" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION            1 << 7
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION:
+ *
+ * the schema has "substitution" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION            1 << 8
+/**
+ * XML_SCHEMAS_INCLUDING_CONVERT_NS:
+ *
+ * the schema is currently including an other schema with
+ * no target namespace.
+ */
+#define XML_SCHEMAS_INCLUDING_CONVERT_NS            1 << 9
+/**
+ * _xmlSchema:
+ *
+ * A Schemas definition
+ */
+struct _xmlSchema {
+    const xmlChar *name; /* schema name */
+    const xmlChar *targetNamespace; /* the target namespace */
+    const xmlChar *version;
+    const xmlChar *id; /* Obsolete */
+    xmlDocPtr doc;
+    xmlSchemaAnnotPtr annot;
+    int flags;
+
+    xmlHashTablePtr typeDecl;
+    xmlHashTablePtr attrDecl;
+    xmlHashTablePtr attrgrpDecl;
+    xmlHashTablePtr elemDecl;
+    xmlHashTablePtr notaDecl;
+
+    xmlHashTablePtr schemasImports;
+
+    void *_private;        /* unused by the library for users or bindings */
+    xmlHashTablePtr groupDecl;
+    xmlDictPtr      dict;
+    void *includes;     /* the includes, this is opaque for now */
+    int preserve;        /* whether to free the document */
+    int counter; /* used to give anonymous components unique names */
+    xmlHashTablePtr idcDef; /* All identity-constraint defs. */
+    void *volatiles; /* Obsolete */
+};
+
+XMLPUBFUN void XMLCALL         xmlSchemaFreeType        (xmlSchemaTypePtr type);
+XMLPUBFUN void XMLCALL         xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* __XML_SCHEMA_INTERNALS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/schematron.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/schematron.h
new file mode 100644
index 0000000..364eaec
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/schematron.h
@@ -0,0 +1,142 @@
+/*
+ * Summary: XML Schemastron implementation
+ * Description: interface to the XML Schematron validity checking.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMATRON_H__
+#define __XML_SCHEMATRON_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMATRON_ENABLED
+
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    XML_SCHEMATRON_OUT_QUIET = 1 << 0,	/* quiet no report */
+    XML_SCHEMATRON_OUT_TEXT = 1 << 1,	/* build a textual report */
+    XML_SCHEMATRON_OUT_XML = 1 << 2,	/* output SVRL */
+    XML_SCHEMATRON_OUT_ERROR = 1 << 3,  /* output via xmlStructuredErrorFunc */
+    XML_SCHEMATRON_OUT_FILE = 1 << 8,	/* output to a file descriptor */
+    XML_SCHEMATRON_OUT_BUFFER = 1 << 9,	/* output to a buffer */
+    XML_SCHEMATRON_OUT_IO = 1 << 10	/* output to I/O mechanism */
+} xmlSchematronValidOptions;
+
+/**
+ * The schemas related types are kept internal
+ */
+typedef struct _xmlSchematron xmlSchematron;
+typedef xmlSchematron *xmlSchematronPtr;
+
+/**
+ * xmlSchematronValidityErrorFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of an error callback from a Schematron validation
+ */
+typedef void (*xmlSchematronValidityErrorFunc) (void *ctx, const char *msg, ...);
+
+/**
+ * xmlSchematronValidityWarningFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of a warning callback from a Schematron validation
+ */
+typedef void (*xmlSchematronValidityWarningFunc) (void *ctx, const char *msg, ...);
+
+/**
+ * A schemas validation context
+ */
+typedef struct _xmlSchematronParserCtxt xmlSchematronParserCtxt;
+typedef xmlSchematronParserCtxt *xmlSchematronParserCtxtPtr;
+
+typedef struct _xmlSchematronValidCtxt xmlSchematronValidCtxt;
+typedef xmlSchematronValidCtxt *xmlSchematronValidCtxtPtr;
+
+/*
+ * Interfaces for parsing.
+ */
+XMLPUBFUN xmlSchematronParserCtxtPtr XMLCALL
+	    xmlSchematronNewParserCtxt	(const char *URL);
+XMLPUBFUN xmlSchematronParserCtxtPtr XMLCALL
+	    xmlSchematronNewMemParserCtxt(const char *buffer,
+					 int size);
+XMLPUBFUN xmlSchematronParserCtxtPtr XMLCALL
+	    xmlSchematronNewDocParserCtxt(xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	    xmlSchematronFreeParserCtxt	(xmlSchematronParserCtxtPtr ctxt);
+/*****
+XMLPUBFUN void XMLCALL
+	    xmlSchematronSetParserErrors(xmlSchematronParserCtxtPtr ctxt,
+					 xmlSchematronValidityErrorFunc err,
+					 xmlSchematronValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchematronGetParserErrors(xmlSchematronParserCtxtPtr ctxt,
+					xmlSchematronValidityErrorFunc * err,
+					xmlSchematronValidityWarningFunc * warn,
+					void **ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchematronIsValid	(xmlSchematronValidCtxtPtr ctxt);
+ *****/
+XMLPUBFUN xmlSchematronPtr XMLCALL
+	    xmlSchematronParse		(xmlSchematronParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+	    xmlSchematronFree		(xmlSchematronPtr schema);
+/*
+ * Interfaces for validating
+ */
+XMLPUBFUN void XMLCALL
+	    xmlSchematronSetValidStructuredErrors(
+	                                  xmlSchematronValidCtxtPtr ctxt,
+					  xmlStructuredErrorFunc serror,
+					  void *ctx);
+/******
+XMLPUBFUN void XMLCALL
+	    xmlSchematronSetValidErrors	(xmlSchematronValidCtxtPtr ctxt,
+					 xmlSchematronValidityErrorFunc err,
+					 xmlSchematronValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronGetValidErrors	(xmlSchematronValidCtxtPtr ctxt,
+					 xmlSchematronValidityErrorFunc *err,
+					 xmlSchematronValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronSetValidOptions(xmlSchematronValidCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronValidCtxtGetOptions(xmlSchematronValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+            xmlSchematronValidateOneElement (xmlSchematronValidCtxtPtr ctxt,
+			                 xmlNodePtr elem);
+ *******/
+
+XMLPUBFUN xmlSchematronValidCtxtPtr XMLCALL
+	    xmlSchematronNewValidCtxt	(xmlSchematronPtr schema,
+					 int options);
+XMLPUBFUN void XMLCALL
+	    xmlSchematronFreeValidCtxt	(xmlSchematronValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronValidateDoc	(xmlSchematronValidCtxtPtr ctxt,
+					 xmlDocPtr instance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMATRON_ENABLED */
+#endif /* __XML_SCHEMATRON_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/threads.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/threads.h
new file mode 100644
index 0000000..9969ae7
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/threads.h
@@ -0,0 +1,89 @@
+/**
+ * Summary: interfaces for thread handling
+ * Description: set of generic threading related routines
+ *              should work with pthreads, Windows native or TLS threads
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_THREADS_H__
+#define __XML_THREADS_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * xmlMutex are a simple mutual exception locks.
+ */
+typedef struct _xmlMutex xmlMutex;
+typedef xmlMutex *xmlMutexPtr;
+
+/*
+ * xmlRMutex are reentrant mutual exception locks.
+ */
+typedef struct _xmlRMutex xmlRMutex;
+typedef xmlRMutex *xmlRMutexPtr;
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/globals.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN xmlMutexPtr XMLCALL
+			xmlNewMutex	(void);
+XMLPUBFUN void XMLCALL
+			xmlMutexLock	(xmlMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlMutexUnlock	(xmlMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlFreeMutex	(xmlMutexPtr tok);
+
+XMLPUBFUN xmlRMutexPtr XMLCALL
+			xmlNewRMutex	(void);
+XMLPUBFUN void XMLCALL
+			xmlRMutexLock	(xmlRMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlRMutexUnlock	(xmlRMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlFreeRMutex	(xmlRMutexPtr tok);
+
+/*
+ * Library wide APIs.
+ */
+XMLPUBFUN void XMLCALL
+			xmlInitThreads	(void);
+XMLPUBFUN void XMLCALL
+			xmlLockLibrary	(void);
+XMLPUBFUN void XMLCALL
+			xmlUnlockLibrary(void);
+XMLPUBFUN int XMLCALL
+			xmlGetThreadId	(void);
+XMLPUBFUN int XMLCALL
+			xmlIsMainThread	(void);
+XMLPUBFUN void XMLCALL
+			xmlCleanupThreads(void);
+XMLPUBFUN xmlGlobalStatePtr XMLCALL
+			xmlGetGlobalState(void);
+
+#ifdef HAVE_PTHREAD_H
+#elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+#if defined(LIBXML_STATIC_FOR_DLL)
+int XMLCALL
+xmlDllMain(void *hinstDLL, unsigned long fdwReason,
+           void *lpvReserved);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* __XML_THREADS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/tree.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/tree.h
new file mode 100644
index 0000000..1e79be9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/tree.h
@@ -0,0 +1,1311 @@
+/*
+ * Summary: interfaces for tree manipulation
+ * Description: this module describes the structures found in an tree resulting
+ *              from an XML or HTML parsing, as well as the API provided for
+ *              various processing on that tree
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_TREE_H__
+#define __XML_TREE_H__
+
+#include <stdio.h>
+#include <limits.h>
+#include <libxml/xmlversion.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Some of the basic types pointer to structures:
+ */
+/* xmlIO.h */
+typedef struct _xmlParserInputBuffer xmlParserInputBuffer;
+typedef xmlParserInputBuffer *xmlParserInputBufferPtr;
+
+typedef struct _xmlOutputBuffer xmlOutputBuffer;
+typedef xmlOutputBuffer *xmlOutputBufferPtr;
+
+/* parser.h */
+typedef struct _xmlParserInput xmlParserInput;
+typedef xmlParserInput *xmlParserInputPtr;
+
+typedef struct _xmlParserCtxt xmlParserCtxt;
+typedef xmlParserCtxt *xmlParserCtxtPtr;
+
+typedef struct _xmlSAXLocator xmlSAXLocator;
+typedef xmlSAXLocator *xmlSAXLocatorPtr;
+
+typedef struct _xmlSAXHandler xmlSAXHandler;
+typedef xmlSAXHandler *xmlSAXHandlerPtr;
+
+/* entities.h */
+typedef struct _xmlEntity xmlEntity;
+typedef xmlEntity *xmlEntityPtr;
+
+/**
+ * BASE_BUFFER_SIZE:
+ *
+ * default buffer size 4000.
+ */
+#define BASE_BUFFER_SIZE 4096
+
+/**
+ * LIBXML_NAMESPACE_DICT:
+ *
+ * Defines experimental behaviour:
+ * 1) xmlNs gets an additional field @context (a xmlDoc)
+ * 2) when creating a tree, xmlNs->href is stored in the dict of xmlDoc.
+ */
+/* #define LIBXML_NAMESPACE_DICT */
+
+/**
+ * xmlBufferAllocationScheme:
+ *
+ * A buffer allocation scheme can be defined to either match exactly the
+ * need or double it's allocated size each time it is found too small.
+ */
+
+typedef enum {
+    XML_BUFFER_ALLOC_DOUBLEIT,	/* double each time one need to grow */
+    XML_BUFFER_ALLOC_EXACT,	/* grow only to the minimal size */
+    XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */
+    XML_BUFFER_ALLOC_IO,	/* special allocation scheme used for I/O */
+    XML_BUFFER_ALLOC_HYBRID,	/* exact up to a threshold, and doubleit thereafter */
+    XML_BUFFER_ALLOC_BOUNDED	/* limit the upper size of the buffer */
+} xmlBufferAllocationScheme;
+
+/**
+ * xmlBuffer:
+ *
+ * A buffer structure, this old construct is limited to 2GB and
+ * is being deprecated, use API with xmlBuf instead
+ */
+typedef struct _xmlBuffer xmlBuffer;
+typedef xmlBuffer *xmlBufferPtr;
+struct _xmlBuffer {
+    xmlChar *content;		/* The buffer content UTF8 */
+    unsigned int use;		/* The buffer size used */
+    unsigned int size;		/* The buffer size */
+    xmlBufferAllocationScheme alloc; /* The realloc method */
+    xmlChar *contentIO;		/* in IO mode we may have a different base */
+};
+
+/**
+ * xmlBuf:
+ *
+ * A buffer structure, new one, the actual structure internals are not public
+ */
+
+typedef struct _xmlBuf xmlBuf;
+
+/**
+ * xmlBufPtr:
+ *
+ * A pointer to a buffer structure, the actual structure internals are not
+ * public
+ */
+
+typedef xmlBuf *xmlBufPtr;
+
+/*
+ * A few public routines for xmlBuf. As those are expected to be used
+ * mostly internally the bulk of the routines are internal in buf.h
+ */
+XMLPUBFUN xmlChar* XMLCALL       xmlBufContent	(const xmlBuf* buf);
+XMLPUBFUN xmlChar* XMLCALL       xmlBufEnd      (xmlBufPtr buf);
+XMLPUBFUN size_t XMLCALL         xmlBufUse      (const xmlBufPtr buf);
+XMLPUBFUN size_t XMLCALL         xmlBufShrink	(xmlBufPtr buf, size_t len);
+
+/*
+ * LIBXML2_NEW_BUFFER:
+ *
+ * Macro used to express that the API use the new buffers for
+ * xmlParserInputBuffer and xmlOutputBuffer. The change was
+ * introduced in 2.9.0.
+ */
+#define LIBXML2_NEW_BUFFER
+
+/**
+ * XML_XML_NAMESPACE:
+ *
+ * This is the namespace for the special xml: prefix predefined in the
+ * XML Namespace specification.
+ */
+#define XML_XML_NAMESPACE \
+    (const xmlChar *) "http://www.w3.org/XML/1998/namespace"
+
+/**
+ * XML_XML_ID:
+ *
+ * This is the name for the special xml:id attribute
+ */
+#define XML_XML_ID (const xmlChar *) "xml:id"
+
+/*
+ * The different element types carried by an XML tree.
+ *
+ * NOTE: This is synchronized with DOM Level1 values
+ *       See http://www.w3.org/TR/REC-DOM-Level-1/
+ *
+ * Actually this had diverged a bit, and now XML_DOCUMENT_TYPE_NODE should
+ * be deprecated to use an XML_DTD_NODE.
+ */
+typedef enum {
+    XML_ELEMENT_NODE=		1,
+    XML_ATTRIBUTE_NODE=		2,
+    XML_TEXT_NODE=		3,
+    XML_CDATA_SECTION_NODE=	4,
+    XML_ENTITY_REF_NODE=	5,
+    XML_ENTITY_NODE=		6,
+    XML_PI_NODE=		7,
+    XML_COMMENT_NODE=		8,
+    XML_DOCUMENT_NODE=		9,
+    XML_DOCUMENT_TYPE_NODE=	10,
+    XML_DOCUMENT_FRAG_NODE=	11,
+    XML_NOTATION_NODE=		12,
+    XML_HTML_DOCUMENT_NODE=	13,
+    XML_DTD_NODE=		14,
+    XML_ELEMENT_DECL=		15,
+    XML_ATTRIBUTE_DECL=		16,
+    XML_ENTITY_DECL=		17,
+    XML_NAMESPACE_DECL=		18,
+    XML_XINCLUDE_START=		19,
+    XML_XINCLUDE_END=		20
+#ifdef LIBXML_DOCB_ENABLED
+   ,XML_DOCB_DOCUMENT_NODE=	21
+#endif
+} xmlElementType;
+
+
+/**
+ * xmlNotation:
+ *
+ * A DTD Notation definition.
+ */
+
+typedef struct _xmlNotation xmlNotation;
+typedef xmlNotation *xmlNotationPtr;
+struct _xmlNotation {
+    const xmlChar               *name;	        /* Notation name */
+    const xmlChar               *PublicID;	/* Public identifier, if any */
+    const xmlChar               *SystemID;	/* System identifier, if any */
+};
+
+/**
+ * xmlAttributeType:
+ *
+ * A DTD Attribute type definition.
+ */
+
+typedef enum {
+    XML_ATTRIBUTE_CDATA = 1,
+    XML_ATTRIBUTE_ID,
+    XML_ATTRIBUTE_IDREF	,
+    XML_ATTRIBUTE_IDREFS,
+    XML_ATTRIBUTE_ENTITY,
+    XML_ATTRIBUTE_ENTITIES,
+    XML_ATTRIBUTE_NMTOKEN,
+    XML_ATTRIBUTE_NMTOKENS,
+    XML_ATTRIBUTE_ENUMERATION,
+    XML_ATTRIBUTE_NOTATION
+} xmlAttributeType;
+
+/**
+ * xmlAttributeDefault:
+ *
+ * A DTD Attribute default definition.
+ */
+
+typedef enum {
+    XML_ATTRIBUTE_NONE = 1,
+    XML_ATTRIBUTE_REQUIRED,
+    XML_ATTRIBUTE_IMPLIED,
+    XML_ATTRIBUTE_FIXED
+} xmlAttributeDefault;
+
+/**
+ * xmlEnumeration:
+ *
+ * List structure used when there is an enumeration in DTDs.
+ */
+
+typedef struct _xmlEnumeration xmlEnumeration;
+typedef xmlEnumeration *xmlEnumerationPtr;
+struct _xmlEnumeration {
+    struct _xmlEnumeration    *next;	/* next one */
+    const xmlChar            *name;	/* Enumeration name */
+};
+
+/**
+ * xmlAttribute:
+ *
+ * An Attribute declaration in a DTD.
+ */
+
+typedef struct _xmlAttribute xmlAttribute;
+typedef xmlAttribute *xmlAttributePtr;
+struct _xmlAttribute {
+    void           *_private;	        /* application data */
+    xmlElementType          type;       /* XML_ATTRIBUTE_DECL, must be second ! */
+    const xmlChar          *name;	/* Attribute name */
+    struct _xmlNode    *children;	/* NULL */
+    struct _xmlNode        *last;	/* NULL */
+    struct _xmlDtd       *parent;	/* -> DTD */
+    struct _xmlNode        *next;	/* next sibling link  */
+    struct _xmlNode        *prev;	/* previous sibling link  */
+    struct _xmlDoc          *doc;       /* the containing document */
+
+    struct _xmlAttribute  *nexth;	/* next in hash table */
+    xmlAttributeType       atype;	/* The attribute type */
+    xmlAttributeDefault      def;	/* the default */
+    const xmlChar  *defaultValue;	/* or the default value */
+    xmlEnumerationPtr       tree;       /* or the enumeration tree if any */
+    const xmlChar        *prefix;	/* the namespace prefix if any */
+    const xmlChar          *elem;	/* Element holding the attribute */
+};
+
+/**
+ * xmlElementContentType:
+ *
+ * Possible definitions of element content types.
+ */
+typedef enum {
+    XML_ELEMENT_CONTENT_PCDATA = 1,
+    XML_ELEMENT_CONTENT_ELEMENT,
+    XML_ELEMENT_CONTENT_SEQ,
+    XML_ELEMENT_CONTENT_OR
+} xmlElementContentType;
+
+/**
+ * xmlElementContentOccur:
+ *
+ * Possible definitions of element content occurrences.
+ */
+typedef enum {
+    XML_ELEMENT_CONTENT_ONCE = 1,
+    XML_ELEMENT_CONTENT_OPT,
+    XML_ELEMENT_CONTENT_MULT,
+    XML_ELEMENT_CONTENT_PLUS
+} xmlElementContentOccur;
+
+/**
+ * xmlElementContent:
+ *
+ * An XML Element content as stored after parsing an element definition
+ * in a DTD.
+ */
+
+typedef struct _xmlElementContent xmlElementContent;
+typedef xmlElementContent *xmlElementContentPtr;
+struct _xmlElementContent {
+    xmlElementContentType     type;	/* PCDATA, ELEMENT, SEQ or OR */
+    xmlElementContentOccur    ocur;	/* ONCE, OPT, MULT or PLUS */
+    const xmlChar             *name;	/* Element name */
+    struct _xmlElementContent *c1;	/* first child */
+    struct _xmlElementContent *c2;	/* second child */
+    struct _xmlElementContent *parent;	/* parent */
+    const xmlChar             *prefix;	/* Namespace prefix */
+};
+
+/**
+ * xmlElementTypeVal:
+ *
+ * The different possibilities for an element content type.
+ */
+
+typedef enum {
+    XML_ELEMENT_TYPE_UNDEFINED = 0,
+    XML_ELEMENT_TYPE_EMPTY = 1,
+    XML_ELEMENT_TYPE_ANY,
+    XML_ELEMENT_TYPE_MIXED,
+    XML_ELEMENT_TYPE_ELEMENT
+} xmlElementTypeVal;
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/xmlregexp.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlElement:
+ *
+ * An XML Element declaration from a DTD.
+ */
+
+typedef struct _xmlElement xmlElement;
+typedef xmlElement *xmlElementPtr;
+struct _xmlElement {
+    void           *_private;	        /* application data */
+    xmlElementType          type;       /* XML_ELEMENT_DECL, must be second ! */
+    const xmlChar          *name;	/* Element name */
+    struct _xmlNode    *children;	/* NULL */
+    struct _xmlNode        *last;	/* NULL */
+    struct _xmlDtd       *parent;	/* -> DTD */
+    struct _xmlNode        *next;	/* next sibling link  */
+    struct _xmlNode        *prev;	/* previous sibling link  */
+    struct _xmlDoc          *doc;       /* the containing document */
+
+    xmlElementTypeVal      etype;	/* The type */
+    xmlElementContentPtr content;	/* the allowed element content */
+    xmlAttributePtr   attributes;	/* List of the declared attributes */
+    const xmlChar        *prefix;	/* the namespace prefix if any */
+#ifdef LIBXML_REGEXP_ENABLED
+    xmlRegexpPtr       contModel;	/* the validating regexp */
+#else
+    void	      *contModel;
+#endif
+};
+
+
+/**
+ * XML_LOCAL_NAMESPACE:
+ *
+ * A namespace declaration node.
+ */
+#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL
+typedef xmlElementType xmlNsType;
+
+/**
+ * xmlNs:
+ *
+ * An XML namespace.
+ * Note that prefix == NULL is valid, it defines the default namespace
+ * within the subtree (until overridden).
+ *
+ * xmlNsType is unified with xmlElementType.
+ */
+
+typedef struct _xmlNs xmlNs;
+typedef xmlNs *xmlNsPtr;
+struct _xmlNs {
+    struct _xmlNs  *next;	/* next Ns link for this node  */
+    xmlNsType      type;	/* global or local */
+    const xmlChar *href;	/* URL for the namespace */
+    const xmlChar *prefix;	/* prefix for the namespace */
+    void           *_private;   /* application data */
+    struct _xmlDoc *context;		/* normally an xmlDoc */
+};
+
+/**
+ * xmlDtd:
+ *
+ * An XML DTD, as defined by <!DOCTYPE ... There is actually one for
+ * the internal subset and for the external subset.
+ */
+typedef struct _xmlDtd xmlDtd;
+typedef xmlDtd *xmlDtdPtr;
+struct _xmlDtd {
+    void           *_private;	/* application data */
+    xmlElementType  type;       /* XML_DTD_NODE, must be second ! */
+    const xmlChar *name;	/* Name of the DTD */
+    struct _xmlNode *children;	/* the value of the property link */
+    struct _xmlNode *last;	/* last child link */
+    struct _xmlDoc  *parent;	/* child->parent link */
+    struct _xmlNode *next;	/* next sibling link  */
+    struct _xmlNode *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* the containing document */
+
+    /* End of common part */
+    void          *notations;   /* Hash table for notations if any */
+    void          *elements;    /* Hash table for elements if any */
+    void          *attributes;  /* Hash table for attributes if any */
+    void          *entities;    /* Hash table for entities if any */
+    const xmlChar *ExternalID;	/* External identifier for PUBLIC DTD */
+    const xmlChar *SystemID;	/* URI for a SYSTEM or PUBLIC DTD */
+    void          *pentities;   /* Hash table for param entities if any */
+};
+
+/**
+ * xmlAttr:
+ *
+ * An attribute on an XML node.
+ */
+typedef struct _xmlAttr xmlAttr;
+typedef xmlAttr *xmlAttrPtr;
+struct _xmlAttr {
+    void           *_private;	/* application data */
+    xmlElementType   type;      /* XML_ATTRIBUTE_NODE, must be second ! */
+    const xmlChar   *name;      /* the name of the property */
+    struct _xmlNode *children;	/* the value of the property */
+    struct _xmlNode *last;	/* NULL */
+    struct _xmlNode *parent;	/* child->parent link */
+    struct _xmlAttr *next;	/* next sibling link  */
+    struct _xmlAttr *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* the containing document */
+    xmlNs           *ns;        /* pointer to the associated namespace */
+    xmlAttributeType atype;     /* the attribute type if validating */
+    void            *psvi;	/* for type/PSVI information */
+};
+
+/**
+ * xmlID:
+ *
+ * An XML ID instance.
+ */
+
+typedef struct _xmlID xmlID;
+typedef xmlID *xmlIDPtr;
+struct _xmlID {
+    struct _xmlID    *next;	/* next ID */
+    const xmlChar    *value;	/* The ID name */
+    xmlAttrPtr        attr;	/* The attribute holding it */
+    const xmlChar    *name;	/* The attribute if attr is not available */
+    int               lineno;	/* The line number if attr is not available */
+    struct _xmlDoc   *doc;	/* The document holding the ID */
+};
+
+/**
+ * xmlRef:
+ *
+ * An XML IDREF instance.
+ */
+
+typedef struct _xmlRef xmlRef;
+typedef xmlRef *xmlRefPtr;
+struct _xmlRef {
+    struct _xmlRef    *next;	/* next Ref */
+    const xmlChar     *value;	/* The Ref name */
+    xmlAttrPtr        attr;	/* The attribute holding it */
+    const xmlChar    *name;	/* The attribute if attr is not available */
+    int               lineno;	/* The line number if attr is not available */
+};
+
+/**
+ * xmlNode:
+ *
+ * A node in an XML tree.
+ */
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+struct _xmlNode {
+    void           *_private;	/* application data */
+    xmlElementType   type;	/* type number, must be second ! */
+    const xmlChar   *name;      /* the name of the node, or the entity */
+    struct _xmlNode *children;	/* parent->childs link */
+    struct _xmlNode *last;	/* last child link */
+    struct _xmlNode *parent;	/* child->parent link */
+    struct _xmlNode *next;	/* next sibling link  */
+    struct _xmlNode *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* the containing document */
+
+    /* End of common part */
+    xmlNs           *ns;        /* pointer to the associated namespace */
+    xmlChar         *content;   /* the content */
+    struct _xmlAttr *properties;/* properties list */
+    xmlNs           *nsDef;     /* namespace definitions on this node */
+    void            *psvi;	/* for type/PSVI information */
+    unsigned short   line;	/* line number */
+    unsigned short   extra;	/* extra data for XPath/XSLT */
+};
+
+/**
+ * XML_GET_CONTENT:
+ *
+ * Macro to extract the content pointer of a node.
+ */
+#define XML_GET_CONTENT(n)					\
+    ((n)->type == XML_ELEMENT_NODE ? NULL : (n)->content)
+
+/**
+ * XML_GET_LINE:
+ *
+ * Macro to extract the line number of an element node.
+ */
+#define XML_GET_LINE(n)						\
+    (xmlGetLineNo(n))
+
+/**
+ * xmlDocProperty
+ *
+ * Set of properties of the document as found by the parser
+ * Some of them are linked to similarly named xmlParserOption
+ */
+typedef enum {
+    XML_DOC_WELLFORMED		= 1<<0, /* document is XML well formed */
+    XML_DOC_NSVALID		= 1<<1, /* document is Namespace valid */
+    XML_DOC_OLD10		= 1<<2, /* parsed with old XML-1.0 parser */
+    XML_DOC_DTDVALID		= 1<<3, /* DTD validation was successful */
+    XML_DOC_XINCLUDE		= 1<<4, /* XInclude substitution was done */
+    XML_DOC_USERBUILT		= 1<<5, /* Document was built using the API
+                                           and not by parsing an instance */
+    XML_DOC_INTERNAL		= 1<<6, /* built for internal processing */
+    XML_DOC_HTML		= 1<<7  /* parsed or built HTML document */
+} xmlDocProperties;
+
+/**
+ * xmlDoc:
+ *
+ * An XML document.
+ */
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+struct _xmlDoc {
+    void           *_private;	/* application data */
+    xmlElementType  type;       /* XML_DOCUMENT_NODE, must be second ! */
+    char           *name;	/* name/filename/URI of the document */
+    struct _xmlNode *children;	/* the document tree */
+    struct _xmlNode *last;	/* last child link */
+    struct _xmlNode *parent;	/* child->parent link */
+    struct _xmlNode *next;	/* next sibling link  */
+    struct _xmlNode *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* autoreference to itself */
+
+    /* End of common part */
+    int             compression;/* level of zlib compression */
+    int             standalone; /* standalone document (no external refs)
+				     1 if standalone="yes"
+				     0 if standalone="no"
+				    -1 if there is no XML declaration
+				    -2 if there is an XML declaration, but no
+					standalone attribute was specified */
+    struct _xmlDtd  *intSubset;	/* the document internal subset */
+    struct _xmlDtd  *extSubset;	/* the document external subset */
+    struct _xmlNs   *oldNs;	/* Global namespace, the old way */
+    const xmlChar  *version;	/* the XML version string */
+    const xmlChar  *encoding;   /* external initial encoding, if any */
+    void           *ids;        /* Hash table for ID attributes if any */
+    void           *refs;       /* Hash table for IDREFs attributes if any */
+    const xmlChar  *URL;	/* The URI for that document */
+    int             charset;    /* Internal flag for charset handling,
+				   actually an xmlCharEncoding */
+    struct _xmlDict *dict;      /* dict used to allocate names or NULL */
+    void           *psvi;	/* for type/PSVI information */
+    int             parseFlags;	/* set of xmlParserOption used to parse the
+				   document */
+    int             properties;	/* set of xmlDocProperties for this document
+				   set at the end of parsing */
+};
+
+
+typedef struct _xmlDOMWrapCtxt xmlDOMWrapCtxt;
+typedef xmlDOMWrapCtxt *xmlDOMWrapCtxtPtr;
+
+/**
+ * xmlDOMWrapAcquireNsFunction:
+ * @ctxt:  a DOM wrapper context
+ * @node:  the context node (element or attribute)
+ * @nsName:  the requested namespace name
+ * @nsPrefix:  the requested namespace prefix
+ *
+ * A function called to acquire namespaces (xmlNs) from the wrapper.
+ *
+ * Returns an xmlNsPtr or NULL in case of an error.
+ */
+typedef xmlNsPtr (*xmlDOMWrapAcquireNsFunction) (xmlDOMWrapCtxtPtr ctxt,
+						 xmlNodePtr node,
+						 const xmlChar *nsName,
+						 const xmlChar *nsPrefix);
+
+/**
+ * xmlDOMWrapCtxt:
+ *
+ * Context for DOM wrapper-operations.
+ */
+struct _xmlDOMWrapCtxt {
+    void * _private;
+    /*
+    * The type of this context, just in case we need specialized
+    * contexts in the future.
+    */
+    int type;
+    /*
+    * Internal namespace map used for various operations.
+    */
+    void * namespaceMap;
+    /*
+    * Use this one to acquire an xmlNsPtr intended for node->ns.
+    * (Note that this is not intended for elem->nsDef).
+    */
+    xmlDOMWrapAcquireNsFunction getNsForNodeFunc;
+};
+
+/**
+ * xmlChildrenNode:
+ *
+ * Macro for compatibility naming layer with libxml1. Maps
+ * to "children."
+ */
+#ifndef xmlChildrenNode
+#define xmlChildrenNode children
+#endif
+
+/**
+ * xmlRootNode:
+ *
+ * Macro for compatibility naming layer with libxml1. Maps
+ * to "children".
+ */
+#ifndef xmlRootNode
+#define xmlRootNode children
+#endif
+
+/*
+ * Variables.
+ */
+
+/*
+ * Some helper functions
+ */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || \
+    defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || \
+    defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || \
+    defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlValidateNCName	(const xmlChar *value,
+					 int space);
+#endif
+
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlValidateQName	(const xmlChar *value,
+					 int space);
+XMLPUBFUN int XMLCALL
+		xmlValidateName		(const xmlChar *value,
+					 int space);
+XMLPUBFUN int XMLCALL
+		xmlValidateNMToken	(const xmlChar *value,
+					 int space);
+#endif
+
+XMLPUBFUN xmlChar * XMLCALL
+		xmlBuildQName		(const xmlChar *ncname,
+					 const xmlChar *prefix,
+					 xmlChar *memory,
+					 int len);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSplitQName2		(const xmlChar *name,
+					 xmlChar **prefix);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSplitQName3		(const xmlChar *name,
+					 int *len);
+
+/*
+ * Handling Buffers, the old ones see @xmlBuf for the new ones.
+ */
+
+XMLPUBFUN void XMLCALL
+		xmlSetBufferAllocationScheme(xmlBufferAllocationScheme scheme);
+XMLPUBFUN xmlBufferAllocationScheme XMLCALL
+		xmlGetBufferAllocationScheme(void);
+
+XMLPUBFUN xmlBufferPtr XMLCALL
+		xmlBufferCreate		(void);
+XMLPUBFUN xmlBufferPtr XMLCALL
+		xmlBufferCreateSize	(size_t size);
+XMLPUBFUN xmlBufferPtr XMLCALL
+		xmlBufferCreateStatic	(void *mem,
+					 size_t size);
+XMLPUBFUN int XMLCALL
+		xmlBufferResize		(xmlBufferPtr buf,
+					 unsigned int size);
+XMLPUBFUN void XMLCALL
+		xmlBufferFree		(xmlBufferPtr buf);
+XMLPUBFUN int XMLCALL
+		xmlBufferDump		(FILE *file,
+					 xmlBufferPtr buf);
+XMLPUBFUN int XMLCALL
+		xmlBufferAdd		(xmlBufferPtr buf,
+					 const xmlChar *str,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlBufferAddHead	(xmlBufferPtr buf,
+					 const xmlChar *str,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlBufferCat		(xmlBufferPtr buf,
+					 const xmlChar *str);
+XMLPUBFUN int XMLCALL
+		xmlBufferCCat		(xmlBufferPtr buf,
+					 const char *str);
+XMLPUBFUN int XMLCALL
+		xmlBufferShrink		(xmlBufferPtr buf,
+					 unsigned int len);
+XMLPUBFUN int XMLCALL
+		xmlBufferGrow		(xmlBufferPtr buf,
+					 unsigned int len);
+XMLPUBFUN void XMLCALL
+		xmlBufferEmpty		(xmlBufferPtr buf);
+XMLPUBFUN const xmlChar* XMLCALL
+		xmlBufferContent	(const xmlBuffer *buf);
+XMLPUBFUN xmlChar* XMLCALL
+		xmlBufferDetach         (xmlBufferPtr buf);
+XMLPUBFUN void XMLCALL
+		xmlBufferSetAllocationScheme(xmlBufferPtr buf,
+					 xmlBufferAllocationScheme scheme);
+XMLPUBFUN int XMLCALL
+		xmlBufferLength		(const xmlBuffer *buf);
+
+/*
+ * Creating/freeing new structures.
+ */
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlCreateIntSubset	(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlNewDtd		(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlGetIntSubset		(const xmlDoc *doc);
+XMLPUBFUN void XMLCALL
+		xmlFreeDtd		(xmlDtdPtr cur);
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlNewGlobalNs		(xmlDocPtr doc,
+					 const xmlChar *href,
+					 const xmlChar *prefix);
+#endif /* LIBXML_LEGACY_ENABLED */
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlNewNs		(xmlNodePtr node,
+					 const xmlChar *href,
+					 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		xmlFreeNs		(xmlNsPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlFreeNsList		(xmlNsPtr cur);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlNewDoc		(const xmlChar *version);
+XMLPUBFUN void XMLCALL
+		xmlFreeDoc		(xmlDocPtr cur);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewDocProp		(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *value);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewProp		(xmlNodePtr node,
+					 const xmlChar *name,
+					 const xmlChar *value);
+#endif
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewNsProp		(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewNsPropEatName	(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		xmlFreePropList		(xmlAttrPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlFreeProp		(xmlAttrPtr cur);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlCopyProp		(xmlNodePtr target,
+					 xmlAttrPtr cur);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlCopyPropList		(xmlNodePtr target,
+					 xmlAttrPtr cur);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlCopyDtd		(xmlDtdPtr dtd);
+#endif /* LIBXML_TREE_ENABLED */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCopyDoc		(xmlDocPtr doc,
+					 int recursive);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) */
+/*
+ * Creating new nodes.
+ */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocNode		(xmlDocPtr doc,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocNodeEatName	(xmlDocPtr doc,
+					 xmlNsPtr ns,
+					 xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewNode		(xmlNsPtr ns,
+					 const xmlChar *name);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewNodeEatName	(xmlNsPtr ns,
+					 xmlChar *name);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewChild		(xmlNodePtr parent,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+#endif
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocText		(const xmlDoc *doc,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewText		(const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocPI		(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewPI		(const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocTextLen	(xmlDocPtr doc,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewTextLen		(const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocComment	(xmlDocPtr doc,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewComment		(const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewCDataBlock	(xmlDocPtr doc,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewCharRef		(xmlDocPtr doc,
+					 const xmlChar *name);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewReference		(const xmlDoc *doc,
+					 const xmlChar *name);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlCopyNode		(xmlNodePtr node,
+					 int recursive);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocCopyNode		(xmlNodePtr node,
+					 xmlDocPtr doc,
+					 int recursive);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocCopyNodeList	(xmlDocPtr doc,
+					 xmlNodePtr node);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlCopyNodeList		(xmlNodePtr node);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewTextChild		(xmlNodePtr parent,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocRawNode	(xmlDocPtr doc,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocFragment	(xmlDocPtr doc);
+#endif /* LIBXML_TREE_ENABLED */
+
+/*
+ * Navigating.
+ */
+XMLPUBFUN long XMLCALL
+		xmlGetLineNo		(const xmlNode *node);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetNodePath		(const xmlNode *node);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED) */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocGetRootElement	(const xmlDoc *doc);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlGetLastChild		(const xmlNode *parent);
+XMLPUBFUN int XMLCALL
+		xmlNodeIsText		(const xmlNode *node);
+XMLPUBFUN int XMLCALL
+		xmlIsBlankNode		(const xmlNode *node);
+
+/*
+ * Changing the structure.
+ */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocSetRootElement	(xmlDocPtr doc,
+					 xmlNodePtr root);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED) */
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlNodeSetName		(xmlNodePtr cur,
+					 const xmlChar *name);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddChild		(xmlNodePtr parent,
+					 xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddChildList		(xmlNodePtr parent,
+					 xmlNodePtr cur);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlReplaceNode		(xmlNodePtr old,
+					 xmlNodePtr cur);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED) */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddPrevSibling	(xmlNodePtr cur,
+					 xmlNodePtr elem);
+#endif /* LIBXML_TREE_ENABLED || LIBXML_HTML_ENABLED || LIBXML_SCHEMAS_ENABLED */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddSibling		(xmlNodePtr cur,
+					 xmlNodePtr elem);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddNextSibling	(xmlNodePtr cur,
+					 xmlNodePtr elem);
+XMLPUBFUN void XMLCALL
+		xmlUnlinkNode		(xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlTextMerge		(xmlNodePtr first,
+					 xmlNodePtr second);
+XMLPUBFUN int XMLCALL
+		xmlTextConcat		(xmlNodePtr node,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN void XMLCALL
+		xmlFreeNodeList		(xmlNodePtr cur);
+XMLPUBFUN void XMLCALL
+		xmlFreeNode		(xmlNodePtr cur);
+XMLPUBFUN void XMLCALL
+		xmlSetTreeDoc		(xmlNodePtr tree,
+					 xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+		xmlSetListDoc		(xmlNodePtr list,
+					 xmlDocPtr doc);
+/*
+ * Namespaces.
+ */
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlSearchNs		(xmlDocPtr doc,
+					 xmlNodePtr node,
+					 const xmlChar *nameSpace);
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlSearchNsByHref	(xmlDocPtr doc,
+					 xmlNodePtr node,
+					 const xmlChar *href);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlNsPtr * XMLCALL
+		xmlGetNsList		(const xmlDoc *doc,
+					 const xmlNode *node);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) */
+
+XMLPUBFUN void XMLCALL
+		xmlSetNs		(xmlNodePtr node,
+					 xmlNsPtr ns);
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlCopyNamespace	(xmlNsPtr cur);
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlCopyNamespaceList	(xmlNsPtr cur);
+
+/*
+ * Changing the content.
+ */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlSetProp		(xmlNodePtr node,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlSetNsProp		(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *value);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || \
+	  defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED) */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetNoNsProp		(const xmlNode *node,
+					 const xmlChar *name);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetProp		(const xmlNode *node,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlHasProp		(const xmlNode *node,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlHasNsProp		(const xmlNode *node,
+					 const xmlChar *name,
+					 const xmlChar *nameSpace);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetNsProp		(const xmlNode *node,
+					 const xmlChar *name,
+					 const xmlChar *nameSpace);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlStringGetNodeList	(const xmlDoc *doc,
+					 const xmlChar *value);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlStringLenGetNodeList	(const xmlDoc *doc,
+					 const xmlChar *value,
+					 int len);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeListGetString	(xmlDocPtr doc,
+					 const xmlNode *list,
+					 int inLine);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeListGetRawString	(const xmlDoc *doc,
+					 const xmlNode *list,
+					 int inLine);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlNodeSetContent	(xmlNodePtr cur,
+					 const xmlChar *content);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlNodeSetContentLen	(xmlNodePtr cur,
+					 const xmlChar *content,
+					 int len);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlNodeAddContent	(xmlNodePtr cur,
+					 const xmlChar *content);
+XMLPUBFUN void XMLCALL
+		xmlNodeAddContentLen	(xmlNodePtr cur,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeGetContent	(const xmlNode *cur);
+
+XMLPUBFUN int XMLCALL
+		xmlNodeBufGetContent	(xmlBufferPtr buffer,
+					 const xmlNode *cur);
+XMLPUBFUN int XMLCALL
+		xmlBufGetNodeContent	(xmlBufPtr buf,
+					 const xmlNode *cur);
+
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeGetLang		(const xmlNode *cur);
+XMLPUBFUN int XMLCALL
+		xmlNodeGetSpacePreserve	(const xmlNode *cur);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlNodeSetLang		(xmlNodePtr cur,
+					 const xmlChar *lang);
+XMLPUBFUN void XMLCALL
+		xmlNodeSetSpacePreserve (xmlNodePtr cur,
+					 int val);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeGetBase		(const xmlDoc *doc,
+					 const xmlNode *cur);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
+XMLPUBFUN void XMLCALL
+		xmlNodeSetBase		(xmlNodePtr cur,
+					 const xmlChar *uri);
+#endif
+
+/*
+ * Removing content.
+ */
+XMLPUBFUN int XMLCALL
+		xmlRemoveProp		(xmlAttrPtr cur);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlUnsetNsProp		(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 const xmlChar *name);
+XMLPUBFUN int XMLCALL
+		xmlUnsetProp		(xmlNodePtr node,
+					 const xmlChar *name);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) */
+
+/*
+ * Internal, don't use.
+ */
+XMLPUBFUN void XMLCALL
+		xmlBufferWriteCHAR	(xmlBufferPtr buf,
+					 const xmlChar *string);
+XMLPUBFUN void XMLCALL
+		xmlBufferWriteChar	(xmlBufferPtr buf,
+					 const char *string);
+XMLPUBFUN void XMLCALL
+		xmlBufferWriteQuotedString(xmlBufferPtr buf,
+					 const xmlChar *string);
+
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void xmlAttrSerializeTxtContent(xmlBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlAttrPtr attr,
+					 const xmlChar *string);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+#ifdef LIBXML_TREE_ENABLED
+/*
+ * Namespace handling.
+ */
+XMLPUBFUN int XMLCALL
+		xmlReconciliateNs	(xmlDocPtr doc,
+					 xmlNodePtr tree);
+#endif
+
+#ifdef LIBXML_OUTPUT_ENABLED
+/*
+ * Saving.
+ */
+XMLPUBFUN void XMLCALL
+		xmlDocDumpFormatMemory	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size,
+					 int format);
+XMLPUBFUN void XMLCALL
+		xmlDocDumpMemory	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size);
+XMLPUBFUN void XMLCALL
+		xmlDocDumpMemoryEnc	(xmlDocPtr out_doc,
+					 xmlChar **doc_txt_ptr,
+					 int * doc_txt_len,
+					 const char *txt_encoding);
+XMLPUBFUN void XMLCALL
+		xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc,
+					 xmlChar **doc_txt_ptr,
+					 int * doc_txt_len,
+					 const char *txt_encoding,
+					 int format);
+XMLPUBFUN int XMLCALL
+		xmlDocFormatDump	(FILE *f,
+					 xmlDocPtr cur,
+					 int format);
+XMLPUBFUN int XMLCALL
+		xmlDocDump		(FILE *f,
+					 xmlDocPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlElemDump		(FILE *f,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
+XMLPUBFUN int XMLCALL
+		xmlSaveFile		(const char *filename,
+					 xmlDocPtr cur);
+XMLPUBFUN int XMLCALL
+		xmlSaveFormatFile	(const char *filename,
+					 xmlDocPtr cur,
+					 int format);
+XMLPUBFUN size_t XMLCALL
+		xmlBufNodeDump		(xmlBufPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 int level,
+					 int format);
+XMLPUBFUN int XMLCALL
+		xmlNodeDump		(xmlBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 int level,
+					 int format);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFileTo		(xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+		xmlSaveFormatFileTo     (xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+				         const char *encoding,
+				         int format);
+XMLPUBFUN void XMLCALL
+		xmlNodeDumpOutput	(xmlOutputBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 int level,
+					 int format,
+					 const char *encoding);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFormatFileEnc    (const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding,
+					 int format);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFileEnc		(const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding);
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+/*
+ * XHTML
+ */
+XMLPUBFUN int XMLCALL
+		xmlIsXHTML		(const xmlChar *systemID,
+					 const xmlChar *publicID);
+
+/*
+ * Compression.
+ */
+XMLPUBFUN int XMLCALL
+		xmlGetDocCompressMode	(const xmlDoc *doc);
+XMLPUBFUN void XMLCALL
+		xmlSetDocCompressMode	(xmlDocPtr doc,
+					 int mode);
+XMLPUBFUN int XMLCALL
+		xmlGetCompressMode	(void);
+XMLPUBFUN void XMLCALL
+		xmlSetCompressMode	(int mode);
+
+/*
+* DOM-wrapper helper functions.
+*/
+XMLPUBFUN xmlDOMWrapCtxtPtr XMLCALL
+		xmlDOMWrapNewCtxt	(void);
+XMLPUBFUN void XMLCALL
+		xmlDOMWrapFreeCtxt	(xmlDOMWrapCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt,
+					 xmlNodePtr elem,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt,
+					 xmlDocPtr sourceDoc,
+					 xmlNodePtr node,
+					 xmlDocPtr destDoc,
+					 xmlNodePtr destParent,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapRemoveNode	(xmlDOMWrapCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr node,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt,
+					 xmlDocPtr sourceDoc,
+					 xmlNodePtr node,
+					 xmlNodePtr *clonedNode,
+					 xmlDocPtr destDoc,
+					 xmlNodePtr destParent,
+					 int deep,
+					 int options);
+
+#ifdef LIBXML_TREE_ENABLED
+/*
+ * 5 interfaces from DOM ElementTraversal, but different in entities
+ * traversal.
+ */
+XMLPUBFUN unsigned long XMLCALL
+            xmlChildElementCount        (xmlNodePtr parent);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlNextElementSibling       (xmlNodePtr node);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlFirstElementChild        (xmlNodePtr parent);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlLastElementChild         (xmlNodePtr parent);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlPreviousElementSibling   (xmlNodePtr node);
+#endif
+#ifdef __cplusplus
+}
+#endif
+#ifndef __XML_PARSER_H__
+#include <libxml/xmlmemory.h>
+#endif
+
+#endif /* __XML_TREE_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/uri.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/uri.h
new file mode 100644
index 0000000..db48262
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/uri.h
@@ -0,0 +1,94 @@
+/**
+ * Summary: library of generic URI related routines
+ * Description: library of generic URI related routines
+ *              Implements RFC 2396
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_URI_H__
+#define __XML_URI_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlURI:
+ *
+ * A parsed URI reference. This is a struct containing the various fields
+ * as described in RFC 2396 but separated for further processing.
+ *
+ * Note: query is a deprecated field which is incorrectly unescaped.
+ * query_raw takes precedence over query if the former is set.
+ * See: http://mail.gnome.org/archives/xml/2007-April/thread.html#00127
+ */
+typedef struct _xmlURI xmlURI;
+typedef xmlURI *xmlURIPtr;
+struct _xmlURI {
+    char *scheme;	/* the URI scheme */
+    char *opaque;	/* opaque part */
+    char *authority;	/* the authority part */
+    char *server;	/* the server part */
+    char *user;		/* the user part */
+    int port;		/* the port number */
+    char *path;		/* the path string */
+    char *query;	/* the query string (deprecated - use with caution) */
+    char *fragment;	/* the fragment identifier */
+    int  cleanup;	/* parsing potentially unclean URI */
+    char *query_raw;	/* the query string (as it appears in the URI) */
+};
+
+/*
+ * This function is in tree.h:
+ * xmlChar *	xmlNodeGetBase	(xmlDocPtr doc,
+ *                               xmlNodePtr cur);
+ */
+XMLPUBFUN xmlURIPtr XMLCALL
+		xmlCreateURI		(void);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlBuildURI		(const xmlChar *URI,
+					 const xmlChar *base);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlBuildRelativeURI	(const xmlChar *URI,
+					 const xmlChar *base);
+XMLPUBFUN xmlURIPtr XMLCALL
+		xmlParseURI		(const char *str);
+XMLPUBFUN xmlURIPtr XMLCALL
+		xmlParseURIRaw		(const char *str,
+					 int raw);
+XMLPUBFUN int XMLCALL
+		xmlParseURIReference	(xmlURIPtr uri,
+					 const char *str);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSaveUri		(xmlURIPtr uri);
+XMLPUBFUN void XMLCALL
+		xmlPrintURI		(FILE *stream,
+					 xmlURIPtr uri);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlURIEscapeStr         (const xmlChar *str,
+					 const xmlChar *list);
+XMLPUBFUN char * XMLCALL
+		xmlURIUnescapeString	(const char *str,
+					 int len,
+					 char *target);
+XMLPUBFUN int XMLCALL
+		xmlNormalizeURIPath	(char *path);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlURIEscape		(const xmlChar *str);
+XMLPUBFUN void XMLCALL
+		xmlFreeURI		(xmlURIPtr uri);
+XMLPUBFUN xmlChar* XMLCALL
+		xmlCanonicPath		(const xmlChar *path);
+XMLPUBFUN xmlChar* XMLCALL
+		xmlPathToURI		(const xmlChar *path);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_URI_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/valid.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/valid.h
new file mode 100644
index 0000000..2bc7b38
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/valid.h
@@ -0,0 +1,458 @@
+/*
+ * Summary: The DTD validation
+ * Description: API for the DTD handling and the validity checking
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_VALID_H__
+#define __XML_VALID_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/xmlerror.h>
+#include <libxml/tree.h>
+#include <libxml/list.h>
+#include <libxml/xmlautomata.h>
+#include <libxml/xmlregexp.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Validation state added for non-determinist content model.
+ */
+typedef struct _xmlValidState xmlValidState;
+typedef xmlValidState *xmlValidStatePtr;
+
+/**
+ * xmlValidityErrorFunc:
+ * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
+ *        but comes from ctxt->userData (which normally contains such
+ *        a pointer); ctxt->userData can be changed by the user.
+ * @msg:  the string to format *printf like vararg
+ * @...:  remaining arguments to the format
+ *
+ * Callback called when a validity error is found. This is a message
+ * oriented function similar to an *printf function.
+ */
+typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
+			     const char *msg,
+			     ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * xmlValidityWarningFunc:
+ * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
+ *        but comes from ctxt->userData (which normally contains such
+ *        a pointer); ctxt->userData can be changed by the user.
+ * @msg:  the string to format *printf like vararg
+ * @...:  remaining arguments to the format
+ *
+ * Callback called when a validity warning is found. This is a message
+ * oriented function similar to an *printf function.
+ */
+typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx,
+			       const char *msg,
+			       ...) LIBXML_ATTR_FORMAT(2,3);
+
+#ifdef IN_LIBXML
+/**
+ * XML_CTXT_FINISH_DTD_0:
+ *
+ * Special value for finishDtd field when embedded in an xmlParserCtxt
+ */
+#define XML_CTXT_FINISH_DTD_0 0xabcd1234
+/**
+ * XML_CTXT_FINISH_DTD_1:
+ *
+ * Special value for finishDtd field when embedded in an xmlParserCtxt
+ */
+#define XML_CTXT_FINISH_DTD_1 0xabcd1235
+#endif
+
+/*
+ * xmlValidCtxt:
+ * An xmlValidCtxt is used for error reporting when validating.
+ */
+typedef struct _xmlValidCtxt xmlValidCtxt;
+typedef xmlValidCtxt *xmlValidCtxtPtr;
+struct _xmlValidCtxt {
+    void *userData;			/* user specific data block */
+    xmlValidityErrorFunc error;		/* the callback in case of errors */
+    xmlValidityWarningFunc warning;	/* the callback in case of warning */
+
+    /* Node analysis stack used when validating within entities */
+    xmlNodePtr         node;          /* Current parsed Node */
+    int                nodeNr;        /* Depth of the parsing stack */
+    int                nodeMax;       /* Max depth of the parsing stack */
+    xmlNodePtr        *nodeTab;       /* array of nodes */
+
+    unsigned int     finishDtd;       /* finished validating the Dtd ? */
+    xmlDocPtr              doc;       /* the document */
+    int                  valid;       /* temporary validity check result */
+
+    /* state state used for non-determinist content validation */
+    xmlValidState     *vstate;        /* current state */
+    int                vstateNr;      /* Depth of the validation stack */
+    int                vstateMax;     /* Max depth of the validation stack */
+    xmlValidState     *vstateTab;     /* array of validation states */
+
+#ifdef LIBXML_REGEXP_ENABLED
+    xmlAutomataPtr            am;     /* the automata */
+    xmlAutomataStatePtr    state;     /* used to build the automata */
+#else
+    void                     *am;
+    void                  *state;
+#endif
+};
+
+/*
+ * ALL notation declarations are stored in a table.
+ * There is one table per DTD.
+ */
+
+typedef struct _xmlHashTable xmlNotationTable;
+typedef xmlNotationTable *xmlNotationTablePtr;
+
+/*
+ * ALL element declarations are stored in a table.
+ * There is one table per DTD.
+ */
+
+typedef struct _xmlHashTable xmlElementTable;
+typedef xmlElementTable *xmlElementTablePtr;
+
+/*
+ * ALL attribute declarations are stored in a table.
+ * There is one table per DTD.
+ */
+
+typedef struct _xmlHashTable xmlAttributeTable;
+typedef xmlAttributeTable *xmlAttributeTablePtr;
+
+/*
+ * ALL IDs attributes are stored in a table.
+ * There is one table per document.
+ */
+
+typedef struct _xmlHashTable xmlIDTable;
+typedef xmlIDTable *xmlIDTablePtr;
+
+/*
+ * ALL Refs attributes are stored in a table.
+ * There is one table per document.
+ */
+
+typedef struct _xmlHashTable xmlRefTable;
+typedef xmlRefTable *xmlRefTablePtr;
+
+/* Notation */
+XMLPUBFUN xmlNotationPtr XMLCALL
+		xmlAddNotationDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDtdPtr dtd,
+					 const xmlChar *name,
+					 const xmlChar *PublicID,
+					 const xmlChar *SystemID);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlNotationTablePtr XMLCALL
+		xmlCopyNotationTable	(xmlNotationTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeNotationTable	(xmlNotationTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlDumpNotationDecl	(xmlBufferPtr buf,
+					 xmlNotationPtr nota);
+XMLPUBFUN void XMLCALL
+		xmlDumpNotationTable	(xmlBufferPtr buf,
+					 xmlNotationTablePtr table);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/* Element Content */
+/* the non Doc version are being deprecated */
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlNewElementContent	(const xmlChar *name,
+					 xmlElementContentType type);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlCopyElementContent	(xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		xmlFreeElementContent	(xmlElementContentPtr cur);
+/* the new versions with doc argument */
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlNewDocElementContent	(xmlDocPtr doc,
+					 const xmlChar *name,
+					 xmlElementContentType type);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlCopyDocElementContent(xmlDocPtr doc,
+					 xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		xmlFreeDocElementContent(xmlDocPtr doc,
+					 xmlElementContentPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlSnprintfElementContent(char *buf,
+					 int size,
+	                                 xmlElementContentPtr content,
+					 int englob);
+#ifdef LIBXML_OUTPUT_ENABLED
+/* DEPRECATED */
+XMLPUBFUN void XMLCALL
+		xmlSprintfElementContent(char *buf,
+	                                 xmlElementContentPtr content,
+					 int englob);
+#endif /* LIBXML_OUTPUT_ENABLED */
+/* DEPRECATED */
+
+/* Element */
+XMLPUBFUN xmlElementPtr XMLCALL
+		xmlAddElementDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDtdPtr dtd,
+					 const xmlChar *name,
+					 xmlElementTypeVal type,
+					 xmlElementContentPtr content);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlElementTablePtr XMLCALL
+		xmlCopyElementTable	(xmlElementTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeElementTable	(xmlElementTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlDumpElementTable	(xmlBufferPtr buf,
+					 xmlElementTablePtr table);
+XMLPUBFUN void XMLCALL
+		xmlDumpElementDecl	(xmlBufferPtr buf,
+					 xmlElementPtr elem);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/* Enumeration */
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+		xmlCreateEnumeration	(const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		xmlFreeEnumeration	(xmlEnumerationPtr cur);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+		xmlCopyEnumeration	(xmlEnumerationPtr cur);
+#endif /* LIBXML_TREE_ENABLED */
+
+/* Attribute */
+XMLPUBFUN xmlAttributePtr XMLCALL
+		xmlAddAttributeDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDtdPtr dtd,
+					 const xmlChar *elem,
+					 const xmlChar *name,
+					 const xmlChar *ns,
+					 xmlAttributeType type,
+					 xmlAttributeDefault def,
+					 const xmlChar *defaultValue,
+					 xmlEnumerationPtr tree);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlAttributeTablePtr XMLCALL
+		xmlCopyAttributeTable  (xmlAttributeTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeAttributeTable  (xmlAttributeTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlDumpAttributeTable  (xmlBufferPtr buf,
+					xmlAttributeTablePtr table);
+XMLPUBFUN void XMLCALL
+		xmlDumpAttributeDecl   (xmlBufferPtr buf,
+					xmlAttributePtr attr);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/* IDs */
+XMLPUBFUN xmlIDPtr XMLCALL
+		xmlAddID	       (xmlValidCtxtPtr ctxt,
+					xmlDocPtr doc,
+					const xmlChar *value,
+					xmlAttrPtr attr);
+XMLPUBFUN void XMLCALL
+		xmlFreeIDTable	       (xmlIDTablePtr table);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlGetID	       (xmlDocPtr doc,
+					const xmlChar *ID);
+XMLPUBFUN int XMLCALL
+		xmlIsID		       (xmlDocPtr doc,
+					xmlNodePtr elem,
+					xmlAttrPtr attr);
+XMLPUBFUN int XMLCALL
+		xmlRemoveID	       (xmlDocPtr doc,
+					xmlAttrPtr attr);
+
+/* IDREFs */
+XMLPUBFUN xmlRefPtr XMLCALL
+		xmlAddRef	       (xmlValidCtxtPtr ctxt,
+					xmlDocPtr doc,
+					const xmlChar *value,
+					xmlAttrPtr attr);
+XMLPUBFUN void XMLCALL
+		xmlFreeRefTable	       (xmlRefTablePtr table);
+XMLPUBFUN int XMLCALL
+		xmlIsRef	       (xmlDocPtr doc,
+					xmlNodePtr elem,
+					xmlAttrPtr attr);
+XMLPUBFUN int XMLCALL
+		xmlRemoveRef	       (xmlDocPtr doc,
+					xmlAttrPtr attr);
+XMLPUBFUN xmlListPtr XMLCALL
+		xmlGetRefs	       (xmlDocPtr doc,
+					const xmlChar *ID);
+
+/**
+ * The public function calls related to validity checking.
+ */
+#ifdef LIBXML_VALID_ENABLED
+/* Allocate/Release Validation Contexts */
+XMLPUBFUN xmlValidCtxtPtr XMLCALL
+		xmlNewValidCtxt(void);
+XMLPUBFUN void XMLCALL
+		xmlFreeValidCtxt(xmlValidCtxtPtr);
+
+XMLPUBFUN int XMLCALL
+		xmlValidateRoot		(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlValidateElementDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlElementPtr elem);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlValidNormalizeAttributeValue(xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlAttributePtr attr);
+XMLPUBFUN int XMLCALL
+		xmlValidateAttributeValue(xmlAttributeType type,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNotationDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlNotationPtr nota);
+XMLPUBFUN int XMLCALL
+		xmlValidateDtd		(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlDtdPtr dtd);
+XMLPUBFUN int XMLCALL
+		xmlValidateDtdFinal	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlValidateDocument	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlValidateElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		xmlValidateOneElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		xmlValidateOneAttribute	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr	elem,
+					 xmlAttrPtr attr,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateOneNamespace	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *prefix,
+					 xmlNsPtr ns,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+#endif /* LIBXML_VALID_ENABLED */
+
+#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlValidateNotationUse	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 const xmlChar *notationName);
+#endif /* LIBXML_VALID_ENABLED or LIBXML_SCHEMAS_ENABLED */
+
+XMLPUBFUN int XMLCALL
+		xmlIsMixedElement	(xmlDocPtr doc,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttributePtr XMLCALL
+		xmlGetDtdAttrDesc	(xmlDtdPtr dtd,
+					 const xmlChar *elem,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttributePtr XMLCALL
+		xmlGetDtdQAttrDesc	(xmlDtdPtr dtd,
+					 const xmlChar *elem,
+					 const xmlChar *name,
+					 const xmlChar *prefix);
+XMLPUBFUN xmlNotationPtr XMLCALL
+		xmlGetDtdNotationDesc	(xmlDtdPtr dtd,
+					 const xmlChar *name);
+XMLPUBFUN xmlElementPtr XMLCALL
+		xmlGetDtdQElementDesc	(xmlDtdPtr dtd,
+					 const xmlChar *name,
+					 const xmlChar *prefix);
+XMLPUBFUN xmlElementPtr XMLCALL
+		xmlGetDtdElementDesc	(xmlDtdPtr dtd,
+					 const xmlChar *name);
+
+#ifdef LIBXML_VALID_ENABLED
+
+XMLPUBFUN int XMLCALL
+		xmlValidGetPotentialChildren(xmlElementContent *ctree,
+					 const xmlChar **names,
+					 int *len,
+					 int max);
+
+XMLPUBFUN int XMLCALL
+		xmlValidGetValidElements(xmlNode *prev,
+					 xmlNode *next,
+					 const xmlChar **names,
+					 int max);
+XMLPUBFUN int XMLCALL
+		xmlValidateNameValue	(const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNamesValue	(const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNmtokenValue	(const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNmtokensValue(const xmlChar *value);
+
+#ifdef LIBXML_REGEXP_ENABLED
+/*
+ * Validation based on the regexp support
+ */
+XMLPUBFUN int XMLCALL
+		xmlValidBuildContentModel(xmlValidCtxtPtr ctxt,
+					 xmlElementPtr elem);
+
+XMLPUBFUN int XMLCALL
+		xmlValidatePushElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *qname);
+XMLPUBFUN int XMLCALL
+		xmlValidatePushCData	(xmlValidCtxtPtr ctxt,
+					 const xmlChar *data,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlValidatePopElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *qname);
+#endif /* LIBXML_REGEXP_ENABLED */
+#endif /* LIBXML_VALID_ENABLED */
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_VALID_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xinclude.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xinclude.h
new file mode 100644
index 0000000..863ab25
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xinclude.h
@@ -0,0 +1,129 @@
+/*
+ * Summary: implementation of XInclude
+ * Description: API to handle XInclude processing,
+ * implements the
+ * World Wide Web Consortium Last Call Working Draft 10 November 2003
+ * http://www.w3.org/TR/2003/WD-xinclude-20031110
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XINCLUDE_H__
+#define __XML_XINCLUDE_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_XINCLUDE_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * XINCLUDE_NS:
+ *
+ * Macro defining the Xinclude namespace: http://www.w3.org/2003/XInclude
+ */
+#define XINCLUDE_NS (const xmlChar *) "http://www.w3.org/2003/XInclude"
+/**
+ * XINCLUDE_OLD_NS:
+ *
+ * Macro defining the draft Xinclude namespace: http://www.w3.org/2001/XInclude
+ */
+#define XINCLUDE_OLD_NS (const xmlChar *) "http://www.w3.org/2001/XInclude"
+/**
+ * XINCLUDE_NODE:
+ *
+ * Macro defining "include"
+ */
+#define XINCLUDE_NODE (const xmlChar *) "include"
+/**
+ * XINCLUDE_FALLBACK:
+ *
+ * Macro defining "fallback"
+ */
+#define XINCLUDE_FALLBACK (const xmlChar *) "fallback"
+/**
+ * XINCLUDE_HREF:
+ *
+ * Macro defining "href"
+ */
+#define XINCLUDE_HREF (const xmlChar *) "href"
+/**
+ * XINCLUDE_PARSE:
+ *
+ * Macro defining "parse"
+ */
+#define XINCLUDE_PARSE (const xmlChar *) "parse"
+/**
+ * XINCLUDE_PARSE_XML:
+ *
+ * Macro defining "xml"
+ */
+#define XINCLUDE_PARSE_XML (const xmlChar *) "xml"
+/**
+ * XINCLUDE_PARSE_TEXT:
+ *
+ * Macro defining "text"
+ */
+#define XINCLUDE_PARSE_TEXT (const xmlChar *) "text"
+/**
+ * XINCLUDE_PARSE_ENCODING:
+ *
+ * Macro defining "encoding"
+ */
+#define XINCLUDE_PARSE_ENCODING (const xmlChar *) "encoding"
+/**
+ * XINCLUDE_PARSE_XPOINTER:
+ *
+ * Macro defining "xpointer"
+ */
+#define XINCLUDE_PARSE_XPOINTER (const xmlChar *) "xpointer"
+
+typedef struct _xmlXIncludeCtxt xmlXIncludeCtxt;
+typedef xmlXIncludeCtxt *xmlXIncludeCtxtPtr;
+
+/*
+ * standalone processing
+ */
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcess	(xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessFlags	(xmlDocPtr doc,
+					 int flags);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessFlagsData(xmlDocPtr doc,
+					 int flags,
+					 void *data);
+XMLPUBFUN int XMLCALL
+                xmlXIncludeProcessTreeFlagsData(xmlNodePtr tree,
+                                         int flags,
+                                         void *data);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessTree	(xmlNodePtr tree);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessTreeFlags(xmlNodePtr tree,
+					 int flags);
+/*
+ * contextual processing
+ */
+XMLPUBFUN xmlXIncludeCtxtPtr XMLCALL
+		xmlXIncludeNewContext	(xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeSetFlags	(xmlXIncludeCtxtPtr ctxt,
+					 int flags);
+XMLPUBFUN void XMLCALL
+		xmlXIncludeFreeContext	(xmlXIncludeCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessNode	(xmlXIncludeCtxtPtr ctxt,
+					 xmlNodePtr tree);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XINCLUDE_ENABLED */
+
+#endif /* __XML_XINCLUDE_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xlink.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xlink.h
new file mode 100644
index 0000000..04e4b32
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xlink.h
@@ -0,0 +1,189 @@
+/*
+ * Summary: unfinished XLink detection module
+ * Description: unfinished XLink detection module
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XLINK_H__
+#define __XML_XLINK_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_XPTR_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Various defines for the various Link properties.
+ *
+ * NOTE: the link detection layer will try to resolve QName expansion
+ *       of namespaces. If "foo" is the prefix for "http://foo.com/"
+ *       then the link detection layer will expand role="foo:myrole"
+ *       to "http://foo.com/:myrole".
+ * NOTE: the link detection layer will expand URI-References found on
+ *       href attributes by using the base mechanism if found.
+ */
+typedef xmlChar *xlinkHRef;
+typedef xmlChar *xlinkRole;
+typedef xmlChar *xlinkTitle;
+
+typedef enum {
+    XLINK_TYPE_NONE = 0,
+    XLINK_TYPE_SIMPLE,
+    XLINK_TYPE_EXTENDED,
+    XLINK_TYPE_EXTENDED_SET
+} xlinkType;
+
+typedef enum {
+    XLINK_SHOW_NONE = 0,
+    XLINK_SHOW_NEW,
+    XLINK_SHOW_EMBED,
+    XLINK_SHOW_REPLACE
+} xlinkShow;
+
+typedef enum {
+    XLINK_ACTUATE_NONE = 0,
+    XLINK_ACTUATE_AUTO,
+    XLINK_ACTUATE_ONREQUEST
+} xlinkActuate;
+
+/**
+ * xlinkNodeDetectFunc:
+ * @ctx:  user data pointer
+ * @node:  the node to check
+ *
+ * This is the prototype for the link detection routine.
+ * It calls the default link detection callbacks upon link detection.
+ */
+typedef void (*xlinkNodeDetectFunc) (void *ctx, xmlNodePtr node);
+
+/*
+ * The link detection module interact with the upper layers using
+ * a set of callback registered at parsing time.
+ */
+
+/**
+ * xlinkSimpleLinkFunk:
+ * @ctx:  user data pointer
+ * @node:  the node carrying the link
+ * @href:  the target of the link
+ * @role:  the role string
+ * @title:  the link title
+ *
+ * This is the prototype for a simple link detection callback.
+ */
+typedef void
+(*xlinkSimpleLinkFunk)	(void *ctx,
+			 xmlNodePtr node,
+			 const xlinkHRef href,
+			 const xlinkRole role,
+			 const xlinkTitle title);
+
+/**
+ * xlinkExtendedLinkFunk:
+ * @ctx:  user data pointer
+ * @node:  the node carrying the link
+ * @nbLocators: the number of locators detected on the link
+ * @hrefs:  pointer to the array of locator hrefs
+ * @roles:  pointer to the array of locator roles
+ * @nbArcs: the number of arcs detected on the link
+ * @from:  pointer to the array of source roles found on the arcs
+ * @to:  pointer to the array of target roles found on the arcs
+ * @show:  array of values for the show attributes found on the arcs
+ * @actuate:  array of values for the actuate attributes found on the arcs
+ * @nbTitles: the number of titles detected on the link
+ * @title:  array of titles detected on the link
+ * @langs:  array of xml:lang values for the titles
+ *
+ * This is the prototype for a extended link detection callback.
+ */
+typedef void
+(*xlinkExtendedLinkFunk)(void *ctx,
+			 xmlNodePtr node,
+			 int nbLocators,
+			 const xlinkHRef *hrefs,
+			 const xlinkRole *roles,
+			 int nbArcs,
+			 const xlinkRole *from,
+			 const xlinkRole *to,
+			 xlinkShow *show,
+			 xlinkActuate *actuate,
+			 int nbTitles,
+			 const xlinkTitle *titles,
+			 const xmlChar **langs);
+
+/**
+ * xlinkExtendedLinkSetFunk:
+ * @ctx:  user data pointer
+ * @node:  the node carrying the link
+ * @nbLocators: the number of locators detected on the link
+ * @hrefs:  pointer to the array of locator hrefs
+ * @roles:  pointer to the array of locator roles
+ * @nbTitles: the number of titles detected on the link
+ * @title:  array of titles detected on the link
+ * @langs:  array of xml:lang values for the titles
+ *
+ * This is the prototype for a extended link set detection callback.
+ */
+typedef void
+(*xlinkExtendedLinkSetFunk)	(void *ctx,
+				 xmlNodePtr node,
+				 int nbLocators,
+				 const xlinkHRef *hrefs,
+				 const xlinkRole *roles,
+				 int nbTitles,
+				 const xlinkTitle *titles,
+				 const xmlChar **langs);
+
+/**
+ * This is the structure containing a set of Links detection callbacks.
+ *
+ * There is no default xlink callbacks, if one want to get link
+ * recognition activated, those call backs must be provided before parsing.
+ */
+typedef struct _xlinkHandler xlinkHandler;
+typedef xlinkHandler *xlinkHandlerPtr;
+struct _xlinkHandler {
+    xlinkSimpleLinkFunk simple;
+    xlinkExtendedLinkFunk extended;
+    xlinkExtendedLinkSetFunk set;
+};
+
+/*
+ * The default detection routine, can be overridden, they call the default
+ * detection callbacks.
+ */
+
+XMLPUBFUN xlinkNodeDetectFunc XMLCALL
+		xlinkGetDefaultDetect	(void);
+XMLPUBFUN void XMLCALL
+		xlinkSetDefaultDetect	(xlinkNodeDetectFunc func);
+
+/*
+ * Routines to set/get the default handlers.
+ */
+XMLPUBFUN xlinkHandlerPtr XMLCALL
+		xlinkGetDefaultHandler	(void);
+XMLPUBFUN void XMLCALL
+		xlinkSetDefaultHandler	(xlinkHandlerPtr handler);
+
+/*
+ * Link detection module itself.
+ */
+XMLPUBFUN xlinkType XMLCALL
+		xlinkIsLink		(xmlDocPtr doc,
+					 xmlNodePtr node);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPTR_ENABLED */
+
+#endif /* __XML_XLINK_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlIO.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlIO.h
new file mode 100644
index 0000000..095b2f5
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlIO.h
@@ -0,0 +1,368 @@
+/*
+ * Summary: interface for the I/O interfaces used by the parser
+ * Description: interface for the I/O interfaces used by the parser
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_IO_H__
+#define __XML_IO_H__
+
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Those are the functions and datatypes for the parser input
+ * I/O structures.
+ */
+
+/**
+ * xmlInputMatchCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Input API to detect if the current handler
+ * can provide input functionality for this resource.
+ *
+ * Returns 1 if yes and 0 if another Input module should be used
+ */
+typedef int (XMLCALL *xmlInputMatchCallback) (char const *filename);
+/**
+ * xmlInputOpenCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Input API to open the resource
+ *
+ * Returns an Input context or NULL in case or error
+ */
+typedef void * (XMLCALL *xmlInputOpenCallback) (char const *filename);
+/**
+ * xmlInputReadCallback:
+ * @context:  an Input context
+ * @buffer:  the buffer to store data read
+ * @len:  the length of the buffer in bytes
+ *
+ * Callback used in the I/O Input API to read the resource
+ *
+ * Returns the number of bytes read or -1 in case of error
+ */
+typedef int (XMLCALL *xmlInputReadCallback) (void * context, char * buffer, int len);
+/**
+ * xmlInputCloseCallback:
+ * @context:  an Input context
+ *
+ * Callback used in the I/O Input API to close the resource
+ *
+ * Returns 0 or -1 in case of error
+ */
+typedef int (XMLCALL *xmlInputCloseCallback) (void * context);
+
+#ifdef LIBXML_OUTPUT_ENABLED
+/*
+ * Those are the functions and datatypes for the library output
+ * I/O structures.
+ */
+
+/**
+ * xmlOutputMatchCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Output API to detect if the current handler
+ * can provide output functionality for this resource.
+ *
+ * Returns 1 if yes and 0 if another Output module should be used
+ */
+typedef int (XMLCALL *xmlOutputMatchCallback) (char const *filename);
+/**
+ * xmlOutputOpenCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Output API to open the resource
+ *
+ * Returns an Output context or NULL in case or error
+ */
+typedef void * (XMLCALL *xmlOutputOpenCallback) (char const *filename);
+/**
+ * xmlOutputWriteCallback:
+ * @context:  an Output context
+ * @buffer:  the buffer of data to write
+ * @len:  the length of the buffer in bytes
+ *
+ * Callback used in the I/O Output API to write to the resource
+ *
+ * Returns the number of bytes written or -1 in case of error
+ */
+typedef int (XMLCALL *xmlOutputWriteCallback) (void * context, const char * buffer,
+                                       int len);
+/**
+ * xmlOutputCloseCallback:
+ * @context:  an Output context
+ *
+ * Callback used in the I/O Output API to close the resource
+ *
+ * Returns 0 or -1 in case of error
+ */
+typedef int (XMLCALL *xmlOutputCloseCallback) (void * context);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <libxml/globals.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/encoding.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+struct _xmlParserInputBuffer {
+    void*                  context;
+    xmlInputReadCallback   readcallback;
+    xmlInputCloseCallback  closecallback;
+
+    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
+
+    xmlBufPtr buffer;    /* Local buffer encoded in UTF-8 */
+    xmlBufPtr raw;       /* if encoder != NULL buffer for raw input */
+    int	compressed;	    /* -1=unknown, 0=not compressed, 1=compressed */
+    int error;
+    unsigned long rawconsumed;/* amount consumed from raw */
+};
+
+
+#ifdef LIBXML_OUTPUT_ENABLED
+struct _xmlOutputBuffer {
+    void*                   context;
+    xmlOutputWriteCallback  writecallback;
+    xmlOutputCloseCallback  closecallback;
+
+    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
+
+    xmlBufPtr buffer;    /* Local buffer encoded in UTF-8 or ISOLatin */
+    xmlBufPtr conv;      /* if encoder != NULL buffer for output */
+    int written;            /* total number of byte written */
+    int error;
+};
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/*
+ * Interfaces for input
+ */
+XMLPUBFUN void XMLCALL
+	xmlCleanupInputCallbacks		(void);
+
+XMLPUBFUN int XMLCALL
+	xmlPopInputCallbacks			(void);
+
+XMLPUBFUN void XMLCALL
+	xmlRegisterDefaultInputCallbacks	(void);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlAllocParserInputBuffer		(xmlCharEncoding enc);
+
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateFilename	(const char *URI,
+                                                 xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateFile		(FILE *file,
+                                                 xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateFd		(int fd,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateMem		(const char *mem, int size,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateStatic	(const char *mem, int size,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateIO		(xmlInputReadCallback   ioread,
+						 xmlInputCloseCallback  ioclose,
+						 void *ioctx,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+	xmlParserInputBufferRead		(xmlParserInputBufferPtr in,
+						 int len);
+XMLPUBFUN int XMLCALL
+	xmlParserInputBufferGrow		(xmlParserInputBufferPtr in,
+						 int len);
+XMLPUBFUN int XMLCALL
+	xmlParserInputBufferPush		(xmlParserInputBufferPtr in,
+						 int len,
+						 const char *buf);
+XMLPUBFUN void XMLCALL
+	xmlFreeParserInputBuffer		(xmlParserInputBufferPtr in);
+XMLPUBFUN char * XMLCALL
+	xmlParserGetDirectory			(const char *filename);
+
+XMLPUBFUN int XMLCALL
+	xmlRegisterInputCallbacks		(xmlInputMatchCallback matchFunc,
+						 xmlInputOpenCallback openFunc,
+						 xmlInputReadCallback readFunc,
+						 xmlInputCloseCallback closeFunc);
+
+xmlParserInputBufferPtr
+	__xmlParserInputBufferCreateFilename(const char *URI,
+						xmlCharEncoding enc);
+
+#ifdef LIBXML_OUTPUT_ENABLED
+/*
+ * Interfaces for output
+ */
+XMLPUBFUN void XMLCALL
+	xmlCleanupOutputCallbacks		(void);
+XMLPUBFUN int XMLCALL
+	xmlPopOutputCallbacks			(void);
+XMLPUBFUN void XMLCALL
+	xmlRegisterDefaultOutputCallbacks(void);
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlAllocOutputBuffer		(xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateFilename	(const char *URI,
+					 xmlCharEncodingHandlerPtr encoder,
+					 int compression);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateFile	(FILE *file,
+					 xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateBuffer	(xmlBufferPtr buffer,
+					 xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateFd		(int fd,
+					 xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateIO		(xmlOutputWriteCallback   iowrite,
+					 xmlOutputCloseCallback  ioclose,
+					 void *ioctx,
+					 xmlCharEncodingHandlerPtr encoder);
+
+/* Couple of APIs to get the output without digging into the buffers */
+XMLPUBFUN const xmlChar * XMLCALL
+        xmlOutputBufferGetContent       (xmlOutputBufferPtr out);
+XMLPUBFUN size_t XMLCALL
+        xmlOutputBufferGetSize          (xmlOutputBufferPtr out);
+
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferWrite		(xmlOutputBufferPtr out,
+					 int len,
+					 const char *buf);
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferWriteString	(xmlOutputBufferPtr out,
+					 const char *str);
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferWriteEscape	(xmlOutputBufferPtr out,
+					 const xmlChar *str,
+					 xmlCharEncodingOutputFunc escaping);
+
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferFlush		(xmlOutputBufferPtr out);
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferClose		(xmlOutputBufferPtr out);
+
+XMLPUBFUN int XMLCALL
+	xmlRegisterOutputCallbacks	(xmlOutputMatchCallback matchFunc,
+					 xmlOutputOpenCallback openFunc,
+					 xmlOutputWriteCallback writeFunc,
+					 xmlOutputCloseCallback closeFunc);
+
+xmlOutputBufferPtr
+	__xmlOutputBufferCreateFilename(const char *URI,
+                              xmlCharEncodingHandlerPtr encoder,
+                              int compression);
+
+#ifdef LIBXML_HTTP_ENABLED
+/*  This function only exists if HTTP support built into the library  */
+XMLPUBFUN void XMLCALL
+	xmlRegisterHTTPPostCallbacks	(void );
+#endif /* LIBXML_HTTP_ENABLED */
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+XMLPUBFUN xmlParserInputPtr XMLCALL
+	xmlCheckHTTPInput		(xmlParserCtxtPtr ctxt,
+					 xmlParserInputPtr ret);
+
+/*
+ * A predefined entity loader disabling network accesses
+ */
+XMLPUBFUN xmlParserInputPtr XMLCALL
+	xmlNoNetExternalEntityLoader	(const char *URL,
+					 const char *ID,
+					 xmlParserCtxtPtr ctxt);
+
+/*
+ * xmlNormalizeWindowsPath is obsolete, don't use it.
+ * Check xmlCanonicPath in uri.h for a better alternative.
+ */
+XMLPUBFUN xmlChar * XMLCALL
+	xmlNormalizeWindowsPath		(const xmlChar *path);
+
+XMLPUBFUN int XMLCALL
+	xmlCheckFilename		(const char *path);
+/**
+ * Default 'file://' protocol callbacks
+ */
+XMLPUBFUN int XMLCALL
+	xmlFileMatch			(const char *filename);
+XMLPUBFUN void * XMLCALL
+	xmlFileOpen			(const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlFileRead			(void * context,
+					 char * buffer,
+					 int len);
+XMLPUBFUN int XMLCALL
+	xmlFileClose			(void * context);
+
+/**
+ * Default 'http://' protocol callbacks
+ */
+#ifdef LIBXML_HTTP_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlIOHTTPMatch			(const char *filename);
+XMLPUBFUN void * XMLCALL
+	xmlIOHTTPOpen			(const char *filename);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void * XMLCALL
+	xmlIOHTTPOpenW			(const char * post_uri,
+					 int   compression );
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN int XMLCALL
+	xmlIOHTTPRead			(void * context,
+					 char * buffer,
+					 int len);
+XMLPUBFUN int XMLCALL
+	xmlIOHTTPClose			(void * context);
+#endif /* LIBXML_HTTP_ENABLED */
+
+/**
+ * Default 'ftp://' protocol callbacks
+ */
+#ifdef LIBXML_FTP_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlIOFTPMatch			(const char *filename);
+XMLPUBFUN void * XMLCALL
+	xmlIOFTPOpen			(const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlIOFTPRead			(void * context,
+					 char * buffer,
+					 int len);
+XMLPUBFUN int XMLCALL
+	xmlIOFTPClose			(void * context);
+#endif /* LIBXML_FTP_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_IO_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlautomata.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlautomata.h
new file mode 100644
index 0000000..bf1b131
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlautomata.h
@@ -0,0 +1,146 @@
+/*
+ * Summary: API to build regexp automata
+ * Description: the API to build regexp automata
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_AUTOMATA_H__
+#define __XML_AUTOMATA_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_REGEXP_ENABLED
+#ifdef LIBXML_AUTOMATA_ENABLED
+#include <libxml/xmlregexp.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlAutomataPtr:
+ *
+ * A libxml automata description, It can be compiled into a regexp
+ */
+typedef struct _xmlAutomata xmlAutomata;
+typedef xmlAutomata *xmlAutomataPtr;
+
+/**
+ * xmlAutomataStatePtr:
+ *
+ * A state int the automata description,
+ */
+typedef struct _xmlAutomataState xmlAutomataState;
+typedef xmlAutomataState *xmlAutomataStatePtr;
+
+/*
+ * Building API
+ */
+XMLPUBFUN xmlAutomataPtr XMLCALL
+		    xmlNewAutomata		(void);
+XMLPUBFUN void XMLCALL
+		    xmlFreeAutomata		(xmlAutomataPtr am);
+
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataGetInitState	(xmlAutomataPtr am);
+XMLPUBFUN int XMLCALL
+		    xmlAutomataSetFinalState	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr state);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewState		(xmlAutomataPtr am);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewTransition	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewTransition2	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+                    xmlAutomataNewNegTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 void *data);
+
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCountTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCountTrans2	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewOnceTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewOnceTrans2	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewAllTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 int lax);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewEpsilon	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCountedTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 int counter);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCounterTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 int counter);
+XMLPUBFUN int XMLCALL
+		    xmlAutomataNewCounter	(xmlAutomataPtr am,
+						 int min,
+						 int max);
+
+XMLPUBFUN xmlRegexpPtr XMLCALL
+		    xmlAutomataCompile		(xmlAutomataPtr am);
+XMLPUBFUN int XMLCALL
+		    xmlAutomataIsDeterminist	(xmlAutomataPtr am);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_AUTOMATA_ENABLED */
+#endif /* LIBXML_REGEXP_ENABLED */
+
+#endif /* __XML_AUTOMATA_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlerror.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlerror.h
new file mode 100644
index 0000000..c101997
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlerror.h
@@ -0,0 +1,945 @@
+/*
+ * Summary: error handling
+ * Description: the API used to report errors
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#include <libxml/parser.h>
+
+#ifndef __XML_ERROR_H__
+#define __XML_ERROR_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlErrorLevel:
+ *
+ * Indicates the level of an error
+ */
+typedef enum {
+    XML_ERR_NONE = 0,
+    XML_ERR_WARNING = 1,	/* A simple warning */
+    XML_ERR_ERROR = 2,		/* A recoverable error */
+    XML_ERR_FATAL = 3		/* A fatal error */
+} xmlErrorLevel;
+
+/**
+ * xmlErrorDomain:
+ *
+ * Indicates where an error may have come from
+ */
+typedef enum {
+    XML_FROM_NONE = 0,
+    XML_FROM_PARSER,	/* The XML parser */
+    XML_FROM_TREE,	/* The tree module */
+    XML_FROM_NAMESPACE,	/* The XML Namespace module */
+    XML_FROM_DTD,	/* The XML DTD validation with parser context*/
+    XML_FROM_HTML,	/* The HTML parser */
+    XML_FROM_MEMORY,	/* The memory allocator */
+    XML_FROM_OUTPUT,	/* The serialization code */
+    XML_FROM_IO,	/* The Input/Output stack */
+    XML_FROM_FTP,	/* The FTP module */
+    XML_FROM_HTTP,	/* The HTTP module */
+    XML_FROM_XINCLUDE,	/* The XInclude processing */
+    XML_FROM_XPATH,	/* The XPath module */
+    XML_FROM_XPOINTER,	/* The XPointer module */
+    XML_FROM_REGEXP,	/* The regular expressions module */
+    XML_FROM_DATATYPE,	/* The W3C XML Schemas Datatype module */
+    XML_FROM_SCHEMASP,	/* The W3C XML Schemas parser module */
+    XML_FROM_SCHEMASV,	/* The W3C XML Schemas validation module */
+    XML_FROM_RELAXNGP,	/* The Relax-NG parser module */
+    XML_FROM_RELAXNGV,	/* The Relax-NG validator module */
+    XML_FROM_CATALOG,	/* The Catalog module */
+    XML_FROM_C14N,	/* The Canonicalization module */
+    XML_FROM_XSLT,	/* The XSLT engine from libxslt */
+    XML_FROM_VALID,	/* The XML DTD validation with valid context */
+    XML_FROM_CHECK,	/* The error checking module */
+    XML_FROM_WRITER,	/* The xmlwriter module */
+    XML_FROM_MODULE,	/* The dynamically loaded module module*/
+    XML_FROM_I18N,	/* The module handling character conversion */
+    XML_FROM_SCHEMATRONV,/* The Schematron validator module */
+    XML_FROM_BUFFER,    /* The buffers module */
+    XML_FROM_URI        /* The URI module */
+} xmlErrorDomain;
+
+/**
+ * xmlError:
+ *
+ * An XML Error instance.
+ */
+
+typedef struct _xmlError xmlError;
+typedef xmlError *xmlErrorPtr;
+struct _xmlError {
+    int		domain;	/* What part of the library raised this error */
+    int		code;	/* The error code, e.g. an xmlParserError */
+    char       *message;/* human-readable informative error message */
+    xmlErrorLevel level;/* how consequent is the error */
+    char       *file;	/* the filename */
+    int		line;	/* the line number if available */
+    char       *str1;	/* extra string information */
+    char       *str2;	/* extra string information */
+    char       *str3;	/* extra string information */
+    int		int1;	/* extra number information */
+    int		int2;	/* error column # or 0 if N/A (todo: rename field when we would brk ABI) */
+    void       *ctxt;   /* the parser context if available */
+    void       *node;   /* the node in the tree */
+};
+
+/**
+ * xmlParserError:
+ *
+ * This is an error that the XML (or HTML) parser can generate
+ */
+typedef enum {
+    XML_ERR_OK = 0,
+    XML_ERR_INTERNAL_ERROR, /* 1 */
+    XML_ERR_NO_MEMORY, /* 2 */
+    XML_ERR_DOCUMENT_START, /* 3 */
+    XML_ERR_DOCUMENT_EMPTY, /* 4 */
+    XML_ERR_DOCUMENT_END, /* 5 */
+    XML_ERR_INVALID_HEX_CHARREF, /* 6 */
+    XML_ERR_INVALID_DEC_CHARREF, /* 7 */
+    XML_ERR_INVALID_CHARREF, /* 8 */
+    XML_ERR_INVALID_CHAR, /* 9 */
+    XML_ERR_CHARREF_AT_EOF, /* 10 */
+    XML_ERR_CHARREF_IN_PROLOG, /* 11 */
+    XML_ERR_CHARREF_IN_EPILOG, /* 12 */
+    XML_ERR_CHARREF_IN_DTD, /* 13 */
+    XML_ERR_ENTITYREF_AT_EOF, /* 14 */
+    XML_ERR_ENTITYREF_IN_PROLOG, /* 15 */
+    XML_ERR_ENTITYREF_IN_EPILOG, /* 16 */
+    XML_ERR_ENTITYREF_IN_DTD, /* 17 */
+    XML_ERR_PEREF_AT_EOF, /* 18 */
+    XML_ERR_PEREF_IN_PROLOG, /* 19 */
+    XML_ERR_PEREF_IN_EPILOG, /* 20 */
+    XML_ERR_PEREF_IN_INT_SUBSET, /* 21 */
+    XML_ERR_ENTITYREF_NO_NAME, /* 22 */
+    XML_ERR_ENTITYREF_SEMICOL_MISSING, /* 23 */
+    XML_ERR_PEREF_NO_NAME, /* 24 */
+    XML_ERR_PEREF_SEMICOL_MISSING, /* 25 */
+    XML_ERR_UNDECLARED_ENTITY, /* 26 */
+    XML_WAR_UNDECLARED_ENTITY, /* 27 */
+    XML_ERR_UNPARSED_ENTITY, /* 28 */
+    XML_ERR_ENTITY_IS_EXTERNAL, /* 29 */
+    XML_ERR_ENTITY_IS_PARAMETER, /* 30 */
+    XML_ERR_UNKNOWN_ENCODING, /* 31 */
+    XML_ERR_UNSUPPORTED_ENCODING, /* 32 */
+    XML_ERR_STRING_NOT_STARTED, /* 33 */
+    XML_ERR_STRING_NOT_CLOSED, /* 34 */
+    XML_ERR_NS_DECL_ERROR, /* 35 */
+    XML_ERR_ENTITY_NOT_STARTED, /* 36 */
+    XML_ERR_ENTITY_NOT_FINISHED, /* 37 */
+    XML_ERR_LT_IN_ATTRIBUTE, /* 38 */
+    XML_ERR_ATTRIBUTE_NOT_STARTED, /* 39 */
+    XML_ERR_ATTRIBUTE_NOT_FINISHED, /* 40 */
+    XML_ERR_ATTRIBUTE_WITHOUT_VALUE, /* 41 */
+    XML_ERR_ATTRIBUTE_REDEFINED, /* 42 */
+    XML_ERR_LITERAL_NOT_STARTED, /* 43 */
+    XML_ERR_LITERAL_NOT_FINISHED, /* 44 */
+    XML_ERR_COMMENT_NOT_FINISHED, /* 45 */
+    XML_ERR_PI_NOT_STARTED, /* 46 */
+    XML_ERR_PI_NOT_FINISHED, /* 47 */
+    XML_ERR_NOTATION_NOT_STARTED, /* 48 */
+    XML_ERR_NOTATION_NOT_FINISHED, /* 49 */
+    XML_ERR_ATTLIST_NOT_STARTED, /* 50 */
+    XML_ERR_ATTLIST_NOT_FINISHED, /* 51 */
+    XML_ERR_MIXED_NOT_STARTED, /* 52 */
+    XML_ERR_MIXED_NOT_FINISHED, /* 53 */
+    XML_ERR_ELEMCONTENT_NOT_STARTED, /* 54 */
+    XML_ERR_ELEMCONTENT_NOT_FINISHED, /* 55 */
+    XML_ERR_XMLDECL_NOT_STARTED, /* 56 */
+    XML_ERR_XMLDECL_NOT_FINISHED, /* 57 */
+    XML_ERR_CONDSEC_NOT_STARTED, /* 58 */
+    XML_ERR_CONDSEC_NOT_FINISHED, /* 59 */
+    XML_ERR_EXT_SUBSET_NOT_FINISHED, /* 60 */
+    XML_ERR_DOCTYPE_NOT_FINISHED, /* 61 */
+    XML_ERR_MISPLACED_CDATA_END, /* 62 */
+    XML_ERR_CDATA_NOT_FINISHED, /* 63 */
+    XML_ERR_RESERVED_XML_NAME, /* 64 */
+    XML_ERR_SPACE_REQUIRED, /* 65 */
+    XML_ERR_SEPARATOR_REQUIRED, /* 66 */
+    XML_ERR_NMTOKEN_REQUIRED, /* 67 */
+    XML_ERR_NAME_REQUIRED, /* 68 */
+    XML_ERR_PCDATA_REQUIRED, /* 69 */
+    XML_ERR_URI_REQUIRED, /* 70 */
+    XML_ERR_PUBID_REQUIRED, /* 71 */
+    XML_ERR_LT_REQUIRED, /* 72 */
+    XML_ERR_GT_REQUIRED, /* 73 */
+    XML_ERR_LTSLASH_REQUIRED, /* 74 */
+    XML_ERR_EQUAL_REQUIRED, /* 75 */
+    XML_ERR_TAG_NAME_MISMATCH, /* 76 */
+    XML_ERR_TAG_NOT_FINISHED, /* 77 */
+    XML_ERR_STANDALONE_VALUE, /* 78 */
+    XML_ERR_ENCODING_NAME, /* 79 */
+    XML_ERR_HYPHEN_IN_COMMENT, /* 80 */
+    XML_ERR_INVALID_ENCODING, /* 81 */
+    XML_ERR_EXT_ENTITY_STANDALONE, /* 82 */
+    XML_ERR_CONDSEC_INVALID, /* 83 */
+    XML_ERR_VALUE_REQUIRED, /* 84 */
+    XML_ERR_NOT_WELL_BALANCED, /* 85 */
+    XML_ERR_EXTRA_CONTENT, /* 86 */
+    XML_ERR_ENTITY_CHAR_ERROR, /* 87 */
+    XML_ERR_ENTITY_PE_INTERNAL, /* 88 */
+    XML_ERR_ENTITY_LOOP, /* 89 */
+    XML_ERR_ENTITY_BOUNDARY, /* 90 */
+    XML_ERR_INVALID_URI, /* 91 */
+    XML_ERR_URI_FRAGMENT, /* 92 */
+    XML_WAR_CATALOG_PI, /* 93 */
+    XML_ERR_NO_DTD, /* 94 */
+    XML_ERR_CONDSEC_INVALID_KEYWORD, /* 95 */
+    XML_ERR_VERSION_MISSING, /* 96 */
+    XML_WAR_UNKNOWN_VERSION, /* 97 */
+    XML_WAR_LANG_VALUE, /* 98 */
+    XML_WAR_NS_URI, /* 99 */
+    XML_WAR_NS_URI_RELATIVE, /* 100 */
+    XML_ERR_MISSING_ENCODING, /* 101 */
+    XML_WAR_SPACE_VALUE, /* 102 */
+    XML_ERR_NOT_STANDALONE, /* 103 */
+    XML_ERR_ENTITY_PROCESSING, /* 104 */
+    XML_ERR_NOTATION_PROCESSING, /* 105 */
+    XML_WAR_NS_COLUMN, /* 106 */
+    XML_WAR_ENTITY_REDEFINED, /* 107 */
+    XML_ERR_UNKNOWN_VERSION, /* 108 */
+    XML_ERR_VERSION_MISMATCH, /* 109 */
+    XML_ERR_NAME_TOO_LONG, /* 110 */
+    XML_ERR_USER_STOP, /* 111 */
+    XML_NS_ERR_XML_NAMESPACE = 200,
+    XML_NS_ERR_UNDEFINED_NAMESPACE, /* 201 */
+    XML_NS_ERR_QNAME, /* 202 */
+    XML_NS_ERR_ATTRIBUTE_REDEFINED, /* 203 */
+    XML_NS_ERR_EMPTY, /* 204 */
+    XML_NS_ERR_COLON, /* 205 */
+    XML_DTD_ATTRIBUTE_DEFAULT = 500,
+    XML_DTD_ATTRIBUTE_REDEFINED, /* 501 */
+    XML_DTD_ATTRIBUTE_VALUE, /* 502 */
+    XML_DTD_CONTENT_ERROR, /* 503 */
+    XML_DTD_CONTENT_MODEL, /* 504 */
+    XML_DTD_CONTENT_NOT_DETERMINIST, /* 505 */
+    XML_DTD_DIFFERENT_PREFIX, /* 506 */
+    XML_DTD_ELEM_DEFAULT_NAMESPACE, /* 507 */
+    XML_DTD_ELEM_NAMESPACE, /* 508 */
+    XML_DTD_ELEM_REDEFINED, /* 509 */
+    XML_DTD_EMPTY_NOTATION, /* 510 */
+    XML_DTD_ENTITY_TYPE, /* 511 */
+    XML_DTD_ID_FIXED, /* 512 */
+    XML_DTD_ID_REDEFINED, /* 513 */
+    XML_DTD_ID_SUBSET, /* 514 */
+    XML_DTD_INVALID_CHILD, /* 515 */
+    XML_DTD_INVALID_DEFAULT, /* 516 */
+    XML_DTD_LOAD_ERROR, /* 517 */
+    XML_DTD_MISSING_ATTRIBUTE, /* 518 */
+    XML_DTD_MIXED_CORRUPT, /* 519 */
+    XML_DTD_MULTIPLE_ID, /* 520 */
+    XML_DTD_NO_DOC, /* 521 */
+    XML_DTD_NO_DTD, /* 522 */
+    XML_DTD_NO_ELEM_NAME, /* 523 */
+    XML_DTD_NO_PREFIX, /* 524 */
+    XML_DTD_NO_ROOT, /* 525 */
+    XML_DTD_NOTATION_REDEFINED, /* 526 */
+    XML_DTD_NOTATION_VALUE, /* 527 */
+    XML_DTD_NOT_EMPTY, /* 528 */
+    XML_DTD_NOT_PCDATA, /* 529 */
+    XML_DTD_NOT_STANDALONE, /* 530 */
+    XML_DTD_ROOT_NAME, /* 531 */
+    XML_DTD_STANDALONE_WHITE_SPACE, /* 532 */
+    XML_DTD_UNKNOWN_ATTRIBUTE, /* 533 */
+    XML_DTD_UNKNOWN_ELEM, /* 534 */
+    XML_DTD_UNKNOWN_ENTITY, /* 535 */
+    XML_DTD_UNKNOWN_ID, /* 536 */
+    XML_DTD_UNKNOWN_NOTATION, /* 537 */
+    XML_DTD_STANDALONE_DEFAULTED, /* 538 */
+    XML_DTD_XMLID_VALUE, /* 539 */
+    XML_DTD_XMLID_TYPE, /* 540 */
+    XML_DTD_DUP_TOKEN, /* 541 */
+    XML_HTML_STRUCURE_ERROR = 800,
+    XML_HTML_UNKNOWN_TAG, /* 801 */
+    XML_RNGP_ANYNAME_ATTR_ANCESTOR = 1000,
+    XML_RNGP_ATTR_CONFLICT, /* 1001 */
+    XML_RNGP_ATTRIBUTE_CHILDREN, /* 1002 */
+    XML_RNGP_ATTRIBUTE_CONTENT, /* 1003 */
+    XML_RNGP_ATTRIBUTE_EMPTY, /* 1004 */
+    XML_RNGP_ATTRIBUTE_NOOP, /* 1005 */
+    XML_RNGP_CHOICE_CONTENT, /* 1006 */
+    XML_RNGP_CHOICE_EMPTY, /* 1007 */
+    XML_RNGP_CREATE_FAILURE, /* 1008 */
+    XML_RNGP_DATA_CONTENT, /* 1009 */
+    XML_RNGP_DEF_CHOICE_AND_INTERLEAVE, /* 1010 */
+    XML_RNGP_DEFINE_CREATE_FAILED, /* 1011 */
+    XML_RNGP_DEFINE_EMPTY, /* 1012 */
+    XML_RNGP_DEFINE_MISSING, /* 1013 */
+    XML_RNGP_DEFINE_NAME_MISSING, /* 1014 */
+    XML_RNGP_ELEM_CONTENT_EMPTY, /* 1015 */
+    XML_RNGP_ELEM_CONTENT_ERROR, /* 1016 */
+    XML_RNGP_ELEMENT_EMPTY, /* 1017 */
+    XML_RNGP_ELEMENT_CONTENT, /* 1018 */
+    XML_RNGP_ELEMENT_NAME, /* 1019 */
+    XML_RNGP_ELEMENT_NO_CONTENT, /* 1020 */
+    XML_RNGP_ELEM_TEXT_CONFLICT, /* 1021 */
+    XML_RNGP_EMPTY, /* 1022 */
+    XML_RNGP_EMPTY_CONSTRUCT, /* 1023 */
+    XML_RNGP_EMPTY_CONTENT, /* 1024 */
+    XML_RNGP_EMPTY_NOT_EMPTY, /* 1025 */
+    XML_RNGP_ERROR_TYPE_LIB, /* 1026 */
+    XML_RNGP_EXCEPT_EMPTY, /* 1027 */
+    XML_RNGP_EXCEPT_MISSING, /* 1028 */
+    XML_RNGP_EXCEPT_MULTIPLE, /* 1029 */
+    XML_RNGP_EXCEPT_NO_CONTENT, /* 1030 */
+    XML_RNGP_EXTERNALREF_EMTPY, /* 1031 */
+    XML_RNGP_EXTERNAL_REF_FAILURE, /* 1032 */
+    XML_RNGP_EXTERNALREF_RECURSE, /* 1033 */
+    XML_RNGP_FORBIDDEN_ATTRIBUTE, /* 1034 */
+    XML_RNGP_FOREIGN_ELEMENT, /* 1035 */
+    XML_RNGP_GRAMMAR_CONTENT, /* 1036 */
+    XML_RNGP_GRAMMAR_EMPTY, /* 1037 */
+    XML_RNGP_GRAMMAR_MISSING, /* 1038 */
+    XML_RNGP_GRAMMAR_NO_START, /* 1039 */
+    XML_RNGP_GROUP_ATTR_CONFLICT, /* 1040 */
+    XML_RNGP_HREF_ERROR, /* 1041 */
+    XML_RNGP_INCLUDE_EMPTY, /* 1042 */
+    XML_RNGP_INCLUDE_FAILURE, /* 1043 */
+    XML_RNGP_INCLUDE_RECURSE, /* 1044 */
+    XML_RNGP_INTERLEAVE_ADD, /* 1045 */
+    XML_RNGP_INTERLEAVE_CREATE_FAILED, /* 1046 */
+    XML_RNGP_INTERLEAVE_EMPTY, /* 1047 */
+    XML_RNGP_INTERLEAVE_NO_CONTENT, /* 1048 */
+    XML_RNGP_INVALID_DEFINE_NAME, /* 1049 */
+    XML_RNGP_INVALID_URI, /* 1050 */
+    XML_RNGP_INVALID_VALUE, /* 1051 */
+    XML_RNGP_MISSING_HREF, /* 1052 */
+    XML_RNGP_NAME_MISSING, /* 1053 */
+    XML_RNGP_NEED_COMBINE, /* 1054 */
+    XML_RNGP_NOTALLOWED_NOT_EMPTY, /* 1055 */
+    XML_RNGP_NSNAME_ATTR_ANCESTOR, /* 1056 */
+    XML_RNGP_NSNAME_NO_NS, /* 1057 */
+    XML_RNGP_PARAM_FORBIDDEN, /* 1058 */
+    XML_RNGP_PARAM_NAME_MISSING, /* 1059 */
+    XML_RNGP_PARENTREF_CREATE_FAILED, /* 1060 */
+    XML_RNGP_PARENTREF_NAME_INVALID, /* 1061 */
+    XML_RNGP_PARENTREF_NO_NAME, /* 1062 */
+    XML_RNGP_PARENTREF_NO_PARENT, /* 1063 */
+    XML_RNGP_PARENTREF_NOT_EMPTY, /* 1064 */
+    XML_RNGP_PARSE_ERROR, /* 1065 */
+    XML_RNGP_PAT_ANYNAME_EXCEPT_ANYNAME, /* 1066 */
+    XML_RNGP_PAT_ATTR_ATTR, /* 1067 */
+    XML_RNGP_PAT_ATTR_ELEM, /* 1068 */
+    XML_RNGP_PAT_DATA_EXCEPT_ATTR, /* 1069 */
+    XML_RNGP_PAT_DATA_EXCEPT_ELEM, /* 1070 */
+    XML_RNGP_PAT_DATA_EXCEPT_EMPTY, /* 1071 */
+    XML_RNGP_PAT_DATA_EXCEPT_GROUP, /* 1072 */
+    XML_RNGP_PAT_DATA_EXCEPT_INTERLEAVE, /* 1073 */
+    XML_RNGP_PAT_DATA_EXCEPT_LIST, /* 1074 */
+    XML_RNGP_PAT_DATA_EXCEPT_ONEMORE, /* 1075 */
+    XML_RNGP_PAT_DATA_EXCEPT_REF, /* 1076 */
+    XML_RNGP_PAT_DATA_EXCEPT_TEXT, /* 1077 */
+    XML_RNGP_PAT_LIST_ATTR, /* 1078 */
+    XML_RNGP_PAT_LIST_ELEM, /* 1079 */
+    XML_RNGP_PAT_LIST_INTERLEAVE, /* 1080 */
+    XML_RNGP_PAT_LIST_LIST, /* 1081 */
+    XML_RNGP_PAT_LIST_REF, /* 1082 */
+    XML_RNGP_PAT_LIST_TEXT, /* 1083 */
+    XML_RNGP_PAT_NSNAME_EXCEPT_ANYNAME, /* 1084 */
+    XML_RNGP_PAT_NSNAME_EXCEPT_NSNAME, /* 1085 */
+    XML_RNGP_PAT_ONEMORE_GROUP_ATTR, /* 1086 */
+    XML_RNGP_PAT_ONEMORE_INTERLEAVE_ATTR, /* 1087 */
+    XML_RNGP_PAT_START_ATTR, /* 1088 */
+    XML_RNGP_PAT_START_DATA, /* 1089 */
+    XML_RNGP_PAT_START_EMPTY, /* 1090 */
+    XML_RNGP_PAT_START_GROUP, /* 1091 */
+    XML_RNGP_PAT_START_INTERLEAVE, /* 1092 */
+    XML_RNGP_PAT_START_LIST, /* 1093 */
+    XML_RNGP_PAT_START_ONEMORE, /* 1094 */
+    XML_RNGP_PAT_START_TEXT, /* 1095 */
+    XML_RNGP_PAT_START_VALUE, /* 1096 */
+    XML_RNGP_PREFIX_UNDEFINED, /* 1097 */
+    XML_RNGP_REF_CREATE_FAILED, /* 1098 */
+    XML_RNGP_REF_CYCLE, /* 1099 */
+    XML_RNGP_REF_NAME_INVALID, /* 1100 */
+    XML_RNGP_REF_NO_DEF, /* 1101 */
+    XML_RNGP_REF_NO_NAME, /* 1102 */
+    XML_RNGP_REF_NOT_EMPTY, /* 1103 */
+    XML_RNGP_START_CHOICE_AND_INTERLEAVE, /* 1104 */
+    XML_RNGP_START_CONTENT, /* 1105 */
+    XML_RNGP_START_EMPTY, /* 1106 */
+    XML_RNGP_START_MISSING, /* 1107 */
+    XML_RNGP_TEXT_EXPECTED, /* 1108 */
+    XML_RNGP_TEXT_HAS_CHILD, /* 1109 */
+    XML_RNGP_TYPE_MISSING, /* 1110 */
+    XML_RNGP_TYPE_NOT_FOUND, /* 1111 */
+    XML_RNGP_TYPE_VALUE, /* 1112 */
+    XML_RNGP_UNKNOWN_ATTRIBUTE, /* 1113 */
+    XML_RNGP_UNKNOWN_COMBINE, /* 1114 */
+    XML_RNGP_UNKNOWN_CONSTRUCT, /* 1115 */
+    XML_RNGP_UNKNOWN_TYPE_LIB, /* 1116 */
+    XML_RNGP_URI_FRAGMENT, /* 1117 */
+    XML_RNGP_URI_NOT_ABSOLUTE, /* 1118 */
+    XML_RNGP_VALUE_EMPTY, /* 1119 */
+    XML_RNGP_VALUE_NO_CONTENT, /* 1120 */
+    XML_RNGP_XMLNS_NAME, /* 1121 */
+    XML_RNGP_XML_NS, /* 1122 */
+    XML_XPATH_EXPRESSION_OK = 1200,
+    XML_XPATH_NUMBER_ERROR, /* 1201 */
+    XML_XPATH_UNFINISHED_LITERAL_ERROR, /* 1202 */
+    XML_XPATH_START_LITERAL_ERROR, /* 1203 */
+    XML_XPATH_VARIABLE_REF_ERROR, /* 1204 */
+    XML_XPATH_UNDEF_VARIABLE_ERROR, /* 1205 */
+    XML_XPATH_INVALID_PREDICATE_ERROR, /* 1206 */
+    XML_XPATH_EXPR_ERROR, /* 1207 */
+    XML_XPATH_UNCLOSED_ERROR, /* 1208 */
+    XML_XPATH_UNKNOWN_FUNC_ERROR, /* 1209 */
+    XML_XPATH_INVALID_OPERAND, /* 1210 */
+    XML_XPATH_INVALID_TYPE, /* 1211 */
+    XML_XPATH_INVALID_ARITY, /* 1212 */
+    XML_XPATH_INVALID_CTXT_SIZE, /* 1213 */
+    XML_XPATH_INVALID_CTXT_POSITION, /* 1214 */
+    XML_XPATH_MEMORY_ERROR, /* 1215 */
+    XML_XPTR_SYNTAX_ERROR, /* 1216 */
+    XML_XPTR_RESOURCE_ERROR, /* 1217 */
+    XML_XPTR_SUB_RESOURCE_ERROR, /* 1218 */
+    XML_XPATH_UNDEF_PREFIX_ERROR, /* 1219 */
+    XML_XPATH_ENCODING_ERROR, /* 1220 */
+    XML_XPATH_INVALID_CHAR_ERROR, /* 1221 */
+    XML_TREE_INVALID_HEX = 1300,
+    XML_TREE_INVALID_DEC, /* 1301 */
+    XML_TREE_UNTERMINATED_ENTITY, /* 1302 */
+    XML_TREE_NOT_UTF8, /* 1303 */
+    XML_SAVE_NOT_UTF8 = 1400,
+    XML_SAVE_CHAR_INVALID, /* 1401 */
+    XML_SAVE_NO_DOCTYPE, /* 1402 */
+    XML_SAVE_UNKNOWN_ENCODING, /* 1403 */
+    XML_REGEXP_COMPILE_ERROR = 1450,
+    XML_IO_UNKNOWN = 1500,
+    XML_IO_EACCES, /* 1501 */
+    XML_IO_EAGAIN, /* 1502 */
+    XML_IO_EBADF, /* 1503 */
+    XML_IO_EBADMSG, /* 1504 */
+    XML_IO_EBUSY, /* 1505 */
+    XML_IO_ECANCELED, /* 1506 */
+    XML_IO_ECHILD, /* 1507 */
+    XML_IO_EDEADLK, /* 1508 */
+    XML_IO_EDOM, /* 1509 */
+    XML_IO_EEXIST, /* 1510 */
+    XML_IO_EFAULT, /* 1511 */
+    XML_IO_EFBIG, /* 1512 */
+    XML_IO_EINPROGRESS, /* 1513 */
+    XML_IO_EINTR, /* 1514 */
+    XML_IO_EINVAL, /* 1515 */
+    XML_IO_EIO, /* 1516 */
+    XML_IO_EISDIR, /* 1517 */
+    XML_IO_EMFILE, /* 1518 */
+    XML_IO_EMLINK, /* 1519 */
+    XML_IO_EMSGSIZE, /* 1520 */
+    XML_IO_ENAMETOOLONG, /* 1521 */
+    XML_IO_ENFILE, /* 1522 */
+    XML_IO_ENODEV, /* 1523 */
+    XML_IO_ENOENT, /* 1524 */
+    XML_IO_ENOEXEC, /* 1525 */
+    XML_IO_ENOLCK, /* 1526 */
+    XML_IO_ENOMEM, /* 1527 */
+    XML_IO_ENOSPC, /* 1528 */
+    XML_IO_ENOSYS, /* 1529 */
+    XML_IO_ENOTDIR, /* 1530 */
+    XML_IO_ENOTEMPTY, /* 1531 */
+    XML_IO_ENOTSUP, /* 1532 */
+    XML_IO_ENOTTY, /* 1533 */
+    XML_IO_ENXIO, /* 1534 */
+    XML_IO_EPERM, /* 1535 */
+    XML_IO_EPIPE, /* 1536 */
+    XML_IO_ERANGE, /* 1537 */
+    XML_IO_EROFS, /* 1538 */
+    XML_IO_ESPIPE, /* 1539 */
+    XML_IO_ESRCH, /* 1540 */
+    XML_IO_ETIMEDOUT, /* 1541 */
+    XML_IO_EXDEV, /* 1542 */
+    XML_IO_NETWORK_ATTEMPT, /* 1543 */
+    XML_IO_ENCODER, /* 1544 */
+    XML_IO_FLUSH, /* 1545 */
+    XML_IO_WRITE, /* 1546 */
+    XML_IO_NO_INPUT, /* 1547 */
+    XML_IO_BUFFER_FULL, /* 1548 */
+    XML_IO_LOAD_ERROR, /* 1549 */
+    XML_IO_ENOTSOCK, /* 1550 */
+    XML_IO_EISCONN, /* 1551 */
+    XML_IO_ECONNREFUSED, /* 1552 */
+    XML_IO_ENETUNREACH, /* 1553 */
+    XML_IO_EADDRINUSE, /* 1554 */
+    XML_IO_EALREADY, /* 1555 */
+    XML_IO_EAFNOSUPPORT, /* 1556 */
+    XML_XINCLUDE_RECURSION=1600,
+    XML_XINCLUDE_PARSE_VALUE, /* 1601 */
+    XML_XINCLUDE_ENTITY_DEF_MISMATCH, /* 1602 */
+    XML_XINCLUDE_NO_HREF, /* 1603 */
+    XML_XINCLUDE_NO_FALLBACK, /* 1604 */
+    XML_XINCLUDE_HREF_URI, /* 1605 */
+    XML_XINCLUDE_TEXT_FRAGMENT, /* 1606 */
+    XML_XINCLUDE_TEXT_DOCUMENT, /* 1607 */
+    XML_XINCLUDE_INVALID_CHAR, /* 1608 */
+    XML_XINCLUDE_BUILD_FAILED, /* 1609 */
+    XML_XINCLUDE_UNKNOWN_ENCODING, /* 1610 */
+    XML_XINCLUDE_MULTIPLE_ROOT, /* 1611 */
+    XML_XINCLUDE_XPTR_FAILED, /* 1612 */
+    XML_XINCLUDE_XPTR_RESULT, /* 1613 */
+    XML_XINCLUDE_INCLUDE_IN_INCLUDE, /* 1614 */
+    XML_XINCLUDE_FALLBACKS_IN_INCLUDE, /* 1615 */
+    XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE, /* 1616 */
+    XML_XINCLUDE_DEPRECATED_NS, /* 1617 */
+    XML_XINCLUDE_FRAGMENT_ID, /* 1618 */
+    XML_CATALOG_MISSING_ATTR = 1650,
+    XML_CATALOG_ENTRY_BROKEN, /* 1651 */
+    XML_CATALOG_PREFER_VALUE, /* 1652 */
+    XML_CATALOG_NOT_CATALOG, /* 1653 */
+    XML_CATALOG_RECURSION, /* 1654 */
+    XML_SCHEMAP_PREFIX_UNDEFINED = 1700,
+    XML_SCHEMAP_ATTRFORMDEFAULT_VALUE, /* 1701 */
+    XML_SCHEMAP_ATTRGRP_NONAME_NOREF, /* 1702 */
+    XML_SCHEMAP_ATTR_NONAME_NOREF, /* 1703 */
+    XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF, /* 1704 */
+    XML_SCHEMAP_ELEMFORMDEFAULT_VALUE, /* 1705 */
+    XML_SCHEMAP_ELEM_NONAME_NOREF, /* 1706 */
+    XML_SCHEMAP_EXTENSION_NO_BASE, /* 1707 */
+    XML_SCHEMAP_FACET_NO_VALUE, /* 1708 */
+    XML_SCHEMAP_FAILED_BUILD_IMPORT, /* 1709 */
+    XML_SCHEMAP_GROUP_NONAME_NOREF, /* 1710 */
+    XML_SCHEMAP_IMPORT_NAMESPACE_NOT_URI, /* 1711 */
+    XML_SCHEMAP_IMPORT_REDEFINE_NSNAME, /* 1712 */
+    XML_SCHEMAP_IMPORT_SCHEMA_NOT_URI, /* 1713 */
+    XML_SCHEMAP_INVALID_BOOLEAN, /* 1714 */
+    XML_SCHEMAP_INVALID_ENUM, /* 1715 */
+    XML_SCHEMAP_INVALID_FACET, /* 1716 */
+    XML_SCHEMAP_INVALID_FACET_VALUE, /* 1717 */
+    XML_SCHEMAP_INVALID_MAXOCCURS, /* 1718 */
+    XML_SCHEMAP_INVALID_MINOCCURS, /* 1719 */
+    XML_SCHEMAP_INVALID_REF_AND_SUBTYPE, /* 1720 */
+    XML_SCHEMAP_INVALID_WHITE_SPACE, /* 1721 */
+    XML_SCHEMAP_NOATTR_NOREF, /* 1722 */
+    XML_SCHEMAP_NOTATION_NO_NAME, /* 1723 */
+    XML_SCHEMAP_NOTYPE_NOREF, /* 1724 */
+    XML_SCHEMAP_REF_AND_SUBTYPE, /* 1725 */
+    XML_SCHEMAP_RESTRICTION_NONAME_NOREF, /* 1726 */
+    XML_SCHEMAP_SIMPLETYPE_NONAME, /* 1727 */
+    XML_SCHEMAP_TYPE_AND_SUBTYPE, /* 1728 */
+    XML_SCHEMAP_UNKNOWN_ALL_CHILD, /* 1729 */
+    XML_SCHEMAP_UNKNOWN_ANYATTRIBUTE_CHILD, /* 1730 */
+    XML_SCHEMAP_UNKNOWN_ATTR_CHILD, /* 1731 */
+    XML_SCHEMAP_UNKNOWN_ATTRGRP_CHILD, /* 1732 */
+    XML_SCHEMAP_UNKNOWN_ATTRIBUTE_GROUP, /* 1733 */
+    XML_SCHEMAP_UNKNOWN_BASE_TYPE, /* 1734 */
+    XML_SCHEMAP_UNKNOWN_CHOICE_CHILD, /* 1735 */
+    XML_SCHEMAP_UNKNOWN_COMPLEXCONTENT_CHILD, /* 1736 */
+    XML_SCHEMAP_UNKNOWN_COMPLEXTYPE_CHILD, /* 1737 */
+    XML_SCHEMAP_UNKNOWN_ELEM_CHILD, /* 1738 */
+    XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD, /* 1739 */
+    XML_SCHEMAP_UNKNOWN_FACET_CHILD, /* 1740 */
+    XML_SCHEMAP_UNKNOWN_FACET_TYPE, /* 1741 */
+    XML_SCHEMAP_UNKNOWN_GROUP_CHILD, /* 1742 */
+    XML_SCHEMAP_UNKNOWN_IMPORT_CHILD, /* 1743 */
+    XML_SCHEMAP_UNKNOWN_LIST_CHILD, /* 1744 */
+    XML_SCHEMAP_UNKNOWN_NOTATION_CHILD, /* 1745 */
+    XML_SCHEMAP_UNKNOWN_PROCESSCONTENT_CHILD, /* 1746 */
+    XML_SCHEMAP_UNKNOWN_REF, /* 1747 */
+    XML_SCHEMAP_UNKNOWN_RESTRICTION_CHILD, /* 1748 */
+    XML_SCHEMAP_UNKNOWN_SCHEMAS_CHILD, /* 1749 */
+    XML_SCHEMAP_UNKNOWN_SEQUENCE_CHILD, /* 1750 */
+    XML_SCHEMAP_UNKNOWN_SIMPLECONTENT_CHILD, /* 1751 */
+    XML_SCHEMAP_UNKNOWN_SIMPLETYPE_CHILD, /* 1752 */
+    XML_SCHEMAP_UNKNOWN_TYPE, /* 1753 */
+    XML_SCHEMAP_UNKNOWN_UNION_CHILD, /* 1754 */
+    XML_SCHEMAP_ELEM_DEFAULT_FIXED, /* 1755 */
+    XML_SCHEMAP_REGEXP_INVALID, /* 1756 */
+    XML_SCHEMAP_FAILED_LOAD, /* 1757 */
+    XML_SCHEMAP_NOTHING_TO_PARSE, /* 1758 */
+    XML_SCHEMAP_NOROOT, /* 1759 */
+    XML_SCHEMAP_REDEFINED_GROUP, /* 1760 */
+    XML_SCHEMAP_REDEFINED_TYPE, /* 1761 */
+    XML_SCHEMAP_REDEFINED_ELEMENT, /* 1762 */
+    XML_SCHEMAP_REDEFINED_ATTRGROUP, /* 1763 */
+    XML_SCHEMAP_REDEFINED_ATTR, /* 1764 */
+    XML_SCHEMAP_REDEFINED_NOTATION, /* 1765 */
+    XML_SCHEMAP_FAILED_PARSE, /* 1766 */
+    XML_SCHEMAP_UNKNOWN_PREFIX, /* 1767 */
+    XML_SCHEMAP_DEF_AND_PREFIX, /* 1768 */
+    XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD, /* 1769 */
+    XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI, /* 1770 */
+    XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1771 */
+    XML_SCHEMAP_NOT_SCHEMA, /* 1772 */
+    XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1773 */
+    XML_SCHEMAP_INVALID_ATTR_USE, /* 1774 */
+    XML_SCHEMAP_RECURSIVE, /* 1775 */
+    XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE, /* 1776 */
+    XML_SCHEMAP_INVALID_ATTR_COMBINATION, /* 1777 */
+    XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION, /* 1778 */
+    XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD, /* 1779 */
+    XML_SCHEMAP_INVALID_ATTR_NAME, /* 1780 */
+    XML_SCHEMAP_REF_AND_CONTENT, /* 1781 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_1, /* 1782 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_2, /* 1783 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_3, /* 1784 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_4, /* 1785 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_5, /* 1786 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1, /* 1787 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1, /* 1788 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2, /* 1789 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2, /* 1790 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3, /* 1791 */
+    XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER, /* 1792 */
+    XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE, /* 1793 */
+    XML_SCHEMAP_UNION_NOT_EXPRESSIBLE, /* 1794 */
+    XML_SCHEMAP_SRC_IMPORT_3_1, /* 1795 */
+    XML_SCHEMAP_SRC_IMPORT_3_2, /* 1796 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1, /* 1797 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2, /* 1798 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3, /* 1799 */
+    XML_SCHEMAP_COS_CT_EXTENDS_1_3, /* 1800 */
+    XML_SCHEMAV_NOROOT = 1801,
+    XML_SCHEMAV_UNDECLAREDELEM, /* 1802 */
+    XML_SCHEMAV_NOTTOPLEVEL, /* 1803 */
+    XML_SCHEMAV_MISSING, /* 1804 */
+    XML_SCHEMAV_WRONGELEM, /* 1805 */
+    XML_SCHEMAV_NOTYPE, /* 1806 */
+    XML_SCHEMAV_NOROLLBACK, /* 1807 */
+    XML_SCHEMAV_ISABSTRACT, /* 1808 */
+    XML_SCHEMAV_NOTEMPTY, /* 1809 */
+    XML_SCHEMAV_ELEMCONT, /* 1810 */
+    XML_SCHEMAV_HAVEDEFAULT, /* 1811 */
+    XML_SCHEMAV_NOTNILLABLE, /* 1812 */
+    XML_SCHEMAV_EXTRACONTENT, /* 1813 */
+    XML_SCHEMAV_INVALIDATTR, /* 1814 */
+    XML_SCHEMAV_INVALIDELEM, /* 1815 */
+    XML_SCHEMAV_NOTDETERMINIST, /* 1816 */
+    XML_SCHEMAV_CONSTRUCT, /* 1817 */
+    XML_SCHEMAV_INTERNAL, /* 1818 */
+    XML_SCHEMAV_NOTSIMPLE, /* 1819 */
+    XML_SCHEMAV_ATTRUNKNOWN, /* 1820 */
+    XML_SCHEMAV_ATTRINVALID, /* 1821 */
+    XML_SCHEMAV_VALUE, /* 1822 */
+    XML_SCHEMAV_FACET, /* 1823 */
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1, /* 1824 */
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2, /* 1825 */
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3, /* 1826 */
+    XML_SCHEMAV_CVC_TYPE_3_1_1, /* 1827 */
+    XML_SCHEMAV_CVC_TYPE_3_1_2, /* 1828 */
+    XML_SCHEMAV_CVC_FACET_VALID, /* 1829 */
+    XML_SCHEMAV_CVC_LENGTH_VALID, /* 1830 */
+    XML_SCHEMAV_CVC_MINLENGTH_VALID, /* 1831 */
+    XML_SCHEMAV_CVC_MAXLENGTH_VALID, /* 1832 */
+    XML_SCHEMAV_CVC_MININCLUSIVE_VALID, /* 1833 */
+    XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID, /* 1834 */
+    XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID, /* 1835 */
+    XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID, /* 1836 */
+    XML_SCHEMAV_CVC_TOTALDIGITS_VALID, /* 1837 */
+    XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID, /* 1838 */
+    XML_SCHEMAV_CVC_PATTERN_VALID, /* 1839 */
+    XML_SCHEMAV_CVC_ENUMERATION_VALID, /* 1840 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1, /* 1841 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2, /* 1842 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3, /* 1843 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4, /* 1844 */
+    XML_SCHEMAV_CVC_ELT_1, /* 1845 */
+    XML_SCHEMAV_CVC_ELT_2, /* 1846 */
+    XML_SCHEMAV_CVC_ELT_3_1, /* 1847 */
+    XML_SCHEMAV_CVC_ELT_3_2_1, /* 1848 */
+    XML_SCHEMAV_CVC_ELT_3_2_2, /* 1849 */
+    XML_SCHEMAV_CVC_ELT_4_1, /* 1850 */
+    XML_SCHEMAV_CVC_ELT_4_2, /* 1851 */
+    XML_SCHEMAV_CVC_ELT_4_3, /* 1852 */
+    XML_SCHEMAV_CVC_ELT_5_1_1, /* 1853 */
+    XML_SCHEMAV_CVC_ELT_5_1_2, /* 1854 */
+    XML_SCHEMAV_CVC_ELT_5_2_1, /* 1855 */
+    XML_SCHEMAV_CVC_ELT_5_2_2_1, /* 1856 */
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_1, /* 1857 */
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_2, /* 1858 */
+    XML_SCHEMAV_CVC_ELT_6, /* 1859 */
+    XML_SCHEMAV_CVC_ELT_7, /* 1860 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_1, /* 1861 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_2, /* 1862 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_3, /* 1863 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_4, /* 1864 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1, /* 1865 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1, /* 1866 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2, /* 1867 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_4, /* 1868 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1, /* 1869 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2, /* 1870 */
+    XML_SCHEMAV_ELEMENT_CONTENT, /* 1871 */
+    XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING, /* 1872 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_1, /* 1873 */
+    XML_SCHEMAV_CVC_AU, /* 1874 */
+    XML_SCHEMAV_CVC_TYPE_1, /* 1875 */
+    XML_SCHEMAV_CVC_TYPE_2, /* 1876 */
+    XML_SCHEMAV_CVC_IDC, /* 1877 */
+    XML_SCHEMAV_CVC_WILDCARD, /* 1878 */
+    XML_SCHEMAV_MISC, /* 1879 */
+    XML_XPTR_UNKNOWN_SCHEME = 1900,
+    XML_XPTR_CHILDSEQ_START, /* 1901 */
+    XML_XPTR_EVAL_FAILED, /* 1902 */
+    XML_XPTR_EXTRA_OBJECTS, /* 1903 */
+    XML_C14N_CREATE_CTXT = 1950,
+    XML_C14N_REQUIRES_UTF8, /* 1951 */
+    XML_C14N_CREATE_STACK, /* 1952 */
+    XML_C14N_INVALID_NODE, /* 1953 */
+    XML_C14N_UNKNOW_NODE, /* 1954 */
+    XML_C14N_RELATIVE_NAMESPACE, /* 1955 */
+    XML_FTP_PASV_ANSWER = 2000,
+    XML_FTP_EPSV_ANSWER, /* 2001 */
+    XML_FTP_ACCNT, /* 2002 */
+    XML_FTP_URL_SYNTAX, /* 2003 */
+    XML_HTTP_URL_SYNTAX = 2020,
+    XML_HTTP_USE_IP, /* 2021 */
+    XML_HTTP_UNKNOWN_HOST, /* 2022 */
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_1 = 3000,
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_2, /* 3001 */
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_3, /* 3002 */
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_4, /* 3003 */
+    XML_SCHEMAP_SRC_RESOLVE, /* 3004 */
+    XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE, /* 3005 */
+    XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE, /* 3006 */
+    XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES, /* 3007 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_1, /* 3008 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_2, /* 3009 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_3, /* 3010 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_1, /* 3011 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_2, /* 3012 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1, /* 3013 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2, /* 3014 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_1, /* 3015 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_1, /* 3016 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_2, /* 3017 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_1, /* 3018 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_2, /* 3019 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_3, /* 3020 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_4, /* 3021 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_5, /* 3022 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_1, /* 3023 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1, /* 3024 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1_2, /* 3025 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_2, /* 3026 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_1, /* 3027 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_3, /* 3028 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_4, /* 3029 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_5, /* 3030 */
+    XML_SCHEMAP_COS_ST_DERIVED_OK_2_1, /* 3031 */
+    XML_SCHEMAP_COS_ST_DERIVED_OK_2_2, /* 3032 */
+    XML_SCHEMAP_S4S_ELEM_NOT_ALLOWED, /* 3033 */
+    XML_SCHEMAP_S4S_ELEM_MISSING, /* 3034 */
+    XML_SCHEMAP_S4S_ATTR_NOT_ALLOWED, /* 3035 */
+    XML_SCHEMAP_S4S_ATTR_MISSING, /* 3036 */
+    XML_SCHEMAP_S4S_ATTR_INVALID_VALUE, /* 3037 */
+    XML_SCHEMAP_SRC_ELEMENT_1, /* 3038 */
+    XML_SCHEMAP_SRC_ELEMENT_2_1, /* 3039 */
+    XML_SCHEMAP_SRC_ELEMENT_2_2, /* 3040 */
+    XML_SCHEMAP_SRC_ELEMENT_3, /* 3041 */
+    XML_SCHEMAP_P_PROPS_CORRECT_1, /* 3042 */
+    XML_SCHEMAP_P_PROPS_CORRECT_2_1, /* 3043 */
+    XML_SCHEMAP_P_PROPS_CORRECT_2_2, /* 3044 */
+    XML_SCHEMAP_E_PROPS_CORRECT_2, /* 3045 */
+    XML_SCHEMAP_E_PROPS_CORRECT_3, /* 3046 */
+    XML_SCHEMAP_E_PROPS_CORRECT_4, /* 3047 */
+    XML_SCHEMAP_E_PROPS_CORRECT_5, /* 3048 */
+    XML_SCHEMAP_E_PROPS_CORRECT_6, /* 3049 */
+    XML_SCHEMAP_SRC_INCLUDE, /* 3050 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_1, /* 3051 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_2, /* 3052 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_3_1, /* 3053 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_3_2, /* 3054 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_4, /* 3055 */
+    XML_SCHEMAP_NO_XMLNS, /* 3056 */
+    XML_SCHEMAP_NO_XSI, /* 3057 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_1, /* 3058 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_1, /* 3059 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1, /* 3060 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2, /* 3061 */
+    XML_SCHEMAP_CVC_SIMPLE_TYPE, /* 3062 */
+    XML_SCHEMAP_COS_CT_EXTENDS_1_1, /* 3063 */
+    XML_SCHEMAP_SRC_IMPORT_1_1, /* 3064 */
+    XML_SCHEMAP_SRC_IMPORT_1_2, /* 3065 */
+    XML_SCHEMAP_SRC_IMPORT_2, /* 3066 */
+    XML_SCHEMAP_SRC_IMPORT_2_1, /* 3067 */
+    XML_SCHEMAP_SRC_IMPORT_2_2, /* 3068 */
+    XML_SCHEMAP_INTERNAL, /* 3069 non-W3C */
+    XML_SCHEMAP_NOT_DETERMINISTIC, /* 3070 non-W3C */
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1, /* 3071 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2, /* 3072 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3, /* 3073 */
+    XML_SCHEMAP_MG_PROPS_CORRECT_1, /* 3074 */
+    XML_SCHEMAP_MG_PROPS_CORRECT_2, /* 3075 */
+    XML_SCHEMAP_SRC_CT_1, /* 3076 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_3, /* 3077 */
+    XML_SCHEMAP_AU_PROPS_CORRECT_2, /* 3078 */
+    XML_SCHEMAP_A_PROPS_CORRECT_2, /* 3079 */
+    XML_SCHEMAP_C_PROPS_CORRECT, /* 3080 */
+    XML_SCHEMAP_SRC_REDEFINE, /* 3081 */
+    XML_SCHEMAP_SRC_IMPORT, /* 3082 */
+    XML_SCHEMAP_WARN_SKIP_SCHEMA, /* 3083 */
+    XML_SCHEMAP_WARN_UNLOCATED_SCHEMA, /* 3084 */
+    XML_SCHEMAP_WARN_ATTR_REDECL_PROH, /* 3085 */
+    XML_SCHEMAP_WARN_ATTR_POINTLESS_PROH, /* 3085 */
+    XML_SCHEMAP_AG_PROPS_CORRECT, /* 3086 */
+    XML_SCHEMAP_COS_CT_EXTENDS_1_2, /* 3087 */
+    XML_SCHEMAP_AU_PROPS_CORRECT, /* 3088 */
+    XML_SCHEMAP_A_PROPS_CORRECT_3, /* 3089 */
+    XML_SCHEMAP_COS_ALL_LIMITED, /* 3090 */
+    XML_SCHEMATRONV_ASSERT = 4000, /* 4000 */
+    XML_SCHEMATRONV_REPORT,
+    XML_MODULE_OPEN = 4900, /* 4900 */
+    XML_MODULE_CLOSE, /* 4901 */
+    XML_CHECK_FOUND_ELEMENT = 5000,
+    XML_CHECK_FOUND_ATTRIBUTE, /* 5001 */
+    XML_CHECK_FOUND_TEXT, /* 5002 */
+    XML_CHECK_FOUND_CDATA, /* 5003 */
+    XML_CHECK_FOUND_ENTITYREF, /* 5004 */
+    XML_CHECK_FOUND_ENTITY, /* 5005 */
+    XML_CHECK_FOUND_PI, /* 5006 */
+    XML_CHECK_FOUND_COMMENT, /* 5007 */
+    XML_CHECK_FOUND_DOCTYPE, /* 5008 */
+    XML_CHECK_FOUND_FRAGMENT, /* 5009 */
+    XML_CHECK_FOUND_NOTATION, /* 5010 */
+    XML_CHECK_UNKNOWN_NODE, /* 5011 */
+    XML_CHECK_ENTITY_TYPE, /* 5012 */
+    XML_CHECK_NO_PARENT, /* 5013 */
+    XML_CHECK_NO_DOC, /* 5014 */
+    XML_CHECK_NO_NAME, /* 5015 */
+    XML_CHECK_NO_ELEM, /* 5016 */
+    XML_CHECK_WRONG_DOC, /* 5017 */
+    XML_CHECK_NO_PREV, /* 5018 */
+    XML_CHECK_WRONG_PREV, /* 5019 */
+    XML_CHECK_NO_NEXT, /* 5020 */
+    XML_CHECK_WRONG_NEXT, /* 5021 */
+    XML_CHECK_NOT_DTD, /* 5022 */
+    XML_CHECK_NOT_ATTR, /* 5023 */
+    XML_CHECK_NOT_ATTR_DECL, /* 5024 */
+    XML_CHECK_NOT_ELEM_DECL, /* 5025 */
+    XML_CHECK_NOT_ENTITY_DECL, /* 5026 */
+    XML_CHECK_NOT_NS_DECL, /* 5027 */
+    XML_CHECK_NO_HREF, /* 5028 */
+    XML_CHECK_WRONG_PARENT,/* 5029 */
+    XML_CHECK_NS_SCOPE, /* 5030 */
+    XML_CHECK_NS_ANCESTOR, /* 5031 */
+    XML_CHECK_NOT_UTF8, /* 5032 */
+    XML_CHECK_NO_DICT, /* 5033 */
+    XML_CHECK_NOT_NCNAME, /* 5034 */
+    XML_CHECK_OUTSIDE_DICT, /* 5035 */
+    XML_CHECK_WRONG_NAME, /* 5036 */
+    XML_CHECK_NAME_NOT_NULL, /* 5037 */
+    XML_I18N_NO_NAME = 6000,
+    XML_I18N_NO_HANDLER, /* 6001 */
+    XML_I18N_EXCESS_HANDLER, /* 6002 */
+    XML_I18N_CONV_FAILED, /* 6003 */
+    XML_I18N_NO_OUTPUT, /* 6004 */
+    XML_BUF_OVERFLOW = 7000
+} xmlParserErrors;
+
+/**
+ * xmlGenericErrorFunc:
+ * @ctx:  a parsing context
+ * @msg:  the message
+ * @...:  the extra arguments of the varargs to format the message
+ *
+ * Signature of the function to use when there is an error and
+ * no parsing or validity context available .
+ */
+typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * xmlStructuredErrorFunc:
+ * @userData:  user provided data for the error callback
+ * @error:  the error being raised.
+ *
+ * Signature of the function to use when there is an error and
+ * the module handles the new error reporting mechanism.
+ */
+typedef void (XMLCALL *xmlStructuredErrorFunc) (void *userData, xmlErrorPtr error);
+
+/*
+ * Use the following function to reset the two global variables
+ * xmlGenericError and xmlGenericErrorContext.
+ */
+XMLPUBFUN void XMLCALL
+    xmlSetGenericErrorFunc	(void *ctx,
+				 xmlGenericErrorFunc handler);
+XMLPUBFUN void XMLCALL
+    initGenericErrorDefaultFunc	(xmlGenericErrorFunc *handler);
+
+XMLPUBFUN void XMLCALL
+    xmlSetStructuredErrorFunc	(void *ctx,
+				 xmlStructuredErrorFunc handler);
+/*
+ * Default message routines used by SAX and Valid context for error
+ * and warning reporting.
+ */
+XMLPUBFUN void XMLCDECL
+    xmlParserError		(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCDECL
+    xmlParserWarning		(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCDECL
+    xmlParserValidityError	(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCDECL
+    xmlParserValidityWarning	(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCALL
+    xmlParserPrintFileInfo	(xmlParserInputPtr input);
+XMLPUBFUN void XMLCALL
+    xmlParserPrintFileContext	(xmlParserInputPtr input);
+
+/*
+ * Extended error information routines
+ */
+XMLPUBFUN xmlErrorPtr XMLCALL
+    xmlGetLastError		(void);
+XMLPUBFUN void XMLCALL
+    xmlResetLastError		(void);
+XMLPUBFUN xmlErrorPtr XMLCALL
+    xmlCtxtGetLastError		(void *ctx);
+XMLPUBFUN void XMLCALL
+    xmlCtxtResetLastError	(void *ctx);
+XMLPUBFUN void XMLCALL
+    xmlResetError		(xmlErrorPtr err);
+XMLPUBFUN int XMLCALL
+    xmlCopyError		(xmlErrorPtr from,
+				 xmlErrorPtr to);
+
+#ifdef IN_LIBXML
+/*
+ * Internal callback reporting routine
+ */
+XMLPUBFUN void XMLCALL
+    __xmlRaiseError		(xmlStructuredErrorFunc schannel,
+				 xmlGenericErrorFunc channel,
+				 void *data,
+                                 void *ctx,
+				 void *node,
+				 int domain,
+				 int code,
+				 xmlErrorLevel level,
+				 const char *file,
+				 int line,
+				 const char *str1,
+				 const char *str2,
+				 const char *str3,
+				 int int1,
+				 int col,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(16,17);
+XMLPUBFUN void XMLCALL
+    __xmlSimpleError		(int domain,
+				 int code,
+				 xmlNodePtr node,
+				 const char *msg,
+				 const char *extra) LIBXML_ATTR_FORMAT(4,0);
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_ERROR_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlexports.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlexports.h
new file mode 100644
index 0000000..aceede5
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlexports.h
@@ -0,0 +1,77 @@
+/*
+ * Summary: macros for marking symbols as exportable/importable.
+ * Description: macros for marking symbols as exportable/importable.
+ *
+ * Copy: See Copyright for the status of this software.
+ */
+
+#ifndef __XML_EXPORTS_H__
+#define __XML_EXPORTS_H__
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+/** DOC_DISABLE */
+
+#ifdef LIBXML_STATIC
+  #define XMLPUBLIC
+#elif defined(IN_LIBXML)
+  #define XMLPUBLIC __declspec(dllexport)
+#else
+  #define XMLPUBLIC __declspec(dllimport)
+#endif
+
+#if defined(LIBXML_FASTCALL)
+  #define XMLCALL __fastcall
+#else
+  #define XMLCALL __cdecl
+#endif
+#define XMLCDECL __cdecl
+
+/** DOC_ENABLE */
+#else /* not Windows */
+
+/**
+ * XMLPUBLIC:
+ *
+ * Macro which declares a public symbol
+ */
+#define XMLPUBLIC
+
+/**
+ * XMLCALL:
+ *
+ * Macro which declares the calling convention for exported functions
+ */
+#define XMLCALL
+
+/**
+ * XMLCDECL:
+ *
+ * Macro which declares the calling convention for exported functions that
+ * use '...'.
+ */
+#define XMLCDECL
+
+#endif /* platform switch */
+
+/*
+ * XMLPUBFUN:
+ *
+ * Macro which declares an exportable function
+ */
+#define XMLPUBFUN XMLPUBLIC
+
+/**
+ * XMLPUBVAR:
+ *
+ * Macro which declares an exportable variable
+ */
+#define XMLPUBVAR XMLPUBLIC extern
+
+/* Compatibility */
+#if !defined(LIBXML_DLL_IMPORT)
+#define LIBXML_DLL_IMPORT XMLPUBVAR
+#endif
+
+#endif /* __XML_EXPORTS_H__ */
+
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlmemory.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlmemory.h
new file mode 100644
index 0000000..17e375a
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlmemory.h
@@ -0,0 +1,224 @@
+/*
+ * Summary: interface for the memory allocator
+ * Description: provides interfaces for the memory allocator,
+ *              including debugging capabilities.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __DEBUG_MEMORY_ALLOC__
+#define __DEBUG_MEMORY_ALLOC__
+
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+
+/**
+ * DEBUG_MEMORY:
+ *
+ * DEBUG_MEMORY replaces the allocator with a collect and debug
+ * shell to the libc allocator.
+ * DEBUG_MEMORY should only be activated when debugging
+ * libxml i.e. if libxml has been configured with --with-debug-mem too.
+ */
+/* #define DEBUG_MEMORY_FREED */
+/* #define DEBUG_MEMORY_LOCATION */
+
+#ifdef DEBUG
+#ifndef DEBUG_MEMORY
+#define DEBUG_MEMORY
+#endif
+#endif
+
+/**
+ * DEBUG_MEMORY_LOCATION:
+ *
+ * DEBUG_MEMORY_LOCATION should be activated only when debugging
+ * libxml i.e. if libxml has been configured with --with-debug-mem too.
+ */
+#ifdef DEBUG_MEMORY_LOCATION
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The XML memory wrapper support 4 basic overloadable functions.
+ */
+/**
+ * xmlFreeFunc:
+ * @mem: an already allocated block of memory
+ *
+ * Signature for a free() implementation.
+ */
+typedef void (XMLCALL *xmlFreeFunc)(void *mem);
+/**
+ * xmlMallocFunc:
+ * @size:  the size requested in bytes
+ *
+ * Signature for a malloc() implementation.
+ *
+ * Returns a pointer to the newly allocated block or NULL in case of error.
+ */
+typedef void *(LIBXML_ATTR_ALLOC_SIZE(1) XMLCALL *xmlMallocFunc)(size_t size);
+
+/**
+ * xmlReallocFunc:
+ * @mem: an already allocated block of memory
+ * @size:  the new size requested in bytes
+ *
+ * Signature for a realloc() implementation.
+ *
+ * Returns a pointer to the newly reallocated block or NULL in case of error.
+ */
+typedef void *(XMLCALL *xmlReallocFunc)(void *mem, size_t size);
+
+/**
+ * xmlStrdupFunc:
+ * @str: a zero terminated string
+ *
+ * Signature for an strdup() implementation.
+ *
+ * Returns the copy of the string or NULL in case of error.
+ */
+typedef char *(XMLCALL *xmlStrdupFunc)(const char *str);
+
+/*
+ * The 4 interfaces used for all memory handling within libxml.
+LIBXML_DLL_IMPORT xmlFreeFunc xmlFree;
+LIBXML_DLL_IMPORT xmlMallocFunc xmlMalloc;
+LIBXML_DLL_IMPORT xmlMallocFunc xmlMallocAtomic;
+LIBXML_DLL_IMPORT xmlReallocFunc xmlRealloc;
+LIBXML_DLL_IMPORT xmlStrdupFunc xmlMemStrdup;
+ */
+
+/*
+ * The way to overload the existing functions.
+ * The xmlGc function have an extra entry for atomic block
+ * allocations useful for garbage collected memory allocators
+ */
+XMLPUBFUN int XMLCALL
+	xmlMemSetup	(xmlFreeFunc freeFunc,
+			 xmlMallocFunc mallocFunc,
+			 xmlReallocFunc reallocFunc,
+			 xmlStrdupFunc strdupFunc);
+XMLPUBFUN int XMLCALL
+	xmlMemGet	(xmlFreeFunc *freeFunc,
+			 xmlMallocFunc *mallocFunc,
+			 xmlReallocFunc *reallocFunc,
+			 xmlStrdupFunc *strdupFunc);
+XMLPUBFUN int XMLCALL
+	xmlGcMemSetup	(xmlFreeFunc freeFunc,
+			 xmlMallocFunc mallocFunc,
+			 xmlMallocFunc mallocAtomicFunc,
+			 xmlReallocFunc reallocFunc,
+			 xmlStrdupFunc strdupFunc);
+XMLPUBFUN int XMLCALL
+	xmlGcMemGet	(xmlFreeFunc *freeFunc,
+			 xmlMallocFunc *mallocFunc,
+			 xmlMallocFunc *mallocAtomicFunc,
+			 xmlReallocFunc *reallocFunc,
+			 xmlStrdupFunc *strdupFunc);
+
+/*
+ * Initialization of the memory layer.
+ */
+XMLPUBFUN int XMLCALL
+	xmlInitMemory	(void);
+
+/*
+ * Cleanup of the memory layer.
+ */
+XMLPUBFUN void XMLCALL
+                xmlCleanupMemory        (void);
+/*
+ * These are specific to the XML debug memory wrapper.
+ */
+XMLPUBFUN int XMLCALL
+	xmlMemUsed	(void);
+XMLPUBFUN int XMLCALL
+	xmlMemBlocks	(void);
+XMLPUBFUN void XMLCALL
+	xmlMemDisplay	(FILE *fp);
+XMLPUBFUN void XMLCALL
+	xmlMemDisplayLast(FILE *fp, long nbBytes);
+XMLPUBFUN void XMLCALL
+	xmlMemShow	(FILE *fp, int nr);
+XMLPUBFUN void XMLCALL
+	xmlMemoryDump	(void);
+XMLPUBFUN void * XMLCALL
+	xmlMemMalloc	(size_t size) LIBXML_ATTR_ALLOC_SIZE(1);
+XMLPUBFUN void * XMLCALL
+	xmlMemRealloc	(void *ptr,size_t size);
+XMLPUBFUN void XMLCALL
+	xmlMemFree	(void *ptr);
+XMLPUBFUN char * XMLCALL
+	xmlMemoryStrdup	(const char *str);
+XMLPUBFUN void * XMLCALL
+	xmlMallocLoc	(size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
+XMLPUBFUN void * XMLCALL
+	xmlReallocLoc	(void *ptr, size_t size, const char *file, int line);
+XMLPUBFUN void * XMLCALL
+	xmlMallocAtomicLoc (size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
+XMLPUBFUN char * XMLCALL
+	xmlMemStrdupLoc	(const char *str, const char *file, int line);
+
+
+#ifdef DEBUG_MEMORY_LOCATION
+/**
+ * xmlMalloc:
+ * @size:  number of bytes to allocate
+ *
+ * Wrapper for the malloc() function used in the XML library.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlMalloc(size) xmlMallocLoc((size), __FILE__, __LINE__)
+/**
+ * xmlMallocAtomic:
+ * @size:  number of bytes to allocate
+ *
+ * Wrapper for the malloc() function used in the XML library for allocation
+ * of block not containing pointers to other areas.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlMallocAtomic(size) xmlMallocAtomicLoc((size), __FILE__, __LINE__)
+/**
+ * xmlRealloc:
+ * @ptr:  pointer to the existing allocated area
+ * @size:  number of bytes to allocate
+ *
+ * Wrapper for the realloc() function used in the XML library.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlRealloc(ptr, size) xmlReallocLoc((ptr), (size), __FILE__, __LINE__)
+/**
+ * xmlMemStrdup:
+ * @str:  pointer to the existing string
+ *
+ * Wrapper for the strdup() function, xmlStrdup() is usually preferred.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlMemStrdup(str) xmlMemStrdupLoc((str), __FILE__, __LINE__)
+
+#endif /* DEBUG_MEMORY_LOCATION */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#ifndef __XML_GLOBALS_H
+#ifndef __XML_THREADS_H__
+#include <libxml/threads.h>
+#include <libxml/globals.h>
+#endif
+#endif
+
+#endif  /* __DEBUG_MEMORY_ALLOC__ */
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlmodule.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlmodule.h
new file mode 100644
index 0000000..9667820
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlmodule.h
@@ -0,0 +1,57 @@
+/*
+ * Summary: dynamic module loading
+ * Description: basic API for dynamic module loading, used by
+ *              libexslt added in 2.6.17
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Joel W. Reed
+ */
+
+#ifndef __XML_MODULE_H__
+#define __XML_MODULE_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_MODULES_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlModulePtr:
+ *
+ * A handle to a dynamically loaded module
+ */
+typedef struct _xmlModule xmlModule;
+typedef xmlModule *xmlModulePtr;
+
+/**
+ * xmlModuleOption:
+ *
+ * enumeration of options that can be passed down to xmlModuleOpen()
+ */
+typedef enum {
+    XML_MODULE_LAZY = 1,	/* lazy binding */
+    XML_MODULE_LOCAL= 2		/* local binding */
+} xmlModuleOption;
+
+XMLPUBFUN xmlModulePtr XMLCALL xmlModuleOpen	(const char *filename,
+						 int options);
+
+XMLPUBFUN int XMLCALL xmlModuleSymbol		(xmlModulePtr module,
+						 const char* name,
+						 void **result);
+
+XMLPUBFUN int XMLCALL xmlModuleClose		(xmlModulePtr module);
+
+XMLPUBFUN int XMLCALL xmlModuleFree		(xmlModulePtr module);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_MODULES_ENABLED */
+
+#endif /*__XML_MODULE_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlreader.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlreader.h
new file mode 100644
index 0000000..e8a8bcc
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlreader.h
@@ -0,0 +1,428 @@
+/*
+ * Summary: the XMLReader implementation
+ * Description: API of the XML streaming API based on C# interfaces.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XMLREADER_H__
+#define __XML_XMLREADER_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/xmlIO.h>
+#ifdef LIBXML_SCHEMAS_ENABLED
+#include <libxml/relaxng.h>
+#include <libxml/xmlschemas.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlParserSeverities:
+ *
+ * How severe an error callback is when the per-reader error callback API
+ * is used.
+ */
+typedef enum {
+    XML_PARSER_SEVERITY_VALIDITY_WARNING = 1,
+    XML_PARSER_SEVERITY_VALIDITY_ERROR = 2,
+    XML_PARSER_SEVERITY_WARNING = 3,
+    XML_PARSER_SEVERITY_ERROR = 4
+} xmlParserSeverities;
+
+#ifdef LIBXML_READER_ENABLED
+
+/**
+ * xmlTextReaderMode:
+ *
+ * Internal state values for the reader.
+ */
+typedef enum {
+    XML_TEXTREADER_MODE_INITIAL = 0,
+    XML_TEXTREADER_MODE_INTERACTIVE = 1,
+    XML_TEXTREADER_MODE_ERROR = 2,
+    XML_TEXTREADER_MODE_EOF =3,
+    XML_TEXTREADER_MODE_CLOSED = 4,
+    XML_TEXTREADER_MODE_READING = 5
+} xmlTextReaderMode;
+
+/**
+ * xmlParserProperties:
+ *
+ * Some common options to use with xmlTextReaderSetParserProp, but it
+ * is better to use xmlParserOption and the xmlReaderNewxxx and
+ * xmlReaderForxxx APIs now.
+ */
+typedef enum {
+    XML_PARSER_LOADDTD = 1,
+    XML_PARSER_DEFAULTATTRS = 2,
+    XML_PARSER_VALIDATE = 3,
+    XML_PARSER_SUBST_ENTITIES = 4
+} xmlParserProperties;
+
+/**
+ * xmlReaderTypes:
+ *
+ * Predefined constants for the different types of nodes.
+ */
+typedef enum {
+    XML_READER_TYPE_NONE = 0,
+    XML_READER_TYPE_ELEMENT = 1,
+    XML_READER_TYPE_ATTRIBUTE = 2,
+    XML_READER_TYPE_TEXT = 3,
+    XML_READER_TYPE_CDATA = 4,
+    XML_READER_TYPE_ENTITY_REFERENCE = 5,
+    XML_READER_TYPE_ENTITY = 6,
+    XML_READER_TYPE_PROCESSING_INSTRUCTION = 7,
+    XML_READER_TYPE_COMMENT = 8,
+    XML_READER_TYPE_DOCUMENT = 9,
+    XML_READER_TYPE_DOCUMENT_TYPE = 10,
+    XML_READER_TYPE_DOCUMENT_FRAGMENT = 11,
+    XML_READER_TYPE_NOTATION = 12,
+    XML_READER_TYPE_WHITESPACE = 13,
+    XML_READER_TYPE_SIGNIFICANT_WHITESPACE = 14,
+    XML_READER_TYPE_END_ELEMENT = 15,
+    XML_READER_TYPE_END_ENTITY = 16,
+    XML_READER_TYPE_XML_DECLARATION = 17
+} xmlReaderTypes;
+
+/**
+ * xmlTextReader:
+ *
+ * Structure for an xmlReader context.
+ */
+typedef struct _xmlTextReader xmlTextReader;
+
+/**
+ * xmlTextReaderPtr:
+ *
+ * Pointer to an xmlReader context.
+ */
+typedef xmlTextReader *xmlTextReaderPtr;
+
+/*
+ * Constructors & Destructor
+ */
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+			xmlNewTextReader	(xmlParserInputBufferPtr input,
+	                                         const char *URI);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+			xmlNewTextReaderFilename(const char *URI);
+
+XMLPUBFUN void XMLCALL
+			xmlFreeTextReader	(xmlTextReaderPtr reader);
+
+XMLPUBFUN int XMLCALL
+            xmlTextReaderSetup(xmlTextReaderPtr reader,
+                   xmlParserInputBufferPtr input, const char *URL,
+                   const char *encoding, int options);
+
+/*
+ * Iterators
+ */
+XMLPUBFUN int XMLCALL
+			xmlTextReaderRead	(xmlTextReaderPtr reader);
+
+#ifdef LIBXML_WRITER_ENABLED
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderReadInnerXml(xmlTextReaderPtr reader);
+
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderReadOuterXml(xmlTextReaderPtr reader);
+#endif
+
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderReadString	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader);
+
+/*
+ * Attributes of the node
+ */
+XMLPUBFUN int XMLCALL
+			xmlTextReaderAttributeCount(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderDepth	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderHasAttributes(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderHasValue(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderIsDefault	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderIsEmptyElement(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderNodeType	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderQuoteChar	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderReadState	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+                        xmlTextReaderIsNamespaceDecl(xmlTextReaderPtr reader);
+
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstBaseUri	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstLocalName	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstName	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstNamespaceUri(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstPrefix	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstXmlLang	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstString	(xmlTextReaderPtr reader,
+						 const xmlChar *str);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstValue	(xmlTextReaderPtr reader);
+
+/*
+ * use the Const version of the routine for
+ * better performance and simpler code
+ */
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderBaseUri	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderLocalName	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderName	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderNamespaceUri(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderPrefix	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderXmlLang	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderValue	(xmlTextReaderPtr reader);
+
+/*
+ * Methods of the XmlTextReader
+ */
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderClose		(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderGetAttributeNo	(xmlTextReaderPtr reader,
+						 int no);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderGetAttribute	(xmlTextReaderPtr reader,
+						 const xmlChar *name);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderGetAttributeNs	(xmlTextReaderPtr reader,
+						 const xmlChar *localName,
+						 const xmlChar *namespaceURI);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+		    xmlTextReaderGetRemainder	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderLookupNamespace(xmlTextReaderPtr reader,
+						 const xmlChar *prefix);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToAttributeNo(xmlTextReaderPtr reader,
+						 int no);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToAttribute(xmlTextReaderPtr reader,
+						 const xmlChar *name);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToAttributeNs(xmlTextReaderPtr reader,
+						 const xmlChar *localName,
+						 const xmlChar *namespaceURI);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToFirstAttribute(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToNextAttribute(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToElement	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderNormalization	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstEncoding  (xmlTextReaderPtr reader);
+
+/*
+ * Extensions
+ */
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSetParserProp	(xmlTextReaderPtr reader,
+						 int prop,
+						 int value);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderGetParserProp	(xmlTextReaderPtr reader,
+						 int prop);
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlTextReaderCurrentNode	(xmlTextReaderPtr reader);
+
+XMLPUBFUN int XMLCALL
+            xmlTextReaderGetParserLineNumber(xmlTextReaderPtr reader);
+
+XMLPUBFUN int XMLCALL
+            xmlTextReaderGetParserColumnNumber(xmlTextReaderPtr reader);
+
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlTextReaderPreserve	(xmlTextReaderPtr reader);
+#ifdef LIBXML_PATTERN_ENABLED
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderPreservePattern(xmlTextReaderPtr reader,
+						 const xmlChar *pattern,
+						 const xmlChar **namespaces);
+#endif /* LIBXML_PATTERN_ENABLED */
+XMLPUBFUN xmlDocPtr XMLCALL
+		    xmlTextReaderCurrentDoc	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlTextReaderExpand		(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderNext		(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderNextSibling	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderIsValid	(xmlTextReaderPtr reader);
+#ifdef LIBXML_SCHEMAS_ENABLED
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderRelaxNGValidate(xmlTextReaderPtr reader,
+						 const char *rng);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderRelaxNGValidateCtxt(xmlTextReaderPtr reader,
+						 xmlRelaxNGValidCtxtPtr ctxt,
+						 int options);
+
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderRelaxNGSetSchema(xmlTextReaderPtr reader,
+						 xmlRelaxNGPtr schema);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSchemaValidate	(xmlTextReaderPtr reader,
+						 const char *xsd);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSchemaValidateCtxt(xmlTextReaderPtr reader,
+						 xmlSchemaValidCtxtPtr ctxt,
+						 int options);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSetSchema	(xmlTextReaderPtr reader,
+						 xmlSchemaPtr schema);
+#endif
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstXmlVersion(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderStandalone     (xmlTextReaderPtr reader);
+
+
+/*
+ * Index lookup
+ */
+XMLPUBFUN long XMLCALL
+		xmlTextReaderByteConsumed	(xmlTextReaderPtr reader);
+
+/*
+ * New more complete APIs for simpler creation and reuse of readers
+ */
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderWalker		(xmlDocPtr doc);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForDoc		(const xmlChar * cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForFile	(const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForMemory	(const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForFd		(int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForIO		(xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN int XMLCALL
+		xmlReaderNewWalker	(xmlTextReaderPtr reader,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewDoc		(xmlTextReaderPtr reader,
+					 const xmlChar * cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewFile	(xmlTextReaderPtr reader,
+					 const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewMemory	(xmlTextReaderPtr reader,
+					 const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewFd		(xmlTextReaderPtr reader,
+					 int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewIO		(xmlTextReaderPtr reader,
+					 xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+/*
+ * Error handling extensions
+ */
+typedef void *  xmlTextReaderLocatorPtr;
+
+/**
+ * xmlTextReaderErrorFunc:
+ * @arg: the user argument
+ * @msg: the message
+ * @severity: the severity of the error
+ * @locator: a locator indicating where the error occurred
+ *
+ * Signature of an error callback from a reader parser
+ */
+typedef void (XMLCALL *xmlTextReaderErrorFunc)(void *arg,
+					       const char *msg,
+					       xmlParserSeverities severity,
+					       xmlTextReaderLocatorPtr locator);
+XMLPUBFUN int XMLCALL
+	    xmlTextReaderLocatorLineNumber(xmlTextReaderLocatorPtr locator);
+XMLPUBFUN xmlChar * XMLCALL
+	    xmlTextReaderLocatorBaseURI (xmlTextReaderLocatorPtr locator);
+XMLPUBFUN void XMLCALL
+	    xmlTextReaderSetErrorHandler(xmlTextReaderPtr reader,
+					 xmlTextReaderErrorFunc f,
+					 void *arg);
+XMLPUBFUN void XMLCALL
+	    xmlTextReaderSetStructuredErrorHandler(xmlTextReaderPtr reader,
+						   xmlStructuredErrorFunc f,
+						   void *arg);
+XMLPUBFUN void XMLCALL
+	    xmlTextReaderGetErrorHandler(xmlTextReaderPtr reader,
+					 xmlTextReaderErrorFunc *f,
+					 void **arg);
+
+#endif /* LIBXML_READER_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_XMLREADER_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlregexp.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlregexp.h
new file mode 100644
index 0000000..7009645
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlregexp.h
@@ -0,0 +1,222 @@
+/*
+ * Summary: regular expressions handling
+ * Description: basic API for libxml regular expressions handling used
+ *              for XML Schemas and validation.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_REGEXP_H__
+#define __XML_REGEXP_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_REGEXP_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlRegexpPtr:
+ *
+ * A libxml regular expression, they can actually be far more complex
+ * thank the POSIX regex expressions.
+ */
+typedef struct _xmlRegexp xmlRegexp;
+typedef xmlRegexp *xmlRegexpPtr;
+
+/**
+ * xmlRegExecCtxtPtr:
+ *
+ * A libxml progressive regular expression evaluation context
+ */
+typedef struct _xmlRegExecCtxt xmlRegExecCtxt;
+typedef xmlRegExecCtxt *xmlRegExecCtxtPtr;
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/tree.h>
+#include <libxml/dict.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The POSIX like API
+ */
+XMLPUBFUN xmlRegexpPtr XMLCALL
+		    xmlRegexpCompile	(const xmlChar *regexp);
+XMLPUBFUN void XMLCALL			 xmlRegFreeRegexp(xmlRegexpPtr regexp);
+XMLPUBFUN int XMLCALL
+		    xmlRegexpExec	(xmlRegexpPtr comp,
+					 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		    xmlRegexpPrint	(FILE *output,
+					 xmlRegexpPtr regexp);
+XMLPUBFUN int XMLCALL
+		    xmlRegexpIsDeterminist(xmlRegexpPtr comp);
+
+/**
+ * xmlRegExecCallbacks:
+ * @exec: the regular expression context
+ * @token: the current token string
+ * @transdata: transition data
+ * @inputdata: input data
+ *
+ * Callback function when doing a transition in the automata
+ */
+typedef void (*xmlRegExecCallbacks) (xmlRegExecCtxtPtr exec,
+	                             const xmlChar *token,
+				     void *transdata,
+				     void *inputdata);
+
+/*
+ * The progressive API
+ */
+XMLPUBFUN xmlRegExecCtxtPtr XMLCALL
+		    xmlRegNewExecCtxt	(xmlRegexpPtr comp,
+					 xmlRegExecCallbacks callback,
+					 void *data);
+XMLPUBFUN void XMLCALL
+		    xmlRegFreeExecCtxt	(xmlRegExecCtxtPtr exec);
+XMLPUBFUN int XMLCALL
+		    xmlRegExecPushString(xmlRegExecCtxtPtr exec,
+					 const xmlChar *value,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		    xmlRegExecPushString2(xmlRegExecCtxtPtr exec,
+					 const xmlChar *value,
+					 const xmlChar *value2,
+					 void *data);
+
+XMLPUBFUN int XMLCALL
+		    xmlRegExecNextValues(xmlRegExecCtxtPtr exec,
+					 int *nbval,
+					 int *nbneg,
+					 xmlChar **values,
+					 int *terminal);
+XMLPUBFUN int XMLCALL
+		    xmlRegExecErrInfo	(xmlRegExecCtxtPtr exec,
+					 const xmlChar **string,
+					 int *nbval,
+					 int *nbneg,
+					 xmlChar **values,
+					 int *terminal);
+#ifdef LIBXML_EXPR_ENABLED
+/*
+ * Formal regular expression handling
+ * Its goal is to do some formal work on content models
+ */
+
+/* expressions are used within a context */
+typedef struct _xmlExpCtxt xmlExpCtxt;
+typedef xmlExpCtxt *xmlExpCtxtPtr;
+
+XMLPUBFUN void XMLCALL
+			xmlExpFreeCtxt	(xmlExpCtxtPtr ctxt);
+XMLPUBFUN xmlExpCtxtPtr XMLCALL
+			xmlExpNewCtxt	(int maxNodes,
+					 xmlDictPtr dict);
+
+XMLPUBFUN int XMLCALL
+			xmlExpCtxtNbNodes(xmlExpCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt);
+
+/* Expressions are trees but the tree is opaque */
+typedef struct _xmlExpNode xmlExpNode;
+typedef xmlExpNode *xmlExpNodePtr;
+
+typedef enum {
+    XML_EXP_EMPTY = 0,
+    XML_EXP_FORBID = 1,
+    XML_EXP_ATOM = 2,
+    XML_EXP_SEQ = 3,
+    XML_EXP_OR = 4,
+    XML_EXP_COUNT = 5
+} xmlExpNodeType;
+
+/*
+ * 2 core expressions shared by all for the empty language set
+ * and for the set with just the empty token
+ */
+XMLPUBVAR xmlExpNodePtr forbiddenExp;
+XMLPUBVAR xmlExpNodePtr emptyExp;
+
+/*
+ * Expressions are reference counted internally
+ */
+XMLPUBFUN void XMLCALL
+			xmlExpFree	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr);
+XMLPUBFUN void XMLCALL
+			xmlExpRef	(xmlExpNodePtr expr);
+
+/*
+ * constructors can be either manual or from a string
+ */
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpParse	(xmlExpCtxtPtr ctxt,
+					 const char *expr);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewAtom	(xmlExpCtxtPtr ctxt,
+					 const xmlChar *name,
+					 int len);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewOr	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr left,
+					 xmlExpNodePtr right);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewSeq	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr left,
+					 xmlExpNodePtr right);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewRange	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr subset,
+					 int min,
+					 int max);
+/*
+ * The really interesting APIs
+ */
+XMLPUBFUN int XMLCALL
+			xmlExpIsNillable(xmlExpNodePtr expr);
+XMLPUBFUN int XMLCALL
+			xmlExpMaxToken	(xmlExpNodePtr expr);
+XMLPUBFUN int XMLCALL
+			xmlExpGetLanguage(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 const xmlChar**langList,
+					 int len);
+XMLPUBFUN int XMLCALL
+			xmlExpGetStart	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 const xmlChar**tokList,
+					 int len);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpStringDerive(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 const xmlChar *str,
+					 int len);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpExpDerive	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 xmlExpNodePtr sub);
+XMLPUBFUN int XMLCALL
+			xmlExpSubsume	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 xmlExpNodePtr sub);
+XMLPUBFUN void XMLCALL
+			xmlExpDump	(xmlBufferPtr buf,
+					 xmlExpNodePtr expr);
+#endif /* LIBXML_EXPR_ENABLED */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_REGEXP_ENABLED */
+
+#endif /*__XML_REGEXP_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlsave.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlsave.h
new file mode 100644
index 0000000..fb329b2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlsave.h
@@ -0,0 +1,88 @@
+/*
+ * Summary: the XML document serializer
+ * Description: API to save document or subtree of document
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XMLSAVE_H__
+#define __XML_XMLSAVE_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/encoding.h>
+#include <libxml/xmlIO.h>
+
+#ifdef LIBXML_OUTPUT_ENABLED
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlSaveOption:
+ *
+ * This is the set of XML save options that can be passed down
+ * to the xmlSaveToFd() and similar calls.
+ */
+typedef enum {
+    XML_SAVE_FORMAT     = 1<<0,	/* format save output */
+    XML_SAVE_NO_DECL    = 1<<1,	/* drop the xml declaration */
+    XML_SAVE_NO_EMPTY	= 1<<2, /* no empty tags */
+    XML_SAVE_NO_XHTML	= 1<<3, /* disable XHTML1 specific rules */
+    XML_SAVE_XHTML	= 1<<4, /* force XHTML1 specific rules */
+    XML_SAVE_AS_XML     = 1<<5, /* force XML serialization on HTML doc */
+    XML_SAVE_AS_HTML    = 1<<6, /* force HTML serialization on XML doc */
+    XML_SAVE_WSNONSIG   = 1<<7  /* format with non-significant whitespace */
+} xmlSaveOption;
+
+
+typedef struct _xmlSaveCtxt xmlSaveCtxt;
+typedef xmlSaveCtxt *xmlSaveCtxtPtr;
+
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToFd		(int fd,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToFilename	(const char *filename,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToBuffer		(xmlBufferPtr buffer,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToIO		(xmlOutputWriteCallback iowrite,
+					 xmlOutputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN long XMLCALL
+		xmlSaveDoc		(xmlSaveCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN long XMLCALL
+		xmlSaveTree		(xmlSaveCtxtPtr ctxt,
+					 xmlNodePtr node);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFlush		(xmlSaveCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlSaveClose		(xmlSaveCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlSaveSetEscape	(xmlSaveCtxtPtr ctxt,
+					 xmlCharEncodingOutputFunc escape);
+XMLPUBFUN int XMLCALL
+		xmlSaveSetAttrEscape	(xmlSaveCtxtPtr ctxt,
+					 xmlCharEncodingOutputFunc escape);
+#ifdef __cplusplus
+}
+#endif
+#endif /* LIBXML_OUTPUT_ENABLED */
+#endif /* __XML_XMLSAVE_H__ */
+
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlschemas.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlschemas.h
new file mode 100644
index 0000000..b90e9d1
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlschemas.h
@@ -0,0 +1,246 @@
+/*
+ * Summary: incomplete XML Schemas structure implementation
+ * Description: interface to the XML Schemas handling and schema validity
+ *              checking, it is incomplete right now.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMA_H__
+#define __XML_SCHEMA_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * This error codes are obsolete; not used any more.
+ */
+typedef enum {
+    XML_SCHEMAS_ERR_OK		= 0,
+    XML_SCHEMAS_ERR_NOROOT	= 1,
+    XML_SCHEMAS_ERR_UNDECLAREDELEM,
+    XML_SCHEMAS_ERR_NOTTOPLEVEL,
+    XML_SCHEMAS_ERR_MISSING,
+    XML_SCHEMAS_ERR_WRONGELEM,
+    XML_SCHEMAS_ERR_NOTYPE,
+    XML_SCHEMAS_ERR_NOROLLBACK,
+    XML_SCHEMAS_ERR_ISABSTRACT,
+    XML_SCHEMAS_ERR_NOTEMPTY,
+    XML_SCHEMAS_ERR_ELEMCONT,
+    XML_SCHEMAS_ERR_HAVEDEFAULT,
+    XML_SCHEMAS_ERR_NOTNILLABLE,
+    XML_SCHEMAS_ERR_EXTRACONTENT,
+    XML_SCHEMAS_ERR_INVALIDATTR,
+    XML_SCHEMAS_ERR_INVALIDELEM,
+    XML_SCHEMAS_ERR_NOTDETERMINIST,
+    XML_SCHEMAS_ERR_CONSTRUCT,
+    XML_SCHEMAS_ERR_INTERNAL,
+    XML_SCHEMAS_ERR_NOTSIMPLE,
+    XML_SCHEMAS_ERR_ATTRUNKNOWN,
+    XML_SCHEMAS_ERR_ATTRINVALID,
+    XML_SCHEMAS_ERR_VALUE,
+    XML_SCHEMAS_ERR_FACET,
+    XML_SCHEMAS_ERR_,
+    XML_SCHEMAS_ERR_XXX
+} xmlSchemaValidError;
+
+/*
+* ATTENTION: Change xmlSchemaSetValidOptions's check
+* for invalid values, if adding to the validation
+* options below.
+*/
+/**
+ * xmlSchemaValidOption:
+ *
+ * This is the set of XML Schema validation options.
+ */
+typedef enum {
+    XML_SCHEMA_VAL_VC_I_CREATE			= 1<<0
+	/* Default/fixed: create an attribute node
+	* or an element's text node on the instance.
+	*/
+} xmlSchemaValidOption;
+
+/*
+    XML_SCHEMA_VAL_XSI_ASSEMBLE			= 1<<1,
+	* assemble schemata using
+	* xsi:schemaLocation and
+	* xsi:noNamespaceSchemaLocation
+*/
+
+/**
+ * The schemas related types are kept internal
+ */
+typedef struct _xmlSchema xmlSchema;
+typedef xmlSchema *xmlSchemaPtr;
+
+/**
+ * xmlSchemaValidityErrorFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of an error callback from an XSD validation
+ */
+typedef void (XMLCDECL *xmlSchemaValidityErrorFunc)
+                 (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * xmlSchemaValidityWarningFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of a warning callback from an XSD validation
+ */
+typedef void (XMLCDECL *xmlSchemaValidityWarningFunc)
+                 (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * A schemas validation context
+ */
+typedef struct _xmlSchemaParserCtxt xmlSchemaParserCtxt;
+typedef xmlSchemaParserCtxt *xmlSchemaParserCtxtPtr;
+
+typedef struct _xmlSchemaValidCtxt xmlSchemaValidCtxt;
+typedef xmlSchemaValidCtxt *xmlSchemaValidCtxtPtr;
+
+/**
+ * xmlSchemaValidityLocatorFunc:
+ * @ctx: user provided context
+ * @file: returned file information
+ * @line: returned line information
+ *
+ * A schemas validation locator, a callback called by the validator.
+ * This is used when file or node information are not available
+ * to find out what file and line number are affected
+ *
+ * Returns: 0 in case of success and -1 in case of error
+ */
+
+typedef int (XMLCDECL *xmlSchemaValidityLocatorFunc) (void *ctx,
+                           const char **file, unsigned long *line);
+
+/*
+ * Interfaces for parsing.
+ */
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL
+	    xmlSchemaNewParserCtxt	(const char *URL);
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL
+	    xmlSchemaNewMemParserCtxt	(const char *buffer,
+					 int size);
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL
+	    xmlSchemaNewDocParserCtxt	(xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaFreeParserCtxt	(xmlSchemaParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetParserErrors	(xmlSchemaParserCtxtPtr ctxt,
+					 xmlSchemaValidityErrorFunc err,
+					 xmlSchemaValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetParserStructuredErrors(xmlSchemaParserCtxtPtr ctxt,
+					 xmlStructuredErrorFunc serror,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetParserErrors(xmlSchemaParserCtxtPtr ctxt,
+					xmlSchemaValidityErrorFunc * err,
+					xmlSchemaValidityWarningFunc * warn,
+					void **ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchemaIsValid	(xmlSchemaValidCtxtPtr ctxt);
+
+XMLPUBFUN xmlSchemaPtr XMLCALL
+	    xmlSchemaParse		(xmlSchemaParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaFree		(xmlSchemaPtr schema);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+	    xmlSchemaDump		(FILE *output,
+					 xmlSchemaPtr schema);
+#endif /* LIBXML_OUTPUT_ENABLED */
+/*
+ * Interfaces for validating
+ */
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetValidErrors	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlSchemaValidityErrorFunc err,
+					 xmlSchemaValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxtPtr ctxt,
+					 xmlStructuredErrorFunc serror,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaGetValidErrors	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlSchemaValidityErrorFunc *err,
+					 xmlSchemaValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN void XMLCALL
+            xmlSchemaValidateSetFilename(xmlSchemaValidCtxtPtr vctxt,
+	                                 const char *filename);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxtPtr ctxt);
+
+XMLPUBFUN xmlSchemaValidCtxtPtr XMLCALL
+	    xmlSchemaNewValidCtxt	(xmlSchemaPtr schema);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaFreeValidCtxt	(xmlSchemaValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidateDoc	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlDocPtr instance);
+XMLPUBFUN int XMLCALL
+            xmlSchemaValidateOneElement (xmlSchemaValidCtxtPtr ctxt,
+			                 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidateStream	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlParserInputBufferPtr input,
+					 xmlCharEncoding enc,
+					 xmlSAXHandlerPtr sax,
+					 void *user_data);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidateFile	(xmlSchemaValidCtxtPtr ctxt,
+					 const char * filename,
+					 int options);
+
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+	    xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt);
+
+/*
+ * Interface to insert Schemas SAX validation in a SAX stream
+ */
+typedef struct _xmlSchemaSAXPlug xmlSchemaSAXPlugStruct;
+typedef xmlSchemaSAXPlugStruct *xmlSchemaSAXPlugPtr;
+
+XMLPUBFUN xmlSchemaSAXPlugPtr XMLCALL
+            xmlSchemaSAXPlug		(xmlSchemaValidCtxtPtr ctxt,
+					 xmlSAXHandlerPtr *sax,
+					 void **user_data);
+XMLPUBFUN int XMLCALL
+            xmlSchemaSAXUnplug		(xmlSchemaSAXPlugPtr plug);
+
+
+XMLPUBFUN void XMLCALL
+            xmlSchemaValidateSetLocator	(xmlSchemaValidCtxtPtr vctxt,
+					 xmlSchemaValidityLocatorFunc f,
+					 void *ctxt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* __XML_SCHEMA_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlschemastypes.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlschemastypes.h
new file mode 100644
index 0000000..35d48d4
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlschemastypes.h
@@ -0,0 +1,151 @@
+/*
+ * Summary: implementation of XML Schema Datatypes
+ * Description: module providing the XML Schema Datatypes implementation
+ *              both definition and validity checking
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMA_TYPES_H__
+#define __XML_SCHEMA_TYPES_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    XML_SCHEMA_WHITESPACE_UNKNOWN = 0,
+    XML_SCHEMA_WHITESPACE_PRESERVE = 1,
+    XML_SCHEMA_WHITESPACE_REPLACE = 2,
+    XML_SCHEMA_WHITESPACE_COLLAPSE = 3
+} xmlSchemaWhitespaceValueType;
+
+XMLPUBFUN void XMLCALL
+		xmlSchemaInitTypes		(void);
+XMLPUBFUN void XMLCALL
+		xmlSchemaCleanupTypes		(void);
+XMLPUBFUN xmlSchemaTypePtr XMLCALL
+		xmlSchemaGetPredefinedType	(const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidatePredefinedType	(xmlSchemaTypePtr type,
+						 const xmlChar *value,
+						 xmlSchemaValPtr *val);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValPredefTypeNode	(xmlSchemaTypePtr type,
+						 const xmlChar *value,
+						 xmlSchemaValPtr *val,
+						 xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateFacet		(xmlSchemaTypePtr base,
+						 xmlSchemaFacetPtr facet,
+						 const xmlChar *value,
+						 xmlSchemaValPtr val);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateFacetWhtsp	(xmlSchemaFacetPtr facet,
+						 xmlSchemaWhitespaceValueType fws,
+						 xmlSchemaValType valType,
+						 const xmlChar *value,
+						 xmlSchemaValPtr val,
+						 xmlSchemaWhitespaceValueType ws);
+XMLPUBFUN void XMLCALL
+		xmlSchemaFreeValue		(xmlSchemaValPtr val);
+XMLPUBFUN xmlSchemaFacetPtr XMLCALL
+		xmlSchemaNewFacet		(void);
+XMLPUBFUN int XMLCALL
+		xmlSchemaCheckFacet		(xmlSchemaFacetPtr facet,
+						 xmlSchemaTypePtr typeDecl,
+						 xmlSchemaParserCtxtPtr ctxt,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		xmlSchemaFreeFacet		(xmlSchemaFacetPtr facet);
+XMLPUBFUN int XMLCALL
+		xmlSchemaCompareValues		(xmlSchemaValPtr x,
+						 xmlSchemaValPtr y);
+XMLPUBFUN xmlSchemaTypePtr XMLCALL
+    xmlSchemaGetBuiltInListSimpleTypeItemType	(xmlSchemaTypePtr type);
+XMLPUBFUN int XMLCALL
+    xmlSchemaValidateListSimpleTypeFacet	(xmlSchemaFacetPtr facet,
+						 const xmlChar *value,
+						 unsigned long actualLen,
+						 unsigned long *expectedLen);
+XMLPUBFUN xmlSchemaTypePtr XMLCALL
+		xmlSchemaGetBuiltInType		(xmlSchemaValType type);
+XMLPUBFUN int XMLCALL
+		xmlSchemaIsBuiltInTypeFacet	(xmlSchemaTypePtr type,
+						 int facetType);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSchemaCollapseString		(const xmlChar *value);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSchemaWhiteSpaceReplace	(const xmlChar *value);
+XMLPUBFUN unsigned long  XMLCALL
+		xmlSchemaGetFacetValueAsULong	(xmlSchemaFacetPtr facet);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateLengthFacet	(xmlSchemaTypePtr type,
+						 xmlSchemaFacetPtr facet,
+						 const xmlChar *value,
+						 xmlSchemaValPtr val,
+						 unsigned long *length);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateLengthFacetWhtsp(xmlSchemaFacetPtr facet,
+						  xmlSchemaValType valType,
+						  const xmlChar *value,
+						  xmlSchemaValPtr val,
+						  unsigned long *length,
+						  xmlSchemaWhitespaceValueType ws);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaTypePtr type,
+						 const xmlChar *value,
+						 xmlSchemaValPtr *val,
+						 xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetCanonValue		(xmlSchemaValPtr val,
+						 const xmlChar **retValue);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetCanonValueWhtsp	(xmlSchemaValPtr val,
+						 const xmlChar **retValue,
+						 xmlSchemaWhitespaceValueType ws);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValueAppend		(xmlSchemaValPtr prev,
+						 xmlSchemaValPtr cur);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaValueGetNext		(xmlSchemaValPtr cur);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSchemaValueGetAsString	(xmlSchemaValPtr val);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValueGetAsBoolean	(xmlSchemaValPtr val);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaNewStringValue		(xmlSchemaValType type,
+						 const xmlChar *value);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaNewNOTATIONValue	(const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaNewQNameValue		(const xmlChar *namespaceName,
+						 const xmlChar *localName);
+XMLPUBFUN int XMLCALL
+		xmlSchemaCompareValuesWhtsp	(xmlSchemaValPtr x,
+						 xmlSchemaWhitespaceValueType xws,
+						 xmlSchemaValPtr y,
+						 xmlSchemaWhitespaceValueType yws);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaCopyValue		(xmlSchemaValPtr val);
+XMLPUBFUN xmlSchemaValType XMLCALL
+		xmlSchemaGetValType		(xmlSchemaValPtr val);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* __XML_SCHEMA_TYPES_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlstring.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlstring.h
new file mode 100644
index 0000000..2d0b2d1
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlstring.h
@@ -0,0 +1,140 @@
+/*
+ * Summary: set of routines to process strings
+ * Description: type and interfaces needed for the internal string handling
+ *              of the library, especially UTF8 processing.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_STRING_H__
+#define __XML_STRING_H__
+
+#include <stdarg.h>
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlChar:
+ *
+ * This is a basic byte in an UTF-8 encoded string.
+ * It's unsigned allowing to pinpoint case where char * are assigned
+ * to xmlChar * (possibly making serialization back impossible).
+ */
+typedef unsigned char xmlChar;
+
+/**
+ * BAD_CAST:
+ *
+ * Macro to cast a string to an xmlChar * when one know its safe.
+ */
+#define BAD_CAST (xmlChar *)
+
+/*
+ * xmlChar handling
+ */
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrdup                (const xmlChar *cur);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrndup               (const xmlChar *cur,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlCharStrndup           (const char *cur,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlCharStrdup            (const char *cur);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrsub                (const xmlChar *str,
+                                         int start,
+                                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+                xmlStrchr                (const xmlChar *str,
+                                         xmlChar val);
+XMLPUBFUN const xmlChar * XMLCALL
+                xmlStrstr                (const xmlChar *str,
+                                         const xmlChar *val);
+XMLPUBFUN const xmlChar * XMLCALL
+                xmlStrcasestr            (const xmlChar *str,
+                                         const xmlChar *val);
+XMLPUBFUN int XMLCALL
+                xmlStrcmp                (const xmlChar *str1,
+                                         const xmlChar *str2);
+XMLPUBFUN int XMLCALL
+                xmlStrncmp               (const xmlChar *str1,
+                                         const xmlChar *str2,
+                                         int len);
+XMLPUBFUN int XMLCALL
+                xmlStrcasecmp            (const xmlChar *str1,
+                                         const xmlChar *str2);
+XMLPUBFUN int XMLCALL
+                xmlStrncasecmp           (const xmlChar *str1,
+                                         const xmlChar *str2,
+                                         int len);
+XMLPUBFUN int XMLCALL
+                xmlStrEqual              (const xmlChar *str1,
+                                         const xmlChar *str2);
+XMLPUBFUN int XMLCALL
+                xmlStrQEqual             (const xmlChar *pref,
+                                         const xmlChar *name,
+                                         const xmlChar *str);
+XMLPUBFUN int XMLCALL
+                xmlStrlen                (const xmlChar *str);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrcat                (xmlChar *cur,
+                                         const xmlChar *add);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrncat               (xmlChar *cur,
+                                         const xmlChar *add,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrncatNew            (const xmlChar *str1,
+                                         const xmlChar *str2,
+                                         int len);
+XMLPUBFUN int XMLCALL
+                xmlStrPrintf             (xmlChar *buf,
+                                         int len,
+                                         const char *msg,
+                                         ...) LIBXML_ATTR_FORMAT(3,4);
+XMLPUBFUN int XMLCALL
+                xmlStrVPrintf                (xmlChar *buf,
+                                         int len,
+                                         const char *msg,
+                                         va_list ap) LIBXML_ATTR_FORMAT(3,0);
+
+XMLPUBFUN int XMLCALL
+        xmlGetUTF8Char                   (const unsigned char *utf,
+                                         int *len);
+XMLPUBFUN int XMLCALL
+        xmlCheckUTF8                     (const unsigned char *utf);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Strsize                   (const xmlChar *utf,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+        xmlUTF8Strndup                   (const xmlChar *utf,
+                                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+        xmlUTF8Strpos                    (const xmlChar *utf,
+                                         int pos);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Strloc                    (const xmlChar *utf,
+                                         const xmlChar *utfchar);
+XMLPUBFUN xmlChar * XMLCALL
+        xmlUTF8Strsub                    (const xmlChar *utf,
+                                         int start,
+                                         int len);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Strlen                    (const xmlChar *utf);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Size                      (const xmlChar *utf);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Charcmp                   (const xmlChar *utf1,
+                                         const xmlChar *utf2);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_STRING_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlunicode.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlunicode.h
new file mode 100644
index 0000000..01ac8b6
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlunicode.h
@@ -0,0 +1,202 @@
+/*
+ * Summary: Unicode character APIs
+ * Description: API for the Unicode character APIs
+ *
+ * This file is automatically generated from the
+ * UCS description files of the Unicode Character Database
+ * http://www.unicode.org/Public/4.0-Update1/UCD-4.0.1.html
+ * using the genUnicode.py Python script.
+ *
+ * Generation date: Mon Mar 27 11:09:52 2006
+ * Sources: Blocks-4.0.1.txt UnicodeData-4.0.1.txt
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_UNICODE_H__
+#define __XML_UNICODE_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_UNICODE_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+XMLPUBFUN int XMLCALL xmlUCSIsAegeanNumbers	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsAlphabeticPresentationForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArabic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArabicPresentationFormsA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArabicPresentationFormsB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArmenian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArrows	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBasicLatin	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBengali	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBlockElements	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBopomofo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBopomofoExtended	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBoxDrawing	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBraillePatterns	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBuhid	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsByzantineMusicalSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibility	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibilityForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibilityIdeographs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibilityIdeographsSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKRadicalsSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKSymbolsandPunctuation	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKUnifiedIdeographs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKUnifiedIdeographsExtensionA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKUnifiedIdeographsExtensionB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCherokee	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningDiacriticalMarks	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningDiacriticalMarksforSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningHalfMarks	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningMarksforSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsControlPictures	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCurrencySymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCypriotSyllabary	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCyrillic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCyrillicSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsDeseret	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsDevanagari	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsDingbats	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsEnclosedAlphanumerics	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsEnclosedCJKLettersandMonths	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsEthiopic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGeneralPunctuation	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGeometricShapes	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGeorgian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGothic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGreek	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGreekExtended	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGreekandCoptic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGujarati	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGurmukhi	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHalfwidthandFullwidthForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHangulCompatibilityJamo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHangulJamo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHangulSyllables	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHanunoo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHebrew	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHighPrivateUseSurrogates	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHighSurrogates	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHiragana	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsIPAExtensions	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsIdeographicDescriptionCharacters	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKanbun	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKangxiRadicals	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKannada	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKatakana	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKatakanaPhoneticExtensions	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKhmer	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKhmerSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLao	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatin1Supplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatinExtendedA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatinExtendedB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatinExtendedAdditional	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLetterlikeSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLimbu	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLinearBIdeograms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLinearBSyllabary	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLowSurrogates	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMalayalam	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMathematicalAlphanumericSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMathematicalOperators	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousMathematicalSymbolsA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousMathematicalSymbolsB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousSymbolsandArrows	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousTechnical	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMongolian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMusicalSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMyanmar	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsNumberForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOgham	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOldItalic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOpticalCharacterRecognition	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOriya	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOsmanya	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsPhoneticExtensions	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsPrivateUse	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsPrivateUseArea	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsRunic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsShavian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSinhala	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSmallFormVariants	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSpacingModifierLetters	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSpecials	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSuperscriptsandSubscripts	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementalArrowsA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementalArrowsB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementalMathematicalOperators	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementaryPrivateUseAreaA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementaryPrivateUseAreaB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSyriac	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTagalog	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTagbanwa	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTags	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTaiLe	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTaiXuanJingSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTamil	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTelugu	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsThaana	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsThai	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTibetan	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsUgaritic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsUnifiedCanadianAboriginalSyllabics	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsVariationSelectors	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsVariationSelectorsSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsYiRadicals	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsYiSyllables	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsYijingHexagramSymbols	(int code);
+
+XMLPUBFUN int XMLCALL xmlUCSIsBlock	(int code, const char *block);
+
+XMLPUBFUN int XMLCALL xmlUCSIsCatC	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCf	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatL	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLl	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLm	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLt	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLu	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatM	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatMc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatMe	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatMn	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatN	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatNd	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatNl	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatNo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatP	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPd	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPe	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPf	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPi	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatS	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSk	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSm	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZ	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZl	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZp	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZs	(int code);
+
+XMLPUBFUN int XMLCALL xmlUCSIsCat	(int code, const char *cat);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_UNICODE_ENABLED */
+
+#endif /* __XML_UNICODE_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlversion.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlversion.h
new file mode 100644
index 0000000..d793760
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlversion.h
@@ -0,0 +1,485 @@
+/*
+ * Summary: compile-time version information
+ * Description: compile-time version information for the XML library
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_VERSION_H__
+#define __XML_VERSION_H__
+
+#include <libxml/xmlexports.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * use those to be sure nothing nasty will happen if
+ * your library and includes mismatch
+ */
+#ifndef LIBXML2_COMPILING_MSCCDEF
+XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
+#endif /* LIBXML2_COMPILING_MSCCDEF */
+
+/**
+ * LIBXML_DOTTED_VERSION:
+ *
+ * the version string like "1.2.3"
+ */
+#define LIBXML_DOTTED_VERSION "2.9.10"
+
+/**
+ * LIBXML_VERSION:
+ *
+ * the version number: 1.2.3 value is 10203
+ */
+#define LIBXML_VERSION 209010
+
+/**
+ * LIBXML_VERSION_STRING:
+ *
+ * the version number string, 1.2.3 value is "10203"
+ */
+#define LIBXML_VERSION_STRING "209010"
+
+/**
+ * LIBXML_VERSION_EXTRA:
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define LIBXML_VERSION_EXTRA ""
+
+/**
+ * LIBXML_TEST_VERSION:
+ *
+ * Macro to check that the libxml version in use is compatible with
+ * the version the software has been compiled against
+ */
+#define LIBXML_TEST_VERSION xmlCheckVersion(209010);
+
+#ifndef VMS
+#if 0
+/**
+ * WITH_TRIO:
+ *
+ * defined if the trio support need to be configured in
+ */
+#define WITH_TRIO
+#else
+/**
+ * WITHOUT_TRIO:
+ *
+ * defined if the trio support should not be configured in
+ */
+#define WITHOUT_TRIO
+#endif
+#else /* VMS */
+/**
+ * WITH_TRIO:
+ *
+ * defined if the trio support need to be configured in
+ */
+#define WITH_TRIO 1
+#endif /* VMS */
+
+/**
+ * LIBXML_THREAD_ENABLED:
+ *
+ * Whether the thread support is configured in
+ */
+#if 1
+#define LIBXML_THREAD_ENABLED
+#endif
+
+/**
+ * LIBXML_THREAD_ALLOC_ENABLED:
+ *
+ * Whether the allocation hooks are per-thread
+ */
+#if 0
+#define LIBXML_THREAD_ALLOC_ENABLED
+#endif
+
+/**
+ * LIBXML_TREE_ENABLED:
+ *
+ * Whether the DOM like tree manipulation API support is configured in
+ */
+#if 1
+#define LIBXML_TREE_ENABLED
+#endif
+
+/**
+ * LIBXML_OUTPUT_ENABLED:
+ *
+ * Whether the serialization/saving support is configured in
+ */
+#if 1
+#define LIBXML_OUTPUT_ENABLED
+#endif
+
+/**
+ * LIBXML_PUSH_ENABLED:
+ *
+ * Whether the push parsing interfaces are configured in
+ */
+#if 1
+#define LIBXML_PUSH_ENABLED
+#endif
+
+/**
+ * LIBXML_READER_ENABLED:
+ *
+ * Whether the xmlReader parsing interface is configured in
+ */
+#if 1
+#define LIBXML_READER_ENABLED
+#endif
+
+/**
+ * LIBXML_PATTERN_ENABLED:
+ *
+ * Whether the xmlPattern node selection interface is configured in
+ */
+#if 1
+#define LIBXML_PATTERN_ENABLED
+#endif
+
+/**
+ * LIBXML_WRITER_ENABLED:
+ *
+ * Whether the xmlWriter saving interface is configured in
+ */
+#if 1
+#define LIBXML_WRITER_ENABLED
+#endif
+
+/**
+ * LIBXML_SAX1_ENABLED:
+ *
+ * Whether the older SAX1 interface is configured in
+ */
+#if 1
+#define LIBXML_SAX1_ENABLED
+#endif
+
+/**
+ * LIBXML_FTP_ENABLED:
+ *
+ * Whether the FTP support is configured in
+ */
+#if 1
+#define LIBXML_FTP_ENABLED
+#endif
+
+/**
+ * LIBXML_HTTP_ENABLED:
+ *
+ * Whether the HTTP support is configured in
+ */
+#if 1
+#define LIBXML_HTTP_ENABLED
+#endif
+
+/**
+ * LIBXML_VALID_ENABLED:
+ *
+ * Whether the DTD validation support is configured in
+ */
+#if 1
+#define LIBXML_VALID_ENABLED
+#endif
+
+/**
+ * LIBXML_HTML_ENABLED:
+ *
+ * Whether the HTML support is configured in
+ */
+#if 1
+#define LIBXML_HTML_ENABLED
+#endif
+
+/**
+ * LIBXML_LEGACY_ENABLED:
+ *
+ * Whether the deprecated APIs are compiled in for compatibility
+ */
+#if 1
+#define LIBXML_LEGACY_ENABLED
+#endif
+
+/**
+ * LIBXML_C14N_ENABLED:
+ *
+ * Whether the Canonicalization support is configured in
+ */
+#if 1
+#define LIBXML_C14N_ENABLED
+#endif
+
+/**
+ * LIBXML_CATALOG_ENABLED:
+ *
+ * Whether the Catalog support is configured in
+ */
+#if 1
+#define LIBXML_CATALOG_ENABLED
+#endif
+
+/**
+ * LIBXML_DOCB_ENABLED:
+ *
+ * Whether the SGML Docbook support is configured in
+ */
+#if 1
+#define LIBXML_DOCB_ENABLED
+#endif
+
+/**
+ * LIBXML_XPATH_ENABLED:
+ *
+ * Whether XPath is configured in
+ */
+#if 1
+#define LIBXML_XPATH_ENABLED
+#endif
+
+/**
+ * LIBXML_XPTR_ENABLED:
+ *
+ * Whether XPointer is configured in
+ */
+#if 1
+#define LIBXML_XPTR_ENABLED
+#endif
+
+/**
+ * LIBXML_XINCLUDE_ENABLED:
+ *
+ * Whether XInclude is configured in
+ */
+#if 1
+#define LIBXML_XINCLUDE_ENABLED
+#endif
+
+/**
+ * LIBXML_ICONV_ENABLED:
+ *
+ * Whether iconv support is available
+ */
+#if 0
+#define LIBXML_ICONV_ENABLED
+#endif
+
+/**
+ * LIBXML_ICU_ENABLED:
+ *
+ * Whether icu support is available
+ */
+#if 0
+#define LIBXML_ICU_ENABLED
+#endif
+
+/**
+ * LIBXML_ISO8859X_ENABLED:
+ *
+ * Whether ISO-8859-* support is made available in case iconv is not
+ */
+#if 1
+#define LIBXML_ISO8859X_ENABLED
+#endif
+
+/**
+ * LIBXML_DEBUG_ENABLED:
+ *
+ * Whether Debugging module is configured in
+ */
+#if 1
+#define LIBXML_DEBUG_ENABLED
+#endif
+
+/**
+ * DEBUG_MEMORY_LOCATION:
+ *
+ * Whether the memory debugging is configured in
+ */
+#if 0
+#define DEBUG_MEMORY_LOCATION
+#endif
+
+/**
+ * LIBXML_DEBUG_RUNTIME:
+ *
+ * Whether the runtime debugging is configured in
+ */
+#if 0
+#define LIBXML_DEBUG_RUNTIME
+#endif
+
+/**
+ * LIBXML_UNICODE_ENABLED:
+ *
+ * Whether the Unicode related interfaces are compiled in
+ */
+#if 1
+#define LIBXML_UNICODE_ENABLED
+#endif
+
+/**
+ * LIBXML_REGEXP_ENABLED:
+ *
+ * Whether the regular expressions interfaces are compiled in
+ */
+#if 1
+#define LIBXML_REGEXP_ENABLED
+#endif
+
+/**
+ * LIBXML_AUTOMATA_ENABLED:
+ *
+ * Whether the automata interfaces are compiled in
+ */
+#if 1
+#define LIBXML_AUTOMATA_ENABLED
+#endif
+
+/**
+ * LIBXML_EXPR_ENABLED:
+ *
+ * Whether the formal expressions interfaces are compiled in
+ *
+ * This code is unused and disabled unconditionally for now.
+ */
+#if 0
+#define LIBXML_EXPR_ENABLED
+#endif
+
+/**
+ * LIBXML_SCHEMAS_ENABLED:
+ *
+ * Whether the Schemas validation interfaces are compiled in
+ */
+#if 1
+#define LIBXML_SCHEMAS_ENABLED
+#endif
+
+/**
+ * LIBXML_SCHEMATRON_ENABLED:
+ *
+ * Whether the Schematron validation interfaces are compiled in
+ */
+#if 1
+#define LIBXML_SCHEMATRON_ENABLED
+#endif
+
+/**
+ * LIBXML_MODULES_ENABLED:
+ *
+ * Whether the module interfaces are compiled in
+ */
+#if 1
+#define LIBXML_MODULES_ENABLED
+/**
+ * LIBXML_MODULE_EXTENSION:
+ *
+ * the string suffix used by dynamic modules (usually shared libraries)
+ */
+#define LIBXML_MODULE_EXTENSION ".so" 
+#endif
+
+/**
+ * LIBXML_ZLIB_ENABLED:
+ *
+ * Whether the Zlib support is compiled in
+ */
+#if 0
+#define LIBXML_ZLIB_ENABLED
+#endif
+
+/**
+ * LIBXML_LZMA_ENABLED:
+ *
+ * Whether the Lzma support is compiled in
+ */
+#if 0
+#define LIBXML_LZMA_ENABLED
+#endif
+
+#ifdef __GNUC__
+
+/**
+ * ATTRIBUTE_UNUSED:
+ *
+ * Macro used to signal to GCC unused function parameters
+ */
+
+#ifndef ATTRIBUTE_UNUSED
+# if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
+#  define ATTRIBUTE_UNUSED __attribute__((unused))
+# else
+#  define ATTRIBUTE_UNUSED
+# endif
+#endif
+
+/**
+ * LIBXML_ATTR_ALLOC_SIZE:
+ *
+ * Macro used to indicate to GCC this is an allocator function
+ */
+
+#ifndef LIBXML_ATTR_ALLOC_SIZE
+# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))))
+#  define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
+# else
+#  define LIBXML_ATTR_ALLOC_SIZE(x)
+# endif
+#else
+# define LIBXML_ATTR_ALLOC_SIZE(x)
+#endif
+
+/**
+ * LIBXML_ATTR_FORMAT:
+ *
+ * Macro used to indicate to GCC the parameter are printf like
+ */
+
+#ifndef LIBXML_ATTR_FORMAT
+# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
+#  define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
+# else
+#  define LIBXML_ATTR_FORMAT(fmt,args)
+# endif
+#else
+# define LIBXML_ATTR_FORMAT(fmt,args)
+#endif
+
+#else /* ! __GNUC__ */
+/**
+ * ATTRIBUTE_UNUSED:
+ *
+ * Macro used to signal to GCC unused function parameters
+ */
+#define ATTRIBUTE_UNUSED
+/**
+ * LIBXML_ATTR_ALLOC_SIZE:
+ *
+ * Macro used to indicate to GCC this is an allocator function
+ */
+#define LIBXML_ATTR_ALLOC_SIZE(x)
+/**
+ * LIBXML_ATTR_FORMAT:
+ *
+ * Macro used to indicate to GCC the parameter are printf like
+ */
+#define LIBXML_ATTR_FORMAT(fmt,args)
+#endif /* __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif
+
+
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlwriter.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlwriter.h
new file mode 100644
index 0000000..dd5add3
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xmlwriter.h
@@ -0,0 +1,488 @@
+/*
+ * Summary: text writing API for XML
+ * Description: text writing API for XML
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Alfred Mickautsch <alfred@mickautsch.de>
+ */
+
+#ifndef __XML_XMLWRITER_H__
+#define __XML_XMLWRITER_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_WRITER_ENABLED
+
+#include <stdarg.h>
+#include <libxml/xmlIO.h>
+#include <libxml/list.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    typedef struct _xmlTextWriter xmlTextWriter;
+    typedef xmlTextWriter *xmlTextWriterPtr;
+
+/*
+ * Constructors & Destructor
+ */
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriter(xmlOutputBufferPtr out);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterFilename(const char *uri, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterMemory(xmlBufferPtr buf, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterDoc(xmlDocPtr * doc, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterTree(xmlDocPtr doc, xmlNodePtr node,
+                             int compression);
+    XMLPUBFUN void XMLCALL xmlFreeTextWriter(xmlTextWriterPtr writer);
+
+/*
+ * Functions
+ */
+
+
+/*
+ * Document
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDocument(xmlTextWriterPtr writer,
+                                   const char *version,
+                                   const char *encoding,
+                                   const char *standalone);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDocument(xmlTextWriterPtr
+                                                   writer);
+
+/*
+ * Comments
+ */
+    XMLPUBFUN int XMLCALL xmlTextWriterStartComment(xmlTextWriterPtr
+                                                    writer);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndComment(xmlTextWriterPtr writer);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer,
+                                        const char *format, ...)
+					LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer,
+                                         const char *format,
+                                         va_list argptr)
+					 LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteComment(xmlTextWriterPtr
+                                                    writer,
+                                                    const xmlChar *
+                                                    content);
+
+/*
+ * Elements
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartElement(xmlTextWriterPtr writer,
+                                  const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterStartElementNS(xmlTextWriterPtr
+                                                      writer,
+                                                      const xmlChar *
+                                                      prefix,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      namespaceURI);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndElement(xmlTextWriterPtr writer);
+    XMLPUBFUN int XMLCALL xmlTextWriterFullEndElement(xmlTextWriterPtr
+                                                      writer);
+
+/*
+ * Elements conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer,
+                                        const xmlChar * name,
+                                        const char *format, ...)
+					LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer,
+                                         const xmlChar * name,
+                                         const char *format,
+                                         va_list argptr)
+					 LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteElement(xmlTextWriterPtr
+                                                    writer,
+                                                    const xmlChar * name,
+                                                    const xmlChar *
+                                                    content);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatElementNS(xmlTextWriterPtr writer,
+                                          const xmlChar * prefix,
+                                          const xmlChar * name,
+                                          const xmlChar * namespaceURI,
+                                          const char *format, ...)
+					  LIBXML_ATTR_FORMAT(5,6);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer,
+                                           const xmlChar * prefix,
+                                           const xmlChar * name,
+                                           const xmlChar * namespaceURI,
+                                           const char *format,
+                                           va_list argptr)
+					   LIBXML_ATTR_FORMAT(5,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteElementNS(xmlTextWriterPtr
+                                                      writer,
+                                                      const xmlChar *
+                                                      prefix,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      namespaceURI,
+                                                      const xmlChar *
+                                                      content);
+
+/*
+ * Text
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer,
+                                    const char *format, ...)
+				    LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer,
+                                     const char *format, va_list argptr)
+				     LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteRawLen(xmlTextWriterPtr writer,
+                                 const xmlChar * content, int len);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteRaw(xmlTextWriterPtr writer,
+                              const xmlChar * content);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteFormatString(xmlTextWriterPtr
+                                                         writer,
+                                                         const char
+                                                         *format, ...)
+							 LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteVFormatString(xmlTextWriterPtr
+                                                          writer,
+                                                          const char
+                                                          *format,
+                                                          va_list argptr)
+							  LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteString(xmlTextWriterPtr writer,
+                                                   const xmlChar *
+                                                   content);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteBase64(xmlTextWriterPtr writer,
+                                                   const char *data,
+                                                   int start, int len);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteBinHex(xmlTextWriterPtr writer,
+                                                   const char *data,
+                                                   int start, int len);
+
+/*
+ * Attributes
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartAttribute(xmlTextWriterPtr writer,
+                                    const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterStartAttributeNS(xmlTextWriterPtr
+                                                        writer,
+                                                        const xmlChar *
+                                                        prefix,
+                                                        const xmlChar *
+                                                        name,
+                                                        const xmlChar *
+                                                        namespaceURI);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndAttribute(xmlTextWriterPtr
+                                                    writer);
+
+/*
+ * Attributes conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer,
+                                          const xmlChar * name,
+                                          const char *format, ...)
+					  LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer,
+                                           const xmlChar * name,
+                                           const char *format,
+                                           va_list argptr)
+					   LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteAttribute(xmlTextWriterPtr
+                                                      writer,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      content);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatAttributeNS(xmlTextWriterPtr writer,
+                                            const xmlChar * prefix,
+                                            const xmlChar * name,
+                                            const xmlChar * namespaceURI,
+                                            const char *format, ...)
+					    LIBXML_ATTR_FORMAT(5,6);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer,
+                                             const xmlChar * prefix,
+                                             const xmlChar * name,
+                                             const xmlChar * namespaceURI,
+                                             const char *format,
+                                             va_list argptr)
+					     LIBXML_ATTR_FORMAT(5,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteAttributeNS(xmlTextWriterPtr
+                                                        writer,
+                                                        const xmlChar *
+                                                        prefix,
+                                                        const xmlChar *
+                                                        name,
+                                                        const xmlChar *
+                                                        namespaceURI,
+                                                        const xmlChar *
+                                                        content);
+
+/*
+ * PI's
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartPI(xmlTextWriterPtr writer,
+                             const xmlChar * target);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndPI(xmlTextWriterPtr writer);
+
+/*
+ * PI conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer,
+                                   const xmlChar * target,
+                                   const char *format, ...)
+				   LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer,
+                                    const xmlChar * target,
+                                    const char *format, va_list argptr)
+				    LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWritePI(xmlTextWriterPtr writer,
+                             const xmlChar * target,
+                             const xmlChar * content);
+
+/**
+ * xmlTextWriterWriteProcessingInstruction:
+ *
+ * This macro maps to xmlTextWriterWritePI
+ */
+#define xmlTextWriterWriteProcessingInstruction xmlTextWriterWritePI
+
+/*
+ * CDATA
+ */
+    XMLPUBFUN int XMLCALL xmlTextWriterStartCDATA(xmlTextWriterPtr writer);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndCDATA(xmlTextWriterPtr writer);
+
+/*
+ * CDATA conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer,
+                                      const char *format, ...)
+				      LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer,
+                                       const char *format, va_list argptr)
+				       LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteCDATA(xmlTextWriterPtr writer,
+                                const xmlChar * content);
+
+/*
+ * DTD
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTD(xmlTextWriterPtr writer,
+                              const xmlChar * name,
+                              const xmlChar * pubid,
+                              const xmlChar * sysid);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTD(xmlTextWriterPtr writer);
+
+/*
+ * DTD conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTD(xmlTextWriterPtr writer,
+                                    const xmlChar * name,
+                                    const xmlChar * pubid,
+                                    const xmlChar * sysid,
+                                    const char *format, ...)
+				    LIBXML_ATTR_FORMAT(5,6);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer,
+                                     const xmlChar * name,
+                                     const xmlChar * pubid,
+                                     const xmlChar * sysid,
+                                     const char *format, va_list argptr)
+				     LIBXML_ATTR_FORMAT(5,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTD(xmlTextWriterPtr writer,
+                              const xmlChar * name,
+                              const xmlChar * pubid,
+                              const xmlChar * sysid,
+                              const xmlChar * subset);
+
+/**
+ * xmlTextWriterWriteDocType:
+ *
+ * this macro maps to xmlTextWriterWriteDTD
+ */
+#define xmlTextWriterWriteDocType xmlTextWriterWriteDTD
+
+/*
+ * DTD element definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTDElement(xmlTextWriterPtr writer,
+                                     const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTDElement(xmlTextWriterPtr
+                                                     writer);
+
+/*
+ * DTD element definition conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer,
+                                           const xmlChar * name,
+                                           const char *format, ...)
+					   LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer,
+                                            const xmlChar * name,
+                                            const char *format,
+                                            va_list argptr)
+					    LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDElement(xmlTextWriterPtr
+                                                       writer,
+                                                       const xmlChar *
+                                                       name,
+                                                       const xmlChar *
+                                                       content);
+
+/*
+ * DTD attribute list definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTDAttlist(xmlTextWriterPtr writer,
+                                     const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTDAttlist(xmlTextWriterPtr
+                                                     writer);
+
+/*
+ * DTD attribute list definition conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer,
+                                           const xmlChar * name,
+                                           const char *format, ...)
+					   LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer,
+                                            const xmlChar * name,
+                                            const char *format,
+                                            va_list argptr)
+					    LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr
+                                                       writer,
+                                                       const xmlChar *
+                                                       name,
+                                                       const xmlChar *
+                                                       content);
+
+/*
+ * DTD entity definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTDEntity(xmlTextWriterPtr writer,
+                                    int pe, const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTDEntity(xmlTextWriterPtr
+                                                    writer);
+
+/*
+ * DTD entity definition conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriterPtr writer,
+                                                  int pe,
+                                                  const xmlChar * name,
+                                                  const char *format, ...)
+						  LIBXML_ATTR_FORMAT(4,5);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer,
+                                                   int pe,
+                                                   const xmlChar * name,
+                                                   const char *format,
+                                                   va_list argptr)
+						   LIBXML_ATTR_FORMAT(4,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer,
+                                            int pe,
+                                            const xmlChar * name,
+                                            const xmlChar * content);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDExternalEntity(xmlTextWriterPtr writer,
+                                            int pe,
+                                            const xmlChar * name,
+                                            const xmlChar * pubid,
+                                            const xmlChar * sysid,
+                                            const xmlChar * ndataid);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriterPtr
+                                                    writer,
+                                                    const xmlChar * pubid,
+                                                    const xmlChar * sysid,
+                                                    const xmlChar *
+                                                    ndataid);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDEntity(xmlTextWriterPtr
+                                                      writer, int pe,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      pubid,
+                                                      const xmlChar *
+                                                      sysid,
+                                                      const xmlChar *
+                                                      ndataid,
+                                                      const xmlChar *
+                                                      content);
+
+/*
+ * DTD notation definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDNotation(xmlTextWriterPtr writer,
+                                      const xmlChar * name,
+                                      const xmlChar * pubid,
+                                      const xmlChar * sysid);
+
+/*
+ * Indentation
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterSetIndent(xmlTextWriterPtr writer, int indent);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterSetIndentString(xmlTextWriterPtr writer,
+                                     const xmlChar * str);
+
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterSetQuoteChar(xmlTextWriterPtr writer, xmlChar quotechar);
+
+
+/*
+ * misc
+ */
+    XMLPUBFUN int XMLCALL xmlTextWriterFlush(xmlTextWriterPtr writer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_WRITER_ENABLED */
+
+#endif                          /* __XML_XMLWRITER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpath.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpath.h
new file mode 100644
index 0000000..539593f
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpath.h
@@ -0,0 +1,564 @@
+/*
+ * Summary: XML Path Language implementation
+ * Description: API for the XML Path Language implementation
+ *
+ * XML Path Language implementation
+ * XPath is a language for addressing parts of an XML document,
+ * designed to be used by both XSLT and XPointer
+ *     http://www.w3.org/TR/xpath
+ *
+ * Implements
+ * W3C Recommendation 16 November 1999
+ *     http://www.w3.org/TR/1999/REC-xpath-19991116
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XPATH_H__
+#define __XML_XPATH_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_XPATH_ENABLED
+
+#include <libxml/xmlerror.h>
+#include <libxml/tree.h>
+#include <libxml/hash.h>
+#endif /* LIBXML_XPATH_ENABLED */
+
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+#ifdef __cplusplus
+extern "C" {
+#endif
+#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED */
+
+#ifdef LIBXML_XPATH_ENABLED
+
+typedef struct _xmlXPathContext xmlXPathContext;
+typedef xmlXPathContext *xmlXPathContextPtr;
+typedef struct _xmlXPathParserContext xmlXPathParserContext;
+typedef xmlXPathParserContext *xmlXPathParserContextPtr;
+
+/**
+ * The set of XPath error codes.
+ */
+
+typedef enum {
+    XPATH_EXPRESSION_OK = 0,
+    XPATH_NUMBER_ERROR,
+    XPATH_UNFINISHED_LITERAL_ERROR,
+    XPATH_START_LITERAL_ERROR,
+    XPATH_VARIABLE_REF_ERROR,
+    XPATH_UNDEF_VARIABLE_ERROR,
+    XPATH_INVALID_PREDICATE_ERROR,
+    XPATH_EXPR_ERROR,
+    XPATH_UNCLOSED_ERROR,
+    XPATH_UNKNOWN_FUNC_ERROR,
+    XPATH_INVALID_OPERAND,
+    XPATH_INVALID_TYPE,
+    XPATH_INVALID_ARITY,
+    XPATH_INVALID_CTXT_SIZE,
+    XPATH_INVALID_CTXT_POSITION,
+    XPATH_MEMORY_ERROR,
+    XPTR_SYNTAX_ERROR,
+    XPTR_RESOURCE_ERROR,
+    XPTR_SUB_RESOURCE_ERROR,
+    XPATH_UNDEF_PREFIX_ERROR,
+    XPATH_ENCODING_ERROR,
+    XPATH_INVALID_CHAR_ERROR,
+    XPATH_INVALID_CTXT,
+    XPATH_STACK_ERROR,
+    XPATH_FORBID_VARIABLE_ERROR,
+    XPATH_OP_LIMIT_EXCEEDED,
+    XPATH_RECURSION_LIMIT_EXCEEDED
+} xmlXPathError;
+
+/*
+ * A node-set (an unordered collection of nodes without duplicates).
+ */
+typedef struct _xmlNodeSet xmlNodeSet;
+typedef xmlNodeSet *xmlNodeSetPtr;
+struct _xmlNodeSet {
+    int nodeNr;			/* number of nodes in the set */
+    int nodeMax;		/* size of the array as allocated */
+    xmlNodePtr *nodeTab;	/* array of nodes in no particular order */
+    /* @@ with_ns to check whether namespace nodes should be looked at @@ */
+};
+
+/*
+ * An expression is evaluated to yield an object, which
+ * has one of the following four basic types:
+ *   - node-set
+ *   - boolean
+ *   - number
+ *   - string
+ *
+ * @@ XPointer will add more types !
+ */
+
+typedef enum {
+    XPATH_UNDEFINED = 0,
+    XPATH_NODESET = 1,
+    XPATH_BOOLEAN = 2,
+    XPATH_NUMBER = 3,
+    XPATH_STRING = 4,
+    XPATH_POINT = 5,
+    XPATH_RANGE = 6,
+    XPATH_LOCATIONSET = 7,
+    XPATH_USERS = 8,
+    XPATH_XSLT_TREE = 9  /* An XSLT value tree, non modifiable */
+} xmlXPathObjectType;
+
+typedef struct _xmlXPathObject xmlXPathObject;
+typedef xmlXPathObject *xmlXPathObjectPtr;
+struct _xmlXPathObject {
+    xmlXPathObjectType type;
+    xmlNodeSetPtr nodesetval;
+    int boolval;
+    double floatval;
+    xmlChar *stringval;
+    void *user;
+    int index;
+    void *user2;
+    int index2;
+};
+
+/**
+ * xmlXPathConvertFunc:
+ * @obj:  an XPath object
+ * @type:  the number of the target type
+ *
+ * A conversion function is associated to a type and used to cast
+ * the new type to primitive values.
+ *
+ * Returns -1 in case of error, 0 otherwise
+ */
+typedef int (*xmlXPathConvertFunc) (xmlXPathObjectPtr obj, int type);
+
+/*
+ * Extra type: a name and a conversion function.
+ */
+
+typedef struct _xmlXPathType xmlXPathType;
+typedef xmlXPathType *xmlXPathTypePtr;
+struct _xmlXPathType {
+    const xmlChar         *name;		/* the type name */
+    xmlXPathConvertFunc func;		/* the conversion function */
+};
+
+/*
+ * Extra variable: a name and a value.
+ */
+
+typedef struct _xmlXPathVariable xmlXPathVariable;
+typedef xmlXPathVariable *xmlXPathVariablePtr;
+struct _xmlXPathVariable {
+    const xmlChar       *name;		/* the variable name */
+    xmlXPathObjectPtr value;		/* the value */
+};
+
+/**
+ * xmlXPathEvalFunc:
+ * @ctxt: an XPath parser context
+ * @nargs: the number of arguments passed to the function
+ *
+ * An XPath evaluation function, the parameters are on the XPath context stack.
+ */
+
+typedef void (*xmlXPathEvalFunc)(xmlXPathParserContextPtr ctxt,
+	                         int nargs);
+
+/*
+ * Extra function: a name and a evaluation function.
+ */
+
+typedef struct _xmlXPathFunct xmlXPathFunct;
+typedef xmlXPathFunct *xmlXPathFuncPtr;
+struct _xmlXPathFunct {
+    const xmlChar      *name;		/* the function name */
+    xmlXPathEvalFunc func;		/* the evaluation function */
+};
+
+/**
+ * xmlXPathAxisFunc:
+ * @ctxt:  the XPath interpreter context
+ * @cur:  the previous node being explored on that axis
+ *
+ * An axis traversal function. To traverse an axis, the engine calls
+ * the first time with cur == NULL and repeat until the function returns
+ * NULL indicating the end of the axis traversal.
+ *
+ * Returns the next node in that axis or NULL if at the end of the axis.
+ */
+
+typedef xmlXPathObjectPtr (*xmlXPathAxisFunc) (xmlXPathParserContextPtr ctxt,
+				 xmlXPathObjectPtr cur);
+
+/*
+ * Extra axis: a name and an axis function.
+ */
+
+typedef struct _xmlXPathAxis xmlXPathAxis;
+typedef xmlXPathAxis *xmlXPathAxisPtr;
+struct _xmlXPathAxis {
+    const xmlChar      *name;		/* the axis name */
+    xmlXPathAxisFunc func;		/* the search function */
+};
+
+/**
+ * xmlXPathFunction:
+ * @ctxt:  the XPath interprestation context
+ * @nargs:  the number of arguments
+ *
+ * An XPath function.
+ * The arguments (if any) are popped out from the context stack
+ * and the result is pushed on the stack.
+ */
+
+typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs);
+
+/*
+ * Function and Variable Lookup.
+ */
+
+/**
+ * xmlXPathVariableLookupFunc:
+ * @ctxt:  an XPath context
+ * @name:  name of the variable
+ * @ns_uri:  the namespace name hosting this variable
+ *
+ * Prototype for callbacks used to plug variable lookup in the XPath
+ * engine.
+ *
+ * Returns the XPath object value or NULL if not found.
+ */
+typedef xmlXPathObjectPtr (*xmlXPathVariableLookupFunc) (void *ctxt,
+                                         const xmlChar *name,
+                                         const xmlChar *ns_uri);
+
+/**
+ * xmlXPathFuncLookupFunc:
+ * @ctxt:  an XPath context
+ * @name:  name of the function
+ * @ns_uri:  the namespace name hosting this function
+ *
+ * Prototype for callbacks used to plug function lookup in the XPath
+ * engine.
+ *
+ * Returns the XPath function or NULL if not found.
+ */
+typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt,
+					 const xmlChar *name,
+					 const xmlChar *ns_uri);
+
+/**
+ * xmlXPathFlags:
+ * Flags for XPath engine compilation and runtime
+ */
+/**
+ * XML_XPATH_CHECKNS:
+ *
+ * check namespaces at compilation
+ */
+#define XML_XPATH_CHECKNS (1<<0)
+/**
+ * XML_XPATH_NOVAR:
+ *
+ * forbid variables in expression
+ */
+#define XML_XPATH_NOVAR	  (1<<1)
+
+/**
+ * xmlXPathContext:
+ *
+ * Expression evaluation occurs with respect to a context.
+ * he context consists of:
+ *    - a node (the context node)
+ *    - a node list (the context node list)
+ *    - a set of variable bindings
+ *    - a function library
+ *    - the set of namespace declarations in scope for the expression
+ * Following the switch to hash tables, this need to be trimmed up at
+ * the next binary incompatible release.
+ * The node may be modified when the context is passed to libxml2
+ * for an XPath evaluation so you may need to initialize it again
+ * before the next call.
+ */
+
+struct _xmlXPathContext {
+    xmlDocPtr doc;			/* The current document */
+    xmlNodePtr node;			/* The current node */
+
+    int nb_variables_unused;		/* unused (hash table) */
+    int max_variables_unused;		/* unused (hash table) */
+    xmlHashTablePtr varHash;		/* Hash table of defined variables */
+
+    int nb_types;			/* number of defined types */
+    int max_types;			/* max number of types */
+    xmlXPathTypePtr types;		/* Array of defined types */
+
+    int nb_funcs_unused;		/* unused (hash table) */
+    int max_funcs_unused;		/* unused (hash table) */
+    xmlHashTablePtr funcHash;		/* Hash table of defined funcs */
+
+    int nb_axis;			/* number of defined axis */
+    int max_axis;			/* max number of axis */
+    xmlXPathAxisPtr axis;		/* Array of defined axis */
+
+    /* the namespace nodes of the context node */
+    xmlNsPtr *namespaces;		/* Array of namespaces */
+    int nsNr;				/* number of namespace in scope */
+    void *user;				/* function to free */
+
+    /* extra variables */
+    int contextSize;			/* the context size */
+    int proximityPosition;		/* the proximity position */
+
+    /* extra stuff for XPointer */
+    int xptr;				/* is this an XPointer context? */
+    xmlNodePtr here;			/* for here() */
+    xmlNodePtr origin;			/* for origin() */
+
+    /* the set of namespace declarations in scope for the expression */
+    xmlHashTablePtr nsHash;		/* The namespaces hash table */
+    xmlXPathVariableLookupFunc varLookupFunc;/* variable lookup func */
+    void *varLookupData;		/* variable lookup data */
+
+    /* Possibility to link in an extra item */
+    void *extra;                        /* needed for XSLT */
+
+    /* The function name and URI when calling a function */
+    const xmlChar *function;
+    const xmlChar *functionURI;
+
+    /* function lookup function and data */
+    xmlXPathFuncLookupFunc funcLookupFunc;/* function lookup func */
+    void *funcLookupData;		/* function lookup data */
+
+    /* temporary namespace lists kept for walking the namespace axis */
+    xmlNsPtr *tmpNsList;		/* Array of namespaces */
+    int tmpNsNr;			/* number of namespaces in scope */
+
+    /* error reporting mechanism */
+    void *userData;                     /* user specific data block */
+    xmlStructuredErrorFunc error;       /* the callback in case of errors */
+    xmlError lastError;			/* the last error */
+    xmlNodePtr debugNode;		/* the source node XSLT */
+
+    /* dictionary */
+    xmlDictPtr dict;			/* dictionary if any */
+
+    int flags;				/* flags to control compilation */
+
+    /* Cache for reusal of XPath objects */
+    void *cache;
+
+    /* Resource limits */
+    unsigned long opLimit;
+    unsigned long opCount;
+    int depth;
+};
+
+/*
+ * The structure of a compiled expression form is not public.
+ */
+
+typedef struct _xmlXPathCompExpr xmlXPathCompExpr;
+typedef xmlXPathCompExpr *xmlXPathCompExprPtr;
+
+/**
+ * xmlXPathParserContext:
+ *
+ * An XPath parser context. It contains pure parsing information,
+ * an xmlXPathContext, and the stack of objects.
+ */
+struct _xmlXPathParserContext {
+    const xmlChar *cur;			/* the current char being parsed */
+    const xmlChar *base;			/* the full expression */
+
+    int error;				/* error code */
+
+    xmlXPathContextPtr  context;	/* the evaluation context */
+    xmlXPathObjectPtr     value;	/* the current value */
+    int                 valueNr;	/* number of values stacked */
+    int                valueMax;	/* max number of values stacked */
+    xmlXPathObjectPtr *valueTab;	/* stack of values */
+
+    xmlXPathCompExprPtr comp;		/* the precompiled expression */
+    int xptr;				/* it this an XPointer expression */
+    xmlNodePtr         ancestor;	/* used for walking preceding axis */
+
+    int              valueFrame;        /* used to limit Pop on the stack */
+};
+
+/************************************************************************
+ *									*
+ *			Public API					*
+ *									*
+ ************************************************************************/
+
+/**
+ * Objects and Nodesets handling
+ */
+
+XMLPUBVAR double xmlXPathNAN;
+XMLPUBVAR double xmlXPathPINF;
+XMLPUBVAR double xmlXPathNINF;
+
+/* These macros may later turn into functions */
+/**
+ * xmlXPathNodeSetGetLength:
+ * @ns:  a node-set
+ *
+ * Implement a functionality similar to the DOM NodeList.length.
+ *
+ * Returns the number of nodes in the node-set.
+ */
+#define xmlXPathNodeSetGetLength(ns) ((ns) ? (ns)->nodeNr : 0)
+/**
+ * xmlXPathNodeSetItem:
+ * @ns:  a node-set
+ * @index:  index of a node in the set
+ *
+ * Implements a functionality similar to the DOM NodeList.item().
+ *
+ * Returns the xmlNodePtr at the given @index in @ns or NULL if
+ *         @index is out of range (0 to length-1)
+ */
+#define xmlXPathNodeSetItem(ns, index)				\
+		((((ns) != NULL) &&				\
+		  ((index) >= 0) && ((index) < (ns)->nodeNr)) ?	\
+		 (ns)->nodeTab[(index)]				\
+		 : NULL)
+/**
+ * xmlXPathNodeSetIsEmpty:
+ * @ns: a node-set
+ *
+ * Checks whether @ns is empty or not.
+ *
+ * Returns %TRUE if @ns is an empty node-set.
+ */
+#define xmlXPathNodeSetIsEmpty(ns)                                      \
+    (((ns) == NULL) || ((ns)->nodeNr == 0) || ((ns)->nodeTab == NULL))
+
+
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeObject		(xmlXPathObjectPtr obj);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		    xmlXPathNodeSetCreate	(xmlNodePtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeNodeSetList	(xmlXPathObjectPtr obj);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeNodeSet		(xmlNodeSetPtr obj);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathObjectCopy		(xmlXPathObjectPtr val);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCmpNodes		(xmlNodePtr node1,
+						 xmlNodePtr node2);
+/**
+ * Conversion functions to basic types.
+ */
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastNumberToBoolean	(double val);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastStringToBoolean	(const xmlChar * val);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastNodeSetToBoolean(xmlNodeSetPtr ns);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastToBoolean	(xmlXPathObjectPtr val);
+
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastBooleanToNumber	(int val);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastStringToNumber	(const xmlChar * val);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastNodeToNumber	(xmlNodePtr node);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastNodeSetToNumber	(xmlNodeSetPtr ns);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastToNumber	(xmlXPathObjectPtr val);
+
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastBooleanToString	(int val);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastNumberToString	(double val);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastNodeToString	(xmlNodePtr node);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastNodeSetToString	(xmlNodeSetPtr ns);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastToString	(xmlXPathObjectPtr val);
+
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathConvertBoolean	(xmlXPathObjectPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathConvertNumber	(xmlXPathObjectPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathConvertString	(xmlXPathObjectPtr val);
+
+/**
+ * Context handling.
+ */
+XMLPUBFUN xmlXPathContextPtr XMLCALL
+		    xmlXPathNewContext		(xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeContext		(xmlXPathContextPtr ctxt);
+XMLPUBFUN int XMLCALL
+		    xmlXPathContextSetCache(xmlXPathContextPtr ctxt,
+				            int active,
+					    int value,
+					    int options);
+/**
+ * Evaluation functions.
+ */
+XMLPUBFUN long XMLCALL
+		    xmlXPathOrderDocElems	(xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		    xmlXPathSetContextNode	(xmlNodePtr node,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathNodeEval		(xmlNodePtr node,
+						 const xmlChar *str,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathEval		(const xmlChar *str,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathEvalExpression	(const xmlChar *str,
+						 xmlXPathContextPtr ctxt);
+XMLPUBFUN int XMLCALL
+		    xmlXPathEvalPredicate	(xmlXPathContextPtr ctxt,
+						 xmlXPathObjectPtr res);
+/**
+ * Separate compilation/evaluation entry points.
+ */
+XMLPUBFUN xmlXPathCompExprPtr XMLCALL
+		    xmlXPathCompile		(const xmlChar *str);
+XMLPUBFUN xmlXPathCompExprPtr XMLCALL
+		    xmlXPathCtxtCompile		(xmlXPathContextPtr ctxt,
+						 const xmlChar *str);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathCompiledEval	(xmlXPathCompExprPtr comp,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp,
+						 xmlXPathContextPtr ctxt);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeCompExpr	(xmlXPathCompExprPtr comp);
+#endif /* LIBXML_XPATH_ENABLED */
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN void XMLCALL
+		    xmlXPathInit		(void);
+XMLPUBFUN int XMLCALL
+		xmlXPathIsNaN	(double val);
+XMLPUBFUN int XMLCALL
+		xmlXPathIsInf	(double val);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED*/
+#endif /* ! __XML_XPATH_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpathInternals.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpathInternals.h
new file mode 100644
index 0000000..76a6b48
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpathInternals.h
@@ -0,0 +1,632 @@
+/*
+ * Summary: internal interfaces for XML Path Language implementation
+ * Description: internal interfaces for XML Path Language implementation
+ *              used to build new modules on top of XPath like XPointer and
+ *              XSLT
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XPATH_INTERNALS_H__
+#define __XML_XPATH_INTERNALS_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/xpath.h>
+
+#ifdef LIBXML_XPATH_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/************************************************************************
+ *									*
+ *			Helpers						*
+ *									*
+ ************************************************************************/
+
+/*
+ * Many of these macros may later turn into functions. They
+ * shouldn't be used in #ifdef's preprocessor instructions.
+ */
+/**
+ * xmlXPathSetError:
+ * @ctxt:  an XPath parser context
+ * @err:  an xmlXPathError code
+ *
+ * Raises an error.
+ */
+#define xmlXPathSetError(ctxt, err)					\
+    { xmlXPatherror((ctxt), __FILE__, __LINE__, (err));			\
+      if ((ctxt) != NULL) (ctxt)->error = (err); }
+
+/**
+ * xmlXPathSetArityError:
+ * @ctxt:  an XPath parser context
+ *
+ * Raises an XPATH_INVALID_ARITY error.
+ */
+#define xmlXPathSetArityError(ctxt)					\
+    xmlXPathSetError((ctxt), XPATH_INVALID_ARITY)
+
+/**
+ * xmlXPathSetTypeError:
+ * @ctxt:  an XPath parser context
+ *
+ * Raises an XPATH_INVALID_TYPE error.
+ */
+#define xmlXPathSetTypeError(ctxt)					\
+    xmlXPathSetError((ctxt), XPATH_INVALID_TYPE)
+
+/**
+ * xmlXPathGetError:
+ * @ctxt:  an XPath parser context
+ *
+ * Get the error code of an XPath context.
+ *
+ * Returns the context error.
+ */
+#define xmlXPathGetError(ctxt)	  ((ctxt)->error)
+
+/**
+ * xmlXPathCheckError:
+ * @ctxt:  an XPath parser context
+ *
+ * Check if an XPath error was raised.
+ *
+ * Returns true if an error has been raised, false otherwise.
+ */
+#define xmlXPathCheckError(ctxt)  ((ctxt)->error != XPATH_EXPRESSION_OK)
+
+/**
+ * xmlXPathGetDocument:
+ * @ctxt:  an XPath parser context
+ *
+ * Get the document of an XPath context.
+ *
+ * Returns the context document.
+ */
+#define xmlXPathGetDocument(ctxt)	((ctxt)->context->doc)
+
+/**
+ * xmlXPathGetContextNode:
+ * @ctxt: an XPath parser context
+ *
+ * Get the context node of an XPath context.
+ *
+ * Returns the context node.
+ */
+#define xmlXPathGetContextNode(ctxt)	((ctxt)->context->node)
+
+XMLPUBFUN int XMLCALL
+		xmlXPathPopBoolean	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN double XMLCALL
+		xmlXPathPopNumber	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlXPathPopString	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathPopNodeSet	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void * XMLCALL
+		xmlXPathPopExternal	(xmlXPathParserContextPtr ctxt);
+
+/**
+ * xmlXPathReturnBoolean:
+ * @ctxt:  an XPath parser context
+ * @val:  a boolean
+ *
+ * Pushes the boolean @val on the context stack.
+ */
+#define xmlXPathReturnBoolean(ctxt, val)				\
+    valuePush((ctxt), xmlXPathNewBoolean(val))
+
+/**
+ * xmlXPathReturnTrue:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes true on the context stack.
+ */
+#define xmlXPathReturnTrue(ctxt)   xmlXPathReturnBoolean((ctxt), 1)
+
+/**
+ * xmlXPathReturnFalse:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes false on the context stack.
+ */
+#define xmlXPathReturnFalse(ctxt)  xmlXPathReturnBoolean((ctxt), 0)
+
+/**
+ * xmlXPathReturnNumber:
+ * @ctxt:  an XPath parser context
+ * @val:  a double
+ *
+ * Pushes the double @val on the context stack.
+ */
+#define xmlXPathReturnNumber(ctxt, val)					\
+    valuePush((ctxt), xmlXPathNewFloat(val))
+
+/**
+ * xmlXPathReturnString:
+ * @ctxt:  an XPath parser context
+ * @str:  a string
+ *
+ * Pushes the string @str on the context stack.
+ */
+#define xmlXPathReturnString(ctxt, str)					\
+    valuePush((ctxt), xmlXPathWrapString(str))
+
+/**
+ * xmlXPathReturnEmptyString:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes an empty string on the stack.
+ */
+#define xmlXPathReturnEmptyString(ctxt)					\
+    valuePush((ctxt), xmlXPathNewCString(""))
+
+/**
+ * xmlXPathReturnNodeSet:
+ * @ctxt:  an XPath parser context
+ * @ns:  a node-set
+ *
+ * Pushes the node-set @ns on the context stack.
+ */
+#define xmlXPathReturnNodeSet(ctxt, ns)					\
+    valuePush((ctxt), xmlXPathWrapNodeSet(ns))
+
+/**
+ * xmlXPathReturnEmptyNodeSet:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes an empty node-set on the context stack.
+ */
+#define xmlXPathReturnEmptyNodeSet(ctxt)				\
+    valuePush((ctxt), xmlXPathNewNodeSet(NULL))
+
+/**
+ * xmlXPathReturnExternal:
+ * @ctxt:  an XPath parser context
+ * @val:  user data
+ *
+ * Pushes user data on the context stack.
+ */
+#define xmlXPathReturnExternal(ctxt, val)				\
+    valuePush((ctxt), xmlXPathWrapExternal(val))
+
+/**
+ * xmlXPathStackIsNodeSet:
+ * @ctxt: an XPath parser context
+ *
+ * Check if the current value on the XPath stack is a node set or
+ * an XSLT value tree.
+ *
+ * Returns true if the current object on the stack is a node-set.
+ */
+#define xmlXPathStackIsNodeSet(ctxt)					\
+    (((ctxt)->value != NULL)						\
+     && (((ctxt)->value->type == XPATH_NODESET)				\
+         || ((ctxt)->value->type == XPATH_XSLT_TREE)))
+
+/**
+ * xmlXPathStackIsExternal:
+ * @ctxt: an XPath parser context
+ *
+ * Checks if the current value on the XPath stack is an external
+ * object.
+ *
+ * Returns true if the current object on the stack is an external
+ * object.
+ */
+#define xmlXPathStackIsExternal(ctxt)					\
+	((ctxt->value != NULL) && (ctxt->value->type == XPATH_USERS))
+
+/**
+ * xmlXPathEmptyNodeSet:
+ * @ns:  a node-set
+ *
+ * Empties a node-set.
+ */
+#define xmlXPathEmptyNodeSet(ns)					\
+    { while ((ns)->nodeNr > 0) (ns)->nodeTab[--(ns)->nodeNr] = NULL; }
+
+/**
+ * CHECK_ERROR:
+ *
+ * Macro to return from the function if an XPath error was detected.
+ */
+#define CHECK_ERROR							\
+    if (ctxt->error != XPATH_EXPRESSION_OK) return
+
+/**
+ * CHECK_ERROR0:
+ *
+ * Macro to return 0 from the function if an XPath error was detected.
+ */
+#define CHECK_ERROR0							\
+    if (ctxt->error != XPATH_EXPRESSION_OK) return(0)
+
+/**
+ * XP_ERROR:
+ * @X:  the error code
+ *
+ * Macro to raise an XPath error and return.
+ */
+#define XP_ERROR(X)							\
+    { xmlXPathErr(ctxt, X); return; }
+
+/**
+ * XP_ERROR0:
+ * @X:  the error code
+ *
+ * Macro to raise an XPath error and return 0.
+ */
+#define XP_ERROR0(X)							\
+    { xmlXPathErr(ctxt, X); return(0); }
+
+/**
+ * CHECK_TYPE:
+ * @typeval:  the XPath type
+ *
+ * Macro to check that the value on top of the XPath stack is of a given
+ * type.
+ */
+#define CHECK_TYPE(typeval)						\
+    if ((ctxt->value == NULL) || (ctxt->value->type != typeval))	\
+        XP_ERROR(XPATH_INVALID_TYPE)
+
+/**
+ * CHECK_TYPE0:
+ * @typeval:  the XPath type
+ *
+ * Macro to check that the value on top of the XPath stack is of a given
+ * type. Return(0) in case of failure
+ */
+#define CHECK_TYPE0(typeval)						\
+    if ((ctxt->value == NULL) || (ctxt->value->type != typeval))	\
+        XP_ERROR0(XPATH_INVALID_TYPE)
+
+/**
+ * CHECK_ARITY:
+ * @x:  the number of expected args
+ *
+ * Macro to check that the number of args passed to an XPath function matches.
+ */
+#define CHECK_ARITY(x)							\
+    if (ctxt == NULL) return;						\
+    if (nargs != (x))							\
+        XP_ERROR(XPATH_INVALID_ARITY);					\
+    if (ctxt->valueNr < ctxt->valueFrame + (x))				\
+        XP_ERROR(XPATH_STACK_ERROR);
+
+/**
+ * CAST_TO_STRING:
+ *
+ * Macro to try to cast the value on the top of the XPath stack to a string.
+ */
+#define CAST_TO_STRING							\
+    if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING))	\
+        xmlXPathStringFunction(ctxt, 1);
+
+/**
+ * CAST_TO_NUMBER:
+ *
+ * Macro to try to cast the value on the top of the XPath stack to a number.
+ */
+#define CAST_TO_NUMBER							\
+    if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_NUMBER))	\
+        xmlXPathNumberFunction(ctxt, 1);
+
+/**
+ * CAST_TO_BOOLEAN:
+ *
+ * Macro to try to cast the value on the top of the XPath stack to a boolean.
+ */
+#define CAST_TO_BOOLEAN							\
+    if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_BOOLEAN))	\
+        xmlXPathBooleanFunction(ctxt, 1);
+
+/*
+ * Variable Lookup forwarding.
+ */
+
+XMLPUBFUN void XMLCALL
+	xmlXPathRegisterVariableLookup	(xmlXPathContextPtr ctxt,
+					 xmlXPathVariableLookupFunc f,
+					 void *data);
+
+/*
+ * Function Lookup forwarding.
+ */
+
+XMLPUBFUN void XMLCALL
+	    xmlXPathRegisterFuncLookup	(xmlXPathContextPtr ctxt,
+					 xmlXPathFuncLookupFunc f,
+					 void *funcCtxt);
+
+/*
+ * Error reporting.
+ */
+XMLPUBFUN void XMLCALL
+		xmlXPatherror	(xmlXPathParserContextPtr ctxt,
+				 const char *file,
+				 int line,
+				 int no);
+
+XMLPUBFUN void XMLCALL
+		xmlXPathErr	(xmlXPathParserContextPtr ctxt,
+				 int error);
+
+#ifdef LIBXML_DEBUG_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlXPathDebugDumpObject	(FILE *output,
+					 xmlXPathObjectPtr cur,
+					 int depth);
+XMLPUBFUN void XMLCALL
+	    xmlXPathDebugDumpCompExpr(FILE *output,
+					 xmlXPathCompExprPtr comp,
+					 int depth);
+#endif
+/**
+ * NodeSet handling.
+ */
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetContains		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathDifference		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathIntersection		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathDistinctSorted		(xmlNodeSetPtr nodes);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathDistinct		(xmlNodeSetPtr nodes);
+
+XMLPUBFUN int XMLCALL
+		xmlXPathHasSameNodes		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeLeadingSorted	(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathLeadingSorted		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeLeading		(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathLeading			(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeTrailingSorted	(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathTrailingSorted		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeTrailing		(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathTrailing		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+
+/**
+ * Extending a context.
+ */
+
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterNs		(xmlXPathContextPtr ctxt,
+						 const xmlChar *prefix,
+						 const xmlChar *ns_uri);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlXPathNsLookup		(xmlXPathContextPtr ctxt,
+						 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisteredNsCleanup	(xmlXPathContextPtr ctxt);
+
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterFunc		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 xmlXPathFunction f);
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterFuncNS		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri,
+						 xmlXPathFunction f);
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterVariable	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 xmlXPathObjectPtr value);
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterVariableNS	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri,
+						 xmlXPathObjectPtr value);
+XMLPUBFUN xmlXPathFunction XMLCALL
+		xmlXPathFunctionLookup		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name);
+XMLPUBFUN xmlXPathFunction XMLCALL
+		xmlXPathFunctionLookupNS	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisteredFuncsCleanup	(xmlXPathContextPtr ctxt);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathVariableLookup		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathVariableLookupNS	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisteredVariablesCleanup(xmlXPathContextPtr ctxt);
+
+/**
+ * Utilities to extend XPath.
+ */
+XMLPUBFUN xmlXPathParserContextPtr XMLCALL
+		  xmlXPathNewParserContext	(const xmlChar *str,
+						 xmlXPathContextPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlXPathFreeParserContext	(xmlXPathParserContextPtr ctxt);
+
+/* TODO: remap to xmlXPathValuePop and Push. */
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		valuePop			(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN int XMLCALL
+		valuePush			(xmlXPathParserContextPtr ctxt,
+						 xmlXPathObjectPtr value);
+
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewString		(const xmlChar *val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewCString		(const char *val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapString		(xmlChar *val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapCString		(char * val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewFloat		(double val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewBoolean		(int val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewNodeSet		(xmlNodePtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewValueTree		(xmlNodePtr val);
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetAdd		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetAddUnique	(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetAddNs		(xmlNodeSetPtr cur,
+						 xmlNodePtr node,
+						 xmlNsPtr ns);
+XMLPUBFUN void XMLCALL
+		xmlXPathNodeSetSort		(xmlNodeSetPtr set);
+
+XMLPUBFUN void XMLCALL
+		xmlXPathRoot			(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlXPathEvalExpr		(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlXPathParseName		(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlXPathParseNCName		(xmlXPathParserContextPtr ctxt);
+
+/*
+ * Existing functions.
+ */
+XMLPUBFUN double XMLCALL
+		xmlXPathStringEvalNumber	(const xmlChar *str);
+XMLPUBFUN int XMLCALL
+		xmlXPathEvaluatePredicateResult (xmlXPathParserContextPtr ctxt,
+						 xmlXPathObjectPtr res);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisterAllFunctions	(xmlXPathContextPtr ctxt);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeSetMerge		(xmlNodeSetPtr val1,
+						 xmlNodeSetPtr val2);
+XMLPUBFUN void XMLCALL
+		xmlXPathNodeSetDel		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN void XMLCALL
+		xmlXPathNodeSetRemove		(xmlNodeSetPtr cur,
+						 int val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewNodeSetList		(xmlNodeSetPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapNodeSet		(xmlNodeSetPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapExternal		(void *val);
+
+XMLPUBFUN int XMLCALL xmlXPathEqualValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN int XMLCALL xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN int XMLCALL xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict);
+XMLPUBFUN void XMLCALL xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathAddValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathSubValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathMultValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathDivValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathModValues(xmlXPathParserContextPtr ctxt);
+
+XMLPUBFUN int XMLCALL xmlXPathIsNodeType(const xmlChar *name);
+
+/*
+ * Some of the axis navigation routines.
+ */
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextSelf(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextChild(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextDescendant(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextDescendantOrSelf(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextParent(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextAncestorOrSelf(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextFollowingSibling(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextNamespace(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextAttribute(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextAncestor(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextPrecedingSibling(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+/*
+ * The official core of XPath functions.
+ */
+XMLPUBFUN void XMLCALL xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNamespaceURIFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathFloorFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathCeilingFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathRoundFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathBooleanFunction(xmlXPathParserContextPtr ctxt, int nargs);
+
+/**
+ * Really internal functions
+ */
+XMLPUBFUN void XMLCALL xmlXPathNodeSetFreeNs(xmlNsPtr ns);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPATH_ENABLED */
+#endif /* ! __XML_XPATH_INTERNALS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpointer.h b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpointer.h
new file mode 100644
index 0000000..b99112b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/include/libxml2/libxml/xpointer.h
@@ -0,0 +1,114 @@
+/*
+ * Summary: API to handle XML Pointers
+ * Description: API to handle XML Pointers
+ * Base implementation was made accordingly to
+ * W3C Candidate Recommendation 7 June 2000
+ * http://www.w3.org/TR/2000/CR-xptr-20000607
+ *
+ * Added support for the element() scheme described in:
+ * W3C Proposed Recommendation 13 November 2002
+ * http://www.w3.org/TR/2002/PR-xptr-element-20021113/
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XPTR_H__
+#define __XML_XPTR_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_XPTR_ENABLED
+
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * A Location Set
+ */
+typedef struct _xmlLocationSet xmlLocationSet;
+typedef xmlLocationSet *xmlLocationSetPtr;
+struct _xmlLocationSet {
+    int locNr;		      /* number of locations in the set */
+    int locMax;		      /* size of the array as allocated */
+    xmlXPathObjectPtr *locTab;/* array of locations */
+};
+
+/*
+ * Handling of location sets.
+ */
+
+XMLPUBFUN xmlLocationSetPtr XMLCALL
+		    xmlXPtrLocationSetCreate	(xmlXPathObjectPtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrFreeLocationSet	(xmlLocationSetPtr obj);
+XMLPUBFUN xmlLocationSetPtr XMLCALL
+		    xmlXPtrLocationSetMerge	(xmlLocationSetPtr val1,
+						 xmlLocationSetPtr val2);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRange		(xmlNodePtr start,
+						 int startindex,
+						 xmlNodePtr end,
+						 int endindex);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangePoints	(xmlXPathObjectPtr start,
+						 xmlXPathObjectPtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangeNodePoint	(xmlNodePtr start,
+						 xmlXPathObjectPtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangePointNode	(xmlXPathObjectPtr start,
+						 xmlNodePtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangeNodes	(xmlNodePtr start,
+						 xmlNodePtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewLocationSetNodes	(xmlNodePtr start,
+						 xmlNodePtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewLocationSetNodeSet(xmlNodeSetPtr set);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangeNodeObject	(xmlNodePtr start,
+						 xmlXPathObjectPtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewCollapsedRange	(xmlNodePtr start);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrLocationSetAdd	(xmlLocationSetPtr cur,
+						 xmlXPathObjectPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrWrapLocationSet	(xmlLocationSetPtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrLocationSetDel	(xmlLocationSetPtr cur,
+						 xmlXPathObjectPtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrLocationSetRemove	(xmlLocationSetPtr cur,
+						 int val);
+
+/*
+ * Functions.
+ */
+XMLPUBFUN xmlXPathContextPtr XMLCALL
+		    xmlXPtrNewContext		(xmlDocPtr doc,
+						 xmlNodePtr here,
+						 xmlNodePtr origin);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrEval			(const xmlChar *str,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrRangeToFunction	(xmlXPathParserContextPtr ctxt,
+						 int nargs);
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlXPtrBuildNodeList	(xmlXPathObjectPtr obj);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrEvalRangePredicate	(xmlXPathParserContextPtr ctxt);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPTR_ENABLED */
+#endif /* __XML_XPTR_H__ */
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppConfig.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppConfig.cmake
new file mode 100644
index 0000000..814f20b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppConfig.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/libdbcpppTargets.cmake")
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppConfigVersion.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppConfigVersion.cmake
new file mode 100644
index 0000000..32911d9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppConfigVersion.cmake
@@ -0,0 +1,48 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "0.1.0")
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  # Package version must be in the requested version range
+  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
+      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  endif()
+else()
+  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppTargets-release.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppTargets-release.cmake
new file mode 100644
index 0000000..125bba5
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppTargets-release.cmake
@@ -0,0 +1,39 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "libxmlmm" for configuration "Release"
+set_property(TARGET libxmlmm APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(libxmlmm PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libxmlmm.a"
+  )
+
+list(APPEND _cmake_import_check_targets libxmlmm )
+list(APPEND _cmake_import_check_files_for_libxmlmm "${_IMPORT_PREFIX}/lib/libxmlmm.a" )
+
+# Import target "LibXml2" for configuration "Release"
+set_property(TARGET LibXml2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2 PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libxml2.a"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2 )
+list(APPEND _cmake_import_check_files_for_LibXml2 "${_IMPORT_PREFIX}/lib/libxml2.a" )
+
+# Import target "libdbcppp" for configuration "Release"
+set_property(TARGET libdbcppp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(libdbcppp PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libdbcppp.a"
+  )
+
+list(APPEND _cmake_import_check_targets libdbcppp )
+list(APPEND _cmake_import_check_files_for_libdbcppp "${_IMPORT_PREFIX}/lib/libdbcppp.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppTargets.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppTargets.cmake
new file mode 100644
index 0000000..987aabd
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libdbcppp/libdbcpppTargets.cmake
@@ -0,0 +1,123 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS libxmlmm LibXml2 libdbcppp)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target libxmlmm
+add_library(libxmlmm STATIC IMPORTED)
+
+set_target_properties(libxmlmm PROPERTIES
+  INTERFACE_LINK_LIBRARIES "LibXml2"
+)
+
+# Create imported target LibXml2
+add_library(LibXml2 STATIC IMPORTED)
+
+set_target_properties(LibXml2 PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "LIBXML_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libxml2"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:dl>;\$<LINK_ONLY:m>;\$<LINK_ONLY:Threads::Threads>"
+)
+
+# Create imported target libdbcppp
+add_library(libdbcppp STATIC IMPORTED)
+
+set_target_properties(libdbcppp PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/"
+  INTERFACE_LINK_LIBRARIES "libxmlmm"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/libdbcpppTargets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-config-version.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-config-version.cmake
new file mode 100644
index 0000000..83f731d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-config-version.cmake
@@ -0,0 +1,88 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is equal to the requested version.
+# The tweak version component is ignored.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  message(AUTHOR_WARNING
+    "`find_package()` specify a version range but the version strategy "
+    "(ExactVersion) of the module `${PACKAGE_FIND_NAME}` is incompatible "
+    "with this request. Only the lower endpoint of the range will be used.")
+endif()
+
+set(PACKAGE_VERSION "2.9.10")
+
+if("2.9.10" MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)") # strip the tweak version
+  set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+  set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
+  set(CVF_VERSION_PATCH "${CMAKE_MATCH_3}")
+
+  if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+  endif()
+  if(NOT CVF_VERSION_MINOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
+  endif()
+  if(NOT CVF_VERSION_PATCH VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" CVF_VERSION_PATCH "${CVF_VERSION_PATCH}")
+  endif()
+
+  set(CVF_VERSION_NO_TWEAK "${CVF_VERSION_MAJOR}.${CVF_VERSION_MINOR}.${CVF_VERSION_PATCH}")
+else()
+  set(CVF_VERSION_NO_TWEAK "2.9.10")
+endif()
+
+if(PACKAGE_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)") # strip the tweak version
+  set(REQUESTED_VERSION_MAJOR "${CMAKE_MATCH_1}")
+  set(REQUESTED_VERSION_MINOR "${CMAKE_MATCH_2}")
+  set(REQUESTED_VERSION_PATCH "${CMAKE_MATCH_3}")
+
+  if(NOT REQUESTED_VERSION_MAJOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_MAJOR "${REQUESTED_VERSION_MAJOR}")
+  endif()
+  if(NOT REQUESTED_VERSION_MINOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_MINOR "${REQUESTED_VERSION_MINOR}")
+  endif()
+  if(NOT REQUESTED_VERSION_PATCH VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_PATCH "${REQUESTED_VERSION_PATCH}")
+  endif()
+
+  set(REQUESTED_VERSION_NO_TWEAK
+      "${REQUESTED_VERSION_MAJOR}.${REQUESTED_VERSION_MINOR}.${REQUESTED_VERSION_PATCH}")
+else()
+  set(REQUESTED_VERSION_NO_TWEAK "${PACKAGE_FIND_VERSION}")
+endif()
+
+if(REQUESTED_VERSION_NO_TWEAK STREQUAL CVF_VERSION_NO_TWEAK)
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+endif()
+
+if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+  set(PACKAGE_VERSION_EXACT TRUE)
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-config.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-config.cmake
new file mode 100644
index 0000000..8adce87
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-config.cmake
@@ -0,0 +1,160 @@
+# libxml2-config.cmake
+# --------------------
+#
+# Libxml2 cmake module.
+# This module sets the following variables:
+#
+# ::
+#
+#   LIBXML2_INCLUDE_DIR        - Directory where LibXml2 headers are located.
+#   LIBXML2_INCLUDE_DIRS       - list of the include directories needed to use LibXml2.
+#   LIBXML2_LIBRARY            - path to the LibXml2 library.
+#   LIBXML2_LIBRARIES          - xml2 libraries to link against.
+#   LIBXML2_DEFINITIONS        - the compiler switches required for using LibXml2.
+#   LIBXML2_VERSION_MAJOR      - The major version of libxml2.
+#   LIBXML2_VERSION_MINOR      - The minor version of libxml2.
+#   LIBXML2_VERSION_PATCH      - The patch version of libxml2.
+#   LIBXML2_VERSION_STRING     - version number as a string (ex: "2.3.4")
+#   LIBXML2_MODULES            - whether libxml2 has dso support
+#   LIBXML2_XMLLINT_EXECUTABLE - path to the XML checking tool xmllint coming with LibXml2
+
+include("${CMAKE_CURRENT_LIST_DIR}/libxml2-export.cmake")
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libxml2-config.cmake.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set(LIBXML2_VERSION_MAJOR  2)
+set(LIBXML2_VERSION_MINOR  9)
+set(LIBXML2_VERSION_PATCH  10)
+set(LIBXML2_VERSION_STRING "2.9.10")
+set(LIBXML2_INSTALL_PREFIX ${PACKAGE_PREFIX_DIR})
+set(LIBXML2_INCLUDE_DIR    ${PACKAGE_PREFIX_DIR}/include/libxml2)
+set(LIBXML2_LIBRARY_DIR    ${PACKAGE_PREFIX_DIR}/lib)
+
+macro(select_library_location target basename)
+  if(TARGET ${target})
+    foreach(property IN ITEMS IMPORTED_LOCATION IMPORTED_IMPLIB)
+      get_target_property(${basename}_${property}_DEBUG ${target} ${property}_DEBUG)
+      get_target_property(${basename}_${property}_MINSIZEREL ${target} ${property}_MINSIZEREL)
+      get_target_property(${basename}_${property}_RELEASE ${target} ${property}_RELEASE)
+      get_target_property(${basename}_${property}_RELWITHDEBINFO ${target} ${property}_RELWITHDEBINFO)
+
+      if(${basename}_${property}_DEBUG AND ${basename}_${property}_RELEASE)
+        set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELEASE})
+      elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_RELWITHDEBINFO)
+        set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELWITHDEBINFO})
+      elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_MINSIZEREL)
+        set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_MINSIZEREL})
+      elseif(${basename}_${property}_RELEASE)
+        set(${basename}_LIBRARY ${${basename}_${property}_RELEASE})
+      elseif(${basename}_${property}_RELWITHDEBINFO)
+        set(${basename}_LIBRARY ${${basename}_${property}_RELWITHDEBINFO})
+      elseif(${basename}_${property}_MINSIZEREL)
+        set(${basename}_LIBRARY ${${basename}_${property}_MINSIZEREL})
+      elseif(${basename}_${property}_DEBUG)
+        set(${basename}_LIBRARY ${${basename}_${property}_DEBUG})
+      endif()
+    endforeach()
+  endif()
+endmacro()
+
+macro(select_executable_location target basename)
+  if(TARGET ${target})
+    get_target_property(${basename}_IMPORTED_LOCATION_DEBUG ${target} IMPORTED_LOCATION_DEBUG)
+    get_target_property(${basename}_IMPORTED_LOCATION_MINSIZEREL ${target} IMPORTED_LOCATION_MINSIZEREL)
+    get_target_property(${basename}_IMPORTED_LOCATION_RELEASE ${target} IMPORTED_LOCATION_RELEASE)
+    get_target_property(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO ${target} IMPORTED_LOCATION_RELWITHDEBINFO)
+
+    if(${basename}_IMPORTED_LOCATION_RELEASE)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELEASE})
+    elseif(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELWITHDEBINFO})
+    elseif(${basename}_IMPORTED_LOCATION_MINSIZEREL)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_MINSIZEREL})
+    elseif(${basename}_IMPORTED_LOCATION_DEBUG)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_DEBUG})
+    endif()
+  endif()
+endmacro()
+
+select_library_location(LibXml2::LibXml2 LIBXML2)
+select_executable_location(LibXml2::xmlcatalog LIBXML2_XMLCATALOG)
+select_executable_location(LibXml2::xmllint LIBXML2_XMLLINT)
+
+set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY})
+set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
+
+include(CMakeFindDependencyMacro)
+
+set(LIBXML2_SHARED OFF)
+set(LIBXML2_WITH_ICONV OFF)
+set(LIBXML2_WITH_THREADS ON)
+set(LIBXML2_WITH_ICU OFF)
+set(LIBXML2_WITH_LZMA OFF)
+set(LIBXML2_WITH_ZLIB OFF)
+
+if(LIBXML2_WITH_ICONV)
+  find_dependency(Iconv)
+  list(APPEND LIBXML2_LIBRARIES    ${Iconv_LIBRARIES})
+  list(APPEND LIBXML2_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS})
+endif()
+
+if(NOT LIBXML2_SHARED)
+  set(LIBXML2_DEFINITIONS -DLIBXML_STATIC)
+
+  if(LIBXML2_WITH_THREADS)
+    find_dependency(Threads)
+    list(APPEND LIBXML2_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  endif()
+
+  if(LIBXML2_WITH_ICU)
+    find_dependency(ICU COMPONENTS data i18n uc)
+    list(APPEND LIBXML2_LIBRARIES    ${ICU_LIBRARIES})
+  endif()
+
+  if(LIBXML2_WITH_LZMA)
+    find_dependency(LibLZMA)
+    list(APPEND LIBXML2_LIBRARIES    ${LIBLZMA_LIBRARIES})
+  endif()
+
+  if(LIBXML2_WITH_ZLIB)
+    find_dependency(ZLIB)
+    list(APPEND LIBXML2_LIBRARIES    ${ZLIB_LIBRARIES})
+  endif()
+
+  if(UNIX)
+    list(APPEND LIBXML2_LIBRARIES m)
+  endif()
+
+  if(WIN32)
+    list(APPEND LIBXML2_LIBRARIES ws2_32)
+  endif()
+endif()
+
+# whether libxml2 has dso support
+set(LIBXML2_MODULES ON)
+
+mark_as_advanced(LIBXML2_LIBRARY LIBXML2_XMLCATALOG_EXECUTABLE LIBXML2_XMLLINT_EXECUTABLE)
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-export-release.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-export-release.cmake
new file mode 100644
index 0000000..9f57e63
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-export-release.cmake
@@ -0,0 +1,37 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "LibXml2::LibXml2" for configuration "Release"
+set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2::LibXml2 PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libxml2.a"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2::LibXml2 )
+list(APPEND _cmake_import_check_files_for_LibXml2::LibXml2 "${_IMPORT_PREFIX}/lib/libxml2.a" )
+
+# Import target "LibXml2::xmlcatalog" for configuration "Release"
+set_property(TARGET LibXml2::xmlcatalog APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2::xmlcatalog PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/xmlcatalog"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2::xmlcatalog )
+list(APPEND _cmake_import_check_files_for_LibXml2::xmlcatalog "${_IMPORT_PREFIX}/bin/xmlcatalog" )
+
+# Import target "LibXml2::xmllint" for configuration "Release"
+set_property(TARGET LibXml2::xmllint APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2::xmllint PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/xmllint"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2::xmllint )
+list(APPEND _cmake_import_check_files_for_LibXml2::xmllint "${_IMPORT_PREFIX}/bin/xmllint" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-export.cmake b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-export.cmake
new file mode 100644
index 0000000..c5f0da7
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/cmake/libxml2-2.9.10/libxml2-export.cmake
@@ -0,0 +1,114 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS LibXml2::LibXml2 LibXml2::xmlcatalog LibXml2::xmllint)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target LibXml2::LibXml2
+add_library(LibXml2::LibXml2 STATIC IMPORTED)
+
+set_target_properties(LibXml2::LibXml2 PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "LIBXML_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libxml2"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:dl>;\$<LINK_ONLY:m>;\$<LINK_ONLY:Threads::Threads>"
+)
+
+# Create imported target LibXml2::xmlcatalog
+add_executable(LibXml2::xmlcatalog IMPORTED)
+
+# Create imported target LibXml2::xmllint
+add_executable(LibXml2::xmllint IMPORTED)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/libxml2-export-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/libdbcppp.a b/Source/ThirdParty/dbcppp/Linux/lib/libdbcppp.a
new file mode 100644
index 0000000..9189b46
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/libdbcppp.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9996f0d4d0a3528455eb9da1580778b239e6a8ea75584e90b967323b50abf963
+size 3338346
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/libdbcppp.so b/Source/ThirdParty/dbcppp/Linux/lib/libdbcppp.so
new file mode 100644
index 0000000..6c6cc34
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/libdbcppp.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8943b45bdda5f5bfa13fed38d262327c978060a1a8a80d0290981f5ed9638131
+size 1660696
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/libxml2.a b/Source/ThirdParty/dbcppp/Linux/lib/libxml2.a
new file mode 100644
index 0000000..84b1791
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/libxml2.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1242ecf6c33cd787b29206ed876114f5d2730778f8f8de868040fada2bdb76b
+size 2706852
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/libxml2.so b/Source/ThirdParty/dbcppp/Linux/lib/libxml2.so
new file mode 100644
index 0000000..895f0b0
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/libxml2.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7242de1bd4617c557686b3a02d9339fabed0177d2751aa17f26633f837a28cb6
+size 1781288
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/libxml2.so.2.9.10 b/Source/ThirdParty/dbcppp/Linux/lib/libxml2.so.2.9.10
new file mode 100644
index 0000000..895f0b0
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/libxml2.so.2.9.10
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7242de1bd4617c557686b3a02d9339fabed0177d2751aa17f26633f837a28cb6
+size 1781288
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/libxmlmm.a b/Source/ThirdParty/dbcppp/Linux/lib/libxmlmm.a
new file mode 100644
index 0000000..1672f7f
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/libxmlmm.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7443a83f7497fe6d6e47b4d6854ee16e24042736e254426ce887157a114f2dee
+size 158590
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/libxmlmm.so b/Source/ThirdParty/dbcppp/Linux/lib/libxmlmm.so
new file mode 100644
index 0000000..bf29b24
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/libxmlmm.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0da4edb1f2860f7ae217dc680e218b083d7eac7b985c43ea291027221ad146b7
+size 109392
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/pkgconfig/libxml-2.0.pc b/Source/ThirdParty/dbcppp/Linux/lib/pkgconfig/libxml-2.0.pc
new file mode 100644
index 0000000..e9c12a9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/pkgconfig/libxml-2.0.pc
@@ -0,0 +1,13 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+modules=1
+
+Name: libXML
+Version: 2.9.10
+Description: libXML library version2.
+Requires:
+Libs: -L${libdir} -lxml2
+Libs.private:  -lpthread    -lm  
+Cflags: -I${includedir}/libxml2 -DLIBXML_STATIC
diff --git a/Source/ThirdParty/dbcppp/Linux/lib/xml2Conf.sh b/Source/ThirdParty/dbcppp/Linux/lib/xml2Conf.sh
new file mode 100644
index 0000000..9696632
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Linux/lib/xml2Conf.sh
@@ -0,0 +1,8 @@
+#
+# Configuration file for using the XML library in GNOME applications
+#
+XML2_LIBDIR="-LC:/UnrealProjects/SodaSimBase/Plugins/UnrealSoda/Source/ThirdParty/dbcppp/Linux/lib"
+XML2_LIBS="-lxml2   -lpthread   -lm"
+XML2_INCLUDEDIR="-IC:/UnrealProjects/SodaSimBase/Plugins/UnrealSoda/Source/ThirdParty/dbcppp/Linux/include/libxml2"
+MODULE_VERSION="xml2-2.9.10"
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Attribute.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Attribute.h
new file mode 100644
index 0000000..fce4582
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Attribute.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <string>
+#include <cstddef>
+#include <variant>
+
+#include "Export.h"
+#include "AttributeDefinition.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IAttribute
+    {
+    public:
+        using hex_value_t = int64_t;
+        using value_t = std::variant<int64_t, double, std::string>;
+
+        static std::unique_ptr<IAttribute> Create(
+              std::string&& name
+            , IAttributeDefinition::EObjectType object_type
+            , value_t value);
+            
+        virtual std::unique_ptr<IAttribute> Clone() const = 0;
+
+        virtual ~IAttribute() = default;
+        virtual const std::string& Name() const = 0;
+        virtual IAttributeDefinition::EObjectType ObjectType() const = 0;
+        virtual const value_t& Value() const = 0;
+
+        virtual bool operator==(const IAttribute& rhs) const = 0;
+        virtual bool operator!=(const IAttribute& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/AttributeDefinition.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/AttributeDefinition.h
new file mode 100644
index 0000000..8e3c41b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/AttributeDefinition.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <vector>
+#include <functional>
+#include <variant>
+#include <memory>
+
+#include "Export.h"
+#include "Iterator.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IAttributeDefinition
+    {
+    public:
+        enum class EObjectType
+        {
+            Network,
+            Node,
+            Message,
+            Signal,
+            EnvironmentVariable,
+        };
+        struct ValueTypeInt
+        {
+            int64_t minimum;
+            int64_t maximum;
+        };
+        struct ValueTypeHex
+        {
+            int64_t minimum;
+            int64_t maximum;
+        };
+        struct ValueTypeFloat
+        {
+            double minimum;
+            double maximum;
+        };
+        struct ValueTypeString
+        {
+        };
+        struct ValueTypeEnum
+        {
+            std::vector<std::string> values;
+        };
+        using value_type_t = std::variant<ValueTypeInt, ValueTypeHex, ValueTypeFloat, ValueTypeString, ValueTypeEnum>;
+        
+        static std::unique_ptr<IAttributeDefinition> Create(
+              std::string&& name
+            , EObjectType object_type
+            , value_type_t&& value_type);
+            
+        virtual std::unique_ptr<IAttributeDefinition> Clone() const = 0;
+
+        virtual ~IAttributeDefinition() = default;
+        virtual EObjectType ObjectType() const = 0;
+        virtual const std::string& Name() const = 0;
+        virtual const value_type_t& ValueType() const = 0;
+        
+        virtual bool operator==(const IAttributeDefinition& rhs) const = 0;
+        virtual bool operator!=(const IAttributeDefinition& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/BitTiming.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/BitTiming.h
new file mode 100644
index 0000000..f07ea2d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/BitTiming.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <memory>
+#include <cstdint>
+
+#include "Export.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IBitTiming
+    {
+    public:
+        static std::unique_ptr<IBitTiming> Create(uint64_t baudrate, uint64_t BTR1, uint64_t BTR2);
+        
+        virtual std::unique_ptr<IBitTiming> Clone() const = 0;
+
+        virtual ~IBitTiming() = default;
+        virtual uint64_t Baudrate() const = 0;
+        virtual uint64_t BTR1() const = 0;
+        virtual uint64_t BTR2() const = 0;
+        
+        virtual bool operator==(const IBitTiming& rhs) const = 0;
+        virtual bool operator!=(const IBitTiming& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/CApi.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/CApi.h
new file mode 100644
index 0000000..24c22a0
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/CApi.h
@@ -0,0 +1,307 @@
+
+#pragma once
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#include "Export.h"
+#include <stdint.h>
+
+    typedef enum
+    {
+        dbcppp_ObjectType_Network,
+        dbcppp_ObjectType_Node,
+        dbcppp_ObjectType_Message,
+        dbcppp_ObjectType_Signal,
+        dbcppp_ObjectType_EnvironmentVariable
+    } dbcppp_EObjectType;
+    typedef enum
+    {
+        dbcppp_AttributeValueType_Int,
+        dbcppp_AttributeValueType_Double,
+        dbcppp_AttributeValueType_String
+    } dbcppp_EAttributeValueType;
+    typedef enum
+    {
+        dbcppp_AttributeDefinitionValueTypeInt,
+        dbcppp_AttributeDefinitionValueTypeHex,
+        dbcppp_AttributeDefinitionValueTypeFloat,
+        dbcppp_AttributeDefinitionValueTypeString,
+        dbcppp_AttributeDefinitionValueTypeEnum
+    } dbcppp_EAttributeDefinitionValueType;
+    typedef enum
+    {
+        dbcppp_EnvironmentVariableVarTypeInteger,
+        dbcppp_EnvironmentVariableVarTypeFloat,
+        dbcppp_EnvironmentVariableVarTypeString,
+        dbcppp_EnvironmentVariableVarTypeData
+    } dbcppp_EEnvironmentVariableVarType;
+    typedef enum
+    {
+        dbcppp_EnvironmentVariableAccessTypeUnrestricted,
+        dbcppp_EnvironmentVariableAccessTypeRead,
+        dbcppp_EnvironmentVariableAccessTypeWrite,
+        dbcppp_EnvironmentVariableAccessTypeReadWrite
+    } dbcppp_EEnvironmentVariableAccessType;
+    typedef enum
+    {
+        dbcppp_SignalMultiplexerNoMux,
+        dbcppp_SignalMultiplexerMuxSwitch,
+        dbcppp_SignalMultiplexerMuxValue
+    } dbcppp_ESignalMultiplexer;
+    typedef enum
+    {
+        dbcppp_SignalByteOrderLittleEndian,
+        dbcppp_SignalByteOrderBigEndian
+    } dbcppp_ESignalByteOrder;
+    typedef enum
+    {
+        dbcppp_SignalValueTypeSigned,
+        dbcppp_SignalValueTypeUnsigned
+    } dbcppp_ESignalValueType;
+    typedef enum
+    {
+        dbcppp_SignalExtendedValueTypeInteger,
+        dbcppp_SignalExtendedValueTypeFloat, 
+        dbcppp_SignalExtendedValueTypeDouble
+    } dbcppp_ESignalExtendedValueType;
+
+    typedef struct {} dbcppp_Network;
+    typedef struct {} dbcppp_BitTiming;
+    typedef struct {} dbcppp_Node;
+    typedef struct {} dbcppp_ValueTable;
+    typedef struct {} dbcppp_Message;
+    typedef struct {} dbcppp_EnvironmentVariable;
+    typedef struct {} dbcppp_AttributeDefinition;
+    typedef struct {} dbcppp_Attribute;
+    typedef struct {} dbcppp_SignalType;
+    typedef struct {} dbcppp_Signal;
+    typedef struct {} dbcppp_SignalMultiplexerValue;
+    typedef struct {
+        uint64_t from;
+        uint64_t to;
+    } dbcppp_ValueRange;
+    typedef struct {} dbcppp_ValueEncodingDescription;
+    
+    DBCPPP_API const dbcppp_Attribute* dbcppp_AttributeCreate(
+        const char* name,
+        dbcppp_EObjectType object_type,
+        dbcppp_EAttributeValueType value_type,
+        const void* value);
+    DBCPPP_API void dbcppp_AttributeFree(const dbcppp_Attribute* attribute);
+    DBCPPP_API const char* dbcppp_AttributeName(const dbcppp_Attribute* attribute);
+    DBCPPP_API dbcppp_EObjectType dbcppp_AttributeObjectType(const dbcppp_Attribute* attribute);
+    DBCPPP_API dbcppp_EAttributeValueType dbcppp_AttributeValueType(const dbcppp_Attribute* attribute);
+    DBCPPP_API int64_t dbcppp_AttributeValueAsInt(const dbcppp_Attribute* attribute);
+    DBCPPP_API double dbcppp_AttributeValueAsDouble(const dbcppp_Attribute* attribute);
+    DBCPPP_API const char* dbcppp_AttributeValueAsString(const dbcppp_Attribute* attribute);
+    
+    DBCPPP_API dbcppp_AttributeDefinition* dbcppp_AttributeDefinitionCreate(
+          const char* name
+        , dbcppp_EObjectType object_type
+        , dbcppp_EAttributeDefinitionValueType value_type
+        , const void* value);
+    DBCPPP_API void dbcppp_AttributeDefinitionFree(const dbcppp_AttributeDefinition* attribute_defintion);
+    DBCPPP_API dbcppp_EObjectType dbcppp_AttributeDefinitionObjectType(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API const char* dbcppp_AttributeDefinitionName(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API dbcppp_EAttributeDefinitionValueType dbcppp_AttributeDefinitionValueType(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API int64_t dbcppp_AttributeDefinitionValueTypeAsInt_Minimum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API int64_t dbcppp_AttributeDefinitionValueTypeAsInt_Maximum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API uint64_t dbcppp_AttributeDefinitionValueTypeAsHex_Minimum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API uint64_t dbcppp_AttributeDefinitionValueTypeAsHex_Maximum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API double dbcppp_AttributeDefinitionValueTypeAsFloat_Minimum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API double dbcppp_AttributeDefinitionValueTypeAsFloat_Maximum(const dbcppp_AttributeDefinition* attribute_definition);
+    DBCPPP_API const char* dbcppp_AttributeDefinitionValueTypeAsEnum_Get(const dbcppp_AttributeDefinition* attribute_definition, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_AttributeDefinitionValueTypeAsEnum_Size(const dbcppp_AttributeDefinition* attribute_definition);
+
+    DBCPPP_API const dbcppp_BitTiming* dbcppp_BitTimingCreate(uint64_t baudrate, uint64_t BTR1, uint64_t BTR2);
+    DBCPPP_API void dbcppp_BitTimingFree(const dbcppp_BitTiming* bit_timing);
+    DBCPPP_API uint64_t dbcppp_BitTimingBaudrate(const dbcppp_BitTiming* bit_timing);
+    DBCPPP_API uint64_t dbcppp_BitTimingBTR1(const dbcppp_BitTiming* bit_timing);
+    DBCPPP_API uint64_t dbcppp_BitTimingBTR2(const dbcppp_BitTiming* bit_timing);
+
+    DBCPPP_API const dbcppp_EnvironmentVariable* dbcppp_EnvironmentVariableCreate(
+          const char* name
+        , dbcppp_EEnvironmentVariableVarType var_type
+        , double minimum
+        , double maximum
+        , const char* unit
+        , double initial_value
+        , uint64_t ev_id
+        , dbcppp_EEnvironmentVariableAccessType access_type
+        , const char** access_nodes
+        , dbcppp_ValueEncodingDescription** value_encoding_descriptions
+        , uint64_t data_size
+        , dbcppp_Attribute** attribute_values
+        , const char* comment);
+    DBCPPP_API void dbcppp_EnvironmentVariableFree(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableName(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API dbcppp_EEnvironmentVariableVarType dbcppp_EnvironmentVariableVarType(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API double dbcppp_EnvironmentVariableMinimum(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API double dbcppp_EnvironmentVariableMaximum(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableUnit(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API double dbcppp_EnvironmentVariableInitialValue(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableEvId(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API dbcppp_EEnvironmentVariableAccessType dbcppp_EnvironmentVariableAccessType(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableAccessNodes_Get(const dbcppp_EnvironmentVariable* env_var, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableAccessNodes_Size(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableValueEncodingDescriptions_GetValue(const dbcppp_EnvironmentVariable* env_var, int64_t i);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableValueEncodingDescriptions_GetDescription(const dbcppp_EnvironmentVariable* env_var, int64_t i);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableValueEncodingDescriptions_Size(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableDataSize(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_EnvironmentVariableAttributeValues_Get(const dbcppp_EnvironmentVariable* env_var, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_EnvironmentVariableAttributeValues_Size(const dbcppp_EnvironmentVariable* env_var);
+    DBCPPP_API const char* dbcppp_EnvironmentVariableComment(const dbcppp_EnvironmentVariable* env_var);
+
+    DBCPPP_API const dbcppp_Message* dbcppp_MessageCreate(
+          uint64_t id
+        , const char* name
+        , uint64_t message_size
+        , const char* transmitter
+        , const char** message_transmitters
+        , dbcppp_Signal** signals
+        , dbcppp_Attribute** attribute_values
+        , const char* comment);
+    DBCPPP_API void dbcppp_MessageFree(const dbcppp_Message* msg);
+    DBCPPP_API uint64_t dbcppp_MessageId(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageName(const dbcppp_Message* msg);
+    DBCPPP_API uint64_t dbcppp_MessageMessageSize(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageTransmitter(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageTransmitters_Get(const dbcppp_Message* msg, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_MessageTransmitters_Size(const dbcppp_Message* msg);
+    DBCPPP_API const dbcppp_Signal* dbcppp_MessageSignals_Get(const dbcppp_Message* msg, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_MessageSignals_Size(const dbcppp_Message* msg);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_MessageAttributeValues_Get(const dbcppp_Message* msg, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_MessageAttributeValues_Size(const dbcppp_Message* msg);
+    DBCPPP_API const char* dbcppp_MessageComment(const dbcppp_Message* msg);
+    
+    DBCPPP_API const dbcppp_Network* dbcppp_NetworkLoadDBCFromFile(const char* filename);
+    DBCPPP_API const dbcppp_Network* dbcppp_NetworkLoadDBCFromMemory(const char* data);
+    DBCPPP_API const dbcppp_Network* dbcppp_NetworkCreate(
+          const char* version
+        , const char** new_symbols
+        , dbcppp_BitTiming* bit_timing
+        , dbcppp_Node** nodes
+        , dbcppp_ValueTable** value_tables
+        , dbcppp_Message** messages
+        , dbcppp_EnvironmentVariable** environment_variables
+        , dbcppp_AttributeDefinition** attribute_definitions
+        , dbcppp_Attribute** attribute_defaults
+        , dbcppp_Attribute** attribute_values
+        , const char* comment);
+    DBCPPP_API void dbcppp_NetworkFree(const dbcppp_Network* network);
+    DBCPPP_API const char* dbcppp_NetworkVersion(const dbcppp_Network* net);
+    DBCPPP_API const char* dbcppp_NetworkNewSymbols_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkNewSymbols_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_BitTiming* dbcppp_NetworkBitTiming(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Node* dbcppp_NetworkNodes_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkNodes_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_ValueTable* dbcppp_NetworkValueTables_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkValueTables_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Message* dbcppp_NetworkMessages_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkMessages_Size(const dbcppp_Network* net);    
+    DBCPPP_API const dbcppp_EnvironmentVariable* dbcppp_NetworkEnvironmentVariables_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkEnvironmentVariables_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_AttributeDefinition* dbcppp_NetworkAttributeDefinitions_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkAttributeDefinitions_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_NetworkAttributeDefaults_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkAttributeDefaults_Size(const dbcppp_Network* net);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_NetworkAttributeValues_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NetworkAttributeValues_Size(const dbcppp_Network* net);
+    DBCPPP_API const char* dbcppp_NetworkComment(const dbcppp_Network* net);
+
+    DBCPPP_API const dbcppp_Node* dbcppp_NodeCreate(const char* name, const char* comment, dbcppp_Attribute** attributes);
+    DBCPPP_API void dbcppp_NodeFree(const dbcppp_Node* node);
+    DBCPPP_API const char* dbcppp_NodeName(const dbcppp_Node* node);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_NodeAttributeValues_Get(const dbcppp_Network* net, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_NodeAttributeValues_Size(const dbcppp_Network* net);
+    DBCPPP_API const char* dbcppp_NodeComment(const dbcppp_Node* node);
+
+    DBCPPP_API const dbcppp_Signal* dbcppp_SignalCreate(
+          uint64_t message_size
+        , const char* name
+        , dbcppp_ESignalMultiplexer multiplexer_indicator
+        , uint64_t multiplexer_switch_value
+        , uint64_t start_bit
+        , uint64_t bit_size
+        , dbcppp_ESignalByteOrder byte_order
+        , dbcppp_ESignalValueType value_type
+        , double factor
+        , double offset
+        , double minimum
+        , double maximum
+        , const char* unit
+        , const char** receivers
+        , dbcppp_Attribute** attribute_values
+        , dbcppp_ValueEncodingDescription** value_descriptions
+        , const char* comment
+        , dbcppp_ESignalExtendedValueType extended_value_type);
+    DBCPPP_API const char* dbcppp_SignalName(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalMultiplexer dbcppp_SignalMultiplexerIndicator(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalMultiplexerSwitchValue(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalMultiplexerValues_Size(const dbcppp_Signal* sig);
+    DBCPPP_API const dbcppp_SignalMultiplexerValue* dbcppp_SignalMultiplexerValues_Get(const dbcppp_Signal* sig, uint64_t i);
+    DBCPPP_API const char* dbcppp_SignalMultiplexerValue_SwitchName(const dbcppp_SignalMultiplexerValue* mux_val);
+    DBCPPP_API uint64_t dbcppp_SignalMultiplexerValue_ValueRanges_Size(const dbcppp_SignalMultiplexerValue* mux_val);
+    DBCPPP_API const dbcppp_ValueRange* dbcppp_SignalMultiplexerValue_ValueRanges_Get(const dbcppp_SignalMultiplexerValue* mux_val, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalStartBit(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalBitSize(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalByteOrder dbcppp_SignalByteOrder(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalValueType dbcppp_SignalValueType(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalFactor(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalOffset(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalMinimum(const dbcppp_Signal* sig);
+    DBCPPP_API double dbcppp_SignalMaximum(const dbcppp_Signal* sig);
+    DBCPPP_API const char* dbcppp_SignalUnit(const dbcppp_Signal* sig);
+    DBCPPP_API const char* dbcppp_SignalReceivers_Get(const dbcppp_Signal* signal, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalReceivers_Size(const dbcppp_Signal* signal);
+    DBCPPP_API const dbcppp_ValueEncodingDescription* dbcppp_SignalValueEncodingDescriptions_Get(const dbcppp_Signal* signal, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalValueEncodingDescriptions_Size(const dbcppp_Signal* signal);
+    DBCPPP_API const dbcppp_Attribute* dbcppp_SignalAttributeValues_Get(const dbcppp_Signal* signal, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_SignalAttributeValues_Size(const dbcppp_Signal* signal);
+    DBCPPP_API const char* dbcppp_SignalComment(const dbcppp_Signal* sig);
+    DBCPPP_API dbcppp_ESignalExtendedValueType dbcppp_SignalExtended_ValueType(const dbcppp_Signal* sig);
+    DBCPPP_API uint64_t dbcppp_SignalDecode(const dbcppp_Signal* sig, const void* bytes);
+    DBCPPP_API void dbcppp_SignalEncode(const dbcppp_Signal* sig, uint64_t raw, void* buffer);
+    DBCPPP_API double dbcppp_SignalRawToPhys(const dbcppp_Signal* sig, uint64_t raw);
+    DBCPPP_API uint64_t dbcppp_SignalPhysToRaw(const dbcppp_Signal* sig, double phys);
+
+    DBCPPP_API const dbcppp_SignalType* dbcppp_SignalTypeCreate(
+          const char* name
+        , uint64_t signal_size
+        , dbcppp_ESignalByteOrder byte_order
+        , dbcppp_ESignalValueType value_type
+        , double factor
+        , double offset
+        , double minimum
+        , double maximum
+        , const char* unit
+        , double default_value
+        , const char* value_table);
+    DBCPPP_API const char* dbcppp_SignalTypeName(const dbcppp_SignalType* sig_type);
+    DBCPPP_API uint64_t dbcppp_SignalTypeSignalSize(const dbcppp_SignalType* sig_type);
+    DBCPPP_API dbcppp_ESignalByteOrder dbcppp_SignalTypeByteOrder(const dbcppp_SignalType* sig_type);
+    DBCPPP_API dbcppp_ESignalValueType dbcppp_SignalTypeValueType(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeFactor(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeOffset(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeMinimum(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeMaximum(const dbcppp_SignalType* sig_type);
+    DBCPPP_API const char* dbcppp_SignalTypeUnit(const dbcppp_SignalType* sig_type);
+    DBCPPP_API double dbcppp_SignalTypeDefaultValue(const dbcppp_SignalType* sig_type);
+    DBCPPP_API const char* dbcppp_SignalTypeValueTable(const dbcppp_SignalType* sig_type);
+    DBCPPP_API const dbcppp_ValueTable* dbcppp_ValueTableCreate(const char* name, dbcppp_SignalType* signal_type, dbcppp_ValueEncodingDescription** pairs);
+    DBCPPP_API void dbcppp_ValueTableFree(const dbcppp_ValueTable* value_table);
+    DBCPPP_API const char* dbcppp_ValueTableName(const dbcppp_ValueTable* value_table);
+    DBCPPP_API const dbcppp_SignalType* dbcppp_ValueTableSignalType(const dbcppp_ValueTable* value_table);
+    DBCPPP_API const dbcppp_ValueEncodingDescription* dbcppp_ValueTableValueEncodingDescription_Get(const dbcppp_ValueTable* value_table, uint64_t i);
+    DBCPPP_API uint64_t dbcppp_ValueTableValueEncodingDescription_Size(const dbcppp_ValueTable* value_table);
+    
+    DBCPPP_API const dbcppp_ValueEncodingDescription* dbcppp_ValueEncodingDescriptionCreate(uint64_t value, const char* desc);
+    DBCPPP_API void dbcppp_ValueEncodingDescriptionFree(const dbcppp_ValueEncodingDescription* ved);
+    DBCPPP_API uint64_t dbcppp_ValueEncodingDescriptionValue(const dbcppp_ValueEncodingDescription* ved);
+    DBCPPP_API const char* dbcppp_ValueEncodingDescriptionDescription(const dbcppp_ValueEncodingDescription* ved);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/EnvironmentVariable.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/EnvironmentVariable.h
new file mode 100644
index 0000000..4d4ebd4
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/EnvironmentVariable.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include <map>
+#include <set>
+#include <string>
+#include <vector>
+#include <cstddef>
+#include <functional>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Node.h"
+#include "Attribute.h"
+#include "ValueEncodingDescription.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IEnvironmentVariable
+    {
+    public:
+        enum class EVarType
+        {
+            Integer, Float, String, Data
+        };
+        enum class EAccessType
+        {
+            Unrestricted    = 0x0000,
+            Read            = 0x0001,
+            Write           = 0x0002,
+            ReadWrite       = 0x0003,
+            Unrestricted_   = 0x8000,
+            Read_           = 0x8001,
+            Write_          = 0x8002,
+            ReadWrite_      = 0x8003
+        };
+
+        static std::unique_ptr<IEnvironmentVariable> Create(
+              std::string&& name
+            , EVarType var_type
+            , double minimum
+            , double maximum
+            , std::string&& unit
+            , double initial_value
+            , uint64_t ev_id
+            , EAccessType access_type
+            , std::vector<std::string>&& access_nodes
+            , std::vector<std::unique_ptr<IValueEncodingDescription>>&& value_encoding_descriptions
+            , uint64_t data_size
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::string&& comment);
+            
+        virtual std::unique_ptr<IEnvironmentVariable> Clone() const = 0;
+
+        virtual ~IEnvironmentVariable() = default;
+        virtual const std::string& Name() const = 0;
+        virtual EVarType VarType() const = 0;
+        virtual double Minimum() const = 0;
+        virtual double Maximum() const = 0;
+        virtual const std::string& Unit() const = 0;
+        virtual double InitialValue() const = 0;
+        virtual uint64_t EvId() const = 0;
+        virtual EAccessType AccessType() const = 0;
+        virtual const std::string& AccessNodes_Get(std::size_t i) const = 0;
+        virtual uint64_t AccessNodes_Size() const = 0;
+        virtual const IValueEncodingDescription& ValueEncodingDescriptions_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueEncodingDescriptions_Size() const = 0;
+        virtual uint64_t DataSize() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        
+        DBCPPP_MAKE_ITERABLE(IEnvironmentVariable, AccessNodes, std::string);
+        DBCPPP_MAKE_ITERABLE(IEnvironmentVariable, ValueEncodingDescriptions, IValueEncodingDescription);
+        DBCPPP_MAKE_ITERABLE(IEnvironmentVariable, AttributeValues, IAttribute);
+
+        virtual bool operator==(const IEnvironmentVariable& rhs) const = 0;
+        virtual bool operator!=(const IEnvironmentVariable& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Export.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Export.h
new file mode 100644
index 0000000..82febff
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Export.h
@@ -0,0 +1,16 @@
+
+#pragma once
+
+#ifdef DBCPPP_STATIC
+#    define DBCPPP_API
+#else
+#    ifdef _WIN32
+#        ifdef DBCPPP_EXPORT
+#            define DBCPPP_API __declspec(dllexport)
+#        else
+#            define DBCPPP_API __declspec(dllimport)
+#        endif
+#    else
+#        define DBCPPP_API
+#    endif
+#endif
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Iterator.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Iterator.h
new file mode 100644
index 0000000..916761b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Iterator.h
@@ -0,0 +1,102 @@
+
+#pragma once
+
+#include <functional>
+
+namespace dbcppp
+{
+    template <class T>
+    class Iterator
+    {
+    public:
+        using self_t            = Iterator<T>;
+        using iterator_category = std::random_access_iterator_tag;
+        using difference_type   = std::ptrdiff_t;
+        using value_type        = T;
+        using pointer           = const value_type*;
+        using reference         = const value_type&;
+        using get_t             = std::function<reference (std::size_t)>;
+
+        Iterator(get_t get, std::size_t i)
+            : _get(get)
+            , _i(i)
+        {}
+        reference operator*() const
+        {
+            return _get(_i);
+        }
+        pointer operator->() const
+        {
+            return &_get(_i);
+        }
+        self_t& operator++()
+        {
+            _i++;
+            return *this;
+        }
+        self_t operator+(std::size_t o)
+        {
+            return {_get, _i + o};
+        }
+        self_t operator-(std::size_t o)
+        {
+            return {_get, _i + o};
+        }
+        difference_type operator-(const self_t& rhs)
+        {
+            return _i - rhs._i;
+        }
+        self_t& operator+=(std::size_t o)
+        {
+            _i += o;
+            return *this;
+        }
+        self_t& operator-=(std::size_t o)
+        {
+            _i -= o;
+            return *this;
+        }
+
+        bool operator==(const self_t& rhs) const
+        {
+            return _i == rhs._i;
+        }
+        bool operator!=(const self_t& rhs) const
+        {
+            return !(*this == rhs);
+        }
+
+    private:
+        get_t _get;
+        std::size_t _i;
+    };
+    template <class Iterator>
+    class Iterable
+    {
+    public:
+        Iterable(Iterator begin, Iterator end)
+            : _begin(begin)
+            , _end(end)
+        {}
+        Iterator& begin()
+        {
+            return _begin;
+        }
+        Iterator& end()
+        {
+            return _end;
+        }
+
+    private:
+        Iterator _begin;
+        Iterator _end;
+    };
+}
+#define DBCPPP_MAKE_ITERABLE(ClassName, Name, Type)                                 \
+    auto Name() const                                                               \
+    {                                                                               \
+        auto get = std::bind(&ClassName::Name##_Get, this, std::placeholders::_1);  \
+        Iterator<Type> begin(get, 0);                                               \
+        Iterator<Type> end(get, Name##_Size());                                     \
+        return Iterable(begin, end);                                                \
+    }
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Message.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Message.h
new file mode 100644
index 0000000..bbdeef0
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Message.h
@@ -0,0 +1,65 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <memory>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Node.h"
+#include "Signal.h"
+#include "Attribute.h"
+#include "SignalGroup.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IMessage
+    {
+    public:
+        enum class EErrorCode
+            : uint64_t
+        {
+            NoError,
+            MuxValeWithoutMuxSignal
+        };
+
+        static std::unique_ptr<IMessage> Create(
+              uint64_t id
+            , std::string&& name
+            , uint64_t message_size
+            , std::string&& transmitter
+            , std::vector<std::string>&& message_transmitters
+            , std::vector<std::unique_ptr<ISignal>>&& signals_
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::string&& comment
+            , std::vector<std::unique_ptr<ISignalGroup>>&& signal_groups);
+
+        virtual std::unique_ptr<IMessage> Clone() const = 0;
+
+        virtual ~IMessage() = default;
+        virtual uint64_t Id() const = 0;
+        virtual const std::string& Name() const = 0;
+        virtual uint64_t MessageSize() const = 0;
+        virtual const std::string& Transmitter() const = 0;
+        virtual const std::string& MessageTransmitters_Get(std::size_t i) const = 0;
+        virtual uint64_t MessageTransmitters_Size() const = 0;
+        virtual const ISignal& Signals_Get(std::size_t i) const = 0;
+        virtual uint64_t Signals_Size() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        virtual const ISignalGroup& SignalGroups_Get(std::size_t i) const = 0;
+        virtual uint64_t SignalGroups_Size() const = 0;
+        virtual const ISignal* MuxSignal() const = 0;
+        
+        DBCPPP_MAKE_ITERABLE(IMessage, MessageTransmitters, std::string);
+        DBCPPP_MAKE_ITERABLE(IMessage, Signals, ISignal);
+        DBCPPP_MAKE_ITERABLE(IMessage, AttributeValues, IAttribute);
+        DBCPPP_MAKE_ITERABLE(IMessage, SignalGroups, ISignalGroup);
+        
+        virtual bool operator==(const IMessage& message) const = 0;
+        virtual bool operator!=(const IMessage& message) const = 0;
+
+        virtual EErrorCode Error() const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Network.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Network.h
new file mode 100644
index 0000000..34459e9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Network.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <memory>
+#include <iostream>
+#include <string>
+#include <vector>
+#include <istream>
+#include <functional>
+#include <unordered_map>
+#include <filesystem>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "BitTiming.h"
+#include "ValueTable.h"
+#include "Node.h"
+#include "Message.h"
+#include "EnvironmentVariable.h"
+#include "SignalType.h"
+#include "AttributeDefinition.h"
+#include "Attribute.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API INetwork
+    {
+    public:
+        static std::unique_ptr<INetwork> Create(
+              std::string&& version
+            , std::vector<std::string>&& new_symbols
+            , std::unique_ptr<IBitTiming>&& bit_timing
+            , std::vector<std::unique_ptr<INode>>&& nodes
+            , std::vector<std::unique_ptr<IValueTable>>&& value_tables
+            , std::vector<std::unique_ptr<IMessage>>&& messages
+            , std::vector<std::unique_ptr<IEnvironmentVariable>>&& environment_variables
+            , std::vector<std::unique_ptr<IAttributeDefinition>>&& attribute_definitions
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_defaults
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::string&& comment);
+        static std::map<std::string, std::unique_ptr<INetwork>> LoadNetworkFromFile(const std::filesystem::path& filename);
+        static std::unique_ptr<INetwork> LoadDBCFromIs(std::istream& is);
+        static std::map<std::string, std::unique_ptr<INetwork>> LoadKCDFromIs(std::istream& is);
+        
+        virtual std::unique_ptr<INetwork> Clone() const = 0;
+
+        virtual ~INetwork() = default;
+        virtual const std::string& Version() const = 0;
+        virtual const std::string& NewSymbols_Get(std::size_t i) const = 0;
+        virtual uint64_t NewSymbols_Size() const = 0;
+        virtual const IBitTiming& BitTiming() const = 0;
+        virtual const INode& Nodes_Get(std::size_t i) const = 0;
+        virtual uint64_t Nodes_Size() const = 0;
+        virtual const IValueTable& ValueTables_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueTables_Size() const = 0;
+        virtual const IMessage& Messages_Get(std::size_t i) const = 0;
+        virtual uint64_t Messages_Size() const = 0;
+        virtual const IEnvironmentVariable& EnvironmentVariables_Get(std::size_t i) const = 0;
+        virtual uint64_t EnvironmentVariables_Size() const = 0;
+        virtual const IAttributeDefinition& AttributeDefinitions_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeDefinitions_Size() const = 0;
+        virtual const IAttribute& AttributeDefaults_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeDefaults_Size() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        
+        DBCPPP_MAKE_ITERABLE(INetwork, NewSymbols, std::string);
+        DBCPPP_MAKE_ITERABLE(INetwork, Nodes, INode);
+        DBCPPP_MAKE_ITERABLE(INetwork, ValueTables, IValueTable);
+        DBCPPP_MAKE_ITERABLE(INetwork, Messages, IMessage);
+        DBCPPP_MAKE_ITERABLE(INetwork, EnvironmentVariables, IEnvironmentVariable);
+        DBCPPP_MAKE_ITERABLE(INetwork, AttributeDefinitions, IAttributeDefinition);
+        DBCPPP_MAKE_ITERABLE(INetwork, AttributeDefaults, IAttribute);
+        DBCPPP_MAKE_ITERABLE(INetwork, AttributeValues, IAttribute);
+
+        virtual const IMessage* ParentMessage(const ISignal* sig) const = 0;
+
+        virtual bool operator==(const INetwork& rhs) const = 0;
+        virtual bool operator!=(const INetwork& rhs) const = 0;
+
+        void Merge(std::unique_ptr<INetwork>&& other);
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Network2Functions.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Network2Functions.h
new file mode 100644
index 0000000..c428c73
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Network2Functions.h
@@ -0,0 +1,37 @@
+
+#pragma once
+
+#include <boost/format.hpp>
+#include <ostream>
+#include <tuple>
+#include <ostream>
+
+#include "Export.h"
+#include "../../include/dbcppp/Network.h"
+
+namespace dbcppp
+{
+    namespace Network2C
+    {
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INetwork& net);
+    }
+    namespace Network2DBC
+    {
+        using na_t = std::tuple<const INetwork&, const IAttribute&>;
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const na_t& na);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IAttributeDefinition& ad);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IBitTiming& bt);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IEnvironmentVariable& ev);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IMessage& m);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INetwork& net);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INode& n);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const ISignal& s);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const ISignalType& st);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IValueTable& vt);
+    }
+    namespace Network2Human
+    {
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const INetwork& net);
+        DBCPPP_API std::ostream& operator<<(std::ostream& os, const IMessage& msg);
+    }
+}
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Node.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Node.h
new file mode 100644
index 0000000..2203b21
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Node.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <map>
+#include <string>
+#include <memory>
+#include <functional>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Attribute.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API INode
+    {
+    public:
+        static std::unique_ptr<INode> Create(
+            std::string&& name,
+            std::string&& comment,
+            std::vector<std::unique_ptr<IAttribute>>&& attribute_values);
+            
+        virtual std::unique_ptr<INode> Clone() const = 0;
+
+        virtual ~INode() = default;
+        virtual const std::string& Name() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(INode, AttributeValues, IAttribute);
+        
+        virtual bool operator==(const dbcppp::INode& rhs) const = 0;
+        virtual bool operator!=(const dbcppp::INode& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Signal.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Signal.h
new file mode 100644
index 0000000..7097a84
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/Signal.h
@@ -0,0 +1,133 @@
+#pragma once
+
+#include <set>
+#include <map>
+#include <memory>
+#include <string>
+#include <cstddef>
+
+#include "Export.h"
+#include "Iterator.h"
+#include "Node.h"
+#include "Attribute.h"
+#include "SignalMultiplexerValue.h"
+#include "ValueEncodingDescription.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API ISignal
+    {
+    public:
+        enum class EErrorCode
+            : uint64_t
+        {
+            NoError,
+            MaschinesFloatEncodingNotSupported = 1,
+            MaschinesDoubleEncodingNotSupported = 2,
+            SignalExceedsMessageSize = 4,
+            WrongBitSizeForExtendedDataType = 8
+        };
+        enum class EMultiplexer
+        {
+            NoMux, MuxSwitch, MuxValue
+        };
+        enum class EByteOrder
+        {
+            BigEndian = 0,
+            LittleEndian = 1
+        };
+        enum class EValueType
+        {
+            Signed, Unsigned
+        };
+        enum class EExtendedValueType
+        {
+            Integer, Float, Double
+        };
+        
+        static std::unique_ptr<ISignal> Create(
+              uint64_t message_size
+            , std::string&& name
+            , EMultiplexer multiplexer_indicator
+            , uint64_t multiplexer_switch_value
+            , uint64_t start_bit
+            , uint64_t bit_size
+            , EByteOrder byte_order
+            , EValueType value_type
+            , double factor
+            , double offset
+            , double minimum
+            , double maximum
+            , std::string&& unit
+            , std::vector<std::string>&& receivers
+            , std::vector<std::unique_ptr<IAttribute>>&& attribute_values
+            , std::vector<std::unique_ptr<IValueEncodingDescription>>&& value_encoding_description
+            , std::string&& comment
+            , EExtendedValueType extended_value_type
+            , std::vector<std::unique_ptr<ISignalMultiplexerValue>>&& signal_multiplexer_values);
+            
+        virtual std::unique_ptr<ISignal> Clone() const = 0;
+
+        virtual ~ISignal() = default;
+        virtual const std::string& Name() const = 0;
+        virtual EMultiplexer MultiplexerIndicator() const = 0;
+        virtual uint64_t MultiplexerSwitchValue() const = 0;
+        virtual uint64_t StartBit() const = 0;
+        virtual uint64_t BitSize() const = 0;
+        virtual EByteOrder ByteOrder() const = 0;
+        virtual EValueType ValueType() const = 0;
+        virtual double Factor() const = 0;
+        virtual double Offset() const = 0;
+        virtual double Minimum() const = 0;
+        virtual double Maximum() const = 0;
+        virtual const std::string& Unit() const = 0;
+        virtual const std::string& Receivers_Get(std::size_t i) const = 0;
+        virtual uint64_t Receivers_Size() const = 0;
+        virtual const IValueEncodingDescription& ValueEncodingDescriptions_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueEncodingDescriptions_Size() const = 0;
+        virtual const IAttribute& AttributeValues_Get(std::size_t i) const = 0;
+        virtual uint64_t AttributeValues_Size() const = 0;
+        virtual const std::string& Comment() const = 0;
+        virtual EExtendedValueType ExtendedValueType() const = 0;
+        virtual const ISignalMultiplexerValue& SignalMultiplexerValues_Get(std::size_t i) const = 0;
+        virtual uint64_t SignalMultiplexerValues_Size() const = 0;
+
+        virtual bool Error(EErrorCode code) const = 0;
+        
+        virtual bool operator==(const ISignal& rhs) const = 0;
+        virtual bool operator!=(const ISignal& rhs) const = 0;
+        
+        /// \brief Extracts the raw value from a given n byte array
+        ///
+        /// This function uses a optimized method of reversing the byte order and extracting
+        /// the value from the given data.
+        /// !!! Note: This function takes at least 8 bytes and at least as many as the signal needs to be represented,
+        ///     if you pass less, the program ends up in undefined behaviour! !!!
+        ///
+        /// @param nbyte a n byte array (!!! at least 8 bytes !!!) which is representing the can data.
+        ///               the data must be in this order:
+        ///               bit_0  - bit_7:  bytes[0]
+        ///               bit_8  - bit_15: bytes[1]
+        ///               ...
+        ///               bit_n-7 - bit_n: bytes[n / 8]
+        ///               (like the Unix CAN frame does store the data)
+        using raw_t = uint64_t;
+        inline raw_t Decode(const void* bytes) const noexcept { return _decode(this, bytes); }
+        inline void Encode(raw_t raw, void* buffer) const noexcept { return _encode(this, raw, buffer); }
+
+        inline double RawToPhys(raw_t raw) const noexcept { return _raw_to_phys(this, raw); }
+        inline raw_t PhysToRaw(double phys) const noexcept { return _phys_to_raw(this, phys); }
+        
+        DBCPPP_MAKE_ITERABLE(ISignal, Receivers, std::string);
+        DBCPPP_MAKE_ITERABLE(ISignal, ValueEncodingDescriptions, IValueEncodingDescription);
+        DBCPPP_MAKE_ITERABLE(ISignal, AttributeValues, IAttribute);
+        DBCPPP_MAKE_ITERABLE(ISignal, SignalMultiplexerValues, ISignalMultiplexerValue);
+
+    protected:
+        // instead of using virtuals dynamic dispatching use function pointers
+        raw_t (*_decode)(const ISignal* sig, const void* bytes) noexcept {nullptr};
+        void (*_encode)(const ISignal* sig, raw_t raw, void* buffer) noexcept {nullptr};
+        double (*_raw_to_phys)(const ISignal* sig, raw_t raw) noexcept {nullptr};
+        raw_t (*_phys_to_raw)(const ISignal* sig, double phys) noexcept {nullptr};
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalGroup.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalGroup.h
new file mode 100644
index 0000000..cf707c2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalGroup.h
@@ -0,0 +1,37 @@
+
+#pragma once
+
+#include <vector>
+#include <string>
+#include <memory>
+#include <functional>
+
+#include "Export.h"
+#include "Iterator.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API ISignalGroup
+    {
+    public:
+        static std::unique_ptr<ISignalGroup> Create(
+              uint64_t message_id
+            , std::string&& name
+            , uint64_t repetitions
+            , std::vector<std::string>&& signal_names);
+
+        virtual std::unique_ptr<ISignalGroup> Clone() const = 0;
+
+        virtual ~ISignalGroup() = default;
+        virtual uint64_t MessageId() const = 0;
+        virtual const std::string& Name() const = 0;
+        virtual uint64_t Repetitions() const = 0;
+        virtual const std::string& SignalNames_Get(std::size_t i) const = 0;
+        virtual uint64_t SignalNames_Size() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(ISignalGroup, SignalNames, std::string);
+        
+        virtual bool operator==(const ISignalGroup& rhs) const = 0;
+        virtual bool operator!=(const ISignalGroup& rhs) const = 0;
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalMultiplexerValue.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalMultiplexerValue.h
new file mode 100644
index 0000000..5c69fa9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalMultiplexerValue.h
@@ -0,0 +1,39 @@
+
+#pragma once
+
+#include <string>
+#include <cstddef>
+#include <memory>
+#include <vector>
+#include <functional>
+
+#include "Iterator.h"
+
+namespace dbcppp
+{
+    class ISignalMultiplexerValue
+    {
+    public:
+        struct Range
+        {
+            std::size_t from;
+            std::size_t to;
+        };
+        
+        static std::unique_ptr<ISignalMultiplexerValue> Create(
+              std::string&& switch_name
+            , std::vector<Range>&& value_ranges);
+        
+        virtual std::unique_ptr<ISignalMultiplexerValue> Clone() const = 0;
+
+        virtual ~ISignalMultiplexerValue() = default;
+        virtual const std::string& SwitchName() const = 0;
+        virtual const Range& ValueRanges_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueRanges_Size() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(ISignalMultiplexerValue, ValueRanges, Range);
+
+        virtual bool operator==(const ISignalMultiplexerValue& rhs) const = 0;
+        virtual bool operator!=(const ISignalMultiplexerValue& rhs) const = 0;
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalType.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalType.h
new file mode 100644
index 0000000..ec5fd0c
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/SignalType.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <memory>
+
+#include "Export.h"
+#include "Signal.h"
+
+namespace dbcppp
+{
+    class ISignalType
+    {
+    public:
+        static std::unique_ptr<ISignalType> Create(
+              std::string&& name
+            , uint64_t signal_size
+            , ISignal::EByteOrder byte_order
+            , ISignal::EValueType value_type
+            , double factor
+            , double offset
+            , double minimum
+            , double maximum
+            , std::string&& unit
+            , double default_value
+            , std::string&& value_table);
+            
+        virtual std::unique_ptr<ISignalType> Clone() const = 0;
+
+        virtual ~ISignalType() = default;
+        virtual const std::string& Name() const = 0;
+        virtual uint64_t SignalSize() const = 0;
+        virtual ISignal::EByteOrder ByteOrder() const = 0;
+        virtual ISignal::EValueType ValueType() const = 0;
+        virtual double Factor() const = 0;
+        virtual double Offset() const = 0;
+        virtual double Minimum() const = 0;
+        virtual double Maximum() const = 0;
+        virtual const std::string& Unit() const = 0;
+        virtual double DefaultValue() const = 0;
+        virtual const std::string& ValueTable() const = 0;
+        
+        virtual bool operator==(const ISignalType& rhs) const = 0;
+        virtual bool operator!=(const ISignalType& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/ValueEncodingDescription.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/ValueEncodingDescription.h
new file mode 100644
index 0000000..8eecf08
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/ValueEncodingDescription.h
@@ -0,0 +1,24 @@
+
+#pragma once
+
+#include <string>
+#include <memory>
+
+#include "Export.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IValueEncodingDescription
+    {
+    public:
+        static std::unique_ptr<IValueEncodingDescription> Create(int64_t value, std::string&& description);
+        virtual std::unique_ptr<IValueEncodingDescription> Clone() const = 0;
+        virtual ~IValueEncodingDescription() = default;
+
+        virtual int64_t Value() const = 0;
+        virtual const std::string& Description() const = 0;
+
+        virtual bool operator==(const IValueEncodingDescription& rhs) const = 0;
+        virtual bool operator!=(const IValueEncodingDescription& rhs) const = 0;
+    };
+}
diff --git a/Source/ThirdParty/dbcppp/Win64/include/dbcppp/ValueTable.h b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/ValueTable.h
new file mode 100644
index 0000000..ee8212d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/dbcppp/ValueTable.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <vector>
+#include <string>
+#include <memory>
+#include <optional>
+
+#include "Export.h"
+#include "SignalType.h"
+#include "ValueEncodingDescription.h"
+
+namespace dbcppp
+{
+    class DBCPPP_API IValueTable
+    {
+    public:
+        static std::unique_ptr<IValueTable> Create(
+              std::string&& name
+            , std::optional<std::unique_ptr<ISignalType>>&& signal_type
+            , std::vector<std::unique_ptr<IValueEncodingDescription>>&& value_encoding_descriptions);
+            
+        virtual std::unique_ptr<IValueTable> Clone() const = 0;
+
+        virtual ~IValueTable() = default;
+        virtual const std::string& Name() const = 0;
+        virtual std::optional<std::reference_wrapper<const ISignalType>> SignalType() const = 0;
+        virtual const IValueEncodingDescription& ValueEncodingDescriptions_Get(std::size_t i) const = 0;
+        virtual uint64_t ValueEncodingDescriptions_Size() const = 0;
+
+        DBCPPP_MAKE_ITERABLE(IValueTable, ValueEncodingDescriptions, IValueEncodingDescription);
+        
+        virtual bool operator==(const IValueTable& rhs) const = 0;
+        virtual bool operator!=(const IValueTable& rhs) const = 0;
+    };
+}
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/DOCBparser.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/DOCBparser.h
new file mode 100644
index 0000000..9394fa7
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/DOCBparser.h
@@ -0,0 +1,96 @@
+/*
+ * Summary: old DocBook SGML parser
+ * Description: interface for a DocBook SGML non-verifying parser
+ * This code is DEPRECATED, and should not be used anymore.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __DOCB_PARSER_H__
+#define __DOCB_PARSER_H__
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_DOCB_ENABLED
+
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+
+#ifndef IN_LIBXML
+#ifdef __GNUC__
+#warning "The DOCBparser module has been deprecated in libxml2-2.6.0"
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Most of the back-end structures from XML and SGML are shared.
+ */
+typedef xmlParserCtxt docbParserCtxt;
+typedef xmlParserCtxtPtr docbParserCtxtPtr;
+typedef xmlSAXHandler docbSAXHandler;
+typedef xmlSAXHandlerPtr docbSAXHandlerPtr;
+typedef xmlParserInput docbParserInput;
+typedef xmlParserInputPtr docbParserInputPtr;
+typedef xmlDocPtr docbDocPtr;
+
+/*
+ * There is only few public functions.
+ */
+XMLPUBFUN int XMLCALL
+		     docbEncodeEntities(unsigned char *out,
+                                        int *outlen,
+                                        const unsigned char *in,
+                                        int *inlen, int quoteChar);
+
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbSAXParseDoc   (xmlChar *cur,
+                                        const char *encoding,
+                                        docbSAXHandlerPtr sax,
+                                        void *userData);
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbParseDoc      (xmlChar *cur,
+                                        const char *encoding);
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbSAXParseFile  (const char *filename,
+                                        const char *encoding,
+                                        docbSAXHandlerPtr sax,
+                                        void *userData);
+XMLPUBFUN docbDocPtr XMLCALL
+		     docbParseFile     (const char *filename,
+                                        const char *encoding);
+
+/**
+ * Interfaces for the Push mode.
+ */
+XMLPUBFUN void XMLCALL
+		     docbFreeParserCtxt      (docbParserCtxtPtr ctxt);
+XMLPUBFUN docbParserCtxtPtr XMLCALL
+		     docbCreatePushParserCtxt(docbSAXHandlerPtr sax,
+                                              void *user_data,
+                                              const char *chunk,
+                                              int size,
+                                              const char *filename,
+                                              xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+		     docbParseChunk          (docbParserCtxtPtr ctxt,
+                                              const char *chunk,
+                                              int size,
+                                              int terminate);
+XMLPUBFUN docbParserCtxtPtr XMLCALL
+		     docbCreateFileParserCtxt(const char *filename,
+                                              const char *encoding);
+XMLPUBFUN int XMLCALL
+		     docbParseDocument       (docbParserCtxtPtr ctxt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_DOCB_ENABLED */
+
+#endif /* __DOCB_PARSER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/HTMLparser.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/HTMLparser.h
new file mode 100644
index 0000000..1d4fec2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/HTMLparser.h
@@ -0,0 +1,306 @@
+/*
+ * Summary: interface for an HTML 4.0 non-verifying parser
+ * Description: this module implements an HTML 4.0 non-verifying parser
+ *              with API compatible with the XML parser ones. It should
+ *              be able to parse "real world" HTML, even if severely
+ *              broken from a specification point of view.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __HTML_PARSER_H__
+#define __HTML_PARSER_H__
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+
+#ifdef LIBXML_HTML_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Most of the back-end structures from XML and HTML are shared.
+ */
+typedef xmlParserCtxt htmlParserCtxt;
+typedef xmlParserCtxtPtr htmlParserCtxtPtr;
+typedef xmlParserNodeInfo htmlParserNodeInfo;
+typedef xmlSAXHandler htmlSAXHandler;
+typedef xmlSAXHandlerPtr htmlSAXHandlerPtr;
+typedef xmlParserInput htmlParserInput;
+typedef xmlParserInputPtr htmlParserInputPtr;
+typedef xmlDocPtr htmlDocPtr;
+typedef xmlNodePtr htmlNodePtr;
+
+/*
+ * Internal description of an HTML element, representing HTML 4.01
+ * and XHTML 1.0 (which share the same structure).
+ */
+typedef struct _htmlElemDesc htmlElemDesc;
+typedef htmlElemDesc *htmlElemDescPtr;
+struct _htmlElemDesc {
+    const char *name;	/* The tag name */
+    char startTag;      /* Whether the start tag can be implied */
+    char endTag;        /* Whether the end tag can be implied */
+    char saveEndTag;    /* Whether the end tag should be saved */
+    char empty;         /* Is this an empty element ? */
+    char depr;          /* Is this a deprecated element ? */
+    char dtd;           /* 1: only in Loose DTD, 2: only Frameset one */
+    char isinline;      /* is this a block 0 or inline 1 element */
+    const char *desc;   /* the description */
+
+/* NRK Jan.2003
+ * New fields encapsulating HTML structure
+ *
+ * Bugs:
+ *	This is a very limited representation.  It fails to tell us when
+ *	an element *requires* subelements (we only have whether they're
+ *	allowed or not), and it doesn't tell us where CDATA and PCDATA
+ *	are allowed.  Some element relationships are not fully represented:
+ *	these are flagged with the word MODIFIER
+ */
+    const char** subelts;		/* allowed sub-elements of this element */
+    const char* defaultsubelt;	/* subelement for suggested auto-repair
+					   if necessary or NULL */
+    const char** attrs_opt;		/* Optional Attributes */
+    const char** attrs_depr;		/* Additional deprecated attributes */
+    const char** attrs_req;		/* Required attributes */
+};
+
+/*
+ * Internal description of an HTML entity.
+ */
+typedef struct _htmlEntityDesc htmlEntityDesc;
+typedef htmlEntityDesc *htmlEntityDescPtr;
+struct _htmlEntityDesc {
+    unsigned int value;	/* the UNICODE value for the character */
+    const char *name;	/* The entity name */
+    const char *desc;   /* the description */
+};
+
+/*
+ * There is only few public functions.
+ */
+XMLPUBFUN const htmlElemDesc * XMLCALL
+			htmlTagLookup	(const xmlChar *tag);
+XMLPUBFUN const htmlEntityDesc * XMLCALL
+			htmlEntityLookup(const xmlChar *name);
+XMLPUBFUN const htmlEntityDesc * XMLCALL
+			htmlEntityValueLookup(unsigned int value);
+
+XMLPUBFUN int XMLCALL
+			htmlIsAutoClosed(htmlDocPtr doc,
+					 htmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+			htmlAutoCloseTag(htmlDocPtr doc,
+					 const xmlChar *name,
+					 htmlNodePtr elem);
+XMLPUBFUN const htmlEntityDesc * XMLCALL
+			htmlParseEntityRef(htmlParserCtxtPtr ctxt,
+					 const xmlChar **str);
+XMLPUBFUN int XMLCALL
+			htmlParseCharRef(htmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			htmlParseElement(htmlParserCtxtPtr ctxt);
+
+XMLPUBFUN htmlParserCtxtPtr XMLCALL
+			htmlNewParserCtxt(void);
+
+XMLPUBFUN htmlParserCtxtPtr XMLCALL
+			htmlCreateMemoryParserCtxt(const char *buffer,
+						   int size);
+
+XMLPUBFUN int XMLCALL
+			htmlParseDocument(htmlParserCtxtPtr ctxt);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlSAXParseDoc	(const xmlChar *cur,
+					 const char *encoding,
+					 htmlSAXHandlerPtr sax,
+					 void *userData);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlParseDoc	(const xmlChar *cur,
+					 const char *encoding);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlSAXParseFile(const char *filename,
+					 const char *encoding,
+					 htmlSAXHandlerPtr sax,
+					 void *userData);
+XMLPUBFUN htmlDocPtr XMLCALL
+			htmlParseFile	(const char *filename,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+			UTF8ToHtml	(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen);
+XMLPUBFUN int XMLCALL
+			htmlEncodeEntities(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen, int quoteChar);
+XMLPUBFUN int XMLCALL
+			htmlIsScriptAttribute(const xmlChar *name);
+XMLPUBFUN int XMLCALL
+			htmlHandleOmittedElem(int val);
+
+#ifdef LIBXML_PUSH_ENABLED
+/**
+ * Interfaces for the Push mode.
+ */
+XMLPUBFUN htmlParserCtxtPtr XMLCALL
+			htmlCreatePushParserCtxt(htmlSAXHandlerPtr sax,
+						 void *user_data,
+						 const char *chunk,
+						 int size,
+						 const char *filename,
+						 xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+			htmlParseChunk		(htmlParserCtxtPtr ctxt,
+						 const char *chunk,
+						 int size,
+						 int terminate);
+#endif /* LIBXML_PUSH_ENABLED */
+
+XMLPUBFUN void XMLCALL
+			htmlFreeParserCtxt	(htmlParserCtxtPtr ctxt);
+
+/*
+ * New set of simpler/more flexible APIs
+ */
+/**
+ * xmlParserOption:
+ *
+ * This is the set of XML parser options that can be passed down
+ * to the xmlReadDoc() and similar calls.
+ */
+typedef enum {
+    HTML_PARSE_RECOVER  = 1<<0, /* Relaxed parsing */
+    HTML_PARSE_NODEFDTD = 1<<2, /* do not default a doctype if not found */
+    HTML_PARSE_NOERROR	= 1<<5,	/* suppress error reports */
+    HTML_PARSE_NOWARNING= 1<<6,	/* suppress warning reports */
+    HTML_PARSE_PEDANTIC	= 1<<7,	/* pedantic error reporting */
+    HTML_PARSE_NOBLANKS	= 1<<8,	/* remove blank nodes */
+    HTML_PARSE_NONET	= 1<<11,/* Forbid network access */
+    HTML_PARSE_NOIMPLIED= 1<<13,/* Do not add implied html/body... elements */
+    HTML_PARSE_COMPACT  = 1<<16,/* compact small text nodes */
+    HTML_PARSE_IGNORE_ENC=1<<21 /* ignore internal document encoding hint */
+} htmlParserOption;
+
+XMLPUBFUN void XMLCALL
+		htmlCtxtReset		(htmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		htmlCtxtUseOptions	(htmlParserCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadDoc		(const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadFile		(const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadMemory		(const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadFd		(int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlReadIO		(xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadDoc		(xmlParserCtxtPtr ctxt,
+					 const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadFile		(xmlParserCtxtPtr ctxt,
+					 const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadMemory		(xmlParserCtxtPtr ctxt,
+					 const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadFd		(xmlParserCtxtPtr ctxt,
+					 int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlCtxtReadIO		(xmlParserCtxtPtr ctxt,
+					 xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+
+/* NRK/Jan2003: further knowledge of HTML structure
+ */
+typedef enum {
+  HTML_NA = 0 ,		/* something we don't check at all */
+  HTML_INVALID = 0x1 ,
+  HTML_DEPRECATED = 0x2 ,
+  HTML_VALID = 0x4 ,
+  HTML_REQUIRED = 0xc /* VALID bit set so ( & HTML_VALID ) is TRUE */
+} htmlStatus ;
+
+/* Using htmlElemDesc rather than name here, to emphasise the fact
+   that otherwise there's a lookup overhead
+*/
+XMLPUBFUN htmlStatus XMLCALL htmlAttrAllowed(const htmlElemDesc*, const xmlChar*, int) ;
+XMLPUBFUN int XMLCALL htmlElementAllowedHere(const htmlElemDesc*, const xmlChar*) ;
+XMLPUBFUN htmlStatus XMLCALL htmlElementStatusHere(const htmlElemDesc*, const htmlElemDesc*) ;
+XMLPUBFUN htmlStatus XMLCALL htmlNodeStatus(const htmlNodePtr, int) ;
+/**
+ * htmlDefaultSubelement:
+ * @elt: HTML element
+ *
+ * Returns the default subelement for this element
+ */
+#define htmlDefaultSubelement(elt) elt->defaultsubelt
+/**
+ * htmlElementAllowedHereDesc:
+ * @parent: HTML parent element
+ * @elt: HTML element
+ *
+ * Checks whether an HTML element description may be a
+ * direct child of the specified element.
+ *
+ * Returns 1 if allowed; 0 otherwise.
+ */
+#define htmlElementAllowedHereDesc(parent,elt) \
+	htmlElementAllowedHere((parent), (elt)->name)
+/**
+ * htmlRequiredAttrs:
+ * @elt: HTML element
+ *
+ * Returns the attributes required for the specified element.
+ */
+#define htmlRequiredAttrs(elt) (elt)->attrs_req
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_HTML_ENABLED */
+#endif /* __HTML_PARSER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/HTMLtree.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/HTMLtree.h
new file mode 100644
index 0000000..c0e1103
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/HTMLtree.h
@@ -0,0 +1,147 @@
+/*
+ * Summary: specific APIs to process HTML tree, especially serialization
+ * Description: this module implements a few function needed to process
+ *              tree in an HTML specific way.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __HTML_TREE_H__
+#define __HTML_TREE_H__
+
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/HTMLparser.h>
+
+#ifdef LIBXML_HTML_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/**
+ * HTML_TEXT_NODE:
+ *
+ * Macro. A text node in a HTML document is really implemented
+ * the same way as a text node in an XML document.
+ */
+#define HTML_TEXT_NODE		XML_TEXT_NODE
+/**
+ * HTML_ENTITY_REF_NODE:
+ *
+ * Macro. An entity reference in a HTML document is really implemented
+ * the same way as an entity reference in an XML document.
+ */
+#define HTML_ENTITY_REF_NODE	XML_ENTITY_REF_NODE
+/**
+ * HTML_COMMENT_NODE:
+ *
+ * Macro. A comment in a HTML document is really implemented
+ * the same way as a comment in an XML document.
+ */
+#define HTML_COMMENT_NODE	XML_COMMENT_NODE
+/**
+ * HTML_PRESERVE_NODE:
+ *
+ * Macro. A preserved node in a HTML document is really implemented
+ * the same way as a CDATA section in an XML document.
+ */
+#define HTML_PRESERVE_NODE	XML_CDATA_SECTION_NODE
+/**
+ * HTML_PI_NODE:
+ *
+ * Macro. A processing instruction in a HTML document is really implemented
+ * the same way as a processing instruction in an XML document.
+ */
+#define HTML_PI_NODE		XML_PI_NODE
+
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlNewDoc		(const xmlChar *URI,
+					 const xmlChar *ExternalID);
+XMLPUBFUN htmlDocPtr XMLCALL
+		htmlNewDocNoDtD		(const xmlChar *URI,
+					 const xmlChar *ExternalID);
+XMLPUBFUN const xmlChar * XMLCALL
+		htmlGetMetaEncoding	(htmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		htmlSetMetaEncoding	(htmlDocPtr doc,
+					 const xmlChar *encoding);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		htmlDocDumpMemory	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size);
+XMLPUBFUN void XMLCALL
+		htmlDocDumpMemoryFormat	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size,
+					 int format);
+XMLPUBFUN int XMLCALL
+		htmlDocDump		(FILE *f,
+					 xmlDocPtr cur);
+XMLPUBFUN int XMLCALL
+		htmlSaveFile		(const char *filename,
+					 xmlDocPtr cur);
+XMLPUBFUN int XMLCALL
+		htmlNodeDump		(xmlBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
+XMLPUBFUN void XMLCALL
+		htmlNodeDumpFile	(FILE *out,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
+XMLPUBFUN int XMLCALL
+		htmlNodeDumpFileFormat	(FILE *out,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 const char *encoding,
+					 int format);
+XMLPUBFUN int XMLCALL
+		htmlSaveFileEnc		(const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+		htmlSaveFileFormat	(const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding,
+					 int format);
+
+XMLPUBFUN void XMLCALL
+		htmlNodeDumpFormatOutput(xmlOutputBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 const char *encoding,
+					 int format);
+XMLPUBFUN void XMLCALL
+		htmlDocContentDumpOutput(xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+					 const char *encoding);
+XMLPUBFUN void XMLCALL
+		htmlDocContentDumpFormatOutput(xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+					 const char *encoding,
+					 int format);
+XMLPUBFUN void XMLCALL
+		htmlNodeDumpOutput	(xmlOutputBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 const char *encoding);
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+XMLPUBFUN int XMLCALL
+		htmlIsBooleanAttr	(const xmlChar *name);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_HTML_ENABLED */
+
+#endif /* __HTML_TREE_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/SAX.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/SAX.h
new file mode 100644
index 0000000..20093ce
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/SAX.h
@@ -0,0 +1,173 @@
+/*
+ * Summary: Old SAX version 1 handler, deprecated
+ * Description: DEPRECATED set of SAX version 1 interfaces used to
+ *              build the DOM tree.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SAX_H__
+#define __XML_SAX_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/xlink.h>
+
+#ifdef LIBXML_LEGACY_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN const xmlChar * XMLCALL
+		getPublicId			(void *ctx);
+XMLPUBFUN const xmlChar * XMLCALL
+		getSystemId			(void *ctx);
+XMLPUBFUN void XMLCALL
+		setDocumentLocator		(void *ctx,
+						 xmlSAXLocatorPtr loc);
+
+XMLPUBFUN int XMLCALL
+		getLineNumber			(void *ctx);
+XMLPUBFUN int XMLCALL
+		getColumnNumber			(void *ctx);
+
+XMLPUBFUN int XMLCALL
+		isStandalone			(void *ctx);
+XMLPUBFUN int XMLCALL
+		hasInternalSubset		(void *ctx);
+XMLPUBFUN int XMLCALL
+		hasExternalSubset		(void *ctx);
+
+XMLPUBFUN void XMLCALL
+		internalSubset			(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN void XMLCALL
+		externalSubset			(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		getEntity			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		getParameterEntity		(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		resolveEntity			(void *ctx,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+
+XMLPUBFUN void XMLCALL
+		entityDecl			(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 xmlChar *content);
+XMLPUBFUN void XMLCALL
+		attributeDecl			(void *ctx,
+						 const xmlChar *elem,
+						 const xmlChar *fullname,
+						 int type,
+						 int def,
+						 const xmlChar *defaultValue,
+						 xmlEnumerationPtr tree);
+XMLPUBFUN void XMLCALL
+		elementDecl			(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		notationDecl			(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+XMLPUBFUN void XMLCALL
+		unparsedEntityDecl		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 const xmlChar *notationName);
+
+XMLPUBFUN void XMLCALL
+		startDocument			(void *ctx);
+XMLPUBFUN void XMLCALL
+		endDocument			(void *ctx);
+XMLPUBFUN void XMLCALL
+		attribute			(void *ctx,
+						 const xmlChar *fullname,
+						 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		startElement			(void *ctx,
+						 const xmlChar *fullname,
+						 const xmlChar **atts);
+XMLPUBFUN void XMLCALL
+		endElement			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		reference			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		characters			(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		ignorableWhitespace		(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		processingInstruction		(void *ctx,
+						 const xmlChar *target,
+						 const xmlChar *data);
+XMLPUBFUN void XMLCALL
+		globalNamespace			(void *ctx,
+						 const xmlChar *href,
+						 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		setNamespace			(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlNsPtr XMLCALL
+		getNamespace			(void *ctx);
+XMLPUBFUN int XMLCALL
+		checkNamespace			(void *ctx,
+						 xmlChar *nameSpace);
+XMLPUBFUN void XMLCALL
+		namespaceDecl			(void *ctx,
+						 const xmlChar *href,
+						 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		comment				(void *ctx,
+						 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		cdataBlock			(void *ctx,
+						 const xmlChar *value,
+						 int len);
+
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN void XMLCALL
+		initxmlDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr,
+						 int warning);
+#ifdef LIBXML_HTML_ENABLED
+XMLPUBFUN void XMLCALL
+		inithtmlDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr);
+#endif
+#ifdef LIBXML_DOCB_ENABLED
+XMLPUBFUN void XMLCALL
+		initdocbDefaultSAXHandler	(xmlSAXHandlerV1 *hdlr);
+#endif
+#endif /* LIBXML_SAX1_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_LEGACY_ENABLED */
+
+#endif /* __XML_SAX_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/SAX2.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/SAX2.h
new file mode 100644
index 0000000..a55212e
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/SAX2.h
@@ -0,0 +1,178 @@
+/*
+ * Summary: SAX2 parser interface used to build the DOM tree
+ * Description: those are the default SAX2 interfaces used by
+ *              the library when building DOM tree.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SAX2_H__
+#define __XML_SAX2_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/xlink.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSAX2GetPublicId		(void *ctx);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSAX2GetSystemId		(void *ctx);
+XMLPUBFUN void XMLCALL
+		xmlSAX2SetDocumentLocator	(void *ctx,
+						 xmlSAXLocatorPtr loc);
+
+XMLPUBFUN int XMLCALL
+		xmlSAX2GetLineNumber		(void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSAX2GetColumnNumber		(void *ctx);
+
+XMLPUBFUN int XMLCALL
+		xmlSAX2IsStandalone		(void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSAX2HasInternalSubset	(void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSAX2HasExternalSubset	(void *ctx);
+
+XMLPUBFUN void XMLCALL
+		xmlSAX2InternalSubset		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN void XMLCALL
+		xmlSAX2ExternalSubset		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		xmlSAX2GetEntity		(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+		xmlSAX2GetParameterEntity	(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		xmlSAX2ResolveEntity		(void *ctx,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+
+XMLPUBFUN void XMLCALL
+		xmlSAX2EntityDecl		(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 xmlChar *content);
+XMLPUBFUN void XMLCALL
+		xmlSAX2AttributeDecl		(void *ctx,
+						 const xmlChar *elem,
+						 const xmlChar *fullname,
+						 int type,
+						 int def,
+						 const xmlChar *defaultValue,
+						 xmlEnumerationPtr tree);
+XMLPUBFUN void XMLCALL
+		xmlSAX2ElementDecl		(void *ctx,
+						 const xmlChar *name,
+						 int type,
+						 xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		xmlSAX2NotationDecl		(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId);
+XMLPUBFUN void XMLCALL
+		xmlSAX2UnparsedEntityDecl	(void *ctx,
+						 const xmlChar *name,
+						 const xmlChar *publicId,
+						 const xmlChar *systemId,
+						 const xmlChar *notationName);
+
+XMLPUBFUN void XMLCALL
+		xmlSAX2StartDocument		(void *ctx);
+XMLPUBFUN void XMLCALL
+		xmlSAX2EndDocument		(void *ctx);
+#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || \
+    defined(LIBXML_LEGACY_ENABLED)
+XMLPUBFUN void XMLCALL
+		xmlSAX2StartElement		(void *ctx,
+						 const xmlChar *fullname,
+						 const xmlChar **atts);
+XMLPUBFUN void XMLCALL
+		xmlSAX2EndElement		(void *ctx,
+						 const xmlChar *name);
+#endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED or LIBXML_LEGACY_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlSAX2StartElementNs		(void *ctx,
+						 const xmlChar *localname,
+						 const xmlChar *prefix,
+						 const xmlChar *URI,
+						 int nb_namespaces,
+						 const xmlChar **namespaces,
+						 int nb_attributes,
+						 int nb_defaulted,
+						 const xmlChar **attributes);
+XMLPUBFUN void XMLCALL
+		xmlSAX2EndElementNs		(void *ctx,
+						 const xmlChar *localname,
+						 const xmlChar *prefix,
+						 const xmlChar *URI);
+XMLPUBFUN void XMLCALL
+		xmlSAX2Reference		(void *ctx,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		xmlSAX2Characters		(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		xmlSAX2IgnorableWhitespace	(void *ctx,
+						 const xmlChar *ch,
+						 int len);
+XMLPUBFUN void XMLCALL
+		xmlSAX2ProcessingInstruction	(void *ctx,
+						 const xmlChar *target,
+						 const xmlChar *data);
+XMLPUBFUN void XMLCALL
+		xmlSAX2Comment			(void *ctx,
+						 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		xmlSAX2CDataBlock		(void *ctx,
+						 const xmlChar *value,
+						 int len);
+
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlSAXDefaultVersion		(int version);
+#endif /* LIBXML_SAX1_ENABLED */
+
+XMLPUBFUN int XMLCALL
+		xmlSAXVersion			(xmlSAXHandler *hdlr,
+						 int version);
+XMLPUBFUN void XMLCALL
+		xmlSAX2InitDefaultSAXHandler    (xmlSAXHandler *hdlr,
+						 int warning);
+#ifdef LIBXML_HTML_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlSAX2InitHtmlDefaultSAXHandler(xmlSAXHandler *hdlr);
+XMLPUBFUN void XMLCALL
+		htmlDefaultSAXHandlerInit	(void);
+#endif
+#ifdef LIBXML_DOCB_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlSAX2InitDocbDefaultSAXHandler(xmlSAXHandler *hdlr);
+XMLPUBFUN void XMLCALL
+		docbDefaultSAXHandlerInit	(void);
+#endif
+XMLPUBFUN void XMLCALL
+		xmlDefaultSAXHandlerInit	(void);
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_SAX2_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/c14n.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/c14n.h
new file mode 100644
index 0000000..af93de6
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/c14n.h
@@ -0,0 +1,128 @@
+/*
+ * Summary: Provide Canonical XML and Exclusive XML Canonicalization
+ * Description: the c14n modules provides a
+ *
+ * "Canonical XML" implementation
+ * http://www.w3.org/TR/xml-c14n
+ *
+ * and an
+ *
+ * "Exclusive XML Canonicalization" implementation
+ * http://www.w3.org/TR/xml-exc-c14n
+
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Aleksey Sanin <aleksey@aleksey.com>
+ */
+#ifndef __XML_C14N_H__
+#define __XML_C14N_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_C14N_ENABLED
+#ifdef LIBXML_OUTPUT_ENABLED
+
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/*
+ * XML Canonicalization
+ * http://www.w3.org/TR/xml-c14n
+ *
+ * Exclusive XML Canonicalization
+ * http://www.w3.org/TR/xml-exc-c14n
+ *
+ * Canonical form of an XML document could be created if and only if
+ *  a) default attributes (if any) are added to all nodes
+ *  b) all character and parsed entity references are resolved
+ * In order to achieve this in libxml2 the document MUST be loaded with
+ * following global settings:
+ *
+ *    xmlLoadExtDtdDefaultValue = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
+ *    xmlSubstituteEntitiesDefault(1);
+ *
+ * or corresponding parser context setting:
+ *    xmlParserCtxtPtr ctxt;
+ *
+ *    ...
+ *    ctxt->loadsubset = XML_DETECT_IDS | XML_COMPLETE_ATTRS;
+ *    ctxt->replaceEntities = 1;
+ *    ...
+ */
+
+/*
+ * xmlC14NMode:
+ *
+ * Predefined values for C14N modes
+ *
+ */
+typedef enum {
+    XML_C14N_1_0            = 0,    /* Original C14N 1.0 spec */
+    XML_C14N_EXCLUSIVE_1_0  = 1,    /* Exclusive C14N 1.0 spec */
+    XML_C14N_1_1            = 2     /* C14N 1.1 spec */
+} xmlC14NMode;
+
+XMLPUBFUN int XMLCALL
+		xmlC14NDocSaveTo	(xmlDocPtr doc,
+					 xmlNodeSetPtr nodes,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 xmlOutputBufferPtr buf);
+
+XMLPUBFUN int XMLCALL
+		xmlC14NDocDumpMemory	(xmlDocPtr doc,
+					 xmlNodeSetPtr nodes,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 xmlChar **doc_txt_ptr);
+
+XMLPUBFUN int XMLCALL
+		xmlC14NDocSave		(xmlDocPtr doc,
+					 xmlNodeSetPtr nodes,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 const char* filename,
+					 int compression);
+
+
+/**
+ * This is the core C14N function
+ */
+/**
+ * xmlC14NIsVisibleCallback:
+ * @user_data: user data
+ * @node: the current node
+ * @parent: the parent node
+ *
+ * Signature for a C14N callback on visible nodes
+ *
+ * Returns 1 if the node should be included
+ */
+typedef int (*xmlC14NIsVisibleCallback)	(void* user_data,
+					 xmlNodePtr node,
+					 xmlNodePtr parent);
+
+XMLPUBFUN int XMLCALL
+		xmlC14NExecute		(xmlDocPtr doc,
+					 xmlC14NIsVisibleCallback is_visible_callback,
+					 void* user_data,
+					 int mode, /* a xmlC14NMode */
+					 xmlChar **inclusive_ns_prefixes,
+					 int with_comments,
+					 xmlOutputBufferPtr buf);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+#endif /* LIBXML_C14N_ENABLED */
+#endif /* __XML_C14N_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/catalog.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/catalog.h
new file mode 100644
index 0000000..26b178d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/catalog.h
@@ -0,0 +1,182 @@
+/**
+ * Summary: interfaces to the Catalog handling system
+ * Description: the catalog module implements the support for
+ * XML Catalogs and SGML catalogs
+ *
+ * SGML Open Technical Resolution TR9401:1997.
+ * http://www.jclark.com/sp/catalog.htm
+ *
+ * XML Catalogs Working Draft 06 August 2001
+ * http://www.oasis-open.org/committees/entity/spec-2001-08-06.html
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_CATALOG_H__
+#define __XML_CATALOG_H__
+
+#include <stdio.h>
+
+#include <libxml/xmlversion.h>
+#include <libxml/xmlstring.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_CATALOG_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * XML_CATALOGS_NAMESPACE:
+ *
+ * The namespace for the XML Catalogs elements.
+ */
+#define XML_CATALOGS_NAMESPACE					\
+    (const xmlChar *) "urn:oasis:names:tc:entity:xmlns:xml:catalog"
+/**
+ * XML_CATALOG_PI:
+ *
+ * The specific XML Catalog Processing Instruction name.
+ */
+#define XML_CATALOG_PI						\
+    (const xmlChar *) "oasis-xml-catalog"
+
+/*
+ * The API is voluntarily limited to general cataloging.
+ */
+typedef enum {
+    XML_CATA_PREFER_NONE = 0,
+    XML_CATA_PREFER_PUBLIC = 1,
+    XML_CATA_PREFER_SYSTEM
+} xmlCatalogPrefer;
+
+typedef enum {
+    XML_CATA_ALLOW_NONE = 0,
+    XML_CATA_ALLOW_GLOBAL = 1,
+    XML_CATA_ALLOW_DOCUMENT = 2,
+    XML_CATA_ALLOW_ALL = 3
+} xmlCatalogAllow;
+
+typedef struct _xmlCatalog xmlCatalog;
+typedef xmlCatalog *xmlCatalogPtr;
+
+/*
+ * Operations on a given catalog.
+ */
+XMLPUBFUN xmlCatalogPtr XMLCALL
+		xmlNewCatalog		(int sgml);
+XMLPUBFUN xmlCatalogPtr XMLCALL
+		xmlLoadACatalog		(const char *filename);
+XMLPUBFUN xmlCatalogPtr XMLCALL
+		xmlLoadSGMLSuperCatalog	(const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlConvertSGMLCatalog	(xmlCatalogPtr catal);
+XMLPUBFUN int XMLCALL
+		xmlACatalogAdd		(xmlCatalogPtr catal,
+					 const xmlChar *type,
+					 const xmlChar *orig,
+					 const xmlChar *replace);
+XMLPUBFUN int XMLCALL
+		xmlACatalogRemove	(xmlCatalogPtr catal,
+					 const xmlChar *value);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolve	(xmlCatalogPtr catal,
+					 const xmlChar *pubID,
+	                                 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolveSystem(xmlCatalogPtr catal,
+					 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolvePublic(xmlCatalogPtr catal,
+					 const xmlChar *pubID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlACatalogResolveURI	(xmlCatalogPtr catal,
+					 const xmlChar *URI);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlACatalogDump		(xmlCatalogPtr catal,
+					 FILE *out);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeCatalog		(xmlCatalogPtr catal);
+XMLPUBFUN int XMLCALL
+		xmlCatalogIsEmpty	(xmlCatalogPtr catal);
+
+/*
+ * Global operations.
+ */
+XMLPUBFUN void XMLCALL
+		xmlInitializeCatalog	(void);
+XMLPUBFUN int XMLCALL
+		xmlLoadCatalog		(const char *filename);
+XMLPUBFUN void XMLCALL
+		xmlLoadCatalogs		(const char *paths);
+XMLPUBFUN void XMLCALL
+		xmlCatalogCleanup	(void);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlCatalogDump		(FILE *out);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolve	(const xmlChar *pubID,
+	                                 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolveSystem	(const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolvePublic	(const xmlChar *pubID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogResolveURI	(const xmlChar *URI);
+XMLPUBFUN int XMLCALL
+		xmlCatalogAdd		(const xmlChar *type,
+					 const xmlChar *orig,
+					 const xmlChar *replace);
+XMLPUBFUN int XMLCALL
+		xmlCatalogRemove	(const xmlChar *value);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseCatalogFile	(const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlCatalogConvert	(void);
+
+/*
+ * Strictly minimal interfaces for per-document catalogs used
+ * by the parser.
+ */
+XMLPUBFUN void XMLCALL
+		xmlCatalogFreeLocal	(void *catalogs);
+XMLPUBFUN void * XMLCALL
+		xmlCatalogAddLocal	(void *catalogs,
+					 const xmlChar *URL);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogLocalResolve	(void *catalogs,
+					 const xmlChar *pubID,
+	                                 const xmlChar *sysID);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlCatalogLocalResolveURI(void *catalogs,
+					 const xmlChar *URI);
+/*
+ * Preference settings.
+ */
+XMLPUBFUN int XMLCALL
+		xmlCatalogSetDebug	(int level);
+XMLPUBFUN xmlCatalogPrefer XMLCALL
+		xmlCatalogSetDefaultPrefer(xmlCatalogPrefer prefer);
+XMLPUBFUN void XMLCALL
+		xmlCatalogSetDefaults	(xmlCatalogAllow allow);
+XMLPUBFUN xmlCatalogAllow XMLCALL
+		xmlCatalogGetDefaults	(void);
+
+
+/* DEPRECATED interfaces */
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlCatalogGetSystem	(const xmlChar *sysID);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlCatalogGetPublic	(const xmlChar *pubID);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* LIBXML_CATALOG_ENABLED */
+#endif /* __XML_CATALOG_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/chvalid.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/chvalid.h
new file mode 100644
index 0000000..fb43016
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/chvalid.h
@@ -0,0 +1,230 @@
+/*
+ * Summary: Unicode character range checking
+ * Description: this module exports interfaces for the character
+ *               range validation APIs
+ *
+ * This file is automatically generated from the cvs source
+ * definition files using the genChRanges.py Python script
+ *
+ * Generation date: Mon Mar 27 11:09:48 2006
+ * Sources: chvalid.def
+ * Author: William Brack <wbrack@mmm.com.hk>
+ */
+
+#ifndef __XML_CHVALID_H__
+#define __XML_CHVALID_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Define our typedefs and structures
+ *
+ */
+typedef struct _xmlChSRange xmlChSRange;
+typedef xmlChSRange *xmlChSRangePtr;
+struct _xmlChSRange {
+    unsigned short	low;
+    unsigned short	high;
+};
+
+typedef struct _xmlChLRange xmlChLRange;
+typedef xmlChLRange *xmlChLRangePtr;
+struct _xmlChLRange {
+    unsigned int	low;
+    unsigned int	high;
+};
+
+typedef struct _xmlChRangeGroup xmlChRangeGroup;
+typedef xmlChRangeGroup *xmlChRangeGroupPtr;
+struct _xmlChRangeGroup {
+    int			nbShortRange;
+    int			nbLongRange;
+    const xmlChSRange	*shortRange;	/* points to an array of ranges */
+    const xmlChLRange	*longRange;
+};
+
+/**
+ * Range checking routine
+ */
+XMLPUBFUN int XMLCALL
+		xmlCharInRange(unsigned int val, const xmlChRangeGroup *group);
+
+
+/**
+ * xmlIsBaseChar_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBaseChar_ch(c)	(((0x41 <= (c)) && ((c) <= 0x5a)) || \
+				 ((0x61 <= (c)) && ((c) <= 0x7a)) || \
+				 ((0xc0 <= (c)) && ((c) <= 0xd6)) || \
+				 ((0xd8 <= (c)) && ((c) <= 0xf6)) || \
+				  (0xf8 <= (c)))
+
+/**
+ * xmlIsBaseCharQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBaseCharQ(c)	(((c) < 0x100) ? \
+				 xmlIsBaseChar_ch((c)) : \
+				 xmlCharInRange((c), &xmlIsBaseCharGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsBaseCharGroup;
+
+/**
+ * xmlIsBlank_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBlank_ch(c)	(((c) == 0x20) || \
+				 ((0x9 <= (c)) && ((c) <= 0xa)) || \
+				 ((c) == 0xd))
+
+/**
+ * xmlIsBlankQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsBlankQ(c)		(((c) < 0x100) ? \
+				 xmlIsBlank_ch((c)) : 0)
+
+
+/**
+ * xmlIsChar_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsChar_ch(c)		(((0x9 <= (c)) && ((c) <= 0xa)) || \
+				 ((c) == 0xd) || \
+				  (0x20 <= (c)))
+
+/**
+ * xmlIsCharQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsCharQ(c)		(((c) < 0x100) ? \
+				 xmlIsChar_ch((c)) :\
+				(((0x100 <= (c)) && ((c) <= 0xd7ff)) || \
+				 ((0xe000 <= (c)) && ((c) <= 0xfffd)) || \
+				 ((0x10000 <= (c)) && ((c) <= 0x10ffff))))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsCharGroup;
+
+/**
+ * xmlIsCombiningQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsCombiningQ(c)	(((c) < 0x100) ? \
+				 0 : \
+				 xmlCharInRange((c), &xmlIsCombiningGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsCombiningGroup;
+
+/**
+ * xmlIsDigit_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsDigit_ch(c)	(((0x30 <= (c)) && ((c) <= 0x39)))
+
+/**
+ * xmlIsDigitQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsDigitQ(c)		(((c) < 0x100) ? \
+				 xmlIsDigit_ch((c)) : \
+				 xmlCharInRange((c), &xmlIsDigitGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsDigitGroup;
+
+/**
+ * xmlIsExtender_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsExtender_ch(c)	(((c) == 0xb7))
+
+/**
+ * xmlIsExtenderQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsExtenderQ(c)	(((c) < 0x100) ? \
+				 xmlIsExtender_ch((c)) : \
+				 xmlCharInRange((c), &xmlIsExtenderGroup))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsExtenderGroup;
+
+/**
+ * xmlIsIdeographicQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsIdeographicQ(c)	(((c) < 0x100) ? \
+				 0 :\
+				(((0x4e00 <= (c)) && ((c) <= 0x9fa5)) || \
+				 ((c) == 0x3007) || \
+				 ((0x3021 <= (c)) && ((c) <= 0x3029))))
+
+XMLPUBVAR const xmlChRangeGroup xmlIsIdeographicGroup;
+XMLPUBVAR const unsigned char xmlIsPubidChar_tab[256];
+
+/**
+ * xmlIsPubidChar_ch:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsPubidChar_ch(c)	(xmlIsPubidChar_tab[(c)])
+
+/**
+ * xmlIsPubidCharQ:
+ * @c: char to validate
+ *
+ * Automatically generated by genChRanges.py
+ */
+#define xmlIsPubidCharQ(c)	(((c) < 0x100) ? \
+				 xmlIsPubidChar_ch((c)) : 0)
+
+XMLPUBFUN int XMLCALL
+		xmlIsBaseChar(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsBlank(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsChar(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsCombining(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsDigit(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsExtender(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsIdeographic(unsigned int ch);
+XMLPUBFUN int XMLCALL
+		xmlIsPubidChar(unsigned int ch);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_CHVALID_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/debugXML.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/debugXML.h
new file mode 100644
index 0000000..5b3be13
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/debugXML.h
@@ -0,0 +1,217 @@
+/*
+ * Summary: Tree debugging APIs
+ * Description: Interfaces to a set of routines used for debugging the tree
+ *              produced by the XML parser.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __DEBUG_XML__
+#define __DEBUG_XML__
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_DEBUG_ENABLED
+
+#include <libxml/xpath.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The standard Dump routines.
+ */
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpString	(FILE *output,
+				 const xmlChar *str);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpAttr	(FILE *output,
+				 xmlAttrPtr attr,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpAttrList	(FILE *output,
+				 xmlAttrPtr attr,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpOneNode	(FILE *output,
+				 xmlNodePtr node,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpNode	(FILE *output,
+				 xmlNodePtr node,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpNodeList	(FILE *output,
+				 xmlNodePtr node,
+				 int depth);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpDocumentHead(FILE *output,
+				 xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpDocument	(FILE *output,
+				 xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpDTD		(FILE *output,
+				 xmlDtdPtr dtd);
+XMLPUBFUN void XMLCALL
+	xmlDebugDumpEntities	(FILE *output,
+				 xmlDocPtr doc);
+
+/****************************************************************
+ *								*
+ *			Checking routines			*
+ *								*
+ ****************************************************************/
+
+XMLPUBFUN int XMLCALL
+	xmlDebugCheckDocument	(FILE * output,
+				 xmlDocPtr doc);
+
+/****************************************************************
+ *								*
+ *			XML shell helpers			*
+ *								*
+ ****************************************************************/
+
+XMLPUBFUN void XMLCALL
+	xmlLsOneNode		(FILE *output, xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+	xmlLsCountNode		(xmlNodePtr node);
+
+XMLPUBFUN const char * XMLCALL
+	xmlBoolToText		(int boolval);
+
+/****************************************************************
+ *								*
+ *	 The XML shell related structures and functions		*
+ *								*
+ ****************************************************************/
+
+#ifdef LIBXML_XPATH_ENABLED
+/**
+ * xmlShellReadlineFunc:
+ * @prompt:  a string prompt
+ *
+ * This is a generic signature for the XML shell input function.
+ *
+ * Returns a string which will be freed by the Shell.
+ */
+typedef char * (* xmlShellReadlineFunc)(char *prompt);
+
+/**
+ * xmlShellCtxt:
+ *
+ * A debugging shell context.
+ * TODO: add the defined function tables.
+ */
+typedef struct _xmlShellCtxt xmlShellCtxt;
+typedef xmlShellCtxt *xmlShellCtxtPtr;
+struct _xmlShellCtxt {
+    char *filename;
+    xmlDocPtr doc;
+    xmlNodePtr node;
+    xmlXPathContextPtr pctxt;
+    int loaded;
+    FILE *output;
+    xmlShellReadlineFunc input;
+};
+
+/**
+ * xmlShellCmd:
+ * @ctxt:  a shell context
+ * @arg:  a string argument
+ * @node:  a first node
+ * @node2:  a second node
+ *
+ * This is a generic signature for the XML shell functions.
+ *
+ * Returns an int, negative returns indicating errors.
+ */
+typedef int (* xmlShellCmd) (xmlShellCtxtPtr ctxt,
+                             char *arg,
+			     xmlNodePtr node,
+			     xmlNodePtr node2);
+
+XMLPUBFUN void XMLCALL
+	xmlShellPrintXPathError	(int errorType,
+				 const char *arg);
+XMLPUBFUN void XMLCALL
+	xmlShellPrintXPathResult(xmlXPathObjectPtr list);
+XMLPUBFUN int XMLCALL
+	xmlShellList		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellBase		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellDir		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellLoad		(xmlShellCtxtPtr ctxt,
+				 char *filename,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+	xmlShellPrintNode	(xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+	xmlShellCat		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellWrite		(xmlShellCtxtPtr ctxt,
+				 char *filename,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellSave		(xmlShellCtxtPtr ctxt,
+				 char *filename,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+#endif /* LIBXML_OUTPUT_ENABLED */
+#ifdef LIBXML_VALID_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlShellValidate	(xmlShellCtxtPtr ctxt,
+				 char *dtd,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+#endif /* LIBXML_VALID_ENABLED */
+XMLPUBFUN int XMLCALL
+	xmlShellDu		(xmlShellCtxtPtr ctxt,
+				 char *arg,
+				 xmlNodePtr tree,
+				 xmlNodePtr node2);
+XMLPUBFUN int XMLCALL
+	xmlShellPwd		(xmlShellCtxtPtr ctxt,
+				 char *buffer,
+				 xmlNodePtr node,
+				 xmlNodePtr node2);
+
+/*
+ * The Shell interface.
+ */
+XMLPUBFUN void XMLCALL
+	xmlShell		(xmlDocPtr doc,
+				 char *filename,
+				 xmlShellReadlineFunc input,
+				 FILE *output);
+
+#endif /* LIBXML_XPATH_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_DEBUG_ENABLED */
+#endif /* __DEBUG_XML__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/dict.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/dict.h
new file mode 100644
index 0000000..cf54af1
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/dict.h
@@ -0,0 +1,79 @@
+/*
+ * Summary: string dictionary
+ * Description: dictionary of reusable strings, just used to avoid allocation
+ *         and freeing operations.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_DICT_H__
+#define __XML_DICT_H__
+
+#include <stddef.h>
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The dictionary.
+ */
+typedef struct _xmlDict xmlDict;
+typedef xmlDict *xmlDictPtr;
+
+/*
+ * Initializer
+ */
+XMLPUBFUN int XMLCALL  xmlInitializeDict(void);
+
+/*
+ * Constructor and destructor.
+ */
+XMLPUBFUN xmlDictPtr XMLCALL
+			xmlDictCreate	(void);
+XMLPUBFUN size_t XMLCALL
+			xmlDictSetLimit	(xmlDictPtr dict,
+                                         size_t limit);
+XMLPUBFUN size_t XMLCALL
+			xmlDictGetUsage (xmlDictPtr dict);
+XMLPUBFUN xmlDictPtr XMLCALL
+			xmlDictCreateSub(xmlDictPtr sub);
+XMLPUBFUN int XMLCALL
+			xmlDictReference(xmlDictPtr dict);
+XMLPUBFUN void XMLCALL
+			xmlDictFree	(xmlDictPtr dict);
+
+/*
+ * Lookup of entry in the dictionary.
+ */
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlDictLookup	(xmlDictPtr dict,
+		                         const xmlChar *name,
+		                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlDictExists	(xmlDictPtr dict,
+		                         const xmlChar *name,
+		                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlDictQLookup	(xmlDictPtr dict,
+		                         const xmlChar *prefix,
+		                         const xmlChar *name);
+XMLPUBFUN int XMLCALL
+			xmlDictOwns	(xmlDictPtr dict,
+					 const xmlChar *str);
+XMLPUBFUN int XMLCALL
+			xmlDictSize	(xmlDictPtr dict);
+
+/*
+ * Cleanup function
+ */
+XMLPUBFUN void XMLCALL
+                        xmlDictCleanup  (void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* ! __XML_DICT_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/encoding.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/encoding.h
new file mode 100644
index 0000000..c875af6
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/encoding.h
@@ -0,0 +1,245 @@
+/*
+ * Summary: interface for the encoding conversion functions
+ * Description: interface for the encoding conversion functions needed for
+ *              XML basic encoding and iconv() support.
+ *
+ * Related specs are
+ * rfc2044        (UTF-8 and UTF-16) F. Yergeau Alis Technologies
+ * [ISO-10646]    UTF-8 and UTF-16 in Annexes
+ * [ISO-8859-1]   ISO Latin-1 characters codes.
+ * [UNICODE]      The Unicode Consortium, "The Unicode Standard --
+ *                Worldwide Character Encoding -- Version 1.0", Addison-
+ *                Wesley, Volume 1, 1991, Volume 2, 1992.  UTF-8 is
+ *                described in Unicode Technical Report #4.
+ * [US-ASCII]     Coded Character Set--7-bit American Standard Code for
+ *                Information Interchange, ANSI X3.4-1986.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_CHAR_ENCODING_H__
+#define __XML_CHAR_ENCODING_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_ICONV_ENABLED
+#include <iconv.h>
+#endif
+#ifdef LIBXML_ICU_ENABLED
+#include <unicode/ucnv.h>
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * xmlCharEncoding:
+ *
+ * Predefined values for some standard encodings.
+ * Libxml does not do beforehand translation on UTF8 and ISOLatinX.
+ * It also supports ASCII, ISO-8859-1, and UTF16 (LE and BE) by default.
+ *
+ * Anything else would have to be translated to UTF8 before being
+ * given to the parser itself. The BOM for UTF16 and the encoding
+ * declaration are looked at and a converter is looked for at that
+ * point. If not found the parser stops here as asked by the XML REC. A
+ * converter can be registered by the user using xmlRegisterCharEncodingHandler
+ * but the current form doesn't allow stateful transcoding (a serious
+ * problem agreed !). If iconv has been found it will be used
+ * automatically and allow stateful transcoding, the simplest is then
+ * to be sure to enable iconv and to provide iconv libs for the encoding
+ * support needed.
+ *
+ * Note that the generic "UTF-16" is not a predefined value.  Instead, only
+ * the specific UTF-16LE and UTF-16BE are present.
+ */
+typedef enum {
+    XML_CHAR_ENCODING_ERROR=   -1, /* No char encoding detected */
+    XML_CHAR_ENCODING_NONE=	0, /* No char encoding detected */
+    XML_CHAR_ENCODING_UTF8=	1, /* UTF-8 */
+    XML_CHAR_ENCODING_UTF16LE=	2, /* UTF-16 little endian */
+    XML_CHAR_ENCODING_UTF16BE=	3, /* UTF-16 big endian */
+    XML_CHAR_ENCODING_UCS4LE=	4, /* UCS-4 little endian */
+    XML_CHAR_ENCODING_UCS4BE=	5, /* UCS-4 big endian */
+    XML_CHAR_ENCODING_EBCDIC=	6, /* EBCDIC uh! */
+    XML_CHAR_ENCODING_UCS4_2143=7, /* UCS-4 unusual ordering */
+    XML_CHAR_ENCODING_UCS4_3412=8, /* UCS-4 unusual ordering */
+    XML_CHAR_ENCODING_UCS2=	9, /* UCS-2 */
+    XML_CHAR_ENCODING_8859_1=	10,/* ISO-8859-1 ISO Latin 1 */
+    XML_CHAR_ENCODING_8859_2=	11,/* ISO-8859-2 ISO Latin 2 */
+    XML_CHAR_ENCODING_8859_3=	12,/* ISO-8859-3 */
+    XML_CHAR_ENCODING_8859_4=	13,/* ISO-8859-4 */
+    XML_CHAR_ENCODING_8859_5=	14,/* ISO-8859-5 */
+    XML_CHAR_ENCODING_8859_6=	15,/* ISO-8859-6 */
+    XML_CHAR_ENCODING_8859_7=	16,/* ISO-8859-7 */
+    XML_CHAR_ENCODING_8859_8=	17,/* ISO-8859-8 */
+    XML_CHAR_ENCODING_8859_9=	18,/* ISO-8859-9 */
+    XML_CHAR_ENCODING_2022_JP=  19,/* ISO-2022-JP */
+    XML_CHAR_ENCODING_SHIFT_JIS=20,/* Shift_JIS */
+    XML_CHAR_ENCODING_EUC_JP=   21,/* EUC-JP */
+    XML_CHAR_ENCODING_ASCII=    22 /* pure ASCII */
+} xmlCharEncoding;
+
+/**
+ * xmlCharEncodingInputFunc:
+ * @out:  a pointer to an array of bytes to store the UTF-8 result
+ * @outlen:  the length of @out
+ * @in:  a pointer to an array of chars in the original encoding
+ * @inlen:  the length of @in
+ *
+ * Take a block of chars in the original encoding and try to convert
+ * it to an UTF-8 block of chars out.
+ *
+ * Returns the number of bytes written, -1 if lack of space, or -2
+ *     if the transcoding failed.
+ * The value of @inlen after return is the number of octets consumed
+ *     if the return value is positive, else unpredictiable.
+ * The value of @outlen after return is the number of octets consumed.
+ */
+typedef int (* xmlCharEncodingInputFunc)(unsigned char *out, int *outlen,
+                                         const unsigned char *in, int *inlen);
+
+
+/**
+ * xmlCharEncodingOutputFunc:
+ * @out:  a pointer to an array of bytes to store the result
+ * @outlen:  the length of @out
+ * @in:  a pointer to an array of UTF-8 chars
+ * @inlen:  the length of @in
+ *
+ * Take a block of UTF-8 chars in and try to convert it to another
+ * encoding.
+ * Note: a first call designed to produce heading info is called with
+ * in = NULL. If stateful this should also initialize the encoder state.
+ *
+ * Returns the number of bytes written, -1 if lack of space, or -2
+ *     if the transcoding failed.
+ * The value of @inlen after return is the number of octets consumed
+ *     if the return value is positive, else unpredictiable.
+ * The value of @outlen after return is the number of octets produced.
+ */
+typedef int (* xmlCharEncodingOutputFunc)(unsigned char *out, int *outlen,
+                                          const unsigned char *in, int *inlen);
+
+
+/*
+ * Block defining the handlers for non UTF-8 encodings.
+ * If iconv is supported, there are two extra fields.
+ */
+#ifdef LIBXML_ICU_ENABLED
+/* Size of pivot buffer, same as icu/source/common/ucnv.cpp CHUNK_SIZE */
+#define ICU_PIVOT_BUF_SIZE 1024
+struct _uconv_t {
+  UConverter *uconv; /* for conversion between an encoding and UTF-16 */
+  UConverter *utf8; /* for conversion between UTF-8 and UTF-16 */
+  UChar      pivot_buf[ICU_PIVOT_BUF_SIZE];
+  UChar      *pivot_source;
+  UChar      *pivot_target;
+};
+typedef struct _uconv_t uconv_t;
+#endif
+
+typedef struct _xmlCharEncodingHandler xmlCharEncodingHandler;
+typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;
+struct _xmlCharEncodingHandler {
+    char                       *name;
+    xmlCharEncodingInputFunc   input;
+    xmlCharEncodingOutputFunc  output;
+#ifdef LIBXML_ICONV_ENABLED
+    iconv_t                    iconv_in;
+    iconv_t                    iconv_out;
+#endif /* LIBXML_ICONV_ENABLED */
+#ifdef LIBXML_ICU_ENABLED
+    uconv_t                    *uconv_in;
+    uconv_t                    *uconv_out;
+#endif /* LIBXML_ICU_ENABLED */
+};
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/tree.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Interfaces for encoding handlers.
+ */
+XMLPUBFUN void XMLCALL
+	xmlInitCharEncodingHandlers	(void);
+XMLPUBFUN void XMLCALL
+	xmlCleanupCharEncodingHandlers	(void);
+XMLPUBFUN void XMLCALL
+	xmlRegisterCharEncodingHandler	(xmlCharEncodingHandlerPtr handler);
+XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
+	xmlGetCharEncodingHandler	(xmlCharEncoding enc);
+XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
+	xmlFindCharEncodingHandler	(const char *name);
+XMLPUBFUN xmlCharEncodingHandlerPtr XMLCALL
+	xmlNewCharEncodingHandler	(const char *name,
+					 xmlCharEncodingInputFunc input,
+					 xmlCharEncodingOutputFunc output);
+
+/*
+ * Interfaces for encoding names and aliases.
+ */
+XMLPUBFUN int XMLCALL
+	xmlAddEncodingAlias		(const char *name,
+					 const char *alias);
+XMLPUBFUN int XMLCALL
+	xmlDelEncodingAlias		(const char *alias);
+XMLPUBFUN const char * XMLCALL
+	xmlGetEncodingAlias		(const char *alias);
+XMLPUBFUN void XMLCALL
+	xmlCleanupEncodingAliases	(void);
+XMLPUBFUN xmlCharEncoding XMLCALL
+	xmlParseCharEncoding		(const char *name);
+XMLPUBFUN const char * XMLCALL
+	xmlGetCharEncodingName		(xmlCharEncoding enc);
+
+/*
+ * Interfaces directly used by the parsers.
+ */
+XMLPUBFUN xmlCharEncoding XMLCALL
+	xmlDetectCharEncoding		(const unsigned char *in,
+					 int len);
+
+XMLPUBFUN int XMLCALL
+	xmlCharEncOutFunc		(xmlCharEncodingHandler *handler,
+					 xmlBufferPtr out,
+					 xmlBufferPtr in);
+
+XMLPUBFUN int XMLCALL
+	xmlCharEncInFunc		(xmlCharEncodingHandler *handler,
+					 xmlBufferPtr out,
+					 xmlBufferPtr in);
+XMLPUBFUN int XMLCALL
+	xmlCharEncFirstLine		(xmlCharEncodingHandler *handler,
+					 xmlBufferPtr out,
+					 xmlBufferPtr in);
+XMLPUBFUN int XMLCALL
+	xmlCharEncCloseFunc		(xmlCharEncodingHandler *handler);
+
+/*
+ * Export a few useful functions
+ */
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN int XMLCALL
+	UTF8Toisolat1			(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN int XMLCALL
+	isolat1ToUTF8			(unsigned char *out,
+					 int *outlen,
+					 const unsigned char *in,
+					 int *inlen);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_CHAR_ENCODING_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/entities.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/entities.h
new file mode 100644
index 0000000..47b4573
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/entities.h
@@ -0,0 +1,151 @@
+/*
+ * Summary: interface for the XML entities handling
+ * Description: this module provides some of the entity API needed
+ *              for the parser and applications.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_ENTITIES_H__
+#define __XML_ENTITIES_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The different valid entity types.
+ */
+typedef enum {
+    XML_INTERNAL_GENERAL_ENTITY = 1,
+    XML_EXTERNAL_GENERAL_PARSED_ENTITY = 2,
+    XML_EXTERNAL_GENERAL_UNPARSED_ENTITY = 3,
+    XML_INTERNAL_PARAMETER_ENTITY = 4,
+    XML_EXTERNAL_PARAMETER_ENTITY = 5,
+    XML_INTERNAL_PREDEFINED_ENTITY = 6
+} xmlEntityType;
+
+/*
+ * An unit of storage for an entity, contains the string, the value
+ * and the linkind data needed for the linking in the hash table.
+ */
+
+struct _xmlEntity {
+    void           *_private;	        /* application data */
+    xmlElementType          type;       /* XML_ENTITY_DECL, must be second ! */
+    const xmlChar          *name;	/* Entity name */
+    struct _xmlNode    *children;	/* First child link */
+    struct _xmlNode        *last;	/* Last child link */
+    struct _xmlDtd       *parent;	/* -> DTD */
+    struct _xmlNode        *next;	/* next sibling link  */
+    struct _xmlNode        *prev;	/* previous sibling link  */
+    struct _xmlDoc          *doc;       /* the containing document */
+
+    xmlChar                *orig;	/* content without ref substitution */
+    xmlChar             *content;	/* content or ndata if unparsed */
+    int                   length;	/* the content length */
+    xmlEntityType          etype;	/* The entity type */
+    const xmlChar    *ExternalID;	/* External identifier for PUBLIC */
+    const xmlChar      *SystemID;	/* URI for a SYSTEM or PUBLIC Entity */
+
+    struct _xmlEntity     *nexte;	/* unused */
+    const xmlChar           *URI;	/* the full URI as computed */
+    int                    owner;	/* does the entity own the childrens */
+    int			 checked;	/* was the entity content checked */
+					/* this is also used to count entities
+					 * references done from that entity
+					 * and if it contains '<' */
+};
+
+/*
+ * All entities are stored in an hash table.
+ * There is 2 separate hash tables for global and parameter entities.
+ */
+
+typedef struct _xmlHashTable xmlEntitiesTable;
+typedef xmlEntitiesTable *xmlEntitiesTablePtr;
+
+/*
+ * External functions:
+ */
+
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlInitializePredefinedEntities	(void);
+#endif /* LIBXML_LEGACY_ENABLED */
+
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlNewEntity		(xmlDocPtr doc,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID,
+						 const xmlChar *content);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlAddDocEntity		(xmlDocPtr doc,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID,
+						 const xmlChar *content);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlAddDtdEntity		(xmlDocPtr doc,
+						 const xmlChar *name,
+						 int type,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID,
+						 const xmlChar *content);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetPredefinedEntity	(const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetDocEntity		(const xmlDoc *doc,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetDtdEntity		(xmlDocPtr doc,
+						 const xmlChar *name);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlGetParameterEntity	(xmlDocPtr doc,
+						 const xmlChar *name);
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlEncodeEntities	(xmlDocPtr doc,
+						 const xmlChar *input);
+#endif /* LIBXML_LEGACY_ENABLED */
+XMLPUBFUN xmlChar * XMLCALL
+			xmlEncodeEntitiesReentrant(xmlDocPtr doc,
+						 const xmlChar *input);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlEncodeSpecialChars	(const xmlDoc *doc,
+						 const xmlChar *input);
+XMLPUBFUN xmlEntitiesTablePtr XMLCALL
+			xmlCreateEntitiesTable	(void);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlEntitiesTablePtr XMLCALL
+			xmlCopyEntitiesTable	(xmlEntitiesTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+			xmlFreeEntitiesTable	(xmlEntitiesTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+			xmlDumpEntitiesTable	(xmlBufferPtr buf,
+						 xmlEntitiesTablePtr table);
+XMLPUBFUN void XMLCALL
+			xmlDumpEntityDecl	(xmlBufferPtr buf,
+						 xmlEntityPtr ent);
+#endif /* LIBXML_OUTPUT_ENABLED */
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN void XMLCALL
+			xmlCleanupPredefinedEntities(void);
+#endif /* LIBXML_LEGACY_ENABLED */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+# endif /* __XML_ENTITIES_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/globals.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/globals.h
new file mode 100644
index 0000000..5e41b7b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/globals.h
@@ -0,0 +1,508 @@
+/*
+ * Summary: interface for all global variables of the library
+ * Description: all the global variables and thread handling for
+ *              those variables is handled by this module.
+ *
+ * The bottom of this file is automatically generated by build_glob.py
+ * based on the description file global.data
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Gary Pennington <Gary.Pennington@uk.sun.com>, Daniel Veillard
+ */
+
+#ifndef __XML_GLOBALS_H
+#define __XML_GLOBALS_H
+
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/xmlerror.h>
+#include <libxml/SAX2.h>
+#include <libxml/xmlmemory.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+XMLPUBFUN void XMLCALL xmlInitGlobals(void);
+XMLPUBFUN void XMLCALL xmlCleanupGlobals(void);
+
+/**
+ * xmlParserInputBufferCreateFilenameFunc:
+ * @URI: the URI to read from
+ * @enc: the requested source encoding
+ *
+ * Signature for the function doing the lookup for a suitable input method
+ * corresponding to an URI.
+ *
+ * Returns the new xmlParserInputBufferPtr in case of success or NULL if no
+ *         method was found.
+ */
+typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI,
+									   xmlCharEncoding enc);
+
+
+/**
+ * xmlOutputBufferCreateFilenameFunc:
+ * @URI: the URI to write to
+ * @enc: the requested target encoding
+ *
+ * Signature for the function doing the lookup for a suitable output method
+ * corresponding to an URI.
+ *
+ * Returns the new xmlOutputBufferPtr in case of success or NULL if no
+ *         method was found.
+ */
+typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI,
+								 xmlCharEncodingHandlerPtr encoder,
+								 int compression);
+
+XMLPUBFUN xmlParserInputBufferCreateFilenameFunc
+XMLCALL xmlParserInputBufferCreateFilenameDefault (xmlParserInputBufferCreateFilenameFunc func);
+XMLPUBFUN xmlOutputBufferCreateFilenameFunc
+XMLCALL xmlOutputBufferCreateFilenameDefault (xmlOutputBufferCreateFilenameFunc func);
+
+/*
+ * Externally global symbols which need to be protected for backwards
+ * compatibility support.
+ */
+
+#undef	docbDefaultSAXHandler
+#undef	htmlDefaultSAXHandler
+#undef	oldXMLWDcompatibility
+#undef	xmlBufferAllocScheme
+#undef	xmlDefaultBufferSize
+#undef	xmlDefaultSAXHandler
+#undef	xmlDefaultSAXLocator
+#undef	xmlDoValidityCheckingDefaultValue
+#undef	xmlFree
+#undef	xmlGenericError
+#undef	xmlStructuredError
+#undef	xmlGenericErrorContext
+#undef	xmlStructuredErrorContext
+#undef	xmlGetWarningsDefaultValue
+#undef	xmlIndentTreeOutput
+#undef  xmlTreeIndentString
+#undef	xmlKeepBlanksDefaultValue
+#undef	xmlLineNumbersDefaultValue
+#undef	xmlLoadExtDtdDefaultValue
+#undef	xmlMalloc
+#undef	xmlMallocAtomic
+#undef	xmlMemStrdup
+#undef	xmlParserDebugEntities
+#undef	xmlParserVersion
+#undef	xmlPedanticParserDefaultValue
+#undef	xmlRealloc
+#undef	xmlSaveNoEmptyTags
+#undef	xmlSubstituteEntitiesDefaultValue
+#undef  xmlRegisterNodeDefaultValue
+#undef  xmlDeregisterNodeDefaultValue
+#undef  xmlLastError
+#undef  xmlParserInputBufferCreateFilenameValue
+#undef  xmlOutputBufferCreateFilenameValue
+
+/**
+ * xmlRegisterNodeFunc:
+ * @node: the current node
+ *
+ * Signature for the registration callback of a created node
+ */
+typedef void (*xmlRegisterNodeFunc) (xmlNodePtr node);
+/**
+ * xmlDeregisterNodeFunc:
+ * @node: the current node
+ *
+ * Signature for the deregistration callback of a discarded node
+ */
+typedef void (*xmlDeregisterNodeFunc) (xmlNodePtr node);
+
+typedef struct _xmlGlobalState xmlGlobalState;
+typedef xmlGlobalState *xmlGlobalStatePtr;
+struct _xmlGlobalState
+{
+	const char *xmlParserVersion;
+
+	xmlSAXLocator xmlDefaultSAXLocator;
+	xmlSAXHandlerV1 xmlDefaultSAXHandler;
+	xmlSAXHandlerV1 docbDefaultSAXHandler;
+	xmlSAXHandlerV1 htmlDefaultSAXHandler;
+
+	xmlFreeFunc xmlFree;
+	xmlMallocFunc xmlMalloc;
+	xmlStrdupFunc xmlMemStrdup;
+	xmlReallocFunc xmlRealloc;
+
+	xmlGenericErrorFunc xmlGenericError;
+	xmlStructuredErrorFunc xmlStructuredError;
+	void *xmlGenericErrorContext;
+
+	int oldXMLWDcompatibility;
+
+	xmlBufferAllocationScheme xmlBufferAllocScheme;
+	int xmlDefaultBufferSize;
+
+	int xmlSubstituteEntitiesDefaultValue;
+	int xmlDoValidityCheckingDefaultValue;
+	int xmlGetWarningsDefaultValue;
+	int xmlKeepBlanksDefaultValue;
+	int xmlLineNumbersDefaultValue;
+	int xmlLoadExtDtdDefaultValue;
+	int xmlParserDebugEntities;
+	int xmlPedanticParserDefaultValue;
+
+	int xmlSaveNoEmptyTags;
+	int xmlIndentTreeOutput;
+	const char *xmlTreeIndentString;
+
+	xmlRegisterNodeFunc xmlRegisterNodeDefaultValue;
+	xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue;
+
+	xmlMallocFunc xmlMallocAtomic;
+	xmlError xmlLastError;
+
+	xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue;
+	xmlOutputBufferCreateFilenameFunc xmlOutputBufferCreateFilenameValue;
+
+	void *xmlStructuredErrorContext;
+};
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/threads.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+XMLPUBFUN void XMLCALL	xmlInitializeGlobalState(xmlGlobalStatePtr gs);
+
+XMLPUBFUN void XMLCALL xmlThrDefSetGenericErrorFunc(void *ctx, xmlGenericErrorFunc handler);
+
+XMLPUBFUN void XMLCALL xmlThrDefSetStructuredErrorFunc(void *ctx, xmlStructuredErrorFunc handler);
+
+XMLPUBFUN xmlRegisterNodeFunc XMLCALL xmlRegisterNodeDefault(xmlRegisterNodeFunc func);
+XMLPUBFUN xmlRegisterNodeFunc XMLCALL xmlThrDefRegisterNodeDefault(xmlRegisterNodeFunc func);
+XMLPUBFUN xmlDeregisterNodeFunc XMLCALL xmlDeregisterNodeDefault(xmlDeregisterNodeFunc func);
+XMLPUBFUN xmlDeregisterNodeFunc XMLCALL xmlThrDefDeregisterNodeDefault(xmlDeregisterNodeFunc func);
+
+XMLPUBFUN xmlOutputBufferCreateFilenameFunc XMLCALL
+	xmlThrDefOutputBufferCreateFilenameDefault(xmlOutputBufferCreateFilenameFunc func);
+XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL
+	xmlThrDefParserInputBufferCreateFilenameDefault(
+				xmlParserInputBufferCreateFilenameFunc func);
+
+/** DOC_DISABLE */
+/*
+ * In general the memory allocation entry points are not kept
+ * thread specific but this can be overridden by LIBXML_THREAD_ALLOC_ENABLED
+ *    - xmlMalloc
+ *    - xmlMallocAtomic
+ *    - xmlRealloc
+ *    - xmlMemStrdup
+ *    - xmlFree
+ */
+
+#ifdef LIBXML_THREAD_ALLOC_ENABLED
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlMallocFunc * XMLCALL __xmlMalloc(void);
+#define xmlMalloc \
+(*(__xmlMalloc()))
+#else
+XMLPUBVAR xmlMallocFunc xmlMalloc;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlMallocFunc * XMLCALL __xmlMallocAtomic(void);
+#define xmlMallocAtomic \
+(*(__xmlMallocAtomic()))
+#else
+XMLPUBVAR xmlMallocFunc xmlMallocAtomic;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlReallocFunc * XMLCALL __xmlRealloc(void);
+#define xmlRealloc \
+(*(__xmlRealloc()))
+#else
+XMLPUBVAR xmlReallocFunc xmlRealloc;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlFreeFunc * XMLCALL __xmlFree(void);
+#define xmlFree \
+(*(__xmlFree()))
+#else
+XMLPUBVAR xmlFreeFunc xmlFree;
+#endif
+
+#ifdef LIBXML_THREAD_ENABLED
+XMLPUBFUN  xmlStrdupFunc * XMLCALL __xmlMemStrdup(void);
+#define xmlMemStrdup \
+(*(__xmlMemStrdup()))
+#else
+XMLPUBVAR xmlStrdupFunc xmlMemStrdup;
+#endif
+
+#else /* !LIBXML_THREAD_ALLOC_ENABLED */
+XMLPUBVAR xmlMallocFunc xmlMalloc;
+XMLPUBVAR xmlMallocFunc xmlMallocAtomic;
+XMLPUBVAR xmlReallocFunc xmlRealloc;
+XMLPUBVAR xmlFreeFunc xmlFree;
+XMLPUBVAR xmlStrdupFunc xmlMemStrdup;
+#endif /* LIBXML_THREAD_ALLOC_ENABLED */
+
+#ifdef LIBXML_DOCB_ENABLED
+XMLPUBFUN  xmlSAXHandlerV1 * XMLCALL __docbDefaultSAXHandler(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define docbDefaultSAXHandler \
+(*(__docbDefaultSAXHandler()))
+#else
+XMLPUBVAR xmlSAXHandlerV1 docbDefaultSAXHandler;
+#endif
+#endif
+
+#ifdef LIBXML_HTML_ENABLED
+XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __htmlDefaultSAXHandler(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define htmlDefaultSAXHandler \
+(*(__htmlDefaultSAXHandler()))
+#else
+XMLPUBVAR xmlSAXHandlerV1 htmlDefaultSAXHandler;
+#endif
+#endif
+
+XMLPUBFUN xmlError * XMLCALL __xmlLastError(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlLastError \
+(*(__xmlLastError()))
+#else
+XMLPUBVAR xmlError xmlLastError;
+#endif
+
+/*
+ * Everything starting from the line below is
+ * Automatically generated by build_glob.py.
+ * Do not modify the previous line.
+ */
+
+
+XMLPUBFUN int * XMLCALL __oldXMLWDcompatibility(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define oldXMLWDcompatibility \
+(*(__oldXMLWDcompatibility()))
+#else
+XMLPUBVAR int oldXMLWDcompatibility;
+#endif
+
+XMLPUBFUN xmlBufferAllocationScheme * XMLCALL __xmlBufferAllocScheme(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlBufferAllocScheme \
+(*(__xmlBufferAllocScheme()))
+#else
+XMLPUBVAR xmlBufferAllocationScheme xmlBufferAllocScheme;
+#endif
+XMLPUBFUN xmlBufferAllocationScheme XMLCALL
+	xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v);
+
+XMLPUBFUN int * XMLCALL __xmlDefaultBufferSize(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDefaultBufferSize \
+(*(__xmlDefaultBufferSize()))
+#else
+XMLPUBVAR int xmlDefaultBufferSize;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefDefaultBufferSize(int v);
+
+XMLPUBFUN xmlSAXHandlerV1 * XMLCALL __xmlDefaultSAXHandler(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDefaultSAXHandler \
+(*(__xmlDefaultSAXHandler()))
+#else
+XMLPUBVAR xmlSAXHandlerV1 xmlDefaultSAXHandler;
+#endif
+
+XMLPUBFUN xmlSAXLocator * XMLCALL __xmlDefaultSAXLocator(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDefaultSAXLocator \
+(*(__xmlDefaultSAXLocator()))
+#else
+XMLPUBVAR xmlSAXLocator xmlDefaultSAXLocator;
+#endif
+
+XMLPUBFUN int * XMLCALL __xmlDoValidityCheckingDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDoValidityCheckingDefaultValue \
+(*(__xmlDoValidityCheckingDefaultValue()))
+#else
+XMLPUBVAR int xmlDoValidityCheckingDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefDoValidityCheckingDefaultValue(int v);
+
+XMLPUBFUN xmlGenericErrorFunc * XMLCALL __xmlGenericError(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlGenericError \
+(*(__xmlGenericError()))
+#else
+XMLPUBVAR xmlGenericErrorFunc xmlGenericError;
+#endif
+
+XMLPUBFUN xmlStructuredErrorFunc * XMLCALL __xmlStructuredError(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlStructuredError \
+(*(__xmlStructuredError()))
+#else
+XMLPUBVAR xmlStructuredErrorFunc xmlStructuredError;
+#endif
+
+XMLPUBFUN void * * XMLCALL __xmlGenericErrorContext(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlGenericErrorContext \
+(*(__xmlGenericErrorContext()))
+#else
+XMLPUBVAR void * xmlGenericErrorContext;
+#endif
+
+XMLPUBFUN void * * XMLCALL __xmlStructuredErrorContext(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlStructuredErrorContext \
+(*(__xmlStructuredErrorContext()))
+#else
+XMLPUBVAR void * xmlStructuredErrorContext;
+#endif
+
+XMLPUBFUN int * XMLCALL __xmlGetWarningsDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlGetWarningsDefaultValue \
+(*(__xmlGetWarningsDefaultValue()))
+#else
+XMLPUBVAR int xmlGetWarningsDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefGetWarningsDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlIndentTreeOutput(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlIndentTreeOutput \
+(*(__xmlIndentTreeOutput()))
+#else
+XMLPUBVAR int xmlIndentTreeOutput;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefIndentTreeOutput(int v);
+
+XMLPUBFUN const char * * XMLCALL __xmlTreeIndentString(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlTreeIndentString \
+(*(__xmlTreeIndentString()))
+#else
+XMLPUBVAR const char * xmlTreeIndentString;
+#endif
+XMLPUBFUN const char * XMLCALL xmlThrDefTreeIndentString(const char * v);
+
+XMLPUBFUN int * XMLCALL __xmlKeepBlanksDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlKeepBlanksDefaultValue \
+(*(__xmlKeepBlanksDefaultValue()))
+#else
+XMLPUBVAR int xmlKeepBlanksDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefKeepBlanksDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlLineNumbersDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlLineNumbersDefaultValue \
+(*(__xmlLineNumbersDefaultValue()))
+#else
+XMLPUBVAR int xmlLineNumbersDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefLineNumbersDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlLoadExtDtdDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlLoadExtDtdDefaultValue \
+(*(__xmlLoadExtDtdDefaultValue()))
+#else
+XMLPUBVAR int xmlLoadExtDtdDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefLoadExtDtdDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlParserDebugEntities(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlParserDebugEntities \
+(*(__xmlParserDebugEntities()))
+#else
+XMLPUBVAR int xmlParserDebugEntities;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefParserDebugEntities(int v);
+
+XMLPUBFUN const char * * XMLCALL __xmlParserVersion(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlParserVersion \
+(*(__xmlParserVersion()))
+#else
+XMLPUBVAR const char * xmlParserVersion;
+#endif
+
+XMLPUBFUN int * XMLCALL __xmlPedanticParserDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlPedanticParserDefaultValue \
+(*(__xmlPedanticParserDefaultValue()))
+#else
+XMLPUBVAR int xmlPedanticParserDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefPedanticParserDefaultValue(int v);
+
+XMLPUBFUN int * XMLCALL __xmlSaveNoEmptyTags(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlSaveNoEmptyTags \
+(*(__xmlSaveNoEmptyTags()))
+#else
+XMLPUBVAR int xmlSaveNoEmptyTags;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefSaveNoEmptyTags(int v);
+
+XMLPUBFUN int * XMLCALL __xmlSubstituteEntitiesDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlSubstituteEntitiesDefaultValue \
+(*(__xmlSubstituteEntitiesDefaultValue()))
+#else
+XMLPUBVAR int xmlSubstituteEntitiesDefaultValue;
+#endif
+XMLPUBFUN int XMLCALL xmlThrDefSubstituteEntitiesDefaultValue(int v);
+
+XMLPUBFUN xmlRegisterNodeFunc * XMLCALL __xmlRegisterNodeDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlRegisterNodeDefaultValue \
+(*(__xmlRegisterNodeDefaultValue()))
+#else
+XMLPUBVAR xmlRegisterNodeFunc xmlRegisterNodeDefaultValue;
+#endif
+
+XMLPUBFUN xmlDeregisterNodeFunc * XMLCALL __xmlDeregisterNodeDefaultValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlDeregisterNodeDefaultValue \
+(*(__xmlDeregisterNodeDefaultValue()))
+#else
+XMLPUBVAR xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue;
+#endif
+
+XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL \
+				__xmlParserInputBufferCreateFilenameValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlParserInputBufferCreateFilenameValue \
+(*(__xmlParserInputBufferCreateFilenameValue()))
+#else
+XMLPUBVAR xmlParserInputBufferCreateFilenameFunc xmlParserInputBufferCreateFilenameValue;
+#endif
+
+XMLPUBFUN xmlOutputBufferCreateFilenameFunc * XMLCALL __xmlOutputBufferCreateFilenameValue(void);
+#ifdef LIBXML_THREAD_ENABLED
+#define xmlOutputBufferCreateFilenameValue \
+(*(__xmlOutputBufferCreateFilenameValue()))
+#else
+XMLPUBVAR xmlOutputBufferCreateFilenameFunc xmlOutputBufferCreateFilenameValue;
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_GLOBALS_H */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/hash.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/hash.h
new file mode 100644
index 0000000..b682b6b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/hash.h
@@ -0,0 +1,236 @@
+/*
+ * Summary: Chained hash tables
+ * Description: This module implements the hash table support used in
+ *		various places in the library.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Bjorn Reese <bjorn.reese@systematic.dk>
+ */
+
+#ifndef __XML_HASH_H__
+#define __XML_HASH_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The hash table.
+ */
+typedef struct _xmlHashTable xmlHashTable;
+typedef xmlHashTable *xmlHashTablePtr;
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/dict.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Recent version of gcc produce a warning when a function pointer is assigned
+ * to an object pointer, or vice versa.  The following macro is a dirty hack
+ * to allow suppression of the warning.  If your architecture has function
+ * pointers which are a different size than a void pointer, there may be some
+ * serious trouble within the library.
+ */
+/**
+ * XML_CAST_FPTR:
+ * @fptr:  pointer to a function
+ *
+ * Macro to do a casting from an object pointer to a
+ * function pointer without encountering a warning from
+ * gcc
+ *
+ * #define XML_CAST_FPTR(fptr) (*(void **)(&fptr))
+ * This macro violated ISO C aliasing rules (gcc4 on s390 broke)
+ * so it is disabled now
+ */
+
+#define XML_CAST_FPTR(fptr) fptr
+
+
+/*
+ * function types:
+ */
+/**
+ * xmlHashDeallocator:
+ * @payload:  the data in the hash
+ * @name:  the name associated
+ *
+ * Callback to free data from a hash.
+ */
+typedef void (*xmlHashDeallocator)(void *payload, const xmlChar *name);
+/**
+ * xmlHashCopier:
+ * @payload:  the data in the hash
+ * @name:  the name associated
+ *
+ * Callback to copy data from a hash.
+ *
+ * Returns a copy of the data or NULL in case of error.
+ */
+typedef void *(*xmlHashCopier)(void *payload, const xmlChar *name);
+/**
+ * xmlHashScanner:
+ * @payload:  the data in the hash
+ * @data:  extra scanner data
+ * @name:  the name associated
+ *
+ * Callback when scanning data in a hash with the simple scanner.
+ */
+typedef void (*xmlHashScanner)(void *payload, void *data, const xmlChar *name);
+/**
+ * xmlHashScannerFull:
+ * @payload:  the data in the hash
+ * @data:  extra scanner data
+ * @name:  the name associated
+ * @name2:  the second name associated
+ * @name3:  the third name associated
+ *
+ * Callback when scanning data in a hash with the full scanner.
+ */
+typedef void (*xmlHashScannerFull)(void *payload, void *data,
+				   const xmlChar *name, const xmlChar *name2,
+				   const xmlChar *name3);
+
+/*
+ * Constructor and destructor.
+ */
+XMLPUBFUN xmlHashTablePtr XMLCALL
+			xmlHashCreate	(int size);
+XMLPUBFUN xmlHashTablePtr XMLCALL
+			xmlHashCreateDict(int size,
+					 xmlDictPtr dict);
+XMLPUBFUN void XMLCALL
+			xmlHashFree	(xmlHashTablePtr table,
+					 xmlHashDeallocator f);
+XMLPUBFUN void XMLCALL
+			xmlHashDefaultDeallocator(void *entry,
+					 const xmlChar *name);
+
+/*
+ * Add a new entry to the hash table.
+ */
+XMLPUBFUN int XMLCALL
+			xmlHashAddEntry	(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         void *userdata);
+XMLPUBFUN int XMLCALL
+			xmlHashUpdateEntry(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         void *userdata,
+					 xmlHashDeallocator f);
+XMLPUBFUN int XMLCALL
+			xmlHashAddEntry2(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         void *userdata);
+XMLPUBFUN int XMLCALL
+			xmlHashUpdateEntry2(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         void *userdata,
+					 xmlHashDeallocator f);
+XMLPUBFUN int XMLCALL
+			xmlHashAddEntry3(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         const xmlChar *name3,
+		                         void *userdata);
+XMLPUBFUN int XMLCALL
+			xmlHashUpdateEntry3(xmlHashTablePtr table,
+		                         const xmlChar *name,
+		                         const xmlChar *name2,
+		                         const xmlChar *name3,
+		                         void *userdata,
+					 xmlHashDeallocator f);
+
+/*
+ * Remove an entry from the hash table.
+ */
+XMLPUBFUN int XMLCALL
+			xmlHashRemoveEntry(xmlHashTablePtr table, const xmlChar *name,
+                           xmlHashDeallocator f);
+XMLPUBFUN int XMLCALL
+			xmlHashRemoveEntry2(xmlHashTablePtr table, const xmlChar *name,
+                            const xmlChar *name2, xmlHashDeallocator f);
+XMLPUBFUN int  XMLCALL
+			xmlHashRemoveEntry3(xmlHashTablePtr table, const xmlChar *name,
+                            const xmlChar *name2, const xmlChar *name3,
+                            xmlHashDeallocator f);
+
+/*
+ * Retrieve the userdata.
+ */
+XMLPUBFUN void * XMLCALL
+			xmlHashLookup	(xmlHashTablePtr table,
+					 const xmlChar *name);
+XMLPUBFUN void * XMLCALL
+			xmlHashLookup2	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2);
+XMLPUBFUN void * XMLCALL
+			xmlHashLookup3	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2,
+					 const xmlChar *name3);
+XMLPUBFUN void * XMLCALL
+			xmlHashQLookup	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *prefix);
+XMLPUBFUN void * XMLCALL
+			xmlHashQLookup2	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *prefix,
+					 const xmlChar *name2,
+					 const xmlChar *prefix2);
+XMLPUBFUN void * XMLCALL
+			xmlHashQLookup3	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *prefix,
+					 const xmlChar *name2,
+					 const xmlChar *prefix2,
+					 const xmlChar *name3,
+					 const xmlChar *prefix3);
+
+/*
+ * Helpers.
+ */
+XMLPUBFUN xmlHashTablePtr XMLCALL
+			xmlHashCopy	(xmlHashTablePtr table,
+					 xmlHashCopier f);
+XMLPUBFUN int XMLCALL
+			xmlHashSize	(xmlHashTablePtr table);
+XMLPUBFUN void XMLCALL
+			xmlHashScan	(xmlHashTablePtr table,
+					 xmlHashScanner f,
+					 void *data);
+XMLPUBFUN void XMLCALL
+			xmlHashScan3	(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2,
+					 const xmlChar *name3,
+					 xmlHashScanner f,
+					 void *data);
+XMLPUBFUN void XMLCALL
+			xmlHashScanFull	(xmlHashTablePtr table,
+					 xmlHashScannerFull f,
+					 void *data);
+XMLPUBFUN void XMLCALL
+			xmlHashScanFull3(xmlHashTablePtr table,
+					 const xmlChar *name,
+					 const xmlChar *name2,
+					 const xmlChar *name3,
+					 xmlHashScannerFull f,
+					 void *data);
+#ifdef __cplusplus
+}
+#endif
+#endif /* ! __XML_HASH_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/list.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/list.h
new file mode 100644
index 0000000..3211c75
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/list.h
@@ -0,0 +1,137 @@
+/*
+ * Summary: lists interfaces
+ * Description: this module implement the list support used in
+ * various place in the library.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Gary Pennington <Gary.Pennington@uk.sun.com>
+ */
+
+#ifndef __XML_LINK_INCLUDE__
+#define __XML_LINK_INCLUDE__
+
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _xmlLink xmlLink;
+typedef xmlLink *xmlLinkPtr;
+
+typedef struct _xmlList xmlList;
+typedef xmlList *xmlListPtr;
+
+/**
+ * xmlListDeallocator:
+ * @lk:  the data to deallocate
+ *
+ * Callback function used to free data from a list.
+ */
+typedef void (*xmlListDeallocator) (xmlLinkPtr lk);
+/**
+ * xmlListDataCompare:
+ * @data0: the first data
+ * @data1: the second data
+ *
+ * Callback function used to compare 2 data.
+ *
+ * Returns 0 is equality, -1 or 1 otherwise depending on the ordering.
+ */
+typedef int  (*xmlListDataCompare) (const void *data0, const void *data1);
+/**
+ * xmlListWalker:
+ * @data: the data found in the list
+ * @user: extra user provided data to the walker
+ *
+ * Callback function used when walking a list with xmlListWalk().
+ *
+ * Returns 0 to stop walking the list, 1 otherwise.
+ */
+typedef int (*xmlListWalker) (const void *data, void *user);
+
+/* Creation/Deletion */
+XMLPUBFUN xmlListPtr XMLCALL
+		xmlListCreate		(xmlListDeallocator deallocator,
+	                                 xmlListDataCompare compare);
+XMLPUBFUN void XMLCALL
+		xmlListDelete		(xmlListPtr l);
+
+/* Basic Operators */
+XMLPUBFUN void * XMLCALL
+		xmlListSearch		(xmlListPtr l,
+					 void *data);
+XMLPUBFUN void * XMLCALL
+		xmlListReverseSearch	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListInsert		(xmlListPtr l,
+					 void *data) ;
+XMLPUBFUN int XMLCALL
+		xmlListAppend		(xmlListPtr l,
+					 void *data) ;
+XMLPUBFUN int XMLCALL
+		xmlListRemoveFirst	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListRemoveLast	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListRemoveAll	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN void XMLCALL
+		xmlListClear		(xmlListPtr l);
+XMLPUBFUN int XMLCALL
+		xmlListEmpty		(xmlListPtr l);
+XMLPUBFUN xmlLinkPtr XMLCALL
+		xmlListFront		(xmlListPtr l);
+XMLPUBFUN xmlLinkPtr XMLCALL
+		xmlListEnd		(xmlListPtr l);
+XMLPUBFUN int XMLCALL
+		xmlListSize		(xmlListPtr l);
+
+XMLPUBFUN void XMLCALL
+		xmlListPopFront		(xmlListPtr l);
+XMLPUBFUN void XMLCALL
+		xmlListPopBack		(xmlListPtr l);
+XMLPUBFUN int XMLCALL
+		xmlListPushFront	(xmlListPtr l,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		xmlListPushBack		(xmlListPtr l,
+					 void *data);
+
+/* Advanced Operators */
+XMLPUBFUN void XMLCALL
+		xmlListReverse		(xmlListPtr l);
+XMLPUBFUN void XMLCALL
+		xmlListSort		(xmlListPtr l);
+XMLPUBFUN void XMLCALL
+		xmlListWalk		(xmlListPtr l,
+					 xmlListWalker walker,
+					 void *user);
+XMLPUBFUN void XMLCALL
+		xmlListReverseWalk	(xmlListPtr l,
+					 xmlListWalker walker,
+					 void *user);
+XMLPUBFUN void XMLCALL
+		xmlListMerge		(xmlListPtr l1,
+					 xmlListPtr l2);
+XMLPUBFUN xmlListPtr XMLCALL
+		xmlListDup		(const xmlListPtr old);
+XMLPUBFUN int XMLCALL
+		xmlListCopy		(xmlListPtr cur,
+					 const xmlListPtr old);
+/* Link operators */
+XMLPUBFUN void * XMLCALL
+		xmlLinkGetData          (xmlLinkPtr lk);
+
+/* xmlListUnique() */
+/* xmlListSwap */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_LINK_INCLUDE__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/nanoftp.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/nanoftp.h
new file mode 100644
index 0000000..7335faf
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/nanoftp.h
@@ -0,0 +1,163 @@
+/*
+ * Summary: minimal FTP implementation
+ * Description: minimal FTP implementation allowing to fetch resources
+ *              like external subset.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __NANO_FTP_H__
+#define __NANO_FTP_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_FTP_ENABLED
+
+/* Needed for portability to Windows 64 bits */
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <winsock2.h>
+#else
+/**
+ * SOCKET:
+ *
+ * macro used to provide portability of code to windows sockets
+ */
+#define SOCKET int
+/**
+ * INVALID_SOCKET:
+ *
+ * macro used to provide portability of code to windows sockets
+ * the value to be used when the socket is not valid
+ */
+#undef  INVALID_SOCKET
+#define INVALID_SOCKET (-1)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * ftpListCallback:
+ * @userData:  user provided data for the callback
+ * @filename:  the file name (including "->" when links are shown)
+ * @attrib:  the attribute string
+ * @owner:  the owner string
+ * @group:  the group string
+ * @size:  the file size
+ * @links:  the link count
+ * @year:  the year
+ * @month:  the month
+ * @day:  the day
+ * @hour:  the hour
+ * @minute:  the minute
+ *
+ * A callback for the xmlNanoFTPList command.
+ * Note that only one of year and day:minute are specified.
+ */
+typedef void (*ftpListCallback) (void *userData,
+	                         const char *filename, const char *attrib,
+	                         const char *owner, const char *group,
+				 unsigned long size, int links, int year,
+				 const char *month, int day, int hour,
+				 int minute);
+/**
+ * ftpDataCallback:
+ * @userData: the user provided context
+ * @data: the data received
+ * @len: its size in bytes
+ *
+ * A callback for the xmlNanoFTPGet command.
+ */
+typedef void (*ftpDataCallback) (void *userData,
+				 const char *data,
+				 int len);
+
+/*
+ * Init
+ */
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPInit		(void);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPCleanup	(void);
+
+/*
+ * Creating/freeing contexts.
+ */
+XMLPUBFUN void * XMLCALL
+	xmlNanoFTPNewCtxt	(const char *URL);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPFreeCtxt	(void * ctx);
+XMLPUBFUN void * XMLCALL
+	xmlNanoFTPConnectTo	(const char *server,
+				 int port);
+/*
+ * Opening/closing session connections.
+ */
+XMLPUBFUN void * XMLCALL
+	xmlNanoFTPOpen		(const char *URL);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPConnect	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPClose		(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPQuit		(void *ctx);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPScanProxy	(const char *URL);
+XMLPUBFUN void XMLCALL
+	xmlNanoFTPProxy		(const char *host,
+				 int port,
+				 const char *user,
+				 const char *passwd,
+				 int type);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPUpdateURL	(void *ctx,
+				 const char *URL);
+
+/*
+ * Rather internal commands.
+ */
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPGetResponse	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPCheckResponse	(void *ctx);
+
+/*
+ * CD/DIR/GET handlers.
+ */
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPCwd		(void *ctx,
+				 const char *directory);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPDele		(void *ctx,
+				 const char *file);
+
+XMLPUBFUN SOCKET XMLCALL
+	xmlNanoFTPGetConnection	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPCloseConnection(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPList		(void *ctx,
+				 ftpListCallback callback,
+				 void *userData,
+				 const char *filename);
+XMLPUBFUN SOCKET XMLCALL
+	xmlNanoFTPGetSocket	(void *ctx,
+				 const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPGet		(void *ctx,
+				 ftpDataCallback callback,
+				 void *userData,
+				 const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlNanoFTPRead		(void *ctx,
+				 void *dest,
+				 int len);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* LIBXML_FTP_ENABLED */
+#endif /* __NANO_FTP_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/nanohttp.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/nanohttp.h
new file mode 100644
index 0000000..22b8fb4
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/nanohttp.h
@@ -0,0 +1,81 @@
+/*
+ * Summary: minimal HTTP implementation
+ * Description: minimal HTTP implementation allowing to fetch resources
+ *              like external subset.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __NANO_HTTP_H__
+#define __NANO_HTTP_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_HTTP_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPInit		(void);
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPCleanup	(void);
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPScanProxy	(const char *URL);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPFetch	(const char *URL,
+				 const char *filename,
+				 char **contentType);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPMethod	(const char *URL,
+				 const char *method,
+				 const char *input,
+				 char **contentType,
+				 const char *headers,
+				 int   ilen);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPMethodRedir	(const char *URL,
+				 const char *method,
+				 const char *input,
+				 char **contentType,
+				 char **redir,
+				 const char *headers,
+				 int   ilen);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPOpen		(const char *URL,
+				 char **contentType);
+XMLPUBFUN void * XMLCALL
+	xmlNanoHTTPOpenRedir	(const char *URL,
+				 char **contentType,
+				 char **redir);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPReturnCode	(void *ctx);
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPAuthHeader	(void *ctx);
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPRedir	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPContentLength( void * ctx );
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPEncoding	(void *ctx);
+XMLPUBFUN const char * XMLCALL
+	xmlNanoHTTPMimeType	(void *ctx);
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPRead		(void *ctx,
+				 void *dest,
+				 int len);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlNanoHTTPSave		(void *ctxt,
+				 const char *filename);
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN void XMLCALL
+	xmlNanoHTTPClose	(void *ctx);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_HTTP_ENABLED */
+#endif /* __NANO_HTTP_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/parser.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/parser.h
new file mode 100644
index 0000000..1c86a97
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/parser.h
@@ -0,0 +1,1241 @@
+/*
+ * Summary: the core parser module
+ * Description: Interfaces, constants and types related to the XML parser
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_PARSER_H__
+#define __XML_PARSER_H__
+
+#include <stdarg.h>
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/dict.h>
+#include <libxml/hash.h>
+#include <libxml/valid.h>
+#include <libxml/entities.h>
+#include <libxml/xmlerror.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * XML_DEFAULT_VERSION:
+ *
+ * The default version of XML used: 1.0
+ */
+#define XML_DEFAULT_VERSION	"1.0"
+
+/**
+ * xmlParserInput:
+ *
+ * An xmlParserInput is an input flow for the XML processor.
+ * Each entity parsed is associated an xmlParserInput (except the
+ * few predefined ones). This is the case both for internal entities
+ * - in which case the flow is already completely in memory - or
+ * external entities - in which case we use the buf structure for
+ * progressive reading and I18N conversions to the internal UTF-8 format.
+ */
+
+/**
+ * xmlParserInputDeallocate:
+ * @str:  the string to deallocate
+ *
+ * Callback for freeing some parser input allocations.
+ */
+typedef void (* xmlParserInputDeallocate)(xmlChar *str);
+
+struct _xmlParserInput {
+    /* Input buffer */
+    xmlParserInputBufferPtr buf;      /* UTF-8 encoded buffer */
+
+    const char *filename;             /* The file analyzed, if any */
+    const char *directory;            /* the directory/base of the file */
+    const xmlChar *base;              /* Base of the array to parse */
+    const xmlChar *cur;               /* Current char being parsed */
+    const xmlChar *end;               /* end of the array to parse */
+    int length;                       /* length if known */
+    int line;                         /* Current line */
+    int col;                          /* Current column */
+    /*
+     * NOTE: consumed is only tested for equality in the parser code,
+     *       so even if there is an overflow this should not give troubles
+     *       for parsing very large instances.
+     */
+    unsigned long consumed;           /* How many xmlChars already consumed */
+    xmlParserInputDeallocate free;    /* function to deallocate the base */
+    const xmlChar *encoding;          /* the encoding string for entity */
+    const xmlChar *version;           /* the version string for entity */
+    int standalone;                   /* Was that entity marked standalone */
+    int id;                           /* an unique identifier for the entity */
+};
+
+/**
+ * xmlParserNodeInfo:
+ *
+ * The parser can be asked to collect Node information, i.e. at what
+ * place in the file they were detected.
+ * NOTE: This is off by default and not very well tested.
+ */
+typedef struct _xmlParserNodeInfo xmlParserNodeInfo;
+typedef xmlParserNodeInfo *xmlParserNodeInfoPtr;
+
+struct _xmlParserNodeInfo {
+  const struct _xmlNode* node;
+  /* Position & line # that text that created the node begins & ends on */
+  unsigned long begin_pos;
+  unsigned long begin_line;
+  unsigned long end_pos;
+  unsigned long end_line;
+};
+
+typedef struct _xmlParserNodeInfoSeq xmlParserNodeInfoSeq;
+typedef xmlParserNodeInfoSeq *xmlParserNodeInfoSeqPtr;
+struct _xmlParserNodeInfoSeq {
+  unsigned long maximum;
+  unsigned long length;
+  xmlParserNodeInfo* buffer;
+};
+
+/**
+ * xmlParserInputState:
+ *
+ * The parser is now working also as a state based parser.
+ * The recursive one use the state info for entities processing.
+ */
+typedef enum {
+    XML_PARSER_EOF = -1,	/* nothing is to be parsed */
+    XML_PARSER_START = 0,	/* nothing has been parsed */
+    XML_PARSER_MISC,		/* Misc* before int subset */
+    XML_PARSER_PI,		/* Within a processing instruction */
+    XML_PARSER_DTD,		/* within some DTD content */
+    XML_PARSER_PROLOG,		/* Misc* after internal subset */
+    XML_PARSER_COMMENT,		/* within a comment */
+    XML_PARSER_START_TAG,	/* within a start tag */
+    XML_PARSER_CONTENT,		/* within the content */
+    XML_PARSER_CDATA_SECTION,	/* within a CDATA section */
+    XML_PARSER_END_TAG,		/* within a closing tag */
+    XML_PARSER_ENTITY_DECL,	/* within an entity declaration */
+    XML_PARSER_ENTITY_VALUE,	/* within an entity value in a decl */
+    XML_PARSER_ATTRIBUTE_VALUE,	/* within an attribute value */
+    XML_PARSER_SYSTEM_LITERAL,	/* within a SYSTEM value */
+    XML_PARSER_EPILOG,		/* the Misc* after the last end tag */
+    XML_PARSER_IGNORE,		/* within an IGNORED section */
+    XML_PARSER_PUBLIC_LITERAL	/* within a PUBLIC value */
+} xmlParserInputState;
+
+/**
+ * XML_DETECT_IDS:
+ *
+ * Bit in the loadsubset context field to tell to do ID/REFs lookups.
+ * Use it to initialize xmlLoadExtDtdDefaultValue.
+ */
+#define XML_DETECT_IDS		2
+
+/**
+ * XML_COMPLETE_ATTRS:
+ *
+ * Bit in the loadsubset context field to tell to do complete the
+ * elements attributes lists with the ones defaulted from the DTDs.
+ * Use it to initialize xmlLoadExtDtdDefaultValue.
+ */
+#define XML_COMPLETE_ATTRS	4
+
+/**
+ * XML_SKIP_IDS:
+ *
+ * Bit in the loadsubset context field to tell to not do ID/REFs registration.
+ * Used to initialize xmlLoadExtDtdDefaultValue in some special cases.
+ */
+#define XML_SKIP_IDS		8
+
+/**
+ * xmlParserMode:
+ *
+ * A parser can operate in various modes
+ */
+typedef enum {
+    XML_PARSE_UNKNOWN = 0,
+    XML_PARSE_DOM = 1,
+    XML_PARSE_SAX = 2,
+    XML_PARSE_PUSH_DOM = 3,
+    XML_PARSE_PUSH_SAX = 4,
+    XML_PARSE_READER = 5
+} xmlParserMode;
+
+/**
+ * xmlParserCtxt:
+ *
+ * The parser context.
+ * NOTE This doesn't completely define the parser state, the (current ?)
+ *      design of the parser uses recursive function calls since this allow
+ *      and easy mapping from the production rules of the specification
+ *      to the actual code. The drawback is that the actual function call
+ *      also reflect the parser state. However most of the parsing routines
+ *      takes as the only argument the parser context pointer, so migrating
+ *      to a state based parser for progressive parsing shouldn't be too hard.
+ */
+struct _xmlParserCtxt {
+    struct _xmlSAXHandler *sax;       /* The SAX handler */
+    void            *userData;        /* For SAX interface only, used by DOM build */
+    xmlDocPtr           myDoc;        /* the document being built */
+    int            wellFormed;        /* is the document well formed */
+    int       replaceEntities;        /* shall we replace entities ? */
+    const xmlChar    *version;        /* the XML version string */
+    const xmlChar   *encoding;        /* the declared encoding, if any */
+    int            standalone;        /* standalone document */
+    int                  html;        /* an HTML(1)/Docbook(2) document
+                                       * 3 is HTML after <head>
+                                       * 10 is HTML after <body>
+                                       */
+
+    /* Input stream stack */
+    xmlParserInputPtr  input;         /* Current input stream */
+    int                inputNr;       /* Number of current input streams */
+    int                inputMax;      /* Max number of input streams */
+    xmlParserInputPtr *inputTab;      /* stack of inputs */
+
+    /* Node analysis stack only used for DOM building */
+    xmlNodePtr         node;          /* Current parsed Node */
+    int                nodeNr;        /* Depth of the parsing stack */
+    int                nodeMax;       /* Max depth of the parsing stack */
+    xmlNodePtr        *nodeTab;       /* array of nodes */
+
+    int record_info;                  /* Whether node info should be kept */
+    xmlParserNodeInfoSeq node_seq;    /* info about each node parsed */
+
+    int errNo;                        /* error code */
+
+    int     hasExternalSubset;        /* reference and external subset */
+    int             hasPErefs;        /* the internal subset has PE refs */
+    int              external;        /* are we parsing an external entity */
+
+    int                 valid;        /* is the document valid */
+    int              validate;        /* shall we try to validate ? */
+    xmlValidCtxt        vctxt;        /* The validity context */
+
+    xmlParserInputState instate;      /* current type of input */
+    int                 token;        /* next char look-ahead */
+
+    char           *directory;        /* the data directory */
+
+    /* Node name stack */
+    const xmlChar     *name;          /* Current parsed Node */
+    int                nameNr;        /* Depth of the parsing stack */
+    int                nameMax;       /* Max depth of the parsing stack */
+    const xmlChar *   *nameTab;       /* array of nodes */
+
+    long               nbChars;       /* unused */
+    long            checkIndex;       /* used by progressive parsing lookup */
+    int             keepBlanks;       /* ugly but ... */
+    int             disableSAX;       /* SAX callbacks are disabled */
+    int               inSubset;       /* Parsing is in int 1/ext 2 subset */
+    const xmlChar *    intSubName;    /* name of subset */
+    xmlChar *          extSubURI;     /* URI of external subset */
+    xmlChar *          extSubSystem;  /* SYSTEM ID of external subset */
+
+    /* xml:space values */
+    int *              space;         /* Should the parser preserve spaces */
+    int                spaceNr;       /* Depth of the parsing stack */
+    int                spaceMax;      /* Max depth of the parsing stack */
+    int *              spaceTab;      /* array of space infos */
+
+    int                depth;         /* to prevent entity substitution loops */
+    xmlParserInputPtr  entity;        /* used to check entities boundaries */
+    int                charset;       /* encoding of the in-memory content
+				         actually an xmlCharEncoding */
+    int                nodelen;       /* Those two fields are there to */
+    int                nodemem;       /* Speed up large node parsing */
+    int                pedantic;      /* signal pedantic warnings */
+    void              *_private;      /* For user data, libxml won't touch it */
+
+    int                loadsubset;    /* should the external subset be loaded */
+    int                linenumbers;   /* set line number in element content */
+    void              *catalogs;      /* document's own catalog */
+    int                recovery;      /* run in recovery mode */
+    int                progressive;   /* is this a progressive parsing */
+    xmlDictPtr         dict;          /* dictionary for the parser */
+    const xmlChar *   *atts;          /* array for the attributes callbacks */
+    int                maxatts;       /* the size of the array */
+    int                docdict;       /* use strings from dict to build tree */
+
+    /*
+     * pre-interned strings
+     */
+    const xmlChar *str_xml;
+    const xmlChar *str_xmlns;
+    const xmlChar *str_xml_ns;
+
+    /*
+     * Everything below is used only by the new SAX mode
+     */
+    int                sax2;          /* operating in the new SAX mode */
+    int                nsNr;          /* the number of inherited namespaces */
+    int                nsMax;         /* the size of the arrays */
+    const xmlChar *   *nsTab;         /* the array of prefix/namespace name */
+    int               *attallocs;     /* which attribute were allocated */
+    void *            *pushTab;       /* array of data for push */
+    xmlHashTablePtr    attsDefault;   /* defaulted attributes if any */
+    xmlHashTablePtr    attsSpecial;   /* non-CDATA attributes if any */
+    int                nsWellFormed;  /* is the document XML Namespace okay */
+    int                options;       /* Extra options */
+
+    /*
+     * Those fields are needed only for streaming parsing so far
+     */
+    int               dictNames;    /* Use dictionary names for the tree */
+    int               freeElemsNr;  /* number of freed element nodes */
+    xmlNodePtr        freeElems;    /* List of freed element nodes */
+    int               freeAttrsNr;  /* number of freed attributes nodes */
+    xmlAttrPtr        freeAttrs;    /* List of freed attributes nodes */
+
+    /*
+     * the complete error information for the last error.
+     */
+    xmlError          lastError;
+    xmlParserMode     parseMode;    /* the parser mode */
+    unsigned long    nbentities;    /* number of entities references */
+    unsigned long  sizeentities;    /* size of parsed entities */
+
+    /* for use by HTML non-recursive parser */
+    xmlParserNodeInfo *nodeInfo;      /* Current NodeInfo */
+    int                nodeInfoNr;    /* Depth of the parsing stack */
+    int                nodeInfoMax;   /* Max depth of the parsing stack */
+    xmlParserNodeInfo *nodeInfoTab;   /* array of nodeInfos */
+
+    int                input_id;      /* we need to label inputs */
+    unsigned long      sizeentcopy;   /* volume of entity copy */
+};
+
+/**
+ * xmlSAXLocator:
+ *
+ * A SAX Locator.
+ */
+struct _xmlSAXLocator {
+    const xmlChar *(*getPublicId)(void *ctx);
+    const xmlChar *(*getSystemId)(void *ctx);
+    int (*getLineNumber)(void *ctx);
+    int (*getColumnNumber)(void *ctx);
+};
+
+/**
+ * xmlSAXHandler:
+ *
+ * A SAX handler is bunch of callbacks called by the parser when processing
+ * of the input generate data or structure information.
+ */
+
+/**
+ * resolveEntitySAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ *
+ * Callback:
+ * The entity loader, to control the loading of external entities,
+ * the application can either:
+ *    - override this resolveEntity() callback in the SAX block
+ *    - or better use the xmlSetExternalEntityLoader() function to
+ *      set up it's own entity resolution routine
+ *
+ * Returns the xmlParserInputPtr if inlined or NULL for DOM behaviour.
+ */
+typedef xmlParserInputPtr (*resolveEntitySAXFunc) (void *ctx,
+				const xmlChar *publicId,
+				const xmlChar *systemId);
+/**
+ * internalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the root element name
+ * @ExternalID:  the external ID
+ * @SystemID:  the SYSTEM ID (e.g. filename or URL)
+ *
+ * Callback on internal subset declaration.
+ */
+typedef void (*internalSubsetSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar *ExternalID,
+				const xmlChar *SystemID);
+/**
+ * externalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the root element name
+ * @ExternalID:  the external ID
+ * @SystemID:  the SYSTEM ID (e.g. filename or URL)
+ *
+ * Callback on external subset declaration.
+ */
+typedef void (*externalSubsetSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar *ExternalID,
+				const xmlChar *SystemID);
+/**
+ * getEntitySAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The entity name
+ *
+ * Get an entity by name.
+ *
+ * Returns the xmlEntityPtr if found.
+ */
+typedef xmlEntityPtr (*getEntitySAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * getParameterEntitySAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The entity name
+ *
+ * Get a parameter entity by name.
+ *
+ * Returns the xmlEntityPtr if found.
+ */
+typedef xmlEntityPtr (*getParameterEntitySAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * entityDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the entity name
+ * @type:  the entity type
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ * @content: the entity value (without processing).
+ *
+ * An entity definition has been parsed.
+ */
+typedef void (*entityDeclSAXFunc) (void *ctx,
+				const xmlChar *name,
+				int type,
+				const xmlChar *publicId,
+				const xmlChar *systemId,
+				xmlChar *content);
+/**
+ * notationDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The name of the notation
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ *
+ * What to do when a notation declaration has been parsed.
+ */
+typedef void (*notationDeclSAXFunc)(void *ctx,
+				const xmlChar *name,
+				const xmlChar *publicId,
+				const xmlChar *systemId);
+/**
+ * attributeDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @elem:  the name of the element
+ * @fullname:  the attribute name
+ * @type:  the attribute type
+ * @def:  the type of default value
+ * @defaultValue: the attribute default value
+ * @tree:  the tree of enumerated value set
+ *
+ * An attribute definition has been parsed.
+ */
+typedef void (*attributeDeclSAXFunc)(void *ctx,
+				const xmlChar *elem,
+				const xmlChar *fullname,
+				int type,
+				int def,
+				const xmlChar *defaultValue,
+				xmlEnumerationPtr tree);
+/**
+ * elementDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  the element name
+ * @type:  the element type
+ * @content: the element value tree
+ *
+ * An element definition has been parsed.
+ */
+typedef void (*elementDeclSAXFunc)(void *ctx,
+				const xmlChar *name,
+				int type,
+				xmlElementContentPtr content);
+/**
+ * unparsedEntityDeclSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name: The name of the entity
+ * @publicId: The public ID of the entity
+ * @systemId: The system ID of the entity
+ * @notationName: the name of the notation
+ *
+ * What to do when an unparsed entity declaration is parsed.
+ */
+typedef void (*unparsedEntityDeclSAXFunc)(void *ctx,
+				const xmlChar *name,
+				const xmlChar *publicId,
+				const xmlChar *systemId,
+				const xmlChar *notationName);
+/**
+ * setDocumentLocatorSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @loc: A SAX Locator
+ *
+ * Receive the document locator at startup, actually xmlDefaultSAXLocator.
+ * Everything is available on the context, so this is useless in our case.
+ */
+typedef void (*setDocumentLocatorSAXFunc) (void *ctx,
+				xmlSAXLocatorPtr loc);
+/**
+ * startDocumentSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Called when the document start being processed.
+ */
+typedef void (*startDocumentSAXFunc) (void *ctx);
+/**
+ * endDocumentSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Called when the document end has been detected.
+ */
+typedef void (*endDocumentSAXFunc) (void *ctx);
+/**
+ * startElementSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The element name, including namespace prefix
+ * @atts:  An array of name/value attributes pairs, NULL terminated
+ *
+ * Called when an opening tag has been processed.
+ */
+typedef void (*startElementSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar **atts);
+/**
+ * endElementSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The element name
+ *
+ * Called when the end of an element has been detected.
+ */
+typedef void (*endElementSAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * attributeSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The attribute name, including namespace prefix
+ * @value:  The attribute value
+ *
+ * Handle an attribute that has been read by the parser.
+ * The default handling is to convert the attribute into an
+ * DOM subtree and past it in a new xmlAttr element added to
+ * the element.
+ */
+typedef void (*attributeSAXFunc) (void *ctx,
+				const xmlChar *name,
+				const xmlChar *value);
+/**
+ * referenceSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @name:  The entity name
+ *
+ * Called when an entity reference is detected.
+ */
+typedef void (*referenceSAXFunc) (void *ctx,
+				const xmlChar *name);
+/**
+ * charactersSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @ch:  a xmlChar string
+ * @len: the number of xmlChar
+ *
+ * Receiving some chars from the parser.
+ */
+typedef void (*charactersSAXFunc) (void *ctx,
+				const xmlChar *ch,
+				int len);
+/**
+ * ignorableWhitespaceSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @ch:  a xmlChar string
+ * @len: the number of xmlChar
+ *
+ * Receiving some ignorable whitespaces from the parser.
+ * UNUSED: by default the DOM building will use characters.
+ */
+typedef void (*ignorableWhitespaceSAXFunc) (void *ctx,
+				const xmlChar *ch,
+				int len);
+/**
+ * processingInstructionSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @target:  the target name
+ * @data: the PI data's
+ *
+ * A processing instruction has been parsed.
+ */
+typedef void (*processingInstructionSAXFunc) (void *ctx,
+				const xmlChar *target,
+				const xmlChar *data);
+/**
+ * commentSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @value:  the comment content
+ *
+ * A comment has been parsed.
+ */
+typedef void (*commentSAXFunc) (void *ctx,
+				const xmlChar *value);
+/**
+ * cdataBlockSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ * @value:  The pcdata content
+ * @len:  the block length
+ *
+ * Called when a pcdata block has been parsed.
+ */
+typedef void (*cdataBlockSAXFunc) (
+	                        void *ctx,
+				const xmlChar *value,
+				int len);
+/**
+ * warningSAXFunc:
+ * @ctx:  an XML parser context
+ * @msg:  the message to display/transmit
+ * @...:  extra parameters for the message display
+ *
+ * Display and format a warning messages, callback.
+ */
+typedef void (XMLCDECL *warningSAXFunc) (void *ctx,
+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * errorSAXFunc:
+ * @ctx:  an XML parser context
+ * @msg:  the message to display/transmit
+ * @...:  extra parameters for the message display
+ *
+ * Display and format an error messages, callback.
+ */
+typedef void (XMLCDECL *errorSAXFunc) (void *ctx,
+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * fatalErrorSAXFunc:
+ * @ctx:  an XML parser context
+ * @msg:  the message to display/transmit
+ * @...:  extra parameters for the message display
+ *
+ * Display and format fatal error messages, callback.
+ * Note: so far fatalError() SAX callbacks are not used, error()
+ *       get all the callbacks for errors.
+ */
+typedef void (XMLCDECL *fatalErrorSAXFunc) (void *ctx,
+				const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * isStandaloneSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Is this document tagged standalone?
+ *
+ * Returns 1 if true
+ */
+typedef int (*isStandaloneSAXFunc) (void *ctx);
+/**
+ * hasInternalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Does this document has an internal subset.
+ *
+ * Returns 1 if true
+ */
+typedef int (*hasInternalSubsetSAXFunc) (void *ctx);
+
+/**
+ * hasExternalSubsetSAXFunc:
+ * @ctx:  the user data (XML parser context)
+ *
+ * Does this document has an external subset?
+ *
+ * Returns 1 if true
+ */
+typedef int (*hasExternalSubsetSAXFunc) (void *ctx);
+
+/************************************************************************
+ *									*
+ *			The SAX version 2 API extensions		*
+ *									*
+ ************************************************************************/
+/**
+ * XML_SAX2_MAGIC:
+ *
+ * Special constant found in SAX2 blocks initialized fields
+ */
+#define XML_SAX2_MAGIC 0xDEEDBEAF
+
+/**
+ * startElementNsSAX2Func:
+ * @ctx:  the user data (XML parser context)
+ * @localname:  the local name of the element
+ * @prefix:  the element namespace prefix if available
+ * @URI:  the element namespace name if available
+ * @nb_namespaces:  number of namespace definitions on that node
+ * @namespaces:  pointer to the array of prefix/URI pairs namespace definitions
+ * @nb_attributes:  the number of attributes on that node
+ * @nb_defaulted:  the number of defaulted attributes. The defaulted
+ *                  ones are at the end of the array
+ * @attributes:  pointer to the array of (localname/prefix/URI/value/end)
+ *               attribute values.
+ *
+ * SAX2 callback when an element start has been detected by the parser.
+ * It provides the namespace information for the element, as well as
+ * the new namespace declarations on the element.
+ */
+
+typedef void (*startElementNsSAX2Func) (void *ctx,
+					const xmlChar *localname,
+					const xmlChar *prefix,
+					const xmlChar *URI,
+					int nb_namespaces,
+					const xmlChar **namespaces,
+					int nb_attributes,
+					int nb_defaulted,
+					const xmlChar **attributes);
+
+/**
+ * endElementNsSAX2Func:
+ * @ctx:  the user data (XML parser context)
+ * @localname:  the local name of the element
+ * @prefix:  the element namespace prefix if available
+ * @URI:  the element namespace name if available
+ *
+ * SAX2 callback when an element end has been detected by the parser.
+ * It provides the namespace information for the element.
+ */
+
+typedef void (*endElementNsSAX2Func)   (void *ctx,
+					const xmlChar *localname,
+					const xmlChar *prefix,
+					const xmlChar *URI);
+
+
+struct _xmlSAXHandler {
+    internalSubsetSAXFunc internalSubset;
+    isStandaloneSAXFunc isStandalone;
+    hasInternalSubsetSAXFunc hasInternalSubset;
+    hasExternalSubsetSAXFunc hasExternalSubset;
+    resolveEntitySAXFunc resolveEntity;
+    getEntitySAXFunc getEntity;
+    entityDeclSAXFunc entityDecl;
+    notationDeclSAXFunc notationDecl;
+    attributeDeclSAXFunc attributeDecl;
+    elementDeclSAXFunc elementDecl;
+    unparsedEntityDeclSAXFunc unparsedEntityDecl;
+    setDocumentLocatorSAXFunc setDocumentLocator;
+    startDocumentSAXFunc startDocument;
+    endDocumentSAXFunc endDocument;
+    startElementSAXFunc startElement;
+    endElementSAXFunc endElement;
+    referenceSAXFunc reference;
+    charactersSAXFunc characters;
+    ignorableWhitespaceSAXFunc ignorableWhitespace;
+    processingInstructionSAXFunc processingInstruction;
+    commentSAXFunc comment;
+    warningSAXFunc warning;
+    errorSAXFunc error;
+    fatalErrorSAXFunc fatalError; /* unused error() get all the errors */
+    getParameterEntitySAXFunc getParameterEntity;
+    cdataBlockSAXFunc cdataBlock;
+    externalSubsetSAXFunc externalSubset;
+    unsigned int initialized;
+    /* The following fields are extensions available only on version 2 */
+    void *_private;
+    startElementNsSAX2Func startElementNs;
+    endElementNsSAX2Func endElementNs;
+    xmlStructuredErrorFunc serror;
+};
+
+/*
+ * SAX Version 1
+ */
+typedef struct _xmlSAXHandlerV1 xmlSAXHandlerV1;
+typedef xmlSAXHandlerV1 *xmlSAXHandlerV1Ptr;
+struct _xmlSAXHandlerV1 {
+    internalSubsetSAXFunc internalSubset;
+    isStandaloneSAXFunc isStandalone;
+    hasInternalSubsetSAXFunc hasInternalSubset;
+    hasExternalSubsetSAXFunc hasExternalSubset;
+    resolveEntitySAXFunc resolveEntity;
+    getEntitySAXFunc getEntity;
+    entityDeclSAXFunc entityDecl;
+    notationDeclSAXFunc notationDecl;
+    attributeDeclSAXFunc attributeDecl;
+    elementDeclSAXFunc elementDecl;
+    unparsedEntityDeclSAXFunc unparsedEntityDecl;
+    setDocumentLocatorSAXFunc setDocumentLocator;
+    startDocumentSAXFunc startDocument;
+    endDocumentSAXFunc endDocument;
+    startElementSAXFunc startElement;
+    endElementSAXFunc endElement;
+    referenceSAXFunc reference;
+    charactersSAXFunc characters;
+    ignorableWhitespaceSAXFunc ignorableWhitespace;
+    processingInstructionSAXFunc processingInstruction;
+    commentSAXFunc comment;
+    warningSAXFunc warning;
+    errorSAXFunc error;
+    fatalErrorSAXFunc fatalError; /* unused error() get all the errors */
+    getParameterEntitySAXFunc getParameterEntity;
+    cdataBlockSAXFunc cdataBlock;
+    externalSubsetSAXFunc externalSubset;
+    unsigned int initialized;
+};
+
+
+/**
+ * xmlExternalEntityLoader:
+ * @URL: The System ID of the resource requested
+ * @ID: The Public ID of the resource requested
+ * @context: the XML parser context
+ *
+ * External entity loaders types.
+ *
+ * Returns the entity input parser.
+ */
+typedef xmlParserInputPtr (*xmlExternalEntityLoader) (const char *URL,
+					 const char *ID,
+					 xmlParserCtxtPtr context);
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <libxml/encoding.h>
+#include <libxml/xmlIO.h>
+#include <libxml/globals.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*
+ * Init/Cleanup
+ */
+XMLPUBFUN void XMLCALL
+		xmlInitParser		(void);
+XMLPUBFUN void XMLCALL
+		xmlCleanupParser	(void);
+
+/*
+ * Input functions
+ */
+XMLPUBFUN int XMLCALL
+		xmlParserInputRead	(xmlParserInputPtr in,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlParserInputGrow	(xmlParserInputPtr in,
+					 int len);
+
+/*
+ * Basic parsing Interfaces
+ */
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseDoc		(const xmlChar *cur);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseFile		(const char *filename);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseMemory		(const char *buffer,
+					 int size);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN int XMLCALL
+		xmlSubstituteEntitiesDefault(int val);
+XMLPUBFUN int XMLCALL
+		xmlKeepBlanksDefault	(int val);
+XMLPUBFUN void XMLCALL
+		xmlStopParser		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlPedanticParserDefault(int val);
+XMLPUBFUN int XMLCALL
+		xmlLineNumbersDefault	(int val);
+
+#ifdef LIBXML_SAX1_ENABLED
+/*
+ * Recovery mode
+ */
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlRecoverDoc		(const xmlChar *cur);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlRecoverMemory	(const char *buffer,
+					 int size);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlRecoverFile		(const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
+
+/*
+ * Less common routines and SAX interfaces
+ */
+XMLPUBFUN int XMLCALL
+		xmlParseDocument	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlParseExtParsedEnt	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlSAXUserParseFile	(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlSAXUserParseMemory	(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 const char *buffer,
+					 int size);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseDoc		(xmlSAXHandlerPtr sax,
+					 const xmlChar *cur,
+					 int recovery);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseMemory	(xmlSAXHandlerPtr sax,
+					 const char *buffer,
+					 int size,
+					 int recovery);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseMemoryWithData (xmlSAXHandlerPtr sax,
+					 const char *buffer,
+					 int size,
+					 int recovery,
+					 void *data);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseFile		(xmlSAXHandlerPtr sax,
+					 const char *filename,
+					 int recovery);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseFileWithData	(xmlSAXHandlerPtr sax,
+					 const char *filename,
+					 int recovery,
+					 void *data);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlSAXParseEntity	(xmlSAXHandlerPtr sax,
+					 const char *filename);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlParseEntity		(const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
+
+#ifdef LIBXML_VALID_ENABLED
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlSAXParseDTD		(xmlSAXHandlerPtr sax,
+					 const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlParseDTD		(const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlIOParseDTD		(xmlSAXHandlerPtr sax,
+					 xmlParserInputBufferPtr input,
+					 xmlCharEncoding enc);
+#endif /* LIBXML_VALID_ENABLE */
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlParseBalancedChunkMemory(xmlDocPtr doc,
+					 xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 int depth,
+					 const xmlChar *string,
+					 xmlNodePtr *lst);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN xmlParserErrors XMLCALL
+		xmlParseInNodeContext	(xmlNodePtr node,
+					 const char *data,
+					 int datalen,
+					 int options,
+					 xmlNodePtr *lst);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN int XMLCALL
+		xmlParseBalancedChunkMemoryRecover(xmlDocPtr doc,
+                     xmlSAXHandlerPtr sax,
+                     void *user_data,
+                     int depth,
+                     const xmlChar *string,
+                     xmlNodePtr *lst,
+                     int recover);
+XMLPUBFUN int XMLCALL
+		xmlParseExternalEntity	(xmlDocPtr doc,
+					 xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 int depth,
+					 const xmlChar *URL,
+					 const xmlChar *ID,
+					 xmlNodePtr *lst);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN int XMLCALL
+		xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx,
+					 const xmlChar *URL,
+					 const xmlChar *ID,
+					 xmlNodePtr *lst);
+
+/*
+ * Parser contexts handling.
+ */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlNewParserCtxt	(void);
+XMLPUBFUN int XMLCALL
+		xmlInitParserCtxt	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlClearParserCtxt	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlFreeParserCtxt	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlSetupParserForBuffer	(xmlParserCtxtPtr ctxt,
+					 const xmlChar* buffer,
+					 const char *filename);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlCreateDocParserCtxt	(const xmlChar *cur);
+
+#ifdef LIBXML_LEGACY_ENABLED
+/*
+ * Reading/setting optional parsing features.
+ */
+XMLPUBFUN int XMLCALL
+		xmlGetFeaturesList	(int *len,
+					 const char **result);
+XMLPUBFUN int XMLCALL
+		xmlGetFeature		(xmlParserCtxtPtr ctxt,
+					 const char *name,
+					 void *result);
+XMLPUBFUN int XMLCALL
+		xmlSetFeature		(xmlParserCtxtPtr ctxt,
+					 const char *name,
+					 void *value);
+#endif /* LIBXML_LEGACY_ENABLED */
+
+#ifdef LIBXML_PUSH_ENABLED
+/*
+ * Interfaces for the Push mode.
+ */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlCreatePushParserCtxt(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 const char *chunk,
+					 int size,
+					 const char *filename);
+XMLPUBFUN int XMLCALL
+		xmlParseChunk		(xmlParserCtxtPtr ctxt,
+					 const char *chunk,
+					 int size,
+					 int terminate);
+#endif /* LIBXML_PUSH_ENABLED */
+
+/*
+ * Special I/O mode.
+ */
+
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+		xmlCreateIOParserCtxt	(xmlSAXHandlerPtr sax,
+					 void *user_data,
+					 xmlInputReadCallback   ioread,
+					 xmlInputCloseCallback  ioclose,
+					 void *ioctx,
+					 xmlCharEncoding enc);
+
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		xmlNewIOInputStream	(xmlParserCtxtPtr ctxt,
+					 xmlParserInputBufferPtr input,
+					 xmlCharEncoding enc);
+
+/*
+ * Node infos.
+ */
+XMLPUBFUN const xmlParserNodeInfo* XMLCALL
+		xmlParserFindNodeInfo	(const xmlParserCtxtPtr ctxt,
+				         const xmlNodePtr node);
+XMLPUBFUN void XMLCALL
+		xmlInitNodeInfoSeq	(xmlParserNodeInfoSeqPtr seq);
+XMLPUBFUN void XMLCALL
+		xmlClearNodeInfoSeq	(xmlParserNodeInfoSeqPtr seq);
+XMLPUBFUN unsigned long XMLCALL
+		xmlParserFindNodeInfoIndex(const xmlParserNodeInfoSeqPtr seq,
+                                         const xmlNodePtr node);
+XMLPUBFUN void XMLCALL
+		xmlParserAddNodeInfo	(xmlParserCtxtPtr ctxt,
+					 const xmlParserNodeInfoPtr info);
+
+/*
+ * External entities handling actually implemented in xmlIO.
+ */
+
+XMLPUBFUN void XMLCALL
+		xmlSetExternalEntityLoader(xmlExternalEntityLoader f);
+XMLPUBFUN xmlExternalEntityLoader XMLCALL
+		xmlGetExternalEntityLoader(void);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+		xmlLoadExternalEntity	(const char *URL,
+					 const char *ID,
+					 xmlParserCtxtPtr ctxt);
+
+/*
+ * Index lookup, actually implemented in the encoding module
+ */
+XMLPUBFUN long XMLCALL
+		xmlByteConsumed		(xmlParserCtxtPtr ctxt);
+
+/*
+ * New set of simpler/more flexible APIs
+ */
+/**
+ * xmlParserOption:
+ *
+ * This is the set of XML parser options that can be passed down
+ * to the xmlReadDoc() and similar calls.
+ */
+typedef enum {
+    XML_PARSE_RECOVER	= 1<<0,	/* recover on errors */
+    XML_PARSE_NOENT	= 1<<1,	/* substitute entities */
+    XML_PARSE_DTDLOAD	= 1<<2,	/* load the external subset */
+    XML_PARSE_DTDATTR	= 1<<3,	/* default DTD attributes */
+    XML_PARSE_DTDVALID	= 1<<4,	/* validate with the DTD */
+    XML_PARSE_NOERROR	= 1<<5,	/* suppress error reports */
+    XML_PARSE_NOWARNING	= 1<<6,	/* suppress warning reports */
+    XML_PARSE_PEDANTIC	= 1<<7,	/* pedantic error reporting */
+    XML_PARSE_NOBLANKS	= 1<<8,	/* remove blank nodes */
+    XML_PARSE_SAX1	= 1<<9,	/* use the SAX1 interface internally */
+    XML_PARSE_XINCLUDE	= 1<<10,/* Implement XInclude substitution  */
+    XML_PARSE_NONET	= 1<<11,/* Forbid network access */
+    XML_PARSE_NODICT	= 1<<12,/* Do not reuse the context dictionary */
+    XML_PARSE_NSCLEAN	= 1<<13,/* remove redundant namespaces declarations */
+    XML_PARSE_NOCDATA	= 1<<14,/* merge CDATA as text nodes */
+    XML_PARSE_NOXINCNODE= 1<<15,/* do not generate XINCLUDE START/END nodes */
+    XML_PARSE_COMPACT   = 1<<16,/* compact small text nodes; no modification of
+                                   the tree allowed afterwards (will possibly
+				   crash if you try to modify the tree) */
+    XML_PARSE_OLD10	= 1<<17,/* parse using XML-1.0 before update 5 */
+    XML_PARSE_NOBASEFIX = 1<<18,/* do not fixup XINCLUDE xml:base uris */
+    XML_PARSE_HUGE      = 1<<19,/* relax any hardcoded limit from the parser */
+    XML_PARSE_OLDSAX    = 1<<20,/* parse using SAX2 interface before 2.7.0 */
+    XML_PARSE_IGNORE_ENC= 1<<21,/* ignore internal document encoding hint */
+    XML_PARSE_BIG_LINES = 1<<22 /* Store big lines numbers in text PSVI field */
+} xmlParserOption;
+
+XMLPUBFUN void XMLCALL
+		xmlCtxtReset		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlCtxtResetPush	(xmlParserCtxtPtr ctxt,
+					 const char *chunk,
+					 int size,
+					 const char *filename,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+		xmlCtxtUseOptions	(xmlParserCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadDoc		(const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadFile		(const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadMemory		(const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadFd		(int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlReadIO		(xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadDoc		(xmlParserCtxtPtr ctxt,
+					 const xmlChar *cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadFile		(xmlParserCtxtPtr ctxt,
+					 const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadMemory		(xmlParserCtxtPtr ctxt,
+					 const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadFd		(xmlParserCtxtPtr ctxt,
+					 int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCtxtReadIO		(xmlParserCtxtPtr ctxt,
+					 xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+
+/*
+ * Library wide options
+ */
+/**
+ * xmlFeature:
+ *
+ * Used to examine the existence of features that can be enabled
+ * or disabled at compile-time.
+ * They used to be called XML_FEATURE_xxx but this clashed with Expat
+ */
+typedef enum {
+    XML_WITH_THREAD = 1,
+    XML_WITH_TREE = 2,
+    XML_WITH_OUTPUT = 3,
+    XML_WITH_PUSH = 4,
+    XML_WITH_READER = 5,
+    XML_WITH_PATTERN = 6,
+    XML_WITH_WRITER = 7,
+    XML_WITH_SAX1 = 8,
+    XML_WITH_FTP = 9,
+    XML_WITH_HTTP = 10,
+    XML_WITH_VALID = 11,
+    XML_WITH_HTML = 12,
+    XML_WITH_LEGACY = 13,
+    XML_WITH_C14N = 14,
+    XML_WITH_CATALOG = 15,
+    XML_WITH_XPATH = 16,
+    XML_WITH_XPTR = 17,
+    XML_WITH_XINCLUDE = 18,
+    XML_WITH_ICONV = 19,
+    XML_WITH_ISO8859X = 20,
+    XML_WITH_UNICODE = 21,
+    XML_WITH_REGEXP = 22,
+    XML_WITH_AUTOMATA = 23,
+    XML_WITH_EXPR = 24,
+    XML_WITH_SCHEMAS = 25,
+    XML_WITH_SCHEMATRON = 26,
+    XML_WITH_MODULES = 27,
+    XML_WITH_DEBUG = 28,
+    XML_WITH_DEBUG_MEM = 29,
+    XML_WITH_DEBUG_RUN = 30,
+    XML_WITH_ZLIB = 31,
+    XML_WITH_ICU = 32,
+    XML_WITH_LZMA = 33,
+    XML_WITH_NONE = 99999 /* just to be sure of allocation size */
+} xmlFeature;
+
+XMLPUBFUN int XMLCALL
+		xmlHasFeature		(xmlFeature feature);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_PARSER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/parserInternals.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/parserInternals.h
new file mode 100644
index 0000000..1f26ce2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/parserInternals.h
@@ -0,0 +1,644 @@
+/*
+ * Summary: internals routines and limits exported by the parser.
+ * Description: this module exports a number of internal parsing routines
+ *              they are not really all intended for applications but
+ *              can prove useful doing low level processing.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_PARSER_INTERNALS_H__
+#define __XML_PARSER_INTERNALS_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/parser.h>
+#include <libxml/HTMLparser.h>
+#include <libxml/chvalid.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlParserMaxDepth:
+ *
+ * arbitrary depth limit for the XML documents that we allow to
+ * process. This is not a limitation of the parser but a safety
+ * boundary feature, use XML_PARSE_HUGE option to override it.
+ */
+XMLPUBVAR unsigned int xmlParserMaxDepth;
+
+/**
+ * XML_MAX_TEXT_LENGTH:
+ *
+ * Maximum size allowed for a single text node when building a tree.
+ * This is not a limitation of the parser but a safety boundary feature,
+ * use XML_PARSE_HUGE option to override it.
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_TEXT_LENGTH 10000000
+
+/**
+ * XML_MAX_NAME_LENGTH:
+ *
+ * Maximum size allowed for a markup identifier.
+ * This is not a limitation of the parser but a safety boundary feature,
+ * use XML_PARSE_HUGE option to override it.
+ * Note that with the use of parsing dictionaries overriding the limit
+ * may result in more runtime memory usage in face of "unfriendly' content
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_NAME_LENGTH 50000
+
+/**
+ * XML_MAX_DICTIONARY_LIMIT:
+ *
+ * Maximum size allowed by the parser for a dictionary by default
+ * This is not a limitation of the parser but a safety boundary feature,
+ * use XML_PARSE_HUGE option to override it.
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_DICTIONARY_LIMIT 10000000
+
+/**
+ * XML_MAX_LOOKUP_LIMIT:
+ *
+ * Maximum size allowed by the parser for ahead lookup
+ * This is an upper boundary enforced by the parser to avoid bad
+ * behaviour on "unfriendly' content
+ * Introduced in 2.9.0
+ */
+#define XML_MAX_LOOKUP_LIMIT 10000000
+
+/**
+ * XML_MAX_NAMELEN:
+ *
+ * Identifiers can be longer, but this will be more costly
+ * at runtime.
+ */
+#define XML_MAX_NAMELEN 100
+
+/**
+ * INPUT_CHUNK:
+ *
+ * The parser tries to always have that amount of input ready.
+ * One of the point is providing context when reporting errors.
+ */
+#define INPUT_CHUNK	250
+
+/************************************************************************
+ *									*
+ * UNICODE version of the macros.					*
+ *									*
+ ************************************************************************/
+/**
+ * IS_BYTE_CHAR:
+ * @c:  an byte value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [2] Char ::= #x9 | #xA | #xD | [#x20...]
+ * any byte character in the accepted range
+ */
+#define IS_BYTE_CHAR(c)	 xmlIsChar_ch(c)
+
+/**
+ * IS_CHAR:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD]
+ *                  | [#x10000-#x10FFFF]
+ * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
+ */
+#define IS_CHAR(c)   xmlIsCharQ(c)
+
+/**
+ * IS_CHAR_CH:
+ * @c: an xmlChar (usually an unsigned char)
+ *
+ * Behaves like IS_CHAR on single-byte value
+ */
+#define IS_CHAR_CH(c)  xmlIsChar_ch(c)
+
+/**
+ * IS_BLANK:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [3] S ::= (#x20 | #x9 | #xD | #xA)+
+ */
+#define IS_BLANK(c)  xmlIsBlankQ(c)
+
+/**
+ * IS_BLANK_CH:
+ * @c:  an xmlChar value (normally unsigned char)
+ *
+ * Behaviour same as IS_BLANK
+ */
+#define IS_BLANK_CH(c)  xmlIsBlank_ch(c)
+
+/**
+ * IS_BASECHAR:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [85] BaseChar ::= ... long list see REC ...
+ */
+#define IS_BASECHAR(c) xmlIsBaseCharQ(c)
+
+/**
+ * IS_DIGIT:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [88] Digit ::= ... long list see REC ...
+ */
+#define IS_DIGIT(c) xmlIsDigitQ(c)
+
+/**
+ * IS_DIGIT_CH:
+ * @c:  an xmlChar value (usually an unsigned char)
+ *
+ * Behaves like IS_DIGIT but with a single byte argument
+ */
+#define IS_DIGIT_CH(c)  xmlIsDigit_ch(c)
+
+/**
+ * IS_COMBINING:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ * [87] CombiningChar ::= ... long list see REC ...
+ */
+#define IS_COMBINING(c) xmlIsCombiningQ(c)
+
+/**
+ * IS_COMBINING_CH:
+ * @c:  an xmlChar (usually an unsigned char)
+ *
+ * Always false (all combining chars > 0xff)
+ */
+#define IS_COMBINING_CH(c) 0
+
+/**
+ * IS_EXTENDER:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [89] Extender ::= #x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 |
+ *                   #x0E46 | #x0EC6 | #x3005 | [#x3031-#x3035] |
+ *                   [#x309D-#x309E] | [#x30FC-#x30FE]
+ */
+#define IS_EXTENDER(c) xmlIsExtenderQ(c)
+
+/**
+ * IS_EXTENDER_CH:
+ * @c:  an xmlChar value (usually an unsigned char)
+ *
+ * Behaves like IS_EXTENDER but with a single-byte argument
+ */
+#define IS_EXTENDER_CH(c)  xmlIsExtender_ch(c)
+
+/**
+ * IS_IDEOGRAPHIC:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [86] Ideographic ::= [#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029]
+ */
+#define IS_IDEOGRAPHIC(c) xmlIsIdeographicQ(c)
+
+/**
+ * IS_LETTER:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [84] Letter ::= BaseChar | Ideographic
+ */
+#define IS_LETTER(c) (IS_BASECHAR(c) || IS_IDEOGRAPHIC(c))
+
+/**
+ * IS_LETTER_CH:
+ * @c:  an xmlChar value (normally unsigned char)
+ *
+ * Macro behaves like IS_LETTER, but only check base chars
+ *
+ */
+#define IS_LETTER_CH(c) xmlIsBaseChar_ch(c)
+
+/**
+ * IS_ASCII_LETTER:
+ * @c: an xmlChar value
+ *
+ * Macro to check [a-zA-Z]
+ *
+ */
+#define IS_ASCII_LETTER(c)	(((0x41 <= (c)) && ((c) <= 0x5a)) || \
+				 ((0x61 <= (c)) && ((c) <= 0x7a)))
+
+/**
+ * IS_ASCII_DIGIT:
+ * @c: an xmlChar value
+ *
+ * Macro to check [0-9]
+ *
+ */
+#define IS_ASCII_DIGIT(c)	((0x30 <= (c)) && ((c) <= 0x39))
+
+/**
+ * IS_PUBIDCHAR:
+ * @c:  an UNICODE value (int)
+ *
+ * Macro to check the following production in the XML spec:
+ *
+ *
+ * [13] PubidChar ::= #x20 | #xD | #xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]
+ */
+#define IS_PUBIDCHAR(c)	xmlIsPubidCharQ(c)
+
+/**
+ * IS_PUBIDCHAR_CH:
+ * @c:  an xmlChar value (normally unsigned char)
+ *
+ * Same as IS_PUBIDCHAR but for single-byte value
+ */
+#define IS_PUBIDCHAR_CH(c) xmlIsPubidChar_ch(c)
+
+/**
+ * SKIP_EOL:
+ * @p:  and UTF8 string pointer
+ *
+ * Skips the end of line chars.
+ */
+#define SKIP_EOL(p)							\
+    if (*(p) == 0x13) { p++ ; if (*(p) == 0x10) p++; }			\
+    if (*(p) == 0x10) { p++ ; if (*(p) == 0x13) p++; }
+
+/**
+ * MOVETO_ENDTAG:
+ * @p:  and UTF8 string pointer
+ *
+ * Skips to the next '>' char.
+ */
+#define MOVETO_ENDTAG(p)						\
+    while ((*p) && (*(p) != '>')) (p)++
+
+/**
+ * MOVETO_STARTTAG:
+ * @p:  and UTF8 string pointer
+ *
+ * Skips to the next '<' char.
+ */
+#define MOVETO_STARTTAG(p)						\
+    while ((*p) && (*(p) != '<')) (p)++
+
+/**
+ * Global variables used for predefined strings.
+ */
+XMLPUBVAR const xmlChar xmlStringText[];
+XMLPUBVAR const xmlChar xmlStringTextNoenc[];
+XMLPUBVAR const xmlChar xmlStringComment[];
+
+/*
+ * Function to finish the work of the macros where needed.
+ */
+XMLPUBFUN int XMLCALL                   xmlIsLetter     (int c);
+
+/**
+ * Parser context.
+ */
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateFileParserCtxt	(const char *filename);
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateURLParserCtxt	(const char *filename,
+						 int options);
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateMemoryParserCtxt(const char *buffer,
+						 int size);
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+			xmlCreateEntityParserCtxt(const xmlChar *URL,
+						 const xmlChar *ID,
+						 const xmlChar *base);
+XMLPUBFUN int XMLCALL
+			xmlSwitchEncoding	(xmlParserCtxtPtr ctxt,
+						 xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+			xmlSwitchToEncoding	(xmlParserCtxtPtr ctxt,
+					 xmlCharEncodingHandlerPtr handler);
+XMLPUBFUN int XMLCALL
+			xmlSwitchInputEncoding	(xmlParserCtxtPtr ctxt,
+						 xmlParserInputPtr input,
+					 xmlCharEncodingHandlerPtr handler);
+
+#ifdef IN_LIBXML
+/* internal error reporting */
+XMLPUBFUN void XMLCALL
+			__xmlErrEncoding	(xmlParserCtxtPtr ctxt,
+						 xmlParserErrors xmlerr,
+						 const char *msg,
+						 const xmlChar * str1,
+						 const xmlChar * str2) LIBXML_ATTR_FORMAT(3,0);
+#endif
+
+/**
+ * Input Streams.
+ */
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewStringInputStream	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *buffer);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewEntityInputStream	(xmlParserCtxtPtr ctxt,
+						 xmlEntityPtr entity);
+XMLPUBFUN int XMLCALL
+			xmlPushInput		(xmlParserCtxtPtr ctxt,
+						 xmlParserInputPtr input);
+XMLPUBFUN xmlChar XMLCALL
+			xmlPopInput		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlFreeInputStream	(xmlParserInputPtr input);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewInputFromFile	(xmlParserCtxtPtr ctxt,
+						 const char *filename);
+XMLPUBFUN xmlParserInputPtr XMLCALL
+			xmlNewInputStream	(xmlParserCtxtPtr ctxt);
+
+/**
+ * Namespaces.
+ */
+XMLPUBFUN xmlChar * XMLCALL
+			xmlSplitQName		(xmlParserCtxtPtr ctxt,
+						 const xmlChar *name,
+						 xmlChar **prefix);
+
+/**
+ * Generic production rules.
+ */
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseName		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseNmtoken		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseEntityValue	(xmlParserCtxtPtr ctxt,
+						 xmlChar **orig);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseAttValue	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseSystemLiteral	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParsePubidLiteral	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseCharData	(xmlParserCtxtPtr ctxt,
+						 int cdata);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseExternalID	(xmlParserCtxtPtr ctxt,
+						 xmlChar **publicID,
+						 int strict);
+XMLPUBFUN void XMLCALL
+			xmlParseComment		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParsePITarget	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParsePI		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseNotationDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseEntityDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseDefaultDecl	(xmlParserCtxtPtr ctxt,
+						 xmlChar **value);
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+			xmlParseNotationType	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+			xmlParseEnumerationType	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseEnumeratedType	(xmlParserCtxtPtr ctxt,
+						 xmlEnumerationPtr *tree);
+XMLPUBFUN int XMLCALL
+			xmlParseAttributeType	(xmlParserCtxtPtr ctxt,
+						 xmlEnumerationPtr *tree);
+XMLPUBFUN void XMLCALL
+			xmlParseAttributeListDecl(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+			xmlParseElementMixedContentDecl
+						(xmlParserCtxtPtr ctxt,
+						 int inputchk);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+			xmlParseElementChildrenContentDecl
+						(xmlParserCtxtPtr ctxt,
+						 int inputchk);
+XMLPUBFUN int XMLCALL
+			xmlParseElementContentDecl(xmlParserCtxtPtr ctxt,
+						 const xmlChar *name,
+						 xmlElementContentPtr *result);
+XMLPUBFUN int XMLCALL
+			xmlParseElementDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseMarkupDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseCharRef		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlEntityPtr XMLCALL
+			xmlParseEntityRef	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseReference	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParsePEReference	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseDocTypeDecl	(xmlParserCtxtPtr ctxt);
+#ifdef LIBXML_SAX1_ENABLED
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseAttribute	(xmlParserCtxtPtr ctxt,
+						 xmlChar **value);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseStartTag	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseEndTag		(xmlParserCtxtPtr ctxt);
+#endif /* LIBXML_SAX1_ENABLED */
+XMLPUBFUN void XMLCALL
+			xmlParseCDSect		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseContent		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseElement		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseVersionNum	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseVersionInfo	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseEncName		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN const xmlChar * XMLCALL
+			xmlParseEncodingDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlParseSDDecl		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseXMLDecl		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseTextDecl	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseMisc		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+			xmlParseExternalSubset	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *ExternalID,
+						 const xmlChar *SystemID);
+/**
+ * XML_SUBSTITUTE_NONE:
+ *
+ * If no entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_NONE	0
+/**
+ * XML_SUBSTITUTE_REF:
+ *
+ * Whether general entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_REF	1
+/**
+ * XML_SUBSTITUTE_PEREF:
+ *
+ * Whether parameter entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_PEREF	2
+/**
+ * XML_SUBSTITUTE_BOTH:
+ *
+ * Both general and parameter entities need to be substituted.
+ */
+#define XML_SUBSTITUTE_BOTH	3
+
+XMLPUBFUN xmlChar * XMLCALL
+		xmlStringDecodeEntities		(xmlParserCtxtPtr ctxt,
+						 const xmlChar *str,
+						 int what,
+						 xmlChar end,
+						 xmlChar  end2,
+						 xmlChar end3);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlStringLenDecodeEntities	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *str,
+						 int len,
+						 int what,
+						 xmlChar end,
+						 xmlChar  end2,
+						 xmlChar end3);
+
+/*
+ * Generated by MACROS on top of parser.c c.f. PUSH_AND_POP.
+ */
+XMLPUBFUN int XMLCALL			nodePush		(xmlParserCtxtPtr ctxt,
+						 xmlNodePtr value);
+XMLPUBFUN xmlNodePtr XMLCALL		nodePop			(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			inputPush		(xmlParserCtxtPtr ctxt,
+						 xmlParserInputPtr value);
+XMLPUBFUN xmlParserInputPtr XMLCALL	inputPop		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN const xmlChar * XMLCALL	namePop			(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			namePush		(xmlParserCtxtPtr ctxt,
+						 const xmlChar *value);
+
+/*
+ * other commodities shared between parser.c and parserInternals.
+ */
+XMLPUBFUN int XMLCALL			xmlSkipBlankChars	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			xmlStringCurrentChar	(xmlParserCtxtPtr ctxt,
+						 const xmlChar *cur,
+						 int *len);
+XMLPUBFUN void XMLCALL			xmlParserHandlePEReference(xmlParserCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL			xmlCheckLanguageID	(const xmlChar *lang);
+
+/*
+ * Really core function shared with HTML parser.
+ */
+XMLPUBFUN int XMLCALL			xmlCurrentChar		(xmlParserCtxtPtr ctxt,
+						 int *len);
+XMLPUBFUN int XMLCALL		xmlCopyCharMultiByte	(xmlChar *out,
+						 int val);
+XMLPUBFUN int XMLCALL			xmlCopyChar		(int len,
+						 xmlChar *out,
+						 int val);
+XMLPUBFUN void XMLCALL			xmlNextChar		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL			xmlParserInputShrink	(xmlParserInputPtr in);
+
+#ifdef LIBXML_HTML_ENABLED
+/*
+ * Actually comes from the HTML parser but launched from the init stuff.
+ */
+XMLPUBFUN void XMLCALL			htmlInitAutoClose	(void);
+XMLPUBFUN htmlParserCtxtPtr XMLCALL	htmlCreateFileParserCtxt(const char *filename,
+	                                         const char *encoding);
+#endif
+
+/*
+ * Specific function to keep track of entities references
+ * and used by the XSLT debugger.
+ */
+#ifdef LIBXML_LEGACY_ENABLED
+/**
+ * xmlEntityReferenceFunc:
+ * @ent: the entity
+ * @firstNode:  the fist node in the chunk
+ * @lastNode:  the last nod in the chunk
+ *
+ * Callback function used when one needs to be able to track back the
+ * provenance of a chunk of nodes inherited from an entity replacement.
+ */
+typedef	void	(*xmlEntityReferenceFunc)	(xmlEntityPtr ent,
+						 xmlNodePtr firstNode,
+						 xmlNodePtr lastNode);
+
+XMLPUBFUN void XMLCALL		xmlSetEntityReferenceFunc	(xmlEntityReferenceFunc func);
+
+XMLPUBFUN xmlChar * XMLCALL
+			xmlParseQuotedString	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+                        xmlParseNamespace       (xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlNamespaceParseNSDef	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlScanName		(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlNamespaceParseNCName	(xmlParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL	xmlParserHandleReference(xmlParserCtxtPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlNamespaceParseQName	(xmlParserCtxtPtr ctxt,
+						 xmlChar **prefix);
+/**
+ * Entities
+ */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlDecodeEntities		(xmlParserCtxtPtr ctxt,
+						 int len,
+						 int what,
+						 xmlChar end,
+						 xmlChar  end2,
+						 xmlChar end3);
+XMLPUBFUN void XMLCALL
+			xmlHandleEntity		(xmlParserCtxtPtr ctxt,
+						 xmlEntityPtr entity);
+
+#endif /* LIBXML_LEGACY_ENABLED */
+
+#ifdef IN_LIBXML
+/*
+ * internal only
+ */
+XMLPUBFUN void XMLCALL
+	xmlErrMemory		(xmlParserCtxtPtr ctxt,
+				 const char *extra);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_PARSER_INTERNALS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/pattern.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/pattern.h
new file mode 100644
index 0000000..97d2cd2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/pattern.h
@@ -0,0 +1,100 @@
+/*
+ * Summary: pattern expression handling
+ * Description: allows to compile and test pattern expressions for nodes
+ *              either in a tree or based on a parser state.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_PATTERN_H__
+#define __XML_PATTERN_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/dict.h>
+
+#ifdef LIBXML_PATTERN_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlPattern:
+ *
+ * A compiled (XPath based) pattern to select nodes
+ */
+typedef struct _xmlPattern xmlPattern;
+typedef xmlPattern *xmlPatternPtr;
+
+/**
+ * xmlPatternFlags:
+ *
+ * This is the set of options affecting the behaviour of pattern
+ * matching with this module
+ *
+ */
+typedef enum {
+    XML_PATTERN_DEFAULT		= 0,	/* simple pattern match */
+    XML_PATTERN_XPATH		= 1<<0,	/* standard XPath pattern */
+    XML_PATTERN_XSSEL		= 1<<1,	/* XPath subset for schema selector */
+    XML_PATTERN_XSFIELD		= 1<<2	/* XPath subset for schema field */
+} xmlPatternFlags;
+
+XMLPUBFUN void XMLCALL
+			xmlFreePattern		(xmlPatternPtr comp);
+
+XMLPUBFUN void XMLCALL
+			xmlFreePatternList	(xmlPatternPtr comp);
+
+XMLPUBFUN xmlPatternPtr XMLCALL
+			xmlPatterncompile	(const xmlChar *pattern,
+						 xmlDict *dict,
+						 int flags,
+						 const xmlChar **namespaces);
+XMLPUBFUN int XMLCALL
+			xmlPatternMatch		(xmlPatternPtr comp,
+						 xmlNodePtr node);
+
+/* streaming interfaces */
+typedef struct _xmlStreamCtxt xmlStreamCtxt;
+typedef xmlStreamCtxt *xmlStreamCtxtPtr;
+
+XMLPUBFUN int XMLCALL
+			xmlPatternStreamable	(xmlPatternPtr comp);
+XMLPUBFUN int XMLCALL
+			xmlPatternMaxDepth	(xmlPatternPtr comp);
+XMLPUBFUN int XMLCALL
+			xmlPatternMinDepth	(xmlPatternPtr comp);
+XMLPUBFUN int XMLCALL
+			xmlPatternFromRoot	(xmlPatternPtr comp);
+XMLPUBFUN xmlStreamCtxtPtr XMLCALL
+			xmlPatternGetStreamCtxt	(xmlPatternPtr comp);
+XMLPUBFUN void XMLCALL
+			xmlFreeStreamCtxt	(xmlStreamCtxtPtr stream);
+XMLPUBFUN int XMLCALL
+			xmlStreamPushNode	(xmlStreamCtxtPtr stream,
+						 const xmlChar *name,
+						 const xmlChar *ns,
+						 int nodeType);
+XMLPUBFUN int XMLCALL
+			xmlStreamPush		(xmlStreamCtxtPtr stream,
+						 const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN int XMLCALL
+			xmlStreamPushAttr	(xmlStreamCtxtPtr stream,
+						 const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN int XMLCALL
+			xmlStreamPop		(xmlStreamCtxtPtr stream);
+XMLPUBFUN int XMLCALL
+			xmlStreamWantsAnyNode	(xmlStreamCtxtPtr stream);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_PATTERN_ENABLED */
+
+#endif /* __XML_PATTERN_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/relaxng.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/relaxng.h
new file mode 100644
index 0000000..f269c9e
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/relaxng.h
@@ -0,0 +1,217 @@
+/*
+ * Summary: implementation of the Relax-NG validation
+ * Description: implementation of the Relax-NG validation
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_RELAX_NG__
+#define __XML_RELAX_NG__
+
+#include <libxml/xmlversion.h>
+#include <libxml/hash.h>
+#include <libxml/xmlstring.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _xmlRelaxNG xmlRelaxNG;
+typedef xmlRelaxNG *xmlRelaxNGPtr;
+
+
+/**
+ * xmlRelaxNGValidityErrorFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of an error callback from a Relax-NG validation
+ */
+typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx,
+						      const char *msg,
+						      ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * xmlRelaxNGValidityWarningFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of a warning callback from a Relax-NG validation
+ */
+typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx,
+							const char *msg,
+							...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * A schemas validation context
+ */
+typedef struct _xmlRelaxNGParserCtxt xmlRelaxNGParserCtxt;
+typedef xmlRelaxNGParserCtxt *xmlRelaxNGParserCtxtPtr;
+
+typedef struct _xmlRelaxNGValidCtxt xmlRelaxNGValidCtxt;
+typedef xmlRelaxNGValidCtxt *xmlRelaxNGValidCtxtPtr;
+
+/*
+ * xmlRelaxNGValidErr:
+ *
+ * List of possible Relax NG validation errors
+ */
+typedef enum {
+    XML_RELAXNG_OK = 0,
+    XML_RELAXNG_ERR_MEMORY,
+    XML_RELAXNG_ERR_TYPE,
+    XML_RELAXNG_ERR_TYPEVAL,
+    XML_RELAXNG_ERR_DUPID,
+    XML_RELAXNG_ERR_TYPECMP,
+    XML_RELAXNG_ERR_NOSTATE,
+    XML_RELAXNG_ERR_NODEFINE,
+    XML_RELAXNG_ERR_LISTEXTRA,
+    XML_RELAXNG_ERR_LISTEMPTY,
+    XML_RELAXNG_ERR_INTERNODATA,
+    XML_RELAXNG_ERR_INTERSEQ,
+    XML_RELAXNG_ERR_INTEREXTRA,
+    XML_RELAXNG_ERR_ELEMNAME,
+    XML_RELAXNG_ERR_ATTRNAME,
+    XML_RELAXNG_ERR_ELEMNONS,
+    XML_RELAXNG_ERR_ATTRNONS,
+    XML_RELAXNG_ERR_ELEMWRONGNS,
+    XML_RELAXNG_ERR_ATTRWRONGNS,
+    XML_RELAXNG_ERR_ELEMEXTRANS,
+    XML_RELAXNG_ERR_ATTREXTRANS,
+    XML_RELAXNG_ERR_ELEMNOTEMPTY,
+    XML_RELAXNG_ERR_NOELEM,
+    XML_RELAXNG_ERR_NOTELEM,
+    XML_RELAXNG_ERR_ATTRVALID,
+    XML_RELAXNG_ERR_CONTENTVALID,
+    XML_RELAXNG_ERR_EXTRACONTENT,
+    XML_RELAXNG_ERR_INVALIDATTR,
+    XML_RELAXNG_ERR_DATAELEM,
+    XML_RELAXNG_ERR_VALELEM,
+    XML_RELAXNG_ERR_LISTELEM,
+    XML_RELAXNG_ERR_DATATYPE,
+    XML_RELAXNG_ERR_VALUE,
+    XML_RELAXNG_ERR_LIST,
+    XML_RELAXNG_ERR_NOGRAMMAR,
+    XML_RELAXNG_ERR_EXTRADATA,
+    XML_RELAXNG_ERR_LACKDATA,
+    XML_RELAXNG_ERR_INTERNAL,
+    XML_RELAXNG_ERR_ELEMWRONG,
+    XML_RELAXNG_ERR_TEXTWRONG
+} xmlRelaxNGValidErr;
+
+/*
+ * xmlRelaxNGParserFlags:
+ *
+ * List of possible Relax NG Parser flags
+ */
+typedef enum {
+    XML_RELAXNGP_NONE = 0,
+    XML_RELAXNGP_FREE_DOC = 1,
+    XML_RELAXNGP_CRNG = 2
+} xmlRelaxNGParserFlag;
+
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGInitTypes		(void);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGCleanupTypes	(void);
+
+/*
+ * Interfaces for parsing.
+ */
+XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
+		    xmlRelaxNGNewParserCtxt	(const char *URL);
+XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
+		    xmlRelaxNGNewMemParserCtxt	(const char *buffer,
+						 int size);
+XMLPUBFUN xmlRelaxNGParserCtxtPtr XMLCALL
+		    xmlRelaxNGNewDocParserCtxt	(xmlDocPtr doc);
+
+XMLPUBFUN int XMLCALL
+		    xmlRelaxParserSetFlag	(xmlRelaxNGParserCtxtPtr ctxt,
+						 int flag);
+
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGFreeParserCtxt	(xmlRelaxNGParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGSetParserErrors(xmlRelaxNGParserCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc err,
+					 xmlRelaxNGValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGGetParserErrors(xmlRelaxNGParserCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc *err,
+					 xmlRelaxNGValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGSetParserStructuredErrors(
+					 xmlRelaxNGParserCtxtPtr ctxt,
+					 xmlStructuredErrorFunc serror,
+					 void *ctx);
+XMLPUBFUN xmlRelaxNGPtr XMLCALL
+		    xmlRelaxNGParse		(xmlRelaxNGParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGFree		(xmlRelaxNGPtr schema);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGDump		(FILE *output,
+					 xmlRelaxNGPtr schema);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGDumpTree	(FILE * output,
+					 xmlRelaxNGPtr schema);
+#endif /* LIBXML_OUTPUT_ENABLED */
+/*
+ * Interfaces for validating
+ */
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc err,
+					 xmlRelaxNGValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGGetValidErrors(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlRelaxNGValidityErrorFunc *err,
+					 xmlRelaxNGValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN void XMLCALL
+			xmlRelaxNGSetValidStructuredErrors(xmlRelaxNGValidCtxtPtr ctxt,
+					  xmlStructuredErrorFunc serror, void *ctx);
+XMLPUBFUN xmlRelaxNGValidCtxtPtr XMLCALL
+		    xmlRelaxNGNewValidCtxt	(xmlRelaxNGPtr schema);
+XMLPUBFUN void XMLCALL
+		    xmlRelaxNGFreeValidCtxt	(xmlRelaxNGValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidateDoc	(xmlRelaxNGValidCtxtPtr ctxt,
+						 xmlDocPtr doc);
+/*
+ * Interfaces for progressive validation when possible
+ */
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidatePushElement	(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidatePushCData	(xmlRelaxNGValidCtxtPtr ctxt,
+					 const xmlChar *data,
+					 int len);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidatePopElement	(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		    xmlRelaxNGValidateFullElement	(xmlRelaxNGValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+
+#endif /* __XML_RELAX_NG__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/schemasInternals.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/schemasInternals.h
new file mode 100644
index 0000000..c521d1c
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/schemasInternals.h
@@ -0,0 +1,958 @@
+/*
+ * Summary: internal interfaces for XML Schemas
+ * Description: internal interfaces for the XML Schemas handling
+ *              and schema validity checking
+ *		The Schemas development is a Work In Progress.
+ *              Some of those interfaces are not guaranteed to be API or ABI stable !
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMA_INTERNALS_H__
+#define __XML_SCHEMA_INTERNALS_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#include <libxml/xmlregexp.h>
+#include <libxml/hash.h>
+#include <libxml/dict.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    XML_SCHEMAS_UNKNOWN = 0,
+    XML_SCHEMAS_STRING = 1,
+    XML_SCHEMAS_NORMSTRING = 2,
+    XML_SCHEMAS_DECIMAL = 3,
+    XML_SCHEMAS_TIME = 4,
+    XML_SCHEMAS_GDAY = 5,
+    XML_SCHEMAS_GMONTH = 6,
+    XML_SCHEMAS_GMONTHDAY = 7,
+    XML_SCHEMAS_GYEAR = 8,
+    XML_SCHEMAS_GYEARMONTH = 9,
+    XML_SCHEMAS_DATE = 10,
+    XML_SCHEMAS_DATETIME = 11,
+    XML_SCHEMAS_DURATION = 12,
+    XML_SCHEMAS_FLOAT = 13,
+    XML_SCHEMAS_DOUBLE = 14,
+    XML_SCHEMAS_BOOLEAN = 15,
+    XML_SCHEMAS_TOKEN = 16,
+    XML_SCHEMAS_LANGUAGE = 17,
+    XML_SCHEMAS_NMTOKEN = 18,
+    XML_SCHEMAS_NMTOKENS = 19,
+    XML_SCHEMAS_NAME = 20,
+    XML_SCHEMAS_QNAME = 21,
+    XML_SCHEMAS_NCNAME = 22,
+    XML_SCHEMAS_ID = 23,
+    XML_SCHEMAS_IDREF = 24,
+    XML_SCHEMAS_IDREFS = 25,
+    XML_SCHEMAS_ENTITY = 26,
+    XML_SCHEMAS_ENTITIES = 27,
+    XML_SCHEMAS_NOTATION = 28,
+    XML_SCHEMAS_ANYURI = 29,
+    XML_SCHEMAS_INTEGER = 30,
+    XML_SCHEMAS_NPINTEGER = 31,
+    XML_SCHEMAS_NINTEGER = 32,
+    XML_SCHEMAS_NNINTEGER = 33,
+    XML_SCHEMAS_PINTEGER = 34,
+    XML_SCHEMAS_INT = 35,
+    XML_SCHEMAS_UINT = 36,
+    XML_SCHEMAS_LONG = 37,
+    XML_SCHEMAS_ULONG = 38,
+    XML_SCHEMAS_SHORT = 39,
+    XML_SCHEMAS_USHORT = 40,
+    XML_SCHEMAS_BYTE = 41,
+    XML_SCHEMAS_UBYTE = 42,
+    XML_SCHEMAS_HEXBINARY = 43,
+    XML_SCHEMAS_BASE64BINARY = 44,
+    XML_SCHEMAS_ANYTYPE = 45,
+    XML_SCHEMAS_ANYSIMPLETYPE = 46
+} xmlSchemaValType;
+
+/*
+ * XML Schemas defines multiple type of types.
+ */
+typedef enum {
+    XML_SCHEMA_TYPE_BASIC = 1, /* A built-in datatype */
+    XML_SCHEMA_TYPE_ANY,
+    XML_SCHEMA_TYPE_FACET,
+    XML_SCHEMA_TYPE_SIMPLE,
+    XML_SCHEMA_TYPE_COMPLEX,
+    XML_SCHEMA_TYPE_SEQUENCE = 6,
+    XML_SCHEMA_TYPE_CHOICE,
+    XML_SCHEMA_TYPE_ALL,
+    XML_SCHEMA_TYPE_SIMPLE_CONTENT,
+    XML_SCHEMA_TYPE_COMPLEX_CONTENT,
+    XML_SCHEMA_TYPE_UR,
+    XML_SCHEMA_TYPE_RESTRICTION,
+    XML_SCHEMA_TYPE_EXTENSION,
+    XML_SCHEMA_TYPE_ELEMENT,
+    XML_SCHEMA_TYPE_ATTRIBUTE,
+    XML_SCHEMA_TYPE_ATTRIBUTEGROUP,
+    XML_SCHEMA_TYPE_GROUP,
+    XML_SCHEMA_TYPE_NOTATION,
+    XML_SCHEMA_TYPE_LIST,
+    XML_SCHEMA_TYPE_UNION,
+    XML_SCHEMA_TYPE_ANY_ATTRIBUTE,
+    XML_SCHEMA_TYPE_IDC_UNIQUE,
+    XML_SCHEMA_TYPE_IDC_KEY,
+    XML_SCHEMA_TYPE_IDC_KEYREF,
+    XML_SCHEMA_TYPE_PARTICLE = 25,
+    XML_SCHEMA_TYPE_ATTRIBUTE_USE,
+    XML_SCHEMA_FACET_MININCLUSIVE = 1000,
+    XML_SCHEMA_FACET_MINEXCLUSIVE,
+    XML_SCHEMA_FACET_MAXINCLUSIVE,
+    XML_SCHEMA_FACET_MAXEXCLUSIVE,
+    XML_SCHEMA_FACET_TOTALDIGITS,
+    XML_SCHEMA_FACET_FRACTIONDIGITS,
+    XML_SCHEMA_FACET_PATTERN,
+    XML_SCHEMA_FACET_ENUMERATION,
+    XML_SCHEMA_FACET_WHITESPACE,
+    XML_SCHEMA_FACET_LENGTH,
+    XML_SCHEMA_FACET_MAXLENGTH,
+    XML_SCHEMA_FACET_MINLENGTH,
+    XML_SCHEMA_EXTRA_QNAMEREF = 2000,
+    XML_SCHEMA_EXTRA_ATTR_USE_PROHIB
+} xmlSchemaTypeType;
+
+typedef enum {
+    XML_SCHEMA_CONTENT_UNKNOWN = 0,
+    XML_SCHEMA_CONTENT_EMPTY = 1,
+    XML_SCHEMA_CONTENT_ELEMENTS,
+    XML_SCHEMA_CONTENT_MIXED,
+    XML_SCHEMA_CONTENT_SIMPLE,
+    XML_SCHEMA_CONTENT_MIXED_OR_ELEMENTS, /* Obsolete */
+    XML_SCHEMA_CONTENT_BASIC,
+    XML_SCHEMA_CONTENT_ANY
+} xmlSchemaContentType;
+
+typedef struct _xmlSchemaVal xmlSchemaVal;
+typedef xmlSchemaVal *xmlSchemaValPtr;
+
+typedef struct _xmlSchemaType xmlSchemaType;
+typedef xmlSchemaType *xmlSchemaTypePtr;
+
+typedef struct _xmlSchemaFacet xmlSchemaFacet;
+typedef xmlSchemaFacet *xmlSchemaFacetPtr;
+
+/**
+ * Annotation
+ */
+typedef struct _xmlSchemaAnnot xmlSchemaAnnot;
+typedef xmlSchemaAnnot *xmlSchemaAnnotPtr;
+struct _xmlSchemaAnnot {
+    struct _xmlSchemaAnnot *next;
+    xmlNodePtr content;         /* the annotation */
+};
+
+/**
+ * XML_SCHEMAS_ANYATTR_SKIP:
+ *
+ * Skip unknown attribute from validation
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ANYATTR_SKIP        1
+/**
+ * XML_SCHEMAS_ANYATTR_LAX:
+ *
+ * Ignore validation non definition on attributes
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ANYATTR_LAX                2
+/**
+ * XML_SCHEMAS_ANYATTR_STRICT:
+ *
+ * Apply strict validation rules on attributes
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ANYATTR_STRICT        3
+/**
+ * XML_SCHEMAS_ANY_SKIP:
+ *
+ * Skip unknown attribute from validation
+ */
+#define XML_SCHEMAS_ANY_SKIP        1
+/**
+ * XML_SCHEMAS_ANY_LAX:
+ *
+ * Used by wildcards.
+ * Validate if type found, don't worry if not found
+ */
+#define XML_SCHEMAS_ANY_LAX                2
+/**
+ * XML_SCHEMAS_ANY_STRICT:
+ *
+ * Used by wildcards.
+ * Apply strict validation rules
+ */
+#define XML_SCHEMAS_ANY_STRICT        3
+/**
+ * XML_SCHEMAS_ATTR_USE_PROHIBITED:
+ *
+ * Used by wildcards.
+ * The attribute is prohibited.
+ */
+#define XML_SCHEMAS_ATTR_USE_PROHIBITED 0
+/**
+ * XML_SCHEMAS_ATTR_USE_REQUIRED:
+ *
+ * The attribute is required.
+ */
+#define XML_SCHEMAS_ATTR_USE_REQUIRED 1
+/**
+ * XML_SCHEMAS_ATTR_USE_OPTIONAL:
+ *
+ * The attribute is optional.
+ */
+#define XML_SCHEMAS_ATTR_USE_OPTIONAL 2
+/**
+ * XML_SCHEMAS_ATTR_GLOBAL:
+ *
+ * allow elements in no namespace
+ */
+#define XML_SCHEMAS_ATTR_GLOBAL        1 << 0
+/**
+ * XML_SCHEMAS_ATTR_NSDEFAULT:
+ *
+ * allow elements in no namespace
+ */
+#define XML_SCHEMAS_ATTR_NSDEFAULT        1 << 7
+/**
+ * XML_SCHEMAS_ATTR_INTERNAL_RESOLVED:
+ *
+ * this is set when the "type" and "ref" references
+ * have been resolved.
+ */
+#define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED        1 << 8
+/**
+ * XML_SCHEMAS_ATTR_FIXED:
+ *
+ * the attribute has a fixed value
+ */
+#define XML_SCHEMAS_ATTR_FIXED        1 << 9
+
+/**
+ * xmlSchemaAttribute:
+ * An attribute definition.
+ */
+
+typedef struct _xmlSchemaAttribute xmlSchemaAttribute;
+typedef xmlSchemaAttribute *xmlSchemaAttributePtr;
+struct _xmlSchemaAttribute {
+    xmlSchemaTypeType type;
+    struct _xmlSchemaAttribute *next; /* the next attribute (not used?) */
+    const xmlChar *name; /* the name of the declaration */
+    const xmlChar *id; /* Deprecated; not used */
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    const xmlChar *typeName; /* the local name of the type definition */
+    const xmlChar *typeNs; /* the ns URI of the type definition */
+    xmlSchemaAnnotPtr annot;
+
+    xmlSchemaTypePtr base; /* Deprecated; not used */
+    int occurs; /* Deprecated; not used */
+    const xmlChar *defValue; /* The initial value of the value constraint */
+    xmlSchemaTypePtr subtypes; /* the type definition */
+    xmlNodePtr node;
+    const xmlChar *targetNamespace;
+    int flags;
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaValPtr defVal; /* The compiled value constraint */
+    xmlSchemaAttributePtr refDecl; /* Deprecated; not used */
+};
+
+/**
+ * xmlSchemaAttributeLink:
+ * Used to build a list of attribute uses on complexType definitions.
+ * WARNING: Deprecated; not used.
+ */
+typedef struct _xmlSchemaAttributeLink xmlSchemaAttributeLink;
+typedef xmlSchemaAttributeLink *xmlSchemaAttributeLinkPtr;
+struct _xmlSchemaAttributeLink {
+    struct _xmlSchemaAttributeLink *next;/* the next attribute link ... */
+    struct _xmlSchemaAttribute *attr;/* the linked attribute */
+};
+
+/**
+ * XML_SCHEMAS_WILDCARD_COMPLETE:
+ *
+ * If the wildcard is complete.
+ */
+#define XML_SCHEMAS_WILDCARD_COMPLETE 1 << 0
+
+/**
+ * xmlSchemaCharValueLink:
+ * Used to build a list of namespaces on wildcards.
+ */
+typedef struct _xmlSchemaWildcardNs xmlSchemaWildcardNs;
+typedef xmlSchemaWildcardNs *xmlSchemaWildcardNsPtr;
+struct _xmlSchemaWildcardNs {
+    struct _xmlSchemaWildcardNs *next;/* the next constraint link ... */
+    const xmlChar *value;/* the value */
+};
+
+/**
+ * xmlSchemaWildcard.
+ * A wildcard.
+ */
+typedef struct _xmlSchemaWildcard xmlSchemaWildcard;
+typedef xmlSchemaWildcard *xmlSchemaWildcardPtr;
+struct _xmlSchemaWildcard {
+    xmlSchemaTypeType type;        /* The kind of type */
+    const xmlChar *id; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+    xmlNodePtr node;
+    int minOccurs; /* Deprecated; not used */
+    int maxOccurs; /* Deprecated; not used */
+    int processContents;
+    int any; /* Indicates if the ns constraint is of ##any */
+    xmlSchemaWildcardNsPtr nsSet; /* The list of allowed namespaces */
+    xmlSchemaWildcardNsPtr negNsSet; /* The negated namespace */
+    int flags;
+};
+
+/**
+ * XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED:
+ *
+ * The attribute wildcard has been built.
+ */
+#define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED 1 << 0
+/**
+ * XML_SCHEMAS_ATTRGROUP_GLOBAL:
+ *
+ * The attribute group has been defined.
+ */
+#define XML_SCHEMAS_ATTRGROUP_GLOBAL 1 << 1
+/**
+ * XML_SCHEMAS_ATTRGROUP_MARKED:
+ *
+ * Marks the attr group as marked; used for circular checks.
+ */
+#define XML_SCHEMAS_ATTRGROUP_MARKED 1 << 2
+
+/**
+ * XML_SCHEMAS_ATTRGROUP_REDEFINED:
+ *
+ * The attr group was redefined.
+ */
+#define XML_SCHEMAS_ATTRGROUP_REDEFINED 1 << 3
+/**
+ * XML_SCHEMAS_ATTRGROUP_HAS_REFS:
+ *
+ * Whether this attr. group contains attr. group references.
+ */
+#define XML_SCHEMAS_ATTRGROUP_HAS_REFS 1 << 4
+
+/**
+ * An attribute group definition.
+ *
+ * xmlSchemaAttribute and xmlSchemaAttributeGroup start of structures
+ * must be kept similar
+ */
+typedef struct _xmlSchemaAttributeGroup xmlSchemaAttributeGroup;
+typedef xmlSchemaAttributeGroup *xmlSchemaAttributeGroupPtr;
+struct _xmlSchemaAttributeGroup {
+    xmlSchemaTypeType type;        /* The kind of type */
+    struct _xmlSchemaAttribute *next;/* the next attribute if in a group ... */
+    const xmlChar *name;
+    const xmlChar *id;
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+
+    xmlSchemaAttributePtr attributes; /* Deprecated; not used */
+    xmlNodePtr node;
+    int flags;
+    xmlSchemaWildcardPtr attributeWildcard;
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaAttributeGroupPtr refItem; /* Deprecated; not used */
+    const xmlChar *targetNamespace;
+    void *attrUses;
+};
+
+/**
+ * xmlSchemaTypeLink:
+ * Used to build a list of types (e.g. member types of
+ * simpleType with variety "union").
+ */
+typedef struct _xmlSchemaTypeLink xmlSchemaTypeLink;
+typedef xmlSchemaTypeLink *xmlSchemaTypeLinkPtr;
+struct _xmlSchemaTypeLink {
+    struct _xmlSchemaTypeLink *next;/* the next type link ... */
+    xmlSchemaTypePtr type;/* the linked type */
+};
+
+/**
+ * xmlSchemaFacetLink:
+ * Used to build a list of facets.
+ */
+typedef struct _xmlSchemaFacetLink xmlSchemaFacetLink;
+typedef xmlSchemaFacetLink *xmlSchemaFacetLinkPtr;
+struct _xmlSchemaFacetLink {
+    struct _xmlSchemaFacetLink *next;/* the next facet link ... */
+    xmlSchemaFacetPtr facet;/* the linked facet */
+};
+
+/**
+ * XML_SCHEMAS_TYPE_MIXED:
+ *
+ * the element content type is mixed
+ */
+#define XML_SCHEMAS_TYPE_MIXED                1 << 0
+/**
+ * XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION:
+ *
+ * the simple or complex type has a derivation method of "extension".
+ */
+#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION                1 << 1
+/**
+ * XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION:
+ *
+ * the simple or complex type has a derivation method of "restriction".
+ */
+#define XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION                1 << 2
+/**
+ * XML_SCHEMAS_TYPE_GLOBAL:
+ *
+ * the type is global
+ */
+#define XML_SCHEMAS_TYPE_GLOBAL                1 << 3
+/**
+ * XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD:
+ *
+ * the complexType owns an attribute wildcard, i.e.
+ * it can be freed by the complexType
+ */
+#define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD    1 << 4 /* Obsolete. */
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_ABSENT:
+ *
+ * the simpleType has a variety of "absent".
+ * TODO: Actually not necessary :-/, since if
+ * none of the variety flags occur then it's
+ * automatically absent.
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_ABSENT    1 << 5
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_LIST:
+ *
+ * the simpleType has a variety of "list".
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_LIST    1 << 6
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_UNION:
+ *
+ * the simpleType has a variety of "union".
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_UNION    1 << 7
+/**
+ * XML_SCHEMAS_TYPE_VARIETY_ATOMIC:
+ *
+ * the simpleType has a variety of "union".
+ */
+#define XML_SCHEMAS_TYPE_VARIETY_ATOMIC    1 << 8
+/**
+ * XML_SCHEMAS_TYPE_FINAL_EXTENSION:
+ *
+ * the complexType has a final of "extension".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_EXTENSION    1 << 9
+/**
+ * XML_SCHEMAS_TYPE_FINAL_RESTRICTION:
+ *
+ * the simpleType/complexType has a final of "restriction".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_RESTRICTION    1 << 10
+/**
+ * XML_SCHEMAS_TYPE_FINAL_LIST:
+ *
+ * the simpleType has a final of "list".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_LIST    1 << 11
+/**
+ * XML_SCHEMAS_TYPE_FINAL_UNION:
+ *
+ * the simpleType has a final of "union".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_UNION    1 << 12
+/**
+ * XML_SCHEMAS_TYPE_FINAL_DEFAULT:
+ *
+ * the simpleType has a final of "default".
+ */
+#define XML_SCHEMAS_TYPE_FINAL_DEFAULT    1 << 13
+/**
+ * XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE:
+ *
+ * Marks the item as a builtin primitive.
+ */
+#define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE    1 << 14
+/**
+ * XML_SCHEMAS_TYPE_MARKED:
+ *
+ * Marks the item as marked; used for circular checks.
+ */
+#define XML_SCHEMAS_TYPE_MARKED        1 << 16
+/**
+ * XML_SCHEMAS_TYPE_BLOCK_DEFAULT:
+ *
+ * the complexType did not specify 'block' so use the default of the
+ * <schema> item.
+ */
+#define XML_SCHEMAS_TYPE_BLOCK_DEFAULT    1 << 17
+/**
+ * XML_SCHEMAS_TYPE_BLOCK_EXTENSION:
+ *
+ * the complexType has a 'block' of "extension".
+ */
+#define XML_SCHEMAS_TYPE_BLOCK_EXTENSION    1 << 18
+/**
+ * XML_SCHEMAS_TYPE_BLOCK_RESTRICTION:
+ *
+ * the complexType has a 'block' of "restriction".
+ */
+#define XML_SCHEMAS_TYPE_BLOCK_RESTRICTION    1 << 19
+/**
+ * XML_SCHEMAS_TYPE_ABSTRACT:
+ *
+ * the simple/complexType is abstract.
+ */
+#define XML_SCHEMAS_TYPE_ABSTRACT    1 << 20
+/**
+ * XML_SCHEMAS_TYPE_FACETSNEEDVALUE:
+ *
+ * indicates if the facets need a computed value
+ */
+#define XML_SCHEMAS_TYPE_FACETSNEEDVALUE    1 << 21
+/**
+ * XML_SCHEMAS_TYPE_INTERNAL_RESOLVED:
+ *
+ * indicates that the type was typefixed
+ */
+#define XML_SCHEMAS_TYPE_INTERNAL_RESOLVED    1 << 22
+/**
+ * XML_SCHEMAS_TYPE_INTERNAL_INVALID:
+ *
+ * indicates that the type is invalid
+ */
+#define XML_SCHEMAS_TYPE_INTERNAL_INVALID    1 << 23
+/**
+ * XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE:
+ *
+ * a whitespace-facet value of "preserve"
+ */
+#define XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE    1 << 24
+/**
+ * XML_SCHEMAS_TYPE_WHITESPACE_REPLACE:
+ *
+ * a whitespace-facet value of "replace"
+ */
+#define XML_SCHEMAS_TYPE_WHITESPACE_REPLACE    1 << 25
+/**
+ * XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE:
+ *
+ * a whitespace-facet value of "collapse"
+ */
+#define XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE    1 << 26
+/**
+ * XML_SCHEMAS_TYPE_HAS_FACETS:
+ *
+ * has facets
+ */
+#define XML_SCHEMAS_TYPE_HAS_FACETS    1 << 27
+/**
+ * XML_SCHEMAS_TYPE_NORMVALUENEEDED:
+ *
+ * indicates if the facets (pattern) need a normalized value
+ */
+#define XML_SCHEMAS_TYPE_NORMVALUENEEDED    1 << 28
+
+/**
+ * XML_SCHEMAS_TYPE_FIXUP_1:
+ *
+ * First stage of fixup was done.
+ */
+#define XML_SCHEMAS_TYPE_FIXUP_1    1 << 29
+
+/**
+ * XML_SCHEMAS_TYPE_REDEFINED:
+ *
+ * The type was redefined.
+ */
+#define XML_SCHEMAS_TYPE_REDEFINED    1 << 30
+/**
+ * XML_SCHEMAS_TYPE_REDEFINING:
+ *
+ * The type redefines an other type.
+ */
+/* #define XML_SCHEMAS_TYPE_REDEFINING    1 << 31 */
+
+/**
+ * _xmlSchemaType:
+ *
+ * Schemas type definition.
+ */
+struct _xmlSchemaType {
+    xmlSchemaTypeType type; /* The kind of type */
+    struct _xmlSchemaType *next; /* the next type if in a sequence ... */
+    const xmlChar *name;
+    const xmlChar *id ; /* Deprecated; not used */
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaTypePtr subtypes;
+    xmlSchemaAttributePtr attributes; /* Deprecated; not used */
+    xmlNodePtr node;
+    int minOccurs; /* Deprecated; not used */
+    int maxOccurs; /* Deprecated; not used */
+
+    int flags;
+    xmlSchemaContentType contentType;
+    const xmlChar *base; /* Base type's local name */
+    const xmlChar *baseNs; /* Base type's target namespace */
+    xmlSchemaTypePtr baseType; /* The base type component */
+    xmlSchemaFacetPtr facets; /* Local facets */
+    struct _xmlSchemaType *redef; /* Deprecated; not used */
+    int recurse; /* Obsolete */
+    xmlSchemaAttributeLinkPtr *attributeUses; /* Deprecated; not used */
+    xmlSchemaWildcardPtr attributeWildcard;
+    int builtInType; /* Type of built-in types. */
+    xmlSchemaTypeLinkPtr memberTypes; /* member-types if a union type. */
+    xmlSchemaFacetLinkPtr facetSet; /* All facets (incl. inherited) */
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaTypePtr contentTypeDef; /* Used for the simple content of complex types.
+                                        Could we use @subtypes for this? */
+    xmlRegexpPtr contModel; /* Holds the automaton of the content model */
+    const xmlChar *targetNamespace;
+    void *attrUses;
+};
+
+/*
+ * xmlSchemaElement:
+ * An element definition.
+ *
+ * xmlSchemaType, xmlSchemaFacet and xmlSchemaElement start of
+ * structures must be kept similar
+ */
+/**
+ * XML_SCHEMAS_ELEM_NILLABLE:
+ *
+ * the element is nillable
+ */
+#define XML_SCHEMAS_ELEM_NILLABLE        1 << 0
+/**
+ * XML_SCHEMAS_ELEM_GLOBAL:
+ *
+ * the element is global
+ */
+#define XML_SCHEMAS_ELEM_GLOBAL                1 << 1
+/**
+ * XML_SCHEMAS_ELEM_DEFAULT:
+ *
+ * the element has a default value
+ */
+#define XML_SCHEMAS_ELEM_DEFAULT        1 << 2
+/**
+ * XML_SCHEMAS_ELEM_FIXED:
+ *
+ * the element has a fixed value
+ */
+#define XML_SCHEMAS_ELEM_FIXED                1 << 3
+/**
+ * XML_SCHEMAS_ELEM_ABSTRACT:
+ *
+ * the element is abstract
+ */
+#define XML_SCHEMAS_ELEM_ABSTRACT        1 << 4
+/**
+ * XML_SCHEMAS_ELEM_TOPLEVEL:
+ *
+ * the element is top level
+ * obsolete: use XML_SCHEMAS_ELEM_GLOBAL instead
+ */
+#define XML_SCHEMAS_ELEM_TOPLEVEL        1 << 5
+/**
+ * XML_SCHEMAS_ELEM_REF:
+ *
+ * the element is a reference to a type
+ */
+#define XML_SCHEMAS_ELEM_REF                1 << 6
+/**
+ * XML_SCHEMAS_ELEM_NSDEFAULT:
+ *
+ * allow elements in no namespace
+ * Obsolete, not used anymore.
+ */
+#define XML_SCHEMAS_ELEM_NSDEFAULT        1 << 7
+/**
+ * XML_SCHEMAS_ELEM_INTERNAL_RESOLVED:
+ *
+ * this is set when "type", "ref", "substitutionGroup"
+ * references have been resolved.
+ */
+#define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED        1 << 8
+ /**
+ * XML_SCHEMAS_ELEM_CIRCULAR:
+ *
+ * a helper flag for the search of circular references.
+ */
+#define XML_SCHEMAS_ELEM_CIRCULAR        1 << 9
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_ABSENT:
+ *
+ * the "block" attribute is absent
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_ABSENT        1 << 10
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_EXTENSION:
+ *
+ * disallowed substitutions are absent
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_EXTENSION        1 << 11
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_RESTRICTION:
+ *
+ * disallowed substitutions: "restriction"
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION        1 << 12
+/**
+ * XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION:
+ *
+ * disallowed substitutions: "substitution"
+ */
+#define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION        1 << 13
+/**
+ * XML_SCHEMAS_ELEM_FINAL_ABSENT:
+ *
+ * substitution group exclusions are absent
+ */
+#define XML_SCHEMAS_ELEM_FINAL_ABSENT        1 << 14
+/**
+ * XML_SCHEMAS_ELEM_FINAL_EXTENSION:
+ *
+ * substitution group exclusions: "extension"
+ */
+#define XML_SCHEMAS_ELEM_FINAL_EXTENSION        1 << 15
+/**
+ * XML_SCHEMAS_ELEM_FINAL_RESTRICTION:
+ *
+ * substitution group exclusions: "restriction"
+ */
+#define XML_SCHEMAS_ELEM_FINAL_RESTRICTION        1 << 16
+/**
+ * XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD:
+ *
+ * the declaration is a substitution group head
+ */
+#define XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD        1 << 17
+/**
+ * XML_SCHEMAS_ELEM_INTERNAL_CHECKED:
+ *
+ * this is set when the elem decl has been checked against
+ * all constraints
+ */
+#define XML_SCHEMAS_ELEM_INTERNAL_CHECKED        1 << 18
+
+typedef struct _xmlSchemaElement xmlSchemaElement;
+typedef xmlSchemaElement *xmlSchemaElementPtr;
+struct _xmlSchemaElement {
+    xmlSchemaTypeType type; /* The kind of type */
+    struct _xmlSchemaType *next; /* Not used? */
+    const xmlChar *name;
+    const xmlChar *id; /* Deprecated; not used */
+    const xmlChar *ref; /* Deprecated; not used */
+    const xmlChar *refNs; /* Deprecated; not used */
+    xmlSchemaAnnotPtr annot;
+    xmlSchemaTypePtr subtypes; /* the type definition */
+    xmlSchemaAttributePtr attributes;
+    xmlNodePtr node;
+    int minOccurs; /* Deprecated; not used */
+    int maxOccurs; /* Deprecated; not used */
+
+    int flags;
+    const xmlChar *targetNamespace;
+    const xmlChar *namedType;
+    const xmlChar *namedTypeNs;
+    const xmlChar *substGroup;
+    const xmlChar *substGroupNs;
+    const xmlChar *scope;
+    const xmlChar *value; /* The original value of the value constraint. */
+    struct _xmlSchemaElement *refDecl; /* This will now be used for the
+                                          substitution group affiliation */
+    xmlRegexpPtr contModel; /* Obsolete for WXS, maybe used for RelaxNG */
+    xmlSchemaContentType contentType;
+    const xmlChar *refPrefix; /* Deprecated; not used */
+    xmlSchemaValPtr defVal; /* The compiled value constraint. */
+    void *idcs; /* The identity-constraint defs */
+};
+
+/*
+ * XML_SCHEMAS_FACET_UNKNOWN:
+ *
+ * unknown facet handling
+ */
+#define XML_SCHEMAS_FACET_UNKNOWN        0
+/*
+ * XML_SCHEMAS_FACET_PRESERVE:
+ *
+ * preserve the type of the facet
+ */
+#define XML_SCHEMAS_FACET_PRESERVE        1
+/*
+ * XML_SCHEMAS_FACET_REPLACE:
+ *
+ * replace the type of the facet
+ */
+#define XML_SCHEMAS_FACET_REPLACE        2
+/*
+ * XML_SCHEMAS_FACET_COLLAPSE:
+ *
+ * collapse the types of the facet
+ */
+#define XML_SCHEMAS_FACET_COLLAPSE        3
+/**
+ * A facet definition.
+ */
+struct _xmlSchemaFacet {
+    xmlSchemaTypeType type;        /* The kind of type */
+    struct _xmlSchemaFacet *next;/* the next type if in a sequence ... */
+    const xmlChar *value; /* The original value */
+    const xmlChar *id; /* Obsolete */
+    xmlSchemaAnnotPtr annot;
+    xmlNodePtr node;
+    int fixed; /* XML_SCHEMAS_FACET_PRESERVE, etc. */
+    int whitespace;
+    xmlSchemaValPtr val; /* The compiled value */
+    xmlRegexpPtr    regexp; /* The regex for patterns */
+};
+
+/**
+ * A notation definition.
+ */
+typedef struct _xmlSchemaNotation xmlSchemaNotation;
+typedef xmlSchemaNotation *xmlSchemaNotationPtr;
+struct _xmlSchemaNotation {
+    xmlSchemaTypeType type; /* The kind of type */
+    const xmlChar *name;
+    xmlSchemaAnnotPtr annot;
+    const xmlChar *identifier;
+    const xmlChar *targetNamespace;
+};
+
+/*
+* TODO: Actually all those flags used for the schema should sit
+* on the schema parser context, since they are used only
+* during parsing an XML schema document, and not available
+* on the component level as per spec.
+*/
+/**
+ * XML_SCHEMAS_QUALIF_ELEM:
+ *
+ * Reflects elementFormDefault == qualified in
+ * an XML schema document.
+ */
+#define XML_SCHEMAS_QUALIF_ELEM                1 << 0
+/**
+ * XML_SCHEMAS_QUALIF_ATTR:
+ *
+ * Reflects attributeFormDefault == qualified in
+ * an XML schema document.
+ */
+#define XML_SCHEMAS_QUALIF_ATTR            1 << 1
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_EXTENSION:
+ *
+ * the schema has "extension" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION        1 << 2
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION:
+ *
+ * the schema has "restriction" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION            1 << 3
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_LIST:
+ *
+ * the schema has "list" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_LIST            1 << 4
+/**
+ * XML_SCHEMAS_FINAL_DEFAULT_UNION:
+ *
+ * the schema has "union" in the set of finalDefault.
+ */
+#define XML_SCHEMAS_FINAL_DEFAULT_UNION            1 << 5
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION:
+ *
+ * the schema has "extension" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION            1 << 6
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION:
+ *
+ * the schema has "restriction" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION            1 << 7
+/**
+ * XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION:
+ *
+ * the schema has "substitution" in the set of blockDefault.
+ */
+#define XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION            1 << 8
+/**
+ * XML_SCHEMAS_INCLUDING_CONVERT_NS:
+ *
+ * the schema is currently including an other schema with
+ * no target namespace.
+ */
+#define XML_SCHEMAS_INCLUDING_CONVERT_NS            1 << 9
+/**
+ * _xmlSchema:
+ *
+ * A Schemas definition
+ */
+struct _xmlSchema {
+    const xmlChar *name; /* schema name */
+    const xmlChar *targetNamespace; /* the target namespace */
+    const xmlChar *version;
+    const xmlChar *id; /* Obsolete */
+    xmlDocPtr doc;
+    xmlSchemaAnnotPtr annot;
+    int flags;
+
+    xmlHashTablePtr typeDecl;
+    xmlHashTablePtr attrDecl;
+    xmlHashTablePtr attrgrpDecl;
+    xmlHashTablePtr elemDecl;
+    xmlHashTablePtr notaDecl;
+
+    xmlHashTablePtr schemasImports;
+
+    void *_private;        /* unused by the library for users or bindings */
+    xmlHashTablePtr groupDecl;
+    xmlDictPtr      dict;
+    void *includes;     /* the includes, this is opaque for now */
+    int preserve;        /* whether to free the document */
+    int counter; /* used to give anonymous components unique names */
+    xmlHashTablePtr idcDef; /* All identity-constraint defs. */
+    void *volatiles; /* Obsolete */
+};
+
+XMLPUBFUN void XMLCALL         xmlSchemaFreeType        (xmlSchemaTypePtr type);
+XMLPUBFUN void XMLCALL         xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* __XML_SCHEMA_INTERNALS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/schematron.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/schematron.h
new file mode 100644
index 0000000..364eaec
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/schematron.h
@@ -0,0 +1,142 @@
+/*
+ * Summary: XML Schemastron implementation
+ * Description: interface to the XML Schematron validity checking.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMATRON_H__
+#define __XML_SCHEMATRON_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMATRON_ENABLED
+
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    XML_SCHEMATRON_OUT_QUIET = 1 << 0,	/* quiet no report */
+    XML_SCHEMATRON_OUT_TEXT = 1 << 1,	/* build a textual report */
+    XML_SCHEMATRON_OUT_XML = 1 << 2,	/* output SVRL */
+    XML_SCHEMATRON_OUT_ERROR = 1 << 3,  /* output via xmlStructuredErrorFunc */
+    XML_SCHEMATRON_OUT_FILE = 1 << 8,	/* output to a file descriptor */
+    XML_SCHEMATRON_OUT_BUFFER = 1 << 9,	/* output to a buffer */
+    XML_SCHEMATRON_OUT_IO = 1 << 10	/* output to I/O mechanism */
+} xmlSchematronValidOptions;
+
+/**
+ * The schemas related types are kept internal
+ */
+typedef struct _xmlSchematron xmlSchematron;
+typedef xmlSchematron *xmlSchematronPtr;
+
+/**
+ * xmlSchematronValidityErrorFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of an error callback from a Schematron validation
+ */
+typedef void (*xmlSchematronValidityErrorFunc) (void *ctx, const char *msg, ...);
+
+/**
+ * xmlSchematronValidityWarningFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of a warning callback from a Schematron validation
+ */
+typedef void (*xmlSchematronValidityWarningFunc) (void *ctx, const char *msg, ...);
+
+/**
+ * A schemas validation context
+ */
+typedef struct _xmlSchematronParserCtxt xmlSchematronParserCtxt;
+typedef xmlSchematronParserCtxt *xmlSchematronParserCtxtPtr;
+
+typedef struct _xmlSchematronValidCtxt xmlSchematronValidCtxt;
+typedef xmlSchematronValidCtxt *xmlSchematronValidCtxtPtr;
+
+/*
+ * Interfaces for parsing.
+ */
+XMLPUBFUN xmlSchematronParserCtxtPtr XMLCALL
+	    xmlSchematronNewParserCtxt	(const char *URL);
+XMLPUBFUN xmlSchematronParserCtxtPtr XMLCALL
+	    xmlSchematronNewMemParserCtxt(const char *buffer,
+					 int size);
+XMLPUBFUN xmlSchematronParserCtxtPtr XMLCALL
+	    xmlSchematronNewDocParserCtxt(xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	    xmlSchematronFreeParserCtxt	(xmlSchematronParserCtxtPtr ctxt);
+/*****
+XMLPUBFUN void XMLCALL
+	    xmlSchematronSetParserErrors(xmlSchematronParserCtxtPtr ctxt,
+					 xmlSchematronValidityErrorFunc err,
+					 xmlSchematronValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchematronGetParserErrors(xmlSchematronParserCtxtPtr ctxt,
+					xmlSchematronValidityErrorFunc * err,
+					xmlSchematronValidityWarningFunc * warn,
+					void **ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchematronIsValid	(xmlSchematronValidCtxtPtr ctxt);
+ *****/
+XMLPUBFUN xmlSchematronPtr XMLCALL
+	    xmlSchematronParse		(xmlSchematronParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+	    xmlSchematronFree		(xmlSchematronPtr schema);
+/*
+ * Interfaces for validating
+ */
+XMLPUBFUN void XMLCALL
+	    xmlSchematronSetValidStructuredErrors(
+	                                  xmlSchematronValidCtxtPtr ctxt,
+					  xmlStructuredErrorFunc serror,
+					  void *ctx);
+/******
+XMLPUBFUN void XMLCALL
+	    xmlSchematronSetValidErrors	(xmlSchematronValidCtxtPtr ctxt,
+					 xmlSchematronValidityErrorFunc err,
+					 xmlSchematronValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronGetValidErrors	(xmlSchematronValidCtxtPtr ctxt,
+					 xmlSchematronValidityErrorFunc *err,
+					 xmlSchematronValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronSetValidOptions(xmlSchematronValidCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronValidCtxtGetOptions(xmlSchematronValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+            xmlSchematronValidateOneElement (xmlSchematronValidCtxtPtr ctxt,
+			                 xmlNodePtr elem);
+ *******/
+
+XMLPUBFUN xmlSchematronValidCtxtPtr XMLCALL
+	    xmlSchematronNewValidCtxt	(xmlSchematronPtr schema,
+					 int options);
+XMLPUBFUN void XMLCALL
+	    xmlSchematronFreeValidCtxt	(xmlSchematronValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+	    xmlSchematronValidateDoc	(xmlSchematronValidCtxtPtr ctxt,
+					 xmlDocPtr instance);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMATRON_ENABLED */
+#endif /* __XML_SCHEMATRON_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/threads.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/threads.h
new file mode 100644
index 0000000..9969ae7
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/threads.h
@@ -0,0 +1,89 @@
+/**
+ * Summary: interfaces for thread handling
+ * Description: set of generic threading related routines
+ *              should work with pthreads, Windows native or TLS threads
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_THREADS_H__
+#define __XML_THREADS_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * xmlMutex are a simple mutual exception locks.
+ */
+typedef struct _xmlMutex xmlMutex;
+typedef xmlMutex *xmlMutexPtr;
+
+/*
+ * xmlRMutex are reentrant mutual exception locks.
+ */
+typedef struct _xmlRMutex xmlRMutex;
+typedef xmlRMutex *xmlRMutexPtr;
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/globals.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+XMLPUBFUN xmlMutexPtr XMLCALL
+			xmlNewMutex	(void);
+XMLPUBFUN void XMLCALL
+			xmlMutexLock	(xmlMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlMutexUnlock	(xmlMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlFreeMutex	(xmlMutexPtr tok);
+
+XMLPUBFUN xmlRMutexPtr XMLCALL
+			xmlNewRMutex	(void);
+XMLPUBFUN void XMLCALL
+			xmlRMutexLock	(xmlRMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlRMutexUnlock	(xmlRMutexPtr tok);
+XMLPUBFUN void XMLCALL
+			xmlFreeRMutex	(xmlRMutexPtr tok);
+
+/*
+ * Library wide APIs.
+ */
+XMLPUBFUN void XMLCALL
+			xmlInitThreads	(void);
+XMLPUBFUN void XMLCALL
+			xmlLockLibrary	(void);
+XMLPUBFUN void XMLCALL
+			xmlUnlockLibrary(void);
+XMLPUBFUN int XMLCALL
+			xmlGetThreadId	(void);
+XMLPUBFUN int XMLCALL
+			xmlIsMainThread	(void);
+XMLPUBFUN void XMLCALL
+			xmlCleanupThreads(void);
+XMLPUBFUN xmlGlobalStatePtr XMLCALL
+			xmlGetGlobalState(void);
+
+#ifdef HAVE_PTHREAD_H
+#elif defined(HAVE_WIN32_THREADS) && !defined(HAVE_COMPILER_TLS) && (!defined(LIBXML_STATIC) || defined(LIBXML_STATIC_FOR_DLL))
+#if defined(LIBXML_STATIC_FOR_DLL)
+int XMLCALL
+xmlDllMain(void *hinstDLL, unsigned long fdwReason,
+           void *lpvReserved);
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* __XML_THREADS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/tree.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/tree.h
new file mode 100644
index 0000000..1e79be9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/tree.h
@@ -0,0 +1,1311 @@
+/*
+ * Summary: interfaces for tree manipulation
+ * Description: this module describes the structures found in an tree resulting
+ *              from an XML or HTML parsing, as well as the API provided for
+ *              various processing on that tree
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_TREE_H__
+#define __XML_TREE_H__
+
+#include <stdio.h>
+#include <limits.h>
+#include <libxml/xmlversion.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Some of the basic types pointer to structures:
+ */
+/* xmlIO.h */
+typedef struct _xmlParserInputBuffer xmlParserInputBuffer;
+typedef xmlParserInputBuffer *xmlParserInputBufferPtr;
+
+typedef struct _xmlOutputBuffer xmlOutputBuffer;
+typedef xmlOutputBuffer *xmlOutputBufferPtr;
+
+/* parser.h */
+typedef struct _xmlParserInput xmlParserInput;
+typedef xmlParserInput *xmlParserInputPtr;
+
+typedef struct _xmlParserCtxt xmlParserCtxt;
+typedef xmlParserCtxt *xmlParserCtxtPtr;
+
+typedef struct _xmlSAXLocator xmlSAXLocator;
+typedef xmlSAXLocator *xmlSAXLocatorPtr;
+
+typedef struct _xmlSAXHandler xmlSAXHandler;
+typedef xmlSAXHandler *xmlSAXHandlerPtr;
+
+/* entities.h */
+typedef struct _xmlEntity xmlEntity;
+typedef xmlEntity *xmlEntityPtr;
+
+/**
+ * BASE_BUFFER_SIZE:
+ *
+ * default buffer size 4000.
+ */
+#define BASE_BUFFER_SIZE 4096
+
+/**
+ * LIBXML_NAMESPACE_DICT:
+ *
+ * Defines experimental behaviour:
+ * 1) xmlNs gets an additional field @context (a xmlDoc)
+ * 2) when creating a tree, xmlNs->href is stored in the dict of xmlDoc.
+ */
+/* #define LIBXML_NAMESPACE_DICT */
+
+/**
+ * xmlBufferAllocationScheme:
+ *
+ * A buffer allocation scheme can be defined to either match exactly the
+ * need or double it's allocated size each time it is found too small.
+ */
+
+typedef enum {
+    XML_BUFFER_ALLOC_DOUBLEIT,	/* double each time one need to grow */
+    XML_BUFFER_ALLOC_EXACT,	/* grow only to the minimal size */
+    XML_BUFFER_ALLOC_IMMUTABLE, /* immutable buffer */
+    XML_BUFFER_ALLOC_IO,	/* special allocation scheme used for I/O */
+    XML_BUFFER_ALLOC_HYBRID,	/* exact up to a threshold, and doubleit thereafter */
+    XML_BUFFER_ALLOC_BOUNDED	/* limit the upper size of the buffer */
+} xmlBufferAllocationScheme;
+
+/**
+ * xmlBuffer:
+ *
+ * A buffer structure, this old construct is limited to 2GB and
+ * is being deprecated, use API with xmlBuf instead
+ */
+typedef struct _xmlBuffer xmlBuffer;
+typedef xmlBuffer *xmlBufferPtr;
+struct _xmlBuffer {
+    xmlChar *content;		/* The buffer content UTF8 */
+    unsigned int use;		/* The buffer size used */
+    unsigned int size;		/* The buffer size */
+    xmlBufferAllocationScheme alloc; /* The realloc method */
+    xmlChar *contentIO;		/* in IO mode we may have a different base */
+};
+
+/**
+ * xmlBuf:
+ *
+ * A buffer structure, new one, the actual structure internals are not public
+ */
+
+typedef struct _xmlBuf xmlBuf;
+
+/**
+ * xmlBufPtr:
+ *
+ * A pointer to a buffer structure, the actual structure internals are not
+ * public
+ */
+
+typedef xmlBuf *xmlBufPtr;
+
+/*
+ * A few public routines for xmlBuf. As those are expected to be used
+ * mostly internally the bulk of the routines are internal in buf.h
+ */
+XMLPUBFUN xmlChar* XMLCALL       xmlBufContent	(const xmlBuf* buf);
+XMLPUBFUN xmlChar* XMLCALL       xmlBufEnd      (xmlBufPtr buf);
+XMLPUBFUN size_t XMLCALL         xmlBufUse      (const xmlBufPtr buf);
+XMLPUBFUN size_t XMLCALL         xmlBufShrink	(xmlBufPtr buf, size_t len);
+
+/*
+ * LIBXML2_NEW_BUFFER:
+ *
+ * Macro used to express that the API use the new buffers for
+ * xmlParserInputBuffer and xmlOutputBuffer. The change was
+ * introduced in 2.9.0.
+ */
+#define LIBXML2_NEW_BUFFER
+
+/**
+ * XML_XML_NAMESPACE:
+ *
+ * This is the namespace for the special xml: prefix predefined in the
+ * XML Namespace specification.
+ */
+#define XML_XML_NAMESPACE \
+    (const xmlChar *) "http://www.w3.org/XML/1998/namespace"
+
+/**
+ * XML_XML_ID:
+ *
+ * This is the name for the special xml:id attribute
+ */
+#define XML_XML_ID (const xmlChar *) "xml:id"
+
+/*
+ * The different element types carried by an XML tree.
+ *
+ * NOTE: This is synchronized with DOM Level1 values
+ *       See http://www.w3.org/TR/REC-DOM-Level-1/
+ *
+ * Actually this had diverged a bit, and now XML_DOCUMENT_TYPE_NODE should
+ * be deprecated to use an XML_DTD_NODE.
+ */
+typedef enum {
+    XML_ELEMENT_NODE=		1,
+    XML_ATTRIBUTE_NODE=		2,
+    XML_TEXT_NODE=		3,
+    XML_CDATA_SECTION_NODE=	4,
+    XML_ENTITY_REF_NODE=	5,
+    XML_ENTITY_NODE=		6,
+    XML_PI_NODE=		7,
+    XML_COMMENT_NODE=		8,
+    XML_DOCUMENT_NODE=		9,
+    XML_DOCUMENT_TYPE_NODE=	10,
+    XML_DOCUMENT_FRAG_NODE=	11,
+    XML_NOTATION_NODE=		12,
+    XML_HTML_DOCUMENT_NODE=	13,
+    XML_DTD_NODE=		14,
+    XML_ELEMENT_DECL=		15,
+    XML_ATTRIBUTE_DECL=		16,
+    XML_ENTITY_DECL=		17,
+    XML_NAMESPACE_DECL=		18,
+    XML_XINCLUDE_START=		19,
+    XML_XINCLUDE_END=		20
+#ifdef LIBXML_DOCB_ENABLED
+   ,XML_DOCB_DOCUMENT_NODE=	21
+#endif
+} xmlElementType;
+
+
+/**
+ * xmlNotation:
+ *
+ * A DTD Notation definition.
+ */
+
+typedef struct _xmlNotation xmlNotation;
+typedef xmlNotation *xmlNotationPtr;
+struct _xmlNotation {
+    const xmlChar               *name;	        /* Notation name */
+    const xmlChar               *PublicID;	/* Public identifier, if any */
+    const xmlChar               *SystemID;	/* System identifier, if any */
+};
+
+/**
+ * xmlAttributeType:
+ *
+ * A DTD Attribute type definition.
+ */
+
+typedef enum {
+    XML_ATTRIBUTE_CDATA = 1,
+    XML_ATTRIBUTE_ID,
+    XML_ATTRIBUTE_IDREF	,
+    XML_ATTRIBUTE_IDREFS,
+    XML_ATTRIBUTE_ENTITY,
+    XML_ATTRIBUTE_ENTITIES,
+    XML_ATTRIBUTE_NMTOKEN,
+    XML_ATTRIBUTE_NMTOKENS,
+    XML_ATTRIBUTE_ENUMERATION,
+    XML_ATTRIBUTE_NOTATION
+} xmlAttributeType;
+
+/**
+ * xmlAttributeDefault:
+ *
+ * A DTD Attribute default definition.
+ */
+
+typedef enum {
+    XML_ATTRIBUTE_NONE = 1,
+    XML_ATTRIBUTE_REQUIRED,
+    XML_ATTRIBUTE_IMPLIED,
+    XML_ATTRIBUTE_FIXED
+} xmlAttributeDefault;
+
+/**
+ * xmlEnumeration:
+ *
+ * List structure used when there is an enumeration in DTDs.
+ */
+
+typedef struct _xmlEnumeration xmlEnumeration;
+typedef xmlEnumeration *xmlEnumerationPtr;
+struct _xmlEnumeration {
+    struct _xmlEnumeration    *next;	/* next one */
+    const xmlChar            *name;	/* Enumeration name */
+};
+
+/**
+ * xmlAttribute:
+ *
+ * An Attribute declaration in a DTD.
+ */
+
+typedef struct _xmlAttribute xmlAttribute;
+typedef xmlAttribute *xmlAttributePtr;
+struct _xmlAttribute {
+    void           *_private;	        /* application data */
+    xmlElementType          type;       /* XML_ATTRIBUTE_DECL, must be second ! */
+    const xmlChar          *name;	/* Attribute name */
+    struct _xmlNode    *children;	/* NULL */
+    struct _xmlNode        *last;	/* NULL */
+    struct _xmlDtd       *parent;	/* -> DTD */
+    struct _xmlNode        *next;	/* next sibling link  */
+    struct _xmlNode        *prev;	/* previous sibling link  */
+    struct _xmlDoc          *doc;       /* the containing document */
+
+    struct _xmlAttribute  *nexth;	/* next in hash table */
+    xmlAttributeType       atype;	/* The attribute type */
+    xmlAttributeDefault      def;	/* the default */
+    const xmlChar  *defaultValue;	/* or the default value */
+    xmlEnumerationPtr       tree;       /* or the enumeration tree if any */
+    const xmlChar        *prefix;	/* the namespace prefix if any */
+    const xmlChar          *elem;	/* Element holding the attribute */
+};
+
+/**
+ * xmlElementContentType:
+ *
+ * Possible definitions of element content types.
+ */
+typedef enum {
+    XML_ELEMENT_CONTENT_PCDATA = 1,
+    XML_ELEMENT_CONTENT_ELEMENT,
+    XML_ELEMENT_CONTENT_SEQ,
+    XML_ELEMENT_CONTENT_OR
+} xmlElementContentType;
+
+/**
+ * xmlElementContentOccur:
+ *
+ * Possible definitions of element content occurrences.
+ */
+typedef enum {
+    XML_ELEMENT_CONTENT_ONCE = 1,
+    XML_ELEMENT_CONTENT_OPT,
+    XML_ELEMENT_CONTENT_MULT,
+    XML_ELEMENT_CONTENT_PLUS
+} xmlElementContentOccur;
+
+/**
+ * xmlElementContent:
+ *
+ * An XML Element content as stored after parsing an element definition
+ * in a DTD.
+ */
+
+typedef struct _xmlElementContent xmlElementContent;
+typedef xmlElementContent *xmlElementContentPtr;
+struct _xmlElementContent {
+    xmlElementContentType     type;	/* PCDATA, ELEMENT, SEQ or OR */
+    xmlElementContentOccur    ocur;	/* ONCE, OPT, MULT or PLUS */
+    const xmlChar             *name;	/* Element name */
+    struct _xmlElementContent *c1;	/* first child */
+    struct _xmlElementContent *c2;	/* second child */
+    struct _xmlElementContent *parent;	/* parent */
+    const xmlChar             *prefix;	/* Namespace prefix */
+};
+
+/**
+ * xmlElementTypeVal:
+ *
+ * The different possibilities for an element content type.
+ */
+
+typedef enum {
+    XML_ELEMENT_TYPE_UNDEFINED = 0,
+    XML_ELEMENT_TYPE_EMPTY = 1,
+    XML_ELEMENT_TYPE_ANY,
+    XML_ELEMENT_TYPE_MIXED,
+    XML_ELEMENT_TYPE_ELEMENT
+} xmlElementTypeVal;
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/xmlregexp.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlElement:
+ *
+ * An XML Element declaration from a DTD.
+ */
+
+typedef struct _xmlElement xmlElement;
+typedef xmlElement *xmlElementPtr;
+struct _xmlElement {
+    void           *_private;	        /* application data */
+    xmlElementType          type;       /* XML_ELEMENT_DECL, must be second ! */
+    const xmlChar          *name;	/* Element name */
+    struct _xmlNode    *children;	/* NULL */
+    struct _xmlNode        *last;	/* NULL */
+    struct _xmlDtd       *parent;	/* -> DTD */
+    struct _xmlNode        *next;	/* next sibling link  */
+    struct _xmlNode        *prev;	/* previous sibling link  */
+    struct _xmlDoc          *doc;       /* the containing document */
+
+    xmlElementTypeVal      etype;	/* The type */
+    xmlElementContentPtr content;	/* the allowed element content */
+    xmlAttributePtr   attributes;	/* List of the declared attributes */
+    const xmlChar        *prefix;	/* the namespace prefix if any */
+#ifdef LIBXML_REGEXP_ENABLED
+    xmlRegexpPtr       contModel;	/* the validating regexp */
+#else
+    void	      *contModel;
+#endif
+};
+
+
+/**
+ * XML_LOCAL_NAMESPACE:
+ *
+ * A namespace declaration node.
+ */
+#define XML_LOCAL_NAMESPACE XML_NAMESPACE_DECL
+typedef xmlElementType xmlNsType;
+
+/**
+ * xmlNs:
+ *
+ * An XML namespace.
+ * Note that prefix == NULL is valid, it defines the default namespace
+ * within the subtree (until overridden).
+ *
+ * xmlNsType is unified with xmlElementType.
+ */
+
+typedef struct _xmlNs xmlNs;
+typedef xmlNs *xmlNsPtr;
+struct _xmlNs {
+    struct _xmlNs  *next;	/* next Ns link for this node  */
+    xmlNsType      type;	/* global or local */
+    const xmlChar *href;	/* URL for the namespace */
+    const xmlChar *prefix;	/* prefix for the namespace */
+    void           *_private;   /* application data */
+    struct _xmlDoc *context;		/* normally an xmlDoc */
+};
+
+/**
+ * xmlDtd:
+ *
+ * An XML DTD, as defined by <!DOCTYPE ... There is actually one for
+ * the internal subset and for the external subset.
+ */
+typedef struct _xmlDtd xmlDtd;
+typedef xmlDtd *xmlDtdPtr;
+struct _xmlDtd {
+    void           *_private;	/* application data */
+    xmlElementType  type;       /* XML_DTD_NODE, must be second ! */
+    const xmlChar *name;	/* Name of the DTD */
+    struct _xmlNode *children;	/* the value of the property link */
+    struct _xmlNode *last;	/* last child link */
+    struct _xmlDoc  *parent;	/* child->parent link */
+    struct _xmlNode *next;	/* next sibling link  */
+    struct _xmlNode *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* the containing document */
+
+    /* End of common part */
+    void          *notations;   /* Hash table for notations if any */
+    void          *elements;    /* Hash table for elements if any */
+    void          *attributes;  /* Hash table for attributes if any */
+    void          *entities;    /* Hash table for entities if any */
+    const xmlChar *ExternalID;	/* External identifier for PUBLIC DTD */
+    const xmlChar *SystemID;	/* URI for a SYSTEM or PUBLIC DTD */
+    void          *pentities;   /* Hash table for param entities if any */
+};
+
+/**
+ * xmlAttr:
+ *
+ * An attribute on an XML node.
+ */
+typedef struct _xmlAttr xmlAttr;
+typedef xmlAttr *xmlAttrPtr;
+struct _xmlAttr {
+    void           *_private;	/* application data */
+    xmlElementType   type;      /* XML_ATTRIBUTE_NODE, must be second ! */
+    const xmlChar   *name;      /* the name of the property */
+    struct _xmlNode *children;	/* the value of the property */
+    struct _xmlNode *last;	/* NULL */
+    struct _xmlNode *parent;	/* child->parent link */
+    struct _xmlAttr *next;	/* next sibling link  */
+    struct _xmlAttr *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* the containing document */
+    xmlNs           *ns;        /* pointer to the associated namespace */
+    xmlAttributeType atype;     /* the attribute type if validating */
+    void            *psvi;	/* for type/PSVI information */
+};
+
+/**
+ * xmlID:
+ *
+ * An XML ID instance.
+ */
+
+typedef struct _xmlID xmlID;
+typedef xmlID *xmlIDPtr;
+struct _xmlID {
+    struct _xmlID    *next;	/* next ID */
+    const xmlChar    *value;	/* The ID name */
+    xmlAttrPtr        attr;	/* The attribute holding it */
+    const xmlChar    *name;	/* The attribute if attr is not available */
+    int               lineno;	/* The line number if attr is not available */
+    struct _xmlDoc   *doc;	/* The document holding the ID */
+};
+
+/**
+ * xmlRef:
+ *
+ * An XML IDREF instance.
+ */
+
+typedef struct _xmlRef xmlRef;
+typedef xmlRef *xmlRefPtr;
+struct _xmlRef {
+    struct _xmlRef    *next;	/* next Ref */
+    const xmlChar     *value;	/* The Ref name */
+    xmlAttrPtr        attr;	/* The attribute holding it */
+    const xmlChar    *name;	/* The attribute if attr is not available */
+    int               lineno;	/* The line number if attr is not available */
+};
+
+/**
+ * xmlNode:
+ *
+ * A node in an XML tree.
+ */
+typedef struct _xmlNode xmlNode;
+typedef xmlNode *xmlNodePtr;
+struct _xmlNode {
+    void           *_private;	/* application data */
+    xmlElementType   type;	/* type number, must be second ! */
+    const xmlChar   *name;      /* the name of the node, or the entity */
+    struct _xmlNode *children;	/* parent->childs link */
+    struct _xmlNode *last;	/* last child link */
+    struct _xmlNode *parent;	/* child->parent link */
+    struct _xmlNode *next;	/* next sibling link  */
+    struct _xmlNode *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* the containing document */
+
+    /* End of common part */
+    xmlNs           *ns;        /* pointer to the associated namespace */
+    xmlChar         *content;   /* the content */
+    struct _xmlAttr *properties;/* properties list */
+    xmlNs           *nsDef;     /* namespace definitions on this node */
+    void            *psvi;	/* for type/PSVI information */
+    unsigned short   line;	/* line number */
+    unsigned short   extra;	/* extra data for XPath/XSLT */
+};
+
+/**
+ * XML_GET_CONTENT:
+ *
+ * Macro to extract the content pointer of a node.
+ */
+#define XML_GET_CONTENT(n)					\
+    ((n)->type == XML_ELEMENT_NODE ? NULL : (n)->content)
+
+/**
+ * XML_GET_LINE:
+ *
+ * Macro to extract the line number of an element node.
+ */
+#define XML_GET_LINE(n)						\
+    (xmlGetLineNo(n))
+
+/**
+ * xmlDocProperty
+ *
+ * Set of properties of the document as found by the parser
+ * Some of them are linked to similarly named xmlParserOption
+ */
+typedef enum {
+    XML_DOC_WELLFORMED		= 1<<0, /* document is XML well formed */
+    XML_DOC_NSVALID		= 1<<1, /* document is Namespace valid */
+    XML_DOC_OLD10		= 1<<2, /* parsed with old XML-1.0 parser */
+    XML_DOC_DTDVALID		= 1<<3, /* DTD validation was successful */
+    XML_DOC_XINCLUDE		= 1<<4, /* XInclude substitution was done */
+    XML_DOC_USERBUILT		= 1<<5, /* Document was built using the API
+                                           and not by parsing an instance */
+    XML_DOC_INTERNAL		= 1<<6, /* built for internal processing */
+    XML_DOC_HTML		= 1<<7  /* parsed or built HTML document */
+} xmlDocProperties;
+
+/**
+ * xmlDoc:
+ *
+ * An XML document.
+ */
+typedef struct _xmlDoc xmlDoc;
+typedef xmlDoc *xmlDocPtr;
+struct _xmlDoc {
+    void           *_private;	/* application data */
+    xmlElementType  type;       /* XML_DOCUMENT_NODE, must be second ! */
+    char           *name;	/* name/filename/URI of the document */
+    struct _xmlNode *children;	/* the document tree */
+    struct _xmlNode *last;	/* last child link */
+    struct _xmlNode *parent;	/* child->parent link */
+    struct _xmlNode *next;	/* next sibling link  */
+    struct _xmlNode *prev;	/* previous sibling link  */
+    struct _xmlDoc  *doc;	/* autoreference to itself */
+
+    /* End of common part */
+    int             compression;/* level of zlib compression */
+    int             standalone; /* standalone document (no external refs)
+				     1 if standalone="yes"
+				     0 if standalone="no"
+				    -1 if there is no XML declaration
+				    -2 if there is an XML declaration, but no
+					standalone attribute was specified */
+    struct _xmlDtd  *intSubset;	/* the document internal subset */
+    struct _xmlDtd  *extSubset;	/* the document external subset */
+    struct _xmlNs   *oldNs;	/* Global namespace, the old way */
+    const xmlChar  *version;	/* the XML version string */
+    const xmlChar  *encoding;   /* external initial encoding, if any */
+    void           *ids;        /* Hash table for ID attributes if any */
+    void           *refs;       /* Hash table for IDREFs attributes if any */
+    const xmlChar  *URL;	/* The URI for that document */
+    int             charset;    /* Internal flag for charset handling,
+				   actually an xmlCharEncoding */
+    struct _xmlDict *dict;      /* dict used to allocate names or NULL */
+    void           *psvi;	/* for type/PSVI information */
+    int             parseFlags;	/* set of xmlParserOption used to parse the
+				   document */
+    int             properties;	/* set of xmlDocProperties for this document
+				   set at the end of parsing */
+};
+
+
+typedef struct _xmlDOMWrapCtxt xmlDOMWrapCtxt;
+typedef xmlDOMWrapCtxt *xmlDOMWrapCtxtPtr;
+
+/**
+ * xmlDOMWrapAcquireNsFunction:
+ * @ctxt:  a DOM wrapper context
+ * @node:  the context node (element or attribute)
+ * @nsName:  the requested namespace name
+ * @nsPrefix:  the requested namespace prefix
+ *
+ * A function called to acquire namespaces (xmlNs) from the wrapper.
+ *
+ * Returns an xmlNsPtr or NULL in case of an error.
+ */
+typedef xmlNsPtr (*xmlDOMWrapAcquireNsFunction) (xmlDOMWrapCtxtPtr ctxt,
+						 xmlNodePtr node,
+						 const xmlChar *nsName,
+						 const xmlChar *nsPrefix);
+
+/**
+ * xmlDOMWrapCtxt:
+ *
+ * Context for DOM wrapper-operations.
+ */
+struct _xmlDOMWrapCtxt {
+    void * _private;
+    /*
+    * The type of this context, just in case we need specialized
+    * contexts in the future.
+    */
+    int type;
+    /*
+    * Internal namespace map used for various operations.
+    */
+    void * namespaceMap;
+    /*
+    * Use this one to acquire an xmlNsPtr intended for node->ns.
+    * (Note that this is not intended for elem->nsDef).
+    */
+    xmlDOMWrapAcquireNsFunction getNsForNodeFunc;
+};
+
+/**
+ * xmlChildrenNode:
+ *
+ * Macro for compatibility naming layer with libxml1. Maps
+ * to "children."
+ */
+#ifndef xmlChildrenNode
+#define xmlChildrenNode children
+#endif
+
+/**
+ * xmlRootNode:
+ *
+ * Macro for compatibility naming layer with libxml1. Maps
+ * to "children".
+ */
+#ifndef xmlRootNode
+#define xmlRootNode children
+#endif
+
+/*
+ * Variables.
+ */
+
+/*
+ * Some helper functions
+ */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || \
+    defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || \
+    defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || \
+    defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlValidateNCName	(const xmlChar *value,
+					 int space);
+#endif
+
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlValidateQName	(const xmlChar *value,
+					 int space);
+XMLPUBFUN int XMLCALL
+		xmlValidateName		(const xmlChar *value,
+					 int space);
+XMLPUBFUN int XMLCALL
+		xmlValidateNMToken	(const xmlChar *value,
+					 int space);
+#endif
+
+XMLPUBFUN xmlChar * XMLCALL
+		xmlBuildQName		(const xmlChar *ncname,
+					 const xmlChar *prefix,
+					 xmlChar *memory,
+					 int len);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSplitQName2		(const xmlChar *name,
+					 xmlChar **prefix);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSplitQName3		(const xmlChar *name,
+					 int *len);
+
+/*
+ * Handling Buffers, the old ones see @xmlBuf for the new ones.
+ */
+
+XMLPUBFUN void XMLCALL
+		xmlSetBufferAllocationScheme(xmlBufferAllocationScheme scheme);
+XMLPUBFUN xmlBufferAllocationScheme XMLCALL
+		xmlGetBufferAllocationScheme(void);
+
+XMLPUBFUN xmlBufferPtr XMLCALL
+		xmlBufferCreate		(void);
+XMLPUBFUN xmlBufferPtr XMLCALL
+		xmlBufferCreateSize	(size_t size);
+XMLPUBFUN xmlBufferPtr XMLCALL
+		xmlBufferCreateStatic	(void *mem,
+					 size_t size);
+XMLPUBFUN int XMLCALL
+		xmlBufferResize		(xmlBufferPtr buf,
+					 unsigned int size);
+XMLPUBFUN void XMLCALL
+		xmlBufferFree		(xmlBufferPtr buf);
+XMLPUBFUN int XMLCALL
+		xmlBufferDump		(FILE *file,
+					 xmlBufferPtr buf);
+XMLPUBFUN int XMLCALL
+		xmlBufferAdd		(xmlBufferPtr buf,
+					 const xmlChar *str,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlBufferAddHead	(xmlBufferPtr buf,
+					 const xmlChar *str,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlBufferCat		(xmlBufferPtr buf,
+					 const xmlChar *str);
+XMLPUBFUN int XMLCALL
+		xmlBufferCCat		(xmlBufferPtr buf,
+					 const char *str);
+XMLPUBFUN int XMLCALL
+		xmlBufferShrink		(xmlBufferPtr buf,
+					 unsigned int len);
+XMLPUBFUN int XMLCALL
+		xmlBufferGrow		(xmlBufferPtr buf,
+					 unsigned int len);
+XMLPUBFUN void XMLCALL
+		xmlBufferEmpty		(xmlBufferPtr buf);
+XMLPUBFUN const xmlChar* XMLCALL
+		xmlBufferContent	(const xmlBuffer *buf);
+XMLPUBFUN xmlChar* XMLCALL
+		xmlBufferDetach         (xmlBufferPtr buf);
+XMLPUBFUN void XMLCALL
+		xmlBufferSetAllocationScheme(xmlBufferPtr buf,
+					 xmlBufferAllocationScheme scheme);
+XMLPUBFUN int XMLCALL
+		xmlBufferLength		(const xmlBuffer *buf);
+
+/*
+ * Creating/freeing new structures.
+ */
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlCreateIntSubset	(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlNewDtd		(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *ExternalID,
+					 const xmlChar *SystemID);
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlGetIntSubset		(const xmlDoc *doc);
+XMLPUBFUN void XMLCALL
+		xmlFreeDtd		(xmlDtdPtr cur);
+#ifdef LIBXML_LEGACY_ENABLED
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlNewGlobalNs		(xmlDocPtr doc,
+					 const xmlChar *href,
+					 const xmlChar *prefix);
+#endif /* LIBXML_LEGACY_ENABLED */
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlNewNs		(xmlNodePtr node,
+					 const xmlChar *href,
+					 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		xmlFreeNs		(xmlNsPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlFreeNsList		(xmlNsPtr cur);
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlNewDoc		(const xmlChar *version);
+XMLPUBFUN void XMLCALL
+		xmlFreeDoc		(xmlDocPtr cur);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewDocProp		(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *value);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewProp		(xmlNodePtr node,
+					 const xmlChar *name,
+					 const xmlChar *value);
+#endif
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewNsProp		(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlNewNsPropEatName	(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		xmlFreePropList		(xmlAttrPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlFreeProp		(xmlAttrPtr cur);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlCopyProp		(xmlNodePtr target,
+					 xmlAttrPtr cur);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlCopyPropList		(xmlNodePtr target,
+					 xmlAttrPtr cur);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlDtdPtr XMLCALL
+		xmlCopyDtd		(xmlDtdPtr dtd);
+#endif /* LIBXML_TREE_ENABLED */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlDocPtr XMLCALL
+		xmlCopyDoc		(xmlDocPtr doc,
+					 int recursive);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) */
+/*
+ * Creating new nodes.
+ */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocNode		(xmlDocPtr doc,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocNodeEatName	(xmlDocPtr doc,
+					 xmlNsPtr ns,
+					 xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewNode		(xmlNsPtr ns,
+					 const xmlChar *name);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewNodeEatName	(xmlNsPtr ns,
+					 xmlChar *name);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewChild		(xmlNodePtr parent,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+#endif
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocText		(const xmlDoc *doc,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewText		(const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocPI		(xmlDocPtr doc,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewPI		(const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocTextLen	(xmlDocPtr doc,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewTextLen		(const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocComment	(xmlDocPtr doc,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewComment		(const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewCDataBlock	(xmlDocPtr doc,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewCharRef		(xmlDocPtr doc,
+					 const xmlChar *name);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewReference		(const xmlDoc *doc,
+					 const xmlChar *name);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlCopyNode		(xmlNodePtr node,
+					 int recursive);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocCopyNode		(xmlNodePtr node,
+					 xmlDocPtr doc,
+					 int recursive);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocCopyNodeList	(xmlDocPtr doc,
+					 xmlNodePtr node);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlCopyNodeList		(xmlNodePtr node);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewTextChild		(xmlNodePtr parent,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocRawNode	(xmlDocPtr doc,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *content);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlNewDocFragment	(xmlDocPtr doc);
+#endif /* LIBXML_TREE_ENABLED */
+
+/*
+ * Navigating.
+ */
+XMLPUBFUN long XMLCALL
+		xmlGetLineNo		(const xmlNode *node);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED)
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetNodePath		(const xmlNode *node);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED) */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocGetRootElement	(const xmlDoc *doc);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlGetLastChild		(const xmlNode *parent);
+XMLPUBFUN int XMLCALL
+		xmlNodeIsText		(const xmlNode *node);
+XMLPUBFUN int XMLCALL
+		xmlIsBlankNode		(const xmlNode *node);
+
+/*
+ * Changing the structure.
+ */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlDocSetRootElement	(xmlDocPtr doc,
+					 xmlNodePtr root);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED) */
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlNodeSetName		(xmlNodePtr cur,
+					 const xmlChar *name);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddChild		(xmlNodePtr parent,
+					 xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddChildList		(xmlNodePtr parent,
+					 xmlNodePtr cur);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlReplaceNode		(xmlNodePtr old,
+					 xmlNodePtr cur);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED) */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddPrevSibling	(xmlNodePtr cur,
+					 xmlNodePtr elem);
+#endif /* LIBXML_TREE_ENABLED || LIBXML_HTML_ENABLED || LIBXML_SCHEMAS_ENABLED */
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddSibling		(xmlNodePtr cur,
+					 xmlNodePtr elem);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlAddNextSibling	(xmlNodePtr cur,
+					 xmlNodePtr elem);
+XMLPUBFUN void XMLCALL
+		xmlUnlinkNode		(xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlTextMerge		(xmlNodePtr first,
+					 xmlNodePtr second);
+XMLPUBFUN int XMLCALL
+		xmlTextConcat		(xmlNodePtr node,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN void XMLCALL
+		xmlFreeNodeList		(xmlNodePtr cur);
+XMLPUBFUN void XMLCALL
+		xmlFreeNode		(xmlNodePtr cur);
+XMLPUBFUN void XMLCALL
+		xmlSetTreeDoc		(xmlNodePtr tree,
+					 xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+		xmlSetListDoc		(xmlNodePtr list,
+					 xmlDocPtr doc);
+/*
+ * Namespaces.
+ */
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlSearchNs		(xmlDocPtr doc,
+					 xmlNodePtr node,
+					 const xmlChar *nameSpace);
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlSearchNsByHref	(xmlDocPtr doc,
+					 xmlNodePtr node,
+					 const xmlChar *href);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN xmlNsPtr * XMLCALL
+		xmlGetNsList		(const xmlDoc *doc,
+					 const xmlNode *node);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) */
+
+XMLPUBFUN void XMLCALL
+		xmlSetNs		(xmlNodePtr node,
+					 xmlNsPtr ns);
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlCopyNamespace	(xmlNsPtr cur);
+XMLPUBFUN xmlNsPtr XMLCALL
+		xmlCopyNamespaceList	(xmlNsPtr cur);
+
+/*
+ * Changing the content.
+ */
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || \
+    defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED)
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlSetProp		(xmlNodePtr node,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlSetNsProp		(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 const xmlChar *name,
+					 const xmlChar *value);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || \
+	  defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED) */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetNoNsProp		(const xmlNode *node,
+					 const xmlChar *name);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetProp		(const xmlNode *node,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlHasProp		(const xmlNode *node,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlHasNsProp		(const xmlNode *node,
+					 const xmlChar *name,
+					 const xmlChar *nameSpace);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlGetNsProp		(const xmlNode *node,
+					 const xmlChar *name,
+					 const xmlChar *nameSpace);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlStringGetNodeList	(const xmlDoc *doc,
+					 const xmlChar *value);
+XMLPUBFUN xmlNodePtr XMLCALL
+		xmlStringLenGetNodeList	(const xmlDoc *doc,
+					 const xmlChar *value,
+					 int len);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeListGetString	(xmlDocPtr doc,
+					 const xmlNode *list,
+					 int inLine);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeListGetRawString	(const xmlDoc *doc,
+					 const xmlNode *list,
+					 int inLine);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlNodeSetContent	(xmlNodePtr cur,
+					 const xmlChar *content);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlNodeSetContentLen	(xmlNodePtr cur,
+					 const xmlChar *content,
+					 int len);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlNodeAddContent	(xmlNodePtr cur,
+					 const xmlChar *content);
+XMLPUBFUN void XMLCALL
+		xmlNodeAddContentLen	(xmlNodePtr cur,
+					 const xmlChar *content,
+					 int len);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeGetContent	(const xmlNode *cur);
+
+XMLPUBFUN int XMLCALL
+		xmlNodeBufGetContent	(xmlBufferPtr buffer,
+					 const xmlNode *cur);
+XMLPUBFUN int XMLCALL
+		xmlBufGetNodeContent	(xmlBufPtr buf,
+					 const xmlNode *cur);
+
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeGetLang		(const xmlNode *cur);
+XMLPUBFUN int XMLCALL
+		xmlNodeGetSpacePreserve	(const xmlNode *cur);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlNodeSetLang		(xmlNodePtr cur,
+					 const xmlChar *lang);
+XMLPUBFUN void XMLCALL
+		xmlNodeSetSpacePreserve (xmlNodePtr cur,
+					 int val);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN xmlChar * XMLCALL
+		xmlNodeGetBase		(const xmlDoc *doc,
+					 const xmlNode *cur);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED)
+XMLPUBFUN void XMLCALL
+		xmlNodeSetBase		(xmlNodePtr cur,
+					 const xmlChar *uri);
+#endif
+
+/*
+ * Removing content.
+ */
+XMLPUBFUN int XMLCALL
+		xmlRemoveProp		(xmlAttrPtr cur);
+#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlUnsetNsProp		(xmlNodePtr node,
+					 xmlNsPtr ns,
+					 const xmlChar *name);
+XMLPUBFUN int XMLCALL
+		xmlUnsetProp		(xmlNodePtr node,
+					 const xmlChar *name);
+#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) */
+
+/*
+ * Internal, don't use.
+ */
+XMLPUBFUN void XMLCALL
+		xmlBufferWriteCHAR	(xmlBufferPtr buf,
+					 const xmlChar *string);
+XMLPUBFUN void XMLCALL
+		xmlBufferWriteChar	(xmlBufferPtr buf,
+					 const char *string);
+XMLPUBFUN void XMLCALL
+		xmlBufferWriteQuotedString(xmlBufferPtr buf,
+					 const xmlChar *string);
+
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void xmlAttrSerializeTxtContent(xmlBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlAttrPtr attr,
+					 const xmlChar *string);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+#ifdef LIBXML_TREE_ENABLED
+/*
+ * Namespace handling.
+ */
+XMLPUBFUN int XMLCALL
+		xmlReconciliateNs	(xmlDocPtr doc,
+					 xmlNodePtr tree);
+#endif
+
+#ifdef LIBXML_OUTPUT_ENABLED
+/*
+ * Saving.
+ */
+XMLPUBFUN void XMLCALL
+		xmlDocDumpFormatMemory	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size,
+					 int format);
+XMLPUBFUN void XMLCALL
+		xmlDocDumpMemory	(xmlDocPtr cur,
+					 xmlChar **mem,
+					 int *size);
+XMLPUBFUN void XMLCALL
+		xmlDocDumpMemoryEnc	(xmlDocPtr out_doc,
+					 xmlChar **doc_txt_ptr,
+					 int * doc_txt_len,
+					 const char *txt_encoding);
+XMLPUBFUN void XMLCALL
+		xmlDocDumpFormatMemoryEnc(xmlDocPtr out_doc,
+					 xmlChar **doc_txt_ptr,
+					 int * doc_txt_len,
+					 const char *txt_encoding,
+					 int format);
+XMLPUBFUN int XMLCALL
+		xmlDocFormatDump	(FILE *f,
+					 xmlDocPtr cur,
+					 int format);
+XMLPUBFUN int XMLCALL
+		xmlDocDump		(FILE *f,
+					 xmlDocPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlElemDump		(FILE *f,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur);
+XMLPUBFUN int XMLCALL
+		xmlSaveFile		(const char *filename,
+					 xmlDocPtr cur);
+XMLPUBFUN int XMLCALL
+		xmlSaveFormatFile	(const char *filename,
+					 xmlDocPtr cur,
+					 int format);
+XMLPUBFUN size_t XMLCALL
+		xmlBufNodeDump		(xmlBufPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 int level,
+					 int format);
+XMLPUBFUN int XMLCALL
+		xmlNodeDump		(xmlBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 int level,
+					 int format);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFileTo		(xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+					 const char *encoding);
+XMLPUBFUN int XMLCALL
+		xmlSaveFormatFileTo     (xmlOutputBufferPtr buf,
+					 xmlDocPtr cur,
+				         const char *encoding,
+				         int format);
+XMLPUBFUN void XMLCALL
+		xmlNodeDumpOutput	(xmlOutputBufferPtr buf,
+					 xmlDocPtr doc,
+					 xmlNodePtr cur,
+					 int level,
+					 int format,
+					 const char *encoding);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFormatFileEnc    (const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding,
+					 int format);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFileEnc		(const char *filename,
+					 xmlDocPtr cur,
+					 const char *encoding);
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+/*
+ * XHTML
+ */
+XMLPUBFUN int XMLCALL
+		xmlIsXHTML		(const xmlChar *systemID,
+					 const xmlChar *publicID);
+
+/*
+ * Compression.
+ */
+XMLPUBFUN int XMLCALL
+		xmlGetDocCompressMode	(const xmlDoc *doc);
+XMLPUBFUN void XMLCALL
+		xmlSetDocCompressMode	(xmlDocPtr doc,
+					 int mode);
+XMLPUBFUN int XMLCALL
+		xmlGetCompressMode	(void);
+XMLPUBFUN void XMLCALL
+		xmlSetCompressMode	(int mode);
+
+/*
+* DOM-wrapper helper functions.
+*/
+XMLPUBFUN xmlDOMWrapCtxtPtr XMLCALL
+		xmlDOMWrapNewCtxt	(void);
+XMLPUBFUN void XMLCALL
+		xmlDOMWrapFreeCtxt	(xmlDOMWrapCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapReconcileNamespaces(xmlDOMWrapCtxtPtr ctxt,
+					 xmlNodePtr elem,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapAdoptNode		(xmlDOMWrapCtxtPtr ctxt,
+					 xmlDocPtr sourceDoc,
+					 xmlNodePtr node,
+					 xmlDocPtr destDoc,
+					 xmlNodePtr destParent,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapRemoveNode	(xmlDOMWrapCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr node,
+					 int options);
+XMLPUBFUN int XMLCALL
+	    xmlDOMWrapCloneNode		(xmlDOMWrapCtxtPtr ctxt,
+					 xmlDocPtr sourceDoc,
+					 xmlNodePtr node,
+					 xmlNodePtr *clonedNode,
+					 xmlDocPtr destDoc,
+					 xmlNodePtr destParent,
+					 int deep,
+					 int options);
+
+#ifdef LIBXML_TREE_ENABLED
+/*
+ * 5 interfaces from DOM ElementTraversal, but different in entities
+ * traversal.
+ */
+XMLPUBFUN unsigned long XMLCALL
+            xmlChildElementCount        (xmlNodePtr parent);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlNextElementSibling       (xmlNodePtr node);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlFirstElementChild        (xmlNodePtr parent);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlLastElementChild         (xmlNodePtr parent);
+XMLPUBFUN xmlNodePtr XMLCALL
+            xmlPreviousElementSibling   (xmlNodePtr node);
+#endif
+#ifdef __cplusplus
+}
+#endif
+#ifndef __XML_PARSER_H__
+#include <libxml/xmlmemory.h>
+#endif
+
+#endif /* __XML_TREE_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/uri.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/uri.h
new file mode 100644
index 0000000..db48262
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/uri.h
@@ -0,0 +1,94 @@
+/**
+ * Summary: library of generic URI related routines
+ * Description: library of generic URI related routines
+ *              Implements RFC 2396
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_URI_H__
+#define __XML_URI_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlURI:
+ *
+ * A parsed URI reference. This is a struct containing the various fields
+ * as described in RFC 2396 but separated for further processing.
+ *
+ * Note: query is a deprecated field which is incorrectly unescaped.
+ * query_raw takes precedence over query if the former is set.
+ * See: http://mail.gnome.org/archives/xml/2007-April/thread.html#00127
+ */
+typedef struct _xmlURI xmlURI;
+typedef xmlURI *xmlURIPtr;
+struct _xmlURI {
+    char *scheme;	/* the URI scheme */
+    char *opaque;	/* opaque part */
+    char *authority;	/* the authority part */
+    char *server;	/* the server part */
+    char *user;		/* the user part */
+    int port;		/* the port number */
+    char *path;		/* the path string */
+    char *query;	/* the query string (deprecated - use with caution) */
+    char *fragment;	/* the fragment identifier */
+    int  cleanup;	/* parsing potentially unclean URI */
+    char *query_raw;	/* the query string (as it appears in the URI) */
+};
+
+/*
+ * This function is in tree.h:
+ * xmlChar *	xmlNodeGetBase	(xmlDocPtr doc,
+ *                               xmlNodePtr cur);
+ */
+XMLPUBFUN xmlURIPtr XMLCALL
+		xmlCreateURI		(void);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlBuildURI		(const xmlChar *URI,
+					 const xmlChar *base);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlBuildRelativeURI	(const xmlChar *URI,
+					 const xmlChar *base);
+XMLPUBFUN xmlURIPtr XMLCALL
+		xmlParseURI		(const char *str);
+XMLPUBFUN xmlURIPtr XMLCALL
+		xmlParseURIRaw		(const char *str,
+					 int raw);
+XMLPUBFUN int XMLCALL
+		xmlParseURIReference	(xmlURIPtr uri,
+					 const char *str);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSaveUri		(xmlURIPtr uri);
+XMLPUBFUN void XMLCALL
+		xmlPrintURI		(FILE *stream,
+					 xmlURIPtr uri);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlURIEscapeStr         (const xmlChar *str,
+					 const xmlChar *list);
+XMLPUBFUN char * XMLCALL
+		xmlURIUnescapeString	(const char *str,
+					 int len,
+					 char *target);
+XMLPUBFUN int XMLCALL
+		xmlNormalizeURIPath	(char *path);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlURIEscape		(const xmlChar *str);
+XMLPUBFUN void XMLCALL
+		xmlFreeURI		(xmlURIPtr uri);
+XMLPUBFUN xmlChar* XMLCALL
+		xmlCanonicPath		(const xmlChar *path);
+XMLPUBFUN xmlChar* XMLCALL
+		xmlPathToURI		(const xmlChar *path);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_URI_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/valid.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/valid.h
new file mode 100644
index 0000000..2bc7b38
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/valid.h
@@ -0,0 +1,458 @@
+/*
+ * Summary: The DTD validation
+ * Description: API for the DTD handling and the validity checking
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_VALID_H__
+#define __XML_VALID_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/xmlerror.h>
+#include <libxml/tree.h>
+#include <libxml/list.h>
+#include <libxml/xmlautomata.h>
+#include <libxml/xmlregexp.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Validation state added for non-determinist content model.
+ */
+typedef struct _xmlValidState xmlValidState;
+typedef xmlValidState *xmlValidStatePtr;
+
+/**
+ * xmlValidityErrorFunc:
+ * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
+ *        but comes from ctxt->userData (which normally contains such
+ *        a pointer); ctxt->userData can be changed by the user.
+ * @msg:  the string to format *printf like vararg
+ * @...:  remaining arguments to the format
+ *
+ * Callback called when a validity error is found. This is a message
+ * oriented function similar to an *printf function.
+ */
+typedef void (XMLCDECL *xmlValidityErrorFunc) (void *ctx,
+			     const char *msg,
+			     ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * xmlValidityWarningFunc:
+ * @ctx:  usually an xmlValidCtxtPtr to a validity error context,
+ *        but comes from ctxt->userData (which normally contains such
+ *        a pointer); ctxt->userData can be changed by the user.
+ * @msg:  the string to format *printf like vararg
+ * @...:  remaining arguments to the format
+ *
+ * Callback called when a validity warning is found. This is a message
+ * oriented function similar to an *printf function.
+ */
+typedef void (XMLCDECL *xmlValidityWarningFunc) (void *ctx,
+			       const char *msg,
+			       ...) LIBXML_ATTR_FORMAT(2,3);
+
+#ifdef IN_LIBXML
+/**
+ * XML_CTXT_FINISH_DTD_0:
+ *
+ * Special value for finishDtd field when embedded in an xmlParserCtxt
+ */
+#define XML_CTXT_FINISH_DTD_0 0xabcd1234
+/**
+ * XML_CTXT_FINISH_DTD_1:
+ *
+ * Special value for finishDtd field when embedded in an xmlParserCtxt
+ */
+#define XML_CTXT_FINISH_DTD_1 0xabcd1235
+#endif
+
+/*
+ * xmlValidCtxt:
+ * An xmlValidCtxt is used for error reporting when validating.
+ */
+typedef struct _xmlValidCtxt xmlValidCtxt;
+typedef xmlValidCtxt *xmlValidCtxtPtr;
+struct _xmlValidCtxt {
+    void *userData;			/* user specific data block */
+    xmlValidityErrorFunc error;		/* the callback in case of errors */
+    xmlValidityWarningFunc warning;	/* the callback in case of warning */
+
+    /* Node analysis stack used when validating within entities */
+    xmlNodePtr         node;          /* Current parsed Node */
+    int                nodeNr;        /* Depth of the parsing stack */
+    int                nodeMax;       /* Max depth of the parsing stack */
+    xmlNodePtr        *nodeTab;       /* array of nodes */
+
+    unsigned int     finishDtd;       /* finished validating the Dtd ? */
+    xmlDocPtr              doc;       /* the document */
+    int                  valid;       /* temporary validity check result */
+
+    /* state state used for non-determinist content validation */
+    xmlValidState     *vstate;        /* current state */
+    int                vstateNr;      /* Depth of the validation stack */
+    int                vstateMax;     /* Max depth of the validation stack */
+    xmlValidState     *vstateTab;     /* array of validation states */
+
+#ifdef LIBXML_REGEXP_ENABLED
+    xmlAutomataPtr            am;     /* the automata */
+    xmlAutomataStatePtr    state;     /* used to build the automata */
+#else
+    void                     *am;
+    void                  *state;
+#endif
+};
+
+/*
+ * ALL notation declarations are stored in a table.
+ * There is one table per DTD.
+ */
+
+typedef struct _xmlHashTable xmlNotationTable;
+typedef xmlNotationTable *xmlNotationTablePtr;
+
+/*
+ * ALL element declarations are stored in a table.
+ * There is one table per DTD.
+ */
+
+typedef struct _xmlHashTable xmlElementTable;
+typedef xmlElementTable *xmlElementTablePtr;
+
+/*
+ * ALL attribute declarations are stored in a table.
+ * There is one table per DTD.
+ */
+
+typedef struct _xmlHashTable xmlAttributeTable;
+typedef xmlAttributeTable *xmlAttributeTablePtr;
+
+/*
+ * ALL IDs attributes are stored in a table.
+ * There is one table per document.
+ */
+
+typedef struct _xmlHashTable xmlIDTable;
+typedef xmlIDTable *xmlIDTablePtr;
+
+/*
+ * ALL Refs attributes are stored in a table.
+ * There is one table per document.
+ */
+
+typedef struct _xmlHashTable xmlRefTable;
+typedef xmlRefTable *xmlRefTablePtr;
+
+/* Notation */
+XMLPUBFUN xmlNotationPtr XMLCALL
+		xmlAddNotationDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDtdPtr dtd,
+					 const xmlChar *name,
+					 const xmlChar *PublicID,
+					 const xmlChar *SystemID);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlNotationTablePtr XMLCALL
+		xmlCopyNotationTable	(xmlNotationTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeNotationTable	(xmlNotationTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlDumpNotationDecl	(xmlBufferPtr buf,
+					 xmlNotationPtr nota);
+XMLPUBFUN void XMLCALL
+		xmlDumpNotationTable	(xmlBufferPtr buf,
+					 xmlNotationTablePtr table);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/* Element Content */
+/* the non Doc version are being deprecated */
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlNewElementContent	(const xmlChar *name,
+					 xmlElementContentType type);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlCopyElementContent	(xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		xmlFreeElementContent	(xmlElementContentPtr cur);
+/* the new versions with doc argument */
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlNewDocElementContent	(xmlDocPtr doc,
+					 const xmlChar *name,
+					 xmlElementContentType type);
+XMLPUBFUN xmlElementContentPtr XMLCALL
+		xmlCopyDocElementContent(xmlDocPtr doc,
+					 xmlElementContentPtr content);
+XMLPUBFUN void XMLCALL
+		xmlFreeDocElementContent(xmlDocPtr doc,
+					 xmlElementContentPtr cur);
+XMLPUBFUN void XMLCALL
+		xmlSnprintfElementContent(char *buf,
+					 int size,
+	                                 xmlElementContentPtr content,
+					 int englob);
+#ifdef LIBXML_OUTPUT_ENABLED
+/* DEPRECATED */
+XMLPUBFUN void XMLCALL
+		xmlSprintfElementContent(char *buf,
+	                                 xmlElementContentPtr content,
+					 int englob);
+#endif /* LIBXML_OUTPUT_ENABLED */
+/* DEPRECATED */
+
+/* Element */
+XMLPUBFUN xmlElementPtr XMLCALL
+		xmlAddElementDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDtdPtr dtd,
+					 const xmlChar *name,
+					 xmlElementTypeVal type,
+					 xmlElementContentPtr content);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlElementTablePtr XMLCALL
+		xmlCopyElementTable	(xmlElementTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeElementTable	(xmlElementTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlDumpElementTable	(xmlBufferPtr buf,
+					 xmlElementTablePtr table);
+XMLPUBFUN void XMLCALL
+		xmlDumpElementDecl	(xmlBufferPtr buf,
+					 xmlElementPtr elem);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/* Enumeration */
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+		xmlCreateEnumeration	(const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		xmlFreeEnumeration	(xmlEnumerationPtr cur);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlEnumerationPtr XMLCALL
+		xmlCopyEnumeration	(xmlEnumerationPtr cur);
+#endif /* LIBXML_TREE_ENABLED */
+
+/* Attribute */
+XMLPUBFUN xmlAttributePtr XMLCALL
+		xmlAddAttributeDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDtdPtr dtd,
+					 const xmlChar *elem,
+					 const xmlChar *name,
+					 const xmlChar *ns,
+					 xmlAttributeType type,
+					 xmlAttributeDefault def,
+					 const xmlChar *defaultValue,
+					 xmlEnumerationPtr tree);
+#ifdef LIBXML_TREE_ENABLED
+XMLPUBFUN xmlAttributeTablePtr XMLCALL
+		xmlCopyAttributeTable  (xmlAttributeTablePtr table);
+#endif /* LIBXML_TREE_ENABLED */
+XMLPUBFUN void XMLCALL
+		xmlFreeAttributeTable  (xmlAttributeTablePtr table);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlDumpAttributeTable  (xmlBufferPtr buf,
+					xmlAttributeTablePtr table);
+XMLPUBFUN void XMLCALL
+		xmlDumpAttributeDecl   (xmlBufferPtr buf,
+					xmlAttributePtr attr);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/* IDs */
+XMLPUBFUN xmlIDPtr XMLCALL
+		xmlAddID	       (xmlValidCtxtPtr ctxt,
+					xmlDocPtr doc,
+					const xmlChar *value,
+					xmlAttrPtr attr);
+XMLPUBFUN void XMLCALL
+		xmlFreeIDTable	       (xmlIDTablePtr table);
+XMLPUBFUN xmlAttrPtr XMLCALL
+		xmlGetID	       (xmlDocPtr doc,
+					const xmlChar *ID);
+XMLPUBFUN int XMLCALL
+		xmlIsID		       (xmlDocPtr doc,
+					xmlNodePtr elem,
+					xmlAttrPtr attr);
+XMLPUBFUN int XMLCALL
+		xmlRemoveID	       (xmlDocPtr doc,
+					xmlAttrPtr attr);
+
+/* IDREFs */
+XMLPUBFUN xmlRefPtr XMLCALL
+		xmlAddRef	       (xmlValidCtxtPtr ctxt,
+					xmlDocPtr doc,
+					const xmlChar *value,
+					xmlAttrPtr attr);
+XMLPUBFUN void XMLCALL
+		xmlFreeRefTable	       (xmlRefTablePtr table);
+XMLPUBFUN int XMLCALL
+		xmlIsRef	       (xmlDocPtr doc,
+					xmlNodePtr elem,
+					xmlAttrPtr attr);
+XMLPUBFUN int XMLCALL
+		xmlRemoveRef	       (xmlDocPtr doc,
+					xmlAttrPtr attr);
+XMLPUBFUN xmlListPtr XMLCALL
+		xmlGetRefs	       (xmlDocPtr doc,
+					const xmlChar *ID);
+
+/**
+ * The public function calls related to validity checking.
+ */
+#ifdef LIBXML_VALID_ENABLED
+/* Allocate/Release Validation Contexts */
+XMLPUBFUN xmlValidCtxtPtr XMLCALL
+		xmlNewValidCtxt(void);
+XMLPUBFUN void XMLCALL
+		xmlFreeValidCtxt(xmlValidCtxtPtr);
+
+XMLPUBFUN int XMLCALL
+		xmlValidateRoot		(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlValidateElementDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlElementPtr elem);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlValidNormalizeAttributeValue(xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlValidCtxtNormalizeAttributeValue(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *name,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateAttributeDecl(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlAttributePtr attr);
+XMLPUBFUN int XMLCALL
+		xmlValidateAttributeValue(xmlAttributeType type,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNotationDecl	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlNotationPtr nota);
+XMLPUBFUN int XMLCALL
+		xmlValidateDtd		(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlDtdPtr dtd);
+XMLPUBFUN int XMLCALL
+		xmlValidateDtdFinal	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlValidateDocument	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlValidateElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		xmlValidateOneElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+		                         xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+		xmlValidateOneAttribute	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr	elem,
+					 xmlAttrPtr attr,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateOneNamespace	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *prefix,
+					 xmlNsPtr ns,
+					 const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateDocumentFinal(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc);
+#endif /* LIBXML_VALID_ENABLED */
+
+#if defined(LIBXML_VALID_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN int XMLCALL
+		xmlValidateNotationUse	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 const xmlChar *notationName);
+#endif /* LIBXML_VALID_ENABLED or LIBXML_SCHEMAS_ENABLED */
+
+XMLPUBFUN int XMLCALL
+		xmlIsMixedElement	(xmlDocPtr doc,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttributePtr XMLCALL
+		xmlGetDtdAttrDesc	(xmlDtdPtr dtd,
+					 const xmlChar *elem,
+					 const xmlChar *name);
+XMLPUBFUN xmlAttributePtr XMLCALL
+		xmlGetDtdQAttrDesc	(xmlDtdPtr dtd,
+					 const xmlChar *elem,
+					 const xmlChar *name,
+					 const xmlChar *prefix);
+XMLPUBFUN xmlNotationPtr XMLCALL
+		xmlGetDtdNotationDesc	(xmlDtdPtr dtd,
+					 const xmlChar *name);
+XMLPUBFUN xmlElementPtr XMLCALL
+		xmlGetDtdQElementDesc	(xmlDtdPtr dtd,
+					 const xmlChar *name,
+					 const xmlChar *prefix);
+XMLPUBFUN xmlElementPtr XMLCALL
+		xmlGetDtdElementDesc	(xmlDtdPtr dtd,
+					 const xmlChar *name);
+
+#ifdef LIBXML_VALID_ENABLED
+
+XMLPUBFUN int XMLCALL
+		xmlValidGetPotentialChildren(xmlElementContent *ctree,
+					 const xmlChar **names,
+					 int *len,
+					 int max);
+
+XMLPUBFUN int XMLCALL
+		xmlValidGetValidElements(xmlNode *prev,
+					 xmlNode *next,
+					 const xmlChar **names,
+					 int max);
+XMLPUBFUN int XMLCALL
+		xmlValidateNameValue	(const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNamesValue	(const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNmtokenValue	(const xmlChar *value);
+XMLPUBFUN int XMLCALL
+		xmlValidateNmtokensValue(const xmlChar *value);
+
+#ifdef LIBXML_REGEXP_ENABLED
+/*
+ * Validation based on the regexp support
+ */
+XMLPUBFUN int XMLCALL
+		xmlValidBuildContentModel(xmlValidCtxtPtr ctxt,
+					 xmlElementPtr elem);
+
+XMLPUBFUN int XMLCALL
+		xmlValidatePushElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *qname);
+XMLPUBFUN int XMLCALL
+		xmlValidatePushCData	(xmlValidCtxtPtr ctxt,
+					 const xmlChar *data,
+					 int len);
+XMLPUBFUN int XMLCALL
+		xmlValidatePopElement	(xmlValidCtxtPtr ctxt,
+					 xmlDocPtr doc,
+					 xmlNodePtr elem,
+					 const xmlChar *qname);
+#endif /* LIBXML_REGEXP_ENABLED */
+#endif /* LIBXML_VALID_ENABLED */
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_VALID_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xinclude.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xinclude.h
new file mode 100644
index 0000000..863ab25
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xinclude.h
@@ -0,0 +1,129 @@
+/*
+ * Summary: implementation of XInclude
+ * Description: API to handle XInclude processing,
+ * implements the
+ * World Wide Web Consortium Last Call Working Draft 10 November 2003
+ * http://www.w3.org/TR/2003/WD-xinclude-20031110
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XINCLUDE_H__
+#define __XML_XINCLUDE_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_XINCLUDE_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * XINCLUDE_NS:
+ *
+ * Macro defining the Xinclude namespace: http://www.w3.org/2003/XInclude
+ */
+#define XINCLUDE_NS (const xmlChar *) "http://www.w3.org/2003/XInclude"
+/**
+ * XINCLUDE_OLD_NS:
+ *
+ * Macro defining the draft Xinclude namespace: http://www.w3.org/2001/XInclude
+ */
+#define XINCLUDE_OLD_NS (const xmlChar *) "http://www.w3.org/2001/XInclude"
+/**
+ * XINCLUDE_NODE:
+ *
+ * Macro defining "include"
+ */
+#define XINCLUDE_NODE (const xmlChar *) "include"
+/**
+ * XINCLUDE_FALLBACK:
+ *
+ * Macro defining "fallback"
+ */
+#define XINCLUDE_FALLBACK (const xmlChar *) "fallback"
+/**
+ * XINCLUDE_HREF:
+ *
+ * Macro defining "href"
+ */
+#define XINCLUDE_HREF (const xmlChar *) "href"
+/**
+ * XINCLUDE_PARSE:
+ *
+ * Macro defining "parse"
+ */
+#define XINCLUDE_PARSE (const xmlChar *) "parse"
+/**
+ * XINCLUDE_PARSE_XML:
+ *
+ * Macro defining "xml"
+ */
+#define XINCLUDE_PARSE_XML (const xmlChar *) "xml"
+/**
+ * XINCLUDE_PARSE_TEXT:
+ *
+ * Macro defining "text"
+ */
+#define XINCLUDE_PARSE_TEXT (const xmlChar *) "text"
+/**
+ * XINCLUDE_PARSE_ENCODING:
+ *
+ * Macro defining "encoding"
+ */
+#define XINCLUDE_PARSE_ENCODING (const xmlChar *) "encoding"
+/**
+ * XINCLUDE_PARSE_XPOINTER:
+ *
+ * Macro defining "xpointer"
+ */
+#define XINCLUDE_PARSE_XPOINTER (const xmlChar *) "xpointer"
+
+typedef struct _xmlXIncludeCtxt xmlXIncludeCtxt;
+typedef xmlXIncludeCtxt *xmlXIncludeCtxtPtr;
+
+/*
+ * standalone processing
+ */
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcess	(xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessFlags	(xmlDocPtr doc,
+					 int flags);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessFlagsData(xmlDocPtr doc,
+					 int flags,
+					 void *data);
+XMLPUBFUN int XMLCALL
+                xmlXIncludeProcessTreeFlagsData(xmlNodePtr tree,
+                                         int flags,
+                                         void *data);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessTree	(xmlNodePtr tree);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessTreeFlags(xmlNodePtr tree,
+					 int flags);
+/*
+ * contextual processing
+ */
+XMLPUBFUN xmlXIncludeCtxtPtr XMLCALL
+		xmlXIncludeNewContext	(xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeSetFlags	(xmlXIncludeCtxtPtr ctxt,
+					 int flags);
+XMLPUBFUN void XMLCALL
+		xmlXIncludeFreeContext	(xmlXIncludeCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlXIncludeProcessNode	(xmlXIncludeCtxtPtr ctxt,
+					 xmlNodePtr tree);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XINCLUDE_ENABLED */
+
+#endif /* __XML_XINCLUDE_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xlink.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xlink.h
new file mode 100644
index 0000000..04e4b32
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xlink.h
@@ -0,0 +1,189 @@
+/*
+ * Summary: unfinished XLink detection module
+ * Description: unfinished XLink detection module
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XLINK_H__
+#define __XML_XLINK_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_XPTR_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Various defines for the various Link properties.
+ *
+ * NOTE: the link detection layer will try to resolve QName expansion
+ *       of namespaces. If "foo" is the prefix for "http://foo.com/"
+ *       then the link detection layer will expand role="foo:myrole"
+ *       to "http://foo.com/:myrole".
+ * NOTE: the link detection layer will expand URI-References found on
+ *       href attributes by using the base mechanism if found.
+ */
+typedef xmlChar *xlinkHRef;
+typedef xmlChar *xlinkRole;
+typedef xmlChar *xlinkTitle;
+
+typedef enum {
+    XLINK_TYPE_NONE = 0,
+    XLINK_TYPE_SIMPLE,
+    XLINK_TYPE_EXTENDED,
+    XLINK_TYPE_EXTENDED_SET
+} xlinkType;
+
+typedef enum {
+    XLINK_SHOW_NONE = 0,
+    XLINK_SHOW_NEW,
+    XLINK_SHOW_EMBED,
+    XLINK_SHOW_REPLACE
+} xlinkShow;
+
+typedef enum {
+    XLINK_ACTUATE_NONE = 0,
+    XLINK_ACTUATE_AUTO,
+    XLINK_ACTUATE_ONREQUEST
+} xlinkActuate;
+
+/**
+ * xlinkNodeDetectFunc:
+ * @ctx:  user data pointer
+ * @node:  the node to check
+ *
+ * This is the prototype for the link detection routine.
+ * It calls the default link detection callbacks upon link detection.
+ */
+typedef void (*xlinkNodeDetectFunc) (void *ctx, xmlNodePtr node);
+
+/*
+ * The link detection module interact with the upper layers using
+ * a set of callback registered at parsing time.
+ */
+
+/**
+ * xlinkSimpleLinkFunk:
+ * @ctx:  user data pointer
+ * @node:  the node carrying the link
+ * @href:  the target of the link
+ * @role:  the role string
+ * @title:  the link title
+ *
+ * This is the prototype for a simple link detection callback.
+ */
+typedef void
+(*xlinkSimpleLinkFunk)	(void *ctx,
+			 xmlNodePtr node,
+			 const xlinkHRef href,
+			 const xlinkRole role,
+			 const xlinkTitle title);
+
+/**
+ * xlinkExtendedLinkFunk:
+ * @ctx:  user data pointer
+ * @node:  the node carrying the link
+ * @nbLocators: the number of locators detected on the link
+ * @hrefs:  pointer to the array of locator hrefs
+ * @roles:  pointer to the array of locator roles
+ * @nbArcs: the number of arcs detected on the link
+ * @from:  pointer to the array of source roles found on the arcs
+ * @to:  pointer to the array of target roles found on the arcs
+ * @show:  array of values for the show attributes found on the arcs
+ * @actuate:  array of values for the actuate attributes found on the arcs
+ * @nbTitles: the number of titles detected on the link
+ * @title:  array of titles detected on the link
+ * @langs:  array of xml:lang values for the titles
+ *
+ * This is the prototype for a extended link detection callback.
+ */
+typedef void
+(*xlinkExtendedLinkFunk)(void *ctx,
+			 xmlNodePtr node,
+			 int nbLocators,
+			 const xlinkHRef *hrefs,
+			 const xlinkRole *roles,
+			 int nbArcs,
+			 const xlinkRole *from,
+			 const xlinkRole *to,
+			 xlinkShow *show,
+			 xlinkActuate *actuate,
+			 int nbTitles,
+			 const xlinkTitle *titles,
+			 const xmlChar **langs);
+
+/**
+ * xlinkExtendedLinkSetFunk:
+ * @ctx:  user data pointer
+ * @node:  the node carrying the link
+ * @nbLocators: the number of locators detected on the link
+ * @hrefs:  pointer to the array of locator hrefs
+ * @roles:  pointer to the array of locator roles
+ * @nbTitles: the number of titles detected on the link
+ * @title:  array of titles detected on the link
+ * @langs:  array of xml:lang values for the titles
+ *
+ * This is the prototype for a extended link set detection callback.
+ */
+typedef void
+(*xlinkExtendedLinkSetFunk)	(void *ctx,
+				 xmlNodePtr node,
+				 int nbLocators,
+				 const xlinkHRef *hrefs,
+				 const xlinkRole *roles,
+				 int nbTitles,
+				 const xlinkTitle *titles,
+				 const xmlChar **langs);
+
+/**
+ * This is the structure containing a set of Links detection callbacks.
+ *
+ * There is no default xlink callbacks, if one want to get link
+ * recognition activated, those call backs must be provided before parsing.
+ */
+typedef struct _xlinkHandler xlinkHandler;
+typedef xlinkHandler *xlinkHandlerPtr;
+struct _xlinkHandler {
+    xlinkSimpleLinkFunk simple;
+    xlinkExtendedLinkFunk extended;
+    xlinkExtendedLinkSetFunk set;
+};
+
+/*
+ * The default detection routine, can be overridden, they call the default
+ * detection callbacks.
+ */
+
+XMLPUBFUN xlinkNodeDetectFunc XMLCALL
+		xlinkGetDefaultDetect	(void);
+XMLPUBFUN void XMLCALL
+		xlinkSetDefaultDetect	(xlinkNodeDetectFunc func);
+
+/*
+ * Routines to set/get the default handlers.
+ */
+XMLPUBFUN xlinkHandlerPtr XMLCALL
+		xlinkGetDefaultHandler	(void);
+XMLPUBFUN void XMLCALL
+		xlinkSetDefaultHandler	(xlinkHandlerPtr handler);
+
+/*
+ * Link detection module itself.
+ */
+XMLPUBFUN xlinkType XMLCALL
+		xlinkIsLink		(xmlDocPtr doc,
+					 xmlNodePtr node);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPTR_ENABLED */
+
+#endif /* __XML_XLINK_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlIO.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlIO.h
new file mode 100644
index 0000000..095b2f5
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlIO.h
@@ -0,0 +1,368 @@
+/*
+ * Summary: interface for the I/O interfaces used by the parser
+ * Description: interface for the I/O interfaces used by the parser
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_IO_H__
+#define __XML_IO_H__
+
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Those are the functions and datatypes for the parser input
+ * I/O structures.
+ */
+
+/**
+ * xmlInputMatchCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Input API to detect if the current handler
+ * can provide input functionality for this resource.
+ *
+ * Returns 1 if yes and 0 if another Input module should be used
+ */
+typedef int (XMLCALL *xmlInputMatchCallback) (char const *filename);
+/**
+ * xmlInputOpenCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Input API to open the resource
+ *
+ * Returns an Input context or NULL in case or error
+ */
+typedef void * (XMLCALL *xmlInputOpenCallback) (char const *filename);
+/**
+ * xmlInputReadCallback:
+ * @context:  an Input context
+ * @buffer:  the buffer to store data read
+ * @len:  the length of the buffer in bytes
+ *
+ * Callback used in the I/O Input API to read the resource
+ *
+ * Returns the number of bytes read or -1 in case of error
+ */
+typedef int (XMLCALL *xmlInputReadCallback) (void * context, char * buffer, int len);
+/**
+ * xmlInputCloseCallback:
+ * @context:  an Input context
+ *
+ * Callback used in the I/O Input API to close the resource
+ *
+ * Returns 0 or -1 in case of error
+ */
+typedef int (XMLCALL *xmlInputCloseCallback) (void * context);
+
+#ifdef LIBXML_OUTPUT_ENABLED
+/*
+ * Those are the functions and datatypes for the library output
+ * I/O structures.
+ */
+
+/**
+ * xmlOutputMatchCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Output API to detect if the current handler
+ * can provide output functionality for this resource.
+ *
+ * Returns 1 if yes and 0 if another Output module should be used
+ */
+typedef int (XMLCALL *xmlOutputMatchCallback) (char const *filename);
+/**
+ * xmlOutputOpenCallback:
+ * @filename: the filename or URI
+ *
+ * Callback used in the I/O Output API to open the resource
+ *
+ * Returns an Output context or NULL in case or error
+ */
+typedef void * (XMLCALL *xmlOutputOpenCallback) (char const *filename);
+/**
+ * xmlOutputWriteCallback:
+ * @context:  an Output context
+ * @buffer:  the buffer of data to write
+ * @len:  the length of the buffer in bytes
+ *
+ * Callback used in the I/O Output API to write to the resource
+ *
+ * Returns the number of bytes written or -1 in case of error
+ */
+typedef int (XMLCALL *xmlOutputWriteCallback) (void * context, const char * buffer,
+                                       int len);
+/**
+ * xmlOutputCloseCallback:
+ * @context:  an Output context
+ *
+ * Callback used in the I/O Output API to close the resource
+ *
+ * Returns 0 or -1 in case of error
+ */
+typedef int (XMLCALL *xmlOutputCloseCallback) (void * context);
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <libxml/globals.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/encoding.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+struct _xmlParserInputBuffer {
+    void*                  context;
+    xmlInputReadCallback   readcallback;
+    xmlInputCloseCallback  closecallback;
+
+    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
+
+    xmlBufPtr buffer;    /* Local buffer encoded in UTF-8 */
+    xmlBufPtr raw;       /* if encoder != NULL buffer for raw input */
+    int	compressed;	    /* -1=unknown, 0=not compressed, 1=compressed */
+    int error;
+    unsigned long rawconsumed;/* amount consumed from raw */
+};
+
+
+#ifdef LIBXML_OUTPUT_ENABLED
+struct _xmlOutputBuffer {
+    void*                   context;
+    xmlOutputWriteCallback  writecallback;
+    xmlOutputCloseCallback  closecallback;
+
+    xmlCharEncodingHandlerPtr encoder; /* I18N conversions to UTF-8 */
+
+    xmlBufPtr buffer;    /* Local buffer encoded in UTF-8 or ISOLatin */
+    xmlBufPtr conv;      /* if encoder != NULL buffer for output */
+    int written;            /* total number of byte written */
+    int error;
+};
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+/*
+ * Interfaces for input
+ */
+XMLPUBFUN void XMLCALL
+	xmlCleanupInputCallbacks		(void);
+
+XMLPUBFUN int XMLCALL
+	xmlPopInputCallbacks			(void);
+
+XMLPUBFUN void XMLCALL
+	xmlRegisterDefaultInputCallbacks	(void);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlAllocParserInputBuffer		(xmlCharEncoding enc);
+
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateFilename	(const char *URI,
+                                                 xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateFile		(FILE *file,
+                                                 xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateFd		(int fd,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateMem		(const char *mem, int size,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateStatic	(const char *mem, int size,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+	xmlParserInputBufferCreateIO		(xmlInputReadCallback   ioread,
+						 xmlInputCloseCallback  ioclose,
+						 void *ioctx,
+	                                         xmlCharEncoding enc);
+XMLPUBFUN int XMLCALL
+	xmlParserInputBufferRead		(xmlParserInputBufferPtr in,
+						 int len);
+XMLPUBFUN int XMLCALL
+	xmlParserInputBufferGrow		(xmlParserInputBufferPtr in,
+						 int len);
+XMLPUBFUN int XMLCALL
+	xmlParserInputBufferPush		(xmlParserInputBufferPtr in,
+						 int len,
+						 const char *buf);
+XMLPUBFUN void XMLCALL
+	xmlFreeParserInputBuffer		(xmlParserInputBufferPtr in);
+XMLPUBFUN char * XMLCALL
+	xmlParserGetDirectory			(const char *filename);
+
+XMLPUBFUN int XMLCALL
+	xmlRegisterInputCallbacks		(xmlInputMatchCallback matchFunc,
+						 xmlInputOpenCallback openFunc,
+						 xmlInputReadCallback readFunc,
+						 xmlInputCloseCallback closeFunc);
+
+xmlParserInputBufferPtr
+	__xmlParserInputBufferCreateFilename(const char *URI,
+						xmlCharEncoding enc);
+
+#ifdef LIBXML_OUTPUT_ENABLED
+/*
+ * Interfaces for output
+ */
+XMLPUBFUN void XMLCALL
+	xmlCleanupOutputCallbacks		(void);
+XMLPUBFUN int XMLCALL
+	xmlPopOutputCallbacks			(void);
+XMLPUBFUN void XMLCALL
+	xmlRegisterDefaultOutputCallbacks(void);
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlAllocOutputBuffer		(xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateFilename	(const char *URI,
+					 xmlCharEncodingHandlerPtr encoder,
+					 int compression);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateFile	(FILE *file,
+					 xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateBuffer	(xmlBufferPtr buffer,
+					 xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateFd		(int fd,
+					 xmlCharEncodingHandlerPtr encoder);
+
+XMLPUBFUN xmlOutputBufferPtr XMLCALL
+	xmlOutputBufferCreateIO		(xmlOutputWriteCallback   iowrite,
+					 xmlOutputCloseCallback  ioclose,
+					 void *ioctx,
+					 xmlCharEncodingHandlerPtr encoder);
+
+/* Couple of APIs to get the output without digging into the buffers */
+XMLPUBFUN const xmlChar * XMLCALL
+        xmlOutputBufferGetContent       (xmlOutputBufferPtr out);
+XMLPUBFUN size_t XMLCALL
+        xmlOutputBufferGetSize          (xmlOutputBufferPtr out);
+
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferWrite		(xmlOutputBufferPtr out,
+					 int len,
+					 const char *buf);
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferWriteString	(xmlOutputBufferPtr out,
+					 const char *str);
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferWriteEscape	(xmlOutputBufferPtr out,
+					 const xmlChar *str,
+					 xmlCharEncodingOutputFunc escaping);
+
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferFlush		(xmlOutputBufferPtr out);
+XMLPUBFUN int XMLCALL
+	xmlOutputBufferClose		(xmlOutputBufferPtr out);
+
+XMLPUBFUN int XMLCALL
+	xmlRegisterOutputCallbacks	(xmlOutputMatchCallback matchFunc,
+					 xmlOutputOpenCallback openFunc,
+					 xmlOutputWriteCallback writeFunc,
+					 xmlOutputCloseCallback closeFunc);
+
+xmlOutputBufferPtr
+	__xmlOutputBufferCreateFilename(const char *URI,
+                              xmlCharEncodingHandlerPtr encoder,
+                              int compression);
+
+#ifdef LIBXML_HTTP_ENABLED
+/*  This function only exists if HTTP support built into the library  */
+XMLPUBFUN void XMLCALL
+	xmlRegisterHTTPPostCallbacks	(void );
+#endif /* LIBXML_HTTP_ENABLED */
+
+#endif /* LIBXML_OUTPUT_ENABLED */
+
+XMLPUBFUN xmlParserInputPtr XMLCALL
+	xmlCheckHTTPInput		(xmlParserCtxtPtr ctxt,
+					 xmlParserInputPtr ret);
+
+/*
+ * A predefined entity loader disabling network accesses
+ */
+XMLPUBFUN xmlParserInputPtr XMLCALL
+	xmlNoNetExternalEntityLoader	(const char *URL,
+					 const char *ID,
+					 xmlParserCtxtPtr ctxt);
+
+/*
+ * xmlNormalizeWindowsPath is obsolete, don't use it.
+ * Check xmlCanonicPath in uri.h for a better alternative.
+ */
+XMLPUBFUN xmlChar * XMLCALL
+	xmlNormalizeWindowsPath		(const xmlChar *path);
+
+XMLPUBFUN int XMLCALL
+	xmlCheckFilename		(const char *path);
+/**
+ * Default 'file://' protocol callbacks
+ */
+XMLPUBFUN int XMLCALL
+	xmlFileMatch			(const char *filename);
+XMLPUBFUN void * XMLCALL
+	xmlFileOpen			(const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlFileRead			(void * context,
+					 char * buffer,
+					 int len);
+XMLPUBFUN int XMLCALL
+	xmlFileClose			(void * context);
+
+/**
+ * Default 'http://' protocol callbacks
+ */
+#ifdef LIBXML_HTTP_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlIOHTTPMatch			(const char *filename);
+XMLPUBFUN void * XMLCALL
+	xmlIOHTTPOpen			(const char *filename);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void * XMLCALL
+	xmlIOHTTPOpenW			(const char * post_uri,
+					 int   compression );
+#endif /* LIBXML_OUTPUT_ENABLED */
+XMLPUBFUN int XMLCALL
+	xmlIOHTTPRead			(void * context,
+					 char * buffer,
+					 int len);
+XMLPUBFUN int XMLCALL
+	xmlIOHTTPClose			(void * context);
+#endif /* LIBXML_HTTP_ENABLED */
+
+/**
+ * Default 'ftp://' protocol callbacks
+ */
+#ifdef LIBXML_FTP_ENABLED
+XMLPUBFUN int XMLCALL
+	xmlIOFTPMatch			(const char *filename);
+XMLPUBFUN void * XMLCALL
+	xmlIOFTPOpen			(const char *filename);
+XMLPUBFUN int XMLCALL
+	xmlIOFTPRead			(void * context,
+					 char * buffer,
+					 int len);
+XMLPUBFUN int XMLCALL
+	xmlIOFTPClose			(void * context);
+#endif /* LIBXML_FTP_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_IO_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlautomata.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlautomata.h
new file mode 100644
index 0000000..bf1b131
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlautomata.h
@@ -0,0 +1,146 @@
+/*
+ * Summary: API to build regexp automata
+ * Description: the API to build regexp automata
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_AUTOMATA_H__
+#define __XML_AUTOMATA_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+
+#ifdef LIBXML_REGEXP_ENABLED
+#ifdef LIBXML_AUTOMATA_ENABLED
+#include <libxml/xmlregexp.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlAutomataPtr:
+ *
+ * A libxml automata description, It can be compiled into a regexp
+ */
+typedef struct _xmlAutomata xmlAutomata;
+typedef xmlAutomata *xmlAutomataPtr;
+
+/**
+ * xmlAutomataStatePtr:
+ *
+ * A state int the automata description,
+ */
+typedef struct _xmlAutomataState xmlAutomataState;
+typedef xmlAutomataState *xmlAutomataStatePtr;
+
+/*
+ * Building API
+ */
+XMLPUBFUN xmlAutomataPtr XMLCALL
+		    xmlNewAutomata		(void);
+XMLPUBFUN void XMLCALL
+		    xmlFreeAutomata		(xmlAutomataPtr am);
+
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataGetInitState	(xmlAutomataPtr am);
+XMLPUBFUN int XMLCALL
+		    xmlAutomataSetFinalState	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr state);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewState		(xmlAutomataPtr am);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewTransition	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewTransition2	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+                    xmlAutomataNewNegTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 void *data);
+
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCountTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCountTrans2	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewOnceTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewOnceTrans2	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 const xmlChar *token,
+						 const xmlChar *token2,
+						 int min,
+						 int max,
+						 void *data);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewAllTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 int lax);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewEpsilon	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCountedTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 int counter);
+XMLPUBFUN xmlAutomataStatePtr XMLCALL
+		    xmlAutomataNewCounterTrans	(xmlAutomataPtr am,
+						 xmlAutomataStatePtr from,
+						 xmlAutomataStatePtr to,
+						 int counter);
+XMLPUBFUN int XMLCALL
+		    xmlAutomataNewCounter	(xmlAutomataPtr am,
+						 int min,
+						 int max);
+
+XMLPUBFUN xmlRegexpPtr XMLCALL
+		    xmlAutomataCompile		(xmlAutomataPtr am);
+XMLPUBFUN int XMLCALL
+		    xmlAutomataIsDeterminist	(xmlAutomataPtr am);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_AUTOMATA_ENABLED */
+#endif /* LIBXML_REGEXP_ENABLED */
+
+#endif /* __XML_AUTOMATA_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlerror.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlerror.h
new file mode 100644
index 0000000..c101997
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlerror.h
@@ -0,0 +1,945 @@
+/*
+ * Summary: error handling
+ * Description: the API used to report errors
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#include <libxml/parser.h>
+
+#ifndef __XML_ERROR_H__
+#define __XML_ERROR_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlErrorLevel:
+ *
+ * Indicates the level of an error
+ */
+typedef enum {
+    XML_ERR_NONE = 0,
+    XML_ERR_WARNING = 1,	/* A simple warning */
+    XML_ERR_ERROR = 2,		/* A recoverable error */
+    XML_ERR_FATAL = 3		/* A fatal error */
+} xmlErrorLevel;
+
+/**
+ * xmlErrorDomain:
+ *
+ * Indicates where an error may have come from
+ */
+typedef enum {
+    XML_FROM_NONE = 0,
+    XML_FROM_PARSER,	/* The XML parser */
+    XML_FROM_TREE,	/* The tree module */
+    XML_FROM_NAMESPACE,	/* The XML Namespace module */
+    XML_FROM_DTD,	/* The XML DTD validation with parser context*/
+    XML_FROM_HTML,	/* The HTML parser */
+    XML_FROM_MEMORY,	/* The memory allocator */
+    XML_FROM_OUTPUT,	/* The serialization code */
+    XML_FROM_IO,	/* The Input/Output stack */
+    XML_FROM_FTP,	/* The FTP module */
+    XML_FROM_HTTP,	/* The HTTP module */
+    XML_FROM_XINCLUDE,	/* The XInclude processing */
+    XML_FROM_XPATH,	/* The XPath module */
+    XML_FROM_XPOINTER,	/* The XPointer module */
+    XML_FROM_REGEXP,	/* The regular expressions module */
+    XML_FROM_DATATYPE,	/* The W3C XML Schemas Datatype module */
+    XML_FROM_SCHEMASP,	/* The W3C XML Schemas parser module */
+    XML_FROM_SCHEMASV,	/* The W3C XML Schemas validation module */
+    XML_FROM_RELAXNGP,	/* The Relax-NG parser module */
+    XML_FROM_RELAXNGV,	/* The Relax-NG validator module */
+    XML_FROM_CATALOG,	/* The Catalog module */
+    XML_FROM_C14N,	/* The Canonicalization module */
+    XML_FROM_XSLT,	/* The XSLT engine from libxslt */
+    XML_FROM_VALID,	/* The XML DTD validation with valid context */
+    XML_FROM_CHECK,	/* The error checking module */
+    XML_FROM_WRITER,	/* The xmlwriter module */
+    XML_FROM_MODULE,	/* The dynamically loaded module module*/
+    XML_FROM_I18N,	/* The module handling character conversion */
+    XML_FROM_SCHEMATRONV,/* The Schematron validator module */
+    XML_FROM_BUFFER,    /* The buffers module */
+    XML_FROM_URI        /* The URI module */
+} xmlErrorDomain;
+
+/**
+ * xmlError:
+ *
+ * An XML Error instance.
+ */
+
+typedef struct _xmlError xmlError;
+typedef xmlError *xmlErrorPtr;
+struct _xmlError {
+    int		domain;	/* What part of the library raised this error */
+    int		code;	/* The error code, e.g. an xmlParserError */
+    char       *message;/* human-readable informative error message */
+    xmlErrorLevel level;/* how consequent is the error */
+    char       *file;	/* the filename */
+    int		line;	/* the line number if available */
+    char       *str1;	/* extra string information */
+    char       *str2;	/* extra string information */
+    char       *str3;	/* extra string information */
+    int		int1;	/* extra number information */
+    int		int2;	/* error column # or 0 if N/A (todo: rename field when we would brk ABI) */
+    void       *ctxt;   /* the parser context if available */
+    void       *node;   /* the node in the tree */
+};
+
+/**
+ * xmlParserError:
+ *
+ * This is an error that the XML (or HTML) parser can generate
+ */
+typedef enum {
+    XML_ERR_OK = 0,
+    XML_ERR_INTERNAL_ERROR, /* 1 */
+    XML_ERR_NO_MEMORY, /* 2 */
+    XML_ERR_DOCUMENT_START, /* 3 */
+    XML_ERR_DOCUMENT_EMPTY, /* 4 */
+    XML_ERR_DOCUMENT_END, /* 5 */
+    XML_ERR_INVALID_HEX_CHARREF, /* 6 */
+    XML_ERR_INVALID_DEC_CHARREF, /* 7 */
+    XML_ERR_INVALID_CHARREF, /* 8 */
+    XML_ERR_INVALID_CHAR, /* 9 */
+    XML_ERR_CHARREF_AT_EOF, /* 10 */
+    XML_ERR_CHARREF_IN_PROLOG, /* 11 */
+    XML_ERR_CHARREF_IN_EPILOG, /* 12 */
+    XML_ERR_CHARREF_IN_DTD, /* 13 */
+    XML_ERR_ENTITYREF_AT_EOF, /* 14 */
+    XML_ERR_ENTITYREF_IN_PROLOG, /* 15 */
+    XML_ERR_ENTITYREF_IN_EPILOG, /* 16 */
+    XML_ERR_ENTITYREF_IN_DTD, /* 17 */
+    XML_ERR_PEREF_AT_EOF, /* 18 */
+    XML_ERR_PEREF_IN_PROLOG, /* 19 */
+    XML_ERR_PEREF_IN_EPILOG, /* 20 */
+    XML_ERR_PEREF_IN_INT_SUBSET, /* 21 */
+    XML_ERR_ENTITYREF_NO_NAME, /* 22 */
+    XML_ERR_ENTITYREF_SEMICOL_MISSING, /* 23 */
+    XML_ERR_PEREF_NO_NAME, /* 24 */
+    XML_ERR_PEREF_SEMICOL_MISSING, /* 25 */
+    XML_ERR_UNDECLARED_ENTITY, /* 26 */
+    XML_WAR_UNDECLARED_ENTITY, /* 27 */
+    XML_ERR_UNPARSED_ENTITY, /* 28 */
+    XML_ERR_ENTITY_IS_EXTERNAL, /* 29 */
+    XML_ERR_ENTITY_IS_PARAMETER, /* 30 */
+    XML_ERR_UNKNOWN_ENCODING, /* 31 */
+    XML_ERR_UNSUPPORTED_ENCODING, /* 32 */
+    XML_ERR_STRING_NOT_STARTED, /* 33 */
+    XML_ERR_STRING_NOT_CLOSED, /* 34 */
+    XML_ERR_NS_DECL_ERROR, /* 35 */
+    XML_ERR_ENTITY_NOT_STARTED, /* 36 */
+    XML_ERR_ENTITY_NOT_FINISHED, /* 37 */
+    XML_ERR_LT_IN_ATTRIBUTE, /* 38 */
+    XML_ERR_ATTRIBUTE_NOT_STARTED, /* 39 */
+    XML_ERR_ATTRIBUTE_NOT_FINISHED, /* 40 */
+    XML_ERR_ATTRIBUTE_WITHOUT_VALUE, /* 41 */
+    XML_ERR_ATTRIBUTE_REDEFINED, /* 42 */
+    XML_ERR_LITERAL_NOT_STARTED, /* 43 */
+    XML_ERR_LITERAL_NOT_FINISHED, /* 44 */
+    XML_ERR_COMMENT_NOT_FINISHED, /* 45 */
+    XML_ERR_PI_NOT_STARTED, /* 46 */
+    XML_ERR_PI_NOT_FINISHED, /* 47 */
+    XML_ERR_NOTATION_NOT_STARTED, /* 48 */
+    XML_ERR_NOTATION_NOT_FINISHED, /* 49 */
+    XML_ERR_ATTLIST_NOT_STARTED, /* 50 */
+    XML_ERR_ATTLIST_NOT_FINISHED, /* 51 */
+    XML_ERR_MIXED_NOT_STARTED, /* 52 */
+    XML_ERR_MIXED_NOT_FINISHED, /* 53 */
+    XML_ERR_ELEMCONTENT_NOT_STARTED, /* 54 */
+    XML_ERR_ELEMCONTENT_NOT_FINISHED, /* 55 */
+    XML_ERR_XMLDECL_NOT_STARTED, /* 56 */
+    XML_ERR_XMLDECL_NOT_FINISHED, /* 57 */
+    XML_ERR_CONDSEC_NOT_STARTED, /* 58 */
+    XML_ERR_CONDSEC_NOT_FINISHED, /* 59 */
+    XML_ERR_EXT_SUBSET_NOT_FINISHED, /* 60 */
+    XML_ERR_DOCTYPE_NOT_FINISHED, /* 61 */
+    XML_ERR_MISPLACED_CDATA_END, /* 62 */
+    XML_ERR_CDATA_NOT_FINISHED, /* 63 */
+    XML_ERR_RESERVED_XML_NAME, /* 64 */
+    XML_ERR_SPACE_REQUIRED, /* 65 */
+    XML_ERR_SEPARATOR_REQUIRED, /* 66 */
+    XML_ERR_NMTOKEN_REQUIRED, /* 67 */
+    XML_ERR_NAME_REQUIRED, /* 68 */
+    XML_ERR_PCDATA_REQUIRED, /* 69 */
+    XML_ERR_URI_REQUIRED, /* 70 */
+    XML_ERR_PUBID_REQUIRED, /* 71 */
+    XML_ERR_LT_REQUIRED, /* 72 */
+    XML_ERR_GT_REQUIRED, /* 73 */
+    XML_ERR_LTSLASH_REQUIRED, /* 74 */
+    XML_ERR_EQUAL_REQUIRED, /* 75 */
+    XML_ERR_TAG_NAME_MISMATCH, /* 76 */
+    XML_ERR_TAG_NOT_FINISHED, /* 77 */
+    XML_ERR_STANDALONE_VALUE, /* 78 */
+    XML_ERR_ENCODING_NAME, /* 79 */
+    XML_ERR_HYPHEN_IN_COMMENT, /* 80 */
+    XML_ERR_INVALID_ENCODING, /* 81 */
+    XML_ERR_EXT_ENTITY_STANDALONE, /* 82 */
+    XML_ERR_CONDSEC_INVALID, /* 83 */
+    XML_ERR_VALUE_REQUIRED, /* 84 */
+    XML_ERR_NOT_WELL_BALANCED, /* 85 */
+    XML_ERR_EXTRA_CONTENT, /* 86 */
+    XML_ERR_ENTITY_CHAR_ERROR, /* 87 */
+    XML_ERR_ENTITY_PE_INTERNAL, /* 88 */
+    XML_ERR_ENTITY_LOOP, /* 89 */
+    XML_ERR_ENTITY_BOUNDARY, /* 90 */
+    XML_ERR_INVALID_URI, /* 91 */
+    XML_ERR_URI_FRAGMENT, /* 92 */
+    XML_WAR_CATALOG_PI, /* 93 */
+    XML_ERR_NO_DTD, /* 94 */
+    XML_ERR_CONDSEC_INVALID_KEYWORD, /* 95 */
+    XML_ERR_VERSION_MISSING, /* 96 */
+    XML_WAR_UNKNOWN_VERSION, /* 97 */
+    XML_WAR_LANG_VALUE, /* 98 */
+    XML_WAR_NS_URI, /* 99 */
+    XML_WAR_NS_URI_RELATIVE, /* 100 */
+    XML_ERR_MISSING_ENCODING, /* 101 */
+    XML_WAR_SPACE_VALUE, /* 102 */
+    XML_ERR_NOT_STANDALONE, /* 103 */
+    XML_ERR_ENTITY_PROCESSING, /* 104 */
+    XML_ERR_NOTATION_PROCESSING, /* 105 */
+    XML_WAR_NS_COLUMN, /* 106 */
+    XML_WAR_ENTITY_REDEFINED, /* 107 */
+    XML_ERR_UNKNOWN_VERSION, /* 108 */
+    XML_ERR_VERSION_MISMATCH, /* 109 */
+    XML_ERR_NAME_TOO_LONG, /* 110 */
+    XML_ERR_USER_STOP, /* 111 */
+    XML_NS_ERR_XML_NAMESPACE = 200,
+    XML_NS_ERR_UNDEFINED_NAMESPACE, /* 201 */
+    XML_NS_ERR_QNAME, /* 202 */
+    XML_NS_ERR_ATTRIBUTE_REDEFINED, /* 203 */
+    XML_NS_ERR_EMPTY, /* 204 */
+    XML_NS_ERR_COLON, /* 205 */
+    XML_DTD_ATTRIBUTE_DEFAULT = 500,
+    XML_DTD_ATTRIBUTE_REDEFINED, /* 501 */
+    XML_DTD_ATTRIBUTE_VALUE, /* 502 */
+    XML_DTD_CONTENT_ERROR, /* 503 */
+    XML_DTD_CONTENT_MODEL, /* 504 */
+    XML_DTD_CONTENT_NOT_DETERMINIST, /* 505 */
+    XML_DTD_DIFFERENT_PREFIX, /* 506 */
+    XML_DTD_ELEM_DEFAULT_NAMESPACE, /* 507 */
+    XML_DTD_ELEM_NAMESPACE, /* 508 */
+    XML_DTD_ELEM_REDEFINED, /* 509 */
+    XML_DTD_EMPTY_NOTATION, /* 510 */
+    XML_DTD_ENTITY_TYPE, /* 511 */
+    XML_DTD_ID_FIXED, /* 512 */
+    XML_DTD_ID_REDEFINED, /* 513 */
+    XML_DTD_ID_SUBSET, /* 514 */
+    XML_DTD_INVALID_CHILD, /* 515 */
+    XML_DTD_INVALID_DEFAULT, /* 516 */
+    XML_DTD_LOAD_ERROR, /* 517 */
+    XML_DTD_MISSING_ATTRIBUTE, /* 518 */
+    XML_DTD_MIXED_CORRUPT, /* 519 */
+    XML_DTD_MULTIPLE_ID, /* 520 */
+    XML_DTD_NO_DOC, /* 521 */
+    XML_DTD_NO_DTD, /* 522 */
+    XML_DTD_NO_ELEM_NAME, /* 523 */
+    XML_DTD_NO_PREFIX, /* 524 */
+    XML_DTD_NO_ROOT, /* 525 */
+    XML_DTD_NOTATION_REDEFINED, /* 526 */
+    XML_DTD_NOTATION_VALUE, /* 527 */
+    XML_DTD_NOT_EMPTY, /* 528 */
+    XML_DTD_NOT_PCDATA, /* 529 */
+    XML_DTD_NOT_STANDALONE, /* 530 */
+    XML_DTD_ROOT_NAME, /* 531 */
+    XML_DTD_STANDALONE_WHITE_SPACE, /* 532 */
+    XML_DTD_UNKNOWN_ATTRIBUTE, /* 533 */
+    XML_DTD_UNKNOWN_ELEM, /* 534 */
+    XML_DTD_UNKNOWN_ENTITY, /* 535 */
+    XML_DTD_UNKNOWN_ID, /* 536 */
+    XML_DTD_UNKNOWN_NOTATION, /* 537 */
+    XML_DTD_STANDALONE_DEFAULTED, /* 538 */
+    XML_DTD_XMLID_VALUE, /* 539 */
+    XML_DTD_XMLID_TYPE, /* 540 */
+    XML_DTD_DUP_TOKEN, /* 541 */
+    XML_HTML_STRUCURE_ERROR = 800,
+    XML_HTML_UNKNOWN_TAG, /* 801 */
+    XML_RNGP_ANYNAME_ATTR_ANCESTOR = 1000,
+    XML_RNGP_ATTR_CONFLICT, /* 1001 */
+    XML_RNGP_ATTRIBUTE_CHILDREN, /* 1002 */
+    XML_RNGP_ATTRIBUTE_CONTENT, /* 1003 */
+    XML_RNGP_ATTRIBUTE_EMPTY, /* 1004 */
+    XML_RNGP_ATTRIBUTE_NOOP, /* 1005 */
+    XML_RNGP_CHOICE_CONTENT, /* 1006 */
+    XML_RNGP_CHOICE_EMPTY, /* 1007 */
+    XML_RNGP_CREATE_FAILURE, /* 1008 */
+    XML_RNGP_DATA_CONTENT, /* 1009 */
+    XML_RNGP_DEF_CHOICE_AND_INTERLEAVE, /* 1010 */
+    XML_RNGP_DEFINE_CREATE_FAILED, /* 1011 */
+    XML_RNGP_DEFINE_EMPTY, /* 1012 */
+    XML_RNGP_DEFINE_MISSING, /* 1013 */
+    XML_RNGP_DEFINE_NAME_MISSING, /* 1014 */
+    XML_RNGP_ELEM_CONTENT_EMPTY, /* 1015 */
+    XML_RNGP_ELEM_CONTENT_ERROR, /* 1016 */
+    XML_RNGP_ELEMENT_EMPTY, /* 1017 */
+    XML_RNGP_ELEMENT_CONTENT, /* 1018 */
+    XML_RNGP_ELEMENT_NAME, /* 1019 */
+    XML_RNGP_ELEMENT_NO_CONTENT, /* 1020 */
+    XML_RNGP_ELEM_TEXT_CONFLICT, /* 1021 */
+    XML_RNGP_EMPTY, /* 1022 */
+    XML_RNGP_EMPTY_CONSTRUCT, /* 1023 */
+    XML_RNGP_EMPTY_CONTENT, /* 1024 */
+    XML_RNGP_EMPTY_NOT_EMPTY, /* 1025 */
+    XML_RNGP_ERROR_TYPE_LIB, /* 1026 */
+    XML_RNGP_EXCEPT_EMPTY, /* 1027 */
+    XML_RNGP_EXCEPT_MISSING, /* 1028 */
+    XML_RNGP_EXCEPT_MULTIPLE, /* 1029 */
+    XML_RNGP_EXCEPT_NO_CONTENT, /* 1030 */
+    XML_RNGP_EXTERNALREF_EMTPY, /* 1031 */
+    XML_RNGP_EXTERNAL_REF_FAILURE, /* 1032 */
+    XML_RNGP_EXTERNALREF_RECURSE, /* 1033 */
+    XML_RNGP_FORBIDDEN_ATTRIBUTE, /* 1034 */
+    XML_RNGP_FOREIGN_ELEMENT, /* 1035 */
+    XML_RNGP_GRAMMAR_CONTENT, /* 1036 */
+    XML_RNGP_GRAMMAR_EMPTY, /* 1037 */
+    XML_RNGP_GRAMMAR_MISSING, /* 1038 */
+    XML_RNGP_GRAMMAR_NO_START, /* 1039 */
+    XML_RNGP_GROUP_ATTR_CONFLICT, /* 1040 */
+    XML_RNGP_HREF_ERROR, /* 1041 */
+    XML_RNGP_INCLUDE_EMPTY, /* 1042 */
+    XML_RNGP_INCLUDE_FAILURE, /* 1043 */
+    XML_RNGP_INCLUDE_RECURSE, /* 1044 */
+    XML_RNGP_INTERLEAVE_ADD, /* 1045 */
+    XML_RNGP_INTERLEAVE_CREATE_FAILED, /* 1046 */
+    XML_RNGP_INTERLEAVE_EMPTY, /* 1047 */
+    XML_RNGP_INTERLEAVE_NO_CONTENT, /* 1048 */
+    XML_RNGP_INVALID_DEFINE_NAME, /* 1049 */
+    XML_RNGP_INVALID_URI, /* 1050 */
+    XML_RNGP_INVALID_VALUE, /* 1051 */
+    XML_RNGP_MISSING_HREF, /* 1052 */
+    XML_RNGP_NAME_MISSING, /* 1053 */
+    XML_RNGP_NEED_COMBINE, /* 1054 */
+    XML_RNGP_NOTALLOWED_NOT_EMPTY, /* 1055 */
+    XML_RNGP_NSNAME_ATTR_ANCESTOR, /* 1056 */
+    XML_RNGP_NSNAME_NO_NS, /* 1057 */
+    XML_RNGP_PARAM_FORBIDDEN, /* 1058 */
+    XML_RNGP_PARAM_NAME_MISSING, /* 1059 */
+    XML_RNGP_PARENTREF_CREATE_FAILED, /* 1060 */
+    XML_RNGP_PARENTREF_NAME_INVALID, /* 1061 */
+    XML_RNGP_PARENTREF_NO_NAME, /* 1062 */
+    XML_RNGP_PARENTREF_NO_PARENT, /* 1063 */
+    XML_RNGP_PARENTREF_NOT_EMPTY, /* 1064 */
+    XML_RNGP_PARSE_ERROR, /* 1065 */
+    XML_RNGP_PAT_ANYNAME_EXCEPT_ANYNAME, /* 1066 */
+    XML_RNGP_PAT_ATTR_ATTR, /* 1067 */
+    XML_RNGP_PAT_ATTR_ELEM, /* 1068 */
+    XML_RNGP_PAT_DATA_EXCEPT_ATTR, /* 1069 */
+    XML_RNGP_PAT_DATA_EXCEPT_ELEM, /* 1070 */
+    XML_RNGP_PAT_DATA_EXCEPT_EMPTY, /* 1071 */
+    XML_RNGP_PAT_DATA_EXCEPT_GROUP, /* 1072 */
+    XML_RNGP_PAT_DATA_EXCEPT_INTERLEAVE, /* 1073 */
+    XML_RNGP_PAT_DATA_EXCEPT_LIST, /* 1074 */
+    XML_RNGP_PAT_DATA_EXCEPT_ONEMORE, /* 1075 */
+    XML_RNGP_PAT_DATA_EXCEPT_REF, /* 1076 */
+    XML_RNGP_PAT_DATA_EXCEPT_TEXT, /* 1077 */
+    XML_RNGP_PAT_LIST_ATTR, /* 1078 */
+    XML_RNGP_PAT_LIST_ELEM, /* 1079 */
+    XML_RNGP_PAT_LIST_INTERLEAVE, /* 1080 */
+    XML_RNGP_PAT_LIST_LIST, /* 1081 */
+    XML_RNGP_PAT_LIST_REF, /* 1082 */
+    XML_RNGP_PAT_LIST_TEXT, /* 1083 */
+    XML_RNGP_PAT_NSNAME_EXCEPT_ANYNAME, /* 1084 */
+    XML_RNGP_PAT_NSNAME_EXCEPT_NSNAME, /* 1085 */
+    XML_RNGP_PAT_ONEMORE_GROUP_ATTR, /* 1086 */
+    XML_RNGP_PAT_ONEMORE_INTERLEAVE_ATTR, /* 1087 */
+    XML_RNGP_PAT_START_ATTR, /* 1088 */
+    XML_RNGP_PAT_START_DATA, /* 1089 */
+    XML_RNGP_PAT_START_EMPTY, /* 1090 */
+    XML_RNGP_PAT_START_GROUP, /* 1091 */
+    XML_RNGP_PAT_START_INTERLEAVE, /* 1092 */
+    XML_RNGP_PAT_START_LIST, /* 1093 */
+    XML_RNGP_PAT_START_ONEMORE, /* 1094 */
+    XML_RNGP_PAT_START_TEXT, /* 1095 */
+    XML_RNGP_PAT_START_VALUE, /* 1096 */
+    XML_RNGP_PREFIX_UNDEFINED, /* 1097 */
+    XML_RNGP_REF_CREATE_FAILED, /* 1098 */
+    XML_RNGP_REF_CYCLE, /* 1099 */
+    XML_RNGP_REF_NAME_INVALID, /* 1100 */
+    XML_RNGP_REF_NO_DEF, /* 1101 */
+    XML_RNGP_REF_NO_NAME, /* 1102 */
+    XML_RNGP_REF_NOT_EMPTY, /* 1103 */
+    XML_RNGP_START_CHOICE_AND_INTERLEAVE, /* 1104 */
+    XML_RNGP_START_CONTENT, /* 1105 */
+    XML_RNGP_START_EMPTY, /* 1106 */
+    XML_RNGP_START_MISSING, /* 1107 */
+    XML_RNGP_TEXT_EXPECTED, /* 1108 */
+    XML_RNGP_TEXT_HAS_CHILD, /* 1109 */
+    XML_RNGP_TYPE_MISSING, /* 1110 */
+    XML_RNGP_TYPE_NOT_FOUND, /* 1111 */
+    XML_RNGP_TYPE_VALUE, /* 1112 */
+    XML_RNGP_UNKNOWN_ATTRIBUTE, /* 1113 */
+    XML_RNGP_UNKNOWN_COMBINE, /* 1114 */
+    XML_RNGP_UNKNOWN_CONSTRUCT, /* 1115 */
+    XML_RNGP_UNKNOWN_TYPE_LIB, /* 1116 */
+    XML_RNGP_URI_FRAGMENT, /* 1117 */
+    XML_RNGP_URI_NOT_ABSOLUTE, /* 1118 */
+    XML_RNGP_VALUE_EMPTY, /* 1119 */
+    XML_RNGP_VALUE_NO_CONTENT, /* 1120 */
+    XML_RNGP_XMLNS_NAME, /* 1121 */
+    XML_RNGP_XML_NS, /* 1122 */
+    XML_XPATH_EXPRESSION_OK = 1200,
+    XML_XPATH_NUMBER_ERROR, /* 1201 */
+    XML_XPATH_UNFINISHED_LITERAL_ERROR, /* 1202 */
+    XML_XPATH_START_LITERAL_ERROR, /* 1203 */
+    XML_XPATH_VARIABLE_REF_ERROR, /* 1204 */
+    XML_XPATH_UNDEF_VARIABLE_ERROR, /* 1205 */
+    XML_XPATH_INVALID_PREDICATE_ERROR, /* 1206 */
+    XML_XPATH_EXPR_ERROR, /* 1207 */
+    XML_XPATH_UNCLOSED_ERROR, /* 1208 */
+    XML_XPATH_UNKNOWN_FUNC_ERROR, /* 1209 */
+    XML_XPATH_INVALID_OPERAND, /* 1210 */
+    XML_XPATH_INVALID_TYPE, /* 1211 */
+    XML_XPATH_INVALID_ARITY, /* 1212 */
+    XML_XPATH_INVALID_CTXT_SIZE, /* 1213 */
+    XML_XPATH_INVALID_CTXT_POSITION, /* 1214 */
+    XML_XPATH_MEMORY_ERROR, /* 1215 */
+    XML_XPTR_SYNTAX_ERROR, /* 1216 */
+    XML_XPTR_RESOURCE_ERROR, /* 1217 */
+    XML_XPTR_SUB_RESOURCE_ERROR, /* 1218 */
+    XML_XPATH_UNDEF_PREFIX_ERROR, /* 1219 */
+    XML_XPATH_ENCODING_ERROR, /* 1220 */
+    XML_XPATH_INVALID_CHAR_ERROR, /* 1221 */
+    XML_TREE_INVALID_HEX = 1300,
+    XML_TREE_INVALID_DEC, /* 1301 */
+    XML_TREE_UNTERMINATED_ENTITY, /* 1302 */
+    XML_TREE_NOT_UTF8, /* 1303 */
+    XML_SAVE_NOT_UTF8 = 1400,
+    XML_SAVE_CHAR_INVALID, /* 1401 */
+    XML_SAVE_NO_DOCTYPE, /* 1402 */
+    XML_SAVE_UNKNOWN_ENCODING, /* 1403 */
+    XML_REGEXP_COMPILE_ERROR = 1450,
+    XML_IO_UNKNOWN = 1500,
+    XML_IO_EACCES, /* 1501 */
+    XML_IO_EAGAIN, /* 1502 */
+    XML_IO_EBADF, /* 1503 */
+    XML_IO_EBADMSG, /* 1504 */
+    XML_IO_EBUSY, /* 1505 */
+    XML_IO_ECANCELED, /* 1506 */
+    XML_IO_ECHILD, /* 1507 */
+    XML_IO_EDEADLK, /* 1508 */
+    XML_IO_EDOM, /* 1509 */
+    XML_IO_EEXIST, /* 1510 */
+    XML_IO_EFAULT, /* 1511 */
+    XML_IO_EFBIG, /* 1512 */
+    XML_IO_EINPROGRESS, /* 1513 */
+    XML_IO_EINTR, /* 1514 */
+    XML_IO_EINVAL, /* 1515 */
+    XML_IO_EIO, /* 1516 */
+    XML_IO_EISDIR, /* 1517 */
+    XML_IO_EMFILE, /* 1518 */
+    XML_IO_EMLINK, /* 1519 */
+    XML_IO_EMSGSIZE, /* 1520 */
+    XML_IO_ENAMETOOLONG, /* 1521 */
+    XML_IO_ENFILE, /* 1522 */
+    XML_IO_ENODEV, /* 1523 */
+    XML_IO_ENOENT, /* 1524 */
+    XML_IO_ENOEXEC, /* 1525 */
+    XML_IO_ENOLCK, /* 1526 */
+    XML_IO_ENOMEM, /* 1527 */
+    XML_IO_ENOSPC, /* 1528 */
+    XML_IO_ENOSYS, /* 1529 */
+    XML_IO_ENOTDIR, /* 1530 */
+    XML_IO_ENOTEMPTY, /* 1531 */
+    XML_IO_ENOTSUP, /* 1532 */
+    XML_IO_ENOTTY, /* 1533 */
+    XML_IO_ENXIO, /* 1534 */
+    XML_IO_EPERM, /* 1535 */
+    XML_IO_EPIPE, /* 1536 */
+    XML_IO_ERANGE, /* 1537 */
+    XML_IO_EROFS, /* 1538 */
+    XML_IO_ESPIPE, /* 1539 */
+    XML_IO_ESRCH, /* 1540 */
+    XML_IO_ETIMEDOUT, /* 1541 */
+    XML_IO_EXDEV, /* 1542 */
+    XML_IO_NETWORK_ATTEMPT, /* 1543 */
+    XML_IO_ENCODER, /* 1544 */
+    XML_IO_FLUSH, /* 1545 */
+    XML_IO_WRITE, /* 1546 */
+    XML_IO_NO_INPUT, /* 1547 */
+    XML_IO_BUFFER_FULL, /* 1548 */
+    XML_IO_LOAD_ERROR, /* 1549 */
+    XML_IO_ENOTSOCK, /* 1550 */
+    XML_IO_EISCONN, /* 1551 */
+    XML_IO_ECONNREFUSED, /* 1552 */
+    XML_IO_ENETUNREACH, /* 1553 */
+    XML_IO_EADDRINUSE, /* 1554 */
+    XML_IO_EALREADY, /* 1555 */
+    XML_IO_EAFNOSUPPORT, /* 1556 */
+    XML_XINCLUDE_RECURSION=1600,
+    XML_XINCLUDE_PARSE_VALUE, /* 1601 */
+    XML_XINCLUDE_ENTITY_DEF_MISMATCH, /* 1602 */
+    XML_XINCLUDE_NO_HREF, /* 1603 */
+    XML_XINCLUDE_NO_FALLBACK, /* 1604 */
+    XML_XINCLUDE_HREF_URI, /* 1605 */
+    XML_XINCLUDE_TEXT_FRAGMENT, /* 1606 */
+    XML_XINCLUDE_TEXT_DOCUMENT, /* 1607 */
+    XML_XINCLUDE_INVALID_CHAR, /* 1608 */
+    XML_XINCLUDE_BUILD_FAILED, /* 1609 */
+    XML_XINCLUDE_UNKNOWN_ENCODING, /* 1610 */
+    XML_XINCLUDE_MULTIPLE_ROOT, /* 1611 */
+    XML_XINCLUDE_XPTR_FAILED, /* 1612 */
+    XML_XINCLUDE_XPTR_RESULT, /* 1613 */
+    XML_XINCLUDE_INCLUDE_IN_INCLUDE, /* 1614 */
+    XML_XINCLUDE_FALLBACKS_IN_INCLUDE, /* 1615 */
+    XML_XINCLUDE_FALLBACK_NOT_IN_INCLUDE, /* 1616 */
+    XML_XINCLUDE_DEPRECATED_NS, /* 1617 */
+    XML_XINCLUDE_FRAGMENT_ID, /* 1618 */
+    XML_CATALOG_MISSING_ATTR = 1650,
+    XML_CATALOG_ENTRY_BROKEN, /* 1651 */
+    XML_CATALOG_PREFER_VALUE, /* 1652 */
+    XML_CATALOG_NOT_CATALOG, /* 1653 */
+    XML_CATALOG_RECURSION, /* 1654 */
+    XML_SCHEMAP_PREFIX_UNDEFINED = 1700,
+    XML_SCHEMAP_ATTRFORMDEFAULT_VALUE, /* 1701 */
+    XML_SCHEMAP_ATTRGRP_NONAME_NOREF, /* 1702 */
+    XML_SCHEMAP_ATTR_NONAME_NOREF, /* 1703 */
+    XML_SCHEMAP_COMPLEXTYPE_NONAME_NOREF, /* 1704 */
+    XML_SCHEMAP_ELEMFORMDEFAULT_VALUE, /* 1705 */
+    XML_SCHEMAP_ELEM_NONAME_NOREF, /* 1706 */
+    XML_SCHEMAP_EXTENSION_NO_BASE, /* 1707 */
+    XML_SCHEMAP_FACET_NO_VALUE, /* 1708 */
+    XML_SCHEMAP_FAILED_BUILD_IMPORT, /* 1709 */
+    XML_SCHEMAP_GROUP_NONAME_NOREF, /* 1710 */
+    XML_SCHEMAP_IMPORT_NAMESPACE_NOT_URI, /* 1711 */
+    XML_SCHEMAP_IMPORT_REDEFINE_NSNAME, /* 1712 */
+    XML_SCHEMAP_IMPORT_SCHEMA_NOT_URI, /* 1713 */
+    XML_SCHEMAP_INVALID_BOOLEAN, /* 1714 */
+    XML_SCHEMAP_INVALID_ENUM, /* 1715 */
+    XML_SCHEMAP_INVALID_FACET, /* 1716 */
+    XML_SCHEMAP_INVALID_FACET_VALUE, /* 1717 */
+    XML_SCHEMAP_INVALID_MAXOCCURS, /* 1718 */
+    XML_SCHEMAP_INVALID_MINOCCURS, /* 1719 */
+    XML_SCHEMAP_INVALID_REF_AND_SUBTYPE, /* 1720 */
+    XML_SCHEMAP_INVALID_WHITE_SPACE, /* 1721 */
+    XML_SCHEMAP_NOATTR_NOREF, /* 1722 */
+    XML_SCHEMAP_NOTATION_NO_NAME, /* 1723 */
+    XML_SCHEMAP_NOTYPE_NOREF, /* 1724 */
+    XML_SCHEMAP_REF_AND_SUBTYPE, /* 1725 */
+    XML_SCHEMAP_RESTRICTION_NONAME_NOREF, /* 1726 */
+    XML_SCHEMAP_SIMPLETYPE_NONAME, /* 1727 */
+    XML_SCHEMAP_TYPE_AND_SUBTYPE, /* 1728 */
+    XML_SCHEMAP_UNKNOWN_ALL_CHILD, /* 1729 */
+    XML_SCHEMAP_UNKNOWN_ANYATTRIBUTE_CHILD, /* 1730 */
+    XML_SCHEMAP_UNKNOWN_ATTR_CHILD, /* 1731 */
+    XML_SCHEMAP_UNKNOWN_ATTRGRP_CHILD, /* 1732 */
+    XML_SCHEMAP_UNKNOWN_ATTRIBUTE_GROUP, /* 1733 */
+    XML_SCHEMAP_UNKNOWN_BASE_TYPE, /* 1734 */
+    XML_SCHEMAP_UNKNOWN_CHOICE_CHILD, /* 1735 */
+    XML_SCHEMAP_UNKNOWN_COMPLEXCONTENT_CHILD, /* 1736 */
+    XML_SCHEMAP_UNKNOWN_COMPLEXTYPE_CHILD, /* 1737 */
+    XML_SCHEMAP_UNKNOWN_ELEM_CHILD, /* 1738 */
+    XML_SCHEMAP_UNKNOWN_EXTENSION_CHILD, /* 1739 */
+    XML_SCHEMAP_UNKNOWN_FACET_CHILD, /* 1740 */
+    XML_SCHEMAP_UNKNOWN_FACET_TYPE, /* 1741 */
+    XML_SCHEMAP_UNKNOWN_GROUP_CHILD, /* 1742 */
+    XML_SCHEMAP_UNKNOWN_IMPORT_CHILD, /* 1743 */
+    XML_SCHEMAP_UNKNOWN_LIST_CHILD, /* 1744 */
+    XML_SCHEMAP_UNKNOWN_NOTATION_CHILD, /* 1745 */
+    XML_SCHEMAP_UNKNOWN_PROCESSCONTENT_CHILD, /* 1746 */
+    XML_SCHEMAP_UNKNOWN_REF, /* 1747 */
+    XML_SCHEMAP_UNKNOWN_RESTRICTION_CHILD, /* 1748 */
+    XML_SCHEMAP_UNKNOWN_SCHEMAS_CHILD, /* 1749 */
+    XML_SCHEMAP_UNKNOWN_SEQUENCE_CHILD, /* 1750 */
+    XML_SCHEMAP_UNKNOWN_SIMPLECONTENT_CHILD, /* 1751 */
+    XML_SCHEMAP_UNKNOWN_SIMPLETYPE_CHILD, /* 1752 */
+    XML_SCHEMAP_UNKNOWN_TYPE, /* 1753 */
+    XML_SCHEMAP_UNKNOWN_UNION_CHILD, /* 1754 */
+    XML_SCHEMAP_ELEM_DEFAULT_FIXED, /* 1755 */
+    XML_SCHEMAP_REGEXP_INVALID, /* 1756 */
+    XML_SCHEMAP_FAILED_LOAD, /* 1757 */
+    XML_SCHEMAP_NOTHING_TO_PARSE, /* 1758 */
+    XML_SCHEMAP_NOROOT, /* 1759 */
+    XML_SCHEMAP_REDEFINED_GROUP, /* 1760 */
+    XML_SCHEMAP_REDEFINED_TYPE, /* 1761 */
+    XML_SCHEMAP_REDEFINED_ELEMENT, /* 1762 */
+    XML_SCHEMAP_REDEFINED_ATTRGROUP, /* 1763 */
+    XML_SCHEMAP_REDEFINED_ATTR, /* 1764 */
+    XML_SCHEMAP_REDEFINED_NOTATION, /* 1765 */
+    XML_SCHEMAP_FAILED_PARSE, /* 1766 */
+    XML_SCHEMAP_UNKNOWN_PREFIX, /* 1767 */
+    XML_SCHEMAP_DEF_AND_PREFIX, /* 1768 */
+    XML_SCHEMAP_UNKNOWN_INCLUDE_CHILD, /* 1769 */
+    XML_SCHEMAP_INCLUDE_SCHEMA_NOT_URI, /* 1770 */
+    XML_SCHEMAP_INCLUDE_SCHEMA_NO_URI, /* 1771 */
+    XML_SCHEMAP_NOT_SCHEMA, /* 1772 */
+    XML_SCHEMAP_UNKNOWN_MEMBER_TYPE, /* 1773 */
+    XML_SCHEMAP_INVALID_ATTR_USE, /* 1774 */
+    XML_SCHEMAP_RECURSIVE, /* 1775 */
+    XML_SCHEMAP_SUPERNUMEROUS_LIST_ITEM_TYPE, /* 1776 */
+    XML_SCHEMAP_INVALID_ATTR_COMBINATION, /* 1777 */
+    XML_SCHEMAP_INVALID_ATTR_INLINE_COMBINATION, /* 1778 */
+    XML_SCHEMAP_MISSING_SIMPLETYPE_CHILD, /* 1779 */
+    XML_SCHEMAP_INVALID_ATTR_NAME, /* 1780 */
+    XML_SCHEMAP_REF_AND_CONTENT, /* 1781 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_1, /* 1782 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_2, /* 1783 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_3, /* 1784 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_4, /* 1785 */
+    XML_SCHEMAP_CT_PROPS_CORRECT_5, /* 1786 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_1, /* 1787 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_1, /* 1788 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_2, /* 1789 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_2, /* 1790 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_3, /* 1791 */
+    XML_SCHEMAP_WILDCARD_INVALID_NS_MEMBER, /* 1792 */
+    XML_SCHEMAP_INTERSECTION_NOT_EXPRESSIBLE, /* 1793 */
+    XML_SCHEMAP_UNION_NOT_EXPRESSIBLE, /* 1794 */
+    XML_SCHEMAP_SRC_IMPORT_3_1, /* 1795 */
+    XML_SCHEMAP_SRC_IMPORT_3_2, /* 1796 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_1, /* 1797 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_2, /* 1798 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_4_3, /* 1799 */
+    XML_SCHEMAP_COS_CT_EXTENDS_1_3, /* 1800 */
+    XML_SCHEMAV_NOROOT = 1801,
+    XML_SCHEMAV_UNDECLAREDELEM, /* 1802 */
+    XML_SCHEMAV_NOTTOPLEVEL, /* 1803 */
+    XML_SCHEMAV_MISSING, /* 1804 */
+    XML_SCHEMAV_WRONGELEM, /* 1805 */
+    XML_SCHEMAV_NOTYPE, /* 1806 */
+    XML_SCHEMAV_NOROLLBACK, /* 1807 */
+    XML_SCHEMAV_ISABSTRACT, /* 1808 */
+    XML_SCHEMAV_NOTEMPTY, /* 1809 */
+    XML_SCHEMAV_ELEMCONT, /* 1810 */
+    XML_SCHEMAV_HAVEDEFAULT, /* 1811 */
+    XML_SCHEMAV_NOTNILLABLE, /* 1812 */
+    XML_SCHEMAV_EXTRACONTENT, /* 1813 */
+    XML_SCHEMAV_INVALIDATTR, /* 1814 */
+    XML_SCHEMAV_INVALIDELEM, /* 1815 */
+    XML_SCHEMAV_NOTDETERMINIST, /* 1816 */
+    XML_SCHEMAV_CONSTRUCT, /* 1817 */
+    XML_SCHEMAV_INTERNAL, /* 1818 */
+    XML_SCHEMAV_NOTSIMPLE, /* 1819 */
+    XML_SCHEMAV_ATTRUNKNOWN, /* 1820 */
+    XML_SCHEMAV_ATTRINVALID, /* 1821 */
+    XML_SCHEMAV_VALUE, /* 1822 */
+    XML_SCHEMAV_FACET, /* 1823 */
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_1, /* 1824 */
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_2, /* 1825 */
+    XML_SCHEMAV_CVC_DATATYPE_VALID_1_2_3, /* 1826 */
+    XML_SCHEMAV_CVC_TYPE_3_1_1, /* 1827 */
+    XML_SCHEMAV_CVC_TYPE_3_1_2, /* 1828 */
+    XML_SCHEMAV_CVC_FACET_VALID, /* 1829 */
+    XML_SCHEMAV_CVC_LENGTH_VALID, /* 1830 */
+    XML_SCHEMAV_CVC_MINLENGTH_VALID, /* 1831 */
+    XML_SCHEMAV_CVC_MAXLENGTH_VALID, /* 1832 */
+    XML_SCHEMAV_CVC_MININCLUSIVE_VALID, /* 1833 */
+    XML_SCHEMAV_CVC_MAXINCLUSIVE_VALID, /* 1834 */
+    XML_SCHEMAV_CVC_MINEXCLUSIVE_VALID, /* 1835 */
+    XML_SCHEMAV_CVC_MAXEXCLUSIVE_VALID, /* 1836 */
+    XML_SCHEMAV_CVC_TOTALDIGITS_VALID, /* 1837 */
+    XML_SCHEMAV_CVC_FRACTIONDIGITS_VALID, /* 1838 */
+    XML_SCHEMAV_CVC_PATTERN_VALID, /* 1839 */
+    XML_SCHEMAV_CVC_ENUMERATION_VALID, /* 1840 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_1, /* 1841 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_2, /* 1842 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_3, /* 1843 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_2_4, /* 1844 */
+    XML_SCHEMAV_CVC_ELT_1, /* 1845 */
+    XML_SCHEMAV_CVC_ELT_2, /* 1846 */
+    XML_SCHEMAV_CVC_ELT_3_1, /* 1847 */
+    XML_SCHEMAV_CVC_ELT_3_2_1, /* 1848 */
+    XML_SCHEMAV_CVC_ELT_3_2_2, /* 1849 */
+    XML_SCHEMAV_CVC_ELT_4_1, /* 1850 */
+    XML_SCHEMAV_CVC_ELT_4_2, /* 1851 */
+    XML_SCHEMAV_CVC_ELT_4_3, /* 1852 */
+    XML_SCHEMAV_CVC_ELT_5_1_1, /* 1853 */
+    XML_SCHEMAV_CVC_ELT_5_1_2, /* 1854 */
+    XML_SCHEMAV_CVC_ELT_5_2_1, /* 1855 */
+    XML_SCHEMAV_CVC_ELT_5_2_2_1, /* 1856 */
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_1, /* 1857 */
+    XML_SCHEMAV_CVC_ELT_5_2_2_2_2, /* 1858 */
+    XML_SCHEMAV_CVC_ELT_6, /* 1859 */
+    XML_SCHEMAV_CVC_ELT_7, /* 1860 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_1, /* 1861 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_2, /* 1862 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_3, /* 1863 */
+    XML_SCHEMAV_CVC_ATTRIBUTE_4, /* 1864 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_1, /* 1865 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_1, /* 1866 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_3_2_2, /* 1867 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_4, /* 1868 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_1, /* 1869 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_5_2, /* 1870 */
+    XML_SCHEMAV_ELEMENT_CONTENT, /* 1871 */
+    XML_SCHEMAV_DOCUMENT_ELEMENT_MISSING, /* 1872 */
+    XML_SCHEMAV_CVC_COMPLEX_TYPE_1, /* 1873 */
+    XML_SCHEMAV_CVC_AU, /* 1874 */
+    XML_SCHEMAV_CVC_TYPE_1, /* 1875 */
+    XML_SCHEMAV_CVC_TYPE_2, /* 1876 */
+    XML_SCHEMAV_CVC_IDC, /* 1877 */
+    XML_SCHEMAV_CVC_WILDCARD, /* 1878 */
+    XML_SCHEMAV_MISC, /* 1879 */
+    XML_XPTR_UNKNOWN_SCHEME = 1900,
+    XML_XPTR_CHILDSEQ_START, /* 1901 */
+    XML_XPTR_EVAL_FAILED, /* 1902 */
+    XML_XPTR_EXTRA_OBJECTS, /* 1903 */
+    XML_C14N_CREATE_CTXT = 1950,
+    XML_C14N_REQUIRES_UTF8, /* 1951 */
+    XML_C14N_CREATE_STACK, /* 1952 */
+    XML_C14N_INVALID_NODE, /* 1953 */
+    XML_C14N_UNKNOW_NODE, /* 1954 */
+    XML_C14N_RELATIVE_NAMESPACE, /* 1955 */
+    XML_FTP_PASV_ANSWER = 2000,
+    XML_FTP_EPSV_ANSWER, /* 2001 */
+    XML_FTP_ACCNT, /* 2002 */
+    XML_FTP_URL_SYNTAX, /* 2003 */
+    XML_HTTP_URL_SYNTAX = 2020,
+    XML_HTTP_USE_IP, /* 2021 */
+    XML_HTTP_UNKNOWN_HOST, /* 2022 */
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_1 = 3000,
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_2, /* 3001 */
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_3, /* 3002 */
+    XML_SCHEMAP_SRC_SIMPLE_TYPE_4, /* 3003 */
+    XML_SCHEMAP_SRC_RESOLVE, /* 3004 */
+    XML_SCHEMAP_SRC_RESTRICTION_BASE_OR_SIMPLETYPE, /* 3005 */
+    XML_SCHEMAP_SRC_LIST_ITEMTYPE_OR_SIMPLETYPE, /* 3006 */
+    XML_SCHEMAP_SRC_UNION_MEMBERTYPES_OR_SIMPLETYPES, /* 3007 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_1, /* 3008 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_2, /* 3009 */
+    XML_SCHEMAP_ST_PROPS_CORRECT_3, /* 3010 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_1, /* 3011 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_2, /* 3012 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_1, /* 3013 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_1_3_2, /* 3014 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_1, /* 3015 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_1, /* 3016 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_1_2, /* 3017 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_1, /* 3018 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_2, /* 3019 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_3, /* 3020 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_4, /* 3021 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_2_3_2_5, /* 3022 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_1, /* 3023 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1, /* 3024 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_1_2, /* 3025 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_2, /* 3026 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_1, /* 3027 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_3, /* 3028 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_4, /* 3029 */
+    XML_SCHEMAP_COS_ST_RESTRICTS_3_3_2_5, /* 3030 */
+    XML_SCHEMAP_COS_ST_DERIVED_OK_2_1, /* 3031 */
+    XML_SCHEMAP_COS_ST_DERIVED_OK_2_2, /* 3032 */
+    XML_SCHEMAP_S4S_ELEM_NOT_ALLOWED, /* 3033 */
+    XML_SCHEMAP_S4S_ELEM_MISSING, /* 3034 */
+    XML_SCHEMAP_S4S_ATTR_NOT_ALLOWED, /* 3035 */
+    XML_SCHEMAP_S4S_ATTR_MISSING, /* 3036 */
+    XML_SCHEMAP_S4S_ATTR_INVALID_VALUE, /* 3037 */
+    XML_SCHEMAP_SRC_ELEMENT_1, /* 3038 */
+    XML_SCHEMAP_SRC_ELEMENT_2_1, /* 3039 */
+    XML_SCHEMAP_SRC_ELEMENT_2_2, /* 3040 */
+    XML_SCHEMAP_SRC_ELEMENT_3, /* 3041 */
+    XML_SCHEMAP_P_PROPS_CORRECT_1, /* 3042 */
+    XML_SCHEMAP_P_PROPS_CORRECT_2_1, /* 3043 */
+    XML_SCHEMAP_P_PROPS_CORRECT_2_2, /* 3044 */
+    XML_SCHEMAP_E_PROPS_CORRECT_2, /* 3045 */
+    XML_SCHEMAP_E_PROPS_CORRECT_3, /* 3046 */
+    XML_SCHEMAP_E_PROPS_CORRECT_4, /* 3047 */
+    XML_SCHEMAP_E_PROPS_CORRECT_5, /* 3048 */
+    XML_SCHEMAP_E_PROPS_CORRECT_6, /* 3049 */
+    XML_SCHEMAP_SRC_INCLUDE, /* 3050 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_1, /* 3051 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_2, /* 3052 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_3_1, /* 3053 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_3_2, /* 3054 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_4, /* 3055 */
+    XML_SCHEMAP_NO_XMLNS, /* 3056 */
+    XML_SCHEMAP_NO_XSI, /* 3057 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_1, /* 3058 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_1, /* 3059 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_1, /* 3060 */
+    XML_SCHEMAP_COS_VALID_DEFAULT_2_2_2, /* 3061 */
+    XML_SCHEMAP_CVC_SIMPLE_TYPE, /* 3062 */
+    XML_SCHEMAP_COS_CT_EXTENDS_1_1, /* 3063 */
+    XML_SCHEMAP_SRC_IMPORT_1_1, /* 3064 */
+    XML_SCHEMAP_SRC_IMPORT_1_2, /* 3065 */
+    XML_SCHEMAP_SRC_IMPORT_2, /* 3066 */
+    XML_SCHEMAP_SRC_IMPORT_2_1, /* 3067 */
+    XML_SCHEMAP_SRC_IMPORT_2_2, /* 3068 */
+    XML_SCHEMAP_INTERNAL, /* 3069 non-W3C */
+    XML_SCHEMAP_NOT_DETERMINISTIC, /* 3070 non-W3C */
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_1, /* 3071 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_2, /* 3072 */
+    XML_SCHEMAP_SRC_ATTRIBUTE_GROUP_3, /* 3073 */
+    XML_SCHEMAP_MG_PROPS_CORRECT_1, /* 3074 */
+    XML_SCHEMAP_MG_PROPS_CORRECT_2, /* 3075 */
+    XML_SCHEMAP_SRC_CT_1, /* 3076 */
+    XML_SCHEMAP_DERIVATION_OK_RESTRICTION_2_1_3, /* 3077 */
+    XML_SCHEMAP_AU_PROPS_CORRECT_2, /* 3078 */
+    XML_SCHEMAP_A_PROPS_CORRECT_2, /* 3079 */
+    XML_SCHEMAP_C_PROPS_CORRECT, /* 3080 */
+    XML_SCHEMAP_SRC_REDEFINE, /* 3081 */
+    XML_SCHEMAP_SRC_IMPORT, /* 3082 */
+    XML_SCHEMAP_WARN_SKIP_SCHEMA, /* 3083 */
+    XML_SCHEMAP_WARN_UNLOCATED_SCHEMA, /* 3084 */
+    XML_SCHEMAP_WARN_ATTR_REDECL_PROH, /* 3085 */
+    XML_SCHEMAP_WARN_ATTR_POINTLESS_PROH, /* 3085 */
+    XML_SCHEMAP_AG_PROPS_CORRECT, /* 3086 */
+    XML_SCHEMAP_COS_CT_EXTENDS_1_2, /* 3087 */
+    XML_SCHEMAP_AU_PROPS_CORRECT, /* 3088 */
+    XML_SCHEMAP_A_PROPS_CORRECT_3, /* 3089 */
+    XML_SCHEMAP_COS_ALL_LIMITED, /* 3090 */
+    XML_SCHEMATRONV_ASSERT = 4000, /* 4000 */
+    XML_SCHEMATRONV_REPORT,
+    XML_MODULE_OPEN = 4900, /* 4900 */
+    XML_MODULE_CLOSE, /* 4901 */
+    XML_CHECK_FOUND_ELEMENT = 5000,
+    XML_CHECK_FOUND_ATTRIBUTE, /* 5001 */
+    XML_CHECK_FOUND_TEXT, /* 5002 */
+    XML_CHECK_FOUND_CDATA, /* 5003 */
+    XML_CHECK_FOUND_ENTITYREF, /* 5004 */
+    XML_CHECK_FOUND_ENTITY, /* 5005 */
+    XML_CHECK_FOUND_PI, /* 5006 */
+    XML_CHECK_FOUND_COMMENT, /* 5007 */
+    XML_CHECK_FOUND_DOCTYPE, /* 5008 */
+    XML_CHECK_FOUND_FRAGMENT, /* 5009 */
+    XML_CHECK_FOUND_NOTATION, /* 5010 */
+    XML_CHECK_UNKNOWN_NODE, /* 5011 */
+    XML_CHECK_ENTITY_TYPE, /* 5012 */
+    XML_CHECK_NO_PARENT, /* 5013 */
+    XML_CHECK_NO_DOC, /* 5014 */
+    XML_CHECK_NO_NAME, /* 5015 */
+    XML_CHECK_NO_ELEM, /* 5016 */
+    XML_CHECK_WRONG_DOC, /* 5017 */
+    XML_CHECK_NO_PREV, /* 5018 */
+    XML_CHECK_WRONG_PREV, /* 5019 */
+    XML_CHECK_NO_NEXT, /* 5020 */
+    XML_CHECK_WRONG_NEXT, /* 5021 */
+    XML_CHECK_NOT_DTD, /* 5022 */
+    XML_CHECK_NOT_ATTR, /* 5023 */
+    XML_CHECK_NOT_ATTR_DECL, /* 5024 */
+    XML_CHECK_NOT_ELEM_DECL, /* 5025 */
+    XML_CHECK_NOT_ENTITY_DECL, /* 5026 */
+    XML_CHECK_NOT_NS_DECL, /* 5027 */
+    XML_CHECK_NO_HREF, /* 5028 */
+    XML_CHECK_WRONG_PARENT,/* 5029 */
+    XML_CHECK_NS_SCOPE, /* 5030 */
+    XML_CHECK_NS_ANCESTOR, /* 5031 */
+    XML_CHECK_NOT_UTF8, /* 5032 */
+    XML_CHECK_NO_DICT, /* 5033 */
+    XML_CHECK_NOT_NCNAME, /* 5034 */
+    XML_CHECK_OUTSIDE_DICT, /* 5035 */
+    XML_CHECK_WRONG_NAME, /* 5036 */
+    XML_CHECK_NAME_NOT_NULL, /* 5037 */
+    XML_I18N_NO_NAME = 6000,
+    XML_I18N_NO_HANDLER, /* 6001 */
+    XML_I18N_EXCESS_HANDLER, /* 6002 */
+    XML_I18N_CONV_FAILED, /* 6003 */
+    XML_I18N_NO_OUTPUT, /* 6004 */
+    XML_BUF_OVERFLOW = 7000
+} xmlParserErrors;
+
+/**
+ * xmlGenericErrorFunc:
+ * @ctx:  a parsing context
+ * @msg:  the message
+ * @...:  the extra arguments of the varargs to format the message
+ *
+ * Signature of the function to use when there is an error and
+ * no parsing or validity context available .
+ */
+typedef void (XMLCDECL *xmlGenericErrorFunc) (void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+/**
+ * xmlStructuredErrorFunc:
+ * @userData:  user provided data for the error callback
+ * @error:  the error being raised.
+ *
+ * Signature of the function to use when there is an error and
+ * the module handles the new error reporting mechanism.
+ */
+typedef void (XMLCALL *xmlStructuredErrorFunc) (void *userData, xmlErrorPtr error);
+
+/*
+ * Use the following function to reset the two global variables
+ * xmlGenericError and xmlGenericErrorContext.
+ */
+XMLPUBFUN void XMLCALL
+    xmlSetGenericErrorFunc	(void *ctx,
+				 xmlGenericErrorFunc handler);
+XMLPUBFUN void XMLCALL
+    initGenericErrorDefaultFunc	(xmlGenericErrorFunc *handler);
+
+XMLPUBFUN void XMLCALL
+    xmlSetStructuredErrorFunc	(void *ctx,
+				 xmlStructuredErrorFunc handler);
+/*
+ * Default message routines used by SAX and Valid context for error
+ * and warning reporting.
+ */
+XMLPUBFUN void XMLCDECL
+    xmlParserError		(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCDECL
+    xmlParserWarning		(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCDECL
+    xmlParserValidityError	(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCDECL
+    xmlParserValidityWarning	(void *ctx,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(2,3);
+XMLPUBFUN void XMLCALL
+    xmlParserPrintFileInfo	(xmlParserInputPtr input);
+XMLPUBFUN void XMLCALL
+    xmlParserPrintFileContext	(xmlParserInputPtr input);
+
+/*
+ * Extended error information routines
+ */
+XMLPUBFUN xmlErrorPtr XMLCALL
+    xmlGetLastError		(void);
+XMLPUBFUN void XMLCALL
+    xmlResetLastError		(void);
+XMLPUBFUN xmlErrorPtr XMLCALL
+    xmlCtxtGetLastError		(void *ctx);
+XMLPUBFUN void XMLCALL
+    xmlCtxtResetLastError	(void *ctx);
+XMLPUBFUN void XMLCALL
+    xmlResetError		(xmlErrorPtr err);
+XMLPUBFUN int XMLCALL
+    xmlCopyError		(xmlErrorPtr from,
+				 xmlErrorPtr to);
+
+#ifdef IN_LIBXML
+/*
+ * Internal callback reporting routine
+ */
+XMLPUBFUN void XMLCALL
+    __xmlRaiseError		(xmlStructuredErrorFunc schannel,
+				 xmlGenericErrorFunc channel,
+				 void *data,
+                                 void *ctx,
+				 void *node,
+				 int domain,
+				 int code,
+				 xmlErrorLevel level,
+				 const char *file,
+				 int line,
+				 const char *str1,
+				 const char *str2,
+				 const char *str3,
+				 int int1,
+				 int col,
+				 const char *msg,
+				 ...) LIBXML_ATTR_FORMAT(16,17);
+XMLPUBFUN void XMLCALL
+    __xmlSimpleError		(int domain,
+				 int code,
+				 xmlNodePtr node,
+				 const char *msg,
+				 const char *extra) LIBXML_ATTR_FORMAT(4,0);
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_ERROR_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlexports.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlexports.h
new file mode 100644
index 0000000..aceede5
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlexports.h
@@ -0,0 +1,77 @@
+/*
+ * Summary: macros for marking symbols as exportable/importable.
+ * Description: macros for marking symbols as exportable/importable.
+ *
+ * Copy: See Copyright for the status of this software.
+ */
+
+#ifndef __XML_EXPORTS_H__
+#define __XML_EXPORTS_H__
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+/** DOC_DISABLE */
+
+#ifdef LIBXML_STATIC
+  #define XMLPUBLIC
+#elif defined(IN_LIBXML)
+  #define XMLPUBLIC __declspec(dllexport)
+#else
+  #define XMLPUBLIC __declspec(dllimport)
+#endif
+
+#if defined(LIBXML_FASTCALL)
+  #define XMLCALL __fastcall
+#else
+  #define XMLCALL __cdecl
+#endif
+#define XMLCDECL __cdecl
+
+/** DOC_ENABLE */
+#else /* not Windows */
+
+/**
+ * XMLPUBLIC:
+ *
+ * Macro which declares a public symbol
+ */
+#define XMLPUBLIC
+
+/**
+ * XMLCALL:
+ *
+ * Macro which declares the calling convention for exported functions
+ */
+#define XMLCALL
+
+/**
+ * XMLCDECL:
+ *
+ * Macro which declares the calling convention for exported functions that
+ * use '...'.
+ */
+#define XMLCDECL
+
+#endif /* platform switch */
+
+/*
+ * XMLPUBFUN:
+ *
+ * Macro which declares an exportable function
+ */
+#define XMLPUBFUN XMLPUBLIC
+
+/**
+ * XMLPUBVAR:
+ *
+ * Macro which declares an exportable variable
+ */
+#define XMLPUBVAR XMLPUBLIC extern
+
+/* Compatibility */
+#if !defined(LIBXML_DLL_IMPORT)
+#define LIBXML_DLL_IMPORT XMLPUBVAR
+#endif
+
+#endif /* __XML_EXPORTS_H__ */
+
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlmemory.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlmemory.h
new file mode 100644
index 0000000..17e375a
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlmemory.h
@@ -0,0 +1,224 @@
+/*
+ * Summary: interface for the memory allocator
+ * Description: provides interfaces for the memory allocator,
+ *              including debugging capabilities.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __DEBUG_MEMORY_ALLOC__
+#define __DEBUG_MEMORY_ALLOC__
+
+#include <stdio.h>
+#include <libxml/xmlversion.h>
+
+/**
+ * DEBUG_MEMORY:
+ *
+ * DEBUG_MEMORY replaces the allocator with a collect and debug
+ * shell to the libc allocator.
+ * DEBUG_MEMORY should only be activated when debugging
+ * libxml i.e. if libxml has been configured with --with-debug-mem too.
+ */
+/* #define DEBUG_MEMORY_FREED */
+/* #define DEBUG_MEMORY_LOCATION */
+
+#ifdef DEBUG
+#ifndef DEBUG_MEMORY
+#define DEBUG_MEMORY
+#endif
+#endif
+
+/**
+ * DEBUG_MEMORY_LOCATION:
+ *
+ * DEBUG_MEMORY_LOCATION should be activated only when debugging
+ * libxml i.e. if libxml has been configured with --with-debug-mem too.
+ */
+#ifdef DEBUG_MEMORY_LOCATION
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The XML memory wrapper support 4 basic overloadable functions.
+ */
+/**
+ * xmlFreeFunc:
+ * @mem: an already allocated block of memory
+ *
+ * Signature for a free() implementation.
+ */
+typedef void (XMLCALL *xmlFreeFunc)(void *mem);
+/**
+ * xmlMallocFunc:
+ * @size:  the size requested in bytes
+ *
+ * Signature for a malloc() implementation.
+ *
+ * Returns a pointer to the newly allocated block or NULL in case of error.
+ */
+typedef void *(LIBXML_ATTR_ALLOC_SIZE(1) XMLCALL *xmlMallocFunc)(size_t size);
+
+/**
+ * xmlReallocFunc:
+ * @mem: an already allocated block of memory
+ * @size:  the new size requested in bytes
+ *
+ * Signature for a realloc() implementation.
+ *
+ * Returns a pointer to the newly reallocated block or NULL in case of error.
+ */
+typedef void *(XMLCALL *xmlReallocFunc)(void *mem, size_t size);
+
+/**
+ * xmlStrdupFunc:
+ * @str: a zero terminated string
+ *
+ * Signature for an strdup() implementation.
+ *
+ * Returns the copy of the string or NULL in case of error.
+ */
+typedef char *(XMLCALL *xmlStrdupFunc)(const char *str);
+
+/*
+ * The 4 interfaces used for all memory handling within libxml.
+LIBXML_DLL_IMPORT xmlFreeFunc xmlFree;
+LIBXML_DLL_IMPORT xmlMallocFunc xmlMalloc;
+LIBXML_DLL_IMPORT xmlMallocFunc xmlMallocAtomic;
+LIBXML_DLL_IMPORT xmlReallocFunc xmlRealloc;
+LIBXML_DLL_IMPORT xmlStrdupFunc xmlMemStrdup;
+ */
+
+/*
+ * The way to overload the existing functions.
+ * The xmlGc function have an extra entry for atomic block
+ * allocations useful for garbage collected memory allocators
+ */
+XMLPUBFUN int XMLCALL
+	xmlMemSetup	(xmlFreeFunc freeFunc,
+			 xmlMallocFunc mallocFunc,
+			 xmlReallocFunc reallocFunc,
+			 xmlStrdupFunc strdupFunc);
+XMLPUBFUN int XMLCALL
+	xmlMemGet	(xmlFreeFunc *freeFunc,
+			 xmlMallocFunc *mallocFunc,
+			 xmlReallocFunc *reallocFunc,
+			 xmlStrdupFunc *strdupFunc);
+XMLPUBFUN int XMLCALL
+	xmlGcMemSetup	(xmlFreeFunc freeFunc,
+			 xmlMallocFunc mallocFunc,
+			 xmlMallocFunc mallocAtomicFunc,
+			 xmlReallocFunc reallocFunc,
+			 xmlStrdupFunc strdupFunc);
+XMLPUBFUN int XMLCALL
+	xmlGcMemGet	(xmlFreeFunc *freeFunc,
+			 xmlMallocFunc *mallocFunc,
+			 xmlMallocFunc *mallocAtomicFunc,
+			 xmlReallocFunc *reallocFunc,
+			 xmlStrdupFunc *strdupFunc);
+
+/*
+ * Initialization of the memory layer.
+ */
+XMLPUBFUN int XMLCALL
+	xmlInitMemory	(void);
+
+/*
+ * Cleanup of the memory layer.
+ */
+XMLPUBFUN void XMLCALL
+                xmlCleanupMemory        (void);
+/*
+ * These are specific to the XML debug memory wrapper.
+ */
+XMLPUBFUN int XMLCALL
+	xmlMemUsed	(void);
+XMLPUBFUN int XMLCALL
+	xmlMemBlocks	(void);
+XMLPUBFUN void XMLCALL
+	xmlMemDisplay	(FILE *fp);
+XMLPUBFUN void XMLCALL
+	xmlMemDisplayLast(FILE *fp, long nbBytes);
+XMLPUBFUN void XMLCALL
+	xmlMemShow	(FILE *fp, int nr);
+XMLPUBFUN void XMLCALL
+	xmlMemoryDump	(void);
+XMLPUBFUN void * XMLCALL
+	xmlMemMalloc	(size_t size) LIBXML_ATTR_ALLOC_SIZE(1);
+XMLPUBFUN void * XMLCALL
+	xmlMemRealloc	(void *ptr,size_t size);
+XMLPUBFUN void XMLCALL
+	xmlMemFree	(void *ptr);
+XMLPUBFUN char * XMLCALL
+	xmlMemoryStrdup	(const char *str);
+XMLPUBFUN void * XMLCALL
+	xmlMallocLoc	(size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
+XMLPUBFUN void * XMLCALL
+	xmlReallocLoc	(void *ptr, size_t size, const char *file, int line);
+XMLPUBFUN void * XMLCALL
+	xmlMallocAtomicLoc (size_t size, const char *file, int line) LIBXML_ATTR_ALLOC_SIZE(1);
+XMLPUBFUN char * XMLCALL
+	xmlMemStrdupLoc	(const char *str, const char *file, int line);
+
+
+#ifdef DEBUG_MEMORY_LOCATION
+/**
+ * xmlMalloc:
+ * @size:  number of bytes to allocate
+ *
+ * Wrapper for the malloc() function used in the XML library.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlMalloc(size) xmlMallocLoc((size), __FILE__, __LINE__)
+/**
+ * xmlMallocAtomic:
+ * @size:  number of bytes to allocate
+ *
+ * Wrapper for the malloc() function used in the XML library for allocation
+ * of block not containing pointers to other areas.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlMallocAtomic(size) xmlMallocAtomicLoc((size), __FILE__, __LINE__)
+/**
+ * xmlRealloc:
+ * @ptr:  pointer to the existing allocated area
+ * @size:  number of bytes to allocate
+ *
+ * Wrapper for the realloc() function used in the XML library.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlRealloc(ptr, size) xmlReallocLoc((ptr), (size), __FILE__, __LINE__)
+/**
+ * xmlMemStrdup:
+ * @str:  pointer to the existing string
+ *
+ * Wrapper for the strdup() function, xmlStrdup() is usually preferred.
+ *
+ * Returns the pointer to the allocated area or NULL in case of error.
+ */
+#define xmlMemStrdup(str) xmlMemStrdupLoc((str), __FILE__, __LINE__)
+
+#endif /* DEBUG_MEMORY_LOCATION */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#ifndef __XML_GLOBALS_H
+#ifndef __XML_THREADS_H__
+#include <libxml/threads.h>
+#include <libxml/globals.h>
+#endif
+#endif
+
+#endif  /* __DEBUG_MEMORY_ALLOC__ */
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlmodule.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlmodule.h
new file mode 100644
index 0000000..9667820
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlmodule.h
@@ -0,0 +1,57 @@
+/*
+ * Summary: dynamic module loading
+ * Description: basic API for dynamic module loading, used by
+ *              libexslt added in 2.6.17
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Joel W. Reed
+ */
+
+#ifndef __XML_MODULE_H__
+#define __XML_MODULE_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_MODULES_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlModulePtr:
+ *
+ * A handle to a dynamically loaded module
+ */
+typedef struct _xmlModule xmlModule;
+typedef xmlModule *xmlModulePtr;
+
+/**
+ * xmlModuleOption:
+ *
+ * enumeration of options that can be passed down to xmlModuleOpen()
+ */
+typedef enum {
+    XML_MODULE_LAZY = 1,	/* lazy binding */
+    XML_MODULE_LOCAL= 2		/* local binding */
+} xmlModuleOption;
+
+XMLPUBFUN xmlModulePtr XMLCALL xmlModuleOpen	(const char *filename,
+						 int options);
+
+XMLPUBFUN int XMLCALL xmlModuleSymbol		(xmlModulePtr module,
+						 const char* name,
+						 void **result);
+
+XMLPUBFUN int XMLCALL xmlModuleClose		(xmlModulePtr module);
+
+XMLPUBFUN int XMLCALL xmlModuleFree		(xmlModulePtr module);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_MODULES_ENABLED */
+
+#endif /*__XML_MODULE_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlreader.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlreader.h
new file mode 100644
index 0000000..e8a8bcc
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlreader.h
@@ -0,0 +1,428 @@
+/*
+ * Summary: the XMLReader implementation
+ * Description: API of the XML streaming API based on C# interfaces.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XMLREADER_H__
+#define __XML_XMLREADER_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/xmlIO.h>
+#ifdef LIBXML_SCHEMAS_ENABLED
+#include <libxml/relaxng.h>
+#include <libxml/xmlschemas.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlParserSeverities:
+ *
+ * How severe an error callback is when the per-reader error callback API
+ * is used.
+ */
+typedef enum {
+    XML_PARSER_SEVERITY_VALIDITY_WARNING = 1,
+    XML_PARSER_SEVERITY_VALIDITY_ERROR = 2,
+    XML_PARSER_SEVERITY_WARNING = 3,
+    XML_PARSER_SEVERITY_ERROR = 4
+} xmlParserSeverities;
+
+#ifdef LIBXML_READER_ENABLED
+
+/**
+ * xmlTextReaderMode:
+ *
+ * Internal state values for the reader.
+ */
+typedef enum {
+    XML_TEXTREADER_MODE_INITIAL = 0,
+    XML_TEXTREADER_MODE_INTERACTIVE = 1,
+    XML_TEXTREADER_MODE_ERROR = 2,
+    XML_TEXTREADER_MODE_EOF =3,
+    XML_TEXTREADER_MODE_CLOSED = 4,
+    XML_TEXTREADER_MODE_READING = 5
+} xmlTextReaderMode;
+
+/**
+ * xmlParserProperties:
+ *
+ * Some common options to use with xmlTextReaderSetParserProp, but it
+ * is better to use xmlParserOption and the xmlReaderNewxxx and
+ * xmlReaderForxxx APIs now.
+ */
+typedef enum {
+    XML_PARSER_LOADDTD = 1,
+    XML_PARSER_DEFAULTATTRS = 2,
+    XML_PARSER_VALIDATE = 3,
+    XML_PARSER_SUBST_ENTITIES = 4
+} xmlParserProperties;
+
+/**
+ * xmlReaderTypes:
+ *
+ * Predefined constants for the different types of nodes.
+ */
+typedef enum {
+    XML_READER_TYPE_NONE = 0,
+    XML_READER_TYPE_ELEMENT = 1,
+    XML_READER_TYPE_ATTRIBUTE = 2,
+    XML_READER_TYPE_TEXT = 3,
+    XML_READER_TYPE_CDATA = 4,
+    XML_READER_TYPE_ENTITY_REFERENCE = 5,
+    XML_READER_TYPE_ENTITY = 6,
+    XML_READER_TYPE_PROCESSING_INSTRUCTION = 7,
+    XML_READER_TYPE_COMMENT = 8,
+    XML_READER_TYPE_DOCUMENT = 9,
+    XML_READER_TYPE_DOCUMENT_TYPE = 10,
+    XML_READER_TYPE_DOCUMENT_FRAGMENT = 11,
+    XML_READER_TYPE_NOTATION = 12,
+    XML_READER_TYPE_WHITESPACE = 13,
+    XML_READER_TYPE_SIGNIFICANT_WHITESPACE = 14,
+    XML_READER_TYPE_END_ELEMENT = 15,
+    XML_READER_TYPE_END_ENTITY = 16,
+    XML_READER_TYPE_XML_DECLARATION = 17
+} xmlReaderTypes;
+
+/**
+ * xmlTextReader:
+ *
+ * Structure for an xmlReader context.
+ */
+typedef struct _xmlTextReader xmlTextReader;
+
+/**
+ * xmlTextReaderPtr:
+ *
+ * Pointer to an xmlReader context.
+ */
+typedef xmlTextReader *xmlTextReaderPtr;
+
+/*
+ * Constructors & Destructor
+ */
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+			xmlNewTextReader	(xmlParserInputBufferPtr input,
+	                                         const char *URI);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+			xmlNewTextReaderFilename(const char *URI);
+
+XMLPUBFUN void XMLCALL
+			xmlFreeTextReader	(xmlTextReaderPtr reader);
+
+XMLPUBFUN int XMLCALL
+            xmlTextReaderSetup(xmlTextReaderPtr reader,
+                   xmlParserInputBufferPtr input, const char *URL,
+                   const char *encoding, int options);
+
+/*
+ * Iterators
+ */
+XMLPUBFUN int XMLCALL
+			xmlTextReaderRead	(xmlTextReaderPtr reader);
+
+#ifdef LIBXML_WRITER_ENABLED
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderReadInnerXml(xmlTextReaderPtr reader);
+
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderReadOuterXml(xmlTextReaderPtr reader);
+#endif
+
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderReadString	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderReadAttributeValue(xmlTextReaderPtr reader);
+
+/*
+ * Attributes of the node
+ */
+XMLPUBFUN int XMLCALL
+			xmlTextReaderAttributeCount(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderDepth	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderHasAttributes(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderHasValue(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderIsDefault	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderIsEmptyElement(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderNodeType	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderQuoteChar	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+			xmlTextReaderReadState	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+                        xmlTextReaderIsNamespaceDecl(xmlTextReaderPtr reader);
+
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstBaseUri	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstLocalName	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstName	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstNamespaceUri(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstPrefix	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstXmlLang	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstString	(xmlTextReaderPtr reader,
+						 const xmlChar *str);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstValue	(xmlTextReaderPtr reader);
+
+/*
+ * use the Const version of the routine for
+ * better performance and simpler code
+ */
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderBaseUri	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderLocalName	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderName	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderNamespaceUri(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderPrefix	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderXmlLang	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+			xmlTextReaderValue	(xmlTextReaderPtr reader);
+
+/*
+ * Methods of the XmlTextReader
+ */
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderClose		(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderGetAttributeNo	(xmlTextReaderPtr reader,
+						 int no);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderGetAttribute	(xmlTextReaderPtr reader,
+						 const xmlChar *name);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderGetAttributeNs	(xmlTextReaderPtr reader,
+						 const xmlChar *localName,
+						 const xmlChar *namespaceURI);
+XMLPUBFUN xmlParserInputBufferPtr XMLCALL
+		    xmlTextReaderGetRemainder	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlTextReaderLookupNamespace(xmlTextReaderPtr reader,
+						 const xmlChar *prefix);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToAttributeNo(xmlTextReaderPtr reader,
+						 int no);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToAttribute(xmlTextReaderPtr reader,
+						 const xmlChar *name);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToAttributeNs(xmlTextReaderPtr reader,
+						 const xmlChar *localName,
+						 const xmlChar *namespaceURI);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToFirstAttribute(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToNextAttribute(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderMoveToElement	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderNormalization	(xmlTextReaderPtr reader);
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstEncoding  (xmlTextReaderPtr reader);
+
+/*
+ * Extensions
+ */
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSetParserProp	(xmlTextReaderPtr reader,
+						 int prop,
+						 int value);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderGetParserProp	(xmlTextReaderPtr reader,
+						 int prop);
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlTextReaderCurrentNode	(xmlTextReaderPtr reader);
+
+XMLPUBFUN int XMLCALL
+            xmlTextReaderGetParserLineNumber(xmlTextReaderPtr reader);
+
+XMLPUBFUN int XMLCALL
+            xmlTextReaderGetParserColumnNumber(xmlTextReaderPtr reader);
+
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlTextReaderPreserve	(xmlTextReaderPtr reader);
+#ifdef LIBXML_PATTERN_ENABLED
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderPreservePattern(xmlTextReaderPtr reader,
+						 const xmlChar *pattern,
+						 const xmlChar **namespaces);
+#endif /* LIBXML_PATTERN_ENABLED */
+XMLPUBFUN xmlDocPtr XMLCALL
+		    xmlTextReaderCurrentDoc	(xmlTextReaderPtr reader);
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlTextReaderExpand		(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderNext		(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderNextSibling	(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderIsValid	(xmlTextReaderPtr reader);
+#ifdef LIBXML_SCHEMAS_ENABLED
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderRelaxNGValidate(xmlTextReaderPtr reader,
+						 const char *rng);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderRelaxNGValidateCtxt(xmlTextReaderPtr reader,
+						 xmlRelaxNGValidCtxtPtr ctxt,
+						 int options);
+
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderRelaxNGSetSchema(xmlTextReaderPtr reader,
+						 xmlRelaxNGPtr schema);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSchemaValidate	(xmlTextReaderPtr reader,
+						 const char *xsd);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSchemaValidateCtxt(xmlTextReaderPtr reader,
+						 xmlSchemaValidCtxtPtr ctxt,
+						 int options);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderSetSchema	(xmlTextReaderPtr reader,
+						 xmlSchemaPtr schema);
+#endif
+XMLPUBFUN const xmlChar * XMLCALL
+		    xmlTextReaderConstXmlVersion(xmlTextReaderPtr reader);
+XMLPUBFUN int XMLCALL
+		    xmlTextReaderStandalone     (xmlTextReaderPtr reader);
+
+
+/*
+ * Index lookup
+ */
+XMLPUBFUN long XMLCALL
+		xmlTextReaderByteConsumed	(xmlTextReaderPtr reader);
+
+/*
+ * New more complete APIs for simpler creation and reuse of readers
+ */
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderWalker		(xmlDocPtr doc);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForDoc		(const xmlChar * cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForFile	(const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForMemory	(const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForFd		(int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlTextReaderPtr XMLCALL
+		xmlReaderForIO		(xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN int XMLCALL
+		xmlReaderNewWalker	(xmlTextReaderPtr reader,
+					 xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewDoc		(xmlTextReaderPtr reader,
+					 const xmlChar * cur,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewFile	(xmlTextReaderPtr reader,
+					 const char *filename,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewMemory	(xmlTextReaderPtr reader,
+					 const char *buffer,
+					 int size,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewFd		(xmlTextReaderPtr reader,
+					 int fd,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN int XMLCALL
+		xmlReaderNewIO		(xmlTextReaderPtr reader,
+					 xmlInputReadCallback ioread,
+					 xmlInputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *URL,
+					 const char *encoding,
+					 int options);
+/*
+ * Error handling extensions
+ */
+typedef void *  xmlTextReaderLocatorPtr;
+
+/**
+ * xmlTextReaderErrorFunc:
+ * @arg: the user argument
+ * @msg: the message
+ * @severity: the severity of the error
+ * @locator: a locator indicating where the error occurred
+ *
+ * Signature of an error callback from a reader parser
+ */
+typedef void (XMLCALL *xmlTextReaderErrorFunc)(void *arg,
+					       const char *msg,
+					       xmlParserSeverities severity,
+					       xmlTextReaderLocatorPtr locator);
+XMLPUBFUN int XMLCALL
+	    xmlTextReaderLocatorLineNumber(xmlTextReaderLocatorPtr locator);
+XMLPUBFUN xmlChar * XMLCALL
+	    xmlTextReaderLocatorBaseURI (xmlTextReaderLocatorPtr locator);
+XMLPUBFUN void XMLCALL
+	    xmlTextReaderSetErrorHandler(xmlTextReaderPtr reader,
+					 xmlTextReaderErrorFunc f,
+					 void *arg);
+XMLPUBFUN void XMLCALL
+	    xmlTextReaderSetStructuredErrorHandler(xmlTextReaderPtr reader,
+						   xmlStructuredErrorFunc f,
+						   void *arg);
+XMLPUBFUN void XMLCALL
+	    xmlTextReaderGetErrorHandler(xmlTextReaderPtr reader,
+					 xmlTextReaderErrorFunc *f,
+					 void **arg);
+
+#endif /* LIBXML_READER_ENABLED */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __XML_XMLREADER_H__ */
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlregexp.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlregexp.h
new file mode 100644
index 0000000..7009645
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlregexp.h
@@ -0,0 +1,222 @@
+/*
+ * Summary: regular expressions handling
+ * Description: basic API for libxml regular expressions handling used
+ *              for XML Schemas and validation.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_REGEXP_H__
+#define __XML_REGEXP_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_REGEXP_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlRegexpPtr:
+ *
+ * A libxml regular expression, they can actually be far more complex
+ * thank the POSIX regex expressions.
+ */
+typedef struct _xmlRegexp xmlRegexp;
+typedef xmlRegexp *xmlRegexpPtr;
+
+/**
+ * xmlRegExecCtxtPtr:
+ *
+ * A libxml progressive regular expression evaluation context
+ */
+typedef struct _xmlRegExecCtxt xmlRegExecCtxt;
+typedef xmlRegExecCtxt *xmlRegExecCtxtPtr;
+
+#ifdef __cplusplus
+}
+#endif
+#include <libxml/tree.h>
+#include <libxml/dict.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * The POSIX like API
+ */
+XMLPUBFUN xmlRegexpPtr XMLCALL
+		    xmlRegexpCompile	(const xmlChar *regexp);
+XMLPUBFUN void XMLCALL			 xmlRegFreeRegexp(xmlRegexpPtr regexp);
+XMLPUBFUN int XMLCALL
+		    xmlRegexpExec	(xmlRegexpPtr comp,
+					 const xmlChar *value);
+XMLPUBFUN void XMLCALL
+		    xmlRegexpPrint	(FILE *output,
+					 xmlRegexpPtr regexp);
+XMLPUBFUN int XMLCALL
+		    xmlRegexpIsDeterminist(xmlRegexpPtr comp);
+
+/**
+ * xmlRegExecCallbacks:
+ * @exec: the regular expression context
+ * @token: the current token string
+ * @transdata: transition data
+ * @inputdata: input data
+ *
+ * Callback function when doing a transition in the automata
+ */
+typedef void (*xmlRegExecCallbacks) (xmlRegExecCtxtPtr exec,
+	                             const xmlChar *token,
+				     void *transdata,
+				     void *inputdata);
+
+/*
+ * The progressive API
+ */
+XMLPUBFUN xmlRegExecCtxtPtr XMLCALL
+		    xmlRegNewExecCtxt	(xmlRegexpPtr comp,
+					 xmlRegExecCallbacks callback,
+					 void *data);
+XMLPUBFUN void XMLCALL
+		    xmlRegFreeExecCtxt	(xmlRegExecCtxtPtr exec);
+XMLPUBFUN int XMLCALL
+		    xmlRegExecPushString(xmlRegExecCtxtPtr exec,
+					 const xmlChar *value,
+					 void *data);
+XMLPUBFUN int XMLCALL
+		    xmlRegExecPushString2(xmlRegExecCtxtPtr exec,
+					 const xmlChar *value,
+					 const xmlChar *value2,
+					 void *data);
+
+XMLPUBFUN int XMLCALL
+		    xmlRegExecNextValues(xmlRegExecCtxtPtr exec,
+					 int *nbval,
+					 int *nbneg,
+					 xmlChar **values,
+					 int *terminal);
+XMLPUBFUN int XMLCALL
+		    xmlRegExecErrInfo	(xmlRegExecCtxtPtr exec,
+					 const xmlChar **string,
+					 int *nbval,
+					 int *nbneg,
+					 xmlChar **values,
+					 int *terminal);
+#ifdef LIBXML_EXPR_ENABLED
+/*
+ * Formal regular expression handling
+ * Its goal is to do some formal work on content models
+ */
+
+/* expressions are used within a context */
+typedef struct _xmlExpCtxt xmlExpCtxt;
+typedef xmlExpCtxt *xmlExpCtxtPtr;
+
+XMLPUBFUN void XMLCALL
+			xmlExpFreeCtxt	(xmlExpCtxtPtr ctxt);
+XMLPUBFUN xmlExpCtxtPtr XMLCALL
+			xmlExpNewCtxt	(int maxNodes,
+					 xmlDictPtr dict);
+
+XMLPUBFUN int XMLCALL
+			xmlExpCtxtNbNodes(xmlExpCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+			xmlExpCtxtNbCons(xmlExpCtxtPtr ctxt);
+
+/* Expressions are trees but the tree is opaque */
+typedef struct _xmlExpNode xmlExpNode;
+typedef xmlExpNode *xmlExpNodePtr;
+
+typedef enum {
+    XML_EXP_EMPTY = 0,
+    XML_EXP_FORBID = 1,
+    XML_EXP_ATOM = 2,
+    XML_EXP_SEQ = 3,
+    XML_EXP_OR = 4,
+    XML_EXP_COUNT = 5
+} xmlExpNodeType;
+
+/*
+ * 2 core expressions shared by all for the empty language set
+ * and for the set with just the empty token
+ */
+XMLPUBVAR xmlExpNodePtr forbiddenExp;
+XMLPUBVAR xmlExpNodePtr emptyExp;
+
+/*
+ * Expressions are reference counted internally
+ */
+XMLPUBFUN void XMLCALL
+			xmlExpFree	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr);
+XMLPUBFUN void XMLCALL
+			xmlExpRef	(xmlExpNodePtr expr);
+
+/*
+ * constructors can be either manual or from a string
+ */
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpParse	(xmlExpCtxtPtr ctxt,
+					 const char *expr);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewAtom	(xmlExpCtxtPtr ctxt,
+					 const xmlChar *name,
+					 int len);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewOr	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr left,
+					 xmlExpNodePtr right);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewSeq	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr left,
+					 xmlExpNodePtr right);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpNewRange	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr subset,
+					 int min,
+					 int max);
+/*
+ * The really interesting APIs
+ */
+XMLPUBFUN int XMLCALL
+			xmlExpIsNillable(xmlExpNodePtr expr);
+XMLPUBFUN int XMLCALL
+			xmlExpMaxToken	(xmlExpNodePtr expr);
+XMLPUBFUN int XMLCALL
+			xmlExpGetLanguage(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 const xmlChar**langList,
+					 int len);
+XMLPUBFUN int XMLCALL
+			xmlExpGetStart	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 const xmlChar**tokList,
+					 int len);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpStringDerive(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 const xmlChar *str,
+					 int len);
+XMLPUBFUN xmlExpNodePtr XMLCALL
+			xmlExpExpDerive	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 xmlExpNodePtr sub);
+XMLPUBFUN int XMLCALL
+			xmlExpSubsume	(xmlExpCtxtPtr ctxt,
+					 xmlExpNodePtr expr,
+					 xmlExpNodePtr sub);
+XMLPUBFUN void XMLCALL
+			xmlExpDump	(xmlBufferPtr buf,
+					 xmlExpNodePtr expr);
+#endif /* LIBXML_EXPR_ENABLED */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_REGEXP_ENABLED */
+
+#endif /*__XML_REGEXP_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlsave.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlsave.h
new file mode 100644
index 0000000..fb329b2
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlsave.h
@@ -0,0 +1,88 @@
+/*
+ * Summary: the XML document serializer
+ * Description: API to save document or subtree of document
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XMLSAVE_H__
+#define __XML_XMLSAVE_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/tree.h>
+#include <libxml/encoding.h>
+#include <libxml/xmlIO.h>
+
+#ifdef LIBXML_OUTPUT_ENABLED
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlSaveOption:
+ *
+ * This is the set of XML save options that can be passed down
+ * to the xmlSaveToFd() and similar calls.
+ */
+typedef enum {
+    XML_SAVE_FORMAT     = 1<<0,	/* format save output */
+    XML_SAVE_NO_DECL    = 1<<1,	/* drop the xml declaration */
+    XML_SAVE_NO_EMPTY	= 1<<2, /* no empty tags */
+    XML_SAVE_NO_XHTML	= 1<<3, /* disable XHTML1 specific rules */
+    XML_SAVE_XHTML	= 1<<4, /* force XHTML1 specific rules */
+    XML_SAVE_AS_XML     = 1<<5, /* force XML serialization on HTML doc */
+    XML_SAVE_AS_HTML    = 1<<6, /* force HTML serialization on XML doc */
+    XML_SAVE_WSNONSIG   = 1<<7  /* format with non-significant whitespace */
+} xmlSaveOption;
+
+
+typedef struct _xmlSaveCtxt xmlSaveCtxt;
+typedef xmlSaveCtxt *xmlSaveCtxtPtr;
+
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToFd		(int fd,
+					 const char *encoding,
+					 int options);
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToFilename	(const char *filename,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToBuffer		(xmlBufferPtr buffer,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN xmlSaveCtxtPtr XMLCALL
+		xmlSaveToIO		(xmlOutputWriteCallback iowrite,
+					 xmlOutputCloseCallback ioclose,
+					 void *ioctx,
+					 const char *encoding,
+					 int options);
+
+XMLPUBFUN long XMLCALL
+		xmlSaveDoc		(xmlSaveCtxtPtr ctxt,
+					 xmlDocPtr doc);
+XMLPUBFUN long XMLCALL
+		xmlSaveTree		(xmlSaveCtxtPtr ctxt,
+					 xmlNodePtr node);
+
+XMLPUBFUN int XMLCALL
+		xmlSaveFlush		(xmlSaveCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlSaveClose		(xmlSaveCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+		xmlSaveSetEscape	(xmlSaveCtxtPtr ctxt,
+					 xmlCharEncodingOutputFunc escape);
+XMLPUBFUN int XMLCALL
+		xmlSaveSetAttrEscape	(xmlSaveCtxtPtr ctxt,
+					 xmlCharEncodingOutputFunc escape);
+#ifdef __cplusplus
+}
+#endif
+#endif /* LIBXML_OUTPUT_ENABLED */
+#endif /* __XML_XMLSAVE_H__ */
+
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlschemas.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlschemas.h
new file mode 100644
index 0000000..b90e9d1
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlschemas.h
@@ -0,0 +1,246 @@
+/*
+ * Summary: incomplete XML Schemas structure implementation
+ * Description: interface to the XML Schemas handling and schema validity
+ *              checking, it is incomplete right now.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMA_H__
+#define __XML_SCHEMA_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#include <libxml/tree.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * This error codes are obsolete; not used any more.
+ */
+typedef enum {
+    XML_SCHEMAS_ERR_OK		= 0,
+    XML_SCHEMAS_ERR_NOROOT	= 1,
+    XML_SCHEMAS_ERR_UNDECLAREDELEM,
+    XML_SCHEMAS_ERR_NOTTOPLEVEL,
+    XML_SCHEMAS_ERR_MISSING,
+    XML_SCHEMAS_ERR_WRONGELEM,
+    XML_SCHEMAS_ERR_NOTYPE,
+    XML_SCHEMAS_ERR_NOROLLBACK,
+    XML_SCHEMAS_ERR_ISABSTRACT,
+    XML_SCHEMAS_ERR_NOTEMPTY,
+    XML_SCHEMAS_ERR_ELEMCONT,
+    XML_SCHEMAS_ERR_HAVEDEFAULT,
+    XML_SCHEMAS_ERR_NOTNILLABLE,
+    XML_SCHEMAS_ERR_EXTRACONTENT,
+    XML_SCHEMAS_ERR_INVALIDATTR,
+    XML_SCHEMAS_ERR_INVALIDELEM,
+    XML_SCHEMAS_ERR_NOTDETERMINIST,
+    XML_SCHEMAS_ERR_CONSTRUCT,
+    XML_SCHEMAS_ERR_INTERNAL,
+    XML_SCHEMAS_ERR_NOTSIMPLE,
+    XML_SCHEMAS_ERR_ATTRUNKNOWN,
+    XML_SCHEMAS_ERR_ATTRINVALID,
+    XML_SCHEMAS_ERR_VALUE,
+    XML_SCHEMAS_ERR_FACET,
+    XML_SCHEMAS_ERR_,
+    XML_SCHEMAS_ERR_XXX
+} xmlSchemaValidError;
+
+/*
+* ATTENTION: Change xmlSchemaSetValidOptions's check
+* for invalid values, if adding to the validation
+* options below.
+*/
+/**
+ * xmlSchemaValidOption:
+ *
+ * This is the set of XML Schema validation options.
+ */
+typedef enum {
+    XML_SCHEMA_VAL_VC_I_CREATE			= 1<<0
+	/* Default/fixed: create an attribute node
+	* or an element's text node on the instance.
+	*/
+} xmlSchemaValidOption;
+
+/*
+    XML_SCHEMA_VAL_XSI_ASSEMBLE			= 1<<1,
+	* assemble schemata using
+	* xsi:schemaLocation and
+	* xsi:noNamespaceSchemaLocation
+*/
+
+/**
+ * The schemas related types are kept internal
+ */
+typedef struct _xmlSchema xmlSchema;
+typedef xmlSchema *xmlSchemaPtr;
+
+/**
+ * xmlSchemaValidityErrorFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of an error callback from an XSD validation
+ */
+typedef void (XMLCDECL *xmlSchemaValidityErrorFunc)
+                 (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * xmlSchemaValidityWarningFunc:
+ * @ctx: the validation context
+ * @msg: the message
+ * @...: extra arguments
+ *
+ * Signature of a warning callback from an XSD validation
+ */
+typedef void (XMLCDECL *xmlSchemaValidityWarningFunc)
+                 (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3);
+
+/**
+ * A schemas validation context
+ */
+typedef struct _xmlSchemaParserCtxt xmlSchemaParserCtxt;
+typedef xmlSchemaParserCtxt *xmlSchemaParserCtxtPtr;
+
+typedef struct _xmlSchemaValidCtxt xmlSchemaValidCtxt;
+typedef xmlSchemaValidCtxt *xmlSchemaValidCtxtPtr;
+
+/**
+ * xmlSchemaValidityLocatorFunc:
+ * @ctx: user provided context
+ * @file: returned file information
+ * @line: returned line information
+ *
+ * A schemas validation locator, a callback called by the validator.
+ * This is used when file or node information are not available
+ * to find out what file and line number are affected
+ *
+ * Returns: 0 in case of success and -1 in case of error
+ */
+
+typedef int (XMLCDECL *xmlSchemaValidityLocatorFunc) (void *ctx,
+                           const char **file, unsigned long *line);
+
+/*
+ * Interfaces for parsing.
+ */
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL
+	    xmlSchemaNewParserCtxt	(const char *URL);
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL
+	    xmlSchemaNewMemParserCtxt	(const char *buffer,
+					 int size);
+XMLPUBFUN xmlSchemaParserCtxtPtr XMLCALL
+	    xmlSchemaNewDocParserCtxt	(xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaFreeParserCtxt	(xmlSchemaParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetParserErrors	(xmlSchemaParserCtxtPtr ctxt,
+					 xmlSchemaValidityErrorFunc err,
+					 xmlSchemaValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetParserStructuredErrors(xmlSchemaParserCtxtPtr ctxt,
+					 xmlStructuredErrorFunc serror,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetParserErrors(xmlSchemaParserCtxtPtr ctxt,
+					xmlSchemaValidityErrorFunc * err,
+					xmlSchemaValidityWarningFunc * warn,
+					void **ctx);
+XMLPUBFUN int XMLCALL
+		xmlSchemaIsValid	(xmlSchemaValidCtxtPtr ctxt);
+
+XMLPUBFUN xmlSchemaPtr XMLCALL
+	    xmlSchemaParse		(xmlSchemaParserCtxtPtr ctxt);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaFree		(xmlSchemaPtr schema);
+#ifdef LIBXML_OUTPUT_ENABLED
+XMLPUBFUN void XMLCALL
+	    xmlSchemaDump		(FILE *output,
+					 xmlSchemaPtr schema);
+#endif /* LIBXML_OUTPUT_ENABLED */
+/*
+ * Interfaces for validating
+ */
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetValidErrors	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlSchemaValidityErrorFunc err,
+					 xmlSchemaValidityWarningFunc warn,
+					 void *ctx);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaSetValidStructuredErrors(xmlSchemaValidCtxtPtr ctxt,
+					 xmlStructuredErrorFunc serror,
+					 void *ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaGetValidErrors	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlSchemaValidityErrorFunc *err,
+					 xmlSchemaValidityWarningFunc *warn,
+					 void **ctx);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaSetValidOptions	(xmlSchemaValidCtxtPtr ctxt,
+					 int options);
+XMLPUBFUN void XMLCALL
+            xmlSchemaValidateSetFilename(xmlSchemaValidCtxtPtr vctxt,
+	                                 const char *filename);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidCtxtGetOptions(xmlSchemaValidCtxtPtr ctxt);
+
+XMLPUBFUN xmlSchemaValidCtxtPtr XMLCALL
+	    xmlSchemaNewValidCtxt	(xmlSchemaPtr schema);
+XMLPUBFUN void XMLCALL
+	    xmlSchemaFreeValidCtxt	(xmlSchemaValidCtxtPtr ctxt);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidateDoc	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlDocPtr instance);
+XMLPUBFUN int XMLCALL
+            xmlSchemaValidateOneElement (xmlSchemaValidCtxtPtr ctxt,
+			                 xmlNodePtr elem);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidateStream	(xmlSchemaValidCtxtPtr ctxt,
+					 xmlParserInputBufferPtr input,
+					 xmlCharEncoding enc,
+					 xmlSAXHandlerPtr sax,
+					 void *user_data);
+XMLPUBFUN int XMLCALL
+	    xmlSchemaValidateFile	(xmlSchemaValidCtxtPtr ctxt,
+					 const char * filename,
+					 int options);
+
+XMLPUBFUN xmlParserCtxtPtr XMLCALL
+	    xmlSchemaValidCtxtGetParserCtxt(xmlSchemaValidCtxtPtr ctxt);
+
+/*
+ * Interface to insert Schemas SAX validation in a SAX stream
+ */
+typedef struct _xmlSchemaSAXPlug xmlSchemaSAXPlugStruct;
+typedef xmlSchemaSAXPlugStruct *xmlSchemaSAXPlugPtr;
+
+XMLPUBFUN xmlSchemaSAXPlugPtr XMLCALL
+            xmlSchemaSAXPlug		(xmlSchemaValidCtxtPtr ctxt,
+					 xmlSAXHandlerPtr *sax,
+					 void **user_data);
+XMLPUBFUN int XMLCALL
+            xmlSchemaSAXUnplug		(xmlSchemaSAXPlugPtr plug);
+
+
+XMLPUBFUN void XMLCALL
+            xmlSchemaValidateSetLocator	(xmlSchemaValidCtxtPtr vctxt,
+					 xmlSchemaValidityLocatorFunc f,
+					 void *ctxt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* __XML_SCHEMA_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlschemastypes.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlschemastypes.h
new file mode 100644
index 0000000..35d48d4
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlschemastypes.h
@@ -0,0 +1,151 @@
+/*
+ * Summary: implementation of XML Schema Datatypes
+ * Description: module providing the XML Schema Datatypes implementation
+ *              both definition and validity checking
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+
+#ifndef __XML_SCHEMA_TYPES_H__
+#define __XML_SCHEMA_TYPES_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_SCHEMAS_ENABLED
+
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    XML_SCHEMA_WHITESPACE_UNKNOWN = 0,
+    XML_SCHEMA_WHITESPACE_PRESERVE = 1,
+    XML_SCHEMA_WHITESPACE_REPLACE = 2,
+    XML_SCHEMA_WHITESPACE_COLLAPSE = 3
+} xmlSchemaWhitespaceValueType;
+
+XMLPUBFUN void XMLCALL
+		xmlSchemaInitTypes		(void);
+XMLPUBFUN void XMLCALL
+		xmlSchemaCleanupTypes		(void);
+XMLPUBFUN xmlSchemaTypePtr XMLCALL
+		xmlSchemaGetPredefinedType	(const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidatePredefinedType	(xmlSchemaTypePtr type,
+						 const xmlChar *value,
+						 xmlSchemaValPtr *val);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValPredefTypeNode	(xmlSchemaTypePtr type,
+						 const xmlChar *value,
+						 xmlSchemaValPtr *val,
+						 xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateFacet		(xmlSchemaTypePtr base,
+						 xmlSchemaFacetPtr facet,
+						 const xmlChar *value,
+						 xmlSchemaValPtr val);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateFacetWhtsp	(xmlSchemaFacetPtr facet,
+						 xmlSchemaWhitespaceValueType fws,
+						 xmlSchemaValType valType,
+						 const xmlChar *value,
+						 xmlSchemaValPtr val,
+						 xmlSchemaWhitespaceValueType ws);
+XMLPUBFUN void XMLCALL
+		xmlSchemaFreeValue		(xmlSchemaValPtr val);
+XMLPUBFUN xmlSchemaFacetPtr XMLCALL
+		xmlSchemaNewFacet		(void);
+XMLPUBFUN int XMLCALL
+		xmlSchemaCheckFacet		(xmlSchemaFacetPtr facet,
+						 xmlSchemaTypePtr typeDecl,
+						 xmlSchemaParserCtxtPtr ctxt,
+						 const xmlChar *name);
+XMLPUBFUN void XMLCALL
+		xmlSchemaFreeFacet		(xmlSchemaFacetPtr facet);
+XMLPUBFUN int XMLCALL
+		xmlSchemaCompareValues		(xmlSchemaValPtr x,
+						 xmlSchemaValPtr y);
+XMLPUBFUN xmlSchemaTypePtr XMLCALL
+    xmlSchemaGetBuiltInListSimpleTypeItemType	(xmlSchemaTypePtr type);
+XMLPUBFUN int XMLCALL
+    xmlSchemaValidateListSimpleTypeFacet	(xmlSchemaFacetPtr facet,
+						 const xmlChar *value,
+						 unsigned long actualLen,
+						 unsigned long *expectedLen);
+XMLPUBFUN xmlSchemaTypePtr XMLCALL
+		xmlSchemaGetBuiltInType		(xmlSchemaValType type);
+XMLPUBFUN int XMLCALL
+		xmlSchemaIsBuiltInTypeFacet	(xmlSchemaTypePtr type,
+						 int facetType);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSchemaCollapseString		(const xmlChar *value);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlSchemaWhiteSpaceReplace	(const xmlChar *value);
+XMLPUBFUN unsigned long  XMLCALL
+		xmlSchemaGetFacetValueAsULong	(xmlSchemaFacetPtr facet);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateLengthFacet	(xmlSchemaTypePtr type,
+						 xmlSchemaFacetPtr facet,
+						 const xmlChar *value,
+						 xmlSchemaValPtr val,
+						 unsigned long *length);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValidateLengthFacetWhtsp(xmlSchemaFacetPtr facet,
+						  xmlSchemaValType valType,
+						  const xmlChar *value,
+						  xmlSchemaValPtr val,
+						  unsigned long *length,
+						  xmlSchemaWhitespaceValueType ws);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValPredefTypeNodeNoNorm(xmlSchemaTypePtr type,
+						 const xmlChar *value,
+						 xmlSchemaValPtr *val,
+						 xmlNodePtr node);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetCanonValue		(xmlSchemaValPtr val,
+						 const xmlChar **retValue);
+XMLPUBFUN int XMLCALL
+		xmlSchemaGetCanonValueWhtsp	(xmlSchemaValPtr val,
+						 const xmlChar **retValue,
+						 xmlSchemaWhitespaceValueType ws);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValueAppend		(xmlSchemaValPtr prev,
+						 xmlSchemaValPtr cur);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaValueGetNext		(xmlSchemaValPtr cur);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlSchemaValueGetAsString	(xmlSchemaValPtr val);
+XMLPUBFUN int XMLCALL
+		xmlSchemaValueGetAsBoolean	(xmlSchemaValPtr val);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaNewStringValue		(xmlSchemaValType type,
+						 const xmlChar *value);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaNewNOTATIONValue	(const xmlChar *name,
+						 const xmlChar *ns);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaNewQNameValue		(const xmlChar *namespaceName,
+						 const xmlChar *localName);
+XMLPUBFUN int XMLCALL
+		xmlSchemaCompareValuesWhtsp	(xmlSchemaValPtr x,
+						 xmlSchemaWhitespaceValueType xws,
+						 xmlSchemaValPtr y,
+						 xmlSchemaWhitespaceValueType yws);
+XMLPUBFUN xmlSchemaValPtr XMLCALL
+		xmlSchemaCopyValue		(xmlSchemaValPtr val);
+XMLPUBFUN xmlSchemaValType XMLCALL
+		xmlSchemaGetValType		(xmlSchemaValPtr val);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_SCHEMAS_ENABLED */
+#endif /* __XML_SCHEMA_TYPES_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlstring.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlstring.h
new file mode 100644
index 0000000..2d0b2d1
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlstring.h
@@ -0,0 +1,140 @@
+/*
+ * Summary: set of routines to process strings
+ * Description: type and interfaces needed for the internal string handling
+ *              of the library, especially UTF8 processing.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_STRING_H__
+#define __XML_STRING_H__
+
+#include <stdarg.h>
+#include <libxml/xmlversion.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * xmlChar:
+ *
+ * This is a basic byte in an UTF-8 encoded string.
+ * It's unsigned allowing to pinpoint case where char * are assigned
+ * to xmlChar * (possibly making serialization back impossible).
+ */
+typedef unsigned char xmlChar;
+
+/**
+ * BAD_CAST:
+ *
+ * Macro to cast a string to an xmlChar * when one know its safe.
+ */
+#define BAD_CAST (xmlChar *)
+
+/*
+ * xmlChar handling
+ */
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrdup                (const xmlChar *cur);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrndup               (const xmlChar *cur,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlCharStrndup           (const char *cur,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlCharStrdup            (const char *cur);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrsub                (const xmlChar *str,
+                                         int start,
+                                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+                xmlStrchr                (const xmlChar *str,
+                                         xmlChar val);
+XMLPUBFUN const xmlChar * XMLCALL
+                xmlStrstr                (const xmlChar *str,
+                                         const xmlChar *val);
+XMLPUBFUN const xmlChar * XMLCALL
+                xmlStrcasestr            (const xmlChar *str,
+                                         const xmlChar *val);
+XMLPUBFUN int XMLCALL
+                xmlStrcmp                (const xmlChar *str1,
+                                         const xmlChar *str2);
+XMLPUBFUN int XMLCALL
+                xmlStrncmp               (const xmlChar *str1,
+                                         const xmlChar *str2,
+                                         int len);
+XMLPUBFUN int XMLCALL
+                xmlStrcasecmp            (const xmlChar *str1,
+                                         const xmlChar *str2);
+XMLPUBFUN int XMLCALL
+                xmlStrncasecmp           (const xmlChar *str1,
+                                         const xmlChar *str2,
+                                         int len);
+XMLPUBFUN int XMLCALL
+                xmlStrEqual              (const xmlChar *str1,
+                                         const xmlChar *str2);
+XMLPUBFUN int XMLCALL
+                xmlStrQEqual             (const xmlChar *pref,
+                                         const xmlChar *name,
+                                         const xmlChar *str);
+XMLPUBFUN int XMLCALL
+                xmlStrlen                (const xmlChar *str);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrcat                (xmlChar *cur,
+                                         const xmlChar *add);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrncat               (xmlChar *cur,
+                                         const xmlChar *add,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+                xmlStrncatNew            (const xmlChar *str1,
+                                         const xmlChar *str2,
+                                         int len);
+XMLPUBFUN int XMLCALL
+                xmlStrPrintf             (xmlChar *buf,
+                                         int len,
+                                         const char *msg,
+                                         ...) LIBXML_ATTR_FORMAT(3,4);
+XMLPUBFUN int XMLCALL
+                xmlStrVPrintf                (xmlChar *buf,
+                                         int len,
+                                         const char *msg,
+                                         va_list ap) LIBXML_ATTR_FORMAT(3,0);
+
+XMLPUBFUN int XMLCALL
+        xmlGetUTF8Char                   (const unsigned char *utf,
+                                         int *len);
+XMLPUBFUN int XMLCALL
+        xmlCheckUTF8                     (const unsigned char *utf);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Strsize                   (const xmlChar *utf,
+                                         int len);
+XMLPUBFUN xmlChar * XMLCALL
+        xmlUTF8Strndup                   (const xmlChar *utf,
+                                         int len);
+XMLPUBFUN const xmlChar * XMLCALL
+        xmlUTF8Strpos                    (const xmlChar *utf,
+                                         int pos);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Strloc                    (const xmlChar *utf,
+                                         const xmlChar *utfchar);
+XMLPUBFUN xmlChar * XMLCALL
+        xmlUTF8Strsub                    (const xmlChar *utf,
+                                         int start,
+                                         int len);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Strlen                    (const xmlChar *utf);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Size                      (const xmlChar *utf);
+XMLPUBFUN int XMLCALL
+        xmlUTF8Charcmp                   (const xmlChar *utf1,
+                                         const xmlChar *utf2);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __XML_STRING_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlunicode.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlunicode.h
new file mode 100644
index 0000000..01ac8b6
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlunicode.h
@@ -0,0 +1,202 @@
+/*
+ * Summary: Unicode character APIs
+ * Description: API for the Unicode character APIs
+ *
+ * This file is automatically generated from the
+ * UCS description files of the Unicode Character Database
+ * http://www.unicode.org/Public/4.0-Update1/UCD-4.0.1.html
+ * using the genUnicode.py Python script.
+ *
+ * Generation date: Mon Mar 27 11:09:52 2006
+ * Sources: Blocks-4.0.1.txt UnicodeData-4.0.1.txt
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_UNICODE_H__
+#define __XML_UNICODE_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_UNICODE_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+XMLPUBFUN int XMLCALL xmlUCSIsAegeanNumbers	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsAlphabeticPresentationForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArabic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArabicPresentationFormsA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArabicPresentationFormsB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArmenian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsArrows	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBasicLatin	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBengali	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBlockElements	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBopomofo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBopomofoExtended	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBoxDrawing	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBraillePatterns	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsBuhid	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsByzantineMusicalSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibility	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibilityForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibilityIdeographs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKCompatibilityIdeographsSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKRadicalsSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKSymbolsandPunctuation	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKUnifiedIdeographs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKUnifiedIdeographsExtensionA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCJKUnifiedIdeographsExtensionB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCherokee	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningDiacriticalMarks	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningDiacriticalMarksforSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningHalfMarks	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCombiningMarksforSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsControlPictures	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCurrencySymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCypriotSyllabary	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCyrillic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCyrillicSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsDeseret	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsDevanagari	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsDingbats	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsEnclosedAlphanumerics	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsEnclosedCJKLettersandMonths	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsEthiopic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGeneralPunctuation	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGeometricShapes	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGeorgian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGothic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGreek	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGreekExtended	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGreekandCoptic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGujarati	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsGurmukhi	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHalfwidthandFullwidthForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHangulCompatibilityJamo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHangulJamo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHangulSyllables	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHanunoo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHebrew	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHighPrivateUseSurrogates	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHighSurrogates	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsHiragana	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsIPAExtensions	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsIdeographicDescriptionCharacters	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKanbun	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKangxiRadicals	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKannada	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKatakana	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKatakanaPhoneticExtensions	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKhmer	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsKhmerSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLao	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatin1Supplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatinExtendedA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatinExtendedB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLatinExtendedAdditional	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLetterlikeSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLimbu	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLinearBIdeograms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLinearBSyllabary	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsLowSurrogates	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMalayalam	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMathematicalAlphanumericSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMathematicalOperators	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousMathematicalSymbolsA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousMathematicalSymbolsB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousSymbolsandArrows	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMiscellaneousTechnical	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMongolian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMusicalSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsMyanmar	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsNumberForms	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOgham	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOldItalic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOpticalCharacterRecognition	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOriya	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsOsmanya	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsPhoneticExtensions	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsPrivateUse	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsPrivateUseArea	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsRunic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsShavian	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSinhala	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSmallFormVariants	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSpacingModifierLetters	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSpecials	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSuperscriptsandSubscripts	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementalArrowsA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementalArrowsB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementalMathematicalOperators	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementaryPrivateUseAreaA	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSupplementaryPrivateUseAreaB	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsSyriac	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTagalog	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTagbanwa	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTags	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTaiLe	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTaiXuanJingSymbols	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTamil	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTelugu	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsThaana	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsThai	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsTibetan	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsUgaritic	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsUnifiedCanadianAboriginalSyllabics	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsVariationSelectors	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsVariationSelectorsSupplement	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsYiRadicals	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsYiSyllables	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsYijingHexagramSymbols	(int code);
+
+XMLPUBFUN int XMLCALL xmlUCSIsBlock	(int code, const char *block);
+
+XMLPUBFUN int XMLCALL xmlUCSIsCatC	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCf	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatCs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatL	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLl	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLm	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLt	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatLu	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatM	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatMc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatMe	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatMn	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatN	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatNd	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatNl	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatNo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatP	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPd	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPe	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPf	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPi	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatPs	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatS	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSc	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSk	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSm	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatSo	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZ	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZl	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZp	(int code);
+XMLPUBFUN int XMLCALL xmlUCSIsCatZs	(int code);
+
+XMLPUBFUN int XMLCALL xmlUCSIsCat	(int code, const char *cat);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_UNICODE_ENABLED */
+
+#endif /* __XML_UNICODE_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlversion.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlversion.h
new file mode 100644
index 0000000..7f20363
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlversion.h
@@ -0,0 +1,485 @@
+/*
+ * Summary: compile-time version information
+ * Description: compile-time version information for the XML library
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_VERSION_H__
+#define __XML_VERSION_H__
+
+#include <libxml/xmlexports.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * use those to be sure nothing nasty will happen if
+ * your library and includes mismatch
+ */
+#ifndef LIBXML2_COMPILING_MSCCDEF
+XMLPUBFUN void XMLCALL xmlCheckVersion(int version);
+#endif /* LIBXML2_COMPILING_MSCCDEF */
+
+/**
+ * LIBXML_DOTTED_VERSION:
+ *
+ * the version string like "1.2.3"
+ */
+#define LIBXML_DOTTED_VERSION "2.9.10"
+
+/**
+ * LIBXML_VERSION:
+ *
+ * the version number: 1.2.3 value is 10203
+ */
+#define LIBXML_VERSION 209010
+
+/**
+ * LIBXML_VERSION_STRING:
+ *
+ * the version number string, 1.2.3 value is "10203"
+ */
+#define LIBXML_VERSION_STRING "209010"
+
+/**
+ * LIBXML_VERSION_EXTRA:
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define LIBXML_VERSION_EXTRA ""
+
+/**
+ * LIBXML_TEST_VERSION:
+ *
+ * Macro to check that the libxml version in use is compatible with
+ * the version the software has been compiled against
+ */
+#define LIBXML_TEST_VERSION xmlCheckVersion(209010);
+
+#ifndef VMS
+#if 0
+/**
+ * WITH_TRIO:
+ *
+ * defined if the trio support need to be configured in
+ */
+#define WITH_TRIO
+#else
+/**
+ * WITHOUT_TRIO:
+ *
+ * defined if the trio support should not be configured in
+ */
+#define WITHOUT_TRIO
+#endif
+#else /* VMS */
+/**
+ * WITH_TRIO:
+ *
+ * defined if the trio support need to be configured in
+ */
+#define WITH_TRIO 1
+#endif /* VMS */
+
+/**
+ * LIBXML_THREAD_ENABLED:
+ *
+ * Whether the thread support is configured in
+ */
+#if 1
+#define LIBXML_THREAD_ENABLED
+#endif
+
+/**
+ * LIBXML_THREAD_ALLOC_ENABLED:
+ *
+ * Whether the allocation hooks are per-thread
+ */
+#if 0
+#define LIBXML_THREAD_ALLOC_ENABLED
+#endif
+
+/**
+ * LIBXML_TREE_ENABLED:
+ *
+ * Whether the DOM like tree manipulation API support is configured in
+ */
+#if 1
+#define LIBXML_TREE_ENABLED
+#endif
+
+/**
+ * LIBXML_OUTPUT_ENABLED:
+ *
+ * Whether the serialization/saving support is configured in
+ */
+#if 1
+#define LIBXML_OUTPUT_ENABLED
+#endif
+
+/**
+ * LIBXML_PUSH_ENABLED:
+ *
+ * Whether the push parsing interfaces are configured in
+ */
+#if 1
+#define LIBXML_PUSH_ENABLED
+#endif
+
+/**
+ * LIBXML_READER_ENABLED:
+ *
+ * Whether the xmlReader parsing interface is configured in
+ */
+#if 1
+#define LIBXML_READER_ENABLED
+#endif
+
+/**
+ * LIBXML_PATTERN_ENABLED:
+ *
+ * Whether the xmlPattern node selection interface is configured in
+ */
+#if 1
+#define LIBXML_PATTERN_ENABLED
+#endif
+
+/**
+ * LIBXML_WRITER_ENABLED:
+ *
+ * Whether the xmlWriter saving interface is configured in
+ */
+#if 1
+#define LIBXML_WRITER_ENABLED
+#endif
+
+/**
+ * LIBXML_SAX1_ENABLED:
+ *
+ * Whether the older SAX1 interface is configured in
+ */
+#if 1
+#define LIBXML_SAX1_ENABLED
+#endif
+
+/**
+ * LIBXML_FTP_ENABLED:
+ *
+ * Whether the FTP support is configured in
+ */
+#if 1
+#define LIBXML_FTP_ENABLED
+#endif
+
+/**
+ * LIBXML_HTTP_ENABLED:
+ *
+ * Whether the HTTP support is configured in
+ */
+#if 1
+#define LIBXML_HTTP_ENABLED
+#endif
+
+/**
+ * LIBXML_VALID_ENABLED:
+ *
+ * Whether the DTD validation support is configured in
+ */
+#if 1
+#define LIBXML_VALID_ENABLED
+#endif
+
+/**
+ * LIBXML_HTML_ENABLED:
+ *
+ * Whether the HTML support is configured in
+ */
+#if 1
+#define LIBXML_HTML_ENABLED
+#endif
+
+/**
+ * LIBXML_LEGACY_ENABLED:
+ *
+ * Whether the deprecated APIs are compiled in for compatibility
+ */
+#if 1
+#define LIBXML_LEGACY_ENABLED
+#endif
+
+/**
+ * LIBXML_C14N_ENABLED:
+ *
+ * Whether the Canonicalization support is configured in
+ */
+#if 1
+#define LIBXML_C14N_ENABLED
+#endif
+
+/**
+ * LIBXML_CATALOG_ENABLED:
+ *
+ * Whether the Catalog support is configured in
+ */
+#if 1
+#define LIBXML_CATALOG_ENABLED
+#endif
+
+/**
+ * LIBXML_DOCB_ENABLED:
+ *
+ * Whether the SGML Docbook support is configured in
+ */
+#if 1
+#define LIBXML_DOCB_ENABLED
+#endif
+
+/**
+ * LIBXML_XPATH_ENABLED:
+ *
+ * Whether XPath is configured in
+ */
+#if 1
+#define LIBXML_XPATH_ENABLED
+#endif
+
+/**
+ * LIBXML_XPTR_ENABLED:
+ *
+ * Whether XPointer is configured in
+ */
+#if 1
+#define LIBXML_XPTR_ENABLED
+#endif
+
+/**
+ * LIBXML_XINCLUDE_ENABLED:
+ *
+ * Whether XInclude is configured in
+ */
+#if 1
+#define LIBXML_XINCLUDE_ENABLED
+#endif
+
+/**
+ * LIBXML_ICONV_ENABLED:
+ *
+ * Whether iconv support is available
+ */
+#if 0
+#define LIBXML_ICONV_ENABLED
+#endif
+
+/**
+ * LIBXML_ICU_ENABLED:
+ *
+ * Whether icu support is available
+ */
+#if 0
+#define LIBXML_ICU_ENABLED
+#endif
+
+/**
+ * LIBXML_ISO8859X_ENABLED:
+ *
+ * Whether ISO-8859-* support is made available in case iconv is not
+ */
+#if 1
+#define LIBXML_ISO8859X_ENABLED
+#endif
+
+/**
+ * LIBXML_DEBUG_ENABLED:
+ *
+ * Whether Debugging module is configured in
+ */
+#if 1
+#define LIBXML_DEBUG_ENABLED
+#endif
+
+/**
+ * DEBUG_MEMORY_LOCATION:
+ *
+ * Whether the memory debugging is configured in
+ */
+#if 0
+#define DEBUG_MEMORY_LOCATION
+#endif
+
+/**
+ * LIBXML_DEBUG_RUNTIME:
+ *
+ * Whether the runtime debugging is configured in
+ */
+#if 0
+#define LIBXML_DEBUG_RUNTIME
+#endif
+
+/**
+ * LIBXML_UNICODE_ENABLED:
+ *
+ * Whether the Unicode related interfaces are compiled in
+ */
+#if 1
+#define LIBXML_UNICODE_ENABLED
+#endif
+
+/**
+ * LIBXML_REGEXP_ENABLED:
+ *
+ * Whether the regular expressions interfaces are compiled in
+ */
+#if 1
+#define LIBXML_REGEXP_ENABLED
+#endif
+
+/**
+ * LIBXML_AUTOMATA_ENABLED:
+ *
+ * Whether the automata interfaces are compiled in
+ */
+#if 1
+#define LIBXML_AUTOMATA_ENABLED
+#endif
+
+/**
+ * LIBXML_EXPR_ENABLED:
+ *
+ * Whether the formal expressions interfaces are compiled in
+ *
+ * This code is unused and disabled unconditionally for now.
+ */
+#if 0
+#define LIBXML_EXPR_ENABLED
+#endif
+
+/**
+ * LIBXML_SCHEMAS_ENABLED:
+ *
+ * Whether the Schemas validation interfaces are compiled in
+ */
+#if 1
+#define LIBXML_SCHEMAS_ENABLED
+#endif
+
+/**
+ * LIBXML_SCHEMATRON_ENABLED:
+ *
+ * Whether the Schematron validation interfaces are compiled in
+ */
+#if 1
+#define LIBXML_SCHEMATRON_ENABLED
+#endif
+
+/**
+ * LIBXML_MODULES_ENABLED:
+ *
+ * Whether the module interfaces are compiled in
+ */
+#if 1
+#define LIBXML_MODULES_ENABLED
+/**
+ * LIBXML_MODULE_EXTENSION:
+ *
+ * the string suffix used by dynamic modules (usually shared libraries)
+ */
+#define LIBXML_MODULE_EXTENSION ".dll" 
+#endif
+
+/**
+ * LIBXML_ZLIB_ENABLED:
+ *
+ * Whether the Zlib support is compiled in
+ */
+#if 0
+#define LIBXML_ZLIB_ENABLED
+#endif
+
+/**
+ * LIBXML_LZMA_ENABLED:
+ *
+ * Whether the Lzma support is compiled in
+ */
+#if 0
+#define LIBXML_LZMA_ENABLED
+#endif
+
+#ifdef __GNUC__
+
+/**
+ * ATTRIBUTE_UNUSED:
+ *
+ * Macro used to signal to GCC unused function parameters
+ */
+
+#ifndef ATTRIBUTE_UNUSED
+# if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
+#  define ATTRIBUTE_UNUSED __attribute__((unused))
+# else
+#  define ATTRIBUTE_UNUSED
+# endif
+#endif
+
+/**
+ * LIBXML_ATTR_ALLOC_SIZE:
+ *
+ * Macro used to indicate to GCC this is an allocator function
+ */
+
+#ifndef LIBXML_ATTR_ALLOC_SIZE
+# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))))
+#  define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
+# else
+#  define LIBXML_ATTR_ALLOC_SIZE(x)
+# endif
+#else
+# define LIBXML_ATTR_ALLOC_SIZE(x)
+#endif
+
+/**
+ * LIBXML_ATTR_FORMAT:
+ *
+ * Macro used to indicate to GCC the parameter are printf like
+ */
+
+#ifndef LIBXML_ATTR_FORMAT
+# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
+#  define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
+# else
+#  define LIBXML_ATTR_FORMAT(fmt,args)
+# endif
+#else
+# define LIBXML_ATTR_FORMAT(fmt,args)
+#endif
+
+#else /* ! __GNUC__ */
+/**
+ * ATTRIBUTE_UNUSED:
+ *
+ * Macro used to signal to GCC unused function parameters
+ */
+#define ATTRIBUTE_UNUSED
+/**
+ * LIBXML_ATTR_ALLOC_SIZE:
+ *
+ * Macro used to indicate to GCC this is an allocator function
+ */
+#define LIBXML_ATTR_ALLOC_SIZE(x)
+/**
+ * LIBXML_ATTR_FORMAT:
+ *
+ * Macro used to indicate to GCC the parameter are printf like
+ */
+#define LIBXML_ATTR_FORMAT(fmt,args)
+#endif /* __GNUC__ */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif
+
+
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlwin32version.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlwin32version.h
new file mode 100644
index 0000000..da6e42b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlwin32version.h
@@ -0,0 +1,322 @@
+/*
+ * Summary: compile-time version information on Windows
+ * Description: compile-time version information for the XML library
+ *              when compiled on the Windows platform
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_VERSION_H__
+#define __XML_VERSION_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * use those to be sure nothing nasty will happen if
+ * your library and includes mismatch
+ */
+#ifndef LIBXML2_COMPILING_MSCCDEF
+extern void xmlCheckVersion(int version);
+#endif /* LIBXML2_COMPILING_MSCCDEF */
+
+/**
+ * LIBXML_DOTTED_VERSION:
+ *
+ * the version string like "1.2.3"
+ */
+#define LIBXML_DOTTED_VERSION "2.9.10"
+
+/**
+ * LIBXML_VERSION:
+ *
+ * the version number: 1.2.3 value is 1002003
+ */
+#define LIBXML_VERSION 209010
+
+/**
+ * LIBXML_VERSION_STRING:
+ *
+ * the version number string, 1.2.3 value is "1002003"
+ */
+#define LIBXML_VERSION_STRING "209010"
+
+/**
+ * LIBXML_VERSION_EXTRA:
+ *
+ * extra version information, used to show a CVS compilation
+ */
+#define LIBXML_VERSION_EXTRA "-win32"
+
+/**
+ * LIBXML_TEST_VERSION:
+ *
+ * Macro to check that the libxml version in use is compatible with
+ * the version the software has been compiled against
+ */
+#define LIBXML_TEST_VERSION xmlCheckVersion(209010);
+
+#if 0
+/**
+ * WITH_TRIO:
+ *
+ * defined if the trio support need to be configured in
+ */
+#define WITH_TRIO
+#else
+/**
+ * WITHOUT_TRIO:
+ *
+ * defined if the trio support should not be configured in
+ */
+#define WITHOUT_TRIO
+#endif
+
+/**
+ * LIBXML_THREAD_ENABLED:
+ *
+ * Whether the thread support is configured in
+ */
+#if 0
+#define LIBXML_THREAD_ENABLED
+#endif
+
+/**
+ * LIBXML_FTP_ENABLED:
+ *
+ * Whether the FTP support is configured in
+ */
+#if 1
+#define LIBXML_FTP_ENABLED
+#endif
+
+/**
+ * LIBXML_HTTP_ENABLED:
+ *
+ * Whether the HTTP support is configured in
+ */
+#if 1
+#define LIBXML_HTTP_ENABLED
+#endif
+
+/**
+ * LIBXML_HTML_ENABLED:
+ *
+ * Whether the HTML support is configured in
+ */
+#if 1
+#define LIBXML_HTML_ENABLED
+#endif
+
+/**
+ * LIBXML_CATALOG_ENABLED:
+ *
+ * Whether the Catalog support is configured in
+ */
+#if 1
+#define LIBXML_CATALOG_ENABLED
+#endif
+
+/**
+ * LIBXML_DOCB_ENABLED:
+ *
+ * Whether the SGML Docbook support is configured in
+ */
+#if 1
+#define LIBXML_DOCB_ENABLED
+#endif
+
+/**
+ * LIBXML_XPATH_ENABLED:
+ *
+ * Whether XPath is configured in
+ */
+#if 1
+#define LIBXML_XPATH_ENABLED
+#endif
+
+/**
+ * LIBXML_XPTR_ENABLED:
+ *
+ * Whether XPointer is configured in
+ */
+#if 1
+#define LIBXML_XPTR_ENABLED
+#endif
+
+/**
+ * LIBXML_C14N_ENABLED:
+ *
+ * Whether the Canonicalization support is configured in
+ */
+#if 0
+#define LIBXML_C14N_ENABLED
+#endif
+
+/**
+ * LIBXML_XINCLUDE_ENABLED:
+ *
+ * Whether XInclude is configured in
+ */
+#if 1
+#define LIBXML_XINCLUDE_ENABLED
+#endif
+
+/**
+ * LIBXML_SCHEMATRON_ENABLED:
+ *
+ * Whether the Schematron validation interfaces are compiled in
+ */
+#if 1
+#define LIBXML_SCHEMATRON_ENABLED
+#endif
+
+/**
+ * LIBXML_ICONV_ENABLED:
+ *
+ * Whether iconv support is available
+ */
+#if 0
+#define LIBXML_ICONV_ENABLED
+#endif
+
+/**
+ * LIBXML_ISO8859X_ENABLED:
+ *
+ * Whether ISO-8859-* support is made available in case iconv is not
+ */
+#if 1
+#define LIBXML_ISO8859X_ENABLED
+#endif
+
+/**
+ * LIBXML_DEBUG_ENABLED:
+ *
+ * Whether Debugging module is configured in
+ */
+#if 1
+#define LIBXML_DEBUG_ENABLED
+#endif
+
+/**
+ * DEBUG_MEMORY_LOCATION:
+ *
+ * Whether the memory debugging is configured in
+ */
+#if 0
+#define DEBUG_MEMORY_LOCATION
+#endif
+
+/**
+ * LIBXML_DEBUG_RUNTIME:
+ *
+ * Whether the runtime debugging is configured in
+ */
+#if 0
+#define LIBXML_DEBUG_RUNTIME
+#endif
+
+/**
+ * LIBXML_DLL_IMPORT:
+ *
+ * Used on Windows (MS C compiler only) to declare a variable as 
+ * imported from the library. This macro should be empty when compiling
+ * libxml itself. It should expand to __declspec(dllimport)
+ * when the client code includes this header, and that only if the client
+ * links dynamically against libxml.
+ * For this to work, we need three macros. One tells us which compiler is
+ * being used and luckily the compiler defines such a thing: _MSC_VER. The
+ * second macro tells us if we are compiling libxml or the client code and
+ * we define the macro IN_LIBXML on the compiler's command line for this 
+ * purpose. The third macro, LIBXML_STATIC, must be defined by any client 
+ * code which links against libxml statically. 
+ */
+#ifndef LIBXML_DLL_IMPORT
+#if defined(_MSC_VER) && !defined(IN_LIBXML) && !defined(LIBXML_STATIC)
+#define LIBXML_DLL_IMPORT __declspec(dllimport)
+#else
+#define LIBXML_DLL_IMPORT
+#endif
+#endif
+
+#ifdef __GNUC__
+
+/**
+ * ATTRIBUTE_UNUSED:
+ *
+ * Macro used to signal to GCC unused function parameters
+ */
+
+#ifndef ATTRIBUTE_UNUSED
+#define ATTRIBUTE_UNUSED
+#endif
+
+/**
+ * ATTRIBUTE_ALLOC_SIZE:
+ *
+ * Macro used to indicate to GCC this is an allocator function
+ */
+
+#ifndef ATTRIBUTE_ALLOC_SIZE
+# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))
+#  define ATTRIBUTE_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
+# else
+#  define ATTRIBUTE_ALLOC_SIZE(x)
+# endif
+#else
+# define ATTRIBUTE_ALLOC_SIZE(x)
+#endif
+
+/**
+ * LIBXML_ATTR_FORMAT:
+ *
+ * Macro used to indicate to GCC the parameter are printf like
+ */
+
+#ifndef LIBXML_ATTR_FORMAT
+# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
+#  define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
+# else
+#  define LIBXML_ATTR_FORMAT(fmt,args)
+# endif
+#else
+# define LIBXML_ATTR_FORMAT(fmt,args)
+#endif
+
+#else /* !__GNUC__ */
+#define ATTRIBUTE_UNUSED
+#define LIBXML_ATTR_FORMAT(fmt,args)
+#define ATTRIBUTE_ALLOC_SIZE(x)
+#endif /* __GNUC__ */
+
+/*
+ * #pragma comment(lib, "iconv.lib")
+ *
+ * pragma understood my MS compiler which enables a conditional link with
+ * iconv.
+ */
+#ifdef _MSC_VER
+#if defined LIBXML_ICONV_ENABLED && !defined LIBXML2_COMPILING_MSCCDEF
+#pragma comment(lib, "iconv.lib")
+#endif
+#endif
+
+/*
+ * #pragma comment(lib, "kernel32.lib")
+ *
+ * pragma understood my MS compiler which enables a conditional link with
+ * kernel32.
+ */
+#ifdef _MSC_VER
+#if defined LIBXML_MODULES_ENABLED
+#pragma comment(lib, "kernel32.lib")
+#endif
+#endif
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlwriter.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlwriter.h
new file mode 100644
index 0000000..dd5add3
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xmlwriter.h
@@ -0,0 +1,488 @@
+/*
+ * Summary: text writing API for XML
+ * Description: text writing API for XML
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Alfred Mickautsch <alfred@mickautsch.de>
+ */
+
+#ifndef __XML_XMLWRITER_H__
+#define __XML_XMLWRITER_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_WRITER_ENABLED
+
+#include <stdarg.h>
+#include <libxml/xmlIO.h>
+#include <libxml/list.h>
+#include <libxml/xmlstring.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+    typedef struct _xmlTextWriter xmlTextWriter;
+    typedef xmlTextWriter *xmlTextWriterPtr;
+
+/*
+ * Constructors & Destructor
+ */
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriter(xmlOutputBufferPtr out);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterFilename(const char *uri, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterMemory(xmlBufferPtr buf, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterPushParser(xmlParserCtxtPtr ctxt, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterDoc(xmlDocPtr * doc, int compression);
+    XMLPUBFUN xmlTextWriterPtr XMLCALL
+        xmlNewTextWriterTree(xmlDocPtr doc, xmlNodePtr node,
+                             int compression);
+    XMLPUBFUN void XMLCALL xmlFreeTextWriter(xmlTextWriterPtr writer);
+
+/*
+ * Functions
+ */
+
+
+/*
+ * Document
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDocument(xmlTextWriterPtr writer,
+                                   const char *version,
+                                   const char *encoding,
+                                   const char *standalone);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDocument(xmlTextWriterPtr
+                                                   writer);
+
+/*
+ * Comments
+ */
+    XMLPUBFUN int XMLCALL xmlTextWriterStartComment(xmlTextWriterPtr
+                                                    writer);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndComment(xmlTextWriterPtr writer);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatComment(xmlTextWriterPtr writer,
+                                        const char *format, ...)
+					LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatComment(xmlTextWriterPtr writer,
+                                         const char *format,
+                                         va_list argptr)
+					 LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteComment(xmlTextWriterPtr
+                                                    writer,
+                                                    const xmlChar *
+                                                    content);
+
+/*
+ * Elements
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartElement(xmlTextWriterPtr writer,
+                                  const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterStartElementNS(xmlTextWriterPtr
+                                                      writer,
+                                                      const xmlChar *
+                                                      prefix,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      namespaceURI);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndElement(xmlTextWriterPtr writer);
+    XMLPUBFUN int XMLCALL xmlTextWriterFullEndElement(xmlTextWriterPtr
+                                                      writer);
+
+/*
+ * Elements conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatElement(xmlTextWriterPtr writer,
+                                        const xmlChar * name,
+                                        const char *format, ...)
+					LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatElement(xmlTextWriterPtr writer,
+                                         const xmlChar * name,
+                                         const char *format,
+                                         va_list argptr)
+					 LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteElement(xmlTextWriterPtr
+                                                    writer,
+                                                    const xmlChar * name,
+                                                    const xmlChar *
+                                                    content);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatElementNS(xmlTextWriterPtr writer,
+                                          const xmlChar * prefix,
+                                          const xmlChar * name,
+                                          const xmlChar * namespaceURI,
+                                          const char *format, ...)
+					  LIBXML_ATTR_FORMAT(5,6);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatElementNS(xmlTextWriterPtr writer,
+                                           const xmlChar * prefix,
+                                           const xmlChar * name,
+                                           const xmlChar * namespaceURI,
+                                           const char *format,
+                                           va_list argptr)
+					   LIBXML_ATTR_FORMAT(5,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteElementNS(xmlTextWriterPtr
+                                                      writer,
+                                                      const xmlChar *
+                                                      prefix,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      namespaceURI,
+                                                      const xmlChar *
+                                                      content);
+
+/*
+ * Text
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatRaw(xmlTextWriterPtr writer,
+                                    const char *format, ...)
+				    LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatRaw(xmlTextWriterPtr writer,
+                                     const char *format, va_list argptr)
+				     LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteRawLen(xmlTextWriterPtr writer,
+                                 const xmlChar * content, int len);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteRaw(xmlTextWriterPtr writer,
+                              const xmlChar * content);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteFormatString(xmlTextWriterPtr
+                                                         writer,
+                                                         const char
+                                                         *format, ...)
+							 LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteVFormatString(xmlTextWriterPtr
+                                                          writer,
+                                                          const char
+                                                          *format,
+                                                          va_list argptr)
+							  LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteString(xmlTextWriterPtr writer,
+                                                   const xmlChar *
+                                                   content);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteBase64(xmlTextWriterPtr writer,
+                                                   const char *data,
+                                                   int start, int len);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteBinHex(xmlTextWriterPtr writer,
+                                                   const char *data,
+                                                   int start, int len);
+
+/*
+ * Attributes
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartAttribute(xmlTextWriterPtr writer,
+                                    const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterStartAttributeNS(xmlTextWriterPtr
+                                                        writer,
+                                                        const xmlChar *
+                                                        prefix,
+                                                        const xmlChar *
+                                                        name,
+                                                        const xmlChar *
+                                                        namespaceURI);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndAttribute(xmlTextWriterPtr
+                                                    writer);
+
+/*
+ * Attributes conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatAttribute(xmlTextWriterPtr writer,
+                                          const xmlChar * name,
+                                          const char *format, ...)
+					  LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatAttribute(xmlTextWriterPtr writer,
+                                           const xmlChar * name,
+                                           const char *format,
+                                           va_list argptr)
+					   LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteAttribute(xmlTextWriterPtr
+                                                      writer,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      content);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatAttributeNS(xmlTextWriterPtr writer,
+                                            const xmlChar * prefix,
+                                            const xmlChar * name,
+                                            const xmlChar * namespaceURI,
+                                            const char *format, ...)
+					    LIBXML_ATTR_FORMAT(5,6);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatAttributeNS(xmlTextWriterPtr writer,
+                                             const xmlChar * prefix,
+                                             const xmlChar * name,
+                                             const xmlChar * namespaceURI,
+                                             const char *format,
+                                             va_list argptr)
+					     LIBXML_ATTR_FORMAT(5,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteAttributeNS(xmlTextWriterPtr
+                                                        writer,
+                                                        const xmlChar *
+                                                        prefix,
+                                                        const xmlChar *
+                                                        name,
+                                                        const xmlChar *
+                                                        namespaceURI,
+                                                        const xmlChar *
+                                                        content);
+
+/*
+ * PI's
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartPI(xmlTextWriterPtr writer,
+                             const xmlChar * target);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndPI(xmlTextWriterPtr writer);
+
+/*
+ * PI conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatPI(xmlTextWriterPtr writer,
+                                   const xmlChar * target,
+                                   const char *format, ...)
+				   LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatPI(xmlTextWriterPtr writer,
+                                    const xmlChar * target,
+                                    const char *format, va_list argptr)
+				    LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWritePI(xmlTextWriterPtr writer,
+                             const xmlChar * target,
+                             const xmlChar * content);
+
+/**
+ * xmlTextWriterWriteProcessingInstruction:
+ *
+ * This macro maps to xmlTextWriterWritePI
+ */
+#define xmlTextWriterWriteProcessingInstruction xmlTextWriterWritePI
+
+/*
+ * CDATA
+ */
+    XMLPUBFUN int XMLCALL xmlTextWriterStartCDATA(xmlTextWriterPtr writer);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndCDATA(xmlTextWriterPtr writer);
+
+/*
+ * CDATA conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatCDATA(xmlTextWriterPtr writer,
+                                      const char *format, ...)
+				      LIBXML_ATTR_FORMAT(2,3);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatCDATA(xmlTextWriterPtr writer,
+                                       const char *format, va_list argptr)
+				       LIBXML_ATTR_FORMAT(2,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteCDATA(xmlTextWriterPtr writer,
+                                const xmlChar * content);
+
+/*
+ * DTD
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTD(xmlTextWriterPtr writer,
+                              const xmlChar * name,
+                              const xmlChar * pubid,
+                              const xmlChar * sysid);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTD(xmlTextWriterPtr writer);
+
+/*
+ * DTD conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTD(xmlTextWriterPtr writer,
+                                    const xmlChar * name,
+                                    const xmlChar * pubid,
+                                    const xmlChar * sysid,
+                                    const char *format, ...)
+				    LIBXML_ATTR_FORMAT(5,6);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTD(xmlTextWriterPtr writer,
+                                     const xmlChar * name,
+                                     const xmlChar * pubid,
+                                     const xmlChar * sysid,
+                                     const char *format, va_list argptr)
+				     LIBXML_ATTR_FORMAT(5,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTD(xmlTextWriterPtr writer,
+                              const xmlChar * name,
+                              const xmlChar * pubid,
+                              const xmlChar * sysid,
+                              const xmlChar * subset);
+
+/**
+ * xmlTextWriterWriteDocType:
+ *
+ * this macro maps to xmlTextWriterWriteDTD
+ */
+#define xmlTextWriterWriteDocType xmlTextWriterWriteDTD
+
+/*
+ * DTD element definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTDElement(xmlTextWriterPtr writer,
+                                     const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTDElement(xmlTextWriterPtr
+                                                     writer);
+
+/*
+ * DTD element definition conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTDElement(xmlTextWriterPtr writer,
+                                           const xmlChar * name,
+                                           const char *format, ...)
+					   LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTDElement(xmlTextWriterPtr writer,
+                                            const xmlChar * name,
+                                            const char *format,
+                                            va_list argptr)
+					    LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDElement(xmlTextWriterPtr
+                                                       writer,
+                                                       const xmlChar *
+                                                       name,
+                                                       const xmlChar *
+                                                       content);
+
+/*
+ * DTD attribute list definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTDAttlist(xmlTextWriterPtr writer,
+                                     const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTDAttlist(xmlTextWriterPtr
+                                                     writer);
+
+/*
+ * DTD attribute list definition conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTDAttlist(xmlTextWriterPtr writer,
+                                           const xmlChar * name,
+                                           const char *format, ...)
+					   LIBXML_ATTR_FORMAT(3,4);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTDAttlist(xmlTextWriterPtr writer,
+                                            const xmlChar * name,
+                                            const char *format,
+                                            va_list argptr)
+					    LIBXML_ATTR_FORMAT(3,0);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDAttlist(xmlTextWriterPtr
+                                                       writer,
+                                                       const xmlChar *
+                                                       name,
+                                                       const xmlChar *
+                                                       content);
+
+/*
+ * DTD entity definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterStartDTDEntity(xmlTextWriterPtr writer,
+                                    int pe, const xmlChar * name);
+    XMLPUBFUN int XMLCALL xmlTextWriterEndDTDEntity(xmlTextWriterPtr
+                                                    writer);
+
+/*
+ * DTD entity definition conveniency functions
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteFormatDTDInternalEntity(xmlTextWriterPtr writer,
+                                                  int pe,
+                                                  const xmlChar * name,
+                                                  const char *format, ...)
+						  LIBXML_ATTR_FORMAT(4,5);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteVFormatDTDInternalEntity(xmlTextWriterPtr writer,
+                                                   int pe,
+                                                   const xmlChar * name,
+                                                   const char *format,
+                                                   va_list argptr)
+						   LIBXML_ATTR_FORMAT(4,0);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDInternalEntity(xmlTextWriterPtr writer,
+                                            int pe,
+                                            const xmlChar * name,
+                                            const xmlChar * content);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDExternalEntity(xmlTextWriterPtr writer,
+                                            int pe,
+                                            const xmlChar * name,
+                                            const xmlChar * pubid,
+                                            const xmlChar * sysid,
+                                            const xmlChar * ndataid);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDExternalEntityContents(xmlTextWriterPtr
+                                                    writer,
+                                                    const xmlChar * pubid,
+                                                    const xmlChar * sysid,
+                                                    const xmlChar *
+                                                    ndataid);
+    XMLPUBFUN int XMLCALL xmlTextWriterWriteDTDEntity(xmlTextWriterPtr
+                                                      writer, int pe,
+                                                      const xmlChar * name,
+                                                      const xmlChar *
+                                                      pubid,
+                                                      const xmlChar *
+                                                      sysid,
+                                                      const xmlChar *
+                                                      ndataid,
+                                                      const xmlChar *
+                                                      content);
+
+/*
+ * DTD notation definition
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterWriteDTDNotation(xmlTextWriterPtr writer,
+                                      const xmlChar * name,
+                                      const xmlChar * pubid,
+                                      const xmlChar * sysid);
+
+/*
+ * Indentation
+ */
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterSetIndent(xmlTextWriterPtr writer, int indent);
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterSetIndentString(xmlTextWriterPtr writer,
+                                     const xmlChar * str);
+
+    XMLPUBFUN int XMLCALL
+        xmlTextWriterSetQuoteChar(xmlTextWriterPtr writer, xmlChar quotechar);
+
+
+/*
+ * misc
+ */
+    XMLPUBFUN int XMLCALL xmlTextWriterFlush(xmlTextWriterPtr writer);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_WRITER_ENABLED */
+
+#endif                          /* __XML_XMLWRITER_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpath.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpath.h
new file mode 100644
index 0000000..539593f
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpath.h
@@ -0,0 +1,564 @@
+/*
+ * Summary: XML Path Language implementation
+ * Description: API for the XML Path Language implementation
+ *
+ * XML Path Language implementation
+ * XPath is a language for addressing parts of an XML document,
+ * designed to be used by both XSLT and XPointer
+ *     http://www.w3.org/TR/xpath
+ *
+ * Implements
+ * W3C Recommendation 16 November 1999
+ *     http://www.w3.org/TR/1999/REC-xpath-19991116
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XPATH_H__
+#define __XML_XPATH_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_XPATH_ENABLED
+
+#include <libxml/xmlerror.h>
+#include <libxml/tree.h>
+#include <libxml/hash.h>
+#endif /* LIBXML_XPATH_ENABLED */
+
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+#ifdef __cplusplus
+extern "C" {
+#endif
+#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED */
+
+#ifdef LIBXML_XPATH_ENABLED
+
+typedef struct _xmlXPathContext xmlXPathContext;
+typedef xmlXPathContext *xmlXPathContextPtr;
+typedef struct _xmlXPathParserContext xmlXPathParserContext;
+typedef xmlXPathParserContext *xmlXPathParserContextPtr;
+
+/**
+ * The set of XPath error codes.
+ */
+
+typedef enum {
+    XPATH_EXPRESSION_OK = 0,
+    XPATH_NUMBER_ERROR,
+    XPATH_UNFINISHED_LITERAL_ERROR,
+    XPATH_START_LITERAL_ERROR,
+    XPATH_VARIABLE_REF_ERROR,
+    XPATH_UNDEF_VARIABLE_ERROR,
+    XPATH_INVALID_PREDICATE_ERROR,
+    XPATH_EXPR_ERROR,
+    XPATH_UNCLOSED_ERROR,
+    XPATH_UNKNOWN_FUNC_ERROR,
+    XPATH_INVALID_OPERAND,
+    XPATH_INVALID_TYPE,
+    XPATH_INVALID_ARITY,
+    XPATH_INVALID_CTXT_SIZE,
+    XPATH_INVALID_CTXT_POSITION,
+    XPATH_MEMORY_ERROR,
+    XPTR_SYNTAX_ERROR,
+    XPTR_RESOURCE_ERROR,
+    XPTR_SUB_RESOURCE_ERROR,
+    XPATH_UNDEF_PREFIX_ERROR,
+    XPATH_ENCODING_ERROR,
+    XPATH_INVALID_CHAR_ERROR,
+    XPATH_INVALID_CTXT,
+    XPATH_STACK_ERROR,
+    XPATH_FORBID_VARIABLE_ERROR,
+    XPATH_OP_LIMIT_EXCEEDED,
+    XPATH_RECURSION_LIMIT_EXCEEDED
+} xmlXPathError;
+
+/*
+ * A node-set (an unordered collection of nodes without duplicates).
+ */
+typedef struct _xmlNodeSet xmlNodeSet;
+typedef xmlNodeSet *xmlNodeSetPtr;
+struct _xmlNodeSet {
+    int nodeNr;			/* number of nodes in the set */
+    int nodeMax;		/* size of the array as allocated */
+    xmlNodePtr *nodeTab;	/* array of nodes in no particular order */
+    /* @@ with_ns to check whether namespace nodes should be looked at @@ */
+};
+
+/*
+ * An expression is evaluated to yield an object, which
+ * has one of the following four basic types:
+ *   - node-set
+ *   - boolean
+ *   - number
+ *   - string
+ *
+ * @@ XPointer will add more types !
+ */
+
+typedef enum {
+    XPATH_UNDEFINED = 0,
+    XPATH_NODESET = 1,
+    XPATH_BOOLEAN = 2,
+    XPATH_NUMBER = 3,
+    XPATH_STRING = 4,
+    XPATH_POINT = 5,
+    XPATH_RANGE = 6,
+    XPATH_LOCATIONSET = 7,
+    XPATH_USERS = 8,
+    XPATH_XSLT_TREE = 9  /* An XSLT value tree, non modifiable */
+} xmlXPathObjectType;
+
+typedef struct _xmlXPathObject xmlXPathObject;
+typedef xmlXPathObject *xmlXPathObjectPtr;
+struct _xmlXPathObject {
+    xmlXPathObjectType type;
+    xmlNodeSetPtr nodesetval;
+    int boolval;
+    double floatval;
+    xmlChar *stringval;
+    void *user;
+    int index;
+    void *user2;
+    int index2;
+};
+
+/**
+ * xmlXPathConvertFunc:
+ * @obj:  an XPath object
+ * @type:  the number of the target type
+ *
+ * A conversion function is associated to a type and used to cast
+ * the new type to primitive values.
+ *
+ * Returns -1 in case of error, 0 otherwise
+ */
+typedef int (*xmlXPathConvertFunc) (xmlXPathObjectPtr obj, int type);
+
+/*
+ * Extra type: a name and a conversion function.
+ */
+
+typedef struct _xmlXPathType xmlXPathType;
+typedef xmlXPathType *xmlXPathTypePtr;
+struct _xmlXPathType {
+    const xmlChar         *name;		/* the type name */
+    xmlXPathConvertFunc func;		/* the conversion function */
+};
+
+/*
+ * Extra variable: a name and a value.
+ */
+
+typedef struct _xmlXPathVariable xmlXPathVariable;
+typedef xmlXPathVariable *xmlXPathVariablePtr;
+struct _xmlXPathVariable {
+    const xmlChar       *name;		/* the variable name */
+    xmlXPathObjectPtr value;		/* the value */
+};
+
+/**
+ * xmlXPathEvalFunc:
+ * @ctxt: an XPath parser context
+ * @nargs: the number of arguments passed to the function
+ *
+ * An XPath evaluation function, the parameters are on the XPath context stack.
+ */
+
+typedef void (*xmlXPathEvalFunc)(xmlXPathParserContextPtr ctxt,
+	                         int nargs);
+
+/*
+ * Extra function: a name and a evaluation function.
+ */
+
+typedef struct _xmlXPathFunct xmlXPathFunct;
+typedef xmlXPathFunct *xmlXPathFuncPtr;
+struct _xmlXPathFunct {
+    const xmlChar      *name;		/* the function name */
+    xmlXPathEvalFunc func;		/* the evaluation function */
+};
+
+/**
+ * xmlXPathAxisFunc:
+ * @ctxt:  the XPath interpreter context
+ * @cur:  the previous node being explored on that axis
+ *
+ * An axis traversal function. To traverse an axis, the engine calls
+ * the first time with cur == NULL and repeat until the function returns
+ * NULL indicating the end of the axis traversal.
+ *
+ * Returns the next node in that axis or NULL if at the end of the axis.
+ */
+
+typedef xmlXPathObjectPtr (*xmlXPathAxisFunc) (xmlXPathParserContextPtr ctxt,
+				 xmlXPathObjectPtr cur);
+
+/*
+ * Extra axis: a name and an axis function.
+ */
+
+typedef struct _xmlXPathAxis xmlXPathAxis;
+typedef xmlXPathAxis *xmlXPathAxisPtr;
+struct _xmlXPathAxis {
+    const xmlChar      *name;		/* the axis name */
+    xmlXPathAxisFunc func;		/* the search function */
+};
+
+/**
+ * xmlXPathFunction:
+ * @ctxt:  the XPath interprestation context
+ * @nargs:  the number of arguments
+ *
+ * An XPath function.
+ * The arguments (if any) are popped out from the context stack
+ * and the result is pushed on the stack.
+ */
+
+typedef void (*xmlXPathFunction) (xmlXPathParserContextPtr ctxt, int nargs);
+
+/*
+ * Function and Variable Lookup.
+ */
+
+/**
+ * xmlXPathVariableLookupFunc:
+ * @ctxt:  an XPath context
+ * @name:  name of the variable
+ * @ns_uri:  the namespace name hosting this variable
+ *
+ * Prototype for callbacks used to plug variable lookup in the XPath
+ * engine.
+ *
+ * Returns the XPath object value or NULL if not found.
+ */
+typedef xmlXPathObjectPtr (*xmlXPathVariableLookupFunc) (void *ctxt,
+                                         const xmlChar *name,
+                                         const xmlChar *ns_uri);
+
+/**
+ * xmlXPathFuncLookupFunc:
+ * @ctxt:  an XPath context
+ * @name:  name of the function
+ * @ns_uri:  the namespace name hosting this function
+ *
+ * Prototype for callbacks used to plug function lookup in the XPath
+ * engine.
+ *
+ * Returns the XPath function or NULL if not found.
+ */
+typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt,
+					 const xmlChar *name,
+					 const xmlChar *ns_uri);
+
+/**
+ * xmlXPathFlags:
+ * Flags for XPath engine compilation and runtime
+ */
+/**
+ * XML_XPATH_CHECKNS:
+ *
+ * check namespaces at compilation
+ */
+#define XML_XPATH_CHECKNS (1<<0)
+/**
+ * XML_XPATH_NOVAR:
+ *
+ * forbid variables in expression
+ */
+#define XML_XPATH_NOVAR	  (1<<1)
+
+/**
+ * xmlXPathContext:
+ *
+ * Expression evaluation occurs with respect to a context.
+ * he context consists of:
+ *    - a node (the context node)
+ *    - a node list (the context node list)
+ *    - a set of variable bindings
+ *    - a function library
+ *    - the set of namespace declarations in scope for the expression
+ * Following the switch to hash tables, this need to be trimmed up at
+ * the next binary incompatible release.
+ * The node may be modified when the context is passed to libxml2
+ * for an XPath evaluation so you may need to initialize it again
+ * before the next call.
+ */
+
+struct _xmlXPathContext {
+    xmlDocPtr doc;			/* The current document */
+    xmlNodePtr node;			/* The current node */
+
+    int nb_variables_unused;		/* unused (hash table) */
+    int max_variables_unused;		/* unused (hash table) */
+    xmlHashTablePtr varHash;		/* Hash table of defined variables */
+
+    int nb_types;			/* number of defined types */
+    int max_types;			/* max number of types */
+    xmlXPathTypePtr types;		/* Array of defined types */
+
+    int nb_funcs_unused;		/* unused (hash table) */
+    int max_funcs_unused;		/* unused (hash table) */
+    xmlHashTablePtr funcHash;		/* Hash table of defined funcs */
+
+    int nb_axis;			/* number of defined axis */
+    int max_axis;			/* max number of axis */
+    xmlXPathAxisPtr axis;		/* Array of defined axis */
+
+    /* the namespace nodes of the context node */
+    xmlNsPtr *namespaces;		/* Array of namespaces */
+    int nsNr;				/* number of namespace in scope */
+    void *user;				/* function to free */
+
+    /* extra variables */
+    int contextSize;			/* the context size */
+    int proximityPosition;		/* the proximity position */
+
+    /* extra stuff for XPointer */
+    int xptr;				/* is this an XPointer context? */
+    xmlNodePtr here;			/* for here() */
+    xmlNodePtr origin;			/* for origin() */
+
+    /* the set of namespace declarations in scope for the expression */
+    xmlHashTablePtr nsHash;		/* The namespaces hash table */
+    xmlXPathVariableLookupFunc varLookupFunc;/* variable lookup func */
+    void *varLookupData;		/* variable lookup data */
+
+    /* Possibility to link in an extra item */
+    void *extra;                        /* needed for XSLT */
+
+    /* The function name and URI when calling a function */
+    const xmlChar *function;
+    const xmlChar *functionURI;
+
+    /* function lookup function and data */
+    xmlXPathFuncLookupFunc funcLookupFunc;/* function lookup func */
+    void *funcLookupData;		/* function lookup data */
+
+    /* temporary namespace lists kept for walking the namespace axis */
+    xmlNsPtr *tmpNsList;		/* Array of namespaces */
+    int tmpNsNr;			/* number of namespaces in scope */
+
+    /* error reporting mechanism */
+    void *userData;                     /* user specific data block */
+    xmlStructuredErrorFunc error;       /* the callback in case of errors */
+    xmlError lastError;			/* the last error */
+    xmlNodePtr debugNode;		/* the source node XSLT */
+
+    /* dictionary */
+    xmlDictPtr dict;			/* dictionary if any */
+
+    int flags;				/* flags to control compilation */
+
+    /* Cache for reusal of XPath objects */
+    void *cache;
+
+    /* Resource limits */
+    unsigned long opLimit;
+    unsigned long opCount;
+    int depth;
+};
+
+/*
+ * The structure of a compiled expression form is not public.
+ */
+
+typedef struct _xmlXPathCompExpr xmlXPathCompExpr;
+typedef xmlXPathCompExpr *xmlXPathCompExprPtr;
+
+/**
+ * xmlXPathParserContext:
+ *
+ * An XPath parser context. It contains pure parsing information,
+ * an xmlXPathContext, and the stack of objects.
+ */
+struct _xmlXPathParserContext {
+    const xmlChar *cur;			/* the current char being parsed */
+    const xmlChar *base;			/* the full expression */
+
+    int error;				/* error code */
+
+    xmlXPathContextPtr  context;	/* the evaluation context */
+    xmlXPathObjectPtr     value;	/* the current value */
+    int                 valueNr;	/* number of values stacked */
+    int                valueMax;	/* max number of values stacked */
+    xmlXPathObjectPtr *valueTab;	/* stack of values */
+
+    xmlXPathCompExprPtr comp;		/* the precompiled expression */
+    int xptr;				/* it this an XPointer expression */
+    xmlNodePtr         ancestor;	/* used for walking preceding axis */
+
+    int              valueFrame;        /* used to limit Pop on the stack */
+};
+
+/************************************************************************
+ *									*
+ *			Public API					*
+ *									*
+ ************************************************************************/
+
+/**
+ * Objects and Nodesets handling
+ */
+
+XMLPUBVAR double xmlXPathNAN;
+XMLPUBVAR double xmlXPathPINF;
+XMLPUBVAR double xmlXPathNINF;
+
+/* These macros may later turn into functions */
+/**
+ * xmlXPathNodeSetGetLength:
+ * @ns:  a node-set
+ *
+ * Implement a functionality similar to the DOM NodeList.length.
+ *
+ * Returns the number of nodes in the node-set.
+ */
+#define xmlXPathNodeSetGetLength(ns) ((ns) ? (ns)->nodeNr : 0)
+/**
+ * xmlXPathNodeSetItem:
+ * @ns:  a node-set
+ * @index:  index of a node in the set
+ *
+ * Implements a functionality similar to the DOM NodeList.item().
+ *
+ * Returns the xmlNodePtr at the given @index in @ns or NULL if
+ *         @index is out of range (0 to length-1)
+ */
+#define xmlXPathNodeSetItem(ns, index)				\
+		((((ns) != NULL) &&				\
+		  ((index) >= 0) && ((index) < (ns)->nodeNr)) ?	\
+		 (ns)->nodeTab[(index)]				\
+		 : NULL)
+/**
+ * xmlXPathNodeSetIsEmpty:
+ * @ns: a node-set
+ *
+ * Checks whether @ns is empty or not.
+ *
+ * Returns %TRUE if @ns is an empty node-set.
+ */
+#define xmlXPathNodeSetIsEmpty(ns)                                      \
+    (((ns) == NULL) || ((ns)->nodeNr == 0) || ((ns)->nodeTab == NULL))
+
+
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeObject		(xmlXPathObjectPtr obj);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		    xmlXPathNodeSetCreate	(xmlNodePtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeNodeSetList	(xmlXPathObjectPtr obj);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeNodeSet		(xmlNodeSetPtr obj);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathObjectCopy		(xmlXPathObjectPtr val);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCmpNodes		(xmlNodePtr node1,
+						 xmlNodePtr node2);
+/**
+ * Conversion functions to basic types.
+ */
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastNumberToBoolean	(double val);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastStringToBoolean	(const xmlChar * val);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastNodeSetToBoolean(xmlNodeSetPtr ns);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCastToBoolean	(xmlXPathObjectPtr val);
+
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastBooleanToNumber	(int val);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastStringToNumber	(const xmlChar * val);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastNodeToNumber	(xmlNodePtr node);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastNodeSetToNumber	(xmlNodeSetPtr ns);
+XMLPUBFUN double XMLCALL
+		    xmlXPathCastToNumber	(xmlXPathObjectPtr val);
+
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastBooleanToString	(int val);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastNumberToString	(double val);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastNodeToString	(xmlNodePtr node);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastNodeSetToString	(xmlNodeSetPtr ns);
+XMLPUBFUN xmlChar * XMLCALL
+		    xmlXPathCastToString	(xmlXPathObjectPtr val);
+
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathConvertBoolean	(xmlXPathObjectPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathConvertNumber	(xmlXPathObjectPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathConvertString	(xmlXPathObjectPtr val);
+
+/**
+ * Context handling.
+ */
+XMLPUBFUN xmlXPathContextPtr XMLCALL
+		    xmlXPathNewContext		(xmlDocPtr doc);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeContext		(xmlXPathContextPtr ctxt);
+XMLPUBFUN int XMLCALL
+		    xmlXPathContextSetCache(xmlXPathContextPtr ctxt,
+				            int active,
+					    int value,
+					    int options);
+/**
+ * Evaluation functions.
+ */
+XMLPUBFUN long XMLCALL
+		    xmlXPathOrderDocElems	(xmlDocPtr doc);
+XMLPUBFUN int XMLCALL
+		    xmlXPathSetContextNode	(xmlNodePtr node,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathNodeEval		(xmlNodePtr node,
+						 const xmlChar *str,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathEval		(const xmlChar *str,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathEvalExpression	(const xmlChar *str,
+						 xmlXPathContextPtr ctxt);
+XMLPUBFUN int XMLCALL
+		    xmlXPathEvalPredicate	(xmlXPathContextPtr ctxt,
+						 xmlXPathObjectPtr res);
+/**
+ * Separate compilation/evaluation entry points.
+ */
+XMLPUBFUN xmlXPathCompExprPtr XMLCALL
+		    xmlXPathCompile		(const xmlChar *str);
+XMLPUBFUN xmlXPathCompExprPtr XMLCALL
+		    xmlXPathCtxtCompile		(xmlXPathContextPtr ctxt,
+						 const xmlChar *str);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPathCompiledEval	(xmlXPathCompExprPtr comp,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN int XMLCALL
+		    xmlXPathCompiledEvalToBoolean(xmlXPathCompExprPtr comp,
+						 xmlXPathContextPtr ctxt);
+XMLPUBFUN void XMLCALL
+		    xmlXPathFreeCompExpr	(xmlXPathCompExprPtr comp);
+#endif /* LIBXML_XPATH_ENABLED */
+#if defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED)
+XMLPUBFUN void XMLCALL
+		    xmlXPathInit		(void);
+XMLPUBFUN int XMLCALL
+		xmlXPathIsNaN	(double val);
+XMLPUBFUN int XMLCALL
+		xmlXPathIsInf	(double val);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPATH_ENABLED or LIBXML_SCHEMAS_ENABLED*/
+#endif /* ! __XML_XPATH_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpathInternals.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpathInternals.h
new file mode 100644
index 0000000..76a6b48
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpathInternals.h
@@ -0,0 +1,632 @@
+/*
+ * Summary: internal interfaces for XML Path Language implementation
+ * Description: internal interfaces for XML Path Language implementation
+ *              used to build new modules on top of XPath like XPointer and
+ *              XSLT
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XPATH_INTERNALS_H__
+#define __XML_XPATH_INTERNALS_H__
+
+#include <libxml/xmlversion.h>
+#include <libxml/xpath.h>
+
+#ifdef LIBXML_XPATH_ENABLED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/************************************************************************
+ *									*
+ *			Helpers						*
+ *									*
+ ************************************************************************/
+
+/*
+ * Many of these macros may later turn into functions. They
+ * shouldn't be used in #ifdef's preprocessor instructions.
+ */
+/**
+ * xmlXPathSetError:
+ * @ctxt:  an XPath parser context
+ * @err:  an xmlXPathError code
+ *
+ * Raises an error.
+ */
+#define xmlXPathSetError(ctxt, err)					\
+    { xmlXPatherror((ctxt), __FILE__, __LINE__, (err));			\
+      if ((ctxt) != NULL) (ctxt)->error = (err); }
+
+/**
+ * xmlXPathSetArityError:
+ * @ctxt:  an XPath parser context
+ *
+ * Raises an XPATH_INVALID_ARITY error.
+ */
+#define xmlXPathSetArityError(ctxt)					\
+    xmlXPathSetError((ctxt), XPATH_INVALID_ARITY)
+
+/**
+ * xmlXPathSetTypeError:
+ * @ctxt:  an XPath parser context
+ *
+ * Raises an XPATH_INVALID_TYPE error.
+ */
+#define xmlXPathSetTypeError(ctxt)					\
+    xmlXPathSetError((ctxt), XPATH_INVALID_TYPE)
+
+/**
+ * xmlXPathGetError:
+ * @ctxt:  an XPath parser context
+ *
+ * Get the error code of an XPath context.
+ *
+ * Returns the context error.
+ */
+#define xmlXPathGetError(ctxt)	  ((ctxt)->error)
+
+/**
+ * xmlXPathCheckError:
+ * @ctxt:  an XPath parser context
+ *
+ * Check if an XPath error was raised.
+ *
+ * Returns true if an error has been raised, false otherwise.
+ */
+#define xmlXPathCheckError(ctxt)  ((ctxt)->error != XPATH_EXPRESSION_OK)
+
+/**
+ * xmlXPathGetDocument:
+ * @ctxt:  an XPath parser context
+ *
+ * Get the document of an XPath context.
+ *
+ * Returns the context document.
+ */
+#define xmlXPathGetDocument(ctxt)	((ctxt)->context->doc)
+
+/**
+ * xmlXPathGetContextNode:
+ * @ctxt: an XPath parser context
+ *
+ * Get the context node of an XPath context.
+ *
+ * Returns the context node.
+ */
+#define xmlXPathGetContextNode(ctxt)	((ctxt)->context->node)
+
+XMLPUBFUN int XMLCALL
+		xmlXPathPopBoolean	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN double XMLCALL
+		xmlXPathPopNumber	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlXPathPopString	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathPopNodeSet	(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void * XMLCALL
+		xmlXPathPopExternal	(xmlXPathParserContextPtr ctxt);
+
+/**
+ * xmlXPathReturnBoolean:
+ * @ctxt:  an XPath parser context
+ * @val:  a boolean
+ *
+ * Pushes the boolean @val on the context stack.
+ */
+#define xmlXPathReturnBoolean(ctxt, val)				\
+    valuePush((ctxt), xmlXPathNewBoolean(val))
+
+/**
+ * xmlXPathReturnTrue:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes true on the context stack.
+ */
+#define xmlXPathReturnTrue(ctxt)   xmlXPathReturnBoolean((ctxt), 1)
+
+/**
+ * xmlXPathReturnFalse:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes false on the context stack.
+ */
+#define xmlXPathReturnFalse(ctxt)  xmlXPathReturnBoolean((ctxt), 0)
+
+/**
+ * xmlXPathReturnNumber:
+ * @ctxt:  an XPath parser context
+ * @val:  a double
+ *
+ * Pushes the double @val on the context stack.
+ */
+#define xmlXPathReturnNumber(ctxt, val)					\
+    valuePush((ctxt), xmlXPathNewFloat(val))
+
+/**
+ * xmlXPathReturnString:
+ * @ctxt:  an XPath parser context
+ * @str:  a string
+ *
+ * Pushes the string @str on the context stack.
+ */
+#define xmlXPathReturnString(ctxt, str)					\
+    valuePush((ctxt), xmlXPathWrapString(str))
+
+/**
+ * xmlXPathReturnEmptyString:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes an empty string on the stack.
+ */
+#define xmlXPathReturnEmptyString(ctxt)					\
+    valuePush((ctxt), xmlXPathNewCString(""))
+
+/**
+ * xmlXPathReturnNodeSet:
+ * @ctxt:  an XPath parser context
+ * @ns:  a node-set
+ *
+ * Pushes the node-set @ns on the context stack.
+ */
+#define xmlXPathReturnNodeSet(ctxt, ns)					\
+    valuePush((ctxt), xmlXPathWrapNodeSet(ns))
+
+/**
+ * xmlXPathReturnEmptyNodeSet:
+ * @ctxt:  an XPath parser context
+ *
+ * Pushes an empty node-set on the context stack.
+ */
+#define xmlXPathReturnEmptyNodeSet(ctxt)				\
+    valuePush((ctxt), xmlXPathNewNodeSet(NULL))
+
+/**
+ * xmlXPathReturnExternal:
+ * @ctxt:  an XPath parser context
+ * @val:  user data
+ *
+ * Pushes user data on the context stack.
+ */
+#define xmlXPathReturnExternal(ctxt, val)				\
+    valuePush((ctxt), xmlXPathWrapExternal(val))
+
+/**
+ * xmlXPathStackIsNodeSet:
+ * @ctxt: an XPath parser context
+ *
+ * Check if the current value on the XPath stack is a node set or
+ * an XSLT value tree.
+ *
+ * Returns true if the current object on the stack is a node-set.
+ */
+#define xmlXPathStackIsNodeSet(ctxt)					\
+    (((ctxt)->value != NULL)						\
+     && (((ctxt)->value->type == XPATH_NODESET)				\
+         || ((ctxt)->value->type == XPATH_XSLT_TREE)))
+
+/**
+ * xmlXPathStackIsExternal:
+ * @ctxt: an XPath parser context
+ *
+ * Checks if the current value on the XPath stack is an external
+ * object.
+ *
+ * Returns true if the current object on the stack is an external
+ * object.
+ */
+#define xmlXPathStackIsExternal(ctxt)					\
+	((ctxt->value != NULL) && (ctxt->value->type == XPATH_USERS))
+
+/**
+ * xmlXPathEmptyNodeSet:
+ * @ns:  a node-set
+ *
+ * Empties a node-set.
+ */
+#define xmlXPathEmptyNodeSet(ns)					\
+    { while ((ns)->nodeNr > 0) (ns)->nodeTab[--(ns)->nodeNr] = NULL; }
+
+/**
+ * CHECK_ERROR:
+ *
+ * Macro to return from the function if an XPath error was detected.
+ */
+#define CHECK_ERROR							\
+    if (ctxt->error != XPATH_EXPRESSION_OK) return
+
+/**
+ * CHECK_ERROR0:
+ *
+ * Macro to return 0 from the function if an XPath error was detected.
+ */
+#define CHECK_ERROR0							\
+    if (ctxt->error != XPATH_EXPRESSION_OK) return(0)
+
+/**
+ * XP_ERROR:
+ * @X:  the error code
+ *
+ * Macro to raise an XPath error and return.
+ */
+#define XP_ERROR(X)							\
+    { xmlXPathErr(ctxt, X); return; }
+
+/**
+ * XP_ERROR0:
+ * @X:  the error code
+ *
+ * Macro to raise an XPath error and return 0.
+ */
+#define XP_ERROR0(X)							\
+    { xmlXPathErr(ctxt, X); return(0); }
+
+/**
+ * CHECK_TYPE:
+ * @typeval:  the XPath type
+ *
+ * Macro to check that the value on top of the XPath stack is of a given
+ * type.
+ */
+#define CHECK_TYPE(typeval)						\
+    if ((ctxt->value == NULL) || (ctxt->value->type != typeval))	\
+        XP_ERROR(XPATH_INVALID_TYPE)
+
+/**
+ * CHECK_TYPE0:
+ * @typeval:  the XPath type
+ *
+ * Macro to check that the value on top of the XPath stack is of a given
+ * type. Return(0) in case of failure
+ */
+#define CHECK_TYPE0(typeval)						\
+    if ((ctxt->value == NULL) || (ctxt->value->type != typeval))	\
+        XP_ERROR0(XPATH_INVALID_TYPE)
+
+/**
+ * CHECK_ARITY:
+ * @x:  the number of expected args
+ *
+ * Macro to check that the number of args passed to an XPath function matches.
+ */
+#define CHECK_ARITY(x)							\
+    if (ctxt == NULL) return;						\
+    if (nargs != (x))							\
+        XP_ERROR(XPATH_INVALID_ARITY);					\
+    if (ctxt->valueNr < ctxt->valueFrame + (x))				\
+        XP_ERROR(XPATH_STACK_ERROR);
+
+/**
+ * CAST_TO_STRING:
+ *
+ * Macro to try to cast the value on the top of the XPath stack to a string.
+ */
+#define CAST_TO_STRING							\
+    if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_STRING))	\
+        xmlXPathStringFunction(ctxt, 1);
+
+/**
+ * CAST_TO_NUMBER:
+ *
+ * Macro to try to cast the value on the top of the XPath stack to a number.
+ */
+#define CAST_TO_NUMBER							\
+    if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_NUMBER))	\
+        xmlXPathNumberFunction(ctxt, 1);
+
+/**
+ * CAST_TO_BOOLEAN:
+ *
+ * Macro to try to cast the value on the top of the XPath stack to a boolean.
+ */
+#define CAST_TO_BOOLEAN							\
+    if ((ctxt->value != NULL) && (ctxt->value->type != XPATH_BOOLEAN))	\
+        xmlXPathBooleanFunction(ctxt, 1);
+
+/*
+ * Variable Lookup forwarding.
+ */
+
+XMLPUBFUN void XMLCALL
+	xmlXPathRegisterVariableLookup	(xmlXPathContextPtr ctxt,
+					 xmlXPathVariableLookupFunc f,
+					 void *data);
+
+/*
+ * Function Lookup forwarding.
+ */
+
+XMLPUBFUN void XMLCALL
+	    xmlXPathRegisterFuncLookup	(xmlXPathContextPtr ctxt,
+					 xmlXPathFuncLookupFunc f,
+					 void *funcCtxt);
+
+/*
+ * Error reporting.
+ */
+XMLPUBFUN void XMLCALL
+		xmlXPatherror	(xmlXPathParserContextPtr ctxt,
+				 const char *file,
+				 int line,
+				 int no);
+
+XMLPUBFUN void XMLCALL
+		xmlXPathErr	(xmlXPathParserContextPtr ctxt,
+				 int error);
+
+#ifdef LIBXML_DEBUG_ENABLED
+XMLPUBFUN void XMLCALL
+		xmlXPathDebugDumpObject	(FILE *output,
+					 xmlXPathObjectPtr cur,
+					 int depth);
+XMLPUBFUN void XMLCALL
+	    xmlXPathDebugDumpCompExpr(FILE *output,
+					 xmlXPathCompExprPtr comp,
+					 int depth);
+#endif
+/**
+ * NodeSet handling.
+ */
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetContains		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathDifference		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathIntersection		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathDistinctSorted		(xmlNodeSetPtr nodes);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathDistinct		(xmlNodeSetPtr nodes);
+
+XMLPUBFUN int XMLCALL
+		xmlXPathHasSameNodes		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeLeadingSorted	(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathLeadingSorted		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeLeading		(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathLeading			(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeTrailingSorted	(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathTrailingSorted		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeTrailing		(xmlNodeSetPtr nodes,
+						 xmlNodePtr node);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathTrailing		(xmlNodeSetPtr nodes1,
+						 xmlNodeSetPtr nodes2);
+
+
+/**
+ * Extending a context.
+ */
+
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterNs		(xmlXPathContextPtr ctxt,
+						 const xmlChar *prefix,
+						 const xmlChar *ns_uri);
+XMLPUBFUN const xmlChar * XMLCALL
+		xmlXPathNsLookup		(xmlXPathContextPtr ctxt,
+						 const xmlChar *prefix);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisteredNsCleanup	(xmlXPathContextPtr ctxt);
+
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterFunc		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 xmlXPathFunction f);
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterFuncNS		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri,
+						 xmlXPathFunction f);
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterVariable	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 xmlXPathObjectPtr value);
+XMLPUBFUN int XMLCALL
+		xmlXPathRegisterVariableNS	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri,
+						 xmlXPathObjectPtr value);
+XMLPUBFUN xmlXPathFunction XMLCALL
+		xmlXPathFunctionLookup		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name);
+XMLPUBFUN xmlXPathFunction XMLCALL
+		xmlXPathFunctionLookupNS	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisteredFuncsCleanup	(xmlXPathContextPtr ctxt);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathVariableLookup		(xmlXPathContextPtr ctxt,
+						 const xmlChar *name);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathVariableLookupNS	(xmlXPathContextPtr ctxt,
+						 const xmlChar *name,
+						 const xmlChar *ns_uri);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisteredVariablesCleanup(xmlXPathContextPtr ctxt);
+
+/**
+ * Utilities to extend XPath.
+ */
+XMLPUBFUN xmlXPathParserContextPtr XMLCALL
+		  xmlXPathNewParserContext	(const xmlChar *str,
+						 xmlXPathContextPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlXPathFreeParserContext	(xmlXPathParserContextPtr ctxt);
+
+/* TODO: remap to xmlXPathValuePop and Push. */
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		valuePop			(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN int XMLCALL
+		valuePush			(xmlXPathParserContextPtr ctxt,
+						 xmlXPathObjectPtr value);
+
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewString		(const xmlChar *val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewCString		(const char *val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapString		(xmlChar *val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapCString		(char * val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewFloat		(double val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewBoolean		(int val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewNodeSet		(xmlNodePtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewValueTree		(xmlNodePtr val);
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetAdd		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetAddUnique	(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN int XMLCALL
+		xmlXPathNodeSetAddNs		(xmlNodeSetPtr cur,
+						 xmlNodePtr node,
+						 xmlNsPtr ns);
+XMLPUBFUN void XMLCALL
+		xmlXPathNodeSetSort		(xmlNodeSetPtr set);
+
+XMLPUBFUN void XMLCALL
+		xmlXPathRoot			(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL
+		xmlXPathEvalExpr		(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlXPathParseName		(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN xmlChar * XMLCALL
+		xmlXPathParseNCName		(xmlXPathParserContextPtr ctxt);
+
+/*
+ * Existing functions.
+ */
+XMLPUBFUN double XMLCALL
+		xmlXPathStringEvalNumber	(const xmlChar *str);
+XMLPUBFUN int XMLCALL
+		xmlXPathEvaluatePredicateResult (xmlXPathParserContextPtr ctxt,
+						 xmlXPathObjectPtr res);
+XMLPUBFUN void XMLCALL
+		xmlXPathRegisterAllFunctions	(xmlXPathContextPtr ctxt);
+XMLPUBFUN xmlNodeSetPtr XMLCALL
+		xmlXPathNodeSetMerge		(xmlNodeSetPtr val1,
+						 xmlNodeSetPtr val2);
+XMLPUBFUN void XMLCALL
+		xmlXPathNodeSetDel		(xmlNodeSetPtr cur,
+						 xmlNodePtr val);
+XMLPUBFUN void XMLCALL
+		xmlXPathNodeSetRemove		(xmlNodeSetPtr cur,
+						 int val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathNewNodeSetList		(xmlNodeSetPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapNodeSet		(xmlNodeSetPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		xmlXPathWrapExternal		(void *val);
+
+XMLPUBFUN int XMLCALL xmlXPathEqualValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN int XMLCALL xmlXPathNotEqualValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN int XMLCALL xmlXPathCompareValues(xmlXPathParserContextPtr ctxt, int inf, int strict);
+XMLPUBFUN void XMLCALL xmlXPathValueFlipSign(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathAddValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathSubValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathMultValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathDivValues(xmlXPathParserContextPtr ctxt);
+XMLPUBFUN void XMLCALL xmlXPathModValues(xmlXPathParserContextPtr ctxt);
+
+XMLPUBFUN int XMLCALL xmlXPathIsNodeType(const xmlChar *name);
+
+/*
+ * Some of the axis navigation routines.
+ */
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextSelf(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextChild(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextDescendant(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextDescendantOrSelf(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextParent(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextAncestorOrSelf(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextFollowingSibling(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextFollowing(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextNamespace(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextAttribute(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextPreceding(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextAncestor(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+XMLPUBFUN xmlNodePtr XMLCALL xmlXPathNextPrecedingSibling(xmlXPathParserContextPtr ctxt,
+			xmlNodePtr cur);
+/*
+ * The official core of XPath functions.
+ */
+XMLPUBFUN void XMLCALL xmlXPathLastFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathPositionFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathCountFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathLocalNameFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNamespaceURIFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathStringFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathStringLengthFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathConcatFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathContainsFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathStartsWithFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSubstringFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSubstringBeforeFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSubstringAfterFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNormalizeFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNotFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathTrueFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathFalseFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathLangFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathNumberFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathSumFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathFloorFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathCeilingFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathRoundFunction(xmlXPathParserContextPtr ctxt, int nargs);
+XMLPUBFUN void XMLCALL xmlXPathBooleanFunction(xmlXPathParserContextPtr ctxt, int nargs);
+
+/**
+ * Really internal functions
+ */
+XMLPUBFUN void XMLCALL xmlXPathNodeSetFreeNs(xmlNsPtr ns);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPATH_ENABLED */
+#endif /* ! __XML_XPATH_INTERNALS_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpointer.h b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpointer.h
new file mode 100644
index 0000000..b99112b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/include/libxml2/libxml/xpointer.h
@@ -0,0 +1,114 @@
+/*
+ * Summary: API to handle XML Pointers
+ * Description: API to handle XML Pointers
+ * Base implementation was made accordingly to
+ * W3C Candidate Recommendation 7 June 2000
+ * http://www.w3.org/TR/2000/CR-xptr-20000607
+ *
+ * Added support for the element() scheme described in:
+ * W3C Proposed Recommendation 13 November 2002
+ * http://www.w3.org/TR/2002/PR-xptr-element-20021113/
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Daniel Veillard
+ */
+
+#ifndef __XML_XPTR_H__
+#define __XML_XPTR_H__
+
+#include <libxml/xmlversion.h>
+
+#ifdef LIBXML_XPTR_ENABLED
+
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * A Location Set
+ */
+typedef struct _xmlLocationSet xmlLocationSet;
+typedef xmlLocationSet *xmlLocationSetPtr;
+struct _xmlLocationSet {
+    int locNr;		      /* number of locations in the set */
+    int locMax;		      /* size of the array as allocated */
+    xmlXPathObjectPtr *locTab;/* array of locations */
+};
+
+/*
+ * Handling of location sets.
+ */
+
+XMLPUBFUN xmlLocationSetPtr XMLCALL
+		    xmlXPtrLocationSetCreate	(xmlXPathObjectPtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrFreeLocationSet	(xmlLocationSetPtr obj);
+XMLPUBFUN xmlLocationSetPtr XMLCALL
+		    xmlXPtrLocationSetMerge	(xmlLocationSetPtr val1,
+						 xmlLocationSetPtr val2);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRange		(xmlNodePtr start,
+						 int startindex,
+						 xmlNodePtr end,
+						 int endindex);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangePoints	(xmlXPathObjectPtr start,
+						 xmlXPathObjectPtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangeNodePoint	(xmlNodePtr start,
+						 xmlXPathObjectPtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangePointNode	(xmlXPathObjectPtr start,
+						 xmlNodePtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangeNodes	(xmlNodePtr start,
+						 xmlNodePtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewLocationSetNodes	(xmlNodePtr start,
+						 xmlNodePtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewLocationSetNodeSet(xmlNodeSetPtr set);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewRangeNodeObject	(xmlNodePtr start,
+						 xmlXPathObjectPtr end);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrNewCollapsedRange	(xmlNodePtr start);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrLocationSetAdd	(xmlLocationSetPtr cur,
+						 xmlXPathObjectPtr val);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrWrapLocationSet	(xmlLocationSetPtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrLocationSetDel	(xmlLocationSetPtr cur,
+						 xmlXPathObjectPtr val);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrLocationSetRemove	(xmlLocationSetPtr cur,
+						 int val);
+
+/*
+ * Functions.
+ */
+XMLPUBFUN xmlXPathContextPtr XMLCALL
+		    xmlXPtrNewContext		(xmlDocPtr doc,
+						 xmlNodePtr here,
+						 xmlNodePtr origin);
+XMLPUBFUN xmlXPathObjectPtr XMLCALL
+		    xmlXPtrEval			(const xmlChar *str,
+						 xmlXPathContextPtr ctx);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrRangeToFunction	(xmlXPathParserContextPtr ctxt,
+						 int nargs);
+XMLPUBFUN xmlNodePtr XMLCALL
+		    xmlXPtrBuildNodeList	(xmlXPathObjectPtr obj);
+XMLPUBFUN void XMLCALL
+		    xmlXPtrEvalRangePredicate	(xmlXPathParserContextPtr ctxt);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBXML_XPTR_ENABLED */
+#endif /* __XML_XPTR_H__ */
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppConfig.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppConfig.cmake
new file mode 100644
index 0000000..814f20b
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppConfig.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/libdbcpppTargets.cmake")
\ No newline at end of file
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppConfigVersion.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppConfigVersion.cmake
new file mode 100644
index 0000000..32911d9
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppConfigVersion.cmake
@@ -0,0 +1,48 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "0.1.0")
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  # Package version must be in the requested version range
+  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
+      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  endif()
+else()
+  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppTargets-release.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppTargets-release.cmake
new file mode 100644
index 0000000..77ab7f6
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppTargets-release.cmake
@@ -0,0 +1,39 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "libxmlmm" for configuration "Release"
+set_property(TARGET libxmlmm APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(libxmlmm PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libxmlmm.lib"
+  )
+
+list(APPEND _cmake_import_check_targets libxmlmm )
+list(APPEND _cmake_import_check_files_for_libxmlmm "${_IMPORT_PREFIX}/lib/libxmlmm.lib" )
+
+# Import target "LibXml2" for configuration "Release"
+set_property(TARGET LibXml2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2 PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C;RC"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libxml2s.lib"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2 )
+list(APPEND _cmake_import_check_files_for_LibXml2 "${_IMPORT_PREFIX}/lib/libxml2s.lib" )
+
+# Import target "libdbcppp" for configuration "Release"
+set_property(TARGET libdbcppp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(libdbcppp PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libdbcppp.lib"
+  )
+
+list(APPEND _cmake_import_check_targets libdbcppp )
+list(APPEND _cmake_import_check_files_for_libdbcppp "${_IMPORT_PREFIX}/lib/libdbcppp.lib" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppTargets.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppTargets.cmake
new file mode 100644
index 0000000..1a2bb05
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libdbcppp/libdbcpppTargets.cmake
@@ -0,0 +1,123 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS libxmlmm LibXml2 libdbcppp)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target libxmlmm
+add_library(libxmlmm STATIC IMPORTED)
+
+set_target_properties(libxmlmm PROPERTIES
+  INTERFACE_LINK_LIBRARIES "LibXml2"
+)
+
+# Create imported target LibXml2
+add_library(LibXml2 STATIC IMPORTED)
+
+set_target_properties(LibXml2 PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "LIBXML_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libxml2"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ws2_32>;\$<LINK_ONLY:Threads::Threads>"
+)
+
+# Create imported target libdbcppp
+add_library(libdbcppp STATIC IMPORTED)
+
+set_target_properties(libdbcppp PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/"
+  INTERFACE_LINK_LIBRARIES "libxmlmm"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/libdbcpppTargets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-config-version.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-config-version.cmake
new file mode 100644
index 0000000..83f731d
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-config-version.cmake
@@ -0,0 +1,88 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is equal to the requested version.
+# The tweak version component is ignored.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  message(AUTHOR_WARNING
+    "`find_package()` specify a version range but the version strategy "
+    "(ExactVersion) of the module `${PACKAGE_FIND_NAME}` is incompatible "
+    "with this request. Only the lower endpoint of the range will be used.")
+endif()
+
+set(PACKAGE_VERSION "2.9.10")
+
+if("2.9.10" MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)") # strip the tweak version
+  set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+  set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
+  set(CVF_VERSION_PATCH "${CMAKE_MATCH_3}")
+
+  if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+  endif()
+  if(NOT CVF_VERSION_MINOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
+  endif()
+  if(NOT CVF_VERSION_PATCH VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" CVF_VERSION_PATCH "${CVF_VERSION_PATCH}")
+  endif()
+
+  set(CVF_VERSION_NO_TWEAK "${CVF_VERSION_MAJOR}.${CVF_VERSION_MINOR}.${CVF_VERSION_PATCH}")
+else()
+  set(CVF_VERSION_NO_TWEAK "2.9.10")
+endif()
+
+if(PACKAGE_FIND_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)") # strip the tweak version
+  set(REQUESTED_VERSION_MAJOR "${CMAKE_MATCH_1}")
+  set(REQUESTED_VERSION_MINOR "${CMAKE_MATCH_2}")
+  set(REQUESTED_VERSION_PATCH "${CMAKE_MATCH_3}")
+
+  if(NOT REQUESTED_VERSION_MAJOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_MAJOR "${REQUESTED_VERSION_MAJOR}")
+  endif()
+  if(NOT REQUESTED_VERSION_MINOR VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_MINOR "${REQUESTED_VERSION_MINOR}")
+  endif()
+  if(NOT REQUESTED_VERSION_PATCH VERSION_EQUAL 0)
+    string(REGEX REPLACE "^0+" "" REQUESTED_VERSION_PATCH "${REQUESTED_VERSION_PATCH}")
+  endif()
+
+  set(REQUESTED_VERSION_NO_TWEAK
+      "${REQUESTED_VERSION_MAJOR}.${REQUESTED_VERSION_MINOR}.${REQUESTED_VERSION_PATCH}")
+else()
+  set(REQUESTED_VERSION_NO_TWEAK "${PACKAGE_FIND_VERSION}")
+endif()
+
+if(REQUESTED_VERSION_NO_TWEAK STREQUAL CVF_VERSION_NO_TWEAK)
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+endif()
+
+if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+  set(PACKAGE_VERSION_EXACT TRUE)
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-config.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-config.cmake
new file mode 100644
index 0000000..8adce87
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-config.cmake
@@ -0,0 +1,160 @@
+# libxml2-config.cmake
+# --------------------
+#
+# Libxml2 cmake module.
+# This module sets the following variables:
+#
+# ::
+#
+#   LIBXML2_INCLUDE_DIR        - Directory where LibXml2 headers are located.
+#   LIBXML2_INCLUDE_DIRS       - list of the include directories needed to use LibXml2.
+#   LIBXML2_LIBRARY            - path to the LibXml2 library.
+#   LIBXML2_LIBRARIES          - xml2 libraries to link against.
+#   LIBXML2_DEFINITIONS        - the compiler switches required for using LibXml2.
+#   LIBXML2_VERSION_MAJOR      - The major version of libxml2.
+#   LIBXML2_VERSION_MINOR      - The minor version of libxml2.
+#   LIBXML2_VERSION_PATCH      - The patch version of libxml2.
+#   LIBXML2_VERSION_STRING     - version number as a string (ex: "2.3.4")
+#   LIBXML2_MODULES            - whether libxml2 has dso support
+#   LIBXML2_XMLLINT_EXECUTABLE - path to the XML checking tool xmllint coming with LibXml2
+
+include("${CMAKE_CURRENT_LIST_DIR}/libxml2-export.cmake")
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libxml2-config.cmake.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set(LIBXML2_VERSION_MAJOR  2)
+set(LIBXML2_VERSION_MINOR  9)
+set(LIBXML2_VERSION_PATCH  10)
+set(LIBXML2_VERSION_STRING "2.9.10")
+set(LIBXML2_INSTALL_PREFIX ${PACKAGE_PREFIX_DIR})
+set(LIBXML2_INCLUDE_DIR    ${PACKAGE_PREFIX_DIR}/include/libxml2)
+set(LIBXML2_LIBRARY_DIR    ${PACKAGE_PREFIX_DIR}/lib)
+
+macro(select_library_location target basename)
+  if(TARGET ${target})
+    foreach(property IN ITEMS IMPORTED_LOCATION IMPORTED_IMPLIB)
+      get_target_property(${basename}_${property}_DEBUG ${target} ${property}_DEBUG)
+      get_target_property(${basename}_${property}_MINSIZEREL ${target} ${property}_MINSIZEREL)
+      get_target_property(${basename}_${property}_RELEASE ${target} ${property}_RELEASE)
+      get_target_property(${basename}_${property}_RELWITHDEBINFO ${target} ${property}_RELWITHDEBINFO)
+
+      if(${basename}_${property}_DEBUG AND ${basename}_${property}_RELEASE)
+        set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELEASE})
+      elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_RELWITHDEBINFO)
+        set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_RELWITHDEBINFO})
+      elseif(${basename}_${property}_DEBUG AND ${basename}_${property}_MINSIZEREL)
+        set(${basename}_LIBRARY debug ${${basename}_${property}_DEBUG} optimized ${${basename}_${property}_MINSIZEREL})
+      elseif(${basename}_${property}_RELEASE)
+        set(${basename}_LIBRARY ${${basename}_${property}_RELEASE})
+      elseif(${basename}_${property}_RELWITHDEBINFO)
+        set(${basename}_LIBRARY ${${basename}_${property}_RELWITHDEBINFO})
+      elseif(${basename}_${property}_MINSIZEREL)
+        set(${basename}_LIBRARY ${${basename}_${property}_MINSIZEREL})
+      elseif(${basename}_${property}_DEBUG)
+        set(${basename}_LIBRARY ${${basename}_${property}_DEBUG})
+      endif()
+    endforeach()
+  endif()
+endmacro()
+
+macro(select_executable_location target basename)
+  if(TARGET ${target})
+    get_target_property(${basename}_IMPORTED_LOCATION_DEBUG ${target} IMPORTED_LOCATION_DEBUG)
+    get_target_property(${basename}_IMPORTED_LOCATION_MINSIZEREL ${target} IMPORTED_LOCATION_MINSIZEREL)
+    get_target_property(${basename}_IMPORTED_LOCATION_RELEASE ${target} IMPORTED_LOCATION_RELEASE)
+    get_target_property(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO ${target} IMPORTED_LOCATION_RELWITHDEBINFO)
+
+    if(${basename}_IMPORTED_LOCATION_RELEASE)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELEASE})
+    elseif(${basename}_IMPORTED_LOCATION_RELWITHDEBINFO)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_RELWITHDEBINFO})
+    elseif(${basename}_IMPORTED_LOCATION_MINSIZEREL)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_MINSIZEREL})
+    elseif(${basename}_IMPORTED_LOCATION_DEBUG)
+      set(${basename}_EXECUTABLE ${${basename}_IMPORTED_LOCATION_DEBUG})
+    endif()
+  endif()
+endmacro()
+
+select_library_location(LibXml2::LibXml2 LIBXML2)
+select_executable_location(LibXml2::xmlcatalog LIBXML2_XMLCATALOG)
+select_executable_location(LibXml2::xmllint LIBXML2_XMLLINT)
+
+set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY})
+set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR})
+
+include(CMakeFindDependencyMacro)
+
+set(LIBXML2_SHARED OFF)
+set(LIBXML2_WITH_ICONV OFF)
+set(LIBXML2_WITH_THREADS ON)
+set(LIBXML2_WITH_ICU OFF)
+set(LIBXML2_WITH_LZMA OFF)
+set(LIBXML2_WITH_ZLIB OFF)
+
+if(LIBXML2_WITH_ICONV)
+  find_dependency(Iconv)
+  list(APPEND LIBXML2_LIBRARIES    ${Iconv_LIBRARIES})
+  list(APPEND LIBXML2_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS})
+endif()
+
+if(NOT LIBXML2_SHARED)
+  set(LIBXML2_DEFINITIONS -DLIBXML_STATIC)
+
+  if(LIBXML2_WITH_THREADS)
+    find_dependency(Threads)
+    list(APPEND LIBXML2_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  endif()
+
+  if(LIBXML2_WITH_ICU)
+    find_dependency(ICU COMPONENTS data i18n uc)
+    list(APPEND LIBXML2_LIBRARIES    ${ICU_LIBRARIES})
+  endif()
+
+  if(LIBXML2_WITH_LZMA)
+    find_dependency(LibLZMA)
+    list(APPEND LIBXML2_LIBRARIES    ${LIBLZMA_LIBRARIES})
+  endif()
+
+  if(LIBXML2_WITH_ZLIB)
+    find_dependency(ZLIB)
+    list(APPEND LIBXML2_LIBRARIES    ${ZLIB_LIBRARIES})
+  endif()
+
+  if(UNIX)
+    list(APPEND LIBXML2_LIBRARIES m)
+  endif()
+
+  if(WIN32)
+    list(APPEND LIBXML2_LIBRARIES ws2_32)
+  endif()
+endif()
+
+# whether libxml2 has dso support
+set(LIBXML2_MODULES ON)
+
+mark_as_advanced(LIBXML2_LIBRARY LIBXML2_XMLCATALOG_EXECUTABLE LIBXML2_XMLLINT_EXECUTABLE)
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-export-release.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-export-release.cmake
new file mode 100644
index 0000000..6a761f7
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-export-release.cmake
@@ -0,0 +1,37 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "LibXml2::LibXml2" for configuration "Release"
+set_property(TARGET LibXml2::LibXml2 APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2::LibXml2 PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C;RC"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libxml2s.lib"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2::LibXml2 )
+list(APPEND _cmake_import_check_files_for_LibXml2::LibXml2 "${_IMPORT_PREFIX}/lib/libxml2s.lib" )
+
+# Import target "LibXml2::xmlcatalog" for configuration "Release"
+set_property(TARGET LibXml2::xmlcatalog APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2::xmlcatalog PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/xmlcatalog.exe"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2::xmlcatalog )
+list(APPEND _cmake_import_check_files_for_LibXml2::xmlcatalog "${_IMPORT_PREFIX}/bin/xmlcatalog.exe" )
+
+# Import target "LibXml2::xmllint" for configuration "Release"
+set_property(TARGET LibXml2::xmllint APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(LibXml2::xmllint PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/xmllint.exe"
+  )
+
+list(APPEND _cmake_import_check_targets LibXml2::xmllint )
+list(APPEND _cmake_import_check_files_for_LibXml2::xmllint "${_IMPORT_PREFIX}/bin/xmllint.exe" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-export.cmake b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-export.cmake
new file mode 100644
index 0000000..31789f7
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/cmake/libxml2-2.9.10/libxml2-export.cmake
@@ -0,0 +1,114 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS LibXml2::LibXml2 LibXml2::xmlcatalog LibXml2::xmllint)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target LibXml2::LibXml2
+add_library(LibXml2::LibXml2 STATIC IMPORTED)
+
+set_target_properties(LibXml2::LibXml2 PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "LIBXML_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libxml2"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ws2_32>;\$<LINK_ONLY:Threads::Threads>"
+)
+
+# Create imported target LibXml2::xmlcatalog
+add_executable(LibXml2::xmlcatalog IMPORTED)
+
+# Create imported target LibXml2::xmllint
+add_executable(LibXml2::xmllint IMPORTED)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/libxml2-export-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/libdbcppp.lib b/Source/ThirdParty/dbcppp/Win64/lib/libdbcppp.lib
new file mode 100644
index 0000000..c128908
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/libdbcppp.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3d4f06ca6497bb19d001ecf7d2b8788813f29fbd5c840c58a989f280c14b114
+size 59734760
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/libxml2s.lib b/Source/ThirdParty/dbcppp/Win64/lib/libxml2s.lib
new file mode 100644
index 0000000..c2586df
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/libxml2s.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cc37db311f71cea7ba22549c98dbc1c1695694166caebc46cfc928873afd50e
+size 5276928
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/libxmlmm.lib b/Source/ThirdParty/dbcppp/Win64/lib/libxmlmm.lib
new file mode 100644
index 0000000..01e71f3
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/libxmlmm.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e87f62dd67b71e230cae62203dec858446bf4f37f7bd4dd315c4b7338a91b75
+size 837120
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/pkgconfig/libxml-2.0.pc b/Source/ThirdParty/dbcppp/Win64/lib/pkgconfig/libxml-2.0.pc
new file mode 100644
index 0000000..3dd088e
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/pkgconfig/libxml-2.0.pc
@@ -0,0 +1,13 @@
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include
+modules=1
+
+Name: libXML
+Version: 2.9.10
+Description: libXML library version2.
+Requires:
+Libs: -L${libdir} -lxml2
+Libs.private:       -lws2_32 
+Cflags: -I${includedir}/libxml2 -DLIBXML_STATIC
diff --git a/Source/ThirdParty/dbcppp/Win64/lib/xml2Conf.sh b/Source/ThirdParty/dbcppp/Win64/lib/xml2Conf.sh
new file mode 100644
index 0000000..0174141
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/Win64/lib/xml2Conf.sh
@@ -0,0 +1,8 @@
+#
+# Configuration file for using the XML library in GNOME applications
+#
+XML2_LIBDIR="-LC:/UnrealProjects/SodaSimBase/Plugins/UnrealSoda/Source/ThirdParty/dbcppp/Win64/lib"
+XML2_LIBS="-lxml2      "
+XML2_INCLUDEDIR="-IC:/UnrealProjects/SodaSimBase/Plugins/UnrealSoda/Source/ThirdParty/dbcppp/Win64/include/libxml2"
+MODULE_VERSION="xml2-2.9.10"
+
diff --git a/Source/ThirdParty/dbcppp/build_linux.bat b/Source/ThirdParty/dbcppp/build_linux.bat
new file mode 100644
index 0000000..241d3ed
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/build_linux.bat
@@ -0,0 +1,15 @@
+setlocal
+
+SET TOOLCHAIN_FILE="%cd%\..\unreal-linux-from-windows-toolchain.cmake"
+SET MAKE_EXE="C:\Program Files (x86)\GnuWin32\bin\make.exe" 
+SET INSTALL_DIR="%cd%\Linux"
+
+rd \s \q %INSTALL_DIR%
+mkdir %INSTALL_DIR%
+
+if not exist src\build_linux mkdir src\build_linux
+pushd src\build_linux
+
+cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=%TOOLCHAIN_FILE% -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -Dbuild_tests=OFF -Dbuild_examples=OFF  .. && make -j8 install
+
+popd
diff --git a/Source/ThirdParty/dbcppp/build_win.bat b/Source/ThirdParty/dbcppp/build_win.bat
new file mode 100644
index 0000000..341e758
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/build_win.bat
@@ -0,0 +1,11 @@
+setlocal
+
+SET INSTALL_DIR="%cd%\Win64"
+
+rd /s /q %INSTALL_DIR%
+mkdir %INSTALL_DIR%
+
+if not exist src\build_win mkdir src\build_win
+pushd src\build_win
+cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -Dbuild_tests=OFF -Dbuild_examples=OFF .. && nmake install
+popd
diff --git a/Source/ThirdParty/dbcppp/dbcppp.Build.cs b/Source/ThirdParty/dbcppp/dbcppp.Build.cs
new file mode 100644
index 0000000..ee1ae84
--- /dev/null
+++ b/Source/ThirdParty/dbcppp/dbcppp.Build.cs
@@ -0,0 +1,48 @@
+using System.IO;
+using UnrealBuildTool;
+using System;
+
+public class dbcppp : ModuleRules
+{
+	private string BinariesPath
+	{
+		get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../../../Binaries/", Target.Platform.ToString())); }
+	}
+
+	public dbcppp(ReadOnlyTargetRules Target) : base(Target)
+	{
+		Type = ModuleType.External;
+
+        PublicDefinitions.Add("DBCPPP_STATIC");
+
+        if (Target.Platform == UnrealTargetPlatform.Win64)
+		{
+			string InstallDir = Path.Combine(ModuleDirectory, "Win64");
+			//RuntimeDependencies.Add(Path.Combine(BinariesPath, "libdbcppp.dll"));
+			//RuntimeDependencies.Add(Path.Combine(BinariesPath, "libxml2.dll"));
+			//RuntimeDependencies.Add(Path.Combine(BinariesPath, "libxmlmm.dll"));;
+			PublicIncludePaths.Add(Path.Combine(InstallDir, "include"));
+            //PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "libdbcppp.lib"));
+
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib/libdbcppp.lib"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib/libxml2s.lib"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib/libxmlmm.lib"));
+
+
+        }
+		else if (Target.Platform == UnrealTargetPlatform.Linux)
+		{
+            string InstallDir = Path.Combine(ModuleDirectory, "Linux");
+            //RuntimeDependencies.Add(Path.Combine(BinariesPath, "libdbcppp.so"));
+            //RuntimeDependencies.Add(Path.Combine(BinariesPath, "libxml2.so"));
+            //RuntimeDependencies.Add(Path.Combine(BinariesPath, "libxml2.so.2.9.10"));
+            //RuntimeDependencies.Add(Path.Combine(BinariesPath, "libxmlmm.so"));
+            PublicIncludePaths.Add(Path.Combine(InstallDir, "include"));
+            //PublicAdditionalLibraries.Add(Path.Combine(BinariesPath, "libdbcppp.so"));
+
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib/libdbcppp.a"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib/libxml2.a"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib/libxmlmm.a"));
+        }
+	}
+}
diff --git a/Source/ThirdParty/libZmq/README b/Source/ThirdParty/libZmq/README
new file mode 100644
index 0000000..2c09483
--- /dev/null
+++ b/Source/ThirdParty/libZmq/README
@@ -0,0 +1 @@
+The Linux version of ZMQ is compiled from the source, but the source isn't inculded to this repo. See build_linux_example.sh to help how to build ZMQ for linux
diff --git a/Source/ThirdParty/libZmq/build_linux_example.sh b/Source/ThirdParty/libZmq/build_linux_example.sh
new file mode 100644
index 0000000..0d98726
--- /dev/null
+++ b/Source/ThirdParty/libZmq/build_linux_example.sh
@@ -0,0 +1,31 @@
+UE_LIBCXX=$UE4_ROOT/Engine/Source/ThirdParty/Linux/LibCxx
+UE_SYSROOT=$UE4_ROOT/Engine/Extras/ThirdPartyNotUE/SDKs/HostLinux/Linux_x64/v19_clang-11.0.1-centos7/x86_64-unknown-linux-gnu
+INSTALL_DIR=$PWD/Linux
+
+CC=$UE_SYSROOT/bin/clang
+CXX=$UE_SYSROOT/bin/clang++
+CCFLAGS="-nostdinc++ -nostdlib++ -g3 -O3 -I$UE_SYSROOT/usr/include -I$UE_LIBCXX/include -I$UE_LIBCXX/include/c++/v1 --sysroot=$UE_SYSROOT"
+CXXFLAGS=" -nostdinc++ -nostdlib++ -g3 -O3 -std=c++11 -I$UE_SYSROOT/usr/include -I$UE_LIBCXX/include -I$UE_LIBCXX/include/c++/v1 --sysroot=$UE_SYSROOT"
+LDFLAGS="-nodefaultlibs -stdlib=libc++  --gcc-toolchain=$UE_SYSROOT --sysroot=$UE_SYSROOT -B$UE_SYSROOT/usr/lib64 -L$UE_SYSROOT/usr/lib64 -L$UE_LIBCXX/lib/Linux/x86_64-unknown-linux-gnu/" 
+LIBS="$UE_LIBCXX/lib/Linux/x86_64-unknown-linux-gnu/libc++.a $UE_LIBCXX/lib/Linux/x86_64-unknown-linux-gnu/libc++abi.a -lc -lm -lgcc_s -lgcc"
+
+
+mkdir -p $INSTALL_DIR && rm -rf $INSTALL_DIR/*
+rm -rf build &&  mkdir build && pushd build
+cmake -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+      -DCMAKE_C_COMPILER="$CC" \
+      -DCMAKE_CXX_COMPILER="$CXX" \
+      -DCMAKE_MODULE_LINKER_FLAGS="$LIBS" \
+      -DCMAKE_EXE_LINKER_FLAGS="$LIBS" \
+      -DCMAKE_SHARED_LINKER_FLAGS="$LIBS" \
+      -DCMAKE_C_FLAGS="$CCFLAGS" \
+      -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+      -DCMAKE_CXX_STANDARD_LIBRARIES="$LIBS" \
+      -DBUILD_SHARED=ON \
+      -DBUILD_STATIC=OFF \
+      -DBUILD_TESTS=OFF \
+      -DWITH_LIBSODIUM=OFF .. && make -j8 install
+popd
+
+
diff --git a/Source/ThirdParty/libZmq/include/.DS_Store b/Source/ThirdParty/libZmq/include/.DS_Store
new file mode 100644
index 0000000..d07c653
Binary files /dev/null and b/Source/ThirdParty/libZmq/include/.DS_Store differ
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmq.h b/Source/ThirdParty/libZmq/include/Linux/zmq.h
new file mode 100644
index 0000000..d05659f
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmq.h
@@ -0,0 +1,788 @@
+/*
+    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
+
+    This file is part of libzmq, the ZeroMQ core engine in C++.
+
+    libzmq is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License (LGPL) as published
+    by the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    As a special exception, the Contributors give you permission to link
+    this library with independent modules to produce an executable,
+    regardless of the license terms of these independent modules, and to
+    copy and distribute the resulting executable under terms of your choice,
+    provided that you also meet, for each linked independent module, the
+    terms and conditions of the license of that module. An independent
+    module is a module which is not derived from or based on this library.
+    If you modify this library, you must extend this exception to your
+    version of the library.
+
+    libzmq is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+    License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    *************************************************************************
+    NOTE to contributors. This file comprises the principal public contract
+    for ZeroMQ API users. Any change to this file supplied in a stable
+    release SHOULD not break existing applications.
+    In practice this means that the value of constants must not change, and
+    that old values may not be reused for new constants.
+    *************************************************************************
+*/
+
+#ifndef __ZMQ_H_INCLUDED__
+#define __ZMQ_H_INCLUDED__
+
+/*  Version macros for compile-time API version detection                     */
+#define ZMQ_VERSION_MAJOR 4
+#define ZMQ_VERSION_MINOR 3
+#define ZMQ_VERSION_PATCH 4
+
+#define ZMQ_MAKE_VERSION(major, minor, patch)                                  \
+    ((major) *10000 + (minor) *100 + (patch))
+#define ZMQ_VERSION                                                            \
+    ZMQ_MAKE_VERSION (ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined _WIN32_WCE
+#include <errno.h>
+#endif
+#include <stddef.h>
+#include <stdio.h>
+#if defined _WIN32
+//  Set target version to Windows Server 2008, Windows Vista or higher.
+//  Windows XP (0x0501) is supported but without client & server socket types.
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+
+#ifdef __MINGW32__
+//  Require Windows XP or higher with MinGW for getaddrinfo().
+#if (_WIN32_WINNT >= 0x0501)
+#else
+#error You need at least Windows XP target
+#endif
+#endif
+#endif
+
+/*  Handle DSO symbol visibility                                             */
+#if defined _WIN32
+#if defined ZMQ_STATIC
+#define ZMQ_EXPORT
+#elif defined DLL_EXPORT
+#define ZMQ_EXPORT __declspec(dllexport)
+#else
+#define ZMQ_EXPORT __declspec(dllimport)
+#endif
+#else
+#if defined __SUNPRO_C || defined __SUNPRO_CC
+#define ZMQ_EXPORT __global
+#elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#define ZMQ_EXPORT __attribute__ ((visibility ("default")))
+#else
+#define ZMQ_EXPORT
+#endif
+#endif
+
+/*  Define integer types needed for event interface                          */
+#define ZMQ_DEFINED_STDINT 1
+#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
+#include <inttypes.h>
+#elif defined _MSC_VER && _MSC_VER < 1600
+#ifndef uint64_t
+typedef unsigned __int64 uint64_t;
+#endif
+#ifndef int32_t
+typedef __int32 int32_t;
+#endif
+#ifndef uint32_t
+typedef unsigned __int32 uint32_t;
+#endif
+#ifndef uint16_t
+typedef unsigned __int16 uint16_t;
+#endif
+#ifndef uint8_t
+typedef unsigned __int8 uint8_t;
+#endif
+#else
+#include <stdint.h>
+#endif
+
+//  32-bit AIX's pollfd struct members are called reqevents and rtnevents so it
+//  defines compatibility macros for them. Need to include that header first to
+//  stop build failures since zmq_pollset_t defines them as events and revents.
+#ifdef ZMQ_HAVE_AIX
+#include <poll.h>
+#endif
+
+
+/******************************************************************************/
+/*  0MQ errors.                                                               */
+/******************************************************************************/
+
+/*  A number random enough not to collide with different errno ranges on      */
+/*  different OSes. The assumption is that error_t is at least 32-bit type.   */
+#define ZMQ_HAUSNUMERO 156384712
+
+/*  On Windows platform some of the standard POSIX errnos are not defined.    */
+#ifndef ENOTSUP
+#define ENOTSUP (ZMQ_HAUSNUMERO + 1)
+#endif
+#ifndef EPROTONOSUPPORT
+#define EPROTONOSUPPORT (ZMQ_HAUSNUMERO + 2)
+#endif
+#ifndef ENOBUFS
+#define ENOBUFS (ZMQ_HAUSNUMERO + 3)
+#endif
+#ifndef ENETDOWN
+#define ENETDOWN (ZMQ_HAUSNUMERO + 4)
+#endif
+#ifndef EADDRINUSE
+#define EADDRINUSE (ZMQ_HAUSNUMERO + 5)
+#endif
+#ifndef EADDRNOTAVAIL
+#define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6)
+#endif
+#ifndef ECONNREFUSED
+#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7)
+#endif
+#ifndef EINPROGRESS
+#define EINPROGRESS (ZMQ_HAUSNUMERO + 8)
+#endif
+#ifndef ENOTSOCK
+#define ENOTSOCK (ZMQ_HAUSNUMERO + 9)
+#endif
+#ifndef EMSGSIZE
+#define EMSGSIZE (ZMQ_HAUSNUMERO + 10)
+#endif
+#ifndef EAFNOSUPPORT
+#define EAFNOSUPPORT (ZMQ_HAUSNUMERO + 11)
+#endif
+#ifndef ENETUNREACH
+#define ENETUNREACH (ZMQ_HAUSNUMERO + 12)
+#endif
+#ifndef ECONNABORTED
+#define ECONNABORTED (ZMQ_HAUSNUMERO + 13)
+#endif
+#ifndef ECONNRESET
+#define ECONNRESET (ZMQ_HAUSNUMERO + 14)
+#endif
+#ifndef ENOTCONN
+#define ENOTCONN (ZMQ_HAUSNUMERO + 15)
+#endif
+#ifndef ETIMEDOUT
+#define ETIMEDOUT (ZMQ_HAUSNUMERO + 16)
+#endif
+#ifndef EHOSTUNREACH
+#define EHOSTUNREACH (ZMQ_HAUSNUMERO + 17)
+#endif
+#ifndef ENETRESET
+#define ENETRESET (ZMQ_HAUSNUMERO + 18)
+#endif
+
+/*  Native 0MQ error codes.                                                   */
+#define EFSM (ZMQ_HAUSNUMERO + 51)
+#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
+#define ETERM (ZMQ_HAUSNUMERO + 53)
+#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
+
+/*  This function retrieves the errno as it is known to 0MQ library. The goal */
+/*  of this function is to make the code 100% portable, including where 0MQ   */
+/*  compiled with certain CRT library (on Windows) is linked to an            */
+/*  application that uses different CRT library.                              */
+ZMQ_EXPORT int zmq_errno (void);
+
+/*  Resolves system errors and 0MQ errors to human-readable string.           */
+ZMQ_EXPORT const char *zmq_strerror (int errnum_);
+
+/*  Run-time API version detection                                            */
+ZMQ_EXPORT void zmq_version (int *major_, int *minor_, int *patch_);
+
+/******************************************************************************/
+/*  0MQ infrastructure (a.k.a. context) initialisation & termination.         */
+/******************************************************************************/
+
+/*  Context options                                                           */
+#define ZMQ_IO_THREADS 1
+#define ZMQ_MAX_SOCKETS 2
+#define ZMQ_SOCKET_LIMIT 3
+#define ZMQ_THREAD_PRIORITY 3
+#define ZMQ_THREAD_SCHED_POLICY 4
+#define ZMQ_MAX_MSGSZ 5
+#define ZMQ_MSG_T_SIZE 6
+#define ZMQ_THREAD_AFFINITY_CPU_ADD 7
+#define ZMQ_THREAD_AFFINITY_CPU_REMOVE 8
+#define ZMQ_THREAD_NAME_PREFIX 9
+
+/*  Default for new contexts                                                  */
+#define ZMQ_IO_THREADS_DFLT 1
+#define ZMQ_MAX_SOCKETS_DFLT 1023
+#define ZMQ_THREAD_PRIORITY_DFLT -1
+#define ZMQ_THREAD_SCHED_POLICY_DFLT -1
+
+ZMQ_EXPORT void *zmq_ctx_new (void);
+ZMQ_EXPORT int zmq_ctx_term (void *context_);
+ZMQ_EXPORT int zmq_ctx_shutdown (void *context_);
+ZMQ_EXPORT int zmq_ctx_set (void *context_, int option_, int optval_);
+ZMQ_EXPORT int zmq_ctx_get (void *context_, int option_);
+
+/*  Old (legacy) API                                                          */
+ZMQ_EXPORT void *zmq_init (int io_threads_);
+ZMQ_EXPORT int zmq_term (void *context_);
+ZMQ_EXPORT int zmq_ctx_destroy (void *context_);
+
+
+/******************************************************************************/
+/*  0MQ message definition.                                                   */
+/******************************************************************************/
+
+/* Some architectures, like sparc64 and some variants of aarch64, enforce pointer
+ * alignment and raise sigbus on violations. Make sure applications allocate
+ * zmq_msg_t on addresses aligned on a pointer-size boundary to avoid this issue.
+ */
+typedef struct zmq_msg_t
+{
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
+    __declspec(align (8)) unsigned char _[64];
+#elif defined(_MSC_VER)                                                        \
+  && (defined(_M_IX86) || defined(_M_ARM_ARMV7VE) || defined(_M_ARM))
+    __declspec(align (4)) unsigned char _[64];
+#elif defined(__GNUC__) || defined(__INTEL_COMPILER)                           \
+  || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590)                              \
+  || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
+    unsigned char _[64] __attribute__ ((aligned (sizeof (void *))));
+#else
+    unsigned char _[64];
+#endif
+} zmq_msg_t;
+
+typedef void(zmq_free_fn) (void *data_, void *hint_);
+
+ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_);
+ZMQ_EXPORT int zmq_msg_init_data (
+  zmq_msg_t *msg_, void *data_, size_t size_, zmq_free_fn *ffn_, void *hint_);
+ZMQ_EXPORT int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_);
+ZMQ_EXPORT int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_);
+ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest_, zmq_msg_t *src_);
+ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest_, zmq_msg_t *src_);
+ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg_);
+ZMQ_EXPORT size_t zmq_msg_size (const zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_more (const zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_get (const zmq_msg_t *msg_, int property_);
+ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg_, int property_, int optval_);
+ZMQ_EXPORT const char *zmq_msg_gets (const zmq_msg_t *msg_,
+                                     const char *property_);
+
+/******************************************************************************/
+/*  0MQ socket definition.                                                    */
+/******************************************************************************/
+
+/*  Socket types.                                                             */
+#define ZMQ_PAIR 0
+#define ZMQ_PUB 1
+#define ZMQ_SUB 2
+#define ZMQ_REQ 3
+#define ZMQ_REP 4
+#define ZMQ_DEALER 5
+#define ZMQ_ROUTER 6
+#define ZMQ_PULL 7
+#define ZMQ_PUSH 8
+#define ZMQ_XPUB 9
+#define ZMQ_XSUB 10
+#define ZMQ_STREAM 11
+
+/*  Deprecated aliases                                                        */
+#define ZMQ_XREQ ZMQ_DEALER
+#define ZMQ_XREP ZMQ_ROUTER
+
+/*  Socket options.                                                           */
+#define ZMQ_AFFINITY 4
+#define ZMQ_ROUTING_ID 5
+#define ZMQ_SUBSCRIBE 6
+#define ZMQ_UNSUBSCRIBE 7
+#define ZMQ_RATE 8
+#define ZMQ_RECOVERY_IVL 9
+#define ZMQ_SNDBUF 11
+#define ZMQ_RCVBUF 12
+#define ZMQ_RCVMORE 13
+#define ZMQ_FD 14
+#define ZMQ_EVENTS 15
+#define ZMQ_TYPE 16
+#define ZMQ_LINGER 17
+#define ZMQ_RECONNECT_IVL 18
+#define ZMQ_BACKLOG 19
+#define ZMQ_RECONNECT_IVL_MAX 21
+#define ZMQ_MAXMSGSIZE 22
+#define ZMQ_SNDHWM 23
+#define ZMQ_RCVHWM 24
+#define ZMQ_MULTICAST_HOPS 25
+#define ZMQ_RCVTIMEO 27
+#define ZMQ_SNDTIMEO 28
+#define ZMQ_LAST_ENDPOINT 32
+#define ZMQ_ROUTER_MANDATORY 33
+#define ZMQ_TCP_KEEPALIVE 34
+#define ZMQ_TCP_KEEPALIVE_CNT 35
+#define ZMQ_TCP_KEEPALIVE_IDLE 36
+#define ZMQ_TCP_KEEPALIVE_INTVL 37
+#define ZMQ_IMMEDIATE 39
+#define ZMQ_XPUB_VERBOSE 40
+#define ZMQ_ROUTER_RAW 41
+#define ZMQ_IPV6 42
+#define ZMQ_MECHANISM 43
+#define ZMQ_PLAIN_SERVER 44
+#define ZMQ_PLAIN_USERNAME 45
+#define ZMQ_PLAIN_PASSWORD 46
+#define ZMQ_CURVE_SERVER 47
+#define ZMQ_CURVE_PUBLICKEY 48
+#define ZMQ_CURVE_SECRETKEY 49
+#define ZMQ_CURVE_SERVERKEY 50
+#define ZMQ_PROBE_ROUTER 51
+#define ZMQ_REQ_CORRELATE 52
+#define ZMQ_REQ_RELAXED 53
+#define ZMQ_CONFLATE 54
+#define ZMQ_ZAP_DOMAIN 55
+#define ZMQ_ROUTER_HANDOVER 56
+#define ZMQ_TOS 57
+#define ZMQ_CONNECT_ROUTING_ID 61
+#define ZMQ_GSSAPI_SERVER 62
+#define ZMQ_GSSAPI_PRINCIPAL 63
+#define ZMQ_GSSAPI_SERVICE_PRINCIPAL 64
+#define ZMQ_GSSAPI_PLAINTEXT 65
+#define ZMQ_HANDSHAKE_IVL 66
+#define ZMQ_SOCKS_PROXY 68
+#define ZMQ_XPUB_NODROP 69
+#define ZMQ_BLOCKY 70
+#define ZMQ_XPUB_MANUAL 71
+#define ZMQ_XPUB_WELCOME_MSG 72
+#define ZMQ_STREAM_NOTIFY 73
+#define ZMQ_INVERT_MATCHING 74
+#define ZMQ_HEARTBEAT_IVL 75
+#define ZMQ_HEARTBEAT_TTL 76
+#define ZMQ_HEARTBEAT_TIMEOUT 77
+#define ZMQ_XPUB_VERBOSER 78
+#define ZMQ_CONNECT_TIMEOUT 79
+#define ZMQ_TCP_MAXRT 80
+#define ZMQ_THREAD_SAFE 81
+#define ZMQ_MULTICAST_MAXTPDU 84
+#define ZMQ_VMCI_BUFFER_SIZE 85
+#define ZMQ_VMCI_BUFFER_MIN_SIZE 86
+#define ZMQ_VMCI_BUFFER_MAX_SIZE 87
+#define ZMQ_VMCI_CONNECT_TIMEOUT 88
+#define ZMQ_USE_FD 89
+#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
+#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
+#define ZMQ_BINDTODEVICE 92
+
+/*  Message options                                                           */
+#define ZMQ_MORE 1
+#define ZMQ_SHARED 3
+
+/*  Send/recv options.                                                        */
+#define ZMQ_DONTWAIT 1
+#define ZMQ_SNDMORE 2
+
+/*  Security mechanisms                                                       */
+#define ZMQ_NULL 0
+#define ZMQ_PLAIN 1
+#define ZMQ_CURVE 2
+#define ZMQ_GSSAPI 3
+
+/*  RADIO-DISH protocol                                                       */
+#define ZMQ_GROUP_MAX_LENGTH 255
+
+/*  Deprecated options and aliases                                            */
+#define ZMQ_IDENTITY ZMQ_ROUTING_ID
+#define ZMQ_CONNECT_RID ZMQ_CONNECT_ROUTING_ID
+#define ZMQ_TCP_ACCEPT_FILTER 38
+#define ZMQ_IPC_FILTER_PID 58
+#define ZMQ_IPC_FILTER_UID 59
+#define ZMQ_IPC_FILTER_GID 60
+#define ZMQ_IPV4ONLY 31
+#define ZMQ_DELAY_ATTACH_ON_CONNECT ZMQ_IMMEDIATE
+#define ZMQ_NOBLOCK ZMQ_DONTWAIT
+#define ZMQ_FAIL_UNROUTABLE ZMQ_ROUTER_MANDATORY
+#define ZMQ_ROUTER_BEHAVIOR ZMQ_ROUTER_MANDATORY
+
+/*  Deprecated Message options                                                */
+#define ZMQ_SRCFD 2
+
+/******************************************************************************/
+/*  GSSAPI definitions                                                        */
+/******************************************************************************/
+
+/*  GSSAPI principal name types                                               */
+#define ZMQ_GSSAPI_NT_HOSTBASED 0
+#define ZMQ_GSSAPI_NT_USER_NAME 1
+#define ZMQ_GSSAPI_NT_KRB5_PRINCIPAL 2
+
+/******************************************************************************/
+/*  0MQ socket events and monitoring                                          */
+/******************************************************************************/
+
+/*  Socket transport events (TCP, IPC and TIPC only)                          */
+
+#define ZMQ_EVENT_CONNECTED 0x0001
+#define ZMQ_EVENT_CONNECT_DELAYED 0x0002
+#define ZMQ_EVENT_CONNECT_RETRIED 0x0004
+#define ZMQ_EVENT_LISTENING 0x0008
+#define ZMQ_EVENT_BIND_FAILED 0x0010
+#define ZMQ_EVENT_ACCEPTED 0x0020
+#define ZMQ_EVENT_ACCEPT_FAILED 0x0040
+#define ZMQ_EVENT_CLOSED 0x0080
+#define ZMQ_EVENT_CLOSE_FAILED 0x0100
+#define ZMQ_EVENT_DISCONNECTED 0x0200
+#define ZMQ_EVENT_MONITOR_STOPPED 0x0400
+#define ZMQ_EVENT_ALL 0xFFFF
+/*  Unspecified system errors during handshake. Event value is an errno.      */
+#define ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL 0x0800
+/*  Handshake complete successfully with successful authentication (if        *
+ *  enabled). Event value is unused.                                          */
+#define ZMQ_EVENT_HANDSHAKE_SUCCEEDED 0x1000
+/*  Protocol errors between ZMTP peers or between server and ZAP handler.     *
+ *  Event value is one of ZMQ_PROTOCOL_ERROR_*                                */
+#define ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL 0x2000
+/*  Failed authentication requests. Event value is the numeric ZAP status     *
+ *  code, i.e. 300, 400 or 500.                                               */
+#define ZMQ_EVENT_HANDSHAKE_FAILED_AUTH 0x4000
+#define ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED 0x10000000
+#define ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND 0x10000001
+#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE 0x10000002
+#define ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE 0x10000003
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED 0x10000011
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE 0x10000012
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO 0x10000013
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE 0x10000014
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR 0x10000015
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY 0x10000016
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME 0x10000017
+#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA 0x10000018
+// the following two may be due to erroneous configuration of a peer
+#define ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC 0x11000001
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH 0x11000002
+#define ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED 0x20000000
+#define ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY 0x20000001
+#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID 0x20000002
+#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION 0x20000003
+#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE 0x20000004
+#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA 0x20000005
+#define ZMQ_PROTOCOL_ERROR_WS_UNSPECIFIED 0x30000000
+
+ZMQ_EXPORT void *zmq_socket (void *, int type_);
+ZMQ_EXPORT int zmq_close (void *s_);
+ZMQ_EXPORT int
+zmq_setsockopt (void *s_, int option_, const void *optval_, size_t optvallen_);
+ZMQ_EXPORT int
+zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_);
+ZMQ_EXPORT int zmq_bind (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_connect (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_unbind (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_disconnect (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_send (void *s_, const void *buf_, size_t len_, int flags_);
+ZMQ_EXPORT int
+zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_);
+ZMQ_EXPORT int zmq_recv (void *s_, void *buf_, size_t len_, int flags_);
+ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_);
+
+/******************************************************************************/
+/*  Hide socket fd type; this was before zmq_poller_event_t typedef below     */
+/******************************************************************************/
+
+#if defined _WIN32
+// Windows uses a pointer-sized unsigned integer to store the socket fd.
+#if defined _WIN64
+typedef unsigned __int64 zmq_fd_t;
+#else
+typedef unsigned int zmq_fd_t;
+#endif
+#else
+typedef int zmq_fd_t;
+#endif
+
+/******************************************************************************/
+/*  Deprecated I/O multiplexing. Prefer using zmq_poller API                  */
+/******************************************************************************/
+
+#define ZMQ_POLLIN 1
+#define ZMQ_POLLOUT 2
+#define ZMQ_POLLERR 4
+#define ZMQ_POLLPRI 8
+
+typedef struct zmq_pollitem_t
+{
+    void *socket;
+    zmq_fd_t fd;
+    short events;
+    short revents;
+} zmq_pollitem_t;
+
+#define ZMQ_POLLITEMS_DFLT 16
+
+ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_);
+
+/******************************************************************************/
+/*  Message proxying                                                          */
+/******************************************************************************/
+
+ZMQ_EXPORT int zmq_proxy (void *frontend_, void *backend_, void *capture_);
+ZMQ_EXPORT int zmq_proxy_steerable (void *frontend_,
+                                    void *backend_,
+                                    void *capture_,
+                                    void *control_);
+
+/******************************************************************************/
+/*  Probe library capabilities                                                */
+/******************************************************************************/
+
+#define ZMQ_HAS_CAPABILITIES 1
+ZMQ_EXPORT int zmq_has (const char *capability_);
+
+/*  Deprecated aliases */
+#define ZMQ_STREAMER 1
+#define ZMQ_FORWARDER 2
+#define ZMQ_QUEUE 3
+
+/*  Deprecated methods */
+ZMQ_EXPORT int zmq_device (int type_, void *frontend_, void *backend_);
+ZMQ_EXPORT int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_);
+ZMQ_EXPORT int zmq_recvmsg (void *s_, zmq_msg_t *msg_, int flags_);
+struct iovec;
+ZMQ_EXPORT int
+zmq_sendiov (void *s_, struct iovec *iov_, size_t count_, int flags_);
+ZMQ_EXPORT int
+zmq_recviov (void *s_, struct iovec *iov_, size_t *count_, int flags_);
+
+/******************************************************************************/
+/*  Encryption functions                                                      */
+/******************************************************************************/
+
+/*  Encode data with Z85 encoding. Returns encoded data                       */
+ZMQ_EXPORT char *
+zmq_z85_encode (char *dest_, const uint8_t *data_, size_t size_);
+
+/*  Decode data with Z85 encoding. Returns decoded data                       */
+ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest_, const char *string_);
+
+/*  Generate z85-encoded public and private keypair with tweetnacl/libsodium. */
+/*  Returns 0 on success.                                                     */
+ZMQ_EXPORT int zmq_curve_keypair (char *z85_public_key_, char *z85_secret_key_);
+
+/*  Derive the z85-encoded public key from the z85-encoded secret key.        */
+/*  Returns 0 on success.                                                     */
+ZMQ_EXPORT int zmq_curve_public (char *z85_public_key_,
+                                 const char *z85_secret_key_);
+
+/******************************************************************************/
+/*  Atomic utility methods                                                    */
+/******************************************************************************/
+
+ZMQ_EXPORT void *zmq_atomic_counter_new (void);
+ZMQ_EXPORT void zmq_atomic_counter_set (void *counter_, int value_);
+ZMQ_EXPORT int zmq_atomic_counter_inc (void *counter_);
+ZMQ_EXPORT int zmq_atomic_counter_dec (void *counter_);
+ZMQ_EXPORT int zmq_atomic_counter_value (void *counter_);
+ZMQ_EXPORT void zmq_atomic_counter_destroy (void **counter_p_);
+
+/******************************************************************************/
+/*  Scheduling timers                                                         */
+/******************************************************************************/
+
+#define ZMQ_HAVE_TIMERS
+
+typedef void(zmq_timer_fn) (int timer_id, void *arg);
+
+ZMQ_EXPORT void *zmq_timers_new (void);
+ZMQ_EXPORT int zmq_timers_destroy (void **timers_p);
+ZMQ_EXPORT int
+zmq_timers_add (void *timers, size_t interval, zmq_timer_fn handler, void *arg);
+ZMQ_EXPORT int zmq_timers_cancel (void *timers, int timer_id);
+ZMQ_EXPORT int
+zmq_timers_set_interval (void *timers, int timer_id, size_t interval);
+ZMQ_EXPORT int zmq_timers_reset (void *timers, int timer_id);
+ZMQ_EXPORT long zmq_timers_timeout (void *timers);
+ZMQ_EXPORT int zmq_timers_execute (void *timers);
+
+
+/******************************************************************************/
+/*  These functions are not documented by man pages -- use at your own risk.  */
+/*  If you need these to be part of the formal ZMQ API, then (a) write a man  */
+/*  page, and (b) write a test case in tests.                                 */
+/******************************************************************************/
+
+/*  Helper functions are used by perf tests so that they don't have to care   */
+/*  about minutiae of time-related functions on different OS platforms.       */
+
+/*  Starts the stopwatch. Returns the handle to the watch.                    */
+ZMQ_EXPORT void *zmq_stopwatch_start (void);
+
+/*  Returns the number of microseconds elapsed since the stopwatch was        */
+/*  started, but does not stop or deallocate the stopwatch.                   */
+ZMQ_EXPORT unsigned long zmq_stopwatch_intermediate (void *watch_);
+
+/*  Stops the stopwatch. Returns the number of microseconds elapsed since     */
+/*  the stopwatch was started, and deallocates that watch.                    */
+ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
+
+/*  Sleeps for specified number of seconds.                                   */
+ZMQ_EXPORT void zmq_sleep (int seconds_);
+
+typedef void(zmq_thread_fn) (void *);
+
+/* Start a thread. Returns a handle to the thread.                            */
+ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn *func_, void *arg_);
+
+/* Wait for thread to complete then free up resources.                        */
+ZMQ_EXPORT void zmq_threadclose (void *thread_);
+
+
+/******************************************************************************/
+/*  These functions are DRAFT and disabled in stable releases, and subject to */
+/*  change at ANY time until declared stable.                                 */
+/******************************************************************************/
+
+#ifdef ZMQ_BUILD_DRAFT_API
+
+/*  DRAFT Socket types.                                                       */
+#define ZMQ_SERVER 12
+#define ZMQ_CLIENT 13
+#define ZMQ_RADIO 14
+#define ZMQ_DISH 15
+#define ZMQ_GATHER 16
+#define ZMQ_SCATTER 17
+#define ZMQ_DGRAM 18
+#define ZMQ_PEER 19
+#define ZMQ_CHANNEL 20
+
+/*  DRAFT Socket options.                                                     */
+#define ZMQ_ZAP_ENFORCE_DOMAIN 93
+#define ZMQ_LOOPBACK_FASTPATH 94
+#define ZMQ_METADATA 95
+#define ZMQ_MULTICAST_LOOP 96
+#define ZMQ_ROUTER_NOTIFY 97
+#define ZMQ_XPUB_MANUAL_LAST_VALUE 98
+#define ZMQ_SOCKS_USERNAME 99
+#define ZMQ_SOCKS_PASSWORD 100
+#define ZMQ_IN_BATCH_SIZE 101
+#define ZMQ_OUT_BATCH_SIZE 102
+#define ZMQ_WSS_KEY_PEM 103
+#define ZMQ_WSS_CERT_PEM 104
+#define ZMQ_WSS_TRUST_PEM 105
+#define ZMQ_WSS_HOSTNAME 106
+#define ZMQ_WSS_TRUST_SYSTEM 107
+#define ZMQ_ONLY_FIRST_SUBSCRIBE 108
+#define ZMQ_RECONNECT_STOP 109
+#define ZMQ_HELLO_MSG 110
+#define ZMQ_DISCONNECT_MSG 111
+#define ZMQ_PRIORITY 112
+
+/*  DRAFT ZMQ_RECONNECT_STOP options                                          */
+#define ZMQ_RECONNECT_STOP_CONN_REFUSED 0x1
+#define ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED 0x2
+#define ZMQ_RECONNECT_STOP_AFTER_DISCONNECT 0x3
+
+/*  DRAFT Context options                                                     */
+#define ZMQ_ZERO_COPY_RECV 10
+
+/*  DRAFT Context methods.                                                    */
+ZMQ_EXPORT int zmq_ctx_set_ext (void *context_,
+                                int option_,
+                                const void *optval_,
+                                size_t optvallen_);
+ZMQ_EXPORT int zmq_ctx_get_ext (void *context_,
+                                int option_,
+                                void *optval_,
+                                size_t *optvallen_);
+
+/*  DRAFT Socket methods.                                                     */
+ZMQ_EXPORT int zmq_join (void *s, const char *group);
+ZMQ_EXPORT int zmq_leave (void *s, const char *group);
+ZMQ_EXPORT uint32_t zmq_connect_peer (void *s_, const char *addr_);
+
+/*  DRAFT Msg methods.                                                        */
+ZMQ_EXPORT int zmq_msg_set_routing_id (zmq_msg_t *msg, uint32_t routing_id);
+ZMQ_EXPORT uint32_t zmq_msg_routing_id (zmq_msg_t *msg);
+ZMQ_EXPORT int zmq_msg_set_group (zmq_msg_t *msg, const char *group);
+ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
+ZMQ_EXPORT int
+zmq_msg_init_buffer (zmq_msg_t *msg_, const void *buf_, size_t size_);
+
+/*  DRAFT Msg property names.                                                 */
+#define ZMQ_MSG_PROPERTY_ROUTING_ID "Routing-Id"
+#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
+#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
+#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
+
+/*  Router notify options                                                     */
+#define ZMQ_NOTIFY_CONNECT 1
+#define ZMQ_NOTIFY_DISCONNECT 2
+
+/******************************************************************************/
+/*  Poller polling on sockets,fd and thread-safe sockets                      */
+/******************************************************************************/
+
+#define ZMQ_HAVE_POLLER
+
+typedef struct zmq_poller_event_t
+{
+    void *socket;
+    zmq_fd_t fd;
+    void *user_data;
+    short events;
+} zmq_poller_event_t;
+
+ZMQ_EXPORT void *zmq_poller_new (void);
+ZMQ_EXPORT int zmq_poller_destroy (void **poller_p);
+ZMQ_EXPORT int zmq_poller_size (void *poller);
+ZMQ_EXPORT int
+zmq_poller_add (void *poller, void *socket, void *user_data, short events);
+ZMQ_EXPORT int zmq_poller_modify (void *poller, void *socket, short events);
+ZMQ_EXPORT int zmq_poller_remove (void *poller, void *socket);
+ZMQ_EXPORT int
+zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
+ZMQ_EXPORT int zmq_poller_wait_all (void *poller,
+                                    zmq_poller_event_t *events,
+                                    int n_events,
+                                    long timeout);
+ZMQ_EXPORT int zmq_poller_fd (void *poller, zmq_fd_t *fd);
+
+ZMQ_EXPORT int
+zmq_poller_add_fd (void *poller, zmq_fd_t fd, void *user_data, short events);
+ZMQ_EXPORT int zmq_poller_modify_fd (void *poller, zmq_fd_t fd, short events);
+ZMQ_EXPORT int zmq_poller_remove_fd (void *poller, zmq_fd_t fd);
+
+ZMQ_EXPORT int zmq_socket_get_peer_state (void *socket,
+                                          const void *routing_id,
+                                          size_t routing_id_size);
+
+/*  DRAFT Socket monitoring events                                            */
+#define ZMQ_EVENT_PIPES_STATS 0x10000
+
+#define ZMQ_CURRENT_EVENT_VERSION 1
+#define ZMQ_CURRENT_EVENT_VERSION_DRAFT 2
+
+#define ZMQ_EVENT_ALL_V1 ZMQ_EVENT_ALL
+#define ZMQ_EVENT_ALL_V2 ZMQ_EVENT_ALL_V1 | ZMQ_EVENT_PIPES_STATS
+
+ZMQ_EXPORT int zmq_socket_monitor_versioned (
+  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_);
+ZMQ_EXPORT int zmq_socket_monitor_pipes_stats (void *s);
+
+#endif // ZMQ_BUILD_DRAFT_API
+
+
+#undef ZMQ_EXPORT
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmq.hpp b/Source/ThirdParty/libZmq/include/Linux/zmq.hpp
new file mode 100644
index 0000000..37817db
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmq.hpp
@@ -0,0 +1,789 @@
+/*
+    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2011 Botond Ballo
+    Copyright (c) 2007-2009 iMatix Corporation
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to
+    deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+    sell copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+    IN THE SOFTWARE.
+*/
+
+#ifndef __ZMQ_HPP_INCLUDED__
+#define __ZMQ_HPP_INCLUDED__
+
+#if __cplusplus >= 201103L
+#define ZMQ_CPP11
+#define ZMQ_NOTHROW noexcept
+#define ZMQ_EXPLICIT explicit
+#else
+    #define ZMQ_CPP03
+    #define ZMQ_NOTHROW
+    #define ZMQ_EXPLICIT
+#endif
+
+#include <zmq.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <exception>
+#include <vector>
+#include <iterator>
+
+#ifdef ZMQ_CPP11
+#include <chrono>
+#include <tuple>
+#endif
+
+//  Detect whether the compiler supports C++11 rvalue references.
+#if (defined(__GNUC__) && (__GNUC__ > 4 || \
+      (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && \
+      defined(__GXX_EXPERIMENTAL_CXX0X__))
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION = delete
+#elif defined(__clang__)
+    #if __has_feature(cxx_rvalue_references)
+        #define ZMQ_HAS_RVALUE_REFS
+    #endif
+
+    #if __has_feature(cxx_deleted_functions)
+        #define ZMQ_DELETED_FUNCTION = delete
+    #else
+        #define ZMQ_DELETED_FUNCTION
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER >= 1600)
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION
+#else
+    #define ZMQ_DELETED_FUNCTION
+#endif
+
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 3, 0)
+#define ZMQ_NEW_MONITOR_EVENT_LAYOUT
+#endif
+
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0)
+#define ZMQ_HAS_PROXY_STEERABLE
+/*  Socket event data  */
+typedef struct {
+    uint16_t event;  // id of the event as bitfield
+    int32_t  value ; // value is either error code, fd or reconnect interval
+} zmq_event_t;
+#endif
+
+// Avoid using deprecated message receive function when possible
+#if ZMQ_VERSION < ZMQ_MAKE_VERSION(3, 2, 0)
+#  define zmq_msg_recv(msg, socket, flags) zmq_recvmsg(socket, msg, flags)
+#endif
+
+
+// In order to prevent unused variable warnings when building in non-debug
+// mode use this macro to make assertions.
+#ifndef NDEBUG
+#   define ZMQ_ASSERT(expression) assert(expression)
+#else
+#   define ZMQ_ASSERT(expression) (void)(expression)
+#endif
+
+namespace zmq
+{
+
+    typedef zmq_free_fn free_fn;
+    typedef zmq_pollitem_t pollitem_t;
+
+    class error_t : public std::exception
+    {
+    public:
+
+        error_t () : errnum (zmq_errno ()) {}
+
+        virtual const char *what () const throw ()
+        {
+            return zmq_strerror (errnum);
+        }
+
+        int num () const
+        {
+            return errnum;
+        }
+
+    private:
+
+        int errnum;
+    };
+
+    inline int poll (zmq_pollitem_t const* items_, size_t nitems_, long timeout_ = -1)
+    {
+        int rc = zmq_poll (const_cast<zmq_pollitem_t*>(items_), static_cast<int>(nitems_), timeout_);
+        if (rc < 0)
+            throw error_t ();
+        return rc;
+    }
+
+    inline int poll(zmq_pollitem_t const* items, size_t nitems)
+    {
+        return poll(items, nitems, -1);
+    }
+
+    #ifdef ZMQ_CPP11
+    inline int poll(zmq_pollitem_t const* items, size_t nitems, std::chrono::milliseconds timeout)
+    {
+        return poll(items, nitems, timeout.count() );
+    }
+
+    inline int poll(std::vector<zmq_pollitem_t> const& items, std::chrono::milliseconds timeout)
+    {
+        return poll(items.data(), items.size(), timeout.count() );
+    }
+
+    inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)
+    {
+        return poll(items.data(), items.size(), timeout_);
+    }
+    #endif
+
+
+
+    inline void proxy (void *frontend, void *backend, void *capture)
+    {
+        int rc = zmq_proxy (frontend, backend, capture);
+        if (rc != 0)
+            throw error_t ();
+    }
+    
+#ifdef ZMQ_HAS_PROXY_STEERABLE
+    inline void proxy_steerable (void *frontend, void *backend, void *capture, void *control)
+    {
+        int rc = zmq_proxy_steerable (frontend, backend, capture, control);
+        if (rc != 0)
+            throw error_t ();
+    }
+#endif
+    
+    inline void version (int *major_, int *minor_, int *patch_)
+    {
+        zmq_version (major_, minor_, patch_);
+    }
+
+    #ifdef ZMQ_CPP11
+    inline std::tuple<int, int, int> version()
+    {
+        std::tuple<int, int, int> v;
+        zmq_version(&std::get<0>(v), &std::get<1>(v), &std::get<2>(v) );
+        return v;
+    }
+    #endif
+
+    class message_t
+    {
+        friend class socket_t;
+
+    public:
+
+        inline message_t ()
+        {
+            int rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline explicit message_t (size_t size_)
+        {
+            int rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        template<typename I> message_t(I first, I last):
+            msg()
+        {
+            typedef typename std::iterator_traits<I>::difference_type size_type;
+            typedef typename std::iterator_traits<I>::value_type value_t;
+
+            size_type const size_ = std::distance(first, last)*sizeof(value_t);
+            int const rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            value_t* dest = data<value_t>();
+            while (first != last)
+            {
+                *dest = *first;
+                ++dest; ++first;
+            }
+        }
+
+        inline message_t (const void *data_, size_t size_)
+        {
+            int rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            memcpy(data(), data_, size_);
+        }
+
+        inline message_t (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline message_t (message_t &&rhs): msg (rhs.msg)
+        {
+            int rc = zmq_msg_init (&rhs.msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline message_t &operator = (message_t &&rhs) ZMQ_NOTHROW
+        {
+            std::swap (msg, rhs.msg);
+            return *this;
+        }
+#endif
+
+        inline ~message_t () ZMQ_NOTHROW
+        {
+            int rc = zmq_msg_close (&msg);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        inline void rebuild ()
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (size_t size_)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (const void *data_, size_t size_)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            memcpy(data(), data_, size_);
+        }
+
+        inline void rebuild (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void move (message_t const *msg_)
+        {
+            int rc = zmq_msg_move (&msg, const_cast<zmq_msg_t*>(&(msg_->msg)));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void copy (message_t const *msg_)
+        {
+            int rc = zmq_msg_copy (&msg, const_cast<zmq_msg_t*>(&(msg_->msg)));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool more () const ZMQ_NOTHROW
+        {
+            int rc = zmq_msg_more (const_cast<zmq_msg_t*>(&msg) );
+            return rc != 0;
+        }
+
+        inline void *data () ZMQ_NOTHROW
+        {
+            return zmq_msg_data (&msg);
+        }
+
+        inline const void* data () const ZMQ_NOTHROW
+        {
+            return zmq_msg_data (const_cast<zmq_msg_t*>(&msg));
+        }
+
+        inline size_t size () const ZMQ_NOTHROW
+        {
+            return zmq_msg_size (const_cast<zmq_msg_t*>(&msg));
+        }
+
+        template<typename T> T* data() ZMQ_NOTHROW
+        {
+            return static_cast<T*>( data() );
+        }
+
+        template<typename T> T const* data() const ZMQ_NOTHROW
+        {
+            return static_cast<T const*>( data() );
+        }
+
+
+    private:
+        //  The underlying message
+        zmq_msg_t msg;
+
+        //  Disable implicit message copying, so that users won't use shared
+        //  messages (less efficient) without being aware of the fact.
+        message_t (const message_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const message_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    class context_t
+    {
+        friend class socket_t;
+
+    public:
+        inline context_t ()
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+
+        inline explicit context_t (int io_threads_, int max_sockets_ = ZMQ_MAX_SOCKETS_DFLT)
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+
+            int rc = zmq_ctx_set (ptr, ZMQ_IO_THREADS, io_threads_);
+            ZMQ_ASSERT (rc == 0);
+
+            rc = zmq_ctx_set (ptr, ZMQ_MAX_SOCKETS, max_sockets_);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline context_t (context_t &&rhs) ZMQ_NOTHROW : ptr (rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline context_t &operator = (context_t &&rhs) ZMQ_NOTHROW
+        {
+            std::swap (ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~context_t () ZMQ_NOTHROW
+        {
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        inline void close() ZMQ_NOTHROW
+        {
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        //  Be careful with this, it's probably only useful for
+        //  using the C api together with an existing C++ api.
+        //  Normally you should never need to use this.
+        inline ZMQ_EXPLICIT operator void* () ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline ZMQ_EXPLICIT operator void const* () const ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+    private:
+
+        void *ptr;
+
+        context_t (const context_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const context_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    #ifdef ZMQ_CPP11
+    enum class socket_type: int
+    {
+        req = ZMQ_REQ,
+        rep = ZMQ_REP,
+        dealer = ZMQ_DEALER,
+        router = ZMQ_ROUTER,
+        pub = ZMQ_PUB,
+        sub = ZMQ_SUB,
+        xpub = ZMQ_XPUB,
+        xsub = ZMQ_XSUB,
+        push = ZMQ_PUSH,
+        pull = ZMQ_PULL,
+#if ZMQ_VERSION_MAJOR < 4
+        pair = ZMQ_PAIR
+#else
+        pair = ZMQ_PAIR,
+        stream = ZMQ_STREAM
+#endif
+    };
+    #endif
+
+    class socket_t
+    {
+        friend class monitor_t;
+    public:
+        inline socket_t(context_t& context_, int type_)
+        {
+            init(context_, type_);
+        }
+
+        #ifdef ZMQ_CPP11
+        inline socket_t(context_t& context_, socket_type type_)
+        {
+            init(context_, static_cast<int>(type_));
+        }
+        #endif
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline socket_t(socket_t&& rhs) ZMQ_NOTHROW : ptr(rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline socket_t& operator=(socket_t&& rhs) ZMQ_NOTHROW
+        {
+            std::swap(ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~socket_t () ZMQ_NOTHROW
+        {
+            close();
+        }
+
+        inline ZMQ_EXPLICIT operator void* () ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline ZMQ_EXPLICIT operator void const* () const ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline void close() ZMQ_NOTHROW
+        {
+            if(ptr == NULL)
+                // already closed
+                return ;
+            int rc = zmq_close (ptr);
+            ZMQ_ASSERT (rc == 0);
+            ptr = 0 ;
+        }
+
+        template<typename T> void setsockopt(int option_, T const& optval)
+        {
+            setsockopt(option_, &optval, sizeof(T) );
+        }
+
+        inline void setsockopt (int option_, const void *optval_,
+            size_t optvallen_)
+        {
+            int rc = zmq_setsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void getsockopt (int option_, void *optval_,
+            size_t *optvallen_) const
+        {
+            int rc = zmq_getsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        template<typename T> T getsockopt(int option_) const
+        {
+            T optval;
+            size_t optlen = sizeof(T);
+            getsockopt(option_, &optval, &optlen );
+            return optval;
+        }
+
+        inline void bind(std::string const& addr)
+        {
+            bind(addr.c_str());
+        }
+
+        inline void bind (const char *addr_)
+        {
+            int rc = zmq_bind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void unbind(std::string const& addr)
+        {
+            unbind(addr.c_str());
+        }
+
+        inline void unbind (const char *addr_)
+        {
+            int rc = zmq_unbind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void connect(std::string const& addr)
+        {
+            connect(addr.c_str());
+        }
+
+        inline void connect (const char *addr_)
+        {
+            int rc = zmq_connect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void disconnect(std::string const& addr)
+        {
+            disconnect(addr.c_str());
+        }
+
+        inline void disconnect (const char *addr_)
+        {
+            int rc = zmq_disconnect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool connected() const ZMQ_NOTHROW
+        {
+            return(ptr != NULL);
+        }
+        
+        inline size_t send (const void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_send (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool send (message_t &msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_send (&(msg_.msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+
+        template<typename I> bool send(I first, I last, int flags_=0)
+        {
+            zmq::message_t msg(first, last);
+            return send(msg, flags_);
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline bool send (message_t &&msg_, int flags_ = 0)
+        {
+            return send(msg_, flags_);
+        }
+#endif
+
+        inline size_t recv (void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_recv (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool recv (message_t *msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_recv (&(msg_->msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+        
+    private:
+        inline void init(context_t& context_, int type_)
+        {
+            ctxptr = context_.ptr;
+            ptr = zmq_socket (context_.ptr, type_ );
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+        void *ptr;
+        void *ctxptr;
+
+        socket_t (const socket_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const socket_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    class monitor_t
+    {
+    public:
+        monitor_t() : socketPtr(NULL) {}
+        virtual ~monitor_t() {}
+
+        void monitor(socket_t &socket, std::string const& addr, int events = ZMQ_EVENT_ALL)
+        {
+            monitor(socket, addr.c_str(), events);
+        }
+
+        void monitor(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL)
+        {
+            int rc = zmq_socket_monitor(socket.ptr, addr_, events);
+            if (rc != 0)
+                throw error_t ();
+
+            socketPtr = socket.ptr;
+            void *s = zmq_socket (socket.ctxptr, ZMQ_PAIR);
+            assert (s);
+
+            rc = zmq_connect (s, addr_);
+            assert (rc == 0);
+            
+            on_monitor_started();
+            
+            while (true) {
+                zmq_msg_t eventMsg;
+                zmq_msg_init (&eventMsg);
+                rc = zmq_msg_recv (&eventMsg, s, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+#if ZMQ_VERSION_MAJOR >= 4
+                const char* data = static_cast<const char*>(zmq_msg_data(&eventMsg));
+                zmq_event_t msgEvent;
+                memcpy(&msgEvent.event, data, sizeof(uint16_t)); data += sizeof(uint16_t);
+                memcpy(&msgEvent.value, data, sizeof(int32_t));
+                zmq_event_t* event = &msgEvent;
+#else
+                zmq_event_t* event = static_cast<zmq_event_t*>(zmq_msg_data(&eventMsg));
+#endif
+                
+#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT
+                zmq_msg_t addrMsg;
+                zmq_msg_init (&addrMsg);
+                rc = zmq_msg_recv (&addrMsg, s, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+                const char* str = static_cast<const char*>(zmq_msg_data (&addrMsg));
+                std::string address(str, str + zmq_msg_size(&addrMsg));
+                zmq_msg_close (&addrMsg);
+#else
+                // Bit of a hack, but all events in the zmq_event_t union have the same layout so this will work for all event types.
+                std::string address = event->data.connected.addr;
+#endif
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+                if (event->event == ZMQ_EVENT_MONITOR_STOPPED)
+                    break;
+#endif
+
+                switch (event->event) {
+                case ZMQ_EVENT_CONNECTED:
+                    on_event_connected(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_DELAYED:
+                    on_event_connect_delayed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_RETRIED:
+                    on_event_connect_retried(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_LISTENING:
+                    on_event_listening(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_BIND_FAILED:
+                    on_event_bind_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPTED:
+                    on_event_accepted(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPT_FAILED:
+                    on_event_accept_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSED:
+                    on_event_closed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSE_FAILED:
+                    on_event_close_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_DISCONNECTED:
+                    on_event_disconnected(*event, address.c_str());
+                    break;
+                default:
+                    on_event_unknown(*event, address.c_str());
+                    break;
+                }
+                zmq_msg_close (&eventMsg);
+            }
+            zmq_close (s);
+            socketPtr = NULL;
+        }
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+        void abort()
+        {
+            if (socketPtr)
+                zmq_socket_monitor(socketPtr, NULL, 0);
+        }
+#endif
+        virtual void on_monitor_started() {}
+        virtual void on_event_connected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_delayed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_retried(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_listening(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_bind_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accepted(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accept_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_closed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_close_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_disconnected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_unknown(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+    private:
+        void* socketPtr;
+    };
+}
+
+#endif
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmq_utils.h b/Source/ThirdParty/libZmq/include/Linux/zmq_utils.h
new file mode 100644
index 0000000..b9398d5
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmq_utils.h
@@ -0,0 +1,50 @@
+/*
+    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
+
+    This file is part of libzmq, the ZeroMQ core engine in C++.
+
+    libzmq is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License (LGPL) as published
+    by the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    As a special exception, the Contributors give you permission to link
+    this library with independent modules to produce an executable,
+    regardless of the license terms of these independent modules, and to
+    copy and distribute the resulting executable under terms of your choice,
+    provided that you also meet, for each linked independent module, the
+    terms and conditions of the license of that module. An independent
+    module is a module which is not derived from or based on this library.
+    If you modify this library, you must extend this exception to your
+    version of the library.
+
+    libzmq is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+    License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*  This file is deprecated, and all its functionality provided by zmq.h     */
+/*  Note that -Wpedantic compilation requires GCC to avoid using its custom
+    extensions such as #warning, hence the trick below. Also, pragmas for
+    warnings or other messages are not standard, not portable, and not all
+    compilers even have an equivalent concept.
+    So in the worst case, this include file is treated as silently empty. */
+
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)               \
+  || defined(_MSC_VER)
+#if defined(__GNUC__) || defined(__GNUG__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic warning "-Wcpp"
+#pragma GCC diagnostic ignored "-Werror"
+#pragma GCC diagnostic ignored "-Wall"
+#endif
+#pragma message(                                                               \
+  "Warning: zmq_utils.h is deprecated. All its functionality is provided by zmq.h.")
+#if defined(__GNUC__) || defined(__GNUG__)
+#pragma GCC diagnostic pop
+#endif
+#endif
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/compatibility.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/compatibility.hpp
new file mode 100644
index 0000000..4673f3b
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/compatibility.hpp
@@ -0,0 +1,80 @@
+/**
+ * \file
+ *
+ * \date   10 Sep 2011
+ * \author ron
+ * \author Ben Gray (\@benjamg)
+ *
+ * A fair number of C++0x (or more accurately C++11) features are used in this
+ * library and as this project is used where I work on older compilers this
+ * file was created to help.
+ *
+ * C++ features and their workaround where not supported:
+ * \li lambda functions - disabled, these are only used in the test anyway.
+ * \li typesafe enums   - replaced with enum where comparisons needed.
+ * \li nullptr          - defined to null.
+ *
+ * As of the port to version 3.1 (libzmqpp version 1.1.0) this file will also
+ * be used to maintain compatablity with multiple versions of 0mq
+ */
+
+#ifndef ZMQPP_COMPATIBILITY_HPP_
+#define ZMQPP_COMPATIBILITY_HPP_
+
+#include <zmq.h>
+
+// Currently we require at least 0mq version 2.2.x
+#define ZMQPP_REQUIRED_ZMQ_MAJOR 2
+#define ZMQPP_REQUIRED_ZMQ_MINOR 2
+
+#if (ZMQ_VERSION_MAJOR < ZMQPP_REQUIRED_ZMQ_MAJOR) or ((ZMQ_VERSION_MAJOR == ZMQPP_REQUIRED_ZMQ_MAJOR) and (ZMQ_VERSION_MINOR < ZMQPP_REQUIRED_ZMQ_MINOR))
+#error zmqpp requires a later version of 0mq
+#endif
+
+// Experimental feature support
+#if (ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR == 0)
+#define ZMQ_EXPERIMENTAL_LABELS
+#endif
+
+// Deal with older versions of gcc
+#if defined(__GNUC__) and !defined(__clang__)
+#if __GNUC__ == 4
+
+// Deal with older gcc not supporting C++0x typesafe enum class name {} comparison
+#if __GNUC_MINOR__ < 4
+#define ZMQPP_COMPARABLE_ENUM enum
+#endif
+
+#if __GNUC_MINOR__ == 4
+#if __GNUC_PATCHLEVEL__ < 1
+#undef ZMQPP_COMPARABLE_ENUM
+#define ZMQPP_COMPARABLE_ENUM enum
+#endif // if __GNUC_PATCHLEVEL__ < 1
+#endif // if __GNUC_MINOR__ == 4
+
+// Deal with older gcc not supporting C++0x lambda function
+#if __GNUC_MINOR__ < 5
+#define ZMQPP_IGNORE_LAMBDA_FUNCTION_TESTS
+#define ZMQPP_EXPLICITLY_DELETED
+#endif // if __GNUC_MINOR__ < 5
+
+// Deal with older gcc not supporting C++0x nullptr
+#if __GNUC_MINOR__ < 6
+#define nullptr NULL
+#define noexcept
+#endif // if __GNUC_MINOR__ < 6
+
+#endif // if __GNUC_ == 4
+#endif // if defined(__GNUC__) && !defined(__clang__)
+
+// Generic state, assume a modern compiler
+#ifndef ZMQPP_COMPARABLE_ENUM
+#define ZMQPP_COMPARABLE_ENUM enum class
+#endif
+
+#ifndef ZMQPP_EXPLICITLY_DELETED
+#define ZMQPP_EXPLICITLY_DELETED = delete
+#endif
+
+#endif /* ZMQPP_COMPATIBILITY_HPP_ */
+
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/context.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/context.hpp
new file mode 100644
index 0000000..3220785
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/context.hpp
@@ -0,0 +1,200 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_CONTEXT_HPP_
+#define ZMQPP_CONTEXT_HPP_
+
+#include <cassert>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+#include "exception.hpp"
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+#include "context_options.hpp"
+#endif
+
+namespace zmqpp
+{
+
+/*!
+ * The context class represents internal zmq context and io threads.
+ *
+ * By default the context class will create one thread, however this can be
+ * overridden in the constructor.
+ *
+ * The context class is the only object that can be considered thread safe.
+ *
+ * All sockets using endpoints other than inproc require the context to have
+ * at least one thread.
+ *
+ * This class is c++0x move supporting and cannot be copied.
+ */
+class context
+{
+public:
+
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+	/*!
+	 * Initialise the 0mq context.
+	 *
+	 * If only inproc is used then the context may be created with zero threads.
+	 * Any inproc endpoint using sockets must be created using the same context.
+	 *
+	 * The context is thread safe an may be used anywhere in your application,
+	 * however there is no requirement (other than inproc restrictions) for you
+	 * to do this.
+	 *
+	 * \param threads an integer argument for the number of required threads. Defaults to 1.
+	 */
+	context(int const& threads = 1)
+#else
+	/*!
+	 * Initialise the 0mq context.
+	 *
+	 * The context is thread safe an may be used anywhere in your application,
+	 * however there is no requirement (other than inproc restrictions) for you
+	 * to do this.
+	 */
+	context()
+#endif
+		: _context(nullptr)
+	{
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+		_context = zmq_init(threads);
+#else
+		_context = zmq_ctx_new();
+#endif
+
+		if (nullptr == _context)
+		{
+			throw zmq_internal_exception();
+		}
+	}
+
+	/*!
+	 * Closes the 0mq context.
+	 *
+	 * Any blocking calls other than a socket close will return with an error.
+	 *
+	 * If there are open sockets will block while zmq internal buffers are
+	 * processed up to a limit specified by that sockets linger option.
+	 */
+	~context() noexcept
+	{
+		if (nullptr != _context)
+		{
+
+#ifndef NDEBUG // unused assert variable in release
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+			int result = zmq_term(_context);
+#else
+			int result = zmq_ctx_destroy(_context);
+#endif
+			assert(0 == result);
+#else
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+			zmq_term(_context);
+#else
+			zmq_ctx_destroy(_context);
+#endif
+#endif // NDEBUG
+
+			_context = nullptr;
+		}
+	}
+
+	/*!
+	 * Move supporting constructor.
+	 *
+	 * Allows zero-copy move semantics to be used with this class.
+	 *
+	 * \param source a rvalue instance of the object who's internals we wish to steal.
+	 */
+	context(context&& source) noexcept
+		: _context(source._context)
+	{
+		source._context = nullptr;
+	}
+
+	/*!
+	 * Move supporting operator.
+	 *
+	 * Allows zero-copy move semantics to be used with this class.
+	 *
+	 * \param source an rvalue instance of the context who's internals we wish to steal.
+	 */
+	context& operator=(context&& source) noexcept
+	{
+		std::swap( _context, source._context );
+		return *this;
+	}
+
+	/*!
+	 * Terminate the current context.
+	 *
+	 * Any blocking calls other than a socket close will return with an error.
+	 *
+	 * If there are open sockets will block while zmq internal buffers are
+	 * processed up to a limit specified by that sockets linger option.
+	 */
+	void terminate();
+
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+	/*!
+	 * Set the value of an option in the underlaying zmq context.
+	 *
+	 * \param option a valid ::context_option
+	 * \param value to set the option to
+	 */
+	void set(context_option const& option, int const& value);
+
+	/*!
+	 * Get a context option from the underlaying zmq context.
+	 *
+	 * \param option a valid ::context_option
+	 * \return context option value
+	 */
+	int get(context_option const& option);
+#endif
+
+	/*!
+	 * Validity checking of the context
+	 *
+	 * Checks if the underlying 0mq context for this instance is valid.
+	 *
+	 * Contexts should always be valid unless people are doing 'fun' things with
+	 * std::move.
+	 *
+	 * \return boolean true if the object is valid.
+	 */
+	operator bool() const noexcept
+	{
+		return nullptr != _context;
+	}
+
+	/*!
+	 * Access to the raw 0mq context
+	 *
+	 * \return void pointer to the underlying 0mq context.
+	 */
+	operator void*() const noexcept
+	{
+		return _context;
+	}
+
+private:
+	void* _context;
+
+	// No copy - private and not implemented
+	context(context const&) ZMQPP_EXPLICITLY_DELETED;
+	context& operator=(context const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+};
+
+}
+
+#endif /* ZMQPP_CONTEXT_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/context_options.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/context_options.hpp
new file mode 100644
index 0000000..b2e2cf4
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/context_options.hpp
@@ -0,0 +1,26 @@
+/**
+ * \file
+ *
+ * \date   3 Jul 2013
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_CONTEXT_OPTIONS_HPP_
+#define ZMQPP_CONTEXT_OPTIONS_HPP_
+
+namespace zmqpp
+{
+
+/** \todo Expand the information on the options to make it actually useful. */
+/*!
+ * \brief possible Context options in zmq
+ */
+
+enum class context_option {
+	io_threads  = ZMQ_IO_THREADS,          /*!< I/O thread count */
+	max_sockets = ZMQ_MAX_SOCKETS,         /*!< Maximum supported sockets */
+};
+
+}
+
+#endif /* ZMQPP_CONTEXT_OPTIONS_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/exception.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/exception.hpp
new file mode 100644
index 0000000..a0b2347
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/exception.hpp
@@ -0,0 +1,87 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_EXCEPTION_HPP_
+#define ZMQPP_EXCEPTION_HPP_
+
+#include <stdexcept>
+#include <string>
+
+#include <zmq.h>
+
+namespace zmqpp
+{
+
+/** \todo Have a larger variety of exceptions with better state debug information */
+
+/*!
+ * Represents the base zmqpp exception.
+ *
+ * All zmqpp runtime exceptions are children of this class.
+ * The class itself does not provide any special access fields but it only
+ * for convince when catching exceptions.
+ *
+ * The class extends std::runtime_error.
+ *
+ */
+class exception : public std::runtime_error
+{
+public:
+	/*!
+	 * Standard exception constructor.
+	 *
+	 * \param message a string representing the error message.
+	 */
+	exception(std::string const& message)
+		: std::runtime_error(message)
+	{ }
+};
+
+/*!
+ * Represents an attempt to use an invalid object.
+ *
+ * Objects may be invalid initially or after a shutdown or close.
+ */
+class invalid_instance : public exception
+{
+public:
+	invalid_instance(std::string const& message)
+		: exception(message)
+	{ }
+};
+
+/*!
+ * Represents internal zmq errors.
+ *
+ * Any error response from the zmq bindings will be wrapped in this error.
+ *
+ * The class provides access to the zmq error number via zmq_error().
+ */
+class zmq_internal_exception : public exception
+{
+public:
+	/*!
+	 * Uses the zmq functions to pull out error messages and numbers.
+	 */
+	zmq_internal_exception()
+		: exception(zmq_strerror(zmq_errno()))
+		, _error(zmq_errno())
+	{ }
+
+	/*!
+	 * Retrieve the zmq error number associated with this exception.
+	 * \return zmq error number
+	 */
+	int zmq_error() const { return _error; }
+
+private:
+	int _error;
+};
+
+}
+
+#endif /* ZMQPP_EXCEPTION_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/inet.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/inet.hpp
new file mode 100644
index 0000000..82e7e5e
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/inet.hpp
@@ -0,0 +1,104 @@
+/**
+ * \file
+ *
+ * \date   10 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_INET_HPP_
+#define ZMQPP_INET_HPP_
+
+/** \todo cross-platform version of including headers for htons and htonl. */
+// We get htons and htonl from here
+#include <netinet/in.h>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+
+/*!
+ * \brief Possible byte order types.
+ *
+ * An enumeration of all the known order types, all two of them.
+ * There is also an entry for unknown which is just used as a default.
+ */
+ZMQPP_COMPARABLE_ENUM order {
+	unknown,      /*!< used as a default prior to detection of the the byte order */
+	big_endian,   /*!< brief byte order is big endian */
+	little_endian /*!< \brief byte order is little endian */
+};
+
+/*!
+ * Common code for the 64bit versions of htons/htons and ntohs/ntohl
+ *
+ * As htons and ntohs (or htonl and ntohs) always just do the same thing, ie
+ * swap bytes if the host order differs from network order or otherwise don't
+ * do anything, it seemed silly to type the code twice.
+ *
+ * \note This code assumes network order is always big endian. Which it is.
+ * \note The host endian is only checked once and afterwards assumed to remain
+ *       the same.
+ *
+ * \param value_to_check unsigned 64 bit integer to swap
+ * \return swapped (or not) unsigned 64 bit integer
+ */
+inline uint64_t swap_if_needed(uint64_t const& value_to_check)
+{
+	static order host_order = order::unknown;
+
+	union {
+		uint64_t integer;
+		uint8_t bytes[8];
+	} value;
+
+	if (order::unknown == host_order)
+	{
+		value.integer = 1;
+		host_order = (1 == value.bytes[0]) ? order::little_endian : order::big_endian;
+	}
+
+	if (order::big_endian == host_order)
+	{
+		return value_to_check;
+	}
+
+	value.integer = value_to_check;
+
+	std::swap(value.bytes[0], value.bytes[7]);
+	std::swap(value.bytes[1], value.bytes[6]);
+	std::swap(value.bytes[2], value.bytes[5]);
+	std::swap(value.bytes[3], value.bytes[4]);
+
+	return value.integer;
+}
+
+}
+
+/*!
+ * 64 bit version of the htons/htonl
+ *
+ * I've used the name htonll to try and keep with the htonl naming scheme.
+ *
+ * \param hostlonglong unsigned 64 bit host order integer
+ * \return unsigned 64 bit network order integer
+ */
+inline uint64_t htonll(uint64_t const& hostlonglong)
+{
+	return zmqpp::swap_if_needed(hostlonglong);
+}
+
+/*!
+ * 64 bit version of the ntohs/ntohl
+ *
+ * I've used the name htonll to try and keep with the htonl naming scheme.
+ *
+ * \param networklonglong unsigned 64 bit network order integer
+ * \return unsigned 64 bit host order integer
+ */
+inline uint64_t ntohll(uint64_t const& networklonglong)
+{
+	return zmqpp::swap_if_needed(networklonglong);
+}
+
+#endif /* INET_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/message.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/message.hpp
new file mode 100644
index 0000000..3311bd1
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/message.hpp
@@ -0,0 +1,180 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_MESSAGE_HPP_
+#define ZMQPP_MESSAGE_HPP_
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+struct zmq_msg_wrapper;
+
+/*!
+ * \brief a zmq message with optional multipart support
+ *
+ * A zmq message is made up of one or more parts which are sent together to
+ * the target endpoints. zmq guarantees either the whole message or none
+ * of the message will be delivered.
+ */
+class message
+{
+public:
+	/*!
+	 * \brief callback to release user allocated data.
+	 *
+	 * The release function will be called on any void* moved part.
+	 * It must be thread safe to the extent that the callback may occur on
+	 * one of the context threads.
+	 *
+	 * The function called will be passed a single variable which is the
+	 * pointer to the memory allocated.
+	 */
+	typedef std::function<void (void*)> release_function;
+
+	message();
+	~message();
+
+	size_t parts() const;
+	size_t size(size_t const& part) const;
+	std::string get(size_t const& part) const;
+
+	void get(int8_t& integer, size_t const& part) const;
+	void get(int16_t& integer, size_t const& part) const;
+	void get(int32_t& integer, size_t const& part) const;
+	void get(int64_t& integer, size_t const& part) const;
+
+	void get(uint8_t& unsigned_integer, size_t const& part) const;
+	void get(uint16_t& unsigned_integer, size_t const& part) const;
+	void get(uint32_t& unsigned_integer, size_t const& part) const;
+	void get(uint64_t& unsigned_integer, size_t const& part) const;
+
+	void get(float& floating_point, size_t const& part) const;
+	void get(double& double_precision, size_t const& part) const;
+	void get(bool& boolean, size_t const& part) const;
+
+	void get(std::string& string, size_t const& part) const;
+
+	// Warn: If a pointer type is requested the message (well zmq) still 'owns'
+	// the data and will release it when the message object is freed.
+	template<typename Type>
+	Type get(size_t const& part)
+	{
+		Type value;
+		get(value, part);
+		return value;
+	}
+
+	// Raw get data operations, useful with data structures more than anything else
+	// Warn: The message (well zmq) still 'owns' the data and will release it
+	// when the message object is freed.
+	template<typename Type>
+	void get(Type*& value, size_t const& part) const
+	{
+		value = static_cast<Type*>(raw_data(part));
+	}
+
+	// Warn: The message (well zmq) still 'owns' the data and will release it
+	// when the message object is freed.
+	template<typename Type>
+	void get(Type** value, size_t const& part) const
+	{
+		*value = static_cast<Type*>(raw_data(part));
+	}
+
+	// Move operators will take ownership of message parts without copying
+	void move(void* part, size_t& size, release_function const& release);
+
+	// Raw move data operation, useful with data structures more than anything else
+	template<typename Object>
+	void move(Object *part)
+	{
+		move(part, sizeof(Object), &deleter_callback<Object>);
+	}
+
+	// Copy operators will take copies of any data
+	void add(void const* part, size_t const& size);
+
+	template<typename Type>
+	void add(Type const& part)
+	{
+		*this << part;
+	}
+
+	// Stream reader style
+	void reset_read_cursor();
+
+	template<typename Type>
+	message& operator>>(Type& value)
+	{
+		get(value, _read_cursor++);
+		return *this;
+	}
+
+	// Stream writer style - these all use copy styles
+	message& operator<<(int8_t const& integer);
+	message& operator<<(int16_t const& integer);
+	message& operator<<(int32_t const& integer);
+	message& operator<<(int64_t const& integer);
+
+	message& operator<<(uint8_t const& unsigned_integer);
+	message& operator<<(uint16_t const& unsigned_integer);
+	message& operator<<(uint32_t const& unsigned_integer);
+	message& operator<<(uint64_t const& unsigned_integer);
+
+	message& operator<<(float const& floating_point);
+	message& operator<<(double const& double_precision);
+	message& operator<<(bool const& boolean);
+
+	message& operator<<(char const* c_string);
+	message& operator<<(std::string const& string);
+
+	// Move supporting
+	message(message&& source) noexcept;
+	message& operator=(message&& source) noexcept;
+
+	// Copy support
+	message copy();
+	void copy(message& source);
+
+	// Used for internal tracking
+	void sent(size_t const& part);
+
+	// Access to raw zmq details
+	void const* raw_data(size_t const& part = 0) const;
+	zmq_msg_t& raw_msg(size_t const& part = 0);
+	zmq_msg_t& raw_new_msg();
+
+private:
+	typedef std::vector<zmq_msg_wrapper> parts_type;
+	parts_type _parts;
+	size_t _read_cursor;
+
+	// Disable implicit copy support, code must request a copy to clone
+	message(message const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+	message& operator=(message const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+
+	static void release_callback(void* data, void* hint);
+
+	template<typename Object>
+	static void deleter_callback(void* data)
+	{
+		delete static_cast<Object*>(data);
+	}
+};
+
+}
+
+#endif /* ZMQPP_MESSAGE_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/poller.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/poller.hpp
new file mode 100644
index 0000000..45c762d
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/poller.hpp
@@ -0,0 +1,186 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_POLLER_HPP_
+#define ZMQPP_POLLER_HPP_
+
+#include <unordered_map>
+#include <vector>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+
+class socket;
+typedef socket socket_t;
+
+/*!
+ * Polling wrapper.
+ *
+ * Allows access to polling for any number of sockets or file descriptors.
+ */
+class poller
+{
+public:
+	static const long wait_forever; /*!< Block forever flag, default setting. */
+
+	static const short poll_none;   /*!< No polling flags set. */
+	static const short poll_in;     /*!< Monitor inbound flag. */
+	static const short poll_out;    /*!< Monitor output flag. */
+	static const short poll_error;  /*!< Monitor error flag.\n Only for file descriptors. */
+
+	/*!
+	 * Construct an empty polling model.
+	 */
+	poller();
+
+	/*!
+	 * Cleanup poller.
+	 *
+	 * Any sockets will need to be closed separately.
+	 */
+	~poller();
+
+	/*!
+	 * Add a socket to the polling model and set which events to monitor.
+	 *
+	 * \param socket the socket to monitor.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void add(socket_t& socket, short const& event = poll_in);
+
+	/*!
+	 * Add a file descriptor to the polling model and set which events to monitor.
+	 *
+	 * \param descriptor the file descriptor to monitor.
+	 * \param event the event flags to monitor.
+	 */
+	void add(int const& descriptor, short const& event = poll_in | poll_error);
+
+	/*!
+	 * Check if we are monitoring a given socket with this poller.
+	 *
+	 * \param socket the socket to check.
+	 * \return true if it is there.
+	 */
+	bool has(socket_t const& socket);
+
+	/*!
+	 * Check if we are monitoring a given file descriptor with this poller.
+	 *
+	 * \param descriptor the file descriptor to check.
+	 * \return true if it is there.
+	 */
+	bool has(int const& descriptor);
+
+	/*!
+	 * Stop monitoring a socket.
+	 *
+	 * \param socket the socket to stop monitoring.
+	 */
+	void remove(socket_t const& socket);
+
+	/*!
+	 * Stop monitoring a file descriptor.
+	 *
+	 * \param descriptor the file descriptor to stop monitoring.
+	 */
+	void remove(int const& descriptor);
+
+	/*!
+	 * Update the monitored event flags for a given socket.
+	 *
+	 * \param socket the socket to update event flags.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void check_for(socket_t const& socket, short const& event);
+
+	/*!
+	 * Update the monitored event flags for a given file descriptor.
+	 *
+	 * \param descriptor the file descriptor to update event flags.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void check_for(int const& descriptor, short const& event);
+
+	/*!
+	 * Poll for monitored events.
+	 *
+	 * By default this method will block forever or until at least one of the monitored
+	 * sockets or file descriptors has events.
+	 *
+	 * If a timeout is set and was reached then this function returns false.
+	 *
+	 * \param timeout milliseconds to timeout.
+	 * \return true if there is an event..
+	 */
+	bool poll(long timeout = wait_forever);
+
+	/*!
+	 * Get the event flags triggered for a socket.
+	 *
+	 * \param socket the socket to get triggered event flags for.
+	 * \return the event flags.
+	 */
+	short events(socket_t const& socket) const;
+
+	/*!
+	 * Get the event flags triggered for a file descriptor.
+	 *
+	 * \param descriptor the file descriptor to get triggered event flags for.
+	 * \return the event flags.
+	 */
+	short events(int const& descriptor) const;
+
+	/*!
+	 * Check either a file descriptor or socket for input events.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * \param watchable either a file descriptor or socket known to the poller.
+	 * \return true if there is input.
+	 */
+	template<typename Watched>
+	bool has_input(Watched const& watchable) const { return events(watchable) & poll_in; }
+
+	/*!
+	 * Check either a file descriptor or socket for output events.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * \param watchable either a file descriptor or socket known to the poller.
+	 * \return true if there is output.
+	 */
+	template<typename Watched>
+	bool has_output(Watched const& watchable) const { return events(watchable) & poll_out; }
+
+	/*!
+	 * Check a file descriptor.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * Technically this template works for sockets as well but the error flag is never set for
+	 * sockets so I have no idea why someone would call it.
+	 *
+	 * \param watchable a file descriptor know to the poller.
+	 * \return true if there is an error.
+	 */
+	template<typename Watched>
+	bool has_error(Watched const& watchable) const { return events(watchable) & poll_error; }
+
+private:
+	std::vector<zmq_pollitem_t> _items;
+	std::unordered_map<void *, size_t> _index;
+	std::unordered_map<int, size_t> _fdindex;
+
+	void reindex(size_t const index);
+};
+
+}
+
+#endif /* ZMQPP_POLLER_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket.hpp
new file mode 100644
index 0000000..09ea71f
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket.hpp
@@ -0,0 +1,500 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_HPP_
+#define ZMQPP_SOCKET_HPP_
+
+#include <cstring>
+#include <string>
+#include <list>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+
+#include "socket_types.hpp"
+#include "socket_options.hpp"
+
+namespace zmqpp
+{
+
+class context;
+class message;
+
+typedef std::string endpoint_t;
+typedef context     context_t;
+typedef message     message_t;
+
+/*!
+ * The socket class represents the zmq sockets.
+ *
+ * A socket can be bound and/or connected to as many endpoints as required
+ * with the sole exception of a ::pair socket.
+ *
+ * The routing is handled by zmq based on the type set.
+ *
+ * The bound side of an inproc connection must occur first and inproc can only
+ * connect to other inproc sockets of the same context.
+ *
+ * This class is c++0x move supporting and cannot be copied.
+ */
+class socket
+{
+public:
+	static const int normal     = 0;            /*!< /brief default send type, no flags set */
+#if (ZMQ_VERSION_MAJOR == 2)
+	static const int dont_wait  = ZMQ_NOBLOCK;  /*!< /brief don't block if sending is not currently possible  */
+#else
+	static const int dont_wait  = ZMQ_DONTWAIT; /*!< /brief don't block if sending is not currently possible  */
+#endif
+	static const int send_more  = ZMQ_SNDMORE;  /*!< /brief more parts will follow this one */
+#ifdef ZMQ_EXPERIMENTAL_LABELS
+	static const int send_label = ZMQ_SNDLABEL; /*!< /brief this message part is an internal zmq label */
+#endif
+
+	/*!
+	 * Create a socket for a given type.
+	 *
+	 * \param context the zmq context under which the socket will live
+	 * \param type a valid ::socket_type for the socket
+	 */
+	socket(context_t const& context, socket_type const& type);
+
+	/*!
+	 * This will close any socket still open before returning
+	 */
+	~socket();
+
+	/*!
+	 * Get the type of the socket, this works on zmqpp types and not the zmq internal types.
+	 * Use the socket::get method if you wish to intergoate the zmq internal ones.
+	 *
+	 * \return the type of the socket
+	 */
+	socket_type type() const { return _type; }
+
+	/*!
+	 * Asynchronously binds to an endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to bind to
+	 */
+	void bind(endpoint_t const& endpoint);
+
+	/*!
+	 * Unbinds from a previously bound endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to bind to
+	 */
+	void unbind(endpoint_t const& endpoint);
+
+	/*!
+	 * Asynchronously connects to an endpoint.
+	 * If the endpoint is not inproc then zmq will happily keep trying
+	 * to connect until there is something there.
+	 *
+	 * Inproc sockets must have a valid target already bound before connection
+	 * will work.
+	 *
+	 * \param endpoint the zmq endpoint to connect to
+	 */
+	void connect(endpoint_t const& endpoint);
+
+	/*!
+	 * Asynchronously connects to multiple endpoints.
+	 * If the endpoint is not inproc then zmq will happily keep trying
+	 * to connect until there is something there.
+	 *
+	 * Inproc sockets must have a valid target already bound before connection
+	 * will work.
+	 *
+	 * This is a helper function that wraps the single item connect in a loop
+	 *
+	 * \param connections_begin the starting iterator for zmq endpoints.
+	 * \param connections_end the final iterator for zmq endpoints.
+	 */
+	template<typename InputIterator>
+	void connect(InputIterator const& connections_begin, InputIterator const& connections_end)
+	{
+		for(InputIterator it = connections_begin; it != connections_end; ++it)
+		{
+			connect(*it);
+		}
+	}
+
+
+	/*!
+	 * Disconnects a previously connected endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to disconnect from
+	 */
+	void disconnect(endpoint_t const& endpoint);
+
+	/*!
+	 * Disconnects from multiple previously connected endpoints.
+	 *
+	 * This is a helper function that wraps the single item disconnect in a loop
+	 *
+	 * \param disconnections_begin the starting iterator for zmq endpoints.
+	 * \param disconnections_end the final iterator for zmq endpoints.
+	 */
+	template<typename InputIterator>
+	void disconnect(InputIterator const& disconnections_begin, InputIterator const& disconnections_end)
+	{
+		for(InputIterator it = disconnections_begin; it != disconnections_end; ++it)
+		{
+			disconnect(*it);
+		}
+	}
+
+	/*!
+	 * Closes the internal zmq socket and marks this instance
+	 * as invalid.
+	 */
+	void close();
+
+	/*!
+	 * Sends the message over the connection, this may be a multipart message.
+	 *
+	 * If dont_block is true and we are unable to add a new message then this
+	 * function will return false.
+	 *
+	 * \param message message to send
+	 * \param dont_block boolean to dictate if we wait while sending.
+	 * \return true if message sent, false if it would have blocked
+	 */
+	bool send(message_t& message, bool const& dont_block = false);
+
+	/*!
+	 * Gets a message from the connection, this may be a multipart message.
+	 *
+	 * If dont_block is true and we are unable to get a message then this
+	 * function will return false.
+	 *
+	 * \param message reference to fill with received data
+	 * \param dont_block boolean to dictate if we wait for data.
+	 * \return true if message sent, false if it would have blocked
+	 */
+	bool receive(message_t& message, bool const& dont_block = false);
+
+	/*!
+	 * Sends the byte data held by the string as the next message part.
+	 *
+	 * If the socket::DONT_WAIT flag and we are unable to add a new message to
+	 * socket then this function will return false.
+	 *
+	 * \param string message part to send
+	 * \param flags message send flags
+	 * \return true if message part sent, false if it would have blocked
+	 */
+	bool send(std::string const& string, int const& flags = normal);
+
+	/*!
+	 * If there is a message ready then get the next part as a string
+	 *
+	 * If the socket::DONT_WAIT flag and there is no message ready to receive
+	 * then this function will return false.
+	 *
+	 * \param string message part to receive into
+	 * \param flags message receive flags
+	 * \return true if message part received, false if it would have blocked
+	 */
+	bool receive(std::string& string, int const& flags = normal);
+
+	/*!
+	 * Sends the byte data pointed to by buffer as the next part of the message.
+	 *
+	 * If the socket::DONT_WAIT flag and we are unable to add a new message to
+	 * socket then this function will return false.
+	 *
+	 * \param buffer byte buffer pointer to start writing from
+	 * \param length max length of the buffer
+	 * \param flags message send flags
+	 * \return true if message part sent, false if it would have blocked
+	 */
+	bool send_raw(char const* buffer, int const& length, int const& flags = normal);
+
+	/*!
+	 * \warning If the buffer is not large enough for the message part then the
+	 *       data will be truncated. The rest of the part is lost forever.
+	 *
+	 * If there is a message ready then get the next part of it as a raw
+	 * byte buffer.
+	 *
+	 * If the socket::DONT_WAIT flag and there is no message ready to receive
+	 * then this function will return false.
+	 *
+	 * \param buffer byte buffer pointer to start writing to
+	 * \param length max length of the buffer
+	 * \param flags message receive flags
+	 * \return true if message part received, false if it would have blocked
+	 */
+	bool receive_raw(char* buffer, int& length, int const& flags = normal);
+
+	/*!
+	 *
+	 * Subscribe to a topic
+	 *
+	 * Helper function that is equivalent of calling
+	 * \code
+	 * set(zmqpp::socket_option::subscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * \param topic the topic to subscribe to.
+	 */
+	void subscribe(std::string const& topic);
+
+	/*!
+	 * Subscribe to a topic
+	 *
+	 * Helper function that is equivalent of a loop calling
+	 * \code
+	 * set(zmqpp::socket_option::subscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * Generally this will be used with stl collections using begin() and
+	 * end() functions to get the iterators.
+	 * For this reason the end loop runs until the end iterator, not inclusive
+	 * of it.
+	 *
+	 * \param topics_begin the starting iterator for topics.
+	 * \param topics_end the final iterator for topics.
+	 */
+	template<typename InputIterator>
+	void subscribe(InputIterator const& topics_begin, InputIterator const& topics_end)
+	{
+		for(InputIterator it = topics_begin; it != topics_end; ++it)
+		{
+			subscribe(*it);
+		}
+	}
+
+	/*!
+	 * Unsubscribe from a topic
+	 *
+	 * Helper function that is equivalent of calling
+	 * \code
+	 * set(zmqpp::socket_option::unsubscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * \param topic the topic to unsubscribe from.
+	 */
+	void unsubscribe(std::string const& topic);
+
+	/*!
+	 * Unsubscribe from a topic
+	 *
+	 * Helper function that is equivalent of a loop calling
+	 * \code
+	 * set(zmqpp::socket_option::unsubscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * Generally this will be used with stl collections using begin() and
+	 * end() functions to get the iterators.
+	 * For this reason the end loop runs until the end iterator, not inclusive
+	 * of it.
+	 *
+	 * \param topics_begin the starting iterator for topics.
+	 * \param topics_end the final iterator for topics.
+	 */
+	template<typename InputIterator>
+	void unsubscribe(InputIterator const& topics_begin, InputIterator const& topics_end)
+	{
+		for(InputIterator it = topics_begin; it != topics_end; ++it)
+		{
+			unsubscribe(*it);
+		}
+	}
+
+	/*!
+	 * If the last receive part call to the socket resulted
+	 * in a label or a non-terminating part of a multipart
+	 * message this will return true.
+	 *
+	 * \return true if there are more parts
+	 */
+	bool has_more_parts() const;
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, int const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \since 2.0.0 (built against 0mq version 3.1.x or later)
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, bool const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, uint64_t const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, int64_t const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param pointer to raw byte value to set the option to
+	 * \param length the size of the raw byte value
+	 */
+	void set(socket_option const& option, char const* value, size_t const length);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param pointer to null terminated cstring value to set the option to
+	 */
+	inline void set(socket_option const& option, char const* value) { set(option, value, strlen(value)); }
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	inline void set(socket_option const& option, std::string const& value) { set(option, value.c_str(), value.length()); }
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced int to return value in
+	 */
+	void get(socket_option const& option, int& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced bool to return value in
+	 */
+	void get(socket_option const& option, bool& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced uint64_t to return value in
+	 */
+	void get(socket_option const& option, uint64_t& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced uint64_t to return value in
+	 */
+	void get(socket_option const& option, int64_t& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced std::string to return value in
+	 */
+	void get(socket_option const& option, std::string& value) const;
+
+	/*!
+	 * For those that don't want to get into a referenced value this templated method
+	 * will return the value instead.
+	 *
+	 * \param option a valid ::socket_option
+	 * \return socket option value
+	 */
+	template<typename Type>
+	Type get(socket_option const& option) const
+	{
+		Type value = Type();
+		get(option, value);
+		return value;
+	}
+
+	/*!
+	 * Move constructor
+	 *
+	 * Moves the internals of source to this object, there is no guarantee
+	 * that source will be left in a valid state.
+	 *
+	 * This constructor is noexcept and so will not throw exceptions
+	 *
+	 * \param source target socket to steal internals from
+	 */
+	socket(socket&& source) noexcept;
+
+	/*!
+	 * Move operator
+	 *
+	 * Moves the internals of source to this object, there is no guarantee
+	 * that source will be left in a valid state.
+	 *
+	 * This function is noexcept and so will not throw exceptions
+	 *
+	 * \param source target socket to steal internals from
+	 * \return socket reference to this
+	 */
+	socket& operator=(socket&& source) noexcept;
+
+	/*!
+	 * Check the socket is still valid
+	 *
+	 * This tests the internal state of the socket.
+	 * If creation failed for some reason or if the move functions were used
+	 * to move the socket internals to another instance this will return false.
+	 *
+	 * \return true if the socket is valid
+	 */
+	operator bool() const;
+
+	/*!
+	 * Access to the raw 0mq context
+	 *
+	 * \return void pointer to the underlying 0mq socket
+	 */
+	operator void*() const;
+
+private:
+	void* _socket;
+	socket_type _type;
+	zmq_msg_t _recv_buffer;
+
+	// No copy
+	socket(socket const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+	socket& operator=(socket const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+
+	void track_message(message_t const&, uint32_t const&, bool&);
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket_options.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket_options.hpp
new file mode 100644
index 0000000..3fd3dfc
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket_options.hpp
@@ -0,0 +1,75 @@
+/**
+ * \file
+ *
+ * \date   23 Sep 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_OPTIONS_HPP_
+#define ZMQPP_SOCKET_OPTIONS_HPP_
+
+namespace zmqpp
+{
+
+/** \todo Expand the information on the options to make it actually useful. */
+/*!
+ * \brief possible Socket options in zmq
+ */
+
+enum class socket_option {
+	affinity                  = ZMQ_AFFINITY,          /*!< I/O thread affinity */
+	identity                  = ZMQ_IDENTITY,          /*!< Socket identity */
+	subscribe                 = ZMQ_SUBSCRIBE,         /*!< Add topic subscription - set only */
+	unsubscribe               = ZMQ_UNSUBSCRIBE,       /*!< Remove topic subscription - set only */
+	rate                      = ZMQ_RATE,              /*!< Multicast data rate */
+	send_buffer_size          = ZMQ_SNDBUF,            /*!< Kernel transmission buffer size */
+	receive_buffer_size       = ZMQ_RCVBUF,            /*!< Kernel receive buffer size */
+	receive_more              = ZMQ_RCVMORE,           /*!< Can receive more parts - get only */
+	file_descriptor           = ZMQ_FD,                /*!< Socket file descriptor - get only */
+	events                    = ZMQ_EVENTS,            /*!< Socket event flags - get only */
+	type                      = ZMQ_TYPE,              /*!< Socket type - get only */
+	linger                    = ZMQ_LINGER,            /*!< Socket linger timeout */
+	backlog                   = ZMQ_BACKLOG,           /*!< Maximum length of outstanding connections - get only */
+#if (ZMQ_VERSION_MAJOR == 2)
+    // Note that this is inverse of the zmq names for version 2.x
+	recovery_interval_seconds = ZMQ_RECOVERY_IVL,      /*!< Multicast recovery interval in seconds */
+	recovery_interval         = ZMQ_RECOVERY_IVL_MSEC, /*!< Multicast recovery interval in milliseconds */
+#else
+	recovery_interval         = ZMQ_RECOVERY_IVL,      /*!< Multicast recovery interval in milliseconds */
+#endif
+	reconnect_interval        = ZMQ_RECONNECT_IVL,     /*!< Reconnection interval */
+	reconnect_interval_max    = ZMQ_RECONNECT_IVL_MAX, /*!< Maximum reconnection interval */
+	receive_timeout           = ZMQ_RCVTIMEO,          /*!< Maximum inbound block timeout */
+	send_timeout              = ZMQ_SNDTIMEO,          /*!< Maximum outbound block timeout */
+#if (ZMQ_VERSION_MAJOR == 2)
+	high_water_mark           = ZMQ_HWM,               /*!< High-water mark for all messages */
+	swap_size                 = ZMQ_SWAP,              /*!< Maximum socket swap size in bytes */
+	multicast_loopback        = ZMQ_MCAST_LOOP,        /*!< Allow multicast packet loopback */
+#else
+	max_messsage_size         = ZMQ_MAXMSGSIZE,        /*!< Maximum inbound message size */
+	send_high_water_mark      = ZMQ_SNDHWM,            /*!< High-water mark for outbound messages */
+	receive_high_water_mark   = ZMQ_RCVHWM,            /*!< High-water mark for inbound messages */
+	multicast_hops            = ZMQ_MULTICAST_HOPS,    /*!< Maximum number of multicast hops */
+#endif
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 1))
+	ipv4_only                 = ZMQ_IPV4ONLY,
+#endif
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+	delay_attach_on_connect   = ZMQ_DELAY_ATTACH_ON_CONNECT, /*!< Delay buffer attachment until connect complete */
+	last_endpoint             = ZMQ_LAST_ENDPOINT,           /*!< Last bound endpoint - get only */
+	router_mandatory          = ZMQ_ROUTER_MANDATORY,        /*!< Require routable messages - set only */
+	xpub_verbose              = ZMQ_XPUB_VERBOSE,            /*!< Pass on existing subscriptions - set only */
+	tcp_keepalive             = ZMQ_TCP_KEEPALIVE,           /*!< Enable TCP keepalives */
+	tcp_keepalive_idle        = ZMQ_TCP_KEEPALIVE_IDLE,      /*!< TCP keepalive idle count (generally retry count) */
+	tcp_keepalive_count       = ZMQ_TCP_KEEPALIVE_CNT,       /*!< TCP keepalive retry count */
+	tcp_keepalive_interval    = ZMQ_TCP_KEEPALIVE_INTVL,     /*!< TCP keepalive interval */
+	tcp_accept_filter         = ZMQ_TCP_ACCEPT_FILTER,       /*!< Filter inbound connections - set only */
+#endif
+#ifdef ZMQ_EXPERIMENTAL_LABELS
+	receive_label             = ZMQ_RCVLABEL,          /*!< Received label part - get only */
+#endif
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_OPTIONS_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket_types.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket_types.hpp
new file mode 100644
index 0000000..e59e71c
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/socket_types.hpp
@@ -0,0 +1,148 @@
+/**
+ * \file
+ *
+ * \date   23 Sep 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_TYPES_HPP_
+#define ZMQPP_SOCKET_TYPES_HPP_
+
+namespace zmqpp
+{
+
+/*!
+ * \brief Socket types allowed by zmq
+ *
+ * The socket type choose at creation must be one of these types.
+ *
+ * Each is designed for a different use and has different limitations.
+ */
+enum class socket_type {
+	/*!
+	 * One to one - two way connection.\n
+	 * Connect to ::pair.\n
+	 * A \c pair socket has to be connected only one other pair socket and allows
+	 * two way communication between them.
+	 */
+	pair       = ZMQ_PAIR,
+
+	/*!
+	 * One to many - fan out.\n
+	 * Connect to ::subscribe or ::xsubscribe.\n
+	 * Socket is send only.\n
+	 * Socket will drop messages and not block.\n
+	 * \c publish sockets allow sending of the same message to many subscribers
+	 * each subscriber can limit what is sent through the socket_option::subscribe
+	 * settings.
+	 */
+	publish    = ZMQ_PUB,
+
+	/*!
+	 * \note It seems doxygen can't work out which data is for the socket type and
+	 * which is for the socket option so both get listed for both.
+	 *
+	 * One to many - fair-queued.\n
+	 * Connect to ::publish or ::xpublish.\n
+	 * Socket is receive only.\n
+	 * The \c subscribe socket can connection to any number of publishers and will
+	 * fairly pull messages from each. The socket_option::subscribe settings can
+	 * be use to limit which messages are received and by default none are.
+	 */
+	subscribe  = ZMQ_SUB,
+
+	/*!
+	 * One to many - fair-queued.\n
+	 * Connect to ::push.\n
+	 * Socket is receive only.\n
+	 * The \c pull socket fairly pulls messages from all pushers it is connected
+	 * to.
+	 */
+	pull       = ZMQ_PULL,
+
+	/*!
+	 * One to many - load-balanced.\n
+	 * Connect to ::pull.\n
+	 * Socket is send only.\n
+	 * Socket will block if unable to send.\n
+	 * The \c push socket fairly distributes messages between any connected
+	 * puller sockets.
+	 */
+	push       = ZMQ_PUSH,
+
+	/*!
+	 * One to many - fair-queued outgoing, last peer incoming.\n
+	 * Connect to ::reply or ::xreply.\n
+	 * Socket flips between send and receive only.\n
+	 * Socket will block if unable to send.\n
+	 * The \c request socket will fairly balance requests sent out to a
+	 * replier and then can only be used to receive until that replier
+	 * sends a reply.
+	 */
+	request    = ZMQ_REQ,
+
+	/*!
+	 * One to many - load-balanced incoming, last peer outgoing.\n
+	 * Connect to ::request or ::xrequest.\n
+	 * Socket flips between send and receive only.\n
+	 * Socket will drop messages and not block.\n
+	 * The \c reply socket can only receive until it pulls a message from a
+	 * requester at which point it can only send until the reply is sent.
+	 */
+	reply      = ZMQ_REP,
+
+	/*!
+	 * One to many - fan out.\n
+	 * Connect to ::subscribe or ::xsubscribe.\n
+	 * Socket is send only with the exception of special subscription messages.\n
+	 * Socket will drop messages and not block.\n
+	 * \c xpublish act the same as ::publish sockets however also allow special
+	 * subscription messages to be received from subscribers.
+	 */
+	xpublish   = ZMQ_XPUB,
+
+	/*!
+	 * One to many - fair-queued.\n
+	 * Connect to ::publish or ::xpublish.\n
+	 * Socket is receive only with the exception of special subscription messages\n
+	 * \c xsubscribe act the same as ::subscribe sockets however also allow special
+	 * subscription messages to be send to connected publishers.
+	 */
+	xsubscribe = ZMQ_XSUB,
+
+	/*!
+	 * One to many - fair-queued incoming, load-balanced outgoing.\n
+	 * Connect to ::reply or ::xreply.\n
+	 * Socket will block if unable to send.\n
+	 * An \c xrequest socket balances requests between repliers and pulls replies
+	 * back in a fair manner. Each request is expected to have exactly one reply.
+	 */
+	xrequest   = ZMQ_XREQ,
+
+	/*!
+	 * One to many - fair-queued incoming, targeted outgoing.\n
+	 * Connect to ::request or ::xrequest.\n
+	 * Socket will drop messages and not block.\n
+	 * An \c xreply socket fairly pulls in requests from requesters and will
+	 * label requests so it can return replies back to the correct target.
+	 */
+	xreply     = ZMQ_XREP,
+
+	// To match for people who prefer the shorter versions
+	pub        = ZMQ_PUB,    /*!< version of ::publish to match zmq name convention */
+	sub        = ZMQ_SUB,    /*!< version of ::subscribe to match zmq name convention */
+	req        = ZMQ_REQ,    /*!< version of ::request to match zmq name convention */
+	rep        = ZMQ_REP,    /*!< version of ::reply to match zmq name convention */
+	xpub       = ZMQ_XPUB,   /*!< version of ::xpublish to match zmq name convention */
+	xsub       = ZMQ_XSUB,   /*!< version of ::xsubscribe to match zmq name convention */
+	xreq       = ZMQ_XREQ,   /*!< version of ::xrequest to match zmq name convention */
+	xrep       = ZMQ_XREP,   /*!< version of ::xreply to match zmq name convention */
+
+	// For completion
+	router     = ZMQ_ROUTER, /*!< \deprecated Matches zmq 2.x xrep functionality. */
+	dealer     = ZMQ_DEALER  /*!< \deprecated Matches zmq 2.x xreq functionality. */
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_TYPES_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Linux/zmqpp/zmqpp.hpp b/Source/ThirdParty/libZmq/include/Linux/zmqpp/zmqpp.hpp
new file mode 100644
index 0000000..92a47ce
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Linux/zmqpp/zmqpp.hpp
@@ -0,0 +1,111 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ *
+ * License: http://www.opensource.org/licenses/MIT
+ *
+ * Copyright (C) 2011 by Ben Gray
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef ZMQPP_ZMQPP_HPP_
+#define ZMQPP_ZMQPP_HPP_
+
+/**
+ * \def ZMQPP_VERSION_MAJOR
+ * zmqpp major version number, generated at compile time
+ */
+#define	ZMQPP_VERSION_MAJOR BUILD_VERSION_MAJOR
+
+/**
+ * \def ZMQPP_VERSION_MINOR
+ * zmqpp minor version number, generated at compile time
+ */
+#define	ZMQPP_VERSION_MINOR BUILD_VERSION_MINOR
+
+/**
+ * \def ZMQPP_VERSION_REVISION
+ * zmqpp version revision number, generated at compile time
+ */
+#define	ZMQPP_VERSION_REVISION BUILD_VERSION_REVISION
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+#include "context.hpp"
+#include "exception.hpp"
+#include "message.hpp"
+#include "poller.hpp"
+#include "socket.hpp"
+
+/*!
+ * \brief C++ wrapper around zmq
+ *
+ * All zmq++ / zmqpp functions, constants and classes live within this namespace,
+ */
+namespace zmqpp
+{
+
+/*!
+ * Returns the current major.minor.revision version number as a string.
+ *
+ * \return string version number.
+ */
+std::string version();
+
+/*!
+ * Retrieve the parts of the zmqpp version number.
+ *
+ * Set the three parameters to values representing the zmqpp version number.
+ * These values are generated at library compile time.
+ *
+ * \param major an unsigned 8 bit reference to set to the major version.
+ * \param minor an unsigned 8 bit reference to set to the minor version.
+ * \param revision an unsigned 8 bit reference to set the current revision.
+ */
+void version(uint8_t& major, uint8_t& minor, uint8_t& revision);
+
+/*!
+ * Retrieve the parts of the 0mq version this library was built against.
+ *
+ * Because sections of the library are optionally compiled in or ignored
+ * depending on the version of 0mq it was compiled against this method is
+ * provided to allow sanity checking for usage.
+ *
+ * Set the three parameters to values representing the 0mq version number.
+ * These values are generated at library compile time.
+ *
+ * \param major an unsigned 8 bit reference to set to the major version.
+ * \param minor an unsigned 8 bit reference to set to the minor version.
+ * \param revision an unsigned 8 bit reference to set the current revision.
+ */
+void zmq_version(uint8_t& major, uint8_t& minor, uint8_t& patch);
+
+typedef context     context_t;   /*!< \brief context type */
+typedef std::string endpoint_t;  /*!< \brief endpoint type */
+typedef message     message_t;   /*!< \brief message type */
+typedef poller      poller_t;    /*!< \brief poller type */
+typedef socket      socket_t;    /*!< \brief socket type */
+
+}
+
+#endif /* ZMQPP_ZMQPP_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmq.h b/Source/ThirdParty/libZmq/include/Mac/zmq.h
new file mode 100644
index 0000000..c58885b
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmq.h
@@ -0,0 +1,463 @@
+/*
+    Copyright (c) 2007-2015 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    *************************************************************************
+    NOTE to contributors. This file comprises the principal public contract
+    for ZeroMQ API users (along with zmq_utils.h). Any change to this file
+    supplied in a stable release SHOULD not break existing applications.
+    In practice this means that the value of constants must not change, and
+    that old values may not be reused for new constants.
+    *************************************************************************
+*/
+
+#ifndef __ZMQ_H_INCLUDED__
+#define __ZMQ_H_INCLUDED__
+
+/*  Version macros for compile-time API version detection                     */
+#define ZMQ_VERSION_MAJOR 4
+#define ZMQ_VERSION_MINOR 1
+#define ZMQ_VERSION_PATCH 4
+
+#define ZMQ_MAKE_VERSION(major, minor, patch) \
+    ((major) * 10000 + (minor) * 100 + (patch))
+#define ZMQ_VERSION \
+    ZMQ_MAKE_VERSION(ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined _WIN32_WCE
+#include <errno.h>
+#endif
+#include <stddef.h>
+#include <stdio.h>
+#if defined _WIN32
+#include <winsock2.h>
+#endif
+
+/*  Handle DSO symbol visibility                                             */
+#if defined _WIN32
+#   if defined ZMQ_STATIC
+#       define ZMQ_EXPORT
+#   elif defined DLL_EXPORT
+#       define ZMQ_EXPORT __declspec(dllexport)
+#   else
+#       define ZMQ_EXPORT __declspec(dllimport)
+#   endif
+#else
+#   if defined __SUNPRO_C  || defined __SUNPRO_CC
+#       define ZMQ_EXPORT __global
+#   elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#       define ZMQ_EXPORT __attribute__ ((visibility("default")))
+#   else
+#       define ZMQ_EXPORT
+#   endif
+#endif
+
+/*  Define integer types needed for event interface                          */
+#define ZMQ_DEFINED_STDINT 1
+#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
+#   include <inttypes.h>
+#else
+#   include <stdint.h>
+#endif
+
+
+/******************************************************************************/
+/*  0MQ errors.                                                               */
+/******************************************************************************/
+
+/*  A number random enough not to collide with different errno ranges on      */
+/*  different OSes. The assumption is that error_t is at least 32-bit type.   */
+#define ZMQ_HAUSNUMERO 156384712
+
+/*  On Windows platform some of the standard POSIX errnos are not defined.    */
+#ifndef ENOTSUP
+#define ENOTSUP (ZMQ_HAUSNUMERO + 1)
+#endif
+#ifndef EPROTONOSUPPORT
+#define EPROTONOSUPPORT (ZMQ_HAUSNUMERO + 2)
+#endif
+#ifndef ENOBUFS
+#define ENOBUFS (ZMQ_HAUSNUMERO + 3)
+#endif
+#ifndef ENETDOWN
+#define ENETDOWN (ZMQ_HAUSNUMERO + 4)
+#endif
+#ifndef EADDRINUSE
+#define EADDRINUSE (ZMQ_HAUSNUMERO + 5)
+#endif
+#ifndef EADDRNOTAVAIL
+#define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6)
+#endif
+#ifndef ECONNREFUSED
+#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7)
+#endif
+#ifndef EINPROGRESS
+#define EINPROGRESS (ZMQ_HAUSNUMERO + 8)
+#endif
+#ifndef ENOTSOCK
+#define ENOTSOCK (ZMQ_HAUSNUMERO + 9)
+#endif
+#ifndef EMSGSIZE
+#define EMSGSIZE (ZMQ_HAUSNUMERO + 10)
+#endif
+#ifndef EAFNOSUPPORT
+#define EAFNOSUPPORT (ZMQ_HAUSNUMERO + 11)
+#endif
+#ifndef ENETUNREACH
+#define ENETUNREACH (ZMQ_HAUSNUMERO + 12)
+#endif
+#ifndef ECONNABORTED
+#define ECONNABORTED (ZMQ_HAUSNUMERO + 13)
+#endif
+#ifndef ECONNRESET
+#define ECONNRESET (ZMQ_HAUSNUMERO + 14)
+#endif
+#ifndef ENOTCONN
+#define ENOTCONN (ZMQ_HAUSNUMERO + 15)
+#endif
+#ifndef ETIMEDOUT
+#define ETIMEDOUT (ZMQ_HAUSNUMERO + 16)
+#endif
+#ifndef EHOSTUNREACH
+#define EHOSTUNREACH (ZMQ_HAUSNUMERO + 17)
+#endif
+#ifndef ENETRESET
+#define ENETRESET (ZMQ_HAUSNUMERO + 18)
+#endif
+
+/*  Native 0MQ error codes.                                                   */
+#define EFSM (ZMQ_HAUSNUMERO + 51)
+#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
+#define ETERM (ZMQ_HAUSNUMERO + 53)
+#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
+
+/*  This function retrieves the errno as it is known to 0MQ library. The goal */
+/*  of this function is to make the code 100% portable, including where 0MQ   */
+/*  compiled with certain CRT library (on Windows) is linked to an            */
+/*  application that uses different CRT library.                              */
+ZMQ_EXPORT int zmq_errno (void);
+
+/*  Resolves system errors and 0MQ errors to human-readable string.           */
+ZMQ_EXPORT const char *zmq_strerror (int errnum);
+
+/*  Run-time API version detection                                            */
+ZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
+
+/******************************************************************************/
+/*  0MQ infrastructure (a.k.a. context) initialisation & termination.         */
+/******************************************************************************/
+
+/*  New API                                                                   */
+/*  Context options                                                           */
+#define ZMQ_IO_THREADS  1
+#define ZMQ_MAX_SOCKETS 2
+#define ZMQ_SOCKET_LIMIT 3
+#define ZMQ_THREAD_PRIORITY 3
+#define ZMQ_THREAD_SCHED_POLICY 4
+
+/*  Default for new contexts                                                  */
+#define ZMQ_IO_THREADS_DFLT  1
+#define ZMQ_MAX_SOCKETS_DFLT 1023
+#define ZMQ_THREAD_PRIORITY_DFLT -1
+#define ZMQ_THREAD_SCHED_POLICY_DFLT -1
+
+ZMQ_EXPORT void *zmq_ctx_new (void);
+ZMQ_EXPORT int zmq_ctx_term (void *context);
+ZMQ_EXPORT int zmq_ctx_shutdown (void *ctx_);
+ZMQ_EXPORT int zmq_ctx_set (void *context, int option, int optval);
+ZMQ_EXPORT int zmq_ctx_get (void *context, int option);
+
+/*  Old (legacy) API                                                          */
+ZMQ_EXPORT void *zmq_init (int io_threads);
+ZMQ_EXPORT int zmq_term (void *context);
+ZMQ_EXPORT int zmq_ctx_destroy (void *context);
+
+
+/******************************************************************************/
+/*  0MQ message definition.                                                   */
+/******************************************************************************/
+
+typedef struct zmq_msg_t {unsigned char _ [64];} zmq_msg_t;
+
+typedef void (zmq_free_fn) (void *data, void *hint);
+
+ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg);
+ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg, size_t size);
+ZMQ_EXPORT int zmq_msg_init_data (zmq_msg_t *msg, void *data,
+    size_t size, zmq_free_fn *ffn, void *hint);
+ZMQ_EXPORT int zmq_msg_send (zmq_msg_t *msg, void *s, int flags);
+ZMQ_EXPORT int zmq_msg_recv (zmq_msg_t *msg, void *s, int flags);
+ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg);
+ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src);
+ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src);
+ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg);
+ZMQ_EXPORT size_t zmq_msg_size (zmq_msg_t *msg);
+ZMQ_EXPORT int zmq_msg_more (zmq_msg_t *msg);
+ZMQ_EXPORT int zmq_msg_get (zmq_msg_t *msg, int property);
+ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg, int property, int optval);
+ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
+
+
+/******************************************************************************/
+/*  0MQ socket definition.                                                    */
+/******************************************************************************/
+
+/*  Socket types.                                                             */
+#define ZMQ_PAIR 0
+#define ZMQ_PUB 1
+#define ZMQ_SUB 2
+#define ZMQ_REQ 3
+#define ZMQ_REP 4
+#define ZMQ_DEALER 5
+#define ZMQ_ROUTER 6
+#define ZMQ_PULL 7
+#define ZMQ_PUSH 8
+#define ZMQ_XPUB 9
+#define ZMQ_XSUB 10
+#define ZMQ_STREAM 11
+
+/*  Deprecated aliases                                                        */
+#define ZMQ_XREQ ZMQ_DEALER
+#define ZMQ_XREP ZMQ_ROUTER
+
+/*  Socket options.                                                           */
+#define ZMQ_AFFINITY 4
+#define ZMQ_IDENTITY 5
+#define ZMQ_SUBSCRIBE 6
+#define ZMQ_UNSUBSCRIBE 7
+#define ZMQ_RATE 8
+#define ZMQ_RECOVERY_IVL 9
+#define ZMQ_SNDBUF 11
+#define ZMQ_RCVBUF 12
+#define ZMQ_RCVMORE 13
+#define ZMQ_FD 14
+#define ZMQ_EVENTS 15
+#define ZMQ_TYPE 16
+#define ZMQ_LINGER 17
+#define ZMQ_RECONNECT_IVL 18
+#define ZMQ_BACKLOG 19
+#define ZMQ_RECONNECT_IVL_MAX 21
+#define ZMQ_MAXMSGSIZE 22
+#define ZMQ_SNDHWM 23
+#define ZMQ_RCVHWM 24
+#define ZMQ_MULTICAST_HOPS 25
+#define ZMQ_RCVTIMEO 27
+#define ZMQ_SNDTIMEO 28
+#define ZMQ_LAST_ENDPOINT 32
+#define ZMQ_ROUTER_MANDATORY 33
+#define ZMQ_TCP_KEEPALIVE 34
+#define ZMQ_TCP_KEEPALIVE_CNT 35
+#define ZMQ_TCP_KEEPALIVE_IDLE 36
+#define ZMQ_TCP_KEEPALIVE_INTVL 37
+#define ZMQ_IMMEDIATE 39
+#define ZMQ_XPUB_VERBOSE 40
+#define ZMQ_ROUTER_RAW 41
+#define ZMQ_IPV6 42
+#define ZMQ_MECHANISM 43
+#define ZMQ_PLAIN_SERVER 44
+#define ZMQ_PLAIN_USERNAME 45
+#define ZMQ_PLAIN_PASSWORD 46
+#define ZMQ_CURVE_SERVER 47
+#define ZMQ_CURVE_PUBLICKEY 48
+#define ZMQ_CURVE_SECRETKEY 49
+#define ZMQ_CURVE_SERVERKEY 50
+#define ZMQ_PROBE_ROUTER 51
+#define ZMQ_REQ_CORRELATE 52
+#define ZMQ_REQ_RELAXED 53
+#define ZMQ_CONFLATE 54
+#define ZMQ_ZAP_DOMAIN 55
+#define ZMQ_ROUTER_HANDOVER 56
+#define ZMQ_TOS 57
+#define ZMQ_CONNECT_RID 61
+#define ZMQ_GSSAPI_SERVER 62
+#define ZMQ_GSSAPI_PRINCIPAL 63
+#define ZMQ_GSSAPI_SERVICE_PRINCIPAL 64
+#define ZMQ_GSSAPI_PLAINTEXT 65
+#define ZMQ_HANDSHAKE_IVL 66
+#define ZMQ_SOCKS_PROXY 68
+#define ZMQ_XPUB_NODROP 69
+
+/*  Message options                                                           */
+#define ZMQ_MORE 1
+#define ZMQ_SRCFD 2
+#define ZMQ_SHARED 3
+
+/*  Send/recv options.                                                        */
+#define ZMQ_DONTWAIT 1
+#define ZMQ_SNDMORE 2
+
+/*  Security mechanisms                                                       */
+#define ZMQ_NULL 0
+#define ZMQ_PLAIN 1
+#define ZMQ_CURVE 2
+#define ZMQ_GSSAPI 3
+
+/*  Deprecated options and aliases                                            */
+#define ZMQ_TCP_ACCEPT_FILTER       38
+#define ZMQ_IPC_FILTER_PID          58
+#define ZMQ_IPC_FILTER_UID          59
+#define ZMQ_IPC_FILTER_GID          60
+#define ZMQ_IPV4ONLY                31
+#define ZMQ_DELAY_ATTACH_ON_CONNECT ZMQ_IMMEDIATE
+#define ZMQ_NOBLOCK                 ZMQ_DONTWAIT
+#define ZMQ_FAIL_UNROUTABLE         ZMQ_ROUTER_MANDATORY
+#define ZMQ_ROUTER_BEHAVIOR         ZMQ_ROUTER_MANDATORY
+
+/******************************************************************************/
+/*  0MQ socket events and monitoring                                          */
+/******************************************************************************/
+
+/*  Socket transport events (TCP and IPC only)                                */
+
+#define ZMQ_EVENT_CONNECTED         0x0001
+#define ZMQ_EVENT_CONNECT_DELAYED   0x0002
+#define ZMQ_EVENT_CONNECT_RETRIED   0x0004
+#define ZMQ_EVENT_LISTENING         0x0008
+#define ZMQ_EVENT_BIND_FAILED       0x0010
+#define ZMQ_EVENT_ACCEPTED          0x0020
+#define ZMQ_EVENT_ACCEPT_FAILED     0x0040
+#define ZMQ_EVENT_CLOSED            0x0080
+#define ZMQ_EVENT_CLOSE_FAILED      0x0100
+#define ZMQ_EVENT_DISCONNECTED      0x0200
+#define ZMQ_EVENT_MONITOR_STOPPED   0x0400
+#define ZMQ_EVENT_ALL               0xFFFF
+
+ZMQ_EXPORT void *zmq_socket (void *, int type);
+ZMQ_EXPORT int zmq_close (void *s);
+ZMQ_EXPORT int zmq_setsockopt (void *s, int option, const void *optval,
+    size_t optvallen);
+ZMQ_EXPORT int zmq_getsockopt (void *s, int option, void *optval,
+    size_t *optvallen);
+ZMQ_EXPORT int zmq_bind (void *s, const char *addr);
+ZMQ_EXPORT int zmq_connect (void *s, const char *addr);
+ZMQ_EXPORT int zmq_unbind (void *s, const char *addr);
+ZMQ_EXPORT int zmq_disconnect (void *s, const char *addr);
+ZMQ_EXPORT int zmq_send (void *s, const void *buf, size_t len, int flags);
+ZMQ_EXPORT int zmq_send_const (void *s, const void *buf, size_t len, int flags);
+ZMQ_EXPORT int zmq_recv (void *s, void *buf, size_t len, int flags);
+ZMQ_EXPORT int zmq_socket_monitor (void *s, const char *addr, int events);
+
+
+/******************************************************************************/
+/*  I/O multiplexing.                                                         */
+/******************************************************************************/
+
+#define ZMQ_POLLIN 1
+#define ZMQ_POLLOUT 2
+#define ZMQ_POLLERR 4
+
+typedef struct zmq_pollitem_t
+{
+    void *socket;
+#if defined _WIN32
+    SOCKET fd;
+#else
+    int fd;
+#endif
+    short events;
+    short revents;
+} zmq_pollitem_t;
+
+#define ZMQ_POLLITEMS_DFLT 16
+
+ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout);
+
+/******************************************************************************/
+/*  Message proxying                                                          */
+/******************************************************************************/
+
+ZMQ_EXPORT int zmq_proxy (void *frontend, void *backend, void *capture);
+ZMQ_EXPORT int zmq_proxy_steerable (void *frontend, void *backend, void *capture, void *control);
+
+/******************************************************************************/
+/*  Probe library capabilities                                                */
+/******************************************************************************/
+
+#define ZMQ_HAS_CAPABILITIES 1
+ZMQ_EXPORT int zmq_has (const char *capability);
+
+/*  Deprecated aliases */
+#define ZMQ_STREAMER 1
+#define ZMQ_FORWARDER 2
+#define ZMQ_QUEUE 3
+
+/*  Deprecated methods */
+ZMQ_EXPORT int zmq_device (int type, void *frontend, void *backend);
+ZMQ_EXPORT int zmq_sendmsg (void *s, zmq_msg_t *msg, int flags);
+ZMQ_EXPORT int zmq_recvmsg (void *s, zmq_msg_t *msg, int flags);
+
+
+/******************************************************************************/
+/*  Encryption functions                                                      */
+/******************************************************************************/
+
+/*  Encode data with Z85 encoding. Returns encoded data                       */
+ZMQ_EXPORT char *zmq_z85_encode (char *dest, const uint8_t *data, size_t size);
+
+/*  Decode data with Z85 encoding. Returns decoded data                       */
+ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest, const char *string);
+
+/*  Generate z85-encoded public and private keypair with libsodium.           */
+/*  Returns 0 on success.                                                     */
+ZMQ_EXPORT int zmq_curve_keypair (char *z85_public_key, char *z85_secret_key);
+
+
+/******************************************************************************/
+/*  These functions are not documented by man pages -- use at your own risk.  */
+/*  If you need these to be part of the formal ZMQ API, then (a) write a man  */
+/*  page, and (b) write a test case in tests.                                 */
+/******************************************************************************/
+
+struct iovec;
+
+ZMQ_EXPORT int zmq_sendiov (void *s, struct iovec *iov, size_t count, int flags);
+ZMQ_EXPORT int zmq_recviov (void *s, struct iovec *iov, size_t *count, int flags);
+
+/*  Helper functions are used by perf tests so that they don't have to care   */
+/*  about minutiae of time-related functions on different OS platforms.       */
+
+/*  Starts the stopwatch. Returns the handle to the watch.                    */
+ZMQ_EXPORT void *zmq_stopwatch_start (void);
+
+/*  Stops the stopwatch. Returns the number of microseconds elapsed since     */
+/*  the stopwatch was started.                                                */
+ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
+
+/*  Sleeps for specified number of seconds.                                   */
+ZMQ_EXPORT void zmq_sleep (int seconds_);
+
+typedef void (zmq_thread_fn) (void*);
+
+/* Start a thread. Returns a handle to the thread.                            */
+ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn* func, void* arg);
+
+/* Wait for thread to complete then free up resources.                        */
+ZMQ_EXPORT void zmq_threadclose (void* thread);
+
+
+#undef ZMQ_EXPORT
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmq.hpp b/Source/ThirdParty/libZmq/include/Mac/zmq.hpp
new file mode 100644
index 0000000..37817db
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmq.hpp
@@ -0,0 +1,789 @@
+/*
+    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2011 Botond Ballo
+    Copyright (c) 2007-2009 iMatix Corporation
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to
+    deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+    sell copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+    IN THE SOFTWARE.
+*/
+
+#ifndef __ZMQ_HPP_INCLUDED__
+#define __ZMQ_HPP_INCLUDED__
+
+#if __cplusplus >= 201103L
+#define ZMQ_CPP11
+#define ZMQ_NOTHROW noexcept
+#define ZMQ_EXPLICIT explicit
+#else
+    #define ZMQ_CPP03
+    #define ZMQ_NOTHROW
+    #define ZMQ_EXPLICIT
+#endif
+
+#include <zmq.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <exception>
+#include <vector>
+#include <iterator>
+
+#ifdef ZMQ_CPP11
+#include <chrono>
+#include <tuple>
+#endif
+
+//  Detect whether the compiler supports C++11 rvalue references.
+#if (defined(__GNUC__) && (__GNUC__ > 4 || \
+      (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && \
+      defined(__GXX_EXPERIMENTAL_CXX0X__))
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION = delete
+#elif defined(__clang__)
+    #if __has_feature(cxx_rvalue_references)
+        #define ZMQ_HAS_RVALUE_REFS
+    #endif
+
+    #if __has_feature(cxx_deleted_functions)
+        #define ZMQ_DELETED_FUNCTION = delete
+    #else
+        #define ZMQ_DELETED_FUNCTION
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER >= 1600)
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION
+#else
+    #define ZMQ_DELETED_FUNCTION
+#endif
+
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 3, 0)
+#define ZMQ_NEW_MONITOR_EVENT_LAYOUT
+#endif
+
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0)
+#define ZMQ_HAS_PROXY_STEERABLE
+/*  Socket event data  */
+typedef struct {
+    uint16_t event;  // id of the event as bitfield
+    int32_t  value ; // value is either error code, fd or reconnect interval
+} zmq_event_t;
+#endif
+
+// Avoid using deprecated message receive function when possible
+#if ZMQ_VERSION < ZMQ_MAKE_VERSION(3, 2, 0)
+#  define zmq_msg_recv(msg, socket, flags) zmq_recvmsg(socket, msg, flags)
+#endif
+
+
+// In order to prevent unused variable warnings when building in non-debug
+// mode use this macro to make assertions.
+#ifndef NDEBUG
+#   define ZMQ_ASSERT(expression) assert(expression)
+#else
+#   define ZMQ_ASSERT(expression) (void)(expression)
+#endif
+
+namespace zmq
+{
+
+    typedef zmq_free_fn free_fn;
+    typedef zmq_pollitem_t pollitem_t;
+
+    class error_t : public std::exception
+    {
+    public:
+
+        error_t () : errnum (zmq_errno ()) {}
+
+        virtual const char *what () const throw ()
+        {
+            return zmq_strerror (errnum);
+        }
+
+        int num () const
+        {
+            return errnum;
+        }
+
+    private:
+
+        int errnum;
+    };
+
+    inline int poll (zmq_pollitem_t const* items_, size_t nitems_, long timeout_ = -1)
+    {
+        int rc = zmq_poll (const_cast<zmq_pollitem_t*>(items_), static_cast<int>(nitems_), timeout_);
+        if (rc < 0)
+            throw error_t ();
+        return rc;
+    }
+
+    inline int poll(zmq_pollitem_t const* items, size_t nitems)
+    {
+        return poll(items, nitems, -1);
+    }
+
+    #ifdef ZMQ_CPP11
+    inline int poll(zmq_pollitem_t const* items, size_t nitems, std::chrono::milliseconds timeout)
+    {
+        return poll(items, nitems, timeout.count() );
+    }
+
+    inline int poll(std::vector<zmq_pollitem_t> const& items, std::chrono::milliseconds timeout)
+    {
+        return poll(items.data(), items.size(), timeout.count() );
+    }
+
+    inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)
+    {
+        return poll(items.data(), items.size(), timeout_);
+    }
+    #endif
+
+
+
+    inline void proxy (void *frontend, void *backend, void *capture)
+    {
+        int rc = zmq_proxy (frontend, backend, capture);
+        if (rc != 0)
+            throw error_t ();
+    }
+    
+#ifdef ZMQ_HAS_PROXY_STEERABLE
+    inline void proxy_steerable (void *frontend, void *backend, void *capture, void *control)
+    {
+        int rc = zmq_proxy_steerable (frontend, backend, capture, control);
+        if (rc != 0)
+            throw error_t ();
+    }
+#endif
+    
+    inline void version (int *major_, int *minor_, int *patch_)
+    {
+        zmq_version (major_, minor_, patch_);
+    }
+
+    #ifdef ZMQ_CPP11
+    inline std::tuple<int, int, int> version()
+    {
+        std::tuple<int, int, int> v;
+        zmq_version(&std::get<0>(v), &std::get<1>(v), &std::get<2>(v) );
+        return v;
+    }
+    #endif
+
+    class message_t
+    {
+        friend class socket_t;
+
+    public:
+
+        inline message_t ()
+        {
+            int rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline explicit message_t (size_t size_)
+        {
+            int rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        template<typename I> message_t(I first, I last):
+            msg()
+        {
+            typedef typename std::iterator_traits<I>::difference_type size_type;
+            typedef typename std::iterator_traits<I>::value_type value_t;
+
+            size_type const size_ = std::distance(first, last)*sizeof(value_t);
+            int const rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            value_t* dest = data<value_t>();
+            while (first != last)
+            {
+                *dest = *first;
+                ++dest; ++first;
+            }
+        }
+
+        inline message_t (const void *data_, size_t size_)
+        {
+            int rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            memcpy(data(), data_, size_);
+        }
+
+        inline message_t (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline message_t (message_t &&rhs): msg (rhs.msg)
+        {
+            int rc = zmq_msg_init (&rhs.msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline message_t &operator = (message_t &&rhs) ZMQ_NOTHROW
+        {
+            std::swap (msg, rhs.msg);
+            return *this;
+        }
+#endif
+
+        inline ~message_t () ZMQ_NOTHROW
+        {
+            int rc = zmq_msg_close (&msg);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        inline void rebuild ()
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (size_t size_)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (const void *data_, size_t size_)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            memcpy(data(), data_, size_);
+        }
+
+        inline void rebuild (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void move (message_t const *msg_)
+        {
+            int rc = zmq_msg_move (&msg, const_cast<zmq_msg_t*>(&(msg_->msg)));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void copy (message_t const *msg_)
+        {
+            int rc = zmq_msg_copy (&msg, const_cast<zmq_msg_t*>(&(msg_->msg)));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool more () const ZMQ_NOTHROW
+        {
+            int rc = zmq_msg_more (const_cast<zmq_msg_t*>(&msg) );
+            return rc != 0;
+        }
+
+        inline void *data () ZMQ_NOTHROW
+        {
+            return zmq_msg_data (&msg);
+        }
+
+        inline const void* data () const ZMQ_NOTHROW
+        {
+            return zmq_msg_data (const_cast<zmq_msg_t*>(&msg));
+        }
+
+        inline size_t size () const ZMQ_NOTHROW
+        {
+            return zmq_msg_size (const_cast<zmq_msg_t*>(&msg));
+        }
+
+        template<typename T> T* data() ZMQ_NOTHROW
+        {
+            return static_cast<T*>( data() );
+        }
+
+        template<typename T> T const* data() const ZMQ_NOTHROW
+        {
+            return static_cast<T const*>( data() );
+        }
+
+
+    private:
+        //  The underlying message
+        zmq_msg_t msg;
+
+        //  Disable implicit message copying, so that users won't use shared
+        //  messages (less efficient) without being aware of the fact.
+        message_t (const message_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const message_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    class context_t
+    {
+        friend class socket_t;
+
+    public:
+        inline context_t ()
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+
+        inline explicit context_t (int io_threads_, int max_sockets_ = ZMQ_MAX_SOCKETS_DFLT)
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+
+            int rc = zmq_ctx_set (ptr, ZMQ_IO_THREADS, io_threads_);
+            ZMQ_ASSERT (rc == 0);
+
+            rc = zmq_ctx_set (ptr, ZMQ_MAX_SOCKETS, max_sockets_);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline context_t (context_t &&rhs) ZMQ_NOTHROW : ptr (rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline context_t &operator = (context_t &&rhs) ZMQ_NOTHROW
+        {
+            std::swap (ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~context_t () ZMQ_NOTHROW
+        {
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        inline void close() ZMQ_NOTHROW
+        {
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        //  Be careful with this, it's probably only useful for
+        //  using the C api together with an existing C++ api.
+        //  Normally you should never need to use this.
+        inline ZMQ_EXPLICIT operator void* () ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline ZMQ_EXPLICIT operator void const* () const ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+    private:
+
+        void *ptr;
+
+        context_t (const context_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const context_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    #ifdef ZMQ_CPP11
+    enum class socket_type: int
+    {
+        req = ZMQ_REQ,
+        rep = ZMQ_REP,
+        dealer = ZMQ_DEALER,
+        router = ZMQ_ROUTER,
+        pub = ZMQ_PUB,
+        sub = ZMQ_SUB,
+        xpub = ZMQ_XPUB,
+        xsub = ZMQ_XSUB,
+        push = ZMQ_PUSH,
+        pull = ZMQ_PULL,
+#if ZMQ_VERSION_MAJOR < 4
+        pair = ZMQ_PAIR
+#else
+        pair = ZMQ_PAIR,
+        stream = ZMQ_STREAM
+#endif
+    };
+    #endif
+
+    class socket_t
+    {
+        friend class monitor_t;
+    public:
+        inline socket_t(context_t& context_, int type_)
+        {
+            init(context_, type_);
+        }
+
+        #ifdef ZMQ_CPP11
+        inline socket_t(context_t& context_, socket_type type_)
+        {
+            init(context_, static_cast<int>(type_));
+        }
+        #endif
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline socket_t(socket_t&& rhs) ZMQ_NOTHROW : ptr(rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline socket_t& operator=(socket_t&& rhs) ZMQ_NOTHROW
+        {
+            std::swap(ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~socket_t () ZMQ_NOTHROW
+        {
+            close();
+        }
+
+        inline ZMQ_EXPLICIT operator void* () ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline ZMQ_EXPLICIT operator void const* () const ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline void close() ZMQ_NOTHROW
+        {
+            if(ptr == NULL)
+                // already closed
+                return ;
+            int rc = zmq_close (ptr);
+            ZMQ_ASSERT (rc == 0);
+            ptr = 0 ;
+        }
+
+        template<typename T> void setsockopt(int option_, T const& optval)
+        {
+            setsockopt(option_, &optval, sizeof(T) );
+        }
+
+        inline void setsockopt (int option_, const void *optval_,
+            size_t optvallen_)
+        {
+            int rc = zmq_setsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void getsockopt (int option_, void *optval_,
+            size_t *optvallen_) const
+        {
+            int rc = zmq_getsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        template<typename T> T getsockopt(int option_) const
+        {
+            T optval;
+            size_t optlen = sizeof(T);
+            getsockopt(option_, &optval, &optlen );
+            return optval;
+        }
+
+        inline void bind(std::string const& addr)
+        {
+            bind(addr.c_str());
+        }
+
+        inline void bind (const char *addr_)
+        {
+            int rc = zmq_bind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void unbind(std::string const& addr)
+        {
+            unbind(addr.c_str());
+        }
+
+        inline void unbind (const char *addr_)
+        {
+            int rc = zmq_unbind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void connect(std::string const& addr)
+        {
+            connect(addr.c_str());
+        }
+
+        inline void connect (const char *addr_)
+        {
+            int rc = zmq_connect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void disconnect(std::string const& addr)
+        {
+            disconnect(addr.c_str());
+        }
+
+        inline void disconnect (const char *addr_)
+        {
+            int rc = zmq_disconnect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool connected() const ZMQ_NOTHROW
+        {
+            return(ptr != NULL);
+        }
+        
+        inline size_t send (const void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_send (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool send (message_t &msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_send (&(msg_.msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+
+        template<typename I> bool send(I first, I last, int flags_=0)
+        {
+            zmq::message_t msg(first, last);
+            return send(msg, flags_);
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline bool send (message_t &&msg_, int flags_ = 0)
+        {
+            return send(msg_, flags_);
+        }
+#endif
+
+        inline size_t recv (void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_recv (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool recv (message_t *msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_recv (&(msg_->msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+        
+    private:
+        inline void init(context_t& context_, int type_)
+        {
+            ctxptr = context_.ptr;
+            ptr = zmq_socket (context_.ptr, type_ );
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+        void *ptr;
+        void *ctxptr;
+
+        socket_t (const socket_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const socket_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    class monitor_t
+    {
+    public:
+        monitor_t() : socketPtr(NULL) {}
+        virtual ~monitor_t() {}
+
+        void monitor(socket_t &socket, std::string const& addr, int events = ZMQ_EVENT_ALL)
+        {
+            monitor(socket, addr.c_str(), events);
+        }
+
+        void monitor(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL)
+        {
+            int rc = zmq_socket_monitor(socket.ptr, addr_, events);
+            if (rc != 0)
+                throw error_t ();
+
+            socketPtr = socket.ptr;
+            void *s = zmq_socket (socket.ctxptr, ZMQ_PAIR);
+            assert (s);
+
+            rc = zmq_connect (s, addr_);
+            assert (rc == 0);
+            
+            on_monitor_started();
+            
+            while (true) {
+                zmq_msg_t eventMsg;
+                zmq_msg_init (&eventMsg);
+                rc = zmq_msg_recv (&eventMsg, s, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+#if ZMQ_VERSION_MAJOR >= 4
+                const char* data = static_cast<const char*>(zmq_msg_data(&eventMsg));
+                zmq_event_t msgEvent;
+                memcpy(&msgEvent.event, data, sizeof(uint16_t)); data += sizeof(uint16_t);
+                memcpy(&msgEvent.value, data, sizeof(int32_t));
+                zmq_event_t* event = &msgEvent;
+#else
+                zmq_event_t* event = static_cast<zmq_event_t*>(zmq_msg_data(&eventMsg));
+#endif
+                
+#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT
+                zmq_msg_t addrMsg;
+                zmq_msg_init (&addrMsg);
+                rc = zmq_msg_recv (&addrMsg, s, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+                const char* str = static_cast<const char*>(zmq_msg_data (&addrMsg));
+                std::string address(str, str + zmq_msg_size(&addrMsg));
+                zmq_msg_close (&addrMsg);
+#else
+                // Bit of a hack, but all events in the zmq_event_t union have the same layout so this will work for all event types.
+                std::string address = event->data.connected.addr;
+#endif
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+                if (event->event == ZMQ_EVENT_MONITOR_STOPPED)
+                    break;
+#endif
+
+                switch (event->event) {
+                case ZMQ_EVENT_CONNECTED:
+                    on_event_connected(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_DELAYED:
+                    on_event_connect_delayed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_RETRIED:
+                    on_event_connect_retried(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_LISTENING:
+                    on_event_listening(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_BIND_FAILED:
+                    on_event_bind_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPTED:
+                    on_event_accepted(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPT_FAILED:
+                    on_event_accept_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSED:
+                    on_event_closed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSE_FAILED:
+                    on_event_close_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_DISCONNECTED:
+                    on_event_disconnected(*event, address.c_str());
+                    break;
+                default:
+                    on_event_unknown(*event, address.c_str());
+                    break;
+                }
+                zmq_msg_close (&eventMsg);
+            }
+            zmq_close (s);
+            socketPtr = NULL;
+        }
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+        void abort()
+        {
+            if (socketPtr)
+                zmq_socket_monitor(socketPtr, NULL, 0);
+        }
+#endif
+        virtual void on_monitor_started() {}
+        virtual void on_event_connected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_delayed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_retried(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_listening(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_bind_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accepted(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accept_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_closed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_close_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_disconnected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_unknown(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+    private:
+        void* socketPtr;
+    };
+}
+
+#endif
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmq_utils.h b/Source/ThirdParty/libZmq/include/Mac/zmq_utils.h
new file mode 100644
index 0000000..3392a8e
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmq_utils.h
@@ -0,0 +1,20 @@
+/*
+    Copyright (c) 2007-2015 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*  This file is deprecated, and all its functionality provided by zmq.h     */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/compatibility.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/compatibility.hpp
new file mode 100644
index 0000000..4673f3b
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/compatibility.hpp
@@ -0,0 +1,80 @@
+/**
+ * \file
+ *
+ * \date   10 Sep 2011
+ * \author ron
+ * \author Ben Gray (\@benjamg)
+ *
+ * A fair number of C++0x (or more accurately C++11) features are used in this
+ * library and as this project is used where I work on older compilers this
+ * file was created to help.
+ *
+ * C++ features and their workaround where not supported:
+ * \li lambda functions - disabled, these are only used in the test anyway.
+ * \li typesafe enums   - replaced with enum where comparisons needed.
+ * \li nullptr          - defined to null.
+ *
+ * As of the port to version 3.1 (libzmqpp version 1.1.0) this file will also
+ * be used to maintain compatablity with multiple versions of 0mq
+ */
+
+#ifndef ZMQPP_COMPATIBILITY_HPP_
+#define ZMQPP_COMPATIBILITY_HPP_
+
+#include <zmq.h>
+
+// Currently we require at least 0mq version 2.2.x
+#define ZMQPP_REQUIRED_ZMQ_MAJOR 2
+#define ZMQPP_REQUIRED_ZMQ_MINOR 2
+
+#if (ZMQ_VERSION_MAJOR < ZMQPP_REQUIRED_ZMQ_MAJOR) or ((ZMQ_VERSION_MAJOR == ZMQPP_REQUIRED_ZMQ_MAJOR) and (ZMQ_VERSION_MINOR < ZMQPP_REQUIRED_ZMQ_MINOR))
+#error zmqpp requires a later version of 0mq
+#endif
+
+// Experimental feature support
+#if (ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR == 0)
+#define ZMQ_EXPERIMENTAL_LABELS
+#endif
+
+// Deal with older versions of gcc
+#if defined(__GNUC__) and !defined(__clang__)
+#if __GNUC__ == 4
+
+// Deal with older gcc not supporting C++0x typesafe enum class name {} comparison
+#if __GNUC_MINOR__ < 4
+#define ZMQPP_COMPARABLE_ENUM enum
+#endif
+
+#if __GNUC_MINOR__ == 4
+#if __GNUC_PATCHLEVEL__ < 1
+#undef ZMQPP_COMPARABLE_ENUM
+#define ZMQPP_COMPARABLE_ENUM enum
+#endif // if __GNUC_PATCHLEVEL__ < 1
+#endif // if __GNUC_MINOR__ == 4
+
+// Deal with older gcc not supporting C++0x lambda function
+#if __GNUC_MINOR__ < 5
+#define ZMQPP_IGNORE_LAMBDA_FUNCTION_TESTS
+#define ZMQPP_EXPLICITLY_DELETED
+#endif // if __GNUC_MINOR__ < 5
+
+// Deal with older gcc not supporting C++0x nullptr
+#if __GNUC_MINOR__ < 6
+#define nullptr NULL
+#define noexcept
+#endif // if __GNUC_MINOR__ < 6
+
+#endif // if __GNUC_ == 4
+#endif // if defined(__GNUC__) && !defined(__clang__)
+
+// Generic state, assume a modern compiler
+#ifndef ZMQPP_COMPARABLE_ENUM
+#define ZMQPP_COMPARABLE_ENUM enum class
+#endif
+
+#ifndef ZMQPP_EXPLICITLY_DELETED
+#define ZMQPP_EXPLICITLY_DELETED = delete
+#endif
+
+#endif /* ZMQPP_COMPATIBILITY_HPP_ */
+
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/context.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/context.hpp
new file mode 100644
index 0000000..3220785
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/context.hpp
@@ -0,0 +1,200 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_CONTEXT_HPP_
+#define ZMQPP_CONTEXT_HPP_
+
+#include <cassert>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+#include "exception.hpp"
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+#include "context_options.hpp"
+#endif
+
+namespace zmqpp
+{
+
+/*!
+ * The context class represents internal zmq context and io threads.
+ *
+ * By default the context class will create one thread, however this can be
+ * overridden in the constructor.
+ *
+ * The context class is the only object that can be considered thread safe.
+ *
+ * All sockets using endpoints other than inproc require the context to have
+ * at least one thread.
+ *
+ * This class is c++0x move supporting and cannot be copied.
+ */
+class context
+{
+public:
+
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+	/*!
+	 * Initialise the 0mq context.
+	 *
+	 * If only inproc is used then the context may be created with zero threads.
+	 * Any inproc endpoint using sockets must be created using the same context.
+	 *
+	 * The context is thread safe an may be used anywhere in your application,
+	 * however there is no requirement (other than inproc restrictions) for you
+	 * to do this.
+	 *
+	 * \param threads an integer argument for the number of required threads. Defaults to 1.
+	 */
+	context(int const& threads = 1)
+#else
+	/*!
+	 * Initialise the 0mq context.
+	 *
+	 * The context is thread safe an may be used anywhere in your application,
+	 * however there is no requirement (other than inproc restrictions) for you
+	 * to do this.
+	 */
+	context()
+#endif
+		: _context(nullptr)
+	{
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+		_context = zmq_init(threads);
+#else
+		_context = zmq_ctx_new();
+#endif
+
+		if (nullptr == _context)
+		{
+			throw zmq_internal_exception();
+		}
+	}
+
+	/*!
+	 * Closes the 0mq context.
+	 *
+	 * Any blocking calls other than a socket close will return with an error.
+	 *
+	 * If there are open sockets will block while zmq internal buffers are
+	 * processed up to a limit specified by that sockets linger option.
+	 */
+	~context() noexcept
+	{
+		if (nullptr != _context)
+		{
+
+#ifndef NDEBUG // unused assert variable in release
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+			int result = zmq_term(_context);
+#else
+			int result = zmq_ctx_destroy(_context);
+#endif
+			assert(0 == result);
+#else
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+			zmq_term(_context);
+#else
+			zmq_ctx_destroy(_context);
+#endif
+#endif // NDEBUG
+
+			_context = nullptr;
+		}
+	}
+
+	/*!
+	 * Move supporting constructor.
+	 *
+	 * Allows zero-copy move semantics to be used with this class.
+	 *
+	 * \param source a rvalue instance of the object who's internals we wish to steal.
+	 */
+	context(context&& source) noexcept
+		: _context(source._context)
+	{
+		source._context = nullptr;
+	}
+
+	/*!
+	 * Move supporting operator.
+	 *
+	 * Allows zero-copy move semantics to be used with this class.
+	 *
+	 * \param source an rvalue instance of the context who's internals we wish to steal.
+	 */
+	context& operator=(context&& source) noexcept
+	{
+		std::swap( _context, source._context );
+		return *this;
+	}
+
+	/*!
+	 * Terminate the current context.
+	 *
+	 * Any blocking calls other than a socket close will return with an error.
+	 *
+	 * If there are open sockets will block while zmq internal buffers are
+	 * processed up to a limit specified by that sockets linger option.
+	 */
+	void terminate();
+
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+	/*!
+	 * Set the value of an option in the underlaying zmq context.
+	 *
+	 * \param option a valid ::context_option
+	 * \param value to set the option to
+	 */
+	void set(context_option const& option, int const& value);
+
+	/*!
+	 * Get a context option from the underlaying zmq context.
+	 *
+	 * \param option a valid ::context_option
+	 * \return context option value
+	 */
+	int get(context_option const& option);
+#endif
+
+	/*!
+	 * Validity checking of the context
+	 *
+	 * Checks if the underlying 0mq context for this instance is valid.
+	 *
+	 * Contexts should always be valid unless people are doing 'fun' things with
+	 * std::move.
+	 *
+	 * \return boolean true if the object is valid.
+	 */
+	operator bool() const noexcept
+	{
+		return nullptr != _context;
+	}
+
+	/*!
+	 * Access to the raw 0mq context
+	 *
+	 * \return void pointer to the underlying 0mq context.
+	 */
+	operator void*() const noexcept
+	{
+		return _context;
+	}
+
+private:
+	void* _context;
+
+	// No copy - private and not implemented
+	context(context const&) ZMQPP_EXPLICITLY_DELETED;
+	context& operator=(context const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+};
+
+}
+
+#endif /* ZMQPP_CONTEXT_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/context_options.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/context_options.hpp
new file mode 100644
index 0000000..b2e2cf4
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/context_options.hpp
@@ -0,0 +1,26 @@
+/**
+ * \file
+ *
+ * \date   3 Jul 2013
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_CONTEXT_OPTIONS_HPP_
+#define ZMQPP_CONTEXT_OPTIONS_HPP_
+
+namespace zmqpp
+{
+
+/** \todo Expand the information on the options to make it actually useful. */
+/*!
+ * \brief possible Context options in zmq
+ */
+
+enum class context_option {
+	io_threads  = ZMQ_IO_THREADS,          /*!< I/O thread count */
+	max_sockets = ZMQ_MAX_SOCKETS,         /*!< Maximum supported sockets */
+};
+
+}
+
+#endif /* ZMQPP_CONTEXT_OPTIONS_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/exception.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/exception.hpp
new file mode 100644
index 0000000..a0b2347
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/exception.hpp
@@ -0,0 +1,87 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_EXCEPTION_HPP_
+#define ZMQPP_EXCEPTION_HPP_
+
+#include <stdexcept>
+#include <string>
+
+#include <zmq.h>
+
+namespace zmqpp
+{
+
+/** \todo Have a larger variety of exceptions with better state debug information */
+
+/*!
+ * Represents the base zmqpp exception.
+ *
+ * All zmqpp runtime exceptions are children of this class.
+ * The class itself does not provide any special access fields but it only
+ * for convince when catching exceptions.
+ *
+ * The class extends std::runtime_error.
+ *
+ */
+class exception : public std::runtime_error
+{
+public:
+	/*!
+	 * Standard exception constructor.
+	 *
+	 * \param message a string representing the error message.
+	 */
+	exception(std::string const& message)
+		: std::runtime_error(message)
+	{ }
+};
+
+/*!
+ * Represents an attempt to use an invalid object.
+ *
+ * Objects may be invalid initially or after a shutdown or close.
+ */
+class invalid_instance : public exception
+{
+public:
+	invalid_instance(std::string const& message)
+		: exception(message)
+	{ }
+};
+
+/*!
+ * Represents internal zmq errors.
+ *
+ * Any error response from the zmq bindings will be wrapped in this error.
+ *
+ * The class provides access to the zmq error number via zmq_error().
+ */
+class zmq_internal_exception : public exception
+{
+public:
+	/*!
+	 * Uses the zmq functions to pull out error messages and numbers.
+	 */
+	zmq_internal_exception()
+		: exception(zmq_strerror(zmq_errno()))
+		, _error(zmq_errno())
+	{ }
+
+	/*!
+	 * Retrieve the zmq error number associated with this exception.
+	 * \return zmq error number
+	 */
+	int zmq_error() const { return _error; }
+
+private:
+	int _error;
+};
+
+}
+
+#endif /* ZMQPP_EXCEPTION_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/inet.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/inet.hpp
new file mode 100644
index 0000000..82e7e5e
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/inet.hpp
@@ -0,0 +1,104 @@
+/**
+ * \file
+ *
+ * \date   10 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_INET_HPP_
+#define ZMQPP_INET_HPP_
+
+/** \todo cross-platform version of including headers for htons and htonl. */
+// We get htons and htonl from here
+#include <netinet/in.h>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+
+/*!
+ * \brief Possible byte order types.
+ *
+ * An enumeration of all the known order types, all two of them.
+ * There is also an entry for unknown which is just used as a default.
+ */
+ZMQPP_COMPARABLE_ENUM order {
+	unknown,      /*!< used as a default prior to detection of the the byte order */
+	big_endian,   /*!< brief byte order is big endian */
+	little_endian /*!< \brief byte order is little endian */
+};
+
+/*!
+ * Common code for the 64bit versions of htons/htons and ntohs/ntohl
+ *
+ * As htons and ntohs (or htonl and ntohs) always just do the same thing, ie
+ * swap bytes if the host order differs from network order or otherwise don't
+ * do anything, it seemed silly to type the code twice.
+ *
+ * \note This code assumes network order is always big endian. Which it is.
+ * \note The host endian is only checked once and afterwards assumed to remain
+ *       the same.
+ *
+ * \param value_to_check unsigned 64 bit integer to swap
+ * \return swapped (or not) unsigned 64 bit integer
+ */
+inline uint64_t swap_if_needed(uint64_t const& value_to_check)
+{
+	static order host_order = order::unknown;
+
+	union {
+		uint64_t integer;
+		uint8_t bytes[8];
+	} value;
+
+	if (order::unknown == host_order)
+	{
+		value.integer = 1;
+		host_order = (1 == value.bytes[0]) ? order::little_endian : order::big_endian;
+	}
+
+	if (order::big_endian == host_order)
+	{
+		return value_to_check;
+	}
+
+	value.integer = value_to_check;
+
+	std::swap(value.bytes[0], value.bytes[7]);
+	std::swap(value.bytes[1], value.bytes[6]);
+	std::swap(value.bytes[2], value.bytes[5]);
+	std::swap(value.bytes[3], value.bytes[4]);
+
+	return value.integer;
+}
+
+}
+
+/*!
+ * 64 bit version of the htons/htonl
+ *
+ * I've used the name htonll to try and keep with the htonl naming scheme.
+ *
+ * \param hostlonglong unsigned 64 bit host order integer
+ * \return unsigned 64 bit network order integer
+ */
+inline uint64_t htonll(uint64_t const& hostlonglong)
+{
+	return zmqpp::swap_if_needed(hostlonglong);
+}
+
+/*!
+ * 64 bit version of the ntohs/ntohl
+ *
+ * I've used the name htonll to try and keep with the htonl naming scheme.
+ *
+ * \param networklonglong unsigned 64 bit network order integer
+ * \return unsigned 64 bit host order integer
+ */
+inline uint64_t ntohll(uint64_t const& networklonglong)
+{
+	return zmqpp::swap_if_needed(networklonglong);
+}
+
+#endif /* INET_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/message.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/message.hpp
new file mode 100644
index 0000000..3311bd1
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/message.hpp
@@ -0,0 +1,180 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_MESSAGE_HPP_
+#define ZMQPP_MESSAGE_HPP_
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+struct zmq_msg_wrapper;
+
+/*!
+ * \brief a zmq message with optional multipart support
+ *
+ * A zmq message is made up of one or more parts which are sent together to
+ * the target endpoints. zmq guarantees either the whole message or none
+ * of the message will be delivered.
+ */
+class message
+{
+public:
+	/*!
+	 * \brief callback to release user allocated data.
+	 *
+	 * The release function will be called on any void* moved part.
+	 * It must be thread safe to the extent that the callback may occur on
+	 * one of the context threads.
+	 *
+	 * The function called will be passed a single variable which is the
+	 * pointer to the memory allocated.
+	 */
+	typedef std::function<void (void*)> release_function;
+
+	message();
+	~message();
+
+	size_t parts() const;
+	size_t size(size_t const& part) const;
+	std::string get(size_t const& part) const;
+
+	void get(int8_t& integer, size_t const& part) const;
+	void get(int16_t& integer, size_t const& part) const;
+	void get(int32_t& integer, size_t const& part) const;
+	void get(int64_t& integer, size_t const& part) const;
+
+	void get(uint8_t& unsigned_integer, size_t const& part) const;
+	void get(uint16_t& unsigned_integer, size_t const& part) const;
+	void get(uint32_t& unsigned_integer, size_t const& part) const;
+	void get(uint64_t& unsigned_integer, size_t const& part) const;
+
+	void get(float& floating_point, size_t const& part) const;
+	void get(double& double_precision, size_t const& part) const;
+	void get(bool& boolean, size_t const& part) const;
+
+	void get(std::string& string, size_t const& part) const;
+
+	// Warn: If a pointer type is requested the message (well zmq) still 'owns'
+	// the data and will release it when the message object is freed.
+	template<typename Type>
+	Type get(size_t const& part)
+	{
+		Type value;
+		get(value, part);
+		return value;
+	}
+
+	// Raw get data operations, useful with data structures more than anything else
+	// Warn: The message (well zmq) still 'owns' the data and will release it
+	// when the message object is freed.
+	template<typename Type>
+	void get(Type*& value, size_t const& part) const
+	{
+		value = static_cast<Type*>(raw_data(part));
+	}
+
+	// Warn: The message (well zmq) still 'owns' the data and will release it
+	// when the message object is freed.
+	template<typename Type>
+	void get(Type** value, size_t const& part) const
+	{
+		*value = static_cast<Type*>(raw_data(part));
+	}
+
+	// Move operators will take ownership of message parts without copying
+	void move(void* part, size_t& size, release_function const& release);
+
+	// Raw move data operation, useful with data structures more than anything else
+	template<typename Object>
+	void move(Object *part)
+	{
+		move(part, sizeof(Object), &deleter_callback<Object>);
+	}
+
+	// Copy operators will take copies of any data
+	void add(void const* part, size_t const& size);
+
+	template<typename Type>
+	void add(Type const& part)
+	{
+		*this << part;
+	}
+
+	// Stream reader style
+	void reset_read_cursor();
+
+	template<typename Type>
+	message& operator>>(Type& value)
+	{
+		get(value, _read_cursor++);
+		return *this;
+	}
+
+	// Stream writer style - these all use copy styles
+	message& operator<<(int8_t const& integer);
+	message& operator<<(int16_t const& integer);
+	message& operator<<(int32_t const& integer);
+	message& operator<<(int64_t const& integer);
+
+	message& operator<<(uint8_t const& unsigned_integer);
+	message& operator<<(uint16_t const& unsigned_integer);
+	message& operator<<(uint32_t const& unsigned_integer);
+	message& operator<<(uint64_t const& unsigned_integer);
+
+	message& operator<<(float const& floating_point);
+	message& operator<<(double const& double_precision);
+	message& operator<<(bool const& boolean);
+
+	message& operator<<(char const* c_string);
+	message& operator<<(std::string const& string);
+
+	// Move supporting
+	message(message&& source) noexcept;
+	message& operator=(message&& source) noexcept;
+
+	// Copy support
+	message copy();
+	void copy(message& source);
+
+	// Used for internal tracking
+	void sent(size_t const& part);
+
+	// Access to raw zmq details
+	void const* raw_data(size_t const& part = 0) const;
+	zmq_msg_t& raw_msg(size_t const& part = 0);
+	zmq_msg_t& raw_new_msg();
+
+private:
+	typedef std::vector<zmq_msg_wrapper> parts_type;
+	parts_type _parts;
+	size_t _read_cursor;
+
+	// Disable implicit copy support, code must request a copy to clone
+	message(message const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+	message& operator=(message const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+
+	static void release_callback(void* data, void* hint);
+
+	template<typename Object>
+	static void deleter_callback(void* data)
+	{
+		delete static_cast<Object*>(data);
+	}
+};
+
+}
+
+#endif /* ZMQPP_MESSAGE_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/poller.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/poller.hpp
new file mode 100644
index 0000000..45c762d
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/poller.hpp
@@ -0,0 +1,186 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_POLLER_HPP_
+#define ZMQPP_POLLER_HPP_
+
+#include <unordered_map>
+#include <vector>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+
+class socket;
+typedef socket socket_t;
+
+/*!
+ * Polling wrapper.
+ *
+ * Allows access to polling for any number of sockets or file descriptors.
+ */
+class poller
+{
+public:
+	static const long wait_forever; /*!< Block forever flag, default setting. */
+
+	static const short poll_none;   /*!< No polling flags set. */
+	static const short poll_in;     /*!< Monitor inbound flag. */
+	static const short poll_out;    /*!< Monitor output flag. */
+	static const short poll_error;  /*!< Monitor error flag.\n Only for file descriptors. */
+
+	/*!
+	 * Construct an empty polling model.
+	 */
+	poller();
+
+	/*!
+	 * Cleanup poller.
+	 *
+	 * Any sockets will need to be closed separately.
+	 */
+	~poller();
+
+	/*!
+	 * Add a socket to the polling model and set which events to monitor.
+	 *
+	 * \param socket the socket to monitor.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void add(socket_t& socket, short const& event = poll_in);
+
+	/*!
+	 * Add a file descriptor to the polling model and set which events to monitor.
+	 *
+	 * \param descriptor the file descriptor to monitor.
+	 * \param event the event flags to monitor.
+	 */
+	void add(int const& descriptor, short const& event = poll_in | poll_error);
+
+	/*!
+	 * Check if we are monitoring a given socket with this poller.
+	 *
+	 * \param socket the socket to check.
+	 * \return true if it is there.
+	 */
+	bool has(socket_t const& socket);
+
+	/*!
+	 * Check if we are monitoring a given file descriptor with this poller.
+	 *
+	 * \param descriptor the file descriptor to check.
+	 * \return true if it is there.
+	 */
+	bool has(int const& descriptor);
+
+	/*!
+	 * Stop monitoring a socket.
+	 *
+	 * \param socket the socket to stop monitoring.
+	 */
+	void remove(socket_t const& socket);
+
+	/*!
+	 * Stop monitoring a file descriptor.
+	 *
+	 * \param descriptor the file descriptor to stop monitoring.
+	 */
+	void remove(int const& descriptor);
+
+	/*!
+	 * Update the monitored event flags for a given socket.
+	 *
+	 * \param socket the socket to update event flags.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void check_for(socket_t const& socket, short const& event);
+
+	/*!
+	 * Update the monitored event flags for a given file descriptor.
+	 *
+	 * \param descriptor the file descriptor to update event flags.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void check_for(int const& descriptor, short const& event);
+
+	/*!
+	 * Poll for monitored events.
+	 *
+	 * By default this method will block forever or until at least one of the monitored
+	 * sockets or file descriptors has events.
+	 *
+	 * If a timeout is set and was reached then this function returns false.
+	 *
+	 * \param timeout milliseconds to timeout.
+	 * \return true if there is an event..
+	 */
+	bool poll(long timeout = wait_forever);
+
+	/*!
+	 * Get the event flags triggered for a socket.
+	 *
+	 * \param socket the socket to get triggered event flags for.
+	 * \return the event flags.
+	 */
+	short events(socket_t const& socket) const;
+
+	/*!
+	 * Get the event flags triggered for a file descriptor.
+	 *
+	 * \param descriptor the file descriptor to get triggered event flags for.
+	 * \return the event flags.
+	 */
+	short events(int const& descriptor) const;
+
+	/*!
+	 * Check either a file descriptor or socket for input events.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * \param watchable either a file descriptor or socket known to the poller.
+	 * \return true if there is input.
+	 */
+	template<typename Watched>
+	bool has_input(Watched const& watchable) const { return events(watchable) & poll_in; }
+
+	/*!
+	 * Check either a file descriptor or socket for output events.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * \param watchable either a file descriptor or socket known to the poller.
+	 * \return true if there is output.
+	 */
+	template<typename Watched>
+	bool has_output(Watched const& watchable) const { return events(watchable) & poll_out; }
+
+	/*!
+	 * Check a file descriptor.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * Technically this template works for sockets as well but the error flag is never set for
+	 * sockets so I have no idea why someone would call it.
+	 *
+	 * \param watchable a file descriptor know to the poller.
+	 * \return true if there is an error.
+	 */
+	template<typename Watched>
+	bool has_error(Watched const& watchable) const { return events(watchable) & poll_error; }
+
+private:
+	std::vector<zmq_pollitem_t> _items;
+	std::unordered_map<void *, size_t> _index;
+	std::unordered_map<int, size_t> _fdindex;
+
+	void reindex(size_t const index);
+};
+
+}
+
+#endif /* ZMQPP_POLLER_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket.hpp
new file mode 100644
index 0000000..09ea71f
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket.hpp
@@ -0,0 +1,500 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_HPP_
+#define ZMQPP_SOCKET_HPP_
+
+#include <cstring>
+#include <string>
+#include <list>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+
+#include "socket_types.hpp"
+#include "socket_options.hpp"
+
+namespace zmqpp
+{
+
+class context;
+class message;
+
+typedef std::string endpoint_t;
+typedef context     context_t;
+typedef message     message_t;
+
+/*!
+ * The socket class represents the zmq sockets.
+ *
+ * A socket can be bound and/or connected to as many endpoints as required
+ * with the sole exception of a ::pair socket.
+ *
+ * The routing is handled by zmq based on the type set.
+ *
+ * The bound side of an inproc connection must occur first and inproc can only
+ * connect to other inproc sockets of the same context.
+ *
+ * This class is c++0x move supporting and cannot be copied.
+ */
+class socket
+{
+public:
+	static const int normal     = 0;            /*!< /brief default send type, no flags set */
+#if (ZMQ_VERSION_MAJOR == 2)
+	static const int dont_wait  = ZMQ_NOBLOCK;  /*!< /brief don't block if sending is not currently possible  */
+#else
+	static const int dont_wait  = ZMQ_DONTWAIT; /*!< /brief don't block if sending is not currently possible  */
+#endif
+	static const int send_more  = ZMQ_SNDMORE;  /*!< /brief more parts will follow this one */
+#ifdef ZMQ_EXPERIMENTAL_LABELS
+	static const int send_label = ZMQ_SNDLABEL; /*!< /brief this message part is an internal zmq label */
+#endif
+
+	/*!
+	 * Create a socket for a given type.
+	 *
+	 * \param context the zmq context under which the socket will live
+	 * \param type a valid ::socket_type for the socket
+	 */
+	socket(context_t const& context, socket_type const& type);
+
+	/*!
+	 * This will close any socket still open before returning
+	 */
+	~socket();
+
+	/*!
+	 * Get the type of the socket, this works on zmqpp types and not the zmq internal types.
+	 * Use the socket::get method if you wish to intergoate the zmq internal ones.
+	 *
+	 * \return the type of the socket
+	 */
+	socket_type type() const { return _type; }
+
+	/*!
+	 * Asynchronously binds to an endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to bind to
+	 */
+	void bind(endpoint_t const& endpoint);
+
+	/*!
+	 * Unbinds from a previously bound endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to bind to
+	 */
+	void unbind(endpoint_t const& endpoint);
+
+	/*!
+	 * Asynchronously connects to an endpoint.
+	 * If the endpoint is not inproc then zmq will happily keep trying
+	 * to connect until there is something there.
+	 *
+	 * Inproc sockets must have a valid target already bound before connection
+	 * will work.
+	 *
+	 * \param endpoint the zmq endpoint to connect to
+	 */
+	void connect(endpoint_t const& endpoint);
+
+	/*!
+	 * Asynchronously connects to multiple endpoints.
+	 * If the endpoint is not inproc then zmq will happily keep trying
+	 * to connect until there is something there.
+	 *
+	 * Inproc sockets must have a valid target already bound before connection
+	 * will work.
+	 *
+	 * This is a helper function that wraps the single item connect in a loop
+	 *
+	 * \param connections_begin the starting iterator for zmq endpoints.
+	 * \param connections_end the final iterator for zmq endpoints.
+	 */
+	template<typename InputIterator>
+	void connect(InputIterator const& connections_begin, InputIterator const& connections_end)
+	{
+		for(InputIterator it = connections_begin; it != connections_end; ++it)
+		{
+			connect(*it);
+		}
+	}
+
+
+	/*!
+	 * Disconnects a previously connected endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to disconnect from
+	 */
+	void disconnect(endpoint_t const& endpoint);
+
+	/*!
+	 * Disconnects from multiple previously connected endpoints.
+	 *
+	 * This is a helper function that wraps the single item disconnect in a loop
+	 *
+	 * \param disconnections_begin the starting iterator for zmq endpoints.
+	 * \param disconnections_end the final iterator for zmq endpoints.
+	 */
+	template<typename InputIterator>
+	void disconnect(InputIterator const& disconnections_begin, InputIterator const& disconnections_end)
+	{
+		for(InputIterator it = disconnections_begin; it != disconnections_end; ++it)
+		{
+			disconnect(*it);
+		}
+	}
+
+	/*!
+	 * Closes the internal zmq socket and marks this instance
+	 * as invalid.
+	 */
+	void close();
+
+	/*!
+	 * Sends the message over the connection, this may be a multipart message.
+	 *
+	 * If dont_block is true and we are unable to add a new message then this
+	 * function will return false.
+	 *
+	 * \param message message to send
+	 * \param dont_block boolean to dictate if we wait while sending.
+	 * \return true if message sent, false if it would have blocked
+	 */
+	bool send(message_t& message, bool const& dont_block = false);
+
+	/*!
+	 * Gets a message from the connection, this may be a multipart message.
+	 *
+	 * If dont_block is true and we are unable to get a message then this
+	 * function will return false.
+	 *
+	 * \param message reference to fill with received data
+	 * \param dont_block boolean to dictate if we wait for data.
+	 * \return true if message sent, false if it would have blocked
+	 */
+	bool receive(message_t& message, bool const& dont_block = false);
+
+	/*!
+	 * Sends the byte data held by the string as the next message part.
+	 *
+	 * If the socket::DONT_WAIT flag and we are unable to add a new message to
+	 * socket then this function will return false.
+	 *
+	 * \param string message part to send
+	 * \param flags message send flags
+	 * \return true if message part sent, false if it would have blocked
+	 */
+	bool send(std::string const& string, int const& flags = normal);
+
+	/*!
+	 * If there is a message ready then get the next part as a string
+	 *
+	 * If the socket::DONT_WAIT flag and there is no message ready to receive
+	 * then this function will return false.
+	 *
+	 * \param string message part to receive into
+	 * \param flags message receive flags
+	 * \return true if message part received, false if it would have blocked
+	 */
+	bool receive(std::string& string, int const& flags = normal);
+
+	/*!
+	 * Sends the byte data pointed to by buffer as the next part of the message.
+	 *
+	 * If the socket::DONT_WAIT flag and we are unable to add a new message to
+	 * socket then this function will return false.
+	 *
+	 * \param buffer byte buffer pointer to start writing from
+	 * \param length max length of the buffer
+	 * \param flags message send flags
+	 * \return true if message part sent, false if it would have blocked
+	 */
+	bool send_raw(char const* buffer, int const& length, int const& flags = normal);
+
+	/*!
+	 * \warning If the buffer is not large enough for the message part then the
+	 *       data will be truncated. The rest of the part is lost forever.
+	 *
+	 * If there is a message ready then get the next part of it as a raw
+	 * byte buffer.
+	 *
+	 * If the socket::DONT_WAIT flag and there is no message ready to receive
+	 * then this function will return false.
+	 *
+	 * \param buffer byte buffer pointer to start writing to
+	 * \param length max length of the buffer
+	 * \param flags message receive flags
+	 * \return true if message part received, false if it would have blocked
+	 */
+	bool receive_raw(char* buffer, int& length, int const& flags = normal);
+
+	/*!
+	 *
+	 * Subscribe to a topic
+	 *
+	 * Helper function that is equivalent of calling
+	 * \code
+	 * set(zmqpp::socket_option::subscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * \param topic the topic to subscribe to.
+	 */
+	void subscribe(std::string const& topic);
+
+	/*!
+	 * Subscribe to a topic
+	 *
+	 * Helper function that is equivalent of a loop calling
+	 * \code
+	 * set(zmqpp::socket_option::subscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * Generally this will be used with stl collections using begin() and
+	 * end() functions to get the iterators.
+	 * For this reason the end loop runs until the end iterator, not inclusive
+	 * of it.
+	 *
+	 * \param topics_begin the starting iterator for topics.
+	 * \param topics_end the final iterator for topics.
+	 */
+	template<typename InputIterator>
+	void subscribe(InputIterator const& topics_begin, InputIterator const& topics_end)
+	{
+		for(InputIterator it = topics_begin; it != topics_end; ++it)
+		{
+			subscribe(*it);
+		}
+	}
+
+	/*!
+	 * Unsubscribe from a topic
+	 *
+	 * Helper function that is equivalent of calling
+	 * \code
+	 * set(zmqpp::socket_option::unsubscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * \param topic the topic to unsubscribe from.
+	 */
+	void unsubscribe(std::string const& topic);
+
+	/*!
+	 * Unsubscribe from a topic
+	 *
+	 * Helper function that is equivalent of a loop calling
+	 * \code
+	 * set(zmqpp::socket_option::unsubscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * Generally this will be used with stl collections using begin() and
+	 * end() functions to get the iterators.
+	 * For this reason the end loop runs until the end iterator, not inclusive
+	 * of it.
+	 *
+	 * \param topics_begin the starting iterator for topics.
+	 * \param topics_end the final iterator for topics.
+	 */
+	template<typename InputIterator>
+	void unsubscribe(InputIterator const& topics_begin, InputIterator const& topics_end)
+	{
+		for(InputIterator it = topics_begin; it != topics_end; ++it)
+		{
+			unsubscribe(*it);
+		}
+	}
+
+	/*!
+	 * If the last receive part call to the socket resulted
+	 * in a label or a non-terminating part of a multipart
+	 * message this will return true.
+	 *
+	 * \return true if there are more parts
+	 */
+	bool has_more_parts() const;
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, int const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \since 2.0.0 (built against 0mq version 3.1.x or later)
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, bool const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, uint64_t const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, int64_t const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param pointer to raw byte value to set the option to
+	 * \param length the size of the raw byte value
+	 */
+	void set(socket_option const& option, char const* value, size_t const length);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param pointer to null terminated cstring value to set the option to
+	 */
+	inline void set(socket_option const& option, char const* value) { set(option, value, strlen(value)); }
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	inline void set(socket_option const& option, std::string const& value) { set(option, value.c_str(), value.length()); }
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced int to return value in
+	 */
+	void get(socket_option const& option, int& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced bool to return value in
+	 */
+	void get(socket_option const& option, bool& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced uint64_t to return value in
+	 */
+	void get(socket_option const& option, uint64_t& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced uint64_t to return value in
+	 */
+	void get(socket_option const& option, int64_t& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced std::string to return value in
+	 */
+	void get(socket_option const& option, std::string& value) const;
+
+	/*!
+	 * For those that don't want to get into a referenced value this templated method
+	 * will return the value instead.
+	 *
+	 * \param option a valid ::socket_option
+	 * \return socket option value
+	 */
+	template<typename Type>
+	Type get(socket_option const& option) const
+	{
+		Type value = Type();
+		get(option, value);
+		return value;
+	}
+
+	/*!
+	 * Move constructor
+	 *
+	 * Moves the internals of source to this object, there is no guarantee
+	 * that source will be left in a valid state.
+	 *
+	 * This constructor is noexcept and so will not throw exceptions
+	 *
+	 * \param source target socket to steal internals from
+	 */
+	socket(socket&& source) noexcept;
+
+	/*!
+	 * Move operator
+	 *
+	 * Moves the internals of source to this object, there is no guarantee
+	 * that source will be left in a valid state.
+	 *
+	 * This function is noexcept and so will not throw exceptions
+	 *
+	 * \param source target socket to steal internals from
+	 * \return socket reference to this
+	 */
+	socket& operator=(socket&& source) noexcept;
+
+	/*!
+	 * Check the socket is still valid
+	 *
+	 * This tests the internal state of the socket.
+	 * If creation failed for some reason or if the move functions were used
+	 * to move the socket internals to another instance this will return false.
+	 *
+	 * \return true if the socket is valid
+	 */
+	operator bool() const;
+
+	/*!
+	 * Access to the raw 0mq context
+	 *
+	 * \return void pointer to the underlying 0mq socket
+	 */
+	operator void*() const;
+
+private:
+	void* _socket;
+	socket_type _type;
+	zmq_msg_t _recv_buffer;
+
+	// No copy
+	socket(socket const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+	socket& operator=(socket const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+
+	void track_message(message_t const&, uint32_t const&, bool&);
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket_options.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket_options.hpp
new file mode 100644
index 0000000..3fd3dfc
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket_options.hpp
@@ -0,0 +1,75 @@
+/**
+ * \file
+ *
+ * \date   23 Sep 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_OPTIONS_HPP_
+#define ZMQPP_SOCKET_OPTIONS_HPP_
+
+namespace zmqpp
+{
+
+/** \todo Expand the information on the options to make it actually useful. */
+/*!
+ * \brief possible Socket options in zmq
+ */
+
+enum class socket_option {
+	affinity                  = ZMQ_AFFINITY,          /*!< I/O thread affinity */
+	identity                  = ZMQ_IDENTITY,          /*!< Socket identity */
+	subscribe                 = ZMQ_SUBSCRIBE,         /*!< Add topic subscription - set only */
+	unsubscribe               = ZMQ_UNSUBSCRIBE,       /*!< Remove topic subscription - set only */
+	rate                      = ZMQ_RATE,              /*!< Multicast data rate */
+	send_buffer_size          = ZMQ_SNDBUF,            /*!< Kernel transmission buffer size */
+	receive_buffer_size       = ZMQ_RCVBUF,            /*!< Kernel receive buffer size */
+	receive_more              = ZMQ_RCVMORE,           /*!< Can receive more parts - get only */
+	file_descriptor           = ZMQ_FD,                /*!< Socket file descriptor - get only */
+	events                    = ZMQ_EVENTS,            /*!< Socket event flags - get only */
+	type                      = ZMQ_TYPE,              /*!< Socket type - get only */
+	linger                    = ZMQ_LINGER,            /*!< Socket linger timeout */
+	backlog                   = ZMQ_BACKLOG,           /*!< Maximum length of outstanding connections - get only */
+#if (ZMQ_VERSION_MAJOR == 2)
+    // Note that this is inverse of the zmq names for version 2.x
+	recovery_interval_seconds = ZMQ_RECOVERY_IVL,      /*!< Multicast recovery interval in seconds */
+	recovery_interval         = ZMQ_RECOVERY_IVL_MSEC, /*!< Multicast recovery interval in milliseconds */
+#else
+	recovery_interval         = ZMQ_RECOVERY_IVL,      /*!< Multicast recovery interval in milliseconds */
+#endif
+	reconnect_interval        = ZMQ_RECONNECT_IVL,     /*!< Reconnection interval */
+	reconnect_interval_max    = ZMQ_RECONNECT_IVL_MAX, /*!< Maximum reconnection interval */
+	receive_timeout           = ZMQ_RCVTIMEO,          /*!< Maximum inbound block timeout */
+	send_timeout              = ZMQ_SNDTIMEO,          /*!< Maximum outbound block timeout */
+#if (ZMQ_VERSION_MAJOR == 2)
+	high_water_mark           = ZMQ_HWM,               /*!< High-water mark for all messages */
+	swap_size                 = ZMQ_SWAP,              /*!< Maximum socket swap size in bytes */
+	multicast_loopback        = ZMQ_MCAST_LOOP,        /*!< Allow multicast packet loopback */
+#else
+	max_messsage_size         = ZMQ_MAXMSGSIZE,        /*!< Maximum inbound message size */
+	send_high_water_mark      = ZMQ_SNDHWM,            /*!< High-water mark for outbound messages */
+	receive_high_water_mark   = ZMQ_RCVHWM,            /*!< High-water mark for inbound messages */
+	multicast_hops            = ZMQ_MULTICAST_HOPS,    /*!< Maximum number of multicast hops */
+#endif
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 1))
+	ipv4_only                 = ZMQ_IPV4ONLY,
+#endif
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+	delay_attach_on_connect   = ZMQ_DELAY_ATTACH_ON_CONNECT, /*!< Delay buffer attachment until connect complete */
+	last_endpoint             = ZMQ_LAST_ENDPOINT,           /*!< Last bound endpoint - get only */
+	router_mandatory          = ZMQ_ROUTER_MANDATORY,        /*!< Require routable messages - set only */
+	xpub_verbose              = ZMQ_XPUB_VERBOSE,            /*!< Pass on existing subscriptions - set only */
+	tcp_keepalive             = ZMQ_TCP_KEEPALIVE,           /*!< Enable TCP keepalives */
+	tcp_keepalive_idle        = ZMQ_TCP_KEEPALIVE_IDLE,      /*!< TCP keepalive idle count (generally retry count) */
+	tcp_keepalive_count       = ZMQ_TCP_KEEPALIVE_CNT,       /*!< TCP keepalive retry count */
+	tcp_keepalive_interval    = ZMQ_TCP_KEEPALIVE_INTVL,     /*!< TCP keepalive interval */
+	tcp_accept_filter         = ZMQ_TCP_ACCEPT_FILTER,       /*!< Filter inbound connections - set only */
+#endif
+#ifdef ZMQ_EXPERIMENTAL_LABELS
+	receive_label             = ZMQ_RCVLABEL,          /*!< Received label part - get only */
+#endif
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_OPTIONS_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket_types.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket_types.hpp
new file mode 100644
index 0000000..e59e71c
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/socket_types.hpp
@@ -0,0 +1,148 @@
+/**
+ * \file
+ *
+ * \date   23 Sep 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_TYPES_HPP_
+#define ZMQPP_SOCKET_TYPES_HPP_
+
+namespace zmqpp
+{
+
+/*!
+ * \brief Socket types allowed by zmq
+ *
+ * The socket type choose at creation must be one of these types.
+ *
+ * Each is designed for a different use and has different limitations.
+ */
+enum class socket_type {
+	/*!
+	 * One to one - two way connection.\n
+	 * Connect to ::pair.\n
+	 * A \c pair socket has to be connected only one other pair socket and allows
+	 * two way communication between them.
+	 */
+	pair       = ZMQ_PAIR,
+
+	/*!
+	 * One to many - fan out.\n
+	 * Connect to ::subscribe or ::xsubscribe.\n
+	 * Socket is send only.\n
+	 * Socket will drop messages and not block.\n
+	 * \c publish sockets allow sending of the same message to many subscribers
+	 * each subscriber can limit what is sent through the socket_option::subscribe
+	 * settings.
+	 */
+	publish    = ZMQ_PUB,
+
+	/*!
+	 * \note It seems doxygen can't work out which data is for the socket type and
+	 * which is for the socket option so both get listed for both.
+	 *
+	 * One to many - fair-queued.\n
+	 * Connect to ::publish or ::xpublish.\n
+	 * Socket is receive only.\n
+	 * The \c subscribe socket can connection to any number of publishers and will
+	 * fairly pull messages from each. The socket_option::subscribe settings can
+	 * be use to limit which messages are received and by default none are.
+	 */
+	subscribe  = ZMQ_SUB,
+
+	/*!
+	 * One to many - fair-queued.\n
+	 * Connect to ::push.\n
+	 * Socket is receive only.\n
+	 * The \c pull socket fairly pulls messages from all pushers it is connected
+	 * to.
+	 */
+	pull       = ZMQ_PULL,
+
+	/*!
+	 * One to many - load-balanced.\n
+	 * Connect to ::pull.\n
+	 * Socket is send only.\n
+	 * Socket will block if unable to send.\n
+	 * The \c push socket fairly distributes messages between any connected
+	 * puller sockets.
+	 */
+	push       = ZMQ_PUSH,
+
+	/*!
+	 * One to many - fair-queued outgoing, last peer incoming.\n
+	 * Connect to ::reply or ::xreply.\n
+	 * Socket flips between send and receive only.\n
+	 * Socket will block if unable to send.\n
+	 * The \c request socket will fairly balance requests sent out to a
+	 * replier and then can only be used to receive until that replier
+	 * sends a reply.
+	 */
+	request    = ZMQ_REQ,
+
+	/*!
+	 * One to many - load-balanced incoming, last peer outgoing.\n
+	 * Connect to ::request or ::xrequest.\n
+	 * Socket flips between send and receive only.\n
+	 * Socket will drop messages and not block.\n
+	 * The \c reply socket can only receive until it pulls a message from a
+	 * requester at which point it can only send until the reply is sent.
+	 */
+	reply      = ZMQ_REP,
+
+	/*!
+	 * One to many - fan out.\n
+	 * Connect to ::subscribe or ::xsubscribe.\n
+	 * Socket is send only with the exception of special subscription messages.\n
+	 * Socket will drop messages and not block.\n
+	 * \c xpublish act the same as ::publish sockets however also allow special
+	 * subscription messages to be received from subscribers.
+	 */
+	xpublish   = ZMQ_XPUB,
+
+	/*!
+	 * One to many - fair-queued.\n
+	 * Connect to ::publish or ::xpublish.\n
+	 * Socket is receive only with the exception of special subscription messages\n
+	 * \c xsubscribe act the same as ::subscribe sockets however also allow special
+	 * subscription messages to be send to connected publishers.
+	 */
+	xsubscribe = ZMQ_XSUB,
+
+	/*!
+	 * One to many - fair-queued incoming, load-balanced outgoing.\n
+	 * Connect to ::reply or ::xreply.\n
+	 * Socket will block if unable to send.\n
+	 * An \c xrequest socket balances requests between repliers and pulls replies
+	 * back in a fair manner. Each request is expected to have exactly one reply.
+	 */
+	xrequest   = ZMQ_XREQ,
+
+	/*!
+	 * One to many - fair-queued incoming, targeted outgoing.\n
+	 * Connect to ::request or ::xrequest.\n
+	 * Socket will drop messages and not block.\n
+	 * An \c xreply socket fairly pulls in requests from requesters and will
+	 * label requests so it can return replies back to the correct target.
+	 */
+	xreply     = ZMQ_XREP,
+
+	// To match for people who prefer the shorter versions
+	pub        = ZMQ_PUB,    /*!< version of ::publish to match zmq name convention */
+	sub        = ZMQ_SUB,    /*!< version of ::subscribe to match zmq name convention */
+	req        = ZMQ_REQ,    /*!< version of ::request to match zmq name convention */
+	rep        = ZMQ_REP,    /*!< version of ::reply to match zmq name convention */
+	xpub       = ZMQ_XPUB,   /*!< version of ::xpublish to match zmq name convention */
+	xsub       = ZMQ_XSUB,   /*!< version of ::xsubscribe to match zmq name convention */
+	xreq       = ZMQ_XREQ,   /*!< version of ::xrequest to match zmq name convention */
+	xrep       = ZMQ_XREP,   /*!< version of ::xreply to match zmq name convention */
+
+	// For completion
+	router     = ZMQ_ROUTER, /*!< \deprecated Matches zmq 2.x xrep functionality. */
+	dealer     = ZMQ_DEALER  /*!< \deprecated Matches zmq 2.x xreq functionality. */
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_TYPES_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Mac/zmqpp/zmqpp.hpp b/Source/ThirdParty/libZmq/include/Mac/zmqpp/zmqpp.hpp
new file mode 100644
index 0000000..92a47ce
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Mac/zmqpp/zmqpp.hpp
@@ -0,0 +1,111 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ *
+ * License: http://www.opensource.org/licenses/MIT
+ *
+ * Copyright (C) 2011 by Ben Gray
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef ZMQPP_ZMQPP_HPP_
+#define ZMQPP_ZMQPP_HPP_
+
+/**
+ * \def ZMQPP_VERSION_MAJOR
+ * zmqpp major version number, generated at compile time
+ */
+#define	ZMQPP_VERSION_MAJOR BUILD_VERSION_MAJOR
+
+/**
+ * \def ZMQPP_VERSION_MINOR
+ * zmqpp minor version number, generated at compile time
+ */
+#define	ZMQPP_VERSION_MINOR BUILD_VERSION_MINOR
+
+/**
+ * \def ZMQPP_VERSION_REVISION
+ * zmqpp version revision number, generated at compile time
+ */
+#define	ZMQPP_VERSION_REVISION BUILD_VERSION_REVISION
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+#include "context.hpp"
+#include "exception.hpp"
+#include "message.hpp"
+#include "poller.hpp"
+#include "socket.hpp"
+
+/*!
+ * \brief C++ wrapper around zmq
+ *
+ * All zmq++ / zmqpp functions, constants and classes live within this namespace,
+ */
+namespace zmqpp
+{
+
+/*!
+ * Returns the current major.minor.revision version number as a string.
+ *
+ * \return string version number.
+ */
+std::string version();
+
+/*!
+ * Retrieve the parts of the zmqpp version number.
+ *
+ * Set the three parameters to values representing the zmqpp version number.
+ * These values are generated at library compile time.
+ *
+ * \param major an unsigned 8 bit reference to set to the major version.
+ * \param minor an unsigned 8 bit reference to set to the minor version.
+ * \param revision an unsigned 8 bit reference to set the current revision.
+ */
+void version(uint8_t& major, uint8_t& minor, uint8_t& revision);
+
+/*!
+ * Retrieve the parts of the 0mq version this library was built against.
+ *
+ * Because sections of the library are optionally compiled in or ignored
+ * depending on the version of 0mq it was compiled against this method is
+ * provided to allow sanity checking for usage.
+ *
+ * Set the three parameters to values representing the 0mq version number.
+ * These values are generated at library compile time.
+ *
+ * \param major an unsigned 8 bit reference to set to the major version.
+ * \param minor an unsigned 8 bit reference to set to the minor version.
+ * \param revision an unsigned 8 bit reference to set the current revision.
+ */
+void zmq_version(uint8_t& major, uint8_t& minor, uint8_t& patch);
+
+typedef context     context_t;   /*!< \brief context type */
+typedef std::string endpoint_t;  /*!< \brief endpoint type */
+typedef message     message_t;   /*!< \brief message type */
+typedef poller      poller_t;    /*!< \brief poller type */
+typedef socket      socket_t;    /*!< \brief socket type */
+
+}
+
+#endif /* ZMQPP_ZMQPP_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmq.h b/Source/ThirdParty/libZmq/include/Win64/zmq.h
new file mode 100644
index 0000000..f5713f8
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmq.h
@@ -0,0 +1,752 @@
+/*
+    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
+
+    This file is part of libzmq, the ZeroMQ core engine in C++.
+
+    libzmq is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License (LGPL) as published
+    by the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    As a special exception, the Contributors give you permission to link
+    this library with independent modules to produce an executable,
+    regardless of the license terms of these independent modules, and to
+    copy and distribute the resulting executable under terms of your choice,
+    provided that you also meet, for each linked independent module, the
+    terms and conditions of the license of that module. An independent
+    module is a module which is not derived from or based on this library.
+    If you modify this library, you must extend this exception to your
+    version of the library.
+
+    libzmq is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+    License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+    *************************************************************************
+    NOTE to contributors. This file comprises the principal public contract
+    for ZeroMQ API users. Any change to this file supplied in a stable
+    release SHOULD not break existing applications.
+    In practice this means that the value of constants must not change, and
+    that old values may not be reused for new constants.
+    *************************************************************************
+*/
+
+#ifndef __ZMQ_H_INCLUDED__
+#define __ZMQ_H_INCLUDED__
+
+/*  Version macros for compile-time API version detection                     */
+#define ZMQ_VERSION_MAJOR 4
+#define ZMQ_VERSION_MINOR 3
+#define ZMQ_VERSION_PATCH 2
+
+#define ZMQ_MAKE_VERSION(major, minor, patch)                                  \
+    ((major) *10000 + (minor) *100 + (patch))
+#define ZMQ_VERSION                                                            \
+    ZMQ_MAKE_VERSION (ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if !defined _WIN32_WCE
+#include <errno.h>
+#endif
+#include <stddef.h>
+#include <stdio.h>
+#if defined _WIN32
+//  Set target version to Windows Server 2008, Windows Vista or higher.
+//  Windows XP (0x0501) is supported but without client & server socket types.
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+
+#ifdef __MINGW32__
+//  Require Windows XP or higher with MinGW for getaddrinfo().
+#if (_WIN32_WINNT >= 0x0501)
+#else
+#error You need at least Windows XP target
+#endif
+#endif
+#include <winsock2.h>
+#endif
+
+/*  Handle DSO symbol visibility                                             */
+#if defined _WIN32
+#if defined ZMQ_STATIC
+#define ZMQ_EXPORT
+#elif defined DLL_EXPORT
+#define ZMQ_EXPORT __declspec(dllexport)
+#else
+#define ZMQ_EXPORT __declspec(dllimport)
+#endif
+#else
+#if defined __SUNPRO_C || defined __SUNPRO_CC
+#define ZMQ_EXPORT __global
+#elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
+#define ZMQ_EXPORT __attribute__ ((visibility ("default")))
+#else
+#define ZMQ_EXPORT
+#endif
+#endif
+
+/*  Define integer types needed for event interface                          */
+#define ZMQ_DEFINED_STDINT 1
+#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
+#include <inttypes.h>
+#elif defined _MSC_VER && _MSC_VER < 1600
+#ifndef uint64_t
+typedef unsigned __int64 uint64_t;
+#endif
+#ifndef int32_t
+typedef __int32 int32_t;
+#endif
+#ifndef uint32_t
+typedef unsigned __int32 uint32_t;
+#endif
+#ifndef uint16_t
+typedef unsigned __int16 uint16_t;
+#endif
+#ifndef uint8_t
+typedef unsigned __int8 uint8_t;
+#endif
+#else
+#include <stdint.h>
+#endif
+
+//  32-bit AIX's pollfd struct members are called reqevents and rtnevents so it
+//  defines compatibility macros for them. Need to include that header first to
+//  stop build failures since zmq_pollset_t defines them as events and revents.
+#ifdef ZMQ_HAVE_AIX
+#include <poll.h>
+#endif
+
+
+/******************************************************************************/
+/*  0MQ errors.                                                               */
+/******************************************************************************/
+
+/*  A number random enough not to collide with different errno ranges on      */
+/*  different OSes. The assumption is that error_t is at least 32-bit type.   */
+#define ZMQ_HAUSNUMERO 156384712
+
+/*  On Windows platform some of the standard POSIX errnos are not defined.    */
+#ifndef ENOTSUP
+#define ENOTSUP (ZMQ_HAUSNUMERO + 1)
+#endif
+#ifndef EPROTONOSUPPORT
+#define EPROTONOSUPPORT (ZMQ_HAUSNUMERO + 2)
+#endif
+#ifndef ENOBUFS
+#define ENOBUFS (ZMQ_HAUSNUMERO + 3)
+#endif
+#ifndef ENETDOWN
+#define ENETDOWN (ZMQ_HAUSNUMERO + 4)
+#endif
+#ifndef EADDRINUSE
+#define EADDRINUSE (ZMQ_HAUSNUMERO + 5)
+#endif
+#ifndef EADDRNOTAVAIL
+#define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6)
+#endif
+#ifndef ECONNREFUSED
+#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7)
+#endif
+#ifndef EINPROGRESS
+#define EINPROGRESS (ZMQ_HAUSNUMERO + 8)
+#endif
+#ifndef ENOTSOCK
+#define ENOTSOCK (ZMQ_HAUSNUMERO + 9)
+#endif
+#ifndef EMSGSIZE
+#define EMSGSIZE (ZMQ_HAUSNUMERO + 10)
+#endif
+#ifndef EAFNOSUPPORT
+#define EAFNOSUPPORT (ZMQ_HAUSNUMERO + 11)
+#endif
+#ifndef ENETUNREACH
+#define ENETUNREACH (ZMQ_HAUSNUMERO + 12)
+#endif
+#ifndef ECONNABORTED
+#define ECONNABORTED (ZMQ_HAUSNUMERO + 13)
+#endif
+#ifndef ECONNRESET
+#define ECONNRESET (ZMQ_HAUSNUMERO + 14)
+#endif
+#ifndef ENOTCONN
+#define ENOTCONN (ZMQ_HAUSNUMERO + 15)
+#endif
+#ifndef ETIMEDOUT
+#define ETIMEDOUT (ZMQ_HAUSNUMERO + 16)
+#endif
+#ifndef EHOSTUNREACH
+#define EHOSTUNREACH (ZMQ_HAUSNUMERO + 17)
+#endif
+#ifndef ENETRESET
+#define ENETRESET (ZMQ_HAUSNUMERO + 18)
+#endif
+
+/*  Native 0MQ error codes.                                                   */
+#define EFSM (ZMQ_HAUSNUMERO + 51)
+#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
+#define ETERM (ZMQ_HAUSNUMERO + 53)
+#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
+
+/*  This function retrieves the errno as it is known to 0MQ library. The goal */
+/*  of this function is to make the code 100% portable, including where 0MQ   */
+/*  compiled with certain CRT library (on Windows) is linked to an            */
+/*  application that uses different CRT library.                              */
+ZMQ_EXPORT int zmq_errno (void);
+
+/*  Resolves system errors and 0MQ errors to human-readable string.           */
+ZMQ_EXPORT const char *zmq_strerror (int errnum_);
+
+/*  Run-time API version detection                                            */
+ZMQ_EXPORT void zmq_version (int *major_, int *minor_, int *patch_);
+
+/******************************************************************************/
+/*  0MQ infrastructure (a.k.a. context) initialisation & termination.         */
+/******************************************************************************/
+
+/*  Context options                                                           */
+#define ZMQ_IO_THREADS 1
+#define ZMQ_MAX_SOCKETS 2
+#define ZMQ_SOCKET_LIMIT 3
+#define ZMQ_THREAD_PRIORITY 3
+#define ZMQ_THREAD_SCHED_POLICY 4
+#define ZMQ_MAX_MSGSZ 5
+#define ZMQ_MSG_T_SIZE 6
+#define ZMQ_THREAD_AFFINITY_CPU_ADD 7
+#define ZMQ_THREAD_AFFINITY_CPU_REMOVE 8
+#define ZMQ_THREAD_NAME_PREFIX 9
+
+/*  Default for new contexts                                                  */
+#define ZMQ_IO_THREADS_DFLT 1
+#define ZMQ_MAX_SOCKETS_DFLT 1023
+#define ZMQ_THREAD_PRIORITY_DFLT -1
+#define ZMQ_THREAD_SCHED_POLICY_DFLT -1
+
+ZMQ_EXPORT void *zmq_ctx_new (void);
+ZMQ_EXPORT int zmq_ctx_term (void *context_);
+ZMQ_EXPORT int zmq_ctx_shutdown (void *context_);
+ZMQ_EXPORT int zmq_ctx_set (void *context_, int option_, int optval_);
+ZMQ_EXPORT int zmq_ctx_get (void *context_, int option_);
+
+/*  Old (legacy) API                                                          */
+ZMQ_EXPORT void *zmq_init (int io_threads_);
+ZMQ_EXPORT int zmq_term (void *context_);
+ZMQ_EXPORT int zmq_ctx_destroy (void *context_);
+
+
+/******************************************************************************/
+/*  0MQ message definition.                                                   */
+/******************************************************************************/
+
+/* Some architectures, like sparc64 and some variants of aarch64, enforce pointer
+ * alignment and raise sigbus on violations. Make sure applications allocate
+ * zmq_msg_t on addresses aligned on a pointer-size boundary to avoid this issue.
+ */
+typedef struct zmq_msg_t
+{
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
+    __declspec(align (8)) unsigned char _[64];
+#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_ARM_ARMV7VE))
+    __declspec(align (4)) unsigned char _[64];
+#elif defined(__GNUC__) || defined(__INTEL_COMPILER)                           \
+  || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590)                              \
+  || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
+    unsigned char _[64] __attribute__ ((aligned (sizeof (void *))));
+#else
+    unsigned char _[64];
+#endif
+} zmq_msg_t;
+
+typedef void(zmq_free_fn) (void *data_, void *hint_);
+
+ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_);
+ZMQ_EXPORT int zmq_msg_init_data (
+  zmq_msg_t *msg_, void *data_, size_t size_, zmq_free_fn *ffn_, void *hint_);
+ZMQ_EXPORT int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_);
+ZMQ_EXPORT int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_);
+ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest_, zmq_msg_t *src_);
+ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest_, zmq_msg_t *src_);
+ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg_);
+ZMQ_EXPORT size_t zmq_msg_size (const zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_more (const zmq_msg_t *msg_);
+ZMQ_EXPORT int zmq_msg_get (const zmq_msg_t *msg_, int property_);
+ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg_, int property_, int optval_);
+ZMQ_EXPORT const char *zmq_msg_gets (const zmq_msg_t *msg_,
+                                     const char *property_);
+
+/******************************************************************************/
+/*  0MQ socket definition.                                                    */
+/******************************************************************************/
+
+/*  Socket types.                                                             */
+#define ZMQ_PAIR 0
+#define ZMQ_PUB 1
+#define ZMQ_SUB 2
+#define ZMQ_REQ 3
+#define ZMQ_REP 4
+#define ZMQ_DEALER 5
+#define ZMQ_ROUTER 6
+#define ZMQ_PULL 7
+#define ZMQ_PUSH 8
+#define ZMQ_XPUB 9
+#define ZMQ_XSUB 10
+#define ZMQ_STREAM 11
+
+/*  Deprecated aliases                                                        */
+#define ZMQ_XREQ ZMQ_DEALER
+#define ZMQ_XREP ZMQ_ROUTER
+
+/*  Socket options.                                                           */
+#define ZMQ_AFFINITY 4
+#define ZMQ_ROUTING_ID 5
+#define ZMQ_SUBSCRIBE 6
+#define ZMQ_UNSUBSCRIBE 7
+#define ZMQ_RATE 8
+#define ZMQ_RECOVERY_IVL 9
+#define ZMQ_SNDBUF 11
+#define ZMQ_RCVBUF 12
+#define ZMQ_RCVMORE 13
+#define ZMQ_FD 14
+#define ZMQ_EVENTS 15
+#define ZMQ_TYPE 16
+#define ZMQ_LINGER 17
+#define ZMQ_RECONNECT_IVL 18
+#define ZMQ_BACKLOG 19
+#define ZMQ_RECONNECT_IVL_MAX 21
+#define ZMQ_MAXMSGSIZE 22
+#define ZMQ_SNDHWM 23
+#define ZMQ_RCVHWM 24
+#define ZMQ_MULTICAST_HOPS 25
+#define ZMQ_RCVTIMEO 27
+#define ZMQ_SNDTIMEO 28
+#define ZMQ_LAST_ENDPOINT 32
+#define ZMQ_ROUTER_MANDATORY 33
+#define ZMQ_TCP_KEEPALIVE 34
+#define ZMQ_TCP_KEEPALIVE_CNT 35
+#define ZMQ_TCP_KEEPALIVE_IDLE 36
+#define ZMQ_TCP_KEEPALIVE_INTVL 37
+#define ZMQ_IMMEDIATE 39
+#define ZMQ_XPUB_VERBOSE 40
+#define ZMQ_ROUTER_RAW 41
+#define ZMQ_IPV6 42
+#define ZMQ_MECHANISM 43
+#define ZMQ_PLAIN_SERVER 44
+#define ZMQ_PLAIN_USERNAME 45
+#define ZMQ_PLAIN_PASSWORD 46
+#define ZMQ_CURVE_SERVER 47
+#define ZMQ_CURVE_PUBLICKEY 48
+#define ZMQ_CURVE_SECRETKEY 49
+#define ZMQ_CURVE_SERVERKEY 50
+#define ZMQ_PROBE_ROUTER 51
+#define ZMQ_REQ_CORRELATE 52
+#define ZMQ_REQ_RELAXED 53
+#define ZMQ_CONFLATE 54
+#define ZMQ_ZAP_DOMAIN 55
+#define ZMQ_ROUTER_HANDOVER 56
+#define ZMQ_TOS 57
+#define ZMQ_CONNECT_ROUTING_ID 61
+#define ZMQ_GSSAPI_SERVER 62
+#define ZMQ_GSSAPI_PRINCIPAL 63
+#define ZMQ_GSSAPI_SERVICE_PRINCIPAL 64
+#define ZMQ_GSSAPI_PLAINTEXT 65
+#define ZMQ_HANDSHAKE_IVL 66
+#define ZMQ_SOCKS_PROXY 68
+#define ZMQ_XPUB_NODROP 69
+#define ZMQ_BLOCKY 70
+#define ZMQ_XPUB_MANUAL 71
+#define ZMQ_XPUB_WELCOME_MSG 72
+#define ZMQ_STREAM_NOTIFY 73
+#define ZMQ_INVERT_MATCHING 74
+#define ZMQ_HEARTBEAT_IVL 75
+#define ZMQ_HEARTBEAT_TTL 76
+#define ZMQ_HEARTBEAT_TIMEOUT 77
+#define ZMQ_XPUB_VERBOSER 78
+#define ZMQ_CONNECT_TIMEOUT 79
+#define ZMQ_TCP_MAXRT 80
+#define ZMQ_THREAD_SAFE 81
+#define ZMQ_MULTICAST_MAXTPDU 84
+#define ZMQ_VMCI_BUFFER_SIZE 85
+#define ZMQ_VMCI_BUFFER_MIN_SIZE 86
+#define ZMQ_VMCI_BUFFER_MAX_SIZE 87
+#define ZMQ_VMCI_CONNECT_TIMEOUT 88
+#define ZMQ_USE_FD 89
+#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
+#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
+#define ZMQ_BINDTODEVICE 92
+
+/*  Message options                                                           */
+#define ZMQ_MORE 1
+#define ZMQ_SHARED 3
+
+/*  Send/recv options.                                                        */
+#define ZMQ_DONTWAIT 1
+#define ZMQ_SNDMORE 2
+
+/*  Security mechanisms                                                       */
+#define ZMQ_NULL 0
+#define ZMQ_PLAIN 1
+#define ZMQ_CURVE 2
+#define ZMQ_GSSAPI 3
+
+/*  RADIO-DISH protocol                                                       */
+#define ZMQ_GROUP_MAX_LENGTH 15
+
+/*  Deprecated options and aliases                                            */
+#define ZMQ_IDENTITY ZMQ_ROUTING_ID
+#define ZMQ_CONNECT_RID ZMQ_CONNECT_ROUTING_ID
+#define ZMQ_TCP_ACCEPT_FILTER 38
+#define ZMQ_IPC_FILTER_PID 58
+#define ZMQ_IPC_FILTER_UID 59
+#define ZMQ_IPC_FILTER_GID 60
+#define ZMQ_IPV4ONLY 31
+#define ZMQ_DELAY_ATTACH_ON_CONNECT ZMQ_IMMEDIATE
+#define ZMQ_NOBLOCK ZMQ_DONTWAIT
+#define ZMQ_FAIL_UNROUTABLE ZMQ_ROUTER_MANDATORY
+#define ZMQ_ROUTER_BEHAVIOR ZMQ_ROUTER_MANDATORY
+
+/*  Deprecated Message options                                                */
+#define ZMQ_SRCFD 2
+
+/******************************************************************************/
+/*  GSSAPI definitions                                                        */
+/******************************************************************************/
+
+/*  GSSAPI principal name types                                               */
+#define ZMQ_GSSAPI_NT_HOSTBASED 0
+#define ZMQ_GSSAPI_NT_USER_NAME 1
+#define ZMQ_GSSAPI_NT_KRB5_PRINCIPAL 2
+
+/******************************************************************************/
+/*  0MQ socket events and monitoring                                          */
+/******************************************************************************/
+
+/*  Socket transport events (TCP, IPC and TIPC only)                          */
+
+#define ZMQ_EVENT_CONNECTED 0x0001
+#define ZMQ_EVENT_CONNECT_DELAYED 0x0002
+#define ZMQ_EVENT_CONNECT_RETRIED 0x0004
+#define ZMQ_EVENT_LISTENING 0x0008
+#define ZMQ_EVENT_BIND_FAILED 0x0010
+#define ZMQ_EVENT_ACCEPTED 0x0020
+#define ZMQ_EVENT_ACCEPT_FAILED 0x0040
+#define ZMQ_EVENT_CLOSED 0x0080
+#define ZMQ_EVENT_CLOSE_FAILED 0x0100
+#define ZMQ_EVENT_DISCONNECTED 0x0200
+#define ZMQ_EVENT_MONITOR_STOPPED 0x0400
+#define ZMQ_EVENT_ALL 0xFFFF
+/*  Unspecified system errors during handshake. Event value is an errno.      */
+#define ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL 0x0800
+/*  Handshake complete successfully with successful authentication (if        *
+ *  enabled). Event value is unused.                                          */
+#define ZMQ_EVENT_HANDSHAKE_SUCCEEDED 0x1000
+/*  Protocol errors between ZMTP peers or between server and ZAP handler.     *
+ *  Event value is one of ZMQ_PROTOCOL_ERROR_*                                */
+#define ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL 0x2000
+/*  Failed authentication requests. Event value is the numeric ZAP status     *
+ *  code, i.e. 300, 400 or 500.                                               */
+#define ZMQ_EVENT_HANDSHAKE_FAILED_AUTH 0x4000
+#define ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED 0x10000000
+#define ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND 0x10000001
+#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE 0x10000002
+#define ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE 0x10000003
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED 0x10000011
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE 0x10000012
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO 0x10000013
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE 0x10000014
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR 0x10000015
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY 0x10000016
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME 0x10000017
+#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA 0x10000018
+// the following two may be due to erroneous configuration of a peer
+#define ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC 0x11000001
+#define ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH 0x11000002
+#define ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED 0x20000000
+#define ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY 0x20000001
+#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID 0x20000002
+#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION 0x20000003
+#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE 0x20000004
+#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA 0x20000005
+
+ZMQ_EXPORT void *zmq_socket (void *, int type_);
+ZMQ_EXPORT int zmq_close (void *s_);
+ZMQ_EXPORT int
+zmq_setsockopt (void *s_, int option_, const void *optval_, size_t optvallen_);
+ZMQ_EXPORT int
+zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_);
+ZMQ_EXPORT int zmq_bind (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_connect (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_unbind (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_disconnect (void *s_, const char *addr_);
+ZMQ_EXPORT int zmq_send (void *s_, const void *buf_, size_t len_, int flags_);
+ZMQ_EXPORT int
+zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_);
+ZMQ_EXPORT int zmq_recv (void *s_, void *buf_, size_t len_, int flags_);
+ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_);
+
+
+/******************************************************************************/
+/*  Deprecated I/O multiplexing. Prefer using zmq_poller API                  */
+/******************************************************************************/
+
+#define ZMQ_POLLIN 1
+#define ZMQ_POLLOUT 2
+#define ZMQ_POLLERR 4
+#define ZMQ_POLLPRI 8
+
+typedef struct zmq_pollitem_t
+{
+    void *socket;
+#if defined _WIN32
+    SOCKET fd;
+#else
+    int fd;
+#endif
+    short events;
+    short revents;
+} zmq_pollitem_t;
+
+#define ZMQ_POLLITEMS_DFLT 16
+
+ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_);
+
+/******************************************************************************/
+/*  Message proxying                                                          */
+/******************************************************************************/
+
+ZMQ_EXPORT int zmq_proxy (void *frontend_, void *backend_, void *capture_);
+ZMQ_EXPORT int zmq_proxy_steerable (void *frontend_,
+                                    void *backend_,
+                                    void *capture_,
+                                    void *control_);
+
+/******************************************************************************/
+/*  Probe library capabilities                                                */
+/******************************************************************************/
+
+#define ZMQ_HAS_CAPABILITIES 1
+ZMQ_EXPORT int zmq_has (const char *capability_);
+
+/*  Deprecated aliases */
+#define ZMQ_STREAMER 1
+#define ZMQ_FORWARDER 2
+#define ZMQ_QUEUE 3
+
+/*  Deprecated methods */
+ZMQ_EXPORT int zmq_device (int type_, void *frontend_, void *backend_);
+ZMQ_EXPORT int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_);
+ZMQ_EXPORT int zmq_recvmsg (void *s_, zmq_msg_t *msg_, int flags_);
+struct iovec;
+ZMQ_EXPORT int
+zmq_sendiov (void *s_, struct iovec *iov_, size_t count_, int flags_);
+ZMQ_EXPORT int
+zmq_recviov (void *s_, struct iovec *iov_, size_t *count_, int flags_);
+
+/******************************************************************************/
+/*  Encryption functions                                                      */
+/******************************************************************************/
+
+/*  Encode data with Z85 encoding. Returns encoded data                       */
+ZMQ_EXPORT char *
+zmq_z85_encode (char *dest_, const uint8_t *data_, size_t size_);
+
+/*  Decode data with Z85 encoding. Returns decoded data                       */
+ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest_, const char *string_);
+
+/*  Generate z85-encoded public and private keypair with tweetnacl/libsodium. */
+/*  Returns 0 on success.                                                     */
+ZMQ_EXPORT int zmq_curve_keypair (char *z85_public_key_, char *z85_secret_key_);
+
+/*  Derive the z85-encoded public key from the z85-encoded secret key.        */
+/*  Returns 0 on success.                                                     */
+ZMQ_EXPORT int zmq_curve_public (char *z85_public_key_,
+                                 const char *z85_secret_key_);
+
+/******************************************************************************/
+/*  Atomic utility methods                                                    */
+/******************************************************************************/
+
+ZMQ_EXPORT void *zmq_atomic_counter_new (void);
+ZMQ_EXPORT void zmq_atomic_counter_set (void *counter_, int value_);
+ZMQ_EXPORT int zmq_atomic_counter_inc (void *counter_);
+ZMQ_EXPORT int zmq_atomic_counter_dec (void *counter_);
+ZMQ_EXPORT int zmq_atomic_counter_value (void *counter_);
+ZMQ_EXPORT void zmq_atomic_counter_destroy (void **counter_p_);
+
+/******************************************************************************/
+/*  Scheduling timers                                                         */
+/******************************************************************************/
+
+#define ZMQ_HAVE_TIMERS
+
+typedef void(zmq_timer_fn) (int timer_id, void *arg);
+
+ZMQ_EXPORT void *zmq_timers_new (void);
+ZMQ_EXPORT int zmq_timers_destroy (void **timers_p);
+ZMQ_EXPORT int
+zmq_timers_add (void *timers, size_t interval, zmq_timer_fn handler, void *arg);
+ZMQ_EXPORT int zmq_timers_cancel (void *timers, int timer_id);
+ZMQ_EXPORT int
+zmq_timers_set_interval (void *timers, int timer_id, size_t interval);
+ZMQ_EXPORT int zmq_timers_reset (void *timers, int timer_id);
+ZMQ_EXPORT long zmq_timers_timeout (void *timers);
+ZMQ_EXPORT int zmq_timers_execute (void *timers);
+
+
+/******************************************************************************/
+/*  These functions are not documented by man pages -- use at your own risk.  */
+/*  If you need these to be part of the formal ZMQ API, then (a) write a man  */
+/*  page, and (b) write a test case in tests.                                 */
+/******************************************************************************/
+
+/*  Helper functions are used by perf tests so that they don't have to care   */
+/*  about minutiae of time-related functions on different OS platforms.       */
+
+/*  Starts the stopwatch. Returns the handle to the watch.                    */
+ZMQ_EXPORT void *zmq_stopwatch_start (void);
+
+/*  Returns the number of microseconds elapsed since the stopwatch was        */
+/*  started, but does not stop or deallocate the stopwatch.                   */
+ZMQ_EXPORT unsigned long zmq_stopwatch_intermediate (void *watch_);
+
+/*  Stops the stopwatch. Returns the number of microseconds elapsed since     */
+/*  the stopwatch was started, and deallocates that watch.                    */
+ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
+
+/*  Sleeps for specified number of seconds.                                   */
+ZMQ_EXPORT void zmq_sleep (int seconds_);
+
+typedef void(zmq_thread_fn) (void *);
+
+/* Start a thread. Returns a handle to the thread.                            */
+ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn *func_, void *arg_);
+
+/* Wait for thread to complete then free up resources.                        */
+ZMQ_EXPORT void zmq_threadclose (void *thread_);
+
+
+/******************************************************************************/
+/*  These functions are DRAFT and disabled in stable releases, and subject to */
+/*  change at ANY time until declared stable.                                 */
+/******************************************************************************/
+
+#ifdef ZMQ_BUILD_DRAFT_API
+
+/*  DRAFT Socket types.                                                       */
+#define ZMQ_SERVER 12
+#define ZMQ_CLIENT 13
+#define ZMQ_RADIO 14
+#define ZMQ_DISH 15
+#define ZMQ_GATHER 16
+#define ZMQ_SCATTER 17
+#define ZMQ_DGRAM 18
+
+/*  DRAFT Socket options.                                                     */
+#define ZMQ_ZAP_ENFORCE_DOMAIN 93
+#define ZMQ_LOOPBACK_FASTPATH 94
+#define ZMQ_METADATA 95
+#define ZMQ_MULTICAST_LOOP 96
+#define ZMQ_ROUTER_NOTIFY 97
+#define ZMQ_XPUB_MANUAL_LAST_VALUE 98
+#define ZMQ_SOCKS_USERNAME 99
+#define ZMQ_SOCKS_PASSWORD 100
+#define ZMQ_IN_BATCH_SIZE 101
+#define ZMQ_OUT_BATCH_SIZE 102
+
+/*  DRAFT Context options                                                     */
+#define ZMQ_ZERO_COPY_RECV 10
+
+/*  DRAFT Socket methods.                                                     */
+ZMQ_EXPORT int zmq_join (void *s, const char *group);
+ZMQ_EXPORT int zmq_leave (void *s, const char *group);
+
+/*  DRAFT Msg methods.                                                        */
+ZMQ_EXPORT int zmq_msg_set_routing_id (zmq_msg_t *msg, uint32_t routing_id);
+ZMQ_EXPORT uint32_t zmq_msg_routing_id (zmq_msg_t *msg);
+ZMQ_EXPORT int zmq_msg_set_group (zmq_msg_t *msg, const char *group);
+ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
+
+/*  DRAFT Msg property names.                                                 */
+#define ZMQ_MSG_PROPERTY_ROUTING_ID "Routing-Id"
+#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
+#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
+#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
+
+/*  Router notify options                                                     */
+#define ZMQ_NOTIFY_CONNECT 1
+#define ZMQ_NOTIFY_DISCONNECT 2
+
+/******************************************************************************/
+/*  Poller polling on sockets,fd and thread-safe sockets                      */
+/******************************************************************************/
+
+#define ZMQ_HAVE_POLLER
+
+#if defined _WIN32
+typedef SOCKET zmq_fd_t;
+#else
+typedef int zmq_fd_t;
+#endif
+
+typedef struct zmq_poller_event_t
+{
+    void *socket;
+    zmq_fd_t fd;
+    void *user_data;
+    short events;
+} zmq_poller_event_t;
+
+ZMQ_EXPORT void *zmq_poller_new (void);
+ZMQ_EXPORT int zmq_poller_destroy (void **poller_p);
+ZMQ_EXPORT int
+zmq_poller_add (void *poller, void *socket, void *user_data, short events);
+ZMQ_EXPORT int zmq_poller_modify (void *poller, void *socket, short events);
+ZMQ_EXPORT int zmq_poller_remove (void *poller, void *socket);
+ZMQ_EXPORT int
+zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
+ZMQ_EXPORT int zmq_poller_wait_all (void *poller,
+                                    zmq_poller_event_t *events,
+                                    int n_events,
+                                    long timeout);
+ZMQ_EXPORT int zmq_poller_fd (void *poller, zmq_fd_t *fd);
+
+ZMQ_EXPORT int
+zmq_poller_add_fd (void *poller, zmq_fd_t fd, void *user_data, short events);
+ZMQ_EXPORT int zmq_poller_modify_fd (void *poller, zmq_fd_t fd, short events);
+ZMQ_EXPORT int zmq_poller_remove_fd (void *poller, zmq_fd_t fd);
+
+ZMQ_EXPORT int zmq_socket_get_peer_state (void *socket,
+                                          const void *routing_id,
+                                          size_t routing_id_size);
+
+/*  DRAFT Socket monitoring events                                            */
+#define ZMQ_EVENT_PIPES_STATS 0x10000
+
+#define ZMQ_CURRENT_EVENT_VERSION 1
+#define ZMQ_CURRENT_EVENT_VERSION_DRAFT 2
+
+#define ZMQ_EVENT_ALL_V1 ZMQ_EVENT_ALL
+#define ZMQ_EVENT_ALL_V2 ZMQ_EVENT_ALL_V1 | ZMQ_EVENT_PIPES_STATS
+
+ZMQ_EXPORT int zmq_socket_monitor_versioned (
+  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_);
+ZMQ_EXPORT int zmq_socket_monitor_pipes_stats (void *s);
+
+#endif // ZMQ_BUILD_DRAFT_API
+
+
+#undef ZMQ_EXPORT
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmq.hpp b/Source/ThirdParty/libZmq/include/Win64/zmq.hpp
new file mode 100644
index 0000000..81c17dc
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmq.hpp
@@ -0,0 +1,789 @@
+/*
+    Copyright (c) 2009-2011 250bpm s.r.o.
+    Copyright (c) 2011 Botond Ballo
+    Copyright (c) 2007-2009 iMatix Corporation
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to
+    deal in the Software without restriction, including without limitation the
+    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+    sell copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+    IN THE SOFTWARE.
+*/
+
+#ifndef __ZMQ_HPP_INCLUDED__
+#define __ZMQ_HPP_INCLUDED__
+
+#if 1/*__cplusplus >= 201103L*/
+#define ZMQ_CPP11
+#define ZMQ_NOTHROW noexcept
+#define ZMQ_EXPLICIT explicit
+#else
+    #define ZMQ_CPP03
+    #define ZMQ_NOTHROW
+    #define ZMQ_EXPLICIT
+#endif
+
+#include <zmq.h>
+
+#include <algorithm>
+#include <cassert>
+#include <cstring>
+#include <string>
+#include <exception>
+#include <vector>
+#include <iterator>
+
+#ifdef ZMQ_CPP11
+#include <chrono>
+#include <tuple>
+#endif
+
+//  Detect whether the compiler supports C++11 rvalue references.
+#if (defined(__GNUC__) && (__GNUC__ > 4 || \
+      (__GNUC__ == 4 && __GNUC_MINOR__ > 2)) && \
+      defined(__GXX_EXPERIMENTAL_CXX0X__))
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION = delete
+#elif defined(__clang__)
+    #if __has_feature(cxx_rvalue_references)
+        #define ZMQ_HAS_RVALUE_REFS
+    #endif
+
+    #if __has_feature(cxx_deleted_functions)
+        #define ZMQ_DELETED_FUNCTION = delete
+    #else
+        #define ZMQ_DELETED_FUNCTION
+    #endif
+#elif defined(_MSC_VER) && (_MSC_VER >= 1600)
+    #define ZMQ_HAS_RVALUE_REFS
+    #define ZMQ_DELETED_FUNCTION
+#else
+    #define ZMQ_DELETED_FUNCTION
+#endif
+
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 3, 0)
+#define ZMQ_NEW_MONITOR_EVENT_LAYOUT
+#endif
+
+#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0)
+#define ZMQ_HAS_PROXY_STEERABLE
+/*  Socket event data  */
+typedef struct {
+    uint16_t event;  // id of the event as bitfield
+    int32_t  value ; // value is either error code, fd or reconnect interval
+} zmq_event_t;
+#endif
+
+// Avoid using deprecated message receive function when possible
+#if ZMQ_VERSION < ZMQ_MAKE_VERSION(3, 2, 0)
+#  define zmq_msg_recv(msg, socket, flags) zmq_recvmsg(socket, msg, flags)
+#endif
+
+
+// In order to prevent unused variable warnings when building in non-debug
+// mode use this macro to make assertions.
+#ifndef NDEBUG
+#   define ZMQ_ASSERT(expression) assert(expression)
+#else
+#   define ZMQ_ASSERT(expression) (void)(expression)
+#endif
+
+namespace zmq
+{
+
+    typedef zmq_free_fn free_fn;
+    typedef zmq_pollitem_t pollitem_t;
+
+    class error_t : public std::exception
+    {
+    public:
+
+        error_t () : errnum (zmq_errno ()) {}
+
+        virtual const char *what () const throw ()
+        {
+            return zmq_strerror (errnum);
+        }
+
+        int num () const
+        {
+            return errnum;
+        }
+
+    private:
+
+        int errnum;
+    };
+
+    inline int poll (zmq_pollitem_t const* items_, size_t nitems_, long timeout_ = -1)
+    {
+        int rc = zmq_poll (const_cast<zmq_pollitem_t*>(items_), static_cast<int>(nitems_), timeout_);
+        if (rc < 0)
+            throw error_t ();
+        return rc;
+    }
+
+    inline int poll(zmq_pollitem_t const* items, size_t nitems)
+    {
+        return poll(items, nitems, -1);
+    }
+
+    #ifdef ZMQ_CPP11
+    inline int poll(zmq_pollitem_t const* items, size_t nitems, std::chrono::milliseconds timeout)
+    {
+        return poll(items, nitems, timeout.count() );
+    }
+
+    inline int poll(std::vector<zmq_pollitem_t> const& items, std::chrono::milliseconds timeout)
+    {
+        return poll(items.data(), items.size(), timeout.count() );
+    }
+
+    inline int poll(std::vector<zmq_pollitem_t> const& items, long timeout_ = -1)
+    {
+        return poll(items.data(), items.size(), timeout_);
+    }
+    #endif
+
+
+
+    inline void proxy (void *frontend, void *backend, void *capture)
+    {
+        int rc = zmq_proxy (frontend, backend, capture);
+        if (rc != 0)
+            throw error_t ();
+    }
+    
+#ifdef ZMQ_HAS_PROXY_STEERABLE
+    inline void proxy_steerable (void *frontend, void *backend, void *capture, void *control)
+    {
+        int rc = zmq_proxy_steerable (frontend, backend, capture, control);
+        if (rc != 0)
+            throw error_t ();
+    }
+#endif
+    
+    inline void version (int *major_, int *minor_, int *patch_)
+    {
+        zmq_version (major_, minor_, patch_);
+    }
+
+    #ifdef ZMQ_CPP11
+    inline std::tuple<int, int, int> version()
+    {
+        std::tuple<int, int, int> v;
+        zmq_version(&std::get<0>(v), &std::get<1>(v), &std::get<2>(v) );
+        return v;
+    }
+    #endif
+
+    class message_t
+    {
+        friend class socket_t;
+
+    public:
+
+        inline message_t ()
+        {
+            int rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline explicit message_t (size_t size_)
+        {
+            int rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        template<typename I> message_t(I first, I last):
+            msg()
+        {
+            typedef typename std::iterator_traits<I>::difference_type size_type;
+            typedef typename std::iterator_traits<I>::value_type value_t;
+
+            size_type const size_ = std::distance(first, last)*sizeof(value_t);
+            int const rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            value_t* dest = data<value_t>();
+            while (first != last)
+            {
+                *dest = *first;
+                ++dest; ++first;
+            }
+        }
+
+        inline message_t (const void *data_, size_t size_)
+        {
+            int rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            memcpy(data(), data_, size_);
+        }
+
+        inline message_t (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline message_t (message_t &&rhs): msg (rhs.msg)
+        {
+            int rc = zmq_msg_init (&rhs.msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline message_t &operator = (message_t &&rhs) ZMQ_NOTHROW
+        {
+            std::swap (msg, rhs.msg);
+            return *this;
+        }
+#endif
+
+        inline ~message_t () ZMQ_NOTHROW
+        {
+            int rc = zmq_msg_close (&msg);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        inline void rebuild ()
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init (&msg);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (size_t size_)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void rebuild (const void *data_, size_t size_)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_size (&msg, size_);
+            if (rc != 0)
+                throw error_t ();
+            memcpy(data(), data_, size_);
+        }
+
+        inline void rebuild (void *data_, size_t size_, free_fn *ffn_,
+            void *hint_ = NULL)
+        {
+            int rc = zmq_msg_close (&msg);
+            if (rc != 0)
+                throw error_t ();
+            rc = zmq_msg_init_data (&msg, data_, size_, ffn_, hint_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void move (message_t const *msg_)
+        {
+            int rc = zmq_msg_move (&msg, const_cast<zmq_msg_t*>(&(msg_->msg)));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void copy (message_t const *msg_)
+        {
+            int rc = zmq_msg_copy (&msg, const_cast<zmq_msg_t*>(&(msg_->msg)));
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool more () const ZMQ_NOTHROW
+        {
+            int rc = zmq_msg_more (const_cast<zmq_msg_t*>(&msg) );
+            return rc != 0;
+        }
+
+        inline void *data () ZMQ_NOTHROW
+        {
+            return zmq_msg_data (&msg);
+        }
+
+        inline const void* data () const ZMQ_NOTHROW
+        {
+            return zmq_msg_data (const_cast<zmq_msg_t*>(&msg));
+        }
+
+        inline size_t size () const ZMQ_NOTHROW
+        {
+            return zmq_msg_size (const_cast<zmq_msg_t*>(&msg));
+        }
+
+        template<typename T> T* data() ZMQ_NOTHROW
+        {
+            return static_cast<T*>( data() );
+        }
+
+        template<typename T> T const* data() const ZMQ_NOTHROW
+        {
+            return static_cast<T const*>( data() );
+        }
+
+
+    private:
+        //  The underlying message
+        zmq_msg_t msg;
+
+        //  Disable implicit message copying, so that users won't use shared
+        //  messages (less efficient) without being aware of the fact.
+        message_t (const message_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const message_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    class context_t
+    {
+        friend class socket_t;
+
+    public:
+        inline context_t ()
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+
+        inline explicit context_t (int io_threads_, int max_sockets_ = ZMQ_MAX_SOCKETS_DFLT)
+        {
+            ptr = zmq_ctx_new ();
+            if (ptr == NULL)
+                throw error_t ();
+
+            int rc = zmq_ctx_set (ptr, ZMQ_IO_THREADS, io_threads_);
+            ZMQ_ASSERT (rc == 0);
+
+            rc = zmq_ctx_set (ptr, ZMQ_MAX_SOCKETS, max_sockets_);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline context_t (context_t &&rhs) ZMQ_NOTHROW : ptr (rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline context_t &operator = (context_t &&rhs) ZMQ_NOTHROW
+        {
+            std::swap (ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~context_t () ZMQ_NOTHROW
+        {
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        inline void close() ZMQ_NOTHROW
+        {
+            int rc = zmq_ctx_destroy (ptr);
+            ZMQ_ASSERT (rc == 0);
+        }
+
+        //  Be careful with this, it's probably only useful for
+        //  using the C api together with an existing C++ api.
+        //  Normally you should never need to use this.
+        inline ZMQ_EXPLICIT operator void* () ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline ZMQ_EXPLICIT operator void const* () const ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+    private:
+
+        void *ptr;
+
+        context_t (const context_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const context_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    #ifdef ZMQ_CPP11
+    enum class socket_type: int
+    {
+        req = ZMQ_REQ,
+        rep = ZMQ_REP,
+        dealer = ZMQ_DEALER,
+        router = ZMQ_ROUTER,
+        pub = ZMQ_PUB,
+        sub = ZMQ_SUB,
+        xpub = ZMQ_XPUB,
+        xsub = ZMQ_XSUB,
+        push = ZMQ_PUSH,
+        pull = ZMQ_PULL,
+#if ZMQ_VERSION_MAJOR < 4
+        pair = ZMQ_PAIR
+#else
+        pair = ZMQ_PAIR,
+        stream = ZMQ_STREAM
+#endif
+    };
+    #endif
+
+    class socket_t
+    {
+        friend class monitor_t;
+    public:
+        inline socket_t(context_t& context_, int type_)
+        {
+            init(context_, type_);
+        }
+
+        #ifdef ZMQ_CPP11
+        inline socket_t(context_t& context_, socket_type type_)
+        {
+            init(context_, static_cast<int>(type_));
+        }
+        #endif
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline socket_t(socket_t&& rhs) ZMQ_NOTHROW : ptr(rhs.ptr)
+        {
+            rhs.ptr = NULL;
+        }
+        inline socket_t& operator=(socket_t&& rhs) ZMQ_NOTHROW
+        {
+            std::swap(ptr, rhs.ptr);
+            return *this;
+        }
+#endif
+
+        inline ~socket_t () ZMQ_NOTHROW
+        {
+            close();
+        }
+
+        inline ZMQ_EXPLICIT operator void* () ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline ZMQ_EXPLICIT operator void const* () const ZMQ_NOTHROW
+        {
+            return ptr;
+        }
+
+        inline void close() ZMQ_NOTHROW
+        {
+            if(ptr == NULL)
+                // already closed
+                return ;
+            int rc = zmq_close (ptr);
+            ZMQ_ASSERT (rc == 0);
+            ptr = 0 ;
+        }
+
+        template<typename T> void setsockopt(int option_, T const& optval)
+        {
+            setsockopt(option_, &optval, sizeof(T) );
+        }
+
+        inline void setsockopt (int option_, const void *optval_,
+            size_t optvallen_)
+        {
+            int rc = zmq_setsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void getsockopt (int option_, void *optval_,
+            size_t *optvallen_) const
+        {
+            int rc = zmq_getsockopt (ptr, option_, optval_, optvallen_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        template<typename T> T getsockopt(int option_) const
+        {
+            T optval;
+            size_t optlen = sizeof(T);
+            getsockopt(option_, &optval, &optlen );
+            return optval;
+        }
+
+        inline void bind(std::string const& addr)
+        {
+            bind(addr.c_str());
+        }
+
+        inline void bind (const char *addr_)
+        {
+            int rc = zmq_bind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void unbind(std::string const& addr)
+        {
+            unbind(addr.c_str());
+        }
+
+        inline void unbind (const char *addr_)
+        {
+            int rc = zmq_unbind (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void connect(std::string const& addr)
+        {
+            connect(addr.c_str());
+        }
+
+        inline void connect (const char *addr_)
+        {
+            int rc = zmq_connect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline void disconnect(std::string const& addr)
+        {
+            disconnect(addr.c_str());
+        }
+
+        inline void disconnect (const char *addr_)
+        {
+            int rc = zmq_disconnect (ptr, addr_);
+            if (rc != 0)
+                throw error_t ();
+        }
+
+        inline bool connected() const ZMQ_NOTHROW
+        {
+            return(ptr != NULL);
+        }
+        
+        inline size_t send (const void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_send (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool send (message_t &msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_send (&(msg_.msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+
+        template<typename I> bool send(I first, I last, int flags_=0)
+        {
+            zmq::message_t msg(first, last);
+            return send(msg, flags_);
+        }
+
+#ifdef ZMQ_HAS_RVALUE_REFS
+        inline bool send (message_t &&msg_, int flags_ = 0)
+        {
+            return send(msg_, flags_);
+        }
+#endif
+
+        inline size_t recv (void *buf_, size_t len_, int flags_ = 0)
+        {
+            int nbytes = zmq_recv (ptr, buf_, len_, flags_);
+            if (nbytes >= 0)
+                return (size_t) nbytes;
+            if (zmq_errno () == EAGAIN)
+                return 0;
+            throw error_t ();
+        }
+
+        inline bool recv (message_t *msg_, int flags_ = 0)
+        {
+            int nbytes = zmq_msg_recv (&(msg_->msg), ptr, flags_);
+            if (nbytes >= 0)
+                return true;
+            if (zmq_errno () == EAGAIN)
+                return false;
+            throw error_t ();
+        }
+        
+    private:
+        inline void init(context_t& context_, int type_)
+        {
+            ctxptr = context_.ptr;
+            ptr = zmq_socket (context_.ptr, type_ );
+            if (ptr == NULL)
+                throw error_t ();
+        }
+
+        void *ptr;
+        void *ctxptr;
+
+        socket_t (const socket_t&) ZMQ_DELETED_FUNCTION;
+        void operator = (const socket_t&) ZMQ_DELETED_FUNCTION;
+    };
+
+    class monitor_t
+    {
+    public:
+        monitor_t() : socketPtr(NULL) {}
+        virtual ~monitor_t() {}
+
+        void monitor(socket_t &socket, std::string const& addr, int events = ZMQ_EVENT_ALL)
+        {
+            monitor(socket, addr.c_str(), events);
+        }
+
+        void monitor(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL)
+        {
+            int rc = zmq_socket_monitor(socket.ptr, addr_, events);
+            if (rc != 0)
+                throw error_t ();
+
+            socketPtr = socket.ptr;
+            void *s = zmq_socket (socket.ctxptr, ZMQ_PAIR);
+            assert (s);
+
+            rc = zmq_connect (s, addr_);
+            assert (rc == 0);
+            
+            on_monitor_started();
+            
+            while (true) {
+                zmq_msg_t eventMsg;
+                zmq_msg_init (&eventMsg);
+                rc = zmq_msg_recv (&eventMsg, s, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+#if ZMQ_VERSION_MAJOR >= 4
+                const char* data = static_cast<const char*>(zmq_msg_data(&eventMsg));
+                zmq_event_t msgEvent;
+                memcpy(&msgEvent.event, data, sizeof(uint16_t)); data += sizeof(uint16_t);
+                memcpy(&msgEvent.value, data, sizeof(int32_t));
+                zmq_event_t* event = &msgEvent;
+#else
+                zmq_event_t* event = static_cast<zmq_event_t*>(zmq_msg_data(&eventMsg));
+#endif
+                
+#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT
+                zmq_msg_t addrMsg;
+                zmq_msg_init (&addrMsg);
+                rc = zmq_msg_recv (&addrMsg, s, 0);
+                if (rc == -1 && zmq_errno() == ETERM)
+                    break;
+                assert (rc != -1);
+                const char* str = static_cast<const char*>(zmq_msg_data (&addrMsg));
+                std::string address(str, str + zmq_msg_size(&addrMsg));
+                zmq_msg_close (&addrMsg);
+#else
+                // Bit of a hack, but all events in the zmq_event_t union have the same layout so this will work for all event types.
+                std::string address = event->data.connected.addr;
+#endif
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+                if (event->event == ZMQ_EVENT_MONITOR_STOPPED)
+                    break;
+#endif
+
+                switch (event->event) {
+                case ZMQ_EVENT_CONNECTED:
+                    on_event_connected(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_DELAYED:
+                    on_event_connect_delayed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CONNECT_RETRIED:
+                    on_event_connect_retried(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_LISTENING:
+                    on_event_listening(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_BIND_FAILED:
+                    on_event_bind_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPTED:
+                    on_event_accepted(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_ACCEPT_FAILED:
+                    on_event_accept_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSED:
+                    on_event_closed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_CLOSE_FAILED:
+                    on_event_close_failed(*event, address.c_str());
+                    break;
+                case ZMQ_EVENT_DISCONNECTED:
+                    on_event_disconnected(*event, address.c_str());
+                    break;
+                default:
+                    on_event_unknown(*event, address.c_str());
+                    break;
+                }
+                zmq_msg_close (&eventMsg);
+            }
+            zmq_close (s);
+            socketPtr = NULL;
+        }
+
+#ifdef ZMQ_EVENT_MONITOR_STOPPED
+        void abort()
+        {
+            if (socketPtr)
+                zmq_socket_monitor(socketPtr, NULL, 0);
+        }
+#endif
+        virtual void on_monitor_started() {}
+        virtual void on_event_connected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_delayed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_connect_retried(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_listening(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_bind_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accepted(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_accept_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_closed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_close_failed(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_disconnected(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+        virtual void on_event_unknown(const zmq_event_t &event_, const char* addr_) { (void)event_; (void)addr_; }
+    private:
+        void* socketPtr;
+    };
+}
+
+#endif
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmq_utils.h b/Source/ThirdParty/libZmq/include/Win64/zmq_utils.h
new file mode 100644
index 0000000..3392a8e
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmq_utils.h
@@ -0,0 +1,20 @@
+/*
+    Copyright (c) 2007-2015 Contributors as noted in the AUTHORS file
+
+    This file is part of 0MQ.
+
+    0MQ is free software; you can redistribute it and/or modify it under
+    the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    0MQ is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/*  This file is deprecated, and all its functionality provided by zmq.h     */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/compatibility.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/compatibility.hpp
new file mode 100644
index 0000000..4673f3b
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/compatibility.hpp
@@ -0,0 +1,80 @@
+/**
+ * \file
+ *
+ * \date   10 Sep 2011
+ * \author ron
+ * \author Ben Gray (\@benjamg)
+ *
+ * A fair number of C++0x (or more accurately C++11) features are used in this
+ * library and as this project is used where I work on older compilers this
+ * file was created to help.
+ *
+ * C++ features and their workaround where not supported:
+ * \li lambda functions - disabled, these are only used in the test anyway.
+ * \li typesafe enums   - replaced with enum where comparisons needed.
+ * \li nullptr          - defined to null.
+ *
+ * As of the port to version 3.1 (libzmqpp version 1.1.0) this file will also
+ * be used to maintain compatablity with multiple versions of 0mq
+ */
+
+#ifndef ZMQPP_COMPATIBILITY_HPP_
+#define ZMQPP_COMPATIBILITY_HPP_
+
+#include <zmq.h>
+
+// Currently we require at least 0mq version 2.2.x
+#define ZMQPP_REQUIRED_ZMQ_MAJOR 2
+#define ZMQPP_REQUIRED_ZMQ_MINOR 2
+
+#if (ZMQ_VERSION_MAJOR < ZMQPP_REQUIRED_ZMQ_MAJOR) or ((ZMQ_VERSION_MAJOR == ZMQPP_REQUIRED_ZMQ_MAJOR) and (ZMQ_VERSION_MINOR < ZMQPP_REQUIRED_ZMQ_MINOR))
+#error zmqpp requires a later version of 0mq
+#endif
+
+// Experimental feature support
+#if (ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR == 0)
+#define ZMQ_EXPERIMENTAL_LABELS
+#endif
+
+// Deal with older versions of gcc
+#if defined(__GNUC__) and !defined(__clang__)
+#if __GNUC__ == 4
+
+// Deal with older gcc not supporting C++0x typesafe enum class name {} comparison
+#if __GNUC_MINOR__ < 4
+#define ZMQPP_COMPARABLE_ENUM enum
+#endif
+
+#if __GNUC_MINOR__ == 4
+#if __GNUC_PATCHLEVEL__ < 1
+#undef ZMQPP_COMPARABLE_ENUM
+#define ZMQPP_COMPARABLE_ENUM enum
+#endif // if __GNUC_PATCHLEVEL__ < 1
+#endif // if __GNUC_MINOR__ == 4
+
+// Deal with older gcc not supporting C++0x lambda function
+#if __GNUC_MINOR__ < 5
+#define ZMQPP_IGNORE_LAMBDA_FUNCTION_TESTS
+#define ZMQPP_EXPLICITLY_DELETED
+#endif // if __GNUC_MINOR__ < 5
+
+// Deal with older gcc not supporting C++0x nullptr
+#if __GNUC_MINOR__ < 6
+#define nullptr NULL
+#define noexcept
+#endif // if __GNUC_MINOR__ < 6
+
+#endif // if __GNUC_ == 4
+#endif // if defined(__GNUC__) && !defined(__clang__)
+
+// Generic state, assume a modern compiler
+#ifndef ZMQPP_COMPARABLE_ENUM
+#define ZMQPP_COMPARABLE_ENUM enum class
+#endif
+
+#ifndef ZMQPP_EXPLICITLY_DELETED
+#define ZMQPP_EXPLICITLY_DELETED = delete
+#endif
+
+#endif /* ZMQPP_COMPATIBILITY_HPP_ */
+
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/context.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/context.hpp
new file mode 100644
index 0000000..3220785
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/context.hpp
@@ -0,0 +1,200 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_CONTEXT_HPP_
+#define ZMQPP_CONTEXT_HPP_
+
+#include <cassert>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+#include "exception.hpp"
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+#include "context_options.hpp"
+#endif
+
+namespace zmqpp
+{
+
+/*!
+ * The context class represents internal zmq context and io threads.
+ *
+ * By default the context class will create one thread, however this can be
+ * overridden in the constructor.
+ *
+ * The context class is the only object that can be considered thread safe.
+ *
+ * All sockets using endpoints other than inproc require the context to have
+ * at least one thread.
+ *
+ * This class is c++0x move supporting and cannot be copied.
+ */
+class context
+{
+public:
+
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+	/*!
+	 * Initialise the 0mq context.
+	 *
+	 * If only inproc is used then the context may be created with zero threads.
+	 * Any inproc endpoint using sockets must be created using the same context.
+	 *
+	 * The context is thread safe an may be used anywhere in your application,
+	 * however there is no requirement (other than inproc restrictions) for you
+	 * to do this.
+	 *
+	 * \param threads an integer argument for the number of required threads. Defaults to 1.
+	 */
+	context(int const& threads = 1)
+#else
+	/*!
+	 * Initialise the 0mq context.
+	 *
+	 * The context is thread safe an may be used anywhere in your application,
+	 * however there is no requirement (other than inproc restrictions) for you
+	 * to do this.
+	 */
+	context()
+#endif
+		: _context(nullptr)
+	{
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+		_context = zmq_init(threads);
+#else
+		_context = zmq_ctx_new();
+#endif
+
+		if (nullptr == _context)
+		{
+			throw zmq_internal_exception();
+		}
+	}
+
+	/*!
+	 * Closes the 0mq context.
+	 *
+	 * Any blocking calls other than a socket close will return with an error.
+	 *
+	 * If there are open sockets will block while zmq internal buffers are
+	 * processed up to a limit specified by that sockets linger option.
+	 */
+	~context() noexcept
+	{
+		if (nullptr != _context)
+		{
+
+#ifndef NDEBUG // unused assert variable in release
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+			int result = zmq_term(_context);
+#else
+			int result = zmq_ctx_destroy(_context);
+#endif
+			assert(0 == result);
+#else
+#if (ZMQ_VERSION_MAJOR < 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR < 2))
+			zmq_term(_context);
+#else
+			zmq_ctx_destroy(_context);
+#endif
+#endif // NDEBUG
+
+			_context = nullptr;
+		}
+	}
+
+	/*!
+	 * Move supporting constructor.
+	 *
+	 * Allows zero-copy move semantics to be used with this class.
+	 *
+	 * \param source a rvalue instance of the object who's internals we wish to steal.
+	 */
+	context(context&& source) noexcept
+		: _context(source._context)
+	{
+		source._context = nullptr;
+	}
+
+	/*!
+	 * Move supporting operator.
+	 *
+	 * Allows zero-copy move semantics to be used with this class.
+	 *
+	 * \param source an rvalue instance of the context who's internals we wish to steal.
+	 */
+	context& operator=(context&& source) noexcept
+	{
+		std::swap( _context, source._context );
+		return *this;
+	}
+
+	/*!
+	 * Terminate the current context.
+	 *
+	 * Any blocking calls other than a socket close will return with an error.
+	 *
+	 * If there are open sockets will block while zmq internal buffers are
+	 * processed up to a limit specified by that sockets linger option.
+	 */
+	void terminate();
+
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+	/*!
+	 * Set the value of an option in the underlaying zmq context.
+	 *
+	 * \param option a valid ::context_option
+	 * \param value to set the option to
+	 */
+	void set(context_option const& option, int const& value);
+
+	/*!
+	 * Get a context option from the underlaying zmq context.
+	 *
+	 * \param option a valid ::context_option
+	 * \return context option value
+	 */
+	int get(context_option const& option);
+#endif
+
+	/*!
+	 * Validity checking of the context
+	 *
+	 * Checks if the underlying 0mq context for this instance is valid.
+	 *
+	 * Contexts should always be valid unless people are doing 'fun' things with
+	 * std::move.
+	 *
+	 * \return boolean true if the object is valid.
+	 */
+	operator bool() const noexcept
+	{
+		return nullptr != _context;
+	}
+
+	/*!
+	 * Access to the raw 0mq context
+	 *
+	 * \return void pointer to the underlying 0mq context.
+	 */
+	operator void*() const noexcept
+	{
+		return _context;
+	}
+
+private:
+	void* _context;
+
+	// No copy - private and not implemented
+	context(context const&) ZMQPP_EXPLICITLY_DELETED;
+	context& operator=(context const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+};
+
+}
+
+#endif /* ZMQPP_CONTEXT_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/context_options.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/context_options.hpp
new file mode 100644
index 0000000..b2e2cf4
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/context_options.hpp
@@ -0,0 +1,26 @@
+/**
+ * \file
+ *
+ * \date   3 Jul 2013
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_CONTEXT_OPTIONS_HPP_
+#define ZMQPP_CONTEXT_OPTIONS_HPP_
+
+namespace zmqpp
+{
+
+/** \todo Expand the information on the options to make it actually useful. */
+/*!
+ * \brief possible Context options in zmq
+ */
+
+enum class context_option {
+	io_threads  = ZMQ_IO_THREADS,          /*!< I/O thread count */
+	max_sockets = ZMQ_MAX_SOCKETS,         /*!< Maximum supported sockets */
+};
+
+}
+
+#endif /* ZMQPP_CONTEXT_OPTIONS_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/exception.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/exception.hpp
new file mode 100644
index 0000000..a0b2347
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/exception.hpp
@@ -0,0 +1,87 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_EXCEPTION_HPP_
+#define ZMQPP_EXCEPTION_HPP_
+
+#include <stdexcept>
+#include <string>
+
+#include <zmq.h>
+
+namespace zmqpp
+{
+
+/** \todo Have a larger variety of exceptions with better state debug information */
+
+/*!
+ * Represents the base zmqpp exception.
+ *
+ * All zmqpp runtime exceptions are children of this class.
+ * The class itself does not provide any special access fields but it only
+ * for convince when catching exceptions.
+ *
+ * The class extends std::runtime_error.
+ *
+ */
+class exception : public std::runtime_error
+{
+public:
+	/*!
+	 * Standard exception constructor.
+	 *
+	 * \param message a string representing the error message.
+	 */
+	exception(std::string const& message)
+		: std::runtime_error(message)
+	{ }
+};
+
+/*!
+ * Represents an attempt to use an invalid object.
+ *
+ * Objects may be invalid initially or after a shutdown or close.
+ */
+class invalid_instance : public exception
+{
+public:
+	invalid_instance(std::string const& message)
+		: exception(message)
+	{ }
+};
+
+/*!
+ * Represents internal zmq errors.
+ *
+ * Any error response from the zmq bindings will be wrapped in this error.
+ *
+ * The class provides access to the zmq error number via zmq_error().
+ */
+class zmq_internal_exception : public exception
+{
+public:
+	/*!
+	 * Uses the zmq functions to pull out error messages and numbers.
+	 */
+	zmq_internal_exception()
+		: exception(zmq_strerror(zmq_errno()))
+		, _error(zmq_errno())
+	{ }
+
+	/*!
+	 * Retrieve the zmq error number associated with this exception.
+	 * \return zmq error number
+	 */
+	int zmq_error() const { return _error; }
+
+private:
+	int _error;
+};
+
+}
+
+#endif /* ZMQPP_EXCEPTION_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/inet.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/inet.hpp
new file mode 100644
index 0000000..82e7e5e
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/inet.hpp
@@ -0,0 +1,104 @@
+/**
+ * \file
+ *
+ * \date   10 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_INET_HPP_
+#define ZMQPP_INET_HPP_
+
+/** \todo cross-platform version of including headers for htons and htonl. */
+// We get htons and htonl from here
+#include <netinet/in.h>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+
+/*!
+ * \brief Possible byte order types.
+ *
+ * An enumeration of all the known order types, all two of them.
+ * There is also an entry for unknown which is just used as a default.
+ */
+ZMQPP_COMPARABLE_ENUM order {
+	unknown,      /*!< used as a default prior to detection of the the byte order */
+	big_endian,   /*!< brief byte order is big endian */
+	little_endian /*!< \brief byte order is little endian */
+};
+
+/*!
+ * Common code for the 64bit versions of htons/htons and ntohs/ntohl
+ *
+ * As htons and ntohs (or htonl and ntohs) always just do the same thing, ie
+ * swap bytes if the host order differs from network order or otherwise don't
+ * do anything, it seemed silly to type the code twice.
+ *
+ * \note This code assumes network order is always big endian. Which it is.
+ * \note The host endian is only checked once and afterwards assumed to remain
+ *       the same.
+ *
+ * \param value_to_check unsigned 64 bit integer to swap
+ * \return swapped (or not) unsigned 64 bit integer
+ */
+inline uint64_t swap_if_needed(uint64_t const& value_to_check)
+{
+	static order host_order = order::unknown;
+
+	union {
+		uint64_t integer;
+		uint8_t bytes[8];
+	} value;
+
+	if (order::unknown == host_order)
+	{
+		value.integer = 1;
+		host_order = (1 == value.bytes[0]) ? order::little_endian : order::big_endian;
+	}
+
+	if (order::big_endian == host_order)
+	{
+		return value_to_check;
+	}
+
+	value.integer = value_to_check;
+
+	std::swap(value.bytes[0], value.bytes[7]);
+	std::swap(value.bytes[1], value.bytes[6]);
+	std::swap(value.bytes[2], value.bytes[5]);
+	std::swap(value.bytes[3], value.bytes[4]);
+
+	return value.integer;
+}
+
+}
+
+/*!
+ * 64 bit version of the htons/htonl
+ *
+ * I've used the name htonll to try and keep with the htonl naming scheme.
+ *
+ * \param hostlonglong unsigned 64 bit host order integer
+ * \return unsigned 64 bit network order integer
+ */
+inline uint64_t htonll(uint64_t const& hostlonglong)
+{
+	return zmqpp::swap_if_needed(hostlonglong);
+}
+
+/*!
+ * 64 bit version of the ntohs/ntohl
+ *
+ * I've used the name htonll to try and keep with the htonl naming scheme.
+ *
+ * \param networklonglong unsigned 64 bit network order integer
+ * \return unsigned 64 bit host order integer
+ */
+inline uint64_t ntohll(uint64_t const& networklonglong)
+{
+	return zmqpp::swap_if_needed(networklonglong);
+}
+
+#endif /* INET_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/message.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/message.hpp
new file mode 100644
index 0000000..3311bd1
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/message.hpp
@@ -0,0 +1,180 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_MESSAGE_HPP_
+#define ZMQPP_MESSAGE_HPP_
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+struct zmq_msg_wrapper;
+
+/*!
+ * \brief a zmq message with optional multipart support
+ *
+ * A zmq message is made up of one or more parts which are sent together to
+ * the target endpoints. zmq guarantees either the whole message or none
+ * of the message will be delivered.
+ */
+class message
+{
+public:
+	/*!
+	 * \brief callback to release user allocated data.
+	 *
+	 * The release function will be called on any void* moved part.
+	 * It must be thread safe to the extent that the callback may occur on
+	 * one of the context threads.
+	 *
+	 * The function called will be passed a single variable which is the
+	 * pointer to the memory allocated.
+	 */
+	typedef std::function<void (void*)> release_function;
+
+	message();
+	~message();
+
+	size_t parts() const;
+	size_t size(size_t const& part) const;
+	std::string get(size_t const& part) const;
+
+	void get(int8_t& integer, size_t const& part) const;
+	void get(int16_t& integer, size_t const& part) const;
+	void get(int32_t& integer, size_t const& part) const;
+	void get(int64_t& integer, size_t const& part) const;
+
+	void get(uint8_t& unsigned_integer, size_t const& part) const;
+	void get(uint16_t& unsigned_integer, size_t const& part) const;
+	void get(uint32_t& unsigned_integer, size_t const& part) const;
+	void get(uint64_t& unsigned_integer, size_t const& part) const;
+
+	void get(float& floating_point, size_t const& part) const;
+	void get(double& double_precision, size_t const& part) const;
+	void get(bool& boolean, size_t const& part) const;
+
+	void get(std::string& string, size_t const& part) const;
+
+	// Warn: If a pointer type is requested the message (well zmq) still 'owns'
+	// the data and will release it when the message object is freed.
+	template<typename Type>
+	Type get(size_t const& part)
+	{
+		Type value;
+		get(value, part);
+		return value;
+	}
+
+	// Raw get data operations, useful with data structures more than anything else
+	// Warn: The message (well zmq) still 'owns' the data and will release it
+	// when the message object is freed.
+	template<typename Type>
+	void get(Type*& value, size_t const& part) const
+	{
+		value = static_cast<Type*>(raw_data(part));
+	}
+
+	// Warn: The message (well zmq) still 'owns' the data and will release it
+	// when the message object is freed.
+	template<typename Type>
+	void get(Type** value, size_t const& part) const
+	{
+		*value = static_cast<Type*>(raw_data(part));
+	}
+
+	// Move operators will take ownership of message parts without copying
+	void move(void* part, size_t& size, release_function const& release);
+
+	// Raw move data operation, useful with data structures more than anything else
+	template<typename Object>
+	void move(Object *part)
+	{
+		move(part, sizeof(Object), &deleter_callback<Object>);
+	}
+
+	// Copy operators will take copies of any data
+	void add(void const* part, size_t const& size);
+
+	template<typename Type>
+	void add(Type const& part)
+	{
+		*this << part;
+	}
+
+	// Stream reader style
+	void reset_read_cursor();
+
+	template<typename Type>
+	message& operator>>(Type& value)
+	{
+		get(value, _read_cursor++);
+		return *this;
+	}
+
+	// Stream writer style - these all use copy styles
+	message& operator<<(int8_t const& integer);
+	message& operator<<(int16_t const& integer);
+	message& operator<<(int32_t const& integer);
+	message& operator<<(int64_t const& integer);
+
+	message& operator<<(uint8_t const& unsigned_integer);
+	message& operator<<(uint16_t const& unsigned_integer);
+	message& operator<<(uint32_t const& unsigned_integer);
+	message& operator<<(uint64_t const& unsigned_integer);
+
+	message& operator<<(float const& floating_point);
+	message& operator<<(double const& double_precision);
+	message& operator<<(bool const& boolean);
+
+	message& operator<<(char const* c_string);
+	message& operator<<(std::string const& string);
+
+	// Move supporting
+	message(message&& source) noexcept;
+	message& operator=(message&& source) noexcept;
+
+	// Copy support
+	message copy();
+	void copy(message& source);
+
+	// Used for internal tracking
+	void sent(size_t const& part);
+
+	// Access to raw zmq details
+	void const* raw_data(size_t const& part = 0) const;
+	zmq_msg_t& raw_msg(size_t const& part = 0);
+	zmq_msg_t& raw_new_msg();
+
+private:
+	typedef std::vector<zmq_msg_wrapper> parts_type;
+	parts_type _parts;
+	size_t _read_cursor;
+
+	// Disable implicit copy support, code must request a copy to clone
+	message(message const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+	message& operator=(message const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+
+	static void release_callback(void* data, void* hint);
+
+	template<typename Object>
+	static void deleter_callback(void* data)
+	{
+		delete static_cast<Object*>(data);
+	}
+};
+
+}
+
+#endif /* ZMQPP_MESSAGE_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/poller.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/poller.hpp
new file mode 100644
index 0000000..45c762d
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/poller.hpp
@@ -0,0 +1,186 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_POLLER_HPP_
+#define ZMQPP_POLLER_HPP_
+
+#include <unordered_map>
+#include <vector>
+
+#include "compatibility.hpp"
+
+namespace zmqpp
+{
+
+class socket;
+typedef socket socket_t;
+
+/*!
+ * Polling wrapper.
+ *
+ * Allows access to polling for any number of sockets or file descriptors.
+ */
+class poller
+{
+public:
+	static const long wait_forever; /*!< Block forever flag, default setting. */
+
+	static const short poll_none;   /*!< No polling flags set. */
+	static const short poll_in;     /*!< Monitor inbound flag. */
+	static const short poll_out;    /*!< Monitor output flag. */
+	static const short poll_error;  /*!< Monitor error flag.\n Only for file descriptors. */
+
+	/*!
+	 * Construct an empty polling model.
+	 */
+	poller();
+
+	/*!
+	 * Cleanup poller.
+	 *
+	 * Any sockets will need to be closed separately.
+	 */
+	~poller();
+
+	/*!
+	 * Add a socket to the polling model and set which events to monitor.
+	 *
+	 * \param socket the socket to monitor.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void add(socket_t& socket, short const& event = poll_in);
+
+	/*!
+	 * Add a file descriptor to the polling model and set which events to monitor.
+	 *
+	 * \param descriptor the file descriptor to monitor.
+	 * \param event the event flags to monitor.
+	 */
+	void add(int const& descriptor, short const& event = poll_in | poll_error);
+
+	/*!
+	 * Check if we are monitoring a given socket with this poller.
+	 *
+	 * \param socket the socket to check.
+	 * \return true if it is there.
+	 */
+	bool has(socket_t const& socket);
+
+	/*!
+	 * Check if we are monitoring a given file descriptor with this poller.
+	 *
+	 * \param descriptor the file descriptor to check.
+	 * \return true if it is there.
+	 */
+	bool has(int const& descriptor);
+
+	/*!
+	 * Stop monitoring a socket.
+	 *
+	 * \param socket the socket to stop monitoring.
+	 */
+	void remove(socket_t const& socket);
+
+	/*!
+	 * Stop monitoring a file descriptor.
+	 *
+	 * \param descriptor the file descriptor to stop monitoring.
+	 */
+	void remove(int const& descriptor);
+
+	/*!
+	 * Update the monitored event flags for a given socket.
+	 *
+	 * \param socket the socket to update event flags.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void check_for(socket_t const& socket, short const& event);
+
+	/*!
+	 * Update the monitored event flags for a given file descriptor.
+	 *
+	 * \param descriptor the file descriptor to update event flags.
+	 * \param event the event flags to monitor on the socket.
+	 */
+	void check_for(int const& descriptor, short const& event);
+
+	/*!
+	 * Poll for monitored events.
+	 *
+	 * By default this method will block forever or until at least one of the monitored
+	 * sockets or file descriptors has events.
+	 *
+	 * If a timeout is set and was reached then this function returns false.
+	 *
+	 * \param timeout milliseconds to timeout.
+	 * \return true if there is an event..
+	 */
+	bool poll(long timeout = wait_forever);
+
+	/*!
+	 * Get the event flags triggered for a socket.
+	 *
+	 * \param socket the socket to get triggered event flags for.
+	 * \return the event flags.
+	 */
+	short events(socket_t const& socket) const;
+
+	/*!
+	 * Get the event flags triggered for a file descriptor.
+	 *
+	 * \param descriptor the file descriptor to get triggered event flags for.
+	 * \return the event flags.
+	 */
+	short events(int const& descriptor) const;
+
+	/*!
+	 * Check either a file descriptor or socket for input events.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * \param watchable either a file descriptor or socket known to the poller.
+	 * \return true if there is input.
+	 */
+	template<typename Watched>
+	bool has_input(Watched const& watchable) const { return events(watchable) & poll_in; }
+
+	/*!
+	 * Check either a file descriptor or socket for output events.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * \param watchable either a file descriptor or socket known to the poller.
+	 * \return true if there is output.
+	 */
+	template<typename Watched>
+	bool has_output(Watched const& watchable) const { return events(watchable) & poll_out; }
+
+	/*!
+	 * Check a file descriptor.
+	 *
+	 * Templated helper method that calls through to event and checks for a given flag
+	 *
+	 * Technically this template works for sockets as well but the error flag is never set for
+	 * sockets so I have no idea why someone would call it.
+	 *
+	 * \param watchable a file descriptor know to the poller.
+	 * \return true if there is an error.
+	 */
+	template<typename Watched>
+	bool has_error(Watched const& watchable) const { return events(watchable) & poll_error; }
+
+private:
+	std::vector<zmq_pollitem_t> _items;
+	std::unordered_map<void *, size_t> _index;
+	std::unordered_map<int, size_t> _fdindex;
+
+	void reindex(size_t const index);
+};
+
+}
+
+#endif /* ZMQPP_POLLER_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket.hpp
new file mode 100644
index 0000000..09ea71f
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket.hpp
@@ -0,0 +1,500 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_HPP_
+#define ZMQPP_SOCKET_HPP_
+
+#include <cstring>
+#include <string>
+#include <list>
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+
+#include "socket_types.hpp"
+#include "socket_options.hpp"
+
+namespace zmqpp
+{
+
+class context;
+class message;
+
+typedef std::string endpoint_t;
+typedef context     context_t;
+typedef message     message_t;
+
+/*!
+ * The socket class represents the zmq sockets.
+ *
+ * A socket can be bound and/or connected to as many endpoints as required
+ * with the sole exception of a ::pair socket.
+ *
+ * The routing is handled by zmq based on the type set.
+ *
+ * The bound side of an inproc connection must occur first and inproc can only
+ * connect to other inproc sockets of the same context.
+ *
+ * This class is c++0x move supporting and cannot be copied.
+ */
+class socket
+{
+public:
+	static const int normal     = 0;            /*!< /brief default send type, no flags set */
+#if (ZMQ_VERSION_MAJOR == 2)
+	static const int dont_wait  = ZMQ_NOBLOCK;  /*!< /brief don't block if sending is not currently possible  */
+#else
+	static const int dont_wait  = ZMQ_DONTWAIT; /*!< /brief don't block if sending is not currently possible  */
+#endif
+	static const int send_more  = ZMQ_SNDMORE;  /*!< /brief more parts will follow this one */
+#ifdef ZMQ_EXPERIMENTAL_LABELS
+	static const int send_label = ZMQ_SNDLABEL; /*!< /brief this message part is an internal zmq label */
+#endif
+
+	/*!
+	 * Create a socket for a given type.
+	 *
+	 * \param context the zmq context under which the socket will live
+	 * \param type a valid ::socket_type for the socket
+	 */
+	socket(context_t const& context, socket_type const& type);
+
+	/*!
+	 * This will close any socket still open before returning
+	 */
+	~socket();
+
+	/*!
+	 * Get the type of the socket, this works on zmqpp types and not the zmq internal types.
+	 * Use the socket::get method if you wish to intergoate the zmq internal ones.
+	 *
+	 * \return the type of the socket
+	 */
+	socket_type type() const { return _type; }
+
+	/*!
+	 * Asynchronously binds to an endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to bind to
+	 */
+	void bind(endpoint_t const& endpoint);
+
+	/*!
+	 * Unbinds from a previously bound endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to bind to
+	 */
+	void unbind(endpoint_t const& endpoint);
+
+	/*!
+	 * Asynchronously connects to an endpoint.
+	 * If the endpoint is not inproc then zmq will happily keep trying
+	 * to connect until there is something there.
+	 *
+	 * Inproc sockets must have a valid target already bound before connection
+	 * will work.
+	 *
+	 * \param endpoint the zmq endpoint to connect to
+	 */
+	void connect(endpoint_t const& endpoint);
+
+	/*!
+	 * Asynchronously connects to multiple endpoints.
+	 * If the endpoint is not inproc then zmq will happily keep trying
+	 * to connect until there is something there.
+	 *
+	 * Inproc sockets must have a valid target already bound before connection
+	 * will work.
+	 *
+	 * This is a helper function that wraps the single item connect in a loop
+	 *
+	 * \param connections_begin the starting iterator for zmq endpoints.
+	 * \param connections_end the final iterator for zmq endpoints.
+	 */
+	template<typename InputIterator>
+	void connect(InputIterator const& connections_begin, InputIterator const& connections_end)
+	{
+		for(InputIterator it = connections_begin; it != connections_end; ++it)
+		{
+			connect(*it);
+		}
+	}
+
+
+	/*!
+	 * Disconnects a previously connected endpoint.
+	 *
+	 * \param endpoint the zmq endpoint to disconnect from
+	 */
+	void disconnect(endpoint_t const& endpoint);
+
+	/*!
+	 * Disconnects from multiple previously connected endpoints.
+	 *
+	 * This is a helper function that wraps the single item disconnect in a loop
+	 *
+	 * \param disconnections_begin the starting iterator for zmq endpoints.
+	 * \param disconnections_end the final iterator for zmq endpoints.
+	 */
+	template<typename InputIterator>
+	void disconnect(InputIterator const& disconnections_begin, InputIterator const& disconnections_end)
+	{
+		for(InputIterator it = disconnections_begin; it != disconnections_end; ++it)
+		{
+			disconnect(*it);
+		}
+	}
+
+	/*!
+	 * Closes the internal zmq socket and marks this instance
+	 * as invalid.
+	 */
+	void close();
+
+	/*!
+	 * Sends the message over the connection, this may be a multipart message.
+	 *
+	 * If dont_block is true and we are unable to add a new message then this
+	 * function will return false.
+	 *
+	 * \param message message to send
+	 * \param dont_block boolean to dictate if we wait while sending.
+	 * \return true if message sent, false if it would have blocked
+	 */
+	bool send(message_t& message, bool const& dont_block = false);
+
+	/*!
+	 * Gets a message from the connection, this may be a multipart message.
+	 *
+	 * If dont_block is true and we are unable to get a message then this
+	 * function will return false.
+	 *
+	 * \param message reference to fill with received data
+	 * \param dont_block boolean to dictate if we wait for data.
+	 * \return true if message sent, false if it would have blocked
+	 */
+	bool receive(message_t& message, bool const& dont_block = false);
+
+	/*!
+	 * Sends the byte data held by the string as the next message part.
+	 *
+	 * If the socket::DONT_WAIT flag and we are unable to add a new message to
+	 * socket then this function will return false.
+	 *
+	 * \param string message part to send
+	 * \param flags message send flags
+	 * \return true if message part sent, false if it would have blocked
+	 */
+	bool send(std::string const& string, int const& flags = normal);
+
+	/*!
+	 * If there is a message ready then get the next part as a string
+	 *
+	 * If the socket::DONT_WAIT flag and there is no message ready to receive
+	 * then this function will return false.
+	 *
+	 * \param string message part to receive into
+	 * \param flags message receive flags
+	 * \return true if message part received, false if it would have blocked
+	 */
+	bool receive(std::string& string, int const& flags = normal);
+
+	/*!
+	 * Sends the byte data pointed to by buffer as the next part of the message.
+	 *
+	 * If the socket::DONT_WAIT flag and we are unable to add a new message to
+	 * socket then this function will return false.
+	 *
+	 * \param buffer byte buffer pointer to start writing from
+	 * \param length max length of the buffer
+	 * \param flags message send flags
+	 * \return true if message part sent, false if it would have blocked
+	 */
+	bool send_raw(char const* buffer, int const& length, int const& flags = normal);
+
+	/*!
+	 * \warning If the buffer is not large enough for the message part then the
+	 *       data will be truncated. The rest of the part is lost forever.
+	 *
+	 * If there is a message ready then get the next part of it as a raw
+	 * byte buffer.
+	 *
+	 * If the socket::DONT_WAIT flag and there is no message ready to receive
+	 * then this function will return false.
+	 *
+	 * \param buffer byte buffer pointer to start writing to
+	 * \param length max length of the buffer
+	 * \param flags message receive flags
+	 * \return true if message part received, false if it would have blocked
+	 */
+	bool receive_raw(char* buffer, int& length, int const& flags = normal);
+
+	/*!
+	 *
+	 * Subscribe to a topic
+	 *
+	 * Helper function that is equivalent of calling
+	 * \code
+	 * set(zmqpp::socket_option::subscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * \param topic the topic to subscribe to.
+	 */
+	void subscribe(std::string const& topic);
+
+	/*!
+	 * Subscribe to a topic
+	 *
+	 * Helper function that is equivalent of a loop calling
+	 * \code
+	 * set(zmqpp::socket_option::subscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * Generally this will be used with stl collections using begin() and
+	 * end() functions to get the iterators.
+	 * For this reason the end loop runs until the end iterator, not inclusive
+	 * of it.
+	 *
+	 * \param topics_begin the starting iterator for topics.
+	 * \param topics_end the final iterator for topics.
+	 */
+	template<typename InputIterator>
+	void subscribe(InputIterator const& topics_begin, InputIterator const& topics_end)
+	{
+		for(InputIterator it = topics_begin; it != topics_end; ++it)
+		{
+			subscribe(*it);
+		}
+	}
+
+	/*!
+	 * Unsubscribe from a topic
+	 *
+	 * Helper function that is equivalent of calling
+	 * \code
+	 * set(zmqpp::socket_option::unsubscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * \param topic the topic to unsubscribe from.
+	 */
+	void unsubscribe(std::string const& topic);
+
+	/*!
+	 * Unsubscribe from a topic
+	 *
+	 * Helper function that is equivalent of a loop calling
+	 * \code
+	 * set(zmqpp::socket_option::unsubscribe, topic);
+	 * \endcode
+	 *
+	 * This method is only useful for subscribe type sockets.
+	 *
+	 * Generally this will be used with stl collections using begin() and
+	 * end() functions to get the iterators.
+	 * For this reason the end loop runs until the end iterator, not inclusive
+	 * of it.
+	 *
+	 * \param topics_begin the starting iterator for topics.
+	 * \param topics_end the final iterator for topics.
+	 */
+	template<typename InputIterator>
+	void unsubscribe(InputIterator const& topics_begin, InputIterator const& topics_end)
+	{
+		for(InputIterator it = topics_begin; it != topics_end; ++it)
+		{
+			unsubscribe(*it);
+		}
+	}
+
+	/*!
+	 * If the last receive part call to the socket resulted
+	 * in a label or a non-terminating part of a multipart
+	 * message this will return true.
+	 *
+	 * \return true if there are more parts
+	 */
+	bool has_more_parts() const;
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, int const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \since 2.0.0 (built against 0mq version 3.1.x or later)
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, bool const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, uint64_t const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	void set(socket_option const& option, int64_t const& value);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param pointer to raw byte value to set the option to
+	 * \param length the size of the raw byte value
+	 */
+	void set(socket_option const& option, char const* value, size_t const length);
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param pointer to null terminated cstring value to set the option to
+	 */
+	inline void set(socket_option const& option, char const* value) { set(option, value, strlen(value)); }
+
+	/*!
+	 * Set the value of an option in the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value to set the option to
+	 */
+	inline void set(socket_option const& option, std::string const& value) { set(option, value.c_str(), value.length()); }
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced int to return value in
+	 */
+	void get(socket_option const& option, int& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced bool to return value in
+	 */
+	void get(socket_option const& option, bool& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced uint64_t to return value in
+	 */
+	void get(socket_option const& option, uint64_t& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced uint64_t to return value in
+	 */
+	void get(socket_option const& option, int64_t& value) const;
+
+	/*!
+	 * Get a socket option from the underlaying zmq socket.
+	 *
+	 * \param option a valid ::socket_option
+	 * \param value referenced std::string to return value in
+	 */
+	void get(socket_option const& option, std::string& value) const;
+
+	/*!
+	 * For those that don't want to get into a referenced value this templated method
+	 * will return the value instead.
+	 *
+	 * \param option a valid ::socket_option
+	 * \return socket option value
+	 */
+	template<typename Type>
+	Type get(socket_option const& option) const
+	{
+		Type value = Type();
+		get(option, value);
+		return value;
+	}
+
+	/*!
+	 * Move constructor
+	 *
+	 * Moves the internals of source to this object, there is no guarantee
+	 * that source will be left in a valid state.
+	 *
+	 * This constructor is noexcept and so will not throw exceptions
+	 *
+	 * \param source target socket to steal internals from
+	 */
+	socket(socket&& source) noexcept;
+
+	/*!
+	 * Move operator
+	 *
+	 * Moves the internals of source to this object, there is no guarantee
+	 * that source will be left in a valid state.
+	 *
+	 * This function is noexcept and so will not throw exceptions
+	 *
+	 * \param source target socket to steal internals from
+	 * \return socket reference to this
+	 */
+	socket& operator=(socket&& source) noexcept;
+
+	/*!
+	 * Check the socket is still valid
+	 *
+	 * This tests the internal state of the socket.
+	 * If creation failed for some reason or if the move functions were used
+	 * to move the socket internals to another instance this will return false.
+	 *
+	 * \return true if the socket is valid
+	 */
+	operator bool() const;
+
+	/*!
+	 * Access to the raw 0mq context
+	 *
+	 * \return void pointer to the underlying 0mq socket
+	 */
+	operator void*() const;
+
+private:
+	void* _socket;
+	socket_type _type;
+	zmq_msg_t _recv_buffer;
+
+	// No copy
+	socket(socket const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+	socket& operator=(socket const&) noexcept ZMQPP_EXPLICITLY_DELETED;
+
+	void track_message(message_t const&, uint32_t const&, bool&);
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket_options.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket_options.hpp
new file mode 100644
index 0000000..3fd3dfc
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket_options.hpp
@@ -0,0 +1,75 @@
+/**
+ * \file
+ *
+ * \date   23 Sep 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_OPTIONS_HPP_
+#define ZMQPP_SOCKET_OPTIONS_HPP_
+
+namespace zmqpp
+{
+
+/** \todo Expand the information on the options to make it actually useful. */
+/*!
+ * \brief possible Socket options in zmq
+ */
+
+enum class socket_option {
+	affinity                  = ZMQ_AFFINITY,          /*!< I/O thread affinity */
+	identity                  = ZMQ_IDENTITY,          /*!< Socket identity */
+	subscribe                 = ZMQ_SUBSCRIBE,         /*!< Add topic subscription - set only */
+	unsubscribe               = ZMQ_UNSUBSCRIBE,       /*!< Remove topic subscription - set only */
+	rate                      = ZMQ_RATE,              /*!< Multicast data rate */
+	send_buffer_size          = ZMQ_SNDBUF,            /*!< Kernel transmission buffer size */
+	receive_buffer_size       = ZMQ_RCVBUF,            /*!< Kernel receive buffer size */
+	receive_more              = ZMQ_RCVMORE,           /*!< Can receive more parts - get only */
+	file_descriptor           = ZMQ_FD,                /*!< Socket file descriptor - get only */
+	events                    = ZMQ_EVENTS,            /*!< Socket event flags - get only */
+	type                      = ZMQ_TYPE,              /*!< Socket type - get only */
+	linger                    = ZMQ_LINGER,            /*!< Socket linger timeout */
+	backlog                   = ZMQ_BACKLOG,           /*!< Maximum length of outstanding connections - get only */
+#if (ZMQ_VERSION_MAJOR == 2)
+    // Note that this is inverse of the zmq names for version 2.x
+	recovery_interval_seconds = ZMQ_RECOVERY_IVL,      /*!< Multicast recovery interval in seconds */
+	recovery_interval         = ZMQ_RECOVERY_IVL_MSEC, /*!< Multicast recovery interval in milliseconds */
+#else
+	recovery_interval         = ZMQ_RECOVERY_IVL,      /*!< Multicast recovery interval in milliseconds */
+#endif
+	reconnect_interval        = ZMQ_RECONNECT_IVL,     /*!< Reconnection interval */
+	reconnect_interval_max    = ZMQ_RECONNECT_IVL_MAX, /*!< Maximum reconnection interval */
+	receive_timeout           = ZMQ_RCVTIMEO,          /*!< Maximum inbound block timeout */
+	send_timeout              = ZMQ_SNDTIMEO,          /*!< Maximum outbound block timeout */
+#if (ZMQ_VERSION_MAJOR == 2)
+	high_water_mark           = ZMQ_HWM,               /*!< High-water mark for all messages */
+	swap_size                 = ZMQ_SWAP,              /*!< Maximum socket swap size in bytes */
+	multicast_loopback        = ZMQ_MCAST_LOOP,        /*!< Allow multicast packet loopback */
+#else
+	max_messsage_size         = ZMQ_MAXMSGSIZE,        /*!< Maximum inbound message size */
+	send_high_water_mark      = ZMQ_SNDHWM,            /*!< High-water mark for outbound messages */
+	receive_high_water_mark   = ZMQ_RCVHWM,            /*!< High-water mark for inbound messages */
+	multicast_hops            = ZMQ_MULTICAST_HOPS,    /*!< Maximum number of multicast hops */
+#endif
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 1))
+	ipv4_only                 = ZMQ_IPV4ONLY,
+#endif
+#if (ZMQ_VERSION_MAJOR > 3) or ((ZMQ_VERSION_MAJOR == 3) and (ZMQ_VERSION_MINOR >= 2))
+	delay_attach_on_connect   = ZMQ_DELAY_ATTACH_ON_CONNECT, /*!< Delay buffer attachment until connect complete */
+	last_endpoint             = ZMQ_LAST_ENDPOINT,           /*!< Last bound endpoint - get only */
+	router_mandatory          = ZMQ_ROUTER_MANDATORY,        /*!< Require routable messages - set only */
+	xpub_verbose              = ZMQ_XPUB_VERBOSE,            /*!< Pass on existing subscriptions - set only */
+	tcp_keepalive             = ZMQ_TCP_KEEPALIVE,           /*!< Enable TCP keepalives */
+	tcp_keepalive_idle        = ZMQ_TCP_KEEPALIVE_IDLE,      /*!< TCP keepalive idle count (generally retry count) */
+	tcp_keepalive_count       = ZMQ_TCP_KEEPALIVE_CNT,       /*!< TCP keepalive retry count */
+	tcp_keepalive_interval    = ZMQ_TCP_KEEPALIVE_INTVL,     /*!< TCP keepalive interval */
+	tcp_accept_filter         = ZMQ_TCP_ACCEPT_FILTER,       /*!< Filter inbound connections - set only */
+#endif
+#ifdef ZMQ_EXPERIMENTAL_LABELS
+	receive_label             = ZMQ_RCVLABEL,          /*!< Received label part - get only */
+#endif
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_OPTIONS_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket_types.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket_types.hpp
new file mode 100644
index 0000000..e59e71c
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/socket_types.hpp
@@ -0,0 +1,148 @@
+/**
+ * \file
+ *
+ * \date   23 Sep 2011
+ * \author Ben Gray (\@benjamg)
+ */
+
+#ifndef ZMQPP_SOCKET_TYPES_HPP_
+#define ZMQPP_SOCKET_TYPES_HPP_
+
+namespace zmqpp
+{
+
+/*!
+ * \brief Socket types allowed by zmq
+ *
+ * The socket type choose at creation must be one of these types.
+ *
+ * Each is designed for a different use and has different limitations.
+ */
+enum class socket_type {
+	/*!
+	 * One to one - two way connection.\n
+	 * Connect to ::pair.\n
+	 * A \c pair socket has to be connected only one other pair socket and allows
+	 * two way communication between them.
+	 */
+	pair       = ZMQ_PAIR,
+
+	/*!
+	 * One to many - fan out.\n
+	 * Connect to ::subscribe or ::xsubscribe.\n
+	 * Socket is send only.\n
+	 * Socket will drop messages and not block.\n
+	 * \c publish sockets allow sending of the same message to many subscribers
+	 * each subscriber can limit what is sent through the socket_option::subscribe
+	 * settings.
+	 */
+	publish    = ZMQ_PUB,
+
+	/*!
+	 * \note It seems doxygen can't work out which data is for the socket type and
+	 * which is for the socket option so both get listed for both.
+	 *
+	 * One to many - fair-queued.\n
+	 * Connect to ::publish or ::xpublish.\n
+	 * Socket is receive only.\n
+	 * The \c subscribe socket can connection to any number of publishers and will
+	 * fairly pull messages from each. The socket_option::subscribe settings can
+	 * be use to limit which messages are received and by default none are.
+	 */
+	subscribe  = ZMQ_SUB,
+
+	/*!
+	 * One to many - fair-queued.\n
+	 * Connect to ::push.\n
+	 * Socket is receive only.\n
+	 * The \c pull socket fairly pulls messages from all pushers it is connected
+	 * to.
+	 */
+	pull       = ZMQ_PULL,
+
+	/*!
+	 * One to many - load-balanced.\n
+	 * Connect to ::pull.\n
+	 * Socket is send only.\n
+	 * Socket will block if unable to send.\n
+	 * The \c push socket fairly distributes messages between any connected
+	 * puller sockets.
+	 */
+	push       = ZMQ_PUSH,
+
+	/*!
+	 * One to many - fair-queued outgoing, last peer incoming.\n
+	 * Connect to ::reply or ::xreply.\n
+	 * Socket flips between send and receive only.\n
+	 * Socket will block if unable to send.\n
+	 * The \c request socket will fairly balance requests sent out to a
+	 * replier and then can only be used to receive until that replier
+	 * sends a reply.
+	 */
+	request    = ZMQ_REQ,
+
+	/*!
+	 * One to many - load-balanced incoming, last peer outgoing.\n
+	 * Connect to ::request or ::xrequest.\n
+	 * Socket flips between send and receive only.\n
+	 * Socket will drop messages and not block.\n
+	 * The \c reply socket can only receive until it pulls a message from a
+	 * requester at which point it can only send until the reply is sent.
+	 */
+	reply      = ZMQ_REP,
+
+	/*!
+	 * One to many - fan out.\n
+	 * Connect to ::subscribe or ::xsubscribe.\n
+	 * Socket is send only with the exception of special subscription messages.\n
+	 * Socket will drop messages and not block.\n
+	 * \c xpublish act the same as ::publish sockets however also allow special
+	 * subscription messages to be received from subscribers.
+	 */
+	xpublish   = ZMQ_XPUB,
+
+	/*!
+	 * One to many - fair-queued.\n
+	 * Connect to ::publish or ::xpublish.\n
+	 * Socket is receive only with the exception of special subscription messages\n
+	 * \c xsubscribe act the same as ::subscribe sockets however also allow special
+	 * subscription messages to be send to connected publishers.
+	 */
+	xsubscribe = ZMQ_XSUB,
+
+	/*!
+	 * One to many - fair-queued incoming, load-balanced outgoing.\n
+	 * Connect to ::reply or ::xreply.\n
+	 * Socket will block if unable to send.\n
+	 * An \c xrequest socket balances requests between repliers and pulls replies
+	 * back in a fair manner. Each request is expected to have exactly one reply.
+	 */
+	xrequest   = ZMQ_XREQ,
+
+	/*!
+	 * One to many - fair-queued incoming, targeted outgoing.\n
+	 * Connect to ::request or ::xrequest.\n
+	 * Socket will drop messages and not block.\n
+	 * An \c xreply socket fairly pulls in requests from requesters and will
+	 * label requests so it can return replies back to the correct target.
+	 */
+	xreply     = ZMQ_XREP,
+
+	// To match for people who prefer the shorter versions
+	pub        = ZMQ_PUB,    /*!< version of ::publish to match zmq name convention */
+	sub        = ZMQ_SUB,    /*!< version of ::subscribe to match zmq name convention */
+	req        = ZMQ_REQ,    /*!< version of ::request to match zmq name convention */
+	rep        = ZMQ_REP,    /*!< version of ::reply to match zmq name convention */
+	xpub       = ZMQ_XPUB,   /*!< version of ::xpublish to match zmq name convention */
+	xsub       = ZMQ_XSUB,   /*!< version of ::xsubscribe to match zmq name convention */
+	xreq       = ZMQ_XREQ,   /*!< version of ::xrequest to match zmq name convention */
+	xrep       = ZMQ_XREP,   /*!< version of ::xreply to match zmq name convention */
+
+	// For completion
+	router     = ZMQ_ROUTER, /*!< \deprecated Matches zmq 2.x xrep functionality. */
+	dealer     = ZMQ_DEALER  /*!< \deprecated Matches zmq 2.x xreq functionality. */
+};
+
+}
+
+#endif /* ZMQPP_SOCKET_TYPES_HPP_ */
diff --git a/Source/ThirdParty/libZmq/include/Win64/zmqpp/zmqpp.hpp b/Source/ThirdParty/libZmq/include/Win64/zmqpp/zmqpp.hpp
new file mode 100644
index 0000000..92a47ce
--- /dev/null
+++ b/Source/ThirdParty/libZmq/include/Win64/zmqpp/zmqpp.hpp
@@ -0,0 +1,111 @@
+/**
+ * \file
+ *
+ * \date   9 Aug 2011
+ * \author Ben Gray (\@benjamg)
+ *
+ * License: http://www.opensource.org/licenses/MIT
+ *
+ * Copyright (C) 2011 by Ben Gray
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef ZMQPP_ZMQPP_HPP_
+#define ZMQPP_ZMQPP_HPP_
+
+/**
+ * \def ZMQPP_VERSION_MAJOR
+ * zmqpp major version number, generated at compile time
+ */
+#define	ZMQPP_VERSION_MAJOR BUILD_VERSION_MAJOR
+
+/**
+ * \def ZMQPP_VERSION_MINOR
+ * zmqpp minor version number, generated at compile time
+ */
+#define	ZMQPP_VERSION_MINOR BUILD_VERSION_MINOR
+
+/**
+ * \def ZMQPP_VERSION_REVISION
+ * zmqpp version revision number, generated at compile time
+ */
+#define	ZMQPP_VERSION_REVISION BUILD_VERSION_REVISION
+
+#include <zmq.h>
+
+#include "compatibility.hpp"
+#include "context.hpp"
+#include "exception.hpp"
+#include "message.hpp"
+#include "poller.hpp"
+#include "socket.hpp"
+
+/*!
+ * \brief C++ wrapper around zmq
+ *
+ * All zmq++ / zmqpp functions, constants and classes live within this namespace,
+ */
+namespace zmqpp
+{
+
+/*!
+ * Returns the current major.minor.revision version number as a string.
+ *
+ * \return string version number.
+ */
+std::string version();
+
+/*!
+ * Retrieve the parts of the zmqpp version number.
+ *
+ * Set the three parameters to values representing the zmqpp version number.
+ * These values are generated at library compile time.
+ *
+ * \param major an unsigned 8 bit reference to set to the major version.
+ * \param minor an unsigned 8 bit reference to set to the minor version.
+ * \param revision an unsigned 8 bit reference to set the current revision.
+ */
+void version(uint8_t& major, uint8_t& minor, uint8_t& revision);
+
+/*!
+ * Retrieve the parts of the 0mq version this library was built against.
+ *
+ * Because sections of the library are optionally compiled in or ignored
+ * depending on the version of 0mq it was compiled against this method is
+ * provided to allow sanity checking for usage.
+ *
+ * Set the three parameters to values representing the 0mq version number.
+ * These values are generated at library compile time.
+ *
+ * \param major an unsigned 8 bit reference to set to the major version.
+ * \param minor an unsigned 8 bit reference to set to the minor version.
+ * \param revision an unsigned 8 bit reference to set the current revision.
+ */
+void zmq_version(uint8_t& major, uint8_t& minor, uint8_t& patch);
+
+typedef context     context_t;   /*!< \brief context type */
+typedef std::string endpoint_t;  /*!< \brief endpoint type */
+typedef message     message_t;   /*!< \brief message type */
+typedef poller      poller_t;    /*!< \brief poller type */
+typedef socket      socket_t;    /*!< \brief socket type */
+
+}
+
+#endif /* ZMQPP_ZMQPP_HPP_ */
diff --git a/Source/ThirdParty/libZmq/lib/Mac/libzmq.a b/Source/ThirdParty/libZmq/lib/Mac/libzmq.a
new file mode 100644
index 0000000..dd8251a
--- /dev/null
+++ b/Source/ThirdParty/libZmq/lib/Mac/libzmq.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cce825bfff0cebb47295b823e30468f9d072e757267f55295cde97dffe06c790
+size 1421664
diff --git a/Source/ThirdParty/libZmq/lib/Win64/libzmq-v141-mt-4_3_2.lib b/Source/ThirdParty/libZmq/lib/Win64/libzmq-v141-mt-4_3_2.lib
new file mode 100644
index 0000000..6bf9bea
--- /dev/null
+++ b/Source/ThirdParty/libZmq/lib/Win64/libzmq-v141-mt-4_3_2.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65ca35b759c3e60ea74e6eaaf97e8000e0b61595f678ad3a3df1324dcdbe4ae1
+size 20868
diff --git a/Source/ThirdParty/libZmq/libZmq.Build.cs b/Source/ThirdParty/libZmq/libZmq.Build.cs
new file mode 100644
index 0000000..f15f9b4
--- /dev/null
+++ b/Source/ThirdParty/libZmq/libZmq.Build.cs
@@ -0,0 +1,42 @@
+// Fill out your copyright notice in the Description page of Project Settings.
+
+using System.IO;
+using UnrealBuildTool;
+
+public class libZmq : ModuleRules
+{
+	private string BinariesPath
+	{
+		get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../../../Binaries/", Target.Platform.ToString())); }
+	}
+
+    string ModuleDirectoryFullPath
+    {
+        get { return System.IO.Path.GetFullPath(ModuleDirectory); }
+    }
+
+	public libZmq(ReadOnlyTargetRules Target) : base(Target)
+	{
+		Type = ModuleType.External;
+
+		if (Target.Platform == UnrealTargetPlatform.Win64)
+		{
+			PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "include/Win64")); 
+			PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "lib/Win64/libzmq-v141-mt-4_3_2.lib"));
+			RuntimeDependencies.Add(Path.Combine(BinariesPath, "libzmq-v141-mt-4_3_2.dll"));
+			RuntimeDependencies.Add(Path.Combine(BinariesPath, "libsodium.dll"));
+			PrivateDependencyModuleNames.Add("zlib");
+            PublicDelayLoadDLLs.Add("libsodium.dll");
+            PublicDelayLoadDLLs.Add("libzmq-v141-mt-4_3_2.dll");
+        }
+		else if (Target.Platform == UnrealTargetPlatform.Linux)
+		{
+			//string LibsPath = Path.Combine(ModuleDirectoryFullPath, "lib", "Linux");
+			PublicIncludePaths.Add(Path.Combine(ModuleDirectory, "include/Linux")); 
+			PublicAdditionalLibraries.Add(Path.Combine(BinariesPath,"libzmq.so"));
+			RuntimeDependencies.Add(Path.Combine(BinariesPath,"libzmq.so"));
+			RuntimeDependencies.Add(Path.Combine(BinariesPath,"libzmq.so.5"));
+			RuntimeDependencies.Add(Path.Combine(BinariesPath,"libzmq.so.5.2.4"));
+		}
+	}
+}
diff --git a/Source/ThirdParty/mongodb_c/.gitignore b/Source/ThirdParty/mongodb_c/.gitignore
new file mode 100644
index 0000000..e831038
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/.gitignore
@@ -0,0 +1 @@
+src
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_c/Linux/bin/mongoc-stat b/Source/ThirdParty/mongodb_c/Linux/bin/mongoc-stat
new file mode 100644
index 0000000..aad3343
Binary files /dev/null and b/Source/ThirdParty/mongodb_c/Linux/bin/mongoc-stat differ
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson.h
new file mode 100644
index 0000000..cfe6d06
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Including bson.h is superseded. Use bson/bson.h instead. */
+#include "bson/bson.h"
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bcon.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bcon.h
new file mode 100644
index 0000000..0562af2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bcon.h
@@ -0,0 +1,295 @@
+/*
+ * @file bcon.h
+ * @brief BCON (BSON C Object Notation) Declarations
+ */
+
+#include "bson-prelude.h"
+
+/*    Copyright 2009-2013 MongoDB, Inc.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef BCON_H_
+#define BCON_H_
+
+#include "bson.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BCON_STACK_MAX 100
+
+#define BCON_ENSURE_DECLARE(fun, type)                 \
+   static BSON_INLINE type bcon_ensure_##fun (type _t) \
+   {                                                   \
+      return _t;                                       \
+   }
+
+#define BCON_ENSURE(fun, val) bcon_ensure_##fun (val)
+
+#define BCON_ENSURE_STORAGE(fun, val) bcon_ensure_##fun (&(val))
+
+BCON_ENSURE_DECLARE (const_char_ptr, const char *)
+BCON_ENSURE_DECLARE (const_char_ptr_ptr, const char **)
+BCON_ENSURE_DECLARE (double, double)
+BCON_ENSURE_DECLARE (double_ptr, double *)
+BCON_ENSURE_DECLARE (const_bson_ptr, const bson_t *)
+BCON_ENSURE_DECLARE (bson_ptr, bson_t *)
+BCON_ENSURE_DECLARE (subtype, bson_subtype_t)
+BCON_ENSURE_DECLARE (subtype_ptr, bson_subtype_t *)
+BCON_ENSURE_DECLARE (const_uint8_ptr, const uint8_t *)
+BCON_ENSURE_DECLARE (const_uint8_ptr_ptr, const uint8_t **)
+BCON_ENSURE_DECLARE (uint32, uint32_t)
+BCON_ENSURE_DECLARE (uint32_ptr, uint32_t *)
+BCON_ENSURE_DECLARE (const_oid_ptr, const bson_oid_t *)
+BCON_ENSURE_DECLARE (const_oid_ptr_ptr, const bson_oid_t **)
+BCON_ENSURE_DECLARE (int32, int32_t)
+BCON_ENSURE_DECLARE (int32_ptr, int32_t *)
+BCON_ENSURE_DECLARE (int64, int64_t)
+BCON_ENSURE_DECLARE (int64_ptr, int64_t *)
+BCON_ENSURE_DECLARE (const_decimal128_ptr, const bson_decimal128_t *)
+BCON_ENSURE_DECLARE (bool, bool)
+BCON_ENSURE_DECLARE (bool_ptr, bool *)
+BCON_ENSURE_DECLARE (bson_type, bson_type_t)
+BCON_ENSURE_DECLARE (bson_iter_ptr, bson_iter_t *)
+BCON_ENSURE_DECLARE (const_bson_iter_ptr, const bson_iter_t *)
+
+#define BCON_UTF8(_val) \
+   BCON_MAGIC, BCON_TYPE_UTF8, BCON_ENSURE (const_char_ptr, (_val))
+#define BCON_DOUBLE(_val) \
+   BCON_MAGIC, BCON_TYPE_DOUBLE, BCON_ENSURE (double, (_val))
+#define BCON_DOCUMENT(_val) \
+   BCON_MAGIC, BCON_TYPE_DOCUMENT, BCON_ENSURE (const_bson_ptr, (_val))
+#define BCON_ARRAY(_val) \
+   BCON_MAGIC, BCON_TYPE_ARRAY, BCON_ENSURE (const_bson_ptr, (_val))
+#define BCON_BIN(_subtype, _binary, _length)                     \
+   BCON_MAGIC, BCON_TYPE_BIN, BCON_ENSURE (subtype, (_subtype)), \
+      BCON_ENSURE (const_uint8_ptr, (_binary)),                  \
+      BCON_ENSURE (uint32, (_length))
+#define BCON_UNDEFINED BCON_MAGIC, BCON_TYPE_UNDEFINED
+#define BCON_OID(_val) \
+   BCON_MAGIC, BCON_TYPE_OID, BCON_ENSURE (const_oid_ptr, (_val))
+#define BCON_BOOL(_val) BCON_MAGIC, BCON_TYPE_BOOL, BCON_ENSURE (bool, (_val))
+#define BCON_DATE_TIME(_val) \
+   BCON_MAGIC, BCON_TYPE_DATE_TIME, BCON_ENSURE (int64, (_val))
+#define BCON_NULL BCON_MAGIC, BCON_TYPE_NULL
+#define BCON_REGEX(_regex, _flags)                                      \
+   BCON_MAGIC, BCON_TYPE_REGEX, BCON_ENSURE (const_char_ptr, (_regex)), \
+      BCON_ENSURE (const_char_ptr, (_flags))
+#define BCON_DBPOINTER(_collection, _oid)          \
+   BCON_MAGIC, BCON_TYPE_DBPOINTER,                \
+      BCON_ENSURE (const_char_ptr, (_collection)), \
+      BCON_ENSURE (const_oid_ptr, (_oid))
+#define BCON_CODE(_val) \
+   BCON_MAGIC, BCON_TYPE_CODE, BCON_ENSURE (const_char_ptr, (_val))
+#define BCON_SYMBOL(_val) \
+   BCON_MAGIC, BCON_TYPE_SYMBOL, BCON_ENSURE (const_char_ptr, (_val))
+#define BCON_CODEWSCOPE(_js, _scope)                                      \
+   BCON_MAGIC, BCON_TYPE_CODEWSCOPE, BCON_ENSURE (const_char_ptr, (_js)), \
+      BCON_ENSURE (const_bson_ptr, (_scope))
+#define BCON_INT32(_val) \
+   BCON_MAGIC, BCON_TYPE_INT32, BCON_ENSURE (int32, (_val))
+#define BCON_TIMESTAMP(_timestamp, _increment)                         \
+   BCON_MAGIC, BCON_TYPE_TIMESTAMP, BCON_ENSURE (int32, (_timestamp)), \
+      BCON_ENSURE (int32, (_increment))
+#define BCON_INT64(_val) \
+   BCON_MAGIC, BCON_TYPE_INT64, BCON_ENSURE (int64, (_val))
+#define BCON_DECIMAL128(_val) \
+   BCON_MAGIC, BCON_TYPE_DECIMAL128, BCON_ENSURE (const_decimal128_ptr, (_val))
+#define BCON_MAXKEY BCON_MAGIC, BCON_TYPE_MAXKEY
+#define BCON_MINKEY BCON_MAGIC, BCON_TYPE_MINKEY
+#define BCON(_val) \
+   BCON_MAGIC, BCON_TYPE_BCON, BCON_ENSURE (const_bson_ptr, (_val))
+#define BCON_ITER(_val) \
+   BCON_MAGIC, BCON_TYPE_ITER, BCON_ENSURE (const_bson_iter_ptr, (_val))
+
+#define BCONE_UTF8(_val) \
+   BCONE_MAGIC, BCON_TYPE_UTF8, BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_val))
+#define BCONE_DOUBLE(_val) \
+   BCONE_MAGIC, BCON_TYPE_DOUBLE, BCON_ENSURE_STORAGE (double_ptr, (_val))
+#define BCONE_DOCUMENT(_val) \
+   BCONE_MAGIC, BCON_TYPE_DOCUMENT, BCON_ENSURE_STORAGE (bson_ptr, (_val))
+#define BCONE_ARRAY(_val) \
+   BCONE_MAGIC, BCON_TYPE_ARRAY, BCON_ENSURE_STORAGE (bson_ptr, (_val))
+#define BCONE_BIN(subtype, binary, length)                                   \
+   BCONE_MAGIC, BCON_TYPE_BIN, BCON_ENSURE_STORAGE (subtype_ptr, (subtype)), \
+      BCON_ENSURE_STORAGE (const_uint8_ptr_ptr, (binary)),                   \
+      BCON_ENSURE_STORAGE (uint32_ptr, (length))
+#define BCONE_UNDEFINED BCONE_MAGIC, BCON_TYPE_UNDEFINED
+#define BCONE_OID(_val) \
+   BCONE_MAGIC, BCON_TYPE_OID, BCON_ENSURE_STORAGE (const_oid_ptr_ptr, (_val))
+#define BCONE_BOOL(_val) \
+   BCONE_MAGIC, BCON_TYPE_BOOL, BCON_ENSURE_STORAGE (bool_ptr, (_val))
+#define BCONE_DATE_TIME(_val) \
+   BCONE_MAGIC, BCON_TYPE_DATE_TIME, BCON_ENSURE_STORAGE (int64_ptr, (_val))
+#define BCONE_NULL BCONE_MAGIC, BCON_TYPE_NULL
+#define BCONE_REGEX(_regex, _flags)                       \
+   BCONE_MAGIC, BCON_TYPE_REGEX,                          \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_regex)), \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_flags))
+#define BCONE_DBPOINTER(_collection, _oid)                     \
+   BCONE_MAGIC, BCON_TYPE_DBPOINTER,                           \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_collection)), \
+      BCON_ENSURE_STORAGE (const_oid_ptr_ptr, (_oid))
+#define BCONE_CODE(_val) \
+   BCONE_MAGIC, BCON_TYPE_CODE, BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_val))
+#define BCONE_SYMBOL(_val)        \
+   BCONE_MAGIC, BCON_TYPE_SYMBOL, \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_val))
+#define BCONE_CODEWSCOPE(_js, _scope)                  \
+   BCONE_MAGIC, BCON_TYPE_CODEWSCOPE,                  \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_js)), \
+      BCON_ENSURE_STORAGE (bson_ptr, (_scope))
+#define BCONE_INT32(_val) \
+   BCONE_MAGIC, BCON_TYPE_INT32, BCON_ENSURE_STORAGE (int32_ptr, (_val))
+#define BCONE_TIMESTAMP(_timestamp, _increment)      \
+   BCONE_MAGIC, BCON_TYPE_TIMESTAMP,                 \
+      BCON_ENSURE_STORAGE (int32_ptr, (_timestamp)), \
+      BCON_ENSURE_STORAGE (int32_ptr, (_increment))
+#define BCONE_INT64(_val) \
+   BCONE_MAGIC, BCON_TYPE_INT64, BCON_ENSURE_STORAGE (int64_ptr, (_val))
+#define BCONE_DECIMAL128(_val)        \
+   BCONE_MAGIC, BCON_TYPE_DECIMAL128, \
+      BCON_ENSURE_STORAGE (const_decimal128_ptr, (_val))
+#define BCONE_MAXKEY BCONE_MAGIC, BCON_TYPE_MAXKEY
+#define BCONE_MINKEY BCONE_MAGIC, BCON_TYPE_MINKEY
+#define BCONE_SKIP(_val) \
+   BCONE_MAGIC, BCON_TYPE_SKIP, BCON_ENSURE (bson_type, (_val))
+#define BCONE_ITER(_val) \
+   BCONE_MAGIC, BCON_TYPE_ITER, BCON_ENSURE_STORAGE (bson_iter_ptr, (_val))
+
+#define BCON_MAGIC bson_bcon_magic ()
+#define BCONE_MAGIC bson_bcone_magic ()
+
+typedef enum {
+   BCON_TYPE_UTF8,
+   BCON_TYPE_DOUBLE,
+   BCON_TYPE_DOCUMENT,
+   BCON_TYPE_ARRAY,
+   BCON_TYPE_BIN,
+   BCON_TYPE_UNDEFINED,
+   BCON_TYPE_OID,
+   BCON_TYPE_BOOL,
+   BCON_TYPE_DATE_TIME,
+   BCON_TYPE_NULL,
+   BCON_TYPE_REGEX,
+   BCON_TYPE_DBPOINTER,
+   BCON_TYPE_CODE,
+   BCON_TYPE_SYMBOL,
+   BCON_TYPE_CODEWSCOPE,
+   BCON_TYPE_INT32,
+   BCON_TYPE_TIMESTAMP,
+   BCON_TYPE_INT64,
+   BCON_TYPE_DECIMAL128,
+   BCON_TYPE_MAXKEY,
+   BCON_TYPE_MINKEY,
+   BCON_TYPE_BCON,
+   BCON_TYPE_ARRAY_START,
+   BCON_TYPE_ARRAY_END,
+   BCON_TYPE_DOC_START,
+   BCON_TYPE_DOC_END,
+   BCON_TYPE_END,
+   BCON_TYPE_RAW,
+   BCON_TYPE_SKIP,
+   BCON_TYPE_ITER,
+   BCON_TYPE_ERROR,
+} bcon_type_t;
+
+typedef struct bcon_append_ctx_frame {
+   int i;
+   bool is_array;
+   bson_t bson;
+} bcon_append_ctx_frame_t;
+
+typedef struct bcon_extract_ctx_frame {
+   int i;
+   bool is_array;
+   bson_iter_t iter;
+} bcon_extract_ctx_frame_t;
+
+typedef struct _bcon_append_ctx_t {
+   bcon_append_ctx_frame_t stack[BCON_STACK_MAX];
+   int n;
+} bcon_append_ctx_t;
+
+typedef struct _bcon_extract_ctx_t {
+   bcon_extract_ctx_frame_t stack[BCON_STACK_MAX];
+   int n;
+} bcon_extract_ctx_t;
+
+BSON_EXPORT (void)
+bcon_append (bson_t *bson, ...) BSON_GNUC_NULL_TERMINATED;
+BSON_EXPORT (void)
+bcon_append_ctx (bson_t *bson,
+                 bcon_append_ctx_t *ctx,
+                 ...) BSON_GNUC_NULL_TERMINATED;
+BSON_EXPORT (void)
+bcon_append_ctx_va (bson_t *bson, bcon_append_ctx_t *ctx, va_list *va);
+BSON_EXPORT (void)
+bcon_append_ctx_init (bcon_append_ctx_t *ctx);
+
+BSON_EXPORT (void)
+bcon_extract_ctx_init (bcon_extract_ctx_t *ctx);
+
+BSON_EXPORT (void)
+bcon_extract_ctx (bson_t *bson,
+                  bcon_extract_ctx_t *ctx,
+                  ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (bool)
+bcon_extract_ctx_va (bson_t *bson, bcon_extract_ctx_t *ctx, va_list *ap);
+
+BSON_EXPORT (bool)
+bcon_extract (bson_t *bson, ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (bool)
+bcon_extract_va (bson_t *bson,
+                 bcon_extract_ctx_t *ctx,
+                 ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (bson_t *)
+bcon_new (void *unused, ...) BSON_GNUC_NULL_TERMINATED;
+
+/**
+ * The bcon_..() functions are all declared with __attribute__((sentinel)).
+ *
+ * From GCC manual for "sentinel": "A valid NULL in this context is defined as
+ * zero with any pointer type. If your system defines the NULL macro with an
+ * integer type then you need to add an explicit cast."
+ * Case in point: GCC on Solaris (at least)
+ */
+#define BCON_APPEND(_bson, ...) \
+   bcon_append ((_bson), __VA_ARGS__, (void *) NULL)
+#define BCON_APPEND_CTX(_bson, _ctx, ...) \
+   bcon_append_ctx ((_bson), (_ctx), __VA_ARGS__, (void *) NULL)
+
+#define BCON_EXTRACT(_bson, ...) \
+   bcon_extract ((_bson), __VA_ARGS__, (void *) NULL)
+
+#define BCON_EXTRACT_CTX(_bson, _ctx, ...) \
+   bcon_extract ((_bson), (_ctx), __VA_ARGS__, (void *) NULL)
+
+#define BCON_NEW(...) bcon_new (NULL, __VA_ARGS__, (void *) NULL)
+
+BSON_EXPORT (const char *)
+bson_bcon_magic (void) BSON_GNUC_PURE;
+BSON_EXPORT (const char *)
+bson_bcone_magic (void) BSON_GNUC_PURE;
+
+
+BSON_END_DECLS
+
+
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-atomic.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-atomic.h
new file mode 100644
index 0000000..845fe34
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-atomic.h
@@ -0,0 +1,774 @@
+/*
+ * Copyright 2013-2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ATOMIC_H
+#define BSON_ATOMIC_H
+
+
+#include "bson-config.h"
+#include "bson-compat.h"
+#include "bson-macros.h"
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#endif
+
+
+BSON_BEGIN_DECLS
+
+enum bson_memory_order {
+   bson_memory_order_seq_cst,
+   bson_memory_order_acquire,
+   bson_memory_order_release,
+   bson_memory_order_relaxed,
+   bson_memory_order_acq_rel,
+   bson_memory_order_consume,
+};
+
+#if defined(_M_ARM) /* MSVC memorder atomics are only avail on ARM */
+#define MSVC_MEMORDER_SUFFIX(X) X
+#else
+#define MSVC_MEMORDER_SUFFIX(X)
+#endif
+
+#if defined(USE_LEGACY_GCC_ATOMICS) || (!defined(__clang__) && __GNUC__ == 4)
+#define BSON_USE_LEGACY_GCC_ATOMICS
+#else
+#undef BSON_USE_LEGACY_GCC_ATOMICS
+#endif
+
+/* Not all GCC-like compilers support the current __atomic built-ins.  Older
+ * GCC (pre-5) used different built-ins named with the __sync prefix.  When
+ * compiling with such older GCC versions, it is necessary to use the applicable
+ * functions, which requires redefining BSON_IF_GNU_LIKE and defining the
+ * additional BSON_IF_GNU_LEGACY_ATOMICS macro here. */
+#ifdef BSON_USE_LEGACY_GCC_ATOMICS
+#undef BSON_IF_GNU_LIKE
+#define BSON_IF_GNU_LIKE(...)
+#define BSON_IF_GNU_LEGACY_ATOMICS(...) __VA_ARGS__
+#else
+#define BSON_IF_GNU_LEGACY_ATOMICS(...)
+#endif
+
+/* CDRIVER-4229 zSeries with gcc 4.8.4 produces illegal instructions for int and
+ * int32 atomic intrinsics. */
+#if defined(__s390__) || defined(__s390x__) || defined(__zarch__)
+#define BSON_EMULATE_INT32
+#define BSON_EMULATE_INT
+#endif
+
+/* CDRIVER-4264 Contrary to documentation, VS 2013 targeting x86 does not
+ * correctly/consistently provide _InterlockedPointerExchange. */
+#if defined(_MSC_VER) && _MSC_VER < 1900 && defined(_M_IX86)
+#define BSON_EMULATE_PTR
+#endif
+
+#define DEF_ATOMIC_OP(                                                       \
+   MSVC_Intrinsic, GNU_Intrinsic, GNU_Legacy_Intrinsic, Order, ...)          \
+   do {                                                                      \
+      switch (Order) {                                                       \
+      case bson_memory_order_acq_rel:                                        \
+         BSON_IF_MSVC (return MSVC_Intrinsic (__VA_ARGS__);)                 \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_ACQ_REL);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_seq_cst:                                        \
+         BSON_IF_MSVC (return MSVC_Intrinsic (__VA_ARGS__);)                 \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_SEQ_CST);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_acquire:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_acq)) (__VA_ARGS__);) \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_ACQUIRE);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_consume:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_acq)) (__VA_ARGS__);) \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_CONSUME);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_release:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_rel)) (__VA_ARGS__);) \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_RELEASE);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_relaxed:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_nf)) (__VA_ARGS__);)  \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_RELAXED);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      default:                                                               \
+         BSON_UNREACHABLE ("Invalid bson_memory_order value");               \
+      }                                                                      \
+   } while (0)
+
+
+#define DEF_ATOMIC_CMPEXCH_STRONG(                                            \
+   VCSuffix1, VCSuffix2, GNU_MemOrder, Ptr, ExpectActualVar, NewValue)        \
+   do {                                                                       \
+      BSON_IF_MSVC (ExpectActualVar = BSON_CONCAT3 (                          \
+                       _InterlockedCompareExchange, VCSuffix1, VCSuffix2) (   \
+                       Ptr, NewValue, ExpectActualVar);)                      \
+      BSON_IF_GNU_LIKE (                                                      \
+         (void) __atomic_compare_exchange_n (Ptr,                             \
+                                             &ExpectActualVar,                \
+                                             NewValue,                        \
+                                             false, /* Not weak */            \
+                                             GNU_MemOrder,                    \
+                                             GNU_MemOrder);)                  \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         __typeof__ (ExpectActualVar) _val;                                   \
+         _val = __sync_val_compare_and_swap (Ptr, ExpectActualVar, NewValue); \
+         ExpectActualVar = _val;)                                             \
+   } while (0)
+
+
+#define DEF_ATOMIC_CMPEXCH_WEAK(                                              \
+   VCSuffix1, VCSuffix2, GNU_MemOrder, Ptr, ExpectActualVar, NewValue)        \
+   do {                                                                       \
+      BSON_IF_MSVC (ExpectActualVar = BSON_CONCAT3 (                          \
+                       _InterlockedCompareExchange, VCSuffix1, VCSuffix2) (   \
+                       Ptr, NewValue, ExpectActualVar);)                      \
+      BSON_IF_GNU_LIKE (                                                      \
+         (void) __atomic_compare_exchange_n (Ptr,                             \
+                                             &ExpectActualVar,                \
+                                             NewValue,                        \
+                                             true, /* Yes weak */             \
+                                             GNU_MemOrder,                    \
+                                             GNU_MemOrder);)                  \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         __typeof__ (ExpectActualVar) _val;                                   \
+         _val = __sync_val_compare_and_swap (Ptr, ExpectActualVar, NewValue); \
+         ExpectActualVar = _val;)                                             \
+   } while (0)
+
+
+#define DECL_ATOMIC_INTEGRAL(NamePart, Type, VCIntrinSuffix)                  \
+   static BSON_INLINE Type bson_atomic_##NamePart##_fetch_add (               \
+      Type volatile *a, Type addend, enum bson_memory_order ord)              \
+   {                                                                          \
+      DEF_ATOMIC_OP (BSON_CONCAT (_InterlockedExchangeAdd, VCIntrinSuffix),   \
+                     __atomic_fetch_add,                                      \
+                     __sync_fetch_and_add,                                    \
+                     ord,                                                     \
+                     a,                                                       \
+                     addend);                                                 \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_fetch_sub (               \
+      Type volatile *a, Type subtrahend, enum bson_memory_order ord)          \
+   {                                                                          \
+      /* MSVC doesn't have a subtract intrinsic, so just reuse addition    */ \
+      BSON_IF_MSVC (                                                          \
+         return bson_atomic_##NamePart##_fetch_add (a, -subtrahend, ord);)    \
+      BSON_IF_GNU_LIKE (                                                      \
+         DEF_ATOMIC_OP (~, __atomic_fetch_sub, ~, ord, a, subtrahend);)       \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         DEF_ATOMIC_OP (~, ~, __sync_fetch_and_sub, ord, a, subtrahend);)     \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_fetch (                   \
+      Type volatile const *a, enum bson_memory_order order)                   \
+   {                                                                          \
+      /* MSVC doesn't have a load intrinsic, so just add zero */              \
+      BSON_IF_MSVC (return bson_atomic_##NamePart##_fetch_add (               \
+                              (Type volatile *) a, 0, order);)                \
+      /* GNU doesn't want RELEASE order for the fetch operation, so we can't  \
+       * just use DEF_ATOMIC_OP. */                                           \
+      BSON_IF_GNU_LIKE (switch (order) {                                      \
+         case bson_memory_order_release: /* Fall back to seqcst */            \
+         case bson_memory_order_acq_rel: /* Fall back to seqcst */            \
+         case bson_memory_order_seq_cst:                                      \
+            return __atomic_load_n (a, __ATOMIC_SEQ_CST);                     \
+         case bson_memory_order_acquire:                                      \
+            return __atomic_load_n (a, __ATOMIC_ACQUIRE);                     \
+         case bson_memory_order_consume:                                      \
+            return __atomic_load_n (a, __ATOMIC_CONSUME);                     \
+         case bson_memory_order_relaxed:                                      \
+            return __atomic_load_n (a, __ATOMIC_RELAXED);                     \
+         default:                                                             \
+            BSON_UNREACHABLE ("Invalid bson_memory_order value");             \
+      })                                                                      \
+      BSON_IF_GNU_LEGACY_ATOMICS ({                                           \
+         __sync_synchronize ();                                               \
+         return *a;                                                           \
+      })                                                                      \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_exchange (                \
+      Type volatile *a, Type value, enum bson_memory_order ord)               \
+   {                                                                          \
+      BSON_IF_MSVC (                                                          \
+         DEF_ATOMIC_OP (BSON_CONCAT (_InterlockedExchange, VCIntrinSuffix),   \
+                        ~,                                                    \
+                        ~,                                                    \
+                        ord,                                                  \
+                        a,                                                    \
+                        value);)                                              \
+      /* GNU doesn't want CONSUME order for the exchange operation, so we     \
+       * cannot use DEF_ATOMIC_OP. */                                         \
+      BSON_IF_GNU_LIKE (switch (ord) {                                        \
+         case bson_memory_order_acq_rel:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_ACQ_REL);          \
+         case bson_memory_order_release:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_RELEASE);          \
+         case bson_memory_order_seq_cst:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_SEQ_CST);          \
+         case bson_memory_order_consume: /* Fall back to acquire */           \
+         case bson_memory_order_acquire:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_ACQUIRE);          \
+         case bson_memory_order_relaxed:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_RELAXED);          \
+         default:                                                             \
+            BSON_UNREACHABLE ("Invalid bson_memory_order value");             \
+      })                                                                      \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         return __sync_val_compare_and_swap (a, *a, value);)                  \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_compare_exchange_strong ( \
+      Type volatile *a,                                                       \
+      Type expect,                                                            \
+      Type new_value,                                                         \
+      enum bson_memory_order ord)                                             \
+   {                                                                          \
+      Type actual = expect;                                                   \
+      switch (ord) {                                                          \
+      case bson_memory_order_release:                                         \
+      case bson_memory_order_acq_rel:                                         \
+      case bson_memory_order_seq_cst:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (                                          \
+            VCIntrinSuffix, , __ATOMIC_SEQ_CST, a, actual, new_value);        \
+         break;                                                               \
+      case bson_memory_order_acquire:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (VCIntrinSuffix,                           \
+                                    MSVC_MEMORDER_SUFFIX (_acq),              \
+                                    __ATOMIC_ACQUIRE,                         \
+                                    a,                                        \
+                                    actual,                                   \
+                                    new_value);                               \
+         break;                                                               \
+      case bson_memory_order_consume:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (VCIntrinSuffix,                           \
+                                    MSVC_MEMORDER_SUFFIX (_acq),              \
+                                    __ATOMIC_CONSUME,                         \
+                                    a,                                        \
+                                    actual,                                   \
+                                    new_value);                               \
+         break;                                                               \
+      case bson_memory_order_relaxed:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (VCIntrinSuffix,                           \
+                                    MSVC_MEMORDER_SUFFIX (_nf),               \
+                                    __ATOMIC_RELAXED,                         \
+                                    a,                                        \
+                                    actual,                                   \
+                                    new_value);                               \
+         break;                                                               \
+      default:                                                                \
+         BSON_UNREACHABLE ("Invalid bson_memory_order value");                \
+      }                                                                       \
+      return actual;                                                          \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_compare_exchange_weak (   \
+      Type volatile *a,                                                       \
+      Type expect,                                                            \
+      Type new_value,                                                         \
+      enum bson_memory_order ord)                                             \
+   {                                                                          \
+      Type actual = expect;                                                   \
+      switch (ord) {                                                          \
+      case bson_memory_order_release:                                         \
+      case bson_memory_order_acq_rel:                                         \
+      case bson_memory_order_seq_cst:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (                                            \
+            VCIntrinSuffix, , __ATOMIC_SEQ_CST, a, actual, new_value);        \
+         break;                                                               \
+      case bson_memory_order_acquire:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix,                             \
+                                  MSVC_MEMORDER_SUFFIX (_acq),                \
+                                  __ATOMIC_ACQUIRE,                           \
+                                  a,                                          \
+                                  actual,                                     \
+                                  new_value);                                 \
+         break;                                                               \
+      case bson_memory_order_consume:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix,                             \
+                                  MSVC_MEMORDER_SUFFIX (_acq),                \
+                                  __ATOMIC_CONSUME,                           \
+                                  a,                                          \
+                                  actual,                                     \
+                                  new_value);                                 \
+         break;                                                               \
+      case bson_memory_order_relaxed:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix,                             \
+                                  MSVC_MEMORDER_SUFFIX (_nf),                 \
+                                  __ATOMIC_RELAXED,                           \
+                                  a,                                          \
+                                  actual,                                     \
+                                  new_value);                                 \
+         break;                                                               \
+      default:                                                                \
+         BSON_UNREACHABLE ("Invalid bson_memory_order value");                \
+      }                                                                       \
+      return actual;                                                          \
+   }
+
+#define DECL_ATOMIC_STDINT(Name, VCSuffix) \
+   DECL_ATOMIC_INTEGRAL (Name, Name##_t, VCSuffix)
+
+#if defined(_MSC_VER) || defined(BSON_USE_LEGACY_GCC_ATOMICS)
+/* MSVC and GCC require built-in types (not typedefs) for their atomic
+ * intrinsics. */
+#if defined(_MSC_VER)
+#define DECL_ATOMIC_INTEGRAL_INT8 char
+#define DECL_ATOMIC_INTEGRAL_INT32 long
+#define DECL_ATOMIC_INTEGRAL_INT long
+#else
+#define DECL_ATOMIC_INTEGRAL_INT8 signed char
+#define DECL_ATOMIC_INTEGRAL_INT32 int
+#define DECL_ATOMIC_INTEGRAL_INT int
+#endif
+DECL_ATOMIC_INTEGRAL (int8, DECL_ATOMIC_INTEGRAL_INT8, 8)
+DECL_ATOMIC_INTEGRAL (int16, short, 16)
+#if !defined(BSON_EMULATE_INT32)
+DECL_ATOMIC_INTEGRAL (int32, DECL_ATOMIC_INTEGRAL_INT32, )
+#endif
+#if !defined(BSON_EMULATE_INT)
+DECL_ATOMIC_INTEGRAL (int, DECL_ATOMIC_INTEGRAL_INT, )
+#endif
+#else
+/* Other compilers that we support provide generic intrinsics */
+DECL_ATOMIC_STDINT (int8, 8)
+DECL_ATOMIC_STDINT (int16, 16)
+#if !defined(BSON_EMULATE_INT32)
+DECL_ATOMIC_STDINT (int32, )
+#endif
+#if !defined(BSON_EMULATE_INT)
+DECL_ATOMIC_INTEGRAL (int, int, )
+#endif
+#endif
+
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_fetch_add (int64_t volatile *val,
+                                   int64_t v,
+                                   enum bson_memory_order);
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_exchange (int64_t volatile *val,
+                                  int64_t v,
+                                  enum bson_memory_order);
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_compare_exchange_strong (int64_t volatile *val,
+                                                 int64_t expect_value,
+                                                 int64_t new_value,
+                                                 enum bson_memory_order);
+
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_compare_exchange_weak (int64_t volatile *val,
+                                               int64_t expect_value,
+                                               int64_t new_value,
+                                               enum bson_memory_order);
+
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_fetch_add (int32_t volatile *val,
+                                   int32_t v,
+                                   enum bson_memory_order);
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_exchange (int32_t volatile *val,
+                                  int32_t v,
+                                  enum bson_memory_order);
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_compare_exchange_strong (int32_t volatile *val,
+                                                 int32_t expect_value,
+                                                 int32_t new_value,
+                                                 enum bson_memory_order);
+
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_compare_exchange_weak (int32_t volatile *val,
+                                               int32_t expect_value,
+                                               int32_t new_value,
+                                               enum bson_memory_order);
+
+BSON_EXPORT (int)
+_bson_emul_atomic_int_fetch_add (int volatile *val,
+                                 int v,
+                                 enum bson_memory_order);
+BSON_EXPORT (int)
+_bson_emul_atomic_int_exchange (int volatile *val,
+                                int v,
+                                enum bson_memory_order);
+BSON_EXPORT (int)
+_bson_emul_atomic_int_compare_exchange_strong (int volatile *val,
+                                               int expect_value,
+                                               int new_value,
+                                               enum bson_memory_order);
+
+BSON_EXPORT (int)
+_bson_emul_atomic_int_compare_exchange_weak (int volatile *val,
+                                             int expect_value,
+                                             int new_value,
+                                             enum bson_memory_order);
+
+BSON_EXPORT (void *)
+_bson_emul_atomic_ptr_exchange (void *volatile *val,
+                                void *v,
+                                enum bson_memory_order);
+
+BSON_EXPORT (void)
+bson_thrd_yield (void);
+
+#if (defined(_MSC_VER) && !defined(_M_IX86)) || (defined(__LP64__) && __LP64__)
+/* (64-bit intrinsics are only available in x64) */
+#ifdef _MSC_VER
+DECL_ATOMIC_INTEGRAL (int64, __int64, 64)
+#else
+DECL_ATOMIC_STDINT (int64, 64)
+#endif
+#else
+static BSON_INLINE int64_t
+bson_atomic_int64_fetch (const int64_t volatile *val,
+                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_fetch_add (
+      (int64_t volatile *) val, 0, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_fetch_add (int64_t volatile *val,
+                             int64_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_fetch_add (val, v, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_fetch_sub (int64_t volatile *val,
+                             int64_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_fetch_add (val, -v, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_exchange (int64_t volatile *val,
+                            int64_t v,
+                            enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_exchange (val, v, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_compare_exchange_strong (int64_t volatile *val,
+                                           int64_t expect_value,
+                                           int64_t new_value,
+                                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_compare_exchange_strong (
+      val, expect_value, new_value, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_compare_exchange_weak (int64_t volatile *val,
+                                         int64_t expect_value,
+                                         int64_t new_value,
+                                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_compare_exchange_weak (
+      val, expect_value, new_value, order);
+}
+#endif
+
+#if defined(BSON_EMULATE_INT32)
+static BSON_INLINE int32_t
+bson_atomic_int32_fetch (const int32_t volatile *val,
+                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_fetch_add (
+      (int32_t volatile *) val, 0, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_fetch_add (int32_t volatile *val,
+                             int32_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_fetch_add (val, v, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_fetch_sub (int32_t volatile *val,
+                             int32_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_fetch_add (val, -v, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_exchange (int32_t volatile *val,
+                            int32_t v,
+                            enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_exchange (val, v, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_compare_exchange_strong (int32_t volatile *val,
+                                           int32_t expect_value,
+                                           int32_t new_value,
+                                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_compare_exchange_strong (
+      val, expect_value, new_value, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_compare_exchange_weak (int32_t volatile *val,
+                                         int32_t expect_value,
+                                         int32_t new_value,
+                                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_compare_exchange_weak (
+      val, expect_value, new_value, order);
+}
+#endif /* BSON_EMULATE_INT32 */
+
+#if defined(BSON_EMULATE_INT)
+static BSON_INLINE int
+bson_atomic_int_fetch (const int volatile *val, enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_fetch_add ((int volatile *) val, 0, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_fetch_add (int volatile *val,
+                           int v,
+                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_fetch_add (val, v, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_fetch_sub (int volatile *val,
+                           int v,
+                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_fetch_add (val, -v, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_exchange (int volatile *val,
+                          int v,
+                          enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_exchange (val, v, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_compare_exchange_strong (int volatile *val,
+                                         int expect_value,
+                                         int new_value,
+                                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_compare_exchange_strong (
+      val, expect_value, new_value, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_compare_exchange_weak (int volatile *val,
+                                       int expect_value,
+                                       int new_value,
+                                       enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_compare_exchange_weak (
+      val, expect_value, new_value, order);
+}
+#endif /* BSON_EMULATE_INT */
+
+static BSON_INLINE void *
+bson_atomic_ptr_exchange (void *volatile *ptr,
+                          void *new_value,
+                          enum bson_memory_order ord)
+{
+#if defined(BSON_EMULATE_PTR)
+   return _bson_emul_atomic_ptr_exchange (ptr, new_value, ord);
+#elif defined(BSON_USE_LEGACY_GCC_ATOMICS)
+   /* The older __sync_val_compare_and_swap also takes oldval */
+   DEF_ATOMIC_OP (_InterlockedExchangePointer,
+                  ,
+                  __sync_val_compare_and_swap,
+                  ord,
+                  ptr,
+                  *ptr,
+                  new_value);
+#else
+   DEF_ATOMIC_OP (
+      _InterlockedExchangePointer, __atomic_exchange_n, , ord, ptr, new_value);
+#endif
+}
+
+static BSON_INLINE void *
+bson_atomic_ptr_compare_exchange_strong (void *volatile *ptr,
+                                         void *expect,
+                                         void *new_value,
+                                         enum bson_memory_order ord)
+{
+   switch (ord) {
+   case bson_memory_order_release:
+   case bson_memory_order_acq_rel:
+   case bson_memory_order_seq_cst:
+      DEF_ATOMIC_CMPEXCH_STRONG (
+         Pointer, , __ATOMIC_SEQ_CST, ptr, expect, new_value);
+      return expect;
+   case bson_memory_order_relaxed:
+      DEF_ATOMIC_CMPEXCH_STRONG (Pointer,
+                                 MSVC_MEMORDER_SUFFIX (_nf),
+                                 __ATOMIC_RELAXED,
+                                 ptr,
+                                 expect,
+                                 new_value);
+      return expect;
+   case bson_memory_order_consume:
+      DEF_ATOMIC_CMPEXCH_STRONG (Pointer,
+                                 MSVC_MEMORDER_SUFFIX (_acq),
+                                 __ATOMIC_CONSUME,
+                                 ptr,
+                                 expect,
+                                 new_value);
+      return expect;
+   case bson_memory_order_acquire:
+      DEF_ATOMIC_CMPEXCH_STRONG (Pointer,
+                                 MSVC_MEMORDER_SUFFIX (_acq),
+                                 __ATOMIC_ACQUIRE,
+                                 ptr,
+                                 expect,
+                                 new_value);
+      return expect;
+   default:
+      BSON_UNREACHABLE ("Invalid bson_memory_order value");
+   }
+}
+
+
+static BSON_INLINE void *
+bson_atomic_ptr_compare_exchange_weak (void *volatile *ptr,
+                                       void *expect,
+                                       void *new_value,
+                                       enum bson_memory_order ord)
+{
+   switch (ord) {
+   case bson_memory_order_release:
+   case bson_memory_order_acq_rel:
+   case bson_memory_order_seq_cst:
+      DEF_ATOMIC_CMPEXCH_WEAK (
+         Pointer, , __ATOMIC_SEQ_CST, ptr, expect, new_value);
+      return expect;
+   case bson_memory_order_relaxed:
+      DEF_ATOMIC_CMPEXCH_WEAK (Pointer,
+                               MSVC_MEMORDER_SUFFIX (_nf),
+                               __ATOMIC_RELAXED,
+                               ptr,
+                               expect,
+                               new_value);
+      return expect;
+   case bson_memory_order_consume:
+      DEF_ATOMIC_CMPEXCH_WEAK (Pointer,
+                               MSVC_MEMORDER_SUFFIX (_acq),
+                               __ATOMIC_CONSUME,
+                               ptr,
+                               expect,
+                               new_value);
+      return expect;
+   case bson_memory_order_acquire:
+      DEF_ATOMIC_CMPEXCH_WEAK (Pointer,
+                               MSVC_MEMORDER_SUFFIX (_acq),
+                               __ATOMIC_ACQUIRE,
+                               ptr,
+                               expect,
+                               new_value);
+      return expect;
+   default:
+      BSON_UNREACHABLE ("Invalid bson_memory_order value");
+   }
+}
+
+
+static BSON_INLINE void *
+bson_atomic_ptr_fetch (void *volatile const *ptr, enum bson_memory_order ord)
+{
+   return bson_atomic_ptr_compare_exchange_strong (
+      (void *volatile *) ptr, NULL, NULL, ord);
+}
+
+#undef DECL_ATOMIC_STDINT
+#undef DECL_ATOMIC_INTEGRAL
+#undef DEF_ATOMIC_OP
+#undef DEF_ATOMIC_CMPEXCH_STRONG
+#undef DEF_ATOMIC_CMPEXCH_WEAK
+#undef MSVC_MEMORDER_SUFFIX
+
+/**
+ * @brief Generate a full-fence memory barrier at the call site.
+ */
+static BSON_INLINE void
+bson_atomic_thread_fence (void)
+{
+   BSON_IF_MSVC (MemoryBarrier ();)
+   BSON_IF_GNU_LIKE (__sync_synchronize ();)
+   BSON_IF_GNU_LEGACY_ATOMICS (__sync_synchronize ();)
+}
+
+#ifdef BSON_USE_LEGACY_GCC_ATOMICS
+#undef BSON_IF_GNU_LIKE
+#define BSON_IF_GNU_LIKE(...) __VA_ARGS__
+#endif
+#undef BSON_IF_GNU_LEGACY_ATOMICS
+#undef BSON_USE_LEGACY_GCC_ATOMICS
+
+BSON_GNUC_DEPRECATED_FOR ("bson_atomic_thread_fence")
+BSON_EXPORT (void) bson_memory_barrier (void);
+
+BSON_GNUC_DEPRECATED_FOR ("bson_atomic_int_fetch_add")
+BSON_EXPORT (int32_t) bson_atomic_int_add (volatile int32_t *p, int32_t n);
+
+BSON_GNUC_DEPRECATED_FOR ("bson_atomic_int64_fetch_add")
+BSON_EXPORT (int64_t) bson_atomic_int64_add (volatile int64_t *p, int64_t n);
+
+
+#undef BSON_EMULATE_PTR
+#undef BSON_EMULATE_INT32
+#undef BSON_EMULATE_INT
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ATOMIC_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-clock.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-clock.h
new file mode 100644
index 0000000..d2f14d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-clock.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_CLOCK_H
+#define BSON_CLOCK_H
+
+
+#include "bson-compat.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (int64_t)
+bson_get_monotonic_time (void);
+BSON_EXPORT (int)
+bson_gettimeofday (struct timeval *tv);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_CLOCK_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-cmp.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-cmp.h
new file mode 100644
index 0000000..98da848
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-cmp.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2022 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_CMP_H
+#define BSON_CMP_H
+
+
+#include "bson-compat.h" /* ssize_t */
+#include "bson-macros.h" /* BSON_CONCAT */
+
+#include <limits.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+
+BSON_BEGIN_DECLS
+
+
+/* Based on the "Safe Integral Comparisons" proposal merged in C++20:
+ * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p0586r2.html
+ *
+ * Due to lack of type deduction in C, relational comparison functions (e.g.
+ * `cmp_less`) are defined in sets of four "functions" according to the
+ * signedness of each value argument, e.g.:
+ *  - bson_cmp_less_ss (signed-value, signed-value)
+ *  - bson_cmp_less_uu (unsigned-value, unsigned-value)
+ *  - bson_cmp_less_su (signed-value, unsigned-value)
+ *  - bson_cmp_less_us (unsigned-value, signed-value)
+ *
+ * Similarly, the `in_range` function is defined as a set of two "functions"
+ * according to the signedness of the value argument:
+ *  - bson_in_range_signed (Type, signed-value)
+ *  - bson_in_range_unsigned (Type, unsigned-value)
+ *
+ * The user must take care to use the correct signedness for the provided
+ * argument(s). Enabling compiler warnings for implicit sign conversions is
+ * recommended.
+ */
+
+
+#define BSON_CMP_SET(op, ss, uu, su, us)                                  \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _ss) (int64_t t,  \
+                                                              int64_t u)  \
+   {                                                                      \
+      return (ss);                                                        \
+   }                                                                      \
+                                                                          \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _uu) (uint64_t t, \
+                                                              uint64_t u) \
+   {                                                                      \
+      return (uu);                                                        \
+   }                                                                      \
+                                                                          \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _su) (int64_t t,  \
+                                                              uint64_t u) \
+   {                                                                      \
+      return (su);                                                        \
+   }                                                                      \
+                                                                          \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _us) (uint64_t t, \
+                                                              int64_t u)  \
+   {                                                                      \
+      return (us);                                                        \
+   }
+
+BSON_CMP_SET (equal,
+              t == u,
+              t == u,
+              t < 0 ? false : (uint64_t) (t) == u,
+              u < 0 ? false : t == (uint64_t) (u))
+
+BSON_CMP_SET (not_equal,
+              !bson_cmp_equal_ss (t, u),
+              !bson_cmp_equal_uu (t, u),
+              !bson_cmp_equal_su (t, u),
+              !bson_cmp_equal_us (t, u))
+
+BSON_CMP_SET (less,
+              t < u,
+              t < u,
+              t < 0 ? true : (uint64_t) (t) < u,
+              u < 0 ? false : t < (uint64_t) (u))
+
+BSON_CMP_SET (greater,
+              bson_cmp_less_ss (u, t),
+              bson_cmp_less_uu (u, t),
+              bson_cmp_less_us (u, t),
+              bson_cmp_less_su (u, t))
+
+BSON_CMP_SET (less_equal,
+              !bson_cmp_greater_ss (t, u),
+              !bson_cmp_greater_uu (t, u),
+              !bson_cmp_greater_su (t, u),
+              !bson_cmp_greater_us (t, u))
+
+BSON_CMP_SET (greater_equal,
+              !bson_cmp_less_ss (t, u),
+              !bson_cmp_less_uu (t, u),
+              !bson_cmp_less_su (t, u),
+              !bson_cmp_less_us (t, u))
+
+#undef BSON_CMP_SET
+
+
+/* Return true if the given value is within the range of the corresponding
+ * signed type. The suffix must match the signedness of the given value. */
+#define BSON_IN_RANGE_SET_SIGNED(Type, min, max)                              \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _signed) (   \
+      int64_t value)                                                          \
+   {                                                                          \
+      return bson_cmp_greater_equal_ss (value, min) &&                        \
+             bson_cmp_less_equal_ss (value, max);                             \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) ( \
+      uint64_t value)                                                         \
+   {                                                                          \
+      return bson_cmp_greater_equal_us (value, min) &&                        \
+             bson_cmp_less_equal_us (value, max);                             \
+   }
+
+/* Return true if the given value is within the range of the corresponding
+ * unsigned type. The suffix must match the signedness of the given value. */
+#define BSON_IN_RANGE_SET_UNSIGNED(Type, max)                                 \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _signed) (   \
+      int64_t value)                                                          \
+   {                                                                          \
+      return bson_cmp_greater_equal_su (value, 0u) &&                         \
+             bson_cmp_less_equal_su (value, max);                             \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) ( \
+      uint64_t value)                                                         \
+   {                                                                          \
+      return bson_cmp_less_equal_uu (value, max);                             \
+   }
+
+BSON_IN_RANGE_SET_SIGNED (signed_char, SCHAR_MIN, SCHAR_MAX)
+BSON_IN_RANGE_SET_SIGNED (short, SHRT_MIN, SHRT_MAX)
+BSON_IN_RANGE_SET_SIGNED (int, INT_MIN, INT_MAX)
+BSON_IN_RANGE_SET_SIGNED (long, LONG_MIN, LONG_MAX)
+BSON_IN_RANGE_SET_SIGNED (long_long, LLONG_MIN, LLONG_MAX)
+
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_char, UCHAR_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_short, USHRT_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_int, UINT_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_long, ULONG_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_long_long, ULLONG_MAX)
+
+BSON_IN_RANGE_SET_SIGNED (int8_t, INT8_MIN, INT8_MAX)
+BSON_IN_RANGE_SET_SIGNED (int16_t, INT16_MIN, INT16_MAX)
+BSON_IN_RANGE_SET_SIGNED (int32_t, INT32_MIN, INT32_MAX)
+BSON_IN_RANGE_SET_SIGNED (int64_t, INT64_MIN, INT64_MAX)
+
+BSON_IN_RANGE_SET_UNSIGNED (uint8_t, UINT8_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (uint16_t, UINT16_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (uint32_t, UINT32_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (uint64_t, UINT64_MAX)
+
+BSON_IN_RANGE_SET_SIGNED (ssize_t, SSIZE_MIN, SSIZE_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (size_t, SIZE_MAX)
+
+#undef BSON_IN_RANGE_SET_SIGNED
+#undef BSON_IN_RANGE_SET_UNSIGNED
+
+
+/* Return true if the value with *signed* type is in the representable range of
+ * Type and false otherwise. */
+#define bson_in_range_signed(Type, value) \
+   BSON_CONCAT3 (bson_in_range, _##Type, _signed) (value)
+
+/* Return true if the value with *unsigned* type is in the representable range
+ * of Type and false otherwise. */
+#define bson_in_range_unsigned(Type, value) \
+   BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) (value)
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_CMP_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-compat.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-compat.h
new file mode 100644
index 0000000..ef49292
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-compat.h
@@ -0,0 +1,353 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_COMPAT_H
+#define BSON_COMPAT_H
+
+
+#if defined(__MINGW32__)
+#if defined(__USE_MINGW_ANSI_STDIO)
+#if __USE_MINGW_ANSI_STDIO < 1
+#error "__USE_MINGW_ANSI_STDIO > 0 is required for correct PRI* macros"
+#endif
+#else
+#define __USE_MINGW_ANSI_STDIO 1
+#endif
+#endif
+
+#include "bson-config.h"
+#include "bson-macros.h"
+
+
+#ifdef BSON_OS_WIN32
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT < 0x0600)
+#undef _WIN32_WINNT
+#endif
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <winsock2.h>
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#else
+#include <windows.h>
+#endif
+#include <direct.h>
+#include <io.h>
+#endif
+
+
+#ifdef BSON_OS_UNIX
+#include <unistd.h>
+#include <sys/time.h>
+#endif
+
+
+#include "bson-macros.h"
+
+
+#include <errno.h>
+#include <ctype.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <stdint.h>
+
+
+BSON_BEGIN_DECLS
+
+#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
+#include <inttypes.h>
+#endif
+#ifdef _MSC_VER
+#ifndef __cplusplus
+/* benign redefinition of type */
+#pragma warning(disable : 4142)
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+typedef SSIZE_T ssize_t;
+#endif
+#ifndef _SIZE_T_DEFINED
+#define _SIZE_T_DEFINED
+typedef SIZE_T size_t;
+#endif
+#pragma warning(default : 4142)
+#else
+/*
+ * MSVC++ does not include ssize_t, just size_t.
+ * So we need to synthesize that as well.
+ */
+#pragma warning(disable : 4142)
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+typedef SSIZE_T ssize_t;
+#endif
+#pragma warning(default : 4142)
+#endif
+#ifndef PRIi32
+#define PRIi32 "d"
+#endif
+#ifndef PRId32
+#define PRId32 "d"
+#endif
+#ifndef PRIu32
+#define PRIu32 "u"
+#endif
+#ifndef PRIi64
+#define PRIi64 "I64i"
+#endif
+#ifndef PRId64
+#define PRId64 "I64i"
+#endif
+#ifndef PRIu64
+#define PRIu64 "I64u"
+#endif
+#endif
+
+/* Derive the maximum representable value of signed integer type T using the
+ * formula 2^(N - 1) - 1 where N is the number of bits in type T. This assumes
+ * T is represented using two's complement. */
+#define BSON_NUMERIC_LIMITS_MAX_SIGNED(T) \
+   ((T) ((((size_t) 0x01u) << (sizeof (T) * (size_t) CHAR_BIT - 1u)) - 1u))
+
+/* Derive the minimum representable value of signed integer type T as one less
+ * than the negation of its maximum representable value. This assumes T is
+ * represented using two's complement. */
+#define BSON_NUMERIC_LIMITS_MIN_SIGNED(T, max) ((T) ((-(max)) - 1))
+
+/* Derive the maximum representable value of unsigned integer type T by flipping
+ * all its bits to 1. */
+#define BSON_NUMERIC_LIMITS_MAX_UNSIGNED(T) ((T) (~((T) 0)))
+
+/* Define numeric limit constants if not already available for C90
+ * compatibility. These can be removed once C99 is declared the minimum
+ * supported C standard. */
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+
+#ifndef SCHAR_MAX
+#define SCHAR_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (signed char)
+#endif
+
+#ifndef SHRT_MAX
+#define SHRT_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (short)
+#endif
+
+#ifndef INT_MAX
+#define INT_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int)
+#endif
+
+#ifndef LONG_MAX
+#define LONG_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (long)
+#endif
+
+#ifndef LLONG_MAX
+#define LLONG_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (long long)
+#endif
+
+#ifndef UCHAR_MAX
+#define UCHAR_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned char)
+#endif
+
+#ifndef USHRT_MAX
+#define USHRT_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned short)
+#endif
+
+#ifndef UINT_MAX
+#define UINT_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned int)
+#endif
+
+#ifndef ULONG_MAX
+#define ULONG_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned long)
+#endif
+
+#ifndef ULLONG_MAX
+#define ULLONG_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned long long)
+#endif
+
+#ifndef INT8_MAX
+#define INT8_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int8_t)
+#endif
+
+#ifndef INT16_MAX
+#define INT16_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int16_t)
+#endif
+
+#ifndef INT32_MAX
+#define INT32_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int32_t)
+#endif
+
+#ifndef INT64_MAX
+#define INT64_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int64_t)
+#endif
+
+#ifndef UINT8_MAX
+#define UINT8_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint8_t)
+#endif
+
+#ifndef UINT16_MAX
+#define UINT16_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint16_t)
+#endif
+
+#ifndef UINT32_MAX
+#define UINT32_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint32_t)
+#endif
+
+#ifndef UINT64_MAX
+#define UINT64_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint64_t)
+#endif
+
+#ifndef SIZE_MAX
+#define SIZE_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (size_t)
+#endif
+
+#ifndef PTRDIFF_MAX
+#define PTRDIFF_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (ptrdiff_t)
+#endif
+
+#ifndef SCHAR_MIN
+#define SCHAR_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (signed char, SCHAR_MAX)
+#endif
+
+#ifndef SHRT_MIN
+#define SHRT_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (short, SHRT_MAX)
+#endif
+
+#ifndef INT_MIN
+#define INT_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int, INT_MAX)
+#endif
+
+#ifndef LONG_MIN
+#define LONG_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (long, LONG_MAX)
+#endif
+
+#ifndef LLONG_MIN
+#define LLONG_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (long long, LLONG_MAX)
+#endif
+
+#ifndef INT8_MIN
+#define INT8_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int8_t, INT8_MAX)
+#endif
+
+#ifndef INT16_MIN
+#define INT16_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int16_t, INT16_MAX)
+#endif
+
+#ifndef INT32_MIN
+#define INT32_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int32_t, INT32_MAX)
+#endif
+
+#ifndef INT64_MIN
+#define INT64_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int64_t, INT64_MAX)
+#endif
+
+#ifndef PTRDIFF_MIN
+#define PTRDIFF_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (ptrdiff_t, PTRDIFF_MAX)
+#endif
+
+#endif /* !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L */
+
+
+#ifndef SSIZE_MAX
+#define SSIZE_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (ssize_t)
+#endif
+
+#ifndef SSIZE_MIN
+#define SSIZE_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (ssize_t, SSIZE_MAX)
+#endif
+
+#if defined(__MINGW32__) && !defined(INIT_ONCE_STATIC_INIT)
+#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT
+typedef RTL_RUN_ONCE INIT_ONCE;
+#endif
+
+#ifdef BSON_HAVE_STDBOOL_H
+#include <stdbool.h>
+#elif !defined(__bool_true_false_are_defined)
+#ifndef __cplusplus
+typedef signed char bool;
+#define false 0
+#define true 1
+#endif
+#define __bool_true_false_are_defined 1
+#endif
+
+
+#if defined(__GNUC__)
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+#define bson_sync_synchronize() __sync_synchronize ()
+#elif defined(__i386__) || defined(__i486__) || defined(__i586__) || \
+   defined(__i686__) || defined(__x86_64__)
+#define bson_sync_synchronize() asm volatile("mfence" ::: "memory")
+#else
+#define bson_sync_synchronize() asm volatile("sync" ::: "memory")
+#endif
+#elif defined(_MSC_VER)
+#define bson_sync_synchronize() MemoryBarrier ()
+#endif
+
+
+#if !defined(va_copy) && defined(__va_copy)
+#define va_copy(dst, src) __va_copy (dst, src)
+#endif
+
+
+#if !defined(va_copy)
+#define va_copy(dst, src) ((dst) = (src))
+#endif
+
+
+#ifdef _MSC_VER
+/** Expands the arguments if compiling with MSVC, otherwise empty */
+#define BSON_IF_MSVC(...) __VA_ARGS__
+/** Expands the arguments if compiling with GCC or Clang, otherwise empty */
+#define BSON_IF_GNU_LIKE(...)
+#elif defined(__GNUC__) || defined(__clang__)
+/** Expands the arguments if compiling with MSVC, otherwise empty */
+#define BSON_IF_MSVC(...)
+/** Expands the arguments if compiling with GCC or Clang, otherwise empty */
+#define BSON_IF_GNU_LIKE(...) __VA_ARGS__
+#endif
+
+#ifdef BSON_OS_WIN32
+/** Expands the arguments if compiling for Windows, otherwise empty */
+#define BSON_IF_WINDOWS(...) __VA_ARGS__
+/** Expands the arguments if compiling for POSIX, otherwise empty */
+#define BSON_IF_POSIX(...)
+#elif defined(BSON_OS_UNIX)
+/** Expands the arguments if compiling for Windows, otherwise empty */
+#define BSON_IF_WINDOWS(...)
+/** Expands the arguments if compiling for POSIX, otherwise empty */
+#define BSON_IF_POSIX(...) __VA_ARGS__
+#endif
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_COMPAT_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-config.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-config.h
new file mode 100644
index 0000000..5eecbf3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-config.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(BSON_INSIDE) && !defined(BSON_COMPILATION)
+#error "Only <bson/bson.h> can be included directly."
+#endif
+
+#ifndef BSON_CONFIG_H
+#define BSON_CONFIG_H
+
+/*
+ * Define to 1234 for Little Endian, 4321 for Big Endian.
+ */
+#define BSON_BYTE_ORDER 1234
+
+
+/*
+ * Define to 1 if you have stdbool.h
+ */
+#define BSON_HAVE_STDBOOL_H 1
+#if BSON_HAVE_STDBOOL_H != 1
+# undef BSON_HAVE_STDBOOL_H
+#endif
+
+
+/*
+ * Define to 1 for POSIX-like systems, 2 for Windows.
+ */
+#define BSON_OS 1
+
+
+/*
+ * Define to 1 if you have clock_gettime() available.
+ */
+#define BSON_HAVE_CLOCK_GETTIME 1
+#if BSON_HAVE_CLOCK_GETTIME != 1
+# undef BSON_HAVE_CLOCK_GETTIME
+#endif
+
+
+/*
+ * Define to 1 if you have strings.h available on your platform.
+ */
+#define BSON_HAVE_STRINGS_H 1
+#if BSON_HAVE_STRINGS_H != 1
+# undef BSON_HAVE_STRINGS_H
+#endif
+
+
+/*
+ * Define to 1 if you have strnlen available on your platform.
+ */
+#define BSON_HAVE_STRNLEN 1
+#if BSON_HAVE_STRNLEN != 1
+# undef BSON_HAVE_STRNLEN
+#endif
+
+
+/*
+ * Define to 1 if you have snprintf available on your platform.
+ */
+#define BSON_HAVE_SNPRINTF 1
+#if BSON_HAVE_SNPRINTF != 1
+# undef BSON_HAVE_SNPRINTF
+#endif
+
+
+/*
+ * Define to 1 if you have gmtime_r available on your platform.
+ */
+#define BSON_HAVE_GMTIME_R 1
+#if BSON_HAVE_GMTIME_R != 1
+# undef BSON_HAVE_GMTIME_R
+#endif
+
+
+/*
+ * Define to 1 if you have struct timespec available on your platform.
+ */
+#define BSON_HAVE_TIMESPEC 1
+#if BSON_HAVE_TIMESPEC != 1
+# undef BSON_HAVE_TIMESPEC
+#endif
+
+
+/*
+ * Define to 1 if you want extra aligned types in libbson
+ */
+#define BSON_EXTRA_ALIGN 1
+#if BSON_EXTRA_ALIGN != 1
+# undef BSON_EXTRA_ALIGN
+#endif
+
+
+/*
+ * Define to 1 if you have rand_r available on your platform.
+ */
+#define BSON_HAVE_RAND_R 1
+#if BSON_HAVE_RAND_R != 1
+# undef BSON_HAVE_RAND_R
+#endif
+
+
+/*
+ * Define to 1 if you have strlcpy available on your platform.
+ */
+#define BSON_HAVE_STRLCPY 0
+#if BSON_HAVE_STRLCPY != 1
+# undef BSON_HAVE_STRLCPY
+#endif
+
+#endif /* BSON_CONFIG_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-context.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-context.h
new file mode 100644
index 0000000..3098ce6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-context.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_CONTEXT_H
+#define BSON_CONTEXT_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * @brief Initialize a new context with the given flags
+ *
+ * @param flags Flags used to configure the behavior of the context. For most
+ * cases, this should be BSON_CONTEXT_NONE.
+ *
+ * @return A newly allocated context. Must be freed with bson_context_destroy()
+ *
+ * @note If you expect your pid to change without notice, such as from an
+ * unexpected call to fork(), then specify BSON_CONTEXT_DISABLE_PID_CACHE in
+ * `flags`.
+ */
+BSON_EXPORT (bson_context_t *)
+bson_context_new (bson_context_flags_t flags);
+
+/**
+ * @brief Destroy and free a bson_context_t created by bson_context_new()
+ */
+BSON_EXPORT (void)
+bson_context_destroy (bson_context_t *context);
+
+/**
+ * @brief Obtain a pointer to the application-default bson_context_t
+ *
+ * @note This context_t MUST NOT be passed to bson_context_destroy()
+ */
+BSON_EXPORT (bson_context_t *)
+bson_context_get_default (void);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_CONTEXT_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-decimal128.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-decimal128.h
new file mode 100644
index 0000000..51ec46f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-decimal128.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_DECIMAL128_H
+#define BSON_DECIMAL128_H
+
+
+#include <string.h>
+
+#include "bson-macros.h"
+#include "bson-config.h"
+#include "bson-types.h"
+
+
+/**
+ * BSON_DECIMAL128_STRING:
+ *
+ * The length of a decimal128 string (with null terminator).
+ *
+ * 1  for the sign
+ * 35 for digits and radix
+ * 2  for exponent indicator and sign
+ * 4  for exponent digits
+ */
+#define BSON_DECIMAL128_STRING 43
+#define BSON_DECIMAL128_INF "Infinity"
+#define BSON_DECIMAL128_NAN "NaN"
+
+
+BSON_BEGIN_DECLS
+
+BSON_EXPORT (void)
+bson_decimal128_to_string (const bson_decimal128_t *dec, char *str);
+
+
+/* Note: @string must be ASCII characters only! */
+BSON_EXPORT (bool)
+bson_decimal128_from_string (const char *string, bson_decimal128_t *dec);
+
+BSON_EXPORT (bool)
+bson_decimal128_from_string_w_len (const char *string,
+                                   int len,
+                                   bson_decimal128_t *dec);
+
+BSON_END_DECLS
+
+
+#endif /* BSON_DECIMAL128_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-endian.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-endian.h
new file mode 100644
index 0000000..1acb547
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-endian.h
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ENDIAN_H
+#define BSON_ENDIAN_H
+
+
+#if defined(__sun)
+#include <sys/byteorder.h>
+#endif
+
+#include "bson-config.h"
+#include "bson-macros.h"
+#include "bson-compat.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_BIG_ENDIAN 4321
+#define BSON_LITTLE_ENDIAN 1234
+
+
+#if defined(__sun)
+#define BSON_UINT16_SWAP_LE_BE(v) BSWAP_16 ((uint16_t) v)
+#define BSON_UINT32_SWAP_LE_BE(v) BSWAP_32 ((uint32_t) v)
+#define BSON_UINT64_SWAP_LE_BE(v) BSWAP_64 ((uint64_t) v)
+#elif defined(__clang__) && defined(__clang_major__) &&  \
+   defined(__clang_minor__) && (__clang_major__ >= 3) && \
+   (__clang_minor__ >= 1)
+#if __has_builtin(__builtin_bswap16)
+#define BSON_UINT16_SWAP_LE_BE(v) __builtin_bswap16 (v)
+#endif
+#if __has_builtin(__builtin_bswap32)
+#define BSON_UINT32_SWAP_LE_BE(v) __builtin_bswap32 (v)
+#endif
+#if __has_builtin(__builtin_bswap64)
+#define BSON_UINT64_SWAP_LE_BE(v) __builtin_bswap64 (v)
+#endif
+#elif defined(__GNUC__) && (__GNUC__ >= 4)
+#if __GNUC__ > 4 || (defined(__GNUC_MINOR__) && __GNUC_MINOR__ >= 3)
+#define BSON_UINT32_SWAP_LE_BE(v) __builtin_bswap32 ((uint32_t) v)
+#define BSON_UINT64_SWAP_LE_BE(v) __builtin_bswap64 ((uint64_t) v)
+#endif
+#if __GNUC__ > 4 || (defined(__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
+#define BSON_UINT16_SWAP_LE_BE(v) __builtin_bswap16 ((uint32_t) v)
+#endif
+#endif
+
+
+#ifndef BSON_UINT16_SWAP_LE_BE
+#define BSON_UINT16_SWAP_LE_BE(v) __bson_uint16_swap_slow ((uint16_t) v)
+#endif
+
+
+#ifndef BSON_UINT32_SWAP_LE_BE
+#define BSON_UINT32_SWAP_LE_BE(v) __bson_uint32_swap_slow ((uint32_t) v)
+#endif
+
+
+#ifndef BSON_UINT64_SWAP_LE_BE
+#define BSON_UINT64_SWAP_LE_BE(v) __bson_uint64_swap_slow ((uint64_t) v)
+#endif
+
+
+#if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN
+#define BSON_UINT16_FROM_LE(v) ((uint16_t) v)
+#define BSON_UINT16_TO_LE(v) ((uint16_t) v)
+#define BSON_UINT16_FROM_BE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT16_TO_BE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT32_FROM_LE(v) ((uint32_t) v)
+#define BSON_UINT32_TO_LE(v) ((uint32_t) v)
+#define BSON_UINT32_FROM_BE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT32_TO_BE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT64_FROM_LE(v) ((uint64_t) v)
+#define BSON_UINT64_TO_LE(v) ((uint64_t) v)
+#define BSON_UINT64_FROM_BE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_UINT64_TO_BE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_DOUBLE_FROM_LE(v) ((double) v)
+#define BSON_DOUBLE_TO_LE(v) ((double) v)
+#elif BSON_BYTE_ORDER == BSON_BIG_ENDIAN
+#define BSON_UINT16_FROM_LE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT16_TO_LE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT16_FROM_BE(v) ((uint16_t) v)
+#define BSON_UINT16_TO_BE(v) ((uint16_t) v)
+#define BSON_UINT32_FROM_LE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT32_TO_LE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT32_FROM_BE(v) ((uint32_t) v)
+#define BSON_UINT32_TO_BE(v) ((uint32_t) v)
+#define BSON_UINT64_FROM_LE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_UINT64_TO_LE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_UINT64_FROM_BE(v) ((uint64_t) v)
+#define BSON_UINT64_TO_BE(v) ((uint64_t) v)
+#define BSON_DOUBLE_FROM_LE(v) (__bson_double_swap_slow (v))
+#define BSON_DOUBLE_TO_LE(v) (__bson_double_swap_slow (v))
+#else
+#error "The endianness of target architecture is unknown."
+#endif
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_uint16_swap_slow --
+ *
+ *       Fallback endianness conversion for 16-bit integers.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+static BSON_INLINE uint16_t
+__bson_uint16_swap_slow (uint16_t v) /* IN */
+{
+   return (uint16_t) ((v & 0x00FF) << 8) | (uint16_t) ((v & 0xFF00) >> 8);
+}
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_uint32_swap_slow --
+ *
+ *       Fallback endianness conversion for 32-bit integers.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+static BSON_INLINE uint32_t
+__bson_uint32_swap_slow (uint32_t v) /* IN */
+{
+   return ((v & 0x000000FFU) << 24) | ((v & 0x0000FF00U) << 8) |
+          ((v & 0x00FF0000U) >> 8) | ((v & 0xFF000000U) >> 24);
+}
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_uint64_swap_slow --
+ *
+ *       Fallback endianness conversion for 64-bit integers.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+static BSON_INLINE uint64_t
+__bson_uint64_swap_slow (uint64_t v) /* IN */
+{
+   return ((v & 0x00000000000000FFULL) << 56) |
+          ((v & 0x000000000000FF00ULL) << 40) |
+          ((v & 0x0000000000FF0000ULL) << 24) |
+          ((v & 0x00000000FF000000ULL) << 8) |
+          ((v & 0x000000FF00000000ULL) >> 8) |
+          ((v & 0x0000FF0000000000ULL) >> 24) |
+          ((v & 0x00FF000000000000ULL) >> 40) |
+          ((v & 0xFF00000000000000ULL) >> 56);
+}
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_double_swap_slow --
+ *
+ *       Fallback endianness conversion for double floating point.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+BSON_STATIC_ASSERT2 (sizeof_uint64_t, sizeof (double) == sizeof (uint64_t));
+
+static BSON_INLINE double
+__bson_double_swap_slow (double v) /* IN */
+{
+   uint64_t uv;
+
+   memcpy (&uv, &v, sizeof (v));
+   uv = BSON_UINT64_SWAP_LE_BE (uv);
+   memcpy (&v, &uv, sizeof (v));
+
+   return v;
+}
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ENDIAN_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-error.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-error.h
new file mode 100644
index 0000000..24b6b97
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-error.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ERROR_H
+#define BSON_ERROR_H
+
+
+#include "bson-compat.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_ERROR_JSON 1
+#define BSON_ERROR_READER 2
+#define BSON_ERROR_INVALID 3
+
+
+BSON_EXPORT (void)
+bson_set_error (bson_error_t *error,
+                uint32_t domain,
+                uint32_t code,
+                const char *format,
+                ...) BSON_GNUC_PRINTF (4, 5);
+BSON_EXPORT (char *)
+bson_strerror_r (int err_code, char *buf, size_t buflen);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ERROR_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-iter.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-iter.h
new file mode 100644
index 0000000..92e1968
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-iter.h
@@ -0,0 +1,547 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ITER_H
+#define BSON_ITER_H
+
+
+#include "bson.h"
+#include "bson-endian.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_ITER_HOLDS_DOUBLE(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DOUBLE)
+
+#define BSON_ITER_HOLDS_UTF8(iter) (bson_iter_type ((iter)) == BSON_TYPE_UTF8)
+
+#define BSON_ITER_HOLDS_DOCUMENT(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DOCUMENT)
+
+#define BSON_ITER_HOLDS_ARRAY(iter) (bson_iter_type ((iter)) == BSON_TYPE_ARRAY)
+
+#define BSON_ITER_HOLDS_BINARY(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_BINARY)
+
+#define BSON_ITER_HOLDS_UNDEFINED(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_UNDEFINED)
+
+#define BSON_ITER_HOLDS_OID(iter) (bson_iter_type ((iter)) == BSON_TYPE_OID)
+
+#define BSON_ITER_HOLDS_BOOL(iter) (bson_iter_type ((iter)) == BSON_TYPE_BOOL)
+
+#define BSON_ITER_HOLDS_DATE_TIME(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DATE_TIME)
+
+#define BSON_ITER_HOLDS_NULL(iter) (bson_iter_type ((iter)) == BSON_TYPE_NULL)
+
+#define BSON_ITER_HOLDS_REGEX(iter) (bson_iter_type ((iter)) == BSON_TYPE_REGEX)
+
+#define BSON_ITER_HOLDS_DBPOINTER(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DBPOINTER)
+
+#define BSON_ITER_HOLDS_CODE(iter) (bson_iter_type ((iter)) == BSON_TYPE_CODE)
+
+#define BSON_ITER_HOLDS_SYMBOL(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_SYMBOL)
+
+#define BSON_ITER_HOLDS_CODEWSCOPE(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_CODEWSCOPE)
+
+#define BSON_ITER_HOLDS_INT32(iter) (bson_iter_type ((iter)) == BSON_TYPE_INT32)
+
+#define BSON_ITER_HOLDS_TIMESTAMP(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_TIMESTAMP)
+
+#define BSON_ITER_HOLDS_INT64(iter) (bson_iter_type ((iter)) == BSON_TYPE_INT64)
+
+#define BSON_ITER_HOLDS_DECIMAL128(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DECIMAL128)
+
+#define BSON_ITER_HOLDS_MAXKEY(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_MAXKEY)
+
+#define BSON_ITER_HOLDS_MINKEY(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_MINKEY)
+
+#define BSON_ITER_HOLDS_INT(iter) \
+   (BSON_ITER_HOLDS_INT32 (iter) || BSON_ITER_HOLDS_INT64 (iter))
+
+#define BSON_ITER_HOLDS_NUMBER(iter) \
+   (BSON_ITER_HOLDS_INT (iter) || BSON_ITER_HOLDS_DOUBLE (iter))
+
+#define BSON_ITER_IS_KEY(iter, key) \
+   (0 == strcmp ((key), bson_iter_key ((iter))))
+
+
+BSON_EXPORT (const bson_value_t *)
+bson_iter_value (bson_iter_t *iter);
+
+
+/**
+ * bson_iter_utf8_len_unsafe:
+ * @iter: a bson_iter_t.
+ *
+ * Returns the length of a string currently pointed to by @iter. This performs
+ * no validation so the is responsible for knowing the BSON is valid. Calling
+ * bson_validate() is one way to do this ahead of time.
+ */
+static BSON_INLINE uint32_t
+bson_iter_utf8_len_unsafe (const bson_iter_t *iter)
+{
+   int32_t val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   val = BSON_UINT32_FROM_LE (val);
+   return BSON_MAX (0, val - 1);
+}
+
+
+BSON_EXPORT (void)
+bson_iter_array (const bson_iter_t *iter,
+                 uint32_t *array_len,
+                 const uint8_t **array);
+
+
+BSON_EXPORT (void)
+bson_iter_binary (const bson_iter_t *iter,
+                  bson_subtype_t *subtype,
+                  uint32_t *binary_len,
+                  const uint8_t **binary);
+
+
+BSON_EXPORT (const char *)
+bson_iter_code (const bson_iter_t *iter, uint32_t *length);
+
+
+/**
+ * bson_iter_code_unsafe:
+ * @iter: A bson_iter_t.
+ * @length: A location for the length of the resulting string.
+ *
+ * Like bson_iter_code() but performs no integrity checks.
+ *
+ * Returns: A string that should not be modified or freed.
+ */
+static BSON_INLINE const char *
+bson_iter_code_unsafe (const bson_iter_t *iter, uint32_t *length)
+{
+   *length = bson_iter_utf8_len_unsafe (iter);
+   return (const char *) (iter->raw + iter->d2);
+}
+
+
+BSON_EXPORT (const char *)
+bson_iter_codewscope (const bson_iter_t *iter,
+                      uint32_t *length,
+                      uint32_t *scope_len,
+                      const uint8_t **scope);
+
+
+BSON_EXPORT (void)
+bson_iter_dbpointer (const bson_iter_t *iter,
+                     uint32_t *collection_len,
+                     const char **collection,
+                     const bson_oid_t **oid);
+
+
+BSON_EXPORT (void)
+bson_iter_document (const bson_iter_t *iter,
+                    uint32_t *document_len,
+                    const uint8_t **document);
+
+
+BSON_EXPORT (double)
+bson_iter_double (const bson_iter_t *iter);
+
+BSON_EXPORT (double)
+bson_iter_as_double (const bson_iter_t *iter);
+
+/**
+ * bson_iter_double_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_double() but does not perform an integrity checking.
+ *
+ * Returns: A double.
+ */
+static BSON_INLINE double
+bson_iter_double_unsafe (const bson_iter_t *iter)
+{
+   double val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   return BSON_DOUBLE_FROM_LE (val);
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_init (bson_iter_t *iter, const bson_t *bson);
+
+BSON_EXPORT (bool)
+bson_iter_init_from_data (bson_iter_t *iter,
+                          const uint8_t *data,
+                          size_t length);
+
+
+BSON_EXPORT (bool)
+bson_iter_init_find (bson_iter_t *iter, const bson_t *bson, const char *key);
+
+
+BSON_EXPORT (bool)
+bson_iter_init_find_w_len (bson_iter_t *iter,
+                           const bson_t *bson,
+                           const char *key,
+                           int keylen);
+
+
+BSON_EXPORT (bool)
+bson_iter_init_find_case (bson_iter_t *iter,
+                          const bson_t *bson,
+                          const char *key);
+
+BSON_EXPORT (bool)
+bson_iter_init_from_data_at_offset (bson_iter_t *iter,
+                                    const uint8_t *data,
+                                    size_t length,
+                                    uint32_t offset,
+                                    uint32_t keylen);
+
+BSON_EXPORT (int32_t)
+bson_iter_int32 (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_int32_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_int32() but with no integrity checking.
+ *
+ * Returns: A 32-bit signed integer.
+ */
+static BSON_INLINE int32_t
+bson_iter_int32_unsafe (const bson_iter_t *iter)
+{
+   int32_t val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   return BSON_UINT32_FROM_LE (val);
+}
+
+
+BSON_EXPORT (int64_t)
+bson_iter_int64 (const bson_iter_t *iter);
+
+
+BSON_EXPORT (int64_t)
+bson_iter_as_int64 (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_int64_unsafe:
+ * @iter: a bson_iter_t.
+ *
+ * Similar to bson_iter_int64() but without integrity checking.
+ *
+ * Returns: A 64-bit signed integer.
+ */
+static BSON_INLINE int64_t
+bson_iter_int64_unsafe (const bson_iter_t *iter)
+{
+   int64_t val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   return BSON_UINT64_FROM_LE (val);
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_find (bson_iter_t *iter, const char *key);
+
+
+BSON_EXPORT (bool)
+bson_iter_find_w_len (bson_iter_t *iter, const char *key, int keylen);
+
+
+BSON_EXPORT (bool)
+bson_iter_find_case (bson_iter_t *iter, const char *key);
+
+
+BSON_EXPORT (bool)
+bson_iter_find_descendant (bson_iter_t *iter,
+                           const char *dotkey,
+                           bson_iter_t *descendant);
+
+
+BSON_EXPORT (bool)
+bson_iter_next (bson_iter_t *iter);
+
+
+BSON_EXPORT (const bson_oid_t *)
+bson_iter_oid (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_oid_unsafe:
+ * @iter: A #bson_iter_t.
+ *
+ * Similar to bson_iter_oid() but performs no integrity checks.
+ *
+ * Returns: A #bson_oid_t that should not be modified or freed.
+ */
+static BSON_INLINE const bson_oid_t *
+bson_iter_oid_unsafe (const bson_iter_t *iter)
+{
+   return (const bson_oid_t *) (iter->raw + iter->d1);
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_decimal128 (const bson_iter_t *iter, bson_decimal128_t *dec);
+
+
+/**
+ * bson_iter_decimal128_unsafe:
+ * @iter: A #bson_iter_t.
+ *
+ * Similar to bson_iter_decimal128() but performs no integrity checks.
+ *
+ * Returns: A #bson_decimal128_t.
+ */
+static BSON_INLINE void
+bson_iter_decimal128_unsafe (const bson_iter_t *iter, bson_decimal128_t *dec)
+{
+   uint64_t low_le;
+   uint64_t high_le;
+
+   memcpy (&low_le, iter->raw + iter->d1, sizeof (low_le));
+   memcpy (&high_le, iter->raw + iter->d1 + 8, sizeof (high_le));
+
+   dec->low = BSON_UINT64_FROM_LE (low_le);
+   dec->high = BSON_UINT64_FROM_LE (high_le);
+}
+
+
+BSON_EXPORT (const char *)
+bson_iter_key (const bson_iter_t *iter);
+
+BSON_EXPORT (uint32_t)
+bson_iter_key_len (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_key_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_key() but performs no integrity checking.
+ *
+ * Returns: A string that should not be modified or freed.
+ */
+static BSON_INLINE const char *
+bson_iter_key_unsafe (const bson_iter_t *iter)
+{
+   return (const char *) (iter->raw + iter->key);
+}
+
+
+BSON_EXPORT (const char *)
+bson_iter_utf8 (const bson_iter_t *iter, uint32_t *length);
+
+
+/**
+ * bson_iter_utf8_unsafe:
+ *
+ * Similar to bson_iter_utf8() but performs no integrity checking.
+ *
+ * Returns: A string that should not be modified or freed.
+ */
+static BSON_INLINE const char *
+bson_iter_utf8_unsafe (const bson_iter_t *iter, size_t *length)
+{
+   *length = bson_iter_utf8_len_unsafe (iter);
+   return (const char *) (iter->raw + iter->d2);
+}
+
+
+BSON_EXPORT (char *)
+bson_iter_dup_utf8 (const bson_iter_t *iter, uint32_t *length);
+
+
+BSON_EXPORT (int64_t)
+bson_iter_date_time (const bson_iter_t *iter);
+
+
+BSON_EXPORT (time_t)
+bson_iter_time_t (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_time_t_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_time_t() but performs no integrity checking.
+ *
+ * Returns: A time_t containing the number of seconds since UNIX epoch
+ *          in UTC.
+ */
+static BSON_INLINE time_t
+bson_iter_time_t_unsafe (const bson_iter_t *iter)
+{
+   return (time_t) (bson_iter_int64_unsafe (iter) / 1000UL);
+}
+
+
+BSON_EXPORT (void)
+bson_iter_timeval (const bson_iter_t *iter, struct timeval *tv);
+
+
+/**
+ * bson_iter_timeval_unsafe:
+ * @iter: A bson_iter_t.
+ * @tv: A struct timeval.
+ *
+ * Similar to bson_iter_timeval() but performs no integrity checking.
+ */
+static BSON_INLINE void
+bson_iter_timeval_unsafe (const bson_iter_t *iter, struct timeval *tv)
+{
+   int64_t value = bson_iter_int64_unsafe (iter);
+#ifdef BSON_OS_WIN32
+   tv->tv_sec = (long) (value / 1000);
+#else
+   tv->tv_sec = (suseconds_t) (value / 1000);
+#endif
+   tv->tv_usec = (value % 1000) * 1000;
+}
+
+
+BSON_EXPORT (void)
+bson_iter_timestamp (const bson_iter_t *iter,
+                     uint32_t *timestamp,
+                     uint32_t *increment);
+
+
+BSON_EXPORT (bool)
+bson_iter_bool (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_bool_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_bool() but performs no integrity checking.
+ *
+ * Returns: true or false.
+ */
+static BSON_INLINE bool
+bson_iter_bool_unsafe (const bson_iter_t *iter)
+{
+   char val;
+
+   memcpy (&val, iter->raw + iter->d1, 1);
+   return !!val;
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_as_bool (const bson_iter_t *iter);
+
+
+BSON_EXPORT (const char *)
+bson_iter_regex (const bson_iter_t *iter, const char **options);
+
+
+BSON_EXPORT (const char *)
+bson_iter_symbol (const bson_iter_t *iter, uint32_t *length);
+
+
+BSON_EXPORT (bson_type_t)
+bson_iter_type (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_type_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_type() but performs no integrity checking.
+ *
+ * Returns: A bson_type_t.
+ */
+static BSON_INLINE bson_type_t
+bson_iter_type_unsafe (const bson_iter_t *iter)
+{
+   return (bson_type_t) (iter->raw + iter->type)[0];
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_recurse (const bson_iter_t *iter, bson_iter_t *child);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_int32 (bson_iter_t *iter, int32_t value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_int64 (bson_iter_t *iter, int64_t value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_double (bson_iter_t *iter, double value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_decimal128 (bson_iter_t *iter, const bson_decimal128_t *value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_bool (bson_iter_t *iter, bool value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_oid (bson_iter_t *iter, const bson_oid_t *value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_timestamp (bson_iter_t *iter,
+                               uint32_t timestamp,
+                               uint32_t increment);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_date_time (bson_iter_t *iter, int64_t value);
+
+
+BSON_EXPORT (bool)
+bson_iter_visit_all (bson_iter_t *iter,
+                     const bson_visitor_t *visitor,
+                     void *data);
+
+BSON_EXPORT (uint32_t)
+bson_iter_offset (bson_iter_t *iter);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ITER_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-json.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-json.h
new file mode 100644
index 0000000..20fab57
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-json.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_JSON_H
+#define BSON_JSON_H
+
+
+#include "bson.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _bson_json_reader_t bson_json_reader_t;
+
+
+typedef enum {
+   BSON_JSON_ERROR_READ_CORRUPT_JS = 1,
+   BSON_JSON_ERROR_READ_INVALID_PARAM,
+   BSON_JSON_ERROR_READ_CB_FAILURE,
+} bson_json_error_code_t;
+
+
+/**
+ * BSON_MAX_LEN_UNLIMITED
+ *
+ * Denotes unlimited length limit when converting BSON to JSON.
+ */
+#define BSON_MAX_LEN_UNLIMITED -1
+
+/**
+ * bson_json_mode_t:
+ *
+ * This enumeration contains the different modes to serialize BSON into extended
+ * JSON.
+ */
+typedef enum {
+   BSON_JSON_MODE_LEGACY,
+   BSON_JSON_MODE_CANONICAL,
+   BSON_JSON_MODE_RELAXED,
+} bson_json_mode_t;
+
+
+BSON_EXPORT (bson_json_opts_t *)
+bson_json_opts_new (bson_json_mode_t mode, int32_t max_len);
+BSON_EXPORT (void)
+bson_json_opts_destroy (bson_json_opts_t *opts);
+
+
+typedef ssize_t (*bson_json_reader_cb) (void *handle,
+                                        uint8_t *buf,
+                                        size_t count);
+typedef void (*bson_json_destroy_cb) (void *handle);
+
+
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_reader_new (void *data,
+                      bson_json_reader_cb cb,
+                      bson_json_destroy_cb dcb,
+                      bool allow_multiple,
+                      size_t buf_size);
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_reader_new_from_fd (int fd, bool close_on_destroy);
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_reader_new_from_file (const char *filename, bson_error_t *error);
+BSON_EXPORT (void)
+bson_json_reader_destroy (bson_json_reader_t *reader);
+BSON_EXPORT (int)
+bson_json_reader_read (bson_json_reader_t *reader,
+                       bson_t *bson,
+                       bson_error_t *error);
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_data_reader_new (bool allow_multiple, size_t size);
+BSON_EXPORT (void)
+bson_json_data_reader_ingest (bson_json_reader_t *reader,
+                              const uint8_t *data,
+                              size_t len);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_JSON_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-keys.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-keys.h
new file mode 100644
index 0000000..da3efad
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-keys.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_KEYS_H
+#define BSON_KEYS_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (size_t)
+bson_uint32_to_string (uint32_t value,
+                       const char **strptr,
+                       char *str,
+                       size_t size);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_KEYS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-macros.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-macros.h
new file mode 100644
index 0000000..e7a3097
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-macros.h
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_MACROS_H
+#define BSON_MACROS_H
+
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+#include <algorithm>
+#endif
+
+#include "bson-config.h"
+
+
+#if BSON_OS == 1
+#define BSON_OS_UNIX
+#elif BSON_OS == 2
+#define BSON_OS_WIN32
+#else
+#error "Unknown operating system."
+#endif
+
+
+#ifdef __cplusplus
+#define BSON_BEGIN_DECLS extern "C" {
+#define BSON_END_DECLS }
+#else
+#define BSON_BEGIN_DECLS
+#define BSON_END_DECLS
+#endif
+
+
+#if defined(__GNUC__)
+#define BSON_GNUC_CHECK_VERSION(major, minor) \
+   ((__GNUC__ > (major)) ||                   \
+    ((__GNUC__ == (major)) && (__GNUC_MINOR__ >= (minor))))
+#else
+#define BSON_GNUC_CHECK_VERSION(major, minor) 0
+#endif
+
+
+#if defined(__GNUC__)
+#define BSON_GNUC_IS_VERSION(major, minor) \
+   ((__GNUC__ == (major)) && (__GNUC_MINOR__ == (minor)))
+#else
+#define BSON_GNUC_IS_VERSION(major, minor) 0
+#endif
+
+
+/* Decorate public functions:
+ * - if BSON_STATIC, we're compiling a program that uses libbson as a static
+ *   library, don't decorate functions
+ * - else if BSON_COMPILATION, we're compiling a static or shared libbson, mark
+ *   public functions for export from the shared lib (which has no effect on
+ *   the static lib)
+ * - else, we're compiling a program that uses libbson as a shared library,
+ *   mark public functions as DLL imports for Microsoft Visual C
+ */
+
+#ifdef _MSC_VER
+/*
+ * Microsoft Visual C
+ */
+#ifdef BSON_STATIC
+#define BSON_API
+#elif defined(BSON_COMPILATION)
+#define BSON_API __declspec(dllexport)
+#else
+#define BSON_API __declspec(dllimport)
+#endif
+#define BSON_CALL __cdecl
+
+#elif defined(__GNUC__)
+/*
+ * GCC
+ */
+#ifdef BSON_STATIC
+#define BSON_API
+#elif defined(BSON_COMPILATION)
+#define BSON_API __attribute__ ((visibility ("default")))
+#else
+#define BSON_API
+#endif
+#define BSON_CALL
+
+#else
+/*
+ * Other compilers
+ */
+#define BSON_API
+#define BSON_CALL
+
+#endif
+
+#define BSON_EXPORT(type) BSON_API type BSON_CALL
+
+
+#ifdef MIN
+#define BSON_MIN MIN
+#elif defined(__cplusplus)
+#define BSON_MIN(a, b) ((std::min) (a, b))
+#elif defined(_MSC_VER)
+#define BSON_MIN(a, b) ((a) < (b) ? (a) : (b))
+#else
+#define BSON_MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+#ifdef MAX
+#define BSON_MAX MAX
+#elif defined(__cplusplus)
+#define BSON_MAX(a, b) ((std::max) (a, b))
+#elif defined(_MSC_VER)
+#define BSON_MAX(a, b) ((a) > (b) ? (a) : (b))
+#else
+#define BSON_MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+
+
+#ifdef ABS
+#define BSON_ABS ABS
+#else
+#define BSON_ABS(a) (((a) < 0) ? ((a) * -1) : (a))
+#endif
+
+#if __STDC_VERSION__ >= 201112L
+#define BSON_ALIGNOF(expr) _Alignof(expr)
+#else
+#if defined(_MSC_VER)
+#define BSON_ALIGNOF(expr) __alignof(expr)
+#else
+#define BSON_ALIGNOF(expr) __alignof__(expr)
+#endif
+#endif // __STDC_VERSION__ >= 201112L
+
+#ifdef _MSC_VER
+// __declspec (align (_N)) only permits integer literals as _N.
+#ifdef _WIN64
+#define BSON_ALIGN_OF_PTR 8
+#else
+#define BSON_ALIGN_OF_PTR 4
+#endif
+#else
+#define BSON_ALIGN_OF_PTR (BSON_ALIGNOF (void *))
+#endif
+
+#ifdef BSON_EXTRA_ALIGN
+#if defined(_MSC_VER)
+#define BSON_ALIGNED_BEGIN(_N) __declspec(align (_N))
+#define BSON_ALIGNED_END(_N)
+#else
+#define BSON_ALIGNED_BEGIN(_N)
+#define BSON_ALIGNED_END(_N) __attribute__ ((aligned (_N)))
+#endif
+#else
+#if defined(_MSC_VER)
+#define BSON_ALIGNED_BEGIN(_N) __declspec(align (BSON_ALIGN_OF_PTR))
+#define BSON_ALIGNED_END(_N)
+#else
+#define BSON_ALIGNED_BEGIN(_N)
+#define BSON_ALIGNED_END(_N) \
+   __attribute__ ((          \
+      aligned ((_N) > BSON_ALIGN_OF_PTR ? BSON_ALIGN_OF_PTR : (_N))))
+#endif
+#endif
+
+
+#define bson_str_empty(s) (!s[0])
+#define bson_str_empty0(s) (!s || !s[0])
+
+
+#if defined(_MSC_VER)
+#define BSON_FUNC __FUNCTION__
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L
+#define BSON_FUNC __FUNCTION__
+#else
+#define BSON_FUNC __func__
+#endif
+
+#define BSON_ASSERT(test)                                  \
+   do {                                                    \
+      if (!(BSON_LIKELY (test))) {                         \
+         fprintf (stderr,                                  \
+                  "%s:%d %s(): precondition failed: %s\n", \
+                  __FILE__,                                \
+                  __LINE__,                                \
+                  BSON_FUNC,                               \
+                  #test);                                  \
+         abort ();                                         \
+      }                                                    \
+   } while (0)
+
+/**
+ * @brief Assert the expression `Assertion`, and evaluates to `Value` on
+ * success.
+ */
+#define BSON_ASSERT_INLINE(Assertion, Value)                              \
+   ((void) ((Assertion) ? (0)                                             \
+                        : ((fprintf (stderr,                              \
+                                     "%s:%d %s(): Assertion '%s' failed", \
+                                     __FILE__,                            \
+                                     __LINE__,                            \
+                                     BSON_FUNC,                           \
+                                     #Assertion),                         \
+                            abort ()),                                    \
+                           0)),                                           \
+    Value)
+
+/**
+ * @brief Assert that the given pointer is non-NULL, while also evaluating to
+ * that pointer.
+ *
+ * Can be used to inline assertions with a pointer dereference:
+ *
+ * ```
+ * foo* f = get_foo();
+ * bar* b = BSON_ASSERT_PTR_INLINE(f)->bar_value;
+ * ```
+ */
+#define BSON_ASSERT_PTR_INLINE(Pointer) \
+   BSON_ASSERT_INLINE ((Pointer) != NULL, (Pointer))
+
+/* Used for asserting parameters to provide a more precise error message */
+#define BSON_ASSERT_PARAM(param)                                         \
+   do {                                                                  \
+      if ((BSON_UNLIKELY (param == NULL))) {                             \
+         fprintf (stderr,                                                \
+                  "The parameter: %s, in function %s, cannot be NULL\n", \
+                  #param,                                                \
+                  BSON_FUNC);                                            \
+         abort ();                                                       \
+      }                                                                  \
+   } while (0)
+
+/* obsolete macros, preserved for compatibility */
+#define BSON_STATIC_ASSERT(s) BSON_STATIC_ASSERT_ (s, __LINE__)
+#define BSON_STATIC_ASSERT_JOIN(a, b) BSON_STATIC_ASSERT_JOIN2 (a, b)
+#define BSON_STATIC_ASSERT_JOIN2(a, b) a##b
+#define BSON_STATIC_ASSERT_(s, l)                             \
+   typedef char BSON_STATIC_ASSERT_JOIN (static_assert_test_, \
+                                         __LINE__)[(s) ? 1 : -1]
+
+/* modern macros */
+#define BSON_STATIC_ASSERT2(_name, _s) \
+   BSON_STATIC_ASSERT2_ (_s, __LINE__, _name)
+#define BSON_STATIC_ASSERT_JOIN3(_a, _b, _name) \
+   BSON_STATIC_ASSERT_JOIN4 (_a, _b, _name)
+#define BSON_STATIC_ASSERT_JOIN4(_a, _b, _name) _a##_b##_name
+#define BSON_STATIC_ASSERT2_(_s, _l, _name) \
+   typedef char BSON_STATIC_ASSERT_JOIN3 (  \
+      static_assert_test_, __LINE__, _name)[(_s) ? 1 : -1]
+
+
+#if defined(__GNUC__)
+#define BSON_GNUC_PURE __attribute__ ((pure))
+#define BSON_GNUC_WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
+#else
+#define BSON_GNUC_PURE
+#define BSON_GNUC_WARN_UNUSED_RESULT
+#endif
+
+
+#if BSON_GNUC_CHECK_VERSION(4, 0) && !defined(_WIN32)
+#define BSON_GNUC_NULL_TERMINATED __attribute__ ((sentinel))
+#define BSON_GNUC_INTERNAL __attribute__ ((visibility ("hidden")))
+#else
+#define BSON_GNUC_NULL_TERMINATED
+#define BSON_GNUC_INTERNAL
+#endif
+
+
+#if defined(__GNUC__)
+#define BSON_LIKELY(x) __builtin_expect (!!(x), 1)
+#define BSON_UNLIKELY(x) __builtin_expect (!!(x), 0)
+#else
+#define BSON_LIKELY(v) v
+#define BSON_UNLIKELY(v) v
+#endif
+
+
+#if defined(__clang__)
+#define BSON_GNUC_PRINTF(f, v) __attribute__ ((format (printf, f, v)))
+#elif BSON_GNUC_CHECK_VERSION(4, 4)
+#define BSON_GNUC_PRINTF(f, v) __attribute__ ((format (gnu_printf, f, v)))
+#else
+#define BSON_GNUC_PRINTF(f, v)
+#endif
+
+
+#if defined(__LP64__) || defined(_LP64)
+#define BSON_WORD_SIZE 64
+#else
+#define BSON_WORD_SIZE 32
+#endif
+
+
+#if defined(_MSC_VER)
+#define BSON_INLINE __inline
+#else
+#define BSON_INLINE __inline__
+#endif
+
+
+#ifdef _MSC_VER
+#define BSON_ENSURE_ARRAY_PARAM_SIZE(_n)
+#define BSON_TYPEOF decltype
+#else
+#define BSON_ENSURE_ARRAY_PARAM_SIZE(_n) static(_n)
+#define BSON_TYPEOF typeof
+#endif
+
+
+#if BSON_GNUC_CHECK_VERSION(3, 1)
+#define BSON_GNUC_DEPRECATED __attribute__ ((__deprecated__))
+#else
+#define BSON_GNUC_DEPRECATED
+#endif
+
+#define BSON_CONCAT_IMPL(a, ...) a##__VA_ARGS__
+#define BSON_CONCAT(a, ...) BSON_CONCAT_IMPL (a, __VA_ARGS__)
+#define BSON_CONCAT3(a, b, c) BSON_CONCAT (a, BSON_CONCAT (b, c))
+#define BSON_CONCAT4(a, b, c, d) \
+   BSON_CONCAT (BSON_CONCAT (a, b), BSON_CONCAT (c, d))
+
+#if BSON_GNUC_CHECK_VERSION(4, 5)
+#define BSON_GNUC_DEPRECATED_FOR(f) \
+   __attribute__ ((deprecated ("Use " #f " instead")))
+#else
+#define BSON_GNUC_DEPRECATED_FOR(f) BSON_GNUC_DEPRECATED
+#endif
+
+/**
+ * @brief String-ify the given argument
+ */
+#define BSON_STR(...) #__VA_ARGS__
+
+/**
+ * @brief Mark the attached declared entity as "possibly-unused."
+ *
+ * Does nothing on MSVC.
+ */
+#if defined(__GNUC__) || defined(__clang__)
+#define BSON_MAYBE_UNUSED __attribute__ ((unused))
+#else
+#define BSON_MAYBE_UNUSED /* Nothing for other compilers */
+#endif
+
+/**
+ * @brief Mark a point in the code as unreachable. If the point is reached, the
+ * program will abort with an error message.
+ *
+ * @param What A string to include in the error message if this point is ever
+ * executed.
+ */
+#define BSON_UNREACHABLE(What)                               \
+   do {                                                      \
+      fprintf (stderr,                                       \
+               "%s:%d %s(): Unreachable code reached: %s\n", \
+               __FILE__,                                     \
+               __LINE__,                                     \
+               BSON_FUNC,                                    \
+               What);                                        \
+      abort ();                                              \
+   } while (0)
+
+/**
+ * @brief Silence warnings for deliberately unused variables or parameters.
+ *
+ * @param expr An unused variable or parameter.
+ *
+ */
+#define BSON_UNUSED(expr) \
+   do {                   \
+      (void) (expr);      \
+   } while (0)
+
+#endif /* BSON_MACROS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-md5.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-md5.h
new file mode 100644
index 0000000..213fc5d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-md5.h
@@ -0,0 +1,89 @@
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgement in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+    http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+    references to Ghostscript; clarified derivation from RFC 1321;
+    now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+    added conditionalization for C++ compilation from Martin
+    Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+
+/*
+ * The following MD5 implementation has been modified to use types as
+ * specified in libbson.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_MD5_H
+#define BSON_MD5_H
+
+
+#include "bson-endian.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct {
+   uint32_t count[2]; /* message length in bits, lsw first */
+   uint32_t abcd[4];  /* digest buffer */
+   uint8_t buf[64];   /* accumulate block */
+} bson_md5_t;
+
+
+BSON_EXPORT (void)
+bson_md5_init (bson_md5_t *pms) BSON_GNUC_DEPRECATED;
+BSON_EXPORT (void)
+bson_md5_append (bson_md5_t *pms,
+                 const uint8_t *data,
+                 uint32_t nbytes) BSON_GNUC_DEPRECATED;
+BSON_EXPORT (void)
+bson_md5_finish (bson_md5_t *pms, uint8_t digest[16]) BSON_GNUC_DEPRECATED;
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_MD5_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-memory.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-memory.h
new file mode 100644
index 0000000..a0f8c23
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-memory.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_MEMORY_H
+#define BSON_MEMORY_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef void *(*bson_realloc_func) (void *mem, size_t num_bytes, void *ctx);
+
+
+typedef struct _bson_mem_vtable_t {
+   void *(*malloc) (size_t num_bytes);
+   void *(*calloc) (size_t n_members, size_t num_bytes);
+   void *(*realloc) (void *mem, size_t num_bytes);
+   void (*free) (void *mem);
+   void *(*aligned_alloc) (size_t alignment, size_t num_bytes);
+   void *padding[3];
+} bson_mem_vtable_t;
+
+
+BSON_EXPORT (void)
+bson_mem_set_vtable (const bson_mem_vtable_t *vtable);
+BSON_EXPORT (void)
+bson_mem_restore_vtable (void);
+BSON_EXPORT (void *)
+bson_malloc (size_t num_bytes);
+BSON_EXPORT (void *)
+bson_malloc0 (size_t num_bytes);
+BSON_EXPORT (void *)
+bson_aligned_alloc (size_t alignment, size_t num_bytes);
+BSON_EXPORT (void *)
+bson_aligned_alloc0 (size_t alignment, size_t num_bytes);
+BSON_EXPORT (void *)
+bson_realloc (void *mem, size_t num_bytes);
+BSON_EXPORT (void *)
+bson_realloc_ctx (void *mem, size_t num_bytes, void *ctx);
+BSON_EXPORT (void)
+bson_free (void *mem);
+BSON_EXPORT (void)
+bson_zero_free (void *mem, size_t size);
+
+
+#define BSON_ALIGNED_ALLOC(T) \
+   ((T *) (bson_aligned_alloc (BSON_ALIGNOF (T), sizeof (T))))
+#define BSON_ALIGNED_ALLOC0(T) \
+   ((T *) (bson_aligned_alloc0 (BSON_ALIGNOF (T), sizeof (T))))
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_MEMORY_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-oid.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-oid.h
new file mode 100644
index 0000000..8586df8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-oid.h
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_OID_H
+#define BSON_OID_H
+
+
+#include <time.h>
+
+#include "bson-context.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+#include "bson-endian.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (int)
+bson_oid_compare (const bson_oid_t *oid1, const bson_oid_t *oid2);
+BSON_EXPORT (void)
+bson_oid_copy (const bson_oid_t *src, bson_oid_t *dst);
+BSON_EXPORT (bool)
+bson_oid_equal (const bson_oid_t *oid1, const bson_oid_t *oid2);
+BSON_EXPORT (bool)
+bson_oid_is_valid (const char *str, size_t length);
+BSON_EXPORT (time_t)
+bson_oid_get_time_t (const bson_oid_t *oid);
+BSON_EXPORT (uint32_t)
+bson_oid_hash (const bson_oid_t *oid);
+BSON_EXPORT (void)
+bson_oid_init (bson_oid_t *oid, bson_context_t *context);
+BSON_EXPORT (void)
+bson_oid_init_from_data (bson_oid_t *oid, const uint8_t *data);
+BSON_EXPORT (void)
+bson_oid_init_from_string (bson_oid_t *oid, const char *str);
+BSON_EXPORT (void)
+bson_oid_init_sequence (bson_oid_t *oid,
+                        bson_context_t *context) BSON_GNUC_DEPRECATED;
+BSON_EXPORT (void)
+bson_oid_to_string (const bson_oid_t *oid, char str[25]);
+
+
+/**
+ * bson_oid_compare_unsafe:
+ * @oid1: A bson_oid_t.
+ * @oid2: A bson_oid_t.
+ *
+ * Performs a qsort() style comparison between @oid1 and @oid2.
+ *
+ * This function is meant to be as fast as possible and therefore performs
+ * no argument validation. That is the callers responsibility.
+ *
+ * Returns: An integer < 0 if @oid1 is less than @oid2. Zero if they are equal.
+ *          An integer > 0 if @oid1 is greater than @oid2.
+ */
+static BSON_INLINE int
+bson_oid_compare_unsafe (const bson_oid_t *oid1, const bson_oid_t *oid2)
+{
+   return memcmp (oid1, oid2, sizeof *oid1);
+}
+
+
+/**
+ * bson_oid_equal_unsafe:
+ * @oid1: A bson_oid_t.
+ * @oid2: A bson_oid_t.
+ *
+ * Checks the equality of @oid1 and @oid2.
+ *
+ * This function is meant to be as fast as possible and therefore performs
+ * no checks for argument validity. That is the callers responsibility.
+ *
+ * Returns: true if @oid1 and @oid2 are equal; otherwise false.
+ */
+static BSON_INLINE bool
+bson_oid_equal_unsafe (const bson_oid_t *oid1, const bson_oid_t *oid2)
+{
+   return !memcmp (oid1, oid2, sizeof *oid1);
+}
+
+/**
+ * bson_oid_hash_unsafe:
+ * @oid: A bson_oid_t.
+ *
+ * This function performs a DJB style hash upon the bytes contained in @oid.
+ * The result is a hash key suitable for use in a hashtable.
+ *
+ * This function is meant to be as fast as possible and therefore performs no
+ * validation of arguments. The caller is responsible to ensure they are
+ * passing valid arguments.
+ *
+ * Returns: A uint32_t containing a hash code.
+ */
+static BSON_INLINE uint32_t
+bson_oid_hash_unsafe (const bson_oid_t *oid)
+{
+   uint32_t hash = 5381;
+   uint32_t i;
+
+   for (i = 0; i < sizeof oid->bytes; i++) {
+      hash = ((hash << 5) + hash) + oid->bytes[i];
+   }
+
+   return hash;
+}
+
+
+/**
+ * bson_oid_copy_unsafe:
+ * @src: A bson_oid_t to copy from.
+ * @dst: A bson_oid_t to copy into.
+ *
+ * Copies the contents of @src into @dst. This function is meant to be as
+ * fast as possible and therefore performs no argument checking. It is the
+ * callers responsibility to ensure they are passing valid data into the
+ * function.
+ */
+static BSON_INLINE void
+bson_oid_copy_unsafe (const bson_oid_t *src, bson_oid_t *dst)
+{
+   memcpy (dst, src, sizeof *src);
+}
+
+
+/**
+ * bson_oid_parse_hex_char:
+ * @hex: A character to parse to its integer value.
+ *
+ * This function contains a jump table to return the integer value for a
+ * character containing a hexadecimal value (0-9, a-f, A-F). If the character
+ * is not a hexadecimal character then zero is returned.
+ *
+ * Returns: An integer between 0 and 15.
+ */
+static BSON_INLINE uint8_t
+bson_oid_parse_hex_char (char hex)
+{
+   switch (hex) {
+   case '0':
+      return 0;
+   case '1':
+      return 1;
+   case '2':
+      return 2;
+   case '3':
+      return 3;
+   case '4':
+      return 4;
+   case '5':
+      return 5;
+   case '6':
+      return 6;
+   case '7':
+      return 7;
+   case '8':
+      return 8;
+   case '9':
+      return 9;
+   case 'a':
+   case 'A':
+      return 0xa;
+   case 'b':
+   case 'B':
+      return 0xb;
+   case 'c':
+   case 'C':
+      return 0xc;
+   case 'd':
+   case 'D':
+      return 0xd;
+   case 'e':
+   case 'E':
+      return 0xe;
+   case 'f':
+   case 'F':
+      return 0xf;
+   default:
+      return 0;
+   }
+}
+
+
+/**
+ * bson_oid_init_from_string_unsafe:
+ * @oid: A bson_oid_t to store the result.
+ * @str: A 24-character hexadecimal encoded string.
+ *
+ * Parses a string containing 24 hexadecimal encoded bytes into a bson_oid_t.
+ * This function is meant to be as fast as possible and inlined into your
+ * code. For that purpose, the function does not perform any sort of bounds
+ * checking and it is the callers responsibility to ensure they are passing
+ * valid input to the function.
+ */
+static BSON_INLINE void
+bson_oid_init_from_string_unsafe (bson_oid_t *oid, const char *str)
+{
+   int i;
+
+   for (i = 0; i < 12; i++) {
+      oid->bytes[i] = (uint8_t) ((bson_oid_parse_hex_char (str[2 * i]) << 4) |
+                                 (bson_oid_parse_hex_char (str[2 * i + 1])));
+   }
+}
+
+
+/**
+ * bson_oid_get_time_t_unsafe:
+ * @oid: A bson_oid_t.
+ *
+ * Fetches the time @oid was generated.
+ *
+ * Returns: A time_t containing the UNIX timestamp of generation.
+ */
+static BSON_INLINE time_t
+bson_oid_get_time_t_unsafe (const bson_oid_t *oid)
+{
+   uint32_t t;
+
+   memcpy (&t, oid, sizeof (t));
+   return BSON_UINT32_FROM_BE (t);
+}
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_OID_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-prelude.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-prelude.h
new file mode 100644
index 0000000..2469125
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-prelude.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(BSON_INSIDE) && !defined(BSON_COMPILATION)
+#error "Only <bson/bson.h> can be included directly."
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-reader.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-reader.h
new file mode 100644
index 0000000..2fc5db4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-reader.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_READER_H
+#define BSON_READER_H
+
+
+#include "bson-compat.h"
+#include "bson-oid.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_ERROR_READER_BADFD 1
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_reader_read_func_t --
+ *
+ *       This function is a callback used by bson_reader_t to read the
+ *       next chunk of data from the underlying opaque file descriptor.
+ *
+ *       This function is meant to operate similar to the read() function
+ *       as part of libc on UNIX-like systems.
+ *
+ * Parameters:
+ *       @handle: The handle to read from.
+ *       @buf: The buffer to read into.
+ *       @count: The number of bytes to read.
+ *
+ * Returns:
+ *       0 for end of stream.
+ *       -1 for read failure.
+ *       Greater than zero for number of bytes read into @buf.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+typedef ssize_t (*bson_reader_read_func_t) (void *handle,  /* IN */
+                                            void *buf,     /* IN */
+                                            size_t count); /* IN */
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_reader_destroy_func_t --
+ *
+ *       Destroy callback to release any resources associated with the
+ *       opaque handle.
+ *
+ * Parameters:
+ *       @handle: the handle provided to bson_reader_new_from_handle().
+ *
+ * Returns:
+ *       None.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+typedef void (*bson_reader_destroy_func_t) (void *handle); /* IN */
+
+
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_handle (void *handle,
+                             bson_reader_read_func_t rf,
+                             bson_reader_destroy_func_t df);
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_fd (int fd, bool close_on_destroy);
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_file (const char *path, bson_error_t *error);
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_data (const uint8_t *data, size_t length);
+BSON_EXPORT (void)
+bson_reader_destroy (bson_reader_t *reader);
+BSON_EXPORT (void)
+bson_reader_set_read_func (bson_reader_t *reader, bson_reader_read_func_t func);
+BSON_EXPORT (void)
+bson_reader_set_destroy_func (bson_reader_t *reader,
+                              bson_reader_destroy_func_t func);
+BSON_EXPORT (const bson_t *)
+bson_reader_read (bson_reader_t *reader, bool *reached_eof);
+BSON_EXPORT (off_t)
+bson_reader_tell (bson_reader_t *reader);
+BSON_EXPORT (void)
+bson_reader_reset (bson_reader_t *reader);
+
+BSON_END_DECLS
+
+
+#endif /* BSON_READER_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-string.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-string.h
new file mode 100644
index 0000000..dbf9497
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-string.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_STRING_H
+#define BSON_STRING_H
+
+
+#include <stdarg.h>
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct {
+   char *str;
+   uint32_t len;
+   uint32_t alloc;
+} bson_string_t;
+
+
+BSON_EXPORT (bson_string_t *)
+bson_string_new (const char *str);
+BSON_EXPORT (char *)
+bson_string_free (bson_string_t *string, bool free_segment);
+BSON_EXPORT (void)
+bson_string_append (bson_string_t *string, const char *str);
+BSON_EXPORT (void)
+bson_string_append_c (bson_string_t *string, char str);
+BSON_EXPORT (void)
+bson_string_append_unichar (bson_string_t *string, bson_unichar_t unichar);
+BSON_EXPORT (void)
+bson_string_append_printf (bson_string_t *string, const char *format, ...)
+   BSON_GNUC_PRINTF (2, 3);
+BSON_EXPORT (void)
+bson_string_truncate (bson_string_t *string, uint32_t len);
+BSON_EXPORT (char *)
+bson_strdup (const char *str);
+BSON_EXPORT (char *)
+bson_strdup_printf (const char *format, ...) BSON_GNUC_PRINTF (1, 2);
+BSON_EXPORT (char *)
+bson_strdupv_printf (const char *format, va_list args) BSON_GNUC_PRINTF (1, 0);
+BSON_EXPORT (char *)
+bson_strndup (const char *str, size_t n_bytes);
+BSON_EXPORT (void)
+bson_strncpy (char *dst, const char *src, size_t size);
+BSON_EXPORT (int)
+bson_vsnprintf (char *str, size_t size, const char *format, va_list ap)
+   BSON_GNUC_PRINTF (3, 0);
+BSON_EXPORT (int)
+bson_snprintf (char *str, size_t size, const char *format, ...)
+   BSON_GNUC_PRINTF (3, 4);
+BSON_EXPORT (void)
+bson_strfreev (char **strv);
+BSON_EXPORT (size_t)
+bson_strnlen (const char *s, size_t maxlen);
+BSON_EXPORT (int64_t)
+bson_ascii_strtoll (const char *str, char **endptr, int base);
+BSON_EXPORT (int)
+bson_strcasecmp (const char *s1, const char *s2);
+BSON_EXPORT (bool)
+bson_isspace (int c);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_STRING_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-types.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-types.h
new file mode 100644
index 0000000..498d543
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-types.h
@@ -0,0 +1,566 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_TYPES_H
+#define BSON_TYPES_H
+
+
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "bson-macros.h"
+#include "bson-config.h"
+#include "bson-compat.h"
+#include "bson-endian.h"
+
+BSON_BEGIN_DECLS
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_unichar_t --
+ *
+ *       bson_unichar_t provides an unsigned 32-bit type for containing
+ *       unicode characters. When iterating UTF-8 sequences, this should
+ *       be used to avoid losing the high-bits of non-ascii characters.
+ *
+ * See also:
+ *       bson_string_append_unichar()
+ *
+ *--------------------------------------------------------------------------
+ */
+
+typedef uint32_t bson_unichar_t;
+
+
+/**
+ * @brief Flags configuring the creation of a bson_context_t
+ */
+typedef enum {
+   /** Use default options */
+   BSON_CONTEXT_NONE = 0,
+   /* Deprecated: Generating new OIDs from a bson_context_t is always
+      thread-safe */
+   BSON_CONTEXT_THREAD_SAFE = (1 << 0),
+   /* Deprecated: Does nothing and is ignored */
+   BSON_CONTEXT_DISABLE_HOST_CACHE = (1 << 1),
+   /* Call getpid() instead of remembering the result of getpid() when using the
+      context */
+   BSON_CONTEXT_DISABLE_PID_CACHE = (1 << 2),
+   /* Deprecated: Does nothing */
+   BSON_CONTEXT_USE_TASK_ID = (1 << 3),
+} bson_context_flags_t;
+
+
+/**
+ * bson_context_t:
+ *
+ * This structure manages context for the bson library. It handles
+ * configuration for thread-safety and other performance related requirements.
+ * Consumers will create a context and may use multiple under a variety of
+ * situations.
+ *
+ * If your program calls fork(), you should initialize a new bson_context_t
+ * using bson_context_init().
+ *
+ * If you are using threading, it is suggested that you use a bson_context_t
+ * per thread for best performance. Alternatively, you can initialize the
+ * bson_context_t with BSON_CONTEXT_THREAD_SAFE, although a performance penalty
+ * will be incurred.
+ *
+ * Many functions will require that you provide a bson_context_t such as OID
+ * generation.
+ *
+ * This structure is opaque in that you cannot see the contents of the
+ * structure. However, it is stack allocatable in that enough padding is
+ * provided in _bson_context_t to hold the structure.
+ */
+typedef struct _bson_context_t bson_context_t;
+
+/**
+ * bson_json_opts_t:
+ *
+ * This structure is used to pass options for serializing BSON into extended
+ * JSON to the respective serialization methods.
+ *
+ * max_len can be either a non-negative integer, or BSON_MAX_LEN_UNLIMITED to
+ * set no limit for serialization length.
+ */
+typedef struct _bson_json_opts_t bson_json_opts_t;
+
+
+/**
+ * bson_t:
+ *
+ * This structure manages a buffer whose contents are a properly formatted
+ * BSON document. You may perform various transforms on the BSON documents.
+ * Additionally, it can be iterated over using bson_iter_t.
+ *
+ * See bson_iter_init() for iterating the contents of a bson_t.
+ *
+ * When building a bson_t structure using the various append functions,
+ * memory allocations may occur. That is performed using power of two
+ * allocations and realloc().
+ *
+ * See http://bsonspec.org for the BSON document spec.
+ *
+ * This structure is meant to fit in two sequential 64-byte cachelines.
+ */
+#ifdef BSON_MEMCHECK
+BSON_ALIGNED_BEGIN (128) typedef struct _bson_t {
+   uint32_t flags; /* Internal flags for the bson_t. */
+   uint32_t len;   /* Length of BSON data. */
+   char *canary;   /* For valgrind check */
+   uint8_t padding[120 - sizeof (char *)];
+} bson_t BSON_ALIGNED_END (128);
+#else
+BSON_ALIGNED_BEGIN (128) typedef struct _bson_t {
+   uint32_t flags;       /* Internal flags for the bson_t. */
+   uint32_t len;         /* Length of BSON data. */
+   uint8_t padding[120]; /* Padding for stack allocation. */
+} bson_t BSON_ALIGNED_END (128);
+#endif
+
+/**
+ * BSON_INITIALIZER:
+ *
+ * This macro can be used to initialize a #bson_t structure on the stack
+ * without calling bson_init().
+ *
+ * |[
+ * bson_t b = BSON_INITIALIZER;
+ * ]|
+ */
+#ifdef BSON_MEMCHECK
+#define BSON_INITIALIZER          \
+   {                              \
+      3, 5, bson_malloc (1), {5}, \
+   }
+#else
+#define BSON_INITIALIZER \
+   {                     \
+      3, 5,              \
+      {                  \
+         5               \
+      }                  \
+   }
+#endif
+
+
+BSON_STATIC_ASSERT2 (bson_t, sizeof (bson_t) == 128);
+
+
+/**
+ * bson_oid_t:
+ *
+ * This structure contains the binary form of a BSON Object Id as specified
+ * on http://bsonspec.org. If you would like the bson_oid_t in string form
+ * see bson_oid_to_string() or bson_oid_to_string_r().
+ */
+typedef struct {
+   uint8_t bytes[12];
+} bson_oid_t;
+
+BSON_STATIC_ASSERT2 (oid_t, sizeof (bson_oid_t) == 12);
+
+/**
+ * bson_decimal128_t:
+ *
+ * @high The high-order bytes of the decimal128.  This field contains sign,
+ *       combination bits, exponent, and part of the coefficient continuation.
+ * @low  The low-order bytes of the decimal128.  This field contains the second
+ *       part of the coefficient continuation.
+ *
+ * This structure is a boxed type containing the value for the BSON decimal128
+ * type.  The structure stores the 128 bits such that they correspond to the
+ * native format for the IEEE decimal128 type, if it is implemented.
+ **/
+typedef struct {
+#if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN
+   uint64_t low;
+   uint64_t high;
+#elif BSON_BYTE_ORDER == BSON_BIG_ENDIAN
+   uint64_t high;
+   uint64_t low;
+#endif
+} bson_decimal128_t;
+
+
+/**
+ * bson_validate_flags_t:
+ *
+ * This enumeration is used for validation of BSON documents. It allows
+ * selective control on what you wish to validate.
+ *
+ * %BSON_VALIDATE_NONE: No additional validation occurs.
+ * %BSON_VALIDATE_UTF8: Check that strings are valid UTF-8.
+ * %BSON_VALIDATE_DOLLAR_KEYS: Check that keys do not start with $.
+ * %BSON_VALIDATE_DOT_KEYS: Check that keys do not contain a period.
+ * %BSON_VALIDATE_UTF8_ALLOW_NULL: Allow NUL bytes in UTF-8 text.
+ * %BSON_VALIDATE_EMPTY_KEYS: Prohibit zero-length field names
+ */
+typedef enum {
+   BSON_VALIDATE_NONE = 0,
+   BSON_VALIDATE_UTF8 = (1 << 0),
+   BSON_VALIDATE_DOLLAR_KEYS = (1 << 1),
+   BSON_VALIDATE_DOT_KEYS = (1 << 2),
+   BSON_VALIDATE_UTF8_ALLOW_NULL = (1 << 3),
+   BSON_VALIDATE_EMPTY_KEYS = (1 << 4),
+} bson_validate_flags_t;
+
+
+/**
+ * bson_type_t:
+ *
+ * This enumeration contains all of the possible types within a BSON document.
+ * Use bson_iter_type() to fetch the type of a field while iterating over it.
+ */
+typedef enum {
+   BSON_TYPE_EOD = 0x00,
+   BSON_TYPE_DOUBLE = 0x01,
+   BSON_TYPE_UTF8 = 0x02,
+   BSON_TYPE_DOCUMENT = 0x03,
+   BSON_TYPE_ARRAY = 0x04,
+   BSON_TYPE_BINARY = 0x05,
+   BSON_TYPE_UNDEFINED = 0x06,
+   BSON_TYPE_OID = 0x07,
+   BSON_TYPE_BOOL = 0x08,
+   BSON_TYPE_DATE_TIME = 0x09,
+   BSON_TYPE_NULL = 0x0A,
+   BSON_TYPE_REGEX = 0x0B,
+   BSON_TYPE_DBPOINTER = 0x0C,
+   BSON_TYPE_CODE = 0x0D,
+   BSON_TYPE_SYMBOL = 0x0E,
+   BSON_TYPE_CODEWSCOPE = 0x0F,
+   BSON_TYPE_INT32 = 0x10,
+   BSON_TYPE_TIMESTAMP = 0x11,
+   BSON_TYPE_INT64 = 0x12,
+   BSON_TYPE_DECIMAL128 = 0x13,
+   BSON_TYPE_MAXKEY = 0x7F,
+   BSON_TYPE_MINKEY = 0xFF,
+} bson_type_t;
+
+
+/**
+ * bson_subtype_t:
+ *
+ * This enumeration contains the various subtypes that may be used in a binary
+ * field. See http://bsonspec.org for more information.
+ */
+typedef enum {
+   BSON_SUBTYPE_BINARY = 0x00,
+   BSON_SUBTYPE_FUNCTION = 0x01,
+   BSON_SUBTYPE_BINARY_DEPRECATED = 0x02,
+   BSON_SUBTYPE_UUID_DEPRECATED = 0x03,
+   BSON_SUBTYPE_UUID = 0x04,
+   BSON_SUBTYPE_MD5 = 0x05,
+   BSON_SUBTYPE_ENCRYPTED = 0x06,
+   BSON_SUBTYPE_COLUMN = 0x07,
+   BSON_SUBTYPE_USER = 0x80,
+} bson_subtype_t;
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_value_t --
+ *
+ *       A boxed type to contain various bson_type_t types.
+ *
+ * See also:
+ *       bson_value_copy()
+ *       bson_value_destroy()
+ *
+ *--------------------------------------------------------------------------
+ */
+
+BSON_ALIGNED_BEGIN (8)
+typedef struct _bson_value_t {
+   bson_type_t value_type;
+   int32_t padding;
+   union {
+      bson_oid_t v_oid;
+      int64_t v_int64;
+      int32_t v_int32;
+      int8_t v_int8;
+      double v_double;
+      bool v_bool;
+      int64_t v_datetime;
+      struct {
+         uint32_t timestamp;
+         uint32_t increment;
+      } v_timestamp;
+      struct {
+         char *str;
+         uint32_t len;
+      } v_utf8;
+      struct {
+         uint8_t *data;
+         uint32_t data_len;
+      } v_doc;
+      struct {
+         uint8_t *data;
+         uint32_t data_len;
+         bson_subtype_t subtype;
+      } v_binary;
+      struct {
+         char *regex;
+         char *options;
+      } v_regex;
+      struct {
+         char *collection;
+         uint32_t collection_len;
+         bson_oid_t oid;
+      } v_dbpointer;
+      struct {
+         char *code;
+         uint32_t code_len;
+      } v_code;
+      struct {
+         char *code;
+         uint8_t *scope_data;
+         uint32_t code_len;
+         uint32_t scope_len;
+      } v_codewscope;
+      struct {
+         char *symbol;
+         uint32_t len;
+      } v_symbol;
+      bson_decimal128_t v_decimal128;
+   } value;
+} bson_value_t BSON_ALIGNED_END (8);
+
+
+/**
+ * bson_iter_t:
+ *
+ * This structure manages iteration over a bson_t structure. It keeps track
+ * of the location of the current key and value within the buffer. Using the
+ * various functions to get the value of the iter will read from these
+ * locations.
+ *
+ * This structure is safe to discard on the stack. No cleanup is necessary
+ * after using it.
+ */
+BSON_ALIGNED_BEGIN (128)
+typedef struct {
+   const uint8_t *raw; /* The raw buffer being iterated. */
+   uint32_t len;       /* The length of raw. */
+   uint32_t off;       /* The offset within the buffer. */
+   uint32_t type;      /* The offset of the type byte. */
+   uint32_t key;       /* The offset of the key byte. */
+   uint32_t d1;        /* The offset of the first data byte. */
+   uint32_t d2;        /* The offset of the second data byte. */
+   uint32_t d3;        /* The offset of the third data byte. */
+   uint32_t d4;        /* The offset of the fourth data byte. */
+   uint32_t next_off;  /* The offset of the next field. */
+   uint32_t err_off;   /* The offset of the error. */
+   bson_value_t value; /* Internal value for various state. */
+} bson_iter_t BSON_ALIGNED_END (128);
+
+
+/**
+ * bson_reader_t:
+ *
+ * This structure is used to iterate over a sequence of BSON documents. It
+ * allows for them to be iterated with the possibility of no additional
+ * memory allocations under certain circumstances such as reading from an
+ * incoming mongo packet.
+ */
+
+BSON_ALIGNED_BEGIN (BSON_ALIGN_OF_PTR)
+typedef struct {
+   uint32_t type;
+   /*< private >*/
+} bson_reader_t BSON_ALIGNED_END (BSON_ALIGN_OF_PTR);
+
+
+/**
+ * bson_visitor_t:
+ *
+ * This structure contains a series of pointers that can be executed for
+ * each field of a BSON document based on the field type.
+ *
+ * For example, if an int32 field is found, visit_int32 will be called.
+ *
+ * When visiting each field using bson_iter_visit_all(), you may provide a
+ * data pointer that will be provided with each callback. This might be useful
+ * if you are marshaling to another language.
+ *
+ * You may pre-maturely stop the visitation of fields by returning true in your
+ * visitor. Returning false will continue visitation to further fields.
+ */
+BSON_ALIGNED_BEGIN (8)
+typedef struct {
+   /* run before / after descending into a document */
+   bool (*visit_before) (const bson_iter_t *iter, const char *key, void *data);
+   bool (*visit_after) (const bson_iter_t *iter, const char *key, void *data);
+   /* corrupt BSON, or unsupported type and visit_unsupported_type not set */
+   void (*visit_corrupt) (const bson_iter_t *iter, void *data);
+   /* normal bson field callbacks */
+   bool (*visit_double) (const bson_iter_t *iter,
+                         const char *key,
+                         double v_double,
+                         void *data);
+   bool (*visit_utf8) (const bson_iter_t *iter,
+                       const char *key,
+                       size_t v_utf8_len,
+                       const char *v_utf8,
+                       void *data);
+   bool (*visit_document) (const bson_iter_t *iter,
+                           const char *key,
+                           const bson_t *v_document,
+                           void *data);
+   bool (*visit_array) (const bson_iter_t *iter,
+                        const char *key,
+                        const bson_t *v_array,
+                        void *data);
+   bool (*visit_binary) (const bson_iter_t *iter,
+                         const char *key,
+                         bson_subtype_t v_subtype,
+                         size_t v_binary_len,
+                         const uint8_t *v_binary,
+                         void *data);
+   /* normal field with deprecated "Undefined" BSON type */
+   bool (*visit_undefined) (const bson_iter_t *iter,
+                            const char *key,
+                            void *data);
+   bool (*visit_oid) (const bson_iter_t *iter,
+                      const char *key,
+                      const bson_oid_t *v_oid,
+                      void *data);
+   bool (*visit_bool) (const bson_iter_t *iter,
+                       const char *key,
+                       bool v_bool,
+                       void *data);
+   bool (*visit_date_time) (const bson_iter_t *iter,
+                            const char *key,
+                            int64_t msec_since_epoch,
+                            void *data);
+   bool (*visit_null) (const bson_iter_t *iter, const char *key, void *data);
+   bool (*visit_regex) (const bson_iter_t *iter,
+                        const char *key,
+                        const char *v_regex,
+                        const char *v_options,
+                        void *data);
+   bool (*visit_dbpointer) (const bson_iter_t *iter,
+                            const char *key,
+                            size_t v_collection_len,
+                            const char *v_collection,
+                            const bson_oid_t *v_oid,
+                            void *data);
+   bool (*visit_code) (const bson_iter_t *iter,
+                       const char *key,
+                       size_t v_code_len,
+                       const char *v_code,
+                       void *data);
+   bool (*visit_symbol) (const bson_iter_t *iter,
+                         const char *key,
+                         size_t v_symbol_len,
+                         const char *v_symbol,
+                         void *data);
+   bool (*visit_codewscope) (const bson_iter_t *iter,
+                             const char *key,
+                             size_t v_code_len,
+                             const char *v_code,
+                             const bson_t *v_scope,
+                             void *data);
+   bool (*visit_int32) (const bson_iter_t *iter,
+                        const char *key,
+                        int32_t v_int32,
+                        void *data);
+   bool (*visit_timestamp) (const bson_iter_t *iter,
+                            const char *key,
+                            uint32_t v_timestamp,
+                            uint32_t v_increment,
+                            void *data);
+   bool (*visit_int64) (const bson_iter_t *iter,
+                        const char *key,
+                        int64_t v_int64,
+                        void *data);
+   bool (*visit_maxkey) (const bson_iter_t *iter, const char *key, void *data);
+   bool (*visit_minkey) (const bson_iter_t *iter, const char *key, void *data);
+   /* if set, called instead of visit_corrupt when an apparently valid BSON
+    * includes an unrecognized field type (reading future version of BSON) */
+   void (*visit_unsupported_type) (const bson_iter_t *iter,
+                                   const char *key,
+                                   uint32_t type_code,
+                                   void *data);
+   bool (*visit_decimal128) (const bson_iter_t *iter,
+                             const char *key,
+                             const bson_decimal128_t *v_decimal128,
+                             void *data);
+
+   void *padding[7];
+} bson_visitor_t BSON_ALIGNED_END (8);
+
+#define BSON_ERROR_BUFFER_SIZE 504
+
+BSON_ALIGNED_BEGIN (8)
+typedef struct _bson_error_t {
+   uint32_t domain;
+   uint32_t code;
+   char message[BSON_ERROR_BUFFER_SIZE];
+} bson_error_t BSON_ALIGNED_END (8);
+
+
+BSON_STATIC_ASSERT2 (error_t, sizeof (bson_error_t) == 512);
+
+
+/**
+ * bson_next_power_of_two:
+ * @v: A 32-bit unsigned integer of required bytes.
+ *
+ * Determines the next larger power of two for the value of @v
+ * in a constant number of operations.
+ *
+ * It is up to the caller to guarantee this will not overflow.
+ *
+ * Returns: The next power of 2 from @v.
+ */
+static BSON_INLINE size_t
+bson_next_power_of_two (size_t v)
+{
+   v--;
+   v |= v >> 1;
+   v |= v >> 2;
+   v |= v >> 4;
+   v |= v >> 8;
+   v |= v >> 16;
+#if BSON_WORD_SIZE == 64
+   v |= v >> 32;
+#endif
+   v++;
+
+   return v;
+}
+
+
+static BSON_INLINE bool
+bson_is_power_of_two (uint32_t v)
+{
+   return ((v != 0) && ((v & (v - 1)) == 0));
+}
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_TYPES_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-utf8.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-utf8.h
new file mode 100644
index 0000000..a1f7dfc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-utf8.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_UTF8_H
+#define BSON_UTF8_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (bool)
+bson_utf8_validate (const char *utf8, size_t utf8_len, bool allow_null);
+BSON_EXPORT (char *)
+bson_utf8_escape_for_json (const char *utf8, ssize_t utf8_len);
+BSON_EXPORT (bson_unichar_t)
+bson_utf8_get_char (const char *utf8);
+BSON_EXPORT (const char *)
+bson_utf8_next_char (const char *utf8);
+BSON_EXPORT (void)
+bson_utf8_from_unichar (bson_unichar_t unichar, char utf8[6], uint32_t *len);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_UTF8_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-value.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-value.h
new file mode 100644
index 0000000..39f0b0f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-value.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_VALUE_H
+#define BSON_VALUE_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (void)
+bson_value_copy (const bson_value_t *src, bson_value_t *dst);
+BSON_EXPORT (void)
+bson_value_destroy (bson_value_t *value);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_VALUE_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-version-functions.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-version-functions.h
new file mode 100644
index 0000000..feb33cd
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-version-functions.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_VERSION_FUNCTIONS_H
+#define BSON_VERSION_FUNCTIONS_H
+
+#include "bson-types.h"
+
+BSON_BEGIN_DECLS
+
+BSON_EXPORT (int)
+bson_get_major_version (void);
+BSON_EXPORT (int)
+bson_get_minor_version (void);
+BSON_EXPORT (int)
+bson_get_micro_version (void);
+BSON_EXPORT (const char *)
+bson_get_version (void);
+BSON_EXPORT (bool)
+bson_check_version (int required_major, int required_minor, int required_micro);
+
+BSON_END_DECLS
+
+#endif /* BSON_VERSION_FUNCTIONS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-version.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-version.h
new file mode 100644
index 0000000..893a950
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-version.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#if !defined (BSON_INSIDE) && !defined (BSON_COMPILATION)
+#error "Only <bson/bson.h> can be included directly."
+#endif
+
+
+#ifndef BSON_VERSION_H
+#define BSON_VERSION_H
+
+
+/**
+ * BSON_MAJOR_VERSION:
+ *
+ * BSON major version component (e.g. 1 if %BSON_VERSION is 1.2.3)
+ */
+#define BSON_MAJOR_VERSION (1)
+
+
+/**
+ * BSON_MINOR_VERSION:
+ *
+ * BSON minor version component (e.g. 2 if %BSON_VERSION is 1.2.3)
+ */
+#define BSON_MINOR_VERSION (23)
+
+
+/**
+ * BSON_MICRO_VERSION:
+ *
+ * BSON micro version component (e.g. 3 if %BSON_VERSION is 1.2.3)
+ */
+#define BSON_MICRO_VERSION (1)
+
+
+/**
+ * BSON_PRERELEASE_VERSION:
+ *
+ * BSON prerelease version component (e.g. pre if %BSON_VERSION is 1.2.3-pre)
+ */
+#define BSON_PRERELEASE_VERSION ()
+
+/**
+ * BSON_VERSION:
+ *
+ * BSON version.
+ */
+#define BSON_VERSION (1.23.1)
+
+
+/**
+ * BSON_VERSION_S:
+ *
+ * BSON version, encoded as a string, useful for printing and
+ * concatenation.
+ */
+#define BSON_VERSION_S "1.23.1"
+
+
+/**
+ * BSON_VERSION_HEX:
+ *
+ * BSON version, encoded as an hexadecimal number, useful for
+ * integer comparisons.
+ */
+#define BSON_VERSION_HEX (BSON_MAJOR_VERSION << 24 | \
+                          BSON_MINOR_VERSION << 16 | \
+                          BSON_MICRO_VERSION << 8)
+
+
+/**
+ * BSON_CHECK_VERSION:
+ * @major: required major version
+ * @minor: required minor version
+ * @micro: required micro version
+ *
+ * Compile-time version checking. Evaluates to %TRUE if the version
+ * of BSON is greater than the required one.
+ */
+#define BSON_CHECK_VERSION(major,minor,micro)   \
+        (BSON_MAJOR_VERSION > (major) || \
+         (BSON_MAJOR_VERSION == (major) && BSON_MINOR_VERSION > (minor)) || \
+         (BSON_MAJOR_VERSION == (major) && BSON_MINOR_VERSION == (minor) && \
+          BSON_MICRO_VERSION >= (micro)))
+
+#endif /* BSON_VERSION_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-writer.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-writer.h
new file mode 100644
index 0000000..6ff74b0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson-writer.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_WRITER_H
+#define BSON_WRITER_H
+
+
+#include "bson.h"
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * bson_writer_t:
+ *
+ * The bson_writer_t structure is a helper for writing a series of BSON
+ * documents to a single malloc() buffer. You can provide a realloc() style
+ * function to grow the buffer as you go.
+ *
+ * This is useful if you want to build a series of BSON documents right into
+ * the target buffer for an outgoing packet. The offset parameter allows you to
+ * start at an offset of the target buffer.
+ */
+typedef struct _bson_writer_t bson_writer_t;
+
+
+BSON_EXPORT (bson_writer_t *)
+bson_writer_new (uint8_t **buf,
+                 size_t *buflen,
+                 size_t offset,
+                 bson_realloc_func realloc_func,
+                 void *realloc_func_ctx);
+BSON_EXPORT (void)
+bson_writer_destroy (bson_writer_t *writer);
+BSON_EXPORT (size_t)
+bson_writer_get_length (bson_writer_t *writer);
+BSON_EXPORT (bool)
+bson_writer_begin (bson_writer_t *writer, bson_t **bson);
+BSON_EXPORT (void)
+bson_writer_end (bson_writer_t *writer);
+BSON_EXPORT (void)
+bson_writer_rollback (bson_writer_t *writer);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_WRITER_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson.h b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson.h
new file mode 100644
index 0000000..8ffc58e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libbson-1.0/bson/bson.h
@@ -0,0 +1,1176 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef BSON_H
+#define BSON_H
+
+#define BSON_INSIDE
+
+#include "bson-compat.h"
+
+#include <string.h>
+#include <time.h>
+
+#include "bson-macros.h"
+#include "bson-config.h"
+#include "bson-atomic.h"
+#include "bson-cmp.h"
+#include "bson-context.h"
+#include "bson-clock.h"
+#include "bson-decimal128.h"
+#include "bson-error.h"
+#include "bson-iter.h"
+#include "bson-json.h"
+#include "bson-keys.h"
+#include "bson-md5.h"
+#include "bson-memory.h"
+#include "bson-oid.h"
+#include "bson-reader.h"
+#include "bson-string.h"
+#include "bson-types.h"
+#include "bson-utf8.h"
+#include "bson-value.h"
+#include "bson-version.h"
+#include "bson-version-functions.h"
+#include "bson-writer.h"
+#include "bcon.h"
+
+#undef BSON_INSIDE
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * bson_empty:
+ * @b: a bson_t.
+ *
+ * Checks to see if @b is an empty BSON document. An empty BSON document is
+ * a 5 byte document which contains the length (4 bytes) and a single NUL
+ * byte indicating end of fields.
+ */
+#define bson_empty(b) (((b)->len == 5) || !bson_get_data ((b))[4])
+
+
+/**
+ * bson_empty0:
+ *
+ * Like bson_empty() but treats NULL the same as an empty bson_t document.
+ */
+#define bson_empty0(b) (!(b) || bson_empty (b))
+
+
+/**
+ * bson_clear:
+ *
+ * Easily free a bson document and set it to NULL. Use like:
+ *
+ * bson_t *doc = bson_new();
+ * bson_clear (&doc);
+ * BSON_ASSERT (doc == NULL);
+ */
+#define bson_clear(bptr)         \
+   do {                          \
+      if (*(bptr)) {             \
+         bson_destroy (*(bptr)); \
+         *(bptr) = NULL;         \
+      }                          \
+   } while (0)
+
+
+/**
+ * BSON_MAX_SIZE:
+ *
+ * The maximum size in bytes of a BSON document.
+ */
+#define BSON_MAX_SIZE ((size_t) ((1U << 31) - 1))
+
+
+#define BSON_APPEND_ARRAY(b, key, val) \
+   bson_append_array (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_ARRAY_BEGIN(b, key, child) \
+   bson_append_array_begin (b, key, (int) strlen (key), child)
+
+#define BSON_APPEND_BINARY(b, key, subtype, val, len) \
+   bson_append_binary (b, key, (int) strlen (key), subtype, val, len)
+
+#define BSON_APPEND_BOOL(b, key, val) \
+   bson_append_bool (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_CODE(b, key, val) \
+   bson_append_code (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_CODE_WITH_SCOPE(b, key, val, scope) \
+   bson_append_code_with_scope (b, key, (int) strlen (key), val, scope)
+
+#define BSON_APPEND_DBPOINTER(b, key, coll, oid) \
+   bson_append_dbpointer (b, key, (int) strlen (key), coll, oid)
+
+#define BSON_APPEND_DOCUMENT_BEGIN(b, key, child) \
+   bson_append_document_begin (b, key, (int) strlen (key), child)
+
+#define BSON_APPEND_DOUBLE(b, key, val) \
+   bson_append_double (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_DOCUMENT(b, key, val) \
+   bson_append_document (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_INT32(b, key, val) \
+   bson_append_int32 (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_INT64(b, key, val) \
+   bson_append_int64 (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_MINKEY(b, key) \
+   bson_append_minkey (b, key, (int) strlen (key))
+
+#define BSON_APPEND_DECIMAL128(b, key, val) \
+   bson_append_decimal128 (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_MAXKEY(b, key) \
+   bson_append_maxkey (b, key, (int) strlen (key))
+
+#define BSON_APPEND_NULL(b, key) bson_append_null (b, key, (int) strlen (key))
+
+#define BSON_APPEND_OID(b, key, val) \
+   bson_append_oid (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_REGEX(b, key, val, opt) \
+   bson_append_regex (b, key, (int) strlen (key), val, opt)
+
+#define BSON_APPEND_UTF8(b, key, val) \
+   bson_append_utf8 (b, key, (int) strlen (key), val, (int) strlen (val))
+
+#define BSON_APPEND_SYMBOL(b, key, val) \
+   bson_append_symbol (b, key, (int) strlen (key), val, (int) strlen (val))
+
+#define BSON_APPEND_TIME_T(b, key, val) \
+   bson_append_time_t (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_TIMEVAL(b, key, val) \
+   bson_append_timeval (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_DATE_TIME(b, key, val) \
+   bson_append_date_time (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_TIMESTAMP(b, key, val, inc) \
+   bson_append_timestamp (b, key, (int) strlen (key), val, inc)
+
+#define BSON_APPEND_UNDEFINED(b, key) \
+   bson_append_undefined (b, key, (int) strlen (key))
+
+#define BSON_APPEND_VALUE(b, key, val) \
+   bson_append_value (b, key, (int) strlen (key), (val))
+
+
+/**
+ * bson_new:
+ *
+ * Allocates a new bson_t structure. Call the various bson_append_*()
+ * functions to add fields to the bson. You can iterate the bson_t at any
+ * time using a bson_iter_t and bson_iter_init().
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ */
+BSON_EXPORT (bson_t *)
+bson_new (void);
+
+
+BSON_EXPORT (bson_t *)
+bson_new_from_json (const uint8_t *data, ssize_t len, bson_error_t *error);
+
+
+BSON_EXPORT (bool)
+bson_init_from_json (bson_t *bson,
+                     const char *data,
+                     ssize_t len,
+                     bson_error_t *error);
+
+
+/**
+ * bson_init_static:
+ * @b: A pointer to a bson_t.
+ * @data: The data buffer to use.
+ * @length: The length of @data.
+ *
+ * Initializes a bson_t using @data and @length. This is ideal if you would
+ * like to use a stack allocation for your bson and do not need to grow the
+ * buffer. @data must be valid for the life of @b.
+ *
+ * Returns: true if initialized successfully; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_init_static (bson_t *b, const uint8_t *data, size_t length);
+
+
+/**
+ * bson_init:
+ * @b: A pointer to a bson_t.
+ *
+ * Initializes a bson_t for use. This function is useful to those that want a
+ * stack allocated bson_t. The usefulness of a stack allocated bson_t is
+ * marginal as the target buffer for content will still require heap
+ * allocations. It can help reduce heap fragmentation on allocators that do
+ * not employ SLAB/magazine semantics.
+ *
+ * You must call bson_destroy() with @b to release resources when you are done
+ * using @b.
+ */
+BSON_EXPORT (void)
+bson_init (bson_t *b);
+
+
+/**
+ * bson_reinit:
+ * @b: (inout): A bson_t.
+ *
+ * This is equivalent to calling bson_destroy() and bson_init() on a #bson_t.
+ * However, it will try to persist the existing malloc'd buffer if one exists.
+ * This is useful in cases where you want to reduce malloc overhead while
+ * building many documents.
+ */
+BSON_EXPORT (void)
+bson_reinit (bson_t *b);
+
+
+/**
+ * bson_new_from_data:
+ * @data: A buffer containing a serialized bson document.
+ * @length: The length of the document in bytes.
+ *
+ * Creates a new bson_t structure using the data provided. @data should contain
+ * at least @length bytes that can be copied into the new bson_t structure.
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ *   If the first four bytes (little-endian) of data do not match @length,
+ *   then NULL will be returned.
+ */
+BSON_EXPORT (bson_t *)
+bson_new_from_data (const uint8_t *data, size_t length);
+
+
+/**
+ * bson_new_from_buffer:
+ * @buf: A pointer to a buffer containing a serialized bson document.
+ * @buf_len: The length of the buffer in bytes.
+ * @realloc_fun: a realloc like function
+ * @realloc_fun_ctx: a context for the realloc function
+ *
+ * Creates a new bson_t structure using the data provided. @buf should contain
+ * a bson document, or null pointer should be passed for new allocations.
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ *          The underlying buffer will be used and not be freed in destroy.
+ */
+BSON_EXPORT (bson_t *)
+bson_new_from_buffer (uint8_t **buf,
+                      size_t *buf_len,
+                      bson_realloc_func realloc_func,
+                      void *realloc_func_ctx);
+
+
+/**
+ * bson_sized_new:
+ * @size: A size_t containing the number of bytes to allocate.
+ *
+ * This will allocate a new bson_t with enough bytes to hold a buffer
+ * sized @size. @size must be smaller than INT_MAX bytes.
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ */
+BSON_EXPORT (bson_t *)
+bson_sized_new (size_t size);
+
+
+/**
+ * bson_copy:
+ * @bson: A bson_t.
+ *
+ * Copies @bson into a newly allocated bson_t. You must call bson_destroy()
+ * when you are done with the resulting value to free its resources.
+ *
+ * Returns: A newly allocated bson_t that should be free'd with bson_destroy()
+ */
+BSON_EXPORT (bson_t *)
+bson_copy (const bson_t *bson);
+
+
+/**
+ * bson_copy_to:
+ * @src: The source bson_t.
+ * @dst: The destination bson_t.
+ *
+ * Initializes @dst and copies the content from @src into @dst.
+ */
+BSON_EXPORT (void)
+bson_copy_to (const bson_t *src, bson_t *dst);
+
+
+/**
+ * bson_copy_to_excluding:
+ * @src: A bson_t.
+ * @dst: A bson_t to initialize and copy into.
+ * @first_exclude: First field name to exclude.
+ *
+ * Copies @src into @dst excluding any field that is provided.
+ * This is handy for situations when you need to remove one or
+ * more fields in a bson_t. Note that bson_init() will be called
+ * on dst.
+ */
+BSON_EXPORT (void)
+bson_copy_to_excluding (const bson_t *src,
+                        bson_t *dst,
+                        const char *first_exclude,
+                        ...) BSON_GNUC_NULL_TERMINATED
+   BSON_GNUC_DEPRECATED_FOR (bson_copy_to_excluding_noinit);
+
+/**
+ * bson_copy_to_excluding_noinit:
+ * @src: A bson_t.
+ * @dst: A bson_t to initialize and copy into.
+ * @first_exclude: First field name to exclude.
+ *
+ * The same as bson_copy_to_excluding, but does not call bson_init()
+ * on the dst. This version should be preferred in new code, but the
+ * old function is left for backwards compatibility.
+ */
+BSON_EXPORT (void)
+bson_copy_to_excluding_noinit (const bson_t *src,
+                               bson_t *dst,
+                               const char *first_exclude,
+                               ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (void)
+bson_copy_to_excluding_noinit_va (const bson_t *src,
+                                  bson_t *dst,
+                                  const char *first_exclude,
+                                  va_list args);
+
+/**
+ * bson_destroy:
+ * @bson: A bson_t.
+ *
+ * Frees the resources associated with @bson.
+ */
+BSON_EXPORT (void)
+bson_destroy (bson_t *bson);
+
+BSON_EXPORT (uint8_t *)
+bson_reserve_buffer (bson_t *bson, uint32_t size);
+
+BSON_EXPORT (bool)
+bson_steal (bson_t *dst, bson_t *src);
+
+
+/**
+ * bson_destroy_with_steal:
+ * @bson: A #bson_t.
+ * @steal: If ownership of the data buffer should be transferred to caller.
+ * @length: (out): location for the length of the buffer.
+ *
+ * Destroys @bson similar to calling bson_destroy() except that the underlying
+ * buffer will be returned and ownership transferred to the caller if @steal
+ * is non-zero.
+ *
+ * If length is non-NULL, the length of @bson will be stored in @length.
+ *
+ * It is a programming error to call this function with any bson that has
+ * been initialized static, or is being used to create a subdocument with
+ * functions such as bson_append_document_begin() or bson_append_array_begin().
+ *
+ * Returns: a buffer owned by the caller if @steal is true. Otherwise NULL.
+ *    If there was an error, NULL is returned.
+ */
+BSON_EXPORT (uint8_t *)
+bson_destroy_with_steal (bson_t *bson, bool steal, uint32_t *length);
+
+
+/**
+ * bson_get_data:
+ * @bson: A bson_t.
+ *
+ * Fetched the data buffer for @bson of @bson->len bytes in length.
+ *
+ * Returns: A buffer that should not be modified or freed.
+ */
+BSON_EXPORT (const uint8_t *)
+bson_get_data (const bson_t *bson);
+
+
+/**
+ * bson_count_keys:
+ * @bson: A bson_t.
+ *
+ * Counts the number of elements found in @bson.
+ */
+BSON_EXPORT (uint32_t)
+bson_count_keys (const bson_t *bson);
+
+
+/**
+ * bson_has_field:
+ * @bson: A bson_t.
+ * @key: The key to lookup.
+ *
+ * Checks to see if @bson contains a field named @key.
+ *
+ * This function is case-sensitive.
+ *
+ * Returns: true if @key exists in @bson; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_has_field (const bson_t *bson, const char *key);
+
+
+/**
+ * bson_compare:
+ * @bson: A bson_t.
+ * @other: A bson_t.
+ *
+ * Compares @bson to @other in a qsort() style comparison.
+ * See qsort() for information on how this function works.
+ *
+ * Returns: Less than zero, zero, or greater than zero.
+ */
+BSON_EXPORT (int)
+bson_compare (const bson_t *bson, const bson_t *other);
+
+/*
+ * bson_equal:
+ * @bson: A bson_t.
+ * @other: A bson_t.
+ *
+ * Checks to see if @bson and @other are equal.
+ *
+ * Returns: true if equal; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_equal (const bson_t *bson, const bson_t *other);
+
+
+/**
+ * bson_validate:
+ * @bson: A bson_t.
+ * @offset: A location for the error offset.
+ *
+ * Validates a BSON document by walking through the document and inspecting
+ * the fields for valid content.
+ *
+ * Returns: true if @bson is valid; otherwise false and @offset is set.
+ */
+BSON_EXPORT (bool)
+bson_validate (const bson_t *bson, bson_validate_flags_t flags, size_t *offset);
+
+
+/**
+ * bson_validate_with_error:
+ * @bson: A bson_t.
+ * @error: A location for the error info.
+ *
+ * Validates a BSON document by walking through the document and inspecting
+ * the fields for valid content.
+ *
+ * Returns: true if @bson is valid; otherwise false and @error is filled out.
+ */
+BSON_EXPORT (bool)
+bson_validate_with_error (const bson_t *bson,
+                          bson_validate_flags_t flags,
+                          bson_error_t *error);
+
+
+/**
+ * bson_as_json_with_opts:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ * @opts: A bson_t_json_opts_t defining options for the conversion
+ *
+ * Creates a new string containing @bson in the selected JSON format,
+ * conforming to the MongoDB Extended JSON Spec:
+ *
+ * github.com/mongodb/specifications/blob/master/source/extended-json.rst
+ *
+ * The caller is responsible for freeing the resulting string. If @length is
+ * non-NULL, then the length of the resulting string will be placed in @length.
+ *
+ * See http://docs.mongodb.org/manual/reference/mongodb-extended-json/ for
+ * more information on extended JSON.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_json_with_opts (const bson_t *bson,
+                        size_t *length,
+                        const bson_json_opts_t *opts);
+
+
+/**
+ * bson_as_canonical_extended_json:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ *
+ * Creates a new string containing @bson in canonical extended JSON format,
+ * conforming to the MongoDB Extended JSON Spec:
+ *
+ * github.com/mongodb/specifications/blob/master/source/extended-json.rst
+ *
+ * The caller is responsible for freeing the resulting string. If @length is
+ * non-NULL, then the length of the resulting string will be placed in @length.
+ *
+ * See http://docs.mongodb.org/manual/reference/mongodb-extended-json/ for
+ * more information on extended JSON.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_canonical_extended_json (const bson_t *bson, size_t *length);
+
+
+/**
+ * bson_as_json:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ *
+ * Creates a new string containing @bson in libbson's legacy JSON format.
+ * Superseded by bson_as_canonical_extended_json and
+ * bson_as_relaxed_extended_json. The caller is
+ * responsible for freeing the resulting string. If @length is non-NULL, then
+ * the length of the resulting string will be placed in @length.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_json (const bson_t *bson, size_t *length);
+
+
+/**
+ * bson_as_relaxed_extended_json:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ *
+ * Creates a new string containing @bson in relaxed extended JSON format,
+ * conforming to the MongoDB Extended JSON Spec:
+ *
+ * github.com/mongodb/specifications/blob/master/source/extended-json.rst
+ *
+ * The caller is responsible for freeing the resulting string. If @length is
+ * non-NULL, then the length of the resulting string will be placed in @length.
+ *
+ * See http://docs.mongodb.org/manual/reference/mongodb-extended-json/ for
+ * more information on extended JSON.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_relaxed_extended_json (const bson_t *bson, size_t *length);
+
+
+/* like bson_as_json() but for outermost arrays. */
+BSON_EXPORT (char *)
+bson_array_as_json (const bson_t *bson, size_t *length);
+
+
+BSON_EXPORT (bool)
+bson_append_value (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   const bson_value_t *value);
+
+
+/**
+ * bson_append_array:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @array: A bson_t containing the array.
+ *
+ * Appends a BSON array to @bson. BSON arrays are like documents where the
+ * key is the string version of the index. For example, the first item of the
+ * array would have the key "0". The second item would have the index "1".
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_array (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   const bson_t *array);
+
+
+/**
+ * bson_append_binary:
+ * @bson: A bson_t to append.
+ * @key: The key for the field.
+ * @subtype: The bson_subtype_t of the binary.
+ * @binary: The binary buffer to append.
+ * @length: The length of @binary.
+ *
+ * Appends a binary buffer to the BSON document.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_binary (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    bson_subtype_t subtype,
+                    const uint8_t *binary,
+                    uint32_t length);
+
+
+/**
+ * bson_append_bool:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The boolean value.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_BOOL.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_bool (bson_t *bson, const char *key, int key_length, bool value);
+
+
+/**
+ * bson_append_code:
+ * @bson: A bson_t.
+ * @key: The key for the document.
+ * @javascript: JavaScript code to be executed.
+ *
+ * Appends a field of type BSON_TYPE_CODE to the BSON document. @javascript
+ * should contain a script in javascript to be executed.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_code (bson_t *bson,
+                  const char *key,
+                  int key_length,
+                  const char *javascript);
+
+
+/**
+ * bson_append_code_with_scope:
+ * @bson: A bson_t.
+ * @key: The key for the document.
+ * @javascript: JavaScript code to be executed.
+ * @scope: A bson_t containing the scope for @javascript.
+ *
+ * Appends a field of type BSON_TYPE_CODEWSCOPE to the BSON document.
+ * @javascript should contain a script in javascript to be executed.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_code_with_scope (bson_t *bson,
+                             const char *key,
+                             int key_length,
+                             const char *javascript,
+                             const bson_t *scope);
+
+
+/**
+ * bson_append_dbpointer:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @collection: The collection name.
+ * @oid: The oid to the reference.
+ *
+ * Appends a new field of type BSON_TYPE_DBPOINTER. This datum type is
+ * deprecated in the BSON spec and should not be used in new code.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_dbpointer (bson_t *bson,
+                       const char *key,
+                       int key_length,
+                       const char *collection,
+                       const bson_oid_t *oid);
+
+
+/**
+ * bson_append_double:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field to @bson of the type BSON_TYPE_DOUBLE.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_double (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    double value);
+
+
+/**
+ * bson_append_document:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A bson_t containing the subdocument.
+ *
+ * Appends a new field to @bson of the type BSON_TYPE_DOCUMENT.
+ * The documents contents will be copied into @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_document (bson_t *bson,
+                      const char *key,
+                      int key_length,
+                      const bson_t *value);
+
+
+/**
+ * bson_append_document_begin:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key in bytes not including NUL or -1
+ *    if @key_length is NUL terminated.
+ * @child: A location to an uninitialized bson_t.
+ *
+ * Appends a new field named @key to @bson. The field is, however,
+ * incomplete.  @child will be initialized so that you may add fields to the
+ * child document.  Child will use a memory buffer owned by @bson and
+ * therefore grow the parent buffer as additional space is used. This allows
+ * a single malloc'd buffer to be used when building documents which can help
+ * reduce memory fragmentation.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_document_begin (bson_t *bson,
+                            const char *key,
+                            int key_length,
+                            bson_t *child);
+
+
+/**
+ * bson_append_document_end:
+ * @bson: A bson_t.
+ * @child: A bson_t supplied to bson_append_document_begin().
+ *
+ * Finishes the appending of a document to a @bson. @child is considered
+ * disposed after this call and should not be used any further.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_document_end (bson_t *bson, bson_t *child);
+
+
+/**
+ * bson_append_array_begin:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key in bytes not including NUL or -1
+ *    if @key_length is NUL terminated.
+ * @child: A location to an uninitialized bson_t.
+ *
+ * Appends a new field named @key to @bson. The field is, however,
+ * incomplete. @child will be initialized so that you may add fields to the
+ * child array. Child will use a memory buffer owned by @bson and
+ * therefore grow the parent buffer as additional space is used. This allows
+ * a single malloc'd buffer to be used when building arrays which can help
+ * reduce memory fragmentation.
+ *
+ * The type of @child will be BSON_TYPE_ARRAY and therefore the keys inside
+ * of it MUST be "0", "1", etc.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_array_begin (bson_t *bson,
+                         const char *key,
+                         int key_length,
+                         bson_t *child);
+
+
+/**
+ * bson_append_array_end:
+ * @bson: A bson_t.
+ * @child: A bson_t supplied to bson_append_array_begin().
+ *
+ * Finishes the appending of a array to a @bson. @child is considered
+ * disposed after this call and should not be used any further.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_array_end (bson_t *bson, bson_t *child);
+
+
+/**
+ * bson_append_int32:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The int32_t 32-bit integer value.
+ *
+ * Appends a new field of type BSON_TYPE_INT32 to @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_int32 (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   int32_t value);
+
+
+/**
+ * bson_append_int64:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The int64_t 64-bit integer value.
+ *
+ * Appends a new field of type BSON_TYPE_INT64 to @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_int64 (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   int64_t value);
+
+
+/**
+ * bson_append_decimal128:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The bson_decimal128_t decimal128 value.
+ *
+ * Appends a new field of type BSON_TYPE_DECIMAL128 to @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_decimal128 (bson_t *bson,
+                        const char *key,
+                        int key_length,
+                        const bson_decimal128_t *value);
+
+
+/**
+ * bson_append_iter:
+ * @bson: A bson_t to append to.
+ * @key: The key name or %NULL to take current key from @iter.
+ * @key_length: The key length or -1 to use strlen().
+ * @iter: The iter located on the position of the element to append.
+ *
+ * Appends a new field to @bson that is equivalent to the field currently
+ * pointed to by @iter.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_iter (bson_t *bson,
+                  const char *key,
+                  int key_length,
+                  const bson_iter_t *iter);
+
+
+/**
+ * bson_append_minkey:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field of type BSON_TYPE_MINKEY to @bson. This is a special
+ * type that compares lower than all other possible BSON element values.
+ *
+ * See http://bsonspec.org for more information on this type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_minkey (bson_t *bson, const char *key, int key_length);
+
+
+/**
+ * bson_append_maxkey:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field of type BSON_TYPE_MAXKEY to @bson. This is a special
+ * type that compares higher than all other possible BSON element values.
+ *
+ * See http://bsonspec.org for more information on this type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_maxkey (bson_t *bson, const char *key, int key_length);
+
+
+/**
+ * bson_append_null:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field to @bson with NULL for the value.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_null (bson_t *bson, const char *key, int key_length);
+
+
+/**
+ * bson_append_oid:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @oid: bson_oid_t.
+ *
+ * Appends a new field to the @bson of type BSON_TYPE_OID using the contents of
+ * @oid.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_oid (bson_t *bson,
+                 const char *key,
+                 int key_length,
+                 const bson_oid_t *oid);
+
+
+/**
+ * bson_append_regex:
+ * @bson: A bson_t.
+ * @key: The key of the field.
+ * @regex: The regex to append to the bson.
+ * @options: Options for @regex.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_REGEX. @regex should
+ * be the regex string. @options should contain the options for the regex.
+ *
+ * Valid options for @options are:
+ *
+ *   'i' for case-insensitive.
+ *   'm' for multiple matching.
+ *   'x' for verbose mode.
+ *   'l' to make \w and \W locale dependent.
+ *   's' for dotall mode ('.' matches everything)
+ *   'u' to make \w and \W match unicode.
+ *
+ * For more detailed information about BSON regex elements, see bsonspec.org.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_regex (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   const char *regex,
+                   const char *options);
+
+
+/**
+ * bson_append_regex:
+ * @bson: A bson_t.
+ * @key: The key of the field.
+ * @key_length: The length of the key string.
+ * @regex: The regex to append to the bson.
+ * @regex_length: The length of the regex string.
+ * @options: Options for @regex.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_REGEX. @regex should
+ * be the regex string. @options should contain the options for the regex.
+ *
+ * Valid options for @options are:
+ *
+ *   'i' for case-insensitive.
+ *   'm' for multiple matching.
+ *   'x' for verbose mode.
+ *   'l' to make \w and \W locale dependent.
+ *   's' for dotall mode ('.' matches everything)
+ *   'u' to make \w and \W match unicode.
+ *
+ * For more detailed information about BSON regex elements, see bsonspec.org.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_regex_w_len (bson_t *bson,
+                         const char *key,
+                         int key_length,
+                         const char *regex,
+                         int regex_length,
+                         const char *options);
+
+
+/**
+ * bson_append_utf8:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A UTF-8 encoded string.
+ * @length: The length of @value or -1 if it is NUL terminated.
+ *
+ * Appends a new field to @bson using @key as the key and @value as the UTF-8
+ * encoded value.
+ *
+ * It is the callers responsibility to ensure @value is valid UTF-8. You can
+ * use bson_utf8_validate() to perform this check.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_utf8 (bson_t *bson,
+                  const char *key,
+                  int key_length,
+                  const char *value,
+                  int length);
+
+
+/**
+ * bson_append_symbol:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The symbol as a string.
+ * @length: The length of @value or -1 if NUL-terminated.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_SYMBOL. This BSON type is
+ * deprecated and should not be used in new code.
+ *
+ * See http://bsonspec.org for more information on this type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_symbol (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    const char *value,
+                    int length);
+
+
+/**
+ * bson_append_time_t:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A time_t.
+ *
+ * Appends a BSON_TYPE_DATE_TIME field to @bson using the time_t @value for the
+ * number of seconds since UNIX epoch in UTC.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_time_t (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    time_t value);
+
+
+/**
+ * bson_append_timeval:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A struct timeval containing the date and time.
+ *
+ * Appends a BSON_TYPE_DATE_TIME field to @bson using the struct timeval
+ * provided. The time is persisted in milliseconds since the UNIX epoch in UTC.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_timeval (bson_t *bson,
+                     const char *key,
+                     int key_length,
+                     struct timeval *value);
+
+
+/**
+ * bson_append_date_time:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key in bytes or -1 if \0 terminated.
+ * @value: The number of milliseconds elapsed since UNIX epoch.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_DATE_TIME.
+ *
+ * Returns: true if successful; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_append_date_time (bson_t *bson,
+                       const char *key,
+                       int key_length,
+                       int64_t value);
+
+
+/**
+ * bson_append_now_utc:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key or -1 if it is NULL terminated.
+ *
+ * Appends a BSON_TYPE_DATE_TIME field to @bson using the current time in UTC
+ * as the field value.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_now_utc (bson_t *bson, const char *key, int key_length);
+
+/**
+ * bson_append_timestamp:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @timestamp: 4 byte timestamp.
+ * @increment: 4 byte increment for timestamp.
+ *
+ * Appends a field of type BSON_TYPE_TIMESTAMP to @bson. This is a special type
+ * used by MongoDB replication and sharding. If you need generic time and date
+ * fields use bson_append_time_t() or bson_append_timeval().
+ *
+ * Setting @increment and @timestamp to zero has special semantics. See
+ * http://bsonspec.org for more information on this field type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_timestamp (bson_t *bson,
+                       const char *key,
+                       int key_length,
+                       uint32_t timestamp,
+                       uint32_t increment);
+
+
+/**
+ * bson_append_undefined:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a field of type BSON_TYPE_UNDEFINED. This type is deprecated in the
+ * spec and should not be used for new code. However, it is provided for those
+ * needing to interact with legacy systems.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_undefined (bson_t *bson, const char *key, int key_length);
+
+
+BSON_EXPORT (bool)
+bson_concat (bson_t *dst, const bson_t *src);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc.h
new file mode 100644
index 0000000..458369f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Including mongoc.h is superseded. Use mongoc/mongoc.h instead. */
+#include "mongoc/mongoc.h"
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-apm.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-apm.h
new file mode 100644
index 0000000..7fe95d3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-apm.h
@@ -0,0 +1,378 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_APM_H
+#define MONGOC_APM_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-host-list.h"
+#include "mongoc-server-description.h"
+#include "mongoc-topology-description.h"
+
+BSON_BEGIN_DECLS
+
+/*
+ * Application Performance Management (APM) interface, complies with two specs.
+ * MongoDB's Command Monitoring Spec:
+ *
+ * https://github.com/mongodb/specifications/tree/master/source/command-monitoring
+ *
+ * MongoDB's Spec for Monitoring Server Discovery and Monitoring (SDAM) events:
+ *
+ * https://github.com/mongodb/specifications/tree/master/source/server-discovery-and-monitoring
+ *
+ */
+
+/*
+ * callbacks to receive APM events
+ */
+
+typedef struct _mongoc_apm_callbacks_t mongoc_apm_callbacks_t;
+
+
+/*
+ * command monitoring events
+ */
+
+typedef struct _mongoc_apm_command_started_t mongoc_apm_command_started_t;
+typedef struct _mongoc_apm_command_succeeded_t mongoc_apm_command_succeeded_t;
+typedef struct _mongoc_apm_command_failed_t mongoc_apm_command_failed_t;
+
+
+/*
+ * SDAM monitoring events
+ */
+
+typedef struct _mongoc_apm_server_changed_t mongoc_apm_server_changed_t;
+typedef struct _mongoc_apm_server_opening_t mongoc_apm_server_opening_t;
+typedef struct _mongoc_apm_server_closed_t mongoc_apm_server_closed_t;
+typedef struct _mongoc_apm_topology_changed_t mongoc_apm_topology_changed_t;
+typedef struct _mongoc_apm_topology_opening_t mongoc_apm_topology_opening_t;
+typedef struct _mongoc_apm_topology_closed_t mongoc_apm_topology_closed_t;
+typedef struct _mongoc_apm_server_heartbeat_started_t
+   mongoc_apm_server_heartbeat_started_t;
+typedef struct _mongoc_apm_server_heartbeat_succeeded_t
+   mongoc_apm_server_heartbeat_succeeded_t;
+typedef struct _mongoc_apm_server_heartbeat_failed_t
+   mongoc_apm_server_heartbeat_failed_t;
+
+/*
+ * event field accessors
+ */
+
+/* command-started event fields */
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_command_started_get_command (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_started_get_database_name (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_started_get_command_name (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_started_get_request_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_started_get_operation_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_command_started_get_host (const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (uint32_t)
+mongoc_apm_command_started_get_server_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_started_get_service_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (int32_t)
+mongoc_apm_command_started_get_server_connection_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_command_started_get_context (
+   const mongoc_apm_command_started_t *event);
+
+/* command-succeeded event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_succeeded_get_duration (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_command_succeeded_get_reply (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_succeeded_get_command_name (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_succeeded_get_request_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_succeeded_get_operation_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_command_succeeded_get_host (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (uint32_t)
+mongoc_apm_command_succeeded_get_server_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_succeeded_get_service_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (int32_t)
+mongoc_apm_command_succeeded_get_server_connection_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_command_succeeded_get_context (
+   const mongoc_apm_command_succeeded_t *event);
+
+/* command-failed event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_failed_get_duration (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_failed_get_command_name (
+   const mongoc_apm_command_failed_t *event);
+/* retrieve the error by filling out the passed-in "error" struct */
+MONGOC_EXPORT (void)
+mongoc_apm_command_failed_get_error (const mongoc_apm_command_failed_t *event,
+                                     bson_error_t *error);
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_command_failed_get_reply (const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_failed_get_request_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_failed_get_operation_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_command_failed_get_host (const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (uint32_t)
+mongoc_apm_command_failed_get_server_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_failed_get_service_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (int32_t)
+mongoc_apm_command_failed_get_server_connection_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_command_failed_get_context (
+   const mongoc_apm_command_failed_t *event);
+
+/* server-changed event fields */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_changed_get_host (const mongoc_apm_server_changed_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_changed_get_topology_id (
+   const mongoc_apm_server_changed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (const mongoc_server_description_t *)
+mongoc_apm_server_changed_get_previous_description (
+   const mongoc_apm_server_changed_t *event);
+MONGOC_EXPORT (const mongoc_server_description_t *)
+mongoc_apm_server_changed_get_new_description (
+   const mongoc_apm_server_changed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_changed_get_context (
+   const mongoc_apm_server_changed_t *event);
+
+/* server-opening event fields */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_opening_get_host (const mongoc_apm_server_opening_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_opening_get_topology_id (
+   const mongoc_apm_server_opening_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_opening_get_context (
+   const mongoc_apm_server_opening_t *event);
+
+/* server-closed event fields */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_closed_get_host (const mongoc_apm_server_closed_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_closed_get_topology_id (
+   const mongoc_apm_server_closed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_closed_get_context (const mongoc_apm_server_closed_t *event);
+
+/* topology-changed event fields */
+
+MONGOC_EXPORT (void)
+mongoc_apm_topology_changed_get_topology_id (
+   const mongoc_apm_topology_changed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (const mongoc_topology_description_t *)
+mongoc_apm_topology_changed_get_previous_description (
+   const mongoc_apm_topology_changed_t *event);
+MONGOC_EXPORT (const mongoc_topology_description_t *)
+mongoc_apm_topology_changed_get_new_description (
+   const mongoc_apm_topology_changed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_topology_changed_get_context (
+   const mongoc_apm_topology_changed_t *event);
+
+/* topology-opening event field */
+
+MONGOC_EXPORT (void)
+mongoc_apm_topology_opening_get_topology_id (
+   const mongoc_apm_topology_opening_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_topology_opening_get_context (
+   const mongoc_apm_topology_opening_t *event);
+
+/* topology-closed event field */
+
+MONGOC_EXPORT (void)
+mongoc_apm_topology_closed_get_topology_id (
+   const mongoc_apm_topology_closed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_topology_closed_get_context (
+   const mongoc_apm_topology_closed_t *event);
+
+/* heartbeat-started event field */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_heartbeat_started_get_host (
+   const mongoc_apm_server_heartbeat_started_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_heartbeat_started_get_context (
+   const mongoc_apm_server_heartbeat_started_t *event);
+MONGOC_EXPORT (bool)
+mongoc_apm_server_heartbeat_started_get_awaited (
+   const mongoc_apm_server_heartbeat_started_t *event);
+
+/* heartbeat-succeeded event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_server_heartbeat_succeeded_get_duration (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_server_heartbeat_succeeded_get_reply (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_heartbeat_succeeded_get_host (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_heartbeat_succeeded_get_context (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (bool)
+mongoc_apm_server_heartbeat_succeeded_get_awaited (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+
+/* heartbeat-failed event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_server_heartbeat_failed_get_duration (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_heartbeat_failed_get_error (
+   const mongoc_apm_server_heartbeat_failed_t *event, bson_error_t *error);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_heartbeat_failed_get_host (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_heartbeat_failed_get_context (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+MONGOC_EXPORT (bool)
+mongoc_apm_server_heartbeat_failed_get_awaited (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+
+
+/*
+ * callbacks
+ */
+
+typedef void (*mongoc_apm_command_started_cb_t) (
+   const mongoc_apm_command_started_t *event);
+typedef void (*mongoc_apm_command_succeeded_cb_t) (
+   const mongoc_apm_command_succeeded_t *event);
+typedef void (*mongoc_apm_command_failed_cb_t) (
+   const mongoc_apm_command_failed_t *event);
+typedef void (*mongoc_apm_server_changed_cb_t) (
+   const mongoc_apm_server_changed_t *event);
+typedef void (*mongoc_apm_server_opening_cb_t) (
+   const mongoc_apm_server_opening_t *event);
+typedef void (*mongoc_apm_server_closed_cb_t) (
+   const mongoc_apm_server_closed_t *event);
+typedef void (*mongoc_apm_topology_changed_cb_t) (
+   const mongoc_apm_topology_changed_t *event);
+typedef void (*mongoc_apm_topology_opening_cb_t) (
+   const mongoc_apm_topology_opening_t *event);
+typedef void (*mongoc_apm_topology_closed_cb_t) (
+   const mongoc_apm_topology_closed_t *event);
+typedef void (*mongoc_apm_server_heartbeat_started_cb_t) (
+   const mongoc_apm_server_heartbeat_started_t *event);
+typedef void (*mongoc_apm_server_heartbeat_succeeded_cb_t) (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+typedef void (*mongoc_apm_server_heartbeat_failed_cb_t) (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+
+/*
+ * registering callbacks
+ */
+
+MONGOC_EXPORT (mongoc_apm_callbacks_t *)
+mongoc_apm_callbacks_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_apm_callbacks_destroy (mongoc_apm_callbacks_t *callbacks);
+MONGOC_EXPORT (void)
+mongoc_apm_set_command_started_cb (mongoc_apm_callbacks_t *callbacks,
+                                   mongoc_apm_command_started_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_command_succeeded_cb (mongoc_apm_callbacks_t *callbacks,
+                                     mongoc_apm_command_succeeded_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_command_failed_cb (mongoc_apm_callbacks_t *callbacks,
+                                  mongoc_apm_command_failed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_changed_cb (mongoc_apm_callbacks_t *callbacks,
+                                  mongoc_apm_server_changed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_opening_cb (mongoc_apm_callbacks_t *callbacks,
+                                  mongoc_apm_server_opening_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_closed_cb (mongoc_apm_callbacks_t *callbacks,
+                                 mongoc_apm_server_closed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_topology_changed_cb (mongoc_apm_callbacks_t *callbacks,
+                                    mongoc_apm_topology_changed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_topology_opening_cb (mongoc_apm_callbacks_t *callbacks,
+                                    mongoc_apm_topology_opening_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_topology_closed_cb (mongoc_apm_callbacks_t *callbacks,
+                                   mongoc_apm_topology_closed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_heartbeat_started_cb (
+   mongoc_apm_callbacks_t *callbacks,
+   mongoc_apm_server_heartbeat_started_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_heartbeat_succeeded_cb (
+   mongoc_apm_callbacks_t *callbacks,
+   mongoc_apm_server_heartbeat_succeeded_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_heartbeat_failed_cb (
+   mongoc_apm_callbacks_t *callbacks,
+   mongoc_apm_server_heartbeat_failed_cb_t cb);
+BSON_END_DECLS
+
+#endif /* MONGOC_APM_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-bulk-operation.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-bulk-operation.h
new file mode 100644
index 0000000..515bfb2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-bulk-operation.h
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_BULK_OPERATION_H
+#define MONGOC_BULK_OPERATION_H
+
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-write-concern.h"
+
+/* ordered, bypass_document_validation, has_collation, multi */
+#define MONGOC_BULK_WRITE_FLAGS_INIT \
+   {                                 \
+      true, false, 0                 \
+   }
+
+BSON_BEGIN_DECLS
+
+/* forward decl */
+struct _mongoc_client_session_t;
+
+typedef struct _mongoc_bulk_operation_t mongoc_bulk_operation_t;
+typedef struct _mongoc_bulk_write_flags_t mongoc_bulk_write_flags_t;
+
+
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_destroy (mongoc_bulk_operation_t *bulk);
+MONGOC_EXPORT (uint32_t)
+mongoc_bulk_operation_execute (mongoc_bulk_operation_t *bulk,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_delete (mongoc_bulk_operation_t *bulk,
+                              const bson_t *selector)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_bulk_operation_remove);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_delete_one (mongoc_bulk_operation_t *bulk,
+                                  const bson_t *selector)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_bulk_operation_remove_one);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_insert (mongoc_bulk_operation_t *bulk,
+                              const bson_t *document);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_insert_with_opts (mongoc_bulk_operation_t *bulk,
+                                        const bson_t *document,
+                                        const bson_t *opts,
+                                        bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_remove (mongoc_bulk_operation_t *bulk,
+                              const bson_t *selector);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_remove_many_with_opts (mongoc_bulk_operation_t *bulk,
+                                             const bson_t *selector,
+                                             const bson_t *opts,
+                                             bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_remove_one (mongoc_bulk_operation_t *bulk,
+                                  const bson_t *selector);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_remove_one_with_opts (mongoc_bulk_operation_t *bulk,
+                                            const bson_t *selector,
+                                            const bson_t *opts,
+                                            bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_replace_one (mongoc_bulk_operation_t *bulk,
+                                   const bson_t *selector,
+                                   const bson_t *document,
+                                   bool upsert);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_replace_one_with_opts (mongoc_bulk_operation_t *bulk,
+                                             const bson_t *selector,
+                                             const bson_t *document,
+                                             const bson_t *opts,
+                                             bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_update (mongoc_bulk_operation_t *bulk,
+                              const bson_t *selector,
+                              const bson_t *document,
+                              bool upsert);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_update_many_with_opts (mongoc_bulk_operation_t *bulk,
+                                             const bson_t *selector,
+                                             const bson_t *document,
+                                             const bson_t *opts,
+                                             bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_update_one (mongoc_bulk_operation_t *bulk,
+                                  const bson_t *selector,
+                                  const bson_t *document,
+                                  bool upsert);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_update_one_with_opts (mongoc_bulk_operation_t *bulk,
+                                            const bson_t *selector,
+                                            const bson_t *document,
+                                            const bson_t *opts,
+                                            bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_bypass_document_validation (
+   mongoc_bulk_operation_t *bulk, bool bypass);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_comment (mongoc_bulk_operation_t *bulk,
+                                   const bson_value_t *comment);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_let (mongoc_bulk_operation_t *bulk,
+                               const bson_t *let);
+
+
+/*
+ * The following functions are really only useful by language bindings and
+ * those wanting to replay a bulk operation to a number of clients or
+ * collections.
+ */
+MONGOC_EXPORT (mongoc_bulk_operation_t *)
+mongoc_bulk_operation_new (bool ordered) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_write_concern (
+   mongoc_bulk_operation_t *bulk, const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_database (mongoc_bulk_operation_t *bulk,
+                                    const char *database);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_collection (mongoc_bulk_operation_t *bulk,
+                                      const char *collection);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_client (mongoc_bulk_operation_t *bulk, void *client);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_client_session (
+   mongoc_bulk_operation_t *bulk,
+   struct _mongoc_client_session_t *client_session);
+/* These names include the term "hint" for backward compatibility, should be
+ * mongoc_bulk_operation_get_server_id, mongoc_bulk_operation_set_server_id. */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_hint (mongoc_bulk_operation_t *bulk,
+                                uint32_t server_id);
+MONGOC_EXPORT (uint32_t)
+mongoc_bulk_operation_get_hint (const mongoc_bulk_operation_t *bulk);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_bulk_operation_get_write_concern (const mongoc_bulk_operation_t *bulk);
+BSON_END_DECLS
+
+
+#endif /* MONGOC_BULK_OPERATION_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-change-stream.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-change-stream.h
new file mode 100644
index 0000000..ad64f8f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-change-stream.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CHANGE_STREAM_H
+#define MONGOC_CHANGE_STREAM_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_change_stream_t mongoc_change_stream_t;
+
+MONGOC_EXPORT (void)
+mongoc_change_stream_destroy (mongoc_change_stream_t *);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_change_stream_get_resume_token (mongoc_change_stream_t *);
+
+MONGOC_EXPORT (bool)
+mongoc_change_stream_next (mongoc_change_stream_t *, const bson_t **);
+
+MONGOC_EXPORT (bool)
+mongoc_change_stream_error_document (const mongoc_change_stream_t *,
+                                     bson_error_t *,
+                                     const bson_t **);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_CHANGE_STREAM_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-pool.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-pool.h
new file mode 100644
index 0000000..c4df560
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-pool.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_POOL_H
+#define MONGOC_CLIENT_POOL_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-apm.h"
+#include "mongoc-client.h"
+#include "mongoc-config.h"
+#ifdef MONGOC_ENABLE_SSL
+#include "mongoc-ssl.h"
+#endif
+#include "mongoc-uri.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_client_pool_t mongoc_client_pool_t;
+
+
+MONGOC_EXPORT (mongoc_client_pool_t *)
+mongoc_client_pool_new (const mongoc_uri_t *uri) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_client_pool_t *)
+mongoc_client_pool_new_with_error (const mongoc_uri_t *uri, bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_pool_destroy (mongoc_client_pool_t *pool);
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_pool_pop (mongoc_client_pool_t *pool)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_pool_push (mongoc_client_pool_t *pool, mongoc_client_t *client);
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_pool_try_pop (mongoc_client_pool_t *pool)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_pool_max_size (mongoc_client_pool_t *pool,
+                             uint32_t max_pool_size);
+MONGOC_EXPORT (void)
+mongoc_client_pool_min_size (mongoc_client_pool_t *pool,
+                             uint32_t min_pool_size) BSON_GNUC_DEPRECATED;
+#ifdef MONGOC_ENABLE_SSL
+MONGOC_EXPORT (void)
+mongoc_client_pool_set_ssl_opts (mongoc_client_pool_t *pool,
+                                 const mongoc_ssl_opt_t *opts);
+#endif
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_apm_callbacks (mongoc_client_pool_t *pool,
+                                      mongoc_apm_callbacks_t *callbacks,
+                                      void *context);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_error_api (mongoc_client_pool_t *pool, int32_t version);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_appname (mongoc_client_pool_t *pool,
+                                const char *appname);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_enable_auto_encryption (mongoc_client_pool_t *pool,
+                                           mongoc_auto_encryption_opts_t *opts,
+                                           bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_server_api (mongoc_client_pool_t *pool,
+                                   const mongoc_server_api_t *api,
+                                   bson_error_t *error);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CLIENT_POOL_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-session.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-session.h
new file mode 100644
index 0000000..b274261
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-session.h
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2017 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_SESSION_H
+#define MONGOC_CLIENT_SESSION_H
+
+#include <bson/bson.h>
+#include "mongoc-macros.h"
+/* mongoc_client_session_t, mongoc_transaction_opt_t, and
+   mongoc_session_opt_t are typedef'ed here */
+#include "mongoc-client.h"
+
+BSON_BEGIN_DECLS
+
+typedef bool (*mongoc_client_session_with_transaction_cb_t) (
+   mongoc_client_session_t *session,
+   void *ctx,
+   bson_t **reply,
+   bson_error_t *error);
+
+typedef enum {
+   MONGOC_TRANSACTION_NONE = 0,
+   MONGOC_TRANSACTION_STARTING = 1,
+   MONGOC_TRANSACTION_IN_PROGRESS = 2,
+   MONGOC_TRANSACTION_COMMITTED = 3,
+   MONGOC_TRANSACTION_ABORTED = 4,
+} mongoc_transaction_state_t;
+
+/* these options types are named "opt_t" but their functions are named with
+ * "opts", for consistency with the older mongoc_ssl_opt_t */
+MONGOC_EXPORT (mongoc_transaction_opt_t *)
+mongoc_transaction_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_transaction_opt_t *)
+mongoc_transaction_opts_clone (const mongoc_transaction_opt_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_destroy (mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_max_commit_time_ms (mongoc_transaction_opt_t *opts,
+                                                int64_t max_commit_time_ms);
+
+MONGOC_EXPORT (int64_t)
+mongoc_transaction_opts_get_max_commit_time_ms (mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_read_concern (
+   mongoc_transaction_opt_t *opts, const mongoc_read_concern_t *read_concern);
+
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_transaction_opts_get_read_concern (const mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_write_concern (
+   mongoc_transaction_opt_t *opts, const mongoc_write_concern_t *write_concern);
+
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_transaction_opts_get_write_concern (
+   const mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_read_prefs (mongoc_transaction_opt_t *opts,
+                                        const mongoc_read_prefs_t *read_prefs);
+
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_transaction_opts_get_read_prefs (const mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (mongoc_session_opt_t *)
+mongoc_session_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_set_causal_consistency (mongoc_session_opt_t *opts,
+                                            bool causal_consistency);
+
+MONGOC_EXPORT (bool)
+mongoc_session_opts_get_causal_consistency (const mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_set_snapshot (mongoc_session_opt_t *opts, bool snapshot);
+
+MONGOC_EXPORT (bool)
+mongoc_session_opts_get_snapshot (const mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_set_default_transaction_opts (
+   mongoc_session_opt_t *opts, const mongoc_transaction_opt_t *txn_opts);
+
+MONGOC_EXPORT (const mongoc_transaction_opt_t *)
+mongoc_session_opts_get_default_transaction_opts (
+   const mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (mongoc_transaction_opt_t *)
+mongoc_session_opts_get_transaction_opts (
+   const mongoc_client_session_t *session) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_session_opt_t *)
+mongoc_session_opts_clone (const mongoc_session_opt_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_destroy (mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_session_get_client (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (const mongoc_session_opt_t *)
+mongoc_client_session_get_opts (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_client_session_get_lsid (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_client_session_get_cluster_time (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (void)
+mongoc_client_session_advance_cluster_time (mongoc_client_session_t *session,
+                                            const bson_t *cluster_time);
+
+MONGOC_EXPORT (void)
+mongoc_client_session_get_operation_time (
+   const mongoc_client_session_t *session,
+   uint32_t *timestamp,
+   uint32_t *increment);
+
+MONGOC_EXPORT (uint32_t)
+mongoc_client_session_get_server_id (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (void)
+mongoc_client_session_advance_operation_time (mongoc_client_session_t *session,
+                                              uint32_t timestamp,
+                                              uint32_t increment);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_with_transaction (
+   mongoc_client_session_t *session,
+   mongoc_client_session_with_transaction_cb_t cb,
+   const mongoc_transaction_opt_t *opts,
+   void *ctx,
+   bson_t *reply,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_start_transaction (mongoc_client_session_t *session,
+                                         const mongoc_transaction_opt_t *opts,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_in_transaction (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (mongoc_transaction_state_t)
+mongoc_client_session_get_transaction_state (
+   const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_commit_transaction (mongoc_client_session_t *session,
+                                          bson_t *reply,
+                                          bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_abort_transaction (mongoc_client_session_t *session,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_append (const mongoc_client_session_t *client_session,
+                              bson_t *opts,
+                              bson_error_t *error);
+
+/* There is no mongoc_client_session_end, only mongoc_client_session_destroy.
+ * Driver Sessions Spec: "In languages that have idiomatic ways of disposing of
+ * resources, drivers SHOULD support that in addition to or instead of
+ * endSession."
+ */
+
+MONGOC_EXPORT (void)
+mongoc_client_session_destroy (mongoc_client_session_t *session);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_get_dirty (mongoc_client_session_t *session);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CLIENT_SESSION_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-side-encryption.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-side-encryption.h
new file mode 100644
index 0000000..6ad0d61
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client-side-encryption.h
@@ -0,0 +1,283 @@
+/*
+ * Copyright 2019-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_SIDE_ENCRYPTION_H
+#define MONGOC_CLIENT_SIDE_ENCRYPTION_H
+
+#include <bson/bson.h>
+
+/* Forward declare */
+struct _mongoc_client_t;
+struct _mongoc_client_pool_t;
+struct _mongoc_cursor_t;
+
+#define MONGOC_AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM \
+   "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+#define MONGOC_AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC \
+   "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+#define MONGOC_ENCRYPT_ALGORITHM_INDEXED "Indexed"
+#define MONGOC_ENCRYPT_ALGORITHM_UNINDEXED "Unindexed"
+
+#define MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY "equality"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_auto_encryption_opts_t mongoc_auto_encryption_opts_t;
+
+typedef bool (*mongoc_kms_credentials_provider_callback_fn) (
+   void *userdata, const bson_t *params, bson_t *out, bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_auto_encryption_opts_t *)
+mongoc_auto_encryption_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_destroy (mongoc_auto_encryption_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_keyvault_client (
+   mongoc_auto_encryption_opts_t *opts, struct _mongoc_client_t *client);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_keyvault_client_pool (
+   mongoc_auto_encryption_opts_t *opts, struct _mongoc_client_pool_t *pool);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_keyvault_namespace (
+   mongoc_auto_encryption_opts_t *opts, const char *db, const char *coll);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_kms_providers (
+   mongoc_auto_encryption_opts_t *opts, const bson_t *kms_providers);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_tls_opts (mongoc_auto_encryption_opts_t *opts,
+                                          const bson_t *tls_opts);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_schema_map (mongoc_auto_encryption_opts_t *opts,
+                                            const bson_t *schema_map);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_encrypted_fields_map (
+   mongoc_auto_encryption_opts_t *opts, const bson_t *encrypted_fields_map);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_bypass_auto_encryption (
+   mongoc_auto_encryption_opts_t *opts, bool bypass_auto_encryption);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_bypass_query_analysis (
+   mongoc_auto_encryption_opts_t *opts, bool bypass_query_analysis);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_extra (mongoc_auto_encryption_opts_t *opts,
+                                       const bson_t *extra);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_kms_credential_provider_callback (
+   mongoc_auto_encryption_opts_t *opts,
+   mongoc_kms_credentials_provider_callback_fn fn,
+   void *userdata);
+
+typedef struct _mongoc_client_encryption_opts_t mongoc_client_encryption_opts_t;
+typedef struct _mongoc_client_encryption_t mongoc_client_encryption_t;
+typedef struct _mongoc_client_encryption_encrypt_opts_t
+   mongoc_client_encryption_encrypt_opts_t;
+typedef struct _mongoc_client_encryption_datakey_opts_t
+   mongoc_client_encryption_datakey_opts_t;
+typedef struct _mongoc_client_encryption_rewrap_many_datakey_result_t
+   mongoc_client_encryption_rewrap_many_datakey_result_t;
+
+MONGOC_EXPORT (mongoc_client_encryption_opts_t *)
+mongoc_client_encryption_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_destroy (mongoc_client_encryption_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_keyvault_client (
+   mongoc_client_encryption_opts_t *opts,
+   struct _mongoc_client_t *keyvault_client);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_keyvault_namespace (
+   mongoc_client_encryption_opts_t *opts, const char *db, const char *coll);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_kms_providers (
+   mongoc_client_encryption_opts_t *opts, const bson_t *kms_providers);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_tls_opts (
+   mongoc_client_encryption_opts_t *opts, const bson_t *tls_opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_kms_credential_provider_callback (
+   mongoc_client_encryption_opts_t *opts,
+   mongoc_kms_credentials_provider_callback_fn fn,
+   void *userdata);
+
+MONGOC_EXPORT (mongoc_client_encryption_rewrap_many_datakey_result_t *)
+mongoc_client_encryption_rewrap_many_datakey_result_new (void)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_rewrap_many_datakey_result_destroy (
+   mongoc_client_encryption_rewrap_many_datakey_result_t *result);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_client_encryption_rewrap_many_datakey_result_get_bulk_write_result (
+   mongoc_client_encryption_rewrap_many_datakey_result_t *result)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_client_encryption_t *)
+mongoc_client_encryption_new (mongoc_client_encryption_opts_t *opts,
+                              bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_destroy (
+   mongoc_client_encryption_t *client_encryption);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_create_datakey (
+   mongoc_client_encryption_t *client_encryption,
+   const char *kms_provider,
+   mongoc_client_encryption_datakey_opts_t *opts,
+   bson_value_t *keyid,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_rewrap_many_datakey (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_t *filter,
+   const char *provider,
+   const bson_t *master_key,
+   mongoc_client_encryption_rewrap_many_datakey_result_t *result,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_delete_key (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_value_t *keyid,
+   bson_t *reply,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_get_key (mongoc_client_encryption_t *client_encryption,
+                                  const bson_value_t *keyid,
+                                  bson_t *key_doc,
+                                  bson_error_t *error);
+
+MONGOC_EXPORT (struct _mongoc_cursor_t *)
+mongoc_client_encryption_get_keys (
+   mongoc_client_encryption_t *client_encryption, bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_add_key_alt_name (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_value_t *keyid,
+   const char *keyaltname,
+   bson_t *key_doc,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_remove_key_alt_name (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_value_t *keyid,
+   const char *keyaltname,
+   bson_t *key_doc,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_get_key_by_alt_name (
+   mongoc_client_encryption_t *client_encryption,
+   const char *keyaltname,
+   bson_t *key_doc,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_encrypt (mongoc_client_encryption_t *client_encryption,
+                                  const bson_value_t *value,
+                                  mongoc_client_encryption_encrypt_opts_t *opts,
+                                  bson_value_t *ciphertext,
+                                  bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_decrypt (mongoc_client_encryption_t *client_encryption,
+                                  const bson_value_t *ciphertext,
+                                  bson_value_t *value,
+                                  bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_client_encryption_encrypt_opts_t *)
+mongoc_client_encryption_encrypt_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_destroy (
+   mongoc_client_encryption_encrypt_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_keyid (
+   mongoc_client_encryption_encrypt_opts_t *opts, const bson_value_t *keyid);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_keyaltname (
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *keyaltname);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_algorithm (
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *algorithm);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_contention_factor (
+   mongoc_client_encryption_encrypt_opts_t *opts, int64_t contention_factor);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_query_type (
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *query_type);
+
+MONGOC_EXPORT (mongoc_client_encryption_datakey_opts_t *)
+mongoc_client_encryption_datakey_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_destroy (
+   mongoc_client_encryption_datakey_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_set_masterkey (
+   mongoc_client_encryption_datakey_opts_t *opts, const bson_t *masterkey);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_set_keyaltnames (
+   mongoc_client_encryption_datakey_opts_t *opts,
+   char **keyaltnames,
+   uint32_t keyaltnames_count);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_set_keymaterial (
+   mongoc_client_encryption_datakey_opts_t *opts,
+   const uint8_t *data,
+   uint32_t len);
+
+MONGOC_EXPORT (const char *)
+mongoc_client_encryption_get_crypt_shared_version (
+   mongoc_client_encryption_t const *enc) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_CLIENT_SIDE_ENCRYPTION_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client.h
new file mode 100644
index 0000000..cff520f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-client.h
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_H
+#define MONGOC_CLIENT_H
+
+#include <bson/bson.h>
+
+#include "mongoc-apm.h"
+#include "mongoc-client-side-encryption.h"
+#include "mongoc-collection.h"
+#include "mongoc-config.h"
+#include "mongoc-cursor.h"
+#include "mongoc-database.h"
+#include "mongoc-gridfs.h"
+#include "mongoc-index.h"
+#include "mongoc-macros.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-server-api.h"
+#ifdef MONGOC_ENABLE_SSL
+#include "mongoc-ssl.h"
+#endif
+#include "mongoc-stream.h"
+#include "mongoc-uri.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-server-description.h"
+
+BSON_BEGIN_DECLS
+
+/* This define is part of our public API. But per MongoDB 4.4, there is no
+ * longer a size limit on collection names. */
+#define MONGOC_NAMESPACE_MAX 128
+
+
+#ifndef MONGOC_DEFAULT_CONNECTTIMEOUTMS
+#define MONGOC_DEFAULT_CONNECTTIMEOUTMS (10 * 1000L)
+#endif
+
+
+#ifndef MONGOC_DEFAULT_SOCKETTIMEOUTMS
+/*
+ * NOTE: The default socket timeout for connections is 5 minutes. This
+ *       means that if your MongoDB server dies or becomes unavailable
+ *       it will take 5 minutes to detect this.
+ *
+ *       You can change this by providing sockettimeoutms= in your
+ *       connection URI.
+ */
+#define MONGOC_DEFAULT_SOCKETTIMEOUTMS (1000L * 60L * 5L)
+#endif
+
+
+/**
+ * mongoc_client_t:
+ *
+ * The mongoc_client_t structure maintains information about a connection to
+ * a MongoDB server.
+ */
+typedef struct _mongoc_client_t mongoc_client_t;
+
+
+typedef struct _mongoc_client_session_t mongoc_client_session_t;
+typedef struct _mongoc_session_opt_t mongoc_session_opt_t;
+typedef struct _mongoc_transaction_opt_t mongoc_transaction_opt_t;
+
+/**
+ * mongoc_stream_initiator_t:
+ * @uri: The uri and options for the stream.
+ * @host: The host and port (or UNIX domain socket path) to connect to.
+ * @user_data: The pointer passed to mongoc_client_set_stream_initiator.
+ * @error: A location for an error.
+ *
+ * Creates a new mongoc_stream_t for the host and port. Begin a
+ * non-blocking connect and return immediately.
+ *
+ * This can be used by language bindings to create network transports other
+ * than those built into libmongoc. An example of such would be the streams
+ * API provided by PHP.
+ *
+ * Returns: A newly allocated mongoc_stream_t or NULL on failure.
+ */
+typedef mongoc_stream_t *(*mongoc_stream_initiator_t) (
+   const mongoc_uri_t *uri,
+   const mongoc_host_list_t *host,
+   void *user_data,
+   bson_error_t *error);
+
+
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_new (const char *uri_string) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_new_from_uri (const mongoc_uri_t *uri)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_new_from_uri_with_error (
+   const mongoc_uri_t *uri, bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_uri_t *)
+mongoc_client_get_uri (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_stream_initiator (mongoc_client_t *client,
+                                    mongoc_stream_initiator_t initiator,
+                                    void *user_data);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_client_command (mongoc_client_t *client,
+                       const char *db_name,
+                       mongoc_query_flags_t flags,
+                       uint32_t skip,
+                       uint32_t limit,
+                       uint32_t batch_size,
+                       const bson_t *query,
+                       const bson_t *fields,
+                       const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_kill_cursor (mongoc_client_t *client,
+                           int64_t cursor_id) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_client_command_simple (mongoc_client_t *client,
+                              const char *db_name,
+                              const bson_t *command,
+                              const mongoc_read_prefs_t *read_prefs,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_read_command_with_opts (mongoc_client_t *client,
+                                      const char *db_name,
+                                      const bson_t *command,
+                                      const mongoc_read_prefs_t *read_prefs,
+                                      const bson_t *opts,
+                                      bson_t *reply,
+                                      bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_write_command_with_opts (mongoc_client_t *client,
+                                       const char *db_name,
+                                       const bson_t *command,
+                                       const bson_t *opts,
+                                       bson_t *reply,
+                                       bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_read_write_command_with_opts (
+   mongoc_client_t *client,
+   const char *db_name,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs /* IGNORED */,
+   const bson_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_command_with_opts (mongoc_client_t *client,
+                                 const char *db_name,
+                                 const bson_t *command,
+                                 const mongoc_read_prefs_t *read_prefs,
+                                 const bson_t *opts,
+                                 bson_t *reply,
+                                 bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_command_simple_with_server_id (
+   mongoc_client_t *client,
+   const char *db_name,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs,
+   uint32_t server_id,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_client_destroy (mongoc_client_t *client);
+MONGOC_EXPORT (mongoc_client_session_t *)
+mongoc_client_start_session (mongoc_client_t *client,
+                             const mongoc_session_opt_t *opts,
+                             bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_database_t *)
+mongoc_client_get_database (mongoc_client_t *client,
+                            const char *name) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_database_t *)
+mongoc_client_get_default_database (mongoc_client_t *client)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_t *)
+mongoc_client_get_gridfs (mongoc_client_t *client,
+                          const char *db,
+                          const char *prefix,
+                          bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_client_get_collection (mongoc_client_t *client,
+                              const char *db,
+                              const char *collection)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (char **)
+mongoc_client_get_database_names (mongoc_client_t *client, bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_client_get_database_names_with_opts);
+MONGOC_EXPORT (char **)
+mongoc_client_get_database_names_with_opts (mongoc_client_t *client,
+                                            const bson_t *opts,
+                                            bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_client_find_databases (mongoc_client_t *client,
+                              bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_client_find_databases_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_client_find_databases_with_opts (
+   mongoc_client_t *client, const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_client_get_server_status (mongoc_client_t *client,
+                                 mongoc_read_prefs_t *read_prefs,
+                                 bson_t *reply,
+                                 bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (int32_t)
+mongoc_client_get_max_message_size (mongoc_client_t *client)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (int32_t)
+mongoc_client_get_max_bson_size (mongoc_client_t *client) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_client_get_write_concern (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_write_concern (mongoc_client_t *client,
+                                 const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_client_get_read_concern (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_read_concern (mongoc_client_t *client,
+                                const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_client_get_read_prefs (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_read_prefs (mongoc_client_t *client,
+                              const mongoc_read_prefs_t *read_prefs);
+#ifdef MONGOC_ENABLE_SSL
+MONGOC_EXPORT (void)
+mongoc_client_set_ssl_opts (mongoc_client_t *client,
+                            const mongoc_ssl_opt_t *opts);
+#endif
+MONGOC_EXPORT (bool)
+mongoc_client_set_apm_callbacks (mongoc_client_t *client,
+                                 mongoc_apm_callbacks_t *callbacks,
+                                 void *context);
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_client_get_server_description (
+   mongoc_client_t *client, uint32_t server_id) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_server_description_t **)
+mongoc_client_get_server_descriptions (const mongoc_client_t *client,
+                                       size_t *n) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_server_descriptions_destroy_all (mongoc_server_description_t **sds,
+                                        size_t n);
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_client_select_server (mongoc_client_t *client,
+                             bool for_writes,
+                             const mongoc_read_prefs_t *prefs,
+                             bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_client_set_error_api (mongoc_client_t *client, int32_t version);
+MONGOC_EXPORT (bool)
+mongoc_client_set_appname (mongoc_client_t *client, const char *appname);
+MONGOC_EXPORT (mongoc_change_stream_t *)
+mongoc_client_watch (mongoc_client_t *client,
+                     const bson_t *pipeline,
+                     const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_reset (mongoc_client_t *client);
+
+MONGOC_EXPORT (bool)
+mongoc_client_enable_auto_encryption (mongoc_client_t *client,
+                                      mongoc_auto_encryption_opts_t *opts,
+                                      bson_error_t *error);
+
+MONGOC_EXPORT (const char *)
+mongoc_client_get_crypt_shared_version (const mongoc_client_t *client)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_client_set_server_api (mongoc_client_t *client,
+                              const mongoc_server_api_t *api,
+                              bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_client_get_handshake_description (mongoc_client_t *client,
+                                         uint32_t server_id,
+                                         bson_t *opts,
+                                         bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CLIENT_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-collection.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-collection.h
new file mode 100644
index 0000000..a36c5ac
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-collection.h
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2013-2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_COLLECTION_H
+#define MONGOC_COLLECTION_H
+
+#include <bson/bson.h>
+
+#include "mongoc-change-stream.h"
+#include "mongoc-macros.h"
+#include "mongoc-bulk-operation.h"
+#include "mongoc-flags.h"
+#include "mongoc-cursor.h"
+#include "mongoc-index.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-find-and-modify.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_collection_t mongoc_collection_t;
+
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_aggregate (mongoc_collection_t *collection,
+                             mongoc_query_flags_t flags,
+                             const bson_t *pipeline,
+                             const bson_t *opts,
+                             const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_collection_destroy (mongoc_collection_t *collection);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_collection_copy (mongoc_collection_t *collection)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_command (mongoc_collection_t *collection,
+                           mongoc_query_flags_t flags,
+                           uint32_t skip,
+                           uint32_t limit,
+                           uint32_t batch_size,
+                           const bson_t *command,
+                           const bson_t *fields,
+                           const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_collection_read_command_with_opts (mongoc_collection_t *collection,
+                                          const bson_t *command,
+                                          const mongoc_read_prefs_t *read_prefs,
+                                          const bson_t *opts,
+                                          bson_t *reply,
+                                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_write_command_with_opts (mongoc_collection_t *collection,
+                                           const bson_t *command,
+                                           const bson_t *opts,
+                                           bson_t *reply,
+                                           bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_read_write_command_with_opts (
+   mongoc_collection_t *collection,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs /* IGNORED */,
+   const bson_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_command_with_opts (mongoc_collection_t *collection,
+                                     const bson_t *command,
+                                     const mongoc_read_prefs_t *read_prefs,
+                                     const bson_t *opts,
+                                     bson_t *reply,
+                                     bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_command_simple (mongoc_collection_t *collection,
+                                  const bson_t *command,
+                                  const mongoc_read_prefs_t *read_prefs,
+                                  bson_t *reply,
+                                  bson_error_t *error);
+MONGOC_EXPORT (int64_t)
+mongoc_collection_count (mongoc_collection_t *collection,
+                         mongoc_query_flags_t flags,
+                         const bson_t *query,
+                         int64_t skip,
+                         int64_t limit,
+                         const mongoc_read_prefs_t *read_prefs,
+                         bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_count_documents or
+                             mongoc_collection_estimated_document_count);
+MONGOC_EXPORT (int64_t)
+mongoc_collection_count_with_opts (mongoc_collection_t *collection,
+                                   mongoc_query_flags_t flags,
+                                   const bson_t *query,
+                                   int64_t skip,
+                                   int64_t limit,
+                                   const bson_t *opts,
+                                   const mongoc_read_prefs_t *read_prefs,
+                                   bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_count_documents or
+                             mongoc_collection_estimated_document_count);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop (mongoc_collection_t *collection, bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop_with_opts (mongoc_collection_t *collection,
+                                  const bson_t *opts,
+                                  bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop_index (mongoc_collection_t *collection,
+                              const char *index_name,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop_index_with_opts (mongoc_collection_t *collection,
+                                        const char *index_name,
+                                        const bson_t *opts,
+                                        bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_create_index (mongoc_collection_t *collection,
+                                const bson_t *keys,
+                                const mongoc_index_opt_t *opt,
+                                bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_collection_create_index_with_opts (mongoc_collection_t *collection,
+                                          const bson_t *keys,
+                                          const mongoc_index_opt_t *opt,
+                                          const bson_t *opts,
+                                          bson_t *reply,
+                                          bson_error_t *error)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_collection_ensure_index (mongoc_collection_t *collection,
+                                const bson_t *keys,
+                                const mongoc_index_opt_t *opt,
+                                bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find_indexes (mongoc_collection_t *collection,
+                                bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_find_indexes_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find_indexes_with_opts (mongoc_collection_t *collection,
+                                          const bson_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find (mongoc_collection_t *collection,
+                        mongoc_query_flags_t flags,
+                        uint32_t skip,
+                        uint32_t limit,
+                        uint32_t batch_size,
+                        const bson_t *query,
+                        const bson_t *fields,
+                        const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_find_with_opts)
+      BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find_with_opts (mongoc_collection_t *collection,
+                                  const bson_t *filter,
+                                  const bson_t *opts,
+                                  const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_collection_insert (mongoc_collection_t *collection,
+                          mongoc_insert_flags_t flags,
+                          const bson_t *document,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_insert_one (mongoc_collection_t *collection,
+                              const bson_t *document,
+                              const bson_t *opts,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_insert_many (mongoc_collection_t *collection,
+                               const bson_t **documents,
+                               size_t n_documents,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_insert_bulk (mongoc_collection_t *collection,
+                               mongoc_insert_flags_t flags,
+                               const bson_t **documents,
+                               uint32_t n_documents,
+                               const mongoc_write_concern_t *write_concern,
+                               bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_insert_many);
+MONGOC_EXPORT (bool)
+mongoc_collection_update (mongoc_collection_t *collection,
+                          mongoc_update_flags_t flags,
+                          const bson_t *selector,
+                          const bson_t *update,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_update_one (mongoc_collection_t *collection,
+                              const bson_t *selector,
+                              const bson_t *update,
+                              const bson_t *opts,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_update_many (mongoc_collection_t *collection,
+                               const bson_t *selector,
+                               const bson_t *update,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_replace_one (mongoc_collection_t *collection,
+                               const bson_t *selector,
+                               const bson_t *replacement,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_delete (mongoc_collection_t *collection,
+                          mongoc_delete_flags_t flags,
+                          const bson_t *selector,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_delete_one or
+                             mongoc_collection_delete_many);
+MONGOC_EXPORT (bool)
+mongoc_collection_save (mongoc_collection_t *collection,
+                        const bson_t *document,
+                        const mongoc_write_concern_t *write_concern,
+                        bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_insert_one or
+                             mongoc_collection_replace_one);
+MONGOC_EXPORT (bool)
+mongoc_collection_remove (mongoc_collection_t *collection,
+                          mongoc_remove_flags_t flags,
+                          const bson_t *selector,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_delete_one (mongoc_collection_t *collection,
+                              const bson_t *selector,
+                              const bson_t *opts,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_delete_many (mongoc_collection_t *collection,
+                               const bson_t *selector,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_rename (mongoc_collection_t *collection,
+                          const char *new_db,
+                          const char *new_name,
+                          bool drop_target_before_rename,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_rename_with_opts (mongoc_collection_t *collection,
+                                    const char *new_db,
+                                    const char *new_name,
+                                    bool drop_target_before_rename,
+                                    const bson_t *opts,
+                                    bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_find_and_modify_with_opts (
+   mongoc_collection_t *collection,
+   const bson_t *query,
+   const mongoc_find_and_modify_opts_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_find_and_modify (mongoc_collection_t *collection,
+                                   const bson_t *query,
+                                   const bson_t *sort,
+                                   const bson_t *update,
+                                   const bson_t *fields,
+                                   bool _remove,
+                                   bool upsert,
+                                   bool _new,
+                                   bson_t *reply,
+                                   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_stats (mongoc_collection_t *collection,
+                         const bson_t *options,
+                         bson_t *reply,
+                         bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (mongoc_bulk_operation_t *)
+mongoc_collection_create_bulk_operation (
+   mongoc_collection_t *collection,
+   bool ordered,
+   const mongoc_write_concern_t *write_concern) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_create_bulk_operation_with_opts);
+MONGOC_EXPORT (mongoc_bulk_operation_t *)
+mongoc_collection_create_bulk_operation_with_opts (
+   mongoc_collection_t *collection,
+   const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_collection_get_read_prefs (const mongoc_collection_t *collection);
+MONGOC_EXPORT (void)
+mongoc_collection_set_read_prefs (mongoc_collection_t *collection,
+                                  const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_collection_get_read_concern (const mongoc_collection_t *collection);
+MONGOC_EXPORT (void)
+mongoc_collection_set_read_concern (mongoc_collection_t *collection,
+                                    const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_collection_get_write_concern (const mongoc_collection_t *collection);
+MONGOC_EXPORT (void)
+mongoc_collection_set_write_concern (
+   mongoc_collection_t *collection,
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (const char *)
+mongoc_collection_get_name (mongoc_collection_t *collection);
+MONGOC_EXPORT (const bson_t *)
+mongoc_collection_get_last_error (const mongoc_collection_t *collection)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (char *)
+mongoc_collection_keys_to_index_string (const bson_t *keys)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_collection_validate (mongoc_collection_t *collection,
+                            const bson_t *options,
+                            bson_t *reply,
+                            bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (mongoc_change_stream_t *)
+mongoc_collection_watch (const mongoc_collection_t *coll,
+                         const bson_t *pipeline,
+                         const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (int64_t)
+mongoc_collection_count_documents (mongoc_collection_t *coll,
+                                   const bson_t *filter,
+                                   const bson_t *opts,
+                                   const mongoc_read_prefs_t *read_prefs,
+                                   bson_t *reply,
+                                   bson_error_t *error);
+MONGOC_EXPORT (int64_t)
+mongoc_collection_estimated_document_count (
+   mongoc_collection_t *coll,
+   const bson_t *opts,
+   const mongoc_read_prefs_t *read_prefs,
+   bson_t *reply,
+   bson_error_t *error);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_COLLECTION_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-config.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-config.h
new file mode 100644
index 0000000..4454f1e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-config.h
@@ -0,0 +1,423 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(MONGOC_INSIDE) && !defined(MONGOC_COMPILATION)
+#error "Only <mongoc/mongoc.h> can be included directly."
+#endif
+
+
+#ifndef MONGOC_CONFIG_H
+#define MONGOC_CONFIG_H
+
+/* clang-format off */
+
+/*
+ * NOTICE:
+ * If you're about to update this file and add a config flag, make sure to
+ * update:
+ * o The bitfield in mongoc-handshake-private.h
+ * o _mongoc_handshake_get_config_hex_string() in mongoc-handshake.c
+ * o examples/parse_handshake_cfg.py
+ * o test_handshake_config_string in test-mongoc-handshake.c
+ */
+
+/* MONGOC_USER_SET_CFLAGS is set from config based on what compiler flags were
+ * used to compile mongoc */
+#define MONGOC_USER_SET_CFLAGS ""
+
+#define MONGOC_USER_SET_LDFLAGS "-nodefaultlibs -stdlib=libc++ -lc -lm -lgcc_s -lgcc C:/UE/UE_5.1/Engine/Source/ThirdParty/Unix/LibCxx/lib/Unix/x86_64-unknown-linux-gnu/libc++.a C:/UE/UE_5.1/Engine/Source/ThirdParty/Unix/LibCxx/lib/Unix/x86_64-unknown-linux-gnu/libc++abi.a"
+
+/* MONGOC_CC is used to determine what C compiler was used to compile mongoc */
+#define MONGOC_CC "C:/UnrealToolchains/v20_clang-13.0.1-centos7/x86_64-unknown-linux-gnu/bin/clang.exe"
+
+/*
+ * MONGOC_ENABLE_SSL_SECURE_CHANNEL is set from configure to determine if we are
+ * compiled with Native SSL support on Windows
+ */
+#define MONGOC_ENABLE_SSL_SECURE_CHANNEL 0
+
+#if MONGOC_ENABLE_SSL_SECURE_CHANNEL != 1
+#  undef MONGOC_ENABLE_SSL_SECURE_CHANNEL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO_CNG is set from configure to determine if we are
+ * compiled with Native Crypto support on Windows
+ */
+#define MONGOC_ENABLE_CRYPTO_CNG 0
+
+#if MONGOC_ENABLE_CRYPTO_CNG != 1
+#  undef MONGOC_ENABLE_CRYPTO_CNG
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL_SECURE_TRANSPORT is set from configure to determine if we are
+ * compiled with Native SSL support on Darwin
+ */
+#define MONGOC_ENABLE_SSL_SECURE_TRANSPORT 0
+
+#if MONGOC_ENABLE_SSL_SECURE_TRANSPORT != 1
+#  undef MONGOC_ENABLE_SSL_SECURE_TRANSPORT
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO is set from configure to determine if we are
+ * compiled with Native Crypto support on Darwin
+ */
+#define MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO 0
+
+#if MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO != 1
+#  undef MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL_LIBRESSL is set from configure to determine if we are
+ * compiled with LibreSSL support.
+ */
+#define MONGOC_ENABLE_SSL_LIBRESSL 0
+
+#if MONGOC_ENABLE_SSL_LIBRESSL != 1
+#  undef MONGOC_ENABLE_SSL_LIBRESSL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL_OPENSSL is set from configure to determine if we are
+ * compiled with OpenSSL support.
+ */
+#define MONGOC_ENABLE_SSL_OPENSSL 0
+
+#if MONGOC_ENABLE_SSL_OPENSSL != 1
+#  undef MONGOC_ENABLE_SSL_OPENSSL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO_LIBCRYPTO is set from configure to determine if we are
+ * compiled with OpenSSL support.
+ */
+#define MONGOC_ENABLE_CRYPTO_LIBCRYPTO 0
+
+#if MONGOC_ENABLE_CRYPTO_LIBCRYPTO != 1
+#  undef MONGOC_ENABLE_CRYPTO_LIBCRYPTO
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL is set from configure to determine if we are
+ * compiled with any SSL support.
+ */
+#define MONGOC_ENABLE_SSL 0
+
+#if MONGOC_ENABLE_SSL != 1
+#  undef MONGOC_ENABLE_SSL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO is set from configure to determine if we are
+ * compiled with any crypto support.
+ */
+#define MONGOC_ENABLE_CRYPTO 0
+
+#if MONGOC_ENABLE_CRYPTO != 1
+#  undef MONGOC_ENABLE_CRYPTO
+#endif
+
+
+/*
+ * Use system crypto profile
+ */
+#define MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE 0
+
+#if MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE != 1
+#  undef MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE
+#endif
+
+
+/*
+ * Use ASN1_STRING_get0_data () rather than the deprecated ASN1_STRING_data
+ */
+#define MONGOC_HAVE_ASN1_STRING_GET0_DATA 0
+
+#if MONGOC_HAVE_ASN1_STRING_GET0_DATA != 1
+#  undef MONGOC_HAVE_ASN1_STRING_GET0_DATA
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SASL is set from configure to determine if we are
+ * compiled with SASL support.
+ */
+#define MONGOC_ENABLE_SASL 0
+
+#if MONGOC_ENABLE_SASL != 1
+#  undef MONGOC_ENABLE_SASL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SASL_CYRUS is set from configure to determine if we are
+ * compiled with Cyrus SASL support.
+ */
+#define MONGOC_ENABLE_SASL_CYRUS 0
+
+#if MONGOC_ENABLE_SASL_CYRUS != 1
+#  undef MONGOC_ENABLE_SASL_CYRUS
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SASL_SSPI is set from configure to determine if we are
+ * compiled with SSPI support.
+ */
+#define MONGOC_ENABLE_SASL_SSPI 0
+
+#if MONGOC_ENABLE_SASL_SSPI != 1
+#  undef MONGOC_ENABLE_SASL_SSPI
+#endif
+
+/*
+ * MONGOC_HAVE_SASL_CLIENT_DONE is set from configure to determine if we
+ * have SASL and its version is new enough to use sasl_client_done (),
+ * which supersedes sasl_done ().
+ */
+#define MONGOC_HAVE_SASL_CLIENT_DONE 0
+
+#if MONGOC_HAVE_SASL_CLIENT_DONE != 1
+#  undef MONGOC_HAVE_SASL_CLIENT_DONE
+#endif
+
+
+/*
+ * Disable automatic calls to mongoc_init() and mongoc_cleanup()
+ * before main() is called, and after exit() (respectively).
+ */
+#define MONGOC_NO_AUTOMATIC_GLOBALS 0
+
+#if MONGOC_NO_AUTOMATIC_GLOBALS != 1
+#  undef MONGOC_NO_AUTOMATIC_GLOBALS
+#endif
+
+/*
+ * MONGOC_HAVE_SOCKLEN is set from configure to determine if we
+ * need to emulate the type.
+ */
+#define MONGOC_HAVE_SOCKLEN 1
+
+#if MONGOC_HAVE_SOCKLEN != 1
+#  undef MONGOC_HAVE_SOCKLEN
+#endif
+
+
+/*
+ * MONGOC_HAVE_DNSAPI is set from configure to determine if we should use the
+ * Windows dnsapi for SRV record lookups.
+ */
+#define MONGOC_HAVE_DNSAPI 0
+
+#if MONGOC_HAVE_DNSAPI != 1
+#  undef MONGOC_HAVE_DNSAPI
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_NSEARCH is set from configure to determine if we
+ * have thread-safe res_nsearch().
+ */
+#define MONGOC_HAVE_RES_NSEARCH 1
+
+#if MONGOC_HAVE_RES_NSEARCH != 1
+#  undef MONGOC_HAVE_RES_NSEARCH
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_NDESTROY is set from configure to determine if we
+ * have BSD / Darwin's res_ndestroy().
+ */
+#define MONGOC_HAVE_RES_NDESTROY 0
+
+#if MONGOC_HAVE_RES_NDESTROY != 1
+#  undef MONGOC_HAVE_RES_NDESTROY
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_NCLOSE is set from configure to determine if we
+ * have Linux's res_nclose().
+ */
+#define MONGOC_HAVE_RES_NCLOSE 1
+
+#if MONGOC_HAVE_RES_NCLOSE != 1
+#  undef MONGOC_HAVE_RES_NCLOSE
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_SEARCH is set from configure to determine if we
+ * have thread-unsafe res_search(). It's unset if we have the preferred
+ * res_nsearch().
+ */
+#define MONGOC_HAVE_RES_SEARCH 0
+
+#if MONGOC_HAVE_RES_SEARCH != 1
+#  undef MONGOC_HAVE_RES_SEARCH
+#endif
+
+
+/*
+ * Set from configure, see
+ * https://curl.haxx.se/mail/lib-2009-04/0287.html
+ */
+#define MONGOC_SOCKET_ARG2 struct sockaddr
+#define MONGOC_SOCKET_ARG3 socklen_t
+
+/*
+ * Enable wire protocol compression negotiation
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION 1
+
+#if MONGOC_ENABLE_COMPRESSION != 1
+#  undef MONGOC_ENABLE_COMPRESSION
+#endif
+
+/*
+ * Set if we have snappy compression support
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION_SNAPPY 0
+
+#if MONGOC_ENABLE_COMPRESSION_SNAPPY != 1
+#  undef MONGOC_ENABLE_COMPRESSION_SNAPPY
+#endif
+
+
+/*
+ * Set if we have zlib compression support
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION_ZLIB 1
+
+#if MONGOC_ENABLE_COMPRESSION_ZLIB != 1
+#  undef MONGOC_ENABLE_COMPRESSION_ZLIB
+#endif
+
+/*
+ * Set if we have zstd compression support
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION_ZSTD 0
+
+#if MONGOC_ENABLE_COMPRESSION_ZSTD != 1
+#  undef MONGOC_ENABLE_COMPRESSION_ZSTD
+#endif
+
+/*
+ * Set if performance counters are available and not disabled.
+ *
+ */
+#define MONGOC_ENABLE_SHM_COUNTERS 1
+
+#if MONGOC_ENABLE_SHM_COUNTERS != 1
+#  undef MONGOC_ENABLE_SHM_COUNTERS
+#endif
+
+/*
+ * Set if we have enabled fast counters on Intel using the RDTSCP instruction
+ *
+ */
+#define MONGOC_ENABLE_RDTSCP 0
+
+#if MONGOC_ENABLE_RDTSCP != 1
+#  undef MONGOC_ENABLE_RDTSCP
+#endif
+
+
+/*
+ * Set if we have the sched_getcpu() function for use with counters
+ *
+ */
+#define MONGOC_HAVE_SCHED_GETCPU 0
+
+#if MONGOC_HAVE_SCHED_GETCPU != 1
+#  undef MONGOC_HAVE_SCHED_GETCPU
+#endif
+
+/*
+ * Set if tracing is enabled. Logs things like network communication and
+ * entry/exit of certain functions.
+ */
+#define MONGOC_TRACE 0
+
+enum {
+   /**
+    * @brief Compile-time constant determining whether the mongoc library was
+    * compiled with tracing enabled.
+    *
+    * Can be controlled with the 'ENABLE_TRACING" configure-time boolean option
+    */
+   MONGOC_TRACE_ENABLED = MONGOC_TRACE
+};
+
+/*
+ * Set if we have ICU support.
+ */
+#define MONGOC_ENABLE_ICU 0
+
+#if MONGOC_ENABLE_ICU != 1
+#  undef MONGOC_ENABLE_ICU
+#endif
+
+
+/*
+ * Set if we have Client Side Encryption support.
+ */
+
+#define MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION 0
+
+#if MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION != 1
+#  undef MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION
+#endif
+
+
+/*
+ * Set if struct sockaddr_storage has __ss_family (instead of ss_family)
+ */
+
+#define MONGOC_HAVE_SS_FAMILY 1
+
+#if MONGOC_HAVE_SS_FAMILY != 1
+#  undef MONGOC_HAVE_SS_FAMILY
+#endif
+
+/*
+ * Set if building with AWS IAM support.
+ */
+#define MONGOC_ENABLE_MONGODB_AWS_AUTH 0
+
+#if MONGOC_ENABLE_MONGODB_AWS_AUTH != 1
+#  undef MONGOC_ENABLE_MONGODB_AWS_AUTH
+#endif
+
+/* clang-format on */
+
+#endif /* MONGOC_CONFIG_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-cursor.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-cursor.h
new file mode 100644
index 0000000..b844c47
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-cursor.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CURSOR_H
+#define MONGOC_CURSOR_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-host-list.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_cursor_t mongoc_cursor_t;
+
+
+/* forward decl */
+struct _mongoc_client_t;
+
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_cursor_clone (const mongoc_cursor_t *cursor)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_cursor_destroy (mongoc_cursor_t *cursor);
+MONGOC_EXPORT (bool)
+mongoc_cursor_more (mongoc_cursor_t *cursor);
+MONGOC_EXPORT (bool)
+mongoc_cursor_next (mongoc_cursor_t *cursor, const bson_t **bson);
+MONGOC_EXPORT (bool)
+mongoc_cursor_error (mongoc_cursor_t *cursor, bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_cursor_error_document (mongoc_cursor_t *cursor,
+                              bson_error_t *error,
+                              const bson_t **doc);
+MONGOC_EXPORT (void)
+mongoc_cursor_get_host (mongoc_cursor_t *cursor, mongoc_host_list_t *host);
+MONGOC_EXPORT (bool)
+mongoc_cursor_is_alive (const mongoc_cursor_t *cursor)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_cursor_more);
+MONGOC_EXPORT (const bson_t *)
+mongoc_cursor_current (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (void)
+mongoc_cursor_set_batch_size (mongoc_cursor_t *cursor, uint32_t batch_size);
+MONGOC_EXPORT (uint32_t)
+mongoc_cursor_get_batch_size (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (bool)
+mongoc_cursor_set_limit (mongoc_cursor_t *cursor, int64_t limit);
+MONGOC_EXPORT (int64_t)
+mongoc_cursor_get_limit (const mongoc_cursor_t *cursor);
+/* These names include the term "hint" for backward compatibility, should be
+ * mongoc_cursor_get_server_id, mongoc_cursor_set_server_id. */
+MONGOC_EXPORT (bool)
+mongoc_cursor_set_hint (mongoc_cursor_t *cursor, uint32_t server_id);
+MONGOC_EXPORT (uint32_t)
+mongoc_cursor_get_hint (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (int64_t)
+mongoc_cursor_get_id (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (void)
+mongoc_cursor_set_max_await_time_ms (mongoc_cursor_t *cursor,
+                                     uint32_t max_await_time_ms);
+MONGOC_EXPORT (uint32_t)
+mongoc_cursor_get_max_await_time_ms (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_cursor_new_from_command_reply (struct _mongoc_client_t *client,
+                                      bson_t *reply,
+                                      uint32_t server_id)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_cursor_new_from_command_reply_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_cursor_new_from_command_reply_with_opts (struct _mongoc_client_t *client,
+                                                bson_t *reply,
+                                                const bson_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CURSOR_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-database.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-database.h
new file mode 100644
index 0000000..e958cd3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-database.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_DATABASE_H
+#define MONGOC_DATABASE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-cursor.h"
+#include "mongoc-flags.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-write-concern.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_database_t mongoc_database_t;
+
+
+MONGOC_EXPORT (const char *)
+mongoc_database_get_name (mongoc_database_t *database);
+MONGOC_EXPORT (bool)
+mongoc_database_remove_user (mongoc_database_t *database,
+                             const char *username,
+                             bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_remove_all_users (mongoc_database_t *database,
+                                  bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_add_user (mongoc_database_t *database,
+                          const char *username,
+                          const char *password,
+                          const bson_t *roles,
+                          const bson_t *custom_data,
+                          bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_database_destroy (mongoc_database_t *database);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_aggregate (mongoc_database_t *db,
+                           const bson_t *pipeline,
+                           const bson_t *opts,
+                           const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_database_t *)
+mongoc_database_copy (mongoc_database_t *database) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_command (mongoc_database_t *database,
+                         mongoc_query_flags_t flags,
+                         uint32_t skip,
+                         uint32_t limit,
+                         uint32_t batch_size,
+                         const bson_t *command,
+                         const bson_t *fields,
+                         const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_database_read_command_with_opts (mongoc_database_t *database,
+                                        const bson_t *command,
+                                        const mongoc_read_prefs_t *read_prefs,
+                                        const bson_t *opts,
+                                        bson_t *reply,
+                                        bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_write_command_with_opts (mongoc_database_t *database,
+                                         const bson_t *command,
+                                         const bson_t *opts,
+                                         bson_t *reply,
+                                         bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_read_write_command_with_opts (
+   mongoc_database_t *database,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs /* IGNORED */,
+   const bson_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_command_with_opts (mongoc_database_t *database,
+                                   const bson_t *command,
+                                   const mongoc_read_prefs_t *read_prefs,
+                                   const bson_t *opts,
+                                   bson_t *reply,
+                                   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_command_simple (mongoc_database_t *database,
+                                const bson_t *command,
+                                const mongoc_read_prefs_t *read_prefs,
+                                bson_t *reply,
+                                bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_drop (mongoc_database_t *database, bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_drop_with_opts (mongoc_database_t *database,
+                                const bson_t *opts,
+                                bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_has_collection (mongoc_database_t *database,
+                                const char *name,
+                                bson_error_t *error);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_database_create_collection (mongoc_database_t *database,
+                                   const char *name,
+                                   const bson_t *options,
+                                   bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_database_get_read_prefs (const mongoc_database_t *database);
+MONGOC_EXPORT (void)
+mongoc_database_set_read_prefs (mongoc_database_t *database,
+                                const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_database_get_write_concern (const mongoc_database_t *database);
+MONGOC_EXPORT (void)
+mongoc_database_set_write_concern (mongoc_database_t *database,
+                                   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_database_get_read_concern (const mongoc_database_t *database);
+MONGOC_EXPORT (void)
+mongoc_database_set_read_concern (mongoc_database_t *database,
+                                  const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_find_collections (mongoc_database_t *database,
+                                  const bson_t *filter,
+                                  bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_database_find_collections_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_find_collections_with_opts (mongoc_database_t *database,
+                                            const bson_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (char **)
+mongoc_database_get_collection_names (mongoc_database_t *database,
+                                      bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_database_get_collection_names_with_opts);
+MONGOC_EXPORT (char **)
+mongoc_database_get_collection_names_with_opts (mongoc_database_t *database,
+                                                const bson_t *opts,
+                                                bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_database_get_collection (mongoc_database_t *database,
+                                const char *name) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_change_stream_t *)
+mongoc_database_watch (const mongoc_database_t *db,
+                       const bson_t *pipeline,
+                       const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_DATABASE_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-error.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-error.h
new file mode 100644
index 0000000..274411c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-error.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_ERRORS_H
+#define MONGOC_ERRORS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+#define MONGOC_ERROR_API_VERSION_LEGACY 1
+#define MONGOC_ERROR_API_VERSION_2 2
+
+BSON_BEGIN_DECLS
+
+
+typedef enum {
+   MONGOC_ERROR_CLIENT = 1,
+   MONGOC_ERROR_STREAM,
+   MONGOC_ERROR_PROTOCOL,
+   MONGOC_ERROR_CURSOR,
+   MONGOC_ERROR_QUERY,
+   MONGOC_ERROR_INSERT,
+   MONGOC_ERROR_SASL,
+   MONGOC_ERROR_BSON,
+   MONGOC_ERROR_MATCHER,
+   MONGOC_ERROR_NAMESPACE,
+   MONGOC_ERROR_COMMAND,
+   MONGOC_ERROR_COLLECTION,
+   MONGOC_ERROR_GRIDFS,
+   MONGOC_ERROR_SCRAM,
+   MONGOC_ERROR_SERVER_SELECTION,
+   MONGOC_ERROR_WRITE_CONCERN,
+   MONGOC_ERROR_SERVER, /* Error API Version 2 only */
+   MONGOC_ERROR_TRANSACTION,
+   MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION, /* An error coming from libmongocrypt */
+   MONGOC_ERROR_POOL
+} mongoc_error_domain_t;
+
+
+typedef enum {
+   MONGOC_ERROR_STREAM_INVALID_TYPE = 1,
+   MONGOC_ERROR_STREAM_INVALID_STATE,
+   MONGOC_ERROR_STREAM_NAME_RESOLUTION,
+   MONGOC_ERROR_STREAM_SOCKET,
+   MONGOC_ERROR_STREAM_CONNECT,
+   MONGOC_ERROR_STREAM_NOT_ESTABLISHED,
+
+   MONGOC_ERROR_CLIENT_NOT_READY,
+   MONGOC_ERROR_CLIENT_TOO_BIG,
+   MONGOC_ERROR_CLIENT_TOO_SMALL,
+   MONGOC_ERROR_CLIENT_GETNONCE,
+   MONGOC_ERROR_CLIENT_AUTHENTICATE,
+   MONGOC_ERROR_CLIENT_NO_ACCEPTABLE_PEER,
+   MONGOC_ERROR_CLIENT_IN_EXHAUST,
+
+   MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
+   MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,
+
+   MONGOC_ERROR_CURSOR_INVALID_CURSOR,
+
+   MONGOC_ERROR_QUERY_FAILURE,
+
+   MONGOC_ERROR_BSON_INVALID,
+
+   MONGOC_ERROR_MATCHER_INVALID,
+
+   MONGOC_ERROR_NAMESPACE_INVALID,
+   MONGOC_ERROR_NAMESPACE_INVALID_FILTER_TYPE,
+
+   MONGOC_ERROR_COMMAND_INVALID_ARG,
+
+   MONGOC_ERROR_COLLECTION_INSERT_FAILED,
+   MONGOC_ERROR_COLLECTION_UPDATE_FAILED,
+   MONGOC_ERROR_COLLECTION_DELETE_FAILED,
+   MONGOC_ERROR_COLLECTION_DOES_NOT_EXIST = 26,
+
+   MONGOC_ERROR_GRIDFS_INVALID_FILENAME,
+
+   MONGOC_ERROR_SCRAM_NOT_DONE,
+   MONGOC_ERROR_SCRAM_PROTOCOL_ERROR,
+
+   MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND = 59,
+   MONGOC_ERROR_QUERY_NOT_TAILABLE = 13051,
+
+   MONGOC_ERROR_SERVER_SELECTION_BAD_WIRE_VERSION,
+   MONGOC_ERROR_SERVER_SELECTION_FAILURE,
+   MONGOC_ERROR_SERVER_SELECTION_INVALID_ID,
+
+   MONGOC_ERROR_GRIDFS_CHUNK_MISSING,
+   MONGOC_ERROR_GRIDFS_PROTOCOL_ERROR,
+
+   /* Dup with query failure. */
+   MONGOC_ERROR_PROTOCOL_ERROR = 17,
+
+   MONGOC_ERROR_WRITE_CONCERN_ERROR = 64,
+
+   MONGOC_ERROR_DUPLICATE_KEY = 11000,
+
+   MONGOC_ERROR_MAX_TIME_MS_EXPIRED = 50,
+
+   MONGOC_ERROR_CHANGE_STREAM_NO_RESUME_TOKEN,
+   MONGOC_ERROR_CLIENT_SESSION_FAILURE,
+   MONGOC_ERROR_TRANSACTION_INVALID_STATE,
+   MONGOC_ERROR_GRIDFS_CORRUPT,
+   MONGOC_ERROR_GRIDFS_BUCKET_FILE_NOT_FOUND,
+   MONGOC_ERROR_GRIDFS_BUCKET_STREAM,
+
+   /* An error related to initializing client side encryption. */
+   MONGOC_ERROR_CLIENT_INVALID_ENCRYPTION_STATE,
+
+   MONGOC_ERROR_CLIENT_INVALID_ENCRYPTION_ARG,
+
+
+   /* An error related to server version api */
+   MONGOC_ERROR_CLIENT_API_ALREADY_SET,
+   MONGOC_ERROR_CLIENT_API_FROM_POOL,
+   MONGOC_ERROR_POOL_API_ALREADY_SET,
+   MONGOC_ERROR_POOL_API_TOO_LATE,
+
+   MONGOC_ERROR_CLIENT_INVALID_LOAD_BALANCER,
+} mongoc_error_code_t;
+
+MONGOC_EXPORT (bool)
+mongoc_error_has_label (const bson_t *reply, const char *label);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_ERRORS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-find-and-modify.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-find-and-modify.h
new file mode 100644
index 0000000..7dfedcc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-find-and-modify.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_FIND_AND_MODIFY_H
+#define MONGOC_FIND_AND_MODIFY_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef enum {
+   MONGOC_FIND_AND_MODIFY_NONE = 0,
+   MONGOC_FIND_AND_MODIFY_REMOVE = 1 << 0,
+   MONGOC_FIND_AND_MODIFY_UPSERT = 1 << 1,
+   MONGOC_FIND_AND_MODIFY_RETURN_NEW = 1 << 2,
+} mongoc_find_and_modify_flags_t;
+
+typedef struct _mongoc_find_and_modify_opts_t mongoc_find_and_modify_opts_t;
+
+MONGOC_EXPORT (mongoc_find_and_modify_opts_t *)
+mongoc_find_and_modify_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_sort (mongoc_find_and_modify_opts_t *opts,
+                                      const bson_t *sort);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_sort (const mongoc_find_and_modify_opts_t *opts,
+                                      bson_t *sort);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_update (mongoc_find_and_modify_opts_t *opts,
+                                        const bson_t *update);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_update (
+   const mongoc_find_and_modify_opts_t *opts, bson_t *update);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_fields (mongoc_find_and_modify_opts_t *opts,
+                                        const bson_t *fields);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_fields (
+   const mongoc_find_and_modify_opts_t *opts, bson_t *fields);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_flags (
+   mongoc_find_and_modify_opts_t *opts,
+   const mongoc_find_and_modify_flags_t flags);
+
+MONGOC_EXPORT (mongoc_find_and_modify_flags_t)
+mongoc_find_and_modify_opts_get_flags (
+   const mongoc_find_and_modify_opts_t *opts);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_bypass_document_validation (
+   mongoc_find_and_modify_opts_t *opts, bool bypass);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_get_bypass_document_validation (
+   const mongoc_find_and_modify_opts_t *opts);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_max_time_ms (
+   mongoc_find_and_modify_opts_t *opts, uint32_t max_time_ms);
+
+MONGOC_EXPORT (uint32_t)
+mongoc_find_and_modify_opts_get_max_time_ms (
+   const mongoc_find_and_modify_opts_t *opts);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_append (mongoc_find_and_modify_opts_t *opts,
+                                    const bson_t *extra);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_extra (
+   const mongoc_find_and_modify_opts_t *opts, bson_t *extra);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_destroy (mongoc_find_and_modify_opts_t *opts);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_FIND_AND_MODIFY_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-flags.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-flags.h
new file mode 100644
index 0000000..343c060
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-flags.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_FLAGS_H
+#define MONGOC_FLAGS_H
+
+#include <bson/bson.h>
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * mongoc_delete_flags_t:
+ * @MONGOC_DELETE_NONE: Specify no delete flags.
+ * @MONGOC_DELETE_SINGLE_REMOVE: Only remove the first document matching the
+ *    document selector.
+ *
+ * This type is only for use with deprecated functions and should not be
+ * used in new code. Use mongoc_remove_flags_t instead.
+ *
+ * #mongoc_delete_flags_t are used when performing a delete operation.
+ */
+typedef enum {
+   MONGOC_DELETE_NONE = 0,
+   MONGOC_DELETE_SINGLE_REMOVE = 1 << 0,
+} mongoc_delete_flags_t;
+
+
+/**
+ * mongoc_remove_flags_t:
+ * @MONGOC_REMOVE_NONE: Specify no delete flags.
+ * @MONGOC_REMOVE_SINGLE_REMOVE: Only remove the first document matching the
+ *    document selector.
+ *
+ * #mongoc_remove_flags_t are used when performing a remove operation.
+ */
+typedef enum {
+   MONGOC_REMOVE_NONE = 0,
+   MONGOC_REMOVE_SINGLE_REMOVE = 1 << 0,
+} mongoc_remove_flags_t;
+
+
+/**
+ * mongoc_insert_flags_t:
+ * @MONGOC_INSERT_NONE: Specify no insert flags.
+ * @MONGOC_INSERT_CONTINUE_ON_ERROR: Continue inserting documents from
+ *    the insertion set even if one fails.
+ *
+ * #mongoc_insert_flags_t are used when performing an insert operation.
+ */
+typedef enum {
+   MONGOC_INSERT_NONE = 0,
+   MONGOC_INSERT_CONTINUE_ON_ERROR = 1 << 0,
+} mongoc_insert_flags_t;
+
+
+#define MONGOC_INSERT_NO_VALIDATE (1U << 31)
+
+
+/**
+ * mongoc_query_flags_t:
+ * @MONGOC_QUERY_NONE: No query flags supplied.
+ * @MONGOC_QUERY_TAILABLE_CURSOR: Cursor will not be closed when the last
+ *    data is retrieved. You can resume this cursor later.
+ * @MONGOC_QUERY_SECONDARY_OK: Allow query of secondaries in a replica set.
+ * @MONGOC_QUERY_OPLOG_REPLAY: Used internally by Mongo.
+ * @MONGOC_QUERY_NO_CURSOR_TIMEOUT: The server normally times out idle
+ *    cursors after an inactivity period (10 minutes). This prevents that.
+ * @MONGOC_QUERY_AWAIT_DATA: Use with %MONGOC_QUERY_TAILABLE_CURSOR. Block
+ *    rather than returning no data. After a period, time out.
+ * @MONGOC_QUERY_EXHAUST: Stream the data down full blast in multiple
+ *    "more" packages. Faster when you are pulling a lot of data and
+ *    know you want to pull it all down.
+ * @MONGOC_QUERY_PARTIAL: Get partial results from mongos if some shards
+ *    are down (instead of throwing an error).
+ *
+ * #mongoc_query_flags_t is used for querying a Mongo instance.
+ */
+typedef enum {
+   MONGOC_QUERY_NONE = 0,
+   MONGOC_QUERY_TAILABLE_CURSOR = 1 << 1,
+   MONGOC_QUERY_SLAVE_OK = 1 << 2,
+   MONGOC_QUERY_SECONDARY_OK = 1 << 2,
+   MONGOC_QUERY_OPLOG_REPLAY = 1 << 3,
+   MONGOC_QUERY_NO_CURSOR_TIMEOUT = 1 << 4,
+   MONGOC_QUERY_AWAIT_DATA = 1 << 5,
+   MONGOC_QUERY_EXHAUST = 1 << 6,
+   MONGOC_QUERY_PARTIAL = 1 << 7,
+} mongoc_query_flags_t;
+
+
+/**
+ * mongoc_reply_flags_t:
+ * @MONGOC_REPLY_NONE: No flags set.
+ * @MONGOC_REPLY_CURSOR_NOT_FOUND: Cursor was not found.
+ * @MONGOC_REPLY_QUERY_FAILURE: Query failed, error document provided.
+ * @MONGOC_REPLY_SHARD_CONFIG_STALE: Shard configuration is stale.
+ * @MONGOC_REPLY_AWAIT_CAPABLE: Wait for data to be returned until timeout
+ *    has passed. Used with %MONGOC_QUERY_TAILABLE_CURSOR.
+ *
+ * #mongoc_reply_flags_t contains flags supplied by the Mongo server in reply
+ * to a request.
+ */
+typedef enum {
+   MONGOC_REPLY_NONE = 0,
+   MONGOC_REPLY_CURSOR_NOT_FOUND = 1 << 0,
+   MONGOC_REPLY_QUERY_FAILURE = 1 << 1,
+   MONGOC_REPLY_SHARD_CONFIG_STALE = 1 << 2,
+   MONGOC_REPLY_AWAIT_CAPABLE = 1 << 3,
+} mongoc_reply_flags_t;
+
+
+/**
+ * mongoc_update_flags_t:
+ * @MONGOC_UPDATE_NONE: No update flags specified.
+ * @MONGOC_UPDATE_UPSERT: Perform an upsert.
+ * @MONGOC_UPDATE_MULTI_UPDATE: Continue updating after first match.
+ *
+ * #mongoc_update_flags_t is used when updating documents found in Mongo.
+ */
+typedef enum {
+   MONGOC_UPDATE_NONE = 0,
+   MONGOC_UPDATE_UPSERT = 1 << 0,
+   MONGOC_UPDATE_MULTI_UPDATE = 1 << 1,
+} mongoc_update_flags_t;
+
+
+#define MONGOC_UPDATE_NO_VALIDATE (1U << 31)
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_FLAGS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-bucket.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-bucket.h
new file mode 100644
index 0000000..9bde457
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-bucket.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_BUCKET_H
+#define MONGOC_GRIDFS_BUCKET_H
+
+#include "bson/bson.h"
+#include "mongoc-collection.h"
+#include "mongoc-database.h"
+#include "mongoc-stream.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_gridfs_bucket_t mongoc_gridfs_bucket_t;
+
+MONGOC_EXPORT (mongoc_gridfs_bucket_t *)
+mongoc_gridfs_bucket_new (mongoc_database_t *db,
+                          const bson_t *opts,
+                          const mongoc_read_prefs_t *read_prefs,
+                          bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_gridfs_bucket_open_upload_stream (mongoc_gridfs_bucket_t *bucket,
+                                         const char *filename,
+                                         const bson_t *opts,
+                                         bson_value_t *file_id,
+                                         bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_gridfs_bucket_open_upload_stream_with_id (mongoc_gridfs_bucket_t *bucket,
+                                                 const bson_value_t *file_id,
+                                                 const char *filename,
+                                                 const bson_t *opts,
+                                                 bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_upload_from_stream (mongoc_gridfs_bucket_t *bucket,
+                                         const char *filename,
+                                         mongoc_stream_t *source,
+                                         const bson_t *opts,
+                                         bson_value_t *file_id,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_upload_from_stream_with_id (mongoc_gridfs_bucket_t *bucket,
+                                                 const bson_value_t *file_id,
+                                                 const char *filename,
+                                                 mongoc_stream_t *source,
+                                                 const bson_t *opts,
+                                                 bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_gridfs_bucket_open_download_stream (mongoc_gridfs_bucket_t *bucket,
+                                           const bson_value_t *file_id,
+                                           bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_download_to_stream (mongoc_gridfs_bucket_t *bucket,
+                                         const bson_value_t *file_id,
+                                         mongoc_stream_t *destination,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_delete_by_id (mongoc_gridfs_bucket_t *bucket,
+                                   const bson_value_t *file_id,
+                                   bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_gridfs_bucket_find (mongoc_gridfs_bucket_t *bucket,
+                           const bson_t *filter,
+                           const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_stream_error (mongoc_stream_t *stream,
+                                   bson_error_t *error);
+
+MONGOC_EXPORT (void)
+mongoc_gridfs_bucket_destroy (mongoc_gridfs_bucket_t *bucket);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_abort_upload (mongoc_stream_t *stream);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_GRIDFS_BUCKET_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-list.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-list.h
new file mode 100644
index 0000000..284204a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-list.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_FILE_LIST_H
+#define MONGOC_GRIDFS_FILE_LIST_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-gridfs-file.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_gridfs_file_list_t mongoc_gridfs_file_list_t;
+
+
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_file_list_next (mongoc_gridfs_file_list_t *list)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_gridfs_file_list_destroy (mongoc_gridfs_file_list_t *list);
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_list_error (mongoc_gridfs_file_list_t *list,
+                               bson_error_t *error);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_GRIDFS_FILE_LIST_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-page.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-page.h
new file mode 100644
index 0000000..7ca03d1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-page.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_FILE_PAGE_H
+#define MONGOC_GRIDFS_FILE_PAGE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-stream.h"
+#include "mongoc-gridfs-file.h"
+#include "mongoc-gridfs-file-list.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_gridfs_file_page_t mongoc_gridfs_file_page_t;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_GRIDFS_FILE_PAGE_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file.h
new file mode 100644
index 0000000..2af8f79
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs-file.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_FILE_H
+#define MONGOC_GRIDFS_FILE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-socket.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_GRIDFS_FILE_STR_HEADER(name)                    \
+   MONGOC_EXPORT (const char *)                                \
+   mongoc_gridfs_file_get_##name (mongoc_gridfs_file_t *file); \
+   MONGOC_EXPORT (void)                                        \
+   mongoc_gridfs_file_set_##name (mongoc_gridfs_file_t *file, const char *str);
+
+
+#define MONGOC_GRIDFS_FILE_BSON_HEADER(name)                   \
+   MONGOC_EXPORT (const bson_t *)                              \
+   mongoc_gridfs_file_get_##name (mongoc_gridfs_file_t *file); \
+   MONGOC_EXPORT (void)                                        \
+   mongoc_gridfs_file_set_##name (mongoc_gridfs_file_t *file,  \
+                                  const bson_t *bson);
+
+
+typedef struct _mongoc_gridfs_file_t mongoc_gridfs_file_t;
+typedef struct _mongoc_gridfs_file_opt_t mongoc_gridfs_file_opt_t;
+
+
+struct _mongoc_gridfs_file_opt_t {
+   const char *md5;
+   const char *filename;
+   const char *content_type;
+   const bson_t *aliases;
+   const bson_t *metadata;
+   uint32_t chunk_size;
+};
+
+
+MONGOC_GRIDFS_FILE_STR_HEADER (md5)
+MONGOC_GRIDFS_FILE_STR_HEADER (filename)
+MONGOC_GRIDFS_FILE_STR_HEADER (content_type)
+MONGOC_GRIDFS_FILE_BSON_HEADER (aliases)
+MONGOC_GRIDFS_FILE_BSON_HEADER (metadata)
+
+
+MONGOC_EXPORT (const bson_value_t *)
+mongoc_gridfs_file_get_id (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (int64_t)
+mongoc_gridfs_file_get_length (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (int32_t)
+mongoc_gridfs_file_get_chunk_size (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (int64_t)
+mongoc_gridfs_file_get_upload_date (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (ssize_t)
+mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,
+                           const mongoc_iovec_t *iov,
+                           size_t iovcnt,
+                           uint32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_gridfs_file_readv (mongoc_gridfs_file_t *file,
+                          mongoc_iovec_t *iov,
+                          size_t iovcnt,
+                          size_t min_bytes,
+                          uint32_t timeout_msec);
+MONGOC_EXPORT (int)
+mongoc_gridfs_file_seek (mongoc_gridfs_file_t *file, int64_t delta, int whence);
+
+MONGOC_EXPORT (uint64_t)
+mongoc_gridfs_file_tell (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_set_id (mongoc_gridfs_file_t *file,
+                           const bson_value_t *id,
+                           bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_save (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (void)
+mongoc_gridfs_file_destroy (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_error (mongoc_gridfs_file_t *file, bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_remove (mongoc_gridfs_file_t *file, bson_error_t *error);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_GRIDFS_FILE_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs.h
new file mode 100644
index 0000000..e75ba39
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-gridfs.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_H
+#define MONGOC_GRIDFS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-stream.h"
+#include "mongoc-gridfs-file.h"
+#include "mongoc-collection.h"
+#include "mongoc-gridfs-file-list.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_gridfs_t mongoc_gridfs_t;
+
+
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_create_file_from_stream (mongoc_gridfs_t *gridfs,
+                                       mongoc_stream_t *stream,
+                                       mongoc_gridfs_file_opt_t *opt)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_create_file (mongoc_gridfs_t *gridfs,
+                           mongoc_gridfs_file_opt_t *opt)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_list_t *)
+mongoc_gridfs_find (mongoc_gridfs_t *gridfs,
+                    const bson_t *query) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_gridfs_find_with_opts);
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_find_one (mongoc_gridfs_t *gridfs,
+                        const bson_t *query,
+                        bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_gridfs_find_one_with_opts);
+MONGOC_EXPORT (mongoc_gridfs_file_list_t *)
+mongoc_gridfs_find_with_opts (mongoc_gridfs_t *gridfs,
+                              const bson_t *filter,
+                              const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_find_one_with_opts (mongoc_gridfs_t *gridfs,
+                                  const bson_t *filter,
+                                  const bson_t *opts,
+                                  bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_find_one_by_filename (mongoc_gridfs_t *gridfs,
+                                    const char *filename,
+                                    bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_gridfs_drop (mongoc_gridfs_t *gridfs, bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_gridfs_destroy (mongoc_gridfs_t *gridfs);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_gridfs_get_files (mongoc_gridfs_t *gridfs);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_gridfs_get_chunks (mongoc_gridfs_t *gridfs);
+MONGOC_EXPORT (bool)
+mongoc_gridfs_remove_by_filename (mongoc_gridfs_t *gridfs,
+                                  const char *filename,
+                                  bson_error_t *error);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_GRIDFS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-handshake.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-handshake.h
new file mode 100644
index 0000000..a1ff2f8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-handshake.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_HANDSHAKE_H
+#define MONGOC_HANDSHAKE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+#define MONGOC_HANDSHAKE_APPNAME_MAX 128
+
+MONGOC_EXPORT (bool) 
+mongoc_handshake_data_append (const char *driver_name,
+                              const char *driver_version,
+                              const char *platform);
+
+BSON_END_DECLS
+
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-host-list.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-host-list.h
new file mode 100644
index 0000000..bb8dbd9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-host-list.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_HOST_LIST_H
+#define MONGOC_HOST_LIST_H
+
+#include <bson/bson.h>
+
+
+BSON_BEGIN_DECLS
+
+
+#ifdef _POSIX_HOST_NAME_MAX
+#define BSON_HOST_NAME_MAX _POSIX_HOST_NAME_MAX
+#else
+#define BSON_HOST_NAME_MAX 255
+#endif
+
+
+typedef struct _mongoc_host_list_t mongoc_host_list_t;
+
+
+struct _mongoc_host_list_t {
+   mongoc_host_list_t *next;
+   char host[BSON_HOST_NAME_MAX + 1];
+   char host_and_port[BSON_HOST_NAME_MAX + 7];
+   uint16_t port;
+   int family;
+   void *padding[4];
+};
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_HOST_LIST_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-index.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-index.h
new file mode 100644
index 0000000..a8a49c9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-index.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_INDEX_H
+#define MONGOC_INDEX_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct {
+   uint8_t twod_sphere_version;
+   uint8_t twod_bits_precision;
+   double twod_location_min;
+   double twod_location_max;
+   double haystack_bucket_size;
+   uint8_t *padding[32];
+} mongoc_index_opt_geo_t;
+
+typedef struct {
+   int type;
+} mongoc_index_opt_storage_t;
+
+typedef enum {
+   MONGOC_INDEX_STORAGE_OPT_MMAPV1,
+   MONGOC_INDEX_STORAGE_OPT_WIREDTIGER,
+} mongoc_index_storage_opt_type_t;
+
+typedef struct {
+   mongoc_index_opt_storage_t base;
+   const char *config_str;
+   void *padding[8];
+} mongoc_index_opt_wt_t;
+
+typedef struct {
+   bool is_initialized;
+   bool background;
+   bool unique;
+   const char *name;
+   bool drop_dups;
+   bool sparse;
+   int32_t expire_after_seconds;
+   int32_t v;
+   const bson_t *weights;
+   const char *default_language;
+   const char *language_override;
+   mongoc_index_opt_geo_t *geo_options;
+   mongoc_index_opt_storage_t *storage_options;
+   const bson_t *partial_filter_expression;
+   const bson_t *collation;
+   void *padding[4];
+} mongoc_index_opt_t;
+
+
+MONGOC_EXPORT (const mongoc_index_opt_t *)
+mongoc_index_opt_get_default (void) BSON_GNUC_PURE;
+MONGOC_EXPORT (const mongoc_index_opt_geo_t *)
+mongoc_index_opt_geo_get_default (void) BSON_GNUC_PURE;
+MONGOC_EXPORT (const mongoc_index_opt_wt_t *)
+mongoc_index_opt_wt_get_default (void) BSON_GNUC_PURE;
+MONGOC_EXPORT (void)
+mongoc_index_opt_init (mongoc_index_opt_t *opt);
+MONGOC_EXPORT (void)
+mongoc_index_opt_geo_init (mongoc_index_opt_geo_t *opt);
+MONGOC_EXPORT (void)
+mongoc_index_opt_wt_init (mongoc_index_opt_wt_t *opt);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_INDEX_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-init.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-init.h
new file mode 100644
index 0000000..f1d8d7e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-init.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_INIT_H
+#define MONGOC_INIT_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+MONGOC_EXPORT (void)
+mongoc_init (void);
+MONGOC_EXPORT (void)
+mongoc_cleanup (void);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_INIT_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-iovec.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-iovec.h
new file mode 100644
index 0000000..f18f411
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-iovec.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_IOVEC_H
+#define MONGOC_IOVEC_H
+
+
+#include <bson/bson.h>
+
+#ifdef _WIN32
+#include <stddef.h>
+#else
+#include <sys/uio.h>
+#endif
+
+BSON_BEGIN_DECLS
+
+
+#ifdef _WIN32
+typedef struct {
+   size_t iov_len;
+   char *iov_base;
+} mongoc_iovec_t;
+
+BSON_STATIC_ASSERT2 (sizeof_iovect_t,
+                     sizeof (mongoc_iovec_t) == sizeof (WSABUF));
+BSON_STATIC_ASSERT2 (offsetof_iovec_base,
+                     offsetof (mongoc_iovec_t, iov_base) ==
+                        offsetof (WSABUF, buf));
+BSON_STATIC_ASSERT2 (offsetof_iovec_len,
+                     offsetof (mongoc_iovec_t, iov_len) ==
+                        offsetof (WSABUF, len));
+
+#else
+typedef struct iovec mongoc_iovec_t;
+#endif
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_IOVEC_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-log.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-log.h
new file mode 100644
index 0000000..8f52364
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-log.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_LOG_H
+#define MONGOC_LOG_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+#ifndef MONGOC_LOG_DOMAIN
+#define MONGOC_LOG_DOMAIN "mongoc"
+#endif
+
+
+#define MONGOC_ERROR(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_ERROR, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_CRITICAL(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_CRITICAL, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_WARNING(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_MESSAGE(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_MESSAGE, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_INFO(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_INFO, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_DEBUG(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_DEBUG, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+
+
+typedef enum {
+   MONGOC_LOG_LEVEL_ERROR,
+   MONGOC_LOG_LEVEL_CRITICAL,
+   MONGOC_LOG_LEVEL_WARNING,
+   MONGOC_LOG_LEVEL_MESSAGE,
+   MONGOC_LOG_LEVEL_INFO,
+   MONGOC_LOG_LEVEL_DEBUG,
+   MONGOC_LOG_LEVEL_TRACE,
+} mongoc_log_level_t;
+
+
+/**
+ * mongoc_log_func_t:
+ * @log_level: The level of the log message.
+ * @log_domain: The domain of the log message, such as "client".
+ * @message: The message generated.
+ * @user_data: User data provided to mongoc_log_set_handler().
+ *
+ * This function prototype can be used to set a custom log handler for the
+ * libmongoc library. This is useful if you would like to show them in a
+ * user interface or alternate storage.
+ */
+typedef void (*mongoc_log_func_t) (mongoc_log_level_t log_level,
+                                   const char *log_domain,
+                                   const char *message,
+                                   void *user_data);
+
+
+/**
+ * mongoc_log_set_handler:
+ * @log_func: A function to handle log messages.
+ * @user_data: User data for @log_func.
+ *
+ * Sets the function to be called to handle logging.
+ */
+MONGOC_EXPORT (void)
+mongoc_log_set_handler (mongoc_log_func_t log_func, void *user_data);
+
+
+/**
+ * mongoc_log:
+ * @log_level: The log level.
+ * @log_domain: The log domain (such as "client").
+ * @format: The format string for the log message.
+ *
+ * Logs a message using the currently configured logger.
+ *
+ * This method will hold a logging lock to prevent concurrent calls to the
+ * logging infrastructure. It is important that your configured log function
+ * does not re-enter the logging system or deadlock will occur.
+ *
+ */
+MONGOC_EXPORT (void)
+mongoc_log (mongoc_log_level_t log_level,
+            const char *log_domain,
+            const char *format,
+            ...) BSON_GNUC_PRINTF (3, 4);
+
+
+MONGOC_EXPORT (void)
+mongoc_log_default_handler (mongoc_log_level_t log_level,
+                            const char *log_domain,
+                            const char *message,
+                            void *user_data);
+
+
+/**
+ * mongoc_log_level_str:
+ * @log_level: The log level.
+ *
+ * Returns: The string representation of log_level
+ */
+MONGOC_EXPORT (const char *)
+mongoc_log_level_str (mongoc_log_level_t log_level);
+
+
+/**
+ * mongoc_log_trace_enable:
+ *
+ * Enables tracing at runtime (if it has been enabled at compile time).
+ */
+MONGOC_EXPORT (void)
+mongoc_log_trace_enable (void);
+
+
+/**
+ * mongoc_log_trace_disable:
+ *
+ * Disables tracing at runtime (if it has been enabled at compile time).
+ */
+MONGOC_EXPORT (void)
+mongoc_log_trace_disable (void);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_LOG_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-macros.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-macros.h
new file mode 100644
index 0000000..d960c05
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-macros.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2017 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_MACROS_H
+#define MONGOC_MACROS_H
+
+/* Decorate public functions:
+ * - if MONGOC_STATIC, we're compiling a program that uses libmongoc as
+ *   a static library, don't decorate functions
+ * - else if MONGOC_COMPILATION, we're compiling a static or shared libmongoc,
+ *   mark public functions for export from the shared lib (which has no effect
+ *   on the static lib)
+ * - else, we're compiling a program that uses libmongoc as a shared library,
+ *   mark public functions as DLL imports for Microsoft Visual C.
+ */
+
+#ifdef _MSC_VER
+/*
+ * Microsoft Visual C
+ */
+#ifdef MONGOC_STATIC
+#define MONGOC_API
+#elif defined(MONGOC_COMPILATION)
+#define MONGOC_API __declspec(dllexport)
+#else
+#define MONGOC_API __declspec(dllimport)
+#endif
+#define MONGOC_CALL __cdecl
+
+#elif defined(__GNUC__)
+/*
+ * GCC
+ */
+#ifdef MONGOC_STATIC
+#define MONGOC_API
+#elif defined(MONGOC_COMPILATION)
+#define MONGOC_API __attribute__ ((visibility ("default")))
+#else
+#define MONGOC_API
+#endif
+#define MONGOC_CALL
+
+#else
+/*
+ * Other compilers
+ */
+#define MONGOC_API
+#define MONGOC_CALL
+
+#endif
+
+#define MONGOC_EXPORT(type) MONGOC_API type MONGOC_CALL
+
+#endif /* MONGOC_MACROS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-matcher.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-matcher.h
new file mode 100644
index 0000000..2534290
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-matcher.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_MATCHER_H
+#define MONGOC_MATCHER_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_matcher_t mongoc_matcher_t;
+
+
+MONGOC_EXPORT (mongoc_matcher_t *)
+mongoc_matcher_new (const bson_t *query, bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_matcher_match (const mongoc_matcher_t *matcher,
+                      const bson_t *document) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (void)
+mongoc_matcher_destroy (mongoc_matcher_t *matcher) BSON_GNUC_DEPRECATED;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_MATCHER_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-opcode.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-opcode.h
new file mode 100644
index 0000000..3616a74
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-opcode.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_OPCODE_H
+#define MONGOC_OPCODE_H
+
+#include <bson/bson.h>
+
+
+BSON_BEGIN_DECLS
+
+
+typedef enum {
+   MONGOC_OPCODE_REPLY = 1,
+   MONGOC_OPCODE_UPDATE = 2001,
+   MONGOC_OPCODE_INSERT = 2002,
+   MONGOC_OPCODE_QUERY = 2004,
+   MONGOC_OPCODE_GET_MORE = 2005,
+   MONGOC_OPCODE_DELETE = 2006,
+   MONGOC_OPCODE_KILL_CURSORS = 2007,
+   MONGOC_OPCODE_COMPRESSED = 2012,
+   MONGOC_OPCODE_MSG = 2013,
+} mongoc_opcode_t;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_OPCODE_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-optional.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-optional.h
new file mode 100644
index 0000000..438e143
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-optional.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_OPTIONAL_H
+#define MONGOC_OPTIONAL_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct {
+   bool value;
+   bool is_set;
+} mongoc_optional_t;
+
+MONGOC_EXPORT (void)
+mongoc_optional_init (mongoc_optional_t *opt);
+
+MONGOC_EXPORT (bool)
+mongoc_optional_is_set (const mongoc_optional_t *opt);
+
+MONGOC_EXPORT (bool)
+mongoc_optional_value (const mongoc_optional_t *opt);
+
+MONGOC_EXPORT (void)
+mongoc_optional_set_value (mongoc_optional_t *opt, bool val);
+
+MONGOC_EXPORT (void)
+mongoc_optional_copy (const mongoc_optional_t *source, mongoc_optional_t *copy);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_OPTIONAL_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-prelude.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-prelude.h
new file mode 100644
index 0000000..8ae2eeb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-prelude.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(MONGOC_INSIDE) && !defined(MONGOC_COMPILATION)
+#error "Only <mongoc/mongoc.h> can be included directly."
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-rand.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-rand.h
new file mode 100644
index 0000000..c64d34a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-rand.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_RAND_H
+#define MONGOC_RAND_H
+
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (void)
+mongoc_rand_seed (const void *buf, int num);
+MONGOC_EXPORT (void)
+mongoc_rand_add (const void *buf, int num, double entropy);
+MONGOC_EXPORT (int)
+mongoc_rand_status (void);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_RAND_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-read-concern.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-read-concern.h
new file mode 100644
index 0000000..ab4cb0a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-read-concern.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_READ_CONCERN_H
+#define MONGOC_READ_CONCERN_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_READ_CONCERN_LEVEL_AVAILABLE "available"
+#define MONGOC_READ_CONCERN_LEVEL_LOCAL "local"
+#define MONGOC_READ_CONCERN_LEVEL_MAJORITY "majority"
+#define MONGOC_READ_CONCERN_LEVEL_LINEARIZABLE "linearizable"
+#define MONGOC_READ_CONCERN_LEVEL_SNAPSHOT "snapshot"
+
+typedef struct _mongoc_read_concern_t mongoc_read_concern_t;
+
+
+MONGOC_EXPORT (mongoc_read_concern_t *)
+mongoc_read_concern_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_read_concern_t *)
+mongoc_read_concern_copy (const mongoc_read_concern_t *read_concern)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_read_concern_destroy (mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (const char *)
+mongoc_read_concern_get_level (const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (bool)
+mongoc_read_concern_set_level (mongoc_read_concern_t *read_concern,
+                               const char *level);
+MONGOC_EXPORT (bool)
+mongoc_read_concern_append (mongoc_read_concern_t *read_concern, bson_t *doc);
+MONGOC_EXPORT (bool)
+mongoc_read_concern_is_default (const mongoc_read_concern_t *read_concern);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_READ_CONCERN_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-read-prefs.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-read-prefs.h
new file mode 100644
index 0000000..c378adb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-read-prefs.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_READ_PREFS_H
+#define MONGOC_READ_PREFS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-config.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_NO_MAX_STALENESS -1
+#define MONGOC_SMALLEST_MAX_STALENESS_SECONDS 90
+
+typedef struct _mongoc_read_prefs_t mongoc_read_prefs_t;
+
+
+typedef enum {
+   /** Represents $readPreference.mode of 'primary' */
+   MONGOC_READ_PRIMARY = (1 << 0),
+   /** Represents $readPreference.mode of 'secondary' */
+   MONGOC_READ_SECONDARY = (1 << 1),
+   /** Represents $readPreference.mode of 'primaryPreferred' */
+   MONGOC_READ_PRIMARY_PREFERRED = (1 << 2) | MONGOC_READ_PRIMARY,
+   /** Represents $readPreference.mode of 'secondaryPreferred' */
+   MONGOC_READ_SECONDARY_PREFERRED = (1 << 2) | MONGOC_READ_SECONDARY,
+   /** Represents $readPreference.mode of 'nearest' */
+   MONGOC_READ_NEAREST = (1 << 3) | MONGOC_READ_SECONDARY,
+} mongoc_read_mode_t;
+
+
+MONGOC_EXPORT (mongoc_read_prefs_t *)
+mongoc_read_prefs_new (mongoc_read_mode_t read_mode)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_read_prefs_t *)
+mongoc_read_prefs_copy (const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_read_prefs_destroy (mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (mongoc_read_mode_t)
+mongoc_read_prefs_get_mode (const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_mode (mongoc_read_prefs_t *read_prefs,
+                            mongoc_read_mode_t mode);
+MONGOC_EXPORT (const bson_t *)
+mongoc_read_prefs_get_tags (const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_tags (mongoc_read_prefs_t *read_prefs,
+                            const bson_t *tags);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_add_tag (mongoc_read_prefs_t *read_prefs, const bson_t *tag);
+MONGOC_EXPORT (int64_t)
+mongoc_read_prefs_get_max_staleness_seconds (
+   const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_max_staleness_seconds (mongoc_read_prefs_t *read_prefs,
+                                             int64_t max_staleness_seconds);
+MONGOC_EXPORT (const bson_t *)
+mongoc_read_prefs_get_hedge (const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_hedge (mongoc_read_prefs_t *read_prefs,
+                             const bson_t *hedge);
+MONGOC_EXPORT (bool)
+mongoc_read_prefs_is_valid (const mongoc_read_prefs_t *read_prefs);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_READ_PREFS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-server-api.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-server-api.h
new file mode 100644
index 0000000..a0e3f37
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-server-api.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SERVER_API_H
+#define MONGOC_SERVER_API_H
+
+#include <bson/bson.h>
+
+#include "mongoc-optional.h"
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef enum { MONGOC_SERVER_API_V1 } mongoc_server_api_version_t;
+
+typedef struct _mongoc_server_api_t mongoc_server_api_t;
+
+MONGOC_EXPORT (const char *)
+mongoc_server_api_version_to_string (mongoc_server_api_version_t version);
+
+MONGOC_EXPORT (bool)
+mongoc_server_api_version_from_string (const char *version,
+                                       mongoc_server_api_version_t *out);
+
+MONGOC_EXPORT (mongoc_server_api_t *)
+mongoc_server_api_new (mongoc_server_api_version_t version)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_server_api_t *)
+mongoc_server_api_copy (const mongoc_server_api_t *api)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_server_api_destroy (mongoc_server_api_t *api);
+
+MONGOC_EXPORT (void)
+mongoc_server_api_strict (mongoc_server_api_t *api, bool strict);
+
+MONGOC_EXPORT (void)
+mongoc_server_api_deprecation_errors (mongoc_server_api_t *api,
+                                      bool deprecation_errors);
+
+MONGOC_EXPORT (const mongoc_optional_t *)
+mongoc_server_api_get_deprecation_errors (const mongoc_server_api_t *api);
+
+MONGOC_EXPORT (const mongoc_optional_t *)
+mongoc_server_api_get_strict (const mongoc_server_api_t *api);
+
+MONGOC_EXPORT (mongoc_server_api_version_t)
+mongoc_server_api_get_version (const mongoc_server_api_t *api);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_SERVER_API_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-server-description.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-server-description.h
new file mode 100644
index 0000000..79ab4af
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-server-description.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SERVER_DESCRIPTION_H
+#define MONGOC_SERVER_DESCRIPTION_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-host-list.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_server_description_t mongoc_server_description_t;
+
+MONGOC_EXPORT (void)
+mongoc_server_description_destroy (mongoc_server_description_t *description);
+
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_server_description_new_copy (
+   const mongoc_server_description_t *description) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (uint32_t)
+mongoc_server_description_id (const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (mongoc_host_list_t *)
+mongoc_server_description_host (const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (int64_t)
+mongoc_server_description_last_update_time (
+   const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (int64_t)
+mongoc_server_description_round_trip_time (
+   const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (const char *)
+mongoc_server_description_type (const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_server_description_hello_response (
+   const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_server_description_ismaster (
+   const mongoc_server_description_t *description)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_server_description_hello_response);
+
+MONGOC_EXPORT (int32_t)
+mongoc_server_description_compressor_id (
+   const mongoc_server_description_t *description);
+
+BSON_END_DECLS
+
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-socket.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-socket.h
new file mode 100644
index 0000000..44be989
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-socket.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SOCKET_H
+#define MONGOC_SOCKET_H
+
+#include <bson/bson.h>
+#include "mongoc-macros.h"
+#include "mongoc-config.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <arpa/inet.h>
+#include <poll.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#endif
+
+#if defined(_AIX) && !defined(MONGOC_HAVE_SS_FAMILY)
+#define ss_family __ss_family
+#endif
+
+#include "mongoc-iovec.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef MONGOC_SOCKET_ARG3 mongoc_socklen_t;
+
+typedef struct _mongoc_socket_t mongoc_socket_t;
+
+typedef struct {
+   mongoc_socket_t *socket;
+   int events;
+   int revents;
+} mongoc_socket_poll_t;
+
+MONGOC_EXPORT (mongoc_socket_t *)
+mongoc_socket_accept (mongoc_socket_t *sock,
+                      int64_t expire_at) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (int)
+mongoc_socket_bind (mongoc_socket_t *sock,
+                    const struct sockaddr *addr,
+                    mongoc_socklen_t addrlen);
+MONGOC_EXPORT (int)
+mongoc_socket_close (mongoc_socket_t *socket);
+MONGOC_EXPORT (int)
+mongoc_socket_connect (mongoc_socket_t *sock,
+                       const struct sockaddr *addr,
+                       mongoc_socklen_t addrlen,
+                       int64_t expire_at);
+MONGOC_EXPORT (char *)
+mongoc_socket_getnameinfo (mongoc_socket_t *sock) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_socket_destroy (mongoc_socket_t *sock);
+MONGOC_EXPORT (int)
+mongoc_socket_errno (mongoc_socket_t *sock);
+MONGOC_EXPORT (int)
+mongoc_socket_getsockname (mongoc_socket_t *sock,
+                           struct sockaddr *addr,
+                           mongoc_socklen_t *addrlen);
+MONGOC_EXPORT (int)
+mongoc_socket_listen (mongoc_socket_t *sock, unsigned int backlog);
+MONGOC_EXPORT (mongoc_socket_t *)
+mongoc_socket_new (int domain,
+                   int type,
+                   int protocol) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_recv (mongoc_socket_t *sock,
+                    void *buf,
+                    size_t buflen,
+                    int flags,
+                    int64_t expire_at);
+MONGOC_EXPORT (int)
+mongoc_socket_setsockopt (mongoc_socket_t *sock,
+                          int level,
+                          int optname,
+                          const void *optval,
+                          mongoc_socklen_t optlen);
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_send (mongoc_socket_t *sock,
+                    const void *buf,
+                    size_t buflen,
+                    int64_t expire_at);
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_sendv (mongoc_socket_t *sock,
+                     mongoc_iovec_t *iov,
+                     size_t iovcnt,
+                     int64_t expire_at);
+MONGOC_EXPORT (bool)
+mongoc_socket_check_closed (mongoc_socket_t *sock);
+MONGOC_EXPORT (void)
+mongoc_socket_inet_ntop (struct addrinfo *rp, char *buf, size_t buflen);
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_poll (mongoc_socket_poll_t *sds, size_t nsds, int32_t timeout);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_SOCKET_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-ssl.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-ssl.h
new file mode 100644
index 0000000..26347ef
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-ssl.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SSL_H
+#define MONGOC_SSL_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_ssl_opt_t mongoc_ssl_opt_t;
+
+
+struct _mongoc_ssl_opt_t {
+   const char *pem_file;
+   const char *pem_pwd;
+   const char *ca_file;
+   const char *ca_dir;
+   const char *crl_file;
+   bool weak_cert_validation;
+   bool allow_invalid_hostname;
+   void *internal;
+   void *padding[6];
+};
+
+
+MONGOC_EXPORT (const mongoc_ssl_opt_t *)
+mongoc_ssl_opt_get_default (void) BSON_GNUC_PURE;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_SSL_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-buffered.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-buffered.h
new file mode 100644
index 0000000..8fc82a2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-buffered.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_BUFFERED_H
+#define MONGOC_STREAM_BUFFERED_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_buffered_new (mongoc_stream_t *base_stream,
+                        size_t buffer_size) BSON_GNUC_WARN_UNUSED_RESULT;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_BUFFERED_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-file.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-file.h
new file mode 100644
index 0000000..8887e11
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-file.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_FILE_H
+#define MONGOC_STREAM_FILE_H
+
+#include "mongoc-macros.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_stream_file_t mongoc_stream_file_t;
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_file_new (int fd) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_file_new_for_path (const char *path,
+                                 int flags,
+                                 int mode) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (int)
+mongoc_stream_file_get_fd (mongoc_stream_file_t *stream);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_FILE_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-gridfs.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-gridfs.h
new file mode 100644
index 0000000..9513f93
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-gridfs.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_GRIDFS_H
+#define MONGOC_STREAM_GRIDFS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-gridfs.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_gridfs_new (mongoc_gridfs_file_t *file)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_GRIDFS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-socket.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-socket.h
new file mode 100644
index 0000000..8f1671f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-socket.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_SOCKET_H
+#define MONGOC_STREAM_SOCKET_H
+
+#include "mongoc-macros.h"
+#include "mongoc-socket.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_stream_socket_t mongoc_stream_socket_t;
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_socket_new (mongoc_socket_t *socket) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_socket_t *)
+mongoc_stream_socket_get_socket (mongoc_stream_socket_t *stream);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_SOCKET_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls-libressl.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls-libressl.h
new file mode 100644
index 0000000..ca70a95
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls-libressl.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_TLS_LIBRESSL_H
+#define MONGOC_STREAM_TLS_LIBRESSL_H
+
+#ifdef MONGOC_ENABLE_SSL_LIBRESSL
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_libressl_new (mongoc_stream_t *base_stream,
+                                const char *host,
+                                mongoc_ssl_opt_t *opt,
+                                int client) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_ENABLE_SSL_LIBRESSL */
+#endif /* MONGOC_STREAM_TLS_LIBRESSL_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls-openssl.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls-openssl.h
new file mode 100644
index 0000000..2ddf8a6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls-openssl.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_TLS_OPENSSL_H
+#define MONGOC_STREAM_TLS_OPENSSL_H
+
+#ifdef MONGOC_ENABLE_SSL_OPENSSL
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_openssl_new (mongoc_stream_t *base_stream,
+                               const char *host,
+                               mongoc_ssl_opt_t *opt,
+                               int client) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_ENABLE_SSL_OPENSSL */
+#endif /* MONGOC_STREAM_TLS_OPENSSL_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls.h
new file mode 100644
index 0000000..3d41f3e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream-tls.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_TLS_H
+#define MONGOC_STREAM_TLS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-ssl.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_stream_tls_t mongoc_stream_tls_t;
+
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_handshake (mongoc_stream_t *stream,
+                             const char *host,
+                             int32_t timeout_msec,
+                             int *events,
+                             bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_handshake_block (mongoc_stream_t *stream,
+                                   const char *host,
+                                   int32_t timeout_msec,
+                                   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_do_handshake (mongoc_stream_t *stream, int32_t timeout_msec)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_stream_tls_handshake);
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_check_cert (mongoc_stream_t *stream, const char *host)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_stream_tls_handshake);
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_new_with_hostname (mongoc_stream_t *base_stream,
+                                     const char *host,
+                                     mongoc_ssl_opt_t *opt,
+                                     int client) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_new (mongoc_stream_t *base_stream,
+                       mongoc_ssl_opt_t *opt,
+                       int client) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_stream_tls_new_with_hostname);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_TLS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream.h
new file mode 100644
index 0000000..402fc50
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-stream.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2013-2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_H
+#define MONGOC_STREAM_H
+
+#include "mongoc-macros.h"
+#include "mongoc-iovec.h"
+#include "mongoc-socket.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_stream_t mongoc_stream_t;
+
+typedef struct _mongoc_stream_poll_t {
+   mongoc_stream_t *stream;
+   int events;
+   int revents;
+} mongoc_stream_poll_t;
+
+struct _mongoc_stream_t {
+   int type;
+   void (*destroy) (mongoc_stream_t *stream);
+   int (*close) (mongoc_stream_t *stream);
+   int (*flush) (mongoc_stream_t *stream);
+   ssize_t (*writev) (mongoc_stream_t *stream,
+                      mongoc_iovec_t *iov,
+                      size_t iovcnt,
+                      int32_t timeout_msec);
+   ssize_t (*readv) (mongoc_stream_t *stream,
+                     mongoc_iovec_t *iov,
+                     size_t iovcnt,
+                     size_t min_bytes,
+                     int32_t timeout_msec);
+   int (*setsockopt) (mongoc_stream_t *stream,
+                      int level,
+                      int optname,
+                      void *optval,
+                      mongoc_socklen_t optlen);
+   mongoc_stream_t *(*get_base_stream) (mongoc_stream_t *stream);
+   bool (*check_closed) (mongoc_stream_t *stream);
+   ssize_t (*poll) (mongoc_stream_poll_t *streams,
+                    size_t nstreams,
+                    int32_t timeout);
+   void (*failed) (mongoc_stream_t *stream);
+   bool (*timed_out) (mongoc_stream_t *stream);
+   bool (*should_retry) (mongoc_stream_t *stream);
+   void *padding[3];
+};
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_get_base_stream (mongoc_stream_t *stream);
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_get_tls_stream (mongoc_stream_t *stream);
+MONGOC_EXPORT (int)
+mongoc_stream_close (mongoc_stream_t *stream);
+MONGOC_EXPORT (void)
+mongoc_stream_destroy (mongoc_stream_t *stream);
+MONGOC_EXPORT (void)
+mongoc_stream_failed (mongoc_stream_t *stream);
+MONGOC_EXPORT (int)
+mongoc_stream_flush (mongoc_stream_t *stream);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_writev (mongoc_stream_t *stream,
+                      mongoc_iovec_t *iov,
+                      size_t iovcnt,
+                      int32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_write (mongoc_stream_t *stream,
+                     void *buf,
+                     size_t count,
+                     int32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_readv (mongoc_stream_t *stream,
+                     mongoc_iovec_t *iov,
+                     size_t iovcnt,
+                     size_t min_bytes,
+                     int32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_read (mongoc_stream_t *stream,
+                    void *buf,
+                    size_t count,
+                    size_t min_bytes,
+                    int32_t timeout_msec);
+MONGOC_EXPORT (int)
+mongoc_stream_setsockopt (mongoc_stream_t *stream,
+                          int level,
+                          int optname,
+                          void *optval,
+                          mongoc_socklen_t optlen);
+MONGOC_EXPORT (bool)
+mongoc_stream_check_closed (mongoc_stream_t *stream);
+MONGOC_EXPORT (bool)
+mongoc_stream_timed_out (mongoc_stream_t *stream);
+MONGOC_EXPORT (bool)
+mongoc_stream_should_retry (mongoc_stream_t *stream);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_poll (mongoc_stream_poll_t *streams,
+                    size_t nstreams,
+                    int32_t timeout);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-topology-description.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-topology-description.h
new file mode 100644
index 0000000..75b7fbc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-topology-description.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_TOPOLOGY_DESCRIPTION_H
+#define MONGOC_TOPOLOGY_DESCRIPTION_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-read-prefs.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_topology_description_t mongoc_topology_description_t;
+
+MONGOC_EXPORT (void)
+mongoc_topology_description_destroy (
+   mongoc_topology_description_t *description);
+
+MONGOC_EXPORT (mongoc_topology_description_t *)
+mongoc_topology_description_new_copy (
+   const mongoc_topology_description_t *description)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_topology_description_has_readable_server (
+   const mongoc_topology_description_t *td, const mongoc_read_prefs_t *prefs);
+
+MONGOC_EXPORT (bool)
+mongoc_topology_description_has_writable_server (
+   const mongoc_topology_description_t *td);
+
+MONGOC_EXPORT (const char *)
+mongoc_topology_description_type (const mongoc_topology_description_t *td);
+
+MONGOC_EXPORT (mongoc_server_description_t **)
+mongoc_topology_description_get_servers (
+   const mongoc_topology_description_t *td,
+   size_t *n) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_TOPOLOGY_DESCRIPTION_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-uri.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-uri.h
new file mode 100644
index 0000000..183c42d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-uri.h
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_URI_H
+#define MONGOC_URI_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-host-list.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-config.h"
+
+
+#ifndef MONGOC_DEFAULT_PORT
+#define MONGOC_DEFAULT_PORT 27017
+#endif
+
+#define MONGOC_URI_APPNAME "appname"
+#define MONGOC_URI_AUTHMECHANISM "authmechanism"
+#define MONGOC_URI_AUTHMECHANISMPROPERTIES "authmechanismproperties"
+#define MONGOC_URI_AUTHSOURCE "authsource"
+#define MONGOC_URI_CANONICALIZEHOSTNAME "canonicalizehostname"
+#define MONGOC_URI_CONNECTTIMEOUTMS "connecttimeoutms"
+#define MONGOC_URI_COMPRESSORS "compressors"
+#define MONGOC_URI_DIRECTCONNECTION "directconnection"
+#define MONGOC_URI_GSSAPISERVICENAME "gssapiservicename"
+#define MONGOC_URI_HEARTBEATFREQUENCYMS "heartbeatfrequencyms"
+#define MONGOC_URI_JOURNAL "journal"
+#define MONGOC_URI_LOADBALANCED "loadbalanced"
+#define MONGOC_URI_LOCALTHRESHOLDMS "localthresholdms"
+#define MONGOC_URI_MAXIDLETIMEMS "maxidletimems"
+#define MONGOC_URI_MAXPOOLSIZE "maxpoolsize"
+#define MONGOC_URI_MAXSTALENESSSECONDS "maxstalenessseconds"
+#define MONGOC_URI_MINPOOLSIZE "minpoolsize"
+#define MONGOC_URI_READCONCERNLEVEL "readconcernlevel"
+#define MONGOC_URI_READPREFERENCE "readpreference"
+#define MONGOC_URI_READPREFERENCETAGS "readpreferencetags"
+#define MONGOC_URI_REPLICASET "replicaset"
+#define MONGOC_URI_RETRYREADS "retryreads"
+#define MONGOC_URI_RETRYWRITES "retrywrites"
+#define MONGOC_URI_SAFE "safe"
+#define MONGOC_URI_SERVERSELECTIONTIMEOUTMS "serverselectiontimeoutms"
+#define MONGOC_URI_SERVERSELECTIONTRYONCE "serverselectiontryonce"
+#define MONGOC_URI_SLAVEOK "slaveok"
+#define MONGOC_URI_SOCKETCHECKINTERVALMS "socketcheckintervalms"
+#define MONGOC_URI_SOCKETTIMEOUTMS "sockettimeoutms"
+#define MONGOC_URI_SRVSERVICENAME "srvservicename"
+#define MONGOC_URI_SRVMAXHOSTS "srvmaxhosts"
+#define MONGOC_URI_TLS "tls"
+#define MONGOC_URI_TLSCERTIFICATEKEYFILE "tlscertificatekeyfile"
+#define MONGOC_URI_TLSCERTIFICATEKEYFILEPASSWORD "tlscertificatekeyfilepassword"
+#define MONGOC_URI_TLSCAFILE "tlscafile"
+#define MONGOC_URI_TLSALLOWINVALIDCERTIFICATES "tlsallowinvalidcertificates"
+#define MONGOC_URI_TLSALLOWINVALIDHOSTNAMES "tlsallowinvalidhostnames"
+#define MONGOC_URI_TLSINSECURE "tlsinsecure"
+#define MONGOC_URI_TLSDISABLECERTIFICATEREVOCATIONCHECK \
+   "tlsdisablecertificaterevocationcheck"
+#define MONGOC_URI_TLSDISABLEOCSPENDPOINTCHECK "tlsdisableocspendpointcheck"
+#define MONGOC_URI_W "w"
+#define MONGOC_URI_WAITQUEUEMULTIPLE "waitqueuemultiple"
+#define MONGOC_URI_WAITQUEUETIMEOUTMS "waitqueuetimeoutms"
+#define MONGOC_URI_WTIMEOUTMS "wtimeoutms"
+#define MONGOC_URI_ZLIBCOMPRESSIONLEVEL "zlibcompressionlevel"
+
+/* Deprecated in MongoDB 4.2, use "tls" variants instead. */
+#define MONGOC_URI_SSL "ssl"
+#define MONGOC_URI_SSLCLIENTCERTIFICATEKEYFILE "sslclientcertificatekeyfile"
+#define MONGOC_URI_SSLCLIENTCERTIFICATEKEYPASSWORD \
+   "sslclientcertificatekeypassword"
+#define MONGOC_URI_SSLCERTIFICATEAUTHORITYFILE "sslcertificateauthorityfile"
+#define MONGOC_URI_SSLALLOWINVALIDCERTIFICATES "sslallowinvalidcertificates"
+#define MONGOC_URI_SSLALLOWINVALIDHOSTNAMES "sslallowinvalidhostnames"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_uri_t mongoc_uri_t;
+
+
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_copy (const mongoc_uri_t *uri) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_uri_destroy (mongoc_uri_t *uri);
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_new (const char *uri_string) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_new_with_error (const char *uri_string,
+                           bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_new_for_host_port (const char *hostname,
+                              uint16_t port) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_uri_get_hosts (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_service (const mongoc_uri_t *uri)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_uri_get_srv_hostname);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_srv_hostname (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_srv_service_name (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_database (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_database (mongoc_uri_t *uri, const char *database);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_compressors (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_options (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_password (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_password (mongoc_uri_t *uri, const char *password);
+MONGOC_EXPORT (bool)
+mongoc_uri_has_option (const mongoc_uri_t *uri, const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_int32 (const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_int64 (const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_bool (const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_utf8 (const char *key);
+MONGOC_EXPORT (int32_t)
+mongoc_uri_get_option_as_int32 (const mongoc_uri_t *uri,
+                                const char *option,
+                                int32_t fallback);
+MONGOC_EXPORT (int64_t)
+mongoc_uri_get_option_as_int64 (const mongoc_uri_t *uri,
+                                const char *option,
+                                int64_t fallback);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_option_as_bool (const mongoc_uri_t *uri,
+                               const char *option,
+                               bool fallback);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_option_as_utf8 (const mongoc_uri_t *uri,
+                               const char *option,
+                               const char *fallback);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_int32 (mongoc_uri_t *uri,
+                                const char *option,
+                                int32_t value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_int64 (mongoc_uri_t *uri,
+                                const char *option,
+                                int64_t value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_bool (mongoc_uri_t *uri,
+                               const char *option,
+                               bool value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_utf8 (mongoc_uri_t *uri,
+                               const char *option,
+                               const char *value);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_read_prefs (const mongoc_uri_t *uri)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_uri_get_read_prefs_t);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_replica_set (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_string (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_username (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_username (mongoc_uri_t *uri, const char *username);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_credentials (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_auth_source (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_auth_source (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_appname (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_appname (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_compressors (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_auth_mechanism (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_auth_mechanism (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_mechanism_properties (const mongoc_uri_t *uri,
+                                     bson_t *properties);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_mechanism_properties (mongoc_uri_t *uri,
+                                     const bson_t *properties);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_ssl (const mongoc_uri_t *uri)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_uri_get_tls);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_tls (const mongoc_uri_t *uri);
+MONGOC_EXPORT (char *)
+mongoc_uri_unescape (const char *escaped_string) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_uri_get_read_prefs_t (const mongoc_uri_t *uri);
+MONGOC_EXPORT (void)
+mongoc_uri_set_read_prefs_t (mongoc_uri_t *uri,
+                             const mongoc_read_prefs_t *prefs);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_uri_get_write_concern (const mongoc_uri_t *uri);
+MONGOC_EXPORT (void)
+mongoc_uri_set_write_concern (mongoc_uri_t *uri,
+                              const mongoc_write_concern_t *wc);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_uri_get_read_concern (const mongoc_uri_t *uri);
+MONGOC_EXPORT (void)
+mongoc_uri_set_read_concern (mongoc_uri_t *uri,
+                             const mongoc_read_concern_t *rc);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_URI_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-version-functions.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-version-functions.h
new file mode 100644
index 0000000..e8311dd
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-version-functions.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_VERSION_FUNCTIONS_H
+#define MONGOC_VERSION_FUNCTIONS_H
+
+#include <bson/bson.h> /* for "bool" */
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (int)
+mongoc_get_major_version (void);
+MONGOC_EXPORT (int)
+mongoc_get_minor_version (void);
+MONGOC_EXPORT (int)
+mongoc_get_micro_version (void);
+MONGOC_EXPORT (const char *)
+mongoc_get_version (void);
+MONGOC_EXPORT (bool)
+mongoc_check_version (int required_major,
+                      int required_minor,
+                      int required_micro);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_VERSION_FUNCTIONS_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-version.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-version.h
new file mode 100644
index 0000000..e2b44fb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-version.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#if !defined (MONGOC_INSIDE) && !defined (MONGOC_COMPILATION)
+#error "Only <mongoc/mongoc.h> can be included directly."
+#endif
+
+
+#ifndef MONGOC_VERSION_H
+#define MONGOC_VERSION_H
+
+
+/**
+ * MONGOC_MAJOR_VERSION:
+ *
+ * MONGOC major version component (e.g. 1 if %MONGOC_VERSION is 1.2.3)
+ */
+#define MONGOC_MAJOR_VERSION (1)
+
+
+/**
+ * MONGOC_MINOR_VERSION:
+ *
+ * MONGOC minor version component (e.g. 2 if %MONGOC_VERSION is 1.2.3)
+ */
+#define MONGOC_MINOR_VERSION (23)
+
+
+/**
+ * MONGOC_MICRO_VERSION:
+ *
+ * MONGOC micro version component (e.g. 3 if %MONGOC_VERSION is 1.2.3)
+ */
+#define MONGOC_MICRO_VERSION (1)
+
+
+/**
+ * MONGOC_PRERELEASE_VERSION:
+ *
+ * MONGOC prerelease version component (e.g. pre if %MONGOC_VERSION is 1.2.3-pre)
+ */
+#define MONGOC_PRERELEASE_VERSION ()
+
+
+/**
+ * MONGOC_VERSION:
+ *
+ * MONGOC version.
+ */
+#define MONGOC_VERSION (1.23.1)
+
+
+/**
+ * MONGOC_VERSION_S:
+ *
+ * MONGOC version, encoded as a string, useful for printing and
+ * concatenation.
+ */
+#define MONGOC_VERSION_S "1.23.1"
+
+
+/**
+ * MONGOC_VERSION_HEX:
+ *
+ * MONGOC version, encoded as an hexadecimal number, useful for
+ * integer comparisons.
+ */
+#define MONGOC_VERSION_HEX (MONGOC_MAJOR_VERSION << 24 | \
+                          MONGOC_MINOR_VERSION << 16 | \
+                          MONGOC_MICRO_VERSION << 8)
+
+
+/**
+ * MONGOC_CHECK_VERSION:
+ * @major: required major version
+ * @minor: required minor version
+ * @micro: required micro version
+ *
+ * Compile-time version checking. Evaluates to %TRUE if the version
+ * of MONGOC is greater than the required one.
+ */
+#define MONGOC_CHECK_VERSION(major,minor,micro)   \
+        (MONGOC_MAJOR_VERSION > (major) || \
+         (MONGOC_MAJOR_VERSION == (major) && MONGOC_MINOR_VERSION > (minor)) || \
+         (MONGOC_MAJOR_VERSION == (major) && MONGOC_MINOR_VERSION == (minor) && \
+          MONGOC_MICRO_VERSION >= (micro)))
+
+#endif /* MONGOC_VERSION_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-write-concern.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-write-concern.h
new file mode 100644
index 0000000..7961361
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc-write-concern.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_WRITE_CONCERN_H
+#define MONGOC_WRITE_CONCERN_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED 0
+#define MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED -1 /* deprecated */
+#define MONGOC_WRITE_CONCERN_W_DEFAULT -2
+#define MONGOC_WRITE_CONCERN_W_MAJORITY -3
+#define MONGOC_WRITE_CONCERN_W_TAG -4
+
+
+typedef struct _mongoc_write_concern_t mongoc_write_concern_t;
+
+
+MONGOC_EXPORT (mongoc_write_concern_t *)
+mongoc_write_concern_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_write_concern_t *)
+mongoc_write_concern_copy (const mongoc_write_concern_t *write_concern)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_write_concern_destroy (mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_get_fsync (const mongoc_write_concern_t *write_concern)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_fsync (mongoc_write_concern_t *write_concern,
+                                bool fsync_) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_write_concern_get_journal (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_journal_is_set (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_journal (mongoc_write_concern_t *write_concern,
+                                  bool journal);
+MONGOC_EXPORT (int32_t)
+mongoc_write_concern_get_w (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_w (mongoc_write_concern_t *write_concern, int32_t w);
+MONGOC_EXPORT (const char *)
+mongoc_write_concern_get_wtag (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wtag (mongoc_write_concern_t *write_concern,
+                               const char *tag);
+MONGOC_EXPORT (int32_t)
+mongoc_write_concern_get_wtimeout (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (int64_t)
+mongoc_write_concern_get_wtimeout_int64 (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wtimeout (mongoc_write_concern_t *write_concern,
+                                   int32_t wtimeout_msec);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wtimeout_int64 (mongoc_write_concern_t *write_concern,
+                                         int64_t wtimeout_msec);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_get_wmajority (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wmajority (mongoc_write_concern_t *write_concern,
+                                    int32_t wtimeout_msec);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_is_acknowledged (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_is_valid (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_append (mongoc_write_concern_t *write_concern,
+                             bson_t *doc);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_is_default (const mongoc_write_concern_t *write_concern);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_WRITE_CONCERN_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc.h b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc.h
new file mode 100644
index 0000000..24d69e4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/include/libmongoc-1.0/mongoc/mongoc.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef MONGOC_H
+#define MONGOC_H
+
+
+#include <bson/bson.h>
+
+#define MONGOC_INSIDE
+#include "mongoc-macros.h"
+#include "mongoc-apm.h"
+#include "mongoc-bulk-operation.h"
+#include "mongoc-change-stream.h"
+#include "mongoc-client.h"
+#include "mongoc-client-pool.h"
+#include "mongoc-client-side-encryption.h"
+#include "mongoc-collection.h"
+#include "mongoc-config.h"
+#include "mongoc-cursor.h"
+#include "mongoc-database.h"
+#include "mongoc-index.h"
+#include "mongoc-error.h"
+#include "mongoc-flags.h"
+#include "mongoc-gridfs.h"
+#include "mongoc-gridfs-bucket.h"
+#include "mongoc-gridfs-file.h"
+#include "mongoc-gridfs-file-list.h"
+#include "mongoc-gridfs-file-page.h"
+#include "mongoc-host-list.h"
+#include "mongoc-init.h"
+#include "mongoc-matcher.h"
+#include "mongoc-handshake.h"
+#include "mongoc-opcode.h"
+#include "mongoc-log.h"
+#include "mongoc-socket.h"
+#include "mongoc-client-session.h"
+#include "mongoc-stream.h"
+#include "mongoc-stream-buffered.h"
+#include "mongoc-stream-file.h"
+#include "mongoc-stream-gridfs.h"
+#include "mongoc-stream-socket.h"
+#include "mongoc-uri.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-version.h"
+#include "mongoc-version-functions.h"
+#ifdef MONGOC_ENABLE_SSL
+#include "mongoc-rand.h"
+#include "mongoc-stream-tls.h"
+#include "mongoc-ssl.h"
+#endif
+#undef MONGOC_INSIDE
+
+
+#endif /* MONGOC_H */
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-1.0-config-version.cmake
new file mode 100644
index 0000000..861e7b6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-1.0-config-version.cmake
@@ -0,0 +1,48 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "1.23.1")
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  # Package version must be in the requested version range
+  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
+      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  endif()
+else()
+  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-1.0-config.cmake
new file mode 100644
index 0000000..7a41d65
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-1.0-config.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/bson-targets.cmake")
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-targets-release.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-targets-release.cmake
new file mode 100644
index 0000000..30143fb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-targets-release.cmake
@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::bson_shared" for configuration "Release"
+set_property(TARGET mongo::bson_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bson_shared PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libbson-1.0.so.0.0.0"
+  IMPORTED_SONAME_RELEASE "libbson-1.0.so.0"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bson_shared )
+list(APPEND _cmake_import_check_files_for_mongo::bson_shared "${_IMPORT_PREFIX}/lib/libbson-1.0.so.0.0.0" )
+
+# Import target "mongo::bson_static" for configuration "Release"
+set_property(TARGET mongo::bson_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bson_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libbson-static-1.0.a"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bson_static )
+list(APPEND _cmake_import_check_files_for_mongo::bson_static "${_IMPORT_PREFIX}/lib/libbson-static-1.0.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-targets.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-targets.cmake
new file mode 100644
index 0000000..c3f8741
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/bson-1.0/bson-targets.cmake
@@ -0,0 +1,116 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::bson_shared mongo::bson_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::bson_shared
+add_library(mongo::bson_shared SHARED IMPORTED)
+
+set_target_properties(mongo::bson_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libbson-1.0"
+)
+
+# Create imported target mongo::bson_static
+add_library(mongo::bson_static STATIC IMPORTED)
+
+set_target_properties(mongo::bson_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "BSON_STATIC"
+  INTERFACE_COMPILE_OPTIONS "-fPIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libbson-1.0"
+  INTERFACE_LINK_LIBRARIES "-lpthread;C:/UnrealToolchains/v20_clang-13.0.1-centos7/x86_64-unknown-linux-gnu/usr/lib64/librt.so"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/bson-targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-1.0/libbson-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-1.0/libbson-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-1.0/libbson-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-1.0/libbson-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-1.0/libbson-1.0-config.cmake
new file mode 100644
index 0000000..cd67dd6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-1.0/libbson-1.0-config.cmake
@@ -0,0 +1,57 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bson_shared' instead.  Consult the example projects for further details.")
+
+set (BSON_MAJOR_VERSION 1)
+set (BSON_MINOR_VERSION 23)
+set (BSON_MICRO_VERSION 1)
+set (BSON_VERSION 1.23.1)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbson-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (BSON_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libbson-1.0")
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# BSON_LIBRARY themselves.
+find_library (BSON_LIBRARY bson-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+
+set (BSON_LIBRARIES ${BSON_LIBRARY})
+
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-static-1.0/libbson-static-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-static-1.0/libbson-static-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-static-1.0/libbson-static-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-static-1.0/libbson-static-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-static-1.0/libbson-static-1.0-config.cmake
new file mode 100644
index 0000000..a257b29
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libbson-static-1.0/libbson-static-1.0-config.cmake
@@ -0,0 +1,62 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bson_static' instead.  Consult the example projects for further details.")
+
+set (BSON_STATIC_MAJOR_VERSION 1)
+set (BSON_STATIC_MINOR_VERSION 23)
+set (BSON_STATIC_MICRO_VERSION 1)
+set (BSON_STATIC_VERSION 1.23.1)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbson-static-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (BSON_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libbson-1.0")
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# BSON_STATIC_LIBRARY themselves.
+find_library (BSON_STATIC_LIBRARY bson-static-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+
+set (BSON_STATIC_LIBRARIES ${BSON_STATIC_LIBRARY})
+
+foreach (LIB  C:/UnrealToolchains/v20_clang-13.0.1-centos7/x86_64-unknown-linux-gnu/usr/lib64/librt.so -lpthread)
+    list (APPEND BSON_STATIC_LIBRARIES ${LIB})
+endforeach ()
+
+set (BSON_STATIC_DEFINITIONS BSON_STATIC)
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-1.0/libmongoc-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-1.0/libmongoc-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-1.0/libmongoc-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-1.0/libmongoc-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-1.0/libmongoc-1.0-config.cmake
new file mode 100644
index 0000000..0b9132f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-1.0/libmongoc-1.0-config.cmake
@@ -0,0 +1,79 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongoc_shared' instead.  Consult the example projects for further details.")
+
+set (MONGOC_MAJOR_VERSION 1)
+set (MONGOC_MINOR_VERSION 23)
+set (MONGOC_MICRO_VERSION 1)
+set (MONGOC_VERSION 1.23.1)
+
+find_package (libbson-1.0 "1.23" REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongoc-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (MONGOC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libmongoc-1.0")
+list (APPEND MONGOC_INCLUDE_DIRS ${BSON_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# MONGOC_LIBRARY themselves.
+find_library (MONGOC_LIBRARY mongoc-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set (MONGOC_LIBRARIES ${MONGOC_LIBRARY} ${BSON_LIBRARIES})
+
+# If this file is generated by the Autotools on Mac, SSL_LIBRARIES might be
+# "-framework CoreFoundation -framework Security". Split into a CMake array
+# like "-framework CoreFoundation;-framework Security".
+set (IS_FRAMEWORK_VAR 0)
+foreach (LIB
+     rt resolv
+      
+)
+   if (LIB STREQUAL "-framework")
+      set (IS_FRAMEWORK_VAR 1)
+      continue ()
+   elseif (IS_FRAMEWORK_VAR)
+      list (APPEND MONGOC_LIBRARIES "-framework ${LIB}")
+      set (IS_FRAMEWORK_VAR 0)
+   else ()
+      list (APPEND MONGOC_LIBRARIES ${LIB})
+   endif ()
+endforeach ()
+
+set (MONGOC_DEFINITIONS ${BSON_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config.cmake
new file mode 100644
index 0000000..3822f78
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config.cmake
@@ -0,0 +1,83 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongoc_static' instead.  Consult the example projects for further details.")
+
+set (MONGOC_STATIC_MAJOR_VERSION 1)
+set (MONGOC_STATIC_MINOR_VERSION 23)
+set (MONGOC_STATIC_MICRO_VERSION 1)
+set (MONGOC_STATIC_VERSION 1.23.1)
+
+find_package (libbson-static-1.0 "1.23" REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongoc-static-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (MONGOC_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libmongoc-1.0")
+list (APPEND MONGOC_STATIC_INCLUDE_DIRS ${BSON_STATIC_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# MONGOC_STATIC_LIBRARY themselves.
+find_library (MONGOC_STATIC_LIBRARY mongoc-static-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+if (MSVC)
+   set (MONGOC_STATIC_LIB_EXT "lib")
+else ()
+   set (MONGOC_STATIC_LIB_EXT "a")
+endif ()
+set (MONGOC_STATIC_LIBRARIES ${MONGOC_STATIC_LIBRARY} ${ZLIB_STATIC_LIBRARY} ${BSON_STATIC_LIBRARIES})
+
+# If this file is generated by the Autotools on Mac, SSL_LIBRARIES might be
+# "-framework CoreFoundation -framework Security". Split into a CMake array
+# like "-framework CoreFoundation;-framework Security".
+set (IS_FRAMEWORK_VAR 0)
+foreach (LIB   rt 
+    resolv   
+)
+   if (LIB STREQUAL "-framework")
+      set (IS_FRAMEWORK_VAR 1)
+      continue ()
+   elseif (IS_FRAMEWORK_VAR)
+      list (APPEND MONGOC_STATIC_LIBRARIES "-framework ${LIB}")
+      set (IS_FRAMEWORK_VAR 0)
+   else ()
+      list (APPEND MONGOC_STATIC_LIBRARIES ${LIB})
+   endif ()
+endforeach ()
+
+set (MONGOC_STATIC_DEFINITIONS MONGOC_STATIC ${BSON_STATIC_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake
new file mode 100644
index 0000000..861e7b6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake
@@ -0,0 +1,48 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "1.23.1")
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  # Package version must be in the requested version range
+  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
+      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  endif()
+else()
+  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake
new file mode 100644
index 0000000..1f4ab76
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake
@@ -0,0 +1,3 @@
+include(CMakeFindDependencyMacro)
+find_dependency(bson-1.0 1.23.1)
+include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake")
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-targets-release.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-targets-release.cmake
new file mode 100644
index 0000000..c89ec5b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-targets-release.cmake
@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::mongoc_shared" for configuration "Release"
+set_property(TARGET mongo::mongoc_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongoc_shared PROPERTIES
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libmongoc-1.0.so.0.0.0"
+  IMPORTED_SONAME_RELEASE "libmongoc-1.0.so.0"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongoc_shared )
+list(APPEND _cmake_import_check_files_for_mongo::mongoc_shared "${_IMPORT_PREFIX}/lib/libmongoc-1.0.so.0.0.0" )
+
+# Import target "mongo::mongoc_static" for configuration "Release"
+set_property(TARGET mongo::mongoc_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongoc_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libmongoc-static-1.0.a"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongoc_static )
+list(APPEND _cmake_import_check_files_for_mongo::mongoc_static "${_IMPORT_PREFIX}/lib/libmongoc-static-1.0.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-targets.cmake b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-targets.cmake
new file mode 100644
index 0000000..41450d9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/cmake/mongoc-1.0/mongoc-targets.cmake
@@ -0,0 +1,133 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::mongoc_shared mongo::mongoc_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::mongoc_shared
+add_library(mongo::mongoc_shared SHARED IMPORTED)
+
+set_target_properties(mongo::mongoc_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libmongoc-1.0"
+  INTERFACE_LINK_LIBRARIES "mongo::bson_shared"
+)
+
+# Create imported target mongo::mongoc_static
+add_library(mongo::mongoc_static STATIC IMPORTED)
+
+set_target_properties(mongo::mongoc_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "MONGOC_STATIC;BSON_STATIC"
+  INTERFACE_COMPILE_OPTIONS "-fPIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libmongoc-1.0"
+  INTERFACE_LINK_LIBRARIES "rt;resolv;-lpthread;mongo::bson_static"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/mongoc-targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# Make sure the targets which have been exported in some other
+# export set exist.
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+foreach(_target "mongo::bson_shared" "mongo::bson_static" )
+  if(NOT TARGET "${_target}" )
+    set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets "${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets} ${_target}")
+  endif()
+endforeach()
+
+if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+  if(CMAKE_FIND_PACKAGE_NAME)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  else()
+    message(FATAL_ERROR "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  endif()
+endif()
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so
new file mode 100644
index 0000000..ae6d809
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb57af84f59db3d47609560d66b419bfa8347ae9b657a44e148312d7d50db1e3
+size 222912
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so.0 b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so.0
new file mode 100644
index 0000000..ae6d809
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so.0
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb57af84f59db3d47609560d66b419bfa8347ae9b657a44e148312d7d50db1e3
+size 222912
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so.0.0.0 b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so.0.0.0
new file mode 100644
index 0000000..ae6d809
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-1.0.so.0.0.0
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb57af84f59db3d47609560d66b419bfa8347ae9b657a44e148312d7d50db1e3
+size 222912
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libbson-static-1.0.a b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-static-1.0.a
new file mode 100644
index 0000000..6b7947a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libbson-static-1.0.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:798bde770916593c1e3c953f3a327dab62a736b99950f3460ee29654beabe743
+size 460168
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so
new file mode 100644
index 0000000..1c93da8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fc97b914cfe8ba47c920b16256bf7fd4d7f8cb94a402e29e7884ae2b6538038
+size 842920
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so.0 b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so.0
new file mode 100644
index 0000000..1c93da8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so.0
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fc97b914cfe8ba47c920b16256bf7fd4d7f8cb94a402e29e7884ae2b6538038
+size 842920
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so.0.0.0 b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so.0.0.0
new file mode 100644
index 0000000..1c93da8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-1.0.so.0.0.0
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7fc97b914cfe8ba47c920b16256bf7fd4d7f8cb94a402e29e7884ae2b6538038
+size 842920
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-static-1.0.a b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-static-1.0.a
new file mode 100644
index 0000000..efeb4e8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/libmongoc-static-1.0.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:abb969054eac57e57e9129d63b73381dc8cba18ee524425b79e2f3ecd5db07a6
+size 1561766
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libbson-1.0.pc b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libbson-1.0.pc
new file mode 100644
index 0000000..bd4bf18
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libbson-1.0.pc
@@ -0,0 +1,10 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Linux
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libbson
+Description: The libbson BSON serialization library.
+Version: 1.23.1
+Libs: -L${libdir} -lbson-1.0
+Cflags: -I${includedir}/libbson-1.0
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libbson-static-1.0.pc b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libbson-static-1.0.pc
new file mode 100644
index 0000000..16d7e79
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libbson-static-1.0.pc
@@ -0,0 +1,10 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Linux
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libbson static archive
+Description: The libbson BSON serialization library.
+Version: 1.23.1
+Libs: -L${libdir} -lbson-static-1.0  C:/UnrealToolchains/v20_clang-13.0.1-centos7/x86_64-unknown-linux-gnu/usr/lib64/librt.so -lpthread
+Cflags: -I${includedir}/libbson-1.0 -DBSON_STATIC
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libmongoc-1.0.pc b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libmongoc-1.0.pc
new file mode 100644
index 0000000..b76188e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libmongoc-1.0.pc
@@ -0,0 +1,11 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Linux
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libmongoc
+Description: The libmongoc MongoDB client library.
+Version: 1.23.1
+Requires: libbson-1.0
+Libs: -L${libdir} -lmongoc-1.0
+Cflags: -I${includedir}/libmongoc-1.0
diff --git a/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libmongoc-static-1.0.pc b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libmongoc-static-1.0.pc
new file mode 100644
index 0000000..2c0af78
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/lib/pkgconfig/libmongoc-static-1.0.pc
@@ -0,0 +1,11 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Linux
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libmongoc
+Description: The libmongoc MongoDB client library.
+Version: 1.23.1
+Requires: libbson-static-1.0
+Libs: -L${libdir} -lmongoc-static-1.0  -lrt -lresolv -lpthread
+Cflags: -I${includedir}/libmongoc-1.0 -DMONGOC_STATIC
diff --git a/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/COPYING b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/COPYING
new file mode 100644
index 0000000..f433b1a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/COPYING
@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/NEWS b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/NEWS
new file mode 100644
index 0000000..fc3874f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/NEWS
@@ -0,0 +1,3258 @@
+libmongoc 1.23.1
+================
+
+Bug fixes:
+
+  * Fix connectivity to Atlas Data Lake 
+  * Fix crash when dropping a malformed Queryable Encryption collection.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+  * Kevin Albertson
+
+
+
+libmongoc 1.23.0
+================
+
+Features:
+
+  * Add on-demand Credentials Callback for CSFLE
+  * Support obtaining AWS credentials for CSFLE in the same way as for MONGODB-AWS
+
+Improvements:
+
+  * Reducing Warnings of Misaligned Address of Over-Aligned Types
+
+Bug fixes:
+
+  * Do not spawn mongocryptd if mongo_shared shared library is loaded.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Ezra Chung
+  * Colby Pike
+  * Kevin Albertson
+  * Roberto C. Sánchez
+
+
+
+libmongoc 1.22.1
+================
+
+Bug fixes:
+
+  * Fix documentation build when using Sphinx 5.0 or newer
+  * Update patch release of libmongocrypt to 1.5.2: Fix a potential data
+    corruption bug in RewrapManyDataKey when rotating encrypted data encryption
+    keys backed by GCP or Azure key services.
+
+    The following conditions will trigger this bug:
+
+    A GCP-backed or Azure-backed data encryption key being rewrapped requires
+    fetching an access token for decryption of the data encryption key.
+
+    The result of this bug is that the key material for all data encryption keys
+    being rewrapped is replaced by new randomly generated material, destroying
+    the original key material.
+
+    To mitigate potential data corruption, upgrade to this version or higher
+    before using RewrapManyDataKey to rotate Azure-backed or GCP-backed data
+    encryption keys. A backup of the key vault collection should always be taken
+    before key rotation.
+
+Other:
+
+  * Update to Fedora 37 for RPM builds
+  * Dependency build of libmongocrypt re-uses the libbson of the depending
+    libmongoc
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Ezra Chung
+  * Roberto C. Sánchez
+  * Kevin Albertson
+
+
+
+libmongoc 1.21.2
+================
+
+Bug Fixes:
+  * Address vulnerability in bundled zlib by updating to 1.1.12.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Colby Pike
+
+
+
+libmongoc 1.22.0
+================
+
+Bug fixes:
+
+  * Do not auto decrypt before emitting CommandSucceeded events.
+
+Improvements:
+
+  * Use OP_MSG if a server API version is requested.
+
+Features:
+
+  * Add server connectionId to command monitoring events.
+  * Add support for the comment field to all helpers.
+  * Support mongo_shared shared library.
+  * Support pre-point-in-time change stream events.
+  * Support Queryable Encryption.
+  * Support 'let' option for multiple CRUD commands.
+  * Add Key Management API functions.
+
+Notes:
+
+  * The 5.0-compat release (1.18.0) accidentally broke estimatedDocumentCount on views by changing its implementation to use aggregate and a $collStats stage instead of the count command.
+  * The new release is fixing estimatedDocumentCount on views by reverting back to using count in its implementation.
+  * Due to an oversight, the count command was omitted from the Stable API in server versions 5.0.0 - 5.0.8 and 5.1.0 - 5.3.1, so users of the Stable API with estimatedDocumentCount are recommended to upgrade their MongoDB clusters to 5.0.9 or 5.3.2 (if on Atlas) or set apiStrict: false when constructing their MongoClients.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Colby Pike
+  * Ezra Chung
+  * Roberto C. Sánchez
+  * Jake Molnar
+  * Jesse Williamson
+  * Remi Collet
+
+
+
+libmongoc 1.21.1
+================
+
+Bug Fixes:
+  * Use static decls for OpenSSL 1.1 polyfills
+  * Prevent possible crash in _mongoc_cursor_fetch_stream
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Jeremy Mikola
+  * Remi Collet
+
+
+
+libmongoc 1.21.0
+================
+
+Bug Fixes:
+  * Addressed VS 2013 build failures due to missing C99 features.
+
+Features:
+ * Support conditional $merge and $out aggregation on secondaries.
+ * Bump minimum wire protocol version from 3 (MongoDB 3.0) to 6 (MongoDB 3.6).
+ * Bump maximum wire protocol version from 14 (MongoDB 5.1) to 15 (MongODB 5.2).
+
+Improvements:
+ * Update algorithm used for generation of OID values to reduce collisions.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Ezra Chung
+  * Colby Pike
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * David CARLIER
+  * Jeremy Mikola
+
+
+
+libmongoc 1.20.1
+================
+
+Bug fixes:
+
+  * Fix bug where first hello command on a single-threaded client may not include full handshake.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+
+libmongoc 1.20.0
+================
+
+Features:
+
+  * Improve multi-threaded performance of client pool.
+  * Support KMIP as a provider for Client-Side Field Level Encryption (CSFLE).
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Ezra Chung
+  * Colby Pike
+  * Jesse Williamson
+  * Jeremy Mikola
+  * Kaitlin Mahar
+
+mongo-c-driver 1.19.2
+=====================
+
+Announcing libmongoc 1.19.2.
+
+Bug fixes:
+
+* Fix assert on invalid URI options in client pools connected to load balanced clusters when a topology closed callback is registered.
+
+Thanks to everyone who contributed to the development of this release.
+
+--Kevin Albertson
+
+libmongoc 1.19.1
+================
+
+It is my pleasure to announce libmongoc 1.19.1.
+
+Bug fixes:
+
+  * Permit NULL platform argument in mongoc_handshake_data_append.
+  * Fix wire version check in server selection when maxStalenessSeconds is specified in read preferences.
+  * Fix assert on invalid URI options in client pools connected to load balanced clusters.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Ezra Chung
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.19.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.19.0 release.
+This release adds full support for MongoDB 5.0 servers and MongoDB Atlas Serverless Instances.
+
+Features:
+
+  * Add full support to connect to MongoDB Atlas Serverless Instances.
+  * Add support for snapshot reads on a session with mongoc_session_opts_set_snapshot.
+  * Support the new URI option loadBalanced to connect to a MongoDB cluster behind a TCP load balancer.
+
+Bug fixes:
+
+  * Fix the uploadDate set on newly created GridFS files in the mongoc_gridfs_bucket_t API.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Benjamin Rewis
+  * Andreas Braun
+  * Colby Pike
+  * Ezra Chung
+  * Roberto C. Sánchez
+  * Jesse Williamson
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.18.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.18.0 release.
+This release adds partial support for MongoDB 5.0 servers.
+
+Features:
+
+  * Introduces support to select an API version when connecting to a MongoDB instance.
+  * Supports Azure and Google Cloud Platform as Key Management Service (KMS) providers in Client-Side Field Level Encryption (CSFLE).
+  * Support "let" option in aggregate command.
+  * Support time series collections.
+  * Relax validation for insert and replace documents to support fields containing dots and dollars.
+  * Expose the reason operations fail document validation.
+
+Bug fixes:
+
+  * Forward opts from mongoc_gridfs_bucket_find to underlying find operation.
+  * Fixes a possible hang when a limited size client pool is waiting for a client to become available in mongoc_client_pool_pop.
+
+Improvements
+
+  * Deprecate API containing deprecated terminology.
+  * Use "hello" command for monitoring servers.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andreas Braun
+  * Clyde Bazile
+  * Benjamin Rewis
+  * Jeremy Mikola
+  * Andrew Witten
+  * Samantha Ritter
+  * samantharitter
+  * Fermín Galán Márquez
+  * David Carlier
+  * Colby Pike
+  * Josh Weinstein
+  * Pierre Mickael Gonzalo
+
+mongo-c-driver 1.18.0-alpha
+===========================
+
+It is my pleasure to announce the MongoDB C Driver 1.18.0-alpha.
+
+This is an unstable prerelease and is unsuitable for production applications.
+
+Features:
+
+  * Introduces support to select an API version when connecting to a MongoDB instance.
+  * Supports Azure and Google Cloud Platform as Key Management Service (KMS) providers in Client-Side Field Level Encryption (CSFLE)
+
+Bug fixes:
+
+  * Fixes a possible hang when a limited size client pool is waiting for a client to become available in mongoc_client_pool_pop.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Clyde Bazile
+  * Andreas Braun
+  * Andrew Witten
+  * Samantha Ritter
+  * Benjamin Rewis
+  * Fermín Galán Márquez
+  * David Carlier
+  * Josh Weinstein
+  * Pierre Mickael Gonzalo
+
+mongo-c-driver 1.17.7
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.7.
+
+- Print correct error message when DNS resolution fails
+- Mix time to avoid duplicate RAND_bytes for the same PIDs
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+  * Jeremy Mikola
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.17.6
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.6.
+
+Bug fixes:
+
+  * Fix possible crash when speculative authentication fails with network error.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.17.5
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.5.
+
+Improvements:
+
+  * Fix documentation regarding when to call mongoc_log_set_handler
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Clyde Bazile
+  * Fermín Galán Márquez
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.17.4
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.4.
+
+Bug fixes:
+
+  * Fix crash on macOS on client pool shutdown.
+  * Fix spacing in extended JSON output for numberLong.
+  * Clear error in mongoc_collection_find_and_modify_with_opts on a successful retry.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Samantha Ritter
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.3
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.3.
+
+Bug fixes:
+
+  * Do not send session ID on GSSAPI auth commands.
+  * Fix build against zlib when zlib is installed in non-standard location.
+  * Fix build when source directory path contains a space.
+  * Fix a platform-specific bug causing mongoc_client_pool_pop to block indefinitely if all clients are checked out.
+  * Fix a possible buffer overflow with hostnames resolving to IPv6 addresses on OpenSSL.
+
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Roberto C. Sánchez
+  * Kevin Albertson
+  * Andrew Witten
+  * gonzalo
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.2
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.2.
+
+Bug fixes:
+
+  * Stop the SRV polling thread when an SRV URI is used to connect to a deployment other than a sharded cluster.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Roberto C. Sánchez
+  * Kevin Albertson
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.1.
+
+Bug fixes:
+
+  * Fix SRV/TXT record lookup for DNS records exceeding 1024 bytes.
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 release.
+This release adds support for MongoDB 4.4 servers.
+
+Features:
+
+  * Support streamable server monitoring to reduce recovery time when the server topology changes.
+  * Support the MONGODB-AWS authentication mechanism.
+  * Support Online Certificate Status Protocol (OCSP).
+  * Support configuring hedged reads in read preferences.
+  * Reduce the number of round trips necessary for SCRAM and X509 authentication.
+  * Monitor servers in parallel when using a mongoc_client_pool_t instead of doing serial scans.
+  * Support the "hint" option in operations using the update, replace, delete, and findAndModify commands.
+  * Improve behavior for retryable writes.
+  * Improve resuming behavior of change streams on server errors.
+  * Remove restriction of 255 character collection namespaces.
+
+Bug fixes:
+
+  * Fix criteria for resumable errors in change streams.
+  * Fix rare crashes when server is invalidated during authentication.
+  * Reject client session for mongoc_collection_estimated_document_count.
+  * Fix behavior of a SecondaryPreferred read preference for exhaust cursor operations against a sharded cluster. Prior to the fix, a nonzero maxStalenessSeconds would not trigger sending the read preference.
+  * Fix SRV polling. Prior to the fix, SRV polling did not properly apply newly discovered results.
+  * Fix checks for existing GridFS indexes to handle indexes created by the MongoDB shell.
+  * Fix possible use of invalidated streams during an unordered OP_QUERY bulk write, and when ending many pooled sessions at client destruction.
+  * Fix a crash when setting the crl_file TLS option for Secure Channel.
+  * Avoid emitting duplicate ServerChanged events when no change is observed during monitoring.
+  * Properly handle large SASL messages instead of erroring.
+
+Notes:
+
+  * Deprecated "lib" prefixed artifacts are no longer produced when building on Windows.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andrew Witten
+  * Andreas Braun
+  * Clyde Bazile
+  * Josh Weinstein
+
+-- Kevin Albertson
+
+mongo-c-driver 1.17.0 rc0
+=========================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 rc0 release.
+This release adds support for MongoDB 4.4 servers.
+
+Features:
+
+  * Support streamable server monitoring to reduce recovery time when the server topology changes.
+  * Support tlsDisableCertificateRevocationCheck when built with Secure Channel.
+
+Bug fixes:
+
+  * Fix criteria for resumable errors in change streams.
+  * Fix rare crashes when server is invalidated during authentication.
+  * Improve behavior when reaching out to OCSP responders for certificate revocation checking.
+  * Reject client session for mongoc_collection_estimated_document_count.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Andrew Witten
+  * Roberto C. Sánchez
+  * Clyde Bazile
+
+-- Kevin Albertson
+
+mongo-c-driver 1.17.0 beta2
+===========================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 beta2 release.
+
+Features:
+
+  * Support Online Certificate Status Protocol (OCSP) response caching.
+  * Support configuring hedged reads in read preferences.
+  * Reduce the number of round trips necessary for SCRAM and X509 authentication.
+  * Monitor servers in parallel when using a mongoc_client_pool_t instead of doing serial scans.
+  * Support OCSP on older versions of OpenSSL (1.0.1+).
+
+Bug fixes:
+
+  * Fix behavior of a SecondaryPreferred read preference for exhaust cursor operations against a sharded cluster. Prior to the fix, a nonzero maxStalenessSeconds would not trigger sending the read preference.
+  * Fix SRV polling. Prior to the fix, SRV polling did not properly apply newly discovered results.
+  * Fix checks for existing GridFS indexes to handle indexes created by the MongoDB shell.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andreas Braun
+  * Clyde Bazile
+  * Josh Weinstein
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.0 beta
+==========================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 beta release.
+
+Features:
+
+  * Support the MONGODB-AWS authentication mechanism.
+  * Support the Online Certificate Status Protocol (OCSP) for OpenSSL 1.1.0+, Secure Transport, and Secure Channel.
+  * Support the "hint" option in operations using the update, replace, delete, and findAndModify commands.
+  * Improve behavior for retryable writes.
+  * Improve resuming behavior of change streams on server errors.
+  * Remove an extra round trip for SCRAM authentication.
+  * Remove restriction of 255 character collection namespaces.
+
+Bug fixes:
+
+  * Fix possible use of invalidated streams during an unordered OP_QUERY bulk write, and when ending many pooled sessions at client destruction.
+  * Fix a crash when setting the crl_file TLS option for Secure Channel.
+  * Avoid emitting duplicate ServerChanged events when no change is observed during monitoring.
+  * Properly handle large SASL messages instead of erroring.
+
+Notes:
+
+  * Deprecated "lib" prefixed artifacts are no longer produced when building on Windows.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andreas Braun
+  * Clyde Bazile
+  * Jeremy Mikola
+  * Sara Golemon
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.16.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.16.1.
+
+Bug fixes:
+
+  * Fix listed library dependency on mongoc_static target when building with libmongocrypt.
+  * Replace a call of free to bson_free.
+  * Vendor Sphinx basic theme and correctly list static files for docs.
+  * Fix a compilation warning introduced in 1.16.0.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.16.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.16.0.
+
+Features:
+
+  * Support Client-side Field Level Encryption.
+  * Support ability to pass an index hint to update operations.
+  * Add cmake export targets.
+
+Bug fixes:
+  * Fix a bug with Windows SSPI failing to authenticate with GSSAPI when using
+    pooled clients for certain operations.
+  * Fix behavior for bulk writes that retry to keep track of the successful server.
+  * Remove hard limit of 1024 characters for SRV response.
+  * Fix racy crash when using client pool against a sharded cluster if a server is invalidated shortly before a new socket is opened against it.
+  * Remove unnecessary library dependencies causing overlinking.
+  * Ensure server proof has been validated during SCRAM conversation.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Clyde Bazile
+  * Andreas Braun
+  * Roberto C. Sánchez
+  * Samantha Ritter
+  * Isabel Atkinson
+  * Kaitlin Mahar
+  * Diego Barrios Romero
+  * Sara Golemon
+  * Vasil Velichkov
+  * EGuesnet
+
+Peace,
+
+    Kevin Albertson
+
+mongo-c-driver 1.15.3
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.3.
+
+Bug fixes:
+    * Fix a hang on macOS when connecting to a server over TLS
+    * Add zstd as a dependency when libmongoc static library is compiled with zstd support
+    * Fix compilation on AIX 6.1
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Samantha Ritter
+  * EGuesnet
+
+mongo-c-driver 1.15.2
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.2.
+
+Bug fixes:
+   * Prevent mongoc_transaction_opts_set_max_commit_time_ms from applying to subsequent transactions that should be using the default.
+   * Do not report the initial error if a retry for a change stream function (mongoc_collection_watch, mongoc_database_watch, or mongoc_client_watch) succeeds
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+  * Clyde Bazile
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.15.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.1.
+
+Bug fixes:
+   * Fix change stream resume logic when no documents received
+   * Reduce the required cmake version to build with zstd support
+   * Minor fixes to mongos pinning logic
+   * Do not resume a change stream on NonResumableChangeStreamError
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Clyde Bazile
+
+Peace,
+
+    Clyde Bazile
+
+mongo-c-driver 1.15.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.0. This release adds
+support for MongoDB 4.2 features.
+
+Features:
+
+  * Support for sharded transactions on MongoDB sharded clusters 4.2+.
+  * Add convenient transaction runner (mongoc_client_session_with_transaction),
+    which accepts a callback and performs appropriate retry logic.
+  * Add a new transaction option to specify maximum time to wait for a commit,
+    mongoc_transaction_opts_set_max_commit_time_ms.
+  * Add URI option "retryReads=true" safely and automatically retries certain
+    read operations if the server is a MongoDB 3.6+.
+  * Poll SRV records to mongos servers periodically.
+  * Keep connections alive after a primary stepdown detected.
+  * Standardizes URI options supported across all spec-compliant MongoDB drivers.
+  * "retryWrites" URI option now defaults to true (requires crypto for session
+    support).
+  * Send any aggregate with $out or $merge stage to a primary.
+  * Add the ability to specify an aggregate pipeline as an update document.
+  * Add a database aggregate helper, mongoc_database_aggregate.
+  * Add option for change streams, "startAfter".
+  * Add mongoc_change_stream_get_resume_token, which returns the resume token
+    which should be used to resume a change stream.
+  * Add support for zstd compression.
+
+Bug fixes:
+  * Correctly report an error in mongoc_change_stream_next if the resume token
+    (_id) is not a document. Previously, an error was only reported if the
+    field was missing.
+  * Fix mongoc_collection_update with MONGOC_UPDATE_MULTI_UPDATE,
+    mongoc_collection_remove, and mongoc_collection_delete when retryWrites
+    was enabled. They would fail previously.
+  * Command options are now correctly taken into account when batching bulk
+    writes for OP_QUERY. It was possible to exceed the maximum document size
+    before.
+  * Fix a crash if a multi-batch bulk write with OP_MSG errored on a batch.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Haris Sheikh
+  * Samantha Ritter
+  * Isabel Atkinson
+  * Sara Golemon
+  * Clyde Bazile
+  * Roberto C. Sánchez
+  * Lior Kaplan
+  * pasniak
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.14.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.14.1.
+
+Bug fixes:
+
+  * Prohibit starting a transaction for pre-4.0 MongoDB servers.
+  * Prohibit starting a sharded transaction for pre-4.2 MongoDB servers.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Jeremy Mikola
+  * Clyde Bazile
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.14.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.14.0.
+
+
+Features:
+
+  * Support for OpenSSL 1.1.1 and its implementation of TLS v1.3.
+  * New function mongoc_stream_should_retry.
+  * New accessor mongoc_server_description_last_update_time.
+  * New method mongoc_client_reset to be called after forking.
+
+Bug fixes:
+
+  * OP_MSG with unacknowledged writes (write concern of w:0) would serialize
+    incorrectly on big-endian platforms, causing writes to use the default
+    write concern of w:1.
+  * mongoc_collection_update_many and mongoc_collection_delete_many would fail
+    with the URI option retryWrites=true.
+  * In a transaction, the driver now properly ignores the readConcern configured
+    on a client, database, or collection: only the mongoc_transaction_opt_t's
+    readConcern is used.
+  * Remove timestamp from uninstall scripts to permit reproducible build.
+  * Setting mongoc_ssl_opt_t.pem_file or ca_file to a bad file path caused a
+    hang with Darwin SSL.
+  * Fix the ENABLE_SASL cmake option:
+    * Remove unnecessary GSSAPI value. It was equivalent to specifying ENABLE_SASL=CYRUS.
+    * ENABLE_SASL=AUTO now correctly chooses SSPI on Windows instead of CYRUS.
+  * The client pool failed to set proper apm callbacks for clients created
+    via try_pop().
+
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Roberto C. Sánchez
+  * Kevin Albertson
+  * Samantha Ritter
+  * Spencer McKenney
+  * Henrik Edin
+  * Jeremy Mikola
+  * Evgeni Dobranov
+  * Derick Rethans
+  * 平民·寻梦(Pingmin Fenlly Liu)
+  * David Carlier
+  * Gustaf Neumann
+  * Jeroen
+  * Jeroen Ooms
+  * Kaitlin Mahar
+  * Tomas Mozes
+  * Clyde Bazile
+
+Peace,
+
+    Samantha Ritter
+
+
+mongo-c-driver 1.13.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.13.1.
+
+Bug fixes:
+
+  * mongoc_collection_update_many and mongoc_collection_delete_many would fail
+    with the URI option retryWrites=true.
+  * Remove timestamp from uninstall scripts to permit reproducible build.
+  * Add missing header files to the release tarball to fix compilation when
+    configuring with ENABLE_SASL=GSSAPI.
+  * Separate libmongoc and libbson uninstall scripts so they do not overwrite
+    each other.
+  * Fix running make install with DESTDIR.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * A. Jesse Jiryu Davis
+  * Henrik Edin
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.13.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.13.0.
+
+Features:
+
+  * Report a new error code, MONGOC_ERROR_GRIDFS_CORRUPT, when a chunk larger
+    than chunkSize is detected. Before, the driver had crashed with an assert.
+  * Restructure of install directory. All mongoc headers are under mongoc/
+    and all bson headers are under bson/. The preferred way of including the
+    headers are mongoc/mongoc.h and bson/bson.h respectively.
+    Forwarding headers in the root are provided for backwards compatibility.
+  * The default CMake build type had been unspecified, now it is RelWithDebInfo.
+  * Support LibreSSL 2.7+.
+
+Bug fixes:
+
+  * mongoc_collection_replace_one is now a correctly exported symbol.
+  * Fix multiple issues with readConcern and writeConcern inheritance.
+  * Fix rare crash with mongodb+srv URIs on Windows.
+  * mongoc_gridfs_create_file_from_stream ignored errors while writing chunks
+    to the server.
+  * The following functions should not have taken a "bypassDocumentValidation"
+    option in bson_t *opts, the option is now prohibited:
+    - mongoc_bulk_operation_insert_with_opts
+    - mongoc_bulk_operation_update_one_with_opts
+    - mongoc_bulk_operation_update_many_with_opts
+    - mongoc_bulk_operation_replace_one_with_opts
+  * The heartbeat-succeeded and heartbeat-failed events (part of SDAM
+    Monitoring) had uninitialized "duration" fields, they are now set correctly.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Roberto C. Sánchez
+  * Kevin Albertson
+  * Henrik Edin
+  * Spencer McKenney
+  * Jeremy Mikola
+  * Evgeni Dobranov
+  * Tomas Mozes
+  * Derick Rethans
+  * Gustaf Neumann
+  * Jeroen Ooms
+  * Kaitlin Mahar
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.12.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.12.0.
+
+Features:
+
+  * New function mongoc_client_session_in_transaction to check if a multi-
+    document transaction is started.
+  * New examples for change streams and transactions, improved guide for
+    migrating from mongoc_collection_count to mongoc_collection_count_documents
+
+Bug fixes:
+
+  * Fix occasional crash in sharded queries
+  * Retry all retryable write concern errors
+  * mongoc_client_session_commit_transaction sets the correct error label when
+    the primary is unavailable
+  * mongoc_collection_find_with_opts had prohibited read preference "primary"
+    in a transaction
+  * mongoc_collection_aggregate had not inherited its mongoc_collection_t's
+    read preference; only an explicitly provided read preference was used.
+  * Allow unencoded delimiters in username/password if unambiguous
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Roberto C. Sánchez
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+  * Spencer McKenney
+  * Evgeni Dobranov
+  * Jeremy Mikola
+  * 平民·寻梦(Pingmin Fenlly Liu)
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.11.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.11.0. This release adds
+support for MongoDB 4.0 features. It includes the following additions and
+improvements:
+
+  * Multi-document transactions, see mongoc_client_session_start_transaction
+  * New function mongoc_error_has_label to check for specific error labels such
+    as "TransientTransactionError" or "UnknownTransactionCommitResult" in
+    error replies.
+  * New functions to subscribe to changes on an entire client or database:
+    - mongoc_client_watch
+    - mongoc_database_watch
+  * New option for change streams, "startAtOperationTime".
+  * mongoc_collection_count_with_opts is deprecated for two new functions:
+    - mongoc_collection_count_documents
+    - mongoc_collection_estimated_document_count
+  * Support for SCRAM-SHA-256 authentication, including support for non-ASCII
+    passwords using libicu is an optional dependency.
+  * Faster mongoc_database_get_collection_names_with_opts fetches only names,
+    not the entire collection metadata.
+
+Additional changes not specific to MongoDB 4.0:
+
+  * All "destroy" functions such as mongoc_collection_destroy now ignore a NULL
+    argument.
+  * The driver now returns an error if you attempt to use "arrayFilters" in an
+    update with a MongoDB server older than 3.6.
+  * Update functions include a new "upsertedCount" field in the reply document.
+  * Replace MD5 with FNV-1a hash to generate ObjectIds (for FIPS compliance).
+
+Bug fixes:
+
+  * Functions incorrectly marked with the "const" compiler attribute are now
+    marked as "pure", fixes build error when link-time optimization is enabled.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+  * Evgeni Dobranov
+  * Spencer McKenney
+  * Jeremy Mikola
+  * Roberto C. Sánchez
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.3
+=====================
+
+No change since 1.10.2; released to keep pace with libbson's version.
+
+-- A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.2
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.10.2. This release fixes
+the libbson and libmongoc installed library filenames and SONAMEs on Linux.
+They had changed unintentionally with the switch to CMake in 1.10.0; they are
+now consistent with 1.9.x and previous releases. Thanks to Roberto C. Sánchez
+for the fix.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.10.1. This release fixes
+the following bugs introduced in version 1.10.0:
+
+  * Client sessions were not prohibited with unacknowledged write concern and
+    mongoc_bulk_operation_execute; now they are prohibited. Client sessions have
+    been prohibited with all other unacknowledged writes since 1.10.
+  * The "arrayFilters" update option, new in MongoDB 3.6 and supported since
+    libmongoc 1.9.0, was inadvertently prohibited by
+    mongoc_bulk_operation_update_one_with_opts and
+    mongoc_bulk_operation_update_many_with_opts in 1.10. The option is now
+    permitted again.
+  * The mongoc-stat tool for displaying shared counters was disabled on Linux
+    and not installed; it is now restored.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.0
+=====================
+
+It is my pleasure to announce MongoDB C Driver 1.10.0. This version drops
+support for MongoDB 2.6 and adds the following features and bugfixes:
+
+  * libbson and libmongoc are now maintained in the mongo-c-driver repository,
+    although they are still built as separate libraries, and libbson can still
+    be used without libmongoc.
+  * Building libbson and libmongoc now requires CMake on all platforms. The
+    Autotools build scripts ("configure" and related scripts) have been deleted.
+    See the "installing" page for updated instructions, including the new
+    ENABLE_MONGOC option and changes to the ENABLE_BSON option.
+  * IPv6 is now fully supported and conforms to RFC-6555. If a hostname has both
+    IPv4 and IPv6 DNS records, the driver tries connecting with IPv6 first. If a
+    connection can't be established after 250ms then IPv4 is tried in parallel.
+    Whichever succeeds connection first cancels the other. The successful DNS
+    result is cached for 10 minutes.
+  * If CMake is configured with ENABLE_SSL=AUTO (the default), libmongoc now
+    uses native TLS libraries on Mac and Windows, and OpenSSL everywhere else.
+    Before, it would search for OpenSSL on all platforms and only use native
+    TLS on Mac and Windows as a fallback.
+  * The driver now handshakes SSL connections to multiple servers in a replica
+    set or sharded cluster in parallel, so long as it uses OpenSSL or Windows
+    SChannel. (SSL handshakes with Apple's Secure Transport are still serial.)
+    A larger receive buffer with SChannel increases performance over slow
+    connections.
+  * All functions that accept read concern now prohibit it, if MongoDB is too
+    old to support it (MongoDB 3.0).
+  * Client sessions are now prohibited with unacknowledged writes.
+  * mongoc_collection_find_and_modify_with_opts now prohibits write concern if
+    MongoDB is too old to support it (MongoDB 3.0).
+  * Other helper functions for commands that write, now prohibit write concern
+    if MongoDB is too old to support it (pre-3.4):
+      mongoc_client_read_write_command_with_opts
+      mongoc_client_write_command_with_opts
+      mongoc_collection_read_write_command_with_opts
+      mongoc_collection_write_command_with_opts
+      mongoc_database_read_write_command_with_opts
+      mongoc_database_write_command_with_opts
+      mongoc_collection_aggregate with $out
+      mongoc_collection_drop_index_with_opts
+      mongoc_collection_drop_with_opts
+      mongoc_collection_rename_with_opts
+      mongoc_database_drop_with_opts
+    Write concern behavior is unchanged for regular CRUD functions.
+  * Setting a negative writeConcern level of -2 or smaller, via the "opts"
+    parameter to functions that accept BSON options, is now prohibited. The
+    special "w" values -2 through -4 are only used internally. The deprecated
+    "w=-1" is still allowed, as a synonym for "w=0".
+  * The Kerberos URI option authMechanismProperties=CANONICALIZE_HOST_NAME:true
+    is now implemented with the Windows Kerberos provider, SSPI.
+  * This repository now includes GDB and LLDB customizations for pretty-printing
+    bson_t structs as JSON while debugging. See the "debugging" page.
+  * The internal preprocessor symbol HAVE_STRINGS_H has been renamed
+    BSON_HAVE_STRINGS_H. If you maintain a handwritten bson-config.h you must
+    rename this symbol.
+  * The following helper functions do not work with mongoc_client_session_t,
+    they are deprecated in favor of running MongoDB commands directly with a
+    function like mongoc_client_read_command_with_opts:
+      mongoc_client_get_server_status
+      mongoc_collection_stats
+      mongoc_collection_validate
+  * mongoc_cursor_is_alive is now deprecated for mongoc_cursor_more, which is
+    functionally equivalent.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Jeremy Mikola
+  * Xiangyu Yao
+  * Jeroen Ooms
+  * Derick Rethans
+  * Kaitlin Mahar
+  * Pavithra Vetriselvan
+  * NotSpooky
+  * Iulian Rotaru
+  * Katherine Walker
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.5
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.5. This release fixes the following bugs:
+
+  * New change streams API functions were not marked extern "C"
+  * mongoc_collection_watch now accepts a pipeline argument as a BSON array, in
+    addition to accepting a BSON document with a "pipeline" array field
+  * Crashes in several change stream error handling paths
+  * Commands could return false with an empty bson_error_t after a replica set
+    reconfig
+  * Network error messages omitted the command name when using OP_MSG
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.4
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.4. This release offers
+compatibility with Sphinx 1.7.0 and above and fixes two bugs:
+
+  * Ensure a change stream uses the proper session id while iterating
+  * Fix a rare crash in pooled mode when a replica set member was disconnected
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.3
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.3. This version fixes a
+session-management bug that could cause an authentication error while connected
+to MongoDB 3.6+ and iterating a cursor, and it permits the $gleStats modifier
+with mongoc_collection_aggregate.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.2
+====================
+
+No change since 1.9.1; released to keep pace with libbson's version number.
+
+-- A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.1. This release fixes a bug
+that caused session ID to be included in authentication and server monitoring
+commands. Thanks to Jeremy Mikola for finding and fixing the issue.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.0. This version drops support
+for MongoDB 2.4 and adds support for MongoDB 3.6 features:
+
+  * New struct mongoc_change_stream_t to watch a collection for changes.
+  * New struct mongoc_client_session_t represents a MongoDB 3.6 session,
+    which supports causal consistency: you are guaranteed to read your writes
+    and to perform monotonic reads, even when reading from secondaries or in
+    a sharded cluster.
+  * New functions that accept flexible options as a BSON document. These
+    accept a "sessionId" option and any future options. In addition, the
+    two new "update" functions accept the "arrayFilters" option that is new
+    in MongoDB 3.6:
+      mongoc_collection_insert_one
+      mongoc_collection_insert_many
+      mongoc_collection_update_one
+      mongoc_collection_update_many
+      mongoc_collection_replace_one
+      mongoc_collection_delete_one
+      mongoc_collection_delete_many
+      mongoc_client_command_with_opts
+      mongoc_database_command_with_opts
+      mongoc_collection_command_with_opts
+      mongoc_client_find_databases_with_opts
+      mongoc_client_get_database_names_with_opts
+      mongoc_collection_create_bulk_operation_with_opts
+      mongoc_collection_find_indexes_with_opts
+      mongoc_database_find_collections_with_opts
+      mongoc_database_get_collection_names_with_opts
+  * New URI option "retryWrites=true" safely and automatically retries certain
+    write operations if the server is a MongoDB 3.6 replica set or sharded
+    cluster.
+  * Support for MongoDB OP_MSG wire protocol.
+
+Additional changes not specific to MongoDB 3.6:
+
+  * Support for mongodb+srv URIs to query DNS for SRV and TXT records that
+    configure the connection to MongoDB.
+  * Support LibreSSL with CMake build
+  * The "minPoolSize" URI option is deprecated: it's confusing and not useful.
+
+Bug fixes:
+
+  * mongoc_bulk_operation_execute did not always initialize "reply".
+  * Fix C99 pedantic warnings.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jeremy Mikola
+  * Kevin Albertson
+  * Jeroen Ooms
+  * Iulian Rotaru
+  * Derick Rethans
+  * Graham Whitted
+  * Brian Moss
+  * Alex Masterov
+  * Michael Kuhn
+  * Sriharsha Vardhan
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.8.2
+====================
+
+It is my pleasure to announce mongo-c-driver 1.8.2. This release fixes the
+following bugs:
+
+  * Remove option to bundle the Snappy compression library, it caused issues
+    for programs linking to libmongoc
+  * Fix pkg-config and CMake config file flags for programs that statically
+    link to libmongoc when libmongoc is statically linked to zLib
+  * The configure flag "--with-zlib=no" was ignored
+    Crash in authentication when username is NULL
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Derick Rethans
+  * Hannes Magnusson
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.8.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.8.1. This release fixes the
+following bugs:
+
+  * Remove a syntax error in the configure script that affects some shells.
+  * The configure script respects --with-zlib=system and --with-snappy=system.
+  * The internal mongoc_server_description_t struct is properly reinitialized
+    after a network error.
+  * Fix the encoding of this NEWS file.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.8.0
+====================
+
+  * The zLib and Snappy compression libraries are bundled if not available.
+    Wire protocol compression is enabled on Windows.
+  * mongoc_collection_find_and_modify_with_opts now respects a "writeConcern"
+    field in the "extra" BSON document in its mongoc_find_and_modify_opts_t.
+  * The command functions mongoc_client_read_write_command_with_opts,
+    mongoc_database_read_write_command_with_opts, and
+    mongoc_collection_read_write_command_with_opts now ignore the "read_prefs"
+    parameter.
+  * mongoc_collection_create_index and mongoc_collection_create_index_with_opts
+    are both now deprecated. Use mongoc_database_write_command_with_opts
+    instead; a guide to creating an index using that function has been added.
+  * Use select, not WSAPoll, on Windows.
+  * Always mark a server "Unknown" after a network error (besides a timeout).
+  * mongoc_client_pool_t sends platform metadata to the server; before, only a
+    single mongoc_client_t did.
+  * New stream method mongoc_stream_timed_out.
+  * Wire version checks introduced in 1.8.0 will prevent the driver from
+    connecting to a future MongoDB server version if its wire protocol is
+    incompatible.
+  * New CMake option ENABLE_MAINTAINER_FLAGS.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jeremy Mikola
+
+Peace,
+
+   A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.7.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.7.0.
+
+New features and bug fixes:
+
+  * CMake build now installs .pc files for programs that link to libmongoc using
+    pkg-config. Both the CMake and Autotools build systems now install .cmake
+    files for programs that link to libmongoc using CMake. Linking to libmongoc
+    statically or dynamically is now much more convenient. See the new tutorial
+    section "Include and link libmongoc in your C program".
+  * New CMake option ENABLE_STATIC can be ON, OFF, or AUTO (the default)
+  * Minimum required CMake version has been increased to 3.1.
+  * CMake remains experimental on non-Windows platforms and issues a warning now
+  * Support for wire compression.
+    * Support for snappy and zlib. MongoDB 3.4 only supports snappy, while zlib
+      support is expected in MongoDB 3.6.
+      The enable, configure mongoc like so:
+      ./configure --with-snappy --with-zlib
+    * New functions: mongoc_uri_get_compressors & mongoc_uri_set_compressors, to
+      get and set compressor configuration on mongoc_uri_t
+    * Added support for comma separated "compressors" connection string option (e.g.
+      mongodb://localhost/?compressors=snappy,zlib)
+    * Added support for configuring zlib compression level in the connection string
+      (e.g. mongodb://localhost/?compressors=zlib&zlibcompressionlevel=8)
+  * Now requires the use of CMake config files for libbson to build libmongoc
+    with CMake
+  * Added pkg-config support for libressl.
+  * New function mongoc_uri_set_auth_mechanism to update the authentication
+    mechanism of a mongoc_uri_t after it is created from a string.
+  * New function mongoc_bulk_operation_insert_with_opts provides immediate
+    error checking.
+  * New function mongoc_uri_new_with_error provides a way to parse a connection
+    string, and retrieve the failure reason, if any.
+  * Support for MongoDB Connection String specification
+    * All connection string options are now represented by MONGOC_URI_xxx macros
+    * Paths to Unix Domain Sockets must be url encoded
+    * Repeated options now issue warnings
+    * Special characters in username, password and other values must be url encoded
+    * Unsupported connection string options now issue warnings
+    * Boolean values can now be represented as true/yes/y/t/1 and false/no/n/f/0.
+    * Case is now preserved in Unix domain paths.
+  * New function mongoc_cursor_error_document provides access to server's error
+    reply if a query or command fails.
+  * New function mongoc_write_concern_is_default determines whether any write
+    concern options have been set, and mongoc_read_concern_is_default checks if
+    read concern options are set.
+  * mongoc_gridfs_find_one_with_opts optimized to use limit 1.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Hannes Magnusson
+  * A. Jesse Jiryu Davis
+  * David Golden
+  * Jeremy Mikola
+  * Bernard Spil
+  * Aleksander Melnikov
+  * Adam Seering
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.6.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.6.0.
+
+New features and bug fixes:
+
+  * Enterprise authentication on Windows now uses the native GSSAPI library;
+    Cyrus SASL is no longer required for enterprise auth on Windows.
+  * BSON documents are more thoroughly validated before insert or update.
+  * New function mongoc_uri_set_mechanism_properties to replace all the
+    authMechanismProperties on an existing URI.
+  * mongoc_uri_get_mechanism_properties asserts its inputs are not NULL.
+  * For consistency with other MongoDB drivers, mongoc_collection_save is
+    deprecated in favor of mongoc_collection_insert or mongoc_collection_update.
+  * The driver is now built and continuously tested with MinGW-W64 on Windows.
+  * Experimental support for HPUX.
+  * The correct operation ids are now passed to Command Monitoring callbacks.
+  * Fix a crash if the driver couldn't connect to the server to create an index.
+  * The documentation is ported from Mallard XML to ReStructured Text, the
+    HTML documentation is restyled, and numerous man page syntax errors fixed.
+  * Getter functions for options in mongoc_find_and_modify_opts_t:
+    * mongoc_find_and_modify_opts_get_bypass_document_validation
+    * mongoc_find_and_modify_opts_get_fields
+    * mongoc_find_and_modify_opts_get_flags
+    * mongoc_find_and_modify_opts_get_max_time_ms
+    * mongoc_find_and_modify_opts_get_sort
+    * mongoc_find_and_modify_opts_get_update
+  * All public functions now have the __cdecl calling convention on Windows.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Aleksander Melnikov
+  * Jeroen Ooms
+  * Brian McCarthy
+  * Jonathan Wang
+  * Peter Beckman
+  * Remi Collet
+  * Rockford Wei
+  * Alexey Ponomarev
+  * Christopher Wang
+  * David Golden
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.5
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.5. This release fixes bugs
+parsing the localThresholdMS option from the MongoDB URI, and a crash in
+mongoc_cursor_destroy if "query" or "filter" are invalid. Thanks to Jeremy
+Mikola.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.4
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.4. This release fixes an error
+in cursor iteration when a readConcern is set. Thanks to Jeremy Mikola and
+Hannes Magnusson.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.3
+====================
+
+This release fixes a bug that prevented connecting to IPv4-only MongoDB servers
+by hostname.
+
+https://jira.mongodb.org/browse/CDRIVER-1988
+
+The driver has reverted to its 1.5.1 behavior: it connects to MongoDB over IPv6
+if given an IPv6 connection string like "mongodb://[::1]", and requires an IPv4
+connection when given a hostname like "mongodb://localhost".
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.2
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.2.
+
+Thanks to everyone who contributed to the development of this release.
+
+New bug fixes:
+  * CDRIVER-1975 allow mixed $ and non-$ query ops.
+  * CDRIVER-1972 Support for ipv6 hostnames.
+  * CDRIVER-1971 Missing exports of mongoc_gridfs_file_set_*() functions.
+  * CDRIVER-1970 update define constants for "find" opts to be unique.
+  * CDRIVER-1964 Windows CA stores should be opened with read-only flag.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Hannes Magnusson
+  * A. Jesse Jiryu Davis
+  * Alexey Ponomarev
+  * Peter Beckman
+  * Rockford Wei
+
+Peace,
+
+    Hannes Magnusson
+
+
+mongo-c-driver 1.5.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.1. This is a bugfix release:
+
+  * Fix SEGFAULT with performance counters on NUMA (thanks to Jonathan Wang).
+  * Prevent rare assertion error in mongoc_cluster_stream_for_server.
+  * Improve error messages from auth failure.
+  * Escape quotes when appending CFLAGS to handshake metadata.
+  * Fix OpenSSL header lookups in non-default paths.
+  * Fix build failure with LibreSSL.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jeroen Ooms
+  * Jonathan Wang
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.0.
+
+New features and bug fixes:
+  * MongoDB 3.4 Support
+    * New URI and read preference option, "maxStalenessSeconds"
+    * MongoDB Handshake
+    * writeConcern and readConcern enhancements
+    * Collation allows users to specify language-specific rules for string
+      comparison when sorting documents. See the code examples for
+      mongoc_client_read_command_with_opts, mongoc_collection_count_with_opts,
+      mongoc_collection_find_with_opts, and mongoc_index_opt_t, as well as the
+      "Setting Collation Order" section of the "Bulk Write Operations" guide.
+  * mongoc_collection_count_with_opts uses the collection's read preference if
+    none is passed in
+  * Improved TLS support
+    * Fixed LibreSSL (libssl) support
+    * Added LibreSSL (libtls) support
+    * Fixed Secure Channel build on VS 2010
+    * OpenSSL now supports SNI (all others already do)
+  * Additional features for Application Performance Monitoring:
+    * mongoc_topology_description_has_writable_server
+    * mongoc_topology_description_has_readable_server
+  * New functions accept flexible options as a BSON document:
+    * mongoc_collection_find_with_opts
+    * mongoc_client_read_command_with_opts
+    * mongoc_client_write_command_with_opts
+    * mongoc_client_read_write_command_with_opts
+    * mongoc_database_read_command_with_opts
+    * mongoc_database_write_command_with_opts
+    * mongoc_database_read_write_command_with_opts
+    * mongoc_collection_read_command_with_opts
+    * mongoc_collection_write_command_with_opts
+    * mongoc_collection_read_write_command_with_opts
+    * mongoc_gridfs_find_with_opts
+    * mongoc_gridfs_find_one_with_opts
+  * mongoc_collection_find is now deprecated in favor of
+    mongoc_collection_find_with_opts.
+  * New helper function to include read concern in one of the above function's
+    options parameter: mongoc_read_concern_append.
+  * mongoc_client_command no longer applies the client's read preference and
+    read concern by default. Same change for mongoc_database_command and
+    mongoc_collection_command.
+  * mongoc_collection_count_with_opts now applies the collection's read
+    preference if no read preference is provided
+  * mongoc_collection_create_index and mongoc_collection_drop_index now apply
+    the collection's write concern.
+  * connectTimeoutMS timer now begins after DNS resolution, and resets
+    for each interface attempted (e.g., if the driver first tries IPv6,
+    then IPv4).
+  * New error code MONGOC_ERROR_DUPLICATE_KEY.
+  * mongoc_collection_find no longer treats the "filter" key specially in
+    queries - querying for a document with a key named "filter" is the same
+    now as any other key.
+  * The server description parameter to the following functions is "const":
+    * mongoc_server_description_host
+    * mongoc_server_description_id
+    * mongoc_server_description_ismaster
+    * mongoc_server_description_round_trip_time
+    * mongoc_server_description_type
+  * Exported symbols are no longer declared in separate export files.
+    This could break ABI with applications using clang, which previously
+    exported symbols from the internal private ABI.
+  * mongoc no longer crashes when multi roundtrip bulk operation fails.
+  * Added support for the new readConcernLevel "linearizable".
+  * Clients now check for misformatted "readPreferenceTags" in URI.
+  * New CMake option ENABLE_TRACING allows debug output, which before had only
+    been available with "configure --enable-tracing".
+  * Bugfix: "PossiblePrimary"-type replicas could be selected for reads
+  * Bugfixes: The random number generator used to select servers is now properly
+    seeded, and secondary queries are now properly distributed according to
+    localThresholdMS, not just to the lowest-latency secondary.
+  * mongoc_collection_insert, mongoc_collection_update, mongoc_collection_remove
+    consistently use domain MONGOC_ERROR_BSON, code MONGOC_ERROR_BSON_INVALID
+    if passed oversized BSON, and MONGOC_ERROR_COLLECTION for other errors.
+    mongoc_bulk_operation_execute continues to use MONGOC_ERROR_COMMAND for
+    all errors.
+  * If mongoc_client_pool_t fails to start its scanner thread in the background,
+    it logs and aborts instead of silently continuing, then failing to connect.
+  * The driver now updates its view of the whole topology with information from
+    each new connection handshake.
+  * mongoc_client_set_apm_callbacks can be used repeatedly to change or clear
+    the list of monitoring callbacks.
+  * Improved error reporting when the driver fails to reach the server.
+
+Deprecations:
+  * mongoc_collection_find is deprecated for mongoc_collection_find_with_opts.
+
+Removed configure flags:
+  * --enable-experimental has been removed. All previously experimental
+    features are now always on.
+  * The configure option "--enable-hardening" had had no effect. It is removed
+    in favor of system-wide compiler configuration.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Fiona Rowan
+  * Ian Boros
+  * Remi Collet
+  * Brian McCarthy
+  * Jeroen Ooms
+  * J. Rassi
+  * Christoph Schwarz
+  * Alexey Vorobeyev
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.4.2
+====================
+
+It is my pleasure to announce mongo-c-driver 1.4.2. This release fixes bugs in
+"minPoolSize" logic, see CDRIVER-1558 for details.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.4.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.4.1. This is a bugfix release:
+
+  * mongoc_client_get_server_descriptions could return a list including NULLs
+  * Tailable cursors on MongoDB 3.2 only worked with MONGOC_QUERY_AWAIT_DATA
+  * Spurious warnings with MONGOC_DISABLE_SHM
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.4.0
+====================
+
+It is my pleasure to announce the release of mongo-c-driver 1.4.0.
+
+TLS
+---
+
+The driver can now use the native TLS and crypto functions included in macOS
+and Windows. OpenSSL is no longer required for TLS or authentication on Mac or
+Windows. By default, OpenSSL is used if available, the default will switch in
+version 2.0 to prefer native TLS.
+
+For native TLS on Mac:
+
+  ./configure --enable-ssl=darwin
+
+For Windows:
+
+  cmake "-DENABLE_SSL=WINDOWS" -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"
+
+All of the TLS implementations now load the native default certificate store,
+with OpenSSL on Windows falling back on the Windows native certificate store if
+no other can be found.
+
+The "ca_dir" field on mongoc_ssl_opt_t is only supported by OpenSSL. All other
+fields, including "pem_file", are supported by all implementations.
+
+A new field, "allow_invalid_hostname", has been added to mongoc_ssl_opt_t and is
+preferred over the existing "allow_invalid_certificate" to disable hostname
+verification.
+
+The driver now supports the latest OpenSSL 1.1 in addition to past versions.
+
+Application Performance Monitoring
+----------------------------------
+
+The driver implements the MongoDB Command Monitoring Spec. Applications can
+record the duration and other details of every operation the driver performs on
+the server. See "Introduction to Application Performance Monitoring" in the
+docs.
+
+Error API
+---------
+
+New functions mongoc_client_set_error_api and mongoc_client_pool_set_error_api
+allow applications to distinguish client and server errors. See the "Error
+Reporting" doc.
+
+Unacknowledged Write Results
+----------------------------
+
+Unacknowledged writes (writes whose mongoc_write_concern_t "w" value is zero)
+now reply with an empty document instead of one with nInserted: 0, nUpdated: 0,
+and so on.
+
+Command functions now ignore the read preferences set on a client, database,
+or collection. Instead, they use the mongoc_read_prefs_t passed in explicitly,
+or default to "primary". This change was made to bring them in line with the
+Server Selection Spec. These are the affected functions:
+
+  * mongoc_client_command
+  * mongoc_client_command_simple
+  * mongoc_database_command
+  * mongoc_database_command_simple
+  * mongoc_collection_command
+  * mongoc_collection_command_simple
+
+On the other hand, the following command-specific helper functions now use the
+collection's read preference:
+
+  * mongoc_collection_count
+  * mongoc_collection_stats
+
+New functions to send maxTimeMS or any arbitrary options with findAndModify:
+
+  * mongoc_find_and_modify_opts_set_max_time_ms
+  * mongoc_find_and_modify_opts_append
+
+New function to include a write concern with a generic command function
+like mongoc_client_command_simple:
+
+  * mongoc_write_concern_append
+
+Public API For Higher-Level Drivers
+-----------------------------------
+
+New functions support language drivers (specifically the PHP and HHVM drivers)
+using only the libmongoc public API:
+
+  * mongoc_bulk_operation_get_hint
+  * mongoc_client_command_simple_with_server_id
+  * mongoc_client_get_server_description
+  * mongoc_client_get_server_description_by_id
+  * mongoc_client_get_server_descriptions
+  * mongoc_client_select_server
+  * mongoc_cursor_get_limit
+  * mongoc_cursor_new_from_command_reply
+  * mongoc_cursor_set_hint
+  * mongoc_cursor_set_limit
+  * mongoc_log_trace_disable
+  * mongoc_log_trace_enable
+  * mongoc_server_description_ismaster
+  * mongoc_server_description_round_trip_time
+  * mongoc_server_description_type
+  * mongoc_server_descriptions_destroy_all
+  * mongoc_uri_get_option_as_bool
+  * mongoc_uri_get_option_as_int32
+  * mongoc_uri_get_option_as_utf8
+  * mongoc_uri_option_is_bool
+  * mongoc_uri_option_is_int32
+  * mongoc_uri_option_is_utf8
+  * mongoc_uri_set_auth_source
+  * mongoc_uri_set_database
+  * mongoc_uri_set_option_as_bool
+  * mongoc_uri_set_option_as_int32
+  * mongoc_uri_set_option_as_utf8
+  * mongoc_uri_set_password
+  * mongoc_uri_set_read_concern
+  * mongoc_uri_set_read_prefs_t
+  * mongoc_uri_set_username
+  * mongoc_uri_set_write_concern
+  * mongoc_write_concern_is_acknowledged
+  * mongoc_write_concern_is_valid
+  * mongoc_write_concern_journal_is_set
+
+Now that these public APIs are available, the PHP drivers no longer define the
+MONGOC_I_AM_A_DRIVER preprocessor symbol to access private APIs. The symbol is
+removed from C Driver headers, and libmongoc-priv.so is no longer installed.
+
+Other Features
+--------------
+
+  * New connection string option "localThresholdMS".
+  * zSeries and POWER8 platform support.
+  * Performance enhancements, reduce allocation and copying in command code.
+  * All man page names now begin with "mongoc_" to avoid install conflicts.
+  * New function mongoc_gridfs_file_set_id.
+
+Deprecations
+------------
+
+Automatically calling mongoc_init and mongoc_cleanup is a GCC-specific feature
+that is now deprecated, and will be removed in version 2. The driver should be
+built with:
+
+./configure --disable-automatic-init-and-cleanup
+
+Or:
+
+  cmake "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"
+
+In this configuration, applications must explicitly init and cleanup libmongoc.
+
+Deprecated functions:
+
+  * mongoc_write_concern_get_fsync
+  * mongoc_write_concern_set_fsync
+
+Notable Bug Fixes
+-----------------
+
+  * Logic bugs using tag sets to select replica set members with complex configs
+  * mongoc_client_get_database_names no longer filters out a replica set
+    member's "local" database.
+  * mongoc_client_get_gridfs now ensures the proper indexes on the files and
+    chunks collections.
+  * SecondaryPreferred fails if primary matches tags but secondaries don't.
+  * mongoc_collection_find_and_modify_with_opts can return true on
+    writeConcernError.
+  * mongoc_collection_validate doesn't always init "reply".
+  * The strings referred to by mongoc_ssl_opt_t, like pem_file and ca_file, are
+    now copied into the client or client pool by mongoc_client_set_ssl_opts or
+    mongoc_client_pool_set_ssl_opts, and need not be kept valid afterward.
+  * mongoc_collection_count_with_opts ignored flags and read_prefs.
+  * minPoolSize of 0 should mean "no minimum".
+  * mongoc_database_create_collection should always use the primary.
+  * The GSSAPI properties SERVICE_NAME and CANONICALIZE_HOST_NAME are now
+    properly parsed from the URI, see the "Authentication" doc for details.
+  * Comprehensive compatibility with various C standards and compilers.
+
+Acknowledgements
+----------------
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Ian Boros
+  * Fiona Rowan
+  * Jeremy Mikola
+  * Christoph Schwarz
+  * Mike Lloyd
+  * Remi Collet
+  * Jean-Bernard Jansen
+  * David Hatch
+  * Derick Rethans
+  * Brian Samek
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.5
+====================
+
+It is my pleasure to announce mongo-c-driver 1.3.5. This release fixes a crash
+in mongoc_cleanup when an allocator had been set with bson_mem_set_vtable, and
+introduces a configure option MONGOC_NO_AUTOMATIC_GLOBALS which prevents code
+built with GCC from automatically calling mongoc_init and mongoc_cleanup when
+your code does not.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.4
+====================
+
+It is my pleasure to announce the MongoDB C Driver 1.3.4. This release fixes a
+security vulnerability: when a mongoc_client_t uses SSL and is disconnected, it
+failed to re-verify the server certificate after reconnecting. This flaw affects
+single clients, not pooled ones.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.3
+====================
+
+It is my pleasure to announce MongoDB C Driver 1.3.3. This fixes a bug where
+a slightly-oversized bulk write operation was not split into batches; instead,
+it was sent whole to the server, which rejected it.
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.2
+====================
+
+It is my pleasure to announce MongoDB C Driver 1.3.2. This is a bugfix release:
+
+  * A socket is properly discarded after a network error from a command.
+  * mongoc_database_get_collection now copies the database's read preferences,
+    read concern, and write concern, instead of copying the client's.
+  * mongoc_cursor_t's private struct now allows a negative limit.
+
+Thanks to everyone who contributed to this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+  * Hannes Magnusson
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+
+mongo-c-driver 1.3.1
+====================
+
+It is my pleasure to announce MongoDB C Driver 1.3.1. This is a bugfix release:
+
+  * mongoc_client_get_gridfs now copies the client's read preferences, read
+    concern, and write concern to the newly created mongoc_gridfs_t. Before
+    this fix, GridFS operations were always executed with the default config:
+    data was read from the primary, with the read concern level "local", and
+    written with write concern "acknowledged". Now, if you have configured any
+    of these options on the mongoc_client_t, they are respected by the
+    mongoc_gridfs_t.
+  * CMakeLists.txt now includes and installs the pkg-config files.
+
+Thanks to everyone who contributed to this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Christopher Wang
+  * Jean-Bernard Jansen
+  * Jeremy Mikola
+  * Jeroen Ooms
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.0
+====================
+
+It is my pleasure to announce to you the release of the MongoDB C Driver 1.3.0.
+
+Changes since the release candidate 1.3.0-rc0:
+
+  * Fix a cursor bug introduced on big-endian platforms in 1.3.0-beta0.
+  * Improve documentation for mongoc_host_list_t.
+  * Move private mongoc_host_list_t functions from public header.
+  * Refactor the build system to declare library version in one place.
+
+All new features and changes since the previous stable release, 1.2.1:
+
+  * If the driver is compiled without SSL support but a URI with "ssl=true"
+    is passed to mongoc_client_new, mongoc_client_new_from_uri, or
+    mongoc_client_pool_new, the function logs an error and returns NULL. Before,
+    the driver would attempt a non-SSL connection.
+  * mongoc_collection_find_and_modify will now apply the mongoc_collection_t's
+    write_concern_t when talking to MongoDB 3.2.
+  * Support for MongoDB 3.2's "readConcern" feature for queries, counts, and
+    aggregations. The option "readConcernLevel" is now accepted in the MongoDB
+    URI. New struct mongoc_read_concern_t, and functions operating on it:
+   - mongoc_client_get_read_concern
+   - mongoc_client_set_read_concern
+   - mongoc_database_get_read_concern
+   - mongoc_database_set_read_concern
+   - mongoc_collection_get_read_concern
+   - mongoc_collection_set_read_concern
+   - mongoc_read_concern_copy
+   - mongoc_read_concern_destroy
+   - mongoc_read_concern_get_level
+   - mongoc_read_concern_new
+   - mongoc_read_concern_set_level
+   - mongoc_uri_get_read_concern
+  * Support for MongoDB 3.2's "bypassDocumentValidation" option for writes.
+  * New struct mongoc_bulk_write_flags_t and related functions:
+   - mongoc_bulk_operation_set_bypass_document_validation
+  * New struct mongoc_find_and_modify_opts_t and related functions:
+   - mongoc_find_and_modify_opts_new
+   - mongoc_find_and_modify_opts_destroy
+   - mongoc_find_and_modify_opts_set_sort
+   - mongoc_find_and_modify_opts_set_update
+   - mongoc_find_and_modify_opts_set_fields
+   - mongoc_find_and_modify_opts_set_flags
+   - mongoc_find_and_modify_opts_set_bypass_document_validation
+   - mongoc_collection_find_and_modify_with_opts
+  * New functions to copy database and collection handles:
+   - mongoc_collection_copy
+   - mongoc_database_copy
+  * Support for MongoDB 3.2 wire protocol: use commands in place of OP_QUERY,
+    OP_GETMORE, and OP_KILLCURSORS messages.
+  * To explain a query plan with MongoDB 3.2, you must now call the "explain"
+    command, instead of including the "$explain" key in a mongoc_collection_find
+    query. See the mongoc_collection_find documentation page for details.
+  * Configurable wait time on tailable cursors with MongoDB 3.2:
+   - mongoc_cursor_get_max_await_time_ms
+   - mongoc_cursor_set_max_await_time_ms
+  * Use electionId to detect a stale replica set primary during a network split.
+  * Disconnect from replica set members whose "me" field does not match the
+    connection address.
+  * The client side matching feature, mongoc_matcher_t and related functions,
+    are deprecated and scheduled for removal in version 2.0.
+  * New CMake options ENABLE_SSL, ENABLE_SASL, ENABLE_TESTS, and ENABLE_EXAMPLES.
+  * Use constant-time comparison when verifying credentials.
+  * Combine environment's CFLAGS with configure options when building.
+  * Improved man page output and "whatis" entries.
+
+There are extensive bugfixes and improvements in GridFS since 1.2.1, including:
+
+  * Handle seeking, reading, and writing past the end of a GridFS file.
+  * If a GridFS chunk is missing, mongoc_gridfs_file_readv sets file->error to
+    domain MONGOC_ERROR_GRIDFS and a new code MONGOC_ERROR_GRIDFS_CHUNK_MISSING.
+  * Optimization for long seeks forward with mongoc_gridfs_file_seek.
+
+Other fixes since 1.2.1:
+
+  * Memory leaks in mongoc_database_has_collection and mongoc_cursor_next.
+  * Report writeConcern failures from findAndModify and from legacy writes.
+  * Memory leak in mongoc_database_find_collections.
+  * Set OP_QUERY's nToReturn from the provided limit.
+  * Fix compiler warnings and errors, especially with Visual Studio 2015,
+    GCC 4.8, and IBM XL C.
+  * Bugs and typos in tutorial examples.
+
+Thanks to everyone who contributed to this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * Jose Sebastian Battig
+  * Matt Cotter
+  * Claudio Canella
+  * alexeyvo
+  * Christopher Wang
+  * Flavio Medeiros
+  * Iago Rubio
+  * Jeremy Mikola
+  * Victor Leschuk
+  * Jason Carey
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.0-rc0
+========================
+
+It is my pleasure to announce to you the first release candidate of MongoDB C
+driver 1.3.0. It includes additive ABI changes and bugfixes, and support for
+the upcoming MongoDB 3.2. It is compatible with MongoDB 2.4 and later.
+
+New features and changes since 1.3.0-beta0:
+
+  * If the driver is compiled without SSL support but a URI with "ssl=true"
+    is passed to mongoc_client_new, mongoc_client_new_from_uri, or
+    mongoc_client_pool_new, the function logs an error and returns NULL. Before,
+    the driver would attempt a non-SSL connection.
+  * New functions to copy database and collection handles:
+   - mongoc_collection_copy
+   - mongoc_database_copy
+  * If a GridFS chunk is missing, mongoc_gridfs_file_readv sets file->error to
+    domain MONGOC_ERROR_GRIDFS and a new code MONGOC_ERROR_GRIDFS_CHUNK_MISSING.
+  * Use electionId to detect a stale replica set primary during a network split.
+  * Disconnect from replica set members whose "me" field does not match the
+    connection address.
+  * The client side matching feature, mongoc_matcher_t and related functions,
+    are deprecated and scheduled for removal in version 2.0.
+  * New CMake options ENABLE_SSL, ENABLE_SASL, ENABLE_TESTS, and ENABLE_EXAMPLES.
+  * The build system is refactored to declare the current version and latest
+    release in one place.
+
+Other fixes:
+
+  * Memory leaks in mongoc_database_has_collection and mongoc_cursor_next.
+  * Report writeConcern failures from findAndModify and from legacy writes.
+
+Thanks to everyone who contributed to this release candidate.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Matt Cotter
+  * Claudio Canella
+  * Victor Leschuk
+  * Flavio Medeiros
+  * Christopher Wang
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.0-beta0
+==========================
+
+It is my pleasure to announce to you the beta of MongoDB C driver 1.3.0.
+This beta includes additive ABI changes and bugfixes, and support for
+the upcoming MongoDB 3.2. It is compatible with MongoDB 2.4 and later.
+
+New features and changes:
+
+  * mongoc_collection_find_and_modify will now apply the mongoc_collection_t's
+    write_concern_t when talking to MongoDB 3.2.
+  * Support for MongoDB 3.2's "readConcern" feature for queries, counts, and
+    aggregations. The option "readConcernLevel" is now accepted in the MongoDB
+    URI. New struct mongoc_read_concern_t, and functions operating on it:
+   - mongoc_client_get_read_concern
+   - mongoc_client_set_read_concern
+   - mongoc_database_get_read_concern
+   - mongoc_database_set_read_concern
+   - mongoc_collection_get_read_concern
+   - mongoc_collection_set_read_concern
+   - mongoc_read_concern_copy
+   - mongoc_read_concern_destroy
+   - mongoc_read_concern_get_level
+   - mongoc_read_concern_new
+   - mongoc_read_concern_set_level
+   - mongoc_uri_get_read_concern
+  * Support for MongoDB 3.2's "bypassDocumentValidation" option for writes.
+  * New struct mongoc_bulk_write_flags_t and related functions:
+   - mongoc_bulk_operation_set_bypass_document_validation
+  * New struct mongoc_find_and_modify_opts_t and related functions:
+   - mongoc_find_and_modify_opts_new
+   - mongoc_find_and_modify_opts_destroy
+   - mongoc_find_and_modify_opts_set_sort
+   - mongoc_find_and_modify_opts_set_update
+   - mongoc_find_and_modify_opts_set_fields
+   - mongoc_find_and_modify_opts_set_flags
+   - mongoc_find_and_modify_opts_set_bypass_document_validation
+   - mongoc_collection_find_and_modify_with_opts
+  * Configurable wait time on tailable cursors with MongoDB 3.2:
+   - mongoc_cursor_get_max_await_time_ms
+   - mongoc_cursor_set_max_await_time_ms
+  * Support for MongoDB 3.2 wire protocol: use commands in place of OP_QUERY,
+    OP_GETMORE, and OP_KILLCURSORS messages.
+  * To explain a query plan with MongoDB 3.2, you must now call the "explain"
+    command, instead of including the "$explain" key in a mongoc_collection_find
+    query. See the mongoc_collection_find documentation page for details.
+  * Use constant-time comparison when verifying credentials.
+  * Combine environment's CFLAGS with configure options when building.
+  * Improved man page output and "whatis" entries.
+
+Extensive bugfixes and improvements in GridFS, including:
+
+  * Handle seeking, reading, and writing past the end of a GridFS file.
+  * Optimization for long seeks forward with mongoc_gridfs_file_seek.
+
+Other fixes:
+
+  * Memory leak in mongoc_database_find_collections.
+  * Set OP_QUERY's nToReturn from the provided limit.
+  * Fix compiler warnings and errors, especially with Visual Studio 2015,
+    GCC 4.8, and IBM XL C.
+  * Bugs and typos in tutorial examples
+
+Thanks to everyone who contributed to this beta release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * Jose Sebastian Battig
+  * Jeremy Mikola
+  * Iago Rubio
+  * Matt Cotter
+  * alexeyvo
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.2
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.2.2.
+
+This release fixes a rare bug where the driver can direct reads to hidden
+secondaries unintentionally. It also includes fixes and improvements to the
+build system.
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.1
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.2.1.
+
+This release includes critical bugfixes for SSL connections with
+mongoc_client_pool_t, and for Unix domain socket connections.
+
+The documentation is updated for a change introduced in version 1.2.0:
+mongoc_client_set_ssl_opts and mongoc_client_pool_set_ssl_opts now configure
+the driver to require an SSL connection to the server, even if "ssl=true" is
+omitted from the MongoDB URI. Before, SSL options were ignored unless
+"ssl=true" was included in the URI.
+
+The build instructions are improved, including the steps to build with OpenSSL
+on OS X El Capitan. Build errors and warnings are fixed for clang in gnu99
+mode and MinGW.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Tamas Nagy
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.2.0.
+
+This is a stable release with additive ABI changes and bugfixes. It is
+compatible with MongoDB version 2.4 and later.
+
+The following notes summarize changes since the previous stable release,
+1.1.11, including changes in the 1.2.0 betas and release candidate.
+
+This version rewrites mongoc_client_t's internals to match two important new
+specs for MongoDB drivers: the Server Discovery And Monitoring Spec and the
+Server Selection Spec. The rewritten client has many advantages:
+
+  * All replica set members or mongos servers are discovered and periodically
+    checked in parallel. The driver's performance is dramatically better and
+    more predictable with multi-server deployments, or with a flaky network,
+    or when some servers are slow or down.
+  * Clients from the same mongoc_client_pool_t share a background thread that
+    discovers and monitors all servers in parallel.
+  * Unnecessary round trips for server checks and pings are eliminated.
+  * Behavior is documented in the specs, and consistent with other drivers,
+    even in complex or unusual scenarios.
+  * The URI's "replicaSet" option is enforced: the driver now refuses to connect
+    to a server unless it is a member of a replica set with the correct setName.
+  * Many race conditions related to changing deployment conditions are fixed.
+
+To conform to the new specs, the client now accepts these options in the
+MongoDB URI; see the mongoc_uri_t documentation for details:
+
+  * heartbeatFrequencyMS
+  * serverSelectionTimeoutMS
+  * serverSelectionTryOnce
+  * socketCheckIntervalMS
+
+Other features:
+
+  * All timeouts that can be configured in the URI now interpret 0 to mean "use
+    the default value for this timeout".
+  * The client's read preference can be configured in the URI with the new
+    options "readPreference" and "readPreferenceTags"; see the mongoc_uri_t
+    documentation.
+  * The new mongoc_uri_get_read_prefs_t function retrieves both the read mode
+    and tags from a mongoc_uri_t.
+  * New accessors mongoc_gridfs_file_get_id, mongoc_client_get_default_database,
+    and mongoc_bulk_operation_get_write_concern.
+  * Debug tracing can be controlled at runtime with mongoc_log_trace_enable and
+    mongoc_log_trace_disable.
+  * Set mongoc_client_pool_t's size with mongoc_client_pool_min_size()
+    and mongoc_client_pool_max_size().
+
+Other changes:
+
+  * Enable runtime asserts in release build.
+  * The libbson submodule's URL now uses the recommended https://, not git://
+  * mongoc_client_kill_cursor is now deprecated and will be removed in 2.0.
+  * The write concern "w=-1" is documented as obsolete.
+
+These notable bugs have been fixed since 1.1.11:
+
+  * The driver now uses the server's maxWireVersion to avoid an error and
+    extra round-trip when executing aggregations on MongoDB 2.4 and older.
+  * Much improved reporting of network errors, unavailable servers, and
+    authentication failure
+  * Off-by-one error in mongoc_gridfs_file_seek with mode SEEK_END
+  * The writeConcernErrors field of bulk results is properly formatted.
+  * A cursor with a server "hint" sets slaveOkay and / or $readPreference.
+  * Destroying an exhaust cursor must close its socket
+  * "wtimeoutms" was ignored for write concerns besides "majority".
+  * Bulk write operations might fail in mixed-version sharded clusters with
+    some pre-2.6 mongos servers.
+  * A variety of bugs and incorrect results in mongoc_bulk_operation_execute.
+  * Numerous compiler warnings and build failures on various platforms.
+  * Copious refinements to the documentation.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * Jason Carey
+  * Samantha Ritter
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * Jeremy Mikola
+  * Remi Collet
+  * Jose Sebastian Battig
+  * Derick Rethans
+  * Yuchen Xie
+  * Manuel Schoenlaub
+  * Sujan Dutta
+  * Lloyd Zhou
+  * rubicks
+  * Pawel Szczurko
+  * Yuval Hager
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0-rc0
+========================
+
+It is my pleasure to announce the release candidate of the MongoDB C driver
+1.2.0. It includes features and bugfixes developed since 1.2.0-beta1.
+
+Notable bugs fixed:
+
+  * Much improved reporting of network errors, unavailable servers, and
+    authentication failure
+  * Destroying an exhaust cursor must close its socket
+  * Various bugs in server reconnection logic
+  * mongoc_collection_aggregate returned invalid cursor after failure
+  * Wrong error message after failed network write on Sparc
+  * Missing JSON test files in release tarball
+
+Other changes:
+
+  * Enable runtime asserts in release build.
+  * mongoc_client_kill_cursor is now deprecated and will be removed in
+    version 2.0.
+
+This release candidate also includes all bugfixes from 1.1.11.
+
+Version 1.2.0 final will be a stable release with additive ABI changes and
+bugfixes. It is compatible with MongoDB version 2.4 and later.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * rubicks
+  * Jose Sebastian Battig
+  * Jason Carey
+  * Remi Collet
+  * Yuval Hager
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0-beta1
+==========================
+
+It is my pleasure to announce the second beta release of the MongoDB C driver
+1.2.0. It includes features and bugfixes developed since 1.2.0-beta.
+
+New features:
+
+  * Set mongoc_client_pool_t's size with mongoc_client_pool_min_size()
+    and mongoc_client_pool_max_size().
+  * The write concern "w=-1" is now documented as obsolete.
+  * Abundant fixes and additions to the documentation, beyond those in the
+    previous beta.
+
+Notable bugs fixed:
+
+  * Crashes and races in several replica set scenarios.
+  * The driver now uses the server's maxWireVersion to avoid an error and
+    extra round-trip when executing aggregations on MongoDB 2.4 and older.
+  * Fixed network error handling in multiple code paths.
+  * connectTimeoutMS limits the time the driver can spend reconnecting to
+    servers in single-threaded (non-pooled) mode with serverSelectionTryOnce.
+
+Version 1.2.0 final will be a stable release with additive ABI changes and
+bugfixes. It is compatible with MongoDB version 2.4 and later.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Manuel Schoenlaub
+  * Kyle Suarez
+  * Remi Collet
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0-beta
+=========================
+
+It is my pleasure to announce to you the first beta release of the MongoDB C
+driver 1.2.0.
+
+This release is a stable release with additive ABI changes and bugfixes.
+It is compatible with MongoDB version 2.4 and later.
+
+Version 1.2.0 rewrites mongoc_client_t's internals to match two important new
+specs for MongoDB drivers: the Server Discovery And Monitoring Spec and the
+Server Selection Spec. The rewritten client has many advantages:
+
+  * All replica set members or mongoses are discovered and periodically
+    checked in parallel. The driver's performance is dramatically better and
+    more predictable with multi-server deployments, or with a flaky network,
+    or when some servers are slow or down.
+  * Clients from the same mongoc_client_pool_t share a background thread that
+    discovers and monitors all servers in parallel.
+  * Unnecessary round trips for server checks and pings are eliminated.
+  * Behavior is documented in the specs, and consistent with other drivers, even
+    in complex or unusual scenarios.
+  * The URI's "replicaSet" option is enforced: the driver now refuses to connect
+    to a server unless it is a member of a replica set with the right setName.
+  * Many race conditions related to changing deployment conditions are fixed.
+
+To conform to the new specs, the client now accepts these options in the MongoDB
+URI; see the mongoc_uri_t documentation for details:
+
+  * heartbeatFrequencyMS
+  * serverSelectionTimeoutMS
+  * serverSelectionTryOnce
+  * socketCheckIntervalMS
+
+Other features:
+
+  * All timeouts that can be configured in the URI now interpret 0 to mean "use
+    the default value for this timeout".
+  * The client's read preference can be configured in the URI with the new
+    options "readPreference" and "readPreferenceTags", see the mongoc_uri_t
+    documentation.
+  * The new mongoc_uri_get_read_prefs_t function retrieves both the read mode
+    and tags from a mongoc_uri_t.
+  * New accessors mongoc_gridfs_file_get_id, mongoc_client_get_default_database,
+    and mongoc_bulk_operation_get_write_concern.
+  * Debug tracing can be controlled at runtime with mongoc_log_trace_enable and
+    mongoc_log_trace_disable.
+
+Notable bugs fixed:
+
+  * "wtimeoutms" was ignored for write concerns besides "majority".
+  * Bulk write operations might fail in mixed-version sharded clusters with
+    some pre-2.6 mongos servers.
+  * Normal operations were logged during startup and could not be silenced.
+  * A variety of bugs and incorrect results in mongoc_bulk_operation_execute.
+  * Numerous compiler warnings and build failures on various platforms.
+  * Copious refinements to the documentation.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Sujan Dutta
+  * Jason Carey
+  * Hannes Magnusson
+  * Jeremy Mikola
+  * Derick Rethans
+  * Samantha Ritter
+  * Yuchen Xie
+  * Lloyd Zhou
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.11
+=====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.1.11.
+
+This is a patch release with bug fixes:
+
+  * Undetected network errors when sending messages to the server
+  * Off-by-one error in mongoc_gridfs_file_seek with mode SEEK_END
+  * Memory leak parsing a URI that contains an invalid option
+  * The libbson submodule's URL now uses the recommended https://, not git://
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jason Carey
+  * Jose Sebastian Battig
+  * rubicks
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.10
+=====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.1.10.
+
+This is a patch release with bug fixes:
+
+  * Occasional crash reconnecting to replica set.
+  * Queries sent to recovering replica set members.
+  * Memory leak when calling ismaster on replica set members.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Daniil Zaitsev
+  * Jason Carey
+  * Jeremy Mikola
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.9
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.1.9.
+
+This release fixes a common crash in 1.1.8, which itself was introduced while
+fixing a rare crash in 1.1.7. For further details:
+
+https://jira.mongodb.org/browse/CDRIVER-721
+https://jira.mongodb.org/browse/CDRIVER-695
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.8
+====================
+
+UPDATE: 1.1.8 suffered a severe new bug so I removed the release from GitHub:
+
+https://jira.mongodb.org/browse/CDRIVER-721
+
+This is a patch release with bug fixes:
+
+  * Crash freeing client after a replica set auth error.
+  * Compile error strict C89 mode.
+
+mongo-c-driver 1.1.7
+====================
+
+It is my pleasure to announce to you the 1.1.7 release of the MongoDB C driver.
+
+This is a patch release with bug fixes:
+
+  * Thread-safe use of Cyrus SASL library.
+  * Experimental support for building with CMake and SASL.
+  * Faster reconnection to replica set with some hosts down.
+  * Crash iterating a cursor after reconnecting to a replica set.
+  * Unchecked errors decoding invalid UTF-8 in MongoDB URIs.
+  * Fix error reporting from mongoc_client_get_database_names.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Jason Carey
+  * Hannes Magnusson
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.6
+====================
+
+It is my pleasure to announce to you the 1.1.6 release of the MongoDB C driver.
+
+This is a patch release with performance enhancements and bug fixes:
+
+  * mongoc_bulk_operation_execute now coalesces consecutive update operations
+    into a single message to a MongoDB 2.6+ server, yielding huge performance
+    gains. Same for remove operations. (Inserts were always coalesced.)
+  * Large numbers of insert operations are now properly batched according to
+    number of documents and total data size.
+  * GSSAPI / Kerberos auth now works.
+  * The driver no longer tries three times in vain to reconnect to a primary,
+    so socketTimeoutMS and connectTimeoutMS now behave *closer* to what you
+    expect for replica sets with down members. A full fix awaits 1.2.0.
+
+I snuck in a feature:
+
+  * mongoc_matcher_t now supports basic subdocument and array matching
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Jason Carey
+  * Kai Mast
+  * Matt Cotter
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.5
+====================
+
+It is my pleasure to announce to you the 1.1.5 release of the MongoDB C driver.
+
+This is a patch release with performance enhancements and bug fixes:
+
+  * The fsync and j write concern flags now imply acknowledged writes
+  * Prevent using fsync or j with conflicting w=0 write concern
+  * Obey socket timeout consistently in TLS/SSL mode
+  * Return an error promptly after a network hangup in TLS mode
+  * Prevent crash using SSL in FIPS mode
+  * Always return NULL from mongoc_database_get_collection_names on error
+  * Fix version check for GCC 5 and future versions of Clang
+  * Fix warnings and errors building on various platforms
+  * Add configure flag to enable/disable shared memory performance counters
+  * Minor docs improvements and fix links from C Driver docs to Libbson docs
+
+With this release, Libbson abandons the convention that odd-numbered patch
+versions indicate unstable releases. We switch to simple semantic versioning:
+1.1.5 is a stable release with bug fixes since 1.1.4. During subsequent
+development the version will be "1.1.6-dev".
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Christian Hergert
+  * Jason Carey
+  * Jeremy Mikola
+  * Jeroen Ooms
+  * Hannes Magnusson
+
+Enjoy!
+
+-- A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.4
+====================
+
+It is my pleasure to announce to you the 1.1.4 release of the MongoDB C driver.
+
+This release is a stable release with performance enhancements and bugfixes.
+
+Changes include:
+  * Fixed client pool concurrency issues
+  * Fixed some scenarios where replica sets would fail to reconnect on primary
+    step down.
+  * Improved write concern handling
+  * Validate port number in URI
+  * Various other fixes
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Jason Carey
+  * Andrew Clayton
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.1.2
+====================
+
+It is my pleasure to announce to you the 1.1.2 release of the MongoDB C driver.
+
+This release is a stable release with performance enhancements and bugfixes.
+
+Changes include:
+  * Process connectTimeoutMS cast insensitively
+  * Addition of missing trace macros
+  * Improvement of internal error messages
+  * Fix a segfault in OpenSSL cleanup routines
+  * Fix for IPv6 support for replica sets
+  * Coalesce small vectorized TLS writes
+  * MinGW fixups
+  * Fix for a memory leak in get_database_names()
+  * Fixes for patching write concern through the bulk api
+  * Fix to normalize hostnames in uri parsing
+  * Fix for managing connections in the client pool
+  * Various other fixes
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Andrew Clayton
+  * Denis Gladkikh
+  * Hannes Magnusson
+  * Jason Carey
+  * Jeremy Mikola
+  * mschoenlaub
+  * Samantha Ritter
+  * Tyler Brock
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.1.0
+====================
+
+It is my pleasure to announce to you the 1.1.0 release of the MongoDB C driver.
+
+This release is a stable release with additive ABI changes and bugfixes.
+
+The below changes include some carried over from RC0.
+
+Changes include:
+  * RC0
+   * ABI versioning for 1.1 versus 1.0 symbols
+   * additional geo index options
+   * authMechanismProperties in URI
+   * fixes for OS X Yosemite
+   * removal of replica set member limit
+   * SCRAM-SHA-1 SASL mechanism
+   * updated dependency on libbson 1.1 abi
+   * validation for bulk insert
+   * various memory leak fixes
+  * Fixes to documentation typos
+  * "How to Ask For Help" in the README
+  * Removed dependency on sasl for PLAIN authentication
+  * Use provided username, if available, for X.509 auth
+  * Fixed WriteConcern error reporting for some writes
+  * Check for closed sockets before attempting RPCs
+  * Fixes for gridfs file seek
+  * Fixes for mongoc_cursor_clone()
+  * Fixes for unix domain socket support
+  * Fixes for polling on win32
+  * Improved warnings on failure to connect
+  * Addition of wired tiger options
+  * Fixes for examples
+
+Additions to the ABI include:
+  * support for extra option in count
+   - mongoc_collection_count_with_opts
+  * additional index options
+   - mongoc_index_opt_geo_get_default
+   - mongoc_index_opt_geo_init
+   - mongoc_index_opt_wt_get_default
+   - mongoc_index_opt_wt_init
+  * rand interface to seed and verify the strong random number generation needed
+    by some auth mechanisms
+   - mongoc_rand_seed
+   - mongoc_rand_add
+   - mongoc_rand_status
+  * URI additions to support more complicated auth credentials
+   - mongoc_uri_get_credentials
+   - mongoc_uri_get_mechanism_properties
+  * Support for cursor returning metadata crud operations
+   - mongoc_client_find_databases
+   - mongoc_collection_find_indexes
+   - mongoc_database_find_collections
+  * Kill cursor support
+   - mongoc_client_kill_cursor
+  * Various get/setters on cursor
+   - mongoc_cursor_get_batch_size
+   - mongoc_cursor_get_id
+   - mongoc_cursor_set_batch_size
+  * More socket/stream options
+   - mongoc_socket_check_closed
+   - mongoc_socket_inet_ntop
+   - mongoc_stream_check_closed
+   - mongoc_stream_write
+
+Additional Notes:
+    Existing complex index names may contain a zero instead of a type due to
+a bug in mongoc_collection_keys_to_index_string. As a result those indexes may
+be hard to drop from the driver as they have a name you would not expect.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Adam Midvidy
+  * aherlihy
+  * alexeyvo
+  * Christian Hergert
+  * Hannes Magnusson
+  * Jason Carey
+  * Jérôme Lebel
+  * Jesse Jiryu Davis
+  * lloydzhou
+  * Mark Benevenuto
+  * Paul Melnikow
+  * Samantha Ritter
+  * Shraya Ramani
+  * Spencer Jackson
+  * Tyler Brock
+
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.1.0-rc0
+========================
+
+It is my pleasure to announce to you the 1.1.0-rc0 release of the MongoDB C driver.
+
+This release is a release candidate with additive ABI changes and bugfixes.
+
+Changes include:
+  * ABI versioning for 1.1 versus 1.0 symbols
+  * additional geo index options
+  * authMechanismProperties in URI
+  * fixes for OS X Yosemite
+  * removal of replica set member limit
+  * SCRAM-SHA-1 SASL mechanism
+  * updated dependency on libbson 1.1 abi
+  * validation for bulk insert
+  * various memory leak fixes
+
+Additions to the ABI include:
+  * support for extra option in count
+   - mongoc_collection_count_with_opts
+  * extra index and collection info
+   - mongoc_collection_get_index_info
+   - mongoc_database_get_collection_info
+  * additional geo options
+   - mongoc_index_opt_geo_get_default
+   - mongoc_index_opt_geo_init
+  * rand interface to seed and verify the strong random number generation needed
+    by some auth mechanisms
+   - mongoc_rand_seed
+   - mongoc_rand_add
+   - mongoc_rand_status
+  * URI additions to support more complicated auth credentials
+   - mongoc_uri_get_credentials
+   - mongoc_uri_get_mechanism_properties
+
+Additional Notes:
+    Existing complex index names may contain a zero instead of a type due to
+a bug in mongoc_collection_keys_to_index_string. As a result those indexes may
+be hard to drop from the driver as they have a name you would not expect.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Adam Midvidy
+  * aherlihy
+  * alexeyvo
+  * Christian Hergert
+  * Jason Carey
+  * Jérôme Lebel
+  * Samantha Ritter
+  * Spencer Jackson
+  * Tyler Brock
+
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.0.2
+====================
+
+It is my pleasure to announce to you the 1.0.2 release of the MongoDB C driver.
+
+This release is a minor point release with no ABI changes and mostly small
+bugfixes.
+
+Changes include:
+  * A variety of fixes for read preference based node selection
+  * Avoided inclusion of getLastError in 2.6 writeConcern
+  * Correct handling of pass through params for collection_aggregate
+  * Improved error reporting in socket connect
+  * Public MONGOC_DEFAULT_CONNECTTIMEOUTMS
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Adam Midvidy
+  * Christian Hergert
+  * Denis Gladkikh
+  * Jason Carey
+  * Jeremy Mikola
+  * Jérôme Lebel
+  * Tyler Brock
+  * Wisdom Omuya
+
+-- Jason Carey
+
+
+mongo-c-driver 1.0.0
+====================
+
+It is my very distinct pleasure to announce to you the 1.0 release of
+the MongoDB C driver!
+
+This is the culmination of just over a year of work and could not have
+been done without the help of our wonderful community.
+
+Thanks to everyone who contributed to the development of this driver!
+
+  * Christian Hergert
+  * Jason Carey
+  * Gary Murakami
+  * Christian Heckl
+  * Frank Watson Song
+  * Hannes Magnusson
+  * Je�rôme Lebel
+  * Kyle Suarez
+  * Maga Napanga
+  * Michael Kuhn
+  * Vincent Giersch
+  * essentia44
+  * yuqing
+
+Happy Hacking!
+
+-- Christian Hergert
+
+
+mongo-c-driver 0.98.2
+=====================
+
+One final step before our journey to 1.0!
+
+This is a relatively small release, adding some features needed for drivers
+building on top of the C driver.
+
+A new libmongoc-priv.so library is installed that does not have symbols
+hidden. You can access private headers via the -private.h variants. This
+means you will need to recompile your project every time the library is
+changed (if you use those private headers, as they are subject to change).
+
+A special thanks to Hannes Magnusson for patches in this release.
+
+See `git shortlog 0.98.0..0.98.2` for a list of all the changes.
+
+-- Christian Hergert
+
+
+mongo-c-driver 0.98.0
+=====================
+
+Another step in the rapidly approaching path to 1.0!
+
+This release is primarily a bugfix release and stablization effort as we
+approach 1.0 of the MongoDB C driver.
+
+This release requires 0.98.0 of Libbson for improvements to the memory
+management system. You can now setup custom memory allocators at the
+start of the process.
+
+This is a RC release that with a few improvements will likely become 1.0.
+
+A special thanks to the following for patches in this cycle:
+
+  * Kyle Suarez
+  * yuqing
+
+See `git shortlog 0.96.4..0.98.0` for a list of all the changes.
+
+-- Christian Hergert
+
+
+mongo-c-driver 0.96.4
+=====================
+
+Another incremental feature update and bugfix release!
+
+In this release, you will find the following changes:
+
+  * build/mci.sh script for automatically building Debian packages, RPMs, and
+    Solaris packaging based on the host operating system.
+  * Various libbson improvements, now depending on 0.8.4.
+  * Alignment fixes for Solaris Studio C compiler via libbson.
+  * Addition of mongoc_gridfs_remove_by_filename() for removing a file from
+    gridfs by filename.
+  * client command functions can now take a fully qualified namespace.
+  * collections can now support names that indicate a command namespace.
+  * Commands will no longer fail if they do not contain an "ok" field.
+  * OP_QUERY will now set the slaveOk bit in the wire protocol if
+  * readPreferences are set to non-PRIMARY.
+  * Various documentation and build fixes.
+
+Thanks again to all the contributors, and happy hacking!
+
+
+mongo-c-driver 0.96.2
+=====================
+
+Hot on the heels of 0.96.0 we would like to present mongo-c-driver 0.96.2!
+
+This is primarily a bugfix release. Included in this release are:
+
+  * Ensure batchSize is used in cursor GETMORE operations with `aggregate`.
+  * Ensure enough buffer space is allocated for incoming RPC when buffering
+    from a stream.
+  * Require libbson 0.8.2 for more robust `bson_next_power_of_two()` when
+    using `size_t` and BCON compilation fix with C++.
+  * Handle cursor id's that are not 64-bit values in response from
+   `aggregate` command.
+  * Handle upsert on MongoDB < 2.6 when _id does not contain an `ObjectId`.
+  * Use 100 for default batchSize in `aggregate` command.
+
+Happy Hacking!
+
+
+mongo-c-driver 0.96.0
+=====================
+
+It's that time again, time for another mongo-c-driver release!
+
+This release includes much new documentation, which can be found at
+http://docs.mongodb.org/ecosystem/drivers/c/.
+
+Additionally, this release improves support for various exotic systems.
+Solaris 10 is supported much better on SPARC and x86_64 based systems.
+
+Some workarounds for mixed-mode sharded-clusters have been added to improve
+resiliency when rolling upgrades are performed.
+
+Build improvements have been added to help us detect SASL and SSL
+implementations on platforms that do not support pkg-config. This should
+simplify building for some of you.
+
+We've added some more logging to SASL authentication to help debug
+authentication failures.
+
+A bug causing an abort() when SSL is used and a server is down has been fixed.
+
+We've renamed various _delete() functions to _remove() to provide consistency
+with other MongoDB drivers.
+
+You can now specify SSL options for client pools.
+
+-D_REENTRANT is always defined now on Solaris to help with errno detection.
+This may not have been done before if using a non-GCC platform with pthreads.
+
+A bug was fixed where timeouts could have been 1000x longer than expected
+due to failure to convert from microseconds to milliseconds.
+
+A bug was fixed with authentication in sharded cluster and replica set
+scenarios.
+
+Happy Hacking!
+
+
+mongo-c-driver 0.94.2
+=====================
+
+Hot on the heels of 0.94.0 is 0.94.2, a bugfix release.
+
+A bug has been fixed when using TLS streams and large result sets.
+
+In this release, we added support for Sun's C compiler (Sun Pro C) on Solaris.
+This allows for builds on Solaris 10 with SPARC using the native toolchain.
+
+This release contains a couple of fixes in libbson as well.
+
+Keep those bug reports coming, and as always, Happy Hacking!
+
+
+mongo-c-driver 0.94.0
+=====================
+
+The mongo-c-driver team is proud to announce the release of 0.94.0. This
+release is a followup to the previous release adding more features to be found
+in MongoDB 2.6.
+
+You will find some new API's, bug fixes, and more documentation. Under the
+hood, 0.94.0 uses the new write-commands as part of MongoDB 2.6 when it
+discovers it is communicating with a MongoDB server. There is now a bulk
+operation API (See `mongoc-bulk-operation.h`).
+
+Helpers for common server commands have been added. You can find most of
+them `mongoc-collection.h`.
+
+To simply using mongo-c-driver from Windows, we've included pre-built binaries
+on the release page.
+
+Thanks to all of the contributors this release!
+
+Happy Hacking!
+
+
+mongo-c-driver 0.92.0
+=====================
+
+The mongo-c-driver team is proud to announce the release of 0.92.0. This
+release is the culimation of a few months work and has many bug fixes and
+new features. It contains over 350 commits from 4 authors since the 0.90.0
+release.
+
+The mongo-c-driver release tarballs now contain a bundled copy of libbson.
+If you do not have libbson installed or the system installed libbson is too
+old, the bundled copy of libbson will be installed.
+
+  * Revamped build system to simplify installation.
+  * Windows Vista and newer support.
+  * Various GridFS fixes and features.
+  * Kerberos support via cyrus-sasl.
+  * Various SSL improvements.
+  * Support for Solaris 11, FreeBSD 10, RHEL 5+, and SmartOS.
+  * A new client side expression matcher to perform basic query processing.
+    It can perform queries such as {'field': {'$in': [1,2,3]}}. See
+    mongoc_matcher_t for more information.
+  * A new socket abstraction for platform independent network sockets.
+  * A new mongoc-dump example for how to write a simple mongodump replacement.
+  * Counters can use rdtscp instruction on Core iX systems for very fast
+    counters.
+  * configure has new options. If in doubt, the defaults are sensible.
+   * --enable-coverage=yes|no
+   * --enable-debug=yes|no
+   * --enable-debug-symbols=yes|no
+   * --enable-hardening=yes|no
+   * --enable-optimizations=yes|no
+   * --enable-ssl=yes|no
+   * --enable-sasl=yes|no
+   * --enable-tracing=yes|no
+   * --with-libbson=auto|system|bundled
+
+mongo-c-driver 0.92.0 requires libbson 0.6.4 or newer.
+
+Happy Hacking!
+
+
+Libmongoc 0.90.0
+================
+
+This is the initial release of the new Libmongoc. We chose 0.90.0 for the
+release version to differentiate ourselves from the, now legacy, version of
+libmongoc. We will rapidly work towards reaching an API/ABI stable library fit
+for a 1.0.0 release.
+
+Libmongoc is Apache licensed so it can be embedded in a multitude of scenarios.
+
+The API of 0.90.0 is completely different from the previous versions. We think
+this allowed us to create a high-quality library that you will enjoy using in
+your applications.
+
+Many outstanding bugs were closed in the process of creating Libbson 0.90.0. So
+if you had a pet issue, please take a look to see if it was resolved as part of
+this effort!
+
+Thanks, and enjoy developing your applications with libmongoc!
diff --git a/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/README.rst b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/README.rst
new file mode 100644
index 0000000..a4c1846
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/README.rst
@@ -0,0 +1,89 @@
+==============
+mongo-c-driver
+==============
+
+About
+=====
+
+mongo-c-driver is a project that includes two libraries:
+
+- libmongoc, a client library written in C for MongoDB.
+- libbson, a library providing useful routines related to building, parsing, and iterating BSON documents.
+
+If libmongoc is not needed, it is possible to build and install only libbson.
+
+Documentation / Support / Feedback
+==================================
+
+The documentation is available at http://mongoc.org/.
+For issues with, questions about, or feedback for libmongoc, please look into
+our `support channels <http://www.mongodb.org/about/support>`_. Please
+do not email any of the libmongoc developers directly with issues or
+questions - you're more likely to get an answer on the `MongoDB Community Forums`_.
+
+Bugs / Feature Requests
+=======================
+
+Think you’ve found a bug? Want to see a new feature in libmongoc? Please open a
+case in our issue management tool, JIRA:
+
+- `Create an account and login <https://jira.mongodb.org>`_.
+- Navigate to `the CDRIVER project <https://jira.mongodb.org/browse/CDRIVER>`_.
+- Click **Create Issue** - Please provide as much information as possible about the issue type and how to reproduce it.
+
+Bug reports in JIRA for all driver projects (i.e. CDRIVER, CSHARP, JAVA) and the
+Core Server (i.e. SERVER) project are **public**.
+
+How To Ask For Help
+-------------------
+
+If you are having difficulty building the driver after reading the below instructions, please post on
+the `MongoDB Community Forums`_ to ask for help. Please include in your post all of the following
+information:
+
+- The version of the driver you are trying to build (branch or tag).
+    - Examples: ``r1.17`` (branch), ``1.9.5`` (tag)
+- Host OS, version, and architecture.
+    - Examples: Windows 10 64-bit x86, Ubuntu 16.04 64-bit x86, macOS 10.13
+- C Compiler and version.
+    - Examples: GCC 7.3.0, Visual Studio Community 2017, clang 3.9, XCode 9.3
+- The output of any ``cmake``, ``make``, or other commands executed during the build.
+- The text of the error you encountered.
+
+Failure to include the relevant information will delay a useful response.
+Here is a made-up example of a help request that provides the relevant
+information:
+
+  Hello, I'm trying to build the C driver with Kerberos support, from
+  mongo-c-driver-1.9.5.tar.gz. I'm on Ubuntu 16.04, 64-bit Intel, with gcc
+  5.4.0. I run CMake like::
+
+    $ cmake .
+    -- The C compiler identification is ;GNU 5.4.0
+    -- Check for working C compiler: /usr/bin/cc
+    -- Check for working C compiler: /usr/bin/cc -- works
+
+    ... SNIPPED OUTPUT, but when you ask for help, include full output without any omissions ...
+
+    -- Searching for libsasl2
+    --   Not found (specify -DCMAKE_LIBRARY_PATH=/path/to/sasl/lib for SASL support)
+    CMake Error at CMakeLists.txt:10 (_message):
+        SASL not found
+
+  Can you tell me what I need to install? Thanks!
+
+.. _MongoDB Community Forums: https://community.mongodb.com/tags/c/drivers-odms-connectors/7/c-driver
+
+Security Vulnerabilities
+------------------------
+
+If you’ve identified a security vulnerability in a driver or any other
+MongoDB project, please report it according to the `instructions here
+<https://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report>`_.
+
+
+Installation
+============
+
+Detailed installation instructions are in the manual:
+http://mongoc.org/libmongoc/current/installing.html
diff --git a/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/THIRD_PARTY_NOTICES b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/THIRD_PARTY_NOTICES
new file mode 100644
index 0000000..9c74b1f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/THIRD_PARTY_NOTICES
@@ -0,0 +1,130 @@
+The MongoDB C Driver uses third-party code distributed under different licenses.
+
+License notice for common-b64.c
+-------------------------------------------------------------------------------
+
+ISC License
+
+Copyright: 1996, 1998 Internet Software Consortium
+           1995 International Business Machines, Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Portions Copyright (c) 1995 by International Business Machines, Inc.
+
+International Business Machines, Inc. (hereinafter called IBM) grants
+permission under its copyrights to use, copy, modify, and distribute this
+Software with or without fee, provided that the above copyright notice and
+all paragraphs of this notice appear in all copies, and that the name of IBM
+not be used in connection with the marketing of any product incorporating
+the Software or modifications thereof, without specific, written prior
+permission.
+
+To the extent it has a right to do so, IBM grants an immunity from suit
+under its patents, if any, for the use, sale or manufacture of products to
+the extent that such products are used for performing Domain Name System
+dynamic updates in TCP/IP networks by means of the Software.  No immunity is
+granted for any product per se or for any other function of any product.
+
+THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
+DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
+IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+License notice for mongoc.css_t
+-------------------------------------------------------------------------------
+
+MIT License
+
+Portions Copyright 2013 by Ignacy Sokolowski.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+License notice for zlib
+-------------------------------------------------------------------------------
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.11, January 15th, 2017
+
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
+License notice for common-md5.c
+-------------------------------------------------------------------------------
+
+ZLib License
+
+Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+L. Peter Deutsch
+ghost@aladdin.com
diff --git a/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/uninstall.sh b/Source/ThirdParty/mongodb_c/Linux/share/mongo-c-driver/uninstall.sh
new file mode 100644
index 0000000..e69de29
diff --git a/Source/ThirdParty/mongodb_c/README b/Source/ThirdParty/mongodb_c/README
new file mode 100644
index 0000000..50f9d10
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/README
@@ -0,0 +1,7 @@
+Note:
+If will appear error like this:
+==========================================
+mt.exe : general error c101008d: Failed to write the updated manifest to the resource of file "mongoc-1.0.dll". The process cannot access the file because it is being used by another process.
+NMAKE : fatal error U1077: '"C:\Program Files\CMake\bin\cmake.exe"' : return code '0xffffffff'
+==========================================
+Try to remove or disable antiviruses
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/bson-1.0.dll b/Source/ThirdParty/mongodb_c/Win64/bin/bson-1.0.dll
new file mode 100644
index 0000000..1cb3390
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/bson-1.0.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e824257300a4f5a50437e63386af8736a771e2b5f3882cd1faaa92c3f980858
+size 197120
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/concrt140.dll b/Source/ThirdParty/mongodb_c/Win64/bin/concrt140.dll
new file mode 100644
index 0000000..2d434c8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/concrt140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:573229a07f38ab9d2fc2e1a5b98e9243b9b39100323180c83ad7ddaf98eee46a
+size 317864
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/mongoc-1.0.dll b/Source/ThirdParty/mongodb_c/Win64/bin/mongoc-1.0.dll
new file mode 100644
index 0000000..c8e7a3e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/mongoc-1.0.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:66d3ef4d3b2b30840f2edc28fb4e326285b5efea389155ee9ca8d8b45bfa43c4
+size 655872
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140.dll b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140.dll
new file mode 100644
index 0000000..94d67d2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fee6f36547d6f6ea7ca0338655555dba6bb0f798bc60334d29b94d1547da4da
+size 566704
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_1.dll b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_1.dll
new file mode 100644
index 0000000..25d6b60
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_1.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8731a93e519c2595c9fd489e6d9ac07e964448c0da1c8ee9ee500a7989482617
+size 23944
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_2.dll b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_2.dll
new file mode 100644
index 0000000..7a954db
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_2.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:366af8e071f004da5d95a832a46b2e8821a8e0294340a93f7c95cf48c441067e
+size 186800
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_atomic_wait.dll b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_atomic_wait.dll
new file mode 100644
index 0000000..369db8b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_atomic_wait.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c61a28711f8c6e9bfd4879cf5f53b013d653badad308abe3e887c694b223d6f0
+size 57264
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_codecvt_ids.dll b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_codecvt_ids.dll
new file mode 100644
index 0000000..777f11c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/msvcp140_codecvt_ids.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b45fd069bd0076d8abfeb7c3c30a1f5c5fc8e7124017853a93d831a346c3d21
+size 21424
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/vcruntime140.dll b/Source/ThirdParty/mongodb_c/Win64/bin/vcruntime140.dll
new file mode 100644
index 0000000..6dca581
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/vcruntime140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d2b40f0395cc5d1b4d5ea17b84970c29971d448c37104676db577586d4ad1b1
+size 98224
diff --git a/Source/ThirdParty/mongodb_c/Win64/bin/vcruntime140_1.dll b/Source/ThirdParty/mongodb_c/Win64/bin/vcruntime140_1.dll
new file mode 100644
index 0000000..283fa93
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/bin/vcruntime140_1.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34048abaa070ecc13b318cea31425f4ca3edd133d350318ac65259e6058c8b32
+size 37256
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson.h
new file mode 100644
index 0000000..cfe6d06
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Including bson.h is superseded. Use bson/bson.h instead. */
+#include "bson/bson.h"
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bcon.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bcon.h
new file mode 100644
index 0000000..0562af2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bcon.h
@@ -0,0 +1,295 @@
+/*
+ * @file bcon.h
+ * @brief BCON (BSON C Object Notation) Declarations
+ */
+
+#include "bson-prelude.h"
+
+/*    Copyright 2009-2013 MongoDB, Inc.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#ifndef BCON_H_
+#define BCON_H_
+
+#include "bson.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BCON_STACK_MAX 100
+
+#define BCON_ENSURE_DECLARE(fun, type)                 \
+   static BSON_INLINE type bcon_ensure_##fun (type _t) \
+   {                                                   \
+      return _t;                                       \
+   }
+
+#define BCON_ENSURE(fun, val) bcon_ensure_##fun (val)
+
+#define BCON_ENSURE_STORAGE(fun, val) bcon_ensure_##fun (&(val))
+
+BCON_ENSURE_DECLARE (const_char_ptr, const char *)
+BCON_ENSURE_DECLARE (const_char_ptr_ptr, const char **)
+BCON_ENSURE_DECLARE (double, double)
+BCON_ENSURE_DECLARE (double_ptr, double *)
+BCON_ENSURE_DECLARE (const_bson_ptr, const bson_t *)
+BCON_ENSURE_DECLARE (bson_ptr, bson_t *)
+BCON_ENSURE_DECLARE (subtype, bson_subtype_t)
+BCON_ENSURE_DECLARE (subtype_ptr, bson_subtype_t *)
+BCON_ENSURE_DECLARE (const_uint8_ptr, const uint8_t *)
+BCON_ENSURE_DECLARE (const_uint8_ptr_ptr, const uint8_t **)
+BCON_ENSURE_DECLARE (uint32, uint32_t)
+BCON_ENSURE_DECLARE (uint32_ptr, uint32_t *)
+BCON_ENSURE_DECLARE (const_oid_ptr, const bson_oid_t *)
+BCON_ENSURE_DECLARE (const_oid_ptr_ptr, const bson_oid_t **)
+BCON_ENSURE_DECLARE (int32, int32_t)
+BCON_ENSURE_DECLARE (int32_ptr, int32_t *)
+BCON_ENSURE_DECLARE (int64, int64_t)
+BCON_ENSURE_DECLARE (int64_ptr, int64_t *)
+BCON_ENSURE_DECLARE (const_decimal128_ptr, const bson_decimal128_t *)
+BCON_ENSURE_DECLARE (bool, bool)
+BCON_ENSURE_DECLARE (bool_ptr, bool *)
+BCON_ENSURE_DECLARE (bson_type, bson_type_t)
+BCON_ENSURE_DECLARE (bson_iter_ptr, bson_iter_t *)
+BCON_ENSURE_DECLARE (const_bson_iter_ptr, const bson_iter_t *)
+
+#define BCON_UTF8(_val) \
+   BCON_MAGIC, BCON_TYPE_UTF8, BCON_ENSURE (const_char_ptr, (_val))
+#define BCON_DOUBLE(_val) \
+   BCON_MAGIC, BCON_TYPE_DOUBLE, BCON_ENSURE (double, (_val))
+#define BCON_DOCUMENT(_val) \
+   BCON_MAGIC, BCON_TYPE_DOCUMENT, BCON_ENSURE (const_bson_ptr, (_val))
+#define BCON_ARRAY(_val) \
+   BCON_MAGIC, BCON_TYPE_ARRAY, BCON_ENSURE (const_bson_ptr, (_val))
+#define BCON_BIN(_subtype, _binary, _length)                     \
+   BCON_MAGIC, BCON_TYPE_BIN, BCON_ENSURE (subtype, (_subtype)), \
+      BCON_ENSURE (const_uint8_ptr, (_binary)),                  \
+      BCON_ENSURE (uint32, (_length))
+#define BCON_UNDEFINED BCON_MAGIC, BCON_TYPE_UNDEFINED
+#define BCON_OID(_val) \
+   BCON_MAGIC, BCON_TYPE_OID, BCON_ENSURE (const_oid_ptr, (_val))
+#define BCON_BOOL(_val) BCON_MAGIC, BCON_TYPE_BOOL, BCON_ENSURE (bool, (_val))
+#define BCON_DATE_TIME(_val) \
+   BCON_MAGIC, BCON_TYPE_DATE_TIME, BCON_ENSURE (int64, (_val))
+#define BCON_NULL BCON_MAGIC, BCON_TYPE_NULL
+#define BCON_REGEX(_regex, _flags)                                      \
+   BCON_MAGIC, BCON_TYPE_REGEX, BCON_ENSURE (const_char_ptr, (_regex)), \
+      BCON_ENSURE (const_char_ptr, (_flags))
+#define BCON_DBPOINTER(_collection, _oid)          \
+   BCON_MAGIC, BCON_TYPE_DBPOINTER,                \
+      BCON_ENSURE (const_char_ptr, (_collection)), \
+      BCON_ENSURE (const_oid_ptr, (_oid))
+#define BCON_CODE(_val) \
+   BCON_MAGIC, BCON_TYPE_CODE, BCON_ENSURE (const_char_ptr, (_val))
+#define BCON_SYMBOL(_val) \
+   BCON_MAGIC, BCON_TYPE_SYMBOL, BCON_ENSURE (const_char_ptr, (_val))
+#define BCON_CODEWSCOPE(_js, _scope)                                      \
+   BCON_MAGIC, BCON_TYPE_CODEWSCOPE, BCON_ENSURE (const_char_ptr, (_js)), \
+      BCON_ENSURE (const_bson_ptr, (_scope))
+#define BCON_INT32(_val) \
+   BCON_MAGIC, BCON_TYPE_INT32, BCON_ENSURE (int32, (_val))
+#define BCON_TIMESTAMP(_timestamp, _increment)                         \
+   BCON_MAGIC, BCON_TYPE_TIMESTAMP, BCON_ENSURE (int32, (_timestamp)), \
+      BCON_ENSURE (int32, (_increment))
+#define BCON_INT64(_val) \
+   BCON_MAGIC, BCON_TYPE_INT64, BCON_ENSURE (int64, (_val))
+#define BCON_DECIMAL128(_val) \
+   BCON_MAGIC, BCON_TYPE_DECIMAL128, BCON_ENSURE (const_decimal128_ptr, (_val))
+#define BCON_MAXKEY BCON_MAGIC, BCON_TYPE_MAXKEY
+#define BCON_MINKEY BCON_MAGIC, BCON_TYPE_MINKEY
+#define BCON(_val) \
+   BCON_MAGIC, BCON_TYPE_BCON, BCON_ENSURE (const_bson_ptr, (_val))
+#define BCON_ITER(_val) \
+   BCON_MAGIC, BCON_TYPE_ITER, BCON_ENSURE (const_bson_iter_ptr, (_val))
+
+#define BCONE_UTF8(_val) \
+   BCONE_MAGIC, BCON_TYPE_UTF8, BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_val))
+#define BCONE_DOUBLE(_val) \
+   BCONE_MAGIC, BCON_TYPE_DOUBLE, BCON_ENSURE_STORAGE (double_ptr, (_val))
+#define BCONE_DOCUMENT(_val) \
+   BCONE_MAGIC, BCON_TYPE_DOCUMENT, BCON_ENSURE_STORAGE (bson_ptr, (_val))
+#define BCONE_ARRAY(_val) \
+   BCONE_MAGIC, BCON_TYPE_ARRAY, BCON_ENSURE_STORAGE (bson_ptr, (_val))
+#define BCONE_BIN(subtype, binary, length)                                   \
+   BCONE_MAGIC, BCON_TYPE_BIN, BCON_ENSURE_STORAGE (subtype_ptr, (subtype)), \
+      BCON_ENSURE_STORAGE (const_uint8_ptr_ptr, (binary)),                   \
+      BCON_ENSURE_STORAGE (uint32_ptr, (length))
+#define BCONE_UNDEFINED BCONE_MAGIC, BCON_TYPE_UNDEFINED
+#define BCONE_OID(_val) \
+   BCONE_MAGIC, BCON_TYPE_OID, BCON_ENSURE_STORAGE (const_oid_ptr_ptr, (_val))
+#define BCONE_BOOL(_val) \
+   BCONE_MAGIC, BCON_TYPE_BOOL, BCON_ENSURE_STORAGE (bool_ptr, (_val))
+#define BCONE_DATE_TIME(_val) \
+   BCONE_MAGIC, BCON_TYPE_DATE_TIME, BCON_ENSURE_STORAGE (int64_ptr, (_val))
+#define BCONE_NULL BCONE_MAGIC, BCON_TYPE_NULL
+#define BCONE_REGEX(_regex, _flags)                       \
+   BCONE_MAGIC, BCON_TYPE_REGEX,                          \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_regex)), \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_flags))
+#define BCONE_DBPOINTER(_collection, _oid)                     \
+   BCONE_MAGIC, BCON_TYPE_DBPOINTER,                           \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_collection)), \
+      BCON_ENSURE_STORAGE (const_oid_ptr_ptr, (_oid))
+#define BCONE_CODE(_val) \
+   BCONE_MAGIC, BCON_TYPE_CODE, BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_val))
+#define BCONE_SYMBOL(_val)        \
+   BCONE_MAGIC, BCON_TYPE_SYMBOL, \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_val))
+#define BCONE_CODEWSCOPE(_js, _scope)                  \
+   BCONE_MAGIC, BCON_TYPE_CODEWSCOPE,                  \
+      BCON_ENSURE_STORAGE (const_char_ptr_ptr, (_js)), \
+      BCON_ENSURE_STORAGE (bson_ptr, (_scope))
+#define BCONE_INT32(_val) \
+   BCONE_MAGIC, BCON_TYPE_INT32, BCON_ENSURE_STORAGE (int32_ptr, (_val))
+#define BCONE_TIMESTAMP(_timestamp, _increment)      \
+   BCONE_MAGIC, BCON_TYPE_TIMESTAMP,                 \
+      BCON_ENSURE_STORAGE (int32_ptr, (_timestamp)), \
+      BCON_ENSURE_STORAGE (int32_ptr, (_increment))
+#define BCONE_INT64(_val) \
+   BCONE_MAGIC, BCON_TYPE_INT64, BCON_ENSURE_STORAGE (int64_ptr, (_val))
+#define BCONE_DECIMAL128(_val)        \
+   BCONE_MAGIC, BCON_TYPE_DECIMAL128, \
+      BCON_ENSURE_STORAGE (const_decimal128_ptr, (_val))
+#define BCONE_MAXKEY BCONE_MAGIC, BCON_TYPE_MAXKEY
+#define BCONE_MINKEY BCONE_MAGIC, BCON_TYPE_MINKEY
+#define BCONE_SKIP(_val) \
+   BCONE_MAGIC, BCON_TYPE_SKIP, BCON_ENSURE (bson_type, (_val))
+#define BCONE_ITER(_val) \
+   BCONE_MAGIC, BCON_TYPE_ITER, BCON_ENSURE_STORAGE (bson_iter_ptr, (_val))
+
+#define BCON_MAGIC bson_bcon_magic ()
+#define BCONE_MAGIC bson_bcone_magic ()
+
+typedef enum {
+   BCON_TYPE_UTF8,
+   BCON_TYPE_DOUBLE,
+   BCON_TYPE_DOCUMENT,
+   BCON_TYPE_ARRAY,
+   BCON_TYPE_BIN,
+   BCON_TYPE_UNDEFINED,
+   BCON_TYPE_OID,
+   BCON_TYPE_BOOL,
+   BCON_TYPE_DATE_TIME,
+   BCON_TYPE_NULL,
+   BCON_TYPE_REGEX,
+   BCON_TYPE_DBPOINTER,
+   BCON_TYPE_CODE,
+   BCON_TYPE_SYMBOL,
+   BCON_TYPE_CODEWSCOPE,
+   BCON_TYPE_INT32,
+   BCON_TYPE_TIMESTAMP,
+   BCON_TYPE_INT64,
+   BCON_TYPE_DECIMAL128,
+   BCON_TYPE_MAXKEY,
+   BCON_TYPE_MINKEY,
+   BCON_TYPE_BCON,
+   BCON_TYPE_ARRAY_START,
+   BCON_TYPE_ARRAY_END,
+   BCON_TYPE_DOC_START,
+   BCON_TYPE_DOC_END,
+   BCON_TYPE_END,
+   BCON_TYPE_RAW,
+   BCON_TYPE_SKIP,
+   BCON_TYPE_ITER,
+   BCON_TYPE_ERROR,
+} bcon_type_t;
+
+typedef struct bcon_append_ctx_frame {
+   int i;
+   bool is_array;
+   bson_t bson;
+} bcon_append_ctx_frame_t;
+
+typedef struct bcon_extract_ctx_frame {
+   int i;
+   bool is_array;
+   bson_iter_t iter;
+} bcon_extract_ctx_frame_t;
+
+typedef struct _bcon_append_ctx_t {
+   bcon_append_ctx_frame_t stack[BCON_STACK_MAX];
+   int n;
+} bcon_append_ctx_t;
+
+typedef struct _bcon_extract_ctx_t {
+   bcon_extract_ctx_frame_t stack[BCON_STACK_MAX];
+   int n;
+} bcon_extract_ctx_t;
+
+BSON_EXPORT (void)
+bcon_append (bson_t *bson, ...) BSON_GNUC_NULL_TERMINATED;
+BSON_EXPORT (void)
+bcon_append_ctx (bson_t *bson,
+                 bcon_append_ctx_t *ctx,
+                 ...) BSON_GNUC_NULL_TERMINATED;
+BSON_EXPORT (void)
+bcon_append_ctx_va (bson_t *bson, bcon_append_ctx_t *ctx, va_list *va);
+BSON_EXPORT (void)
+bcon_append_ctx_init (bcon_append_ctx_t *ctx);
+
+BSON_EXPORT (void)
+bcon_extract_ctx_init (bcon_extract_ctx_t *ctx);
+
+BSON_EXPORT (void)
+bcon_extract_ctx (bson_t *bson,
+                  bcon_extract_ctx_t *ctx,
+                  ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (bool)
+bcon_extract_ctx_va (bson_t *bson, bcon_extract_ctx_t *ctx, va_list *ap);
+
+BSON_EXPORT (bool)
+bcon_extract (bson_t *bson, ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (bool)
+bcon_extract_va (bson_t *bson,
+                 bcon_extract_ctx_t *ctx,
+                 ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (bson_t *)
+bcon_new (void *unused, ...) BSON_GNUC_NULL_TERMINATED;
+
+/**
+ * The bcon_..() functions are all declared with __attribute__((sentinel)).
+ *
+ * From GCC manual for "sentinel": "A valid NULL in this context is defined as
+ * zero with any pointer type. If your system defines the NULL macro with an
+ * integer type then you need to add an explicit cast."
+ * Case in point: GCC on Solaris (at least)
+ */
+#define BCON_APPEND(_bson, ...) \
+   bcon_append ((_bson), __VA_ARGS__, (void *) NULL)
+#define BCON_APPEND_CTX(_bson, _ctx, ...) \
+   bcon_append_ctx ((_bson), (_ctx), __VA_ARGS__, (void *) NULL)
+
+#define BCON_EXTRACT(_bson, ...) \
+   bcon_extract ((_bson), __VA_ARGS__, (void *) NULL)
+
+#define BCON_EXTRACT_CTX(_bson, _ctx, ...) \
+   bcon_extract ((_bson), (_ctx), __VA_ARGS__, (void *) NULL)
+
+#define BCON_NEW(...) bcon_new (NULL, __VA_ARGS__, (void *) NULL)
+
+BSON_EXPORT (const char *)
+bson_bcon_magic (void) BSON_GNUC_PURE;
+BSON_EXPORT (const char *)
+bson_bcone_magic (void) BSON_GNUC_PURE;
+
+
+BSON_END_DECLS
+
+
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-atomic.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-atomic.h
new file mode 100644
index 0000000..845fe34
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-atomic.h
@@ -0,0 +1,774 @@
+/*
+ * Copyright 2013-2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ATOMIC_H
+#define BSON_ATOMIC_H
+
+
+#include "bson-config.h"
+#include "bson-compat.h"
+#include "bson-macros.h"
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#endif
+
+
+BSON_BEGIN_DECLS
+
+enum bson_memory_order {
+   bson_memory_order_seq_cst,
+   bson_memory_order_acquire,
+   bson_memory_order_release,
+   bson_memory_order_relaxed,
+   bson_memory_order_acq_rel,
+   bson_memory_order_consume,
+};
+
+#if defined(_M_ARM) /* MSVC memorder atomics are only avail on ARM */
+#define MSVC_MEMORDER_SUFFIX(X) X
+#else
+#define MSVC_MEMORDER_SUFFIX(X)
+#endif
+
+#if defined(USE_LEGACY_GCC_ATOMICS) || (!defined(__clang__) && __GNUC__ == 4)
+#define BSON_USE_LEGACY_GCC_ATOMICS
+#else
+#undef BSON_USE_LEGACY_GCC_ATOMICS
+#endif
+
+/* Not all GCC-like compilers support the current __atomic built-ins.  Older
+ * GCC (pre-5) used different built-ins named with the __sync prefix.  When
+ * compiling with such older GCC versions, it is necessary to use the applicable
+ * functions, which requires redefining BSON_IF_GNU_LIKE and defining the
+ * additional BSON_IF_GNU_LEGACY_ATOMICS macro here. */
+#ifdef BSON_USE_LEGACY_GCC_ATOMICS
+#undef BSON_IF_GNU_LIKE
+#define BSON_IF_GNU_LIKE(...)
+#define BSON_IF_GNU_LEGACY_ATOMICS(...) __VA_ARGS__
+#else
+#define BSON_IF_GNU_LEGACY_ATOMICS(...)
+#endif
+
+/* CDRIVER-4229 zSeries with gcc 4.8.4 produces illegal instructions for int and
+ * int32 atomic intrinsics. */
+#if defined(__s390__) || defined(__s390x__) || defined(__zarch__)
+#define BSON_EMULATE_INT32
+#define BSON_EMULATE_INT
+#endif
+
+/* CDRIVER-4264 Contrary to documentation, VS 2013 targeting x86 does not
+ * correctly/consistently provide _InterlockedPointerExchange. */
+#if defined(_MSC_VER) && _MSC_VER < 1900 && defined(_M_IX86)
+#define BSON_EMULATE_PTR
+#endif
+
+#define DEF_ATOMIC_OP(                                                       \
+   MSVC_Intrinsic, GNU_Intrinsic, GNU_Legacy_Intrinsic, Order, ...)          \
+   do {                                                                      \
+      switch (Order) {                                                       \
+      case bson_memory_order_acq_rel:                                        \
+         BSON_IF_MSVC (return MSVC_Intrinsic (__VA_ARGS__);)                 \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_ACQ_REL);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_seq_cst:                                        \
+         BSON_IF_MSVC (return MSVC_Intrinsic (__VA_ARGS__);)                 \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_SEQ_CST);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_acquire:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_acq)) (__VA_ARGS__);) \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_ACQUIRE);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_consume:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_acq)) (__VA_ARGS__);) \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_CONSUME);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_release:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_rel)) (__VA_ARGS__);) \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_RELEASE);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      case bson_memory_order_relaxed:                                        \
+         BSON_IF_MSVC (                                                      \
+            return BSON_CONCAT (MSVC_Intrinsic,                              \
+                                MSVC_MEMORDER_SUFFIX (_nf)) (__VA_ARGS__);)  \
+         BSON_IF_GNU_LIKE (                                                  \
+            return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_RELAXED);)           \
+         BSON_IF_GNU_LEGACY_ATOMICS (                                        \
+            return GNU_Legacy_Intrinsic (__VA_ARGS__);)                      \
+      default:                                                               \
+         BSON_UNREACHABLE ("Invalid bson_memory_order value");               \
+      }                                                                      \
+   } while (0)
+
+
+#define DEF_ATOMIC_CMPEXCH_STRONG(                                            \
+   VCSuffix1, VCSuffix2, GNU_MemOrder, Ptr, ExpectActualVar, NewValue)        \
+   do {                                                                       \
+      BSON_IF_MSVC (ExpectActualVar = BSON_CONCAT3 (                          \
+                       _InterlockedCompareExchange, VCSuffix1, VCSuffix2) (   \
+                       Ptr, NewValue, ExpectActualVar);)                      \
+      BSON_IF_GNU_LIKE (                                                      \
+         (void) __atomic_compare_exchange_n (Ptr,                             \
+                                             &ExpectActualVar,                \
+                                             NewValue,                        \
+                                             false, /* Not weak */            \
+                                             GNU_MemOrder,                    \
+                                             GNU_MemOrder);)                  \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         __typeof__ (ExpectActualVar) _val;                                   \
+         _val = __sync_val_compare_and_swap (Ptr, ExpectActualVar, NewValue); \
+         ExpectActualVar = _val;)                                             \
+   } while (0)
+
+
+#define DEF_ATOMIC_CMPEXCH_WEAK(                                              \
+   VCSuffix1, VCSuffix2, GNU_MemOrder, Ptr, ExpectActualVar, NewValue)        \
+   do {                                                                       \
+      BSON_IF_MSVC (ExpectActualVar = BSON_CONCAT3 (                          \
+                       _InterlockedCompareExchange, VCSuffix1, VCSuffix2) (   \
+                       Ptr, NewValue, ExpectActualVar);)                      \
+      BSON_IF_GNU_LIKE (                                                      \
+         (void) __atomic_compare_exchange_n (Ptr,                             \
+                                             &ExpectActualVar,                \
+                                             NewValue,                        \
+                                             true, /* Yes weak */             \
+                                             GNU_MemOrder,                    \
+                                             GNU_MemOrder);)                  \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         __typeof__ (ExpectActualVar) _val;                                   \
+         _val = __sync_val_compare_and_swap (Ptr, ExpectActualVar, NewValue); \
+         ExpectActualVar = _val;)                                             \
+   } while (0)
+
+
+#define DECL_ATOMIC_INTEGRAL(NamePart, Type, VCIntrinSuffix)                  \
+   static BSON_INLINE Type bson_atomic_##NamePart##_fetch_add (               \
+      Type volatile *a, Type addend, enum bson_memory_order ord)              \
+   {                                                                          \
+      DEF_ATOMIC_OP (BSON_CONCAT (_InterlockedExchangeAdd, VCIntrinSuffix),   \
+                     __atomic_fetch_add,                                      \
+                     __sync_fetch_and_add,                                    \
+                     ord,                                                     \
+                     a,                                                       \
+                     addend);                                                 \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_fetch_sub (               \
+      Type volatile *a, Type subtrahend, enum bson_memory_order ord)          \
+   {                                                                          \
+      /* MSVC doesn't have a subtract intrinsic, so just reuse addition    */ \
+      BSON_IF_MSVC (                                                          \
+         return bson_atomic_##NamePart##_fetch_add (a, -subtrahend, ord);)    \
+      BSON_IF_GNU_LIKE (                                                      \
+         DEF_ATOMIC_OP (~, __atomic_fetch_sub, ~, ord, a, subtrahend);)       \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         DEF_ATOMIC_OP (~, ~, __sync_fetch_and_sub, ord, a, subtrahend);)     \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_fetch (                   \
+      Type volatile const *a, enum bson_memory_order order)                   \
+   {                                                                          \
+      /* MSVC doesn't have a load intrinsic, so just add zero */              \
+      BSON_IF_MSVC (return bson_atomic_##NamePart##_fetch_add (               \
+                              (Type volatile *) a, 0, order);)                \
+      /* GNU doesn't want RELEASE order for the fetch operation, so we can't  \
+       * just use DEF_ATOMIC_OP. */                                           \
+      BSON_IF_GNU_LIKE (switch (order) {                                      \
+         case bson_memory_order_release: /* Fall back to seqcst */            \
+         case bson_memory_order_acq_rel: /* Fall back to seqcst */            \
+         case bson_memory_order_seq_cst:                                      \
+            return __atomic_load_n (a, __ATOMIC_SEQ_CST);                     \
+         case bson_memory_order_acquire:                                      \
+            return __atomic_load_n (a, __ATOMIC_ACQUIRE);                     \
+         case bson_memory_order_consume:                                      \
+            return __atomic_load_n (a, __ATOMIC_CONSUME);                     \
+         case bson_memory_order_relaxed:                                      \
+            return __atomic_load_n (a, __ATOMIC_RELAXED);                     \
+         default:                                                             \
+            BSON_UNREACHABLE ("Invalid bson_memory_order value");             \
+      })                                                                      \
+      BSON_IF_GNU_LEGACY_ATOMICS ({                                           \
+         __sync_synchronize ();                                               \
+         return *a;                                                           \
+      })                                                                      \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_exchange (                \
+      Type volatile *a, Type value, enum bson_memory_order ord)               \
+   {                                                                          \
+      BSON_IF_MSVC (                                                          \
+         DEF_ATOMIC_OP (BSON_CONCAT (_InterlockedExchange, VCIntrinSuffix),   \
+                        ~,                                                    \
+                        ~,                                                    \
+                        ord,                                                  \
+                        a,                                                    \
+                        value);)                                              \
+      /* GNU doesn't want CONSUME order for the exchange operation, so we     \
+       * cannot use DEF_ATOMIC_OP. */                                         \
+      BSON_IF_GNU_LIKE (switch (ord) {                                        \
+         case bson_memory_order_acq_rel:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_ACQ_REL);          \
+         case bson_memory_order_release:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_RELEASE);          \
+         case bson_memory_order_seq_cst:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_SEQ_CST);          \
+         case bson_memory_order_consume: /* Fall back to acquire */           \
+         case bson_memory_order_acquire:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_ACQUIRE);          \
+         case bson_memory_order_relaxed:                                      \
+            return __atomic_exchange_n (a, value, __ATOMIC_RELAXED);          \
+         default:                                                             \
+            BSON_UNREACHABLE ("Invalid bson_memory_order value");             \
+      })                                                                      \
+      BSON_IF_GNU_LEGACY_ATOMICS (                                            \
+         return __sync_val_compare_and_swap (a, *a, value);)                  \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_compare_exchange_strong ( \
+      Type volatile *a,                                                       \
+      Type expect,                                                            \
+      Type new_value,                                                         \
+      enum bson_memory_order ord)                                             \
+   {                                                                          \
+      Type actual = expect;                                                   \
+      switch (ord) {                                                          \
+      case bson_memory_order_release:                                         \
+      case bson_memory_order_acq_rel:                                         \
+      case bson_memory_order_seq_cst:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (                                          \
+            VCIntrinSuffix, , __ATOMIC_SEQ_CST, a, actual, new_value);        \
+         break;                                                               \
+      case bson_memory_order_acquire:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (VCIntrinSuffix,                           \
+                                    MSVC_MEMORDER_SUFFIX (_acq),              \
+                                    __ATOMIC_ACQUIRE,                         \
+                                    a,                                        \
+                                    actual,                                   \
+                                    new_value);                               \
+         break;                                                               \
+      case bson_memory_order_consume:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (VCIntrinSuffix,                           \
+                                    MSVC_MEMORDER_SUFFIX (_acq),              \
+                                    __ATOMIC_CONSUME,                         \
+                                    a,                                        \
+                                    actual,                                   \
+                                    new_value);                               \
+         break;                                                               \
+      case bson_memory_order_relaxed:                                         \
+         DEF_ATOMIC_CMPEXCH_STRONG (VCIntrinSuffix,                           \
+                                    MSVC_MEMORDER_SUFFIX (_nf),               \
+                                    __ATOMIC_RELAXED,                         \
+                                    a,                                        \
+                                    actual,                                   \
+                                    new_value);                               \
+         break;                                                               \
+      default:                                                                \
+         BSON_UNREACHABLE ("Invalid bson_memory_order value");                \
+      }                                                                       \
+      return actual;                                                          \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE Type bson_atomic_##NamePart##_compare_exchange_weak (   \
+      Type volatile *a,                                                       \
+      Type expect,                                                            \
+      Type new_value,                                                         \
+      enum bson_memory_order ord)                                             \
+   {                                                                          \
+      Type actual = expect;                                                   \
+      switch (ord) {                                                          \
+      case bson_memory_order_release:                                         \
+      case bson_memory_order_acq_rel:                                         \
+      case bson_memory_order_seq_cst:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (                                            \
+            VCIntrinSuffix, , __ATOMIC_SEQ_CST, a, actual, new_value);        \
+         break;                                                               \
+      case bson_memory_order_acquire:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix,                             \
+                                  MSVC_MEMORDER_SUFFIX (_acq),                \
+                                  __ATOMIC_ACQUIRE,                           \
+                                  a,                                          \
+                                  actual,                                     \
+                                  new_value);                                 \
+         break;                                                               \
+      case bson_memory_order_consume:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix,                             \
+                                  MSVC_MEMORDER_SUFFIX (_acq),                \
+                                  __ATOMIC_CONSUME,                           \
+                                  a,                                          \
+                                  actual,                                     \
+                                  new_value);                                 \
+         break;                                                               \
+      case bson_memory_order_relaxed:                                         \
+         DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix,                             \
+                                  MSVC_MEMORDER_SUFFIX (_nf),                 \
+                                  __ATOMIC_RELAXED,                           \
+                                  a,                                          \
+                                  actual,                                     \
+                                  new_value);                                 \
+         break;                                                               \
+      default:                                                                \
+         BSON_UNREACHABLE ("Invalid bson_memory_order value");                \
+      }                                                                       \
+      return actual;                                                          \
+   }
+
+#define DECL_ATOMIC_STDINT(Name, VCSuffix) \
+   DECL_ATOMIC_INTEGRAL (Name, Name##_t, VCSuffix)
+
+#if defined(_MSC_VER) || defined(BSON_USE_LEGACY_GCC_ATOMICS)
+/* MSVC and GCC require built-in types (not typedefs) for their atomic
+ * intrinsics. */
+#if defined(_MSC_VER)
+#define DECL_ATOMIC_INTEGRAL_INT8 char
+#define DECL_ATOMIC_INTEGRAL_INT32 long
+#define DECL_ATOMIC_INTEGRAL_INT long
+#else
+#define DECL_ATOMIC_INTEGRAL_INT8 signed char
+#define DECL_ATOMIC_INTEGRAL_INT32 int
+#define DECL_ATOMIC_INTEGRAL_INT int
+#endif
+DECL_ATOMIC_INTEGRAL (int8, DECL_ATOMIC_INTEGRAL_INT8, 8)
+DECL_ATOMIC_INTEGRAL (int16, short, 16)
+#if !defined(BSON_EMULATE_INT32)
+DECL_ATOMIC_INTEGRAL (int32, DECL_ATOMIC_INTEGRAL_INT32, )
+#endif
+#if !defined(BSON_EMULATE_INT)
+DECL_ATOMIC_INTEGRAL (int, DECL_ATOMIC_INTEGRAL_INT, )
+#endif
+#else
+/* Other compilers that we support provide generic intrinsics */
+DECL_ATOMIC_STDINT (int8, 8)
+DECL_ATOMIC_STDINT (int16, 16)
+#if !defined(BSON_EMULATE_INT32)
+DECL_ATOMIC_STDINT (int32, )
+#endif
+#if !defined(BSON_EMULATE_INT)
+DECL_ATOMIC_INTEGRAL (int, int, )
+#endif
+#endif
+
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_fetch_add (int64_t volatile *val,
+                                   int64_t v,
+                                   enum bson_memory_order);
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_exchange (int64_t volatile *val,
+                                  int64_t v,
+                                  enum bson_memory_order);
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_compare_exchange_strong (int64_t volatile *val,
+                                                 int64_t expect_value,
+                                                 int64_t new_value,
+                                                 enum bson_memory_order);
+
+BSON_EXPORT (int64_t)
+_bson_emul_atomic_int64_compare_exchange_weak (int64_t volatile *val,
+                                               int64_t expect_value,
+                                               int64_t new_value,
+                                               enum bson_memory_order);
+
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_fetch_add (int32_t volatile *val,
+                                   int32_t v,
+                                   enum bson_memory_order);
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_exchange (int32_t volatile *val,
+                                  int32_t v,
+                                  enum bson_memory_order);
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_compare_exchange_strong (int32_t volatile *val,
+                                                 int32_t expect_value,
+                                                 int32_t new_value,
+                                                 enum bson_memory_order);
+
+BSON_EXPORT (int32_t)
+_bson_emul_atomic_int32_compare_exchange_weak (int32_t volatile *val,
+                                               int32_t expect_value,
+                                               int32_t new_value,
+                                               enum bson_memory_order);
+
+BSON_EXPORT (int)
+_bson_emul_atomic_int_fetch_add (int volatile *val,
+                                 int v,
+                                 enum bson_memory_order);
+BSON_EXPORT (int)
+_bson_emul_atomic_int_exchange (int volatile *val,
+                                int v,
+                                enum bson_memory_order);
+BSON_EXPORT (int)
+_bson_emul_atomic_int_compare_exchange_strong (int volatile *val,
+                                               int expect_value,
+                                               int new_value,
+                                               enum bson_memory_order);
+
+BSON_EXPORT (int)
+_bson_emul_atomic_int_compare_exchange_weak (int volatile *val,
+                                             int expect_value,
+                                             int new_value,
+                                             enum bson_memory_order);
+
+BSON_EXPORT (void *)
+_bson_emul_atomic_ptr_exchange (void *volatile *val,
+                                void *v,
+                                enum bson_memory_order);
+
+BSON_EXPORT (void)
+bson_thrd_yield (void);
+
+#if (defined(_MSC_VER) && !defined(_M_IX86)) || (defined(__LP64__) && __LP64__)
+/* (64-bit intrinsics are only available in x64) */
+#ifdef _MSC_VER
+DECL_ATOMIC_INTEGRAL (int64, __int64, 64)
+#else
+DECL_ATOMIC_STDINT (int64, 64)
+#endif
+#else
+static BSON_INLINE int64_t
+bson_atomic_int64_fetch (const int64_t volatile *val,
+                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_fetch_add (
+      (int64_t volatile *) val, 0, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_fetch_add (int64_t volatile *val,
+                             int64_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_fetch_add (val, v, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_fetch_sub (int64_t volatile *val,
+                             int64_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_fetch_add (val, -v, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_exchange (int64_t volatile *val,
+                            int64_t v,
+                            enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_exchange (val, v, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_compare_exchange_strong (int64_t volatile *val,
+                                           int64_t expect_value,
+                                           int64_t new_value,
+                                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_compare_exchange_strong (
+      val, expect_value, new_value, order);
+}
+
+static BSON_INLINE int64_t
+bson_atomic_int64_compare_exchange_weak (int64_t volatile *val,
+                                         int64_t expect_value,
+                                         int64_t new_value,
+                                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int64_compare_exchange_weak (
+      val, expect_value, new_value, order);
+}
+#endif
+
+#if defined(BSON_EMULATE_INT32)
+static BSON_INLINE int32_t
+bson_atomic_int32_fetch (const int32_t volatile *val,
+                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_fetch_add (
+      (int32_t volatile *) val, 0, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_fetch_add (int32_t volatile *val,
+                             int32_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_fetch_add (val, v, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_fetch_sub (int32_t volatile *val,
+                             int32_t v,
+                             enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_fetch_add (val, -v, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_exchange (int32_t volatile *val,
+                            int32_t v,
+                            enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_exchange (val, v, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_compare_exchange_strong (int32_t volatile *val,
+                                           int32_t expect_value,
+                                           int32_t new_value,
+                                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_compare_exchange_strong (
+      val, expect_value, new_value, order);
+}
+
+static BSON_INLINE int32_t
+bson_atomic_int32_compare_exchange_weak (int32_t volatile *val,
+                                         int32_t expect_value,
+                                         int32_t new_value,
+                                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int32_compare_exchange_weak (
+      val, expect_value, new_value, order);
+}
+#endif /* BSON_EMULATE_INT32 */
+
+#if defined(BSON_EMULATE_INT)
+static BSON_INLINE int
+bson_atomic_int_fetch (const int volatile *val, enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_fetch_add ((int volatile *) val, 0, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_fetch_add (int volatile *val,
+                           int v,
+                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_fetch_add (val, v, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_fetch_sub (int volatile *val,
+                           int v,
+                           enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_fetch_add (val, -v, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_exchange (int volatile *val,
+                          int v,
+                          enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_exchange (val, v, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_compare_exchange_strong (int volatile *val,
+                                         int expect_value,
+                                         int new_value,
+                                         enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_compare_exchange_strong (
+      val, expect_value, new_value, order);
+}
+
+static BSON_INLINE int
+bson_atomic_int_compare_exchange_weak (int volatile *val,
+                                       int expect_value,
+                                       int new_value,
+                                       enum bson_memory_order order)
+{
+   return _bson_emul_atomic_int_compare_exchange_weak (
+      val, expect_value, new_value, order);
+}
+#endif /* BSON_EMULATE_INT */
+
+static BSON_INLINE void *
+bson_atomic_ptr_exchange (void *volatile *ptr,
+                          void *new_value,
+                          enum bson_memory_order ord)
+{
+#if defined(BSON_EMULATE_PTR)
+   return _bson_emul_atomic_ptr_exchange (ptr, new_value, ord);
+#elif defined(BSON_USE_LEGACY_GCC_ATOMICS)
+   /* The older __sync_val_compare_and_swap also takes oldval */
+   DEF_ATOMIC_OP (_InterlockedExchangePointer,
+                  ,
+                  __sync_val_compare_and_swap,
+                  ord,
+                  ptr,
+                  *ptr,
+                  new_value);
+#else
+   DEF_ATOMIC_OP (
+      _InterlockedExchangePointer, __atomic_exchange_n, , ord, ptr, new_value);
+#endif
+}
+
+static BSON_INLINE void *
+bson_atomic_ptr_compare_exchange_strong (void *volatile *ptr,
+                                         void *expect,
+                                         void *new_value,
+                                         enum bson_memory_order ord)
+{
+   switch (ord) {
+   case bson_memory_order_release:
+   case bson_memory_order_acq_rel:
+   case bson_memory_order_seq_cst:
+      DEF_ATOMIC_CMPEXCH_STRONG (
+         Pointer, , __ATOMIC_SEQ_CST, ptr, expect, new_value);
+      return expect;
+   case bson_memory_order_relaxed:
+      DEF_ATOMIC_CMPEXCH_STRONG (Pointer,
+                                 MSVC_MEMORDER_SUFFIX (_nf),
+                                 __ATOMIC_RELAXED,
+                                 ptr,
+                                 expect,
+                                 new_value);
+      return expect;
+   case bson_memory_order_consume:
+      DEF_ATOMIC_CMPEXCH_STRONG (Pointer,
+                                 MSVC_MEMORDER_SUFFIX (_acq),
+                                 __ATOMIC_CONSUME,
+                                 ptr,
+                                 expect,
+                                 new_value);
+      return expect;
+   case bson_memory_order_acquire:
+      DEF_ATOMIC_CMPEXCH_STRONG (Pointer,
+                                 MSVC_MEMORDER_SUFFIX (_acq),
+                                 __ATOMIC_ACQUIRE,
+                                 ptr,
+                                 expect,
+                                 new_value);
+      return expect;
+   default:
+      BSON_UNREACHABLE ("Invalid bson_memory_order value");
+   }
+}
+
+
+static BSON_INLINE void *
+bson_atomic_ptr_compare_exchange_weak (void *volatile *ptr,
+                                       void *expect,
+                                       void *new_value,
+                                       enum bson_memory_order ord)
+{
+   switch (ord) {
+   case bson_memory_order_release:
+   case bson_memory_order_acq_rel:
+   case bson_memory_order_seq_cst:
+      DEF_ATOMIC_CMPEXCH_WEAK (
+         Pointer, , __ATOMIC_SEQ_CST, ptr, expect, new_value);
+      return expect;
+   case bson_memory_order_relaxed:
+      DEF_ATOMIC_CMPEXCH_WEAK (Pointer,
+                               MSVC_MEMORDER_SUFFIX (_nf),
+                               __ATOMIC_RELAXED,
+                               ptr,
+                               expect,
+                               new_value);
+      return expect;
+   case bson_memory_order_consume:
+      DEF_ATOMIC_CMPEXCH_WEAK (Pointer,
+                               MSVC_MEMORDER_SUFFIX (_acq),
+                               __ATOMIC_CONSUME,
+                               ptr,
+                               expect,
+                               new_value);
+      return expect;
+   case bson_memory_order_acquire:
+      DEF_ATOMIC_CMPEXCH_WEAK (Pointer,
+                               MSVC_MEMORDER_SUFFIX (_acq),
+                               __ATOMIC_ACQUIRE,
+                               ptr,
+                               expect,
+                               new_value);
+      return expect;
+   default:
+      BSON_UNREACHABLE ("Invalid bson_memory_order value");
+   }
+}
+
+
+static BSON_INLINE void *
+bson_atomic_ptr_fetch (void *volatile const *ptr, enum bson_memory_order ord)
+{
+   return bson_atomic_ptr_compare_exchange_strong (
+      (void *volatile *) ptr, NULL, NULL, ord);
+}
+
+#undef DECL_ATOMIC_STDINT
+#undef DECL_ATOMIC_INTEGRAL
+#undef DEF_ATOMIC_OP
+#undef DEF_ATOMIC_CMPEXCH_STRONG
+#undef DEF_ATOMIC_CMPEXCH_WEAK
+#undef MSVC_MEMORDER_SUFFIX
+
+/**
+ * @brief Generate a full-fence memory barrier at the call site.
+ */
+static BSON_INLINE void
+bson_atomic_thread_fence (void)
+{
+   BSON_IF_MSVC (MemoryBarrier ();)
+   BSON_IF_GNU_LIKE (__sync_synchronize ();)
+   BSON_IF_GNU_LEGACY_ATOMICS (__sync_synchronize ();)
+}
+
+#ifdef BSON_USE_LEGACY_GCC_ATOMICS
+#undef BSON_IF_GNU_LIKE
+#define BSON_IF_GNU_LIKE(...) __VA_ARGS__
+#endif
+#undef BSON_IF_GNU_LEGACY_ATOMICS
+#undef BSON_USE_LEGACY_GCC_ATOMICS
+
+BSON_GNUC_DEPRECATED_FOR ("bson_atomic_thread_fence")
+BSON_EXPORT (void) bson_memory_barrier (void);
+
+BSON_GNUC_DEPRECATED_FOR ("bson_atomic_int_fetch_add")
+BSON_EXPORT (int32_t) bson_atomic_int_add (volatile int32_t *p, int32_t n);
+
+BSON_GNUC_DEPRECATED_FOR ("bson_atomic_int64_fetch_add")
+BSON_EXPORT (int64_t) bson_atomic_int64_add (volatile int64_t *p, int64_t n);
+
+
+#undef BSON_EMULATE_PTR
+#undef BSON_EMULATE_INT32
+#undef BSON_EMULATE_INT
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ATOMIC_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-clock.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-clock.h
new file mode 100644
index 0000000..d2f14d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-clock.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_CLOCK_H
+#define BSON_CLOCK_H
+
+
+#include "bson-compat.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (int64_t)
+bson_get_monotonic_time (void);
+BSON_EXPORT (int)
+bson_gettimeofday (struct timeval *tv);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_CLOCK_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-cmp.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-cmp.h
new file mode 100644
index 0000000..98da848
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-cmp.h
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2022 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_CMP_H
+#define BSON_CMP_H
+
+
+#include "bson-compat.h" /* ssize_t */
+#include "bson-macros.h" /* BSON_CONCAT */
+
+#include <limits.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+
+BSON_BEGIN_DECLS
+
+
+/* Based on the "Safe Integral Comparisons" proposal merged in C++20:
+ * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p0586r2.html
+ *
+ * Due to lack of type deduction in C, relational comparison functions (e.g.
+ * `cmp_less`) are defined in sets of four "functions" according to the
+ * signedness of each value argument, e.g.:
+ *  - bson_cmp_less_ss (signed-value, signed-value)
+ *  - bson_cmp_less_uu (unsigned-value, unsigned-value)
+ *  - bson_cmp_less_su (signed-value, unsigned-value)
+ *  - bson_cmp_less_us (unsigned-value, signed-value)
+ *
+ * Similarly, the `in_range` function is defined as a set of two "functions"
+ * according to the signedness of the value argument:
+ *  - bson_in_range_signed (Type, signed-value)
+ *  - bson_in_range_unsigned (Type, unsigned-value)
+ *
+ * The user must take care to use the correct signedness for the provided
+ * argument(s). Enabling compiler warnings for implicit sign conversions is
+ * recommended.
+ */
+
+
+#define BSON_CMP_SET(op, ss, uu, su, us)                                  \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _ss) (int64_t t,  \
+                                                              int64_t u)  \
+   {                                                                      \
+      return (ss);                                                        \
+   }                                                                      \
+                                                                          \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _uu) (uint64_t t, \
+                                                              uint64_t u) \
+   {                                                                      \
+      return (uu);                                                        \
+   }                                                                      \
+                                                                          \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _su) (int64_t t,  \
+                                                              uint64_t u) \
+   {                                                                      \
+      return (su);                                                        \
+   }                                                                      \
+                                                                          \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_cmp_, op, _us) (uint64_t t, \
+                                                              int64_t u)  \
+   {                                                                      \
+      return (us);                                                        \
+   }
+
+BSON_CMP_SET (equal,
+              t == u,
+              t == u,
+              t < 0 ? false : (uint64_t) (t) == u,
+              u < 0 ? false : t == (uint64_t) (u))
+
+BSON_CMP_SET (not_equal,
+              !bson_cmp_equal_ss (t, u),
+              !bson_cmp_equal_uu (t, u),
+              !bson_cmp_equal_su (t, u),
+              !bson_cmp_equal_us (t, u))
+
+BSON_CMP_SET (less,
+              t < u,
+              t < u,
+              t < 0 ? true : (uint64_t) (t) < u,
+              u < 0 ? false : t < (uint64_t) (u))
+
+BSON_CMP_SET (greater,
+              bson_cmp_less_ss (u, t),
+              bson_cmp_less_uu (u, t),
+              bson_cmp_less_us (u, t),
+              bson_cmp_less_su (u, t))
+
+BSON_CMP_SET (less_equal,
+              !bson_cmp_greater_ss (t, u),
+              !bson_cmp_greater_uu (t, u),
+              !bson_cmp_greater_su (t, u),
+              !bson_cmp_greater_us (t, u))
+
+BSON_CMP_SET (greater_equal,
+              !bson_cmp_less_ss (t, u),
+              !bson_cmp_less_uu (t, u),
+              !bson_cmp_less_su (t, u),
+              !bson_cmp_less_us (t, u))
+
+#undef BSON_CMP_SET
+
+
+/* Return true if the given value is within the range of the corresponding
+ * signed type. The suffix must match the signedness of the given value. */
+#define BSON_IN_RANGE_SET_SIGNED(Type, min, max)                              \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _signed) (   \
+      int64_t value)                                                          \
+   {                                                                          \
+      return bson_cmp_greater_equal_ss (value, min) &&                        \
+             bson_cmp_less_equal_ss (value, max);                             \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) ( \
+      uint64_t value)                                                         \
+   {                                                                          \
+      return bson_cmp_greater_equal_us (value, min) &&                        \
+             bson_cmp_less_equal_us (value, max);                             \
+   }
+
+/* Return true if the given value is within the range of the corresponding
+ * unsigned type. The suffix must match the signedness of the given value. */
+#define BSON_IN_RANGE_SET_UNSIGNED(Type, max)                                 \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _signed) (   \
+      int64_t value)                                                          \
+   {                                                                          \
+      return bson_cmp_greater_equal_su (value, 0u) &&                         \
+             bson_cmp_less_equal_su (value, max);                             \
+   }                                                                          \
+                                                                              \
+   static BSON_INLINE bool BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) ( \
+      uint64_t value)                                                         \
+   {                                                                          \
+      return bson_cmp_less_equal_uu (value, max);                             \
+   }
+
+BSON_IN_RANGE_SET_SIGNED (signed_char, SCHAR_MIN, SCHAR_MAX)
+BSON_IN_RANGE_SET_SIGNED (short, SHRT_MIN, SHRT_MAX)
+BSON_IN_RANGE_SET_SIGNED (int, INT_MIN, INT_MAX)
+BSON_IN_RANGE_SET_SIGNED (long, LONG_MIN, LONG_MAX)
+BSON_IN_RANGE_SET_SIGNED (long_long, LLONG_MIN, LLONG_MAX)
+
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_char, UCHAR_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_short, USHRT_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_int, UINT_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_long, ULONG_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (unsigned_long_long, ULLONG_MAX)
+
+BSON_IN_RANGE_SET_SIGNED (int8_t, INT8_MIN, INT8_MAX)
+BSON_IN_RANGE_SET_SIGNED (int16_t, INT16_MIN, INT16_MAX)
+BSON_IN_RANGE_SET_SIGNED (int32_t, INT32_MIN, INT32_MAX)
+BSON_IN_RANGE_SET_SIGNED (int64_t, INT64_MIN, INT64_MAX)
+
+BSON_IN_RANGE_SET_UNSIGNED (uint8_t, UINT8_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (uint16_t, UINT16_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (uint32_t, UINT32_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (uint64_t, UINT64_MAX)
+
+BSON_IN_RANGE_SET_SIGNED (ssize_t, SSIZE_MIN, SSIZE_MAX)
+BSON_IN_RANGE_SET_UNSIGNED (size_t, SIZE_MAX)
+
+#undef BSON_IN_RANGE_SET_SIGNED
+#undef BSON_IN_RANGE_SET_UNSIGNED
+
+
+/* Return true if the value with *signed* type is in the representable range of
+ * Type and false otherwise. */
+#define bson_in_range_signed(Type, value) \
+   BSON_CONCAT3 (bson_in_range, _##Type, _signed) (value)
+
+/* Return true if the value with *unsigned* type is in the representable range
+ * of Type and false otherwise. */
+#define bson_in_range_unsigned(Type, value) \
+   BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) (value)
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_CMP_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-compat.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-compat.h
new file mode 100644
index 0000000..ef49292
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-compat.h
@@ -0,0 +1,353 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_COMPAT_H
+#define BSON_COMPAT_H
+
+
+#if defined(__MINGW32__)
+#if defined(__USE_MINGW_ANSI_STDIO)
+#if __USE_MINGW_ANSI_STDIO < 1
+#error "__USE_MINGW_ANSI_STDIO > 0 is required for correct PRI* macros"
+#endif
+#else
+#define __USE_MINGW_ANSI_STDIO 1
+#endif
+#endif
+
+#include "bson-config.h"
+#include "bson-macros.h"
+
+
+#ifdef BSON_OS_WIN32
+#if defined(_WIN32_WINNT) && (_WIN32_WINNT < 0x0600)
+#undef _WIN32_WINNT
+#endif
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0600
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <winsock2.h>
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#else
+#include <windows.h>
+#endif
+#include <direct.h>
+#include <io.h>
+#endif
+
+
+#ifdef BSON_OS_UNIX
+#include <unistd.h>
+#include <sys/time.h>
+#endif
+
+
+#include "bson-macros.h"
+
+
+#include <errno.h>
+#include <ctype.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <stdint.h>
+
+
+BSON_BEGIN_DECLS
+
+#if !defined(_MSC_VER) || (_MSC_VER >= 1800)
+#include <inttypes.h>
+#endif
+#ifdef _MSC_VER
+#ifndef __cplusplus
+/* benign redefinition of type */
+#pragma warning(disable : 4142)
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+typedef SSIZE_T ssize_t;
+#endif
+#ifndef _SIZE_T_DEFINED
+#define _SIZE_T_DEFINED
+typedef SIZE_T size_t;
+#endif
+#pragma warning(default : 4142)
+#else
+/*
+ * MSVC++ does not include ssize_t, just size_t.
+ * So we need to synthesize that as well.
+ */
+#pragma warning(disable : 4142)
+#ifndef _SSIZE_T_DEFINED
+#define _SSIZE_T_DEFINED
+typedef SSIZE_T ssize_t;
+#endif
+#pragma warning(default : 4142)
+#endif
+#ifndef PRIi32
+#define PRIi32 "d"
+#endif
+#ifndef PRId32
+#define PRId32 "d"
+#endif
+#ifndef PRIu32
+#define PRIu32 "u"
+#endif
+#ifndef PRIi64
+#define PRIi64 "I64i"
+#endif
+#ifndef PRId64
+#define PRId64 "I64i"
+#endif
+#ifndef PRIu64
+#define PRIu64 "I64u"
+#endif
+#endif
+
+/* Derive the maximum representable value of signed integer type T using the
+ * formula 2^(N - 1) - 1 where N is the number of bits in type T. This assumes
+ * T is represented using two's complement. */
+#define BSON_NUMERIC_LIMITS_MAX_SIGNED(T) \
+   ((T) ((((size_t) 0x01u) << (sizeof (T) * (size_t) CHAR_BIT - 1u)) - 1u))
+
+/* Derive the minimum representable value of signed integer type T as one less
+ * than the negation of its maximum representable value. This assumes T is
+ * represented using two's complement. */
+#define BSON_NUMERIC_LIMITS_MIN_SIGNED(T, max) ((T) ((-(max)) - 1))
+
+/* Derive the maximum representable value of unsigned integer type T by flipping
+ * all its bits to 1. */
+#define BSON_NUMERIC_LIMITS_MAX_UNSIGNED(T) ((T) (~((T) 0)))
+
+/* Define numeric limit constants if not already available for C90
+ * compatibility. These can be removed once C99 is declared the minimum
+ * supported C standard. */
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
+
+#ifndef SCHAR_MAX
+#define SCHAR_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (signed char)
+#endif
+
+#ifndef SHRT_MAX
+#define SHRT_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (short)
+#endif
+
+#ifndef INT_MAX
+#define INT_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int)
+#endif
+
+#ifndef LONG_MAX
+#define LONG_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (long)
+#endif
+
+#ifndef LLONG_MAX
+#define LLONG_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (long long)
+#endif
+
+#ifndef UCHAR_MAX
+#define UCHAR_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned char)
+#endif
+
+#ifndef USHRT_MAX
+#define USHRT_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned short)
+#endif
+
+#ifndef UINT_MAX
+#define UINT_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned int)
+#endif
+
+#ifndef ULONG_MAX
+#define ULONG_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned long)
+#endif
+
+#ifndef ULLONG_MAX
+#define ULLONG_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (unsigned long long)
+#endif
+
+#ifndef INT8_MAX
+#define INT8_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int8_t)
+#endif
+
+#ifndef INT16_MAX
+#define INT16_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int16_t)
+#endif
+
+#ifndef INT32_MAX
+#define INT32_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int32_t)
+#endif
+
+#ifndef INT64_MAX
+#define INT64_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (int64_t)
+#endif
+
+#ifndef UINT8_MAX
+#define UINT8_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint8_t)
+#endif
+
+#ifndef UINT16_MAX
+#define UINT16_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint16_t)
+#endif
+
+#ifndef UINT32_MAX
+#define UINT32_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint32_t)
+#endif
+
+#ifndef UINT64_MAX
+#define UINT64_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (uint64_t)
+#endif
+
+#ifndef SIZE_MAX
+#define SIZE_MAX BSON_NUMERIC_LIMITS_MAX_UNSIGNED (size_t)
+#endif
+
+#ifndef PTRDIFF_MAX
+#define PTRDIFF_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (ptrdiff_t)
+#endif
+
+#ifndef SCHAR_MIN
+#define SCHAR_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (signed char, SCHAR_MAX)
+#endif
+
+#ifndef SHRT_MIN
+#define SHRT_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (short, SHRT_MAX)
+#endif
+
+#ifndef INT_MIN
+#define INT_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int, INT_MAX)
+#endif
+
+#ifndef LONG_MIN
+#define LONG_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (long, LONG_MAX)
+#endif
+
+#ifndef LLONG_MIN
+#define LLONG_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (long long, LLONG_MAX)
+#endif
+
+#ifndef INT8_MIN
+#define INT8_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int8_t, INT8_MAX)
+#endif
+
+#ifndef INT16_MIN
+#define INT16_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int16_t, INT16_MAX)
+#endif
+
+#ifndef INT32_MIN
+#define INT32_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int32_t, INT32_MAX)
+#endif
+
+#ifndef INT64_MIN
+#define INT64_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (int64_t, INT64_MAX)
+#endif
+
+#ifndef PTRDIFF_MIN
+#define PTRDIFF_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (ptrdiff_t, PTRDIFF_MAX)
+#endif
+
+#endif /* !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L */
+
+
+#ifndef SSIZE_MAX
+#define SSIZE_MAX BSON_NUMERIC_LIMITS_MAX_SIGNED (ssize_t)
+#endif
+
+#ifndef SSIZE_MIN
+#define SSIZE_MIN BSON_NUMERIC_LIMITS_MIN_SIGNED (ssize_t, SSIZE_MAX)
+#endif
+
+#if defined(__MINGW32__) && !defined(INIT_ONCE_STATIC_INIT)
+#define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT
+typedef RTL_RUN_ONCE INIT_ONCE;
+#endif
+
+#ifdef BSON_HAVE_STDBOOL_H
+#include <stdbool.h>
+#elif !defined(__bool_true_false_are_defined)
+#ifndef __cplusplus
+typedef signed char bool;
+#define false 0
+#define true 1
+#endif
+#define __bool_true_false_are_defined 1
+#endif
+
+
+#if defined(__GNUC__)
+#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
+#define bson_sync_synchronize() __sync_synchronize ()
+#elif defined(__i386__) || defined(__i486__) || defined(__i586__) || \
+   defined(__i686__) || defined(__x86_64__)
+#define bson_sync_synchronize() asm volatile("mfence" ::: "memory")
+#else
+#define bson_sync_synchronize() asm volatile("sync" ::: "memory")
+#endif
+#elif defined(_MSC_VER)
+#define bson_sync_synchronize() MemoryBarrier ()
+#endif
+
+
+#if !defined(va_copy) && defined(__va_copy)
+#define va_copy(dst, src) __va_copy (dst, src)
+#endif
+
+
+#if !defined(va_copy)
+#define va_copy(dst, src) ((dst) = (src))
+#endif
+
+
+#ifdef _MSC_VER
+/** Expands the arguments if compiling with MSVC, otherwise empty */
+#define BSON_IF_MSVC(...) __VA_ARGS__
+/** Expands the arguments if compiling with GCC or Clang, otherwise empty */
+#define BSON_IF_GNU_LIKE(...)
+#elif defined(__GNUC__) || defined(__clang__)
+/** Expands the arguments if compiling with MSVC, otherwise empty */
+#define BSON_IF_MSVC(...)
+/** Expands the arguments if compiling with GCC or Clang, otherwise empty */
+#define BSON_IF_GNU_LIKE(...) __VA_ARGS__
+#endif
+
+#ifdef BSON_OS_WIN32
+/** Expands the arguments if compiling for Windows, otherwise empty */
+#define BSON_IF_WINDOWS(...) __VA_ARGS__
+/** Expands the arguments if compiling for POSIX, otherwise empty */
+#define BSON_IF_POSIX(...)
+#elif defined(BSON_OS_UNIX)
+/** Expands the arguments if compiling for Windows, otherwise empty */
+#define BSON_IF_WINDOWS(...)
+/** Expands the arguments if compiling for POSIX, otherwise empty */
+#define BSON_IF_POSIX(...) __VA_ARGS__
+#endif
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_COMPAT_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-config.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-config.h
new file mode 100644
index 0000000..03b9f71
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-config.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(BSON_INSIDE) && !defined(BSON_COMPILATION)
+#error "Only <bson/bson.h> can be included directly."
+#endif
+
+#ifndef BSON_CONFIG_H
+#define BSON_CONFIG_H
+
+/*
+ * Define to 1234 for Little Endian, 4321 for Big Endian.
+ */
+#define BSON_BYTE_ORDER 1234
+
+
+/*
+ * Define to 1 if you have stdbool.h
+ */
+#define BSON_HAVE_STDBOOL_H 1
+#if BSON_HAVE_STDBOOL_H != 1
+# undef BSON_HAVE_STDBOOL_H
+#endif
+
+
+/*
+ * Define to 1 for POSIX-like systems, 2 for Windows.
+ */
+#define BSON_OS 2
+
+
+/*
+ * Define to 1 if you have clock_gettime() available.
+ */
+#define BSON_HAVE_CLOCK_GETTIME 0
+#if BSON_HAVE_CLOCK_GETTIME != 1
+# undef BSON_HAVE_CLOCK_GETTIME
+#endif
+
+
+/*
+ * Define to 1 if you have strings.h available on your platform.
+ */
+#define BSON_HAVE_STRINGS_H 0
+#if BSON_HAVE_STRINGS_H != 1
+# undef BSON_HAVE_STRINGS_H
+#endif
+
+
+/*
+ * Define to 1 if you have strnlen available on your platform.
+ */
+#define BSON_HAVE_STRNLEN 0
+#if BSON_HAVE_STRNLEN != 1
+# undef BSON_HAVE_STRNLEN
+#endif
+
+
+/*
+ * Define to 1 if you have snprintf available on your platform.
+ */
+#define BSON_HAVE_SNPRINTF 1
+#if BSON_HAVE_SNPRINTF != 1
+# undef BSON_HAVE_SNPRINTF
+#endif
+
+
+/*
+ * Define to 1 if you have gmtime_r available on your platform.
+ */
+#define BSON_HAVE_GMTIME_R 0
+#if BSON_HAVE_GMTIME_R != 1
+# undef BSON_HAVE_GMTIME_R
+#endif
+
+
+/*
+ * Define to 1 if you have struct timespec available on your platform.
+ */
+#define BSON_HAVE_TIMESPEC 1
+#if BSON_HAVE_TIMESPEC != 1
+# undef BSON_HAVE_TIMESPEC
+#endif
+
+
+/*
+ * Define to 1 if you want extra aligned types in libbson
+ */
+#define BSON_EXTRA_ALIGN 1
+#if BSON_EXTRA_ALIGN != 1
+# undef BSON_EXTRA_ALIGN
+#endif
+
+
+/*
+ * Define to 1 if you have rand_r available on your platform.
+ */
+#define BSON_HAVE_RAND_R 0
+#if BSON_HAVE_RAND_R != 1
+# undef BSON_HAVE_RAND_R
+#endif
+
+
+/*
+ * Define to 1 if you have strlcpy available on your platform.
+ */
+#define BSON_HAVE_STRLCPY 0
+#if BSON_HAVE_STRLCPY != 1
+# undef BSON_HAVE_STRLCPY
+#endif
+
+#endif /* BSON_CONFIG_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-context.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-context.h
new file mode 100644
index 0000000..3098ce6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-context.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_CONTEXT_H
+#define BSON_CONTEXT_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * @brief Initialize a new context with the given flags
+ *
+ * @param flags Flags used to configure the behavior of the context. For most
+ * cases, this should be BSON_CONTEXT_NONE.
+ *
+ * @return A newly allocated context. Must be freed with bson_context_destroy()
+ *
+ * @note If you expect your pid to change without notice, such as from an
+ * unexpected call to fork(), then specify BSON_CONTEXT_DISABLE_PID_CACHE in
+ * `flags`.
+ */
+BSON_EXPORT (bson_context_t *)
+bson_context_new (bson_context_flags_t flags);
+
+/**
+ * @brief Destroy and free a bson_context_t created by bson_context_new()
+ */
+BSON_EXPORT (void)
+bson_context_destroy (bson_context_t *context);
+
+/**
+ * @brief Obtain a pointer to the application-default bson_context_t
+ *
+ * @note This context_t MUST NOT be passed to bson_context_destroy()
+ */
+BSON_EXPORT (bson_context_t *)
+bson_context_get_default (void);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_CONTEXT_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-decimal128.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-decimal128.h
new file mode 100644
index 0000000..51ec46f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-decimal128.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_DECIMAL128_H
+#define BSON_DECIMAL128_H
+
+
+#include <string.h>
+
+#include "bson-macros.h"
+#include "bson-config.h"
+#include "bson-types.h"
+
+
+/**
+ * BSON_DECIMAL128_STRING:
+ *
+ * The length of a decimal128 string (with null terminator).
+ *
+ * 1  for the sign
+ * 35 for digits and radix
+ * 2  for exponent indicator and sign
+ * 4  for exponent digits
+ */
+#define BSON_DECIMAL128_STRING 43
+#define BSON_DECIMAL128_INF "Infinity"
+#define BSON_DECIMAL128_NAN "NaN"
+
+
+BSON_BEGIN_DECLS
+
+BSON_EXPORT (void)
+bson_decimal128_to_string (const bson_decimal128_t *dec, char *str);
+
+
+/* Note: @string must be ASCII characters only! */
+BSON_EXPORT (bool)
+bson_decimal128_from_string (const char *string, bson_decimal128_t *dec);
+
+BSON_EXPORT (bool)
+bson_decimal128_from_string_w_len (const char *string,
+                                   int len,
+                                   bson_decimal128_t *dec);
+
+BSON_END_DECLS
+
+
+#endif /* BSON_DECIMAL128_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-endian.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-endian.h
new file mode 100644
index 0000000..1acb547
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-endian.h
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ENDIAN_H
+#define BSON_ENDIAN_H
+
+
+#if defined(__sun)
+#include <sys/byteorder.h>
+#endif
+
+#include "bson-config.h"
+#include "bson-macros.h"
+#include "bson-compat.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_BIG_ENDIAN 4321
+#define BSON_LITTLE_ENDIAN 1234
+
+
+#if defined(__sun)
+#define BSON_UINT16_SWAP_LE_BE(v) BSWAP_16 ((uint16_t) v)
+#define BSON_UINT32_SWAP_LE_BE(v) BSWAP_32 ((uint32_t) v)
+#define BSON_UINT64_SWAP_LE_BE(v) BSWAP_64 ((uint64_t) v)
+#elif defined(__clang__) && defined(__clang_major__) &&  \
+   defined(__clang_minor__) && (__clang_major__ >= 3) && \
+   (__clang_minor__ >= 1)
+#if __has_builtin(__builtin_bswap16)
+#define BSON_UINT16_SWAP_LE_BE(v) __builtin_bswap16 (v)
+#endif
+#if __has_builtin(__builtin_bswap32)
+#define BSON_UINT32_SWAP_LE_BE(v) __builtin_bswap32 (v)
+#endif
+#if __has_builtin(__builtin_bswap64)
+#define BSON_UINT64_SWAP_LE_BE(v) __builtin_bswap64 (v)
+#endif
+#elif defined(__GNUC__) && (__GNUC__ >= 4)
+#if __GNUC__ > 4 || (defined(__GNUC_MINOR__) && __GNUC_MINOR__ >= 3)
+#define BSON_UINT32_SWAP_LE_BE(v) __builtin_bswap32 ((uint32_t) v)
+#define BSON_UINT64_SWAP_LE_BE(v) __builtin_bswap64 ((uint64_t) v)
+#endif
+#if __GNUC__ > 4 || (defined(__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
+#define BSON_UINT16_SWAP_LE_BE(v) __builtin_bswap16 ((uint32_t) v)
+#endif
+#endif
+
+
+#ifndef BSON_UINT16_SWAP_LE_BE
+#define BSON_UINT16_SWAP_LE_BE(v) __bson_uint16_swap_slow ((uint16_t) v)
+#endif
+
+
+#ifndef BSON_UINT32_SWAP_LE_BE
+#define BSON_UINT32_SWAP_LE_BE(v) __bson_uint32_swap_slow ((uint32_t) v)
+#endif
+
+
+#ifndef BSON_UINT64_SWAP_LE_BE
+#define BSON_UINT64_SWAP_LE_BE(v) __bson_uint64_swap_slow ((uint64_t) v)
+#endif
+
+
+#if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN
+#define BSON_UINT16_FROM_LE(v) ((uint16_t) v)
+#define BSON_UINT16_TO_LE(v) ((uint16_t) v)
+#define BSON_UINT16_FROM_BE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT16_TO_BE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT32_FROM_LE(v) ((uint32_t) v)
+#define BSON_UINT32_TO_LE(v) ((uint32_t) v)
+#define BSON_UINT32_FROM_BE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT32_TO_BE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT64_FROM_LE(v) ((uint64_t) v)
+#define BSON_UINT64_TO_LE(v) ((uint64_t) v)
+#define BSON_UINT64_FROM_BE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_UINT64_TO_BE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_DOUBLE_FROM_LE(v) ((double) v)
+#define BSON_DOUBLE_TO_LE(v) ((double) v)
+#elif BSON_BYTE_ORDER == BSON_BIG_ENDIAN
+#define BSON_UINT16_FROM_LE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT16_TO_LE(v) BSON_UINT16_SWAP_LE_BE (v)
+#define BSON_UINT16_FROM_BE(v) ((uint16_t) v)
+#define BSON_UINT16_TO_BE(v) ((uint16_t) v)
+#define BSON_UINT32_FROM_LE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT32_TO_LE(v) BSON_UINT32_SWAP_LE_BE (v)
+#define BSON_UINT32_FROM_BE(v) ((uint32_t) v)
+#define BSON_UINT32_TO_BE(v) ((uint32_t) v)
+#define BSON_UINT64_FROM_LE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_UINT64_TO_LE(v) BSON_UINT64_SWAP_LE_BE (v)
+#define BSON_UINT64_FROM_BE(v) ((uint64_t) v)
+#define BSON_UINT64_TO_BE(v) ((uint64_t) v)
+#define BSON_DOUBLE_FROM_LE(v) (__bson_double_swap_slow (v))
+#define BSON_DOUBLE_TO_LE(v) (__bson_double_swap_slow (v))
+#else
+#error "The endianness of target architecture is unknown."
+#endif
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_uint16_swap_slow --
+ *
+ *       Fallback endianness conversion for 16-bit integers.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+static BSON_INLINE uint16_t
+__bson_uint16_swap_slow (uint16_t v) /* IN */
+{
+   return (uint16_t) ((v & 0x00FF) << 8) | (uint16_t) ((v & 0xFF00) >> 8);
+}
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_uint32_swap_slow --
+ *
+ *       Fallback endianness conversion for 32-bit integers.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+static BSON_INLINE uint32_t
+__bson_uint32_swap_slow (uint32_t v) /* IN */
+{
+   return ((v & 0x000000FFU) << 24) | ((v & 0x0000FF00U) << 8) |
+          ((v & 0x00FF0000U) >> 8) | ((v & 0xFF000000U) >> 24);
+}
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_uint64_swap_slow --
+ *
+ *       Fallback endianness conversion for 64-bit integers.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+static BSON_INLINE uint64_t
+__bson_uint64_swap_slow (uint64_t v) /* IN */
+{
+   return ((v & 0x00000000000000FFULL) << 56) |
+          ((v & 0x000000000000FF00ULL) << 40) |
+          ((v & 0x0000000000FF0000ULL) << 24) |
+          ((v & 0x00000000FF000000ULL) << 8) |
+          ((v & 0x000000FF00000000ULL) >> 8) |
+          ((v & 0x0000FF0000000000ULL) >> 24) |
+          ((v & 0x00FF000000000000ULL) >> 40) |
+          ((v & 0xFF00000000000000ULL) >> 56);
+}
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * __bson_double_swap_slow --
+ *
+ *       Fallback endianness conversion for double floating point.
+ *
+ * Returns:
+ *       The endian swapped version.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+BSON_STATIC_ASSERT2 (sizeof_uint64_t, sizeof (double) == sizeof (uint64_t));
+
+static BSON_INLINE double
+__bson_double_swap_slow (double v) /* IN */
+{
+   uint64_t uv;
+
+   memcpy (&uv, &v, sizeof (v));
+   uv = BSON_UINT64_SWAP_LE_BE (uv);
+   memcpy (&v, &uv, sizeof (v));
+
+   return v;
+}
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ENDIAN_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-error.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-error.h
new file mode 100644
index 0000000..24b6b97
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-error.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ERROR_H
+#define BSON_ERROR_H
+
+
+#include "bson-compat.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_ERROR_JSON 1
+#define BSON_ERROR_READER 2
+#define BSON_ERROR_INVALID 3
+
+
+BSON_EXPORT (void)
+bson_set_error (bson_error_t *error,
+                uint32_t domain,
+                uint32_t code,
+                const char *format,
+                ...) BSON_GNUC_PRINTF (4, 5);
+BSON_EXPORT (char *)
+bson_strerror_r (int err_code, char *buf, size_t buflen);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ERROR_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-iter.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-iter.h
new file mode 100644
index 0000000..92e1968
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-iter.h
@@ -0,0 +1,547 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_ITER_H
+#define BSON_ITER_H
+
+
+#include "bson.h"
+#include "bson-endian.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_ITER_HOLDS_DOUBLE(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DOUBLE)
+
+#define BSON_ITER_HOLDS_UTF8(iter) (bson_iter_type ((iter)) == BSON_TYPE_UTF8)
+
+#define BSON_ITER_HOLDS_DOCUMENT(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DOCUMENT)
+
+#define BSON_ITER_HOLDS_ARRAY(iter) (bson_iter_type ((iter)) == BSON_TYPE_ARRAY)
+
+#define BSON_ITER_HOLDS_BINARY(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_BINARY)
+
+#define BSON_ITER_HOLDS_UNDEFINED(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_UNDEFINED)
+
+#define BSON_ITER_HOLDS_OID(iter) (bson_iter_type ((iter)) == BSON_TYPE_OID)
+
+#define BSON_ITER_HOLDS_BOOL(iter) (bson_iter_type ((iter)) == BSON_TYPE_BOOL)
+
+#define BSON_ITER_HOLDS_DATE_TIME(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DATE_TIME)
+
+#define BSON_ITER_HOLDS_NULL(iter) (bson_iter_type ((iter)) == BSON_TYPE_NULL)
+
+#define BSON_ITER_HOLDS_REGEX(iter) (bson_iter_type ((iter)) == BSON_TYPE_REGEX)
+
+#define BSON_ITER_HOLDS_DBPOINTER(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DBPOINTER)
+
+#define BSON_ITER_HOLDS_CODE(iter) (bson_iter_type ((iter)) == BSON_TYPE_CODE)
+
+#define BSON_ITER_HOLDS_SYMBOL(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_SYMBOL)
+
+#define BSON_ITER_HOLDS_CODEWSCOPE(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_CODEWSCOPE)
+
+#define BSON_ITER_HOLDS_INT32(iter) (bson_iter_type ((iter)) == BSON_TYPE_INT32)
+
+#define BSON_ITER_HOLDS_TIMESTAMP(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_TIMESTAMP)
+
+#define BSON_ITER_HOLDS_INT64(iter) (bson_iter_type ((iter)) == BSON_TYPE_INT64)
+
+#define BSON_ITER_HOLDS_DECIMAL128(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_DECIMAL128)
+
+#define BSON_ITER_HOLDS_MAXKEY(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_MAXKEY)
+
+#define BSON_ITER_HOLDS_MINKEY(iter) \
+   (bson_iter_type ((iter)) == BSON_TYPE_MINKEY)
+
+#define BSON_ITER_HOLDS_INT(iter) \
+   (BSON_ITER_HOLDS_INT32 (iter) || BSON_ITER_HOLDS_INT64 (iter))
+
+#define BSON_ITER_HOLDS_NUMBER(iter) \
+   (BSON_ITER_HOLDS_INT (iter) || BSON_ITER_HOLDS_DOUBLE (iter))
+
+#define BSON_ITER_IS_KEY(iter, key) \
+   (0 == strcmp ((key), bson_iter_key ((iter))))
+
+
+BSON_EXPORT (const bson_value_t *)
+bson_iter_value (bson_iter_t *iter);
+
+
+/**
+ * bson_iter_utf8_len_unsafe:
+ * @iter: a bson_iter_t.
+ *
+ * Returns the length of a string currently pointed to by @iter. This performs
+ * no validation so the is responsible for knowing the BSON is valid. Calling
+ * bson_validate() is one way to do this ahead of time.
+ */
+static BSON_INLINE uint32_t
+bson_iter_utf8_len_unsafe (const bson_iter_t *iter)
+{
+   int32_t val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   val = BSON_UINT32_FROM_LE (val);
+   return BSON_MAX (0, val - 1);
+}
+
+
+BSON_EXPORT (void)
+bson_iter_array (const bson_iter_t *iter,
+                 uint32_t *array_len,
+                 const uint8_t **array);
+
+
+BSON_EXPORT (void)
+bson_iter_binary (const bson_iter_t *iter,
+                  bson_subtype_t *subtype,
+                  uint32_t *binary_len,
+                  const uint8_t **binary);
+
+
+BSON_EXPORT (const char *)
+bson_iter_code (const bson_iter_t *iter, uint32_t *length);
+
+
+/**
+ * bson_iter_code_unsafe:
+ * @iter: A bson_iter_t.
+ * @length: A location for the length of the resulting string.
+ *
+ * Like bson_iter_code() but performs no integrity checks.
+ *
+ * Returns: A string that should not be modified or freed.
+ */
+static BSON_INLINE const char *
+bson_iter_code_unsafe (const bson_iter_t *iter, uint32_t *length)
+{
+   *length = bson_iter_utf8_len_unsafe (iter);
+   return (const char *) (iter->raw + iter->d2);
+}
+
+
+BSON_EXPORT (const char *)
+bson_iter_codewscope (const bson_iter_t *iter,
+                      uint32_t *length,
+                      uint32_t *scope_len,
+                      const uint8_t **scope);
+
+
+BSON_EXPORT (void)
+bson_iter_dbpointer (const bson_iter_t *iter,
+                     uint32_t *collection_len,
+                     const char **collection,
+                     const bson_oid_t **oid);
+
+
+BSON_EXPORT (void)
+bson_iter_document (const bson_iter_t *iter,
+                    uint32_t *document_len,
+                    const uint8_t **document);
+
+
+BSON_EXPORT (double)
+bson_iter_double (const bson_iter_t *iter);
+
+BSON_EXPORT (double)
+bson_iter_as_double (const bson_iter_t *iter);
+
+/**
+ * bson_iter_double_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_double() but does not perform an integrity checking.
+ *
+ * Returns: A double.
+ */
+static BSON_INLINE double
+bson_iter_double_unsafe (const bson_iter_t *iter)
+{
+   double val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   return BSON_DOUBLE_FROM_LE (val);
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_init (bson_iter_t *iter, const bson_t *bson);
+
+BSON_EXPORT (bool)
+bson_iter_init_from_data (bson_iter_t *iter,
+                          const uint8_t *data,
+                          size_t length);
+
+
+BSON_EXPORT (bool)
+bson_iter_init_find (bson_iter_t *iter, const bson_t *bson, const char *key);
+
+
+BSON_EXPORT (bool)
+bson_iter_init_find_w_len (bson_iter_t *iter,
+                           const bson_t *bson,
+                           const char *key,
+                           int keylen);
+
+
+BSON_EXPORT (bool)
+bson_iter_init_find_case (bson_iter_t *iter,
+                          const bson_t *bson,
+                          const char *key);
+
+BSON_EXPORT (bool)
+bson_iter_init_from_data_at_offset (bson_iter_t *iter,
+                                    const uint8_t *data,
+                                    size_t length,
+                                    uint32_t offset,
+                                    uint32_t keylen);
+
+BSON_EXPORT (int32_t)
+bson_iter_int32 (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_int32_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_int32() but with no integrity checking.
+ *
+ * Returns: A 32-bit signed integer.
+ */
+static BSON_INLINE int32_t
+bson_iter_int32_unsafe (const bson_iter_t *iter)
+{
+   int32_t val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   return BSON_UINT32_FROM_LE (val);
+}
+
+
+BSON_EXPORT (int64_t)
+bson_iter_int64 (const bson_iter_t *iter);
+
+
+BSON_EXPORT (int64_t)
+bson_iter_as_int64 (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_int64_unsafe:
+ * @iter: a bson_iter_t.
+ *
+ * Similar to bson_iter_int64() but without integrity checking.
+ *
+ * Returns: A 64-bit signed integer.
+ */
+static BSON_INLINE int64_t
+bson_iter_int64_unsafe (const bson_iter_t *iter)
+{
+   int64_t val;
+
+   memcpy (&val, iter->raw + iter->d1, sizeof (val));
+   return BSON_UINT64_FROM_LE (val);
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_find (bson_iter_t *iter, const char *key);
+
+
+BSON_EXPORT (bool)
+bson_iter_find_w_len (bson_iter_t *iter, const char *key, int keylen);
+
+
+BSON_EXPORT (bool)
+bson_iter_find_case (bson_iter_t *iter, const char *key);
+
+
+BSON_EXPORT (bool)
+bson_iter_find_descendant (bson_iter_t *iter,
+                           const char *dotkey,
+                           bson_iter_t *descendant);
+
+
+BSON_EXPORT (bool)
+bson_iter_next (bson_iter_t *iter);
+
+
+BSON_EXPORT (const bson_oid_t *)
+bson_iter_oid (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_oid_unsafe:
+ * @iter: A #bson_iter_t.
+ *
+ * Similar to bson_iter_oid() but performs no integrity checks.
+ *
+ * Returns: A #bson_oid_t that should not be modified or freed.
+ */
+static BSON_INLINE const bson_oid_t *
+bson_iter_oid_unsafe (const bson_iter_t *iter)
+{
+   return (const bson_oid_t *) (iter->raw + iter->d1);
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_decimal128 (const bson_iter_t *iter, bson_decimal128_t *dec);
+
+
+/**
+ * bson_iter_decimal128_unsafe:
+ * @iter: A #bson_iter_t.
+ *
+ * Similar to bson_iter_decimal128() but performs no integrity checks.
+ *
+ * Returns: A #bson_decimal128_t.
+ */
+static BSON_INLINE void
+bson_iter_decimal128_unsafe (const bson_iter_t *iter, bson_decimal128_t *dec)
+{
+   uint64_t low_le;
+   uint64_t high_le;
+
+   memcpy (&low_le, iter->raw + iter->d1, sizeof (low_le));
+   memcpy (&high_le, iter->raw + iter->d1 + 8, sizeof (high_le));
+
+   dec->low = BSON_UINT64_FROM_LE (low_le);
+   dec->high = BSON_UINT64_FROM_LE (high_le);
+}
+
+
+BSON_EXPORT (const char *)
+bson_iter_key (const bson_iter_t *iter);
+
+BSON_EXPORT (uint32_t)
+bson_iter_key_len (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_key_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_key() but performs no integrity checking.
+ *
+ * Returns: A string that should not be modified or freed.
+ */
+static BSON_INLINE const char *
+bson_iter_key_unsafe (const bson_iter_t *iter)
+{
+   return (const char *) (iter->raw + iter->key);
+}
+
+
+BSON_EXPORT (const char *)
+bson_iter_utf8 (const bson_iter_t *iter, uint32_t *length);
+
+
+/**
+ * bson_iter_utf8_unsafe:
+ *
+ * Similar to bson_iter_utf8() but performs no integrity checking.
+ *
+ * Returns: A string that should not be modified or freed.
+ */
+static BSON_INLINE const char *
+bson_iter_utf8_unsafe (const bson_iter_t *iter, size_t *length)
+{
+   *length = bson_iter_utf8_len_unsafe (iter);
+   return (const char *) (iter->raw + iter->d2);
+}
+
+
+BSON_EXPORT (char *)
+bson_iter_dup_utf8 (const bson_iter_t *iter, uint32_t *length);
+
+
+BSON_EXPORT (int64_t)
+bson_iter_date_time (const bson_iter_t *iter);
+
+
+BSON_EXPORT (time_t)
+bson_iter_time_t (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_time_t_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_time_t() but performs no integrity checking.
+ *
+ * Returns: A time_t containing the number of seconds since UNIX epoch
+ *          in UTC.
+ */
+static BSON_INLINE time_t
+bson_iter_time_t_unsafe (const bson_iter_t *iter)
+{
+   return (time_t) (bson_iter_int64_unsafe (iter) / 1000UL);
+}
+
+
+BSON_EXPORT (void)
+bson_iter_timeval (const bson_iter_t *iter, struct timeval *tv);
+
+
+/**
+ * bson_iter_timeval_unsafe:
+ * @iter: A bson_iter_t.
+ * @tv: A struct timeval.
+ *
+ * Similar to bson_iter_timeval() but performs no integrity checking.
+ */
+static BSON_INLINE void
+bson_iter_timeval_unsafe (const bson_iter_t *iter, struct timeval *tv)
+{
+   int64_t value = bson_iter_int64_unsafe (iter);
+#ifdef BSON_OS_WIN32
+   tv->tv_sec = (long) (value / 1000);
+#else
+   tv->tv_sec = (suseconds_t) (value / 1000);
+#endif
+   tv->tv_usec = (value % 1000) * 1000;
+}
+
+
+BSON_EXPORT (void)
+bson_iter_timestamp (const bson_iter_t *iter,
+                     uint32_t *timestamp,
+                     uint32_t *increment);
+
+
+BSON_EXPORT (bool)
+bson_iter_bool (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_bool_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_bool() but performs no integrity checking.
+ *
+ * Returns: true or false.
+ */
+static BSON_INLINE bool
+bson_iter_bool_unsafe (const bson_iter_t *iter)
+{
+   char val;
+
+   memcpy (&val, iter->raw + iter->d1, 1);
+   return !!val;
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_as_bool (const bson_iter_t *iter);
+
+
+BSON_EXPORT (const char *)
+bson_iter_regex (const bson_iter_t *iter, const char **options);
+
+
+BSON_EXPORT (const char *)
+bson_iter_symbol (const bson_iter_t *iter, uint32_t *length);
+
+
+BSON_EXPORT (bson_type_t)
+bson_iter_type (const bson_iter_t *iter);
+
+
+/**
+ * bson_iter_type_unsafe:
+ * @iter: A bson_iter_t.
+ *
+ * Similar to bson_iter_type() but performs no integrity checking.
+ *
+ * Returns: A bson_type_t.
+ */
+static BSON_INLINE bson_type_t
+bson_iter_type_unsafe (const bson_iter_t *iter)
+{
+   return (bson_type_t) (iter->raw + iter->type)[0];
+}
+
+
+BSON_EXPORT (bool)
+bson_iter_recurse (const bson_iter_t *iter, bson_iter_t *child);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_int32 (bson_iter_t *iter, int32_t value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_int64 (bson_iter_t *iter, int64_t value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_double (bson_iter_t *iter, double value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_decimal128 (bson_iter_t *iter, const bson_decimal128_t *value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_bool (bson_iter_t *iter, bool value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_oid (bson_iter_t *iter, const bson_oid_t *value);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_timestamp (bson_iter_t *iter,
+                               uint32_t timestamp,
+                               uint32_t increment);
+
+
+BSON_EXPORT (void)
+bson_iter_overwrite_date_time (bson_iter_t *iter, int64_t value);
+
+
+BSON_EXPORT (bool)
+bson_iter_visit_all (bson_iter_t *iter,
+                     const bson_visitor_t *visitor,
+                     void *data);
+
+BSON_EXPORT (uint32_t)
+bson_iter_offset (bson_iter_t *iter);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_ITER_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-json.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-json.h
new file mode 100644
index 0000000..20fab57
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-json.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_JSON_H
+#define BSON_JSON_H
+
+
+#include "bson.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _bson_json_reader_t bson_json_reader_t;
+
+
+typedef enum {
+   BSON_JSON_ERROR_READ_CORRUPT_JS = 1,
+   BSON_JSON_ERROR_READ_INVALID_PARAM,
+   BSON_JSON_ERROR_READ_CB_FAILURE,
+} bson_json_error_code_t;
+
+
+/**
+ * BSON_MAX_LEN_UNLIMITED
+ *
+ * Denotes unlimited length limit when converting BSON to JSON.
+ */
+#define BSON_MAX_LEN_UNLIMITED -1
+
+/**
+ * bson_json_mode_t:
+ *
+ * This enumeration contains the different modes to serialize BSON into extended
+ * JSON.
+ */
+typedef enum {
+   BSON_JSON_MODE_LEGACY,
+   BSON_JSON_MODE_CANONICAL,
+   BSON_JSON_MODE_RELAXED,
+} bson_json_mode_t;
+
+
+BSON_EXPORT (bson_json_opts_t *)
+bson_json_opts_new (bson_json_mode_t mode, int32_t max_len);
+BSON_EXPORT (void)
+bson_json_opts_destroy (bson_json_opts_t *opts);
+
+
+typedef ssize_t (*bson_json_reader_cb) (void *handle,
+                                        uint8_t *buf,
+                                        size_t count);
+typedef void (*bson_json_destroy_cb) (void *handle);
+
+
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_reader_new (void *data,
+                      bson_json_reader_cb cb,
+                      bson_json_destroy_cb dcb,
+                      bool allow_multiple,
+                      size_t buf_size);
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_reader_new_from_fd (int fd, bool close_on_destroy);
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_reader_new_from_file (const char *filename, bson_error_t *error);
+BSON_EXPORT (void)
+bson_json_reader_destroy (bson_json_reader_t *reader);
+BSON_EXPORT (int)
+bson_json_reader_read (bson_json_reader_t *reader,
+                       bson_t *bson,
+                       bson_error_t *error);
+BSON_EXPORT (bson_json_reader_t *)
+bson_json_data_reader_new (bool allow_multiple, size_t size);
+BSON_EXPORT (void)
+bson_json_data_reader_ingest (bson_json_reader_t *reader,
+                              const uint8_t *data,
+                              size_t len);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_JSON_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-keys.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-keys.h
new file mode 100644
index 0000000..da3efad
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-keys.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_KEYS_H
+#define BSON_KEYS_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (size_t)
+bson_uint32_to_string (uint32_t value,
+                       const char **strptr,
+                       char *str,
+                       size_t size);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_KEYS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-macros.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-macros.h
new file mode 100644
index 0000000..e7a3097
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-macros.h
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_MACROS_H
+#define BSON_MACROS_H
+
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+#include <algorithm>
+#endif
+
+#include "bson-config.h"
+
+
+#if BSON_OS == 1
+#define BSON_OS_UNIX
+#elif BSON_OS == 2
+#define BSON_OS_WIN32
+#else
+#error "Unknown operating system."
+#endif
+
+
+#ifdef __cplusplus
+#define BSON_BEGIN_DECLS extern "C" {
+#define BSON_END_DECLS }
+#else
+#define BSON_BEGIN_DECLS
+#define BSON_END_DECLS
+#endif
+
+
+#if defined(__GNUC__)
+#define BSON_GNUC_CHECK_VERSION(major, minor) \
+   ((__GNUC__ > (major)) ||                   \
+    ((__GNUC__ == (major)) && (__GNUC_MINOR__ >= (minor))))
+#else
+#define BSON_GNUC_CHECK_VERSION(major, minor) 0
+#endif
+
+
+#if defined(__GNUC__)
+#define BSON_GNUC_IS_VERSION(major, minor) \
+   ((__GNUC__ == (major)) && (__GNUC_MINOR__ == (minor)))
+#else
+#define BSON_GNUC_IS_VERSION(major, minor) 0
+#endif
+
+
+/* Decorate public functions:
+ * - if BSON_STATIC, we're compiling a program that uses libbson as a static
+ *   library, don't decorate functions
+ * - else if BSON_COMPILATION, we're compiling a static or shared libbson, mark
+ *   public functions for export from the shared lib (which has no effect on
+ *   the static lib)
+ * - else, we're compiling a program that uses libbson as a shared library,
+ *   mark public functions as DLL imports for Microsoft Visual C
+ */
+
+#ifdef _MSC_VER
+/*
+ * Microsoft Visual C
+ */
+#ifdef BSON_STATIC
+#define BSON_API
+#elif defined(BSON_COMPILATION)
+#define BSON_API __declspec(dllexport)
+#else
+#define BSON_API __declspec(dllimport)
+#endif
+#define BSON_CALL __cdecl
+
+#elif defined(__GNUC__)
+/*
+ * GCC
+ */
+#ifdef BSON_STATIC
+#define BSON_API
+#elif defined(BSON_COMPILATION)
+#define BSON_API __attribute__ ((visibility ("default")))
+#else
+#define BSON_API
+#endif
+#define BSON_CALL
+
+#else
+/*
+ * Other compilers
+ */
+#define BSON_API
+#define BSON_CALL
+
+#endif
+
+#define BSON_EXPORT(type) BSON_API type BSON_CALL
+
+
+#ifdef MIN
+#define BSON_MIN MIN
+#elif defined(__cplusplus)
+#define BSON_MIN(a, b) ((std::min) (a, b))
+#elif defined(_MSC_VER)
+#define BSON_MIN(a, b) ((a) < (b) ? (a) : (b))
+#else
+#define BSON_MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+
+#ifdef MAX
+#define BSON_MAX MAX
+#elif defined(__cplusplus)
+#define BSON_MAX(a, b) ((std::max) (a, b))
+#elif defined(_MSC_VER)
+#define BSON_MAX(a, b) ((a) > (b) ? (a) : (b))
+#else
+#define BSON_MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+
+
+#ifdef ABS
+#define BSON_ABS ABS
+#else
+#define BSON_ABS(a) (((a) < 0) ? ((a) * -1) : (a))
+#endif
+
+#if __STDC_VERSION__ >= 201112L
+#define BSON_ALIGNOF(expr) _Alignof(expr)
+#else
+#if defined(_MSC_VER)
+#define BSON_ALIGNOF(expr) __alignof(expr)
+#else
+#define BSON_ALIGNOF(expr) __alignof__(expr)
+#endif
+#endif // __STDC_VERSION__ >= 201112L
+
+#ifdef _MSC_VER
+// __declspec (align (_N)) only permits integer literals as _N.
+#ifdef _WIN64
+#define BSON_ALIGN_OF_PTR 8
+#else
+#define BSON_ALIGN_OF_PTR 4
+#endif
+#else
+#define BSON_ALIGN_OF_PTR (BSON_ALIGNOF (void *))
+#endif
+
+#ifdef BSON_EXTRA_ALIGN
+#if defined(_MSC_VER)
+#define BSON_ALIGNED_BEGIN(_N) __declspec(align (_N))
+#define BSON_ALIGNED_END(_N)
+#else
+#define BSON_ALIGNED_BEGIN(_N)
+#define BSON_ALIGNED_END(_N) __attribute__ ((aligned (_N)))
+#endif
+#else
+#if defined(_MSC_VER)
+#define BSON_ALIGNED_BEGIN(_N) __declspec(align (BSON_ALIGN_OF_PTR))
+#define BSON_ALIGNED_END(_N)
+#else
+#define BSON_ALIGNED_BEGIN(_N)
+#define BSON_ALIGNED_END(_N) \
+   __attribute__ ((          \
+      aligned ((_N) > BSON_ALIGN_OF_PTR ? BSON_ALIGN_OF_PTR : (_N))))
+#endif
+#endif
+
+
+#define bson_str_empty(s) (!s[0])
+#define bson_str_empty0(s) (!s || !s[0])
+
+
+#if defined(_MSC_VER)
+#define BSON_FUNC __FUNCTION__
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L
+#define BSON_FUNC __FUNCTION__
+#else
+#define BSON_FUNC __func__
+#endif
+
+#define BSON_ASSERT(test)                                  \
+   do {                                                    \
+      if (!(BSON_LIKELY (test))) {                         \
+         fprintf (stderr,                                  \
+                  "%s:%d %s(): precondition failed: %s\n", \
+                  __FILE__,                                \
+                  __LINE__,                                \
+                  BSON_FUNC,                               \
+                  #test);                                  \
+         abort ();                                         \
+      }                                                    \
+   } while (0)
+
+/**
+ * @brief Assert the expression `Assertion`, and evaluates to `Value` on
+ * success.
+ */
+#define BSON_ASSERT_INLINE(Assertion, Value)                              \
+   ((void) ((Assertion) ? (0)                                             \
+                        : ((fprintf (stderr,                              \
+                                     "%s:%d %s(): Assertion '%s' failed", \
+                                     __FILE__,                            \
+                                     __LINE__,                            \
+                                     BSON_FUNC,                           \
+                                     #Assertion),                         \
+                            abort ()),                                    \
+                           0)),                                           \
+    Value)
+
+/**
+ * @brief Assert that the given pointer is non-NULL, while also evaluating to
+ * that pointer.
+ *
+ * Can be used to inline assertions with a pointer dereference:
+ *
+ * ```
+ * foo* f = get_foo();
+ * bar* b = BSON_ASSERT_PTR_INLINE(f)->bar_value;
+ * ```
+ */
+#define BSON_ASSERT_PTR_INLINE(Pointer) \
+   BSON_ASSERT_INLINE ((Pointer) != NULL, (Pointer))
+
+/* Used for asserting parameters to provide a more precise error message */
+#define BSON_ASSERT_PARAM(param)                                         \
+   do {                                                                  \
+      if ((BSON_UNLIKELY (param == NULL))) {                             \
+         fprintf (stderr,                                                \
+                  "The parameter: %s, in function %s, cannot be NULL\n", \
+                  #param,                                                \
+                  BSON_FUNC);                                            \
+         abort ();                                                       \
+      }                                                                  \
+   } while (0)
+
+/* obsolete macros, preserved for compatibility */
+#define BSON_STATIC_ASSERT(s) BSON_STATIC_ASSERT_ (s, __LINE__)
+#define BSON_STATIC_ASSERT_JOIN(a, b) BSON_STATIC_ASSERT_JOIN2 (a, b)
+#define BSON_STATIC_ASSERT_JOIN2(a, b) a##b
+#define BSON_STATIC_ASSERT_(s, l)                             \
+   typedef char BSON_STATIC_ASSERT_JOIN (static_assert_test_, \
+                                         __LINE__)[(s) ? 1 : -1]
+
+/* modern macros */
+#define BSON_STATIC_ASSERT2(_name, _s) \
+   BSON_STATIC_ASSERT2_ (_s, __LINE__, _name)
+#define BSON_STATIC_ASSERT_JOIN3(_a, _b, _name) \
+   BSON_STATIC_ASSERT_JOIN4 (_a, _b, _name)
+#define BSON_STATIC_ASSERT_JOIN4(_a, _b, _name) _a##_b##_name
+#define BSON_STATIC_ASSERT2_(_s, _l, _name) \
+   typedef char BSON_STATIC_ASSERT_JOIN3 (  \
+      static_assert_test_, __LINE__, _name)[(_s) ? 1 : -1]
+
+
+#if defined(__GNUC__)
+#define BSON_GNUC_PURE __attribute__ ((pure))
+#define BSON_GNUC_WARN_UNUSED_RESULT __attribute__ ((warn_unused_result))
+#else
+#define BSON_GNUC_PURE
+#define BSON_GNUC_WARN_UNUSED_RESULT
+#endif
+
+
+#if BSON_GNUC_CHECK_VERSION(4, 0) && !defined(_WIN32)
+#define BSON_GNUC_NULL_TERMINATED __attribute__ ((sentinel))
+#define BSON_GNUC_INTERNAL __attribute__ ((visibility ("hidden")))
+#else
+#define BSON_GNUC_NULL_TERMINATED
+#define BSON_GNUC_INTERNAL
+#endif
+
+
+#if defined(__GNUC__)
+#define BSON_LIKELY(x) __builtin_expect (!!(x), 1)
+#define BSON_UNLIKELY(x) __builtin_expect (!!(x), 0)
+#else
+#define BSON_LIKELY(v) v
+#define BSON_UNLIKELY(v) v
+#endif
+
+
+#if defined(__clang__)
+#define BSON_GNUC_PRINTF(f, v) __attribute__ ((format (printf, f, v)))
+#elif BSON_GNUC_CHECK_VERSION(4, 4)
+#define BSON_GNUC_PRINTF(f, v) __attribute__ ((format (gnu_printf, f, v)))
+#else
+#define BSON_GNUC_PRINTF(f, v)
+#endif
+
+
+#if defined(__LP64__) || defined(_LP64)
+#define BSON_WORD_SIZE 64
+#else
+#define BSON_WORD_SIZE 32
+#endif
+
+
+#if defined(_MSC_VER)
+#define BSON_INLINE __inline
+#else
+#define BSON_INLINE __inline__
+#endif
+
+
+#ifdef _MSC_VER
+#define BSON_ENSURE_ARRAY_PARAM_SIZE(_n)
+#define BSON_TYPEOF decltype
+#else
+#define BSON_ENSURE_ARRAY_PARAM_SIZE(_n) static(_n)
+#define BSON_TYPEOF typeof
+#endif
+
+
+#if BSON_GNUC_CHECK_VERSION(3, 1)
+#define BSON_GNUC_DEPRECATED __attribute__ ((__deprecated__))
+#else
+#define BSON_GNUC_DEPRECATED
+#endif
+
+#define BSON_CONCAT_IMPL(a, ...) a##__VA_ARGS__
+#define BSON_CONCAT(a, ...) BSON_CONCAT_IMPL (a, __VA_ARGS__)
+#define BSON_CONCAT3(a, b, c) BSON_CONCAT (a, BSON_CONCAT (b, c))
+#define BSON_CONCAT4(a, b, c, d) \
+   BSON_CONCAT (BSON_CONCAT (a, b), BSON_CONCAT (c, d))
+
+#if BSON_GNUC_CHECK_VERSION(4, 5)
+#define BSON_GNUC_DEPRECATED_FOR(f) \
+   __attribute__ ((deprecated ("Use " #f " instead")))
+#else
+#define BSON_GNUC_DEPRECATED_FOR(f) BSON_GNUC_DEPRECATED
+#endif
+
+/**
+ * @brief String-ify the given argument
+ */
+#define BSON_STR(...) #__VA_ARGS__
+
+/**
+ * @brief Mark the attached declared entity as "possibly-unused."
+ *
+ * Does nothing on MSVC.
+ */
+#if defined(__GNUC__) || defined(__clang__)
+#define BSON_MAYBE_UNUSED __attribute__ ((unused))
+#else
+#define BSON_MAYBE_UNUSED /* Nothing for other compilers */
+#endif
+
+/**
+ * @brief Mark a point in the code as unreachable. If the point is reached, the
+ * program will abort with an error message.
+ *
+ * @param What A string to include in the error message if this point is ever
+ * executed.
+ */
+#define BSON_UNREACHABLE(What)                               \
+   do {                                                      \
+      fprintf (stderr,                                       \
+               "%s:%d %s(): Unreachable code reached: %s\n", \
+               __FILE__,                                     \
+               __LINE__,                                     \
+               BSON_FUNC,                                    \
+               What);                                        \
+      abort ();                                              \
+   } while (0)
+
+/**
+ * @brief Silence warnings for deliberately unused variables or parameters.
+ *
+ * @param expr An unused variable or parameter.
+ *
+ */
+#define BSON_UNUSED(expr) \
+   do {                   \
+      (void) (expr);      \
+   } while (0)
+
+#endif /* BSON_MACROS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-md5.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-md5.h
new file mode 100644
index 0000000..213fc5d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-md5.h
@@ -0,0 +1,89 @@
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgement in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+    http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+    references to Ghostscript; clarified derivation from RFC 1321;
+    now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+    added conditionalization for C++ compilation from Martin
+    Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+
+/*
+ * The following MD5 implementation has been modified to use types as
+ * specified in libbson.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_MD5_H
+#define BSON_MD5_H
+
+
+#include "bson-endian.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct {
+   uint32_t count[2]; /* message length in bits, lsw first */
+   uint32_t abcd[4];  /* digest buffer */
+   uint8_t buf[64];   /* accumulate block */
+} bson_md5_t;
+
+
+BSON_EXPORT (void)
+bson_md5_init (bson_md5_t *pms) BSON_GNUC_DEPRECATED;
+BSON_EXPORT (void)
+bson_md5_append (bson_md5_t *pms,
+                 const uint8_t *data,
+                 uint32_t nbytes) BSON_GNUC_DEPRECATED;
+BSON_EXPORT (void)
+bson_md5_finish (bson_md5_t *pms, uint8_t digest[16]) BSON_GNUC_DEPRECATED;
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_MD5_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-memory.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-memory.h
new file mode 100644
index 0000000..a0f8c23
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-memory.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_MEMORY_H
+#define BSON_MEMORY_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef void *(*bson_realloc_func) (void *mem, size_t num_bytes, void *ctx);
+
+
+typedef struct _bson_mem_vtable_t {
+   void *(*malloc) (size_t num_bytes);
+   void *(*calloc) (size_t n_members, size_t num_bytes);
+   void *(*realloc) (void *mem, size_t num_bytes);
+   void (*free) (void *mem);
+   void *(*aligned_alloc) (size_t alignment, size_t num_bytes);
+   void *padding[3];
+} bson_mem_vtable_t;
+
+
+BSON_EXPORT (void)
+bson_mem_set_vtable (const bson_mem_vtable_t *vtable);
+BSON_EXPORT (void)
+bson_mem_restore_vtable (void);
+BSON_EXPORT (void *)
+bson_malloc (size_t num_bytes);
+BSON_EXPORT (void *)
+bson_malloc0 (size_t num_bytes);
+BSON_EXPORT (void *)
+bson_aligned_alloc (size_t alignment, size_t num_bytes);
+BSON_EXPORT (void *)
+bson_aligned_alloc0 (size_t alignment, size_t num_bytes);
+BSON_EXPORT (void *)
+bson_realloc (void *mem, size_t num_bytes);
+BSON_EXPORT (void *)
+bson_realloc_ctx (void *mem, size_t num_bytes, void *ctx);
+BSON_EXPORT (void)
+bson_free (void *mem);
+BSON_EXPORT (void)
+bson_zero_free (void *mem, size_t size);
+
+
+#define BSON_ALIGNED_ALLOC(T) \
+   ((T *) (bson_aligned_alloc (BSON_ALIGNOF (T), sizeof (T))))
+#define BSON_ALIGNED_ALLOC0(T) \
+   ((T *) (bson_aligned_alloc0 (BSON_ALIGNOF (T), sizeof (T))))
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_MEMORY_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-oid.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-oid.h
new file mode 100644
index 0000000..8586df8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-oid.h
@@ -0,0 +1,244 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_OID_H
+#define BSON_OID_H
+
+
+#include <time.h>
+
+#include "bson-context.h"
+#include "bson-macros.h"
+#include "bson-types.h"
+#include "bson-endian.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (int)
+bson_oid_compare (const bson_oid_t *oid1, const bson_oid_t *oid2);
+BSON_EXPORT (void)
+bson_oid_copy (const bson_oid_t *src, bson_oid_t *dst);
+BSON_EXPORT (bool)
+bson_oid_equal (const bson_oid_t *oid1, const bson_oid_t *oid2);
+BSON_EXPORT (bool)
+bson_oid_is_valid (const char *str, size_t length);
+BSON_EXPORT (time_t)
+bson_oid_get_time_t (const bson_oid_t *oid);
+BSON_EXPORT (uint32_t)
+bson_oid_hash (const bson_oid_t *oid);
+BSON_EXPORT (void)
+bson_oid_init (bson_oid_t *oid, bson_context_t *context);
+BSON_EXPORT (void)
+bson_oid_init_from_data (bson_oid_t *oid, const uint8_t *data);
+BSON_EXPORT (void)
+bson_oid_init_from_string (bson_oid_t *oid, const char *str);
+BSON_EXPORT (void)
+bson_oid_init_sequence (bson_oid_t *oid,
+                        bson_context_t *context) BSON_GNUC_DEPRECATED;
+BSON_EXPORT (void)
+bson_oid_to_string (const bson_oid_t *oid, char str[25]);
+
+
+/**
+ * bson_oid_compare_unsafe:
+ * @oid1: A bson_oid_t.
+ * @oid2: A bson_oid_t.
+ *
+ * Performs a qsort() style comparison between @oid1 and @oid2.
+ *
+ * This function is meant to be as fast as possible and therefore performs
+ * no argument validation. That is the callers responsibility.
+ *
+ * Returns: An integer < 0 if @oid1 is less than @oid2. Zero if they are equal.
+ *          An integer > 0 if @oid1 is greater than @oid2.
+ */
+static BSON_INLINE int
+bson_oid_compare_unsafe (const bson_oid_t *oid1, const bson_oid_t *oid2)
+{
+   return memcmp (oid1, oid2, sizeof *oid1);
+}
+
+
+/**
+ * bson_oid_equal_unsafe:
+ * @oid1: A bson_oid_t.
+ * @oid2: A bson_oid_t.
+ *
+ * Checks the equality of @oid1 and @oid2.
+ *
+ * This function is meant to be as fast as possible and therefore performs
+ * no checks for argument validity. That is the callers responsibility.
+ *
+ * Returns: true if @oid1 and @oid2 are equal; otherwise false.
+ */
+static BSON_INLINE bool
+bson_oid_equal_unsafe (const bson_oid_t *oid1, const bson_oid_t *oid2)
+{
+   return !memcmp (oid1, oid2, sizeof *oid1);
+}
+
+/**
+ * bson_oid_hash_unsafe:
+ * @oid: A bson_oid_t.
+ *
+ * This function performs a DJB style hash upon the bytes contained in @oid.
+ * The result is a hash key suitable for use in a hashtable.
+ *
+ * This function is meant to be as fast as possible and therefore performs no
+ * validation of arguments. The caller is responsible to ensure they are
+ * passing valid arguments.
+ *
+ * Returns: A uint32_t containing a hash code.
+ */
+static BSON_INLINE uint32_t
+bson_oid_hash_unsafe (const bson_oid_t *oid)
+{
+   uint32_t hash = 5381;
+   uint32_t i;
+
+   for (i = 0; i < sizeof oid->bytes; i++) {
+      hash = ((hash << 5) + hash) + oid->bytes[i];
+   }
+
+   return hash;
+}
+
+
+/**
+ * bson_oid_copy_unsafe:
+ * @src: A bson_oid_t to copy from.
+ * @dst: A bson_oid_t to copy into.
+ *
+ * Copies the contents of @src into @dst. This function is meant to be as
+ * fast as possible and therefore performs no argument checking. It is the
+ * callers responsibility to ensure they are passing valid data into the
+ * function.
+ */
+static BSON_INLINE void
+bson_oid_copy_unsafe (const bson_oid_t *src, bson_oid_t *dst)
+{
+   memcpy (dst, src, sizeof *src);
+}
+
+
+/**
+ * bson_oid_parse_hex_char:
+ * @hex: A character to parse to its integer value.
+ *
+ * This function contains a jump table to return the integer value for a
+ * character containing a hexadecimal value (0-9, a-f, A-F). If the character
+ * is not a hexadecimal character then zero is returned.
+ *
+ * Returns: An integer between 0 and 15.
+ */
+static BSON_INLINE uint8_t
+bson_oid_parse_hex_char (char hex)
+{
+   switch (hex) {
+   case '0':
+      return 0;
+   case '1':
+      return 1;
+   case '2':
+      return 2;
+   case '3':
+      return 3;
+   case '4':
+      return 4;
+   case '5':
+      return 5;
+   case '6':
+      return 6;
+   case '7':
+      return 7;
+   case '8':
+      return 8;
+   case '9':
+      return 9;
+   case 'a':
+   case 'A':
+      return 0xa;
+   case 'b':
+   case 'B':
+      return 0xb;
+   case 'c':
+   case 'C':
+      return 0xc;
+   case 'd':
+   case 'D':
+      return 0xd;
+   case 'e':
+   case 'E':
+      return 0xe;
+   case 'f':
+   case 'F':
+      return 0xf;
+   default:
+      return 0;
+   }
+}
+
+
+/**
+ * bson_oid_init_from_string_unsafe:
+ * @oid: A bson_oid_t to store the result.
+ * @str: A 24-character hexadecimal encoded string.
+ *
+ * Parses a string containing 24 hexadecimal encoded bytes into a bson_oid_t.
+ * This function is meant to be as fast as possible and inlined into your
+ * code. For that purpose, the function does not perform any sort of bounds
+ * checking and it is the callers responsibility to ensure they are passing
+ * valid input to the function.
+ */
+static BSON_INLINE void
+bson_oid_init_from_string_unsafe (bson_oid_t *oid, const char *str)
+{
+   int i;
+
+   for (i = 0; i < 12; i++) {
+      oid->bytes[i] = (uint8_t) ((bson_oid_parse_hex_char (str[2 * i]) << 4) |
+                                 (bson_oid_parse_hex_char (str[2 * i + 1])));
+   }
+}
+
+
+/**
+ * bson_oid_get_time_t_unsafe:
+ * @oid: A bson_oid_t.
+ *
+ * Fetches the time @oid was generated.
+ *
+ * Returns: A time_t containing the UNIX timestamp of generation.
+ */
+static BSON_INLINE time_t
+bson_oid_get_time_t_unsafe (const bson_oid_t *oid)
+{
+   uint32_t t;
+
+   memcpy (&t, oid, sizeof (t));
+   return BSON_UINT32_FROM_BE (t);
+}
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_OID_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-prelude.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-prelude.h
new file mode 100644
index 0000000..2469125
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-prelude.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(BSON_INSIDE) && !defined(BSON_COMPILATION)
+#error "Only <bson/bson.h> can be included directly."
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-reader.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-reader.h
new file mode 100644
index 0000000..2fc5db4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-reader.h
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_READER_H
+#define BSON_READER_H
+
+
+#include "bson-compat.h"
+#include "bson-oid.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+#define BSON_ERROR_READER_BADFD 1
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_reader_read_func_t --
+ *
+ *       This function is a callback used by bson_reader_t to read the
+ *       next chunk of data from the underlying opaque file descriptor.
+ *
+ *       This function is meant to operate similar to the read() function
+ *       as part of libc on UNIX-like systems.
+ *
+ * Parameters:
+ *       @handle: The handle to read from.
+ *       @buf: The buffer to read into.
+ *       @count: The number of bytes to read.
+ *
+ * Returns:
+ *       0 for end of stream.
+ *       -1 for read failure.
+ *       Greater than zero for number of bytes read into @buf.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+typedef ssize_t (*bson_reader_read_func_t) (void *handle,  /* IN */
+                                            void *buf,     /* IN */
+                                            size_t count); /* IN */
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_reader_destroy_func_t --
+ *
+ *       Destroy callback to release any resources associated with the
+ *       opaque handle.
+ *
+ * Parameters:
+ *       @handle: the handle provided to bson_reader_new_from_handle().
+ *
+ * Returns:
+ *       None.
+ *
+ * Side effects:
+ *       None.
+ *
+ *--------------------------------------------------------------------------
+ */
+
+typedef void (*bson_reader_destroy_func_t) (void *handle); /* IN */
+
+
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_handle (void *handle,
+                             bson_reader_read_func_t rf,
+                             bson_reader_destroy_func_t df);
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_fd (int fd, bool close_on_destroy);
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_file (const char *path, bson_error_t *error);
+BSON_EXPORT (bson_reader_t *)
+bson_reader_new_from_data (const uint8_t *data, size_t length);
+BSON_EXPORT (void)
+bson_reader_destroy (bson_reader_t *reader);
+BSON_EXPORT (void)
+bson_reader_set_read_func (bson_reader_t *reader, bson_reader_read_func_t func);
+BSON_EXPORT (void)
+bson_reader_set_destroy_func (bson_reader_t *reader,
+                              bson_reader_destroy_func_t func);
+BSON_EXPORT (const bson_t *)
+bson_reader_read (bson_reader_t *reader, bool *reached_eof);
+BSON_EXPORT (off_t)
+bson_reader_tell (bson_reader_t *reader);
+BSON_EXPORT (void)
+bson_reader_reset (bson_reader_t *reader);
+
+BSON_END_DECLS
+
+
+#endif /* BSON_READER_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-string.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-string.h
new file mode 100644
index 0000000..dbf9497
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-string.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_STRING_H
+#define BSON_STRING_H
+
+
+#include <stdarg.h>
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct {
+   char *str;
+   uint32_t len;
+   uint32_t alloc;
+} bson_string_t;
+
+
+BSON_EXPORT (bson_string_t *)
+bson_string_new (const char *str);
+BSON_EXPORT (char *)
+bson_string_free (bson_string_t *string, bool free_segment);
+BSON_EXPORT (void)
+bson_string_append (bson_string_t *string, const char *str);
+BSON_EXPORT (void)
+bson_string_append_c (bson_string_t *string, char str);
+BSON_EXPORT (void)
+bson_string_append_unichar (bson_string_t *string, bson_unichar_t unichar);
+BSON_EXPORT (void)
+bson_string_append_printf (bson_string_t *string, const char *format, ...)
+   BSON_GNUC_PRINTF (2, 3);
+BSON_EXPORT (void)
+bson_string_truncate (bson_string_t *string, uint32_t len);
+BSON_EXPORT (char *)
+bson_strdup (const char *str);
+BSON_EXPORT (char *)
+bson_strdup_printf (const char *format, ...) BSON_GNUC_PRINTF (1, 2);
+BSON_EXPORT (char *)
+bson_strdupv_printf (const char *format, va_list args) BSON_GNUC_PRINTF (1, 0);
+BSON_EXPORT (char *)
+bson_strndup (const char *str, size_t n_bytes);
+BSON_EXPORT (void)
+bson_strncpy (char *dst, const char *src, size_t size);
+BSON_EXPORT (int)
+bson_vsnprintf (char *str, size_t size, const char *format, va_list ap)
+   BSON_GNUC_PRINTF (3, 0);
+BSON_EXPORT (int)
+bson_snprintf (char *str, size_t size, const char *format, ...)
+   BSON_GNUC_PRINTF (3, 4);
+BSON_EXPORT (void)
+bson_strfreev (char **strv);
+BSON_EXPORT (size_t)
+bson_strnlen (const char *s, size_t maxlen);
+BSON_EXPORT (int64_t)
+bson_ascii_strtoll (const char *str, char **endptr, int base);
+BSON_EXPORT (int)
+bson_strcasecmp (const char *s1, const char *s2);
+BSON_EXPORT (bool)
+bson_isspace (int c);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_STRING_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-types.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-types.h
new file mode 100644
index 0000000..498d543
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-types.h
@@ -0,0 +1,566 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_TYPES_H
+#define BSON_TYPES_H
+
+
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "bson-macros.h"
+#include "bson-config.h"
+#include "bson-compat.h"
+#include "bson-endian.h"
+
+BSON_BEGIN_DECLS
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_unichar_t --
+ *
+ *       bson_unichar_t provides an unsigned 32-bit type for containing
+ *       unicode characters. When iterating UTF-8 sequences, this should
+ *       be used to avoid losing the high-bits of non-ascii characters.
+ *
+ * See also:
+ *       bson_string_append_unichar()
+ *
+ *--------------------------------------------------------------------------
+ */
+
+typedef uint32_t bson_unichar_t;
+
+
+/**
+ * @brief Flags configuring the creation of a bson_context_t
+ */
+typedef enum {
+   /** Use default options */
+   BSON_CONTEXT_NONE = 0,
+   /* Deprecated: Generating new OIDs from a bson_context_t is always
+      thread-safe */
+   BSON_CONTEXT_THREAD_SAFE = (1 << 0),
+   /* Deprecated: Does nothing and is ignored */
+   BSON_CONTEXT_DISABLE_HOST_CACHE = (1 << 1),
+   /* Call getpid() instead of remembering the result of getpid() when using the
+      context */
+   BSON_CONTEXT_DISABLE_PID_CACHE = (1 << 2),
+   /* Deprecated: Does nothing */
+   BSON_CONTEXT_USE_TASK_ID = (1 << 3),
+} bson_context_flags_t;
+
+
+/**
+ * bson_context_t:
+ *
+ * This structure manages context for the bson library. It handles
+ * configuration for thread-safety and other performance related requirements.
+ * Consumers will create a context and may use multiple under a variety of
+ * situations.
+ *
+ * If your program calls fork(), you should initialize a new bson_context_t
+ * using bson_context_init().
+ *
+ * If you are using threading, it is suggested that you use a bson_context_t
+ * per thread for best performance. Alternatively, you can initialize the
+ * bson_context_t with BSON_CONTEXT_THREAD_SAFE, although a performance penalty
+ * will be incurred.
+ *
+ * Many functions will require that you provide a bson_context_t such as OID
+ * generation.
+ *
+ * This structure is opaque in that you cannot see the contents of the
+ * structure. However, it is stack allocatable in that enough padding is
+ * provided in _bson_context_t to hold the structure.
+ */
+typedef struct _bson_context_t bson_context_t;
+
+/**
+ * bson_json_opts_t:
+ *
+ * This structure is used to pass options for serializing BSON into extended
+ * JSON to the respective serialization methods.
+ *
+ * max_len can be either a non-negative integer, or BSON_MAX_LEN_UNLIMITED to
+ * set no limit for serialization length.
+ */
+typedef struct _bson_json_opts_t bson_json_opts_t;
+
+
+/**
+ * bson_t:
+ *
+ * This structure manages a buffer whose contents are a properly formatted
+ * BSON document. You may perform various transforms on the BSON documents.
+ * Additionally, it can be iterated over using bson_iter_t.
+ *
+ * See bson_iter_init() for iterating the contents of a bson_t.
+ *
+ * When building a bson_t structure using the various append functions,
+ * memory allocations may occur. That is performed using power of two
+ * allocations and realloc().
+ *
+ * See http://bsonspec.org for the BSON document spec.
+ *
+ * This structure is meant to fit in two sequential 64-byte cachelines.
+ */
+#ifdef BSON_MEMCHECK
+BSON_ALIGNED_BEGIN (128) typedef struct _bson_t {
+   uint32_t flags; /* Internal flags for the bson_t. */
+   uint32_t len;   /* Length of BSON data. */
+   char *canary;   /* For valgrind check */
+   uint8_t padding[120 - sizeof (char *)];
+} bson_t BSON_ALIGNED_END (128);
+#else
+BSON_ALIGNED_BEGIN (128) typedef struct _bson_t {
+   uint32_t flags;       /* Internal flags for the bson_t. */
+   uint32_t len;         /* Length of BSON data. */
+   uint8_t padding[120]; /* Padding for stack allocation. */
+} bson_t BSON_ALIGNED_END (128);
+#endif
+
+/**
+ * BSON_INITIALIZER:
+ *
+ * This macro can be used to initialize a #bson_t structure on the stack
+ * without calling bson_init().
+ *
+ * |[
+ * bson_t b = BSON_INITIALIZER;
+ * ]|
+ */
+#ifdef BSON_MEMCHECK
+#define BSON_INITIALIZER          \
+   {                              \
+      3, 5, bson_malloc (1), {5}, \
+   }
+#else
+#define BSON_INITIALIZER \
+   {                     \
+      3, 5,              \
+      {                  \
+         5               \
+      }                  \
+   }
+#endif
+
+
+BSON_STATIC_ASSERT2 (bson_t, sizeof (bson_t) == 128);
+
+
+/**
+ * bson_oid_t:
+ *
+ * This structure contains the binary form of a BSON Object Id as specified
+ * on http://bsonspec.org. If you would like the bson_oid_t in string form
+ * see bson_oid_to_string() or bson_oid_to_string_r().
+ */
+typedef struct {
+   uint8_t bytes[12];
+} bson_oid_t;
+
+BSON_STATIC_ASSERT2 (oid_t, sizeof (bson_oid_t) == 12);
+
+/**
+ * bson_decimal128_t:
+ *
+ * @high The high-order bytes of the decimal128.  This field contains sign,
+ *       combination bits, exponent, and part of the coefficient continuation.
+ * @low  The low-order bytes of the decimal128.  This field contains the second
+ *       part of the coefficient continuation.
+ *
+ * This structure is a boxed type containing the value for the BSON decimal128
+ * type.  The structure stores the 128 bits such that they correspond to the
+ * native format for the IEEE decimal128 type, if it is implemented.
+ **/
+typedef struct {
+#if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN
+   uint64_t low;
+   uint64_t high;
+#elif BSON_BYTE_ORDER == BSON_BIG_ENDIAN
+   uint64_t high;
+   uint64_t low;
+#endif
+} bson_decimal128_t;
+
+
+/**
+ * bson_validate_flags_t:
+ *
+ * This enumeration is used for validation of BSON documents. It allows
+ * selective control on what you wish to validate.
+ *
+ * %BSON_VALIDATE_NONE: No additional validation occurs.
+ * %BSON_VALIDATE_UTF8: Check that strings are valid UTF-8.
+ * %BSON_VALIDATE_DOLLAR_KEYS: Check that keys do not start with $.
+ * %BSON_VALIDATE_DOT_KEYS: Check that keys do not contain a period.
+ * %BSON_VALIDATE_UTF8_ALLOW_NULL: Allow NUL bytes in UTF-8 text.
+ * %BSON_VALIDATE_EMPTY_KEYS: Prohibit zero-length field names
+ */
+typedef enum {
+   BSON_VALIDATE_NONE = 0,
+   BSON_VALIDATE_UTF8 = (1 << 0),
+   BSON_VALIDATE_DOLLAR_KEYS = (1 << 1),
+   BSON_VALIDATE_DOT_KEYS = (1 << 2),
+   BSON_VALIDATE_UTF8_ALLOW_NULL = (1 << 3),
+   BSON_VALIDATE_EMPTY_KEYS = (1 << 4),
+} bson_validate_flags_t;
+
+
+/**
+ * bson_type_t:
+ *
+ * This enumeration contains all of the possible types within a BSON document.
+ * Use bson_iter_type() to fetch the type of a field while iterating over it.
+ */
+typedef enum {
+   BSON_TYPE_EOD = 0x00,
+   BSON_TYPE_DOUBLE = 0x01,
+   BSON_TYPE_UTF8 = 0x02,
+   BSON_TYPE_DOCUMENT = 0x03,
+   BSON_TYPE_ARRAY = 0x04,
+   BSON_TYPE_BINARY = 0x05,
+   BSON_TYPE_UNDEFINED = 0x06,
+   BSON_TYPE_OID = 0x07,
+   BSON_TYPE_BOOL = 0x08,
+   BSON_TYPE_DATE_TIME = 0x09,
+   BSON_TYPE_NULL = 0x0A,
+   BSON_TYPE_REGEX = 0x0B,
+   BSON_TYPE_DBPOINTER = 0x0C,
+   BSON_TYPE_CODE = 0x0D,
+   BSON_TYPE_SYMBOL = 0x0E,
+   BSON_TYPE_CODEWSCOPE = 0x0F,
+   BSON_TYPE_INT32 = 0x10,
+   BSON_TYPE_TIMESTAMP = 0x11,
+   BSON_TYPE_INT64 = 0x12,
+   BSON_TYPE_DECIMAL128 = 0x13,
+   BSON_TYPE_MAXKEY = 0x7F,
+   BSON_TYPE_MINKEY = 0xFF,
+} bson_type_t;
+
+
+/**
+ * bson_subtype_t:
+ *
+ * This enumeration contains the various subtypes that may be used in a binary
+ * field. See http://bsonspec.org for more information.
+ */
+typedef enum {
+   BSON_SUBTYPE_BINARY = 0x00,
+   BSON_SUBTYPE_FUNCTION = 0x01,
+   BSON_SUBTYPE_BINARY_DEPRECATED = 0x02,
+   BSON_SUBTYPE_UUID_DEPRECATED = 0x03,
+   BSON_SUBTYPE_UUID = 0x04,
+   BSON_SUBTYPE_MD5 = 0x05,
+   BSON_SUBTYPE_ENCRYPTED = 0x06,
+   BSON_SUBTYPE_COLUMN = 0x07,
+   BSON_SUBTYPE_USER = 0x80,
+} bson_subtype_t;
+
+
+/*
+ *--------------------------------------------------------------------------
+ *
+ * bson_value_t --
+ *
+ *       A boxed type to contain various bson_type_t types.
+ *
+ * See also:
+ *       bson_value_copy()
+ *       bson_value_destroy()
+ *
+ *--------------------------------------------------------------------------
+ */
+
+BSON_ALIGNED_BEGIN (8)
+typedef struct _bson_value_t {
+   bson_type_t value_type;
+   int32_t padding;
+   union {
+      bson_oid_t v_oid;
+      int64_t v_int64;
+      int32_t v_int32;
+      int8_t v_int8;
+      double v_double;
+      bool v_bool;
+      int64_t v_datetime;
+      struct {
+         uint32_t timestamp;
+         uint32_t increment;
+      } v_timestamp;
+      struct {
+         char *str;
+         uint32_t len;
+      } v_utf8;
+      struct {
+         uint8_t *data;
+         uint32_t data_len;
+      } v_doc;
+      struct {
+         uint8_t *data;
+         uint32_t data_len;
+         bson_subtype_t subtype;
+      } v_binary;
+      struct {
+         char *regex;
+         char *options;
+      } v_regex;
+      struct {
+         char *collection;
+         uint32_t collection_len;
+         bson_oid_t oid;
+      } v_dbpointer;
+      struct {
+         char *code;
+         uint32_t code_len;
+      } v_code;
+      struct {
+         char *code;
+         uint8_t *scope_data;
+         uint32_t code_len;
+         uint32_t scope_len;
+      } v_codewscope;
+      struct {
+         char *symbol;
+         uint32_t len;
+      } v_symbol;
+      bson_decimal128_t v_decimal128;
+   } value;
+} bson_value_t BSON_ALIGNED_END (8);
+
+
+/**
+ * bson_iter_t:
+ *
+ * This structure manages iteration over a bson_t structure. It keeps track
+ * of the location of the current key and value within the buffer. Using the
+ * various functions to get the value of the iter will read from these
+ * locations.
+ *
+ * This structure is safe to discard on the stack. No cleanup is necessary
+ * after using it.
+ */
+BSON_ALIGNED_BEGIN (128)
+typedef struct {
+   const uint8_t *raw; /* The raw buffer being iterated. */
+   uint32_t len;       /* The length of raw. */
+   uint32_t off;       /* The offset within the buffer. */
+   uint32_t type;      /* The offset of the type byte. */
+   uint32_t key;       /* The offset of the key byte. */
+   uint32_t d1;        /* The offset of the first data byte. */
+   uint32_t d2;        /* The offset of the second data byte. */
+   uint32_t d3;        /* The offset of the third data byte. */
+   uint32_t d4;        /* The offset of the fourth data byte. */
+   uint32_t next_off;  /* The offset of the next field. */
+   uint32_t err_off;   /* The offset of the error. */
+   bson_value_t value; /* Internal value for various state. */
+} bson_iter_t BSON_ALIGNED_END (128);
+
+
+/**
+ * bson_reader_t:
+ *
+ * This structure is used to iterate over a sequence of BSON documents. It
+ * allows for them to be iterated with the possibility of no additional
+ * memory allocations under certain circumstances such as reading from an
+ * incoming mongo packet.
+ */
+
+BSON_ALIGNED_BEGIN (BSON_ALIGN_OF_PTR)
+typedef struct {
+   uint32_t type;
+   /*< private >*/
+} bson_reader_t BSON_ALIGNED_END (BSON_ALIGN_OF_PTR);
+
+
+/**
+ * bson_visitor_t:
+ *
+ * This structure contains a series of pointers that can be executed for
+ * each field of a BSON document based on the field type.
+ *
+ * For example, if an int32 field is found, visit_int32 will be called.
+ *
+ * When visiting each field using bson_iter_visit_all(), you may provide a
+ * data pointer that will be provided with each callback. This might be useful
+ * if you are marshaling to another language.
+ *
+ * You may pre-maturely stop the visitation of fields by returning true in your
+ * visitor. Returning false will continue visitation to further fields.
+ */
+BSON_ALIGNED_BEGIN (8)
+typedef struct {
+   /* run before / after descending into a document */
+   bool (*visit_before) (const bson_iter_t *iter, const char *key, void *data);
+   bool (*visit_after) (const bson_iter_t *iter, const char *key, void *data);
+   /* corrupt BSON, or unsupported type and visit_unsupported_type not set */
+   void (*visit_corrupt) (const bson_iter_t *iter, void *data);
+   /* normal bson field callbacks */
+   bool (*visit_double) (const bson_iter_t *iter,
+                         const char *key,
+                         double v_double,
+                         void *data);
+   bool (*visit_utf8) (const bson_iter_t *iter,
+                       const char *key,
+                       size_t v_utf8_len,
+                       const char *v_utf8,
+                       void *data);
+   bool (*visit_document) (const bson_iter_t *iter,
+                           const char *key,
+                           const bson_t *v_document,
+                           void *data);
+   bool (*visit_array) (const bson_iter_t *iter,
+                        const char *key,
+                        const bson_t *v_array,
+                        void *data);
+   bool (*visit_binary) (const bson_iter_t *iter,
+                         const char *key,
+                         bson_subtype_t v_subtype,
+                         size_t v_binary_len,
+                         const uint8_t *v_binary,
+                         void *data);
+   /* normal field with deprecated "Undefined" BSON type */
+   bool (*visit_undefined) (const bson_iter_t *iter,
+                            const char *key,
+                            void *data);
+   bool (*visit_oid) (const bson_iter_t *iter,
+                      const char *key,
+                      const bson_oid_t *v_oid,
+                      void *data);
+   bool (*visit_bool) (const bson_iter_t *iter,
+                       const char *key,
+                       bool v_bool,
+                       void *data);
+   bool (*visit_date_time) (const bson_iter_t *iter,
+                            const char *key,
+                            int64_t msec_since_epoch,
+                            void *data);
+   bool (*visit_null) (const bson_iter_t *iter, const char *key, void *data);
+   bool (*visit_regex) (const bson_iter_t *iter,
+                        const char *key,
+                        const char *v_regex,
+                        const char *v_options,
+                        void *data);
+   bool (*visit_dbpointer) (const bson_iter_t *iter,
+                            const char *key,
+                            size_t v_collection_len,
+                            const char *v_collection,
+                            const bson_oid_t *v_oid,
+                            void *data);
+   bool (*visit_code) (const bson_iter_t *iter,
+                       const char *key,
+                       size_t v_code_len,
+                       const char *v_code,
+                       void *data);
+   bool (*visit_symbol) (const bson_iter_t *iter,
+                         const char *key,
+                         size_t v_symbol_len,
+                         const char *v_symbol,
+                         void *data);
+   bool (*visit_codewscope) (const bson_iter_t *iter,
+                             const char *key,
+                             size_t v_code_len,
+                             const char *v_code,
+                             const bson_t *v_scope,
+                             void *data);
+   bool (*visit_int32) (const bson_iter_t *iter,
+                        const char *key,
+                        int32_t v_int32,
+                        void *data);
+   bool (*visit_timestamp) (const bson_iter_t *iter,
+                            const char *key,
+                            uint32_t v_timestamp,
+                            uint32_t v_increment,
+                            void *data);
+   bool (*visit_int64) (const bson_iter_t *iter,
+                        const char *key,
+                        int64_t v_int64,
+                        void *data);
+   bool (*visit_maxkey) (const bson_iter_t *iter, const char *key, void *data);
+   bool (*visit_minkey) (const bson_iter_t *iter, const char *key, void *data);
+   /* if set, called instead of visit_corrupt when an apparently valid BSON
+    * includes an unrecognized field type (reading future version of BSON) */
+   void (*visit_unsupported_type) (const bson_iter_t *iter,
+                                   const char *key,
+                                   uint32_t type_code,
+                                   void *data);
+   bool (*visit_decimal128) (const bson_iter_t *iter,
+                             const char *key,
+                             const bson_decimal128_t *v_decimal128,
+                             void *data);
+
+   void *padding[7];
+} bson_visitor_t BSON_ALIGNED_END (8);
+
+#define BSON_ERROR_BUFFER_SIZE 504
+
+BSON_ALIGNED_BEGIN (8)
+typedef struct _bson_error_t {
+   uint32_t domain;
+   uint32_t code;
+   char message[BSON_ERROR_BUFFER_SIZE];
+} bson_error_t BSON_ALIGNED_END (8);
+
+
+BSON_STATIC_ASSERT2 (error_t, sizeof (bson_error_t) == 512);
+
+
+/**
+ * bson_next_power_of_two:
+ * @v: A 32-bit unsigned integer of required bytes.
+ *
+ * Determines the next larger power of two for the value of @v
+ * in a constant number of operations.
+ *
+ * It is up to the caller to guarantee this will not overflow.
+ *
+ * Returns: The next power of 2 from @v.
+ */
+static BSON_INLINE size_t
+bson_next_power_of_two (size_t v)
+{
+   v--;
+   v |= v >> 1;
+   v |= v >> 2;
+   v |= v >> 4;
+   v |= v >> 8;
+   v |= v >> 16;
+#if BSON_WORD_SIZE == 64
+   v |= v >> 32;
+#endif
+   v++;
+
+   return v;
+}
+
+
+static BSON_INLINE bool
+bson_is_power_of_two (uint32_t v)
+{
+   return ((v != 0) && ((v & (v - 1)) == 0));
+}
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_TYPES_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-utf8.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-utf8.h
new file mode 100644
index 0000000..a1f7dfc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-utf8.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_UTF8_H
+#define BSON_UTF8_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (bool)
+bson_utf8_validate (const char *utf8, size_t utf8_len, bool allow_null);
+BSON_EXPORT (char *)
+bson_utf8_escape_for_json (const char *utf8, ssize_t utf8_len);
+BSON_EXPORT (bson_unichar_t)
+bson_utf8_get_char (const char *utf8);
+BSON_EXPORT (const char *)
+bson_utf8_next_char (const char *utf8);
+BSON_EXPORT (void)
+bson_utf8_from_unichar (bson_unichar_t unichar, char utf8[6], uint32_t *len);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_UTF8_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-value.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-value.h
new file mode 100644
index 0000000..39f0b0f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-value.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_VALUE_H
+#define BSON_VALUE_H
+
+
+#include "bson-macros.h"
+#include "bson-types.h"
+
+
+BSON_BEGIN_DECLS
+
+
+BSON_EXPORT (void)
+bson_value_copy (const bson_value_t *src, bson_value_t *dst);
+BSON_EXPORT (void)
+bson_value_destroy (bson_value_t *value);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_VALUE_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-version-functions.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-version-functions.h
new file mode 100644
index 0000000..feb33cd
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-version-functions.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_VERSION_FUNCTIONS_H
+#define BSON_VERSION_FUNCTIONS_H
+
+#include "bson-types.h"
+
+BSON_BEGIN_DECLS
+
+BSON_EXPORT (int)
+bson_get_major_version (void);
+BSON_EXPORT (int)
+bson_get_minor_version (void);
+BSON_EXPORT (int)
+bson_get_micro_version (void);
+BSON_EXPORT (const char *)
+bson_get_version (void);
+BSON_EXPORT (bool)
+bson_check_version (int required_major, int required_minor, int required_micro);
+
+BSON_END_DECLS
+
+#endif /* BSON_VERSION_FUNCTIONS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-version.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-version.h
new file mode 100644
index 0000000..893a950
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-version.h
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#if !defined (BSON_INSIDE) && !defined (BSON_COMPILATION)
+#error "Only <bson/bson.h> can be included directly."
+#endif
+
+
+#ifndef BSON_VERSION_H
+#define BSON_VERSION_H
+
+
+/**
+ * BSON_MAJOR_VERSION:
+ *
+ * BSON major version component (e.g. 1 if %BSON_VERSION is 1.2.3)
+ */
+#define BSON_MAJOR_VERSION (1)
+
+
+/**
+ * BSON_MINOR_VERSION:
+ *
+ * BSON minor version component (e.g. 2 if %BSON_VERSION is 1.2.3)
+ */
+#define BSON_MINOR_VERSION (23)
+
+
+/**
+ * BSON_MICRO_VERSION:
+ *
+ * BSON micro version component (e.g. 3 if %BSON_VERSION is 1.2.3)
+ */
+#define BSON_MICRO_VERSION (1)
+
+
+/**
+ * BSON_PRERELEASE_VERSION:
+ *
+ * BSON prerelease version component (e.g. pre if %BSON_VERSION is 1.2.3-pre)
+ */
+#define BSON_PRERELEASE_VERSION ()
+
+/**
+ * BSON_VERSION:
+ *
+ * BSON version.
+ */
+#define BSON_VERSION (1.23.1)
+
+
+/**
+ * BSON_VERSION_S:
+ *
+ * BSON version, encoded as a string, useful for printing and
+ * concatenation.
+ */
+#define BSON_VERSION_S "1.23.1"
+
+
+/**
+ * BSON_VERSION_HEX:
+ *
+ * BSON version, encoded as an hexadecimal number, useful for
+ * integer comparisons.
+ */
+#define BSON_VERSION_HEX (BSON_MAJOR_VERSION << 24 | \
+                          BSON_MINOR_VERSION << 16 | \
+                          BSON_MICRO_VERSION << 8)
+
+
+/**
+ * BSON_CHECK_VERSION:
+ * @major: required major version
+ * @minor: required minor version
+ * @micro: required micro version
+ *
+ * Compile-time version checking. Evaluates to %TRUE if the version
+ * of BSON is greater than the required one.
+ */
+#define BSON_CHECK_VERSION(major,minor,micro)   \
+        (BSON_MAJOR_VERSION > (major) || \
+         (BSON_MAJOR_VERSION == (major) && BSON_MINOR_VERSION > (minor)) || \
+         (BSON_MAJOR_VERSION == (major) && BSON_MINOR_VERSION == (minor) && \
+          BSON_MICRO_VERSION >= (micro)))
+
+#endif /* BSON_VERSION_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-writer.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-writer.h
new file mode 100644
index 0000000..6ff74b0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson-writer.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "bson-prelude.h"
+
+
+#ifndef BSON_WRITER_H
+#define BSON_WRITER_H
+
+
+#include "bson.h"
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * bson_writer_t:
+ *
+ * The bson_writer_t structure is a helper for writing a series of BSON
+ * documents to a single malloc() buffer. You can provide a realloc() style
+ * function to grow the buffer as you go.
+ *
+ * This is useful if you want to build a series of BSON documents right into
+ * the target buffer for an outgoing packet. The offset parameter allows you to
+ * start at an offset of the target buffer.
+ */
+typedef struct _bson_writer_t bson_writer_t;
+
+
+BSON_EXPORT (bson_writer_t *)
+bson_writer_new (uint8_t **buf,
+                 size_t *buflen,
+                 size_t offset,
+                 bson_realloc_func realloc_func,
+                 void *realloc_func_ctx);
+BSON_EXPORT (void)
+bson_writer_destroy (bson_writer_t *writer);
+BSON_EXPORT (size_t)
+bson_writer_get_length (bson_writer_t *writer);
+BSON_EXPORT (bool)
+bson_writer_begin (bson_writer_t *writer, bson_t **bson);
+BSON_EXPORT (void)
+bson_writer_end (bson_writer_t *writer);
+BSON_EXPORT (void)
+bson_writer_rollback (bson_writer_t *writer);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_WRITER_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson.h b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson.h
new file mode 100644
index 0000000..8ffc58e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libbson-1.0/bson/bson.h
@@ -0,0 +1,1176 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef BSON_H
+#define BSON_H
+
+#define BSON_INSIDE
+
+#include "bson-compat.h"
+
+#include <string.h>
+#include <time.h>
+
+#include "bson-macros.h"
+#include "bson-config.h"
+#include "bson-atomic.h"
+#include "bson-cmp.h"
+#include "bson-context.h"
+#include "bson-clock.h"
+#include "bson-decimal128.h"
+#include "bson-error.h"
+#include "bson-iter.h"
+#include "bson-json.h"
+#include "bson-keys.h"
+#include "bson-md5.h"
+#include "bson-memory.h"
+#include "bson-oid.h"
+#include "bson-reader.h"
+#include "bson-string.h"
+#include "bson-types.h"
+#include "bson-utf8.h"
+#include "bson-value.h"
+#include "bson-version.h"
+#include "bson-version-functions.h"
+#include "bson-writer.h"
+#include "bcon.h"
+
+#undef BSON_INSIDE
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * bson_empty:
+ * @b: a bson_t.
+ *
+ * Checks to see if @b is an empty BSON document. An empty BSON document is
+ * a 5 byte document which contains the length (4 bytes) and a single NUL
+ * byte indicating end of fields.
+ */
+#define bson_empty(b) (((b)->len == 5) || !bson_get_data ((b))[4])
+
+
+/**
+ * bson_empty0:
+ *
+ * Like bson_empty() but treats NULL the same as an empty bson_t document.
+ */
+#define bson_empty0(b) (!(b) || bson_empty (b))
+
+
+/**
+ * bson_clear:
+ *
+ * Easily free a bson document and set it to NULL. Use like:
+ *
+ * bson_t *doc = bson_new();
+ * bson_clear (&doc);
+ * BSON_ASSERT (doc == NULL);
+ */
+#define bson_clear(bptr)         \
+   do {                          \
+      if (*(bptr)) {             \
+         bson_destroy (*(bptr)); \
+         *(bptr) = NULL;         \
+      }                          \
+   } while (0)
+
+
+/**
+ * BSON_MAX_SIZE:
+ *
+ * The maximum size in bytes of a BSON document.
+ */
+#define BSON_MAX_SIZE ((size_t) ((1U << 31) - 1))
+
+
+#define BSON_APPEND_ARRAY(b, key, val) \
+   bson_append_array (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_ARRAY_BEGIN(b, key, child) \
+   bson_append_array_begin (b, key, (int) strlen (key), child)
+
+#define BSON_APPEND_BINARY(b, key, subtype, val, len) \
+   bson_append_binary (b, key, (int) strlen (key), subtype, val, len)
+
+#define BSON_APPEND_BOOL(b, key, val) \
+   bson_append_bool (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_CODE(b, key, val) \
+   bson_append_code (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_CODE_WITH_SCOPE(b, key, val, scope) \
+   bson_append_code_with_scope (b, key, (int) strlen (key), val, scope)
+
+#define BSON_APPEND_DBPOINTER(b, key, coll, oid) \
+   bson_append_dbpointer (b, key, (int) strlen (key), coll, oid)
+
+#define BSON_APPEND_DOCUMENT_BEGIN(b, key, child) \
+   bson_append_document_begin (b, key, (int) strlen (key), child)
+
+#define BSON_APPEND_DOUBLE(b, key, val) \
+   bson_append_double (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_DOCUMENT(b, key, val) \
+   bson_append_document (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_INT32(b, key, val) \
+   bson_append_int32 (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_INT64(b, key, val) \
+   bson_append_int64 (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_MINKEY(b, key) \
+   bson_append_minkey (b, key, (int) strlen (key))
+
+#define BSON_APPEND_DECIMAL128(b, key, val) \
+   bson_append_decimal128 (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_MAXKEY(b, key) \
+   bson_append_maxkey (b, key, (int) strlen (key))
+
+#define BSON_APPEND_NULL(b, key) bson_append_null (b, key, (int) strlen (key))
+
+#define BSON_APPEND_OID(b, key, val) \
+   bson_append_oid (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_REGEX(b, key, val, opt) \
+   bson_append_regex (b, key, (int) strlen (key), val, opt)
+
+#define BSON_APPEND_UTF8(b, key, val) \
+   bson_append_utf8 (b, key, (int) strlen (key), val, (int) strlen (val))
+
+#define BSON_APPEND_SYMBOL(b, key, val) \
+   bson_append_symbol (b, key, (int) strlen (key), val, (int) strlen (val))
+
+#define BSON_APPEND_TIME_T(b, key, val) \
+   bson_append_time_t (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_TIMEVAL(b, key, val) \
+   bson_append_timeval (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_DATE_TIME(b, key, val) \
+   bson_append_date_time (b, key, (int) strlen (key), val)
+
+#define BSON_APPEND_TIMESTAMP(b, key, val, inc) \
+   bson_append_timestamp (b, key, (int) strlen (key), val, inc)
+
+#define BSON_APPEND_UNDEFINED(b, key) \
+   bson_append_undefined (b, key, (int) strlen (key))
+
+#define BSON_APPEND_VALUE(b, key, val) \
+   bson_append_value (b, key, (int) strlen (key), (val))
+
+
+/**
+ * bson_new:
+ *
+ * Allocates a new bson_t structure. Call the various bson_append_*()
+ * functions to add fields to the bson. You can iterate the bson_t at any
+ * time using a bson_iter_t and bson_iter_init().
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ */
+BSON_EXPORT (bson_t *)
+bson_new (void);
+
+
+BSON_EXPORT (bson_t *)
+bson_new_from_json (const uint8_t *data, ssize_t len, bson_error_t *error);
+
+
+BSON_EXPORT (bool)
+bson_init_from_json (bson_t *bson,
+                     const char *data,
+                     ssize_t len,
+                     bson_error_t *error);
+
+
+/**
+ * bson_init_static:
+ * @b: A pointer to a bson_t.
+ * @data: The data buffer to use.
+ * @length: The length of @data.
+ *
+ * Initializes a bson_t using @data and @length. This is ideal if you would
+ * like to use a stack allocation for your bson and do not need to grow the
+ * buffer. @data must be valid for the life of @b.
+ *
+ * Returns: true if initialized successfully; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_init_static (bson_t *b, const uint8_t *data, size_t length);
+
+
+/**
+ * bson_init:
+ * @b: A pointer to a bson_t.
+ *
+ * Initializes a bson_t for use. This function is useful to those that want a
+ * stack allocated bson_t. The usefulness of a stack allocated bson_t is
+ * marginal as the target buffer for content will still require heap
+ * allocations. It can help reduce heap fragmentation on allocators that do
+ * not employ SLAB/magazine semantics.
+ *
+ * You must call bson_destroy() with @b to release resources when you are done
+ * using @b.
+ */
+BSON_EXPORT (void)
+bson_init (bson_t *b);
+
+
+/**
+ * bson_reinit:
+ * @b: (inout): A bson_t.
+ *
+ * This is equivalent to calling bson_destroy() and bson_init() on a #bson_t.
+ * However, it will try to persist the existing malloc'd buffer if one exists.
+ * This is useful in cases where you want to reduce malloc overhead while
+ * building many documents.
+ */
+BSON_EXPORT (void)
+bson_reinit (bson_t *b);
+
+
+/**
+ * bson_new_from_data:
+ * @data: A buffer containing a serialized bson document.
+ * @length: The length of the document in bytes.
+ *
+ * Creates a new bson_t structure using the data provided. @data should contain
+ * at least @length bytes that can be copied into the new bson_t structure.
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ *   If the first four bytes (little-endian) of data do not match @length,
+ *   then NULL will be returned.
+ */
+BSON_EXPORT (bson_t *)
+bson_new_from_data (const uint8_t *data, size_t length);
+
+
+/**
+ * bson_new_from_buffer:
+ * @buf: A pointer to a buffer containing a serialized bson document.
+ * @buf_len: The length of the buffer in bytes.
+ * @realloc_fun: a realloc like function
+ * @realloc_fun_ctx: a context for the realloc function
+ *
+ * Creates a new bson_t structure using the data provided. @buf should contain
+ * a bson document, or null pointer should be passed for new allocations.
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ *          The underlying buffer will be used and not be freed in destroy.
+ */
+BSON_EXPORT (bson_t *)
+bson_new_from_buffer (uint8_t **buf,
+                      size_t *buf_len,
+                      bson_realloc_func realloc_func,
+                      void *realloc_func_ctx);
+
+
+/**
+ * bson_sized_new:
+ * @size: A size_t containing the number of bytes to allocate.
+ *
+ * This will allocate a new bson_t with enough bytes to hold a buffer
+ * sized @size. @size must be smaller than INT_MAX bytes.
+ *
+ * Returns: A newly allocated bson_t that should be freed with bson_destroy().
+ */
+BSON_EXPORT (bson_t *)
+bson_sized_new (size_t size);
+
+
+/**
+ * bson_copy:
+ * @bson: A bson_t.
+ *
+ * Copies @bson into a newly allocated bson_t. You must call bson_destroy()
+ * when you are done with the resulting value to free its resources.
+ *
+ * Returns: A newly allocated bson_t that should be free'd with bson_destroy()
+ */
+BSON_EXPORT (bson_t *)
+bson_copy (const bson_t *bson);
+
+
+/**
+ * bson_copy_to:
+ * @src: The source bson_t.
+ * @dst: The destination bson_t.
+ *
+ * Initializes @dst and copies the content from @src into @dst.
+ */
+BSON_EXPORT (void)
+bson_copy_to (const bson_t *src, bson_t *dst);
+
+
+/**
+ * bson_copy_to_excluding:
+ * @src: A bson_t.
+ * @dst: A bson_t to initialize and copy into.
+ * @first_exclude: First field name to exclude.
+ *
+ * Copies @src into @dst excluding any field that is provided.
+ * This is handy for situations when you need to remove one or
+ * more fields in a bson_t. Note that bson_init() will be called
+ * on dst.
+ */
+BSON_EXPORT (void)
+bson_copy_to_excluding (const bson_t *src,
+                        bson_t *dst,
+                        const char *first_exclude,
+                        ...) BSON_GNUC_NULL_TERMINATED
+   BSON_GNUC_DEPRECATED_FOR (bson_copy_to_excluding_noinit);
+
+/**
+ * bson_copy_to_excluding_noinit:
+ * @src: A bson_t.
+ * @dst: A bson_t to initialize and copy into.
+ * @first_exclude: First field name to exclude.
+ *
+ * The same as bson_copy_to_excluding, but does not call bson_init()
+ * on the dst. This version should be preferred in new code, but the
+ * old function is left for backwards compatibility.
+ */
+BSON_EXPORT (void)
+bson_copy_to_excluding_noinit (const bson_t *src,
+                               bson_t *dst,
+                               const char *first_exclude,
+                               ...) BSON_GNUC_NULL_TERMINATED;
+
+BSON_EXPORT (void)
+bson_copy_to_excluding_noinit_va (const bson_t *src,
+                                  bson_t *dst,
+                                  const char *first_exclude,
+                                  va_list args);
+
+/**
+ * bson_destroy:
+ * @bson: A bson_t.
+ *
+ * Frees the resources associated with @bson.
+ */
+BSON_EXPORT (void)
+bson_destroy (bson_t *bson);
+
+BSON_EXPORT (uint8_t *)
+bson_reserve_buffer (bson_t *bson, uint32_t size);
+
+BSON_EXPORT (bool)
+bson_steal (bson_t *dst, bson_t *src);
+
+
+/**
+ * bson_destroy_with_steal:
+ * @bson: A #bson_t.
+ * @steal: If ownership of the data buffer should be transferred to caller.
+ * @length: (out): location for the length of the buffer.
+ *
+ * Destroys @bson similar to calling bson_destroy() except that the underlying
+ * buffer will be returned and ownership transferred to the caller if @steal
+ * is non-zero.
+ *
+ * If length is non-NULL, the length of @bson will be stored in @length.
+ *
+ * It is a programming error to call this function with any bson that has
+ * been initialized static, or is being used to create a subdocument with
+ * functions such as bson_append_document_begin() or bson_append_array_begin().
+ *
+ * Returns: a buffer owned by the caller if @steal is true. Otherwise NULL.
+ *    If there was an error, NULL is returned.
+ */
+BSON_EXPORT (uint8_t *)
+bson_destroy_with_steal (bson_t *bson, bool steal, uint32_t *length);
+
+
+/**
+ * bson_get_data:
+ * @bson: A bson_t.
+ *
+ * Fetched the data buffer for @bson of @bson->len bytes in length.
+ *
+ * Returns: A buffer that should not be modified or freed.
+ */
+BSON_EXPORT (const uint8_t *)
+bson_get_data (const bson_t *bson);
+
+
+/**
+ * bson_count_keys:
+ * @bson: A bson_t.
+ *
+ * Counts the number of elements found in @bson.
+ */
+BSON_EXPORT (uint32_t)
+bson_count_keys (const bson_t *bson);
+
+
+/**
+ * bson_has_field:
+ * @bson: A bson_t.
+ * @key: The key to lookup.
+ *
+ * Checks to see if @bson contains a field named @key.
+ *
+ * This function is case-sensitive.
+ *
+ * Returns: true if @key exists in @bson; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_has_field (const bson_t *bson, const char *key);
+
+
+/**
+ * bson_compare:
+ * @bson: A bson_t.
+ * @other: A bson_t.
+ *
+ * Compares @bson to @other in a qsort() style comparison.
+ * See qsort() for information on how this function works.
+ *
+ * Returns: Less than zero, zero, or greater than zero.
+ */
+BSON_EXPORT (int)
+bson_compare (const bson_t *bson, const bson_t *other);
+
+/*
+ * bson_equal:
+ * @bson: A bson_t.
+ * @other: A bson_t.
+ *
+ * Checks to see if @bson and @other are equal.
+ *
+ * Returns: true if equal; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_equal (const bson_t *bson, const bson_t *other);
+
+
+/**
+ * bson_validate:
+ * @bson: A bson_t.
+ * @offset: A location for the error offset.
+ *
+ * Validates a BSON document by walking through the document and inspecting
+ * the fields for valid content.
+ *
+ * Returns: true if @bson is valid; otherwise false and @offset is set.
+ */
+BSON_EXPORT (bool)
+bson_validate (const bson_t *bson, bson_validate_flags_t flags, size_t *offset);
+
+
+/**
+ * bson_validate_with_error:
+ * @bson: A bson_t.
+ * @error: A location for the error info.
+ *
+ * Validates a BSON document by walking through the document and inspecting
+ * the fields for valid content.
+ *
+ * Returns: true if @bson is valid; otherwise false and @error is filled out.
+ */
+BSON_EXPORT (bool)
+bson_validate_with_error (const bson_t *bson,
+                          bson_validate_flags_t flags,
+                          bson_error_t *error);
+
+
+/**
+ * bson_as_json_with_opts:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ * @opts: A bson_t_json_opts_t defining options for the conversion
+ *
+ * Creates a new string containing @bson in the selected JSON format,
+ * conforming to the MongoDB Extended JSON Spec:
+ *
+ * github.com/mongodb/specifications/blob/master/source/extended-json.rst
+ *
+ * The caller is responsible for freeing the resulting string. If @length is
+ * non-NULL, then the length of the resulting string will be placed in @length.
+ *
+ * See http://docs.mongodb.org/manual/reference/mongodb-extended-json/ for
+ * more information on extended JSON.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_json_with_opts (const bson_t *bson,
+                        size_t *length,
+                        const bson_json_opts_t *opts);
+
+
+/**
+ * bson_as_canonical_extended_json:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ *
+ * Creates a new string containing @bson in canonical extended JSON format,
+ * conforming to the MongoDB Extended JSON Spec:
+ *
+ * github.com/mongodb/specifications/blob/master/source/extended-json.rst
+ *
+ * The caller is responsible for freeing the resulting string. If @length is
+ * non-NULL, then the length of the resulting string will be placed in @length.
+ *
+ * See http://docs.mongodb.org/manual/reference/mongodb-extended-json/ for
+ * more information on extended JSON.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_canonical_extended_json (const bson_t *bson, size_t *length);
+
+
+/**
+ * bson_as_json:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ *
+ * Creates a new string containing @bson in libbson's legacy JSON format.
+ * Superseded by bson_as_canonical_extended_json and
+ * bson_as_relaxed_extended_json. The caller is
+ * responsible for freeing the resulting string. If @length is non-NULL, then
+ * the length of the resulting string will be placed in @length.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_json (const bson_t *bson, size_t *length);
+
+
+/**
+ * bson_as_relaxed_extended_json:
+ * @bson: A bson_t.
+ * @length: A location for the string length, or NULL.
+ *
+ * Creates a new string containing @bson in relaxed extended JSON format,
+ * conforming to the MongoDB Extended JSON Spec:
+ *
+ * github.com/mongodb/specifications/blob/master/source/extended-json.rst
+ *
+ * The caller is responsible for freeing the resulting string. If @length is
+ * non-NULL, then the length of the resulting string will be placed in @length.
+ *
+ * See http://docs.mongodb.org/manual/reference/mongodb-extended-json/ for
+ * more information on extended JSON.
+ *
+ * Returns: A newly allocated string that should be freed with bson_free().
+ */
+BSON_EXPORT (char *)
+bson_as_relaxed_extended_json (const bson_t *bson, size_t *length);
+
+
+/* like bson_as_json() but for outermost arrays. */
+BSON_EXPORT (char *)
+bson_array_as_json (const bson_t *bson, size_t *length);
+
+
+BSON_EXPORT (bool)
+bson_append_value (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   const bson_value_t *value);
+
+
+/**
+ * bson_append_array:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @array: A bson_t containing the array.
+ *
+ * Appends a BSON array to @bson. BSON arrays are like documents where the
+ * key is the string version of the index. For example, the first item of the
+ * array would have the key "0". The second item would have the index "1".
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_array (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   const bson_t *array);
+
+
+/**
+ * bson_append_binary:
+ * @bson: A bson_t to append.
+ * @key: The key for the field.
+ * @subtype: The bson_subtype_t of the binary.
+ * @binary: The binary buffer to append.
+ * @length: The length of @binary.
+ *
+ * Appends a binary buffer to the BSON document.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_binary (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    bson_subtype_t subtype,
+                    const uint8_t *binary,
+                    uint32_t length);
+
+
+/**
+ * bson_append_bool:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The boolean value.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_BOOL.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_bool (bson_t *bson, const char *key, int key_length, bool value);
+
+
+/**
+ * bson_append_code:
+ * @bson: A bson_t.
+ * @key: The key for the document.
+ * @javascript: JavaScript code to be executed.
+ *
+ * Appends a field of type BSON_TYPE_CODE to the BSON document. @javascript
+ * should contain a script in javascript to be executed.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_code (bson_t *bson,
+                  const char *key,
+                  int key_length,
+                  const char *javascript);
+
+
+/**
+ * bson_append_code_with_scope:
+ * @bson: A bson_t.
+ * @key: The key for the document.
+ * @javascript: JavaScript code to be executed.
+ * @scope: A bson_t containing the scope for @javascript.
+ *
+ * Appends a field of type BSON_TYPE_CODEWSCOPE to the BSON document.
+ * @javascript should contain a script in javascript to be executed.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_code_with_scope (bson_t *bson,
+                             const char *key,
+                             int key_length,
+                             const char *javascript,
+                             const bson_t *scope);
+
+
+/**
+ * bson_append_dbpointer:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @collection: The collection name.
+ * @oid: The oid to the reference.
+ *
+ * Appends a new field of type BSON_TYPE_DBPOINTER. This datum type is
+ * deprecated in the BSON spec and should not be used in new code.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_dbpointer (bson_t *bson,
+                       const char *key,
+                       int key_length,
+                       const char *collection,
+                       const bson_oid_t *oid);
+
+
+/**
+ * bson_append_double:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field to @bson of the type BSON_TYPE_DOUBLE.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_double (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    double value);
+
+
+/**
+ * bson_append_document:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A bson_t containing the subdocument.
+ *
+ * Appends a new field to @bson of the type BSON_TYPE_DOCUMENT.
+ * The documents contents will be copied into @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_document (bson_t *bson,
+                      const char *key,
+                      int key_length,
+                      const bson_t *value);
+
+
+/**
+ * bson_append_document_begin:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key in bytes not including NUL or -1
+ *    if @key_length is NUL terminated.
+ * @child: A location to an uninitialized bson_t.
+ *
+ * Appends a new field named @key to @bson. The field is, however,
+ * incomplete.  @child will be initialized so that you may add fields to the
+ * child document.  Child will use a memory buffer owned by @bson and
+ * therefore grow the parent buffer as additional space is used. This allows
+ * a single malloc'd buffer to be used when building documents which can help
+ * reduce memory fragmentation.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_document_begin (bson_t *bson,
+                            const char *key,
+                            int key_length,
+                            bson_t *child);
+
+
+/**
+ * bson_append_document_end:
+ * @bson: A bson_t.
+ * @child: A bson_t supplied to bson_append_document_begin().
+ *
+ * Finishes the appending of a document to a @bson. @child is considered
+ * disposed after this call and should not be used any further.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_document_end (bson_t *bson, bson_t *child);
+
+
+/**
+ * bson_append_array_begin:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key in bytes not including NUL or -1
+ *    if @key_length is NUL terminated.
+ * @child: A location to an uninitialized bson_t.
+ *
+ * Appends a new field named @key to @bson. The field is, however,
+ * incomplete. @child will be initialized so that you may add fields to the
+ * child array. Child will use a memory buffer owned by @bson and
+ * therefore grow the parent buffer as additional space is used. This allows
+ * a single malloc'd buffer to be used when building arrays which can help
+ * reduce memory fragmentation.
+ *
+ * The type of @child will be BSON_TYPE_ARRAY and therefore the keys inside
+ * of it MUST be "0", "1", etc.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_array_begin (bson_t *bson,
+                         const char *key,
+                         int key_length,
+                         bson_t *child);
+
+
+/**
+ * bson_append_array_end:
+ * @bson: A bson_t.
+ * @child: A bson_t supplied to bson_append_array_begin().
+ *
+ * Finishes the appending of a array to a @bson. @child is considered
+ * disposed after this call and should not be used any further.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_array_end (bson_t *bson, bson_t *child);
+
+
+/**
+ * bson_append_int32:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The int32_t 32-bit integer value.
+ *
+ * Appends a new field of type BSON_TYPE_INT32 to @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_int32 (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   int32_t value);
+
+
+/**
+ * bson_append_int64:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The int64_t 64-bit integer value.
+ *
+ * Appends a new field of type BSON_TYPE_INT64 to @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_int64 (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   int64_t value);
+
+
+/**
+ * bson_append_decimal128:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The bson_decimal128_t decimal128 value.
+ *
+ * Appends a new field of type BSON_TYPE_DECIMAL128 to @bson.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_decimal128 (bson_t *bson,
+                        const char *key,
+                        int key_length,
+                        const bson_decimal128_t *value);
+
+
+/**
+ * bson_append_iter:
+ * @bson: A bson_t to append to.
+ * @key: The key name or %NULL to take current key from @iter.
+ * @key_length: The key length or -1 to use strlen().
+ * @iter: The iter located on the position of the element to append.
+ *
+ * Appends a new field to @bson that is equivalent to the field currently
+ * pointed to by @iter.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_iter (bson_t *bson,
+                  const char *key,
+                  int key_length,
+                  const bson_iter_t *iter);
+
+
+/**
+ * bson_append_minkey:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field of type BSON_TYPE_MINKEY to @bson. This is a special
+ * type that compares lower than all other possible BSON element values.
+ *
+ * See http://bsonspec.org for more information on this type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_minkey (bson_t *bson, const char *key, int key_length);
+
+
+/**
+ * bson_append_maxkey:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field of type BSON_TYPE_MAXKEY to @bson. This is a special
+ * type that compares higher than all other possible BSON element values.
+ *
+ * See http://bsonspec.org for more information on this type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_maxkey (bson_t *bson, const char *key, int key_length);
+
+
+/**
+ * bson_append_null:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a new field to @bson with NULL for the value.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_null (bson_t *bson, const char *key, int key_length);
+
+
+/**
+ * bson_append_oid:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @oid: bson_oid_t.
+ *
+ * Appends a new field to the @bson of type BSON_TYPE_OID using the contents of
+ * @oid.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_oid (bson_t *bson,
+                 const char *key,
+                 int key_length,
+                 const bson_oid_t *oid);
+
+
+/**
+ * bson_append_regex:
+ * @bson: A bson_t.
+ * @key: The key of the field.
+ * @regex: The regex to append to the bson.
+ * @options: Options for @regex.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_REGEX. @regex should
+ * be the regex string. @options should contain the options for the regex.
+ *
+ * Valid options for @options are:
+ *
+ *   'i' for case-insensitive.
+ *   'm' for multiple matching.
+ *   'x' for verbose mode.
+ *   'l' to make \w and \W locale dependent.
+ *   's' for dotall mode ('.' matches everything)
+ *   'u' to make \w and \W match unicode.
+ *
+ * For more detailed information about BSON regex elements, see bsonspec.org.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_regex (bson_t *bson,
+                   const char *key,
+                   int key_length,
+                   const char *regex,
+                   const char *options);
+
+
+/**
+ * bson_append_regex:
+ * @bson: A bson_t.
+ * @key: The key of the field.
+ * @key_length: The length of the key string.
+ * @regex: The regex to append to the bson.
+ * @regex_length: The length of the regex string.
+ * @options: Options for @regex.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_REGEX. @regex should
+ * be the regex string. @options should contain the options for the regex.
+ *
+ * Valid options for @options are:
+ *
+ *   'i' for case-insensitive.
+ *   'm' for multiple matching.
+ *   'x' for verbose mode.
+ *   'l' to make \w and \W locale dependent.
+ *   's' for dotall mode ('.' matches everything)
+ *   'u' to make \w and \W match unicode.
+ *
+ * For more detailed information about BSON regex elements, see bsonspec.org.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_regex_w_len (bson_t *bson,
+                         const char *key,
+                         int key_length,
+                         const char *regex,
+                         int regex_length,
+                         const char *options);
+
+
+/**
+ * bson_append_utf8:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A UTF-8 encoded string.
+ * @length: The length of @value or -1 if it is NUL terminated.
+ *
+ * Appends a new field to @bson using @key as the key and @value as the UTF-8
+ * encoded value.
+ *
+ * It is the callers responsibility to ensure @value is valid UTF-8. You can
+ * use bson_utf8_validate() to perform this check.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_utf8 (bson_t *bson,
+                  const char *key,
+                  int key_length,
+                  const char *value,
+                  int length);
+
+
+/**
+ * bson_append_symbol:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: The symbol as a string.
+ * @length: The length of @value or -1 if NUL-terminated.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_SYMBOL. This BSON type is
+ * deprecated and should not be used in new code.
+ *
+ * See http://bsonspec.org for more information on this type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_symbol (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    const char *value,
+                    int length);
+
+
+/**
+ * bson_append_time_t:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A time_t.
+ *
+ * Appends a BSON_TYPE_DATE_TIME field to @bson using the time_t @value for the
+ * number of seconds since UNIX epoch in UTC.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_time_t (bson_t *bson,
+                    const char *key,
+                    int key_length,
+                    time_t value);
+
+
+/**
+ * bson_append_timeval:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @value: A struct timeval containing the date and time.
+ *
+ * Appends a BSON_TYPE_DATE_TIME field to @bson using the struct timeval
+ * provided. The time is persisted in milliseconds since the UNIX epoch in UTC.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_timeval (bson_t *bson,
+                     const char *key,
+                     int key_length,
+                     struct timeval *value);
+
+
+/**
+ * bson_append_date_time:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key in bytes or -1 if \0 terminated.
+ * @value: The number of milliseconds elapsed since UNIX epoch.
+ *
+ * Appends a new field to @bson of type BSON_TYPE_DATE_TIME.
+ *
+ * Returns: true if successful; otherwise false.
+ */
+BSON_EXPORT (bool)
+bson_append_date_time (bson_t *bson,
+                       const char *key,
+                       int key_length,
+                       int64_t value);
+
+
+/**
+ * bson_append_now_utc:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @key_length: The length of @key or -1 if it is NULL terminated.
+ *
+ * Appends a BSON_TYPE_DATE_TIME field to @bson using the current time in UTC
+ * as the field value.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_now_utc (bson_t *bson, const char *key, int key_length);
+
+/**
+ * bson_append_timestamp:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ * @timestamp: 4 byte timestamp.
+ * @increment: 4 byte increment for timestamp.
+ *
+ * Appends a field of type BSON_TYPE_TIMESTAMP to @bson. This is a special type
+ * used by MongoDB replication and sharding. If you need generic time and date
+ * fields use bson_append_time_t() or bson_append_timeval().
+ *
+ * Setting @increment and @timestamp to zero has special semantics. See
+ * http://bsonspec.org for more information on this field type.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_timestamp (bson_t *bson,
+                       const char *key,
+                       int key_length,
+                       uint32_t timestamp,
+                       uint32_t increment);
+
+
+/**
+ * bson_append_undefined:
+ * @bson: A bson_t.
+ * @key: The key for the field.
+ *
+ * Appends a field of type BSON_TYPE_UNDEFINED. This type is deprecated in the
+ * spec and should not be used for new code. However, it is provided for those
+ * needing to interact with legacy systems.
+ *
+ * Returns: true if successful; false if append would overflow max size.
+ */
+BSON_EXPORT (bool)
+bson_append_undefined (bson_t *bson, const char *key, int key_length);
+
+
+BSON_EXPORT (bool)
+bson_concat (bson_t *dst, const bson_t *src);
+
+
+BSON_END_DECLS
+
+
+#endif /* BSON_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc.h
new file mode 100644
index 0000000..458369f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* Including mongoc.h is superseded. Use mongoc/mongoc.h instead. */
+#include "mongoc/mongoc.h"
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-apm.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-apm.h
new file mode 100644
index 0000000..7fe95d3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-apm.h
@@ -0,0 +1,378 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_APM_H
+#define MONGOC_APM_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-host-list.h"
+#include "mongoc-server-description.h"
+#include "mongoc-topology-description.h"
+
+BSON_BEGIN_DECLS
+
+/*
+ * Application Performance Management (APM) interface, complies with two specs.
+ * MongoDB's Command Monitoring Spec:
+ *
+ * https://github.com/mongodb/specifications/tree/master/source/command-monitoring
+ *
+ * MongoDB's Spec for Monitoring Server Discovery and Monitoring (SDAM) events:
+ *
+ * https://github.com/mongodb/specifications/tree/master/source/server-discovery-and-monitoring
+ *
+ */
+
+/*
+ * callbacks to receive APM events
+ */
+
+typedef struct _mongoc_apm_callbacks_t mongoc_apm_callbacks_t;
+
+
+/*
+ * command monitoring events
+ */
+
+typedef struct _mongoc_apm_command_started_t mongoc_apm_command_started_t;
+typedef struct _mongoc_apm_command_succeeded_t mongoc_apm_command_succeeded_t;
+typedef struct _mongoc_apm_command_failed_t mongoc_apm_command_failed_t;
+
+
+/*
+ * SDAM monitoring events
+ */
+
+typedef struct _mongoc_apm_server_changed_t mongoc_apm_server_changed_t;
+typedef struct _mongoc_apm_server_opening_t mongoc_apm_server_opening_t;
+typedef struct _mongoc_apm_server_closed_t mongoc_apm_server_closed_t;
+typedef struct _mongoc_apm_topology_changed_t mongoc_apm_topology_changed_t;
+typedef struct _mongoc_apm_topology_opening_t mongoc_apm_topology_opening_t;
+typedef struct _mongoc_apm_topology_closed_t mongoc_apm_topology_closed_t;
+typedef struct _mongoc_apm_server_heartbeat_started_t
+   mongoc_apm_server_heartbeat_started_t;
+typedef struct _mongoc_apm_server_heartbeat_succeeded_t
+   mongoc_apm_server_heartbeat_succeeded_t;
+typedef struct _mongoc_apm_server_heartbeat_failed_t
+   mongoc_apm_server_heartbeat_failed_t;
+
+/*
+ * event field accessors
+ */
+
+/* command-started event fields */
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_command_started_get_command (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_started_get_database_name (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_started_get_command_name (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_started_get_request_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_started_get_operation_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_command_started_get_host (const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (uint32_t)
+mongoc_apm_command_started_get_server_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_started_get_service_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (int32_t)
+mongoc_apm_command_started_get_server_connection_id (
+   const mongoc_apm_command_started_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_command_started_get_context (
+   const mongoc_apm_command_started_t *event);
+
+/* command-succeeded event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_succeeded_get_duration (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_command_succeeded_get_reply (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_succeeded_get_command_name (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_succeeded_get_request_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_succeeded_get_operation_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_command_succeeded_get_host (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (uint32_t)
+mongoc_apm_command_succeeded_get_server_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_succeeded_get_service_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (int32_t)
+mongoc_apm_command_succeeded_get_server_connection_id (
+   const mongoc_apm_command_succeeded_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_command_succeeded_get_context (
+   const mongoc_apm_command_succeeded_t *event);
+
+/* command-failed event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_failed_get_duration (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (const char *)
+mongoc_apm_command_failed_get_command_name (
+   const mongoc_apm_command_failed_t *event);
+/* retrieve the error by filling out the passed-in "error" struct */
+MONGOC_EXPORT (void)
+mongoc_apm_command_failed_get_error (const mongoc_apm_command_failed_t *event,
+                                     bson_error_t *error);
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_command_failed_get_reply (const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_failed_get_request_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (int64_t)
+mongoc_apm_command_failed_get_operation_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_command_failed_get_host (const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (uint32_t)
+mongoc_apm_command_failed_get_server_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (const bson_oid_t *)
+mongoc_apm_command_failed_get_service_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (int32_t)
+mongoc_apm_command_failed_get_server_connection_id (
+   const mongoc_apm_command_failed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_command_failed_get_context (
+   const mongoc_apm_command_failed_t *event);
+
+/* server-changed event fields */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_changed_get_host (const mongoc_apm_server_changed_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_changed_get_topology_id (
+   const mongoc_apm_server_changed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (const mongoc_server_description_t *)
+mongoc_apm_server_changed_get_previous_description (
+   const mongoc_apm_server_changed_t *event);
+MONGOC_EXPORT (const mongoc_server_description_t *)
+mongoc_apm_server_changed_get_new_description (
+   const mongoc_apm_server_changed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_changed_get_context (
+   const mongoc_apm_server_changed_t *event);
+
+/* server-opening event fields */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_opening_get_host (const mongoc_apm_server_opening_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_opening_get_topology_id (
+   const mongoc_apm_server_opening_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_opening_get_context (
+   const mongoc_apm_server_opening_t *event);
+
+/* server-closed event fields */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_closed_get_host (const mongoc_apm_server_closed_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_closed_get_topology_id (
+   const mongoc_apm_server_closed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_closed_get_context (const mongoc_apm_server_closed_t *event);
+
+/* topology-changed event fields */
+
+MONGOC_EXPORT (void)
+mongoc_apm_topology_changed_get_topology_id (
+   const mongoc_apm_topology_changed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (const mongoc_topology_description_t *)
+mongoc_apm_topology_changed_get_previous_description (
+   const mongoc_apm_topology_changed_t *event);
+MONGOC_EXPORT (const mongoc_topology_description_t *)
+mongoc_apm_topology_changed_get_new_description (
+   const mongoc_apm_topology_changed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_topology_changed_get_context (
+   const mongoc_apm_topology_changed_t *event);
+
+/* topology-opening event field */
+
+MONGOC_EXPORT (void)
+mongoc_apm_topology_opening_get_topology_id (
+   const mongoc_apm_topology_opening_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_topology_opening_get_context (
+   const mongoc_apm_topology_opening_t *event);
+
+/* topology-closed event field */
+
+MONGOC_EXPORT (void)
+mongoc_apm_topology_closed_get_topology_id (
+   const mongoc_apm_topology_closed_t *event, bson_oid_t *topology_id);
+MONGOC_EXPORT (void *)
+mongoc_apm_topology_closed_get_context (
+   const mongoc_apm_topology_closed_t *event);
+
+/* heartbeat-started event field */
+
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_heartbeat_started_get_host (
+   const mongoc_apm_server_heartbeat_started_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_heartbeat_started_get_context (
+   const mongoc_apm_server_heartbeat_started_t *event);
+MONGOC_EXPORT (bool)
+mongoc_apm_server_heartbeat_started_get_awaited (
+   const mongoc_apm_server_heartbeat_started_t *event);
+
+/* heartbeat-succeeded event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_server_heartbeat_succeeded_get_duration (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (const bson_t *)
+mongoc_apm_server_heartbeat_succeeded_get_reply (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_heartbeat_succeeded_get_host (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_heartbeat_succeeded_get_context (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+MONGOC_EXPORT (bool)
+mongoc_apm_server_heartbeat_succeeded_get_awaited (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+
+/* heartbeat-failed event fields */
+
+MONGOC_EXPORT (int64_t)
+mongoc_apm_server_heartbeat_failed_get_duration (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+MONGOC_EXPORT (void)
+mongoc_apm_server_heartbeat_failed_get_error (
+   const mongoc_apm_server_heartbeat_failed_t *event, bson_error_t *error);
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_apm_server_heartbeat_failed_get_host (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+MONGOC_EXPORT (void *)
+mongoc_apm_server_heartbeat_failed_get_context (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+MONGOC_EXPORT (bool)
+mongoc_apm_server_heartbeat_failed_get_awaited (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+
+
+/*
+ * callbacks
+ */
+
+typedef void (*mongoc_apm_command_started_cb_t) (
+   const mongoc_apm_command_started_t *event);
+typedef void (*mongoc_apm_command_succeeded_cb_t) (
+   const mongoc_apm_command_succeeded_t *event);
+typedef void (*mongoc_apm_command_failed_cb_t) (
+   const mongoc_apm_command_failed_t *event);
+typedef void (*mongoc_apm_server_changed_cb_t) (
+   const mongoc_apm_server_changed_t *event);
+typedef void (*mongoc_apm_server_opening_cb_t) (
+   const mongoc_apm_server_opening_t *event);
+typedef void (*mongoc_apm_server_closed_cb_t) (
+   const mongoc_apm_server_closed_t *event);
+typedef void (*mongoc_apm_topology_changed_cb_t) (
+   const mongoc_apm_topology_changed_t *event);
+typedef void (*mongoc_apm_topology_opening_cb_t) (
+   const mongoc_apm_topology_opening_t *event);
+typedef void (*mongoc_apm_topology_closed_cb_t) (
+   const mongoc_apm_topology_closed_t *event);
+typedef void (*mongoc_apm_server_heartbeat_started_cb_t) (
+   const mongoc_apm_server_heartbeat_started_t *event);
+typedef void (*mongoc_apm_server_heartbeat_succeeded_cb_t) (
+   const mongoc_apm_server_heartbeat_succeeded_t *event);
+typedef void (*mongoc_apm_server_heartbeat_failed_cb_t) (
+   const mongoc_apm_server_heartbeat_failed_t *event);
+
+/*
+ * registering callbacks
+ */
+
+MONGOC_EXPORT (mongoc_apm_callbacks_t *)
+mongoc_apm_callbacks_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_apm_callbacks_destroy (mongoc_apm_callbacks_t *callbacks);
+MONGOC_EXPORT (void)
+mongoc_apm_set_command_started_cb (mongoc_apm_callbacks_t *callbacks,
+                                   mongoc_apm_command_started_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_command_succeeded_cb (mongoc_apm_callbacks_t *callbacks,
+                                     mongoc_apm_command_succeeded_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_command_failed_cb (mongoc_apm_callbacks_t *callbacks,
+                                  mongoc_apm_command_failed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_changed_cb (mongoc_apm_callbacks_t *callbacks,
+                                  mongoc_apm_server_changed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_opening_cb (mongoc_apm_callbacks_t *callbacks,
+                                  mongoc_apm_server_opening_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_closed_cb (mongoc_apm_callbacks_t *callbacks,
+                                 mongoc_apm_server_closed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_topology_changed_cb (mongoc_apm_callbacks_t *callbacks,
+                                    mongoc_apm_topology_changed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_topology_opening_cb (mongoc_apm_callbacks_t *callbacks,
+                                    mongoc_apm_topology_opening_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_topology_closed_cb (mongoc_apm_callbacks_t *callbacks,
+                                   mongoc_apm_topology_closed_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_heartbeat_started_cb (
+   mongoc_apm_callbacks_t *callbacks,
+   mongoc_apm_server_heartbeat_started_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_heartbeat_succeeded_cb (
+   mongoc_apm_callbacks_t *callbacks,
+   mongoc_apm_server_heartbeat_succeeded_cb_t cb);
+MONGOC_EXPORT (void)
+mongoc_apm_set_server_heartbeat_failed_cb (
+   mongoc_apm_callbacks_t *callbacks,
+   mongoc_apm_server_heartbeat_failed_cb_t cb);
+BSON_END_DECLS
+
+#endif /* MONGOC_APM_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-bulk-operation.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-bulk-operation.h
new file mode 100644
index 0000000..515bfb2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-bulk-operation.h
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_BULK_OPERATION_H
+#define MONGOC_BULK_OPERATION_H
+
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-write-concern.h"
+
+/* ordered, bypass_document_validation, has_collation, multi */
+#define MONGOC_BULK_WRITE_FLAGS_INIT \
+   {                                 \
+      true, false, 0                 \
+   }
+
+BSON_BEGIN_DECLS
+
+/* forward decl */
+struct _mongoc_client_session_t;
+
+typedef struct _mongoc_bulk_operation_t mongoc_bulk_operation_t;
+typedef struct _mongoc_bulk_write_flags_t mongoc_bulk_write_flags_t;
+
+
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_destroy (mongoc_bulk_operation_t *bulk);
+MONGOC_EXPORT (uint32_t)
+mongoc_bulk_operation_execute (mongoc_bulk_operation_t *bulk,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_delete (mongoc_bulk_operation_t *bulk,
+                              const bson_t *selector)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_bulk_operation_remove);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_delete_one (mongoc_bulk_operation_t *bulk,
+                                  const bson_t *selector)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_bulk_operation_remove_one);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_insert (mongoc_bulk_operation_t *bulk,
+                              const bson_t *document);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_insert_with_opts (mongoc_bulk_operation_t *bulk,
+                                        const bson_t *document,
+                                        const bson_t *opts,
+                                        bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_remove (mongoc_bulk_operation_t *bulk,
+                              const bson_t *selector);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_remove_many_with_opts (mongoc_bulk_operation_t *bulk,
+                                             const bson_t *selector,
+                                             const bson_t *opts,
+                                             bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_remove_one (mongoc_bulk_operation_t *bulk,
+                                  const bson_t *selector);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_remove_one_with_opts (mongoc_bulk_operation_t *bulk,
+                                            const bson_t *selector,
+                                            const bson_t *opts,
+                                            bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_replace_one (mongoc_bulk_operation_t *bulk,
+                                   const bson_t *selector,
+                                   const bson_t *document,
+                                   bool upsert);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_replace_one_with_opts (mongoc_bulk_operation_t *bulk,
+                                             const bson_t *selector,
+                                             const bson_t *document,
+                                             const bson_t *opts,
+                                             bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_update (mongoc_bulk_operation_t *bulk,
+                              const bson_t *selector,
+                              const bson_t *document,
+                              bool upsert);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_update_many_with_opts (mongoc_bulk_operation_t *bulk,
+                                             const bson_t *selector,
+                                             const bson_t *document,
+                                             const bson_t *opts,
+                                             bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_update_one (mongoc_bulk_operation_t *bulk,
+                                  const bson_t *selector,
+                                  const bson_t *document,
+                                  bool upsert);
+MONGOC_EXPORT (bool)
+mongoc_bulk_operation_update_one_with_opts (mongoc_bulk_operation_t *bulk,
+                                            const bson_t *selector,
+                                            const bson_t *document,
+                                            const bson_t *opts,
+                                            bson_error_t *error); /* OUT */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_bypass_document_validation (
+   mongoc_bulk_operation_t *bulk, bool bypass);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_comment (mongoc_bulk_operation_t *bulk,
+                                   const bson_value_t *comment);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_let (mongoc_bulk_operation_t *bulk,
+                               const bson_t *let);
+
+
+/*
+ * The following functions are really only useful by language bindings and
+ * those wanting to replay a bulk operation to a number of clients or
+ * collections.
+ */
+MONGOC_EXPORT (mongoc_bulk_operation_t *)
+mongoc_bulk_operation_new (bool ordered) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_write_concern (
+   mongoc_bulk_operation_t *bulk, const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_database (mongoc_bulk_operation_t *bulk,
+                                    const char *database);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_collection (mongoc_bulk_operation_t *bulk,
+                                      const char *collection);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_client (mongoc_bulk_operation_t *bulk, void *client);
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_client_session (
+   mongoc_bulk_operation_t *bulk,
+   struct _mongoc_client_session_t *client_session);
+/* These names include the term "hint" for backward compatibility, should be
+ * mongoc_bulk_operation_get_server_id, mongoc_bulk_operation_set_server_id. */
+MONGOC_EXPORT (void)
+mongoc_bulk_operation_set_hint (mongoc_bulk_operation_t *bulk,
+                                uint32_t server_id);
+MONGOC_EXPORT (uint32_t)
+mongoc_bulk_operation_get_hint (const mongoc_bulk_operation_t *bulk);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_bulk_operation_get_write_concern (const mongoc_bulk_operation_t *bulk);
+BSON_END_DECLS
+
+
+#endif /* MONGOC_BULK_OPERATION_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-change-stream.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-change-stream.h
new file mode 100644
index 0000000..ad64f8f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-change-stream.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2017-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CHANGE_STREAM_H
+#define MONGOC_CHANGE_STREAM_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_change_stream_t mongoc_change_stream_t;
+
+MONGOC_EXPORT (void)
+mongoc_change_stream_destroy (mongoc_change_stream_t *);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_change_stream_get_resume_token (mongoc_change_stream_t *);
+
+MONGOC_EXPORT (bool)
+mongoc_change_stream_next (mongoc_change_stream_t *, const bson_t **);
+
+MONGOC_EXPORT (bool)
+mongoc_change_stream_error_document (const mongoc_change_stream_t *,
+                                     bson_error_t *,
+                                     const bson_t **);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_CHANGE_STREAM_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-pool.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-pool.h
new file mode 100644
index 0000000..c4df560
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-pool.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_POOL_H
+#define MONGOC_CLIENT_POOL_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-apm.h"
+#include "mongoc-client.h"
+#include "mongoc-config.h"
+#ifdef MONGOC_ENABLE_SSL
+#include "mongoc-ssl.h"
+#endif
+#include "mongoc-uri.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_client_pool_t mongoc_client_pool_t;
+
+
+MONGOC_EXPORT (mongoc_client_pool_t *)
+mongoc_client_pool_new (const mongoc_uri_t *uri) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_client_pool_t *)
+mongoc_client_pool_new_with_error (const mongoc_uri_t *uri, bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_pool_destroy (mongoc_client_pool_t *pool);
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_pool_pop (mongoc_client_pool_t *pool)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_pool_push (mongoc_client_pool_t *pool, mongoc_client_t *client);
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_pool_try_pop (mongoc_client_pool_t *pool)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_pool_max_size (mongoc_client_pool_t *pool,
+                             uint32_t max_pool_size);
+MONGOC_EXPORT (void)
+mongoc_client_pool_min_size (mongoc_client_pool_t *pool,
+                             uint32_t min_pool_size) BSON_GNUC_DEPRECATED;
+#ifdef MONGOC_ENABLE_SSL
+MONGOC_EXPORT (void)
+mongoc_client_pool_set_ssl_opts (mongoc_client_pool_t *pool,
+                                 const mongoc_ssl_opt_t *opts);
+#endif
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_apm_callbacks (mongoc_client_pool_t *pool,
+                                      mongoc_apm_callbacks_t *callbacks,
+                                      void *context);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_error_api (mongoc_client_pool_t *pool, int32_t version);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_appname (mongoc_client_pool_t *pool,
+                                const char *appname);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_enable_auto_encryption (mongoc_client_pool_t *pool,
+                                           mongoc_auto_encryption_opts_t *opts,
+                                           bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_pool_set_server_api (mongoc_client_pool_t *pool,
+                                   const mongoc_server_api_t *api,
+                                   bson_error_t *error);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CLIENT_POOL_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-session.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-session.h
new file mode 100644
index 0000000..b274261
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-session.h
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2017 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_SESSION_H
+#define MONGOC_CLIENT_SESSION_H
+
+#include <bson/bson.h>
+#include "mongoc-macros.h"
+/* mongoc_client_session_t, mongoc_transaction_opt_t, and
+   mongoc_session_opt_t are typedef'ed here */
+#include "mongoc-client.h"
+
+BSON_BEGIN_DECLS
+
+typedef bool (*mongoc_client_session_with_transaction_cb_t) (
+   mongoc_client_session_t *session,
+   void *ctx,
+   bson_t **reply,
+   bson_error_t *error);
+
+typedef enum {
+   MONGOC_TRANSACTION_NONE = 0,
+   MONGOC_TRANSACTION_STARTING = 1,
+   MONGOC_TRANSACTION_IN_PROGRESS = 2,
+   MONGOC_TRANSACTION_COMMITTED = 3,
+   MONGOC_TRANSACTION_ABORTED = 4,
+} mongoc_transaction_state_t;
+
+/* these options types are named "opt_t" but their functions are named with
+ * "opts", for consistency with the older mongoc_ssl_opt_t */
+MONGOC_EXPORT (mongoc_transaction_opt_t *)
+mongoc_transaction_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_transaction_opt_t *)
+mongoc_transaction_opts_clone (const mongoc_transaction_opt_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_destroy (mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_max_commit_time_ms (mongoc_transaction_opt_t *opts,
+                                                int64_t max_commit_time_ms);
+
+MONGOC_EXPORT (int64_t)
+mongoc_transaction_opts_get_max_commit_time_ms (mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_read_concern (
+   mongoc_transaction_opt_t *opts, const mongoc_read_concern_t *read_concern);
+
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_transaction_opts_get_read_concern (const mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_write_concern (
+   mongoc_transaction_opt_t *opts, const mongoc_write_concern_t *write_concern);
+
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_transaction_opts_get_write_concern (
+   const mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_transaction_opts_set_read_prefs (mongoc_transaction_opt_t *opts,
+                                        const mongoc_read_prefs_t *read_prefs);
+
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_transaction_opts_get_read_prefs (const mongoc_transaction_opt_t *opts);
+
+MONGOC_EXPORT (mongoc_session_opt_t *)
+mongoc_session_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_set_causal_consistency (mongoc_session_opt_t *opts,
+                                            bool causal_consistency);
+
+MONGOC_EXPORT (bool)
+mongoc_session_opts_get_causal_consistency (const mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_set_snapshot (mongoc_session_opt_t *opts, bool snapshot);
+
+MONGOC_EXPORT (bool)
+mongoc_session_opts_get_snapshot (const mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_set_default_transaction_opts (
+   mongoc_session_opt_t *opts, const mongoc_transaction_opt_t *txn_opts);
+
+MONGOC_EXPORT (const mongoc_transaction_opt_t *)
+mongoc_session_opts_get_default_transaction_opts (
+   const mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (mongoc_transaction_opt_t *)
+mongoc_session_opts_get_transaction_opts (
+   const mongoc_client_session_t *session) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_session_opt_t *)
+mongoc_session_opts_clone (const mongoc_session_opt_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_session_opts_destroy (mongoc_session_opt_t *opts);
+
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_session_get_client (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (const mongoc_session_opt_t *)
+mongoc_client_session_get_opts (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_client_session_get_lsid (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_client_session_get_cluster_time (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (void)
+mongoc_client_session_advance_cluster_time (mongoc_client_session_t *session,
+                                            const bson_t *cluster_time);
+
+MONGOC_EXPORT (void)
+mongoc_client_session_get_operation_time (
+   const mongoc_client_session_t *session,
+   uint32_t *timestamp,
+   uint32_t *increment);
+
+MONGOC_EXPORT (uint32_t)
+mongoc_client_session_get_server_id (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (void)
+mongoc_client_session_advance_operation_time (mongoc_client_session_t *session,
+                                              uint32_t timestamp,
+                                              uint32_t increment);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_with_transaction (
+   mongoc_client_session_t *session,
+   mongoc_client_session_with_transaction_cb_t cb,
+   const mongoc_transaction_opt_t *opts,
+   void *ctx,
+   bson_t *reply,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_start_transaction (mongoc_client_session_t *session,
+                                         const mongoc_transaction_opt_t *opts,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_in_transaction (const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (mongoc_transaction_state_t)
+mongoc_client_session_get_transaction_state (
+   const mongoc_client_session_t *session);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_commit_transaction (mongoc_client_session_t *session,
+                                          bson_t *reply,
+                                          bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_abort_transaction (mongoc_client_session_t *session,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_append (const mongoc_client_session_t *client_session,
+                              bson_t *opts,
+                              bson_error_t *error);
+
+/* There is no mongoc_client_session_end, only mongoc_client_session_destroy.
+ * Driver Sessions Spec: "In languages that have idiomatic ways of disposing of
+ * resources, drivers SHOULD support that in addition to or instead of
+ * endSession."
+ */
+
+MONGOC_EXPORT (void)
+mongoc_client_session_destroy (mongoc_client_session_t *session);
+
+MONGOC_EXPORT (bool)
+mongoc_client_session_get_dirty (mongoc_client_session_t *session);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CLIENT_SESSION_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-side-encryption.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-side-encryption.h
new file mode 100644
index 0000000..6ad0d61
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client-side-encryption.h
@@ -0,0 +1,283 @@
+/*
+ * Copyright 2019-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_SIDE_ENCRYPTION_H
+#define MONGOC_CLIENT_SIDE_ENCRYPTION_H
+
+#include <bson/bson.h>
+
+/* Forward declare */
+struct _mongoc_client_t;
+struct _mongoc_client_pool_t;
+struct _mongoc_cursor_t;
+
+#define MONGOC_AEAD_AES_256_CBC_HMAC_SHA_512_RANDOM \
+   "AEAD_AES_256_CBC_HMAC_SHA_512-Random"
+#define MONGOC_AEAD_AES_256_CBC_HMAC_SHA_512_DETERMINISTIC \
+   "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic"
+#define MONGOC_ENCRYPT_ALGORITHM_INDEXED "Indexed"
+#define MONGOC_ENCRYPT_ALGORITHM_UNINDEXED "Unindexed"
+
+#define MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY "equality"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_auto_encryption_opts_t mongoc_auto_encryption_opts_t;
+
+typedef bool (*mongoc_kms_credentials_provider_callback_fn) (
+   void *userdata, const bson_t *params, bson_t *out, bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_auto_encryption_opts_t *)
+mongoc_auto_encryption_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_destroy (mongoc_auto_encryption_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_keyvault_client (
+   mongoc_auto_encryption_opts_t *opts, struct _mongoc_client_t *client);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_keyvault_client_pool (
+   mongoc_auto_encryption_opts_t *opts, struct _mongoc_client_pool_t *pool);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_keyvault_namespace (
+   mongoc_auto_encryption_opts_t *opts, const char *db, const char *coll);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_kms_providers (
+   mongoc_auto_encryption_opts_t *opts, const bson_t *kms_providers);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_tls_opts (mongoc_auto_encryption_opts_t *opts,
+                                          const bson_t *tls_opts);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_schema_map (mongoc_auto_encryption_opts_t *opts,
+                                            const bson_t *schema_map);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_encrypted_fields_map (
+   mongoc_auto_encryption_opts_t *opts, const bson_t *encrypted_fields_map);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_bypass_auto_encryption (
+   mongoc_auto_encryption_opts_t *opts, bool bypass_auto_encryption);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_bypass_query_analysis (
+   mongoc_auto_encryption_opts_t *opts, bool bypass_query_analysis);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_extra (mongoc_auto_encryption_opts_t *opts,
+                                       const bson_t *extra);
+
+MONGOC_EXPORT (void)
+mongoc_auto_encryption_opts_set_kms_credential_provider_callback (
+   mongoc_auto_encryption_opts_t *opts,
+   mongoc_kms_credentials_provider_callback_fn fn,
+   void *userdata);
+
+typedef struct _mongoc_client_encryption_opts_t mongoc_client_encryption_opts_t;
+typedef struct _mongoc_client_encryption_t mongoc_client_encryption_t;
+typedef struct _mongoc_client_encryption_encrypt_opts_t
+   mongoc_client_encryption_encrypt_opts_t;
+typedef struct _mongoc_client_encryption_datakey_opts_t
+   mongoc_client_encryption_datakey_opts_t;
+typedef struct _mongoc_client_encryption_rewrap_many_datakey_result_t
+   mongoc_client_encryption_rewrap_many_datakey_result_t;
+
+MONGOC_EXPORT (mongoc_client_encryption_opts_t *)
+mongoc_client_encryption_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_destroy (mongoc_client_encryption_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_keyvault_client (
+   mongoc_client_encryption_opts_t *opts,
+   struct _mongoc_client_t *keyvault_client);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_keyvault_namespace (
+   mongoc_client_encryption_opts_t *opts, const char *db, const char *coll);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_kms_providers (
+   mongoc_client_encryption_opts_t *opts, const bson_t *kms_providers);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_tls_opts (
+   mongoc_client_encryption_opts_t *opts, const bson_t *tls_opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_opts_set_kms_credential_provider_callback (
+   mongoc_client_encryption_opts_t *opts,
+   mongoc_kms_credentials_provider_callback_fn fn,
+   void *userdata);
+
+MONGOC_EXPORT (mongoc_client_encryption_rewrap_many_datakey_result_t *)
+mongoc_client_encryption_rewrap_many_datakey_result_new (void)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_rewrap_many_datakey_result_destroy (
+   mongoc_client_encryption_rewrap_many_datakey_result_t *result);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_client_encryption_rewrap_many_datakey_result_get_bulk_write_result (
+   mongoc_client_encryption_rewrap_many_datakey_result_t *result)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_client_encryption_t *)
+mongoc_client_encryption_new (mongoc_client_encryption_opts_t *opts,
+                              bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_destroy (
+   mongoc_client_encryption_t *client_encryption);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_create_datakey (
+   mongoc_client_encryption_t *client_encryption,
+   const char *kms_provider,
+   mongoc_client_encryption_datakey_opts_t *opts,
+   bson_value_t *keyid,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_rewrap_many_datakey (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_t *filter,
+   const char *provider,
+   const bson_t *master_key,
+   mongoc_client_encryption_rewrap_many_datakey_result_t *result,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_delete_key (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_value_t *keyid,
+   bson_t *reply,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_get_key (mongoc_client_encryption_t *client_encryption,
+                                  const bson_value_t *keyid,
+                                  bson_t *key_doc,
+                                  bson_error_t *error);
+
+MONGOC_EXPORT (struct _mongoc_cursor_t *)
+mongoc_client_encryption_get_keys (
+   mongoc_client_encryption_t *client_encryption, bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_add_key_alt_name (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_value_t *keyid,
+   const char *keyaltname,
+   bson_t *key_doc,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_remove_key_alt_name (
+   mongoc_client_encryption_t *client_encryption,
+   const bson_value_t *keyid,
+   const char *keyaltname,
+   bson_t *key_doc,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_get_key_by_alt_name (
+   mongoc_client_encryption_t *client_encryption,
+   const char *keyaltname,
+   bson_t *key_doc,
+   bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_encrypt (mongoc_client_encryption_t *client_encryption,
+                                  const bson_value_t *value,
+                                  mongoc_client_encryption_encrypt_opts_t *opts,
+                                  bson_value_t *ciphertext,
+                                  bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_client_encryption_decrypt (mongoc_client_encryption_t *client_encryption,
+                                  const bson_value_t *ciphertext,
+                                  bson_value_t *value,
+                                  bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_client_encryption_encrypt_opts_t *)
+mongoc_client_encryption_encrypt_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_destroy (
+   mongoc_client_encryption_encrypt_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_keyid (
+   mongoc_client_encryption_encrypt_opts_t *opts, const bson_value_t *keyid);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_keyaltname (
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *keyaltname);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_algorithm (
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *algorithm);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_contention_factor (
+   mongoc_client_encryption_encrypt_opts_t *opts, int64_t contention_factor);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_encrypt_opts_set_query_type (
+   mongoc_client_encryption_encrypt_opts_t *opts, const char *query_type);
+
+MONGOC_EXPORT (mongoc_client_encryption_datakey_opts_t *)
+mongoc_client_encryption_datakey_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_destroy (
+   mongoc_client_encryption_datakey_opts_t *opts);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_set_masterkey (
+   mongoc_client_encryption_datakey_opts_t *opts, const bson_t *masterkey);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_set_keyaltnames (
+   mongoc_client_encryption_datakey_opts_t *opts,
+   char **keyaltnames,
+   uint32_t keyaltnames_count);
+
+MONGOC_EXPORT (void)
+mongoc_client_encryption_datakey_opts_set_keymaterial (
+   mongoc_client_encryption_datakey_opts_t *opts,
+   const uint8_t *data,
+   uint32_t len);
+
+MONGOC_EXPORT (const char *)
+mongoc_client_encryption_get_crypt_shared_version (
+   mongoc_client_encryption_t const *enc) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_CLIENT_SIDE_ENCRYPTION_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client.h
new file mode 100644
index 0000000..cff520f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-client.h
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CLIENT_H
+#define MONGOC_CLIENT_H
+
+#include <bson/bson.h>
+
+#include "mongoc-apm.h"
+#include "mongoc-client-side-encryption.h"
+#include "mongoc-collection.h"
+#include "mongoc-config.h"
+#include "mongoc-cursor.h"
+#include "mongoc-database.h"
+#include "mongoc-gridfs.h"
+#include "mongoc-index.h"
+#include "mongoc-macros.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-server-api.h"
+#ifdef MONGOC_ENABLE_SSL
+#include "mongoc-ssl.h"
+#endif
+#include "mongoc-stream.h"
+#include "mongoc-uri.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-server-description.h"
+
+BSON_BEGIN_DECLS
+
+/* This define is part of our public API. But per MongoDB 4.4, there is no
+ * longer a size limit on collection names. */
+#define MONGOC_NAMESPACE_MAX 128
+
+
+#ifndef MONGOC_DEFAULT_CONNECTTIMEOUTMS
+#define MONGOC_DEFAULT_CONNECTTIMEOUTMS (10 * 1000L)
+#endif
+
+
+#ifndef MONGOC_DEFAULT_SOCKETTIMEOUTMS
+/*
+ * NOTE: The default socket timeout for connections is 5 minutes. This
+ *       means that if your MongoDB server dies or becomes unavailable
+ *       it will take 5 minutes to detect this.
+ *
+ *       You can change this by providing sockettimeoutms= in your
+ *       connection URI.
+ */
+#define MONGOC_DEFAULT_SOCKETTIMEOUTMS (1000L * 60L * 5L)
+#endif
+
+
+/**
+ * mongoc_client_t:
+ *
+ * The mongoc_client_t structure maintains information about a connection to
+ * a MongoDB server.
+ */
+typedef struct _mongoc_client_t mongoc_client_t;
+
+
+typedef struct _mongoc_client_session_t mongoc_client_session_t;
+typedef struct _mongoc_session_opt_t mongoc_session_opt_t;
+typedef struct _mongoc_transaction_opt_t mongoc_transaction_opt_t;
+
+/**
+ * mongoc_stream_initiator_t:
+ * @uri: The uri and options for the stream.
+ * @host: The host and port (or UNIX domain socket path) to connect to.
+ * @user_data: The pointer passed to mongoc_client_set_stream_initiator.
+ * @error: A location for an error.
+ *
+ * Creates a new mongoc_stream_t for the host and port. Begin a
+ * non-blocking connect and return immediately.
+ *
+ * This can be used by language bindings to create network transports other
+ * than those built into libmongoc. An example of such would be the streams
+ * API provided by PHP.
+ *
+ * Returns: A newly allocated mongoc_stream_t or NULL on failure.
+ */
+typedef mongoc_stream_t *(*mongoc_stream_initiator_t) (
+   const mongoc_uri_t *uri,
+   const mongoc_host_list_t *host,
+   void *user_data,
+   bson_error_t *error);
+
+
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_new (const char *uri_string) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_new_from_uri (const mongoc_uri_t *uri)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_client_t *)
+mongoc_client_new_from_uri_with_error (
+   const mongoc_uri_t *uri, bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_uri_t *)
+mongoc_client_get_uri (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_stream_initiator (mongoc_client_t *client,
+                                    mongoc_stream_initiator_t initiator,
+                                    void *user_data);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_client_command (mongoc_client_t *client,
+                       const char *db_name,
+                       mongoc_query_flags_t flags,
+                       uint32_t skip,
+                       uint32_t limit,
+                       uint32_t batch_size,
+                       const bson_t *query,
+                       const bson_t *fields,
+                       const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_kill_cursor (mongoc_client_t *client,
+                           int64_t cursor_id) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_client_command_simple (mongoc_client_t *client,
+                              const char *db_name,
+                              const bson_t *command,
+                              const mongoc_read_prefs_t *read_prefs,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_read_command_with_opts (mongoc_client_t *client,
+                                      const char *db_name,
+                                      const bson_t *command,
+                                      const mongoc_read_prefs_t *read_prefs,
+                                      const bson_t *opts,
+                                      bson_t *reply,
+                                      bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_write_command_with_opts (mongoc_client_t *client,
+                                       const char *db_name,
+                                       const bson_t *command,
+                                       const bson_t *opts,
+                                       bson_t *reply,
+                                       bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_read_write_command_with_opts (
+   mongoc_client_t *client,
+   const char *db_name,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs /* IGNORED */,
+   const bson_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_command_with_opts (mongoc_client_t *client,
+                                 const char *db_name,
+                                 const bson_t *command,
+                                 const mongoc_read_prefs_t *read_prefs,
+                                 const bson_t *opts,
+                                 bson_t *reply,
+                                 bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_client_command_simple_with_server_id (
+   mongoc_client_t *client,
+   const char *db_name,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs,
+   uint32_t server_id,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_client_destroy (mongoc_client_t *client);
+MONGOC_EXPORT (mongoc_client_session_t *)
+mongoc_client_start_session (mongoc_client_t *client,
+                             const mongoc_session_opt_t *opts,
+                             bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_database_t *)
+mongoc_client_get_database (mongoc_client_t *client,
+                            const char *name) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_database_t *)
+mongoc_client_get_default_database (mongoc_client_t *client)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_t *)
+mongoc_client_get_gridfs (mongoc_client_t *client,
+                          const char *db,
+                          const char *prefix,
+                          bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_client_get_collection (mongoc_client_t *client,
+                              const char *db,
+                              const char *collection)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (char **)
+mongoc_client_get_database_names (mongoc_client_t *client, bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_client_get_database_names_with_opts);
+MONGOC_EXPORT (char **)
+mongoc_client_get_database_names_with_opts (mongoc_client_t *client,
+                                            const bson_t *opts,
+                                            bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_client_find_databases (mongoc_client_t *client,
+                              bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_client_find_databases_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_client_find_databases_with_opts (
+   mongoc_client_t *client, const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_client_get_server_status (mongoc_client_t *client,
+                                 mongoc_read_prefs_t *read_prefs,
+                                 bson_t *reply,
+                                 bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (int32_t)
+mongoc_client_get_max_message_size (mongoc_client_t *client)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (int32_t)
+mongoc_client_get_max_bson_size (mongoc_client_t *client) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_client_get_write_concern (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_write_concern (mongoc_client_t *client,
+                                 const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_client_get_read_concern (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_read_concern (mongoc_client_t *client,
+                                const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_client_get_read_prefs (const mongoc_client_t *client);
+MONGOC_EXPORT (void)
+mongoc_client_set_read_prefs (mongoc_client_t *client,
+                              const mongoc_read_prefs_t *read_prefs);
+#ifdef MONGOC_ENABLE_SSL
+MONGOC_EXPORT (void)
+mongoc_client_set_ssl_opts (mongoc_client_t *client,
+                            const mongoc_ssl_opt_t *opts);
+#endif
+MONGOC_EXPORT (bool)
+mongoc_client_set_apm_callbacks (mongoc_client_t *client,
+                                 mongoc_apm_callbacks_t *callbacks,
+                                 void *context);
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_client_get_server_description (
+   mongoc_client_t *client, uint32_t server_id) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_server_description_t **)
+mongoc_client_get_server_descriptions (const mongoc_client_t *client,
+                                       size_t *n) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_server_descriptions_destroy_all (mongoc_server_description_t **sds,
+                                        size_t n);
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_client_select_server (mongoc_client_t *client,
+                             bool for_writes,
+                             const mongoc_read_prefs_t *prefs,
+                             bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_client_set_error_api (mongoc_client_t *client, int32_t version);
+MONGOC_EXPORT (bool)
+mongoc_client_set_appname (mongoc_client_t *client, const char *appname);
+MONGOC_EXPORT (mongoc_change_stream_t *)
+mongoc_client_watch (mongoc_client_t *client,
+                     const bson_t *pipeline,
+                     const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_client_reset (mongoc_client_t *client);
+
+MONGOC_EXPORT (bool)
+mongoc_client_enable_auto_encryption (mongoc_client_t *client,
+                                      mongoc_auto_encryption_opts_t *opts,
+                                      bson_error_t *error);
+
+MONGOC_EXPORT (const char *)
+mongoc_client_get_crypt_shared_version (const mongoc_client_t *client)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_client_set_server_api (mongoc_client_t *client,
+                              const mongoc_server_api_t *api,
+                              bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_client_get_handshake_description (mongoc_client_t *client,
+                                         uint32_t server_id,
+                                         bson_t *opts,
+                                         bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CLIENT_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-collection.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-collection.h
new file mode 100644
index 0000000..a36c5ac
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-collection.h
@@ -0,0 +1,361 @@
+/*
+ * Copyright 2013-2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_COLLECTION_H
+#define MONGOC_COLLECTION_H
+
+#include <bson/bson.h>
+
+#include "mongoc-change-stream.h"
+#include "mongoc-macros.h"
+#include "mongoc-bulk-operation.h"
+#include "mongoc-flags.h"
+#include "mongoc-cursor.h"
+#include "mongoc-index.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-find-and-modify.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_collection_t mongoc_collection_t;
+
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_aggregate (mongoc_collection_t *collection,
+                             mongoc_query_flags_t flags,
+                             const bson_t *pipeline,
+                             const bson_t *opts,
+                             const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_collection_destroy (mongoc_collection_t *collection);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_collection_copy (mongoc_collection_t *collection)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_command (mongoc_collection_t *collection,
+                           mongoc_query_flags_t flags,
+                           uint32_t skip,
+                           uint32_t limit,
+                           uint32_t batch_size,
+                           const bson_t *command,
+                           const bson_t *fields,
+                           const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_collection_read_command_with_opts (mongoc_collection_t *collection,
+                                          const bson_t *command,
+                                          const mongoc_read_prefs_t *read_prefs,
+                                          const bson_t *opts,
+                                          bson_t *reply,
+                                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_write_command_with_opts (mongoc_collection_t *collection,
+                                           const bson_t *command,
+                                           const bson_t *opts,
+                                           bson_t *reply,
+                                           bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_read_write_command_with_opts (
+   mongoc_collection_t *collection,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs /* IGNORED */,
+   const bson_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_command_with_opts (mongoc_collection_t *collection,
+                                     const bson_t *command,
+                                     const mongoc_read_prefs_t *read_prefs,
+                                     const bson_t *opts,
+                                     bson_t *reply,
+                                     bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_command_simple (mongoc_collection_t *collection,
+                                  const bson_t *command,
+                                  const mongoc_read_prefs_t *read_prefs,
+                                  bson_t *reply,
+                                  bson_error_t *error);
+MONGOC_EXPORT (int64_t)
+mongoc_collection_count (mongoc_collection_t *collection,
+                         mongoc_query_flags_t flags,
+                         const bson_t *query,
+                         int64_t skip,
+                         int64_t limit,
+                         const mongoc_read_prefs_t *read_prefs,
+                         bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_count_documents or
+                             mongoc_collection_estimated_document_count);
+MONGOC_EXPORT (int64_t)
+mongoc_collection_count_with_opts (mongoc_collection_t *collection,
+                                   mongoc_query_flags_t flags,
+                                   const bson_t *query,
+                                   int64_t skip,
+                                   int64_t limit,
+                                   const bson_t *opts,
+                                   const mongoc_read_prefs_t *read_prefs,
+                                   bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_count_documents or
+                             mongoc_collection_estimated_document_count);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop (mongoc_collection_t *collection, bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop_with_opts (mongoc_collection_t *collection,
+                                  const bson_t *opts,
+                                  bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop_index (mongoc_collection_t *collection,
+                              const char *index_name,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_drop_index_with_opts (mongoc_collection_t *collection,
+                                        const char *index_name,
+                                        const bson_t *opts,
+                                        bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_create_index (mongoc_collection_t *collection,
+                                const bson_t *keys,
+                                const mongoc_index_opt_t *opt,
+                                bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_collection_create_index_with_opts (mongoc_collection_t *collection,
+                                          const bson_t *keys,
+                                          const mongoc_index_opt_t *opt,
+                                          const bson_t *opts,
+                                          bson_t *reply,
+                                          bson_error_t *error)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_collection_ensure_index (mongoc_collection_t *collection,
+                                const bson_t *keys,
+                                const mongoc_index_opt_t *opt,
+                                bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find_indexes (mongoc_collection_t *collection,
+                                bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_find_indexes_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find_indexes_with_opts (mongoc_collection_t *collection,
+                                          const bson_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find (mongoc_collection_t *collection,
+                        mongoc_query_flags_t flags,
+                        uint32_t skip,
+                        uint32_t limit,
+                        uint32_t batch_size,
+                        const bson_t *query,
+                        const bson_t *fields,
+                        const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_find_with_opts)
+      BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_collection_find_with_opts (mongoc_collection_t *collection,
+                                  const bson_t *filter,
+                                  const bson_t *opts,
+                                  const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_collection_insert (mongoc_collection_t *collection,
+                          mongoc_insert_flags_t flags,
+                          const bson_t *document,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_insert_one (mongoc_collection_t *collection,
+                              const bson_t *document,
+                              const bson_t *opts,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_insert_many (mongoc_collection_t *collection,
+                               const bson_t **documents,
+                               size_t n_documents,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_insert_bulk (mongoc_collection_t *collection,
+                               mongoc_insert_flags_t flags,
+                               const bson_t **documents,
+                               uint32_t n_documents,
+                               const mongoc_write_concern_t *write_concern,
+                               bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_insert_many);
+MONGOC_EXPORT (bool)
+mongoc_collection_update (mongoc_collection_t *collection,
+                          mongoc_update_flags_t flags,
+                          const bson_t *selector,
+                          const bson_t *update,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_update_one (mongoc_collection_t *collection,
+                              const bson_t *selector,
+                              const bson_t *update,
+                              const bson_t *opts,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_update_many (mongoc_collection_t *collection,
+                               const bson_t *selector,
+                               const bson_t *update,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_replace_one (mongoc_collection_t *collection,
+                               const bson_t *selector,
+                               const bson_t *replacement,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_delete (mongoc_collection_t *collection,
+                          mongoc_delete_flags_t flags,
+                          const bson_t *selector,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_delete_one or
+                             mongoc_collection_delete_many);
+MONGOC_EXPORT (bool)
+mongoc_collection_save (mongoc_collection_t *collection,
+                        const bson_t *document,
+                        const mongoc_write_concern_t *write_concern,
+                        bson_error_t *error)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_insert_one or
+                             mongoc_collection_replace_one);
+MONGOC_EXPORT (bool)
+mongoc_collection_remove (mongoc_collection_t *collection,
+                          mongoc_remove_flags_t flags,
+                          const bson_t *selector,
+                          const mongoc_write_concern_t *write_concern,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_delete_one (mongoc_collection_t *collection,
+                              const bson_t *selector,
+                              const bson_t *opts,
+                              bson_t *reply,
+                              bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_delete_many (mongoc_collection_t *collection,
+                               const bson_t *selector,
+                               const bson_t *opts,
+                               bson_t *reply,
+                               bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_rename (mongoc_collection_t *collection,
+                          const char *new_db,
+                          const char *new_name,
+                          bool drop_target_before_rename,
+                          bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_rename_with_opts (mongoc_collection_t *collection,
+                                    const char *new_db,
+                                    const char *new_name,
+                                    bool drop_target_before_rename,
+                                    const bson_t *opts,
+                                    bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_find_and_modify_with_opts (
+   mongoc_collection_t *collection,
+   const bson_t *query,
+   const mongoc_find_and_modify_opts_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_find_and_modify (mongoc_collection_t *collection,
+                                   const bson_t *query,
+                                   const bson_t *sort,
+                                   const bson_t *update,
+                                   const bson_t *fields,
+                                   bool _remove,
+                                   bool upsert,
+                                   bool _new,
+                                   bson_t *reply,
+                                   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_collection_stats (mongoc_collection_t *collection,
+                         const bson_t *options,
+                         bson_t *reply,
+                         bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (mongoc_bulk_operation_t *)
+mongoc_collection_create_bulk_operation (
+   mongoc_collection_t *collection,
+   bool ordered,
+   const mongoc_write_concern_t *write_concern) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_collection_create_bulk_operation_with_opts);
+MONGOC_EXPORT (mongoc_bulk_operation_t *)
+mongoc_collection_create_bulk_operation_with_opts (
+   mongoc_collection_t *collection,
+   const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_collection_get_read_prefs (const mongoc_collection_t *collection);
+MONGOC_EXPORT (void)
+mongoc_collection_set_read_prefs (mongoc_collection_t *collection,
+                                  const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_collection_get_read_concern (const mongoc_collection_t *collection);
+MONGOC_EXPORT (void)
+mongoc_collection_set_read_concern (mongoc_collection_t *collection,
+                                    const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_collection_get_write_concern (const mongoc_collection_t *collection);
+MONGOC_EXPORT (void)
+mongoc_collection_set_write_concern (
+   mongoc_collection_t *collection,
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (const char *)
+mongoc_collection_get_name (mongoc_collection_t *collection);
+MONGOC_EXPORT (const bson_t *)
+mongoc_collection_get_last_error (const mongoc_collection_t *collection)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (char *)
+mongoc_collection_keys_to_index_string (const bson_t *keys)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_collection_validate (mongoc_collection_t *collection,
+                            const bson_t *options,
+                            bson_t *reply,
+                            bson_error_t *error) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (mongoc_change_stream_t *)
+mongoc_collection_watch (const mongoc_collection_t *coll,
+                         const bson_t *pipeline,
+                         const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (int64_t)
+mongoc_collection_count_documents (mongoc_collection_t *coll,
+                                   const bson_t *filter,
+                                   const bson_t *opts,
+                                   const mongoc_read_prefs_t *read_prefs,
+                                   bson_t *reply,
+                                   bson_error_t *error);
+MONGOC_EXPORT (int64_t)
+mongoc_collection_estimated_document_count (
+   mongoc_collection_t *coll,
+   const bson_t *opts,
+   const mongoc_read_prefs_t *read_prefs,
+   bson_t *reply,
+   bson_error_t *error);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_COLLECTION_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-config.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-config.h
new file mode 100644
index 0000000..1b382b3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-config.h
@@ -0,0 +1,423 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(MONGOC_INSIDE) && !defined(MONGOC_COMPILATION)
+#error "Only <mongoc/mongoc.h> can be included directly."
+#endif
+
+
+#ifndef MONGOC_CONFIG_H
+#define MONGOC_CONFIG_H
+
+/* clang-format off */
+
+/*
+ * NOTICE:
+ * If you're about to update this file and add a config flag, make sure to
+ * update:
+ * o The bitfield in mongoc-handshake-private.h
+ * o _mongoc_handshake_get_config_hex_string() in mongoc-handshake.c
+ * o examples/parse_handshake_cfg.py
+ * o test_handshake_config_string in test-mongoc-handshake.c
+ */
+
+/* MONGOC_USER_SET_CFLAGS is set from config based on what compiler flags were
+ * used to compile mongoc */
+#define MONGOC_USER_SET_CFLAGS "/DWIN32 /D_WINDOWS /W3"
+
+#define MONGOC_USER_SET_LDFLAGS "/machine:x64"
+
+/* MONGOC_CC is used to determine what C compiler was used to compile mongoc */
+#define MONGOC_CC "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Tools/MSVC/14.29.30133/bin/Hostx64/x64/cl.exe"
+
+/*
+ * MONGOC_ENABLE_SSL_SECURE_CHANNEL is set from configure to determine if we are
+ * compiled with Native SSL support on Windows
+ */
+#define MONGOC_ENABLE_SSL_SECURE_CHANNEL 1
+
+#if MONGOC_ENABLE_SSL_SECURE_CHANNEL != 1
+#  undef MONGOC_ENABLE_SSL_SECURE_CHANNEL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO_CNG is set from configure to determine if we are
+ * compiled with Native Crypto support on Windows
+ */
+#define MONGOC_ENABLE_CRYPTO_CNG 1
+
+#if MONGOC_ENABLE_CRYPTO_CNG != 1
+#  undef MONGOC_ENABLE_CRYPTO_CNG
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL_SECURE_TRANSPORT is set from configure to determine if we are
+ * compiled with Native SSL support on Darwin
+ */
+#define MONGOC_ENABLE_SSL_SECURE_TRANSPORT 0
+
+#if MONGOC_ENABLE_SSL_SECURE_TRANSPORT != 1
+#  undef MONGOC_ENABLE_SSL_SECURE_TRANSPORT
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO is set from configure to determine if we are
+ * compiled with Native Crypto support on Darwin
+ */
+#define MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO 0
+
+#if MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO != 1
+#  undef MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL_LIBRESSL is set from configure to determine if we are
+ * compiled with LibreSSL support.
+ */
+#define MONGOC_ENABLE_SSL_LIBRESSL 0
+
+#if MONGOC_ENABLE_SSL_LIBRESSL != 1
+#  undef MONGOC_ENABLE_SSL_LIBRESSL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL_OPENSSL is set from configure to determine if we are
+ * compiled with OpenSSL support.
+ */
+#define MONGOC_ENABLE_SSL_OPENSSL 0
+
+#if MONGOC_ENABLE_SSL_OPENSSL != 1
+#  undef MONGOC_ENABLE_SSL_OPENSSL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO_LIBCRYPTO is set from configure to determine if we are
+ * compiled with OpenSSL support.
+ */
+#define MONGOC_ENABLE_CRYPTO_LIBCRYPTO 0
+
+#if MONGOC_ENABLE_CRYPTO_LIBCRYPTO != 1
+#  undef MONGOC_ENABLE_CRYPTO_LIBCRYPTO
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SSL is set from configure to determine if we are
+ * compiled with any SSL support.
+ */
+#define MONGOC_ENABLE_SSL 1
+
+#if MONGOC_ENABLE_SSL != 1
+#  undef MONGOC_ENABLE_SSL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_CRYPTO is set from configure to determine if we are
+ * compiled with any crypto support.
+ */
+#define MONGOC_ENABLE_CRYPTO 1
+
+#if MONGOC_ENABLE_CRYPTO != 1
+#  undef MONGOC_ENABLE_CRYPTO
+#endif
+
+
+/*
+ * Use system crypto profile
+ */
+#define MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE 0
+
+#if MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE != 1
+#  undef MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE
+#endif
+
+
+/*
+ * Use ASN1_STRING_get0_data () rather than the deprecated ASN1_STRING_data
+ */
+#define MONGOC_HAVE_ASN1_STRING_GET0_DATA 0
+
+#if MONGOC_HAVE_ASN1_STRING_GET0_DATA != 1
+#  undef MONGOC_HAVE_ASN1_STRING_GET0_DATA
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SASL is set from configure to determine if we are
+ * compiled with SASL support.
+ */
+#define MONGOC_ENABLE_SASL 1
+
+#if MONGOC_ENABLE_SASL != 1
+#  undef MONGOC_ENABLE_SASL
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SASL_CYRUS is set from configure to determine if we are
+ * compiled with Cyrus SASL support.
+ */
+#define MONGOC_ENABLE_SASL_CYRUS 0
+
+#if MONGOC_ENABLE_SASL_CYRUS != 1
+#  undef MONGOC_ENABLE_SASL_CYRUS
+#endif
+
+
+/*
+ * MONGOC_ENABLE_SASL_SSPI is set from configure to determine if we are
+ * compiled with SSPI support.
+ */
+#define MONGOC_ENABLE_SASL_SSPI 1
+
+#if MONGOC_ENABLE_SASL_SSPI != 1
+#  undef MONGOC_ENABLE_SASL_SSPI
+#endif
+
+/*
+ * MONGOC_HAVE_SASL_CLIENT_DONE is set from configure to determine if we
+ * have SASL and its version is new enough to use sasl_client_done (),
+ * which supersedes sasl_done ().
+ */
+#define MONGOC_HAVE_SASL_CLIENT_DONE 0
+
+#if MONGOC_HAVE_SASL_CLIENT_DONE != 1
+#  undef MONGOC_HAVE_SASL_CLIENT_DONE
+#endif
+
+
+/*
+ * Disable automatic calls to mongoc_init() and mongoc_cleanup()
+ * before main() is called, and after exit() (respectively).
+ */
+#define MONGOC_NO_AUTOMATIC_GLOBALS 0
+
+#if MONGOC_NO_AUTOMATIC_GLOBALS != 1
+#  undef MONGOC_NO_AUTOMATIC_GLOBALS
+#endif
+
+/*
+ * MONGOC_HAVE_SOCKLEN is set from configure to determine if we
+ * need to emulate the type.
+ */
+#define MONGOC_HAVE_SOCKLEN 1
+
+#if MONGOC_HAVE_SOCKLEN != 1
+#  undef MONGOC_HAVE_SOCKLEN
+#endif
+
+
+/*
+ * MONGOC_HAVE_DNSAPI is set from configure to determine if we should use the
+ * Windows dnsapi for SRV record lookups.
+ */
+#define MONGOC_HAVE_DNSAPI 1
+
+#if MONGOC_HAVE_DNSAPI != 1
+#  undef MONGOC_HAVE_DNSAPI
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_NSEARCH is set from configure to determine if we
+ * have thread-safe res_nsearch().
+ */
+#define MONGOC_HAVE_RES_NSEARCH 0
+
+#if MONGOC_HAVE_RES_NSEARCH != 1
+#  undef MONGOC_HAVE_RES_NSEARCH
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_NDESTROY is set from configure to determine if we
+ * have BSD / Darwin's res_ndestroy().
+ */
+#define MONGOC_HAVE_RES_NDESTROY 0
+
+#if MONGOC_HAVE_RES_NDESTROY != 1
+#  undef MONGOC_HAVE_RES_NDESTROY
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_NCLOSE is set from configure to determine if we
+ * have Linux's res_nclose().
+ */
+#define MONGOC_HAVE_RES_NCLOSE 0
+
+#if MONGOC_HAVE_RES_NCLOSE != 1
+#  undef MONGOC_HAVE_RES_NCLOSE
+#endif
+
+
+/*
+ * MONGOC_HAVE_RES_SEARCH is set from configure to determine if we
+ * have thread-unsafe res_search(). It's unset if we have the preferred
+ * res_nsearch().
+ */
+#define MONGOC_HAVE_RES_SEARCH 0
+
+#if MONGOC_HAVE_RES_SEARCH != 1
+#  undef MONGOC_HAVE_RES_SEARCH
+#endif
+
+
+/*
+ * Set from configure, see
+ * https://curl.haxx.se/mail/lib-2009-04/0287.html
+ */
+#define MONGOC_SOCKET_ARG2 struct sockaddr
+#define MONGOC_SOCKET_ARG3 socklen_t
+
+/*
+ * Enable wire protocol compression negotiation
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION 1
+
+#if MONGOC_ENABLE_COMPRESSION != 1
+#  undef MONGOC_ENABLE_COMPRESSION
+#endif
+
+/*
+ * Set if we have snappy compression support
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION_SNAPPY 0
+
+#if MONGOC_ENABLE_COMPRESSION_SNAPPY != 1
+#  undef MONGOC_ENABLE_COMPRESSION_SNAPPY
+#endif
+
+
+/*
+ * Set if we have zlib compression support
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION_ZLIB 1
+
+#if MONGOC_ENABLE_COMPRESSION_ZLIB != 1
+#  undef MONGOC_ENABLE_COMPRESSION_ZLIB
+#endif
+
+/*
+ * Set if we have zstd compression support
+ *
+ */
+#define MONGOC_ENABLE_COMPRESSION_ZSTD 0
+
+#if MONGOC_ENABLE_COMPRESSION_ZSTD != 1
+#  undef MONGOC_ENABLE_COMPRESSION_ZSTD
+#endif
+
+/*
+ * Set if performance counters are available and not disabled.
+ *
+ */
+#define MONGOC_ENABLE_SHM_COUNTERS 0
+
+#if MONGOC_ENABLE_SHM_COUNTERS != 1
+#  undef MONGOC_ENABLE_SHM_COUNTERS
+#endif
+
+/*
+ * Set if we have enabled fast counters on Intel using the RDTSCP instruction
+ *
+ */
+#define MONGOC_ENABLE_RDTSCP 0
+
+#if MONGOC_ENABLE_RDTSCP != 1
+#  undef MONGOC_ENABLE_RDTSCP
+#endif
+
+
+/*
+ * Set if we have the sched_getcpu() function for use with counters
+ *
+ */
+#define MONGOC_HAVE_SCHED_GETCPU 0
+
+#if MONGOC_HAVE_SCHED_GETCPU != 1
+#  undef MONGOC_HAVE_SCHED_GETCPU
+#endif
+
+/*
+ * Set if tracing is enabled. Logs things like network communication and
+ * entry/exit of certain functions.
+ */
+#define MONGOC_TRACE 0
+
+enum {
+   /**
+    * @brief Compile-time constant determining whether the mongoc library was
+    * compiled with tracing enabled.
+    *
+    * Can be controlled with the 'ENABLE_TRACING" configure-time boolean option
+    */
+   MONGOC_TRACE_ENABLED = MONGOC_TRACE
+};
+
+/*
+ * Set if we have ICU support.
+ */
+#define MONGOC_ENABLE_ICU 0
+
+#if MONGOC_ENABLE_ICU != 1
+#  undef MONGOC_ENABLE_ICU
+#endif
+
+
+/*
+ * Set if we have Client Side Encryption support.
+ */
+
+#define MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION 0
+
+#if MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION != 1
+#  undef MONGOC_ENABLE_CLIENT_SIDE_ENCRYPTION
+#endif
+
+
+/*
+ * Set if struct sockaddr_storage has __ss_family (instead of ss_family)
+ */
+
+#define MONGOC_HAVE_SS_FAMILY 0
+
+#if MONGOC_HAVE_SS_FAMILY != 1
+#  undef MONGOC_HAVE_SS_FAMILY
+#endif
+
+/*
+ * Set if building with AWS IAM support.
+ */
+#define MONGOC_ENABLE_MONGODB_AWS_AUTH 1
+
+#if MONGOC_ENABLE_MONGODB_AWS_AUTH != 1
+#  undef MONGOC_ENABLE_MONGODB_AWS_AUTH
+#endif
+
+/* clang-format on */
+
+#endif /* MONGOC_CONFIG_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-cursor.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-cursor.h
new file mode 100644
index 0000000..b844c47
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-cursor.h
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_CURSOR_H
+#define MONGOC_CURSOR_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-host-list.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_cursor_t mongoc_cursor_t;
+
+
+/* forward decl */
+struct _mongoc_client_t;
+
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_cursor_clone (const mongoc_cursor_t *cursor)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_cursor_destroy (mongoc_cursor_t *cursor);
+MONGOC_EXPORT (bool)
+mongoc_cursor_more (mongoc_cursor_t *cursor);
+MONGOC_EXPORT (bool)
+mongoc_cursor_next (mongoc_cursor_t *cursor, const bson_t **bson);
+MONGOC_EXPORT (bool)
+mongoc_cursor_error (mongoc_cursor_t *cursor, bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_cursor_error_document (mongoc_cursor_t *cursor,
+                              bson_error_t *error,
+                              const bson_t **doc);
+MONGOC_EXPORT (void)
+mongoc_cursor_get_host (mongoc_cursor_t *cursor, mongoc_host_list_t *host);
+MONGOC_EXPORT (bool)
+mongoc_cursor_is_alive (const mongoc_cursor_t *cursor)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_cursor_more);
+MONGOC_EXPORT (const bson_t *)
+mongoc_cursor_current (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (void)
+mongoc_cursor_set_batch_size (mongoc_cursor_t *cursor, uint32_t batch_size);
+MONGOC_EXPORT (uint32_t)
+mongoc_cursor_get_batch_size (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (bool)
+mongoc_cursor_set_limit (mongoc_cursor_t *cursor, int64_t limit);
+MONGOC_EXPORT (int64_t)
+mongoc_cursor_get_limit (const mongoc_cursor_t *cursor);
+/* These names include the term "hint" for backward compatibility, should be
+ * mongoc_cursor_get_server_id, mongoc_cursor_set_server_id. */
+MONGOC_EXPORT (bool)
+mongoc_cursor_set_hint (mongoc_cursor_t *cursor, uint32_t server_id);
+MONGOC_EXPORT (uint32_t)
+mongoc_cursor_get_hint (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (int64_t)
+mongoc_cursor_get_id (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (void)
+mongoc_cursor_set_max_await_time_ms (mongoc_cursor_t *cursor,
+                                     uint32_t max_await_time_ms);
+MONGOC_EXPORT (uint32_t)
+mongoc_cursor_get_max_await_time_ms (const mongoc_cursor_t *cursor);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_cursor_new_from_command_reply (struct _mongoc_client_t *client,
+                                      bson_t *reply,
+                                      uint32_t server_id)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_cursor_new_from_command_reply_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_cursor_new_from_command_reply_with_opts (struct _mongoc_client_t *client,
+                                                bson_t *reply,
+                                                const bson_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_CURSOR_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-database.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-database.h
new file mode 100644
index 0000000..e958cd3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-database.h
@@ -0,0 +1,169 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_DATABASE_H
+#define MONGOC_DATABASE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-cursor.h"
+#include "mongoc-flags.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-write-concern.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_database_t mongoc_database_t;
+
+
+MONGOC_EXPORT (const char *)
+mongoc_database_get_name (mongoc_database_t *database);
+MONGOC_EXPORT (bool)
+mongoc_database_remove_user (mongoc_database_t *database,
+                             const char *username,
+                             bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_remove_all_users (mongoc_database_t *database,
+                                  bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_add_user (mongoc_database_t *database,
+                          const char *username,
+                          const char *password,
+                          const bson_t *roles,
+                          const bson_t *custom_data,
+                          bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_database_destroy (mongoc_database_t *database);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_aggregate (mongoc_database_t *db,
+                           const bson_t *pipeline,
+                           const bson_t *opts,
+                           const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_database_t *)
+mongoc_database_copy (mongoc_database_t *database) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_command (mongoc_database_t *database,
+                         mongoc_query_flags_t flags,
+                         uint32_t skip,
+                         uint32_t limit,
+                         uint32_t batch_size,
+                         const bson_t *command,
+                         const bson_t *fields,
+                         const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_database_read_command_with_opts (mongoc_database_t *database,
+                                        const bson_t *command,
+                                        const mongoc_read_prefs_t *read_prefs,
+                                        const bson_t *opts,
+                                        bson_t *reply,
+                                        bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_write_command_with_opts (mongoc_database_t *database,
+                                         const bson_t *command,
+                                         const bson_t *opts,
+                                         bson_t *reply,
+                                         bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_read_write_command_with_opts (
+   mongoc_database_t *database,
+   const bson_t *command,
+   const mongoc_read_prefs_t *read_prefs /* IGNORED */,
+   const bson_t *opts,
+   bson_t *reply,
+   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_command_with_opts (mongoc_database_t *database,
+                                   const bson_t *command,
+                                   const mongoc_read_prefs_t *read_prefs,
+                                   const bson_t *opts,
+                                   bson_t *reply,
+                                   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_command_simple (mongoc_database_t *database,
+                                const bson_t *command,
+                                const mongoc_read_prefs_t *read_prefs,
+                                bson_t *reply,
+                                bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_drop (mongoc_database_t *database, bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_drop_with_opts (mongoc_database_t *database,
+                                const bson_t *opts,
+                                bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_database_has_collection (mongoc_database_t *database,
+                                const char *name,
+                                bson_error_t *error);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_database_create_collection (mongoc_database_t *database,
+                                   const char *name,
+                                   const bson_t *options,
+                                   bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_database_get_read_prefs (const mongoc_database_t *database);
+MONGOC_EXPORT (void)
+mongoc_database_set_read_prefs (mongoc_database_t *database,
+                                const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_database_get_write_concern (const mongoc_database_t *database);
+MONGOC_EXPORT (void)
+mongoc_database_set_write_concern (mongoc_database_t *database,
+                                   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_database_get_read_concern (const mongoc_database_t *database);
+MONGOC_EXPORT (void)
+mongoc_database_set_read_concern (mongoc_database_t *database,
+                                  const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_find_collections (mongoc_database_t *database,
+                                  const bson_t *filter,
+                                  bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_database_find_collections_with_opts);
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_database_find_collections_with_opts (mongoc_database_t *database,
+                                            const bson_t *opts)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (char **)
+mongoc_database_get_collection_names (mongoc_database_t *database,
+                                      bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_database_get_collection_names_with_opts);
+MONGOC_EXPORT (char **)
+mongoc_database_get_collection_names_with_opts (mongoc_database_t *database,
+                                                const bson_t *opts,
+                                                bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_database_get_collection (mongoc_database_t *database,
+                                const char *name) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_change_stream_t *)
+mongoc_database_watch (const mongoc_database_t *db,
+                       const bson_t *pipeline,
+                       const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_DATABASE_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-error.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-error.h
new file mode 100644
index 0000000..274411c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-error.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_ERRORS_H
+#define MONGOC_ERRORS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+#define MONGOC_ERROR_API_VERSION_LEGACY 1
+#define MONGOC_ERROR_API_VERSION_2 2
+
+BSON_BEGIN_DECLS
+
+
+typedef enum {
+   MONGOC_ERROR_CLIENT = 1,
+   MONGOC_ERROR_STREAM,
+   MONGOC_ERROR_PROTOCOL,
+   MONGOC_ERROR_CURSOR,
+   MONGOC_ERROR_QUERY,
+   MONGOC_ERROR_INSERT,
+   MONGOC_ERROR_SASL,
+   MONGOC_ERROR_BSON,
+   MONGOC_ERROR_MATCHER,
+   MONGOC_ERROR_NAMESPACE,
+   MONGOC_ERROR_COMMAND,
+   MONGOC_ERROR_COLLECTION,
+   MONGOC_ERROR_GRIDFS,
+   MONGOC_ERROR_SCRAM,
+   MONGOC_ERROR_SERVER_SELECTION,
+   MONGOC_ERROR_WRITE_CONCERN,
+   MONGOC_ERROR_SERVER, /* Error API Version 2 only */
+   MONGOC_ERROR_TRANSACTION,
+   MONGOC_ERROR_CLIENT_SIDE_ENCRYPTION, /* An error coming from libmongocrypt */
+   MONGOC_ERROR_POOL
+} mongoc_error_domain_t;
+
+
+typedef enum {
+   MONGOC_ERROR_STREAM_INVALID_TYPE = 1,
+   MONGOC_ERROR_STREAM_INVALID_STATE,
+   MONGOC_ERROR_STREAM_NAME_RESOLUTION,
+   MONGOC_ERROR_STREAM_SOCKET,
+   MONGOC_ERROR_STREAM_CONNECT,
+   MONGOC_ERROR_STREAM_NOT_ESTABLISHED,
+
+   MONGOC_ERROR_CLIENT_NOT_READY,
+   MONGOC_ERROR_CLIENT_TOO_BIG,
+   MONGOC_ERROR_CLIENT_TOO_SMALL,
+   MONGOC_ERROR_CLIENT_GETNONCE,
+   MONGOC_ERROR_CLIENT_AUTHENTICATE,
+   MONGOC_ERROR_CLIENT_NO_ACCEPTABLE_PEER,
+   MONGOC_ERROR_CLIENT_IN_EXHAUST,
+
+   MONGOC_ERROR_PROTOCOL_INVALID_REPLY,
+   MONGOC_ERROR_PROTOCOL_BAD_WIRE_VERSION,
+
+   MONGOC_ERROR_CURSOR_INVALID_CURSOR,
+
+   MONGOC_ERROR_QUERY_FAILURE,
+
+   MONGOC_ERROR_BSON_INVALID,
+
+   MONGOC_ERROR_MATCHER_INVALID,
+
+   MONGOC_ERROR_NAMESPACE_INVALID,
+   MONGOC_ERROR_NAMESPACE_INVALID_FILTER_TYPE,
+
+   MONGOC_ERROR_COMMAND_INVALID_ARG,
+
+   MONGOC_ERROR_COLLECTION_INSERT_FAILED,
+   MONGOC_ERROR_COLLECTION_UPDATE_FAILED,
+   MONGOC_ERROR_COLLECTION_DELETE_FAILED,
+   MONGOC_ERROR_COLLECTION_DOES_NOT_EXIST = 26,
+
+   MONGOC_ERROR_GRIDFS_INVALID_FILENAME,
+
+   MONGOC_ERROR_SCRAM_NOT_DONE,
+   MONGOC_ERROR_SCRAM_PROTOCOL_ERROR,
+
+   MONGOC_ERROR_QUERY_COMMAND_NOT_FOUND = 59,
+   MONGOC_ERROR_QUERY_NOT_TAILABLE = 13051,
+
+   MONGOC_ERROR_SERVER_SELECTION_BAD_WIRE_VERSION,
+   MONGOC_ERROR_SERVER_SELECTION_FAILURE,
+   MONGOC_ERROR_SERVER_SELECTION_INVALID_ID,
+
+   MONGOC_ERROR_GRIDFS_CHUNK_MISSING,
+   MONGOC_ERROR_GRIDFS_PROTOCOL_ERROR,
+
+   /* Dup with query failure. */
+   MONGOC_ERROR_PROTOCOL_ERROR = 17,
+
+   MONGOC_ERROR_WRITE_CONCERN_ERROR = 64,
+
+   MONGOC_ERROR_DUPLICATE_KEY = 11000,
+
+   MONGOC_ERROR_MAX_TIME_MS_EXPIRED = 50,
+
+   MONGOC_ERROR_CHANGE_STREAM_NO_RESUME_TOKEN,
+   MONGOC_ERROR_CLIENT_SESSION_FAILURE,
+   MONGOC_ERROR_TRANSACTION_INVALID_STATE,
+   MONGOC_ERROR_GRIDFS_CORRUPT,
+   MONGOC_ERROR_GRIDFS_BUCKET_FILE_NOT_FOUND,
+   MONGOC_ERROR_GRIDFS_BUCKET_STREAM,
+
+   /* An error related to initializing client side encryption. */
+   MONGOC_ERROR_CLIENT_INVALID_ENCRYPTION_STATE,
+
+   MONGOC_ERROR_CLIENT_INVALID_ENCRYPTION_ARG,
+
+
+   /* An error related to server version api */
+   MONGOC_ERROR_CLIENT_API_ALREADY_SET,
+   MONGOC_ERROR_CLIENT_API_FROM_POOL,
+   MONGOC_ERROR_POOL_API_ALREADY_SET,
+   MONGOC_ERROR_POOL_API_TOO_LATE,
+
+   MONGOC_ERROR_CLIENT_INVALID_LOAD_BALANCER,
+} mongoc_error_code_t;
+
+MONGOC_EXPORT (bool)
+mongoc_error_has_label (const bson_t *reply, const char *label);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_ERRORS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-find-and-modify.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-find-and-modify.h
new file mode 100644
index 0000000..7dfedcc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-find-and-modify.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_FIND_AND_MODIFY_H
+#define MONGOC_FIND_AND_MODIFY_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef enum {
+   MONGOC_FIND_AND_MODIFY_NONE = 0,
+   MONGOC_FIND_AND_MODIFY_REMOVE = 1 << 0,
+   MONGOC_FIND_AND_MODIFY_UPSERT = 1 << 1,
+   MONGOC_FIND_AND_MODIFY_RETURN_NEW = 1 << 2,
+} mongoc_find_and_modify_flags_t;
+
+typedef struct _mongoc_find_and_modify_opts_t mongoc_find_and_modify_opts_t;
+
+MONGOC_EXPORT (mongoc_find_and_modify_opts_t *)
+mongoc_find_and_modify_opts_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_sort (mongoc_find_and_modify_opts_t *opts,
+                                      const bson_t *sort);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_sort (const mongoc_find_and_modify_opts_t *opts,
+                                      bson_t *sort);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_update (mongoc_find_and_modify_opts_t *opts,
+                                        const bson_t *update);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_update (
+   const mongoc_find_and_modify_opts_t *opts, bson_t *update);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_fields (mongoc_find_and_modify_opts_t *opts,
+                                        const bson_t *fields);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_fields (
+   const mongoc_find_and_modify_opts_t *opts, bson_t *fields);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_flags (
+   mongoc_find_and_modify_opts_t *opts,
+   const mongoc_find_and_modify_flags_t flags);
+
+MONGOC_EXPORT (mongoc_find_and_modify_flags_t)
+mongoc_find_and_modify_opts_get_flags (
+   const mongoc_find_and_modify_opts_t *opts);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_bypass_document_validation (
+   mongoc_find_and_modify_opts_t *opts, bool bypass);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_get_bypass_document_validation (
+   const mongoc_find_and_modify_opts_t *opts);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_set_max_time_ms (
+   mongoc_find_and_modify_opts_t *opts, uint32_t max_time_ms);
+
+MONGOC_EXPORT (uint32_t)
+mongoc_find_and_modify_opts_get_max_time_ms (
+   const mongoc_find_and_modify_opts_t *opts);
+
+MONGOC_EXPORT (bool)
+mongoc_find_and_modify_opts_append (mongoc_find_and_modify_opts_t *opts,
+                                    const bson_t *extra);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_get_extra (
+   const mongoc_find_and_modify_opts_t *opts, bson_t *extra);
+
+MONGOC_EXPORT (void)
+mongoc_find_and_modify_opts_destroy (mongoc_find_and_modify_opts_t *opts);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_FIND_AND_MODIFY_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-flags.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-flags.h
new file mode 100644
index 0000000..343c060
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-flags.h
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_FLAGS_H
+#define MONGOC_FLAGS_H
+
+#include <bson/bson.h>
+
+
+BSON_BEGIN_DECLS
+
+
+/**
+ * mongoc_delete_flags_t:
+ * @MONGOC_DELETE_NONE: Specify no delete flags.
+ * @MONGOC_DELETE_SINGLE_REMOVE: Only remove the first document matching the
+ *    document selector.
+ *
+ * This type is only for use with deprecated functions and should not be
+ * used in new code. Use mongoc_remove_flags_t instead.
+ *
+ * #mongoc_delete_flags_t are used when performing a delete operation.
+ */
+typedef enum {
+   MONGOC_DELETE_NONE = 0,
+   MONGOC_DELETE_SINGLE_REMOVE = 1 << 0,
+} mongoc_delete_flags_t;
+
+
+/**
+ * mongoc_remove_flags_t:
+ * @MONGOC_REMOVE_NONE: Specify no delete flags.
+ * @MONGOC_REMOVE_SINGLE_REMOVE: Only remove the first document matching the
+ *    document selector.
+ *
+ * #mongoc_remove_flags_t are used when performing a remove operation.
+ */
+typedef enum {
+   MONGOC_REMOVE_NONE = 0,
+   MONGOC_REMOVE_SINGLE_REMOVE = 1 << 0,
+} mongoc_remove_flags_t;
+
+
+/**
+ * mongoc_insert_flags_t:
+ * @MONGOC_INSERT_NONE: Specify no insert flags.
+ * @MONGOC_INSERT_CONTINUE_ON_ERROR: Continue inserting documents from
+ *    the insertion set even if one fails.
+ *
+ * #mongoc_insert_flags_t are used when performing an insert operation.
+ */
+typedef enum {
+   MONGOC_INSERT_NONE = 0,
+   MONGOC_INSERT_CONTINUE_ON_ERROR = 1 << 0,
+} mongoc_insert_flags_t;
+
+
+#define MONGOC_INSERT_NO_VALIDATE (1U << 31)
+
+
+/**
+ * mongoc_query_flags_t:
+ * @MONGOC_QUERY_NONE: No query flags supplied.
+ * @MONGOC_QUERY_TAILABLE_CURSOR: Cursor will not be closed when the last
+ *    data is retrieved. You can resume this cursor later.
+ * @MONGOC_QUERY_SECONDARY_OK: Allow query of secondaries in a replica set.
+ * @MONGOC_QUERY_OPLOG_REPLAY: Used internally by Mongo.
+ * @MONGOC_QUERY_NO_CURSOR_TIMEOUT: The server normally times out idle
+ *    cursors after an inactivity period (10 minutes). This prevents that.
+ * @MONGOC_QUERY_AWAIT_DATA: Use with %MONGOC_QUERY_TAILABLE_CURSOR. Block
+ *    rather than returning no data. After a period, time out.
+ * @MONGOC_QUERY_EXHAUST: Stream the data down full blast in multiple
+ *    "more" packages. Faster when you are pulling a lot of data and
+ *    know you want to pull it all down.
+ * @MONGOC_QUERY_PARTIAL: Get partial results from mongos if some shards
+ *    are down (instead of throwing an error).
+ *
+ * #mongoc_query_flags_t is used for querying a Mongo instance.
+ */
+typedef enum {
+   MONGOC_QUERY_NONE = 0,
+   MONGOC_QUERY_TAILABLE_CURSOR = 1 << 1,
+   MONGOC_QUERY_SLAVE_OK = 1 << 2,
+   MONGOC_QUERY_SECONDARY_OK = 1 << 2,
+   MONGOC_QUERY_OPLOG_REPLAY = 1 << 3,
+   MONGOC_QUERY_NO_CURSOR_TIMEOUT = 1 << 4,
+   MONGOC_QUERY_AWAIT_DATA = 1 << 5,
+   MONGOC_QUERY_EXHAUST = 1 << 6,
+   MONGOC_QUERY_PARTIAL = 1 << 7,
+} mongoc_query_flags_t;
+
+
+/**
+ * mongoc_reply_flags_t:
+ * @MONGOC_REPLY_NONE: No flags set.
+ * @MONGOC_REPLY_CURSOR_NOT_FOUND: Cursor was not found.
+ * @MONGOC_REPLY_QUERY_FAILURE: Query failed, error document provided.
+ * @MONGOC_REPLY_SHARD_CONFIG_STALE: Shard configuration is stale.
+ * @MONGOC_REPLY_AWAIT_CAPABLE: Wait for data to be returned until timeout
+ *    has passed. Used with %MONGOC_QUERY_TAILABLE_CURSOR.
+ *
+ * #mongoc_reply_flags_t contains flags supplied by the Mongo server in reply
+ * to a request.
+ */
+typedef enum {
+   MONGOC_REPLY_NONE = 0,
+   MONGOC_REPLY_CURSOR_NOT_FOUND = 1 << 0,
+   MONGOC_REPLY_QUERY_FAILURE = 1 << 1,
+   MONGOC_REPLY_SHARD_CONFIG_STALE = 1 << 2,
+   MONGOC_REPLY_AWAIT_CAPABLE = 1 << 3,
+} mongoc_reply_flags_t;
+
+
+/**
+ * mongoc_update_flags_t:
+ * @MONGOC_UPDATE_NONE: No update flags specified.
+ * @MONGOC_UPDATE_UPSERT: Perform an upsert.
+ * @MONGOC_UPDATE_MULTI_UPDATE: Continue updating after first match.
+ *
+ * #mongoc_update_flags_t is used when updating documents found in Mongo.
+ */
+typedef enum {
+   MONGOC_UPDATE_NONE = 0,
+   MONGOC_UPDATE_UPSERT = 1 << 0,
+   MONGOC_UPDATE_MULTI_UPDATE = 1 << 1,
+} mongoc_update_flags_t;
+
+
+#define MONGOC_UPDATE_NO_VALIDATE (1U << 31)
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_FLAGS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-bucket.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-bucket.h
new file mode 100644
index 0000000..9bde457
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-bucket.h
@@ -0,0 +1,103 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_BUCKET_H
+#define MONGOC_GRIDFS_BUCKET_H
+
+#include "bson/bson.h"
+#include "mongoc-collection.h"
+#include "mongoc-database.h"
+#include "mongoc-stream.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_gridfs_bucket_t mongoc_gridfs_bucket_t;
+
+MONGOC_EXPORT (mongoc_gridfs_bucket_t *)
+mongoc_gridfs_bucket_new (mongoc_database_t *db,
+                          const bson_t *opts,
+                          const mongoc_read_prefs_t *read_prefs,
+                          bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_gridfs_bucket_open_upload_stream (mongoc_gridfs_bucket_t *bucket,
+                                         const char *filename,
+                                         const bson_t *opts,
+                                         bson_value_t *file_id,
+                                         bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_gridfs_bucket_open_upload_stream_with_id (mongoc_gridfs_bucket_t *bucket,
+                                                 const bson_value_t *file_id,
+                                                 const char *filename,
+                                                 const bson_t *opts,
+                                                 bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_upload_from_stream (mongoc_gridfs_bucket_t *bucket,
+                                         const char *filename,
+                                         mongoc_stream_t *source,
+                                         const bson_t *opts,
+                                         bson_value_t *file_id,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_upload_from_stream_with_id (mongoc_gridfs_bucket_t *bucket,
+                                                 const bson_value_t *file_id,
+                                                 const char *filename,
+                                                 mongoc_stream_t *source,
+                                                 const bson_t *opts,
+                                                 bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_gridfs_bucket_open_download_stream (mongoc_gridfs_bucket_t *bucket,
+                                           const bson_value_t *file_id,
+                                           bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_download_to_stream (mongoc_gridfs_bucket_t *bucket,
+                                         const bson_value_t *file_id,
+                                         mongoc_stream_t *destination,
+                                         bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_delete_by_id (mongoc_gridfs_bucket_t *bucket,
+                                   const bson_value_t *file_id,
+                                   bson_error_t *error);
+
+MONGOC_EXPORT (mongoc_cursor_t *)
+mongoc_gridfs_bucket_find (mongoc_gridfs_bucket_t *bucket,
+                           const bson_t *filter,
+                           const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_stream_error (mongoc_stream_t *stream,
+                                   bson_error_t *error);
+
+MONGOC_EXPORT (void)
+mongoc_gridfs_bucket_destroy (mongoc_gridfs_bucket_t *bucket);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_bucket_abort_upload (mongoc_stream_t *stream);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_GRIDFS_BUCKET_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-list.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-list.h
new file mode 100644
index 0000000..284204a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-list.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_FILE_LIST_H
+#define MONGOC_GRIDFS_FILE_LIST_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-gridfs-file.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_gridfs_file_list_t mongoc_gridfs_file_list_t;
+
+
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_file_list_next (mongoc_gridfs_file_list_t *list)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_gridfs_file_list_destroy (mongoc_gridfs_file_list_t *list);
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_list_error (mongoc_gridfs_file_list_t *list,
+                               bson_error_t *error);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_GRIDFS_FILE_LIST_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-page.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-page.h
new file mode 100644
index 0000000..7ca03d1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file-page.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_FILE_PAGE_H
+#define MONGOC_GRIDFS_FILE_PAGE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-stream.h"
+#include "mongoc-gridfs-file.h"
+#include "mongoc-gridfs-file-list.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_gridfs_file_page_t mongoc_gridfs_file_page_t;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_GRIDFS_FILE_PAGE_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file.h
new file mode 100644
index 0000000..2af8f79
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs-file.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_FILE_H
+#define MONGOC_GRIDFS_FILE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-socket.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_GRIDFS_FILE_STR_HEADER(name)                    \
+   MONGOC_EXPORT (const char *)                                \
+   mongoc_gridfs_file_get_##name (mongoc_gridfs_file_t *file); \
+   MONGOC_EXPORT (void)                                        \
+   mongoc_gridfs_file_set_##name (mongoc_gridfs_file_t *file, const char *str);
+
+
+#define MONGOC_GRIDFS_FILE_BSON_HEADER(name)                   \
+   MONGOC_EXPORT (const bson_t *)                              \
+   mongoc_gridfs_file_get_##name (mongoc_gridfs_file_t *file); \
+   MONGOC_EXPORT (void)                                        \
+   mongoc_gridfs_file_set_##name (mongoc_gridfs_file_t *file,  \
+                                  const bson_t *bson);
+
+
+typedef struct _mongoc_gridfs_file_t mongoc_gridfs_file_t;
+typedef struct _mongoc_gridfs_file_opt_t mongoc_gridfs_file_opt_t;
+
+
+struct _mongoc_gridfs_file_opt_t {
+   const char *md5;
+   const char *filename;
+   const char *content_type;
+   const bson_t *aliases;
+   const bson_t *metadata;
+   uint32_t chunk_size;
+};
+
+
+MONGOC_GRIDFS_FILE_STR_HEADER (md5)
+MONGOC_GRIDFS_FILE_STR_HEADER (filename)
+MONGOC_GRIDFS_FILE_STR_HEADER (content_type)
+MONGOC_GRIDFS_FILE_BSON_HEADER (aliases)
+MONGOC_GRIDFS_FILE_BSON_HEADER (metadata)
+
+
+MONGOC_EXPORT (const bson_value_t *)
+mongoc_gridfs_file_get_id (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (int64_t)
+mongoc_gridfs_file_get_length (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (int32_t)
+mongoc_gridfs_file_get_chunk_size (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (int64_t)
+mongoc_gridfs_file_get_upload_date (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (ssize_t)
+mongoc_gridfs_file_writev (mongoc_gridfs_file_t *file,
+                           const mongoc_iovec_t *iov,
+                           size_t iovcnt,
+                           uint32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_gridfs_file_readv (mongoc_gridfs_file_t *file,
+                          mongoc_iovec_t *iov,
+                          size_t iovcnt,
+                          size_t min_bytes,
+                          uint32_t timeout_msec);
+MONGOC_EXPORT (int)
+mongoc_gridfs_file_seek (mongoc_gridfs_file_t *file, int64_t delta, int whence);
+
+MONGOC_EXPORT (uint64_t)
+mongoc_gridfs_file_tell (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_set_id (mongoc_gridfs_file_t *file,
+                           const bson_value_t *id,
+                           bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_save (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (void)
+mongoc_gridfs_file_destroy (mongoc_gridfs_file_t *file);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_error (mongoc_gridfs_file_t *file, bson_error_t *error);
+
+MONGOC_EXPORT (bool)
+mongoc_gridfs_file_remove (mongoc_gridfs_file_t *file, bson_error_t *error);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_GRIDFS_FILE_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs.h
new file mode 100644
index 0000000..e75ba39
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-gridfs.h
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_GRIDFS_H
+#define MONGOC_GRIDFS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-stream.h"
+#include "mongoc-gridfs-file.h"
+#include "mongoc-collection.h"
+#include "mongoc-gridfs-file-list.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_gridfs_t mongoc_gridfs_t;
+
+
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_create_file_from_stream (mongoc_gridfs_t *gridfs,
+                                       mongoc_stream_t *stream,
+                                       mongoc_gridfs_file_opt_t *opt)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_create_file (mongoc_gridfs_t *gridfs,
+                           mongoc_gridfs_file_opt_t *opt)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_list_t *)
+mongoc_gridfs_find (mongoc_gridfs_t *gridfs,
+                    const bson_t *query) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_gridfs_find_with_opts);
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_find_one (mongoc_gridfs_t *gridfs,
+                        const bson_t *query,
+                        bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_gridfs_find_one_with_opts);
+MONGOC_EXPORT (mongoc_gridfs_file_list_t *)
+mongoc_gridfs_find_with_opts (mongoc_gridfs_t *gridfs,
+                              const bson_t *filter,
+                              const bson_t *opts) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_find_one_with_opts (mongoc_gridfs_t *gridfs,
+                                  const bson_t *filter,
+                                  const bson_t *opts,
+                                  bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_gridfs_file_t *)
+mongoc_gridfs_find_one_by_filename (mongoc_gridfs_t *gridfs,
+                                    const char *filename,
+                                    bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (bool)
+mongoc_gridfs_drop (mongoc_gridfs_t *gridfs, bson_error_t *error);
+MONGOC_EXPORT (void)
+mongoc_gridfs_destroy (mongoc_gridfs_t *gridfs);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_gridfs_get_files (mongoc_gridfs_t *gridfs);
+MONGOC_EXPORT (mongoc_collection_t *)
+mongoc_gridfs_get_chunks (mongoc_gridfs_t *gridfs);
+MONGOC_EXPORT (bool)
+mongoc_gridfs_remove_by_filename (mongoc_gridfs_t *gridfs,
+                                  const char *filename,
+                                  bson_error_t *error);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_GRIDFS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-handshake.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-handshake.h
new file mode 100644
index 0000000..a1ff2f8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-handshake.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_HANDSHAKE_H
+#define MONGOC_HANDSHAKE_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+#define MONGOC_HANDSHAKE_APPNAME_MAX 128
+
+MONGOC_EXPORT (bool) 
+mongoc_handshake_data_append (const char *driver_name,
+                              const char *driver_version,
+                              const char *platform);
+
+BSON_END_DECLS
+
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-host-list.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-host-list.h
new file mode 100644
index 0000000..bb8dbd9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-host-list.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_HOST_LIST_H
+#define MONGOC_HOST_LIST_H
+
+#include <bson/bson.h>
+
+
+BSON_BEGIN_DECLS
+
+
+#ifdef _POSIX_HOST_NAME_MAX
+#define BSON_HOST_NAME_MAX _POSIX_HOST_NAME_MAX
+#else
+#define BSON_HOST_NAME_MAX 255
+#endif
+
+
+typedef struct _mongoc_host_list_t mongoc_host_list_t;
+
+
+struct _mongoc_host_list_t {
+   mongoc_host_list_t *next;
+   char host[BSON_HOST_NAME_MAX + 1];
+   char host_and_port[BSON_HOST_NAME_MAX + 7];
+   uint16_t port;
+   int family;
+   void *padding[4];
+};
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_HOST_LIST_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-index.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-index.h
new file mode 100644
index 0000000..a8a49c9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-index.h
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_INDEX_H
+#define MONGOC_INDEX_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct {
+   uint8_t twod_sphere_version;
+   uint8_t twod_bits_precision;
+   double twod_location_min;
+   double twod_location_max;
+   double haystack_bucket_size;
+   uint8_t *padding[32];
+} mongoc_index_opt_geo_t;
+
+typedef struct {
+   int type;
+} mongoc_index_opt_storage_t;
+
+typedef enum {
+   MONGOC_INDEX_STORAGE_OPT_MMAPV1,
+   MONGOC_INDEX_STORAGE_OPT_WIREDTIGER,
+} mongoc_index_storage_opt_type_t;
+
+typedef struct {
+   mongoc_index_opt_storage_t base;
+   const char *config_str;
+   void *padding[8];
+} mongoc_index_opt_wt_t;
+
+typedef struct {
+   bool is_initialized;
+   bool background;
+   bool unique;
+   const char *name;
+   bool drop_dups;
+   bool sparse;
+   int32_t expire_after_seconds;
+   int32_t v;
+   const bson_t *weights;
+   const char *default_language;
+   const char *language_override;
+   mongoc_index_opt_geo_t *geo_options;
+   mongoc_index_opt_storage_t *storage_options;
+   const bson_t *partial_filter_expression;
+   const bson_t *collation;
+   void *padding[4];
+} mongoc_index_opt_t;
+
+
+MONGOC_EXPORT (const mongoc_index_opt_t *)
+mongoc_index_opt_get_default (void) BSON_GNUC_PURE;
+MONGOC_EXPORT (const mongoc_index_opt_geo_t *)
+mongoc_index_opt_geo_get_default (void) BSON_GNUC_PURE;
+MONGOC_EXPORT (const mongoc_index_opt_wt_t *)
+mongoc_index_opt_wt_get_default (void) BSON_GNUC_PURE;
+MONGOC_EXPORT (void)
+mongoc_index_opt_init (mongoc_index_opt_t *opt);
+MONGOC_EXPORT (void)
+mongoc_index_opt_geo_init (mongoc_index_opt_geo_t *opt);
+MONGOC_EXPORT (void)
+mongoc_index_opt_wt_init (mongoc_index_opt_wt_t *opt);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_INDEX_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-init.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-init.h
new file mode 100644
index 0000000..f1d8d7e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-init.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_INIT_H
+#define MONGOC_INIT_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+MONGOC_EXPORT (void)
+mongoc_init (void);
+MONGOC_EXPORT (void)
+mongoc_cleanup (void);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_INIT_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-iovec.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-iovec.h
new file mode 100644
index 0000000..f18f411
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-iovec.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_IOVEC_H
+#define MONGOC_IOVEC_H
+
+
+#include <bson/bson.h>
+
+#ifdef _WIN32
+#include <stddef.h>
+#else
+#include <sys/uio.h>
+#endif
+
+BSON_BEGIN_DECLS
+
+
+#ifdef _WIN32
+typedef struct {
+   size_t iov_len;
+   char *iov_base;
+} mongoc_iovec_t;
+
+BSON_STATIC_ASSERT2 (sizeof_iovect_t,
+                     sizeof (mongoc_iovec_t) == sizeof (WSABUF));
+BSON_STATIC_ASSERT2 (offsetof_iovec_base,
+                     offsetof (mongoc_iovec_t, iov_base) ==
+                        offsetof (WSABUF, buf));
+BSON_STATIC_ASSERT2 (offsetof_iovec_len,
+                     offsetof (mongoc_iovec_t, iov_len) ==
+                        offsetof (WSABUF, len));
+
+#else
+typedef struct iovec mongoc_iovec_t;
+#endif
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_IOVEC_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-log.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-log.h
new file mode 100644
index 0000000..8f52364
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-log.h
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_LOG_H
+#define MONGOC_LOG_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+#ifndef MONGOC_LOG_DOMAIN
+#define MONGOC_LOG_DOMAIN "mongoc"
+#endif
+
+
+#define MONGOC_ERROR(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_ERROR, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_CRITICAL(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_CRITICAL, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_WARNING(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_WARNING, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_MESSAGE(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_MESSAGE, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_INFO(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_INFO, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+#define MONGOC_DEBUG(...) \
+   mongoc_log (MONGOC_LOG_LEVEL_DEBUG, MONGOC_LOG_DOMAIN, __VA_ARGS__)
+
+
+typedef enum {
+   MONGOC_LOG_LEVEL_ERROR,
+   MONGOC_LOG_LEVEL_CRITICAL,
+   MONGOC_LOG_LEVEL_WARNING,
+   MONGOC_LOG_LEVEL_MESSAGE,
+   MONGOC_LOG_LEVEL_INFO,
+   MONGOC_LOG_LEVEL_DEBUG,
+   MONGOC_LOG_LEVEL_TRACE,
+} mongoc_log_level_t;
+
+
+/**
+ * mongoc_log_func_t:
+ * @log_level: The level of the log message.
+ * @log_domain: The domain of the log message, such as "client".
+ * @message: The message generated.
+ * @user_data: User data provided to mongoc_log_set_handler().
+ *
+ * This function prototype can be used to set a custom log handler for the
+ * libmongoc library. This is useful if you would like to show them in a
+ * user interface or alternate storage.
+ */
+typedef void (*mongoc_log_func_t) (mongoc_log_level_t log_level,
+                                   const char *log_domain,
+                                   const char *message,
+                                   void *user_data);
+
+
+/**
+ * mongoc_log_set_handler:
+ * @log_func: A function to handle log messages.
+ * @user_data: User data for @log_func.
+ *
+ * Sets the function to be called to handle logging.
+ */
+MONGOC_EXPORT (void)
+mongoc_log_set_handler (mongoc_log_func_t log_func, void *user_data);
+
+
+/**
+ * mongoc_log:
+ * @log_level: The log level.
+ * @log_domain: The log domain (such as "client").
+ * @format: The format string for the log message.
+ *
+ * Logs a message using the currently configured logger.
+ *
+ * This method will hold a logging lock to prevent concurrent calls to the
+ * logging infrastructure. It is important that your configured log function
+ * does not re-enter the logging system or deadlock will occur.
+ *
+ */
+MONGOC_EXPORT (void)
+mongoc_log (mongoc_log_level_t log_level,
+            const char *log_domain,
+            const char *format,
+            ...) BSON_GNUC_PRINTF (3, 4);
+
+
+MONGOC_EXPORT (void)
+mongoc_log_default_handler (mongoc_log_level_t log_level,
+                            const char *log_domain,
+                            const char *message,
+                            void *user_data);
+
+
+/**
+ * mongoc_log_level_str:
+ * @log_level: The log level.
+ *
+ * Returns: The string representation of log_level
+ */
+MONGOC_EXPORT (const char *)
+mongoc_log_level_str (mongoc_log_level_t log_level);
+
+
+/**
+ * mongoc_log_trace_enable:
+ *
+ * Enables tracing at runtime (if it has been enabled at compile time).
+ */
+MONGOC_EXPORT (void)
+mongoc_log_trace_enable (void);
+
+
+/**
+ * mongoc_log_trace_disable:
+ *
+ * Disables tracing at runtime (if it has been enabled at compile time).
+ */
+MONGOC_EXPORT (void)
+mongoc_log_trace_disable (void);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_LOG_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-macros.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-macros.h
new file mode 100644
index 0000000..d960c05
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-macros.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2017 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_MACROS_H
+#define MONGOC_MACROS_H
+
+/* Decorate public functions:
+ * - if MONGOC_STATIC, we're compiling a program that uses libmongoc as
+ *   a static library, don't decorate functions
+ * - else if MONGOC_COMPILATION, we're compiling a static or shared libmongoc,
+ *   mark public functions for export from the shared lib (which has no effect
+ *   on the static lib)
+ * - else, we're compiling a program that uses libmongoc as a shared library,
+ *   mark public functions as DLL imports for Microsoft Visual C.
+ */
+
+#ifdef _MSC_VER
+/*
+ * Microsoft Visual C
+ */
+#ifdef MONGOC_STATIC
+#define MONGOC_API
+#elif defined(MONGOC_COMPILATION)
+#define MONGOC_API __declspec(dllexport)
+#else
+#define MONGOC_API __declspec(dllimport)
+#endif
+#define MONGOC_CALL __cdecl
+
+#elif defined(__GNUC__)
+/*
+ * GCC
+ */
+#ifdef MONGOC_STATIC
+#define MONGOC_API
+#elif defined(MONGOC_COMPILATION)
+#define MONGOC_API __attribute__ ((visibility ("default")))
+#else
+#define MONGOC_API
+#endif
+#define MONGOC_CALL
+
+#else
+/*
+ * Other compilers
+ */
+#define MONGOC_API
+#define MONGOC_CALL
+
+#endif
+
+#define MONGOC_EXPORT(type) MONGOC_API type MONGOC_CALL
+
+#endif /* MONGOC_MACROS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-matcher.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-matcher.h
new file mode 100644
index 0000000..2534290
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-matcher.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_MATCHER_H
+#define MONGOC_MATCHER_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_matcher_t mongoc_matcher_t;
+
+
+MONGOC_EXPORT (mongoc_matcher_t *)
+mongoc_matcher_new (const bson_t *query, bson_error_t *error)
+   BSON_GNUC_WARN_UNUSED_RESULT BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_matcher_match (const mongoc_matcher_t *matcher,
+                      const bson_t *document) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (void)
+mongoc_matcher_destroy (mongoc_matcher_t *matcher) BSON_GNUC_DEPRECATED;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_MATCHER_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-opcode.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-opcode.h
new file mode 100644
index 0000000..3616a74
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-opcode.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_OPCODE_H
+#define MONGOC_OPCODE_H
+
+#include <bson/bson.h>
+
+
+BSON_BEGIN_DECLS
+
+
+typedef enum {
+   MONGOC_OPCODE_REPLY = 1,
+   MONGOC_OPCODE_UPDATE = 2001,
+   MONGOC_OPCODE_INSERT = 2002,
+   MONGOC_OPCODE_QUERY = 2004,
+   MONGOC_OPCODE_GET_MORE = 2005,
+   MONGOC_OPCODE_DELETE = 2006,
+   MONGOC_OPCODE_KILL_CURSORS = 2007,
+   MONGOC_OPCODE_COMPRESSED = 2012,
+   MONGOC_OPCODE_MSG = 2013,
+} mongoc_opcode_t;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_OPCODE_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-optional.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-optional.h
new file mode 100644
index 0000000..438e143
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-optional.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_OPTIONAL_H
+#define MONGOC_OPTIONAL_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct {
+   bool value;
+   bool is_set;
+} mongoc_optional_t;
+
+MONGOC_EXPORT (void)
+mongoc_optional_init (mongoc_optional_t *opt);
+
+MONGOC_EXPORT (bool)
+mongoc_optional_is_set (const mongoc_optional_t *opt);
+
+MONGOC_EXPORT (bool)
+mongoc_optional_value (const mongoc_optional_t *opt);
+
+MONGOC_EXPORT (void)
+mongoc_optional_set_value (mongoc_optional_t *opt, bool val);
+
+MONGOC_EXPORT (void)
+mongoc_optional_copy (const mongoc_optional_t *source, mongoc_optional_t *copy);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_OPTIONAL_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-prelude.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-prelude.h
new file mode 100644
index 0000000..8ae2eeb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-prelude.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2018-present MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if !defined(MONGOC_INSIDE) && !defined(MONGOC_COMPILATION)
+#error "Only <mongoc/mongoc.h> can be included directly."
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-rand.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-rand.h
new file mode 100644
index 0000000..c64d34a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-rand.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_RAND_H
+#define MONGOC_RAND_H
+
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (void)
+mongoc_rand_seed (const void *buf, int num);
+MONGOC_EXPORT (void)
+mongoc_rand_add (const void *buf, int num, double entropy);
+MONGOC_EXPORT (int)
+mongoc_rand_status (void);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_RAND_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-read-concern.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-read-concern.h
new file mode 100644
index 0000000..ab4cb0a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-read-concern.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_READ_CONCERN_H
+#define MONGOC_READ_CONCERN_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_READ_CONCERN_LEVEL_AVAILABLE "available"
+#define MONGOC_READ_CONCERN_LEVEL_LOCAL "local"
+#define MONGOC_READ_CONCERN_LEVEL_MAJORITY "majority"
+#define MONGOC_READ_CONCERN_LEVEL_LINEARIZABLE "linearizable"
+#define MONGOC_READ_CONCERN_LEVEL_SNAPSHOT "snapshot"
+
+typedef struct _mongoc_read_concern_t mongoc_read_concern_t;
+
+
+MONGOC_EXPORT (mongoc_read_concern_t *)
+mongoc_read_concern_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_read_concern_t *)
+mongoc_read_concern_copy (const mongoc_read_concern_t *read_concern)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_read_concern_destroy (mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (const char *)
+mongoc_read_concern_get_level (const mongoc_read_concern_t *read_concern);
+MONGOC_EXPORT (bool)
+mongoc_read_concern_set_level (mongoc_read_concern_t *read_concern,
+                               const char *level);
+MONGOC_EXPORT (bool)
+mongoc_read_concern_append (mongoc_read_concern_t *read_concern, bson_t *doc);
+MONGOC_EXPORT (bool)
+mongoc_read_concern_is_default (const mongoc_read_concern_t *read_concern);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_READ_CONCERN_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-read-prefs.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-read-prefs.h
new file mode 100644
index 0000000..c378adb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-read-prefs.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_READ_PREFS_H
+#define MONGOC_READ_PREFS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-config.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_NO_MAX_STALENESS -1
+#define MONGOC_SMALLEST_MAX_STALENESS_SECONDS 90
+
+typedef struct _mongoc_read_prefs_t mongoc_read_prefs_t;
+
+
+typedef enum {
+   /** Represents $readPreference.mode of 'primary' */
+   MONGOC_READ_PRIMARY = (1 << 0),
+   /** Represents $readPreference.mode of 'secondary' */
+   MONGOC_READ_SECONDARY = (1 << 1),
+   /** Represents $readPreference.mode of 'primaryPreferred' */
+   MONGOC_READ_PRIMARY_PREFERRED = (1 << 2) | MONGOC_READ_PRIMARY,
+   /** Represents $readPreference.mode of 'secondaryPreferred' */
+   MONGOC_READ_SECONDARY_PREFERRED = (1 << 2) | MONGOC_READ_SECONDARY,
+   /** Represents $readPreference.mode of 'nearest' */
+   MONGOC_READ_NEAREST = (1 << 3) | MONGOC_READ_SECONDARY,
+} mongoc_read_mode_t;
+
+
+MONGOC_EXPORT (mongoc_read_prefs_t *)
+mongoc_read_prefs_new (mongoc_read_mode_t read_mode)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_read_prefs_t *)
+mongoc_read_prefs_copy (const mongoc_read_prefs_t *read_prefs)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_read_prefs_destroy (mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (mongoc_read_mode_t)
+mongoc_read_prefs_get_mode (const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_mode (mongoc_read_prefs_t *read_prefs,
+                            mongoc_read_mode_t mode);
+MONGOC_EXPORT (const bson_t *)
+mongoc_read_prefs_get_tags (const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_tags (mongoc_read_prefs_t *read_prefs,
+                            const bson_t *tags);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_add_tag (mongoc_read_prefs_t *read_prefs, const bson_t *tag);
+MONGOC_EXPORT (int64_t)
+mongoc_read_prefs_get_max_staleness_seconds (
+   const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_max_staleness_seconds (mongoc_read_prefs_t *read_prefs,
+                                             int64_t max_staleness_seconds);
+MONGOC_EXPORT (const bson_t *)
+mongoc_read_prefs_get_hedge (const mongoc_read_prefs_t *read_prefs);
+MONGOC_EXPORT (void)
+mongoc_read_prefs_set_hedge (mongoc_read_prefs_t *read_prefs,
+                             const bson_t *hedge);
+MONGOC_EXPORT (bool)
+mongoc_read_prefs_is_valid (const mongoc_read_prefs_t *read_prefs);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_READ_PREFS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-server-api.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-server-api.h
new file mode 100644
index 0000000..a0e3f37
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-server-api.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SERVER_API_H
+#define MONGOC_SERVER_API_H
+
+#include <bson/bson.h>
+
+#include "mongoc-optional.h"
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+typedef enum { MONGOC_SERVER_API_V1 } mongoc_server_api_version_t;
+
+typedef struct _mongoc_server_api_t mongoc_server_api_t;
+
+MONGOC_EXPORT (const char *)
+mongoc_server_api_version_to_string (mongoc_server_api_version_t version);
+
+MONGOC_EXPORT (bool)
+mongoc_server_api_version_from_string (const char *version,
+                                       mongoc_server_api_version_t *out);
+
+MONGOC_EXPORT (mongoc_server_api_t *)
+mongoc_server_api_new (mongoc_server_api_version_t version)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (mongoc_server_api_t *)
+mongoc_server_api_copy (const mongoc_server_api_t *api)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (void)
+mongoc_server_api_destroy (mongoc_server_api_t *api);
+
+MONGOC_EXPORT (void)
+mongoc_server_api_strict (mongoc_server_api_t *api, bool strict);
+
+MONGOC_EXPORT (void)
+mongoc_server_api_deprecation_errors (mongoc_server_api_t *api,
+                                      bool deprecation_errors);
+
+MONGOC_EXPORT (const mongoc_optional_t *)
+mongoc_server_api_get_deprecation_errors (const mongoc_server_api_t *api);
+
+MONGOC_EXPORT (const mongoc_optional_t *)
+mongoc_server_api_get_strict (const mongoc_server_api_t *api);
+
+MONGOC_EXPORT (mongoc_server_api_version_t)
+mongoc_server_api_get_version (const mongoc_server_api_t *api);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_SERVER_API_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-server-description.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-server-description.h
new file mode 100644
index 0000000..79ab4af
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-server-description.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SERVER_DESCRIPTION_H
+#define MONGOC_SERVER_DESCRIPTION_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-host-list.h"
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_server_description_t mongoc_server_description_t;
+
+MONGOC_EXPORT (void)
+mongoc_server_description_destroy (mongoc_server_description_t *description);
+
+MONGOC_EXPORT (mongoc_server_description_t *)
+mongoc_server_description_new_copy (
+   const mongoc_server_description_t *description) BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (uint32_t)
+mongoc_server_description_id (const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (mongoc_host_list_t *)
+mongoc_server_description_host (const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (int64_t)
+mongoc_server_description_last_update_time (
+   const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (int64_t)
+mongoc_server_description_round_trip_time (
+   const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (const char *)
+mongoc_server_description_type (const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_server_description_hello_response (
+   const mongoc_server_description_t *description);
+
+MONGOC_EXPORT (const bson_t *)
+mongoc_server_description_ismaster (
+   const mongoc_server_description_t *description)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_server_description_hello_response);
+
+MONGOC_EXPORT (int32_t)
+mongoc_server_description_compressor_id (
+   const mongoc_server_description_t *description);
+
+BSON_END_DECLS
+
+#endif
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-socket.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-socket.h
new file mode 100644
index 0000000..44be989
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-socket.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SOCKET_H
+#define MONGOC_SOCKET_H
+
+#include <bson/bson.h>
+#include "mongoc-macros.h"
+#include "mongoc-config.h"
+
+#ifdef _WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <arpa/inet.h>
+#include <poll.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+#include <sys/un.h>
+#endif
+
+#if defined(_AIX) && !defined(MONGOC_HAVE_SS_FAMILY)
+#define ss_family __ss_family
+#endif
+
+#include "mongoc-iovec.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef MONGOC_SOCKET_ARG3 mongoc_socklen_t;
+
+typedef struct _mongoc_socket_t mongoc_socket_t;
+
+typedef struct {
+   mongoc_socket_t *socket;
+   int events;
+   int revents;
+} mongoc_socket_poll_t;
+
+MONGOC_EXPORT (mongoc_socket_t *)
+mongoc_socket_accept (mongoc_socket_t *sock,
+                      int64_t expire_at) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (int)
+mongoc_socket_bind (mongoc_socket_t *sock,
+                    const struct sockaddr *addr,
+                    mongoc_socklen_t addrlen);
+MONGOC_EXPORT (int)
+mongoc_socket_close (mongoc_socket_t *socket);
+MONGOC_EXPORT (int)
+mongoc_socket_connect (mongoc_socket_t *sock,
+                       const struct sockaddr *addr,
+                       mongoc_socklen_t addrlen,
+                       int64_t expire_at);
+MONGOC_EXPORT (char *)
+mongoc_socket_getnameinfo (mongoc_socket_t *sock) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_socket_destroy (mongoc_socket_t *sock);
+MONGOC_EXPORT (int)
+mongoc_socket_errno (mongoc_socket_t *sock);
+MONGOC_EXPORT (int)
+mongoc_socket_getsockname (mongoc_socket_t *sock,
+                           struct sockaddr *addr,
+                           mongoc_socklen_t *addrlen);
+MONGOC_EXPORT (int)
+mongoc_socket_listen (mongoc_socket_t *sock, unsigned int backlog);
+MONGOC_EXPORT (mongoc_socket_t *)
+mongoc_socket_new (int domain,
+                   int type,
+                   int protocol) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_recv (mongoc_socket_t *sock,
+                    void *buf,
+                    size_t buflen,
+                    int flags,
+                    int64_t expire_at);
+MONGOC_EXPORT (int)
+mongoc_socket_setsockopt (mongoc_socket_t *sock,
+                          int level,
+                          int optname,
+                          const void *optval,
+                          mongoc_socklen_t optlen);
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_send (mongoc_socket_t *sock,
+                    const void *buf,
+                    size_t buflen,
+                    int64_t expire_at);
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_sendv (mongoc_socket_t *sock,
+                     mongoc_iovec_t *iov,
+                     size_t iovcnt,
+                     int64_t expire_at);
+MONGOC_EXPORT (bool)
+mongoc_socket_check_closed (mongoc_socket_t *sock);
+MONGOC_EXPORT (void)
+mongoc_socket_inet_ntop (struct addrinfo *rp, char *buf, size_t buflen);
+MONGOC_EXPORT (ssize_t)
+mongoc_socket_poll (mongoc_socket_poll_t *sds, size_t nsds, int32_t timeout);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_SOCKET_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-ssl.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-ssl.h
new file mode 100644
index 0000000..26347ef
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-ssl.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_SSL_H
+#define MONGOC_SSL_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_ssl_opt_t mongoc_ssl_opt_t;
+
+
+struct _mongoc_ssl_opt_t {
+   const char *pem_file;
+   const char *pem_pwd;
+   const char *ca_file;
+   const char *ca_dir;
+   const char *crl_file;
+   bool weak_cert_validation;
+   bool allow_invalid_hostname;
+   void *internal;
+   void *padding[6];
+};
+
+
+MONGOC_EXPORT (const mongoc_ssl_opt_t *)
+mongoc_ssl_opt_get_default (void) BSON_GNUC_PURE;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_SSL_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-buffered.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-buffered.h
new file mode 100644
index 0000000..8fc82a2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-buffered.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_BUFFERED_H
+#define MONGOC_STREAM_BUFFERED_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_buffered_new (mongoc_stream_t *base_stream,
+                        size_t buffer_size) BSON_GNUC_WARN_UNUSED_RESULT;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_BUFFERED_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-file.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-file.h
new file mode 100644
index 0000000..8887e11
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-file.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_FILE_H
+#define MONGOC_STREAM_FILE_H
+
+#include "mongoc-macros.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_stream_file_t mongoc_stream_file_t;
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_file_new (int fd) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_file_new_for_path (const char *path,
+                                 int flags,
+                                 int mode) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (int)
+mongoc_stream_file_get_fd (mongoc_stream_file_t *stream);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_FILE_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-gridfs.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-gridfs.h
new file mode 100644
index 0000000..9513f93
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-gridfs.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013 MongoDB Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_GRIDFS_H
+#define MONGOC_STREAM_GRIDFS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-gridfs.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_gridfs_new (mongoc_gridfs_file_t *file)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_GRIDFS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-socket.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-socket.h
new file mode 100644
index 0000000..8f1671f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-socket.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_SOCKET_H
+#define MONGOC_STREAM_SOCKET_H
+
+#include "mongoc-macros.h"
+#include "mongoc-socket.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_stream_socket_t mongoc_stream_socket_t;
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_socket_new (mongoc_socket_t *socket) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_socket_t *)
+mongoc_stream_socket_get_socket (mongoc_stream_socket_t *stream);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_SOCKET_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls-libressl.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls-libressl.h
new file mode 100644
index 0000000..ca70a95
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls-libressl.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_TLS_LIBRESSL_H
+#define MONGOC_STREAM_TLS_LIBRESSL_H
+
+#ifdef MONGOC_ENABLE_SSL_LIBRESSL
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_libressl_new (mongoc_stream_t *base_stream,
+                                const char *host,
+                                mongoc_ssl_opt_t *opt,
+                                int client) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_ENABLE_SSL_LIBRESSL */
+#endif /* MONGOC_STREAM_TLS_LIBRESSL_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls-openssl.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls-openssl.h
new file mode 100644
index 0000000..2ddf8a6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls-openssl.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2016 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_TLS_OPENSSL_H
+#define MONGOC_STREAM_TLS_OPENSSL_H
+
+#ifdef MONGOC_ENABLE_SSL_OPENSSL
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_openssl_new (mongoc_stream_t *base_stream,
+                               const char *host,
+                               mongoc_ssl_opt_t *opt,
+                               int client) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_ENABLE_SSL_OPENSSL */
+#endif /* MONGOC_STREAM_TLS_OPENSSL_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls.h
new file mode 100644
index 0000000..3d41f3e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream-tls.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_TLS_H
+#define MONGOC_STREAM_TLS_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-ssl.h"
+#include "mongoc-stream.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_stream_tls_t mongoc_stream_tls_t;
+
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_handshake (mongoc_stream_t *stream,
+                             const char *host,
+                             int32_t timeout_msec,
+                             int *events,
+                             bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_handshake_block (mongoc_stream_t *stream,
+                                   const char *host,
+                                   int32_t timeout_msec,
+                                   bson_error_t *error);
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_do_handshake (mongoc_stream_t *stream, int32_t timeout_msec)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_stream_tls_handshake);
+MONGOC_EXPORT (bool)
+mongoc_stream_tls_check_cert (mongoc_stream_t *stream, const char *host)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_stream_tls_handshake);
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_new_with_hostname (mongoc_stream_t *base_stream,
+                                     const char *host,
+                                     mongoc_ssl_opt_t *opt,
+                                     int client) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_tls_new (mongoc_stream_t *base_stream,
+                       mongoc_ssl_opt_t *opt,
+                       int client) BSON_GNUC_WARN_UNUSED_RESULT
+   BSON_GNUC_DEPRECATED_FOR (mongoc_stream_tls_new_with_hostname);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_TLS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream.h
new file mode 100644
index 0000000..402fc50
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-stream.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2013-2014 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_STREAM_H
+#define MONGOC_STREAM_H
+
+#include "mongoc-macros.h"
+#include "mongoc-iovec.h"
+#include "mongoc-socket.h"
+
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_stream_t mongoc_stream_t;
+
+typedef struct _mongoc_stream_poll_t {
+   mongoc_stream_t *stream;
+   int events;
+   int revents;
+} mongoc_stream_poll_t;
+
+struct _mongoc_stream_t {
+   int type;
+   void (*destroy) (mongoc_stream_t *stream);
+   int (*close) (mongoc_stream_t *stream);
+   int (*flush) (mongoc_stream_t *stream);
+   ssize_t (*writev) (mongoc_stream_t *stream,
+                      mongoc_iovec_t *iov,
+                      size_t iovcnt,
+                      int32_t timeout_msec);
+   ssize_t (*readv) (mongoc_stream_t *stream,
+                     mongoc_iovec_t *iov,
+                     size_t iovcnt,
+                     size_t min_bytes,
+                     int32_t timeout_msec);
+   int (*setsockopt) (mongoc_stream_t *stream,
+                      int level,
+                      int optname,
+                      void *optval,
+                      mongoc_socklen_t optlen);
+   mongoc_stream_t *(*get_base_stream) (mongoc_stream_t *stream);
+   bool (*check_closed) (mongoc_stream_t *stream);
+   ssize_t (*poll) (mongoc_stream_poll_t *streams,
+                    size_t nstreams,
+                    int32_t timeout);
+   void (*failed) (mongoc_stream_t *stream);
+   bool (*timed_out) (mongoc_stream_t *stream);
+   bool (*should_retry) (mongoc_stream_t *stream);
+   void *padding[3];
+};
+
+
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_get_base_stream (mongoc_stream_t *stream);
+MONGOC_EXPORT (mongoc_stream_t *)
+mongoc_stream_get_tls_stream (mongoc_stream_t *stream);
+MONGOC_EXPORT (int)
+mongoc_stream_close (mongoc_stream_t *stream);
+MONGOC_EXPORT (void)
+mongoc_stream_destroy (mongoc_stream_t *stream);
+MONGOC_EXPORT (void)
+mongoc_stream_failed (mongoc_stream_t *stream);
+MONGOC_EXPORT (int)
+mongoc_stream_flush (mongoc_stream_t *stream);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_writev (mongoc_stream_t *stream,
+                      mongoc_iovec_t *iov,
+                      size_t iovcnt,
+                      int32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_write (mongoc_stream_t *stream,
+                     void *buf,
+                     size_t count,
+                     int32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_readv (mongoc_stream_t *stream,
+                     mongoc_iovec_t *iov,
+                     size_t iovcnt,
+                     size_t min_bytes,
+                     int32_t timeout_msec);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_read (mongoc_stream_t *stream,
+                    void *buf,
+                    size_t count,
+                    size_t min_bytes,
+                    int32_t timeout_msec);
+MONGOC_EXPORT (int)
+mongoc_stream_setsockopt (mongoc_stream_t *stream,
+                          int level,
+                          int optname,
+                          void *optval,
+                          mongoc_socklen_t optlen);
+MONGOC_EXPORT (bool)
+mongoc_stream_check_closed (mongoc_stream_t *stream);
+MONGOC_EXPORT (bool)
+mongoc_stream_timed_out (mongoc_stream_t *stream);
+MONGOC_EXPORT (bool)
+mongoc_stream_should_retry (mongoc_stream_t *stream);
+MONGOC_EXPORT (ssize_t)
+mongoc_stream_poll (mongoc_stream_poll_t *streams,
+                    size_t nstreams,
+                    int32_t timeout);
+
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_STREAM_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-topology-description.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-topology-description.h
new file mode 100644
index 0000000..75b7fbc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-topology-description.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_TOPOLOGY_DESCRIPTION_H
+#define MONGOC_TOPOLOGY_DESCRIPTION_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-read-prefs.h"
+
+
+BSON_BEGIN_DECLS
+
+typedef struct _mongoc_topology_description_t mongoc_topology_description_t;
+
+MONGOC_EXPORT (void)
+mongoc_topology_description_destroy (
+   mongoc_topology_description_t *description);
+
+MONGOC_EXPORT (mongoc_topology_description_t *)
+mongoc_topology_description_new_copy (
+   const mongoc_topology_description_t *description)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+
+MONGOC_EXPORT (bool)
+mongoc_topology_description_has_readable_server (
+   const mongoc_topology_description_t *td, const mongoc_read_prefs_t *prefs);
+
+MONGOC_EXPORT (bool)
+mongoc_topology_description_has_writable_server (
+   const mongoc_topology_description_t *td);
+
+MONGOC_EXPORT (const char *)
+mongoc_topology_description_type (const mongoc_topology_description_t *td);
+
+MONGOC_EXPORT (mongoc_server_description_t **)
+mongoc_topology_description_get_servers (
+   const mongoc_topology_description_t *td,
+   size_t *n) BSON_GNUC_WARN_UNUSED_RESULT;
+
+BSON_END_DECLS
+
+#endif /* MONGOC_TOPOLOGY_DESCRIPTION_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-uri.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-uri.h
new file mode 100644
index 0000000..183c42d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-uri.h
@@ -0,0 +1,232 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_URI_H
+#define MONGOC_URI_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+#include "mongoc-host-list.h"
+#include "mongoc-read-prefs.h"
+#include "mongoc-read-concern.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-config.h"
+
+
+#ifndef MONGOC_DEFAULT_PORT
+#define MONGOC_DEFAULT_PORT 27017
+#endif
+
+#define MONGOC_URI_APPNAME "appname"
+#define MONGOC_URI_AUTHMECHANISM "authmechanism"
+#define MONGOC_URI_AUTHMECHANISMPROPERTIES "authmechanismproperties"
+#define MONGOC_URI_AUTHSOURCE "authsource"
+#define MONGOC_URI_CANONICALIZEHOSTNAME "canonicalizehostname"
+#define MONGOC_URI_CONNECTTIMEOUTMS "connecttimeoutms"
+#define MONGOC_URI_COMPRESSORS "compressors"
+#define MONGOC_URI_DIRECTCONNECTION "directconnection"
+#define MONGOC_URI_GSSAPISERVICENAME "gssapiservicename"
+#define MONGOC_URI_HEARTBEATFREQUENCYMS "heartbeatfrequencyms"
+#define MONGOC_URI_JOURNAL "journal"
+#define MONGOC_URI_LOADBALANCED "loadbalanced"
+#define MONGOC_URI_LOCALTHRESHOLDMS "localthresholdms"
+#define MONGOC_URI_MAXIDLETIMEMS "maxidletimems"
+#define MONGOC_URI_MAXPOOLSIZE "maxpoolsize"
+#define MONGOC_URI_MAXSTALENESSSECONDS "maxstalenessseconds"
+#define MONGOC_URI_MINPOOLSIZE "minpoolsize"
+#define MONGOC_URI_READCONCERNLEVEL "readconcernlevel"
+#define MONGOC_URI_READPREFERENCE "readpreference"
+#define MONGOC_URI_READPREFERENCETAGS "readpreferencetags"
+#define MONGOC_URI_REPLICASET "replicaset"
+#define MONGOC_URI_RETRYREADS "retryreads"
+#define MONGOC_URI_RETRYWRITES "retrywrites"
+#define MONGOC_URI_SAFE "safe"
+#define MONGOC_URI_SERVERSELECTIONTIMEOUTMS "serverselectiontimeoutms"
+#define MONGOC_URI_SERVERSELECTIONTRYONCE "serverselectiontryonce"
+#define MONGOC_URI_SLAVEOK "slaveok"
+#define MONGOC_URI_SOCKETCHECKINTERVALMS "socketcheckintervalms"
+#define MONGOC_URI_SOCKETTIMEOUTMS "sockettimeoutms"
+#define MONGOC_URI_SRVSERVICENAME "srvservicename"
+#define MONGOC_URI_SRVMAXHOSTS "srvmaxhosts"
+#define MONGOC_URI_TLS "tls"
+#define MONGOC_URI_TLSCERTIFICATEKEYFILE "tlscertificatekeyfile"
+#define MONGOC_URI_TLSCERTIFICATEKEYFILEPASSWORD "tlscertificatekeyfilepassword"
+#define MONGOC_URI_TLSCAFILE "tlscafile"
+#define MONGOC_URI_TLSALLOWINVALIDCERTIFICATES "tlsallowinvalidcertificates"
+#define MONGOC_URI_TLSALLOWINVALIDHOSTNAMES "tlsallowinvalidhostnames"
+#define MONGOC_URI_TLSINSECURE "tlsinsecure"
+#define MONGOC_URI_TLSDISABLECERTIFICATEREVOCATIONCHECK \
+   "tlsdisablecertificaterevocationcheck"
+#define MONGOC_URI_TLSDISABLEOCSPENDPOINTCHECK "tlsdisableocspendpointcheck"
+#define MONGOC_URI_W "w"
+#define MONGOC_URI_WAITQUEUEMULTIPLE "waitqueuemultiple"
+#define MONGOC_URI_WAITQUEUETIMEOUTMS "waitqueuetimeoutms"
+#define MONGOC_URI_WTIMEOUTMS "wtimeoutms"
+#define MONGOC_URI_ZLIBCOMPRESSIONLEVEL "zlibcompressionlevel"
+
+/* Deprecated in MongoDB 4.2, use "tls" variants instead. */
+#define MONGOC_URI_SSL "ssl"
+#define MONGOC_URI_SSLCLIENTCERTIFICATEKEYFILE "sslclientcertificatekeyfile"
+#define MONGOC_URI_SSLCLIENTCERTIFICATEKEYPASSWORD \
+   "sslclientcertificatekeypassword"
+#define MONGOC_URI_SSLCERTIFICATEAUTHORITYFILE "sslcertificateauthorityfile"
+#define MONGOC_URI_SSLALLOWINVALIDCERTIFICATES "sslallowinvalidcertificates"
+#define MONGOC_URI_SSLALLOWINVALIDHOSTNAMES "sslallowinvalidhostnames"
+
+BSON_BEGIN_DECLS
+
+
+typedef struct _mongoc_uri_t mongoc_uri_t;
+
+
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_copy (const mongoc_uri_t *uri) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_uri_destroy (mongoc_uri_t *uri);
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_new (const char *uri_string) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_new_with_error (const char *uri_string,
+                           bson_error_t *error) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_uri_t *)
+mongoc_uri_new_for_host_port (const char *hostname,
+                              uint16_t port) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_host_list_t *)
+mongoc_uri_get_hosts (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_service (const mongoc_uri_t *uri)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_uri_get_srv_hostname);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_srv_hostname (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_srv_service_name (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_database (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_database (mongoc_uri_t *uri, const char *database);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_compressors (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_options (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_password (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_password (mongoc_uri_t *uri, const char *password);
+MONGOC_EXPORT (bool)
+mongoc_uri_has_option (const mongoc_uri_t *uri, const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_int32 (const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_int64 (const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_bool (const char *key);
+MONGOC_EXPORT (bool)
+mongoc_uri_option_is_utf8 (const char *key);
+MONGOC_EXPORT (int32_t)
+mongoc_uri_get_option_as_int32 (const mongoc_uri_t *uri,
+                                const char *option,
+                                int32_t fallback);
+MONGOC_EXPORT (int64_t)
+mongoc_uri_get_option_as_int64 (const mongoc_uri_t *uri,
+                                const char *option,
+                                int64_t fallback);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_option_as_bool (const mongoc_uri_t *uri,
+                               const char *option,
+                               bool fallback);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_option_as_utf8 (const mongoc_uri_t *uri,
+                               const char *option,
+                               const char *fallback);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_int32 (mongoc_uri_t *uri,
+                                const char *option,
+                                int32_t value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_int64 (mongoc_uri_t *uri,
+                                const char *option,
+                                int64_t value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_bool (mongoc_uri_t *uri,
+                               const char *option,
+                               bool value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_option_as_utf8 (mongoc_uri_t *uri,
+                               const char *option,
+                               const char *value);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_read_prefs (const mongoc_uri_t *uri)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_uri_get_read_prefs_t);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_replica_set (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_string (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_username (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_username (mongoc_uri_t *uri, const char *username);
+MONGOC_EXPORT (const bson_t *)
+mongoc_uri_get_credentials (const mongoc_uri_t *uri);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_auth_source (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_auth_source (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_appname (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_appname (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_compressors (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (const char *)
+mongoc_uri_get_auth_mechanism (const mongoc_uri_t *uri);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_auth_mechanism (mongoc_uri_t *uri, const char *value);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_mechanism_properties (const mongoc_uri_t *uri,
+                                     bson_t *properties);
+MONGOC_EXPORT (bool)
+mongoc_uri_set_mechanism_properties (mongoc_uri_t *uri,
+                                     const bson_t *properties);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_ssl (const mongoc_uri_t *uri)
+   BSON_GNUC_DEPRECATED_FOR (mongoc_uri_get_tls);
+MONGOC_EXPORT (bool)
+mongoc_uri_get_tls (const mongoc_uri_t *uri);
+MONGOC_EXPORT (char *)
+mongoc_uri_unescape (const char *escaped_string) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (const mongoc_read_prefs_t *)
+mongoc_uri_get_read_prefs_t (const mongoc_uri_t *uri);
+MONGOC_EXPORT (void)
+mongoc_uri_set_read_prefs_t (mongoc_uri_t *uri,
+                             const mongoc_read_prefs_t *prefs);
+MONGOC_EXPORT (const mongoc_write_concern_t *)
+mongoc_uri_get_write_concern (const mongoc_uri_t *uri);
+MONGOC_EXPORT (void)
+mongoc_uri_set_write_concern (mongoc_uri_t *uri,
+                              const mongoc_write_concern_t *wc);
+MONGOC_EXPORT (const mongoc_read_concern_t *)
+mongoc_uri_get_read_concern (const mongoc_uri_t *uri);
+MONGOC_EXPORT (void)
+mongoc_uri_set_read_concern (mongoc_uri_t *uri,
+                             const mongoc_read_concern_t *rc);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_URI_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-version-functions.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-version-functions.h
new file mode 100644
index 0000000..e8311dd
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-version-functions.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2015 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+
+#ifndef MONGOC_VERSION_FUNCTIONS_H
+#define MONGOC_VERSION_FUNCTIONS_H
+
+#include <bson/bson.h> /* for "bool" */
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+MONGOC_EXPORT (int)
+mongoc_get_major_version (void);
+MONGOC_EXPORT (int)
+mongoc_get_minor_version (void);
+MONGOC_EXPORT (int)
+mongoc_get_micro_version (void);
+MONGOC_EXPORT (const char *)
+mongoc_get_version (void);
+MONGOC_EXPORT (bool)
+mongoc_check_version (int required_major,
+                      int required_minor,
+                      int required_micro);
+
+BSON_END_DECLS
+
+#endif /* MONGOC_VERSION_FUNCTIONS_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-version.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-version.h
new file mode 100644
index 0000000..e2b44fb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-version.h
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#if !defined (MONGOC_INSIDE) && !defined (MONGOC_COMPILATION)
+#error "Only <mongoc/mongoc.h> can be included directly."
+#endif
+
+
+#ifndef MONGOC_VERSION_H
+#define MONGOC_VERSION_H
+
+
+/**
+ * MONGOC_MAJOR_VERSION:
+ *
+ * MONGOC major version component (e.g. 1 if %MONGOC_VERSION is 1.2.3)
+ */
+#define MONGOC_MAJOR_VERSION (1)
+
+
+/**
+ * MONGOC_MINOR_VERSION:
+ *
+ * MONGOC minor version component (e.g. 2 if %MONGOC_VERSION is 1.2.3)
+ */
+#define MONGOC_MINOR_VERSION (23)
+
+
+/**
+ * MONGOC_MICRO_VERSION:
+ *
+ * MONGOC micro version component (e.g. 3 if %MONGOC_VERSION is 1.2.3)
+ */
+#define MONGOC_MICRO_VERSION (1)
+
+
+/**
+ * MONGOC_PRERELEASE_VERSION:
+ *
+ * MONGOC prerelease version component (e.g. pre if %MONGOC_VERSION is 1.2.3-pre)
+ */
+#define MONGOC_PRERELEASE_VERSION ()
+
+
+/**
+ * MONGOC_VERSION:
+ *
+ * MONGOC version.
+ */
+#define MONGOC_VERSION (1.23.1)
+
+
+/**
+ * MONGOC_VERSION_S:
+ *
+ * MONGOC version, encoded as a string, useful for printing and
+ * concatenation.
+ */
+#define MONGOC_VERSION_S "1.23.1"
+
+
+/**
+ * MONGOC_VERSION_HEX:
+ *
+ * MONGOC version, encoded as an hexadecimal number, useful for
+ * integer comparisons.
+ */
+#define MONGOC_VERSION_HEX (MONGOC_MAJOR_VERSION << 24 | \
+                          MONGOC_MINOR_VERSION << 16 | \
+                          MONGOC_MICRO_VERSION << 8)
+
+
+/**
+ * MONGOC_CHECK_VERSION:
+ * @major: required major version
+ * @minor: required minor version
+ * @micro: required micro version
+ *
+ * Compile-time version checking. Evaluates to %TRUE if the version
+ * of MONGOC is greater than the required one.
+ */
+#define MONGOC_CHECK_VERSION(major,minor,micro)   \
+        (MONGOC_MAJOR_VERSION > (major) || \
+         (MONGOC_MAJOR_VERSION == (major) && MONGOC_MINOR_VERSION > (minor)) || \
+         (MONGOC_MAJOR_VERSION == (major) && MONGOC_MINOR_VERSION == (minor) && \
+          MONGOC_MICRO_VERSION >= (micro)))
+
+#endif /* MONGOC_VERSION_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-write-concern.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-write-concern.h
new file mode 100644
index 0000000..7961361
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc-write-concern.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "mongoc-prelude.h"
+
+#ifndef MONGOC_WRITE_CONCERN_H
+#define MONGOC_WRITE_CONCERN_H
+
+#include <bson/bson.h>
+
+#include "mongoc-macros.h"
+
+BSON_BEGIN_DECLS
+
+
+#define MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED 0
+#define MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED -1 /* deprecated */
+#define MONGOC_WRITE_CONCERN_W_DEFAULT -2
+#define MONGOC_WRITE_CONCERN_W_MAJORITY -3
+#define MONGOC_WRITE_CONCERN_W_TAG -4
+
+
+typedef struct _mongoc_write_concern_t mongoc_write_concern_t;
+
+
+MONGOC_EXPORT (mongoc_write_concern_t *)
+mongoc_write_concern_new (void) BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (mongoc_write_concern_t *)
+mongoc_write_concern_copy (const mongoc_write_concern_t *write_concern)
+   BSON_GNUC_WARN_UNUSED_RESULT;
+MONGOC_EXPORT (void)
+mongoc_write_concern_destroy (mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_get_fsync (const mongoc_write_concern_t *write_concern)
+   BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_fsync (mongoc_write_concern_t *write_concern,
+                                bool fsync_) BSON_GNUC_DEPRECATED;
+MONGOC_EXPORT (bool)
+mongoc_write_concern_get_journal (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_journal_is_set (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_journal (mongoc_write_concern_t *write_concern,
+                                  bool journal);
+MONGOC_EXPORT (int32_t)
+mongoc_write_concern_get_w (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_w (mongoc_write_concern_t *write_concern, int32_t w);
+MONGOC_EXPORT (const char *)
+mongoc_write_concern_get_wtag (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wtag (mongoc_write_concern_t *write_concern,
+                               const char *tag);
+MONGOC_EXPORT (int32_t)
+mongoc_write_concern_get_wtimeout (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (int64_t)
+mongoc_write_concern_get_wtimeout_int64 (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wtimeout (mongoc_write_concern_t *write_concern,
+                                   int32_t wtimeout_msec);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wtimeout_int64 (mongoc_write_concern_t *write_concern,
+                                         int64_t wtimeout_msec);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_get_wmajority (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (void)
+mongoc_write_concern_set_wmajority (mongoc_write_concern_t *write_concern,
+                                    int32_t wtimeout_msec);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_is_acknowledged (
+   const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_is_valid (const mongoc_write_concern_t *write_concern);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_append (mongoc_write_concern_t *write_concern,
+                             bson_t *doc);
+MONGOC_EXPORT (bool)
+mongoc_write_concern_is_default (const mongoc_write_concern_t *write_concern);
+
+BSON_END_DECLS
+
+
+#endif /* MONGOC_WRITE_CONCERN_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc.h b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc.h
new file mode 100644
index 0000000..24d69e4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/include/libmongoc-1.0/mongoc/mongoc.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013 MongoDB, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef MONGOC_H
+#define MONGOC_H
+
+
+#include <bson/bson.h>
+
+#define MONGOC_INSIDE
+#include "mongoc-macros.h"
+#include "mongoc-apm.h"
+#include "mongoc-bulk-operation.h"
+#include "mongoc-change-stream.h"
+#include "mongoc-client.h"
+#include "mongoc-client-pool.h"
+#include "mongoc-client-side-encryption.h"
+#include "mongoc-collection.h"
+#include "mongoc-config.h"
+#include "mongoc-cursor.h"
+#include "mongoc-database.h"
+#include "mongoc-index.h"
+#include "mongoc-error.h"
+#include "mongoc-flags.h"
+#include "mongoc-gridfs.h"
+#include "mongoc-gridfs-bucket.h"
+#include "mongoc-gridfs-file.h"
+#include "mongoc-gridfs-file-list.h"
+#include "mongoc-gridfs-file-page.h"
+#include "mongoc-host-list.h"
+#include "mongoc-init.h"
+#include "mongoc-matcher.h"
+#include "mongoc-handshake.h"
+#include "mongoc-opcode.h"
+#include "mongoc-log.h"
+#include "mongoc-socket.h"
+#include "mongoc-client-session.h"
+#include "mongoc-stream.h"
+#include "mongoc-stream-buffered.h"
+#include "mongoc-stream-file.h"
+#include "mongoc-stream-gridfs.h"
+#include "mongoc-stream-socket.h"
+#include "mongoc-uri.h"
+#include "mongoc-write-concern.h"
+#include "mongoc-version.h"
+#include "mongoc-version-functions.h"
+#ifdef MONGOC_ENABLE_SSL
+#include "mongoc-rand.h"
+#include "mongoc-stream-tls.h"
+#include "mongoc-ssl.h"
+#endif
+#undef MONGOC_INSIDE
+
+
+#endif /* MONGOC_H */
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/bson-1.0.lib b/Source/ThirdParty/mongodb_c/Win64/lib/bson-1.0.lib
new file mode 100644
index 0000000..c139846
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/bson-1.0.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6d0681b34e7ce3f67dfd72ddc89597a989f0f7270233e72b35a536f0c5f5247
+size 53190
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/bson-static-1.0.lib b/Source/ThirdParty/mongodb_c/Win64/lib/bson-static-1.0.lib
new file mode 100644
index 0000000..513d8ad
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/bson-static-1.0.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44034fe9cbe2dc4b51f6280e7f0925bf531a5183de5fbbc90c9bac09e3c52be9
+size 900630
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-1.0-config-version.cmake
new file mode 100644
index 0000000..861e7b6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-1.0-config-version.cmake
@@ -0,0 +1,48 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "1.23.1")
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  # Package version must be in the requested version range
+  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
+      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  endif()
+else()
+  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-1.0-config.cmake
new file mode 100644
index 0000000..7a41d65
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-1.0-config.cmake
@@ -0,0 +1 @@
+include("${CMAKE_CURRENT_LIST_DIR}/bson-targets.cmake")
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-targets-release.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-targets-release.cmake
new file mode 100644
index 0000000..c43ef1a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-targets-release.cmake
@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::bson_shared" for configuration "Release"
+set_property(TARGET mongo::bson_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bson_shared PROPERTIES
+  IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/bson-1.0.lib"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/bson-1.0.dll"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bson_shared )
+list(APPEND _cmake_import_check_files_for_mongo::bson_shared "${_IMPORT_PREFIX}/lib/bson-1.0.lib" "${_IMPORT_PREFIX}/bin/bson-1.0.dll" )
+
+# Import target "mongo::bson_static" for configuration "Release"
+set_property(TARGET mongo::bson_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bson_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/bson-static-1.0.lib"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bson_static )
+list(APPEND _cmake_import_check_files_for_mongo::bson_static "${_IMPORT_PREFIX}/lib/bson-static-1.0.lib" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-targets.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-targets.cmake
new file mode 100644
index 0000000..e0a9ac3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/bson-1.0/bson-targets.cmake
@@ -0,0 +1,115 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::bson_shared mongo::bson_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::bson_shared
+add_library(mongo::bson_shared SHARED IMPORTED)
+
+set_target_properties(mongo::bson_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libbson-1.0"
+)
+
+# Create imported target mongo::bson_static
+add_library(mongo::bson_static STATIC IMPORTED)
+
+set_target_properties(mongo::bson_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "BSON_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libbson-1.0"
+  INTERFACE_LINK_LIBRARIES "ws2_32"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/bson-targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-1.0/libbson-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-1.0/libbson-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-1.0/libbson-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-1.0/libbson-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-1.0/libbson-1.0-config.cmake
new file mode 100644
index 0000000..cd67dd6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-1.0/libbson-1.0-config.cmake
@@ -0,0 +1,57 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bson_shared' instead.  Consult the example projects for further details.")
+
+set (BSON_MAJOR_VERSION 1)
+set (BSON_MINOR_VERSION 23)
+set (BSON_MICRO_VERSION 1)
+set (BSON_VERSION 1.23.1)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbson-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (BSON_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libbson-1.0")
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# BSON_LIBRARY themselves.
+find_library (BSON_LIBRARY bson-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+
+set (BSON_LIBRARIES ${BSON_LIBRARY})
+
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-static-1.0/libbson-static-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-static-1.0/libbson-static-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-static-1.0/libbson-static-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-static-1.0/libbson-static-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-static-1.0/libbson-static-1.0-config.cmake
new file mode 100644
index 0000000..90353e3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libbson-static-1.0/libbson-static-1.0-config.cmake
@@ -0,0 +1,62 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bson_static' instead.  Consult the example projects for further details.")
+
+set (BSON_STATIC_MAJOR_VERSION 1)
+set (BSON_STATIC_MINOR_VERSION 23)
+set (BSON_STATIC_MICRO_VERSION 1)
+set (BSON_STATIC_VERSION 1.23.1)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbson-static-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (BSON_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libbson-1.0")
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# BSON_STATIC_LIBRARY themselves.
+find_library (BSON_STATIC_LIBRARY bson-static-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+
+set (BSON_STATIC_LIBRARIES ${BSON_STATIC_LIBRARY})
+
+foreach (LIB  ws2_32)
+    list (APPEND BSON_STATIC_LIBRARIES ${LIB})
+endforeach ()
+
+set (BSON_STATIC_DEFINITIONS BSON_STATIC)
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-1.0/libmongoc-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-1.0/libmongoc-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-1.0/libmongoc-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-1.0/libmongoc-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-1.0/libmongoc-1.0-config.cmake
new file mode 100644
index 0000000..a6f6735
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-1.0/libmongoc-1.0-config.cmake
@@ -0,0 +1,79 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongoc_shared' instead.  Consult the example projects for further details.")
+
+set (MONGOC_MAJOR_VERSION 1)
+set (MONGOC_MINOR_VERSION 23)
+set (MONGOC_MICRO_VERSION 1)
+set (MONGOC_VERSION 1.23.1)
+
+find_package (libbson-1.0 "1.23" REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongoc-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (MONGOC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libmongoc-1.0")
+list (APPEND MONGOC_INCLUDE_DIRS ${BSON_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# MONGOC_LIBRARY themselves.
+find_library (MONGOC_LIBRARY mongoc-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set (MONGOC_LIBRARIES ${MONGOC_LIBRARY} ${BSON_LIBRARIES})
+
+# If this file is generated by the Autotools on Mac, SSL_LIBRARIES might be
+# "-framework CoreFoundation -framework Security". Split into a CMake array
+# like "-framework CoreFoundation;-framework Security".
+set (IS_FRAMEWORK_VAR 0)
+foreach (LIB
+   secur32.lib;crypt32.lib;Shlwapi.lib secur32.lib;crypt32.lib;Bcrypt.lib  Dnsapi
+      
+)
+   if (LIB STREQUAL "-framework")
+      set (IS_FRAMEWORK_VAR 1)
+      continue ()
+   elseif (IS_FRAMEWORK_VAR)
+      list (APPEND MONGOC_LIBRARIES "-framework ${LIB}")
+      set (IS_FRAMEWORK_VAR 0)
+   else ()
+      list (APPEND MONGOC_LIBRARIES ${LIB})
+   endif ()
+endforeach ()
+
+set (MONGOC_DEFINITIONS ${BSON_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config-version.cmake
new file mode 100644
index 0000000..87eca86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config-version.cmake
@@ -0,0 +1,27 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set (PACKAGE_VERSION 1.23.1)
+
+if ("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL "1")
+   if ("${PACKAGE_FIND_VERSION_MINOR}" EQUAL "23")
+      set (PACKAGE_VERSION_EXACT TRUE)
+   elseif ("${PACKAGE_FIND_VERSION_MINOR}" LESS "23")
+      set (PACKAGE_VERSION_COMPATIBLE TRUE)
+   else ()
+      set (PACKAGE_VERSION_UNSUITABLE TRUE)
+   endif ()
+elseif (PACKAGE_FIND_VERSION)
+   set (PACKAGE_VERSION_UNSUITABLE TRUE)
+endif ()
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config.cmake
new file mode 100644
index 0000000..03805a5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/libmongoc-static-1.0/libmongoc-static-1.0-config.cmake
@@ -0,0 +1,83 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongoc_static' instead.  Consult the example projects for further details.")
+
+set (MONGOC_STATIC_MAJOR_VERSION 1)
+set (MONGOC_STATIC_MINOR_VERSION 23)
+set (MONGOC_STATIC_MICRO_VERSION 1)
+set (MONGOC_STATIC_VERSION 1.23.1)
+
+find_package (libbson-static-1.0 "1.23" REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongoc-static-1.0-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check (MONGOC_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/libmongoc-1.0")
+list (APPEND MONGOC_STATIC_INCLUDE_DIRS ${BSON_STATIC_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library () to pick that up.  Users can override this by configuring
+# MONGOC_STATIC_LIBRARY themselves.
+find_library (MONGOC_STATIC_LIBRARY mongoc-static-1.0 PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+if (MSVC)
+   set (MONGOC_STATIC_LIB_EXT "lib")
+else ()
+   set (MONGOC_STATIC_LIB_EXT "a")
+endif ()
+set (MONGOC_STATIC_LIBRARIES ${MONGOC_STATIC_LIBRARY} ${ZLIB_STATIC_LIBRARY} ${BSON_STATIC_LIBRARIES})
+
+# If this file is generated by the Autotools on Mac, SSL_LIBRARIES might be
+# "-framework CoreFoundation -framework Security". Split into a CMake array
+# like "-framework CoreFoundation;-framework Security".
+set (IS_FRAMEWORK_VAR 0)
+foreach (LIB secur32.lib;crypt32.lib;Shlwapi.lib secur32.lib;crypt32.lib;Bcrypt.lib  
+    Dnsapi   
+)
+   if (LIB STREQUAL "-framework")
+      set (IS_FRAMEWORK_VAR 1)
+      continue ()
+   elseif (IS_FRAMEWORK_VAR)
+      list (APPEND MONGOC_STATIC_LIBRARIES "-framework ${LIB}")
+      set (IS_FRAMEWORK_VAR 0)
+   else ()
+      list (APPEND MONGOC_STATIC_LIBRARIES ${LIB})
+   endif ()
+endforeach ()
+
+set (MONGOC_STATIC_DEFINITIONS MONGOC_STATIC ${BSON_STATIC_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake
new file mode 100644
index 0000000..861e7b6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake
@@ -0,0 +1,48 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "1.23.1")
+
+if (PACKAGE_FIND_VERSION_RANGE)
+  # Package version must be in the requested version range
+  if ((PACKAGE_FIND_VERSION_RANGE_MIN STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MIN)
+      OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_GREATER PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_GREATER_EQUAL PACKAGE_FIND_VERSION_MAX)))
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  endif()
+else()
+  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+    set(PACKAGE_VERSION_COMPATIBLE FALSE)
+  else()
+    set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake
new file mode 100644
index 0000000..1f4ab76
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake
@@ -0,0 +1,3 @@
+include(CMakeFindDependencyMacro)
+find_dependency(bson-1.0 1.23.1)
+include("${CMAKE_CURRENT_LIST_DIR}/mongoc-targets.cmake")
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-targets-release.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-targets-release.cmake
new file mode 100644
index 0000000..f74fc84
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-targets-release.cmake
@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::mongoc_shared" for configuration "Release"
+set_property(TARGET mongo::mongoc_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongoc_shared PROPERTIES
+  IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/mongoc-1.0.lib"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/mongoc-1.0.dll"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongoc_shared )
+list(APPEND _cmake_import_check_files_for_mongo::mongoc_shared "${_IMPORT_PREFIX}/lib/mongoc-1.0.lib" "${_IMPORT_PREFIX}/bin/mongoc-1.0.dll" )
+
+# Import target "mongo::mongoc_static" for configuration "Release"
+set_property(TARGET mongo::mongoc_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongoc_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "C"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/mongoc-static-1.0.lib"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongoc_static )
+list(APPEND _cmake_import_check_files_for_mongo::mongoc_static "${_IMPORT_PREFIX}/lib/mongoc-static-1.0.lib" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-targets.cmake b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-targets.cmake
new file mode 100644
index 0000000..22968aa
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/cmake/mongoc-1.0/mongoc-targets.cmake
@@ -0,0 +1,132 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::mongoc_shared mongo::mongoc_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::mongoc_shared
+add_library(mongo::mongoc_shared SHARED IMPORTED)
+
+set_target_properties(mongo::mongoc_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libmongoc-1.0"
+  INTERFACE_LINK_LIBRARIES "mongo::bson_shared"
+)
+
+# Create imported target mongo::mongoc_static
+add_library(mongo::mongoc_static STATIC IMPORTED)
+
+set_target_properties(mongo::mongoc_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "MONGOC_STATIC;BSON_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/libmongoc-1.0"
+  INTERFACE_LINK_LIBRARIES "secur32.lib;crypt32.lib;Shlwapi.lib;secur32.lib;crypt32.lib;Bcrypt.lib;Dnsapi;mongo::bson_static"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/mongoc-targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# Make sure the targets which have been exported in some other
+# export set exist.
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+foreach(_target "mongo::bson_shared" "mongo::bson_static" )
+  if(NOT TARGET "${_target}" )
+    set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets "${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets} ${_target}")
+  endif()
+endforeach()
+
+if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+  if(CMAKE_FIND_PACKAGE_NAME)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  else()
+    message(FATAL_ERROR "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  endif()
+endif()
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/mongoc-1.0.lib b/Source/ThirdParty/mongodb_c/Win64/lib/mongoc-1.0.lib
new file mode 100644
index 0000000..1bcc0ce
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/mongoc-1.0.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89aad712f17c5c2049668c41300527040b0c209bdafda627373cc6fa9d4ef7b5
+size 181614
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/mongoc-static-1.0.lib b/Source/ThirdParty/mongodb_c/Win64/lib/mongoc-static-1.0.lib
new file mode 100644
index 0000000..01129f3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/mongoc-static-1.0.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f86876f3c3567346d417d5846f102fee6b9e530494d821aad152c29021bdd125
+size 3226288
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libbson-1.0.pc b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libbson-1.0.pc
new file mode 100644
index 0000000..17b8619
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libbson-1.0.pc
@@ -0,0 +1,10 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Win64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libbson
+Description: The libbson BSON serialization library.
+Version: 1.23.1
+Libs: -L${libdir} -lbson-1.0
+Cflags: -I${includedir}/libbson-1.0
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libbson-static-1.0.pc b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libbson-static-1.0.pc
new file mode 100644
index 0000000..48188f0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libbson-static-1.0.pc
@@ -0,0 +1,10 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Win64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libbson static archive
+Description: The libbson BSON serialization library.
+Version: 1.23.1
+Libs: -L${libdir} -lbson-static-1.0  ws2_32
+Cflags: -I${includedir}/libbson-1.0 -DBSON_STATIC
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-1.0.pc b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-1.0.pc
new file mode 100644
index 0000000..bb2d711
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-1.0.pc
@@ -0,0 +1,11 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Win64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libmongoc
+Description: The libmongoc MongoDB client library.
+Version: 1.23.1
+Requires: libbson-1.0
+Libs: -L${libdir} -lmongoc-1.0
+Cflags: -I${includedir}/libmongoc-1.0
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-ssl-1.0.pc b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-ssl-1.0.pc
new file mode 100644
index 0000000..73fd421
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-ssl-1.0.pc
@@ -0,0 +1,11 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Win64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libmongoc-1.0
+Description: SSL support for the libmongoc-1.0 library.
+Version: 1.23.1
+Requires: libmongoc-1.0
+Libs:
+Cflags:
diff --git a/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-static-1.0.pc b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-static-1.0.pc
new file mode 100644
index 0000000..f74fc41
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/lib/pkgconfig/libmongoc-static-1.0.pc
@@ -0,0 +1,11 @@
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_c/Win64
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: libmongoc
+Description: The libmongoc MongoDB client library.
+Version: 1.23.1
+Requires: libbson-static-1.0
+Libs: -L${libdir} -lmongoc-static-1.0  -lsecur32.lib -lcrypt32.lib -lShlwapi.lib -lsecur32.lib -lcrypt32.lib -lBcrypt.lib -lDnsapi
+Cflags: -I${includedir}/libmongoc-1.0 -DMONGOC_STATIC
diff --git a/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/COPYING b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/COPYING
new file mode 100644
index 0000000..f433b1a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/COPYING
@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
diff --git a/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/NEWS b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/NEWS
new file mode 100644
index 0000000..fc3874f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/NEWS
@@ -0,0 +1,3258 @@
+libmongoc 1.23.1
+================
+
+Bug fixes:
+
+  * Fix connectivity to Atlas Data Lake 
+  * Fix crash when dropping a malformed Queryable Encryption collection.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+  * Kevin Albertson
+
+
+
+libmongoc 1.23.0
+================
+
+Features:
+
+  * Add on-demand Credentials Callback for CSFLE
+  * Support obtaining AWS credentials for CSFLE in the same way as for MONGODB-AWS
+
+Improvements:
+
+  * Reducing Warnings of Misaligned Address of Over-Aligned Types
+
+Bug fixes:
+
+  * Do not spawn mongocryptd if mongo_shared shared library is loaded.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Ezra Chung
+  * Colby Pike
+  * Kevin Albertson
+  * Roberto C. Sánchez
+
+
+
+libmongoc 1.22.1
+================
+
+Bug fixes:
+
+  * Fix documentation build when using Sphinx 5.0 or newer
+  * Update patch release of libmongocrypt to 1.5.2: Fix a potential data
+    corruption bug in RewrapManyDataKey when rotating encrypted data encryption
+    keys backed by GCP or Azure key services.
+
+    The following conditions will trigger this bug:
+
+    A GCP-backed or Azure-backed data encryption key being rewrapped requires
+    fetching an access token for decryption of the data encryption key.
+
+    The result of this bug is that the key material for all data encryption keys
+    being rewrapped is replaced by new randomly generated material, destroying
+    the original key material.
+
+    To mitigate potential data corruption, upgrade to this version or higher
+    before using RewrapManyDataKey to rotate Azure-backed or GCP-backed data
+    encryption keys. A backup of the key vault collection should always be taken
+    before key rotation.
+
+Other:
+
+  * Update to Fedora 37 for RPM builds
+  * Dependency build of libmongocrypt re-uses the libbson of the depending
+    libmongoc
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Ezra Chung
+  * Roberto C. Sánchez
+  * Kevin Albertson
+
+
+
+libmongoc 1.21.2
+================
+
+Bug Fixes:
+  * Address vulnerability in bundled zlib by updating to 1.1.12.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Colby Pike
+
+
+
+libmongoc 1.22.0
+================
+
+Bug fixes:
+
+  * Do not auto decrypt before emitting CommandSucceeded events.
+
+Improvements:
+
+  * Use OP_MSG if a server API version is requested.
+
+Features:
+
+  * Add server connectionId to command monitoring events.
+  * Add support for the comment field to all helpers.
+  * Support mongo_shared shared library.
+  * Support pre-point-in-time change stream events.
+  * Support Queryable Encryption.
+  * Support 'let' option for multiple CRUD commands.
+  * Add Key Management API functions.
+
+Notes:
+
+  * The 5.0-compat release (1.18.0) accidentally broke estimatedDocumentCount on views by changing its implementation to use aggregate and a $collStats stage instead of the count command.
+  * The new release is fixing estimatedDocumentCount on views by reverting back to using count in its implementation.
+  * Due to an oversight, the count command was omitted from the Stable API in server versions 5.0.0 - 5.0.8 and 5.1.0 - 5.3.1, so users of the Stable API with estimatedDocumentCount are recommended to upgrade their MongoDB clusters to 5.0.9 or 5.3.2 (if on Atlas) or set apiStrict: false when constructing their MongoClients.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Colby Pike
+  * Ezra Chung
+  * Roberto C. Sánchez
+  * Jake Molnar
+  * Jesse Williamson
+  * Remi Collet
+
+
+
+libmongoc 1.21.1
+================
+
+Bug Fixes:
+  * Use static decls for OpenSSL 1.1 polyfills
+  * Prevent possible crash in _mongoc_cursor_fetch_stream
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Jeremy Mikola
+  * Remi Collet
+
+
+
+libmongoc 1.21.0
+================
+
+Bug Fixes:
+  * Addressed VS 2013 build failures due to missing C99 features.
+
+Features:
+ * Support conditional $merge and $out aggregation on secondaries.
+ * Bump minimum wire protocol version from 3 (MongoDB 3.0) to 6 (MongoDB 3.6).
+ * Bump maximum wire protocol version from 14 (MongoDB 5.1) to 15 (MongODB 5.2).
+
+Improvements:
+ * Update algorithm used for generation of OID values to reduce collisions.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Ezra Chung
+  * Colby Pike
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * David CARLIER
+  * Jeremy Mikola
+
+
+
+libmongoc 1.20.1
+================
+
+Bug fixes:
+
+  * Fix bug where first hello command on a single-threaded client may not include full handshake.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+
+libmongoc 1.20.0
+================
+
+Features:
+
+  * Improve multi-threaded performance of client pool.
+  * Support KMIP as a provider for Client-Side Field Level Encryption (CSFLE).
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Ezra Chung
+  * Colby Pike
+  * Jesse Williamson
+  * Jeremy Mikola
+  * Kaitlin Mahar
+
+mongo-c-driver 1.19.2
+=====================
+
+Announcing libmongoc 1.19.2.
+
+Bug fixes:
+
+* Fix assert on invalid URI options in client pools connected to load balanced clusters when a topology closed callback is registered.
+
+Thanks to everyone who contributed to the development of this release.
+
+--Kevin Albertson
+
+libmongoc 1.19.1
+================
+
+It is my pleasure to announce libmongoc 1.19.1.
+
+Bug fixes:
+
+  * Permit NULL platform argument in mongoc_handshake_data_append.
+  * Fix wire version check in server selection when maxStalenessSeconds is specified in read preferences.
+  * Fix assert on invalid URI options in client pools connected to load balanced clusters.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Ezra Chung
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.19.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.19.0 release.
+This release adds full support for MongoDB 5.0 servers and MongoDB Atlas Serverless Instances.
+
+Features:
+
+  * Add full support to connect to MongoDB Atlas Serverless Instances.
+  * Add support for snapshot reads on a session with mongoc_session_opts_set_snapshot.
+  * Support the new URI option loadBalanced to connect to a MongoDB cluster behind a TCP load balancer.
+
+Bug fixes:
+
+  * Fix the uploadDate set on newly created GridFS files in the mongoc_gridfs_bucket_t API.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Benjamin Rewis
+  * Andreas Braun
+  * Colby Pike
+  * Ezra Chung
+  * Roberto C. Sánchez
+  * Jesse Williamson
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.18.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.18.0 release.
+This release adds partial support for MongoDB 5.0 servers.
+
+Features:
+
+  * Introduces support to select an API version when connecting to a MongoDB instance.
+  * Supports Azure and Google Cloud Platform as Key Management Service (KMS) providers in Client-Side Field Level Encryption (CSFLE).
+  * Support "let" option in aggregate command.
+  * Support time series collections.
+  * Relax validation for insert and replace documents to support fields containing dots and dollars.
+  * Expose the reason operations fail document validation.
+
+Bug fixes:
+
+  * Forward opts from mongoc_gridfs_bucket_find to underlying find operation.
+  * Fixes a possible hang when a limited size client pool is waiting for a client to become available in mongoc_client_pool_pop.
+
+Improvements
+
+  * Deprecate API containing deprecated terminology.
+  * Use "hello" command for monitoring servers.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andreas Braun
+  * Clyde Bazile
+  * Benjamin Rewis
+  * Jeremy Mikola
+  * Andrew Witten
+  * Samantha Ritter
+  * samantharitter
+  * Fermín Galán Márquez
+  * David Carlier
+  * Colby Pike
+  * Josh Weinstein
+  * Pierre Mickael Gonzalo
+
+mongo-c-driver 1.18.0-alpha
+===========================
+
+It is my pleasure to announce the MongoDB C Driver 1.18.0-alpha.
+
+This is an unstable prerelease and is unsuitable for production applications.
+
+Features:
+
+  * Introduces support to select an API version when connecting to a MongoDB instance.
+  * Supports Azure and Google Cloud Platform as Key Management Service (KMS) providers in Client-Side Field Level Encryption (CSFLE)
+
+Bug fixes:
+
+  * Fixes a possible hang when a limited size client pool is waiting for a client to become available in mongoc_client_pool_pop.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Clyde Bazile
+  * Andreas Braun
+  * Andrew Witten
+  * Samantha Ritter
+  * Benjamin Rewis
+  * Fermín Galán Márquez
+  * David Carlier
+  * Josh Weinstein
+  * Pierre Mickael Gonzalo
+
+mongo-c-driver 1.17.7
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.7.
+
+- Print correct error message when DNS resolution fails
+- Mix time to avoid duplicate RAND_bytes for the same PIDs
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+  * Jeremy Mikola
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.17.6
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.6.
+
+Bug fixes:
+
+  * Fix possible crash when speculative authentication fails with network error.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.17.5
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.5.
+
+Improvements:
+
+  * Fix documentation regarding when to call mongoc_log_set_handler
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Clyde Bazile
+  * Fermín Galán Márquez
+
+--Kevin Albertson
+
+
+mongo-c-driver 1.17.4
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.4.
+
+Bug fixes:
+
+  * Fix crash on macOS on client pool shutdown.
+  * Fix spacing in extended JSON output for numberLong.
+  * Clear error in mongoc_collection_find_and_modify_with_opts on a successful retry.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Samantha Ritter
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.3
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.3.
+
+Bug fixes:
+
+  * Do not send session ID on GSSAPI auth commands.
+  * Fix build against zlib when zlib is installed in non-standard location.
+  * Fix build when source directory path contains a space.
+  * Fix a platform-specific bug causing mongoc_client_pool_pop to block indefinitely if all clients are checked out.
+  * Fix a possible buffer overflow with hostnames resolving to IPv6 addresses on OpenSSL.
+
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Roberto C. Sánchez
+  * Kevin Albertson
+  * Andrew Witten
+  * gonzalo
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.2
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.2.
+
+Bug fixes:
+
+  * Stop the SRV polling thread when an SRV URI is used to connect to a deployment other than a sharded cluster.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Roberto C. Sánchez
+  * Kevin Albertson
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.1.
+
+Bug fixes:
+
+  * Fix SRV/TXT record lookup for DNS records exceeding 1024 bytes.
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 release.
+This release adds support for MongoDB 4.4 servers.
+
+Features:
+
+  * Support streamable server monitoring to reduce recovery time when the server topology changes.
+  * Support the MONGODB-AWS authentication mechanism.
+  * Support Online Certificate Status Protocol (OCSP).
+  * Support configuring hedged reads in read preferences.
+  * Reduce the number of round trips necessary for SCRAM and X509 authentication.
+  * Monitor servers in parallel when using a mongoc_client_pool_t instead of doing serial scans.
+  * Support the "hint" option in operations using the update, replace, delete, and findAndModify commands.
+  * Improve behavior for retryable writes.
+  * Improve resuming behavior of change streams on server errors.
+  * Remove restriction of 255 character collection namespaces.
+
+Bug fixes:
+
+  * Fix criteria for resumable errors in change streams.
+  * Fix rare crashes when server is invalidated during authentication.
+  * Reject client session for mongoc_collection_estimated_document_count.
+  * Fix behavior of a SecondaryPreferred read preference for exhaust cursor operations against a sharded cluster. Prior to the fix, a nonzero maxStalenessSeconds would not trigger sending the read preference.
+  * Fix SRV polling. Prior to the fix, SRV polling did not properly apply newly discovered results.
+  * Fix checks for existing GridFS indexes to handle indexes created by the MongoDB shell.
+  * Fix possible use of invalidated streams during an unordered OP_QUERY bulk write, and when ending many pooled sessions at client destruction.
+  * Fix a crash when setting the crl_file TLS option for Secure Channel.
+  * Avoid emitting duplicate ServerChanged events when no change is observed during monitoring.
+  * Properly handle large SASL messages instead of erroring.
+
+Notes:
+
+  * Deprecated "lib" prefixed artifacts are no longer produced when building on Windows.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andrew Witten
+  * Andreas Braun
+  * Clyde Bazile
+  * Josh Weinstein
+
+-- Kevin Albertson
+
+mongo-c-driver 1.17.0 rc0
+=========================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 rc0 release.
+This release adds support for MongoDB 4.4 servers.
+
+Features:
+
+  * Support streamable server monitoring to reduce recovery time when the server topology changes.
+  * Support tlsDisableCertificateRevocationCheck when built with Secure Channel.
+
+Bug fixes:
+
+  * Fix criteria for resumable errors in change streams.
+  * Fix rare crashes when server is invalidated during authentication.
+  * Improve behavior when reaching out to OCSP responders for certificate revocation checking.
+  * Reject client session for mongoc_collection_estimated_document_count.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Andrew Witten
+  * Roberto C. Sánchez
+  * Clyde Bazile
+
+-- Kevin Albertson
+
+mongo-c-driver 1.17.0 beta2
+===========================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 beta2 release.
+
+Features:
+
+  * Support Online Certificate Status Protocol (OCSP) response caching.
+  * Support configuring hedged reads in read preferences.
+  * Reduce the number of round trips necessary for SCRAM and X509 authentication.
+  * Monitor servers in parallel when using a mongoc_client_pool_t instead of doing serial scans.
+  * Support OCSP on older versions of OpenSSL (1.0.1+).
+
+Bug fixes:
+
+  * Fix behavior of a SecondaryPreferred read preference for exhaust cursor operations against a sharded cluster. Prior to the fix, a nonzero maxStalenessSeconds would not trigger sending the read preference.
+  * Fix SRV polling. Prior to the fix, SRV polling did not properly apply newly discovered results.
+  * Fix checks for existing GridFS indexes to handle indexes created by the MongoDB shell.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andreas Braun
+  * Clyde Bazile
+  * Josh Weinstein
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.17.0 beta
+==========================
+
+It is my pleasure to announce the MongoDB C Driver 1.17.0 beta release.
+
+Features:
+
+  * Support the MONGODB-AWS authentication mechanism.
+  * Support the Online Certificate Status Protocol (OCSP) for OpenSSL 1.1.0+, Secure Transport, and Secure Channel.
+  * Support the "hint" option in operations using the update, replace, delete, and findAndModify commands.
+  * Improve behavior for retryable writes.
+  * Improve resuming behavior of change streams on server errors.
+  * Remove an extra round trip for SCRAM authentication.
+  * Remove restriction of 255 character collection namespaces.
+
+Bug fixes:
+
+  * Fix possible use of invalidated streams during an unordered OP_QUERY bulk write, and when ending many pooled sessions at client destruction.
+  * Fix a crash when setting the crl_file TLS option for Secure Channel.
+  * Avoid emitting duplicate ServerChanged events when no change is observed during monitoring.
+  * Properly handle large SASL messages instead of erroring.
+
+Notes:
+
+  * Deprecated "lib" prefixed artifacts are no longer produced when building on Windows.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Andreas Braun
+  * Clyde Bazile
+  * Jeremy Mikola
+  * Sara Golemon
+
+-- Kevin Albertson
+
+
+mongo-c-driver 1.16.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.16.1.
+
+Bug fixes:
+
+  * Fix listed library dependency on mongoc_static target when building with libmongocrypt.
+  * Replace a call of free to bson_free.
+  * Vendor Sphinx basic theme and correctly list static files for docs.
+  * Fix a compilation warning introduced in 1.16.0.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.16.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.16.0.
+
+Features:
+
+  * Support Client-side Field Level Encryption.
+  * Support ability to pass an index hint to update operations.
+  * Add cmake export targets.
+
+Bug fixes:
+  * Fix a bug with Windows SSPI failing to authenticate with GSSAPI when using
+    pooled clients for certain operations.
+  * Fix behavior for bulk writes that retry to keep track of the successful server.
+  * Remove hard limit of 1024 characters for SRV response.
+  * Fix racy crash when using client pool against a sharded cluster if a server is invalidated shortly before a new socket is opened against it.
+  * Remove unnecessary library dependencies causing overlinking.
+  * Ensure server proof has been validated during SCRAM conversation.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Clyde Bazile
+  * Andreas Braun
+  * Roberto C. Sánchez
+  * Samantha Ritter
+  * Isabel Atkinson
+  * Kaitlin Mahar
+  * Diego Barrios Romero
+  * Sara Golemon
+  * Vasil Velichkov
+  * EGuesnet
+
+Peace,
+
+    Kevin Albertson
+
+mongo-c-driver 1.15.3
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.3.
+
+Bug fixes:
+    * Fix a hang on macOS when connecting to a server over TLS
+    * Add zstd as a dependency when libmongoc static library is compiled with zstd support
+    * Fix compilation on AIX 6.1
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Samantha Ritter
+  * EGuesnet
+
+mongo-c-driver 1.15.2
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.2.
+
+Bug fixes:
+   * Prevent mongoc_transaction_opts_set_max_commit_time_ms from applying to subsequent transactions that should be using the default.
+   * Do not report the initial error if a retry for a change stream function (mongoc_collection_watch, mongoc_database_watch, or mongoc_client_watch) succeeds
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Andreas Braun
+  * Clyde Bazile
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.15.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.1.
+
+Bug fixes:
+   * Fix change stream resume logic when no documents received
+   * Reduce the required cmake version to build with zstd support
+   * Minor fixes to mongos pinning logic
+   * Do not resume a change stream on NonResumableChangeStreamError
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Clyde Bazile
+
+Peace,
+
+    Clyde Bazile
+
+mongo-c-driver 1.15.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.15.0. This release adds
+support for MongoDB 4.2 features.
+
+Features:
+
+  * Support for sharded transactions on MongoDB sharded clusters 4.2+.
+  * Add convenient transaction runner (mongoc_client_session_with_transaction),
+    which accepts a callback and performs appropriate retry logic.
+  * Add a new transaction option to specify maximum time to wait for a commit,
+    mongoc_transaction_opts_set_max_commit_time_ms.
+  * Add URI option "retryReads=true" safely and automatically retries certain
+    read operations if the server is a MongoDB 3.6+.
+  * Poll SRV records to mongos servers periodically.
+  * Keep connections alive after a primary stepdown detected.
+  * Standardizes URI options supported across all spec-compliant MongoDB drivers.
+  * "retryWrites" URI option now defaults to true (requires crypto for session
+    support).
+  * Send any aggregate with $out or $merge stage to a primary.
+  * Add the ability to specify an aggregate pipeline as an update document.
+  * Add a database aggregate helper, mongoc_database_aggregate.
+  * Add option for change streams, "startAfter".
+  * Add mongoc_change_stream_get_resume_token, which returns the resume token
+    which should be used to resume a change stream.
+  * Add support for zstd compression.
+
+Bug fixes:
+  * Correctly report an error in mongoc_change_stream_next if the resume token
+    (_id) is not a document. Previously, an error was only reported if the
+    field was missing.
+  * Fix mongoc_collection_update with MONGOC_UPDATE_MULTI_UPDATE,
+    mongoc_collection_remove, and mongoc_collection_delete when retryWrites
+    was enabled. They would fail previously.
+  * Command options are now correctly taken into account when batching bulk
+    writes for OP_QUERY. It was possible to exceed the maximum document size
+    before.
+  * Fix a crash if a multi-batch bulk write with OP_MSG errored on a batch.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * Jeremy Mikola
+  * Haris Sheikh
+  * Samantha Ritter
+  * Isabel Atkinson
+  * Sara Golemon
+  * Clyde Bazile
+  * Roberto C. Sánchez
+  * Lior Kaplan
+  * pasniak
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.14.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.14.1.
+
+Bug fixes:
+
+  * Prohibit starting a transaction for pre-4.0 MongoDB servers.
+  * Prohibit starting a sharded transaction for pre-4.2 MongoDB servers.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Jeremy Mikola
+  * Clyde Bazile
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.14.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.14.0.
+
+
+Features:
+
+  * Support for OpenSSL 1.1.1 and its implementation of TLS v1.3.
+  * New function mongoc_stream_should_retry.
+  * New accessor mongoc_server_description_last_update_time.
+  * New method mongoc_client_reset to be called after forking.
+
+Bug fixes:
+
+  * OP_MSG with unacknowledged writes (write concern of w:0) would serialize
+    incorrectly on big-endian platforms, causing writes to use the default
+    write concern of w:1.
+  * mongoc_collection_update_many and mongoc_collection_delete_many would fail
+    with the URI option retryWrites=true.
+  * In a transaction, the driver now properly ignores the readConcern configured
+    on a client, database, or collection: only the mongoc_transaction_opt_t's
+    readConcern is used.
+  * Remove timestamp from uninstall scripts to permit reproducible build.
+  * Setting mongoc_ssl_opt_t.pem_file or ca_file to a bad file path caused a
+    hang with Darwin SSL.
+  * Fix the ENABLE_SASL cmake option:
+    * Remove unnecessary GSSAPI value. It was equivalent to specifying ENABLE_SASL=CYRUS.
+    * ENABLE_SASL=AUTO now correctly chooses SSPI on Windows instead of CYRUS.
+  * The client pool failed to set proper apm callbacks for clients created
+    via try_pop().
+
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Roberto C. Sánchez
+  * Kevin Albertson
+  * Samantha Ritter
+  * Spencer McKenney
+  * Henrik Edin
+  * Jeremy Mikola
+  * Evgeni Dobranov
+  * Derick Rethans
+  * 平民·寻梦(Pingmin Fenlly Liu)
+  * David Carlier
+  * Gustaf Neumann
+  * Jeroen
+  * Jeroen Ooms
+  * Kaitlin Mahar
+  * Tomas Mozes
+  * Clyde Bazile
+
+Peace,
+
+    Samantha Ritter
+
+
+mongo-c-driver 1.13.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.13.1.
+
+Bug fixes:
+
+  * mongoc_collection_update_many and mongoc_collection_delete_many would fail
+    with the URI option retryWrites=true.
+  * Remove timestamp from uninstall scripts to permit reproducible build.
+  * Add missing header files to the release tarball to fix compilation when
+    configuring with ENABLE_SASL=GSSAPI.
+  * Separate libmongoc and libbson uninstall scripts so they do not overwrite
+    each other.
+  * Fix running make install with DESTDIR.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Kevin Albertson
+  * A. Jesse Jiryu Davis
+  * Henrik Edin
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.13.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.13.0.
+
+Features:
+
+  * Report a new error code, MONGOC_ERROR_GRIDFS_CORRUPT, when a chunk larger
+    than chunkSize is detected. Before, the driver had crashed with an assert.
+  * Restructure of install directory. All mongoc headers are under mongoc/
+    and all bson headers are under bson/. The preferred way of including the
+    headers are mongoc/mongoc.h and bson/bson.h respectively.
+    Forwarding headers in the root are provided for backwards compatibility.
+  * The default CMake build type had been unspecified, now it is RelWithDebInfo.
+  * Support LibreSSL 2.7+.
+
+Bug fixes:
+
+  * mongoc_collection_replace_one is now a correctly exported symbol.
+  * Fix multiple issues with readConcern and writeConcern inheritance.
+  * Fix rare crash with mongodb+srv URIs on Windows.
+  * mongoc_gridfs_create_file_from_stream ignored errors while writing chunks
+    to the server.
+  * The following functions should not have taken a "bypassDocumentValidation"
+    option in bson_t *opts, the option is now prohibited:
+    - mongoc_bulk_operation_insert_with_opts
+    - mongoc_bulk_operation_update_one_with_opts
+    - mongoc_bulk_operation_update_many_with_opts
+    - mongoc_bulk_operation_replace_one_with_opts
+  * The heartbeat-succeeded and heartbeat-failed events (part of SDAM
+    Monitoring) had uninitialized "duration" fields, they are now set correctly.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Roberto C. Sánchez
+  * Kevin Albertson
+  * Henrik Edin
+  * Spencer McKenney
+  * Jeremy Mikola
+  * Evgeni Dobranov
+  * Tomas Mozes
+  * Derick Rethans
+  * Gustaf Neumann
+  * Jeroen Ooms
+  * Kaitlin Mahar
+
+Peace,
+
+    Kevin Albertson
+
+
+mongo-c-driver 1.12.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.12.0.
+
+Features:
+
+  * New function mongoc_client_session_in_transaction to check if a multi-
+    document transaction is started.
+  * New examples for change streams and transactions, improved guide for
+    migrating from mongoc_collection_count to mongoc_collection_count_documents
+
+Bug fixes:
+
+  * Fix occasional crash in sharded queries
+  * Retry all retryable write concern errors
+  * mongoc_client_session_commit_transaction sets the correct error label when
+    the primary is unavailable
+  * mongoc_collection_find_with_opts had prohibited read preference "primary"
+    in a transaction
+  * mongoc_collection_aggregate had not inherited its mongoc_collection_t's
+    read preference; only an explicitly provided read preference was used.
+  * Allow unencoded delimiters in username/password if unambiguous
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Roberto C. Sánchez
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+  * Spencer McKenney
+  * Evgeni Dobranov
+  * Jeremy Mikola
+  * 平民·寻梦(Pingmin Fenlly Liu)
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.11.0
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.11.0. This release adds
+support for MongoDB 4.0 features. It includes the following additions and
+improvements:
+
+  * Multi-document transactions, see mongoc_client_session_start_transaction
+  * New function mongoc_error_has_label to check for specific error labels such
+    as "TransientTransactionError" or "UnknownTransactionCommitResult" in
+    error replies.
+  * New functions to subscribe to changes on an entire client or database:
+    - mongoc_client_watch
+    - mongoc_database_watch
+  * New option for change streams, "startAtOperationTime".
+  * mongoc_collection_count_with_opts is deprecated for two new functions:
+    - mongoc_collection_count_documents
+    - mongoc_collection_estimated_document_count
+  * Support for SCRAM-SHA-256 authentication, including support for non-ASCII
+    passwords using libicu is an optional dependency.
+  * Faster mongoc_database_get_collection_names_with_opts fetches only names,
+    not the entire collection metadata.
+
+Additional changes not specific to MongoDB 4.0:
+
+  * All "destroy" functions such as mongoc_collection_destroy now ignore a NULL
+    argument.
+  * The driver now returns an error if you attempt to use "arrayFilters" in an
+    update with a MongoDB server older than 3.6.
+  * Update functions include a new "upsertedCount" field in the reply document.
+  * Replace MD5 with FNV-1a hash to generate ObjectIds (for FIPS compliance).
+
+Bug fixes:
+
+  * Functions incorrectly marked with the "const" compiler attribute are now
+    marked as "pure", fixes build error when link-time optimization is enabled.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+  * Evgeni Dobranov
+  * Spencer McKenney
+  * Jeremy Mikola
+  * Roberto C. Sánchez
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.3
+=====================
+
+No change since 1.10.2; released to keep pace with libbson's version.
+
+-- A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.2
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.10.2. This release fixes
+the libbson and libmongoc installed library filenames and SONAMEs on Linux.
+They had changed unintentionally with the switch to CMake in 1.10.0; they are
+now consistent with 1.9.x and previous releases. Thanks to Roberto C. Sánchez
+for the fix.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.1
+=====================
+
+It is my pleasure to announce the MongoDB C Driver 1.10.1. This release fixes
+the following bugs introduced in version 1.10.0:
+
+  * Client sessions were not prohibited with unacknowledged write concern and
+    mongoc_bulk_operation_execute; now they are prohibited. Client sessions have
+    been prohibited with all other unacknowledged writes since 1.10.
+  * The "arrayFilters" update option, new in MongoDB 3.6 and supported since
+    libmongoc 1.9.0, was inadvertently prohibited by
+    mongoc_bulk_operation_update_one_with_opts and
+    mongoc_bulk_operation_update_many_with_opts in 1.10. The option is now
+    permitted again.
+  * The mongoc-stat tool for displaying shared counters was disabled on Linux
+    and not installed; it is now restored.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.10.0
+=====================
+
+It is my pleasure to announce MongoDB C Driver 1.10.0. This version drops
+support for MongoDB 2.6 and adds the following features and bugfixes:
+
+  * libbson and libmongoc are now maintained in the mongo-c-driver repository,
+    although they are still built as separate libraries, and libbson can still
+    be used without libmongoc.
+  * Building libbson and libmongoc now requires CMake on all platforms. The
+    Autotools build scripts ("configure" and related scripts) have been deleted.
+    See the "installing" page for updated instructions, including the new
+    ENABLE_MONGOC option and changes to the ENABLE_BSON option.
+  * IPv6 is now fully supported and conforms to RFC-6555. If a hostname has both
+    IPv4 and IPv6 DNS records, the driver tries connecting with IPv6 first. If a
+    connection can't be established after 250ms then IPv4 is tried in parallel.
+    Whichever succeeds connection first cancels the other. The successful DNS
+    result is cached for 10 minutes.
+  * If CMake is configured with ENABLE_SSL=AUTO (the default), libmongoc now
+    uses native TLS libraries on Mac and Windows, and OpenSSL everywhere else.
+    Before, it would search for OpenSSL on all platforms and only use native
+    TLS on Mac and Windows as a fallback.
+  * The driver now handshakes SSL connections to multiple servers in a replica
+    set or sharded cluster in parallel, so long as it uses OpenSSL or Windows
+    SChannel. (SSL handshakes with Apple's Secure Transport are still serial.)
+    A larger receive buffer with SChannel increases performance over slow
+    connections.
+  * All functions that accept read concern now prohibit it, if MongoDB is too
+    old to support it (MongoDB 3.0).
+  * Client sessions are now prohibited with unacknowledged writes.
+  * mongoc_collection_find_and_modify_with_opts now prohibits write concern if
+    MongoDB is too old to support it (MongoDB 3.0).
+  * Other helper functions for commands that write, now prohibit write concern
+    if MongoDB is too old to support it (pre-3.4):
+      mongoc_client_read_write_command_with_opts
+      mongoc_client_write_command_with_opts
+      mongoc_collection_read_write_command_with_opts
+      mongoc_collection_write_command_with_opts
+      mongoc_database_read_write_command_with_opts
+      mongoc_database_write_command_with_opts
+      mongoc_collection_aggregate with $out
+      mongoc_collection_drop_index_with_opts
+      mongoc_collection_drop_with_opts
+      mongoc_collection_rename_with_opts
+      mongoc_database_drop_with_opts
+    Write concern behavior is unchanged for regular CRUD functions.
+  * Setting a negative writeConcern level of -2 or smaller, via the "opts"
+    parameter to functions that accept BSON options, is now prohibited. The
+    special "w" values -2 through -4 are only used internally. The deprecated
+    "w=-1" is still allowed, as a synonym for "w=0".
+  * The Kerberos URI option authMechanismProperties=CANONICALIZE_HOST_NAME:true
+    is now implemented with the Windows Kerberos provider, SSPI.
+  * This repository now includes GDB and LLDB customizations for pretty-printing
+    bson_t structs as JSON while debugging. See the "debugging" page.
+  * The internal preprocessor symbol HAVE_STRINGS_H has been renamed
+    BSON_HAVE_STRINGS_H. If you maintain a handwritten bson-config.h you must
+    rename this symbol.
+  * The following helper functions do not work with mongoc_client_session_t,
+    they are deprecated in favor of running MongoDB commands directly with a
+    function like mongoc_client_read_command_with_opts:
+      mongoc_client_get_server_status
+      mongoc_collection_stats
+      mongoc_collection_validate
+  * mongoc_cursor_is_alive is now deprecated for mongoc_cursor_more, which is
+    functionally equivalent.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+  * Roberto C. Sánchez
+  * Jeremy Mikola
+  * Xiangyu Yao
+  * Jeroen Ooms
+  * Derick Rethans
+  * Kaitlin Mahar
+  * Pavithra Vetriselvan
+  * NotSpooky
+  * Iulian Rotaru
+  * Katherine Walker
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.5
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.5. This release fixes the following bugs:
+
+  * New change streams API functions were not marked extern "C"
+  * mongoc_collection_watch now accepts a pipeline argument as a BSON array, in
+    addition to accepting a BSON document with a "pipeline" array field
+  * Crashes in several change stream error handling paths
+  * Commands could return false with an empty bson_error_t after a replica set
+    reconfig
+  * Network error messages omitted the command name when using OP_MSG
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.4
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.4. This release offers
+compatibility with Sphinx 1.7.0 and above and fixes two bugs:
+
+  * Ensure a change stream uses the proper session id while iterating
+  * Fix a rare crash in pooled mode when a replica set member was disconnected
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Kevin Albertson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.3
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.3. This version fixes a
+session-management bug that could cause an authentication error while connected
+to MongoDB 3.6+ and iterating a cursor, and it permits the $gleStats modifier
+with mongoc_collection_aggregate.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.2
+====================
+
+No change since 1.9.1; released to keep pace with libbson's version number.
+
+-- A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.1. This release fixes a bug
+that caused session ID to be included in authentication and server monitoring
+commands. Thanks to Jeremy Mikola for finding and fixing the issue.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.9.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.9.0. This version drops support
+for MongoDB 2.4 and adds support for MongoDB 3.6 features:
+
+  * New struct mongoc_change_stream_t to watch a collection for changes.
+  * New struct mongoc_client_session_t represents a MongoDB 3.6 session,
+    which supports causal consistency: you are guaranteed to read your writes
+    and to perform monotonic reads, even when reading from secondaries or in
+    a sharded cluster.
+  * New functions that accept flexible options as a BSON document. These
+    accept a "sessionId" option and any future options. In addition, the
+    two new "update" functions accept the "arrayFilters" option that is new
+    in MongoDB 3.6:
+      mongoc_collection_insert_one
+      mongoc_collection_insert_many
+      mongoc_collection_update_one
+      mongoc_collection_update_many
+      mongoc_collection_replace_one
+      mongoc_collection_delete_one
+      mongoc_collection_delete_many
+      mongoc_client_command_with_opts
+      mongoc_database_command_with_opts
+      mongoc_collection_command_with_opts
+      mongoc_client_find_databases_with_opts
+      mongoc_client_get_database_names_with_opts
+      mongoc_collection_create_bulk_operation_with_opts
+      mongoc_collection_find_indexes_with_opts
+      mongoc_database_find_collections_with_opts
+      mongoc_database_get_collection_names_with_opts
+  * New URI option "retryWrites=true" safely and automatically retries certain
+    write operations if the server is a MongoDB 3.6 replica set or sharded
+    cluster.
+  * Support for MongoDB OP_MSG wire protocol.
+
+Additional changes not specific to MongoDB 3.6:
+
+  * Support for mongodb+srv URIs to query DNS for SRV and TXT records that
+    configure the connection to MongoDB.
+  * Support LibreSSL with CMake build
+  * The "minPoolSize" URI option is deprecated: it's confusing and not useful.
+
+Bug fixes:
+
+  * mongoc_bulk_operation_execute did not always initialize "reply".
+  * Fix C99 pedantic warnings.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jeremy Mikola
+  * Kevin Albertson
+  * Jeroen Ooms
+  * Iulian Rotaru
+  * Derick Rethans
+  * Graham Whitted
+  * Brian Moss
+  * Alex Masterov
+  * Michael Kuhn
+  * Sriharsha Vardhan
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.8.2
+====================
+
+It is my pleasure to announce mongo-c-driver 1.8.2. This release fixes the
+following bugs:
+
+  * Remove option to bundle the Snappy compression library, it caused issues
+    for programs linking to libmongoc
+  * Fix pkg-config and CMake config file flags for programs that statically
+    link to libmongoc when libmongoc is statically linked to zLib
+  * The configure flag "--with-zlib=no" was ignored
+    Crash in authentication when username is NULL
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Derick Rethans
+  * Hannes Magnusson
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.8.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.8.1. This release fixes the
+following bugs:
+
+  * Remove a syntax error in the configure script that affects some shells.
+  * The configure script respects --with-zlib=system and --with-snappy=system.
+  * The internal mongoc_server_description_t struct is properly reinitialized
+    after a network error.
+  * Fix the encoding of this NEWS file.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.8.0
+====================
+
+  * The zLib and Snappy compression libraries are bundled if not available.
+    Wire protocol compression is enabled on Windows.
+  * mongoc_collection_find_and_modify_with_opts now respects a "writeConcern"
+    field in the "extra" BSON document in its mongoc_find_and_modify_opts_t.
+  * The command functions mongoc_client_read_write_command_with_opts,
+    mongoc_database_read_write_command_with_opts, and
+    mongoc_collection_read_write_command_with_opts now ignore the "read_prefs"
+    parameter.
+  * mongoc_collection_create_index and mongoc_collection_create_index_with_opts
+    are both now deprecated. Use mongoc_database_write_command_with_opts
+    instead; a guide to creating an index using that function has been added.
+  * Use select, not WSAPoll, on Windows.
+  * Always mark a server "Unknown" after a network error (besides a timeout).
+  * mongoc_client_pool_t sends platform metadata to the server; before, only a
+    single mongoc_client_t did.
+  * New stream method mongoc_stream_timed_out.
+  * Wire version checks introduced in 1.8.0 will prevent the driver from
+    connecting to a future MongoDB server version if its wire protocol is
+    incompatible.
+  * New CMake option ENABLE_MAINTAINER_FLAGS.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jeremy Mikola
+
+Peace,
+
+   A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.7.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.7.0.
+
+New features and bug fixes:
+
+  * CMake build now installs .pc files for programs that link to libmongoc using
+    pkg-config. Both the CMake and Autotools build systems now install .cmake
+    files for programs that link to libmongoc using CMake. Linking to libmongoc
+    statically or dynamically is now much more convenient. See the new tutorial
+    section "Include and link libmongoc in your C program".
+  * New CMake option ENABLE_STATIC can be ON, OFF, or AUTO (the default)
+  * Minimum required CMake version has been increased to 3.1.
+  * CMake remains experimental on non-Windows platforms and issues a warning now
+  * Support for wire compression.
+    * Support for snappy and zlib. MongoDB 3.4 only supports snappy, while zlib
+      support is expected in MongoDB 3.6.
+      The enable, configure mongoc like so:
+      ./configure --with-snappy --with-zlib
+    * New functions: mongoc_uri_get_compressors & mongoc_uri_set_compressors, to
+      get and set compressor configuration on mongoc_uri_t
+    * Added support for comma separated "compressors" connection string option (e.g.
+      mongodb://localhost/?compressors=snappy,zlib)
+    * Added support for configuring zlib compression level in the connection string
+      (e.g. mongodb://localhost/?compressors=zlib&zlibcompressionlevel=8)
+  * Now requires the use of CMake config files for libbson to build libmongoc
+    with CMake
+  * Added pkg-config support for libressl.
+  * New function mongoc_uri_set_auth_mechanism to update the authentication
+    mechanism of a mongoc_uri_t after it is created from a string.
+  * New function mongoc_bulk_operation_insert_with_opts provides immediate
+    error checking.
+  * New function mongoc_uri_new_with_error provides a way to parse a connection
+    string, and retrieve the failure reason, if any.
+  * Support for MongoDB Connection String specification
+    * All connection string options are now represented by MONGOC_URI_xxx macros
+    * Paths to Unix Domain Sockets must be url encoded
+    * Repeated options now issue warnings
+    * Special characters in username, password and other values must be url encoded
+    * Unsupported connection string options now issue warnings
+    * Boolean values can now be represented as true/yes/y/t/1 and false/no/n/f/0.
+    * Case is now preserved in Unix domain paths.
+  * New function mongoc_cursor_error_document provides access to server's error
+    reply if a query or command fails.
+  * New function mongoc_write_concern_is_default determines whether any write
+    concern options have been set, and mongoc_read_concern_is_default checks if
+    read concern options are set.
+  * mongoc_gridfs_find_one_with_opts optimized to use limit 1.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Hannes Magnusson
+  * A. Jesse Jiryu Davis
+  * David Golden
+  * Jeremy Mikola
+  * Bernard Spil
+  * Aleksander Melnikov
+  * Adam Seering
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.6.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.6.0.
+
+New features and bug fixes:
+
+  * Enterprise authentication on Windows now uses the native GSSAPI library;
+    Cyrus SASL is no longer required for enterprise auth on Windows.
+  * BSON documents are more thoroughly validated before insert or update.
+  * New function mongoc_uri_set_mechanism_properties to replace all the
+    authMechanismProperties on an existing URI.
+  * mongoc_uri_get_mechanism_properties asserts its inputs are not NULL.
+  * For consistency with other MongoDB drivers, mongoc_collection_save is
+    deprecated in favor of mongoc_collection_insert or mongoc_collection_update.
+  * The driver is now built and continuously tested with MinGW-W64 on Windows.
+  * Experimental support for HPUX.
+  * The correct operation ids are now passed to Command Monitoring callbacks.
+  * Fix a crash if the driver couldn't connect to the server to create an index.
+  * The documentation is ported from Mallard XML to ReStructured Text, the
+    HTML documentation is restyled, and numerous man page syntax errors fixed.
+  * Getter functions for options in mongoc_find_and_modify_opts_t:
+    * mongoc_find_and_modify_opts_get_bypass_document_validation
+    * mongoc_find_and_modify_opts_get_fields
+    * mongoc_find_and_modify_opts_get_flags
+    * mongoc_find_and_modify_opts_get_max_time_ms
+    * mongoc_find_and_modify_opts_get_sort
+    * mongoc_find_and_modify_opts_get_update
+  * All public functions now have the __cdecl calling convention on Windows.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Aleksander Melnikov
+  * Jeroen Ooms
+  * Brian McCarthy
+  * Jonathan Wang
+  * Peter Beckman
+  * Remi Collet
+  * Rockford Wei
+  * Alexey Ponomarev
+  * Christopher Wang
+  * David Golden
+  * Jeremy Mikola
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.5
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.5. This release fixes bugs
+parsing the localThresholdMS option from the MongoDB URI, and a crash in
+mongoc_cursor_destroy if "query" or "filter" are invalid. Thanks to Jeremy
+Mikola.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.4
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.4. This release fixes an error
+in cursor iteration when a readConcern is set. Thanks to Jeremy Mikola and
+Hannes Magnusson.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.3
+====================
+
+This release fixes a bug that prevented connecting to IPv4-only MongoDB servers
+by hostname.
+
+https://jira.mongodb.org/browse/CDRIVER-1988
+
+The driver has reverted to its 1.5.1 behavior: it connects to MongoDB over IPv6
+if given an IPv6 connection string like "mongodb://[::1]", and requires an IPv4
+connection when given a hostname like "mongodb://localhost".
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.2
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.2.
+
+Thanks to everyone who contributed to the development of this release.
+
+New bug fixes:
+  * CDRIVER-1975 allow mixed $ and non-$ query ops.
+  * CDRIVER-1972 Support for ipv6 hostnames.
+  * CDRIVER-1971 Missing exports of mongoc_gridfs_file_set_*() functions.
+  * CDRIVER-1970 update define constants for "find" opts to be unique.
+  * CDRIVER-1964 Windows CA stores should be opened with read-only flag.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * Hannes Magnusson
+  * A. Jesse Jiryu Davis
+  * Alexey Ponomarev
+  * Peter Beckman
+  * Rockford Wei
+
+Peace,
+
+    Hannes Magnusson
+
+
+mongo-c-driver 1.5.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.1. This is a bugfix release:
+
+  * Fix SEGFAULT with performance counters on NUMA (thanks to Jonathan Wang).
+  * Prevent rare assertion error in mongoc_cluster_stream_for_server.
+  * Improve error messages from auth failure.
+  * Escape quotes when appending CFLAGS to handshake metadata.
+  * Fix OpenSSL header lookups in non-default paths.
+  * Fix build failure with LibreSSL.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jeroen Ooms
+  * Jonathan Wang
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.5.0
+====================
+
+It is my pleasure to announce mongo-c-driver 1.5.0.
+
+New features and bug fixes:
+  * MongoDB 3.4 Support
+    * New URI and read preference option, "maxStalenessSeconds"
+    * MongoDB Handshake
+    * writeConcern and readConcern enhancements
+    * Collation allows users to specify language-specific rules for string
+      comparison when sorting documents. See the code examples for
+      mongoc_client_read_command_with_opts, mongoc_collection_count_with_opts,
+      mongoc_collection_find_with_opts, and mongoc_index_opt_t, as well as the
+      "Setting Collation Order" section of the "Bulk Write Operations" guide.
+  * mongoc_collection_count_with_opts uses the collection's read preference if
+    none is passed in
+  * Improved TLS support
+    * Fixed LibreSSL (libssl) support
+    * Added LibreSSL (libtls) support
+    * Fixed Secure Channel build on VS 2010
+    * OpenSSL now supports SNI (all others already do)
+  * Additional features for Application Performance Monitoring:
+    * mongoc_topology_description_has_writable_server
+    * mongoc_topology_description_has_readable_server
+  * New functions accept flexible options as a BSON document:
+    * mongoc_collection_find_with_opts
+    * mongoc_client_read_command_with_opts
+    * mongoc_client_write_command_with_opts
+    * mongoc_client_read_write_command_with_opts
+    * mongoc_database_read_command_with_opts
+    * mongoc_database_write_command_with_opts
+    * mongoc_database_read_write_command_with_opts
+    * mongoc_collection_read_command_with_opts
+    * mongoc_collection_write_command_with_opts
+    * mongoc_collection_read_write_command_with_opts
+    * mongoc_gridfs_find_with_opts
+    * mongoc_gridfs_find_one_with_opts
+  * mongoc_collection_find is now deprecated in favor of
+    mongoc_collection_find_with_opts.
+  * New helper function to include read concern in one of the above function's
+    options parameter: mongoc_read_concern_append.
+  * mongoc_client_command no longer applies the client's read preference and
+    read concern by default. Same change for mongoc_database_command and
+    mongoc_collection_command.
+  * mongoc_collection_count_with_opts now applies the collection's read
+    preference if no read preference is provided
+  * mongoc_collection_create_index and mongoc_collection_drop_index now apply
+    the collection's write concern.
+  * connectTimeoutMS timer now begins after DNS resolution, and resets
+    for each interface attempted (e.g., if the driver first tries IPv6,
+    then IPv4).
+  * New error code MONGOC_ERROR_DUPLICATE_KEY.
+  * mongoc_collection_find no longer treats the "filter" key specially in
+    queries - querying for a document with a key named "filter" is the same
+    now as any other key.
+  * The server description parameter to the following functions is "const":
+    * mongoc_server_description_host
+    * mongoc_server_description_id
+    * mongoc_server_description_ismaster
+    * mongoc_server_description_round_trip_time
+    * mongoc_server_description_type
+  * Exported symbols are no longer declared in separate export files.
+    This could break ABI with applications using clang, which previously
+    exported symbols from the internal private ABI.
+  * mongoc no longer crashes when multi roundtrip bulk operation fails.
+  * Added support for the new readConcernLevel "linearizable".
+  * Clients now check for misformatted "readPreferenceTags" in URI.
+  * New CMake option ENABLE_TRACING allows debug output, which before had only
+    been available with "configure --enable-tracing".
+  * Bugfix: "PossiblePrimary"-type replicas could be selected for reads
+  * Bugfixes: The random number generator used to select servers is now properly
+    seeded, and secondary queries are now properly distributed according to
+    localThresholdMS, not just to the lowest-latency secondary.
+  * mongoc_collection_insert, mongoc_collection_update, mongoc_collection_remove
+    consistently use domain MONGOC_ERROR_BSON, code MONGOC_ERROR_BSON_INVALID
+    if passed oversized BSON, and MONGOC_ERROR_COLLECTION for other errors.
+    mongoc_bulk_operation_execute continues to use MONGOC_ERROR_COMMAND for
+    all errors.
+  * If mongoc_client_pool_t fails to start its scanner thread in the background,
+    it logs and aborts instead of silently continuing, then failing to connect.
+  * The driver now updates its view of the whole topology with information from
+    each new connection handshake.
+  * mongoc_client_set_apm_callbacks can be used repeatedly to change or clear
+    the list of monitoring callbacks.
+  * Improved error reporting when the driver fails to reach the server.
+
+Deprecations:
+  * mongoc_collection_find is deprecated for mongoc_collection_find_with_opts.
+
+Removed configure flags:
+  * --enable-experimental has been removed. All previously experimental
+    features are now always on.
+  * The configure option "--enable-hardening" had had no effect. It is removed
+    in favor of system-wide compiler configuration.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Fiona Rowan
+  * Ian Boros
+  * Remi Collet
+  * Brian McCarthy
+  * Jeroen Ooms
+  * J. Rassi
+  * Christoph Schwarz
+  * Alexey Vorobeyev
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.4.2
+====================
+
+It is my pleasure to announce mongo-c-driver 1.4.2. This release fixes bugs in
+"minPoolSize" logic, see CDRIVER-1558 for details.
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.4.1
+====================
+
+It is my pleasure to announce mongo-c-driver 1.4.1. This is a bugfix release:
+
+  * mongoc_client_get_server_descriptions could return a list including NULLs
+  * Tailable cursors on MongoDB 3.2 only worked with MONGOC_QUERY_AWAIT_DATA
+  * Spurious warnings with MONGOC_DISABLE_SHM
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.4.0
+====================
+
+It is my pleasure to announce the release of mongo-c-driver 1.4.0.
+
+TLS
+---
+
+The driver can now use the native TLS and crypto functions included in macOS
+and Windows. OpenSSL is no longer required for TLS or authentication on Mac or
+Windows. By default, OpenSSL is used if available, the default will switch in
+version 2.0 to prefer native TLS.
+
+For native TLS on Mac:
+
+  ./configure --enable-ssl=darwin
+
+For Windows:
+
+  cmake "-DENABLE_SSL=WINDOWS" -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"
+
+All of the TLS implementations now load the native default certificate store,
+with OpenSSL on Windows falling back on the Windows native certificate store if
+no other can be found.
+
+The "ca_dir" field on mongoc_ssl_opt_t is only supported by OpenSSL. All other
+fields, including "pem_file", are supported by all implementations.
+
+A new field, "allow_invalid_hostname", has been added to mongoc_ssl_opt_t and is
+preferred over the existing "allow_invalid_certificate" to disable hostname
+verification.
+
+The driver now supports the latest OpenSSL 1.1 in addition to past versions.
+
+Application Performance Monitoring
+----------------------------------
+
+The driver implements the MongoDB Command Monitoring Spec. Applications can
+record the duration and other details of every operation the driver performs on
+the server. See "Introduction to Application Performance Monitoring" in the
+docs.
+
+Error API
+---------
+
+New functions mongoc_client_set_error_api and mongoc_client_pool_set_error_api
+allow applications to distinguish client and server errors. See the "Error
+Reporting" doc.
+
+Unacknowledged Write Results
+----------------------------
+
+Unacknowledged writes (writes whose mongoc_write_concern_t "w" value is zero)
+now reply with an empty document instead of one with nInserted: 0, nUpdated: 0,
+and so on.
+
+Command functions now ignore the read preferences set on a client, database,
+or collection. Instead, they use the mongoc_read_prefs_t passed in explicitly,
+or default to "primary". This change was made to bring them in line with the
+Server Selection Spec. These are the affected functions:
+
+  * mongoc_client_command
+  * mongoc_client_command_simple
+  * mongoc_database_command
+  * mongoc_database_command_simple
+  * mongoc_collection_command
+  * mongoc_collection_command_simple
+
+On the other hand, the following command-specific helper functions now use the
+collection's read preference:
+
+  * mongoc_collection_count
+  * mongoc_collection_stats
+
+New functions to send maxTimeMS or any arbitrary options with findAndModify:
+
+  * mongoc_find_and_modify_opts_set_max_time_ms
+  * mongoc_find_and_modify_opts_append
+
+New function to include a write concern with a generic command function
+like mongoc_client_command_simple:
+
+  * mongoc_write_concern_append
+
+Public API For Higher-Level Drivers
+-----------------------------------
+
+New functions support language drivers (specifically the PHP and HHVM drivers)
+using only the libmongoc public API:
+
+  * mongoc_bulk_operation_get_hint
+  * mongoc_client_command_simple_with_server_id
+  * mongoc_client_get_server_description
+  * mongoc_client_get_server_description_by_id
+  * mongoc_client_get_server_descriptions
+  * mongoc_client_select_server
+  * mongoc_cursor_get_limit
+  * mongoc_cursor_new_from_command_reply
+  * mongoc_cursor_set_hint
+  * mongoc_cursor_set_limit
+  * mongoc_log_trace_disable
+  * mongoc_log_trace_enable
+  * mongoc_server_description_ismaster
+  * mongoc_server_description_round_trip_time
+  * mongoc_server_description_type
+  * mongoc_server_descriptions_destroy_all
+  * mongoc_uri_get_option_as_bool
+  * mongoc_uri_get_option_as_int32
+  * mongoc_uri_get_option_as_utf8
+  * mongoc_uri_option_is_bool
+  * mongoc_uri_option_is_int32
+  * mongoc_uri_option_is_utf8
+  * mongoc_uri_set_auth_source
+  * mongoc_uri_set_database
+  * mongoc_uri_set_option_as_bool
+  * mongoc_uri_set_option_as_int32
+  * mongoc_uri_set_option_as_utf8
+  * mongoc_uri_set_password
+  * mongoc_uri_set_read_concern
+  * mongoc_uri_set_read_prefs_t
+  * mongoc_uri_set_username
+  * mongoc_uri_set_write_concern
+  * mongoc_write_concern_is_acknowledged
+  * mongoc_write_concern_is_valid
+  * mongoc_write_concern_journal_is_set
+
+Now that these public APIs are available, the PHP drivers no longer define the
+MONGOC_I_AM_A_DRIVER preprocessor symbol to access private APIs. The symbol is
+removed from C Driver headers, and libmongoc-priv.so is no longer installed.
+
+Other Features
+--------------
+
+  * New connection string option "localThresholdMS".
+  * zSeries and POWER8 platform support.
+  * Performance enhancements, reduce allocation and copying in command code.
+  * All man page names now begin with "mongoc_" to avoid install conflicts.
+  * New function mongoc_gridfs_file_set_id.
+
+Deprecations
+------------
+
+Automatically calling mongoc_init and mongoc_cleanup is a GCC-specific feature
+that is now deprecated, and will be removed in version 2. The driver should be
+built with:
+
+./configure --disable-automatic-init-and-cleanup
+
+Or:
+
+  cmake "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" -G "Visual Studio 10 Win64" "-DCMAKE_INSTALL_PREFIX=C:\mongo-c-driver"
+
+In this configuration, applications must explicitly init and cleanup libmongoc.
+
+Deprecated functions:
+
+  * mongoc_write_concern_get_fsync
+  * mongoc_write_concern_set_fsync
+
+Notable Bug Fixes
+-----------------
+
+  * Logic bugs using tag sets to select replica set members with complex configs
+  * mongoc_client_get_database_names no longer filters out a replica set
+    member's "local" database.
+  * mongoc_client_get_gridfs now ensures the proper indexes on the files and
+    chunks collections.
+  * SecondaryPreferred fails if primary matches tags but secondaries don't.
+  * mongoc_collection_find_and_modify_with_opts can return true on
+    writeConcernError.
+  * mongoc_collection_validate doesn't always init "reply".
+  * The strings referred to by mongoc_ssl_opt_t, like pem_file and ca_file, are
+    now copied into the client or client pool by mongoc_client_set_ssl_opts or
+    mongoc_client_pool_set_ssl_opts, and need not be kept valid afterward.
+  * mongoc_collection_count_with_opts ignored flags and read_prefs.
+  * minPoolSize of 0 should mean "no minimum".
+  * mongoc_database_create_collection should always use the primary.
+  * The GSSAPI properties SERVICE_NAME and CANONICALIZE_HOST_NAME are now
+    properly parsed from the URI, see the "Authentication" doc for details.
+  * Comprehensive compatibility with various C standards and compilers.
+
+Acknowledgements
+----------------
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Ian Boros
+  * Fiona Rowan
+  * Jeremy Mikola
+  * Christoph Schwarz
+  * Mike Lloyd
+  * Remi Collet
+  * Jean-Bernard Jansen
+  * David Hatch
+  * Derick Rethans
+  * Brian Samek
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.5
+====================
+
+It is my pleasure to announce mongo-c-driver 1.3.5. This release fixes a crash
+in mongoc_cleanup when an allocator had been set with bson_mem_set_vtable, and
+introduces a configure option MONGOC_NO_AUTOMATIC_GLOBALS which prevents code
+built with GCC from automatically calling mongoc_init and mongoc_cleanup when
+your code does not.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.4
+====================
+
+It is my pleasure to announce the MongoDB C Driver 1.3.4. This release fixes a
+security vulnerability: when a mongoc_client_t uses SSL and is disconnected, it
+failed to re-verify the server certificate after reconnecting. This flaw affects
+single clients, not pooled ones.
+
+Thanks to everyone who contributed to the development of this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Remi Collet
+
+Peace,
+
+    A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.3
+====================
+
+It is my pleasure to announce MongoDB C Driver 1.3.3. This fixes a bug where
+a slightly-oversized bulk write operation was not split into batches; instead,
+it was sent whole to the server, which rejected it.
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.2
+====================
+
+It is my pleasure to announce MongoDB C Driver 1.3.2. This is a bugfix release:
+
+  * A socket is properly discarded after a network error from a command.
+  * mongoc_database_get_collection now copies the database's read preferences,
+    read concern, and write concern, instead of copying the client's.
+  * mongoc_cursor_t's private struct now allows a negative limit.
+
+Thanks to everyone who contributed to this release.
+
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+  * Hannes Magnusson
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+
+mongo-c-driver 1.3.1
+====================
+
+It is my pleasure to announce MongoDB C Driver 1.3.1. This is a bugfix release:
+
+  * mongoc_client_get_gridfs now copies the client's read preferences, read
+    concern, and write concern to the newly created mongoc_gridfs_t. Before
+    this fix, GridFS operations were always executed with the default config:
+    data was read from the primary, with the read concern level "local", and
+    written with write concern "acknowledged". Now, if you have configured any
+    of these options on the mongoc_client_t, they are respected by the
+    mongoc_gridfs_t.
+  * CMakeLists.txt now includes and installs the pkg-config files.
+
+Thanks to everyone who contributed to this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Christopher Wang
+  * Jean-Bernard Jansen
+  * Jeremy Mikola
+  * Jeroen Ooms
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.0
+====================
+
+It is my pleasure to announce to you the release of the MongoDB C Driver 1.3.0.
+
+Changes since the release candidate 1.3.0-rc0:
+
+  * Fix a cursor bug introduced on big-endian platforms in 1.3.0-beta0.
+  * Improve documentation for mongoc_host_list_t.
+  * Move private mongoc_host_list_t functions from public header.
+  * Refactor the build system to declare library version in one place.
+
+All new features and changes since the previous stable release, 1.2.1:
+
+  * If the driver is compiled without SSL support but a URI with "ssl=true"
+    is passed to mongoc_client_new, mongoc_client_new_from_uri, or
+    mongoc_client_pool_new, the function logs an error and returns NULL. Before,
+    the driver would attempt a non-SSL connection.
+  * mongoc_collection_find_and_modify will now apply the mongoc_collection_t's
+    write_concern_t when talking to MongoDB 3.2.
+  * Support for MongoDB 3.2's "readConcern" feature for queries, counts, and
+    aggregations. The option "readConcernLevel" is now accepted in the MongoDB
+    URI. New struct mongoc_read_concern_t, and functions operating on it:
+   - mongoc_client_get_read_concern
+   - mongoc_client_set_read_concern
+   - mongoc_database_get_read_concern
+   - mongoc_database_set_read_concern
+   - mongoc_collection_get_read_concern
+   - mongoc_collection_set_read_concern
+   - mongoc_read_concern_copy
+   - mongoc_read_concern_destroy
+   - mongoc_read_concern_get_level
+   - mongoc_read_concern_new
+   - mongoc_read_concern_set_level
+   - mongoc_uri_get_read_concern
+  * Support for MongoDB 3.2's "bypassDocumentValidation" option for writes.
+  * New struct mongoc_bulk_write_flags_t and related functions:
+   - mongoc_bulk_operation_set_bypass_document_validation
+  * New struct mongoc_find_and_modify_opts_t and related functions:
+   - mongoc_find_and_modify_opts_new
+   - mongoc_find_and_modify_opts_destroy
+   - mongoc_find_and_modify_opts_set_sort
+   - mongoc_find_and_modify_opts_set_update
+   - mongoc_find_and_modify_opts_set_fields
+   - mongoc_find_and_modify_opts_set_flags
+   - mongoc_find_and_modify_opts_set_bypass_document_validation
+   - mongoc_collection_find_and_modify_with_opts
+  * New functions to copy database and collection handles:
+   - mongoc_collection_copy
+   - mongoc_database_copy
+  * Support for MongoDB 3.2 wire protocol: use commands in place of OP_QUERY,
+    OP_GETMORE, and OP_KILLCURSORS messages.
+  * To explain a query plan with MongoDB 3.2, you must now call the "explain"
+    command, instead of including the "$explain" key in a mongoc_collection_find
+    query. See the mongoc_collection_find documentation page for details.
+  * Configurable wait time on tailable cursors with MongoDB 3.2:
+   - mongoc_cursor_get_max_await_time_ms
+   - mongoc_cursor_set_max_await_time_ms
+  * Use electionId to detect a stale replica set primary during a network split.
+  * Disconnect from replica set members whose "me" field does not match the
+    connection address.
+  * The client side matching feature, mongoc_matcher_t and related functions,
+    are deprecated and scheduled for removal in version 2.0.
+  * New CMake options ENABLE_SSL, ENABLE_SASL, ENABLE_TESTS, and ENABLE_EXAMPLES.
+  * Use constant-time comparison when verifying credentials.
+  * Combine environment's CFLAGS with configure options when building.
+  * Improved man page output and "whatis" entries.
+
+There are extensive bugfixes and improvements in GridFS since 1.2.1, including:
+
+  * Handle seeking, reading, and writing past the end of a GridFS file.
+  * If a GridFS chunk is missing, mongoc_gridfs_file_readv sets file->error to
+    domain MONGOC_ERROR_GRIDFS and a new code MONGOC_ERROR_GRIDFS_CHUNK_MISSING.
+  * Optimization for long seeks forward with mongoc_gridfs_file_seek.
+
+Other fixes since 1.2.1:
+
+  * Memory leaks in mongoc_database_has_collection and mongoc_cursor_next.
+  * Report writeConcern failures from findAndModify and from legacy writes.
+  * Memory leak in mongoc_database_find_collections.
+  * Set OP_QUERY's nToReturn from the provided limit.
+  * Fix compiler warnings and errors, especially with Visual Studio 2015,
+    GCC 4.8, and IBM XL C.
+  * Bugs and typos in tutorial examples.
+
+Thanks to everyone who contributed to this release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * Jose Sebastian Battig
+  * Matt Cotter
+  * Claudio Canella
+  * alexeyvo
+  * Christopher Wang
+  * Flavio Medeiros
+  * Iago Rubio
+  * Jeremy Mikola
+  * Victor Leschuk
+  * Jason Carey
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.0-rc0
+========================
+
+It is my pleasure to announce to you the first release candidate of MongoDB C
+driver 1.3.0. It includes additive ABI changes and bugfixes, and support for
+the upcoming MongoDB 3.2. It is compatible with MongoDB 2.4 and later.
+
+New features and changes since 1.3.0-beta0:
+
+  * If the driver is compiled without SSL support but a URI with "ssl=true"
+    is passed to mongoc_client_new, mongoc_client_new_from_uri, or
+    mongoc_client_pool_new, the function logs an error and returns NULL. Before,
+    the driver would attempt a non-SSL connection.
+  * New functions to copy database and collection handles:
+   - mongoc_collection_copy
+   - mongoc_database_copy
+  * If a GridFS chunk is missing, mongoc_gridfs_file_readv sets file->error to
+    domain MONGOC_ERROR_GRIDFS and a new code MONGOC_ERROR_GRIDFS_CHUNK_MISSING.
+  * Use electionId to detect a stale replica set primary during a network split.
+  * Disconnect from replica set members whose "me" field does not match the
+    connection address.
+  * The client side matching feature, mongoc_matcher_t and related functions,
+    are deprecated and scheduled for removal in version 2.0.
+  * New CMake options ENABLE_SSL, ENABLE_SASL, ENABLE_TESTS, and ENABLE_EXAMPLES.
+  * The build system is refactored to declare the current version and latest
+    release in one place.
+
+Other fixes:
+
+  * Memory leaks in mongoc_database_has_collection and mongoc_cursor_next.
+  * Report writeConcern failures from findAndModify and from legacy writes.
+
+Thanks to everyone who contributed to this release candidate.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Matt Cotter
+  * Claudio Canella
+  * Victor Leschuk
+  * Flavio Medeiros
+  * Christopher Wang
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.3.0-beta0
+==========================
+
+It is my pleasure to announce to you the beta of MongoDB C driver 1.3.0.
+This beta includes additive ABI changes and bugfixes, and support for
+the upcoming MongoDB 3.2. It is compatible with MongoDB 2.4 and later.
+
+New features and changes:
+
+  * mongoc_collection_find_and_modify will now apply the mongoc_collection_t's
+    write_concern_t when talking to MongoDB 3.2.
+  * Support for MongoDB 3.2's "readConcern" feature for queries, counts, and
+    aggregations. The option "readConcernLevel" is now accepted in the MongoDB
+    URI. New struct mongoc_read_concern_t, and functions operating on it:
+   - mongoc_client_get_read_concern
+   - mongoc_client_set_read_concern
+   - mongoc_database_get_read_concern
+   - mongoc_database_set_read_concern
+   - mongoc_collection_get_read_concern
+   - mongoc_collection_set_read_concern
+   - mongoc_read_concern_copy
+   - mongoc_read_concern_destroy
+   - mongoc_read_concern_get_level
+   - mongoc_read_concern_new
+   - mongoc_read_concern_set_level
+   - mongoc_uri_get_read_concern
+  * Support for MongoDB 3.2's "bypassDocumentValidation" option for writes.
+  * New struct mongoc_bulk_write_flags_t and related functions:
+   - mongoc_bulk_operation_set_bypass_document_validation
+  * New struct mongoc_find_and_modify_opts_t and related functions:
+   - mongoc_find_and_modify_opts_new
+   - mongoc_find_and_modify_opts_destroy
+   - mongoc_find_and_modify_opts_set_sort
+   - mongoc_find_and_modify_opts_set_update
+   - mongoc_find_and_modify_opts_set_fields
+   - mongoc_find_and_modify_opts_set_flags
+   - mongoc_find_and_modify_opts_set_bypass_document_validation
+   - mongoc_collection_find_and_modify_with_opts
+  * Configurable wait time on tailable cursors with MongoDB 3.2:
+   - mongoc_cursor_get_max_await_time_ms
+   - mongoc_cursor_set_max_await_time_ms
+  * Support for MongoDB 3.2 wire protocol: use commands in place of OP_QUERY,
+    OP_GETMORE, and OP_KILLCURSORS messages.
+  * To explain a query plan with MongoDB 3.2, you must now call the "explain"
+    command, instead of including the "$explain" key in a mongoc_collection_find
+    query. See the mongoc_collection_find documentation page for details.
+  * Use constant-time comparison when verifying credentials.
+  * Combine environment's CFLAGS with configure options when building.
+  * Improved man page output and "whatis" entries.
+
+Extensive bugfixes and improvements in GridFS, including:
+
+  * Handle seeking, reading, and writing past the end of a GridFS file.
+  * Optimization for long seeks forward with mongoc_gridfs_file_seek.
+
+Other fixes:
+
+  * Memory leak in mongoc_database_find_collections.
+  * Set OP_QUERY's nToReturn from the provided limit.
+  * Fix compiler warnings and errors, especially with Visual Studio 2015,
+    GCC 4.8, and IBM XL C.
+  * Bugs and typos in tutorial examples
+
+Thanks to everyone who contributed to this beta release.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * Jose Sebastian Battig
+  * Jeremy Mikola
+  * Iago Rubio
+  * Matt Cotter
+  * alexeyvo
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.2
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.2.2.
+
+This release fixes a rare bug where the driver can direct reads to hidden
+secondaries unintentionally. It also includes fixes and improvements to the
+build system.
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.1
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.2.1.
+
+This release includes critical bugfixes for SSL connections with
+mongoc_client_pool_t, and for Unix domain socket connections.
+
+The documentation is updated for a change introduced in version 1.2.0:
+mongoc_client_set_ssl_opts and mongoc_client_pool_set_ssl_opts now configure
+the driver to require an SSL connection to the server, even if "ssl=true" is
+omitted from the MongoDB URI. Before, SSL options were ignored unless
+"ssl=true" was included in the URI.
+
+The build instructions are improved, including the steps to build with OpenSSL
+on OS X El Capitan. Build errors and warnings are fixed for clang in gnu99
+mode and MinGW.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Tamas Nagy
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.2.0.
+
+This is a stable release with additive ABI changes and bugfixes. It is
+compatible with MongoDB version 2.4 and later.
+
+The following notes summarize changes since the previous stable release,
+1.1.11, including changes in the 1.2.0 betas and release candidate.
+
+This version rewrites mongoc_client_t's internals to match two important new
+specs for MongoDB drivers: the Server Discovery And Monitoring Spec and the
+Server Selection Spec. The rewritten client has many advantages:
+
+  * All replica set members or mongos servers are discovered and periodically
+    checked in parallel. The driver's performance is dramatically better and
+    more predictable with multi-server deployments, or with a flaky network,
+    or when some servers are slow or down.
+  * Clients from the same mongoc_client_pool_t share a background thread that
+    discovers and monitors all servers in parallel.
+  * Unnecessary round trips for server checks and pings are eliminated.
+  * Behavior is documented in the specs, and consistent with other drivers,
+    even in complex or unusual scenarios.
+  * The URI's "replicaSet" option is enforced: the driver now refuses to connect
+    to a server unless it is a member of a replica set with the correct setName.
+  * Many race conditions related to changing deployment conditions are fixed.
+
+To conform to the new specs, the client now accepts these options in the
+MongoDB URI; see the mongoc_uri_t documentation for details:
+
+  * heartbeatFrequencyMS
+  * serverSelectionTimeoutMS
+  * serverSelectionTryOnce
+  * socketCheckIntervalMS
+
+Other features:
+
+  * All timeouts that can be configured in the URI now interpret 0 to mean "use
+    the default value for this timeout".
+  * The client's read preference can be configured in the URI with the new
+    options "readPreference" and "readPreferenceTags"; see the mongoc_uri_t
+    documentation.
+  * The new mongoc_uri_get_read_prefs_t function retrieves both the read mode
+    and tags from a mongoc_uri_t.
+  * New accessors mongoc_gridfs_file_get_id, mongoc_client_get_default_database,
+    and mongoc_bulk_operation_get_write_concern.
+  * Debug tracing can be controlled at runtime with mongoc_log_trace_enable and
+    mongoc_log_trace_disable.
+  * Set mongoc_client_pool_t's size with mongoc_client_pool_min_size()
+    and mongoc_client_pool_max_size().
+
+Other changes:
+
+  * Enable runtime asserts in release build.
+  * The libbson submodule's URL now uses the recommended https://, not git://
+  * mongoc_client_kill_cursor is now deprecated and will be removed in 2.0.
+  * The write concern "w=-1" is documented as obsolete.
+
+These notable bugs have been fixed since 1.1.11:
+
+  * The driver now uses the server's maxWireVersion to avoid an error and
+    extra round-trip when executing aggregations on MongoDB 2.4 and older.
+  * Much improved reporting of network errors, unavailable servers, and
+    authentication failure
+  * Off-by-one error in mongoc_gridfs_file_seek with mode SEEK_END
+  * The writeConcernErrors field of bulk results is properly formatted.
+  * A cursor with a server "hint" sets slaveOkay and / or $readPreference.
+  * Destroying an exhaust cursor must close its socket
+  * "wtimeoutms" was ignored for write concerns besides "majority".
+  * Bulk write operations might fail in mixed-version sharded clusters with
+    some pre-2.6 mongos servers.
+  * A variety of bugs and incorrect results in mongoc_bulk_operation_execute.
+  * Numerous compiler warnings and build failures on various platforms.
+  * Copious refinements to the documentation.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * Jason Carey
+  * Samantha Ritter
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * Jeremy Mikola
+  * Remi Collet
+  * Jose Sebastian Battig
+  * Derick Rethans
+  * Yuchen Xie
+  * Manuel Schoenlaub
+  * Sujan Dutta
+  * Lloyd Zhou
+  * rubicks
+  * Pawel Szczurko
+  * Yuval Hager
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0-rc0
+========================
+
+It is my pleasure to announce the release candidate of the MongoDB C driver
+1.2.0. It includes features and bugfixes developed since 1.2.0-beta1.
+
+Notable bugs fixed:
+
+  * Much improved reporting of network errors, unavailable servers, and
+    authentication failure
+  * Destroying an exhaust cursor must close its socket
+  * Various bugs in server reconnection logic
+  * mongoc_collection_aggregate returned invalid cursor after failure
+  * Wrong error message after failed network write on Sparc
+  * Missing JSON test files in release tarball
+
+Other changes:
+
+  * Enable runtime asserts in release build.
+  * mongoc_client_kill_cursor is now deprecated and will be removed in
+    version 2.0.
+
+This release candidate also includes all bugfixes from 1.1.11.
+
+Version 1.2.0 final will be a stable release with additive ABI changes and
+bugfixes. It is compatible with MongoDB version 2.4 and later.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Kyle Suarez
+  * rubicks
+  * Jose Sebastian Battig
+  * Jason Carey
+  * Remi Collet
+  * Yuval Hager
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0-beta1
+==========================
+
+It is my pleasure to announce the second beta release of the MongoDB C driver
+1.2.0. It includes features and bugfixes developed since 1.2.0-beta.
+
+New features:
+
+  * Set mongoc_client_pool_t's size with mongoc_client_pool_min_size()
+    and mongoc_client_pool_max_size().
+  * The write concern "w=-1" is now documented as obsolete.
+  * Abundant fixes and additions to the documentation, beyond those in the
+    previous beta.
+
+Notable bugs fixed:
+
+  * Crashes and races in several replica set scenarios.
+  * The driver now uses the server's maxWireVersion to avoid an error and
+    extra round-trip when executing aggregations on MongoDB 2.4 and older.
+  * Fixed network error handling in multiple code paths.
+  * connectTimeoutMS limits the time the driver can spend reconnecting to
+    servers in single-threaded (non-pooled) mode with serverSelectionTryOnce.
+
+Version 1.2.0 final will be a stable release with additive ABI changes and
+bugfixes. It is compatible with MongoDB version 2.4 and later.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Manuel Schoenlaub
+  * Kyle Suarez
+  * Remi Collet
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.2.0-beta
+=========================
+
+It is my pleasure to announce to you the first beta release of the MongoDB C
+driver 1.2.0.
+
+This release is a stable release with additive ABI changes and bugfixes.
+It is compatible with MongoDB version 2.4 and later.
+
+Version 1.2.0 rewrites mongoc_client_t's internals to match two important new
+specs for MongoDB drivers: the Server Discovery And Monitoring Spec and the
+Server Selection Spec. The rewritten client has many advantages:
+
+  * All replica set members or mongoses are discovered and periodically
+    checked in parallel. The driver's performance is dramatically better and
+    more predictable with multi-server deployments, or with a flaky network,
+    or when some servers are slow or down.
+  * Clients from the same mongoc_client_pool_t share a background thread that
+    discovers and monitors all servers in parallel.
+  * Unnecessary round trips for server checks and pings are eliminated.
+  * Behavior is documented in the specs, and consistent with other drivers, even
+    in complex or unusual scenarios.
+  * The URI's "replicaSet" option is enforced: the driver now refuses to connect
+    to a server unless it is a member of a replica set with the right setName.
+  * Many race conditions related to changing deployment conditions are fixed.
+
+To conform to the new specs, the client now accepts these options in the MongoDB
+URI; see the mongoc_uri_t documentation for details:
+
+  * heartbeatFrequencyMS
+  * serverSelectionTimeoutMS
+  * serverSelectionTryOnce
+  * socketCheckIntervalMS
+
+Other features:
+
+  * All timeouts that can be configured in the URI now interpret 0 to mean "use
+    the default value for this timeout".
+  * The client's read preference can be configured in the URI with the new
+    options "readPreference" and "readPreferenceTags", see the mongoc_uri_t
+    documentation.
+  * The new mongoc_uri_get_read_prefs_t function retrieves both the read mode
+    and tags from a mongoc_uri_t.
+  * New accessors mongoc_gridfs_file_get_id, mongoc_client_get_default_database,
+    and mongoc_bulk_operation_get_write_concern.
+  * Debug tracing can be controlled at runtime with mongoc_log_trace_enable and
+    mongoc_log_trace_disable.
+
+Notable bugs fixed:
+
+  * "wtimeoutms" was ignored for write concerns besides "majority".
+  * Bulk write operations might fail in mixed-version sharded clusters with
+    some pre-2.6 mongos servers.
+  * Normal operations were logged during startup and could not be silenced.
+  * A variety of bugs and incorrect results in mongoc_bulk_operation_execute.
+  * Numerous compiler warnings and build failures on various platforms.
+  * Copious refinements to the documentation.
+
+Thanks to everyone who contributed to this version of libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Sujan Dutta
+  * Jason Carey
+  * Hannes Magnusson
+  * Jeremy Mikola
+  * Derick Rethans
+  * Samantha Ritter
+  * Yuchen Xie
+  * Lloyd Zhou
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.11
+=====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.1.11.
+
+This is a patch release with bug fixes:
+
+  * Undetected network errors when sending messages to the server
+  * Off-by-one error in mongoc_gridfs_file_seek with mode SEEK_END
+  * Memory leak parsing a URI that contains an invalid option
+  * The libbson submodule's URL now uses the recommended https://, not git://
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Hannes Magnusson
+  * Jason Carey
+  * Jose Sebastian Battig
+  * rubicks
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.10
+=====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.1.10.
+
+This is a patch release with bug fixes:
+
+  * Occasional crash reconnecting to replica set.
+  * Queries sent to recovering replica set members.
+  * Memory leak when calling ismaster on replica set members.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Daniil Zaitsev
+  * Jason Carey
+  * Jeremy Mikola
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.9
+====================
+
+It is my pleasure to announce to you the MongoDB C driver 1.1.9.
+
+This release fixes a common crash in 1.1.8, which itself was introduced while
+fixing a rare crash in 1.1.7. For further details:
+
+https://jira.mongodb.org/browse/CDRIVER-721
+https://jira.mongodb.org/browse/CDRIVER-695
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.8
+====================
+
+UPDATE: 1.1.8 suffered a severe new bug so I removed the release from GitHub:
+
+https://jira.mongodb.org/browse/CDRIVER-721
+
+This is a patch release with bug fixes:
+
+  * Crash freeing client after a replica set auth error.
+  * Compile error strict C89 mode.
+
+mongo-c-driver 1.1.7
+====================
+
+It is my pleasure to announce to you the 1.1.7 release of the MongoDB C driver.
+
+This is a patch release with bug fixes:
+
+  * Thread-safe use of Cyrus SASL library.
+  * Experimental support for building with CMake and SASL.
+  * Faster reconnection to replica set with some hosts down.
+  * Crash iterating a cursor after reconnecting to a replica set.
+  * Unchecked errors decoding invalid UTF-8 in MongoDB URIs.
+  * Fix error reporting from mongoc_client_get_database_names.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Jason Carey
+  * Hannes Magnusson
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.6
+====================
+
+It is my pleasure to announce to you the 1.1.6 release of the MongoDB C driver.
+
+This is a patch release with performance enhancements and bug fixes:
+
+  * mongoc_bulk_operation_execute now coalesces consecutive update operations
+    into a single message to a MongoDB 2.6+ server, yielding huge performance
+    gains. Same for remove operations. (Inserts were always coalesced.)
+  * Large numbers of insert operations are now properly batched according to
+    number of documents and total data size.
+  * GSSAPI / Kerberos auth now works.
+  * The driver no longer tries three times in vain to reconnect to a primary,
+    so socketTimeoutMS and connectTimeoutMS now behave *closer* to what you
+    expect for replica sets with down members. A full fix awaits 1.2.0.
+
+I snuck in a feature:
+
+  * mongoc_matcher_t now supports basic subdocument and array matching
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Jason Carey
+  * Kai Mast
+  * Matt Cotter
+
+Peace,
+
+  A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.5
+====================
+
+It is my pleasure to announce to you the 1.1.5 release of the MongoDB C driver.
+
+This is a patch release with performance enhancements and bug fixes:
+
+  * The fsync and j write concern flags now imply acknowledged writes
+  * Prevent using fsync or j with conflicting w=0 write concern
+  * Obey socket timeout consistently in TLS/SSL mode
+  * Return an error promptly after a network hangup in TLS mode
+  * Prevent crash using SSL in FIPS mode
+  * Always return NULL from mongoc_database_get_collection_names on error
+  * Fix version check for GCC 5 and future versions of Clang
+  * Fix warnings and errors building on various platforms
+  * Add configure flag to enable/disable shared memory performance counters
+  * Minor docs improvements and fix links from C Driver docs to Libbson docs
+
+With this release, Libbson abandons the convention that odd-numbered patch
+versions indicate unstable releases. We switch to simple semantic versioning:
+1.1.5 is a stable release with bug fixes since 1.1.4. During subsequent
+development the version will be "1.1.6-dev".
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * A. Jesse Jiryu Davis
+  * Christian Hergert
+  * Jason Carey
+  * Jeremy Mikola
+  * Jeroen Ooms
+  * Hannes Magnusson
+
+Enjoy!
+
+-- A. Jesse Jiryu Davis
+
+
+mongo-c-driver 1.1.4
+====================
+
+It is my pleasure to announce to you the 1.1.4 release of the MongoDB C driver.
+
+This release is a stable release with performance enhancements and bugfixes.
+
+Changes include:
+  * Fixed client pool concurrency issues
+  * Fixed some scenarios where replica sets would fail to reconnect on primary
+    step down.
+  * Improved write concern handling
+  * Validate port number in URI
+  * Various other fixes
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Jason Carey
+  * Andrew Clayton
+  * A. Jesse Jiryu Davis
+  * Jeremy Mikola
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.1.2
+====================
+
+It is my pleasure to announce to you the 1.1.2 release of the MongoDB C driver.
+
+This release is a stable release with performance enhancements and bugfixes.
+
+Changes include:
+  * Process connectTimeoutMS cast insensitively
+  * Addition of missing trace macros
+  * Improvement of internal error messages
+  * Fix a segfault in OpenSSL cleanup routines
+  * Fix for IPv6 support for replica sets
+  * Coalesce small vectorized TLS writes
+  * MinGW fixups
+  * Fix for a memory leak in get_database_names()
+  * Fixes for patching write concern through the bulk api
+  * Fix to normalize hostnames in uri parsing
+  * Fix for managing connections in the client pool
+  * Various other fixes
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Andrew Clayton
+  * Denis Gladkikh
+  * Hannes Magnusson
+  * Jason Carey
+  * Jeremy Mikola
+  * mschoenlaub
+  * Samantha Ritter
+  * Tyler Brock
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.1.0
+====================
+
+It is my pleasure to announce to you the 1.1.0 release of the MongoDB C driver.
+
+This release is a stable release with additive ABI changes and bugfixes.
+
+The below changes include some carried over from RC0.
+
+Changes include:
+  * RC0
+   * ABI versioning for 1.1 versus 1.0 symbols
+   * additional geo index options
+   * authMechanismProperties in URI
+   * fixes for OS X Yosemite
+   * removal of replica set member limit
+   * SCRAM-SHA-1 SASL mechanism
+   * updated dependency on libbson 1.1 abi
+   * validation for bulk insert
+   * various memory leak fixes
+  * Fixes to documentation typos
+  * "How to Ask For Help" in the README
+  * Removed dependency on sasl for PLAIN authentication
+  * Use provided username, if available, for X.509 auth
+  * Fixed WriteConcern error reporting for some writes
+  * Check for closed sockets before attempting RPCs
+  * Fixes for gridfs file seek
+  * Fixes for mongoc_cursor_clone()
+  * Fixes for unix domain socket support
+  * Fixes for polling on win32
+  * Improved warnings on failure to connect
+  * Addition of wired tiger options
+  * Fixes for examples
+
+Additions to the ABI include:
+  * support for extra option in count
+   - mongoc_collection_count_with_opts
+  * additional index options
+   - mongoc_index_opt_geo_get_default
+   - mongoc_index_opt_geo_init
+   - mongoc_index_opt_wt_get_default
+   - mongoc_index_opt_wt_init
+  * rand interface to seed and verify the strong random number generation needed
+    by some auth mechanisms
+   - mongoc_rand_seed
+   - mongoc_rand_add
+   - mongoc_rand_status
+  * URI additions to support more complicated auth credentials
+   - mongoc_uri_get_credentials
+   - mongoc_uri_get_mechanism_properties
+  * Support for cursor returning metadata crud operations
+   - mongoc_client_find_databases
+   - mongoc_collection_find_indexes
+   - mongoc_database_find_collections
+  * Kill cursor support
+   - mongoc_client_kill_cursor
+  * Various get/setters on cursor
+   - mongoc_cursor_get_batch_size
+   - mongoc_cursor_get_id
+   - mongoc_cursor_set_batch_size
+  * More socket/stream options
+   - mongoc_socket_check_closed
+   - mongoc_socket_inet_ntop
+   - mongoc_stream_check_closed
+   - mongoc_stream_write
+
+Additional Notes:
+    Existing complex index names may contain a zero instead of a type due to
+a bug in mongoc_collection_keys_to_index_string. As a result those indexes may
+be hard to drop from the driver as they have a name you would not expect.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Adam Midvidy
+  * aherlihy
+  * alexeyvo
+  * Christian Hergert
+  * Hannes Magnusson
+  * Jason Carey
+  * Jérôme Lebel
+  * Jesse Jiryu Davis
+  * lloydzhou
+  * Mark Benevenuto
+  * Paul Melnikow
+  * Samantha Ritter
+  * Shraya Ramani
+  * Spencer Jackson
+  * Tyler Brock
+
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.1.0-rc0
+========================
+
+It is my pleasure to announce to you the 1.1.0-rc0 release of the MongoDB C driver.
+
+This release is a release candidate with additive ABI changes and bugfixes.
+
+Changes include:
+  * ABI versioning for 1.1 versus 1.0 symbols
+  * additional geo index options
+  * authMechanismProperties in URI
+  * fixes for OS X Yosemite
+  * removal of replica set member limit
+  * SCRAM-SHA-1 SASL mechanism
+  * updated dependency on libbson 1.1 abi
+  * validation for bulk insert
+  * various memory leak fixes
+
+Additions to the ABI include:
+  * support for extra option in count
+   - mongoc_collection_count_with_opts
+  * extra index and collection info
+   - mongoc_collection_get_index_info
+   - mongoc_database_get_collection_info
+  * additional geo options
+   - mongoc_index_opt_geo_get_default
+   - mongoc_index_opt_geo_init
+  * rand interface to seed and verify the strong random number generation needed
+    by some auth mechanisms
+   - mongoc_rand_seed
+   - mongoc_rand_add
+   - mongoc_rand_status
+  * URI additions to support more complicated auth credentials
+   - mongoc_uri_get_credentials
+   - mongoc_uri_get_mechanism_properties
+
+Additional Notes:
+    Existing complex index names may contain a zero instead of a type due to
+a bug in mongoc_collection_keys_to_index_string. As a result those indexes may
+be hard to drop from the driver as they have a name you would not expect.
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Adam Midvidy
+  * aherlihy
+  * alexeyvo
+  * Christian Hergert
+  * Jason Carey
+  * Jérôme Lebel
+  * Samantha Ritter
+  * Spencer Jackson
+  * Tyler Brock
+
+
+Enjoy!
+
+-- Jason Carey
+
+
+mongo-c-driver 1.0.2
+====================
+
+It is my pleasure to announce to you the 1.0.2 release of the MongoDB C driver.
+
+This release is a minor point release with no ABI changes and mostly small
+bugfixes.
+
+Changes include:
+  * A variety of fixes for read preference based node selection
+  * Avoided inclusion of getLastError in 2.6 writeConcern
+  * Correct handling of pass through params for collection_aggregate
+  * Improved error reporting in socket connect
+  * Public MONGOC_DEFAULT_CONNECTTIMEOUTMS
+
+Thanks to everyone who contributed to the development of this point release for
+libmongoc.
+
+  * Adam Midvidy
+  * Christian Hergert
+  * Denis Gladkikh
+  * Jason Carey
+  * Jeremy Mikola
+  * Jérôme Lebel
+  * Tyler Brock
+  * Wisdom Omuya
+
+-- Jason Carey
+
+
+mongo-c-driver 1.0.0
+====================
+
+It is my very distinct pleasure to announce to you the 1.0 release of
+the MongoDB C driver!
+
+This is the culmination of just over a year of work and could not have
+been done without the help of our wonderful community.
+
+Thanks to everyone who contributed to the development of this driver!
+
+  * Christian Hergert
+  * Jason Carey
+  * Gary Murakami
+  * Christian Heckl
+  * Frank Watson Song
+  * Hannes Magnusson
+  * Je�rôme Lebel
+  * Kyle Suarez
+  * Maga Napanga
+  * Michael Kuhn
+  * Vincent Giersch
+  * essentia44
+  * yuqing
+
+Happy Hacking!
+
+-- Christian Hergert
+
+
+mongo-c-driver 0.98.2
+=====================
+
+One final step before our journey to 1.0!
+
+This is a relatively small release, adding some features needed for drivers
+building on top of the C driver.
+
+A new libmongoc-priv.so library is installed that does not have symbols
+hidden. You can access private headers via the -private.h variants. This
+means you will need to recompile your project every time the library is
+changed (if you use those private headers, as they are subject to change).
+
+A special thanks to Hannes Magnusson for patches in this release.
+
+See `git shortlog 0.98.0..0.98.2` for a list of all the changes.
+
+-- Christian Hergert
+
+
+mongo-c-driver 0.98.0
+=====================
+
+Another step in the rapidly approaching path to 1.0!
+
+This release is primarily a bugfix release and stablization effort as we
+approach 1.0 of the MongoDB C driver.
+
+This release requires 0.98.0 of Libbson for improvements to the memory
+management system. You can now setup custom memory allocators at the
+start of the process.
+
+This is a RC release that with a few improvements will likely become 1.0.
+
+A special thanks to the following for patches in this cycle:
+
+  * Kyle Suarez
+  * yuqing
+
+See `git shortlog 0.96.4..0.98.0` for a list of all the changes.
+
+-- Christian Hergert
+
+
+mongo-c-driver 0.96.4
+=====================
+
+Another incremental feature update and bugfix release!
+
+In this release, you will find the following changes:
+
+  * build/mci.sh script for automatically building Debian packages, RPMs, and
+    Solaris packaging based on the host operating system.
+  * Various libbson improvements, now depending on 0.8.4.
+  * Alignment fixes for Solaris Studio C compiler via libbson.
+  * Addition of mongoc_gridfs_remove_by_filename() for removing a file from
+    gridfs by filename.
+  * client command functions can now take a fully qualified namespace.
+  * collections can now support names that indicate a command namespace.
+  * Commands will no longer fail if they do not contain an "ok" field.
+  * OP_QUERY will now set the slaveOk bit in the wire protocol if
+  * readPreferences are set to non-PRIMARY.
+  * Various documentation and build fixes.
+
+Thanks again to all the contributors, and happy hacking!
+
+
+mongo-c-driver 0.96.2
+=====================
+
+Hot on the heels of 0.96.0 we would like to present mongo-c-driver 0.96.2!
+
+This is primarily a bugfix release. Included in this release are:
+
+  * Ensure batchSize is used in cursor GETMORE operations with `aggregate`.
+  * Ensure enough buffer space is allocated for incoming RPC when buffering
+    from a stream.
+  * Require libbson 0.8.2 for more robust `bson_next_power_of_two()` when
+    using `size_t` and BCON compilation fix with C++.
+  * Handle cursor id's that are not 64-bit values in response from
+   `aggregate` command.
+  * Handle upsert on MongoDB < 2.6 when _id does not contain an `ObjectId`.
+  * Use 100 for default batchSize in `aggregate` command.
+
+Happy Hacking!
+
+
+mongo-c-driver 0.96.0
+=====================
+
+It's that time again, time for another mongo-c-driver release!
+
+This release includes much new documentation, which can be found at
+http://docs.mongodb.org/ecosystem/drivers/c/.
+
+Additionally, this release improves support for various exotic systems.
+Solaris 10 is supported much better on SPARC and x86_64 based systems.
+
+Some workarounds for mixed-mode sharded-clusters have been added to improve
+resiliency when rolling upgrades are performed.
+
+Build improvements have been added to help us detect SASL and SSL
+implementations on platforms that do not support pkg-config. This should
+simplify building for some of you.
+
+We've added some more logging to SASL authentication to help debug
+authentication failures.
+
+A bug causing an abort() when SSL is used and a server is down has been fixed.
+
+We've renamed various _delete() functions to _remove() to provide consistency
+with other MongoDB drivers.
+
+You can now specify SSL options for client pools.
+
+-D_REENTRANT is always defined now on Solaris to help with errno detection.
+This may not have been done before if using a non-GCC platform with pthreads.
+
+A bug was fixed where timeouts could have been 1000x longer than expected
+due to failure to convert from microseconds to milliseconds.
+
+A bug was fixed with authentication in sharded cluster and replica set
+scenarios.
+
+Happy Hacking!
+
+
+mongo-c-driver 0.94.2
+=====================
+
+Hot on the heels of 0.94.0 is 0.94.2, a bugfix release.
+
+A bug has been fixed when using TLS streams and large result sets.
+
+In this release, we added support for Sun's C compiler (Sun Pro C) on Solaris.
+This allows for builds on Solaris 10 with SPARC using the native toolchain.
+
+This release contains a couple of fixes in libbson as well.
+
+Keep those bug reports coming, and as always, Happy Hacking!
+
+
+mongo-c-driver 0.94.0
+=====================
+
+The mongo-c-driver team is proud to announce the release of 0.94.0. This
+release is a followup to the previous release adding more features to be found
+in MongoDB 2.6.
+
+You will find some new API's, bug fixes, and more documentation. Under the
+hood, 0.94.0 uses the new write-commands as part of MongoDB 2.6 when it
+discovers it is communicating with a MongoDB server. There is now a bulk
+operation API (See `mongoc-bulk-operation.h`).
+
+Helpers for common server commands have been added. You can find most of
+them `mongoc-collection.h`.
+
+To simply using mongo-c-driver from Windows, we've included pre-built binaries
+on the release page.
+
+Thanks to all of the contributors this release!
+
+Happy Hacking!
+
+
+mongo-c-driver 0.92.0
+=====================
+
+The mongo-c-driver team is proud to announce the release of 0.92.0. This
+release is the culimation of a few months work and has many bug fixes and
+new features. It contains over 350 commits from 4 authors since the 0.90.0
+release.
+
+The mongo-c-driver release tarballs now contain a bundled copy of libbson.
+If you do not have libbson installed or the system installed libbson is too
+old, the bundled copy of libbson will be installed.
+
+  * Revamped build system to simplify installation.
+  * Windows Vista and newer support.
+  * Various GridFS fixes and features.
+  * Kerberos support via cyrus-sasl.
+  * Various SSL improvements.
+  * Support for Solaris 11, FreeBSD 10, RHEL 5+, and SmartOS.
+  * A new client side expression matcher to perform basic query processing.
+    It can perform queries such as {'field': {'$in': [1,2,3]}}. See
+    mongoc_matcher_t for more information.
+  * A new socket abstraction for platform independent network sockets.
+  * A new mongoc-dump example for how to write a simple mongodump replacement.
+  * Counters can use rdtscp instruction on Core iX systems for very fast
+    counters.
+  * configure has new options. If in doubt, the defaults are sensible.
+   * --enable-coverage=yes|no
+   * --enable-debug=yes|no
+   * --enable-debug-symbols=yes|no
+   * --enable-hardening=yes|no
+   * --enable-optimizations=yes|no
+   * --enable-ssl=yes|no
+   * --enable-sasl=yes|no
+   * --enable-tracing=yes|no
+   * --with-libbson=auto|system|bundled
+
+mongo-c-driver 0.92.0 requires libbson 0.6.4 or newer.
+
+Happy Hacking!
+
+
+Libmongoc 0.90.0
+================
+
+This is the initial release of the new Libmongoc. We chose 0.90.0 for the
+release version to differentiate ourselves from the, now legacy, version of
+libmongoc. We will rapidly work towards reaching an API/ABI stable library fit
+for a 1.0.0 release.
+
+Libmongoc is Apache licensed so it can be embedded in a multitude of scenarios.
+
+The API of 0.90.0 is completely different from the previous versions. We think
+this allowed us to create a high-quality library that you will enjoy using in
+your applications.
+
+Many outstanding bugs were closed in the process of creating Libbson 0.90.0. So
+if you had a pet issue, please take a look to see if it was resolved as part of
+this effort!
+
+Thanks, and enjoy developing your applications with libmongoc!
diff --git a/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/README.rst b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/README.rst
new file mode 100644
index 0000000..a4c1846
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/README.rst
@@ -0,0 +1,89 @@
+==============
+mongo-c-driver
+==============
+
+About
+=====
+
+mongo-c-driver is a project that includes two libraries:
+
+- libmongoc, a client library written in C for MongoDB.
+- libbson, a library providing useful routines related to building, parsing, and iterating BSON documents.
+
+If libmongoc is not needed, it is possible to build and install only libbson.
+
+Documentation / Support / Feedback
+==================================
+
+The documentation is available at http://mongoc.org/.
+For issues with, questions about, or feedback for libmongoc, please look into
+our `support channels <http://www.mongodb.org/about/support>`_. Please
+do not email any of the libmongoc developers directly with issues or
+questions - you're more likely to get an answer on the `MongoDB Community Forums`_.
+
+Bugs / Feature Requests
+=======================
+
+Think you’ve found a bug? Want to see a new feature in libmongoc? Please open a
+case in our issue management tool, JIRA:
+
+- `Create an account and login <https://jira.mongodb.org>`_.
+- Navigate to `the CDRIVER project <https://jira.mongodb.org/browse/CDRIVER>`_.
+- Click **Create Issue** - Please provide as much information as possible about the issue type and how to reproduce it.
+
+Bug reports in JIRA for all driver projects (i.e. CDRIVER, CSHARP, JAVA) and the
+Core Server (i.e. SERVER) project are **public**.
+
+How To Ask For Help
+-------------------
+
+If you are having difficulty building the driver after reading the below instructions, please post on
+the `MongoDB Community Forums`_ to ask for help. Please include in your post all of the following
+information:
+
+- The version of the driver you are trying to build (branch or tag).
+    - Examples: ``r1.17`` (branch), ``1.9.5`` (tag)
+- Host OS, version, and architecture.
+    - Examples: Windows 10 64-bit x86, Ubuntu 16.04 64-bit x86, macOS 10.13
+- C Compiler and version.
+    - Examples: GCC 7.3.0, Visual Studio Community 2017, clang 3.9, XCode 9.3
+- The output of any ``cmake``, ``make``, or other commands executed during the build.
+- The text of the error you encountered.
+
+Failure to include the relevant information will delay a useful response.
+Here is a made-up example of a help request that provides the relevant
+information:
+
+  Hello, I'm trying to build the C driver with Kerberos support, from
+  mongo-c-driver-1.9.5.tar.gz. I'm on Ubuntu 16.04, 64-bit Intel, with gcc
+  5.4.0. I run CMake like::
+
+    $ cmake .
+    -- The C compiler identification is ;GNU 5.4.0
+    -- Check for working C compiler: /usr/bin/cc
+    -- Check for working C compiler: /usr/bin/cc -- works
+
+    ... SNIPPED OUTPUT, but when you ask for help, include full output without any omissions ...
+
+    -- Searching for libsasl2
+    --   Not found (specify -DCMAKE_LIBRARY_PATH=/path/to/sasl/lib for SASL support)
+    CMake Error at CMakeLists.txt:10 (_message):
+        SASL not found
+
+  Can you tell me what I need to install? Thanks!
+
+.. _MongoDB Community Forums: https://community.mongodb.com/tags/c/drivers-odms-connectors/7/c-driver
+
+Security Vulnerabilities
+------------------------
+
+If you’ve identified a security vulnerability in a driver or any other
+MongoDB project, please report it according to the `instructions here
+<https://docs.mongodb.org/manual/tutorial/create-a-vulnerability-report>`_.
+
+
+Installation
+============
+
+Detailed installation instructions are in the manual:
+http://mongoc.org/libmongoc/current/installing.html
diff --git a/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/THIRD_PARTY_NOTICES b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/THIRD_PARTY_NOTICES
new file mode 100644
index 0000000..9c74b1f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/THIRD_PARTY_NOTICES
@@ -0,0 +1,130 @@
+The MongoDB C Driver uses third-party code distributed under different licenses.
+
+License notice for common-b64.c
+-------------------------------------------------------------------------------
+
+ISC License
+
+Copyright: 1996, 1998 Internet Software Consortium
+           1995 International Business Machines, Inc.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+
+Portions Copyright (c) 1995 by International Business Machines, Inc.
+
+International Business Machines, Inc. (hereinafter called IBM) grants
+permission under its copyrights to use, copy, modify, and distribute this
+Software with or without fee, provided that the above copyright notice and
+all paragraphs of this notice appear in all copies, and that the name of IBM
+not be used in connection with the marketing of any product incorporating
+the Software or modifications thereof, without specific, written prior
+permission.
+
+To the extent it has a right to do so, IBM grants an immunity from suit
+under its patents, if any, for the use, sale or manufacture of products to
+the extent that such products are used for performing Domain Name System
+dynamic updates in TCP/IP networks by means of the Software.  No immunity is
+granted for any product per se or for any other function of any product.
+
+THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
+DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
+OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
+IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+
+License notice for mongoc.css_t
+-------------------------------------------------------------------------------
+
+MIT License
+
+Portions Copyright 2013 by Ignacy Sokolowski.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+License notice for zlib
+-------------------------------------------------------------------------------
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.11, January 15th, 2017
+
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup@gzip.org          madler@alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950
+  (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format).
+*/
+
+License notice for common-md5.c
+-------------------------------------------------------------------------------
+
+ZLib License
+
+Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+L. Peter Deutsch
+ghost@aladdin.com
diff --git a/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/uninstall.cmd b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/uninstall.cmd
new file mode 100644
index 0000000..61093cb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/Win64/share/mongo-c-driver/uninstall.cmd
@@ -0,0 +1,375 @@
+@echo off
+
+REM Mongo C Driver uninstall program, generated with CMake
+
+REM Copyright 2018-present MongoDB, Inc.
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM   http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+
+
+REM Windows does not handle a batch script deleting itself during
+REM execution.  Copy the uninstall program into the TEMP directory from
+REM the environment and run from there so everything in the installation
+REM is deleted and the copied program deletes itself at the end.
+if /i "%~dp0" NEQ "%TEMP%\" (
+   copy "%~f0" "%TEMP%\mongoc-%~nx0" >NUL
+   "%TEMP%\mongoc-%~nx0" & del "%TEMP%\mongoc-%~nx0"
+)
+
+pushd C:\UnrealProjects\ArrivalSim\Plugins\UnrealArrival\Source\ThirdParty\mongodb_c\Win64\
+
+echo Removing file bin\msvcp140.dll
+del bin\msvcp140.dll || echo ... not removed
+echo Removing file bin\msvcp140_1.dll
+del bin\msvcp140_1.dll || echo ... not removed
+echo Removing file bin\msvcp140_2.dll
+del bin\msvcp140_2.dll || echo ... not removed
+echo Removing file bin\msvcp140_atomic_wait.dll
+del bin\msvcp140_atomic_wait.dll || echo ... not removed
+echo Removing file bin\msvcp140_codecvt_ids.dll
+del bin\msvcp140_codecvt_ids.dll || echo ... not removed
+echo Removing file bin\vcruntime140_1.dll
+del bin\vcruntime140_1.dll || echo ... not removed
+echo Removing file bin\vcruntime140.dll
+del bin\vcruntime140.dll || echo ... not removed
+echo Removing file bin\concrt140.dll
+del bin\concrt140.dll || echo ... not removed
+echo Removing file share\mongo-c-driver\COPYING
+del share\mongo-c-driver\COPYING || echo ... not removed
+echo Removing file share\mongo-c-driver\NEWS
+del share\mongo-c-driver\NEWS || echo ... not removed
+echo Removing file share\mongo-c-driver\README.rst
+del share\mongo-c-driver\README.rst || echo ... not removed
+echo Removing file share\mongo-c-driver\THIRD_PARTY_NOTICES
+del share\mongo-c-driver\THIRD_PARTY_NOTICES || echo ... not removed
+echo Removing file bin\msvcp140.dll
+del bin\msvcp140.dll || echo ... not removed
+echo Removing file bin\msvcp140_1.dll
+del bin\msvcp140_1.dll || echo ... not removed
+echo Removing file bin\msvcp140_2.dll
+del bin\msvcp140_2.dll || echo ... not removed
+echo Removing file bin\msvcp140_atomic_wait.dll
+del bin\msvcp140_atomic_wait.dll || echo ... not removed
+echo Removing file bin\msvcp140_codecvt_ids.dll
+del bin\msvcp140_codecvt_ids.dll || echo ... not removed
+echo Removing file bin\vcruntime140_1.dll
+del bin\vcruntime140_1.dll || echo ... not removed
+echo Removing file bin\vcruntime140.dll
+del bin\vcruntime140.dll || echo ... not removed
+echo Removing file bin\concrt140.dll
+del bin\concrt140.dll || echo ... not removed
+echo Removing file bin\msvcp140.dll
+del bin\msvcp140.dll || echo ... not removed
+echo Removing file bin\msvcp140_1.dll
+del bin\msvcp140_1.dll || echo ... not removed
+echo Removing file bin\msvcp140_2.dll
+del bin\msvcp140_2.dll || echo ... not removed
+echo Removing file bin\msvcp140_atomic_wait.dll
+del bin\msvcp140_atomic_wait.dll || echo ... not removed
+echo Removing file bin\msvcp140_codecvt_ids.dll
+del bin\msvcp140_codecvt_ids.dll || echo ... not removed
+echo Removing file bin\vcruntime140_1.dll
+del bin\vcruntime140_1.dll || echo ... not removed
+echo Removing file bin\vcruntime140.dll
+del bin\vcruntime140.dll || echo ... not removed
+echo Removing file bin\concrt140.dll
+del bin\concrt140.dll || echo ... not removed
+echo Removing file lib\bson-1.0.lib
+del lib\bson-1.0.lib || echo ... not removed
+echo Removing file bin\bson-1.0.dll
+del bin\bson-1.0.dll || echo ... not removed
+echo Removing file lib\bson-static-1.0.lib
+del lib\bson-static-1.0.lib || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-config.h
+del include\libbson-1.0\bson\bson-config.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-version.h
+del include\libbson-1.0\bson\bson-version.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bcon.h
+del include\libbson-1.0\bson\bcon.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-atomic.h
+del include\libbson-1.0\bson\bson-atomic.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-clock.h
+del include\libbson-1.0\bson\bson-clock.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-cmp.h
+del include\libbson-1.0\bson\bson-cmp.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-compat.h
+del include\libbson-1.0\bson\bson-compat.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-context.h
+del include\libbson-1.0\bson\bson-context.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-decimal128.h
+del include\libbson-1.0\bson\bson-decimal128.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-endian.h
+del include\libbson-1.0\bson\bson-endian.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-error.h
+del include\libbson-1.0\bson\bson-error.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson.h
+del include\libbson-1.0\bson\bson.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-iter.h
+del include\libbson-1.0\bson\bson-iter.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-json.h
+del include\libbson-1.0\bson\bson-json.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-keys.h
+del include\libbson-1.0\bson\bson-keys.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-macros.h
+del include\libbson-1.0\bson\bson-macros.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-md5.h
+del include\libbson-1.0\bson\bson-md5.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-memory.h
+del include\libbson-1.0\bson\bson-memory.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-oid.h
+del include\libbson-1.0\bson\bson-oid.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-prelude.h
+del include\libbson-1.0\bson\bson-prelude.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-reader.h
+del include\libbson-1.0\bson\bson-reader.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-string.h
+del include\libbson-1.0\bson\bson-string.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-types.h
+del include\libbson-1.0\bson\bson-types.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-utf8.h
+del include\libbson-1.0\bson\bson-utf8.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-value.h
+del include\libbson-1.0\bson\bson-value.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-version-functions.h
+del include\libbson-1.0\bson\bson-version-functions.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson\bson-writer.h
+del include\libbson-1.0\bson\bson-writer.h || echo ... not removed
+echo Removing file include\libbson-1.0\bson.h
+del include\libbson-1.0\bson.h || echo ... not removed
+echo Removing file lib\pkgconfig\libbson-1.0.pc
+del lib\pkgconfig\libbson-1.0.pc || echo ... not removed
+echo Removing file lib\pkgconfig\libbson-static-1.0.pc
+del lib\pkgconfig\libbson-static-1.0.pc || echo ... not removed
+echo Removing file lib\cmake\bson-1.0\bson-targets.cmake
+del lib\cmake\bson-1.0\bson-targets.cmake || echo ... not removed
+echo Removing file lib\cmake\bson-1.0\bson-targets-release.cmake
+del lib\cmake\bson-1.0\bson-targets-release.cmake || echo ... not removed
+echo Removing file lib\cmake\bson-1.0\bson-1.0-config.cmake
+del lib\cmake\bson-1.0\bson-1.0-config.cmake || echo ... not removed
+echo Removing file lib\cmake\bson-1.0\bson-1.0-config-version.cmake
+del lib\cmake\bson-1.0\bson-1.0-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\libbson-1.0\libbson-1.0-config.cmake
+del lib\cmake\libbson-1.0\libbson-1.0-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libbson-1.0\libbson-1.0-config-version.cmake
+del lib\cmake\libbson-1.0\libbson-1.0-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\libbson-static-1.0\libbson-static-1.0-config.cmake
+del lib\cmake\libbson-static-1.0\libbson-static-1.0-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libbson-static-1.0\libbson-static-1.0-config-version.cmake
+del lib\cmake\libbson-static-1.0\libbson-static-1.0-config-version.cmake || echo ... not removed
+echo Removing file bin\msvcp140.dll
+del bin\msvcp140.dll || echo ... not removed
+echo Removing file bin\msvcp140_1.dll
+del bin\msvcp140_1.dll || echo ... not removed
+echo Removing file bin\msvcp140_2.dll
+del bin\msvcp140_2.dll || echo ... not removed
+echo Removing file bin\msvcp140_atomic_wait.dll
+del bin\msvcp140_atomic_wait.dll || echo ... not removed
+echo Removing file bin\msvcp140_codecvt_ids.dll
+del bin\msvcp140_codecvt_ids.dll || echo ... not removed
+echo Removing file bin\vcruntime140_1.dll
+del bin\vcruntime140_1.dll || echo ... not removed
+echo Removing file bin\vcruntime140.dll
+del bin\vcruntime140.dll || echo ... not removed
+echo Removing file bin\concrt140.dll
+del bin\concrt140.dll || echo ... not removed
+echo Removing file bin\msvcp140.dll
+del bin\msvcp140.dll || echo ... not removed
+echo Removing file bin\msvcp140_1.dll
+del bin\msvcp140_1.dll || echo ... not removed
+echo Removing file bin\msvcp140_2.dll
+del bin\msvcp140_2.dll || echo ... not removed
+echo Removing file bin\msvcp140_atomic_wait.dll
+del bin\msvcp140_atomic_wait.dll || echo ... not removed
+echo Removing file bin\msvcp140_codecvt_ids.dll
+del bin\msvcp140_codecvt_ids.dll || echo ... not removed
+echo Removing file bin\vcruntime140_1.dll
+del bin\vcruntime140_1.dll || echo ... not removed
+echo Removing file bin\vcruntime140.dll
+del bin\vcruntime140.dll || echo ... not removed
+echo Removing file bin\concrt140.dll
+del bin\concrt140.dll || echo ... not removed
+echo Removing file lib\mongoc-1.0.lib
+del lib\mongoc-1.0.lib || echo ... not removed
+echo Removing file bin\mongoc-1.0.dll
+del bin\mongoc-1.0.dll || echo ... not removed
+echo Removing file lib\mongoc-static-1.0.lib
+del lib\mongoc-static-1.0.lib || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-config.h
+del include\libmongoc-1.0\mongoc\mongoc-config.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-version.h
+del include\libmongoc-1.0\mongoc\mongoc-version.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc.h
+del include\libmongoc-1.0\mongoc\mongoc.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-apm.h
+del include\libmongoc-1.0\mongoc\mongoc-apm.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-bulk-operation.h
+del include\libmongoc-1.0\mongoc\mongoc-bulk-operation.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-change-stream.h
+del include\libmongoc-1.0\mongoc\mongoc-change-stream.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-client.h
+del include\libmongoc-1.0\mongoc\mongoc-client.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-client-pool.h
+del include\libmongoc-1.0\mongoc\mongoc-client-pool.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-client-side-encryption.h
+del include\libmongoc-1.0\mongoc\mongoc-client-side-encryption.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-collection.h
+del include\libmongoc-1.0\mongoc\mongoc-collection.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-cursor.h
+del include\libmongoc-1.0\mongoc\mongoc-cursor.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-database.h
+del include\libmongoc-1.0\mongoc\mongoc-database.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-error.h
+del include\libmongoc-1.0\mongoc\mongoc-error.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-flags.h
+del include\libmongoc-1.0\mongoc\mongoc-flags.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-find-and-modify.h
+del include\libmongoc-1.0\mongoc\mongoc-find-and-modify.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-gridfs.h
+del include\libmongoc-1.0\mongoc\mongoc-gridfs.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-gridfs-bucket.h
+del include\libmongoc-1.0\mongoc\mongoc-gridfs-bucket.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-gridfs-file.h
+del include\libmongoc-1.0\mongoc\mongoc-gridfs-file.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-gridfs-file-page.h
+del include\libmongoc-1.0\mongoc\mongoc-gridfs-file-page.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-gridfs-file-list.h
+del include\libmongoc-1.0\mongoc\mongoc-gridfs-file-list.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-handshake.h
+del include\libmongoc-1.0\mongoc\mongoc-handshake.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-host-list.h
+del include\libmongoc-1.0\mongoc\mongoc-host-list.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-init.h
+del include\libmongoc-1.0\mongoc\mongoc-init.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-index.h
+del include\libmongoc-1.0\mongoc\mongoc-index.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-iovec.h
+del include\libmongoc-1.0\mongoc\mongoc-iovec.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-log.h
+del include\libmongoc-1.0\mongoc\mongoc-log.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-macros.h
+del include\libmongoc-1.0\mongoc\mongoc-macros.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-matcher.h
+del include\libmongoc-1.0\mongoc\mongoc-matcher.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-opcode.h
+del include\libmongoc-1.0\mongoc\mongoc-opcode.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-optional.h
+del include\libmongoc-1.0\mongoc\mongoc-optional.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-prelude.h
+del include\libmongoc-1.0\mongoc\mongoc-prelude.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-read-concern.h
+del include\libmongoc-1.0\mongoc\mongoc-read-concern.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-read-prefs.h
+del include\libmongoc-1.0\mongoc\mongoc-read-prefs.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-server-api.h
+del include\libmongoc-1.0\mongoc\mongoc-server-api.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-server-description.h
+del include\libmongoc-1.0\mongoc\mongoc-server-description.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-client-session.h
+del include\libmongoc-1.0\mongoc\mongoc-client-session.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-socket.h
+del include\libmongoc-1.0\mongoc\mongoc-socket.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream-tls-libressl.h
+del include\libmongoc-1.0\mongoc\mongoc-stream-tls-libressl.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream-tls-openssl.h
+del include\libmongoc-1.0\mongoc\mongoc-stream-tls-openssl.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream.h
+del include\libmongoc-1.0\mongoc\mongoc-stream.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream-buffered.h
+del include\libmongoc-1.0\mongoc\mongoc-stream-buffered.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream-file.h
+del include\libmongoc-1.0\mongoc\mongoc-stream-file.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream-gridfs.h
+del include\libmongoc-1.0\mongoc\mongoc-stream-gridfs.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream-socket.h
+del include\libmongoc-1.0\mongoc\mongoc-stream-socket.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-topology-description.h
+del include\libmongoc-1.0\mongoc\mongoc-topology-description.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-uri.h
+del include\libmongoc-1.0\mongoc\mongoc-uri.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-version-functions.h
+del include\libmongoc-1.0\mongoc\mongoc-version-functions.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-write-concern.h
+del include\libmongoc-1.0\mongoc\mongoc-write-concern.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-rand.h
+del include\libmongoc-1.0\mongoc\mongoc-rand.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-stream-tls.h
+del include\libmongoc-1.0\mongoc\mongoc-stream-tls.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc\mongoc-ssl.h
+del include\libmongoc-1.0\mongoc\mongoc-ssl.h || echo ... not removed
+echo Removing file include\libmongoc-1.0\mongoc.h
+del include\libmongoc-1.0\mongoc.h || echo ... not removed
+echo Removing file lib\pkgconfig\libmongoc-1.0.pc
+del lib\pkgconfig\libmongoc-1.0.pc || echo ... not removed
+echo Removing file lib\pkgconfig\libmongoc-static-1.0.pc
+del lib\pkgconfig\libmongoc-static-1.0.pc || echo ... not removed
+echo Removing file lib\pkgconfig\libmongoc-ssl-1.0.pc
+del lib\pkgconfig\libmongoc-ssl-1.0.pc || echo ... not removed
+echo Removing file lib\cmake\mongoc-1.0\mongoc-targets.cmake
+del lib\cmake\mongoc-1.0\mongoc-targets.cmake || echo ... not removed
+echo Removing file lib\cmake\mongoc-1.0\mongoc-targets-release.cmake
+del lib\cmake\mongoc-1.0\mongoc-targets-release.cmake || echo ... not removed
+echo Removing file lib\cmake\mongoc-1.0\mongoc-1.0-config.cmake
+del lib\cmake\mongoc-1.0\mongoc-1.0-config.cmake || echo ... not removed
+echo Removing file lib\cmake\mongoc-1.0\mongoc-1.0-config-version.cmake
+del lib\cmake\mongoc-1.0\mongoc-1.0-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\libmongoc-1.0\libmongoc-1.0-config.cmake
+del lib\cmake\libmongoc-1.0\libmongoc-1.0-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libmongoc-1.0\libmongoc-1.0-config-version.cmake
+del lib\cmake\libmongoc-1.0\libmongoc-1.0-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\libmongoc-static-1.0\libmongoc-static-1.0-config.cmake
+del lib\cmake\libmongoc-static-1.0\libmongoc-static-1.0-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libmongoc-static-1.0\libmongoc-static-1.0-config-version.cmake
+del lib\cmake\libmongoc-static-1.0\libmongoc-static-1.0-config-version.cmake || echo ... not removed
+echo Removing file share\mongo-c-driver\uninstall.cmd
+del share\mongo-c-driver\uninstall.cmd || echo ... not removed
+echo Removing directory bin
+(rmdir bin 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\libbson-1.0\bson
+(rmdir include\libbson-1.0\bson 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\libbson-1.0
+(rmdir include\libbson-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\libmongoc-1.0\mongoc
+(rmdir include\libmongoc-1.0\mongoc 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\libmongoc-1.0
+(rmdir include\libmongoc-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include
+(rmdir include 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\bson-1.0
+(rmdir lib\cmake\bson-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libbson-1.0
+(rmdir lib\cmake\libbson-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libbson-static-1.0
+(rmdir lib\cmake\libbson-static-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libmongoc-1.0
+(rmdir lib\cmake\libmongoc-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libmongoc-static-1.0
+(rmdir lib\cmake\libmongoc-static-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\mongoc-1.0
+(rmdir lib\cmake\mongoc-1.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake
+(rmdir lib\cmake 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\pkgconfig
+(rmdir lib\pkgconfig 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib
+(rmdir lib 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory share\mongo-c-driver
+(rmdir share\mongo-c-driver 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory share
+(rmdir share 2>NUL) || echo ... not removed (probably not empty)
+cd ..
+echo Removing top-level installation directory: C:\UnrealProjects\ArrivalSim\Plugins\UnrealArrival\Source\ThirdParty\mongodb_c\Win64\
+(rmdir C:\UnrealProjects\ArrivalSim\Plugins\UnrealArrival\Source\ThirdParty\mongodb_c\Win64\ 2>NUL) || echo ... not removed (probably not empty)
+
+REM Return to the directory from which the program was called
+popd
diff --git a/Source/ThirdParty/mongodb_c/build_linux.bat b/Source/ThirdParty/mongodb_c/build_linux.bat
new file mode 100644
index 0000000..9384211
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/build_linux.bat
@@ -0,0 +1,15 @@
+setlocal
+
+SET TOOLCHAIN_FILE="%cd%\..\unreal-linux-from-windows-toolchain.cmake"
+SET MAKE_EXE="C:\Program Files (x86)\GnuWin32\bin\make.exe" 
+SET INSTALL_DIR="%cd%\Linux"
+
+rd \s \q %INSTALL_DIR%
+mkdir %INSTALL_DIR%
+
+if not exist src\build_linux mkdir src\build_linux
+pushd src\build_linux
+
+cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=%TOOLCHAIN_FILE% -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_MONGODB_AWS_AUTH=OFF -DMONGOC_TEST_USE_CRYPT_SHARED=OFF .. && make -j8 install
+
+popd
diff --git a/Source/ThirdParty/mongodb_c/build_win.bat b/Source/ThirdParty/mongodb_c/build_win.bat
new file mode 100644
index 0000000..7388f5a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/build_win.bat
@@ -0,0 +1,11 @@
+setlocal
+
+SET INSTALL_DIR="%cd%\Win64"
+
+rd /s /q %INSTALL_DIR%
+mkdir %INSTALL_DIR%
+
+if not exist src\build_win mkdir src\build_win
+pushd src\build_win
+cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% .. && nmake install
+popd
diff --git a/Source/ThirdParty/mongodb_c/mongo-c-driver-1.23.1.tar.gz b/Source/ThirdParty/mongodb_c/mongo-c-driver-1.23.1.tar.gz
new file mode 100644
index 0000000..a9559f0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/mongo-c-driver-1.23.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1e4f59713b2e48dba1ed962bc0e52b00479b009a9ec4e5fbece61bda76a42df
+size 7472200
diff --git a/Source/ThirdParty/mongodb_c/mongodb_c.Build.cs b/Source/ThirdParty/mongodb_c/mongodb_c.Build.cs
new file mode 100644
index 0000000..4e1f28a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_c/mongodb_c.Build.cs
@@ -0,0 +1,43 @@
+using System.IO;
+using UnrealBuildTool;
+using System;
+
+public class mongodb_c : ModuleRules
+{
+	private string BinariesPath
+	{
+		get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../../../Binaries/", Target.Platform.ToString())); }
+	}
+
+	public mongodb_c(ReadOnlyTargetRules Target) : base(Target)
+	{
+		Type = ModuleType.External;
+
+		if (Target.Platform == UnrealTargetPlatform.Win64)
+		{
+			string InstallDir = Path.Combine(ModuleDirectory, "Win64");
+			PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "libbson-1.0")); 
+			PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "libmongoc-1.0")); 
+			PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "bson-static-1.0.lib"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "mongoc-static-1.0.lib"));
+            PublicDefinitions.Add("BSON_STATIC");
+            PublicDefinitions.Add("MONGOC_STATIC");
+
+            PublicAdditionalLibraries.Add("Bcrypt.lib");
+			PublicAdditionalLibraries.Add("Dnsapi.lib");
+            PublicAdditionalLibraries.Add("Secur32.lib");
+        }
+		else if (Target.Platform == UnrealTargetPlatform.Linux)
+		{
+            string InstallDir = Path.Combine(ModuleDirectory, "Linux");
+            PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "libbson-1.0"));
+            PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "libmongoc-1.0"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "libbson-static-1.0.a"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "libmongoc-static-1.0.a"));
+            PublicAdditionalLibraries.Add(Path.Combine(BinariesPath, "libresolv.so"));
+            RuntimeDependencies.Add(Path.Combine(BinariesPath, "libresolv.so"));
+            PublicDefinitions.Add("BSON_STATIC");
+            PublicDefinitions.Add("MONGOC_STATIC");
+        }
+	}
+}
diff --git a/Source/ThirdParty/mongodb_cpp/.gitignore b/Source/ThirdParty/mongodb_cpp/.gitignore
new file mode 100644
index 0000000..e831038
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/.gitignore
@@ -0,0 +1 @@
+src
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp
new file mode 100644
index 0000000..7f77135
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp
@@ -0,0 +1,127 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#include <bsoncxx/document/element.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+namespace bson_value {
+class view;
+}  // namespace bson_value
+}  // namespace types
+
+namespace array {
+
+///
+/// A variant view type that accesses values in serialized BSON arrays.
+///
+/// Element functions as a variant type, where the kind of the element can be
+/// interrogated by calling type() and a specific value can be extracted through
+/// get_X() accessors.
+///
+class BSONCXX_API element : private document::element {
+   public:
+    element();
+
+    using document::element::operator bool;
+
+    using document::element::type;
+
+    using document::element::get_array;
+    using document::element::get_binary;
+    using document::element::get_bool;
+    using document::element::get_code;
+    using document::element::get_codewscope;
+    using document::element::get_date;
+    using document::element::get_dbpointer;
+    using document::element::get_decimal128;
+    using document::element::get_document;
+    using document::element::get_double;
+    using document::element::get_int32;
+    using document::element::get_int64;
+    using document::element::get_maxkey;
+    using document::element::get_minkey;
+    using document::element::get_null;
+    using document::element::get_oid;
+    using document::element::get_regex;
+    using document::element::get_string;
+    using document::element::get_symbol;
+    using document::element::get_timestamp;
+    using document::element::get_undefined;
+    using document::element::get_utf8;
+
+    using document::element::get_value;
+
+    using document::element::operator[];
+
+    using document::element::key;
+    using document::element::keylen;
+    using document::element::length;
+    using document::element::offset;
+    using document::element::raw;
+
+   private:
+    friend class view;
+
+    BSONCXX_PRIVATE explicit element(const std::uint8_t* raw,
+                                     std::uint32_t length,
+                                     std::uint32_t offset,
+                                     std::uint32_t keylen);
+};
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns true if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator==(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator==(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns false if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator!=(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+}  // namespace array
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp
new file mode 100644
index 0000000..35ecd46
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp
@@ -0,0 +1,120 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdlib>
+#include <memory>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace array {
+
+///
+/// A read-only BSON array that owns its underlying buffer. When a array::value goes
+/// out of scope, the underlying buffer is freed. Generally this class should be used
+/// sparingly; array::view should be used instead wherever possible.
+///
+class BSONCXX_API value {
+   public:
+    using deleter_type = void (*)(std::uint8_t*);
+    using unique_ptr_type = std::unique_ptr<uint8_t[], deleter_type>;
+
+    ///
+    /// Constructs a value from a buffer.
+    /// This constructor transfers ownership of the buffer to the resulting
+    /// value. A user-provided deleter is used to destroy the buffer.
+    ///
+    /// @param data
+    ///   A pointer to a buffer containing a valid BSON array.
+    /// @param length
+    ///   The length of the document.
+    /// @param dtor
+    ///   A user provided deleter.
+    ///
+    value(std::uint8_t* data, std::size_t length, deleter_type dtor);
+
+    ///
+    /// Constructs a value from a std::unique_ptr to a buffer. The ownership
+    /// of the buffer is transferred to the resulting value.
+    ///
+    /// @param ptr
+    ///   A pointer to a buffer containing a valid BSON array.
+    /// @param length
+    ///   The length of the document.
+    ///
+    value(unique_ptr_type ptr, std::size_t length);
+
+    ///
+    /// Constructs a value from a view of an array. The data referenced
+    /// by the array::view will be copied into a new buffer managed by the
+    /// constructed value.
+    ///
+    /// @param view
+    ///   A view of another array to copy.
+    ///
+    explicit value(array::view view);
+
+    value(const value&);
+    value& operator=(const value&);
+
+    value(value&&) noexcept = default;
+    value& operator=(value&&) noexcept = default;
+
+    ///
+    /// Get a view over the document owned by this value.
+    ///
+    BSONCXX_INLINE array::view view() const noexcept;
+
+    ///
+    /// Conversion operator that provides a view given a value.
+    ///
+    /// @return A view over the value.
+    ///
+    BSONCXX_INLINE operator array::view() const noexcept;
+
+    ///
+    /// Transfer ownership of the underlying buffer to the caller.
+    ///
+    /// @warning
+    ///   After calling release() it is illegal to call any methods
+    ///   on this class, unless it is subsequently moved into.
+    ///
+    /// @return A std::unique_ptr with ownership of the buffer.
+    ///
+    unique_ptr_type release();
+
+   private:
+    unique_ptr_type _data;
+    std::size_t _length{0};
+};
+
+BSONCXX_INLINE array::view value::view() const noexcept {
+    return array::view{static_cast<uint8_t*>(_data.get()), _length};
+}
+
+BSONCXX_INLINE value::operator array::view() const noexcept {
+    return view();
+}
+
+}  // namespace array
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp
new file mode 100644
index 0000000..5dec9f5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp
@@ -0,0 +1,200 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+
+#include <bsoncxx/array/element.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+namespace bson_value {
+class view;
+}  // namespace bson_value
+}  // namespace types
+
+namespace array {
+
+///
+/// A read-only, non-owning view of a BSON document.
+///
+class BSONCXX_API view {
+   public:
+    class BSONCXX_API const_iterator;
+    using iterator = const_iterator;
+
+    ///
+    /// @returns A const_iterator to the first element of the array.
+    ///
+    const_iterator cbegin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the array.
+    ///
+    const_iterator cend() const;
+
+    ///
+    /// @returns A const_iterator to the first element of the array.
+    ///
+    const_iterator begin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the array.
+    ///
+    const_iterator end() const;
+
+    ///
+    /// Indexes into this BSON array. If the index is out-of-bounds, a past-the-end iterator
+    /// will be returned. As BSON represents arrays as documents, the runtime of find() is
+    /// linear in the length of the array.
+    ///
+    /// @param i
+    ///   The index of the element.
+    ///
+    /// @return An iterator to the element if it exists, or the past-the-end iterator.
+    ///
+    const_iterator find(std::uint32_t i) const;
+
+    ///
+    /// Indexes into this BSON array. If the index is out-of-bounds, the invalid array::element
+    /// will be returned. As BSON represents arrays as documents, the runtime of operator[] is
+    /// linear in the length of the array.
+    ///
+    /// @param i
+    ///   The index of the element.
+    ///
+    /// @return The element if it exists, or the invalid element.
+    ///
+    element operator[](std::uint32_t i) const;
+
+    ///
+    /// Default constructs a view. The resulting view will be initialized to point at
+    /// an empty BSON array.
+    ///
+    view();
+
+    ///
+    /// Constructs a view from a buffer. The caller is responsible for ensuring that
+    /// the lifetime of the resulting view is a subset of the buffer's.
+    ///
+    /// @param data
+    ///   A buffer containing a valid BSON array.
+    /// @param length
+    ///   The size of the buffer, in bytes.
+    ///
+    view(const std::uint8_t* data, std::size_t length);
+
+    ///
+    /// Access the raw bytes of the underlying array.
+    ///
+    /// @return A (non-owning) pointer to the view's buffer.
+    ///
+    const std::uint8_t* data() const;
+
+    ///
+    /// Gets the length of the underlying buffer.
+    ///
+    /// @remark This is not the number of elements in the array.
+    /// To compute the number of elements, use std::distance.
+    ///
+    /// @return The length of the array, in bytes.
+    ///
+    std::size_t length() const;
+
+    ///
+    /// Checks if the underlying buffer is empty, i.e. it is equivalent to
+    /// the trivial array '[]'.
+    ///
+    /// @return true if the underlying document is empty.
+    ///
+    bool empty() const;
+
+    ///
+    /// Conversion operator unwrapping a document::view
+    ///
+    operator document::view() const;
+
+    ///
+    /// @{
+    ///
+    /// Compare two views for (in)-equality
+    ///
+    /// @relates view
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(view, view);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(view, view);
+    ///
+    /// @}
+    ///
+
+   private:
+    document::view _view;
+};
+
+///
+/// A const iterator over the contents of an array view.
+///
+/// This iterator type provides a const forward iterator interface to array
+/// view elements.
+///
+class BSONCXX_API view::const_iterator {
+   public:
+    ///
+    /// std::iterator_traits
+    ///
+    using value_type = element;
+    using reference = element&;
+    using pointer = element*;
+    using iterator_category = std::forward_iterator_tag;
+    using difference_type = std::ptrdiff_t;
+
+    const_iterator();
+    explicit const_iterator(const element& element);
+
+    reference operator*();
+    pointer operator->();
+
+    const_iterator& operator++();
+    const_iterator operator++(int);
+
+    ///
+    /// @{
+    ///
+    /// Compare two const_iterators for (in)-equality
+    ///
+    /// @relates view::const_iterator
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const const_iterator&, const const_iterator&);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const const_iterator&, const const_iterator&);
+    ///
+    /// @}
+    ///
+
+   private:
+    element _element;
+};
+
+}  // namespace array
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp
new file mode 100644
index 0000000..29c61a3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp
@@ -0,0 +1,34 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace array {
+
+using view_or_value = bsoncxx::view_or_value<array::view, array::value>;
+
+}  // namespace array
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp
new file mode 100644
index 0000000..3d515cd
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp
@@ -0,0 +1,119 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/builder/basic/impl.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/builder/basic/sub_array.hpp>
+#include <bsoncxx/builder/core.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+///
+/// A traditional builder-style interface for constructing
+/// a BSON array.
+///
+class array : public sub_array {
+   public:
+    ///
+    /// Default constructor
+    ///
+    BSONCXX_INLINE array() : sub_array(&_core), _core(true) {}
+
+    ///
+    /// Move constructor
+    ///
+    BSONCXX_INLINE array(array&& arr) noexcept : sub_array(&_core), _core(std::move(arr._core)) {}
+
+    ///
+    /// Move assignment operator
+    ///
+    BSONCXX_INLINE array& operator=(array&& arr) noexcept {
+        _core = std::move(arr._core);
+        return *this;
+    }
+
+    ///
+    /// @return A view of the BSON array.
+    ///
+    BSONCXX_INLINE bsoncxx::array::view view() const {
+        return _core.view_array();
+    }
+
+    ///
+    /// Conversion operator that provides a view of the current builder
+    /// contents.
+    ///
+    /// @return A view of the current builder contents.
+    ///
+    BSONCXX_INLINE operator bsoncxx::array::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying array to the caller.
+    ///
+    /// @return An array::value with ownership of the array.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequenly moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::array::value extract() {
+        return _core.extract_array();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty array.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+///
+/// Creates an array from a list of elements.
+///
+/// @param args
+///   A variadiac list of elements. The types of the elements can be anything that
+///   builder::basic::sub_array::append accepts.
+///
+/// @return
+///   A bsoncxx::array::value containing the elements.
+///
+template <typename... Args>
+bsoncxx::array::value BSONCXX_CALL make_array(Args&&... args) {
+    basic::array array;
+    array.append(std::forward<Args>(args)...);
+
+    return array.extract();
+}
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp
new file mode 100644
index 0000000..122d482
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp
@@ -0,0 +1,122 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/impl.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/builder/basic/sub_document.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+class array;
+
+///
+/// A traditional builder-style interface for constructing
+/// a BSON document.
+///
+class document : public sub_document {
+   public:
+    ///
+    /// Default constructor
+    ///
+    BSONCXX_INLINE document() : sub_document(&_core), _core(false) {}
+
+    ///
+    /// Move constructor
+    ///
+    BSONCXX_INLINE document(document&& doc) noexcept
+        : sub_document(&_core), _core(std::move(doc._core)) {}
+
+    ///
+    /// Move assignment operator
+    ///
+    BSONCXX_INLINE document& operator=(document&& doc) noexcept {
+        _core = std::move(doc._core);
+        return *this;
+    }
+
+    ///
+    /// @return A view of the BSON document.
+    ///
+    BSONCXX_INLINE bsoncxx::document::view view() const {
+        return _core.view_document();
+    }
+
+    ///
+    /// Conversion operator that provides a view of the current builder
+    /// contents.
+    ///
+    /// @return A view of the current builder contents.
+    ///
+    BSONCXX_INLINE operator bsoncxx::document::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequently moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::document::value extract() {
+        return _core.extract_document();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty document.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+///
+/// Creates a document from a list of key-value pairs.
+///
+/// @param args
+///   A variadic list of key-value pairs. The types of the keys and values can be anything that
+///   builder::basic::sub_document::append accepts.
+///
+/// @return
+///   A bsoncxx::document::value containing the elements.
+///
+template <typename... Args>
+bsoncxx::document::value BSONCXX_CALL make_document(Args&&... args) {
+    basic::document document;
+    document.append(std::forward<Args>(args)...);
+
+    return document.extract();
+}
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp
new file mode 100644
index 0000000..58b06ba
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp
@@ -0,0 +1,33 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/concatenate.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+using bsoncxx::builder::concatenate;
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp
new file mode 100644
index 0000000..ab97d81
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp
@@ -0,0 +1,69 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/sub_array.hpp>
+#include <bsoncxx/builder/basic/sub_document.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+namespace impl {
+
+template <typename T>
+using takes_document = typename util::is_functor<T, void(sub_document)>;
+
+template <typename T>
+using takes_array = typename util::is_functor<T, void(sub_array)>;
+
+template <typename T>
+BSONCXX_INLINE typename std::enable_if<takes_document<T>::value, void>::type generic_append(
+    core* core, T&& func) {
+    core->open_document();
+    func(sub_document(core));
+    core->close_document();
+}
+
+template <typename T>
+BSONCXX_INLINE typename std::enable_if<takes_array<T>::value, void>::type generic_append(core* core,
+                                                                                         T&& func) {
+    core->open_array();
+    func(sub_array(core));
+    core->close_array();
+}
+
+template <typename T>
+BSONCXX_INLINE
+    typename std::enable_if<!takes_document<T>::value && !takes_array<T>::value, void>::type
+    generic_append(core* core, T&& t) {
+    core->append(std::forward<T>(t));
+}
+
+template <typename T>
+BSONCXX_INLINE void value_append(core* core, T&& t) {
+    generic_append(core, std::forward<T>(t));
+}
+
+}  // namespace impl
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp
new file mode 100644
index 0000000..0d779aa
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp
@@ -0,0 +1,40 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <tuple>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+///
+/// Constructs a key-value pair from a string key
+/// and a BSON value.
+///
+template <typename T, typename U>
+BSONCXX_INLINE std::tuple<T&&, U&&> kvp(T&& t, U&& u) {
+    return std::tuple<T&&, U&&>(std::forward<T>(t), std::forward<U>(u));
+}
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp
new file mode 100644
index 0000000..ef8f3d0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp
@@ -0,0 +1,86 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/helpers.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/builder/core.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+namespace impl {
+
+template <typename T>
+void value_append(core* core, T&& t);
+
+}  // namespace impl
+
+///
+/// An internal class of builder::basic.
+/// Users should almost always construct a builder::basic::array instead.
+///
+class sub_array {
+   public:
+    ///
+    /// Default constructor
+    ///
+    BSONCXX_INLINE sub_array(core* core) : _core(core) {}
+
+    ///
+    /// Appends multiple BSON values.
+    ///
+    template <typename Arg, typename... Args>
+    BSONCXX_INLINE void append(Arg&& a, Args&&... args) {
+        append_(std::forward<Arg>(a));
+        append(std::forward<Args>(args)...);
+    }
+
+    ///
+    /// Inductive base-case for the variadic append(...)
+    ///
+    BSONCXX_INLINE
+    void append() {}
+
+   private:
+    //
+    // Appends a BSON value.
+    //
+    template <typename T>
+    BSONCXX_INLINE void append_(T&& t) {
+        impl::value_append(_core, std::forward<T>(t));
+    }
+
+    //
+    // Concatenates another bson array directly.
+    //
+    BSONCXX_INLINE
+    void append_(concatenate_array array) {
+        _core->concatenate(array.view());
+    }
+
+    core* _core;
+};
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp
new file mode 100644
index 0000000..7c345d3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp
@@ -0,0 +1,105 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/helpers.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+namespace impl {
+template <typename T>
+void value_append(core* core, T&& t);
+}  // namespace impl
+
+///
+/// An internal class of builder::basic.
+/// Users should almost always construct a builder::basic::document instead.
+///
+class sub_document {
+   public:
+    BSONCXX_INLINE sub_document(core* core) : _core(core) {}
+
+    ///
+    /// Appends multiple basic::kvp key-value pairs.
+    ///
+    template <typename Arg, typename... Args>
+    BSONCXX_INLINE void append(Arg&& a, Args&&... args) {
+        append_(std::forward<Arg>(a));
+        append(std::forward<Args>(args)...);
+    }
+
+    ///
+    /// Inductive base-case for the variadic append(...)
+    ///
+    BSONCXX_INLINE
+    void append() {}
+
+   private:
+    //
+    // Appends a basic::kvp where the key is a non-owning string view.
+    //
+    template <typename K, typename V>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<typename std::decay<K>::type, stdx::string_view>::value>::type
+    append_(std::tuple<K, V>&& t) {
+        _core->key_view(std::forward<K>(std::get<0>(t)));
+        impl::value_append(_core, std::forward<V>(std::get<1>(t)));
+    }
+
+    //
+    // Appends a basic::kvp where the key is an owning STL string.
+    //
+    template <typename K, typename V>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<typename std::decay<K>::type, std::string>::value>::type
+    append_(std::tuple<K, V>&& t) {
+        _core->key_owned(std::forward<K>(std::get<0>(t)));
+        impl::value_append(_core, std::forward<V>(std::get<1>(t)));
+    }
+
+    //
+    // Appends a basic::kvp where the key is a string literal
+    //
+    template <std::size_t n, typename V>
+    BSONCXX_INLINE void append_(std::tuple<const char (&)[n], V>&& t) {
+        _core->key_view(stdx::string_view{std::get<0>(t), n - 1});
+        impl::value_append(_core, std::forward<V>(std::get<1>(t)));
+    }
+
+    //
+    // Concatenates another bson document directly.
+    //
+    BSONCXX_INLINE
+    void append_(concatenate_doc doc) {
+        _core->concatenate(doc);
+    }
+
+    core* _core;
+};
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp
new file mode 100644
index 0000000..39a3943
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp
@@ -0,0 +1,122 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+
+///
+/// Container to concatenate a document. Use it by constructing an instance with the
+/// document to be concatenated, and pass it into a document stream builder.
+///
+struct concatenate_doc {
+    document::view_or_value doc;
+
+    // MSVC seems to need a hint that it should always
+    // inline this destructor.
+    BSONCXX_INLINE ~concatenate_doc() = default;
+
+    ///
+    /// Conversion operator that provides a view of the wrapped concatenate
+    /// document.
+    ///
+    /// @return A view of the wrapped concatenate document.
+    ///
+    BSONCXX_INLINE operator document::view() const {
+        return doc;
+    }
+
+    ///
+    /// Accessor that provides a view of the wrapped concatenate
+    /// document.
+    ///
+    /// @return A view of the wrapped concatenate document.
+    ///
+    BSONCXX_INLINE document::view view() const {
+        return doc;
+    }
+};
+
+///
+/// Container to concatenate an array. Use this with the array stream builder in order
+/// to pass an array into a new builder and append its values to the stream.
+///
+struct concatenate_array {
+    array::view_or_value array;
+
+    // MSVC seems to need a hint that it should always
+    // inline this destructor.
+    BSONCXX_INLINE ~concatenate_array() = default;
+
+    ///
+    /// Conversion operator that provides a view of the wrapped concatenate
+    /// array.
+    ///
+    /// @return A view of the wrapped concatenate array.
+    ///
+    BSONCXX_INLINE operator array::view() const {
+        return array;
+    }
+
+    ///
+    /// Accessor that provides a view of the wrapped concatenate
+    /// array.
+    ///
+    /// @return A view of the wrapped concatenate array.
+    ///
+    BSONCXX_INLINE array::view view() const {
+        return array;
+    }
+};
+
+///
+/// Helper method to concatenate a document. Use this with the document stream
+/// builder to merge an existing document's fields with a new document's.
+///
+/// @param doc A document to be concatenated.
+///
+/// @return concatenate_doc A concatenating struct.
+///
+/// @relatesalso concatenate_doc
+///
+BSONCXX_INLINE concatenate_doc concatenate(document::view_or_value doc) {
+    return {std::move(doc)};
+}
+
+///
+/// Method to concatenate an array with a new array. Use this with the array stream
+/// builder to merge an existing array's fields with a new array.
+///
+/// @param array An array to be concatenated.
+///
+/// @return concatenate_array A concatenating struct.
+///
+/// @relatesalso concatenate_array
+///
+BSONCXX_INLINE concatenate_array concatenate(array::view_or_value array) {
+    return {std::move(array)};
+}
+
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp
new file mode 100644
index 0000000..b0ae781
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp
@@ -0,0 +1,698 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+#include <stdexcept>
+#include <type_traits>
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/types.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+
+///
+/// A low-level interface for constructing BSON documents and arrays.
+///
+/// @remark
+///   Generally it is recommended to use the classes in builder::basic or builder::stream instead of
+///   using this class directly. However, developers who wish to write their own abstractions may
+///   find this class useful.
+///
+class BSONCXX_API core {
+   public:
+    class BSONCXX_PRIVATE impl;
+
+    ///
+    /// Constructs an empty BSON datum.
+    ///
+    /// @param is_array
+    ///   True if the top-level BSON datum should be an array.
+    ///
+    explicit core(bool is_array);
+
+    core(core&& rhs) noexcept;
+    core& operator=(core&& rhs) noexcept;
+
+    ~core();
+
+    ///
+    /// Appends a key passed as a non-owning stdx::string_view.
+    ///
+    /// @remark
+    ///   Use key_owned() unless you know what you are doing.
+    ///
+    /// @warning
+    ///   The caller must ensure that the lifetime of the backing string extends until the next
+    ///   value is appended.
+    ///
+    /// @param key
+    ///   A null-terminated array of characters.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is an array or if the previous value
+    /// appended to the builder was also a key.
+    ///
+    core& key_view(stdx::string_view key);
+
+    ///
+    /// Appends a key passed as an STL string.  Transfers ownership of the key to this class.
+    ///
+    /// @param key
+    ///   A string key.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is an array or if the previous value
+    /// appended to the builder was a key.
+    ///
+    core& key_owned(std::string key);
+
+    ///
+    /// Opens a sub-document within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& open_document();
+
+    ///
+    /// Opens a sub-array within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& open_array();
+
+    ///
+    /// Closes the current sub-document within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is not an open sub-document.
+    ///
+    core& close_document();
+
+    ///
+    /// Closes the current sub-array within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is not an open sub-array.
+    ///
+    core& close_array();
+
+    ///
+    /// Appends the keys from a BSON document into this BSON datum.
+    ///
+    /// @note
+    ///   If this BSON datum is a document, the original keys from `view` are kept.  Otherwise (if
+    ///   this BSON datum is an array), the original keys from `view` are discarded.
+    ///
+    /// @note
+    ///   This can be used with an array::view as well by converting it to a document::view first.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if one of the keys fails to append.
+    ///
+    core& concatenate(const document::view& view);
+
+    ///
+    /// Appends a BSON double.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the double fails to append.
+    ///
+    core& append(const types::b_double& value);
+
+    ///
+    /// Append a BSON UTF-8 string.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the string fails to append.
+    ///
+    core& append(const types::b_string& value);
+
+    ///
+    /// Appends a BSON document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the document fails to append.
+    ///
+    core& append(const types::b_document& value);
+
+    ///
+    /// Appends a BSON array.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the array fails to append.
+    ///
+    core& append(const types::b_array& value);
+
+    ///
+    /// Appends a BSON binary datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the binary fails to append.
+    ///
+    core& append(const types::b_binary& value);
+
+    ///
+    /// Appends a BSON undefined.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if undefined fails to append.
+    ///
+    core& append(const types::b_undefined& value);
+
+    ///
+    /// Appends a BSON ObjectId.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the ObjectId fails to append.
+    ///
+    core& append(const types::b_oid& value);
+
+    ///
+    /// Appends a BSON boolean.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the boolean fails to append.
+    ///
+    core& append(const types::b_bool& value);
+
+    ///
+    /// Appends a BSON date.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the date fails to append.
+    ///
+    core& append(const types::b_date& value);
+
+    ///
+    /// Appends a BSON null.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if null fails to append.
+    ///
+    core& append(const types::b_null& value);
+
+    ///
+    /// Appends a BSON regex.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the regex fails to append.
+    ///
+    core& append(const types::b_regex& value);
+
+    ///
+    /// Appends a BSON DBPointer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the DBPointer fails to append.
+    ///
+    core& append(const types::b_dbpointer& value);
+
+    ///
+    /// Appends a BSON JavaScript code.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the JavaScript code fails to append.
+    ///
+    core& append(const types::b_code& value);
+
+    ///
+    /// Appends a BSON symbol.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the symbol fails to append.
+    ///
+    core& append(const types::b_symbol& value);
+
+    ///
+    /// Appends a BSON JavaScript code with scope.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the JavaScript code with scope fails to append.
+    ///
+    core& append(const types::b_codewscope& value);
+
+    ///
+    /// Appends a BSON 32-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the 32-bit signed integer fails to append.
+    ///
+    core& append(const types::b_int32& value);
+
+    ///
+    /// Appends a BSON replication timestamp.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the timestamp fails to append.
+    ///
+    core& append(const types::b_timestamp& value);
+
+    ///
+    /// Appends a BSON 64-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the 64-bit signed integer fails to append.
+    ///
+    core& append(const types::b_int64& value);
+
+    ///
+    /// Appends a BSON Decimal128.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the Decimal128 fails to append.
+    ///
+    core& append(const types::b_decimal128& value);
+
+    ///
+    /// Appends a BSON min-key.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the min-key fails to append.
+    ///
+    core& append(const types::b_minkey& value);
+
+    ///
+    /// Appends a BSON max-key.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the max-key fails to append.
+    ///
+    core& append(const types::b_maxkey& value);
+
+    ///
+    /// Appends a BSON variant value.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(const types::bson_value::view& value);
+
+    ///
+    /// Appends an STL string as a BSON UTF-8 string.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(std::string str);
+
+    ///
+    /// Appends a string view as a BSON UTF-8 string.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(stdx::string_view str);
+
+    ///
+    /// Appends a char* or const char*.
+    ///
+    /// We disable all other pointer types to prevent the surprising implicit conversion to bool.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    template <typename T>
+    BSONCXX_INLINE core& append(T* v) {
+        static_assert(std::is_same<typename std::remove_const<T>::type, char>::value,
+                      "append is disabled for non-char pointer types");
+        append(types::b_string{v});
+
+        return *this;
+    }
+
+    ///
+    /// Appends a native boolean as a BSON boolean.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(bool value);
+
+    ///
+    /// Appends a native double as a BSON double.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(double value);
+
+    ///
+    /// Appends a native int32_t as a BSON 32-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(std::int32_t value);
+
+    ///
+    /// Appends a native int64_t as a BSON 64-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(std::int64_t value);
+
+    ///
+    /// Appends an oid as a BSON ObjectId.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(const oid& value);
+
+    ///
+    /// Appends a decimal128 object as a BSON Decimal128.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(decimal128 value);
+
+    ///
+    /// Appends the given document view.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(document::view view);
+
+    ///
+    /// Appends the given array view.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(array::view view);
+
+    ///
+    /// Gets a view over the document.
+    ///
+    /// @return A document::view of the internal BSON.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be a document that is not waiting for a key to be
+    ///    appended to start a new key/value pair, and does contain any open sub-documents or open
+    ///    sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    document::view view_document() const;
+
+    ///
+    /// Gets a view over the array.
+    ///
+    /// @return An array::view of the internal BSON.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be an array that does not contain any open sub-documents
+    ///    or open sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    array::view view_array() const;
+
+    ///
+    /// Transfers ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be a document that is not waiting for a key to be
+    ///    appended to start a new key/value pair, and does not contain any open sub-documents or
+    ///    open sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    /// @warning
+    ///   After calling extract_document() it is illegal to call any methods on this class, unless
+    ///   it is subsequenly moved into.
+    ///
+    document::value extract_document();
+
+    ///
+    /// Transfers ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be an array that does not contain any open sub-documents
+    ///    or open sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    /// @warning
+    ///   After calling extract_array() it is illegal to call any methods on this class, unless it
+    ///   is subsequenly moved into.
+    ///
+    array::value extract_array();
+
+    ///
+    /// Deletes the contents of the underlying BSON datum. After calling clear(), the state of this
+    /// class will be the same as it was immediately after construction.
+    ///
+    void clear();
+
+   private:
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp
new file mode 100644
index 0000000..47636e8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp
@@ -0,0 +1,188 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <sstream>
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/exception/error_code.hpp>
+#include <bsoncxx/exception/exception.hpp>
+#include <bsoncxx/types/bson_value/value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+using namespace bsoncxx::types;
+
+///
+/// A JSON-like builder for creating documents and arrays.
+///
+class list {
+    using initializer_list_t = std::initializer_list<list>;
+
+   public:
+    ///
+    /// Creates an empty document.
+    ///
+    list() : list({}) {}
+
+    ///
+    /// Creates a bsoncxx::builder::list from a value of type T. T must be a
+    /// bsoncxx::types::bson_value::value or implicitly convertible to a
+    /// bsoncxx::types::bson_value::value.
+    ///
+    /// @param value
+    ///     the BSON value
+    ///
+    /// @see bsoncxx::types::bson_value::value.
+    ///
+    template <typename T>
+    list(T value) : val{value} {}
+
+    ///
+    /// Creates a BSON document, if possible. Otherwise, it will create a BSON array. A document is
+    /// possible if:
+    //      1. The initializer list's size is even; this implies a list of
+    //         key-value pairs or an empty document if the size is zero.
+    //      2. Each 'key' is a string type. In a list of key-value pairs, the 'key' is every other
+    //         element starting at the 0th element.
+    //
+    /// @param init
+    ///     the initializer list used to construct the BSON document or array
+    ///
+    /// @note
+    ///     to enforce the creation of a BSON document or array use the bsoncxx::builder::document
+    ///     or bsoncxx::builder::array constructor, respectively.
+    ///
+    /// @see bsoncxx::builder::document
+    /// @see bsoncxx::builder::array
+    ///
+    list(initializer_list_t init) : list(init, true, true) {}
+
+    ///
+    /// Provides a view of the underlying BSON value.
+    ///
+    /// @see bsoncxx::types::bson_value::view.
+    ///
+    operator bson_value::view() {
+        return view();
+    }
+
+    ///
+    /// Provides a view of the underlying BSON value.
+    ///
+    /// @see bsoncxx::types::bson_value::view.
+    ///
+    bson_value::view view() {
+        return val.view();
+    }
+
+   private:
+    bson_value::value val;
+
+    friend class document;
+    friend class array;
+
+    list(initializer_list_t init, bool type_deduction, bool is_array) : val{nullptr} {
+        std::stringstream err_msg{"cannot construct document"};
+        bool valid_document = false;
+        if (type_deduction || !is_array) {
+            valid_document = [&] {
+                if (init.size() % 2 != 0) {
+                    err_msg << " : must be list of key-value pairs";
+                    return false;
+                }
+                for (size_t i = 0; i < init.size(); i += 2) {
+                    auto t = (begin(init) + i)->val.view().type();
+                    if (t != type::k_utf8) {
+                        err_msg << " : all keys must be string type. ";
+                        err_msg << "Found type=" << to_string(t);
+                        return false;
+                    }
+                }
+                return true;
+            }();
+        }
+
+        if (valid_document) {
+            core _core{false};
+            for (size_t i = 0; i < init.size(); i += 2) {
+                _core.key_owned(std::string((begin(init) + i)->val.view().get_string().value));
+                _core.append((begin(init) + i + 1)->val);
+            }
+            val = bson_value::value(_core.extract_document());
+        } else if (type_deduction || is_array) {
+            core _core{true};
+            for (auto&& ele : init)
+                _core.append(ele.val);
+            val = bson_value::value(_core.extract_array());
+        } else {
+            throw bsoncxx::exception{error_code::k_unmatched_key_in_builder, err_msg.str()};
+        }
+    }
+};
+
+///
+/// A JSON-like builder for creating documents.
+///
+class document : public list {
+    using initializer_list_t = std::initializer_list<list>;
+
+   public:
+    ///
+    /// Creates an empty document.
+    ///
+    document() : list({}, false, false){};
+
+    ///
+    /// Creates a BSON document.
+    ///
+    /// @param init
+    ///     the initializer list used to construct the BSON document
+    ///
+    /// @see bsoncxx::builder::list
+    /// @see bsoncxx::builder::array
+    ///
+    document(initializer_list_t init) : list(init, false, false) {}
+};
+
+///
+/// A JSON-like builder for creating arrays.
+///
+class array : public list {
+    using initializer_list_t = std::initializer_list<list>;
+
+   public:
+    ///
+    /// Creates an empty array.
+    ///
+    array() : list({}, false, true){};
+
+    ///
+    /// Creates a BSON array.
+    ///
+    /// @param init
+    ///     the initializer list used to construct the BSON array
+    ///
+    /// @see bsoncxx::builder::list
+    /// @see bsoncxx::builder::document
+    ///
+    array(initializer_list_t init) : list(init, false, true) {}
+};
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp
new file mode 100644
index 0000000..41ce3ce
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp
@@ -0,0 +1,90 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/array_context.hpp>
+#include <bsoncxx/builder/stream/key_context.hpp>
+#include <bsoncxx/builder/stream/single_context.hpp>
+#include <bsoncxx/builder/stream/value_context.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A streaming interface for constructing
+/// a BSON array.
+///
+/// @note Use of the stream builder is discouraged. See
+/// http://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/working-with-bson/#stream-builder for more
+/// details.
+///
+class array : public array_context<> {
+   public:
+    ///
+    /// Default constructor.
+    ///
+    BSONCXX_INLINE array() : array_context<>(&_core), _core(true) {}
+
+    ///
+    /// @return A view of the BSON array.
+    ///
+    BSONCXX_INLINE bsoncxx::array::view view() const {
+        return _core.view_array();
+    }
+
+    ///
+    /// @return A view of the BSON array.
+    ///
+    BSONCXX_INLINE operator bsoncxx::array::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying array to the caller.
+    ///
+    /// @return An array::value with ownership of the array.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequenly moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::array::value extract() {
+        return _core.extract_array();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty array.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp
new file mode 100644
index 0000000..581a6b5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp
@@ -0,0 +1,202 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/closed_context.hpp>
+#include <bsoncxx/builder/stream/helpers.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+template <class T>
+class key_context;
+
+class single_context;
+
+///
+/// A stream context which expects any number of values.
+///
+/// The template argument can be used to hold additional information about
+/// containing documents or arrays. I.e. value_context<> implies that this array
+/// is a sub_array in a document, while array_context would indicated a sub_array
+/// in an array. These types can be nested, such that contextual parsing (for
+/// key/value pairs) and depth (to prevent an invalid array_close) are enforced
+/// by the type system.
+///
+/// I.e.
+/// builder << array_context << array_context << ...;
+///
+/// This builds a bson array with successively higher index keys
+///
+template <class base = closed_context>
+class array_context {
+   public:
+    ///
+    /// Create an array_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    BSONCXX_INLINE array_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for accepting a real value and appending it to the core
+    ///   builder.
+    ///
+    /// @param t
+    ///   The value to append
+    ///
+    template <class T>
+    BSONCXX_INLINE typename std::enable_if<
+        !(util::is_functor<T, void(array_context<>)>::value ||
+          util::is_functor<T, void(single_context)>::value ||
+          std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value),
+        array_context>::type&
+    operator<<(T&& t) {
+        _core->append(std::forward<T>(t));
+        return *this;
+    }
+
+    ///
+    /// << operator for accepting a callable of the form void(array_context) or
+    ///   void(single_context) and invoking it to perform 1 or more value appends
+    ///   to the core builder.
+    ///
+    /// @param func
+    ///   The callback to invoke
+    ///
+    template <typename Func>
+    BSONCXX_INLINE typename std::enable_if<(util::is_functor<Func, void(array_context<>)>::value ||
+                                            util::is_functor<Func, void(single_context)>::value),
+                                           array_context>::type&
+    operator<<(Func&& func) {
+        func(*this);
+        return *this;
+    }
+
+    ///
+    /// << operator for finalizing the stream.
+    ///
+    /// This operation finishes all processing necessary to fully encode the
+    /// bson bytes and returns an owning value.
+    ///
+    /// @param _
+    ///   A finalize_type token
+    ///
+    /// @return A value type which holds the complete bson document.
+    ///
+    template <typename T>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<base, closed_context>::value &&
+            std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value,
+        // TODO(MSVC): This should just be 'array::value', but
+        // VS2015U1 can't resolve the name.
+        bsoncxx::array::value>::type
+    operator<<(T&&) {
+        return _core->extract_array();
+    }
+
+    ///
+    /// << operator for opening a new subdocument in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE key_context<array_context> operator<<(const open_document_type) {
+        _core->open_document();
+        return wrap_document();
+    }
+
+    ///
+    /// << operator for concatenating another array.
+    ///
+    /// This operation concatenates all of the values from the passed document
+    /// into the current stream. Keys are adjusted to match the existing array.
+    ///
+    /// @param array
+    ///   An array to concatenate
+    ///
+    BSONCXX_INLINE array_context operator<<(concatenate_array array) {
+        _core->concatenate(array.view());
+        return *this;
+    }
+
+    ///
+    /// << operator for opening a new subarray in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE array_context<array_context> operator<<(const open_array_type) {
+        _core->open_array();
+        return wrap_array();
+    }
+
+    ///
+    /// << operator for closing a subarray in the core builder.
+    ///
+    /// @param _
+    ///   A close_array_type token
+    ///
+    BSONCXX_INLINE base operator<<(const close_array_type) {
+        _core->close_array();
+        return unwrap();
+    }
+
+    ///
+    /// Conversion operator which provides a rooted array context given any
+    /// stream currently in a nested array_context.
+    ///
+    BSONCXX_INLINE operator array_context<>() {
+        return array_context<>(_core);
+    }
+
+    ///
+    /// Conversion operator for single_context.
+    ///
+    /// @relatesalso single_context
+    ///
+    BSONCXX_INLINE operator single_context();
+
+   private:
+    BSONCXX_INLINE base unwrap() {
+        return base(_core);
+    }
+
+    BSONCXX_INLINE array_context<array_context> wrap_array() {
+        return array_context<array_context>(_core);
+    }
+
+    BSONCXX_INLINE key_context<array_context> wrap_document() {
+        return key_context<array_context>(_core);
+    }
+
+    core* _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp
new file mode 100644
index 0000000..b0fe9cc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp
@@ -0,0 +1,43 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+
+class core;
+
+namespace stream {
+
+///
+/// The closed_context, when used as a template parameter for array_context,
+/// value_context or key_context, indicates that the document cannot be closed
+/// further. This could indicate that the document is the root, or that the type
+/// stack has been intentionally erased, as is the case when using callbacks in
+/// the stream api.
+///
+struct closed_context {
+    closed_context(core*) {}
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp
new file mode 100644
index 0000000..3ceed74
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp
@@ -0,0 +1,88 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/key_context.hpp>
+#include <bsoncxx/builder/stream/single_context.hpp>
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A streaming interface for constructing
+/// a BSON document.
+///
+/// @note Use of the stream builder is discouraged. See
+/// http://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/working-with-bson/#stream-builder for more
+/// details.
+///
+class document : public key_context<> {
+   public:
+    ///
+    /// Default constructor.
+    ///
+    BSONCXX_INLINE document() : key_context<>(&_core), _core(false) {}
+
+    ///
+    /// @return A view of the BSON document.
+    ///
+    BSONCXX_INLINE bsoncxx::document::view view() const {
+        return _core.view_document();
+    }
+
+    ///
+    /// @return A view of the BSON document.
+    ///
+    BSONCXX_INLINE operator bsoncxx::document::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequenly moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::document::value extract() {
+        return _core.extract_document();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty document.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp
new file mode 100644
index 0000000..8e822d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp
@@ -0,0 +1,98 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+using bsoncxx::builder::concatenate;
+
+///
+/// The type of a stream manipulator to open a subdocument.
+///
+struct BSONCXX_API open_document_type {
+    constexpr open_document_type() {}
+};
+
+///
+/// A stream manipulator to open a subdocument.
+///
+constexpr open_document_type open_document;
+
+///
+/// The type of a stream manipulator to close a subdocument.
+///
+struct BSONCXX_API close_document_type {
+    constexpr close_document_type() {}
+};
+
+///
+/// A stream manipulator to close a subdocument.
+///
+constexpr close_document_type close_document;
+
+///
+/// The type of a stream manipulator to open a subarray.
+///
+struct BSONCXX_API open_array_type {
+    constexpr open_array_type() {}
+};
+
+///
+/// A stream manipulator to open a subarray.
+///
+/// @see https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/working-with-bson/#builders for help
+/// building arrays in loops.
+///
+constexpr open_array_type open_array;
+
+///
+/// The type of a stream manipulator to close a subarray.
+///
+struct BSONCXX_API close_array_type {
+    constexpr close_array_type() {}
+};
+
+///
+/// A stream manipulator to close a subarray.
+///
+constexpr close_array_type close_array;
+
+///
+/// The type of a stream manipulator to finalize a document.
+///
+struct BSONCXX_API finalize_type {
+    constexpr finalize_type() {}
+};
+
+///
+/// A stream manipulator to finalize a document. When finalize is passed,
+/// the expression will evaluate to an owning document::value or array::value.
+///
+constexpr finalize_type finalize;
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp
new file mode 100644
index 0000000..a52e86f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp
@@ -0,0 +1,186 @@
+
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/closed_context.hpp>
+#include <bsoncxx/builder/stream/value_context.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A stream context which expects a key, which can later be followed by
+/// value, then more key/value pairs.
+///
+/// The template argument can be used to hold additional information about
+/// containing documents or arrays. I.e. value_context<> implies that this
+/// document is a sub_document in a document, while array_context would
+/// indicated a sub_document in an array. These types can be nested, such that
+/// contextual parsing (for key/value pairs) and depth (to prevent an invalid
+/// document_close) are enforced by the type system.
+///
+/// When in document context, the first parameter will be in key_context, then
+/// in value_context, then in key_context, etc.
+///
+/// I.e.
+/// builder << key_context << value_context << key_context << ...
+///
+template <class base = closed_context>
+class key_context {
+   public:
+    ///
+    /// Create a key_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    key_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for accepting a literal key and appending it to the core
+    ///   builder.
+    ///
+    /// @param v
+    ///   The key to append
+    ///
+    /// @throws bsoncxx::exception if the previous value appended to the builder was also a key.
+    ///
+    template <std::size_t n>
+    BSONCXX_INLINE value_context<key_context> operator<<(const char (&v)[n]) {
+        _core->key_view(stdx::string_view{v, n - 1});
+        return value_context<key_context>(_core);
+    }
+
+    ///
+    /// << operator for accepting a std::string key and appending it to the core
+    ///   builder.
+    ///
+    /// @param str
+    ///   The key to append
+    ///
+    /// @throws bsoncxx::exception if the previous value appended to the builder was also a key.
+    ///
+    BSONCXX_INLINE value_context<key_context> operator<<(std::string str) {
+        _core->key_owned(std::move(str));
+        return value_context<key_context>(_core);
+    }
+
+    ///
+    /// << operator for accepting a stdx::string_view key and appending it to
+    ///   the core builder.
+    ///
+    /// @param str
+    ///   The key to append
+    ///
+    /// @throws bsoncxx::exception if the previous value appended to the builder was also a key.
+    ///
+    BSONCXX_INLINE value_context<key_context> operator<<(stdx::string_view str) {
+        _core->key_view(std::move(str));
+        return value_context<key_context>(_core);
+    }
+
+    ///
+    /// << operator for accepting a callable of the form void(key_context)
+    ///   and invoking it to perform 1 or more key, value appends to the core
+    ///   builder.
+    ///
+    /// @param func
+    ///   The callback to invoke
+    ///
+    template <typename T>
+    BSONCXX_INLINE
+        typename std::enable_if<util::is_functor<T, void(key_context<>)>::value, key_context>::type&
+        operator<<(T&& func) {
+        func(*this);
+        return *this;
+    }
+
+    ///
+    /// << operator for finalizing the stream.
+    ///
+    /// This operation finishes all processing necessary to fully encode the
+    /// bson bytes and returns an owning value.
+    ///
+    /// @param _
+    ///   A finalize_type token
+    ///
+    /// @return A value type which holds the complete bson document.
+    ///
+    template <typename T>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<base, closed_context>::value &&
+            std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value,
+        // TODO(MSVC): This should just be 'document::value', but
+        // VS2015U1 can't resolve the name.
+        bsoncxx::document::value>::type
+    operator<<(T&&) {
+        return _core->extract_document();
+    }
+
+    ///
+    /// << operator for concatenating another document.
+    ///
+    /// This operation concatenates all of the keys and values from the passed
+    /// document into the current stream.
+    ///
+    /// @param doc
+    ///   A document to concatenate
+    ///
+    BSONCXX_INLINE key_context operator<<(concatenate_doc doc) {
+        _core->concatenate(doc);
+        return *this;
+    }
+
+    ///
+    /// << operator for closing a subdocument in the core builder.
+    ///
+    /// @param _
+    ///   A close_document_type token
+    ///
+    BSONCXX_INLINE base operator<<(const close_document_type) {
+        _core->close_document();
+        return unwrap();
+    }
+
+    ///
+    /// Conversion operator which provides a rooted document given any stream
+    /// currently in a nested key_context.
+    ///
+    BSONCXX_INLINE operator key_context<>() {
+        return key_context<>(_core);
+    }
+
+   private:
+    BSONCXX_INLINE base unwrap() {
+        return base(_core);
+    }
+
+    core* _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp
new file mode 100644
index 0000000..a831275
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp
@@ -0,0 +1,115 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/array_context.hpp>
+#include <bsoncxx/builder/stream/key_context.hpp>
+#include <bsoncxx/builder/stream/value_context.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A stream context which appends a single value.
+///
+/// This type is useful as the argument to a callable passed to other stream
+/// modes. Specifically, any callback that takes a single_context can be used to
+/// write a value in value_context or array_context.
+///
+class single_context {
+   public:
+    ///
+    /// Create a single_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    BSONCXX_INLINE single_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for opening a new subdocument in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE key_context<> operator<<(open_document_type) {
+        _core->open_document();
+
+        return wrap_document();
+    }
+
+    ///
+    /// << operator for opening a new subarray in the core builder.
+    ///
+    /// @param _
+    ///   An open_array_type token
+    ///
+    BSONCXX_INLINE array_context<> operator<<(open_array_type) {
+        _core->open_array();
+
+        return wrap_array();
+    }
+
+    ///
+    /// << operator for accepting a real value and appending it to the core
+    ///   builder.
+    ///
+    /// @param t
+    ///   The value to append
+    ///
+    template <class T>
+    BSONCXX_INLINE void operator<<(T&& t) {
+        _core->append(std::forward<T>(t));
+    }
+
+   private:
+    BSONCXX_INLINE array_context<> wrap_array() {
+        return array_context<>(_core);
+    }
+
+    BSONCXX_INLINE key_context<> wrap_document() {
+        return key_context<>(_core);
+    }
+
+    core* _core;
+};
+
+///
+/// Implementation of the single_context conversion operator for array_context.
+///
+template <class T>
+BSONCXX_INLINE array_context<T>::operator single_context() {
+    return single_context(_core);
+}
+
+///
+/// Implementation of the single_context conversion operator for value_context.
+///
+template <class T>
+BSONCXX_INLINE value_context<T>::operator single_context() {
+    return single_context(_core);
+}
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp
new file mode 100644
index 0000000..45a1077
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp
@@ -0,0 +1,145 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/array_context.hpp>
+#include <bsoncxx/builder/stream/closed_context.hpp>
+#include <bsoncxx/builder/stream/helpers.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A stream context which expects a value, which can later be followed by
+/// more key/value pairs.
+///
+/// The template argument can be used to hold additional information about
+/// containing documents or arrays. I.e. value_context<> implies that this
+/// document is a sub_document in a document, while array_context would
+/// indicated a sub_document in an array. These types can be nested, such that
+/// contextual parsing (for key/value pairs) and depth (to prevent an invalid
+/// document_close) are enforced by the type system.
+///
+/// When in document context, the first parameter will be in key_context, then
+/// in value_context, then in key_context, etc.
+///
+/// I.e.
+/// builder << key_context << value_context << key_context << ...
+///
+template <class base>
+class value_context {
+   public:
+    ///
+    /// Create a value_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    BSONCXX_INLINE value_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for accepting a real value and appending it to the core
+    ///   builder.
+    ///
+    /// @param t
+    ///   The value to append
+    ///
+    template <class T>
+    BSONCXX_INLINE
+        typename std::enable_if<!util::is_functor<T, void(single_context)>::value, base>::type
+        operator<<(T&& t) {
+        _core->append(std::forward<T>(t));
+        return unwrap();
+    }
+
+    ///
+    /// << operator for accepting a callable of the form void(single_context)
+    ///   and invoking it to perform a value append to the core builder.
+    ///
+    /// @param func
+    ///   The callback to invoke
+    ///
+    template <typename T>
+    BSONCXX_INLINE
+        typename std::enable_if<util::is_functor<T, void(single_context)>::value, base>::type
+        operator<<(T&& func) {
+        func(*this);
+        return unwrap();
+    }
+
+    ///
+    /// << operator for opening a new subdocument in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE key_context<base> operator<<(const open_document_type) {
+        _core->open_document();
+        return wrap_document();
+    }
+
+    ///
+    /// << operator for opening a new subarray in the core builder.
+    ///
+    /// @param _
+    ///   An open_array_type token
+    ///
+    BSONCXX_INLINE array_context<base> operator<<(const open_array_type) {
+        _core->open_array();
+        return wrap_array();
+    }
+
+    ///
+    /// Conversion operator for single_context.
+    ///
+    /// @relatesalso single_context
+    ///
+    operator single_context();
+
+#if !defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+    // TODO(MSVC): Causes an ICE under VS2015U1
+    static_assert(
+        std::is_same<value_context, decltype(std::declval<value_context>() << 1 << "str")>::value,
+        "value_context must be templatized on a key_context");
+#endif
+
+   private:
+    BSONCXX_INLINE base unwrap() {
+        return base(_core);
+    }
+
+    BSONCXX_INLINE array_context<base> wrap_array() {
+        return array_context<base>(_core);
+    }
+
+    BSONCXX_INLINE key_context<base> wrap_document() {
+        return key_context<base>(_core);
+    }
+
+    core* _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp
new file mode 100644
index 0000000..6fdf600
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp
@@ -0,0 +1,32 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if defined(_MSC_VER)
+
+// Disable MSVC warnings that cause a lot of noise related to DLL visibility
+// for types that we don't control (like std::unique_ptr).
+#pragma warning(push)
+#pragma warning(disable : 4251 4275)
+
+#define BSONCXX_INLINE inline BSONCXX_PRIVATE
+
+#define BSONCXX_CALL __cdecl
+
+#else
+
+#define BSONCXX_INLINE inline BSONCXX_PRIVATE
+
+#define BSONCXX_CALL
+
+#endif
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp
new file mode 100644
index 0000000..1485d85
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp
@@ -0,0 +1,23 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/* #undef BSONCXX_POLY_USE_STD_EXPERIMENTAL */
+/* #undef BSONCXX_POLY_USE_MNMLSTC */
+/* #undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC */
+#define BSONCXX_POLY_USE_BOOST
+/* #undef BSONCXX_POLY_USE_STD */
+
+#define BSONCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
+
+#define BSONCXX_INLINE_NAMESPACE_END }  // namespace v_noabi
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp
new file mode 100644
index 0000000..7050a78
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp
@@ -0,0 +1,42 @@
+
+#ifndef BSONCXX_API_H
+#define BSONCXX_API_H
+
+#ifdef BSONCXX_STATIC
+#  define BSONCXX_API
+#  define BSONCXX_PRIVATE
+#else
+#  ifndef BSONCXX_API
+#    ifdef BSONCXX_EXPORT
+        /* We are building this library */
+#      define BSONCXX_API 
+#    else
+        /* We are using this library */
+#      define BSONCXX_API 
+#    endif
+#  endif
+
+#  ifndef BSONCXX_PRIVATE
+#    define BSONCXX_PRIVATE 
+#  endif
+#endif
+
+#ifndef BSONCXX_DEPRECATED
+#  define BSONCXX_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef BSONCXX_DEPRECATED_EXPORT
+#  define BSONCXX_DEPRECATED_EXPORT BSONCXX_API BSONCXX_DEPRECATED
+#endif
+
+#ifndef BSONCXX_DEPRECATED_NO_EXPORT
+#  define BSONCXX_DEPRECATED_NO_EXPORT BSONCXX_PRIVATE BSONCXX_DEPRECATED
+#endif
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef BSONCXX_NO_DEPRECATED
+#    define BSONCXX_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* BSONCXX_API_H */
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
new file mode 100644
index 0000000..15570c6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
@@ -0,0 +1,74 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// compiler.hpp
+#undef BSONCXX_INLINE
+#pragma pop_macro("BSONCXX_INLINE")
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+#undef BSONCXX_CALL
+#pragma pop_macro("BSONCXX_CALL")
+
+// src/bsoncxx/config/config.hpp.in
+#undef BSONCXX_INLINE_NAMESPACE_BEGIN
+#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
+#undef BSONCXX_INLINE_NAMESPACE_END
+#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_END")
+#undef BSONCXX_POLY_USE_MNMLSTC
+#pragma pop_macro("BSONCXX_POLY_USE_MNMLSTC")
+#undef BSONCXX_POLY_USE_STD_EXPERIMENTAL
+#pragma pop_macro("BSONCXX_POLY_USE_STD_EXPERIMENTAL")
+#undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC
+#pragma pop_macro("BSONCXX_POLY_USE_SYSTEM_MNMLSTC")
+#undef BSONCXX_POLY_USE_BOOST
+#pragma pop_macro("BSONCXX_POLY_USE_BOOST")
+
+// src/bsoncxx/config/version.hpp.in
+#undef BSONCXX_VERSION_EXTRA
+#pragma pop_macro("BSONCXX_VERSION_EXTRA")
+#undef BSONCXX_VERSION_MAJOR
+#pragma pop_macro("BSONCXX_VERSION_MAJOR")
+#undef BSONCXX_VERSION_MINOR
+#pragma pop_macro("BSONCXX_VERSION_MINOR")
+#undef BSONCXX_VERSION_PATCH
+#pragma pop_macro("BSONCXX_VERSION_PATCH")
+
+// src/bsoncxx/types.hpp
+#ifdef BSONCXX_ENUM
+static_assert(false, "BSONCXX_ENUM must be undef'ed");
+#endif
+#pragma pop_macro("BSONCXX_ENUM")
+
+// export.hpp (generated by cmake)
+#undef BSONCXX_API_H
+#pragma pop_macro("BSONCXX_API_H")
+#undef BSONCXX_API
+#pragma pop_macro("BSONCXX_API")
+#undef BSONCXX_PRIVATE
+#pragma pop_macro("BSONCXX_PRIVATE")
+#undef BSONCXX_DEPRECATED
+#pragma pop_macro("BSONCXX_DEPRECATED")
+#undef BSONCXX_DEPRECATED_EXPORT
+#pragma pop_macro("BSONCXX_DEPRECATED_EXPORT")
+#undef BSONCXX_DEPRECATED_NO_EXPORT
+#pragma pop_macro("BSONCXX_DEPRECATED_NO_EXPORT")
+#undef DEFINE_NO_DEPRECATED
+#pragma pop_macro("DEFINE_NO_DEPRECATED")
+#undef BSONCXX_NO_DEPRECATED
+#pragma pop_macro("BSONCXX_NO_DEPRECATED")
+
+// prelude.hpp
+#undef BSONCXX_UNREACHABLE
+#pragma pop_macro("BSONCXX_UNREACHABLE")
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
new file mode 100644
index 0000000..7e5165a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
@@ -0,0 +1,74 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// compiler.hpp
+#pragma push_macro("BSONCXX_INLINE")
+#undef BSONCXX_INLINE
+#pragma push_macro("BSONCXX_CALL")
+#undef BSONCXX_CALL
+
+// src/bsoncxx/config/config.hpp.in
+#pragma push_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
+#undef BSONCXX_INLINE_NAMESPACE_BEGIN
+#pragma push_macro("BSONCXX_INLINE_NAMESPACE_END")
+#undef BSONCXX_INLINE_NAMESPACE_END
+#pragma push_macro("BSONCXX_POLY_USE_MNMLSTC")
+#undef BSONCXX_POLY_USE_MNMLSTC
+#pragma push_macro("BSONCXX_POLY_USE_STD_EXPERIMENTAL")
+#undef BSONCXX_POLY_USE_STD_EXPERIMENTAL
+#pragma push_macro("BSONCXX_POLY_USE_SYSTEM_MNMLSTC")
+#undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC
+#pragma push_macro("BSONCXX_POLY_USE_BOOST")
+#undef BSONCXX_POLY_USE_BOOST
+
+// src/bsoncxx/config/version.hpp.in
+#pragma push_macro("BSONCXX_VERSION_EXTRA")
+#undef BSONCXX_VERSION_EXTRA
+#pragma push_macro("BSONCXX_VERSION_MAJOR")
+#undef BSONCXX_VERSION_MAJOR
+#pragma push_macro("BSONCXX_VERSION_MINOR")
+#undef BSONCXX_VERSION_MINOR
+#pragma push_macro("BSONCXX_VERSION_PATCH")
+#undef BSONCXX_VERSION_PATCH
+
+// src/bsoncxx/types.hpp
+#pragma push_macro("BSONCXX_ENUM")
+#undef BSONCXX_ENUM
+
+// export.hpp (generated by cmake)
+#pragma push_macro("BSONCXX_API_H")
+#undef BSONCXX_API_H
+#pragma push_macro("BSONCXX_API")
+#undef BSONCXX_API
+#pragma push_macro("BSONCXX_PRIVATE")
+#undef BSONCXX_PRIVATE
+#pragma push_macro("BSONCXX_DEPRECATED")
+#undef BSONCXX_DEPRECATED
+#pragma push_macro("BSONCXX_DEPRECATED_EXPORT")
+#undef BSONCXX_DEPRECATED_EXPORT
+#pragma push_macro("BSONCXX_DEPRECATED_NO_EXPORT")
+#undef BSONCXX_DEPRECATED_NO_EXPORT
+#pragma push_macro("DEFINE_NO_DEPRECATED")
+#undef DEFINE_NO_DEPRECATED
+#pragma push_macro("BSONCXX_NO_DEPRECATED")
+#undef BSONCXX_NO_DEPRECATED
+
+#include <bsoncxx/config/compiler.hpp>
+#include <bsoncxx/config/config.hpp>
+#include <bsoncxx/config/export.hpp>
+#include <bsoncxx/config/version.hpp>
+
+#pragma push_macro("BSONCXX_UNREACHABLE")
+#undef BSONCXX_UNREACHABLE
+#define BSONCXX_UNREACHABLE std::abort()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp
new file mode 100644
index 0000000..19b84b6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp
@@ -0,0 +1,18 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define BSONCXX_VERSION_MAJOR 3
+#define BSONCXX_VERSION_MINOR 7
+#define BSONCXX_VERSION_PATCH 0
+#define BSONCXX_VERSION_EXTRA 
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp
new file mode 100644
index 0000000..14dacdf
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp
@@ -0,0 +1,100 @@
+// Copyright 2016 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Represents an IEEE 754-2008 BSON Decimal128 value in a platform-independent way.
+///
+class BSONCXX_API decimal128 {
+   public:
+    ///
+    /// Constructs a BSON Decimal128 value representing zero.
+    ///
+    decimal128() = default;
+
+    ///
+    /// Constructs a BSON Decimal128 from high and low 64-bit big-endian parts.
+    ///
+    /// @param high
+    ///     The high 64-bits.
+    /// @param low
+    ///     The low 64-bits.
+    ///
+    decimal128(uint64_t high, uint64_t low) noexcept : _high(high), _low(low) {}
+
+    ///
+    /// Constructs a BSON Decimal128 from a string.
+    ///
+    /// @param str
+    ///     A string representation of a decimal number.
+    ///
+    /// @throws bsoncxx::exception if the string isn't a valid BSON Decimal128
+    /// representation.
+    ///
+    explicit decimal128(stdx::string_view str);
+
+    ///
+    /// Converts this decimal128 value to a string representation.
+    ///
+    /// @return A string representation of a IEEE 754-2008 decimal number.
+    ///
+    std::string to_string() const;
+
+    ///
+    /// @{
+    ///
+    /// Relational operators for decimal128
+    ///
+    /// @relates decimal128
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const decimal128& lhs, const decimal128& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const decimal128& lhs, const decimal128& rhs);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Accessor for high 64 bits.
+    ///
+    BSONCXX_INLINE uint64_t high() const {
+        return _high;
+    }
+
+    ///
+    /// Accessor for low 64 bits.
+    ///
+    BSONCXX_INLINE uint64_t low() const {
+        return _low;
+    }
+
+   private:
+    uint64_t _high = 0;
+    uint64_t _low = 0;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp
new file mode 100644
index 0000000..363b1e9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp
@@ -0,0 +1,448 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+enum class type : std::uint8_t;
+enum class binary_sub_type : std::uint8_t;
+
+namespace types {
+struct b_eod;
+struct b_double;
+struct b_string;
+struct b_document;
+struct b_array;
+struct b_binary;
+struct b_undefined;
+struct b_oid;
+struct b_bool;
+struct b_date;
+struct b_null;
+struct b_regex;
+struct b_dbpointer;
+struct b_code;
+struct b_symbol;
+struct b_codewscope;
+struct b_int32;
+struct b_timestamp;
+struct b_int64;
+struct b_decimal128;
+struct b_minkey;
+struct b_maxkey;
+
+namespace bson_value {
+class value;
+class view;
+}  // namespace bson_value
+
+}  // namespace types
+
+namespace array {
+class element;
+}  // namespace array
+
+namespace document {
+
+///
+/// A variant view type that accesses values in serialized BSON documents.
+///
+/// Element functions as a variant type, where the kind of the element can be
+/// interrogated by calling type(), the key can be extracted by calling key() and
+/// a specific value can be extracted through get_X() accessors.
+///
+/// @relatesalso array::element
+///
+class BSONCXX_API element {
+   public:
+    ///
+    /// Construct an invalid element.
+    ///
+    /// This is useful when mapping the end iterator of a document or array
+    /// view.
+    ///
+    element();
+
+    ///
+    /// Conversion operator to bool which is true for valid elements
+    /// and false for invalid elements.
+    ///
+    explicit operator bool() const;
+
+    ///
+    /// Getter for the raw bson bytes the element points to.
+    ///
+    /// @return a pointer to the raw bson bytes.
+    ///
+    const std::uint8_t* raw() const;
+
+    ///
+    /// Getter for length of the raw bson bytes the element points to.
+    ///
+    /// @return a pointer to the length of the raw bson bytes.
+    ///
+    std::uint32_t length() const;
+
+    ///
+    /// Getter for the offset into the raw bson bytes the element points to.
+    ///
+    /// @return the offset into the raw bson bytes.
+    ///
+    std::uint32_t offset() const;
+
+    ///
+    /// Getter for the type of the element.
+    ///
+    /// @return the element's type.
+    ///
+    /// @throws bsoncxx::exception if this element is invalid.
+    ///
+    bsoncxx::type type() const;
+
+    ///
+    /// Getter for the element's key.
+    ///
+    /// @return the element's key.
+    ///
+    /// @throws bsoncxx::exception if this element is invalid.
+    ///
+    stdx::string_view key() const;
+
+    ///
+    /// Getter for the element's key length.
+    ///
+    /// @return the element's key length.
+    ///
+    std::uint32_t keylen() const;
+
+    ///
+    /// Getter for elements of the b_double type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_double.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_double get_double() const;
+
+    ///
+    /// Getter for elements of the b_string type.
+    ///
+    /// @deprecated use document::element::get_string() instead.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_string.
+    ///
+    /// @return the element's value.
+    ///
+    BSONCXX_DEPRECATED types::b_string get_utf8() const;
+
+    ///
+    /// Getter for elements of the b_string type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_string.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_string get_string() const;
+
+    ///
+    /// Getter for elements of the b_document type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_document.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_document get_document() const;
+
+    ///
+    /// Getter for elements of the b_array type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_array.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_array get_array() const;
+
+    ///
+    /// Getter for elements of the b_binary type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_binary.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_binary get_binary() const;
+
+    ///
+    /// Getter for elements of the b_undefined type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_undefined.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_undefined get_undefined() const;
+
+    ///
+    /// Getter for elements of the b_oid type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_oid.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_oid get_oid() const;
+
+    ///
+    /// Getter for elements of the b_bool type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_bool.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_bool get_bool() const;
+
+    ///
+    /// Getter for elements of the b_date type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_date.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_date get_date() const;
+
+    ///
+    /// Getter for elements of the b_null type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_null.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_null get_null() const;
+
+    ///
+    /// Getter for elements of the b_regex type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_regex.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_regex get_regex() const;
+
+    ///
+    /// Getter for elements of the b_dbpointer type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_dbpointer.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_dbpointer get_dbpointer() const;
+
+    ///
+    /// Getter for elements of the b_code type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_code.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_code get_code() const;
+
+    ///
+    /// Getter for elements of the b_symbol type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_symbol.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_symbol get_symbol() const;
+
+    ///
+    /// Getter for elements of the b_codewscope type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_codewscope.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_codewscope get_codewscope() const;
+
+    ///
+    /// Getter for elements of the b_int32 type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_int32.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_int32 get_int32() const;
+
+    ///
+    /// Getter for elements of the b_timestamp type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_timestamp.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_timestamp get_timestamp() const;
+
+    ///
+    /// Getter for elements of the b_int64 type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_int64.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_int64 get_int64() const;
+
+    ///
+    /// Getter for elements of the b_decimal128 type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_decimal128.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_decimal128 get_decimal128() const;
+
+    ///
+    /// Getter for elements of the b_minkey type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_minkey.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_minkey get_minkey() const;
+
+    ///
+    /// Getter for elements of the b_maxkey type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_maxkey.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_maxkey get_maxkey() const;
+
+    ///
+    /// Getter for a types::bson_value::view variant wrapper of the value portion of the
+    /// element.
+    ///
+    /// @return the element's value.
+    ///
+    types::bson_value::view get_value() const;
+
+    ///
+    /// Getter for a types::bson_value::value variant wrapper of the value portion of
+    /// the element. The returned object will make a copy of the buffer from this object.
+    ///
+    /// @return an owning version of the element's value.
+    ///
+    types::bson_value::value get_owning_value() const;
+
+    ///
+    /// If this element is a document, finds the first element of the document
+    /// with the provided key. If there is no such element, an invalid
+    /// document::element will be returned.  The runtime of operator[] is
+    /// linear in the length of the document.
+    ///
+    /// If this element is not a document, an invalid document::element will
+    /// be returned.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return The matching element, if found, or an invalid element.
+    ///
+    element operator[](stdx::string_view key) const;
+
+    ///
+    /// If this element is an array, indexes into this BSON array. If the
+    /// index is out-of-bounds, an invalid array::element will be returned. As
+    /// BSON represents arrays as documents, the runtime of operator[] is
+    /// linear in the length of the array.
+    ///
+    /// If this element is not an array, an invalid array::element will
+    /// be returned.
+    ///
+    /// @param i
+    ///   The index of the element.
+    ///
+    /// @return The element if it exists, or an invalid element.
+    ///
+    array::element operator[](std::uint32_t i) const;
+
+   private:
+    ///
+    /// Construct an element as an offset into a buffer of bson bytes.
+    ///
+    /// @param raw
+    ///   A pointer to the raw bson bytes.
+    ///
+    /// @param length
+    ///   The size of the bson buffer.
+    ///
+    /// @param offset
+    ///   The element's offset into the buffer.
+    ///
+    BSONCXX_PRIVATE explicit element(const std::uint8_t* raw,
+                                     std::uint32_t length,
+                                     std::uint32_t offset,
+                                     std::uint32_t keylen);
+
+    friend class view;
+    friend class array::element;
+
+    const std::uint8_t* _raw;
+    std::uint32_t _length;
+    std::uint32_t _offset;
+    std::uint32_t _keylen;
+};
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns true if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator==(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator==(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns false if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator!=(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+}  // namespace document
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp
new file mode 100644
index 0000000..a9ec570
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp
@@ -0,0 +1,265 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdlib>
+#include <memory>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace document {
+
+///
+/// A read-only BSON document that owns its underlying buffer. When a document::value goes
+/// out of scope, the underlying buffer is freed. Generally this class should be used
+/// sparingly; document::view should be used instead wherever possible.
+///
+class BSONCXX_API value {
+   public:
+    using deleter_type = void (*)(std::uint8_t*);
+    using unique_ptr_type = std::unique_ptr<uint8_t[], deleter_type>;
+
+    ///
+    /// Constructs a value from a buffer.
+    /// This constructor transfers ownership of the buffer to the resulting
+    /// value. A user-provided deleter is used to destroy the buffer.
+    ///
+    /// @param data
+    ///   A pointer to a buffer containing a valid BSON document.
+    /// @param length
+    ///   The length of the document.
+    /// @param dtor
+    ///   A user provided deleter.
+    ///
+    value(std::uint8_t* data, std::size_t length, deleter_type dtor);
+
+    ///
+    /// Constructs a value from a std::unique_ptr to a buffer. The ownership
+    /// of the buffer is transferred to the constructed value.
+    ///
+    /// @param ptr
+    ///   A pointer to a buffer containing a valid BSON document.
+    /// @param length
+    ///   The length of the document.
+    ///
+    value(unique_ptr_type ptr, std::size_t length);
+
+    ///
+    /// Constructs a value from a view of a document. The data referenced
+    /// by the document::view will be copied into a new buffer managed by the
+    /// constructed value.
+    ///
+    /// @param view
+    ///   A view of another document to copy.
+    ///
+    explicit value(document::view view);
+
+    value(const value&);
+    value& operator=(const value&);
+
+    value(value&&) noexcept = default;
+    value& operator=(value&&) noexcept = default;
+
+    ///
+    /// Constructor used for serialization of user objects. This uses argument-dependent lookup
+    /// to find the function declaration `void to_bson(T& t, bsoncxx::document::value doc)`.
+    ///
+    /// @param t
+    ///   A user-defined object to serialize into a BSON object.
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<T, typename array::view>::value, int>::type = 0>
+    explicit value(const T& t) : value({}) {
+        to_bson(t, *this);
+    }
+    template <typename T>
+    value& operator=(const T& t) {
+        *this = value{t};
+        return *this;
+    }
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    document::view::const_iterator cbegin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    document::view::const_iterator cend() const;
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    document::view::const_iterator begin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    document::view::const_iterator end() const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is
+    /// no such element, the past-the-end iterator will be returned. The runtime of
+    /// find() is linear in the length of the document. This method only searches
+    /// the top-level document, and will not recurse to any subdocuments.
+    ///
+    /// @remark In BSON, keys are not required to be unique. If there are multiple
+    /// elements with a matching key in the document, the first matching element from
+    /// the start will be returned.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return An iterator to the matching element, if found, or the past-the-end iterator.
+    ///
+    document::view::const_iterator find(stdx::string_view key) const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is no
+    /// such element, the invalid document::element will be returned. The runtime of operator[]
+    /// is linear in the length of the document.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return The matching element, if found, or the invalid element.
+    ///
+    element operator[](stdx::string_view key) const;
+
+    ///
+    /// Access the raw bytes of the underlying document.
+    ///
+    /// @return A pointer to the value's buffer.
+    ///
+    const std::uint8_t* data() const;
+
+    ///
+    /// Gets the length of the underlying buffer.
+    ///
+    /// @remark This is not the number of elements in the document.
+    /// To compute the number of elements, use std::distance.
+    ///
+    /// @return The length of the document, in bytes.
+    ///
+    std::size_t length() const;
+
+    ///
+    /// Checks if the underlying document is empty, i.e. it is equivalent to
+    /// the trivial document '{}'.
+    ///
+    /// @return true if the underlying document is empty.
+    ///
+    bool empty() const;
+
+    ///
+    /// Get a view over the document owned by this value.
+    ///
+    BSONCXX_INLINE document::view view() const noexcept;
+
+    ///
+    /// Conversion operator that provides a view given a value.
+    ///
+    /// @return A view over the value.
+    ///
+    BSONCXX_INLINE operator document::view() const noexcept;
+
+    ///
+    /// Constructs an object of type T from this document object. This method uses
+    /// argument-dependent lookup to find the function declaration
+    /// `void from_bson(T& t, const bsoncxx::document::view& doc)`.
+    ///
+    /// @note Type T must be default-constructible. Otherwise, use `void get(T& t)`.
+    ///
+    template <typename T>
+    T get() {
+        T temp{};
+        from_bson(temp, this->view());
+        return temp;
+    }
+
+    ///
+    /// Constructs an object of type T from this document object. This method uses
+    /// argument-dependent lookup to find the function declaration
+    /// `void from_bson(T& t, const bsoncxx::document::view& doc)`.
+    ///
+    /// @param t
+    ///   The object to construct. The contents of the document object will be deserialized
+    ///   into t.
+    ///
+    template <typename T>
+    void get(T& t) {
+        from_bson(t, this->view());
+    }
+
+    ///
+    /// Transfer ownership of the underlying buffer to the caller.
+    ///
+    /// @warning
+    ///   After calling release() it is illegal to call any methods
+    ///   on this class, unless it is subsequently moved into.
+    ///
+    /// @return A std::unique_ptr with ownership of the buffer.
+    ///
+    unique_ptr_type release();
+
+    ///
+    /// Replace the formerly-owned buffer with the new view.
+    /// This will make a copy of the passed-in view.
+    ///
+    void reset(document::view view);
+
+   private:
+    unique_ptr_type _data;
+    std::size_t _length{0};
+};
+
+BSONCXX_INLINE document::view value::view() const noexcept {
+    return document::view{static_cast<uint8_t*>(_data.get()), _length};
+}
+
+BSONCXX_INLINE value::operator document::view() const noexcept {
+    return view();
+}
+
+///
+/// @{
+///
+/// Compares two document values for (in)-equality.
+///
+/// @relates document::value
+///
+BSONCXX_INLINE bool operator==(const value& lhs, const value& rhs) {
+    return (lhs.view() == rhs.view());
+}
+
+BSONCXX_INLINE bool operator!=(const value& lhs, const value& rhs) {
+    return !(lhs == rhs);
+}
+
+///
+/// @}
+///
+
+}  // namespace document
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp
new file mode 100644
index 0000000..b05b425
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp
@@ -0,0 +1,194 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+
+#include <bsoncxx/document/element.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace document {
+
+///
+/// A read-only, non-owning view of a BSON document.
+///
+class BSONCXX_API view {
+   public:
+    class BSONCXX_API const_iterator;
+    using iterator = const_iterator;
+
+    ///
+    /// Default constructs a view. The resulting view will be initialized to point at
+    /// an empty BSON document.
+    ///
+    view();
+
+    ///
+    /// Constructs a view from a buffer. The caller is responsible for ensuring that
+    /// the lifetime of the resulting view is a subset of the buffer's.
+    ///
+    /// @param data
+    ///   A buffer containing a valid BSON document.
+    /// @param length
+    ///   The size of the buffer, in bytes.
+    ///
+    view(const std::uint8_t* data, std::size_t length);
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    const_iterator cbegin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    const_iterator cend() const;
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    const_iterator begin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    const_iterator end() const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is
+    /// no such element, the past-the-end iterator will be returned. The runtime of
+    /// find() is linear in the length of the document. This method only searches
+    /// the top-level document, and will not recurse to any subdocuments.
+    ///
+    /// @remark In BSON, keys are not required to be unique. If there are multiple
+    /// elements with a matching key in the document, the first matching element from
+    /// the start will be returned.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return An iterator to the matching element, if found, or the past-the-end iterator.
+    ///
+    const_iterator find(stdx::string_view key) const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is no
+    /// such element, the invalid document::element will be returned. The runtime of operator[]
+    /// is linear in the length of the document.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return The matching element, if found, or the invalid element.
+    ///
+    element operator[](stdx::string_view key) const;
+
+    ///
+    /// Access the raw bytes of the underlying document.
+    ///
+    /// @return A (non-owning) pointer to the view's buffer.
+    ///
+    const std::uint8_t* data() const;
+
+    ///
+    /// Gets the length of the underlying buffer.
+    ///
+    /// @remark This is not the number of elements in the document.
+    /// To compute the number of elements, use std::distance.
+    ///
+    /// @return The length of the document, in bytes.
+    ///
+    std::size_t length() const;
+
+    ///
+    /// Checks if the underlying document is empty, i.e. it is equivalent to
+    /// the trivial document '{}'.
+    ///
+    /// @return true if the underlying document is empty.
+    ///
+    bool empty() const;
+
+    ///
+    /// @{
+    ///
+    /// Compare two document views for (in)-equality
+    ///
+    /// @relates view
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(view, view);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(view, view);
+    ///
+    /// @}
+    ///
+
+   private:
+    const std::uint8_t* _data;
+    std::size_t _length;
+};
+
+///
+/// A const iterator over the contents of a document view.
+///
+/// This iterator type provides a const forward iterator interface to document
+/// view elements.
+///
+class BSONCXX_API view::const_iterator {
+   public:
+    ///
+    /// std::iterator_traits
+    ///
+    using value_type = element;
+    using reference = element&;
+    using pointer = element*;
+    using iterator_category = std::forward_iterator_tag;
+    using difference_type = std::ptrdiff_t;
+
+    const_iterator();
+    explicit const_iterator(const element& element);
+
+    reference operator*();
+    pointer operator->();
+
+    const_iterator& operator++();
+    const_iterator operator++(int);
+
+    ///
+    /// @{
+    ///
+    /// Compares two const_iterators for (in)-equality
+    ///
+    /// @relates view::const_iterator
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const const_iterator&, const const_iterator&);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const const_iterator&, const const_iterator&);
+    ///
+    /// @}
+    ///
+
+   private:
+    element _element;
+};
+
+}  // namespace document
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp
new file mode 100644
index 0000000..5fb3466
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp
@@ -0,0 +1,33 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace document {
+
+using view_or_value = bsoncxx::view_or_value<document::view, document::value>;
+
+}  // namespace document
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp
new file mode 100644
index 0000000..bef4b39
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp
@@ -0,0 +1,27 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef BSONCXX_ENUM
+#error "This header is only meant to be included as an X-macro over BSONCXX_ENUM"
+#endif
+
+BSONCXX_ENUM(binary, 0x00)
+BSONCXX_ENUM(function, 0x01)
+BSONCXX_ENUM(binary_deprecated, 0x02)
+BSONCXX_ENUM(uuid_deprecated, 0x03)
+BSONCXX_ENUM(uuid, 0x04)
+BSONCXX_ENUM(md5, 0x05)
+BSONCXX_ENUM(encrypted, 0x06)
+BSONCXX_ENUM(column, 0x07)
+BSONCXX_ENUM(user, 0x80)
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp
new file mode 100644
index 0000000..bd94b1e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp
@@ -0,0 +1,39 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef BSONCXX_ENUM
+#error "This header is only meant to be included as an X-macro over BSONCXX_ENUM"
+#endif
+
+BSONCXX_ENUM(double, 0x01)
+BSONCXX_ENUM(string, 0x02)
+BSONCXX_ENUM(document, 0x03)
+BSONCXX_ENUM(array, 0x04)
+BSONCXX_ENUM(binary, 0x05)
+BSONCXX_ENUM(undefined, 0x06)
+BSONCXX_ENUM(oid, 0x07)
+BSONCXX_ENUM(bool, 0x08)
+BSONCXX_ENUM(date, 0x09)
+BSONCXX_ENUM(null, 0x0A)
+BSONCXX_ENUM(regex, 0x0B)
+BSONCXX_ENUM(dbpointer, 0x0C)
+BSONCXX_ENUM(code, 0x0D)
+BSONCXX_ENUM(symbol, 0x0E)
+BSONCXX_ENUM(codewscope, 0x0F)
+BSONCXX_ENUM(int32, 0x10)
+BSONCXX_ENUM(timestamp, 0x11)
+BSONCXX_ENUM(int64, 0x12)
+BSONCXX_ENUM(decimal128, 0x13)
+BSONCXX_ENUM(maxkey, 0x7F)
+BSONCXX_ENUM(minkey, 0xFF)
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
new file mode 100644
index 0000000..4988fa3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
@@ -0,0 +1,129 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <system_error>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the various error types that can occur while operating on BSON values.
+///
+enum class error_code : std::int32_t {
+    /// A new key was appended while building a subarray.
+    k_cannot_append_key_in_sub_array = 1,
+
+    /// A subarray was closed while building a subdocument.
+    k_cannot_close_array_in_sub_document,
+
+    /// A subdocument was closed while building a subarray.
+    k_cannot_close_document_in_sub_array,
+
+    /// An array operation was performed while building a document.
+    k_cannot_perform_array_operation_on_document,
+
+    /// A document operation was performed while building an array.
+    k_cannot_perform_document_operation_on_array,
+#define BSONCXX_ENUM(name, value) k_need_element_type_k_##name,
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+    /// No key was provided when one was needed.
+    k_need_key,
+
+    /// An array was closed while no array was open.
+    k_no_array_to_close,
+
+    /// A document was closed while no document was open.
+    k_no_document_to_close,
+
+    // Attempted to view or extract a document when a key was still awaiting a matching value.
+    k_unmatched_key_in_builder,
+
+    /// An empty element was accessed.
+    k_unset_element,
+
+    /// A JSON document failed to parse.
+    k_json_parse_failure,
+
+    /// An Object ID string failed to parse.
+    k_invalid_oid,
+
+    // This type is unused and deprecated.
+    k_failed_converting_bson_to_json,
+
+    /// A Decimal128 string failed to parse.
+    k_invalid_decimal128,
+
+    /// BSON data could not be processed, but no specific reason was available.
+    k_internal_error,
+
+    /// Failed to begin appending an array to a BSON document or array.
+    k_cannot_begin_appending_array,
+
+    /// Failed to begin appending a BSON document to a BSON document or array.
+    k_cannot_begin_appending_document,
+
+    /// Failed to complete appending an array to a BSON document or array.
+    k_cannot_end_appending_array,
+
+    /// Failed to complete appending a BSON document to a BSON document or array.
+    k_cannot_end_appending_document,
+
+    /// Invalid binary subtype.
+    k_invalid_binary_subtype,
+
+    /// Invalid type.
+    k_invalid_bson_type_id,
+
+/// A value failed to append.
+#define BSONCXX_ENUM(name, value) k_cannot_append_##name,
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+    k_cannot_append_utf8 = k_cannot_append_string,
+    k_need_element_type_k_utf8 = k_need_element_type_k_string,
+    // Add new constant string message to error_code.cpp as well!
+};
+
+///
+/// Get the error_category for exceptions originating from the bsoncxx library.
+///
+/// @return The bsoncxx error_category
+///
+BSONCXX_API const std::error_category& BSONCXX_CALL error_category();
+
+///
+/// Translate a bsoncxx::error_code into a std::error_code.
+///
+/// @param error An error from bsoncxx
+/// @return An error_code
+///
+BSONCXX_INLINE std::error_code make_error_code(error_code error) {
+    return {static_cast<int>(error), error_category()};
+}
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
+
+namespace std {
+// Specialize is_error_code_enum so we get simpler std::error_code construction
+template <>
+struct is_error_code_enum<bsoncxx::error_code> : public true_type {};
+}  // namespace std
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
new file mode 100644
index 0000000..949f76e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
@@ -0,0 +1,35 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <system_error>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing any exceptions emitted from the bsoncxx library or
+/// its underlying implementation.
+///
+class BSONCXX_API exception : public std::system_error {
+    using std::system_error::system_error;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/json.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/json.hpp
new file mode 100644
index 0000000..1353701
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/json.hpp
@@ -0,0 +1,90 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+///
+/// Top level namespace for MongoDB C++ BSON functionality.
+///
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+// Placing this variable between the `BSONCXX_INLINE_NAMESPACE_BEGIN` and the Doxygen documentation
+// for `to_json` suppressed the macro name from being shown as part of the return type in the
+// generated documentation pages.
+extern const bool k_silence_doxygen;
+
+///
+/// An enumeration of the types of Extended JSON that the to_json function accepts
+enum class ExtendedJsonMode : std::uint8_t {
+    k_legacy,     ///< to produce Legacy Extended JSON
+    k_canonical,  ///< to produce Canonical Extended JSON
+    k_relaxed,    ///< to produce Relaxed Extended JSON
+};
+
+///
+/// Converts a BSON document to a JSON string, in extended format.
+///
+/// @param view
+///   A valid BSON document.
+/// @param mode
+///   An optional JSON representation mode.
+///
+/// @throws bsoncxx::exception with error details if the conversion failed.
+///
+/// @returns An extended JSON string.
+///
+BSONCXX_API std::string BSONCXX_CALL to_json(document::view view,
+                                             ExtendedJsonMode mode = ExtendedJsonMode::k_legacy);
+
+///
+/// Constructs a new document::value from the provided JSON text.
+///
+/// @param 'json'
+///  A string_view into a JSON document.
+///
+/// @returns A document::value if conversion worked.
+///
+/// @throws bsoncxx::exception with error details if the conversion failed.
+///
+BSONCXX_API document::value BSONCXX_CALL from_json(stdx::string_view json);
+
+///
+/// Constructs a new document::value from the provided JSON text. This is the UDL version of
+/// from_json().
+///
+/// @param 'json'
+///  A string into a JSON document.
+///
+/// @param 'len'
+///  The length of the JSON string. This is calculated automatically upon use of the UDL.
+///
+/// @returns A document::value if conversion worked.
+///
+/// @throws bsoncxx::exception with error details if the conversion failed.
+///
+BSONCXX_API document::value BSONCXX_CALL operator"" _bson(const char* json, size_t len);
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/oid.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/oid.hpp
new file mode 100644
index 0000000..fb5c2ca
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/oid.hpp
@@ -0,0 +1,126 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <array>
+#include <ctime>
+#include <string>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Represents a MongoDB ObjectId. As this BSON type is used within the MongoDB server
+/// as a primary key for each document, it is useful for representing a 'pointer'
+/// to another document.
+///
+/// @note we use 'oid' to refer to this concrete class. We use 'ObjectId' to refer
+/// to the BSON type.
+///
+/// @see https://docs.mongodb.com/manual/reference/object-id/
+///
+class BSONCXX_API oid {
+   public:
+    static constexpr std::size_t k_oid_length = 12;
+
+    ///
+    /// Constructs an oid and initializes it to a newly generated ObjectId.
+    ///
+    oid();
+
+    ///
+    /// Constructs an oid initializes it to the contents of the provided buffer.
+    ///
+    /// @param bytes
+    ///   A pointer a buffer containing a valid ObjectId.
+    /// @param len
+    ///   The length of the buffer. Should be equal to oid::size().
+    ///
+    /// @throws bsoncxx::exception if the length is not equal to oid::size().
+    ///
+    explicit oid(const char* bytes, std::size_t len);
+
+    ///
+    /// Constructs an oid and initializes it from the provided hex string.
+    ///
+    /// @param str
+    ///   A string of a hexadecimal representation of a valid ObjectId.
+    ///
+    /// @throws bsoncxx::exception if the string isn't an OID-sized hex
+    /// string.
+    ///
+    explicit oid(const bsoncxx::stdx::string_view& str);
+
+    ///
+    /// Converts this oid to a hexadecimal string.
+    ///
+    /// @return A hexadecimal string representation of this ObjectId.
+    ///
+    std::string to_string() const;
+
+    ///
+    /// Returns the number of bytes in this ObjectId.
+    ///
+    /// @return The length of this oid's buffer.
+    ///
+    static std::size_t size() {
+        return k_oid_length;
+    }
+
+    ///
+    /// @{
+    ///
+    /// Relational operators for OIDs
+    ///
+    /// @relates oid
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator<(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator>(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator<=(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator>=(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const oid& lhs, const oid& rhs);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Extracts the timestamp portion of the underlying ObjectId.
+    ///
+    /// @return A std::time_t initialized to the timestamp.
+    ///
+    std::time_t get_time_t() const;
+
+    ///
+    /// An accessor for the internal data buffer in the oid.
+    ///
+    /// @return A pointer to the internal buffer holding the oid bytes.
+    ///
+    const char* bytes() const;
+
+   private:
+    friend BSONCXX_PRIVATE int oid_compare(const oid& lhs, const oid& rhs);
+
+    std::array<char, k_oid_length> _bytes;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp
new file mode 100644
index 0000000..d954eae
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp
@@ -0,0 +1,69 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+#if defined(BSONCXX_POLY_USE_MNMLSTC)
+
+#if defined(MONGO_CXX_DRIVER_COMPILING) || defined(BSONCXX_POLY_USE_SYSTEM_MNMLSTC)
+#include <core/memory.hpp>
+#else
+#include <bsoncxx/third_party/mnmlstc/core/memory.hpp>
+#endif
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::core::make_unique;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_BOOST)
+
+#include <boost/smart_ptr/make_unique.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::boost::make_unique;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif __cplusplus >= 201402L
+
+#include <memory>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::make_unique;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+#error "Cannot find a valid polyfill for make_unique"
+#endif
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
new file mode 100644
index 0000000..a62fd1b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
@@ -0,0 +1,99 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+#if defined(BSONCXX_POLY_USE_MNMLSTC)
+
+#if defined(MONGO_CXX_DRIVER_COMPILING) || defined(BSONCXX_POLY_USE_SYSTEM_MNMLSTC)
+#include <core/optional.hpp>
+#else
+#include <bsoncxx/third_party/mnmlstc/core/optional.hpp>
+#endif
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::core::make_optional;
+using ::core::nullopt;
+using ::core::nullopt_t;
+using ::core::optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_BOOST)
+
+#include <boost/none.hpp>
+#include <boost/optional/optional.hpp>
+#include <boost/optional/optional_io.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::boost::optional;
+using nullopt_t = ::boost::none_t;
+
+// TODO(MSVC): This would be better expressed as constexpr, but VS2015U1 can't do it.
+const nullopt_t nullopt{::boost::none};
+using ::boost::make_optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_STD_EXPERIMENTAL)
+
+#include <experimental/optional>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::experimental::make_optional;
+using ::std::experimental::nullopt;
+using ::std::experimental::nullopt_t;
+using ::std::experimental::optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_STD)
+
+#include <optional>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::make_optional;
+using ::std::nullopt;
+using ::std::nullopt_t;
+using ::std::optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+#error "Cannot find a valid polyfill for optional"
+#endif
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
new file mode 100644
index 0000000..581d346
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
@@ -0,0 +1,109 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+#if defined(BSONCXX_POLY_USE_MNMLSTC)
+
+#if defined(MONGO_CXX_DRIVER_COMPILING) || defined(BSONCXX_POLY_USE_SYSTEM_MNMLSTC)
+#include <core/string.hpp>
+#else
+#include <bsoncxx/third_party/mnmlstc/core/string.hpp>
+#endif
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::core::basic_string_view;
+using ::core::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_BOOST)
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 106100
+
+#include <boost/utility/string_view.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::boost::basic_string_view;
+using ::boost::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+
+#include <boost/utility/string_ref.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+template <typename charT, typename traits = std::char_traits<charT>>
+using basic_string_view = ::boost::basic_string_ref<charT, traits>;
+using string_view = ::boost::string_ref;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#endif
+
+#elif defined(BSONCXX_POLY_USE_STD_EXPERIMENTAL)
+
+#include <experimental/string_view>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::experimental::basic_string_view;
+using ::std::experimental::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_STD)
+
+#include <string_view>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::basic_string_view;
+using ::std::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+#error "Cannot find a valid polyfill for string_view"
+#endif
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp
new file mode 100644
index 0000000..42546dc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp
@@ -0,0 +1,40 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <utility>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace string {
+
+template <class CharT,
+          class Traits = std::char_traits<CharT>,
+          class Allocator = std::allocator<CharT>>
+BSONCXX_INLINE std::basic_string<CharT, Traits, Allocator> to_string(
+    stdx::basic_string_view<CharT, Traits> value, const Allocator& alloc = Allocator()) {
+    return std::basic_string<CharT, Traits, Allocator>{value.data(), value.length(), alloc};
+}
+
+}  // namespace string
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp
new file mode 100644
index 0000000..e5b5aa5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp
@@ -0,0 +1,123 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace string {
+
+///
+/// Class representing a view-or-value variant type for strings.
+///
+/// This class adds several string-specific methods to the bsoncxx::view_or_value template:
+/// - a constructor overload for const char*
+/// - a constructor overload for std::string by l-value reference
+/// - a safe c_str() operation to return null-terminated c-style strings.
+///
+class BSONCXX_API view_or_value : public bsoncxx::view_or_value<stdx::string_view, std::string> {
+   public:
+    ///
+    /// Forward all bsoncxx::view_or_value constructors.
+    ///
+    using bsoncxx::view_or_value<stdx::string_view, std::string>::view_or_value;
+
+    ///
+    /// Default constructor, equivalent to using an empty string.
+    ///
+    BSONCXX_INLINE view_or_value() = default;
+
+    ///
+    /// Construct a string::view_or_value using a null-terminated const char *.
+    /// The resulting view_or_value will keep a string_view of 'str', so it is
+    /// important that the passed-in string outlive this object.
+    ///
+    /// @param str A null-terminated string
+    ///
+    BSONCXX_INLINE view_or_value(const char* str)
+        : bsoncxx::view_or_value<stdx::string_view, std::string>(stdx::string_view(str)) {}
+
+    ///
+    /// Allow construction with an l-value reference to a std::string. The resulting
+    /// view_or_value will keep a string_view of 'str', so it is important that the
+    /// passed-in string outlive this object.
+    ///
+    /// Construction calls passing a std::string by r-value reference will use the
+    /// constructor defined in the parent view_or_value class.
+    ///
+    /// @param str A std::string l-value reference.
+    ///
+    BSONCXX_INLINE view_or_value(const std::string& str)
+        : bsoncxx::view_or_value<stdx::string_view, std::string>(stdx::string_view(str)) {}
+
+    ///
+    /// Return a string_view_or_value that is guaranteed to hold a null-terminated
+    /// string. The lifetime of the returned object must be a subset of this object's
+    /// lifetime, because the new view_or_value might hold a view into this one.
+    ///
+    /// It is recommended that this method be used before calling .data() on a
+    /// view_or_value, as that method may return a non-null-terminated string.
+    ///
+    /// @return A new view_or_value object.
+    ///
+    view_or_value terminated() const;
+
+    ///
+    /// Call data() on this view_or_value's string_view. This method is not
+    /// guaranteed to return a null-terminated string unless it is used in
+    /// combination with terminated().
+    ///
+    /// @return A const char* of this string.
+    ///
+    const char* data() const;
+};
+
+///
+/// @{
+///
+/// Comparison operators for comparing string::view_or_value directly with const char *.
+///
+/// @relates view_or_value
+///
+BSONCXX_INLINE bool operator==(const view_or_value& lhs, const char* rhs) {
+    return lhs.view() == stdx::string_view(rhs);
+}
+
+BSONCXX_INLINE bool operator!=(const view_or_value& lhs, const char* rhs) {
+    return !(lhs == rhs);
+}
+
+BSONCXX_INLINE bool operator==(const char* lhs, const view_or_value& rhs) {
+    return rhs == lhs;
+}
+
+BSONCXX_INLINE bool operator!=(const char* lhs, const view_or_value& rhs) {
+    return !(rhs == lhs);
+}
+///
+/// @}
+///
+
+}  // namespace string
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types.hpp
new file mode 100644
index 0000000..865aab5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types.hpp
@@ -0,0 +1,697 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfloat-equal"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+#include <chrono>
+#include <cstring>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/decimal128.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// An enumeration of each BSON type.
+/// These x-macros will expand to be of the form:
+///    k_double = 0x01,
+///    k_string = 0x02,
+///    k_document = 0x03,
+///    k_array = 0x04 ...
+///
+enum class type : std::uint8_t {
+#define BSONCXX_ENUM(name, val) k_##name = val,
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+    k_utf8 = 0x02,
+};
+
+///
+/// An enumeration of each BSON binary sub type.
+/// These x-macros will expand to be of the form:
+///   k_binary = 0x00,
+///   k_function = 0x01,
+///   k_binary_deprecated = 0x02,
+///   k_uuid_deprecated = 0x03,
+///   k_uuid = 0x04,
+///   k_md5 = 0x05,
+///   k_encrypted = 0x06,
+///   k_column = 0x07,
+///   k_user = 0x80
+///
+enum class binary_sub_type : std::uint8_t {
+#define BSONCXX_ENUM(name, val) k_##name = val,
+#include <bsoncxx/enums/binary_sub_type.hpp>
+#undef BSONCXX_ENUM
+};
+
+///
+/// Returns a stringification of the given type.
+///
+/// @param rhs
+///   The type to stringify.
+///
+/// @return a std::string representation of the type.
+///
+BSONCXX_API std::string BSONCXX_CALL to_string(type rhs);
+
+///
+/// Returns a stringification of the given binary sub type.
+///
+/// @param rhs
+///   The type to stringify.
+///
+/// @return a std::string representation of the type.
+///
+BSONCXX_API std::string BSONCXX_CALL to_string(binary_sub_type rhs);
+
+namespace types {
+
+///
+/// A BSON double value.
+///
+struct BSONCXX_API b_double {
+    static constexpr auto type_id = type::k_double;
+
+    double value;
+
+    ///
+    /// Conversion operator unwrapping a double
+    ///
+    BSONCXX_INLINE operator double() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_double
+///
+/// @relatesalso b_double
+///
+BSONCXX_INLINE bool operator==(const b_double& lhs, const b_double& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON UTF-8 encoded string value.
+///
+struct BSONCXX_API b_string {
+    static constexpr auto type_id = type::k_string;
+
+    ///
+    /// Constructor for b_string.
+    ///
+    /// @param t
+    ///   The value to wrap.
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<b_string, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_string(T&& t) : value(std::forward<T>(t)) {}
+
+    stdx::string_view value;
+
+    ///
+    /// Conversion operator unwrapping a string_view
+    ///
+    BSONCXX_INLINE operator stdx::string_view() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_string
+///
+/// @relatesalso b_string
+///
+BSONCXX_INLINE bool operator==(const b_string& lhs, const b_string& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// This class has been renamed to b_string
+///
+/// @deprecated use b_string instead.
+///
+BSONCXX_DEPRECATED typedef b_string b_utf8;
+
+///
+/// A BSON document value.
+///
+struct BSONCXX_API b_document {
+    static constexpr auto type_id = type::k_document;
+
+    document::view value;
+
+    ///
+    /// Conversion operator unwrapping a document::view
+    ///
+    BSONCXX_INLINE operator document::view() const {
+        return value;
+    }
+
+    ///
+    /// Returns an unwrapped document::view
+    ///
+    BSONCXX_INLINE document::view view() {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_document
+///
+/// @relatesalso b_document
+///
+BSONCXX_INLINE bool operator==(const b_document& lhs, const b_document& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON array value.
+///
+struct BSONCXX_API b_array {
+    static constexpr auto type_id = type::k_array;
+
+    array::view value;
+
+    ///
+    /// Conversion operator unwrapping an array::view
+    ///
+    BSONCXX_INLINE operator array::view() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_array
+///
+/// @relatesalso b_array
+///
+BSONCXX_INLINE bool operator==(const b_array& lhs, const b_array& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON binary data value.
+///
+struct BSONCXX_API b_binary {
+    static constexpr auto type_id = type::k_binary;
+
+    binary_sub_type sub_type;
+    uint32_t size;
+    const uint8_t* bytes;
+};
+
+///
+/// free function comparator for b_binary
+///
+/// @relatesalso b_binary
+///
+BSONCXX_INLINE bool operator==(const b_binary& lhs, const b_binary& rhs) {
+    return lhs.sub_type == rhs.sub_type && lhs.size == rhs.size &&
+           (!lhs.size || (std::memcmp(lhs.bytes, rhs.bytes, lhs.size) == 0));
+}
+
+///
+/// A BSON undefined value.
+///
+/// @deprecated
+///   This BSON type is deprecated and use by clients is discouraged.
+///
+struct BSONCXX_API b_undefined {
+    static constexpr auto type_id = type::k_undefined;
+};
+
+///
+/// free function comparator for b_undefined
+///
+/// @relatesalso b_undefined
+///
+BSONCXX_INLINE bool operator==(const b_undefined&, const b_undefined&) {
+    return true;
+}
+
+///
+/// A BSON ObjectId value.
+///
+struct BSONCXX_API b_oid {
+    static constexpr auto type_id = type::k_oid;
+
+    oid value;
+};
+
+///
+/// free function comparator for b_oid
+///
+/// @relatesalso b_oid
+///
+BSONCXX_INLINE bool operator==(const b_oid& lhs, const b_oid& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON boolean value.
+///
+struct BSONCXX_API b_bool {
+    static constexpr auto type_id = type::k_bool;
+
+    bool value;
+
+    ///
+    /// Conversion operator unwrapping a bool
+    ///
+    BSONCXX_INLINE operator bool() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_bool
+///
+/// @relatesalso b_bool
+///
+BSONCXX_INLINE bool operator==(const b_bool& lhs, const b_bool& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON date value.
+///
+struct BSONCXX_API b_date {
+    static constexpr auto type_id = type::k_date;
+
+    ///
+    /// Constructor for b_date
+    ///
+    /// @param value
+    ///   Milliseconds since the system_clock epoch.
+    ///
+    BSONCXX_INLINE
+    explicit b_date(std::chrono::milliseconds value) : value(value) {}
+
+    ///
+    /// Constructor for b_date
+    ///
+    /// @param tp
+    ///   A system_clock time_point.
+    ///
+    BSONCXX_INLINE
+    explicit b_date(const std::chrono::system_clock::time_point& tp)
+        : value(std::chrono::duration_cast<std::chrono::milliseconds>(tp.time_since_epoch())) {}
+
+    std::chrono::milliseconds value;
+
+    ///
+    /// Conversion operator unwrapping a int64_t
+    ///
+    BSONCXX_INLINE operator int64_t() const {
+        return value.count();
+    }
+
+    ///
+    /// Manually convert this b_date to an int64_t
+    ///
+    BSONCXX_INLINE int64_t to_int64() const {
+        return value.count();
+    }
+
+    ///
+    /// Conversion operator unwrapping a time_point
+    ///
+    BSONCXX_INLINE operator std::chrono::system_clock::time_point() const {
+        return std::chrono::system_clock::time_point(
+            std::chrono::duration_cast<std::chrono::system_clock::duration>(value));
+    }
+};
+
+///
+/// free function comparator for b_date
+///
+/// @relatesalso b_date
+///
+BSONCXX_INLINE bool operator==(const b_date& lhs, const b_date& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON null value.
+///
+struct BSONCXX_API b_null {
+    static constexpr auto type_id = type::k_null;
+};
+
+///
+/// free function comparator for b_null
+///
+/// @relatesalso b_null
+///
+BSONCXX_INLINE bool operator==(const b_null&, const b_null&) {
+    return true;
+}
+
+///
+/// A BSON regex value.
+///
+struct BSONCXX_API b_regex {
+    static constexpr auto type_id = type::k_regex;
+
+    ///
+    /// Constructor for b_regex
+    ///
+    /// @param regex
+    ///   The regex pattern
+    ///
+    /// @param options
+    ///   The regex options
+    ///
+    template <typename T,
+              typename U = stdx::string_view,
+              typename std::enable_if<!std::is_same<b_regex, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_regex(T&& regex, U&& options = U{})
+        : regex(std::forward<T>(regex)), options(std::forward<U>(options)) {}
+
+    stdx::string_view regex;
+    stdx::string_view options;
+};
+
+///
+/// free function comparator for b_regex
+///
+/// @relatesalso b_regex
+///
+BSONCXX_INLINE bool operator==(const b_regex& lhs, const b_regex& rhs) {
+    return lhs.regex == rhs.regex && lhs.options == rhs.options;
+}
+
+///
+/// A BSON DBPointer value.
+///
+/// @deprecated
+///   A BSON DBPointer (aka DBRef) is still supported but deprecated.
+///
+struct BSONCXX_API b_dbpointer {
+    static constexpr auto type_id = type::k_dbpointer;
+
+    stdx::string_view collection;
+    oid value;
+};
+
+///
+/// free function comparator for b_dbpointer
+///
+/// @relatesalso b_dbpointer
+///
+BSONCXX_INLINE bool operator==(const b_dbpointer& lhs, const b_dbpointer& rhs) {
+    return lhs.collection == rhs.collection && lhs.value == rhs.value;
+}
+
+///
+/// A BSON JavaScript code value.
+///
+struct BSONCXX_API b_code {
+    static constexpr auto type_id = type::k_code;
+
+    ///
+    /// Constructor for b_code.
+    ///
+    /// @param t
+    ///   The js code
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<b_code, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_code(T&& t) : code(std::forward<T>(t)) {}
+
+    stdx::string_view code;
+
+    ///
+    /// Conversion operator unwrapping a string_view
+    ///
+    BSONCXX_INLINE operator stdx::string_view() const {
+        return code;
+    }
+};
+
+///
+/// free function comparator for b_code
+///
+/// @relatesalso b_code
+///
+BSONCXX_INLINE bool operator==(const b_code& lhs, const b_code& rhs) {
+    return lhs.code == rhs.code;
+}
+
+///
+/// A BSON Symbol value.
+///
+/// @deprecated
+///   This BSON type is deprecated and use by clients is discouraged.
+///
+struct BSONCXX_API b_symbol {
+    static constexpr auto type_id = type::k_symbol;
+
+    ///
+    /// Constructor for b_symbol.
+    ///
+    /// @param t
+    ///   The symbol.
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<b_symbol, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_symbol(T&& t) : symbol(std::forward<T>(t)) {}
+
+    stdx::string_view symbol;
+
+    ///
+    /// Conversion operator unwrapping a string_view
+    ///
+    BSONCXX_INLINE operator stdx::string_view() const {
+        return symbol;
+    }
+};
+
+///
+/// free function comparator for b_symbol
+///
+/// @relatesalso b_symbol
+///
+BSONCXX_INLINE bool operator==(const b_symbol& lhs, const b_symbol& rhs) {
+    return lhs.symbol == rhs.symbol;
+}
+
+///
+/// A BSON JavaScript code with scope value.
+///
+struct BSONCXX_API b_codewscope {
+    static constexpr auto type_id = type::k_codewscope;
+
+    ///
+    /// Constructor for b_codewscope.
+    ///
+    /// @param code
+    ///   The js code
+    ///
+    /// @param scope
+    ///   A bson document view holding the scope environment.
+    ///
+    template <
+        typename T,
+        typename U,
+        typename std::enable_if<!std::is_same<b_codewscope, typename std::decay<T>::type>::value,
+                                int>::type = 0>
+    BSONCXX_INLINE explicit b_codewscope(T&& code, U&& scope)
+        : code(std::forward<T>(code)), scope(std::forward<U>(scope)) {}
+
+    stdx::string_view code;
+    document::view scope;
+};
+
+///
+/// free function comparator for b_codewscope
+///
+/// @relatesalso b_codewscope
+///
+BSONCXX_INLINE bool operator==(const b_codewscope& lhs, const b_codewscope& rhs) {
+    return lhs.code == rhs.code && lhs.scope == rhs.scope;
+}
+
+///
+/// A BSON signed 32-bit integer value.
+///
+struct BSONCXX_API b_int32 {
+    static constexpr auto type_id = type::k_int32;
+
+    int32_t value;
+
+    ///
+    /// Conversion operator unwrapping a int32_t
+    ///
+    BSONCXX_INLINE operator int32_t() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_int32
+///
+/// @relatesalso b_int32
+///
+BSONCXX_INLINE bool operator==(const b_int32& lhs, const b_int32& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON replication timestamp value.
+///
+/// @warning
+///   This BSON type is used internally by the MongoDB server - use by clients
+///   is discouraged.
+///
+struct BSONCXX_API b_timestamp {
+    static constexpr auto type_id = type::k_timestamp;
+
+    uint32_t increment;
+    uint32_t timestamp;
+};
+
+///
+/// free function comparator for b_timestamp
+///
+/// @relatesalso b_timestamp
+///
+BSONCXX_INLINE bool operator==(const b_timestamp& lhs, const b_timestamp& rhs) {
+    return lhs.increment == rhs.increment && lhs.timestamp == rhs.timestamp;
+}
+
+///
+/// A BSON 64-bit signed integer value.
+///
+struct BSONCXX_API b_int64 {
+    static constexpr auto type_id = type::k_int64;
+
+    int64_t value;
+
+    ///
+    /// Conversion operator unwrapping a int64_t
+    ///
+    BSONCXX_INLINE operator int64_t() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_int64
+///
+/// @relatesalso b_int64
+///
+BSONCXX_INLINE bool operator==(const b_int64& lhs, const b_int64& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON Decimal128 value.
+///
+struct BSONCXX_API b_decimal128 {
+    static constexpr auto type_id = type::k_decimal128;
+
+    decimal128 value;
+
+    ///
+    /// Constructor for b_decimal128.
+    ///
+    /// @param t
+    ///   The value to wrap.
+    ///
+    template <
+        typename T,
+        typename std::enable_if<!std::is_same<b_decimal128, typename std::decay<T>::type>::value,
+                                int>::type = 0>
+    BSONCXX_INLINE explicit b_decimal128(T&& t) : value(std::forward<T>(t)) {}
+};
+
+///
+/// free function comparator for b_decimal128
+///
+/// @relatesalso b_decimal128
+///
+BSONCXX_INLINE bool operator==(const b_decimal128& lhs, const b_decimal128& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON min-key value.
+///
+struct BSONCXX_API b_minkey {
+    static constexpr auto type_id = type::k_minkey;
+};
+
+///
+/// free function comparator for b_minkey
+///
+/// @relatesalso b_minkey
+///
+BSONCXX_INLINE bool operator==(const b_minkey&, const b_minkey&) {
+    return true;
+}
+
+///
+/// A BSON max-key value.
+///
+struct BSONCXX_API b_maxkey {
+    static constexpr auto type_id = type::k_maxkey;
+};
+
+///
+/// free function comparator for b_maxkey
+///
+/// @relatesalso b_maxkey
+///
+BSONCXX_INLINE bool operator==(const b_maxkey&, const b_maxkey&) {
+    return true;
+}
+
+#define BSONCXX_ENUM(name, val)                                                \
+    BSONCXX_INLINE bool operator!=(const b_##name& lhs, const b_##name& rhs) { \
+        return !(lhs == rhs);                                                  \
+    }
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+
+}  // namespace types
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp
new file mode 100644
index 0000000..3cc78bc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp
@@ -0,0 +1,43 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/document.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/types/bson_value/value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace types {
+namespace bson_value {
+
+///
+/// Helper to construct a bson_value::value from a component bson type. The type
+/// of the passed-in t can be anything that builder::basic::sub_document::append accepts.
+///
+template <typename T>
+BSONCXX_INLINE bson_value::value make_value(T&& t) {
+    auto doc = builder::basic::make_document(builder::basic::kvp("v", std::forward<T>(t)));
+    return doc.view()["v"].get_owning_value();
+}
+
+}  // namespace bson_value
+}  // namespace types
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
new file mode 100644
index 0000000..02a115e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
@@ -0,0 +1,327 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <iostream>
+#include <memory>
+#include <vector>
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/make_unique.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+namespace bson_value {
+
+///
+/// A variant owning type that represents any BSON type. Owns its underlying
+/// buffer. When a bson_value::value goes out of scope, its underlying
+/// buffer is freed.
+///
+/// For accessors into this type and to extract the various BSON types out,
+/// please use bson_value::view.
+///
+/// @relatesalso bson_value::view
+///
+class BSONCXX_API value {
+   public:
+///
+/// Constructor for each BSON type.
+///
+/// These x-macros will expand to:
+///    value(b_double v);
+///    value(b_string v);
+///    value(b_document v);
+///    value(b_array v); ...
+///
+#define BSONCXX_ENUM(name, val) value(b_##name v);
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+
+    ///
+    /// Constructs a BSON UTF-8 string value.
+    ///
+    value(const char* v);
+
+    ///
+    /// Constructs a BSON UTF-8 string value.
+    ///
+    value(std::string v);
+
+    ///
+    /// Constructs a BSON UTF-8 string value.
+    ///
+    value(stdx::string_view v);
+
+    ///
+    /// Constructs a BSON 32-bit signed integer value.
+    ///
+    value(int32_t v);
+
+    ///
+    /// Constructs a BSON 64-bit signed integer value.
+    ///
+    value(int64_t v);
+
+    ///
+    /// Constructs a BSON double value.
+    ///
+    value(double v);
+
+    ///
+    /// Constructs a BSON boolean value.
+    ///
+    value(bool v);
+
+    ///
+    /// Constructs a BSON ObjectId value.
+    ///
+    value(oid v);
+
+    ///
+    /// Constructs a BSON Decimal128 value.
+    ///
+    value(decimal128 v);
+
+    ///
+    /// Constructs a BSON date value.
+    ///
+    value(std::chrono::milliseconds v);
+
+    ///
+    /// Constructs a BSON null value.
+    ///
+    value(std::nullptr_t);
+
+    ///
+    /// Constructs a BSON document value.
+    ///
+    value(bsoncxx::document::view v);
+
+    ///
+    /// Constructs a BSON array value.
+    ///
+    value(bsoncxx::array::view v);
+
+    ///
+    /// Constructs a BSON binary data value.
+    ///
+    /// @param v
+    ///     a stream of bytes
+    /// @param sub_type
+    ///     an optional binary sub type. Defaults to type::k_binary
+    ///
+    value(std::vector<unsigned char> v, const binary_sub_type sub_type = {});
+
+    ///
+    /// Constructs a BSON binary data value.
+    ///
+    /// @param data
+    ///     pointer to a stream of bytes
+    /// @param size
+    ///     the size of the stream of bytes
+    /// @param sub_type
+    ///     an optional binary sub type. Defaults to type::k_binary
+    ///
+    value(const uint8_t* data, size_t size, const binary_sub_type sub_type = {});
+
+    ///
+    /// Constructs a BSON DBPointer value.
+    ///
+    /// @param collection
+    ///     the collection name
+    /// @param value
+    ///     the object id
+    ///
+    /// @deprecated
+    ///   A BSON DBPointer (aka DBRef) is still supported but deprecated.
+    ///
+    value(stdx::string_view collection, oid value);
+
+    ///
+    /// Constructs a BSON JavaScript code with scope value.
+    ///
+    /// @param code
+    ///     the JavaScript code
+    /// @param scope
+    ///     a bson document view holding the scope environment
+    ///
+    value(stdx::string_view code, bsoncxx::document::view_or_value scope);
+
+    ///
+    /// Constructs a BSON regex value with options.
+    ///
+    /// @param regex
+    ///   The regex pattern
+    /// @param options
+    ///   The regex options
+    ///
+    value(stdx::string_view regex, stdx::string_view options);
+
+    ///
+    /// Constructs one of the following BSON values (each specified by the parenthesized type):
+    /// - BSON code value (type::k_code)
+    /// - BSON regex value (type::k_regex)
+    /// - BSON symbol value (type::k_symbol)
+    ///
+    /// @param id
+    ///     the type of BSON value to construct.
+    /// @param v
+    ///     the symbol, JavaScript code, or regex pattern for the BSON symbol, code, or regex value
+    ///     respectively.
+    ///
+    /// @throws bsoncxx::exception if the type's value is not k_code, k_regex, or k_symbol.
+    ///
+    /// @deprecated
+    ///   The BSON symbol type is deprecated and use by clients is discouraged.
+    /// @deprecated
+    ///   The BSON undefined type is deprecated and use by clients is discouraged.
+    ///
+    value(const type id, stdx::string_view v);
+
+    ///
+    /// Constructs one of the following BSON values (each specified by the parenthesized type):
+    /// - BSON maxkey value (type::k_maxkey)
+    /// - BSON minkey value (type::k_minkey)
+    /// - BSON undefined value (type::k_undefined)
+    ///
+    /// @param id
+    ///     the type of BSON value to construct.
+    ///
+    /// @throws bsoncxx::exception if the type's value is not k_maxkey, k_minkey, or k_undefined.
+    ///
+    value(const type id);
+
+    ///
+    /// Constructs one of the following BSON values (each specified by the parenthesized type):
+    /// - BSON decimal128 value (type::k_decimal128)
+    /// - BSON timestamp value (type::k_timestamp)
+    ///
+    /// @param id
+    ///     the type of the BSON value to construct.
+    /// @param a
+    ///     If a BSON decimal128 value is to be constructed, this is the high value.
+    ///     If a BSON timestamp value is to be constructed, this is the increment.
+    /// @param b
+    ///     If a BSON decimal128 value is to be constructed, this is the low value.
+    ///     If a BSON timestamp value is to be constructed, this is the timestamp.
+    ///
+    /// @throws bsoncxx::exception if the specified type is missing its required arguments.
+    ///
+    /// @warning
+    ///   The BSON timestamp type is used internally by the MongoDB server - use by clients
+    ///   is discouraged.
+    ///
+    value(const type id, uint64_t a, uint64_t b);
+
+    ~value();
+
+    value(const value&);
+    value& operator=(const value&);
+
+    value(value&&) noexcept;
+    value& operator=(value&&) noexcept;
+
+    ///
+    /// Create an owning copy of a bson_value::view.
+    ///
+    explicit value(const view&);
+
+    ///
+    /// Get a view over the bson_value owned by this object.
+    ///
+    bson_value::view view() const noexcept;
+
+    ///
+    /// Conversion operator that provides a bson_value::view given a bson_value::value.
+    ///
+    operator bson_value::view() const noexcept;
+
+   private:
+    friend class bsoncxx::document::element;
+
+    value(const std::uint8_t* raw,
+          std::uint32_t length,
+          std::uint32_t offset,
+          std::uint32_t keylen);
+
+    // Makes a copy of 'internal_value' and owns the copy.
+    value(void* internal_value);
+
+    friend value make_owning_bson(void* internal_value);
+
+    class BSONCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+///
+/// @{
+///
+/// Compares values for (in)-equality.
+///
+/// @relates bson_value::value
+///
+BSONCXX_INLINE bool operator==(const value& lhs, const value& rhs) {
+    return (lhs.view() == rhs.view());
+}
+
+BSONCXX_INLINE bool operator!=(const value& lhs, const value& rhs) {
+    return !(lhs == rhs);
+}
+
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Compares a value with a view for (in)-equality.
+///
+/// @relates bson_value::value
+///
+BSONCXX_INLINE bool operator==(const value& lhs, const view& rhs) {
+    return (lhs.view() == rhs);
+}
+
+BSONCXX_INLINE bool operator==(const view& lhs, const value& rhs) {
+    return (rhs == lhs);
+}
+
+BSONCXX_INLINE bool operator!=(const value& lhs, const view& rhs) {
+    return !(lhs == rhs);
+}
+
+BSONCXX_INLINE bool operator!=(const view& lhs, const value& rhs) {
+    return !(lhs == rhs);
+}
+
+///
+/// @}
+///
+
+}  // namespace bson_value
+}  // namespace types
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
new file mode 100644
index 0000000..3d40744
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
@@ -0,0 +1,345 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <type_traits>
+
+#include <bsoncxx/types.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace document {
+class element;
+}  // namespace document
+
+namespace types {
+namespace bson_value {
+
+class value;
+
+///
+/// A view-only variant that can contain any BSON type.
+///
+/// @warning
+///   Calling the wrong get_<type> method will cause an exception
+///   to be thrown.
+///
+class BSONCXX_API view {
+   public:
+///
+/// Construct a bson_value::view from any of the various BSON types. Defines
+/// constructors of the following form for each type:
+///
+///   explicit view(type) noexcept;
+///
+/// Like this:
+///
+///   explicit view(b_double) noexcept;
+///   explicit view(b_string) noexcept;
+///   explicit view(b_bool) noexcept;
+///
+/// etc.
+///
+#define BSONCXX_ENUM(type, val) explicit view(b_##type) noexcept;
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+
+    ///
+    /// Default constructs a bson_value::view. The resulting view will be initialized
+    /// to point at a bson_value of type k_null.
+    ///
+    view() noexcept;
+
+    view(const view&) noexcept;
+    view& operator=(const view&) noexcept;
+
+    ~view();
+
+    ///
+    /// @{
+    ///
+    /// Compare two bson_value::views for equality
+    ///
+    /// @relates bson_value::view
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const bson_value::view&,
+                                                    const bson_value::view&);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const bson_value::view&,
+                                                    const bson_value::view&);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @return The type of the underlying BSON value stored in this object.
+    ///
+    bsoncxx::type type() const;
+
+    ///
+    /// @return The underlying BSON double value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_double& get_double() const;
+
+    ///
+    /// @return The underlying BSON UTF-8 string value.
+    ///
+    /// @deprecated use get_string instead.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    BSONCXX_DEPRECATED const b_string& get_utf8() const;
+
+    ///
+    /// @return The underlying BSON UTF-8 string value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_string& get_string() const;
+
+    ///
+    /// @return The underlying BSON document value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_document& get_document() const;
+
+    ///
+    /// @return The underlying BSON array value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_array& get_array() const;
+
+    ///
+    /// @return The underlying BSON binary data value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_binary& get_binary() const;
+
+    ///
+    /// @return The underlying BSON undefined value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_undefined& get_undefined() const;
+
+    ///
+    /// @return The underlying BSON ObjectId value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_oid& get_oid() const;
+
+    ///
+    /// @return The underlying BSON boolean value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_bool& get_bool() const;
+
+    ///
+    /// @return The underlying BSON date value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_date& get_date() const;
+
+    ///
+    /// @return The underlying BSON null value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_null& get_null() const;
+
+    ///
+    /// @return The underlying BSON regex value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_regex& get_regex() const;
+
+    ///
+    /// @return The underlying BSON DBPointer value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_dbpointer& get_dbpointer() const;
+
+    ///
+    /// @return The underlying BSON JavaScript code value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_code& get_code() const;
+
+    ///
+    /// @return The underlying BSON symbol value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_symbol& get_symbol() const;
+
+    ///
+    /// @return The underlying BSON JavaScript code with scope value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_codewscope& get_codewscope() const;
+
+    ///
+    /// @return The underlying BSON 32-bit signed integer value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_int32& get_int32() const;
+
+    ///
+    /// @return The underlying BSON replication timestamp value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_timestamp& get_timestamp() const;
+
+    ///
+    /// @return The underlying BSON 64-bit signed integer value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_int64& get_int64() const;
+
+    ///
+    /// @return The underlying BSON Decimal128 value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_decimal128& get_decimal128() const;
+
+    ///
+    /// @return The underlying BSON min-key value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_minkey& get_minkey() const;
+
+    ///
+    /// @return The underlying BSON max-key value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_maxkey& get_maxkey() const;
+
+   private:
+    friend class document::element;
+    friend class bson_value::value;
+
+    view(const std::uint8_t* raw, std::uint32_t length, std::uint32_t offset, std::uint32_t keylen);
+    view(void* internal_value) noexcept;
+
+    void _init(void* internal_value) noexcept;
+
+    void BSONCXX_PRIVATE destroy() noexcept;
+
+    bsoncxx::type _type;
+    union {
+        struct b_double _b_double;
+        struct b_string _b_string;
+        struct b_document _b_document;
+        struct b_array _b_array;
+        struct b_binary _b_binary;
+        struct b_undefined _b_undefined;
+        struct b_oid _b_oid;
+        struct b_bool _b_bool;
+        struct b_date _b_date;
+        struct b_null _b_null;
+        struct b_regex _b_regex;
+        struct b_dbpointer _b_dbpointer;
+        struct b_code _b_code;
+        struct b_symbol _b_symbol;
+        struct b_codewscope _b_codewscope;
+        struct b_int32 _b_int32;
+        struct b_timestamp _b_timestamp;
+        struct b_int64 _b_int64;
+        struct b_decimal128 _b_decimal128;
+        struct b_minkey _b_minkey;
+        struct b_maxkey _b_maxkey;
+    };
+};
+
+// sfinae in the bool return to avoid competing with the value == value
+// operators.
+template <typename T>
+using not_view = typename std::enable_if<
+    std::is_constructible<bson_value::view, T>::value &&
+        !std::is_same<typename std::decay<T>::type, bson_value::view>::value &&
+        !std::is_same<typename std::decay<T>::type, bson_value::value>::value,
+    bool>::type;
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator==(const bson_value::view& lhs, T&& rhs) {
+    return lhs == bson_value::view{std::forward<T>(rhs)};
+}
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator==(T&& lhs, const bson_value::view& rhs) {
+    return bson_value::view{std::forward<T>(lhs)} == rhs;
+}
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator!=(const bson_value::view& lhs, T&& rhs) {
+    return lhs != bson_value::view{std::forward<T>(rhs)};
+}
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator!=(T&& lhs, const bson_value::view& rhs) {
+    return bson_value::view{std::forward<T>(lhs)} != rhs;
+}
+
+}  // namespace bson_value
+}  // namespace types
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp
new file mode 100644
index 0000000..07b672b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp
@@ -0,0 +1,35 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/types/bson_value/value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace types {
+namespace bson_value {
+
+using view_or_value = bsoncxx::view_or_value<bson_value::view, bson_value::value>;
+
+}  // namespace bson_value
+}  // namespace types
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp
new file mode 100644
index 0000000..e9a8852
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp
@@ -0,0 +1,39 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/types/bson_value/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+
+///
+/// The bsoncxx::types::bson_value::view class has been renamed to
+/// bsoncxx::types::bson_value::view.
+///
+/// @deprecated use bsoncxx::types::bson_value::view instead.
+///
+BSONCXX_DEPRECATED typedef types::bson_value::view value;
+
+}  // namespace types
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp
new file mode 100644
index 0000000..624067f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp
@@ -0,0 +1,114 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+#include <type_traits>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace util {
+
+// TODO(MSVC): VS2015U1 Completely falls apart trying to honor the
+// simple definition of is_functor since is_convertible returns the
+// wrong results for std::function, so we fall back to a bunch of
+// other template metaprogramming there.
+
+#if !defined(_MSC_VER)
+
+template <typename FunctionLike, typename Signature>
+using is_functor = std::is_convertible<FunctionLike, std::function<Signature>>;
+
+#else
+
+namespace functor {
+
+template <typename, typename>
+struct build_free_function;
+
+template <typename F, typename R, typename... Args>
+struct build_free_function<F, R(Args...)> {
+    typedef R (*type)(Args...);
+};
+
+template <typename, typename>
+struct build_class_function;
+
+template <typename C, typename R, typename... Args>
+struct build_class_function<C, R(Args...)> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename>
+struct strip_cv_from_class_function;
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...)> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...) const> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...) volatile> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename S>
+struct is_class_method_with_signature {
+    typedef int yes;
+    typedef char no;
+
+    // T stands for SFINAE
+    template <typename T>
+    static typename std::enable_if<std::is_convertible<typename build_class_function<C, S>::type,
+                                                       typename strip_cv_from_class_function<
+                                                           decltype(&T::operator())>::type>::value,
+                                   yes>::type
+    sfinae(void*);
+
+    template <typename>
+    static no sfinae(...);
+
+    static bool constexpr value = sizeof(sfinae<C>(nullptr)) == sizeof(yes);
+};
+
+template <typename F, typename S>
+struct is_function_with_signature
+    : std::is_convertible<F, typename build_free_function<F, S>::type> {};
+
+template <typename C, typename S, bool>
+struct is_functor_impl : is_class_method_with_signature<C, S> {};
+
+template <typename F, typename S>
+struct is_functor_impl<F, S, false> : is_function_with_signature<F, S> {};
+
+}  // namespace functor
+
+template <typename C, typename S>
+struct is_functor : functor::is_functor_impl<C, S, std::is_class<C>::value> {};
+
+#endif
+
+}  // namespace util
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/validate.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/validate.hpp
new file mode 100644
index 0000000..c39fa78
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/validate.hpp
@@ -0,0 +1,162 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+class validator;
+
+///
+/// Validates a BSON document. This is a simplified overload that will
+/// only do the bare minimum validation of document structure, and does
+/// not provide any further information if the document is found to be invalid.
+///
+/// @param data
+///   A buffer containing a BSON document to validate.
+/// @param length
+///   The size of the buffer.
+///
+/// @returns
+///   An engaged optional containing a view if the document is valid, or
+///   an unengaged optional if the document is invalid.
+///
+BSONCXX_API stdx::optional<document::view> BSONCXX_CALL validate(const std::uint8_t* data,
+                                                                 std::size_t length);
+
+///
+/// Validates a BSON document. This overload provides additional control over the
+/// precise validation that is performed, and will give the caller access to the
+/// offset at which the document was found to be invalid.
+///
+/// @param data
+///   A buffer containing a BSON document to validate.
+/// @param length
+///   The size of the buffer.
+/// @param validator
+///   A validator used to configure what checks are done. If validation fails, it
+///   will contain the offset at which the document was found to be invalid.
+/// @param invalid_offset
+///   If validation fails, the offset at which the document was found to be invalid
+///   will be stored here (if non-null).
+///
+/// @returns
+///   An engaged optional containing a view if the document is valid, or
+///   an unengaged optional if the document is invalid.
+///
+BSONCXX_API stdx::optional<document::view> BSONCXX_CALL
+validate(const std::uint8_t* data,
+         std::size_t length,
+         const validator& validator,
+         std::size_t* invalid_offset = nullptr);
+///
+/// A validator is used to enable or disable specific checks that can be
+/// performed during BSON validation.
+///
+class BSONCXX_API validator {
+   public:
+    ///
+    /// Constructs a validator.
+    ///
+    validator();
+
+    ///
+    /// Destructs a validator.
+    ///
+    ~validator();
+
+    ///
+    /// Verify that all keys and string values are valid UTF-8.
+    ///
+    /// @param check_utf8
+    ///   If true, UTF-8 validation is performed.
+    ///
+    void check_utf8(bool check_utf8);
+
+    ///
+    /// Getter for the current check_utf8 value of the underlying validator.
+    ///
+    /// @return True if UTF-8 validation is performed.
+    ///
+    bool check_utf8() const;
+
+    ///
+    /// Verify that all keys and string values are valid UTF-8, but allow
+    /// null bytes. This is generally bad practice, but some languages such
+    /// as Python, can sennd UTF-8 encoded strings with null bytes.
+    ///
+    /// @param check_utf8_allow_null
+    ///   If true, UTF-8 validation (with null bytes allowed) is performed.
+    ///
+    void check_utf8_allow_null(bool check_utf8_allow_null);
+
+    ///
+    /// Getter for the current check_utf8_allow_null value of the underlying
+    /// validator.
+    ///
+    /// @return True if UTF-8 validation (with null bytes allowed) is
+    ///   performed.
+    ///
+    bool check_utf8_allow_null() const;
+
+    ///
+    /// Verifies that document keys are not preceeded with '$'.
+    ///
+    /// @param check_dollar_keys
+    ///   If true, keys starting with '$' will be treated as invalid.
+    ///
+    void check_dollar_keys(bool check_dollar_keys);
+
+    ///
+    /// Getter for the current check_dollar_keys value of the underlying
+    /// validator.
+    ///
+    /// @return True if keys starting with '$' will be treated as invalid.
+    ///
+    bool check_dollar_keys() const;
+
+    ///
+    /// Verifies that document keys do not contain any '.' characters.
+    ///
+    /// @param check_dot_keys
+    ///   If true, keys containing '.' will be treated as invalid.
+    ///
+    void check_dot_keys(bool check_dot_keys);
+
+    ///
+    /// Getter for the current check_dot_keys value of the underlying
+    /// validator.
+    ///
+    /// @return True if keys containing '.' will be treated as invalid.
+    ///
+    bool check_dot_keys() const;
+
+   private:
+    struct BSONCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp
new file mode 100644
index 0000000..0de4e62
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp
@@ -0,0 +1,215 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <type_traits>
+
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a view-or-value variant type.
+///
+template <typename View, typename Value>
+class view_or_value {
+   public:
+    using view_type = View;
+    using value_type = Value;
+
+    ///
+    /// Class View must be constructible from an instance of class Value.
+    ///
+    static_assert(std::is_constructible<View, Value>::value,
+                  "View type must be constructible from a Value");
+
+    ///
+    /// Class View must be default constructible.
+    ///
+    static_assert(std::is_default_constructible<View>::value,
+                  "View type must be default constructible");
+
+    ///
+    /// Default-constructs a view_or_value. This is equivalent to constructing a
+    /// view_or_value with a default-constructed View.
+    ///
+    BSONCXX_INLINE view_or_value() = default;
+
+    ///
+    /// Construct a view_or_value from a View. When constructed with a View,
+    /// this object is non-owning. The Value underneath the given View must outlive this object.
+    ///
+    /// @param view
+    ///   A non-owning View.
+    ///
+    BSONCXX_INLINE view_or_value(View view) : _view{view} {}
+
+    ///
+    /// Constructs a view_or_value from a Value type. This object owns the passed-in Value.
+    ///
+    /// @param value
+    ///   A Value type.
+    ///
+    BSONCXX_INLINE view_or_value(Value&& value) : _value(std::move(value)), _view(*_value) {}
+
+    ///
+    /// Construct a view_or_value from a copied view_or_value.
+    ///
+    BSONCXX_INLINE view_or_value(const view_or_value& other)
+        : _value(other._value), _view(_value ? *_value : other._view) {}
+
+    ///
+    /// Assign to this view_or_value from a copied view_or_value.
+    ///
+    BSONCXX_INLINE view_or_value& operator=(const view_or_value& other) {
+        _value = other._value;
+        _view = _value ? *_value : other._view;
+        return *this;
+    }
+
+    ///
+    /// Construct a view_or_value from a moved-in view_or_value.
+    ///
+
+    /// TODO CXX-800: Create a noexcept expression to check the conditions that must be met.
+    BSONCXX_INLINE view_or_value(view_or_value&& other) noexcept
+        : _value{std::move(other._value)}, _view(_value ? *_value : std::move(other._view)) {
+        other._view = View();
+        other._value = stdx::nullopt;
+    }
+
+    ///
+    /// Assign to this view_or_value from a moved-in view_or_value.
+    ///
+    /// TODO CXX-800: Create a noexcept expression to check the conditions that must be met.
+    BSONCXX_INLINE view_or_value& operator=(view_or_value&& other) noexcept {
+        _value = std::move(other._value);
+        _view = _value ? *_value : std::move(other._view);
+        other._view = View();
+        other._value = stdx::nullopt;
+        return *this;
+    }
+
+    ///
+    /// Return whether or not this view_or_value owns an underlying Value.
+    ///
+    /// @return bool Whether we are owning.
+    ///
+    BSONCXX_INLINE bool is_owning() const noexcept {
+        return static_cast<bool>(_value);
+    }
+
+    ///
+    /// This type may be used as a View.
+    ///
+    /// @return a View into this view_or_value.
+    ///
+    BSONCXX_INLINE operator View() const {
+        return _view;
+    }
+
+    ///
+    /// Get a View for the type.
+    ///
+    /// @return a View into this view_or_value.
+    ///
+    BSONCXX_INLINE const View& view() const {
+        return _view;
+    }
+
+   private:
+    stdx::optional<Value> _value;
+    View _view;
+};
+
+///
+/// @{
+///
+/// Compare view_or_value objects for (in)-equality
+///
+/// @relates: view_or_value
+///
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const view_or_value<View, Value>& lhs,
+                               const view_or_value<View, Value>& rhs) {
+    return lhs.view() == rhs.view();
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const view_or_value<View, Value>& lhs,
+                               const view_or_value<View, Value>& rhs) {
+    return !(lhs == rhs);
+}
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Mixed (in)-equality operators for view_or_value against View or Value types
+///
+/// @relates view_or_value
+///
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const view_or_value<View, Value>& lhs, View rhs) {
+    return lhs.view() == rhs;
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(View lhs, const view_or_value<View, Value>& rhs) {
+    return rhs == lhs;
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const view_or_value<View, Value>& lhs, View rhs) {
+    return !(lhs == rhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(View lhs, const view_or_value<View, Value>& rhs) {
+    return !(rhs == lhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const view_or_value<View, Value>& lhs, const Value& rhs) {
+    return lhs.view() == View(rhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const Value& lhs, const view_or_value<View, Value>& rhs) {
+    return rhs == lhs;
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const view_or_value<View, Value>& lhs, const Value& rhs) {
+    return !(lhs == rhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const Value& lhs, const view_or_value<View, Value>& rhs) {
+    return !(rhs == lhs);
+}
+///
+/// @}
+///
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp
new file mode 100644
index 0000000..41d5e42
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp
@@ -0,0 +1,111 @@
+// Copyright 2014-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/model/write.hpp>
+#include <mongocxx/options/bulk_write.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+///
+/// Class representing a batch of write operations that can be sent to the server as a group.
+///
+/// If you have a lot of write operations to execute, it can be more efficient to send them as
+/// part of a bulk_write in order to avoid unnecessary network-level round trips between the driver
+/// and the server.
+///
+/// Bulk writes affect a single collection only and are executed via the bulk_write::execute()
+/// method. Options that you would typically specify for individual write operations (such as write
+/// concern) are instead specified for the aggregate operation.
+///
+/// @see https://docs.mongodb.com/manual/core/crud/
+/// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+///
+class MONGOCXX_API bulk_write {
+   public:
+    ///
+    /// Move constructs a bulk write operation.
+    ///
+    bulk_write(bulk_write&&) noexcept;
+
+    ///
+    /// Move assigns a bulk write operation.
+    ///
+    bulk_write& operator=(bulk_write&&) noexcept;
+
+    ///
+    /// Destroys a bulk write operation.
+    ///
+    ~bulk_write();
+
+    ///
+    /// Appends a single write to the bulk write operation. The write operation's contents are
+    /// copied into the bulk operation completely, so there is no dependency between the life of an
+    /// appended write operation and the bulk operation itself.
+    ///
+    /// @param operation
+    ///   The write operation to append (an instance of model::write)
+    ///
+    ///   A model::write can be implicitly constructed from any of the following MongoDB models:
+    ///
+    ///     - model::insert_one
+    ///     - model::delete_one
+    ///     - model::replace_one
+    ///     - model::update_many
+    ///     - model::update_one
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @throws mongocxx::logic_error if the given operation is invalid.
+    ///
+    bulk_write& append(const model::write& operation);
+
+    ///
+    /// Executes a bulk write.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @return The optional result of the bulk operation execution, a result::bulk_write.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    stdx::optional<result::bulk_write> execute() const;
+
+   private:
+    friend class collection;
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE bulk_write(const collection& coll,
+                                const options::bulk_write& options,
+                                const client_session* session = nullptr);
+
+    bool _created_from_collection;
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/change_stream.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/change_stream.hpp
new file mode 100644
index 0000000..d428caf
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/change_stream.hpp
@@ -0,0 +1,208 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+
+///
+/// Class representing a MongoDB change stream.
+///
+class MONGOCXX_API change_stream {
+   public:
+    /// A change stream iterator.
+    class MONGOCXX_API iterator;
+
+    ///
+    /// Move constructs a change_stream.
+    ///
+    change_stream(change_stream&& other) noexcept;
+
+    ///
+    /// Move assigns a change_stream.
+    ///
+    change_stream& operator=(change_stream&& other) noexcept;
+
+    ///
+    /// Destroys a change_stream.
+    ///
+    ~change_stream();
+
+    ///
+    /// A change_stream::iterator points to the beginning of any
+    /// available notifications. Each call to begin() advances to the next
+    /// available notification. The state of all iterators is tracked by the
+    /// change_stream itself, so advancing one iterator advances all iterators.
+    ///
+    /// change_stream::begin() and the increment operators are blocking operations.
+    /// They will not return until a notification is available, the max_await_time (from
+    /// the options::change_stream) milliseconds have elapsed, or a server
+    /// error is encountered.
+    ///
+    /// When change_stream.begin() == change_stream.end(), no notifications
+    /// are available. Each call to change_stream.begin() checks again for
+    /// newly-available notifications.
+    ///
+    /// @return
+    ///   The change_stream::iterator
+    /// @exception
+    ///   Throws mongocxx::query_exception if the query failed.
+    ///
+    iterator begin() const;
+
+    ///
+    /// A change_stream::iterator indicating stream exhaustion, meaning that
+    /// no notifications are available from the stream.
+    ///
+    /// @return
+    ///   The change_stream::iterator indicating exhaustion
+    ///
+    iterator end() const;
+
+    ///
+    /// Returns a resume token for this change stream.
+    ///
+    /// If the change stream has not been iterated, and either resume_after or
+    /// start_after was specified in the options to this change stream, the
+    /// specified value will be returned by this method. If neither resume_after or
+    /// start_after was set on the options for this change stream, and it has
+    /// not been iterated, this method will return no token.
+    ///
+    /// Once this change stream has been iterated, this method will return the
+    /// resume token of the most recently returned document in the stream, or a
+    /// postBatchResumeToken if the current batch of documents has been exhausted.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/#change-stream-resume-token
+    ///
+    /// The returned document::view is valid for the lifetime of the stream and
+    /// its data may be updated if the change stream is iterated after this function.
+    /// The value may be copied to extend its lifetime or preserve the
+    /// current resume token.
+    ///
+    /// @return
+    ///   The token.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::document::view> get_resume_token() const;
+
+   private:
+    friend class client;
+    friend class collection;
+    friend class database;
+    friend class change_stream::iterator;
+
+    MONGOCXX_PRIVATE change_stream(void* change_stream_ptr);
+
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+///
+/// Class representing a MongoDB change stream iterator.
+///
+class MONGOCXX_API change_stream::iterator {
+   public:
+    // Support input-iterator (caveat of post-increment returning void)
+    using difference_type = std::int64_t;
+    using value_type = const bsoncxx::document::view;
+    using pointer = std::add_pointer<value_type>::type;
+    using reference = std::add_lvalue_reference<value_type>::type;
+    using iterator_category = std::input_iterator_tag;
+
+    ///
+    /// Default-construct an iterator.
+    /// Default-constucted iterators can be compared (all default-constructed
+    /// iterators are ==), assigned, and copied.
+    ///
+    iterator();
+
+    ///
+    /// Dereferences the view for the document currently being pointed to.
+    ///
+    const bsoncxx::document::view& operator*() const;
+
+    ///
+    /// Accesses a member of the dereferenced document currently being pointed to.
+    ///
+    const bsoncxx::document::view* operator->() const;
+
+    ///
+    /// Pre-increments the iterator to move to the next document.
+    ///
+    /// change_stream::begin() and increment operators are blocking operations.
+    /// They will not return until a notification is available, the max_await_time (from
+    /// the options::change_stream) miliseconds have elapsed, or a server
+    /// error is encountered.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    iterator& operator++();
+
+    ///
+    /// Post-increments the iterator to move to the next document.
+    ///
+    /// change_stream::begin() and increment operators are blocking operations.
+    /// They will not return until a notification is available, the max_await_time (from
+    /// the options::change_stream) miliseconds have elapsed, or a server
+    /// error is encountered.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    void operator++(int);
+
+   private:
+    friend class change_stream;
+    enum class iter_type { k_tracking, k_default_constructed, k_end };
+
+    MONGOCXX_PRIVATE explicit iterator(iter_type type, const change_stream* change_stream);
+
+    ///
+    /// @{
+    ///
+    /// Compare two iterators for (in)-equality.  Iterators compare equal if
+    /// they point to the same underlying change_stream or if both are exhausted.
+    ///
+    /// @relates iterator
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const change_stream::iterator&,
+                                                      const change_stream::iterator&) noexcept;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const change_stream::iterator&,
+                                                      const change_stream::iterator&) noexcept;
+    ///
+    /// @}
+    ///
+
+    MONGOCXX_PRIVATE bool is_exhausted() const;
+
+    // iter_type==k_default_constructed is equivalent to _change_stream==nullptr
+    iter_type _type;
+    const change_stream* _change_stream;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client.hpp
new file mode 100644
index 0000000..f9ec029
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client.hpp
@@ -0,0 +1,412 @@
+// Copyright 2014-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/database.hpp>
+#include <mongocxx/options/client.hpp>
+#include <mongocxx/options/client_encryption.hpp>
+#include <mongocxx/options/client_session.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/uri.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+///
+/// Top level namespace for the MongoDB C++ driver.
+///
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_session;
+
+///
+/// Class representing a client connection to MongoDB.
+///
+/// Acts as a logical gateway for working with databases contained within a MongoDB server.
+///
+/// Databases that are created via this client inherit the @c read_concern, @c read_preference, and
+/// @c write_concern settings of this client when they are created. The lifetimes of objects created
+/// via a client object (databases, collections, cursors, etc...) @b must be a subset of the
+/// lifetime of the client that created them.
+///
+/// Example:
+/// @code
+///   mongocxx::client mongo_client{mongocxx::uri{}};
+///   mongocxx::client mongo_client{mongocxx::uri{"mongodb://localhost:27017"}};
+/// @endcode
+///
+/// Note that client is not thread-safe. See
+/// https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/thread-safety/ for more details.
+class MONGOCXX_API client {
+   public:
+    ///
+    /// Default constructs a new client. The client is not connected and is equivalent to the
+    /// state of a moved-from client. The only valid actions to take with a default constructed
+    /// 'client' are to assign to it, or destroy it.
+    ///
+    client() noexcept;
+
+    ///
+    /// Creates a new client connection to MongoDB.
+    ///
+    /// @param mongodb_uri
+    ///   A MongoDB URI representing the connection parameters
+    /// @param options
+    ///   Additional options that cannot be specified via the mongodb_uri
+    ///
+    /// @throws mongocxx::exception if invalid options are provided
+    /// (whether from the URI or provided client options).
+    ///
+    client(const class uri& mongodb_uri, const options::client& options = options::client());
+
+    ///
+    /// Move constructs a client.
+    ///
+    client(client&&) noexcept;
+
+    ///
+    /// Move assigns a client.
+    ///
+    client& operator=(client&&) noexcept;
+
+    ///
+    /// Destroys a client.
+    ///
+    ~client();
+
+    ///
+    /// Returns true if the client is valid, meaning it was not default constructed
+    /// or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// Sets the read concern for this client.
+    ///
+    /// Modifications at this level do not affect existing database instances that have been
+    /// created by this client but do affect new ones as databases inherit the @c read_concern
+    /// settings of their parent upon instantiation.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. Read concerns should be set either in the URI or directly on
+    ///   database or collection objects.
+    ///
+    /// @param rc
+    ///   The new @c read_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/
+    ///
+    MONGOCXX_DEPRECATED void read_concern(class read_concern rc);
+    void read_concern_deprecated(class read_concern rc);
+
+    ///
+    /// Returns the current read concern for this client.
+    ///
+    /// @return The current @c read_concern
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Sets the read preference for this client.
+    ///
+    /// Modifications at this level do not affect existing database instances that have been
+    /// created by this client but do affect new ones as databases inherit the @c read_preference
+    /// settings of their parent upon instantiation.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. Read preferences should be set either in the URI or directly on
+    ///   database or collection objects.
+    ///
+    /// @param rp
+    ///   The new @c read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    MONGOCXX_DEPRECATED void read_preference(class read_preference rp);
+    void read_preference_deprecated(class read_preference rp);
+
+    ///
+    /// Returns the current read preference for this client.
+    ///
+    /// @return The current @c read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// Returns the current uri for this client.
+    ///
+    /// @return The @c uri that this client was created with.
+    ///
+    class uri uri() const;
+
+    ///
+    /// Sets the write concern for this client.
+    ///
+    /// @note Modifications at this level do not affect existing databases or collection instances
+    /// that have come from this client but do affect new ones as databases will receive a copy of
+    /// this client's @c write_concern upon instantiation.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. Write concerns should be set either in the URI or directly on
+    ///   database or collection objects.
+    ///
+    /// @param wc
+    ///   The new write concern
+    ///
+    MONGOCXX_DEPRECATED void write_concern(class write_concern wc);
+    void write_concern_deprecated(class write_concern wc);
+
+    ///
+    /// Returns the current write concern for this client.
+    ///
+    /// @return the current @c write_concern
+    class write_concern write_concern() const;
+
+    ///
+    /// Obtains a database that represents a logical grouping of collections on a MongoDB server.
+    ///
+    /// @note A database cannot be obtained from a temporary client object.
+    ///
+    /// @param name
+    ///   The name of the database to get
+    ///
+    /// @return The database
+    ///
+    class database database(bsoncxx::string::view_or_value name) const&;
+    class database database(bsoncxx::string::view_or_value name) const&& = delete;
+
+    ///
+    /// Allows the syntax @c client["db_name"] as a convenient shorthand for the client::database()
+    /// method by implementing the array subscript operator.
+    ///
+    /// @note A database cannot be obtained from a temporary client object.
+    ///
+    /// @param name
+    ///   The name of the database.
+    ///
+    /// @return Client side representation of a server side database
+    ///
+    MONGOCXX_INLINE class database operator[](bsoncxx::string::view_or_value name) const&;
+    MONGOCXX_INLINE class database operator[](bsoncxx::string::view_or_value name) const&& = delete;
+
+    ///
+    /// @{
+    ///
+    /// Enumerates the databases in the client.
+    ///
+    /// @return A mongocxx::cursor containing a BSON document for each
+    ///   database. Each document contains a name field with the database
+    ///   name, a sizeOnDisk field with the total size of the database file on
+    ///   disk in bytes, and an empty field specifying whether the database
+    ///   has any data.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases' command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    cursor list_databases() const;
+
+    ///
+    /// Enumerates the databases in the client.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    ///
+    /// @return A mongocxx::cursor containing a BSON document for each
+    ///   database. Each document contains a name field with the database
+    ///   name, a sizeOnDisk field with the total size of the database file on
+    ///   disk in bytes, and an empty field specifying whether the database
+    ///   has any data.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases' command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    cursor list_databases(const client_session& session) const;
+
+    ///
+    /// Enumerates the databases in the client.
+    ///
+    /// @param opts
+    ///   Options passed directly to the 'listDatabases' command.
+    ///
+    /// @return A mongocxx::cursor containing a BSON document for each
+    ///   database. Each document contains a name field with the database
+    ///   name, a sizeOnDisk field with the total size of the database file on
+    ///   disk in bytes, and an empty field specifying whether the database
+    ///   has any data.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases' command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    cursor list_databases(const bsoncxx::document::view_or_value opts) const;
+
+    ///
+    /// Queries the MongoDB server for a list of known databases.
+    ///
+    /// @param filter
+    ///   An optional query expression to filter the returned database names.
+    ///
+    /// @return std::vector<std::string> containing the database names.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases'
+    /// command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    std::vector<std::string> list_database_names(
+        const bsoncxx::document::view_or_value filter = {}) const;
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Create a client session for a sequence of operations.
+    ///
+    /// @return A client_session object. See `mongocxx::client_session` for more information.
+    ///
+    /// @throws mongocxx::operation_exception if the driver is not built with crypto support, if
+    /// options is misconfigured, or if the session is configured with options that the server does
+    /// not support.
+    ///
+    client_session start_session(const options::client_session& options = {});
+
+    ///
+    /// @{
+    ///
+    /// Gets a change stream on this client with an empty pipeline.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const options::change_stream& options = {});
+
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this client.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    ///   Only a subset of pipeline operations are supported for change streams. For more
+    ///   information see the change streams documentation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const pipeline& pipe, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this client.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session,
+                        const pipeline& pipe,
+                        const options::change_stream& options = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Prevents resource cleanup in the child process from interfering
+    /// with the parent process after forking.
+    ///
+    /// Clients should not be reused after forking. Call this method in the
+    /// child after forking to safely destroy the client. This method should
+    /// not be used with multi-threaded clients.
+    ///
+    /// This method causes the client to clear its session pool without sending
+    /// endSessions.  It also increments an internal generation counter on the
+    /// given client. After this method is called, cursors from
+    /// previous generations will not issue a killCursors command when
+    /// they are destroyed. Client sessions from previous generations
+    /// cannot be used and should be destroyed.
+    ///
+    void reset();
+
+   private:
+    friend class collection;
+    friend class database;
+    friend class pool;
+    friend class client_session;
+    friend class options::auto_encryption;
+    friend class options::client_encryption;
+
+    MONGOCXX_PRIVATE explicit client(void* implementation);
+
+    MONGOCXX_PRIVATE change_stream _watch(const client_session* session,
+                                          const pipeline& pipe,
+                                          const options::change_stream& options);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE database client::operator[](bsoncxx::string::view_or_value name) const& {
+    return database(name);
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp
new file mode 100644
index 0000000..4dd1af2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp
@@ -0,0 +1,124 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/types/bson_value/value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/options/client_encryption.hpp>
+#include <mongocxx/options/data_key.hpp>
+#include <mongocxx/options/encrypt.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class supporting operations for MongoDB Client-Side Field Level Encryption.
+///
+class MONGOCXX_API client_encryption {
+   public:
+    ///
+    /// Creates a client_encryption object.
+    ///
+    /// @param opts
+    ///   An object representing encryption options.
+    ///
+    /// @see https://docs.mongodb.com/ecosystem/use-cases/client-side-field-level-encryption-guide
+    ///
+    client_encryption(options::client_encryption opts);
+
+    ///
+    /// Destroys a client_encryption.
+    ///
+    ~client_encryption() noexcept;
+
+    ///
+    /// Move-constructs a client_encryption object.
+    ///
+    client_encryption(client_encryption&&);
+
+    ///
+    /// Move-assigns a client_encryption object.
+    ///
+    client_encryption& operator=(client_encryption&&);
+
+    client_encryption(const client_encryption&) = delete;
+    client_encryption& operator=(const client_encryption&) = delete;
+
+    ///
+    /// Creates a new key document and inserts into the key vault collection.
+    ///
+    /// @param kms_provider
+    ///   A string identifying the KMS service to use to encrypt the datakey.
+    ///   Must be one of "aws", "azure", "gcp", "kmip", or "local".
+    /// @param opts
+    ///   Optional arguments, see options::data_key.
+    ///
+    /// @return The id of the created document as a bson_value::value containing
+    ///   a UUID (BSON binary subtype 4).
+    ///
+    /// @throws mongocxx::exception if there is an error creating the key.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/ecosystem/use-cases/client-side-field-level-encryption-guide/#b-create-a-data-encryption-key
+    ///
+    bsoncxx::types::bson_value::value create_data_key(std::string kms_provider,
+                                                      const options::data_key& opts = {});
+
+    ///
+    /// Encrypts a BSON value with a given key and algorithm.
+    ///
+    /// @param value
+    ///   The BSON value to encrypt.
+    /// @param opts
+    ///   Options must be given in order to specify an encryption algorithm
+    ///   and a key_id or key_alt_name. See options::encrypt.
+    ///
+    /// @return The encrypted value (BSON binary subtype 6).
+    ///
+    /// @throws mongocxx::exception if there is an error encrypting the value.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/reference/method/ClientEncryption.encrypt/#ClientEncryption.encrypt
+    ///
+    bsoncxx::types::bson_value::value encrypt(bsoncxx::types::bson_value::view value,
+                                              const options::encrypt& opts);
+
+    ///
+    /// Decrypts an encrypted value (BSON binary of subtype 6).
+    ///
+    /// @param value
+    ///   The encrypted value.
+    ///
+    /// @return The original BSON value.
+    ///
+    /// @throws mongocxx::exception if there is an error decrypting the value.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/reference/method/ClientEncryption.decrypt/#ClientEncryption.decrypt
+    ///
+    bsoncxx::types::bson_value::value decrypt(bsoncxx::types::bson_value::view value);
+
+   private:
+    class MONGOCXX_PRIVATE impl;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client_session.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client_session.hpp
new file mode 100644
index 0000000..5e37a4d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/client_session.hpp
@@ -0,0 +1,215 @@
+// Copyright 2017-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/client_session.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+
+///
+/// Use a session for a sequence of operations, optionally with either causal consistency
+/// or snapshots.
+///
+/// Note that client_session is not thread-safe. See
+/// https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/thread-safety/ for more details.
+///
+/// @see http://dochub.mongodb.org/core/causal-consistency
+///
+class MONGOCXX_API client_session {
+   public:
+    enum class transaction_state {
+        k_transaction_none,
+        k_transaction_starting,
+        k_transaction_in_progress,
+        k_transaction_committed,
+        k_transaction_aborted,
+    };
+
+    ///
+    /// Move constructs a session.
+    ///
+    client_session(client_session&&) noexcept;
+
+    ///
+    /// Move assigns a session.
+    ///
+    client_session& operator=(client_session&&) noexcept;
+
+    client_session(const client_session&) = delete;
+    client_session& operator=(const client_session&) = delete;
+
+    ///
+    /// Ends and destroys the session.
+    ///
+    ~client_session() noexcept;
+
+    ///
+    /// Gets the client that started this session.
+    ///
+    const class client& client() const noexcept;
+
+    ///
+    /// Gets the options this session was created with.
+    ///
+    const options::client_session& options() const noexcept;
+
+    ///
+    /// Get the server-side "logical session ID" associated with this session, as a BSON document.
+    /// This view is invalid after the session is destroyed.
+    ///
+    bsoncxx::document::view id() const noexcept;
+
+    ///
+    /// Get the session's clusterTime, as a BSON document. This is an opaque value suitable for
+    /// passing to advance_cluster_time(). The document is empty if the session has
+    /// not been used for any operation and you have not called advance_cluster_time().
+    /// This view is invalid after the session is destroyed.
+    ///
+    bsoncxx::document::view cluster_time() const noexcept;
+
+    ///
+    /// Get the session's operationTime, as a BSON timestamp. This is an opaque value suitable for
+    /// passing to advance_operation_time(). The timestamp is zero if the session has not been used
+    /// for any operation and you have not called advance_operation_time().
+    ///
+    bsoncxx::types::b_timestamp operation_time() const noexcept;
+
+    ///
+    /// Get the server_id the session is pinned to. The server_id is zero if the session is not
+    /// pinned to a server.
+    ///
+    std::uint32_t server_id() const noexcept;
+
+    ///
+    /// Returns the current transaction state for this session.
+    ///
+    transaction_state get_transaction_state() const noexcept;
+
+    ///
+    /// Returns whether or not this session is dirty.
+    ///
+    bool get_dirty() const noexcept;
+
+    ///
+    /// Advance the cluster time for a session. Has an effect only if the new cluster time is
+    /// greater than the session's current cluster time.
+    ///
+    /// Use advance_operation_time() and advance_cluster_time() to copy the operationTime and
+    /// clusterTime from another session, ensuring subsequent operations in this session are
+    /// causally consistent with the last operation in the other session.
+    ///
+    void advance_cluster_time(const bsoncxx::document::view& cluster_time);
+
+    ///
+    /// Advance the session's operation time, expressed as a BSON timestamp. Has an effect only if
+    /// the new operation time is greater than the session's current operation time.
+    ///
+    /// Use advance_operation_time() and advance_cluster_time() to copy the operationTime and
+    /// clusterTime from another session, ensuring subsequent operations in this session are
+    /// causally consistent with the last operation in the other session.
+    ///
+    void advance_operation_time(const bsoncxx::types::b_timestamp& operation_time);
+
+    ///
+    /// Starts a transaction on the current client session.
+    ///
+    /// @param transaction_opts (optional)
+    ///    The options to use in the transaction.
+    ///
+    /// @throws mongocxx::operation_exception if the options are misconfigured, if there are network
+    /// or other transient failures, or if there are other errors such as a session with a
+    /// transaction already in progress.
+    ///
+    void start_transaction(const stdx::optional<options::transaction>& transaction_opts = {});
+
+    ///
+    /// Commits a transaction on the current client session.
+    ///
+    /// @throws mongocxx::operation_exception if the options are misconfigured, if there are network
+    /// or other transient failures, or if there are other errors such as a session with no
+    /// transaction in progress.
+    ///
+    void commit_transaction();
+
+    ///
+    /// Aborts a transaction on the current client session.
+    ///
+    /// @throws mongocxx::operation_exception if the options are misconfigured or if there are
+    /// other errors such as a session with no transaction in progress.
+    ///
+    void abort_transaction();
+
+    ///
+    /// Helper to run a user-provided callback within a transaction.
+    ///
+    /// This method will start a new transaction on this client session,
+    /// run the callback, then commit the transaction. If it cannot commit
+    /// the transaction, the entire sequence may be retried, and the callback
+    /// may be run multiple times.
+    ///
+    /// If the user callback calls driver methods that run operations against the
+    /// server that can throw an operation_exception (ex: collection::insert_one),
+    /// the user callback should allow those exceptions to propagate up the stack
+    /// so they can be caught and processed by the with_transaction helper.
+    ///
+    /// @param cb
+    ///   The callback to run inside of a transaction.
+    /// @param opts (optional)
+    ///   The options to use to run the transaction.
+    ///
+    /// @throws mongocxx::operation_exception if there are errors completing the
+    /// transaction.
+    ///
+    using with_transaction_cb = std::function<void MONGOCXX_CALL(client_session*)>;
+    void with_transaction(with_transaction_cb cb, options::transaction opts = {});
+
+   private:
+    friend class bulk_write;
+    friend class client;
+    friend class collection;
+    friend class database;
+    friend class index_view;
+
+    class MONGOCXX_PRIVATE impl;
+
+    // "class client" distinguishes from client() method above.
+    MONGOCXX_PRIVATE client_session(const class client* client,
+                                    const options::client_session& options);
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
+
+///
+/// @example examples/mongocxx/client_session.cpp
+/// Use a mongocxx::client_session for a sequence of operations with causal consistency.
+///
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/collection.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/collection.hpp
new file mode 100644
index 0000000..7b9f52f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/collection.hpp
@@ -0,0 +1,2078 @@
+// Copyright 2014-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <algorithm>
+#include <string>
+
+#include <bsoncxx/builder/basic/array.hpp>
+#include <bsoncxx/builder/basic/document.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/bulk_write.hpp>
+#include <mongocxx/change_stream.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/index_view.hpp>
+#include <mongocxx/model/insert_one.hpp>
+#include <mongocxx/options/aggregate.hpp>
+#include <mongocxx/options/bulk_write.hpp>
+#include <mongocxx/options/change_stream.hpp>
+#include <mongocxx/options/count.hpp>
+#include <mongocxx/options/delete.hpp>
+#include <mongocxx/options/distinct.hpp>
+#include <mongocxx/options/estimated_document_count.hpp>
+#include <mongocxx/options/find.hpp>
+#include <mongocxx/options/find_one_and_delete.hpp>
+#include <mongocxx/options/find_one_and_replace.hpp>
+#include <mongocxx/options/find_one_and_update.hpp>
+#include <mongocxx/options/index.hpp>
+#include <mongocxx/options/index_view.hpp>
+#include <mongocxx/options/insert.hpp>
+#include <mongocxx/options/replace.hpp>
+#include <mongocxx/options/update.hpp>
+#include <mongocxx/pipeline.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+#include <mongocxx/result/delete.hpp>
+#include <mongocxx/result/insert_many.hpp>
+#include <mongocxx/result/insert_one.hpp>
+#include <mongocxx/result/replace_one.hpp>
+#include <mongocxx/result/update.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class database;
+
+///
+/// Class representing server side document groupings within a MongoDB database.
+///
+/// Collections do not require or enforce a schema and documents inside of a collection can have
+/// different fields. While not a requirement, typically documents in a collection have a similar
+/// shape or related purpose.
+///
+/// Example:
+/// @code
+///   // Connect and get a collection.
+///   mongocxx::client mongo_client{mongocxx::uri{}};
+///   auto coll = mongo_client["database"]["collection"];
+/// @endcode
+///
+class MONGOCXX_API collection {
+    //
+    // Utility class supporting the convenience of {} meaning an empty bsoncxx::document.
+    //
+    // Users may not use this class directly.
+    //
+    // In places where driver methods take this class as a parameter, passing {} will
+    // translate to a default-constructed bsoncxx::document::view_or_value,
+    // regardless of other overloads taking other default-constructible types
+    // for that parameter. This class avoids compiler ambiguity with such overloads.
+    //
+    // See collection::update_one for an example of such overloads.
+    //
+    class _empty_doc_tag {
+        _empty_doc_tag() = default;
+    };
+
+   public:
+    ///
+    /// Default constructs a collection object. The collection is
+    /// equivalent to the state of a moved from collection. The only
+    /// valid actions to take with a default constructed collection
+    /// are to assign to it, or destroy it.
+    ///
+    collection() noexcept;
+
+    ///
+    /// Move constructs a collection.
+    ///
+    collection(collection&&) noexcept;
+
+    ///
+    /// Move assigns a collection.
+    ///
+    collection& operator=(collection&&) noexcept;
+
+    ///
+    /// Copy constructs a collection.
+    ///
+    collection(const collection&);
+
+    ///
+    /// Copy assigns a collection.
+    ///
+    collection& operator=(const collection&);
+
+    ///
+    /// Destroys a collection.
+    ///
+    ~collection();
+
+    ///
+    /// Returns true if the collection is valid, meaning it was not
+    /// default constructed or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// @{
+    ///
+    /// Runs an aggregation framework pipeline against this collection.
+    ///
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   collection level set read concern - collection::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+
+    ///
+    /// Runs an aggregation framework pipeline against this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   collection level set read concern - collection::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const client_session& session,
+                     const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates a new bulk operation to be executed against this collection.
+    /// The lifetime of the bulk_write is independent of the collection.
+    ///
+    /// @param options
+    ///   Optional arguments; see mongocxx::options::bulk_write.
+    ///
+    /// @return
+    ///    The newly-created bulk write.
+    ///
+    class bulk_write create_bulk_write(const options::bulk_write& options = {});
+
+    ///
+    /// Creates a new bulk operation to be executed against this collection.
+    /// The lifetime of the bulk_write is independent of the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param options
+    ///   Optional arguments; see mongocxx::options::bulk_write.
+    ///
+    /// @return
+    ///    The newly-created bulk write.
+    ///
+    class bulk_write create_bulk_write(const client_session& session,
+                                       const options::bulk_write& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Sends a write to the server as a bulk write operation.
+    ///
+    /// @param write
+    ///   A model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return
+    ///   The optional result of the bulk operation execution.
+    ///   If the write concern is unacknowledged, the optional will be
+    ///   disengaged.
+    ///
+    /// @exception
+    ///   mongocxx::bulk_write_exception when there are errors processing
+    ///   the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> write(
+        const model::write& write, const options::bulk_write& options = options::bulk_write());
+
+    ///
+    /// Sends a write to the server as a bulk write operation.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param write
+    ///   A model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return
+    ///   The optional result of the bulk operation execution.
+    ///   If the write concern is unacknowledged, the optional will be
+    ///   disengaged.
+    ///
+    /// @exception
+    ///   mongocxx::bulk_write_exception when there are errors processing
+    ///   the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> write(
+        const client_session& session,
+        const model::write& write,
+        const options::bulk_write& options = options::bulk_write());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Sends a container of writes to the server as a bulk write operation.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param writes
+    ///   A container of model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        const container_type& writes, const options::bulk_write& options = options::bulk_write());
+
+    ///
+    /// Sends a container of writes to the server as a bulk write operation.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param writes
+    ///   A container of model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        const client_session& session,
+        const container_type& writes,
+        const options::bulk_write& options = options::bulk_write());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Sends writes starting at @c begin and ending at @c end to the server as a bulk write
+    /// operation.
+    ///
+    /// @tparam write_model_iterator_type
+    ///   The container type. Must meet the requirements for the input iterator concept with a value
+    ///   type of model::write.
+    ///
+    /// @param begin
+    ///   Iterator pointing to the first model::write to send.
+    /// @param end
+    ///   Iterator pointing to the end of the writes to send.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution, a result::bulk_write.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename write_model_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        write_model_iterator_type begin,
+        write_model_iterator_type end,
+        const options::bulk_write& options = options::bulk_write());
+
+    ///
+    /// Sends writes starting at @c begin and ending at @c end to the server as a bulk write
+    /// operation.
+    ///
+    /// @tparam write_model_iterator_type
+    ///   The container type. Must meet the requirements for the input iterator concept with a value
+    ///   type of model::write.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param begin
+    ///   Iterator pointing to the first model::write to send.
+    /// @param end
+    ///   Iterator pointing to the end of the writes to send.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution, a result::bulk_write.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename write_model_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        const client_session& session,
+        write_model_iterator_type begin,
+        write_model_iterator_type end,
+        const options::bulk_write& options = options::bulk_write());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Counts the number of documents matching the provided filter.
+    ///
+    /// @param filter
+    ///   The filter that documents must match in order to be counted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::count.
+    ///
+    /// @return The count of the documents that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the count operation fails.
+    ///
+    /// @note For a fast count of the total documents in a collection, see
+    /// estimated_document_count().
+    ///
+    /// @note Due to an oversight in MongoDB server versions 5.0.0 through 5.0.7, the `count`
+    /// command was not included in Stable API v1. Users of the Stable API with
+    /// estimatedDocumentCount are recommended to upgrade their server version to 5.0.8 or newer, or
+    /// set `apiStrict: false` to avoid encountering errors.
+    ///
+    /// @see mongocxx::estimated_document_count
+    ///
+    std::int64_t count_documents(bsoncxx::document::view_or_value filter,
+                                 const options::count& options = options::count());
+
+    ///
+    /// Counts the number of documents matching the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the count.
+    /// @param filter
+    ///   The filter that documents must match in order to be counted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::count.
+    ///
+    /// @return The count of the documents that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the count operation fails.
+    ///
+    /// @note Due to an oversight in MongoDB server versions 5.0.0 through 5.0.7, the `count`
+    /// command was not included in Stable API v1. Users of the Stable API with
+    /// estimatedDocumentCount are recommended to upgrade their server version to 5.0.8 or newer, or
+    /// set `apiStrict: false` to avoid encountering errors.
+    ///
+    /// @see mongocxx::estimated_document_count
+    ///
+    std::int64_t count_documents(const client_session& session,
+                                 bsoncxx::document::view_or_value filter,
+                                 const options::count& options = options::count());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Returns an estimate of the number of documents in the collection.
+    ///
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::count.
+    ///
+    /// @return The count of the documents that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the count operation fails.
+    ///
+    /// @note This function is implemented in terms of the count server command. See:
+    /// https://www.mongodb.com/docs/manual/reference/command/count/#behavior for more information.
+    ///
+    /// @see mongocxx::count_documents
+    ///
+    std::int64_t estimated_document_count(
+        const options::estimated_document_count& options = options::estimated_document_count());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates an index over the collection for the provided keys with the provided options.
+    ///
+    /// @param keys
+    ///   The keys for the index: @c {a: 1, b: -1}
+    /// @param index_options
+    ///   A document containing optional arguments for creating the index.
+    /// @param operation_options
+    ///   Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if index creation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    bsoncxx::document::value create_index(
+        bsoncxx::document::view_or_value keys,
+        bsoncxx::document::view_or_value index_options = {},
+        options::index_view operation_options = options::index_view{});
+
+    ///
+    /// Creates an index over the collection for the provided keys with the provided options.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the index creation.
+    /// @param keys
+    ///   The keys for the index: @c {a: 1, b: -1}
+    /// @param index_options
+    ///   A document containing optional arguments for creating the index.
+    /// @param operation_options
+    ///   Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if index creation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    bsoncxx::document::value create_index(
+        const client_session& session,
+        bsoncxx::document::view_or_value keys,
+        bsoncxx::document::view_or_value index_options = {},
+        options::index_view operation_options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Deletes all matching documents from the collection.
+    ///
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_many(
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// Deletes all matching documents from the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the deletion.
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_many(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Deletes a single matching document from the collection.
+    ///
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_one(
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// Deletes a single matching document from the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the deletion.
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_one(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds the distinct values for a specified field across the collection.
+    ///
+    /// @param name
+    ///   The field for which the distinct values will be found.
+    /// @param filter
+    ///   Document view representing the documents for which the distinct operation will apply.
+    /// @param options
+    ///   Optional arguments, see options::distinct.
+
+    /// @return mongocxx::cursor having the distinct values for the specified
+    /// field.  If the operation fails, the cursor throws
+    /// mongocxx::query_exception when the returned cursor is iterated.
+
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    cursor distinct(bsoncxx::string::view_or_value name,
+                    bsoncxx::document::view_or_value filter,
+                    const options::distinct& options = options::distinct());
+
+    ///
+    /// Finds the distinct values for a specified field across the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param name
+    ///   The field for which the distinct values will be found.
+    /// @param filter
+    ///   Document view representing the documents for which the distinct operation will apply.
+    /// @param options
+    ///   Optional arguments, see options::distinct.
+
+    /// @return mongocxx::cursor having the distinct values for the specified
+    /// field.  If the operation fails, the cursor throws
+    /// mongocxx::query_exception when the returned cursor is iterated.
+
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    cursor distinct(const client_session& session,
+                    bsoncxx::string::view_or_value name,
+                    bsoncxx::document::view_or_value filter,
+                    const options::distinct& options = options::distinct());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops this collection and all its contained documents from the database.
+    ///
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/drop/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void drop(const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+
+    ///
+    /// Drops this collection and all its contained documents from the database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/drop/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void drop(const client_session& session,
+              const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds the documents in this collection which match the provided filter.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    cursor find(bsoncxx::document::view_or_value filter,
+                const options::find& options = options::find());
+
+    ///
+    /// Finds the documents in this collection which match the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the query.
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    cursor find(const client_session& session,
+                bsoncxx::document::view_or_value filter,
+                const options::find& options = options::find());
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document in this collection that match the provided filter.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return An optional document that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    stdx::optional<bsoncxx::document::value> find_one(
+        bsoncxx::document::view_or_value filter, const options::find& options = options::find());
+
+    ///
+    /// Finds a single document in this collection that match the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the query.
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return An optional document that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    stdx::optional<bsoncxx::document::value> find_one(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::find& options = options::find());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document matching the filter, deletes it, and returns the original.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be deleted.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_delete
+    ///
+    /// @return The document that was deleted.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_delete(
+        bsoncxx::document::view_or_value filter,
+        const options::find_one_and_delete& options = options::find_one_and_delete());
+
+    ///
+    /// Finds a single document matching the filter, deletes it, and returns the original.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be deleted.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_delete
+    ///
+    /// @return The document that was deleted.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_delete(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::find_one_and_delete& options = options::find_one_and_delete());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document matching the filter, replaces it, and returns either the original
+    /// or the replacement document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be replaced.
+    /// @param replacement
+    ///   Document view representing the replacement for a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_replace.
+    ///
+    /// @return The original or replaced document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_replace(
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::find_one_and_replace& options = options::find_one_and_replace());
+
+    ///
+    /// Finds a single document matching the filter, replaces it, and returns either the original
+    /// or the replacement document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be replaced.
+    /// @param replacement
+    ///   Document view representing the replacement for a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_replace.
+    ///
+    /// @return The original or replaced document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_replace(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::find_one_and_replace& options = options::find_one_and_replace());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Document view representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Pipeline representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        bsoncxx::document::view_or_value filter,
+        const pipeline& update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        bsoncxx::document::view_or_value filter,
+        std::initializer_list<_empty_doc_tag> update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Document view representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Pipeline representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const pipeline& update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        std::initializer_list<_empty_doc_tag> update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Inserts a single document into the collection. If the document is missing an identifier
+    /// (@c _id field) one will be generated for it.
+    ///
+    /// @param document
+    ///   The document to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to perform the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    stdx::optional<result::insert_one> insert_one(bsoncxx::document::view_or_value document,
+                                                  const options::insert& options = {});
+    ///
+    /// Inserts a single document into the collection. If the document is missing an identifier
+    /// (@c _id field) one will be generated for it.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the insert.
+    /// @param document
+    ///   The document to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to perform the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    stdx::optional<result::insert_one> insert_one(const client_session& session,
+                                                  bsoncxx::document::view_or_value document,
+                                                  const options::insert& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @warning This method uses the bulk insert command to execute the insertion as opposed to
+    /// the legacy OP_INSERT wire protocol message. As a result, using this method to insert many
+    /// documents on MongoDB < 2.6 will be slow.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param container
+    ///   Container of a documents to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to performing the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when the operation fails.
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        const container_type& container, const options::insert& options = options::insert());
+
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the inserts.
+    /// @param container
+    ///   Container of a documents to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to performing the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when the operation fails.
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        const client_session& session,
+        const container_type& container,
+        const options::insert& options = options::insert());
+
+    ///
+    /// @{
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @warning This method uses the bulk insert command to execute the insertion as opposed to
+    /// the legacy OP_INSERT wire protocol message. As a result, using this method to insert many
+    /// documents on MongoDB < 2.6 will be slow.
+    ///
+    /// @tparam document_view_iterator_type
+    ///   The iterator type. Must meet the requirements for the input iterator concept with a value
+    ///   type of bsoncxx::document::view.
+    ///
+    /// @param begin
+    ///   Iterator pointing to the first document to be inserted.
+    /// @param end
+    ///   Iterator pointing to the end of the documents to be inserted.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The result of attempting to performing the insert.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    ///
+    template <typename document_view_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        document_view_iterator_type begin,
+        document_view_iterator_type end,
+        const options::insert& options = options::insert());
+
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @tparam document_view_iterator_type
+    ///   The iterator type. Must meet the requirements for the input iterator concept with a value
+    ///   type of bsoncxx::document::view.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the inserts.
+    /// @param begin
+    ///   Iterator pointing to the first document to be inserted.
+    /// @param end
+    ///   Iterator pointing to the end of the documents to be inserted.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The result of attempting to performing the insert.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    ///
+    template <typename document_view_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        const client_session& session,
+        document_view_iterator_type begin,
+        document_view_iterator_type end,
+        const options::insert& options = options::insert());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Returns a list of the indexes currently on this collection.
+    ///
+    /// @return Cursor yielding the index specifications.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listIndexes/
+    ///
+    cursor list_indexes() const;
+
+    ///
+    /// Returns a list of the indexes currently on this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    ///
+    /// @return Cursor yielding the index specifications.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listIndexes/
+    ///
+    cursor list_indexes(const client_session& session) const;
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Returns the name of this collection.
+    ///
+    /// @return The name of the collection.  The return value of this method is invalidated by any
+    /// subsequent call to collection::rename() on this collection object.
+    ///
+    stdx::string_view name() const;
+
+    ///
+    /// Rename this collection.
+    ///
+    /// @param new_name The new name to assign to the collection.
+    /// @param drop_target_before_rename Whether to overwrite any
+    ///   existing collections called new_name. The default is false.
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/renameCollection/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void rename(bsoncxx::string::view_or_value new_name,
+                bool drop_target_before_rename = false,
+                const bsoncxx::stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Rename this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the rename.
+    /// @param new_name The new name to assign to the collection.
+    /// @param drop_target_before_rename Whether to overwrite any
+    ///   existing collections called new_name. The default is false.
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/renameCollection/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void rename(const client_session& session,
+                bsoncxx::string::view_or_value new_name,
+                bool drop_target_before_rename = false,
+                const bsoncxx::stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Sets the read_concern for this collection. Changes will not have any effect on existing
+    /// cursors or other read operations which use the previously-set read concern.
+    ///
+    /// @param rc
+    ///   The new @c read_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/
+    ///
+    void read_concern(class read_concern rc);
+
+    ///
+    /// Gets the read_concern for the collection.
+    ///
+    /// If a read_concern has not been explicitly set for this collection object, it inherits
+    /// the read_concern from its parent database or client object.
+    ///
+    /// @return The current read_concern.
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Sets the read_preference for this collection. Changes will not have any effect on existing
+    /// cursors or other read operations which use the read preference.
+    ///
+    /// @param rp
+    ///   The read_preference to set.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    void read_preference(class read_preference rp);
+
+    ///
+    /// Gets the read_preference for the collection.
+    ///
+    /// @return The current read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// @{
+    ///
+    /// Replaces a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param replacement
+    ///   The replacement document.
+    /// @param options
+    ///   Optional arguments, see options::replace.
+    ///
+    /// @return The optional result of attempting to replace a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the replacement is invalid, or mongocxx::bulk_write_exception if
+    ///   the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::replace_one> replace_one(
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::replace& options = options::replace{});
+
+    ///
+    /// Replaces a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the replace.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param replacement
+    ///   The replacement document.
+    /// @param options
+    ///   Optional arguments, see options::replace.
+    ///
+    /// @return The optional result of attempting to replace a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the replacement is invalid, or mongocxx::bulk_write_exception if
+    ///   the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::replace_one> replace_one(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::replace& options = options::replace{});
+
+    ///
+    /// @{
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(bsoncxx::document::view_or_value filter,
+                                               bsoncxx::document::view_or_value update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(bsoncxx::document::view_or_value filter,
+                                               const pipeline& update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(bsoncxx::document::view_or_value filter,
+                                               std::initializer_list<_empty_doc_tag> update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(const client_session& session,
+                                               bsoncxx::document::view_or_value filter,
+                                               bsoncxx::document::view_or_value update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(const client_session& session,
+                                               bsoncxx::document::view_or_value filter,
+                                               const pipeline& update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(const client_session& session,
+                                               bsoncxx::document::view_or_value filter,
+                                               std::initializer_list<_empty_doc_tag> update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(bsoncxx::document::view_or_value filter,
+                                              bsoncxx::document::view_or_value update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(bsoncxx::document::view_or_value filter,
+                                              const pipeline& update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(bsoncxx::document::view_or_value filter,
+                                              std::initializer_list<_empty_doc_tag> update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(const client_session& session,
+                                              bsoncxx::document::view_or_value filter,
+                                              bsoncxx::document::view_or_value update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(const client_session& session,
+                                              bsoncxx::document::view_or_value filter,
+                                              const pipeline& update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(const client_session& session,
+                                              bsoncxx::document::view_or_value filter,
+                                              std::initializer_list<_empty_doc_tag> update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Sets the write_concern for this collection. Changes will not have any effect on existing
+    /// write operations.
+    ///
+    /// @param wc
+    ///   The new write_concern to use.
+    ///
+    void write_concern(class write_concern wc);
+
+    ///
+    /// Gets the write_concern for the collection.
+    ///
+    /// @return The current write_concern.
+    ///
+    class write_concern write_concern() const;
+
+    ///
+    /// Gets an index_view to the collection.
+    index_view indexes();
+
+    ///
+    /// @{
+    ///
+    /// Gets a change stream on this collection with an empty pipeline.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const options::change_stream& options = {});
+
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this collection.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    ///   Only a subset of pipeline operations are supported for change streams. For more
+    ///   information see the change streams documentation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const pipeline& pipe, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session,
+                        const pipeline& pipe,
+                        const options::change_stream& options = {});
+
+    ///
+    /// @}
+    ///
+
+   private:
+    friend class bulk_write;
+    friend class database;
+
+    MONGOCXX_PRIVATE collection(const database& database,
+                                bsoncxx::string::view_or_value collection_name);
+
+    MONGOCXX_PRIVATE collection(const database& database, void* collection);
+
+    MONGOCXX_PRIVATE cursor _aggregate(const client_session* session,
+                                       const pipeline& pipeline,
+                                       const options::aggregate& options);
+
+    MONGOCXX_PRIVATE std::int64_t _count(const client_session* session,
+                                         bsoncxx::document::view_or_value filter,
+                                         const options::count& options);
+
+    MONGOCXX_PRIVATE std::int64_t _count_documents(const client_session* session,
+                                                   bsoncxx::document::view_or_value filter,
+                                                   const options::count& options);
+
+    MONGOCXX_PRIVATE bsoncxx::document::value _create_index(
+        const client_session* session,
+        bsoncxx::document::view_or_value keys,
+        bsoncxx::document::view_or_value index_options,
+        options::index_view operation_options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::delete_result> _delete_many(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::delete_result> _delete_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options);
+
+    MONGOCXX_PRIVATE cursor _distinct(const client_session* session,
+                                      bsoncxx::string::view_or_value name,
+                                      bsoncxx::document::view_or_value filter,
+                                      const options::distinct& options);
+
+    MONGOCXX_PRIVATE void _drop(
+        const client_session* session,
+        const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE cursor _find(const client_session* session,
+                                  bsoncxx::document::view_or_value filter,
+                                  const options::find& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::find& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one_and_delete(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::find_one_and_delete& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one_and_replace(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::find_one_and_replace& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one_and_update(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::find_one_and_update& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::insert_one> _insert_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value document,
+        const options::insert& options);
+
+    MONGOCXX_PRIVATE void _rename(
+        const client_session* session,
+        bsoncxx::string::view_or_value new_name,
+        bool drop_target_before_rename,
+        const bsoncxx::stdx::optional<class write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE stdx::optional<result::replace_one> _replace_one(
+        const client_session* session,
+        const options::bulk_write& bulk_opts,
+        const model::replace_one& replace_op);
+
+    MONGOCXX_PRIVATE stdx::optional<result::replace_one> _replace_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::replace& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::update> _update_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::update& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::update> _update_many(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::update& options);
+
+    MONGOCXX_PRIVATE change_stream _watch(const client_session* session,
+                                          const pipeline& pipe,
+                                          const options::change_stream& options);
+
+    // Helpers for the insert_many method templates.
+    class bulk_write _init_insert_many(const options::insert& options,
+                                       const client_session* session);
+
+    void _insert_many_doc_handler(class bulk_write& writes,
+                                  bsoncxx::builder::basic::array& inserted_ids,
+                                  bsoncxx::document::view doc) const;
+
+    stdx::optional<result::insert_many> _exec_insert_many(
+        class bulk_write& writes, bsoncxx::builder::basic::array& inserted_ids);
+
+    template <typename document_view_iterator_type>
+    MONGOCXX_PRIVATE stdx::optional<result::insert_many> _insert_many(
+        const client_session* session,
+        document_view_iterator_type begin,
+        document_view_iterator_type end,
+        const options::insert& options);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::write(
+    const model::write& write, const options::bulk_write& options) {
+    return create_bulk_write(options).append(write).execute();
+}
+
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::write(
+    const client_session& session, const model::write& write, const options::bulk_write& options) {
+    return create_bulk_write(session, options).append(write).execute();
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    const container_type& requests, const options::bulk_write& options) {
+    return bulk_write(requests.begin(), requests.end(), options);
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    const client_session& session,
+    const container_type& requests,
+    const options::bulk_write& options) {
+    return bulk_write(session, requests.begin(), requests.end(), options);
+}
+
+template <typename write_model_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    write_model_iterator_type begin,
+    write_model_iterator_type end,
+    const options::bulk_write& options) {
+    auto writes = create_bulk_write(options);
+    std::for_each(begin, end, [&](const model::write& current) { writes.append(current); });
+    return writes.execute();
+}
+
+template <typename write_model_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    const client_session& session,
+    write_model_iterator_type begin,
+    write_model_iterator_type end,
+    const options::bulk_write& options) {
+    auto writes = create_bulk_write(session, options);
+    std::for_each(begin, end, [&](const model::write& current) { writes.append(current); });
+    return writes.execute();
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    const container_type& container, const options::insert& options) {
+    return insert_many(container.begin(), container.end(), options);
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    const client_session& session,
+    const container_type& container,
+    const options::insert& options) {
+    return insert_many(session, container.begin(), container.end(), options);
+}
+
+template <typename document_view_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::_insert_many(
+
+    const client_session* session,
+    document_view_iterator_type begin,
+    document_view_iterator_type end,
+    const options::insert& options) {
+    bsoncxx::builder::basic::array inserted_ids;
+    auto writes = _init_insert_many(options, session);
+    std::for_each(begin, end, [&inserted_ids, &writes, this](bsoncxx::document::view doc) {
+        _insert_many_doc_handler(writes, inserted_ids, doc);
+    });
+    return _exec_insert_many(writes, inserted_ids);
+}
+
+template <typename document_view_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    document_view_iterator_type begin,
+    document_view_iterator_type end,
+    const options::insert& options) {
+    return _insert_many(nullptr, begin, end, options);
+}
+
+template <typename document_view_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    const client_session& session,
+    document_view_iterator_type begin,
+    document_view_iterator_type end,
+    const options::insert& options) {
+    return _insert_many(&session, begin, end, options);
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp
new file mode 100644
index 0000000..c9dffc8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp
@@ -0,0 +1,34 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// TODO: DRY this definition with the one from bsoncxx/config/compiler.hpp per discussion
+//       here - https://github.com/mongodb/mongo-cxx-driver/pull/374#issuecomment-158179295
+#if defined(_MSC_VER)
+
+// Disable MSVC warnings that cause a lot of noise related to DLL visibility
+// for types that we don't control (like std::unique_ptr).
+#pragma warning(push)
+#pragma warning(disable : 4251 4275)
+
+#define MONGOCXX_INLINE inline MONGOCXX_PRIVATE
+
+#define MONGOCXX_CALL __cdecl
+
+#else
+
+#define MONGOCXX_INLINE inline MONGOCXX_PRIVATE
+
+#define MONGOCXX_CALL
+
+#endif
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/config.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/config.hpp
new file mode 100644
index 0000000..90a571d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/config.hpp
@@ -0,0 +1,17 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define MONGOCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
+
+#define MONGOCXX_INLINE_NAMESPACE_END }  // namespace v_noabi
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/export.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/export.hpp
new file mode 100644
index 0000000..bc31d5f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/export.hpp
@@ -0,0 +1,42 @@
+
+#ifndef MONGOCXX_API_H
+#define MONGOCXX_API_H
+
+#ifdef MONGOCXX_STATIC
+#  define MONGOCXX_API
+#  define MONGOCXX_PRIVATE
+#else
+#  ifndef MONGOCXX_API
+#    ifdef MONGOCXX_EXPORTS
+        /* We are building this library */
+#      define MONGOCXX_API 
+#    else
+        /* We are using this library */
+#      define MONGOCXX_API 
+#    endif
+#  endif
+
+#  ifndef MONGOCXX_PRIVATE
+#    define MONGOCXX_PRIVATE 
+#  endif
+#endif
+
+#ifndef MONGOCXX_DEPRECATED
+#  define MONGOCXX_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef MONGOCXX_DEPRECATED_EXPORT
+#  define MONGOCXX_DEPRECATED_EXPORT MONGOCXX_API MONGOCXX_DEPRECATED
+#endif
+
+#ifndef MONGOCXX_DEPRECATED_NO_EXPORT
+#  define MONGOCXX_DEPRECATED_NO_EXPORT MONGOCXX_PRIVATE MONGOCXX_DEPRECATED
+#endif
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef MONGOCXX_NO_DEPRECATED
+#    define MONGOCXX_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* MONGOCXX_API_H */
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
new file mode 100644
index 0000000..cb5f665
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
@@ -0,0 +1,62 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// src/mongocxx/config/compiler.hpp
+#undef MONGOCXX_INLINE
+#pragma pop_macro("MONGOCXX_INLINE")
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+#undef MONGOCXX_CALL
+#pragma pop_macro("MONGOCXX_CALL")
+
+// src/mongocxx/config/config.hpp.in
+#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
+#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
+#undef MONGOCXX_INLINE_NAMESPACE_END
+#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_END")
+
+// src/mongocxx/config/version.hpp.in
+#undef MONGOCXX_VERSION_STRING
+#pragma pop_macro("MONGOCXX_VERSION_STRING")
+#undef MONGOCXX_VERSION_EXTRA
+#pragma pop_macro("MONGOCXX_VERSION_EXTRA")
+#undef MONGOCXX_VERSION_MAJOR
+#pragma pop_macro("MONGOCXX_VERSION_MAJOR")
+#undef MONGOCXX_VERSION_MINOR
+#pragma pop_macro("MONGOCXX_VERSION_MINOR")
+#undef MONGOCXX_VERSION_PATCH
+#pragma pop_macro("MONGOCXX_VERSION_PATCH")
+
+// export.hpp (generated by cmake)
+#undef MONGOCXX_API_H
+#pragma pop_macro("MONGOCXX_API_H")
+#undef MONGOCXX_API
+#pragma pop_macro("MONGOCXX_API")
+#undef MONGOCXX_PRIVATE
+#pragma pop_macro("MONGOCXX_PRIVATE")
+#undef MONGOCXX_DEPRECATED
+#pragma pop_macro("MONGOCXX_DEPRECATED")
+#undef MONGOCXX_DEPRECATED_EXPORT
+#pragma pop_macro("MONGOCXX_DEPRECATED_EXPORT")
+#undef MONGOCXX_DEPRECATED_NO_EXPORT
+#pragma pop_macro("MONGOCXX_DEPRECATED_NO_EXPORT")
+#undef DEFINE_NO_DEPRECATED
+#pragma pop_macro("DEFINE_NO_DEPRECATED")
+#undef MONGOCXX_NO_DEPRECATED
+#pragma pop_macro("MONGOCXX_NO_DEPRECATED")
+
+// prelude.hpp
+#undef MONGOCXX_UNREACHABLE
+#pragma pop_macro("MONGOCXX_UNREACHABLE")
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
new file mode 100644
index 0000000..df1162b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
@@ -0,0 +1,65 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// src/mongocxx/config/compiler.hpp
+#pragma push_macro("MONGOCXX_INLINE")
+#undef MONGOCXX_INLINE
+#pragma push_macro("MONGOCXX_CALL")
+#undef MONGOCXX_CALL
+
+// src/mongocxx/config/config.hpp.in
+#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
+#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
+#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_END")
+#undef MONGOCXX_INLINE_NAMESPACE_END
+
+// src/mongocxx/config/version.hpp.in
+#pragma push_macro("MONGOCXX_VERSION_STRING")
+#undef MONGOCXX_VERSION_STRING
+#pragma push_macro("MONGOCXX_VERSION_EXTRA")
+#undef MONGOCXX_VERSION_EXTRA
+#pragma push_macro("MONGOCXX_VERSION_MAJOR")
+#undef MONGOCXX_VERSION_MAJOR
+#pragma push_macro("MONGOCXX_VERSION_MINOR")
+#undef MONGOCXX_VERSION_MINOR
+#pragma push_macro("MONGOCXX_VERSION_PATCH")
+#undef MONGOCXX_VERSION_PATCH
+
+// export.hpp (generated by cmake)
+#pragma push_macro("MONGOCXX_API_H")
+#undef MONGOCXX_API_H
+#pragma push_macro("MONGOCXX_API")
+#undef MONGOCXX_API
+#pragma push_macro("MONGOCXX_PRIVATE")
+#undef MONGOCXX_PRIVATE
+#pragma push_macro("MONGOCXX_DEPRECATED")
+#undef MONGOCXX_DEPRECATED
+#pragma push_macro("MONGOCXX_DEPRECATED_EXPORT")
+#undef MONGOCXX_DEPRECATED_EXPORT
+#pragma push_macro("MONGOCXX_DEPRECATED_NO_EXPORT")
+#undef MONGOCXX_DEPRECATED_NO_EXPORT
+#pragma push_macro("DEFINE_NO_DEPRECATED")
+#undef DEFINE_NO_DEPRECATED
+#pragma push_macro("MONGOCXX_NO_DEPRECATED")
+#undef MONGOCXX_NO_DEPRECATED
+
+#include <mongocxx/config/compiler.hpp>
+#include <mongocxx/config/config.hpp>
+#include <mongocxx/config/export.hpp>
+#include <mongocxx/config/version.hpp>
+
+// TODO: Find a way to DRY this with BSONCXX_UNREACHABLE
+#pragma push_macro("MONGOCXX_UNREACHABLE")
+#undef MONGOCXX_UNREACHABLE
+#define MONGOCXX_UNREACHABLE std::abort()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/version.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/version.hpp
new file mode 100644
index 0000000..ed1cf90
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/config/version.hpp
@@ -0,0 +1,19 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define MONGOCXX_VERSION_STRING "3.7.0"
+#define MONGOCXX_VERSION_MAJOR 3
+#define MONGOCXX_VERSION_MINOR 7
+#define MONGOCXX_VERSION_PATCH 0
+#define MONGOCXX_VERSION_EXTRA 
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/cursor.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/cursor.hpp
new file mode 100644
index 0000000..f85ce59
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/cursor.hpp
@@ -0,0 +1,176 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+///
+/// Class representing a pointer to the result set of a query on a MongoDB server.
+///
+/// Clients can iterate through a cursor::iterator to retrieve results.
+///
+/// @note By default, cursors timeout after 10 minutes of inactivity.
+///
+class MONGOCXX_API cursor {
+   public:
+    enum class type { k_non_tailable, k_tailable, k_tailable_await };
+
+    class MONGOCXX_API iterator;
+
+    ///
+    /// Move constructs a cursor.
+    ///
+    cursor(cursor&&) noexcept;
+
+    ///
+    /// Move assigns a cursor.
+    ///
+    cursor& operator=(cursor&&) noexcept;
+
+    ///
+    /// Destroys a cursor.
+    ///
+    ~cursor();
+
+    ///
+    /// A cursor::iterator that points to the beginning of any available
+    /// results.  If begin() is called more than once, the cursor::iterator
+    /// returned points to the next remaining result, not the result of
+    /// the original call to begin().
+    ///
+    /// For a tailable cursor, when cursor.begin() == cursor.end(), no
+    /// documents are available.  Each call to cursor.begin() checks again
+    /// for newly-available documents.
+    ///
+    /// @return the cursor::iterator
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    iterator begin();
+
+    ///
+    /// A cursor::iterator indicating cursor exhaustion, meaning that
+    /// no documents are available from the cursor.
+    ///
+    /// @return the cursor::iterator
+    ///
+    iterator end();
+
+   private:
+    friend class collection;
+    friend class client;
+    friend class database;
+    friend class index_view;
+    friend class cursor::iterator;
+
+    MONGOCXX_PRIVATE cursor(void* cursor_ptr,
+                            bsoncxx::stdx::optional<type> cursor_type = bsoncxx::stdx::nullopt);
+
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+///
+/// Class representing an input iterator of documents in a MongoDB cursor
+/// result set.
+///
+/// All non-end iterators derived from the same mongocxx::cursor move in
+/// lock-step.  Dereferencing any non-end() iterator always gives the first
+/// remaining document in the cursor.  Incrementing one non-end iterator is
+/// equivalent to incrementing them all.
+///
+/// An iterator is 'exhausted' when no documents are available. An
+/// end-iterator is always exhausted. A non-end iterator is exhausted when the
+/// originating mongocxx::cursor has no more documents.  When an iterator is
+/// exhausted, it must not be dereferenced or incremented.
+///
+/// For iterators of a tailable cursor, calling cursor.begin() may revive an
+/// exhausted iterator so that it no longer compares equal to the
+/// end-iterator.
+///
+class MONGOCXX_API cursor::iterator {
+   public:
+    ///
+    /// std::iterator_traits
+    ///
+    using value_type = bsoncxx::document::view;
+    using reference = bsoncxx::document::view&;
+    using pointer = bsoncxx::document::view*;
+    using iterator_category = std::input_iterator_tag;
+    using difference_type = std::ptrdiff_t;
+
+    ///
+    /// Dereferences the view for the document currently being pointed to.
+    ///
+    const bsoncxx::document::view& operator*() const;
+
+    ///
+    /// Accesses a member of the dereferenced document currently being pointed to.
+    ///
+    const bsoncxx::document::view* operator->() const;
+
+    ///
+    /// Pre-increments the iterator to move to the next document.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    iterator& operator++();
+
+    ///
+    /// Post-increments the iterator to move to the next document.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    void operator++(int);
+
+   private:
+    friend class cursor;
+
+    ///
+    /// @{
+    ///
+    /// Compare two iterators for (in)-equality.  Iterators compare equal if
+    /// they point to the same underlying cursor or if both are exhausted.
+    ///
+    /// @relates iterator
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const iterator&, const iterator&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const iterator&, const iterator&);
+    ///
+    /// @}
+    ///
+
+    MONGOCXX_PRIVATE bool is_exhausted() const;
+
+    MONGOCXX_PRIVATE explicit iterator(cursor* cursor);
+
+    // If this pointer is null, the iterator is considered "past-the-end".
+    cursor* _cursor;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/database.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/database.hpp
new file mode 100644
index 0000000..af06a8f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/database.hpp
@@ -0,0 +1,679 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/collection.hpp>
+#include <mongocxx/gridfs/bucket.hpp>
+#include <mongocxx/options/create_collection.hpp>
+#include <mongocxx/options/gridfs/bucket.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+
+///
+/// Class representing a MongoDB database.
+///
+/// Acts as a gateway for accessing collections that are contained within a database. It inherits
+/// all of its default settings from the client that creates it.
+///
+class MONGOCXX_API database {
+   public:
+    ///
+    /// Default constructs a new database. The database is not valid for use and is equivalent
+    /// to the state of a moved-from database. The only valid actions to take with a default
+    /// constructed database are to assign to it, or destroy it.
+    ///
+    database() noexcept;
+
+    ///
+    /// Move constructs a database.
+    ///
+    database(database&&) noexcept;
+
+    ///
+    /// Move assigns a database.
+    ///
+    database& operator=(database&&) noexcept;
+
+    ///
+    /// Copy constructs a database.
+    ///
+    database(const database&);
+
+    ///
+    /// Copy assigns a database.
+    ///
+    database& operator=(const database&);
+
+    ///
+    /// Destroys a database.
+    ///
+    ~database();
+
+    ///
+    /// Returns true if the client is valid, meaning it was not default constructed
+    /// or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// @{
+    ///
+    /// Runs an aggregation framework pipeline against this database for
+    /// pipeline stages that do not require an underlying collection,
+    /// such as $currentOp and $listLocalSessions.
+    ///
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/#dbcmd.aggregate
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   database level set read concern - database::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+
+    ///
+    /// Runs an aggregation framework pipeline against this database for
+    /// pipeline stages that do not require an underlying collection,
+    /// such as $currentOp and $listLocalSessions.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/#dbcmd.aggregate
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   database level set read concern - database::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const client_session& session,
+                     const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Runs a command against this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.runCommand/
+    ///
+    /// @param command document representing the command to be run.
+    /// @return the result of executing the command.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    bsoncxx::document::value run_command(bsoncxx::document::view_or_value command);
+
+    ///
+    /// Runs a command against this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.runCommand/
+    ///
+    /// @param session The mongocxx::client_session with which to run the command.
+    /// @param command document representing the command to be run.
+    /// @return the result of executing the command.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    bsoncxx::document::value run_command(const client_session& session,
+                                         bsoncxx::document::view_or_value command);
+
+    ///
+    /// Executes a command on a specific server using this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.runCommand/
+    ///
+    /// @param command document representing the command to be run.
+    /// @param server_id specifying which server to use.
+    /// @return the result of executing the command.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    bsoncxx::document::value run_command(bsoncxx::document::view_or_value command,
+                                         uint32_t server_id);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @note This function can also be used to create a Time Series Collection. See:
+    /// https://docs.mongodb.com/manual/core/timeseries-collections/
+    ///
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    class collection create_collection(stdx::string_view name,
+                                       bsoncxx::document::view_or_value collection_options = {},
+                                       const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @note This function can also be used to create a Time Series Collection. See:
+    /// https://docs.mongodb.com/manual/core/timeseries-collections/
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the create operation.
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    class collection create_collection(const client_session& session,
+                                       stdx::string_view name,
+                                       bsoncxx::document::view_or_value collection_options = {},
+                                       const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @deprecated
+    ///   This overload is deprecated. Call database::create_collection with a
+    ///   bsoncxx::document::view_or_value collection_options instead.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    MONGOCXX_DEPRECATED class collection create_collection(
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {}) {
+        return create_collection_deprecated(name, collection_options, write_concern);
+    }
+
+    class collection create_collection_deprecated(
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @deprecated
+    ///   This overload is deprecated. Call database::create_collection with a
+    ///   bsoncxx::document::view_or_value collection_options instead.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the create operation.
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    MONGOCXX_DEPRECATED class collection create_collection(
+        const client_session& session,
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {}) {
+        return create_collection_deprecated(session, name, collection_options, write_concern);
+    }
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @deprecated
+    ///   This overload is deprecated. Call database::create_collection with a
+    ///   bsoncxx::document::view_or_value collection_options instead.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the create operation.
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    class collection create_collection_deprecated(
+        const client_session& session,
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops the database and all its collections.
+    ///
+    /// @param write_concern (optional)
+    ///   The write concern to be used for this operation. If not passed here, the write concern
+    ///   set on the database will be used.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/dropDatabase/
+    ///
+    void drop(const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+
+    ///
+    /// Drops the database and all its collections.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param write_concern (optional)
+    ///   The write concern to be used for this operation. If not passed here, the write concern
+    ///   set on the database will be used.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/dropDatabase/
+    ///
+    void drop(const client_session& session,
+              const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Checks whether this database contains a collection having the given name.
+    ///
+    /// @param name the name of the collection.
+    ///
+    /// @return bool whether the collection exists in this database.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listCollections'
+    /// command fails.
+    ///
+    bool has_collection(bsoncxx::string::view_or_value name) const;
+
+    ///
+    /// @{
+    ///
+    /// Enumerates the collections in this database.
+    ///
+    /// @param filter
+    ///   An optional query expression to filter the returned collections.
+    ///
+    /// @return mongocxx::cursor containing the collection information.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    cursor list_collections(bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// Enumerates the collections in this database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param filter
+    ///   An optional query expression to filter the returned collections.
+    ///
+    /// @return mongocxx::cursor containing the collection information.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    cursor list_collections(const client_session& session,
+                            bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// Enumerates the collection names in this database.
+    ///
+    /// @param filter
+    ///   An optional query expression to filter the returned collection names.
+    ///
+    /// @return std::vector<std::string> containing the collection names.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listCollections'
+    /// command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    std::vector<std::string> list_collection_names(bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// Enumerates the collection names in this database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param filter
+    ///   An optional query expression to filter the returned collection names.
+    ///
+    /// @return std::vector<std::string> containing the collection names.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listCollections'
+    /// command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    std::vector<std::string> list_collection_names(const client_session& session,
+                                                   bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Get the name of this database.
+    ///
+    /// @return the name of this database.
+    ///
+    stdx::string_view name() const;
+
+    ///
+    /// Sets the read_concern for this database.
+    ///
+    /// @note Modifications at this level do not affect existing collection instances that have come
+    /// from this database, but do affect new ones. New collections will receive a copy of the
+    /// new read_concern for this database upon instantiation.
+    ///
+    /// @param rc
+    ///   The new @c read_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/
+    ///
+    void read_concern(class read_concern rc);
+
+    ///
+    /// The current read concern for this database.
+    ///
+    /// If the read_concern is not explicitly set on this database object, it inherits the
+    /// read_concern from its parent client object.
+    ///
+    /// @return the current read_concern
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Sets the read_preference for this database.
+    ///
+    /// @note Modifications at this level do not affect existing collection instances that have come
+    /// from this database, but do affect new ones. New collections will receive a copy of the
+    /// new read_preference for this database upon instantiation.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    /// @param rp the new read_preference.
+    ///
+    void read_preference(class read_preference rp);
+
+    ///
+    /// The current read preference for this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    /// @return the current read_preference
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// Sets the write_concern for this database.
+    ///
+    /// @note Modifications at this level do not affect existing collection instances that have come
+    /// from this database, but do affect new ones as new collections will receive a copy of the
+    /// write_concern of this database upon instantiation.
+    ///
+    void write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this database.
+    ///
+    /// @return the current write_concern
+    ///
+    class write_concern write_concern() const;
+
+    ///
+    /// Access a collection (logical grouping of documents) within this database.
+    ///
+    /// @param name the name of the collection to get.
+    ///
+    /// @return the collection.
+    ///
+    class collection collection(bsoncxx::string::view_or_value name) const;
+
+    ///
+    /// Allows the db["collection_name"] syntax to be used to access a collection within this
+    /// database.
+    ///
+    /// @param name the name of the collection to get.
+    ///
+    /// @return the collection.
+    ///
+    MONGOCXX_INLINE class collection operator[](bsoncxx::string::view_or_value name) const;
+
+    ///
+    /// Access a GridFS bucket within this database.
+    ///
+    /// @param options
+    ///   The options for the bucket.
+    ///
+    /// @return
+    ///   The GridFS bucket.
+    ///
+    /// @note
+    ///   See the class comment for `gridfs::bucket` for more information about GridFS.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    class gridfs::bucket gridfs_bucket(
+        const options::gridfs::bucket& options = options::gridfs::bucket()) const;
+
+    ///
+    /// @{
+    ///
+    /// Gets a change stream on this database with an empty pipeline.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const options::change_stream& options = {});
+
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this database.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    ///   Only a subset of pipeline operations are supported for change streams. For more
+    ///   information see the change streams documentation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const pipeline& pipe, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session,
+                        const pipeline& pipe,
+                        const options::change_stream& options = {});
+
+    ///
+    /// @}
+    ///
+
+   private:
+    friend class client;
+    friend class collection;
+
+    MONGOCXX_PRIVATE database(const class client& client, bsoncxx::string::view_or_value name);
+
+    MONGOCXX_PRIVATE cursor _aggregate(const client_session* session,
+                                       const pipeline& pipeline,
+                                       const options::aggregate& options);
+
+    MONGOCXX_PRIVATE bsoncxx::document::value _run_command(
+        const client_session* session, bsoncxx::document::view_or_value command);
+
+    MONGOCXX_PRIVATE class collection _create_collection(
+        const client_session* session,
+        stdx::string_view name,
+        bsoncxx::document::view_or_value collection_options,
+        const stdx::optional<class write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE class collection _create_collection_deprecated(
+        const client_session* session,
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<class write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE cursor _list_collections(const client_session* session,
+                                              bsoncxx::document::view_or_value filter);
+
+    MONGOCXX_PRIVATE std::vector<std::string> _list_collection_names(
+        const client_session* session, bsoncxx::document::view_or_value filter);
+
+    MONGOCXX_PRIVATE void _drop(
+        const client_session* session,
+        const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE change_stream _watch(const client_session* session,
+                                          const pipeline& pipe,
+                                          const options::change_stream& options);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE collection database::operator[](bsoncxx::string::view_or_value name) const {
+    return collection(name);
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp
new file mode 100644
index 0000000..2837ae9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp
@@ -0,0 +1,109 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver fails to execute a MongoDB command.
+///
+/// @see "CommandFailedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst
+///
+class MONGOCXX_API command_failed_event {
+   public:
+    MONGOCXX_PRIVATE explicit command_failed_event(const void* event);
+
+    ///
+    /// Destroys a command_failed_event.
+    ///
+    ~command_failed_event();
+
+    ///
+    /// Returns the server’s reply to the failed operation.
+    ///
+    /// @return The failure.
+    ///
+    bsoncxx::document::view failure() const;
+
+    ///
+    /// Returns the name of the command.
+    ///
+    /// @return The command name.
+    ///
+    bsoncxx::stdx::string_view command_name() const;
+
+    ///
+    /// Returns the duration of the failed operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the request id.
+    ///
+    /// @return The request id.
+    ///
+    std::int64_t request_id() const;
+
+    ///
+    /// Returns the operation id.
+    ///
+    /// @return The operation id.
+    ///
+    std::int64_t operation_id() const;
+
+    ///
+    /// Optionally returns the service id.
+    ///
+    /// @return No contained value, or contains the service id if load balancing is enabled.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::oid> service_id() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _failed_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp
new file mode 100644
index 0000000..ebae4a9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp
@@ -0,0 +1,109 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver begins executing a MongoDB command.
+///
+/// @see "CommandStartedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst
+///
+class MONGOCXX_API command_started_event {
+   public:
+    MONGOCXX_PRIVATE explicit command_started_event(const void* event);
+
+    ///
+    /// Destroys a command_started_event.
+    ///
+    ~command_started_event();
+
+    ///
+    /// Returns the command that has been started.
+    ///
+    /// @return The command.
+    ///
+    bsoncxx::document::view command() const;
+
+    ///
+    /// Returns the name of the database.
+    ///
+    /// @return The database name.
+    ///
+    bsoncxx::stdx::string_view database_name() const;
+
+    ///
+    /// Returns the name of the command.
+    ///
+    /// @return The command name.
+    ///
+    bsoncxx::stdx::string_view command_name() const;
+
+    ///
+    /// Returns the request id.
+    ///
+    /// @return The request id.
+    ///
+    std::int64_t request_id() const;
+
+    ///
+    /// Returns the operation id.
+    ///
+    /// @return The operation id.
+    ///
+    std::int64_t operation_id() const;
+
+    ///
+    /// Optionally returns the service id.
+    ///
+    /// @return No contained value, or contains the service id if load balancing is enabled.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::oid> service_id() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _started_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp
new file mode 100644
index 0000000..f3afd97
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp
@@ -0,0 +1,109 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver successfully executes a MongoDB command.
+///
+/// @see "CommandSucceededEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst
+///
+class MONGOCXX_API command_succeeded_event {
+   public:
+    MONGOCXX_PRIVATE explicit command_succeeded_event(const void* event);
+
+    ///
+    /// Destroys a command_succeeded_event.
+    ///
+    ~command_succeeded_event();
+
+    ///
+    /// Returns the server reply for the succeeded operation.
+    ///
+    /// @return The reply.
+    ///
+    bsoncxx::document::view reply() const;
+
+    ///
+    /// Returns the name of the command.
+    ///
+    /// @return The command name.
+    ///
+    bsoncxx::stdx::string_view command_name() const;
+
+    ///
+    /// Returns the duration of the successful operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the request id.
+    ///
+    /// @return The request id.
+    ///
+    std::int64_t request_id() const;
+
+    ///
+    /// Returns the operation id.
+    ///
+    /// @return The operation id.
+    ///
+    std::int64_t operation_id() const;
+
+    ///
+    /// Optionally returns the service id.
+    ///
+    /// @return No contained value, or contains the service id if load balancing is enabled.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::oid> service_id() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _succeeded_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp
new file mode 100644
index 0000000..08cbe38
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp
@@ -0,0 +1,85 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver failed to send an "hello" command to check the
+/// status of a server.
+///
+/// @see "ServerHeartbeatFailedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API heartbeat_failed_event {
+   public:
+    MONGOCXX_PRIVATE explicit heartbeat_failed_event(const void* event);
+
+    ///
+    /// Destroys a heartbeat_failed_event.
+    ///
+    ~heartbeat_failed_event();
+
+    ///
+    /// Returns the failed operation's error message.
+    ///
+    /// @return The message.
+    ///
+    std::string message() const;
+
+    ///
+    /// Returns the duration of the failed operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// Returns a boolean indicating whether this heartbeat event is from an awaitable hello.
+    ///
+    /// @return A boolean.
+    ///
+    bool awaited() const;
+
+   private:
+    const void* _failed_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp
new file mode 100644
index 0000000..e18c109
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp
@@ -0,0 +1,71 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver begins executing a "hello" command to check the
+/// status of a server.
+///
+/// @see "ServerHeartbeatStartedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API heartbeat_started_event {
+   public:
+    MONGOCXX_PRIVATE explicit heartbeat_started_event(const void* event);
+
+    ///
+    /// Destroys a heartbeat_started_event.
+    ///
+    ~heartbeat_started_event();
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// Returns a boolean indicating whether this heartbeat event is from an awaitable hello.
+    ///
+    /// @return A boolean.
+    ///
+    bool awaited() const;
+
+   private:
+    const void* _started_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp
new file mode 100644
index 0000000..936aff8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp
@@ -0,0 +1,86 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver completes a "hello" command to check the status
+/// of a server.
+///
+/// @see "ServerHeartbeatSucceededEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API heartbeat_succeeded_event {
+   public:
+    MONGOCXX_PRIVATE explicit heartbeat_succeeded_event(const void* event);
+
+    ///
+    /// Destroys a heartbeat_succeeded_event.
+    ///
+    ~heartbeat_succeeded_event();
+
+    ///
+    /// Returns the server reply for the succeeded operation.
+    ///
+    /// @return The reply.
+    ///
+    bsoncxx::document::view reply() const;
+
+    ///
+    /// Returns the duration of the successful operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// Returns a boolean indicating whether this heartbeat event is from an awaitable hello.
+    ///
+    /// @return A boolean.
+    ///
+    bool awaited() const;
+
+   private:
+    const void* _succeeded_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp
new file mode 100644
index 0000000..ad7babe
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp
@@ -0,0 +1,87 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/events/server_description.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver observes a change in the status of a server it is
+/// connected to.
+///
+/// @see "ServerDescriptionChangedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API server_changed_event {
+   public:
+    MONGOCXX_PRIVATE explicit server_changed_event(const void* event);
+
+    ///
+    /// Destroys a server_changed_event.
+    ///
+    ~server_changed_event();
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    const bsoncxx::oid topology_id() const;
+
+    ///
+    /// The server's description before it changed.
+    ///
+    /// @return The server_description.
+    ///
+    const server_description previous_description() const;
+
+    ///
+    /// The server's description after it changed.
+    ///
+    /// @return The server_description.
+    ///
+    const server_description new_description() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp
new file mode 100644
index 0000000..a046083
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp
@@ -0,0 +1,72 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver stops monitoring a MongoDB server and removes it
+/// from the topology description.
+///
+/// @see "ServerClosedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API server_closed_event {
+   public:
+    MONGOCXX_PRIVATE explicit server_closed_event(const void* event);
+
+    ///
+    /// Destroys a server_closed_event.
+    ///
+    ~server_closed_event();
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    const bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp
new file mode 100644
index 0000000..53d3a0e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp
@@ -0,0 +1,98 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// Class representing what the driver knows about a MongoDB server.
+///
+class MONGOCXX_API server_description {
+   public:
+    MONGOCXX_PRIVATE explicit server_description(const void* event);
+
+    ///
+    /// Destroys a server_description.
+    ///
+    ~server_description();
+
+    ///
+    /// An opaque id, unique to this server for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    std::uint32_t id() const;
+
+    ///
+    /// The duration of the last hello call, indicating network latency.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t round_trip_time() const;
+
+    ///
+    /// The server type: "Unknown", "Standalone", "Mongos", "PossiblePrimary", "RSPrimary",
+    /// "RSSecondary", "RSArbiter", "RSOther", or "RSGhost".
+    ///
+    /// @return The type as a short-lived string view.
+    ///
+    bsoncxx::stdx::string_view type() const;
+
+    ///
+    /// @return The response as a short-lived document view.
+    ///
+    /// @deprecated use hello instead.
+    ///
+    MONGOCXX_DEPRECATED bsoncxx::document::view is_master() const;
+
+    ///
+    /// The server's last response to the "hello" command, or an empty document if the driver
+    /// has not yet reached the server or there was an error.
+    ///
+    /// @return The response as a short-lived document view.
+    ///
+    bsoncxx::document::view hello() const;
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _sd;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp
new file mode 100644
index 0000000..aa73fce
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp
@@ -0,0 +1,71 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver adds a MongoDB server to the topology description
+/// and begins monitoring it.
+///
+/// @see "ServerOpeningEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API server_opening_event {
+   public:
+    MONGOCXX_PRIVATE explicit server_opening_event(const void* event);
+
+    ///
+    /// Destroys a server_opening_event.
+    ///
+    ~server_opening_event();
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    const bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp
new file mode 100644
index 0000000..4b3b188
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp
@@ -0,0 +1,72 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <mongocxx/events/topology_description.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver observes a change in any of the servers it is
+/// connected to or a change in the overall server topology.
+///
+/// @see "TopologyDescriptionChangedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API topology_changed_event {
+   public:
+    MONGOCXX_PRIVATE explicit topology_changed_event(const void* event);
+
+    ///
+    /// Destroys a topology_changed_event.
+    ///
+    ~topology_changed_event();
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    bsoncxx::oid topology_id() const;
+
+    ///
+    /// The server's description before it changed.
+    ///
+    /// @return The topology_description.
+    ///
+    topology_description previous_description() const;
+
+    ///
+    /// The server's description after it changed.
+    ///
+    /// @return The topology_description.
+    ///
+    topology_description new_description() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp
new file mode 100644
index 0000000..d34b15f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp
@@ -0,0 +1,57 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver stops monitoring a server topology and destroys its
+/// description.
+///
+/// @see "TopologyClosedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API topology_closed_event {
+   public:
+    MONGOCXX_PRIVATE explicit topology_closed_event(const void* event);
+
+    ///
+    /// Destroys a topology_closed_event.
+    ///
+    ~topology_closed_event();
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp
new file mode 100644
index 0000000..bbde379
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp
@@ -0,0 +1,165 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <vector>
+
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/events/server_description.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+using mongocxx::read_preference;
+
+///
+/// Class representing what the driver knows about a topology of MongoDB servers: either a
+/// standalone, a replica set, or a sharded cluster.
+///
+class MONGOCXX_API topology_description {
+   public:
+    ///
+    /// An array of server_description instances.
+    ///
+    class MONGOCXX_API server_descriptions {
+       private:
+        using container = std::vector<server_description>;
+
+       public:
+        ///
+        /// Move constructs a server_descriptions array.
+        ///
+        server_descriptions(server_descriptions&&) noexcept;
+
+        ///
+        /// Move assigns a server_descriptions array.
+        ///
+        server_descriptions& operator=(server_descriptions&&) noexcept;
+
+        server_descriptions(const server_descriptions&) = delete;
+        server_descriptions& operator=(const server_descriptions&) = delete;
+
+        ///
+        /// Destroys a server_descriptions array.
+        ///
+        ~server_descriptions();
+
+        ///
+        /// The array's iterator type.
+        ///
+        using iterator = container::iterator;
+
+        ///
+        /// The array's const iterator type.
+        ///
+        using const_iterator = container::const_iterator;
+
+        ///
+        /// @{
+        ///
+        /// Returns an iterator to the beginning.
+        ///
+        iterator begin() noexcept;
+        const_iterator begin() const noexcept;
+
+        ///
+        /// @}
+        ///
+
+        ///
+        /// @{
+        ///
+        /// Returns an iterator to the end.
+        ///
+        iterator end() noexcept;
+        const_iterator end() const noexcept;
+
+        ///
+        /// @}
+        ///
+
+        ///
+        /// The number of server_description instances in the array.
+        ///
+        std::size_t size() const noexcept;
+
+       private:
+        friend topology_description;
+        MONGOCXX_PRIVATE explicit server_descriptions(void* sds, std::size_t size);
+        MONGOCXX_PRIVATE void swap(server_descriptions& other) noexcept;
+        container _container;
+        void* _sds;
+        std::size_t _size;
+    };
+
+    MONGOCXX_PRIVATE explicit topology_description(void* event);
+
+    ///
+    /// Destroys a topology_description.
+    ///
+    ~topology_description();
+
+    ///
+    /// The topology type: "Unknown", "Sharded", "ReplicaSetNoPrimary", "ReplicaSetWithPrimary", or
+    /// "Single".
+    ///
+    /// @return The type as a short-lived string view.
+    ///
+    bsoncxx::stdx::string_view type() const;
+
+    ///
+    /// Determines if the topology has a readable server available. Servers are
+    /// filtered by the given read preferences only if the driver is connected
+    /// to a replica set, otherwise the read preferences are ignored. This
+    /// function uses the driver's current knowledge of the state of the
+    /// MongoDB server or servers it is connected to; it does no I/O.
+    ///
+    /// @return Whether there is a readable server available.
+    ///
+    bool has_readable_server(const mongocxx::read_preference& pref) const;
+
+    ///
+    /// Determines if the topology has a writable server available, such as a
+    /// primary, mongos, or standalone. This function uses the driver's current
+    /// knowledge of the state of the MongoDB server or servers it is connected
+    /// to; it does no I/O.
+    ///
+    /// @return Whether there is a writable server available.
+    ///
+    bool has_writable_server() const;
+
+    ///
+    /// Fetches descriptions for all known servers in the topology.
+    ///
+    /// @return An array of server_description objects.
+    ///
+    server_descriptions servers() const;
+
+   private:
+    // Non-const since mongoc_topology_description_has_readable_server/writable_server take
+    // non-const. They do server selection, which modifies the mongoc_topology_description_t.
+    void* _td;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp
new file mode 100644
index 0000000..47e3dda
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp
@@ -0,0 +1,57 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <mongocxx/events/topology_description.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver initializes a server topology.
+///
+/// @see "TopologyOpeningEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API topology_opening_event {
+   public:
+    MONGOCXX_PRIVATE explicit topology_opening_event(const void* event);
+
+    ///
+    /// Destroys a topology_opening_event.
+    ///
+    ~topology_opening_event();
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp
new file mode 100644
index 0000000..fdc33fa
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp
@@ -0,0 +1,38 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during authentication.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API authentication_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp
new file mode 100644
index 0000000..ddd71af
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp
@@ -0,0 +1,38 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during a bulk write operation.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API bulk_write_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp
new file mode 100644
index 0000000..24082c4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp
@@ -0,0 +1,126 @@
+// Copyright 2015-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <system_error>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the various error types that can occur during driver usage.
+///
+enum class error_code : std::int32_t {
+    /// More than one mongocxx::instance has been created.
+    k_cannot_recreate_instance = 1,
+
+    /// A default-constructed or moved-from mongocxx::client object has been used.
+    k_invalid_client_object,
+
+    /// A default-constructed or moved-from mongocxx::collection object has been used.
+    k_invalid_collection_object,
+
+    /// A default-constructed or moved-from mongocxx::database object has been used.
+    k_invalid_database_object,
+
+    /// An invalid or out-of-bounds parameter was provided.
+    k_invalid_parameter,
+
+    /// An SSL operation was used without SSL support being built.
+    k_ssl_not_supported,
+
+    /// An unknown read concern level was set.
+    k_unknown_read_concern,
+
+    /// An unknown write concern level was set.
+    k_unknown_write_concern,
+
+    /// The server returned a malformed response.
+    k_server_response_malformed,
+
+    /// An invalid MongoDB URI was provided.
+    k_invalid_uri,
+
+    /// A default-constructed or moved-from mongocxx::gridfs::bucket object has been used.
+    k_invalid_gridfs_bucket_object,
+
+    /// A default-constructed or moved-from mongocxx::gridfs::uploader object has been used.
+    k_invalid_gridfs_uploader_object,
+
+    /// A default-constructed or moved-from mongocxx::gridfs::downloader object has been used.
+    k_invalid_gridfs_downloader_object,
+
+    /// A mongocxx::gridfs::uploader object was not open for writing, or a
+    /// mongocxx::gridfs::downloader object was not open for reading.
+    k_gridfs_stream_not_open,
+
+    /// A mongocxx::gridfs::uploader object has exceeded the maximum number of allowable GridFS
+    /// chunks when attempting to upload the requested file.
+    k_gridfs_upload_requires_too_many_chunks,
+
+    /// The requested GridFS file was not found.
+    k_gridfs_file_not_found,
+
+    /// A GridFS file being operated on was discovered to be corrupted.
+    k_gridfs_file_corrupted,
+
+    /// The mongocxx::instance has been destroyed.
+    k_instance_destroyed,
+
+    /// mongocxx::client.create_session failed to create a mongocxx::client_session.
+    k_cannot_create_session,
+
+    /// A failure attempting to pass a mongocxx::client_session to a method.
+    k_invalid_session,
+
+    /// A moved-from mongocxx::options::transaction object has been used.
+    k_invalid_transaction_options_object,
+
+    // A resource (server API handle, etc.) could not be created:
+    k_create_resource_fail,
+
+    // Add new constant string message to error_code.cpp as well!
+};
+
+///
+/// Get the error_category for mongocxx library exceptions.
+///
+/// @return The mongocxx error_category
+///
+MONGOCXX_API const std::error_category& MONGOCXX_CALL error_category();
+
+///
+/// Translate a mongocxx::error_code into a std::error_code.
+///
+/// @param error A mongocxx::error_code
+///
+/// @return A std::error_code
+///
+MONGOCXX_INLINE std::error_code make_error_code(error_code error) {
+    return {static_cast<int>(error), error_category()};
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
+
+namespace std {
+// Specialize is_error_code_enum so we get simpler std::error_code construction
+template <>
+struct is_error_code_enum<mongocxx::error_code> : public true_type {};
+}  // namespace std
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp
new file mode 100644
index 0000000..fbb30da
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp
@@ -0,0 +1,35 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <system_error>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// A class to be used as the base class for all mongocxx exceptions.
+///
+class MONGOCXX_API exception : public std::system_error {
+    using system_error::system_error;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp
new file mode 100644
index 0000000..01eea3a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp
@@ -0,0 +1,38 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an error encountered when attempting to perform the requested GridFS
+/// operation.
+///
+/// @see mongocxx::exception
+///
+class MONGOCXX_API gridfs_exception : public exception {
+   public:
+    using exception::exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp
new file mode 100644
index 0000000..7401041
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp
@@ -0,0 +1,37 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception caused by using the mongocxx API improperly.
+///
+/// @see mongocxx::exception
+///
+class MONGOCXX_API logic_error : public exception {
+   public:
+    using exception::exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp
new file mode 100644
index 0000000..ef83ee8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp
@@ -0,0 +1,81 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/exception/exception.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception received from a MongoDB server.  It includes the server-provided
+/// error code, if one was available.
+///
+/// @see mongocxx::exception
+///
+class MONGOCXX_API operation_exception : public exception {
+   public:
+    using exception::exception;
+
+    ///
+    /// Constructs a new operation exception.
+    ///
+    /// @param ec
+    ///   The error code associated with this exception.
+    /// @param raw_server_error
+    ///   The optional raw bson error document to be associated with this exception.
+    /// @param what_arg
+    ///   An optional message to be returned by `what`.
+    ///
+    operation_exception(std::error_code ec,
+                        bsoncxx::document::value&& raw_server_error,
+                        std::string what_arg = "");
+
+    ///
+    /// @{
+    ///
+    /// The optional raw bson error document from the server.
+    ///
+    /// @returns The raw server error, if it is available.
+    ///
+    const stdx::optional<bsoncxx::document::value>& raw_server_error() const;
+    stdx::optional<bsoncxx::document::value>& raw_server_error();
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Checks for the specified label in a operation exception.
+    ///
+    /// @param label
+    ///   A string of the label to search for
+    ///
+    /// @returns True if the label is found in the operation exception, and false otherwise.
+    ///
+    bool has_error_label(stdx::string_view label) const;
+
+   private:
+    stdx::optional<bsoncxx::document::value> _raw_server_error;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp
new file mode 100644
index 0000000..cababb8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp
@@ -0,0 +1,37 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during a query operation.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API query_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp
new file mode 100644
index 0000000..5a0082b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp
@@ -0,0 +1,59 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <system_error>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the various errors types that can be returned from the server. As this list
+/// changes over time, this is just a placeholder for an Int32 error code value from the server.
+///
+enum class server_error_code : std::int32_t {
+    // Intentionally empty at this time!
+};
+
+///
+/// Get the error_category for mongocxx library exceptions.
+///
+/// @return The mongocxx error_category
+///
+MONGOCXX_API const std::error_category& MONGOCXX_CALL server_error_category();
+
+///
+/// Translate a mongocxx::server_error_code into a std::error_code.
+///
+/// @param error A mongocxx::error_code
+///
+/// @return A std::error_code
+///
+MONGOCXX_INLINE std::error_code make_error_code(server_error_code error) {
+    return {static_cast<int>(error), server_error_category()};
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
+
+namespace std {
+// Specialize is_error_code_enum so we get simpler std::error_code construction
+template <>
+struct is_error_code_enum<mongocxx::server_error_code> : public true_type {};
+}  // namespace std
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp
new file mode 100644
index 0000000..cf90071
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp
@@ -0,0 +1,37 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during a write operation.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API write_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp
new file mode 100644
index 0000000..bd30f30
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp
@@ -0,0 +1,681 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <istream>
+#include <memory>
+#include <ostream>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/gridfs/downloader.hpp>
+#include <mongocxx/gridfs/uploader.hpp>
+#include <mongocxx/options/find.hpp>
+#include <mongocxx/options/gridfs/bucket.hpp>
+#include <mongocxx/options/gridfs/upload.hpp>
+#include <mongocxx/result/gridfs/upload.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class database;
+
+namespace gridfs {
+
+///
+/// Class representing a GridFS bucket.
+///
+/// A GridFS bucket is used to store files that may be too large to store in a single document due
+/// to the 16 MB limit. The bucket comprises of two collections, `<bucketname>.files` and
+/// `<bucketname>.chunks.` A file written to a GridFS bucket will be serialized into zero or more
+/// chunk documents stored in the `<bucketname>.chunks` collection, and one document will be stored
+/// in the `<bucketname>.files` collection containing the information about the file. Users should
+/// not modify these collections directly.
+///
+/// Example of how obtain the default GridFS bucket for a given database:
+/// @code
+///   mongocxx::client mongo_client{mongocxx::uri{}};
+///   auto gridfs_bucket = mongo_client["database"].gridfs_bucket();
+/// @endcode
+///
+/// See also the method documentation for `mongocxx::database::gridfs_bucket()`.
+///
+/// @see http://www.mongodb.org/display/DOCS/GridFS
+///
+class MONGOCXX_API bucket {
+   public:
+    ///
+    /// Default constructs a bucket object. The bucket is equivalent to the state of a moved from
+    /// bucket. The only valid actions to take with a default constructed bucket are to assign to
+    /// it, or destroy it.
+    ///
+    bucket() noexcept;
+
+    ///
+    /// Move constructs a bucket.
+    ///
+    bucket(bucket&&) noexcept;
+
+    ///
+    /// Move assigns a bucket.
+    ///
+    bucket& operator=(bucket&&) noexcept;
+
+    ///
+    /// Copy constructs a bucket.
+    ///
+    bucket(const bucket&);
+
+    ///
+    /// Copy assigns a bucket.
+    ///
+    bucket& operator=(const bucket&);
+
+    ///
+    /// Destroys a bucket.
+    ///
+    ~bucket();
+
+    ///
+    /// Returns true if the bucket is valid, meaning it was not default constructed or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// @{
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file. The id of the file will be
+    /// automatically generated as an ObjectId.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   A stream for writing to the GridFS file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream(stdx::string_view filename,
+                                const options::gridfs::upload& options = {});
+
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file. The id of the file will be
+    /// automatically generated as an ObjectId.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload. The client session must
+    ///   remain valid for the lifetime of the uploader.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   A stream for writing to the GridFS file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream(const client_session& session,
+                                stdx::string_view filename,
+                                const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file.
+    ///
+    /// @param id
+    ///   The unique id of the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The gridfs::uploader to which the GridFS file should be written.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream_with_id(bsoncxx::types::bson_value::view id,
+                                        stdx::string_view filename,
+                                        const options::gridfs::upload& options = {});
+
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload. The client session must
+    ///   remain valid for the lifetime of the uploader.
+    ///
+    /// @param id
+    ///   The unique id of the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The gridfs::uploader to which the GridFS file should be written.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream_with_id(const client_session& session,
+                                        bsoncxx::types::bson_value::view id,
+                                        stdx::string_view filename,
+                                        const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates a new GridFS file by uploading bytes from an input stream. The id of the file will
+    /// be automatically generated as an ObjectId.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The id of the uploaded file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    result::gridfs::upload upload_from_stream(stdx::string_view filename,
+                                              std::istream* source,
+                                              const options::gridfs::upload& options = {});
+
+    ///
+    /// Creates a new GridFS file by uploading bytes from an input stream. The id of the file will
+    /// be automatically generated as an ObjectId.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The id of the uploaded file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    result::gridfs::upload upload_from_stream(const client_session& session,
+                                              stdx::string_view filename,
+                                              std::istream* source,
+                                              const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates a new GridFS file with a user-supplied unique id by uploading bytes from an input
+    /// stream.
+    ///
+    /// @param id
+    ///   A unique id for the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    void upload_from_stream_with_id(bsoncxx::types::bson_value::view id,
+                                    stdx::string_view filename,
+                                    std::istream* source,
+                                    const options::gridfs::upload& options = {});
+
+    ///
+    /// Creates a new GridFS file with a user-supplied unique id by uploading bytes from an input
+    /// stream.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload.
+    ///
+    /// @param id
+    ///   A unique id for the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    void upload_from_stream_with_id(const client_session& session,
+                                    bsoncxx::types::bson_value::view id,
+                                    stdx::string_view filename,
+                                    std::istream* source,
+                                    const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Opens a gridfs::downloader to read a GridFS file.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @return
+    ///   The gridfs::downloader from which the GridFS file should be read.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    downloader open_download_stream(bsoncxx::types::bson_value::view id);
+
+    ///
+    /// Opens a gridfs::downloader to read a GridFS file.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the download. The client session must
+    ///   remain valid for the lifetime of the downloader.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @return
+    ///   The gridfs::downloader from which the GridFS file should be read.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    downloader open_download_stream(const client_session& session,
+                                    bsoncxx::types::bson_value::view id);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Downloads the contents of a stored GridFS file from the bucket and writes it to a stream.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @param destination
+    ///   The non-null stream to which the GridFS file should be written.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files or chunks collections for this bucket.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if writing to `destination` fails.  In addition, if `destination::exceptions()` is set for
+    ///   `badbit`, any exception thrown during execution of `destination::write()` will be
+    ///   re-thrown.
+    ///
+    void download_to_stream(bsoncxx::types::bson_value::view id, std::ostream* destination);
+    void download_to_stream(bsoncxx::types::bson_value::view id,
+                            std::ostream* destination,
+                            std::size_t start,
+                            std::size_t end);
+
+    ///
+    /// Downloads the contents of a stored GridFS file from the bucket and writes it to a stream.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the download.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @param destination
+    ///   The non-null stream to which the GridFS file should be written.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files or chunks collections for this bucket.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if writing to `destination` fails.  In addition, if `destination::exceptions()` is set for
+    ///   `badbit`, any exception thrown during execution of `destination::write()` will be
+    ///   re-thrown.
+    ///
+    void download_to_stream(const client_session& session,
+                            bsoncxx::types::bson_value::view id,
+                            std::ostream* destination);
+    void download_to_stream(const client_session& session,
+                            bsoncxx::types::bson_value::view id,
+                            std::ostream* destination,
+                            std::size_t start,
+                            std::size_t end);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Deletes a GridFS file from the bucket.
+    ///
+    /// @param id
+    ///   The id of the file to be deleted.
+    ///
+    /// @throws mongocxx::gridfs_exception if the requested file does not exist.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when removing file data or chunk data from the database.
+    ///
+    void delete_file(bsoncxx::types::bson_value::view id);
+
+    ///
+    /// Deletes a GridFS file from the bucket.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the delete.
+    ///
+    /// @param id
+    ///   The id of the file to be deleted.
+    ///
+    /// @throws mongocxx::gridfs_exception if the requested file does not exist.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when removing file data or chunk data from the database.
+    ///
+    void delete_file(const client_session& session, bsoncxx::types::bson_value::view id);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds the documents in the files collection of the bucket which match the provided filter.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::find.
+    ///
+    /// @return
+    ///   A mongocxx::cursor with the results. If the query fails, the cursor throws
+    ///   mongocxx::query_exception when the returned cursor is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see mongocxx::collection::find.
+    ///
+    cursor find(bsoncxx::document::view_or_value filter, const options::find& options = {});
+
+    ///
+    /// Finds the documents in the files collection of the bucket which match the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the query. The client session must
+    ///   remain valid for the lifetime of the cursor.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::find.
+    ///
+    /// @return
+    ///   A mongocxx::cursor with the results. If the query fails, the cursor throws
+    ///   mongocxx::query_exception when the returned cursor is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see mongocxx::collection::find.
+    ///
+    cursor find(const client_session& session,
+                bsoncxx::document::view_or_value filter,
+                const options::find& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Gets the name of the GridFS bucket.
+    ///
+    /// @return
+    ///   The name of the GridFS bucket.
+    ///
+    stdx::string_view bucket_name() const;
+
+   private:
+    friend class mongocxx::database;
+
+    // Constructs a new GridFS bucket.  Throws if options are invalid.
+    MONGOCXX_PRIVATE bucket(const database& db, const options::gridfs::bucket& options);
+
+    MONGOCXX_PRIVATE void create_indexes_if_nonexistent(const client_session* session);
+
+    MONGOCXX_PRIVATE uploader _open_upload_stream_with_id(const client_session* session,
+                                                          bsoncxx::types::bson_value::view id,
+                                                          stdx::string_view filename,
+                                                          const options::gridfs::upload& options);
+
+    MONGOCXX_PRIVATE void _upload_from_stream_with_id(const client_session* session,
+                                                      bsoncxx::types::bson_value::view id,
+                                                      stdx::string_view filename,
+                                                      std::istream* source,
+                                                      const options::gridfs::upload& options);
+
+    MONGOCXX_PRIVATE downloader _open_download_stream(const client_session* session,
+                                                      bsoncxx::types::bson_value::view id,
+                                                      stdx::optional<std::size_t> start,
+                                                      stdx::optional<std::size_t> end);
+
+    MONGOCXX_PRIVATE void _download_to_stream(const client_session* session,
+                                              bsoncxx::types::bson_value::view id,
+                                              std::ostream* destination,
+                                              stdx::optional<std::size_t> start,
+                                              stdx::optional<std::size_t> end);
+
+    MONGOCXX_PRIVATE void _delete_file(const client_session* session,
+                                       bsoncxx::types::bson_value::view id);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace gridfs
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp
new file mode 100644
index 0000000..1d49692
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp
@@ -0,0 +1,169 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace gridfs {
+
+struct chunks_and_bytes_offset {
+    std::int32_t chunks_offset = 0;
+    std::int32_t bytes_offset = 0;
+};
+
+///
+/// Class used to download a GridFS file.
+///
+class MONGOCXX_API downloader {
+   public:
+    ///
+    /// Default constructs a downloader object. The downloader is equivalent to the state of a moved
+    /// from downloader. The only valid actions to take with a default constructed downloader are to
+    /// assign to it, or destroy it.
+    ///
+    downloader() noexcept;
+
+    ///
+    /// Move constructs a downloader.
+    ///
+    downloader(downloader&&) noexcept;
+
+    ///
+    /// Move assigns a downloader.
+    ///
+    downloader& operator=(downloader&&) noexcept;
+
+    downloader(const downloader&) = delete;
+
+    downloader& operator=(const downloader&) = delete;
+
+    ///
+    /// Destroys a downloader.
+    ///
+    ~downloader();
+
+    ///
+    /// Returns true if the downloader is valid, meaning it was not default constructed or moved
+    /// from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// Reads a specified number of bytes from the GridFS file being downloaded.
+    ///
+    /// @param buffer
+    ///   A pointer to a buffer to store the bytes read from the file.
+    ///
+    /// @param length
+    ///   The number of bytes to read from the file.
+    ///
+    /// @return
+    ///   The number of bytes actually read. If zero, the downloader has reached the end of the
+    ///   file.
+    ///
+    /// @throws mongocxx::logic_error if the download stream was already closed.
+    ///
+    /// @throws mongocxx::gridfs_exception if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading chunk data from the database for the requested file.
+    ///
+    std::size_t read(std::uint8_t* buffer, std::size_t length);
+
+    ///
+    /// Closes the downloader stream.
+    ///
+    /// @throws mongocxx::logic_error if the download stream was already closed.
+    ///
+    void close();
+
+    ///
+    /// Gets the chunk size of the file being downloaded.
+    ///
+    /// @return
+    ///   The chunk size in bytes.
+    ///
+    std::int32_t chunk_size() const;
+
+    ///
+    /// Gets the length of the file being downloaded.
+    ///
+    /// @return
+    ///   The length in bytes.
+    ///
+    std::int64_t file_length() const;
+
+    ///
+    /// Gets the files collection document of the file being downloaded.
+    ///
+    /// @return
+    ///    A view to the files collection document of the file being downloaded.
+    ///
+    bsoncxx::document::view files_document() const;
+
+   private:
+    friend class bucket;
+
+    //
+    // Constructs a new downloader stream.
+    //
+    // @param chunks
+    //   The cursor to read the chunks of the file from. It must have a value if the length of the
+    //   file is non-zero.
+    //
+    // @param start
+    //   The offset from which to start reading the chunks of the file.
+    //
+    // @param chunk_size
+    //   The expected size of a chunk in bytes.
+    //
+    // @param file_len
+    //   The expected size of the file in bytes.
+    //
+    // @param files_doc
+    //   The files collection document of the file being downloaded.
+    //
+    MONGOCXX_PRIVATE downloader(stdx::optional<cursor> chunks,
+                                chunks_and_bytes_offset start,
+                                std::int32_t chunk_size,
+                                std::int64_t file_len,
+                                bsoncxx::document::value files_doc);
+
+    MONGOCXX_PRIVATE void fetch_chunk();
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace gridfs
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp
new file mode 100644
index 0000000..1a1bce3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp
@@ -0,0 +1,170 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/collection.hpp>
+#include <mongocxx/result/gridfs/upload.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace gridfs {
+
+///
+/// Class used to upload a GridFS file.
+///
+class MONGOCXX_API uploader {
+   public:
+    ///
+    /// Default constructs an uploader object. The uploader is equivalent to the state of a moved
+    /// from uploader. The only valid actions to take with a default constructed uploader are to
+    /// assign to it, or destroy it.
+    ///
+    uploader() noexcept;
+
+    ///
+    /// Move constructs an uploader.
+    ///
+    uploader(uploader&&) noexcept;
+
+    ///
+    /// Move assigns an uploader.
+    ///
+    uploader& operator=(uploader&&) noexcept;
+
+    uploader(const uploader&) = delete;
+
+    uploader& operator=(const uploader&) = delete;
+
+    ///
+    /// Destroys an uploader.
+    ///
+    ~uploader();
+
+    ///
+    /// Returns true if the uploader is valid, meaning it was not default constructed or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// Writes a specified number of bytes to a GridFS file.
+    ///
+    /// @param bytes
+    ///   A pointer to the bytes to write.
+    ///
+    /// @param length
+    ///   The number of bytes to write.
+    ///
+    /// @throws mongocxx::logic_error if the upload stream was already closed.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data to the database.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    void write(const std::uint8_t* bytes, std::size_t length);
+
+    ///
+    /// Closes the uploader stream.
+    ///
+    /// @throws mongocxx::logic_error if the upload stream was already closed.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    result::gridfs::upload close();
+
+    ///
+    /// Aborts uploading the file.
+    ///
+    /// @throws mongocxx::logic_error if the upload stream was already closed.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when removing chunk data from the database.
+    ///
+    void abort();
+
+    ///
+    /// Gets the chunk size of the file being uploaded.
+    ///
+    /// @return
+    ///   The chunk size in bytes.
+    ///
+    std::int32_t chunk_size() const;
+
+   private:
+    friend class bucket;
+
+    //
+    // Constructs a new uploader stream.
+    //
+    // @param session
+    //   The client session to use for upload operations.
+    //
+    // @param id
+    //   The id of the GridFS file being uploaded.
+    //
+    // @param files
+    //   The files collection of the bucket receiving the file.
+    //
+    // @param chunks
+    //   The chunks collection of the bucket receiving the file.
+    //
+    // @param chunk_size
+    //   The size in bytes of the chunks being uploaded.
+    //
+    // @param metadata
+    //   Optional metadata field of the files collection document.
+    //
+    MONGOCXX_PRIVATE uploader(const client_session* session,
+                              bsoncxx::types::bson_value::view id,
+                              stdx::string_view filename,
+                              collection files,
+                              collection chunks,
+                              std::int32_t chunk_size,
+                              stdx::optional<bsoncxx::document::view_or_value> metadata = {});
+
+    MONGOCXX_PRIVATE void finish_chunk();
+    MONGOCXX_PRIVATE void flush_chunks();
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace gridfs
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/hint.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/hint.hpp
new file mode 100644
index 0000000..81785e8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/hint.hpp
@@ -0,0 +1,147 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a hint to be passed to a database operation.
+///
+class MONGOCXX_API hint {
+   public:
+    ///
+    /// Constructs a new hint.
+    ///
+    /// Note: this constructor is purposefully not explicit, to allow conversion
+    /// from either document::view or document::value to view_or_value.
+    ///
+    /// @param index
+    ///   Document view or value representing the index to be used.
+    ///
+    hint(bsoncxx::document::view_or_value index);
+
+    ///
+    /// Constructs a new hint.
+    ///
+    /// @param index
+    ///   String representing the name of the index to be used.
+    ///
+    explicit hint(bsoncxx::string::view_or_value index);
+
+    ///
+    /// @{
+    ///
+    /// Compare this hint to a string for (in)-equality
+    ///
+    /// @relates hint
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const hint& index_hint, std::string index);
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const hint& index_hint,
+                                                      bsoncxx::document::view index);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Returns a types::bson_value::view representing this hint.
+    ///
+    /// @return Hint, as a types::bson_value::view. The caller must ensure that the returned object
+    /// not outlive
+    /// the hint object that it was created from.
+    ///
+    bsoncxx::types::bson_value::view to_value() const;
+
+    ///
+    /// Returns a types::bson_value::view representing this hint.
+    ///
+    /// @return Hint, as a types::bson_value::view. The caller must ensure that the returned object
+    /// not outlive
+    /// the hint object that it was created from.
+    ///
+    MONGOCXX_INLINE operator bsoncxx::types::bson_value::view() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _index_doc;
+    stdx::optional<bsoncxx::string::view_or_value> _index_string;
+};
+
+///
+/// Convenience methods to compare for equality against an index name.
+///
+/// Return true if this hint contains an index name that matches.
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator==(std::string index, const hint& index_hint);
+
+///
+/// @{
+///
+/// Convenience methods to compare for inequality against an index name.
+///
+/// Return true if this hint contains an index name that matches.
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator!=(const hint& index_hint, std::string index);
+MONGOCXX_API bool MONGOCXX_CALL operator!=(std::string index, const hint& index_index);
+///
+/// @}
+///
+
+///
+/// Convenience methods to compare for equality against an index document.
+///
+/// Return true if this hint contains an index document that matches.
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator==(bsoncxx::document::view index, const hint& index_hint);
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against an index document.
+///
+/// Return true if this hint contains an index document that matches.
+///
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator!=(const hint& index_hint, bsoncxx::document::view index);
+MONGOCXX_API bool MONGOCXX_CALL operator!=(bsoncxx::document::view index, const hint& index_hint);
+///
+/// @}
+///
+
+MONGOCXX_INLINE hint::operator bsoncxx::types::bson_value::view() const {
+    return to_value();
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/index_model.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/index_model.hpp
new file mode 100644
index 0000000..59ba37a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/index_model.hpp
@@ -0,0 +1,79 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <mongocxx/options/index.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an index on a MongoDB server.
+///
+class MONGOCXX_API index_model {
+   public:
+    ///
+    /// Initializes a new index_model over a mongocxx::collection.
+    ///
+    index_model(const bsoncxx::document::view_or_value& keys,
+                const bsoncxx::document::view_or_value& options = {});
+
+    index_model() = delete;
+
+    ///
+    /// Move constructs an index_model.
+    ///
+    index_model(index_model&&) noexcept;
+
+    ///
+    /// Move assigns an index_model.
+    ///
+    index_model& operator=(index_model&&) noexcept;
+
+    ///
+    /// Copy constructs an index_model.
+    ///
+    index_model(const index_model&);
+
+    index_model& operator=(const index_model&) = delete;
+
+    ///
+    /// Destroys an index_model.
+    ///
+    ~index_model();
+
+    ///
+    /// Retrieves keys of an index_model.
+    ///
+    bsoncxx::document::view keys() const;
+
+    ///
+    /// Retrieves options of an index_model.
+    ///
+    bsoncxx::document::view options() const;
+
+   private:
+    bsoncxx::document::value _keys;
+    bsoncxx::document::value _options;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/index_view.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/index_view.hpp
new file mode 100644
index 0000000..7756ed1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/index_view.hpp
@@ -0,0 +1,438 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/index_model.hpp>
+#include <mongocxx/options/index_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a MongoDB index view.
+///
+class MONGOCXX_API index_view {
+   public:
+    index_view(index_view&&) noexcept;
+    index_view& operator=(index_view&&) noexcept;
+
+    ~index_view();
+
+    ///
+    /// @{
+    ///
+    /// Returns a cursor over all the indexes.
+    ///
+    cursor list();
+
+    ///
+    /// Returns a cursor over all the indexes.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the list operation.
+    ///
+    cursor list(const client_session& session);
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types.
+    /// @param index_options
+    ///    A document containing set of options that controls the creation of the index. See
+    ///    https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/
+    ///
+    stdx::optional<std::string> create_one(
+        const bsoncxx::document::view_or_value& keys,
+        const bsoncxx::document::view_or_value& index_options = {},
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types.
+    /// @param index_options
+    ///    A document containing set of options that controls the creation of the index. See
+    ///    https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/
+    ///
+    stdx::optional<std::string> create_one(
+        const client_session& session,
+        const bsoncxx::document::view_or_value& keys,
+        const bsoncxx::document::view_or_value& index_options = {},
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param index
+    ///    Index_model describing the index being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    stdx::optional<std::string> create_one(
+        const index_model& index, const options::index_view& options = options::index_view{});
+
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param index
+    ///    Index_model describing the index being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    stdx::optional<std::string> create_one(
+        const client_session& session,
+        const index_model& index,
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Adds a container of indexes to the collection.
+    ///
+    /// @param indexes
+    ///   std::vector containing index models describing the indexes being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    The result document sent back by the server as if the createIndexes command was run from
+    ///    the shell.
+    ///
+    /// @exception
+    ///     Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///     option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    bsoncxx::document::value create_many(
+        const std::vector<index_model>& indexes,
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// Adds a container of indexes to the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param indexes
+    ///   std::vector containing index models describing the indexes being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    The result document sent back by the server as if the createIndexes command was run from
+    ///    the shell.
+    ///
+    /// @exception
+    ///     Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///     option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    bsoncxx::document::value create_many(
+        const client_session& session,
+        const std::vector<index_model>& indexes,
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops a single index by name.
+    ///
+    /// @param name
+    ///    The name of the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(stdx::string_view name,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// Drops a single index by name.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param name
+    ///    The name of the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const client_session& session,
+                  stdx::string_view name,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Attempts to drop a single index from the collection given the keys and options.
+    ///
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types. If no name
+    ///    option is present in the options, a name based on the keys will be used.
+    /// @param index_options (optional)
+    ///    A document containing set of options used to create the index. Only the name field will
+    ///    be used from here, and if it is not included, a name based on they keys will be used.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const bsoncxx::document::view_or_value& keys,
+                  const bsoncxx::document::view_or_value& index_options = {},
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// Attempts to drop a single index from the collection given the keys and options.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types. If no name
+    ///    option is present in the options, a name based on the keys will be used.
+    /// @param index_options (optional)
+    ///    A document containing set of options used to create the index. Only the name field will
+    ///    be used from here, and if it is not included, a name based on they keys will be used.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const client_session& session,
+                  const bsoncxx::document::view_or_value& keys,
+                  const bsoncxx::document::view_or_value& index_options = {},
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Attempts to drop a single index from the collection given an index model.
+    ///
+    /// @param index
+    ///    An index model describing the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const index_model& index,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// Attempts to drop a single index from the collection given an index model.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param index
+    ///    An index model describing the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const client_session& session,
+                  const index_model& index,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops all indexes in the collection.
+    ///
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_all(const options::index_view& options = options::index_view{});
+
+    ///
+    /// Drops all indexes in the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_all(const client_session& session,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+   private:
+    friend class collection;
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE index_view(void* coll, void* client);
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+
+   private:
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/instance.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/instance.hpp
new file mode 100644
index 0000000..fc2d012
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/instance.hpp
@@ -0,0 +1,134 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class logger;
+
+///
+/// Class representing an instance of the MongoDB driver.
+///
+/// The constructor and destructor initialize and shut down the driver, respectively. Therefore, an
+/// instance must be created before using the driver and must remain alive until all other mongocxx
+/// objects are destroyed. After the instance destructor runs, the driver may not be used.
+///
+/// Exactly one instance must be created in a given program. Not constructing an instance or
+/// constructing more than one instance in a program are errors, even if the multiple instances have
+/// non-overlapping lifetimes.
+///
+/// The following is a correct example of using an instance in a program, as the instance is kept
+/// alive for as long as the driver is in use:
+///
+/// \code
+///
+/// #include <mongocxx/client.hpp>
+/// #include <mongocxx/instance.hpp>
+/// #include <mongocxx/uri.hpp>
+///
+/// int main() {
+///     mongocxx::instance inst{};
+///     mongocxx::client conn{mongocxx::uri{}};
+///     ...
+/// }
+///
+/// \endcode
+///
+/// An example of using instance incorrectly might look as follows:
+///
+/// \code
+///
+/// #include <mongocxx/client.hpp>
+/// #include <mongocxx/instance.hpp>
+/// #include <mongocxx/uri.hpp>
+///
+/// client get_client() {
+///     mongocxx::instance inst{};
+///     mongocxx::client conn{mongocxx::uri{}};
+///
+///     return client;
+/// } // ERROR! The instance is no longer alive after this function returns.
+///
+/// int main() {
+///     mongocxx::client conn = get_client();
+///     ...
+/// }
+///
+/// \endcode
+///
+/// For examples of more advanced usage of instance, see
+/// `examples/mongocxx/instance_management.cpp`.
+///
+class MONGOCXX_API instance {
+   public:
+    ///
+    /// Creates an instance of the driver.
+    ///
+    instance();
+
+    ///
+    /// Creates an instance of the driver with a user provided log handler.
+    ///  @param logger The logger that the driver will direct log messages to.
+    ///
+    /// @throws mongocxx::logic_error if an instance already exists.
+    ///
+    instance(std::unique_ptr<logger> logger);
+
+    ///
+    /// Move constructs an instance of the driver.
+    ///
+    instance(instance&&) noexcept;
+
+    ///
+    /// Move assigns an instance of the driver.
+    ///
+    instance& operator=(instance&&) noexcept;
+
+    ///
+    /// Destroys an instance of the driver.
+    ///
+    ~instance();
+
+    ///
+    /// Returns the current unique instance of the driver. If an instance was explicitly created,
+    /// that will be returned. If no instance has yet been created, a default instance will be
+    /// constructed and returned. If a default instance is constructed, its destruction will be
+    /// sequenced according to the rules for the destruction of static local variables at program
+    /// exit (see http://en.cppreference.com/w/cpp/utility/program/exit).
+    ///
+    /// Note that, if you need to configure the instance in any way (e.g. with a logger), you cannot
+    /// use this method to cause the instance to be constructed. You must explicitly create an
+    /// properly configured instance object. You can, however, use this method to obtain that
+    /// configured instance object.
+    ///
+    /// @note This method is intended primarily for test authors, where managing the lifetime of the
+    /// instance w.r.t. the test framework can be problematic.
+    ///
+    static instance& current();
+
+   private:
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/logger.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/logger.hpp
new file mode 100644
index 0000000..22b8fa3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/logger.hpp
@@ -0,0 +1,81 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// The log level of a message passed to a mongocxx::logger.
+///
+enum class log_level {
+    k_error,
+    k_critical,
+    k_warning,
+    k_message,
+    k_info,
+    k_debug,
+    k_trace,
+};
+
+///
+/// Returns a stringification of the given log level.
+///
+/// @param level
+///   The type to stringify.
+///
+/// @return a std::string representation of the type.
+///
+MONGOCXX_API stdx::string_view MONGOCXX_CALL to_string(log_level level);
+
+///
+/// The interface that all user-defined loggers must implement.
+///
+class MONGOCXX_API logger {
+   public:
+    virtual ~logger();
+
+    ///
+    /// Handles a log message. User defined logger implementations may do whatever they wish when
+    /// this is called, such as log the output to a file or send it to a remote server for analysis.
+    ///
+    /// @param level
+    ///   The log level of the current log message
+    /// @param domain
+    ///   The domain of the current log message, such as 'client'
+    /// @param message
+    ///   The text of the current log message.
+    virtual void operator()(log_level level,
+                            stdx::string_view domain,
+                            stdx::string_view message) noexcept = 0;
+
+   protected:
+    ///
+    /// Default constructor
+    ///
+    logger();
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp
new file mode 100644
index 0000000..f02fbb1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp
@@ -0,0 +1,106 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB delete operation that removes multiple documents.
+///
+class MONGOCXX_API delete_many {
+   public:
+    ///
+    /// Constructs a delete operation that will delete all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for deletion.
+    ///
+    explicit delete_many(bsoncxx::document::view_or_value filter);
+
+    ///
+    /// Gets the filter for this delete operation.
+    ///
+    /// @return The filter to be used for the delete operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Sets the collation for this delete operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    delete_many& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this delete operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_many& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp
new file mode 100644
index 0000000..8147d33
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp
@@ -0,0 +1,103 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB delete operation that removes a single document.
+///
+class MONGOCXX_API delete_one {
+   public:
+    ///
+    /// Constructs a delete operation that will delete the first document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for deletion.
+    ///
+    delete_one(bsoncxx::document::view_or_value filter);
+
+    ///
+    /// Gets the filter on this delete operation.
+    ///
+    /// @return The filter to be used for the delete operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Sets the collation for this delete operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    delete_one& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this delete operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_one& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp
new file mode 100644
index 0000000..3fd4aa3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp
@@ -0,0 +1,53 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB insert operation that creates a single document.
+///
+class MONGOCXX_API insert_one {
+   public:
+    ///
+    /// Constructs an insert operation that will create a single document.
+    ///
+    /// @param document
+    ///   The document to insert.
+    ///
+    insert_one(bsoncxx::document::view_or_value document);
+
+    ///
+    /// Gets the document to be inserted.
+    ///
+    /// @return The document to be inserted.
+    ///
+    const bsoncxx::document::view_or_value& document() const;
+
+   private:
+    bsoncxx::document::view_or_value _document;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp
new file mode 100644
index 0000000..da31042
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp
@@ -0,0 +1,137 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB update operation that replaces a single document.
+///
+class MONGOCXX_API replace_one {
+   public:
+    ///
+    /// Constructs an update operation that will replace a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for replacement.
+    /// @param replacement
+    ///   Document that will serve as the replacement.
+    ///
+    replace_one(bsoncxx::document::view_or_value filter,
+                bsoncxx::document::view_or_value replacement);
+
+    ///
+    /// Gets the filter for replacement.
+    ///
+    /// @return The filter to be used for the replacement operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Gets the replacement document.
+    ///
+    /// @return The document that will replace the original selected document.
+    ///
+    const bsoncxx::document::view_or_value& replacement() const;
+
+    ///
+    /// Sets the collation for this replacement operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    replace_one& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this replacement operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// When upsert is @c true, this operation will insert the replacement document as a new
+    /// document if no existing documents match the filter. When upsert is @c false, the
+    /// replacement operation does nothing if there are no matching documents. By default,
+    /// upsert is @c false.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    replace_one& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace_one& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+    bsoncxx::document::view_or_value _replacement;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp
new file mode 100644
index 0000000..4d8dec2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp
@@ -0,0 +1,202 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/pipeline.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace model {
+
+///
+/// Class representing a MongoDB update operation that modifies multiple documents.
+///
+class MONGOCXX_API update_many {
+    //
+    // Utility class supporting the convenience of {} meaning an empty bsoncxx::document.
+    //
+    // Users may not use this class directly.
+    //
+    // In places where driver methods take this class as a parameter, passing {} will
+    // translate to a default-constructed bsoncxx::document::view_or_value,
+    // regardless of other overloads taking other default-constructible types
+    // for that parameter. This class avoids compiler ambiguity with such overloads.
+    //
+    // See update_many() for an example of such overloads.
+    //
+    class _empty_doc_tag {
+        _empty_doc_tag() = default;
+    };
+
+   public:
+    ///
+    /// @{
+    ///
+    /// Constructs an update operation that will modify all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Document representing the modifications to be applied to matching documents.
+    ///
+    update_many(bsoncxx::document::view_or_value filter, bsoncxx::document::view_or_value update);
+
+    ///
+    /// Constructs an update operation that will modify all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Pipeline representing the modifications to be applied to matching documents.
+    ///
+    update_many(bsoncxx::document::view_or_value filter, const pipeline& update);
+
+    ///
+    /// Constructs an update operation that will modify all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Supports the empty update {}.
+    ///
+    update_many(bsoncxx::document::view_or_value filter,
+                std::initializer_list<_empty_doc_tag> update);
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Gets the filter.
+    ///
+    /// @return The filter to be used for the update operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Gets the update document.
+    ///
+    /// @return The modifications to be applied as part of the update.
+    ///
+    const bsoncxx::document::view_or_value& update() const;
+
+    ///
+    /// Sets the collation for this update operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    update_many& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this update operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update_many& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// When upsert is @c false, update does nothing when no documents match the filter.
+    /// However, by specifying upsert as @c true, this operation either updates matching documents
+    /// or inserts a new document using the update specification if no matching document exists.
+    /// By default, upsert is unset by the driver, and the server-side default, @c false, is used.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    update_many& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Set array filters for this update operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    update_many& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+    bsoncxx::document::view_or_value _update;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp
new file mode 100644
index 0000000..684a252
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp
@@ -0,0 +1,203 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/pipeline.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace model {
+
+///
+/// Class representing a MongoDB update operation that modifies a single document.
+///
+class MONGOCXX_API update_one {
+    //
+    // Utility class supporting the convenience of {} meaning an empty bsoncxx::document.
+    //
+    // Users may not use this class directly.
+    //
+    // In places where driver methods take this class as a parameter, passing {} will
+    // translate to a default-constructed bsoncxx::document::view_or_value,
+    // regardless of other overloads taking other default-constructible types
+    // for that parameter. This class avoids compiler ambiguity with such overloads.
+    //
+    // See update_one() for an example of such overloads.
+    //
+    class _empty_doc_tag {
+        _empty_doc_tag() = default;
+    };
+
+   public:
+    ///
+    /// @{
+    ///
+    /// Constructs an update operation that will modify a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Document representing the modifications to be applied to the matching document.
+    ///
+    update_one(bsoncxx::document::view_or_value filter, bsoncxx::document::view_or_value update);
+
+    ///
+    /// Constructs an update operation that will modify a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Pipeline representing the modifications to be applied to the matching document.
+    ///
+    update_one(bsoncxx::document::view_or_value filter, const pipeline& update);
+
+    ///
+    /// Constructs an update operation that will modify a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Supports the empty update {}.
+    ///
+    update_one(bsoncxx::document::view_or_value filter,
+               std::initializer_list<_empty_doc_tag> update);
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Gets the filter
+    ///
+    /// @return The filter to be used for the update operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Gets the update document.
+    ///
+    /// @return The modifications to be applied as part of the update.
+    ///
+    const bsoncxx::document::view_or_value& update() const;
+
+    ///
+    /// Sets the collation for this update operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    update_one& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this update operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update_one& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// When upsert is @c false, if no document matches the filter, update does nothing.
+    /// However, by specifying upsert as @c true, this operation either updates a matching document
+    /// or inserts a new document using the update specification if no matching document exists.
+    /// By default upsert is @c false.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    update_one& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Set array filters for this update operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    update_one& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+    bsoncxx::document::view_or_value _update;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/write.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/write.hpp
new file mode 100644
index 0000000..7fc9c93
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/model/write.hpp
@@ -0,0 +1,154 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/model/delete_many.hpp>
+#include <mongocxx/model/delete_one.hpp>
+#include <mongocxx/model/insert_one.hpp>
+#include <mongocxx/model/replace_one.hpp>
+#include <mongocxx/model/update_many.hpp>
+#include <mongocxx/model/update_one.hpp>
+#include <mongocxx/write_type.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Models a single write operation within a mongocxx::bulk_write.
+///
+class MONGOCXX_API write {
+   public:
+    ///
+    /// Constructs a write from a model::insert_one.
+    ///
+    write(insert_one value);
+
+    ///
+    /// Constructs a write from a model::update_one.
+    ///
+    write(update_one value);
+
+    ///
+    /// Constructs a write from a model::update_many.
+    ///
+    write(update_many value);
+
+    ///
+    /// Constructs a write from a model::delete_one.
+    ///
+    write(delete_one value);
+
+    ///
+    /// Constructs a write from a model::delete_many.
+    ///
+    write(delete_many value);
+
+    ///
+    /// Constructs a write from a model::replace_one.
+    ///
+    write(replace_one value);
+
+    ///
+    /// Move constructs a write.
+    ///
+    write(write&& rhs) noexcept;
+
+    ///
+    /// Move assigns a write.
+    ///
+    write& operator=(write&& rhs) noexcept;
+
+    write(const write& rhs) = delete;
+    write& operator=(const write& rhs) = delete;
+
+    ///
+    /// Destroys a write.
+    ///
+    ~write();
+
+    ///
+    /// Returns the current type of this write. You must call this
+    /// method before calling any of the get methods below.
+    ///
+    write_type type() const;
+
+    ///
+    /// Accesses the write as a model::insert_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const insert_one& get_insert_one() const;
+
+    ///
+    /// Accesses the write as an model::update_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const update_one& get_update_one() const;
+
+    ///
+    /// Accesses the write as an model::update_many. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const update_many& get_update_many() const;
+
+    ///
+    /// Accesses the write as a model::delete_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const delete_one& get_delete_one() const;
+
+    ///
+    /// Accesses the write as a model::delete_many. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const delete_many& get_delete_many() const;
+
+    ///
+    /// Accesses the write as a model::replace_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const replace_one& get_replace_one() const;
+
+   private:
+    MONGOCXX_PRIVATE void destroy_member() noexcept;
+
+    write_type _type;
+
+    union {
+        insert_one _insert_one;
+        update_one _update_one;
+        update_many _update_many;
+        delete_one _delete_one;
+        delete_many _delete_many;
+        replace_one _replace_one;
+    };
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp
new file mode 100644
index 0000000..2e7c61d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp
@@ -0,0 +1,328 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/builder/basic/document.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB aggregation operation.
+///
+class MONGOCXX_API aggregate {
+   public:
+    ///
+    /// Enables writing to temporary files. When set to @c true, aggregation stages can write data
+    /// to the _tmp subdirectory in the dbPath directory. The server-side default is @c false.
+    ///
+    /// @param allow_disk_use
+    ///   Whether or not to allow disk use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& allow_disk_use(bool allow_disk_use);
+
+    ///
+    /// Retrieves the current allow_disk_use setting.
+    ///
+    /// @return Whether disk use is allowed.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bool>& allow_disk_use() const;
+
+    ///
+    /// Sets the number of documents to return per batch.
+    ///
+    /// @param batch_size
+    ///   The size of the batches to request.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& batch_size(std::int32_t batch_size);
+
+    ///
+    /// The current batch size setting.
+    ///
+    /// @return The current batch size.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::int32_t>& batch_size() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the variable mapping for this operation.
+    ///
+    /// @param let
+    ///   The new variable mapping.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Retrieves the current variable mapping for this operation.
+    ///
+    /// @return
+    ///   The current variable mapping.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& let() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run server-side in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return
+    ///   The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp the new read_preference
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+    ///
+    /// Sets whether the $out stage should bypass document validation.
+    ///
+    /// @param bypass_document_validation whether or not to bypass validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    aggregate& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current bypass_document_validation setting.
+    ///
+    /// @return the current bypass_document_validation setting
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    aggregate& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Sets the write concern to use for this operation. Only has an effect if $out is a part of
+    /// the pipeline.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @param write_concern
+    ///   Object representing the write_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    aggregate& write_concern(class write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern, if it is set.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Sets the read concern to use for this operation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @param read_concern
+    ///   Object representing the read_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    aggregate& read_concern(class read_concern read_concern);
+
+    ///
+    /// Gets the current read concern.
+    ///
+    /// @return
+    ///   The current read concern, if it is set.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class read_concern>& read_concern() const;
+
+    ///
+    /// Sets the comment to use for this operation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @param comment
+    ///   Object representing the comment.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    aggregate& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current comment.
+    ///
+    /// @return
+    ///   The current comment, if it is set.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+   private:
+    friend class ::mongocxx::database;
+    friend class ::mongocxx::collection;
+
+    void append(bsoncxx::builder::basic::document& builder) const;
+
+    stdx::optional<bool> _allow_disk_use;
+    stdx::optional<std::int32_t> _batch_size;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<class read_preference> _read_preference;
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<class read_concern> _read_concern;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/apm.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/apm.hpp
new file mode 100644
index 0000000..eacfb17
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/apm.hpp
@@ -0,0 +1,330 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+
+#include <mongocxx/events/command_failed_event.hpp>
+#include <mongocxx/events/command_started_event.hpp>
+#include <mongocxx/events/command_succeeded_event.hpp>
+#include <mongocxx/events/heartbeat_failed_event.hpp>
+#include <mongocxx/events/heartbeat_started_event.hpp>
+#include <mongocxx/events/heartbeat_succeeded_event.hpp>
+#include <mongocxx/events/server_changed_event.hpp>
+#include <mongocxx/events/server_closed_event.hpp>
+#include <mongocxx/events/server_opening_event.hpp>
+#include <mongocxx/events/topology_changed_event.hpp>
+#include <mongocxx/events/topology_closed_event.hpp>
+#include <mongocxx/events/topology_opening_event.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing MongoDB application performance monitoring.
+///
+class MONGOCXX_API apm {
+   public:
+    ///
+    /// Set the command started monitoring callback. The callback takes a reference to a
+    /// command_started_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param command_started
+    ///   The command started monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_command_started(
+        std::function<void(const mongocxx::events::command_started_event&)> command_started);
+
+    ///
+    /// Retrieves the command started monitoring callback.
+    ///
+    /// @return The command started monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::command_started_event&)>& command_started()
+        const;
+
+    ///
+    /// Set the command failed monitoring callback. The callback takes a reference to a
+    /// command_failed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param command_failed
+    ///   The command failed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_command_failed(
+        std::function<void(const mongocxx::events::command_failed_event&)> command_failed);
+
+    ///
+    /// Retrieves the command failed monitoring callback.
+    ///
+    /// @return The command failed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::command_failed_event&)>& command_failed()
+        const;
+
+    ///
+    /// Set the command succeeded monitoring callback. The callback takes a reference to a
+    /// command_succeeded_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param command_succeeded
+    ///   The command succeeded monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_command_succeeded(
+        std::function<void(const mongocxx::events::command_succeeded_event&)> command_succeeded);
+
+    ///
+    /// Retrieves the command succeeded monitoring callback.
+    ///
+    /// @return The command succeeded monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::command_succeeded_event&)>& command_succeeded()
+        const;
+
+    ///
+    /// Set the server opening monitoring callback. The callback takes a reference to a
+    /// server_opening_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param server_opening
+    ///   The server opening monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_server_opening(
+        std::function<void(const mongocxx::events::server_opening_event&)> server_opening);
+
+    ///
+    /// Retrieves the server opening monitoring callback.
+    ///
+    /// @return The server opening monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::server_opening_event&)>& server_opening()
+        const;
+
+    ///
+    /// Set the server closed monitoring callback. The callback takes a reference to a
+    /// server_closed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param server_closed
+    ///   The server closed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_server_closed(
+        std::function<void(const mongocxx::events::server_closed_event&)> server_closed);
+
+    ///
+    /// Retrieves the server closed monitoring callback.
+    ///
+    /// @return The server closed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::server_closed_event&)>& server_closed() const;
+
+    ///
+    /// Set the server description changed monitoring callback. The callback takes a reference to a
+    /// server_changed_event which will only contain valid data for the duration of the
+    /// callback.
+    ///
+    /// @param server_changed
+    ///   The server description changed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_server_changed(
+        std::function<void(const mongocxx::events::server_changed_event&)> server_changed);
+
+    ///
+    /// Retrieves the server description changed monitoring callback.
+    ///
+    /// @return The server description changed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::server_changed_event&)>& server_changed()
+        const;
+
+    ///
+    /// Set the topology_opening monitoring callback. The callback takes a reference to a
+    /// topology_opening_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param topology_opening
+    ///   The topology_opening monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_topology_opening(
+        std::function<void(const mongocxx::events::topology_opening_event&)> topology_opening);
+
+    ///
+    /// Retrieves the topology_opening monitoring callback.
+    ///
+    /// @return The topology_opening monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::topology_opening_event&)>& topology_opening()
+        const;
+
+    ///
+    /// Set the topology closed monitoring callback. The callback takes a reference to a
+    /// topology_closed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param topology_closed
+    ///   The topology closed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_topology_closed(
+        std::function<void(const mongocxx::events::topology_closed_event&)> topology_closed);
+
+    ///
+    /// Retrieves the topology closed monitoring callback.
+    ///
+    /// @return The topology closed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::topology_closed_event&)>& topology_closed()
+        const;
+
+    ///
+    /// Set the topology description changed monitoring callback. The callback takes a reference to
+    /// a
+    /// topology_changed_event which will only contain valid data for the duration of
+    /// the callback.
+    ///
+    /// @param topology_changed
+    ///   The topology description changed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_topology_changed(
+        std::function<void(const mongocxx::events::topology_changed_event&)> topology_changed);
+
+    ///
+    /// Retrieves the topology description changed monitoring callback.
+    ///
+    /// @return The topology description changed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::topology_changed_event&)>& topology_changed()
+        const;
+
+    ///
+    /// Set the heartbeat started monitoring callback. The callback takes a reference to a
+    /// heartbeat_started_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param heartbeat_started
+    ///   The heartbeat started monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_heartbeat_started(
+        std::function<void(const mongocxx::events::heartbeat_started_event&)> heartbeat_started);
+
+    ///
+    /// Retrieves the heartbeat started monitoring callback.
+    ///
+    /// @return The heartbeat started monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::heartbeat_started_event&)>& heartbeat_started()
+        const;
+
+    ///
+    /// Set the heartbeat failed monitoring callback. The callback takes a reference to a
+    /// heartbeat_failed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param heartbeat_failed
+    ///   The heartbeat failed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_heartbeat_failed(
+        std::function<void(const mongocxx::events::heartbeat_failed_event&)> heartbeat_failed);
+
+    ///
+    /// Retrieves the heartbeat failed monitoring callback.
+    ///
+    /// @return The heartbeat failed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::heartbeat_failed_event&)>& heartbeat_failed()
+        const;
+
+    ///
+    /// Set the heartbeat succeeded monitoring callback. The callback takes a reference to a
+    /// heartbeat_succeeded_event which will only contain valid data for the duration of the
+    /// callback.
+    ///
+    /// @param heartbeat_succeeded
+    ///   The heartbeat succeeded monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_heartbeat_succeeded(
+        std::function<void(const mongocxx::events::heartbeat_succeeded_event&)>
+            heartbeat_succeeded);
+
+    ///
+    /// Retrieves the heartbeat succeeded monitoring callback.
+    ///
+    /// @return The heartbeat succeeded monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::heartbeat_succeeded_event&)>&
+    heartbeat_succeeded() const;
+
+   private:
+    std::function<void(const mongocxx::events::command_started_event&)> _command_started;
+    std::function<void(const mongocxx::events::command_failed_event&)> _command_failed;
+    std::function<void(const mongocxx::events::command_succeeded_event&)> _command_succeeded;
+    std::function<void(const mongocxx::events::server_closed_event&)> _server_closed;
+    std::function<void(const mongocxx::events::server_changed_event&)> _server_changed;
+    std::function<void(const mongocxx::events::server_opening_event&)> _server_opening;
+    std::function<void(const mongocxx::events::topology_closed_event&)> _topology_closed;
+    std::function<void(const mongocxx::events::topology_changed_event&)> _topology_changed;
+    std::function<void(const mongocxx::events::topology_opening_event&)> _topology_opening;
+    std::function<void(const mongocxx::events::heartbeat_started_event&)> _heartbeat_started;
+    std::function<void(const mongocxx::events::heartbeat_failed_event&)> _heartbeat_failed;
+    std::function<void(const mongocxx::events::heartbeat_succeeded_event&)> _heartbeat_succeeded;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp
new file mode 100644
index 0000000..ca516d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp
@@ -0,0 +1,312 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class pool;
+
+namespace options {
+
+///
+/// Class representing options for automatic client-side encryption.
+///
+class MONGOCXX_API auto_encryption {
+   public:
+    ///
+    /// Default constructs a new auto_encryption object.
+    ///
+    auto_encryption() noexcept;
+
+    ///
+    /// When the key vault collection is on a separate MongoDB cluster,
+    /// sets the optional client to use to route data key queries to
+    /// that cluster.
+    ///
+    /// The given key vault client MUST outlive any client that has
+    /// been enabled to use it through these options.
+    ///
+    /// @param client
+    ///   A client to use for routing queries to the key vault collection.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& key_vault_client(client* client);
+
+    ///
+    /// Gets the key vault client.
+    ///
+    /// @return
+    ///   An optional pointer to the key vault client.
+    ///
+    const stdx::optional<client*>& key_vault_client() const;
+
+    ///
+    /// When the key vault collection is on a separate MongoDB cluster,
+    /// sets the optional client pool to use to route data key queries to
+    /// that cluster.
+    ///
+    /// This option may not be used if a key_vault_client is set.
+    ///
+    /// The given key vault pool MUST outlive any pool that has
+    /// been enabled to use it through these options.
+    ///
+    /// May only be set when enabling automatic encryption on a pool.
+    ///
+    /// @param pool
+    ///   A pool to use for routing queries to the key vault collection.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& key_vault_pool(pool* pool);
+
+    ///
+    /// Gets the key vault pool.
+    ///
+    /// @return
+    ///   An optional pointer to the key vault pool.
+    ///
+    const stdx::optional<pool*>& key_vault_pool() const;
+
+    ///
+    /// Sets the namespace to use to access the key vault collection, which
+    /// contains all data keys used for encryption and decryption. This
+    /// option must be set:
+    ///
+    ///   auto_encryption.key_vault_namespace({ "db", "coll" });
+    ///
+    /// @param ns
+    ///   A std::pair of strings representing the db and collection to use
+    ///   to access the key vault.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    using ns_pair = std::pair<std::string, std::string>;
+    auto_encryption& key_vault_namespace(ns_pair ns);
+
+    ///
+    /// Gets the key vault namespace.
+    ///
+    /// @return
+    ///   An optional pair of strings representing the namespace of the
+    ///   key vault collection.
+    ///
+    const stdx::optional<ns_pair>& key_vault_namespace() const;
+
+    ///
+    /// Sets the KMS providers to use for client side encryption.
+    ///
+    /// Multiple KMS providers may be specified. The following KMS providers are
+    /// supported: "aws", "azure", "gcp", "kmip", and "local". The kmsProviders map values differ
+    /// by provider:
+    ///
+    ///    aws: {
+    ///      accessKeyId: String,
+    ///      secretAccessKey: String
+    ///    }
+    ///
+    ///    azure: {
+    ///       tenantId: String,
+    ///       clientId: String,
+    ///       clientSecret: String,
+    ///       identityPlatformEndpoint: Optional<String> // Defaults to login.microsoftonline.com
+    ///    }
+    ///
+    ///    gcp: {
+    ///       email: String,
+    ///       privateKey: byte[] or String, // May be passed as a base64 encoded string.
+    ///       endpoint: Optional<String> // Defaults to oauth2.googleapis.com
+    ///    }
+    ///
+    ///    kmip: {
+    ///       endpoint: String
+    ///    }
+    ///
+    ///    local: {
+    ///      key: byte[96] // The master key used to encrypt/decrypt data keys.
+    ///    }
+    ///
+    /// @param kms_providers
+    ///   A document containing the KMS providers.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& kms_providers(bsoncxx::document::view_or_value kms_providers);
+
+    ///
+    /// Gets the KMS providers.
+    ///
+    /// @return
+    ///   An optional document containing the KMS providers.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& kms_providers() const;
+
+    ///
+    /// Sets the TLS options to use for client side encryption with a given KMS provider.
+    ///
+    /// Multiple KMS providers may be specified. Supported KMS providers are "aws", "azure", "gcp",
+    /// and "kmip". The map value has the same form for all supported providers:
+    ///
+    ///    <KMS provider name>: {
+    ///        tlsCaFile: Optional<String>
+    ///        tlsCertificateKeyFile: Optional<String>
+    ///        tlsCertificateKeyFilePassword: Optional<String>
+    ///    }
+    ///
+    /// @param tls_opts
+    ///   A document containing the TLS options.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& tls_opts(bsoncxx::document::view_or_value tls_opts);
+
+    ///
+    /// Gets the TLS options.
+    ///
+    /// @return
+    ///   An optional document containing the TLS options.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& tls_opts() const;
+
+    ///
+    /// Sets a local JSON schema.
+    ///
+    /// Supplying a schemaMap provides more security than relying on
+    /// JSON schemas obtained from the server. It protects against a
+    /// malicious server advertising a false JSON Schema, which could
+    /// trick the client into sending unencrypted data that should be
+    /// encrypted.
+    ///
+    /// Schemas supplied in the schemaMap only apply to configuring
+    /// automatic encryption for client side encryption. Other validation
+    /// rules in the JSON schema will not be enforced by the driver and
+    /// will result in an error.
+    ///
+    /// @param schema_map
+    ///   The JSON schema to use.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& schema_map(bsoncxx::document::view_or_value schema_map);
+
+    ///
+    /// Gets the schema map.
+    ///
+    /// @return
+    ///   An optional document containing the schema map.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& schema_map() const;
+
+    ///
+    /// Automatic encryption is disabled when the 'bypassAutoEncryption'
+    /// option is true. Default is 'false,' so auto encryption is enabled.
+    ///
+    /// @param should_bypass
+    ///   Whether or not to bypass automatic encryption.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& bypass_auto_encryption(bool should_bypass);
+
+    ///
+    /// Gets a boolean specifying whether or not auto encryption is bypassed.
+    ///
+    /// @return
+    ///   A boolean specifying whether auto encryption is bypassed.
+    ///
+    bool bypass_auto_encryption() const;
+
+    ///
+    /// Set extra options related to the mongocryptd process. This options
+    /// document may include the following fields:
+    ///
+    /// - mongocryptdURI: string, defaults to "mongodb://localhost:27020".
+    ///
+    /// - mongocryptdBypassSpawn: bool, defaults to false.
+    ///
+    /// - mongocryptdSpawnPath: string, defaults to "" and spawns mongocryptd
+    ///   from the system path.
+    ///
+    /// - mongocryptdSpawnArgs: array[strings], options passed to mongocryptd
+    ///   when spawing. Defaults to ["--idleShutdownTimeoutSecs=60"].
+    ///
+    /// @param extra
+    ///   The extra options to set.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& extra_options(bsoncxx::document::view_or_value extra);
+
+    ///
+    /// Gets extra options related to the mongocryptd process.
+    ///
+    /// @return
+    ///   An optional document containing the extra options.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& extra_options() const;
+
+   private:
+    friend class mongocxx::client;
+    friend class mongocxx::pool;
+
+    MONGOCXX_PRIVATE void* convert() const;
+
+    bool _bypass;
+    stdx::optional<mongocxx::client*> _key_vault_client;
+    stdx::optional<mongocxx::pool*> _key_vault_pool;
+    stdx::optional<ns_pair> _key_vault_namespace;
+    stdx::optional<bsoncxx::document::view_or_value> _kms_providers;
+    stdx::optional<bsoncxx::document::view_or_value> _tls_opts;
+    stdx::optional<bsoncxx::document::view_or_value> _schema_map;
+    stdx::optional<bsoncxx::document::view_or_value> _extra_options;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp
new file mode 100644
index 0000000..01f803c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp
@@ -0,0 +1,160 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB bulk write
+///
+class MONGOCXX_API bulk_write {
+   public:
+    ///
+    /// Constructs a new bulk_write object. By default, bulk writes are considered ordered
+    /// as this is the only safe choice. If you want an unordered update, you must call
+    /// ordered(false) to switch to unordered mode.
+    ///
+    bulk_write();
+
+    ///
+    /// Sets whether the writes must be executed in order by the server.
+    ///
+    /// The server-side default is @c true.
+    ///
+    /// @param ordered
+    ///   If @c true all write operations will be executed serially in the order they were appended,
+    ///   and the entire bulk operation will abort on the first error. If @c false operations will
+    ///   be executed in arbitrary order (possibly in parallel on the server) and any errors will be
+    ///   reported after attempting all operations.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& ordered(bool ordered);
+
+    ///
+    /// Gets the current value of the ordered option.
+    ///
+    /// @return The value of the ordered option.
+    ///
+    bool ordered() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    bulk_write& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Set whether or not to bypass document validation for this operation.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current setting for bypassing document validation for this operation.
+    ///
+    /// @return
+    ///  The current document validation bypass setting.
+    ///
+    const stdx::optional<bool> bypass_document_validation() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    bool _ordered;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp
new file mode 100644
index 0000000..778b75a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp
@@ -0,0 +1,284 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <bsoncxx/types.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+
+namespace options {
+
+///
+/// Class representing MongoDB change stream options.
+///
+class MONGOCXX_API change_stream {
+   public:
+    change_stream();
+
+    ///
+    /// Sets the fullDocument option for the $changeStream.
+    ///
+    /// Allowed values: 'default', 'updateLookup', 'whenAvailable', 'required'.
+    ///
+    /// The default is to not send a value, which is equivalent to 'default'. By default, the change
+    /// notification for partial updates will include a delta describing the changes to the
+    /// document.
+    ///
+    /// When set to 'updateLookup', the change notification for partial updates will include both a
+    /// delta describing the changes to the document as well as a copy of the entire document that
+    /// was changed from some time after the change occurred.
+    ///
+    /// When set to 'whenAvailable', configures the change stream to return the post-image of the
+    /// modified document for replace and update change events if the post-image for this event is
+    /// available.
+    ///
+    /// When set to 'required', the same behavior as 'whenAvailable' except that an error is raised
+    /// if the post-image is not available.
+    ///
+    /// @param full_doc
+    ///   The fullDocument option to use on this stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& full_document(bsoncxx::string::view_or_value full_doc);
+
+    ///
+    /// Gets the current fullDocument option.
+    ///
+    /// @return
+    ///   The current fullDocument option.
+    ///
+    const bsoncxx::stdx::optional<bsoncxx::string::view_or_value>& full_document() const;
+
+    ///
+    /// Sets the fullDocumentBeforeChange option for the $changeStream.
+    ///
+    /// The allowed values are: 'whenAvailable', 'required', 'off'.
+    /// If none set, defaults to 'off'.
+    ///
+    /// When set to 'whenAvailable', configures the change stream to return the pre-image of the
+    /// modified document for replace, update, and delete change events if it is available.
+    ///
+    /// When set to 'required', the same behavior as 'whenAvailable' except that an error is raised
+    /// if the pre-image is not available.
+    ///
+    /// @param full_doc_before_change
+    ///   The fullDocumentBeforeChange option to use on this stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& full_document_before_change(
+        bsoncxx::string::view_or_value full_doc_before_change);
+
+    ///
+    /// Gets the current fullDocumentBeforeChange option.
+    ///
+    /// @return
+    ///   The current fullDocumentBeforeChange option.
+    ///
+    const bsoncxx::stdx::optional<bsoncxx::string::view_or_value>& full_document_before_change()
+        const;
+
+    ///
+    /// Sets the number of documents to return per batch.
+    ///
+    /// @param batch_size
+    ///   The size of the batches to request.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& batch_size(std::int32_t batch_size);
+
+    ///
+    /// The current batch size setting.
+    ///
+    /// @return
+    ///   The current batch size.
+    ///
+    const stdx::optional<std::int32_t>& batch_size() const;
+
+    ///
+    /// Sets the current value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///   The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Specifies the logical starting point for the new change stream.
+    ///
+    /// The value returned by calling change_stream::get_resume_token can be used here.
+    ///
+    /// start_after, resume_after, and start_at_operation_time are mutually exclusive options.
+    /// Setting more than one of these will result in a server error.
+    ///
+    /// @param resume_after
+    ///   The resumeToken to use when starting the change stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& resume_after(bsoncxx::document::view_or_value resume_after);
+
+    ///
+    /// Retrieves the current resumeToken for this change stream.
+    ///
+    /// @return
+    ///   The current resumeToken.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& resume_after() const;
+
+    ///
+    /// Specifies the logical starting point of the new change stream. The new stream will
+    /// return the first notification after the given token.
+    ///
+    /// The value returned by calling change_stream::get_resume_token can be used here.
+    ///
+    /// Unlike resumeAfter, this can resume notifications after an "invalidate" event.
+    ///
+    /// start_after, resume_after, and start_at_operation_time are mutually exclusive options.
+    /// Setting more than one of these will result in a server error.
+    ///
+    /// @param token
+    ///   The token representing the logical starting point of the change stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this function is being called.
+    ///
+    change_stream& start_after(bsoncxx::document::view_or_value token);
+
+    ///
+    /// Retrieves the current startAfter token for this change stream.
+    ///
+    /// @return
+    ///   The current startAfter token.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& start_after() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the maximum amount of time for for the server to wait on new documents to satisfy a
+    /// change stream query.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds) for the server to wait on new documents.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& max_await_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return
+    ///   The current max time (in milliseconds).
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_await_time() const;
+
+    ///
+    /// Specifies the logical starting point for the new change stream. Changes are returned at or
+    /// after the specified operation time.
+    ///
+    /// start_after, resume_after, and start_at_operation_time are mutually exclusive options.
+    /// Setting more than one of these will result in a server error.
+    ///
+    /// @param timestamp
+    ///   The starting operation time.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& start_at_operation_time(bsoncxx::types::b_timestamp timestamp);
+
+   private:
+    friend class ::mongocxx::client;
+    friend class ::mongocxx::collection;
+    friend class ::mongocxx::database;
+
+    bsoncxx::document::value as_bson() const;
+    stdx::optional<bsoncxx::string::view_or_value> _full_document;
+    stdx::optional<bsoncxx::string::view_or_value> _full_document_before_change;
+    stdx::optional<std::int32_t> _batch_size;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::document::view_or_value> _resume_after;
+    stdx::optional<bsoncxx::document::view_or_value> _start_after;
+    stdx::optional<std::chrono::milliseconds> _max_await_time;
+    // _start_at_operation_time is not wrapped in a stdx::optional because of a longstanding bug in
+    // the MNMLSTC polyfill that has been fixed on master, but not in the latest release:
+    // https://github.com/mnmlstc/core/pull/23
+    bsoncxx::types::b_timestamp _start_at_operation_time = {};
+    bool _start_at_operation_time_set = false;
+};
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client.hpp
new file mode 100644
index 0000000..9ef61d0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client.hpp
@@ -0,0 +1,152 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/apm.hpp>
+#include <mongocxx/options/auto_encryption.hpp>
+#include <mongocxx/options/server_api.hpp>
+#include <mongocxx/options/tls.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+// NOTE: client options interface still evolving
+
+///
+/// Class representing the optional arguments to a MongoDB driver client object.
+///
+class MONGOCXX_API client {
+   public:
+    ///
+    /// Sets the SSL-related options.
+    ///
+    /// @param ssl_opts
+    ///   The SSL-related options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This
+    ///   facilitates method chaining.
+    ///
+    /// @deprecated
+    ///   Please use tls_opts instead.
+    ///
+    MONGOCXX_DEPRECATED client& ssl_opts(tls ssl_opts);
+
+    ///
+    /// Sets the TLS-related options.
+    ///
+    /// @param tls_opts
+    ///   The TLS-related options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& tls_opts(tls tls_opts);
+
+    ///
+    /// The current SSL-related options.
+    ///
+    /// @return The SSL-related options.
+    ///
+    /// @deprecated Please use tls_opts instead.
+    ///
+    MONGOCXX_DEPRECATED const stdx::optional<tls>& ssl_opts() const;
+
+    ///
+    /// The current TLS-related options.
+    ///
+    /// @return The TLS-related options.
+    ///
+    const stdx::optional<tls>& tls_opts() const;
+
+    ///
+    /// Sets the automatic encryption options.
+    ///
+    /// @param auto_encryption_opts
+    ///   The options for automatic encryption.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& auto_encryption_opts(auto_encryption auto_encryption_opts);
+
+    ///
+    /// Gets the current automatic encryption options.
+    ///
+    /// @return
+    ///   The automatic encryption opts.
+    ///
+    const stdx::optional<auto_encryption>& auto_encryption_opts() const;
+
+    ///
+    /// Sets the APM-related options.
+    ///
+    /// @param apm_opts
+    ///   The APM-related options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& apm_opts(apm apm_opts);
+
+    ///
+    /// The current APM-related options.
+    ///
+    /// @return The APM-related options.
+    ///
+    const stdx::optional<apm>& apm_opts() const;
+
+    ///
+    /// Sets the server API options.
+    ///
+    /// @param server_api_opts
+    ///   The options for server API.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& server_api_opts(server_api server_api_opts);
+
+    ///
+    /// Gets the current server API options or returns a disengaged optional if there are no server
+    /// API options set.
+    ///
+    /// @return
+    ///   The server API options.
+    ///
+    const stdx::optional<server_api>& server_api_opts() const;
+
+   private:
+    stdx::optional<tls> _tls_opts;
+    stdx::optional<apm> _apm_opts;
+    stdx::optional<auto_encryption> _auto_encrypt_opts;
+    stdx::optional<server_api> _server_api_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp
new file mode 100644
index 0000000..bd8ada6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp
@@ -0,0 +1,185 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class client_encryption;
+
+namespace options {
+
+///
+/// Class representing options for the object managing explicit client-side encryption.
+///
+class MONGOCXX_API client_encryption {
+   public:
+    ///
+    /// When the key vault collection is on a separate MongoDB cluster,
+    /// sets the optional client to use to route data key queries to
+    /// that cluster.
+    ///
+    /// @param client
+    ///   A client to use for routing queries to the key vault collection.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    client_encryption& key_vault_client(mongocxx::client* client);
+
+    ///
+    /// Gets the key vault client.
+    ///
+    /// @return
+    ///   An optional pointer to the key vault client.
+    ///
+    const stdx::optional<mongocxx::client*>& key_vault_client() const;
+
+    ///
+    /// Sets the namespace to use to access the key vault collection, which
+    /// contains all data keys used for encryption and decryption. This
+    /// option must be set:
+    ///
+    ///   client_encryption.key_vault_namespace({ "db", "coll" });
+    ///
+    /// @param ns
+    ///   A std::pair of strings representing the db and collection to use
+    ///   to access the key vault.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    using ns_pair = std::pair<std::string, std::string>;
+    client_encryption& key_vault_namespace(ns_pair ns);
+
+    ///
+    /// Gets the key vault namespace.
+    ///
+    /// @return
+    ///   An optional pair of strings representing the namespace of the
+    ///   key vault collection.
+    ///
+    const stdx::optional<ns_pair>& key_vault_namespace() const;
+
+    ///
+    /// Sets the KMS providers to use for client side encryption.
+    ///
+    /// Multiple KMS providers may be specified. Supported KMS providers are
+    /// "aws", "azure", "gcp", "kmip", and "local". The kmsProviders map values differ
+    /// by provider:
+    ///
+    ///    aws: {
+    ///      accessKeyId: String,
+    ///      secretAccessKey: String
+    ///    }
+    ///
+    ///    azure: {
+    ///       tenantId: String,
+    ///       clientId: String,
+    ///       clientSecret: String,
+    ///       identityPlatformEndpoint: Optional<String> // Defaults to login.microsoftonline.com
+    ///    }
+    ///
+    ///    gcp: {
+    ///       email: String,
+    ///       privateKey: byte[] or String, // May be passed as a base64 encoded string.
+    ///       endpoint: Optional<String> // Defaults to oauth2.googleapis.com
+    ///    }
+    ///
+    ///    kmip: {
+    ///       endpoint: String
+    ///    }
+    ///
+    ///    local: {
+    ///      key: byte[96] // The master key used to encrypt/decrypt data keys.
+    ///    }
+    ///
+    /// @param kms_providers
+    ///   A document containing the KMS providers.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    client_encryption& kms_providers(bsoncxx::document::view_or_value kms_providers);
+
+    ///
+    /// Gets the KMS providers.
+    ///
+    /// @return
+    ///   An optional document containing the KMS providers.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& kms_providers() const;
+
+    ///
+    /// Sets the TLS options to use for client side encryption with a given KMS provider.
+    ///
+    /// Multiple KMS providers may be specified. Supported KMS providers are "aws", "azure", "gcp",
+    /// and "kmip". The map value has the same form for all supported providers:
+    ///
+    ///    <KMS provider name>: {
+    ///        tlsCaFile: Optional<String>
+    ///        tlsCertificateKeyFile: Optional<String>
+    ///        tlsCertificateKeyFilePassword: Optional<String>
+    ///    }
+    ///
+    /// @param tls_opts
+    ///   A document containing the TLS options.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    client_encryption& tls_opts(bsoncxx::document::view_or_value tls_opts);
+
+    ///
+    /// Gets the TLS options.
+    ///
+    /// @return
+    ///   An optional document containing the TLS options.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& tls_opts() const;
+
+   private:
+    friend class mongocxx::client_encryption;
+
+    MONGOCXX_PRIVATE void* convert() const;
+
+    stdx::optional<mongocxx::client*> _key_vault_client;
+    stdx::optional<ns_pair> _key_vault_namespace;
+    stdx::optional<bsoncxx::document::view_or_value> _kms_providers;
+    stdx::optional<bsoncxx::document::view_or_value> _tls_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp
new file mode 100644
index 0000000..8aff6c3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp
@@ -0,0 +1,112 @@
+// Copyright 2017-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to mongocxx::client::start_session.
+///
+class MONGOCXX_API client_session {
+   public:
+    ///
+    /// Sets the causal_consistency option.
+    ///
+    /// If true (the default), each operation in the session will be causally ordered after the
+    /// previous read or write operation. Set to false to disable causal consistency.
+    ///
+    /// Unacknowledged writes are not causally consistent. If you execute a write operation with an
+    /// unacknowledged write concern (a mongocxx::write_concern with
+    /// mongocxx::write_concern::acknowledge_level of @c k_unacknowledged), the write does not
+    /// participate in causal consistency.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/core/read-isolation-consistency-recency/#causal-consistency
+    ///
+    client_session& causal_consistency(bool causal_consistency) noexcept;
+
+    ///
+    /// Gets the value of the causal_consistency option.
+    ///
+    ///
+    bool causal_consistency() const noexcept;
+
+    ///
+    /// Sets the read concern "snapshot" (not enabled by default).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/reference/read-concern-snapshot/
+    ///
+    /// @note Snapshot reads and causal consistency are mutually exclusive: only one or the
+    /// other may be active at a time. Attempting to do so will result in an error being thrown
+    /// by mongocxx::client::start_session.
+    ///
+    client_session& snapshot(bool enable_snapshot_reads) noexcept;
+
+    ///
+    /// Gets the value of the snapshot_reads option.
+    ///
+    bool snapshot() const noexcept;
+
+    ///
+    /// Sets the default transaction options.
+    ///
+    /// @param default_transaction_opts
+    ///   The default transaction options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client_session& default_transaction_opts(transaction default_transaction_opts);
+
+    ///
+    /// Gets the current default transaction options.
+    ///
+    /// @return The default transaction options.
+    ///
+    const stdx::optional<transaction>& default_transaction_opts() const;
+
+   private:
+    // Allow the implementation of client_session to see these:
+    friend mongocxx::client_session;
+
+    stdx::optional<bool> _causal_consistency;
+    stdx::optional<bool> _enable_snapshot_reads;
+
+    stdx::optional<transaction> _default_transaction_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/count.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/count.hpp
new file mode 100644
index 0000000..6bb432f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/count.hpp
@@ -0,0 +1,215 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace options {
+
+///
+/// Class representing the optional arguments to mongocxx::collection::count_documents
+///
+class MONGOCXX_API count {
+   public:
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return The current comment option.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Sets the maximum number of documents to count.
+    ///
+    /// @param limit
+    ///  The max number of documents to count.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& limit(std::int64_t limit);
+
+    ///
+    /// Gets the current limit.
+    ///
+    /// @return The current limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::int64_t>& limit() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the number of documents to skip before counting documents.
+    ///
+    /// @param skip
+    ///   The number of documents to skip.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& skip(std::int64_t skip);
+
+    ///
+    /// Gets the current number of documents to skip.
+    ///
+    /// @return The number of documents to skip.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::int64_t>& skip() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<std::int64_t> _limit;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<std::int64_t> _skip;
+    stdx::optional<class read_preference> _read_preference;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp
new file mode 100644
index 0000000..8da3338
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp
@@ -0,0 +1,249 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/validation_criteria.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB createCollection command
+///
+/// This class is deprecated, as are the database class methods that use this class.
+/// Please use the new database::create_collection methods that take options as a
+/// BSON document.
+///
+class MONGOCXX_API create_collection_deprecated {
+   public:
+    ///
+    /// To create a capped collection, specify true.
+    ///
+    /// @note If you specify true, you must also set a maximum size using the size() method.
+    ///
+    /// @param capped
+    ///   Whether or not this collection will be capped.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/glossary/#term-capped-collection
+    ///
+    create_collection_deprecated& capped(bool capped);
+
+    ///
+    /// Gets the current capped setting.
+    ///
+    /// @return
+    ///   Whether or not this collection will be capped.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/glossary/#term-capped-collection
+    ///
+    const stdx::optional<bool>& capped() const;
+
+    ///
+    /// Sets the default collation for this collection.
+    ///
+    /// @param collation
+    ///   The default collation for the collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    create_collection_deprecated& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the default collation for this collection.
+    ///
+    /// @return
+    ///   The default collation for the collection.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// The maximum number of documents allowed in the capped collection.
+    ///
+    /// @note The size limit takes precedence over this limit. If a capped collection reaches
+    ///   the size limit before it reaches the maximum number of documents, MongoDB removes
+    ///   old documents.
+    ///
+    /// @param max_documents
+    ///   Maximum number of documents allowed in the collection (if capped).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& max(std::int64_t max_documents);
+
+    ///
+    /// Gets the current setting for the maximum number of documents allowed in the capped
+    /// collection.
+    ///
+    /// @return
+    ///   Maximum number of documents allowed in the collection (if capped).
+    ///
+    const stdx::optional<std::int64_t>& max() const;
+
+    ///
+    /// When true, disables the power of 2 sizes allocation for the collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param no_padding
+    ///   When true, disables power of 2 sizing for this collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& no_padding(bool no_padding);
+
+    ///
+    /// Gets the current value of the "no padding" option for the collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @return
+    ///   When true, power of 2 sizing is disabled for this collection.
+    ///
+    const stdx::optional<bool>& no_padding() const;
+
+    ///
+    /// A maximum size, in bytes, for a capped collection.
+    ///
+    /// @note Once a capped collection reaches its maximum size, MongoDB removes older
+    ///   documents to make space for new documents.
+    ///
+    /// @note Size is required for capped collections and ignored for other collections.
+    ///
+    /// @param max_size
+    ///   Maximum size, in bytes, of this collection (if capped).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& size(std::int64_t max_size);
+
+    ///
+    /// Gets the current size setting, for a capped collection.
+    ///
+    /// @return
+    ///   Maximum size, in bytes, of this collection (if capped).
+    ///
+    const stdx::optional<std::int64_t>& size() const;
+
+    ///
+    /// Specify configuration to the storage on a per-collection basis.
+    ///
+    /// @note This option is currently only available with the WiredTiger storage engine.
+    ///
+    /// @param storage_engine_opts
+    ///   Configuration options specific to the storage engine.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& storage_engine(
+        bsoncxx::document::view_or_value storage_engine_opts);
+
+    ///
+    /// Gets the current storage engine configuration for this collection.
+    ///
+    /// @return
+    ///   Configuration options specific to the storage engine.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& storage_engine() const;
+
+    ///
+    /// Specify validation criteria for this collection.
+    ///
+    /// @param validation
+    ///   Validation criteria for this collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/document-validation/
+    ///
+    create_collection_deprecated& validation_criteria(class validation_criteria validation);
+
+    ///
+    /// Gets the current validation criteria for this collection.
+    ///
+    /// @return
+    ///   Validation criteria for this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/document-validation/
+    ///
+    const stdx::optional<class validation_criteria>& validation_criteria() const;
+
+    ///
+    /// Return a bson document representing the options set on this object.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    /// @return Options, as a document.
+    ///
+    MONGOCXX_DEPRECATED bsoncxx::document::value to_document() const;
+    bsoncxx::document::value to_document_deprecated() const;
+
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    MONGOCXX_DEPRECATED MONGOCXX_INLINE operator bsoncxx::document::value() const;
+
+   private:
+    stdx::optional<bool> _capped;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<std::int64_t> _max_documents;
+    stdx::optional<std::int64_t> _max_size;
+    stdx::optional<bool> _no_padding;
+    stdx::optional<bsoncxx::document::view_or_value> _storage_engine_opts;
+    stdx::optional<class validation_criteria> _validation;
+};
+
+MONGOCXX_DEPRECATED typedef create_collection_deprecated create_collection;
+
+MONGOCXX_INLINE create_collection_deprecated::operator bsoncxx::document::value() const {
+    return to_document_deprecated();
+}
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp
new file mode 100644
index 0000000..530af29
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp
@@ -0,0 +1,135 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_encryption;
+
+namespace options {
+
+///
+/// Class representing options for data key generation for encryption.
+///
+class MONGOCXX_API data_key {
+   public:
+    ///
+    /// Sets a KMS-specific key used to encrypt the new data key.
+    ///
+    /// If the KMS provider is "aws" the masterKey is required and has the following fields:
+    ///
+    /// {
+    ///    region: String,
+    ///    key: String, // The Amazon Resource Name (ARN) to the AWS customer master key (CMK).
+    ///    endpoint: Optional<String> // An alternate host identifier to send KMS requests to. May
+    ///    include port number. Defaults to "kms.<region>.amazonaws.com"
+    /// }
+    ///
+    /// If the KMS provider is "azure" the masterKey is required and has the following fields:
+    ///
+    /// {
+    ///    keyVaultEndpoint: String, // Host with optional port. Example: "example.vault.azure.net".
+    ///    keyName: String,
+    ///    keyVersion: Optional<String> // A specific version of the named key, defaults to using
+    ///    the key's primary version.
+    /// }
+    ///
+    /// If the KMS provider is "gcp" the masterKey is required and has the following fields:
+    ///
+    /// {
+    ///    projectId: String,
+    ///    location: String,
+    ///    keyRing: String,
+    ///    keyName: String,
+    ///    keyVersion: Optional<String>, // A specific version of the named key, defaults to using
+    ///    the key's primary version.
+    ///    endpoint: Optional<String> // Host with optional port. Defaults to
+    ///    "cloudkms.googleapis.com".
+    /// }
+    ///
+    /// If the KMS provider is "kmip" the masterKey is required and has the following fields:
+    ///
+    /// {
+    //     keyId: Optional<String>, // keyId is the KMIP Unique Identifier to a 96 byte KMIP Secret
+    //                              // Data managed object.If keyId is omitted, the driver creates a
+    //                              // random 96 byte KMIP Secret Data managed object.
+    //     endpoint: Optional<String> // Host with optional port.
+    /// }
+    ///
+    /// If the KMS provider is "local" the masterKey is not applicable.
+    ///
+    /// @param master_key
+    ///   The document representing the master key.
+    ///
+    /// @return
+    ///   A reference to this object.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption-key-management/
+    ///
+    data_key& master_key(bsoncxx::document::view_or_value master_key);
+
+    ///
+    /// Gets the master key.
+    ///
+    /// @return
+    ///   An optional document containing the master key.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& master_key() const;
+
+    ///
+    /// Sets an optional list of string alternate names used to reference the key.
+    /// If a key is created with alternate names, then encryption may refer to the
+    /// key by the unique alternate name instead of by _id.
+    ///
+    /// @param key_alt_names
+    ///   The alternate names for the key.
+    ///
+    /// @return
+    ///   A reference to this object.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/getClientEncryption/
+    ///
+    data_key& key_alt_names(std::vector<std::string> key_alt_names);
+
+    ///
+    /// Gets the alternate names for the data key.
+    ///
+    /// @return
+    ///   The alternate names for the data key.
+    ///
+    const std::vector<std::string>& key_alt_names() const;
+
+   private:
+    friend class mongocxx::client_encryption;
+    MONGOCXX_PRIVATE void* convert() const;
+
+    stdx::optional<bsoncxx::document::view_or_value> _master_key;
+    std::vector<std::string> _key_alt_names;
+};
+
+}  // namespace options
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/delete.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/delete.hpp
new file mode 100644
index 0000000..3418c09
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/delete.hpp
@@ -0,0 +1,159 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB delete operation
+///
+class MONGOCXX_API delete_options {
+   public:
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    delete_options& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    delete_options& write_concern(write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_options& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_options& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_options& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp
new file mode 100644
index 0000000..cac9920
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp
@@ -0,0 +1,141 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB distinct command.
+///
+class MONGOCXX_API distinct {
+   public:
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the comment for this operation.
+    ///
+    /// @param comment
+    ///   The new comment.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// The current comment for this operation.
+    ///
+    /// @return The current comment
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<class read_preference> _read_preference;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp
new file mode 100644
index 0000000..db61b41
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp
@@ -0,0 +1,132 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_encryption;
+
+namespace options {
+
+///
+/// Class representing options for explicit client-side encryption.
+///
+class MONGOCXX_API encrypt {
+   public:
+    ///
+    /// Sets the key to use for this encryption operation. A key id can be used instead
+    /// of a key alt name.
+    ///
+    /// If a non-owning bson_value::view is passed in as the key_id, the object that owns
+    /// key_id's memory must outlive this object.
+    ///
+    /// @param key_id
+    ///   The id of the key to use for encryption, as a bson_value containing a
+    ///   UUID (BSON binary subtype 4).
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    encrypt& key_id(bsoncxx::types::bson_value::view_or_value key_id);
+
+    ///
+    /// Sets a name by which to lookup a key from the key vault collection to use
+    /// for this encryption operation. A key alt name can be used instead of a key id.
+    ///
+    /// @param name
+    ///   The name of the key to use for encryption.
+    ///
+    /// @return
+    ///   A reference to this obejct to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/getClientEncryption/
+    ///
+    encrypt& key_alt_name(std::string name);
+
+    ///
+    /// Gets the current key alt name.
+    ///
+    /// @return
+    ///   An optional key name.
+    ///
+    const stdx::optional<std::string>& key_alt_name() const;
+
+    ///
+    /// Determines which AEAD_AES_256_CBC algorithm to use with HMAC_SHA_512 when
+    /// encrypting data.
+    ///
+    enum class encryption_algorithm : std::uint8_t {
+        ///
+        /// Use deterministic encryption.
+        ///
+        k_deterministic,
+
+        ///
+        /// Use randomized encryption.
+        ///
+        k_random
+    };
+
+    ///
+    /// Sets the algorithm to use for encryption.
+    ///
+    /// @param algorithm
+    ///   An algorithm, either deterministic or random, to use for encryption.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/core/security-client-side-encryption/#encryption-algorithms
+    ///
+    encrypt& algorithm(encryption_algorithm algorithm);
+
+    ///
+    /// Gets the current algorithm.
+    ///
+    /// @return
+    ///   An optional algorithm.
+    ///
+    const stdx::optional<encryption_algorithm>& algorithm() const;
+
+    ///
+    /// Gets the key_id.
+    ///
+    /// @return
+    ///   An optional owning bson_value containing the key_id.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& key_id() const;
+
+   private:
+    friend class mongocxx::client_encryption;
+    MONGOCXX_PRIVATE void* convert() const;
+
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _key_id;
+    stdx::optional<std::string> _key_alt_name;
+    stdx::optional<encryption_algorithm> _algorithm;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp
new file mode 100644
index 0000000..496fd1d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp
@@ -0,0 +1,114 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace options {
+
+///
+/// Class representing the optional arguments to mongocxx::collection::estimated_document_count
+///
+class MONGOCXX_API estimated_document_count {
+   public:
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    estimated_document_count& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    const bsoncxx::stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the comment for this operation.
+    ///
+    /// @param comment
+    ///   The new comment.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    estimated_document_count& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// The current comment for this operation.
+    ///
+    /// @return The current comment
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    const bsoncxx::stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    estimated_document_count& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    const bsoncxx::stdx::optional<class read_preference>& read_preference() const;
+
+   private:
+    bsoncxx::stdx::optional<std::chrono::milliseconds> _max_time;
+    bsoncxx::stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    bsoncxx::stdx::optional<class read_preference> _read_preference;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find.hpp
new file mode 100644
index 0000000..0323855
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find.hpp
@@ -0,0 +1,586 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB query.
+///
+class MONGOCXX_API find {
+   public:
+    ///
+    /// Enables writing to temporary files on the server. When set to true, the server
+    /// can write temporary data to disk while executing the find operation.
+    ///
+    /// This option is sent only if the caller explicitly provides a value. The default
+    /// is to not send a value.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @param allow_disk_use
+    ///   Whether to allow writing temporary files on the server.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& allow_disk_use(bool allow_disk_use);
+
+    ///
+    /// Gets the current setting for allowing disk use on the server.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @return Whether disk use on the server is allowed.
+    ///
+    const stdx::optional<bool>& allow_disk_use() const;
+
+    ///
+    /// Sets whether to allow partial results from a mongos if some shards are down (instead of
+    /// throwing an error).
+    ///
+    /// @param allow_partial
+    ///   Whether to allow partial results from mongos.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& allow_partial_results(bool allow_partial);
+
+    ///
+    /// Gets the current setting for allowing partial results from mongos.
+    ///
+    /// @return Whether partial results from mongos are allowed.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& allow_partial_results() const;
+
+    ///
+    /// Sets the number of documents to return per batch.
+    ///
+    /// @param batch_size
+    ///   The size of the batches to request.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& batch_size(std::int32_t batch_size);
+
+    ///
+    /// The current batch size setting.
+    ///
+    /// @return The current batch size.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::int32_t>& batch_size() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Attaches a comment to the query. If $comment also exists in the modifiers document then
+    /// the comment field overwrites $comment.
+    ///
+    /// @deprecated use comment_option instead.
+    ///
+    /// @param comment
+    ///   The comment to attach to this query.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& comment(bsoncxx::string::view_or_value comment);
+
+    ///
+    /// Gets the current comment attached to this query.
+    ///
+    /// @deprecated use comment_option instead.
+    ///
+    /// @return The comment attached to this query.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& comment() const;
+
+    ///
+    /// Indicates the type of cursor to use for this query.
+    ///
+    /// @param cursor_type
+    ///   The cursor type to set.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& cursor_type(cursor::type cursor_type);
+
+    ///
+    /// Gets the current cursor type.
+    ///
+    /// @return The current cursor type.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<cursor::type>& cursor_type() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @note Not to be confused with the $comment query modifier.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& comment_option(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @note Not to be confused with the $comment query modifier.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment_option() const;
+
+    ///
+    /// Sets maximum number of documents to return.
+    ///
+    /// @param limit
+    ///   The maximum number of documents to return.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& limit(std::int64_t limit);
+
+    ///
+    /// Gets the current limit.
+    ///
+    /// @return The current limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::int64_t>& limit() const;
+
+    ///
+    /// Gets the current exclusive upper bound for a specific index.
+    ///
+    /// @param max
+    ///   The exclusive upper bound for a specific index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& max(bsoncxx::document::view_or_value max);
+
+    ///
+    /// Sets the current exclusive upper bound for a specific index.
+    ///
+    /// @return The exclusive upper bound for a specific index.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& max() const;
+
+    ///
+    /// The maximum amount of time for the server to wait on new documents to satisfy a tailable
+    /// cursor query. This only applies to a TAILABLE_AWAIT cursor. When the cursor is not a
+    /// TAILABLE_AWAIT cursor, this option is ignored. The default on the server is to wait for one
+    /// second.
+    ///
+    /// @note On servers < 3.2, this option is ignored.
+    ///
+    /// @param max_await_time
+    ///   The max amount of time (in milliseconds) to wait for new documents.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& max_await_time(std::chrono::milliseconds max_await_time);
+
+    ///
+    /// The maximum amount of time for the server to wait on new documents to satisfy a tailable
+    /// cursor query.
+    ///
+    /// @return The current max await time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_await_time() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time_ms setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Gets the current inclusive lower bound for a specific index.
+    ///
+    /// @param min
+    ///   The inclusive lower bound for a specific index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& min(bsoncxx::document::view_or_value min);
+
+    ///
+    /// Sets the current inclusive lower bound for a specific index.
+    ///
+    /// @return The inclusive lower bound for a specific index.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& min() const;
+
+    ///
+    /// Sets the cursor flag to prevent cursor from timing out server-side due to a period of
+    /// inactivity.
+    ///
+    /// @param no_cursor_timeout
+    ///   When true prevents the cursor from timing out.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& no_cursor_timeout(bool no_cursor_timeout);
+
+    ///
+    /// Gets the current no_cursor_timeout setting.
+    ///
+    /// @return The current no_cursor_timeout setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& no_cursor_timeout() const;
+
+    ///
+    /// Sets a projection which limits the returned fields for all matching documents.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection set on this query.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return
+    ///   The current read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+    ///
+    /// Sets whether to return the index keys associated with the query results, instead of the
+    /// actual query results themselves.
+    ///
+    /// @param return_key
+    ///   Whether to return the index keys associated with the query results, instead of the actual
+    ///   query results themselves.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& return_key(bool return_key);
+
+    ///
+    /// Gets the current setting for returning the index keys associated with the query results,
+    /// instead of the actual query results themselves.
+    ///
+    /// @return
+    ///   Whether index keys associated with the query results are returned, instead of the actual
+    ///   query results themselves.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& return_key() const;
+
+    ///
+    /// Sets whether to include the record identifier for each document in the query results.
+    ///
+    /// @param show_record_id
+    ///   Whether to include the record identifier.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& show_record_id(bool show_record_id);
+
+    ///
+    /// Gets the current setting for whether the record identifier is returned for each document in
+    /// the query results.
+    ///
+    /// @return
+    ///   Whether the record identifier is included.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& show_record_id() const;
+
+    ///
+    /// Sets the number of documents to skip before returning results.
+    ///
+    /// @param skip
+    ///   The number of documents to skip.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& skip(std::int64_t skip);
+
+    ///
+    /// Gets the current number of documents to skip.
+    ///
+    /// @return The number of documents to skip.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::int64_t>& skip() const;
+
+    ///
+    /// The order in which to return matching documents. If $orderby also exists in the modifiers
+    /// document, the sort field takes precedence over $orderby.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering for this query.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+   private:
+    stdx::optional<bool> _allow_disk_use;
+    stdx::optional<bool> _allow_partial_results;
+    stdx::optional<std::int32_t> _batch_size;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::string::view_or_value> _comment;
+    stdx::optional<cursor::type> _cursor_type;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment_option;
+    stdx::optional<std::int64_t> _limit;
+    stdx::optional<bsoncxx::document::view_or_value> _max;
+    stdx::optional<std::chrono::milliseconds> _max_await_time;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _min;
+    stdx::optional<bool> _no_cursor_timeout;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<class read_preference> _read_preference;
+    stdx::optional<bool> _return_key;
+    stdx::optional<bool> _show_record_id;
+    stdx::optional<std::int64_t> _skip;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp
new file mode 100644
index 0000000..bc3c537
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp
@@ -0,0 +1,235 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB find_and_modify delete operation
+///
+class MONGOCXX_API find_one_and_delete {
+   public:
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of running time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return the current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets a projection that limits the fields to return.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection set on this operation.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Sets the order to search for a matching document.
+    ///
+    /// @warning This can influence which document the operation modifies if the provided filter
+    /// selects multiple documents.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_delete& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_delete& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_delete& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+    stdx::optional<mongocxx::write_concern> _write_concern;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp
new file mode 100644
index 0000000..889207a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp
@@ -0,0 +1,318 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/options/find_one_common_options.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB find_and_modify replace operation
+///
+class MONGOCXX_API find_one_and_replace {
+   public:
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Whether or not to bypass document validation for this operation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current setting for bypassing document validation.
+    ///
+    /// @return the current bypass document validation setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_replace& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_replace& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_replace& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return the current max allowed running time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets a projection, which limits the fields to return.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection for this operation.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Set the desired version of the replaced document to return, either the original
+    /// document, or the replacement. By default, the original document is returned.
+    ///
+    /// @param return_document
+    ///   Version of document to return, either original or replaced.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    find_one_and_replace& return_document(return_document return_document);
+
+    ///
+    /// Which version of the replaced document to return.
+    ///
+    /// @return Version of document to return, either original or replacement.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    const stdx::optional<mongocxx::options::return_document>& return_document() const;
+
+    ///
+    /// Sets the order by which to search the collection for a matching document.
+    ///
+    /// @warning This can influence which document the operation modifies if the provided filter
+    /// selects multiple documents.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+    ///
+    /// Sets the upsert flag on the operation. When @c true, the operation creates a new document if
+    /// no document matches the filter. When @c false, this operation will do nothing if there are
+    /// no matching documents. The server-side default is false.
+    ///
+    /// @param upsert
+    ///   Whether or not to perform an upsert.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& upsert(bool upsert);
+
+    ///
+    /// Gets the current upsert setting.
+    ///
+    /// @return The current upsert setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<mongocxx::options::return_document> _return_document;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+    stdx::optional<bool> _upsert;
+    stdx::optional<mongocxx::write_concern> _write_concern;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp
new file mode 100644
index 0000000..89f19d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp
@@ -0,0 +1,345 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/options/find_one_common_options.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB find_and_modify update operation.
+///
+class MONGOCXX_API find_one_and_update {
+   public:
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Whether or not to bypass document validation for this operation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current setting for bypassing document validation.
+    ///
+    /// @return the current bypass document validation setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_update& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_update& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_update& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return the current max allowed running time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets a projection, which limits the fields to return.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection for this operation.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Set the desired version of the updated document to return, either the original
+    /// document, or the updated. By default, the original document is returned.
+    ///
+    /// @param return_document
+    ///   Version of document to return, either original or updated.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    find_one_and_update& return_document(return_document return_document);
+
+    ///
+    /// Which version of the updated document to return.
+    ///
+    /// @return Version of document to return, either original or updated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    const stdx::optional<mongocxx::options::return_document>& return_document() const;
+
+    ///
+    /// Sets the order by which to search the collection for a matching document.
+    ///
+    /// @warning This can influence which document the operation modifies if the provided filter
+    /// selects multiple documents.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+    ///
+    /// Sets the upsert flag on the operation. When @c true, the operation creates a new document if
+    /// no document matches the filter. When @c false, this operation will do nothing if there are
+    /// no matching documents. The server-side default is false.
+    ///
+    /// @param upsert
+    ///   Whether or not to perform an upsert.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& upsert(bool upsert);
+
+    ///
+    /// Gets the current upsert setting.
+    ///
+    /// @return The current upsert setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+    ///
+    /// Set array filters for this operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<mongocxx::options::return_document> _return_document;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+    stdx::optional<bool> _upsert;
+    stdx::optional<mongocxx::write_concern> _write_concern;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp
new file mode 100644
index 0000000..482097c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp
@@ -0,0 +1,38 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Enum representing whether to return the old or new version of a document modified by a
+/// `findOneAndModify` operation.
+///
+enum class return_document {
+    /// Return the version of the document before the modification takes place.
+    k_before,
+    /// Return the version of the document after the modification takes place.
+    k_after,
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp
new file mode 100644
index 0000000..2e771c8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp
@@ -0,0 +1,160 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+namespace gridfs {
+
+///
+/// Class representing the optional arguments to a MongoDB GridFS bucket creation operation.
+///
+class MONGOCXX_API bucket {
+   public:
+    ///
+    /// Sets the name of the bucket. Defaults to 'fs'.
+    ///
+    /// @param bucket_name
+    ///   The name of the bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    bucket& bucket_name(std::string bucket_name);
+
+    ///
+    /// Gets the name of the bucket.
+    ///
+    /// @return
+    ///   The name of the bucket.
+    ///
+    const stdx::optional<std::string>& bucket_name() const;
+
+    ///
+    /// Sets the size of the chunks in the bucket. This will be used as the chunk size for files
+    /// uploaded through the bucket without a custom size specified. Defaults to 255KB (255 * 1024).
+    ///
+    /// @param chunk_size_bytes
+    ///   The size of the chunks in bytes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    bucket& chunk_size_bytes(std::int32_t chunk_size_bytes);
+
+    ///
+    /// Gets the size of the chunks in the bucket.
+    ///
+    /// @return
+    ///   The size of the chunks in the bucket in bytes.
+    ///
+    const stdx::optional<std::int32_t>& chunk_size_bytes() const;
+
+    ///
+    /// Sets the read concern to be used when reading from the bucket. Defaults to the read
+    /// concern of the database containing the bucket's collections.
+    ///
+    /// @param read_concern
+    ///   The read concern of the bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bucket& read_concern(class read_concern read_concern);
+
+    ///
+    /// Gets the read concern of the bucket.
+    ///
+    /// @return
+    ///   The read concern of the bucket.
+    ///
+    const stdx::optional<class read_concern>& read_concern() const;
+
+    ///
+    /// Sets the read preference to be used when reading from the GridFS bucket. Defaults to the
+    /// read preference of the database containing the bucket's collections.
+    ///
+    /// @note
+    ///   Because many GridFS operations require multiple independent reads from separate
+    ///   collections, use with secondaries is strongly discouraged because reads could go to
+    ///   different secondaries, resulting in inconsistent data if all file and chunk documents have
+    ///   not replicated to all secondaries.
+    ///
+    /// @param read_preference
+    ///   The read preference of the GridFS bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bucket& read_preference(class read_preference read_preference);
+
+    ///
+    /// Gets the read preference of the bucket.
+    ///
+    /// @return
+    ///   The read preference of the bucket.
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+    ///
+    /// Sets the write concern to be used when writing to the GridFS bucket. Defaults to the write
+    /// concern of the database containing the bucket's collections.
+    ///
+    /// @param write_concern
+    ///   The write concern of the GridFS bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bucket& write_concern(class write_concern write_concern);
+
+    ///
+    /// Gets the write concern of the bucket.
+    ///
+    /// @return
+    ///   The write concern of the bucket.
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+   private:
+    stdx::optional<std::string> _bucket_name;
+    stdx::optional<std::int32_t> _chunk_size_bytes;
+    stdx::optional<class read_concern> _read_concern;
+    stdx::optional<class read_preference> _read_preference;
+    stdx::optional<class write_concern> _write_concern;
+};
+
+}  // namespace gridfs
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp
new file mode 100644
index 0000000..2f5e88e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp
@@ -0,0 +1,85 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+namespace gridfs {
+
+///
+/// Class representing the optional arguments to a MongoDB GridFS upload operation.
+///
+class MONGOCXX_API upload {
+   public:
+    ///
+    /// Sets the chunk size of the GridFS file being uploaded. Defaults to the chunk size specified
+    /// in options::gridfs::bucket.
+    ///
+    /// @param chunk_size_bytes
+    ///   The size of the chunks in bytes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    upload& chunk_size_bytes(std::int32_t chunk_size_bytes);
+
+    ///
+    /// Gets the chunk size of the GridFS file being uploaded.
+    ///
+    /// @return
+    ///   The chunk size of the GridFS file being uploaded in bytes.
+    ///
+    const stdx::optional<std::int32_t>& chunk_size_bytes() const;
+
+    ///
+    /// Sets the metadata field of the GridFS file being uploaded. A GridFS file can store arbitrary
+    /// metadata in the form of a BSON document.
+    ///
+    /// @param metadata
+    ///   The metadata document for the GridFS file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    upload& metadata(bsoncxx::document::view_or_value metadata);
+
+    ///
+    /// Gets the metadata of the GridFS file being uploaded.
+    ///
+    /// @return
+    ///   The metadata document of the GridFS file.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& metadata() const;
+
+   private:
+    stdx::optional<std::int32_t> _chunk_size_bytes;
+    stdx::optional<bsoncxx::document::view_or_value> _metadata;
+};
+
+}  // namespace gridfs
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/index.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/index.hpp
new file mode 100644
index 0000000..001cf43
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/index.hpp
@@ -0,0 +1,508 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB create index operation.
+///
+/// @see https://docs.mongodb.com/manual/reference/command/createIndexes
+///
+class MONGOCXX_API index {
+   public:
+    ///
+    /// Base class representing the optional storage engine options for indexes.
+    ///
+    class MONGOCXX_API base_storage_options {
+       public:
+        virtual ~base_storage_options();
+
+       private:
+        friend class options::index;
+        MONGOCXX_PRIVATE virtual int type() const = 0;
+    };
+
+    ///
+    /// Class representing the optional WiredTiger storage engine options for indexes.
+    ///
+    class MONGOCXX_API wiredtiger_storage_options final : public base_storage_options {
+       public:
+        ~wiredtiger_storage_options() override;
+
+        ///
+        /// Set the WiredTiger configuration string.
+        ///
+        /// @param config_string
+        ///   The WiredTiger configuration string.
+        ///
+        void config_string(bsoncxx::string::view_or_value config_string);
+
+        ///
+        /// The current config_string setting.
+        ///
+        /// @return The current config_string.
+        ///
+        const stdx::optional<bsoncxx::string::view_or_value>& config_string() const;
+
+       private:
+        friend collection;
+        MONGOCXX_PRIVATE int type() const override;
+        stdx::optional<bsoncxx::string::view_or_value> _config_string;
+    };
+
+    index();
+
+    ///
+    /// Whether or not to build the index in the background so that building the index does not
+    /// block other database activities. The default is to build indexes in the foreground
+    ///
+    /// @param background
+    ///   Whether or not to build the index in the background.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/tutorial/build-indexes-in-the-background/
+    ///
+    index& background(bool background);
+
+    ///
+    /// The current background setting.
+    ///
+    /// @return The current background.
+    ///
+    const stdx::optional<bool>& background() const;
+
+    ///
+    /// Whether or not to create a unique index so that the collection will not accept insertion of
+    /// documents where the index key or keys match an existing value in the index.
+    ///
+    /// @param unique
+    ///   Whether or not to create a unique index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-unique/
+    ///
+    index& unique(bool unique);
+
+    ///
+    /// The current unique setting.
+    ///
+    /// @return The current unique.
+    ///
+    const stdx::optional<bool>& unique() const;
+
+    ///
+    /// Whether or not the index is hidden from the query planner. A hidden index is not evaluated
+    /// as part of query plan selection.
+    ///
+    /// @param hidden
+    ///   Whether or not to create a hidden index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-hidden/
+    ///
+    index& hidden(bool hidden);
+
+    ///
+    /// The current hidden setting.
+    ///
+    /// @return The current hidden.
+    ///
+    const stdx::optional<bool>& hidden() const;
+
+    ///
+    /// The name of the index.
+    ///
+    /// @param name
+    ///   The name of the index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& name(bsoncxx::string::view_or_value name);
+
+    ///
+    /// The current name setting.
+    ///
+    /// @return The current name.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& name() const;
+
+    ///
+    /// Sets the collation for this index.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    index& collation(bsoncxx::document::view collation);
+
+    ///
+    /// Retrieves the current collation for this index.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view>& collation() const;
+
+    ///
+    /// Whether or not to create a sparse index. Sparse indexes only reference documents with the
+    /// indexed fields.
+    ///
+    /// @param sparse
+    ///   Whether or not to create a sparse index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-sparse/
+    ///
+    index& sparse(bool sparse);
+
+    ///
+    /// The current sparse setting.
+    ///
+    /// @return The current sparse setting.
+    ///
+    const stdx::optional<bool>& sparse() const;
+
+    ///
+    /// Optionally used only in MongoDB 3.0.0 and higher. Specifies the storage engine options for
+    /// the index.
+    ///
+    /// @param storage_options
+    ///   The storage engine options for the index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& storage_options(std::unique_ptr<base_storage_options> storage_options);
+
+    ///
+    /// Optionally used only in MongoDB 3.0.0 and higher. Specifies the WiredTiger-specific storage
+    /// engine options for the index.
+    ///
+    /// @param storage_options
+    ///   The storage engine options for the index.
+    ///
+    index& storage_options(std::unique_ptr<wiredtiger_storage_options> storage_options);
+
+    ///
+    /// Set a value, in seconds, as a TTL to control how long MongoDB retains documents in this
+    /// collection.
+    ///
+    /// @param seconds
+    ///   The amount of time, in seconds, to retain documents.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-ttl/
+    ///
+    index& expire_after(std::chrono::seconds seconds);
+
+    ///
+    /// The current expire_after setting.
+    ///
+    /// @return The current expire_after value.
+    ///
+    const stdx::optional<std::chrono::seconds>& expire_after() const;
+
+    ///
+    /// Sets the index version.
+    ///
+    /// @param v
+    ///   The index version.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& version(std::int32_t v);
+
+    ///
+    /// The current index version.
+    ///
+    /// @return The current index version.
+    ///
+    const stdx::optional<std::int32_t>& version() const;
+
+    ///
+    /// For text indexes, sets the weight document. The weight document contains field and weight
+    /// pairs.
+    ///
+    /// @param weights
+    ///   The weight document for text indexes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& weights(bsoncxx::document::view weights);
+
+    ///
+    /// The current weights setting.
+    ///
+    /// @return The current weights.
+    ///
+    const stdx::optional<bsoncxx::document::view>& weights() const;
+
+    ///
+    /// For text indexes, the language that determines the list of stop words and the rules for the
+    /// stemmer and tokenizer.
+    ///
+    /// @param default_language
+    ///   The default language used when creating text indexes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& default_language(bsoncxx::string::view_or_value default_language);
+
+    ///
+    /// The current default_language setting.
+    ///
+    /// @return The current default_language.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& default_language() const;
+
+    ///
+    /// For text indexes, the name of the field, in the collection’s documents, that contains the
+    /// override language for the document.
+    ///
+    /// @param language_override
+    ///   The name of the field that contains the override language for text indexes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& language_override(bsoncxx::string::view_or_value language_override);
+
+    ///
+    /// The current name of the field that contains the override language for text indexes.
+    ///
+    /// @return The name of the field that contains the override language for text indexes.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& language_override() const;
+
+    ///
+    /// Sets the document for the partial filter expression for partial indexes.
+    ///
+    /// @param partial_filter_expression
+    ///   The partial filter expression document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& partial_filter_expression(bsoncxx::document::view partial_filter_expression);
+
+    ///
+    /// The current partial_filter_expression setting.
+    ///
+    /// @return The current partial_filter_expression.
+    ///
+    const stdx::optional<bsoncxx::document::view>& partial_filter_expression() const;
+
+    ///
+    /// For 2dsphere indexes, the 2dsphere index version number. Version can be either 1 or 2.
+    ///
+    /// @param twod_sphere_version
+    ///   The 2dsphere index version number.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_sphere_version(std::uint8_t twod_sphere_version);
+
+    ///
+    /// The current twod_sphere_version setting.
+    ///
+    /// @return The current twod_sphere_version.
+    ///
+    const stdx::optional<std::uint8_t>& twod_sphere_version() const;
+
+    ///
+    /// For 2d indexes, the precision of the stored geohash value of the location data.
+    ///
+    /// @param twod_bits_precision
+    ///   The precision of the stored geohash value.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_bits_precision(std::uint8_t twod_bits_precision);
+
+    ///
+    /// The current precision of the stored geohash value of the location data.
+    ///
+    /// @return The precision of the stored geohash value of the location data.
+    ///
+    const stdx::optional<std::uint8_t>& twod_bits_precision() const;
+
+    ///
+    /// For 2d indexes, the lower inclusive boundary for the longitude and latitude values.
+    ///
+    /// @param twod_location_min
+    ///   The lower inclusive boundary.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_location_min(double twod_location_min);
+
+    ///
+    /// The current lower inclusive boundary for the longitude and latitude values.
+    ///
+    /// @return The lower inclusive boundary for the longitude and latitude values.
+    ///
+    const stdx::optional<double>& twod_location_min() const;
+
+    ///
+    /// For 2d indexes, the upper inclusive boundary for the longitude and latitude values.
+    ///
+    /// @param twod_location_max
+    ///   The upper inclusive boundary.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_location_max(double twod_location_max);
+
+    ///
+    /// The current upper inclusive boundary for the longitude and latitude values.
+    ///
+    /// @return The upper inclusive boundary for the longitude and latitude values.
+    ///
+    const stdx::optional<double>& twod_location_max() const;
+
+    ///
+    /// For geoHaystack indexes, specify the number of units within which to group the location
+    /// values; i.e. group in the same bucket those location values that are within the specified
+    /// number of units to each other.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/geohaystack/
+    ///
+    /// @param haystack_bucket_size
+    ///   The geoHaystack bucket size.
+    ///
+    /// @deprecated
+    ///   This option is deprecated.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    MONGOCXX_DEPRECATED index& haystack_bucket_size(double haystack_bucket_size);
+    index& haystack_bucket_size_deprecated(double haystack_bucket_size);
+
+    ///
+    /// The current haystack_bucket_size setting.
+    ///
+    /// @return The current haystack_bucket_size.
+    ///
+    /// @deprecated
+    ///   This method is deprecated.
+    ///
+    MONGOCXX_DEPRECATED const stdx::optional<double>& haystack_bucket_size() const;
+    const stdx::optional<double>& haystack_bucket_size_deprecated() const;
+
+    ///
+    /// Conversion operator that provides a view of the options in document form.
+    ///
+    /// @exception mongocxx::logic_error if an invalid expireAfterSeconds field is provided.
+    ///
+    /// @return A view of the current builder contents.
+    ///
+    operator bsoncxx::document::view_or_value();
+
+   private:
+    friend collection;
+
+    stdx::optional<bool> _background;
+    stdx::optional<bool> _unique;
+    stdx::optional<bool> _hidden;
+    stdx::optional<bsoncxx::string::view_or_value> _name;
+    stdx::optional<bsoncxx::document::view> _collation;
+    stdx::optional<bool> _sparse;
+    std::unique_ptr<base_storage_options> _storage_options;
+    stdx::optional<std::chrono::seconds> _expire_after;
+    stdx::optional<std::int32_t> _version;
+    stdx::optional<bsoncxx::document::view> _weights;
+    stdx::optional<bsoncxx::string::view_or_value> _default_language;
+    stdx::optional<bsoncxx::string::view_or_value> _language_override;
+    stdx::optional<bsoncxx::document::view> _partial_filter_expression;
+    stdx::optional<std::uint8_t> _twod_sphere_version;
+    stdx::optional<std::uint8_t> _twod_bits_precision;
+    stdx::optional<double> _twod_location_min;
+    stdx::optional<double> _twod_location_max;
+    stdx::optional<double> _haystack_bucket_size;
+
+    //
+    // Return the current storage_options setting.
+    //
+    const std::unique_ptr<base_storage_options>& storage_options() const;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp
new file mode 100644
index 0000000..448b801
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp
@@ -0,0 +1,148 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing optional arguments to IndexView operations
+///
+class MONGOCXX_API index_view {
+   public:
+    index_view();
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    index_view& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return
+    ///   The current max allowed running time (in milliseconds).
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const bsoncxx::stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    index_view& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+    ///
+    /// Sets the commit quorum for this operation.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @param commit_quorum
+    ///   Integer representing the minimum number of data-bearing voting replica set members (i.e.
+    ///   commit quorum), including the primary, that must report a successful index build before
+    ///   the primary marks the indexes as ready. A value of @c 0 disables quorum-voting behavior.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes
+    ///
+    index_view& commit_quorum(std::int32_t commit_quorum);
+
+    ///
+    /// Sets the commit quorum for this operation.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @param commit_quorum
+    ///   String representing the minimum number of data-bearing voting replica set members (i.e.
+    ///   commit quorum), including the primary, that must report a successful index build before
+    ///   the primary marks the indexes as ready.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes
+    ///
+    index_view& commit_quorum(std::string commit_quorum);
+
+    ///
+    /// Gets the current commitQuorum setting.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @return
+    ///   The current commitQuorum setting.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes
+    ///
+    const stdx::optional<bsoncxx::document::value> commit_quorum() const;
+
+   private:
+    bsoncxx::stdx::optional<std::chrono::milliseconds> _max_time;
+    bsoncxx::stdx::optional<mongocxx::write_concern> _write_concern;
+    bsoncxx::stdx::optional<bsoncxx::document::value> _commit_quorum;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/insert.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/insert.hpp
new file mode 100644
index 0000000..d5517ba
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/insert.hpp
@@ -0,0 +1,143 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB insert operation
+///
+class MONGOCXX_API insert {
+   public:
+    ///
+    /// Sets the bypass_document_validation option.
+    /// If true, allows the write to opt-out of document level validation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    insert& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// Gets the current value of the bypass_document_validation option.
+    ///
+    /// @return The optional value of the bypass_document_validation option.
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    insert& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return The current write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// @note: This applies only to insert_many and is ignored for insert_one.
+    ///
+    /// If true, when an insert fails, return without performing the remaining
+    /// writes. If false, when a write fails, continue with the remaining
+    /// writes, if any. Inserts can be performed in any order if this is false.
+    /// Defaults to true.
+    ///
+    /// @param ordered
+    ///   Whether or not the insert_many will be ordered.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    insert& ordered(bool ordered);
+
+    ///
+    /// The current ordered value for this operation.
+    ///
+    /// @return The current ordered value.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    const stdx::optional<bool>& ordered() const;
+
+    ///
+    /// Sets the comment for this operation.
+    ///
+    /// @param comment
+    ///   The new comment.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    insert& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// The current comment for this operation.
+    ///
+    /// @return The current comment.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+   private:
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<bool> _ordered;
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/pool.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/pool.hpp
new file mode 100644
index 0000000..668985e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/pool.hpp
@@ -0,0 +1,55 @@
+// Copyright 2016 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/options/client.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB driver pool object. Pool options
+/// logically extend client options.
+///
+class MONGOCXX_API pool {
+   public:
+    ///
+    /// Constructs a new pool options object. Note that options::pool is implictly convertible from
+    /// options::client.
+    ///
+    /// @param client_opts
+    ///   The client options.
+    ///
+    pool(client client_opts = client());
+
+    ///
+    /// The current client options.
+    ///
+    /// @return The client options.
+    ///
+    const client& client_opts() const;
+
+   private:
+    client _client_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/replace.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/replace.hpp
new file mode 100644
index 0000000..e3c04e7
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/replace.hpp
@@ -0,0 +1,211 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB replace operation.
+///
+class MONGOCXX_API replace {
+   public:
+    ///
+    /// Sets the bypass_document_validation option.
+    /// If true, allows the write to opt-out of document level validation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// Gets the current value of the bypass_document_validation option.
+    ///
+    /// @return The optional value of the bypass_document_validation option.
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    replace& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// By default, if no document matches the filter, the replace operation does nothing.
+    /// However, by specifying upsert as @c true, this operation either updates matching documents
+    /// or inserts a new document using the replace specification if no matching document exists.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server-side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    replace& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp
new file mode 100644
index 0000000..cf601d1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp
@@ -0,0 +1,143 @@
+// Copyright 2021 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class pool;
+
+namespace options {
+
+///
+/// Class representing options for server API.
+///
+class MONGOCXX_API server_api {
+   public:
+    ///
+    /// Enum representing the possible values for server API version.
+    ///
+    enum class version { k_version_1 };
+
+    ///
+    /// Constructs a new server_api object.
+    ///
+    /// The specified API version will be sent to the server. This will cause
+    /// the server to behave in a manner compatible with that API version.
+    /// The driver will behave in a manner compatible with a server configured
+    /// with that API version, regardless of the server's actual release version.
+    ///
+    /// @param version
+    ///   The server api version to send to the server.
+    ///
+    server_api(version version);
+
+    ///
+    /// Converts a version enum value to its string value.
+    ///
+    /// @param version
+    ///   The enum value to convert to a string.
+    ///
+    /// @throws mongocxx::logic_error on an invalid argument
+    ///
+    /// @return
+    ///   The string value of the given enum value.
+    ///
+    static std::string version_to_string(version version);
+
+    ///
+    /// Converts a version string to its enum value.
+    ///
+    /// @param version
+    ///   The string to convert to an enum value.
+    ///
+    /// @throws mongocxx::logic_error on an invalid argument
+    ///
+    /// @return
+    ///   The enum value of the given string.
+    ///
+    static version version_from_string(stdx::string_view version);
+
+    ///
+    /// Sets the strict option, specifying whether the server should return
+    /// errors for features that are not part of the declared API version.
+    ///
+    /// @param strict
+    ///   The value to set strict to.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    server_api& strict(bool strict);
+
+    ///
+    /// Gets the current value of the strict option.
+    ///
+    /// @return
+    ///   The optional value of the strict option.
+    ///
+    const stdx::optional<bool>& strict() const;
+
+    ///
+    /// Sets the deprecation errors option, specifying whether the server should
+    /// return errors for features that are deprecated in the declared API version.
+    ///
+    /// @param deprecation_errors
+    ///   The value to set deprecation errors to.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    server_api& deprecation_errors(bool deprecation_errors);
+
+    ///
+    /// Gets the current value of the deprecation errors option.
+    ///
+    /// @return
+    ///   The optional value of the deprecation errors option.
+    ///
+    const stdx::optional<bool>& deprecation_errors() const;
+
+    ///
+    /// Gets the declared server api version.
+    ///
+    /// @return
+    ///   The version enum value specifying the declared server api version.
+    ///
+    version get_version() const;
+
+   private:
+    friend class mongocxx::client;
+    friend class mongocxx::pool;
+
+    version _version;
+    stdx::optional<bool> _strict;
+    stdx::optional<bool> _deprecation_errors;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp
new file mode 100644
index 0000000..2b7c1a5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp
@@ -0,0 +1,40 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <mongocxx/options/tls.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB driver client (SSL)
+///
+/// This class has been renamed to options::tls.
+///
+/// @deprecated use the tls options class instead.
+///
+MONGOCXX_DEPRECATED typedef tls ssl;
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/tls.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/tls.hpp
new file mode 100644
index 0000000..25eff08
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/tls.hpp
@@ -0,0 +1,163 @@
+// Copyright 2019 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB driver client (TLS)
+///
+class MONGOCXX_API tls {
+   public:
+    ///
+    /// The path to the .pem file containing a public key certificate and its associated private
+    /// key.
+    ///
+    /// @param pem_file
+    ///   The path to the .pem file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& pem_file(bsoncxx::string::view_or_value pem_file);
+
+    ///
+    /// Retrieves the current path to the .pem file.
+    ///
+    /// @return The path to the .pem file.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& pem_file() const;
+
+    ///
+    /// The pass phrase used to decrypt an encrypted PEM file.
+    ///
+    /// @param pem_password
+    ///   The pass phrase.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& pem_password(bsoncxx::string::view_or_value pem_password);
+
+    ///
+    /// Retrieves the current decryption pass phrase.
+    ///
+    /// @return The pass phrase.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& pem_password() const;
+
+    ///
+    /// The path to the .pem file that contains the root certificate chain from the Certificate
+    /// Authority.
+    ///
+    /// @param ca_file
+    ///   The path to the CA file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& ca_file(bsoncxx::string::view_or_value ca_file);
+
+    ///
+    /// Retrieves the current path to the CA file.
+    ///
+    /// @return The path to the CA file.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& ca_file() const;
+
+    ///
+    /// The path to the Certificate Authority directory.
+    ///
+    /// @param ca_dir
+    ///   The path to the CA directory.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& ca_dir(bsoncxx::string::view_or_value ca_dir);
+
+    ///
+    /// Retrieves the current path to the CA directory.
+    ///
+    /// @return The path to the CA directory.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& ca_dir() const;
+
+    ///
+    /// The path to the .pem file that contains revoked certificates.
+    ///
+    /// @param crl_file
+    ///   The path to the PEM file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& crl_file(bsoncxx::string::view_or_value crl_file);
+
+    ///
+    /// Retrieves the current path to the .pem file that contains revoked certificates.
+    ///
+    /// @return The path to the revoked certificates file.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& crl_file() const;
+
+    ///
+    /// If true, the driver will not verify the server's CA file.
+    ///
+    /// @param allow_invalid_certificates
+    ///   Whether or not to check the server's CA file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& allow_invalid_certificates(bool allow_invalid_certificates);
+
+    ///
+    /// Retrieves whether or not the driver will check the server's CA file.
+    ///
+    /// @return Whether or not the driver will check the server's CA file.
+    ///
+    const stdx::optional<bool>& allow_invalid_certificates() const;
+
+   private:
+    stdx::optional<bsoncxx::string::view_or_value> _pem_file;
+    stdx::optional<bsoncxx::string::view_or_value> _pem_password;
+    stdx::optional<bsoncxx::string::view_or_value> _ca_file;
+    stdx::optional<bsoncxx::string::view_or_value> _ca_dir;
+    stdx::optional<bsoncxx::string::view_or_value> _crl_file;
+    stdx::optional<bool> _allow_invalid_certificates;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp
new file mode 100644
index 0000000..2042359
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp
@@ -0,0 +1,163 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <memory>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_session;
+class read_concern;
+class write_concern;
+class read_preference;
+
+namespace options {
+
+///
+/// Class representing the optional arguments for a transaction.
+///
+class MONGOCXX_API transaction {
+   public:
+    transaction();
+
+    ///
+    /// Copy constructs transaction options.
+    ///
+    transaction(const transaction&);
+
+    ///
+    /// Copy assigns transaction options.
+    ///
+    transaction& operator=(const transaction&);
+
+    ///
+    /// Move constructs transaction options.
+    ///
+    transaction(transaction&&) noexcept;
+
+    ///
+    /// Move assigns transaction options.
+    ///
+    transaction& operator=(transaction&&) noexcept;
+
+    ///
+    /// Destroys the transaction options.
+    ///
+    ~transaction() noexcept;
+
+    ///
+    /// Sets the transaction read concern.
+    ///
+    /// @param rc
+    ///   The read concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    transaction& read_concern(const class read_concern& rc);
+
+    ///
+    /// Gets the current transaction read concern.
+    ///
+    /// @return
+    ///    An optional containing the read concern. If the read concern has not been set, a
+    ///    disengaged optional is returned.
+    stdx::optional<class read_concern> read_concern() const;
+
+    ///
+    /// Sets the transaction write concern.
+    ///
+    /// @param wc
+    ///   The write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    transaction& write_concern(const class write_concern& wc);
+
+    ///
+    /// Gets the current transaction write concern.
+    ///
+    /// @return The write concern.
+    ///
+    /// @return
+    ///    An optional containing the write concern. If the write concern has not been set, a
+    ///    disengaged optional is returned.
+    stdx::optional<class write_concern> write_concern() const;
+
+    ///
+    /// Sets the transaction read preference.
+    ///
+    /// @param rp
+    ///   The read preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    transaction& read_preference(const class read_preference& rp);
+
+    ///
+    /// Gets the current transaction read preference.
+    ///
+    /// @return
+    ///    An optional containing the read preference. If the read preference has not been set, a
+    ///    disengaged optional is returned.
+    stdx::optional<class read_preference> read_preference() const;
+
+    ///
+    /// Sets the transaction's max commit time, in milliseconds.
+    ///
+    /// @param ms
+    ///   The max commit time in milliseconds.
+    ///
+    /// @return
+    ///   A reference to the object on which this function is being called.
+    ///
+    transaction& max_commit_time_ms(std::chrono::milliseconds ms);
+
+    ///
+    /// Gets the current transaction commit time, in milliseconds.
+    ///
+    /// @return
+    ///   An optional containing the timeout. If the max commit time has not been set,
+    ///   a disengaged optional is returned.
+    ///
+    stdx::optional<std::chrono::milliseconds> max_commit_time_ms() const;
+
+   private:
+    friend class ::mongocxx::client_session;
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/update.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/update.hpp
new file mode 100644
index 0000000..5d17b0c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/options/update.hpp
@@ -0,0 +1,236 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB update operation.
+///
+class MONGOCXX_API update {
+   public:
+    ///
+    /// Sets the bypass_document_validation option.
+    /// If true, allows the write to opt-out of document level validation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// Gets the current value of the bypass_document_validation option.
+    ///
+    /// @return The optional value of the bypass_document_validation option.
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    update& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// By default, if no document matches the filter, the update operation does nothing.
+    /// However, by specifying upsert as @c true, this operation either updates matching documents
+    /// or inserts a new document using the update specification if no matching document exists.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server-side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    update& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Set array filters for this operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    update& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/pipeline.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/pipeline.hpp
new file mode 100644
index 0000000..483c664
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/pipeline.hpp
@@ -0,0 +1,558 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+#include <string>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+
+///
+/// Class representing a MongoDB aggregation pipeline.
+///
+class MONGOCXX_API pipeline {
+   public:
+    ///
+    /// Creates a new aggregation pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/aggregation-pipeline/
+    ///
+    pipeline();
+
+    ///
+    /// Move constructs a pipeline.
+    ///
+    pipeline(pipeline&&) noexcept;
+
+    ///
+    /// Move assigns a pipeline.
+    ///
+    pipeline& operator=(pipeline&&) noexcept;
+
+    ///
+    /// Destroys a pipeline.
+    ///
+    ~pipeline();
+
+    ///
+    /// Adds new fields to documents.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/addFields/
+    ///
+    /// @param fields_to_add
+    ///   A document specifying the fields to add.  For each field specified in this parameter, a
+    ///   corresponding field will be added to the documents, where the value of the added field is
+    ///   the result of evaluating the specified expression.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& add_fields(bsoncxx::document::view_or_value fields_to_add);
+
+    ///
+    /// Categorizes documents into groups, called buckets, based on a specified expression and
+    /// bucket boundaries.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/bucket/
+    ///
+    /// @param bucket_args
+    ///   The specification for the bucket operation.  The required fields `groupBy` and
+    ///   `boundaries` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& bucket(bsoncxx::document::view_or_value bucket_args);
+
+    ///
+    /// Categorizes documents into a specific number of groups, called buckets, based on a
+    /// specified expression.  Bucket boundaries are automatically determined in an attempt to
+    /// evenly distribute the documents into the specified number of buckets.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/
+    ///
+    /// @param bucket_auto_args
+    ///   The specification for the bucket_auto operation.  This required fields `groupBy` and
+    ///   `buckets` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& bucket_auto(bsoncxx::document::view_or_value bucket_auto_args);
+
+    ///
+    /// Returns statistics regarding a collection or view.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/collStats/
+    ///
+    /// @param coll_stats_args
+    ///   The specification for the coll_stats operation.  See link above for a list of valid
+    ///   options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& coll_stats(
+        bsoncxx::document::view_or_value coll_stats_args = bsoncxx::document::view{});
+
+    ///
+    /// Returns a document containing a count of the number of documents input to the stage.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/count/
+    ///
+    /// @param field
+    ///   Name of the field for the count to be written to.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& count(std::string field);
+
+    ///
+    /// Returns a stream of documents containing information on active and/or dormant
+    /// operations as well as inactive sessions that are holding locks as part of a
+    /// transaction. The stage returns a document for each operation or session.
+    ///
+    /// This stage must be used with database aggregate on the 'admin' database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/currentOp/
+    ///
+    /// @param current_op_args
+    ///   A document containing the arguments for the current_op operation.
+    ///
+    /// @return
+    ///   A reference to the object on which this method is being called.
+    ///
+    pipeline& current_op(bsoncxx::document::view_or_value current_op_args);
+
+    ///
+    /// Processes multiple aggregation pipelines within a single stage on the same set of input
+    /// documents.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/facet/
+    ///
+    /// @param facet_args
+    ///   The specification for the facet operation.  Each field in the the provided document should
+    ///   specify an aggregation pipeline, as an array.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& facet(bsoncxx::document::view_or_value facet_args);
+
+    ///
+    /// Appends a stage to this pipeline object.
+    ///
+    /// Use this method to run new pipeline stages that are not yet offered as
+    /// explicit methods on this class. Pass in a document describing a
+    /// pipeline stage:
+    ///
+    ///    { "$addFields" : { "field" : 0 }}
+    ///
+    /// @param stage
+    ///   A bson document view or value describing a pipeline stage.
+    ///
+    /// @return
+    ///   A reference to this object on which this member function is being called.
+    ///
+    pipeline& append_stage(bsoncxx::document::view_or_value stage);
+
+    ///
+    /// Appends stages to this pipeline object from the given bson array.
+    ///
+    /// Use this method to run new pipeline stages that are not yet offered as
+    /// explicit methods on this class. Pass in an array of documents, where each
+    /// document in the array describes a pipeline stage:
+    ///
+    ///    [ { "$addFields" : { "field" : 0 } }, { "$newStage" : ... }, ... ]
+    ///
+    /// @param stages
+    ///   A bson array containing documents describing pipeline stages.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    pipeline& append_stages(bsoncxx::array::view_or_value stages);
+
+    ///
+    /// Outputs documents in order of nearest to farthest from a specified point.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/geoNear/
+    ///
+    /// @param geo_near_args
+    ///   The specification for the geo_near operation.  The required fields `near` and
+    ///   `distanceField` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& geo_near(bsoncxx::document::view_or_value geo_near_args);
+
+    ///
+    /// Performs a recursive search on a collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/graphLookup/
+    ///
+    /// @param graph_lookup_args
+    ///   The specification for the graph_lookup operation.  The required fields `from`,
+    ///   `connectFromField`, `startWith`, `connectToField`, and `as` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& graph_lookup(bsoncxx::document::view_or_value graph_lookup_args);
+
+    ///
+    /// Groups documents by some specified expression and outputs to the next stage a
+    /// document for each distinct grouping. The output documents contain an `_id` field
+    /// which contains the the distinct key for that group. The output documents can also
+    /// contain computed fields that hold the values of some accumulator expression grouped
+    /// by the group's `_id` field.
+    ///
+    /// @note group does not order output documents.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/group/
+    ///
+    /// @param group_args
+    ///   The specification for the group operation.  The required field `_id` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& group(bsoncxx::document::view_or_value group_args);
+
+    ///
+    /// Returns statistics regarding the use of each index for the collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/indexStats/
+    ///
+    pipeline& index_stats();
+
+    ///
+    /// Limits the number of documents passed to the next stage in the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/limit/
+    ///
+    /// @param limit
+    ///   The number of documents to which output should be limited.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& limit(std::int32_t limit);
+
+    ///
+    /// Lists the sessions cached in memory by the mongod or mongos instance.
+    ///
+    /// This option must be used with database aggregate.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/listLocalSessions/
+    ///
+    /// @param list_local_sessions_args
+    ///   A document containing the arguments for list_local_sessions.
+    ///
+    /// @return
+    ///   A reference to the object on which this method is being called.
+    ///
+    pipeline& list_local_sessions(bsoncxx::document::view_or_value list_local_sessions_args);
+
+    ///
+    /// Lists all sessions stored in the system.sessions collection in the config database.
+    /// These sessions are visible to all members of the MongoDB deployment.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/listSessions/
+    ///
+    /// @param list_sessions_args
+    ///   A document containing the arguments for list_sessions.
+    ///
+    /// @return
+    ///   A reference to the object on which this method is being called.
+    ///
+    pipeline& list_sessions(bsoncxx::document::view_or_value list_sessions_args);
+
+    ///
+    /// Performs a left outer join to an unsharded collection in the same database to filter in
+    /// documents from the "joined" collection for processing.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/lookup/
+    ///
+    /// @param lookup_args
+    ///   The specification for the lookup operation.  The required fields `from`, `localField`,
+    ///   `foreignField`, and `as` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& lookup(bsoncxx::document::view_or_value lookup_args);
+
+    ///
+    /// Filters the documents. Only the documents that match the condition(s) specified by the
+    /// `filter` will continue to the next pipeline stage.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/match/
+    ///
+    /// @param filter
+    ///   The filter.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& match(bsoncxx::document::view_or_value filter);
+
+    ///
+    /// Outputs the aggregation results to a collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/merge/
+    ///
+    /// @param merge_args
+    ///   The specification for the merge options. Must include an `into` field that
+    ///   is either a collection name or a subdocument of the form:
+    ///   { `db` : &lt;db name&gt;, `coll` : &lt;collection name&gt; }.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    pipeline& merge(bsoncxx::document::view_or_value merge_args);
+
+    ///
+    /// Takes documents returned by the aggregation pipeline and writes them to a specified
+    /// collection. This stage must be the last stage in the pipeline. The out operator lets the
+    /// aggregation framework return result sets of any size.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/out/
+    ///
+    /// @param collection_name
+    ///   The name of the collection where the output documents should go.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& out(std::string collection_name);
+
+    ///
+    /// Projects a subset of the fields in the documents to the next stage of the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/project/
+    ///
+    /// @param projection
+    ///   The projection specification.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& project(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Restricts the contents of the documents based on information stored in the documents
+    /// themselves.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/redact/
+    ///
+    /// @param restrictions
+    ///   The document restrictions.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& redact(bsoncxx::document::view_or_value restrictions);
+
+    ///
+    /// Promotes a specified document to the top level and replaces all other fields.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/replaceRoot/
+    ///
+    /// @param replace_root_args
+    ///   The specification for the replace_root operation.  The required field `newRoot` must be
+    ///   included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& replace_root(bsoncxx::document::view_or_value replace_root_args);
+
+    ///
+    /// Randomly selects the specified number of documents that pass into the stage and passes the
+    /// remaining documents to the next stage in the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sample/
+    ///
+    /// @param size
+    ///   The number of input documents to select.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& sample(std::int32_t size);
+
+    ///
+    /// Skips over the specified number of documents that pass into the stage and passes the
+    /// remaining documents to the next stage in the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/skip/
+    ///
+    /// @param docs_to_skip
+    ///   The number of input documents to skip.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& skip(std::int32_t docs_to_skip);
+
+    ///
+    /// Sorts all input documents and returns them to the pipeline in sorted order.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+    ///
+    /// @param ordering
+    ///   Document specifying the ordering by which the documents are sorted.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Groups incoming documents based on the value of a specified expression, then computes the
+    /// count of documents in each distinct group.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/
+    ///
+    /// @param field_expression
+    ///   The expression to group by, as an object.  The expression can not evaluate to an object.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of sort_by_count() is intended to be used when the desired sort is over a
+    ///   grouping of the result of a complex expression computed from the input documents.
+    ///
+    pipeline& sort_by_count(bsoncxx::document::view_or_value field_expression);
+
+    ///
+    /// Groups incoming documents based on the value of a specified expression, then computes the
+    /// count of documents in each distinct group.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/
+    ///
+    /// @param field_expression
+    ///   The expression to group by, as a string.  To specify a field path, prefix the field path
+    ///   with a dollar sign (`$`).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of sort_by_count() is intended to be used when the desired sort is over a
+    ///   grouping of the value of a particular element in the input documents.
+    ///
+    pipeline& sort_by_count(std::string field_expression);
+
+    ///
+    /// Deconstructs an array field from the input documents to output a document for each element.
+    /// Each output document is an input document with the value of its array field replaced by
+    /// an element from the unwound array.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/unwind/
+    ///
+    /// @param unwind_args
+    ///   The specification for the unwind operation.  The required field path must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of unwind() is intended to be used when additional options other than the
+    ///   field name need to be specified.
+    ///
+    pipeline& unwind(bsoncxx::document::view_or_value unwind_args);
+
+    ///
+    /// Deconstructs an array field from the input documents to output a document for each element.
+    /// Each output document is an input document with the value of its array field replaced by
+    /// an element from the unwound array.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/unwind/
+    ///
+    /// @param field_name
+    ///   The name of the field to unwind.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of unwind() is intended to be used when no options other than the field name
+    ///   need to be specified.
+    ///
+    pipeline& unwind(std::string field_name);
+
+    ///
+    /// @return A view of the underlying BSON array this pipeline represents.
+    ///
+    bsoncxx::array::view view_array() const;
+
+   private:
+    friend class client;
+    friend class collection;
+    friend class database;
+
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/pool.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/pool.hpp
new file mode 100644
index 0000000..6f71b39
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/pool.hpp
@@ -0,0 +1,124 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/pool.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/uri.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+
+///
+/// A pool of @c client objects associated with a MongoDB deployment.
+///
+/// For interoperability with other MongoDB drivers, the minimum and maximum number of connections
+/// in the pool is configured using the 'minPoolSize' and 'maxPoolSize' connection string options.
+///
+/// @see https://docs.mongodb.com/manual/reference/connection-string/#connection-string-options
+///
+/// @remark When connecting to a replica set, it is @b much more efficient to use a pool as opposed
+/// to manually constructing @c client objects. The pool will use a single background thread per
+/// server to monitor the topology of the replica set, all of which are shared between the client
+/// objects created by the pool. A standalone client will instead "stop the world" every 60 seconds
+/// to check the status of the cluster. Because of this, if multiple threads are available, a
+/// connection pool should be used even if the application itself is single-threaded.
+///
+class MONGOCXX_API pool {
+   public:
+    ///
+    /// Creates a pool associated with a connection string.
+    ///
+    /// @param mongodb_uri
+    ///  A MongoDB URI representing the connection parameters
+    /// @param options
+    ///  Options to use when connecting to the MongoDB deployment.
+    ///
+    /// @throws mongocxx::exception if invalid options are provided (whether from the URI or
+    ///  provided client options).
+    explicit pool(const uri& mongodb_uri = mongocxx::uri(),
+                  const options::pool& options = options::pool());
+
+    ///
+    /// Destroys a pool.
+    ///
+    ~pool();
+
+    ///
+    /// An entry is a handle on a @c client object acquired via the pool. Similar to
+    /// std::unique_ptr.
+    ///
+    /// @note The lifetime of any entry object must be a subset of the pool object
+    ///  from which it was acquired.
+    ///
+    class MONGOCXX_API entry {
+       public:
+        /// Access a member of the client instance.
+        client* operator->() const& noexcept;
+        client* operator->() && = delete;
+
+        /// Retrieve a reference to the client.
+        client& operator*() const& noexcept;
+        client& operator*() && = delete;
+
+        /// Assign nullptr to this entry to release its client to the pool.
+        entry& operator=(std::nullptr_t) noexcept;
+
+        /// Return true if this entry has a client acquired from the pool.
+        explicit operator bool() const noexcept;
+
+       private:
+        friend class pool;
+
+        using unique_client = std::unique_ptr<client, std::function<void MONGOCXX_CALL(client*)>>;
+
+        MONGOCXX_PRIVATE explicit entry(unique_client);
+
+        unique_client _client;
+    };
+
+    ///
+    /// Acquires a client from the pool. The calling thread will block until a connection is
+    /// available.
+    ///
+    entry acquire();
+
+    ///
+    /// Acquires a client from the pool. This method will return immediately, but may return a
+    /// disengaged optional if a client is not available.
+    ///
+    stdx::optional<entry> try_acquire();
+
+   private:
+    friend class options::auto_encryption;
+
+    MONGOCXX_PRIVATE void _release(client* client);
+
+    class MONGOCXX_PRIVATE impl;
+    const std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/read_concern.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/read_concern.hpp
new file mode 100644
index 0000000..5e1855d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/read_concern.hpp
@@ -0,0 +1,187 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+class uri;
+
+///
+/// A class to represent the read concern. Read concern can be set at the client, database, or
+/// collection level. The read concern can also be provided via connection string, and will be
+/// parsed and set on the client constructed for the URI.
+///
+/// For the WiredTiger storage engine, MongoDB 3.2 introduced the readConcern option for replica
+/// sets and replica set shards. The readConcern option allows clients to choose a level of
+/// isolation for their reads. You can specify a readConcern of "majority" to read data that has
+/// been written to a majority of nodes and thus cannot be rolled back. By default, MongoDB uses a
+/// readConcern of "local" which does not guarantee that the read data would not be rolled back.
+///
+/// MongoDB 3.4 introduces a read concern level of "linearizable" to read data that has been written
+/// to a majority of nodes (i.e. cannot be rolled back) @b and is not stale. Linearizable read
+/// concern is available for all MongoDB supported storage engines and applies to read operations on
+/// a single document. Note that writes must be made with majority write concern in order for reads
+/// to be linearizable.
+///
+/// @see https://docs.mongodb.com/manual/reference/read-concern/
+///
+class MONGOCXX_API read_concern {
+   public:
+    ///
+    /// A class to represent the read concern level.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/#read-concern-levels
+    ///
+    enum class level {
+        k_local,
+        k_majority,
+        k_linearizable,
+        k_server_default,
+        k_unknown,
+        k_available,
+        k_snapshot
+    };
+
+    ///
+    /// Constructs a new read_concern with default acknowledge_level of k_server_default.
+    ///
+    /// The k_server_default acknowledge level has an empty acknowledge_string. Queries that
+    /// run with this read_concern will use the server's default read_concern instead of
+    /// specifying one.
+    ///
+    read_concern();
+
+    ///
+    /// Copy constructs a read_concern.
+    ///
+    read_concern(const read_concern&);
+
+    ///
+    /// Copy assigns a read_concern.
+    ///
+    read_concern& operator=(const read_concern&);
+
+    ///
+    /// Move constructs a read_concern.
+    ///
+    read_concern(read_concern&&) noexcept;
+
+    ///
+    /// Move assigns a read_concern.
+    ///
+    read_concern& operator=(read_concern&&) noexcept;
+
+    ///
+    /// Destroys a read_concern.
+    ///
+    ~read_concern();
+
+    ///
+    /// Sets the read concern level.
+    ///
+    /// @param rc_level
+    ///   Either k_local, k_majority, k_linearizable, or k_server_default.
+    ///
+    /// @throws
+    ///   mongocxx::exception if rc_level is not k_local, k_majority, k_linearizable, or
+    ///   k_server_default.
+    ///
+    void acknowledge_level(level rc_level);
+
+    ///
+    /// Gets the current read concern level.
+    ///
+    /// If this was set with acknowledge_string to anything other than "local", "majority",
+    /// "linearizable", or an empty string, this will return k_unknown.
+    ///
+    /// @return The read concern level.
+    ///
+    level acknowledge_level() const;
+
+    ///
+    /// Sets the read concern string. Any valid read concern string (e.g. "local",
+    /// "majority", "linearizable", "") may be passed in.  For forward-compatibility
+    /// with read concern levels introduced in the future, no validation is performed on
+    /// this string.
+    ///
+    /// @param rc_string
+    ///   The read concern string.
+    ///
+    void acknowledge_string(stdx::string_view rc_string);
+
+    ///
+    /// Gets the current read concern string.
+    ///
+    /// If the read concern level was set with acknowledge_level, this will return either "local",
+    /// "majority", "linearizable", or an empty string for k_server_default.
+    ///
+    /// @return The read concern string.
+    ///
+    stdx::string_view acknowledge_string() const;
+
+    ///
+    /// Gets the document form of this read_concern.
+    ///
+    /// @return
+    ///   Document representation of this read_concern.
+    ///
+    bsoncxx::document::value to_document() const;
+
+   private:
+    friend client;
+    friend collection;
+    friend database;
+    /// \relates mongocxx::options::transaction
+    friend mongocxx::options::transaction;
+    friend uri;
+
+    ///
+    /// @{
+    ///
+    /// Compares two read_concern objects for (in)-equality.
+    ///
+    /// @relates: read_concern
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const read_concern&, const read_concern&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const read_concern&, const read_concern&);
+    ///
+    /// @}
+    ///
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE read_concern(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/read_preference.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/read_preference.hpp
new file mode 100644
index 0000000..79ed258
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/read_preference.hpp
@@ -0,0 +1,318 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <string>
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+class uri;
+
+namespace events {
+class topology_description;
+}
+
+///
+/// Class representing a preference for how the driver routes read operations to members of a
+/// replica set or to a sharded cluster.
+///
+/// By default read operations are directed to the primary member in a replica set. Reading from the
+/// primary guarantees that read operations reflect the latest version of a document. However, by
+/// distributing some or all reads to secondary members of the replica set, you can improve read
+/// throughput or reduce latency for an application that does not require fully up-to-date data.
+///
+/// Read preference can be broadly specified by setting a mode. It is also possible to
+/// set tags in the read preference for more granular control, and to target specific members of a
+/// replica set via attributes other than their current state as a primary or secondary node.
+/// Furthermore, it is also possible to set a staleness threshold, such that the read is limited to
+/// targeting secondaries whose staleness is less than or equal to the given threshold.
+///
+/// Read preferences are ignored for direct connections to a single mongod instance. However,
+/// in order to perform read operations on a direct connection to a secondary member of a replica
+/// set, you must set a read preference that allows reading from secondaries.
+///
+/// @see https://docs.mongodb.com/manual/core/read-preference/
+///
+class MONGOCXX_API read_preference {
+   public:
+    ///
+    /// Determines which members in a replica set are acceptable to read from.
+    ///
+    /// @warning Read preference tags are not respected when the mode is set to primary.
+    ///
+    /// @warning All read preference modes except primary may return stale data because secondaries
+    /// replicate operations from the primary with some delay. Ensure that your application
+    /// can tolerate stale data if you choose to use a non-primary mode.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/#read-preference-modes
+    ///
+    enum class read_mode : std::uint8_t {
+        ///
+        /// Only read from a primary node.
+        ///
+        k_primary,
+
+        ///
+        /// Prefer to read from a primary node.
+        ///
+        k_primary_preferred,
+
+        ///
+        /// Only read from secondary nodes.
+        ///
+        k_secondary,
+
+        ///
+        /// Prefer to read from secondary nodes.
+        ///
+        k_secondary_preferred,
+
+        ///
+        /// Read from the node with the lowest latency irrespective of state.
+        ///
+        k_nearest
+    };
+
+    ///
+    /// Constructs a new read_preference with read_mode set to k_primary.
+    ///
+    read_preference();
+
+    struct deprecated_tag {};
+
+    ///
+    /// Constructs a new read_preference.
+    ///
+    /// @param mode
+    ///   Specifies the read_mode.
+    ///
+    /// @deprecated The constructor with no arguments and the method mode() should be used.
+    ///
+    MONGOCXX_DEPRECATED read_preference(read_mode mode);
+    read_preference(read_mode mode, deprecated_tag);
+
+    ///
+    /// Constructs a new read_preference with tags.
+    ///
+    /// @param mode
+    ///   A read_preference read_mode.
+    /// @param tags
+    ///   A document representing tags to use for the read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/#tag-sets
+    ///
+    /// @deprecated The tags() method should be used instead.
+    ///
+    MONGOCXX_DEPRECATED read_preference(read_mode mode, bsoncxx::document::view_or_value tags);
+    read_preference(read_mode mode, bsoncxx::document::view_or_value tags, deprecated_tag);
+
+    ///
+    /// Copy constructs a read_preference.
+    ///
+    read_preference(const read_preference&);
+
+    ///
+    /// Copy assigns a read_preference.
+    ///
+    read_preference& operator=(const read_preference&);
+
+    ///
+    /// Move constructs a read_preference.
+    ///
+    read_preference(read_preference&&) noexcept;
+
+    ///
+    /// Move assigns a read_preference.
+    ///
+    read_preference& operator=(read_preference&&) noexcept;
+
+    ///
+    /// Destroys a read_preference.
+    ///
+    ~read_preference();
+
+    ///
+    /// Sets a new mode for this read_preference.
+    ///
+    /// @param mode
+    ///   The new read preference mode.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    read_preference& mode(read_mode mode);
+
+    ///
+    /// Returns the current read_mode for this read_preference.
+    ///
+    /// @return The current read_mode.
+    ///
+    read_mode mode() const;
+
+    ///
+    /// Sets or updates the tag set list for this read_preference.
+    ///
+    /// @param tags
+    ///   Document representing the tag set list.
+    ///
+    /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    read_preference& tags(bsoncxx::document::view_or_value tag_set_list);
+
+    ///
+    /// Sets or updates the tag set list for this read_preference.
+    ///
+    /// @param tags
+    ///   Array of tag sets.
+    ///
+    /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    read_preference& tags(bsoncxx::array::view_or_value tag_set_list);
+
+    ///
+    /// Sets or updates the tag set list for this read_preference.
+    ///
+    /// @return The optionally set current tag set list.
+    ///
+    /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/
+    ///
+    stdx::optional<bsoncxx::document::view> tags() const;
+
+    ///
+    /// Sets the max staleness setting for this read_preference.  Secondary
+    /// servers with an estimated lag greater than this value will be excluded
+    /// from selection under modes that allow secondaries.
+    ///
+    /// Max staleness must be at least 90 seconds, and also at least
+    /// the sum (in seconds) of the client's heartbeatFrequencyMS and the
+    /// server's idle write period, which is 10 seconds.  For general use,
+    /// 90 seconds is the effective minimum.  If less, an exception will be
+    /// thrown when an operation is attempted.
+    ///
+    /// Max staleness may only be used with MongoDB version 3.4 or later.
+    /// If used with an earlier version, an exception will be thrown when an
+    /// operation is attempted.
+    ///
+    /// @note
+    ///     The max-staleness feature is designed to prevent badly-lagging
+    ///     servers from being selected.  The staleness estimate is
+    ///     imprecise and shouldn't be used to try to select "up-to-date"
+    ///     secondaries.
+    ///
+    /// @param max_staleness
+    ///    The new max staleness setting.  It must be positive.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws mongocxx::logic_error if the argument is invalid.
+    ///
+    read_preference& max_staleness(std::chrono::seconds max_staleness);
+
+    ///
+    /// Returns the current max staleness setting for this read_preference.
+    ///
+    /// @return The optionally current max staleness setting.
+    ///
+    stdx::optional<std::chrono::seconds> max_staleness() const;
+
+    ///
+    /// Sets the hedge document to be used for the read preference. Sharded clusters running MongoDB
+    /// 4.4 or later can dispatch read operations in parallel, returning the result from the fastest
+    /// host and cancelling the unfinished operations.
+    ///
+    /// This may be an empty document or a document of the form { enabled: &lt;boolean&gt; }.
+    ///
+    /// Hedged reads are automatically enabled in MongoDB 4.4+ when using a ``nearest`` read
+    /// preference. To explicitly enable or disable hedging, the ``hedge`` document must be
+    /// passed. An empty document uses server defaults to control hedging, but the ``enabled`` key
+    /// may be set to ``true`` or ``false`` to explicitly enable or disable hedged reads.
+    ///
+    /// @param hedge
+    ///   The hedge document to set. For example, the document { enabled: true }.
+    ///
+    /// @return A reference to the object on which this member function is being called. This
+    /// facilitates method chaining.
+    ///
+    read_preference& hedge(bsoncxx::document::view_or_value hedge);
+
+    ///
+    /// Gets the current hedge document to be used for the read preference.
+    ///
+    /// @return A hedge document if one was set.
+    ///
+    const stdx::optional<bsoncxx::document::view> hedge() const;
+
+   private:
+    friend client;
+    friend collection;
+    friend database;
+    /// \relates mongocxx::options::transaction
+    friend mongocxx::options::transaction;
+    /// \relates mongocxx::events::topology_description
+    friend mongocxx::events::topology_description;
+    friend uri;
+
+    ///
+    /// @{
+    ///
+    /// Compares two read_preference objects for (in)-equality.
+    ///
+    /// @relates: read_preference
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const read_preference&,
+                                                      const read_preference&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const read_preference&,
+                                                      const read_preference&);
+    ///
+    /// @}
+    ///
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE read_preference(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp
new file mode 100644
index 0000000..99c5dff
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp
@@ -0,0 +1,99 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <map>
+#include <vector>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/types.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+///
+/// Class representing the result of a MongoDB bulk write operation.
+///
+class MONGOCXX_API bulk_write {
+   public:
+    using id_map = std::map<std::size_t, bsoncxx::document::element>;
+
+    // This constructor is public for testing purposes only
+    explicit bulk_write(bsoncxx::document::value raw_response);
+
+    ///
+    /// Gets the number of documents that were inserted during this operation.
+    ///
+    /// @return The number of documents that were inserted.
+    ///
+    std::int32_t inserted_count() const;
+
+    ///
+    /// Gets the number of documents that were matched during this operation.
+    ///
+    /// @return The number of documents that were matched.
+    ///
+    std::int32_t matched_count() const;
+
+    ///
+    /// Gets the number of documents that were modified during this operation.
+    ///
+    /// @return The number of documents that were modified.
+    ///
+    /// @throws with server versions below 2.6 due to the field `nModified` not being returned.
+    ///
+    std::int32_t modified_count() const;
+
+    ///
+    /// Gets the number of documents that were deleted during this operation.
+    ///
+    /// @return The number of documents that were deleted.
+    ///
+    std::int32_t deleted_count() const;
+
+    ///
+    /// Gets the number of documents that were upserted during this operation.
+    ///
+    /// @return The number of documents that were upserted.
+    ///
+    std::int32_t upserted_count() const;
+
+    ///
+    /// Gets the ids of the upserted documents.
+    ///
+    /// @note The returned id_map must not be accessed after the bulk_write object is destroyed.
+    /// @return A map from bulk write index to _id field for upserted documents.
+    ///
+    id_map upserted_ids() const;
+
+   private:
+    MONGOCXX_PRIVATE bsoncxx::document::view view() const;
+
+    bsoncxx::document::value _response;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const bulk_write&, const bulk_write&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const bulk_write&, const bulk_write&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/delete.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/delete.hpp
new file mode 100644
index 0000000..c7137b0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/delete.hpp
@@ -0,0 +1,60 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+///
+/// Class representing the result of a MongoDB delete operation.
+///
+class MONGOCXX_API delete_result {
+   public:
+    // This constructor is public for testing purposes only
+    explicit delete_result(result::bulk_write result);
+
+    ///
+    /// Returns the bulk write result.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were deleted during this operation.
+    ///
+    /// @return The number of documents that were deleted.
+    ///
+    std::int32_t deleted_count() const;
+
+   private:
+    result::bulk_write _result;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const delete_result&, const delete_result&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const delete_result&, const delete_result&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp
new file mode 100644
index 0000000..3846199
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp
@@ -0,0 +1,56 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+namespace gridfs {
+
+/// Class representing the result of a GridFS upload operation.
+class MONGOCXX_API upload {
+   public:
+    upload(bsoncxx::types::bson_value::view id);
+
+    ///
+    /// Gets the id of the uploaded GridFS file.
+    ///
+    /// @return The id of the uploaded file.
+    ///
+    const bsoncxx::types::bson_value::view& id() const;
+
+   private:
+    // Array with a single element, containing the value of the _id field for the inserted files
+    // collection document.
+    bsoncxx::array::value _id_owned;
+
+    // Points into _id_owned.
+    bsoncxx::types::bson_value::view _id;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const upload&, const upload&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const upload&, const upload&);
+};
+
+}  // namespace gridfs
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp
new file mode 100644
index 0000000..49898e8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp
@@ -0,0 +1,95 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <map>
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/types.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+namespace result {
+
+///
+/// Class representing the result of a MongoDB insert many operation
+/// (executed as a bulk write).
+///
+class MONGOCXX_API insert_many {
+   public:
+    using id_map = std::map<std::size_t, bsoncxx::document::element>;
+
+    insert_many(result::bulk_write result, bsoncxx::array::value inserted_ids);
+
+    insert_many(const insert_many&);
+    insert_many(insert_many&&) = default;
+
+    insert_many& operator=(const insert_many&);
+    insert_many& operator=(insert_many&&) = default;
+
+    ///
+    /// Returns the bulk write result for this insert many operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were inserted during this operation.
+    ///
+    /// @return The number of documents that were inserted.
+    ///
+    std::int32_t inserted_count() const;
+
+    ///
+    /// Gets the _ids of the inserted documents.
+    ///
+    /// @note The returned id_map must not be accessed after the result::insert_many object is
+    /// destroyed.
+    /// @return Map of the index of the operation to the _id of the inserted document.
+    ///
+    id_map inserted_ids() const;
+
+   private:
+    friend collection;
+
+    // Construct _inserted_ids from _inserted_ids_owned
+    MONGOCXX_PRIVATE void _buildInsertedIds();
+
+    result::bulk_write _result;
+
+    // Array containing documents with the values of the _id field for the inserted documents. This
+    // array is in the following format: [{"_id": ...}, {"_id": ...}, ...].
+    bsoncxx::array::value _inserted_ids_owned;
+
+    // Points into _inserted_ids_owned.
+    id_map _inserted_ids;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const insert_many&, const insert_many&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const insert_many&, const insert_many&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp
new file mode 100644
index 0000000..f76b113
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp
@@ -0,0 +1,65 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/types.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+/// Class representing the result of a MongoDB insert operation.
+class MONGOCXX_API insert_one {
+   public:
+    // This constructor is public for testing purposes only
+    insert_one(result::bulk_write result, bsoncxx::types::bson_value::view inserted_id);
+
+    ///
+    /// Returns the bulk write result for this insert operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the _id of the inserted document.
+    ///
+    /// @return The value of the _id field for the inserted document.
+    ///
+    const bsoncxx::types::bson_value::view& inserted_id() const;
+
+   private:
+    result::bulk_write _result;
+
+    // Array with a single element, containing the value of the _id field for the inserted document.
+    bsoncxx::array::value _inserted_id_owned;
+
+    // Points into _inserted_id_owned.
+    bsoncxx::types::bson_value::view _inserted_id;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const insert_one&, const insert_one&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const insert_one&, const insert_one&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp
new file mode 100644
index 0000000..fbb1f83
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp
@@ -0,0 +1,75 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+/// Class representing the result of a MongoDB replace_one operation.
+class MONGOCXX_API replace_one {
+   public:
+    // This constructor is public for testing purposes only
+    explicit replace_one(result::bulk_write result);
+
+    ///
+    /// Returns the bulk write result for this replace_one operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were matched during this operation.
+    ///
+    /// @return The number of documents that were matched.
+    ///
+    std::int32_t matched_count() const;
+
+    ///
+    /// Gets the number of documents that were modified during this operation.
+    ///
+    /// @return The number of documents that were modified.
+    ///
+    std::int32_t modified_count() const;
+
+    ///
+    /// Gets the id of the upserted document.
+    ///
+    /// @return The value of the _id field for upserted document.
+    ///
+    stdx::optional<bsoncxx::document::element> upserted_id() const;
+
+   private:
+    result::bulk_write _result;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const replace_one&, const replace_one&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const replace_one&, const replace_one&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/update.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/update.hpp
new file mode 100644
index 0000000..85070f8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/result/update.hpp
@@ -0,0 +1,80 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+/// Class representing the result of a MongoDB update operation.
+class MONGOCXX_API update {
+   public:
+    // This constructor is public for testing purposes only
+    explicit update(result::bulk_write result);
+
+    ///
+    /// Returns the bulk write result for this update operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were matched during this operation.
+    ///
+    /// @return The number of documents that were matched.
+    ///
+    std::int32_t matched_count() const;
+
+    ///
+    /// Gets the number of documents that were modified during this operation.
+    ///
+    /// @return The number of documents that were modified.
+    std::int32_t modified_count() const;
+
+    ///
+    /// Gets the number of documents that were upserted during this operation.
+    ///
+    /// @return The number of documents that were upserted.
+    std::int32_t upserted_count() const;
+
+    ///
+    /// If a document was upserted during this operation, gets the _id of the upserted document.
+    ///
+    /// @return The value of the _id field for upserted document.
+    ///
+    stdx::optional<bsoncxx::document::element> upserted_id() const;
+
+   private:
+    result::bulk_write _result;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const update&, const update&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const update&, const update&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/stdx.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/stdx.hpp
new file mode 100644
index 0000000..c70fe44
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/stdx.hpp
@@ -0,0 +1,30 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+// We adopt all the bsoncxx polyfills
+using namespace ::bsoncxx::stdx;
+
+}  // namespace stdx
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/uri.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/uri.hpp
new file mode 100644
index 0000000..5c88a68
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/uri.hpp
@@ -0,0 +1,363 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a MongoDB connection string URI.
+///
+/// @todo CXX-2038 Use optionals for all option getters. Otherwise users cannot distinguish between
+/// a case of an empty option explicitly present in the URI and the option being omitted. Also
+/// change getters that return a std::string to return a string_view since a copy is not necessary.
+///
+/// @see https://docs.mongodb.com/manual/reference/connection-string/
+/// @see http://mongoc.org/libmongoc/current/mongoc_uri_t.html for more information on supported URI
+/// options.
+///
+class MONGOCXX_API uri {
+   public:
+    /// A host.
+    struct host {
+        std::string name;
+        std::uint16_t port;
+        std::int32_t family;
+    };
+
+    static const std::string k_default_uri;
+
+    ///
+    /// Constructs a uri from an optional MongoDB URI string. If no URI string is specified,
+    /// uses the default URI string, 'mongodb://localhost:27017'.
+    ///
+    /// @see The documentation for the version of libmongoc used for the list of supported
+    ///   URI options. For the latest libmongoc release:
+    ///   http://mongoc.org/libmongoc/current/mongoc_uri_t.html
+    ///
+    /// @param uri_string
+    ///   String representing a MongoDB connection string URI, defaults to k_default_uri.
+    ///
+    uri(bsoncxx::string::view_or_value uri_string = k_default_uri);
+
+    ///
+    /// Move constructs a uri.
+    ///
+    uri(uri&&) noexcept;
+
+    ///
+    /// Move assigns a uri.
+    ///
+    uri& operator=(uri&&) noexcept;
+
+    ///
+    /// Destroys a uri.
+    ///
+    ~uri();
+
+    ///
+    /// Returns the authentication mechanism from the uri.
+    ///
+    /// @return A string representing the authentication mechanism.
+    ///
+    std::string auth_mechanism() const;
+
+    ///
+    /// Returns the authentication source from the uri.
+    ///
+    /// @return A string representing the authentication source.
+    ///
+    std::string auth_source() const;
+
+    ///
+    /// Returns the hosts from the uri.
+    ///
+    /// @return A vector of hosts.
+    ///
+    std::vector<host> hosts() const;
+
+    ///
+    /// Returns the database from the uri.
+    ///
+    /// @return A string with the name of the database.
+    ///
+    std::string database() const;
+
+    ///
+    /// Returns other uri options.
+    ///
+    /// Note, options are returned in the case they were presented.
+    /// The URI mongodb://localhost/?appName=abc will return { "appName": "abc" }
+    /// The URI mongodb://localhost/?appname=abc will return { "appname": "abc" }
+    ///
+    /// @return A document view containing other options.
+    ///
+    bsoncxx::document::view options() const;
+
+    ///
+    /// Returns the password from the uri.
+    ///
+    /// @return A string containing the supplied password.
+    ///
+    std::string password() const;
+
+    ///
+    /// Returns the read concern from the uri.
+    ///
+    /// @return A read_concern that represents what was specified in the uri.
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Returns the read preference from the uri.
+    ///
+    /// @return A read_preference that represents what was specified in the uri.
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// Returns the replica set specified in the uri.
+    ///
+    /// @return A string representing the supplied replica set name.
+    ///
+    std::string replica_set() const;
+
+    ///
+    /// Returns the ssl parameter from the uri.
+    ///
+    /// @return Boolean that is @c true if ssl is enabled and @c false if not.
+    ///
+    /// @deprecated The tls() method should be used instead of this method.
+    ///
+    MONGOCXX_DEPRECATED bool ssl() const;
+
+    ///
+    /// Returns the tls parameter from the uri.
+    ///
+    /// @return Boolean that is @c true if tls is enabled and @c false if not.
+    ///
+    bool tls() const;
+
+    ///
+    /// Returns the uri in a string format.
+    ///
+    /// @return A string with the uri.
+    ///
+    std::string to_string() const;
+
+    ///
+    /// Returns the supplied username from the uri.
+    ///
+    /// @return A string with the username specified in the uri.
+    ///
+    std::string username() const;
+
+    ///
+    /// Returns the write concern specified in the uri.
+    ///
+    /// @return A write_concern that represents what was specified in the uri.
+    ///
+    class write_concern write_concern() const;
+
+    ///
+    /// Returns the value of the option "appname" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> appname() const;
+
+    ///
+    /// Returns the value of the option "authMechanismProperties" if present in the uri.
+    ///
+    /// @return An optional bsoncxx::document::view
+    ///
+    stdx::optional<bsoncxx::document::view> auth_mechanism_properties() const;
+
+    ///
+    /// Returns the list of compressors present in the uri or an empty list if "compressors" was not
+    /// present or contained no valid compressors.
+    ///
+    /// @return A std::vector of stdx::string_view.
+    ///
+    std::vector<stdx::string_view> compressors() const;
+
+    ///
+    /// Returns the value of the option "connectTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> connect_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "directConnection" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> direct_connection() const;
+
+    ///
+    /// Returns the value of the option "heartbeatFrequencyMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> heartbeat_frequency_ms() const;
+
+    ///
+    /// Returns the value of the option "localThresholdMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> local_threshold_ms() const;
+
+    ///
+    /// Returns the value of the option "maxPoolSize" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> max_pool_size() const;
+
+    ///
+    /// Returns the value of the option "retryReads" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> retry_reads() const;
+
+    ///
+    /// Returns the value of the option "retryWrites" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> retry_writes() const;
+
+    ///
+    /// Returns the value of the option "serverSelectionTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> server_selection_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "serverSelectionTryOnce" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> server_selection_try_once() const;
+
+    ///
+    /// Returns the value of the option "socketTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> socket_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "tlsAllowInvalidCertificates" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_allow_invalid_certificates() const;
+
+    ///
+    /// Returns the value of the option "tlsAllowInvalidHostnames" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_allow_invalid_hostnames() const;
+
+    ///
+    /// Returns the value of the option "tlsCAFile" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> tls_ca_file() const;
+
+    ///
+    /// Returns the value of the option "tlsCertificateKeyFile" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> tls_certificate_key_file() const;
+
+    ///
+    /// Returns the value of the option "tlsCertificateKeyFilePassword" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> tls_certificate_key_file_password() const;
+
+    ///
+    /// Returns the value of the option "tlsDisableCertificateRevocationCheck" if present in the
+    /// uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_disable_certificate_revocation_check() const;
+
+    ///
+    /// Returns the value of the option "tlsDisableOCSPEndpointCheck" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_disable_ocsp_endpoint_check() const;
+
+    ///
+    /// Returns the value of the option "tlsInsecure" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_insecure() const;
+
+    ///
+    /// Returns the value of the option "waitQueueTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> wait_queue_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "zlibCompressionLevel" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> zlib_compression_level() const;
+
+   private:
+    friend class client;
+    friend class pool;
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE uri(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp
new file mode 100644
index 0000000..4771334
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp
@@ -0,0 +1,157 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing criteria for document validation, to be applied to a collection.
+///
+/// @see https://docs.mongodb.com/manual/core/document-validation/
+///
+class MONGOCXX_API validation_criteria {
+   public:
+    ///
+    /// Sets a validation rule for this validation object.
+    ///
+    /// @param rule
+    ///   Document representing a validation rule.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    validation_criteria& rule(bsoncxx::document::view_or_value rule);
+
+    ///
+    /// Gets the validation rule for this validation object.
+    ///
+    /// @return
+    ///   Document representing a validation rule.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& rule() const;
+
+    ///
+    /// A class to represent the different validation level options.
+    ///
+    /// - k_off: Disable validation entirely.
+    /// - k_moderate: Apply validation rules to inserts, and apply validation rules to updates only
+    ///   if the document to be updated already fulfills the validation criteria.
+    /// - k_strict: Apply validation rules to all inserts and updates.
+    ///
+    enum class validation_level {
+        k_off,
+        k_moderate,
+        k_strict,
+    };
+
+    ///
+    /// Sets a validation level.
+    ///
+    /// @param level
+    ///   An enumerated validation level.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    validation_criteria& level(validation_level level);
+
+    ///
+    /// Gets the validation level.
+    ///
+    /// @return
+    ///   The enumerated validation level.
+    ///
+    const stdx::optional<validation_level>& level() const;
+
+    ///
+    /// A class to represent the different validation action options.
+    ///
+    /// - k_error: Reject any insertion or update that violates the validation criteria.
+    /// - k_warn: Log any violations of the validation criteria, but allow the insertion or update
+    ///   to proceed.
+    ///
+    enum class validation_action {
+        k_error,
+        k_warn,
+    };
+
+    ///
+    /// Sets a validation action to run when documents failing validation are inserted or modified.
+    ///
+    /// @param action
+    ///   An enumerated validation action.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    validation_criteria& action(validation_action action);
+
+    ///
+    /// Gets the validation action to run when documents failing validation are inserted or
+    /// modified.
+    ///
+    /// @return
+    ///   The enumerated validation action.
+    ///
+    const stdx::optional<validation_action>& action() const;
+
+    ///
+    /// Returns a bson document representing this set of validation criteria.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    /// @return Validation criteria, as a document.
+    ///
+    MONGOCXX_DEPRECATED bsoncxx::document::value to_document() const;
+    bsoncxx::document::value to_document_deprecated() const;
+
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    MONGOCXX_DEPRECATED MONGOCXX_INLINE operator bsoncxx::document::value() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _rule;
+    stdx::optional<validation_level> _level;
+    stdx::optional<validation_action> _action;
+};
+
+MONGOCXX_API bool MONGOCXX_CALL operator==(const validation_criteria& lhs,
+                                           const validation_criteria& rhs);
+MONGOCXX_API bool MONGOCXX_CALL operator!=(const validation_criteria& lhs,
+                                           const validation_criteria& rhs);
+
+MONGOCXX_INLINE validation_criteria::operator bsoncxx::document::value() const {
+    return to_document_deprecated();
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/write_concern.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/write_concern.hpp
new file mode 100644
index 0000000..80aaf55
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/write_concern.hpp
@@ -0,0 +1,276 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <stdexcept>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class bulk_write;
+class client;
+class collection;
+class database;
+class uri;
+
+///
+/// Class representing the server-side requirement for reporting the success of a write
+/// operation. The strength of the write concern setting determines the level of guarantees
+/// that you will receive from MongoDB regarding write durability.
+///
+/// Weaker requirements that provide fewer guarantees report on success quickly while stronger
+/// requirements that provide greater guarantees will take longer (or potentially forever, if
+/// the write_concern's requirements are not satisfied and no timeout is set).
+///
+/// MongoDB drivers allow for different levels of write concern to better address the specific
+/// needs of applications. Clients may adjust write concern to ensure that the most important
+/// operations persist successfully to an entire MongoDB deployment. However, for other less
+/// critical operations, clients can adjust the write concern to ensure better performance
+/// rather than persistence to the entire deployment.
+///
+/// @see https://docs.mongodb.com/manual/core/write-concern/
+///
+class MONGOCXX_API write_concern {
+   public:
+    ///
+    /// A class to represent the special case values for write_concern::nodes.
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    enum class level { k_default, k_majority, k_tag, k_unacknowledged, k_acknowledged };
+
+    ///
+    /// Constructs a new write_concern.
+    ///
+    write_concern();
+
+    ///
+    /// Copy constructs a write_concern.
+    ///
+    write_concern(const write_concern&);
+
+    ///
+    /// Copy assigns a write_concern.
+    ///
+    write_concern& operator=(const write_concern&);
+
+    ///
+    /// Move constructs a write_concern.
+    ///
+    write_concern(write_concern&&) noexcept;
+
+    ///
+    /// Move assigns a write_concern.
+    ///
+    write_concern& operator=(write_concern&&) noexcept;
+
+    ///
+    /// Destroys a write_concern.
+    ///
+    ~write_concern();
+
+    ///
+    /// Sets the journal parameter for this write concern.
+    ///
+    /// @param journal
+    ///   If @c true confirms that the mongod instance has written the data to the on-disk journal
+    ///   before reporting a write operations was successful. This ensures that data is not lost if
+    ///   the mongod instance shuts down unexpectedly.
+    ///
+    void journal(bool journal);
+
+    ///
+    /// Sets the number of nodes that are required to acknowledge the write before the operation is
+    /// considered successful. Write operations will block until they have been replicated to the
+    /// specified number of servers in a replica set.
+    ///
+    /// @param confirm_from
+    ///   The number of replica set nodes that must acknowledge the write.
+    ///
+    /// @warning Setting the number of nodes to 0 disables write acknowledgment and all other
+    /// write concern options.
+    ///
+    /// @warning Setting the number of nodes required to an amount greater than the number of
+    /// available nodes will cause writes using this write concern to block forever if no timeout
+    /// is set.
+    ///
+    void nodes(std::int32_t confirm_from);
+
+    ///
+    /// Sets the acknowledge level.
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    /// @param confirm_level
+    ///   Either level::k_unacknowledged, level::k_acknowledged, level::k_default, or
+    ///   level::k_majority.
+    ///
+    /// @note
+    ///   the acknowledge level of level::k_tag is set automatically when a tag is set.
+    ///
+    /// @warning
+    ///   Setting this to level::k_unacknowledged disables write acknowledgment and all other
+    ///   write concern options.
+    ///
+    /// @warning
+    ///   Unacknowledged writes using dollar-prefixed or dotted keys may be silently rejected by
+    ///   pre-5.0 servers.
+    ///
+    /// @exception
+    ///   Throws mongocxx::exception for setting a tag acknowledge level. Use tag() instead.
+    ///
+    void acknowledge_level(level confirm_level);
+
+    ///
+    /// Requires that a majority of the nodes in a replica set acknowledge a write operation before
+    /// it is considered a success.
+    ///
+    /// @param timeout
+    ///   The amount of time to wait before the write operation times out if it cannot reach
+    ///   the majority of nodes in the replica set. If the value is zero, then no timeout is set.
+    ///
+    /// @throws mongocxx::logic_error for an invalid timeout value.
+    ///
+    void majority(std::chrono::milliseconds timeout);
+
+    ///
+    /// Sets the name representing the server-side getLastErrorMode entry containing the list of
+    /// nodes that must acknowledge a write operation before it is considered a success.
+    ///
+    /// @note the acknowledge level of level::k_tag is set automatically when a tag is set.
+    ///
+    /// @param tag
+    ///   The string representing on of the "getLastErrorModes" in the replica set configuration.
+    ///
+    void tag(stdx::string_view tag);
+
+    ///
+    /// Sets an upper bound on the time a write concern can take to be satisfied. If the write
+    /// concern cannot be satisfied within the timeout, the operation is considered a failure.
+    ///
+    /// @param timeout
+    ///   The timeout (in milliseconds) for this write concern. If the value is zero, then no
+    ///   timeout is set.
+    ///
+    /// @throws mongocxx::logic_error for an invalid timeout value.
+    ///
+    void timeout(std::chrono::milliseconds timeout);
+
+    ///
+    /// Gets the current status of the journal parameter.
+    ///
+    /// @return @c true if journal is required, @c false if not.
+    ///
+    bool journal() const;
+
+    ///
+    /// Gets the current number of nodes that this write_concern requires operations to reach.
+    /// This value will be unset if the acknowledge_level is set to majority, default, or tag.
+    ///
+    /// This is unset by default.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    /// @return The number of required nodes.
+    ///
+    stdx::optional<std::int32_t> nodes() const;
+
+    ///
+    /// Gets the current acknowledgment level.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    /// @return The acknowledgment level.
+    ///
+    level acknowledge_level() const;
+
+    ///
+    /// Gets the current getLastErrorMode that is required by this write_concern.
+    ///
+    /// @return The current getLastErrorMode.
+    ///
+    stdx::optional<std::string> tag() const;
+
+    ///
+    /// Gets whether the majority of nodes is currently required by this write_concern.
+    ///
+    /// @return The current majority setting.
+    ///
+    bool majority() const;
+
+    ///
+    /// Gets the current timeout for this write_concern.
+    ///
+    /// @return Current timeout in milliseconds.
+    ///
+    std::chrono::milliseconds timeout() const;
+
+    ///
+    /// Gets whether this write_concern requires an acknowledged write.
+    ///
+    /// @return Whether this write concern requires an acknowledged write.
+    ///
+    bool is_acknowledged() const;
+
+    ///
+    /// Gets the document form of this write_concern.
+    ///
+    /// @return
+    ///   Document representation of this write_concern.
+    ///
+    bsoncxx::document::value to_document() const;
+
+   private:
+    friend bulk_write;
+    friend client;
+    friend collection;
+    friend database;
+    /// \relates mongocxx::options::transaction
+    friend mongocxx::options::transaction;
+    friend uri;
+
+    ///
+    /// @{
+    ///
+    /// Compares two write_concern objects for (in)-equality.
+    ///
+    /// @relates: write_concern
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const write_concern&, const write_concern&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const write_concern&, const write_concern&);
+    ///
+    /// @}
+    ///
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE write_concern(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/write_type.hpp b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/write_type.hpp
new file mode 100644
index 0000000..5efbb3a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/include/mongocxx/v_noabi/mongocxx/write_type.hpp
@@ -0,0 +1,48 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the the types of write operations that can be performed.
+///
+enum class write_type {
+    /// Inserting a single document into a collection.
+    k_insert_one,
+
+    /// Deleting a single document from a collection.
+    k_delete_one,
+
+    /// Delete one or more documents from a collection.
+    k_delete_many,
+
+    /// Update a single document in a collection.
+    k_update_one,
+
+    /// Update one or more documents in a collection.
+    k_update_many,
+
+    /// Replace a single document in a collection with a new one.
+    k_replace_one,
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx-config.cmake
new file mode 100644
index 0000000..cf914d3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx-config.cmake
@@ -0,0 +1,3 @@
+include(CMakeFindDependencyMacro)
+find_dependency(bson-1.0 REQUIRED)
+include("${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets.cmake")
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets-release.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets-release.cmake
new file mode 100644
index 0000000..37ba1d9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets-release.cmake
@@ -0,0 +1,30 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::bsoncxx_shared" for configuration "Release"
+set_property(TARGET mongo::bsoncxx_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bsoncxx_shared PROPERTIES
+  IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "mongo::bson_shared"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libbsoncxx.so.3.7.0"
+  IMPORTED_SONAME_RELEASE "libbsoncxx.so._noabi"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bsoncxx_shared )
+list(APPEND _cmake_import_check_files_for_mongo::bsoncxx_shared "${_IMPORT_PREFIX}/lib/libbsoncxx.so.3.7.0" )
+
+# Import target "mongo::bsoncxx_static" for configuration "Release"
+set_property(TARGET mongo::bsoncxx_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bsoncxx_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libbsoncxx-static.a"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bsoncxx_static )
+list(APPEND _cmake_import_check_files_for_mongo::bsoncxx_static "${_IMPORT_PREFIX}/lib/libbsoncxx-static.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets.cmake
new file mode 100644
index 0000000..43fbabf
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets.cmake
@@ -0,0 +1,116 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::bsoncxx_shared mongo::bsoncxx_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::bsoncxx_shared
+add_library(mongo::bsoncxx_shared SHARED IMPORTED)
+
+set_target_properties(mongo::bsoncxx_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/bsoncxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "Boost::boost"
+)
+
+# Create imported target mongo::bsoncxx_static
+add_library(mongo::bsoncxx_static STATIC IMPORTED)
+
+set_target_properties(mongo::bsoncxx_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "BSONCXX_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/bsoncxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "Boost::boost;\$<LINK_ONLY:mongo::bson_shared>"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config.cmake
new file mode 100644
index 0000000..53c8084
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config.cmake
@@ -0,0 +1,56 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bsoncxx_shared' instead.  Consult the example projects for further details.")
+
+set(LIBBSONCXX_VERSION_MAJOR 3)
+set(LIBBSONCXX_VERSION_MINOR 7)
+set(LIBBSONCXX_VERSION_PATCH 0)
+set(LIBBSONCXX_PACKAGE_VERSION 3.7.0)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbsoncxx-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBBSONCXX_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/bsoncxx/v_noabi")
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library() to pick that up.
+find_library(LIBBSONCXX_LIBRARY_PATH bsoncxx PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBBSONCXX_LIBRARIES ${LIBBSONCXX_LIBRARY_PATH})
+
+set(LIBBSONCXX_DEFINITIONS "")
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config.cmake
new file mode 100644
index 0000000..d5a2d45
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config.cmake
@@ -0,0 +1,61 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bsoncxx_static' instead.  Consult the example projects for further details.")
+
+set(LIBBSONCXX_STATIC_VERSION_MAJOR 3)
+set(LIBBSONCXX_STATIC_VERSION_MINOR 7)
+set(LIBBSONCXX_STATIC_VERSION_PATCH 0)
+set(LIBBSONCXX_STATIC_PACKAGE_VERSION 3.7.0)
+
+# We need to pull in the libbson-static-* library to read the BSON_STATIC_LIBRARIES variable.  We
+# can ignore the other variables exported by that package (e.g. BSON_STATIC_INCLUDE_DIRS,
+# BSON_STATIC_DEFINITIONS), since bsoncxx hides the existence of libbson from the user through
+# abstraction.  bsoncxx users generally should not need to include libbson headers directly.
+find_package(libbson-static-1.0 1.13.0 REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbsoncxx-static-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBBSONCXX_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/bsoncxx/v_noabi")
+
+# We want to provide an absolute path to the library and we know the directory and the base name,
+# but not the suffix, so we use CMake's find_library() to pick that up.
+find_library(LIBBSONCXX_STATIC_LIBRARY_PATH bsoncxx-static PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBBSONCXX_STATIC_LIBRARIES ${LIBBSONCXX_STATIC_LIBRARY_PATH} ${BSON_STATIC_LIBRARIES})
+
+set(LIBBSONCXX_STATIC_DEFINITIONS BSONCXX_STATIC)
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-3.7.0/libmongocxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-3.7.0/libmongocxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-3.7.0/libmongocxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-3.7.0/libmongocxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-3.7.0/libmongocxx-config.cmake
new file mode 100644
index 0000000..9a2b3f5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-3.7.0/libmongocxx-config.cmake
@@ -0,0 +1,60 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongocxx_shared' instead.  Consult the example projects for further details.")
+
+set(LIBMONGOCXX_VERSION_MAJOR 3)
+set(LIBMONGOCXX_VERSION_MINOR 7)
+set(LIBMONGOCXX_VERSION_PATCH 0)
+set(LIBMONGOCXX_PACKAGE_VERSION 3.7.0)
+
+find_package(libbsoncxx 3.7.0 REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongocxx-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBMONGOCXX_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/mongocxx/v_noabi")
+
+set(LIBMONGOCXX_INCLUDE_DIRS ${LIBMONGOCXX_INCLUDE_DIRS} ${LIBBSONCXX_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library() to pick that up.
+find_library(LIBMONGOCXX_LIBRARY_PATH mongocxx PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBMONGOCXX_LIBRARIES ${LIBMONGOCXX_LIBRARY_PATH} ${LIBBSONCXX_LIBRARIES})
+
+set(LIBMONGOCXX_DEFINITIONS ${LIBBSONCXX_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config.cmake
new file mode 100644
index 0000000..12461b8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config.cmake
@@ -0,0 +1,65 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongocxx_static' instead.  Consult the example projects for further details.")
+
+set(LIBMONGOCXX_STATIC_VERSION_MAJOR 3)
+set(LIBMONGOCXX_STATIC_VERSION_MINOR 7)
+set(LIBMONGOCXX_STATIC_VERSION_PATCH 0)
+set(LIBMONGOCXX_STATIC_PACKAGE_VERSION 3.7.0)
+
+find_package(libbsoncxx-static 3.7.0 REQUIRED)
+
+# We need to pull in the libmongoc-static-* library to read the MONGOC_STATIC_LIBRARIES variable.
+# We can ignore the other variables exported by that package (e.g. MONGOC_STATIC_INCLUDE_DIRS,
+# MONGOC_STATIC_DEFINITIONS), since mongocxx hides the existence of libmongoc from the user through
+# abstraction.  mongocxx users generally should not need to include libmongoc headers directly.
+find_package(libmongoc-static-1.0 1.19.0 REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongocxx-static-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBMONGOCXX_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/mongocxx/v_noabi")
+
+set(LIBMONGOCXX_STATIC_INCLUDE_DIRS ${LIBMONGOCXX_STATIC_INCLUDE_DIRS} ${LIBBSONCXX_STATIC_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the directory and the base name,
+# but not the suffix, so we use CMake's find_library() to pick that up.
+find_library(LIBMONGOCXX_STATIC_LIBRARY_PATH mongocxx-static PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBMONGOCXX_STATIC_LIBRARIES ${LIBMONGOCXX_STATIC_LIBRARY_PATH} ${LIBBSONCXX_STATIC_LIBRARIES} ${MONGOC_STATIC_LIBRARIES})
+
+set(LIBMONGOCXX_STATIC_DEFINITIONS MONGOCXX_STATIC ${LIBBSONCXX_STATIC_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx-config.cmake
new file mode 100644
index 0000000..4d6cf86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx-config.cmake
@@ -0,0 +1,4 @@
+include(CMakeFindDependencyMacro)
+find_dependency(mongoc-1.0 REQUIRED)
+find_dependency(bsoncxx REQUIRED)
+include("${CMAKE_CURRENT_LIST_DIR}/mongocxx_targets.cmake")
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx_targets-release.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx_targets-release.cmake
new file mode 100644
index 0000000..bd05dc7
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx_targets-release.cmake
@@ -0,0 +1,30 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::mongocxx_shared" for configuration "Release"
+set_property(TARGET mongo::mongocxx_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongocxx_shared PROPERTIES
+  IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE "mongo::mongoc_shared"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libmongocxx.so.3.7.0"
+  IMPORTED_SONAME_RELEASE "libmongocxx.so._noabi"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongocxx_shared )
+list(APPEND _cmake_import_check_files_for_mongo::mongocxx_shared "${_IMPORT_PREFIX}/lib/libmongocxx.so.3.7.0" )
+
+# Import target "mongo::mongocxx_static" for configuration "Release"
+set_property(TARGET mongo::mongocxx_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongocxx_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libmongocxx-static.a"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongocxx_static )
+list(APPEND _cmake_import_check_files_for_mongo::mongocxx_static "${_IMPORT_PREFIX}/lib/libmongocxx-static.a" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx_targets.cmake b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx_targets.cmake
new file mode 100644
index 0000000..47ebb99
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/cmake/mongocxx-3.7.0/mongocxx_targets.cmake
@@ -0,0 +1,132 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::mongocxx_shared mongo::mongocxx_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::mongocxx_shared
+add_library(mongo::mongocxx_shared SHARED IMPORTED)
+
+set_target_properties(mongo::mongocxx_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/mongocxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "mongo::bsoncxx_shared"
+)
+
+# Create imported target mongo::mongocxx_static
+add_library(mongo::mongocxx_static STATIC IMPORTED)
+
+set_target_properties(mongo::mongocxx_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "MONGOCXX_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/mongocxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:mongo::mongoc_shared>;mongo::bsoncxx_static"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/mongocxx_targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# Make sure the targets which have been exported in some other
+# export set exist.
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+foreach(_target "mongo::bsoncxx_shared" "mongo::bsoncxx_static" )
+  if(NOT TARGET "${_target}" )
+    set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets "${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets} ${_target}")
+  endif()
+endforeach()
+
+if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+  if(CMAKE_FIND_PACKAGE_NAME)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  else()
+    message(FATAL_ERROR "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  endif()
+endif()
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx-static.a b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx-static.a
new file mode 100644
index 0000000..67a52d3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx-static.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:97df324da317ac74ec0cf8ebeba3eb0f9531a16e3aa6728c263861bd0eeea060
+size 295260
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so
new file mode 100644
index 0000000..70fed88
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b33c6013076fbf2fe28e9bc643c0d25ec414af78410bcb043a91d0e66df03c96
+size 141880
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so.3.7.0 b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so.3.7.0
new file mode 100644
index 0000000..70fed88
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so.3.7.0
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b33c6013076fbf2fe28e9bc643c0d25ec414af78410bcb043a91d0e66df03c96
+size 141880
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so._noabi b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so._noabi
new file mode 100644
index 0000000..70fed88
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libbsoncxx.so._noabi
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b33c6013076fbf2fe28e9bc643c0d25ec414af78410bcb043a91d0e66df03c96
+size 141880
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx-static.a b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx-static.a
new file mode 100644
index 0000000..87b4992
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx-static.a
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c90692c8e5e0bc8a1c9888d9c664498f792e0e722ba865ebe8bf8b94181b757
+size 1810170
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so
new file mode 100644
index 0000000..7a19cfb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc76d7eef079749cabe5d773a745d1bae2970f509de0c6ea188f008f78aa10a6
+size 682760
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so.3.7.0 b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so.3.7.0
new file mode 100644
index 0000000..7a19cfb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so.3.7.0
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc76d7eef079749cabe5d773a745d1bae2970f509de0c6ea188f008f78aa10a6
+size 682760
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so._noabi b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so._noabi
new file mode 100644
index 0000000..7a19cfb
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/libmongocxx.so._noabi
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc76d7eef079749cabe5d773a745d1bae2970f509de0c6ea188f008f78aa10a6
+size 682760
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libbsoncxx-static.pc b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libbsoncxx-static.pc
new file mode 100644
index 0000000..6b241ac
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libbsoncxx-static.pc
@@ -0,0 +1,25 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Linux
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libbsoncxx-static
+Description: The MongoDB C++11 BSON Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Requires: libbson-static-1.0 >= 1.13.0
+Cflags: -I${includedir}/bsoncxx/v_noabi -DBSONCXX_STATIC
+Libs: -L${libdir} -lbsoncxx-static
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libbsoncxx.pc b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libbsoncxx.pc
new file mode 100644
index 0000000..360aa9a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libbsoncxx.pc
@@ -0,0 +1,24 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Linux
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libbsoncxx
+Description: The MongoDB C++11 BSON Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Cflags: -I${includedir}/bsoncxx/v_noabi
+Libs: -L${libdir} -lbsoncxx
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libmongocxx-static.pc b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libmongocxx-static.pc
new file mode 100644
index 0000000..fea7d35
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libmongocxx-static.pc
@@ -0,0 +1,25 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Linux
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libmongocxx
+Description: The MongoDB C++11 Driver Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Requires: libbsoncxx-static >= 3.7.0, libmongoc-static-1.0 >= 1.19.0
+Cflags: -I${includedir}/mongocxx/v_noabi -DMONGOCXX_STATIC
+Libs: -L${libdir} -lmongocxx-static
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libmongocxx.pc b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libmongocxx.pc
new file mode 100644
index 0000000..131ac42
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/lib/pkgconfig/libmongocxx.pc
@@ -0,0 +1,25 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Linux
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libmongocxx
+Description: The MongoDB C++11 Driver Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Requires: libbsoncxx >= 3.7.0
+Cflags: -I${includedir}/mongocxx/v_noabi
+Libs: -L${libdir} -lmongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/LICENSE b/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/LICENSE
new file mode 100644
index 0000000..e06d208
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/README.md b/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/README.md
new file mode 100644
index 0000000..d15f44f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/README.md
@@ -0,0 +1,58 @@
+# MongoDB C++ Driver 
+[![Travis Build Status](https://travis-ci.org/mongodb/mongo-cxx-driver.svg?branch=master)](https://travis-ci.org/mongodb/mongo-cxx-driver)
+[![Evergreen Build Status](https://img.shields.io/badge/build-evergreen-brightgreen)](https://evergreen.mongodb.com/waterfall/cxx-driver)
+[![codecov](https://codecov.io/gh/mongodb/mongo-cxx-driver/branch/master/graph/badge.svg)](https://codecov.io/gh/mongodb/mongo-cxx-driver)
+[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](https://mongocxx.org/api/mongocxx-v3/)
+[![Documentation](https://img.shields.io/badge/docs-mongocxx-green.svg)](https://mongocxx.org/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/mongodb/mongo-cxx-driver/blob/master/LICENSE)
+
+Welcome to the MongoDB C++ Driver!
+
+## Branches - `releases/stable` versus `master`
+
+The default checkout branch of this repository is `releases/stable`. 
+This will always contain the latest stable release of the driver. The
+ `master` branch is used for active development. `master` should 
+**only** be used when making contributions back to the driver, as it 
+is not stable for use in production.
+
+See [Driver Status by family and version](#driver-status-by-family-and-version)
+for more details about the various versions of the driver.
+
+## Resources
+
+* [MongoDB C++ Driver Installation](https://mongocxx.org/mongocxx-v3/installation/)
+* [MongoDB C++ Driver Quickstart](https://mongocxx.org/mongocxx-v3/tutorial/)
+* [MongoDB C++ Driver Manual](https://mongocxx.org)
+* [MongoDB C++ Driver API Documentation](https://mongocxx.org/api/current/)
+* [MongoDB C++ Driver Contribution guidelines](https://mongocxx.org/contributing/)
+* [MongoDB Database Manual](https://docs.mongodb.com/manual/)
+
+## Driver status by family and version
+
+Stability indicates whether this driver is recommended for production use.
+Currently, no drivers guarantee API or ABI stability.
+
+| Family/version       | Stability   | Development         | Purpose                             |
+| -------------------- | ----------- | ------------------- | ----------------------------------- |
+| (repo master branch) | Unstable    | Active development  | New feature development             |
+| mongocxx 3.6.x       | Stable      | Bug fixes only      | Current stable C++ driver release   |
+| mongocxx 3.5.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.4.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.3.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.2.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.1.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.0.x       | Stable      | None                | Previous stable C++ driver release  |
+
+## MongoDB compatibility
+
+Compatibility of each C++ driver version with each MongoDB server is documented in the [MongoDB manual](https://docs.mongodb.com/drivers/cxx#mongodb-compatibility).
+
+## Bugs and issues
+
+See our [JIRA project](http://jira.mongodb.org/browse/CXX).
+
+## License
+
+The source files in this repository are made available under the terms of
+the Apache License, version 2.0.
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/THIRD-PARTY-NOTICES b/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000..1c12e00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/THIRD-PARTY-NOTICES
@@ -0,0 +1,38 @@
+MongoDB uses third-party libraries or other resources that may
+be distributed under licenses different than the MongoDB software.
+
+In the event that we accidentally failed to list a required notice,
+please bring it to our attention through any of the ways detailed here:
+
+    https://jira.mongodb.org/browse/CXX
+
+The attached notices are provided for information only.
+
+For any licenses that require disclosure of source, sources are available at
+https://github.com/mongodb/mongo-cxx-driver.
+
+1) License Notice for the Catch library
+---------------------------------------
+[Note: Catch is used only for testing.]
+
+Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
+
+Distributed under the Boost Software License, Version 1.0.
+See http://www.boost.org/LICENSE_1_0.txt
+
+2) License Notice for the MNMLSTC library
+-----------------------------------------
+[Note: MNMLSTC is the default polyfill.  If configured, it is downloaded
+and compiled during the build.]
+
+Copyright (c) 2013 - 2015 MNMLSTC
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this software except in compliance with the License. You may obtain a
+copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
diff --git a/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/uninstall.sh b/Source/ThirdParty/mongodb_cpp/Linux/share/mongo-cxx-driver/uninstall.sh
new file mode 100644
index 0000000..e69de29
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/bsoncxx.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/bsoncxx.dll
new file mode 100644
index 0000000..55de3f3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/bsoncxx.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1d95726f5e105303222cbd4067dc9b37e97ca92a27f8f3174bbd61c12ef5408
+size 257536
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/concrt140.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/concrt140.dll
new file mode 100644
index 0000000..2d434c8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/concrt140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:573229a07f38ab9d2fc2e1a5b98e9243b9b39100323180c83ad7ddaf98eee46a
+size 317864
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/mongocxx.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/mongocxx.dll
new file mode 100644
index 0000000..886f230
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/mongocxx.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2341049a8b71e1385730ece6a0023529fcd6480485bcec452a4d3fb4929bc1cf
+size 1182720
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140.dll
new file mode 100644
index 0000000..94d67d2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9fee6f36547d6f6ea7ca0338655555dba6bb0f798bc60334d29b94d1547da4da
+size 566704
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_1.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_1.dll
new file mode 100644
index 0000000..25d6b60
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_1.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8731a93e519c2595c9fd489e6d9ac07e964448c0da1c8ee9ee500a7989482617
+size 23944
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_2.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_2.dll
new file mode 100644
index 0000000..7a954db
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_2.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:366af8e071f004da5d95a832a46b2e8821a8e0294340a93f7c95cf48c441067e
+size 186800
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_atomic_wait.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_atomic_wait.dll
new file mode 100644
index 0000000..369db8b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_atomic_wait.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c61a28711f8c6e9bfd4879cf5f53b013d653badad308abe3e887c694b223d6f0
+size 57264
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_codecvt_ids.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_codecvt_ids.dll
new file mode 100644
index 0000000..777f11c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/msvcp140_codecvt_ids.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b45fd069bd0076d8abfeb7c3c30a1f5c5fc8e7124017853a93d831a346c3d21
+size 21424
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/vcruntime140.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/vcruntime140.dll
new file mode 100644
index 0000000..6dca581
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/vcruntime140.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d2b40f0395cc5d1b4d5ea17b84970c29971d448c37104676db577586d4ad1b1
+size 98224
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/bin/vcruntime140_1.dll b/Source/ThirdParty/mongodb_cpp/Win64/bin/vcruntime140_1.dll
new file mode 100644
index 0000000..283fa93
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/bin/vcruntime140_1.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:34048abaa070ecc13b318cea31425f4ca3edd133d350318ac65259e6058c8b32
+size 37256
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp
new file mode 100644
index 0000000..7f77135
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp
@@ -0,0 +1,127 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#include <bsoncxx/document/element.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+namespace bson_value {
+class view;
+}  // namespace bson_value
+}  // namespace types
+
+namespace array {
+
+///
+/// A variant view type that accesses values in serialized BSON arrays.
+///
+/// Element functions as a variant type, where the kind of the element can be
+/// interrogated by calling type() and a specific value can be extracted through
+/// get_X() accessors.
+///
+class BSONCXX_API element : private document::element {
+   public:
+    element();
+
+    using document::element::operator bool;
+
+    using document::element::type;
+
+    using document::element::get_array;
+    using document::element::get_binary;
+    using document::element::get_bool;
+    using document::element::get_code;
+    using document::element::get_codewscope;
+    using document::element::get_date;
+    using document::element::get_dbpointer;
+    using document::element::get_decimal128;
+    using document::element::get_document;
+    using document::element::get_double;
+    using document::element::get_int32;
+    using document::element::get_int64;
+    using document::element::get_maxkey;
+    using document::element::get_minkey;
+    using document::element::get_null;
+    using document::element::get_oid;
+    using document::element::get_regex;
+    using document::element::get_string;
+    using document::element::get_symbol;
+    using document::element::get_timestamp;
+    using document::element::get_undefined;
+    using document::element::get_utf8;
+
+    using document::element::get_value;
+
+    using document::element::operator[];
+
+    using document::element::key;
+    using document::element::keylen;
+    using document::element::length;
+    using document::element::offset;
+    using document::element::raw;
+
+   private:
+    friend class view;
+
+    BSONCXX_PRIVATE explicit element(const std::uint8_t* raw,
+                                     std::uint32_t length,
+                                     std::uint32_t offset,
+                                     std::uint32_t keylen);
+};
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns true if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator==(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator==(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns false if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator!=(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+}  // namespace array
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp
new file mode 100644
index 0000000..35ecd46
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/value.hpp
@@ -0,0 +1,120 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdlib>
+#include <memory>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace array {
+
+///
+/// A read-only BSON array that owns its underlying buffer. When a array::value goes
+/// out of scope, the underlying buffer is freed. Generally this class should be used
+/// sparingly; array::view should be used instead wherever possible.
+///
+class BSONCXX_API value {
+   public:
+    using deleter_type = void (*)(std::uint8_t*);
+    using unique_ptr_type = std::unique_ptr<uint8_t[], deleter_type>;
+
+    ///
+    /// Constructs a value from a buffer.
+    /// This constructor transfers ownership of the buffer to the resulting
+    /// value. A user-provided deleter is used to destroy the buffer.
+    ///
+    /// @param data
+    ///   A pointer to a buffer containing a valid BSON array.
+    /// @param length
+    ///   The length of the document.
+    /// @param dtor
+    ///   A user provided deleter.
+    ///
+    value(std::uint8_t* data, std::size_t length, deleter_type dtor);
+
+    ///
+    /// Constructs a value from a std::unique_ptr to a buffer. The ownership
+    /// of the buffer is transferred to the resulting value.
+    ///
+    /// @param ptr
+    ///   A pointer to a buffer containing a valid BSON array.
+    /// @param length
+    ///   The length of the document.
+    ///
+    value(unique_ptr_type ptr, std::size_t length);
+
+    ///
+    /// Constructs a value from a view of an array. The data referenced
+    /// by the array::view will be copied into a new buffer managed by the
+    /// constructed value.
+    ///
+    /// @param view
+    ///   A view of another array to copy.
+    ///
+    explicit value(array::view view);
+
+    value(const value&);
+    value& operator=(const value&);
+
+    value(value&&) noexcept = default;
+    value& operator=(value&&) noexcept = default;
+
+    ///
+    /// Get a view over the document owned by this value.
+    ///
+    BSONCXX_INLINE array::view view() const noexcept;
+
+    ///
+    /// Conversion operator that provides a view given a value.
+    ///
+    /// @return A view over the value.
+    ///
+    BSONCXX_INLINE operator array::view() const noexcept;
+
+    ///
+    /// Transfer ownership of the underlying buffer to the caller.
+    ///
+    /// @warning
+    ///   After calling release() it is illegal to call any methods
+    ///   on this class, unless it is subsequently moved into.
+    ///
+    /// @return A std::unique_ptr with ownership of the buffer.
+    ///
+    unique_ptr_type release();
+
+   private:
+    unique_ptr_type _data;
+    std::size_t _length{0};
+};
+
+BSONCXX_INLINE array::view value::view() const noexcept {
+    return array::view{static_cast<uint8_t*>(_data.get()), _length};
+}
+
+BSONCXX_INLINE value::operator array::view() const noexcept {
+    return view();
+}
+
+}  // namespace array
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp
new file mode 100644
index 0000000..5dec9f5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/view.hpp
@@ -0,0 +1,200 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+
+#include <bsoncxx/array/element.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+namespace bson_value {
+class view;
+}  // namespace bson_value
+}  // namespace types
+
+namespace array {
+
+///
+/// A read-only, non-owning view of a BSON document.
+///
+class BSONCXX_API view {
+   public:
+    class BSONCXX_API const_iterator;
+    using iterator = const_iterator;
+
+    ///
+    /// @returns A const_iterator to the first element of the array.
+    ///
+    const_iterator cbegin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the array.
+    ///
+    const_iterator cend() const;
+
+    ///
+    /// @returns A const_iterator to the first element of the array.
+    ///
+    const_iterator begin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the array.
+    ///
+    const_iterator end() const;
+
+    ///
+    /// Indexes into this BSON array. If the index is out-of-bounds, a past-the-end iterator
+    /// will be returned. As BSON represents arrays as documents, the runtime of find() is
+    /// linear in the length of the array.
+    ///
+    /// @param i
+    ///   The index of the element.
+    ///
+    /// @return An iterator to the element if it exists, or the past-the-end iterator.
+    ///
+    const_iterator find(std::uint32_t i) const;
+
+    ///
+    /// Indexes into this BSON array. If the index is out-of-bounds, the invalid array::element
+    /// will be returned. As BSON represents arrays as documents, the runtime of operator[] is
+    /// linear in the length of the array.
+    ///
+    /// @param i
+    ///   The index of the element.
+    ///
+    /// @return The element if it exists, or the invalid element.
+    ///
+    element operator[](std::uint32_t i) const;
+
+    ///
+    /// Default constructs a view. The resulting view will be initialized to point at
+    /// an empty BSON array.
+    ///
+    view();
+
+    ///
+    /// Constructs a view from a buffer. The caller is responsible for ensuring that
+    /// the lifetime of the resulting view is a subset of the buffer's.
+    ///
+    /// @param data
+    ///   A buffer containing a valid BSON array.
+    /// @param length
+    ///   The size of the buffer, in bytes.
+    ///
+    view(const std::uint8_t* data, std::size_t length);
+
+    ///
+    /// Access the raw bytes of the underlying array.
+    ///
+    /// @return A (non-owning) pointer to the view's buffer.
+    ///
+    const std::uint8_t* data() const;
+
+    ///
+    /// Gets the length of the underlying buffer.
+    ///
+    /// @remark This is not the number of elements in the array.
+    /// To compute the number of elements, use std::distance.
+    ///
+    /// @return The length of the array, in bytes.
+    ///
+    std::size_t length() const;
+
+    ///
+    /// Checks if the underlying buffer is empty, i.e. it is equivalent to
+    /// the trivial array '[]'.
+    ///
+    /// @return true if the underlying document is empty.
+    ///
+    bool empty() const;
+
+    ///
+    /// Conversion operator unwrapping a document::view
+    ///
+    operator document::view() const;
+
+    ///
+    /// @{
+    ///
+    /// Compare two views for (in)-equality
+    ///
+    /// @relates view
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(view, view);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(view, view);
+    ///
+    /// @}
+    ///
+
+   private:
+    document::view _view;
+};
+
+///
+/// A const iterator over the contents of an array view.
+///
+/// This iterator type provides a const forward iterator interface to array
+/// view elements.
+///
+class BSONCXX_API view::const_iterator {
+   public:
+    ///
+    /// std::iterator_traits
+    ///
+    using value_type = element;
+    using reference = element&;
+    using pointer = element*;
+    using iterator_category = std::forward_iterator_tag;
+    using difference_type = std::ptrdiff_t;
+
+    const_iterator();
+    explicit const_iterator(const element& element);
+
+    reference operator*();
+    pointer operator->();
+
+    const_iterator& operator++();
+    const_iterator operator++(int);
+
+    ///
+    /// @{
+    ///
+    /// Compare two const_iterators for (in)-equality
+    ///
+    /// @relates view::const_iterator
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const const_iterator&, const const_iterator&);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const const_iterator&, const const_iterator&);
+    ///
+    /// @}
+    ///
+
+   private:
+    element _element;
+};
+
+}  // namespace array
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp
new file mode 100644
index 0000000..29c61a3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/array/view_or_value.hpp
@@ -0,0 +1,34 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace array {
+
+using view_or_value = bsoncxx::view_or_value<array::view, array::value>;
+
+}  // namespace array
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp
new file mode 100644
index 0000000..3d515cd
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/array.hpp
@@ -0,0 +1,119 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/builder/basic/impl.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/builder/basic/sub_array.hpp>
+#include <bsoncxx/builder/core.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+///
+/// A traditional builder-style interface for constructing
+/// a BSON array.
+///
+class array : public sub_array {
+   public:
+    ///
+    /// Default constructor
+    ///
+    BSONCXX_INLINE array() : sub_array(&_core), _core(true) {}
+
+    ///
+    /// Move constructor
+    ///
+    BSONCXX_INLINE array(array&& arr) noexcept : sub_array(&_core), _core(std::move(arr._core)) {}
+
+    ///
+    /// Move assignment operator
+    ///
+    BSONCXX_INLINE array& operator=(array&& arr) noexcept {
+        _core = std::move(arr._core);
+        return *this;
+    }
+
+    ///
+    /// @return A view of the BSON array.
+    ///
+    BSONCXX_INLINE bsoncxx::array::view view() const {
+        return _core.view_array();
+    }
+
+    ///
+    /// Conversion operator that provides a view of the current builder
+    /// contents.
+    ///
+    /// @return A view of the current builder contents.
+    ///
+    BSONCXX_INLINE operator bsoncxx::array::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying array to the caller.
+    ///
+    /// @return An array::value with ownership of the array.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequenly moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::array::value extract() {
+        return _core.extract_array();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty array.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+///
+/// Creates an array from a list of elements.
+///
+/// @param args
+///   A variadiac list of elements. The types of the elements can be anything that
+///   builder::basic::sub_array::append accepts.
+///
+/// @return
+///   A bsoncxx::array::value containing the elements.
+///
+template <typename... Args>
+bsoncxx::array::value BSONCXX_CALL make_array(Args&&... args) {
+    basic::array array;
+    array.append(std::forward<Args>(args)...);
+
+    return array.extract();
+}
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp
new file mode 100644
index 0000000..122d482
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/document.hpp
@@ -0,0 +1,122 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/impl.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/builder/basic/sub_document.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+class array;
+
+///
+/// A traditional builder-style interface for constructing
+/// a BSON document.
+///
+class document : public sub_document {
+   public:
+    ///
+    /// Default constructor
+    ///
+    BSONCXX_INLINE document() : sub_document(&_core), _core(false) {}
+
+    ///
+    /// Move constructor
+    ///
+    BSONCXX_INLINE document(document&& doc) noexcept
+        : sub_document(&_core), _core(std::move(doc._core)) {}
+
+    ///
+    /// Move assignment operator
+    ///
+    BSONCXX_INLINE document& operator=(document&& doc) noexcept {
+        _core = std::move(doc._core);
+        return *this;
+    }
+
+    ///
+    /// @return A view of the BSON document.
+    ///
+    BSONCXX_INLINE bsoncxx::document::view view() const {
+        return _core.view_document();
+    }
+
+    ///
+    /// Conversion operator that provides a view of the current builder
+    /// contents.
+    ///
+    /// @return A view of the current builder contents.
+    ///
+    BSONCXX_INLINE operator bsoncxx::document::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequently moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::document::value extract() {
+        return _core.extract_document();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty document.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+///
+/// Creates a document from a list of key-value pairs.
+///
+/// @param args
+///   A variadic list of key-value pairs. The types of the keys and values can be anything that
+///   builder::basic::sub_document::append accepts.
+///
+/// @return
+///   A bsoncxx::document::value containing the elements.
+///
+template <typename... Args>
+bsoncxx::document::value BSONCXX_CALL make_document(Args&&... args) {
+    basic::document document;
+    document.append(std::forward<Args>(args)...);
+
+    return document.extract();
+}
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp
new file mode 100644
index 0000000..58b06ba
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp
@@ -0,0 +1,33 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/concatenate.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+using bsoncxx::builder::concatenate;
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp
new file mode 100644
index 0000000..ab97d81
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/impl.hpp
@@ -0,0 +1,69 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/sub_array.hpp>
+#include <bsoncxx/builder/basic/sub_document.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+namespace impl {
+
+template <typename T>
+using takes_document = typename util::is_functor<T, void(sub_document)>;
+
+template <typename T>
+using takes_array = typename util::is_functor<T, void(sub_array)>;
+
+template <typename T>
+BSONCXX_INLINE typename std::enable_if<takes_document<T>::value, void>::type generic_append(
+    core* core, T&& func) {
+    core->open_document();
+    func(sub_document(core));
+    core->close_document();
+}
+
+template <typename T>
+BSONCXX_INLINE typename std::enable_if<takes_array<T>::value, void>::type generic_append(core* core,
+                                                                                         T&& func) {
+    core->open_array();
+    func(sub_array(core));
+    core->close_array();
+}
+
+template <typename T>
+BSONCXX_INLINE
+    typename std::enable_if<!takes_document<T>::value && !takes_array<T>::value, void>::type
+    generic_append(core* core, T&& t) {
+    core->append(std::forward<T>(t));
+}
+
+template <typename T>
+BSONCXX_INLINE void value_append(core* core, T&& t) {
+    generic_append(core, std::forward<T>(t));
+}
+
+}  // namespace impl
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp
new file mode 100644
index 0000000..0d779aa
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/kvp.hpp
@@ -0,0 +1,40 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <tuple>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+///
+/// Constructs a key-value pair from a string key
+/// and a BSON value.
+///
+template <typename T, typename U>
+BSONCXX_INLINE std::tuple<T&&, U&&> kvp(T&& t, U&& u) {
+    return std::tuple<T&&, U&&>(std::forward<T>(t), std::forward<U>(u));
+}
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp
new file mode 100644
index 0000000..ef8f3d0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_array.hpp
@@ -0,0 +1,86 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/helpers.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/builder/core.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+namespace impl {
+
+template <typename T>
+void value_append(core* core, T&& t);
+
+}  // namespace impl
+
+///
+/// An internal class of builder::basic.
+/// Users should almost always construct a builder::basic::array instead.
+///
+class sub_array {
+   public:
+    ///
+    /// Default constructor
+    ///
+    BSONCXX_INLINE sub_array(core* core) : _core(core) {}
+
+    ///
+    /// Appends multiple BSON values.
+    ///
+    template <typename Arg, typename... Args>
+    BSONCXX_INLINE void append(Arg&& a, Args&&... args) {
+        append_(std::forward<Arg>(a));
+        append(std::forward<Args>(args)...);
+    }
+
+    ///
+    /// Inductive base-case for the variadic append(...)
+    ///
+    BSONCXX_INLINE
+    void append() {}
+
+   private:
+    //
+    // Appends a BSON value.
+    //
+    template <typename T>
+    BSONCXX_INLINE void append_(T&& t) {
+        impl::value_append(_core, std::forward<T>(t));
+    }
+
+    //
+    // Concatenates another bson array directly.
+    //
+    BSONCXX_INLINE
+    void append_(concatenate_array array) {
+        _core->concatenate(array.view());
+    }
+
+    core* _core;
+};
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp
new file mode 100644
index 0000000..7c345d3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/basic/sub_document.hpp
@@ -0,0 +1,105 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/helpers.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace basic {
+
+namespace impl {
+template <typename T>
+void value_append(core* core, T&& t);
+}  // namespace impl
+
+///
+/// An internal class of builder::basic.
+/// Users should almost always construct a builder::basic::document instead.
+///
+class sub_document {
+   public:
+    BSONCXX_INLINE sub_document(core* core) : _core(core) {}
+
+    ///
+    /// Appends multiple basic::kvp key-value pairs.
+    ///
+    template <typename Arg, typename... Args>
+    BSONCXX_INLINE void append(Arg&& a, Args&&... args) {
+        append_(std::forward<Arg>(a));
+        append(std::forward<Args>(args)...);
+    }
+
+    ///
+    /// Inductive base-case for the variadic append(...)
+    ///
+    BSONCXX_INLINE
+    void append() {}
+
+   private:
+    //
+    // Appends a basic::kvp where the key is a non-owning string view.
+    //
+    template <typename K, typename V>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<typename std::decay<K>::type, stdx::string_view>::value>::type
+    append_(std::tuple<K, V>&& t) {
+        _core->key_view(std::forward<K>(std::get<0>(t)));
+        impl::value_append(_core, std::forward<V>(std::get<1>(t)));
+    }
+
+    //
+    // Appends a basic::kvp where the key is an owning STL string.
+    //
+    template <typename K, typename V>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<typename std::decay<K>::type, std::string>::value>::type
+    append_(std::tuple<K, V>&& t) {
+        _core->key_owned(std::forward<K>(std::get<0>(t)));
+        impl::value_append(_core, std::forward<V>(std::get<1>(t)));
+    }
+
+    //
+    // Appends a basic::kvp where the key is a string literal
+    //
+    template <std::size_t n, typename V>
+    BSONCXX_INLINE void append_(std::tuple<const char (&)[n], V>&& t) {
+        _core->key_view(stdx::string_view{std::get<0>(t), n - 1});
+        impl::value_append(_core, std::forward<V>(std::get<1>(t)));
+    }
+
+    //
+    // Concatenates another bson document directly.
+    //
+    BSONCXX_INLINE
+    void append_(concatenate_doc doc) {
+        _core->concatenate(doc);
+    }
+
+    core* _core;
+};
+
+}  // namespace basic
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp
new file mode 100644
index 0000000..39a3943
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp
@@ -0,0 +1,122 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+
+///
+/// Container to concatenate a document. Use it by constructing an instance with the
+/// document to be concatenated, and pass it into a document stream builder.
+///
+struct concatenate_doc {
+    document::view_or_value doc;
+
+    // MSVC seems to need a hint that it should always
+    // inline this destructor.
+    BSONCXX_INLINE ~concatenate_doc() = default;
+
+    ///
+    /// Conversion operator that provides a view of the wrapped concatenate
+    /// document.
+    ///
+    /// @return A view of the wrapped concatenate document.
+    ///
+    BSONCXX_INLINE operator document::view() const {
+        return doc;
+    }
+
+    ///
+    /// Accessor that provides a view of the wrapped concatenate
+    /// document.
+    ///
+    /// @return A view of the wrapped concatenate document.
+    ///
+    BSONCXX_INLINE document::view view() const {
+        return doc;
+    }
+};
+
+///
+/// Container to concatenate an array. Use this with the array stream builder in order
+/// to pass an array into a new builder and append its values to the stream.
+///
+struct concatenate_array {
+    array::view_or_value array;
+
+    // MSVC seems to need a hint that it should always
+    // inline this destructor.
+    BSONCXX_INLINE ~concatenate_array() = default;
+
+    ///
+    /// Conversion operator that provides a view of the wrapped concatenate
+    /// array.
+    ///
+    /// @return A view of the wrapped concatenate array.
+    ///
+    BSONCXX_INLINE operator array::view() const {
+        return array;
+    }
+
+    ///
+    /// Accessor that provides a view of the wrapped concatenate
+    /// array.
+    ///
+    /// @return A view of the wrapped concatenate array.
+    ///
+    BSONCXX_INLINE array::view view() const {
+        return array;
+    }
+};
+
+///
+/// Helper method to concatenate a document. Use this with the document stream
+/// builder to merge an existing document's fields with a new document's.
+///
+/// @param doc A document to be concatenated.
+///
+/// @return concatenate_doc A concatenating struct.
+///
+/// @relatesalso concatenate_doc
+///
+BSONCXX_INLINE concatenate_doc concatenate(document::view_or_value doc) {
+    return {std::move(doc)};
+}
+
+///
+/// Method to concatenate an array with a new array. Use this with the array stream
+/// builder to merge an existing array's fields with a new array.
+///
+/// @param array An array to be concatenated.
+///
+/// @return concatenate_array A concatenating struct.
+///
+/// @relatesalso concatenate_array
+///
+BSONCXX_INLINE concatenate_array concatenate(array::view_or_value array) {
+    return {std::move(array)};
+}
+
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp
new file mode 100644
index 0000000..b0ae781
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/core.hpp
@@ -0,0 +1,698 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+#include <stdexcept>
+#include <type_traits>
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/types.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+
+///
+/// A low-level interface for constructing BSON documents and arrays.
+///
+/// @remark
+///   Generally it is recommended to use the classes in builder::basic or builder::stream instead of
+///   using this class directly. However, developers who wish to write their own abstractions may
+///   find this class useful.
+///
+class BSONCXX_API core {
+   public:
+    class BSONCXX_PRIVATE impl;
+
+    ///
+    /// Constructs an empty BSON datum.
+    ///
+    /// @param is_array
+    ///   True if the top-level BSON datum should be an array.
+    ///
+    explicit core(bool is_array);
+
+    core(core&& rhs) noexcept;
+    core& operator=(core&& rhs) noexcept;
+
+    ~core();
+
+    ///
+    /// Appends a key passed as a non-owning stdx::string_view.
+    ///
+    /// @remark
+    ///   Use key_owned() unless you know what you are doing.
+    ///
+    /// @warning
+    ///   The caller must ensure that the lifetime of the backing string extends until the next
+    ///   value is appended.
+    ///
+    /// @param key
+    ///   A null-terminated array of characters.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is an array or if the previous value
+    /// appended to the builder was also a key.
+    ///
+    core& key_view(stdx::string_view key);
+
+    ///
+    /// Appends a key passed as an STL string.  Transfers ownership of the key to this class.
+    ///
+    /// @param key
+    ///   A string key.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is an array or if the previous value
+    /// appended to the builder was a key.
+    ///
+    core& key_owned(std::string key);
+
+    ///
+    /// Opens a sub-document within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& open_document();
+
+    ///
+    /// Opens a sub-array within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& open_array();
+
+    ///
+    /// Closes the current sub-document within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is not an open sub-document.
+    ///
+    core& close_document();
+
+    ///
+    /// Closes the current sub-array within this BSON datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws bsoncxx::exception if the current BSON datum is not an open sub-array.
+    ///
+    core& close_array();
+
+    ///
+    /// Appends the keys from a BSON document into this BSON datum.
+    ///
+    /// @note
+    ///   If this BSON datum is a document, the original keys from `view` are kept.  Otherwise (if
+    ///   this BSON datum is an array), the original keys from `view` are discarded.
+    ///
+    /// @note
+    ///   This can be used with an array::view as well by converting it to a document::view first.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if one of the keys fails to append.
+    ///
+    core& concatenate(const document::view& view);
+
+    ///
+    /// Appends a BSON double.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the double fails to append.
+    ///
+    core& append(const types::b_double& value);
+
+    ///
+    /// Append a BSON UTF-8 string.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the string fails to append.
+    ///
+    core& append(const types::b_string& value);
+
+    ///
+    /// Appends a BSON document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the document fails to append.
+    ///
+    core& append(const types::b_document& value);
+
+    ///
+    /// Appends a BSON array.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the array fails to append.
+    ///
+    core& append(const types::b_array& value);
+
+    ///
+    /// Appends a BSON binary datum.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the binary fails to append.
+    ///
+    core& append(const types::b_binary& value);
+
+    ///
+    /// Appends a BSON undefined.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if undefined fails to append.
+    ///
+    core& append(const types::b_undefined& value);
+
+    ///
+    /// Appends a BSON ObjectId.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the ObjectId fails to append.
+    ///
+    core& append(const types::b_oid& value);
+
+    ///
+    /// Appends a BSON boolean.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the boolean fails to append.
+    ///
+    core& append(const types::b_bool& value);
+
+    ///
+    /// Appends a BSON date.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the date fails to append.
+    ///
+    core& append(const types::b_date& value);
+
+    ///
+    /// Appends a BSON null.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if null fails to append.
+    ///
+    core& append(const types::b_null& value);
+
+    ///
+    /// Appends a BSON regex.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the regex fails to append.
+    ///
+    core& append(const types::b_regex& value);
+
+    ///
+    /// Appends a BSON DBPointer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the DBPointer fails to append.
+    ///
+    core& append(const types::b_dbpointer& value);
+
+    ///
+    /// Appends a BSON JavaScript code.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the JavaScript code fails to append.
+    ///
+    core& append(const types::b_code& value);
+
+    ///
+    /// Appends a BSON symbol.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the symbol fails to append.
+    ///
+    core& append(const types::b_symbol& value);
+
+    ///
+    /// Appends a BSON JavaScript code with scope.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the JavaScript code with scope fails to append.
+    ///
+    core& append(const types::b_codewscope& value);
+
+    ///
+    /// Appends a BSON 32-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the 32-bit signed integer fails to append.
+    ///
+    core& append(const types::b_int32& value);
+
+    ///
+    /// Appends a BSON replication timestamp.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the timestamp fails to append.
+    ///
+    core& append(const types::b_timestamp& value);
+
+    ///
+    /// Appends a BSON 64-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the 64-bit signed integer fails to append.
+    ///
+    core& append(const types::b_int64& value);
+
+    ///
+    /// Appends a BSON Decimal128.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the Decimal128 fails to append.
+    ///
+    core& append(const types::b_decimal128& value);
+
+    ///
+    /// Appends a BSON min-key.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the min-key fails to append.
+    ///
+    core& append(const types::b_minkey& value);
+
+    ///
+    /// Appends a BSON max-key.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///   bsoncxx::exception if the max-key fails to append.
+    ///
+    core& append(const types::b_maxkey& value);
+
+    ///
+    /// Appends a BSON variant value.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(const types::bson_value::view& value);
+
+    ///
+    /// Appends an STL string as a BSON UTF-8 string.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(std::string str);
+
+    ///
+    /// Appends a string view as a BSON UTF-8 string.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(stdx::string_view str);
+
+    ///
+    /// Appends a char* or const char*.
+    ///
+    /// We disable all other pointer types to prevent the surprising implicit conversion to bool.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    template <typename T>
+    BSONCXX_INLINE core& append(T* v) {
+        static_assert(std::is_same<typename std::remove_const<T>::type, char>::value,
+                      "append is disabled for non-char pointer types");
+        append(types::b_string{v});
+
+        return *this;
+    }
+
+    ///
+    /// Appends a native boolean as a BSON boolean.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(bool value);
+
+    ///
+    /// Appends a native double as a BSON double.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(double value);
+
+    ///
+    /// Appends a native int32_t as a BSON 32-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(std::int32_t value);
+
+    ///
+    /// Appends a native int64_t as a BSON 64-bit signed integer.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(std::int64_t value);
+
+    ///
+    /// Appends an oid as a BSON ObjectId.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(const oid& value);
+
+    ///
+    /// Appends a decimal128 object as a BSON Decimal128.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(decimal128 value);
+
+    ///
+    /// Appends the given document view.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(document::view view);
+
+    ///
+    /// Appends the given array view.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws
+    ///   bsoncxx::exception if the current BSON datum is a document that is waiting for a key to be
+    ///   appended to start a new key/value pair.
+    ///
+    core& append(array::view view);
+
+    ///
+    /// Gets a view over the document.
+    ///
+    /// @return A document::view of the internal BSON.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be a document that is not waiting for a key to be
+    ///    appended to start a new key/value pair, and does contain any open sub-documents or open
+    ///    sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    document::view view_document() const;
+
+    ///
+    /// Gets a view over the array.
+    ///
+    /// @return An array::view of the internal BSON.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be an array that does not contain any open sub-documents
+    ///    or open sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    array::view view_array() const;
+
+    ///
+    /// Transfers ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be a document that is not waiting for a key to be
+    ///    appended to start a new key/value pair, and does not contain any open sub-documents or
+    ///    open sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    /// @warning
+    ///   After calling extract_document() it is illegal to call any methods on this class, unless
+    ///   it is subsequenly moved into.
+    ///
+    document::value extract_document();
+
+    ///
+    /// Transfers ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @pre
+    ///    The top-level BSON datum should be an array that does not contain any open sub-documents
+    ///    or open sub-arrays.
+    ///
+    /// @throws bsoncxx::exception if the precondition is violated.
+    ///
+    /// @warning
+    ///   After calling extract_array() it is illegal to call any methods on this class, unless it
+    ///   is subsequenly moved into.
+    ///
+    array::value extract_array();
+
+    ///
+    /// Deletes the contents of the underlying BSON datum. After calling clear(), the state of this
+    /// class will be the same as it was immediately after construction.
+    ///
+    void clear();
+
+   private:
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp
new file mode 100644
index 0000000..47636e8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp
@@ -0,0 +1,188 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <sstream>
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/exception/error_code.hpp>
+#include <bsoncxx/exception/exception.hpp>
+#include <bsoncxx/types/bson_value/value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+using namespace bsoncxx::types;
+
+///
+/// A JSON-like builder for creating documents and arrays.
+///
+class list {
+    using initializer_list_t = std::initializer_list<list>;
+
+   public:
+    ///
+    /// Creates an empty document.
+    ///
+    list() : list({}) {}
+
+    ///
+    /// Creates a bsoncxx::builder::list from a value of type T. T must be a
+    /// bsoncxx::types::bson_value::value or implicitly convertible to a
+    /// bsoncxx::types::bson_value::value.
+    ///
+    /// @param value
+    ///     the BSON value
+    ///
+    /// @see bsoncxx::types::bson_value::value.
+    ///
+    template <typename T>
+    list(T value) : val{value} {}
+
+    ///
+    /// Creates a BSON document, if possible. Otherwise, it will create a BSON array. A document is
+    /// possible if:
+    //      1. The initializer list's size is even; this implies a list of
+    //         key-value pairs or an empty document if the size is zero.
+    //      2. Each 'key' is a string type. In a list of key-value pairs, the 'key' is every other
+    //         element starting at the 0th element.
+    //
+    /// @param init
+    ///     the initializer list used to construct the BSON document or array
+    ///
+    /// @note
+    ///     to enforce the creation of a BSON document or array use the bsoncxx::builder::document
+    ///     or bsoncxx::builder::array constructor, respectively.
+    ///
+    /// @see bsoncxx::builder::document
+    /// @see bsoncxx::builder::array
+    ///
+    list(initializer_list_t init) : list(init, true, true) {}
+
+    ///
+    /// Provides a view of the underlying BSON value.
+    ///
+    /// @see bsoncxx::types::bson_value::view.
+    ///
+    operator bson_value::view() {
+        return view();
+    }
+
+    ///
+    /// Provides a view of the underlying BSON value.
+    ///
+    /// @see bsoncxx::types::bson_value::view.
+    ///
+    bson_value::view view() {
+        return val.view();
+    }
+
+   private:
+    bson_value::value val;
+
+    friend class document;
+    friend class array;
+
+    list(initializer_list_t init, bool type_deduction, bool is_array) : val{nullptr} {
+        std::stringstream err_msg{"cannot construct document"};
+        bool valid_document = false;
+        if (type_deduction || !is_array) {
+            valid_document = [&] {
+                if (init.size() % 2 != 0) {
+                    err_msg << " : must be list of key-value pairs";
+                    return false;
+                }
+                for (size_t i = 0; i < init.size(); i += 2) {
+                    auto t = (begin(init) + i)->val.view().type();
+                    if (t != type::k_utf8) {
+                        err_msg << " : all keys must be string type. ";
+                        err_msg << "Found type=" << to_string(t);
+                        return false;
+                    }
+                }
+                return true;
+            }();
+        }
+
+        if (valid_document) {
+            core _core{false};
+            for (size_t i = 0; i < init.size(); i += 2) {
+                _core.key_owned(std::string((begin(init) + i)->val.view().get_string().value));
+                _core.append((begin(init) + i + 1)->val);
+            }
+            val = bson_value::value(_core.extract_document());
+        } else if (type_deduction || is_array) {
+            core _core{true};
+            for (auto&& ele : init)
+                _core.append(ele.val);
+            val = bson_value::value(_core.extract_array());
+        } else {
+            throw bsoncxx::exception{error_code::k_unmatched_key_in_builder, err_msg.str()};
+        }
+    }
+};
+
+///
+/// A JSON-like builder for creating documents.
+///
+class document : public list {
+    using initializer_list_t = std::initializer_list<list>;
+
+   public:
+    ///
+    /// Creates an empty document.
+    ///
+    document() : list({}, false, false){};
+
+    ///
+    /// Creates a BSON document.
+    ///
+    /// @param init
+    ///     the initializer list used to construct the BSON document
+    ///
+    /// @see bsoncxx::builder::list
+    /// @see bsoncxx::builder::array
+    ///
+    document(initializer_list_t init) : list(init, false, false) {}
+};
+
+///
+/// A JSON-like builder for creating arrays.
+///
+class array : public list {
+    using initializer_list_t = std::initializer_list<list>;
+
+   public:
+    ///
+    /// Creates an empty array.
+    ///
+    array() : list({}, false, true){};
+
+    ///
+    /// Creates a BSON array.
+    ///
+    /// @param init
+    ///     the initializer list used to construct the BSON array
+    ///
+    /// @see bsoncxx::builder::list
+    /// @see bsoncxx::builder::document
+    ///
+    array(initializer_list_t init) : list(init, false, true) {}
+};
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp
new file mode 100644
index 0000000..41ce3ce
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array.hpp
@@ -0,0 +1,90 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/array_context.hpp>
+#include <bsoncxx/builder/stream/key_context.hpp>
+#include <bsoncxx/builder/stream/single_context.hpp>
+#include <bsoncxx/builder/stream/value_context.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A streaming interface for constructing
+/// a BSON array.
+///
+/// @note Use of the stream builder is discouraged. See
+/// http://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/working-with-bson/#stream-builder for more
+/// details.
+///
+class array : public array_context<> {
+   public:
+    ///
+    /// Default constructor.
+    ///
+    BSONCXX_INLINE array() : array_context<>(&_core), _core(true) {}
+
+    ///
+    /// @return A view of the BSON array.
+    ///
+    BSONCXX_INLINE bsoncxx::array::view view() const {
+        return _core.view_array();
+    }
+
+    ///
+    /// @return A view of the BSON array.
+    ///
+    BSONCXX_INLINE operator bsoncxx::array::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying array to the caller.
+    ///
+    /// @return An array::value with ownership of the array.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequenly moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::array::value extract() {
+        return _core.extract_array();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty array.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp
new file mode 100644
index 0000000..581a6b5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/array_context.hpp
@@ -0,0 +1,202 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/closed_context.hpp>
+#include <bsoncxx/builder/stream/helpers.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+template <class T>
+class key_context;
+
+class single_context;
+
+///
+/// A stream context which expects any number of values.
+///
+/// The template argument can be used to hold additional information about
+/// containing documents or arrays. I.e. value_context<> implies that this array
+/// is a sub_array in a document, while array_context would indicated a sub_array
+/// in an array. These types can be nested, such that contextual parsing (for
+/// key/value pairs) and depth (to prevent an invalid array_close) are enforced
+/// by the type system.
+///
+/// I.e.
+/// builder << array_context << array_context << ...;
+///
+/// This builds a bson array with successively higher index keys
+///
+template <class base = closed_context>
+class array_context {
+   public:
+    ///
+    /// Create an array_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    BSONCXX_INLINE array_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for accepting a real value and appending it to the core
+    ///   builder.
+    ///
+    /// @param t
+    ///   The value to append
+    ///
+    template <class T>
+    BSONCXX_INLINE typename std::enable_if<
+        !(util::is_functor<T, void(array_context<>)>::value ||
+          util::is_functor<T, void(single_context)>::value ||
+          std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value),
+        array_context>::type&
+    operator<<(T&& t) {
+        _core->append(std::forward<T>(t));
+        return *this;
+    }
+
+    ///
+    /// << operator for accepting a callable of the form void(array_context) or
+    ///   void(single_context) and invoking it to perform 1 or more value appends
+    ///   to the core builder.
+    ///
+    /// @param func
+    ///   The callback to invoke
+    ///
+    template <typename Func>
+    BSONCXX_INLINE typename std::enable_if<(util::is_functor<Func, void(array_context<>)>::value ||
+                                            util::is_functor<Func, void(single_context)>::value),
+                                           array_context>::type&
+    operator<<(Func&& func) {
+        func(*this);
+        return *this;
+    }
+
+    ///
+    /// << operator for finalizing the stream.
+    ///
+    /// This operation finishes all processing necessary to fully encode the
+    /// bson bytes and returns an owning value.
+    ///
+    /// @param _
+    ///   A finalize_type token
+    ///
+    /// @return A value type which holds the complete bson document.
+    ///
+    template <typename T>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<base, closed_context>::value &&
+            std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value,
+        // TODO(MSVC): This should just be 'array::value', but
+        // VS2015U1 can't resolve the name.
+        bsoncxx::array::value>::type
+    operator<<(T&&) {
+        return _core->extract_array();
+    }
+
+    ///
+    /// << operator for opening a new subdocument in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE key_context<array_context> operator<<(const open_document_type) {
+        _core->open_document();
+        return wrap_document();
+    }
+
+    ///
+    /// << operator for concatenating another array.
+    ///
+    /// This operation concatenates all of the values from the passed document
+    /// into the current stream. Keys are adjusted to match the existing array.
+    ///
+    /// @param array
+    ///   An array to concatenate
+    ///
+    BSONCXX_INLINE array_context operator<<(concatenate_array array) {
+        _core->concatenate(array.view());
+        return *this;
+    }
+
+    ///
+    /// << operator for opening a new subarray in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE array_context<array_context> operator<<(const open_array_type) {
+        _core->open_array();
+        return wrap_array();
+    }
+
+    ///
+    /// << operator for closing a subarray in the core builder.
+    ///
+    /// @param _
+    ///   A close_array_type token
+    ///
+    BSONCXX_INLINE base operator<<(const close_array_type) {
+        _core->close_array();
+        return unwrap();
+    }
+
+    ///
+    /// Conversion operator which provides a rooted array context given any
+    /// stream currently in a nested array_context.
+    ///
+    BSONCXX_INLINE operator array_context<>() {
+        return array_context<>(_core);
+    }
+
+    ///
+    /// Conversion operator for single_context.
+    ///
+    /// @relatesalso single_context
+    ///
+    BSONCXX_INLINE operator single_context();
+
+   private:
+    BSONCXX_INLINE base unwrap() {
+        return base(_core);
+    }
+
+    BSONCXX_INLINE array_context<array_context> wrap_array() {
+        return array_context<array_context>(_core);
+    }
+
+    BSONCXX_INLINE key_context<array_context> wrap_document() {
+        return key_context<array_context>(_core);
+    }
+
+    core* _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp
new file mode 100644
index 0000000..b0fe9cc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/closed_context.hpp
@@ -0,0 +1,43 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+
+class core;
+
+namespace stream {
+
+///
+/// The closed_context, when used as a template parameter for array_context,
+/// value_context or key_context, indicates that the document cannot be closed
+/// further. This could indicate that the document is the root, or that the type
+/// stack has been intentionally erased, as is the case when using callbacks in
+/// the stream api.
+///
+struct closed_context {
+    closed_context(core*) {}
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp
new file mode 100644
index 0000000..3ceed74
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/document.hpp
@@ -0,0 +1,88 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/key_context.hpp>
+#include <bsoncxx/builder/stream/single_context.hpp>
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A streaming interface for constructing
+/// a BSON document.
+///
+/// @note Use of the stream builder is discouraged. See
+/// http://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/working-with-bson/#stream-builder for more
+/// details.
+///
+class document : public key_context<> {
+   public:
+    ///
+    /// Default constructor.
+    ///
+    BSONCXX_INLINE document() : key_context<>(&_core), _core(false) {}
+
+    ///
+    /// @return A view of the BSON document.
+    ///
+    BSONCXX_INLINE bsoncxx::document::view view() const {
+        return _core.view_document();
+    }
+
+    ///
+    /// @return A view of the BSON document.
+    ///
+    BSONCXX_INLINE operator bsoncxx::document::view() const {
+        return view();
+    }
+
+    ///
+    /// Transfer ownership of the underlying document to the caller.
+    ///
+    /// @return A document::value with ownership of the document.
+    ///
+    /// @warning
+    ///  After calling extract() it is illegal to call any methods
+    ///  on this class, unless it is subsequenly moved into.
+    ///
+    BSONCXX_INLINE bsoncxx::document::value extract() {
+        return _core.extract_document();
+    }
+
+    ///
+    /// Reset the underlying BSON to an empty document.
+    ///
+    BSONCXX_INLINE void clear() {
+        _core.clear();
+    }
+
+   private:
+    core _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp
new file mode 100644
index 0000000..8e822d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/helpers.hpp
@@ -0,0 +1,98 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+using bsoncxx::builder::concatenate;
+
+///
+/// The type of a stream manipulator to open a subdocument.
+///
+struct BSONCXX_API open_document_type {
+    constexpr open_document_type() {}
+};
+
+///
+/// A stream manipulator to open a subdocument.
+///
+constexpr open_document_type open_document;
+
+///
+/// The type of a stream manipulator to close a subdocument.
+///
+struct BSONCXX_API close_document_type {
+    constexpr close_document_type() {}
+};
+
+///
+/// A stream manipulator to close a subdocument.
+///
+constexpr close_document_type close_document;
+
+///
+/// The type of a stream manipulator to open a subarray.
+///
+struct BSONCXX_API open_array_type {
+    constexpr open_array_type() {}
+};
+
+///
+/// A stream manipulator to open a subarray.
+///
+/// @see https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/working-with-bson/#builders for help
+/// building arrays in loops.
+///
+constexpr open_array_type open_array;
+
+///
+/// The type of a stream manipulator to close a subarray.
+///
+struct BSONCXX_API close_array_type {
+    constexpr close_array_type() {}
+};
+
+///
+/// A stream manipulator to close a subarray.
+///
+constexpr close_array_type close_array;
+
+///
+/// The type of a stream manipulator to finalize a document.
+///
+struct BSONCXX_API finalize_type {
+    constexpr finalize_type() {}
+};
+
+///
+/// A stream manipulator to finalize a document. When finalize is passed,
+/// the expression will evaluate to an owning document::value or array::value.
+///
+constexpr finalize_type finalize;
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp
new file mode 100644
index 0000000..a52e86f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/key_context.hpp
@@ -0,0 +1,186 @@
+
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/closed_context.hpp>
+#include <bsoncxx/builder/stream/value_context.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A stream context which expects a key, which can later be followed by
+/// value, then more key/value pairs.
+///
+/// The template argument can be used to hold additional information about
+/// containing documents or arrays. I.e. value_context<> implies that this
+/// document is a sub_document in a document, while array_context would
+/// indicated a sub_document in an array. These types can be nested, such that
+/// contextual parsing (for key/value pairs) and depth (to prevent an invalid
+/// document_close) are enforced by the type system.
+///
+/// When in document context, the first parameter will be in key_context, then
+/// in value_context, then in key_context, etc.
+///
+/// I.e.
+/// builder << key_context << value_context << key_context << ...
+///
+template <class base = closed_context>
+class key_context {
+   public:
+    ///
+    /// Create a key_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    key_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for accepting a literal key and appending it to the core
+    ///   builder.
+    ///
+    /// @param v
+    ///   The key to append
+    ///
+    /// @throws bsoncxx::exception if the previous value appended to the builder was also a key.
+    ///
+    template <std::size_t n>
+    BSONCXX_INLINE value_context<key_context> operator<<(const char (&v)[n]) {
+        _core->key_view(stdx::string_view{v, n - 1});
+        return value_context<key_context>(_core);
+    }
+
+    ///
+    /// << operator for accepting a std::string key and appending it to the core
+    ///   builder.
+    ///
+    /// @param str
+    ///   The key to append
+    ///
+    /// @throws bsoncxx::exception if the previous value appended to the builder was also a key.
+    ///
+    BSONCXX_INLINE value_context<key_context> operator<<(std::string str) {
+        _core->key_owned(std::move(str));
+        return value_context<key_context>(_core);
+    }
+
+    ///
+    /// << operator for accepting a stdx::string_view key and appending it to
+    ///   the core builder.
+    ///
+    /// @param str
+    ///   The key to append
+    ///
+    /// @throws bsoncxx::exception if the previous value appended to the builder was also a key.
+    ///
+    BSONCXX_INLINE value_context<key_context> operator<<(stdx::string_view str) {
+        _core->key_view(std::move(str));
+        return value_context<key_context>(_core);
+    }
+
+    ///
+    /// << operator for accepting a callable of the form void(key_context)
+    ///   and invoking it to perform 1 or more key, value appends to the core
+    ///   builder.
+    ///
+    /// @param func
+    ///   The callback to invoke
+    ///
+    template <typename T>
+    BSONCXX_INLINE
+        typename std::enable_if<util::is_functor<T, void(key_context<>)>::value, key_context>::type&
+        operator<<(T&& func) {
+        func(*this);
+        return *this;
+    }
+
+    ///
+    /// << operator for finalizing the stream.
+    ///
+    /// This operation finishes all processing necessary to fully encode the
+    /// bson bytes and returns an owning value.
+    ///
+    /// @param _
+    ///   A finalize_type token
+    ///
+    /// @return A value type which holds the complete bson document.
+    ///
+    template <typename T>
+    BSONCXX_INLINE typename std::enable_if<
+        std::is_same<base, closed_context>::value &&
+            std::is_same<typename std::remove_reference<T>::type, const finalize_type>::value,
+        // TODO(MSVC): This should just be 'document::value', but
+        // VS2015U1 can't resolve the name.
+        bsoncxx::document::value>::type
+    operator<<(T&&) {
+        return _core->extract_document();
+    }
+
+    ///
+    /// << operator for concatenating another document.
+    ///
+    /// This operation concatenates all of the keys and values from the passed
+    /// document into the current stream.
+    ///
+    /// @param doc
+    ///   A document to concatenate
+    ///
+    BSONCXX_INLINE key_context operator<<(concatenate_doc doc) {
+        _core->concatenate(doc);
+        return *this;
+    }
+
+    ///
+    /// << operator for closing a subdocument in the core builder.
+    ///
+    /// @param _
+    ///   A close_document_type token
+    ///
+    BSONCXX_INLINE base operator<<(const close_document_type) {
+        _core->close_document();
+        return unwrap();
+    }
+
+    ///
+    /// Conversion operator which provides a rooted document given any stream
+    /// currently in a nested key_context.
+    ///
+    BSONCXX_INLINE operator key_context<>() {
+        return key_context<>(_core);
+    }
+
+   private:
+    BSONCXX_INLINE base unwrap() {
+        return base(_core);
+    }
+
+    core* _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp
new file mode 100644
index 0000000..a831275
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/single_context.hpp
@@ -0,0 +1,115 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/array_context.hpp>
+#include <bsoncxx/builder/stream/key_context.hpp>
+#include <bsoncxx/builder/stream/value_context.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A stream context which appends a single value.
+///
+/// This type is useful as the argument to a callable passed to other stream
+/// modes. Specifically, any callback that takes a single_context can be used to
+/// write a value in value_context or array_context.
+///
+class single_context {
+   public:
+    ///
+    /// Create a single_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    BSONCXX_INLINE single_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for opening a new subdocument in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE key_context<> operator<<(open_document_type) {
+        _core->open_document();
+
+        return wrap_document();
+    }
+
+    ///
+    /// << operator for opening a new subarray in the core builder.
+    ///
+    /// @param _
+    ///   An open_array_type token
+    ///
+    BSONCXX_INLINE array_context<> operator<<(open_array_type) {
+        _core->open_array();
+
+        return wrap_array();
+    }
+
+    ///
+    /// << operator for accepting a real value and appending it to the core
+    ///   builder.
+    ///
+    /// @param t
+    ///   The value to append
+    ///
+    template <class T>
+    BSONCXX_INLINE void operator<<(T&& t) {
+        _core->append(std::forward<T>(t));
+    }
+
+   private:
+    BSONCXX_INLINE array_context<> wrap_array() {
+        return array_context<>(_core);
+    }
+
+    BSONCXX_INLINE key_context<> wrap_document() {
+        return key_context<>(_core);
+    }
+
+    core* _core;
+};
+
+///
+/// Implementation of the single_context conversion operator for array_context.
+///
+template <class T>
+BSONCXX_INLINE array_context<T>::operator single_context() {
+    return single_context(_core);
+}
+
+///
+/// Implementation of the single_context conversion operator for value_context.
+///
+template <class T>
+BSONCXX_INLINE value_context<T>::operator single_context() {
+    return single_context(_core);
+}
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp
new file mode 100644
index 0000000..45a1077
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/builder/stream/value_context.hpp
@@ -0,0 +1,145 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/core.hpp>
+#include <bsoncxx/builder/stream/array_context.hpp>
+#include <bsoncxx/builder/stream/closed_context.hpp>
+#include <bsoncxx/builder/stream/helpers.hpp>
+#include <bsoncxx/util/functor.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace builder {
+namespace stream {
+
+///
+/// A stream context which expects a value, which can later be followed by
+/// more key/value pairs.
+///
+/// The template argument can be used to hold additional information about
+/// containing documents or arrays. I.e. value_context<> implies that this
+/// document is a sub_document in a document, while array_context would
+/// indicated a sub_document in an array. These types can be nested, such that
+/// contextual parsing (for key/value pairs) and depth (to prevent an invalid
+/// document_close) are enforced by the type system.
+///
+/// When in document context, the first parameter will be in key_context, then
+/// in value_context, then in key_context, etc.
+///
+/// I.e.
+/// builder << key_context << value_context << key_context << ...
+///
+template <class base>
+class value_context {
+   public:
+    ///
+    /// Create a value_context given a core builder
+    ///
+    /// @param core
+    ///   The core builder to orchestrate
+    ///
+    BSONCXX_INLINE value_context(core* core) : _core(core) {}
+
+    ///
+    /// << operator for accepting a real value and appending it to the core
+    ///   builder.
+    ///
+    /// @param t
+    ///   The value to append
+    ///
+    template <class T>
+    BSONCXX_INLINE
+        typename std::enable_if<!util::is_functor<T, void(single_context)>::value, base>::type
+        operator<<(T&& t) {
+        _core->append(std::forward<T>(t));
+        return unwrap();
+    }
+
+    ///
+    /// << operator for accepting a callable of the form void(single_context)
+    ///   and invoking it to perform a value append to the core builder.
+    ///
+    /// @param func
+    ///   The callback to invoke
+    ///
+    template <typename T>
+    BSONCXX_INLINE
+        typename std::enable_if<util::is_functor<T, void(single_context)>::value, base>::type
+        operator<<(T&& func) {
+        func(*this);
+        return unwrap();
+    }
+
+    ///
+    /// << operator for opening a new subdocument in the core builder.
+    ///
+    /// @param _
+    ///   An open_document_type token
+    ///
+    BSONCXX_INLINE key_context<base> operator<<(const open_document_type) {
+        _core->open_document();
+        return wrap_document();
+    }
+
+    ///
+    /// << operator for opening a new subarray in the core builder.
+    ///
+    /// @param _
+    ///   An open_array_type token
+    ///
+    BSONCXX_INLINE array_context<base> operator<<(const open_array_type) {
+        _core->open_array();
+        return wrap_array();
+    }
+
+    ///
+    /// Conversion operator for single_context.
+    ///
+    /// @relatesalso single_context
+    ///
+    operator single_context();
+
+#if !defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+    // TODO(MSVC): Causes an ICE under VS2015U1
+    static_assert(
+        std::is_same<value_context, decltype(std::declval<value_context>() << 1 << "str")>::value,
+        "value_context must be templatized on a key_context");
+#endif
+
+   private:
+    BSONCXX_INLINE base unwrap() {
+        return base(_core);
+    }
+
+    BSONCXX_INLINE array_context<base> wrap_array() {
+        return array_context<base>(_core);
+    }
+
+    BSONCXX_INLINE key_context<base> wrap_document() {
+        return key_context<base>(_core);
+    }
+
+    core* _core;
+};
+
+}  // namespace stream
+}  // namespace builder
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp
new file mode 100644
index 0000000..6fdf600
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/compiler.hpp
@@ -0,0 +1,32 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#if defined(_MSC_VER)
+
+// Disable MSVC warnings that cause a lot of noise related to DLL visibility
+// for types that we don't control (like std::unique_ptr).
+#pragma warning(push)
+#pragma warning(disable : 4251 4275)
+
+#define BSONCXX_INLINE inline BSONCXX_PRIVATE
+
+#define BSONCXX_CALL __cdecl
+
+#else
+
+#define BSONCXX_INLINE inline BSONCXX_PRIVATE
+
+#define BSONCXX_CALL
+
+#endif
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp
new file mode 100644
index 0000000..1485d85
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/config.hpp
@@ -0,0 +1,23 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/* #undef BSONCXX_POLY_USE_STD_EXPERIMENTAL */
+/* #undef BSONCXX_POLY_USE_MNMLSTC */
+/* #undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC */
+#define BSONCXX_POLY_USE_BOOST
+/* #undef BSONCXX_POLY_USE_STD */
+
+#define BSONCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
+
+#define BSONCXX_INLINE_NAMESPACE_END }  // namespace v_noabi
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp
new file mode 100644
index 0000000..fbac0e7
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/export.hpp
@@ -0,0 +1,42 @@
+
+#ifndef BSONCXX_API_H
+#define BSONCXX_API_H
+
+#ifdef BSONCXX_STATIC
+#  define BSONCXX_API
+#  define BSONCXX_PRIVATE
+#else
+#  ifndef BSONCXX_API
+#    ifdef BSONCXX_EXPORT
+        /* We are building this library */
+#      define BSONCXX_API __declspec(dllexport)
+#    else
+        /* We are using this library */
+#      define BSONCXX_API __declspec(dllimport)
+#    endif
+#  endif
+
+#  ifndef BSONCXX_PRIVATE
+#    define BSONCXX_PRIVATE 
+#  endif
+#endif
+
+#ifndef BSONCXX_DEPRECATED
+#  define BSONCXX_DEPRECATED __declspec(deprecated)
+#endif
+
+#ifndef BSONCXX_DEPRECATED_EXPORT
+#  define BSONCXX_DEPRECATED_EXPORT BSONCXX_API BSONCXX_DEPRECATED
+#endif
+
+#ifndef BSONCXX_DEPRECATED_NO_EXPORT
+#  define BSONCXX_DEPRECATED_NO_EXPORT BSONCXX_PRIVATE BSONCXX_DEPRECATED
+#endif
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef BSONCXX_NO_DEPRECATED
+#    define BSONCXX_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* BSONCXX_API_H */
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
new file mode 100644
index 0000000..15570c6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/postlude.hpp
@@ -0,0 +1,74 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// compiler.hpp
+#undef BSONCXX_INLINE
+#pragma pop_macro("BSONCXX_INLINE")
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+#undef BSONCXX_CALL
+#pragma pop_macro("BSONCXX_CALL")
+
+// src/bsoncxx/config/config.hpp.in
+#undef BSONCXX_INLINE_NAMESPACE_BEGIN
+#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
+#undef BSONCXX_INLINE_NAMESPACE_END
+#pragma pop_macro("BSONCXX_INLINE_NAMESPACE_END")
+#undef BSONCXX_POLY_USE_MNMLSTC
+#pragma pop_macro("BSONCXX_POLY_USE_MNMLSTC")
+#undef BSONCXX_POLY_USE_STD_EXPERIMENTAL
+#pragma pop_macro("BSONCXX_POLY_USE_STD_EXPERIMENTAL")
+#undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC
+#pragma pop_macro("BSONCXX_POLY_USE_SYSTEM_MNMLSTC")
+#undef BSONCXX_POLY_USE_BOOST
+#pragma pop_macro("BSONCXX_POLY_USE_BOOST")
+
+// src/bsoncxx/config/version.hpp.in
+#undef BSONCXX_VERSION_EXTRA
+#pragma pop_macro("BSONCXX_VERSION_EXTRA")
+#undef BSONCXX_VERSION_MAJOR
+#pragma pop_macro("BSONCXX_VERSION_MAJOR")
+#undef BSONCXX_VERSION_MINOR
+#pragma pop_macro("BSONCXX_VERSION_MINOR")
+#undef BSONCXX_VERSION_PATCH
+#pragma pop_macro("BSONCXX_VERSION_PATCH")
+
+// src/bsoncxx/types.hpp
+#ifdef BSONCXX_ENUM
+static_assert(false, "BSONCXX_ENUM must be undef'ed");
+#endif
+#pragma pop_macro("BSONCXX_ENUM")
+
+// export.hpp (generated by cmake)
+#undef BSONCXX_API_H
+#pragma pop_macro("BSONCXX_API_H")
+#undef BSONCXX_API
+#pragma pop_macro("BSONCXX_API")
+#undef BSONCXX_PRIVATE
+#pragma pop_macro("BSONCXX_PRIVATE")
+#undef BSONCXX_DEPRECATED
+#pragma pop_macro("BSONCXX_DEPRECATED")
+#undef BSONCXX_DEPRECATED_EXPORT
+#pragma pop_macro("BSONCXX_DEPRECATED_EXPORT")
+#undef BSONCXX_DEPRECATED_NO_EXPORT
+#pragma pop_macro("BSONCXX_DEPRECATED_NO_EXPORT")
+#undef DEFINE_NO_DEPRECATED
+#pragma pop_macro("DEFINE_NO_DEPRECATED")
+#undef BSONCXX_NO_DEPRECATED
+#pragma pop_macro("BSONCXX_NO_DEPRECATED")
+
+// prelude.hpp
+#undef BSONCXX_UNREACHABLE
+#pragma pop_macro("BSONCXX_UNREACHABLE")
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
new file mode 100644
index 0000000..7e5165a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/prelude.hpp
@@ -0,0 +1,74 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// compiler.hpp
+#pragma push_macro("BSONCXX_INLINE")
+#undef BSONCXX_INLINE
+#pragma push_macro("BSONCXX_CALL")
+#undef BSONCXX_CALL
+
+// src/bsoncxx/config/config.hpp.in
+#pragma push_macro("BSONCXX_INLINE_NAMESPACE_BEGIN")
+#undef BSONCXX_INLINE_NAMESPACE_BEGIN
+#pragma push_macro("BSONCXX_INLINE_NAMESPACE_END")
+#undef BSONCXX_INLINE_NAMESPACE_END
+#pragma push_macro("BSONCXX_POLY_USE_MNMLSTC")
+#undef BSONCXX_POLY_USE_MNMLSTC
+#pragma push_macro("BSONCXX_POLY_USE_STD_EXPERIMENTAL")
+#undef BSONCXX_POLY_USE_STD_EXPERIMENTAL
+#pragma push_macro("BSONCXX_POLY_USE_SYSTEM_MNMLSTC")
+#undef BSONCXX_POLY_USE_SYSTEM_MNMLSTC
+#pragma push_macro("BSONCXX_POLY_USE_BOOST")
+#undef BSONCXX_POLY_USE_BOOST
+
+// src/bsoncxx/config/version.hpp.in
+#pragma push_macro("BSONCXX_VERSION_EXTRA")
+#undef BSONCXX_VERSION_EXTRA
+#pragma push_macro("BSONCXX_VERSION_MAJOR")
+#undef BSONCXX_VERSION_MAJOR
+#pragma push_macro("BSONCXX_VERSION_MINOR")
+#undef BSONCXX_VERSION_MINOR
+#pragma push_macro("BSONCXX_VERSION_PATCH")
+#undef BSONCXX_VERSION_PATCH
+
+// src/bsoncxx/types.hpp
+#pragma push_macro("BSONCXX_ENUM")
+#undef BSONCXX_ENUM
+
+// export.hpp (generated by cmake)
+#pragma push_macro("BSONCXX_API_H")
+#undef BSONCXX_API_H
+#pragma push_macro("BSONCXX_API")
+#undef BSONCXX_API
+#pragma push_macro("BSONCXX_PRIVATE")
+#undef BSONCXX_PRIVATE
+#pragma push_macro("BSONCXX_DEPRECATED")
+#undef BSONCXX_DEPRECATED
+#pragma push_macro("BSONCXX_DEPRECATED_EXPORT")
+#undef BSONCXX_DEPRECATED_EXPORT
+#pragma push_macro("BSONCXX_DEPRECATED_NO_EXPORT")
+#undef BSONCXX_DEPRECATED_NO_EXPORT
+#pragma push_macro("DEFINE_NO_DEPRECATED")
+#undef DEFINE_NO_DEPRECATED
+#pragma push_macro("BSONCXX_NO_DEPRECATED")
+#undef BSONCXX_NO_DEPRECATED
+
+#include <bsoncxx/config/compiler.hpp>
+#include <bsoncxx/config/config.hpp>
+#include <bsoncxx/config/export.hpp>
+#include <bsoncxx/config/version.hpp>
+
+#pragma push_macro("BSONCXX_UNREACHABLE")
+#undef BSONCXX_UNREACHABLE
+#define BSONCXX_UNREACHABLE std::abort()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp
new file mode 100644
index 0000000..19b84b6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/config/version.hpp
@@ -0,0 +1,18 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define BSONCXX_VERSION_MAJOR 3
+#define BSONCXX_VERSION_MINOR 7
+#define BSONCXX_VERSION_PATCH 0
+#define BSONCXX_VERSION_EXTRA 
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp
new file mode 100644
index 0000000..14dacdf
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/decimal128.hpp
@@ -0,0 +1,100 @@
+// Copyright 2016 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Represents an IEEE 754-2008 BSON Decimal128 value in a platform-independent way.
+///
+class BSONCXX_API decimal128 {
+   public:
+    ///
+    /// Constructs a BSON Decimal128 value representing zero.
+    ///
+    decimal128() = default;
+
+    ///
+    /// Constructs a BSON Decimal128 from high and low 64-bit big-endian parts.
+    ///
+    /// @param high
+    ///     The high 64-bits.
+    /// @param low
+    ///     The low 64-bits.
+    ///
+    decimal128(uint64_t high, uint64_t low) noexcept : _high(high), _low(low) {}
+
+    ///
+    /// Constructs a BSON Decimal128 from a string.
+    ///
+    /// @param str
+    ///     A string representation of a decimal number.
+    ///
+    /// @throws bsoncxx::exception if the string isn't a valid BSON Decimal128
+    /// representation.
+    ///
+    explicit decimal128(stdx::string_view str);
+
+    ///
+    /// Converts this decimal128 value to a string representation.
+    ///
+    /// @return A string representation of a IEEE 754-2008 decimal number.
+    ///
+    std::string to_string() const;
+
+    ///
+    /// @{
+    ///
+    /// Relational operators for decimal128
+    ///
+    /// @relates decimal128
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const decimal128& lhs, const decimal128& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const decimal128& lhs, const decimal128& rhs);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Accessor for high 64 bits.
+    ///
+    BSONCXX_INLINE uint64_t high() const {
+        return _high;
+    }
+
+    ///
+    /// Accessor for low 64 bits.
+    ///
+    BSONCXX_INLINE uint64_t low() const {
+        return _low;
+    }
+
+   private:
+    uint64_t _high = 0;
+    uint64_t _low = 0;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp
new file mode 100644
index 0000000..363b1e9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp
@@ -0,0 +1,448 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+enum class type : std::uint8_t;
+enum class binary_sub_type : std::uint8_t;
+
+namespace types {
+struct b_eod;
+struct b_double;
+struct b_string;
+struct b_document;
+struct b_array;
+struct b_binary;
+struct b_undefined;
+struct b_oid;
+struct b_bool;
+struct b_date;
+struct b_null;
+struct b_regex;
+struct b_dbpointer;
+struct b_code;
+struct b_symbol;
+struct b_codewscope;
+struct b_int32;
+struct b_timestamp;
+struct b_int64;
+struct b_decimal128;
+struct b_minkey;
+struct b_maxkey;
+
+namespace bson_value {
+class value;
+class view;
+}  // namespace bson_value
+
+}  // namespace types
+
+namespace array {
+class element;
+}  // namespace array
+
+namespace document {
+
+///
+/// A variant view type that accesses values in serialized BSON documents.
+///
+/// Element functions as a variant type, where the kind of the element can be
+/// interrogated by calling type(), the key can be extracted by calling key() and
+/// a specific value can be extracted through get_X() accessors.
+///
+/// @relatesalso array::element
+///
+class BSONCXX_API element {
+   public:
+    ///
+    /// Construct an invalid element.
+    ///
+    /// This is useful when mapping the end iterator of a document or array
+    /// view.
+    ///
+    element();
+
+    ///
+    /// Conversion operator to bool which is true for valid elements
+    /// and false for invalid elements.
+    ///
+    explicit operator bool() const;
+
+    ///
+    /// Getter for the raw bson bytes the element points to.
+    ///
+    /// @return a pointer to the raw bson bytes.
+    ///
+    const std::uint8_t* raw() const;
+
+    ///
+    /// Getter for length of the raw bson bytes the element points to.
+    ///
+    /// @return a pointer to the length of the raw bson bytes.
+    ///
+    std::uint32_t length() const;
+
+    ///
+    /// Getter for the offset into the raw bson bytes the element points to.
+    ///
+    /// @return the offset into the raw bson bytes.
+    ///
+    std::uint32_t offset() const;
+
+    ///
+    /// Getter for the type of the element.
+    ///
+    /// @return the element's type.
+    ///
+    /// @throws bsoncxx::exception if this element is invalid.
+    ///
+    bsoncxx::type type() const;
+
+    ///
+    /// Getter for the element's key.
+    ///
+    /// @return the element's key.
+    ///
+    /// @throws bsoncxx::exception if this element is invalid.
+    ///
+    stdx::string_view key() const;
+
+    ///
+    /// Getter for the element's key length.
+    ///
+    /// @return the element's key length.
+    ///
+    std::uint32_t keylen() const;
+
+    ///
+    /// Getter for elements of the b_double type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_double.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_double get_double() const;
+
+    ///
+    /// Getter for elements of the b_string type.
+    ///
+    /// @deprecated use document::element::get_string() instead.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_string.
+    ///
+    /// @return the element's value.
+    ///
+    BSONCXX_DEPRECATED types::b_string get_utf8() const;
+
+    ///
+    /// Getter for elements of the b_string type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_string.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_string get_string() const;
+
+    ///
+    /// Getter for elements of the b_document type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_document.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_document get_document() const;
+
+    ///
+    /// Getter for elements of the b_array type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_array.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_array get_array() const;
+
+    ///
+    /// Getter for elements of the b_binary type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_binary.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_binary get_binary() const;
+
+    ///
+    /// Getter for elements of the b_undefined type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_undefined.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_undefined get_undefined() const;
+
+    ///
+    /// Getter for elements of the b_oid type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_oid.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_oid get_oid() const;
+
+    ///
+    /// Getter for elements of the b_bool type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_bool.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_bool get_bool() const;
+
+    ///
+    /// Getter for elements of the b_date type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_date.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_date get_date() const;
+
+    ///
+    /// Getter for elements of the b_null type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_null.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_null get_null() const;
+
+    ///
+    /// Getter for elements of the b_regex type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_regex.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_regex get_regex() const;
+
+    ///
+    /// Getter for elements of the b_dbpointer type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_dbpointer.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_dbpointer get_dbpointer() const;
+
+    ///
+    /// Getter for elements of the b_code type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_code.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_code get_code() const;
+
+    ///
+    /// Getter for elements of the b_symbol type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_symbol.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_symbol get_symbol() const;
+
+    ///
+    /// Getter for elements of the b_codewscope type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_codewscope.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_codewscope get_codewscope() const;
+
+    ///
+    /// Getter for elements of the b_int32 type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_int32.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_int32 get_int32() const;
+
+    ///
+    /// Getter for elements of the b_timestamp type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_timestamp.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_timestamp get_timestamp() const;
+
+    ///
+    /// Getter for elements of the b_int64 type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_int64.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_int64 get_int64() const;
+
+    ///
+    /// Getter for elements of the b_decimal128 type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_decimal128.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_decimal128 get_decimal128() const;
+
+    ///
+    /// Getter for elements of the b_minkey type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_minkey.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_minkey get_minkey() const;
+
+    ///
+    /// Getter for elements of the b_maxkey type.
+    ///
+    /// @throws bsoncxx::exception if this element is not a b_maxkey.
+    ///
+    /// @return the element's value.
+    ///
+    types::b_maxkey get_maxkey() const;
+
+    ///
+    /// Getter for a types::bson_value::view variant wrapper of the value portion of the
+    /// element.
+    ///
+    /// @return the element's value.
+    ///
+    types::bson_value::view get_value() const;
+
+    ///
+    /// Getter for a types::bson_value::value variant wrapper of the value portion of
+    /// the element. The returned object will make a copy of the buffer from this object.
+    ///
+    /// @return an owning version of the element's value.
+    ///
+    types::bson_value::value get_owning_value() const;
+
+    ///
+    /// If this element is a document, finds the first element of the document
+    /// with the provided key. If there is no such element, an invalid
+    /// document::element will be returned.  The runtime of operator[] is
+    /// linear in the length of the document.
+    ///
+    /// If this element is not a document, an invalid document::element will
+    /// be returned.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return The matching element, if found, or an invalid element.
+    ///
+    element operator[](stdx::string_view key) const;
+
+    ///
+    /// If this element is an array, indexes into this BSON array. If the
+    /// index is out-of-bounds, an invalid array::element will be returned. As
+    /// BSON represents arrays as documents, the runtime of operator[] is
+    /// linear in the length of the array.
+    ///
+    /// If this element is not an array, an invalid array::element will
+    /// be returned.
+    ///
+    /// @param i
+    ///   The index of the element.
+    ///
+    /// @return The element if it exists, or an invalid element.
+    ///
+    array::element operator[](std::uint32_t i) const;
+
+   private:
+    ///
+    /// Construct an element as an offset into a buffer of bson bytes.
+    ///
+    /// @param raw
+    ///   A pointer to the raw bson bytes.
+    ///
+    /// @param length
+    ///   The size of the bson buffer.
+    ///
+    /// @param offset
+    ///   The element's offset into the buffer.
+    ///
+    BSONCXX_PRIVATE explicit element(const std::uint8_t* raw,
+                                     std::uint32_t length,
+                                     std::uint32_t offset,
+                                     std::uint32_t keylen);
+
+    friend class view;
+    friend class array::element;
+
+    const std::uint8_t* _raw;
+    std::uint32_t _length;
+    std::uint32_t _offset;
+    std::uint32_t _keylen;
+};
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns true if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator==(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator==(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against a bson_value.
+///
+/// Returns false if this element contains a bson_value that matches.
+///
+/// @relates element
+///
+BSONCXX_API bool BSONCXX_CALL operator!=(const element& elem, const types::bson_value::view& v);
+BSONCXX_API bool BSONCXX_CALL operator!=(const types::bson_value::view& v, const element& elem);
+///
+/// @}
+///
+
+}  // namespace document
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp
new file mode 100644
index 0000000..a9ec570
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/value.hpp
@@ -0,0 +1,265 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdlib>
+#include <memory>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/document/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace document {
+
+///
+/// A read-only BSON document that owns its underlying buffer. When a document::value goes
+/// out of scope, the underlying buffer is freed. Generally this class should be used
+/// sparingly; document::view should be used instead wherever possible.
+///
+class BSONCXX_API value {
+   public:
+    using deleter_type = void (*)(std::uint8_t*);
+    using unique_ptr_type = std::unique_ptr<uint8_t[], deleter_type>;
+
+    ///
+    /// Constructs a value from a buffer.
+    /// This constructor transfers ownership of the buffer to the resulting
+    /// value. A user-provided deleter is used to destroy the buffer.
+    ///
+    /// @param data
+    ///   A pointer to a buffer containing a valid BSON document.
+    /// @param length
+    ///   The length of the document.
+    /// @param dtor
+    ///   A user provided deleter.
+    ///
+    value(std::uint8_t* data, std::size_t length, deleter_type dtor);
+
+    ///
+    /// Constructs a value from a std::unique_ptr to a buffer. The ownership
+    /// of the buffer is transferred to the constructed value.
+    ///
+    /// @param ptr
+    ///   A pointer to a buffer containing a valid BSON document.
+    /// @param length
+    ///   The length of the document.
+    ///
+    value(unique_ptr_type ptr, std::size_t length);
+
+    ///
+    /// Constructs a value from a view of a document. The data referenced
+    /// by the document::view will be copied into a new buffer managed by the
+    /// constructed value.
+    ///
+    /// @param view
+    ///   A view of another document to copy.
+    ///
+    explicit value(document::view view);
+
+    value(const value&);
+    value& operator=(const value&);
+
+    value(value&&) noexcept = default;
+    value& operator=(value&&) noexcept = default;
+
+    ///
+    /// Constructor used for serialization of user objects. This uses argument-dependent lookup
+    /// to find the function declaration `void to_bson(T& t, bsoncxx::document::value doc)`.
+    ///
+    /// @param t
+    ///   A user-defined object to serialize into a BSON object.
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<T, typename array::view>::value, int>::type = 0>
+    explicit value(const T& t) : value({}) {
+        to_bson(t, *this);
+    }
+    template <typename T>
+    value& operator=(const T& t) {
+        *this = value{t};
+        return *this;
+    }
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    document::view::const_iterator cbegin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    document::view::const_iterator cend() const;
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    document::view::const_iterator begin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    document::view::const_iterator end() const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is
+    /// no such element, the past-the-end iterator will be returned. The runtime of
+    /// find() is linear in the length of the document. This method only searches
+    /// the top-level document, and will not recurse to any subdocuments.
+    ///
+    /// @remark In BSON, keys are not required to be unique. If there are multiple
+    /// elements with a matching key in the document, the first matching element from
+    /// the start will be returned.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return An iterator to the matching element, if found, or the past-the-end iterator.
+    ///
+    document::view::const_iterator find(stdx::string_view key) const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is no
+    /// such element, the invalid document::element will be returned. The runtime of operator[]
+    /// is linear in the length of the document.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return The matching element, if found, or the invalid element.
+    ///
+    element operator[](stdx::string_view key) const;
+
+    ///
+    /// Access the raw bytes of the underlying document.
+    ///
+    /// @return A pointer to the value's buffer.
+    ///
+    const std::uint8_t* data() const;
+
+    ///
+    /// Gets the length of the underlying buffer.
+    ///
+    /// @remark This is not the number of elements in the document.
+    /// To compute the number of elements, use std::distance.
+    ///
+    /// @return The length of the document, in bytes.
+    ///
+    std::size_t length() const;
+
+    ///
+    /// Checks if the underlying document is empty, i.e. it is equivalent to
+    /// the trivial document '{}'.
+    ///
+    /// @return true if the underlying document is empty.
+    ///
+    bool empty() const;
+
+    ///
+    /// Get a view over the document owned by this value.
+    ///
+    BSONCXX_INLINE document::view view() const noexcept;
+
+    ///
+    /// Conversion operator that provides a view given a value.
+    ///
+    /// @return A view over the value.
+    ///
+    BSONCXX_INLINE operator document::view() const noexcept;
+
+    ///
+    /// Constructs an object of type T from this document object. This method uses
+    /// argument-dependent lookup to find the function declaration
+    /// `void from_bson(T& t, const bsoncxx::document::view& doc)`.
+    ///
+    /// @note Type T must be default-constructible. Otherwise, use `void get(T& t)`.
+    ///
+    template <typename T>
+    T get() {
+        T temp{};
+        from_bson(temp, this->view());
+        return temp;
+    }
+
+    ///
+    /// Constructs an object of type T from this document object. This method uses
+    /// argument-dependent lookup to find the function declaration
+    /// `void from_bson(T& t, const bsoncxx::document::view& doc)`.
+    ///
+    /// @param t
+    ///   The object to construct. The contents of the document object will be deserialized
+    ///   into t.
+    ///
+    template <typename T>
+    void get(T& t) {
+        from_bson(t, this->view());
+    }
+
+    ///
+    /// Transfer ownership of the underlying buffer to the caller.
+    ///
+    /// @warning
+    ///   After calling release() it is illegal to call any methods
+    ///   on this class, unless it is subsequently moved into.
+    ///
+    /// @return A std::unique_ptr with ownership of the buffer.
+    ///
+    unique_ptr_type release();
+
+    ///
+    /// Replace the formerly-owned buffer with the new view.
+    /// This will make a copy of the passed-in view.
+    ///
+    void reset(document::view view);
+
+   private:
+    unique_ptr_type _data;
+    std::size_t _length{0};
+};
+
+BSONCXX_INLINE document::view value::view() const noexcept {
+    return document::view{static_cast<uint8_t*>(_data.get()), _length};
+}
+
+BSONCXX_INLINE value::operator document::view() const noexcept {
+    return view();
+}
+
+///
+/// @{
+///
+/// Compares two document values for (in)-equality.
+///
+/// @relates document::value
+///
+BSONCXX_INLINE bool operator==(const value& lhs, const value& rhs) {
+    return (lhs.view() == rhs.view());
+}
+
+BSONCXX_INLINE bool operator!=(const value& lhs, const value& rhs) {
+    return !(lhs == rhs);
+}
+
+///
+/// @}
+///
+
+}  // namespace document
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp
new file mode 100644
index 0000000..b05b425
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/view.hpp
@@ -0,0 +1,194 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+
+#include <bsoncxx/document/element.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace document {
+
+///
+/// A read-only, non-owning view of a BSON document.
+///
+class BSONCXX_API view {
+   public:
+    class BSONCXX_API const_iterator;
+    using iterator = const_iterator;
+
+    ///
+    /// Default constructs a view. The resulting view will be initialized to point at
+    /// an empty BSON document.
+    ///
+    view();
+
+    ///
+    /// Constructs a view from a buffer. The caller is responsible for ensuring that
+    /// the lifetime of the resulting view is a subset of the buffer's.
+    ///
+    /// @param data
+    ///   A buffer containing a valid BSON document.
+    /// @param length
+    ///   The size of the buffer, in bytes.
+    ///
+    view(const std::uint8_t* data, std::size_t length);
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    const_iterator cbegin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    const_iterator cend() const;
+
+    ///
+    /// @returns A const_iterator to the first element of the document.
+    ///
+    const_iterator begin() const;
+
+    ///
+    /// @returns A const_iterator to the past-the-end element of the document.
+    ///
+    const_iterator end() const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is
+    /// no such element, the past-the-end iterator will be returned. The runtime of
+    /// find() is linear in the length of the document. This method only searches
+    /// the top-level document, and will not recurse to any subdocuments.
+    ///
+    /// @remark In BSON, keys are not required to be unique. If there are multiple
+    /// elements with a matching key in the document, the first matching element from
+    /// the start will be returned.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return An iterator to the matching element, if found, or the past-the-end iterator.
+    ///
+    const_iterator find(stdx::string_view key) const;
+
+    ///
+    /// Finds the first element of the document with the provided key. If there is no
+    /// such element, the invalid document::element will be returned. The runtime of operator[]
+    /// is linear in the length of the document.
+    ///
+    /// @param key
+    ///   The key to search for.
+    ///
+    /// @return The matching element, if found, or the invalid element.
+    ///
+    element operator[](stdx::string_view key) const;
+
+    ///
+    /// Access the raw bytes of the underlying document.
+    ///
+    /// @return A (non-owning) pointer to the view's buffer.
+    ///
+    const std::uint8_t* data() const;
+
+    ///
+    /// Gets the length of the underlying buffer.
+    ///
+    /// @remark This is not the number of elements in the document.
+    /// To compute the number of elements, use std::distance.
+    ///
+    /// @return The length of the document, in bytes.
+    ///
+    std::size_t length() const;
+
+    ///
+    /// Checks if the underlying document is empty, i.e. it is equivalent to
+    /// the trivial document '{}'.
+    ///
+    /// @return true if the underlying document is empty.
+    ///
+    bool empty() const;
+
+    ///
+    /// @{
+    ///
+    /// Compare two document views for (in)-equality
+    ///
+    /// @relates view
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(view, view);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(view, view);
+    ///
+    /// @}
+    ///
+
+   private:
+    const std::uint8_t* _data;
+    std::size_t _length;
+};
+
+///
+/// A const iterator over the contents of a document view.
+///
+/// This iterator type provides a const forward iterator interface to document
+/// view elements.
+///
+class BSONCXX_API view::const_iterator {
+   public:
+    ///
+    /// std::iterator_traits
+    ///
+    using value_type = element;
+    using reference = element&;
+    using pointer = element*;
+    using iterator_category = std::forward_iterator_tag;
+    using difference_type = std::ptrdiff_t;
+
+    const_iterator();
+    explicit const_iterator(const element& element);
+
+    reference operator*();
+    pointer operator->();
+
+    const_iterator& operator++();
+    const_iterator operator++(int);
+
+    ///
+    /// @{
+    ///
+    /// Compares two const_iterators for (in)-equality
+    ///
+    /// @relates view::const_iterator
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const const_iterator&, const const_iterator&);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const const_iterator&, const const_iterator&);
+    ///
+    /// @}
+    ///
+
+   private:
+    element _element;
+};
+
+}  // namespace document
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp
new file mode 100644
index 0000000..5fb3466
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/document/view_or_value.hpp
@@ -0,0 +1,33 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace document {
+
+using view_or_value = bsoncxx::view_or_value<document::view, document::value>;
+
+}  // namespace document
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp
new file mode 100644
index 0000000..bef4b39
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/enums/binary_sub_type.hpp
@@ -0,0 +1,27 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef BSONCXX_ENUM
+#error "This header is only meant to be included as an X-macro over BSONCXX_ENUM"
+#endif
+
+BSONCXX_ENUM(binary, 0x00)
+BSONCXX_ENUM(function, 0x01)
+BSONCXX_ENUM(binary_deprecated, 0x02)
+BSONCXX_ENUM(uuid_deprecated, 0x03)
+BSONCXX_ENUM(uuid, 0x04)
+BSONCXX_ENUM(md5, 0x05)
+BSONCXX_ENUM(encrypted, 0x06)
+BSONCXX_ENUM(column, 0x07)
+BSONCXX_ENUM(user, 0x80)
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp
new file mode 100644
index 0000000..bd94b1e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/enums/type.hpp
@@ -0,0 +1,39 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef BSONCXX_ENUM
+#error "This header is only meant to be included as an X-macro over BSONCXX_ENUM"
+#endif
+
+BSONCXX_ENUM(double, 0x01)
+BSONCXX_ENUM(string, 0x02)
+BSONCXX_ENUM(document, 0x03)
+BSONCXX_ENUM(array, 0x04)
+BSONCXX_ENUM(binary, 0x05)
+BSONCXX_ENUM(undefined, 0x06)
+BSONCXX_ENUM(oid, 0x07)
+BSONCXX_ENUM(bool, 0x08)
+BSONCXX_ENUM(date, 0x09)
+BSONCXX_ENUM(null, 0x0A)
+BSONCXX_ENUM(regex, 0x0B)
+BSONCXX_ENUM(dbpointer, 0x0C)
+BSONCXX_ENUM(code, 0x0D)
+BSONCXX_ENUM(symbol, 0x0E)
+BSONCXX_ENUM(codewscope, 0x0F)
+BSONCXX_ENUM(int32, 0x10)
+BSONCXX_ENUM(timestamp, 0x11)
+BSONCXX_ENUM(int64, 0x12)
+BSONCXX_ENUM(decimal128, 0x13)
+BSONCXX_ENUM(maxkey, 0x7F)
+BSONCXX_ENUM(minkey, 0xFF)
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
new file mode 100644
index 0000000..4988fa3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp
@@ -0,0 +1,129 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <system_error>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the various error types that can occur while operating on BSON values.
+///
+enum class error_code : std::int32_t {
+    /// A new key was appended while building a subarray.
+    k_cannot_append_key_in_sub_array = 1,
+
+    /// A subarray was closed while building a subdocument.
+    k_cannot_close_array_in_sub_document,
+
+    /// A subdocument was closed while building a subarray.
+    k_cannot_close_document_in_sub_array,
+
+    /// An array operation was performed while building a document.
+    k_cannot_perform_array_operation_on_document,
+
+    /// A document operation was performed while building an array.
+    k_cannot_perform_document_operation_on_array,
+#define BSONCXX_ENUM(name, value) k_need_element_type_k_##name,
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+    /// No key was provided when one was needed.
+    k_need_key,
+
+    /// An array was closed while no array was open.
+    k_no_array_to_close,
+
+    /// A document was closed while no document was open.
+    k_no_document_to_close,
+
+    // Attempted to view or extract a document when a key was still awaiting a matching value.
+    k_unmatched_key_in_builder,
+
+    /// An empty element was accessed.
+    k_unset_element,
+
+    /// A JSON document failed to parse.
+    k_json_parse_failure,
+
+    /// An Object ID string failed to parse.
+    k_invalid_oid,
+
+    // This type is unused and deprecated.
+    k_failed_converting_bson_to_json,
+
+    /// A Decimal128 string failed to parse.
+    k_invalid_decimal128,
+
+    /// BSON data could not be processed, but no specific reason was available.
+    k_internal_error,
+
+    /// Failed to begin appending an array to a BSON document or array.
+    k_cannot_begin_appending_array,
+
+    /// Failed to begin appending a BSON document to a BSON document or array.
+    k_cannot_begin_appending_document,
+
+    /// Failed to complete appending an array to a BSON document or array.
+    k_cannot_end_appending_array,
+
+    /// Failed to complete appending a BSON document to a BSON document or array.
+    k_cannot_end_appending_document,
+
+    /// Invalid binary subtype.
+    k_invalid_binary_subtype,
+
+    /// Invalid type.
+    k_invalid_bson_type_id,
+
+/// A value failed to append.
+#define BSONCXX_ENUM(name, value) k_cannot_append_##name,
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+    k_cannot_append_utf8 = k_cannot_append_string,
+    k_need_element_type_k_utf8 = k_need_element_type_k_string,
+    // Add new constant string message to error_code.cpp as well!
+};
+
+///
+/// Get the error_category for exceptions originating from the bsoncxx library.
+///
+/// @return The bsoncxx error_category
+///
+BSONCXX_API const std::error_category& BSONCXX_CALL error_category();
+
+///
+/// Translate a bsoncxx::error_code into a std::error_code.
+///
+/// @param error An error from bsoncxx
+/// @return An error_code
+///
+BSONCXX_INLINE std::error_code make_error_code(error_code error) {
+    return {static_cast<int>(error), error_category()};
+}
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
+
+namespace std {
+// Specialize is_error_code_enum so we get simpler std::error_code construction
+template <>
+struct is_error_code_enum<bsoncxx::error_code> : public true_type {};
+}  // namespace std
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
new file mode 100644
index 0000000..949f76e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/exception/exception.hpp
@@ -0,0 +1,35 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <system_error>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing any exceptions emitted from the bsoncxx library or
+/// its underlying implementation.
+///
+class BSONCXX_API exception : public std::system_error {
+    using std::system_error::system_error;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/json.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/json.hpp
new file mode 100644
index 0000000..1353701
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/json.hpp
@@ -0,0 +1,90 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+///
+/// Top level namespace for MongoDB C++ BSON functionality.
+///
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+// Placing this variable between the `BSONCXX_INLINE_NAMESPACE_BEGIN` and the Doxygen documentation
+// for `to_json` suppressed the macro name from being shown as part of the return type in the
+// generated documentation pages.
+extern const bool k_silence_doxygen;
+
+///
+/// An enumeration of the types of Extended JSON that the to_json function accepts
+enum class ExtendedJsonMode : std::uint8_t {
+    k_legacy,     ///< to produce Legacy Extended JSON
+    k_canonical,  ///< to produce Canonical Extended JSON
+    k_relaxed,    ///< to produce Relaxed Extended JSON
+};
+
+///
+/// Converts a BSON document to a JSON string, in extended format.
+///
+/// @param view
+///   A valid BSON document.
+/// @param mode
+///   An optional JSON representation mode.
+///
+/// @throws bsoncxx::exception with error details if the conversion failed.
+///
+/// @returns An extended JSON string.
+///
+BSONCXX_API std::string BSONCXX_CALL to_json(document::view view,
+                                             ExtendedJsonMode mode = ExtendedJsonMode::k_legacy);
+
+///
+/// Constructs a new document::value from the provided JSON text.
+///
+/// @param 'json'
+///  A string_view into a JSON document.
+///
+/// @returns A document::value if conversion worked.
+///
+/// @throws bsoncxx::exception with error details if the conversion failed.
+///
+BSONCXX_API document::value BSONCXX_CALL from_json(stdx::string_view json);
+
+///
+/// Constructs a new document::value from the provided JSON text. This is the UDL version of
+/// from_json().
+///
+/// @param 'json'
+///  A string into a JSON document.
+///
+/// @param 'len'
+///  The length of the JSON string. This is calculated automatically upon use of the UDL.
+///
+/// @returns A document::value if conversion worked.
+///
+/// @throws bsoncxx::exception with error details if the conversion failed.
+///
+BSONCXX_API document::value BSONCXX_CALL operator"" _bson(const char* json, size_t len);
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/oid.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/oid.hpp
new file mode 100644
index 0000000..fb5c2ca
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/oid.hpp
@@ -0,0 +1,126 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <array>
+#include <ctime>
+#include <string>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Represents a MongoDB ObjectId. As this BSON type is used within the MongoDB server
+/// as a primary key for each document, it is useful for representing a 'pointer'
+/// to another document.
+///
+/// @note we use 'oid' to refer to this concrete class. We use 'ObjectId' to refer
+/// to the BSON type.
+///
+/// @see https://docs.mongodb.com/manual/reference/object-id/
+///
+class BSONCXX_API oid {
+   public:
+    static constexpr std::size_t k_oid_length = 12;
+
+    ///
+    /// Constructs an oid and initializes it to a newly generated ObjectId.
+    ///
+    oid();
+
+    ///
+    /// Constructs an oid initializes it to the contents of the provided buffer.
+    ///
+    /// @param bytes
+    ///   A pointer a buffer containing a valid ObjectId.
+    /// @param len
+    ///   The length of the buffer. Should be equal to oid::size().
+    ///
+    /// @throws bsoncxx::exception if the length is not equal to oid::size().
+    ///
+    explicit oid(const char* bytes, std::size_t len);
+
+    ///
+    /// Constructs an oid and initializes it from the provided hex string.
+    ///
+    /// @param str
+    ///   A string of a hexadecimal representation of a valid ObjectId.
+    ///
+    /// @throws bsoncxx::exception if the string isn't an OID-sized hex
+    /// string.
+    ///
+    explicit oid(const bsoncxx::stdx::string_view& str);
+
+    ///
+    /// Converts this oid to a hexadecimal string.
+    ///
+    /// @return A hexadecimal string representation of this ObjectId.
+    ///
+    std::string to_string() const;
+
+    ///
+    /// Returns the number of bytes in this ObjectId.
+    ///
+    /// @return The length of this oid's buffer.
+    ///
+    static std::size_t size() {
+        return k_oid_length;
+    }
+
+    ///
+    /// @{
+    ///
+    /// Relational operators for OIDs
+    ///
+    /// @relates oid
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator<(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator>(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator<=(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator>=(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const oid& lhs, const oid& rhs);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const oid& lhs, const oid& rhs);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Extracts the timestamp portion of the underlying ObjectId.
+    ///
+    /// @return A std::time_t initialized to the timestamp.
+    ///
+    std::time_t get_time_t() const;
+
+    ///
+    /// An accessor for the internal data buffer in the oid.
+    ///
+    /// @return A pointer to the internal buffer holding the oid bytes.
+    ///
+    const char* bytes() const;
+
+   private:
+    friend BSONCXX_PRIVATE int oid_compare(const oid& lhs, const oid& rhs);
+
+    std::array<char, k_oid_length> _bytes;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp
new file mode 100644
index 0000000..d954eae
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/make_unique.hpp
@@ -0,0 +1,69 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+#if defined(BSONCXX_POLY_USE_MNMLSTC)
+
+#if defined(MONGO_CXX_DRIVER_COMPILING) || defined(BSONCXX_POLY_USE_SYSTEM_MNMLSTC)
+#include <core/memory.hpp>
+#else
+#include <bsoncxx/third_party/mnmlstc/core/memory.hpp>
+#endif
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::core::make_unique;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_BOOST)
+
+#include <boost/smart_ptr/make_unique.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::boost::make_unique;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif __cplusplus >= 201402L
+
+#include <memory>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::make_unique;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+#error "Cannot find a valid polyfill for make_unique"
+#endif
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
new file mode 100644
index 0000000..a62fd1b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/optional.hpp
@@ -0,0 +1,99 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+#if defined(BSONCXX_POLY_USE_MNMLSTC)
+
+#if defined(MONGO_CXX_DRIVER_COMPILING) || defined(BSONCXX_POLY_USE_SYSTEM_MNMLSTC)
+#include <core/optional.hpp>
+#else
+#include <bsoncxx/third_party/mnmlstc/core/optional.hpp>
+#endif
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::core::make_optional;
+using ::core::nullopt;
+using ::core::nullopt_t;
+using ::core::optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_BOOST)
+
+#include <boost/none.hpp>
+#include <boost/optional/optional.hpp>
+#include <boost/optional/optional_io.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::boost::optional;
+using nullopt_t = ::boost::none_t;
+
+// TODO(MSVC): This would be better expressed as constexpr, but VS2015U1 can't do it.
+const nullopt_t nullopt{::boost::none};
+using ::boost::make_optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_STD_EXPERIMENTAL)
+
+#include <experimental/optional>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::experimental::make_optional;
+using ::std::experimental::nullopt;
+using ::std::experimental::nullopt_t;
+using ::std::experimental::optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_STD)
+
+#include <optional>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::make_optional;
+using ::std::nullopt;
+using ::std::nullopt_t;
+using ::std::optional;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+#error "Cannot find a valid polyfill for optional"
+#endif
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
new file mode 100644
index 0000000..581d346
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/stdx/string_view.hpp
@@ -0,0 +1,109 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/config/prelude.hpp>
+
+#if defined(BSONCXX_POLY_USE_MNMLSTC)
+
+#if defined(MONGO_CXX_DRIVER_COMPILING) || defined(BSONCXX_POLY_USE_SYSTEM_MNMLSTC)
+#include <core/string.hpp>
+#else
+#include <bsoncxx/third_party/mnmlstc/core/string.hpp>
+#endif
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::core::basic_string_view;
+using ::core::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_BOOST)
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 106100
+
+#include <boost/utility/string_view.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::boost::basic_string_view;
+using ::boost::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+
+#include <boost/utility/string_ref.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+template <typename charT, typename traits = std::char_traits<charT>>
+using basic_string_view = ::boost::basic_string_ref<charT, traits>;
+using string_view = ::boost::string_ref;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#endif
+
+#elif defined(BSONCXX_POLY_USE_STD_EXPERIMENTAL)
+
+#include <experimental/string_view>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::experimental::basic_string_view;
+using ::std::experimental::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#elif defined(BSONCXX_POLY_USE_STD)
+
+#include <string_view>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+using ::std::basic_string_view;
+using ::std::string_view;
+
+}  // namespace stdx
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#else
+#error "Cannot find a valid polyfill for string_view"
+#endif
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp
new file mode 100644
index 0000000..42546dc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/string/to_string.hpp
@@ -0,0 +1,40 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <utility>
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace string {
+
+template <class CharT,
+          class Traits = std::char_traits<CharT>,
+          class Allocator = std::allocator<CharT>>
+BSONCXX_INLINE std::basic_string<CharT, Traits, Allocator> to_string(
+    stdx::basic_string_view<CharT, Traits> value, const Allocator& alloc = Allocator()) {
+    return std::basic_string<CharT, Traits, Allocator>{value.data(), value.length(), alloc};
+}
+
+}  // namespace string
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp
new file mode 100644
index 0000000..e5b5aa5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/string/view_or_value.hpp
@@ -0,0 +1,123 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace string {
+
+///
+/// Class representing a view-or-value variant type for strings.
+///
+/// This class adds several string-specific methods to the bsoncxx::view_or_value template:
+/// - a constructor overload for const char*
+/// - a constructor overload for std::string by l-value reference
+/// - a safe c_str() operation to return null-terminated c-style strings.
+///
+class BSONCXX_API view_or_value : public bsoncxx::view_or_value<stdx::string_view, std::string> {
+   public:
+    ///
+    /// Forward all bsoncxx::view_or_value constructors.
+    ///
+    using bsoncxx::view_or_value<stdx::string_view, std::string>::view_or_value;
+
+    ///
+    /// Default constructor, equivalent to using an empty string.
+    ///
+    BSONCXX_INLINE view_or_value() = default;
+
+    ///
+    /// Construct a string::view_or_value using a null-terminated const char *.
+    /// The resulting view_or_value will keep a string_view of 'str', so it is
+    /// important that the passed-in string outlive this object.
+    ///
+    /// @param str A null-terminated string
+    ///
+    BSONCXX_INLINE view_or_value(const char* str)
+        : bsoncxx::view_or_value<stdx::string_view, std::string>(stdx::string_view(str)) {}
+
+    ///
+    /// Allow construction with an l-value reference to a std::string. The resulting
+    /// view_or_value will keep a string_view of 'str', so it is important that the
+    /// passed-in string outlive this object.
+    ///
+    /// Construction calls passing a std::string by r-value reference will use the
+    /// constructor defined in the parent view_or_value class.
+    ///
+    /// @param str A std::string l-value reference.
+    ///
+    BSONCXX_INLINE view_or_value(const std::string& str)
+        : bsoncxx::view_or_value<stdx::string_view, std::string>(stdx::string_view(str)) {}
+
+    ///
+    /// Return a string_view_or_value that is guaranteed to hold a null-terminated
+    /// string. The lifetime of the returned object must be a subset of this object's
+    /// lifetime, because the new view_or_value might hold a view into this one.
+    ///
+    /// It is recommended that this method be used before calling .data() on a
+    /// view_or_value, as that method may return a non-null-terminated string.
+    ///
+    /// @return A new view_or_value object.
+    ///
+    view_or_value terminated() const;
+
+    ///
+    /// Call data() on this view_or_value's string_view. This method is not
+    /// guaranteed to return a null-terminated string unless it is used in
+    /// combination with terminated().
+    ///
+    /// @return A const char* of this string.
+    ///
+    const char* data() const;
+};
+
+///
+/// @{
+///
+/// Comparison operators for comparing string::view_or_value directly with const char *.
+///
+/// @relates view_or_value
+///
+BSONCXX_INLINE bool operator==(const view_or_value& lhs, const char* rhs) {
+    return lhs.view() == stdx::string_view(rhs);
+}
+
+BSONCXX_INLINE bool operator!=(const view_or_value& lhs, const char* rhs) {
+    return !(lhs == rhs);
+}
+
+BSONCXX_INLINE bool operator==(const char* lhs, const view_or_value& rhs) {
+    return rhs == lhs;
+}
+
+BSONCXX_INLINE bool operator!=(const char* lhs, const view_or_value& rhs) {
+    return !(rhs == lhs);
+}
+///
+/// @}
+///
+
+}  // namespace string
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types.hpp
new file mode 100644
index 0000000..865aab5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types.hpp
@@ -0,0 +1,697 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+#if defined(__clang__)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wfloat-equal"
+#elif defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+#include <chrono>
+#include <cstring>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/decimal128.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// An enumeration of each BSON type.
+/// These x-macros will expand to be of the form:
+///    k_double = 0x01,
+///    k_string = 0x02,
+///    k_document = 0x03,
+///    k_array = 0x04 ...
+///
+enum class type : std::uint8_t {
+#define BSONCXX_ENUM(name, val) k_##name = val,
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+    k_utf8 = 0x02,
+};
+
+///
+/// An enumeration of each BSON binary sub type.
+/// These x-macros will expand to be of the form:
+///   k_binary = 0x00,
+///   k_function = 0x01,
+///   k_binary_deprecated = 0x02,
+///   k_uuid_deprecated = 0x03,
+///   k_uuid = 0x04,
+///   k_md5 = 0x05,
+///   k_encrypted = 0x06,
+///   k_column = 0x07,
+///   k_user = 0x80
+///
+enum class binary_sub_type : std::uint8_t {
+#define BSONCXX_ENUM(name, val) k_##name = val,
+#include <bsoncxx/enums/binary_sub_type.hpp>
+#undef BSONCXX_ENUM
+};
+
+///
+/// Returns a stringification of the given type.
+///
+/// @param rhs
+///   The type to stringify.
+///
+/// @return a std::string representation of the type.
+///
+BSONCXX_API std::string BSONCXX_CALL to_string(type rhs);
+
+///
+/// Returns a stringification of the given binary sub type.
+///
+/// @param rhs
+///   The type to stringify.
+///
+/// @return a std::string representation of the type.
+///
+BSONCXX_API std::string BSONCXX_CALL to_string(binary_sub_type rhs);
+
+namespace types {
+
+///
+/// A BSON double value.
+///
+struct BSONCXX_API b_double {
+    static constexpr auto type_id = type::k_double;
+
+    double value;
+
+    ///
+    /// Conversion operator unwrapping a double
+    ///
+    BSONCXX_INLINE operator double() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_double
+///
+/// @relatesalso b_double
+///
+BSONCXX_INLINE bool operator==(const b_double& lhs, const b_double& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON UTF-8 encoded string value.
+///
+struct BSONCXX_API b_string {
+    static constexpr auto type_id = type::k_string;
+
+    ///
+    /// Constructor for b_string.
+    ///
+    /// @param t
+    ///   The value to wrap.
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<b_string, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_string(T&& t) : value(std::forward<T>(t)) {}
+
+    stdx::string_view value;
+
+    ///
+    /// Conversion operator unwrapping a string_view
+    ///
+    BSONCXX_INLINE operator stdx::string_view() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_string
+///
+/// @relatesalso b_string
+///
+BSONCXX_INLINE bool operator==(const b_string& lhs, const b_string& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// This class has been renamed to b_string
+///
+/// @deprecated use b_string instead.
+///
+BSONCXX_DEPRECATED typedef b_string b_utf8;
+
+///
+/// A BSON document value.
+///
+struct BSONCXX_API b_document {
+    static constexpr auto type_id = type::k_document;
+
+    document::view value;
+
+    ///
+    /// Conversion operator unwrapping a document::view
+    ///
+    BSONCXX_INLINE operator document::view() const {
+        return value;
+    }
+
+    ///
+    /// Returns an unwrapped document::view
+    ///
+    BSONCXX_INLINE document::view view() {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_document
+///
+/// @relatesalso b_document
+///
+BSONCXX_INLINE bool operator==(const b_document& lhs, const b_document& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON array value.
+///
+struct BSONCXX_API b_array {
+    static constexpr auto type_id = type::k_array;
+
+    array::view value;
+
+    ///
+    /// Conversion operator unwrapping an array::view
+    ///
+    BSONCXX_INLINE operator array::view() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_array
+///
+/// @relatesalso b_array
+///
+BSONCXX_INLINE bool operator==(const b_array& lhs, const b_array& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON binary data value.
+///
+struct BSONCXX_API b_binary {
+    static constexpr auto type_id = type::k_binary;
+
+    binary_sub_type sub_type;
+    uint32_t size;
+    const uint8_t* bytes;
+};
+
+///
+/// free function comparator for b_binary
+///
+/// @relatesalso b_binary
+///
+BSONCXX_INLINE bool operator==(const b_binary& lhs, const b_binary& rhs) {
+    return lhs.sub_type == rhs.sub_type && lhs.size == rhs.size &&
+           (!lhs.size || (std::memcmp(lhs.bytes, rhs.bytes, lhs.size) == 0));
+}
+
+///
+/// A BSON undefined value.
+///
+/// @deprecated
+///   This BSON type is deprecated and use by clients is discouraged.
+///
+struct BSONCXX_API b_undefined {
+    static constexpr auto type_id = type::k_undefined;
+};
+
+///
+/// free function comparator for b_undefined
+///
+/// @relatesalso b_undefined
+///
+BSONCXX_INLINE bool operator==(const b_undefined&, const b_undefined&) {
+    return true;
+}
+
+///
+/// A BSON ObjectId value.
+///
+struct BSONCXX_API b_oid {
+    static constexpr auto type_id = type::k_oid;
+
+    oid value;
+};
+
+///
+/// free function comparator for b_oid
+///
+/// @relatesalso b_oid
+///
+BSONCXX_INLINE bool operator==(const b_oid& lhs, const b_oid& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON boolean value.
+///
+struct BSONCXX_API b_bool {
+    static constexpr auto type_id = type::k_bool;
+
+    bool value;
+
+    ///
+    /// Conversion operator unwrapping a bool
+    ///
+    BSONCXX_INLINE operator bool() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_bool
+///
+/// @relatesalso b_bool
+///
+BSONCXX_INLINE bool operator==(const b_bool& lhs, const b_bool& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON date value.
+///
+struct BSONCXX_API b_date {
+    static constexpr auto type_id = type::k_date;
+
+    ///
+    /// Constructor for b_date
+    ///
+    /// @param value
+    ///   Milliseconds since the system_clock epoch.
+    ///
+    BSONCXX_INLINE
+    explicit b_date(std::chrono::milliseconds value) : value(value) {}
+
+    ///
+    /// Constructor for b_date
+    ///
+    /// @param tp
+    ///   A system_clock time_point.
+    ///
+    BSONCXX_INLINE
+    explicit b_date(const std::chrono::system_clock::time_point& tp)
+        : value(std::chrono::duration_cast<std::chrono::milliseconds>(tp.time_since_epoch())) {}
+
+    std::chrono::milliseconds value;
+
+    ///
+    /// Conversion operator unwrapping a int64_t
+    ///
+    BSONCXX_INLINE operator int64_t() const {
+        return value.count();
+    }
+
+    ///
+    /// Manually convert this b_date to an int64_t
+    ///
+    BSONCXX_INLINE int64_t to_int64() const {
+        return value.count();
+    }
+
+    ///
+    /// Conversion operator unwrapping a time_point
+    ///
+    BSONCXX_INLINE operator std::chrono::system_clock::time_point() const {
+        return std::chrono::system_clock::time_point(
+            std::chrono::duration_cast<std::chrono::system_clock::duration>(value));
+    }
+};
+
+///
+/// free function comparator for b_date
+///
+/// @relatesalso b_date
+///
+BSONCXX_INLINE bool operator==(const b_date& lhs, const b_date& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON null value.
+///
+struct BSONCXX_API b_null {
+    static constexpr auto type_id = type::k_null;
+};
+
+///
+/// free function comparator for b_null
+///
+/// @relatesalso b_null
+///
+BSONCXX_INLINE bool operator==(const b_null&, const b_null&) {
+    return true;
+}
+
+///
+/// A BSON regex value.
+///
+struct BSONCXX_API b_regex {
+    static constexpr auto type_id = type::k_regex;
+
+    ///
+    /// Constructor for b_regex
+    ///
+    /// @param regex
+    ///   The regex pattern
+    ///
+    /// @param options
+    ///   The regex options
+    ///
+    template <typename T,
+              typename U = stdx::string_view,
+              typename std::enable_if<!std::is_same<b_regex, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_regex(T&& regex, U&& options = U{})
+        : regex(std::forward<T>(regex)), options(std::forward<U>(options)) {}
+
+    stdx::string_view regex;
+    stdx::string_view options;
+};
+
+///
+/// free function comparator for b_regex
+///
+/// @relatesalso b_regex
+///
+BSONCXX_INLINE bool operator==(const b_regex& lhs, const b_regex& rhs) {
+    return lhs.regex == rhs.regex && lhs.options == rhs.options;
+}
+
+///
+/// A BSON DBPointer value.
+///
+/// @deprecated
+///   A BSON DBPointer (aka DBRef) is still supported but deprecated.
+///
+struct BSONCXX_API b_dbpointer {
+    static constexpr auto type_id = type::k_dbpointer;
+
+    stdx::string_view collection;
+    oid value;
+};
+
+///
+/// free function comparator for b_dbpointer
+///
+/// @relatesalso b_dbpointer
+///
+BSONCXX_INLINE bool operator==(const b_dbpointer& lhs, const b_dbpointer& rhs) {
+    return lhs.collection == rhs.collection && lhs.value == rhs.value;
+}
+
+///
+/// A BSON JavaScript code value.
+///
+struct BSONCXX_API b_code {
+    static constexpr auto type_id = type::k_code;
+
+    ///
+    /// Constructor for b_code.
+    ///
+    /// @param t
+    ///   The js code
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<b_code, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_code(T&& t) : code(std::forward<T>(t)) {}
+
+    stdx::string_view code;
+
+    ///
+    /// Conversion operator unwrapping a string_view
+    ///
+    BSONCXX_INLINE operator stdx::string_view() const {
+        return code;
+    }
+};
+
+///
+/// free function comparator for b_code
+///
+/// @relatesalso b_code
+///
+BSONCXX_INLINE bool operator==(const b_code& lhs, const b_code& rhs) {
+    return lhs.code == rhs.code;
+}
+
+///
+/// A BSON Symbol value.
+///
+/// @deprecated
+///   This BSON type is deprecated and use by clients is discouraged.
+///
+struct BSONCXX_API b_symbol {
+    static constexpr auto type_id = type::k_symbol;
+
+    ///
+    /// Constructor for b_symbol.
+    ///
+    /// @param t
+    ///   The symbol.
+    ///
+    template <typename T,
+              typename std::enable_if<!std::is_same<b_symbol, typename std::decay<T>::type>::value,
+                                      int>::type = 0>
+    BSONCXX_INLINE explicit b_symbol(T&& t) : symbol(std::forward<T>(t)) {}
+
+    stdx::string_view symbol;
+
+    ///
+    /// Conversion operator unwrapping a string_view
+    ///
+    BSONCXX_INLINE operator stdx::string_view() const {
+        return symbol;
+    }
+};
+
+///
+/// free function comparator for b_symbol
+///
+/// @relatesalso b_symbol
+///
+BSONCXX_INLINE bool operator==(const b_symbol& lhs, const b_symbol& rhs) {
+    return lhs.symbol == rhs.symbol;
+}
+
+///
+/// A BSON JavaScript code with scope value.
+///
+struct BSONCXX_API b_codewscope {
+    static constexpr auto type_id = type::k_codewscope;
+
+    ///
+    /// Constructor for b_codewscope.
+    ///
+    /// @param code
+    ///   The js code
+    ///
+    /// @param scope
+    ///   A bson document view holding the scope environment.
+    ///
+    template <
+        typename T,
+        typename U,
+        typename std::enable_if<!std::is_same<b_codewscope, typename std::decay<T>::type>::value,
+                                int>::type = 0>
+    BSONCXX_INLINE explicit b_codewscope(T&& code, U&& scope)
+        : code(std::forward<T>(code)), scope(std::forward<U>(scope)) {}
+
+    stdx::string_view code;
+    document::view scope;
+};
+
+///
+/// free function comparator for b_codewscope
+///
+/// @relatesalso b_codewscope
+///
+BSONCXX_INLINE bool operator==(const b_codewscope& lhs, const b_codewscope& rhs) {
+    return lhs.code == rhs.code && lhs.scope == rhs.scope;
+}
+
+///
+/// A BSON signed 32-bit integer value.
+///
+struct BSONCXX_API b_int32 {
+    static constexpr auto type_id = type::k_int32;
+
+    int32_t value;
+
+    ///
+    /// Conversion operator unwrapping a int32_t
+    ///
+    BSONCXX_INLINE operator int32_t() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_int32
+///
+/// @relatesalso b_int32
+///
+BSONCXX_INLINE bool operator==(const b_int32& lhs, const b_int32& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON replication timestamp value.
+///
+/// @warning
+///   This BSON type is used internally by the MongoDB server - use by clients
+///   is discouraged.
+///
+struct BSONCXX_API b_timestamp {
+    static constexpr auto type_id = type::k_timestamp;
+
+    uint32_t increment;
+    uint32_t timestamp;
+};
+
+///
+/// free function comparator for b_timestamp
+///
+/// @relatesalso b_timestamp
+///
+BSONCXX_INLINE bool operator==(const b_timestamp& lhs, const b_timestamp& rhs) {
+    return lhs.increment == rhs.increment && lhs.timestamp == rhs.timestamp;
+}
+
+///
+/// A BSON 64-bit signed integer value.
+///
+struct BSONCXX_API b_int64 {
+    static constexpr auto type_id = type::k_int64;
+
+    int64_t value;
+
+    ///
+    /// Conversion operator unwrapping a int64_t
+    ///
+    BSONCXX_INLINE operator int64_t() const {
+        return value;
+    }
+};
+
+///
+/// free function comparator for b_int64
+///
+/// @relatesalso b_int64
+///
+BSONCXX_INLINE bool operator==(const b_int64& lhs, const b_int64& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON Decimal128 value.
+///
+struct BSONCXX_API b_decimal128 {
+    static constexpr auto type_id = type::k_decimal128;
+
+    decimal128 value;
+
+    ///
+    /// Constructor for b_decimal128.
+    ///
+    /// @param t
+    ///   The value to wrap.
+    ///
+    template <
+        typename T,
+        typename std::enable_if<!std::is_same<b_decimal128, typename std::decay<T>::type>::value,
+                                int>::type = 0>
+    BSONCXX_INLINE explicit b_decimal128(T&& t) : value(std::forward<T>(t)) {}
+};
+
+///
+/// free function comparator for b_decimal128
+///
+/// @relatesalso b_decimal128
+///
+BSONCXX_INLINE bool operator==(const b_decimal128& lhs, const b_decimal128& rhs) {
+    return lhs.value == rhs.value;
+}
+
+///
+/// A BSON min-key value.
+///
+struct BSONCXX_API b_minkey {
+    static constexpr auto type_id = type::k_minkey;
+};
+
+///
+/// free function comparator for b_minkey
+///
+/// @relatesalso b_minkey
+///
+BSONCXX_INLINE bool operator==(const b_minkey&, const b_minkey&) {
+    return true;
+}
+
+///
+/// A BSON max-key value.
+///
+struct BSONCXX_API b_maxkey {
+    static constexpr auto type_id = type::k_maxkey;
+};
+
+///
+/// free function comparator for b_maxkey
+///
+/// @relatesalso b_maxkey
+///
+BSONCXX_INLINE bool operator==(const b_maxkey&, const b_maxkey&) {
+    return true;
+}
+
+#define BSONCXX_ENUM(name, val)                                                \
+    BSONCXX_INLINE bool operator!=(const b_##name& lhs, const b_##name& rhs) { \
+        return !(lhs == rhs);                                                  \
+    }
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+
+}  // namespace types
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp
new file mode 100644
index 0000000..3cc78bc
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/make_value.hpp
@@ -0,0 +1,43 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/builder/basic/document.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/types/bson_value/value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace types {
+namespace bson_value {
+
+///
+/// Helper to construct a bson_value::value from a component bson type. The type
+/// of the passed-in t can be anything that builder::basic::sub_document::append accepts.
+///
+template <typename T>
+BSONCXX_INLINE bson_value::value make_value(T&& t) {
+    auto doc = builder::basic::make_document(builder::basic::kvp("v", std::forward<T>(t)));
+    return doc.view()["v"].get_owning_value();
+}
+
+}  // namespace bson_value
+}  // namespace types
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
new file mode 100644
index 0000000..02a115e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.hpp
@@ -0,0 +1,327 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <iostream>
+#include <memory>
+#include <vector>
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/make_unique.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+namespace bson_value {
+
+///
+/// A variant owning type that represents any BSON type. Owns its underlying
+/// buffer. When a bson_value::value goes out of scope, its underlying
+/// buffer is freed.
+///
+/// For accessors into this type and to extract the various BSON types out,
+/// please use bson_value::view.
+///
+/// @relatesalso bson_value::view
+///
+class BSONCXX_API value {
+   public:
+///
+/// Constructor for each BSON type.
+///
+/// These x-macros will expand to:
+///    value(b_double v);
+///    value(b_string v);
+///    value(b_document v);
+///    value(b_array v); ...
+///
+#define BSONCXX_ENUM(name, val) value(b_##name v);
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+
+    ///
+    /// Constructs a BSON UTF-8 string value.
+    ///
+    value(const char* v);
+
+    ///
+    /// Constructs a BSON UTF-8 string value.
+    ///
+    value(std::string v);
+
+    ///
+    /// Constructs a BSON UTF-8 string value.
+    ///
+    value(stdx::string_view v);
+
+    ///
+    /// Constructs a BSON 32-bit signed integer value.
+    ///
+    value(int32_t v);
+
+    ///
+    /// Constructs a BSON 64-bit signed integer value.
+    ///
+    value(int64_t v);
+
+    ///
+    /// Constructs a BSON double value.
+    ///
+    value(double v);
+
+    ///
+    /// Constructs a BSON boolean value.
+    ///
+    value(bool v);
+
+    ///
+    /// Constructs a BSON ObjectId value.
+    ///
+    value(oid v);
+
+    ///
+    /// Constructs a BSON Decimal128 value.
+    ///
+    value(decimal128 v);
+
+    ///
+    /// Constructs a BSON date value.
+    ///
+    value(std::chrono::milliseconds v);
+
+    ///
+    /// Constructs a BSON null value.
+    ///
+    value(std::nullptr_t);
+
+    ///
+    /// Constructs a BSON document value.
+    ///
+    value(bsoncxx::document::view v);
+
+    ///
+    /// Constructs a BSON array value.
+    ///
+    value(bsoncxx::array::view v);
+
+    ///
+    /// Constructs a BSON binary data value.
+    ///
+    /// @param v
+    ///     a stream of bytes
+    /// @param sub_type
+    ///     an optional binary sub type. Defaults to type::k_binary
+    ///
+    value(std::vector<unsigned char> v, const binary_sub_type sub_type = {});
+
+    ///
+    /// Constructs a BSON binary data value.
+    ///
+    /// @param data
+    ///     pointer to a stream of bytes
+    /// @param size
+    ///     the size of the stream of bytes
+    /// @param sub_type
+    ///     an optional binary sub type. Defaults to type::k_binary
+    ///
+    value(const uint8_t* data, size_t size, const binary_sub_type sub_type = {});
+
+    ///
+    /// Constructs a BSON DBPointer value.
+    ///
+    /// @param collection
+    ///     the collection name
+    /// @param value
+    ///     the object id
+    ///
+    /// @deprecated
+    ///   A BSON DBPointer (aka DBRef) is still supported but deprecated.
+    ///
+    value(stdx::string_view collection, oid value);
+
+    ///
+    /// Constructs a BSON JavaScript code with scope value.
+    ///
+    /// @param code
+    ///     the JavaScript code
+    /// @param scope
+    ///     a bson document view holding the scope environment
+    ///
+    value(stdx::string_view code, bsoncxx::document::view_or_value scope);
+
+    ///
+    /// Constructs a BSON regex value with options.
+    ///
+    /// @param regex
+    ///   The regex pattern
+    /// @param options
+    ///   The regex options
+    ///
+    value(stdx::string_view regex, stdx::string_view options);
+
+    ///
+    /// Constructs one of the following BSON values (each specified by the parenthesized type):
+    /// - BSON code value (type::k_code)
+    /// - BSON regex value (type::k_regex)
+    /// - BSON symbol value (type::k_symbol)
+    ///
+    /// @param id
+    ///     the type of BSON value to construct.
+    /// @param v
+    ///     the symbol, JavaScript code, or regex pattern for the BSON symbol, code, or regex value
+    ///     respectively.
+    ///
+    /// @throws bsoncxx::exception if the type's value is not k_code, k_regex, or k_symbol.
+    ///
+    /// @deprecated
+    ///   The BSON symbol type is deprecated and use by clients is discouraged.
+    /// @deprecated
+    ///   The BSON undefined type is deprecated and use by clients is discouraged.
+    ///
+    value(const type id, stdx::string_view v);
+
+    ///
+    /// Constructs one of the following BSON values (each specified by the parenthesized type):
+    /// - BSON maxkey value (type::k_maxkey)
+    /// - BSON minkey value (type::k_minkey)
+    /// - BSON undefined value (type::k_undefined)
+    ///
+    /// @param id
+    ///     the type of BSON value to construct.
+    ///
+    /// @throws bsoncxx::exception if the type's value is not k_maxkey, k_minkey, or k_undefined.
+    ///
+    value(const type id);
+
+    ///
+    /// Constructs one of the following BSON values (each specified by the parenthesized type):
+    /// - BSON decimal128 value (type::k_decimal128)
+    /// - BSON timestamp value (type::k_timestamp)
+    ///
+    /// @param id
+    ///     the type of the BSON value to construct.
+    /// @param a
+    ///     If a BSON decimal128 value is to be constructed, this is the high value.
+    ///     If a BSON timestamp value is to be constructed, this is the increment.
+    /// @param b
+    ///     If a BSON decimal128 value is to be constructed, this is the low value.
+    ///     If a BSON timestamp value is to be constructed, this is the timestamp.
+    ///
+    /// @throws bsoncxx::exception if the specified type is missing its required arguments.
+    ///
+    /// @warning
+    ///   The BSON timestamp type is used internally by the MongoDB server - use by clients
+    ///   is discouraged.
+    ///
+    value(const type id, uint64_t a, uint64_t b);
+
+    ~value();
+
+    value(const value&);
+    value& operator=(const value&);
+
+    value(value&&) noexcept;
+    value& operator=(value&&) noexcept;
+
+    ///
+    /// Create an owning copy of a bson_value::view.
+    ///
+    explicit value(const view&);
+
+    ///
+    /// Get a view over the bson_value owned by this object.
+    ///
+    bson_value::view view() const noexcept;
+
+    ///
+    /// Conversion operator that provides a bson_value::view given a bson_value::value.
+    ///
+    operator bson_value::view() const noexcept;
+
+   private:
+    friend class bsoncxx::document::element;
+
+    value(const std::uint8_t* raw,
+          std::uint32_t length,
+          std::uint32_t offset,
+          std::uint32_t keylen);
+
+    // Makes a copy of 'internal_value' and owns the copy.
+    value(void* internal_value);
+
+    friend value make_owning_bson(void* internal_value);
+
+    class BSONCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+///
+/// @{
+///
+/// Compares values for (in)-equality.
+///
+/// @relates bson_value::value
+///
+BSONCXX_INLINE bool operator==(const value& lhs, const value& rhs) {
+    return (lhs.view() == rhs.view());
+}
+
+BSONCXX_INLINE bool operator!=(const value& lhs, const value& rhs) {
+    return !(lhs == rhs);
+}
+
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Compares a value with a view for (in)-equality.
+///
+/// @relates bson_value::value
+///
+BSONCXX_INLINE bool operator==(const value& lhs, const view& rhs) {
+    return (lhs.view() == rhs);
+}
+
+BSONCXX_INLINE bool operator==(const view& lhs, const value& rhs) {
+    return (rhs == lhs);
+}
+
+BSONCXX_INLINE bool operator!=(const value& lhs, const view& rhs) {
+    return !(lhs == rhs);
+}
+
+BSONCXX_INLINE bool operator!=(const view& lhs, const value& rhs) {
+    return !(lhs == rhs);
+}
+
+///
+/// @}
+///
+
+}  // namespace bson_value
+}  // namespace types
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
new file mode 100644
index 0000000..3d40744
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp
@@ -0,0 +1,345 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <type_traits>
+
+#include <bsoncxx/types.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace document {
+class element;
+}  // namespace document
+
+namespace types {
+namespace bson_value {
+
+class value;
+
+///
+/// A view-only variant that can contain any BSON type.
+///
+/// @warning
+///   Calling the wrong get_<type> method will cause an exception
+///   to be thrown.
+///
+class BSONCXX_API view {
+   public:
+///
+/// Construct a bson_value::view from any of the various BSON types. Defines
+/// constructors of the following form for each type:
+///
+///   explicit view(type) noexcept;
+///
+/// Like this:
+///
+///   explicit view(b_double) noexcept;
+///   explicit view(b_string) noexcept;
+///   explicit view(b_bool) noexcept;
+///
+/// etc.
+///
+#define BSONCXX_ENUM(type, val) explicit view(b_##type) noexcept;
+#include <bsoncxx/enums/type.hpp>
+#undef BSONCXX_ENUM
+
+    ///
+    /// Default constructs a bson_value::view. The resulting view will be initialized
+    /// to point at a bson_value of type k_null.
+    ///
+    view() noexcept;
+
+    view(const view&) noexcept;
+    view& operator=(const view&) noexcept;
+
+    ~view();
+
+    ///
+    /// @{
+    ///
+    /// Compare two bson_value::views for equality
+    ///
+    /// @relates bson_value::view
+    ///
+    friend BSONCXX_API bool BSONCXX_CALL operator==(const bson_value::view&,
+                                                    const bson_value::view&);
+    friend BSONCXX_API bool BSONCXX_CALL operator!=(const bson_value::view&,
+                                                    const bson_value::view&);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @return The type of the underlying BSON value stored in this object.
+    ///
+    bsoncxx::type type() const;
+
+    ///
+    /// @return The underlying BSON double value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_double& get_double() const;
+
+    ///
+    /// @return The underlying BSON UTF-8 string value.
+    ///
+    /// @deprecated use get_string instead.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    BSONCXX_DEPRECATED const b_string& get_utf8() const;
+
+    ///
+    /// @return The underlying BSON UTF-8 string value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_string& get_string() const;
+
+    ///
+    /// @return The underlying BSON document value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_document& get_document() const;
+
+    ///
+    /// @return The underlying BSON array value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_array& get_array() const;
+
+    ///
+    /// @return The underlying BSON binary data value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_binary& get_binary() const;
+
+    ///
+    /// @return The underlying BSON undefined value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_undefined& get_undefined() const;
+
+    ///
+    /// @return The underlying BSON ObjectId value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_oid& get_oid() const;
+
+    ///
+    /// @return The underlying BSON boolean value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_bool& get_bool() const;
+
+    ///
+    /// @return The underlying BSON date value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_date& get_date() const;
+
+    ///
+    /// @return The underlying BSON null value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_null& get_null() const;
+
+    ///
+    /// @return The underlying BSON regex value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_regex& get_regex() const;
+
+    ///
+    /// @return The underlying BSON DBPointer value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_dbpointer& get_dbpointer() const;
+
+    ///
+    /// @return The underlying BSON JavaScript code value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_code& get_code() const;
+
+    ///
+    /// @return The underlying BSON symbol value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_symbol& get_symbol() const;
+
+    ///
+    /// @return The underlying BSON JavaScript code with scope value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_codewscope& get_codewscope() const;
+
+    ///
+    /// @return The underlying BSON 32-bit signed integer value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_int32& get_int32() const;
+
+    ///
+    /// @return The underlying BSON replication timestamp value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_timestamp& get_timestamp() const;
+
+    ///
+    /// @return The underlying BSON 64-bit signed integer value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_int64& get_int64() const;
+
+    ///
+    /// @return The underlying BSON Decimal128 value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_decimal128& get_decimal128() const;
+
+    ///
+    /// @return The underlying BSON min-key value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_minkey& get_minkey() const;
+
+    ///
+    /// @return The underlying BSON max-key value.
+    ///
+    /// @warning
+    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
+    ///
+    const b_maxkey& get_maxkey() const;
+
+   private:
+    friend class document::element;
+    friend class bson_value::value;
+
+    view(const std::uint8_t* raw, std::uint32_t length, std::uint32_t offset, std::uint32_t keylen);
+    view(void* internal_value) noexcept;
+
+    void _init(void* internal_value) noexcept;
+
+    void BSONCXX_PRIVATE destroy() noexcept;
+
+    bsoncxx::type _type;
+    union {
+        struct b_double _b_double;
+        struct b_string _b_string;
+        struct b_document _b_document;
+        struct b_array _b_array;
+        struct b_binary _b_binary;
+        struct b_undefined _b_undefined;
+        struct b_oid _b_oid;
+        struct b_bool _b_bool;
+        struct b_date _b_date;
+        struct b_null _b_null;
+        struct b_regex _b_regex;
+        struct b_dbpointer _b_dbpointer;
+        struct b_code _b_code;
+        struct b_symbol _b_symbol;
+        struct b_codewscope _b_codewscope;
+        struct b_int32 _b_int32;
+        struct b_timestamp _b_timestamp;
+        struct b_int64 _b_int64;
+        struct b_decimal128 _b_decimal128;
+        struct b_minkey _b_minkey;
+        struct b_maxkey _b_maxkey;
+    };
+};
+
+// sfinae in the bool return to avoid competing with the value == value
+// operators.
+template <typename T>
+using not_view = typename std::enable_if<
+    std::is_constructible<bson_value::view, T>::value &&
+        !std::is_same<typename std::decay<T>::type, bson_value::view>::value &&
+        !std::is_same<typename std::decay<T>::type, bson_value::value>::value,
+    bool>::type;
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator==(const bson_value::view& lhs, T&& rhs) {
+    return lhs == bson_value::view{std::forward<T>(rhs)};
+}
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator==(T&& lhs, const bson_value::view& rhs) {
+    return bson_value::view{std::forward<T>(lhs)} == rhs;
+}
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator!=(const bson_value::view& lhs, T&& rhs) {
+    return lhs != bson_value::view{std::forward<T>(rhs)};
+}
+
+template <typename T>
+BSONCXX_INLINE not_view<T> operator!=(T&& lhs, const bson_value::view& rhs) {
+    return bson_value::view{std::forward<T>(lhs)} != rhs;
+}
+
+}  // namespace bson_value
+}  // namespace types
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp
new file mode 100644
index 0000000..07b672b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view_or_value.hpp
@@ -0,0 +1,35 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/types/bson_value/value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace types {
+namespace bson_value {
+
+using view_or_value = bsoncxx::view_or_value<bson_value::view, bson_value::value>;
+
+}  // namespace bson_value
+}  // namespace types
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp
new file mode 100644
index 0000000..e9a8852
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/types/value.hpp
@@ -0,0 +1,39 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/types/bson_value/view.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+namespace types {
+
+///
+/// The bsoncxx::types::bson_value::view class has been renamed to
+/// bsoncxx::types::bson_value::view.
+///
+/// @deprecated use bsoncxx::types::bson_value::view instead.
+///
+BSONCXX_DEPRECATED typedef types::bson_value::view value;
+
+}  // namespace types
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp
new file mode 100644
index 0000000..624067f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/util/functor.hpp
@@ -0,0 +1,114 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+#include <type_traits>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+namespace util {
+
+// TODO(MSVC): VS2015U1 Completely falls apart trying to honor the
+// simple definition of is_functor since is_convertible returns the
+// wrong results for std::function, so we fall back to a bunch of
+// other template metaprogramming there.
+
+#if !defined(_MSC_VER)
+
+template <typename FunctionLike, typename Signature>
+using is_functor = std::is_convertible<FunctionLike, std::function<Signature>>;
+
+#else
+
+namespace functor {
+
+template <typename, typename>
+struct build_free_function;
+
+template <typename F, typename R, typename... Args>
+struct build_free_function<F, R(Args...)> {
+    typedef R (*type)(Args...);
+};
+
+template <typename, typename>
+struct build_class_function;
+
+template <typename C, typename R, typename... Args>
+struct build_class_function<C, R(Args...)> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename>
+struct strip_cv_from_class_function;
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...)> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...) const> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename R, typename... Args>
+struct strip_cv_from_class_function<R (C::*)(Args...) volatile> {
+    typedef R (C::*type)(Args...);
+};
+
+template <typename C, typename S>
+struct is_class_method_with_signature {
+    typedef int yes;
+    typedef char no;
+
+    // T stands for SFINAE
+    template <typename T>
+    static typename std::enable_if<std::is_convertible<typename build_class_function<C, S>::type,
+                                                       typename strip_cv_from_class_function<
+                                                           decltype(&T::operator())>::type>::value,
+                                   yes>::type
+    sfinae(void*);
+
+    template <typename>
+    static no sfinae(...);
+
+    static bool constexpr value = sizeof(sfinae<C>(nullptr)) == sizeof(yes);
+};
+
+template <typename F, typename S>
+struct is_function_with_signature
+    : std::is_convertible<F, typename build_free_function<F, S>::type> {};
+
+template <typename C, typename S, bool>
+struct is_functor_impl : is_class_method_with_signature<C, S> {};
+
+template <typename F, typename S>
+struct is_functor_impl<F, S, false> : is_function_with_signature<F, S> {};
+
+}  // namespace functor
+
+template <typename C, typename S>
+struct is_functor : functor::is_functor_impl<C, S, std::is_class<C>::value> {};
+
+#endif
+
+}  // namespace util
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/validate.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/validate.hpp
new file mode 100644
index 0000000..c39fa78
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/validate.hpp
@@ -0,0 +1,162 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+class validator;
+
+///
+/// Validates a BSON document. This is a simplified overload that will
+/// only do the bare minimum validation of document structure, and does
+/// not provide any further information if the document is found to be invalid.
+///
+/// @param data
+///   A buffer containing a BSON document to validate.
+/// @param length
+///   The size of the buffer.
+///
+/// @returns
+///   An engaged optional containing a view if the document is valid, or
+///   an unengaged optional if the document is invalid.
+///
+BSONCXX_API stdx::optional<document::view> BSONCXX_CALL validate(const std::uint8_t* data,
+                                                                 std::size_t length);
+
+///
+/// Validates a BSON document. This overload provides additional control over the
+/// precise validation that is performed, and will give the caller access to the
+/// offset at which the document was found to be invalid.
+///
+/// @param data
+///   A buffer containing a BSON document to validate.
+/// @param length
+///   The size of the buffer.
+/// @param validator
+///   A validator used to configure what checks are done. If validation fails, it
+///   will contain the offset at which the document was found to be invalid.
+/// @param invalid_offset
+///   If validation fails, the offset at which the document was found to be invalid
+///   will be stored here (if non-null).
+///
+/// @returns
+///   An engaged optional containing a view if the document is valid, or
+///   an unengaged optional if the document is invalid.
+///
+BSONCXX_API stdx::optional<document::view> BSONCXX_CALL
+validate(const std::uint8_t* data,
+         std::size_t length,
+         const validator& validator,
+         std::size_t* invalid_offset = nullptr);
+///
+/// A validator is used to enable or disable specific checks that can be
+/// performed during BSON validation.
+///
+class BSONCXX_API validator {
+   public:
+    ///
+    /// Constructs a validator.
+    ///
+    validator();
+
+    ///
+    /// Destructs a validator.
+    ///
+    ~validator();
+
+    ///
+    /// Verify that all keys and string values are valid UTF-8.
+    ///
+    /// @param check_utf8
+    ///   If true, UTF-8 validation is performed.
+    ///
+    void check_utf8(bool check_utf8);
+
+    ///
+    /// Getter for the current check_utf8 value of the underlying validator.
+    ///
+    /// @return True if UTF-8 validation is performed.
+    ///
+    bool check_utf8() const;
+
+    ///
+    /// Verify that all keys and string values are valid UTF-8, but allow
+    /// null bytes. This is generally bad practice, but some languages such
+    /// as Python, can sennd UTF-8 encoded strings with null bytes.
+    ///
+    /// @param check_utf8_allow_null
+    ///   If true, UTF-8 validation (with null bytes allowed) is performed.
+    ///
+    void check_utf8_allow_null(bool check_utf8_allow_null);
+
+    ///
+    /// Getter for the current check_utf8_allow_null value of the underlying
+    /// validator.
+    ///
+    /// @return True if UTF-8 validation (with null bytes allowed) is
+    ///   performed.
+    ///
+    bool check_utf8_allow_null() const;
+
+    ///
+    /// Verifies that document keys are not preceeded with '$'.
+    ///
+    /// @param check_dollar_keys
+    ///   If true, keys starting with '$' will be treated as invalid.
+    ///
+    void check_dollar_keys(bool check_dollar_keys);
+
+    ///
+    /// Getter for the current check_dollar_keys value of the underlying
+    /// validator.
+    ///
+    /// @return True if keys starting with '$' will be treated as invalid.
+    ///
+    bool check_dollar_keys() const;
+
+    ///
+    /// Verifies that document keys do not contain any '.' characters.
+    ///
+    /// @param check_dot_keys
+    ///   If true, keys containing '.' will be treated as invalid.
+    ///
+    void check_dot_keys(bool check_dot_keys);
+
+    ///
+    /// Getter for the current check_dot_keys value of the underlying
+    /// validator.
+    ///
+    /// @return True if keys containing '.' will be treated as invalid.
+    ///
+    bool check_dot_keys() const;
+
+   private:
+    struct BSONCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp
new file mode 100644
index 0000000..0de4e62
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/bsoncxx/v_noabi/bsoncxx/view_or_value.hpp
@@ -0,0 +1,215 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <type_traits>
+
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <bsoncxx/config/prelude.hpp>
+
+namespace bsoncxx {
+BSONCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a view-or-value variant type.
+///
+template <typename View, typename Value>
+class view_or_value {
+   public:
+    using view_type = View;
+    using value_type = Value;
+
+    ///
+    /// Class View must be constructible from an instance of class Value.
+    ///
+    static_assert(std::is_constructible<View, Value>::value,
+                  "View type must be constructible from a Value");
+
+    ///
+    /// Class View must be default constructible.
+    ///
+    static_assert(std::is_default_constructible<View>::value,
+                  "View type must be default constructible");
+
+    ///
+    /// Default-constructs a view_or_value. This is equivalent to constructing a
+    /// view_or_value with a default-constructed View.
+    ///
+    BSONCXX_INLINE view_or_value() = default;
+
+    ///
+    /// Construct a view_or_value from a View. When constructed with a View,
+    /// this object is non-owning. The Value underneath the given View must outlive this object.
+    ///
+    /// @param view
+    ///   A non-owning View.
+    ///
+    BSONCXX_INLINE view_or_value(View view) : _view{view} {}
+
+    ///
+    /// Constructs a view_or_value from a Value type. This object owns the passed-in Value.
+    ///
+    /// @param value
+    ///   A Value type.
+    ///
+    BSONCXX_INLINE view_or_value(Value&& value) : _value(std::move(value)), _view(*_value) {}
+
+    ///
+    /// Construct a view_or_value from a copied view_or_value.
+    ///
+    BSONCXX_INLINE view_or_value(const view_or_value& other)
+        : _value(other._value), _view(_value ? *_value : other._view) {}
+
+    ///
+    /// Assign to this view_or_value from a copied view_or_value.
+    ///
+    BSONCXX_INLINE view_or_value& operator=(const view_or_value& other) {
+        _value = other._value;
+        _view = _value ? *_value : other._view;
+        return *this;
+    }
+
+    ///
+    /// Construct a view_or_value from a moved-in view_or_value.
+    ///
+
+    /// TODO CXX-800: Create a noexcept expression to check the conditions that must be met.
+    BSONCXX_INLINE view_or_value(view_or_value&& other) noexcept
+        : _value{std::move(other._value)}, _view(_value ? *_value : std::move(other._view)) {
+        other._view = View();
+        other._value = stdx::nullopt;
+    }
+
+    ///
+    /// Assign to this view_or_value from a moved-in view_or_value.
+    ///
+    /// TODO CXX-800: Create a noexcept expression to check the conditions that must be met.
+    BSONCXX_INLINE view_or_value& operator=(view_or_value&& other) noexcept {
+        _value = std::move(other._value);
+        _view = _value ? *_value : std::move(other._view);
+        other._view = View();
+        other._value = stdx::nullopt;
+        return *this;
+    }
+
+    ///
+    /// Return whether or not this view_or_value owns an underlying Value.
+    ///
+    /// @return bool Whether we are owning.
+    ///
+    BSONCXX_INLINE bool is_owning() const noexcept {
+        return static_cast<bool>(_value);
+    }
+
+    ///
+    /// This type may be used as a View.
+    ///
+    /// @return a View into this view_or_value.
+    ///
+    BSONCXX_INLINE operator View() const {
+        return _view;
+    }
+
+    ///
+    /// Get a View for the type.
+    ///
+    /// @return a View into this view_or_value.
+    ///
+    BSONCXX_INLINE const View& view() const {
+        return _view;
+    }
+
+   private:
+    stdx::optional<Value> _value;
+    View _view;
+};
+
+///
+/// @{
+///
+/// Compare view_or_value objects for (in)-equality
+///
+/// @relates: view_or_value
+///
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const view_or_value<View, Value>& lhs,
+                               const view_or_value<View, Value>& rhs) {
+    return lhs.view() == rhs.view();
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const view_or_value<View, Value>& lhs,
+                               const view_or_value<View, Value>& rhs) {
+    return !(lhs == rhs);
+}
+///
+/// @}
+///
+
+///
+/// @{
+///
+/// Mixed (in)-equality operators for view_or_value against View or Value types
+///
+/// @relates view_or_value
+///
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const view_or_value<View, Value>& lhs, View rhs) {
+    return lhs.view() == rhs;
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(View lhs, const view_or_value<View, Value>& rhs) {
+    return rhs == lhs;
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const view_or_value<View, Value>& lhs, View rhs) {
+    return !(lhs == rhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(View lhs, const view_or_value<View, Value>& rhs) {
+    return !(rhs == lhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const view_or_value<View, Value>& lhs, const Value& rhs) {
+    return lhs.view() == View(rhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator==(const Value& lhs, const view_or_value<View, Value>& rhs) {
+    return rhs == lhs;
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const view_or_value<View, Value>& lhs, const Value& rhs) {
+    return !(lhs == rhs);
+}
+
+template <typename View, typename Value>
+BSONCXX_INLINE bool operator!=(const Value& lhs, const view_or_value<View, Value>& rhs) {
+    return !(rhs == lhs);
+}
+///
+/// @}
+///
+
+BSONCXX_INLINE_NAMESPACE_END
+}  // namespace bsoncxx
+
+#include <bsoncxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp
new file mode 100644
index 0000000..41d5e42
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/bulk_write.hpp
@@ -0,0 +1,111 @@
+// Copyright 2014-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/model/write.hpp>
+#include <mongocxx/options/bulk_write.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+///
+/// Class representing a batch of write operations that can be sent to the server as a group.
+///
+/// If you have a lot of write operations to execute, it can be more efficient to send them as
+/// part of a bulk_write in order to avoid unnecessary network-level round trips between the driver
+/// and the server.
+///
+/// Bulk writes affect a single collection only and are executed via the bulk_write::execute()
+/// method. Options that you would typically specify for individual write operations (such as write
+/// concern) are instead specified for the aggregate operation.
+///
+/// @see https://docs.mongodb.com/manual/core/crud/
+/// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+///
+class MONGOCXX_API bulk_write {
+   public:
+    ///
+    /// Move constructs a bulk write operation.
+    ///
+    bulk_write(bulk_write&&) noexcept;
+
+    ///
+    /// Move assigns a bulk write operation.
+    ///
+    bulk_write& operator=(bulk_write&&) noexcept;
+
+    ///
+    /// Destroys a bulk write operation.
+    ///
+    ~bulk_write();
+
+    ///
+    /// Appends a single write to the bulk write operation. The write operation's contents are
+    /// copied into the bulk operation completely, so there is no dependency between the life of an
+    /// appended write operation and the bulk operation itself.
+    ///
+    /// @param operation
+    ///   The write operation to append (an instance of model::write)
+    ///
+    ///   A model::write can be implicitly constructed from any of the following MongoDB models:
+    ///
+    ///     - model::insert_one
+    ///     - model::delete_one
+    ///     - model::replace_one
+    ///     - model::update_many
+    ///     - model::update_one
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @throws mongocxx::logic_error if the given operation is invalid.
+    ///
+    bulk_write& append(const model::write& operation);
+
+    ///
+    /// Executes a bulk write.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @return The optional result of the bulk operation execution, a result::bulk_write.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    stdx::optional<result::bulk_write> execute() const;
+
+   private:
+    friend class collection;
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE bulk_write(const collection& coll,
+                                const options::bulk_write& options,
+                                const client_session* session = nullptr);
+
+    bool _created_from_collection;
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/change_stream.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/change_stream.hpp
new file mode 100644
index 0000000..d428caf
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/change_stream.hpp
@@ -0,0 +1,208 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+
+///
+/// Class representing a MongoDB change stream.
+///
+class MONGOCXX_API change_stream {
+   public:
+    /// A change stream iterator.
+    class MONGOCXX_API iterator;
+
+    ///
+    /// Move constructs a change_stream.
+    ///
+    change_stream(change_stream&& other) noexcept;
+
+    ///
+    /// Move assigns a change_stream.
+    ///
+    change_stream& operator=(change_stream&& other) noexcept;
+
+    ///
+    /// Destroys a change_stream.
+    ///
+    ~change_stream();
+
+    ///
+    /// A change_stream::iterator points to the beginning of any
+    /// available notifications. Each call to begin() advances to the next
+    /// available notification. The state of all iterators is tracked by the
+    /// change_stream itself, so advancing one iterator advances all iterators.
+    ///
+    /// change_stream::begin() and the increment operators are blocking operations.
+    /// They will not return until a notification is available, the max_await_time (from
+    /// the options::change_stream) milliseconds have elapsed, or a server
+    /// error is encountered.
+    ///
+    /// When change_stream.begin() == change_stream.end(), no notifications
+    /// are available. Each call to change_stream.begin() checks again for
+    /// newly-available notifications.
+    ///
+    /// @return
+    ///   The change_stream::iterator
+    /// @exception
+    ///   Throws mongocxx::query_exception if the query failed.
+    ///
+    iterator begin() const;
+
+    ///
+    /// A change_stream::iterator indicating stream exhaustion, meaning that
+    /// no notifications are available from the stream.
+    ///
+    /// @return
+    ///   The change_stream::iterator indicating exhaustion
+    ///
+    iterator end() const;
+
+    ///
+    /// Returns a resume token for this change stream.
+    ///
+    /// If the change stream has not been iterated, and either resume_after or
+    /// start_after was specified in the options to this change stream, the
+    /// specified value will be returned by this method. If neither resume_after or
+    /// start_after was set on the options for this change stream, and it has
+    /// not been iterated, this method will return no token.
+    ///
+    /// Once this change stream has been iterated, this method will return the
+    /// resume token of the most recently returned document in the stream, or a
+    /// postBatchResumeToken if the current batch of documents has been exhausted.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/#change-stream-resume-token
+    ///
+    /// The returned document::view is valid for the lifetime of the stream and
+    /// its data may be updated if the change stream is iterated after this function.
+    /// The value may be copied to extend its lifetime or preserve the
+    /// current resume token.
+    ///
+    /// @return
+    ///   The token.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::document::view> get_resume_token() const;
+
+   private:
+    friend class client;
+    friend class collection;
+    friend class database;
+    friend class change_stream::iterator;
+
+    MONGOCXX_PRIVATE change_stream(void* change_stream_ptr);
+
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+///
+/// Class representing a MongoDB change stream iterator.
+///
+class MONGOCXX_API change_stream::iterator {
+   public:
+    // Support input-iterator (caveat of post-increment returning void)
+    using difference_type = std::int64_t;
+    using value_type = const bsoncxx::document::view;
+    using pointer = std::add_pointer<value_type>::type;
+    using reference = std::add_lvalue_reference<value_type>::type;
+    using iterator_category = std::input_iterator_tag;
+
+    ///
+    /// Default-construct an iterator.
+    /// Default-constucted iterators can be compared (all default-constructed
+    /// iterators are ==), assigned, and copied.
+    ///
+    iterator();
+
+    ///
+    /// Dereferences the view for the document currently being pointed to.
+    ///
+    const bsoncxx::document::view& operator*() const;
+
+    ///
+    /// Accesses a member of the dereferenced document currently being pointed to.
+    ///
+    const bsoncxx::document::view* operator->() const;
+
+    ///
+    /// Pre-increments the iterator to move to the next document.
+    ///
+    /// change_stream::begin() and increment operators are blocking operations.
+    /// They will not return until a notification is available, the max_await_time (from
+    /// the options::change_stream) miliseconds have elapsed, or a server
+    /// error is encountered.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    iterator& operator++();
+
+    ///
+    /// Post-increments the iterator to move to the next document.
+    ///
+    /// change_stream::begin() and increment operators are blocking operations.
+    /// They will not return until a notification is available, the max_await_time (from
+    /// the options::change_stream) miliseconds have elapsed, or a server
+    /// error is encountered.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    void operator++(int);
+
+   private:
+    friend class change_stream;
+    enum class iter_type { k_tracking, k_default_constructed, k_end };
+
+    MONGOCXX_PRIVATE explicit iterator(iter_type type, const change_stream* change_stream);
+
+    ///
+    /// @{
+    ///
+    /// Compare two iterators for (in)-equality.  Iterators compare equal if
+    /// they point to the same underlying change_stream or if both are exhausted.
+    ///
+    /// @relates iterator
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const change_stream::iterator&,
+                                                      const change_stream::iterator&) noexcept;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const change_stream::iterator&,
+                                                      const change_stream::iterator&) noexcept;
+    ///
+    /// @}
+    ///
+
+    MONGOCXX_PRIVATE bool is_exhausted() const;
+
+    // iter_type==k_default_constructed is equivalent to _change_stream==nullptr
+    iter_type _type;
+    const change_stream* _change_stream;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client.hpp
new file mode 100644
index 0000000..f9ec029
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client.hpp
@@ -0,0 +1,412 @@
+// Copyright 2014-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/database.hpp>
+#include <mongocxx/options/client.hpp>
+#include <mongocxx/options/client_encryption.hpp>
+#include <mongocxx/options/client_session.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/uri.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+///
+/// Top level namespace for the MongoDB C++ driver.
+///
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_session;
+
+///
+/// Class representing a client connection to MongoDB.
+///
+/// Acts as a logical gateway for working with databases contained within a MongoDB server.
+///
+/// Databases that are created via this client inherit the @c read_concern, @c read_preference, and
+/// @c write_concern settings of this client when they are created. The lifetimes of objects created
+/// via a client object (databases, collections, cursors, etc...) @b must be a subset of the
+/// lifetime of the client that created them.
+///
+/// Example:
+/// @code
+///   mongocxx::client mongo_client{mongocxx::uri{}};
+///   mongocxx::client mongo_client{mongocxx::uri{"mongodb://localhost:27017"}};
+/// @endcode
+///
+/// Note that client is not thread-safe. See
+/// https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/thread-safety/ for more details.
+class MONGOCXX_API client {
+   public:
+    ///
+    /// Default constructs a new client. The client is not connected and is equivalent to the
+    /// state of a moved-from client. The only valid actions to take with a default constructed
+    /// 'client' are to assign to it, or destroy it.
+    ///
+    client() noexcept;
+
+    ///
+    /// Creates a new client connection to MongoDB.
+    ///
+    /// @param mongodb_uri
+    ///   A MongoDB URI representing the connection parameters
+    /// @param options
+    ///   Additional options that cannot be specified via the mongodb_uri
+    ///
+    /// @throws mongocxx::exception if invalid options are provided
+    /// (whether from the URI or provided client options).
+    ///
+    client(const class uri& mongodb_uri, const options::client& options = options::client());
+
+    ///
+    /// Move constructs a client.
+    ///
+    client(client&&) noexcept;
+
+    ///
+    /// Move assigns a client.
+    ///
+    client& operator=(client&&) noexcept;
+
+    ///
+    /// Destroys a client.
+    ///
+    ~client();
+
+    ///
+    /// Returns true if the client is valid, meaning it was not default constructed
+    /// or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// Sets the read concern for this client.
+    ///
+    /// Modifications at this level do not affect existing database instances that have been
+    /// created by this client but do affect new ones as databases inherit the @c read_concern
+    /// settings of their parent upon instantiation.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. Read concerns should be set either in the URI or directly on
+    ///   database or collection objects.
+    ///
+    /// @param rc
+    ///   The new @c read_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/
+    ///
+    MONGOCXX_DEPRECATED void read_concern(class read_concern rc);
+    void read_concern_deprecated(class read_concern rc);
+
+    ///
+    /// Returns the current read concern for this client.
+    ///
+    /// @return The current @c read_concern
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Sets the read preference for this client.
+    ///
+    /// Modifications at this level do not affect existing database instances that have been
+    /// created by this client but do affect new ones as databases inherit the @c read_preference
+    /// settings of their parent upon instantiation.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. Read preferences should be set either in the URI or directly on
+    ///   database or collection objects.
+    ///
+    /// @param rp
+    ///   The new @c read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    MONGOCXX_DEPRECATED void read_preference(class read_preference rp);
+    void read_preference_deprecated(class read_preference rp);
+
+    ///
+    /// Returns the current read preference for this client.
+    ///
+    /// @return The current @c read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// Returns the current uri for this client.
+    ///
+    /// @return The @c uri that this client was created with.
+    ///
+    class uri uri() const;
+
+    ///
+    /// Sets the write concern for this client.
+    ///
+    /// @note Modifications at this level do not affect existing databases or collection instances
+    /// that have come from this client but do affect new ones as databases will receive a copy of
+    /// this client's @c write_concern upon instantiation.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. Write concerns should be set either in the URI or directly on
+    ///   database or collection objects.
+    ///
+    /// @param wc
+    ///   The new write concern
+    ///
+    MONGOCXX_DEPRECATED void write_concern(class write_concern wc);
+    void write_concern_deprecated(class write_concern wc);
+
+    ///
+    /// Returns the current write concern for this client.
+    ///
+    /// @return the current @c write_concern
+    class write_concern write_concern() const;
+
+    ///
+    /// Obtains a database that represents a logical grouping of collections on a MongoDB server.
+    ///
+    /// @note A database cannot be obtained from a temporary client object.
+    ///
+    /// @param name
+    ///   The name of the database to get
+    ///
+    /// @return The database
+    ///
+    class database database(bsoncxx::string::view_or_value name) const&;
+    class database database(bsoncxx::string::view_or_value name) const&& = delete;
+
+    ///
+    /// Allows the syntax @c client["db_name"] as a convenient shorthand for the client::database()
+    /// method by implementing the array subscript operator.
+    ///
+    /// @note A database cannot be obtained from a temporary client object.
+    ///
+    /// @param name
+    ///   The name of the database.
+    ///
+    /// @return Client side representation of a server side database
+    ///
+    MONGOCXX_INLINE class database operator[](bsoncxx::string::view_or_value name) const&;
+    MONGOCXX_INLINE class database operator[](bsoncxx::string::view_or_value name) const&& = delete;
+
+    ///
+    /// @{
+    ///
+    /// Enumerates the databases in the client.
+    ///
+    /// @return A mongocxx::cursor containing a BSON document for each
+    ///   database. Each document contains a name field with the database
+    ///   name, a sizeOnDisk field with the total size of the database file on
+    ///   disk in bytes, and an empty field specifying whether the database
+    ///   has any data.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases' command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    cursor list_databases() const;
+
+    ///
+    /// Enumerates the databases in the client.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    ///
+    /// @return A mongocxx::cursor containing a BSON document for each
+    ///   database. Each document contains a name field with the database
+    ///   name, a sizeOnDisk field with the total size of the database file on
+    ///   disk in bytes, and an empty field specifying whether the database
+    ///   has any data.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases' command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    cursor list_databases(const client_session& session) const;
+
+    ///
+    /// Enumerates the databases in the client.
+    ///
+    /// @param opts
+    ///   Options passed directly to the 'listDatabases' command.
+    ///
+    /// @return A mongocxx::cursor containing a BSON document for each
+    ///   database. Each document contains a name field with the database
+    ///   name, a sizeOnDisk field with the total size of the database file on
+    ///   disk in bytes, and an empty field specifying whether the database
+    ///   has any data.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases' command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    cursor list_databases(const bsoncxx::document::view_or_value opts) const;
+
+    ///
+    /// Queries the MongoDB server for a list of known databases.
+    ///
+    /// @param filter
+    ///   An optional query expression to filter the returned database names.
+    ///
+    /// @return std::vector<std::string> containing the database names.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listDatabases'
+    /// command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listDatabases
+    ///
+    std::vector<std::string> list_database_names(
+        const bsoncxx::document::view_or_value filter = {}) const;
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Create a client session for a sequence of operations.
+    ///
+    /// @return A client_session object. See `mongocxx::client_session` for more information.
+    ///
+    /// @throws mongocxx::operation_exception if the driver is not built with crypto support, if
+    /// options is misconfigured, or if the session is configured with options that the server does
+    /// not support.
+    ///
+    client_session start_session(const options::client_session& options = {});
+
+    ///
+    /// @{
+    ///
+    /// Gets a change stream on this client with an empty pipeline.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const options::change_stream& options = {});
+
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this client.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    ///   Only a subset of pipeline operations are supported for change streams. For more
+    ///   information see the change streams documentation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const pipeline& pipe, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this client.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this client.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session,
+                        const pipeline& pipe,
+                        const options::change_stream& options = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Prevents resource cleanup in the child process from interfering
+    /// with the parent process after forking.
+    ///
+    /// Clients should not be reused after forking. Call this method in the
+    /// child after forking to safely destroy the client. This method should
+    /// not be used with multi-threaded clients.
+    ///
+    /// This method causes the client to clear its session pool without sending
+    /// endSessions.  It also increments an internal generation counter on the
+    /// given client. After this method is called, cursors from
+    /// previous generations will not issue a killCursors command when
+    /// they are destroyed. Client sessions from previous generations
+    /// cannot be used and should be destroyed.
+    ///
+    void reset();
+
+   private:
+    friend class collection;
+    friend class database;
+    friend class pool;
+    friend class client_session;
+    friend class options::auto_encryption;
+    friend class options::client_encryption;
+
+    MONGOCXX_PRIVATE explicit client(void* implementation);
+
+    MONGOCXX_PRIVATE change_stream _watch(const client_session* session,
+                                          const pipeline& pipe,
+                                          const options::change_stream& options);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE database client::operator[](bsoncxx::string::view_or_value name) const& {
+    return database(name);
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp
new file mode 100644
index 0000000..4dd1af2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client_encryption.hpp
@@ -0,0 +1,124 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/types/bson_value/value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/options/client_encryption.hpp>
+#include <mongocxx/options/data_key.hpp>
+#include <mongocxx/options/encrypt.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class supporting operations for MongoDB Client-Side Field Level Encryption.
+///
+class MONGOCXX_API client_encryption {
+   public:
+    ///
+    /// Creates a client_encryption object.
+    ///
+    /// @param opts
+    ///   An object representing encryption options.
+    ///
+    /// @see https://docs.mongodb.com/ecosystem/use-cases/client-side-field-level-encryption-guide
+    ///
+    client_encryption(options::client_encryption opts);
+
+    ///
+    /// Destroys a client_encryption.
+    ///
+    ~client_encryption() noexcept;
+
+    ///
+    /// Move-constructs a client_encryption object.
+    ///
+    client_encryption(client_encryption&&);
+
+    ///
+    /// Move-assigns a client_encryption object.
+    ///
+    client_encryption& operator=(client_encryption&&);
+
+    client_encryption(const client_encryption&) = delete;
+    client_encryption& operator=(const client_encryption&) = delete;
+
+    ///
+    /// Creates a new key document and inserts into the key vault collection.
+    ///
+    /// @param kms_provider
+    ///   A string identifying the KMS service to use to encrypt the datakey.
+    ///   Must be one of "aws", "azure", "gcp", "kmip", or "local".
+    /// @param opts
+    ///   Optional arguments, see options::data_key.
+    ///
+    /// @return The id of the created document as a bson_value::value containing
+    ///   a UUID (BSON binary subtype 4).
+    ///
+    /// @throws mongocxx::exception if there is an error creating the key.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/ecosystem/use-cases/client-side-field-level-encryption-guide/#b-create-a-data-encryption-key
+    ///
+    bsoncxx::types::bson_value::value create_data_key(std::string kms_provider,
+                                                      const options::data_key& opts = {});
+
+    ///
+    /// Encrypts a BSON value with a given key and algorithm.
+    ///
+    /// @param value
+    ///   The BSON value to encrypt.
+    /// @param opts
+    ///   Options must be given in order to specify an encryption algorithm
+    ///   and a key_id or key_alt_name. See options::encrypt.
+    ///
+    /// @return The encrypted value (BSON binary subtype 6).
+    ///
+    /// @throws mongocxx::exception if there is an error encrypting the value.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/reference/method/ClientEncryption.encrypt/#ClientEncryption.encrypt
+    ///
+    bsoncxx::types::bson_value::value encrypt(bsoncxx::types::bson_value::view value,
+                                              const options::encrypt& opts);
+
+    ///
+    /// Decrypts an encrypted value (BSON binary of subtype 6).
+    ///
+    /// @param value
+    ///   The encrypted value.
+    ///
+    /// @return The original BSON value.
+    ///
+    /// @throws mongocxx::exception if there is an error decrypting the value.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/reference/method/ClientEncryption.decrypt/#ClientEncryption.decrypt
+    ///
+    bsoncxx::types::bson_value::value decrypt(bsoncxx::types::bson_value::view value);
+
+   private:
+    class MONGOCXX_PRIVATE impl;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client_session.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client_session.hpp
new file mode 100644
index 0000000..5e37a4d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/client_session.hpp
@@ -0,0 +1,215 @@
+// Copyright 2017-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/client_session.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+
+///
+/// Use a session for a sequence of operations, optionally with either causal consistency
+/// or snapshots.
+///
+/// Note that client_session is not thread-safe. See
+/// https://mongodb.github.io/mongo-cxx-driver/mongocxx-v3/thread-safety/ for more details.
+///
+/// @see http://dochub.mongodb.org/core/causal-consistency
+///
+class MONGOCXX_API client_session {
+   public:
+    enum class transaction_state {
+        k_transaction_none,
+        k_transaction_starting,
+        k_transaction_in_progress,
+        k_transaction_committed,
+        k_transaction_aborted,
+    };
+
+    ///
+    /// Move constructs a session.
+    ///
+    client_session(client_session&&) noexcept;
+
+    ///
+    /// Move assigns a session.
+    ///
+    client_session& operator=(client_session&&) noexcept;
+
+    client_session(const client_session&) = delete;
+    client_session& operator=(const client_session&) = delete;
+
+    ///
+    /// Ends and destroys the session.
+    ///
+    ~client_session() noexcept;
+
+    ///
+    /// Gets the client that started this session.
+    ///
+    const class client& client() const noexcept;
+
+    ///
+    /// Gets the options this session was created with.
+    ///
+    const options::client_session& options() const noexcept;
+
+    ///
+    /// Get the server-side "logical session ID" associated with this session, as a BSON document.
+    /// This view is invalid after the session is destroyed.
+    ///
+    bsoncxx::document::view id() const noexcept;
+
+    ///
+    /// Get the session's clusterTime, as a BSON document. This is an opaque value suitable for
+    /// passing to advance_cluster_time(). The document is empty if the session has
+    /// not been used for any operation and you have not called advance_cluster_time().
+    /// This view is invalid after the session is destroyed.
+    ///
+    bsoncxx::document::view cluster_time() const noexcept;
+
+    ///
+    /// Get the session's operationTime, as a BSON timestamp. This is an opaque value suitable for
+    /// passing to advance_operation_time(). The timestamp is zero if the session has not been used
+    /// for any operation and you have not called advance_operation_time().
+    ///
+    bsoncxx::types::b_timestamp operation_time() const noexcept;
+
+    ///
+    /// Get the server_id the session is pinned to. The server_id is zero if the session is not
+    /// pinned to a server.
+    ///
+    std::uint32_t server_id() const noexcept;
+
+    ///
+    /// Returns the current transaction state for this session.
+    ///
+    transaction_state get_transaction_state() const noexcept;
+
+    ///
+    /// Returns whether or not this session is dirty.
+    ///
+    bool get_dirty() const noexcept;
+
+    ///
+    /// Advance the cluster time for a session. Has an effect only if the new cluster time is
+    /// greater than the session's current cluster time.
+    ///
+    /// Use advance_operation_time() and advance_cluster_time() to copy the operationTime and
+    /// clusterTime from another session, ensuring subsequent operations in this session are
+    /// causally consistent with the last operation in the other session.
+    ///
+    void advance_cluster_time(const bsoncxx::document::view& cluster_time);
+
+    ///
+    /// Advance the session's operation time, expressed as a BSON timestamp. Has an effect only if
+    /// the new operation time is greater than the session's current operation time.
+    ///
+    /// Use advance_operation_time() and advance_cluster_time() to copy the operationTime and
+    /// clusterTime from another session, ensuring subsequent operations in this session are
+    /// causally consistent with the last operation in the other session.
+    ///
+    void advance_operation_time(const bsoncxx::types::b_timestamp& operation_time);
+
+    ///
+    /// Starts a transaction on the current client session.
+    ///
+    /// @param transaction_opts (optional)
+    ///    The options to use in the transaction.
+    ///
+    /// @throws mongocxx::operation_exception if the options are misconfigured, if there are network
+    /// or other transient failures, or if there are other errors such as a session with a
+    /// transaction already in progress.
+    ///
+    void start_transaction(const stdx::optional<options::transaction>& transaction_opts = {});
+
+    ///
+    /// Commits a transaction on the current client session.
+    ///
+    /// @throws mongocxx::operation_exception if the options are misconfigured, if there are network
+    /// or other transient failures, or if there are other errors such as a session with no
+    /// transaction in progress.
+    ///
+    void commit_transaction();
+
+    ///
+    /// Aborts a transaction on the current client session.
+    ///
+    /// @throws mongocxx::operation_exception if the options are misconfigured or if there are
+    /// other errors such as a session with no transaction in progress.
+    ///
+    void abort_transaction();
+
+    ///
+    /// Helper to run a user-provided callback within a transaction.
+    ///
+    /// This method will start a new transaction on this client session,
+    /// run the callback, then commit the transaction. If it cannot commit
+    /// the transaction, the entire sequence may be retried, and the callback
+    /// may be run multiple times.
+    ///
+    /// If the user callback calls driver methods that run operations against the
+    /// server that can throw an operation_exception (ex: collection::insert_one),
+    /// the user callback should allow those exceptions to propagate up the stack
+    /// so they can be caught and processed by the with_transaction helper.
+    ///
+    /// @param cb
+    ///   The callback to run inside of a transaction.
+    /// @param opts (optional)
+    ///   The options to use to run the transaction.
+    ///
+    /// @throws mongocxx::operation_exception if there are errors completing the
+    /// transaction.
+    ///
+    using with_transaction_cb = std::function<void MONGOCXX_CALL(client_session*)>;
+    void with_transaction(with_transaction_cb cb, options::transaction opts = {});
+
+   private:
+    friend class bulk_write;
+    friend class client;
+    friend class collection;
+    friend class database;
+    friend class index_view;
+
+    class MONGOCXX_PRIVATE impl;
+
+    // "class client" distinguishes from client() method above.
+    MONGOCXX_PRIVATE client_session(const class client* client,
+                                    const options::client_session& options);
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
+
+///
+/// @example examples/mongocxx/client_session.cpp
+/// Use a mongocxx::client_session for a sequence of operations with causal consistency.
+///
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/collection.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/collection.hpp
new file mode 100644
index 0000000..7b9f52f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/collection.hpp
@@ -0,0 +1,2078 @@
+// Copyright 2014-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <algorithm>
+#include <string>
+
+#include <bsoncxx/builder/basic/array.hpp>
+#include <bsoncxx/builder/basic/document.hpp>
+#include <bsoncxx/builder/basic/kvp.hpp>
+#include <bsoncxx/builder/concatenate.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/bulk_write.hpp>
+#include <mongocxx/change_stream.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/index_view.hpp>
+#include <mongocxx/model/insert_one.hpp>
+#include <mongocxx/options/aggregate.hpp>
+#include <mongocxx/options/bulk_write.hpp>
+#include <mongocxx/options/change_stream.hpp>
+#include <mongocxx/options/count.hpp>
+#include <mongocxx/options/delete.hpp>
+#include <mongocxx/options/distinct.hpp>
+#include <mongocxx/options/estimated_document_count.hpp>
+#include <mongocxx/options/find.hpp>
+#include <mongocxx/options/find_one_and_delete.hpp>
+#include <mongocxx/options/find_one_and_replace.hpp>
+#include <mongocxx/options/find_one_and_update.hpp>
+#include <mongocxx/options/index.hpp>
+#include <mongocxx/options/index_view.hpp>
+#include <mongocxx/options/insert.hpp>
+#include <mongocxx/options/replace.hpp>
+#include <mongocxx/options/update.hpp>
+#include <mongocxx/pipeline.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+#include <mongocxx/result/delete.hpp>
+#include <mongocxx/result/insert_many.hpp>
+#include <mongocxx/result/insert_one.hpp>
+#include <mongocxx/result/replace_one.hpp>
+#include <mongocxx/result/update.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class database;
+
+///
+/// Class representing server side document groupings within a MongoDB database.
+///
+/// Collections do not require or enforce a schema and documents inside of a collection can have
+/// different fields. While not a requirement, typically documents in a collection have a similar
+/// shape or related purpose.
+///
+/// Example:
+/// @code
+///   // Connect and get a collection.
+///   mongocxx::client mongo_client{mongocxx::uri{}};
+///   auto coll = mongo_client["database"]["collection"];
+/// @endcode
+///
+class MONGOCXX_API collection {
+    //
+    // Utility class supporting the convenience of {} meaning an empty bsoncxx::document.
+    //
+    // Users may not use this class directly.
+    //
+    // In places where driver methods take this class as a parameter, passing {} will
+    // translate to a default-constructed bsoncxx::document::view_or_value,
+    // regardless of other overloads taking other default-constructible types
+    // for that parameter. This class avoids compiler ambiguity with such overloads.
+    //
+    // See collection::update_one for an example of such overloads.
+    //
+    class _empty_doc_tag {
+        _empty_doc_tag() = default;
+    };
+
+   public:
+    ///
+    /// Default constructs a collection object. The collection is
+    /// equivalent to the state of a moved from collection. The only
+    /// valid actions to take with a default constructed collection
+    /// are to assign to it, or destroy it.
+    ///
+    collection() noexcept;
+
+    ///
+    /// Move constructs a collection.
+    ///
+    collection(collection&&) noexcept;
+
+    ///
+    /// Move assigns a collection.
+    ///
+    collection& operator=(collection&&) noexcept;
+
+    ///
+    /// Copy constructs a collection.
+    ///
+    collection(const collection&);
+
+    ///
+    /// Copy assigns a collection.
+    ///
+    collection& operator=(const collection&);
+
+    ///
+    /// Destroys a collection.
+    ///
+    ~collection();
+
+    ///
+    /// Returns true if the collection is valid, meaning it was not
+    /// default constructed or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// @{
+    ///
+    /// Runs an aggregation framework pipeline against this collection.
+    ///
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   collection level set read concern - collection::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+
+    ///
+    /// Runs an aggregation framework pipeline against this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   collection level set read concern - collection::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const client_session& session,
+                     const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates a new bulk operation to be executed against this collection.
+    /// The lifetime of the bulk_write is independent of the collection.
+    ///
+    /// @param options
+    ///   Optional arguments; see mongocxx::options::bulk_write.
+    ///
+    /// @return
+    ///    The newly-created bulk write.
+    ///
+    class bulk_write create_bulk_write(const options::bulk_write& options = {});
+
+    ///
+    /// Creates a new bulk operation to be executed against this collection.
+    /// The lifetime of the bulk_write is independent of the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param options
+    ///   Optional arguments; see mongocxx::options::bulk_write.
+    ///
+    /// @return
+    ///    The newly-created bulk write.
+    ///
+    class bulk_write create_bulk_write(const client_session& session,
+                                       const options::bulk_write& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Sends a write to the server as a bulk write operation.
+    ///
+    /// @param write
+    ///   A model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return
+    ///   The optional result of the bulk operation execution.
+    ///   If the write concern is unacknowledged, the optional will be
+    ///   disengaged.
+    ///
+    /// @exception
+    ///   mongocxx::bulk_write_exception when there are errors processing
+    ///   the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> write(
+        const model::write& write, const options::bulk_write& options = options::bulk_write());
+
+    ///
+    /// Sends a write to the server as a bulk write operation.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param write
+    ///   A model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return
+    ///   The optional result of the bulk operation execution.
+    ///   If the write concern is unacknowledged, the optional will be
+    ///   disengaged.
+    ///
+    /// @exception
+    ///   mongocxx::bulk_write_exception when there are errors processing
+    ///   the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> write(
+        const client_session& session,
+        const model::write& write,
+        const options::bulk_write& options = options::bulk_write());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Sends a container of writes to the server as a bulk write operation.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param writes
+    ///   A container of model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        const container_type& writes, const options::bulk_write& options = options::bulk_write());
+
+    ///
+    /// Sends a container of writes to the server as a bulk write operation.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param writes
+    ///   A container of model::write.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        const client_session& session,
+        const container_type& writes,
+        const options::bulk_write& options = options::bulk_write());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Sends writes starting at @c begin and ending at @c end to the server as a bulk write
+    /// operation.
+    ///
+    /// @tparam write_model_iterator_type
+    ///   The container type. Must meet the requirements for the input iterator concept with a value
+    ///   type of model::write.
+    ///
+    /// @param begin
+    ///   Iterator pointing to the first model::write to send.
+    /// @param end
+    ///   Iterator pointing to the end of the writes to send.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution, a result::bulk_write.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename write_model_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        write_model_iterator_type begin,
+        write_model_iterator_type end,
+        const options::bulk_write& options = options::bulk_write());
+
+    ///
+    /// Sends writes starting at @c begin and ending at @c end to the server as a bulk write
+    /// operation.
+    ///
+    /// @tparam write_model_iterator_type
+    ///   The container type. Must meet the requirements for the input iterator concept with a value
+    ///   type of model::write.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the bulk operation.
+    /// @param begin
+    ///   Iterator pointing to the first model::write to send.
+    /// @param end
+    ///   Iterator pointing to the end of the writes to send.
+    /// @param options
+    ///   Optional arguments, see options::bulk_write.
+    ///
+    /// @return The optional result of the bulk operation execution, a result::bulk_write.
+    ///
+    /// @throws mongocxx::bulk_write_exception when there are errors processing the writes.
+    ///
+    /// @see mongocxx::bulk_write
+    /// @see https://docs.mongodb.com/manual/core/bulk-write-operations/
+    ///
+    template <typename write_model_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::bulk_write> bulk_write(
+        const client_session& session,
+        write_model_iterator_type begin,
+        write_model_iterator_type end,
+        const options::bulk_write& options = options::bulk_write());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Counts the number of documents matching the provided filter.
+    ///
+    /// @param filter
+    ///   The filter that documents must match in order to be counted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::count.
+    ///
+    /// @return The count of the documents that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the count operation fails.
+    ///
+    /// @note For a fast count of the total documents in a collection, see
+    /// estimated_document_count().
+    ///
+    /// @note Due to an oversight in MongoDB server versions 5.0.0 through 5.0.7, the `count`
+    /// command was not included in Stable API v1. Users of the Stable API with
+    /// estimatedDocumentCount are recommended to upgrade their server version to 5.0.8 or newer, or
+    /// set `apiStrict: false` to avoid encountering errors.
+    ///
+    /// @see mongocxx::estimated_document_count
+    ///
+    std::int64_t count_documents(bsoncxx::document::view_or_value filter,
+                                 const options::count& options = options::count());
+
+    ///
+    /// Counts the number of documents matching the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the count.
+    /// @param filter
+    ///   The filter that documents must match in order to be counted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::count.
+    ///
+    /// @return The count of the documents that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the count operation fails.
+    ///
+    /// @note Due to an oversight in MongoDB server versions 5.0.0 through 5.0.7, the `count`
+    /// command was not included in Stable API v1. Users of the Stable API with
+    /// estimatedDocumentCount are recommended to upgrade their server version to 5.0.8 or newer, or
+    /// set `apiStrict: false` to avoid encountering errors.
+    ///
+    /// @see mongocxx::estimated_document_count
+    ///
+    std::int64_t count_documents(const client_session& session,
+                                 bsoncxx::document::view_or_value filter,
+                                 const options::count& options = options::count());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Returns an estimate of the number of documents in the collection.
+    ///
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::count.
+    ///
+    /// @return The count of the documents that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the count operation fails.
+    ///
+    /// @note This function is implemented in terms of the count server command. See:
+    /// https://www.mongodb.com/docs/manual/reference/command/count/#behavior for more information.
+    ///
+    /// @see mongocxx::count_documents
+    ///
+    std::int64_t estimated_document_count(
+        const options::estimated_document_count& options = options::estimated_document_count());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates an index over the collection for the provided keys with the provided options.
+    ///
+    /// @param keys
+    ///   The keys for the index: @c {a: 1, b: -1}
+    /// @param index_options
+    ///   A document containing optional arguments for creating the index.
+    /// @param operation_options
+    ///   Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if index creation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    bsoncxx::document::value create_index(
+        bsoncxx::document::view_or_value keys,
+        bsoncxx::document::view_or_value index_options = {},
+        options::index_view operation_options = options::index_view{});
+
+    ///
+    /// Creates an index over the collection for the provided keys with the provided options.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the index creation.
+    /// @param keys
+    ///   The keys for the index: @c {a: 1, b: -1}
+    /// @param index_options
+    ///   A document containing optional arguments for creating the index.
+    /// @param operation_options
+    ///   Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if index creation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    bsoncxx::document::value create_index(
+        const client_session& session,
+        bsoncxx::document::view_or_value keys,
+        bsoncxx::document::view_or_value index_options = {},
+        options::index_view operation_options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Deletes all matching documents from the collection.
+    ///
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_many(
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// Deletes all matching documents from the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the deletion.
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_many(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Deletes a single matching document from the collection.
+    ///
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_one(
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// Deletes a single matching document from the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the deletion.
+    /// @param filter
+    ///   Document view representing the data to be deleted.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::delete_options.
+    ///
+    /// @return The optional result of performing the deletion.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the delete fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/delete/
+    ///
+    stdx::optional<result::delete_result> delete_one(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options = options::delete_options());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds the distinct values for a specified field across the collection.
+    ///
+    /// @param name
+    ///   The field for which the distinct values will be found.
+    /// @param filter
+    ///   Document view representing the documents for which the distinct operation will apply.
+    /// @param options
+    ///   Optional arguments, see options::distinct.
+
+    /// @return mongocxx::cursor having the distinct values for the specified
+    /// field.  If the operation fails, the cursor throws
+    /// mongocxx::query_exception when the returned cursor is iterated.
+
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    cursor distinct(bsoncxx::string::view_or_value name,
+                    bsoncxx::document::view_or_value filter,
+                    const options::distinct& options = options::distinct());
+
+    ///
+    /// Finds the distinct values for a specified field across the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param name
+    ///   The field for which the distinct values will be found.
+    /// @param filter
+    ///   Document view representing the documents for which the distinct operation will apply.
+    /// @param options
+    ///   Optional arguments, see options::distinct.
+
+    /// @return mongocxx::cursor having the distinct values for the specified
+    /// field.  If the operation fails, the cursor throws
+    /// mongocxx::query_exception when the returned cursor is iterated.
+
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    cursor distinct(const client_session& session,
+                    bsoncxx::string::view_or_value name,
+                    bsoncxx::document::view_or_value filter,
+                    const options::distinct& options = options::distinct());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops this collection and all its contained documents from the database.
+    ///
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/drop/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void drop(const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+
+    ///
+    /// Drops this collection and all its contained documents from the database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/drop/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void drop(const client_session& session,
+              const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds the documents in this collection which match the provided filter.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    cursor find(bsoncxx::document::view_or_value filter,
+                const options::find& options = options::find());
+
+    ///
+    /// Finds the documents in this collection which match the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the query.
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    cursor find(const client_session& session,
+                bsoncxx::document::view_or_value filter,
+                const options::find& options = options::find());
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document in this collection that match the provided filter.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return An optional document that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    stdx::optional<bsoncxx::document::value> find_one(
+        bsoncxx::document::view_or_value filter, const options::find& options = options::find());
+
+    ///
+    /// Finds a single document in this collection that match the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the query.
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    /// @param options
+    ///   Optional arguments, see options::find
+    ///
+    /// @return An optional document that matched the filter.
+    ///
+    /// @throws mongocxx::query_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-operations-introduction/
+    ///
+    stdx::optional<bsoncxx::document::value> find_one(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::find& options = options::find());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document matching the filter, deletes it, and returns the original.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be deleted.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_delete
+    ///
+    /// @return The document that was deleted.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_delete(
+        bsoncxx::document::view_or_value filter,
+        const options::find_one_and_delete& options = options::find_one_and_delete());
+
+    ///
+    /// Finds a single document matching the filter, deletes it, and returns the original.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be deleted.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_delete
+    ///
+    /// @return The document that was deleted.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_delete(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const options::find_one_and_delete& options = options::find_one_and_delete());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document matching the filter, replaces it, and returns either the original
+    /// or the replacement document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be replaced.
+    /// @param replacement
+    ///   Document view representing the replacement for a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_replace.
+    ///
+    /// @return The original or replaced document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_replace(
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::find_one_and_replace& options = options::find_one_and_replace());
+
+    ///
+    /// Finds a single document matching the filter, replaces it, and returns either the original
+    /// or the replacement document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be replaced.
+    /// @param replacement
+    ///   Document view representing the replacement for a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_replace.
+    ///
+    /// @return The original or replaced document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_replace(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::find_one_and_replace& options = options::find_one_and_replace());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Document view representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Pipeline representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        bsoncxx::document::view_or_value filter,
+        const pipeline& update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        bsoncxx::document::view_or_value filter,
+        std::initializer_list<_empty_doc_tag> update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Document view representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Pipeline representing the update to apply to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        const pipeline& update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// Finds a single document matching the filter, updates it, and returns either the original
+    /// or the newly-updated document.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param filter
+    ///   Document view representing a document that should be updated.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::find_one_and_update.
+    ///
+    /// @return The original or updated document.
+    ///
+    /// @exception
+    ///   Throws mongocxx::logic_error if the collation option is specified and an unacknowledged
+    ///   write concern is used.
+    ///
+    /// @exception
+    ///   Throws mongocxx::write_exception if the operation fails.
+    ///
+    stdx::optional<bsoncxx::document::value> find_one_and_update(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        std::initializer_list<_empty_doc_tag> update,
+        const options::find_one_and_update& options = options::find_one_and_update());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Inserts a single document into the collection. If the document is missing an identifier
+    /// (@c _id field) one will be generated for it.
+    ///
+    /// @param document
+    ///   The document to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to perform the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    stdx::optional<result::insert_one> insert_one(bsoncxx::document::view_or_value document,
+                                                  const options::insert& options = {});
+    ///
+    /// Inserts a single document into the collection. If the document is missing an identifier
+    /// (@c _id field) one will be generated for it.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the insert.
+    /// @param document
+    ///   The document to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to perform the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    stdx::optional<result::insert_one> insert_one(const client_session& session,
+                                                  bsoncxx::document::view_or_value document,
+                                                  const options::insert& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @warning This method uses the bulk insert command to execute the insertion as opposed to
+    /// the legacy OP_INSERT wire protocol message. As a result, using this method to insert many
+    /// documents on MongoDB < 2.6 will be slow.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param container
+    ///   Container of a documents to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to performing the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when the operation fails.
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        const container_type& container, const options::insert& options = options::insert());
+
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @tparam container_type
+    ///   The container type. Must meet the requirements for the container concept with a value
+    ///   type of model::write.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the inserts.
+    /// @param container
+    ///   Container of a documents to insert.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The optional result of attempting to performing the insert.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws mongocxx::bulk_write_exception when the operation fails.
+    ///
+    template <typename container_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        const client_session& session,
+        const container_type& container,
+        const options::insert& options = options::insert());
+
+    ///
+    /// @{
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @warning This method uses the bulk insert command to execute the insertion as opposed to
+    /// the legacy OP_INSERT wire protocol message. As a result, using this method to insert many
+    /// documents on MongoDB < 2.6 will be slow.
+    ///
+    /// @tparam document_view_iterator_type
+    ///   The iterator type. Must meet the requirements for the input iterator concept with a value
+    ///   type of bsoncxx::document::view.
+    ///
+    /// @param begin
+    ///   Iterator pointing to the first document to be inserted.
+    /// @param end
+    ///   Iterator pointing to the end of the documents to be inserted.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The result of attempting to performing the insert.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    ///
+    template <typename document_view_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        document_view_iterator_type begin,
+        document_view_iterator_type end,
+        const options::insert& options = options::insert());
+
+    ///
+    /// Inserts multiple documents into the collection. If any of the documents are missing
+    /// identifiers the driver will generate them.
+    ///
+    /// @tparam document_view_iterator_type
+    ///   The iterator type. Must meet the requirements for the input iterator concept with a value
+    ///   type of bsoncxx::document::view.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the inserts.
+    /// @param begin
+    ///   Iterator pointing to the first document to be inserted.
+    /// @param end
+    ///   Iterator pointing to the end of the documents to be inserted.
+    /// @param options
+    ///   Optional arguments, see options::insert.
+    ///
+    /// @return The result of attempting to performing the insert.
+    ///
+    /// @throws mongocxx::bulk_write_exception if the operation fails.
+    ///
+    template <typename document_view_iterator_type>
+    MONGOCXX_INLINE stdx::optional<result::insert_many> insert_many(
+        const client_session& session,
+        document_view_iterator_type begin,
+        document_view_iterator_type end,
+        const options::insert& options = options::insert());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Returns a list of the indexes currently on this collection.
+    ///
+    /// @return Cursor yielding the index specifications.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listIndexes/
+    ///
+    cursor list_indexes() const;
+
+    ///
+    /// Returns a list of the indexes currently on this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    ///
+    /// @return Cursor yielding the index specifications.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listIndexes/
+    ///
+    cursor list_indexes(const client_session& session) const;
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Returns the name of this collection.
+    ///
+    /// @return The name of the collection.  The return value of this method is invalidated by any
+    /// subsequent call to collection::rename() on this collection object.
+    ///
+    stdx::string_view name() const;
+
+    ///
+    /// Rename this collection.
+    ///
+    /// @param new_name The new name to assign to the collection.
+    /// @param drop_target_before_rename Whether to overwrite any
+    ///   existing collections called new_name. The default is false.
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/renameCollection/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void rename(bsoncxx::string::view_or_value new_name,
+                bool drop_target_before_rename = false,
+                const bsoncxx::stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Rename this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the rename.
+    /// @param new_name The new name to assign to the collection.
+    /// @param drop_target_before_rename Whether to overwrite any
+    ///   existing collections called new_name. The default is false.
+    /// @param write_concern (optional)
+    ///   The write concern to use for this operation. Defaults to the collection wide write
+    ///   concern if none is provided.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/renameCollection/
+    ///
+    /// @note
+    ///   Write concern supported only for MongoDB 3.4+.
+    ///
+    void rename(const client_session& session,
+                bsoncxx::string::view_or_value new_name,
+                bool drop_target_before_rename = false,
+                const bsoncxx::stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Sets the read_concern for this collection. Changes will not have any effect on existing
+    /// cursors or other read operations which use the previously-set read concern.
+    ///
+    /// @param rc
+    ///   The new @c read_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/
+    ///
+    void read_concern(class read_concern rc);
+
+    ///
+    /// Gets the read_concern for the collection.
+    ///
+    /// If a read_concern has not been explicitly set for this collection object, it inherits
+    /// the read_concern from its parent database or client object.
+    ///
+    /// @return The current read_concern.
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Sets the read_preference for this collection. Changes will not have any effect on existing
+    /// cursors or other read operations which use the read preference.
+    ///
+    /// @param rp
+    ///   The read_preference to set.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    void read_preference(class read_preference rp);
+
+    ///
+    /// Gets the read_preference for the collection.
+    ///
+    /// @return The current read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// @{
+    ///
+    /// Replaces a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param replacement
+    ///   The replacement document.
+    /// @param options
+    ///   Optional arguments, see options::replace.
+    ///
+    /// @return The optional result of attempting to replace a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the replacement is invalid, or mongocxx::bulk_write_exception if
+    ///   the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::replace_one> replace_one(
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::replace& options = options::replace{});
+
+    ///
+    /// Replaces a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the replace.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param replacement
+    ///   The replacement document.
+    /// @param options
+    ///   Optional arguments, see options::replace.
+    ///
+    /// @return The optional result of attempting to replace a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the replacement is invalid, or mongocxx::bulk_write_exception if
+    ///   the operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::replace_one> replace_one(
+        const client_session& session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::replace& options = options::replace{});
+
+    ///
+    /// @{
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(bsoncxx::document::view_or_value filter,
+                                               bsoncxx::document::view_or_value update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(bsoncxx::document::view_or_value filter,
+                                               const pipeline& update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(bsoncxx::document::view_or_value filter,
+                                               std::initializer_list<_empty_doc_tag> update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(const client_session& session,
+                                               bsoncxx::document::view_or_value filter,
+                                               bsoncxx::document::view_or_value update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to matching documents.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(const client_session& session,
+                                               bsoncxx::document::view_or_value filter,
+                                               const pipeline& update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// Updates multiple documents matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update multiple documents.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_many(const client_session& session,
+                                               bsoncxx::document::view_or_value filter,
+                                               std::initializer_list<_empty_doc_tag> update,
+                                               const options::update& options = options::update());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(bsoncxx::document::view_or_value filter,
+                                              bsoncxx::document::view_or_value update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(bsoncxx::document::view_or_value filter,
+                                              const pipeline& update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(bsoncxx::document::view_or_value filter,
+                                              std::initializer_list<_empty_doc_tag> update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Document representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(const client_session& session,
+                                              bsoncxx::document::view_or_value filter,
+                                              bsoncxx::document::view_or_value update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Pipeline representing the update to be applied to a matching document.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(const client_session& session,
+                                              bsoncxx::document::view_or_value filter,
+                                              const pipeline& update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// Updates a single document matching the provided filter in this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the update.
+    /// @param filter
+    ///   Document representing the match criteria.
+    /// @param update
+    ///   Supports the empty update {}.
+    /// @param options
+    ///   Optional arguments, see options::update.
+    ///
+    /// @return The optional result of attempting to update a document.
+    /// If the write concern is unacknowledged, the optional will be
+    /// disengaged.
+    ///
+    /// @throws
+    ///   mongocxx::logic_error if the update is invalid, or mongocxx::bulk_write_exception if the
+    ///   operation fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    stdx::optional<result::update> update_one(const client_session& session,
+                                              bsoncxx::document::view_or_value filter,
+                                              std::initializer_list<_empty_doc_tag> update,
+                                              const options::update& options = options::update());
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Sets the write_concern for this collection. Changes will not have any effect on existing
+    /// write operations.
+    ///
+    /// @param wc
+    ///   The new write_concern to use.
+    ///
+    void write_concern(class write_concern wc);
+
+    ///
+    /// Gets the write_concern for the collection.
+    ///
+    /// @return The current write_concern.
+    ///
+    class write_concern write_concern() const;
+
+    ///
+    /// Gets an index_view to the collection.
+    index_view indexes();
+
+    ///
+    /// @{
+    ///
+    /// Gets a change stream on this collection with an empty pipeline.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const options::change_stream& options = {});
+
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this collection.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    ///   Only a subset of pipeline operations are supported for change streams. For more
+    ///   information see the change streams documentation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const pipeline& pipe, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session,
+                        const pipeline& pipe,
+                        const options::change_stream& options = {});
+
+    ///
+    /// @}
+    ///
+
+   private:
+    friend class bulk_write;
+    friend class database;
+
+    MONGOCXX_PRIVATE collection(const database& database,
+                                bsoncxx::string::view_or_value collection_name);
+
+    MONGOCXX_PRIVATE collection(const database& database, void* collection);
+
+    MONGOCXX_PRIVATE cursor _aggregate(const client_session* session,
+                                       const pipeline& pipeline,
+                                       const options::aggregate& options);
+
+    MONGOCXX_PRIVATE std::int64_t _count(const client_session* session,
+                                         bsoncxx::document::view_or_value filter,
+                                         const options::count& options);
+
+    MONGOCXX_PRIVATE std::int64_t _count_documents(const client_session* session,
+                                                   bsoncxx::document::view_or_value filter,
+                                                   const options::count& options);
+
+    MONGOCXX_PRIVATE bsoncxx::document::value _create_index(
+        const client_session* session,
+        bsoncxx::document::view_or_value keys,
+        bsoncxx::document::view_or_value index_options,
+        options::index_view operation_options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::delete_result> _delete_many(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::delete_result> _delete_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::delete_options& options);
+
+    MONGOCXX_PRIVATE cursor _distinct(const client_session* session,
+                                      bsoncxx::string::view_or_value name,
+                                      bsoncxx::document::view_or_value filter,
+                                      const options::distinct& options);
+
+    MONGOCXX_PRIVATE void _drop(
+        const client_session* session,
+        const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE cursor _find(const client_session* session,
+                                  bsoncxx::document::view_or_value filter,
+                                  const options::find& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::find& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one_and_delete(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        const options::find_one_and_delete& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one_and_replace(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::find_one_and_replace& options);
+
+    MONGOCXX_PRIVATE stdx::optional<bsoncxx::document::value> _find_one_and_update(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::find_one_and_update& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::insert_one> _insert_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value document,
+        const options::insert& options);
+
+    MONGOCXX_PRIVATE void _rename(
+        const client_session* session,
+        bsoncxx::string::view_or_value new_name,
+        bool drop_target_before_rename,
+        const bsoncxx::stdx::optional<class write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE stdx::optional<result::replace_one> _replace_one(
+        const client_session* session,
+        const options::bulk_write& bulk_opts,
+        const model::replace_one& replace_op);
+
+    MONGOCXX_PRIVATE stdx::optional<result::replace_one> _replace_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value replacement,
+        const options::replace& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::update> _update_one(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::update& options);
+
+    MONGOCXX_PRIVATE stdx::optional<result::update> _update_many(
+        const client_session* session,
+        bsoncxx::document::view_or_value filter,
+        bsoncxx::document::view_or_value update,
+        const options::update& options);
+
+    MONGOCXX_PRIVATE change_stream _watch(const client_session* session,
+                                          const pipeline& pipe,
+                                          const options::change_stream& options);
+
+    // Helpers for the insert_many method templates.
+    class bulk_write _init_insert_many(const options::insert& options,
+                                       const client_session* session);
+
+    void _insert_many_doc_handler(class bulk_write& writes,
+                                  bsoncxx::builder::basic::array& inserted_ids,
+                                  bsoncxx::document::view doc) const;
+
+    stdx::optional<result::insert_many> _exec_insert_many(
+        class bulk_write& writes, bsoncxx::builder::basic::array& inserted_ids);
+
+    template <typename document_view_iterator_type>
+    MONGOCXX_PRIVATE stdx::optional<result::insert_many> _insert_many(
+        const client_session* session,
+        document_view_iterator_type begin,
+        document_view_iterator_type end,
+        const options::insert& options);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::write(
+    const model::write& write, const options::bulk_write& options) {
+    return create_bulk_write(options).append(write).execute();
+}
+
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::write(
+    const client_session& session, const model::write& write, const options::bulk_write& options) {
+    return create_bulk_write(session, options).append(write).execute();
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    const container_type& requests, const options::bulk_write& options) {
+    return bulk_write(requests.begin(), requests.end(), options);
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    const client_session& session,
+    const container_type& requests,
+    const options::bulk_write& options) {
+    return bulk_write(session, requests.begin(), requests.end(), options);
+}
+
+template <typename write_model_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    write_model_iterator_type begin,
+    write_model_iterator_type end,
+    const options::bulk_write& options) {
+    auto writes = create_bulk_write(options);
+    std::for_each(begin, end, [&](const model::write& current) { writes.append(current); });
+    return writes.execute();
+}
+
+template <typename write_model_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::bulk_write> collection::bulk_write(
+    const client_session& session,
+    write_model_iterator_type begin,
+    write_model_iterator_type end,
+    const options::bulk_write& options) {
+    auto writes = create_bulk_write(session, options);
+    std::for_each(begin, end, [&](const model::write& current) { writes.append(current); });
+    return writes.execute();
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    const container_type& container, const options::insert& options) {
+    return insert_many(container.begin(), container.end(), options);
+}
+
+template <typename container_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    const client_session& session,
+    const container_type& container,
+    const options::insert& options) {
+    return insert_many(session, container.begin(), container.end(), options);
+}
+
+template <typename document_view_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::_insert_many(
+
+    const client_session* session,
+    document_view_iterator_type begin,
+    document_view_iterator_type end,
+    const options::insert& options) {
+    bsoncxx::builder::basic::array inserted_ids;
+    auto writes = _init_insert_many(options, session);
+    std::for_each(begin, end, [&inserted_ids, &writes, this](bsoncxx::document::view doc) {
+        _insert_many_doc_handler(writes, inserted_ids, doc);
+    });
+    return _exec_insert_many(writes, inserted_ids);
+}
+
+template <typename document_view_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    document_view_iterator_type begin,
+    document_view_iterator_type end,
+    const options::insert& options) {
+    return _insert_many(nullptr, begin, end, options);
+}
+
+template <typename document_view_iterator_type>
+MONGOCXX_INLINE stdx::optional<result::insert_many> collection::insert_many(
+    const client_session& session,
+    document_view_iterator_type begin,
+    document_view_iterator_type end,
+    const options::insert& options) {
+    return _insert_many(&session, begin, end, options);
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp
new file mode 100644
index 0000000..c9dffc8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/compiler.hpp
@@ -0,0 +1,34 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// TODO: DRY this definition with the one from bsoncxx/config/compiler.hpp per discussion
+//       here - https://github.com/mongodb/mongo-cxx-driver/pull/374#issuecomment-158179295
+#if defined(_MSC_VER)
+
+// Disable MSVC warnings that cause a lot of noise related to DLL visibility
+// for types that we don't control (like std::unique_ptr).
+#pragma warning(push)
+#pragma warning(disable : 4251 4275)
+
+#define MONGOCXX_INLINE inline MONGOCXX_PRIVATE
+
+#define MONGOCXX_CALL __cdecl
+
+#else
+
+#define MONGOCXX_INLINE inline MONGOCXX_PRIVATE
+
+#define MONGOCXX_CALL
+
+#endif
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/config.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/config.hpp
new file mode 100644
index 0000000..90a571d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/config.hpp
@@ -0,0 +1,17 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define MONGOCXX_INLINE_NAMESPACE_BEGIN inline namespace v_noabi {
+
+#define MONGOCXX_INLINE_NAMESPACE_END }  // namespace v_noabi
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/export.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/export.hpp
new file mode 100644
index 0000000..be1f834
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/export.hpp
@@ -0,0 +1,42 @@
+
+#ifndef MONGOCXX_API_H
+#define MONGOCXX_API_H
+
+#ifdef MONGOCXX_STATIC
+#  define MONGOCXX_API
+#  define MONGOCXX_PRIVATE
+#else
+#  ifndef MONGOCXX_API
+#    ifdef MONGOCXX_EXPORTS
+        /* We are building this library */
+#      define MONGOCXX_API __declspec(dllexport)
+#    else
+        /* We are using this library */
+#      define MONGOCXX_API __declspec(dllimport)
+#    endif
+#  endif
+
+#  ifndef MONGOCXX_PRIVATE
+#    define MONGOCXX_PRIVATE 
+#  endif
+#endif
+
+#ifndef MONGOCXX_DEPRECATED
+#  define MONGOCXX_DEPRECATED __declspec(deprecated)
+#endif
+
+#ifndef MONGOCXX_DEPRECATED_EXPORT
+#  define MONGOCXX_DEPRECATED_EXPORT MONGOCXX_API MONGOCXX_DEPRECATED
+#endif
+
+#ifndef MONGOCXX_DEPRECATED_NO_EXPORT
+#  define MONGOCXX_DEPRECATED_NO_EXPORT MONGOCXX_PRIVATE MONGOCXX_DEPRECATED
+#endif
+
+#if 0 /* DEFINE_NO_DEPRECATED */
+#  ifndef MONGOCXX_NO_DEPRECATED
+#    define MONGOCXX_NO_DEPRECATED
+#  endif
+#endif
+
+#endif /* MONGOCXX_API_H */
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
new file mode 100644
index 0000000..cb5f665
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/postlude.hpp
@@ -0,0 +1,62 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// src/mongocxx/config/compiler.hpp
+#undef MONGOCXX_INLINE
+#pragma pop_macro("MONGOCXX_INLINE")
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+#undef MONGOCXX_CALL
+#pragma pop_macro("MONGOCXX_CALL")
+
+// src/mongocxx/config/config.hpp.in
+#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
+#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
+#undef MONGOCXX_INLINE_NAMESPACE_END
+#pragma pop_macro("MONGOCXX_INLINE_NAMESPACE_END")
+
+// src/mongocxx/config/version.hpp.in
+#undef MONGOCXX_VERSION_STRING
+#pragma pop_macro("MONGOCXX_VERSION_STRING")
+#undef MONGOCXX_VERSION_EXTRA
+#pragma pop_macro("MONGOCXX_VERSION_EXTRA")
+#undef MONGOCXX_VERSION_MAJOR
+#pragma pop_macro("MONGOCXX_VERSION_MAJOR")
+#undef MONGOCXX_VERSION_MINOR
+#pragma pop_macro("MONGOCXX_VERSION_MINOR")
+#undef MONGOCXX_VERSION_PATCH
+#pragma pop_macro("MONGOCXX_VERSION_PATCH")
+
+// export.hpp (generated by cmake)
+#undef MONGOCXX_API_H
+#pragma pop_macro("MONGOCXX_API_H")
+#undef MONGOCXX_API
+#pragma pop_macro("MONGOCXX_API")
+#undef MONGOCXX_PRIVATE
+#pragma pop_macro("MONGOCXX_PRIVATE")
+#undef MONGOCXX_DEPRECATED
+#pragma pop_macro("MONGOCXX_DEPRECATED")
+#undef MONGOCXX_DEPRECATED_EXPORT
+#pragma pop_macro("MONGOCXX_DEPRECATED_EXPORT")
+#undef MONGOCXX_DEPRECATED_NO_EXPORT
+#pragma pop_macro("MONGOCXX_DEPRECATED_NO_EXPORT")
+#undef DEFINE_NO_DEPRECATED
+#pragma pop_macro("DEFINE_NO_DEPRECATED")
+#undef MONGOCXX_NO_DEPRECATED
+#pragma pop_macro("MONGOCXX_NO_DEPRECATED")
+
+// prelude.hpp
+#undef MONGOCXX_UNREACHABLE
+#pragma pop_macro("MONGOCXX_UNREACHABLE")
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
new file mode 100644
index 0000000..df1162b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/prelude.hpp
@@ -0,0 +1,65 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// src/mongocxx/config/compiler.hpp
+#pragma push_macro("MONGOCXX_INLINE")
+#undef MONGOCXX_INLINE
+#pragma push_macro("MONGOCXX_CALL")
+#undef MONGOCXX_CALL
+
+// src/mongocxx/config/config.hpp.in
+#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_BEGIN")
+#undef MONGOCXX_INLINE_NAMESPACE_BEGIN
+#pragma push_macro("MONGOCXX_INLINE_NAMESPACE_END")
+#undef MONGOCXX_INLINE_NAMESPACE_END
+
+// src/mongocxx/config/version.hpp.in
+#pragma push_macro("MONGOCXX_VERSION_STRING")
+#undef MONGOCXX_VERSION_STRING
+#pragma push_macro("MONGOCXX_VERSION_EXTRA")
+#undef MONGOCXX_VERSION_EXTRA
+#pragma push_macro("MONGOCXX_VERSION_MAJOR")
+#undef MONGOCXX_VERSION_MAJOR
+#pragma push_macro("MONGOCXX_VERSION_MINOR")
+#undef MONGOCXX_VERSION_MINOR
+#pragma push_macro("MONGOCXX_VERSION_PATCH")
+#undef MONGOCXX_VERSION_PATCH
+
+// export.hpp (generated by cmake)
+#pragma push_macro("MONGOCXX_API_H")
+#undef MONGOCXX_API_H
+#pragma push_macro("MONGOCXX_API")
+#undef MONGOCXX_API
+#pragma push_macro("MONGOCXX_PRIVATE")
+#undef MONGOCXX_PRIVATE
+#pragma push_macro("MONGOCXX_DEPRECATED")
+#undef MONGOCXX_DEPRECATED
+#pragma push_macro("MONGOCXX_DEPRECATED_EXPORT")
+#undef MONGOCXX_DEPRECATED_EXPORT
+#pragma push_macro("MONGOCXX_DEPRECATED_NO_EXPORT")
+#undef MONGOCXX_DEPRECATED_NO_EXPORT
+#pragma push_macro("DEFINE_NO_DEPRECATED")
+#undef DEFINE_NO_DEPRECATED
+#pragma push_macro("MONGOCXX_NO_DEPRECATED")
+#undef MONGOCXX_NO_DEPRECATED
+
+#include <mongocxx/config/compiler.hpp>
+#include <mongocxx/config/config.hpp>
+#include <mongocxx/config/export.hpp>
+#include <mongocxx/config/version.hpp>
+
+// TODO: Find a way to DRY this with BSONCXX_UNREACHABLE
+#pragma push_macro("MONGOCXX_UNREACHABLE")
+#undef MONGOCXX_UNREACHABLE
+#define MONGOCXX_UNREACHABLE std::abort()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/version.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/version.hpp
new file mode 100644
index 0000000..ed1cf90
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/config/version.hpp
@@ -0,0 +1,19 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#define MONGOCXX_VERSION_STRING "3.7.0"
+#define MONGOCXX_VERSION_MAJOR 3
+#define MONGOCXX_VERSION_MINOR 7
+#define MONGOCXX_VERSION_PATCH 0
+#define MONGOCXX_VERSION_EXTRA 
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/cursor.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/cursor.hpp
new file mode 100644
index 0000000..f85ce59
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/cursor.hpp
@@ -0,0 +1,176 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+///
+/// Class representing a pointer to the result set of a query on a MongoDB server.
+///
+/// Clients can iterate through a cursor::iterator to retrieve results.
+///
+/// @note By default, cursors timeout after 10 minutes of inactivity.
+///
+class MONGOCXX_API cursor {
+   public:
+    enum class type { k_non_tailable, k_tailable, k_tailable_await };
+
+    class MONGOCXX_API iterator;
+
+    ///
+    /// Move constructs a cursor.
+    ///
+    cursor(cursor&&) noexcept;
+
+    ///
+    /// Move assigns a cursor.
+    ///
+    cursor& operator=(cursor&&) noexcept;
+
+    ///
+    /// Destroys a cursor.
+    ///
+    ~cursor();
+
+    ///
+    /// A cursor::iterator that points to the beginning of any available
+    /// results.  If begin() is called more than once, the cursor::iterator
+    /// returned points to the next remaining result, not the result of
+    /// the original call to begin().
+    ///
+    /// For a tailable cursor, when cursor.begin() == cursor.end(), no
+    /// documents are available.  Each call to cursor.begin() checks again
+    /// for newly-available documents.
+    ///
+    /// @return the cursor::iterator
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    iterator begin();
+
+    ///
+    /// A cursor::iterator indicating cursor exhaustion, meaning that
+    /// no documents are available from the cursor.
+    ///
+    /// @return the cursor::iterator
+    ///
+    iterator end();
+
+   private:
+    friend class collection;
+    friend class client;
+    friend class database;
+    friend class index_view;
+    friend class cursor::iterator;
+
+    MONGOCXX_PRIVATE cursor(void* cursor_ptr,
+                            bsoncxx::stdx::optional<type> cursor_type = bsoncxx::stdx::nullopt);
+
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+///
+/// Class representing an input iterator of documents in a MongoDB cursor
+/// result set.
+///
+/// All non-end iterators derived from the same mongocxx::cursor move in
+/// lock-step.  Dereferencing any non-end() iterator always gives the first
+/// remaining document in the cursor.  Incrementing one non-end iterator is
+/// equivalent to incrementing them all.
+///
+/// An iterator is 'exhausted' when no documents are available. An
+/// end-iterator is always exhausted. A non-end iterator is exhausted when the
+/// originating mongocxx::cursor has no more documents.  When an iterator is
+/// exhausted, it must not be dereferenced or incremented.
+///
+/// For iterators of a tailable cursor, calling cursor.begin() may revive an
+/// exhausted iterator so that it no longer compares equal to the
+/// end-iterator.
+///
+class MONGOCXX_API cursor::iterator {
+   public:
+    ///
+    /// std::iterator_traits
+    ///
+    using value_type = bsoncxx::document::view;
+    using reference = bsoncxx::document::view&;
+    using pointer = bsoncxx::document::view*;
+    using iterator_category = std::input_iterator_tag;
+    using difference_type = std::ptrdiff_t;
+
+    ///
+    /// Dereferences the view for the document currently being pointed to.
+    ///
+    const bsoncxx::document::view& operator*() const;
+
+    ///
+    /// Accesses a member of the dereferenced document currently being pointed to.
+    ///
+    const bsoncxx::document::view* operator->() const;
+
+    ///
+    /// Pre-increments the iterator to move to the next document.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    iterator& operator++();
+
+    ///
+    /// Post-increments the iterator to move to the next document.
+    ///
+    /// @throws mongocxx::query_exception if the query failed
+    ///
+    void operator++(int);
+
+   private:
+    friend class cursor;
+
+    ///
+    /// @{
+    ///
+    /// Compare two iterators for (in)-equality.  Iterators compare equal if
+    /// they point to the same underlying cursor or if both are exhausted.
+    ///
+    /// @relates iterator
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const iterator&, const iterator&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const iterator&, const iterator&);
+    ///
+    /// @}
+    ///
+
+    MONGOCXX_PRIVATE bool is_exhausted() const;
+
+    MONGOCXX_PRIVATE explicit iterator(cursor* cursor);
+
+    // If this pointer is null, the iterator is considered "past-the-end".
+    cursor* _cursor;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/database.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/database.hpp
new file mode 100644
index 0000000..af06a8f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/database.hpp
@@ -0,0 +1,679 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/collection.hpp>
+#include <mongocxx/gridfs/bucket.hpp>
+#include <mongocxx/options/create_collection.hpp>
+#include <mongocxx/options/gridfs/bucket.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+
+///
+/// Class representing a MongoDB database.
+///
+/// Acts as a gateway for accessing collections that are contained within a database. It inherits
+/// all of its default settings from the client that creates it.
+///
+class MONGOCXX_API database {
+   public:
+    ///
+    /// Default constructs a new database. The database is not valid for use and is equivalent
+    /// to the state of a moved-from database. The only valid actions to take with a default
+    /// constructed database are to assign to it, or destroy it.
+    ///
+    database() noexcept;
+
+    ///
+    /// Move constructs a database.
+    ///
+    database(database&&) noexcept;
+
+    ///
+    /// Move assigns a database.
+    ///
+    database& operator=(database&&) noexcept;
+
+    ///
+    /// Copy constructs a database.
+    ///
+    database(const database&);
+
+    ///
+    /// Copy assigns a database.
+    ///
+    database& operator=(const database&);
+
+    ///
+    /// Destroys a database.
+    ///
+    ~database();
+
+    ///
+    /// Returns true if the client is valid, meaning it was not default constructed
+    /// or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// @{
+    ///
+    /// Runs an aggregation framework pipeline against this database for
+    /// pipeline stages that do not require an underlying collection,
+    /// such as $currentOp and $listLocalSessions.
+    ///
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/#dbcmd.aggregate
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   database level set read concern - database::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+
+    ///
+    /// Runs an aggregation framework pipeline against this database for
+    /// pipeline stages that do not require an underlying collection,
+    /// such as $currentOp and $listLocalSessions.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param pipeline
+    ///   The pipeline of aggregation operations to perform.
+    /// @param options
+    ///   Optional arguments, see mongocxx::options::aggregate.
+    ///
+    /// @return A mongocxx::cursor with the results.  If the query fails,
+    /// the cursor throws mongocxx::query_exception when the returned cursor
+    /// is iterated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/#dbcmd.aggregate
+    ///
+    /// @note
+    ///   In order to pass a read concern to this, you must use the
+    ///   database level set read concern - database::read_concern(rc).
+    ///   (Write concern supported only for MongoDB 3.4+).
+    ///
+    cursor aggregate(const client_session& session,
+                     const pipeline& pipeline,
+                     const options::aggregate& options = options::aggregate());
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Runs a command against this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.runCommand/
+    ///
+    /// @param command document representing the command to be run.
+    /// @return the result of executing the command.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    bsoncxx::document::value run_command(bsoncxx::document::view_or_value command);
+
+    ///
+    /// Runs a command against this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.runCommand/
+    ///
+    /// @param session The mongocxx::client_session with which to run the command.
+    /// @param command document representing the command to be run.
+    /// @return the result of executing the command.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    bsoncxx::document::value run_command(const client_session& session,
+                                         bsoncxx::document::view_or_value command);
+
+    ///
+    /// Executes a command on a specific server using this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.runCommand/
+    ///
+    /// @param command document representing the command to be run.
+    /// @param server_id specifying which server to use.
+    /// @return the result of executing the command.
+    ///
+    /// @throws mongocxx::operation_exception if the operation fails.
+    ///
+    bsoncxx::document::value run_command(bsoncxx::document::view_or_value command,
+                                         uint32_t server_id);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @note This function can also be used to create a Time Series Collection. See:
+    /// https://docs.mongodb.com/manual/core/timeseries-collections/
+    ///
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    class collection create_collection(stdx::string_view name,
+                                       bsoncxx::document::view_or_value collection_options = {},
+                                       const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @note This function can also be used to create a Time Series Collection. See:
+    /// https://docs.mongodb.com/manual/core/timeseries-collections/
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the create operation.
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    class collection create_collection(const client_session& session,
+                                       stdx::string_view name,
+                                       bsoncxx::document::view_or_value collection_options = {},
+                                       const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @deprecated
+    ///   This overload is deprecated. Call database::create_collection with a
+    ///   bsoncxx::document::view_or_value collection_options instead.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    MONGOCXX_DEPRECATED class collection create_collection(
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {}) {
+        return create_collection_deprecated(name, collection_options, write_concern);
+    }
+
+    class collection create_collection_deprecated(
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @deprecated
+    ///   This overload is deprecated. Call database::create_collection with a
+    ///   bsoncxx::document::view_or_value collection_options instead.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the create operation.
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    MONGOCXX_DEPRECATED class collection create_collection(
+        const client_session& session,
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {}) {
+        return create_collection_deprecated(session, name, collection_options, write_concern);
+    }
+
+    ///
+    /// Explicitly creates a collection in this database with the specified options.
+    ///
+    /// @deprecated
+    ///   This overload is deprecated. Call database::create_collection with a
+    ///   bsoncxx::document::view_or_value collection_options instead.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the create operation.
+    /// @param name
+    ///   the new collection's name.
+    /// @param collection_options
+    ///   the options for the new collection.
+    /// @param write_concern
+    ///   the write concern to use for this operation. Will default to database
+    ///   set write concern if none passed here.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    class collection create_collection_deprecated(
+        const client_session& session,
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<write_concern>& write_concern = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops the database and all its collections.
+    ///
+    /// @param write_concern (optional)
+    ///   The write concern to be used for this operation. If not passed here, the write concern
+    ///   set on the database will be used.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/dropDatabase/
+    ///
+    void drop(const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+
+    ///
+    /// Drops the database and all its collections.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param write_concern (optional)
+    ///   The write concern to be used for this operation. If not passed here, the write concern
+    ///   set on the database will be used.
+    ///
+    /// @exception
+    ///   mongocxx::operation_exception if the operation fails.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/dropDatabase/
+    ///
+    void drop(const client_session& session,
+              const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Checks whether this database contains a collection having the given name.
+    ///
+    /// @param name the name of the collection.
+    ///
+    /// @return bool whether the collection exists in this database.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listCollections'
+    /// command fails.
+    ///
+    bool has_collection(bsoncxx::string::view_or_value name) const;
+
+    ///
+    /// @{
+    ///
+    /// Enumerates the collections in this database.
+    ///
+    /// @param filter
+    ///   An optional query expression to filter the returned collections.
+    ///
+    /// @return mongocxx::cursor containing the collection information.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    cursor list_collections(bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// Enumerates the collections in this database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param filter
+    ///   An optional query expression to filter the returned collections.
+    ///
+    /// @return mongocxx::cursor containing the collection information.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    cursor list_collections(const client_session& session,
+                            bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// Enumerates the collection names in this database.
+    ///
+    /// @param filter
+    ///   An optional query expression to filter the returned collection names.
+    ///
+    /// @return std::vector<std::string> containing the collection names.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listCollections'
+    /// command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    std::vector<std::string> list_collection_names(bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// Enumerates the collection names in this database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the aggregation.
+    /// @param filter
+    ///   An optional query expression to filter the returned collection names.
+    ///
+    /// @return std::vector<std::string> containing the collection names.
+    ///
+    /// @throws mongocxx::operation_exception if the underlying 'listCollections'
+    /// command fails.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/listCollections/
+    ///
+    std::vector<std::string> list_collection_names(const client_session& session,
+                                                   bsoncxx::document::view_or_value filter = {});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Get the name of this database.
+    ///
+    /// @return the name of this database.
+    ///
+    stdx::string_view name() const;
+
+    ///
+    /// Sets the read_concern for this database.
+    ///
+    /// @note Modifications at this level do not affect existing collection instances that have come
+    /// from this database, but do affect new ones. New collections will receive a copy of the
+    /// new read_concern for this database upon instantiation.
+    ///
+    /// @param rc
+    ///   The new @c read_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/
+    ///
+    void read_concern(class read_concern rc);
+
+    ///
+    /// The current read concern for this database.
+    ///
+    /// If the read_concern is not explicitly set on this database object, it inherits the
+    /// read_concern from its parent client object.
+    ///
+    /// @return the current read_concern
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Sets the read_preference for this database.
+    ///
+    /// @note Modifications at this level do not affect existing collection instances that have come
+    /// from this database, but do affect new ones. New collections will receive a copy of the
+    /// new read_preference for this database upon instantiation.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    /// @param rp the new read_preference.
+    ///
+    void read_preference(class read_preference rp);
+
+    ///
+    /// The current read preference for this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/
+    ///
+    /// @return the current read_preference
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// Sets the write_concern for this database.
+    ///
+    /// @note Modifications at this level do not affect existing collection instances that have come
+    /// from this database, but do affect new ones as new collections will receive a copy of the
+    /// write_concern of this database upon instantiation.
+    ///
+    void write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this database.
+    ///
+    /// @return the current write_concern
+    ///
+    class write_concern write_concern() const;
+
+    ///
+    /// Access a collection (logical grouping of documents) within this database.
+    ///
+    /// @param name the name of the collection to get.
+    ///
+    /// @return the collection.
+    ///
+    class collection collection(bsoncxx::string::view_or_value name) const;
+
+    ///
+    /// Allows the db["collection_name"] syntax to be used to access a collection within this
+    /// database.
+    ///
+    /// @param name the name of the collection to get.
+    ///
+    /// @return the collection.
+    ///
+    MONGOCXX_INLINE class collection operator[](bsoncxx::string::view_or_value name) const;
+
+    ///
+    /// Access a GridFS bucket within this database.
+    ///
+    /// @param options
+    ///   The options for the bucket.
+    ///
+    /// @return
+    ///   The GridFS bucket.
+    ///
+    /// @note
+    ///   See the class comment for `gridfs::bucket` for more information about GridFS.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    class gridfs::bucket gridfs_bucket(
+        const options::gridfs::bucket& options = options::gridfs::bucket()) const;
+
+    ///
+    /// @{
+    ///
+    /// Gets a change stream on this database with an empty pipeline.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const options::change_stream& options = {});
+
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this database.
+    /// Change streams are only supported with a "majority" read concern or no read concern.
+    ///
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    ///   Only a subset of pipeline operations are supported for change streams. For more
+    ///   information see the change streams documentation.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const pipeline& pipe, const options::change_stream& options = {});
+
+    ///
+    /// Gets a change stream on this database.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the watch operation.
+    /// @param pipe
+    ///   The aggregation pipeline to be used on the change notifications.
+    /// @param options
+    ///   The options to use when creating the change stream.
+    ///
+    /// @return
+    ///  A change stream on this database.
+    ///
+    /// @see https://docs.mongodb.com/manual/changeStreams/
+    ///
+    change_stream watch(const client_session& session,
+                        const pipeline& pipe,
+                        const options::change_stream& options = {});
+
+    ///
+    /// @}
+    ///
+
+   private:
+    friend class client;
+    friend class collection;
+
+    MONGOCXX_PRIVATE database(const class client& client, bsoncxx::string::view_or_value name);
+
+    MONGOCXX_PRIVATE cursor _aggregate(const client_session* session,
+                                       const pipeline& pipeline,
+                                       const options::aggregate& options);
+
+    MONGOCXX_PRIVATE bsoncxx::document::value _run_command(
+        const client_session* session, bsoncxx::document::view_or_value command);
+
+    MONGOCXX_PRIVATE class collection _create_collection(
+        const client_session* session,
+        stdx::string_view name,
+        bsoncxx::document::view_or_value collection_options,
+        const stdx::optional<class write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE class collection _create_collection_deprecated(
+        const client_session* session,
+        bsoncxx::string::view_or_value name,
+        const options::create_collection_deprecated& collection_options,
+        const stdx::optional<class write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE cursor _list_collections(const client_session* session,
+                                              bsoncxx::document::view_or_value filter);
+
+    MONGOCXX_PRIVATE std::vector<std::string> _list_collection_names(
+        const client_session* session, bsoncxx::document::view_or_value filter);
+
+    MONGOCXX_PRIVATE void _drop(
+        const client_session* session,
+        const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern);
+
+    MONGOCXX_PRIVATE change_stream _watch(const client_session* session,
+                                          const pipeline& pipe,
+                                          const options::change_stream& options);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE collection database::operator[](bsoncxx::string::view_or_value name) const {
+    return collection(name);
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp
new file mode 100644
index 0000000..2837ae9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_failed_event.hpp
@@ -0,0 +1,109 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver fails to execute a MongoDB command.
+///
+/// @see "CommandFailedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst
+///
+class MONGOCXX_API command_failed_event {
+   public:
+    MONGOCXX_PRIVATE explicit command_failed_event(const void* event);
+
+    ///
+    /// Destroys a command_failed_event.
+    ///
+    ~command_failed_event();
+
+    ///
+    /// Returns the server’s reply to the failed operation.
+    ///
+    /// @return The failure.
+    ///
+    bsoncxx::document::view failure() const;
+
+    ///
+    /// Returns the name of the command.
+    ///
+    /// @return The command name.
+    ///
+    bsoncxx::stdx::string_view command_name() const;
+
+    ///
+    /// Returns the duration of the failed operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the request id.
+    ///
+    /// @return The request id.
+    ///
+    std::int64_t request_id() const;
+
+    ///
+    /// Returns the operation id.
+    ///
+    /// @return The operation id.
+    ///
+    std::int64_t operation_id() const;
+
+    ///
+    /// Optionally returns the service id.
+    ///
+    /// @return No contained value, or contains the service id if load balancing is enabled.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::oid> service_id() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _failed_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp
new file mode 100644
index 0000000..ebae4a9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_started_event.hpp
@@ -0,0 +1,109 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver begins executing a MongoDB command.
+///
+/// @see "CommandStartedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst
+///
+class MONGOCXX_API command_started_event {
+   public:
+    MONGOCXX_PRIVATE explicit command_started_event(const void* event);
+
+    ///
+    /// Destroys a command_started_event.
+    ///
+    ~command_started_event();
+
+    ///
+    /// Returns the command that has been started.
+    ///
+    /// @return The command.
+    ///
+    bsoncxx::document::view command() const;
+
+    ///
+    /// Returns the name of the database.
+    ///
+    /// @return The database name.
+    ///
+    bsoncxx::stdx::string_view database_name() const;
+
+    ///
+    /// Returns the name of the command.
+    ///
+    /// @return The command name.
+    ///
+    bsoncxx::stdx::string_view command_name() const;
+
+    ///
+    /// Returns the request id.
+    ///
+    /// @return The request id.
+    ///
+    std::int64_t request_id() const;
+
+    ///
+    /// Returns the operation id.
+    ///
+    /// @return The operation id.
+    ///
+    std::int64_t operation_id() const;
+
+    ///
+    /// Optionally returns the service id.
+    ///
+    /// @return No contained value, or contains the service id if load balancing is enabled.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::oid> service_id() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _started_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp
new file mode 100644
index 0000000..f3afd97
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/command_succeeded_event.hpp
@@ -0,0 +1,109 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver successfully executes a MongoDB command.
+///
+/// @see "CommandSucceededEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/command-monitoring/command-monitoring.rst
+///
+class MONGOCXX_API command_succeeded_event {
+   public:
+    MONGOCXX_PRIVATE explicit command_succeeded_event(const void* event);
+
+    ///
+    /// Destroys a command_succeeded_event.
+    ///
+    ~command_succeeded_event();
+
+    ///
+    /// Returns the server reply for the succeeded operation.
+    ///
+    /// @return The reply.
+    ///
+    bsoncxx::document::view reply() const;
+
+    ///
+    /// Returns the name of the command.
+    ///
+    /// @return The command name.
+    ///
+    bsoncxx::stdx::string_view command_name() const;
+
+    ///
+    /// Returns the duration of the successful operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the request id.
+    ///
+    /// @return The request id.
+    ///
+    std::int64_t request_id() const;
+
+    ///
+    /// Returns the operation id.
+    ///
+    /// @return The operation id.
+    ///
+    std::int64_t operation_id() const;
+
+    ///
+    /// Optionally returns the service id.
+    ///
+    /// @return No contained value, or contains the service id if load balancing is enabled.
+    ///
+    bsoncxx::stdx::optional<bsoncxx::oid> service_id() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _succeeded_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp
new file mode 100644
index 0000000..08cbe38
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_failed_event.hpp
@@ -0,0 +1,85 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver failed to send an "hello" command to check the
+/// status of a server.
+///
+/// @see "ServerHeartbeatFailedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API heartbeat_failed_event {
+   public:
+    MONGOCXX_PRIVATE explicit heartbeat_failed_event(const void* event);
+
+    ///
+    /// Destroys a heartbeat_failed_event.
+    ///
+    ~heartbeat_failed_event();
+
+    ///
+    /// Returns the failed operation's error message.
+    ///
+    /// @return The message.
+    ///
+    std::string message() const;
+
+    ///
+    /// Returns the duration of the failed operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// Returns a boolean indicating whether this heartbeat event is from an awaitable hello.
+    ///
+    /// @return A boolean.
+    ///
+    bool awaited() const;
+
+   private:
+    const void* _failed_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp
new file mode 100644
index 0000000..e18c109
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_started_event.hpp
@@ -0,0 +1,71 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver begins executing a "hello" command to check the
+/// status of a server.
+///
+/// @see "ServerHeartbeatStartedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API heartbeat_started_event {
+   public:
+    MONGOCXX_PRIVATE explicit heartbeat_started_event(const void* event);
+
+    ///
+    /// Destroys a heartbeat_started_event.
+    ///
+    ~heartbeat_started_event();
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// Returns a boolean indicating whether this heartbeat event is from an awaitable hello.
+    ///
+    /// @return A boolean.
+    ///
+    bool awaited() const;
+
+   private:
+    const void* _started_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp
new file mode 100644
index 0000000..936aff8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/heartbeat_succeeded_event.hpp
@@ -0,0 +1,86 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver completes a "hello" command to check the status
+/// of a server.
+///
+/// @see "ServerHeartbeatSucceededEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API heartbeat_succeeded_event {
+   public:
+    MONGOCXX_PRIVATE explicit heartbeat_succeeded_event(const void* event);
+
+    ///
+    /// Destroys a heartbeat_succeeded_event.
+    ///
+    ~heartbeat_succeeded_event();
+
+    ///
+    /// Returns the server reply for the succeeded operation.
+    ///
+    /// @return The reply.
+    ///
+    bsoncxx::document::view reply() const;
+
+    ///
+    /// Returns the duration of the successful operation.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t duration() const;
+
+    ///
+    /// Returns the host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// Returns a boolean indicating whether this heartbeat event is from an awaitable hello.
+    ///
+    /// @return A boolean.
+    ///
+    bool awaited() const;
+
+   private:
+    const void* _succeeded_event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp
new file mode 100644
index 0000000..ad7babe
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_changed_event.hpp
@@ -0,0 +1,87 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/events/server_description.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver observes a change in the status of a server it is
+/// connected to.
+///
+/// @see "ServerDescriptionChangedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API server_changed_event {
+   public:
+    MONGOCXX_PRIVATE explicit server_changed_event(const void* event);
+
+    ///
+    /// Destroys a server_changed_event.
+    ///
+    ~server_changed_event();
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    const bsoncxx::oid topology_id() const;
+
+    ///
+    /// The server's description before it changed.
+    ///
+    /// @return The server_description.
+    ///
+    const server_description previous_description() const;
+
+    ///
+    /// The server's description after it changed.
+    ///
+    /// @return The server_description.
+    ///
+    const server_description new_description() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp
new file mode 100644
index 0000000..a046083
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_closed_event.hpp
@@ -0,0 +1,72 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver stops monitoring a MongoDB server and removes it
+/// from the topology description.
+///
+/// @see "ServerClosedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API server_closed_event {
+   public:
+    MONGOCXX_PRIVATE explicit server_closed_event(const void* event);
+
+    ///
+    /// Destroys a server_closed_event.
+    ///
+    ~server_closed_event();
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    const bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp
new file mode 100644
index 0000000..53d3a0e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_description.hpp
@@ -0,0 +1,98 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// Class representing what the driver knows about a MongoDB server.
+///
+class MONGOCXX_API server_description {
+   public:
+    MONGOCXX_PRIVATE explicit server_description(const void* event);
+
+    ///
+    /// Destroys a server_description.
+    ///
+    ~server_description();
+
+    ///
+    /// An opaque id, unique to this server for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    std::uint32_t id() const;
+
+    ///
+    /// The duration of the last hello call, indicating network latency.
+    ///
+    /// @return The duration in microseconds.
+    ///
+    std::int64_t round_trip_time() const;
+
+    ///
+    /// The server type: "Unknown", "Standalone", "Mongos", "PossiblePrimary", "RSPrimary",
+    /// "RSSecondary", "RSArbiter", "RSOther", or "RSGhost".
+    ///
+    /// @return The type as a short-lived string view.
+    ///
+    bsoncxx::stdx::string_view type() const;
+
+    ///
+    /// @return The response as a short-lived document view.
+    ///
+    /// @deprecated use hello instead.
+    ///
+    MONGOCXX_DEPRECATED bsoncxx::document::view is_master() const;
+
+    ///
+    /// The server's last response to the "hello" command, or an empty document if the driver
+    /// has not yet reached the server or there was an error.
+    ///
+    /// @return The response as a short-lived document view.
+    ///
+    bsoncxx::document::view hello() const;
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+   private:
+    const void* _sd;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp
new file mode 100644
index 0000000..aa73fce
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/server_opening_event.hpp
@@ -0,0 +1,71 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver adds a MongoDB server to the topology description
+/// and begins monitoring it.
+///
+/// @see "ServerOpeningEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API server_opening_event {
+   public:
+    MONGOCXX_PRIVATE explicit server_opening_event(const void* event);
+
+    ///
+    /// Destroys a server_opening_event.
+    ///
+    ~server_opening_event();
+
+    ///
+    /// Returns the server host name.
+    ///
+    /// @return The host name.
+    ///
+    bsoncxx::stdx::string_view host() const;
+
+    ///
+    /// Returns the server port.
+    ///
+    /// @return The port.
+    ///
+    std::uint16_t port() const;
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    const bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp
new file mode 100644
index 0000000..4b3b188
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_changed_event.hpp
@@ -0,0 +1,72 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <mongocxx/events/topology_description.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver observes a change in any of the servers it is
+/// connected to or a change in the overall server topology.
+///
+/// @see "TopologyDescriptionChangedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API topology_changed_event {
+   public:
+    MONGOCXX_PRIVATE explicit topology_changed_event(const void* event);
+
+    ///
+    /// Destroys a topology_changed_event.
+    ///
+    ~topology_changed_event();
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    bsoncxx::oid topology_id() const;
+
+    ///
+    /// The server's description before it changed.
+    ///
+    /// @return The topology_description.
+    ///
+    topology_description previous_description() const;
+
+    ///
+    /// The server's description after it changed.
+    ///
+    /// @return The topology_description.
+    ///
+    topology_description new_description() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp
new file mode 100644
index 0000000..d34b15f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_closed_event.hpp
@@ -0,0 +1,57 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver stops monitoring a server topology and destroys its
+/// description.
+///
+/// @see "TopologyClosedEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API topology_closed_event {
+   public:
+    MONGOCXX_PRIVATE explicit topology_closed_event(const void* event);
+
+    ///
+    /// Destroys a topology_closed_event.
+    ///
+    ~topology_closed_event();
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp
new file mode 100644
index 0000000..bbde379
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_description.hpp
@@ -0,0 +1,165 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <vector>
+
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/events/server_description.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+using mongocxx::read_preference;
+
+///
+/// Class representing what the driver knows about a topology of MongoDB servers: either a
+/// standalone, a replica set, or a sharded cluster.
+///
+class MONGOCXX_API topology_description {
+   public:
+    ///
+    /// An array of server_description instances.
+    ///
+    class MONGOCXX_API server_descriptions {
+       private:
+        using container = std::vector<server_description>;
+
+       public:
+        ///
+        /// Move constructs a server_descriptions array.
+        ///
+        server_descriptions(server_descriptions&&) noexcept;
+
+        ///
+        /// Move assigns a server_descriptions array.
+        ///
+        server_descriptions& operator=(server_descriptions&&) noexcept;
+
+        server_descriptions(const server_descriptions&) = delete;
+        server_descriptions& operator=(const server_descriptions&) = delete;
+
+        ///
+        /// Destroys a server_descriptions array.
+        ///
+        ~server_descriptions();
+
+        ///
+        /// The array's iterator type.
+        ///
+        using iterator = container::iterator;
+
+        ///
+        /// The array's const iterator type.
+        ///
+        using const_iterator = container::const_iterator;
+
+        ///
+        /// @{
+        ///
+        /// Returns an iterator to the beginning.
+        ///
+        iterator begin() noexcept;
+        const_iterator begin() const noexcept;
+
+        ///
+        /// @}
+        ///
+
+        ///
+        /// @{
+        ///
+        /// Returns an iterator to the end.
+        ///
+        iterator end() noexcept;
+        const_iterator end() const noexcept;
+
+        ///
+        /// @}
+        ///
+
+        ///
+        /// The number of server_description instances in the array.
+        ///
+        std::size_t size() const noexcept;
+
+       private:
+        friend topology_description;
+        MONGOCXX_PRIVATE explicit server_descriptions(void* sds, std::size_t size);
+        MONGOCXX_PRIVATE void swap(server_descriptions& other) noexcept;
+        container _container;
+        void* _sds;
+        std::size_t _size;
+    };
+
+    MONGOCXX_PRIVATE explicit topology_description(void* event);
+
+    ///
+    /// Destroys a topology_description.
+    ///
+    ~topology_description();
+
+    ///
+    /// The topology type: "Unknown", "Sharded", "ReplicaSetNoPrimary", "ReplicaSetWithPrimary", or
+    /// "Single".
+    ///
+    /// @return The type as a short-lived string view.
+    ///
+    bsoncxx::stdx::string_view type() const;
+
+    ///
+    /// Determines if the topology has a readable server available. Servers are
+    /// filtered by the given read preferences only if the driver is connected
+    /// to a replica set, otherwise the read preferences are ignored. This
+    /// function uses the driver's current knowledge of the state of the
+    /// MongoDB server or servers it is connected to; it does no I/O.
+    ///
+    /// @return Whether there is a readable server available.
+    ///
+    bool has_readable_server(const mongocxx::read_preference& pref) const;
+
+    ///
+    /// Determines if the topology has a writable server available, such as a
+    /// primary, mongos, or standalone. This function uses the driver's current
+    /// knowledge of the state of the MongoDB server or servers it is connected
+    /// to; it does no I/O.
+    ///
+    /// @return Whether there is a writable server available.
+    ///
+    bool has_writable_server() const;
+
+    ///
+    /// Fetches descriptions for all known servers in the topology.
+    ///
+    /// @return An array of server_description objects.
+    ///
+    server_descriptions servers() const;
+
+   private:
+    // Non-const since mongoc_topology_description_has_readable_server/writable_server take
+    // non-const. They do server selection, which modifies the mongoc_topology_description_t.
+    void* _td;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp
new file mode 100644
index 0000000..47e3dda
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/events/topology_opening_event.hpp
@@ -0,0 +1,57 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/oid.hpp>
+#include <mongocxx/events/topology_description.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace events {
+
+///
+/// An event notification sent when the driver initializes a server topology.
+///
+/// @see "TopologyOpeningEvent" in
+/// https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring-monitoring.rst
+///
+class MONGOCXX_API topology_opening_event {
+   public:
+    MONGOCXX_PRIVATE explicit topology_opening_event(const void* event);
+
+    ///
+    /// Destroys a topology_opening_event.
+    ///
+    ~topology_opening_event();
+
+    ///
+    /// An opaque id, unique to this topology for this mongocxx::client or mongocxx::pool.
+    ///
+    /// @return The id.
+    ///
+    bsoncxx::oid topology_id() const;
+
+   private:
+    const void* _event;
+};
+
+}  // namespace events
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp
new file mode 100644
index 0000000..fdc33fa
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/authentication_exception.hpp
@@ -0,0 +1,38 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during authentication.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API authentication_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp
new file mode 100644
index 0000000..ddd71af
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.hpp
@@ -0,0 +1,38 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during a bulk write operation.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API bulk_write_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp
new file mode 100644
index 0000000..24082c4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/error_code.hpp
@@ -0,0 +1,126 @@
+// Copyright 2015-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <system_error>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the various error types that can occur during driver usage.
+///
+enum class error_code : std::int32_t {
+    /// More than one mongocxx::instance has been created.
+    k_cannot_recreate_instance = 1,
+
+    /// A default-constructed or moved-from mongocxx::client object has been used.
+    k_invalid_client_object,
+
+    /// A default-constructed or moved-from mongocxx::collection object has been used.
+    k_invalid_collection_object,
+
+    /// A default-constructed or moved-from mongocxx::database object has been used.
+    k_invalid_database_object,
+
+    /// An invalid or out-of-bounds parameter was provided.
+    k_invalid_parameter,
+
+    /// An SSL operation was used without SSL support being built.
+    k_ssl_not_supported,
+
+    /// An unknown read concern level was set.
+    k_unknown_read_concern,
+
+    /// An unknown write concern level was set.
+    k_unknown_write_concern,
+
+    /// The server returned a malformed response.
+    k_server_response_malformed,
+
+    /// An invalid MongoDB URI was provided.
+    k_invalid_uri,
+
+    /// A default-constructed or moved-from mongocxx::gridfs::bucket object has been used.
+    k_invalid_gridfs_bucket_object,
+
+    /// A default-constructed or moved-from mongocxx::gridfs::uploader object has been used.
+    k_invalid_gridfs_uploader_object,
+
+    /// A default-constructed or moved-from mongocxx::gridfs::downloader object has been used.
+    k_invalid_gridfs_downloader_object,
+
+    /// A mongocxx::gridfs::uploader object was not open for writing, or a
+    /// mongocxx::gridfs::downloader object was not open for reading.
+    k_gridfs_stream_not_open,
+
+    /// A mongocxx::gridfs::uploader object has exceeded the maximum number of allowable GridFS
+    /// chunks when attempting to upload the requested file.
+    k_gridfs_upload_requires_too_many_chunks,
+
+    /// The requested GridFS file was not found.
+    k_gridfs_file_not_found,
+
+    /// A GridFS file being operated on was discovered to be corrupted.
+    k_gridfs_file_corrupted,
+
+    /// The mongocxx::instance has been destroyed.
+    k_instance_destroyed,
+
+    /// mongocxx::client.create_session failed to create a mongocxx::client_session.
+    k_cannot_create_session,
+
+    /// A failure attempting to pass a mongocxx::client_session to a method.
+    k_invalid_session,
+
+    /// A moved-from mongocxx::options::transaction object has been used.
+    k_invalid_transaction_options_object,
+
+    // A resource (server API handle, etc.) could not be created:
+    k_create_resource_fail,
+
+    // Add new constant string message to error_code.cpp as well!
+};
+
+///
+/// Get the error_category for mongocxx library exceptions.
+///
+/// @return The mongocxx error_category
+///
+MONGOCXX_API const std::error_category& MONGOCXX_CALL error_category();
+
+///
+/// Translate a mongocxx::error_code into a std::error_code.
+///
+/// @param error A mongocxx::error_code
+///
+/// @return A std::error_code
+///
+MONGOCXX_INLINE std::error_code make_error_code(error_code error) {
+    return {static_cast<int>(error), error_category()};
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
+
+namespace std {
+// Specialize is_error_code_enum so we get simpler std::error_code construction
+template <>
+struct is_error_code_enum<mongocxx::error_code> : public true_type {};
+}  // namespace std
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp
new file mode 100644
index 0000000..fbb30da
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/exception.hpp
@@ -0,0 +1,35 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <system_error>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// A class to be used as the base class for all mongocxx exceptions.
+///
+class MONGOCXX_API exception : public std::system_error {
+    using system_error::system_error;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp
new file mode 100644
index 0000000..01eea3a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/gridfs_exception.hpp
@@ -0,0 +1,38 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an error encountered when attempting to perform the requested GridFS
+/// operation.
+///
+/// @see mongocxx::exception
+///
+class MONGOCXX_API gridfs_exception : public exception {
+   public:
+    using exception::exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp
new file mode 100644
index 0000000..7401041
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/logic_error.hpp
@@ -0,0 +1,37 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception caused by using the mongocxx API improperly.
+///
+/// @see mongocxx::exception
+///
+class MONGOCXX_API logic_error : public exception {
+   public:
+    using exception::exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp
new file mode 100644
index 0000000..ef83ee8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/operation_exception.hpp
@@ -0,0 +1,81 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/exception/exception.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception received from a MongoDB server.  It includes the server-provided
+/// error code, if one was available.
+///
+/// @see mongocxx::exception
+///
+class MONGOCXX_API operation_exception : public exception {
+   public:
+    using exception::exception;
+
+    ///
+    /// Constructs a new operation exception.
+    ///
+    /// @param ec
+    ///   The error code associated with this exception.
+    /// @param raw_server_error
+    ///   The optional raw bson error document to be associated with this exception.
+    /// @param what_arg
+    ///   An optional message to be returned by `what`.
+    ///
+    operation_exception(std::error_code ec,
+                        bsoncxx::document::value&& raw_server_error,
+                        std::string what_arg = "");
+
+    ///
+    /// @{
+    ///
+    /// The optional raw bson error document from the server.
+    ///
+    /// @returns The raw server error, if it is available.
+    ///
+    const stdx::optional<bsoncxx::document::value>& raw_server_error() const;
+    stdx::optional<bsoncxx::document::value>& raw_server_error();
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Checks for the specified label in a operation exception.
+    ///
+    /// @param label
+    ///   A string of the label to search for
+    ///
+    /// @returns True if the label is found in the operation exception, and false otherwise.
+    ///
+    bool has_error_label(stdx::string_view label) const;
+
+   private:
+    stdx::optional<bsoncxx::document::value> _raw_server_error;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp
new file mode 100644
index 0000000..cababb8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/query_exception.hpp
@@ -0,0 +1,37 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during a query operation.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API query_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp
new file mode 100644
index 0000000..5a0082b
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/server_error_code.hpp
@@ -0,0 +1,59 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <system_error>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the various errors types that can be returned from the server. As this list
+/// changes over time, this is just a placeholder for an Int32 error code value from the server.
+///
+enum class server_error_code : std::int32_t {
+    // Intentionally empty at this time!
+};
+
+///
+/// Get the error_category for mongocxx library exceptions.
+///
+/// @return The mongocxx error_category
+///
+MONGOCXX_API const std::error_category& MONGOCXX_CALL server_error_category();
+
+///
+/// Translate a mongocxx::server_error_code into a std::error_code.
+///
+/// @param error A mongocxx::error_code
+///
+/// @return A std::error_code
+///
+MONGOCXX_INLINE std::error_code make_error_code(server_error_code error) {
+    return {static_cast<int>(error), server_error_category()};
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
+
+namespace std {
+// Specialize is_error_code_enum so we get simpler std::error_code construction
+template <>
+struct is_error_code_enum<mongocxx::server_error_code> : public true_type {};
+}  // namespace std
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp
new file mode 100644
index 0000000..cf90071
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/exception/write_exception.hpp
@@ -0,0 +1,37 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/exception/operation_exception.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an exception during a write operation.
+///
+/// @see mongocxx::operation_exception
+///
+class MONGOCXX_API write_exception : public operation_exception {
+   public:
+    using operation_exception::operation_exception;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp
new file mode 100644
index 0000000..bd30f30
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/bucket.hpp
@@ -0,0 +1,681 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <istream>
+#include <memory>
+#include <ostream>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/gridfs/downloader.hpp>
+#include <mongocxx/gridfs/uploader.hpp>
+#include <mongocxx/options/find.hpp>
+#include <mongocxx/options/gridfs/bucket.hpp>
+#include <mongocxx/options/gridfs/upload.hpp>
+#include <mongocxx/result/gridfs/upload.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class database;
+
+namespace gridfs {
+
+///
+/// Class representing a GridFS bucket.
+///
+/// A GridFS bucket is used to store files that may be too large to store in a single document due
+/// to the 16 MB limit. The bucket comprises of two collections, `<bucketname>.files` and
+/// `<bucketname>.chunks.` A file written to a GridFS bucket will be serialized into zero or more
+/// chunk documents stored in the `<bucketname>.chunks` collection, and one document will be stored
+/// in the `<bucketname>.files` collection containing the information about the file. Users should
+/// not modify these collections directly.
+///
+/// Example of how obtain the default GridFS bucket for a given database:
+/// @code
+///   mongocxx::client mongo_client{mongocxx::uri{}};
+///   auto gridfs_bucket = mongo_client["database"].gridfs_bucket();
+/// @endcode
+///
+/// See also the method documentation for `mongocxx::database::gridfs_bucket()`.
+///
+/// @see http://www.mongodb.org/display/DOCS/GridFS
+///
+class MONGOCXX_API bucket {
+   public:
+    ///
+    /// Default constructs a bucket object. The bucket is equivalent to the state of a moved from
+    /// bucket. The only valid actions to take with a default constructed bucket are to assign to
+    /// it, or destroy it.
+    ///
+    bucket() noexcept;
+
+    ///
+    /// Move constructs a bucket.
+    ///
+    bucket(bucket&&) noexcept;
+
+    ///
+    /// Move assigns a bucket.
+    ///
+    bucket& operator=(bucket&&) noexcept;
+
+    ///
+    /// Copy constructs a bucket.
+    ///
+    bucket(const bucket&);
+
+    ///
+    /// Copy assigns a bucket.
+    ///
+    bucket& operator=(const bucket&);
+
+    ///
+    /// Destroys a bucket.
+    ///
+    ~bucket();
+
+    ///
+    /// Returns true if the bucket is valid, meaning it was not default constructed or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// @{
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file. The id of the file will be
+    /// automatically generated as an ObjectId.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   A stream for writing to the GridFS file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream(stdx::string_view filename,
+                                const options::gridfs::upload& options = {});
+
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file. The id of the file will be
+    /// automatically generated as an ObjectId.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload. The client session must
+    ///   remain valid for the lifetime of the uploader.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   A stream for writing to the GridFS file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream(const client_session& session,
+                                stdx::string_view filename,
+                                const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file.
+    ///
+    /// @param id
+    ///   The unique id of the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The gridfs::uploader to which the GridFS file should be written.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream_with_id(bsoncxx::types::bson_value::view id,
+                                        stdx::string_view filename,
+                                        const options::gridfs::upload& options = {});
+
+    ///
+    /// Opens a gridfs::uploader to create a new GridFS file.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload. The client session must
+    ///   remain valid for the lifetime of the uploader.
+    ///
+    /// @param id
+    ///   The unique id of the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The gridfs::uploader to which the GridFS file should be written.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    uploader open_upload_stream_with_id(const client_session& session,
+                                        bsoncxx::types::bson_value::view id,
+                                        stdx::string_view filename,
+                                        const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates a new GridFS file by uploading bytes from an input stream. The id of the file will
+    /// be automatically generated as an ObjectId.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The id of the uploaded file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    result::gridfs::upload upload_from_stream(stdx::string_view filename,
+                                              std::istream* source,
+                                              const options::gridfs::upload& options = {});
+
+    ///
+    /// Creates a new GridFS file by uploading bytes from an input stream. The id of the file will
+    /// be automatically generated as an ObjectId.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @return
+    ///   The id of the uploaded file.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    result::gridfs::upload upload_from_stream(const client_session& session,
+                                              stdx::string_view filename,
+                                              std::istream* source,
+                                              const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates a new GridFS file with a user-supplied unique id by uploading bytes from an input
+    /// stream.
+    ///
+    /// @param id
+    ///   A unique id for the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    void upload_from_stream_with_id(bsoncxx::types::bson_value::view id,
+                                    stdx::string_view filename,
+                                    std::istream* source,
+                                    const options::gridfs::upload& options = {});
+
+    ///
+    /// Creates a new GridFS file with a user-supplied unique id by uploading bytes from an input
+    /// stream.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the upload.
+    ///
+    /// @param id
+    ///   A unique id for the file being uploaded.
+    ///
+    /// @param filename
+    ///   The name of the file to be uploaded. A bucket can contain multiple files with the same
+    ///   name.
+    ///
+    /// @param source
+    ///    The non-null stream from which the GridFS file should be read. The exception mask on
+    ///    `source` will be cleared of `eofbit` and set for `failbit` and `badbit`.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::gridfs::upload.
+    ///
+    /// @note
+    ///   If this GridFS bucket does not already exist in the database, it will be implicitly
+    ///   created and initialized with GridFS indexes.
+    ///
+    /// @throws mongocxx::logic_error if `options` are invalid.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if reading from `source` fails. Any exception thrown during the execution of
+    ///   `source::read()` will be re-thrown.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    /// @throws mongocxx::operation_exception if an error occurs when building GridFS indexes.
+    ///
+    void upload_from_stream_with_id(const client_session& session,
+                                    bsoncxx::types::bson_value::view id,
+                                    stdx::string_view filename,
+                                    std::istream* source,
+                                    const options::gridfs::upload& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Opens a gridfs::downloader to read a GridFS file.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @return
+    ///   The gridfs::downloader from which the GridFS file should be read.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    downloader open_download_stream(bsoncxx::types::bson_value::view id);
+
+    ///
+    /// Opens a gridfs::downloader to read a GridFS file.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the download. The client session must
+    ///   remain valid for the lifetime of the downloader.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @return
+    ///   The gridfs::downloader from which the GridFS file should be read.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files collection for this bucket.
+    ///
+    downloader open_download_stream(const client_session& session,
+                                    bsoncxx::types::bson_value::view id);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Downloads the contents of a stored GridFS file from the bucket and writes it to a stream.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @param destination
+    ///   The non-null stream to which the GridFS file should be written.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files or chunks collections for this bucket.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if writing to `destination` fails.  In addition, if `destination::exceptions()` is set for
+    ///   `badbit`, any exception thrown during execution of `destination::write()` will be
+    ///   re-thrown.
+    ///
+    void download_to_stream(bsoncxx::types::bson_value::view id, std::ostream* destination);
+    void download_to_stream(bsoncxx::types::bson_value::view id,
+                            std::ostream* destination,
+                            std::size_t start,
+                            std::size_t end);
+
+    ///
+    /// Downloads the contents of a stored GridFS file from the bucket and writes it to a stream.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the download.
+    ///
+    /// @param id
+    ///   The id of the file to read.
+    ///
+    /// @param destination
+    ///   The non-null stream to which the GridFS file should be written.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the requested file does not exist, or if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading from the files or chunks collections for this bucket.
+    ///
+    /// @throws std::ios_base::failure
+    ///   if writing to `destination` fails.  In addition, if `destination::exceptions()` is set for
+    ///   `badbit`, any exception thrown during execution of `destination::write()` will be
+    ///   re-thrown.
+    ///
+    void download_to_stream(const client_session& session,
+                            bsoncxx::types::bson_value::view id,
+                            std::ostream* destination);
+    void download_to_stream(const client_session& session,
+                            bsoncxx::types::bson_value::view id,
+                            std::ostream* destination,
+                            std::size_t start,
+                            std::size_t end);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Deletes a GridFS file from the bucket.
+    ///
+    /// @param id
+    ///   The id of the file to be deleted.
+    ///
+    /// @throws mongocxx::gridfs_exception if the requested file does not exist.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when removing file data or chunk data from the database.
+    ///
+    void delete_file(bsoncxx::types::bson_value::view id);
+
+    ///
+    /// Deletes a GridFS file from the bucket.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the delete.
+    ///
+    /// @param id
+    ///   The id of the file to be deleted.
+    ///
+    /// @throws mongocxx::gridfs_exception if the requested file does not exist.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when removing file data or chunk data from the database.
+    ///
+    void delete_file(const client_session& session, bsoncxx::types::bson_value::view id);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Finds the documents in the files collection of the bucket which match the provided filter.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::find.
+    ///
+    /// @return
+    ///   A mongocxx::cursor with the results. If the query fails, the cursor throws
+    ///   mongocxx::query_exception when the returned cursor is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see mongocxx::collection::find.
+    ///
+    cursor find(bsoncxx::document::view_or_value filter, const options::find& options = {});
+
+    ///
+    /// Finds the documents in the files collection of the bucket which match the provided filter.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the query. The client session must
+    ///   remain valid for the lifetime of the cursor.
+    ///
+    /// @param filter
+    ///   Document view representing a document that should match the query.
+    ///
+    /// @param options
+    ///   Optional arguments; see options::find.
+    ///
+    /// @return
+    ///   A mongocxx::cursor with the results. If the query fails, the cursor throws
+    ///   mongocxx::query_exception when the returned cursor is iterated.
+    ///
+    /// @throws mongocxx::logic_error if the options are invalid, or if the unsupported option
+    /// modifiers "$query" or "$explain" are used.
+    ///
+    /// @see mongocxx::collection::find.
+    ///
+    cursor find(const client_session& session,
+                bsoncxx::document::view_or_value filter,
+                const options::find& options = {});
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Gets the name of the GridFS bucket.
+    ///
+    /// @return
+    ///   The name of the GridFS bucket.
+    ///
+    stdx::string_view bucket_name() const;
+
+   private:
+    friend class mongocxx::database;
+
+    // Constructs a new GridFS bucket.  Throws if options are invalid.
+    MONGOCXX_PRIVATE bucket(const database& db, const options::gridfs::bucket& options);
+
+    MONGOCXX_PRIVATE void create_indexes_if_nonexistent(const client_session* session);
+
+    MONGOCXX_PRIVATE uploader _open_upload_stream_with_id(const client_session* session,
+                                                          bsoncxx::types::bson_value::view id,
+                                                          stdx::string_view filename,
+                                                          const options::gridfs::upload& options);
+
+    MONGOCXX_PRIVATE void _upload_from_stream_with_id(const client_session* session,
+                                                      bsoncxx::types::bson_value::view id,
+                                                      stdx::string_view filename,
+                                                      std::istream* source,
+                                                      const options::gridfs::upload& options);
+
+    MONGOCXX_PRIVATE downloader _open_download_stream(const client_session* session,
+                                                      bsoncxx::types::bson_value::view id,
+                                                      stdx::optional<std::size_t> start,
+                                                      stdx::optional<std::size_t> end);
+
+    MONGOCXX_PRIVATE void _download_to_stream(const client_session* session,
+                                              bsoncxx::types::bson_value::view id,
+                                              std::ostream* destination,
+                                              stdx::optional<std::size_t> start,
+                                              stdx::optional<std::size_t> end);
+
+    MONGOCXX_PRIVATE void _delete_file(const client_session* session,
+                                       bsoncxx::types::bson_value::view id);
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace gridfs
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp
new file mode 100644
index 0000000..1d49692
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/downloader.hpp
@@ -0,0 +1,169 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace gridfs {
+
+struct chunks_and_bytes_offset {
+    std::int32_t chunks_offset = 0;
+    std::int32_t bytes_offset = 0;
+};
+
+///
+/// Class used to download a GridFS file.
+///
+class MONGOCXX_API downloader {
+   public:
+    ///
+    /// Default constructs a downloader object. The downloader is equivalent to the state of a moved
+    /// from downloader. The only valid actions to take with a default constructed downloader are to
+    /// assign to it, or destroy it.
+    ///
+    downloader() noexcept;
+
+    ///
+    /// Move constructs a downloader.
+    ///
+    downloader(downloader&&) noexcept;
+
+    ///
+    /// Move assigns a downloader.
+    ///
+    downloader& operator=(downloader&&) noexcept;
+
+    downloader(const downloader&) = delete;
+
+    downloader& operator=(const downloader&) = delete;
+
+    ///
+    /// Destroys a downloader.
+    ///
+    ~downloader();
+
+    ///
+    /// Returns true if the downloader is valid, meaning it was not default constructed or moved
+    /// from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// Reads a specified number of bytes from the GridFS file being downloaded.
+    ///
+    /// @param buffer
+    ///   A pointer to a buffer to store the bytes read from the file.
+    ///
+    /// @param length
+    ///   The number of bytes to read from the file.
+    ///
+    /// @return
+    ///   The number of bytes actually read. If zero, the downloader has reached the end of the
+    ///   file.
+    ///
+    /// @throws mongocxx::logic_error if the download stream was already closed.
+    ///
+    /// @throws mongocxx::gridfs_exception if the requested file has been corrupted.
+    ///
+    /// @throws mongocxx::query_exception
+    ///   if an error occurs when reading chunk data from the database for the requested file.
+    ///
+    std::size_t read(std::uint8_t* buffer, std::size_t length);
+
+    ///
+    /// Closes the downloader stream.
+    ///
+    /// @throws mongocxx::logic_error if the download stream was already closed.
+    ///
+    void close();
+
+    ///
+    /// Gets the chunk size of the file being downloaded.
+    ///
+    /// @return
+    ///   The chunk size in bytes.
+    ///
+    std::int32_t chunk_size() const;
+
+    ///
+    /// Gets the length of the file being downloaded.
+    ///
+    /// @return
+    ///   The length in bytes.
+    ///
+    std::int64_t file_length() const;
+
+    ///
+    /// Gets the files collection document of the file being downloaded.
+    ///
+    /// @return
+    ///    A view to the files collection document of the file being downloaded.
+    ///
+    bsoncxx::document::view files_document() const;
+
+   private:
+    friend class bucket;
+
+    //
+    // Constructs a new downloader stream.
+    //
+    // @param chunks
+    //   The cursor to read the chunks of the file from. It must have a value if the length of the
+    //   file is non-zero.
+    //
+    // @param start
+    //   The offset from which to start reading the chunks of the file.
+    //
+    // @param chunk_size
+    //   The expected size of a chunk in bytes.
+    //
+    // @param file_len
+    //   The expected size of the file in bytes.
+    //
+    // @param files_doc
+    //   The files collection document of the file being downloaded.
+    //
+    MONGOCXX_PRIVATE downloader(stdx::optional<cursor> chunks,
+                                chunks_and_bytes_offset start,
+                                std::int32_t chunk_size,
+                                std::int64_t file_len,
+                                bsoncxx::document::value files_doc);
+
+    MONGOCXX_PRIVATE void fetch_chunk();
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace gridfs
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp
new file mode 100644
index 0000000..1a1bce3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/gridfs/uploader.hpp
@@ -0,0 +1,170 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <bsoncxx/view_or_value.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/collection.hpp>
+#include <mongocxx/result/gridfs/upload.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace gridfs {
+
+///
+/// Class used to upload a GridFS file.
+///
+class MONGOCXX_API uploader {
+   public:
+    ///
+    /// Default constructs an uploader object. The uploader is equivalent to the state of a moved
+    /// from uploader. The only valid actions to take with a default constructed uploader are to
+    /// assign to it, or destroy it.
+    ///
+    uploader() noexcept;
+
+    ///
+    /// Move constructs an uploader.
+    ///
+    uploader(uploader&&) noexcept;
+
+    ///
+    /// Move assigns an uploader.
+    ///
+    uploader& operator=(uploader&&) noexcept;
+
+    uploader(const uploader&) = delete;
+
+    uploader& operator=(const uploader&) = delete;
+
+    ///
+    /// Destroys an uploader.
+    ///
+    ~uploader();
+
+    ///
+    /// Returns true if the uploader is valid, meaning it was not default constructed or moved from.
+    ///
+    explicit operator bool() const noexcept;
+
+    ///
+    /// Writes a specified number of bytes to a GridFS file.
+    ///
+    /// @param bytes
+    ///   A pointer to the bytes to write.
+    ///
+    /// @param length
+    ///   The number of bytes to write.
+    ///
+    /// @throws mongocxx::logic_error if the upload stream was already closed.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data to the database.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    void write(const std::uint8_t* bytes, std::size_t length);
+
+    ///
+    /// Closes the uploader stream.
+    ///
+    /// @throws mongocxx::logic_error if the upload stream was already closed.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when writing chunk data or file metadata to the database.
+    ///
+    /// @throws mongocxx::gridfs_exception
+    ///   if the uploader requires more than 2^31-1 chunks to store the file at the requested chunk
+    ///   size.
+    ///
+    result::gridfs::upload close();
+
+    ///
+    /// Aborts uploading the file.
+    ///
+    /// @throws mongocxx::logic_error if the upload stream was already closed.
+    ///
+    /// @throws mongocxx::bulk_write_exception
+    ///   if an error occurs when removing chunk data from the database.
+    ///
+    void abort();
+
+    ///
+    /// Gets the chunk size of the file being uploaded.
+    ///
+    /// @return
+    ///   The chunk size in bytes.
+    ///
+    std::int32_t chunk_size() const;
+
+   private:
+    friend class bucket;
+
+    //
+    // Constructs a new uploader stream.
+    //
+    // @param session
+    //   The client session to use for upload operations.
+    //
+    // @param id
+    //   The id of the GridFS file being uploaded.
+    //
+    // @param files
+    //   The files collection of the bucket receiving the file.
+    //
+    // @param chunks
+    //   The chunks collection of the bucket receiving the file.
+    //
+    // @param chunk_size
+    //   The size in bytes of the chunks being uploaded.
+    //
+    // @param metadata
+    //   Optional metadata field of the files collection document.
+    //
+    MONGOCXX_PRIVATE uploader(const client_session* session,
+                              bsoncxx::types::bson_value::view id,
+                              stdx::string_view filename,
+                              collection files,
+                              collection chunks,
+                              std::int32_t chunk_size,
+                              stdx::optional<bsoncxx::document::view_or_value> metadata = {});
+
+    MONGOCXX_PRIVATE void finish_chunk();
+    MONGOCXX_PRIVATE void flush_chunks();
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace gridfs
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/hint.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/hint.hpp
new file mode 100644
index 0000000..81785e8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/hint.hpp
@@ -0,0 +1,147 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a hint to be passed to a database operation.
+///
+class MONGOCXX_API hint {
+   public:
+    ///
+    /// Constructs a new hint.
+    ///
+    /// Note: this constructor is purposefully not explicit, to allow conversion
+    /// from either document::view or document::value to view_or_value.
+    ///
+    /// @param index
+    ///   Document view or value representing the index to be used.
+    ///
+    hint(bsoncxx::document::view_or_value index);
+
+    ///
+    /// Constructs a new hint.
+    ///
+    /// @param index
+    ///   String representing the name of the index to be used.
+    ///
+    explicit hint(bsoncxx::string::view_or_value index);
+
+    ///
+    /// @{
+    ///
+    /// Compare this hint to a string for (in)-equality
+    ///
+    /// @relates hint
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const hint& index_hint, std::string index);
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const hint& index_hint,
+                                                      bsoncxx::document::view index);
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Returns a types::bson_value::view representing this hint.
+    ///
+    /// @return Hint, as a types::bson_value::view. The caller must ensure that the returned object
+    /// not outlive
+    /// the hint object that it was created from.
+    ///
+    bsoncxx::types::bson_value::view to_value() const;
+
+    ///
+    /// Returns a types::bson_value::view representing this hint.
+    ///
+    /// @return Hint, as a types::bson_value::view. The caller must ensure that the returned object
+    /// not outlive
+    /// the hint object that it was created from.
+    ///
+    MONGOCXX_INLINE operator bsoncxx::types::bson_value::view() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _index_doc;
+    stdx::optional<bsoncxx::string::view_or_value> _index_string;
+};
+
+///
+/// Convenience methods to compare for equality against an index name.
+///
+/// Return true if this hint contains an index name that matches.
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator==(std::string index, const hint& index_hint);
+
+///
+/// @{
+///
+/// Convenience methods to compare for inequality against an index name.
+///
+/// Return true if this hint contains an index name that matches.
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator!=(const hint& index_hint, std::string index);
+MONGOCXX_API bool MONGOCXX_CALL operator!=(std::string index, const hint& index_index);
+///
+/// @}
+///
+
+///
+/// Convenience methods to compare for equality against an index document.
+///
+/// Return true if this hint contains an index document that matches.
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator==(bsoncxx::document::view index, const hint& index_hint);
+
+///
+/// @{
+///
+/// Convenience methods to compare for equality against an index document.
+///
+/// Return true if this hint contains an index document that matches.
+///
+///
+/// @relates hint
+///
+MONGOCXX_API bool MONGOCXX_CALL operator!=(const hint& index_hint, bsoncxx::document::view index);
+MONGOCXX_API bool MONGOCXX_CALL operator!=(bsoncxx::document::view index, const hint& index_hint);
+///
+/// @}
+///
+
+MONGOCXX_INLINE hint::operator bsoncxx::types::bson_value::view() const {
+    return to_value();
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/index_model.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/index_model.hpp
new file mode 100644
index 0000000..59ba37a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/index_model.hpp
@@ -0,0 +1,79 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <mongocxx/options/index.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing an index on a MongoDB server.
+///
+class MONGOCXX_API index_model {
+   public:
+    ///
+    /// Initializes a new index_model over a mongocxx::collection.
+    ///
+    index_model(const bsoncxx::document::view_or_value& keys,
+                const bsoncxx::document::view_or_value& options = {});
+
+    index_model() = delete;
+
+    ///
+    /// Move constructs an index_model.
+    ///
+    index_model(index_model&&) noexcept;
+
+    ///
+    /// Move assigns an index_model.
+    ///
+    index_model& operator=(index_model&&) noexcept;
+
+    ///
+    /// Copy constructs an index_model.
+    ///
+    index_model(const index_model&);
+
+    index_model& operator=(const index_model&) = delete;
+
+    ///
+    /// Destroys an index_model.
+    ///
+    ~index_model();
+
+    ///
+    /// Retrieves keys of an index_model.
+    ///
+    bsoncxx::document::view keys() const;
+
+    ///
+    /// Retrieves options of an index_model.
+    ///
+    bsoncxx::document::view options() const;
+
+   private:
+    bsoncxx::document::value _keys;
+    bsoncxx::document::value _options;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
\ No newline at end of file
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/index_view.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/index_view.hpp
new file mode 100644
index 0000000..7756ed1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/index_view.hpp
@@ -0,0 +1,438 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/client_session.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/index_model.hpp>
+#include <mongocxx/options/index_view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a MongoDB index view.
+///
+class MONGOCXX_API index_view {
+   public:
+    index_view(index_view&&) noexcept;
+    index_view& operator=(index_view&&) noexcept;
+
+    ~index_view();
+
+    ///
+    /// @{
+    ///
+    /// Returns a cursor over all the indexes.
+    ///
+    cursor list();
+
+    ///
+    /// Returns a cursor over all the indexes.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the list operation.
+    ///
+    cursor list(const client_session& session);
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types.
+    /// @param index_options
+    ///    A document containing set of options that controls the creation of the index. See
+    ///    https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/
+    ///
+    stdx::optional<std::string> create_one(
+        const bsoncxx::document::view_or_value& keys,
+        const bsoncxx::document::view_or_value& index_options = {},
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types.
+    /// @param index_options
+    ///    A document containing set of options that controls the creation of the index. See
+    ///    https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/db.collection.createIndex/
+    ///
+    stdx::optional<std::string> create_one(
+        const client_session& session,
+        const bsoncxx::document::view_or_value& keys,
+        const bsoncxx::document::view_or_value& index_options = {},
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param index
+    ///    Index_model describing the index being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    stdx::optional<std::string> create_one(
+        const index_model& index, const options::index_view& options = options::index_view{});
+
+    ///
+    /// Creates an index. A convenience method that calls create_many.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param index
+    ///    Index_model describing the index being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    An optional containing the name of the created index. If and index with the same keys
+    ///    already exists, an empty optional is returned.
+    ///
+    /// @exception
+    ///    Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///    option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    stdx::optional<std::string> create_one(
+        const client_session& session,
+        const index_model& index,
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Adds a container of indexes to the collection.
+    ///
+    /// @param indexes
+    ///   std::vector containing index models describing the indexes being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    The result document sent back by the server as if the createIndexes command was run from
+    ///    the shell.
+    ///
+    /// @exception
+    ///     Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///     option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    bsoncxx::document::value create_many(
+        const std::vector<index_model>& indexes,
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// Adds a container of indexes to the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the operation.
+    /// @param indexes
+    ///   std::vector containing index models describing the indexes being created.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @return
+    ///    The result document sent back by the server as if the createIndexes command was run from
+    ///    the shell.
+    ///
+    /// @exception
+    ///     Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///     option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    bsoncxx::document::value create_many(
+        const client_session& session,
+        const std::vector<index_model>& indexes,
+        const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops a single index by name.
+    ///
+    /// @param name
+    ///    The name of the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(stdx::string_view name,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// Drops a single index by name.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param name
+    ///    The name of the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const client_session& session,
+                  stdx::string_view name,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Attempts to drop a single index from the collection given the keys and options.
+    ///
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types. If no name
+    ///    option is present in the options, a name based on the keys will be used.
+    /// @param index_options (optional)
+    ///    A document containing set of options used to create the index. Only the name field will
+    ///    be used from here, and if it is not included, a name based on they keys will be used.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const bsoncxx::document::view_or_value& keys,
+                  const bsoncxx::document::view_or_value& index_options = {},
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// Attempts to drop a single index from the collection given the keys and options.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param keys
+    ///    A document containing the index keys and their corresponding index types. If no name
+    ///    option is present in the options, a name based on the keys will be used.
+    /// @param index_options (optional)
+    ///    A document containing set of options used to create the index. Only the name field will
+    ///    be used from here, and if it is not included, a name based on they keys will be used.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const client_session& session,
+                  const bsoncxx::document::view_or_value& keys,
+                  const bsoncxx::document::view_or_value& index_options = {},
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Attempts to drop a single index from the collection given an index model.
+    ///
+    /// @param index
+    ///    An index model describing the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const index_model& index,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// Attempts to drop a single index from the collection given an index model.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param index
+    ///    An index model describing the index being dropped.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws bsoncxx::exception if "name" key is present in options but is not a string.
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    /// @exception
+    ///   Throws logic_error if "*" is passed in for the index name
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_one(const client_session& session,
+                  const index_model& index,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// @{
+    ///
+    /// Drops all indexes in the collection.
+    ///
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_all(const options::index_view& options = options::index_view{});
+
+    ///
+    /// Drops all indexes in the collection.
+    ///
+    /// @param session
+    ///   The mongocxx::client_session with which to perform the drop.
+    /// @param options
+    ///    Optional arguments for the overall operation, see mongocxx::options::index_view.
+    ///
+    /// @exception
+    ///   Throws operation_exception for any errors encountered by the server or if max_time_ms
+    ///   option is present and the operation exceeds the time limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/cursor.maxTimeMS/
+    ///
+    void drop_all(const client_session& session,
+                  const options::index_view& options = options::index_view{});
+
+    ///
+    /// @}
+    ///
+
+   private:
+    friend class collection;
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE index_view(void* coll, void* client);
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+
+   private:
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/instance.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/instance.hpp
new file mode 100644
index 0000000..fc2d012
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/instance.hpp
@@ -0,0 +1,134 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class logger;
+
+///
+/// Class representing an instance of the MongoDB driver.
+///
+/// The constructor and destructor initialize and shut down the driver, respectively. Therefore, an
+/// instance must be created before using the driver and must remain alive until all other mongocxx
+/// objects are destroyed. After the instance destructor runs, the driver may not be used.
+///
+/// Exactly one instance must be created in a given program. Not constructing an instance or
+/// constructing more than one instance in a program are errors, even if the multiple instances have
+/// non-overlapping lifetimes.
+///
+/// The following is a correct example of using an instance in a program, as the instance is kept
+/// alive for as long as the driver is in use:
+///
+/// \code
+///
+/// #include <mongocxx/client.hpp>
+/// #include <mongocxx/instance.hpp>
+/// #include <mongocxx/uri.hpp>
+///
+/// int main() {
+///     mongocxx::instance inst{};
+///     mongocxx::client conn{mongocxx::uri{}};
+///     ...
+/// }
+///
+/// \endcode
+///
+/// An example of using instance incorrectly might look as follows:
+///
+/// \code
+///
+/// #include <mongocxx/client.hpp>
+/// #include <mongocxx/instance.hpp>
+/// #include <mongocxx/uri.hpp>
+///
+/// client get_client() {
+///     mongocxx::instance inst{};
+///     mongocxx::client conn{mongocxx::uri{}};
+///
+///     return client;
+/// } // ERROR! The instance is no longer alive after this function returns.
+///
+/// int main() {
+///     mongocxx::client conn = get_client();
+///     ...
+/// }
+///
+/// \endcode
+///
+/// For examples of more advanced usage of instance, see
+/// `examples/mongocxx/instance_management.cpp`.
+///
+class MONGOCXX_API instance {
+   public:
+    ///
+    /// Creates an instance of the driver.
+    ///
+    instance();
+
+    ///
+    /// Creates an instance of the driver with a user provided log handler.
+    ///  @param logger The logger that the driver will direct log messages to.
+    ///
+    /// @throws mongocxx::logic_error if an instance already exists.
+    ///
+    instance(std::unique_ptr<logger> logger);
+
+    ///
+    /// Move constructs an instance of the driver.
+    ///
+    instance(instance&&) noexcept;
+
+    ///
+    /// Move assigns an instance of the driver.
+    ///
+    instance& operator=(instance&&) noexcept;
+
+    ///
+    /// Destroys an instance of the driver.
+    ///
+    ~instance();
+
+    ///
+    /// Returns the current unique instance of the driver. If an instance was explicitly created,
+    /// that will be returned. If no instance has yet been created, a default instance will be
+    /// constructed and returned. If a default instance is constructed, its destruction will be
+    /// sequenced according to the rules for the destruction of static local variables at program
+    /// exit (see http://en.cppreference.com/w/cpp/utility/program/exit).
+    ///
+    /// Note that, if you need to configure the instance in any way (e.g. with a logger), you cannot
+    /// use this method to cause the instance to be constructed. You must explicitly create an
+    /// properly configured instance object. You can, however, use this method to obtain that
+    /// configured instance object.
+    ///
+    /// @note This method is intended primarily for test authors, where managing the lifetime of the
+    /// instance w.r.t. the test framework can be problematic.
+    ///
+    static instance& current();
+
+   private:
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/logger.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/logger.hpp
new file mode 100644
index 0000000..22b8fa3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/logger.hpp
@@ -0,0 +1,81 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// The log level of a message passed to a mongocxx::logger.
+///
+enum class log_level {
+    k_error,
+    k_critical,
+    k_warning,
+    k_message,
+    k_info,
+    k_debug,
+    k_trace,
+};
+
+///
+/// Returns a stringification of the given log level.
+///
+/// @param level
+///   The type to stringify.
+///
+/// @return a std::string representation of the type.
+///
+MONGOCXX_API stdx::string_view MONGOCXX_CALL to_string(log_level level);
+
+///
+/// The interface that all user-defined loggers must implement.
+///
+class MONGOCXX_API logger {
+   public:
+    virtual ~logger();
+
+    ///
+    /// Handles a log message. User defined logger implementations may do whatever they wish when
+    /// this is called, such as log the output to a file or send it to a remote server for analysis.
+    ///
+    /// @param level
+    ///   The log level of the current log message
+    /// @param domain
+    ///   The domain of the current log message, such as 'client'
+    /// @param message
+    ///   The text of the current log message.
+    virtual void operator()(log_level level,
+                            stdx::string_view domain,
+                            stdx::string_view message) noexcept = 0;
+
+   protected:
+    ///
+    /// Default constructor
+    ///
+    logger();
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp
new file mode 100644
index 0000000..f02fbb1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/delete_many.hpp
@@ -0,0 +1,106 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB delete operation that removes multiple documents.
+///
+class MONGOCXX_API delete_many {
+   public:
+    ///
+    /// Constructs a delete operation that will delete all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for deletion.
+    ///
+    explicit delete_many(bsoncxx::document::view_or_value filter);
+
+    ///
+    /// Gets the filter for this delete operation.
+    ///
+    /// @return The filter to be used for the delete operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Sets the collation for this delete operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    delete_many& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this delete operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_many& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp
new file mode 100644
index 0000000..8147d33
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/delete_one.hpp
@@ -0,0 +1,103 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB delete operation that removes a single document.
+///
+class MONGOCXX_API delete_one {
+   public:
+    ///
+    /// Constructs a delete operation that will delete the first document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for deletion.
+    ///
+    delete_one(bsoncxx::document::view_or_value filter);
+
+    ///
+    /// Gets the filter on this delete operation.
+    ///
+    /// @return The filter to be used for the delete operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Sets the collation for this delete operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    delete_one& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this delete operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_one& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp
new file mode 100644
index 0000000..3fd4aa3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/insert_one.hpp
@@ -0,0 +1,53 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB insert operation that creates a single document.
+///
+class MONGOCXX_API insert_one {
+   public:
+    ///
+    /// Constructs an insert operation that will create a single document.
+    ///
+    /// @param document
+    ///   The document to insert.
+    ///
+    insert_one(bsoncxx::document::view_or_value document);
+
+    ///
+    /// Gets the document to be inserted.
+    ///
+    /// @return The document to be inserted.
+    ///
+    const bsoncxx::document::view_or_value& document() const;
+
+   private:
+    bsoncxx::document::view_or_value _document;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp
new file mode 100644
index 0000000..da31042
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/replace_one.hpp
@@ -0,0 +1,137 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Class representing a MongoDB update operation that replaces a single document.
+///
+class MONGOCXX_API replace_one {
+   public:
+    ///
+    /// Constructs an update operation that will replace a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for replacement.
+    /// @param replacement
+    ///   Document that will serve as the replacement.
+    ///
+    replace_one(bsoncxx::document::view_or_value filter,
+                bsoncxx::document::view_or_value replacement);
+
+    ///
+    /// Gets the filter for replacement.
+    ///
+    /// @return The filter to be used for the replacement operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Gets the replacement document.
+    ///
+    /// @return The document that will replace the original selected document.
+    ///
+    const bsoncxx::document::view_or_value& replacement() const;
+
+    ///
+    /// Sets the collation for this replacement operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    replace_one& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this replacement operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// When upsert is @c true, this operation will insert the replacement document as a new
+    /// document if no existing documents match the filter. When upsert is @c false, the
+    /// replacement operation does nothing if there are no matching documents. By default,
+    /// upsert is @c false.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    replace_one& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace_one& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+    bsoncxx::document::view_or_value _replacement;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp
new file mode 100644
index 0000000..4d8dec2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/update_many.hpp
@@ -0,0 +1,202 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/pipeline.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace model {
+
+///
+/// Class representing a MongoDB update operation that modifies multiple documents.
+///
+class MONGOCXX_API update_many {
+    //
+    // Utility class supporting the convenience of {} meaning an empty bsoncxx::document.
+    //
+    // Users may not use this class directly.
+    //
+    // In places where driver methods take this class as a parameter, passing {} will
+    // translate to a default-constructed bsoncxx::document::view_or_value,
+    // regardless of other overloads taking other default-constructible types
+    // for that parameter. This class avoids compiler ambiguity with such overloads.
+    //
+    // See update_many() for an example of such overloads.
+    //
+    class _empty_doc_tag {
+        _empty_doc_tag() = default;
+    };
+
+   public:
+    ///
+    /// @{
+    ///
+    /// Constructs an update operation that will modify all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Document representing the modifications to be applied to matching documents.
+    ///
+    update_many(bsoncxx::document::view_or_value filter, bsoncxx::document::view_or_value update);
+
+    ///
+    /// Constructs an update operation that will modify all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Pipeline representing the modifications to be applied to matching documents.
+    ///
+    update_many(bsoncxx::document::view_or_value filter, const pipeline& update);
+
+    ///
+    /// Constructs an update operation that will modify all documents matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Supports the empty update {}.
+    ///
+    update_many(bsoncxx::document::view_or_value filter,
+                std::initializer_list<_empty_doc_tag> update);
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Gets the filter.
+    ///
+    /// @return The filter to be used for the update operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Gets the update document.
+    ///
+    /// @return The modifications to be applied as part of the update.
+    ///
+    const bsoncxx::document::view_or_value& update() const;
+
+    ///
+    /// Sets the collation for this update operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    update_many& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this update operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update_many& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// When upsert is @c false, update does nothing when no documents match the filter.
+    /// However, by specifying upsert as @c true, this operation either updates matching documents
+    /// or inserts a new document using the update specification if no matching document exists.
+    /// By default, upsert is unset by the driver, and the server-side default, @c false, is used.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    update_many& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Set array filters for this update operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    update_many& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+    bsoncxx::document::view_or_value _update;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp
new file mode 100644
index 0000000..684a252
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/update_one.hpp
@@ -0,0 +1,203 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/pipeline.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace model {
+
+///
+/// Class representing a MongoDB update operation that modifies a single document.
+///
+class MONGOCXX_API update_one {
+    //
+    // Utility class supporting the convenience of {} meaning an empty bsoncxx::document.
+    //
+    // Users may not use this class directly.
+    //
+    // In places where driver methods take this class as a parameter, passing {} will
+    // translate to a default-constructed bsoncxx::document::view_or_value,
+    // regardless of other overloads taking other default-constructible types
+    // for that parameter. This class avoids compiler ambiguity with such overloads.
+    //
+    // See update_one() for an example of such overloads.
+    //
+    class _empty_doc_tag {
+        _empty_doc_tag() = default;
+    };
+
+   public:
+    ///
+    /// @{
+    ///
+    /// Constructs an update operation that will modify a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Document representing the modifications to be applied to the matching document.
+    ///
+    update_one(bsoncxx::document::view_or_value filter, bsoncxx::document::view_or_value update);
+
+    ///
+    /// Constructs an update operation that will modify a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Pipeline representing the modifications to be applied to the matching document.
+    ///
+    update_one(bsoncxx::document::view_or_value filter, const pipeline& update);
+
+    ///
+    /// Constructs an update operation that will modify a single document matching the filter.
+    ///
+    /// @param filter
+    ///   Document representing the criteria for applying the update.
+    /// @param update
+    ///   Supports the empty update {}.
+    ///
+    update_one(bsoncxx::document::view_or_value filter,
+               std::initializer_list<_empty_doc_tag> update);
+
+    ///
+    /// @}
+    ///
+
+    ///
+    /// Gets the filter
+    ///
+    /// @return The filter to be used for the update operation.
+    ///
+    const bsoncxx::document::view_or_value& filter() const;
+
+    ///
+    /// Gets the update document.
+    ///
+    /// @return The modifications to be applied as part of the update.
+    ///
+    const bsoncxx::document::view_or_value& update() const;
+
+    ///
+    /// Sets the collation for this update operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    update_one& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the collation option for this update operation.
+    ///
+    /// @return
+    ///   The optional value of the collation option.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update_one& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// When upsert is @c false, if no document matches the filter, update does nothing.
+    /// However, by specifying upsert as @c true, this operation either updates a matching document
+    /// or inserts a new document using the update specification if no matching document exists.
+    /// By default upsert is @c false.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    update_one& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Set array filters for this update operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    update_one& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    bsoncxx::document::view_or_value _filter;
+    bsoncxx::document::view_or_value _update;
+
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class hint> _hint;
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/write.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/write.hpp
new file mode 100644
index 0000000..7fc9c93
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/model/write.hpp
@@ -0,0 +1,154 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/model/delete_many.hpp>
+#include <mongocxx/model/delete_one.hpp>
+#include <mongocxx/model/insert_one.hpp>
+#include <mongocxx/model/replace_one.hpp>
+#include <mongocxx/model/update_many.hpp>
+#include <mongocxx/model/update_one.hpp>
+#include <mongocxx/write_type.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace model {
+
+///
+/// Models a single write operation within a mongocxx::bulk_write.
+///
+class MONGOCXX_API write {
+   public:
+    ///
+    /// Constructs a write from a model::insert_one.
+    ///
+    write(insert_one value);
+
+    ///
+    /// Constructs a write from a model::update_one.
+    ///
+    write(update_one value);
+
+    ///
+    /// Constructs a write from a model::update_many.
+    ///
+    write(update_many value);
+
+    ///
+    /// Constructs a write from a model::delete_one.
+    ///
+    write(delete_one value);
+
+    ///
+    /// Constructs a write from a model::delete_many.
+    ///
+    write(delete_many value);
+
+    ///
+    /// Constructs a write from a model::replace_one.
+    ///
+    write(replace_one value);
+
+    ///
+    /// Move constructs a write.
+    ///
+    write(write&& rhs) noexcept;
+
+    ///
+    /// Move assigns a write.
+    ///
+    write& operator=(write&& rhs) noexcept;
+
+    write(const write& rhs) = delete;
+    write& operator=(const write& rhs) = delete;
+
+    ///
+    /// Destroys a write.
+    ///
+    ~write();
+
+    ///
+    /// Returns the current type of this write. You must call this
+    /// method before calling any of the get methods below.
+    ///
+    write_type type() const;
+
+    ///
+    /// Accesses the write as a model::insert_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const insert_one& get_insert_one() const;
+
+    ///
+    /// Accesses the write as an model::update_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const update_one& get_update_one() const;
+
+    ///
+    /// Accesses the write as an model::update_many. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const update_many& get_update_many() const;
+
+    ///
+    /// Accesses the write as a model::delete_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const delete_one& get_delete_one() const;
+
+    ///
+    /// Accesses the write as a model::delete_many. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const delete_many& get_delete_many() const;
+
+    ///
+    /// Accesses the write as a model::replace_one. It is illegal to call
+    /// this method if the return of type() does not indicate
+    /// that this object currently contains the applicable type.
+    ///
+    const replace_one& get_replace_one() const;
+
+   private:
+    MONGOCXX_PRIVATE void destroy_member() noexcept;
+
+    write_type _type;
+
+    union {
+        insert_one _insert_one;
+        update_one _update_one;
+        update_many _update_many;
+        delete_one _delete_one;
+        delete_many _delete_many;
+        replace_one _replace_one;
+    };
+};
+
+}  // namespace model
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp
new file mode 100644
index 0000000..2e7c61d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/aggregate.hpp
@@ -0,0 +1,328 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/builder/basic/document.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB aggregation operation.
+///
+class MONGOCXX_API aggregate {
+   public:
+    ///
+    /// Enables writing to temporary files. When set to @c true, aggregation stages can write data
+    /// to the _tmp subdirectory in the dbPath directory. The server-side default is @c false.
+    ///
+    /// @param allow_disk_use
+    ///   Whether or not to allow disk use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& allow_disk_use(bool allow_disk_use);
+
+    ///
+    /// Retrieves the current allow_disk_use setting.
+    ///
+    /// @return Whether disk use is allowed.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bool>& allow_disk_use() const;
+
+    ///
+    /// Sets the number of documents to return per batch.
+    ///
+    /// @param batch_size
+    ///   The size of the batches to request.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& batch_size(std::int32_t batch_size);
+
+    ///
+    /// The current batch size setting.
+    ///
+    /// @return The current batch size.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::int32_t>& batch_size() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the variable mapping for this operation.
+    ///
+    /// @param let
+    ///   The new variable mapping.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Retrieves the current variable mapping for this operation.
+    ///
+    /// @return
+    ///   The current variable mapping.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& let() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run server-side in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return
+    ///   The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp the new read_preference
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    aggregate& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+    ///
+    /// Sets whether the $out stage should bypass document validation.
+    ///
+    /// @param bypass_document_validation whether or not to bypass validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    aggregate& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current bypass_document_validation setting.
+    ///
+    /// @return the current bypass_document_validation setting
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    aggregate& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Sets the write concern to use for this operation. Only has an effect if $out is a part of
+    /// the pipeline.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @param write_concern
+    ///   Object representing the write_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    aggregate& write_concern(class write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern, if it is set.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Sets the read concern to use for this operation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @param read_concern
+    ///   Object representing the read_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    aggregate& read_concern(class read_concern read_concern);
+
+    ///
+    /// Gets the current read concern.
+    ///
+    /// @return
+    ///   The current read concern, if it is set.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class read_concern>& read_concern() const;
+
+    ///
+    /// Sets the comment to use for this operation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    /// @param comment
+    ///   Object representing the comment.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    aggregate& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current comment.
+    ///
+    /// @return
+    ///   The current comment, if it is set.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+   private:
+    friend class ::mongocxx::database;
+    friend class ::mongocxx::collection;
+
+    void append(bsoncxx::builder::basic::document& builder) const;
+
+    stdx::optional<bool> _allow_disk_use;
+    stdx::optional<std::int32_t> _batch_size;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<class read_preference> _read_preference;
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<class read_concern> _read_concern;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/apm.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/apm.hpp
new file mode 100644
index 0000000..eacfb17
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/apm.hpp
@@ -0,0 +1,330 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+
+#include <mongocxx/events/command_failed_event.hpp>
+#include <mongocxx/events/command_started_event.hpp>
+#include <mongocxx/events/command_succeeded_event.hpp>
+#include <mongocxx/events/heartbeat_failed_event.hpp>
+#include <mongocxx/events/heartbeat_started_event.hpp>
+#include <mongocxx/events/heartbeat_succeeded_event.hpp>
+#include <mongocxx/events/server_changed_event.hpp>
+#include <mongocxx/events/server_closed_event.hpp>
+#include <mongocxx/events/server_opening_event.hpp>
+#include <mongocxx/events/topology_changed_event.hpp>
+#include <mongocxx/events/topology_closed_event.hpp>
+#include <mongocxx/events/topology_opening_event.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing MongoDB application performance monitoring.
+///
+class MONGOCXX_API apm {
+   public:
+    ///
+    /// Set the command started monitoring callback. The callback takes a reference to a
+    /// command_started_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param command_started
+    ///   The command started monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_command_started(
+        std::function<void(const mongocxx::events::command_started_event&)> command_started);
+
+    ///
+    /// Retrieves the command started monitoring callback.
+    ///
+    /// @return The command started monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::command_started_event&)>& command_started()
+        const;
+
+    ///
+    /// Set the command failed monitoring callback. The callback takes a reference to a
+    /// command_failed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param command_failed
+    ///   The command failed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_command_failed(
+        std::function<void(const mongocxx::events::command_failed_event&)> command_failed);
+
+    ///
+    /// Retrieves the command failed monitoring callback.
+    ///
+    /// @return The command failed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::command_failed_event&)>& command_failed()
+        const;
+
+    ///
+    /// Set the command succeeded monitoring callback. The callback takes a reference to a
+    /// command_succeeded_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param command_succeeded
+    ///   The command succeeded monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_command_succeeded(
+        std::function<void(const mongocxx::events::command_succeeded_event&)> command_succeeded);
+
+    ///
+    /// Retrieves the command succeeded monitoring callback.
+    ///
+    /// @return The command succeeded monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::command_succeeded_event&)>& command_succeeded()
+        const;
+
+    ///
+    /// Set the server opening monitoring callback. The callback takes a reference to a
+    /// server_opening_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param server_opening
+    ///   The server opening monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_server_opening(
+        std::function<void(const mongocxx::events::server_opening_event&)> server_opening);
+
+    ///
+    /// Retrieves the server opening monitoring callback.
+    ///
+    /// @return The server opening monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::server_opening_event&)>& server_opening()
+        const;
+
+    ///
+    /// Set the server closed monitoring callback. The callback takes a reference to a
+    /// server_closed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param server_closed
+    ///   The server closed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_server_closed(
+        std::function<void(const mongocxx::events::server_closed_event&)> server_closed);
+
+    ///
+    /// Retrieves the server closed monitoring callback.
+    ///
+    /// @return The server closed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::server_closed_event&)>& server_closed() const;
+
+    ///
+    /// Set the server description changed monitoring callback. The callback takes a reference to a
+    /// server_changed_event which will only contain valid data for the duration of the
+    /// callback.
+    ///
+    /// @param server_changed
+    ///   The server description changed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_server_changed(
+        std::function<void(const mongocxx::events::server_changed_event&)> server_changed);
+
+    ///
+    /// Retrieves the server description changed monitoring callback.
+    ///
+    /// @return The server description changed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::server_changed_event&)>& server_changed()
+        const;
+
+    ///
+    /// Set the topology_opening monitoring callback. The callback takes a reference to a
+    /// topology_opening_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param topology_opening
+    ///   The topology_opening monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_topology_opening(
+        std::function<void(const mongocxx::events::topology_opening_event&)> topology_opening);
+
+    ///
+    /// Retrieves the topology_opening monitoring callback.
+    ///
+    /// @return The topology_opening monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::topology_opening_event&)>& topology_opening()
+        const;
+
+    ///
+    /// Set the topology closed monitoring callback. The callback takes a reference to a
+    /// topology_closed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param topology_closed
+    ///   The topology closed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_topology_closed(
+        std::function<void(const mongocxx::events::topology_closed_event&)> topology_closed);
+
+    ///
+    /// Retrieves the topology closed monitoring callback.
+    ///
+    /// @return The topology closed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::topology_closed_event&)>& topology_closed()
+        const;
+
+    ///
+    /// Set the topology description changed monitoring callback. The callback takes a reference to
+    /// a
+    /// topology_changed_event which will only contain valid data for the duration of
+    /// the callback.
+    ///
+    /// @param topology_changed
+    ///   The topology description changed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_topology_changed(
+        std::function<void(const mongocxx::events::topology_changed_event&)> topology_changed);
+
+    ///
+    /// Retrieves the topology description changed monitoring callback.
+    ///
+    /// @return The topology description changed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::topology_changed_event&)>& topology_changed()
+        const;
+
+    ///
+    /// Set the heartbeat started monitoring callback. The callback takes a reference to a
+    /// heartbeat_started_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param heartbeat_started
+    ///   The heartbeat started monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_heartbeat_started(
+        std::function<void(const mongocxx::events::heartbeat_started_event&)> heartbeat_started);
+
+    ///
+    /// Retrieves the heartbeat started monitoring callback.
+    ///
+    /// @return The heartbeat started monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::heartbeat_started_event&)>& heartbeat_started()
+        const;
+
+    ///
+    /// Set the heartbeat failed monitoring callback. The callback takes a reference to a
+    /// heartbeat_failed_event which will only contain valid data for the duration of the callback.
+    ///
+    /// @param heartbeat_failed
+    ///   The heartbeat failed monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_heartbeat_failed(
+        std::function<void(const mongocxx::events::heartbeat_failed_event&)> heartbeat_failed);
+
+    ///
+    /// Retrieves the heartbeat failed monitoring callback.
+    ///
+    /// @return The heartbeat failed monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::heartbeat_failed_event&)>& heartbeat_failed()
+        const;
+
+    ///
+    /// Set the heartbeat succeeded monitoring callback. The callback takes a reference to a
+    /// heartbeat_succeeded_event which will only contain valid data for the duration of the
+    /// callback.
+    ///
+    /// @param heartbeat_succeeded
+    ///   The heartbeat succeeded monitoring callback.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    apm& on_heartbeat_succeeded(
+        std::function<void(const mongocxx::events::heartbeat_succeeded_event&)>
+            heartbeat_succeeded);
+
+    ///
+    /// Retrieves the heartbeat succeeded monitoring callback.
+    ///
+    /// @return The heartbeat succeeded monitoring callback.
+    ///
+    const std::function<void(const mongocxx::events::heartbeat_succeeded_event&)>&
+    heartbeat_succeeded() const;
+
+   private:
+    std::function<void(const mongocxx::events::command_started_event&)> _command_started;
+    std::function<void(const mongocxx::events::command_failed_event&)> _command_failed;
+    std::function<void(const mongocxx::events::command_succeeded_event&)> _command_succeeded;
+    std::function<void(const mongocxx::events::server_closed_event&)> _server_closed;
+    std::function<void(const mongocxx::events::server_changed_event&)> _server_changed;
+    std::function<void(const mongocxx::events::server_opening_event&)> _server_opening;
+    std::function<void(const mongocxx::events::topology_closed_event&)> _topology_closed;
+    std::function<void(const mongocxx::events::topology_changed_event&)> _topology_changed;
+    std::function<void(const mongocxx::events::topology_opening_event&)> _topology_opening;
+    std::function<void(const mongocxx::events::heartbeat_started_event&)> _heartbeat_started;
+    std::function<void(const mongocxx::events::heartbeat_failed_event&)> _heartbeat_failed;
+    std::function<void(const mongocxx::events::heartbeat_succeeded_event&)> _heartbeat_succeeded;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp
new file mode 100644
index 0000000..ca516d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/auto_encryption.hpp
@@ -0,0 +1,312 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class pool;
+
+namespace options {
+
+///
+/// Class representing options for automatic client-side encryption.
+///
+class MONGOCXX_API auto_encryption {
+   public:
+    ///
+    /// Default constructs a new auto_encryption object.
+    ///
+    auto_encryption() noexcept;
+
+    ///
+    /// When the key vault collection is on a separate MongoDB cluster,
+    /// sets the optional client to use to route data key queries to
+    /// that cluster.
+    ///
+    /// The given key vault client MUST outlive any client that has
+    /// been enabled to use it through these options.
+    ///
+    /// @param client
+    ///   A client to use for routing queries to the key vault collection.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& key_vault_client(client* client);
+
+    ///
+    /// Gets the key vault client.
+    ///
+    /// @return
+    ///   An optional pointer to the key vault client.
+    ///
+    const stdx::optional<client*>& key_vault_client() const;
+
+    ///
+    /// When the key vault collection is on a separate MongoDB cluster,
+    /// sets the optional client pool to use to route data key queries to
+    /// that cluster.
+    ///
+    /// This option may not be used if a key_vault_client is set.
+    ///
+    /// The given key vault pool MUST outlive any pool that has
+    /// been enabled to use it through these options.
+    ///
+    /// May only be set when enabling automatic encryption on a pool.
+    ///
+    /// @param pool
+    ///   A pool to use for routing queries to the key vault collection.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& key_vault_pool(pool* pool);
+
+    ///
+    /// Gets the key vault pool.
+    ///
+    /// @return
+    ///   An optional pointer to the key vault pool.
+    ///
+    const stdx::optional<pool*>& key_vault_pool() const;
+
+    ///
+    /// Sets the namespace to use to access the key vault collection, which
+    /// contains all data keys used for encryption and decryption. This
+    /// option must be set:
+    ///
+    ///   auto_encryption.key_vault_namespace({ "db", "coll" });
+    ///
+    /// @param ns
+    ///   A std::pair of strings representing the db and collection to use
+    ///   to access the key vault.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    using ns_pair = std::pair<std::string, std::string>;
+    auto_encryption& key_vault_namespace(ns_pair ns);
+
+    ///
+    /// Gets the key vault namespace.
+    ///
+    /// @return
+    ///   An optional pair of strings representing the namespace of the
+    ///   key vault collection.
+    ///
+    const stdx::optional<ns_pair>& key_vault_namespace() const;
+
+    ///
+    /// Sets the KMS providers to use for client side encryption.
+    ///
+    /// Multiple KMS providers may be specified. The following KMS providers are
+    /// supported: "aws", "azure", "gcp", "kmip", and "local". The kmsProviders map values differ
+    /// by provider:
+    ///
+    ///    aws: {
+    ///      accessKeyId: String,
+    ///      secretAccessKey: String
+    ///    }
+    ///
+    ///    azure: {
+    ///       tenantId: String,
+    ///       clientId: String,
+    ///       clientSecret: String,
+    ///       identityPlatformEndpoint: Optional<String> // Defaults to login.microsoftonline.com
+    ///    }
+    ///
+    ///    gcp: {
+    ///       email: String,
+    ///       privateKey: byte[] or String, // May be passed as a base64 encoded string.
+    ///       endpoint: Optional<String> // Defaults to oauth2.googleapis.com
+    ///    }
+    ///
+    ///    kmip: {
+    ///       endpoint: String
+    ///    }
+    ///
+    ///    local: {
+    ///      key: byte[96] // The master key used to encrypt/decrypt data keys.
+    ///    }
+    ///
+    /// @param kms_providers
+    ///   A document containing the KMS providers.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& kms_providers(bsoncxx::document::view_or_value kms_providers);
+
+    ///
+    /// Gets the KMS providers.
+    ///
+    /// @return
+    ///   An optional document containing the KMS providers.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& kms_providers() const;
+
+    ///
+    /// Sets the TLS options to use for client side encryption with a given KMS provider.
+    ///
+    /// Multiple KMS providers may be specified. Supported KMS providers are "aws", "azure", "gcp",
+    /// and "kmip". The map value has the same form for all supported providers:
+    ///
+    ///    <KMS provider name>: {
+    ///        tlsCaFile: Optional<String>
+    ///        tlsCertificateKeyFile: Optional<String>
+    ///        tlsCertificateKeyFilePassword: Optional<String>
+    ///    }
+    ///
+    /// @param tls_opts
+    ///   A document containing the TLS options.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& tls_opts(bsoncxx::document::view_or_value tls_opts);
+
+    ///
+    /// Gets the TLS options.
+    ///
+    /// @return
+    ///   An optional document containing the TLS options.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& tls_opts() const;
+
+    ///
+    /// Sets a local JSON schema.
+    ///
+    /// Supplying a schemaMap provides more security than relying on
+    /// JSON schemas obtained from the server. It protects against a
+    /// malicious server advertising a false JSON Schema, which could
+    /// trick the client into sending unencrypted data that should be
+    /// encrypted.
+    ///
+    /// Schemas supplied in the schemaMap only apply to configuring
+    /// automatic encryption for client side encryption. Other validation
+    /// rules in the JSON schema will not be enforced by the driver and
+    /// will result in an error.
+    ///
+    /// @param schema_map
+    ///   The JSON schema to use.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& schema_map(bsoncxx::document::view_or_value schema_map);
+
+    ///
+    /// Gets the schema map.
+    ///
+    /// @return
+    ///   An optional document containing the schema map.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& schema_map() const;
+
+    ///
+    /// Automatic encryption is disabled when the 'bypassAutoEncryption'
+    /// option is true. Default is 'false,' so auto encryption is enabled.
+    ///
+    /// @param should_bypass
+    ///   Whether or not to bypass automatic encryption.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& bypass_auto_encryption(bool should_bypass);
+
+    ///
+    /// Gets a boolean specifying whether or not auto encryption is bypassed.
+    ///
+    /// @return
+    ///   A boolean specifying whether auto encryption is bypassed.
+    ///
+    bool bypass_auto_encryption() const;
+
+    ///
+    /// Set extra options related to the mongocryptd process. This options
+    /// document may include the following fields:
+    ///
+    /// - mongocryptdURI: string, defaults to "mongodb://localhost:27020".
+    ///
+    /// - mongocryptdBypassSpawn: bool, defaults to false.
+    ///
+    /// - mongocryptdSpawnPath: string, defaults to "" and spawns mongocryptd
+    ///   from the system path.
+    ///
+    /// - mongocryptdSpawnArgs: array[strings], options passed to mongocryptd
+    ///   when spawing. Defaults to ["--idleShutdownTimeoutSecs=60"].
+    ///
+    /// @param extra
+    ///   The extra options to set.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    auto_encryption& extra_options(bsoncxx::document::view_or_value extra);
+
+    ///
+    /// Gets extra options related to the mongocryptd process.
+    ///
+    /// @return
+    ///   An optional document containing the extra options.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& extra_options() const;
+
+   private:
+    friend class mongocxx::client;
+    friend class mongocxx::pool;
+
+    MONGOCXX_PRIVATE void* convert() const;
+
+    bool _bypass;
+    stdx::optional<mongocxx::client*> _key_vault_client;
+    stdx::optional<mongocxx::pool*> _key_vault_pool;
+    stdx::optional<ns_pair> _key_vault_namespace;
+    stdx::optional<bsoncxx::document::view_or_value> _kms_providers;
+    stdx::optional<bsoncxx::document::view_or_value> _tls_opts;
+    stdx::optional<bsoncxx::document::view_or_value> _schema_map;
+    stdx::optional<bsoncxx::document::view_or_value> _extra_options;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp
new file mode 100644
index 0000000..01f803c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/bulk_write.hpp
@@ -0,0 +1,160 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB bulk write
+///
+class MONGOCXX_API bulk_write {
+   public:
+    ///
+    /// Constructs a new bulk_write object. By default, bulk writes are considered ordered
+    /// as this is the only safe choice. If you want an unordered update, you must call
+    /// ordered(false) to switch to unordered mode.
+    ///
+    bulk_write();
+
+    ///
+    /// Sets whether the writes must be executed in order by the server.
+    ///
+    /// The server-side default is @c true.
+    ///
+    /// @param ordered
+    ///   If @c true all write operations will be executed serially in the order they were appended,
+    ///   and the entire bulk operation will abort on the first error. If @c false operations will
+    ///   be executed in arbitrary order (possibly in parallel on the server) and any errors will be
+    ///   reported after attempting all operations.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& ordered(bool ordered);
+
+    ///
+    /// Gets the current value of the ordered option.
+    ///
+    /// @return The value of the ordered option.
+    ///
+    bool ordered() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    bulk_write& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Set whether or not to bypass document validation for this operation.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current setting for bypassing document validation for this operation.
+    ///
+    /// @return
+    ///  The current document validation bypass setting.
+    ///
+    const stdx::optional<bool> bypass_document_validation() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bulk_write& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    bool _ordered;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp
new file mode 100644
index 0000000..778b75a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/change_stream.hpp
@@ -0,0 +1,284 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <bsoncxx/types.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+
+namespace options {
+
+///
+/// Class representing MongoDB change stream options.
+///
+class MONGOCXX_API change_stream {
+   public:
+    change_stream();
+
+    ///
+    /// Sets the fullDocument option for the $changeStream.
+    ///
+    /// Allowed values: 'default', 'updateLookup', 'whenAvailable', 'required'.
+    ///
+    /// The default is to not send a value, which is equivalent to 'default'. By default, the change
+    /// notification for partial updates will include a delta describing the changes to the
+    /// document.
+    ///
+    /// When set to 'updateLookup', the change notification for partial updates will include both a
+    /// delta describing the changes to the document as well as a copy of the entire document that
+    /// was changed from some time after the change occurred.
+    ///
+    /// When set to 'whenAvailable', configures the change stream to return the post-image of the
+    /// modified document for replace and update change events if the post-image for this event is
+    /// available.
+    ///
+    /// When set to 'required', the same behavior as 'whenAvailable' except that an error is raised
+    /// if the post-image is not available.
+    ///
+    /// @param full_doc
+    ///   The fullDocument option to use on this stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& full_document(bsoncxx::string::view_or_value full_doc);
+
+    ///
+    /// Gets the current fullDocument option.
+    ///
+    /// @return
+    ///   The current fullDocument option.
+    ///
+    const bsoncxx::stdx::optional<bsoncxx::string::view_or_value>& full_document() const;
+
+    ///
+    /// Sets the fullDocumentBeforeChange option for the $changeStream.
+    ///
+    /// The allowed values are: 'whenAvailable', 'required', 'off'.
+    /// If none set, defaults to 'off'.
+    ///
+    /// When set to 'whenAvailable', configures the change stream to return the pre-image of the
+    /// modified document for replace, update, and delete change events if it is available.
+    ///
+    /// When set to 'required', the same behavior as 'whenAvailable' except that an error is raised
+    /// if the pre-image is not available.
+    ///
+    /// @param full_doc_before_change
+    ///   The fullDocumentBeforeChange option to use on this stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& full_document_before_change(
+        bsoncxx::string::view_or_value full_doc_before_change);
+
+    ///
+    /// Gets the current fullDocumentBeforeChange option.
+    ///
+    /// @return
+    ///   The current fullDocumentBeforeChange option.
+    ///
+    const bsoncxx::stdx::optional<bsoncxx::string::view_or_value>& full_document_before_change()
+        const;
+
+    ///
+    /// Sets the number of documents to return per batch.
+    ///
+    /// @param batch_size
+    ///   The size of the batches to request.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& batch_size(std::int32_t batch_size);
+
+    ///
+    /// The current batch size setting.
+    ///
+    /// @return
+    ///   The current batch size.
+    ///
+    const stdx::optional<std::int32_t>& batch_size() const;
+
+    ///
+    /// Sets the current value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///   The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Specifies the logical starting point for the new change stream.
+    ///
+    /// The value returned by calling change_stream::get_resume_token can be used here.
+    ///
+    /// start_after, resume_after, and start_at_operation_time are mutually exclusive options.
+    /// Setting more than one of these will result in a server error.
+    ///
+    /// @param resume_after
+    ///   The resumeToken to use when starting the change stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& resume_after(bsoncxx::document::view_or_value resume_after);
+
+    ///
+    /// Retrieves the current resumeToken for this change stream.
+    ///
+    /// @return
+    ///   The current resumeToken.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& resume_after() const;
+
+    ///
+    /// Specifies the logical starting point of the new change stream. The new stream will
+    /// return the first notification after the given token.
+    ///
+    /// The value returned by calling change_stream::get_resume_token can be used here.
+    ///
+    /// Unlike resumeAfter, this can resume notifications after an "invalidate" event.
+    ///
+    /// start_after, resume_after, and start_at_operation_time are mutually exclusive options.
+    /// Setting more than one of these will result in a server error.
+    ///
+    /// @param token
+    ///   The token representing the logical starting point of the change stream.
+    ///
+    /// @return
+    ///   A reference to the object on which this function is being called.
+    ///
+    change_stream& start_after(bsoncxx::document::view_or_value token);
+
+    ///
+    /// Retrieves the current startAfter token for this change stream.
+    ///
+    /// @return
+    ///   The current startAfter token.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& start_after() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the maximum amount of time for for the server to wait on new documents to satisfy a
+    /// change stream query.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds) for the server to wait on new documents.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& max_await_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return
+    ///   The current max time (in milliseconds).
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_await_time() const;
+
+    ///
+    /// Specifies the logical starting point for the new change stream. Changes are returned at or
+    /// after the specified operation time.
+    ///
+    /// start_after, resume_after, and start_at_operation_time are mutually exclusive options.
+    /// Setting more than one of these will result in a server error.
+    ///
+    /// @param timestamp
+    ///   The starting operation time.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    change_stream& start_at_operation_time(bsoncxx::types::b_timestamp timestamp);
+
+   private:
+    friend class ::mongocxx::client;
+    friend class ::mongocxx::collection;
+    friend class ::mongocxx::database;
+
+    bsoncxx::document::value as_bson() const;
+    stdx::optional<bsoncxx::string::view_or_value> _full_document;
+    stdx::optional<bsoncxx::string::view_or_value> _full_document_before_change;
+    stdx::optional<std::int32_t> _batch_size;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::document::view_or_value> _resume_after;
+    stdx::optional<bsoncxx::document::view_or_value> _start_after;
+    stdx::optional<std::chrono::milliseconds> _max_await_time;
+    // _start_at_operation_time is not wrapped in a stdx::optional because of a longstanding bug in
+    // the MNMLSTC polyfill that has been fixed on master, but not in the latest release:
+    // https://github.com/mnmlstc/core/pull/23
+    bsoncxx::types::b_timestamp _start_at_operation_time = {};
+    bool _start_at_operation_time_set = false;
+};
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client.hpp
new file mode 100644
index 0000000..9ef61d0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client.hpp
@@ -0,0 +1,152 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/apm.hpp>
+#include <mongocxx/options/auto_encryption.hpp>
+#include <mongocxx/options/server_api.hpp>
+#include <mongocxx/options/tls.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+// NOTE: client options interface still evolving
+
+///
+/// Class representing the optional arguments to a MongoDB driver client object.
+///
+class MONGOCXX_API client {
+   public:
+    ///
+    /// Sets the SSL-related options.
+    ///
+    /// @param ssl_opts
+    ///   The SSL-related options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This
+    ///   facilitates method chaining.
+    ///
+    /// @deprecated
+    ///   Please use tls_opts instead.
+    ///
+    MONGOCXX_DEPRECATED client& ssl_opts(tls ssl_opts);
+
+    ///
+    /// Sets the TLS-related options.
+    ///
+    /// @param tls_opts
+    ///   The TLS-related options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& tls_opts(tls tls_opts);
+
+    ///
+    /// The current SSL-related options.
+    ///
+    /// @return The SSL-related options.
+    ///
+    /// @deprecated Please use tls_opts instead.
+    ///
+    MONGOCXX_DEPRECATED const stdx::optional<tls>& ssl_opts() const;
+
+    ///
+    /// The current TLS-related options.
+    ///
+    /// @return The TLS-related options.
+    ///
+    const stdx::optional<tls>& tls_opts() const;
+
+    ///
+    /// Sets the automatic encryption options.
+    ///
+    /// @param auto_encryption_opts
+    ///   The options for automatic encryption.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& auto_encryption_opts(auto_encryption auto_encryption_opts);
+
+    ///
+    /// Gets the current automatic encryption options.
+    ///
+    /// @return
+    ///   The automatic encryption opts.
+    ///
+    const stdx::optional<auto_encryption>& auto_encryption_opts() const;
+
+    ///
+    /// Sets the APM-related options.
+    ///
+    /// @param apm_opts
+    ///   The APM-related options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& apm_opts(apm apm_opts);
+
+    ///
+    /// The current APM-related options.
+    ///
+    /// @return The APM-related options.
+    ///
+    const stdx::optional<apm>& apm_opts() const;
+
+    ///
+    /// Sets the server API options.
+    ///
+    /// @param server_api_opts
+    ///   The options for server API.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client& server_api_opts(server_api server_api_opts);
+
+    ///
+    /// Gets the current server API options or returns a disengaged optional if there are no server
+    /// API options set.
+    ///
+    /// @return
+    ///   The server API options.
+    ///
+    const stdx::optional<server_api>& server_api_opts() const;
+
+   private:
+    stdx::optional<tls> _tls_opts;
+    stdx::optional<apm> _apm_opts;
+    stdx::optional<auto_encryption> _auto_encrypt_opts;
+    stdx::optional<server_api> _server_api_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp
new file mode 100644
index 0000000..bd8ada6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client_encryption.hpp
@@ -0,0 +1,185 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class client_encryption;
+
+namespace options {
+
+///
+/// Class representing options for the object managing explicit client-side encryption.
+///
+class MONGOCXX_API client_encryption {
+   public:
+    ///
+    /// When the key vault collection is on a separate MongoDB cluster,
+    /// sets the optional client to use to route data key queries to
+    /// that cluster.
+    ///
+    /// @param client
+    ///   A client to use for routing queries to the key vault collection.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    client_encryption& key_vault_client(mongocxx::client* client);
+
+    ///
+    /// Gets the key vault client.
+    ///
+    /// @return
+    ///   An optional pointer to the key vault client.
+    ///
+    const stdx::optional<mongocxx::client*>& key_vault_client() const;
+
+    ///
+    /// Sets the namespace to use to access the key vault collection, which
+    /// contains all data keys used for encryption and decryption. This
+    /// option must be set:
+    ///
+    ///   client_encryption.key_vault_namespace({ "db", "coll" });
+    ///
+    /// @param ns
+    ///   A std::pair of strings representing the db and collection to use
+    ///   to access the key vault.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    using ns_pair = std::pair<std::string, std::string>;
+    client_encryption& key_vault_namespace(ns_pair ns);
+
+    ///
+    /// Gets the key vault namespace.
+    ///
+    /// @return
+    ///   An optional pair of strings representing the namespace of the
+    ///   key vault collection.
+    ///
+    const stdx::optional<ns_pair>& key_vault_namespace() const;
+
+    ///
+    /// Sets the KMS providers to use for client side encryption.
+    ///
+    /// Multiple KMS providers may be specified. Supported KMS providers are
+    /// "aws", "azure", "gcp", "kmip", and "local". The kmsProviders map values differ
+    /// by provider:
+    ///
+    ///    aws: {
+    ///      accessKeyId: String,
+    ///      secretAccessKey: String
+    ///    }
+    ///
+    ///    azure: {
+    ///       tenantId: String,
+    ///       clientId: String,
+    ///       clientSecret: String,
+    ///       identityPlatformEndpoint: Optional<String> // Defaults to login.microsoftonline.com
+    ///    }
+    ///
+    ///    gcp: {
+    ///       email: String,
+    ///       privateKey: byte[] or String, // May be passed as a base64 encoded string.
+    ///       endpoint: Optional<String> // Defaults to oauth2.googleapis.com
+    ///    }
+    ///
+    ///    kmip: {
+    ///       endpoint: String
+    ///    }
+    ///
+    ///    local: {
+    ///      key: byte[96] // The master key used to encrypt/decrypt data keys.
+    ///    }
+    ///
+    /// @param kms_providers
+    ///   A document containing the KMS providers.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    client_encryption& kms_providers(bsoncxx::document::view_or_value kms_providers);
+
+    ///
+    /// Gets the KMS providers.
+    ///
+    /// @return
+    ///   An optional document containing the KMS providers.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& kms_providers() const;
+
+    ///
+    /// Sets the TLS options to use for client side encryption with a given KMS provider.
+    ///
+    /// Multiple KMS providers may be specified. Supported KMS providers are "aws", "azure", "gcp",
+    /// and "kmip". The map value has the same form for all supported providers:
+    ///
+    ///    <KMS provider name>: {
+    ///        tlsCaFile: Optional<String>
+    ///        tlsCertificateKeyFile: Optional<String>
+    ///        tlsCertificateKeyFilePassword: Optional<String>
+    ///    }
+    ///
+    /// @param tls_opts
+    ///   A document containing the TLS options.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    client_encryption& tls_opts(bsoncxx::document::view_or_value tls_opts);
+
+    ///
+    /// Gets the TLS options.
+    ///
+    /// @return
+    ///   An optional document containing the TLS options.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& tls_opts() const;
+
+   private:
+    friend class mongocxx::client_encryption;
+
+    MONGOCXX_PRIVATE void* convert() const;
+
+    stdx::optional<mongocxx::client*> _key_vault_client;
+    stdx::optional<ns_pair> _key_vault_namespace;
+    stdx::optional<bsoncxx::document::view_or_value> _kms_providers;
+    stdx::optional<bsoncxx::document::view_or_value> _tls_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp
new file mode 100644
index 0000000..8aff6c3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/client_session.hpp
@@ -0,0 +1,112 @@
+// Copyright 2017-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to mongocxx::client::start_session.
+///
+class MONGOCXX_API client_session {
+   public:
+    ///
+    /// Sets the causal_consistency option.
+    ///
+    /// If true (the default), each operation in the session will be causally ordered after the
+    /// previous read or write operation. Set to false to disable causal consistency.
+    ///
+    /// Unacknowledged writes are not causally consistent. If you execute a write operation with an
+    /// unacknowledged write concern (a mongocxx::write_concern with
+    /// mongocxx::write_concern::acknowledge_level of @c k_unacknowledged), the write does not
+    /// participate in causal consistency.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/core/read-isolation-consistency-recency/#causal-consistency
+    ///
+    client_session& causal_consistency(bool causal_consistency) noexcept;
+
+    ///
+    /// Gets the value of the causal_consistency option.
+    ///
+    ///
+    bool causal_consistency() const noexcept;
+
+    ///
+    /// Sets the read concern "snapshot" (not enabled by default).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/reference/read-concern-snapshot/
+    ///
+    /// @note Snapshot reads and causal consistency are mutually exclusive: only one or the
+    /// other may be active at a time. Attempting to do so will result in an error being thrown
+    /// by mongocxx::client::start_session.
+    ///
+    client_session& snapshot(bool enable_snapshot_reads) noexcept;
+
+    ///
+    /// Gets the value of the snapshot_reads option.
+    ///
+    bool snapshot() const noexcept;
+
+    ///
+    /// Sets the default transaction options.
+    ///
+    /// @param default_transaction_opts
+    ///   The default transaction options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    client_session& default_transaction_opts(transaction default_transaction_opts);
+
+    ///
+    /// Gets the current default transaction options.
+    ///
+    /// @return The default transaction options.
+    ///
+    const stdx::optional<transaction>& default_transaction_opts() const;
+
+   private:
+    // Allow the implementation of client_session to see these:
+    friend mongocxx::client_session;
+
+    stdx::optional<bool> _causal_consistency;
+    stdx::optional<bool> _enable_snapshot_reads;
+
+    stdx::optional<transaction> _default_transaction_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/count.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/count.hpp
new file mode 100644
index 0000000..6bb432f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/count.hpp
@@ -0,0 +1,215 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace options {
+
+///
+/// Class representing the optional arguments to mongocxx::collection::count_documents
+///
+class MONGOCXX_API count {
+   public:
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return The current comment option.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Sets the maximum number of documents to count.
+    ///
+    /// @param limit
+    ///  The max number of documents to count.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& limit(std::int64_t limit);
+
+    ///
+    /// Gets the current limit.
+    ///
+    /// @return The current limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::int64_t>& limit() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the number of documents to skip before counting documents.
+    ///
+    /// @param skip
+    ///   The number of documents to skip.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& skip(std::int64_t skip);
+
+    ///
+    /// Gets the current number of documents to skip.
+    ///
+    /// @return The number of documents to skip.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<std::int64_t>& skip() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    count& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/aggregate/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<std::int64_t> _limit;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<std::int64_t> _skip;
+    stdx::optional<class read_preference> _read_preference;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp
new file mode 100644
index 0000000..8da3338
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/create_collection.hpp
@@ -0,0 +1,249 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/validation_criteria.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB createCollection command
+///
+/// This class is deprecated, as are the database class methods that use this class.
+/// Please use the new database::create_collection methods that take options as a
+/// BSON document.
+///
+class MONGOCXX_API create_collection_deprecated {
+   public:
+    ///
+    /// To create a capped collection, specify true.
+    ///
+    /// @note If you specify true, you must also set a maximum size using the size() method.
+    ///
+    /// @param capped
+    ///   Whether or not this collection will be capped.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/glossary/#term-capped-collection
+    ///
+    create_collection_deprecated& capped(bool capped);
+
+    ///
+    /// Gets the current capped setting.
+    ///
+    /// @return
+    ///   Whether or not this collection will be capped.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/glossary/#term-capped-collection
+    ///
+    const stdx::optional<bool>& capped() const;
+
+    ///
+    /// Sets the default collation for this collection.
+    ///
+    /// @param collation
+    ///   The default collation for the collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    create_collection_deprecated& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Gets the default collation for this collection.
+    ///
+    /// @return
+    ///   The default collation for the collection.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// The maximum number of documents allowed in the capped collection.
+    ///
+    /// @note The size limit takes precedence over this limit. If a capped collection reaches
+    ///   the size limit before it reaches the maximum number of documents, MongoDB removes
+    ///   old documents.
+    ///
+    /// @param max_documents
+    ///   Maximum number of documents allowed in the collection (if capped).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& max(std::int64_t max_documents);
+
+    ///
+    /// Gets the current setting for the maximum number of documents allowed in the capped
+    /// collection.
+    ///
+    /// @return
+    ///   Maximum number of documents allowed in the collection (if capped).
+    ///
+    const stdx::optional<std::int64_t>& max() const;
+
+    ///
+    /// When true, disables the power of 2 sizes allocation for the collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @param no_padding
+    ///   When true, disables power of 2 sizing for this collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& no_padding(bool no_padding);
+
+    ///
+    /// Gets the current value of the "no padding" option for the collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/create/
+    ///
+    /// @return
+    ///   When true, power of 2 sizing is disabled for this collection.
+    ///
+    const stdx::optional<bool>& no_padding() const;
+
+    ///
+    /// A maximum size, in bytes, for a capped collection.
+    ///
+    /// @note Once a capped collection reaches its maximum size, MongoDB removes older
+    ///   documents to make space for new documents.
+    ///
+    /// @note Size is required for capped collections and ignored for other collections.
+    ///
+    /// @param max_size
+    ///   Maximum size, in bytes, of this collection (if capped).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& size(std::int64_t max_size);
+
+    ///
+    /// Gets the current size setting, for a capped collection.
+    ///
+    /// @return
+    ///   Maximum size, in bytes, of this collection (if capped).
+    ///
+    const stdx::optional<std::int64_t>& size() const;
+
+    ///
+    /// Specify configuration to the storage on a per-collection basis.
+    ///
+    /// @note This option is currently only available with the WiredTiger storage engine.
+    ///
+    /// @param storage_engine_opts
+    ///   Configuration options specific to the storage engine.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    create_collection_deprecated& storage_engine(
+        bsoncxx::document::view_or_value storage_engine_opts);
+
+    ///
+    /// Gets the current storage engine configuration for this collection.
+    ///
+    /// @return
+    ///   Configuration options specific to the storage engine.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& storage_engine() const;
+
+    ///
+    /// Specify validation criteria for this collection.
+    ///
+    /// @param validation
+    ///   Validation criteria for this collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/document-validation/
+    ///
+    create_collection_deprecated& validation_criteria(class validation_criteria validation);
+
+    ///
+    /// Gets the current validation criteria for this collection.
+    ///
+    /// @return
+    ///   Validation criteria for this collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/document-validation/
+    ///
+    const stdx::optional<class validation_criteria>& validation_criteria() const;
+
+    ///
+    /// Return a bson document representing the options set on this object.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    /// @return Options, as a document.
+    ///
+    MONGOCXX_DEPRECATED bsoncxx::document::value to_document() const;
+    bsoncxx::document::value to_document_deprecated() const;
+
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    MONGOCXX_DEPRECATED MONGOCXX_INLINE operator bsoncxx::document::value() const;
+
+   private:
+    stdx::optional<bool> _capped;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<std::int64_t> _max_documents;
+    stdx::optional<std::int64_t> _max_size;
+    stdx::optional<bool> _no_padding;
+    stdx::optional<bsoncxx::document::view_or_value> _storage_engine_opts;
+    stdx::optional<class validation_criteria> _validation;
+};
+
+MONGOCXX_DEPRECATED typedef create_collection_deprecated create_collection;
+
+MONGOCXX_INLINE create_collection_deprecated::operator bsoncxx::document::value() const {
+    return to_document_deprecated();
+}
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp
new file mode 100644
index 0000000..530af29
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/data_key.hpp
@@ -0,0 +1,135 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_encryption;
+
+namespace options {
+
+///
+/// Class representing options for data key generation for encryption.
+///
+class MONGOCXX_API data_key {
+   public:
+    ///
+    /// Sets a KMS-specific key used to encrypt the new data key.
+    ///
+    /// If the KMS provider is "aws" the masterKey is required and has the following fields:
+    ///
+    /// {
+    ///    region: String,
+    ///    key: String, // The Amazon Resource Name (ARN) to the AWS customer master key (CMK).
+    ///    endpoint: Optional<String> // An alternate host identifier to send KMS requests to. May
+    ///    include port number. Defaults to "kms.<region>.amazonaws.com"
+    /// }
+    ///
+    /// If the KMS provider is "azure" the masterKey is required and has the following fields:
+    ///
+    /// {
+    ///    keyVaultEndpoint: String, // Host with optional port. Example: "example.vault.azure.net".
+    ///    keyName: String,
+    ///    keyVersion: Optional<String> // A specific version of the named key, defaults to using
+    ///    the key's primary version.
+    /// }
+    ///
+    /// If the KMS provider is "gcp" the masterKey is required and has the following fields:
+    ///
+    /// {
+    ///    projectId: String,
+    ///    location: String,
+    ///    keyRing: String,
+    ///    keyName: String,
+    ///    keyVersion: Optional<String>, // A specific version of the named key, defaults to using
+    ///    the key's primary version.
+    ///    endpoint: Optional<String> // Host with optional port. Defaults to
+    ///    "cloudkms.googleapis.com".
+    /// }
+    ///
+    /// If the KMS provider is "kmip" the masterKey is required and has the following fields:
+    ///
+    /// {
+    //     keyId: Optional<String>, // keyId is the KMIP Unique Identifier to a 96 byte KMIP Secret
+    //                              // Data managed object.If keyId is omitted, the driver creates a
+    //                              // random 96 byte KMIP Secret Data managed object.
+    //     endpoint: Optional<String> // Host with optional port.
+    /// }
+    ///
+    /// If the KMS provider is "local" the masterKey is not applicable.
+    ///
+    /// @param master_key
+    ///   The document representing the master key.
+    ///
+    /// @return
+    ///   A reference to this object.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption-key-management/
+    ///
+    data_key& master_key(bsoncxx::document::view_or_value master_key);
+
+    ///
+    /// Gets the master key.
+    ///
+    /// @return
+    ///   An optional document containing the master key.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& master_key() const;
+
+    ///
+    /// Sets an optional list of string alternate names used to reference the key.
+    /// If a key is created with alternate names, then encryption may refer to the
+    /// key by the unique alternate name instead of by _id.
+    ///
+    /// @param key_alt_names
+    ///   The alternate names for the key.
+    ///
+    /// @return
+    ///   A reference to this object.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/getClientEncryption/
+    ///
+    data_key& key_alt_names(std::vector<std::string> key_alt_names);
+
+    ///
+    /// Gets the alternate names for the data key.
+    ///
+    /// @return
+    ///   The alternate names for the data key.
+    ///
+    const std::vector<std::string>& key_alt_names() const;
+
+   private:
+    friend class mongocxx::client_encryption;
+    MONGOCXX_PRIVATE void* convert() const;
+
+    stdx::optional<bsoncxx::document::view_or_value> _master_key;
+    std::vector<std::string> _key_alt_names;
+};
+
+}  // namespace options
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/delete.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/delete.hpp
new file mode 100644
index 0000000..3418c09
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/delete.hpp
@@ -0,0 +1,159 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB delete operation
+///
+class MONGOCXX_API delete_options {
+   public:
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    delete_options& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    delete_options& write_concern(write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_options& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_options& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    delete_options& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp
new file mode 100644
index 0000000..cac9920
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/distinct.hpp
@@ -0,0 +1,141 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <string>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB distinct command.
+///
+class MONGOCXX_API distinct {
+   public:
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the comment for this operation.
+    ///
+    /// @param comment
+    ///   The new comment.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// The current comment for this operation.
+    ///
+    /// @return The current comment
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    distinct& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/distinct/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<class read_preference> _read_preference;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp
new file mode 100644
index 0000000..db61b41
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/encrypt.hpp
@@ -0,0 +1,132 @@
+// Copyright 2020 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_encryption;
+
+namespace options {
+
+///
+/// Class representing options for explicit client-side encryption.
+///
+class MONGOCXX_API encrypt {
+   public:
+    ///
+    /// Sets the key to use for this encryption operation. A key id can be used instead
+    /// of a key alt name.
+    ///
+    /// If a non-owning bson_value::view is passed in as the key_id, the object that owns
+    /// key_id's memory must outlive this object.
+    ///
+    /// @param key_id
+    ///   The id of the key to use for encryption, as a bson_value containing a
+    ///   UUID (BSON binary subtype 4).
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/security-client-side-encryption/
+    ///
+    encrypt& key_id(bsoncxx::types::bson_value::view_or_value key_id);
+
+    ///
+    /// Sets a name by which to lookup a key from the key vault collection to use
+    /// for this encryption operation. A key alt name can be used instead of a key id.
+    ///
+    /// @param name
+    ///   The name of the key to use for encryption.
+    ///
+    /// @return
+    ///   A reference to this obejct to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/method/getClientEncryption/
+    ///
+    encrypt& key_alt_name(std::string name);
+
+    ///
+    /// Gets the current key alt name.
+    ///
+    /// @return
+    ///   An optional key name.
+    ///
+    const stdx::optional<std::string>& key_alt_name() const;
+
+    ///
+    /// Determines which AEAD_AES_256_CBC algorithm to use with HMAC_SHA_512 when
+    /// encrypting data.
+    ///
+    enum class encryption_algorithm : std::uint8_t {
+        ///
+        /// Use deterministic encryption.
+        ///
+        k_deterministic,
+
+        ///
+        /// Use randomized encryption.
+        ///
+        k_random
+    };
+
+    ///
+    /// Sets the algorithm to use for encryption.
+    ///
+    /// @param algorithm
+    ///   An algorithm, either deterministic or random, to use for encryption.
+    ///
+    /// @see
+    /// https://docs.mongodb.com/manual/core/security-client-side-encryption/#encryption-algorithms
+    ///
+    encrypt& algorithm(encryption_algorithm algorithm);
+
+    ///
+    /// Gets the current algorithm.
+    ///
+    /// @return
+    ///   An optional algorithm.
+    ///
+    const stdx::optional<encryption_algorithm>& algorithm() const;
+
+    ///
+    /// Gets the key_id.
+    ///
+    /// @return
+    ///   An optional owning bson_value containing the key_id.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& key_id() const;
+
+   private:
+    friend class mongocxx::client_encryption;
+    MONGOCXX_PRIVATE void* convert() const;
+
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _key_id;
+    stdx::optional<std::string> _key_alt_name;
+    stdx::optional<encryption_algorithm> _algorithm;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp
new file mode 100644
index 0000000..496fd1d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/estimated_document_count.hpp
@@ -0,0 +1,114 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+namespace options {
+
+///
+/// Class representing the optional arguments to mongocxx::collection::estimated_document_count
+///
+class MONGOCXX_API estimated_document_count {
+   public:
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    estimated_document_count& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    const bsoncxx::stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the comment for this operation.
+    ///
+    /// @param comment
+    ///   The new comment.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    estimated_document_count& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// The current comment for this operation.
+    ///
+    /// @return The current comment
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    const bsoncxx::stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    estimated_document_count& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return the current read_preference
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/count/
+    ///
+    const bsoncxx::stdx::optional<class read_preference>& read_preference() const;
+
+   private:
+    bsoncxx::stdx::optional<std::chrono::milliseconds> _max_time;
+    bsoncxx::stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    bsoncxx::stdx::optional<class read_preference> _read_preference;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find.hpp
new file mode 100644
index 0000000..0323855
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find.hpp
@@ -0,0 +1,586 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/cursor.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/read_preference.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB query.
+///
+class MONGOCXX_API find {
+   public:
+    ///
+    /// Enables writing to temporary files on the server. When set to true, the server
+    /// can write temporary data to disk while executing the find operation.
+    ///
+    /// This option is sent only if the caller explicitly provides a value. The default
+    /// is to not send a value.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @param allow_disk_use
+    ///   Whether to allow writing temporary files on the server.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& allow_disk_use(bool allow_disk_use);
+
+    ///
+    /// Gets the current setting for allowing disk use on the server.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @return Whether disk use on the server is allowed.
+    ///
+    const stdx::optional<bool>& allow_disk_use() const;
+
+    ///
+    /// Sets whether to allow partial results from a mongos if some shards are down (instead of
+    /// throwing an error).
+    ///
+    /// @param allow_partial
+    ///   Whether to allow partial results from mongos.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& allow_partial_results(bool allow_partial);
+
+    ///
+    /// Gets the current setting for allowing partial results from mongos.
+    ///
+    /// @return Whether partial results from mongos are allowed.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& allow_partial_results() const;
+
+    ///
+    /// Sets the number of documents to return per batch.
+    ///
+    /// @param batch_size
+    ///   The size of the batches to request.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& batch_size(std::int32_t batch_size);
+
+    ///
+    /// The current batch size setting.
+    ///
+    /// @return The current batch size.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::int32_t>& batch_size() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Attaches a comment to the query. If $comment also exists in the modifiers document then
+    /// the comment field overwrites $comment.
+    ///
+    /// @deprecated use comment_option instead.
+    ///
+    /// @param comment
+    ///   The comment to attach to this query.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& comment(bsoncxx::string::view_or_value comment);
+
+    ///
+    /// Gets the current comment attached to this query.
+    ///
+    /// @deprecated use comment_option instead.
+    ///
+    /// @return The comment attached to this query.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& comment() const;
+
+    ///
+    /// Indicates the type of cursor to use for this query.
+    ///
+    /// @param cursor_type
+    ///   The cursor type to set.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& cursor_type(cursor::type cursor_type);
+
+    ///
+    /// Gets the current cursor type.
+    ///
+    /// @return The current cursor type.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<cursor::type>& cursor_type() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @note Not to be confused with the $comment query modifier.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& comment_option(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @note Not to be confused with the $comment query modifier.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment_option() const;
+
+    ///
+    /// Sets maximum number of documents to return.
+    ///
+    /// @param limit
+    ///   The maximum number of documents to return.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& limit(std::int64_t limit);
+
+    ///
+    /// Gets the current limit.
+    ///
+    /// @return The current limit.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::int64_t>& limit() const;
+
+    ///
+    /// Gets the current exclusive upper bound for a specific index.
+    ///
+    /// @param max
+    ///   The exclusive upper bound for a specific index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& max(bsoncxx::document::view_or_value max);
+
+    ///
+    /// Sets the current exclusive upper bound for a specific index.
+    ///
+    /// @return The exclusive upper bound for a specific index.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& max() const;
+
+    ///
+    /// The maximum amount of time for the server to wait on new documents to satisfy a tailable
+    /// cursor query. This only applies to a TAILABLE_AWAIT cursor. When the cursor is not a
+    /// TAILABLE_AWAIT cursor, this option is ignored. The default on the server is to wait for one
+    /// second.
+    ///
+    /// @note On servers < 3.2, this option is ignored.
+    ///
+    /// @param max_await_time
+    ///   The max amount of time (in milliseconds) to wait for new documents.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& max_await_time(std::chrono::milliseconds max_await_time);
+
+    ///
+    /// The maximum amount of time for the server to wait on new documents to satisfy a tailable
+    /// cursor query.
+    ///
+    /// @return The current max await time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_await_time() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time_ms setting.
+    ///
+    /// @return The current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Gets the current inclusive lower bound for a specific index.
+    ///
+    /// @param min
+    ///   The inclusive lower bound for a specific index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& min(bsoncxx::document::view_or_value min);
+
+    ///
+    /// Sets the current inclusive lower bound for a specific index.
+    ///
+    /// @return The inclusive lower bound for a specific index.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& min() const;
+
+    ///
+    /// Sets the cursor flag to prevent cursor from timing out server-side due to a period of
+    /// inactivity.
+    ///
+    /// @param no_cursor_timeout
+    ///   When true prevents the cursor from timing out.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& no_cursor_timeout(bool no_cursor_timeout);
+
+    ///
+    /// Gets the current no_cursor_timeout setting.
+    ///
+    /// @return The current no_cursor_timeout setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& no_cursor_timeout() const;
+
+    ///
+    /// Sets a projection which limits the returned fields for all matching documents.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection set on this query.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Sets the read_preference for this operation.
+    ///
+    /// @param rp
+    ///   The new read_preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& read_preference(class read_preference rp);
+
+    ///
+    /// The current read_preference for this operation.
+    ///
+    /// @return
+    ///   The current read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+    ///
+    /// Sets whether to return the index keys associated with the query results, instead of the
+    /// actual query results themselves.
+    ///
+    /// @param return_key
+    ///   Whether to return the index keys associated with the query results, instead of the actual
+    ///   query results themselves.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& return_key(bool return_key);
+
+    ///
+    /// Gets the current setting for returning the index keys associated with the query results,
+    /// instead of the actual query results themselves.
+    ///
+    /// @return
+    ///   Whether index keys associated with the query results are returned, instead of the actual
+    ///   query results themselves.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& return_key() const;
+
+    ///
+    /// Sets whether to include the record identifier for each document in the query results.
+    ///
+    /// @param show_record_id
+    ///   Whether to include the record identifier.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& show_record_id(bool show_record_id);
+
+    ///
+    /// Gets the current setting for whether the record identifier is returned for each document in
+    /// the query results.
+    ///
+    /// @return
+    ///   Whether the record identifier is included.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bool>& show_record_id() const;
+
+    ///
+    /// Sets the number of documents to skip before returning results.
+    ///
+    /// @param skip
+    ///   The number of documents to skip.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& skip(std::int64_t skip);
+
+    ///
+    /// Gets the current number of documents to skip.
+    ///
+    /// @return The number of documents to skip.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<std::int64_t>& skip() const;
+
+    ///
+    /// The order in which to return matching documents. If $orderby also exists in the modifiers
+    /// document, the sort field takes precedence over $orderby.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    find& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering for this query.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/find/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+   private:
+    stdx::optional<bool> _allow_disk_use;
+    stdx::optional<bool> _allow_partial_results;
+    stdx::optional<std::int32_t> _batch_size;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bsoncxx::string::view_or_value> _comment;
+    stdx::optional<cursor::type> _cursor_type;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment_option;
+    stdx::optional<std::int64_t> _limit;
+    stdx::optional<bsoncxx::document::view_or_value> _max;
+    stdx::optional<std::chrono::milliseconds> _max_await_time;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _min;
+    stdx::optional<bool> _no_cursor_timeout;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<class read_preference> _read_preference;
+    stdx::optional<bool> _return_key;
+    stdx::optional<bool> _show_record_id;
+    stdx::optional<std::int64_t> _skip;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp
new file mode 100644
index 0000000..bc3c537
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp
@@ -0,0 +1,235 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB find_and_modify delete operation
+///
+class MONGOCXX_API find_one_and_delete {
+   public:
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of running time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return the current max time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets a projection that limits the fields to return.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection set on this operation.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Sets the order to search for a matching document.
+    ///
+    /// @warning This can influence which document the operation modifies if the provided filter
+    /// selects multiple documents.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_delete& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_delete& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_delete& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_delete& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+    stdx::optional<mongocxx::write_concern> _write_concern;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp
new file mode 100644
index 0000000..889207a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_replace.hpp
@@ -0,0 +1,318 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/options/find_one_common_options.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB find_and_modify replace operation
+///
+class MONGOCXX_API find_one_and_replace {
+   public:
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Whether or not to bypass document validation for this operation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current setting for bypassing document validation.
+    ///
+    /// @return the current bypass document validation setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_replace& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_replace& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_replace& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return the current max allowed running time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets a projection, which limits the fields to return.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection for this operation.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Set the desired version of the replaced document to return, either the original
+    /// document, or the replacement. By default, the original document is returned.
+    ///
+    /// @param return_document
+    ///   Version of document to return, either original or replaced.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    find_one_and_replace& return_document(return_document return_document);
+
+    ///
+    /// Which version of the replaced document to return.
+    ///
+    /// @return Version of document to return, either original or replacement.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    const stdx::optional<mongocxx::options::return_document>& return_document() const;
+
+    ///
+    /// Sets the order by which to search the collection for a matching document.
+    ///
+    /// @warning This can influence which document the operation modifies if the provided filter
+    /// selects multiple documents.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+    ///
+    /// Sets the upsert flag on the operation. When @c true, the operation creates a new document if
+    /// no document matches the filter. When @c false, this operation will do nothing if there are
+    /// no matching documents. The server-side default is false.
+    ///
+    /// @param upsert
+    ///   Whether or not to perform an upsert.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& upsert(bool upsert);
+
+    ///
+    /// Gets the current upsert setting.
+    ///
+    /// @return The current upsert setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_replace& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<mongocxx::options::return_document> _return_document;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+    stdx::optional<bool> _upsert;
+    stdx::optional<mongocxx::write_concern> _write_concern;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp
new file mode 100644
index 0000000..89f19d4
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_and_update.hpp
@@ -0,0 +1,345 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/options/find_one_common_options.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB find_and_modify update operation.
+///
+class MONGOCXX_API find_one_and_update {
+   public:
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Whether or not to bypass document validation for this operation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// The current setting for bypassing document validation.
+    ///
+    /// @return the current bypass document validation setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_update& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_update& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    find_one_and_update& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return the current max allowed running time (in milliseconds).
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets a projection, which limits the fields to return.
+    ///
+    /// @param projection
+    ///   The projection document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& projection(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Gets the current projection for this operation.
+    ///
+    /// @return The current projection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& projection() const;
+
+    ///
+    /// Set the desired version of the updated document to return, either the original
+    /// document, or the updated. By default, the original document is returned.
+    ///
+    /// @param return_document
+    ///   Version of document to return, either original or updated.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    find_one_and_update& return_document(return_document return_document);
+
+    ///
+    /// Which version of the updated document to return.
+    ///
+    /// @return Version of document to return, either original or updated.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    /// @see mongocxx::options::return_document
+    ///
+    const stdx::optional<mongocxx::options::return_document>& return_document() const;
+
+    ///
+    /// Sets the order by which to search the collection for a matching document.
+    ///
+    /// @warning This can influence which document the operation modifies if the provided filter
+    /// selects multiple documents.
+    ///
+    /// @param ordering
+    ///   Document describing the order of the documents to be returned.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Gets the current sort ordering.
+    ///
+    /// @return The current sort ordering.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& sort() const;
+
+    ///
+    /// Sets the upsert flag on the operation. When @c true, the operation creates a new document if
+    /// no document matches the filter. When @c false, this operation will do nothing if there are
+    /// no matching documents. The server-side default is false.
+    ///
+    /// @param upsert
+    ///   Whether or not to perform an upsert.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& upsert(bool upsert);
+
+    ///
+    /// Gets the current upsert setting.
+    ///
+    /// @return The current upsert setting.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+    ///
+    /// Set array filters for this operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    find_one_and_update& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+    stdx::optional<std::chrono::milliseconds> _max_time;
+    stdx::optional<bsoncxx::document::view_or_value> _projection;
+    stdx::optional<mongocxx::options::return_document> _return_document;
+    stdx::optional<bsoncxx::document::view_or_value> _ordering;
+    stdx::optional<bool> _upsert;
+    stdx::optional<mongocxx::write_concern> _write_concern;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp
new file mode 100644
index 0000000..482097c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/find_one_common_options.hpp
@@ -0,0 +1,38 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Enum representing whether to return the old or new version of a document modified by a
+/// `findOneAndModify` operation.
+///
+enum class return_document {
+    /// Return the version of the document before the modification takes place.
+    k_before,
+    /// Return the version of the document after the modification takes place.
+    k_after,
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp
new file mode 100644
index 0000000..2e771c8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/gridfs/bucket.hpp
@@ -0,0 +1,160 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+namespace gridfs {
+
+///
+/// Class representing the optional arguments to a MongoDB GridFS bucket creation operation.
+///
+class MONGOCXX_API bucket {
+   public:
+    ///
+    /// Sets the name of the bucket. Defaults to 'fs'.
+    ///
+    /// @param bucket_name
+    ///   The name of the bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    bucket& bucket_name(std::string bucket_name);
+
+    ///
+    /// Gets the name of the bucket.
+    ///
+    /// @return
+    ///   The name of the bucket.
+    ///
+    const stdx::optional<std::string>& bucket_name() const;
+
+    ///
+    /// Sets the size of the chunks in the bucket. This will be used as the chunk size for files
+    /// uploaded through the bucket without a custom size specified. Defaults to 255KB (255 * 1024).
+    ///
+    /// @param chunk_size_bytes
+    ///   The size of the chunks in bytes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    bucket& chunk_size_bytes(std::int32_t chunk_size_bytes);
+
+    ///
+    /// Gets the size of the chunks in the bucket.
+    ///
+    /// @return
+    ///   The size of the chunks in the bucket in bytes.
+    ///
+    const stdx::optional<std::int32_t>& chunk_size_bytes() const;
+
+    ///
+    /// Sets the read concern to be used when reading from the bucket. Defaults to the read
+    /// concern of the database containing the bucket's collections.
+    ///
+    /// @param read_concern
+    ///   The read concern of the bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bucket& read_concern(class read_concern read_concern);
+
+    ///
+    /// Gets the read concern of the bucket.
+    ///
+    /// @return
+    ///   The read concern of the bucket.
+    ///
+    const stdx::optional<class read_concern>& read_concern() const;
+
+    ///
+    /// Sets the read preference to be used when reading from the GridFS bucket. Defaults to the
+    /// read preference of the database containing the bucket's collections.
+    ///
+    /// @note
+    ///   Because many GridFS operations require multiple independent reads from separate
+    ///   collections, use with secondaries is strongly discouraged because reads could go to
+    ///   different secondaries, resulting in inconsistent data if all file and chunk documents have
+    ///   not replicated to all secondaries.
+    ///
+    /// @param read_preference
+    ///   The read preference of the GridFS bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bucket& read_preference(class read_preference read_preference);
+
+    ///
+    /// Gets the read preference of the bucket.
+    ///
+    /// @return
+    ///   The read preference of the bucket.
+    ///
+    const stdx::optional<class read_preference>& read_preference() const;
+
+    ///
+    /// Sets the write concern to be used when writing to the GridFS bucket. Defaults to the write
+    /// concern of the database containing the bucket's collections.
+    ///
+    /// @param write_concern
+    ///   The write concern of the GridFS bucket.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    bucket& write_concern(class write_concern write_concern);
+
+    ///
+    /// Gets the write concern of the bucket.
+    ///
+    /// @return
+    ///   The write concern of the bucket.
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+   private:
+    stdx::optional<std::string> _bucket_name;
+    stdx::optional<std::int32_t> _chunk_size_bytes;
+    stdx::optional<class read_concern> _read_concern;
+    stdx::optional<class read_preference> _read_preference;
+    stdx::optional<class write_concern> _write_concern;
+};
+
+}  // namespace gridfs
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp
new file mode 100644
index 0000000..2f5e88e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/gridfs/upload.hpp
@@ -0,0 +1,85 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+namespace gridfs {
+
+///
+/// Class representing the optional arguments to a MongoDB GridFS upload operation.
+///
+class MONGOCXX_API upload {
+   public:
+    ///
+    /// Sets the chunk size of the GridFS file being uploaded. Defaults to the chunk size specified
+    /// in options::gridfs::bucket.
+    ///
+    /// @param chunk_size_bytes
+    ///   The size of the chunks in bytes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    upload& chunk_size_bytes(std::int32_t chunk_size_bytes);
+
+    ///
+    /// Gets the chunk size of the GridFS file being uploaded.
+    ///
+    /// @return
+    ///   The chunk size of the GridFS file being uploaded in bytes.
+    ///
+    const stdx::optional<std::int32_t>& chunk_size_bytes() const;
+
+    ///
+    /// Sets the metadata field of the GridFS file being uploaded. A GridFS file can store arbitrary
+    /// metadata in the form of a BSON document.
+    ///
+    /// @param metadata
+    ///   The metadata document for the GridFS file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    upload& metadata(bsoncxx::document::view_or_value metadata);
+
+    ///
+    /// Gets the metadata of the GridFS file being uploaded.
+    ///
+    /// @return
+    ///   The metadata document of the GridFS file.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& metadata() const;
+
+   private:
+    stdx::optional<std::int32_t> _chunk_size_bytes;
+    stdx::optional<bsoncxx::document::view_or_value> _metadata;
+};
+
+}  // namespace gridfs
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/index.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/index.hpp
new file mode 100644
index 0000000..001cf43
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/index.hpp
@@ -0,0 +1,508 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB create index operation.
+///
+/// @see https://docs.mongodb.com/manual/reference/command/createIndexes
+///
+class MONGOCXX_API index {
+   public:
+    ///
+    /// Base class representing the optional storage engine options for indexes.
+    ///
+    class MONGOCXX_API base_storage_options {
+       public:
+        virtual ~base_storage_options();
+
+       private:
+        friend class options::index;
+        MONGOCXX_PRIVATE virtual int type() const = 0;
+    };
+
+    ///
+    /// Class representing the optional WiredTiger storage engine options for indexes.
+    ///
+    class MONGOCXX_API wiredtiger_storage_options final : public base_storage_options {
+       public:
+        ~wiredtiger_storage_options() override;
+
+        ///
+        /// Set the WiredTiger configuration string.
+        ///
+        /// @param config_string
+        ///   The WiredTiger configuration string.
+        ///
+        void config_string(bsoncxx::string::view_or_value config_string);
+
+        ///
+        /// The current config_string setting.
+        ///
+        /// @return The current config_string.
+        ///
+        const stdx::optional<bsoncxx::string::view_or_value>& config_string() const;
+
+       private:
+        friend collection;
+        MONGOCXX_PRIVATE int type() const override;
+        stdx::optional<bsoncxx::string::view_or_value> _config_string;
+    };
+
+    index();
+
+    ///
+    /// Whether or not to build the index in the background so that building the index does not
+    /// block other database activities. The default is to build indexes in the foreground
+    ///
+    /// @param background
+    ///   Whether or not to build the index in the background.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/tutorial/build-indexes-in-the-background/
+    ///
+    index& background(bool background);
+
+    ///
+    /// The current background setting.
+    ///
+    /// @return The current background.
+    ///
+    const stdx::optional<bool>& background() const;
+
+    ///
+    /// Whether or not to create a unique index so that the collection will not accept insertion of
+    /// documents where the index key or keys match an existing value in the index.
+    ///
+    /// @param unique
+    ///   Whether or not to create a unique index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-unique/
+    ///
+    index& unique(bool unique);
+
+    ///
+    /// The current unique setting.
+    ///
+    /// @return The current unique.
+    ///
+    const stdx::optional<bool>& unique() const;
+
+    ///
+    /// Whether or not the index is hidden from the query planner. A hidden index is not evaluated
+    /// as part of query plan selection.
+    ///
+    /// @param hidden
+    ///   Whether or not to create a hidden index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-hidden/
+    ///
+    index& hidden(bool hidden);
+
+    ///
+    /// The current hidden setting.
+    ///
+    /// @return The current hidden.
+    ///
+    const stdx::optional<bool>& hidden() const;
+
+    ///
+    /// The name of the index.
+    ///
+    /// @param name
+    ///   The name of the index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& name(bsoncxx::string::view_or_value name);
+
+    ///
+    /// The current name setting.
+    ///
+    /// @return The current name.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& name() const;
+
+    ///
+    /// Sets the collation for this index.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    index& collation(bsoncxx::document::view collation);
+
+    ///
+    /// Retrieves the current collation for this index.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view>& collation() const;
+
+    ///
+    /// Whether or not to create a sparse index. Sparse indexes only reference documents with the
+    /// indexed fields.
+    ///
+    /// @param sparse
+    ///   Whether or not to create a sparse index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-sparse/
+    ///
+    index& sparse(bool sparse);
+
+    ///
+    /// The current sparse setting.
+    ///
+    /// @return The current sparse setting.
+    ///
+    const stdx::optional<bool>& sparse() const;
+
+    ///
+    /// Optionally used only in MongoDB 3.0.0 and higher. Specifies the storage engine options for
+    /// the index.
+    ///
+    /// @param storage_options
+    ///   The storage engine options for the index.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& storage_options(std::unique_ptr<base_storage_options> storage_options);
+
+    ///
+    /// Optionally used only in MongoDB 3.0.0 and higher. Specifies the WiredTiger-specific storage
+    /// engine options for the index.
+    ///
+    /// @param storage_options
+    ///   The storage engine options for the index.
+    ///
+    index& storage_options(std::unique_ptr<wiredtiger_storage_options> storage_options);
+
+    ///
+    /// Set a value, in seconds, as a TTL to control how long MongoDB retains documents in this
+    /// collection.
+    ///
+    /// @param seconds
+    ///   The amount of time, in seconds, to retain documents.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/index-ttl/
+    ///
+    index& expire_after(std::chrono::seconds seconds);
+
+    ///
+    /// The current expire_after setting.
+    ///
+    /// @return The current expire_after value.
+    ///
+    const stdx::optional<std::chrono::seconds>& expire_after() const;
+
+    ///
+    /// Sets the index version.
+    ///
+    /// @param v
+    ///   The index version.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& version(std::int32_t v);
+
+    ///
+    /// The current index version.
+    ///
+    /// @return The current index version.
+    ///
+    const stdx::optional<std::int32_t>& version() const;
+
+    ///
+    /// For text indexes, sets the weight document. The weight document contains field and weight
+    /// pairs.
+    ///
+    /// @param weights
+    ///   The weight document for text indexes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& weights(bsoncxx::document::view weights);
+
+    ///
+    /// The current weights setting.
+    ///
+    /// @return The current weights.
+    ///
+    const stdx::optional<bsoncxx::document::view>& weights() const;
+
+    ///
+    /// For text indexes, the language that determines the list of stop words and the rules for the
+    /// stemmer and tokenizer.
+    ///
+    /// @param default_language
+    ///   The default language used when creating text indexes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& default_language(bsoncxx::string::view_or_value default_language);
+
+    ///
+    /// The current default_language setting.
+    ///
+    /// @return The current default_language.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& default_language() const;
+
+    ///
+    /// For text indexes, the name of the field, in the collection’s documents, that contains the
+    /// override language for the document.
+    ///
+    /// @param language_override
+    ///   The name of the field that contains the override language for text indexes.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& language_override(bsoncxx::string::view_or_value language_override);
+
+    ///
+    /// The current name of the field that contains the override language for text indexes.
+    ///
+    /// @return The name of the field that contains the override language for text indexes.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& language_override() const;
+
+    ///
+    /// Sets the document for the partial filter expression for partial indexes.
+    ///
+    /// @param partial_filter_expression
+    ///   The partial filter expression document.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& partial_filter_expression(bsoncxx::document::view partial_filter_expression);
+
+    ///
+    /// The current partial_filter_expression setting.
+    ///
+    /// @return The current partial_filter_expression.
+    ///
+    const stdx::optional<bsoncxx::document::view>& partial_filter_expression() const;
+
+    ///
+    /// For 2dsphere indexes, the 2dsphere index version number. Version can be either 1 or 2.
+    ///
+    /// @param twod_sphere_version
+    ///   The 2dsphere index version number.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_sphere_version(std::uint8_t twod_sphere_version);
+
+    ///
+    /// The current twod_sphere_version setting.
+    ///
+    /// @return The current twod_sphere_version.
+    ///
+    const stdx::optional<std::uint8_t>& twod_sphere_version() const;
+
+    ///
+    /// For 2d indexes, the precision of the stored geohash value of the location data.
+    ///
+    /// @param twod_bits_precision
+    ///   The precision of the stored geohash value.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_bits_precision(std::uint8_t twod_bits_precision);
+
+    ///
+    /// The current precision of the stored geohash value of the location data.
+    ///
+    /// @return The precision of the stored geohash value of the location data.
+    ///
+    const stdx::optional<std::uint8_t>& twod_bits_precision() const;
+
+    ///
+    /// For 2d indexes, the lower inclusive boundary for the longitude and latitude values.
+    ///
+    /// @param twod_location_min
+    ///   The lower inclusive boundary.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_location_min(double twod_location_min);
+
+    ///
+    /// The current lower inclusive boundary for the longitude and latitude values.
+    ///
+    /// @return The lower inclusive boundary for the longitude and latitude values.
+    ///
+    const stdx::optional<double>& twod_location_min() const;
+
+    ///
+    /// For 2d indexes, the upper inclusive boundary for the longitude and latitude values.
+    ///
+    /// @param twod_location_max
+    ///   The upper inclusive boundary.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    index& twod_location_max(double twod_location_max);
+
+    ///
+    /// The current upper inclusive boundary for the longitude and latitude values.
+    ///
+    /// @return The upper inclusive boundary for the longitude and latitude values.
+    ///
+    const stdx::optional<double>& twod_location_max() const;
+
+    ///
+    /// For geoHaystack indexes, specify the number of units within which to group the location
+    /// values; i.e. group in the same bucket those location values that are within the specified
+    /// number of units to each other.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/geohaystack/
+    ///
+    /// @param haystack_bucket_size
+    ///   The geoHaystack bucket size.
+    ///
+    /// @deprecated
+    ///   This option is deprecated.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    MONGOCXX_DEPRECATED index& haystack_bucket_size(double haystack_bucket_size);
+    index& haystack_bucket_size_deprecated(double haystack_bucket_size);
+
+    ///
+    /// The current haystack_bucket_size setting.
+    ///
+    /// @return The current haystack_bucket_size.
+    ///
+    /// @deprecated
+    ///   This method is deprecated.
+    ///
+    MONGOCXX_DEPRECATED const stdx::optional<double>& haystack_bucket_size() const;
+    const stdx::optional<double>& haystack_bucket_size_deprecated() const;
+
+    ///
+    /// Conversion operator that provides a view of the options in document form.
+    ///
+    /// @exception mongocxx::logic_error if an invalid expireAfterSeconds field is provided.
+    ///
+    /// @return A view of the current builder contents.
+    ///
+    operator bsoncxx::document::view_or_value();
+
+   private:
+    friend collection;
+
+    stdx::optional<bool> _background;
+    stdx::optional<bool> _unique;
+    stdx::optional<bool> _hidden;
+    stdx::optional<bsoncxx::string::view_or_value> _name;
+    stdx::optional<bsoncxx::document::view> _collation;
+    stdx::optional<bool> _sparse;
+    std::unique_ptr<base_storage_options> _storage_options;
+    stdx::optional<std::chrono::seconds> _expire_after;
+    stdx::optional<std::int32_t> _version;
+    stdx::optional<bsoncxx::document::view> _weights;
+    stdx::optional<bsoncxx::string::view_or_value> _default_language;
+    stdx::optional<bsoncxx::string::view_or_value> _language_override;
+    stdx::optional<bsoncxx::document::view> _partial_filter_expression;
+    stdx::optional<std::uint8_t> _twod_sphere_version;
+    stdx::optional<std::uint8_t> _twod_bits_precision;
+    stdx::optional<double> _twod_location_min;
+    stdx::optional<double> _twod_location_max;
+    stdx::optional<double> _haystack_bucket_size;
+
+    //
+    // Return the current storage_options setting.
+    //
+    const std::unique_ptr<base_storage_options>& storage_options() const;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp
new file mode 100644
index 0000000..448b801
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/index_view.hpp
@@ -0,0 +1,148 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing optional arguments to IndexView operations
+///
+class MONGOCXX_API index_view {
+   public:
+    index_view();
+
+    ///
+    /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
+    ///
+    /// @param max_time
+    ///   The max amount of time (in milliseconds).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    index_view& max_time(std::chrono::milliseconds max_time);
+
+    ///
+    /// The current max_time setting.
+    ///
+    /// @return
+    ///   The current max allowed running time (in milliseconds).
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const bsoncxx::stdx::optional<std::chrono::milliseconds>& max_time() const;
+
+    ///
+    /// Sets the write concern for this operation.
+    ///
+    /// @param write_concern
+    ///   Object representing the write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    index_view& write_concern(mongocxx::write_concern write_concern);
+
+    ///
+    /// Gets the current write concern.
+    ///
+    /// @return
+    ///   The current write concern.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/findAndModify/
+    ///
+    const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern() const;
+
+    ///
+    /// Sets the commit quorum for this operation.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @param commit_quorum
+    ///   Integer representing the minimum number of data-bearing voting replica set members (i.e.
+    ///   commit quorum), including the primary, that must report a successful index build before
+    ///   the primary marks the indexes as ready. A value of @c 0 disables quorum-voting behavior.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes
+    ///
+    index_view& commit_quorum(std::int32_t commit_quorum);
+
+    ///
+    /// Sets the commit quorum for this operation.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @param commit_quorum
+    ///   String representing the minimum number of data-bearing voting replica set members (i.e.
+    ///   commit quorum), including the primary, that must report a successful index build before
+    ///   the primary marks the indexes as ready.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called. This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes
+    ///
+    index_view& commit_quorum(std::string commit_quorum);
+
+    ///
+    /// Gets the current commitQuorum setting.
+    ///
+    /// This option may only be used with MongoDB version 4.4 or later.
+    ///
+    /// @return
+    ///   The current commitQuorum setting.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/command/createIndexes
+    ///
+    const stdx::optional<bsoncxx::document::value> commit_quorum() const;
+
+   private:
+    bsoncxx::stdx::optional<std::chrono::milliseconds> _max_time;
+    bsoncxx::stdx::optional<mongocxx::write_concern> _write_concern;
+    bsoncxx::stdx::optional<bsoncxx::document::value> _commit_quorum;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/insert.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/insert.hpp
new file mode 100644
index 0000000..d5517ba
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/insert.hpp
@@ -0,0 +1,143 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB insert operation
+///
+class MONGOCXX_API insert {
+   public:
+    ///
+    /// Sets the bypass_document_validation option.
+    /// If true, allows the write to opt-out of document level validation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    insert& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// Gets the current value of the bypass_document_validation option.
+    ///
+    /// @return The optional value of the bypass_document_validation option.
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    insert& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return The current write_concern.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// @note: This applies only to insert_many and is ignored for insert_one.
+    ///
+    /// If true, when an insert fails, return without performing the remaining
+    /// writes. If false, when a write fails, continue with the remaining
+    /// writes, if any. Inserts can be performed in any order if this is false.
+    /// Defaults to true.
+    ///
+    /// @param ordered
+    ///   Whether or not the insert_many will be ordered.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    insert& ordered(bool ordered);
+
+    ///
+    /// The current ordered value for this operation.
+    ///
+    /// @return The current ordered value.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    const stdx::optional<bool>& ordered() const;
+
+    ///
+    /// Sets the comment for this operation.
+    ///
+    /// @param comment
+    ///   The new comment.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    insert& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// The current comment for this operation.
+    ///
+    /// @return The current comment.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/insert/
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value>& comment() const;
+
+   private:
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<bool> _ordered;
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/pool.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/pool.hpp
new file mode 100644
index 0000000..668985e
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/pool.hpp
@@ -0,0 +1,55 @@
+// Copyright 2016 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/options/client.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB driver pool object. Pool options
+/// logically extend client options.
+///
+class MONGOCXX_API pool {
+   public:
+    ///
+    /// Constructs a new pool options object. Note that options::pool is implictly convertible from
+    /// options::client.
+    ///
+    /// @param client_opts
+    ///   The client options.
+    ///
+    pool(client client_opts = client());
+
+    ///
+    /// The current client options.
+    ///
+    /// @return The client options.
+    ///
+    const client& client_opts() const;
+
+   private:
+    client _client_opts;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/replace.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/replace.hpp
new file mode 100644
index 0000000..e3c04e7
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/replace.hpp
@@ -0,0 +1,211 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB replace operation.
+///
+class MONGOCXX_API replace {
+   public:
+    ///
+    /// Sets the bypass_document_validation option.
+    /// If true, allows the write to opt-out of document level validation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// Gets the current value of the bypass_document_validation option.
+    ///
+    /// @return The optional value of the bypass_document_validation option.
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    replace& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// By default, if no document matches the filter, the replace operation does nothing.
+    /// However, by specifying upsert as @c true, this operation either updates matching documents
+    /// or inserts a new document using the replace specification if no matching document exists.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server-side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    replace& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    replace& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp
new file mode 100644
index 0000000..cf601d1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/server_api.hpp
@@ -0,0 +1,143 @@
+// Copyright 2021 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class pool;
+
+namespace options {
+
+///
+/// Class representing options for server API.
+///
+class MONGOCXX_API server_api {
+   public:
+    ///
+    /// Enum representing the possible values for server API version.
+    ///
+    enum class version { k_version_1 };
+
+    ///
+    /// Constructs a new server_api object.
+    ///
+    /// The specified API version will be sent to the server. This will cause
+    /// the server to behave in a manner compatible with that API version.
+    /// The driver will behave in a manner compatible with a server configured
+    /// with that API version, regardless of the server's actual release version.
+    ///
+    /// @param version
+    ///   The server api version to send to the server.
+    ///
+    server_api(version version);
+
+    ///
+    /// Converts a version enum value to its string value.
+    ///
+    /// @param version
+    ///   The enum value to convert to a string.
+    ///
+    /// @throws mongocxx::logic_error on an invalid argument
+    ///
+    /// @return
+    ///   The string value of the given enum value.
+    ///
+    static std::string version_to_string(version version);
+
+    ///
+    /// Converts a version string to its enum value.
+    ///
+    /// @param version
+    ///   The string to convert to an enum value.
+    ///
+    /// @throws mongocxx::logic_error on an invalid argument
+    ///
+    /// @return
+    ///   The enum value of the given string.
+    ///
+    static version version_from_string(stdx::string_view version);
+
+    ///
+    /// Sets the strict option, specifying whether the server should return
+    /// errors for features that are not part of the declared API version.
+    ///
+    /// @param strict
+    ///   The value to set strict to.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    server_api& strict(bool strict);
+
+    ///
+    /// Gets the current value of the strict option.
+    ///
+    /// @return
+    ///   The optional value of the strict option.
+    ///
+    const stdx::optional<bool>& strict() const;
+
+    ///
+    /// Sets the deprecation errors option, specifying whether the server should
+    /// return errors for features that are deprecated in the declared API version.
+    ///
+    /// @param deprecation_errors
+    ///   The value to set deprecation errors to.
+    ///
+    /// @return
+    ///   A reference to this object to facilitate method chaining.
+    ///
+    server_api& deprecation_errors(bool deprecation_errors);
+
+    ///
+    /// Gets the current value of the deprecation errors option.
+    ///
+    /// @return
+    ///   The optional value of the deprecation errors option.
+    ///
+    const stdx::optional<bool>& deprecation_errors() const;
+
+    ///
+    /// Gets the declared server api version.
+    ///
+    /// @return
+    ///   The version enum value specifying the declared server api version.
+    ///
+    version get_version() const;
+
+   private:
+    friend class mongocxx::client;
+    friend class mongocxx::pool;
+
+    version _version;
+    stdx::optional<bool> _strict;
+    stdx::optional<bool> _deprecation_errors;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp
new file mode 100644
index 0000000..2b7c1a5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/ssl.hpp
@@ -0,0 +1,40 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <mongocxx/options/tls.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB driver client (SSL)
+///
+/// This class has been renamed to options::tls.
+///
+/// @deprecated use the tls options class instead.
+///
+MONGOCXX_DEPRECATED typedef tls ssl;
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/tls.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/tls.hpp
new file mode 100644
index 0000000..25eff08
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/tls.hpp
@@ -0,0 +1,163 @@
+// Copyright 2019 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <string>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB driver client (TLS)
+///
+class MONGOCXX_API tls {
+   public:
+    ///
+    /// The path to the .pem file containing a public key certificate and its associated private
+    /// key.
+    ///
+    /// @param pem_file
+    ///   The path to the .pem file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& pem_file(bsoncxx::string::view_or_value pem_file);
+
+    ///
+    /// Retrieves the current path to the .pem file.
+    ///
+    /// @return The path to the .pem file.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& pem_file() const;
+
+    ///
+    /// The pass phrase used to decrypt an encrypted PEM file.
+    ///
+    /// @param pem_password
+    ///   The pass phrase.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& pem_password(bsoncxx::string::view_or_value pem_password);
+
+    ///
+    /// Retrieves the current decryption pass phrase.
+    ///
+    /// @return The pass phrase.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& pem_password() const;
+
+    ///
+    /// The path to the .pem file that contains the root certificate chain from the Certificate
+    /// Authority.
+    ///
+    /// @param ca_file
+    ///   The path to the CA file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& ca_file(bsoncxx::string::view_or_value ca_file);
+
+    ///
+    /// Retrieves the current path to the CA file.
+    ///
+    /// @return The path to the CA file.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& ca_file() const;
+
+    ///
+    /// The path to the Certificate Authority directory.
+    ///
+    /// @param ca_dir
+    ///   The path to the CA directory.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& ca_dir(bsoncxx::string::view_or_value ca_dir);
+
+    ///
+    /// Retrieves the current path to the CA directory.
+    ///
+    /// @return The path to the CA directory.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& ca_dir() const;
+
+    ///
+    /// The path to the .pem file that contains revoked certificates.
+    ///
+    /// @param crl_file
+    ///   The path to the PEM file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& crl_file(bsoncxx::string::view_or_value crl_file);
+
+    ///
+    /// Retrieves the current path to the .pem file that contains revoked certificates.
+    ///
+    /// @return The path to the revoked certificates file.
+    ///
+    const stdx::optional<bsoncxx::string::view_or_value>& crl_file() const;
+
+    ///
+    /// If true, the driver will not verify the server's CA file.
+    ///
+    /// @param allow_invalid_certificates
+    ///   Whether or not to check the server's CA file.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    tls& allow_invalid_certificates(bool allow_invalid_certificates);
+
+    ///
+    /// Retrieves whether or not the driver will check the server's CA file.
+    ///
+    /// @return Whether or not the driver will check the server's CA file.
+    ///
+    const stdx::optional<bool>& allow_invalid_certificates() const;
+
+   private:
+    stdx::optional<bsoncxx::string::view_or_value> _pem_file;
+    stdx::optional<bsoncxx::string::view_or_value> _pem_password;
+    stdx::optional<bsoncxx::string::view_or_value> _ca_file;
+    stdx::optional<bsoncxx::string::view_or_value> _ca_dir;
+    stdx::optional<bsoncxx::string::view_or_value> _crl_file;
+    stdx::optional<bool> _allow_invalid_certificates;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp
new file mode 100644
index 0000000..2042359
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/transaction.hpp
@@ -0,0 +1,163 @@
+// Copyright 2018-present MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <memory>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client_session;
+class read_concern;
+class write_concern;
+class read_preference;
+
+namespace options {
+
+///
+/// Class representing the optional arguments for a transaction.
+///
+class MONGOCXX_API transaction {
+   public:
+    transaction();
+
+    ///
+    /// Copy constructs transaction options.
+    ///
+    transaction(const transaction&);
+
+    ///
+    /// Copy assigns transaction options.
+    ///
+    transaction& operator=(const transaction&);
+
+    ///
+    /// Move constructs transaction options.
+    ///
+    transaction(transaction&&) noexcept;
+
+    ///
+    /// Move assigns transaction options.
+    ///
+    transaction& operator=(transaction&&) noexcept;
+
+    ///
+    /// Destroys the transaction options.
+    ///
+    ~transaction() noexcept;
+
+    ///
+    /// Sets the transaction read concern.
+    ///
+    /// @param rc
+    ///   The read concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    transaction& read_concern(const class read_concern& rc);
+
+    ///
+    /// Gets the current transaction read concern.
+    ///
+    /// @return
+    ///    An optional containing the read concern. If the read concern has not been set, a
+    ///    disengaged optional is returned.
+    stdx::optional<class read_concern> read_concern() const;
+
+    ///
+    /// Sets the transaction write concern.
+    ///
+    /// @param wc
+    ///   The write concern.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    transaction& write_concern(const class write_concern& wc);
+
+    ///
+    /// Gets the current transaction write concern.
+    ///
+    /// @return The write concern.
+    ///
+    /// @return
+    ///    An optional containing the write concern. If the write concern has not been set, a
+    ///    disengaged optional is returned.
+    stdx::optional<class write_concern> write_concern() const;
+
+    ///
+    /// Sets the transaction read preference.
+    ///
+    /// @param rp
+    ///   The read preference.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    transaction& read_preference(const class read_preference& rp);
+
+    ///
+    /// Gets the current transaction read preference.
+    ///
+    /// @return
+    ///    An optional containing the read preference. If the read preference has not been set, a
+    ///    disengaged optional is returned.
+    stdx::optional<class read_preference> read_preference() const;
+
+    ///
+    /// Sets the transaction's max commit time, in milliseconds.
+    ///
+    /// @param ms
+    ///   The max commit time in milliseconds.
+    ///
+    /// @return
+    ///   A reference to the object on which this function is being called.
+    ///
+    transaction& max_commit_time_ms(std::chrono::milliseconds ms);
+
+    ///
+    /// Gets the current transaction commit time, in milliseconds.
+    ///
+    /// @return
+    ///   An optional containing the timeout. If the max commit time has not been set,
+    ///   a disengaged optional is returned.
+    ///
+    stdx::optional<std::chrono::milliseconds> max_commit_time_ms() const;
+
+   private:
+    friend class ::mongocxx::client_session;
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE impl& _get_impl();
+    MONGOCXX_PRIVATE const impl& _get_impl() const;
+    std::unique_ptr<impl> _impl;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/update.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/update.hpp
new file mode 100644
index 0000000..5d17b0c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/options/update.hpp
@@ -0,0 +1,236 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <mongocxx/hint.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace options {
+
+///
+/// Class representing the optional arguments to a MongoDB update operation.
+///
+class MONGOCXX_API update {
+   public:
+    ///
+    /// Sets the bypass_document_validation option.
+    /// If true, allows the write to opt-out of document level validation.
+    ///
+    /// @note
+    ///   On servers >= 3.2, the server applies validation by default. On servers < 3.2, this option
+    ///   is ignored.
+    ///
+    /// @param bypass_document_validation
+    ///   Whether or not to bypass document validation
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& bypass_document_validation(bool bypass_document_validation);
+
+    ///
+    /// Gets the current value of the bypass_document_validation option.
+    ///
+    /// @return The optional value of the bypass_document_validation option.
+    ///
+    const stdx::optional<bool>& bypass_document_validation() const;
+
+    ///
+    /// Sets the collation for this operation.
+    ///
+    /// @param collation
+    ///   The new collation.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    update& collation(bsoncxx::document::view_or_value collation);
+
+    ///
+    /// Retrieves the current collation for this operation.
+    ///
+    /// @return
+    ///   The current collation.
+    ///
+    /// @see
+    ///   https://docs.mongodb.com/manual/reference/collation/
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& collation() const;
+
+    ///
+    /// Sets the index to use for this operation.
+    ///
+    /// @note if the server already has a cached shape for this query, it may
+    /// ignore a hint.
+    ///
+    /// @param index_hint
+    ///   Object representing the index to use.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& hint(class hint index_hint);
+
+    ///
+    /// Gets the current hint.
+    ///
+    /// @return The current hint, if one is set.
+    ///
+    const stdx::optional<class hint>& hint() const;
+
+    ///
+    /// Set the value of the let option.
+    ///
+    /// @param let
+    ///   The new let option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& let(bsoncxx::document::view_or_value let);
+
+    ///
+    /// Gets the current value of the let option.
+    ///
+    /// @return
+    ///  The current let option.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value> let() const;
+
+    ///
+    /// Set the value of the comment option.
+    ///
+    /// @param comment
+    ///   The new comment option.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& comment(bsoncxx::types::bson_value::view_or_value comment);
+
+    ///
+    /// Gets the current value of the comment option.
+    ///
+    /// @return
+    ///  The current comment option.
+    ///
+    const stdx::optional<bsoncxx::types::bson_value::view_or_value> comment() const;
+
+    ///
+    /// Sets the upsert option.
+    ///
+    /// By default, if no document matches the filter, the update operation does nothing.
+    /// However, by specifying upsert as @c true, this operation either updates matching documents
+    /// or inserts a new document using the update specification if no matching document exists.
+    ///
+    /// @param upsert
+    ///   If set to @c true, creates a new document when no document matches the query criteria.
+    ///   The server-side default is @c false, which does not insert a new document if a match
+    ///   is not found.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    update& upsert(bool upsert);
+
+    ///
+    /// Gets the current value of the upsert option.
+    ///
+    /// @return The optional value of the upsert option.
+    ///
+    const stdx::optional<bool>& upsert() const;
+
+    ///
+    /// Sets the write_concern for this operation.
+    ///
+    /// @param wc
+    ///   The new write_concern
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    update& write_concern(class write_concern wc);
+
+    ///
+    /// The current write_concern for this operation.
+    ///
+    /// @return
+    ///   The current write_concern
+    ///
+    /// @see https://docs.mongodb.com/manual/core/write-concern/
+    ///
+    const stdx::optional<class write_concern>& write_concern() const;
+
+    ///
+    /// Set array filters for this operation.
+    ///
+    /// @param array_filters
+    ///   Array representing filters determining which array elements to modify.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    update& array_filters(bsoncxx::array::view_or_value array_filters);
+
+    ///
+    /// Get array filters for this operation.
+    ///
+    /// @return
+    ///   The current array filters.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/command/update/
+    ///
+    const stdx::optional<bsoncxx::array::view_or_value>& array_filters() const;
+
+   private:
+    stdx::optional<bool> _bypass_document_validation;
+    stdx::optional<bsoncxx::document::view_or_value> _collation;
+    stdx::optional<bool> _upsert;
+    stdx::optional<class write_concern> _write_concern;
+    stdx::optional<bsoncxx::array::view_or_value> _array_filters;
+    stdx::optional<class hint> _hint;
+    stdx::optional<bsoncxx::document::view_or_value> _let;
+    stdx::optional<bsoncxx::types::bson_value::view_or_value> _comment;
+};
+
+}  // namespace options
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/pipeline.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/pipeline.hpp
new file mode 100644
index 0000000..483c664
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/pipeline.hpp
@@ -0,0 +1,558 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+#include <string>
+
+#include <bsoncxx/array/view.hpp>
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+
+///
+/// Class representing a MongoDB aggregation pipeline.
+///
+class MONGOCXX_API pipeline {
+   public:
+    ///
+    /// Creates a new aggregation pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/aggregation-pipeline/
+    ///
+    pipeline();
+
+    ///
+    /// Move constructs a pipeline.
+    ///
+    pipeline(pipeline&&) noexcept;
+
+    ///
+    /// Move assigns a pipeline.
+    ///
+    pipeline& operator=(pipeline&&) noexcept;
+
+    ///
+    /// Destroys a pipeline.
+    ///
+    ~pipeline();
+
+    ///
+    /// Adds new fields to documents.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/addFields/
+    ///
+    /// @param fields_to_add
+    ///   A document specifying the fields to add.  For each field specified in this parameter, a
+    ///   corresponding field will be added to the documents, where the value of the added field is
+    ///   the result of evaluating the specified expression.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& add_fields(bsoncxx::document::view_or_value fields_to_add);
+
+    ///
+    /// Categorizes documents into groups, called buckets, based on a specified expression and
+    /// bucket boundaries.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/bucket/
+    ///
+    /// @param bucket_args
+    ///   The specification for the bucket operation.  The required fields `groupBy` and
+    ///   `boundaries` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& bucket(bsoncxx::document::view_or_value bucket_args);
+
+    ///
+    /// Categorizes documents into a specific number of groups, called buckets, based on a
+    /// specified expression.  Bucket boundaries are automatically determined in an attempt to
+    /// evenly distribute the documents into the specified number of buckets.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/
+    ///
+    /// @param bucket_auto_args
+    ///   The specification for the bucket_auto operation.  This required fields `groupBy` and
+    ///   `buckets` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& bucket_auto(bsoncxx::document::view_or_value bucket_auto_args);
+
+    ///
+    /// Returns statistics regarding a collection or view.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/collStats/
+    ///
+    /// @param coll_stats_args
+    ///   The specification for the coll_stats operation.  See link above for a list of valid
+    ///   options.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& coll_stats(
+        bsoncxx::document::view_or_value coll_stats_args = bsoncxx::document::view{});
+
+    ///
+    /// Returns a document containing a count of the number of documents input to the stage.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/count/
+    ///
+    /// @param field
+    ///   Name of the field for the count to be written to.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& count(std::string field);
+
+    ///
+    /// Returns a stream of documents containing information on active and/or dormant
+    /// operations as well as inactive sessions that are holding locks as part of a
+    /// transaction. The stage returns a document for each operation or session.
+    ///
+    /// This stage must be used with database aggregate on the 'admin' database.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/currentOp/
+    ///
+    /// @param current_op_args
+    ///   A document containing the arguments for the current_op operation.
+    ///
+    /// @return
+    ///   A reference to the object on which this method is being called.
+    ///
+    pipeline& current_op(bsoncxx::document::view_or_value current_op_args);
+
+    ///
+    /// Processes multiple aggregation pipelines within a single stage on the same set of input
+    /// documents.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/facet/
+    ///
+    /// @param facet_args
+    ///   The specification for the facet operation.  Each field in the the provided document should
+    ///   specify an aggregation pipeline, as an array.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& facet(bsoncxx::document::view_or_value facet_args);
+
+    ///
+    /// Appends a stage to this pipeline object.
+    ///
+    /// Use this method to run new pipeline stages that are not yet offered as
+    /// explicit methods on this class. Pass in a document describing a
+    /// pipeline stage:
+    ///
+    ///    { "$addFields" : { "field" : 0 }}
+    ///
+    /// @param stage
+    ///   A bson document view or value describing a pipeline stage.
+    ///
+    /// @return
+    ///   A reference to this object on which this member function is being called.
+    ///
+    pipeline& append_stage(bsoncxx::document::view_or_value stage);
+
+    ///
+    /// Appends stages to this pipeline object from the given bson array.
+    ///
+    /// Use this method to run new pipeline stages that are not yet offered as
+    /// explicit methods on this class. Pass in an array of documents, where each
+    /// document in the array describes a pipeline stage:
+    ///
+    ///    [ { "$addFields" : { "field" : 0 } }, { "$newStage" : ... }, ... ]
+    ///
+    /// @param stages
+    ///   A bson array containing documents describing pipeline stages.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    pipeline& append_stages(bsoncxx::array::view_or_value stages);
+
+    ///
+    /// Outputs documents in order of nearest to farthest from a specified point.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/geoNear/
+    ///
+    /// @param geo_near_args
+    ///   The specification for the geo_near operation.  The required fields `near` and
+    ///   `distanceField` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& geo_near(bsoncxx::document::view_or_value geo_near_args);
+
+    ///
+    /// Performs a recursive search on a collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/graphLookup/
+    ///
+    /// @param graph_lookup_args
+    ///   The specification for the graph_lookup operation.  The required fields `from`,
+    ///   `connectFromField`, `startWith`, `connectToField`, and `as` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& graph_lookup(bsoncxx::document::view_or_value graph_lookup_args);
+
+    ///
+    /// Groups documents by some specified expression and outputs to the next stage a
+    /// document for each distinct grouping. The output documents contain an `_id` field
+    /// which contains the the distinct key for that group. The output documents can also
+    /// contain computed fields that hold the values of some accumulator expression grouped
+    /// by the group's `_id` field.
+    ///
+    /// @note group does not order output documents.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/group/
+    ///
+    /// @param group_args
+    ///   The specification for the group operation.  The required field `_id` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& group(bsoncxx::document::view_or_value group_args);
+
+    ///
+    /// Returns statistics regarding the use of each index for the collection.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/indexStats/
+    ///
+    pipeline& index_stats();
+
+    ///
+    /// Limits the number of documents passed to the next stage in the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/limit/
+    ///
+    /// @param limit
+    ///   The number of documents to which output should be limited.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& limit(std::int32_t limit);
+
+    ///
+    /// Lists the sessions cached in memory by the mongod or mongos instance.
+    ///
+    /// This option must be used with database aggregate.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/listLocalSessions/
+    ///
+    /// @param list_local_sessions_args
+    ///   A document containing the arguments for list_local_sessions.
+    ///
+    /// @return
+    ///   A reference to the object on which this method is being called.
+    ///
+    pipeline& list_local_sessions(bsoncxx::document::view_or_value list_local_sessions_args);
+
+    ///
+    /// Lists all sessions stored in the system.sessions collection in the config database.
+    /// These sessions are visible to all members of the MongoDB deployment.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/listSessions/
+    ///
+    /// @param list_sessions_args
+    ///   A document containing the arguments for list_sessions.
+    ///
+    /// @return
+    ///   A reference to the object on which this method is being called.
+    ///
+    pipeline& list_sessions(bsoncxx::document::view_or_value list_sessions_args);
+
+    ///
+    /// Performs a left outer join to an unsharded collection in the same database to filter in
+    /// documents from the "joined" collection for processing.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/lookup/
+    ///
+    /// @param lookup_args
+    ///   The specification for the lookup operation.  The required fields `from`, `localField`,
+    ///   `foreignField`, and `as` must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& lookup(bsoncxx::document::view_or_value lookup_args);
+
+    ///
+    /// Filters the documents. Only the documents that match the condition(s) specified by the
+    /// `filter` will continue to the next pipeline stage.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/match/
+    ///
+    /// @param filter
+    ///   The filter.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& match(bsoncxx::document::view_or_value filter);
+
+    ///
+    /// Outputs the aggregation results to a collection.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/merge/
+    ///
+    /// @param merge_args
+    ///   The specification for the merge options. Must include an `into` field that
+    ///   is either a collection name or a subdocument of the form:
+    ///   { `db` : &lt;db name&gt;, `coll` : &lt;collection name&gt; }.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.
+    ///
+    pipeline& merge(bsoncxx::document::view_or_value merge_args);
+
+    ///
+    /// Takes documents returned by the aggregation pipeline and writes them to a specified
+    /// collection. This stage must be the last stage in the pipeline. The out operator lets the
+    /// aggregation framework return result sets of any size.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/out/
+    ///
+    /// @param collection_name
+    ///   The name of the collection where the output documents should go.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& out(std::string collection_name);
+
+    ///
+    /// Projects a subset of the fields in the documents to the next stage of the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/project/
+    ///
+    /// @param projection
+    ///   The projection specification.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& project(bsoncxx::document::view_or_value projection);
+
+    ///
+    /// Restricts the contents of the documents based on information stored in the documents
+    /// themselves.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/redact/
+    ///
+    /// @param restrictions
+    ///   The document restrictions.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& redact(bsoncxx::document::view_or_value restrictions);
+
+    ///
+    /// Promotes a specified document to the top level and replaces all other fields.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/replaceRoot/
+    ///
+    /// @param replace_root_args
+    ///   The specification for the replace_root operation.  The required field `newRoot` must be
+    ///   included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& replace_root(bsoncxx::document::view_or_value replace_root_args);
+
+    ///
+    /// Randomly selects the specified number of documents that pass into the stage and passes the
+    /// remaining documents to the next stage in the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sample/
+    ///
+    /// @param size
+    ///   The number of input documents to select.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& sample(std::int32_t size);
+
+    ///
+    /// Skips over the specified number of documents that pass into the stage and passes the
+    /// remaining documents to the next stage in the pipeline.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/skip/
+    ///
+    /// @param docs_to_skip
+    ///   The number of input documents to skip.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& skip(std::int32_t docs_to_skip);
+
+    ///
+    /// Sorts all input documents and returns them to the pipeline in sorted order.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sort/
+    ///
+    /// @param ordering
+    ///   Document specifying the ordering by which the documents are sorted.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    pipeline& sort(bsoncxx::document::view_or_value ordering);
+
+    ///
+    /// Groups incoming documents based on the value of a specified expression, then computes the
+    /// count of documents in each distinct group.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/
+    ///
+    /// @param field_expression
+    ///   The expression to group by, as an object.  The expression can not evaluate to an object.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of sort_by_count() is intended to be used when the desired sort is over a
+    ///   grouping of the result of a complex expression computed from the input documents.
+    ///
+    pipeline& sort_by_count(bsoncxx::document::view_or_value field_expression);
+
+    ///
+    /// Groups incoming documents based on the value of a specified expression, then computes the
+    /// count of documents in each distinct group.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/
+    ///
+    /// @param field_expression
+    ///   The expression to group by, as a string.  To specify a field path, prefix the field path
+    ///   with a dollar sign (`$`).
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of sort_by_count() is intended to be used when the desired sort is over a
+    ///   grouping of the value of a particular element in the input documents.
+    ///
+    pipeline& sort_by_count(std::string field_expression);
+
+    ///
+    /// Deconstructs an array field from the input documents to output a document for each element.
+    /// Each output document is an input document with the value of its array field replaced by
+    /// an element from the unwound array.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/unwind/
+    ///
+    /// @param unwind_args
+    ///   The specification for the unwind operation.  The required field path must be included.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of unwind() is intended to be used when additional options other than the
+    ///   field name need to be specified.
+    ///
+    pipeline& unwind(bsoncxx::document::view_or_value unwind_args);
+
+    ///
+    /// Deconstructs an array field from the input documents to output a document for each element.
+    /// Each output document is an input document with the value of its array field replaced by
+    /// an element from the unwound array.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/operator/aggregation/unwind/
+    ///
+    /// @param field_name
+    ///   The name of the field to unwind.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @note
+    ///   This overload of unwind() is intended to be used when no options other than the field name
+    ///   need to be specified.
+    ///
+    pipeline& unwind(std::string field_name);
+
+    ///
+    /// @return A view of the underlying BSON array this pipeline represents.
+    ///
+    bsoncxx::array::view view_array() const;
+
+   private:
+    friend class client;
+    friend class collection;
+    friend class database;
+
+    class MONGOCXX_PRIVATE impl;
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/pool.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/pool.hpp
new file mode 100644
index 0000000..6f71b39
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/pool.hpp
@@ -0,0 +1,124 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <functional>
+#include <memory>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/pool.hpp>
+#include <mongocxx/stdx.hpp>
+#include <mongocxx/uri.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+
+///
+/// A pool of @c client objects associated with a MongoDB deployment.
+///
+/// For interoperability with other MongoDB drivers, the minimum and maximum number of connections
+/// in the pool is configured using the 'minPoolSize' and 'maxPoolSize' connection string options.
+///
+/// @see https://docs.mongodb.com/manual/reference/connection-string/#connection-string-options
+///
+/// @remark When connecting to a replica set, it is @b much more efficient to use a pool as opposed
+/// to manually constructing @c client objects. The pool will use a single background thread per
+/// server to monitor the topology of the replica set, all of which are shared between the client
+/// objects created by the pool. A standalone client will instead "stop the world" every 60 seconds
+/// to check the status of the cluster. Because of this, if multiple threads are available, a
+/// connection pool should be used even if the application itself is single-threaded.
+///
+class MONGOCXX_API pool {
+   public:
+    ///
+    /// Creates a pool associated with a connection string.
+    ///
+    /// @param mongodb_uri
+    ///  A MongoDB URI representing the connection parameters
+    /// @param options
+    ///  Options to use when connecting to the MongoDB deployment.
+    ///
+    /// @throws mongocxx::exception if invalid options are provided (whether from the URI or
+    ///  provided client options).
+    explicit pool(const uri& mongodb_uri = mongocxx::uri(),
+                  const options::pool& options = options::pool());
+
+    ///
+    /// Destroys a pool.
+    ///
+    ~pool();
+
+    ///
+    /// An entry is a handle on a @c client object acquired via the pool. Similar to
+    /// std::unique_ptr.
+    ///
+    /// @note The lifetime of any entry object must be a subset of the pool object
+    ///  from which it was acquired.
+    ///
+    class MONGOCXX_API entry {
+       public:
+        /// Access a member of the client instance.
+        client* operator->() const& noexcept;
+        client* operator->() && = delete;
+
+        /// Retrieve a reference to the client.
+        client& operator*() const& noexcept;
+        client& operator*() && = delete;
+
+        /// Assign nullptr to this entry to release its client to the pool.
+        entry& operator=(std::nullptr_t) noexcept;
+
+        /// Return true if this entry has a client acquired from the pool.
+        explicit operator bool() const noexcept;
+
+       private:
+        friend class pool;
+
+        using unique_client = std::unique_ptr<client, std::function<void MONGOCXX_CALL(client*)>>;
+
+        MONGOCXX_PRIVATE explicit entry(unique_client);
+
+        unique_client _client;
+    };
+
+    ///
+    /// Acquires a client from the pool. The calling thread will block until a connection is
+    /// available.
+    ///
+    entry acquire();
+
+    ///
+    /// Acquires a client from the pool. This method will return immediately, but may return a
+    /// disengaged optional if a client is not available.
+    ///
+    stdx::optional<entry> try_acquire();
+
+   private:
+    friend class options::auto_encryption;
+
+    MONGOCXX_PRIVATE void _release(client* client);
+
+    class MONGOCXX_PRIVATE impl;
+    const std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/read_concern.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/read_concern.hpp
new file mode 100644
index 0000000..5e1855d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/read_concern.hpp
@@ -0,0 +1,187 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+class uri;
+
+///
+/// A class to represent the read concern. Read concern can be set at the client, database, or
+/// collection level. The read concern can also be provided via connection string, and will be
+/// parsed and set on the client constructed for the URI.
+///
+/// For the WiredTiger storage engine, MongoDB 3.2 introduced the readConcern option for replica
+/// sets and replica set shards. The readConcern option allows clients to choose a level of
+/// isolation for their reads. You can specify a readConcern of "majority" to read data that has
+/// been written to a majority of nodes and thus cannot be rolled back. By default, MongoDB uses a
+/// readConcern of "local" which does not guarantee that the read data would not be rolled back.
+///
+/// MongoDB 3.4 introduces a read concern level of "linearizable" to read data that has been written
+/// to a majority of nodes (i.e. cannot be rolled back) @b and is not stale. Linearizable read
+/// concern is available for all MongoDB supported storage engines and applies to read operations on
+/// a single document. Note that writes must be made with majority write concern in order for reads
+/// to be linearizable.
+///
+/// @see https://docs.mongodb.com/manual/reference/read-concern/
+///
+class MONGOCXX_API read_concern {
+   public:
+    ///
+    /// A class to represent the read concern level.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/read-concern/#read-concern-levels
+    ///
+    enum class level {
+        k_local,
+        k_majority,
+        k_linearizable,
+        k_server_default,
+        k_unknown,
+        k_available,
+        k_snapshot
+    };
+
+    ///
+    /// Constructs a new read_concern with default acknowledge_level of k_server_default.
+    ///
+    /// The k_server_default acknowledge level has an empty acknowledge_string. Queries that
+    /// run with this read_concern will use the server's default read_concern instead of
+    /// specifying one.
+    ///
+    read_concern();
+
+    ///
+    /// Copy constructs a read_concern.
+    ///
+    read_concern(const read_concern&);
+
+    ///
+    /// Copy assigns a read_concern.
+    ///
+    read_concern& operator=(const read_concern&);
+
+    ///
+    /// Move constructs a read_concern.
+    ///
+    read_concern(read_concern&&) noexcept;
+
+    ///
+    /// Move assigns a read_concern.
+    ///
+    read_concern& operator=(read_concern&&) noexcept;
+
+    ///
+    /// Destroys a read_concern.
+    ///
+    ~read_concern();
+
+    ///
+    /// Sets the read concern level.
+    ///
+    /// @param rc_level
+    ///   Either k_local, k_majority, k_linearizable, or k_server_default.
+    ///
+    /// @throws
+    ///   mongocxx::exception if rc_level is not k_local, k_majority, k_linearizable, or
+    ///   k_server_default.
+    ///
+    void acknowledge_level(level rc_level);
+
+    ///
+    /// Gets the current read concern level.
+    ///
+    /// If this was set with acknowledge_string to anything other than "local", "majority",
+    /// "linearizable", or an empty string, this will return k_unknown.
+    ///
+    /// @return The read concern level.
+    ///
+    level acknowledge_level() const;
+
+    ///
+    /// Sets the read concern string. Any valid read concern string (e.g. "local",
+    /// "majority", "linearizable", "") may be passed in.  For forward-compatibility
+    /// with read concern levels introduced in the future, no validation is performed on
+    /// this string.
+    ///
+    /// @param rc_string
+    ///   The read concern string.
+    ///
+    void acknowledge_string(stdx::string_view rc_string);
+
+    ///
+    /// Gets the current read concern string.
+    ///
+    /// If the read concern level was set with acknowledge_level, this will return either "local",
+    /// "majority", "linearizable", or an empty string for k_server_default.
+    ///
+    /// @return The read concern string.
+    ///
+    stdx::string_view acknowledge_string() const;
+
+    ///
+    /// Gets the document form of this read_concern.
+    ///
+    /// @return
+    ///   Document representation of this read_concern.
+    ///
+    bsoncxx::document::value to_document() const;
+
+   private:
+    friend client;
+    friend collection;
+    friend database;
+    /// \relates mongocxx::options::transaction
+    friend mongocxx::options::transaction;
+    friend uri;
+
+    ///
+    /// @{
+    ///
+    /// Compares two read_concern objects for (in)-equality.
+    ///
+    /// @relates: read_concern
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const read_concern&, const read_concern&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const read_concern&, const read_concern&);
+    ///
+    /// @}
+    ///
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE read_concern(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/read_preference.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/read_preference.hpp
new file mode 100644
index 0000000..79ed258
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/read_preference.hpp
@@ -0,0 +1,318 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <string>
+
+#include <bsoncxx/array/view_or_value.hpp>
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class client;
+class collection;
+class database;
+class uri;
+
+namespace events {
+class topology_description;
+}
+
+///
+/// Class representing a preference for how the driver routes read operations to members of a
+/// replica set or to a sharded cluster.
+///
+/// By default read operations are directed to the primary member in a replica set. Reading from the
+/// primary guarantees that read operations reflect the latest version of a document. However, by
+/// distributing some or all reads to secondary members of the replica set, you can improve read
+/// throughput or reduce latency for an application that does not require fully up-to-date data.
+///
+/// Read preference can be broadly specified by setting a mode. It is also possible to
+/// set tags in the read preference for more granular control, and to target specific members of a
+/// replica set via attributes other than their current state as a primary or secondary node.
+/// Furthermore, it is also possible to set a staleness threshold, such that the read is limited to
+/// targeting secondaries whose staleness is less than or equal to the given threshold.
+///
+/// Read preferences are ignored for direct connections to a single mongod instance. However,
+/// in order to perform read operations on a direct connection to a secondary member of a replica
+/// set, you must set a read preference that allows reading from secondaries.
+///
+/// @see https://docs.mongodb.com/manual/core/read-preference/
+///
+class MONGOCXX_API read_preference {
+   public:
+    ///
+    /// Determines which members in a replica set are acceptable to read from.
+    ///
+    /// @warning Read preference tags are not respected when the mode is set to primary.
+    ///
+    /// @warning All read preference modes except primary may return stale data because secondaries
+    /// replicate operations from the primary with some delay. Ensure that your application
+    /// can tolerate stale data if you choose to use a non-primary mode.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/#read-preference-modes
+    ///
+    enum class read_mode : std::uint8_t {
+        ///
+        /// Only read from a primary node.
+        ///
+        k_primary,
+
+        ///
+        /// Prefer to read from a primary node.
+        ///
+        k_primary_preferred,
+
+        ///
+        /// Only read from secondary nodes.
+        ///
+        k_secondary,
+
+        ///
+        /// Prefer to read from secondary nodes.
+        ///
+        k_secondary_preferred,
+
+        ///
+        /// Read from the node with the lowest latency irrespective of state.
+        ///
+        k_nearest
+    };
+
+    ///
+    /// Constructs a new read_preference with read_mode set to k_primary.
+    ///
+    read_preference();
+
+    struct deprecated_tag {};
+
+    ///
+    /// Constructs a new read_preference.
+    ///
+    /// @param mode
+    ///   Specifies the read_mode.
+    ///
+    /// @deprecated The constructor with no arguments and the method mode() should be used.
+    ///
+    MONGOCXX_DEPRECATED read_preference(read_mode mode);
+    read_preference(read_mode mode, deprecated_tag);
+
+    ///
+    /// Constructs a new read_preference with tags.
+    ///
+    /// @param mode
+    ///   A read_preference read_mode.
+    /// @param tags
+    ///   A document representing tags to use for the read_preference.
+    ///
+    /// @see https://docs.mongodb.com/manual/core/read-preference/#tag-sets
+    ///
+    /// @deprecated The tags() method should be used instead.
+    ///
+    MONGOCXX_DEPRECATED read_preference(read_mode mode, bsoncxx::document::view_or_value tags);
+    read_preference(read_mode mode, bsoncxx::document::view_or_value tags, deprecated_tag);
+
+    ///
+    /// Copy constructs a read_preference.
+    ///
+    read_preference(const read_preference&);
+
+    ///
+    /// Copy assigns a read_preference.
+    ///
+    read_preference& operator=(const read_preference&);
+
+    ///
+    /// Move constructs a read_preference.
+    ///
+    read_preference(read_preference&&) noexcept;
+
+    ///
+    /// Move assigns a read_preference.
+    ///
+    read_preference& operator=(read_preference&&) noexcept;
+
+    ///
+    /// Destroys a read_preference.
+    ///
+    ~read_preference();
+
+    ///
+    /// Sets a new mode for this read_preference.
+    ///
+    /// @param mode
+    ///   The new read preference mode.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    read_preference& mode(read_mode mode);
+
+    ///
+    /// Returns the current read_mode for this read_preference.
+    ///
+    /// @return The current read_mode.
+    ///
+    read_mode mode() const;
+
+    ///
+    /// Sets or updates the tag set list for this read_preference.
+    ///
+    /// @param tags
+    ///   Document representing the tag set list.
+    ///
+    /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    read_preference& tags(bsoncxx::document::view_or_value tag_set_list);
+
+    ///
+    /// Sets or updates the tag set list for this read_preference.
+    ///
+    /// @param tags
+    ///   Array of tag sets.
+    ///
+    /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    read_preference& tags(bsoncxx::array::view_or_value tag_set_list);
+
+    ///
+    /// Sets or updates the tag set list for this read_preference.
+    ///
+    /// @return The optionally set current tag set list.
+    ///
+    /// @see https://www.mongodb.com/docs/manual/core/read-preference-tags/
+    ///
+    stdx::optional<bsoncxx::document::view> tags() const;
+
+    ///
+    /// Sets the max staleness setting for this read_preference.  Secondary
+    /// servers with an estimated lag greater than this value will be excluded
+    /// from selection under modes that allow secondaries.
+    ///
+    /// Max staleness must be at least 90 seconds, and also at least
+    /// the sum (in seconds) of the client's heartbeatFrequencyMS and the
+    /// server's idle write period, which is 10 seconds.  For general use,
+    /// 90 seconds is the effective minimum.  If less, an exception will be
+    /// thrown when an operation is attempted.
+    ///
+    /// Max staleness may only be used with MongoDB version 3.4 or later.
+    /// If used with an earlier version, an exception will be thrown when an
+    /// operation is attempted.
+    ///
+    /// @note
+    ///     The max-staleness feature is designed to prevent badly-lagging
+    ///     servers from being selected.  The staleness estimate is
+    ///     imprecise and shouldn't be used to try to select "up-to-date"
+    ///     secondaries.
+    ///
+    /// @param max_staleness
+    ///    The new max staleness setting.  It must be positive.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    /// @throws mongocxx::logic_error if the argument is invalid.
+    ///
+    read_preference& max_staleness(std::chrono::seconds max_staleness);
+
+    ///
+    /// Returns the current max staleness setting for this read_preference.
+    ///
+    /// @return The optionally current max staleness setting.
+    ///
+    stdx::optional<std::chrono::seconds> max_staleness() const;
+
+    ///
+    /// Sets the hedge document to be used for the read preference. Sharded clusters running MongoDB
+    /// 4.4 or later can dispatch read operations in parallel, returning the result from the fastest
+    /// host and cancelling the unfinished operations.
+    ///
+    /// This may be an empty document or a document of the form { enabled: &lt;boolean&gt; }.
+    ///
+    /// Hedged reads are automatically enabled in MongoDB 4.4+ when using a ``nearest`` read
+    /// preference. To explicitly enable or disable hedging, the ``hedge`` document must be
+    /// passed. An empty document uses server defaults to control hedging, but the ``enabled`` key
+    /// may be set to ``true`` or ``false`` to explicitly enable or disable hedged reads.
+    ///
+    /// @param hedge
+    ///   The hedge document to set. For example, the document { enabled: true }.
+    ///
+    /// @return A reference to the object on which this member function is being called. This
+    /// facilitates method chaining.
+    ///
+    read_preference& hedge(bsoncxx::document::view_or_value hedge);
+
+    ///
+    /// Gets the current hedge document to be used for the read preference.
+    ///
+    /// @return A hedge document if one was set.
+    ///
+    const stdx::optional<bsoncxx::document::view> hedge() const;
+
+   private:
+    friend client;
+    friend collection;
+    friend database;
+    /// \relates mongocxx::options::transaction
+    friend mongocxx::options::transaction;
+    /// \relates mongocxx::events::topology_description
+    friend mongocxx::events::topology_description;
+    friend uri;
+
+    ///
+    /// @{
+    ///
+    /// Compares two read_preference objects for (in)-equality.
+    ///
+    /// @relates: read_preference
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const read_preference&,
+                                                      const read_preference&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const read_preference&,
+                                                      const read_preference&);
+    ///
+    /// @}
+    ///
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE read_preference(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp
new file mode 100644
index 0000000..99c5dff
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/bulk_write.hpp
@@ -0,0 +1,99 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <map>
+#include <vector>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/types.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+///
+/// Class representing the result of a MongoDB bulk write operation.
+///
+class MONGOCXX_API bulk_write {
+   public:
+    using id_map = std::map<std::size_t, bsoncxx::document::element>;
+
+    // This constructor is public for testing purposes only
+    explicit bulk_write(bsoncxx::document::value raw_response);
+
+    ///
+    /// Gets the number of documents that were inserted during this operation.
+    ///
+    /// @return The number of documents that were inserted.
+    ///
+    std::int32_t inserted_count() const;
+
+    ///
+    /// Gets the number of documents that were matched during this operation.
+    ///
+    /// @return The number of documents that were matched.
+    ///
+    std::int32_t matched_count() const;
+
+    ///
+    /// Gets the number of documents that were modified during this operation.
+    ///
+    /// @return The number of documents that were modified.
+    ///
+    /// @throws with server versions below 2.6 due to the field `nModified` not being returned.
+    ///
+    std::int32_t modified_count() const;
+
+    ///
+    /// Gets the number of documents that were deleted during this operation.
+    ///
+    /// @return The number of documents that were deleted.
+    ///
+    std::int32_t deleted_count() const;
+
+    ///
+    /// Gets the number of documents that were upserted during this operation.
+    ///
+    /// @return The number of documents that were upserted.
+    ///
+    std::int32_t upserted_count() const;
+
+    ///
+    /// Gets the ids of the upserted documents.
+    ///
+    /// @note The returned id_map must not be accessed after the bulk_write object is destroyed.
+    /// @return A map from bulk write index to _id field for upserted documents.
+    ///
+    id_map upserted_ids() const;
+
+   private:
+    MONGOCXX_PRIVATE bsoncxx::document::view view() const;
+
+    bsoncxx::document::value _response;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const bulk_write&, const bulk_write&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const bulk_write&, const bulk_write&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/delete.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/delete.hpp
new file mode 100644
index 0000000..c7137b0
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/delete.hpp
@@ -0,0 +1,60 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+///
+/// Class representing the result of a MongoDB delete operation.
+///
+class MONGOCXX_API delete_result {
+   public:
+    // This constructor is public for testing purposes only
+    explicit delete_result(result::bulk_write result);
+
+    ///
+    /// Returns the bulk write result.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were deleted during this operation.
+    ///
+    /// @return The number of documents that were deleted.
+    ///
+    std::int32_t deleted_count() const;
+
+   private:
+    result::bulk_write _result;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const delete_result&, const delete_result&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const delete_result&, const delete_result&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp
new file mode 100644
index 0000000..3846199
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/gridfs/upload.hpp
@@ -0,0 +1,56 @@
+// Copyright 2017 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+namespace gridfs {
+
+/// Class representing the result of a GridFS upload operation.
+class MONGOCXX_API upload {
+   public:
+    upload(bsoncxx::types::bson_value::view id);
+
+    ///
+    /// Gets the id of the uploaded GridFS file.
+    ///
+    /// @return The id of the uploaded file.
+    ///
+    const bsoncxx::types::bson_value::view& id() const;
+
+   private:
+    // Array with a single element, containing the value of the _id field for the inserted files
+    // collection document.
+    bsoncxx::array::value _id_owned;
+
+    // Points into _id_owned.
+    bsoncxx::types::bson_value::view _id;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const upload&, const upload&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const upload&, const upload&);
+};
+
+}  // namespace gridfs
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp
new file mode 100644
index 0000000..49898e8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/insert_many.hpp
@@ -0,0 +1,95 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+#include <map>
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/types.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class collection;
+
+namespace result {
+
+///
+/// Class representing the result of a MongoDB insert many operation
+/// (executed as a bulk write).
+///
+class MONGOCXX_API insert_many {
+   public:
+    using id_map = std::map<std::size_t, bsoncxx::document::element>;
+
+    insert_many(result::bulk_write result, bsoncxx::array::value inserted_ids);
+
+    insert_many(const insert_many&);
+    insert_many(insert_many&&) = default;
+
+    insert_many& operator=(const insert_many&);
+    insert_many& operator=(insert_many&&) = default;
+
+    ///
+    /// Returns the bulk write result for this insert many operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were inserted during this operation.
+    ///
+    /// @return The number of documents that were inserted.
+    ///
+    std::int32_t inserted_count() const;
+
+    ///
+    /// Gets the _ids of the inserted documents.
+    ///
+    /// @note The returned id_map must not be accessed after the result::insert_many object is
+    /// destroyed.
+    /// @return Map of the index of the operation to the _id of the inserted document.
+    ///
+    id_map inserted_ids() const;
+
+   private:
+    friend collection;
+
+    // Construct _inserted_ids from _inserted_ids_owned
+    MONGOCXX_PRIVATE void _buildInsertedIds();
+
+    result::bulk_write _result;
+
+    // Array containing documents with the values of the _id field for the inserted documents. This
+    // array is in the following format: [{"_id": ...}, {"_id": ...}, ...].
+    bsoncxx::array::value _inserted_ids_owned;
+
+    // Points into _inserted_ids_owned.
+    id_map _inserted_ids;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const insert_many&, const insert_many&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const insert_many&, const insert_many&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp
new file mode 100644
index 0000000..f76b113
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/insert_one.hpp
@@ -0,0 +1,65 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/array/value.hpp>
+#include <bsoncxx/types.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+/// Class representing the result of a MongoDB insert operation.
+class MONGOCXX_API insert_one {
+   public:
+    // This constructor is public for testing purposes only
+    insert_one(result::bulk_write result, bsoncxx::types::bson_value::view inserted_id);
+
+    ///
+    /// Returns the bulk write result for this insert operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the _id of the inserted document.
+    ///
+    /// @return The value of the _id field for the inserted document.
+    ///
+    const bsoncxx::types::bson_value::view& inserted_id() const;
+
+   private:
+    result::bulk_write _result;
+
+    // Array with a single element, containing the value of the _id field for the inserted document.
+    bsoncxx::array::value _inserted_id_owned;
+
+    // Points into _inserted_id_owned.
+    bsoncxx::types::bson_value::view _inserted_id;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const insert_one&, const insert_one&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const insert_one&, const insert_one&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp
new file mode 100644
index 0000000..fbb1f83
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/replace_one.hpp
@@ -0,0 +1,75 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+/// Class representing the result of a MongoDB replace_one operation.
+class MONGOCXX_API replace_one {
+   public:
+    // This constructor is public for testing purposes only
+    explicit replace_one(result::bulk_write result);
+
+    ///
+    /// Returns the bulk write result for this replace_one operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were matched during this operation.
+    ///
+    /// @return The number of documents that were matched.
+    ///
+    std::int32_t matched_count() const;
+
+    ///
+    /// Gets the number of documents that were modified during this operation.
+    ///
+    /// @return The number of documents that were modified.
+    ///
+    std::int32_t modified_count() const;
+
+    ///
+    /// Gets the id of the upserted document.
+    ///
+    /// @return The value of the _id field for upserted document.
+    ///
+    stdx::optional<bsoncxx::document::element> upserted_id() const;
+
+   private:
+    result::bulk_write _result;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const replace_one&, const replace_one&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const replace_one&, const replace_one&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/update.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/update.hpp
new file mode 100644
index 0000000..85070f8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/result/update.hpp
@@ -0,0 +1,80 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <cstdint>
+
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types.hpp>
+#include <mongocxx/result/bulk_write.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace result {
+
+/// Class representing the result of a MongoDB update operation.
+class MONGOCXX_API update {
+   public:
+    // This constructor is public for testing purposes only
+    explicit update(result::bulk_write result);
+
+    ///
+    /// Returns the bulk write result for this update operation.
+    ///
+    /// @return The raw bulk write result.
+    ///
+    const result::bulk_write& result() const;
+
+    ///
+    /// Gets the number of documents that were matched during this operation.
+    ///
+    /// @return The number of documents that were matched.
+    ///
+    std::int32_t matched_count() const;
+
+    ///
+    /// Gets the number of documents that were modified during this operation.
+    ///
+    /// @return The number of documents that were modified.
+    std::int32_t modified_count() const;
+
+    ///
+    /// Gets the number of documents that were upserted during this operation.
+    ///
+    /// @return The number of documents that were upserted.
+    std::int32_t upserted_count() const;
+
+    ///
+    /// If a document was upserted during this operation, gets the _id of the upserted document.
+    ///
+    /// @return The value of the _id field for upserted document.
+    ///
+    stdx::optional<bsoncxx::document::element> upserted_id() const;
+
+   private:
+    result::bulk_write _result;
+
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const update&, const update&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const update&, const update&);
+};
+
+}  // namespace result
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/stdx.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/stdx.hpp
new file mode 100644
index 0000000..c70fe44
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/stdx.hpp
@@ -0,0 +1,30 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+namespace stdx {
+
+// We adopt all the bsoncxx polyfills
+using namespace ::bsoncxx::stdx;
+
+}  // namespace stdx
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/uri.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/uri.hpp
new file mode 100644
index 0000000..5c88a68
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/uri.hpp
@@ -0,0 +1,363 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <bsoncxx/document/view.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
+#include <mongocxx/read_concern.hpp>
+#include <mongocxx/read_preference.hpp>
+#include <mongocxx/write_concern.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing a MongoDB connection string URI.
+///
+/// @todo CXX-2038 Use optionals for all option getters. Otherwise users cannot distinguish between
+/// a case of an empty option explicitly present in the URI and the option being omitted. Also
+/// change getters that return a std::string to return a string_view since a copy is not necessary.
+///
+/// @see https://docs.mongodb.com/manual/reference/connection-string/
+/// @see http://mongoc.org/libmongoc/current/mongoc_uri_t.html for more information on supported URI
+/// options.
+///
+class MONGOCXX_API uri {
+   public:
+    /// A host.
+    struct host {
+        std::string name;
+        std::uint16_t port;
+        std::int32_t family;
+    };
+
+    static const std::string k_default_uri;
+
+    ///
+    /// Constructs a uri from an optional MongoDB URI string. If no URI string is specified,
+    /// uses the default URI string, 'mongodb://localhost:27017'.
+    ///
+    /// @see The documentation for the version of libmongoc used for the list of supported
+    ///   URI options. For the latest libmongoc release:
+    ///   http://mongoc.org/libmongoc/current/mongoc_uri_t.html
+    ///
+    /// @param uri_string
+    ///   String representing a MongoDB connection string URI, defaults to k_default_uri.
+    ///
+    uri(bsoncxx::string::view_or_value uri_string = k_default_uri);
+
+    ///
+    /// Move constructs a uri.
+    ///
+    uri(uri&&) noexcept;
+
+    ///
+    /// Move assigns a uri.
+    ///
+    uri& operator=(uri&&) noexcept;
+
+    ///
+    /// Destroys a uri.
+    ///
+    ~uri();
+
+    ///
+    /// Returns the authentication mechanism from the uri.
+    ///
+    /// @return A string representing the authentication mechanism.
+    ///
+    std::string auth_mechanism() const;
+
+    ///
+    /// Returns the authentication source from the uri.
+    ///
+    /// @return A string representing the authentication source.
+    ///
+    std::string auth_source() const;
+
+    ///
+    /// Returns the hosts from the uri.
+    ///
+    /// @return A vector of hosts.
+    ///
+    std::vector<host> hosts() const;
+
+    ///
+    /// Returns the database from the uri.
+    ///
+    /// @return A string with the name of the database.
+    ///
+    std::string database() const;
+
+    ///
+    /// Returns other uri options.
+    ///
+    /// Note, options are returned in the case they were presented.
+    /// The URI mongodb://localhost/?appName=abc will return { "appName": "abc" }
+    /// The URI mongodb://localhost/?appname=abc will return { "appname": "abc" }
+    ///
+    /// @return A document view containing other options.
+    ///
+    bsoncxx::document::view options() const;
+
+    ///
+    /// Returns the password from the uri.
+    ///
+    /// @return A string containing the supplied password.
+    ///
+    std::string password() const;
+
+    ///
+    /// Returns the read concern from the uri.
+    ///
+    /// @return A read_concern that represents what was specified in the uri.
+    ///
+    class read_concern read_concern() const;
+
+    ///
+    /// Returns the read preference from the uri.
+    ///
+    /// @return A read_preference that represents what was specified in the uri.
+    ///
+    class read_preference read_preference() const;
+
+    ///
+    /// Returns the replica set specified in the uri.
+    ///
+    /// @return A string representing the supplied replica set name.
+    ///
+    std::string replica_set() const;
+
+    ///
+    /// Returns the ssl parameter from the uri.
+    ///
+    /// @return Boolean that is @c true if ssl is enabled and @c false if not.
+    ///
+    /// @deprecated The tls() method should be used instead of this method.
+    ///
+    MONGOCXX_DEPRECATED bool ssl() const;
+
+    ///
+    /// Returns the tls parameter from the uri.
+    ///
+    /// @return Boolean that is @c true if tls is enabled and @c false if not.
+    ///
+    bool tls() const;
+
+    ///
+    /// Returns the uri in a string format.
+    ///
+    /// @return A string with the uri.
+    ///
+    std::string to_string() const;
+
+    ///
+    /// Returns the supplied username from the uri.
+    ///
+    /// @return A string with the username specified in the uri.
+    ///
+    std::string username() const;
+
+    ///
+    /// Returns the write concern specified in the uri.
+    ///
+    /// @return A write_concern that represents what was specified in the uri.
+    ///
+    class write_concern write_concern() const;
+
+    ///
+    /// Returns the value of the option "appname" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> appname() const;
+
+    ///
+    /// Returns the value of the option "authMechanismProperties" if present in the uri.
+    ///
+    /// @return An optional bsoncxx::document::view
+    ///
+    stdx::optional<bsoncxx::document::view> auth_mechanism_properties() const;
+
+    ///
+    /// Returns the list of compressors present in the uri or an empty list if "compressors" was not
+    /// present or contained no valid compressors.
+    ///
+    /// @return A std::vector of stdx::string_view.
+    ///
+    std::vector<stdx::string_view> compressors() const;
+
+    ///
+    /// Returns the value of the option "connectTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> connect_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "directConnection" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> direct_connection() const;
+
+    ///
+    /// Returns the value of the option "heartbeatFrequencyMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> heartbeat_frequency_ms() const;
+
+    ///
+    /// Returns the value of the option "localThresholdMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> local_threshold_ms() const;
+
+    ///
+    /// Returns the value of the option "maxPoolSize" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> max_pool_size() const;
+
+    ///
+    /// Returns the value of the option "retryReads" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> retry_reads() const;
+
+    ///
+    /// Returns the value of the option "retryWrites" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> retry_writes() const;
+
+    ///
+    /// Returns the value of the option "serverSelectionTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> server_selection_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "serverSelectionTryOnce" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> server_selection_try_once() const;
+
+    ///
+    /// Returns the value of the option "socketTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> socket_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "tlsAllowInvalidCertificates" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_allow_invalid_certificates() const;
+
+    ///
+    /// Returns the value of the option "tlsAllowInvalidHostnames" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_allow_invalid_hostnames() const;
+
+    ///
+    /// Returns the value of the option "tlsCAFile" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> tls_ca_file() const;
+
+    ///
+    /// Returns the value of the option "tlsCertificateKeyFile" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> tls_certificate_key_file() const;
+
+    ///
+    /// Returns the value of the option "tlsCertificateKeyFilePassword" if present in the uri.
+    ///
+    /// @return An optional stdx::string_view
+    ///
+    stdx::optional<stdx::string_view> tls_certificate_key_file_password() const;
+
+    ///
+    /// Returns the value of the option "tlsDisableCertificateRevocationCheck" if present in the
+    /// uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_disable_certificate_revocation_check() const;
+
+    ///
+    /// Returns the value of the option "tlsDisableOCSPEndpointCheck" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_disable_ocsp_endpoint_check() const;
+
+    ///
+    /// Returns the value of the option "tlsInsecure" if present in the uri.
+    ///
+    /// @return An optional bool
+    ///
+    stdx::optional<bool> tls_insecure() const;
+
+    ///
+    /// Returns the value of the option "waitQueueTimeoutMS" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> wait_queue_timeout_ms() const;
+
+    ///
+    /// Returns the value of the option "zlibCompressionLevel" if present in the uri.
+    ///
+    /// @return An optional std::int32_t
+    ///
+    stdx::optional<std::int32_t> zlib_compression_level() const;
+
+   private:
+    friend class client;
+    friend class pool;
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE uri(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp
new file mode 100644
index 0000000..4771334
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/validation_criteria.hpp
@@ -0,0 +1,157 @@
+// Copyright 2015 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <bsoncxx/document/view_or_value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Class representing criteria for document validation, to be applied to a collection.
+///
+/// @see https://docs.mongodb.com/manual/core/document-validation/
+///
+class MONGOCXX_API validation_criteria {
+   public:
+    ///
+    /// Sets a validation rule for this validation object.
+    ///
+    /// @param rule
+    ///   Document representing a validation rule.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    validation_criteria& rule(bsoncxx::document::view_or_value rule);
+
+    ///
+    /// Gets the validation rule for this validation object.
+    ///
+    /// @return
+    ///   Document representing a validation rule.
+    ///
+    const stdx::optional<bsoncxx::document::view_or_value>& rule() const;
+
+    ///
+    /// A class to represent the different validation level options.
+    ///
+    /// - k_off: Disable validation entirely.
+    /// - k_moderate: Apply validation rules to inserts, and apply validation rules to updates only
+    ///   if the document to be updated already fulfills the validation criteria.
+    /// - k_strict: Apply validation rules to all inserts and updates.
+    ///
+    enum class validation_level {
+        k_off,
+        k_moderate,
+        k_strict,
+    };
+
+    ///
+    /// Sets a validation level.
+    ///
+    /// @param level
+    ///   An enumerated validation level.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    validation_criteria& level(validation_level level);
+
+    ///
+    /// Gets the validation level.
+    ///
+    /// @return
+    ///   The enumerated validation level.
+    ///
+    const stdx::optional<validation_level>& level() const;
+
+    ///
+    /// A class to represent the different validation action options.
+    ///
+    /// - k_error: Reject any insertion or update that violates the validation criteria.
+    /// - k_warn: Log any violations of the validation criteria, but allow the insertion or update
+    ///   to proceed.
+    ///
+    enum class validation_action {
+        k_error,
+        k_warn,
+    };
+
+    ///
+    /// Sets a validation action to run when documents failing validation are inserted or modified.
+    ///
+    /// @param action
+    ///   An enumerated validation action.
+    ///
+    /// @return
+    ///   A reference to the object on which this member function is being called.  This facilitates
+    ///   method chaining.
+    ///
+    validation_criteria& action(validation_action action);
+
+    ///
+    /// Gets the validation action to run when documents failing validation are inserted or
+    /// modified.
+    ///
+    /// @return
+    ///   The enumerated validation action.
+    ///
+    const stdx::optional<validation_action>& action() const;
+
+    ///
+    /// Returns a bson document representing this set of validation criteria.
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    /// @return Validation criteria, as a document.
+    ///
+    MONGOCXX_DEPRECATED bsoncxx::document::value to_document() const;
+    bsoncxx::document::value to_document_deprecated() const;
+
+    ///
+    /// @deprecated
+    ///   This method is deprecated. To determine which options are set on this object, use the
+    ///   provided accessors instead.
+    ///
+    MONGOCXX_DEPRECATED MONGOCXX_INLINE operator bsoncxx::document::value() const;
+
+   private:
+    stdx::optional<bsoncxx::document::view_or_value> _rule;
+    stdx::optional<validation_level> _level;
+    stdx::optional<validation_action> _action;
+};
+
+MONGOCXX_API bool MONGOCXX_CALL operator==(const validation_criteria& lhs,
+                                           const validation_criteria& rhs);
+MONGOCXX_API bool MONGOCXX_CALL operator!=(const validation_criteria& lhs,
+                                           const validation_criteria& rhs);
+
+MONGOCXX_INLINE validation_criteria::operator bsoncxx::document::value() const {
+    return to_document_deprecated();
+}
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/write_concern.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/write_concern.hpp
new file mode 100644
index 0000000..80aaf55
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/write_concern.hpp
@@ -0,0 +1,276 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include <stdexcept>
+
+#include <bsoncxx/document/value.hpp>
+#include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/stdx/string_view.hpp>
+#include <mongocxx/options/transaction.hpp>
+#include <mongocxx/stdx.hpp>
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+class bulk_write;
+class client;
+class collection;
+class database;
+class uri;
+
+///
+/// Class representing the server-side requirement for reporting the success of a write
+/// operation. The strength of the write concern setting determines the level of guarantees
+/// that you will receive from MongoDB regarding write durability.
+///
+/// Weaker requirements that provide fewer guarantees report on success quickly while stronger
+/// requirements that provide greater guarantees will take longer (or potentially forever, if
+/// the write_concern's requirements are not satisfied and no timeout is set).
+///
+/// MongoDB drivers allow for different levels of write concern to better address the specific
+/// needs of applications. Clients may adjust write concern to ensure that the most important
+/// operations persist successfully to an entire MongoDB deployment. However, for other less
+/// critical operations, clients can adjust the write concern to ensure better performance
+/// rather than persistence to the entire deployment.
+///
+/// @see https://docs.mongodb.com/manual/core/write-concern/
+///
+class MONGOCXX_API write_concern {
+   public:
+    ///
+    /// A class to represent the special case values for write_concern::nodes.
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    enum class level { k_default, k_majority, k_tag, k_unacknowledged, k_acknowledged };
+
+    ///
+    /// Constructs a new write_concern.
+    ///
+    write_concern();
+
+    ///
+    /// Copy constructs a write_concern.
+    ///
+    write_concern(const write_concern&);
+
+    ///
+    /// Copy assigns a write_concern.
+    ///
+    write_concern& operator=(const write_concern&);
+
+    ///
+    /// Move constructs a write_concern.
+    ///
+    write_concern(write_concern&&) noexcept;
+
+    ///
+    /// Move assigns a write_concern.
+    ///
+    write_concern& operator=(write_concern&&) noexcept;
+
+    ///
+    /// Destroys a write_concern.
+    ///
+    ~write_concern();
+
+    ///
+    /// Sets the journal parameter for this write concern.
+    ///
+    /// @param journal
+    ///   If @c true confirms that the mongod instance has written the data to the on-disk journal
+    ///   before reporting a write operations was successful. This ensures that data is not lost if
+    ///   the mongod instance shuts down unexpectedly.
+    ///
+    void journal(bool journal);
+
+    ///
+    /// Sets the number of nodes that are required to acknowledge the write before the operation is
+    /// considered successful. Write operations will block until they have been replicated to the
+    /// specified number of servers in a replica set.
+    ///
+    /// @param confirm_from
+    ///   The number of replica set nodes that must acknowledge the write.
+    ///
+    /// @warning Setting the number of nodes to 0 disables write acknowledgment and all other
+    /// write concern options.
+    ///
+    /// @warning Setting the number of nodes required to an amount greater than the number of
+    /// available nodes will cause writes using this write concern to block forever if no timeout
+    /// is set.
+    ///
+    void nodes(std::int32_t confirm_from);
+
+    ///
+    /// Sets the acknowledge level.
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    /// @param confirm_level
+    ///   Either level::k_unacknowledged, level::k_acknowledged, level::k_default, or
+    ///   level::k_majority.
+    ///
+    /// @note
+    ///   the acknowledge level of level::k_tag is set automatically when a tag is set.
+    ///
+    /// @warning
+    ///   Setting this to level::k_unacknowledged disables write acknowledgment and all other
+    ///   write concern options.
+    ///
+    /// @warning
+    ///   Unacknowledged writes using dollar-prefixed or dotted keys may be silently rejected by
+    ///   pre-5.0 servers.
+    ///
+    /// @exception
+    ///   Throws mongocxx::exception for setting a tag acknowledge level. Use tag() instead.
+    ///
+    void acknowledge_level(level confirm_level);
+
+    ///
+    /// Requires that a majority of the nodes in a replica set acknowledge a write operation before
+    /// it is considered a success.
+    ///
+    /// @param timeout
+    ///   The amount of time to wait before the write operation times out if it cannot reach
+    ///   the majority of nodes in the replica set. If the value is zero, then no timeout is set.
+    ///
+    /// @throws mongocxx::logic_error for an invalid timeout value.
+    ///
+    void majority(std::chrono::milliseconds timeout);
+
+    ///
+    /// Sets the name representing the server-side getLastErrorMode entry containing the list of
+    /// nodes that must acknowledge a write operation before it is considered a success.
+    ///
+    /// @note the acknowledge level of level::k_tag is set automatically when a tag is set.
+    ///
+    /// @param tag
+    ///   The string representing on of the "getLastErrorModes" in the replica set configuration.
+    ///
+    void tag(stdx::string_view tag);
+
+    ///
+    /// Sets an upper bound on the time a write concern can take to be satisfied. If the write
+    /// concern cannot be satisfied within the timeout, the operation is considered a failure.
+    ///
+    /// @param timeout
+    ///   The timeout (in milliseconds) for this write concern. If the value is zero, then no
+    ///   timeout is set.
+    ///
+    /// @throws mongocxx::logic_error for an invalid timeout value.
+    ///
+    void timeout(std::chrono::milliseconds timeout);
+
+    ///
+    /// Gets the current status of the journal parameter.
+    ///
+    /// @return @c true if journal is required, @c false if not.
+    ///
+    bool journal() const;
+
+    ///
+    /// Gets the current number of nodes that this write_concern requires operations to reach.
+    /// This value will be unset if the acknowledge_level is set to majority, default, or tag.
+    ///
+    /// This is unset by default.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    /// @return The number of required nodes.
+    ///
+    stdx::optional<std::int32_t> nodes() const;
+
+    ///
+    /// Gets the current acknowledgment level.
+    ///
+    /// @see https://docs.mongodb.com/manual/reference/write-concern/#w-option
+    ///
+    /// @return The acknowledgment level.
+    ///
+    level acknowledge_level() const;
+
+    ///
+    /// Gets the current getLastErrorMode that is required by this write_concern.
+    ///
+    /// @return The current getLastErrorMode.
+    ///
+    stdx::optional<std::string> tag() const;
+
+    ///
+    /// Gets whether the majority of nodes is currently required by this write_concern.
+    ///
+    /// @return The current majority setting.
+    ///
+    bool majority() const;
+
+    ///
+    /// Gets the current timeout for this write_concern.
+    ///
+    /// @return Current timeout in milliseconds.
+    ///
+    std::chrono::milliseconds timeout() const;
+
+    ///
+    /// Gets whether this write_concern requires an acknowledged write.
+    ///
+    /// @return Whether this write concern requires an acknowledged write.
+    ///
+    bool is_acknowledged() const;
+
+    ///
+    /// Gets the document form of this write_concern.
+    ///
+    /// @return
+    ///   Document representation of this write_concern.
+    ///
+    bsoncxx::document::value to_document() const;
+
+   private:
+    friend bulk_write;
+    friend client;
+    friend collection;
+    friend database;
+    /// \relates mongocxx::options::transaction
+    friend mongocxx::options::transaction;
+    friend uri;
+
+    ///
+    /// @{
+    ///
+    /// Compares two write_concern objects for (in)-equality.
+    ///
+    /// @relates: write_concern
+    ///
+    friend MONGOCXX_API bool MONGOCXX_CALL operator==(const write_concern&, const write_concern&);
+    friend MONGOCXX_API bool MONGOCXX_CALL operator!=(const write_concern&, const write_concern&);
+    ///
+    /// @}
+    ///
+
+    class MONGOCXX_PRIVATE impl;
+
+    MONGOCXX_PRIVATE write_concern(std::unique_ptr<impl>&& implementation);
+
+    std::unique_ptr<impl> _impl;
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/write_type.hpp b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/write_type.hpp
new file mode 100644
index 0000000..5efbb3a
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/include/mongocxx/v_noabi/mongocxx/write_type.hpp
@@ -0,0 +1,48 @@
+// Copyright 2014 MongoDB Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/config/prelude.hpp>
+
+namespace mongocxx {
+MONGOCXX_INLINE_NAMESPACE_BEGIN
+
+///
+/// Enum representing the the types of write operations that can be performed.
+///
+enum class write_type {
+    /// Inserting a single document into a collection.
+    k_insert_one,
+
+    /// Deleting a single document from a collection.
+    k_delete_one,
+
+    /// Delete one or more documents from a collection.
+    k_delete_many,
+
+    /// Update a single document in a collection.
+    k_update_one,
+
+    /// Update one or more documents in a collection.
+    k_update_many,
+
+    /// Replace a single document in a collection with a new one.
+    k_replace_one,
+};
+
+MONGOCXX_INLINE_NAMESPACE_END
+}  // namespace mongocxx
+
+#include <mongocxx/config/postlude.hpp>
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/bsoncxx-static.lib b/Source/ThirdParty/mongodb_cpp/Win64/lib/bsoncxx-static.lib
new file mode 100644
index 0000000..ebda3b1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/bsoncxx-static.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9269407718f8b67a2eeb5bb7848732c35e7389e9c67602a31c5844939f2a8612
+size 1393636
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/bsoncxx.lib b/Source/ThirdParty/mongodb_cpp/Win64/lib/bsoncxx.lib
new file mode 100644
index 0000000..3fb388c
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/bsoncxx.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa3d41b03545e457132147eb78bcedd9dd681dd0c7590313776fa9c163340758
+size 205984
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx-config.cmake
new file mode 100644
index 0000000..cf914d3
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx-config.cmake
@@ -0,0 +1,3 @@
+include(CMakeFindDependencyMacro)
+find_dependency(bson-1.0 REQUIRED)
+include("${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets.cmake")
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets-release.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets-release.cmake
new file mode 100644
index 0000000..0dc297d
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets-release.cmake
@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::bsoncxx_shared" for configuration "Release"
+set_property(TARGET mongo::bsoncxx_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bsoncxx_shared PROPERTIES
+  IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/bsoncxx.lib"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/bsoncxx.dll"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bsoncxx_shared )
+list(APPEND _cmake_import_check_files_for_mongo::bsoncxx_shared "${_IMPORT_PREFIX}/lib/bsoncxx.lib" "${_IMPORT_PREFIX}/bin/bsoncxx.dll" )
+
+# Import target "mongo::bsoncxx_static" for configuration "Release"
+set_property(TARGET mongo::bsoncxx_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::bsoncxx_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/bsoncxx-static.lib"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::bsoncxx_static )
+list(APPEND _cmake_import_check_files_for_mongo::bsoncxx_static "${_IMPORT_PREFIX}/lib/bsoncxx-static.lib" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets.cmake
new file mode 100644
index 0000000..70180f2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/bsoncxx-3.7.0/bsoncxx_targets.cmake
@@ -0,0 +1,116 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::bsoncxx_shared mongo::bsoncxx_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::bsoncxx_shared
+add_library(mongo::bsoncxx_shared SHARED IMPORTED)
+
+set_target_properties(mongo::bsoncxx_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/bsoncxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "Boost::boost"
+)
+
+# Create imported target mongo::bsoncxx_static
+add_library(mongo::bsoncxx_static STATIC IMPORTED)
+
+set_target_properties(mongo::bsoncxx_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "BSONCXX_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/bsoncxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "Boost::boost;\$<LINK_ONLY:mongo::bson_static>"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/bsoncxx_targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# This file does not depend on other imported targets which have
+# been exported from the same project but in a separate export set.
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config.cmake
new file mode 100644
index 0000000..53c8084
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-3.7.0/libbsoncxx-config.cmake
@@ -0,0 +1,56 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bsoncxx_shared' instead.  Consult the example projects for further details.")
+
+set(LIBBSONCXX_VERSION_MAJOR 3)
+set(LIBBSONCXX_VERSION_MINOR 7)
+set(LIBBSONCXX_VERSION_PATCH 0)
+set(LIBBSONCXX_PACKAGE_VERSION 3.7.0)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbsoncxx-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBBSONCXX_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/bsoncxx/v_noabi")
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library() to pick that up.
+find_library(LIBBSONCXX_LIBRARY_PATH bsoncxx PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBBSONCXX_LIBRARIES ${LIBBSONCXX_LIBRARY_PATH})
+
+set(LIBBSONCXX_DEFINITIONS "")
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config.cmake
new file mode 100644
index 0000000..d5a2d45
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libbsoncxx-static-3.7.0/libbsoncxx-static-config.cmake
@@ -0,0 +1,61 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::bsoncxx_static' instead.  Consult the example projects for further details.")
+
+set(LIBBSONCXX_STATIC_VERSION_MAJOR 3)
+set(LIBBSONCXX_STATIC_VERSION_MINOR 7)
+set(LIBBSONCXX_STATIC_VERSION_PATCH 0)
+set(LIBBSONCXX_STATIC_PACKAGE_VERSION 3.7.0)
+
+# We need to pull in the libbson-static-* library to read the BSON_STATIC_LIBRARIES variable.  We
+# can ignore the other variables exported by that package (e.g. BSON_STATIC_INCLUDE_DIRS,
+# BSON_STATIC_DEFINITIONS), since bsoncxx hides the existence of libbson from the user through
+# abstraction.  bsoncxx users generally should not need to include libbson headers directly.
+find_package(libbson-static-1.0 1.13.0 REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libbsoncxx-static-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBBSONCXX_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/bsoncxx/v_noabi")
+
+# We want to provide an absolute path to the library and we know the directory and the base name,
+# but not the suffix, so we use CMake's find_library() to pick that up.
+find_library(LIBBSONCXX_STATIC_LIBRARY_PATH bsoncxx-static PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBBSONCXX_STATIC_LIBRARIES ${LIBBSONCXX_STATIC_LIBRARY_PATH} ${BSON_STATIC_LIBRARIES})
+
+set(LIBBSONCXX_STATIC_DEFINITIONS BSONCXX_STATIC)
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-3.7.0/libmongocxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-3.7.0/libmongocxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-3.7.0/libmongocxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-3.7.0/libmongocxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-3.7.0/libmongocxx-config.cmake
new file mode 100644
index 0000000..9a2b3f5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-3.7.0/libmongocxx-config.cmake
@@ -0,0 +1,60 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongocxx_shared' instead.  Consult the example projects for further details.")
+
+set(LIBMONGOCXX_VERSION_MAJOR 3)
+set(LIBMONGOCXX_VERSION_MINOR 7)
+set(LIBMONGOCXX_VERSION_PATCH 0)
+set(LIBMONGOCXX_PACKAGE_VERSION 3.7.0)
+
+find_package(libbsoncxx 3.7.0 REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongocxx-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBMONGOCXX_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/mongocxx/v_noabi")
+
+set(LIBMONGOCXX_INCLUDE_DIRS ${LIBMONGOCXX_INCLUDE_DIRS} ${LIBBSONCXX_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the
+# directory and the base name, but not the suffix, so we use CMake's
+# find_library() to pick that up.
+find_library(LIBMONGOCXX_LIBRARY_PATH mongocxx PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBMONGOCXX_LIBRARIES ${LIBMONGOCXX_LIBRARY_PATH} ${LIBBSONCXX_LIBRARIES})
+
+set(LIBMONGOCXX_DEFINITIONS ${LIBBSONCXX_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config.cmake
new file mode 100644
index 0000000..12461b8
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/libmongocxx-static-3.7.0/libmongocxx-static-config.cmake
@@ -0,0 +1,65 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+message(WARNING "This CMake target is deprecated.  Use 'mongo::mongocxx_static' instead.  Consult the example projects for further details.")
+
+set(LIBMONGOCXX_STATIC_VERSION_MAJOR 3)
+set(LIBMONGOCXX_STATIC_VERSION_MINOR 7)
+set(LIBMONGOCXX_STATIC_VERSION_PATCH 0)
+set(LIBMONGOCXX_STATIC_PACKAGE_VERSION 3.7.0)
+
+find_package(libbsoncxx-static 3.7.0 REQUIRED)
+
+# We need to pull in the libmongoc-static-* library to read the MONGOC_STATIC_LIBRARIES variable.
+# We can ignore the other variables exported by that package (e.g. MONGOC_STATIC_INCLUDE_DIRS,
+# MONGOC_STATIC_DEFINITIONS), since mongocxx hides the existence of libmongoc from the user through
+# abstraction.  mongocxx users generally should not need to include libmongoc headers directly.
+find_package(libmongoc-static-1.0 1.19.0 REQUIRED)
+
+
+####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() #######
+####### Any changes to this file will be overwritten by the next CMake run ####
+####### The input file was libmongocxx-static-config.cmake.in                            ########
+
+get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)
+
+macro(set_and_check _var _file)
+  set(${_var} "${_file}")
+  if(NOT EXISTS "${_file}")
+    message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !")
+  endif()
+endmacro()
+
+macro(check_required_components _NAME)
+  foreach(comp ${${_NAME}_FIND_COMPONENTS})
+    if(NOT ${_NAME}_${comp}_FOUND)
+      if(${_NAME}_FIND_REQUIRED_${comp})
+        set(${_NAME}_FOUND FALSE)
+      endif()
+    endif()
+  endforeach()
+endmacro()
+
+####################################################################################
+
+set_and_check(LIBMONGOCXX_STATIC_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include/mongocxx/v_noabi")
+
+set(LIBMONGOCXX_STATIC_INCLUDE_DIRS ${LIBMONGOCXX_STATIC_INCLUDE_DIRS} ${LIBBSONCXX_STATIC_INCLUDE_DIRS})
+
+# We want to provide an absolute path to the library and we know the directory and the base name,
+# but not the suffix, so we use CMake's find_library() to pick that up.
+find_library(LIBMONGOCXX_STATIC_LIBRARY_PATH mongocxx-static PATHS "${PACKAGE_PREFIX_DIR}/lib" NO_DEFAULT_PATH)
+set(LIBMONGOCXX_STATIC_LIBRARIES ${LIBMONGOCXX_STATIC_LIBRARY_PATH} ${LIBBSONCXX_STATIC_LIBRARIES} ${MONGOC_STATIC_LIBRARIES})
+
+set(LIBMONGOCXX_STATIC_DEFINITIONS MONGOCXX_STATIC ${LIBBSONCXX_STATIC_DEFINITIONS})
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx-config-version.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx-config-version.cmake
new file mode 100644
index 0000000..60e9d00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx-config-version.cmake
@@ -0,0 +1,70 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
+# but only if the requested major version is the same as the current one.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+
+set(PACKAGE_VERSION "3.7.0")
+
+if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+
+  if("3.7.0" MATCHES "^([0-9]+)\\.")
+    set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
+      string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
+    endif()
+  else()
+    set(CVF_VERSION_MAJOR "3.7.0")
+  endif()
+
+  if(PACKAGE_FIND_VERSION_RANGE)
+    # both endpoints of the range must have the expected major version
+    math (EXPR CVF_VERSION_MAJOR_NEXT "${CVF_VERSION_MAJOR} + 1")
+    if (NOT PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        OR ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX_MAJOR STREQUAL CVF_VERSION_MAJOR)
+          OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND NOT PACKAGE_FIND_VERSION_MAX VERSION_LESS_EQUAL CVF_VERSION_MAJOR_NEXT)))
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    elseif(PACKAGE_FIND_VERSION_MIN_MAJOR STREQUAL CVF_VERSION_MAJOR
+        AND ((PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "INCLUDE" AND PACKAGE_VERSION VERSION_LESS_EQUAL PACKAGE_FIND_VERSION_MAX)
+        OR (PACKAGE_FIND_VERSION_RANGE_MAX STREQUAL "EXCLUDE" AND PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION_MAX)))
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+  else()
+    if(PACKAGE_FIND_VERSION_MAJOR STREQUAL CVF_VERSION_MAJOR)
+      set(PACKAGE_VERSION_COMPATIBLE TRUE)
+    else()
+      set(PACKAGE_VERSION_COMPATIBLE FALSE)
+    endif()
+
+    if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
+      set(PACKAGE_VERSION_EXACT TRUE)
+    endif()
+  endif()
+endif()
+
+
+# if the installed project requested no architecture check, don't perform the check
+if("FALSE")
+  return()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+  return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
+if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8")
+  math(EXPR installedBits "8 * 8")
+  set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+  set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx-config.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx-config.cmake
new file mode 100644
index 0000000..4d6cf86
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx-config.cmake
@@ -0,0 +1,4 @@
+include(CMakeFindDependencyMacro)
+find_dependency(mongoc-1.0 REQUIRED)
+find_dependency(bsoncxx REQUIRED)
+include("${CMAKE_CURRENT_LIST_DIR}/mongocxx_targets.cmake")
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx_targets-release.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx_targets-release.cmake
new file mode 100644
index 0000000..917b5a9
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx_targets-release.cmake
@@ -0,0 +1,29 @@
+#----------------------------------------------------------------
+# Generated CMake target import file for configuration "Release".
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Import target "mongo::mongocxx_shared" for configuration "Release"
+set_property(TARGET mongo::mongocxx_shared APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongocxx_shared PROPERTIES
+  IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/mongocxx.lib"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/mongocxx.dll"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongocxx_shared )
+list(APPEND _cmake_import_check_files_for_mongo::mongocxx_shared "${_IMPORT_PREFIX}/lib/mongocxx.lib" "${_IMPORT_PREFIX}/bin/mongocxx.dll" )
+
+# Import target "mongo::mongocxx_static" for configuration "Release"
+set_property(TARGET mongo::mongocxx_static APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+set_target_properties(mongo::mongocxx_static PROPERTIES
+  IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
+  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/mongocxx-static.lib"
+  )
+
+list(APPEND _cmake_import_check_targets mongo::mongocxx_static )
+list(APPEND _cmake_import_check_files_for_mongo::mongocxx_static "${_IMPORT_PREFIX}/lib/mongocxx-static.lib" )
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx_targets.cmake b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx_targets.cmake
new file mode 100644
index 0000000..372b9b6
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/cmake/mongocxx-3.7.0/mongocxx_targets.cmake
@@ -0,0 +1,132 @@
+# Generated by CMake
+
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
+   message(FATAL_ERROR "CMake >= 2.8.0 required")
+endif()
+if(CMAKE_VERSION VERSION_LESS "2.8.3")
+   message(FATAL_ERROR "CMake >= 2.8.3 required")
+endif()
+cmake_policy(PUSH)
+cmake_policy(VERSION 2.8.3...3.23)
+#----------------------------------------------------------------
+# Generated CMake target import file.
+#----------------------------------------------------------------
+
+# Commands may need to know the format version.
+set(CMAKE_IMPORT_FILE_VERSION 1)
+
+# Protect against multiple inclusion, which would fail when already imported targets are added once more.
+set(_cmake_targets_defined "")
+set(_cmake_targets_not_defined "")
+set(_cmake_expected_targets "")
+foreach(_cmake_expected_target IN ITEMS mongo::mongocxx_shared mongo::mongocxx_static)
+  list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
+  if(TARGET "${_cmake_expected_target}")
+    list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
+  else()
+    list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
+  endif()
+endforeach()
+unset(_cmake_expected_target)
+if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
+  unset(_cmake_targets_defined)
+  unset(_cmake_targets_not_defined)
+  unset(_cmake_expected_targets)
+  unset(CMAKE_IMPORT_FILE_VERSION)
+  cmake_policy(POP)
+  return()
+endif()
+if(NOT _cmake_targets_defined STREQUAL "")
+  string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
+  string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
+  message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
+endif()
+unset(_cmake_targets_defined)
+unset(_cmake_targets_not_defined)
+unset(_cmake_expected_targets)
+
+
+# Compute the installation prefix relative to this file.
+get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+if(_IMPORT_PREFIX STREQUAL "/")
+  set(_IMPORT_PREFIX "")
+endif()
+
+# Create imported target mongo::mongocxx_shared
+add_library(mongo::mongocxx_shared SHARED IMPORTED)
+
+set_target_properties(mongo::mongocxx_shared PROPERTIES
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/mongocxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "mongo::bsoncxx_shared"
+)
+
+# Create imported target mongo::mongocxx_static
+add_library(mongo::mongocxx_static STATIC IMPORTED)
+
+set_target_properties(mongo::mongocxx_static PROPERTIES
+  INTERFACE_COMPILE_DEFINITIONS "MONGOCXX_STATIC"
+  INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include/mongocxx/v_noabi"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:mongo::mongoc_static>;mongo::bsoncxx_static"
+)
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+  message(FATAL_ERROR "This file relies on consumers using CMake 2.8.12 or greater.")
+endif()
+
+# Load information for each installed configuration.
+file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/mongocxx_targets-*.cmake")
+foreach(_cmake_config_file IN LISTS _cmake_config_files)
+  include("${_cmake_config_file}")
+endforeach()
+unset(_cmake_config_file)
+unset(_cmake_config_files)
+
+# Cleanup temporary variables.
+set(_IMPORT_PREFIX)
+
+# Loop over all imported files and verify that they actually exist
+foreach(_cmake_target IN LISTS _cmake_import_check_targets)
+  foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
+    if(NOT EXISTS "${_cmake_file}")
+      message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
+   \"${_cmake_file}\"
+but this file does not exist.  Possible reasons include:
+* The file was deleted, renamed, or moved to another location.
+* An install or uninstall procedure did not complete successfully.
+* The installation package was faulty and contained
+   \"${CMAKE_CURRENT_LIST_FILE}\"
+but not all the files it references.
+")
+    endif()
+  endforeach()
+  unset(_cmake_file)
+  unset("_cmake_import_check_files_for_${_cmake_target}")
+endforeach()
+unset(_cmake_target)
+unset(_cmake_import_check_targets)
+
+# Make sure the targets which have been exported in some other
+# export set exist.
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+foreach(_target "mongo::bsoncxx_shared" "mongo::bsoncxx_static" )
+  if(NOT TARGET "${_target}" )
+    set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets "${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets} ${_target}")
+  endif()
+endforeach()
+
+if(DEFINED ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+  if(CMAKE_FIND_PACKAGE_NAME)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+    set( ${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  else()
+    message(FATAL_ERROR "The following imported targets are referenced, but are missing: ${${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets}")
+  endif()
+endif()
+unset(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE_targets)
+
+# Commands beyond this point should not need to know the version.
+set(CMAKE_IMPORT_FILE_VERSION)
+cmake_policy(POP)
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/mongocxx-static.lib b/Source/ThirdParty/mongodb_cpp/Win64/lib/mongocxx-static.lib
new file mode 100644
index 0000000..4585bd7
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/mongocxx-static.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2550f43148b27a9347c1d06ccf1930bf7e812dad32c5934528f23f2b609a9ef
+size 15361290
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/mongocxx.lib b/Source/ThirdParty/mongodb_cpp/Win64/lib/mongocxx.lib
new file mode 100644
index 0000000..4facbab
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/mongocxx.lib
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a3c4e3dd27349cc72160308785a79790b6b627ba84b148959c5b468a84ad9ee0
+size 906192
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libbsoncxx-static.pc b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libbsoncxx-static.pc
new file mode 100644
index 0000000..b8af684
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libbsoncxx-static.pc
@@ -0,0 +1,25 @@
+# Copyright 2017 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Win64
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libbsoncxx-static
+Description: The MongoDB C++11 BSON Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Requires: libbson-static-1.0 >= 1.13.0
+Cflags: -I${includedir}/bsoncxx/v_noabi -DBSONCXX_STATIC
+Libs: -L${libdir} -lbsoncxx-static
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libbsoncxx.pc b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libbsoncxx.pc
new file mode 100644
index 0000000..2406397
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libbsoncxx.pc
@@ -0,0 +1,24 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Win64
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libbsoncxx
+Description: The MongoDB C++11 BSON Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Cflags: -I${includedir}/bsoncxx/v_noabi
+Libs: -L${libdir} -lbsoncxx
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libmongocxx-static.pc b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libmongocxx-static.pc
new file mode 100644
index 0000000..3cfaee2
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libmongocxx-static.pc
@@ -0,0 +1,25 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Win64
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libmongocxx
+Description: The MongoDB C++11 Driver Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Requires: libbsoncxx-static >= 3.7.0, libmongoc-static-1.0 >= 1.19.0
+Cflags: -I${includedir}/mongocxx/v_noabi -DMONGOCXX_STATIC
+Libs: -L${libdir} -lmongocxx-static
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libmongocxx.pc b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libmongocxx.pc
new file mode 100644
index 0000000..c2a0ff5
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/lib/pkgconfig/libmongocxx.pc
@@ -0,0 +1,25 @@
+# Copyright 2016 MongoDB Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+prefix=C:/UnrealProjects/ArrivalSim/Plugins/UnrealArrival/Source/ThirdParty/mongodb_cpp/Win64
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libmongocxx
+Description: The MongoDB C++11 Driver Library
+URL: http://github.com/mongodb/mongo-cxx-driver
+Version: 3.7.0
+Requires: libbsoncxx >= 3.7.0
+Cflags: -I${includedir}/mongocxx/v_noabi
+Libs: -L${libdir} -lmongocxx
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/LICENSE b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/LICENSE
new file mode 100644
index 0000000..e06d208
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/README.md b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/README.md
new file mode 100644
index 0000000..d15f44f
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/README.md
@@ -0,0 +1,58 @@
+# MongoDB C++ Driver 
+[![Travis Build Status](https://travis-ci.org/mongodb/mongo-cxx-driver.svg?branch=master)](https://travis-ci.org/mongodb/mongo-cxx-driver)
+[![Evergreen Build Status](https://img.shields.io/badge/build-evergreen-brightgreen)](https://evergreen.mongodb.com/waterfall/cxx-driver)
+[![codecov](https://codecov.io/gh/mongodb/mongo-cxx-driver/branch/master/graph/badge.svg)](https://codecov.io/gh/mongodb/mongo-cxx-driver)
+[![Documentation](https://img.shields.io/badge/docs-doxygen-blue.svg)](https://mongocxx.org/api/mongocxx-v3/)
+[![Documentation](https://img.shields.io/badge/docs-mongocxx-green.svg)](https://mongocxx.org/)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/mongodb/mongo-cxx-driver/blob/master/LICENSE)
+
+Welcome to the MongoDB C++ Driver!
+
+## Branches - `releases/stable` versus `master`
+
+The default checkout branch of this repository is `releases/stable`. 
+This will always contain the latest stable release of the driver. The
+ `master` branch is used for active development. `master` should 
+**only** be used when making contributions back to the driver, as it 
+is not stable for use in production.
+
+See [Driver Status by family and version](#driver-status-by-family-and-version)
+for more details about the various versions of the driver.
+
+## Resources
+
+* [MongoDB C++ Driver Installation](https://mongocxx.org/mongocxx-v3/installation/)
+* [MongoDB C++ Driver Quickstart](https://mongocxx.org/mongocxx-v3/tutorial/)
+* [MongoDB C++ Driver Manual](https://mongocxx.org)
+* [MongoDB C++ Driver API Documentation](https://mongocxx.org/api/current/)
+* [MongoDB C++ Driver Contribution guidelines](https://mongocxx.org/contributing/)
+* [MongoDB Database Manual](https://docs.mongodb.com/manual/)
+
+## Driver status by family and version
+
+Stability indicates whether this driver is recommended for production use.
+Currently, no drivers guarantee API or ABI stability.
+
+| Family/version       | Stability   | Development         | Purpose                             |
+| -------------------- | ----------- | ------------------- | ----------------------------------- |
+| (repo master branch) | Unstable    | Active development  | New feature development             |
+| mongocxx 3.6.x       | Stable      | Bug fixes only      | Current stable C++ driver release   |
+| mongocxx 3.5.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.4.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.3.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.2.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.1.x       | Stable      | None                | Previous stable C++ driver release  |
+| mongocxx 3.0.x       | Stable      | None                | Previous stable C++ driver release  |
+
+## MongoDB compatibility
+
+Compatibility of each C++ driver version with each MongoDB server is documented in the [MongoDB manual](https://docs.mongodb.com/drivers/cxx#mongodb-compatibility).
+
+## Bugs and issues
+
+See our [JIRA project](http://jira.mongodb.org/browse/CXX).
+
+## License
+
+The source files in this repository are made available under the terms of
+the Apache License, version 2.0.
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/THIRD-PARTY-NOTICES b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/THIRD-PARTY-NOTICES
new file mode 100644
index 0000000..1c12e00
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/THIRD-PARTY-NOTICES
@@ -0,0 +1,38 @@
+MongoDB uses third-party libraries or other resources that may
+be distributed under licenses different than the MongoDB software.
+
+In the event that we accidentally failed to list a required notice,
+please bring it to our attention through any of the ways detailed here:
+
+    https://jira.mongodb.org/browse/CXX
+
+The attached notices are provided for information only.
+
+For any licenses that require disclosure of source, sources are available at
+https://github.com/mongodb/mongo-cxx-driver.
+
+1) License Notice for the Catch library
+---------------------------------------
+[Note: Catch is used only for testing.]
+
+Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
+
+Distributed under the Boost Software License, Version 1.0.
+See http://www.boost.org/LICENSE_1_0.txt
+
+2) License Notice for the MNMLSTC library
+-----------------------------------------
+[Note: MNMLSTC is the default polyfill.  If configured, it is downloaded
+and compiled during the build.]
+
+Copyright (c) 2013 - 2015 MNMLSTC
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not
+use this software except in compliance with the License. You may obtain a
+copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+License for the specific language governing permissions and limitations
+under the License.
diff --git a/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/uninstall.cmd b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/uninstall.cmd
new file mode 100644
index 0000000..a42f093
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/Win64/share/mongo-cxx-driver/uninstall.cmd
@@ -0,0 +1,503 @@
+@echo off
+
+REM Mongo C++ Driver uninstall program, generated with CMake
+
+REM Copyright 2018-present MongoDB, Inc.
+REM
+REM Licensed under the Apache License, Version 2.0 (the "License");
+REM you may not use this file except in compliance with the License.
+REM You may obtain a copy of the License at
+REM
+REM   http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+
+
+REM Windows does not handle a batch script deleting itself during
+REM execution.  Copy the uninstall program into the TEMP directory from
+REM the environment and run from there so everything in the installation
+REM is deleted and the copied program deletes itself at the end.
+if /i "%~dp0" NEQ "%TEMP%\" (
+   copy "%~f0" "%TEMP%\mongoc-%~nx0" >NUL
+   "%TEMP%\mongoc-%~nx0" & del "%TEMP%\mongoc-%~nx0"
+)
+
+pushd C:\UnrealProjects\ArrivalSim\Plugins\UnrealArrival\Source\ThirdParty\mongodb_cpp\Win64\
+
+echo Removing file bin\msvcp140.dll
+del bin\msvcp140.dll || echo ... not removed
+echo Removing file bin\msvcp140_1.dll
+del bin\msvcp140_1.dll || echo ... not removed
+echo Removing file bin\msvcp140_2.dll
+del bin\msvcp140_2.dll || echo ... not removed
+echo Removing file bin\msvcp140_atomic_wait.dll
+del bin\msvcp140_atomic_wait.dll || echo ... not removed
+echo Removing file bin\msvcp140_codecvt_ids.dll
+del bin\msvcp140_codecvt_ids.dll || echo ... not removed
+echo Removing file bin\vcruntime140_1.dll
+del bin\vcruntime140_1.dll || echo ... not removed
+echo Removing file bin\vcruntime140.dll
+del bin\vcruntime140.dll || echo ... not removed
+echo Removing file bin\concrt140.dll
+del bin\concrt140.dll || echo ... not removed
+echo Removing file share\mongo-cxx-driver\LICENSE
+del share\mongo-cxx-driver\LICENSE || echo ... not removed
+echo Removing file share\mongo-cxx-driver\README.md
+del share\mongo-cxx-driver\README.md || echo ... not removed
+echo Removing file share\mongo-cxx-driver\THIRD-PARTY-NOTICES
+del share\mongo-cxx-driver\THIRD-PARTY-NOTICES || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\array\element.hpp
+del include\bsoncxx\v_noabi\bsoncxx\array\element.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\array\value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\array\value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\array\view.hpp
+del include\bsoncxx\v_noabi\bsoncxx\array\view.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\array\view_or_value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\array\view_or_value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\basic\array.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\basic\array.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\basic\document.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\basic\document.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\basic\helpers.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\basic\helpers.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\basic\impl.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\basic\impl.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\basic\kvp.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\basic\kvp.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\basic\sub_array.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\basic\sub_array.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\basic\sub_document.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\basic\sub_document.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\concatenate.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\concatenate.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\core.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\core.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\list.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\list.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\array.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\array.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\array_context.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\array_context.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\closed_context.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\closed_context.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\document.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\document.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\helpers.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\helpers.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\key_context.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\key_context.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\single_context.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\single_context.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\builder\stream\value_context.hpp
+del include\bsoncxx\v_noabi\bsoncxx\builder\stream\value_context.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\config\compiler.hpp
+del include\bsoncxx\v_noabi\bsoncxx\config\compiler.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\config\postlude.hpp
+del include\bsoncxx\v_noabi\bsoncxx\config\postlude.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\config\prelude.hpp
+del include\bsoncxx\v_noabi\bsoncxx\config\prelude.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\decimal128.hpp
+del include\bsoncxx\v_noabi\bsoncxx\decimal128.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\document\element.hpp
+del include\bsoncxx\v_noabi\bsoncxx\document\element.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\document\value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\document\value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\document\view.hpp
+del include\bsoncxx\v_noabi\bsoncxx\document\view.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\document\view_or_value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\document\view_or_value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\enums\binary_sub_type.hpp
+del include\bsoncxx\v_noabi\bsoncxx\enums\binary_sub_type.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\enums\type.hpp
+del include\bsoncxx\v_noabi\bsoncxx\enums\type.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\exception\error_code.hpp
+del include\bsoncxx\v_noabi\bsoncxx\exception\error_code.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\exception\exception.hpp
+del include\bsoncxx\v_noabi\bsoncxx\exception\exception.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\json.hpp
+del include\bsoncxx\v_noabi\bsoncxx\json.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\oid.hpp
+del include\bsoncxx\v_noabi\bsoncxx\oid.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\stdx\make_unique.hpp
+del include\bsoncxx\v_noabi\bsoncxx\stdx\make_unique.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\stdx\optional.hpp
+del include\bsoncxx\v_noabi\bsoncxx\stdx\optional.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\stdx\string_view.hpp
+del include\bsoncxx\v_noabi\bsoncxx\stdx\string_view.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\string\to_string.hpp
+del include\bsoncxx\v_noabi\bsoncxx\string\to_string.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\string\view_or_value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\string\view_or_value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\types\bson_value\make_value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\types\bson_value\make_value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\types\bson_value\value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\types\bson_value\value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\types\bson_value\view.hpp
+del include\bsoncxx\v_noabi\bsoncxx\types\bson_value\view.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\types\bson_value\view_or_value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\types\bson_value\view_or_value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\types\value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\types\value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\types.hpp
+del include\bsoncxx\v_noabi\bsoncxx\types.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\util\functor.hpp
+del include\bsoncxx\v_noabi\bsoncxx\util\functor.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\validate.hpp
+del include\bsoncxx\v_noabi\bsoncxx\validate.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\view_or_value.hpp
+del include\bsoncxx\v_noabi\bsoncxx\view_or_value.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\config\export.hpp
+del include\bsoncxx\v_noabi\bsoncxx\config\export.hpp || echo ... not removed
+echo Removing file lib\cmake\libbsoncxx-3.7.0\libbsoncxx-config.cmake
+del lib\cmake\libbsoncxx-3.7.0\libbsoncxx-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libbsoncxx-3.7.0\libbsoncxx-config-version.cmake
+del lib\cmake\libbsoncxx-3.7.0\libbsoncxx-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\libbsoncxx-static-3.7.0\libbsoncxx-static-config.cmake
+del lib\cmake\libbsoncxx-static-3.7.0\libbsoncxx-static-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libbsoncxx-static-3.7.0\libbsoncxx-static-config-version.cmake
+del lib\cmake\libbsoncxx-static-3.7.0\libbsoncxx-static-config-version.cmake || echo ... not removed
+echo Removing file lib\bsoncxx.lib
+del lib\bsoncxx.lib || echo ... not removed
+echo Removing file bin\bsoncxx.dll
+del bin\bsoncxx.dll || echo ... not removed
+echo Removing file lib\bsoncxx-static.lib
+del lib\bsoncxx-static.lib || echo ... not removed
+echo Removing file lib\cmake\bsoncxx-3.7.0\bsoncxx_targets.cmake
+del lib\cmake\bsoncxx-3.7.0\bsoncxx_targets.cmake || echo ... not removed
+echo Removing file lib\cmake\bsoncxx-3.7.0\bsoncxx_targets-release.cmake
+del lib\cmake\bsoncxx-3.7.0\bsoncxx_targets-release.cmake || echo ... not removed
+echo Removing file lib\cmake\bsoncxx-3.7.0\bsoncxx-config-version.cmake
+del lib\cmake\bsoncxx-3.7.0\bsoncxx-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\bsoncxx-3.7.0\bsoncxx-config.cmake
+del lib\cmake\bsoncxx-3.7.0\bsoncxx-config.cmake || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\config\config.hpp
+del include\bsoncxx\v_noabi\bsoncxx\config\config.hpp || echo ... not removed
+echo Removing file include\bsoncxx\v_noabi\bsoncxx\config\version.hpp
+del include\bsoncxx\v_noabi\bsoncxx\config\version.hpp || echo ... not removed
+echo Removing file lib\pkgconfig\libbsoncxx.pc
+del lib\pkgconfig\libbsoncxx.pc || echo ... not removed
+echo Removing file lib\pkgconfig\libbsoncxx-static.pc
+del lib\pkgconfig\libbsoncxx-static.pc || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\bulk_write.hpp
+del include\mongocxx\v_noabi\mongocxx\bulk_write.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\change_stream.hpp
+del include\mongocxx\v_noabi\mongocxx\change_stream.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\client.hpp
+del include\mongocxx\v_noabi\mongocxx\client.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\client_encryption.hpp
+del include\mongocxx\v_noabi\mongocxx\client_encryption.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\client_session.hpp
+del include\mongocxx\v_noabi\mongocxx\client_session.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\collection.hpp
+del include\mongocxx\v_noabi\mongocxx\collection.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\config\compiler.hpp
+del include\mongocxx\v_noabi\mongocxx\config\compiler.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\config\postlude.hpp
+del include\mongocxx\v_noabi\mongocxx\config\postlude.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\config\prelude.hpp
+del include\mongocxx\v_noabi\mongocxx\config\prelude.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\cursor.hpp
+del include\mongocxx\v_noabi\mongocxx\cursor.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\database.hpp
+del include\mongocxx\v_noabi\mongocxx\database.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\command_failed_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\command_failed_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\command_started_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\command_started_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\command_succeeded_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\command_succeeded_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\heartbeat_failed_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\heartbeat_failed_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\heartbeat_started_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\heartbeat_started_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\heartbeat_succeeded_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\heartbeat_succeeded_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\server_changed_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\server_changed_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\server_closed_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\server_closed_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\server_description.hpp
+del include\mongocxx\v_noabi\mongocxx\events\server_description.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\server_opening_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\server_opening_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\topology_changed_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\topology_changed_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\topology_closed_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\topology_closed_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\topology_description.hpp
+del include\mongocxx\v_noabi\mongocxx\events\topology_description.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\events\topology_opening_event.hpp
+del include\mongocxx\v_noabi\mongocxx\events\topology_opening_event.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\authentication_exception.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\authentication_exception.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\bulk_write_exception.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\bulk_write_exception.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\error_code.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\error_code.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\exception.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\exception.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\gridfs_exception.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\gridfs_exception.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\logic_error.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\logic_error.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\operation_exception.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\operation_exception.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\query_exception.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\query_exception.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\server_error_code.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\server_error_code.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\exception\write_exception.hpp
+del include\mongocxx\v_noabi\mongocxx\exception\write_exception.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\gridfs\bucket.hpp
+del include\mongocxx\v_noabi\mongocxx\gridfs\bucket.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\gridfs\downloader.hpp
+del include\mongocxx\v_noabi\mongocxx\gridfs\downloader.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\gridfs\uploader.hpp
+del include\mongocxx\v_noabi\mongocxx\gridfs\uploader.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\hint.hpp
+del include\mongocxx\v_noabi\mongocxx\hint.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\index_model.hpp
+del include\mongocxx\v_noabi\mongocxx\index_model.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\index_view.hpp
+del include\mongocxx\v_noabi\mongocxx\index_view.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\instance.hpp
+del include\mongocxx\v_noabi\mongocxx\instance.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\logger.hpp
+del include\mongocxx\v_noabi\mongocxx\logger.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\model\delete_many.hpp
+del include\mongocxx\v_noabi\mongocxx\model\delete_many.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\model\delete_one.hpp
+del include\mongocxx\v_noabi\mongocxx\model\delete_one.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\model\insert_one.hpp
+del include\mongocxx\v_noabi\mongocxx\model\insert_one.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\model\replace_one.hpp
+del include\mongocxx\v_noabi\mongocxx\model\replace_one.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\model\update_many.hpp
+del include\mongocxx\v_noabi\mongocxx\model\update_many.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\model\update_one.hpp
+del include\mongocxx\v_noabi\mongocxx\model\update_one.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\model\write.hpp
+del include\mongocxx\v_noabi\mongocxx\model\write.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\aggregate.hpp
+del include\mongocxx\v_noabi\mongocxx\options\aggregate.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\apm.hpp
+del include\mongocxx\v_noabi\mongocxx\options\apm.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\auto_encryption.hpp
+del include\mongocxx\v_noabi\mongocxx\options\auto_encryption.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\bulk_write.hpp
+del include\mongocxx\v_noabi\mongocxx\options\bulk_write.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\change_stream.hpp
+del include\mongocxx\v_noabi\mongocxx\options\change_stream.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\client.hpp
+del include\mongocxx\v_noabi\mongocxx\options\client.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\client_encryption.hpp
+del include\mongocxx\v_noabi\mongocxx\options\client_encryption.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\client_session.hpp
+del include\mongocxx\v_noabi\mongocxx\options\client_session.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\count.hpp
+del include\mongocxx\v_noabi\mongocxx\options\count.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\create_collection.hpp
+del include\mongocxx\v_noabi\mongocxx\options\create_collection.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\data_key.hpp
+del include\mongocxx\v_noabi\mongocxx\options\data_key.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\delete.hpp
+del include\mongocxx\v_noabi\mongocxx\options\delete.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\distinct.hpp
+del include\mongocxx\v_noabi\mongocxx\options\distinct.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\encrypt.hpp
+del include\mongocxx\v_noabi\mongocxx\options\encrypt.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\estimated_document_count.hpp
+del include\mongocxx\v_noabi\mongocxx\options\estimated_document_count.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\find.hpp
+del include\mongocxx\v_noabi\mongocxx\options\find.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\find_one_and_delete.hpp
+del include\mongocxx\v_noabi\mongocxx\options\find_one_and_delete.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\find_one_and_replace.hpp
+del include\mongocxx\v_noabi\mongocxx\options\find_one_and_replace.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\find_one_and_update.hpp
+del include\mongocxx\v_noabi\mongocxx\options\find_one_and_update.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\find_one_common_options.hpp
+del include\mongocxx\v_noabi\mongocxx\options\find_one_common_options.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\gridfs\bucket.hpp
+del include\mongocxx\v_noabi\mongocxx\options\gridfs\bucket.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\gridfs\upload.hpp
+del include\mongocxx\v_noabi\mongocxx\options\gridfs\upload.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\index.hpp
+del include\mongocxx\v_noabi\mongocxx\options\index.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\index_view.hpp
+del include\mongocxx\v_noabi\mongocxx\options\index_view.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\insert.hpp
+del include\mongocxx\v_noabi\mongocxx\options\insert.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\pool.hpp
+del include\mongocxx\v_noabi\mongocxx\options\pool.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\replace.hpp
+del include\mongocxx\v_noabi\mongocxx\options\replace.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\server_api.hpp
+del include\mongocxx\v_noabi\mongocxx\options\server_api.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\ssl.hpp
+del include\mongocxx\v_noabi\mongocxx\options\ssl.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\tls.hpp
+del include\mongocxx\v_noabi\mongocxx\options\tls.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\transaction.hpp
+del include\mongocxx\v_noabi\mongocxx\options\transaction.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\options\update.hpp
+del include\mongocxx\v_noabi\mongocxx\options\update.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\pipeline.hpp
+del include\mongocxx\v_noabi\mongocxx\pipeline.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\pool.hpp
+del include\mongocxx\v_noabi\mongocxx\pool.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\read_concern.hpp
+del include\mongocxx\v_noabi\mongocxx\read_concern.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\read_preference.hpp
+del include\mongocxx\v_noabi\mongocxx\read_preference.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\result\bulk_write.hpp
+del include\mongocxx\v_noabi\mongocxx\result\bulk_write.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\result\delete.hpp
+del include\mongocxx\v_noabi\mongocxx\result\delete.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\result\gridfs\upload.hpp
+del include\mongocxx\v_noabi\mongocxx\result\gridfs\upload.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\result\insert_many.hpp
+del include\mongocxx\v_noabi\mongocxx\result\insert_many.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\result\insert_one.hpp
+del include\mongocxx\v_noabi\mongocxx\result\insert_one.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\result\replace_one.hpp
+del include\mongocxx\v_noabi\mongocxx\result\replace_one.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\result\update.hpp
+del include\mongocxx\v_noabi\mongocxx\result\update.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\stdx.hpp
+del include\mongocxx\v_noabi\mongocxx\stdx.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\uri.hpp
+del include\mongocxx\v_noabi\mongocxx\uri.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\validation_criteria.hpp
+del include\mongocxx\v_noabi\mongocxx\validation_criteria.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\write_concern.hpp
+del include\mongocxx\v_noabi\mongocxx\write_concern.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\write_type.hpp
+del include\mongocxx\v_noabi\mongocxx\write_type.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\config\export.hpp
+del include\mongocxx\v_noabi\mongocxx\config\export.hpp || echo ... not removed
+echo Removing file lib\cmake\libmongocxx-3.7.0\libmongocxx-config.cmake
+del lib\cmake\libmongocxx-3.7.0\libmongocxx-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libmongocxx-3.7.0\libmongocxx-config-version.cmake
+del lib\cmake\libmongocxx-3.7.0\libmongocxx-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\libmongocxx-static-3.7.0\libmongocxx-static-config.cmake
+del lib\cmake\libmongocxx-static-3.7.0\libmongocxx-static-config.cmake || echo ... not removed
+echo Removing file lib\cmake\libmongocxx-static-3.7.0\libmongocxx-static-config-version.cmake
+del lib\cmake\libmongocxx-static-3.7.0\libmongocxx-static-config-version.cmake || echo ... not removed
+echo Removing file lib\mongocxx.lib
+del lib\mongocxx.lib || echo ... not removed
+echo Removing file bin\mongocxx.dll
+del bin\mongocxx.dll || echo ... not removed
+echo Removing file lib\mongocxx-static.lib
+del lib\mongocxx-static.lib || echo ... not removed
+echo Removing file lib\cmake\mongocxx-3.7.0\mongocxx_targets.cmake
+del lib\cmake\mongocxx-3.7.0\mongocxx_targets.cmake || echo ... not removed
+echo Removing file lib\cmake\mongocxx-3.7.0\mongocxx_targets-release.cmake
+del lib\cmake\mongocxx-3.7.0\mongocxx_targets-release.cmake || echo ... not removed
+echo Removing file lib\cmake\mongocxx-3.7.0\mongocxx-config-version.cmake
+del lib\cmake\mongocxx-3.7.0\mongocxx-config-version.cmake || echo ... not removed
+echo Removing file lib\cmake\mongocxx-3.7.0\mongocxx-config.cmake
+del lib\cmake\mongocxx-3.7.0\mongocxx-config.cmake || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\config\config.hpp
+del include\mongocxx\v_noabi\mongocxx\config\config.hpp || echo ... not removed
+echo Removing file include\mongocxx\v_noabi\mongocxx\config\version.hpp
+del include\mongocxx\v_noabi\mongocxx\config\version.hpp || echo ... not removed
+echo Removing file lib\pkgconfig\libmongocxx.pc
+del lib\pkgconfig\libmongocxx.pc || echo ... not removed
+echo Removing file lib\pkgconfig\libmongocxx-static.pc
+del lib\pkgconfig\libmongocxx-static.pc || echo ... not removed
+echo Removing file share\mongo-cxx-driver\uninstall.cmd
+del share\mongo-cxx-driver\uninstall.cmd || echo ... not removed
+echo Removing directory bin
+(rmdir bin 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\array
+(rmdir include\bsoncxx\v_noabi\bsoncxx\array 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\builder\basic
+(rmdir include\bsoncxx\v_noabi\bsoncxx\builder\basic 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\builder\stream
+(rmdir include\bsoncxx\v_noabi\bsoncxx\builder\stream 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\builder
+(rmdir include\bsoncxx\v_noabi\bsoncxx\builder 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\config
+(rmdir include\bsoncxx\v_noabi\bsoncxx\config 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\document
+(rmdir include\bsoncxx\v_noabi\bsoncxx\document 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\enums
+(rmdir include\bsoncxx\v_noabi\bsoncxx\enums 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\exception
+(rmdir include\bsoncxx\v_noabi\bsoncxx\exception 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\stdx
+(rmdir include\bsoncxx\v_noabi\bsoncxx\stdx 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\string
+(rmdir include\bsoncxx\v_noabi\bsoncxx\string 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\types\bson_value
+(rmdir include\bsoncxx\v_noabi\bsoncxx\types\bson_value 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\types
+(rmdir include\bsoncxx\v_noabi\bsoncxx\types 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx\util
+(rmdir include\bsoncxx\v_noabi\bsoncxx\util 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi\bsoncxx
+(rmdir include\bsoncxx\v_noabi\bsoncxx 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx\v_noabi
+(rmdir include\bsoncxx\v_noabi 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\bsoncxx
+(rmdir include\bsoncxx 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\config
+(rmdir include\mongocxx\v_noabi\mongocxx\config 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\events
+(rmdir include\mongocxx\v_noabi\mongocxx\events 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\exception
+(rmdir include\mongocxx\v_noabi\mongocxx\exception 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\gridfs
+(rmdir include\mongocxx\v_noabi\mongocxx\gridfs 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\model
+(rmdir include\mongocxx\v_noabi\mongocxx\model 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\options\gridfs
+(rmdir include\mongocxx\v_noabi\mongocxx\options\gridfs 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\options
+(rmdir include\mongocxx\v_noabi\mongocxx\options 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\result\gridfs
+(rmdir include\mongocxx\v_noabi\mongocxx\result\gridfs 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx\result
+(rmdir include\mongocxx\v_noabi\mongocxx\result 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi\mongocxx
+(rmdir include\mongocxx\v_noabi\mongocxx 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx\v_noabi
+(rmdir include\mongocxx\v_noabi 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include\mongocxx
+(rmdir include\mongocxx 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory include
+(rmdir include 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\bsoncxx-3.7.0
+(rmdir lib\cmake\bsoncxx-3.7.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libbsoncxx-3.7.0
+(rmdir lib\cmake\libbsoncxx-3.7.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libbsoncxx-static-3.7.0
+(rmdir lib\cmake\libbsoncxx-static-3.7.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libmongocxx-3.7.0
+(rmdir lib\cmake\libmongocxx-3.7.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\libmongocxx-static-3.7.0
+(rmdir lib\cmake\libmongocxx-static-3.7.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake\mongocxx-3.7.0
+(rmdir lib\cmake\mongocxx-3.7.0 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\cmake
+(rmdir lib\cmake 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib\pkgconfig
+(rmdir lib\pkgconfig 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory lib
+(rmdir lib 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory share\mongo-cxx-driver
+(rmdir share\mongo-cxx-driver 2>NUL) || echo ... not removed (probably not empty)
+echo Removing directory share
+(rmdir share 2>NUL) || echo ... not removed (probably not empty)
+cd ..
+echo Removing top-level installation directory: C:\UnrealProjects\ArrivalSim\Plugins\UnrealArrival\Source\ThirdParty\mongodb_cpp\Win64\
+(rmdir C:\UnrealProjects\ArrivalSim\Plugins\UnrealArrival\Source\ThirdParty\mongodb_cpp\Win64\ 2>NUL) || echo ... not removed (probably not empty)
+
+REM Return to the directory from which the program was called
+popd
diff --git a/Source/ThirdParty/mongodb_cpp/build_linux.bat b/Source/ThirdParty/mongodb_cpp/build_linux.bat
new file mode 100644
index 0000000..5565442
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/build_linux.bat
@@ -0,0 +1,17 @@
+setlocal
+
+SET TOOLCHAIN_FILE="%cd%\..\unreal-linux-from-windows-toolchain.cmake"
+SET MAKE_EXE="C:\Program Files (x86)\GnuWin32\bin\make.exe"
+SET MONGODB_C_DIR="%cd%\..\mongodb_c\Linux"
+SET BOOST_DIR="C:\UE\UE_5.1\Engine\Source\ThirdParty\Boost\boost-1_70_0" 
+SET INSTALL_DIR="%cd%\Linux"
+
+rd \s \q %INSTALL_DIR%
+mkdir %INSTALL_DIR%
+
+if not exist src\build_linux mkdir src\build_linux
+pushd src\build_linux
+
+cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=%TOOLCHAIN_FILE% -DCMAKE_MAKE_PROGRAM=%MAKE_EXE% -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_PREFIX_PATH=%MONGODB_C_DIR% -DBUILD_VERSION=3.7.0 -DBOOST_ROOT=%BOOST_DIR% -DBSONCXX_POLY_USE_BOOST=ON -DENABLE_TESTS=OFF -DBUILD_SHARED_AND_STATIC_LIBS=1 .. && make -j8 install
+
+popd
diff --git a/Source/ThirdParty/mongodb_cpp/build_win.bat b/Source/ThirdParty/mongodb_cpp/build_win.bat
new file mode 100644
index 0000000..befb592
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/build_win.bat
@@ -0,0 +1,14 @@
+setlocal
+
+SET INSTALL_DIR="%cd%\Win64"
+
+SET MONGODB_C_DIR="%cd%\..\mongodb_c\Win64"
+SET BOOST_DIR="C:\UE\UE_5.1\Engine\Source\ThirdParty\Boost\boost-1_70_0"
+
+rd /s /q %INSTALL_DIR%
+mkdir %INSTALL_DIR%
+
+if not exist src\build_win mkdir src\build_win
+pushd src\build_win
+cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DCMAKE_PREFIX_PATH=%MONGODB_C_DIR% -DBUILD_VERSION=3.7.0 -DBOOST_ROOT=%BOOST_DIR% -DBUILD_SHARED_AND_STATIC_LIBS=1 -DBUILD_SHARED_LIBS_WITH_STATIC_MONGOC=1 .. && nmake install
+popd
diff --git a/Source/ThirdParty/mongodb_cpp/mongo-cxx-driver-r3.7.0.zip b/Source/ThirdParty/mongodb_cpp/mongo-cxx-driver-r3.7.0.zip
new file mode 100644
index 0000000..0d4d0b1
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/mongo-cxx-driver-r3.7.0.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6ea2c245c8e48afd0dddeef0e3d36b393f4350b4c78b204ffc7c8986e2424fa
+size 2209079
diff --git a/Source/ThirdParty/mongodb_cpp/mongodb_cpp.Build.cs b/Source/ThirdParty/mongodb_cpp/mongodb_cpp.Build.cs
new file mode 100644
index 0000000..32ce9db
--- /dev/null
+++ b/Source/ThirdParty/mongodb_cpp/mongodb_cpp.Build.cs
@@ -0,0 +1,46 @@
+using System.IO;
+using UnrealBuildTool;
+
+using System;
+
+public class mongodb_cpp : ModuleRules
+{
+	private string BinariesPath
+	{
+		get { return Path.GetFullPath(Path.Combine(ModuleDirectory, "../../../Binaries/", Target.Platform.ToString())); }
+	}
+
+	public mongodb_cpp(ReadOnlyTargetRules Target) : base(Target)
+	{
+		Type = ModuleType.External;
+
+		if (Target.Platform == UnrealTargetPlatform.Win64)
+		{
+			string InstallDir = Path.Combine(ModuleDirectory, "Win64");
+			PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "bsoncxx", "v_noabi"));
+			PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "mongocxx", "v_noabi"));
+			PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "bsoncxx-static.lib"));
+			PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "mongocxx-static.lib"));
+			PublicDefinitions.Add("MONGOCXX_STATIC");
+            PublicDefinitions.Add("BSONCXX_STATIC");
+        }
+		else if (Target.Platform == UnrealTargetPlatform.Linux)
+		{
+            string InstallDir = Path.Combine(ModuleDirectory, "Linux");
+            PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "bsoncxx", "v_noabi"));
+            PublicIncludePaths.Add(Path.Combine(InstallDir, "include", "mongocxx", "v_noabi"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "libbsoncxx-static.a"));
+            PublicAdditionalLibraries.Add(Path.Combine(InstallDir, "lib", "libmongocxx-static.a"));
+            PublicDefinitions.Add("MONGOCXX_STATIC");
+            PublicDefinitions.Add("BSONCXX_STATIC");
+        }
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Boost",
+				"mongodb_c"
+			}
+		);
+	}
+}
diff --git a/Source/ThirdParty/unreal-linux-from-windows-toolchain.cmake b/Source/ThirdParty/unreal-linux-from-windows-toolchain.cmake
new file mode 100644
index 0000000..442cd8c
--- /dev/null
+++ b/Source/ThirdParty/unreal-linux-from-windows-toolchain.cmake
@@ -0,0 +1,19 @@
+set (UE_LIBCXX C:/UE/UE_5.1/Engine/Source/ThirdParty/Unix/LibCxx)
+set (LINUX_MULTIARCH_ROOT C:/UnrealToolchains/v20_clang-13.0.1-centos7)
+set (TARGET_TRIPLE x86_64-unknown-linux-gnu)
+set (LD_FLAGS "-nodefaultlibs -stdlib=libc++ -lc -lm -lgcc_s -lgcc ${UE_LIBCXX}/lib/Unix/x86_64-unknown-linux-gnu/libc++.a ${UE_LIBCXX}/lib/Unix/x86_64-unknown-linux-gnu/libc++abi.a")
+
+set (CMAKE_SYSTEM_NAME Linux)
+set (CMAKE_CROSSCOMPILING TRUE)
+set (CMAKE_SYSTEM_PROCESSOR x86_64)
+set (CMAKE_SYSROOT ${LINUX_MULTIARCH_ROOT}/${TARGET_TRIPLE})
+set (CMAKE_C_COMPILER  ${CMAKE_SYSROOT}/bin/clang.exe)
+set (CMAKE_CXX_COMPILER ${CMAKE_SYSROOT}/bin/clang++.exe)
+set (CMAKE_C_COMPILER_TARGET ${TARGET_TRIPLE})
+set (CMAKE_CXX_COMPILER_TARGET ${TARGET_TRIPLE})
+set (CMAKE_ASM_COMPILER_TARGET ${TARGET_TRIPLE})
+set (CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT} )
+set (CMAKE_CXX_FLAGS "-nostdinc++ -nostdlib++ -I${UE_LIBCXX}/include -I${UE_LIBCXX}/include/c++/v1 ")
+set (CMAKE_MODULE_LINKER_FLAGS ${LD_FLAGS})
+set (CMAKE_EXE_LINKER_FLAGS_INIT ${LD_FLAGS})
+set (CMAKE_SHARED_LINKER_FLAGS_INIT ${LD_FLAGS})
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/GhostPedestrian.cpp b/Source/UnrealSoda/Private/Actors/GhostPedestrian.cpp
new file mode 100644
index 0000000..d13d017
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostPedestrian.cpp
@@ -0,0 +1,428 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/GhostPedestrian.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Soda/Actors/NavigationRoute.h"
+#include "Soda/UnrealSoda.h"
+#include "Components/BoxComponent.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/DBGateway.h"
+#include "Soda/SodaApp.h"
+
+#include "bsoncxx/builder/stream/helpers.hpp"
+#include "bsoncxx/exception/exception.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+#include "bsoncxx/builder/stream/array.hpp"
+#include "bsoncxx/json.hpp"
+
+AGhostPedestrian::AGhostPedestrian()
+{
+	Mesh = CreateDefaultSubobject< USkeletalMeshComponent >(TEXT("PedestrianMesh"));
+	//Mesh->SetCollisionProfileName(UCollisionProfile::Vehicle_ProfileName);
+	Mesh->SetSimulatePhysics(false);
+	Mesh->SetGenerateOverlapEvents(true);
+	Mesh->SetCollisionObjectType(ECollisionChannel::ECC_PhysicsBody);
+	Mesh->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_WorldStatic, ECollisionResponse::ECR_Block);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_WorldDynamic, ECollisionResponse::ECR_Block);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Visibility, ECollisionResponse::ECR_Overlap);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Camera, ECollisionResponse::ECR_Overlap);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Pawn, ECollisionResponse::ECR_Ignore);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_PhysicsBody, ECollisionResponse::ECR_Ignore);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Vehicle, ECollisionResponse::ECR_Ignore);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Destructible, ECollisionResponse::ECR_Ignore);
+
+	RootComponent = Mesh;
+	PrimaryActorTick.bCanEverTick = true;
+	USodaStatics::TagActor(this, true, EActorTagMethod::ForceCustomLabel, ESegmObjectLabel::Pedestrians);
+}
+
+void AGhostPedestrian::BeginPlay()
+{
+	Super::BeginPlay();
+
+	InitTransform = GetActorTransform();
+
+	TrajectoryPlaner.Init(GetWorld());
+}
+
+void AGhostPedestrian::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	TrajectoryPlaner.Deinit();
+}
+
+FVector AGhostPedestrian::GetVelocity() const
+{
+	if (bIsMoving && TrajectoryPlaner.GetWayPointsNum())
+	{
+		return GetActorTransform().TransformVectorNoScale(FVector(CurrentVelocity, 0, 0));
+	}
+	else
+	{
+		return FVector::ZeroVector;
+	}
+}
+
+void AGhostPedestrian::InputWidgetDelta(const USceneComponent* WidgetTargetComponent, FTransform& NewWidgetTransform)
+{
+	if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+	{
+		if (bJoinToInitialRoute)
+		{
+			const float Key = RoutePlanner->Spline->FindInputKeyClosestToWorldLocation(NewWidgetTransform.GetTranslation());
+			NewWidgetTransform = RoutePlanner->Spline->GetTransformAtSplineInputKey(Key, ESplineCoordinateSpace::World);
+			InitialRouteOffset = RoutePlanner->Spline->GetDistanceAlongSplineAtSplineInputKey(Key);
+		}
+		else
+		{
+			UpdateJoinCurve();
+		}
+	}
+}
+
+void AGhostPedestrian::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+
+	APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
+	check(PlayerController);
+
+	USodaGameModeComponent * GameMode  = USodaGameModeComponent::GetChecked();
+
+	if (bIsMoving)
+	{
+
+		if (TrajectoryPlaner.UpdateTarjectory(GetWorld(), GetTransform(), 10000))
+		{
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+		}
+
+		if (CurrentSplineOffset > TrajectoryPlaner.GetRouteSpline()->GetSplineLength())
+		{
+			CurrentVelocity = 0;
+		}
+
+		if (TrajectoryPlaner.GetWayPointsNum())
+		{
+			if (bCheckCollision && CheckCollision(TrajectoryPlaner.GetRouteSpline()->GetTransformAtSplineInputKey(TrajectoryPlaner.GetCurrentSplineKey(), ESplineCoordinateSpace::World)))
+			{
+				CurrentVelocity = 0;
+			}
+			else
+			{
+				CurrentSplineOffset += DeltaTime * CurrentVelocity;
+				CurrentVelocity = FMath::Clamp(CurrentVelocity + Acceleration * DeltaTime, 0.f, Velocity);
+				TrajectoryPlaner.SetSplineOffset(CurrentSplineOffset);
+				SetActorTransform(AdjustTransform(TrajectoryPlaner.GetRouteSpline()->GetTransformAtSplineInputKey(TrajectoryPlaner.GetCurrentSplineKey(), ESplineCoordinateSpace::World)));
+			}
+		}
+
+		if (Dataset)
+		{
+			Dataset->BeginRow();
+			OnPushDataset();
+			Dataset->EndRow();
+		}
+	}
+	else
+	{
+		if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+		{
+			if (RoutePlanner->Spline->GetSplineGuid() != SplineGuid)
+			{
+				if (bJoinToInitialRoute)
+				{
+					SetActorTransform(AdjustTransform(RoutePlanner->Spline->GetTransformAtDistanceAlongSpline(InitialRouteOffset, ESplineCoordinateSpace::World)));
+				}
+				else
+				{
+					UpdateJoinCurve();
+				}
+				SplineGuid = RoutePlanner->Spline->GetSplineGuid();
+			}
+		}
+	}
+
+	if (!GameMode->IsScenarioRunning() && !bJoinToInitialRoute)
+	{
+		for (int i = 1; i < JoiningCurvePoints.Num(); ++i)
+		{
+			const FVector & P0 = JoiningCurvePoints[i - 1];
+			const FVector & P1 = JoiningCurvePoints[i];
+			DrawDebugLine(GetWorld(), P0, P1, FColor(180, 180, 255), false, -1.f, 0, 2);
+		}
+	}
+
+	if (bDrawDebugRoute)
+	{
+		TrajectoryPlaner.DrawRoute(this);
+	}
+
+}
+
+
+void AGhostPedestrian::GoToLeftRoute(float StaticOffset, float VelocityToOffset)
+{
+	if (bIsMoving)
+	{
+		if (TrajectoryPlaner.GoToLeftRoute(GetWorld(), GetActorTransform(), StaticOffset + CurrentVelocity * VelocityToOffset))
+		{
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+		}
+	}
+}
+
+void AGhostPedestrian::GoToRightRoute(float StaticOffset, float VelocityToOffset)
+{
+	if (bIsMoving)
+	{
+		if (TrajectoryPlaner.GoToRightRoute(GetWorld(), GetActorTransform(), StaticOffset + CurrentVelocity * VelocityToOffset))
+		{
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+		}
+	}
+}
+
+void AGhostPedestrian::GoToRoute(TSoftObjectPtr<ANavigationRoute> Route, float StaticOffset, float VelocityToOffset)
+{
+	if (bIsMoving && Route.Get())
+	{
+		if (TrajectoryPlaner.GoToRoute(GetWorld(), GetActorTransform(), StaticOffset + CurrentVelocity * VelocityToOffset, Route.Get()))
+		{
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+		}
+	}
+}
+
+void AGhostPedestrian::StartMoving()
+{
+	if (!bIsMoving)
+	{
+		CurrentVelocity = 0;
+		CurrentSplineOffset = 0;
+		TrajectoryPlaner.Reset();
+		InitTransform = GetActorTransform();
+		bIsMoving = true;
+
+		if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+		{
+			if (!bJoinToInitialRoute)
+			{
+				UpdateJoinCurve();
+				auto Poits = JoiningCurvePoints;
+				Poits.Pop(false);
+				TrajectoryPlaner.AddRouteByWaypoints(Poits, RoutePlanner, false, false, false);
+			}
+			TrajectoryPlaner.AddRouteBySpline(RoutePlanner->Spline, InitialRouteOffset, RoutePlanner, false, false, true);
+		}
+
+		ReceiveStartMoving();
+	}
+}
+
+void AGhostPedestrian::StopMoving()
+{
+	if (bIsMoving)
+	{
+		SetActorTransform(InitTransform);
+		bIsMoving = false;
+		CurrentVelocity = 0;
+		CurrentSplineOffset = 0;
+		TrajectoryPlaner.Reset();
+
+		ReceiveStopMoving();
+	}
+}
+
+bool AGhostPedestrian::IsLinkedToRoute() const
+{
+	return !TrajectoryPlaner.IsEnded();
+}
+
+void AGhostPedestrian::ScenarioBegin()
+{
+	ISodaActor::ScenarioBegin();
+
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	if (bRecordDataset && soda::FDBGateway::Instance().GetStatus() == soda::EDBGatewayStatus::Connected && soda::FDBGateway::Instance().IsDatasetRecording())
+	{
+		soda::FBsonDocument Doc;
+		GenerateDatasetDescription(Doc);
+		Dataset = soda::FDBGateway::Instance().CreateActorDataset(GetName(), "pedestrian", GetClass()->GetName(), *Doc);
+	}
+
+	StartMoving();
+}
+
+void AGhostPedestrian::ScenarioEnd()
+{
+	ISodaActor::ScenarioEnd();
+	StopMoving();
+
+	if (Dataset)
+	{
+		Dataset->PushAsync();
+		Dataset.Reset();
+	}
+}
+
+void AGhostPedestrian::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) 
+{
+	IEditableObject::RuntimePostEditChangeProperty(PropertyChangedEvent);
+}
+
+void AGhostPedestrian::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) 
+{
+	IEditableObject::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+	SplineGuid = FGuid::NewGuid();
+}
+
+void AGhostPedestrian::UpdateJoinCurve()
+{
+	JoiningCurvePoints.Reset();
+
+	if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+	{
+		const FTransform StartTransform = GetActorTransform();
+		const FTransform EndTransform = RoutePlanner->Spline->GetTransformAtDistanceAlongSpline(InitialRouteOffset, ESplineCoordinateSpace::World, false);
+		const float TangentSize = (StartTransform.GetTranslation() - EndTransform.GetTranslation()).Size();
+
+		FInterpCurveVector JoiningCurve;
+		JoiningCurve.Points.Add(FInterpCurvePoint<FVector>(
+			0,
+			StartTransform.GetTranslation(),
+			FVector::ZeroVector,
+			StartTransform.GetUnitAxis(EAxis::X) * TangentSize,
+			CIM_CurveUser
+		));
+		JoiningCurve.Points.Add(FInterpCurvePoint<FVector>(
+			1,
+			EndTransform.GetTranslation(),
+			EndTransform.GetUnitAxis(EAxis::X) * TangentSize,
+			FVector::ZeroVector,
+			CIM_CurveUser
+		));
+
+		const int Steps = 20;
+		for (int i = 0; i <= Steps; ++i)
+		{
+			JoiningCurvePoints.Add(JoiningCurve.Eval(i / float(Steps)));
+		}
+	}
+}
+
+FTransform AGhostPedestrian::AdjustTransform(const FTransform& InTransform)
+{
+	FTransform Transform = InTransform;
+	Transform.SetRotation(InTransform.GetRotation() * RotationOffset.Quaternion());
+	return Transform;
+}
+
+bool AGhostPedestrian::CheckCollision(const FTransform & Transform)
+{
+	//FVector GetActorLocation();
+	//FQuat Rotation = TrajectoryPlaner.RouteSpline->GetQuaternionAtSplineInputKey(TrajectoryPlaner.CurrentSplineKey, ESplineCoordinateSpace::World);
+
+	FCollisionQueryParams Params(TEXT("PedestrianCheckCollision"), true, this);
+	//Params.bFindInitialOverlaps = false;
+	//FCollisionObjectQueryParams ObjectParams{ ECollisionChannel::ECC_Visibility };
+
+	FHitResult OutHit;
+	GetWorld()->SweepSingleByChannel(OutHit, Transform.GetLocation(), Transform.GetLocation() + Transform.GetRotation().GetForwardVector() * TraceLookAhead + Transform.GetRotation().GetUpVector() * TraceUpOffes, FQuat::Identity, ECollisionChannel::ECC_WorldDynamic, FCollisionShape::MakeCapsule(TraceCapsuleRadius, TraceCapsuleHalfHeigh), Params);
+	
+	return IsValid(OutHit.GetActor());
+}
+
+void AGhostPedestrian::GenerateDatasetDescription(soda::FBsonDocument& Doc) const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	FExtent Extent = USodaStatics::CalculateActorExtent(this);
+	*Doc
+		<< "extents" << open_document
+		<< "forward" << Extent.Forward
+		<< "backward" << Extent.Backward
+		<< "left" << Extent.Left
+		<< "right" << Extent.Right
+		<< "up" << Extent.Up
+		<< "down" << Extent.Down
+		<< close_document;
+}
+
+void AGhostPedestrian::OnPushDataset() const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	if (Dataset.IsValid())
+	{
+		try
+		{
+			FVector Location = GetActorLocation();
+			FRotator Rotation = GetActorRotation();
+			FVector Vel = FVector(CurrentVelocity, 0, 0);
+			//FVector AngVel = FVector(0, 0, 0);
+
+			Dataset->GetRowDoc()
+				<< "ts" << std::int64_t(soda::RawTimestamp<std::chrono::microseconds>(SodaApp.GetSimulationTimestamp()))
+				<< "loc" << open_array << Location.X << Location.Y << Location.Z << close_array
+				<< "rot" << open_array << Rotation.Pitch << Rotation.Yaw << Rotation.Roll << close_array
+				<< "vel" << open_array << Vel.X << Vel.Y << Vel.Z << close_array;
+
+			auto RouteDoc = Dataset->GetRowDoc() << "route" << open_document;
+			if (const FTrajectoryPlaner::FWayPoint* WayPoint = TrajectoryPlaner.GetCurrentWayPoint())
+			{
+				if (WayPoint->OwndedRoute.IsValid())
+				{
+					RouteDoc << "name" << TCHAR_TO_UTF8(*WayPoint->OwndedRoute->GetName());
+				}
+				else
+				{
+					RouteDoc << "name" << "";
+				}
+			}
+			else
+			{
+				RouteDoc << "name" << "";
+			}
+			RouteDoc << close_document;
+
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("AGhostPedestrian::OnPushDataset(); %s"), UTF8_TO_TCHAR(e.what()));
+		}
+	}
+}
+
+const FSodaActorDescriptor* AGhostPedestrian::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Pedestrian"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT(""), /*SubCategory*/
+		TEXT("SodaIcons.Walking"), /*Icon*/
+		true, /*bAllowTransform*/
+		false, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/AnimNode_GhostWheelController.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/AnimNode_GhostWheelController.cpp
new file mode 100644
index 0000000..cc74508
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/AnimNode_GhostWheelController.cpp
@@ -0,0 +1,144 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/GhostVehicle/AnimNode_GhostWheelController.h"
+#include "Soda/Actors/GhostVehicle/GhostVehicle.h"
+#include "AnimationRuntime.h"
+#include "Animation/AnimStats.h"
+#include "WheeledVehiclePawn.h"
+
+
+FAnimNode_GhostWheelController::FAnimNode_GhostWheelController()
+{
+	AnimInstanceProxy = nullptr;
+}
+
+void FAnimNode_GhostWheelController::GatherDebugData(FNodeDebugData& DebugData)
+{
+	FString DebugLine = DebugData.GetNodeName(this);
+
+	DebugLine += "(";
+	AddDebugNodeData(DebugLine);
+	DebugLine += ")";
+
+	DebugData.AddDebugItem(DebugLine);
+
+	const TArray<FGhostWheelAnimationData>& WheelAnimData = AnimInstanceProxy->GetWheelAnimData();
+	for (const FWheelLookupData& Wheel : Wheels)
+	{
+		if (Wheel.BoneReference.BoneIndex != INDEX_NONE)
+		{
+			DebugLine = FString::Printf(TEXT(" [Wheel Index : %d] Bone: %s , Rotation Offset : %s, Location Offset : %s"),
+				Wheel.WheelIndex, *Wheel.BoneReference.BoneName.ToString(), *WheelAnimData[Wheel.WheelIndex].RotOffset.ToString(), *WheelAnimData[Wheel.WheelIndex].LocOffset.ToString());
+		}
+		else
+		{
+			DebugLine = FString::Printf(TEXT(" [Wheel Index : %d] Bone: %s (invalid bone)"),
+				Wheel.WheelIndex, *Wheel.BoneReference.BoneName.ToString());
+		}
+
+		DebugData.AddDebugItem(DebugLine);
+	}
+
+	ComponentPose.GatherDebugData(DebugData);
+}
+
+void FAnimNode_GhostWheelController::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseContext& Output, TArray<FBoneTransform>& OutBoneTransforms)
+{
+	check(OutBoneTransforms.Num() == 0);
+
+	ANIM_MT_SCOPE_CYCLE_COUNTER_VERBOSE(WheelController, !IsInGameThread());
+
+	const TArray<FGhostWheelAnimationData>& WheelAnimData = AnimInstanceProxy->GetWheelAnimData();
+
+	const FBoneContainer& BoneContainer = Output.Pose.GetPose().GetBoneContainer();
+	for(const FWheelLookupData& Wheel : Wheels)
+	{
+		if (Wheel.BoneReference.IsValidToEvaluate(BoneContainer))
+		{
+			if (Wheel.WheelIndex < WheelAnimData.Num())
+			{
+				FCompactPoseBoneIndex WheelSimBoneIndex = Wheel.BoneReference.GetCompactPoseIndex(BoneContainer);
+
+				// the way we apply transform is same as FMatrix or FTransform
+				// we apply scale first, and rotation, and translation
+				// if you'd like to translate first, you'll need two nodes that first node does translate and second nodes to rotate. 
+				FTransform NewBoneTM = Output.Pose.GetComponentSpaceTransform(WheelSimBoneIndex);
+
+				FAnimationRuntime::ConvertCSTransformToBoneSpace(Output.AnimInstanceProxy->GetComponentTransform(), Output.Pose, NewBoneTM, WheelSimBoneIndex, BCS_ComponentSpace);
+
+				// Apply rotation offset
+				const FQuat BoneQuat(WheelAnimData[Wheel.WheelIndex].RotOffset);
+				NewBoneTM.SetRotation(BoneQuat * NewBoneTM.GetRotation());
+
+				// Apply loc offset
+				NewBoneTM.AddToTranslation(WheelAnimData[Wheel.WheelIndex].LocOffset);
+
+				// Convert back to Component Space.
+				FAnimationRuntime::ConvertBoneSpaceTransformToCS(Output.AnimInstanceProxy->GetComponentTransform(), Output.Pose, NewBoneTM, WheelSimBoneIndex, BCS_ComponentSpace);
+
+				// add back to it
+				OutBoneTransforms.Add(FBoneTransform(WheelSimBoneIndex, NewBoneTM));
+			}
+			else
+			{
+				UE_LOG(LogChaos, Error, TEXT("Invalid condition Wheel.WheelIndex (%d) >= WheelAnimData.Num (%d)"), Wheel.WheelIndex, WheelAnimData.Num());
+			}
+		}
+	}
+
+#if ANIM_TRACE_ENABLED
+	for (const FWheelLookupData& Wheel : Wheels)
+	{
+		if ((Wheel.BoneReference.BoneIndex != INDEX_NONE) && (Wheel.WheelIndex < WheelAnimData.Num()))
+		{
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Name"), Wheel.WheelIndex), *Wheel.BoneReference.BoneName.ToString());
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Rotation Offset"), Wheel.WheelIndex), WheelAnimData[Wheel.WheelIndex].RotOffset);
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Location Offset"), Wheel.WheelIndex), WheelAnimData[Wheel.WheelIndex].LocOffset);
+		}
+		else
+		{
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Name"), Wheel.WheelIndex), *FString::Printf(TEXT("%s (invalid)"), *Wheel.BoneReference.BoneName.ToString()));
+		}
+	}
+#endif
+}
+
+bool FAnimNode_GhostWheelController::IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones) 
+{
+	// if both bones are valid
+	for (const FWheelLookupData& Wheel : Wheels)
+	{
+		// if one of them is valid
+		if (Wheel.BoneReference.IsValidToEvaluate(RequiredBones) == true)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void FAnimNode_GhostWheelController::InitializeBoneReferences(const FBoneContainer& RequiredBones) 
+{
+	const TArray<FGhostWheelAnimationData>& WheelAnimData = AnimInstanceProxy->GetWheelAnimData();
+	const int32 NumWheels = WheelAnimData.Num();
+	Wheels.Empty(NumWheels);
+
+	for (int32 WheelIndex = 0; WheelIndex < NumWheels; ++WheelIndex)
+	{
+		FWheelLookupData* Wheel = new(Wheels)FWheelLookupData();
+		Wheel->WheelIndex = WheelIndex;
+		Wheel->BoneReference.BoneName = WheelAnimData[WheelIndex].BoneName;
+		Wheel->BoneReference.Initialize(RequiredBones);
+	}
+
+	// sort by bone indices
+	Wheels.Sort([](const FWheelLookupData& L, const FWheelLookupData& R) { return L.BoneReference.BoneIndex < R.BoneReference.BoneIndex; });
+}
+
+void FAnimNode_GhostWheelController::Initialize_AnyThread(const FAnimationInitializeContext& Context)
+{
+	AnimInstanceProxy = (FGhostVehicleAnimationInstanceProxy*)Context.AnimInstanceProxy;	//TODO: This is cached for now because we need it in eval bone transforms.
+}
+
+
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.cpp
new file mode 100644
index 0000000..ccb8015
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.cpp
@@ -0,0 +1,152 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.h"
+#include "Soda/Actors/GhostVehicle/GhostVehicle.h"
+#include "AnimationRuntime.h"
+#include "Animation/AnimStats.h"
+#include "WheeledVehiclePawn.h"
+
+FAnimNode_StageCoachGhostWheelController::FAnimNode_StageCoachGhostWheelController()
+	: WheelSpokeCount(5)
+	, MaxAngularVelocity(256.f)
+	, ShutterSpeed(30.f)
+	, StageCoachBlend(730.f)
+{
+	AnimInstanceProxy = nullptr;
+}
+
+void FAnimNode_StageCoachGhostWheelController::GatherDebugData(FNodeDebugData& DebugData)
+{
+	FString DebugLine = DebugData.GetNodeName(this);
+
+	DebugLine += "(";
+	AddDebugNodeData(DebugLine);
+	DebugLine += ")";
+
+	DebugData.AddDebugItem(DebugLine);
+
+	const TArray<FGhostWheelAnimationData>& WheelAnimData = AnimInstanceProxy->GetWheelAnimData();
+	for (const FWheelLookupData& Wheel : Wheels)
+	{
+		if (Wheel.BoneReference.BoneIndex != INDEX_NONE)
+		{
+			DebugLine = FString::Printf(TEXT(" [Wheel Index : %d] Bone: %s , Rotation Offset : %s, Location Offset : %s"),
+				Wheel.WheelIndex, *Wheel.BoneReference.BoneName.ToString(), *WheelAnimData[Wheel.WheelIndex].RotOffset.ToString(), *WheelAnimData[Wheel.WheelIndex].LocOffset.ToString());
+		}
+		else
+		{
+			DebugLine = FString::Printf(TEXT(" [Wheel Index : %d] Bone: %s (invalid bone)"),
+				Wheel.WheelIndex, *Wheel.BoneReference.BoneName.ToString());
+		}
+
+		DebugData.AddDebugItem(DebugLine);
+	}
+
+	ComponentPose.GatherDebugData(DebugData);
+}
+
+void FAnimNode_StageCoachGhostWheelController::EvaluateSkeletalControl_AnyThread(FComponentSpacePoseContext& Output, TArray<FBoneTransform>& OutBoneTransforms)
+{
+	check(OutBoneTransforms.Num() == 0);
+
+	ANIM_MT_SCOPE_CYCLE_COUNTER_VERBOSE(StageCoachWheelController, !IsInGameThread());
+
+	const TArray<FGhostWheelAnimationData>& WheelAnimData = AnimInstanceProxy->GetWheelAnimData();
+
+	const FBoneContainer& BoneContainer = Output.Pose.GetPose().GetBoneContainer();
+	for(const FWheelLookupData& Wheel : Wheels)
+	{
+		if (Wheel.BoneReference.IsValidToEvaluate(BoneContainer))
+		{ 
+			if (Wheel.WheelIndex < WheelAnimData.Num())
+			{
+				FCompactPoseBoneIndex WheelSimBoneIndex = Wheel.BoneReference.GetCompactPoseIndex(BoneContainer);
+
+				// the way we apply transform is same as FMatrix or FTransform
+				// we apply scale first, and rotation, and translation
+				// if you'd like to translate first, you'll need two nodes that first node does translate and second nodes to rotate. 
+				FTransform NewBoneTM = Output.Pose.GetComponentSpaceTransform(WheelSimBoneIndex);
+
+				FAnimationRuntime::ConvertCSTransformToBoneSpace(Output.AnimInstanceProxy->GetComponentTransform(), Output.Pose, NewBoneTM, WheelSimBoneIndex, BCS_ComponentSpace);
+
+				// Apply rotation offset
+				const FQuat BoneQuat(WheelAnimData[Wheel.WheelIndex].RotOffset);
+				NewBoneTM.SetRotation(BoneQuat * NewBoneTM.GetRotation());
+
+				// Apply loc offset
+				NewBoneTM.AddToTranslation(WheelAnimData[Wheel.WheelIndex].LocOffset);
+
+				// Convert back to Component Space.
+				FAnimationRuntime::ConvertBoneSpaceTransformToCS(Output.AnimInstanceProxy->GetComponentTransform(), Output.Pose, NewBoneTM, WheelSimBoneIndex, BCS_ComponentSpace);
+
+				// add back to it
+				OutBoneTransforms.Add(FBoneTransform(WheelSimBoneIndex, NewBoneTM));
+			}
+			else
+			{
+				UE_LOG(LogChaos, Error, TEXT("Invalid condition Wheel.WheelIndex (%d) >= WheelAnimData.Num (%d)"), Wheel.WheelIndex, WheelAnimData.Num());
+			}
+		}
+	}
+
+#if ANIM_TRACE_ENABLED
+	for (const FWheelLookupData& Wheel : Wheels)
+	{
+		if ((Wheel.BoneReference.BoneIndex != INDEX_NONE) && (Wheel.WheelIndex < WheelAnimData.Num()))
+		{
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Name"), Wheel.WheelIndex), *Wheel.BoneReference.BoneName.ToString());
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Rotation Offset"), Wheel.WheelIndex), WheelAnimData[Wheel.WheelIndex].RotOffset);
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Location Offset"), Wheel.WheelIndex), WheelAnimData[Wheel.WheelIndex].LocOffset);
+		}
+		else
+		{
+			TRACE_ANIM_NODE_VALUE(Output, *FString::Printf(TEXT("Wheel %d Name"), Wheel.WheelIndex), *FString::Printf(TEXT("%s (invalid)"), *Wheel.BoneReference.BoneName.ToString()));
+		}
+	}
+#endif
+}
+
+bool FAnimNode_StageCoachGhostWheelController::IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones) 
+{
+	// if both bones are valid
+	for (const FWheelLookupData& Wheel : Wheels)
+	{
+		// if one of them is valid
+		if (Wheel.BoneReference.IsValidToEvaluate(RequiredBones) == true)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void FAnimNode_StageCoachGhostWheelController::InitializeBoneReferences(const FBoneContainer& RequiredBones) 
+{
+	const TArray<FGhostWheelAnimationData>& WheelAnimData = AnimInstanceProxy->GetWheelAnimData();
+	const int32 NumWheels = WheelAnimData.Num();
+	Wheels.Empty(NumWheels);
+
+	for (int32 WheelIndex = 0; WheelIndex < NumWheels; ++WheelIndex)
+	{
+		FWheelLookupData* Wheel = new(Wheels)FWheelLookupData();
+		Wheel->WheelIndex = WheelIndex;
+		Wheel->BoneReference.BoneName = WheelAnimData[WheelIndex].BoneName;
+		Wheel->BoneReference.Initialize(RequiredBones);
+	}
+
+	// sort by bone indices
+	Wheels.Sort([](const FWheelLookupData& L, const FWheelLookupData& R) { return L.BoneReference.BoneIndex < R.BoneReference.BoneIndex; });
+}
+
+void FAnimNode_StageCoachGhostWheelController::Initialize_AnyThread(const FAnimationInitializeContext& Context)
+{
+	AnimInstanceProxy = (FGhostVehicleAnimationInstanceProxy*)Context.AnimInstanceProxy;
+
+	if (AnimInstanceProxy)
+	{
+		AnimInstanceProxy->SetStageCoachEffectParams(WheelSpokeCount, MaxAngularVelocity, ShutterSpeed, StageCoachBlend);
+	}
+}
+
+
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/GhostVehicle.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/GhostVehicle.cpp
new file mode 100644
index 0000000..3c02060
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/GhostVehicle.cpp
@@ -0,0 +1,571 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/GhostVehicle/GhostVehicle.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Soda/Actors/NavigationRoute.h"
+#include "Soda/UnrealSoda.h"
+#include "Components/BoxComponent.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaStatics.h"
+#include "Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.h"
+#include "Actors/GhostVehicle/SpeedProfile/Curvature.h"
+#include "Soda/DBGateway.h"
+#include "Soda/SodaApp.h"
+#include "Math/UnrealMathUtility.h"
+#include "VehicleUtility.h"
+
+#include "bsoncxx/builder/stream/helpers.hpp"
+#include "bsoncxx/exception/exception.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+#include "bsoncxx/builder/stream/array.hpp"
+#include "bsoncxx/json.hpp"
+
+
+AGhostVehicle::AGhostVehicle()
+{
+	Mesh = CreateDefaultSubobject< USkeletalMeshComponent >(TEXT("VehicleMesh"));
+	//Mesh->SetCollisionProfileName(UCollisionProfile::Vehicle_ProfileName);
+	Mesh->SetSimulatePhysics(false);
+	Mesh->SetGenerateOverlapEvents(true);
+	Mesh->SetCollisionObjectType(ECollisionChannel::ECC_PhysicsBody);
+	Mesh->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_WorldStatic, ECollisionResponse::ECR_Block);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_WorldDynamic, ECollisionResponse::ECR_Block);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Visibility, ECollisionResponse::ECR_Overlap);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Camera, ECollisionResponse::ECR_Overlap);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Pawn, ECollisionResponse::ECR_Ignore);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_PhysicsBody, ECollisionResponse::ECR_Ignore);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Vehicle, ECollisionResponse::ECR_Ignore);
+	Mesh->SetCollisionResponseToChannel(ECollisionChannel::ECC_Destructible, ECollisionResponse::ECR_Ignore);
+
+	RootComponent = Mesh;
+	PrimaryActorTick.bCanEverTick = true;
+	USodaStatics::TagActor(this, true, EActorTagMethod::ForceCustomLabel, ESegmObjectLabel::Vehicles);
+}
+
+void AGhostVehicle::BeginPlay()
+{
+	Super::BeginPlay();
+
+	InitTransform = GetActorTransform();
+
+	TrajectoryPlaner.Init(GetWorld());
+
+	BaseLength = 0;
+	if (Mesh)
+	{
+		FBox Box;
+		for (auto& Wheel : Wheels)
+		{
+			int Ind = Mesh->GetBoneIndex(Wheel.BoneName);
+			if (Ind != INDEX_NONE)
+			{
+				Wheel.Location = Mesh->GetBoneLocation(Wheel.BoneName, EBoneSpaces::ComponentSpace);
+				//Wheel.Rotation = Mesh->GetBoneQuaternion(It->BoneName, EBoneSpaces::ComponentSpace).Rotator();
+			}
+			else
+			{
+				UE_LOG(LogSoda, Error, TEXT("AGhostVehicle::BeginPlay(); Can't find vehicle bone name: %s"), *Wheel.BoneName.ToString());
+			}
+
+			Box += Wheel.Location;
+		}
+
+		if (Box.IsValid)
+		{
+			BaseLength = (Box.Max - Box.Min).X;
+		}
+	}
+
+	RealAxesOffset = {};
+	VehicleRWheel = 0;
+
+	if (Wheels.Num())
+	{
+		double MinX = Wheels[0].Location.X;
+		for (auto& it : Wheels)
+		{
+			VehicleRWheel += it.Radius;
+			if (it.Location.X < MinX) MinX = it.Location.X;
+		}
+		VehicleRWheel /= Wheels.Num();
+		RealAxesOffset = FVector(MinX, 0, 0);
+	}
+}
+
+void AGhostVehicle::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	TrajectoryPlaner.Deinit();
+}
+
+FVector AGhostVehicle::GetVelocity() const
+{
+	if (bIsMoving && TrajectoryPlaner.GetWayPointsNum())
+	{
+		return GetActorTransform().TransformVectorNoScale(FVector(CurrentVelocity, 0, 0));
+	}
+	else
+	{
+		return FVector::ZeroVector;
+	}
+}
+
+void AGhostVehicle::InputWidgetDelta(const USceneComponent* WidgetTargetComponent, FTransform& NewWidgetTransform)
+{
+	if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+	{
+		if (bJoinToInitialRoute)
+		{
+			const float Key = RoutePlanner->Spline->FindInputKeyClosestToWorldLocation(NewWidgetTransform.GetTranslation());
+			NewWidgetTransform = RoutePlanner->Spline->GetTransformAtSplineInputKey(Key, ESplineCoordinateSpace::World);
+			InitialRouteOffset = RoutePlanner->Spline->GetDistanceAlongSplineAtSplineInputKey(Key);
+		}
+		else
+		{
+			UpdateJoinCurve();
+		}
+	}
+}
+
+void AGhostVehicle::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+
+	APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
+	check(PlayerController);
+
+	USodaGameModeComponent * GameMode  = USodaGameModeComponent::GetChecked();
+
+	if (bIsMoving)
+	{
+		if (TrajectoryPlaner.UpdateTarjectory(GetWorld(), GetTransform(), 10000, AllowedRouteTags))
+		{
+			CalculateSpeedProfile();
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+		}
+
+		if (CurrentSplineOffset > TrajectoryPlaner.GetRouteSpline()->GetSplineLength())
+		{
+			CurrentVelocity = 0;
+			CurrentAcc = 0;
+		}
+
+		if (TrajectoryPlaner.GetWayPointsNum())
+		{
+
+			const int WayPointInd = FMath::Clamp<int>(TrajectoryPlaner.GetCurrentSplineKey(), 0, TrajectoryPlaner.GetWayPointsNum() - 1);
+			check(WayPointInd < Velocities.size() && WayPointInd < Accelerations.size());
+			const float Vel = Velocities[(WayPointInd == Velocities.size() - 1) ? WayPointInd : WayPointInd + 1] * 100;
+
+			CurrentAcc = Accelerations[WayPointInd] * 100;
+			CurrentSplineOffset += DeltaTime * CurrentVelocity;
+			CurrentVelocity = FMath::Clamp(CurrentVelocity + CurrentAcc * DeltaTime, 0.f, Vel);
+
+			if (BaseLength > 0)
+			{
+				const double SteerAngle = (TrajectoryPlaner.GetCurvatureAtKey(TrajectoryPlaner.GetCurrentSplineKey()) * BaseLength / 100.0) / M_PI * 180;
+				for (auto& Wheel : Wheels)
+				{
+					if (Wheel.bApplySteer)
+					{
+						Wheel.SteerAngle = FMath::Clamp(SteerAngle, Wheel.SteerAngle - SteeringAnimMaxSpeed * DeltaTime, Wheel.SteerAngle + SteeringAnimMaxSpeed * DeltaTime);
+					}
+				}
+			}
+
+			TrajectoryPlaner.SetSplineOffset(CurrentSplineOffset);
+
+			FTransform VehicleTransform = TrajectoryPlaner.GetRouteSpline()->GetTransformAtSplineInputKey(TrajectoryPlaner.GetCurrentSplineKey(), ESplineCoordinateSpace::World);
+
+			TArray<TTuple<int, FVector>> Points;
+			Points.Reserve(Wheels.Num());
+			for (int i = 0; i < Wheels.Num(); ++i)
+			{
+				auto& Wheel = Wheels[i];
+				GetWorld()->LineTraceSingleByChannel(Wheel.Hit, VehicleTransform.TransformPosition(Wheel.Location + FVector(0, 0, Wheel.Radius)), VehicleTransform.TransformPosition(Wheel.Location + FVector(0, 0, -Wheel.Radius - RayCastDepth)),
+					ECollisionChannel::ECC_WorldDynamic,
+					FCollisionQueryParams(NAME_None, false, this));
+
+				if (Wheel.Hit.bBlockingHit)
+				{
+					Points.Add(MakeTuple( i, Wheel.Hit.Location));
+				}
+
+				Wheel.RotationAngularVelocit = -CurrentVelocity  / Wheel.Radius;
+				Wheel.RotationAngle = NormAngDeg( Wheel.RotationAngle + Wheel.RotationAngularVelocit * DeltaTime / M_PI * 180);
+			}
+
+			if (Points.Num() >= 3)
+			{
+				Points.Sort([](const auto& Pt1, const auto& Pt2) { return Pt1.Get<1>().Z > Pt2.Get<1>().Z; });
+				FPlane PlaneRoad(Points[0].Get<1>(), Points[1].Get<1>(), Points[2].Get<1>());
+				if (PlaneRoad.GetNormal().Z < 0) PlaneRoad = PlaneRoad.Flip();
+
+				FPlane PlaneVehicle(
+					VehicleTransform.TransformPosition(Wheels[Points[0].Get<0>()].Location + FVector(0, 0, -Wheels[Points[0].Get<0>()].Radius)),
+					VehicleTransform.TransformPosition(Wheels[Points[1].Get<0>()].Location + FVector(0, 0, -Wheels[Points[1].Get<0>()].Radius)),
+					VehicleTransform.TransformPosition(Wheels[Points[2].Get<0>()].Location + FVector(0, 0, -Wheels[Points[2].Get<0>()].Radius))
+				);
+				if (PlaneVehicle.GetNormal().Z < 0) PlaneVehicle = PlaneVehicle.Flip();
+
+				FQuat dQuat = FQuat::FindBetweenNormals(PlaneVehicle.GetNormal(), PlaneRoad.GetNormal());
+				VehicleTransform.SetRotation(dQuat * VehicleTransform.GetRotation());
+
+				const double Distance = (
+					PlaneRoad.PlaneDot(VehicleTransform.TransformPosition(Wheels[Points[0].Get<0>()].Location + FVector(0, 0, -Wheels[Points[0].Get<0>()].Radius))) +
+					PlaneRoad.PlaneDot(VehicleTransform.TransformPosition(Wheels[Points[1].Get<0>()].Location + FVector(0, 0, -Wheels[Points[1].Get<0>()].Radius))) +
+					PlaneRoad.PlaneDot(VehicleTransform.TransformPosition(Wheels[Points[2].Get<0>()].Location + FVector(0, 0, -Wheels[Points[2].Get<0>()].Radius)))) / 3;
+				VehicleTransform.SetTranslation(VehicleTransform.GetTranslation() - VehicleTransform.InverseTransformVector(PlaneRoad.GetNormal() * Distance));
+				
+			}
+
+			VehicleTransform.SetLocation(
+				VehicleTransform.GetLocation() - 
+				VehicleTransform.GetRotation().RotateVector(VehicleTransform.InverseTransformPosition(VehicleTransform.GetLocation()) + RealAxesOffset)
+			);
+			SetActorTransform(VehicleTransform);
+		}
+
+		if (Dataset)
+		{
+			Dataset->BeginRow();
+			OnPushDataset();
+			Dataset->EndRow();
+		}
+
+	}
+	else
+	{
+		if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+		{
+			if (RoutePlanner->Spline->GetSplineGuid() != SplineGuid)
+			{
+				if (bJoinToInitialRoute)
+				{
+					FTransform VehicleTransform = RoutePlanner->Spline->GetTransformAtDistanceAlongSpline(InitialRouteOffset, ESplineCoordinateSpace::World);
+					VehicleTransform.SetLocation(
+						VehicleTransform.GetLocation() -
+						VehicleTransform.GetRotation().RotateVector(VehicleTransform.InverseTransformPosition(VehicleTransform.GetLocation()) + RealAxesOffset)
+					);
+					SetActorTransform(VehicleTransform);
+				}
+				else
+				{
+					UpdateJoinCurve();
+				}
+				SplineGuid = RoutePlanner->Spline->GetSplineGuid();
+			}
+		}
+	}
+
+	if (!GameMode->IsScenarioRunning() && !bJoinToInitialRoute)
+	{
+		for (int i = 1; i < JoiningCurvePoints.Num(); ++i)
+		{
+			const FVector & P0 = JoiningCurvePoints[i - 1];
+			const FVector & P1 = JoiningCurvePoints[i];
+			DrawDebugLine(GetWorld(), P0, P1, FColor(180, 180, 255), false, -1.f, 0, 2);
+		}
+	}
+
+	if (bDrawDebugRoute)
+	{
+		TrajectoryPlaner.DrawRoute(this);
+	}
+
+}
+
+
+void AGhostVehicle::GoToLeftRoute(float StaticOffset, float VelocityToOffset)
+{
+	if (bIsMoving)
+	{
+		if (TrajectoryPlaner.GoToLeftRoute(GetWorld(), GetActorTransform(), StaticOffset + CurrentVelocity * VelocityToOffset))
+		{
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+			CalculateSpeedProfile();
+		}
+	}
+}
+
+void AGhostVehicle::GoToRightRoute(float StaticOffset, float VelocityToOffset)
+{
+	if (bIsMoving)
+	{
+		if (TrajectoryPlaner.GoToRightRoute(GetWorld(), GetActorTransform(), StaticOffset + CurrentVelocity * VelocityToOffset))
+		{
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+			CalculateSpeedProfile();
+		}
+	}
+}
+
+void AGhostVehicle::GoToRoute(TSoftObjectPtr<ANavigationRoute> Route, float StaticOffset, float VelocityToOffset)
+{
+	if (bIsMoving && Route.Get())
+	{
+		if (TrajectoryPlaner.GoToRoute(GetWorld(), GetActorTransform(), StaticOffset + CurrentVelocity * VelocityToOffset, Route.Get()))
+		{
+			CurrentSplineOffset = TrajectoryPlaner.GetDistanceAlongSpline();
+			CalculateSpeedProfile();
+		}
+	}
+}
+
+void AGhostVehicle::StartMoving()
+{
+	if (!bIsMoving)
+	{
+		CurrentVelocity = Chaos::KmHToCmS(InitVelocity);
+		CurrentSplineOffset = 0;
+		TrajectoryPlaner.Reset();
+		InitTransform = GetActorTransform();
+		bIsMoving = true;
+
+
+		if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+		{
+			if (!bJoinToInitialRoute)
+			{
+				UpdateJoinCurve();
+				auto Poits = JoiningCurvePoints;
+				Poits.Pop(false);
+				TrajectoryPlaner.AddRouteByWaypoints(Poits, RoutePlanner, false, false, false);
+			}
+			TrajectoryPlaner.AddRouteBySpline(RoutePlanner->Spline, InitialRouteOffset, RoutePlanner, false, false, true);
+		}
+		CalculateSpeedProfile();
+
+		ReceiveStartMoving();
+	}
+}
+
+void AGhostVehicle::StopMoving()
+{
+	if (bIsMoving)
+	{
+		SetActorTransform(InitTransform);
+		bIsMoving = false;
+		CurrentVelocity = 0;
+		CurrentAcc = 0;
+		CurrentSplineOffset = 0;
+		TrajectoryPlaner.Reset();
+		CalculateSpeedProfile();
+
+		ReceiveStopMoving();
+	}
+}
+
+void AGhostVehicle::CalculateSpeedProfile()
+{
+	if (TrajectoryPlaner.GetWayPointsNum() == 0)
+	{
+		Velocities.clear();
+		Accelerations.clear();
+		return;
+	}
+
+	std::vector<SpeedProfile::FTrajectoryPoint> Path(TrajectoryPlaner.GetWayPointsNum());
+	for (int i = 0; i < TrajectoryPlaner.GetWayPointsNum(); ++i)
+	{
+		Path[i].point = Eigen::Vector2d(TrajectoryPlaner.GetWayPoints()[i].Location.X / 100, TrajectoryPlaner.GetWayPoints()[i].Location.Y / 100);
+	}
+	for (int i = 0; i < TrajectoryPlaner.GetWayPointsNum() - 1; ++i)
+	{
+		Eigen::Vector2d Dir = Path[i + 1].point - Path[i].point;
+		Path[i].yaw = std::atan2(Dir.y(), Dir.x());
+	}
+	Path[TrajectoryPlaner.GetWayPointsNum() - 1].yaw = Path[TrajectoryPlaner.GetWayPointsNum() - 2].yaw;
+	for (int i = 1; i < TrajectoryPlaner.GetWayPointsNum() - 1; ++i)
+	{
+		Path[i].curvature = SpeedProfile::calculateCurvatureInfo(Path[i - 1].point, Path[i].point, Path[i + 1].point).curve;
+	}
+	Path[0].curvature = Path[1].curvature;
+	Path[TrajectoryPlaner.GetWayPointsNum() - 1].curvature = Path[TrajectoryPlaner.GetWayPointsNum() - 2].curvature;
+
+	SpeedProfile::FVehicleDynamicParams Dynamics;
+	Dynamics.max_velocity = Chaos::KmHToCmS(VehicleMaxVelocity) / 100.0;
+	Dynamics.car_mass = VehicleMass;
+	Dynamics.max_power = VehicleMaxPower;
+	Dynamics.max_torque = VehicleMaxTorque;
+	Dynamics.r_wheel = VehicleRWheel / 100.0;
+	SpeedProfile = MakeShareable(new SpeedProfile::FSpeedProfile(Dynamics));
+
+	SpeedProfile::FPointLimits MainLimit;
+	MainLimit.maxVelocity = Chaos::KmHToCmS(LimitMaxVelocity) / 100.0;
+	MainLimit.mu = LimitMu;
+	MainLimit.maxAcceleration = LimitMaxAcceleration;
+	MainLimit.maxDeceleration = LimitMaxDeceleration;
+
+	auto MainLimits = SpeedProfile::FTrajectoryLimits(Path.size(), MainLimit);
+	auto VelocityProfile = SpeedProfile->calculateVelocities(CurrentVelocity / 100, Path, MainLimits, bIsAggressive);
+
+	Velocities = VelocityProfile.velocities;
+	Accelerations = SpeedProfile->calculateAccelerations(Path, VelocityProfile.velocities);
+}
+
+bool AGhostVehicle::IsLinkedToRoute() const
+{
+	return !TrajectoryPlaner.IsEnded();
+}
+
+void AGhostVehicle::ScenarioBegin()
+{
+	ISodaActor::ScenarioBegin();
+
+	if (bRecordDataset && soda::FDBGateway::Instance().GetStatus() == soda::EDBGatewayStatus::Connected && soda::FDBGateway::Instance().IsDatasetRecording())
+	{
+		soda::FBsonDocument Doc;
+		GenerateDatasetDescription(Doc);
+		Dataset = soda::FDBGateway::Instance().CreateActorDataset(GetName(), "vehicle", GetClass()->GetName(), *Doc);
+	}
+
+	StartMoving();
+}
+
+void AGhostVehicle::ScenarioEnd()
+{
+	ISodaActor::ScenarioEnd();
+	StopMoving();
+
+	if (Dataset)
+	{
+		Dataset->PushAsync();
+		Dataset.Reset();
+	}
+}
+
+void AGhostVehicle::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) 
+{
+	IEditableObject::RuntimePostEditChangeProperty(PropertyChangedEvent);
+}
+
+void AGhostVehicle::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) 
+{
+	IEditableObject::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+	SplineGuid = FGuid::NewGuid();
+}
+
+void AGhostVehicle::UpdateJoinCurve()
+{
+	JoiningCurvePoints.Reset();
+
+	if (ANavigationRoute* RoutePlanner = InitialRoute.Get())
+	{
+		const FTransform StartTransform = GetActorTransform();
+		const FTransform EndTransform = RoutePlanner->Spline->GetTransformAtDistanceAlongSpline(InitialRouteOffset, ESplineCoordinateSpace::World, false);
+		const float TangentSize = (StartTransform.GetTranslation() - EndTransform.GetTranslation()).Size();
+
+		FInterpCurveVector JoiningCurve;
+		JoiningCurve.Points.Add(FInterpCurvePoint<FVector>(
+			0,
+			StartTransform.GetTranslation(),
+			FVector::ZeroVector,
+			StartTransform.GetUnitAxis(EAxis::X) * TangentSize,
+			CIM_CurveUser
+		));
+		JoiningCurve.Points.Add(FInterpCurvePoint<FVector>(
+			1,
+			EndTransform.GetTranslation(),
+			EndTransform.GetUnitAxis(EAxis::X) * TangentSize,
+			FVector::ZeroVector,
+			CIM_CurveUser
+		));
+
+		const int Steps = 20;
+		for (int i = 0; i <= Steps; ++i)
+		{
+			JoiningCurvePoints.Add(JoiningCurve.Eval(i / float(Steps)));
+		}
+	}
+}
+
+void AGhostVehicle::GenerateDatasetDescription(soda::FBsonDocument& Doc) const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	FExtent Extent = USodaStatics::CalculateActorExtent(this);
+	*Doc
+		<< "extents" << open_document
+		<< "forward" << Extent.Forward
+		<< "backward" << Extent.Backward
+		<< "left" << Extent.Left
+		<< "right" << Extent.Right
+		<< "up" << Extent.Up
+		<< "down" << Extent.Down
+		<< close_document;
+}
+
+void AGhostVehicle::OnPushDataset() const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	if (Dataset.IsValid())
+	{
+		try
+		{
+			FVector Location = GetActorLocation();
+			FRotator Rotation = GetActorRotation();
+			FVector Vel = FVector(CurrentVelocity, 0, 0);
+			FVector Acc = FVector(CurrentAcc, 0, 0);
+			//FVector AngVel = FVector(0, 0, 0);
+
+			Dataset->GetRowDoc()
+				<< "ts" << std::int64_t(soda::RawTimestamp<std::chrono::microseconds>(SodaApp.GetSimulationTimestamp()))
+				<< "loc" << open_array << Location.X << Location.Y << Location.Z << close_array
+				<< "rot" << open_array << Rotation.Pitch << Rotation.Yaw << Rotation.Roll << close_array
+				<< "vel" << open_array << Vel.X << Vel.Y << Vel.Z << close_array
+				<< "acc" << open_array << Acc.X << Acc.Y << Acc.Z << close_array;
+				//<< "ang_vel" << open_array << AngVel.X << AngVel.Y << AngVel.Z << close_array;
+
+			auto RouteDoc = Dataset->GetRowDoc() << "route" << open_document;
+			if (const FTrajectoryPlaner::FWayPoint* WayPoint = TrajectoryPlaner.GetCurrentWayPoint())
+			{
+				if (WayPoint->OwndedRoute.IsValid())
+				{
+					RouteDoc << "name" << TCHAR_TO_UTF8(*WayPoint->OwndedRoute->GetName());
+				}
+				else
+				{
+					RouteDoc << "name" << "";
+				}
+			}
+			else
+			{
+				RouteDoc << "name" << "";
+			}
+			RouteDoc << close_document;
+				
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("AGhostPedestrian::OnPushDataset(); %s"), UTF8_TO_TCHAR(e.what()));
+		}
+	}
+}
+
+const FSodaActorDescriptor* AGhostVehicle::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Ghost Car"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT(""), /*SubCategory*/
+		TEXT("SodaIcons.Car"), /*Icon*/
+		true, /*bAllowTransform*/
+		false, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/GhostVehicleAnimationInstance.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/GhostVehicleAnimationInstance.cpp
new file mode 100644
index 0000000..48970ff
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/GhostVehicleAnimationInstance.cpp
@@ -0,0 +1,118 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+
+#include "Soda/Actors/GhostVehicle/GhostVehicleAnimationInstance.h"
+#include "Soda/Actors/GhostVehicle/GhostVehicle.h"
+#include "AnimationRuntime.h"
+
+UGhostVehicleAnimationInstance::UGhostVehicleAnimationInstance(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+
+void UGhostVehicleAnimationInstance::NativeInitializeAnimation()
+{
+	// Find a wheeled movement component
+	if (AGhostVehicle* Actor = Cast<AGhostVehicle>(GetOwningActor()))
+	{
+		SetVehicle(Actor);
+	}
+}
+
+FAnimInstanceProxy* UGhostVehicleAnimationInstance::CreateAnimInstanceProxy()
+{
+	return &AnimInstanceProxy;
+}
+
+void UGhostVehicleAnimationInstance::DestroyAnimInstanceProxy(FAnimInstanceProxy* InProxy)
+{
+}
+
+const AGhostVehicle* UGhostVehicleAnimationInstance::GetVehicle() const
+{
+	return GhostVehicle.Get(); 
+}
+
+//---------------------------------------------------------------------------------------------------------------------------------
+
+void FGhostVehicleAnimationInstanceProxy::SetVehicle(const AGhostVehicle* GhostVehicle)
+{
+	check(GhostVehicle);
+
+	const int32 NumOfwheels = GhostVehicle->Wheels.Num();
+	WheelInstances.Empty(NumOfwheels);
+	if (NumOfwheels > 0)
+	{
+		WheelInstances.AddZeroed(NumOfwheels);
+		// now add wheel data
+		for (int32 WheelIndex = 0; WheelIndex < WheelInstances.Num(); ++WheelIndex)
+		{
+			FGhostWheelAnimationData& WheelInstance = WheelInstances[WheelIndex];
+			const FGhostVehicleWheel& Wheel = GhostVehicle->Wheels[WheelIndex];
+
+			// set data
+			WheelInstance.BoneName = Wheel.BoneName;
+			WheelInstance.LocOffset = FVector::ZeroVector;
+			WheelInstance.RotOffset = FRotator::ZeroRotator;
+		}
+	}
+}
+
+void FGhostVehicleAnimationInstanceProxy::PreUpdate(UAnimInstance* InAnimInstance, float DeltaSeconds)
+{
+	Super::PreUpdate(InAnimInstance, DeltaSeconds);
+
+	const UGhostVehicleAnimationInstance* VehicleAnimInstance = CastChecked<UGhostVehicleAnimationInstance>(InAnimInstance);
+	if (const AGhostVehicle* Vehicle= VehicleAnimInstance->GetVehicle())
+	{
+		for (int32 WheelIndex = 0; WheelIndex < WheelInstances.Num(); ++WheelIndex)
+		{
+			FGhostWheelAnimationData& WheelInstance = WheelInstances[WheelIndex];
+			if (Vehicle->Wheels.IsValidIndex(WheelIndex))
+			{
+				const FGhostVehicleWheel& VehicleWheel = Vehicle->Wheels[WheelIndex];
+				if (WheelSpokeCount > 0 && ShutterSpeed > 0 && MaxAngularVelocity > SMALL_NUMBER) // employ stagecoach effect
+				{
+					// normalized spoke transition value
+					float AngularVelocity = VehicleWheel.GetRotationAngularVelocity();
+					float DegreesPerFrame = AngularVelocity / ShutterSpeed;
+					float DegreesPerSpoke = 360.f / WheelSpokeCount;
+
+					float IntegerPart = 0;
+					float SpokeTransition = FMath::Modf(DegreesPerFrame / DegreesPerSpoke, &IntegerPart);
+					float StagecoachEffectVelocity = FMath::Sin(SpokeTransition * TWO_PI) * MaxAngularVelocity;
+
+					// blend
+					float OffsetVelocity = FMath::Abs(AngularVelocity) - MaxAngularVelocity;
+					if (OffsetVelocity < 0.f)
+					{
+						OffsetVelocity = 0.f;
+					}
+
+					float BlendAlpha = FMath::Clamp(OffsetVelocity / MaxAngularVelocity, 0.f, 1.f);
+
+					float CorrectedAngularVelocity = FMath::Lerp(AngularVelocity, StagecoachEffectVelocity, BlendAlpha);
+					CorrectedAngularVelocity = FMath::Clamp(CorrectedAngularVelocity, -MaxAngularVelocity, MaxAngularVelocity);
+
+					// integrate to angular position
+					float RotationDelta = CorrectedAngularVelocity * DeltaSeconds;
+					WheelInstance.RotOffset.Pitch += RotationDelta;
+
+					int ExcessRotations = (int)(WheelInstance.RotOffset.Pitch / 360.0f);
+					if (FMath::Abs(ExcessRotations) > 1)
+					{
+						WheelInstance.RotOffset.Pitch -= ExcessRotations * 360.0f;
+					}
+				}
+				else
+				{
+					WheelInstance.RotOffset.Pitch = VehicleWheel.GetRotationAngle();
+				}
+				WheelInstance.RotOffset.Yaw = VehicleWheel.GetSteerAngle();
+				WheelInstance.RotOffset.Roll = 0.f;
+				WheelInstance.LocOffset = -FVector(0, 0, 1) * VehicleWheel.GetSuspensionOffset();
+			}
+		}
+	}
+}
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Curvature.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Curvature.cpp
new file mode 100644
index 0000000..45f402b
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Curvature.cpp
@@ -0,0 +1,65 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Actors/GhostVehicle/SpeedProfile/Curvature.h"
+
+namespace SpeedProfile 
+{
+
+double calculateCurvature(
+	const Eigen::Vector2d& p1,
+	const Eigen::Vector2d& p2,
+	const Eigen::Vector2d& p3) 
+{
+	Eigen::Vector2d a = p2 - p1;
+	Eigen::Vector2d b = p3 - p2;
+	Eigen::Vector2d c = p1 - p3;
+
+	double aNorm2 = a.squaredNorm();
+	double bNorm2 = b.squaredNorm();
+	double cNorm2 = c.squaredNorm();
+
+	auto normMinMax = std::minmax<double>({aNorm2, bNorm2, cNorm2});
+
+	if (normMinMax.first < 1e-6 || 1e4 * normMinMax.first < normMinMax.second)
+		return 0;
+
+	double vdot = a.x() * b.y() - a.y() * b.x();
+	return 2.0 * vdot / std::sqrt(aNorm2 * bNorm2 * cNorm2);
+}
+
+FCurvatureInfo calculateCurvatureInfo(
+	const Eigen::Vector2d& p1,
+	const Eigen::Vector2d& p2,
+	const Eigen::Vector2d& p3) {
+	Eigen::Vector2d a = p2 - p1;
+	Eigen::Vector2d b = p3 - p2;
+	Eigen::Vector2d c = p1 - p3;
+
+	double aNorm2 = a.squaredNorm();
+	double bNorm2 = b.squaredNorm();
+	double cNorm2 = c.squaredNorm();
+
+	auto normMinMax = std::minmax<double>({aNorm2, bNorm2, cNorm2});
+
+	if (normMinMax.first < 1e-6 || 1e4 * normMinMax.first < normMinMax.second) 
+	{
+		return {0.0, std::sqrt(cNorm2)};
+	}
+
+	double vdot = a.x() * b.y() - a.y() * b.x();
+	double sdot = a.x() * b.x() + a.y() * b.y();
+	double curvature = 2.0 * vdot / std::sqrt(aNorm2 * bNorm2 * cNorm2);
+	double arc_len = std::abs(curvature) > 1e-9 ? 2.0 * std::abs(std::atan2(vdot, sdot) / curvature) : std::sqrt(cNorm2);
+
+	return {curvature, arc_len};
+}
+
+FCurvatureInfo calculateSimpleCurvatureInfo(
+	const Eigen::Vector2d& p1,
+	const Eigen::Vector2d& p2,
+	const Eigen::Vector2d& p3) 
+{
+	return {calculateCurvature(p1, p2, p3), (p3 - p1).norm()};
+}
+
+} // namespace SpeedProfile
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Curvature.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Curvature.h
new file mode 100644
index 0000000..60ef832
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Curvature.h
@@ -0,0 +1,24 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <vector>
+#include <type_traits>
+#include <iterator>
+#include <Eigen/Core>
+
+
+namespace SpeedProfile
+{
+
+struct FCurvatureInfo 
+{
+	double curve = 0;
+	double arc_length = 0;
+};
+
+double calculateCurvature(const Eigen::Vector2d& p1, const Eigen::Vector2d& p2, const Eigen::Vector2d& p3);
+FCurvatureInfo calculateCurvatureInfo(const Eigen::Vector2d& p1, const Eigen::Vector2d& p2, const Eigen::Vector2d& p3);
+FCurvatureInfo calculateSimpleCurvatureInfo(const Eigen::Vector2d& p1, const Eigen::Vector2d& p2, const Eigen::Vector2d& p3);
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Math.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Math.h
new file mode 100644
index 0000000..259b7f8
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/Math.h
@@ -0,0 +1,50 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <cmath>
+#include <vector>
+#include <type_traits>
+#include <Eigen/Core>
+
+namespace SpeedProfile
+{
+
+namespace math 
+{
+
+constexpr double grav_acc = 9.80665; //**m/s^2 */
+
+template<typename T>
+constexpr T pi() 
+{
+	return (T)3.141592653589793;
+}
+
+template<typename T>
+constexpr decltype(T() * T()) square(const T t) 
+{
+	static_assert(std::is_arithmetic<T>::value, "Type should be arithmetic");
+	return t * t;
+}
+
+template<typename T>
+constexpr int approx_cmp(const T a, const T b, const T prec = 5 * std::numeric_limits<T>::epsilon()) 
+{
+	static_assert(std::is_floating_point<T>::value, "Type should be floating point.");
+	if (std::abs(a - b) < prec)
+		return 0;
+	else
+		return a < b ? -1 : 1;
+}
+
+template<typename T, std::enable_if_t<std::is_arithmetic<T>::value, bool> = true>
+constexpr int sign(T number, T epsilon = 0) 
+{
+	return number > epsilon ? 1 : number < -epsilon ? -1 : 0;
+}
+
+} // namespace math
+
+} // namespace SpeedProfile
+
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/PointLimits.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/PointLimits.h
new file mode 100644
index 0000000..75f9d77
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/PointLimits.h
@@ -0,0 +1,23 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <Eigen/Core>
+#include <vector>
+
+
+namespace SpeedProfile 
+{
+
+struct FPointLimits 
+{
+	double maxVelocity = 42;
+	double mu = 0.85;
+	double maxAcceleration = 11;
+	double maxDeceleration = 11;
+	// default devbot values
+};
+
+using FTrajectoryLimits = std::vector<FPointLimits>;
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/SpeedEstimator.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/SpeedEstimator.cpp
new file mode 100644
index 0000000..1a7615e
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/SpeedEstimator.cpp
@@ -0,0 +1,224 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Actors/GhostVehicle/SpeedProfile/SpeedEstimator.h"
+#include "Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.h"
+#include "Actors/GhostVehicle/SpeedProfile/Math.h"
+#include "Actors/GhostVehicle/SpeedProfile/Curvature.h"
+
+namespace SpeedProfile 
+{
+
+std::vector<FTrajectoryPoint> convertToTrajectoryPoints(
+	const std::vector<Eigen::Vector2d> &path,
+	bool loop ) 
+{
+	std::vector<FTrajectoryPoint> result;
+	result.resize(path.size());
+	if (path.size() < 3) {
+		for (int i = 0; i < result.size(); ++i)
+		{
+			result[i].point = path[i];
+		}
+		if (path.size() == 2) 
+		{
+			Eigen::Vector2d dir = result[1].point - result[0].point;
+			double yaw = std::atan2(dir.y(), dir.x());
+			result[0].yaw = yaw;
+			result[1].yaw = yaw;
+		}
+		return result;
+	}
+
+	for (int i = loop ? 0 : 1; i + (loop ? 0 : 1) < path.size(); i++) 
+	{
+		auto &rc = result.at(i);
+		auto pp = path.at((i - 1 + path.size()) % path.size());
+		auto pn = path.at((i + 1 + path.size()) % path.size());
+
+		rc.point = path.at(i);
+		Eigen::Vector2d dir = pn - pp;
+		rc.yaw = ::std::atan2(dir.y(), dir.x());
+		rc.curvature = calculateCurvature(pp, path.at(i), pn);
+	}
+
+	if (!loop)
+	{
+		result.front().point = path.front();
+		result.front().curvature = result.at(1).curvature;
+		result.front().yaw = result.at(1).yaw;
+
+		result.back().point = path.back();
+		result.back().curvature = result.at(result.size() - 2).curvature;
+		result.back().yaw = result.at(result.size() - 2).yaw;
+	}
+
+	return result;
+}
+
+
+namespace 
+{
+	constexpr double epsilon = 1e-6; // m/s
+}
+
+double estimateTime(
+	const std::vector<FTrajectoryPoint>& trajectory,
+	const std::vector<double>& velocities,
+	bool bIsLooped)
+{
+	assert(velocities.size() == trajectory.size());
+	double loopTime = 0;
+	if (bIsLooped)
+	{
+		double dist = (trajectory.front().point - trajectory.back().point).norm();
+		double averageSpeed = 0.5 * (velocities.front() + velocities.back());
+		if (averageSpeed < epsilon)
+		{
+			loopTime = std::numeric_limits<double>::infinity();
+		}
+		else 
+		{
+			loopTime += dist / averageSpeed;
+		}
+	}
+	for (int i = 0; i + 1 < velocities.size(); ++i) 
+	{
+		double dist = (trajectory.at(i + 1).point - trajectory.at(i).point).norm();
+		double averageSpeed = 0.5 * (velocities.at(i + 1) + velocities.at(i));
+		if (averageSpeed < epsilon) 
+		{
+			loopTime = std::numeric_limits<double>::infinity();
+		}
+		else 
+		{
+			loopTime += dist / averageSpeed;
+		}
+	}
+	return loopTime;
+}
+
+std::vector<double> estimateTimestamps(
+	const std::vector<Eigen::Vector2d>& trajectory,
+	const std::vector<double>& velocities) 
+{
+	std::vector<double> result;
+	result.reserve(trajectory.size());
+	result.emplace_back(0);
+	double time = 0;
+	for (int i = 0; i + 1 < velocities.size(); ++i) 
+	{
+		double dist = (trajectory.at(i + 1) - trajectory.at(i)).norm();
+		double averageSpeed = 0.5 * (velocities.at(i + 1) + velocities.at(i));
+		if (averageSpeed < epsilon) 
+		{
+			time = std::numeric_limits<double>::infinity();
+		}
+		else 
+		{
+			time += dist / averageSpeed;
+		}
+		result.emplace_back(time);
+	}
+	return result;
+}
+
+FSpeedEstimator::FSpeedEstimator(
+	double baseMu,
+	double maxMu,
+	const FVehicleDynamicParams& vehicleDynamicParams,
+	const std::vector<Eigen::Vector2d>& points,
+	bool bIsLooped)
+	: baseMu(baseMu),
+	  maxMu(maxMu),
+	  vehicleDynamicParams(vehicleDynamicParams),
+	  trajectory(convertToTrajectoryPoints(points, bIsLooped)),
+	  bIsLooped(bIsLooped)
+{
+	calculateVelocities();
+}
+
+void FSpeedEstimator::calculateVelocities() 
+{
+	struct LimitsCalculator 
+	{
+		inline FTrajectoryLimits getTrajectoryLimits(size_t size) const
+		{
+			return FTrajectoryLimits(size, pointLimit);
+		}
+		FPointLimits pointLimit;
+	};
+
+	LimitsCalculator limitsCalculator;
+
+	limitsCalculator.pointLimit.maxAcceleration = 10.0;
+	limitsCalculator.pointLimit.maxDeceleration = 10.0;
+	limitsCalculator.pointLimit.maxVelocity = 100.0;
+	limitsCalculator.pointLimit.mu = baseMu;
+
+	auto trajectoryCpy = trajectory;
+	int baseSize = trajectory.size();
+	if (bIsLooped)
+	{
+		trajectoryCpy.insert(trajectoryCpy.end(), trajectory.begin(), trajectory.end());
+		trajectoryCpy.insert(trajectoryCpy.end(), trajectory.begin(), trajectory.end());
+	}
+	auto mainLimits = limitsCalculator.getTrajectoryLimits(trajectoryCpy.size());
+
+	SpeedProfile::FSpeedProfile speedProfile(vehicleDynamicParams);
+	velocities = speedProfile.calculateVelocities(0.0, trajectoryCpy, mainLimits, true).velocities;
+	accelerations = speedProfile.calculateAccelerations(trajectoryCpy, velocities);
+
+	if (bIsLooped)
+	{
+		velocities.erase(velocities.begin(), velocities.begin() + baseSize);
+		velocities.resize(baseSize);
+
+		accelerations.erase(accelerations.begin(), accelerations.begin() + baseSize);
+		accelerations.resize(baseSize);
+	}
+}
+
+double FSpeedEstimator::estimateTime() const 
+{
+	return SpeedProfile::estimateTime(trajectory, velocities, bIsLooped);
+}
+
+double FSpeedEstimator::estimateMu(int index) const 
+{
+	constexpr double downForceCoefFront = 1.17;
+	constexpr double downForceCoefRear = 1.91;
+	constexpr double downForceCoef = 0.5 * (downForceCoefFront + downForceCoefRear);
+
+
+	double velocity = velocities.at(index);
+	double acceleration = accelerations.at(index);
+	double curvature = trajectory.at(index).curvature;
+	if (velocity < 10.0) 
+	{
+		return baseMu;
+	}
+
+	double accelerationLong = acceleration;
+	double accelerationLat = curvature * math::square(velocity);
+
+	double accelerationLatAdj =
+		(vehicleDynamicParams.car_mass * math::grav_acc + downForceCoef * math::square(velocity)) *
+			baseMu / vehicleDynamicParams.car_mass;
+
+	if (acceleration >= 0.0) 
+	{
+		return std::min(maxMu, accelerationLatAdj / math::grav_acc);
+	}
+
+	double accelerationLongAdj = accelerationLatAdj +
+		(vehicleDynamicParams.rolling_resistance + vehicleDynamicParams.drag_force_coeff * math::square(velocity)) / vehicleDynamicParams.car_mass;
+
+	double mu = accelerationLatAdj * accelerationLongAdj /
+		std::hypot(accelerationLatAdj * accelerationLong, accelerationLat * accelerationLongAdj) *
+		std::hypot(accelerationLat, accelerationLong) /
+		math::grav_acc;
+
+	return std::min(maxMu, mu);
+}
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/SpeedEstimator.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/SpeedEstimator.h
new file mode 100644
index 0000000..bd6b473
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/SpeedEstimator.h
@@ -0,0 +1,42 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+#include "Actors/GhostVehicle/SpeedProfile/TrajectoryPoint.h"
+#include "Actors/GhostVehicle/SpeedProfile/VehicleParameters.h"
+
+#include <vector>
+
+
+namespace SpeedProfile 
+{
+
+class FSpeedEstimator 
+{
+public:
+	FSpeedEstimator(
+		double baseMu,
+		double maxMu,
+		const FVehicleDynamicParams& vehicleDynamicParams,
+		const std::vector<Eigen::Vector2d>& points,
+		bool bIsLooped);
+
+   // std::vector<trajectory_msgs::msg::MuEstimationItem> getMuMap() const;
+	double estimateTime() const;
+
+private:
+	void calculateVelocities();
+	double estimateMu(int index) const ;
+
+private:
+	const double baseMu;
+	const double maxMu;
+	const FVehicleDynamicParams& vehicleDynamicParams;
+
+	const std::vector<FTrajectoryPoint> trajectory;
+	const bool bIsLooped;
+
+	std::vector<double> velocities;
+	std::vector<double> accelerations;
+};
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/TrajectoryPoint.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/TrajectoryPoint.h
new file mode 100644
index 0000000..eb3679e
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/TrajectoryPoint.h
@@ -0,0 +1,47 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <Eigen/Core>
+#include <utility>
+
+namespace SpeedProfile
+{
+
+struct FTrajectoryPoint 
+{
+	FTrajectoryPoint() = default;
+	FTrajectoryPoint(
+		const Eigen::Vector2d& point_,
+		double curvature_,
+		double yaw_)
+		: point(point_)
+		, curvature(curvature_)
+		, yaw(yaw_) {}
+
+	Eigen::Vector2d point = Eigen::Vector2d(0.0, 0.0);
+	double curvature = 0;
+	double yaw = 0;
+
+	inline operator Eigen::Vector2d& () noexcept
+	{
+		return point;
+	}
+	inline operator const Eigen::Vector2d& () const noexcept
+	{
+		return point;
+	}
+};
+
+
+inline bool operator==(const FTrajectoryPoint& lhs, const FTrajectoryPoint& rhs) 
+{
+	return std::tie(lhs.point, lhs.curvature, lhs.yaw) == std::tie(rhs.point, rhs.curvature, rhs.yaw);
+}
+
+inline bool operator!=(const FTrajectoryPoint& lhs, const FTrajectoryPoint& rhs) 
+{
+	return !(rhs == lhs);
+}
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.cpp
new file mode 100644
index 0000000..0bfc7ab
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.cpp
@@ -0,0 +1,286 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.h"
+#include "Actors/GhostVehicle/SpeedProfile/Math.h"
+
+namespace SpeedProfile 
+{
+
+double FSpeedProfile::getMaxPossibleCurvature(double velocity, double friction) 
+{
+	return friction * math::grav_acc / std::max(velocity * velocity, 1e-8);
+}
+
+double FSpeedProfile::getHighestPossibleVelocity(double curvature, double friction) 
+{
+	return std::sqrt(std::max(friction * math::grav_acc, 0.0) /
+		std::max(std::abs(curvature), 1e-8));
+}
+
+std::vector<double> FSpeedProfile::getMaxVelocities(
+	const FSpeedProfile::Trajectory &trajectory,
+	const FTrajectoryLimits& trajectoryLimits
+) const 
+{
+	assert(!trajectory.empty());
+	assert(trajectory.size() == trajectoryLimits.size());
+
+	std::vector<double> velocitites(trajectory.size(), vehicleDynamicsCalculator.getVehicleDynamics().max_velocity);
+
+	for (size_t i = 0; i < trajectory.size(); ++i) {
+		double possible = FSpeedProfile::getHighestPossibleVelocity(trajectory[i].curvature,
+																   trajectoryLimits[i].mu);
+		double limited = trajectoryLimits[i].maxVelocity;
+		velocitites[i] = std::min(limited, possible);
+	}
+
+	return velocitites;
+}
+
+double FSpeedProfile::velocityChange(
+	const FTrajectoryPoint& start,
+	const FTrajectoryPoint& finish,
+	double velocity,
+	double acceleration
+) const noexcept 
+{
+	double distance = (start.point - finish.point).norm();
+	return std::sqrt(math::square(velocity) + 2 * acceleration * distance) - velocity;
+}
+
+FVelocityProfile FSpeedProfile::immediateBraking(
+	double initialVelocity,
+	const FSpeedProfile::Trajectory& trajectory,
+	const FTrajectoryLimits& trajectoryLimits
+) const noexcept 
+{
+	FVelocityProfile profile;
+	profile.velocities = getMaxVelocities(trajectory, trajectoryLimits);
+
+	profile.velocities.front() = initialVelocity;
+
+	for (size_t i = 0; i + 1 < profile.velocities.size(); ++i) 
+	{
+		FVehicleDynamicsCalculator::DecelerationResult decelerationResult =
+			vehicleDynamicsCalculator.getMaxDeceleration(profile.velocities[i],
+														  trajectory[i],
+														  trajectoryLimits[i]);
+
+		double deceleration = -1 * decelerationResult.deceleration;
+		double delta = velocityChange(trajectory[i],
+									  trajectory[i + 1],
+									  profile.velocities[i],
+									  deceleration);
+
+		double nextVelocity = std::max(0.0, profile.velocities[i] + delta);
+
+		double nextVelocityLimit = profile.velocities[i + 1];
+		// TODO the last condition is used in city scenario only - need refactoring
+		if (nextVelocity > std::max(0.0, nextVelocityLimit)) {
+			profile.isSafe = false;
+		}
+
+		profile.velocities[i + 1] = nextVelocity;
+	}
+
+	return profile;
+}
+
+std::vector<double> FSpeedProfile::reverseBraking(
+	const std::vector<double>& acceleratedVelocities,
+	const FSpeedProfile::Trajectory& trajectory,
+	const FTrajectoryLimits& trajectoryLimits
+) const 
+{
+	auto velocities = acceleratedVelocities;
+
+	for (int i = static_cast<int>(velocities.size()) - 2; i >= 0; --i) {
+		FVehicleDynamicsCalculator::DecelerationResult decelerationResult =
+			vehicleDynamicsCalculator.getMaxDeceleration(velocities[i + 1], trajectory[i + 1], trajectoryLimits[i + 1]);
+		double deceleration = decelerationResult.deceleration;
+		double delta = velocityChange(trajectory[i], trajectory[i + 1], velocities[i + 1], deceleration);
+		double prevVelocity = velocities[i + 1] + delta;
+
+		velocities[i] = std::min(prevVelocity, velocities[i]);
+	}
+	return velocities;
+}
+
+std::vector<double> FSpeedProfile::immediateAcceleration(
+	double initialVelocity,
+	const std::vector<double>& brakingVelocities,
+	const FSpeedProfile::Trajectory& trajectory,
+	const FTrajectoryLimits& trajectoryLimits
+) const 
+{
+	std::vector<double> velocities = brakingVelocities;
+	velocities.front() = initialVelocity;
+
+	for (size_t i = 0; i < velocities.size() - 1; ++i) 
+	{
+		double acceleration = vehicleDynamicsCalculator.getMaxAcceleration(velocities[i],
+																			trajectory[i],
+																			trajectoryLimits[i]);
+
+		double delta = velocityChange(trajectory[i],
+									  trajectory[i + 1],
+									  velocities[i],
+									  acceleration);
+
+		double nextVelocity = velocities[i] + delta;
+
+		velocities[i + 1] = std::min(nextVelocity, velocities[i + 1]);
+	}
+	return velocities;
+}
+
+FVelocityProfile FSpeedProfile::getAgressiveSpeedProfile(
+	double initialVelocity,
+	const FSpeedProfile::Trajectory& trajectory,
+	const FTrajectoryLimits& mainLimits
+) const noexcept 
+{
+	FVelocityProfile profile;
+	profile.isSafe = true;
+
+	std::vector<double> velocities = getMaxVelocities(trajectory, mainLimits);
+
+	std::vector<double> forwardProfile = immediateAcceleration(initialVelocity, velocities, trajectory, mainLimits);
+	std::vector<double> backwardProfile = reverseBraking(forwardProfile, trajectory, mainLimits);
+
+	if (!forwardProfile.empty() && !backwardProfile.empty()) 
+	{
+		double diff = forwardProfile.front() - backwardProfile.front();
+		constexpr double minVelocityDiff = 0.01;
+		if (diff  > minVelocityDiff) 
+		{
+			profile.isSafe = false;
+			profile.inconsistency = diff;
+		}
+	}
+
+	profile.velocities.resize(backwardProfile.size());
+	for (size_t i = 0; i < backwardProfile.size(); ++i) {
+		profile.velocities[i] = std::min(forwardProfile[i], backwardProfile[i]);
+	}
+
+	return profile;
+}
+
+FVelocityProfile FSpeedProfile::getAdaptiveSpeedProfile(
+	double initialVelocity,
+	const FSpeedProfile::Trajectory& trajectory,
+	const FTrajectoryLimits& mainLimits
+) const noexcept 
+{
+	FVelocityProfile profile;
+	profile.isSafe = true;
+
+	auto brakingProfile = adaptiveBraking(initialVelocity, trajectory, mainLimits);
+
+	if (!brakingProfile.isSafe) 
+	{
+		profile.isSafe = false;
+	}
+
+	auto reverseVelocities = reverseBraking(getMaxVelocities(trajectory, mainLimits), trajectory, mainLimits);
+	for (size_t i = 0; i < brakingProfile.velocities.size(); ++i)
+	{
+		brakingProfile.velocities[i] = std::max(brakingProfile.velocities[i],
+												reverseVelocities[i]);
+	}
+
+	profile.velocities = immediateAcceleration(initialVelocity,
+											   brakingProfile.velocities,
+											   trajectory,
+											   mainLimits);
+	return profile;
+}
+
+static FTrajectoryLimits getProportionalLimits(double ratio, const FTrajectoryLimits& mainLimits) 
+{
+	assert(ratio <= 1.0);
+	FTrajectoryLimits averagedLimits = mainLimits;
+	for (std::size_t i = 0; i < mainLimits.size(); i++) 
+	{
+		averagedLimits[i].maxDeceleration = ratio * mainLimits[i].maxDeceleration;
+	}
+	return averagedLimits;
+}
+
+FVelocityProfile FSpeedProfile::adaptiveBraking(
+	double velocity,
+	const FSpeedProfile::Trajectory& trajectory,
+	const FTrajectoryLimits& mainLimits
+) const 
+{
+	double ratio = 0.0;
+	for (int i = 0; i < 10; i++) 
+	{
+		FTrajectoryLimits limits = getProportionalLimits(ratio, mainLimits);
+		FVelocityProfile profile = immediateBraking(velocity, trajectory, limits);
+		if (profile.isSafe) 
+		{
+			return profile;
+		}
+		ratio += 0.1;
+	}
+
+	return immediateBraking(velocity, trajectory, mainLimits);
+}
+
+FVelocityProfile FSpeedProfile::calculateVelocities(
+	double initialVelocity,
+	const FSpeedProfile::Trajectory& trajectory,
+	const FTrajectoryLimits& mainLimits,
+	bool isAggressive
+) const 
+{
+	if (trajectory.empty()) 
+	{
+		return {};
+	}
+	assert(mainLimits.size() == trajectory.size());
+
+	if (trajectory.size() == 1) 
+	{
+		bool isSafe = math::approx_cmp(initialVelocity, 0.0) == 0;
+		return {{0.0}, isSafe};
+	}
+
+	return isAggressive
+		? getAgressiveSpeedProfile(initialVelocity, trajectory, mainLimits)
+		: getAdaptiveSpeedProfile(initialVelocity, trajectory, mainLimits);
+}
+
+std::vector<double> FSpeedProfile::calculateAccelerations(
+	const FSpeedProfile::Trajectory& trajectory,
+	const std::vector<double>& velocities
+)const {
+	assert(velocities.size() == trajectory.size());
+
+	std::vector<double> accelerations(trajectory.size());
+
+	double acceleration = 0.0;
+	for (size_t i = 0; i < accelerations.size() - 1; ++i)
+	{
+		constexpr double epsilon_ = 0.0005;
+
+		double distance = (trajectory[i].point - trajectory[i + 1].point).norm();
+		if (distance > epsilon_) 
+		{
+			acceleration = (math::square(velocities[i + 1]) - math::square(velocities[i])) / (2.0 * distance);
+		}
+		accelerations[i + 1] = acceleration;
+	}
+
+	//TODO Check all the logic.
+	if (accelerations.size() > 1) 
+	{
+		accelerations[0] = accelerations[1];
+	}
+
+	return accelerations;
+}
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.h
new file mode 100644
index 0000000..181a1f5
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/UnifiedSpeedProfile.h
@@ -0,0 +1,85 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <Eigen/Core>
+
+#include "Actors/GhostVehicle/SpeedProfile/VehicleParameters.h"
+#include "Actors/GhostVehicle/SpeedProfile/PointLimits.h"
+#include "Actors/GhostVehicle/SpeedProfile/VelocityProfile.h"
+#include "Actors/GhostVehicle/SpeedProfile/VehicleDynamicCalculator.h"
+#include "Actors/GhostVehicle/SpeedProfile/TrajectoryPoint.h"
+
+
+namespace SpeedProfile 
+{
+
+class FSpeedProfile 
+{
+private:
+	using Trajectory = std::vector<FTrajectoryPoint>;
+
+public:
+	explicit FSpeedProfile(const FVehicleDynamicParams& dynamics)
+		: vehicleDynamicsCalculator(dynamics)
+	{}
+
+	FSpeedProfile() = default;
+
+	static double getMaxPossibleCurvature(double velocity, double friction);
+	static double getHighestPossibleVelocity(double curvature, double friction);
+
+	std::vector<double> getMaxVelocities(const FSpeedProfile::Trajectory& trajectory,
+										 const FTrajectoryLimits& trajectoryLimits) const;
+
+	FVelocityProfile calculateVelocities(double initialVelocity,
+										const Trajectory& trajectory,
+										const FTrajectoryLimits& mainLimits,
+										bool isAggressive = true) const;
+
+	std::vector<double> calculateAccelerations(const Trajectory& trajectory,
+											   const std::vector<double>& velocity) const;
+
+	FVelocityProfile immediateBraking(
+		double initialVelocity,
+		const FSpeedProfile::Trajectory& trajectory,
+		const FTrajectoryLimits& trajectoryLimits
+	) const noexcept;
+
+private:
+	FVelocityProfile getAdaptiveSpeedProfile(
+		double initialVelocity,
+		const FSpeedProfile::Trajectory& trajectory,
+		const FTrajectoryLimits& mainLimits) const noexcept;
+
+	FVelocityProfile getAgressiveSpeedProfile(
+		double initialVelocity,
+		const FSpeedProfile::Trajectory& trajectory,
+		const FTrajectoryLimits& mainLimits
+	) const noexcept;
+
+	double velocityChange(const FTrajectoryPoint& start,
+						  const FTrajectoryPoint& finish,
+						  double velocity,
+						  double acceleration) const noexcept;
+
+	FVelocityProfile adaptiveBraking(
+		double initialVelocity,
+		const FSpeedProfile::Trajectory& trajectory,
+		const FTrajectoryLimits& mainLimits
+	) const;
+
+	std::vector<double> reverseBraking(const std::vector<double>& acceleratedVelocities,
+									   const Trajectory& trajectory,
+									   const FTrajectoryLimits& trajectoryLimits) const;
+
+	std::vector<double> immediateAcceleration(double initialVelocity,
+											  const std::vector<double>& brakingVelocities,
+											  const Trajectory& trajectory,
+											  const FTrajectoryLimits& trajectoryLimits) const;
+
+private:
+	FVehicleDynamicsCalculator vehicleDynamicsCalculator;
+};
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleDynamicCalculator.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleDynamicCalculator.h
new file mode 100644
index 0000000..f3755cd
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleDynamicCalculator.h
@@ -0,0 +1,43 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Actors/GhostVehicle/SpeedProfile/VehicleParameters.h"
+#include "Actors/GhostVehicle/SpeedProfile/PointLimits.h"
+#include "Actors/GhostVehicle/SpeedProfile/VelocityProfile.h"
+#include "Actors/GhostVehicle/SpeedProfile/TrajectoryPoint.h"
+
+
+namespace SpeedProfile 
+{
+
+class FVehicleDynamicsCalculator 
+{
+public:
+	struct DecelerationResult 
+	{
+		double deceleration;
+		bool isSafe = true;
+	};
+
+	explicit FVehicleDynamicsCalculator(const FVehicleDynamicParams& dynamics)
+		: vehicleDynamics(dynamics)
+	{}
+
+	FVehicleDynamicsCalculator() = default;
+
+	const FVehicleDynamicParams& getVehicleDynamics() const noexcept { return vehicleDynamics; }
+
+	double getMaxAcceleration(double velocity,
+							  const FTrajectoryPoint& point,
+							  const FPointLimits& pointLimits) const;
+
+	DecelerationResult getMaxDeceleration(double velocity,
+										  const FTrajectoryPoint& point,
+										  const FPointLimits& pointLimits) const;
+
+private:
+	FVehicleDynamicParams vehicleDynamics;
+};
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleDynamicsCalculator.cpp b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleDynamicsCalculator.cpp
new file mode 100644
index 0000000..a56873b
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleDynamicsCalculator.cpp
@@ -0,0 +1,81 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Actors/GhostVehicle/SpeedProfile/Math.h"
+#include "Actors/GhostVehicle/SpeedProfile/VehicleDynamicCalculator.h"
+
+
+namespace SpeedProfile 
+{
+
+double FVehicleDynamicsCalculator::getMaxAcceleration(
+	double velocity,
+	const FTrajectoryPoint& point,
+	const FPointLimits& pointLimits
+) const 
+{
+	double angularVelocity = velocity / vehicleDynamics.r_wheel;
+	double torqueOnMaxPower = vehicleDynamics.max_power / angularVelocity;
+	double torque = std::min(vehicleDynamics.max_torque, torqueOnMaxPower);
+
+	if (angularVelocity >= vehicleDynamics.omega_nul_torque) 
+	{
+		torque = 0.0;
+	} 
+	else if (angularVelocity >= vehicleDynamics.omega_max_power) 
+	{
+		torque = torqueOnMaxPower * 
+				 (vehicleDynamics.omega_nul_torque - angularVelocity) / 
+				 (vehicleDynamics.omega_nul_torque - vehicleDynamics.omega_max_power);
+	}
+
+	double force = torque / vehicleDynamics.r_wheel;
+	double dragForce = vehicleDynamics.drag_force_coeff * math::square(velocity) + vehicleDynamics.rolling_resistance;
+	double maxLongitudinalAcceleration = (force - dragForce) / vehicleDynamics.car_mass;
+
+	constexpr double epsilon_ = 0.001;
+	if (maxLongitudinalAcceleration < epsilon_) 
+	{
+		return 0.0;
+	}
+
+	double accelerationRadial = std::abs(point.curvature) * math::square(velocity);
+	double accelerationFriction = pointLimits.mu * math::grav_acc;
+	if (accelerationRadial > accelerationFriction + epsilon_) 
+	{
+		return 0.0;
+	}
+
+	//get the maximum longitudinal acceleration value (kammscher kreis)
+	double accelerationLongitudinal =
+		std::sqrt(std::max((math::square(accelerationFriction) - math::square(accelerationRadial))
+						   * math::square(maxLongitudinalAcceleration) / math::square(accelerationFriction), 0.0));
+
+	accelerationLongitudinal = std::min(accelerationLongitudinal, pointLimits.maxAcceleration);
+	accelerationLongitudinal = std::min(accelerationLongitudinal, accelerationFriction);
+	return std::max(0.0, accelerationLongitudinal);
+}
+
+FVehicleDynamicsCalculator::DecelerationResult FVehicleDynamicsCalculator::getMaxDeceleration(
+	double velocity,
+	const FTrajectoryPoint& point,
+	const FPointLimits& pointLimits
+) const 
+{
+	double accelerationFriction = pointLimits.mu * math::grav_acc;
+	double accelerationRadial = std::abs(point.curvature) * math::square(velocity);
+	double diff = math::square(accelerationFriction) - math::square(accelerationRadial);
+	DecelerationResult result;
+	if (diff < 0) 
+	{
+		result.deceleration = 0.0;
+		result.isSafe = false;
+	} 
+	else 
+	{
+		result.deceleration = std::min(std::sqrt(diff), pointLimits.maxDeceleration); // TODO: Check formula;
+		result.isSafe = true;
+	}
+	return result;
+}
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleParameters.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleParameters.h
new file mode 100644
index 0000000..426c6b0
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VehicleParameters.h
@@ -0,0 +1,55 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+namespace SpeedProfile
+{
+
+struct FVehicleShapeParameters 
+{
+	double length = 4.81;
+	double width = 2.0;
+	double base_to_back = 0.96;
+	double wheel_base = 2.9;
+	double rear_wheel_to_gravity_center = 1.168;
+	double gravity_center_height = 0.4;
+};
+
+struct FVehicleDynamicParams 
+{
+	double max_velocity = 60;
+	double r_wheel = 0.35;
+	double max_power = 270E3;
+	double max_torque = 2.5E3;
+	double car_mass = 1196;
+	double omega_nul_torque = 201.6;
+	double drag_force_coeff = 1.0;
+	double rolling_resistance = 600;
+	double omega_max_power = 192.68;
+};
+
+constexpr auto defaultVanDynamics = FVehicleDynamicParams
+{
+	40., /*.max_velocity*/
+	0.336, /*.r_wheel*/
+	270000, /*.max_power*/
+	2500, /*.max_torque*/
+	2000.0, /*.car_mass*/
+	201.6, /*.omega_nul_torque*/
+	1.0, /*.drag_force_coeff*/
+	600., /*.rolling_resistance*/
+	192.68 /*.omega_max_power*/
+};
+
+constexpr auto defaultVanShape = FVehicleShapeParameters
+{
+	5.3, /*length*/
+	2.1, /*width*/
+	1.2, /*base_to_back*/
+	2.8, /*wheel_base*/
+	1.4, /*rear_wheel_to_gravity_center*/
+	0.4 /*gravity_center_height*/
+};
+
+} // SpeedProfile
+
diff --git a/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VelocityProfile.h b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VelocityProfile.h
new file mode 100644
index 0000000..d84c391
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/GhostVehicle/SpeedProfile/VelocityProfile.h
@@ -0,0 +1,19 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <Eigen/Core>
+#include <vector>
+
+
+namespace SpeedProfile 
+{
+
+struct FVelocityProfile 
+{
+	std::vector<double> velocities;
+	bool isSafe = true;
+	double inconsistency = 0;
+};
+
+} // namespace SpeedProfile
diff --git a/Source/UnrealSoda/Private/Actors/NavigationRoute.cpp b/Source/UnrealSoda/Private/Actors/NavigationRoute.cpp
new file mode 100644
index 0000000..062c9c4
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/NavigationRoute.cpp
@@ -0,0 +1,844 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/NavigationRoute.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Misc/SodaRandomEngine.h"
+#include "Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h"
+#include "Runtime/Json/Public/Dom/JsonObject.h"
+#include "Runtime/Json/Public/Serialization/JsonSerializer.h"
+#include "Engine/CollisionProfile.h"
+#include "DrawDebugHelpers.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Kismet/GameplayStatics.h"
+#include "EngineUtils.h"
+#include "ProceduralMeshComponent.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "Slate/SceneViewport.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/Editor/SodaSelection.h"
+#include "Materials/MaterialInterface.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Engine/StaticMesh.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+
+static bool IsSplineValid(const URouteSplineComponent* SplineComponent)
+{
+	return (SplineComponent != nullptr) &&
+		   (SplineComponent->GetNumberOfSplinePoints() > 1);
+}
+
+/*****************************************************************************************
+                                ANavigationRoute
+*****************************************************************************************/
+
+ANavigationRoute::ANavigationRoute(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	Spline = CreateDefaultSubobject< URouteSplineComponent >(TEXT("SplineComponent"));
+	Spline->SetMobility(EComponentMobility::Movable);
+	Spline->bHiddenInGame = true;
+#if WITH_EDITOR
+	Spline->EditorUnselectedSplineSegmentColor = FLinearColor(1.f, 0.15f, 0.15f);
+#endif // WITH_EDITOR
+	RootComponent = Spline;
+
+	TriggerVolume = CreateDefaultSubobject< UBoxComponent >(TEXT("TriggerVolume"));
+	TriggerVolume->SetHiddenInGame(true);
+	//TriggerVolume->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Overlap);
+	//TriggerVolume->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	TriggerVolume->CanCharacterStepUpOn = ECanBeCharacterBase::ECB_Yes;
+	//TriggerVolume->SetGenerateOverlapEvents(true);
+	TriggerVolume->SetBoxExtent(FVector{ 64.0f, 64.0f, 64.0f });
+	//TriggerVolume->SetMobility(EComponentMobility::Movable);
+	TriggerVolume->SetupAttachment(RootComponent);
+
+	ProceduralMesh = CreateDefaultSubobject< UProceduralMeshComponent >(TEXT("ProceduralMeshComponent"));
+	ProceduralMesh->bUseComplexAsSimpleCollision = true;
+	ProceduralMesh->bCastCinematicShadow = false;
+	ProceduralMesh->bCastDynamicShadow = false;
+	ProceduralMesh->bCastStaticShadow = false;
+	ProceduralMesh->bCastFarShadow = false;
+	ProceduralMesh->SetCastShadow(false);
+	ProceduralMesh->SetCastInsetShadow(false);
+	//ProceduralMesh->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Overlap);
+	//ProceduralMesh->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	ProceduralMesh->CanCharacterStepUpOn = ECanBeCharacterBase::ECB_No;
+	//ProceduralMesh->SetGenerateOverlapEvents(true);
+	ProceduralMesh->SetMobility(EComponentMobility::Movable);
+	ProceduralMesh->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	ProceduralMesh->SetCollisionResponseToChannel(SodaApp.GetSodaUserSettings()->SelectTraceChannel, ECollisionResponse::ECR_Block);
+	ProceduralMesh->SetCollisionObjectType(SodaApp.GetSodaUserSettings()->SelectTraceChannel);
+	ProceduralMesh->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	ProceduralMesh->SetupAttachment(RootComponent);
+
+	RandomEngine = CreateDefaultSubobject< USodaRandomEngine >(TEXT("RandomEngine"));
+	RandomEngine->Seed(RandomEngine->GenerateRandomSeed());
+
+	//PrimaryActorTick.bCanEverTick = true;
+	//PrimaryActorTick.TickGroup = TG_PrePhysics;
+
+	static ConstructorHelpers::FObjectFinder< UMaterial > Mat(TEXT("/SodaSim/Assets/CPP/RouteMat"));
+	if (Mat.Succeeded()) MatProcMesh = Mat.Object;
+}
+
+bool ANavigationRoute::SetRoutePoints(const TArray<FVector> & RoutePoints, bool bUpdateMesh)
+{
+	if (RoutePoints.Num() < 2) return false;
+	SetActorLocation(RoutePoints[0]);
+	Spline->SetSplinePoints(RoutePoints, ESplineCoordinateSpace::World, true);
+	if(bUpdateMesh) UpdateViewMesh();
+	return true;
+}
+
+void ANavigationRoute::Tick(float DeltaTime)
+{
+	Super::Tick(DeltaTime);
+}
+
+void ANavigationRoute::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if (MatProcMesh)
+	{
+		MatProcMeshDyn = UMaterialInstanceDynamic::Create(MatProcMesh, this);
+		MatProcMeshDyn->SetVectorParameterValue(TEXT("BaseColor"), BaseColor);
+	}
+
+	UpdateViewMesh();
+}
+
+void ANavigationRoute::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ANavigationRoute::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame())
+	{
+		if (Ar.IsSaving())
+		{
+			int RoutesNum = 1;
+			Ar << RoutesNum;
+
+			if (IsSplineValid(Spline))
+			{
+				int PointsNum = Spline->GetNumberOfSplinePoints();
+				Ar << PointsNum;
+				for (int i = 0; i < PointsNum; ++i)
+				{
+					FVector Point = Spline->GetLocationAtSplinePoint(i, ESplineCoordinateSpace::World);
+					Ar << Point;
+				}
+			}
+			else
+			{
+				int PointsNum = 0;
+				Ar << PointsNum;
+			}
+
+		}
+		else if (Ar.IsLoading())
+		{
+			int RoutesNum;
+			Ar << RoutesNum;
+
+			int PointsNum = 0;
+			Ar << PointsNum;
+			TArray<FVector> Ponints;
+			if (PointsNum >= 0)
+			{
+				for (int j = 0; j < PointsNum; ++j)
+				{
+					FVector Point;
+					Ar << Point;
+					Ponints.Add(Point);
+				}
+
+			}
+			SetRoutePoints(Ponints, false);
+		}
+	}
+}
+
+/*
+ANavigationRoute* ANavigationRoute::GetRandomSuccessor() const
+{
+	check(RandomEngine);
+
+	if (Successors.Num() == 0)
+	{
+		return nullptr;
+	}
+
+	if (Successors.Num() == 1)
+	{
+		return Successors[0];
+	}
+
+	TArray<float> Probabilities;
+	for (int i = 0; i < Successors.Num(); ++i)
+	{
+		Probabilities.Add(Successors[i]->Probability);
+	}
+	auto Index = RandomEngine->GetIntWithWeight(Probabilities);
+	check((Index >= 0) && (Index < Successors.Num()));
+	return Successors[Index];
+}
+*/
+
+
+bool ANavigationRoute::UpdateProcedureMeshSegment(int SegmentIndex)
+{
+	static const float RouteWidth = 40;
+	static const float SegmStep = 20.0;
+	static const float MaxDistErr = 15;
+	static const float MaxCosAngErr = 0.99619469809; //cos(5deg) = 0.99619469809
+
+	static TArray < FVector > Vertices;
+	static TArray < int32 > Triangles;
+	static TArray < FVector2D > UVs;
+	static TArray < FVector > Normals;
+	static TArray < FColor > Colors;
+	static TArray < FProcMeshTangent > Tangents;
+
+	check(Spline && ProceduralMesh);
+
+	if (SegmentIndex < 0 || SegmentIndex >= (Spline->GetNumberOfSplinePoints() - 1))
+	{
+		return false;
+	}
+
+	auto CreateCap = [this](int NodeIndex, int SectionIndex, float Yaw)
+	{
+		Vertices.SetNum(0, false);
+		Triangles.SetNum(0, false);
+		UVs.SetNum(0, false);
+		Normals.SetNum(0, false);
+		Colors.SetNum(0, false);
+		Tangents.SetNum(0, false);
+
+		FQuat Quat = Spline->GetQuaternionAtSplinePoint(NodeIndex, ESplineCoordinateSpace::Local);
+		FTransform Transform = Spline->GetTransformAtSplinePoint(NodeIndex, ESplineCoordinateSpace::Local);
+		//UpVector = Spline->GetComponentTransform().TransformVectorNoScale(Quat.RotateVector(FVector::UpVector));
+
+		Vertices.Add(Transform.GetLocation());
+		const int Step = 10;
+		for (int i = 0; i <= Step; ++i)
+		{
+			FRotator Rot(0, float(i) / Step * 180.0 + Yaw, 0);
+			Vertices.Add(Transform.TransformPosition(Rot.RotateVector(FVector(RouteWidth * 0.5, 0, 0))));
+		}
+
+		for (int i = 0; i < Step; ++i)
+		{
+			Triangles.Append({ 0, i + 1, i + 2 });
+		}
+
+		if (FProcMeshSection* Section = ProceduralMesh->GetProcMeshSection(SectionIndex))
+		{
+			ProceduralMesh->UpdateMeshSection(SectionIndex, Vertices, Normals, UVs, Colors, Tangents);
+		}
+		else
+		{
+			UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UVs, Normals, Tangents);
+			ProceduralMesh->CreateMeshSection(SectionIndex, Vertices, Triangles, Normals, UVs, Colors, Tangents, true);
+			ProceduralMesh->SetMaterial(SectionIndex, MatProcMeshDyn);
+		}
+	};
+
+	if (SegmentIndex == 0 || ProceduralMesh->GetNumSections() < 2)
+	{
+		CreateCap(0, 0, 90);
+	}
+
+	if (SegmentIndex == Spline->GetNumberOfSplinePoints() - 2 || ProceduralMesh->GetNumSections() < 2)
+	{
+		CreateCap(Spline->GetNumberOfSplinePoints() - 1, 1, -90);
+	}
+	
+	Vertices.SetNum(0, false);
+	Triangles.SetNum(0, false);
+	UVs.SetNum(0, false);
+	Normals.SetNum(0, false);
+	Colors.SetNum(0, false);
+	Tangents.SetNum(0, false);
+
+	const float SplineOffest = Spline->GetDistanceAlongSplineAtSplinePoint(SegmentIndex);
+	const float SplineLength = Spline->GetSplineLength();
+	const float SegmLength = Spline->GetDistanceAlongSplineAtSplinePoint(SegmentIndex + 1) - Spline->GetDistanceAlongSplineAtSplinePoint(SegmentIndex);
+	const int SegmCount = int(SegmLength / SegmStep + 0.5);
+	const float SegmStepR = SegmLength / SegmCount;
+	const float UVSplineOffest = int(SplineOffest / RouteWidth);
+
+	FVector CenterPoint = Spline->GetLocationAtDistanceAlongSpline(SplineOffest, ESplineCoordinateSpace::Local);
+	FQuat Quat = Spline->GetQuaternionAtDistanceAlongSpline(SplineOffest, ESplineCoordinateSpace::Local);
+	FVector ForwardVector = Quat.RotateVector(FVector::ForwardVector);
+	FVector UpVector = Quat.RotateVector(FVector::UpVector);
+	FVector RightVector = Quat.RotateVector(FVector::RightVector);
+	FVector PreForwardVector = ForwardVector;
+	FVector PreCenterPoint = CenterPoint;
+
+	Vertices.Add(CenterPoint + RightVector * RouteWidth * 0.5);
+	Vertices.Add(CenterPoint - RightVector * RouteWidth * 0.5);
+	Normals.Add(UpVector);
+	Normals.Add(UpVector);
+	UVs.Add({ 0, SplineOffest / RouteWidth - UVSplineOffest });
+	UVs.Add({ 1, SplineOffest / RouteWidth - UVSplineOffest });
+
+	for (int j = 1; j < SegmCount + 1; ++j)
+	{
+		const float Length = SplineOffest + SegmStepR * j;
+		Quat = Spline->GetQuaternionAtDistanceAlongSpline(Length, ESplineCoordinateSpace::Local);
+		CenterPoint = Spline->GetLocationAtDistanceAlongSpline(Length, ESplineCoordinateSpace::Local);
+		ForwardVector = Quat.RotateVector(FVector::ForwardVector);
+
+		if (j != SegmCount &&
+			std::abs(PreForwardVector | ForwardVector) > MaxCosAngErr &&
+			(CenterPoint - (PreCenterPoint + PreForwardVector * (CenterPoint - PreCenterPoint).Size())).Size() < MaxDistErr)
+		{
+			continue;
+		}
+
+		PreForwardVector = ForwardVector;
+		PreCenterPoint = CenterPoint;
+		UpVector = Quat.RotateVector(FVector::UpVector);
+		RightVector = Quat.RotateVector(FVector::RightVector);
+
+		Vertices.Add(CenterPoint + RightVector * RouteWidth * 0.5);
+		Vertices.Add(CenterPoint - RightVector * RouteWidth * 0.5);
+		Normals.Add(UpVector);
+		Normals.Add(UpVector);
+		UVs.Add({ 0, Length / RouteWidth - UVSplineOffest });
+		UVs.Add({ 1, Length / RouteWidth - UVSplineOffest });
+
+		const int vNum = Vertices.Num() - 1;
+		Triangles.Add(vNum - 1);
+		Triangles.Add(vNum - 2);
+		Triangles.Add(vNum - 3);
+		Triangles.Add(vNum - 1);
+		Triangles.Add(vNum - 0);
+		Triangles.Add(vNum - 2);
+	}
+
+	const int SectionIndex = SegmentIndex + 2;
+	FProcMeshSection* Section =  ProceduralMesh->GetProcMeshSection(SectionIndex);
+	if (Section && Section->ProcVertexBuffer.Num() == Vertices.Num())
+	{
+		ProceduralMesh->UpdateMeshSection(SectionIndex, Vertices, Normals, UVs, Colors, Tangents);
+	}
+	else
+	{
+		UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UVs, Normals, Tangents);
+		ProceduralMesh->CreateMeshSection(SectionIndex, Vertices, Triangles, Normals, UVs, Colors, Tangents, true);
+		ProceduralMesh->SetMaterial(SectionIndex, MatProcMeshDyn);
+	}
+
+
+	return true;
+}
+
+void ANavigationRoute::UpdateViewMesh()
+{
+	ProceduralMesh->ClearAllMeshSections();
+	const int Num = Spline->GetNumberOfSplinePoints();
+	for (int i = 0; i < Num - 1; ++i)
+	{
+		UpdateProcedureMeshSegment(i);
+	}
+}
+
+void ANavigationRoute::FitActorPosition()
+{
+	if (Spline->GetNumberOfSplinePoints() == 0) return;
+	TArray<FVector> TmpPoints;
+	for (int i = 0; i < Spline->GetNumberOfSplinePoints(); ++i)
+	{
+		TmpPoints.Add(Spline->GetLocationAtSplinePoint(i, ESplineCoordinateSpace::World));
+	}
+	
+	SetRoutePoints(TmpPoints, false);
+}
+
+void ANavigationRoute::PropagetUpdatePredecessorRoute()
+{
+	/*
+	if (PredecessorRoute.IsValid())
+	{
+		PredecessorRoute->Spline->SetLocationAtSplinePoint(PredecessorRoute->Spline->GetNumberOfSplinePoints() - 1, Spline->GetLocationAtSplinePoint(0, ESplineCoordinateSpace::World), ESplineCoordinateSpace::World);
+		PredecessorRoute->UpdateViewMesh();
+	}
+	*/
+}
+
+void ANavigationRoute::PropagetUpdateSuccessorRoute()
+{
+	/*
+	if (SuccessorRoute.IsValid())
+	{
+		SuccessorRoute->Spline->SetLocationAtSplinePoint(0, Spline->GetLocationAtSplinePoint(Spline->GetNumberOfSplinePoints() - 1, ESplineCoordinateSpace::World), ESplineCoordinateSpace::World);
+		SuccessorRoute->FitActorPosition();
+		SuccessorRoute->UpdateViewMesh();
+	}
+	*/
+}
+
+void ANavigationRoute::UpdateRouteNetwork(const ANavigationRoute* Initiator, bool bIsInitiatorPredecessor)
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::GetChecked();
+	ASodaActorFactory * ActorFactory = GameMode->GetActorFactory();
+	check(ActorFactory);
+
+	for (AActor* Actor : ActorFactory->GetActors())
+	{
+		if (ANavigationRoute* Route = Cast<ANavigationRoute>(Actor))
+		{
+
+		}
+	}
+}
+
+bool ANavigationRoute::IsRouteTagsAllowed(const TSet<FString>& AllowedRouteTags) const
+{
+	for (auto & It : AllowedRouteTags)
+	{
+		if (RouteTags.Contains(It))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+/*****************************************************************************************
+								URoutePlannerEditableNode
+*****************************************************************************************/
+
+URoutePlannerEditableNode::URoutePlannerEditableNode(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	static ConstructorHelpers::FObjectFinder< UStaticMesh > MeshAsset(TEXT("/Engine/BasicShapes/Cylinder"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > MatAsset(TEXT("/SodaSim/Assets/CPP/AxesMatDense"));
+	if (MeshAsset.Succeeded()) 	SetStaticMesh(MeshAsset.Object);
+	if (MatAsset.Succeeded()) 	SetMaterial(0, MatAsset.Object);
+	PrimaryComponentTick.bCanEverTick = true;
+
+	//SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	//SetCollisionResponseToChannel(ECollisionChannel::ECC_Visibility, ECollisionResponse::ECR_Overlap);
+	//SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+
+	SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	SetCollisionResponseToChannel(SodaApp.GetSodaUserSettings()->SelectTraceChannel, ECollisionResponse::ECR_Block);
+	SetCollisionObjectType(SodaApp.GetSodaUserSettings()->SelectTraceChannel);
+	SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+
+	CanCharacterStepUpOn = ECanBeCharacterBase::ECB_No;
+
+	BaseColor = FLinearColor(1.0, 1.0, 1.0);
+	HoverColor = FLinearColor(0.2, 0.2, 0.0);
+	SetWorldScale3D({ 0.4, 0.4, 0.03 });
+
+	bCastCinematicShadow = false;
+	bCastDynamicShadow = false;
+	bCastStaticShadow = false;
+	bCastFarShadow = false;
+	SetCastShadow(false);
+	SetCastInsetShadow(false);
+}
+
+void URoutePlannerEditableNode::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if (UMaterialInterface* Mat = GetMaterial(0))
+	{
+		MatDyn = UMaterialInstanceDynamic::Create(Mat, this);
+		SetMaterial(0, MatDyn);
+		MatDyn->SetVectorParameterValue(TEXT("BaseColor"), BaseColor);
+	}
+}
+
+void URoutePlannerEditableNode::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void URoutePlannerEditableNode::LightNode(bool bLight)
+{
+	if (MatDyn)
+	{
+		MatDyn->SetVectorParameterValue(TEXT("BaseColor"), bLight ? HoverColor : BaseColor);
+	}
+}
+
+/*****************************************************************************************
+								ANavigationRouteEditable
+*****************************************************************************************/
+
+ANavigationRouteEditable::ANavigationRouteEditable(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	PrimaryActorTick.bCanEverTick = true;
+	PrimaryActorTick.TickGroup = TG_PrePhysics;
+
+	PreviewNode = CreateDefaultSubobject< URoutePlannerEditableNode >(TEXT("PreviewNode"));
+	PreviewNode->PointIndex = -1;
+	PreviewNode->bHiddenInGame = true;
+	PreviewNode->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	PreviewNode->SetCollisionEnabled(ECollisionEnabled::NoCollision);
+	PreviewNode->SetGenerateOverlapEvents(false);
+}
+
+void ANavigationRouteEditable::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void ANavigationRouteEditable::EndPlay(EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ANavigationRouteEditable::Tick(float DeltaTime)
+{
+	Super::Tick(DeltaTime);
+
+	if (bIsSelected)
+	{
+		UWorld* World = GetWorld();
+		check(World);
+
+		USodaGameViewportClient* GameViewportClient = Cast<USodaGameViewportClient>(World->GetGameViewport());
+		if (!GameViewportClient)
+		{
+			return;
+		}
+
+		if (bIsUnfreezeNotified)
+		{
+			bIsUnfreezeNotified = false;
+			GameViewportClient->SetEditorMouseCaptureMode(EEditorMouseCaptureMode::Default);
+		}
+
+		/*
+		if (GameViewportClient->Viewport->HasMouseCapture())
+		{
+			return;
+		}
+		*/
+
+		APlayerController* PlayerController = World->GetFirstPlayerController();
+		check(PlayerController);
+		FSceneViewport* SceneViewport = GameViewportClient->GetGameViewport();
+		check(SceneViewport);
+
+		const bool bMousePresed = SceneViewport->KeyState(EKeys::LeftMouseButton);
+		const bool bLeftCtrPresed = PlayerController->IsInputKeyDown(EKeys::LeftControl);
+		URoutePlannerEditableNode* PreHoverNode = HoverNode;
+		URoutePlannerEditableNode* PreSelectedNode = SelectedNode;
+		bool bHidePreviewNode = true;
+
+		TArray<FHitResult> HitResults; 
+		TraceForMousePosition(PlayerController, HitResults);
+
+		HoverNode = nullptr;		
+
+		if (!SelectedNode && !PreviewNode->IsVisible() && !bLeftCtrPresed)
+		{
+			// Find Hover Node
+			for (auto& Hit : HitResults)
+			{
+				if (Hit.GetActor() == this)
+				{
+					URoutePlannerEditableNode* Node = Cast<URoutePlannerEditableNode>(Hit.GetComponent());
+					if (Node)
+					{
+						HoverNode = Node;
+						break;
+					}
+				}
+			}
+
+			// Select Node
+			if (bMousePresed && HoverNode)
+			{
+				SelectedNode = HoverNode;
+				SelectedNode->LightNode(true);
+				HoverNode = nullptr;
+			}
+		}
+
+		// Unselect node
+		if (SelectedNode && !bMousePresed)
+		{
+			SelectedNode->LightNode(false);
+			SelectedNode = nullptr;
+			bIsUnfreezeNotified = true;
+		}
+
+		// Light hovered node
+		if (PreHoverNode != HoverNode)
+		{
+			if (PreHoverNode) PreHoverNode->LightNode(false);
+			if (HoverNode) HoverNode->LightNode(true);
+		}
+
+		// Preview node
+		if (bLeftCtrPresed && !SelectedNode)
+		{
+			// Draw  Preview node
+			float Key{};
+			FVector Location{};
+			for (auto& Hit : HitResults)
+			{
+				if (Hit.GetComponent() && Hit.GetComponent() == ProceduralMesh)
+				{
+					Key = Spline->FindInputKeyClosestToWorldLocation(Hit.Location);
+					Location = Spline->GetLocationAtSplineInputKey(Key, ESplineCoordinateSpace::World);
+					PreviewNode->SetWorldLocation(Location);
+					bHidePreviewNode = false;
+					break;
+				}
+			}
+
+			// Add node
+			if (!bHidePreviewNode && bMousePresed)
+			{
+				if (!bHidePreviewNode && SceneViewport->KeyState(EKeys::LeftMouseButton))
+				{
+					TArray<FVector> TmpPoints;
+					for (int i = 0; i < Spline->GetNumberOfSplinePoints(); ++i)
+					{
+						TmpPoints.Add(Spline->GetLocationAtSplinePoint(i, ESplineCoordinateSpace::World));
+					}
+					const int InsertNode = int(Key) + 1;
+					TmpPoints.Insert(Location, InsertNode);
+					SetRoutePoints(TmpPoints, false);
+					UpdateViewMesh();
+					UpdateNodes();
+					SelectedNode = EditableNodes[InsertNode];
+					bHidePreviewNode = true;
+					MarkAsDirty();
+				}
+			}
+		}
+
+		// Move selected node
+		if (SelectedNode)
+		{
+			for (auto& Hit : HitResults)
+			{
+				if (Hit.GetActor() != this && !Hit.GetActor()->IsRootComponentMovable() && (Hit.GetComponent()->GetCollisionObjectType() == ECollisionChannel::ECC_WorldStatic || Hit.GetComponent()->GetCollisionObjectType() == ECollisionChannel::ECC_WorldDynamic))
+				{
+					const float ZOffset = 50;
+					const FVector Dir = (Hit.TraceEnd - Hit.TraceStart).GetSafeNormal();
+					FVector HitLocation = Hit.Location + Dir * ZOffset / Dir.Z;
+					SelectedNode->SetWorldLocation(HitLocation);
+					Spline->SetLocationAtSplinePoint(SelectedNode->PointIndex, HitLocation, ESplineCoordinateSpace::World, true);
+					UpdateProcedureMeshSegment(SelectedNode->PointIndex - 2);
+					UpdateProcedureMeshSegment(SelectedNode->PointIndex - 1);
+					UpdateProcedureMeshSegment(SelectedNode->PointIndex + 0);
+					UpdateProcedureMeshSegment(SelectedNode->PointIndex + 1);
+					UpdateProcedureMeshSegment(SelectedNode->PointIndex + 2);
+					if (SelectedNode->PointIndex == 0)
+					{
+						PropagetUpdatePredecessorRoute();
+					}
+					else if(SelectedNode->PointIndex == Spline->GetNumberOfSplinePoints() - 1)
+					{
+						PropagetUpdateSuccessorRoute();
+					}
+					MarkAsDirty();
+					break;
+				}
+			}
+		}
+
+		if (SelectedNode != PreSelectedNode && PreSelectedNode && PreSelectedNode->PointIndex == 0)
+		{
+			FitActorPosition();
+			UpdateViewMesh();
+		}
+
+		// Remove node
+		if(!SelectedNode && HoverNode && SceneViewport->KeyState(EKeys::RightMouseButton) && Spline->GetNumberOfSplinePoints() > 2)
+		{
+			Spline->RemoveSplinePoint(HoverNode->PointIndex);
+			FitActorPosition();
+			UpdateViewMesh();
+			UpdateNodes();
+			HoverNode = nullptr;
+			MarkAsDirty();
+		}
+
+		// PreviewNode visibility
+		if (PreviewNode->IsVisible() == bHidePreviewNode)
+		{
+			PreviewNode->SetHiddenInGame(bHidePreviewNode);
+		}
+
+		// GameViewportClient mode
+		if (HoverNode || SelectedNode || bLeftCtrPresed)
+		{
+			if (GameViewportClient->GetEditorMouseCaptureMode() != EEditorMouseCaptureMode::Dragging)
+			{
+				GameViewportClient->SetEditorMouseCaptureMode(EEditorMouseCaptureMode::Dragging);
+			}
+		}
+		else
+		{
+			if (GameViewportClient->GetEditorMouseCaptureMode() != EEditorMouseCaptureMode::Default)
+			{
+				GameViewportClient->SetMouseCaptureMode(EMouseCaptureMode::CaptureDuringMouseDown);
+				bIsUnfreezeNotified = true;
+			}
+		}
+	}
+}
+
+void ANavigationRouteEditable::OnSelect_Implementation(const UPrimitiveComponent* PrimComponent)
+{ 
+	UpdateNodes();
+	bIsSelected = true;
+	SelectedNode = nullptr;
+	HoverNode = nullptr;
+	if(MatProcMeshDyn) MatProcMeshDyn->SetVectorParameterValue(TEXT("BaseColor"), SelectColor );
+}
+
+void ANavigationRouteEditable::OnUnselect_Implementation()
+{ 
+	for (auto& Node : EditableNodes) Node->DestroyComponent();
+	EditableNodes.Empty();
+	bIsSelected = false;
+	SelectedNode = nullptr;
+	HoverNode = nullptr;
+	if (MatProcMeshDyn) MatProcMeshDyn->SetVectorParameterValue(TEXT("BaseColor"), BaseColor);
+}
+
+void ANavigationRouteEditable::OnHover_Implementation()
+{
+}
+
+void ANavigationRouteEditable::OnUnhover_Implementation()
+{
+}
+
+void ANavigationRouteEditable::OnComponentHover_Implementation(const UPrimitiveComponent* PrimComponent)
+{
+	//HoverNode = Cast<URoutePlannerEditableNode>(const_cast<UPrimitiveComponent*>(PrimComponent));
+}
+
+void ANavigationRouteEditable::OnComponentUnhover_Implementation(const UPrimitiveComponent* PrimComponent)
+{
+	//HoverNode = nullptr;
+}
+
+void ANavigationRouteEditable::UpdateNodes()
+{
+	SelectedNode = nullptr;
+	HoverNode = nullptr;
+
+	const int Diff = Spline->GetNumberOfSplinePoints() - EditableNodes.Num();
+	if (Diff < 0)
+	{
+		for (int i = 0; i < -Diff; ++i)
+		{
+			EditableNodes[EditableNodes.Num() - i - 1]->DestroyComponent();
+		}
+		EditableNodes.SetNum(Spline->GetNumberOfSplinePoints());
+	}
+	else if (Diff > 0)
+	{
+		for (int i = 0; i < Diff; ++i)
+		{
+			URoutePlannerEditableNode* Node = EditableNodes.Add_GetRef(NewObject<URoutePlannerEditableNode>(this));
+			Node->RegisterComponent();
+		}
+	}
+
+	for (int i = 0; i < Spline->GetNumberOfSplinePoints(); ++i)
+	{
+		EditableNodes[i]->SetWorldLocation(Spline->GetLocationAtSplinePoint(i, ESplineCoordinateSpace::World), false, nullptr, ETeleportType::ResetPhysics);
+		EditableNodes[i]->PointIndex = i;
+	}
+}
+
+bool ANavigationRouteEditable::TraceForMousePosition(const APlayerController* PlayerController, TArray<struct FHitResult>& HitResults)
+{
+	FVector2D ScreenPosition;
+	FVector WorldOrigin;
+	FVector WorldDirection;
+
+	FCollisionObjectQueryParams ObjectQueryParams(FCollisionObjectQueryParams::AllObjects);
+
+
+	const float HitResultTraceDistance = 100000.f;
+	if (PlayerController->GetMousePosition(ScreenPosition.X, ScreenPosition.Y) &&
+		FEditorUtils::DeprojectScreenToWorld(PlayerController->GetLocalPlayer(), ScreenPosition, WorldOrigin, WorldDirection) &&
+		PlayerController->GetWorld()->LineTraceMultiByObjectType(HitResults, WorldOrigin, WorldOrigin + WorldDirection * HitResultTraceDistance, ObjectQueryParams))
+	{
+		return true;
+	}
+
+	return false;
+}
+
+void ANavigationRouteEditable::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	ISodaActor::RuntimePostEditChangeProperty(PropertyChangedEvent);
+
+	FProperty* Property = PropertyChangedEvent.Property;
+	const FName PropertyName = Property ? Property->GetFName() : NAME_None;
+
+	if (PropertyName == GET_MEMBER_NAME_CHECKED(ANavigationRoute, PredecessorRoute))
+	{
+		//UpdateRouteNetwork(this, true);
+		PropagetUpdatePredecessorRoute();
+	}
+	else if (PropertyName == GET_MEMBER_NAME_CHECKED(ANavigationRoute, SuccessorRoute))
+	{
+		//UpdateRouteNetwork(this, false);
+		PropagetUpdateSuccessorRoute();
+	}
+}
+
+void ANavigationRouteEditable::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	ISodaActor::RuntimePostEditChangeProperty(PropertyChangedEvent);
+
+	FProperty* Property = PropertyChangedEvent.Property;
+	const FName PropertyName = Property ? Property->GetFName() : NAME_None;
+
+	if (PropertyName == GET_MEMBER_NAME_CHECKED(ANavigationRoute, PredecessorRoute))
+	{
+		//UpdateRouteNetwork(this, true);
+		PropagetUpdatePredecessorRoute();
+	}
+	else if (PropertyName == GET_MEMBER_NAME_CHECKED(ANavigationRoute, SuccessorRoute))
+	{
+		//UpdateRouteNetwork(this, false);
+		PropagetUpdateSuccessorRoute();
+	}
+}
+
+const FSodaActorDescriptor* ANavigationRouteEditable::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Navigatopn Route"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT(""), /*SubCategory*/
+		TEXT("SodaIcons.Route"), /*Icon*/
+		false, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/NoiseBox.cpp b/Source/UnrealSoda/Private/Actors/NoiseBox.cpp
new file mode 100644
index 0000000..9cbfe60
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/NoiseBox.cpp
@@ -0,0 +1,181 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/NoiseBox.h"
+#include "Soda/UnrealSoda.h"
+#include "Components/BoxComponent.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Engine/Texture2D.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h"
+#include "Soda/SodaGameMode.h"
+
+ANoiseBox::ANoiseBox()
+{
+	PrimaryActorTick.bCanEverTick = true;
+
+	ConstructorHelpers::FObjectFinderOptional<UTexture2D> IconTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/S_Emitter"));
+
+	SpriteComponent = CreateDefaultSubobject<UBillboardComponent>(TEXT("SpriteComponent"));
+	SpriteComponent->Sprite = IconTextureObject.Get();
+	SpriteComponent->Mobility = EComponentMobility::Movable;
+	SpriteComponent->SetHiddenInGame(false);
+	SpriteComponent->bIsScreenSizeScaled = true;
+	RootComponent = SpriteComponent;
+
+	TriggerVolume = CreateDefaultSubobject< UBoxComponent >(TEXT("TriggerVolume"));
+	TriggerVolume->SetupAttachment(RootComponent);
+	TriggerVolume->SetHiddenInGame(false);
+	//TriggerVolume->SetCollisionObjectType(ECollisionChannel::ECC_WorldStatic);
+	//TriggerVolume->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	//TriggerVolume->SetCollisionResponseToChannel(ECollisionChannel::ECC_Visibility, ECollisionResponse::ECR_Overlap);
+	//TriggerVolume->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	//TriggerVolume->CanCharacterStepUpOn = ECanBeCharacterBase::ECB_No;
+	//TriggerVolume->SetGenerateOverlapEvents(true);
+	TriggerVolume->InitBoxExtent(Extent);
+	//TriggerVolume->SetMobility(EComponentMobility::Movable);
+
+	auto & RTKGPS = NoisePresets.Add("RTKGPS");
+	RTKGPS.Location.StdDev = FVector(0.08f);
+	RTKGPS.Location.ConstBias = FVector(0.001f);
+	RTKGPS.Location.GMBiasStdDev = FVector(0.008f);
+
+	auto& StandartGPS = NoisePresets.Add("StandartGPS");
+	StandartGPS.Location.StdDev = FVector(2.f);
+	StandartGPS.Location.ConstBias = FVector(2.f);
+	StandartGPS.Location.GMBiasStdDev = FVector(0.5f);
+
+	auto& GPS_L5 = NoisePresets.Add("GPS_L5");
+	GPS_L5.Location.StdDev = FVector(0.3f);
+	GPS_L5.Location.ConstBias = FVector(0.001f);
+	GPS_L5.Location.GMBiasStdDev = FVector(0.3f);
+
+	DefaultProfileName = "StandartGPS";
+}
+
+void ANoiseBox::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	ISodaActor::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	FProperty* MemberProperty = PropertyChangedEvent.PropertyChain.GetHead()->GetValue();
+	if (MemberProperty && MemberProperty->GetFName() == GET_MEMBER_NAME_CHECKED(ANoiseBox, Extent))
+	{
+		TriggerVolume->SetBoxExtent(Extent);
+	}
+}
+
+/*
+#if WITH_EDITOR
+void ANoiseBox::PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent)
+{
+	
+	//Get the name of the property that was changed
+	FName PropertyName = (PropertyChangedEvent.Property != nullptr) ? PropertyChangedEvent.Property->GetFName() : NAME_None;
+	UE_LOG(LogSoda, Log, TEXT("PostEditChangeProperty: %s"), *PropertyName.ToString());
+
+	// We test using GET_MEMBER_NAME_CHECKED so that if someone changes the property name
+	// in the future this will fail to compile and we can update it.
+	if (PropertyName == GET_MEMBER_NAME_CHECKED(UImuNoisePresets, Profile))
+	{
+		if (Profile != EGPSMode::Custom)
+		{
+			ImuNoiseParams = NoisePresets[Profile];
+		}
+	}
+	else if (PropertyName == GET_MEMBER_NAME_CHECKED(FVector, X) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FVector, Y) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FVector, Z) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FImuNoiseParams, LocShiftStddev) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FImuNoiseParams, LocTimeMeanValue) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FImuNoiseParams, LocTimeStddev) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FImuNoiseParams, LocFusionTime) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FImuNoiseParams, RotShiftStddev) ||
+		PropertyName == GET_MEMBER_NAME_CHECKED(FImuNoiseParams, RotFusionTime))
+	{
+		Profile = EGPSMode::Custom;
+	}
+	
+
+	// Call the base class version
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+};
+#endif
+*/
+
+void ANoiseBox::BeginPlay()
+{
+	Super::BeginPlay();
+
+	TriggerVolume->SetBoxExtent(Extent);
+	TriggerVolume->OnComponentBeginOverlap.AddDynamic(this, &ANoiseBox::OnBeginOverlap);
+	TriggerVolume->OnComponentEndOverlap.AddDynamic(this, &ANoiseBox::OnEndOverlap);
+}
+
+void ANoiseBox::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	TriggerVolume->OnComponentBeginOverlap.RemoveDynamic(this, &ANoiseBox::OnBeginOverlap);
+	TriggerVolume->OnComponentEndOverlap.RemoveDynamic(this, &ANoiseBox::OnEndOverlap);
+}
+
+void ANoiseBox::OnBeginOverlap(UPrimitiveComponent* OverlappedComp, AActor* Other, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult)
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (!bActiveOnlyIfScenario || (GameMode && GameMode->IsScenarioRunning()))
+	{
+		if (ASodaVehicle* Vehicle = Cast<ASodaVehicle>(Other))
+		{
+			for (auto& Component : Vehicle->GetVehicleComponents())
+			{
+				if (UImuSensorComponent* Sensor = Cast<UImuSensorComponent>(Component))
+				{
+					Sensor->SetImuNoiseParams(DefaultNoiseParams);
+				}
+			}
+		}
+	}
+}
+
+void ANoiseBox::OnEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* Other, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex)
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (!bActiveOnlyIfScenario || (GameMode && GameMode->IsScenarioRunning()))
+	{
+		if (ASodaVehicle* Vehicle = Cast<ASodaVehicle>(Other))
+		{
+			for (auto& Component : Vehicle->GetVehicleComponents())
+			{
+				if (UImuSensorComponent* Sensor = Cast<UImuSensorComponent>(Component))
+				{
+					Sensor->RestoreBaseImuNoiseParams();
+				}
+			}
+		}
+	}
+}
+
+void ANoiseBox::UpdateDefaultNoiseParams()
+{
+	if (auto* Profile = NoisePresets.Find(DefaultProfileName))
+	{
+		DefaultNoiseParams = *Profile;
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ANoiseBox::UpdateDefaultNoiseParams(); Can't find profile \"%s\""), *DefaultProfileName);
+	}
+}
+
+const FSodaActorDescriptor* ANoiseBox::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Noise Box"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT(""), /*SubCategory*/
+		TEXT("Icons.Box"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50) /*SpawnOffset*/
+	};
+	return &Desc;
+}
diff --git a/Source/UnrealSoda/Private/Actors/OpenDriveTool.cpp b/Source/UnrealSoda/Private/Actors/OpenDriveTool.cpp
new file mode 100644
index 0000000..b138447
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/OpenDriveTool.cpp
@@ -0,0 +1,575 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/OpenDriveTool.h"
+#include "Soda/UnrealSoda.h"
+#include "DrawDebugHelpers.h"
+#include "HAL/FileManager.h"
+#include "Soda/UnrealSoda.h"
+#include "opendrive/OpenDrive.hpp"
+#include "opendrive/geometry/CenterLine.hpp"
+#include "opendrive/geometry/GeometryGenerator.hpp"
+#include "UObject/ConstructorHelpers.h"
+#include "Engine/Texture2D.h"
+#include "Materials/Material.h"
+#include "Soda/DBGateway.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Misc/FileHelper.h"
+
+#include "bsoncxx/builder/stream/helpers.hpp"
+#include "bsoncxx/exception/exception.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+#include "bsoncxx/builder/stream/array.hpp"
+#include "bsoncxx/json.hpp"
+
+FOpenDriveRoadMarkProfile::FOpenDriveRoadMarkProfile()
+{
+	MarkType = "solid";
+	Label = ESegmObjectLabel::RoadLines;
+	Color = FColor(255, 255, 255);
+	Width = 30;
+}
+
+FOpenDriveRoadMarkProfile::FOpenDriveRoadMarkProfile(const FString& InMarakType, ESegmObjectLabel InLabel, const FColor& InColor, float InWidth)
+{
+	MarkType = InMarakType;
+	Label = InLabel;
+	Color = InColor;
+	Width = InWidth;
+}
+
+AOpenDriveTool::AOpenDriveTool(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	PrimaryActorTick.bCanEverTick = false;
+
+	ConstructorHelpers::FObjectFinderOptional<UTexture2D> IconTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/RoadMark"));
+
+	USceneComponent* SceneComponent = ObjectInitializer.CreateDefaultSubobject<USceneComponent>(this, TEXT("SceneComp"));
+	RootComponent = SceneComponent;
+	RootComponent->Mobility = EComponentMobility::Static;
+
+#if WITH_EDITORONLY_DATA
+	SpriteComponent = ObjectInitializer.CreateEditorOnlyDefaultSubobject<UBillboardComponent>(this, TEXT("Sprite"));
+	if (SpriteComponent)
+	{
+		SpriteComponent->Sprite = IconTextureObject.Get();
+		SpriteComponent->SpriteInfo.Category = TEXT("GenerateRoadMark");
+		SpriteComponent->SpriteInfo.DisplayName = FText::FromString(TEXT("GenerateRoadMark"));
+		SpriteComponent->SetupAttachment(RootComponent);
+		SpriteComponent->Mobility = EComponentMobility::Static;
+		SpriteComponent->SetEditorScale(1.f);
+	}
+#endif // WITH_EDITORONLY_DATA
+
+	MarkProfile.Add(FOpenDriveRoadMarkProfile(TEXT("solid"), ESegmObjectLabel::RoadLines_Solid, FColor(255, 0, 0), 20 ));
+	MarkProfile.Add(FOpenDriveRoadMarkProfile(TEXT("broken"), ESegmObjectLabel::RoadLines_Dashed, FColor(0, 255, 0), 20));
+	MarkProfile.Add(FOpenDriveRoadMarkProfile(TEXT("solid solid"), ESegmObjectLabel::RoadLines_DoubleSide, FColor(255, 255, 0), 40));
+	MarkProfile.Add(FOpenDriveRoadMarkProfile(TEXT("solid broken"), ESegmObjectLabel::RoadLines_Solid, FColor(0, 0, 255), 40));
+	MarkProfile.Add(FOpenDriveRoadMarkProfile(TEXT("broken solid"), ESegmObjectLabel::RoadLines_Solid, FColor(0, 0, 255), 40));
+	
+	static ConstructorHelpers::FObjectFinder< UMaterial > MarkMaterialPtr(TEXT("/SodaSim/Assets/CPP/LaneMat"));
+	if (MarkMaterialPtr.Succeeded()) MarkMaterial = MarkMaterialPtr.Object;
+}
+
+#if WITH_EDITOR
+void AOpenDriveTool::PostEditChangeProperty(struct FPropertyChangedEvent& Event)
+{
+	Super::PostEditChangeProperty(Event);
+
+	/*
+	const FName PropertyName = (Event.Property != NULL ? Event.Property->GetFName() : NAME_None);
+	if (PropertyName == GET_MEMBER_NAME_CHECKED(AOpenDriveTool, bGenerateMarks))
+	{
+	}
+	*/
+}
+#endif // WITH_EDITOR
+
+FString AOpenDriveTool::FindXDORFile()
+{
+	FString MapName = GetWorld()->GetMapName();
+
+#if WITH_EDITOR
+	{
+		FString CorrectedMapName = MapName;
+		constexpr auto PIEPrefix = TEXT("UEDPIE_0_");
+		CorrectedMapName.RemoveFromStart(PIEPrefix);
+		UE_LOG(LogSoda, Log, TEXT("AOpenDriveTool::FindXDORFile(); Corrected map name from %s to %s"), *MapName, *CorrectedMapName);
+		MapName = CorrectedMapName;
+	}
+#endif // WITH_EDITOR
+
+	MapName += TEXT(".xodr");
+
+	/*
+	const FString DefaultFilePath =
+		FPaths::ProjectContentDir() +
+		TEXT("Carla/Maps/OpenDrive/") +
+		MapName;
+	*/
+
+	const FString DefaultFilePath = FPaths::ProjectDir() / TEXT("OpenDrive") / MapName;
+
+	auto& FileManager = IFileManager::Get();
+
+	if (FileManager.FileExists(*DefaultFilePath))
+	{
+		UE_LOG(LogSoda, Log, TEXT("AOpenDriveTool::FindXDORFile(); Found .xdor (%s) for LevelName: %s"), *DefaultFilePath, *MapName);
+		return DefaultFilePath;
+	}
+
+	/*
+	TArray<FString> FilesFound;
+	FileManager.FindFilesRecursive(
+		FilesFound,
+		*FPaths::ProjectContentDir(),
+		*MapName,
+		true,
+		false,
+		false);
+
+	if (FilesFound.Num())
+	{
+		UE_LOG(LogSoda, Log, TEXT("AOpenDriveTool::FindXDORFile(); Found .xdor (%s) for LevelName: %s"), *FilesFound[0], *MapName);
+		return FilesFound[0];
+	}
+	*/
+
+	UE_LOG(LogSoda, Warning, TEXT("AOpenDriveTool::FindXDORFile(); Can't find .xdor for LevelName: %s"), *MapName);
+	return FString();
+}
+
+bool AOpenDriveTool::FindAndLoadXDOR(bool bForceReload)
+{
+	if (OpenDriveData && !bForceReload)
+	{
+		return true;
+	}
+
+	FString Path = FindXDORFile();
+	if (!Path.Len())
+	{
+		return false;
+	}
+
+	OpenDriveData = MakeShared< opendrive::OpenDriveData>();
+	if (!opendrive::Load(std::string(TCHAR_TO_UTF8(*Path)), *OpenDriveData.Get()))
+	{
+		UE_LOG(LogSoda, Error, TEXT("AOpenDriveTool::FindAndLoadXDOR(); Can't parse OpenDrive file: %s"), *Path);
+		OpenDriveData.Reset();
+		return false;
+	}
+	return true;
+}
+
+bool AOpenDriveTool::BuildRoadMarks()
+{
+	ClearMarkings();
+
+	if (!FindAndLoadXDOR(false))
+	{
+		UE_LOG(LogSoda, Error, TEXT("AOpenDriveTool::BuildRoadMarks(); XDOR isn't loaded"));
+		return false;
+	}
+
+	for (auto& Profile : MarkProfile)
+	{
+		Profile.Material = UMaterialInstanceDynamic::Create(MarkMaterial, this);
+		Profile.Material->SetVectorParameterValue(TEXT("BaseColor"), Profile.Color);
+	}
+
+	for (int road_id = 0; road_id < OpenDriveData->roads.size(); ++road_id)
+	{
+		std::vector<opendrive::LaneMark> LaneMarkers;
+		opendrive::geometry::GenerateRoadMarkLines(OpenDriveData->roads[road_id], LaneMarkers, MarkAccuracy / 100.f);
+
+		for (auto& MarkLine : LaneMarkers)
+		{
+			auto Profile = FindMarkProfile(UTF8_TO_TCHAR(MarkLine.type.c_str()));
+
+			TArray<FVector> CenterLine;
+			for (auto& Pt : MarkLine.Edge) CenterLine.Add(FVector(Pt.x * 100, -Pt.y * 100, Pt.z * 100 + MarkHeight));
+
+			if (bMarkDrawDebug)
+			{
+				TArray<FVector> Positions;
+				for (auto& Pt : MarkLine.Edge)
+				{
+					Positions.Add(FVector(Pt.x * 100, -Pt.y * 100, Pt.z * 100 + MarkHeight));
+				}
+				DebugMarkLines.Add(Positions);
+			}
+			
+			if (Profile != nullptr)
+			{
+				TArray < FVector > Vertices;
+				TArray < int32 >Triangles;
+				TArray<FVector2D> UVs;
+				TArray<FVector> Normals;
+				TArray<FColor> Colors;
+				TArray<FProcMeshTangent> Tangents;
+
+				TArray<FVector> ForwardVectors;
+				for (int i = 0; i < CenterLine.Num() - 1; ++i)  ForwardVectors.Add((CenterLine[i + 1] - CenterLine[i]).GetSafeNormal());
+				ForwardVectors.Add(FVector(ForwardVectors.Last()));
+
+				TArray<FVector> RightVectors2D;
+				for (int i = 0; i < CenterLine.Num(); ++i)
+				{
+					RightVectors2D.Add(FRotationMatrix(ForwardVectors[i].GetSafeNormal2D().Rotation()).GetScaledAxis(EAxis::Y));
+				}
+				
+				Vertices.Add(CenterLine[0] + RightVectors2D[0] * Profile->Width);
+				Vertices.Add(CenterLine[0] - RightVectors2D[0] * Profile->Width);
+
+				for (int i = 1; i< CenterLine.Num(); ++i)
+				{
+					FVector RightVector2D;
+					float Width;
+					if (i == CenterLine.Num() - 1)
+					{
+						RightVector2D = RightVectors2D[i];
+						Width = Profile->Width;
+					}
+					else
+					{
+						if (bMarkOptimizeMesh)
+						{
+							FVector RightVector3D = (ForwardVectors[i - 1] - ForwardVectors[i + 1]);
+							if (!RightVector3D.Normalize(1.e-6f)) continue;
+						}
+
+						RightVector2D = (RightVectors2D[i - 1] + RightVectors2D[i + 1]).GetSafeNormal2D();
+						if (RightVector2D.IsZero())
+						{
+							RightVector2D = RightVectors2D[i];
+							Width = Profile->Width;
+						}
+						else
+						{
+							float A = FMath::Acos(RightVectors2D[i - 1].CosineAngle2D(-RightVectors2D[i + 1])) / 2;
+							Width = std::fabsf(Profile->Width / std::sin(A));
+						}
+					}
+
+					Vertices.Add(CenterLine[i] + RightVector2D * Width);
+					Vertices.Add(CenterLine[i] - RightVector2D * Width);
+
+					int Num = Vertices.Num() - 1;
+					Triangles.Add(Num - 1);
+					Triangles.Add(Num - 2);
+					Triangles.Add(Num - 3);
+					Triangles.Add(Num - 1);
+					Triangles.Add(Num + 0);
+					Triangles.Add(Num - 2);
+				}
+
+				UProceduralMeshComponent* MarkMesh = NewObject<UProceduralMeshComponent>(this);
+				MarkMesh->RegisterComponent();
+				MarkMesh->CreateMeshSection(road_id, Vertices, Triangles, Normals, UVs, Colors, Tangents, false);
+				MarkMesh->SetMaterial(road_id, Profile->Material);
+				MarkMesh->bCastCinematicShadow = false;
+				MarkMesh->bCastDynamicShadow = false;
+				MarkMesh->bCastStaticShadow = false;
+				MarkMesh->bCastFarShadow = false;
+				MarkMesh->SetCastShadow(false);
+				MarkMesh->SetCastInsetShadow(false);
+				MarkMesh->SetCustomDepthStencilValue((uint8)Profile->Label);
+				MarkMesh->SetRenderCustomDepth(true);
+				MarkMeshes.Add(MarkMesh);
+			}
+		}
+	}
+
+	return true;
+}
+
+bool AOpenDriveTool::BuildRoutes()
+{
+	ClearRoutes();
+
+	if (!FindAndLoadXDOR(false))
+	{
+		UE_LOG(LogSoda, Error, TEXT("AOpenDriveTool::BuildRoutes(); XDOR isn't loaded"));
+		return false;
+	}
+
+	for (int road_id = 0; road_id < OpenDriveData->roads.size(); ++road_id)
+	{
+		//auto& lanes = OpenDriveData->roads[road_id].lanes;
+		auto& laneSections = OpenDriveData->roads[road_id].lanes.lane_sections;
+		opendrive::geometry::CenterLine centerLine;
+
+		if (!opendrive::geometry::generateCenterLine(OpenDriveData->roads[road_id], centerLine))
+		{
+			return false;
+		}
+
+		for (auto it = laneSections.begin(); it != laneSections.end(); it++)
+		{
+			auto& laneSection = *it;
+			auto laneSectionIndex = static_cast<uint32_t>(it - laneSections.begin()) + 1;
+
+			// the tolerance at the end is necessary so that the lane offset applies only to the current lane section
+			double s0 = laneSection.start_position;
+			double s1 = laneSection.end_position;
+
+			/*
+			if ((s1 - s0) < MinimumSegmentLength)
+			{
+				std::cerr << "Invalid lane section length s1, s0\n";
+				continue;
+			}
+			*/
+
+			auto EvalBorderOffset = [&](const std::vector<opendrive::LaneInfo>& LanesInfo, const opendrive::LaneInfo& target_line, double s)
+			{
+				double borderOffset = 0.;
+				for (auto& laneInfo : LanesInfo)
+				{
+					auto width = opendrive::geometry::laneWidth(laneInfo.lane_width, s - s0);
+					borderOffset += width;
+
+					if (&laneInfo == &target_line)
+					{
+						borderOffset -= width / 2;
+						break;
+					}
+				}
+
+				return borderOffset;
+			};
+
+
+			auto AddRoute = [&](const std::vector<opendrive::LaneInfo>& LanesInfo, const opendrive::LaneInfo& laneInfo, int dir)
+			{
+				if (laneInfo.attributes.type != opendrive::LaneType::Driving)
+				{
+					return;
+				}
+
+				TArray<FVector> Points;
+
+				int count = int(centerLine.length / (RouteAccuracy / 100.0f) + 1);
+
+				const double step = double(centerLine.length) / count;
+
+				for (int j = 0; j <= count; ++j)
+				{
+					double s = s0 + step * j;
+					auto centerPoint = centerLine.eval(s);
+					double height = centerLine.evalElevation(s);
+					double borderOffset = EvalBorderOffset(LanesInfo, laneInfo, s);
+
+					switch (dir)
+					{
+					case -1: //right
+						centerPoint.ApplyLateralOffset(-borderOffset);
+						break;
+					case 1: //left
+						centerPoint.ApplyLateralOffset(borderOffset);
+						break;
+					}
+					//laneMark.Edge.push_back({ centerPoint.location.x, centerPoint.location.y, height });
+
+					Points.Add(FVector( centerPoint.location.x * 100, -centerPoint.location.y * 100, height * 100 + RoutesHeight));
+				}
+
+				if (Points.Num() > 1)
+				{
+					if (dir == 1)
+					{
+						for (int i = 0; i < Points.Num() / 2; ++i)
+						{
+							std::swap(Points[i], Points[Points.Num() - 1 - i]);
+						}
+					}
+					ANavigationRoute* Route = GetWorld()->SpawnActor<ANavigationRoute>(Points[0], FRotator(0, 0, 0));
+					Route->SetRoutePoints(Points);
+					Route->bAllowForVehicles = true;
+					Route->bAllowForPedestrians = false;
+					Routes.Add(Route);
+				}
+			};
+
+
+			for (auto& laneInfo : laneSection.left)
+				AddRoute(laneSection.left, laneInfo, 1);
+			for (auto& laneInfo : laneSection.right)
+				AddRoute(laneSection.right, laneInfo, -1);
+			AddRoute(laneSection.center, laneSection.center[0], 0);
+
+		}
+	}
+
+	return true;
+}
+
+void AOpenDriveTool::ClearRoutes()
+{
+	for (auto& Route : Routes)
+	{
+		if (IsValid(Route)) Route->Destroy();
+	}
+	Routes.Empty();
+}
+
+void AOpenDriveTool::ClearMarkings()
+{
+	for (auto& it : MarkMeshes)
+	{
+		if (IsValid(it))
+		{
+			it->ClearAllMeshSections();
+			it->DestroyComponent();
+		}
+	}
+	MarkMeshes.Empty();
+	DebugMarkLines.Empty();
+}
+
+void AOpenDriveTool::DrawDebugMarks() const
+{
+	for (int i = 0; i < DebugMarkLines.Num(); ++i)
+	{
+		for (int j = 0; j < DebugMarkLines[i].Num() - 1; ++j)
+		{
+			const FVector p0 = DebugMarkLines[i][j + 0];
+			const FVector p1 = DebugMarkLines[i][j + 1];
+
+			DrawDebugLine(GetWorld(), p0, p1, FColor(0, 0, 255), true, -1.f, 0, 10);
+		}
+	}
+}
+
+FOpenDriveRoadMarkProfile* AOpenDriveTool::FindMarkProfile(const FString& MarakType)
+{
+	for (auto& Profile : MarkProfile)
+	{
+		if (Profile.MarkType == MarakType) return &Profile;
+	}
+	return nullptr;
+}
+
+void AOpenDriveTool::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if (bMarkGenerateOnBeginPlay)
+	{
+		BuildRoadMarks();
+	}
+}
+
+void AOpenDriveTool::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void AOpenDriveTool::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+}
+
+void AOpenDriveTool::OnConstruction(const FTransform& Transform)
+{
+	Super::OnConstruction(Transform);
+}
+
+void AOpenDriveTool::ScenarioBegin()
+{
+	ISodaActor::ScenarioBegin();
+
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	if (bRecordDataset && soda::FDBGateway::Instance().GetStatus() == soda::EDBGatewayStatus::Connected && soda::FDBGateway::Instance().IsDatasetRecording())
+	{
+		if (OpenDriveData.IsValid())
+		{
+			bsoncxx::builder::stream::document Doc;
+
+			if (bStoreLanesMarks)
+			{
+				auto laneArray = Doc << "road_lanes_marks" << open_array;
+				for (int road_id = 0; road_id < OpenDriveData->roads.size(); ++road_id)
+				{
+					std::vector<opendrive::LaneMark> LaneMarkers;
+					opendrive::geometry::GenerateRoadMarkLines(OpenDriveData->roads[road_id], LaneMarkers, MarkAccuracy / 100.f);
+
+					auto laneDoc = laneArray << open_document;
+					for (auto& MarkLine : LaneMarkers)
+					{
+						laneDoc << "type" << MarkLine.type;
+						auto ptArray = laneDoc << "points" << open_array;
+						for (auto& Pt : MarkLine.Edge)
+						{
+							FVector Pt2{ Pt.x * 100, -Pt.y * 100, Pt.z * 100 };
+							ptArray << open_array << Pt2.X << Pt2.Y << Pt2.Z << close_array;
+						}
+						ptArray << close_array;
+					}
+					laneDoc << close_document;
+				}
+				laneArray << close_array;
+			}
+
+			if (bStoreXDOR)
+			{
+				FString FileName = FindXDORFile();
+				FString FileContent;
+				if (!FileName.IsEmpty())
+				{
+					if (FFileHelper::LoadFileToString(FileContent, *FileName))
+					{
+						Doc << "xdor" << TCHAR_TO_UTF8(*FileContent);
+					}
+					else
+					{
+						UE_LOG(LogSoda, Error, TEXT("AOpenDriveTool::ScenarioBegin(); Can't load %s"), *FileName);
+					}
+				}
+				else
+				{
+					UE_LOG(LogSoda, Error, TEXT("AOpenDriveTool::ScenarioBegin(); Can't find XDOR file"));
+				}
+			}
+
+			auto Dataset = soda::FDBGateway::Instance().CreateActorDataset(GetName(), "opendrive", GetClass()->GetName(), Doc);
+			if (!Dataset)
+			{
+				SodaApp.GetGameModeChecked()->ScenarioStop(EScenarioStopReason::InnerError);
+				SodaApp.GetGameModeChecked()->ShowMessageBox(soda::EMessageBoxType::OK, "Scenarip stoped", "Can't create dataset for \"" + GetName() + "\"");
+			}
+		}
+		else
+		{
+			UE_LOG(LogSoda, Error, TEXT("AOpenDriveTool::ScenarioBegin(); Can't find OpenDriveData isn't valid"));
+		}
+	}
+}
+
+void AOpenDriveTool::ScenarioEnd()
+{
+	ISodaActor::ScenarioEnd();
+}
+
+const FSodaActorDescriptor* AOpenDriveTool::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Open Drive Tool"), /*DisplayName*/
+		TEXT("Tools"), /*Category*/
+		TEXT(""), /*SubCategory*/
+		TEXT("SodaIcons.Road"), /*Icon*/
+		false, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/PathViewer.cpp b/Source/UnrealSoda/Private/Actors/PathViewer.cpp
new file mode 100644
index 0000000..6aaf46d
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/PathViewer.cpp
@@ -0,0 +1,116 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/PathViewer.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/LevelState.h"
+
+APathViewer::APathViewer()
+{
+	PrimaryActorTick.bCanEverTick = true;
+	PrimaryActorTick.bTickEvenWhenPaused = false;
+
+	RootComponent = CreateDefaultSubobject< USceneComponent >(TEXT("RootComponent"));
+
+	Color = FColor(0, 255, 0);
+}
+
+void APathViewer::BeginPlay()
+{
+	Super::BeginPlay();
+
+
+	FIPv4Endpoint Endpoint(FIPv4Address(0, 0, 0, 0), Port);
+
+	ListenSocket = FUdpSocketBuilder(TEXT("PathViwer"))
+					   .AsNonBlocking()
+					   .AsReusable()
+					   .BoundToEndpoint(Endpoint)
+					   .WithReceiveBufferSize(0xFFFF);
+
+	if (ListenSocket == nullptr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("APathViewer::BeginPlay() Can't create socket"));
+		Destroy();
+		return;
+	}
+
+	FTimespan ThreadWaitTime = FTimespan::FromMilliseconds(100);
+	UDPReceiver = new FUdpSocketReceiver(ListenSocket, ThreadWaitTime, TEXT("PathViwer"));
+	UDPReceiver->OnDataReceived().BindUObject(this, &APathViewer::Recv);
+	UDPReceiver->Start();
+}
+
+void APathViewer::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	if (UDPReceiver)
+	{
+		UDPReceiver->Stop();
+		delete UDPReceiver;
+	}
+
+	if (ListenSocket)
+	{
+		delete ListenSocket;
+	}
+}
+
+void APathViewer::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+
+	mutex.lock();
+	DrawBuf = Buf;
+	mutex.unlock();
+
+	auto World = GetWorld();
+	FVector WorldLoc = RootComponent->GetComponentLocation();
+	const auto & Conv = ALevelState::GetChecked()->GetLLConverter();
+
+	for (int i = 0; i < (int)DrawBuf.size() / 2 - 1; i++)
+	{
+		FVector Pt1;
+		FVector Pt2;
+		if(bIsLanLong)
+		{
+			Conv.LLA2UE(Pt1, DrawBuf[i * 2 + 0], DrawBuf[i * 2 + 1], 0);
+			Conv.LLA2UE(Pt2, DrawBuf[i * 2 + 2], DrawBuf[i * 2 + 3], 0);
+			Pt1.Z = Pt2.Z = WorldLoc.Z;
+		}
+		else
+		{
+			Pt1 = FVector(DrawBuf[i * 2 + 0] * ScaleX + DX, DrawBuf[i * 2 + 1] * ScaleY + DY, WorldLoc.Z);
+			Pt2 = FVector(DrawBuf[i * 2 + 2] * ScaleX + DX, DrawBuf[i * 2 + 3] * ScaleY + DY, WorldLoc.Z);
+		}
+		DrawDebugLine(World, Pt1, Pt2, Color, false, -1.f, 0, Thickness);
+	}
+}
+
+void APathViewer::Recv(const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt)
+{
+
+	mutex.lock();
+	Buf.resize(ArrayReaderPtr->Num() / sizeof(double));
+	::memcpy(Buf.data(), ArrayReaderPtr->GetData(), ArrayReaderPtr->Num() / sizeof(double) * sizeof(double));
+	mutex.unlock();
+
+	//UE_LOG(LogSoda, Error, TEXT("PathViwer::Recv %d "), ArrayReaderPtr->Num());
+
+	//for (int i = 0; i < Buf.size(); i++)
+	//	UE_LOG(LogSoda, Error, TEXT("i %d: %f"), i, Buf[i]);
+}
+
+const FSodaActorDescriptor* APathViewer::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Path Viewer"), /*DisplayName*/
+		TEXT("Tools"), /*Category*/
+		TEXT("Experimental"), /*SubCategory*/
+		TEXT("SodaIcons.Path"), /*Icon*/
+		false, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 0), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/RefPoint.cpp b/Source/UnrealSoda/Private/Actors/RefPoint.cpp
new file mode 100644
index 0000000..2ebcf87
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/RefPoint.cpp
@@ -0,0 +1,336 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/RefPoint.h"
+#include "Soda/UnrealSoda.h"
+#include "GameFramework/PlayerController.h"
+#include "Engine/LocalPlayer.h"
+#include "Kismet/GameplayStatics.h"
+#include "Kismet/KismetMathLibrary.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "Soda/LevelState.h"
+#include "UObject/ConstructorHelpers.h"
+#include "SceneView.h"
+#include "EngineUtils.h"
+
+namespace soda
+{
+
+void BuildCylinderVerts(const FVector& Base, const FVector& XAxis, const FVector& YAxis, const FVector& ZAxis, float Radius, float HalfHeight, uint32 Sides, TArray<FVector>& OutVerts, TArray<int32>& OutIndices)
+{
+	const float	AngleDelta = 2.0f * PI / Sides;
+	FVector	LastVertex = Base + XAxis * Radius;
+
+	FVector2D TC = FVector2D(0.0f, 0.0f);
+	float TCStep = 1.0f / Sides;
+
+	FVector TopOffset = HalfHeight * ZAxis;
+
+	int32 BaseVertIndex = OutVerts.Num();
+
+	//Compute vertices for base circle.
+	for (uint32 SideIndex = 0; SideIndex < Sides; SideIndex++)
+	{
+		const FVector Vertex = Base + (XAxis * FMath::Cos(AngleDelta * (SideIndex + 1)) + YAxis * FMath::Sin(AngleDelta * (SideIndex + 1))) * Radius;
+		OutVerts.Add(Vertex - TopOffset); //Add bottom vertex
+		LastVertex = Vertex;
+		TC.X += TCStep;
+	}
+
+	LastVertex = Base + XAxis * Radius;
+	TC = FVector2D(0.0f, 1.0f);
+
+	//Compute vertices for the top circle
+	for (uint32 SideIndex = 0; SideIndex < Sides; SideIndex++)
+	{
+		const FVector Vertex = Base + (XAxis * FMath::Cos(AngleDelta * (SideIndex + 1)) + YAxis * FMath::Sin(AngleDelta * (SideIndex + 1))) * Radius;
+		OutVerts.Add(Vertex + TopOffset); //Add top vertex
+		LastVertex = Vertex;
+		TC.X += TCStep;
+	}
+
+	//Add top/bottom triangles, in the style of a fan.
+	//Note if we wanted nice rendering of the caps then we need to duplicate the vertices and modify
+	//texture/tangent coordinates.
+	for (uint32 SideIndex = 1; SideIndex < Sides; SideIndex++)
+	{
+		int32 V0 = BaseVertIndex;
+		int32 V1 = BaseVertIndex + SideIndex;
+		int32 V2 = BaseVertIndex + ((SideIndex + 1) % Sides);
+
+		//bottom
+		OutIndices.Add(V2);
+		OutIndices.Add(V1);
+		OutIndices.Add(V0);
+
+		// top
+		OutIndices.Add(Sides + V0);
+		OutIndices.Add(Sides + V1);
+		OutIndices.Add(Sides + V2);
+	}
+
+	//Add sides.
+
+	for (uint32 SideIndex = 0; SideIndex < Sides; SideIndex++)
+	{
+		int32 V0 = BaseVertIndex + SideIndex;
+		int32 V1 = BaseVertIndex + ((SideIndex + 1) % Sides);
+		int32 V2 = V0 + Sides;
+		int32 V3 = V1 + Sides;
+
+		OutIndices.Add(V1);
+		OutIndices.Add(V2);
+		OutIndices.Add(V0);
+
+		OutIndices.Add(V1);
+		OutIndices.Add(V3);
+		OutIndices.Add(V2);
+	}
+}
+
+}
+
+ARefPoint::ARefPoint()
+{
+	static ConstructorHelpers::FObjectFinder< UMaterial > AxesMatDense(TEXT("/SodaSim/Assets/CPP/AxesMatDense"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > AxesMatOpacity(TEXT("/SodaSim/Assets/CPP/AxesMatOpacity"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > TextMat(TEXT("/SodaSim/Assets/CPP/UnlitText"));
+
+	Shaft = CreateDefaultSubobject< UProceduralMeshComponent >(TEXT("Shaft"));
+	RootComponent = Shaft;
+
+	if (AxesMatOpacity.Succeeded()) MatOpacity  = AxesMatOpacity.Object;
+	if (AxesMatDense.Succeeded())  MatDense = AxesMatDense.Object;
+	if (TextMat.Succeeded())  MatText = TextMat.Object;
+
+	PrimaryActorTick.bCanEverTick = true;
+	PrimaryActorTick.bTickEvenWhenPaused = true;
+}
+
+void ARefPoint::BeginPlay()
+{
+	Super::BeginPlay();
+
+	Shaft->ClearAllMeshSections();
+
+	const float TotalLength = 2000000;
+	const float ShaftRadius = 3;
+
+	TArray < FVector > Vertices;
+	TArray < int32 >Triangles;
+	TArray<FVector2D> UV0;
+	TArray<FVector> Normals;
+	TArray<FColor> Colors;
+	TArray<FProcMeshTangent> Tangents;
+
+	soda::BuildCylinderVerts(FVector(0, 0, 0), FVector(0, 0, 1), FVector(0, 1, 0), FVector(1, 0, 0), ShaftRadius, 0.5f * TotalLength, 16, Vertices, Triangles);
+	UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UV0, Normals, Tangents);
+	Shaft->CreateMeshSection(0, Vertices, Triangles, Normals, UV0, Colors, Tangents, false);
+	Shaft->CreateMeshSection(1, Vertices, Triangles, Normals, UV0, Colors, Tangents, false);
+
+	Vertices.Empty();
+	Triangles.Empty();
+	UV0.Empty();
+	Normals.Empty();
+	Colors.Empty();
+	Tangents.Empty();
+
+	soda::BuildCylinderVerts(FVector(0, 0, 0), FVector(1, 0, 0), FVector(0, 0, 1), FVector(0, 1, 0), ShaftRadius, 0.5f * TotalLength, 16, Vertices, Triangles);
+	UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UV0, Normals, Tangents);
+	Shaft->CreateMeshSection(2, Vertices, Triangles, Normals, UV0, Colors, Tangents, false);
+	Shaft->CreateMeshSection(3, Vertices, Triangles, Normals, UV0, Colors, Tangents, false);
+
+	Vertices.Empty();
+	Triangles.Empty();
+	UV0.Empty();
+	Normals.Empty();
+	Colors.Empty();
+	Tangents.Empty();
+
+	soda::BuildCylinderVerts(FVector(0, 0, 0), FVector(1, 0, 0), FVector(0, 1, 0), FVector(0, 0, 1), ShaftRadius, 0.5f * TotalLength, 16, Vertices, Triangles);
+	UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UV0, Normals, Tangents);
+	Shaft->CreateMeshSection(4, Vertices, Triangles, Normals, UV0, Colors, Tangents, false);
+	Shaft->CreateMeshSection(5, Vertices, Triangles, Normals, UV0, Colors, Tangents, false);
+
+	if (IsValid(MatDense))
+	{
+		UMaterialInstanceDynamic* MatDenseDyn = UMaterialInstanceDynamic::Create(MatDense, this);
+		Shaft->SetMaterial(0, MatDenseDyn);
+		MatDenseDyn->SetVectorParameterValue(TEXT("BaseColor"), FLinearColor(1, 0, 0));
+	}
+
+	if (IsValid(MatOpacity))
+	{
+		UMaterialInstanceDynamic* MatOpacityDyn = UMaterialInstanceDynamic::Create(MatOpacity, this);
+		Shaft->SetMaterial(1, MatOpacityDyn);
+		MatOpacityDyn->SetVectorParameterValue(TEXT("BaseColor"), FLinearColor(1, 0, 0));
+	}
+
+	if (IsValid(MatDense))
+	{
+		UMaterialInstanceDynamic* MatDenseDyn = UMaterialInstanceDynamic::Create(MatDense, this);
+		Shaft->SetMaterial(2, MatDenseDyn);
+		MatDenseDyn->SetVectorParameterValue(TEXT("BaseColor"), FLinearColor(0, 1, 0));
+	}
+
+	if (IsValid(MatOpacity))
+	{
+		UMaterialInstanceDynamic* MatOpacityDyn = UMaterialInstanceDynamic::Create(MatOpacity, this);
+		Shaft->SetMaterial(3, MatOpacityDyn);
+		MatOpacityDyn->SetVectorParameterValue(TEXT("BaseColor"), FLinearColor(0, 1, 0));
+	}
+
+	if (IsValid(MatDense))
+	{
+		UMaterialInstanceDynamic* MatDenseDyn = UMaterialInstanceDynamic::Create(MatDense, this);
+		Shaft->SetMaterial(4, MatDenseDyn);
+		MatDenseDyn->SetVectorParameterValue(TEXT("BaseColor"), FLinearColor(0, 0, 1));
+	}
+
+	if (IsValid(MatOpacity))
+	{
+		UMaterialInstanceDynamic* MatOpacityDyn = UMaterialInstanceDynamic::Create(MatOpacity, this);
+		Shaft->SetMaterial(5, MatOpacityDyn);
+		MatOpacityDyn->SetVectorParameterValue(TEXT("BaseColor"), FLinearColor(0, 0, 1));
+	}
+
+	TextRenderNorth = NewObject<UTextRenderComponent>(this);
+	TextRenderNorth->SetupAttachment(RootComponent);
+	TextRenderNorth->RegisterComponent();
+	TextRenderNorth->SetText(FText::FromString(TEXT("N")));
+	TextRenderNorth->SetRelativeRotation(FRotator(90, -90, 0));
+	TextRenderNorth->SetWorldSize(50);
+	TextRenderNorth->SetTextRenderColor(FColor(0, 255, 0));
+	TextRenderNorth->SetVisibility(false);
+
+	TextRenderSouth = NewObject<UTextRenderComponent>(this);
+	TextRenderSouth->SetupAttachment(RootComponent);
+	TextRenderSouth->RegisterComponent();
+	TextRenderSouth->SetText(FText::FromString(TEXT("S")));
+	TextRenderSouth->SetRelativeRotation(FRotator(90, -90, 0));
+	TextRenderSouth->SetWorldSize(50);
+	TextRenderSouth->SetTextRenderColor(FColor(0, 255, 0));
+	TextRenderSouth->SetVisibility(false);
+
+	TextRenderWest = NewObject<UTextRenderComponent>(this);
+	TextRenderWest->SetupAttachment(RootComponent);
+	TextRenderWest->RegisterComponent();
+	TextRenderWest->SetText(FText::FromString(TEXT("W")));
+	TextRenderWest->SetRelativeRotation(FRotator(90, -90, 0));
+	TextRenderWest->SetWorldSize(50);
+	TextRenderWest->SetTextRenderColor(FColor(255, 0, 0));
+	TextRenderWest->SetVisibility(false);
+
+	TextRenderEast = NewObject<UTextRenderComponent>(this);
+	TextRenderEast->SetupAttachment(RootComponent);
+	TextRenderEast->RegisterComponent();
+	TextRenderEast->SetText(FText::FromString(TEXT("E")));
+	TextRenderEast->SetRelativeRotation(FRotator(90, -90, 0));
+	TextRenderEast->SetWorldSize(50);
+	TextRenderEast->SetTextRenderColor(FColor(255, 0, 0));
+	TextRenderEast->SetVisibility(false);
+
+	if (MatText)
+	{
+		TextRenderNorth->SetTextMaterial(MatText);
+		TextRenderSouth->SetTextMaterial(MatText);
+		TextRenderWest->SetTextMaterial(MatText);
+		TextRenderEast->SetTextMaterial(MatText);
+	}
+
+	const auto & LLConverter = ALevelState::GetChecked()->GetLLConverter();
+	SetActorLocation(LLConverter.OrignShift);
+	SetActorRotation(FRotator(0, LLConverter.OrignDYaw, 0));
+	Longitude = LLConverter.OrignLon;
+	Latitude = LLConverter.OrignLat;
+	Altitude = LLConverter.OrignAltitude;
+}
+
+void ARefPoint::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ARefPoint::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+
+	UWorld* World = GetWorld();
+	check(World);
+
+	Shaft->SetMeshSectionVisible(0, bDrawAxis);
+	Shaft->SetMeshSectionVisible(1, bDrawAxis && bDrawOverTop);
+	Shaft->SetMeshSectionVisible(2, bDrawAxis);
+	Shaft->SetMeshSectionVisible(3, bDrawAxis && bDrawOverTop);
+	Shaft->SetMeshSectionVisible(4, bDrawAxis);
+	Shaft->SetMeshSectionVisible(5, bDrawAxis && bDrawOverTop);
+
+	TextRenderNorth->SetVisibility(bDrawAxis);
+	TextRenderSouth->SetVisibility(bDrawAxis);
+	TextRenderWest->SetVisibility(bDrawAxis);
+	TextRenderEast->SetVisibility(bDrawAxis);
+	
+	if (bDrawAxis)
+	{
+		float FlipX = 1; //bInvertX ? -1 : 1;
+		float FlipY = 1; //bInvertY ? -1 : 1;
+		TextRenderNorth->SetRelativeLocation(FVector(-10, 130 * FlipY, 0));
+		TextRenderSouth->SetRelativeLocation(FVector(-10, -130 * FlipY, 0));
+		TextRenderWest->SetRelativeLocation(FVector(130 * FlipX, 0, 0));
+		TextRenderEast->SetRelativeLocation(FVector(-130 * FlipX, 0, 0));
+
+		if (bScreenAutoScale)
+		{
+			if (APlayerController* PlayerController = World->GetFirstPlayerController())
+			{
+				const ULocalPlayer* LocalPlayer = PlayerController->GetLocalPlayer();
+				if (LocalPlayer && LocalPlayer->ViewportClient)
+				{
+					FSceneViewProjectionData ProjectionData;
+					if (LocalPlayer->GetProjectionData(LocalPlayer->ViewportClient->Viewport, ProjectionData))
+					{
+						const float ZoomFactor = FMath::Min<float>(ProjectionData.ProjectionMatrix.M[0][0], ProjectionData.ProjectionMatrix.M[1][1]);
+						if (ZoomFactor != 0.0f)
+						{
+							const float Radius = (ProjectionData.ViewOrigin - GetActorLocation()).Size() * (ScreenSize / ZoomFactor);
+							SetActorScale3D(FVector(std::fabsf(Radius)));
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void ARefPoint::UpdateGlobalRefPoint()
+{
+	if (HasActorBegunPlay())
+	{
+		ALevelState::GetChecked()->SetGeoReference(Latitude, Longitude, Altitude, GetActorLocation(), GetActorRotation().Yaw);
+	}
+	else
+	{
+		TActorIterator<ALevelState> It(GetWorld());
+		if (It)
+		{
+			It->SetGeoReference(Latitude, Longitude, Altitude, GetActorLocation(), GetActorRotation().Yaw);
+		}
+		else
+		{
+			UE_LOG(LogSoda, Error, TEXT("ARefPoint::UpdateGlobalRefPoint(); Add ALavelState actor to the level first"));
+		}
+	}
+}
+
+const FSodaActorDescriptor* ARefPoint::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Reference Point"), /*DisplayName*/
+		TEXT("Tools"), /*Category*/
+		TEXT(""), /*SubCategory*/
+		TEXT("SodaIcons.Compass"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 0), /*SpawnOffset*/
+	};
+	return &Desc;
+}
diff --git a/Source/UnrealSoda/Private/Actors/ScenarioTriggerActors.cpp b/Source/UnrealSoda/Private/Actors/ScenarioTriggerActors.cpp
new file mode 100644
index 0000000..9ff58e1
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/ScenarioTriggerActors.cpp
@@ -0,0 +1,367 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/ScenarioTriggerActors.h"
+#include "CoreMinimal.h"
+#include "Engine/EngineTypes.h"
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Engine/Texture2D.h"
+#include "Engine/TriggerBox.h"
+#include "Engine/TriggerCapsule.h"
+#include "Engine/TriggerSphere.h"
+#include "Components/BoxComponent.h"
+#include "Components/SphereComponent.h"
+#include "Components/CapsuleComponent.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Components/ShapeComponent.h"
+
+namespace
+{
+	static const FColor TriggerBaseColor(100, 255, 100, 255);
+	static const FName TriggerCollisionProfileName(TEXT("Trigger"));
+}
+
+AScenarioTriggerBase::AScenarioTriggerBase(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	SetHidden(false);
+	SetCanBeDamaged(false);
+
+	// AScenarioTriggerBase is requesting UShapeComponent which is abstract, however it is responsibility
+	// of a derived class to override this type with ObjectInitializer.SetDefaultSubobjectClass.
+	CollisionComponent = CreateDefaultSubobject<UShapeComponent>(TEXT("CollisionComp"));
+	if (CollisionComponent)
+	{
+		RootComponent = CollisionComponent;
+		CollisionComponent->bHiddenInGame = false;
+	}
+
+	SpriteComponent = CreateEditorOnlyDefaultSubobject<UBillboardComponent>(TEXT("Sprite"));
+	if (SpriteComponent)
+	{
+		// Structure to hold one-time initialization
+		struct FConstructorStatics
+		{
+			ConstructorHelpers::FObjectFinderOptional<UTexture2D> TriggerTextureObject;
+			FName ID_Triggers;
+			FText NAME_Triggers;
+			FConstructorStatics()
+				: TriggerTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/S_Trigger"))
+				, ID_Triggers(TEXT("ScenarioTriggers"))
+				, NAME_Triggers(NSLOCTEXT("SpriteCategory", "ScenarioTriggers", "ScenarioTriggers"))
+			{
+			}
+		};
+		static FConstructorStatics ConstructorStatics;
+
+		SpriteComponent->Sprite = ConstructorStatics.TriggerTextureObject.Get();
+		SpriteComponent->SetRelativeScale3D(FVector(0.5f, 0.5f, 0.5f));
+		SpriteComponent->bHiddenInGame = false;
+#if WITH_EDITORONLY_DATA
+		SpriteComponent->SpriteInfo.Category = ConstructorStatics.ID_Triggers;
+		SpriteComponent->SpriteInfo.DisplayName = ConstructorStatics.NAME_Triggers;
+#endif
+		SpriteComponent->bIsScreenSizeScaled = true;
+	}
+}
+
+//----------------------------------------------------------------------------------------------
+AScenarioTriggerCapsule::AScenarioTriggerCapsule(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer.SetDefaultSubobjectClass<UCapsuleComponent>(TEXT("CollisionComp")))
+{
+	UCapsuleComponent* CapsuleCollisionComponent = CastChecked<UCapsuleComponent>(GetCollisionComponent());
+	CapsuleCollisionComponent->ShapeColor = TriggerBaseColor;
+	CapsuleCollisionComponent->InitCapsuleSize(CapsuleRadius, CapsuleHalfHeight);
+	CapsuleCollisionComponent->SetCollisionProfileName(TriggerCollisionProfileName);
+
+	bCollideWhenPlacing = true;
+	SpawnCollisionHandlingMethod = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButDontSpawnIfColliding;
+
+	if (UBillboardComponent* TriggerSpriteComponent = GetSpriteComponent())
+	{
+		TriggerSpriteComponent->SetupAttachment(CapsuleCollisionComponent);
+	}
+
+	if (GetSpriteComponent())
+	{
+		// Structure to hold one-time initialization
+		struct FConstructorStatics
+		{
+			ConstructorHelpers::FObjectFinderOptional<UTexture2D> TriggerTextureObject;
+			FName ID_Triggers;
+			FText NAME_Triggers;
+			FConstructorStatics()
+				: TriggerTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/S_TriggerCapsule"))
+				, ID_Triggers(TEXT("ScenarioTriggers"))
+				, NAME_Triggers(NSLOCTEXT("SpriteCategory", "ScenarioTriggers", "ScenarioTriggers"))
+			{
+			}
+		};
+		static FConstructorStatics ConstructorStatics;
+
+		GetSpriteComponent()->Sprite = ConstructorStatics.TriggerTextureObject.Get();
+	}
+}
+
+/*
+void AScenarioTriggerCapsule::EditorApplyScale(const FVector& DeltaScale, const FVector* PivotLocation, bool bAltDown, bool bShiftDown, bool bCtrlDown)
+{
+	const FVector ModifiedScale = DeltaScale * ( AActor::bUsePercentageBasedScaling ? 500.0f : 5.0f );
+
+	UCapsuleComponent * CapsuleComponent = CastChecked<UCapsuleComponent>(GetRootComponent());
+
+	float CapsuleRadius = CapsuleComponent->GetUnscaledCapsuleRadius();
+	float CapsuleHalfHeight = CapsuleComponent->GetUnscaledCapsuleHalfHeight();
+		
+	CapsuleRadius += ModifiedScale.X;
+	CapsuleRadius = FMath::Max( 0.0f, CapsuleRadius );
+
+	// If non-uniformly scaling, Z scale affects height and Y can affect radius too.
+	if ( !ModifiedScale.AllComponentsEqual() )
+	{
+		// *2 to keep the capsule more capsule shaped during scaling
+		CapsuleHalfHeight+= ModifiedScale.Z * 2.0f;
+		CapsuleHalfHeight = FMath::Max( 0.0f, CapsuleHalfHeight );
+
+		CapsuleRadius += ModifiedScale.Y;
+		CapsuleRadius = FMath::Max( 0.0f, CapsuleRadius );
+	}
+	else
+	{
+		// uniform scaling, so apply to height as well
+
+		// *2 to keep the capsule more capsule shaped during scaling
+		CapsuleHalfHeight += ModifiedScale.Z * 2.0f;
+		CapsuleHalfHeight = FMath::Max( 0.0f, CapsuleHalfHeight );
+	}
+
+	CapsuleComponent->SetCapsuleSize(CapsuleRadius, CapsuleHalfHeight);
+	
+}
+*/
+
+void AScenarioTriggerCapsule::BeginPlay()
+{
+	Super::BeginPlay();
+
+	CastChecked<UCapsuleComponent>(GetCollisionComponent())->SetCapsuleSize(CapsuleRadius, CapsuleHalfHeight);
+}
+
+void AScenarioTriggerCapsule::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeProperty(PropertyChangedEvent);
+}
+
+void AScenarioTriggerCapsule::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	if (PropertyChangedEvent.Property != nullptr && 
+		(PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(AScenarioTriggerCapsule, CapsuleRadius) ||
+		PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(AScenarioTriggerCapsule, CapsuleHalfHeight)))
+	{
+		UCapsuleComponent* CapsuleCollisionComponent = CastChecked<UCapsuleComponent>(GetCollisionComponent());
+		CapsuleCollisionComponent->SetCapsuleSize(CapsuleRadius, CapsuleHalfHeight);
+	}
+}
+
+const FSodaActorDescriptor* AScenarioTriggerCapsule::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Trigger Capsule"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT("Triggers"), /*SubCategory*/
+		TEXT("ClassIcon.TriggerCapsule"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
+
+//----------------------------------------------------------------------------------------------
+AScenarioTriggerBox::AScenarioTriggerBox(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer.SetDefaultSubobjectClass<UBoxComponent>(TEXT("CollisionComp")))
+{
+	UBoxComponent* BoxCollisionComponent = CastChecked<UBoxComponent>(GetCollisionComponent());
+
+	BoxCollisionComponent->ShapeColor = TriggerBaseColor;
+	BoxCollisionComponent->InitBoxExtent(Extent);
+	BoxCollisionComponent->SetCollisionProfileName(TriggerCollisionProfileName);
+
+	if (UBillboardComponent* TriggerSpriteComponent = GetSpriteComponent())
+	{
+		TriggerSpriteComponent->SetupAttachment(BoxCollisionComponent);
+	}
+
+	if (GetSpriteComponent())
+	{
+		// Structure to hold one-time initialization
+		struct FConstructorStatics
+		{
+			ConstructorHelpers::FObjectFinderOptional<UTexture2D> TriggerTextureObject;
+			FName ID_Triggers;
+			FText NAME_Triggers;
+			FConstructorStatics()
+				: TriggerTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/S_TriggerBox"))
+					, ID_Triggers(TEXT("ScenarioTriggers"))
+					, NAME_Triggers(NSLOCTEXT("SpriteCategory", "ScenarioTriggers", "ScenarioTriggers"))
+			{
+			}
+		};
+		static FConstructorStatics ConstructorStatics;
+
+		GetSpriteComponent()->Sprite = ConstructorStatics.TriggerTextureObject.Get();
+	}
+}
+
+/*
+void AScenarioTriggerBox::EditorApplyScale(const FVector& DeltaScale, const FVector* PivotLocation, bool bAltDown, bool bShiftDown, bool bCtrlDown)
+{
+	const FVector ModifiedScale = DeltaScale * ( AActor::bUsePercentageBasedScaling ? 500.0f : 5.0f );
+
+	UBoxComponent * BoxComponent = CastChecked<UBoxComponent>(GetRootComponent());
+	if ( bCtrlDown )
+	{
+		// CTRL+Scaling modifies trigger collision height.  This is for convenience, so that height
+		// can be changed without having to use the non-uniform scaling widget (which is
+		// inaccessable with spacebar widget cycling).
+		FVector Extent = BoxComponent->GetUnscaledBoxExtent() + FVector(0, 0, ModifiedScale.X);
+		Extent.Z = FMath::Max<FVector::FReal>(0, Extent.Z);
+		BoxComponent->SetBoxExtent(Extent);
+	}
+	else
+	{
+		FVector Extent = BoxComponent->GetUnscaledBoxExtent() + FVector(ModifiedScale.X, ModifiedScale.Y, ModifiedScale.Z);
+		Extent.X = FMath::Max<FVector::FReal>(0, Extent.X);
+		Extent.Y = FMath::Max<FVector::FReal>(0, Extent.Y);
+		Extent.Z = FMath::Max<FVector::FReal>(0, Extent.Z);
+		BoxComponent->SetBoxExtent(Extent);
+	}
+}
+*/
+
+void AScenarioTriggerBox::BeginPlay()
+{
+	Super::BeginPlay();
+
+	CastChecked<UBoxComponent>(GetCollisionComponent())->SetBoxExtent(Extent);
+}
+
+void AScenarioTriggerBox::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeProperty(PropertyChangedEvent);
+}
+
+void AScenarioTriggerBox::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	FProperty* MemberProperty = PropertyChangedEvent.PropertyChain.GetHead()->GetValue();
+
+	if (MemberProperty &&
+		MemberProperty->GetFName() == GET_MEMBER_NAME_CHECKED(AScenarioTriggerBox, Extent))
+	{
+		UBoxComponent* BoxCollisionComponent = CastChecked<UBoxComponent>(GetCollisionComponent());
+		BoxCollisionComponent->SetBoxExtent(Extent);
+	}
+}
+
+const FSodaActorDescriptor* AScenarioTriggerBox::GenerateActorDescriptor() const
+{
+
+	static FSodaActorDescriptor Desc{
+		TEXT("Trigger Box"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT("Triggers"), /*SubCategory*/
+		TEXT("ClassIcon.TriggerBox"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
+
+//----------------------------------------------------------------------------------------------
+AScenarioTriggerSphere::AScenarioTriggerSphere(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer.SetDefaultSubobjectClass<USphereComponent>(TEXT("CollisionComp")))
+{
+	USphereComponent* SphereCollisionComponent = CastChecked<USphereComponent>(GetCollisionComponent());
+
+	SphereCollisionComponent->ShapeColor = TriggerBaseColor;
+	SphereCollisionComponent->InitSphereRadius(SphereRadius);
+	SphereCollisionComponent->SetCollisionProfileName(TriggerCollisionProfileName);
+	if (UBillboardComponent* TriggerSpriteComponent = GetSpriteComponent())
+	{
+		TriggerSpriteComponent->SetupAttachment(SphereCollisionComponent);
+	}
+
+	if (GetSpriteComponent())
+	{
+		// Structure to hold one-time initialization
+		struct FConstructorStatics
+		{
+			ConstructorHelpers::FObjectFinderOptional<UTexture2D> TriggerTextureObject;
+			FName ID_Triggers;
+			FText NAME_Triggers;
+			FConstructorStatics()
+				: TriggerTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/S_TriggerSphere"))
+				, ID_Triggers(TEXT("ScenarioTriggers"))
+				, NAME_Triggers(NSLOCTEXT("SpriteCategory", "ScenarioTriggers", "ScenarioTriggers"))
+			{
+			}
+		};
+		static FConstructorStatics ConstructorStatics;
+
+		GetSpriteComponent()->Sprite = ConstructorStatics.TriggerTextureObject.Get();
+	}
+}
+
+/*
+void AScenarioTriggerSphere::EditorApplyScale(const FVector& DeltaScale, const FVector* PivotLocation, bool bAltDown, bool bShiftDown, bool bCtrlDown)
+{
+	const FVector ModifiedScale = DeltaScale * ( AActor::bUsePercentageBasedScaling ? 500.0f : 5.0f );
+
+	USphereComponent * SphereComponent = CastChecked<USphereComponent>(GetRootComponent());
+	SphereComponent->SetSphereRadius(FMath::Max<float>(0.0f, SphereComponent->GetUnscaledSphereRadius() + ModifiedScale.X));
+}
+*/
+
+void AScenarioTriggerSphere::BeginPlay()
+{
+	Super::BeginPlay();
+
+	CastChecked<USphereComponent>(GetCollisionComponent())->SetSphereRadius(SphereRadius);
+}
+
+void AScenarioTriggerSphere::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeProperty(PropertyChangedEvent);
+}
+
+void AScenarioTriggerSphere::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	if (PropertyChangedEvent.Property != nullptr &&
+		PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(AScenarioTriggerSphere, SphereRadius))
+	{
+		USphereComponent* SphereCollisionComponent = CastChecked<USphereComponent>(GetCollisionComponent());
+		SphereCollisionComponent->SetSphereRadius(SphereRadius);
+	}
+}
+
+const FSodaActorDescriptor* AScenarioTriggerSphere::GenerateActorDescriptor() const
+{
+
+	static FSodaActorDescriptor Desc{
+		TEXT("Trigger Sphere"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT("Triggers"), /*SubCategory*/
+		TEXT("ClassIcon.TriggerSphere"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
diff --git a/Source/UnrealSoda/Private/Actors/SensorHolder.cpp b/Source/UnrealSoda/Private/Actors/SensorHolder.cpp
new file mode 100644
index 0000000..8672baf
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/SensorHolder.cpp
@@ -0,0 +1,163 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/SensorHolder.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Components/BoxComponent.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Engine/Texture2D.h"
+
+ASensorHolder::ASensorHolder()
+{
+	PrimaryActorTick.bCanEverTick = true;
+
+	ConstructorHelpers::FObjectFinderOptional<UTexture2D> IconTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/S_RadForce"));
+
+	SpriteComponent = CreateDefaultSubobject<UBillboardComponent>(TEXT("SpriteComponent"));
+	SpriteComponent->Sprite = IconTextureObject.Get();
+	SpriteComponent->Mobility = EComponentMobility::Movable;
+	SpriteComponent->SetHiddenInGame(false);
+	SpriteComponent->bIsScreenSizeScaled = true;
+	RootComponent = SpriteComponent;
+
+	ArrowComponent = CreateDefaultSubobject<UArrowComponent>(TEXT("ArrowComponent"));
+	ArrowComponent->SetupAttachment(RootComponent);
+	ArrowComponent->Mobility = EComponentMobility::Movable;
+	ArrowComponent->SetHiddenInGame(false);
+	ArrowComponent->bIsScreenSizeScaled = true;
+	ArrowComponent->ArrowSize = 2.5;
+	ArrowComponent->SetArrowColor(FLinearColor(0, 0.35, 1));
+
+	TriggerVolume = CreateDefaultSubobject< UBoxComponent >(TEXT("TriggerVolume"));
+	TriggerVolume->SetupAttachment(RootComponent);
+	TriggerVolume->SetHiddenInGame(true);
+	TriggerVolume->SetCollisionObjectType(ECollisionChannel::ECC_WorldStatic);
+	TriggerVolume->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	TriggerVolume->SetCollisionResponseToChannel(ECollisionChannel::ECC_Visibility, ECollisionResponse::ECR_Overlap);
+	TriggerVolume->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	TriggerVolume->CanCharacterStepUpOn = ECanBeCharacterBase::ECB_No;
+	TriggerVolume->SetGenerateOverlapEvents(true);
+	TriggerVolume->SetBoxExtent(FVector{ 50.0f, 50.0f, 50.0f });
+	TriggerVolume->SetMobility(EComponentMobility::Movable);
+}
+
+void ASensorHolder::BeginPlay()
+{
+	Super::BeginPlay();
+	/*
+	EditableComponent->VariantParams->OnParamChanged.AddDynamic(this, &ASensorHolder::OnParamChanged);
+	EditableComponent->VariantParams->AddObjectParams(EditableComponent);
+	EditableComponent->VariantParams->AddObjectParams(this);
+	EditableComponent->OnSelected.AddDynamic(this, &ASensorHolder::OnSelected);
+	EditableComponent->OnUnselected.AddDynamic(this, &ASensorHolder::OnUnselected);
+	*/
+
+	if (SensorClass)
+	{
+		SensorComponent = NewObject<USensorComponent>(this, SensorClass);
+		check(SensorComponent);
+		if (ComponentRecord.IsRecordValid())
+		{
+			ComponentRecord.DeserializeComponent(SensorComponent);
+		}
+		SensorComponent->SetupAttachment(RootComponent);
+		SensorComponent->RegisterComponent();
+		SensorComponent->HideActorComponentsFromSensorView(this);
+		//EditableComponent->VariantParams->AddObjectParams(SensorComponent);
+	}
+}
+
+void ASensorHolder::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ASensorHolder::RecreateSensor()
+{
+	//EditableComponent->VariantParams->Params.Empty();
+
+	if (SensorClass)
+	{
+		USensorComponent* NewSensor = NewObject<USensorComponent>(this, SensorClass);
+		check(NewSensor);
+		if (SensorComponent && SensorClass == SensorComponent->GetClass())
+		{
+			FComponentRecord TmpRecord;
+			TmpRecord.SerializeComponent(SensorComponent);
+			TmpRecord.DeserializeComponent(NewSensor);
+		}
+		NewSensor->SetupAttachment(RootComponent);
+		NewSensor->RegisterComponent();
+		NewSensor->HideActorComponentsFromSensorView(this);
+
+		if (SensorComponent)
+		{
+			SensorComponent->RemoveVehicleComponent();
+		}
+		SensorComponent = NewSensor;
+	}
+	else
+	{
+		if (SensorComponent)
+		{
+			SensorComponent->RemoveVehicleComponent();
+			SensorComponent = nullptr;
+		}
+	}
+
+	/*
+	EditableComponent->VariantParams->AddObjectParams(this);
+	if (SensorComponent) EditableComponent->VariantParams->AddObjectParams(SensorComponent);
+	*/
+}
+
+/*
+void ASensorHolder::OnParamChanged(UVariantParam* VariantParam)
+{
+	if (VariantParam->NeedUpdate())
+	{
+		RecreateSensor();
+	}
+}
+*/
+
+void ASensorHolder::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaving())
+	{
+		if (SensorComponent)
+		{
+			ComponentRecord.SerializeComponent(SensorComponent);
+			Ar << ComponentRecord;
+		}
+
+	}
+	else if (Ar.IsLoading())
+	{
+		Ar << ComponentRecord;
+	}
+}
+
+void ASensorHolder::OnSelected()
+{	
+}
+
+void ASensorHolder::OnUnselected()
+{
+}
+
+const FSodaActorDescriptor* ASensorHolder::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Sensor Holder"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT("Experimental"), /*SubCategory*/
+		TEXT("SodaIcons.Sensor"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/SpawnPoint.cpp b/Source/UnrealSoda/Private/Actors/SpawnPoint.cpp
new file mode 100644
index 0000000..798db9b
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/SpawnPoint.cpp
@@ -0,0 +1,118 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/SpawnPoint.h"
+#include "Soda/UnrealSoda.h"
+#include "Components/BoxComponent.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Engine/Texture2D.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h"
+
+ASpawnPoint::ASpawnPoint()
+{
+	PrimaryActorTick.bCanEverTick = true;
+
+	ConstructorHelpers::FObjectFinderOptional<UTexture2D> IconTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/Spawn_Point"));
+
+	SpriteComponent = CreateDefaultSubobject<UBillboardComponent>(TEXT("SpriteComponent"));
+	SpriteComponent->Sprite = IconTextureObject.Get();
+	SpriteComponent->Mobility = EComponentMobility::Movable;
+	SpriteComponent->SetHiddenInGame(false);
+	SpriteComponent->bIsScreenSizeScaled = true;
+	RootComponent = SpriteComponent;
+
+	ArrowComponent = CreateDefaultSubobject<UArrowComponent>(TEXT("ArrowComponent"));
+	ArrowComponent->SetupAttachment(RootComponent);
+	ArrowComponent->Mobility = EComponentMobility::Movable;
+	ArrowComponent->SetHiddenInGame(false);
+	ArrowComponent->bIsScreenSizeScaled = true;
+	ArrowComponent->ArrowSize = 2.5;
+	ArrowComponent->SetArrowColor(FLinearColor(0, 0.35, 1));
+	
+	TriggerVolume = CreateDefaultSubobject< UBoxComponent >(TEXT("TriggerVolume"));
+	TriggerVolume->SetupAttachment(RootComponent);
+	TriggerVolume->SetHiddenInGame(true);
+	TriggerVolume->SetCollisionObjectType(ECollisionChannel::ECC_WorldStatic);
+	TriggerVolume->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	TriggerVolume->SetCollisionResponseToChannel(ECollisionChannel::ECC_Visibility, ECollisionResponse::ECR_Overlap);
+	TriggerVolume->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	TriggerVolume->CanCharacterStepUpOn = ECanBeCharacterBase::ECB_No;
+	TriggerVolume->SetGenerateOverlapEvents(true);
+	TriggerVolume->SetBoxExtent(FVector{ 50.0f, 50.0f, 50.0f });
+	TriggerVolume->SetMobility(EComponentMobility::Movable);
+}
+
+#if WITH_EDITOR
+void ASpawnPoint::PostEditChangeProperty(struct FPropertyChangedEvent& Event)
+{
+	Super::PostEditChangeProperty(Event);
+}
+#endif // WITH_EDITOR
+
+
+void ASpawnPoint::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void ASpawnPoint::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ASpawnPoint::PostInitializeComponents()
+{
+	Super::PostInitializeComponents();
+}
+
+void ASpawnPoint::ScenarioBegin()
+{
+	ISodaActor::ScenarioBegin();
+	if (IsValid(SpawnedActor))
+	{
+		SpawnedActor->Destroy();
+		SpawnedActor = nullptr;
+	}
+
+	if (bIsActivePoint)
+	{
+		SpawnedActor = GetWorld()->SpawnActor<AActor>(ActorClass, GetActorTransform());
+
+		if (bSetVehicleToAIMode)
+		{
+			if (ASodaWheeledVehicle* Vehicle = Cast<ASodaWheeledVehicle>(SpawnedActor))
+			{
+				if (UVehicleInputAIComponent* Input = Cast<UVehicleInputAIComponent>(Vehicle->SetActiveVehicleInputByType(EVehicleInputType::AI)))
+				{
+					Input->SetSpeedLimit(VehicleAISpeed);
+				}
+			}
+		}
+
+		OnActorSpawned(SpawnedActor);
+	}
+}
+
+void ASpawnPoint::ScenarioEnd()
+{
+	ISodaActor::ScenarioEnd();
+	if (IsValid(SpawnedActor))
+	{
+		SpawnedActor->Destroy();
+		SpawnedActor = nullptr;
+	}
+}
+
+const FSodaActorDescriptor* ASpawnPoint::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Spawn Point"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT(""), /*SubCategory*/
+		TEXT("SodaIcons.Point"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
diff --git a/Source/UnrealSoda/Private/Actors/TileScanner.cpp b/Source/UnrealSoda/Private/Actors/TileScanner.cpp
new file mode 100644
index 0000000..651ad2a
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/TileScanner.cpp
@@ -0,0 +1,109 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/TileScanner.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Soda/VehicleComponents/Sensors/CameraSensor.h"
+#include "ImagePixelData.h"
+#include "ImageWriteTask.h"
+#include "HighResScreenshot.h"
+#include "ImageWriteQueue.h"
+#include "Engine/TextureRenderTarget2D.h"
+
+
+ATileScanner::ATileScanner()
+{
+	CaptureComponent = CreateDefaultSubobject<USceneCaptureComponent2D>(TEXT("SceneCaptureComponent2D"));
+	//CaptureComponent->TextureTarget = CreateDefaultSubobject< UTextureRenderTarget2D >(TEXT("TextureTarget"));
+	//CaptureComponent->TextureTarget->InitCustomFormat(TileSize, TileSize, EPixelFormat::PF_B8G8R8A8, false);
+	CaptureComponent->bCaptureEveryFrame = false;
+	CaptureComponent->bCaptureOnMovement = false;
+	//CaptureComponent->ProjectionType = ECameraProjectionMode::Orthographic;
+	//CaptureComponent->OrthoWidth = TileSize;
+
+	/*
+	CaptureComponent->PrimitiveRenderMode = PrimitiveRenderMode;
+	CaptureComponent->HiddenActors = HiddenActors;
+	CaptureComponent->ShowOnlyActors = ShowOnlyActors;
+	CaptureComponent->bAlwaysPersistRenderingState = bAlwaysPersistRenderingState;
+	CaptureComponent->LODDistanceFactor = LODDistanceFactor;
+	CaptureComponent->MaxViewDistanceOverride = MaxViewDistanceOverride;
+	CaptureComponent->CaptureSortPriority = CaptureSortPriority;
+	CaptureComponent->ShowFlags = ShowFlags;
+
+	CaptureComponent->FOVAngle = FOVAngle;
+	CaptureComponent->OrthoWidth = OrthoWidth;
+	CaptureComponent->CompositeMode = CompositeMode;
+	CaptureComponent->PostProcessSettings = PostProcessSettings;
+	CaptureComponent->PostProcessBlendWeight = PostProcessBlendWeight;
+	CaptureComponent->ShowFlagSettings = ShowFlagSettings;
+	CaptureComponent->ShowFlags.EnableAdvancedFeatures();
+	CaptureComponent->CaptureSource = (Format == CameraSensorShader::HdrRGB8) ? ESceneCaptureSource::SCS_SceneColorHDR : ESceneCaptureSource::SCS_FinalColorLDR;
+	*/
+}
+
+void ATileScanner::BeginPlay()
+{
+	Super::BeginPlay();
+
+	CaptureComponent->TextureTarget = NewObject< UTextureRenderTarget2D >(this);
+	CaptureComponent->TextureTarget->InitCustomFormat(TileSize, TileSize, EPixelFormat::PF_B8G8R8A8, false);
+}
+
+void ATileScanner::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ATileScanner::MakeScreenshot(const FString& InFileName)
+{
+	if (!CaptureComponent->bCaptureEveryFrame)
+	{
+		CaptureComponent->CaptureScene();
+	}
+
+	ENQUEUE_RENDER_COMMAND(SceneDrawCompletion)([this, InFileName](FRHICommandListImmediate& RHICmdList)
+	{
+		TArray<FColor> OutPixels;
+		uint32 ImageStride;
+		FCameraPixelReader::ReadPixels(*CaptureComponent->TextureTarget, RHICmdList, OutPixels, ImageStride);
+		TUniquePtr<TImagePixelData<FColor>> PixelData = MakeUnique<TImagePixelData<FColor>>(FIntPoint(TileSize, TileSize));
+		PixelData->Pixels.SetNum(TileSize * TileSize, false);
+		ParallelFor(TileSize, [&](int32 i)
+			{
+				FMemory::Memcpy(
+					&PixelData->Pixels[i * TileSize],
+					&OutPixels[i * ImageStride],
+					TileSize * 4);
+			});
+
+		TUniquePtr<FImageWriteTask> ImageTask = MakeUnique<FImageWriteTask>();
+		ImageTask->PixelData = MoveTemp(PixelData);
+		ImageTask->Filename = InFileName;
+		ImageTask->Format = EImageFormat::PNG;
+		ImageTask->CompressionQuality = (int32)EImageCompressionQuality::Default;
+		ImageTask->bOverwriteFile = true;
+		ImageTask->PixelPreProcessors.Add(TAsyncAlphaWrite<FColor>(255));
+		FHighResScreenshotConfig& HighResScreenshotConfig = GetHighResScreenshotConfig();
+		//TFuture<bool> Res = 
+		HighResScreenshotConfig.ImageWriteQueue->Enqueue(MoveTemp(ImageTask));
+	});
+}
+
+void ATileScanner::Scan()
+{
+	FVector Loc = GetActorLocation();
+	const float H = (OrthoWidth - ZeroLevel) / 2;
+	int Ind = 0;
+	for (int i = 0; i < UpCount + DownCount; ++i)
+	{
+		float Y = (-UpCount + i + 0.5) * OrthoWidth;
+		for (int j = 0; j < LeftCount + RightCount; ++j)
+		{
+			float X = (-LeftCount + j + 0.5) * OrthoWidth;
+			SetActorLocation(FVector(X, Y, H));
+			MakeScreenshot(FString("C:\\Temp\\") + FString::FromInt(Ind));
+			++Ind;
+		}
+	}
+	SetActorLocation(Loc);
+}
diff --git a/Source/UnrealSoda/Private/Actors/TrackBuilder.cpp b/Source/UnrealSoda/Private/Actors/TrackBuilder.cpp
new file mode 100644
index 0000000..0fc421c
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/TrackBuilder.cpp
@@ -0,0 +1,1360 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/TrackBuilder.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Misc/MathUtils.hpp"
+#include "HAL/FileManager.h"
+#include "Misc/FileHelper.h"
+#include "Serialization/JsonReader.h"
+#include "Serialization/JsonSerializer.h"
+#include "ConstrainedDelaunay2.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/LevelState.h"
+#include "Soda/SodaActorFactory.h"
+#include "EngineUtils.h"
+#include "Soda/Actors/SpawnPoint.h"
+#include "Misc/Paths.h"
+#include "Components/DecalComponent.h"
+#include "Soda/LevelState.h"
+#include "DesktopPlatformModule.h"
+#include <map>
+
+struct FPolyline;
+struct FPolylineVertex;
+
+struct FPolylineVertex
+{
+	FPolylineVertex() {}
+	FPolylineVertex(const FVector& InPos) : Pos(InPos) {}
+	FPolylineVertex(const FVector& InPos, FVector2D InUV) : Pos(InPos), UV(InUV) {}
+	FVector Pos;
+	FVector2D UV;
+
+	FVector& operator() ()
+	{
+		return Pos;
+	}
+	FVector  operator() () const
+	{
+		return Pos;
+	}
+	FVector operator+(const FVector& Other) const
+	{
+		return Pos + Other;
+	}
+	FVector operator-(const FVector& Other) const
+	{
+		return Pos - Other;
+	}
+
+	FVector2D GetNormalizedUV() const
+	{
+		FVector2D Ret = UV;
+
+		if (Ret.X < 0) Ret.X = Ret.X + int(Ret.X) + 1.0;
+		if (Ret.Y < 0) Ret.Y = Ret.Y + int(Ret.Y) + 1.0;
+
+		if (Ret.X > 1) Ret.X = Ret.X - int(Ret.X);
+		if (Ret.Y > 1) Ret.Y = Ret.Y - int(Ret.Y);
+
+		return Ret;
+	}
+};
+
+struct FPolyline
+{
+	TArray<FPolylineVertex> Vertices;
+	bool bClosed = true;
+
+	FPolyline(bool bInClosed): bClosed(bInClosed) {}
+	FPolyline(const TArray<FVector>& InPoints, bool bInClosed, float AdditionalElevation = 0)
+	{
+		Vertices.SetNumZeroed(InPoints.Num());
+		for (int i = 0; i < InPoints.Num(); ++i)
+		{
+			Vertices[i] = InPoints[i];
+			Vertices[i].Pos.Z += AdditionalElevation;
+		}
+		bClosed = bInClosed;
+	}
+
+	inline FPolylineVertex& operator[] (unsigned i) 
+	{
+		return Vertices[i];
+	}
+
+	inline int32 Num() const
+	{
+		return Vertices.Num();
+	}
+
+	FVector ComputeRightVectors2D(int Ind)
+	{
+		if (!bClosed)
+		{
+			if (Ind == Vertices.Num() - 1)
+			{
+				return ComputeNormal2D(Vertices[Ind - 1].Pos, Vertices[Ind].Pos, Vertices[Ind].Pos);
+			}
+			if (Ind == 0)
+			{
+				return ComputeNormal2D(Vertices[0].Pos, Vertices[0].Pos, Vertices[1].Pos);
+			}
+			return ComputeNormal2D(Vertices[Ind - 1].Pos, Vertices[Ind].Pos, Vertices[Ind + 1].Pos);
+		}
+		else
+		{
+			const int PrevInd = (Ind == 0) ? Vertices.Num() - 1 : Ind - 1;
+			const int NextInd = (Ind + 1) % Vertices.Num();
+			return ComputeNormal2D(Vertices[PrevInd].Pos, Vertices[Ind].Pos, Vertices[NextInd].Pos);
+		}
+	}
+
+	void Expend(float Width)
+	{
+		for (int i = 0; i < Vertices.Num(); ++i)
+		{
+			const FVector& Pos = Vertices[i].Pos += ComputeRightVectors2D(i) * Width;
+		}
+	}
+
+	void AddElevation(float Z)
+	{
+		for (auto& Pt : Vertices) Pt.Pos += FVector(0, 0, Z);
+	}
+
+	FVector Intersect(const FVector& PointA, const FVector& PointB)
+	{
+		const int Num = Vertices.Num() - 1 + int(bClosed);
+		float NearestDist = (Vertices[0].Pos - PointA).Size();
+		FVector NearestIntersection = Vertices[0].Pos;
+		for (int i = 0; i < Num; ++i)
+		{
+			const FVector& Pt0 = Vertices[i].Pos;
+			const FVector& Pt1 = Vertices[(i + 1) % Vertices.Num()].Pos;
+
+			FVector Intersection;
+			if (FMath::SegmentIntersection2D(Pt0, Pt1, PointA, PointB, Intersection))
+			{
+				float Dist = (PointA - Intersection).Size();
+				if (Dist < NearestDist)
+				{
+					NearestDist = Dist;
+					NearestIntersection = Intersection;
+				}
+			}
+		}
+		return NearestIntersection;
+	}
+
+	FPolyline Simplify(float MinSegmentLength) const
+	{
+		FPolyline Out(bClosed);
+		float AccLength = TNumericLimits<float>::Max() / 2;
+		FPolylineVertex PrePt = FVector::ZeroVector;
+		for (auto& Pt : Vertices)
+		{
+			if (PrePt.Pos.IsZero()) PrePt = Pt;
+			float Step = (PrePt.Pos - Pt.Pos).Size();
+			AccLength += Step;
+			Out.CashedLength += Step;
+			if (MinSegmentLength < 0 || AccLength >= MinSegmentLength)
+			{
+				AccLength = 0;
+				Out.Vertices.Add(Pt);
+			}
+			PrePt = Pt;
+		}
+		return Out;
+	}
+
+	float ClosestPoint(const FVector& Point, FPolylineVertex& Out) const
+	{
+		float FullDistance = 0;
+		float ResDistance = 0;
+		float NearestDist = (Vertices[0] - Point).Size();
+		const int Num = Vertices.Num() - 1 + int(bClosed);
+		FVector ClosestPoint = Vertices[0].Pos;
+		int Min_i0 = 0;
+		for (int i = 0; i < Num; ++i)
+		{
+			const FVector& Pt0 = Vertices[i].Pos;
+			const FVector& Pt1 = Vertices[(i + 1) % Vertices.Num()].Pos;
+			const FVector Pt3 = FMath::ClosestPointOnSegment(Point, Pt0, Pt1);
+			float Dist = (Point - Pt3).Size();
+			if (Dist < NearestDist)
+			{
+				ClosestPoint = Pt3;
+				NearestDist = Dist;
+				ResDistance = FullDistance + (Pt0 - Pt3).Size();
+				Min_i0 = i;
+			}
+			FullDistance += (Pt0 - Pt1).Size();
+		}
+
+		float Alpha = (Vertices[Min_i0].Pos - ClosestPoint).Size() / (Vertices[Min_i0].Pos - Vertices[(Min_i0 + 1) % Vertices.Num()].Pos).Size();
+
+		Alpha = FMath::Clamp(Alpha, 0.0f, 1.0f);
+
+		float MaxV = Vertices.Last().UV.Y;
+
+		FVector2D UV0 = Vertices[(Min_i0 == 0) ? Vertices.Num() - 1 : Min_i0 - 1].UV;
+		FVector2D UV1 = Vertices[Min_i0].UV;
+		FVector2D UV2 = Vertices[(Min_i0 + 1) % Vertices.Num()].UV;
+		FVector2D UV3 = Vertices[(Min_i0 + 2) % Vertices.Num()].UV;
+
+		if (Min_i0 == 0) UV0.Y -= MaxV;
+		if ((Min_i0 + 1) >= Vertices.Num()) UV2.Y += MaxV;
+		if ((Min_i0 + 2) >= Vertices.Num()) UV3.Y += MaxV;
+
+		Out.UV = CubicInterpolate(UV0, UV1, UV2, UV3, Alpha);
+		Out.Pos = ClosestPoint;
+		return ResDistance;
+	}
+
+	void Relax(float Speed = 0.5, int Iterations = 10, float TargetAngel = 100)
+	{
+		TargetAngel = TargetAngel / 180 * M_PI;
+		const int Num = bClosed ? Vertices.Num() : Vertices.Num() - 2;
+		TArray<FVector> Add;
+		Add.SetNumZeroed(Vertices.Num());
+		for (int j = 0; j < Iterations; ++j)
+		{
+			for (int i = 0; i < Num; ++i)
+			{
+				const FVector& Pt0 = Vertices[i].Pos;
+				const FVector& Pt1 = Vertices[(i + 1) % Vertices.Num()].Pos;
+				const FVector& Pt2 = Vertices[(i + 2) % Vertices.Num()].Pos;
+				const FVector V1 = Pt0 - Pt1;
+				const FVector V2 = Pt2 - Pt1;
+				const FVector V = V1 + V2;
+				const FVector Norm = V.GetSafeNormal();
+				const float Angle = FMath::Acos(V1.CosineAngle2D(V2));
+				const float MaxDistance = V.Size() / 2.0;
+				const float lk = 1.0f - std::min(Angle / TargetAngel , 1.0f);
+				Add[(i + 1) % Vertices.Num()] = Norm * MaxDistance * Speed * lk;
+			}
+			for (int i = 0; i < Num; ++i)
+			{
+				int Ind = (i + 1) % Vertices.Num();
+				Vertices[Ind].Pos += Add[Ind];
+			}
+		}
+	}
+
+	FVector GetPointByLength(float Length)
+	{
+		float AccLength = 0;
+
+		for (int i = 0; i < Vertices.Num() - 1; ++i)
+		{
+			float DLen = (Vertices[i].Pos - Vertices[i + 1].Pos).Size();
+
+			if ((AccLength + DLen) >= Length)
+			{
+				return Vertices[i].Pos + (Vertices[i + 1].Pos - Vertices[i].Pos).GetSafeNormal() * (AccLength + DLen - Length);
+			}
+			AccLength += DLen;
+		}
+
+		return Vertices.Last().Pos;
+	}
+
+	int FindNearestVertex(const FVector& Point)
+	{
+		int Ret = 0;
+		float MinLength = (Vertices[0].Pos - Point).Size();
+		for (int i = 0; i < Vertices.Num(); ++i)
+		{
+			int Ind = i % Vertices.Num();
+			float Length = (Vertices[Ind].Pos - Point).Size();
+			if (Length < MinLength)
+			{
+				MinLength = Length;
+				Ret = Ind;
+			}
+		}
+		return Ret;
+	}
+
+	void Normalize()
+	{
+		float Max = 0;
+		int iMax = -1;
+		for (int i = 0; i < Vertices.Num(); ++i)
+		{
+			if (Vertices[i].UV.Y > Max)
+			{
+				Max = Vertices[i].UV.Y;
+				iMax = i;
+			}
+		}
+		if (iMax >= 0 && iMax != Vertices.Num() - 1)
+		{
+
+			for (int i = 0; i <= iMax; ++i)
+			{
+				Vertices[i].UV.Y -= int(Max) + 1;
+			}
+		}
+	}
+
+	float GetCashedLength() const
+	{
+		return CashedLength;
+	}
+
+protected:
+	float CashedLength = 0;
+};
+
+static float SimplifyPlolylane(const TArray<FVector>& In, float MinSegmentLength, TArray<FVector>& Out, bool bClose = false)
+{
+	float Length = 0;
+
+	float AccLength = TNumericLimits<float>::Max() / 2;
+	FVector PrePt = FVector::ZeroVector;
+
+	for (auto& Pt : In)
+	{
+		if (PrePt.IsZero()) PrePt = Pt;
+		float Step = (PrePt - Pt).Size();
+		AccLength += Step;
+		Length += Step;
+		if (MinSegmentLength < 0 || AccLength >= MinSegmentLength)
+		{
+			AccLength = 0;
+			Out.Add(Pt);
+		}
+		PrePt = Pt;
+	}
+
+	if (bClose)
+	{
+		if ((In[0] - Out.Last()).Size() < MinSegmentLength * 0.5)
+		{
+			Out.Last() = In[0];
+		}
+		else
+		{
+			Out.Add(In[0]);
+		}
+	}
+
+	return Length;
+}
+
+
+ATrackBuilder::ATrackBuilder()
+{
+	RouteOffset = FVector(0, 0, 100);
+	RootComponent = CreateDefaultSubobject< USceneComponent >(TEXT("Root"));;
+}
+
+bool ATrackBuilder::JSONReadLine(const TSharedPtr<FJsonObject>& JSON, const FString& FieldName, TArray<FVector>& OutPoints, bool ImportAltitude)
+{
+	const TArray< TSharedPtr< FJsonValue > >* JsonNode;
+
+	if (!JSON->TryGetArrayField(FieldName, JsonNode))
+	{
+		UE_LOG(LogSoda, Warning, TEXT("JSONReadLine(%s); Can't find node in the"), *FieldName);
+		return false;
+	}
+
+	float AccLength = TNumericLimits<float>::Max() / 2;
+	FVector PrePt = FVector::ZeroVector;
+
+	for (auto& JsonValue : *JsonNode)
+	{
+		const TArray< TSharedPtr< FJsonValue > >* Points;
+		if (!JsonValue->TryGetArray(Points))
+		{
+			UE_LOG(LogSoda, Error, TEXT("JSONReadLine(%s); Wrong point format (the point isn't array)"), *FieldName);
+			return false;
+		}
+		if (Points->Num() < 2)
+		{
+			UE_LOG(LogSoda, Error, TEXT("JSONReadLine(%s); Wrong point format (the point size < 2)"), *FieldName);
+			return false;
+		}
+
+		FVector Pt = FVector::ZeroVector;
+
+		if (!(*Points)[0]->TryGetNumber(Pt.X) || !(*Points)[1]->TryGetNumber(Pt.Y))
+		{
+			UE_LOG(LogSoda, Error, TEXT("JSONReadLine(%s); Wrong point format (x or y isn't number)"), *FieldName);
+			return false;
+		}
+
+		if (Points->Num() >= 3 && ImportAltitude)
+		{
+			if (!(*Points)[2]->TryGetNumber(Pt.Z))
+			{
+				UE_LOG(LogSoda, Error, TEXT("JSONReadLine(%s); Wrong point format (z isn't number)"), *FieldName);
+				return false;
+			}
+		}
+
+		Pt *= 100;
+		Pt.X = -Pt.X;
+
+		OutPoints.Add(Pt);
+	}
+
+	return true;
+}
+
+void ATrackBuilder::BeginPlay()
+{
+	Super::BeginPlay();
+
+	/*
+	UVariantParam* JSONFilesParma = VariantParams->Add((FString*)(nullptr), "JSON Files", false);
+	JSONFilesParma->CategoryName = "LoadJsonTrack";
+	
+
+	TArray<FString> Files;
+	IFileManager::Get().FindFiles(Files, *(FPaths::ProjectDir() / "JSON_Traks"));
+
+	for (auto& File : Files)
+	{
+		JSONFilesParma->MapAsString.Add(File, FPaths::ProjectDir() / "JSON_Traks" / File);
+	}
+	*/
+
+	if (bJSONLoaded)
+	{
+		if (bGenerateTrackOnBeginPlay)
+		{
+			GenerateTrack();
+		}
+
+		if (bGeneratMarkingsOnBeginPlay)
+		{
+			GenerateMarkings();
+		}
+
+		if (bGenerateLineRoutesOnBeginPlay)
+		{
+			GenerateLineRoutes();
+		}
+
+		if (bGenerateRaceRouteOnBeginPlay)
+		{
+			GenerateRaceRoute();
+		}
+
+		if (bGeneratStartLineOnBeginPlay)
+		{
+			GenerateStartLine();
+		}
+	}
+}
+
+void ATrackBuilder::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ATrackBuilder::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+}
+
+void ATrackBuilder::OnConstruction(const FTransform& Transform)
+{
+	Super::OnConstruction(Transform);
+	//GenerateMesh();
+}
+
+bool ATrackBuilder::LoadJson(const FString & InFileName)
+{
+	UnloadJson();
+
+	FString JsonString;
+	if (!FFileHelper::LoadFileToString(JsonString, *InFileName))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::LoadJson(); Can't read file"));
+		return false;
+	}
+
+	TSharedPtr<FJsonObject> JSON;
+	TSharedRef<TJsonReader<TCHAR>> Reader = TJsonReaderFactory<TCHAR>::Create(JsonString);
+	if (!FJsonSerializer::Deserialize(Reader, JSON))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::LoadJson(); Can't JSON deserialize"));
+		return false;
+	}
+
+	if (!JSONReadLine(JSON, TEXT("Inside"), InsidePoints, bImportAltitude) ||
+		!JSONReadLine(JSON, TEXT("Outside"), OutsidePoints, bImportAltitude) ||
+		!JSONReadLine(JSON, TEXT("Centre"), CentrePoints, bImportAltitude))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::LoadJson(); Can't parse Inside or Outside or Centre node"));
+		return false;
+	}
+
+	JSONReadLine(JSON, TEXT("Racing"), RacingPoints, false);
+
+	if (CentrePoints.Num() < 3 && OutsidePoints.Num() < 3 && CentrePoints.Num() < 3)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::LoadJson(); Size of track line < 3"));
+		return false;
+	}
+
+	//Align the lines
+	int Ind;
+	Ind = FindNearestPoint2D(CentrePoints[0], InsidePoints);
+	InsidePoints.Append(InsidePoints.GetData(), Ind);
+	InsidePoints.RemoveAt(0, Ind);
+	Ind = FindNearestPoint2D(CentrePoints[0], OutsidePoints);
+	OutsidePoints.Append(OutsidePoints.GetData(), Ind);
+	OutsidePoints.RemoveAt(0, Ind);
+
+	if (bIsClosedTrack)
+	{
+		bool InsidePointsDir = IsClockwise2D(InsidePoints);
+		bool OutsidePointsDir = IsClockwise2D(OutsidePoints);
+		bool CentrePointsDir = IsClockwise2D(CentrePoints);
+
+		if (CentrePointsDir != InsidePointsDir || CentrePointsDir != OutsidePointsDir)
+		{
+			UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::LoadJson(); Direction of Inside, Outside and Centre line are not matched"));
+			return false;
+		}
+
+		bIsClockwise2D = CentrePointsDir;
+	} 
+	else
+	{
+		FVector ForwardVec =  ComputeNormal2D(InsidePoints[0], CentrePoints[0], OutsidePoints[0]);
+		FVector RightVec = InsidePoints[0] - CentrePoints[0];
+		bIsClockwise2D = (ForwardVec.X * RightVec.Y - RightVec.X * ForwardVec.Y) > 0;
+	}
+
+	const TArray< TSharedPtr< FJsonValue > >* ReferencePoint;
+	if (JSON->TryGetArrayField(TEXT("ReferencePoint"), ReferencePoint) && ReferencePoint && ReferencePoint->Num() == 3 && 
+		(*ReferencePoint)[0]->TryGetNumber(RefPointLon) && 
+		(*ReferencePoint)[1]->TryGetNumber(RefPointLat) &&
+		(*ReferencePoint)[2]->TryGetNumber(RefPointAlt))
+	{
+		bRefPointIsOk = true;
+	}
+	else
+	{
+		UE_LOG(LogSoda, Warning, TEXT("ATrackBuilder::LoadJson(); Can't parse 'ReferencePoint' node"));
+	}
+
+	bJSONLoaded = true;
+	LoadedFileName = InFileName;
+
+	UE_LOG(LogSoda, Log, TEXT(" ATrackBuilder::LoadJson(); %s sucessful loaded"), *FileName);
+
+	return true;
+}
+
+void ATrackBuilder::UnloadJson()
+{
+	OutsidePoints.Empty();
+	InsidePoints.Empty();
+	CentrePoints.Empty();
+	RacingPoints.Empty();
+
+	bRefPointIsOk = false;
+	bJSONLoaded = false;
+	LoadedFileName = "";
+
+	RefPointLon = 0;
+	RefPointLat = 0;
+	RefPointAlt = 0;
+}
+
+void ATrackBuilder::GenerateAll()
+{
+	GenerateTrack();
+	GenerateMarkings();
+	GenerateLineRoutes();
+	GenerateStartLine();
+	UpdateActorsFactory();
+	UpdateGlobalRefpoint();
+}
+
+void ATrackBuilder::LoadJson_Editor()
+{
+	IDesktopPlatform* DesktopPlatform = FDesktopPlatformModule::Get();
+	if (!DesktopPlatform)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::LoadJson_Editor() Can't get the IDesktopPlatform ref"));
+		return;
+	}
+
+	const FString FileTypes = TEXT("(*.json)|*.json");
+
+	TArray<FString> OpenFilenames;
+	int32 FilterIndex = -1;
+	if (!DesktopPlatform->OpenFileDialog(nullptr, TEXT("Import track from JSON"), TEXT(""), TEXT(""), FileTypes, EFileDialogFlags::None, OpenFilenames, FilterIndex) || OpenFilenames.Num() <= 0)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::LoadJson_Editor() Can't open file"));
+		return;
+	}
+
+	LoadJson(OpenFilenames[0]);
+}
+
+
+void ATrackBuilder::ClearTrack()
+{
+	for (auto& it : TrackMeshes)
+	{
+		if (IsValid(it))
+		{
+			it->ClearAllMeshSections();
+			it->DestroyComponent();
+		}
+	}
+	TrackMeshes.Empty();
+}
+
+void ATrackBuilder::GenerateTrack()
+{
+	if (!bJSONLoaded)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateMarkingsInner(); JSON isn't loaded"));
+		return;
+	}
+
+	ClearTrack();
+
+	if (InsidePoints.Num() < 3 || OutsidePoints.Num() < 3 || CentrePoints.Num() < 3)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateMesh(); Input track is broken"));
+		return;
+	}
+
+	const float Dir = bIsClockwise2D ? -1 : 1;
+
+	/*
+	 * Initialization and simplify  of inside, otside and centre track's polylines 
+	 */
+	FPolyline InsidePolyline(InsidePoints, true, TrackElevation);
+	FPolyline OutsidePolyline(OutsidePoints, true, TrackElevation);
+	FPolyline CentrePolyline(CentrePoints, true, TrackElevation);
+
+	if (bRelax)
+	{
+		InsidePolyline.Relax(RelaxSpeed, RelaxIterations, RelaxTargetAngel);
+		OutsidePolyline.Relax(RelaxSpeed, RelaxIterations, RelaxTargetAngel);
+		CentrePolyline.Relax(RelaxSpeed, RelaxIterations, RelaxTargetAngel);
+	}
+
+	InsidePolyline = InsidePolyline.Simplify(TrackMinSegmentLength);
+	OutsidePolyline = OutsidePolyline.Simplify(TrackMinSegmentLength);
+	CentrePolyline = CentrePolyline.Simplify(TrackMinSegmentLength);
+
+	if (InsidePolyline.GetCashedLength() <= 0 || OutsidePolyline.GetCashedLength() <= 0 || InsidePolyline.Vertices.Num() < 3 || OutsidePolyline.Vertices.Num() < 0)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateMesh(); Simplified track is broken"));
+		return;
+	}
+
+
+	/*
+	 * Comput UV for every polyline. UVs calculat relative to the center line. 
+	 * InsidePolylineHelper and OutsidePolylineHelper are the center line transferred to the inside and outside polylines.
+	 */
+	FPolyline InsidePolylineHelper(bIsClosedTrack);
+	FPolyline OutsidePolylineHelper(bIsClosedTrack);
+
+	float VTexLength = 0;
+	for (int i = 0; i < CentrePolyline.Num(); ++i)
+	{
+		FVector RightVectors2D = CentrePolyline.ComputeRightVectors2D(i) * Dir;
+		InsidePolylineHelper.Vertices.Add(FPolylineVertex(InsidePolyline.Intersect(CentrePolyline[i].Pos, CentrePolyline[i].Pos + RightVectors2D * 10000), FVector2D(0.0, VTexLength) ));
+		OutsidePolylineHelper.Vertices.Add(FPolylineVertex(OutsidePolyline.Intersect(CentrePolyline[i].Pos, CentrePolyline[i].Pos - RightVectors2D * 10000), FVector2D(1.0, VTexLength)));
+		CentrePolyline[i].UV = FVector2D(0.5, VTexLength);
+		VTexLength += (CentrePolyline[i].Pos - CentrePolyline[(i + 1) % CentrePolyline.Num()].Pos).Size() * TrackTexScaleV;
+	}
+
+	/*
+	 * CalibCoeffTexV is scaling factor for the TexV coordinate to scale TexV to a multiple of 1.
+	 */
+	const float CalibCoeffTexV = float(int(VTexLength)) / VTexLength;
+	for (int i = 0; i < CentrePolyline.Num(); ++i)
+	{
+		CentrePolyline[i].UV.Y *= CalibCoeffTexV;
+		InsidePolylineHelper[i].UV.Y *= CalibCoeffTexV;
+		OutsidePolylineHelper[i].UV.Y *= CalibCoeffTexV;
+	}
+
+	/*
+	 * Determine the UV for inside and outside polyline how nearest destance to InsidePolylineHelper and OutsidePolylineHelper.
+	 */
+	for (int i = 0; i < InsidePolyline.Num(); ++i)
+	{
+		FPolylineVertex Pt;
+		InsidePolylineHelper.ClosestPoint(InsidePolyline[i].Pos, Pt);
+		InsidePolyline[i].UV =  Pt.UV;
+	}
+	for (int i = 0; i < OutsidePolyline.Num(); ++i)
+	{
+		FPolylineVertex Pt;
+		OutsidePolylineHelper.ClosestPoint(OutsidePolyline[i].Pos, Pt);
+		OutsidePolyline[i].UV = Pt.UV;
+	}
+
+	int CenterLineInd = 0;
+	int InsideLineInd = 0;
+	int OutsideLineInd = 0;
+	int MeshID = 0;
+
+	/*
+	 * Split the track into segments, loop until we reach the last segment
+	 */
+	while (true)
+	{
+		/*
+		 * Find the segment of track
+		 */
+		FPolyline InsideSegment(false);
+		FPolyline OutsideSegment(false);
+		FPolyline CentreSegment(false);
+
+		const int PointsLeft = CentrePolyline.Num() - CenterLineInd;
+		const bool IsLastSegment = PointsLeft < (TrackSegmentStep + TrackSegmentStep / 2);
+
+		int CenterSegmEndInd;
+		int InsideSegmEndInd;
+		int OutsideSegmEndInd;
+
+		if (IsLastSegment)
+		{
+			CenterSegmEndInd = CentrePolyline.Num() - 1;
+			InsideSegmEndInd = InsidePolyline.Num() - 1;
+			OutsideSegmEndInd = OutsidePolyline.Num() - 1;
+		}
+		else
+		{
+			CenterSegmEndInd = CenterLineInd + TrackSegmentStep - 1;
+			const FVector& CenterPoint = CentrePolyline[CenterSegmEndInd].Pos;
+			InsideSegmEndInd = InsidePolyline.FindNearestVertex(CenterPoint);
+			OutsideSegmEndInd = OutsidePolyline.FindNearestVertex(CenterPoint);
+		}
+
+		for (int i = CenterLineInd; i <= CenterSegmEndInd; ++i) CentreSegment.Vertices.Add(CentrePolyline[i]);
+		for (int i = InsideLineInd; i <= InsideSegmEndInd; ++i) InsideSegment.Vertices.Add(InsidePolyline[i]);
+		for (int i = OutsideLineInd; i <= OutsideSegmEndInd; ++i) OutsideSegment.Vertices.Add(OutsidePolyline[i]);
+
+		if (IsLastSegment && bIsClosedTrack)
+		{
+			if ((CentrePolyline.Vertices[0].Pos - CentrePolyline.Vertices.Last().Pos).Size() > TrackMinSegmentLength)
+			{
+				CentreSegment.Vertices.Add(FPolylineVertex(CentrePolyline.Vertices[0].Pos, FVector2D(0.5, VTexLength * CalibCoeffTexV)));
+			}
+			else
+			{
+				CentreSegment.Vertices.Last() = FPolylineVertex(CentrePolyline.Vertices[0].Pos, FVector2D(0.5, VTexLength * CalibCoeffTexV));
+			}
+
+			if ((InsidePolyline.Vertices[0].Pos - InsidePolyline.Vertices.Last().Pos).Size() > TrackMinSegmentLength)
+			{
+				InsideSegment.Vertices.Add(FPolylineVertex(InsidePolyline.Vertices[0].Pos, FVector2D(0.0, VTexLength * CalibCoeffTexV)));
+			}
+			else
+			{
+				InsideSegment.Vertices.Last() = FPolylineVertex(InsidePolyline.Vertices[0].Pos, FVector2D(0.0, VTexLength * CalibCoeffTexV));
+			}
+
+			if ((OutsidePolyline.Vertices[0].Pos - OutsidePolyline.Vertices.Last().Pos).Size() > TrackMinSegmentLength)
+			{
+				OutsideSegment.Vertices.Add(FPolylineVertex(OutsidePolyline.Vertices[0].Pos, FVector2D(1.0, VTexLength * CalibCoeffTexV)));
+			}
+			else
+			{
+				OutsideSegment.Vertices.Last() = FPolylineVertex(OutsidePolyline.Vertices[0].Pos, FVector2D(1.0, VTexLength * CalibCoeffTexV));
+			}
+
+		}
+		
+		/*
+		 * Normalize segment texture coordinates
+		 */
+		FVector2D FirstUV = CentreSegment[0].GetNormalizedUV() - CentreSegment[0].UV;
+		for (int i = 0; i < CentreSegment.Num(); ++i) CentreSegment[i].UV.Y += FirstUV.Y;
+		for (int i = 0; i < InsideSegment.Num(); ++i) InsideSegment[i].UV.Y += FirstUV.Y;
+		for (int i = 0; i < OutsideSegment.Num(); ++i) OutsideSegment[i].UV.Y += FirstUV.Y;
+
+		InsideSegment.Normalize();
+		OutsideSegment.Normalize();
+
+		/*
+		 * Compute border points and inner points for segment with borders and center line
+		 */
+		FPolyline VerticesBorder(true), VerticesInner(false);
+		if (bTrackWithCenterLine) VerticesBorder.Vertices.Add(FPolylineVertex(CentreSegment[0]));
+		if (bWithBorder)
+		{
+			for (int i = 0; i < InsideSegment.Num(); ++i)
+			{
+				FVector RightVectors2D = (IsLastSegment && (i == (InsideSegment.Num() - 1))) ?
+					InsidePolyline.ComputeRightVectors2D(0) :
+					InsidePolyline.ComputeRightVectors2D(InsideLineInd + i);
+
+				const FVector2D & UV = InsideSegment[i].UV;
+				const FVector & Pos = InsideSegment[i].Pos;
+				FPolylineVertex PtIn = FPolylineVertex(Pos, FVector2D(TrackTexBorderPartU, UV.Y));
+				FPolylineVertex PtOut = FPolylineVertex(Pos + RightVectors2D * BorderWidth * Dir, UV);
+				PtOut.Pos.Z = 0;
+				if (i == 0)
+				{
+					VerticesBorder.Vertices.Add(PtIn);
+					VerticesBorder.Vertices.Add(PtOut);
+				}
+				else if (i == InsideSegment.Num() - 1)
+				{
+					VerticesBorder.Vertices.Add(PtOut);
+					VerticesBorder.Vertices.Add(PtIn);
+				}
+				else
+				{
+					VerticesBorder.Vertices.Add(PtOut);
+					VerticesInner.Vertices.Add(PtIn);
+				}
+			}
+		}
+		else
+		{
+			for (int i = 0; i < InsideSegment.Num(); ++i) VerticesBorder.Vertices.Add(InsideSegment[i]);
+		}
+		if (bTrackWithCenterLine)
+		{
+			VerticesBorder.Vertices.Add(FPolylineVertex(CentreSegment[CentreSegment.Num() - 1]));
+		}
+		if (bWithBorder)
+		{
+			for (int i = OutsideSegment.Num() - 1; i >= 0; --i)
+			{
+				FVector RightVectors2D = (IsLastSegment && (i == (OutsideSegment.Num() - 1))) ?
+					OutsidePolyline.ComputeRightVectors2D(0) :
+					OutsidePolyline.ComputeRightVectors2D(OutsideLineInd + i);
+
+				const FVector2D& UV = OutsideSegment[i].UV;
+				const FVector& Pos = OutsideSegment[i].Pos;
+				FPolylineVertex PtIn = FPolylineVertex(Pos, FVector2D(1.0 - TrackTexBorderPartU, UV.Y));
+				FPolylineVertex PtOut = FPolylineVertex(Pos - RightVectors2D * BorderWidth * Dir, UV);
+				PtOut.Pos.Z = 0;
+				if (i == 0)
+				{
+					VerticesBorder.Vertices.Add(PtOut);
+					VerticesBorder.Vertices.Add(PtIn);
+				}
+				else if (i == OutsideSegment.Num() - 1)
+				{
+					VerticesBorder.Vertices.Add(PtIn);
+					VerticesBorder.Vertices.Add(PtOut);
+				}
+				else
+				{
+					VerticesBorder.Vertices.Add(PtOut);
+					VerticesInner.Vertices.Add(PtIn);
+				}
+			}
+		}
+		else
+		{
+			for (int i = OutsideSegment.Num() - 1; i >= 0; --i) VerticesBorder.Vertices.Add(OutsideSegment[i]);
+		}
+		if (bTrackWithCenterLine)
+		{
+			for (int i = 1; i < CentreSegment.Num() - 1; ++i) VerticesInner.Vertices.Add(CentreSegment[i]);
+		}
+
+		CenterLineInd = CenterSegmEndInd;
+		InsideLineInd = InsideSegmEndInd;
+		OutsideLineInd = OutsideSegmEndInd;
+
+		/*
+		 * Triangulate
+		 */
+		UE::Geometry::FConstrainedDelaunay2d Triangulation;
+		Triangulation.Vertices.Add({ VerticesBorder.Vertices[0].Pos.X, VerticesBorder.Vertices[0].Pos.Y });
+		for (int i = 1; i< VerticesBorder.Vertices.Num(); ++i)
+		{
+			auto& Point = VerticesBorder.Vertices[i];
+			Triangulation.Vertices.Add({ Point.Pos.X, Point.Pos.Y });
+			Triangulation.Edges.Add(UE::Geometry::FIndex2i(i-1, i));
+		}
+		Triangulation.Edges.Add(UE::Geometry::FIndex2i(VerticesBorder.Vertices.Num() - 1, 0));
+
+		for (auto& Point : VerticesInner.Vertices)
+		{
+			Triangulation.Vertices.Add({ Point.Pos.X, Point.Pos.Y });
+		}
+
+		bool bTriangulationSuccess = Triangulation.Triangulate();
+		if (!bTriangulationSuccess || Triangulation.Triangles.Num() == 0)
+		{
+			UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateMesh(); Can't triangulateh"));
+			break;
+		}
+
+		/*
+		 * Build mesh
+		 */
+		TArray <FVector> Vertices;
+		TArray<FVector2D> UVs;
+
+		for (auto& Point : VerticesBorder.Vertices)
+		{
+			Vertices.Add(Point.Pos);
+			UVs.Add(Point.UV);
+		}
+		for (auto& Point : VerticesInner.Vertices)
+		{
+			Vertices.Add(Point.Pos);
+			UVs.Add(Point.UV);
+		}
+
+		TArray <int32> Triangles;
+		for (const UE::Geometry::FIndex3i& Tri : Triangulation.Triangles)
+		{
+			Triangles.Add(Tri.A);
+			Triangles.Add(Tri.B);
+			Triangles.Add(Tri.C);
+		}
+
+		TArray<FVector> Normals;
+		TArray<FColor> Colors;
+		TArray<FProcMeshTangent> Tangents;
+		UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UVs, Normals, Tangents);
+
+
+		UProceduralMeshComponent* ProceduralMesh = NewObject<UProceduralMeshComponent>(this);
+		ProceduralMesh->SetupAttachment(RootComponent);
+		ProceduralMesh->RegisterComponent();
+		ProceduralMesh->CreateMeshSection(MeshID, Vertices, Triangles, Normals, UVs, Colors, Tangents, true);
+		ProceduralMesh->bUseComplexAsSimpleCollision = true;
+		ProceduralMesh->ComponentTags.Add("CusomSegmTag");
+		ProceduralMesh->bRenderCustomDepth = true;
+		ProceduralMesh->SetCustomDepthStencilValue(int32(ESegmObjectLabel::Roads));
+		ProceduralMesh->SetRenderCustomDepth(true);
+		if (IsValid(TrackMaterial))
+		{
+			ProceduralMesh->SetMaterial(MeshID, TrackMaterial);
+		}
+
+		TrackMeshes.Add(ProceduralMesh);
+
+		UE_LOG(LogSoda, Log, TEXT(" ATrackBuilder::GenerateMesh(); ID: %i; Vertices: %i, Triangles: %i"), MeshID, Vertices.Num(), Triangles.Num() / 3);
+
+		if (IsLastSegment || (TrackBuildSegmentCount > 0 && (TrackBuildSegmentCount - 1) < MeshID)) break;
+
+		++MeshID;
+	}
+
+}
+
+void ATrackBuilder::GenerateLineRoutes()
+{
+	ClearRoutes();
+	
+	if (CentrePoints.Num() < 3 )
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateLineRoutes(); Centre line is broken"));
+		return;
+	}
+
+	float Dir = IsClockwise2D(CentrePoints) ? -1 : 1;
+
+	FVector Location = GetActorLocation();
+	TArray <TArray<FVector>> RoutesPoints;
+	RoutesPoints.SetNum(NumRouteLanes);
+	for (size_t i = 0; i < CentrePoints.Num(); ++i)
+	{
+		FVector ForwardVector = (CentrePoints[(i + 1) % CentrePoints.Num()] - CentrePoints[i]).GetSafeNormal();
+		FVector RightVectors2D = FRotationMatrix(ForwardVector.GetSafeNormal2D().Rotation()).GetScaledAxis(EAxis::Y) * Dir;
+
+		FVector PtOut = OutsidePoints[FindNearestPoint2D(CentrePoints[i], OutsidePoints)];
+		FVector PtIn = InsidePoints[FindNearestPoint2D(CentrePoints[i], InsidePoints)];
+
+		float TrackWidth = FVector2D(PtOut - PtIn).Size();
+
+		for (int j = 0; j < NumRouteLanes; ++j)
+		{
+			float CalibCoeff = float(j) / (NumRouteLanes) + 1.0f / NumRouteLanes * 0.5;
+			float DZ = (PtIn.Z - PtOut.Z) * CalibCoeff  + PtOut.Z;
+			FVector Pt = CentrePoints[i] + RouteOffset + Location + FVector(0, 0, DZ) + RightVectors2D * (CalibCoeff - 0.5) * TrackWidth;
+			RoutesPoints[j].Add(Pt);
+		}
+	}
+
+	for (int i = 0; i < NumRouteLanes; ++i)
+	{
+		TArray<FVector> RouteSimplified;
+		float Length =  SimplifyPlolylane(RoutesPoints[i], RouteMinSegmentLength, RouteSimplified, true);
+
+		if (Length <= 0 || RouteSimplified.Num() < 3)
+		{
+			UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateLineRoutes(); Simplified line is broken"));
+			return;
+		}
+
+		ANavigationRoute* Route = GetWorld()->SpawnActor<ANavigationRoute>(RouteSimplified[0], FRotator(0, 0, 0));
+		Route->SetRoutePoints(RouteSimplified);
+		Route->bAllowForVehicles = true;
+		Route->bAllowForPedestrians = false;
+		Routes.Add(Route);
+
+		UE_LOG(LogSoda, Log, TEXT("ATrackBuilder::GenerateLineRoutes(); Added route %i ; Vertices num: %i"), i, RouteSimplified.Num());
+	}
+}
+
+void ATrackBuilder::GenerateRaceRoute()
+{
+	if (!RacingPoints.Num())
+	{
+		UE_LOG(LogSoda, Log, TEXT("ATrackBuilder::GenerateRaceRoute(); Racing Points isn't loaded"));
+		return;
+	}
+
+	TArray<FVector> RouteSimplified;
+	float Length = SimplifyPlolylane(RacingPoints, RouteMinSegmentLength, RouteSimplified, true);
+
+
+	for (int i = 0; i < RouteSimplified.Num(); ++i)
+	{
+		int Ind = FindNearestPoint2D(RouteSimplified[i], CentrePoints);
+		if (Ind > 0) RouteSimplified[i].Z = CentrePoints[Ind].Z;
+		RouteSimplified[i] += RouteOffset;
+	}
+
+	if (Length <= 0 || RouteSimplified.Num() < 3)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateRaceRoute(); Simplified line is broken"));
+		return;
+	}
+
+	ANavigationRoute* Route = GetWorld()->SpawnActor<ANavigationRoute>(RouteSimplified[0], FRotator(0, 0, 0));
+	Route->SetRoutePoints(RouteSimplified);
+	Route->bAllowForVehicles = true;
+	Route->bAllowForPedestrians = false;
+	Routes.Add(Route);
+
+	UE_LOG(LogSoda, Log, TEXT("ATrackBuilder::GenerateRaceRoute(); Added racing route"));
+}
+
+void ATrackBuilder::ClearRoutes()
+{
+	for (auto& Route : Routes)
+	{
+		if (IsValid(Route)) Route->Destroy();
+	}
+	Routes.Empty();
+}
+
+void ATrackBuilder::GenerateMarkings()
+{
+	ClearMarkings();
+	GenerateMarkingsInner(InsidePoints);
+	GenerateMarkingsInner(OutsidePoints);
+}
+
+void ATrackBuilder::ClearMarkings()
+{
+	for (auto& it : MarkingMeshes)
+	{
+		if (IsValid(it))
+		{
+			it->ClearAllMeshSections();
+			it->DestroyComponent();
+		}
+	}
+	MarkingMeshes.Empty();
+}
+
+bool ATrackBuilder::GenerateMarkingsInner(const TArray<FVector>& Points)
+{
+	if (!bJSONLoaded)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateMarkingsInner(); JSON isn't loaded"));
+		return false;
+	}
+
+	if (Points.Num() < 3)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateRoadMarkings(); Input track is broken"));
+		return false;
+	}
+
+	FPolyline Polyline(Points, true, TrackElevation + 3); // + 3 cm under road
+
+	if (bRelax)
+	{
+		Polyline.Relax(RelaxSpeed, RelaxIterations, RelaxTargetAngel);
+	}
+
+	Polyline = Polyline.Simplify(MarkingsMinSegmentLength);
+	
+	const float Dir = bIsClockwise2D ? -1 : 1;
+
+	float VTexLength = 0;
+	for (int i = 0; i < Polyline.Num(); ++i)
+	{
+		Polyline[i].UV = FVector2D(0.5, VTexLength);
+		VTexLength += (Polyline[i].Pos - Polyline[(i + 1) % Polyline.Num()].Pos).Size() * MarkingsTexScaleV;
+	}
+	float CalibCoeffTexV = float(int(VTexLength)) / VTexLength;
+	for (int i = 0; i < Polyline.Num(); ++i)
+	{
+		Polyline[i].UV.Y *= CalibCoeffTexV;
+	}
+
+	int LineInd = 0;
+	int MeshID = 0;
+
+	while (true)
+	{
+		FPolyline Segment(false);
+
+
+		const int PointsLeft = Polyline.Num() - LineInd;
+		const bool IsLastSegment = PointsLeft < (MarkingsStep + MarkingsStep / 2);
+
+		int SegmEndInd;
+
+
+		if (IsLastSegment)
+		{
+			SegmEndInd = Polyline.Num() - 1;
+
+		}
+		else
+		{
+			SegmEndInd = LineInd + MarkingsStep - 1;
+		}
+
+		for (int i = LineInd; i <= SegmEndInd; ++i) Segment.Vertices.Add(Polyline[i]);
+
+		
+
+		if (IsLastSegment && bIsClosedTrack)
+		{
+			if ((Polyline.Vertices[0].Pos - Polyline.Vertices.Last().Pos).Size() > MarkingsMinSegmentLength)
+			{
+				Segment.Vertices.Add(FPolylineVertex(Polyline.Vertices[0].Pos, FVector2D(0.5, VTexLength * CalibCoeffTexV)));
+			}
+			else
+			{
+				Segment.Vertices.Last() = FPolylineVertex(Polyline.Vertices[0].Pos, FVector2D(0.5, VTexLength * CalibCoeffTexV));
+			}
+		}
+
+		/*
+		 * Normalize segment texture coordinates
+		 */
+		FVector2D FirstUV = Segment[0].GetNormalizedUV() - Segment[0].UV;
+		for (int i = 0; i < Segment.Num(); ++i) Segment[i].UV.Y += FirstUV.Y;
+		Segment.Normalize();
+
+		TArray<FVector> RightVectors2D;
+		RightVectors2D.SetNum(Polyline.Num());
+		for (int i = 0; i < Segment.Num(); ++i)
+		{
+			RightVectors2D[i] = (IsLastSegment && (i == (Segment.Num() - 1))) ?
+				Polyline.ComputeRightVectors2D(0) :
+				Polyline.ComputeRightVectors2D(LineInd + i);
+		}
+
+		FPolyline VerticesBorder(true);
+		for (int i = 0; i < Segment.Num(); ++i)
+		{
+			FPolylineVertex Pt = FPolylineVertex(Segment[i].Pos + RightVectors2D[i] * MarkingsWidth * 0.5 * Dir, FVector2D(0, Segment[i].UV.Y));
+			VerticesBorder.Vertices.Add(Pt);
+		}
+		for (int i = Segment.Num() - 1; i >= 0; --i)
+		{
+			FPolylineVertex Pt = FPolylineVertex(Segment[i].Pos - RightVectors2D[i] * MarkingsWidth * 0.5 * Dir, FVector2D(1, Segment[i].UV.Y));
+			VerticesBorder.Vertices.Add(Pt);
+		}
+
+		LineInd = SegmEndInd;
+
+		/*
+		 * Triangulate
+		 */
+
+		UE::Geometry::FConstrainedDelaunay2d Triangulation;
+		Triangulation.Vertices.Add({ VerticesBorder.Vertices[0].Pos.X, VerticesBorder.Vertices[0].Pos.Y });
+		for (int i = 1; i < VerticesBorder.Vertices.Num(); ++i)
+		{
+			auto& Point = VerticesBorder.Vertices[i];
+			Triangulation.Vertices.Add({ Point.Pos.X, Point.Pos.Y });
+			Triangulation.Edges.Add(UE::Geometry::FIndex2i(i - 1, i));
+		}
+		Triangulation.Edges.Add(UE::Geometry::FIndex2i(VerticesBorder.Vertices.Num() - 1, 0));
+
+		bool bTriangulationSuccess = Triangulation.Triangulate();
+		if (!bTriangulationSuccess || Triangulation.Triangles.Num() == 0)
+		{
+			UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateRoadMarkings(); Can't triangulateh"));
+			break;
+		}
+
+		/*
+		 * Build mesh
+		 */
+
+		TArray <FVector> Vertices;
+		TArray<FVector2D> UVs;
+
+		for (auto& Point : VerticesBorder.Vertices)
+		{
+			Vertices.Add(Point.Pos);
+			UVs.Add(Point.UV);
+		}
+
+		TArray <int32> Triangles;
+		for (const UE::Geometry::FIndex3i& Tri : Triangulation.Triangles)
+		{
+			Triangles.Add(Tri.A);
+			Triangles.Add(Tri.B);
+			Triangles.Add(Tri.C);
+		}
+
+		TArray<FVector> Normals;
+		TArray<FColor> Colors;
+		TArray<FProcMeshTangent> Tangents;
+		UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UVs, Normals, Tangents);
+
+
+		UProceduralMeshComponent* ProceduralMesh = NewObject<UProceduralMeshComponent>(this);
+		ProceduralMesh->SetupAttachment(RootComponent);
+		ProceduralMesh->RegisterComponent();
+		ProceduralMesh->CreateMeshSection(MeshID, Vertices, Triangles, Normals, UVs, Colors, Tangents, false);
+		ProceduralMesh->SetCustomDepthStencilValue(int32(ESegmObjectLabel::RoadLines));
+		ProceduralMesh->SetRenderCustomDepth(true);
+		ProceduralMesh->SetCastShadow(false);
+		if (IsValid(MarkingsMaterial))
+		{
+			ProceduralMesh->SetMaterial(MeshID, MarkingsMaterial);
+		}
+
+		MarkingMeshes.Add(ProceduralMesh);
+
+		UE_LOG(LogSoda, Log, TEXT("ATrackBuilder::GenerateRoadMarkings(); ID: %i; Vertices: %i, Triangles: %i"), MeshID, Vertices.Num(), Triangles.Num() / 3);
+
+		if (IsLastSegment) break;
+
+		++MeshID;
+	}
+
+	return true;
+}
+
+void ATrackBuilder::UpdateGlobalRefpoint()
+{
+	if (!bRefPointIsOk)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::UpdateGlobalRefpoint(); Refpoint isn't loaded from JSON file"));
+		return;
+	}
+
+	if (ALevelState* LevelState = ALevelState::Get())
+	{
+		LevelState->SetGeoReference(RefPointLat, RefPointLon, RefPointAlt);
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::UpdateGlobalRefpoint(); Add ALevelState first"));
+	}
+}
+
+void ATrackBuilder::UpdateActorsFactory()
+{
+	/*
+	if (!bJSONLoaded)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::UpdateActorsFactory(); JSON isn't loaded"));
+		return;
+	}
+
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	ASodaActorFactory* ActorFactory = nullptr;
+
+	if (IsValid(GameMode))
+	{
+		ActorFactory = GameMode->GetActorFactory();
+	}
+
+	if (!IsValid(ActorFactory))
+	{
+		if (auto It = TActorIterator<ASodaActorFactory>(GetWorld()))ActorFactory = *It;
+	}
+
+	if (IsValid(ActorFactory))
+	{
+		for (auto& Actor : ActorFactory->GetActors()) Actor->Destroy();
+		const float Yaw = (CentrePoints[1] - CentrePoints[0]).HeadingAngle() / M_PI * 180.0;
+		ActorFactory->SpawnActor(ADefaultVehicleSpawnPoint::StaticClass(), FTransform(FRotator(0, Yaw, 0), CentrePoints[0] + FVector(0, 0, TrackElevation) + GetActorLocation()));
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::UpdateActorsFactory(); Can't find ActorFactory Actor"));
+	}
+	*/
+}
+
+void ATrackBuilder::GenerateStartLine()
+{
+	ClearStartLine();
+
+	if (!bJSONLoaded)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ATrackBuilder::GenerateStartLine(); JSON isn't loaded"));
+		return;
+	}
+
+	FPolyline InsidePolyline(InsidePoints, true, TrackElevation);
+	FPolyline OutsidePolyline(OutsidePoints, true, TrackElevation);
+	FPolyline CentrePolyline(CentrePoints, true, TrackElevation);
+
+	FVector CenterPoint = CentrePolyline.GetPointByLength(StartLineOffset);
+	FPolylineVertex InsidePoint;
+	FPolylineVertex OutsidePoint;
+	InsidePolyline.ClosestPoint(CenterPoint, InsidePoint);
+	OutsidePolyline.ClosestPoint(CenterPoint, OutsidePoint);
+	float Length = (InsidePoint.Pos - OutsidePoint.Pos).Size() + BorderWidth * 2 + 20; // Addition 0.2m
+	float Yaw = (InsidePoint.Pos - OutsidePoint.Pos).HeadingAngle() / M_PI * 180;
+
+	StartLineDecal = NewObject<UDecalComponent>(this);
+	StartLineDecal->SetupAttachment(RootComponent);
+	StartLineDecal->SetDecalMaterial(DecalMaterial);
+	StartLineDecal->SetRelativeLocation(CentrePolyline.GetPointByLength(StartLineOffset));
+	StartLineDecal->SetRelativeRotation(FRotator(-90, Yaw, 0));
+	StartLineDecal->DecalSize = FVector(30, StartLineWidth, Length) / 2.0;
+	StartLineDecal->RegisterComponent();
+}
+
+void ATrackBuilder::ClearStartLine()
+{
+	if (IsValid(StartLineDecal))
+	{
+		StartLineDecal->DestroyComponent();
+		StartLineDecal = nullptr;
+	}
+}
+
+const FSodaActorDescriptor* ATrackBuilder::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("Track Builder"), /*DisplayName*/
+		TEXT("Tools"), /*Category*/
+		TEXT("Experimental"), /*SubCategory*/
+		TEXT("SodaIcons.RaceTrack"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/V2VBox.cpp b/Source/UnrealSoda/Private/Actors/V2VBox.cpp
new file mode 100644
index 0000000..a97bb8b
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/V2VBox.cpp
@@ -0,0 +1,70 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/V2VBox.h"
+#include "Soda/UnrealSoda.h"
+#include "Components/BoxComponent.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Engine/Texture2D.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h"
+
+AV2VBox::AV2VBox()
+{
+	PrimaryActorTick.bCanEverTick = true;
+
+	ConstructorHelpers::FObjectFinderOptional<UTexture2D> IconTextureObject(TEXT("/SodaSim/Assets/CPP/ActorSprites/S_TriggerBox"));
+
+	SpriteComponent = CreateDefaultSubobject<UBillboardComponent>(TEXT("SpriteComponent"));
+	SpriteComponent->Sprite = IconTextureObject.Get();
+	SpriteComponent->Mobility = EComponentMobility::Movable;
+	SpriteComponent->SetHiddenInGame(false);
+	SpriteComponent->bIsScreenSizeScaled = true;
+	RootComponent = SpriteComponent;
+
+	TriggerVolume = CreateDefaultSubobject< UBoxComponent >(TEXT("TriggerVolume"));
+	TriggerVolume->SetupAttachment(RootComponent);
+	TriggerVolume->SetHiddenInGame(false);
+	//TriggerVolume->SetCollisionObjectType(ECollisionChannel::ECC_WorldStatic);
+	//TriggerVolume->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	//TriggerVolume->SetCollisionResponseToChannel(ECollisionChannel::ECC_Visibility, ECollisionResponse::ECR_Overlap);
+	//TriggerVolume->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	//TriggerVolume->CanCharacterStepUpOn = ECanBeCharacterBase::ECB_No;
+	//TriggerVolume->SetGenerateOverlapEvents(true);
+	TriggerVolume->InitBoxExtent(Extent);
+	//TriggerVolume->SetMobility(EComponentMobility::Movable);
+
+	V2VTransmitter = CreateDefaultSubobject<UV2VTransmitterComponent>(TEXT("V2VTransmitter"));
+	V2VTransmitter->SetupAttachment(RootComponent);
+}
+
+void AV2VBox::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	ISodaActor::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	FProperty* MemberProperty = PropertyChangedEvent.PropertyChain.GetHead()->GetValue();
+	if (MemberProperty && MemberProperty->GetFName() == GET_MEMBER_NAME_CHECKED(AV2VBox, Extent))
+	{
+		TriggerVolume->SetBoxExtent(Extent);
+	}
+}
+
+void AV2VBox::BeginPlay()
+{
+	Super::BeginPlay();
+
+	TriggerVolume->SetBoxExtent(Extent);
+}
+
+const FSodaActorDescriptor* AV2VBox::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("V2V Box"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT("Experimental"), /*SubCategory*/
+		TEXT("Icons.Box"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
diff --git a/Source/UnrealSoda/Private/Actors/V2XViewer.cpp b/Source/UnrealSoda/Private/Actors/V2XViewer.cpp
new file mode 100644
index 0000000..01ab2d3
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/V2XViewer.cpp
@@ -0,0 +1,302 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/V2XViewer.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Misc/CString.h"
+#include "Soda/Misc/SodaPhysicsInterface.h"
+#include "Materials/MaterialInterface.h"
+#include "DrawDebugHelpers.h"
+#include "Components/InstancedStaticMeshComponent.h"
+#include "Soda/LevelState.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Materials/Material.h"
+#include "Materials/MaterialInterface.h"
+#include "Engine/StaticMesh.h"
+
+#if PLATFORM_LINUX
+#include "BSDSockets/SocketsBSD.h"
+#	ifndef SO_REUSEPORT 
+#		define SO_REUSEPORT	15
+#	endif
+#endif
+
+AV2XViewer::AV2XViewer()
+{
+	BoxStaticMeshesObstacle = CreateDefaultSubobject< UInstancedStaticMeshComponent >(TEXT("BoxStaticMeshesObstacle"));
+	BoxStaticMeshesCollectable = CreateDefaultSubobject< UInstancedStaticMeshComponent >(TEXT("BoxStaticMeshesCollectable"));
+	BoxStaticMeshesUndef = CreateDefaultSubobject< UInstancedStaticMeshComponent >(TEXT("BoxStaticMeshesUndef"));
+
+	static ConstructorHelpers::FObjectFinder< UStaticMesh > CubeMeshAsset(TEXT("/Engine/BasicShapes/Cube"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > BoxObstacleMatAsset(TEXT("/SodaSim/Assets/CPP/V2X/BoxObstacleMat"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > BoxCollectableMatAsset(TEXT("/SodaSim/Assets/CPP/V2X/BoxCollectableMat"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > BoxUndefMatAsset(TEXT("/SodaSim/Assets/CPP/V2X/BoxUndefMat"));
+
+	if (CubeMeshAsset.Succeeded())
+	{
+		BoxStaticMeshesObstacle->SetStaticMesh(CubeMeshAsset.Object);
+		BoxStaticMeshesCollectable->SetStaticMesh(CubeMeshAsset.Object);
+		BoxStaticMeshesUndef->SetStaticMesh(CubeMeshAsset.Object);
+	}
+	if (BoxObstacleMatAsset.Succeeded())
+	{
+		BoxStaticMeshesObstacle->SetMaterial(0, BoxObstacleMatAsset.Object);
+	}
+	if (BoxCollectableMatAsset.Succeeded())
+	{
+		BoxStaticMeshesCollectable->SetMaterial(0, BoxCollectableMatAsset.Object);
+	}
+	if (BoxUndefMatAsset.Succeeded())
+	{
+		BoxStaticMeshesUndef->SetMaterial(0, BoxUndefMatAsset.Object);
+	}
+
+	BoxStaticMeshesObstacle->SetSimulatePhysics(false);
+	BoxStaticMeshesObstacle->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	BoxStaticMeshesObstacle->SetCollisionEnabled(ECollisionEnabled::NoCollision);
+
+	BoxStaticMeshesCollectable->SetSimulatePhysics(false);
+	BoxStaticMeshesCollectable->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	BoxStaticMeshesCollectable->SetCollisionEnabled(ECollisionEnabled::NoCollision);
+
+	BoxStaticMeshesUndef->SetSimulatePhysics(false);
+	BoxStaticMeshesUndef->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	BoxStaticMeshesUndef->SetCollisionEnabled(ECollisionEnabled::NoCollision);
+
+
+	PrimaryActorTick.bCanEverTick = true;
+	PrimaryActorTick.bTickEvenWhenPaused = false;
+	Shift = FVector(0, 0, 20.f);
+}
+
+
+void AV2XViewer::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if(bUseCustomRefPoint)
+	{
+		ALevelState::GetChecked()->GetLLConverter().LLA2UE(OrignShift, Longitude, Latitude, Altitude);
+	}
+
+	FIPv4Endpoint Endpoint(FIPv4Address(0, 0, 0, 0), Port);
+
+	ListenSocket = FUdpSocketBuilder(TEXT("V2XViewer"))
+					   .AsNonBlocking()
+					   .AsReusable()
+					   .BoundToEndpoint(Endpoint)
+					   .WithReceiveBufferSize(0xFFFF);
+
+	if(ListenSocket)
+	{
+#if PLATFORM_LINUX
+		SOCKET RawSocket = ((FSocketBSD*)ListenSocket)->GetNativeSocket();
+		int Param = 1;
+		if(setsockopt(RawSocket, SOL_SOCKET, SO_REUSEPORT, (char*)&Param, sizeof(Param)) != 0)
+		{
+			UE_LOG(LogSoda, Warning, TEXT("AV2XViewer::BeginPlay(). Can't setsockopt(SO_REUSEPORT)"));	
+		}
+#endif
+		FTimespan ThreadWaitTime = FTimespan::FromMilliseconds(100);
+		UDPReceiver = new FUdpSocketReceiver(ListenSocket, ThreadWaitTime, TEXT("V2XViewer"));
+		UDPReceiver->OnDataReceived().BindUObject(this, &AV2XViewer::Recv);
+		UDPReceiver->Start();
+		UE_LOG(LogSoda, Log, TEXT("Start V2X Viwer on port: %i, shift: %s"), Port, *OrignShift.ToString());
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("AV2XViewer::BeginPlay(). Can't create socket"));
+	}
+}
+
+void AV2XViewer::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	if (UDPReceiver)
+	{
+		UDPReceiver->Stop();
+		delete UDPReceiver;
+	}
+
+	if (ListenSocket)
+	{
+		delete ListenSocket;
+	}
+}
+
+void AV2XViewer::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+
+	TTimestamp Timestamp = SodaApp.GetRealtimeTimestamp();
+
+	Mutex.lock();
+
+	static const std::chrono::milliseconds Timeout(1000);
+
+	for(auto It = V2XObjects.CreateIterator(); It; ++It)
+	{
+		if(Timestamp - It->Value.Timestamp > Timeout)
+		{
+			It.RemoveCurrent();
+		}
+	}
+
+	BatchStart.SetNum(0, false);
+	BatchEnd.SetNum(0, false);
+
+	for(auto & Obj : V2XObjects)
+	{
+		if(!Obj.Value.Traced)
+		{
+			BatchStart.Add(FVector(Obj.Value.Pos.X, Obj.Value.Pos.Y, +100000.f));
+			BatchEnd.Add(FVector(Obj.Value.Pos.X, Obj.Value.Pos.Y, -100000.f));
+		}
+	}
+	
+	TArray<FHitResult> OutHits;
+	FSodaPhysicsInterface::RaycastSingleScope(
+		GetWorld(), OutHits, BatchStart, BatchEnd,
+		ECollisionChannel::ECC_WorldStatic,
+		FCollisionQueryParams(NAME_None, false),
+		FCollisionResponseParams::DefaultResponseParam,
+		FCollisionObjectQueryParams::DefaultObjectQueryParam);
+	check(OutHits.Num() == BatchStart.Num());
+
+	int RaysNum = 0;
+	int ObstacleNum = 0, CollectableNum = 0, UndefNum = 0;
+	for(auto & Obj : V2XObjects)
+	{
+		if(!Obj.Value.Traced)
+		{
+			Obj.Value.TracedValid = false;
+			auto& Hit = OutHits[RaysNum];
+			if (Hit.bBlockingHit)
+			{
+				Obj.Value.Pos.Z  = -FLT_MAX;
+				if (Hit.GetActor())
+				{
+					Obj.Value.Pos.Z = std::max(Obj.Value.Pos.Z, Hit.Location.Z);
+					Obj.Value.TracedValid = true;
+				}
+			}
+
+			Obj.Value.Traced = true;
+			++RaysNum;
+		}
+
+		if (Obj.Value.TracedValid)
+		{
+			FTransform Transform(
+				Obj.Value.Rot.Quaternion(),
+				Obj.Value.Pos + FVector(0.f, 0.f, Obj.Value.Extent.Z) + Shift,
+				Obj.Value.Extent / 100);
+			
+			if (Obj.Value.Data.object_type & (uint32_t)soda::V2XRenderObjectType::OBSTACLE)
+			{
+				++ObstacleNum;
+				if (BoxStaticMeshesObstacle->GetInstanceCount() < ObstacleNum)
+				{
+					BoxStaticMeshesObstacle->AddInstanceWorldSpace(FTransform());
+				}
+				BoxStaticMeshesObstacle->UpdateInstanceTransform(ObstacleNum - 1, Transform, true, false, true);
+			}
+			else if (Obj.Value.Data.object_type & (uint32_t)soda::V2XRenderObjectType::COLLECTABLE)
+			{
+				++CollectableNum;
+				if (BoxStaticMeshesCollectable->GetInstanceCount() < CollectableNum)
+				{
+					BoxStaticMeshesCollectable->AddInstanceWorldSpace(FTransform());
+				}
+				BoxStaticMeshesCollectable->UpdateInstanceTransform(CollectableNum - 1, Transform, true, false, true);
+			}
+			else
+			{
+				++UndefNum;
+				if (BoxStaticMeshesUndef->GetInstanceCount() < UndefNum)
+				{
+					BoxStaticMeshesUndef->AddInstanceWorldSpace(FTransform());
+				}
+				BoxStaticMeshesUndef->UpdateInstanceTransform(UndefNum - 1, Transform, true, false, true);
+			}
+		}
+	
+		if(bShowLog)
+			UE_LOG(LogSoda, Warning, TEXT("V2X ID: %i; TracedValid: %i; Pos: %s; Extent: %s; Yaw %f"), 
+				Obj.Key, Obj.Value.TracedValid, *Obj.Value.Pos.ToString(), *Obj.Value.Extent.ToString(), Obj.Value.Rot.Yaw);
+	}
+
+	Mutex.unlock();
+
+
+	int Diff = BoxStaticMeshesObstacle->GetInstanceCount() - ObstacleNum;
+	for (int i = 0; i < Diff; ++i)
+	{
+		BoxStaticMeshesObstacle->RemoveInstance(BoxStaticMeshesObstacle->GetInstanceCount() - 1);
+	}
+	Diff = BoxStaticMeshesCollectable->GetInstanceCount() - CollectableNum;
+	for (int i = 0; i < Diff; ++i)
+	{
+		BoxStaticMeshesCollectable->RemoveInstance(BoxStaticMeshesCollectable->GetInstanceCount() - 1);
+	}
+	Diff = BoxStaticMeshesUndef->GetInstanceCount() - UndefNum;
+	for (int i = 0; i < Diff; ++i)
+	{
+		BoxStaticMeshesUndef->RemoveInstance(BoxStaticMeshesUndef->GetInstanceCount() - 1);
+	}
+
+	BoxStaticMeshesObstacle->MarkRenderStateDirty();
+	BoxStaticMeshesCollectable->MarkRenderStateDirty();
+	BoxStaticMeshesUndef->MarkRenderStateDirty();
+
+}
+
+void AV2XViewer::Recv(const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt)
+{
+	if(ArrayReaderPtr->Num() != sizeof(soda::V2XRenderObject))
+	{
+		UE_LOG(LogSoda, Error, TEXT("AV2XViewer::Recv(); Protocol error, recve %d bytes, was expected %d bytes"), ArrayReaderPtr->Num(), sizeof(soda::V2XRenderObject));
+		return;
+	}
+
+	soda::V2XRenderObject GenericObject;
+	::memcpy(&GenericObject, ArrayReaderPtr->GetData(), sizeof(soda::V2XRenderObject));
+
+	//if(!(GenericObject.tags & (uint32_t)soda::V2XRenderObjectTag::VIRTUAL_OBJECT)) return;
+	
+	Mutex.lock();
+	FV2XObject & V2XObject = V2XObjects.FindOrAdd(GenericObject.object_id);
+	V2XObject.Data = GenericObject;
+	V2XObject.Timestamp = SodaApp.GetRealtimeTimestamp();
+	V2XObject.Extent = FVector(GenericObject.length * 100.f, GenericObject.width * 100.f, GenericObject.height * 100.f);
+	V2XObject.Rot = FRotator(0.f, -GenericObject.yaw_angle / M_PI * 180.f, 0.f);
+	V2XObject.Pos.X = -GenericObject.east * 100.f;
+	V2XObject.Pos.Y = GenericObject.north * 100.f;
+	if(!V2XObject.Traced) V2XObject.Pos.Z = GenericObject.up * 100.f;
+	if(bUseCustomRefPoint) 
+	{
+		V2XObject.Pos.X += OrignShift.X;
+		V2XObject.Pos.Y += OrignShift.Y;
+		if(!V2XObject.Traced) V2XObject.Pos.Z += OrignShift.Z;
+	}
+	if(bUseDefaultHeight)
+	{
+		V2XObject.Extent.Z = DefaultHeight;
+	}
+	Mutex.unlock();
+}
+
+const FSodaActorDescriptor* AV2XViewer::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc{
+		TEXT("V2X Viewer"), /*DisplayName*/
+		TEXT("Tools"), /*Category*/
+		TEXT("Experimental"), /*SubCategory*/
+		TEXT("Icons.Box"), /*Icon*/
+		false, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Actors/WeatherSystem.cpp b/Source/UnrealSoda/Private/Actors/WeatherSystem.cpp
new file mode 100644
index 0000000..38ce088
--- /dev/null
+++ b/Source/UnrealSoda/Private/Actors/WeatherSystem.cpp
@@ -0,0 +1,107 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Actors/WeatherSystem.h"
+#include "Soda/UnrealSoda.h"
+#include "Components/ExponentialHeightFogComponent.h"
+#include "Components/SkyLightComponent.h"
+#include "Components/VolumetricCloudComponent.h"
+#include "Components/StaticMeshComponent.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Materials/MaterialInterface.h"
+#include "Misc/OutputDeviceNull.h"
+#include "UObject/UObjectIterator.h"
+
+AWeatherSystem::AWeatherSystem()
+{
+}
+
+void AWeatherSystem::PreInitializeComponents()
+{
+	Super::PreInitializeComponents();
+}
+
+
+void AWeatherSystem::BeginPlay()
+{
+	Super::BeginPlay();
+	UpdateWeather();
+}
+
+void AWeatherSystem::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if(Ar.IsLoading() && Ar.IsSaveGame() && HasActorBegunPlay())
+	if (Ar.IsLoading())
+	{
+		UpdateWeather();
+	}
+}
+
+void AWeatherSystem::UpdateWeather()
+{
+	if (Sun)
+	{
+		float SunAngle = FMath::Clamp(DayTime / 24.f, 0.f, 1.f) * 360.f + 90.f;
+		FRotator Rotator(SunAngle, 0.f, 0.f);
+		Sun->SetActorRotation(Rotator);
+	}
+	for (TObjectIterator<AActor> Itr; Itr; ++Itr)
+	{
+		if (Itr->IsA(FogClass))
+		{
+			AActor* FogActor = *Itr;
+			if (FogActor->GetParentActor() && FogActor->GetParentActor()->IsA(RoadPlannerClass))
+			{
+				FogActor->SetActorHiddenInGame(!RoadsFog);
+			}
+			else
+			{
+				FogActor->SetActorHiddenInGame(!LocalFog);
+			}
+		}
+	}
+	if (ExponentialHeightFog)
+	{
+		OverallMistDensity = FMath::Clamp(OverallMistDensity, 0.01f, 100.f);
+		ExponentialHeightFog->GetComponent()->SetFogDensity(OverallMistDensity * 0.01f);
+	}
+	if (VolumetricClouds)
+	{
+		VolumetricClouds->SetActorHiddenInGame(!EnableVolumetricClouds);
+		if (!CloudsDynamicMaterial)
+		{
+			if (UVolumetricCloudComponent* VolumetricCloudComponent = VolumetricClouds->FindComponentByClass<UVolumetricCloudComponent>())
+			{
+				CloudsDynamicMaterial = UMaterialInstanceDynamic::Create(VolumetricCloudComponent->Material, VolumetricCloudComponent);
+				VolumetricCloudComponent->SetMaterial(CloudsDynamicMaterial);
+			}
+		}
+		if (CloudsDynamicMaterial)
+		{
+			VolumetricCloudsDencity = FMath::Clamp(VolumetricCloudsDencity, 0.f, 100.f);
+			VolumetricCloudsLayout = FMath::Clamp(VolumetricCloudsLayout, 1.f, 5.f);
+			CloudsDynamicMaterial->SetScalarParameterValue(TEXT("ExtinctionScale"), VolumetricCloudsDencity * 0.0002f);
+			CloudsDynamicMaterial->SetScalarParameterValue(TEXT("WeatherUVScale"), VolumetricCloudsLayout * 0.0001);
+		}
+	}
+	if (SkyLight)
+	{
+		SkyLight->GetLightComponent()->RecaptureSky();
+	}
+}
+
+
+const FSodaActorDescriptor* AWeatherSystem::GenerateActorDescriptor() const
+{
+	static FSodaActorDescriptor Desc {
+		TEXT("Weather System"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT("Experimental"), /*SubCategory*/
+		TEXT("SodaIcons.Weather"), /*Icon*/
+		false, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 0), /*SpawnOffset*/
+	};
+	return &Desc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Customization/SPropertyMenuSubobjectPicker.cpp b/Source/UnrealSoda/Private/Customization/SPropertyMenuSubobjectPicker.cpp
new file mode 100644
index 0000000..a048202
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SPropertyMenuSubobjectPicker.cpp
@@ -0,0 +1,294 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SPropertyMenuSubobjectPicker.h"
+#include "Modules/ModuleManager.h"
+#include "Textures/SlateIcon.h"
+#include "Framework/Commands/UIAction.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Views/STableRow.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Views/SListView.h"
+#include "Widgets/Views/SHeaderRow.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "SodaStyleSet.h"
+#include "GameFramework/Actor.h"
+#include "AssetRegistry/AssetData.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "HAL/PlatformApplicationMisc.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "Soda/ISodaVehicleComponent.h"
+
+#define LOCTEXT_NAMESPACE "PropertyEditor"
+
+namespace soda
+{
+
+static const FName Column_Name("Name");
+static const FName Column_Class("Class");
+
+
+class SSubobjectRow : public SMultiColumnTableRow<TWeakObjectPtr<UObject>>
+{
+public:
+	SLATE_BEGIN_ARGS(SSubobjectRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UObject> InSubobject)
+	{
+		Subobject = InSubobject;
+
+		if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(InSubobject.Get()))
+		{
+			Icon = VehicleComponent->GetVehicleComponentGUI().IcanName;
+		}
+
+		FSuperRowType::FArguments OutArgs;
+		//OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+		SMultiColumnTableRow<TWeakObjectPtr<UObject>>::Construct(OutArgs, InOwnerTable);
+
+	}
+
+	virtual TSharedRef<SWidget> GenerateWidgetForColumn(const FName& InColumnName) override
+	{
+
+		if (InColumnName == Column_Name)
+		{
+			return
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(5, 1, 1, 1)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SImage)
+					.Image(FSodaStyle::GetBrush(Icon))
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(5, 1, 1, 1)
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(Subobject->GetName()))
+				];
+		}
+
+		if (InColumnName == Column_Class)
+		{
+			return SNew(SBox)
+				.Padding(FMargin(5, 1, 1, 1))
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(Subobject->GetClass()->GetName()))
+				];
+		}
+
+		return SNullWidget::NullWidget;
+	}
+
+protected:
+	TWeakObjectPtr<UObject> Subobject;
+	FName Icon = TEXT("ClassIcon.Actor");
+};
+
+
+void SPropertyMenuSubobjectPicker::Construct(const FArguments& InArgs)
+{
+	OwnedActor = InArgs._OwnedActor;
+	InitialSubobject = InArgs._InitialSubobject;
+	bAllowClear = InArgs._AllowClear;
+	SubobjectFilter = InArgs._SubobjectFilter;
+	OnSet = InArgs._OnSet;
+	OnClose = InArgs._OnClose;
+
+	FMenuBuilder MenuBuilder(true, NULL);
+
+	MenuBuilder.BeginSection(NAME_None, LOCTEXT("CurrentSubobjectOperationsHeader", "Current Subobject"));
+	{
+		if (InitialSubobject.IsValid())
+		{
+			MenuBuilder.AddMenuEntry(
+				LOCTEXT("EditSubobject", "Edit"),
+				LOCTEXT("EditSubobject_Tooltip", "Edit this Subobject"),
+				FSlateIcon(),
+				FUIAction(FExecuteAction::CreateSP(this, &SPropertyMenuSubobjectPicker::OnEdit)));
+		}
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("CopySubobject", "Copy"),
+			LOCTEXT("CopySubobject_Tooltip", "Copies the Subobject to the clipboard"),
+			FSlateIcon(),
+			FUIAction(FExecuteAction::CreateSP(this, &SPropertyMenuSubobjectPicker::OnCopy))
+			);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("PasteSubobject", "Paste"),
+			LOCTEXT("PasteSubobject_Tooltip", "Pastes an Subobject from the clipboard to this field"),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SPropertyMenuSubobjectPicker::OnPaste),
+				FCanExecuteAction::CreateSP(this, &SPropertyMenuSubobjectPicker::CanPaste))
+			);
+
+		if (bAllowClear)
+		{
+			MenuBuilder.AddMenuEntry(
+				LOCTEXT("ClearSubobject", "Clear"),
+				LOCTEXT("ClearSubobject_ToolTip", "Clears the Subobject set on this field"),
+				FSlateIcon(),
+				FUIAction(FExecuteAction::CreateSP(this, &SPropertyMenuSubobjectPicker::OnClear))
+			);
+		}
+	}
+
+	MenuBuilder.BeginSection(NAME_None, LOCTEXT("BrowseHeader", "Browse"));
+	{
+		TSharedPtr<SWidget> MenuContent;
+
+		ForEachObjectWithOuter(OwnedActor.Get(), [this](UObject* Object)
+		{
+			if(SubobjectFilter.IsBound())
+			{
+				if (!SubobjectFilter.Execute(Object)) return;
+			}
+			Source.Add(Object);
+		}, true);
+
+		MenuContent =
+			SNew(SBox)
+			.WidthOverride(350.0f)
+			.HeightOverride(300.0f)
+			[
+				SNew(SBorder)
+				.BorderImage(FAppStyle::GetBrush("Menu.Background"))
+				[
+					SNew(SListView<TWeakObjectPtr<UObject>>)
+					.SelectionMode(ESelectionMode::Single)
+					.ListItemsSource(&Source)
+					.OnGenerateRow(this, &SPropertyMenuSubobjectPicker::MakeRowWidget)
+					.OnSelectionChanged(this, &SPropertyMenuSubobjectPicker::OnItemSelected)
+					.HeaderRow(
+						SNew(SHeaderRow)
+						+ SHeaderRow::Column(Column_Name)
+						.DefaultLabel(FText::FromString("Name"))
+						+ SHeaderRow::Column(Column_Class)
+						.DefaultLabel(FText::FromString("Class"))
+					)
+				]
+			];
+
+		MenuBuilder.AddWidget(MenuContent.ToSharedRef(), FText::GetEmpty(), true);
+
+	}
+	MenuBuilder.EndSection();
+
+	ChildSlot
+	[
+		MenuBuilder.MakeWidget()
+	];
+}
+
+void SPropertyMenuSubobjectPicker::OnEdit()
+{
+	if (InitialSubobject.IsValid())
+	{
+		//GEditor->EditObject(InitialSubobject);
+	}
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuSubobjectPicker::OnCopy()
+{
+	if (InitialSubobject.IsValid())
+	{
+		FPlatformApplicationMisc::ClipboardCopy(*FString::Printf(TEXT("%s %s"), *InitialSubobject->GetClass()->GetPathName(), *InitialSubobject->GetPathName()));
+	}
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuSubobjectPicker::OnPaste()
+{
+	FString ClipboardText;
+	FPlatformApplicationMisc::ClipboardPaste(ClipboardText);
+
+	bool bFound = false;
+
+	int32 SpaceIndex = INDEX_NONE;
+	if (ClipboardText.FindChar(TEXT(' '), SpaceIndex))
+	{
+		FString ClassPath = ClipboardText.Left(SpaceIndex);
+		FString PossibleObjectPath = ClipboardText.Mid(SpaceIndex);
+
+		if (UClass* ClassPtr = LoadClass<UObject>(nullptr, *ClassPath))
+		{
+			UObject* Subobject = FindObject<UObject>(nullptr, *PossibleObjectPath);
+			if (Subobject && Subobject->IsA(ClassPtr) && FEditorUtils::FindOuterActor(Subobject) && (!SubobjectFilter.IsBound() || SubobjectFilter.Execute(Subobject)))
+			{
+				SetValue(Subobject);
+				bFound = true;
+			}
+		}
+	}
+
+	if (!bFound)
+	{
+		SetValue(nullptr);
+	}
+
+	OnClose.ExecuteIfBound();
+}
+
+bool SPropertyMenuSubobjectPicker::CanPaste()
+{
+	FString ClipboardText;
+	FPlatformApplicationMisc::ClipboardPaste(ClipboardText);
+
+	bool bCanPaste = false;
+
+	int32 SpaceIndex = INDEX_NONE;
+	if (ClipboardText.FindChar(TEXT(' '), SpaceIndex))
+	{
+		FString Class = ClipboardText.Left(SpaceIndex);
+		FString PossibleObjectPath = ClipboardText.Mid(SpaceIndex);
+
+		bCanPaste = !Class.IsEmpty() && !PossibleObjectPath.IsEmpty();
+		if (bCanPaste)
+		{
+			bCanPaste = LoadClass<UObject>(nullptr, *Class) != nullptr;
+		}
+		if (bCanPaste)
+		{
+			bCanPaste = FindObject<UObject>(nullptr, *PossibleObjectPath) != nullptr;
+		}
+	}
+
+	return bCanPaste;
+}
+
+void SPropertyMenuSubobjectPicker::OnClear()
+{
+	SetValue(nullptr);
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuSubobjectPicker::OnItemSelected(TWeakObjectPtr<UObject> Subobject, ESelectInfo::Type SelectInfo)
+{
+	SetValue(Subobject.Get());
+	OnClose.ExecuteIfBound();
+}
+
+void SPropertyMenuSubobjectPicker::SetValue(UObject* Subobject)
+{
+	OnSet.ExecuteIfBound(Subobject);
+}
+
+TSharedRef< ITableRow > SPropertyMenuSubobjectPicker::MakeRowWidget(TWeakObjectPtr<UObject> Subobject, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return SNew(SSubobjectRow, OwnerTable, Subobject);
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/Customization/SPropertyMenuSubobjectPicker.h b/Source/UnrealSoda/Private/Customization/SPropertyMenuSubobjectPicker.h
new file mode 100644
index 0000000..1f5abb4
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SPropertyMenuSubobjectPicker.h
@@ -0,0 +1,105 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+
+
+/*
+namespace SceneOutliner
+{
+	struct ISceneOutlinerTreeItem;
+}
+*/
+
+namespace soda
+{
+
+DECLARE_DELEGATE_OneParam(FOnSubobjectSelected, const UObject* /*Subobject*/);
+DECLARE_DELEGATE_RetVal_OneParam(bool, FOnShouldFilterSubobject, const UObject* /*Subobject*/);
+
+class SPropertyMenuSubobjectPicker : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SPropertyMenuSubobjectPicker)
+		: _OwnedActor(nullptr)
+		, _InitialSubobject(nullptr)
+		, _AllowClear(true)
+	{}
+		SLATE_ARGUMENT(AActor*, OwnedActor)
+		SLATE_ARGUMENT(UObject*, InitialSubobject)
+		SLATE_ARGUMENT(bool, AllowClear)
+		SLATE_ARGUMENT(FOnShouldFilterSubobject, SubobjectFilter)
+		SLATE_EVENT(FOnSubobjectSelected, OnSet)
+		SLATE_EVENT(FSimpleDelegate, OnClose)
+	SLATE_END_ARGS()
+
+	/**
+	 * Construct the widget.
+	 * @param	InArgs				Arguments for widget construction
+	 * @param	InPropertyHandle	The property handle that this widget will operate on.
+	 */
+	void Construct(const FArguments& InArgs);
+
+private:
+	/**
+	 * Edit the object referenced by this widget
+	 */
+	void OnEdit();
+
+	/**
+	 * Delegate handling ctrl+c
+	 */
+	void OnCopy();
+
+	/**
+	 * Delegate handling ctrl+v
+	 */
+	void OnPaste();
+
+	/**
+	 * @return True of the current clipboard contents can be pasted
+	 */
+	bool CanPaste();
+
+	/**
+	 * Clear the referenced object
+	 */
+	void OnClear();
+
+	/**
+	 * Delegate for handling selection by the actor picker.
+	 */
+	void OnItemSelected(TWeakObjectPtr<UObject> Subobject, ESelectInfo::Type SelectInfo);
+
+	/**
+	 * Set the value of the asset referenced by this property editor.
+	 * Will set the underlying property handle if there is one.
+	 * @param	InObject	The object to set the reference to
+	 */
+	void SetValue(UObject* Subobject);
+
+	TSharedRef< ITableRow > MakeRowWidget(TWeakObjectPtr<UObject> Subobject, const TSharedRef< STableViewBase >& OwnerTable);
+
+
+private:
+	TWeakObjectPtr<AActor> OwnedActor;
+	TWeakObjectPtr<UObject> InitialSubobject;
+	TArray<TWeakObjectPtr<UObject>> Source;
+
+	/** Whether the asset can be 'None' in this case */
+	bool bAllowClear;
+
+	/** Delegate used to test whether a item should be displayed or not */
+	FOnShouldFilterSubobject SubobjectFilter;
+
+	/** Delegate to call when our object value should be set */
+	FOnSubobjectSelected OnSet;
+
+	/** Delegate for closing the containing menu */
+	FSimpleDelegate OnClose;
+};
+
+} // namespace soda
diff --git a/Source/UnrealSoda/Private/Customization/SoftSodaActorPtrCustomization.cpp b/Source/UnrealSoda/Private/Customization/SoftSodaActorPtrCustomization.cpp
new file mode 100644
index 0000000..538d178
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SoftSodaActorPtrCustomization.cpp
@@ -0,0 +1,311 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SoftSodaActorPtrCustomization.h"
+#include "Containers/UnrealString.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/IDetailChildrenBuilder.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "HAL/PlatformCrt.h"
+#include "UObject/Object.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Layout/SWidgetSwitcher.h"
+#include "RuntimeEditorUtils.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/UI/SActorList.h"
+#include "Soda/SodaGameViewportClient.h"
+
+class IDetailChildrenBuilder;
+class UClass;
+
+
+namespace soda
+{
+
+void FSoftSodaActorPtrCustomization::CustomizeHeader( TSharedRef<IPropertyHandle> InPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils )
+{
+	PropertyHandle = InPropertyHandle;
+
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	check(GameMode);
+	
+	CachedActor.Reset();
+	CachedPropertyAccess = FPropertyAccess::Fail;
+
+	FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(InPropertyHandle->GetProperty());
+	check(ObjectProperty);
+	MetaClass = ObjectProperty->PropertyClass;
+	check(MetaClass);
+
+	BuildComboBox();
+
+	InPropertyHandle->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(this, &FSoftSodaActorPtrCustomization::OnPropertyValueChanged));
+
+	UObject * TmpObject;
+	CachedPropertyAccess = GetValue(TmpObject);
+	if (CachedPropertyAccess == FPropertyAccess::Success)
+	{
+		CachedActor = Cast<AActor>(TmpObject);
+		if (CachedActor.IsValid())
+		{
+			CachedActorDesc = GameMode->GetSodaActorDescriptor(CachedActor->GetClass());
+		}
+	}
+
+	HeaderRow
+	.NameContent()
+	[
+		PropertyHandle->CreatePropertyNameWidget()
+	]
+	.ValueContent()
+	[
+		SubobjectComboButton.ToSharedRef()
+	];
+}
+
+void FSoftSodaActorPtrCustomization::CustomizeChildren(TSharedRef<IPropertyHandle> InStructPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils)
+{
+}
+
+void FSoftSodaActorPtrCustomization::SetValue(const UObject* Value)
+{
+	SubobjectComboButton->SetIsOpen(false);
+	ensure(PropertyHandle->SetValue(Value) == FPropertyAccess::Result::Success);
+}
+
+FPropertyAccess::Result FSoftSodaActorPtrCustomization::GetValue(UObject*& OutValue) const
+{
+	// Potentially accessing the value while garbage collecting or saving the package could trigger a crash.
+	// so we fail to get the value when that is occurring.
+	if (GIsSavingPackage || IsGarbageCollecting())
+	{
+		return FPropertyAccess::Fail;
+	}
+
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	
+	UObject* Object = nullptr;
+	Result = PropertyHandle->GetValue(Object);
+
+	if (Object == nullptr)
+	{
+		// Check to see if it's pointing to an unloaded object
+		FString CurrentObjectPath;
+		FSoftObjectPath SoftObjectPath;
+		PropertyHandle->GetValueAsFormattedString(CurrentObjectPath);
+		if (CurrentObjectPath.Len() > 0 && CurrentObjectPath != TEXT("None"))
+		{
+			if (SoftObjectPath.IsAsset())
+			{
+				Result = FPropertyAccess::Fail;
+			}
+			else
+			{
+				Object = SoftObjectPath.ResolveObject(); // TODO: OutValue can be UObject or FSoftObjectPath
+				if (Object != nullptr)
+				{
+					Result = FPropertyAccess::Success;
+				}
+			}
+		}
+	}
+
+	if (Object == nullptr)
+	{
+		// No property editor was specified so check if multiple property values are associated with the property handle
+		TArray<FString> ObjectValues;
+		PropertyHandle->GetPerObjectValues(ObjectValues);
+
+		if (ObjectValues.Num() > 1)
+		{
+			for (int32 ObjectIndex = 1; ObjectIndex < ObjectValues.Num() && Result == FPropertyAccess::Success; ++ObjectIndex)
+			{
+				if (ObjectValues[ObjectIndex] != ObjectValues[0])
+				{
+					Result = FPropertyAccess::MultipleValues;
+				}
+			}
+		}
+	}
+	
+	OutValue = Object;
+	return Result;
+}
+
+void FSoftSodaActorPtrCustomization::BuildComboBox()
+{
+	/*
+	TAttribute<bool> IsEnabledAttribute(this, &FComponentReferenceCustomization::CanEdit);
+	TAttribute<FText> TooltipAttribute;
+	if (PropertyHandle->GetMetaDataProperty()->HasAnyPropertyFlags(CPF_EditConst | CPF_DisableEditOnTemplate))
+	{
+		TArray<UObject*> ObjectList;
+		PropertyHandle->GetOuterObjects(ObjectList);
+
+		// If there is no objects, that means we must have a struct asset managing this property
+		if (ObjectList.Num() == 0)
+		{
+			IsEnabledAttribute.Set(false);
+			TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplate", "Editing this value in structure's defaults is not allowed"));
+		}
+		else
+		{
+			// Go through all the found objects and see if any are a CDO, we can't set an actor in a CDO default.
+			for (UObject* Obj : ObjectList)
+			{
+				if (Obj->IsTemplate() && !Obj->IsA<ALevelScriptActor>())
+				{
+					IsEnabledAttribute.Set(false);
+					TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplateTooltip", "Editing this value in a Class Default Object is not allowed"));
+					break;
+				}
+
+			}
+		}
+	}
+	*/
+
+
+	SubobjectComboButton = SNew(SComboButton)
+		//.ToolTipText(TooltipAttribute)
+		//.ButtonStyle(FSodaStyle::Get(), "PropertyEditor.AssetComboStyle")
+		//.ForegroundColor(FSodaStyle::GetColor("PropertyEditor.AssetName.ColorAndOpacity"))
+		.OnGetMenuContent(this, &FSoftSodaActorPtrCustomization::OnGetMenuContent)
+		.OnMenuOpenChanged(this, &FSoftSodaActorPtrCustomization::OnMenuOpenChanged)
+		//.IsEnabled(IsEnabledAttribute)
+		//.ContentPadding(2.0f)
+		.ButtonContent()
+		[
+			SNew(SWidgetSwitcher)
+			.WidgetIndex(this, &FSoftSodaActorPtrCustomization::OnGetComboContentWidgetIndex)
+			+ SWidgetSwitcher::Slot()
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(TEXT("<multiple values>")))
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+			]
+			+ SWidgetSwitcher::Slot()
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(0, 0, 2, 0)
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				[
+					SNew(SImage)
+					.Image(this, &FSoftSodaActorPtrCustomization::GetActorIcon)
+				]
+				+ SHorizontalBox::Slot()
+				.FillWidth(1)
+				.VAlign(VAlign_Center)
+				[
+					// Show the name of the asset or actor
+					SNew(STextBlock)
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+					.Text(this, &FSoftSodaActorPtrCustomization::OnGetActorName)
+				]
+			]
+		];
+}
+
+const FSlateBrush* FSoftSodaActorPtrCustomization::GetActorIcon() const
+{
+	if (CachedActor.IsValid())
+	{
+		return FSodaStyle::GetBrush(CachedActorDesc.Icon);
+	}
+	else
+	{
+		return FSodaStyle::GetBrush(TEXT("ClassIcon.Actor"));
+	}
+}
+
+FText FSoftSodaActorPtrCustomization::OnGetActorName() const
+{
+	if (CachedActor.IsValid())
+	{
+		return FText::FromString(CachedActor->GetName());
+	}
+	else
+	{
+		return FText::FromString(TEXT("None"));
+	}
+}
+
+TSharedRef<SWidget> FSoftSodaActorPtrCustomization::OnGetMenuContent()
+{
+	return 
+		SNew(SBorder)
+		.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Header")))
+		.Padding(1)
+		[
+			SNew(SBox)
+			.MinDesiredWidth(200)
+			.MinDesiredHeight(300)
+			[
+				SNew(soda::SActorList, Cast<USodaGameViewportClient>(USodaGameModeComponent::GetChecked()->GetWorld()->GetGameViewport()))
+				.bInteractiveMode(false)
+				.OnSelectionChanged(this, &FSoftSodaActorPtrCustomization::OnActorSelected)
+				.ActorFilter(FOnShouldFilterActor::CreateSP(this, &FSoftSodaActorPtrCustomization::IsFilteredActor))
+			]
+		];
+}
+
+bool FSoftSodaActorPtrCustomization::IsFilteredActor(const AActor* const Actor) const
+{
+	return Actor->IsA(MetaClass);
+}
+
+void FSoftSodaActorPtrCustomization::OnActorSelected(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo)
+{
+	SetValue(Actor.Get());
+	//FSlateApplication::Get().DismissAllMenus();
+}
+
+void FSoftSodaActorPtrCustomization::OnMenuOpenChanged(bool bOpen)
+{
+	if (!bOpen)
+	{
+		SubobjectComboButton->SetMenuContent(SNullWidget::NullWidget);
+	}
+}
+
+int32 FSoftSodaActorPtrCustomization::OnGetComboContentWidgetIndex() const
+{
+	switch (CachedPropertyAccess)
+	{
+	case FPropertyAccess::MultipleValues: return 0;
+	case FPropertyAccess::Success:
+	default:
+		return 1;
+	}
+}
+
+void FSoftSodaActorPtrCustomization::OnPropertyValueChanged()
+{
+	CachedActor.Reset();
+
+	UObject * TmpObject;
+	CachedPropertyAccess = GetValue(TmpObject);
+	if (CachedPropertyAccess == FPropertyAccess::Success)
+	{
+		CachedActor = Cast<AActor>(TmpObject);
+		if (CachedActor.IsValid())
+		{
+			USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+			check(GameMode);
+			CachedActorDesc = GameMode->GetSodaActorDescriptor(CachedActor->GetClass());
+		}
+	}
+}
+
+void FSoftSodaActorPtrCustomization::CloseComboButton()
+{
+	SubobjectComboButton->SetIsOpen(false);
+}
+
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Customization/SoftSodaActorPtrCustomization.h b/Source/UnrealSoda/Private/Customization/SoftSodaActorPtrCustomization.h
new file mode 100644
index 0000000..7b5dac5
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SoftSodaActorPtrCustomization.h
@@ -0,0 +1,58 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "Templates/SharedPointer.h"
+#include "RuntimeEditorModule.h"
+#include "Soda/ISodaActor.h"
+#include "Widgets/Input/SComboButton.h"
+
+namespace soda
+{
+
+class IPropertyHandle;
+
+
+/**
+ * Customizes a soft object path to look like a UObject property
+ */
+class FSoftSodaActorPtrCustomization : public IPropertyTypeCustomization
+{
+public:
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance() 
+	{
+		return MakeShareable( new FSoftSodaActorPtrCustomization);
+	}
+
+	/** IPropertyTypeCustomization interface */
+	virtual void CustomizeHeader( TSharedRef<class IPropertyHandle> InPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils ) override;
+	virtual void CustomizeChildren( TSharedRef<class IPropertyHandle> InPropertyHandle, class IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils ) override;
+
+protected:
+	FPropertyAccess::Result GetValue(UObject *& OutValue) const;
+	void SetValue(const UObject * Value);
+
+	void BuildComboBox();
+
+	const FSlateBrush* GetActorIcon() const;
+	FText OnGetActorName() const;
+	TSharedRef<SWidget> OnGetMenuContent();
+	void OnMenuOpenChanged(bool bOpen);
+	int32 OnGetComboContentWidgetIndex() const;
+	void OnPropertyValueChanged();
+	void CloseComboButton();
+	void OnActorSelected(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo);
+	bool IsFilteredActor(const AActor* const Actor) const;
+
+private:
+	/** Handle to the struct property being customized */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+	UClass* MetaClass = nullptr;
+	TWeakObjectPtr<AActor> CachedActor;
+	FSodaActorDescriptor CachedActorDesc;
+	FPropertyAccess::Result CachedPropertyAccess;
+	TSharedPtr<SComboButton> SubobjectComboButton;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Customization/SoftSodaVehicleComponentPtrCustomization.cpp b/Source/UnrealSoda/Private/Customization/SoftSodaVehicleComponentPtrCustomization.cpp
new file mode 100644
index 0000000..3f2dd73
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SoftSodaVehicleComponentPtrCustomization.cpp
@@ -0,0 +1,333 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SoftSodaVehicleComponentPtrCustomization.h"
+#include "Containers/UnrealString.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/IDetailChildrenBuilder.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "HAL/PlatformCrt.h"
+#include "UObject/Object.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Layout/SWidgetSwitcher.h"
+#include "RuntimeEditorUtils.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/UI/SVehicleComponentsList.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Components/ActorComponent.h"
+
+class IDetailChildrenBuilder;
+class UClass;
+
+
+namespace soda
+{
+
+void FSoftSodaVehicleComponentPtrCustomization::CustomizeHeader( TSharedRef<IPropertyHandle> InPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils )
+{
+	PropertyHandle = InPropertyHandle;
+
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	check(GameMode);
+	
+	CachedSubobject.Reset();
+	CachedPropertyAccess = FPropertyAccess::Fail;
+
+	FObjectPropertyBase* ObjectProperty = CastField<FObjectPropertyBase>(InPropertyHandle->GetProperty());
+	check(ObjectProperty);
+	MetaClass = ObjectProperty->PropertyClass;
+	check(MetaClass);
+
+	BuildComboBox();
+
+	InPropertyHandle->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(this, &FSoftSodaVehicleComponentPtrCustomization::OnPropertyValueChanged));
+
+	UObject * TmpObject;
+	CachedPropertyAccess = GetValue(TmpObject);
+	if (CachedPropertyAccess == FPropertyAccess::Success)
+	{
+		CachedSubobject = Cast<UActorComponent>(TmpObject);
+		if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(CachedSubobject.Get()))
+		{
+			CachedComponentDesc = VehicleComponent->GetVehicleComponentGUI();
+		}
+		else
+		{
+			CachedComponentDesc = FVehicleComponentGUI();
+		}
+	}
+
+	HeaderRow
+	.NameContent()
+	[
+		PropertyHandle->CreatePropertyNameWidget()
+	]
+	.ValueContent()
+	[
+		SubobjectComboButton.ToSharedRef()
+	];
+}
+
+void FSoftSodaVehicleComponentPtrCustomization::CustomizeChildren(TSharedRef<IPropertyHandle> InStructPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils)
+{
+}
+
+void FSoftSodaVehicleComponentPtrCustomization::SetValue(const UObject* Value)
+{
+	SubobjectComboButton->SetIsOpen(false);
+	ensure(PropertyHandle->SetValue(Value) == FPropertyAccess::Result::Success);
+}
+
+FPropertyAccess::Result FSoftSodaVehicleComponentPtrCustomization::GetValue(UObject*& OutValue) const
+{
+	// Potentially accessing the value while garbage collecting or saving the package could trigger a crash.
+	// so we fail to get the value when that is occurring.
+	if (GIsSavingPackage || IsGarbageCollecting())
+	{
+		return FPropertyAccess::Fail;
+	}
+
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	
+	UObject* Object = nullptr;
+	Result = PropertyHandle->GetValue(Object);
+
+	if (Object == nullptr)
+	{
+		// Check to see if it's pointing to an unloaded object
+		FString CurrentObjectPath;
+		FSoftObjectPath SoftObjectPath;
+		PropertyHandle->GetValueAsFormattedString(CurrentObjectPath);
+		if (CurrentObjectPath.Len() > 0 && CurrentObjectPath != TEXT("None"))
+		{
+			if (SoftObjectPath.IsAsset())
+			{
+				Result = FPropertyAccess::Fail;
+			}
+			else
+			{
+				Object = SoftObjectPath.ResolveObject(); // TODO: OutValue can be UObject or FSoftObjectPath
+				if (Object != nullptr)
+				{
+					Result = FPropertyAccess::Success;
+				}
+			}
+		}
+	}
+
+	if (Object == nullptr)
+	{
+		// No property editor was specified so check if multiple property values are associated with the property handle
+		TArray<FString> ObjectValues;
+		PropertyHandle->GetPerObjectValues(ObjectValues);
+
+		if (ObjectValues.Num() > 1)
+		{
+			for (int32 ObjectIndex = 1; ObjectIndex < ObjectValues.Num() && Result == FPropertyAccess::Success; ++ObjectIndex)
+			{
+				if (ObjectValues[ObjectIndex] != ObjectValues[0])
+				{
+					Result = FPropertyAccess::MultipleValues;
+				}
+			}
+		}
+	}
+	
+	OutValue = Object;
+	return Result;
+}
+
+void FSoftSodaVehicleComponentPtrCustomization::BuildComboBox()
+{
+	/*
+	TAttribute<bool> IsEnabledAttribute(this, &FComponentReferenceCustomization::CanEdit);
+	TAttribute<FText> TooltipAttribute;
+	if (PropertyHandle->GetMetaDataProperty()->HasAnyPropertyFlags(CPF_EditConst | CPF_DisableEditOnTemplate))
+	{
+		TArray<UObject*> ObjectList;
+		PropertyHandle->GetOuterObjects(ObjectList);
+
+		// If there is no objects, that means we must have a struct asset managing this property
+		if (ObjectList.Num() == 0)
+		{
+			IsEnabledAttribute.Set(false);
+			TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplate", "Editing this value in structure's defaults is not allowed"));
+		}
+		else
+		{
+			// Go through all the found objects and see if any are a CDO, we can't set an actor in a CDO default.
+			for (UObject* Obj : ObjectList)
+			{
+				if (Obj->IsTemplate() && !Obj->IsA<ALevelScriptActor>())
+				{
+					IsEnabledAttribute.Set(false);
+					TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplateTooltip", "Editing this value in a Class Default Object is not allowed"));
+					break;
+				}
+
+			}
+		}
+	}
+	*/
+
+
+	SubobjectComboButton = SNew(SComboButton)
+		//.ToolTipText(TooltipAttribute)
+		//.ButtonStyle(FSodaStyle::Get(), "PropertyEditor.AssetComboStyle")
+		//.ForegroundColor(FSodaStyle::GetColor("PropertyEditor.AssetName.ColorAndOpacity"))
+		.OnGetMenuContent(this, &FSoftSodaVehicleComponentPtrCustomization::OnGetMenuContent)
+		.OnMenuOpenChanged(this, &FSoftSodaVehicleComponentPtrCustomization::OnMenuOpenChanged)
+		//.IsEnabled(IsEnabledAttribute)
+		//.ContentPadding(2.0f)
+		.ButtonContent()
+		[
+			SNew(SWidgetSwitcher)
+			.WidgetIndex(this, &FSoftSodaVehicleComponentPtrCustomization::OnGetComboContentWidgetIndex)
+			+ SWidgetSwitcher::Slot()
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(TEXT("<multiple values>")))
+				.Font(IDetailLayoutBuilder::GetDetailFont())
+			]
+			+ SWidgetSwitcher::Slot()
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(0, 0, 2, 0)
+				.HAlign(HAlign_Left)
+				.VAlign(VAlign_Center)
+				[
+					SNew(SImage)
+					.Image(this, &FSoftSodaVehicleComponentPtrCustomization::GetComponentIcon)
+				]
+				+ SHorizontalBox::Slot()
+				.FillWidth(1)
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.Font(IDetailLayoutBuilder::GetDetailFont())
+					.Text(this, &FSoftSodaVehicleComponentPtrCustomization::OnGetSubobjectName)
+				]
+			]
+		];
+}
+
+const FSlateBrush* FSoftSodaVehicleComponentPtrCustomization::GetComponentIcon() const
+{
+	if (CachedSubobject.IsValid())
+	{
+		return FSodaStyle::GetBrush(CachedComponentDesc.IcanName);
+	}
+	else
+	{
+		return FSodaStyle::GetBrush(TEXT("ClassIcon.Actor"));
+	}
+}
+
+FText FSoftSodaVehicleComponentPtrCustomization::OnGetSubobjectName() const
+{
+	if (CachedSubobject.IsValid())
+	{
+		return FText::FromString(CachedSubobject->GetName());
+	}
+	else
+	{
+		return FText::FromString(TEXT("None"));
+	}
+}
+
+TSharedRef<SWidget> FSoftSodaVehicleComponentPtrCustomization::OnGetMenuContent()
+{
+	TArray<UObject*> OuterObjects;
+	PropertyHandle->GetOuterObjects(OuterObjects);
+	ASodaVehicle* SodaVehicle = nullptr;
+	if (OuterObjects.Num() == 1)
+	{
+		SodaVehicle = Cast<ASodaVehicle>(OuterObjects[0]);
+	}
+
+	if (!SodaVehicle)
+	{
+		return SNullWidget::NullWidget;
+	}
+
+	return 
+		SNew(SBorder)
+		.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Header")))
+		.Padding(1)
+		[
+			SNew(SBox)
+			.MinDesiredWidth(200)
+			.MinDesiredHeight(300)
+			[
+				SNew(soda::SVehicleComponentsList, SodaVehicle, false)
+				//.bInteractiveMode(false)
+				//.OnSelectionChanged(this, &FSoftSodaVehicleComponentPtrCustomization::OnComponentSelected)
+				//.ComponentFilter(FOnShouldFilterActor::CreateSP(this, &FSoftSodaVehicleComponentPtrCustomization::IsFilteredComponent))
+			]
+		];
+}
+
+bool FSoftSodaVehicleComponentPtrCustomization::IsFilteredComponent(const UActorComponent* const Component) const
+{
+	return Component->IsA(MetaClass);
+}
+
+void FSoftSodaVehicleComponentPtrCustomization::OnComponentSelected(TWeakObjectPtr<UActorComponent> Component, ESelectInfo::Type SelectInfo)
+{
+	SetValue(Component.Get());
+	//FSlateApplication::Get().DismissAllMenus();
+}
+
+void FSoftSodaVehicleComponentPtrCustomization::OnMenuOpenChanged(bool bOpen)
+{
+	if (!bOpen)
+	{
+		SubobjectComboButton->SetMenuContent(SNullWidget::NullWidget);
+	}
+}
+
+int32 FSoftSodaVehicleComponentPtrCustomization::OnGetComboContentWidgetIndex() const
+{
+	switch (CachedPropertyAccess)
+	{
+	case FPropertyAccess::MultipleValues: return 0;
+	case FPropertyAccess::Success:
+	default:
+		return 1;
+	}
+}
+
+void FSoftSodaVehicleComponentPtrCustomization::OnPropertyValueChanged()
+{
+	CachedSubobject.Reset();
+
+	UObject * TmpObject;
+	CachedPropertyAccess = GetValue(TmpObject);
+	if (CachedPropertyAccess == FPropertyAccess::Success)
+	{
+		CachedSubobject = Cast<UActorComponent>(TmpObject);
+		if (CachedSubobject.IsValid())
+		{
+			if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(CachedSubobject.Get()))
+			{
+				CachedComponentDesc = VehicleComponent->GetVehicleComponentGUI();
+			}
+			else
+			{
+				CachedComponentDesc = FVehicleComponentGUI();
+			}
+		}
+	}
+}
+
+void FSoftSodaVehicleComponentPtrCustomization::CloseComboButton()
+{
+	SubobjectComboButton->SetIsOpen(false);
+}
+
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Customization/SoftSodaVehicleComponentPtrCustomization.h b/Source/UnrealSoda/Private/Customization/SoftSodaVehicleComponentPtrCustomization.h
new file mode 100644
index 0000000..efdbda6
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SoftSodaVehicleComponentPtrCustomization.h
@@ -0,0 +1,58 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "Templates/SharedPointer.h"
+#include "RuntimeEditorModule.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Widgets/Input/SComboButton.h"
+
+namespace soda
+{
+
+class IPropertyHandle;
+
+
+/**
+ * Customizes a soft object path to look like a UObject property
+ */
+class FSoftSodaVehicleComponentPtrCustomization : public IPropertyTypeCustomization
+{
+public:
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance() 
+	{
+		return MakeShareable( new FSoftSodaVehicleComponentPtrCustomization);
+	}
+
+	/** IPropertyTypeCustomization interface */
+	virtual void CustomizeHeader( TSharedRef<class IPropertyHandle> InPropertyHandle, class FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& StructCustomizationUtils ) override;
+	virtual void CustomizeChildren( TSharedRef<class IPropertyHandle> InPropertyHandle, class IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& StructCustomizationUtils ) override;
+
+protected:
+	FPropertyAccess::Result GetValue(UObject *& OutValue) const;
+	void SetValue(const UObject * Value);
+
+	void BuildComboBox();
+
+	const FSlateBrush* GetComponentIcon() const;
+	FText OnGetSubobjectName() const;
+	TSharedRef<SWidget> OnGetMenuContent();
+	void OnMenuOpenChanged(bool bOpen);
+	int32 OnGetComboContentWidgetIndex() const;
+	void OnPropertyValueChanged();
+	void CloseComboButton();
+	void OnComponentSelected(TWeakObjectPtr<UActorComponent> Component, ESelectInfo::Type SelectInfo);
+	bool IsFilteredComponent(const UActorComponent* const Component) const;
+
+private:
+	/** Handle to the struct property being customized */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+	UClass* MetaClass = nullptr;
+	TWeakObjectPtr<UActorComponent> CachedSubobject;
+	FVehicleComponentGUI CachedComponentDesc;
+	FPropertyAccess::Result CachedPropertyAccess;
+	TSharedPtr<SComboButton> SubobjectComboButton;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Customization/SubobjectReferenceCustomization.cpp b/Source/UnrealSoda/Private/Customization/SubobjectReferenceCustomization.cpp
new file mode 100644
index 0000000..38ec2bc
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SubobjectReferenceCustomization.cpp
@@ -0,0 +1,588 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SubobjectReferenceCustomization.h"
+#include "Components/SceneComponent.h"
+#include "RuntimePropertyEditor/DetailLayoutBuilder.h"
+#include "RuntimePropertyEditor/DetailWidgetRow.h"
+#include "SodaStyleSet.h"
+#include "Engine/LevelScriptActor.h"
+#include "RuntimePropertyEditor/IDetailChildrenBuilder.h"
+#include "RuntimePropertyEditor/IDetailPropertyRow.h"
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Styling/SlateIconFinder.h"
+#include "UObject/UObjectIterator.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Layout/SWidgetSwitcher.h"
+#include "Widgets/Text/STextBlock.h"
+#include "SPropertyMenuSubobjectPicker.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/ISodaVehicleComponent.h"
+
+#define LOCTEXT_NAMESPACE "ComponentReferenceCustomization"
+
+namespace soda
+{
+
+static const FName NAME_AllowAnyActor = "AllowAnyActor";
+static const FName NAME_AllowedClasses = "AllowedClasses";
+static const FName NAME_DisallowedClasses = "DisallowedClasses";
+static const FName NAME_UseComponentPicker = "UseComponentPicker";
+
+static FSubobjectReference MakeSubobjectReference(const AActor* InOwner, const UObject* InSubobject)
+{
+	FSubobjectReference Result;
+	if (InSubobject)
+	{
+		AActor* Owner = FEditorUtils::FindOuterActor(InSubobject);
+		Result.PathToSubobject = InSubobject->GetPathName(Owner);
+	}
+	return Result;
+}
+
+TSharedRef<IPropertyTypeCustomization> FSubobjectReferenceCustomization::MakeInstance()
+{
+	return MakeShareable(new FSubobjectReferenceCustomization);
+}
+
+void FSubobjectReferenceCustomization::CustomizeHeader(TSharedRef<IPropertyHandle> InPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& PropertyTypeCustomizationUtils)
+{
+	PropertyHandle = InPropertyHandle;
+
+	CachedSubobject.Reset();
+	CachedFirstOuterActor.Reset();
+	bCachedPropertyAccess = false;
+
+	bAllowClear = false;
+
+	FProperty* Property = InPropertyHandle->GetProperty();
+	check(CastField<FStructProperty>(Property) && FSubobjectReference::StaticStruct() == CastFieldChecked<const FStructProperty>(Property)->Struct);
+
+	bAllowClear = !(InPropertyHandle->GetMetaDataProperty()->PropertyFlags & CPF_NoClear);
+
+	BuildClassFilters();
+	BuildComboBox();
+
+	InPropertyHandle->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(this, &FSubobjectReferenceCustomization::OnPropertyValueChanged));
+
+	// set cached values
+	{
+		CachedSubobject.Reset();
+		CachedFirstOuterActor = GetFirstOuterActor();
+
+		FSubobjectReference TmpSubobjectReference;
+		bCachedPropertyAccess = GetValue(TmpSubobjectReference);
+		if (bCachedPropertyAccess)
+		{
+			CachedSubobject = TmpSubobjectReference.GetObject<UObject>(CachedFirstOuterActor.Get());
+			if (!IsSubobjectReferenceValid(TmpSubobjectReference))
+			{
+				CachedSubobject.Reset();
+			}
+		}
+	}
+
+	HeaderRow.NameContent()
+	[
+		InPropertyHandle->CreatePropertyNameWidget()
+	]
+	.ValueContent()
+	[
+		SubobjectComboButton.ToSharedRef()
+	]
+	.IsEnabled(MakeAttributeSP(this, &FSubobjectReferenceCustomization::CanEdit));
+
+}
+
+void FSubobjectReferenceCustomization::CustomizeChildren(TSharedRef<IPropertyHandle> InPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& PropertyTypeCustomizationUtils)
+{
+	uint32 NumberOfChild;
+	if (InPropertyHandle->GetNumChildren(NumberOfChild) == FPropertyAccess::Success)
+	{
+		for (uint32 Index = 0; Index < NumberOfChild; ++Index)
+		{
+			TSharedRef<IPropertyHandle> ChildPropertyHandle = InPropertyHandle->GetChildHandle(Index).ToSharedRef();
+			ChildPropertyHandle->SetOnPropertyValueChanged(FSimpleDelegate::CreateSP(this, &FSubobjectReferenceCustomization::OnPropertyValueChanged));
+			StructBuilder.AddProperty(ChildPropertyHandle)
+				.ShowPropertyButtons(true)
+				.IsEnabled(MakeAttributeSP(this, &FSubobjectReferenceCustomization::CanEditChildren));
+		}
+	}
+}
+
+void FSubobjectReferenceCustomization::BuildClassFilters()
+{
+
+	auto ParseClassFilters = [this](const FString& MetaDataString, TArray<const UClass*>& ComponentList)
+	{
+		if (!MetaDataString.IsEmpty())
+		{
+			TArray<FString> ClassFilterNames;
+			MetaDataString.ParseIntoArrayWS(ClassFilterNames, TEXT(","), true);
+
+			for (const FString& ClassName : ClassFilterNames)
+			{
+				UClass* Class = UClass::TryFindTypeSlow<UClass>(ClassName);
+				if (!Class)
+				{
+					Class = LoadObject<UClass>(nullptr, *ClassName);
+				}
+
+				if (Class)
+				{
+					// If the class is an interface, expand it to be all classes in memory that implement the class.
+					if (Class->HasAnyClassFlags(CLASS_Interface))
+					{
+						for (TObjectIterator<UClass> ClassIt; ClassIt; ++ClassIt)
+						{
+							UClass* const ClassWithInterface = (*ClassIt);
+							if (ClassWithInterface->ImplementsInterface(Class))
+							{
+								ComponentList.Add(ClassWithInterface);
+							}
+						}
+					}
+					else
+					{
+						ComponentList.Add(Class);
+					}
+				}
+			}
+		}
+	};
+
+	// Account for the allowed classes specified in the property metadata
+	const FString& AllowedClassesFilterString = PropertyHandle->GetMetaData(NAME_AllowedClasses);
+	ParseClassFilters(AllowedClassesFilterString, AllowedSubobjectClassFilters);
+
+	const FString& DisallowedClassesFilterString = PropertyHandle->GetMetaData(NAME_DisallowedClasses);
+	ParseClassFilters(DisallowedClassesFilterString, DisallowedSubobjectClassFilters);
+}
+
+void FSubobjectReferenceCustomization::BuildComboBox()
+{
+	TAttribute<bool> IsEnabledAttribute(this, &FSubobjectReferenceCustomization::CanEdit);
+	TAttribute<FText> TooltipAttribute;
+	if (PropertyHandle->GetMetaDataProperty()->HasAnyPropertyFlags(CPF_EditConst | CPF_DisableEditOnTemplate))
+	{
+		TArray<UObject*> ObjectList;
+		PropertyHandle->GetOuterObjects(ObjectList);
+
+		// If there is no objects, that means we must have a struct asset managing this property
+		if (ObjectList.Num() == 0)
+		{
+			IsEnabledAttribute.Set(false);
+			TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplate", "Editing this value in structure's defaults is not allowed"));
+		}
+		else
+		{
+			// Go through all the found objects and see if any are a CDO, we can't set an actor in a CDO default.
+			for (UObject* Obj : ObjectList)
+			{
+				if (Obj->IsTemplate() && !Obj->IsA<ALevelScriptActor>())
+				{
+					IsEnabledAttribute.Set(false);
+					TooltipAttribute.Set(LOCTEXT("VariableHasDisableEditOnTemplateTooltip", "Editing this value in a Class Default Object is not allowed"));
+					break;
+				}
+
+			}
+		}
+	}
+
+	TSharedRef<SVerticalBox> ObjectContent = SNew(SVerticalBox);
+	ObjectContent->AddSlot()
+	[
+		SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		.Padding(0, 0, 4, 0)
+		[
+			SNew(SImage)
+			.Image(this, &FSubobjectReferenceCustomization::GetComponentIcon)
+		]
+		+ SHorizontalBox::Slot()
+		.FillWidth(1)
+		.VAlign(VAlign_Center)
+		[
+			// Show the name of the asset or actor
+			SNew(STextBlock)
+			.Font(soda::IDetailLayoutBuilder::GetDetailFont())
+			.Text(this, &FSubobjectReferenceCustomization::OnGetSubobjectName)
+		]
+	];
+
+	TSharedRef<SHorizontalBox> ComboButtonContent = SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		.HAlign(HAlign_Left)
+		.VAlign(VAlign_Center)
+		[
+			SNew(SImage)
+			.Image(this, &FSubobjectReferenceCustomization::GetStatusIcon)
+		]
+		+ SHorizontalBox::Slot()
+		.FillWidth(1)
+		.VAlign(VAlign_Center)
+		[
+			ObjectContent
+		];
+
+	SubobjectComboButton = SNew(SComboButton)
+		.ToolTipText(TooltipAttribute)
+		//.ButtonStyle(FSodaStyle::Get(), "PropertyEditor.AssetComboStyle")
+		//.ForegroundColor(FSodaStyle::GetColor("PropertyEditor.AssetName.ColorAndOpacity"))
+		.OnGetMenuContent(this, &FSubobjectReferenceCustomization::OnGetMenuContent)
+		.OnMenuOpenChanged(this, &FSubobjectReferenceCustomization::OnMenuOpenChanged)
+		.IsEnabled(IsEnabledAttribute)
+		.ContentPadding(2.0f)
+		.ButtonContent()
+		[
+			SNew(SWidgetSwitcher)
+			.WidgetIndex(this, &FSubobjectReferenceCustomization::OnGetComboContentWidgetIndex)
+			+ SWidgetSwitcher::Slot()
+			[
+				SNew(STextBlock)
+				.Text(LOCTEXT("MultipleValuesText", "<multiple values>"))
+				.Font(soda::IDetailLayoutBuilder::GetDetailFont())
+			]
+			+ SWidgetSwitcher::Slot()
+			[
+				ComboButtonContent
+			]
+		];
+}
+
+AActor* FSubobjectReferenceCustomization::GetFirstOuterActor() const
+{
+	TArray<UObject*> ObjectList;
+	PropertyHandle->GetOuterObjects(ObjectList);
+	for (UObject* Obj : ObjectList)
+	{
+		while (Obj)
+		{
+			if (AActor* Actor = Cast<AActor>(Obj))
+			{
+				return Actor;
+			}
+			else if (UActorComponent* Component = Cast<UActorComponent>(Obj))
+			{
+				if (Component->GetOwner())
+				{
+					return Component->GetOwner();
+				}
+			}
+			else if (UBlueprintGeneratedClass* BP = Cast<UBlueprintGeneratedClass>(Obj))
+			{
+				
+				bool bIsActor = BP->IsChildOf(AActor::StaticClass());
+				if (UObject* DefObj = BP->GetDefaultObject())
+				{
+					UE_LOG(LogSoda, Error, TEXT("*** %i %s"), bIsActor, *DefObj->GetName());
+				}
+
+			}
+			Obj = Obj->GetOuter();
+		}
+	}
+
+	if (const UClass* Class = PropertyHandle->GetOuterBaseClass())
+	{
+		UE_LOG(LogSoda, Error, TEXT("*** %s"), *Class->GetName());
+	}
+
+	TArray<UPackage*> OuterPackages;
+	PropertyHandle->GetOuterPackages(OuterPackages);
+	UE_LOG(LogSoda, Error, TEXT("*** %i"), OuterPackages.Num());
+
+	if (FProperty* Prop = PropertyHandle->GetProperty())
+	{
+		UE_LOG(LogSoda, Error, TEXT("*** %s"), *Prop->GetName());
+	}
+
+
+	if (const FFieldClass* temp = PropertyHandle->GetPropertyClass())
+	{
+		UE_LOG(LogSoda, Error, TEXT("*** %s"), *temp->GetName());
+	}
+
+	if (TSharedPtr<IPropertyHandle>  Parent = PropertyHandle->GetParentHandle())
+	{
+		UE_LOG(LogSoda, Error, TEXT("*** %s"), *Parent->GetPropertyDisplayName().ToString());
+	}
+
+	/*
+	if (ObjectList.Num())
+	{
+		for (TObjectIterator<UBlueprintGeneratedClass> It; It; ++It)
+		{
+			for (TFieldIterator<FObjectProperty> FieldIt(It); It; ++It)
+			{
+				FieldIt->GetObjectPropertyValue_InContainer();
+				if (FieldIt == ObjectList[0])
+				{
+					UE_LOG(LogSoda, Error, TEXT("***"), );
+				}
+			}
+		}
+	}
+	*/
+	
+
+
+
+	return nullptr;
+}
+
+void FSubobjectReferenceCustomization::SetValue(const FSubobjectReference& Value)
+{
+	SubobjectComboButton->SetIsOpen(false);
+
+	const bool bIsEmpty = Value == FSubobjectReference();
+	const bool bAllowedToSetBasedOnFilter = IsSubobjectReferenceValid(Value);
+	if (bIsEmpty || bAllowedToSetBasedOnFilter)
+	{
+		FString TextValue;
+		CastFieldChecked<const FStructProperty>(PropertyHandle->GetProperty())->Struct->ExportText(TextValue, &Value, &Value, nullptr, EPropertyPortFlags::PPF_None, nullptr);
+		ensure(PropertyHandle->SetValueFromFormattedString(TextValue) == FPropertyAccess::Result::Success);
+	}
+}
+
+bool FSubobjectReferenceCustomization::GetValue(FSubobjectReference& OutValue) const
+{
+	// Potentially accessing the value while garbage collecting or saving the package could trigger a crash.
+	// so we fail to get the value when that is occurring.
+	if (GIsSavingPackage || IsGarbageCollecting())
+	{
+		return false;
+	}
+
+	FPropertyAccess::Result Result = FPropertyAccess::Fail;
+	if (PropertyHandle.IsValid() && PropertyHandle->IsValidHandle())
+	{
+		TArray<void*> RawData;
+		PropertyHandle->AccessRawData(RawData);
+		UObject* CurrentSubobject = nullptr;
+		AActor* CurrentActor = CachedFirstOuterActor.Get();
+		for (const void* RawPtr : RawData)
+		{
+			if (RawPtr)
+			{
+				const FSubobjectReference& ThisReference = *reinterpret_cast<const FSubobjectReference*>(RawPtr);
+				if (Result == FPropertyAccess::Success)
+				{
+					if (ThisReference.GetObject<UObject>(CurrentActor) != CurrentSubobject)
+					{
+						Result = FPropertyAccess::MultipleValues;
+						break;
+					}
+				}
+				else
+				{
+					OutValue = ThisReference;
+					CurrentSubobject = OutValue.GetObject<UObject>(CurrentActor);
+					Result = FPropertyAccess::Success;
+				}
+			}
+			else if (Result == FPropertyAccess::Success)
+			{
+				Result = FPropertyAccess::MultipleValues;
+				break;
+			}
+		}
+	}
+	return Result == FPropertyAccess::Success;
+}
+
+bool FSubobjectReferenceCustomization::IsSubobjectReferenceValid(const FSubobjectReference& Value) const
+{
+	AActor* CachedActor = CachedFirstOuterActor.Get();
+	UObject* NewSubobject = Value.GetObject<UObject>(CachedActor);
+	if (!NewSubobject)
+	{
+		return false;
+	}
+
+	if (!IsFilteredSubobject(NewSubobject))
+	{
+		return false;
+	}
+
+	return true;
+}
+
+void FSubobjectReferenceCustomization::OnPropertyValueChanged()
+{
+	CachedSubobject.Reset();
+	CachedFirstOuterActor = GetFirstOuterActor();
+
+	FSubobjectReference TmpComponentReference;
+	bCachedPropertyAccess = GetValue(TmpComponentReference);
+	if (bCachedPropertyAccess)
+	{
+		CachedSubobject = TmpComponentReference.GetObject<UObject>(CachedFirstOuterActor.Get());
+		if (!IsSubobjectReferenceValid(TmpComponentReference))
+		{
+			CachedSubobject.Reset();
+			if (!(TmpComponentReference == FSubobjectReference()))
+			{
+				SetValue(FSubobjectReference());
+			}
+		}
+	}
+}
+
+int32 FSubobjectReferenceCustomization::OnGetComboContentWidgetIndex() const
+{
+	if (bCachedPropertyAccess)
+	{
+		return 1;
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+bool FSubobjectReferenceCustomization::CanEdit() const
+{
+	return PropertyHandle.IsValid() ? !PropertyHandle->IsEditConst() : true;
+}
+
+bool FSubobjectReferenceCustomization::CanEditChildren() const
+{
+	return CanEdit() && !CachedFirstOuterActor.IsValid();
+}
+
+const FSlateBrush* FSubobjectReferenceCustomization::GetComponentIcon() const
+{
+	if (const UObject* ActorComponent = CachedSubobject.Get())
+	{
+		if (const ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(ActorComponent))
+		{
+			return FSodaStyle::GetBrush(VehicleComponent->GetVehicleComponentGUI().IcanName);
+		}
+		return FSlateIconFinder::FindIconBrushForClass(ActorComponent->GetClass());
+	}
+	return FSlateIconFinder::FindIconBrushForClass(UActorComponent::StaticClass());
+}
+
+FText FSubobjectReferenceCustomization::OnGetSubobjectName() const
+{
+	if (bCachedPropertyAccess)
+	{
+		if (UObject* Subobject = CachedSubobject.Get())
+		{
+			/*
+			const FName ComponentName = FComponentEditorUtils::FindVariableNameGivenComponentInstance(Subobject);
+			const bool bIsArrayVariable = !ComponentName.IsNone() && GetOuterActor(Subobject) != nullptr && FindFProperty<FArrayProperty>(GetOuterActor(Subobject)->GetClass(), ComponentName);
+
+			if (!ComponentName.IsNone() && !bIsArrayVariable)
+			{
+				return FText::FromName(ComponentName);
+			}
+			*/
+			return FText::AsCultureInvariant(Subobject->GetName());
+		}
+	}
+
+	return LOCTEXT("NoObject", "None");
+}
+
+const FSlateBrush* FSubobjectReferenceCustomization::GetStatusIcon() const
+{
+	static FSlateNoResource EmptyBrush = FSlateNoResource();
+
+	if (!bCachedPropertyAccess)
+	{
+		return FSodaStyle::GetBrush("Icons.Error");
+	}
+	return &EmptyBrush;
+}
+
+TSharedRef<SWidget> FSubobjectReferenceCustomization::OnGetMenuContent()
+{
+	UObject * InitialComponent = CachedSubobject.Get();
+
+	return SNew(soda::SPropertyMenuSubobjectPicker)
+		.OwnedActor(CachedFirstOuterActor.Get())
+		.AllowClear(bAllowClear)
+		.SubobjectFilter(soda::FOnShouldFilterSubobject::CreateSP(this, &FSubobjectReferenceCustomization::IsFilteredSubobject))
+		.OnSet(soda::FOnSubobjectSelected::CreateSP(this, &FSubobjectReferenceCustomization::OnComponentSelected))
+		.OnClose(FSimpleDelegate::CreateSP(this, &FSubobjectReferenceCustomization::CloseComboButton));
+}
+
+void FSubobjectReferenceCustomization::OnMenuOpenChanged(bool bOpen)
+{
+	if (!bOpen)
+	{
+		SubobjectComboButton->SetMenuContent(SNullWidget::NullWidget);
+	}
+}
+
+bool FSubobjectReferenceCustomization::IsFilteredSubobject(const UObject* const Subobject) const
+{
+	const AActor* OuterActor = CachedFirstOuterActor.Get();
+	const AActor* FindedOwner = FEditorUtils::FindOuterActor(Subobject);
+	return FindedOwner
+		&& (FindedOwner == CachedFirstOuterActor.Get())
+		&& IsFilteredObject(Subobject, AllowedSubobjectClassFilters, DisallowedSubobjectClassFilters);
+}
+
+bool FSubobjectReferenceCustomization::IsFilteredObject(const UObject* const Object, const TArray<const UClass*>& AllowedFilters, const TArray<const UClass*>& DisallowedFilters)
+{
+	bool bAllowedToSetBasedOnFilter = true;
+
+	const UClass* ObjectClass = Object->GetClass();
+	if (AllowedFilters.Num() > 0)
+	{
+		bAllowedToSetBasedOnFilter = false;
+		for (const UClass* AllowedClass : AllowedFilters)
+		{
+			const bool bAllowedClassIsInterface = AllowedClass->HasAnyClassFlags(CLASS_Interface);
+			if (ObjectClass->IsChildOf(AllowedClass) || (bAllowedClassIsInterface && ObjectClass->ImplementsInterface(AllowedClass)))
+			{
+				bAllowedToSetBasedOnFilter = true;
+				break;
+			}
+		}
+	}
+
+	if (DisallowedFilters.Num() > 0 && bAllowedToSetBasedOnFilter)
+	{
+		for (const UClass* DisallowedClass : DisallowedFilters)
+		{
+			const bool bDisallowedClassIsInterface = DisallowedClass->HasAnyClassFlags(CLASS_Interface);
+			if (ObjectClass->IsChildOf(DisallowedClass) || (bDisallowedClassIsInterface && ObjectClass->ImplementsInterface(DisallowedClass)))
+			{
+				bAllowedToSetBasedOnFilter = false;
+				break;
+			}
+		}
+	}
+
+	return bAllowedToSetBasedOnFilter;
+}
+
+void FSubobjectReferenceCustomization::OnComponentSelected(const UObject* InSubobject)
+{
+	SubobjectComboButton->SetIsOpen(false);
+
+	FSubobjectReference SubobjectReference = MakeSubobjectReference(CachedFirstOuterActor.Get(), InSubobject);
+	SetValue(SubobjectReference);
+}
+
+void FSubobjectReferenceCustomization::CloseComboButton()
+{
+	SubobjectComboButton->SetIsOpen(false);
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/Customization/SubobjectReferenceCustomization.h b/Source/UnrealSoda/Private/Customization/SubobjectReferenceCustomization.h
new file mode 100644
index 0000000..5db4abb
--- /dev/null
+++ b/Source/UnrealSoda/Private/Customization/SubobjectReferenceCustomization.h
@@ -0,0 +1,124 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Components/ActorComponent.h"
+#include "Engine/EngineTypes.h"
+#include "GameFramework/Actor.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+#include "Soda/SodaTypes.h"
+#include "RuntimePropertyEditor/IPropertyTypeCustomization.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+
+class SComboButton;
+class SWidget;
+struct FSlateBrush;
+class UClass;
+
+namespace soda
+{
+
+class FSubobjectReferenceCustomization : public IPropertyTypeCustomization
+{
+public:
+	static TSharedRef<IPropertyTypeCustomization> MakeInstance();
+
+	virtual void CustomizeHeader(TSharedRef<IPropertyHandle> InPropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& PropertyTypeCustomizationUtils) override;
+	virtual void CustomizeChildren(TSharedRef<IPropertyHandle> InPropertyHandle, IDetailChildrenBuilder& StructBuilder, IPropertyTypeCustomizationUtils& PropertyTypeCustomizationUtils) override;
+
+protected:
+	/** From the property metadata, build the list of allowed and disallowed class. */
+	void BuildClassFilters();
+
+	/** Build the combobox widget. */
+	void BuildComboBox();
+
+	/**
+	 * From the Detail panel outer hierarchy, find the first actor or component owner we find.
+	 * This is use in case we want only component on the Self actor and to check if we did a cross-level reference.
+	 */
+	AActor* GetFirstOuterActor() const;
+
+	/**
+	 * Set the value of the asset referenced by this property editor.
+	 * Will set the underlying property handle if there is one.
+	 */
+	void SetValue(const FSubobjectReference& Value);
+
+	/** Get the value referenced by this widget. */
+	bool GetValue(FSubobjectReference& OutValue) const;
+
+	/** Is the Value valid */
+	bool IsSubobjectReferenceValid(const FSubobjectReference& Value) const;
+
+	/** Callback when the property value changed. */
+	void OnPropertyValueChanged();
+
+protected:
+	/**
+	 * Return 0, if we have multiple values to edit.
+	 * Return 1, if we display the widget normally.
+	 */
+	int32 OnGetComboContentWidgetIndex() const;
+
+	bool CanEdit() const;
+	bool CanEditChildren() const;
+
+	const FSlateBrush* GetComponentIcon() const;
+	FText OnGetSubobjectName() const;
+	const FSlateBrush* GetStatusIcon() const;
+
+	/**
+	 * Get the content to be displayed in the asset/actor picker menu
+	 * @returns the widget for the menu content
+	 */
+	TSharedRef<SWidget> OnGetMenuContent();
+
+	/**
+	 * Called when the asset menu is closed, we handle this to force the destruction of the asset menu to
+	 * ensure any settings the user set are saved.
+	 */
+	void OnMenuOpenChanged(bool bOpen);
+
+	/**
+	 * Returns whether the actor/component should be filtered out from selection.
+	 */
+	bool IsFilteredSubobject(const UObject* const Subobject) const;
+	static bool IsFilteredObject(const UObject* const Object, const TArray<const UClass*>& AllowedFilters, const TArray<const UClass*>& DisallowedFilters);
+
+	/**
+	 * Delegate for handling selection in the scene outliner.
+	 * @param	InActor	The chosen component
+	 */
+	void OnComponentSelected(const UObject* InComponent);
+
+	/**
+	 * Closes the combo button.
+	 */
+	void CloseComboButton();
+
+protected:
+	/** The property handle we are customizing */
+	TSharedPtr<IPropertyHandle> PropertyHandle;
+
+	/** Main combo button */
+	TSharedPtr<SComboButton> SubobjectComboButton;
+
+
+	/** Whether the asset can be 'None' in this case */
+	bool bAllowClear;
+
+	/** Cached ComponentReference */
+	TWeakObjectPtr<AActor> CachedFirstOuterActor;
+	TWeakObjectPtr<UObject> CachedSubobject;
+	bool bCachedPropertyAccess;
+
+	TArray<const UClass*> AllowedSubobjectClassFilters;
+	TArray<const UClass*> DisallowedSubobjectClassFilters;
+};
+
+}
+
+
diff --git a/Source/UnrealSoda/Private/DBC/Common.cpp b/Source/UnrealSoda/Private/DBC/Common.cpp
new file mode 100644
index 0000000..1c03747
--- /dev/null
+++ b/Source/UnrealSoda/Private/DBC/Common.cpp
@@ -0,0 +1,76 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/DBC/Common.h"
+#include "Soda/DBC/Serialization.h"
+#include "Soda/SodaApp.h"
+#include "Soda/UnrealSoda.h"
+
+namespace dbc
+{
+
+FCANMessageDynamic::FCANMessageDynamic(int64 CANID, TSharedPtr<dbc::FMessageSerializator> InSerializer)
+	: FCANMessage(CANID)
+{
+	Serializer = InSerializer;
+	check(Serializer);
+}
+
+const FString& FCANMessageDynamic::GetName() const
+{
+	return Serializer->GetName();
+}
+
+const FString& FCANMessageDynamic::GetNamespace() const
+{
+	static FString Dummy;
+	return Dummy;
+}
+
+//const uint32_t GetPGN() const { return 0; }
+
+const uint32_t FCANMessageDynamic::GetID() const
+{
+	return Serializer->GetID();
+}
+
+const uint8_t FCANMessageDynamic::GetLength() const
+{
+	return Serializer->GetMessageSize();
+}
+
+const uint32_t FCANMessageDynamic::GetInterval() const
+{
+	return INT_DEFAULT;
+}
+
+void FCANMessageDynamic::OnAfterRecv()
+{
+}
+
+void FCANMessageDynamic::OnPreSend()
+{
+	Frame.Length = Serializer->GetMessageSize();
+	Frame.ID = Serializer->GetID();
+	SendTimestamp = SodaApp.GetRealtimeTimestamp();
+}
+
+//------------------------------------------------------------------------------------------------------------------------------------
+void FCANMessageStatic::OnAfterRecv()
+{ 
+	if (!Dser(Frame.Length, Frame.Data))
+	{
+		UE_LOG(LogSoda, Error, TEXT("FCANMessageStatic::OnRecv(); Can't deserialize CAN_ID == %i"), Frame.ID);
+	}
+}
+void FCANMessageStatic::OnPreSend()
+{ 
+	Frame.Length = GetLength();
+	Frame.ID = GetRegistredCANID();
+	SendTimestamp = SodaApp.GetRealtimeTimestamp();
+	if(!Ser(GetLength(), Frame.Data))
+	{
+		UE_LOG(LogSoda, Error, TEXT("FCANMessageStatic::OnPreSend(); Can't serialize CAN_ID == %i"), Frame.ID);
+	}
+}
+
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/DBC/Helpers.cpp b/Source/UnrealSoda/Private/DBC/Helpers.cpp
new file mode 100644
index 0000000..ec9f95f
--- /dev/null
+++ b/Source/UnrealSoda/Private/DBC/Helpers.cpp
@@ -0,0 +1,153 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/DBC/Helpers.h"
+
+namespace dbc
+{
+
+//--------------------------------------------------------------------------------------------------------------------------------------------
+void FSignalGetSet::Register(dbc::FCANMessageDynamic& Msg)
+{
+    check(0); // TODO
+}
+
+//--------------------------------------------------------------------------------------------------------------------------------------------
+FCANMessageWrapper::FCANMessageWrapper(dbc::FMessageMap* MessageMap, TAttribute<int64> Address, ECanFrameDir Dir, ECanFrameType Type)
+    : MessageMap(MessageMap)
+    , Address(Address)
+    , CanFrameDir(Dir)
+    , CanFrameType(Type)
+{
+    check(MessageMap);
+    MessageMap->Messages.Add(this);
+}
+
+FCANMessageWrapper::~FCANMessageWrapper() 
+{
+    if (MessageMap)
+    {
+        MessageMap->Messages.Remove(this);
+    }
+}
+
+void FCANMessageWrapper::Destroy()
+{
+    MessageMap = nullptr;
+}
+
+//--------------------------------------------------------------------------------------------------------------------------------------------
+bool FCANMessageDynamicWrapper::RegisterMessage()
+{
+    if (MessageMap)
+    {
+        if (GetType() == ECanFrameType::J1939)
+        {
+            if (GetDir() == ECanFrameDir::Input)
+            {
+                Msg = StaticCastSharedPtr<FCANMessageDynamic>(MessageMap->CANBus->RegRecvMsgJ1939(MessageName, GetAddress()));
+            }
+            else
+            {
+                Msg = StaticCastSharedPtr<FCANMessageDynamic>(MessageMap->CANBus->RegSendMsgJ1939(MessageName, GetAddress()));
+            }
+        }
+        else
+        {
+            if (GetDir() == ECanFrameDir::Input)
+            {
+                Msg = StaticCastSharedPtr<FCANMessageDynamic>(MessageMap->CANBus->RegRecvMsg(MessageName, GetAddress()));
+            }
+            else
+            {
+                Msg = StaticCastSharedPtr<FCANMessageDynamic>(MessageMap->CANBus->RegSendMsg(MessageName, GetAddress()));
+            }
+        }
+
+        if (Msg.IsValid())
+        {
+            for (auto& It : Signals)
+            {
+                It.get().Register(*Msg);
+            }
+        }
+    }
+
+    return Msg.IsValid();
+}
+
+void FCANMessageDynamicWrapper::UnregisterMessage()
+{
+    if (MessageMap)
+    {
+        if (GetDir() == ECanFrameDir::Input)
+        {
+            MessageMap->CANBus->UnregRecvMsg(Msg->GetRegistredCANID());
+        }
+        else
+        {
+            MessageMap->CANBus->UnregSendMsg(Msg->GetRegistredCANID());
+        }
+    }
+}
+
+void FCANMessageDynamicWrapper::InitSignales(const FString& SignalsName)
+{
+    TArray<FString> SignalsNameArray;
+    SignalsName.ParseIntoArray(SignalsNameArray, TEXT(","));
+    check(SignalsNameArray.Num() == Signals.size());
+
+    for (int i = 0; i < Signals.size(); ++i)
+    {
+        Signals[i].get().Initialize(SignalsNameArray[i]);
+    }
+}
+
+bool FCANMessageDynamicWrapper::SendMessage()
+{
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------------------------------------------------
+FMessageMap::~FMessageMap() 
+{ 
+    UnregisterMessages(); 
+    for (auto& it : Messages)
+    {
+        it->Destroy();
+    }
+}
+
+bool FMessageMap::RegisterMessages(UCANBusComponent* InCANDev)
+{
+    UnregisterMessages();
+
+    check(IsValid(InCANDev));
+    CANBus = InCANDev;
+
+    bool bRes = true;
+
+    for (auto& it : Messages)
+    {
+        if (!it->RegisterMessage())
+        {
+            bRes = false;
+        }
+    }
+
+    return bRes;
+}
+
+void FMessageMap::UnregisterMessages()
+{
+    if (IsValid(CANBus))
+    {
+        for (auto& it : Messages)
+        {
+            it->UnregisterMessage();
+        }
+    }
+
+    CANBus = nullptr;
+}
+
+}
diff --git a/Source/UnrealSoda/Private/DBC/Serialization.cpp b/Source/UnrealSoda/Private/DBC/Serialization.cpp
new file mode 100644
index 0000000..6f85fb5
--- /dev/null
+++ b/Source/UnrealSoda/Private/DBC/Serialization.cpp
@@ -0,0 +1,83 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/DBC/Serialization.h"
+#include <dbcppp/Network.h>
+#include <fstream>
+
+namespace dbc
+{
+    FMessageSerializator::FMessageSerializator(std::unique_ptr<dbcppp::IMessage> Impl)
+        : MessageImpl(std::move(Impl))
+    {
+        Name = FString(MessageImpl->Name().c_str());
+        Comment = FString(MessageImpl->Comment().c_str());
+    }
+
+    uint64_t FMessageSerializator::GetID() const
+    {
+        return MessageImpl->Id();
+    }
+
+    const int64 FMessageSerializator::GetMessageSize() const
+    {
+        return MessageImpl->MessageSize();
+    }
+
+    /*
+    const FSignal& FMessageSerializator::GetSignals(std::size_t i) const
+    {
+        return MessageImpl->Signals_Get(i);
+    }
+
+    uint64_t FMessageSerializator::GetNumSignals() const
+    {
+        return MessageImpl->Signals_Size();
+    }
+
+    const FAttribute& FMessageSerializator::GetAttributeValues(std::size_t i) const
+    {
+        return MessageImpl->AttributeValues_Get(i);
+    }
+
+    uint64_t FMessageSerializator::GetNumAttributeValues() const
+    {
+        return MessageImpl->AttributeValues_Size();
+    }
+
+    const FSignalGroup& FMessageSerializator::GetSignalGroups(std::size_t i) const
+    {
+        return MessageImpl->SignalGroups_Get(i);
+    }
+
+    uint64_t FMessageSerializator::GetNumSignalGroups() const
+    {
+        return MessageImpl->SignalGroups_Size();
+    }
+
+    const FSignal* FMessageSerializator::GetMuxSignal() const
+    {
+        return MessageImpl->MuxSignal();
+    }
+    */
+
+    bool LoadDBC(const FString& FileName, TMap<FString, TSharedPtr<dbc::FMessageSerializator>>& Map)
+    {
+        std::unique_ptr<dbcppp::INetwork> Net;
+        std::ifstream idbc(TCHAR_TO_UTF8(*FileName));
+        if (!idbc.is_open())
+        {
+            return false;
+        }
+        Net = dbcppp::INetwork::LoadDBCFromIs(idbc);
+        if (!Net)
+        {
+            return false;
+        }
+        for (const dbcppp::IMessage& Msg : Net->Messages())
+        {
+            Map.Add(UTF8_TO_TCHAR(Msg.Name().c_str()), MakeShared<FMessageSerializator>(Msg.Clone()));
+        }
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/DBGateway.cpp b/Source/UnrealSoda/Private/DBGateway.cpp
new file mode 100644
index 0000000..1b83bf3
--- /dev/null
+++ b/Source/UnrealSoda/Private/DBGateway.cpp
@@ -0,0 +1,110 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/DBGateway.h"
+
+#include "bsoncxx/builder/stream/helpers.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+#include "bsoncxx/builder/stream/array.hpp"
+
+namespace soda
+{
+
+FString FDBGateway::ScenarioStopReasonToString(EScenarioStopReason Reason)
+{
+	switch (Reason)
+	{
+	case EScenarioStopReason::UserRequest: return "user_request";
+	case EScenarioStopReason::ScenarioStopTrigger: return "scenario_stop_trigger";
+	case EScenarioStopReason::InnerError: return "inner_error";
+	case EScenarioStopReason::QuitApplication: return "quit_application";
+	default: return "undefined";
+	}
+}
+
+void FDBGateway::ClearDatasetsQueue()
+{
+	FScopeLock ScopeLock(&DatasetsLock);
+	Datasets.Empty();
+}
+int FDBGateway::GetDasetesQueueNum() const
+{
+	int Res = 0;
+	FScopeLock ScopeLock(&DatasetsLock);
+	for (auto& It : Datasets)
+	{
+		Res += It->GetQueueNum();
+	}
+	return Res;
+}
+
+void FDBGateway::StallDatasetRecording()
+{
+	bIsDatasetRecordingStalled = true;
+	FScopeLock ScopeLock(&DatasetsLock);
+	Datasets.Empty();
+}
+
+/*
+ * FActorDatasetData
+ */
+
+FActorDatasetData::FActorDatasetData(const FString& InActorName) :
+	ActorName(InActorName)
+{
+	DatabaseName = FDBGateway::Instance().GetDatabaseName();
+	DatasetCollectionName = FDBGateway::Instance().GetDatasetCollectionName();
+}
+
+void FActorDatasetData::PushAsync()
+{
+	TSharedPtr<bsoncxx::builder::stream::document> Doc = MakeShared<bsoncxx::builder::stream::document>();
+	*Doc << "name" << TCHAR_TO_UTF8(*ActorName)
+		<< "part" << DocPart
+		<< "batch" << std::move(CurrentArray);
+	DocQueue.Enqueue(Doc);
+	CurrentArray.clear();
+	++DocPart;
+	DocsPerPart = 0;
+	++QueueNum;
+}
+
+void FActorDatasetData::BeginRow()
+{
+	if (!bIsInvalidate)
+	{
+		RowDoc.clear();
+	}
+}
+
+void FActorDatasetData::EndRow()
+{
+	if (!bIsInvalidate)
+	{
+		CurrentArray << RowDoc;
+		if (++DocsPerPart >= MaxDocsPerPart)
+		{
+			PushAsync();
+		}
+	}
+}
+
+TSharedPtr<bsoncxx::builder::stream::document> FActorDatasetData::Dequeue()
+{
+	using bsoncxx::builder::stream::finalize;
+
+	if (bIsInvalidate)
+	{
+		return TSharedPtr<bsoncxx::builder::stream::document>();
+	}
+
+	TSharedPtr<bsoncxx::builder::stream::document> Doc;
+	if (DocQueue.Dequeue(Doc))
+	{
+		--QueueNum;
+		return Doc;
+	}
+
+	return TSharedPtr<bsoncxx::builder::stream::document>();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/DBGatewayMongo.cpp b/Source/UnrealSoda/Private/DBGatewayMongo.cpp
new file mode 100644
index 0000000..9cd1814
--- /dev/null
+++ b/Source/UnrealSoda/Private/DBGatewayMongo.cpp
@@ -0,0 +1,745 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/DBGatewayMongo.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/UnrealSodaVersion.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/LevelState.h"
+#include "Soda/Misc/Time.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "HAL/RunnableThread.h"
+#include "Async/Async.h"
+#include "mongocxx/database.hpp"
+#include "mongocxx/collection.hpp"
+#include "mongocxx/client.hpp"
+#include "mongocxx/uri.hpp"
+#include "mongocxx/instance.hpp"
+#include "mongocxx/exception/exception.hpp"
+#include "bsoncxx/builder/stream/helpers.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+#include "bsoncxx/builder/stream/array.hpp"
+
+#define COLLECTION_NAME_VEHICLES "vehicles"
+#define COLLECTION_NAME_DATASETES "datasets"
+#define COLLECTION_NAME_SCENARIOS "scenarios"
+#define COLLECTION_NAME_DATASETE_PREFIX "dataset"
+
+namespace soda
+{
+
+FDBGateway& FDBGateway::Instance()
+{
+	static FDBGatewayMongo Instance;
+	return Instance;
+}
+
+FDBGatewayMongo::FDBGatewayMongo()
+{
+}
+
+FDBGatewayMongo::~FDBGatewayMongo()
+{
+	if (MongoTaskManagerThread)
+	{
+		MongoTaskManagerThread->Kill();
+		delete MongoTaskManagerThread;
+	}
+	MongoTaskManagerThread = nullptr;
+}
+
+TFuture<bool> FDBGatewayMongo::AsyncTask(TUniqueFunction < bool()> Function, bool bSync)
+{
+	if (!MongoTaskManagerThread)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::AsyncTask(); FDBGatewayMongo isn't configured"));
+		SetLastError("FDBGatewayMongo isn't configured");
+		TPromise<bool> Promise;
+		Promise.SetValue(false);
+		return Promise.GetFuture();
+	}
+	return soda::AsyncTask(MongoTaskManager, MoveTemp(Function), bSync);
+}
+
+void FDBGatewayMongo::Configure(const FString& URL, const FString& InDatabaseName, bool bSync)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	if (Status == EDBGatewayStatus::Connecting)
+	{
+		return;
+	}
+
+	Status = EDBGatewayStatus::Connecting;
+
+	if (!Inst)
+	{
+		Inst = MakeUnique<mongocxx::instance>();
+	}
+
+	if (!MongoTaskManagerThread)
+	{
+		MongoTaskManagerThread = FRunnableThread::Create(&MongoTaskManager, TEXT("MongoTaskManager"));
+		if (MongoTaskManagerThread == nullptr)
+		{
+			UE_LOG(LogSoda, Fatal, TEXT("FDBGatewayMongo::AsyncTask(); Can't create MongoTaskManager"));
+		}
+	}
+
+	MongoTaskManager.ClearQueue();
+	soda::AsyncTaskLoop(MongoTaskManager, [this]() { Tick_MongoThread(); });
+
+	auto Future = AsyncTask([this, InDatabaseName, URL]()
+	{
+		Disable_MongoThread();
+		Pool = MakeUnique<mongocxx::pool>(mongocxx::uri{ TCHAR_TO_UTF8(*URL) });
+		GameThreadClient = Pool->try_acquire();
+		MongoThreadClient = Pool->try_acquire();
+		DatabaseName = InDatabaseName;
+
+		try
+		{
+			if (MongoThreadClient && *MongoThreadClient && **MongoThreadClient)
+			{
+				mongocxx::database DB = (**MongoThreadClient)[TCHAR_TO_UTF8(*DatabaseName)];
+				bsoncxx::document::value RetVal = DB.run_command(document{} << "ping" << 1 << finalize);
+				Status = EDBGatewayStatus::Connected;
+				return true;
+			}
+			else
+			{
+				Status = EDBGatewayStatus::Faild;
+				return false;
+			}
+		}
+		catch (const std::system_error& e)
+		{
+			LastError = FString("Can't connect to server; MongoDb error: ") + UTF8_TO_TCHAR(e.what());
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::Configure(); %s"), *LastError);
+			Status = EDBGatewayStatus::Faild;
+			::AsyncTask(ENamedThreads::GameThread, [LastError = LastError]() 
+			{
+				USodaGameModeComponent::GetChecked()->ShowMessageBox(soda::EMessageBoxType::OK, "MongoDB Faild", *LastError);
+			});
+			return false;
+		}
+	});
+
+	if (bSync)
+	{
+		Future.Get();
+	}
+}
+
+void FDBGatewayMongo::Disable_MongoThread()
+{
+	FScopeLock ScopeLock(&DatasetsLock);
+	Datasets.Empty();
+	GameThreadClient.reset();
+	MongoThreadClient.reset();
+	Pool.Reset();
+	DatabaseName = "";
+	bIsDatasetRecording = false;
+	DatasetID = -1;
+	DatasetCollectionName = "";
+	LastError = "";
+	bIsDatasetRecordingStalled = false;
+}
+
+void FDBGatewayMongo::Disable()
+{
+	auto Future = AsyncTask([this]()
+	{
+		Status = EDBGatewayStatus::Disabled;
+		Disable_MongoThread();
+		return true;
+	});
+
+	Future.Get();
+}
+
+mongocxx::pool::entry FDBGatewayMongo::GetConnection()
+{
+	return Pool->acquire();
+}
+
+bsoncxx::stdx::optional<mongocxx::pool::entry> FDBGatewayMongo::TryGetConnection()
+{
+	return Pool->try_acquire();
+}
+
+bool FDBGatewayMongo::BeginRecordDataset()
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	auto Future = AsyncTask([this]()
+	{
+		LastError = "";
+		bIsDatasetRecordingStalled = false;
+
+		if (Status != EDBGatewayStatus::Connected)
+		{
+			LastError = "The MongoDB isn't connected";
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::BeginRecordDataset(); %s"), *LastError);
+			return false;
+		}
+
+		{
+			FScopeLock ScopeLock(&DatasetsLock);
+			if (Datasets.Num())
+			{
+				LastError = "There is an unfinished session(s) from the previous dataset recording";
+				UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::BeginRecordDataset(); %s"), *LastError);
+				return false;
+			}
+		}
+
+		mongocxx::database DB = (**MongoThreadClient)[TCHAR_TO_UTF8(*DatabaseName)];
+		mongocxx::collection Collectioin = DB[COLLECTION_NAME_DATASETES];
+
+		DatasetID = 0;
+		try
+		{
+			mongocxx::options::find Opts;
+			Opts.sort(document{} << "_id" << -1 << finalize);
+			Opts.limit(1);
+			auto Cursor = Collectioin.find({}, Opts);
+			if (Cursor.begin() != Cursor.end())
+			{
+				auto Doc = *Cursor.begin();
+				DatasetID = Doc["_id"].get_int64() + 1;
+			}
+
+			Collectioin.insert_one((document{}
+				<< "_id" << std::int64_t(DatasetID)
+				<< "begin_ts" << std::int64_t(soda::NowRaw< std::chrono::system_clock, std::chrono::microseconds>())
+				<< "unreal_soda_ver" << TCHAR_TO_UTF8(UNREALSODA_VERSION_STRING)
+				<< "actors" << open_array << close_array
+				<< finalize
+			).view());
+		}
+		catch (const std::system_error& e)
+		{
+			LastError = FString("The \"find\" request failed on collection \"datasets\";  MongoDB error: ") + UTF8_TO_TCHAR(e.what());
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::BeginRecordDataset(); %s"), *LastError);
+			return false;
+		}
+
+		DatasetCollectionName = FString(COLLECTION_NAME_DATASETE_PREFIX) + FString::FromInt(DatasetID);
+
+		UE_LOG(LogSoda, Log, TEXT("FDBGatewayMongo::BeginRecordDataset(); Begin recording dataset; ID: %i"), DatasetID);
+
+		bIsDatasetRecording = true;
+		return true;
+	});
+
+	return Future.Get();
+}
+
+void FDBGatewayMongo::EndRecordDataset(EScenarioStopReason Reasone, bool bImmediately)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	auto Future = AsyncTask([this, Reasone, bImmediately]()
+	{
+		if(DatasetID >= 0 && bIsDatasetRecording)
+		{
+			mongocxx::database DB = (**MongoThreadClient)[TCHAR_TO_UTF8(*DatabaseName)];
+			mongocxx::collection Collectioin = DB[COLLECTION_NAME_DATASETES];
+			try
+			{
+				Collectioin.update_one(
+					document{} << "_id" << std::int64_t(DatasetID) << finalize,
+					document{} << "$set" 
+						<< open_document
+						<< "end_ts" << std::int64_t(soda::NowRaw< std::chrono::system_clock, std::chrono::microseconds>())
+						<< "end_reason" << TCHAR_TO_UTF8 (*ScenarioStopReasonToString(Reasone))
+						<< close_document
+					<< finalize
+				);
+			}
+			catch (const std::system_error& e)
+			{
+				SetLastError(FString("The \"update_one\" request failed on collection \"datasets\";  MongoDB error: ") + UTF8_TO_TCHAR(e.what()));
+				UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::EndRecordDataset(); %s"), *GetLastError());
+			}
+		}
+
+		bIsDatasetRecording = false;
+		DatasetID = -1;
+		DatasetCollectionName.Empty();
+
+		if (bImmediately || IsDatasetRecordingStalled())
+		{
+			ClearDatasetsQueue();
+		}
+
+		return true;
+	});
+
+	Future.Get();
+}
+
+void FDBGatewayMongo::Tick_MongoThread()
+{
+	using bsoncxx::builder::stream::finalize;
+
+	TArray<TSharedPtr<FActorDatasetData>> CopyDatasets;
+	{
+		FScopeLock ScopeLock(&DatasetsLock);
+		CopyDatasets = Datasets;
+	}
+
+	if (CopyDatasets.Num())
+	{
+		for (auto& It : CopyDatasets)
+		{
+			if (!It->IsInvalidate())
+			{
+				if (TSharedPtr<bsoncxx::builder::stream::document> Doc = It->Dequeue())
+				{
+					mongocxx::database DB = (**MongoThreadClient)[TCHAR_TO_UTF8(*DatabaseName)];
+					mongocxx::collection Collectioin = DB[TCHAR_TO_UTF8(*DatasetCollectionName)];
+
+					try
+					{
+						Collectioin.insert_one((*Doc << finalize).view());
+					}
+					catch (const std::system_error& e)
+					{
+						SetLastError(FString("Can't insert dociment to \"") + DatasetCollectionName + "\" collection; MongoDB error: " + UTF8_TO_TCHAR(e.what()));
+						UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::PushAsync(); %s"), *GetLastError());
+						It->SetIsInvalidate();
+					}
+				}
+			}
+
+			if (It->IsInvalidate())
+			{
+				StallDatasetRecording();
+			}
+
+			if (It->IsInvalidate() || !IsDatasetRecording())
+			{
+				FScopeLock ScopeLock(&DatasetsLock);
+				Datasets.Remove(It);
+			}
+		}
+	}
+}
+
+TSharedPtr<FActorDatasetData> FDBGatewayMongo::CreateActorDataset(const FString& ActorName, const FString& ActorType, const FString& ActorClassName, const bsoncxx::builder::stream::document& Description)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	TSharedPtr<FActorDatasetData> Dataset;
+	auto Future = AsyncTask([this, ActorName, ActorType, ActorClassName, &Description, &Dataset]()
+	{
+		if (GetStatus() == EDBGatewayStatus::Connected && IsDatasetRecording() && !bIsDatasetRecordingStalled)
+		{
+			Dataset = MakeShared<FActorDatasetData>(ActorName);
+			FScopeLock ScopeLock(&DatasetsLock);
+			Datasets.Add(Dataset);
+
+			mongocxx::database DB = (**MongoThreadClient)[TCHAR_TO_UTF8(*DatabaseName)];
+			mongocxx::collection Collectioin = DB[COLLECTION_NAME_DATASETES];
+
+			try
+			{
+				Collectioin.update_one(
+					document{} << "_id" << std::int64_t(DatasetID) << finalize,
+					document{} << "$push" 
+					<< open_document << "actors"
+					<< open_document 
+					<< "name" << TCHAR_TO_UTF8(*ActorName)
+					<< "type" << TCHAR_TO_UTF8(*ActorType)
+					<< "class" << TCHAR_TO_UTF8(*ActorClassName)
+					<< "description" << Description
+					<< close_document
+					<< close_document
+					<< finalize
+				);
+			}
+			catch (const std::system_error& e)
+			{
+				SetLastError(FString("Can't insert dociment to \"") + DatasetCollectionName + "\" collection; MongoDB error: " + UTF8_TO_TCHAR(e.what()));
+				UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::CreateActorDataset(); %s"), *GetLastError());
+				return false;
+			}
+			return true;
+
+		}
+		return false;
+	});
+
+	Future.Get();
+	return Dataset;
+}
+
+bool FDBGatewayMongo::SaveVehicleData(const FString& VehicleName, const bsoncxx::document::value& Data)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	auto Future = AsyncTask([this, VehicleName, &Data]()
+	{
+		if(!IsConnected())
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::SaveVehicleData(); MongoDB isn't connected"));
+			return false;
+		}
+
+		mongocxx::database DB = (**GetMongoThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+		mongocxx::collection Collectioin = DB[COLLECTION_NAME_VEHICLES];
+
+		try
+		{
+			mongocxx::options::replace Opts;
+			Opts.upsert(true);
+			Collectioin.replace_one(
+				document{} << "_id" << TCHAR_TO_UTF8(*VehicleName) << finalize,
+				document{} 
+					<< "_id" << TCHAR_TO_UTF8(*VehicleName)
+					<< "timestamp" << std::int64_t((FDateTime::Now().GetTicks() - FDateTime(1970, 1, 1).GetTicks()) / ETimespan::TicksPerMicrosecond)
+					<< "soda.sim" << Data
+					<< finalize,
+				Opts
+			);
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::SaveVehicleData(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+		return true;
+	});
+
+	return Future.Get();
+}
+
+bsoncxx::document::view FDBGatewayMongo::LoadVehicleData(const FString& VehicleName)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	bsoncxx::document::view View;
+
+	auto Future = AsyncTask([this, VehicleName, &View]()
+	{
+		if(!IsConnected())
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadVehicleData(); MongoDB isn't connected"));
+			return false;
+		}
+
+		mongocxx::database DB = (**GetGameThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+		mongocxx::collection Collectioin = DB[COLLECTION_NAME_VEHICLES];
+
+		try
+		{
+			auto Value = Collectioin.find_one(document{} << "_id" << TCHAR_TO_UTF8(*VehicleName) << finalize);
+			if (!Value)
+			{
+				return false;
+			}
+
+			View = Value->view()["soda.sim"].get_document().view();
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadVehicleData(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+
+		return true;
+	});
+
+	Future.Wait();// Get();
+	return View;
+}
+
+bool FDBGatewayMongo::DeleteVehicleData(const FString& VehicleName)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	auto Future = AsyncTask([this, VehicleName]()
+	{
+		try
+		{
+			mongocxx::database DB = (**GetGameThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+			mongocxx::collection Collectioin = DB[COLLECTION_NAME_VEHICLES];
+
+			auto Res = Collectioin.delete_one(document{} << "_id" << TCHAR_TO_UTF8(*VehicleName) << finalize);
+			return Res->deleted_count() > 0;
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::DeleteVehicleData(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+		return false;
+	});
+
+	return Future.Get();
+}
+
+bool FDBGatewayMongo::LoadVehiclesList(TArray<FVechicleSaveAddress>& Addresses)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	auto Future = AsyncTask([this, &Addresses]()
+	{
+		if (!IsConnected())
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadVehiclesList(); MongoDB isn't connected"));
+			return false;
+		}
+
+		try
+		{
+			mongocxx::database DB = (**GetGameThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+			mongocxx::collection Collectioin = DB[COLLECTION_NAME_VEHICLES];
+
+			mongocxx::options::find Opts;
+			//if(bSortByDateTime) Opts.sort(document{} << "timestamp" << -1 << finalize);
+			//Opts.allow_partial_results(true);
+			//Opts.projection(document{} << "bin" << 0 << finalize);
+
+			for (auto& It : Collectioin.find({}, Opts))
+			{
+				Addresses.Add(FVechicleSaveAddress(EVehicleSaveSource::DB, It["_id"].get_string().value.to_string().c_str()));
+			}
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadVehiclesList(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+		return true;
+	});
+
+	return Future.Get();
+}
+
+int64 FDBGatewayMongo::SaveLevelData(const FLevelStateSlotDescription & Slot, const TArray<uint8> & ObjectBytes)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	int64 ScenarioID = Slot.ScenarioID;
+
+	auto Future = AsyncTask([this, &Slot, &ObjectBytes, &ScenarioID]()
+	{
+		if(!IsConnected())
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::SaveLevelData(); MongoDB isn't connected"));
+			return false;
+		}
+
+		mongocxx::database DB = (**GetMongoThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+		mongocxx::collection Collectioin = DB[COLLECTION_NAME_SCENARIOS];
+
+		if (ScenarioID < 0)
+		{
+			try
+			{
+				mongocxx::options::find Opts;
+				Opts.sort(document{} << "_id" << -1 << finalize);
+				Opts.limit(1);
+				auto Cursor = Collectioin.find({}, Opts);
+				if (Cursor.begin() != Cursor.end())
+				{
+					auto Doc = *Cursor.begin();
+					ScenarioID = Doc["_id"].get_int64() + 1;
+				}
+				else
+				{
+					ScenarioID = 0;
+				}
+			}
+			catch (const std::system_error& e)
+			{
+				UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::SaveLevelData(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+				return false;
+			}
+		}
+
+		try
+		{
+			mongocxx::options::replace Opts;
+			Opts.upsert(true);
+			Collectioin.replace_one(
+				document{} << "_id" << std::int64_t(ScenarioID) << finalize,
+				document{} 
+					<< "_id" << std::int64_t(ScenarioID)
+					<< "timestamp" << std::int64_t((Slot.DateTime.GetTicks() - FDateTime(1970, 1, 1).GetTicks()) / ETimespan::TicksPerMicrosecond)
+					<< "description" << TCHAR_TO_UTF8(*Slot.Description)
+					<< "bin" << bsoncxx::types::b_binary{ bsoncxx::binary_sub_type::k_binary, (uint32_t)ObjectBytes.Num(), ObjectBytes.GetData()}
+					<< finalize,
+				Opts
+			);
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::SaveLevelData(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+		return true;
+	});
+
+	Future.Wait();
+	return ScenarioID;
+}
+
+bool FDBGatewayMongo::LoadLevelData(int64 ScenarioID, TArray<uint8>& OutObjectBytes)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	auto Future = AsyncTask([this, ScenarioID, &OutObjectBytes]()
+	{
+		if(!IsConnected())
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadLevelData(); MongoDB isn't connected"));
+			return false;
+		}
+
+		mongocxx::database DB = (**GetGameThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+		mongocxx::collection Collectioin = DB[COLLECTION_NAME_SCENARIOS];
+
+		try
+		{
+			auto Value = Collectioin.find_one(document{} << "_id" << std::int64_t(ScenarioID) << finalize);
+			if (!Value)
+			{
+				return false;
+			}
+
+			auto Bin = Value->view()["bin"].get_binary();
+			OutObjectBytes = TArray<uint8>(Bin.bytes, Bin.size);
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadLevelData(); MongoDB error: \"%s\""), *UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+
+		return true;
+	});
+
+	return Future.Get();
+}
+
+bool FDBGatewayMongo::DeleteLevelData(int64 ScenarioID)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	if (ScenarioID < 0)
+	{
+		return false;
+	}
+
+	auto Future = AsyncTask([this, ScenarioID]()
+	{
+		try
+		{
+			mongocxx::database DB = (**GetGameThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+			mongocxx::collection Collectioin = DB[COLLECTION_NAME_SCENARIOS];
+
+			auto Res = Collectioin.delete_one(document{} << "_id" << std::int64_t(ScenarioID) << finalize);
+			return Res->deleted_count() > 0;
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::DeleteLevelData(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+		return false;
+	});
+
+	return Future.Get();
+}
+
+bool FDBGatewayMongo::LoadLevelList(const FString& LevelName, bool bSortByDateTime, TArray<FLevelStateSlotDescription>& OutSlots)
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+
+	OutSlots.Empty();
+
+	auto Future = AsyncTask([this, &OutSlots, bSortByDateTime, LevelName]()
+	{
+		if (!IsConnected())
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadLevelList(); MongoDB isn't connected"));
+			return false;
+		}
+
+		try
+		{
+			mongocxx::database DB = (**GetGameThreadClient())[TCHAR_TO_UTF8(*GetDatabaseName())];
+			mongocxx::collection Collectioin = DB[COLLECTION_NAME_SCENARIOS];
+
+			mongocxx::options::find Opts;
+			if(bSortByDateTime) Opts.sort(document{} << "timestamp" << -1 << finalize);
+			Opts.allow_partial_results(true);
+			Opts.projection(document{} << "bin" << 0 << finalize);
+
+			for (auto& It : Collectioin.find({}, Opts))
+			{
+				FLevelStateSlotDescription & SlotRef = OutSlots.Add_GetRef(FLevelStateSlotDescription());
+				SlotRef.ScenarioID = It["_id"].get_int64();
+				SlotRef.SlotIndex = -1;
+				SlotRef.Description = It["description"].get_string().value.to_string().c_str();
+				SlotRef.DateTime = FDateTime(1970, 1, 1) + FTimespan(It["timestamp"].get_int64() * ETimespan::TicksPerMicrosecond);
+				SlotRef.LevelName = LevelName;
+				SlotRef.SlotSource = ELeveSlotSource::Remote;
+			}
+		}
+		catch (const std::system_error& e)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FDBGatewayMongo::LoadLevelList(); MongoDB error: \"%s\""), UTF8_TO_TCHAR(e.what()));
+			return false;
+		}
+		return true;
+	});
+
+	return Future.Get();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Editor/MeshUtils.hpp b/Source/UnrealSoda/Private/Editor/MeshUtils.hpp
new file mode 100644
index 0000000..cc82e6e
--- /dev/null
+++ b/Source/UnrealSoda/Private/Editor/MeshUtils.hpp
@@ -0,0 +1,527 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Materials/Material.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "DynamicMeshBuilder.h"
+
+
+namespace MeshUtils
+{
+
+inline uint32 AddVertex (const FVector3f& InPosition, const FVector2f& InTextureCoordinate, const FVector3f& InTangentX, const FVector3f& InTangentY, const FVector3f& InTangentZ, const FColor& InColor, TArray<FDynamicMeshVertex>& InOutVertices)
+{
+	int32 VertexIndex = InOutVertices.Num();
+	auto& Vertex = InOutVertices.Add_GetRef({});
+	Vertex.Position = InPosition;
+	Vertex.TextureCoordinate[0] = InTextureCoordinate;
+	Vertex.TangentX = InTangentX;
+	Vertex.TangentZ = InTangentZ;
+	Vertex.TangentZ.Vector.W = GetBasisDeterminantSignByte(InTangentX, InTangentY, InTangentZ);
+	Vertex.Color = InColor;
+	return VertexIndex;
+}
+
+//void BuildConeVerts(float Angle1, float Angle2, float Scale, float XOffset, uint32 NumSides, TArray<FDynamicMeshVertex>& OutVerts, TArray<uint32>& OutIndices);
+
+inline void BuildCylinderVerts(const FVector& Base, const FVector& XAxis, const FVector& YAxis, const FVector& ZAxis, double Radius, double HalfHeight, uint32 Sides, TArray<FDynamicMeshVertex>& OutVerts, TArray<uint32>& OutIndices)
+{
+	const float	AngleDelta = 2.0f * UE_PI / Sides;
+	FVector	LastVertex = Base + XAxis * Radius;
+
+	FVector2D TC = FVector2D(0.0f, 0.0f);
+	float TCStep = 1.0f / Sides;
+
+	FVector TopOffset = HalfHeight * ZAxis;
+
+	int32 BaseVertIndex = OutVerts.Num();
+
+	//Compute vertices for base circle.
+	for (uint32 SideIndex = 0; SideIndex < Sides; SideIndex++)
+	{
+		const FVector Vertex = Base + (XAxis * FMath::Cos(AngleDelta * (SideIndex + 1)) + YAxis * FMath::Sin(AngleDelta * (SideIndex + 1))) * Radius;
+		FVector Normal = Vertex - Base;
+		Normal.Normalize();
+
+		FDynamicMeshVertex MeshVertex;
+
+		MeshVertex.Position = FVector3f(Vertex - TopOffset);
+		MeshVertex.TextureCoordinate[0] = FVector2f(TC);
+
+		MeshVertex.SetTangents(
+			(FVector3f)-ZAxis,
+			FVector3f((-ZAxis) ^ Normal),
+			(FVector3f)Normal
+		);
+
+		OutVerts.Add(MeshVertex); //Add bottom vertex
+
+		LastVertex = Vertex;
+		TC.X += TCStep;
+	}
+
+	LastVertex = Base + XAxis * Radius;
+	TC = FVector2D(0.0f, 1.0f);
+
+	//Compute vertices for the top circle
+	for (uint32 SideIndex = 0; SideIndex < Sides; SideIndex++)
+	{
+		const FVector Vertex = Base + (XAxis * FMath::Cos(AngleDelta * (SideIndex + 1)) + YAxis * FMath::Sin(AngleDelta * (SideIndex + 1))) * Radius;
+		FVector Normal = Vertex - Base;
+		Normal.Normalize();
+
+		FDynamicMeshVertex MeshVertex;
+
+		MeshVertex.Position = FVector3f(Vertex + TopOffset);
+		MeshVertex.TextureCoordinate[0] = FVector2f(TC);
+
+		MeshVertex.SetTangents(
+			(FVector3f)-ZAxis,
+			FVector3f((-ZAxis) ^ Normal),
+			(FVector3f)Normal
+		);
+
+		OutVerts.Add(MeshVertex); //Add top vertex
+
+		LastVertex = Vertex;
+		TC.X += TCStep;
+	}
+
+	//Add top/bottom triangles, in the style of a fan.
+	//Note if we wanted nice rendering of the caps then we need to duplicate the vertices and modify
+	//texture/tangent coordinates.
+	for (uint32 SideIndex = 1; SideIndex < Sides; SideIndex++)
+	{
+		int32 V0 = BaseVertIndex;
+		int32 V1 = BaseVertIndex + SideIndex;
+		int32 V2 = BaseVertIndex + ((SideIndex + 1) % Sides);
+
+		//bottom
+		OutIndices.Add(V0);
+		OutIndices.Add(V1);
+		OutIndices.Add(V2);
+
+		// top
+		OutIndices.Add(Sides + V2);
+		OutIndices.Add(Sides + V1);
+		OutIndices.Add(Sides + V0);
+	}
+
+	//Add sides.
+
+	for (uint32 SideIndex = 0; SideIndex < Sides; SideIndex++)
+	{
+		int32 V0 = BaseVertIndex + SideIndex;
+		int32 V1 = BaseVertIndex + ((SideIndex + 1) % Sides);
+		int32 V2 = V0 + Sides;
+		int32 V3 = V1 + Sides;
+
+		OutIndices.Add(V0);
+		OutIndices.Add(V2);
+		OutIndices.Add(V1);
+
+		OutIndices.Add(V2);
+		OutIndices.Add(V3);
+		OutIndices.Add(V1);
+	}
+}
+
+void DrawBox( const FVector& Radii, const FMaterialRenderProxy* MaterialRenderProxy, uint8 DepthPriorityGroup, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+	// Calculate verts for a face pointing down Z
+	FVector3f Positions[4] =
+	{
+		FVector3f(-1, -1, +1),
+		FVector3f(-1, +1, +1),
+		FVector3f(+1, +1, +1),
+		FVector3f(+1, -1, +1)
+	};
+	FVector2f UVs[4] =
+	{
+		FVector2f(0,0),
+		FVector2f(0,1),
+		FVector2f(1,1),
+		FVector2f(1,0),
+	};
+
+	// Then rotate this face 6 times
+	FRotator3f FaceRotations[6];
+	FaceRotations[0] = FRotator3f(0, 0, 0);
+	FaceRotations[1] = FRotator3f(90.f, 0, 0);
+	FaceRotations[2] = FRotator3f(-90.f, 0, 0);
+	FaceRotations[3] = FRotator3f(0, 0, 90.f);
+	FaceRotations[4] = FRotator3f(0, 0, -90.f);
+	FaceRotations[5] = FRotator3f(180.f, 0, 0);
+
+
+	for (int32 f = 0; f < 6; f++)
+	{
+		FMatrix44f FaceTransform = FRotationMatrix44f(FaceRotations[f]);
+
+		uint32 VertexIndices[4];
+		for (int32 VertexIndex = 0; VertexIndex < 4; VertexIndex++)
+		{
+			VertexIndices[VertexIndex] = AddVertex(
+				FaceTransform.TransformPosition(Positions[VertexIndex]),
+				UVs[VertexIndex],
+				FaceTransform.TransformVector(FVector3f(1, 0, 0)),
+				FaceTransform.TransformVector(FVector3f(0, 1, 0)),
+				FaceTransform.TransformVector(FVector3f(0, 0, 1)),
+				FColor::White,
+				OutVertices
+			);
+		}
+
+		OutIndices.Append({ VertexIndices[0], VertexIndices[1], VertexIndices[2] });
+		OutIndices.Append({ VertexIndices[0], VertexIndices[2], VertexIndices[3] });
+	}
+}
+
+inline void DrawCornerHelper(const FMatrix& LocalToWorld, const FVector& Length, float Thickness, TArray<FDynamicMeshVertex> & OutVertices, TArray<uint32> & OutIndices)
+{
+	const float TH = Thickness;
+
+	float TX = Length.X/2;
+	float TY = Length.Y/2;
+	float TZ = Length.Z/2;
+
+	// Top
+	{
+		uint32 VertexIndices[4];
+		VertexIndices[0] = AddVertex( FVector3f(-TX, -TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White, OutVertices);
+		VertexIndices[1] = AddVertex( FVector3f(-TX, +TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White, OutVertices);
+		VertexIndices[2] = AddVertex( FVector3f(+TX, +TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White, OutVertices);
+		VertexIndices[3] = AddVertex( FVector3f(+TX, -TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White, OutVertices);
+
+		OutIndices.Append({ VertexIndices[0],VertexIndices[1],VertexIndices[2] });
+		OutIndices.Append({ VertexIndices[0],VertexIndices[2],VertexIndices[3] });
+	}
+
+	//Left
+	{
+		uint32 VertexIndices[4];
+		VertexIndices[0] = AddVertex( FVector3f(-TX,  -TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White, OutVertices);
+		VertexIndices[1] = AddVertex( FVector3f(-TX, -TY, TZ),		FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White, OutVertices);
+		VertexIndices[2] = AddVertex( FVector3f(-TX, +TY, TZ),		FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White, OutVertices);
+		VertexIndices[3] = AddVertex( FVector3f(-TX, +TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White, OutVertices);
+
+		OutIndices.Append({ VertexIndices[0],VertexIndices[1],VertexIndices[2] });
+		OutIndices.Append({ VertexIndices[0],VertexIndices[2],VertexIndices[3] });
+	}
+
+	// Front
+	{
+		uint32 VertexIndices[5];
+		VertexIndices[0] = AddVertex( FVector3f(-TX,	+TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White, OutVertices);
+		VertexIndices[1] = AddVertex( FVector3f(-TX,	+TY, +TZ  ),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White, OutVertices);
+		VertexIndices[2] = AddVertex( FVector3f(+TX-TH, +TY, +TX  ),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White, OutVertices);
+		VertexIndices[3] = AddVertex( FVector3f(+TX,	+TY, +TZ  ),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White, OutVertices);
+		VertexIndices[4] = AddVertex( FVector3f(+TX-TH, +TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White, OutVertices);
+
+		OutIndices.Append({ VertexIndices[0],VertexIndices[1],VertexIndices[2] });
+		OutIndices.Append({ VertexIndices[0],VertexIndices[2],VertexIndices[4] });
+		OutIndices.Append({ VertexIndices[4],VertexIndices[2],VertexIndices[3] });
+	}
+
+	// Back
+	{
+		uint32 VertexIndices[5];
+		VertexIndices[0] = AddVertex( FVector3f(-TX,	-TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White, OutVertices);
+		VertexIndices[1] = AddVertex( FVector3f(-TX,	-TY, +TZ),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White, OutVertices);
+		VertexIndices[2] = AddVertex( FVector3f(+TX-TH, -TY, +TX),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White, OutVertices);
+		VertexIndices[3] = AddVertex( FVector3f(+TX,	-TY, +TZ),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White, OutVertices);
+		VertexIndices[4] = AddVertex( FVector3f(+TX-TH, -TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White, OutVertices);
+
+		OutIndices.Append({ VertexIndices[0],VertexIndices[1],VertexIndices[2] });
+		OutIndices.Append({ VertexIndices[0],VertexIndices[2],VertexIndices[4] });
+		OutIndices.Append({ VertexIndices[4],VertexIndices[2],VertexIndices[3] });
+	}
+	// Bottom
+	{
+		uint32 VertexIndices[4];
+		VertexIndices[0] = AddVertex( FVector3f(-TX, -TY, TZ-TH),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White, OutVertices);
+		VertexIndices[1] = AddVertex( FVector3f(-TX, +TY, TZ-TH),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White, OutVertices);
+		VertexIndices[2] = AddVertex( FVector3f(+TX-TH, +TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White, OutVertices);
+		VertexIndices[3] = AddVertex( FVector3f(+TX-TH, -TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White, OutVertices);
+
+		OutIndices.Append({ VertexIndices[0],VertexIndices[1],VertexIndices[2] });
+		OutIndices.Append({ VertexIndices[0],VertexIndices[2],VertexIndices[3] });
+	}
+}
+
+inline void DrawColoredSphere(const FVector& Center, const FRotator& Orientation, FColor Color, const FVector& Radii, uint32 NumSides, uint32 NumRings, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+
+	// The first/last arc are on top of each other.
+	uint32 NumVerts = (NumSides + 1) * (NumRings + 1);
+
+	TArray<FDynamicMeshVertex> Verts;
+	Verts.SetNum(NumVerts);
+
+	TArray<FDynamicMeshVertex> ArcVerts;
+	ArcVerts.SetNum(NumRings + 1);
+
+	for (uint32 i = 0; i < NumRings + 1; i++)
+	{
+		FDynamicMeshVertex* ArcVert = &ArcVerts[i];
+
+		float angle = ((float)i / NumRings) * PI;
+
+		ArcVert->Color = Color;
+		// Note- unit sphere, so position always has mag of one. We can just use it for normal!			
+		ArcVert->Position.X = 0.0f;
+		ArcVert->Position.Y = FMath::Sin(angle);
+		ArcVert->Position.Z = FMath::Cos(angle);
+
+		ArcVert->SetTangents(
+			FVector3f(1, 0, 0),
+			FVector3f(0.0f, -ArcVert->Position.Z, ArcVert->Position.Y),
+			ArcVert->Position
+		);
+
+		ArcVert->TextureCoordinate[0].X = 0.0f;
+		ArcVert->TextureCoordinate[0].Y = ((float)i / NumRings);
+	}
+
+	// Then rotate this arc NumSides+1 times.
+	for (uint32 s = 0; s < NumSides + 1; s++)
+	{
+		FRotator3f ArcRotator(0, 360.f * (float)s / NumSides, 0);
+		FRotationMatrix44f ArcRot(ArcRotator);
+		float XTexCoord = ((float)s / NumSides);
+
+		for (uint32 v = 0; v < NumRings + 1; v++)
+		{
+			int32 VIx = (NumRings + 1)*s + v;
+			Verts[VIx].Color = Color;
+			Verts[VIx].Position = ArcRot.TransformPosition(ArcVerts[v].Position);
+
+			Verts[VIx].SetTangents(
+				ArcRot.TransformVector(ArcVerts[v].TangentX.ToFVector3f()),
+				ArcRot.TransformVector(ArcVerts[v].GetTangentY()),
+				ArcRot.TransformVector(ArcVerts[v].TangentZ.ToFVector3f())
+			);
+
+			Verts[VIx].TextureCoordinate[0].X = XTexCoord;
+			Verts[VIx].TextureCoordinate[0].Y = ArcVerts[v].TextureCoordinate[0].Y;
+		}
+	}
+
+	// Add all of the vertices we generated to the mesh builder.
+	for (uint32 VertIdx = 0; VertIdx < NumVerts; VertIdx++)
+	{
+		OutVertices.Add(Verts[VertIdx]);
+	}
+
+	// Add all of the triangles we generated to the mesh builder.
+	for (uint32 s = 0; s < NumSides; s++)
+	{
+		uint32 a0start = (s + 0) * (NumRings + 1);
+		uint32 a1start = (s + 1) * (NumRings + 1);
+
+		for (uint32 r = 0; r < NumRings; r++)
+		{
+			OutIndices.Append({ a0start + r + 0, a1start + r + 0, a0start + r + 1 });
+			OutIndices.Append({ a1start + r + 0, a1start + r + 1, a0start + r + 1 });
+		}
+	}
+}
+
+/**
+ * Renders a portion of an arc for the rotation widget
+ * @param InParams - Material, Radii, etc
+ * @param InStartAxis - Start of the arc, in radians
+ * @param InEndAxis - End of the arc, in radians
+ * @param InColor - Color to use for the arc
+ */
+inline void DrawThickArc (uint32 CircleSides, float InnerRadius, float OuterRadius, const FVector& Axis0, const FVector& Axis1, const float InStartAngle, const float InEndAngle, const FColor& InColor, bool bIsOrtho, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+	if (InColor.A == 0)
+	{
+		return;
+	}
+
+	// Add more sides to the circle if we've been scaled up to keep the circle looking circular
+	// An extra side for every 5 extra unreal units seems to produce a nice result
+	const uint32 NumPoints = FMath::TruncToInt(CircleSides * (InEndAngle-InStartAngle)/(PI/2)) + 1;
+
+	FColor TriangleColor = InColor;
+	FColor RingColor = InColor;
+	RingColor.A = MAX_uint8;
+
+	FVector ZAxis = Axis0 ^ Axis1;
+	FVector LastWorldVertex;
+
+	for (uint32 RadiusIndex = 0; RadiusIndex < 2; ++RadiusIndex)
+	{
+		float Radius = (RadiusIndex == 0) ? OuterRadius : InnerRadius;
+		float TCRadius = Radius / (float) OuterRadius;
+		//Compute vertices for base circle.
+		for(uint32 VertexIndex = 0;VertexIndex <= NumPoints;VertexIndex++)
+		{
+			float Percent = VertexIndex/(float)NumPoints;
+			float Angle = FMath::Lerp(InStartAngle, InEndAngle, Percent);
+			float AngleDeg = FRotator::ClampAxis(Angle * 180.f / PI);
+
+			FVector VertexDir = Axis0.RotateAngleAxis(AngleDeg, ZAxis);
+			VertexDir.Normalize();
+
+			float TCAngle = Percent*(PI/2);
+			FVector2f TC(TCRadius*FMath::Cos(Angle), TCRadius*FMath::Sin(Angle));
+
+			// Keep the vertices in local space so that we don't lose precision when dealing with LWC
+			const FVector VertexPosition = VertexDir*Radius;
+			FVector Normal = VertexPosition;
+			Normal.Normalize();
+
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)VertexPosition;
+			MeshVertex.Color = TriangleColor;
+			MeshVertex.TextureCoordinate[0] = TC;
+
+			MeshVertex.SetTangents(
+				(FVector3f)-ZAxis,
+				FVector3f((-ZAxis) ^ Normal),
+				(FVector3f)Normal
+				);
+
+			OutVertices.Add(MeshVertex); //Add bottom vertex
+
+			// Push out the arc line borders so they dont z-fight with the mesh arcs
+			// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+			FVector StartLinePos = LastWorldVertex;
+			FVector EndLinePos = VertexPosition;// + InParams.Position;
+			if (VertexIndex != 0)
+			{
+				//PDI->DrawLine(StartLinePos,EndLinePos,RingColor,SDPG_Foreground);
+			}
+			LastWorldVertex = EndLinePos;
+		}
+	}
+
+	//Add top/bottom triangles, in the style of a fan.
+	uint32 InnerVertexStartIndex = NumPoints + 1;
+	for(uint32 VertexIndex = 0; VertexIndex < NumPoints; VertexIndex++)
+	{
+		OutIndices.Append({ VertexIndex, VertexIndex + 1, InnerVertexStartIndex + VertexIndex });
+		OutIndices.Append({ VertexIndex + 1, InnerVertexStartIndex + VertexIndex + 1, InnerVertexStartIndex + VertexIndex });
+	}
+}
+
+/**
+ * Draws protractor like ticks where the rotation widget would snap too.
+ * Also, used to draw the wider axis tick marks
+ * @param PDI - Drawing interface
+ * @param InLocation - The Origin of the widget
+ * @param Axis0 - The Axis that describes a 0 degree rotation
+ * @param Axis1 - The Axis that describes a 90 degree rotation
+ * @param InAngle - The Angle to rotate about the axis of rotation, the vector (Axis0 ^ Axis1)
+ * @param InColor - The color to use for line/poly drawing
+ * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+ * @param InWidthPercent - The percent of the distance between the outer ring and inner ring to use for tangential thickness
+ * @param InPercentSize - The percent of the distance between the outer ring and inner ring to use for radial distance
+ */
+inline void DrawSnapMarker(float InnerDistance, float OuterDistance, const FVector& InLocation, const FVector& Axis0, const FVector& Axis1, const FColor& InColor, const float InScale, const float InWidthPercent, const float InPercentSize, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+	InnerDistance = (InnerDistance * InScale);
+	OuterDistance = (OuterDistance * InScale);
+	const float MaxMarkerHeight = OuterDistance - InnerDistance;
+	const float MarkerWidth = MaxMarkerHeight*InWidthPercent;
+	const float MarkerHeight = MaxMarkerHeight*InPercentSize;
+
+	FVector LocalVertices[4];
+	LocalVertices[0] = (OuterDistance)*Axis0 - (MarkerWidth*.5)*Axis1;
+	LocalVertices[1] = LocalVertices[0] + (MarkerWidth)*Axis1;
+	LocalVertices[2] = (OuterDistance-MarkerHeight)*Axis0 - (MarkerWidth*.5)*Axis1;
+	LocalVertices[3] = LocalVertices[2] + (MarkerWidth)*Axis1;
+
+	//draw at least one line
+	// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+	//PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[2] + InLocation, InColor, SDPG_Foreground);
+
+	//if there should be thickness, draw the other lines
+	if (InWidthPercent > 0.0f)
+	{
+		//PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[1] + InLocation, InColor, SDPG_Foreground);
+		//PDI->DrawLine(LocalVertices[1] + InLocation, LocalVertices[3] + InLocation, InColor, SDPG_Foreground);
+		//PDI->DrawLine(LocalVertices[2] + InLocation, LocalVertices[3] + InLocation, InColor, SDPG_Foreground);
+
+		//fill in the box
+		for(int32 VertexIndex = 0;VertexIndex < 4; VertexIndex++)
+		{
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)LocalVertices[VertexIndex];
+			MeshVertex.Color = InColor;
+			MeshVertex.TextureCoordinate[0] = FVector2f(0.0f, 0.0f);
+			MeshVertex.SetTangents(
+				(FVector3f)Axis0,
+				(FVector3f)Axis1,
+				FVector3f((Axis0) ^ Axis1)
+				);
+			OutVertices.Add(MeshVertex); //Add bottom vertex
+		}
+
+		OutIndices.Append({ 0, 1, 2 });
+		OutIndices.Append({ 1, 3, 2 });
+	}
+}
+
+/**
+ * Draw Start/Stop Marker to show delta rotations along the arc of rotation
+ * @param PDI - Drawing interface
+ * @param InLocation - The Origin of the widget
+ * @param Axis0 - The Axis that describes a 0 degree rotation
+ * @param Axis1 - The Axis that describes a 90 degree rotation
+ * @param InAngle - The Angle to rotate about the axis of rotation, the vector (Axis0 ^ Axis1), units are degrees
+ * @param InColor - The color to use for line/poly drawing
+ * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+ */
+inline void DrawStartStopMarker(float InnerDistance, float OuterDistance, const FVector& InLocation, const FVector& Axis0, const FVector& Axis1, const float InAngle, const FColor& InColor, const float InScale, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+	const float ArrowHeightPercent = .8f;
+	InnerDistance = (InnerDistance * InScale);
+	OuterDistance = (OuterDistance * InScale);
+	const float RingHeight = OuterDistance - InnerDistance;
+	const float ArrowHeight = RingHeight*ArrowHeightPercent;
+	const float ThirtyDegrees = PI / 6.0f;
+	const float HalfArrowidth = ArrowHeight*FMath::Tan(ThirtyDegrees);
+
+	FVector ZAxis = Axis0 ^ Axis1;
+	FVector RotatedAxis0 = Axis0.RotateAngleAxis(InAngle, ZAxis);
+	FVector RotatedAxis1 = Axis1.RotateAngleAxis(InAngle, ZAxis);
+
+	FVector LocalVertices[3];
+	LocalVertices[0] = (OuterDistance)*RotatedAxis0;
+	LocalVertices[1] = LocalVertices[0] + (ArrowHeight)*RotatedAxis0 - HalfArrowidth*RotatedAxis1;
+	LocalVertices[2] = LocalVertices[1] + (2*HalfArrowidth)*RotatedAxis1;
+
+	// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+	//PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[1] + InLocation, InColor, SDPG_Foreground);
+	//PDI->DrawLine(LocalVertices[1] + InLocation, LocalVertices[2] + InLocation, InColor, SDPG_Foreground);
+	//PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[2] + InLocation, InColor, SDPG_Foreground);
+
+	if (InColor.A > 0)
+	{
+		//fill in the box
+
+		for(int32 VertexIndex = 0;VertexIndex < 3; VertexIndex++)
+		{
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)LocalVertices[VertexIndex];
+			MeshVertex.Color = InColor;
+			MeshVertex.TextureCoordinate[0] = FVector2f(0.0f, 0.0f);
+			MeshVertex.SetTangents(
+				(FVector3f)RotatedAxis0,
+				(FVector3f)RotatedAxis1,
+				FVector3f((RotatedAxis0) ^ RotatedAxis1)
+				);
+			OutVertices.Add(MeshVertex); //Add bottom vertex
+		}
+
+		OutIndices.Append({ 0, 1, 2 });
+	}
+}
+
+} // namespace MeshUtils
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Editor/PreviewActor.cpp b/Source/UnrealSoda/Private/Editor/PreviewActor.cpp
new file mode 100644
index 0000000..39f5743
--- /dev/null
+++ b/Source/UnrealSoda/Private/Editor/PreviewActor.cpp
@@ -0,0 +1,221 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "PreviewActor.h"
+#include "Components/SceneComponent.h"
+#include "DynamicMeshBuilder.h"
+#include "Materials/MaterialInterface.h"
+#include "Materials/Material.h"
+
+#define INNER_AXIS_CIRCLE_RADIUS  48.0f
+#define OUTER_AXIS_CIRCLE_RADIUS  56.0f
+#define AXIS_CIRCLE_SIDES  24
+
+static void DrawThickArc(
+	FPrimitiveDrawInterface* PDI,
+	UMaterialInterface* Material,
+	const FVector& InLocation, 
+	float InnerRadius, 
+	float OuterRadius, 
+	const FVector& Axis0, 
+	const FVector& Axis1, 
+	const float InStartAngle, 
+	const float InEndAngle, 
+	const FColor& InColor)
+{
+	if (InColor.A == 0)
+	{
+		return;
+	}
+
+	const int32 NumPoints = FMath::TruncToInt(AXIS_CIRCLE_SIDES * (InEndAngle - InStartAngle) / (PI / 2)) + 1;
+
+	FColor TriangleColor = InColor;
+	FColor RingColor = InColor;
+	RingColor.A = MAX_uint8;
+
+	FVector ZAxis = Axis0 ^ Axis1;
+	FVector LastWorldVertex;
+
+	FDynamicMeshBuilder MeshBuilder(PDI->View->GetFeatureLevel());
+
+	for (int32 RadiusIndex = 0; RadiusIndex < 2; ++RadiusIndex)
+	{
+		float Radius = (RadiusIndex == 0) ? OuterRadius : InnerRadius;
+		float TCRadius = Radius / (float)OuterRadius;
+		//Compute vertices for base circle.
+		for (int32 VertexIndex = 0; VertexIndex <= NumPoints; VertexIndex++)
+		{
+			float Percent = VertexIndex / (float)NumPoints;
+			float Angle = FMath::Lerp(InStartAngle, InEndAngle, Percent);
+			float AngleDeg = FRotator::ClampAxis(Angle * 180.f / PI);
+
+			FVector VertexDir = Axis0.RotateAngleAxis(AngleDeg, ZAxis);
+			VertexDir.Normalize();
+
+			float TCAngle = Percent * (PI / 2);
+			FVector2f TC(TCRadius * FMath::Cos(Angle), TCRadius * FMath::Sin(Angle));
+
+			// Keep the vertices in local space so that we don't lose precision when dealing with LWC
+			// The local-to-world transform is handled in the MeshBuilder.Draw() call at the end of this function
+			const FVector VertexPosition = VertexDir * Radius;
+			FVector Normal = VertexPosition;
+			Normal.Normalize();
+
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)VertexPosition;
+			MeshVertex.Color = TriangleColor;
+			MeshVertex.TextureCoordinate[0] = TC;
+
+			MeshVertex.SetTangents(
+				(FVector3f)-ZAxis,
+				FVector3f((-ZAxis) ^ Normal),
+				(FVector3f)Normal
+			);
+
+			MeshBuilder.AddVertex(MeshVertex); //Add bottom vertex
+
+			// Push out the arc line borders so they dont z-fight with the mesh arcs
+			// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+			FVector StartLinePos = LastWorldVertex;
+			FVector EndLinePos = VertexPosition + InLocation;
+			if (VertexIndex != 0)
+			{
+				PDI->DrawLine(StartLinePos, EndLinePos, RingColor, SDPG_Foreground);
+			}
+			LastWorldVertex = EndLinePos;
+		}
+	}
+
+	//Add top/bottom triangles, in the style of a fan.
+	int32 InnerVertexStartIndex = NumPoints + 1;
+	for (int32 VertexIndex = 0; VertexIndex < NumPoints; VertexIndex++)
+	{
+		MeshBuilder.AddTriangle(VertexIndex, VertexIndex + 1, InnerVertexStartIndex + VertexIndex);
+		MeshBuilder.AddTriangle(VertexIndex + 1, InnerVertexStartIndex + VertexIndex + 1, InnerVertexStartIndex + VertexIndex);
+	}
+
+
+	MeshBuilder.Draw(PDI, FTranslationMatrix(InLocation), Material->GetRenderProxy(), SDPG_Foreground, 0.f);
+}
+
+static void DrawSnapMarker(
+	FPrimitiveDrawInterface* PDI,
+	UMaterialInterface* Material,
+	const FVector& InLocation, 
+	const FVector& Axis0, 
+	const FVector& Axis1, 
+	const FColor& InColor, 
+	const float InScale, 
+	const float InWidthPercent, 
+	const float InPercentSize = 1.0)
+{
+	const float InnerDistance = ((OUTER_AXIS_CIRCLE_RADIUS + 5) * InScale);
+	const float OuterDistance = ((OUTER_AXIS_CIRCLE_RADIUS + 20) * InScale);
+	const float MaxMarkerHeight = OuterDistance - InnerDistance;
+	const float MarkerWidth = MaxMarkerHeight * InWidthPercent;
+	const float MarkerHeight = MaxMarkerHeight * InPercentSize;
+
+	FVector LocalVertices[4];
+	LocalVertices[0] = (OuterDistance)*Axis0 - (MarkerWidth * .5) * Axis1;
+	LocalVertices[1] = LocalVertices[0] + (MarkerWidth)*Axis1;
+	LocalVertices[2] = (OuterDistance - MarkerHeight) * Axis0 - (MarkerWidth * .5) * Axis1;
+	LocalVertices[3] = LocalVertices[2] + (MarkerWidth)*Axis1;
+
+	//draw at least one line
+	// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+	PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[2] + InLocation, InColor, SDPG_Foreground);
+
+	//if there should be thickness, draw the other lines
+	if (InWidthPercent > 0.0f)
+	{
+		PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[1] + InLocation, InColor, SDPG_Foreground);
+		PDI->DrawLine(LocalVertices[1] + InLocation, LocalVertices[3] + InLocation, InColor, SDPG_Foreground);
+		PDI->DrawLine(LocalVertices[2] + InLocation, LocalVertices[3] + InLocation, InColor, SDPG_Foreground);
+
+
+		//fill in the box
+		FDynamicMeshBuilder MeshBuilder(PDI->View->GetFeatureLevel());
+
+		for (int32 VertexIndex = 0; VertexIndex < 4; VertexIndex++)
+		{
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)LocalVertices[VertexIndex];
+			MeshVertex.Color = InColor;
+			MeshVertex.TextureCoordinate[0] = FVector2f(0.0f, 0.0f);
+			MeshVertex.SetTangents(
+				(FVector3f)Axis0,
+				(FVector3f)Axis1,
+				FVector3f((Axis0) ^ Axis1)
+			);
+			MeshBuilder.AddVertex(MeshVertex); //Add bottom vertex
+		}
+
+		MeshBuilder.AddTriangle(0, 1, 2);
+		MeshBuilder.AddTriangle(1, 3, 2);
+		MeshBuilder.Draw(PDI, FTranslationMatrix(InLocation), Material->GetRenderProxy(), SDPG_Foreground, 0.f);
+	}
+}
+
+
+APreviewActor::APreviewActor(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	RootComponent = CreateDefaultSubobject< USceneComponent >(TEXT("Default"));
+
+	TransparentMaterial = (UMaterial*)StaticLoadObject(
+		UMaterial::StaticClass(), NULL,
+		TEXT("/SodaSim/Assets/CPP/EditorMaterials/WidgetVertexColorMaterial.WidgetVertexColorMaterial"), NULL, LOAD_None, NULL);
+
+	GridMaterial = (UMaterial*)StaticLoadObject(
+		UMaterial::StaticClass(), NULL,
+		TEXT("/SodaSim/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial_Ma.WidgetGridVertexColorMaterial_Ma"), NULL,
+		LOAD_None, NULL);
+
+	if (!GridMaterial)
+	{
+		GridMaterial = TransparentMaterial;
+	}
+}
+
+void APreviewActor::RenderTarget(FPrimitiveDrawInterface* PDI)
+{
+	static FVector XAxis = FVector(1, 0, 0);
+	static FVector YAxis = FVector(0, 1, 0);
+	static FVector ZAxis = FVector(0, 0, 1);
+
+	static FVector Axis0 = XAxis;
+	static FVector Axis1 = YAxis;
+
+	FVector Location = GetActorLocation();
+
+	//always draw clockwise, so if we're negative we need to flip the angle
+	float StartAngle = -PI;
+	float FilledAngle = PI * 2;
+
+	FColor ArcColor = FColor(100, 100, 250, 200);
+	const float InnerRadius = (INNER_AXIS_CIRCLE_RADIUS * RenderScale);
+	const float OuterRadius = (OUTER_AXIS_CIRCLE_RADIUS * RenderScale);
+
+	FColor OuterColor = ArcColor;
+	DrawThickArc(PDI, TransparentMaterial, Location, InnerRadius, OuterRadius, Axis0, Axis1, -PI, PI, OuterColor);
+
+	FColor InnerColor = ArcColor;
+	InnerColor.A = 50;
+	DrawThickArc(PDI, GridMaterial, Location, 0.0f, InnerRadius, Axis0, Axis1, -PI, PI, InnerColor);
+
+	//draw axis tick marks
+	FColor AxisColor = FLinearColor(0.0251f, 0.207f, 0.85f, 0.5).ToFColor(true);
+
+	//Rotate Colors to match Axis 0
+	Swap(AxisColor.R, AxisColor.G);
+	Swap(AxisColor.B, AxisColor.R);
+	DrawSnapMarker(PDI, TransparentMaterial, Location, Axis0, Axis1, AxisColor, RenderScale, .25f);
+	DrawSnapMarker(PDI, TransparentMaterial, Location, -Axis0, -Axis1, AxisColor, RenderScale, .25f);
+
+	//Rotate Colors to match Axis 1
+	Swap(AxisColor.R, AxisColor.G);
+	Swap(AxisColor.B, AxisColor.R);
+	DrawSnapMarker(PDI, TransparentMaterial, Location, Axis1, -Axis0, AxisColor, RenderScale, .25f);
+	DrawSnapMarker(PDI, TransparentMaterial, Location, -Axis1, Axis0, AxisColor, RenderScale, .25f);
+}
+
diff --git a/Source/UnrealSoda/Private/Editor/PreviewActor.h b/Source/UnrealSoda/Private/Editor/PreviewActor.h
new file mode 100644
index 0000000..0cf892d
--- /dev/null
+++ b/Source/UnrealSoda/Private/Editor/PreviewActor.h
@@ -0,0 +1,31 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "GameFramework/Actor.h"
+#include "PreviewActor.generated.h"
+
+class UMaterialInterface;
+class FPrimitiveDrawInterface;
+class UClass;
+
+UCLASS(MinimalAPI)
+class APreviewActor : public AActor
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	virtual void RenderTarget(FPrimitiveDrawInterface* PDI);
+	virtual bool SetPreviwActorClass(const UClass* Class) { return false; } // TODO
+
+protected:
+	UMaterialInterface* TransparentMaterial;
+	UMaterialInterface* GridMaterial;
+
+	float RenderScale = 1.0;
+};
+
+
+
diff --git a/Source/UnrealSoda/Private/Editor/SodaSelection.cpp b/Source/UnrealSoda/Private/Editor/SodaSelection.cpp
new file mode 100644
index 0000000..7e7c998
--- /dev/null
+++ b/Source/UnrealSoda/Private/Editor/SodaSelection.cpp
@@ -0,0 +1,252 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Editor/SodaSelection.h"
+#include "EngineUtils.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "DrawDebugHelpers.h"
+#include "Soda/Misc/EditorUtils.h"
+
+USodaSelection::USodaSelection(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+AActor* USodaSelection::GetSelectedActor() 
+{ 
+	return const_cast<AActor*>(SelectedActor); 
+}
+
+AActor* USodaSelection::GetHoveredActor() 
+{ 
+	return const_cast<AActor*>(HoveredActor);
+}
+
+void USodaSelection::Tick(FViewport* Viewport)
+{
+	if (!bIsTraking)
+	{
+		AActor * Actor = GetSodaActorUnderCursor(Viewport);
+
+		if (Actor && SelectedActor != Actor) // Hover
+		{
+			if (HoveredActor)
+			{
+				// TODO: HoveredActor->Unhover()
+			}
+			HoveredActor = Actor;
+			// TODO: HoveredActor->Hover()
+		}
+		else if (HoveredActor && (HoveredActor != Actor)) // Unhover
+		{
+			// TODO: HoveredActor->Unhover()
+			HoveredActor = nullptr;
+		}
+	}
+
+	if (SelectedActor && !IsValid(SelectedActor))
+	{
+		SelectedActor = nullptr;
+	}
+
+	if (HoveredActor && !IsValid(HoveredActor))
+	{
+		HoveredActor = nullptr;
+	}
+}
+
+bool USodaSelection::InputKey(const FInputKeyEventArgs& InEventArgs)
+{
+	bool bIsLeftMouseButtonDown = InEventArgs.Viewport->KeyState(EKeys::LeftMouseButton);
+	bool bIsLeftMouseButtonEvent = InEventArgs.Key == EKeys::LeftMouseButton;
+
+	if (bIsLeftMouseButtonEvent)
+	{
+		if (InEventArgs.Event == IE_Pressed)
+		{
+			bIsTraking = true;
+			MouseDelta = FVector2D::ZeroVector;
+		}
+		else if (InEventArgs.Event == IE_Released)
+		{
+			bIsTraking = false;
+			if (MouseDelta.Size() < 0.5)
+			{
+				AActor* Actor = GetSodaActorUnderCursor(InEventArgs.Viewport);
+				if (Actor)
+				{
+					if (Actor != SelectedActor)
+					{
+						SelectActor(HoveredActor, nullptr); // Select Actor
+					}
+					else if (SelectedActor) 	// Unselect Actor
+					{
+						UnselectActor();
+					}
+				}
+				else if (SelectedActor)
+				{
+					UnselectActor(); // Unselect Actor
+				}
+			}
+			MouseDelta = FVector2D::ZeroVector;
+		}
+		//return true;
+	}
+	return false;
+}
+
+bool USodaSelection::InputAxis(FViewport* Viewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples, bool bGamepad)
+{
+	if(bIsTraking)
+	{
+		MouseDelta += FVector2D(Key == EKeys::MouseX ? Delta : 0, Key == EKeys::MouseY ? Delta : 0);
+	}
+	return false;
+}
+
+AActor * USodaSelection::GetSodaActorUnderCursor(FViewport* Viewport)
+{
+	check(Viewport);
+
+	UWorld * World = USodaGameModeComponent::GetChecked()->GetWorld();
+	check(World);
+
+	int32 X = Viewport->GetMouseX();
+	int32 Y = Viewport->GetMouseY();
+
+	FVector Origin;
+	FVector Direction;
+	if (FEditorUtils::DeprojectScreenToWorld(World, FVector2D(X, Y), Origin, Direction))
+	{
+		TArray<FHitResult> Hits;
+		FCollisionQueryParams Param(SCENE_QUERY_STAT(WidgetTrace), true);
+		const FVector RayEnd = Origin + Direction * HALF_WORLD_MAX;
+		if (World->LineTraceMultiByObjectType(Hits, Origin, RayEnd, FCollisionObjectQueryParams(FCollisionObjectQueryParams::InitType::AllObjects), Param))
+		{
+			float ClosestHitDistanceSqr = TNumericLimits<float>::Max();
+			AActor* ClosestActor = nullptr;
+			for (const FHitResult& Hit : Hits)
+			{
+				if (Hit.GetActor() && Hit.GetActor()->GetClass()->ImplementsInterface(USodaActor::StaticClass()))
+				{
+					const float DistanceToHitSqr = (Hit.ImpactPoint - Origin).SizeSquared();
+					if (DistanceToHitSqr < ClosestHitDistanceSqr)
+					{
+						ClosestHitDistanceSqr = DistanceToHitSqr;
+						ClosestActor = Hit.GetActor();
+					}
+				}
+			}
+
+			return ClosestActor;
+		}
+	}
+	return nullptr;
+}
+
+bool USodaSelection::SelectActor(const AActor* Actor, const UPrimitiveComponent* PrimComponent)
+{
+	if (bIsSelectedActorFreezed)
+	{
+		return false;
+	}
+
+	if (!IsValid(Actor))
+	{
+		return false;
+	}
+
+	if (!Actor->GetClass()->ImplementsInterface(USodaActor::StaticClass()))
+	{
+		return false;
+	}
+
+	if (SelectedActor == Actor)
+	{
+		return true;
+	}
+
+	UnselectActor();
+
+	SelectedActor = Actor;
+	if (SelectedActor == HoveredActor)
+	{
+		HoveredActor = nullptr;
+	}
+
+	ISodaActor::Execute_OnSelect(const_cast<AActor*>(Actor), PrimComponent);
+
+	RetargetWidgetForSelectedActor();
+
+	return true;
+}
+
+void USodaSelection::UnselectActor()
+{
+	if (IsValid(SelectedActor) && bIsSelectedActorFreezed)
+	{
+		return;
+	}
+
+	if (IsValid(SelectedActor))
+	{
+		if (SelectedActor->GetClass()->ImplementsInterface(USodaActor::StaticClass()))
+		{
+			ISodaActor::Execute_OnUnselect(const_cast<AActor*>(SelectedActor));
+		}
+
+		if (USodaGameViewportClient* ViewportClient = Cast<USodaGameViewportClient>(GetWorld()->GetGameViewport()))
+		{
+			ViewportClient->SetWidgetTarget(nullptr);
+		}
+	}
+
+	SelectedActor = nullptr;
+	UnfreeseSelectedActor();
+}
+
+void USodaSelection::RetargetWidgetForSelectedActor()
+{
+	if (IsValid(SelectedActor))
+	{
+		if (USodaGameViewportClient* ViewportClient = Cast<USodaGameViewportClient>(GetWorld()->GetGameViewport()))
+		{
+			if (USodaGameModeComponent::GetChecked()->GetSodaActorDescriptor(SelectedActor->GetClass()).bAllowTransform)
+			{
+				ViewportClient->SetWidgetTarget(SelectedActor->GetRootComponent());
+			}
+		}
+	}
+}
+
+void USodaSelection::DrawDebugBoxes()
+{
+	if (IsValid(SelectedActor))
+	{
+		FVector BoundOrigin, BoundExtent;
+		SelectedActor->GetActorBounds(true, BoundOrigin, BoundExtent);
+		DrawDebugBox(GetWorld(), BoundOrigin, BoundExtent, FColor(0, 255, 0), false, 0, 0, 5);
+	}
+
+	if (IsValid(HoveredActor))
+	{
+		FVector BoundOrigin, BoundExtent;
+		HoveredActor->GetActorBounds(true, BoundOrigin, BoundExtent);
+		DrawDebugBox(GetWorld(), BoundOrigin, BoundExtent, FColor(255, 255, 0), false, 0, 0, 5);
+	}
+}
+
+void USodaSelection::FreeseSelectedActor()
+{
+	if (IsValid(SelectedActor))
+	{
+		bIsSelectedActorFreezed = true;
+	}
+}
+
+void USodaSelection::UnfreeseSelectedActor()
+{
+	bIsSelectedActorFreezed = false;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Editor/SodaWidget.h b/Source/UnrealSoda/Private/Editor/SodaWidget.h
new file mode 100644
index 0000000..b737571
--- /dev/null
+++ b/Source/UnrealSoda/Private/Editor/SodaWidget.h
@@ -0,0 +1,671 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "HitProxies.h"
+#include "UObject/GCObject.h"
+#include "Soda/SodaTypes.h"
+#include "Components/SphereComponent.h"
+#include "Components/BoxComponent.h"
+#include "Components/CapsuleComponent.h"
+#include "ProceduralMeshComponent.h"
+#include "SceneView.h"
+#include "Math/UnrealMathUtility.h"
+#include "SodaWidget.generated.h"
+
+/*
+* TODO: Need refact this shit-code
+*/
+
+class FCanvas;
+class FPrimitiveDrawInterface;
+class FSceneView;
+class UMaterialInstanceDynamic;
+class UMaterialInterface;
+class FMaterialRenderProxy;
+class USodaGameViewportClient;
+
+/**
+ * IAxisInterface
+ */
+UINTERFACE(BlueprintType)
+class UAxisInterface : public UInterface
+{
+	GENERATED_BODY()
+};
+class IAxisInterface
+{
+	GENERATED_BODY()
+
+public:
+	EAxisList::Type AxisList;
+};
+
+/**
+ * UAxisSphereComponent
+ */
+UCLASS(ClassGroup = Soda)
+class UAxisSphereComponent : public USphereComponent, public IAxisInterface
+{
+	GENERATED_BODY()
+};
+
+/**
+ * UAxisBoxComponent
+ */
+UCLASS(ClassGroup = Soda)
+class UAxisBoxComponent : public UBoxComponent, public IAxisInterface
+{
+	GENERATED_BODY()
+};
+
+/**
+ * UAxisProceduralMeshComponent
+ */
+UCLASS(ClassGroup = Soda)
+class UAxisProceduralMeshComponent : public UProceduralMeshComponent, public IAxisInterface
+{
+	GENERATED_BODY()
+
+public:
+	void CreateArc(const FVector& Axis0, const FVector& Axis1, const FMatrix & CoordSystem, const FVector& InDirectionToWidget, float InEndAngle, float InStartAngle, float InnerRadius, float OuterRadius);
+
+protected:
+	FVector StoreAxis0;
+	FVector StoreAxis1;
+	float StoreEndAngle;
+	float StoreStartAngle;
+	float StoreInnerRadius;
+	float StoreOuterRadius;
+};
+
+/**
+ * UAxisCapsuleComponent
+ */
+UCLASS(ClassGroup = Soda)
+class UAxisCapsuleComponent : public UCapsuleComponent, public IAxisInterface
+{
+	GENERATED_BODY()
+};
+
+
+/*
+ *  Simple struct used to create and group data related to the current window's / viewport's space,
+ *  orientation, and scale.
+ */
+struct FSpaceDescriptor
+{
+	/*
+	*  Creates a new FSpaceDescriptor.
+	*
+	*  @param View         The virtual view for the space.
+	*  @param Viewport     The real viewport for the space.
+	*  @param InLocation   The location of the camera in the virtual space.
+	*  @param ExternalScale ExtraScale Factor to apply to the UniformScale to allow for the Widget To Get Scaled.
+	*/
+	FSpaceDescriptor(const FSceneView* View, const USodaGameViewportClient* Viewport, const FVector& InLocation, const float ExternalScale) :
+		bIsPerspective(View->ViewMatrices.GetProjectionMatrix().M[3][3] < 1.0f),
+		bIsLocalSpace(false/*Viewport->GetWidgetCoordSystemSpace() == soda::COORD_Local*/),
+		bIsOrthoXY(!bIsPerspective && FMath::Abs(View->ViewMatrices.GetViewMatrix().M[2][2]) > 0.0f),
+		bIsOrthoXZ(!bIsPerspective && FMath::Abs(View->ViewMatrices.GetViewMatrix().M[1][2]) > 0.0f),
+		bIsOrthoYZ(!bIsPerspective && FMath::Abs(View->ViewMatrices.GetViewMatrix().M[0][2]) > 0.0f),
+		UniformScale(ExternalScale* View->WorldToScreen(InLocation).W* (4.0f / View->UnscaledViewRect.Width() / View->ViewMatrices.GetProjectionMatrix().M[0][0])),
+		Scale(CreateScale())
+	{
+	}
+
+	FSpaceDescriptor() {}
+
+	// Wether or not the view is perspective.
+	bool bIsPerspective;
+
+	// Whether or not the view is in local space.
+	bool bIsLocalSpace;
+
+	// Whether or not the view is orthogonal to the XY plane.
+	bool bIsOrthoXY;
+
+	// Whether or not the view is orthogonal to the XZ plane.
+	bool bIsOrthoXZ;
+
+	// Whether or not the view is orthogonal to the YZ plane.
+	bool bIsOrthoYZ;
+
+	// The uniform scale for the space.
+	float UniformScale;
+
+	// The scale vector for the space based on orientation.
+	FVector Scale;
+
+	/*
+	 *  Used to determine whether or not the X axis should be drawn.
+	 *
+	 *  @param AxisToDraw   The desired axis to draw.
+	 *
+	 *  @return True if the axis should be drawn. False otherwise.
+	 */
+	bool ShouldDrawAxisX(const EAxisList::Type AxisToDraw)
+	{
+		return ShouldDrawAxis(EAxisList::X, AxisToDraw, bIsOrthoYZ);
+	}
+
+	/*
+	 *  Used to determine whether or not the Y axis should be drawn.
+	 *
+	 *  @param AxisToDraw   The desired axis to draw.
+	 *
+	 *  @return True if the axis should be drawn. False otherwise.
+	 */
+	bool ShouldDrawAxisY(const EAxisList::Type AxisToDraw)
+	{
+		return ShouldDrawAxis(EAxisList::Y, AxisToDraw, bIsOrthoXZ);
+	}
+
+	/*
+	 *  Used to determine whether or not the Z axis should be drawn.
+	 *
+	 *  @param AxisToDraw   The desired axis to draw.
+	 *
+	 *  @return True if the axis should be drawn. False otherwise.
+	 */
+	bool ShouldDrawAxisZ(const EAxisList::Type AxisToDraw)
+	{
+		return ShouldDrawAxis(EAxisList::Z, AxisToDraw, bIsOrthoXY);
+	}
+
+private:
+
+	/*
+	 *  Creates a space scale vector from the determined orientation and uniform scale.
+	 *
+	 *  @return Space scale vector.
+	 */
+	FVector CreateScale()
+	{
+		if (bIsOrthoXY)
+		{
+			return FVector(UniformScale, UniformScale, 1.0f);
+		}
+		else if (bIsOrthoXZ)
+		{
+			return FVector(UniformScale, 1.0f, UniformScale);
+		}
+		else if (bIsOrthoYZ)
+		{
+			return FVector(1.0f, UniformScale, UniformScale);
+		}
+		else
+		{
+			return FVector(UniformScale, UniformScale, UniformScale);
+		}
+	}
+
+	/*
+	 *  Used to determine whether or not a specific axis should be drawn.
+	 *
+	 *  @param AxisToCheck  The axis to check.
+	 *  @param AxisToDraw   The desired axis to draw.
+	 *  @param bIsOrtho     Whether or not the axis to check is orthogonal to the viewing orientation.
+	 *
+	 *  @return True if the axis should be drawn. False otherwise.
+	 */
+	bool ShouldDrawAxis(const EAxisList::Type AxisToCheck, const EAxisList::Type AxisToDraw, const bool bIsOrtho)
+	{
+		return (AxisToCheck & AxisToDraw) && (bIsPerspective || bIsLocalSpace || !bIsOrtho);
+	}
+};
+
+
+/**
+ * ASodaWidget
+ * TODO: Full refact this facking crutch. 
+ * TODO: Move all redering functions to components render proxy
+ */
+UCLASS(ClassGroup = Soda)
+class ASodaWidget : public AActor
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	constexpr static float AXIS_LENGTH                         = 35.0f;
+	constexpr static float TRANSLATE_ROTATE_AXIS_CIRCLE_RADIUS = 20.0f;
+	constexpr static float TWOD_AXIS_CIRCLE_RADIUS             = 10.0f;
+	constexpr static float INNER_AXIS_CIRCLE_RADIUS            = 48.0f;
+	constexpr static float OUTER_AXIS_CIRCLE_RADIUS            = 56.0f;
+	constexpr static float ROTATION_TEXT_RADIUS                = 75.0f;
+	constexpr static int32 AXIS_CIRCLE_SIDES                   = 24;
+	constexpr static float ARCALL_RELATIVE_INNER_SIZE          = 0.75f;
+	constexpr static float AXIS_LENGTH_SCALE_OFFSET            = 5.0f;
+
+	constexpr static float TransformWidgetSizeAdjustment = 0.0;
+	constexpr static bool bAllowArcballRotate = false;
+	constexpr static bool bAllowScreenRotate = false;
+	constexpr static bool bRotGridEnabled = true;
+
+	constexpr static float ExternalScale = 1.0;
+
+	constexpr static uint8 LargeInnerAlpha = 0x3f;
+	constexpr static uint8 SmallInnerAlpha = 0x0f;
+	constexpr static uint8 LargeOuterAlpha = 0x7f;
+	constexpr static uint8 SmallOuterAlpha = 0x0f;
+
+public:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+
+public:
+	void TickWidget(USodaGameViewportClient* ViewportClient);
+	void DrawHUD(FCanvas* Canvas);
+	void Render(const FSceneView* View, FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient);
+
+	static EAxisList::Type GetAxisListAtScreenPos(UWorld * World, const FVector2D & ScreenPos);
+
+public:
+	/**
+	 * Converts mouse movement on the screen to widget axis movement/rotation.
+	 */
+	void ConvertMouseMovementToAxisMovement(FSceneView* InView, USodaGameViewportClient* InViewportClient,
+	                                        bool bInUsedDragModifier, FVector& InDiff, FVector& OutDrag,
+	                                        FRotator& OutRotation, FVector& OutScale);
+
+	/**
+	 * Absolute Translation conversion from mouse movement on the screen to widget axis movement/rotation.
+	 */
+	void AbsoluteTranslationConvertMouseMovementToAxisMovement(FSceneView* InView,
+	                                                          USodaGameViewportClient* InViewportClient,
+	                                                           const FVector& InLocation,
+	                                                           const FVector2D& InMousePosition, FVector& OutDrag,
+	                                                           FRotator& OutRotation, FVector& OutScale);
+
+	/** 
+	 * Grab the initial offset again first time input is captured
+	 */
+	void ResetInitialTranslationOffset(void)
+	{
+		bAbsoluteTranslationInitialOffsetCached = false;
+	}
+
+	/** Only some modes support Absolute Translation Movement.  Check current mode */
+	static bool AllowsAbsoluteTranslationMovement(soda::EWidgetMode WidgetMode);
+
+	/** Only some modes support Absolute Rotation Movement.  Check current mode */
+	static bool AllowsAbsoluteRotationMovement(soda::EWidgetMode WidgetMode, EAxisList::Type InAxisType);
+
+	/**
+	 * Sets the axis currently being moused over.  Typically called by FMouseDeltaTracker or FLevelEditorViewportClient.
+	 *
+	 * @param	InCurrentAxis	The new axis value.
+	 */
+	void SetCurrentAxis(EAxisList::Type InCurrentAxis)
+	{
+		CurrentAxis = InCurrentAxis;
+	}
+
+	/**
+	 * @return	The axis currently being moused over.
+	 */
+	EAxisList::Type GetCurrentAxis() const
+	{
+		return CurrentAxis;
+	}
+
+	/** 
+	 * @return	The widget origin in viewport space.
+	 */
+	FVector2D GetOrigin() const
+	{
+		return RenderData.Origin;
+	}
+
+	/**
+	 * @return	The mouse drag start position in viewport space.
+	 */
+	void SetDragStartPosition(const FVector2D& Position)
+	{
+		DragStartPos = Position;
+		LastDragPos  = DragStartPos;
+	}
+
+	/**
+	 * Returns whether we are actively dragging
+	 */
+	bool IsDragging(void) const
+	{
+		return bDragging;
+	}
+
+	/**
+	 * Sets if we are currently engaging the widget in dragging
+	 */
+	void SetDragging(const bool InDragging)
+	{
+		bDragging = InDragging;
+	}
+
+	/**
+	 * Sets if we are currently engaging the widget in dragging
+	 */
+	void SetSnapEnabled(const bool InSnapEnabled)
+	{
+		bSnapEnabled = InSnapEnabled;
+	}
+
+	/**
+	 * Gets the axis to draw based on the current widget mode
+	 */
+	EAxisList::Type GetAxisToDraw(soda::EWidgetMode WidgetMode) const;
+
+	/** @return true if the widget is disabled */
+	bool IsWidgetDisabled() const;
+
+	/** Updates the delta rotation on the widget */
+	void UpdateDeltaRotation();
+
+	/** Resets the total delta rotation back to zero */
+	void ResetDeltaRotation()
+	{
+		TotalDeltaRotation = 0;
+	}
+
+	/** @return the rotation speed of the widget */
+	static float GetRotationSpeed()
+	{
+		return (2.f * (float)PI) / 360.f;
+	}
+
+private:
+	void ConvertMouseToAxis_Translate(FVector2D DragDir, FVector& InOutDelta, FVector& OutDrag) const;
+	void ConvertMouseToAxis_Rotate(FVector2D TangentDir, FVector2D DragDir, FSceneView* InView,
+	                               USodaGameViewportClient* InViewportClient, FVector& InOutDelta, FRotator& OutRotation);
+	void ConvertMouseToAxis_Scale(FVector2D DragDir, FVector& InOutDelta, FVector& OutScale);
+	void ConvertMouseToAxis_TranslateRotateZ(FVector2D TangentDir, FVector2D DragDir, FVector& InOutDelta,
+	                                         FVector& OutDrag, FRotator& OutRotation);
+	void ConvertMouseToAxis_WM_2D(FVector2D TangentDir, FVector2D DragDir, FVector& InOutDelta, FVector& OutDrag,
+	                              FRotator& OutRotation);
+
+	struct FAbsoluteMovementParams
+	{
+		/** The normal of the plane to project onto */
+		FVector PlaneNormal;
+		/** A vector that represent any displacement we want to mute (remove an axis if we're doing axis movement)*/
+		FVector NormalToRemove;
+		/** The current position of the widget */
+		FVector Position;
+
+		//Coordinate System Axes
+		FVector XAxis;
+		FVector YAxis;
+		FVector ZAxis;
+
+		//true if camera movement is locked to the object
+		bool bMovementLockedToCamera;
+
+		//Direction in world space to the current mouse location
+		FVector PixelDir;
+		//Direction in world space of the middle of the camera
+		FVector CameraDir;
+		FVector EyePos;
+
+		//whether to snap the requested positionto the grid
+		bool bPositionSnapping;
+	};
+
+	void AbsoluteConvertMouseToAxis_Translate(FSceneView* InView, const FMatrix& InputCoordSystem, FAbsoluteMovementParams& InOutParams, FVector& OutDrag);
+	/**
+	 * Render helper functions
+	 */
+	void RenderGrid(const FSceneView* View, FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient);
+	void Render_Axis(const FSceneView* View, FPrimitiveDrawInterface* PDI, EAxisList::Type InAxis, FMatrix& InMatrix,
+	                 UMaterialInterface* InMaterial, const FLinearColor& InColor, FVector2D& OutAxisDir,
+	                 const FVector& InScale, bool bCubeHead = false, float AxisLengthOffset = 0);
+	void Render_Cube(FPrimitiveDrawInterface* PDI, const FMatrix& InMatrix, const UMaterialInterface* InMaterial, const FVector& InScale);
+
+	void Render_Translate(const FSceneView* View, FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient, const FVector& InLocation);
+	void Render_Rotate(const FSceneView* View, FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient, const FVector& InLocation);
+	void Render_Scale(const FSceneView* View, FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient, const FVector& InLocation);
+
+	struct FThickArcParams
+	{
+		FThickArcParams(FPrimitiveDrawInterface* InPDI, const FVector& InPosition, UMaterialInterface* InMaterial,
+		                const float InInnerRadius, const float InOuterRadius)
+		    : Position(InPosition)
+		    , PDI(InPDI)
+		    , Material(InMaterial)
+		    , InnerRadius(InInnerRadius)
+		    , OuterRadius(InOuterRadius)
+		{}
+
+		/** The current position of the widget */
+		FVector Position;
+
+		//interface for Drawing
+		FPrimitiveDrawInterface* PDI;
+
+		//Material to use to render
+		UMaterialInterface* Material;
+
+		//Radii
+		float InnerRadius;
+		float OuterRadius;
+	};
+
+	/**
+	 * Returns the Delta from the current position that the absolute movement system wants the object to be at
+	 * @param InParams - Structure containing all the information needed for absolute movement
+	 * @return - The requested delta from the current position
+	 */
+	FVector GetAbsoluteTranslationDelta(const FAbsoluteMovementParams& InParams);
+	/**
+	 * Returns the offset from the initial selection point
+	 */
+	FVector GetAbsoluteTranslationInitialOffset(const FVector& InNewPosition, const FVector& InCurrentPosition);
+
+	/**
+	 * Returns true if we're in Local Space editing mode or editing BSP (which uses the World axes anyway
+	 */
+	bool IsRotationLocalSpace() const;
+
+	/**
+	 * Returns how far we have just rotated
+	 */
+	float GetDeltaRotation() const;
+
+	/**
+	 * If actively dragging, draws a ring representing the potential rotation of the selected objects, snap ticks, and "delta" markers
+	 * If not actively dragging, draws a quarter ring representing the closest quadrant to the camera
+	 * @param View - Information about the scene/camera/etc
+	 * @param PDI - Drawing interface
+	 * @param InAxis - Enumeration of axis to rotate about
+	 * @param InLocation - The Origin of the widget
+	 * @param Axis0 - The Axis that describes a 0 degree rotation
+	 * @param Axis1 - The Axis that describes a 90 degree rotation
+	 * @param InColor - The color associated with the axis of rotation
+	 * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+	 * @param OutAxisDir - Viewport-space direction of rotation arc chord is placed here
+	 */
+	void DrawRotationArc(const FSceneView* View, FPrimitiveDrawInterface* PDI, EAxisList::Type InAxis,
+	                     const FVector& InLocation, const FVector& Axis0, const FVector& Axis1,
+	                     const FColor& InColor, const float InScale,
+	                     FVector2D& OutAxisEnd);
+
+	/**
+	 * If actively dragging, draws a ring representing the potential rotation of the selected objects, snap ticks, and "delta" markers
+	 * If not actively dragging, draws a quarter ring representing the closest quadrant to the camera
+	 * @param View - Information about the scene/camera/etc
+	 * @param PDI - Drawing interface
+	 * @param InAxis - Enumeration of axis to rotate about
+	 * @param InLocation - The Origin of the widget
+	 * @param Axis0 - The Axis that describes a 0 degree rotation
+	 * @param Axis1 - The Axis that describes a 90 degree rotation
+	 * @param InStartAngle - The starting angle about (Axis0^Axis1) to render the arc
+	 * @param InEndAngle - The ending angle about (Axis0^Axis1) to render the arc
+	 * @param InColor - The color associated with the axis of rotation
+	 * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+	 */
+	void DrawPartialRotationArc(const FSceneView* View, FPrimitiveDrawInterface* PDI, EAxisList::Type InAxis,
+	                            const FVector& InLocation, const FVector& Axis0, const FVector& Axis1,
+	                            const float InStartAngle, const float InEndAngle, const FColor& InColor,
+	                            const float InScale);
+
+	/**
+	 * Renders a portion of an arc for the rotation widget
+	 * @param InParams - Material, Radii, etc
+	 * @param InStartAxis - Start of the arc
+	 * @param InEndAxis - End of the arc
+	 * @param InColor - Color to use for the arc
+	 */
+	void DrawThickArc(const FThickArcParams& InParams, const FVector& Axis0, const FVector& Axis1,
+	                  const float InStartAngle, const float InEndAngle, const FColor& InColor, bool bIsOrtho);
+
+	/**
+	 * Draws protractor like ticks where the rotation widget would snap too.
+	 * Also, used to draw the wider axis tick marks
+	 * @param PDI - Drawing interface
+	 * @param InLocation - The Origin of the widget
+	 * @param Axis0 - The Axis that describes a 0 degree rotation
+	 * @param Axis1 - The Axis that describes a 90 degree rotation
+	 * @param InAngle - The Angle to rotate about the axis of rotation, the vector (Axis0 ^ Axis1)
+	 * @param InColor - The color to use for line/poly drawing
+	 * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+	 * @param InWidthPercent - The percent of the distance between the outer ring and inner ring to use for tangential thickness
+	 * @param InPercentSize - The percent of the distance between the outer ring and inner ring to use for radial distance
+	 */
+	void DrawSnapMarker(FPrimitiveDrawInterface* PDI, const FVector& InLocation, const FVector& Axis0,
+	                    const FVector& Axis1, const FColor& InColor, const float InScale,
+	                    const float InWidthPercent = 0.0f, const float InPercentSize = 1.0f);
+
+	/**
+	 * Draw Start/Stop Marker to show delta rotations along the arc of rotation
+	 * @param PDI - Drawing interface
+	 * @param InLocation - The Origin of the widget
+	 * @param Axis0 - The Axis that describes a 0 degree rotation
+	 * @param Axis1 - The Axis that describes a 90 degree rotation
+	 * @param InAngle - The Angle to rotate about the axis of rotation, the vector (Axis0 ^ Axis1)
+	 * @param InColor - The color to use for line/poly drawing
+	 * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+	 */
+	void DrawStartStopMarker(FPrimitiveDrawInterface* PDI, const FVector& InLocation, const FVector& Axis0,
+	                         const FVector& Axis1, const float InAngle, const FColor& InColor, const float InScale);
+
+	/**
+	 * Caches off HUD text to display after 3d rendering is complete
+	 * @param View - Information about the scene/camera/etc
+	 * @param PDI - Drawing interface
+	 * @param InLocation - The Origin of the widget
+	 * @param Axis0 - The Axis that describes a 0 degree rotation
+	 * @param Axis1 - The Axis that describes a 90 degree rotation
+	 * @param AngleOfAngle - angle we've rotated so far (in degrees)
+	 * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+	 */
+	void CacheRotationHUDText(const FSceneView* View, FPrimitiveDrawInterface* PDI, const FVector& InLocation,
+	                          const FVector& Axis0, const FVector& Axis1, const float AngleOfChange,
+	                          const float InScale);
+
+	/**
+	 * Gets the axis to use when converting mouse movement, accounting for Ortho views.
+	 *
+	 * @param InDiff Difference vector to determine dominant axis.
+	 * @param ViewportType Type of viewport for ortho checks.
+	 *
+	 * @return Index of the dominant axis.
+	 */
+	uint32 GetDominantAxisIndex(const FVector& InDiff, USodaGameViewportClient* ViewportClient) const;
+
+
+	void DrawColoredSphere(FPrimitiveDrawInterface* PDI, const FVector& Center, const FRotator& Orientation,
+	                       FColor Color, const FVector& Radii, int32 NumSides, int32 NumRings,
+	                       const FMaterialRenderProxy* MaterialRenderProxy, uint8 DepthPriority,
+	                       bool bDisableBackfaceCulling);
+
+	/** The axis currently being moused over */
+	EAxisList::Type CurrentAxis;
+
+
+	/** Viewport space direction vectors of the axes on the widget */
+	FVector2D XAxisDir, YAxisDir, ZAxisDir;
+	/** Drag start position in viewport space */
+	FVector2D DragStartPos;
+	/** Last mouse position in viewport space */
+	FVector2D LastDragPos;
+	enum
+	{
+		AXIS_ARROW_SEGMENTS = 16
+	};
+
+	/** Materials and colors to be used when drawing the items for each axis */
+	UMaterialInterface* TransparentPlaneMaterialXY;
+	UMaterialInterface* GridMaterial;
+
+	UPROPERTY()
+	UMaterialInstanceDynamic* AxisMaterialX;
+
+	UPROPERTY()
+	UMaterialInstanceDynamic* AxisMaterialY;
+
+	UPROPERTY()
+	UMaterialInstanceDynamic* AxisMaterialZ;
+
+	UPROPERTY()
+	UMaterialInstanceDynamic* CurrentAxisMaterial;
+
+	UPROPERTY()
+	UMaterialInstanceDynamic* OpaquePlaneMaterialXY;
+
+	UPROPERTY()
+	TArray<UPrimitiveComponent*> WidgetAxisComponents;
+
+	FLinearColor AxisColorX, AxisColorY, AxisColorZ;
+	FLinearColor ScreenAxisColor;
+	FColor PlaneColorXY, ScreenSpaceColor, CurrentColor;
+	FColor ArcBallColor;
+
+	// Data computed in the Render() func
+	struct FRenderData
+	{
+		FMatrix CoordSystem = FMatrix::Identity;
+		soda::ECoordSystem CoordSystemSpace = soda::COORD_World;
+		float UniformScale = 1.0;
+		FVector WidgetLocation;
+		soda::EWidgetMode WidgetMode = soda::EWidgetMode::WM_None;
+		FVector DirectionToWidget;
+		FSpaceDescriptor Space;
+
+		/** Viewport space origin location of the widget */
+		FVector2D Origin = FVector2D::ZeroVector;
+
+		bool bUpdated = false;
+	};
+
+	FRenderData RenderData;
+
+
+	bool bPrevMirrorAxis0 = false;
+	bool bPrevMirrorAxis1 = false;
+	bool bPrevMirrorAxis2 = false;
+
+	//location in the viewport to render the hud string
+	FVector2D HUDInfoPos;
+	//string to be displayed on top of the viewport
+	FString HUDString;
+
+	/** Whether Absolute Translation cache position has been captured */
+	bool bAbsoluteTranslationInitialOffsetCached;
+	/** The initial offset where the widget was first clicked */
+	FVector InitialTranslationOffset;
+	/** The initial position of the widget before it was clicked */
+	FVector InitialTranslationPosition;
+	/** Whether or not the widget is actively dragging */
+	bool bDragging;
+	/** Whether or not snapping is enabled for all actors */
+	bool bSnapEnabled;
+	/** Whether we are drawing the full ring in rotation mode (ortho viewports only) */
+	bool bIsOrthoDrawingFullRing;
+
+	/** Total delta rotation applied since the widget was dragged */
+	float TotalDeltaRotation;
+
+	/** Current delta rotation applied to the rotation widget */
+	float CurrentDeltaRotation;
+};
diff --git a/Source/UnrealSoda/Private/Editor/SodaWidgetRendering.cpp b/Source/UnrealSoda/Private/Editor/SodaWidgetRendering.cpp
new file mode 100644
index 0000000..a7b03ad
--- /dev/null
+++ b/Source/UnrealSoda/Private/Editor/SodaWidgetRendering.cpp
@@ -0,0 +1,997 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaWidget.h"
+#include "Materials/Material.h"
+#include "CanvasItem.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "DynamicMeshBuilder.h"
+#include "CanvasTypes.h"
+#include "Soda/SodaGameViewportClient.h"
+
+/**
+ * Renders any widget specific HUD text
+ * @param Canvas - Canvas to use for 2d rendering
+ */
+void ASodaWidget::DrawHUD (FCanvas* Canvas)
+{
+	if (HUDString.Len())
+	{
+		const float DPIScale = Canvas->GetDPIScale();
+		int32 StringPosX = FMath::FloorToInt(HUDInfoPos.X/DPIScale);
+		int32 StringPosY = FMath::FloorToInt(HUDInfoPos.Y/DPIScale);
+
+		//measure string size
+		int32 StringSizeX, StringSizeY;
+		StringSize(GEngine->GetSmallFont(), StringSizeX, StringSizeY, *HUDString);
+		
+		//add some padding to the outside
+		const int32 Border = 5;
+		int32 FillMinX = StringPosX - Border - (StringSizeX>>1);
+		int32 FillMinY = StringPosY - Border;// - (StringSizeY>>1);
+		StringSizeX += 2*Border;
+		StringSizeY += 2*Border;
+
+		//mostly alpha'ed black
+		FCanvasTileItem TileItem( FVector2D( FillMinX, FillMinY), GWhiteTexture, FVector2D( StringSizeX, StringSizeY ), FLinearColor( 0.0f, 0.0f, 0.0f, .25f ) );
+		TileItem.BlendMode = SE_BLEND_Translucent;
+		Canvas->DrawItem( TileItem );
+		FCanvasTextItem TextItem( FVector2D( StringPosX, StringPosY), FText::FromString( HUDString ), GEngine->GetSmallFont(), FLinearColor::White );
+		TextItem.bCentreX = true;
+		Canvas->DrawItem( TextItem );	
+	}
+}
+
+void ASodaWidget::Render( const FSceneView* View,FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient )
+{
+	check(ViewportClient);
+
+	//reset HUD text
+	HUDString.Empty();
+
+	// See if there is a custom coordinate system we should be using, only change it if we are drawing widgets.
+	RenderData.CoordSystem = ViewportClient->GetWidgetCoordSystem();
+	RenderData.CoordSystemSpace = ViewportClient->GetWidgetCoordSystemSpace();
+	RenderData.WidgetLocation = ViewportClient->GetWidgetLocation();
+
+	RenderData.Space = FSpaceDescriptor(View, ViewportClient, RenderData.WidgetLocation, ExternalScale);
+	RenderData.UniformScale = RenderData.Space.UniformScale;	
+	RenderData.DirectionToWidget = View->IsPerspectiveProjection() ? (RenderData.WidgetLocation - View->ViewMatrices.GetViewOrigin()) : -View->GetViewDirection();
+	RenderData.DirectionToWidget.Normalize();
+
+	FVector2D NewOrigin;
+	if (View->ScreenToPixel(View->WorldToScreen(RenderData.WidgetLocation), NewOrigin))
+	{
+		// Only update the viewport-space origin if the position was in front of the camera
+		RenderData.Origin = NewOrigin;
+	}
+
+	switch( ViewportClient->GetWidgetMode())
+	{
+		case soda::EWidgetMode::WM_Translate:
+			Render_Translate(View, PDI, ViewportClient, RenderData.WidgetLocation);
+			break;
+
+		case soda::EWidgetMode::WM_Rotate:
+			Render_Rotate(View, PDI, ViewportClient, RenderData.WidgetLocation);
+			break;
+
+		case soda::EWidgetMode::WM_Scale:
+			Render_Scale(View, PDI, ViewportClient, RenderData.WidgetLocation);
+			break;
+
+		default:
+			break;
+	}
+
+	RenderData.bUpdated = true;
+};
+
+/**
+ * Draws an arrow head line for a specific axis.
+ */
+void ASodaWidget::Render_Axis(const FSceneView* View, FPrimitiveDrawInterface* PDI, EAxisList::Type InAxis, FMatrix& InMatrix, UMaterialInterface* InMaterial, const FLinearColor& InColor, FVector2D& OutAxisDir, const FVector& InScale, bool bCubeHead, float AxisLengthOffset)
+{
+	FMatrix AxisRotation = FMatrix::Identity;
+	if( InAxis == EAxisList::Y )
+	{
+		AxisRotation = FRotationMatrix::MakeFromXZ(FVector(0, 1, 0), FVector(0, 0, 1));
+	}
+	else if( InAxis == EAxisList::Z )
+	{
+		AxisRotation = FRotationMatrix::MakeFromXY(FVector(0, 0, 1), FVector(0, 1, 0));
+	}
+
+	FMatrix ArrowToWorld = AxisRotation * InMatrix;
+
+	// The scale that is passed in potentially leaves one component with a scale of 1, if that happens
+	// we need to extract the inform scale and use it to construct the scale that transforms the primitives
+	float UniformScale = InScale.GetMax() > 1.0f ? InScale.GetMax() : InScale.GetMin() < 1.0f ? InScale.GetMin() : 1.0f;
+	// After the primitives have been scaled and transformed, we apply this inverse scale that flattens the dimension
+	// that was scaled up to prevent it from intersecting with the near plane.  In perspective this won't have any effect,
+	// but in the ortho viewports it will prevent scaling in the direction of the camera and thus intersecting the near plane.
+	FVector FlattenScale = FVector(InScale.Component(0) == 1.0f ? 1.0f / UniformScale : 1.0f, InScale.Component(1) == 1.0f ? 1.0f / UniformScale : 1.0f, InScale.Component(2) == 1.0f ? 1.0f / UniformScale : 1.0f);
+
+	FScaleMatrix Scale(UniformScale);
+	ArrowToWorld = Scale * ArrowToWorld;
+
+	const bool bDisabled = false; //EditorModeTools ? (EditorModeTools->IsDefaultModeActive() && GEditor->HasLockedActors() ) : false;
+
+	const float AxisLength = AXIS_LENGTH + TransformWidgetSizeAdjustment - (AxisLengthOffset * 2);
+	const float HalfHeight = AxisLength/2.0f;
+	const float CylinderRadius = 1.2f;
+	const FVector Offset(0, 0, HalfHeight + AxisLengthOffset);
+
+	switch( InAxis )
+	{
+		case EAxisList::X:
+		{
+			DrawCylinder(PDI, ( Scale * FRotationMatrix(FRotator(-90, 0.f, 0)) * InMatrix ) * FScaleMatrix(FlattenScale), Offset, FVector(1, 0, 0), FVector(0, 1, 0), FVector(0, 0, 1), CylinderRadius, HalfHeight, 16, InMaterial->GetRenderProxy(), SDPG_Foreground);
+			break;
+		}
+		case EAxisList::Y:
+		{
+			DrawCylinder(PDI, (Scale * FRotationMatrix(FRotator(0, 0, 90)) * InMatrix)* FScaleMatrix(FlattenScale), Offset, FVector(1, 0, 0), FVector(0, 1, 0), FVector(0, 0, 1), CylinderRadius, HalfHeight, 16, InMaterial->GetRenderProxy(), SDPG_Foreground );
+			break;
+		}
+		case EAxisList::Z:
+		{
+			DrawCylinder(PDI, ( Scale * InMatrix ) * FScaleMatrix(FlattenScale), Offset, FVector(1, 0, 0), FVector(0, 1, 0), FVector(0, 0, 1), CylinderRadius, HalfHeight, 16, InMaterial->GetRenderProxy(), SDPG_Foreground);
+			break;
+		}
+	}
+
+	if ( bCubeHead )
+	{
+		const float CubeHeadOffset = 3.0f;
+		FVector RootPos(AxisLength + CubeHeadOffset + AxisLengthOffset, 0, 0);
+
+		Render_Cube(PDI, (FTranslationMatrix(RootPos) * ArrowToWorld) * FScaleMatrix(FlattenScale), InMaterial, FVector(4.0f));
+	}
+	else
+	{
+		const float ConeHeadOffset = 12.0f;
+		FVector RootPos(AxisLength + ConeHeadOffset + AxisLengthOffset, 0, 0);
+
+		float Angle = FMath::DegreesToRadians( PI * 5 );
+		DrawCone(PDI, ( FScaleMatrix(-13) * FTranslationMatrix(RootPos) * ArrowToWorld ) * FScaleMatrix(FlattenScale), Angle, Angle, 32, false, FColor::White, InMaterial->GetRenderProxy(), SDPG_Foreground);
+	}
+
+	
+
+	FVector2D NewOrigin;
+	FVector2D AxisEnd;
+	const FVector AxisEndWorld = ArrowToWorld.TransformPosition(FVector(64, 0, 0));
+	const FVector WidgetOrigin = InMatrix.GetOrigin();
+
+	if (View->ScreenToPixel(View->WorldToScreen(WidgetOrigin), NewOrigin) &&
+		View->ScreenToPixel(View->WorldToScreen(AxisEndWorld), AxisEnd))
+	{
+		// If both the origin and the axis endpoint are in front of the camera, trivially calculate the viewport space axis direction
+		OutAxisDir = (AxisEnd - NewOrigin).GetSafeNormal();
+	}
+	else
+	{
+		// If either the origin or axis endpoint are behind the camera, translate the entire widget in front of the camera in the view direction before performing the
+		// viewport space calculation
+		const FMatrix InvViewMatrix = View->ViewMatrices.GetInvViewMatrix();
+		const FVector ViewLocation = InvViewMatrix.GetOrigin();
+		const FVector ViewDirection = InvViewMatrix.GetUnitAxis(EAxis::Z);
+		const FVector Offset2 = ViewDirection * (FVector::DotProduct(ViewLocation - WidgetOrigin, ViewDirection) + 100.0f);
+		const FVector AdjustedWidgetOrigin = WidgetOrigin + Offset2;
+		const FVector AdjustedWidgetAxisEnd = AxisEndWorld + Offset2;
+
+		if (View->ScreenToPixel(View->WorldToScreen(AdjustedWidgetOrigin), NewOrigin) &&
+			View->ScreenToPixel(View->WorldToScreen(AdjustedWidgetAxisEnd), AxisEnd))
+		{
+			OutAxisDir = -(AxisEnd - NewOrigin).GetSafeNormal();
+		}
+	}
+}
+
+void ASodaWidget::Render_Cube( FPrimitiveDrawInterface* PDI, const FMatrix& InMatrix, const UMaterialInterface* InMaterial, const FVector& InScale )
+{
+	const FMatrix CubeToWorld = FScaleMatrix(InScale) * InMatrix;
+	DrawBox( PDI, CubeToWorld, FVector(1,1,1), InMaterial->GetRenderProxy(), SDPG_Foreground );
+}
+
+void DrawCornerHelper( FPrimitiveDrawInterface* PDI, const FMatrix& LocalToWorld, const FVector& Length, float Thickness, const FMaterialRenderProxy* MaterialRenderProxy,uint8 DepthPriorityGroup  )
+{
+	const float TH = Thickness;
+
+	float TX = Length.X/2;
+	float TY = Length.Y/2;
+	float TZ = Length.Z/2;
+
+	FDynamicMeshBuilder MeshBuilder(PDI->View->GetFeatureLevel());
+
+	// Top
+	{
+		int32 VertexIndices[4];
+		VertexIndices[0] = MeshBuilder.AddVertex( FVector3f(-TX, -TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White );
+		VertexIndices[1] = MeshBuilder.AddVertex( FVector3f(-TX, +TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White );
+		VertexIndices[2] = MeshBuilder.AddVertex( FVector3f(+TX, +TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White );
+		VertexIndices[3] = MeshBuilder.AddVertex( FVector3f(+TX, -TY, +TZ), FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,1,0), FVector3f(0,0,1), FColor::White );
+
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[1],VertexIndices[2]);
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[2],VertexIndices[3]);
+	}
+
+	//Left
+	{
+		int32 VertexIndices[4];
+		VertexIndices[0] = MeshBuilder.AddVertex( FVector3f(-TX,  -TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White );
+		VertexIndices[1] = MeshBuilder.AddVertex( FVector3f(-TX, -TY, TZ),		FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White );
+		VertexIndices[2] = MeshBuilder.AddVertex( FVector3f(-TX, +TY, TZ),		FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White );
+		VertexIndices[3] = MeshBuilder.AddVertex( FVector3f(-TX, +TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(0,0,1), FVector3f(0,1,0), FVector3f(-1,0,0), FColor::White );
+
+
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[1],VertexIndices[2]);
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[2],VertexIndices[3]);
+	}
+
+	// Front
+	{
+		int32 VertexIndices[5];
+		VertexIndices[0] = MeshBuilder.AddVertex( FVector3f(-TX,	+TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White );
+		VertexIndices[1] = MeshBuilder.AddVertex( FVector3f(-TX,	+TY, +TZ  ),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White );
+		VertexIndices[2] = MeshBuilder.AddVertex( FVector3f(+TX-TH, +TY, +TX  ),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White );
+		VertexIndices[3] = MeshBuilder.AddVertex( FVector3f(+TX,	+TY, +TZ  ),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White );
+		VertexIndices[4] = MeshBuilder.AddVertex( FVector3f(+TX-TH, +TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,1,0), FColor::White );
+
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[1],VertexIndices[2]);
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[2],VertexIndices[4]);
+		MeshBuilder.AddTriangle(VertexIndices[4],VertexIndices[2],VertexIndices[3]);
+	}
+
+	// Back
+	{
+		int32 VertexIndices[5];
+		VertexIndices[0] = MeshBuilder.AddVertex( FVector3f(-TX,	-TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White );
+		VertexIndices[1] = MeshBuilder.AddVertex( FVector3f(-TX,	-TY, +TZ),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White );
+		VertexIndices[2] = MeshBuilder.AddVertex( FVector3f(+TX-TH, -TY, +TX),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White );
+		VertexIndices[3] = MeshBuilder.AddVertex( FVector3f(+TX,	-TY, +TZ),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White );
+		VertexIndices[4] = MeshBuilder.AddVertex( FVector3f(+TX-TH, -TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,1), FVector3f(0,-1,0), FColor::White );
+
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[1],VertexIndices[2]);
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[2],VertexIndices[4]);
+		MeshBuilder.AddTriangle(VertexIndices[4],VertexIndices[2],VertexIndices[3]);
+	}
+	// Bottom
+	{
+		int32 VertexIndices[4];
+		VertexIndices[0] = MeshBuilder.AddVertex( FVector3f(-TX, -TY, TZ-TH),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White ); 
+		VertexIndices[1] = MeshBuilder.AddVertex( FVector3f(-TX, +TY, TZ-TH),		FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White );
+		VertexIndices[2] = MeshBuilder.AddVertex( FVector3f(+TX-TH, +TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White );
+		VertexIndices[3] = MeshBuilder.AddVertex( FVector3f(+TX-TH, -TY, TZ-TH),	FVector2f::ZeroVector, FVector3f(1,0,0), FVector3f(0,0,-1), FVector3f(0,0,1), FColor::White );
+
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[1],VertexIndices[2]);
+		MeshBuilder.AddTriangle(VertexIndices[0],VertexIndices[2],VertexIndices[3]);
+	}
+	MeshBuilder.Draw(PDI,LocalToWorld,MaterialRenderProxy,DepthPriorityGroup,0.f);
+}
+
+void DrawDualAxis( FPrimitiveDrawInterface* PDI, const FMatrix& BoxToWorld,const FVector& Length, float Thickness, const FMaterialRenderProxy* AxisMat,const FMaterialRenderProxy* Axis2Mat )
+{
+	DrawCornerHelper(PDI, BoxToWorld, Length, Thickness, Axis2Mat, SDPG_Foreground);
+	DrawCornerHelper(PDI, FScaleMatrix(FVector(-1, 1, 1)) * FRotationMatrix(FRotator(-90, 0, 0)) * BoxToWorld, Length, Thickness, AxisMat, SDPG_Foreground);
+}
+
+void ASodaWidget::Render_Translate( const FSceneView* View, FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient, const FVector& InLocation)
+{
+	// Figure out axis colors
+	const FLinearColor& XColor = ( CurrentAxis&EAxisList::X ? (FLinearColor)CurrentColor : AxisColorX );
+	const FLinearColor& YColor = ( CurrentAxis&EAxisList::Y ? (FLinearColor)CurrentColor : AxisColorY );
+	const FLinearColor& ZColor = ( CurrentAxis&EAxisList::Z ? (FLinearColor)CurrentColor : AxisColorZ );
+	FColor CurrentScreenColor = ( CurrentAxis & EAxisList::Screen ? CurrentColor : ScreenSpaceColor );
+
+	// Figure out axis matrices
+	FMatrix WidgetMatrix = RenderData.CoordSystem * FTranslationMatrix( InLocation );
+	const EAxisList::Type DrawAxis = GetAxisToDraw( ViewportClient->GetWidgetMode() );
+	const bool bDisabled = IsWidgetDisabled();
+
+	// Draw the axis lines with arrow heads
+	if( RenderData.Space.ShouldDrawAxisX(DrawAxis) )
+	{
+		UMaterialInstanceDynamic* XMaterial = ( CurrentAxis&EAxisList::X ? CurrentAxisMaterial : AxisMaterialX );
+		Render_Axis( View, PDI, EAxisList::X, WidgetMatrix, XMaterial, XColor, XAxisDir, RenderData.Space.Scale );
+	}
+
+	if( RenderData.Space.ShouldDrawAxisY(DrawAxis) )
+	{
+		UMaterialInstanceDynamic* YMaterial = ( CurrentAxis&EAxisList::Y ? CurrentAxisMaterial : AxisMaterialY );
+		Render_Axis( View, PDI, EAxisList::Y, WidgetMatrix, YMaterial, YColor, YAxisDir, RenderData.Space.Scale );
+	}
+
+	if( RenderData.Space.ShouldDrawAxisZ(DrawAxis) )
+	{
+		UMaterialInstanceDynamic* ZMaterial = ( CurrentAxis&EAxisList::Z ? CurrentAxisMaterial : AxisMaterialZ );
+		Render_Axis( View, PDI, EAxisList::Z, WidgetMatrix, ZMaterial, ZColor, ZAxisDir, RenderData.Space.Scale );
+	}
+
+	// Draw the grabbers
+	FVector CornerPos = FVector(7, 0, 7) * RenderData.Space.UniformScale;
+	FVector AxisSize = FVector(12, 1.2, 12) * RenderData.Space.UniformScale;
+	float CornerLength = 1.2f * RenderData.Space.UniformScale;
+
+	// After the primitives have been scaled and transformed, we apply this inverse scale that flattens the dimension
+	// that was scaled up to prevent it from intersecting with the near plane.  In perspective this won't have any effect,
+	// but in the ortho viewports it will prevent scaling in the direction of the camera and thus intersecting the near plane.
+	FVector FlattenScale = FVector(RenderData.Space.Scale.Component(0) == 1.0f ? 1.0f / RenderData.Space.UniformScale : 1.0f, RenderData.Space.Scale.Component(1) == 1.0f ? 1.0f / RenderData.Space.UniformScale : 1.0f, RenderData.Space.Scale.Component(2) == 1.0f ? 1.0f / RenderData.Space.UniformScale : 1.0f);
+
+	if (RenderData.Space.bIsPerspective || RenderData.Space.bIsLocalSpace || RenderData.Space.bIsOrthoXY)
+	{
+		if( (DrawAxis&EAxisList::XY) == EAxisList::XY )							// Top
+		{
+			UMaterialInstanceDynamic* XMaterial = ( (CurrentAxis&EAxisList::XY) == EAxisList::XY ? CurrentAxisMaterial : AxisMaterialX );
+			UMaterialInstanceDynamic* YMaterial = ( (CurrentAxis&EAxisList::XY) == EAxisList::XY? CurrentAxisMaterial : AxisMaterialY );
+			{
+				DrawDualAxis(PDI, ( FTranslationMatrix(CornerPos) * FRotationMatrix(FRotator(0, 0, 90)) * WidgetMatrix ) * FScaleMatrix(FlattenScale), AxisSize, CornerLength, XMaterial->GetRenderProxy(), YMaterial->GetRenderProxy());
+			}
+		}
+	}
+
+	if (RenderData.Space.bIsPerspective || RenderData.Space.bIsLocalSpace || RenderData.Space.bIsOrthoXZ)		// Front
+	{
+		if( (DrawAxis&EAxisList::XZ) == EAxisList::XZ ) 
+		{
+			UMaterialInstanceDynamic* XMaterial = ( (CurrentAxis&EAxisList::XZ) == EAxisList::XZ ? CurrentAxisMaterial : AxisMaterialX );
+			UMaterialInstanceDynamic* ZMaterial = ( (CurrentAxis&EAxisList::XZ) == EAxisList::XZ ? CurrentAxisMaterial : AxisMaterialZ );
+
+			DrawDualAxis(PDI, (FTranslationMatrix(CornerPos) * WidgetMatrix) * FScaleMatrix(FlattenScale), AxisSize, CornerLength, XMaterial->GetRenderProxy(), ZMaterial->GetRenderProxy() );
+		}
+	}
+
+	if( RenderData.Space.bIsPerspective || RenderData.Space.bIsLocalSpace || RenderData.Space.bIsOrthoYZ )		// Side
+	{
+		if( (DrawAxis&EAxisList::YZ) == EAxisList::YZ ) 
+		{
+			UMaterialInstanceDynamic* YMaterial = ( (CurrentAxis&EAxisList::YZ) == EAxisList::YZ ? CurrentAxisMaterial : AxisMaterialY );
+			UMaterialInstanceDynamic* ZMaterial = ( (CurrentAxis&EAxisList::YZ) == EAxisList::YZ ? CurrentAxisMaterial : AxisMaterialZ );
+			DrawDualAxis(PDI, (FTranslationMatrix(CornerPos) * FRotationMatrix(FRotator(0, 90, 0)) * WidgetMatrix) * FScaleMatrix(FlattenScale), AxisSize, CornerLength, YMaterial->GetRenderProxy(), ZMaterial->GetRenderProxy() );
+		}
+	}
+	
+
+	// Draw screen-space movement handle (circle)
+	if(( DrawAxis & EAxisList::Screen ) && RenderData.Space.bIsPerspective )
+	{
+		const FVector CameraXAxis = View->ViewMatrices.GetViewMatrix().GetColumn(0);
+		const FVector CameraYAxis = View->ViewMatrices.GetViewMatrix().GetColumn(1);
+		const FVector CameraZAxis = View->ViewMatrices.GetViewMatrix().GetColumn(2);
+
+		UMaterialInstanceDynamic* XYZMaterial = ( CurrentAxis&EAxisList::Screen) ? CurrentAxisMaterial : OpaquePlaneMaterialXY;
+		DrawSphere( PDI, InLocation, FRotator::ZeroRotator, 4.0f * RenderData.Space.Scale, 10, 5, XYZMaterial->GetRenderProxy(), SDPG_Foreground );
+	}
+}
+
+void ASodaWidget::DrawColoredSphere(FPrimitiveDrawInterface* PDI, const FVector& Center, const FRotator& Orientation, FColor Color, const FVector& Radii, int32 NumSides, int32 NumRings, const FMaterialRenderProxy* MaterialRenderProxy, uint8 DepthPriority, bool bDisableBackfaceCulling)
+{
+	// Use a mesh builder to draw the sphere.
+	FDynamicMeshBuilder MeshBuilder(PDI->View->GetFeatureLevel());
+	{
+		// The first/last arc are on top of each other.
+		int32 NumVerts = (NumSides + 1) * (NumRings + 1);
+		FDynamicMeshVertex* Verts = (FDynamicMeshVertex*)FMemory::Malloc(NumVerts * sizeof(FDynamicMeshVertex));
+
+		// Calculate verts for one arc
+		FDynamicMeshVertex* ArcVerts = (FDynamicMeshVertex*)FMemory::Malloc((NumRings + 1) * sizeof(FDynamicMeshVertex));
+
+		for (int32 i = 0; i < NumRings + 1; i++)
+		{
+			FDynamicMeshVertex* ArcVert = &ArcVerts[i];
+
+			float angle = ((float)i / NumRings) * PI;
+
+			ArcVert->Color = Color;
+			// Note- unit sphere, so position always has mag of one. We can just use it for normal!			
+			ArcVert->Position.X = 0.0f;
+			ArcVert->Position.Y = FMath::Sin(angle);
+			ArcVert->Position.Z = FMath::Cos(angle);
+
+			ArcVert->SetTangents(
+				FVector3f(1, 0, 0),
+				FVector3f(0.0f, -ArcVert->Position.Z, ArcVert->Position.Y),
+				ArcVert->Position
+			);
+
+			ArcVert->TextureCoordinate[0].X = 0.0f;
+			ArcVert->TextureCoordinate[0].Y = ((float)i / NumRings);
+		}
+
+		// Then rotate this arc NumSides+1 times.
+		for (int32 s = 0; s < NumSides + 1; s++)
+		{
+			FRotator3f ArcRotator(0, 360.f * (float)s / NumSides, 0);
+			FRotationMatrix44f ArcRot(ArcRotator);
+			float XTexCoord = ((float)s / NumSides);
+
+			for (int32 v = 0; v < NumRings + 1; v++)
+			{
+				int32 VIx = (NumRings + 1)*s + v;
+				Verts[VIx].Color = Color;
+				Verts[VIx].Position = ArcRot.TransformPosition(ArcVerts[v].Position);
+
+				Verts[VIx].SetTangents(
+					ArcRot.TransformVector(ArcVerts[v].TangentX.ToFVector3f()),
+					ArcRot.TransformVector(ArcVerts[v].GetTangentY()),
+					ArcRot.TransformVector(ArcVerts[v].TangentZ.ToFVector3f())
+				);
+
+				Verts[VIx].TextureCoordinate[0].X = XTexCoord;
+				Verts[VIx].TextureCoordinate[0].Y = ArcVerts[v].TextureCoordinate[0].Y;
+			}
+		}
+
+		// Add all of the vertices we generated to the mesh builder.
+		for (int32 VertIdx = 0; VertIdx < NumVerts; VertIdx++)
+		{
+			MeshBuilder.AddVertex(Verts[VertIdx]);
+		}
+
+		// Add all of the triangles we generated to the mesh builder.
+		for (int32 s = 0; s < NumSides; s++)
+		{
+			int32 a0start = (s + 0) * (NumRings + 1);
+			int32 a1start = (s + 1) * (NumRings + 1);
+
+			for (int32 r = 0; r < NumRings; r++)
+			{
+				MeshBuilder.AddTriangle(a0start + r + 0, a1start + r + 0, a0start + r + 1);
+				MeshBuilder.AddTriangle(a1start + r + 0, a1start + r + 1, a0start + r + 1);
+			}
+		}
+
+		// Free our local copy of verts and arc verts
+		FMemory::Free(Verts);
+		FMemory::Free(ArcVerts);
+	}
+	MeshBuilder.Draw(PDI, FScaleMatrix(Radii) * FRotationMatrix(Orientation) * FTranslationMatrix(Center), MaterialRenderProxy, DepthPriority, bDisableBackfaceCulling);
+}
+
+void ASodaWidget::Render_Rotate( const FSceneView* View,FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient, const FVector& InLocation)
+{
+	//get the axes 
+	FVector XAxis = RenderData.CoordSystem.TransformVector(FVector(1, 0, 0));
+	FVector YAxis = RenderData.CoordSystem.TransformVector(FVector(0, 1, 0));
+	FVector ZAxis = RenderData.CoordSystem.TransformVector(FVector(0, 0, 1));
+
+	EAxisList::Type DrawAxis = GetAxisToDraw(ViewportClient->GetWidgetMode());
+
+	// Draw a circle for each axis
+	bIsOrthoDrawingFullRing = false;
+	//now draw the arc segments
+	if (DrawAxis&EAxisList::X)
+	{
+		DrawRotationArc(View, PDI, EAxisList::X, InLocation, ZAxis, YAxis, AxisColorX.ToFColor(true), RenderData.UniformScale, XAxisDir);
+	}
+
+	if (DrawAxis&EAxisList::Y)
+	{
+		DrawRotationArc(View, PDI, EAxisList::Y, InLocation, XAxis, ZAxis, AxisColorY.ToFColor(true), RenderData.UniformScale, YAxisDir);
+	}
+
+	if (DrawAxis&EAxisList::Z)
+	{
+		DrawRotationArc(View, PDI, EAxisList::Z, InLocation, XAxis, YAxis, AxisColorZ.ToFColor(true), RenderData.UniformScale, ZAxisDir);
+	}
+
+	if (DrawAxis&EAxisList::XYZ  && (!bDragging || CurrentAxis == EAxisList::XYZ) && bAllowArcballRotate)
+	{
+		FVector Center = InLocation;
+		FRotator Orientation = FRotator::ZeroRotator;
+		const float InnerDistance = (INNER_AXIS_CIRCLE_RADIUS * ARCALL_RELATIVE_INNER_SIZE * RenderData.UniformScale) + TransformWidgetSizeAdjustment;
+		FVector Radii(InnerDistance, InnerDistance, InnerDistance);
+		const bool bDisabled = IsWidgetDisabled();
+		FColor ArcColor = ArcBallColor;
+		ArcColor.A = (CurrentAxis==EAxisList::XYZ) ? ArcBallColor.A + 5 : ArcBallColor.A; //less transparent if selected
+
+		DrawColoredSphere(PDI, InLocation, FRotator::ZeroRotator, ArcColor, Radii, 32, 24, TransparentPlaneMaterialXY->GetRenderProxy(), SDPG_Foreground, true);
+	}
+		
+	if(DrawAxis&EAxisList::Screen && (!bDragging || CurrentAxis == EAxisList::Screen) && bAllowScreenRotate)
+	{
+		const bool bIsPerspective = (View->ViewMatrices.GetProjectionMatrix().M[3][3] < 1.0f);
+		const bool bIsOrtho = !bIsPerspective;
+
+		const FVector Axis0 = View->GetViewUp();
+		const FVector Axis1 = View->GetViewRight();
+			
+		const float OuterRadius = (OUTER_AXIS_CIRCLE_RADIUS * 1.25f * RenderData.UniformScale) + TransformWidgetSizeAdjustment;
+		const float InnerRadius = ((OUTER_AXIS_CIRCLE_RADIUS -1) * 1.25f * RenderData.UniformScale) + TransformWidgetSizeAdjustment;
+
+		FColor ArcColor = (CurrentAxis==EAxisList::Screen) ? CurrentColor : ScreenAxisColor.ToFColor(true);
+
+		const bool bDisabled = IsWidgetDisabled();
+
+		FThickArcParams OuterArcParams(PDI, InLocation, TransparentPlaneMaterialXY, InnerRadius, OuterRadius);
+		//Pass through alpha
+		DrawThickArc(OuterArcParams, Axis0, Axis1, 0.0f, 2.0f * PI, ArcColor, !bIsPerspective);
+	}
+	
+}
+
+void ASodaWidget::Render_Scale( const FSceneView* View,FPrimitiveDrawInterface* PDI, USodaGameViewportClient* ViewportClient, const FVector& InLocation)
+{
+	// Figure out axis colors
+	const FLinearColor& XColor = ( CurrentAxis&EAxisList::X ? (FLinearColor)CurrentColor : AxisColorX );
+	const FLinearColor& YColor = ( CurrentAxis&EAxisList::Y ? (FLinearColor)CurrentColor : AxisColorY );
+	const FLinearColor& ZColor = ( CurrentAxis&EAxisList::Z ? (FLinearColor)CurrentColor : AxisColorZ );
+	FColor CurrentScreenColor = ( CurrentAxis & EAxisList::Screen ? CurrentColor : ScreenSpaceColor );
+
+	// Figure out axis materials
+
+	UMaterialInstanceDynamic* XMaterial = ( CurrentAxis&EAxisList::X ? CurrentAxisMaterial : AxisMaterialX );
+	UMaterialInstanceDynamic* YMaterial = ( CurrentAxis&EAxisList::Y ? CurrentAxisMaterial : AxisMaterialY );
+	UMaterialInstanceDynamic* ZMaterial = ( CurrentAxis&EAxisList::Z ? CurrentAxisMaterial : AxisMaterialZ );
+	UMaterialInstanceDynamic* XYZMaterial = ( CurrentAxis&EAxisList::XYZ ? CurrentAxisMaterial : OpaquePlaneMaterialXY );
+
+	FMatrix WidgetMatrix = RenderData.CoordSystem * FTranslationMatrix( InLocation );
+	const EAxisList::Type DrawAxis = GetAxisToDraw( ViewportClient->GetWidgetMode() );
+
+	// Use a constant uniform scale for this widget since orthographic view for it is not supported.
+	const FVector UniformScale(RenderData.Space.UniformScale);
+
+	// Draw the axis lines with cube heads	
+    if (RenderData.Space.ShouldDrawAxisX(DrawAxis))
+    {
+        Render_Axis(View, PDI, EAxisList::X, WidgetMatrix, XMaterial, XColor, XAxisDir, UniformScale, true, AXIS_LENGTH_SCALE_OFFSET);
+    }
+
+    if (RenderData.Space.ShouldDrawAxisY(DrawAxis))
+    {
+        Render_Axis(View, PDI, EAxisList::Y, WidgetMatrix, YMaterial, YColor, YAxisDir, UniformScale, true, AXIS_LENGTH_SCALE_OFFSET);
+    }
+
+    if (RenderData.Space.ShouldDrawAxisZ(DrawAxis))
+    {
+        Render_Axis(View, PDI, EAxisList::Z, WidgetMatrix, ZMaterial, ZColor, ZAxisDir, UniformScale, true, AXIS_LENGTH_SCALE_OFFSET);
+    }
+
+	// Draw grabber handles and center cube
+	const bool bDisabled = IsWidgetDisabled();
+
+	// Grabber handles - since orthographic scale widgets are not supported, we should always draw grabber handles if we're drawing
+	// the corresponding axes.
+	if( (DrawAxis&(EAxisList::X|EAxisList::Y)) == (EAxisList::X|EAxisList::Y) )
+	{
+		PDI->DrawLine( WidgetMatrix.TransformPosition(FVector(24,0,0) * UniformScale), WidgetMatrix.TransformPosition(FVector(12,12,0) * UniformScale), XColor, SDPG_Foreground );
+		PDI->DrawLine( WidgetMatrix.TransformPosition(FVector(12,12,0) * UniformScale), WidgetMatrix.TransformPosition(FVector(0,24,0) * UniformScale), YColor, SDPG_Foreground );
+	}
+
+	if( (DrawAxis&(EAxisList::X|EAxisList::Z)) == (EAxisList::X|EAxisList::Z) )
+	{
+		PDI->DrawLine( WidgetMatrix.TransformPosition(FVector(24,0,0) * UniformScale), WidgetMatrix.TransformPosition(FVector(12,0,12) * UniformScale), XColor, SDPG_Foreground );
+		PDI->DrawLine( WidgetMatrix.TransformPosition(FVector(12,0,12) * UniformScale), WidgetMatrix.TransformPosition(FVector(0,0,24) * UniformScale), ZColor, SDPG_Foreground );
+	}
+
+	if( (DrawAxis&(EAxisList::Y|EAxisList::Z)) == (EAxisList::Y|EAxisList::Z) )
+	{
+
+		PDI->DrawLine( WidgetMatrix.TransformPosition(FVector(0,24,0) * UniformScale), WidgetMatrix.TransformPosition(FVector(0,12,12) * UniformScale), YColor, SDPG_Foreground );
+		PDI->DrawLine( WidgetMatrix.TransformPosition(FVector(0,12,12) * UniformScale), WidgetMatrix.TransformPosition(FVector(0,0,24) * UniformScale), ZColor, SDPG_Foreground );
+	}
+
+	// Center cube
+	if( (DrawAxis&(EAxisList::XYZ)) == EAxisList::XYZ )
+	{
+		Render_Cube(PDI, WidgetMatrix, XYZMaterial, UniformScale * 4 );
+	}
+}
+
+/**
+* Draws the Translate & Rotate Z widget.
+*/
+
+/**
+ * Caches off HUD text to display after 3d rendering is complete
+ * @param View - Information about the scene/camera/etc
+ * @param PDI - Drawing interface
+ * @param InLocation - The Origin of the widget
+ * @param Axis0 - The Axis that describes a 0 degree rotation
+ * @param Axis1 - The Axis that describes a 90 degree rotation
+ * @param AngleOfAngle - angle we've rotated so far (in degrees)
+ */
+void ASodaWidget::CacheRotationHUDText(const FSceneView* View, FPrimitiveDrawInterface* PDI, const FVector& InLocation, const FVector& Axis0, const FVector& Axis1, const float AngleOfChange, const float InScale)
+{
+	const float TextDistance = (ROTATION_TEXT_RADIUS * InScale) + TransformWidgetSizeAdjustment;
+
+	FVector AxisVectors[4] = { Axis0, Axis1, -Axis0, -Axis1};
+
+	for (int i = 0 ; i < 4; ++i)
+	{
+		FVector PotentialTextPosition = InLocation + (TextDistance)*AxisVectors[i];
+		if(View->ScreenToPixel(View->WorldToScreen(PotentialTextPosition), HUDInfoPos))
+		{
+			if (FMath::IsWithin<float>(HUDInfoPos.X, 0, View->UnscaledViewRect.Width()) && FMath::IsWithin<float>(HUDInfoPos.Y, 0, View->UnscaledViewRect.Height()))
+			{
+				//only valid screen locations get a valid string
+				HUDString = FString::Printf(TEXT("%3.2f"), AngleOfChange);
+				break;
+			}
+		}
+	}
+}
+
+/**
+ * If actively dragging, draws a ring representing the potential rotation of the selected objects, snap ticks, and "delta" markers
+ * If not actively dragging, draws a quarter ring representing the closest quadrant to the camera
+ * @param View - Information about the scene/camera/etc
+ * @param PDI - Drawing interface
+ * @param InAxis - Enumeration of axis to rotate about
+ * @param InLocation - The Origin of the widget
+ * @param Axis0 - The Axis that describes a 0 degree rotation
+ * @param Axis1 - The Axis that describes a 90 degree rotation
+ * @param InColor - The color associated with the axis of rotation
+ * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+ */
+void ASodaWidget::DrawRotationArc(const FSceneView* View, FPrimitiveDrawInterface* PDI, EAxisList::Type InAxis, const FVector& InLocation, const FVector& Axis0, const FVector& Axis1, const FColor& InColor, const float InScale, FVector2D& OutAxisDir)
+{
+	bool bIsPerspective = ( View->ViewMatrices.GetProjectionMatrix().M[3][3] < 1.0f );
+	bool bIsOrtho = !bIsPerspective;
+
+	//if we're in an ortho viewport and the ring is perpendicular to the camera (both Axis0 & Axis1 are perpendicular)
+	bIsOrthoDrawingFullRing |= bIsOrtho && (FMath::Abs(Axis0| RenderData.DirectionToWidget) < KINDA_SMALL_NUMBER) && (FMath::Abs(Axis1|RenderData.DirectionToWidget) < KINDA_SMALL_NUMBER);
+
+	FColor ArcColor = InColor;
+	ArcColor.A = LargeOuterAlpha;
+
+	if (bDragging || (bIsOrthoDrawingFullRing))
+	{
+		if ((CurrentAxis&InAxis) || (bIsOrthoDrawingFullRing))
+		{
+			bool bDrawingArcBallAlso = CurrentAxis == EAxisList::XYZ;
+
+			float DeltaRotation = GetDeltaRotation();
+			float AdjustedDeltaRotation = IsRotationLocalSpace() ? -DeltaRotation : DeltaRotation;
+			float AbsRotation = FRotator::ClampAxis(FMath::Abs(DeltaRotation));
+			float AngleOfChangeRadians (AbsRotation * PI / 180.f);
+
+			//always draw clockwise, so if we're negative we need to flip the angle
+			float StartAngle = AdjustedDeltaRotation < 0.0f ? -AngleOfChangeRadians : 0.0f;
+			float FilledAngle = AngleOfChangeRadians;
+
+			//the axis of rotation
+			FVector ZAxis = Axis0 ^ Axis1;
+
+			ArcColor.A = LargeOuterAlpha;
+			DrawPartialRotationArc(View, PDI, InAxis, InLocation,  Axis0, Axis1, StartAngle, StartAngle + FilledAngle, ArcColor, InScale);
+			ArcColor.A = SmallOuterAlpha;
+			DrawPartialRotationArc(View, PDI, InAxis, InLocation,  Axis0, Axis1, StartAngle + FilledAngle, StartAngle + 2*PI, ArcColor, InScale);
+
+			ArcColor = (CurrentAxis&InAxis && !bDrawingArcBallAlso) ? CurrentColor : ArcColor;
+			if (!bDrawingArcBallAlso)
+			{
+				//Hallow Arrow
+				ArcColor.A = 0;
+				DrawStartStopMarker(PDI, InLocation, Axis0, Axis1, 0, ArcColor, InScale);
+				//Filled Arrow
+				ArcColor.A = LargeOuterAlpha;
+				DrawStartStopMarker(PDI, InLocation, Axis0, Axis1, AdjustedDeltaRotation, ArcColor, InScale);
+				ArcColor.A = 255;
+
+
+				FVector SnapLocation = InLocation;
+
+				if (bRotGridEnabled)
+				{
+					float DeltaAngle = 5.0; // GEditor->GetRotGridSize().Yaw;
+					float TickMarker = 22.5f; //every 22.5 degrees
+					for (float Angle = 0; Angle < 360.f; Angle += DeltaAngle)
+					{
+						FVector GridAxis = Axis0.RotateAngleAxis(Angle, ZAxis);
+						float PercentSize = (FMath::Fmod(Angle, TickMarker) == 0) ? .75f : .25f;
+						if (FMath::Fmod(Angle, 90.f) != 0)
+						{
+							DrawSnapMarker(PDI, SnapLocation, GridAxis, FVector::ZeroVector, ArcColor, InScale, 0.0f, PercentSize);
+						}
+					}
+				}
+
+				//draw axis tick marks
+				FColor AxisColor = InColor;
+				//Rotate Colors to match Axis 0
+				Swap(AxisColor.R, AxisColor.G);
+				Swap(AxisColor.B, AxisColor.R);
+				AxisColor.A = (AdjustedDeltaRotation == 0) ? MAX_uint8 : LargeOuterAlpha;
+				DrawSnapMarker(PDI, SnapLocation, Axis0, Axis1, AxisColor, InScale, .25f);
+				AxisColor.A = (AdjustedDeltaRotation == 180.f) ? MAX_uint8 : LargeOuterAlpha;
+				DrawSnapMarker(PDI, SnapLocation, -Axis0, -Axis1, AxisColor, InScale, .25f);
+
+				//Rotate Colors to match Axis 1
+				Swap(AxisColor.R, AxisColor.G);
+				Swap(AxisColor.B, AxisColor.R);
+				AxisColor.A = (AdjustedDeltaRotation == 90.f) ? MAX_uint8 : LargeOuterAlpha;
+				DrawSnapMarker(PDI, SnapLocation, Axis1, -Axis0, AxisColor, InScale, .25f);
+				AxisColor.A = (AdjustedDeltaRotation == 270.f) ? MAX_uint8 : LargeOuterAlpha;
+				DrawSnapMarker(PDI, SnapLocation, -Axis1, Axis0, AxisColor, InScale, .25f);
+
+				if (bDragging)
+				{
+					float OffsetAngle = IsRotationLocalSpace() ? 0 : AdjustedDeltaRotation;
+
+					CacheRotationHUDText(View, PDI, InLocation, Axis0.RotateAngleAxis(OffsetAngle, ZAxis), Axis1.RotateAngleAxis(OffsetAngle, ZAxis), DeltaRotation, InScale);
+				}
+			}
+		}
+	}
+	else
+	{
+		//Reverse the axes based on camera view
+		bool bMirrorAxis0 = ((Axis0 | RenderData.DirectionToWidget) <= 0.0f);
+		bool bMirrorAxis1 = ((Axis1 | RenderData.DirectionToWidget) <= 0.0f);
+
+		FVector RenderAxis0 = bMirrorAxis0 ? Axis0 : -Axis0;
+		FVector RenderAxis1 = bMirrorAxis1 ? Axis1 : -Axis1;
+		float Direction = (bMirrorAxis0 ^ bMirrorAxis1) ? -1.0f : 1.0f;
+
+		DrawPartialRotationArc(View, PDI, InAxis, InLocation, RenderAxis0, RenderAxis1, 0, PI/2, ArcColor, InScale);
+
+		FVector2D Axis0ScreenLocation;
+		if (!View->ScreenToPixel(View->WorldToScreen(InLocation + RenderAxis0 * 64.0f), Axis0ScreenLocation))
+		{
+			Axis0ScreenLocation.X = Axis0ScreenLocation.Y = 0;
+		}
+
+		FVector2D Axis1ScreenLocation;
+		if (!View->ScreenToPixel(View->WorldToScreen(InLocation + RenderAxis1 * 64.0f), Axis1ScreenLocation))
+		{
+			Axis1ScreenLocation.X = Axis1ScreenLocation.Y = 0;
+		}
+
+		OutAxisDir = ((Axis1ScreenLocation - Axis0ScreenLocation) * Direction).GetSafeNormal();
+	}
+}
+
+/**
+ * If actively dragging, draws a ring representing the potential rotation of the selected objects, snap ticks, and "delta" markers
+ * If not actively dragging, draws a quarter ring representing the closest quadrant to the camera
+ * @param View - Information about the scene/camera/etc
+ * @param PDI - Drawing interface
+ * @param InAxis - Enumeration of axis to rotate about
+ * @param InLocation - The Origin of the widget
+ * @param Axis0 - The Axis that describes a 0 degree rotation
+ * @param Axis1 - The Axis that describes a 90 degree rotation
+ * @param InStartAngle - The starting angle about (Axis0^Axis1) to render the arc, in radians
+ * @param InEndAngle - The ending angle about (Axis0^Axis1) to render the arc, in radians
+ * @param InColor - The color associated with the axis of rotation
+ * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+ */
+void ASodaWidget::DrawPartialRotationArc(const FSceneView* View, FPrimitiveDrawInterface* PDI, EAxisList::Type InAxis, const FVector& InLocation, const FVector& Axis0, const FVector& Axis1, const float InStartAngle, const float InEndAngle, const FColor& InColor, const float InScale )
+{
+	const float InnerRadius = (INNER_AXIS_CIRCLE_RADIUS * InScale) + TransformWidgetSizeAdjustment;
+	const float OuterRadius = (OUTER_AXIS_CIRCLE_RADIUS * InScale) + TransformWidgetSizeAdjustment;
+
+	bool bIsPerspective = ( View->ViewMatrices.GetProjectionMatrix().M[3][3] < 1.0f );
+	FThickArcParams OuterArcParams(PDI, InLocation, TransparentPlaneMaterialXY, InnerRadius, OuterRadius);
+	FColor OuterColor = ( (CurrentAxis&InAxis  && ( CurrentAxis != EAxisList::XYZ ) )? CurrentColor : InColor );
+	//Pass through alpha
+	OuterColor.A = InColor.A;
+	DrawThickArc(OuterArcParams, Axis0, Axis1, InStartAngle, InEndAngle, OuterColor, !bIsPerspective );
+
+
+	//const bool bIsHitProxyView = View->Family->EngineShowFlags.HitProxies;
+	//if (bIsPerspective && !bIsHitProxyView && !PDI->IsHitTesting())
+	//{
+		FThickArcParams InnerArcParams(PDI, InLocation, GridMaterial, 0.0f, InnerRadius);
+		FColor InnerColor = InColor;
+		//if something is selected and it's not this
+		InnerColor.A = ((CurrentAxis & InAxis) && !bDragging) ? LargeInnerAlpha : SmallInnerAlpha;
+		DrawThickArc(InnerArcParams, Axis0, Axis1, InStartAngle, InEndAngle, InnerColor, false );
+	//}
+}
+
+/**
+ * Renders a portion of an arc for the rotation widget
+ * @param InParams - Material, Radii, etc
+ * @param InStartAxis - Start of the arc, in radians
+ * @param InEndAxis - End of the arc, in radians
+ * @param InColor - Color to use for the arc
+ */
+void ASodaWidget::DrawThickArc (const FThickArcParams& InParams, const FVector& Axis0, const FVector& Axis1, const float InStartAngle, const float InEndAngle, const FColor& InColor, bool bIsOrtho )
+{
+	if (InColor.A == 0)
+	{
+		return;
+	}
+
+	// Add more sides to the circle if we've been scaled up to keep the circle looking circular
+	// An extra side for every 5 extra unreal units seems to produce a nice result
+	const int32 CircleSides = (TransformWidgetSizeAdjustment > 0) 
+		? AXIS_CIRCLE_SIDES + (TransformWidgetSizeAdjustment / 5)
+		: AXIS_CIRCLE_SIDES;
+	const int32 NumPoints = FMath::TruncToInt(CircleSides * (InEndAngle-InStartAngle)/(PI/2)) + 1;
+
+	FColor TriangleColor = InColor;
+	FColor RingColor = InColor;
+	RingColor.A = MAX_uint8;
+
+	FVector ZAxis = Axis0 ^ Axis1;
+	FVector LastWorldVertex;
+
+	FDynamicMeshBuilder MeshBuilder(InParams.PDI->View->GetFeatureLevel());
+
+	for (int32 RadiusIndex = 0; RadiusIndex < 2; ++RadiusIndex)
+	{
+		float Radius = (RadiusIndex == 0) ? InParams.OuterRadius : InParams.InnerRadius;
+		float TCRadius = Radius / (float) InParams.OuterRadius;
+		//Compute vertices for base circle.
+		for(int32 VertexIndex = 0;VertexIndex <= NumPoints;VertexIndex++)
+		{
+			float Percent = VertexIndex/(float)NumPoints;
+			float Angle = FMath::Lerp(InStartAngle, InEndAngle, Percent);
+			float AngleDeg = FRotator::ClampAxis(Angle * 180.f / PI);
+
+			FVector VertexDir = Axis0.RotateAngleAxis(AngleDeg, ZAxis);
+			VertexDir.Normalize();
+
+			float TCAngle = Percent*(PI/2);
+			FVector2f TC(TCRadius*FMath::Cos(Angle), TCRadius*FMath::Sin(Angle));
+
+			// Keep the vertices in local space so that we don't lose precision when dealing with LWC
+			// The local-to-world transform is handled in the MeshBuilder.Draw() call at the end of this function
+			const FVector VertexPosition = VertexDir*Radius;
+			FVector Normal = VertexPosition;
+			Normal.Normalize();
+
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)VertexPosition;
+			MeshVertex.Color = TriangleColor;
+			MeshVertex.TextureCoordinate[0] = TC;
+
+			MeshVertex.SetTangents(
+				(FVector3f)-ZAxis,
+				FVector3f((-ZAxis) ^ Normal),
+				(FVector3f)Normal
+				);
+
+			MeshBuilder.AddVertex(MeshVertex); //Add bottom vertex
+
+			// Push out the arc line borders so they dont z-fight with the mesh arcs
+			// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+			FVector StartLinePos = LastWorldVertex;
+			FVector EndLinePos = VertexPosition + InParams.Position;
+			if (VertexIndex != 0)
+			{
+				InParams.PDI->DrawLine(StartLinePos,EndLinePos,RingColor,SDPG_Foreground);
+			}
+			LastWorldVertex = EndLinePos;
+		}
+	}
+
+	//Add top/bottom triangles, in the style of a fan.
+	int32 InnerVertexStartIndex = NumPoints + 1;
+	for(int32 VertexIndex = 0; VertexIndex < NumPoints; VertexIndex++)
+	{
+		MeshBuilder.AddTriangle(VertexIndex, VertexIndex+1, InnerVertexStartIndex+VertexIndex);
+		MeshBuilder.AddTriangle(VertexIndex+1, InnerVertexStartIndex+VertexIndex+1, InnerVertexStartIndex+VertexIndex);
+	}
+
+	MeshBuilder.Draw(InParams.PDI, FTranslationMatrix(InParams.Position), InParams.Material->GetRenderProxy(),SDPG_Foreground,0.f);
+}
+
+/**
+ * Draws protractor like ticks where the rotation widget would snap too.
+ * Also, used to draw the wider axis tick marks
+ * @param PDI - Drawing interface
+ * @param InLocation - The Origin of the widget
+ * @param Axis0 - The Axis that describes a 0 degree rotation
+ * @param Axis1 - The Axis that describes a 90 degree rotation
+ * @param InAngle - The Angle to rotate about the axis of rotation, the vector (Axis0 ^ Axis1)
+ * @param InColor - The color to use for line/poly drawing
+ * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+ * @param InWidthPercent - The percent of the distance between the outer ring and inner ring to use for tangential thickness
+ * @param InPercentSize - The percent of the distance between the outer ring and inner ring to use for radial distance
+ */
+void ASodaWidget::DrawSnapMarker(FPrimitiveDrawInterface* PDI, const FVector& InLocation, const FVector& Axis0, const FVector& Axis1, const FColor& InColor, const float InScale, const float InWidthPercent, const float InPercentSize)
+{
+	const float InnerDistance = (INNER_AXIS_CIRCLE_RADIUS * InScale) + TransformWidgetSizeAdjustment;
+	const float OuterDistance = (OUTER_AXIS_CIRCLE_RADIUS * InScale) + TransformWidgetSizeAdjustment;
+	const float MaxMarkerHeight = OuterDistance - InnerDistance;
+	const float MarkerWidth = MaxMarkerHeight*InWidthPercent;
+	const float MarkerHeight = MaxMarkerHeight*InPercentSize;
+
+	FVector LocalVertices[4];
+	LocalVertices[0] = (OuterDistance)*Axis0 - (MarkerWidth*.5)*Axis1;
+	LocalVertices[1] = LocalVertices[0] + (MarkerWidth)*Axis1;
+	LocalVertices[2] = (OuterDistance-MarkerHeight)*Axis0 - (MarkerWidth*.5)*Axis1;
+	LocalVertices[3] = LocalVertices[2] + (MarkerWidth)*Axis1;
+
+	//draw at least one line
+	// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+	PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[2] + InLocation, InColor, SDPG_Foreground);
+
+	//if there should be thickness, draw the other lines
+	if (InWidthPercent > 0.0f)
+	{
+		PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[1] + InLocation, InColor, SDPG_Foreground);
+		PDI->DrawLine(LocalVertices[1] + InLocation, LocalVertices[3] + InLocation, InColor, SDPG_Foreground);
+		PDI->DrawLine(LocalVertices[2] + InLocation, LocalVertices[3] + InLocation, InColor, SDPG_Foreground);
+
+	
+		//fill in the box
+		FDynamicMeshBuilder MeshBuilder(PDI->View->GetFeatureLevel());
+
+		for(int32 VertexIndex = 0;VertexIndex < 4; VertexIndex++)
+		{
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)LocalVertices[VertexIndex];
+			MeshVertex.Color = InColor;
+			MeshVertex.TextureCoordinate[0] = FVector2f(0.0f, 0.0f);
+			MeshVertex.SetTangents(
+				(FVector3f)Axis0,
+				(FVector3f)Axis1,
+				FVector3f((Axis0) ^ Axis1)
+				);
+			MeshBuilder.AddVertex(MeshVertex); //Add bottom vertex
+		}
+
+		MeshBuilder.AddTriangle(0, 1, 2);
+		MeshBuilder.AddTriangle(1, 3, 2);
+		MeshBuilder.Draw(PDI, FTranslationMatrix(InLocation), TransparentPlaneMaterialXY->GetRenderProxy(),SDPG_Foreground,0.f);
+	
+	}
+}
+
+/**
+ * Draw Start/Stop Marker to show delta rotations along the arc of rotation
+ * @param PDI - Drawing interface
+ * @param InLocation - The Origin of the widget
+ * @param Axis0 - The Axis that describes a 0 degree rotation
+ * @param Axis1 - The Axis that describes a 90 degree rotation
+ * @param InAngle - The Angle to rotate about the axis of rotation, the vector (Axis0 ^ Axis1), units are degrees
+ * @param InColor - The color to use for line/poly drawing
+ * @param InScale - Multiplier to maintain a constant screen size for rendering the widget
+ */
+void ASodaWidget::DrawStartStopMarker(FPrimitiveDrawInterface* PDI, const FVector& InLocation, const FVector& Axis0, const FVector& Axis1, const float InAngle, const FColor& InColor, const float InScale)
+{
+	const float ArrowHeightPercent = .8f;
+	const float InnerDistance = (INNER_AXIS_CIRCLE_RADIUS * InScale) + TransformWidgetSizeAdjustment;
+	const float OuterDistance = (OUTER_AXIS_CIRCLE_RADIUS * InScale) + TransformWidgetSizeAdjustment;
+	const float RingHeight = OuterDistance - InnerDistance;
+	const float ArrowHeight = RingHeight*ArrowHeightPercent;
+	const float ThirtyDegrees = PI / 6.0f;
+	const float HalfArrowidth = ArrowHeight*FMath::Tan(ThirtyDegrees);
+
+	FVector ZAxis = Axis0 ^ Axis1;
+	FVector RotatedAxis0 = Axis0.RotateAngleAxis(InAngle, ZAxis);
+	FVector RotatedAxis1 = Axis1.RotateAngleAxis(InAngle, ZAxis);
+
+	FVector LocalVertices[3];
+	LocalVertices[0] = (OuterDistance)*RotatedAxis0;
+	LocalVertices[1] = LocalVertices[0] + (ArrowHeight)*RotatedAxis0 - HalfArrowidth*RotatedAxis1;
+	LocalVertices[2] = LocalVertices[1] + (2*HalfArrowidth)*RotatedAxis1;
+
+	// DrawLine needs vertices in world space, but this is fine because it takes FVectors and works with LWC well
+	PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[1] + InLocation, InColor, SDPG_Foreground);
+	PDI->DrawLine(LocalVertices[1] + InLocation, LocalVertices[2] + InLocation, InColor, SDPG_Foreground);
+	PDI->DrawLine(LocalVertices[0] + InLocation, LocalVertices[2] + InLocation, InColor, SDPG_Foreground);
+
+	if (InColor.A > 0)
+	{
+		//fill in the box
+		FDynamicMeshBuilder MeshBuilder(PDI->View->GetFeatureLevel());
+
+		for(int32 VertexIndex = 0;VertexIndex < 3; VertexIndex++)
+		{
+			FDynamicMeshVertex MeshVertex;
+			MeshVertex.Position = (FVector3f)LocalVertices[VertexIndex];
+			MeshVertex.Color = InColor;
+			MeshVertex.TextureCoordinate[0] = FVector2f(0.0f, 0.0f);
+			MeshVertex.SetTangents(
+				(FVector3f)RotatedAxis0,
+				(FVector3f)RotatedAxis1,
+				FVector3f((RotatedAxis0) ^ RotatedAxis1)
+				);
+			MeshBuilder.AddVertex(MeshVertex); //Add bottom vertex
+		}
+
+		MeshBuilder.AddTriangle(0, 1, 2);
+		MeshBuilder.Draw(PDI, FTranslationMatrix(InLocation), TransparentPlaneMaterialXY->GetRenderProxy(),SDPG_Foreground,0.f);
+	}
+}
+
+EAxisList::Type ASodaWidget::GetAxisToDraw(soda::EWidgetMode WidgetMode ) const
+{
+	return /*EditorModeTools ? EditorModeTools->GetWidgetAxisToDraw(WidgetMode) :*/ EAxisList::All;
+}
diff --git a/Source/UnrealSoda/Private/Editor/SodalWidget.cpp b/Source/UnrealSoda/Private/Editor/SodalWidget.cpp
new file mode 100644
index 0000000..19c36b8
--- /dev/null
+++ b/Source/UnrealSoda/Private/Editor/SodalWidget.cpp
@@ -0,0 +1,1063 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaWidget.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "CanvasItem.h"
+#include "CanvasTypes.h"
+#include "DynamicMeshBuilder.h"
+#include "Materials/Material.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+
+#include "MeshUtils.hpp"
+
+constexpr float ASodaWidget::AXIS_LENGTH;
+constexpr float ASodaWidget::TRANSLATE_ROTATE_AXIS_CIRCLE_RADIUS;
+constexpr float ASodaWidget::TWOD_AXIS_CIRCLE_RADIUS;
+constexpr float ASodaWidget::INNER_AXIS_CIRCLE_RADIUS;
+constexpr float ASodaWidget::OUTER_AXIS_CIRCLE_RADIUS;
+constexpr float ASodaWidget::ROTATION_TEXT_RADIUS;
+constexpr int32 ASodaWidget::AXIS_CIRCLE_SIDES;
+constexpr float ASodaWidget::ARCALL_RELATIVE_INNER_SIZE;
+constexpr float ASodaWidget::AXIS_LENGTH_SCALE_OFFSET;
+constexpr uint8 ASodaWidget::LargeInnerAlpha;
+constexpr uint8 ASodaWidget::SmallInnerAlpha;
+constexpr uint8 ASodaWidget::LargeOuterAlpha;
+constexpr uint8 ASodaWidget::SmallOuterAlpha;
+
+static void SetCapsuleSize(UCapsuleComponent* CapsuleComponent, const FVector& Begin, const FVector& End, float Radius)
+{
+	const float Height = (Begin - End).Size();
+	const FVector Center = (Begin + End) / 2;
+	const FQuat Quat = (End - Begin).ToOrientationQuat() * FQuat(FRotator(90, 0, 0));
+	CapsuleComponent->SetCapsuleSize(Radius, Height / 2, true);
+	CapsuleComponent->SetRelativeTransform(FTransform(Quat, Center));
+}
+
+static UAxisCapsuleComponent* CreateCapsuleHelper(UObject* Parent, USceneComponent* ParentAttachment, const FVector& Begin, const FVector& End, float Radius, EAxisList::Type AxisList)
+{
+	UAxisCapsuleComponent* Capsule = NewObject<UAxisCapsuleComponent>(Parent);
+	check(Capsule);
+	if (ParentAttachment)Capsule->SetupAttachment(ParentAttachment);
+	Capsule->RegisterComponent();
+	Capsule->SetHiddenInGame(true);
+	Capsule->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	Capsule->SetCollisionResponseToChannel(SodaApp.GetSodaUserSettings()->SelectTraceChannel, ECollisionResponse::ECR_Block);
+	Capsule->SetCollisionObjectType(SodaApp.GetSodaUserSettings()->SelectTraceChannel);
+	Capsule->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	SetCapsuleSize(Capsule, Begin, End, Radius);
+	Capsule->AxisList = AxisList;
+	return Capsule;
+}
+
+static UAxisBoxComponent* CreateBoxHelper(UObject* Parent, USceneComponent* ParentAttachment, const FVector& Orign, float Size, EAxisList::Type AxisList)
+{
+	UAxisBoxComponent* Box = NewObject<UAxisBoxComponent>(Parent);
+	check(Box);
+	if (ParentAttachment) Box->SetupAttachment(ParentAttachment);
+	Box->RegisterComponent();
+	Box->SetHiddenInGame(true);
+	Box->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	Box->SetCollisionResponseToChannel(SodaApp.GetSodaUserSettings()->SelectTraceChannel, ECollisionResponse::ECR_Block);
+	Box->SetCollisionObjectType(SodaApp.GetSodaUserSettings()->SelectTraceChannel);
+	Box->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	Box->SetBoxExtent(FVector(Size));
+	Box->SetRelativeLocation(Orign);
+	Box->AxisList = AxisList;
+	return Box;
+}
+
+static UAxisSphereComponent* CreateSphereHelper(UObject* Parent, USceneComponent* ParentAttachment, const FVector& Orign, float Radius, EAxisList::Type AxisList)
+{
+	UAxisSphereComponent* Sphere = NewObject<UAxisSphereComponent>(Parent);
+	check(Sphere);
+	if (ParentAttachment) Sphere->SetupAttachment(ParentAttachment);
+	Sphere->RegisterComponent();
+	Sphere->SetHiddenInGame(true);
+	Sphere->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	Sphere->SetCollisionResponseToChannel(SodaApp.GetSodaUserSettings()->SelectTraceChannel, ECollisionResponse::ECR_Block);
+	Sphere->SetCollisionObjectType(SodaApp.GetSodaUserSettings()->SelectTraceChannel);
+	Sphere->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	Sphere->SetSphereRadius(Radius);
+	Sphere->SetRelativeLocation(Orign);
+	Sphere->AxisList = AxisList;
+	return Sphere;
+}
+
+static UAxisProceduralMeshComponent* CreateArcHelper(UObject* Parent, USceneComponent* ParentAttachment, const FVector& Axis0, const FVector& Axis1, const FMatrix& CoordSystem, const FVector& InDirectionToWidget, float InEndAngle, float InStartAngle, float InnerRadius, float OuterRadius, EAxisList::Type AxisList)
+{
+	UAxisProceduralMeshComponent* ProceduralMesh = NewObject<UAxisProceduralMeshComponent>(Parent);
+	check(ProceduralMesh);
+	if (ParentAttachment) ProceduralMesh->SetupAttachment(ParentAttachment);
+	ProceduralMesh->RegisterComponent();
+	ProceduralMesh->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Ignore);
+	ProceduralMesh->SetCollisionResponseToChannel(SodaApp.GetSodaUserSettings()->SelectTraceChannel, ECollisionResponse::ECR_Block);
+	ProceduralMesh->SetCollisionObjectType(SodaApp.GetSodaUserSettings()->SelectTraceChannel);
+	ProceduralMesh->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	ProceduralMesh->SetHiddenInGame(true);
+	ProceduralMesh->CreateArc(Axis0, Axis1, CoordSystem, InDirectionToWidget, InEndAngle, InStartAngle, InnerRadius, OuterRadius);
+	ProceduralMesh->AxisList = AxisList;
+	return ProceduralMesh;
+}
+
+
+void UAxisProceduralMeshComponent::CreateArc(const FVector& Axis0, const FVector& Axis1, const FMatrix& CoordSystem, const FVector& InDirectionToWidget, float InEndAngle, float InStartAngle, float InnerRadius, float OuterRadius)
+{
+	StoreAxis0 = Axis0;
+	StoreAxis1 = Axis1;
+	StoreEndAngle = InEndAngle;
+	StoreStartAngle = InStartAngle;
+	StoreInnerRadius = InnerRadius;
+	StoreOuterRadius = OuterRadius;
+
+	const int32 CircleSides = 24;// AXIS_CIRCLE_SIDES;
+	const int32 NumPoints = FMath::TruncToInt(CircleSides * (InEndAngle - InStartAngle) / (PI / 2)) + 1;
+
+	TArray<FVector> Vertices;
+	TArray<int32> Triangles;
+	TArray<FVector> Normals;
+	TArray<FVector2D> UVs;
+	TArray<FColor> VertexColors;
+	TArray<FProcMeshTangent> Tangents;
+
+
+	bool bMirrorAxis0 = ((FVector(CoordSystem.TransformVector(Axis0)) | InDirectionToWidget) <= 0.0f);
+	bool bMirrorAxis1 = ((FVector(CoordSystem.TransformVector(Axis1)) | InDirectionToWidget) <= 0.0f);
+
+	FVector RenderAxis0 = bMirrorAxis0 ? Axis0 : -Axis0;
+	FVector RenderAxis1 = bMirrorAxis1 ? Axis1 : -Axis1;
+	FVector ZAxis = RenderAxis0 ^ RenderAxis1;
+
+	bool bMirrorAxis2 = ((ZAxis | InDirectionToWidget) <= 0.0f);
+
+	//UE_LOG(LogTemp, Error, TEXT("*** %i %i %i"), bMirrorAxis0, bMirrorAxis1, bMirrorAxis2);
+
+	for (int32 RadiusIndex = 0; RadiusIndex < 2; ++RadiusIndex)
+	{
+		float Radius = (RadiusIndex == 0) ? OuterRadius : InnerRadius;
+		float TCRadius = Radius / (float)OuterRadius;
+		//Compute vertices for base circle.
+		for (int32 VertexIndex = 0; VertexIndex <= NumPoints; VertexIndex++)
+		{
+			float Percent = VertexIndex / (float)NumPoints;
+			float Angle = FMath::Lerp(InStartAngle, InEndAngle, Percent);
+			float AngleDeg = FRotator::ClampAxis(Angle * 180.f / PI);
+
+			FVector VertexDir = RenderAxis0.RotateAngleAxis(AngleDeg, ZAxis);
+			VertexDir.Normalize();
+
+			float TCAngle = Percent * (PI / 2);
+			FVector2D TC(TCRadius * FMath::Cos(Angle), TCRadius * FMath::Sin(Angle));
+
+			// Keep the vertices in local space so that we don't lose precision when dealing with LWC
+			// The local-to-world transform is handled in the MeshBuilder.Draw() call at the end of this function
+			const FVector VertexPosition = VertexDir * Radius;
+			FVector Normal = VertexPosition;
+			Normal.Normalize();
+
+			Vertices.Add(VertexPosition);
+			UVs.Add(TC);
+			Normals.Add(Normal);
+		}
+	}
+
+	//Add top/bottom triangles, in the style of a fan.
+	int32 InnerVertexStartIndex = NumPoints + 1;
+	for (int32 VertexIndex = 0; VertexIndex < NumPoints; VertexIndex++)
+	{
+		bool f = bMirrorAxis0 ^ bMirrorAxis1;
+		if ((f && !bMirrorAxis2) || (!f && !bMirrorAxis2))
+		{
+
+			Triangles.Add(VertexIndex);
+			Triangles.Add(VertexIndex + 1);
+			Triangles.Add(InnerVertexStartIndex + VertexIndex);
+
+			Triangles.Add(VertexIndex + 1);
+			Triangles.Add(InnerVertexStartIndex + VertexIndex + 1);
+			Triangles.Add(InnerVertexStartIndex + VertexIndex);
+		}
+		else
+		{
+			Triangles.Add(InnerVertexStartIndex + VertexIndex);
+			Triangles.Add(VertexIndex + 1);
+			Triangles.Add(VertexIndex);
+
+			Triangles.Add(InnerVertexStartIndex + VertexIndex);
+			Triangles.Add(InnerVertexStartIndex + VertexIndex + 1);
+			Triangles.Add(VertexIndex + 1);
+		}
+	}
+
+	UKismetProceduralMeshLibrary::CalculateTangentsForMesh(Vertices, Triangles, UVs, Normals, Tangents);
+
+	ClearAllMeshSections();
+	CreateMeshSection(0, Vertices, Triangles, Normals, UVs, VertexColors, Tangents, true);
+}
+
+
+ASodaWidget::ASodaWidget(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	//EditorModeTools      = NULL;
+	TotalDeltaRotation   = 0;
+	CurrentDeltaRotation = 0;
+
+	AxisColorX       = FLinearColor(0.594f, 0.0197f, 0.0f);
+	AxisColorY       = FLinearColor(0.1349f, 0.3959f, 0.0f);
+	AxisColorZ       = FLinearColor(0.0251f, 0.207f, 0.85f);
+	ScreenAxisColor  = FLinearColor(0.76, 0.72, 0.14f);
+	PlaneColorXY     = FColor::Yellow;
+	ArcBallColor     = FColor(128, 128, 128, 6);
+	ScreenSpaceColor = FColor(196, 196, 196);
+	CurrentColor     = FColor::Yellow;
+
+	CurrentAxis = EAxisList::None;
+
+
+
+	bAbsoluteTranslationInitialOffsetCached = false;
+	InitialTranslationOffset                = FVector::ZeroVector;
+	InitialTranslationPosition              = FVector(0, 0, 0);
+
+	bDragging               = false;
+	bSnapEnabled            = false;
+	bIsOrthoDrawingFullRing = false;
+
+	XAxisDir     = FVector2D::ZeroVector;
+	YAxisDir     = FVector2D::ZeroVector;
+	ZAxisDir     = FVector2D::ZeroVector;
+
+	DragStartPos = FVector2D::ZeroVector;
+	LastDragPos  = FVector2D::ZeroVector;
+}
+
+EAxisList::Type ASodaWidget::GetAxisListAtScreenPos(UWorld* World, const FVector2D& ScreenPos)
+{
+	check(World);
+
+	FVector Origin;
+	FVector Direction;
+	if (FEditorUtils::DeprojectScreenToWorld(World, ScreenPos, Origin, Direction))
+	{
+		TArray<FHitResult> Hits;
+		FCollisionQueryParams Param(SCENE_QUERY_STAT(WidgetTrace), true);
+		const FVector RayEnd = Origin + Direction * HALF_WORLD_MAX;
+		if (World->LineTraceMultiByObjectType(Hits, Origin, RayEnd, FCollisionObjectQueryParams(SodaApp.GetSodaUserSettings()->SelectTraceChannel), Param))
+		{
+			float ClosestHitDistanceSqr = TNumericLimits<float>::Max();
+			IAxisInterface* ClosestAxis = nullptr;
+			for (const FHitResult& Hit : Hits)
+			{
+				if (IAxisInterface* Axis = Cast<IAxisInterface>(Hit.Component.Get()))
+				{
+					const float DistanceToHitSqr = (Hit.ImpactPoint - Origin).SizeSquared();
+					if (DistanceToHitSqr < ClosestHitDistanceSqr)
+					{
+						ClosestHitDistanceSqr = DistanceToHitSqr;
+						ClosestAxis = Axis;
+					}
+				}
+			}
+
+			if (ClosestAxis)
+			{
+				return ClosestAxis->AxisList;
+			}
+		}
+	}
+
+	return EAxisList::None;
+}
+
+
+void ASodaWidget::TickWidget(USodaGameViewportClient* ViewportClient)
+{
+	check(ViewportClient);
+
+	if (!RenderData.bUpdated) return;
+
+	if (ViewportClient->GetWidgetMode() != RenderData.WidgetMode)
+	{
+		RenderData.WidgetMode = ViewportClient->GetWidgetMode();
+
+		for (auto It : WidgetAxisComponents) It->DestroyComponent();
+		WidgetAxisComponents.Empty();
+
+		switch (RenderData.WidgetMode)
+		{
+		case soda::EWidgetMode::WM_Translate:
+		{
+			UAxisSphereComponent* RootAxisComponent = CreateSphereHelper(this, nullptr, FVector(0), 5, EAxisList::Screen);
+			SetRootComponent(RootAxisComponent);
+			WidgetAxisComponents.Add(RootAxisComponent);
+
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0), FVector(AXIS_LENGTH + 15, 0, 0), 3, EAxisList::X)); // X
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0), FVector(0, AXIS_LENGTH + 15, 0), 3, EAxisList::Y)); // Y
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0), FVector(0, 0, AXIS_LENGTH + 15), 3, EAxisList::Z)); // Z
+
+			const float CL = 13;
+
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(CL, 0, 0), FVector(CL, CL, 0), 2, EAxisList::XY)); // XY_X
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0, CL, 0), FVector(CL, CL, 0), 2, EAxisList::XY)); // XY_Y
+
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(CL, 0, 0), FVector(CL, 0, CL), 2, EAxisList::XZ)); // XZ_X
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0, 0, CL), FVector(CL, 0, CL), 2, EAxisList::XZ)); // XZ_Z
+
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0, CL, 0), FVector(0, CL, CL), 2, EAxisList::YZ)); // YZ_Y
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0, 0, CL), FVector(0, CL, CL), 2, EAxisList::YZ)); // YZ_Z
+
+			break;
+		}
+
+		case soda::EWidgetMode::WM_Rotate:
+		{
+			USceneComponent* RootAxisComponent = NewObject<USceneComponent>(this);
+			SetRootComponent(RootAxisComponent);
+
+			FVector XAxis = FVector(1, 0, 0);
+			FVector YAxis = FVector(0, 1, 0);
+			FVector ZAxis = FVector(0, 0, 1);
+
+			WidgetAxisComponents.Add(CreateArcHelper(this, RootAxisComponent, ZAxis, YAxis, ViewportClient->GetWidgetCoordSystem(), RenderData.DirectionToWidget, PI / 2, 0, INNER_AXIS_CIRCLE_RADIUS, OUTER_AXIS_CIRCLE_RADIUS, EAxisList::X));
+			WidgetAxisComponents.Add(CreateArcHelper(this, RootAxisComponent, XAxis, ZAxis, ViewportClient->GetWidgetCoordSystem(), RenderData.DirectionToWidget, PI / 2, 0, INNER_AXIS_CIRCLE_RADIUS, OUTER_AXIS_CIRCLE_RADIUS, EAxisList::Y));
+			WidgetAxisComponents.Add(CreateArcHelper(this, RootAxisComponent, XAxis, YAxis, ViewportClient->GetWidgetCoordSystem(), RenderData.DirectionToWidget, PI / 2, 0, INNER_AXIS_CIRCLE_RADIUS, OUTER_AXIS_CIRCLE_RADIUS, EAxisList::Z));
+
+			break;
+		}
+
+		case soda::EWidgetMode::WM_Scale:
+		{
+
+			UAxisBoxComponent* RootAxisComponent = CreateBoxHelper(this, nullptr, FVector(0), 5, EAxisList::XYZ);
+			SetRootComponent(RootAxisComponent);
+			WidgetAxisComponents.Add(RootAxisComponent);
+
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0), FVector(AXIS_LENGTH, 0, 0), 3, EAxisList::X)); // X
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0), FVector(0, AXIS_LENGTH, 0), 3, EAxisList::Y)); // Y
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0), FVector(0, 0, AXIS_LENGTH), 3, EAxisList::Z)); // Z
+
+			WidgetAxisComponents.Add(CreateBoxHelper(this, RootAxisComponent, FVector(AXIS_LENGTH - 2, 0, 0), 5, EAxisList::X)); // X
+			WidgetAxisComponents.Add(CreateBoxHelper(this, RootAxisComponent, FVector(0, AXIS_LENGTH - 2, 0), 5, EAxisList::Y)); // Y
+			WidgetAxisComponents.Add(CreateBoxHelper(this, RootAxisComponent, FVector(0, 0, AXIS_LENGTH - 2), 5, EAxisList::Z)); // Z
+
+			const float CL = 24;
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(CL, 0, 0), FVector(0, CL, 0), 2, EAxisList::XY)); // XY
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(CL, 0, 0), FVector(0, 0, CL), 2, EAxisList::XZ)); // XZ
+			WidgetAxisComponents.Add(CreateCapsuleHelper(this, RootAxisComponent, FVector(0, CL, 0), FVector(0, 0, CL), 2, EAxisList::YZ)); // YZ
+
+			break;
+
+		}
+
+		}
+
+	}
+	else
+	{
+		if (ViewportClient->GetWidgetMode() == soda::EWidgetMode::WM_Rotate)
+		{
+			const FVector XAxis = FVector(1, 0, 0);
+			const FVector YAxis = FVector(0, 1, 0);
+			const FVector ZAxis = FVector(0, 0, 1);
+
+			const FQuat4d Quat = ViewportClient->GetWidgetCoordSystem().ToQuat();
+			const FVector XAxisRotated = Quat.GetForwardVector();
+			const FVector YAxisRotated = Quat.GetRightVector();
+			const FVector ZAxisRotated = Quat.GetUpVector();
+
+			const bool bMirrorAxis0 = ((XAxisRotated | RenderData.DirectionToWidget) <= 0.0f);
+			const bool bMirrorAxis1 = ((YAxisRotated | RenderData.DirectionToWidget) <= 0.0f);
+			const bool bMirrorAxis2 = ((ZAxisRotated | RenderData.DirectionToWidget) <= 0.0f);
+
+			if (bMirrorAxis0 != bPrevMirrorAxis0 || bMirrorAxis1 != bPrevMirrorAxis1 || bMirrorAxis2 != bPrevMirrorAxis2)
+			{
+				for (auto It : WidgetAxisComponents) It->DestroyComponent();
+				WidgetAxisComponents.Empty();
+
+				USceneComponent* RootAxisComponent = NewObject<USceneComponent>(this);
+				SetRootComponent(RootAxisComponent);
+
+				WidgetAxisComponents.Add(CreateArcHelper(this, RootAxisComponent, ZAxis, YAxis, ViewportClient->GetWidgetCoordSystem(), RenderData.DirectionToWidget, PI / 2, 0, INNER_AXIS_CIRCLE_RADIUS, OUTER_AXIS_CIRCLE_RADIUS, EAxisList::X));
+				WidgetAxisComponents.Add(CreateArcHelper(this, RootAxisComponent, XAxis, ZAxis, ViewportClient->GetWidgetCoordSystem(), RenderData.DirectionToWidget, PI / 2, 0, INNER_AXIS_CIRCLE_RADIUS, OUTER_AXIS_CIRCLE_RADIUS, EAxisList::Y));
+				WidgetAxisComponents.Add(CreateArcHelper(this, RootAxisComponent, XAxis, YAxis, ViewportClient->GetWidgetCoordSystem(), RenderData.DirectionToWidget, PI / 2, 0, INNER_AXIS_CIRCLE_RADIUS, OUTER_AXIS_CIRCLE_RADIUS, EAxisList::Z));
+
+				bPrevMirrorAxis0 = bMirrorAxis0;
+				bPrevMirrorAxis1 = bMirrorAxis1;
+				bPrevMirrorAxis2 = bMirrorAxis2;
+			}
+		}
+	}
+
+	SetActorTransform(FTransform(RenderData.CoordSystem.ToQuat(), RenderData.WidgetLocation, FVector(RenderData.UniformScale)));
+}
+
+void ASodaWidget::BeginPlay()
+{
+	Super::BeginPlay();
+
+	UMaterial* AxisMaterialBase = (UMaterial*)StaticLoadObject(
+		UMaterial::StaticClass(), NULL,
+		TEXT("/SodaSim/Assets/CPP/EditorMaterials/GizmoMaterial.GizmoMaterial"), NULL, LOAD_None, NULL);
+	check(AxisMaterialBase);
+
+	AxisMaterialX = UMaterialInstanceDynamic::Create(AxisMaterialBase, NULL);
+	AxisMaterialX->SetVectorParameterValue("GizmoColor", AxisColorX);
+
+	AxisMaterialY = UMaterialInstanceDynamic::Create(AxisMaterialBase, NULL);
+	AxisMaterialY->SetVectorParameterValue("GizmoColor", AxisColorY);
+
+	AxisMaterialZ = UMaterialInstanceDynamic::Create(AxisMaterialBase, NULL);
+	AxisMaterialZ->SetVectorParameterValue("GizmoColor", AxisColorZ);
+
+	CurrentAxisMaterial = UMaterialInstanceDynamic::Create(AxisMaterialBase, NULL);
+	CurrentAxisMaterial->SetVectorParameterValue("GizmoColor", CurrentColor);
+
+	OpaquePlaneMaterialXY = UMaterialInstanceDynamic::Create(AxisMaterialBase, NULL);
+	OpaquePlaneMaterialXY->SetVectorParameterValue("GizmoColor", FLinearColor::White);
+
+	TransparentPlaneMaterialXY = (UMaterial*)StaticLoadObject(
+		UMaterial::StaticClass(), NULL,
+		TEXT("/SodaSim/Assets/CPP/EditorMaterials/WidgetVertexColorMaterial.WidgetVertexColorMaterial"), NULL, LOAD_None, NULL);
+
+	GridMaterial = (UMaterial*)StaticLoadObject(
+		UMaterial::StaticClass(), NULL,
+		TEXT("/SodaSim/Assets/CPP/EditorMaterials/WidgetGridVertexColorMaterial_Ma.WidgetGridVertexColorMaterial_Ma"), NULL,
+		LOAD_None, NULL);
+
+	check(TransparentPlaneMaterialXY && GridMaterial);
+
+}
+
+void ASodaWidget::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+
+/*
+void ASodaWidget::SetUsesEditorModeTools(FEditorModeTools* InEditorModeTools)
+{
+	EditorModeTools = InEditorModeTools;
+}
+*/
+
+void ASodaWidget::ConvertMouseToAxis_Translate(FVector2D DragDir, FVector& InOutDelta, FVector& OutDrag) const
+{
+	// Get drag delta in widget axis space
+	OutDrag = FVector((CurrentAxis & EAxisList::X) ? FVector2D::DotProduct(XAxisDir, DragDir) : 0.0f,
+	                  (CurrentAxis & EAxisList::Y) ? FVector2D::DotProduct(YAxisDir, DragDir) : 0.0f,
+	                  (CurrentAxis & EAxisList::Z) ? FVector2D::DotProduct(ZAxisDir, DragDir) : 0.0f);
+
+	// Snap to grid in widget axis space
+	//const FVector GridSize = FVector(GEditor->GetGridSize());
+	//FSnappingUtils::SnapPointToGrid(OutDrag, GridSize);
+
+	// Convert to effective screen space delta, and replace input delta, adjusted for inverted screen space Y axis
+	const FVector2D EffectiveDelta = OutDrag.X * XAxisDir + OutDrag.Y * YAxisDir + OutDrag.Z * ZAxisDir;
+	InOutDelta                     = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+
+	// Transform drag delta into world space
+	OutDrag = RenderData.CoordSystem.TransformPosition(OutDrag);
+}
+
+void ASodaWidget::ConvertMouseToAxis_Rotate(FVector2D TangentDir, FVector2D DragDir, FSceneView* InView,
+                                        USodaGameViewportClient* InViewportClient, FVector& InOutDelta,
+                                        FRotator& OutRotation)
+{
+	if (CurrentAxis == EAxisList::X)
+	{
+		FRotator Rotation;
+		FVector2D EffectiveDelta;
+		// Get screen direction representing positive rotation
+		const FVector2D AxisDir = bIsOrthoDrawingFullRing ? TangentDir : XAxisDir;
+
+		// Get rotation in widget local space
+		Rotation = FRotator(0, 0, FVector2D::DotProduct(AxisDir, DragDir));
+		//FSnappingUtils::SnapRotatorToGrid(Rotation);
+
+		// Record delta rotation (used by the widget to render the accumulated delta)
+		CurrentDeltaRotation = Rotation.Roll;
+
+		// Use to calculate the new input delta
+		EffectiveDelta = AxisDir * Rotation.Roll;
+		// Adjust the input delta according to how much rotation was actually applied
+		InOutDelta = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+		// Need to get the delta rotation in the current coordinate space of the widget
+		OutRotation = (RenderData.CoordSystem.Inverse() * FRotationMatrix(Rotation) * RenderData.CoordSystem).Rotator();
+	}
+	else if (CurrentAxis == EAxisList::Y)
+	{
+		FRotator Rotation;
+		FVector2D EffectiveDelta;
+		// TODO: Determine why -TangentDir is necessary here, and fix whatever is causing it
+		const FVector2D AxisDir = bIsOrthoDrawingFullRing ? -TangentDir : YAxisDir;
+
+		Rotation = FRotator(FVector2D::DotProduct(AxisDir, DragDir), 0, 0);
+		//FSnappingUtils::SnapRotatorToGrid(Rotation);
+
+		CurrentDeltaRotation = Rotation.Pitch;
+		EffectiveDelta       = AxisDir * Rotation.Pitch;
+		// Adjust the input delta according to how much rotation was actually applied
+		InOutDelta = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+		// Need to get the delta rotation in the current coordinate space of the widget
+		OutRotation = (RenderData.CoordSystem.Inverse() * FRotationMatrix(Rotation) * RenderData.CoordSystem).Rotator();
+	}
+	else if (CurrentAxis == EAxisList::Z)
+	{
+		FRotator Rotation;
+		FVector2D EffectiveDelta;
+		const FVector2D AxisDir = bIsOrthoDrawingFullRing ? TangentDir : ZAxisDir;
+
+		Rotation = FRotator(0, FVector2D::DotProduct(AxisDir, DragDir), 0);
+		//FSnappingUtils::SnapRotatorToGrid(Rotation);
+
+		CurrentDeltaRotation = Rotation.Yaw;
+		EffectiveDelta       = AxisDir * Rotation.Yaw;
+		// Adjust the input delta according to how much rotation was actually applied
+		InOutDelta = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+		// Need to get the delta rotation in the current coordinate space of the widget
+		OutRotation = (RenderData.CoordSystem.Inverse() * FRotationMatrix(Rotation) * RenderData.CoordSystem).Rotator();
+	}
+	else if (CurrentAxis == EAxisList::XYZ) //arcball rotate
+	{
+		/*
+		//To do this we need to calculate the rotation axis and rotation angle.
+		//The Axis is the cross product of the current ray from eye to pixel in world space with the previous ray.
+		//The Angle is angle amount we rotate from the object's location to the imaginary sphere that matches up with the difference between the current and previous ray
+		//From the Camera. Those rays form a triangle, which we can bisect with a common side.
+		FVector2D MousePosition(InViewportClient->Viewport->GetMouseX(), InViewportClient->Viewport->GetMouseY());
+		FViewportCursorLocation OldMouseViewportRay(InView, InViewportClient, LastDragPos.X, LastDragPos.Y);
+		FViewportCursorLocation MouseViewportRay(InView, InViewportClient, MousePosition.X, MousePosition.Y);
+
+		LastDragPos               = MousePosition;
+		FVector DirectionToWidget = InViewportClient->GetWidgetLocation() - MouseViewportRay.GetOrigin();
+		float Length              = DirectionToWidget.Size();
+		if (!FMath::IsNearlyZero(Length))
+		{
+			//Calc Axis
+			DirectionToWidget /= Length;
+			const FVector CameraToPixelDir    = MouseViewportRay.GetDirection();
+			const FVector OldCameraToPixelDir = OldMouseViewportRay.GetDirection();
+			FVector RotationAxis              = FVector::CrossProduct(OldCameraToPixelDir, CameraToPixelDir);
+			RotationAxis.Normalize();
+			float RotationAngle     = 0.0f;
+			FVector4 ScreenLocation = InView->WorldToScreen(InViewportClient->GetWidgetLocation());
+			FVector2D PixelLocation;
+			InView->ScreenToPixel(ScreenLocation, PixelLocation);
+			float Distance      = FVector2D::Distance(PixelLocation, MousePosition);
+			const float MaxDiff = 2.0f * (INNER_AXIS_CIRCLE_RADIUS);
+			//If outside radius, do screen rotate instead, like other DCC's
+
+			if (Distance > MaxDiff)
+			{
+				FPlane Plane(InViewportClient->GetWidgetLocation(), DirectionToWidget);
+				FVector StartOnPlane =
+				    FMath::RayPlaneIntersection(MouseViewportRay.GetOrigin(), CameraToPixelDir, Plane);
+				FVector OldOnPlane =
+				    FMath::RayPlaneIntersection(MouseViewportRay.GetOrigin(), OldCameraToPixelDir, Plane);
+				StartOnPlane -= InViewportClient->GetWidgetLocation();
+				OldOnPlane -= InViewportClient->GetWidgetLocation();
+				StartOnPlane.Normalize();
+				OldOnPlane.Normalize();
+				RotationAngle = FMath::Acos(FVector::DotProduct(StartOnPlane, OldOnPlane));
+
+				FVector Cross = FVector::CrossProduct(OldCameraToPixelDir, CameraToPixelDir);
+				if (FVector::DotProduct(DirectionToWidget, Cross) < 0.0f)
+				{
+					RotationAngle *= -1.0f;
+				}
+				RotationAxis = DirectionToWidget;
+			}
+			else
+			{
+				const float Scale = ScreenLocation.W *
+				    (4.0f / InView->UnscaledViewRect.Width() / InView->ViewMatrices.GetProjectionMatrix().M[0][0]);
+				const float InnerRadius = (INNER_AXIS_CIRCLE_RADIUS * Scale) + TransformWidgetSizeAdjustment;
+				const float LengthOfAdjacent = Length - InnerRadius;
+				RotationAngle                = FMath::Acos(FVector::DotProduct(OldCameraToPixelDir, CameraToPixelDir));
+				const float OppositeSize     = FMath::Tan(RotationAngle) * LengthOfAdjacent;
+				RotationAngle                = FMath::Atan(OppositeSize / InnerRadius);
+				RotationAngle                = RotationAngle < 0.0f ? RotationAngle : -RotationAngle;
+			}
+
+			const FQuat QuatRotation(RotationAxis, RotationAngle);
+			OutRotation = FRotator(QuatRotation);
+		}
+		*/
+		return;
+	}
+	else if (CurrentAxis == EAxisList::Screen)
+	{
+		/*
+		FVector2D MousePosition(InViewportClient->Viewport->GetMouseX(), InViewportClient->Viewport->GetMouseY());
+		FViewportCursorLocation OldMouseViewportRay(InView, InViewportClient, LastDragPos.X, LastDragPos.Y);
+		FViewportCursorLocation MouseViewportRay(InView, InViewportClient, MousePosition.X, MousePosition.Y);
+
+		LastDragPos               = MousePosition;
+		FVector DirectionToWidget = InViewportClient->GetWidgetLocation() - MouseViewportRay.GetOrigin();
+		float Length              = DirectionToWidget.Size();
+
+		if (!FMath::IsNearlyZero(Length))
+		{
+			DirectionToWidget /= Length;
+
+			const FVector CameraToPixelDir    = MouseViewportRay.GetDirection();
+			const FVector OldCameraToPixelDir = OldMouseViewportRay.GetDirection();
+			FPlane Plane(InViewportClient->GetWidgetLocation(), DirectionToWidget);
+			FVector StartOnPlane = FMath::RayPlaneIntersection(MouseViewportRay.GetOrigin(), CameraToPixelDir, Plane);
+			FVector OldOnPlane = FMath::RayPlaneIntersection(MouseViewportRay.GetOrigin(), OldCameraToPixelDir, Plane);
+			StartOnPlane -= InViewportClient->GetWidgetLocation();
+			OldOnPlane -= InViewportClient->GetWidgetLocation();
+			StartOnPlane.Normalize();
+			OldOnPlane.Normalize();
+			float RotationAngle = FMath::Acos(FVector::DotProduct(StartOnPlane, OldOnPlane));
+			FVector Cross       = FVector::CrossProduct(OldCameraToPixelDir, CameraToPixelDir);
+			if (FVector::DotProduct(DirectionToWidget, Cross) < 0.0f)
+			{
+				RotationAngle *= -1.0f;
+			}
+			const FQuat QuatRotation(DirectionToWidget, RotationAngle);
+			OutRotation = FRotator(QuatRotation);
+		}
+		*/
+		return;
+	}
+}
+
+void ASodaWidget::ConvertMouseToAxis_Scale(FVector2D DragDir, FVector& InOutDelta, FVector& OutScale)
+{
+	FVector2D AxisDir = FVector2D::ZeroVector;
+
+	if (CurrentAxis & EAxisList::X)
+	{
+		AxisDir += XAxisDir;
+	}
+
+	if (CurrentAxis & EAxisList::Y)
+	{
+		AxisDir += YAxisDir;
+	}
+
+	if (CurrentAxis & EAxisList::Z)
+	{
+		AxisDir += ZAxisDir;
+	}
+
+	AxisDir.Normalize();
+	const float ScaleDelta = FVector2D::DotProduct(AxisDir, DragDir);
+
+	OutScale =
+	    FVector((CurrentAxis & EAxisList::X) ? ScaleDelta : 0.0f, (CurrentAxis & EAxisList::Y) ? ScaleDelta : 0.0f,
+	            (CurrentAxis & EAxisList::Z) ? ScaleDelta : 0.0f);
+
+	// Snap to grid in widget axis space
+	//const FVector GridSize = FVector(GEditor->GetGridSize());
+	//FSnappingUtils::SnapScale(OutScale, GridSize);
+
+	// Convert to effective screen space delta, and replace input delta, adjusted for inverted screen space Y axis
+	const float ScaleMax           = OutScale.GetMax();
+	const float ScaleMin           = OutScale.GetMin();
+	const float ScaleApplied       = (ScaleMax > -ScaleMin) ? ScaleMax : ScaleMin;
+	const FVector2D EffectiveDelta = AxisDir * ScaleApplied;
+	InOutDelta                     = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+}
+
+void ASodaWidget::ConvertMouseToAxis_TranslateRotateZ(FVector2D TangentDir, FVector2D DragDir, FVector& InOutDelta,
+                                                  FVector& OutDrag, FRotator& OutRotation)
+{
+	if (CurrentAxis == EAxisList::ZRotation)
+	{
+		const FVector2D AxisDir = bIsOrthoDrawingFullRing ? TangentDir : ZAxisDir;
+		FRotator Rotation       = FRotator(0, FVector2D::DotProduct(AxisDir, DragDir), 0);
+		//FSnappingUtils::SnapRotatorToGrid(Rotation);
+		CurrentDeltaRotation = Rotation.Yaw;
+
+		const FVector2D EffectiveDelta = AxisDir * Rotation.Yaw;
+		InOutDelta                     = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+
+		OutRotation = (RenderData.CoordSystem.Inverse() * FRotationMatrix(Rotation) * RenderData.CoordSystem).Rotator();
+	}
+	else
+	{
+		// Get drag delta in widget axis space
+		OutDrag = FVector((CurrentAxis & EAxisList::X) ? FVector2D::DotProduct(XAxisDir, DragDir) : 0.0f,
+		                  (CurrentAxis & EAxisList::Y) ? FVector2D::DotProduct(YAxisDir, DragDir) : 0.0f,
+		                  (CurrentAxis & EAxisList::Z) ? FVector2D::DotProduct(ZAxisDir, DragDir) : 0.0f);
+
+		// Snap to grid in widget axis space
+		//const FVector GridSize = FVector(GEditor->GetGridSize());
+		//FSnappingUtils::SnapPointToGrid(OutDrag, GridSize);
+
+		// Convert to effective screen space delta, and replace input delta, adjusted for inverted screen space Y axis
+		const FVector2D EffectiveDelta = OutDrag.X * XAxisDir + OutDrag.Y * YAxisDir + OutDrag.Z * ZAxisDir;
+		InOutDelta                     = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+
+		// Transform drag delta into world space
+		OutDrag = RenderData.CoordSystem.TransformPosition(OutDrag);
+	}
+}
+
+void ASodaWidget::ConvertMouseToAxis_WM_2D(FVector2D TangentDir, FVector2D DragDir, FVector& InOutDelta, FVector& OutDrag,
+                                       FRotator& OutRotation)
+{
+	if (CurrentAxis == EAxisList::Rotate2D)
+	{
+		// TODO: Determine why -TangentDir is necessary here, and fix whatever is causing it
+		const FVector2D AxisDir = bIsOrthoDrawingFullRing ? -TangentDir : YAxisDir;
+
+		FRotator Rotation = FRotator(FVector2D::DotProduct(AxisDir, DragDir), 0, 0);
+		//FSnappingUtils::SnapRotatorToGrid(Rotation);
+
+		CurrentDeltaRotation     = Rotation.Pitch;
+		FVector2D EffectiveDelta = AxisDir * Rotation.Pitch;
+
+
+		// Adjust the input delta according to how much rotation was actually applied
+		InOutDelta = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+
+		// Need to get the delta rotation in the current coordinate space of the widget
+		OutRotation = (RenderData.CoordSystem.Inverse() * FRotationMatrix(Rotation) * RenderData.CoordSystem).Rotator();
+	}
+	else
+	{
+		// Get drag delta in widget axis space
+		OutDrag = FVector((CurrentAxis & EAxisList::X) ? FVector2D::DotProduct(XAxisDir, DragDir) : 0.0f,
+		                  (CurrentAxis & EAxisList::Y) ? FVector2D::DotProduct(YAxisDir, DragDir) : 0.0f,
+		                  (CurrentAxis & EAxisList::Z) ? FVector2D::DotProduct(ZAxisDir, DragDir) : 0.0f);
+
+		// Snap to grid in widget axis space
+		//const FVector GridSize = FVector(GEditor->GetGridSize());
+		//FSnappingUtils::SnapPointToGrid(OutDrag, GridSize);
+
+		// Convert to effective screen space delta, and replace input delta, adjusted for inverted screen space Y axis
+		const FVector2D EffectiveDelta = OutDrag.X * XAxisDir + OutDrag.Y * YAxisDir + OutDrag.Z * ZAxisDir;
+		InOutDelta                     = FVector(EffectiveDelta.X, -EffectiveDelta.Y, 0.0f);
+
+		// Transform drag delta into world space
+		OutDrag = RenderData.CoordSystem.TransformPosition(OutDrag);
+	}
+}
+
+/**
+ * Converts mouse movement on the screen to widget axis movement/rotation.
+ */
+void ASodaWidget::ConvertMouseMovementToAxisMovement(FSceneView* InView, USodaGameViewportClient* InViewportClient,
+                                                 bool bInUsedDragModifier, FVector& InOutDelta, FVector& OutDrag,
+                                                 FRotator& OutRotation, FVector& OutScale)
+{
+	OutDrag     = FVector::ZeroVector;
+	OutRotation = FRotator::ZeroRotator;
+	OutScale    = FVector::ZeroVector;
+
+	const int32 WidgetMode = InViewportClient->GetWidgetMode();
+
+	// Get input delta as 2D vector, adjusted for inverted screen space Y axis
+	const FVector2D DragDir = FVector2D(InOutDelta.X, -InOutDelta.Y);
+
+	// Get offset of the drag start position from the widget origin
+	const FVector2D DirectionToMousePos = FVector2D(DragStartPos - RenderData.Origin).GetSafeNormal();
+
+	// For rotations which display as a full ring, calculate the tangent direction representing a clockwise movement
+	FVector2D TangentDir = bInUsedDragModifier ?
+	    // If a drag modifier has been used, this implies we are not actually touching the widget, so don't attempt to
+	    // calculate the tangent dir based on the relative offset of the cursor from the widget location.
+	    FVector2D(1, 1).GetSafeNormal() :
+	    // Treat the tangent dir as perpendicular to the relative offset of the cursor from the widget location.
+	    FVector2D(-DirectionToMousePos.Y, DirectionToMousePos.X);
+
+	switch (WidgetMode)
+	{
+	case soda::EWidgetMode::WM_Translate:
+		ConvertMouseToAxis_Translate(DragDir, InOutDelta, OutDrag);
+		break;
+	case soda::EWidgetMode::WM_Rotate:
+		ConvertMouseToAxis_Rotate(TangentDir, DragDir, InView, InViewportClient, InOutDelta, OutRotation);
+		break;
+	case soda::EWidgetMode::WM_Scale:
+		ConvertMouseToAxis_Scale(DragDir, InOutDelta, OutScale);
+		break;
+	default:
+		break;
+	}
+}
+
+/**
+ * For axis movement, get the "best" planar normal and axis mask
+ * @param InAxis - Axis of movement
+ * @param InDirToPixel -
+ * @param OutPlaneNormal - Normal of the plane to project the mouse onto
+ * @param OutMask - Used to mask out the component of the planar movement we want
+ */
+void GetAxisPlaneNormalAndMask(const FMatrix& InCoordSystem, const FVector& InAxis, const FVector& InDirToPixel,
+                               FVector& OutPlaneNormal, FVector& NormalToRemove)
+{
+	FVector XAxis = InCoordSystem.TransformVector(FVector(1, 0, 0));
+	FVector YAxis = InCoordSystem.TransformVector(FVector(0, 1, 0));
+	FVector ZAxis = InCoordSystem.TransformVector(FVector(0, 0, 1));
+
+	float XDot = FMath::Abs(InDirToPixel | XAxis);
+	float YDot = FMath::Abs(InDirToPixel | YAxis);
+	float ZDot = FMath::Abs(InDirToPixel | ZAxis);
+
+	if ((InAxis | XAxis) > .1f)
+	{
+		OutPlaneNormal = (YDot > ZDot) ? YAxis : ZAxis;
+		NormalToRemove = (YDot > ZDot) ? ZAxis : YAxis;
+	}
+	else if ((InAxis | YAxis) > .1f)
+	{
+		OutPlaneNormal = (XDot > ZDot) ? XAxis : ZAxis;
+		NormalToRemove = (XDot > ZDot) ? ZAxis : XAxis;
+	}
+	else
+	{
+		OutPlaneNormal = (XDot > YDot) ? XAxis : YAxis;
+		NormalToRemove = (XDot > YDot) ? YAxis : XAxis;
+	}
+}
+
+/**
+ * For planar movement, get the "best" planar normal and axis mask
+ * @param InAxis - Axis of movement
+ * @param OutPlaneNormal - Normal of the plane to project the mouse onto
+ * @param OutMask - Used to mask out the component of the planar movement we want
+ */
+void GetPlaneNormalAndMask(const FVector& InAxis, FVector& OutPlaneNormal, FVector& NormalToRemove)
+{
+	OutPlaneNormal = InAxis;
+	NormalToRemove = InAxis;
+}
+
+void ASodaWidget::AbsoluteConvertMouseToAxis_Translate(FSceneView* InView, const FMatrix& InputCoordSystem,
+                                                   FAbsoluteMovementParams& InOutParams, FVector& OutDrag)
+{
+	switch (CurrentAxis)
+	{
+	case EAxisList::X:
+		GetAxisPlaneNormalAndMask(InputCoordSystem, InOutParams.XAxis, InOutParams.CameraDir, InOutParams.PlaneNormal,
+		                          InOutParams.NormalToRemove);
+		break;
+	case EAxisList::Y:
+		GetAxisPlaneNormalAndMask(InputCoordSystem, InOutParams.YAxis, InOutParams.CameraDir, InOutParams.PlaneNormal,
+		                          InOutParams.NormalToRemove);
+		break;
+	case EAxisList::Z:
+		GetAxisPlaneNormalAndMask(InputCoordSystem, InOutParams.ZAxis, InOutParams.CameraDir, InOutParams.PlaneNormal,
+		                          InOutParams.NormalToRemove);
+		break;
+	case EAxisList::XY:
+		GetPlaneNormalAndMask(InOutParams.ZAxis, InOutParams.PlaneNormal, InOutParams.NormalToRemove);
+		break;
+	case EAxisList::XZ:
+		GetPlaneNormalAndMask(InOutParams.YAxis, InOutParams.PlaneNormal, InOutParams.NormalToRemove);
+		break;
+	case EAxisList::YZ:
+		GetPlaneNormalAndMask(InOutParams.XAxis, InOutParams.PlaneNormal, InOutParams.NormalToRemove);
+		break;
+	case EAxisList::Screen:
+		InOutParams.XAxis = InView->ViewMatrices.GetViewMatrix().GetColumn(0);
+		InOutParams.YAxis = InView->ViewMatrices.GetViewMatrix().GetColumn(1);
+		InOutParams.ZAxis = InView->ViewMatrices.GetViewMatrix().GetColumn(2);
+		GetPlaneNormalAndMask(InOutParams.ZAxis, InOutParams.PlaneNormal, InOutParams.NormalToRemove);
+		//do not damp the movement in this case, we also want to snap
+		InOutParams.bMovementLockedToCamera = false;
+		break;
+	}
+
+	OutDrag = GetAbsoluteTranslationDelta(InOutParams);
+}
+
+/**
+ * Absolute Translation conversion from mouse movement on the screen to widget axis movement/rotation.
+ */
+void ASodaWidget::AbsoluteTranslationConvertMouseMovementToAxisMovement(FSceneView* InView,
+                                                                    USodaGameViewportClient* InViewportClient,
+                                                                    const FVector& InLocation,
+                                                                    const FVector2D& InMousePosition, FVector& OutDrag,
+                                                                    FRotator& OutRotation, FVector& OutScale)
+{
+	
+	// Compute a world space ray from the screen space mouse coordinates
+	FEditorUtils::FViewportCursorLocation MouseViewportRay(InView, InViewportClient, InMousePosition.X, InMousePosition.Y);
+
+	FAbsoluteMovementParams Params;
+	Params.EyePos    = MouseViewportRay.GetOrigin();
+	Params.PixelDir  = MouseViewportRay.GetDirection();
+	Params.CameraDir = InView->GetViewDirection();
+	Params.Position  = InLocation;
+	//dampen by
+	Params.bMovementLockedToCamera = false; // InViewportClient->IsShiftPressed();
+	Params.bPositionSnapping       = true;
+
+	FMatrix InputCoordSystem = InViewportClient->GetWidgetCoordSystem();
+
+	Params.XAxis = InputCoordSystem.TransformVector(FVector(1, 0, 0));
+	Params.YAxis = InputCoordSystem.TransformVector(FVector(0, 1, 0));
+	Params.ZAxis = InputCoordSystem.TransformVector(FVector(0, 0, 1));
+
+	switch (InViewportClient->GetWidgetMode())
+	{
+	case soda::EWidgetMode::WM_Translate:
+		AbsoluteConvertMouseToAxis_Translate(InView, InputCoordSystem, Params, OutDrag);
+		break;
+	case soda::EWidgetMode::WM_Rotate:
+	case soda::EWidgetMode::WM_Scale:
+	case soda::EWidgetMode::WM_None:
+	case soda::EWidgetMode::WM_Max:
+		break;
+	}
+	
+}
+
+/** Only some modes support Absolute Translation Movement */
+bool ASodaWidget::AllowsAbsoluteTranslationMovement(soda::EWidgetMode WidgetMode)
+{
+	if (WidgetMode == soda::EWidgetMode::WM_Translate)
+	{
+		return true;
+	}
+	return false;
+}
+
+/** Only some modes support Absolute Rotation Movement/arcball*/
+bool ASodaWidget::AllowsAbsoluteRotationMovement(soda::EWidgetMode WidgetMode, EAxisList::Type InAxisType)
+{
+	if (WidgetMode == soda::EWidgetMode::WM_Rotate && (InAxisType == EAxisList::XYZ || InAxisType == EAxisList::Screen))
+	{
+		return true;
+	}
+	return false;
+}
+
+#define CAMERA_LOCK_DAMPING_FACTOR .1f
+#define MAX_CAMERA_MOVEMENT_SPEED 512.0f
+/**
+ * Returns the Delta from the current position that the absolute movement system wants the object to be at
+ * @param InParams - Structure containing all the information needed for absolute movement
+ * @return - The requested delta from the current position
+ */
+FVector ASodaWidget::GetAbsoluteTranslationDelta(const FAbsoluteMovementParams& InParams)
+{
+	FPlane MovementPlane(InParams.Position, InParams.PlaneNormal);
+	FVector ProposedEndofEyeVector =
+	    InParams.EyePos + (InParams.PixelDir * (InParams.Position - InParams.EyePos).Size());
+
+	//default to not moving
+	FVector RequestedPosition = InParams.Position;
+
+	float DotProductWithPlaneNormal = InParams.PixelDir | InParams.PlaneNormal;
+	//check to make sure we're not co-planar
+	if (FMath::Abs(DotProductWithPlaneNormal) > DELTA)
+	{
+		//Get closest point on plane
+		RequestedPosition = FMath::LinePlaneIntersection(InParams.EyePos, ProposedEndofEyeVector, MovementPlane);
+	}
+
+	//drag is a delta position, so just update the different between the previous position and the new position
+	FVector DeltaPosition = RequestedPosition - InParams.Position;
+
+	//Retrieve the initial offset, passing in the current requested position and the current position
+	FVector InitialOffset = GetAbsoluteTranslationInitialOffset(RequestedPosition, InParams.Position);
+
+	//subtract off the initial offset (where the widget was clicked) to prevent popping
+	DeltaPosition -= InitialOffset;
+
+	//remove the component along the normal we want to mute
+	float MovementAlongMutedAxis = DeltaPosition | InParams.NormalToRemove;
+	FVector OutDrag              = DeltaPosition - (InParams.NormalToRemove * MovementAlongMutedAxis);
+
+	if (InParams.bMovementLockedToCamera)
+	{
+		//DAMPEN ABSOLUTE MOVEMENT when the camera is locked to the object
+		OutDrag *= CAMERA_LOCK_DAMPING_FACTOR;
+		OutDrag.X = FMath::Clamp<FVector::FReal>(OutDrag.X, -MAX_CAMERA_MOVEMENT_SPEED, MAX_CAMERA_MOVEMENT_SPEED);
+		OutDrag.Y = FMath::Clamp<FVector::FReal>(OutDrag.Y, -MAX_CAMERA_MOVEMENT_SPEED, MAX_CAMERA_MOVEMENT_SPEED);
+		OutDrag.Z = FMath::Clamp<FVector::FReal>(OutDrag.Z, -MAX_CAMERA_MOVEMENT_SPEED, MAX_CAMERA_MOVEMENT_SPEED);
+	}
+
+	//the they requested position snapping and we're not moving with the camera
+	if (InParams.bPositionSnapping && !InParams.bMovementLockedToCamera && bSnapEnabled)
+	{
+		FVector MovementAlongAxis =
+		    FVector(OutDrag | InParams.XAxis, OutDrag | InParams.YAxis, OutDrag | InParams.ZAxis);
+		//translation (either xy plane or z)
+		//FSnappingUtils::SnapPointToGrid( MovementAlongAxis, FVector(GEditor->GetGridSize(), GEditor->GetGridSize(), GEditor->GetGridSize()));
+
+		OutDrag = MovementAlongAxis.X * InParams.XAxis + MovementAlongAxis.Y * InParams.YAxis +
+		    MovementAlongAxis.Z * InParams.ZAxis;
+	}
+
+	//get the distance from the original position to the new proposed position
+	FVector DeltaFromStart = InParams.Position + OutDrag - InitialTranslationPosition;
+
+	//Get the vector from the eye to the proposed new position (to make sure it's not behind the camera
+	FVector EyeToNewPosition        = (InParams.Position + OutDrag) - InParams.EyePos;
+	float BehindTheCameraDotProduct = EyeToNewPosition | InParams.CameraDir;
+
+	//Don't let the requested position go behind the camera
+	if (BehindTheCameraDotProduct <= 0)
+	{
+		OutDrag = OutDrag.ZeroVector;
+	}
+	return OutDrag;
+}
+
+/**
+ * Returns the offset from the initial selection point
+ */
+FVector ASodaWidget::GetAbsoluteTranslationInitialOffset(const FVector& InNewPosition, const FVector& InCurrentPosition)
+{
+	if (!bAbsoluteTranslationInitialOffsetCached)
+	{
+		bAbsoluteTranslationInitialOffsetCached = true;
+		InitialTranslationOffset                = InNewPosition - InCurrentPosition;
+		InitialTranslationPosition              = InCurrentPosition;
+	}
+	return InitialTranslationOffset;
+}
+
+
+/**
+ * Returns true if we're in Local Space editing mode
+ */
+bool ASodaWidget::IsRotationLocalSpace() const
+{
+	return (RenderData.CoordSystemSpace == soda::COORD_Local);
+}
+
+void ASodaWidget::UpdateDeltaRotation()
+{
+	TotalDeltaRotation += CurrentDeltaRotation;
+	if ((TotalDeltaRotation <= -360.f) || (TotalDeltaRotation >= 360.f))
+	{
+		TotalDeltaRotation = FRotator::ClampAxis(TotalDeltaRotation);
+	}
+}
+
+/**
+ * Returns the angle in degrees representation of how far we have just rotated
+ */
+float ASodaWidget::GetDeltaRotation() const
+{
+	return TotalDeltaRotation;
+}
+
+uint32 ASodaWidget::GetDominantAxisIndex(const FVector& InDiff, USodaGameViewportClient* ViewportClient) const
+{
+	uint32 DominantIndex = 0;
+	if (FMath::Abs(InDiff.X) < FMath::Abs(InDiff.Y))
+	{
+		DominantIndex = 1;
+	}
+	return DominantIndex;
+}
+
+bool ASodaWidget::IsWidgetDisabled() const
+{
+	return false; //EditorModeTools ? (EditorModeTools->IsDefaultModeActive() && GEditor->HasLockedActors()) : false;
+}
diff --git a/Source/UnrealSoda/Private/FromUE/ChaosInterfaceWrapper.cpp b/Source/UnrealSoda/Private/FromUE/ChaosInterfaceWrapper.cpp
new file mode 100644
index 0000000..d67010f
--- /dev/null
+++ b/Source/UnrealSoda/Private/FromUE/ChaosInterfaceWrapper.cpp
@@ -0,0 +1,45 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#if(!IS_MONOLITHIC)
+
+#include "Physics/Experimental/ChaosInterfaceWrapper.h"
+#include "Physics/Experimental/PhysScene_Chaos.h"
+#include "Chaos/ParticleHandle.h"
+#include "PhysxUserData.h"
+#include "PBDRigidsSolver.h"
+
+
+namespace ChaosInterface
+{
+	FBodyInstance* GetUserData(const Chaos::FGeometryParticle& Actor)
+	{
+		void* UserData = Actor.UserData();
+		return UserData ? FChaosUserData::Get<FBodyInstance>(Actor.UserData()) : nullptr;
+	}
+
+	UPhysicalMaterial* GetUserData(const Chaos::FChaosPhysicsMaterial& Material)
+	{
+		void* UserData = Material.UserData;
+		return UserData ? FChaosUserData::Get<UPhysicalMaterial>(UserData) : nullptr;
+	}
+
+	FScopedSceneReadLock::FScopedSceneReadLock(FPhysScene_Chaos& SceneIn)
+		: Solver(SceneIn.GetSolver())
+	{
+		if(Solver)
+		{
+			Solver->GetExternalDataLock_External().ReadLock();
+		}
+	}
+
+	FScopedSceneReadLock::~FScopedSceneReadLock()
+	{
+		if(Solver)
+		{
+			Solver->GetExternalDataLock_External().ReadUnlock();
+		}
+	}
+}
+
+#endif // IS_MONOLITHIC
diff --git a/Source/UnrealSoda/Private/FromUE/CollisionConversions.cpp b/Source/UnrealSoda/Private/FromUE/CollisionConversions.cpp
new file mode 100644
index 0000000..779089b
--- /dev/null
+++ b/Source/UnrealSoda/Private/FromUE/CollisionConversions.cpp
@@ -0,0 +1,820 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#if(!IS_MONOLITHIC)
+
+#include "Runtime/Engine/Private/Collision/CollisionConversions.h"
+#include "Engine/World.h"
+#include "Components/PrimitiveComponent.h"
+
+//#include "Collision/CollisionDebugDrawing.h"
+#include "Components/LineBatchComponent.h"
+#include "PhysicalMaterials/PhysicalMaterial.h"
+#include "PhysicalMaterials/PhysicalMaterialMask.h"
+#include "PhysicsEngine/PhysicsSettings.h"
+#include "PhysicsEngine/BodySetup.h"
+#include "Physics/PhysicsInterfaceUtils.h"
+
+#include "Physics/Experimental/ChaosInterfaceWrapper.h"
+#include "Physics/Experimental/PhysInterface_Chaos.h"
+#include "Chaos/ParticleHandle.h"
+
+#include "Runtime/Engine/Private/PhysicsEngine/CollisionQueryFilterCallback.h"
+#include "GameFramework/LightWeightInstanceManager.h"
+#include "PhysicsProxy/SingleParticlePhysicsProxy.h"
+#include "PhysicsProxy/GeometryCollectionPhysicsProxy.h"
+
+#include "ChaosInterfaceWrapperCore.h"
+
+
+
+ECollisionShapeType GetGeometryType(const Chaos::FPerShapeData& Shape)
+{
+	return ChaosInterface::GetType(*Shape.GetGeometry());
+}
+
+
+// Used to place overlaps into a TMap when deduplicating them
+struct FOverlapKey
+{
+	UPrimitiveComponent* Component;
+	int32 ComponentIndex;
+
+	FOverlapKey(UPrimitiveComponent* InComponent, int32 InComponentIndex)
+		: Component(InComponent)
+		, ComponentIndex(InComponentIndex)
+	{
+	}
+
+	friend bool operator==(const FOverlapKey& X, const FOverlapKey& Y)
+	{
+		return (X.ComponentIndex == Y.ComponentIndex) && (X.Component == Y.Component);
+	}
+};
+
+uint32 GetTypeHash(const FOverlapKey& Key)
+{
+	return GetTypeHash(Key.Component) ^ GetTypeHash(Key.ComponentIndex);
+}
+
+
+//extern int32 CVarShowInitialOverlaps;
+
+// Forward declare, I don't want to move the entire function right now or we lose change history.
+template <typename THitLocation>
+static bool ConvertOverlappedShapeToImpactHit(const UWorld* World, const THitLocation& Hit, const FVector& StartLoc, const FVector& EndLoc, FHitResult& OutResult, const FPhysicsGeometry& Geom, const FTransform& QueryTM, const FCollisionFilterData& QueryFilter, bool bReturnPhysMat);
+
+DECLARE_CYCLE_STAT(TEXT("ConvertQueryHit"), STAT_ConvertQueryImpactHit, STATGROUP_Collision);
+DECLARE_CYCLE_STAT(TEXT("ConvertOverlapToHit"), STAT_CollisionConvertOverlapToHit, STATGROUP_Collision);
+DECLARE_CYCLE_STAT(TEXT("ConvertOverlap"), STAT_CollisionConvertOverlap, STATGROUP_Collision);
+DECLARE_CYCLE_STAT(TEXT("SetHitResultFromShapeAndFaceIndex"), STAT_CollisionSetHitResultFromShapeAndFaceIndex, STATGROUP_Collision);
+
+#define ENABLE_CHECK_HIT_NORMAL  (!(UE_BUILD_SHIPPING || UE_BUILD_TEST))
+
+#if ENABLE_CHECK_HIT_NORMAL
+/* Validate Normal of OutResult. We're on hunt for invalid normal */
+static void CheckHitResultNormal(const FHitResult& OutResult, const TCHAR* Message, const FVector& Start = FVector::ZeroVector, const FVector& End = FVector::ZeroVector, const FPhysicsGeometry* Geom = nullptr, const FVector& NormalPreSafeNormalize = FVector::ZeroVector)
+{
+	using namespace ChaosInterface;
+
+	if (!OutResult.bStartPenetrating && !OutResult.Normal.IsNormalized())
+	{
+		UE_LOG(LogPhysics, Warning, TEXT("(%s) Non-normalized OutResult.Normal from hit conversion: %s (Component- %s)"), Message, *OutResult.Normal.ToString(), *OutResult.Component->GetFullName());
+		UE_LOG(LogPhysics, Warning, TEXT("Start Loc(%s), End Loc(%s), Hit Loc(%s), ImpactNormal(%s) NormalPreSafeNormalize(%s)"), *Start.ToString(), *End.ToString(), *OutResult.Location.ToString(), *OutResult.ImpactNormal.ToString(), *NormalPreSafeNormalize.ToString());
+		if (Geom)
+		{
+			if (GetType(*Geom) == ECollisionShapeType::Capsule)
+			{
+				const FPhysicsCapsuleGeometry& Capsule = (FPhysicsCapsuleGeometry&)*Geom;
+				UE_LOG(LogPhysics, Warning, TEXT("Capsule radius (%f), Capsule Halfheight (%f)"), GetRadius(Capsule), GetHalfHeight(Capsule));
+			}
+		}
+		ensure(OutResult.Normal.IsNormalized());
+	}
+}
+#endif // ENABLE_CHECK_HIT_NORMAL
+
+
+
+
+static FVector FindSimpleOpposingNormal(const FHitLocation& Hit, const FVector& TraceDirectionDenorm, const FVector InNormal)
+{
+	// We don't compute anything special
+	return InNormal;
+}
+
+
+/**
+ * Util to find the normal of the face that we hit. Will use faceIndex from the hit if possible.
+ * @param PHit - incoming hit from Physics
+ * @param TraceDirectionDenorm - direction of sweep test (not normalized)
+ * @param InNormal - default value in case no new normal is computed.
+ * @return New normal we compute for geometry.
+ */
+template <typename THitLocation>
+static FVector FindGeomOpposingNormal(ECollisionShapeType QueryGeomType, const THitLocation& Hit, const FVector& TraceDirectionDenorm, const FVector InNormal)
+{
+	// TODO: can we support other shapes here as well?
+	if (QueryGeomType == ECollisionShapeType::Capsule || QueryGeomType == ECollisionShapeType::Sphere)
+	{
+		if (const FPhysicsShape* Shape = GetShape(Hit))
+		{
+			const Chaos::EImplicitObjectType ShapeType = Shape->GetGeometry()->GetNestedType();
+			if (ShapeType == Chaos::ImplicitObjectType::Union && !Hit.FaceNormal.IsNearlyZero())
+			{
+				return Hit.FaceNormal;
+			}
+			else
+			{
+				const FTransform ActorTM(Hit.Actor->R(), Hit.Actor->X());
+				const FVector LocalInNormal = ActorTM.InverseTransformVectorNoScale(InNormal);
+				const FVector LocalTraceDirectionDenorm = ActorTM.InverseTransformVectorNoScale(TraceDirectionDenorm);
+				const FVector LocalNormal = Shape->GetGeometry()->FindGeometryOpposingNormal(LocalTraceDirectionDenorm, Hit.FaceIndex, LocalInNormal);
+				return ActorTM.TransformVectorNoScale(LocalNormal);
+			}
+		}
+	}
+
+	return InNormal;
+}
+
+/** Set info in the HitResult (Actor, Component, PhysMaterial, BoneName, Item) based on the supplied shape and face index */
+static void SetHitResultFromShapeAndFaceIndex(const FPhysicsShape& Shape, const FPhysicsActor& Actor, const uint32 FaceIndex, const FVector& HitLocation, FHitResult& OutResult, bool bReturnPhysMat)
+{
+	using namespace ChaosInterface;
+
+	SCOPE_CYCLE_COUNTER(STAT_CollisionSetHitResultFromShapeAndFaceIndex);
+
+	const int32 ShapeIndex = Shape.GetShapeIndex();
+	CHAOS_CHECK(ShapeIndex < (int32)TNumericLimits<uint8>::Max()); // I could just write < 256, but this makes it more clear *why*
+	OutResult.ElementIndex = (uint8)ShapeIndex;
+
+	UPrimitiveComponent* OwningComponent = nullptr;
+	if (const FBodyInstance* BodyInst = GetUserData(Actor))
+	{
+		BodyInst = FPhysicsInterface::ShapeToOriginalBodyInstance(BodyInst, &Shape);
+
+		//Normal case where we hit a body
+		OutResult.Item = BodyInst->InstanceBodyIndex;
+		const UBodySetupCore* BodySetup = BodyInst->BodySetup.Get();	//this data should be immutable at runtime so ok to check from worker thread.
+		if (BodySetup)
+		{
+			OutResult.BoneName = BodySetup->BoneName;
+		}
+
+		OwningComponent = BodyInst->OwnerComponent.Get();
+	}
+	else
+	{
+		// Currently geom collections are registered with a primitive component user data, but maybe custom should be adapted
+		// to be more general so we can support leaf identification #BGTODO
+		void* UserData = Actor.UserData();
+		UPrimitiveComponent* PossibleOwner = FChaosUserData::Get<UPrimitiveComponent>(UserData);
+
+		if (PossibleOwner)
+		{
+			OwningComponent = PossibleOwner;
+			OutResult.Item = INDEX_NONE;
+			OutResult.BoneName = NAME_None;
+
+			// if we have a geometry component let's extract the index of the active piece we have a hit for
+			if (const IPhysicsProxyBase* ActorProxy = Actor.GetProxy())
+			{
+				if (ActorProxy->GetType() == EPhysicsProxyType::GeometryCollectionType)
+				{
+					const FGeometryCollectionPhysicsProxy* ConcreteProxy = static_cast<const FGeometryCollectionPhysicsProxy*>(ActorProxy);
+					const FGeometryCollectionItemIndex ItemIndex = ConcreteProxy->GetItemIndexFromGTParticle_External(Actor.CastToRigidParticle());
+					OutResult.Item = ItemIndex.GetItemIndex();
+					OutResult.BoneName = ConcreteProxy->GetTransformName_External(ItemIndex);
+				}
+			}
+		}
+		else
+		{
+			ensureMsgf(false, TEXT("SetHitResultFromShapeAndFaceIndex hit shape with invalid userData"));
+		}
+	}
+
+	OutResult.PhysMaterial = nullptr;
+
+	// Grab actor/component
+	if (OwningComponent)
+	{
+		OutResult.Component = OwningComponent;
+		AActor* Owner = OwningComponent->GetOwner();
+		if (ALightWeightInstanceManager* LWIManager = Cast<ALightWeightInstanceManager>(Owner))
+		{
+			OutResult.HitObjectHandle = FActorInstanceHandle(LWIManager, OutResult.Item);
+		}
+		else
+		{
+			OutResult.HitObjectHandle = FActorInstanceHandle(OwningComponent->GetOwner());
+		}
+
+		/*
+		if (bReturnPhysMat)
+		{
+			if (const FPhysicsMaterial* PhysicsMaterial = GetMaterialFromInternalFaceIndexAndHitLocation(Shape, Actor, FaceIndex, HitLocation))
+			{
+				OutResult.PhysMaterial = GetUserData(*PhysicsMaterial);
+			}
+		}
+		*/
+	}
+
+	OutResult.FaceIndex = INDEX_NONE;
+}
+
+const FPhysicsActor* GetGTActor(const FPhysicsActor* GTActor) { return GTActor; }
+
+template <bool bGT>
+const FPhysicsShape* GetGTShape(const FPhysicsShape* GTShape, const FPhysicsActor* GTActor) { return GTShape; }
+
+template <>
+const FPhysicsShape* GetGTShape<false>(const FPhysicsShape* PTShape, const FPhysicsActor* GTActor)
+{
+	//This assumes that the geometry hasn't changed.
+	//If it has you will either get null, or the wrong GT shape (note this gt shape is valid and safe to access, user will just get incorrect result)
+	//This is expected because you are accessing GT timeline data from the PT timeline
+	if (GTActor)
+	{
+		const Chaos::FShapesArray& Shapes = GTActor->ShapesArray();
+		const int32 Idx = PTShape->GetShapeIndex();
+		if (Idx < Shapes.Num())
+		{
+			return Shapes[Idx].Get();
+		}
+	}
+
+	return nullptr;
+}
+
+const FPhysicsActor* GetGTActor(const Chaos::FGeometryParticleHandle* PTActor)
+{
+	//TODO: need to pass in context so that in PT we always return null
+	//In frozen GT this is ok because object can't be unregistered while we're holding on to this
+	//On PT this is only true if we acquire a gt lock which is not great
+	auto Proxy = static_cast<const Chaos::FSingleParticlePhysicsProxy*>(PTActor->PhysicsProxy());
+	return Proxy->GetParticle_LowLevel();
+}
+
+template <typename THitLocation>
+EConvertQueryResult ConvertQueryImpactHitImp(const UWorld* World, const THitLocation& Hit, FHitResult& OutResult, float CheckLength, const FCollisionFilterData& QueryFilter, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, bool bReturnFaceIndex, bool bReturnPhysMat)
+{
+	using namespace ChaosInterface;
+
+	SCOPE_CYCLE_COUNTER(STAT_ConvertQueryImpactHit);
+
+#if WITH_EDITOR
+	if (bReturnFaceIndex && World->IsGameWorld())
+	{
+		if (UPhysicsSettings::Get()->bSuppressFaceRemapTable)
+		{
+			bReturnFaceIndex = false;	//The editor uses the remap table, so we modify this to get the same results as you would in a cooked build
+		}
+	}
+#endif
+
+	FHitFlags Flags = GetFlags(Hit);
+	checkSlow(Flags & EHitFlags::Distance);
+
+	const FPhysicsShape* pHitShape = GetShape(Hit);
+	const auto pHitActor = GetActor(Hit);
+
+	const uint32 InternalFaceIndex = GetInternalFaceIndex(Hit);
+	const bool bInitialOverlap = HadInitialOverlap(Hit);
+
+	if (bInitialOverlap && Geom)
+	{
+		ConvertOverlappedShapeToImpactHit(World, Hit, StartLoc, EndLoc, OutResult, *Geom, QueryTM, QueryFilter, bReturnPhysMat);
+
+		if (pHitShape)
+		{
+			const bool bTriMesh = GetGeometryType(*pHitShape) == ECollisionShapeType::Trimesh;
+			const bool bValidInternalFace = InternalFaceIndex != GetInvalidPhysicsFaceIndex();
+			if (bReturnFaceIndex && bTriMesh && bValidInternalFace)
+			{
+				//OutResult.FaceIndex = GetTriangleMeshExternalFaceIndex(*pHitShape, InternalFaceIndex);
+			}
+		}
+
+		return EConvertQueryResult::Valid;
+	}
+
+	if ((pHitShape == nullptr) || (pHitActor == nullptr))
+	{
+		OutResult.Reset();
+		return EConvertQueryResult::Invalid;
+	}
+
+	const FPhysicsShape& HitShape = *pHitShape;
+	const auto& HitActor = *pHitActor;
+
+	//Get the GT actor/shape for accessing GT specific data, should not be used for things like hit location
+	const FPhysicsActor* GTActor = GetGTActor(pHitActor);
+	//Note that a non-gt query could still happen on gt if we're in a fixed tick
+	constexpr bool bIsGTQuery = std::is_same<THitLocation, FHitLocation>::value;
+	const FPhysicsShape* GTShape = GetGTShape<bIsGTQuery>(pHitShape, GTActor);
+
+	// See if this is a 'blocking' hit
+	const FCollisionFilterData ShapeFilter = GetQueryFilterData(HitShape);
+	const ECollisionQueryHitType HitType = FCollisionQueryFilterCallback::CalcQueryHitType(QueryFilter, ShapeFilter);
+	OutResult.bBlockingHit = (HitType == ECollisionQueryHitType::Block);
+	OutResult.bStartPenetrating = bInitialOverlap;
+
+	// calculate the hit time
+	const float HitTime = GetDistance(Hit) / CheckLength;
+	OutResult.Time = HitTime;
+	OutResult.Distance = GetDistance(Hit);
+
+	// figure out where the the "safe" location for this shape is by moving from the startLoc toward the ImpactPoint
+	const FVector TraceStartToEnd = EndLoc - StartLoc;
+	const FVector SafeLocationToFitShape = StartLoc + (HitTime * TraceStartToEnd);
+	OutResult.Location = SafeLocationToFitShape;
+
+	const bool bUseReturnedPoint = ((Flags & EHitFlags::Position) && !bInitialOverlap);
+	FVector Position = StartLoc;
+	if (bUseReturnedPoint)
+	{
+		Position = GetPosition(Hit);
+		if (Position.ContainsNaN() && GTActor && GTShape)
+		{
+#if ENABLE_NAN_DIAGNOSTIC
+			SetHitResultFromShapeAndFaceIndex(*GTShape, *GTActor, InternalFaceIndex, OutResult.ImpactPoint, OutResult, bReturnPhysMat);
+			UE_LOG(LogCore, Error, TEXT("ConvertQueryImpactHit() NaN details:\n>> Actor:%s (%s)\n>> Component:%s\n>> Item:%d\n>> BoneName:%s\n>> Time:%f\n>> Distance:%f\n>> Location:%s\n>> bIsBlocking:%d\n>> bStartPenetrating:%d"),
+				*OutResult.GetHitObjectHandle().GetName(), OutResult.HasValidHitObjectHandle() ? *OutResult.GetHitObjectHandle().FetchActor()->GetPathName() : TEXT("no path"),
+				*GetNameSafe(OutResult.GetComponent()), OutResult.Item, *OutResult.BoneName.ToString(),
+				OutResult.Time, OutResult.Distance, *OutResult.Location.ToString(), OutResult.bBlockingHit ? 1 : 0, OutResult.bStartPenetrating ? 1 : 0);
+#endif // ENABLE_NAN_DIAGNOSTIC
+
+			OutResult.Reset();
+			logOrEnsureNanError(TEXT("ConvertQueryImpactHit() received NaN/Inf for position: %s"), *Position.ToString());
+			return EConvertQueryResult::Invalid;
+		}
+	}
+	OutResult.ImpactPoint = Position;
+
+	// Caution: we may still have an initial overlap, but with null Geom. This is the case for RayCast results.
+	const bool bUseReturnedNormal = ((Flags & EHitFlags::Normal) && !bInitialOverlap);
+	const FVector HitNormal = GetNormal(Hit);
+	if (bUseReturnedNormal && HitNormal.ContainsNaN() && GTActor && GTShape)
+	{
+#if ENABLE_NAN_DIAGNOSTIC
+		SetHitResultFromShapeAndFaceIndex(*GTShape, *GTActor, InternalFaceIndex, OutResult.ImpactPoint, OutResult, bReturnPhysMat);
+		UE_LOG(LogCore, Error, TEXT("ConvertQueryImpactHit() NaN details:\n>> Actor:%s (%s)\n>> Component:%s\n>> Item:%d\n>> BoneName:%s\n>> Time:%f\n>> Distance:%f\n>> Location:%s\n>> bIsBlocking:%d\n>> bStartPenetrating:%d"),
+			*OutResult.GetHitObjectHandle().GetName(), OutResult.HasValidHitObjectHandle() ? *OutResult.GetHitObjectHandle().FetchActor()->GetPathName() : TEXT("no path"),
+			*GetNameSafe(OutResult.GetComponent()), OutResult.Item, *OutResult.BoneName.ToString(),
+			OutResult.Time, OutResult.Distance, *OutResult.Location.ToString(), OutResult.bBlockingHit ? 1 : 0, OutResult.bStartPenetrating ? 1 : 0);
+#endif // ENABLE_NAN_DIAGNOSTIC
+
+		OutResult.Reset();
+		logOrEnsureNanError(TEXT("ConvertQueryImpactHit() received NaN/Inf for normal: %s"), *HitNormal.ToString());
+		return EConvertQueryResult::Invalid;
+	}
+
+	FVector OriginalNormal = bUseReturnedNormal ? HitNormal : -TraceStartToEnd;
+	FVector Normal = OriginalNormal.GetSafeNormal();
+	OutResult.Normal = Normal;
+	OutResult.ImpactNormal = Normal;
+
+	OutResult.TraceStart = StartLoc;
+	OutResult.TraceEnd = EndLoc;
+
+	// Fill in Actor, Component, material, etc.
+	if (GTActor && GTShape)
+	{
+		SetHitResultFromShapeAndFaceIndex(*GTShape, *GTActor, InternalFaceIndex, OutResult.ImpactPoint, OutResult, bReturnPhysMat);
+	}
+
+#if ENABLE_CHECK_HIT_NORMAL
+	CheckHitResultNormal(OutResult, TEXT("Invalid Normal from ConvertQueryImpactHit"), StartLoc, EndLoc, Geom, OriginalNormal);
+#endif // ENABLE_CHECK_HIT_NORMAL
+
+	if (bUseReturnedNormal && !Normal.IsNormalized())
+	{
+		// TraceStartToEnd should never be zero, because of the length restriction in the raycast and sweep tests.
+		Normal = -TraceStartToEnd.GetSafeNormal();
+		OutResult.Normal = Normal;
+		OutResult.ImpactNormal = Normal;
+	}
+
+	const ECollisionShapeType SweptGeometryType = Geom ? GetType(*Geom) : ECollisionShapeType::None;
+	OutResult.ImpactNormal = FindGeomOpposingNormal(SweptGeometryType, Hit, TraceStartToEnd, Normal);
+
+	ECollisionShapeType GeomType = GetGeometryType(HitShape);
+
+	if (GeomType == ECollisionShapeType::Heightfield)
+	{
+		// Lookup physical material for heightfields
+		if (bReturnPhysMat && InternalFaceIndex != GetInvalidPhysicsFaceIndex() && GTActor && GTShape)
+		{
+			/*
+			if (const FPhysicsMaterial* Material = GetMaterialFromInternalFaceIndex(*GTShape, *GTActor, InternalFaceIndex))
+			{
+				OutResult.PhysMaterial = GetUserData(*Material);
+			}
+			*/
+		}
+	}
+	else if (bReturnFaceIndex && GeomType == ECollisionShapeType::Trimesh && InternalFaceIndex != GetInvalidPhysicsFaceIndex() && GTShape)
+	{
+		//OutResult.FaceIndex = GetTriangleMeshExternalFaceIndex(*GTShape, InternalFaceIndex);
+	}
+
+	return EConvertQueryResult::Valid;
+}
+
+EConvertQueryResult ConvertQueryImpactHit(const UWorld* World, const FHitLocation& Hit, FHitResult& OutResult, float CheckLength, const FCollisionFilterData& QueryFilter, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, bool bReturnFaceIndex, bool bReturnPhysMat)
+{
+	return ConvertQueryImpactHitImp(World, Hit, OutResult, CheckLength, QueryFilter, StartLoc, EndLoc, Geom, QueryTM, bReturnFaceIndex, bReturnPhysMat);
+}
+EConvertQueryResult ConvertQueryImpactHit(const UWorld* World, const ChaosInterface::FPTLocationHit& Hit, FHitResult& OutResult, float CheckLength, const FCollisionFilterData& QueryFilter, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, bool bReturnFaceIndex, bool bReturnPhysMat)
+{
+	return ConvertQueryImpactHitImp(World, Hit, OutResult, CheckLength, QueryFilter, StartLoc, EndLoc, Geom, QueryTM, bReturnFaceIndex, bReturnPhysMat);
+}
+
+template <typename HitType>
+EConvertQueryResult ConvertTraceResults(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, HitType* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, TArray<FHitResult>& OutHits, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat)
+{
+	OutHits.Reserve(OutHits.Num() + NumHits);
+	EConvertQueryResult ConvertResult = EConvertQueryResult::Valid;
+	bool bHadBlockingHit = false;
+	const FVector Dir = (EndLoc - StartLoc).GetSafeNormal();
+
+	for (int32 i = 0; i < NumHits; i++)
+	{
+		HitType& Hit = Hits[i];
+		if (GetDistance(Hit) <= MaxDistance)
+		{
+			if constexpr (std::is_same_v<HitType, FHitSweep>)
+			{
+				if (!HadInitialOverlap(Hit))
+				{
+					SetInternalFaceIndex(Hit, FindFaceIndex(Hit, Dir));
+				}
+			}
+
+			FHitResult& NewResult = OutHits[OutHits.AddDefaulted()];
+			if (ConvertQueryImpactHit(World, Hit, NewResult, CheckLength, QueryFilter, StartLoc, EndLoc, Geom, QueryTM, bReturnFaceIndex, bReturnPhysMat) == EConvertQueryResult::Valid)
+			{
+				bHadBlockingHit |= NewResult.bBlockingHit;
+			}
+			else
+			{
+				// Reject invalid result (this should be rare). Remove from the results.
+				OutHits.Pop(/*bAllowShrinking=*/ false);
+				ConvertResult = EConvertQueryResult::Invalid;
+			}
+
+		}
+	}
+
+	// Sort results from first to last hit
+	OutHits.Sort(FCompareFHitResultTime());
+	OutHasValidBlockingHit = bHadBlockingHit;
+	return ConvertResult;
+}
+
+template <typename Hit>
+EConvertQueryResult ConvertTraceResults(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, Hit* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, FHitResult& OutHit, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat)
+{
+	const FVector Dir = (EndLoc - StartLoc).GetSafeNormal();
+	if constexpr (std::is_same_v<Hit, FHitSweep>)
+	{
+		if (!HadInitialOverlap(Hits[0]))
+		{
+			SetInternalFaceIndex(Hits[0], FindFaceIndex(Hits[0], Dir));
+		}
+	}
+	EConvertQueryResult Result = ConvertQueryImpactHit(World, Hits[0], OutHit, CheckLength, QueryFilter, StartLoc, EndLoc, Geom, QueryTM, bReturnFaceIndex, bReturnPhysMat);
+	OutHasValidBlockingHit = Result == EConvertQueryResult::Valid;
+	return Result;
+}
+
+template EConvertQueryResult ConvertTraceResults<FHitSweep>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, FHitSweep* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, TArray<FHitResult>& OutHits, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+template EConvertQueryResult ConvertTraceResults<FHitSweep>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, FHitSweep* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, FHitResult& OutHit, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+template EConvertQueryResult ConvertTraceResults<ChaosInterface::FPTSweepHit>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, ChaosInterface::FPTSweepHit* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, TArray<FHitResult>& OutHits, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+template EConvertQueryResult ConvertTraceResults<ChaosInterface::FPTSweepHit>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, ChaosInterface::FPTSweepHit* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, FHitResult& OutHit, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+template EConvertQueryResult ConvertTraceResults<FHitRaycast>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, FHitRaycast* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, TArray<FHitResult>& OutHits, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+template EConvertQueryResult ConvertTraceResults<FHitRaycast>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, FHitRaycast* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, FHitResult& OutHit, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+template EConvertQueryResult ConvertTraceResults<ChaosInterface::FPTRaycastHit>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, ChaosInterface::FPTRaycastHit* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, TArray<FHitResult>& OutHits, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+template EConvertQueryResult ConvertTraceResults<ChaosInterface::FPTRaycastHit>(bool& OutHasValidBlockingHit, const UWorld* World, int32 NumHits, ChaosInterface::FPTRaycastHit* Hits, float CheckLength, const FCollisionFilterData& QueryFilter, FHitResult& OutHit, const FVector& StartLoc, const FVector& EndLoc, const FPhysicsGeometry* Geom, const FTransform& QueryTM, float MaxDistance, bool bReturnFaceIndex, bool bReturnPhysMat);
+
+/** Util to convert an overlapped shape into a sweep hit result, returns whether it was a blocking hit. */
+template <typename THitLocation>
+static bool ConvertOverlappedShapeToImpactHit(const UWorld* World, const THitLocation& Hit, const FVector& StartLoc, const FVector& EndLoc, FHitResult& OutResult, const FPhysicsGeometry& Geom, const FTransform& QueryTM, const FCollisionFilterData& QueryFilter, bool bReturnPhysMat)
+{
+	using namespace ChaosInterface;
+
+	SCOPE_CYCLE_COUNTER(STAT_CollisionConvertOverlapToHit);
+
+	const FPhysicsShape* pHitShape = GetShape(Hit);
+	const auto pHitActor = GetActor(Hit);
+	if ((pHitShape == nullptr) || (pHitActor == nullptr))
+	{
+		OutResult.Reset();
+		return false;
+	}
+
+	const FPhysicsShape& HitShape = *pHitShape;
+	const auto& HitActor = *pHitActor;
+
+	// See if this is a 'blocking' hit
+	FCollisionFilterData ShapeFilter = GetQueryFilterData(HitShape);
+	const ECollisionQueryHitType HitType = FCollisionQueryFilterCallback::CalcQueryHitType(QueryFilter, ShapeFilter);
+	const bool bBlockingHit = (HitType == ECollisionQueryHitType::Block);
+	OutResult.bBlockingHit = bBlockingHit;
+
+	// Time of zero because initially overlapping
+	OutResult.bStartPenetrating = true;
+	OutResult.Time = 0.f;
+	OutResult.Distance = 0.f;
+
+	// Return start location as 'safe location'
+	OutResult.Location = QueryTM.GetLocation();
+
+	const bool bValidPosition = !!(GetFlags(Hit) & EHitFlags::Position);
+	if (bValidPosition)
+	{
+		const FVector HitPosition = GetPosition(Hit);
+		const bool bFinitePosition = !HitPosition.ContainsNaN();
+		if (bFinitePosition)
+		{
+			OutResult.ImpactPoint = HitPosition;
+		}
+		else
+		{
+			OutResult.ImpactPoint = StartLoc;
+			UE_LOG(LogPhysics, Verbose, TEXT("Warning: ConvertOverlappedShapeToImpactHit: MTD returned NaN :( position: %s"), *HitPosition.ToString());
+		}
+	}
+	else
+	{
+		OutResult.ImpactPoint = StartLoc;
+	}
+	OutResult.TraceStart = StartLoc;
+	OutResult.TraceEnd = EndLoc;
+
+	const FVector HitNormal = GetNormal(Hit);
+	const bool bFiniteNormal = !HitNormal.ContainsNaN();
+	const bool bValidNormal = (GetFlags(Hit) & EHitFlags::Normal) && bFiniteNormal;
+
+	// Use MTD result if possible. We interpret the MTD vector as both the direction to move and the opposing normal.
+	if (bValidNormal)
+	{
+		OutResult.ImpactNormal = HitNormal;
+		OutResult.PenetrationDepth = FMath::Abs(GetDistance(Hit));
+	}
+	else
+	{
+		// Fallback normal if we can't find it with MTD or otherwise.
+		OutResult.ImpactNormal = FVector::UpVector;
+		OutResult.PenetrationDepth = 0.f;
+		if (!bFiniteNormal)
+		{
+			UE_LOG(LogPhysics, Verbose, TEXT("Warning: ConvertOverlappedShapeToImpactHit: MTD returned NaN :( normal: %s"), *HitNormal.ToString());
+		}
+	}
+/*
+#if DRAW_OVERLAPPING_TRIS
+	if (CVarShowInitialOverlaps != 0 && World && World->IsGameWorld())
+	{
+		DrawOverlappingTris(World, Hit, Geom, QueryTM);
+	}
+#endif
+*/
+
+	if (bBlockingHit)
+	{
+		// Zero-distance hits are often valid hits and we can extract the hit normal.
+		// For invalid normals we can try other methods as well (get overlapping triangles).
+		if (GetDistance(Hit) == 0.f || !bValidNormal)	//todo(ocohen): isn't hit distance always zero in this function? should this be if(!bValidNormal) ?
+		{
+			ComputeZeroDistanceImpactNormalAndPenetration(World, Hit, Geom, QueryTM, OutResult);
+		}
+	}
+	else
+	{
+		// non blocking hit (overlap).
+		if (!bValidNormal)
+		{
+			OutResult.ImpactNormal = (StartLoc - EndLoc).GetSafeNormal();
+			ensure(OutResult.ImpactNormal.IsNormalized());
+		}
+	}
+
+	OutResult.Normal = OutResult.ImpactNormal;
+
+	const FPhysicsActor* GTHitActor = GetGTActor(&HitActor);
+
+	//Note that a non-gt query could still happen on gt if we're in a fixed tick
+	constexpr bool bIsGTQuery = std::is_same<THitLocation, FHitLocation>::value;
+	const FPhysicsShape* GTHitShape = GetGTShape<bIsGTQuery>(&HitShape, GTHitActor);
+	if (GTHitActor && GTHitShape)
+	{
+		SetHitResultFromShapeAndFaceIndex(*GTHitShape, *GTHitActor, GetInternalFaceIndex(Hit), OutResult.ImpactPoint, OutResult, bReturnPhysMat);
+	}
+
+	return bBlockingHit;
+}
+
+
+void ConvertQueryOverlap(const FPhysicsShape& Shape, const FPhysicsActor& Actor, FOverlapResult& OutOverlap, const FCollisionFilterData& QueryFilter)
+{
+	using namespace ChaosInterface;
+
+	// Grab actor/component
+
+	// Try body instance
+	if (const FBodyInstance* BodyInst = GetUserData(Actor))
+	{
+		BodyInst = FPhysicsInterface::ShapeToOriginalBodyInstance(BodyInst, &Shape);
+		if (const UPrimitiveComponent* OwnerComponent = BodyInst->OwnerComponent.Get())
+		{
+			if (ALightWeightInstanceManager* LWIManager = Cast<ALightWeightInstanceManager>(OwnerComponent->GetOwner()))
+			{
+				OutOverlap.OverlapObjectHandle = FActorInstanceHandle(LWIManager, BodyInst->InstanceBodyIndex);
+			}
+			else
+			{
+				OutOverlap.OverlapObjectHandle = FActorInstanceHandle(OwnerComponent->GetOwner());
+			}
+			OutOverlap.Component = BodyInst->OwnerComponent; // Copying weak pointer is faster than assigning raw pointer.
+			OutOverlap.ItemIndex = OwnerComponent->bMultiBodyOverlap ? BodyInst->InstanceBodyIndex : INDEX_NONE;
+		}
+	}
+	else
+	{
+		// Currently geom collections are registered with a primitive component user data, but maybe custom should be adapted
+		// to be more general so we can support leaf identification #BGTODO
+		void* UserData = Actor.UserData();
+		UPrimitiveComponent* PossibleOwner = FChaosUserData::Get<UPrimitiveComponent>(UserData);
+
+		if (PossibleOwner)
+		{
+			OutOverlap.Component = PossibleOwner;
+			OutOverlap.OverlapObjectHandle = FActorInstanceHandle(OutOverlap.Component->GetOwner());
+			OutOverlap.ItemIndex = INDEX_NONE;
+		}
+		else
+		{
+			ensureMsgf(false, TEXT("ConvertQueryOverlap called with bad payload type"));
+		}
+	}
+}
+
+/** Util to add NewOverlap to OutOverlaps if it is not already there */
+static void AddUniqueOverlap(TArray<FOverlapResult>& OutOverlaps, const FOverlapResult& NewOverlap)
+{
+	// Look to see if we already have this overlap (based on component)
+	for (int32 TestIdx = 0; TestIdx < OutOverlaps.Num(); TestIdx++)
+	{
+		FOverlapResult& Overlap = OutOverlaps[TestIdx];
+
+		if (Overlap.ItemIndex == NewOverlap.ItemIndex && Overlap.Component == NewOverlap.Component)
+		{
+			// These should be the same if the component matches!
+			checkSlow(Overlap.OverlapObjectHandle == NewOverlap.OverlapObjectHandle);
+
+			// If we had a non-blocking overlap with this component, but now we have a blocking one, use that one instead!
+			if (!Overlap.bBlockingHit && NewOverlap.bBlockingHit)
+			{
+				Overlap = NewOverlap;
+			}
+
+			return;
+		}
+	}
+
+	// Not found, so add it 
+	OutOverlaps.Add(NewOverlap);
+}
+
+bool IsBlocking(const FPhysicsShape& Shape, const FCollisionFilterData& QueryFilter)
+{
+	using namespace ChaosInterface;
+
+	// See if this is a 'blocking' hit
+	const FCollisionFilterData ShapeFilter = GetQueryFilterData(Shape);
+	const ECollisionQueryHitType HitType = FCollisionQueryFilterCallback::CalcQueryHitType(QueryFilter, ShapeFilter);
+	const bool bBlock = (HitType == ECollisionQueryHitType::Block);
+	return bBlock;
+}
+
+/** Min number of overlaps required to start using a TMap for deduplication */
+int32 GNumOverlapsRequiredForTMap = 3;
+
+static FAutoConsoleVariableRef GTestOverlapSpeed(
+	TEXT("Engine.MinNumOverlapsToUseTMap"),
+	GNumOverlapsRequiredForTMap,
+	TEXT("Min number of overlaps required before using a TMap for deduplication")
+);
+
+template <typename THitOverlap>
+bool ConvertOverlapResultsImp(int32 NumOverlaps, THitOverlap* OverlapResults, const FCollisionFilterData& QueryFilter, TArray<FOverlapResult>& OutOverlaps)
+{
+	SCOPE_CYCLE_COUNTER(STAT_CollisionConvertOverlap);
+
+	const int32 ExpectedSize = OutOverlaps.Num() + NumOverlaps;
+	OutOverlaps.Reserve(ExpectedSize);
+	bool bBlockingFound = false;
+	constexpr bool bIsGTQuery = std::is_same<THitOverlap, FHitOverlap>::value;
+
+	if (ExpectedSize >= GNumOverlapsRequiredForTMap)
+	{
+		// Map from an overlap to the position in the result array (the index has one added to it so 0 can be a sentinel)
+		TMap<FOverlapKey, int32, TInlineSetAllocator<64>> OverlapMap;
+		OverlapMap.Reserve(ExpectedSize);
+
+		// Fill in the map with existing hits
+		for (int32 ExistingIndex = 0; ExistingIndex < OutOverlaps.Num(); ++ExistingIndex)
+		{
+			const FOverlapResult& ExistingOverlap = OutOverlaps[ExistingIndex];
+			OverlapMap.Add(FOverlapKey(ExistingOverlap.Component.Get(), ExistingOverlap.ItemIndex), ExistingIndex + 1);
+		}
+
+		for (int32 PResultIndex = 0; PResultIndex < NumOverlaps; ++PResultIndex)
+		{
+			FOverlapResult NewOverlap;
+			const auto Actor = GetActor(OverlapResults[PResultIndex]);
+			const FPhysicsShape* Shape = GetShape(OverlapResults[PResultIndex]);
+
+			const bool bBlock = IsBlocking(*Shape, QueryFilter);
+			NewOverlap.bBlockingHit = bBlock;
+			bBlockingFound |= bBlock;
+
+			const FPhysicsActor* GTActor = GetGTActor(Actor);
+			const FPhysicsShape* GTShape = GetGTShape<bIsGTQuery>(Shape, GTActor);
+			if (GTActor && GTShape)
+			{
+				ConvertQueryOverlap(*GTShape, *GTActor, NewOverlap, QueryFilter);
+			}
+
+			// Look for it in the map, newly added elements will start with 0, so we know we need to add it to the results array then (the index is stored as +1)
+			//TODO: this doesn't de-duplicate if FOverlapResult has no component - like in PT for example. If we care about de-duplication we should use the PT handle if needed
+			//Question: why do we de-duplicate? This seems expensive and is not consistent with traces. The user could handle this at their level anyway (at the cost of a bit of transient memory here)
+			//TODO: make sure it doesn't de-duplicate null results
+			int32& DestinationIndex = OverlapMap.FindOrAdd(FOverlapKey(NewOverlap.Component.Get(), NewOverlap.ItemIndex));
+			if (DestinationIndex == 0)
+			{
+				DestinationIndex = OutOverlaps.Add(NewOverlap) + 1;
+			}
+			else
+			{
+				FOverlapResult& ExistingOverlap = OutOverlaps[DestinationIndex - 1];
+
+				// If we had a non-blocking overlap with this component, but now we have a blocking one, use that one instead!
+				if (!ExistingOverlap.bBlockingHit && NewOverlap.bBlockingHit)
+				{
+					ExistingOverlap = NewOverlap;
+				}
+			}
+		}
+	}
+	else
+	{
+		// N^2 approach, no maps
+		for (int32 i = 0; i < NumOverlaps; i++)
+		{
+			FOverlapResult NewOverlap;
+			const auto Actor = GetActor(OverlapResults[i]);
+			const FPhysicsShape* Shape = GetShape(OverlapResults[i]);
+
+			const bool bBlock = IsBlocking(*Shape, QueryFilter);
+			NewOverlap.bBlockingHit = bBlock;
+			bBlockingFound |= bBlock;
+
+			const FPhysicsActor* GTActor = GetGTActor(Actor);
+			const FPhysicsShape* GTShape = GetGTShape<bIsGTQuery>(Shape, GTActor);
+			if (GTActor && GTShape)
+			{
+				ConvertQueryOverlap(*GTShape, *GTActor, NewOverlap, QueryFilter);
+			}
+
+			AddUniqueOverlap(OutOverlaps, NewOverlap);
+		}
+	}
+
+	return bBlockingFound;
+}
+
+bool ConvertOverlapResults(int32 NumOverlaps, FHitOverlap* OverlapResults, const FCollisionFilterData& QueryFilter, TArray<FOverlapResult>& OutOverlaps)
+{
+	return ConvertOverlapResultsImp(NumOverlaps, OverlapResults, QueryFilter, OutOverlaps);
+}
+
+bool ConvertOverlapResults(int32 NumOverlaps, ChaosInterface::FPTOverlapHit* OverlapResults, const FCollisionFilterData& QueryFilter, TArray<FOverlapResult>& OutOverlaps)
+{
+	return ConvertOverlapResultsImp(NumOverlaps, OverlapResults, QueryFilter, OutOverlaps);
+}
+
+FHitResult ConvertOverlapToHitResult(const FOverlapResult& Overlap)
+{
+	FHitResult Hit;
+	Hit.bBlockingHit = Overlap.bBlockingHit;
+	Hit.Item = Overlap.ItemIndex;
+	Hit.Component = Overlap.Component;
+	Hit.HitObjectHandle = Overlap.OverlapObjectHandle;
+	return Hit;
+}
+#endif // IS_MONOLITHIC
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/FromUE/CollisionQueryFilterCallback.cpp b/Source/UnrealSoda/Private/FromUE/CollisionQueryFilterCallback.cpp
new file mode 100644
index 0000000..8568b46
--- /dev/null
+++ b/Source/UnrealSoda/Private/FromUE/CollisionQueryFilterCallback.cpp
@@ -0,0 +1,281 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#if(!IS_MONOLITHIC)
+
+#include "Runtime/Engine/Private/PhysicsEngine/CollisionQueryFilterCallback.h"
+#include "Runtime/Engine/Private/PhysicsEngine/ScopedSQHitchRepeater.h"
+#include "Physics/PhysicsInterfaceUtils.h"
+#include "Physics/PhysicsFiltering.h"
+#include "PhysicsEngine/BodyInstance.h"
+#include "Components/PrimitiveComponent.h"
+#include "Collision.h"
+
+#include "ChaosInterfaceWrapperCore.h"
+#include "Physics/Experimental/ChaosInterfaceWrapper.h"
+#include "Chaos/GeometryParticles.h"
+
+ECollisionQueryHitType FCollisionQueryFilterCallback::CalcQueryHitType(const FCollisionFilterData& QueryFilter, const FCollisionFilterData& ShapeFilter, bool bPreFilter)
+{
+	ECollisionQuery QueryType = (ECollisionQuery)QueryFilter.Word0;
+	FMaskFilter QuerierMaskFilter;
+	const ECollisionChannel QuerierChannel = GetCollisionChannelAndExtraFilter(QueryFilter.Word3, QuerierMaskFilter);
+
+	FMaskFilter ShapeMaskFilter;
+	const ECollisionChannel ShapeChannel = GetCollisionChannelAndExtraFilter(ShapeFilter.Word3, ShapeMaskFilter);
+
+	if ((QuerierMaskFilter & ShapeMaskFilter) != 0)	//If ignore mask hit something, ignore it
+	{
+		return ECollisionQueryHitType::None;
+	}
+
+	const uint32 ShapeBit = ECC_TO_BITFIELD(ShapeChannel);
+	if (QueryType == ECollisionQuery::ObjectQuery)
+	{
+		const int32 MultiTrace = (int32)QuerierChannel;
+		// do I belong to one of objects of interest?
+		if (ShapeBit & QueryFilter.Word1)
+		{
+			if (bPreFilter)	//In the case of an object query we actually want to return all object types (or first in single case). So in PreFilter we have to trick physx by not blocking in the multi case, and blocking in the single case.
+			{
+
+				return MultiTrace ? ECollisionQueryHitType::Touch: ECollisionQueryHitType::Block;
+			}
+			else
+			{
+				return ECollisionQueryHitType::Block;	//In the case where an object query is being resolved for the user we just return a block because object query doesn't have the concept of overlap at all and block seems more natural
+			}
+		}
+	}
+	else
+	{
+		// if query channel is Touch All, then just return touch
+		if (QuerierChannel == ECC_OverlapAll_Deprecated)
+		{
+			return ECollisionQueryHitType::Touch;
+		}
+		// @todo delete once we fix up object/trace APIs to work separate
+
+		uint32 const QuerierBit = ECC_TO_BITFIELD(QuerierChannel);
+		ECollisionQueryHitType QuerierHitType = ECollisionQueryHitType::None;
+		ECollisionQueryHitType ShapeHitType = ECollisionQueryHitType::None;
+
+		// check if Querier wants a hit
+		if ((QuerierBit & ShapeFilter.Word1) != 0)
+		{
+			QuerierHitType = ECollisionQueryHitType::Block;
+		}
+		else if ((QuerierBit & ShapeFilter.Word2) != 0)
+		{
+			QuerierHitType = ECollisionQueryHitType::Touch;
+		}
+
+		if ((ShapeBit & QueryFilter.Word1) != 0)
+		{
+			ShapeHitType = ECollisionQueryHitType::Block;
+		}
+		else if ((ShapeBit & QueryFilter.Word2) != 0)
+		{
+			ShapeHitType = ECollisionQueryHitType::Touch;
+		}
+
+		// return minimum agreed-upon interaction
+		return FMath::Min(QuerierHitType, ShapeHitType);
+	}
+
+	return ECollisionQueryHitType::None;
+}
+
+template <typename TParticle>
+ECollisionQueryHitType FCollisionQueryFilterCallback::PreFilterBaseImp(const FCollisionFilterData& FilterData, const Chaos::FPerShapeData& Shape, const TParticle& Actor)
+{
+	//SCOPE_CYCLE_COUNTER(STAT_Collision_PreFilter);
+
+	if (!Shape.GetQueryEnabled())
+	{
+		return ECollisionQueryHitType::None;
+	}
+
+	FCollisionFilterData ShapeFilter = ChaosInterface::GetQueryFilterData(Shape);
+
+	// We usually don't have ignore components so we try to avoid the virtual getSimulationFilterData() call below. 'word2' of shape sim filter data is componentID.
+	uint32 ComponentID = 0;
+	if (IgnoreComponents.Num() > 0)
+	{
+		ComponentID = ChaosInterface::GetSimulationFilterData(Shape).Word2;
+	}
+
+	FBodyInstance* BodyInstance = nullptr;
+
+	if constexpr (std::is_same<TParticle, Chaos::FGeometryParticle>::value)
+	{
+#if ENABLE_PREFILTER_LOGGING || DETECT_SQ_HITCHES
+		BodyInstance = ChaosInterface::GetUserData(Actor);
+#endif // ENABLE_PREFILTER_LOGGING || DETECT_SQ_HITCHES
+	}
+
+	return PreFilterImp(FilterData, ShapeFilter, ComponentID, BodyInstance);
+}
+
+ECollisionQueryHitType FCollisionQueryFilterCallback::PreFilterImp(const FCollisionFilterData& FilterData, const Chaos::FPerShapeData& Shape, const Chaos::FGeometryParticle& Actor)
+{
+	return PreFilterBaseImp(FilterData, Shape, Actor);
+}
+
+ECollisionQueryHitType FCollisionQueryFilterCallback::PreFilterImp(const FCollisionFilterData& FilterData, const Chaos::FPerShapeData& Shape, const Chaos::FGeometryParticleHandle& Actor)
+{
+	return PreFilterBaseImp(FilterData, Shape, Actor);
+}
+
+ECollisionQueryHitType FCollisionQueryFilterCallback::PreFilterImp(const FCollisionFilterData& FilterData, const FCollisionFilterData& ShapeFilter, uint32 ComponentID, const FBodyInstance* BodyInstance)
+{
+#if DETECT_SQ_HITCHES
+	FPreFilterRecord* PreFilterRecord = nullptr;
+	if (bRecordHitches && (IsInGameThread() || FSQHitchRepeaterCVars::SQHitchDetectionForceNames))
+	{
+		PreFilterHitchInfo.AddZeroed();
+		PreFilterRecord = &PreFilterHitchInfo[PreFilterHitchInfo.Num() - 1];
+		
+		if(BodyInstance)
+		{
+			if(UPrimitiveComponent* OwnerComp = BodyInstance->OwnerComponent.Get())
+			{
+				PreFilterRecord->OwnerComponentReadableName = OwnerComp->GetReadableName();
+			}
+		}
+	}
+#endif
+
+#if ENABLE_PREFILTER_LOGGING
+	static bool bLoggingEnabled = false;
+	if (bLoggingEnabled)
+	{
+		if(BodyInstance && BodyInstance->OwnerComponent.IsValid())
+		{
+			UE_LOG(LogCollision, Warning, TEXT("[PREFILTER] against %s[%s] : About to check "),
+				(BodyInstance->OwnerComponent.Get()->GetOwner()) ? *BodyInstance->OwnerComponent.Get()->GetOwner()->GetName() : TEXT("NO OWNER"),
+				*BodyInstance->OwnerComponent.Get()->GetName());
+		}
+
+		UE_LOG(LogCollision, Warning, TEXT("ShapeFilter : %x %x %x %x"), ShapeFilter.Word0, ShapeFilter.Word1, ShapeFilter.Word2, ShapeFilter.Word3);
+		UE_LOG(LogCollision, Warning, TEXT("FilterData : %x %x %x %x"), FilterData.Word0, FilterData.Word1, FilterData.Word2, FilterData.Word3);
+	}
+#endif // ENABLE_PREFILTER_LOGGING
+
+	// Shape : shape's Filter Data
+	// Querier : filterData that owns the trace
+	uint32 ShapeFlags = ShapeFilter.Word3 & 0xFFFFFF;
+	uint32 QuerierFlags = FilterData.Word3 & 0xFFFFFF;
+	uint32 CommonFlags = ShapeFlags & QuerierFlags;
+
+	// First check complexity, none of them matches
+	if (!(CommonFlags & EPDF_SimpleCollision) && !(CommonFlags & EPDF_ComplexCollision))
+	{
+		return (PreFilterReturnValue = ECollisionQueryHitType::None);
+	}
+
+	ECollisionQueryHitType Result = FCollisionQueryFilterCallback::CalcQueryHitType(FilterData, ShapeFilter, true);
+
+	if (Result == ECollisionQueryHitType::Touch && bIgnoreTouches)
+	{
+		Result = ECollisionQueryHitType::None;
+	}
+
+	if (Result == ECollisionQueryHitType::Block && bIgnoreBlocks)
+	{
+		Result = ECollisionQueryHitType::None;
+	}
+
+	// If not already rejected, check ignore actor and component list.
+	if (Result != ECollisionQueryHitType::None)
+	{
+		// See if we are ignoring the actor this shape belongs to (word0 of shape filterdata is actorID)
+		if (IgnoreActors.Contains(ShapeFilter.Word0))
+		{
+			//UE_LOG(LogTemp, Log, TEXT("Ignoring Actor: %d"), ShapeFilter.word0);
+			Result = ECollisionQueryHitType::None;
+		}
+
+		if (IgnoreComponents.Contains(ComponentID))
+		{
+			//UE_LOG(LogTemp, Log, TEXT("Ignoring Component: %d"), shape->getSimulationFilterData().word2);
+			Result = ECollisionQueryHitType::None;
+		}
+	}
+
+#if ENABLE_PREFILTER_LOGGING
+	if (bLoggingEnabled)
+	{
+		ECollisionChannel QuerierChannel = GetCollisionChannel(FilterData.word3);
+		UE_LOG(LogCollision, Log, TEXT("[PREFILTER] Result for Querier [CHANNEL: %d, FLAG: %x] %s [%d]"), (int32)QuerierChannel, QuerierFlags, *ComponentName, (int32)Result);
+	}
+#endif // ENABLE_PREFILTER_LOGGING
+
+	if (bIsOverlapQuery && Result == ECollisionQueryHitType::Block)
+	{
+		Result = ECollisionQueryHitType::Touch;	//In the case of overlaps, physx only understands touches. We do this at the end to ensure all filtering logic based on block vs overlap is correct
+	}
+
+#if DETECT_SQ_HITCHES
+	if (PreFilterRecord)
+	{
+		PreFilterRecord->Result = Result;
+	}
+#endif
+
+	return  (PreFilterReturnValue = Result);
+}
+
+
+ECollisionQueryHitType FCollisionQueryFilterCallback::PostFilterImp(const FCollisionFilterData& FilterData, bool bIsOverlap)
+{
+	if (!bIsSweep)
+	{
+		return ECollisionQueryHitType::Block;
+	}
+	else if (bIsOverlap && bDiscardInitialOverlaps)
+	{
+		return ECollisionQueryHitType::None;
+	}
+	else
+	{
+		if (bIsOverlap && PreFilterReturnValue == ECollisionQueryHitType::Block)
+		{
+			// We want to keep initial blocking overlaps and continue the sweep until a non-overlapping blocking hit.
+			// We will later report this hit as a blocking hit when we compute the hit type (using CalcQueryHitType).
+			return ECollisionQueryHitType::Touch;
+		}
+
+		return PreFilterReturnValue;
+	}
+}
+
+ECollisionQueryHitType FCollisionQueryFilterCallback::PostFilterImp(const FCollisionFilterData& FilterData, const ChaosInterface::FQueryHit& Hit)
+{
+	// Unused in non-sweeps
+	if (!bIsSweep)
+	{
+		return ECollisionQueryHitType::None;
+	}
+
+	const auto& SweepHit = static_cast<const ChaosInterface::FLocationHit&>(Hit);
+	const bool bIsOverlap = ChaosInterface::HadInitialOverlap(SweepHit);
+
+	return PostFilterImp(FilterData, bIsOverlap);
+}
+
+ECollisionQueryHitType FCollisionQueryFilterCallback::PostFilterImp(const FCollisionFilterData& FilterData, const ChaosInterface::FPTQueryHit& Hit)
+{
+	// Unused in non-sweeps
+	if (!bIsSweep)
+	{
+		return ECollisionQueryHitType::None;
+	}
+
+	const auto& SweepHit = static_cast<const ChaosInterface::FPTLocationHit&>(Hit);
+	const bool bIsOverlap = ChaosInterface::HadInitialOverlap(SweepHit);
+
+	return PostFilterImp(FilterData, bIsOverlap);
+}
+
+#endif // IS_MONOLITHIC
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/FromUE/PhysicsInterfaceUtils.cpp b/Source/UnrealSoda/Private/FromUE/PhysicsInterfaceUtils.cpp
new file mode 100644
index 0000000..8fd28da
--- /dev/null
+++ b/Source/UnrealSoda/Private/FromUE/PhysicsInterfaceUtils.cpp
@@ -0,0 +1,111 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#if(!IS_MONOLITHIC)
+
+#include "Physics/PhysicsInterfaceUtils.h"
+#include "PhysXPublic.h"
+#include "WorldCollision.h"
+#include "Physics/PhysicsFiltering.h"
+#include "Physics/PhysicsInterfaceTypes.h"
+
+FCollisionFilterData CreateObjectQueryFilterData(const bool bTraceComplex, const int32 MultiTrace/*=1 if multi. 0 otherwise*/, const struct FCollisionObjectQueryParams& ObjectParam)
+{
+	/**
+	* Format for QueryData :
+	*		word0 (meta data - ECollisionQuery. Extendable)
+	*
+	*		For object queries
+	*
+	*		word1 (object type queries)
+	*		word2 (unused)
+	*		word3 (Multi (1) or single (0) (top 8) + Flags (lower 24))
+	*/
+
+	FCollisionFilterData NewData;
+
+	NewData.Word0 = (uint32)ECollisionQuery::ObjectQuery;
+
+	if (bTraceComplex)
+	{
+		NewData.Word3 |= EPDF_ComplexCollision;
+	}
+	else
+	{
+		NewData.Word3 |= EPDF_SimpleCollision;
+	}
+
+	// get object param bits
+	NewData.Word1 = ObjectParam.GetQueryBitfield();
+
+	// if 'nothing', then set no bits
+	NewData.Word3 |= CreateChannelAndFilter((ECollisionChannel)MultiTrace, ObjectParam.IgnoreMask);
+
+	return NewData;
+}
+
+FCollisionFilterData CreateTraceQueryFilterData(const uint8 MyChannel, const bool bTraceComplex, const FCollisionResponseContainer& InCollisionResponseContainer, const FCollisionQueryParams& Params)
+{
+	/**
+	* Format for QueryData :
+	*		word0 (meta data - ECollisionQuery. Extendable)
+	*
+	*		For trace queries
+	*
+	*		word1 (blocking channels)
+	*		word2 (touching channels)
+	*		word3 (MyChannel (top 8) as ECollisionChannel + Flags (lower 24))
+	*/
+
+	FCollisionFilterData NewData;
+
+	NewData.Word0 = (uint32)ECollisionQuery::TraceQuery;
+
+	if (bTraceComplex)
+	{
+		NewData.Word3 |= EPDF_ComplexCollision;
+	}
+	else
+	{
+		NewData.Word3 |= EPDF_SimpleCollision;
+	}
+
+	// word1 encodes 'what i block', word2 encodes 'what i touch'
+	for (int32 i = 0; i < UE_ARRAY_COUNT(InCollisionResponseContainer.EnumArray); i++)
+	{
+		if (InCollisionResponseContainer.EnumArray[i] == ECR_Block)
+		{
+			// if i block, set that in word1
+			NewData.Word1 |= CRC_TO_BITFIELD(i);
+		}
+		else if (InCollisionResponseContainer.EnumArray[i] == ECR_Overlap)
+		{
+			// if i touch, set that in word2
+			NewData.Word2 |= CRC_TO_BITFIELD(i);
+		}
+	}
+
+	// if 'nothing', then set no bits
+	NewData.Word3 |= CreateChannelAndFilter((ECollisionChannel)MyChannel, Params.IgnoreMask);
+
+	return NewData;
+}
+
+#define TRACE_MULTI		1
+#define TRACE_SINGLE	0
+
+/** Utility for creating a PhysX PxFilterData for performing a query (trace) against the scene */
+FCollisionFilterData CreateQueryFilterData(const uint8 MyChannel, const bool bTraceComplex, const FCollisionResponseContainer& InCollisionResponseContainer, const struct FCollisionQueryParams& QueryParam, const struct FCollisionObjectQueryParams& ObjectParam, const bool bMultitrace)
+{
+	//#TODO implement chaos
+	if (ObjectParam.IsValid())
+	{
+		return CreateObjectQueryFilterData(bTraceComplex, (bMultitrace ? TRACE_MULTI : TRACE_SINGLE), ObjectParam);
+	}
+	else
+	{
+		return CreateTraceQueryFilterData(MyChannel, bTraceComplex, InCollisionResponseContainer, QueryParam);
+	}
+}
+
+#endif // IS_MONOLITHIC
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/FromUE/SceneQueryLowLevel.cpp b/Source/UnrealSoda/Private/FromUE/SceneQueryLowLevel.cpp
new file mode 100644
index 0000000..9a6bd31
--- /dev/null
+++ b/Source/UnrealSoda/Private/FromUE/SceneQueryLowLevel.cpp
@@ -0,0 +1,362 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#if(!IS_MONOLITHIC)
+
+#include "Physics/Experimental/ChaosInterfaceWrapper.h"
+#include "SQAccelerator.h"
+#include "SQVisitor.h"
+
+#include "PhysTestSerializer.h"
+
+#include "PBDRigidsSolver.h"
+#include "Physics/Experimental/PhysScene_Chaos.h"
+#include "PhysicsEngine/ExternalSpatialAccelerationPayload.h"
+
+int32 ForceStandardSQ = 0;
+FAutoConsoleVariableRef CVarForceStandardSQ(TEXT("p.ForceStandardSQ"), ForceStandardSQ, TEXT("If enabled, we force the standard scene query even if custom SQ structure is enabled"));
+
+
+#if !UE_BUILD_SHIPPING
+int32 SerializeSQs = 0;
+int32 SerializeSQSamples = 100;
+int32 SerializeBadSQs = 0;
+int32 ReplaySQs = 0;
+int32 EnableRaycastSQCapture = 1;
+int32 EnableOverlapSQCapture = 1;
+int32 EnableSweepSQCapture = 1;
+
+FAutoConsoleVariableRef CVarSerializeSQs(TEXT("p.SerializeSQs"), SerializeSQs, TEXT("If enabled, we create a sq capture per sq that takes more than provided value in microseconds. This can be very expensive as the entire scene is saved out"));
+FAutoConsoleVariableRef CVarSerializeSQSamples(TEXT("p.SerializeSQSampleCount"), SerializeSQSamples, TEXT("If Query exceeds duration threshold, we will re-measure SQ this many times before serializing. Larger values cause hitching."));
+FAutoConsoleVariableRef CVarReplaySweeps(TEXT("p.ReplaySQs"), ReplaySQs, TEXT("If enabled, we rerun the sq against chaos"));
+FAutoConsoleVariableRef CVarSerializeBadSweeps(TEXT("p.SerializeBadSQs"), SerializeBadSQs, TEXT("If enabled, we create a sq capture whenever chaos and physx diverge"));
+FAutoConsoleVariableRef CVarSerializeSQsRaycastEnabled(TEXT("p.SerializeSQsRaycastEnabled"), EnableRaycastSQCapture, TEXT("If disabled, p.SerializeSQs will not consider raycasts"));
+FAutoConsoleVariableRef CVarSerializeSQsOverlapEnabled(TEXT("p.SerializeSQsOverlapEnabled"), EnableOverlapSQCapture, TEXT("If disabled, p.SerializeSQs will not consider overlaps"));
+FAutoConsoleVariableRef CVarSerializeSQsSweepEnabled(TEXT("p.SerializeSQsSweepEnabled"), EnableSweepSQCapture, TEXT("If disabled, p.SerializeSQs will not consider sweeps"));
+#else
+constexpr int32 SerializeSQs = 0;
+constexpr int32 ReplaySQs = 0;
+constexpr int32 SerializeSQSamples = 0;
+constexpr int32 EnableRaycastSQCapture = 0;
+constexpr int32 EnableOverlapSQCapture = 0;
+constexpr int32 EnableSweepSQCapture = 0;
+#endif
+
+namespace
+{
+	void FinalizeCapture(FPhysTestSerializer& Serializer)
+	{
+#if !UE_BUILD_SHIPPING
+		if (SerializeSQs)
+		{
+			Serializer.Serialize(TEXT("SQCapture"));
+		}
+#if 0
+		if (ReplaySQs)
+		{
+			const bool bReplaySuccess = SQComparisonHelper(Serializer);
+			if (!bReplaySuccess)
+			{
+				UE_LOG(LogPhysicsCore, Warning, TEXT("Chaos SQ does not match physx"));
+				if (SerializeBadSQs && !SerializeSQs)
+				{
+					Serializer.Serialize(TEXT("BadSQCapture"));
+				}
+			}
+		}
+#endif
+#endif
+	}
+
+	/**
+	 * This is meant as a replacement for FChaosSQAccelerator. There doesn't seem to be a need to expose this publicly since it'll just be used internally to allow
+	 * us to use more than one type of acceleration structure payload.
+	 */
+	template<typename TPayload>
+	class FGenericChaosSQAccelerator
+	{
+	public:
+		explicit FGenericChaosSQAccelerator(const Chaos::ISpatialAcceleration<TPayload, Chaos::FReal, 3>& InSpatialAcceleration)
+			: SpatialAcceleration(InSpatialAcceleration)
+		{}
+
+		template<typename THit>
+		void Raycast(const FVector& Start, const FVector& Dir, const float DeltaMagnitude, ChaosInterface::FSQHitBuffer<THit>& HitBuffer, EHitFlags OutputFlags, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase& QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams = {}) const
+		{
+			using namespace Chaos;
+			using namespace ChaosInterface;
+
+			TSQVisitor<TSphere<FReal, 3>, TPayload, THit, std::is_same_v<THit, FRaycastHit>> RaycastVisitor(Start, Dir, HitBuffer, OutputFlags, QueryFilterData, QueryCallback, DebugParams);
+			HitBuffer.IncFlushCount();
+			SpatialAcceleration.Raycast(Start, Dir, DeltaMagnitude, RaycastVisitor);
+			HitBuffer.DecFlushCount();
+		}
+
+		template<typename THit>
+		void Sweep(const Chaos::FImplicitObject& QueryGeom, const FTransform& StartTM, const FVector& Dir, const float DeltaMagnitude, ChaosInterface::FSQHitBuffer<THit>& HitBuffer, EHitFlags OutputFlags, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase& QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams = {}) const
+		{
+			return Chaos::Utilities::CastHelper(QueryGeom, StartTM, [&](const auto& Downcast, const FTransform& StartFullTM)
+				{
+					return SweepHelper(Downcast, SpatialAcceleration, StartFullTM, Dir, DeltaMagnitude, HitBuffer, OutputFlags, QueryFilterData, QueryCallback, DebugParams);
+				});
+		}
+
+		template<typename THit>
+		void Overlap(const Chaos::FImplicitObject& QueryGeom, const FTransform& GeomPose, ChaosInterface::FSQHitBuffer<THit>& HitBuffer, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase& QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams = {}) const
+		{
+			return Chaos::Utilities::CastHelper(QueryGeom, GeomPose, [&](const auto& Downcast, const FTransform& GeomFullPose)
+				{
+					return OverlapHelper(Downcast, SpatialAcceleration, GeomFullPose, HitBuffer, QueryFilterData, QueryCallback, DebugParams);
+				});
+		}
+
+	private:
+		const Chaos::ISpatialAcceleration<TPayload, Chaos::FReal, 3>& SpatialAcceleration;
+	};
+
+	template<typename TPayload>
+	void SweepSQCaptureHelper(float QueryDurationSeconds, const FGenericChaosSQAccelerator<TPayload>& SQAccelerator, const FPhysScene& Scene, const FPhysicsGeometry& QueryGeom, const FTransform& StartTM, const FVector& Dir, float DeltaMag, const FPhysicsHitCallback<FHitSweep>& HitBuffer, EHitFlags OutputFlags, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+	{
+#if !UE_BUILD_SHIPPING
+		float QueryDurationMicro = QueryDurationSeconds * 1000.0 * 1000.0;
+		if (((SerializeSQs && QueryDurationMicro > SerializeSQs)) && IsInGameThread())
+		{
+			// Measure average time of query over multiple samples to reduce fluke from context switches or that kind of thing.
+			uint32 Cycles = 0.0;
+			const uint32 SampleCount = SerializeSQSamples;
+			for (uint32 Samples = 0; Samples < SampleCount; ++Samples)
+			{
+				// Reset output to not skew times with large buffer
+				FPhysicsHitCallback<FHitSweep> ScratchHitBuffer = FPhysicsHitCallback<FHitSweep>(HitBuffer.WantsSingleResult());
+
+				uint32 StartTime = FPlatformTime::Cycles();
+				SQAccelerator.Sweep(QueryGeom, StartTM, Dir, DeltaMag, ScratchHitBuffer, OutputFlags, QueryFilterData, *QueryCallback, DebugParams);
+				Cycles += FPlatformTime::Cycles() - StartTime;
+			}
+
+			float Milliseconds = FPlatformTime::ToMilliseconds(Cycles);
+			float AvgMicroseconds = (Milliseconds * 1000) / SampleCount;
+
+			if (AvgMicroseconds > SerializeSQs)
+			{
+				FPhysTestSerializer Serializer;
+				Serializer.SetPhysicsData(*Scene.GetSolver()->GetEvolution());
+				FSQCapture& SweepCapture = Serializer.CaptureSQ();
+				SweepCapture.StartCaptureChaosSweep(*Scene.GetSolver()->GetEvolution(), QueryGeom, StartTM, Dir, DeltaMag, OutputFlags, QueryFilterData, Filter, *QueryCallback);
+				SweepCapture.EndCaptureChaosSweep(HitBuffer);
+
+				FinalizeCapture(Serializer);
+			}
+		}
+#endif
+	}
+
+	template<typename TPayload>
+	void RaycastSQCaptureHelper(float QueryDurationSeconds, const FGenericChaosSQAccelerator<TPayload>& SQAccelerator, const FPhysScene& Scene, const FVector& Start, const FVector& Dir, float DeltaMag, const FPhysicsHitCallback<FHitRaycast>& HitBuffer, EHitFlags OutputFlags, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+	{
+#if !UE_BUILD_SHIPPING
+		float QueryDurationMicro = QueryDurationSeconds * 1000.0 * 1000.0;
+		if (((!!SerializeSQs && QueryDurationMicro > SerializeSQs)) && IsInGameThread())
+		{
+			// Measure average time of query over multiple samples to reduce fluke from context switches or that kind of thing.
+			uint32 Cycles = 0.0;
+			const uint32 SampleCount = SerializeSQSamples;
+			for (uint32 Samples = 0; Samples < SampleCount; ++Samples)
+			{
+				// Reset output to not skew times with large buffer
+				FPhysicsHitCallback<FHitRaycast> ScratchHitBuffer = FPhysicsHitCallback<FHitRaycast>(HitBuffer.WantsSingleResult());
+
+				uint32 StartTime = FPlatformTime::Cycles();
+				SQAccelerator.Raycast(Start, Dir, DeltaMag, ScratchHitBuffer, OutputFlags, QueryFilterData, *QueryCallback, DebugParams);
+				Cycles += FPlatformTime::Cycles() - StartTime;
+			}
+
+			float Milliseconds = FPlatformTime::ToMilliseconds(Cycles);
+			float AvgMicroseconds = (Milliseconds * 1000) / SampleCount;
+
+			if (AvgMicroseconds > SerializeSQs)
+			{
+				FPhysTestSerializer Serializer;
+				Serializer.SetPhysicsData(*Scene.GetSolver()->GetEvolution());
+				FSQCapture& RaycastCapture = Serializer.CaptureSQ();
+				RaycastCapture.StartCaptureChaosRaycast(*Scene.GetSolver()->GetEvolution(), Start, Dir, DeltaMag, OutputFlags, QueryFilterData, Filter, *QueryCallback);
+				RaycastCapture.EndCaptureChaosRaycast(HitBuffer);
+
+				FinalizeCapture(Serializer);
+			}
+		}
+#endif
+	}
+
+	template<typename TPayload>
+	void OverlapSQCaptureHelper(float QueryDurationSeconds, const FGenericChaosSQAccelerator<TPayload>& SQAccelerator, const FPhysScene& Scene, const FPhysicsGeometry& QueryGeom, const FTransform& GeomPose, const FPhysicsHitCallback<FHitOverlap>& HitBuffer, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+	{
+#if !UE_BUILD_SHIPPING
+		float QueryDurationMicro = QueryDurationSeconds * 1000.0 * 1000.0;
+		if (((!!SerializeSQs && QueryDurationMicro > SerializeSQs)) && IsInGameThread())
+		{
+			// Measure average time of query over multiple samples to reduce fluke from context switches or that kind of thing.
+			uint32 Cycles = 0.0;
+			const uint32 SampleCount = SerializeSQSamples;
+			for (uint32 Samples = 0; Samples < SampleCount; ++Samples)
+			{
+				// Reset output to not skew times with large buffer
+				FPhysicsHitCallback<FHitOverlap> ScratchHitBuffer = FPhysicsHitCallback<FHitOverlap>(HitBuffer.WantsSingleResult());
+
+				uint32 StartTime = FPlatformTime::Cycles();
+				SQAccelerator.Overlap(QueryGeom, GeomPose, ScratchHitBuffer, QueryFilterData, *QueryCallback);
+				Cycles += FPlatformTime::Cycles() - StartTime;
+			}
+
+			float Milliseconds = FPlatformTime::ToMilliseconds(Cycles);
+			float AvgMicroseconds = (Milliseconds * 1000) / SampleCount;
+
+			if (AvgMicroseconds > SerializeSQs)
+			{
+				FPhysTestSerializer Serializer;
+				Serializer.SetPhysicsData(*Scene.GetSolver()->GetEvolution());
+				FSQCapture& OverlapCapture = Serializer.CaptureSQ();
+				OverlapCapture.StartCaptureChaosOverlap(*Scene.GetSolver()->GetEvolution(), QueryGeom, GeomPose, QueryFilterData, Filter, *QueryCallback);
+				OverlapCapture.EndCaptureChaosOverlap(HitBuffer);
+
+				FinalizeCapture(Serializer);
+			}
+		}
+#endif
+	}
+
+	template<typename TAccelContainer, bool bGTData>
+	struct FAccelerationContainerTraits
+	{
+		using TAccelStructure = std::conditional_t<std::is_same_v<TAccelContainer, FPhysScene>, Chaos::IDefaultChaosSpatialAcceleration, TAccelContainer>;
+
+		static const TAccelStructure* GetSpatialAccelerationFromContainer(const TAccelContainer& Container)
+		{
+			if constexpr (IsPhysScene())
+			{
+				if constexpr (bGTData)
+				{
+					return Container.GetSpacialAcceleration();
+				}
+				else
+				{
+					return Container.GetSolver()->GetInternalAccelerationStructure_Internal();
+				}
+			}
+			else
+			{
+				return &Container;
+			}
+
+			return nullptr;
+		}
+
+		static constexpr bool IsPhysScene()
+		{
+			return std::is_same_v<TAccelContainer, FPhysScene>;
+		}
+	};
+				}
+
+#define DEFINE_LOW_LEVEL_RAYCAST_ACCEL_HIT(TACCEL, THIT) template void LowLevelRaycast<TACCEL, THIT>(const TACCEL& Container, const FVector& Start, const FVector& Dir, float DeltaMag, FPhysicsHitCallback<THIT>& HitBuffer, EHitFlags OutputFlags, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams);
+#define DEFINE_LOW_LEVEL_RAYCAST_ACCEL(TACCEL) \
+DEFINE_LOW_LEVEL_RAYCAST_ACCEL_HIT(TACCEL, FHitRaycast); \
+DEFINE_LOW_LEVEL_RAYCAST_ACCEL_HIT(TACCEL, ChaosInterface::FPTRaycastHit);
+
+template <typename TAccelContainer, typename THitRaycast>
+void LowLevelRaycast(const TAccelContainer& Container, const FVector& Start, const FVector& Dir, float DeltaMag, FPhysicsHitCallback<THitRaycast>& HitBuffer, EHitFlags OutputFlags, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+{
+	constexpr bool bGTData = std::is_same_v<THitRaycast, FHitRaycast>;
+	using TTraits = FAccelerationContainerTraits<TAccelContainer, bGTData>;
+	if (const typename TTraits::TAccelStructure* SolverAccelerationStructure = TTraits::GetSpatialAccelerationFromContainer(Container))
+	{
+		FGenericChaosSQAccelerator<typename TTraits::TAccelStructure::TPayload> SQAccelerator(*SolverAccelerationStructure);
+		double Time = 0.0;
+		{
+			FScopedDurationTimer Timer(Time);
+			SQAccelerator.Raycast(Start, Dir, DeltaMag, HitBuffer, OutputFlags, QueryFilterData, *QueryCallback, DebugParams);
+		}
+
+		if constexpr (bGTData && TTraits::IsPhysScene())
+		{
+			if (!!SerializeSQs && !!EnableRaycastSQCapture)
+			{
+				RaycastSQCaptureHelper(Time, SQAccelerator, Container, Start, Dir, DeltaMag, HitBuffer, OutputFlags, QueryFlags, Filter, QueryFilterData, QueryCallback, DebugParams);
+			}
+		}
+	}
+}
+
+DEFINE_LOW_LEVEL_RAYCAST_ACCEL(Chaos::IDefaultChaosSpatialAcceleration)
+DEFINE_LOW_LEVEL_RAYCAST_ACCEL(IExternalSpatialAcceleration)
+DEFINE_LOW_LEVEL_RAYCAST_ACCEL(FPhysScene)
+
+#define DEFINE_LOW_LEVEL_SWEEP_ACCEL_HIT(TACCEL, THIT) template void LowLevelSweep<TACCEL, THIT>(const TACCEL& Container, const FPhysicsGeometry& QueryGeom, const FTransform& StartTM, const FVector& Dir, float DeltaMag, FPhysicsHitCallback<THIT>& HitBuffer, EHitFlags OutputFlags, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+#define DEFINE_LOW_LEVEL_SWEEP_ACCEL(TACCEL) \
+DEFINE_LOW_LEVEL_SWEEP_ACCEL_HIT(TACCEL, FHitSweep); \
+DEFINE_LOW_LEVEL_SWEEP_ACCEL_HIT(TACCEL, ChaosInterface::FPTSweepHit);
+
+template <typename TAccelContainer, typename THitSweep>
+void LowLevelSweep(const TAccelContainer& Container, const FPhysicsGeometry& QueryGeom, const FTransform& StartTM, const FVector& Dir, float DeltaMag, FPhysicsHitCallback<THitSweep>& HitBuffer, EHitFlags OutputFlags, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+{
+	constexpr bool bGTData = std::is_same<THitSweep, FHitSweep>::value;
+	using TTraits = FAccelerationContainerTraits<TAccelContainer, bGTData>;
+	if (const typename TTraits::TAccelStructure* SolverAccelerationStructure = TTraits::GetSpatialAccelerationFromContainer(Container))
+	{
+		FGenericChaosSQAccelerator<typename TTraits::TAccelStructure::TPayload> SQAccelerator(*SolverAccelerationStructure);
+		{
+			double Time = 0.0;
+			{
+				FScopedDurationTimer Timer(Time);
+				SQAccelerator.Sweep(QueryGeom, StartTM, Dir, DeltaMag, HitBuffer, OutputFlags, QueryFilterData, *QueryCallback, DebugParams);
+			}
+
+			if constexpr (bGTData && FAccelerationContainerTraits<TAccelContainer, bGTData>::IsPhysScene())
+			{
+				if (!!SerializeSQs && !!EnableSweepSQCapture)
+				{
+					SweepSQCaptureHelper(Time, SQAccelerator, Container, QueryGeom, StartTM, Dir, DeltaMag, HitBuffer, OutputFlags, QueryFlags, Filter, QueryFilterData, QueryCallback, DebugParams);
+				}
+			}
+		}
+	}
+}
+
+DEFINE_LOW_LEVEL_SWEEP_ACCEL(Chaos::IDefaultChaosSpatialAcceleration)
+DEFINE_LOW_LEVEL_SWEEP_ACCEL(IExternalSpatialAcceleration)
+DEFINE_LOW_LEVEL_SWEEP_ACCEL(FPhysScene)
+
+#define DEFINE_LOW_LEVEL_OVERLAP_ACCEL_HIT(TACCEL, THIT) template void LowLevelOverlap<TACCEL, THIT>(const TACCEL& Container, const FPhysicsGeometry& QueryGeom, const FTransform& GeomPose, FPhysicsHitCallback<THIT>& HitBuffer, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+#define DEFINE_LOW_LEVEL_OVERLAP_ACCEL(TACCEL) \
+DEFINE_LOW_LEVEL_OVERLAP_ACCEL_HIT(TACCEL, FHitOverlap); \
+DEFINE_LOW_LEVEL_OVERLAP_ACCEL_HIT(TACCEL, ChaosInterface::FPTOverlapHit);
+
+template <typename TAccelContainer, typename THitOverlap>
+void LowLevelOverlap(const TAccelContainer& Container, const FPhysicsGeometry& QueryGeom, const FTransform& GeomPose, FPhysicsHitCallback<THitOverlap>& HitBuffer, FQueryFlags QueryFlags, const FCollisionFilterData& Filter, const ChaosInterface::FQueryFilterData& QueryFilterData, ICollisionQueryFilterCallbackBase* QueryCallback, const ChaosInterface::FQueryDebugParams& DebugParams)
+{
+	constexpr bool bGTData = std::is_same<THitOverlap, FHitOverlap>::value;
+	using TTraits = FAccelerationContainerTraits<TAccelContainer, bGTData>;
+	if (const typename TTraits::TAccelStructure* SolverAccelerationStructure = TTraits::GetSpatialAccelerationFromContainer(Container))
+	{
+		FGenericChaosSQAccelerator<typename TTraits::TAccelStructure::TPayload> SQAccelerator(*SolverAccelerationStructure);
+		double Time = 0.0;
+		{
+			FScopedDurationTimer Timer(Time);
+			SQAccelerator.Overlap(QueryGeom, GeomPose, HitBuffer, QueryFilterData, *QueryCallback, DebugParams);
+		}
+
+		if constexpr (bGTData && FAccelerationContainerTraits<TAccelContainer, bGTData>::IsPhysScene())
+		{
+			if (!!SerializeSQs && !!EnableOverlapSQCapture)
+			{
+				OverlapSQCaptureHelper(Time, SQAccelerator, Container, QueryGeom, GeomPose, HitBuffer, QueryFlags, Filter, QueryFilterData, QueryCallback, DebugParams);
+			}
+		}
+	}
+}
+
+DEFINE_LOW_LEVEL_OVERLAP_ACCEL(Chaos::IDefaultChaosSpatialAcceleration)
+DEFINE_LOW_LEVEL_OVERLAP_ACCEL(IExternalSpatialAcceleration)
+DEFINE_LOW_LEVEL_OVERLAP_ACCEL(FPhysScene)
+
+#endif // IS_MONOLITHIC
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/FromUE/ScopedSQHitchRepeater.cpp b/Source/UnrealSoda/Private/FromUE/ScopedSQHitchRepeater.cpp
new file mode 100644
index 0000000..91d67d9
--- /dev/null
+++ b/Source/UnrealSoda/Private/FromUE/ScopedSQHitchRepeater.cpp
@@ -0,0 +1,25 @@
+// Copyright Epic Games, Inc. All Rights Reserved.
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#if(!IS_MONOLITHIC)
+
+#include "Runtime/Engine/Private/PhysicsEngine/ScopedSQHitchRepeater.h"
+
+#if DETECT_SQ_HITCHES
+int FSQHitchRepeaterCVars::SQHitchDetection = 0;
+FAutoConsoleVariableRef FSQHitchRepeaterCVars::CVarSQHitchDetection(TEXT("p.SQHitchDetection"), FSQHitchRepeaterCVars::SQHitchDetection,
+	TEXT("Whether to detect scene query hitches. 0 is off. 1 repeats a slow scene query once and prints extra information. 2+ repeat slow query n times without recording (useful when profiling)")
+);
+
+int FSQHitchRepeaterCVars::SQHitchDetectionForceNames = 0;
+FAutoConsoleVariableRef FSQHitchRepeaterCVars::CVarSQHitchDetectionForceNames(TEXT("p.SQHitchDetectionForceNames"), FSQHitchRepeaterCVars::SQHitchDetectionForceNames,
+	TEXT("Whether name resolution is forced off the game thread. This is not 100% safe, but can be useful when looking at hitches off GT")
+);
+
+float FSQHitchRepeaterCVars::SQHitchDetectionThreshold = 0.05f;
+FAutoConsoleVariableRef FSQHitchRepeaterCVars::CVarSQHitchDetectionThreshold(TEXT("p.SQHitchDetectionThreshold"), FSQHitchRepeaterCVars::SQHitchDetectionThreshold,
+	TEXT("Determines the threshold in milliseconds for a scene query hitch.")
+);
+#endif
+
+#endif // IS_MONOLITHIC
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ISodaActor.cpp b/Source/UnrealSoda/Private/ISodaActor.cpp
new file mode 100644
index 0000000..6dda986
--- /dev/null
+++ b/Source/UnrealSoda/Private/ISodaActor.cpp
@@ -0,0 +1,95 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ISodaActor.h"
+#include "Soda/UnrealSoda.h"
+#include "GameFramework/Actor.h"
+#include "Soda/LevelState.h"
+
+void ISodaActor::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	IEditableObject::RuntimePostEditChangeProperty(PropertyChangedEvent);
+
+	FProperty* Property = PropertyChangedEvent.Property;
+	const FName PropertyName = Property ? Property->GetFName() : NAME_None;
+	//const FName MemberPropertyName = (PropertyChangedEvent.MemberProperty != nullptr) ? PropertyChangedEvent.MemberProperty->GetFName() : NAME_None;
+
+	static FName RelativeLocationName("RelativeLocation");
+	static FName RelativeRotationName("RelativeRotation");
+	static FName RelativeScale3DName("RelativeScale3D");
+
+	if (PropertyName == RelativeLocationName || PropertyName == RelativeRotationName || PropertyName == RelativeScale3DName)
+	{
+		if (ALevelState* LevelState = ALevelState::Get())
+		{
+			LevelState->MarkAsDirty();
+		}
+	}
+
+	if (PropertyChangedEvent.Property->HasAllPropertyFlags(CPF_SaveGame))
+	{
+		MarkAsDirty();
+	}
+}
+
+void ISodaActor::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	IEditableObject::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	FProperty* Property = PropertyChangedEvent.Property;
+	const FName PropertyName = Property ? Property->GetFName() : NAME_None;
+	//const FName MemberPropertyName = (PropertyChangedEvent.MemberProperty != nullptr) ? PropertyChangedEvent.MemberProperty->GetFName() : NAME_None;
+
+	static FName RelativeLocationName("RelativeLocation");
+	static FName RelativeRotationName("RelativeRotation");
+	static FName RelativeScale3DName("RelativeScale3D");
+
+	if (PropertyName == RelativeLocationName || PropertyName == RelativeRotationName || PropertyName == RelativeScale3DName)
+	{
+		if (ALevelState* LevelState = ALevelState::Get())
+		{
+			LevelState->MarkAsDirty();
+		}
+	}
+
+	if (PropertyChangedEvent.Property->HasAllPropertyFlags(CPF_SaveGame))
+	{
+		MarkAsDirty();
+	}
+}
+
+void ISodaActor::ScenarioBegin()
+{
+	//ReceiveScenarioBegin();
+	ISodaActor::Execute_ReceiveScenarioBegin(AsActor());
+}
+
+void ISodaActor::ScenarioEnd()
+{
+	//ReceiveScenarioEnd();
+	ISodaActor::Execute_ReceiveScenarioEnd(AsActor());
+}
+
+AActor* ISodaActor::AsActor() 
+{ 
+	return CastChecked<AActor>(this); 
+}
+
+const AActor* ISodaActor::AsActor() const
+{ 
+	return CastChecked<AActor>(this); 
+}
+
+void ISodaActor::MarkAsDirty() 
+{
+	if (!IsPinnedActor())
+	{
+		if (ALevelState* LevelState = ALevelState::Get())
+		{
+			LevelState->MarkAsDirty();
+		}
+	}
+	else
+	{
+		bIsDirty = true;
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ISodaVehicleComponent.cpp b/Source/UnrealSoda/Private/ISodaVehicleComponent.cpp
new file mode 100644
index 0000000..ef7c4a6
--- /dev/null
+++ b/Source/UnrealSoda/Private/ISodaVehicleComponent.cpp
@@ -0,0 +1,383 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ISodaVehicleComponent.h"
+#include "Engine/Canvas.h"
+#include "Soda/SodaApp.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/UnrealSoda.h"
+#include "RuntimeMetaData.h"
+#include "Soda/SodaGameViewportClient.h"
+
+bool ISodaVehicleComponent::OnActivateVehicleComponent()
+{
+	checkf(AsActorComponent()->HasBegunPlay(), TEXT("ISodaVehicleComponent::OnActivateVehicleComponent(); Can be called only after BeginPlay()"));
+
+	DeferredTask = EVehicleComponentDeferredTask::None;
+	DebugCanvasErrorMessages.Empty();
+	DebugCanvasWarningMessages.Empty();
+
+	TickDivider = SodaApp.IsSynchronousMode() ? GetVehicleComponentCommon().NonRealtimeTickDivider : GetVehicleComponentCommon().RealtimeTickDivider;
+	TickDivider = FMath::Clamp(TickDivider, 1, 100);
+
+	if (bIsVehicleComponentActiveted)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("ISodaVehicleComponent::OnActivateVehicleComponent(); Deactivated component befor call OnActivateVehicleComponent()"));
+		return false;
+	}
+
+	bIsVehicleComponentActiveted = true;
+
+	if (!AsActorComponent()->HasBegunPlay())
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		return false;
+	}
+
+	if (!GetVehicle() && !GetVehicleComponentCommon().bAnyParentAllowed)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("ISodaVehicleComponent::OnActivateVehicleComponent(); Parent actor must be ASodaVehicle"));
+		return false;
+	}
+
+	if (GetVehicle() && GetVehicleComponentCommon().bIsTopologyComponent)
+	{
+		GetVehicle()->NotifyNeedReActivateComponents();
+	}
+	
+	SetHealth(EVehicleComponentHealth::Ok);
+	return true;
+}
+
+void ISodaVehicleComponent::OnDeactivateVehicleComponent()
+{
+	SetHealth(EVehicleComponentHealth::Disabled);
+	bIsVehicleComponentActiveted = false;
+	DeferredTask = EVehicleComponentDeferredTask::None;
+	DebugCanvasErrorMessages.Empty();
+	DebugCanvasWarningMessages.Empty();
+
+	if (GetVehicle() && GetVehicleComponentCommon().bIsTopologyComponent)
+	{
+		GetVehicle()->NotifyNeedReActivateComponents();
+	}
+}
+
+void ISodaVehicleComponent::ActivateVehicleComponent()
+{
+	if (!bIsVehicleComponentActiveted)
+	{
+
+		if (GetVehicle())
+		{
+			if (GetVehicleComponentCommon().UniqueVehiceComponentClass)
+			{
+				UClass* Class = GetVehicleComponentCommon().UniqueVehiceComponentClass;
+				bool bIsInterfcae = Class->IsChildOf(UInterface::StaticClass());
+
+				for (auto& It : GetVehicle()->GetComponentsByInterface(USodaVehicleComponent::StaticClass()))
+				{
+					if (ISodaVehicleComponent* Component = Cast<ISodaVehicleComponent>(It))
+					{
+						if (Component->IsVehicleComponentActiveted() &&
+							((bIsInterfcae && It->GetClass()->ImplementsInterface(Class)) || 
+							(!bIsInterfcae && It->GetClass()->IsChildOf(GetVehicleComponentCommon().UniqueVehiceComponentClass))))
+						{
+							// Don't need activate components after register
+							Component->DeferredTask = EVehicleComponentDeferredTask::Deactivate;
+							GetVehicle()->NotifyNeedReActivateComponents();
+						}
+					}
+				}
+			}
+
+			if (GetVehicleComponentCommon().bIsTopologyComponent || GetVehicle()->DoNeedReActivateComponents())
+			{
+				// Activate vehicle components in scope
+				DeferredTask = EVehicleComponentDeferredTask::Activate;
+				GetVehicle()->ReActivateVehicleComponents(true);
+			}
+			else
+			{
+				FScopeLock ScopeLock(&GetVehicle()->PhysicMutex);
+				OnPreActivateVehicleComponent();
+				OnActivateVehicleComponent();
+			}
+		}
+		else
+		{
+			OnPreActivateVehicleComponent();
+			OnActivateVehicleComponent();
+		}
+	}
+}
+
+void ISodaVehicleComponent::DeactivateVehicleComponent()
+{
+	if (bIsVehicleComponentActiveted)
+	{
+		if (GetVehicle())
+		{
+			FScopeLock ScopeLock(&GetVehicle()->PhysicMutex);
+			OnDeactivateVehicleComponent();
+			GetVehicle()->ReActivateVehicleComponentsIfNeeded();
+		}
+		else
+		{
+			OnDeactivateVehicleComponent();
+		}
+	}
+}
+
+void ISodaVehicleComponent::Toggle()
+{
+	if (IsVehicleComponentActiveted())
+	{
+		DeactivateVehicleComponent();
+	}
+	else 
+	{
+		ActivateVehicleComponent(); 
+	}
+}
+
+void ISodaVehicleComponent::SetHealth(EVehicleComponentHealth NewHealth, const FString& AddMessage) 
+{ 
+	Health = NewHealth; 
+	if (AddMessage.Len())
+	{
+		switch (Health)
+		{
+			case EVehicleComponentHealth::Undefined:
+				break;
+			case EVehicleComponentHealth::Disabled:
+				break;
+			case EVehicleComponentHealth::Ok:
+				break;
+			case EVehicleComponentHealth::Warning:
+				DebugCanvasWarningMessages.Add(AddMessage);
+				break;
+			case EVehicleComponentHealth::Error:
+				DebugCanvasErrorMessages.Add(AddMessage);
+				break;
+		}
+	}
+}
+
+void ISodaVehicleComponent::AddDebugMessage(EVehicleComponentHealth MessageHealth, const FString& Message)
+{
+	switch (MessageHealth)
+	{
+	case EVehicleComponentHealth::Undefined:
+		break;
+	case EVehicleComponentHealth::Disabled:
+		break;
+	case EVehicleComponentHealth::Ok:
+		break;
+	case EVehicleComponentHealth::Warning:
+		DebugCanvasWarningMessages.Add(Message);
+		break;
+	case EVehicleComponentHealth::Error:
+		DebugCanvasErrorMessages.Add(Message);
+		break;
+	}
+}
+
+bool ISodaVehicleComponent::IsTickOnCurrentFrame() const
+{
+	return (SodaApp.GetFrameIndex() % TickDivider) == 0;
+}
+
+void ISodaVehicleComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	UFont* RenderFont = GEngine->GetSmallFont();
+	FString ComponentName = AsActorComponent()->GetName();
+
+	switch (GetHealth())
+	{
+	case EVehicleComponentHealth::Undefined:
+		Canvas->SetDrawColor(FColor::Silver);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("%s : Undefined"), *ComponentName), 4, YPos + 4);
+		break;
+	case EVehicleComponentHealth::Disabled:
+		if (GetVehicleComponentCommon().bDrawDebugCanvas)
+		{
+			Canvas->SetDrawColor(FColor::Silver);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("%s : Disabled"), *ComponentName), 4, YPos + 4);
+		}
+		break;
+	case EVehicleComponentHealth::Ok:
+		if (GetVehicleComponentCommon().bDrawDebugCanvas)
+		{
+			Canvas->SetDrawColor(FColor::Green);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("%s : OK"), *ComponentName), 4, YPos + 4);
+		}
+		break;
+	case EVehicleComponentHealth::Warning:
+		Canvas->SetDrawColor(FColor::Yellow);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("%s : Warning"), *ComponentName), 4, YPos + 4);
+		break;
+	case EVehicleComponentHealth::Error:
+		Canvas->SetDrawColor(FColor::Red);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("%s : Error"), *ComponentName), 4, YPos + 4);
+		break;
+	}
+
+	if (GetVehicleComponentCommon().bDrawDebugCanvas || GetHealth() == EVehicleComponentHealth::Error || GetHealth() == EVehicleComponentHealth::Warning)
+	{
+		if (DebugCanvasErrorMessages.Num())
+		{
+			Canvas->SetDrawColor(FColor::Red);
+			for (auto& Str : DebugCanvasErrorMessages)
+			{
+				YPos += Canvas->DrawText(RenderFont, Str, 16, YPos);
+			}
+		}
+
+		if (DebugCanvasWarningMessages.Num())
+		{
+			Canvas->SetDrawColor(FColor::Yellow);
+			for (auto& Str : DebugCanvasWarningMessages)
+			{
+				YPos += Canvas->DrawText(RenderFont, Str, 16, YPos);
+			}
+		}
+	}
+}
+
+bool ISodaVehicleComponent::RenameVehicleComponent(const FString& NewName)
+{
+	for (auto& Component : AsActorComponent()->GetOwner()->GetComponents())
+	{
+		if (Component->GetName() == NewName) return false;
+	}
+
+	MarkAsDirty();
+
+	bool bResult = AsActorComponent()->Rename(*NewName);
+	if (bResult)
+	{
+		if (GetVehicle() && GetVehicleComponentCommon().bIsTopologyComponent)
+		{
+			GetVehicle()->ReActivateVehicleComponents(true);
+		}
+	}
+
+	return bResult;
+}
+
+void ISodaVehicleComponent::RemoveVehicleComponent()
+{
+	ASodaVehicle* Vehicle = GetVehicle();
+	AsActorComponent()->DestroyComponent();
+	if (Vehicle && GetVehicleComponentCommon().bIsTopologyComponent)
+	{
+		Vehicle->ReActivateVehicleComponents(true);
+	}
+}
+
+void ISodaVehicleComponent::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	IEditableObject::RuntimePostEditChangeProperty(PropertyChangedEvent);
+
+	FProperty* Property = PropertyChangedEvent.Property;
+	const FName PropertyName = Property ? Property->GetFName() : NAME_None;
+	//const FName MemberPropertyName = (PropertyChangedEvent.MemberProperty != nullptr) ? PropertyChangedEvent.MemberProperty->GetFName() : NAME_None;
+
+	static FName RelativeLocationName("RelativeLocation");
+	static FName RelativeRotationName("RelativeRotation");
+	static FName RelativeScale3DName("RelativeScale3D");
+
+	if (PropertyChangedEvent.Property->HasAllPropertyFlags(CPF_SaveGame) || PropertyName == RelativeLocationName || PropertyName == RelativeRotationName || PropertyName == RelativeScale3DName)
+	{
+		MarkAsDirty();
+	}
+
+	if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, TEXT("ReactivateComponent")))
+	{
+		if (IsVehicleComponentActiveted())
+		{
+			DeactivateVehicleComponent();
+			ActivateVehicleComponent();
+		}
+	}
+	else if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, TEXT("ReactivateActor")))
+	{
+		GetVehicle()->ReActivateVehicleComponents(true);
+	}
+
+	//UE_LOG(LogSoda, Error, TEXT("RuntimePostEditChangeProperty() %s"), *PropertyChangedEvent.GetPropertyName().ToString());
+}
+
+void ISodaVehicleComponent::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	IEditableObject::RuntimePostEditChangeProperty(PropertyChangedEvent);
+
+	FProperty* Property = PropertyChangedEvent.Property;
+	const FName PropertyName = Property ? Property->GetFName() : NAME_None;
+	//const FName MemberPropertyName = (PropertyChangedEvent.MemberProperty != nullptr) ? PropertyChangedEvent.MemberProperty->GetFName() : NAME_None;
+
+	static FName RelativeLocationName("RelativeLocation");
+	static FName RelativeRotationName("RelativeRotation");
+	static FName RelativeScale3DName("RelativeScale3D");
+
+	if (PropertyChangedEvent.Property->HasAllPropertyFlags(CPF_SaveGame) || PropertyName == RelativeLocationName || PropertyName == RelativeRotationName || PropertyName == RelativeScale3DName)
+	{
+		MarkAsDirty();
+	}
+
+	if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, TEXT("ReactivateComponent")))
+	{
+		if (IsVehicleComponentActiveted())
+		{
+			DeactivateVehicleComponent();
+			ActivateVehicleComponent();
+		}
+	}
+	else if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, TEXT("ReactivateActor")))
+	{
+		GetVehicle()->ReActivateVehicleComponents(true);
+	}
+	//UE_LOG(LogSoda, Error, TEXT("RuntimePostEditChangeProperty() %s"), *PropertyChangedEvent.GetPropertyName().ToString());
+}
+
+/*
+bool ISodaVehicleComponent::DoesVehicleSupport_Implementation(TSubclassOf<ASodaVehicle> VehicleClass)
+{
+}
+*/
+
+void ISodaVehicleComponent::MarkAsDirty()
+{
+	GetVehicle()->MarkAsDirty();
+}
+
+void ISodaVehicleComponent::DrawSelection(const FSceneView* View, FPrimitiveDrawInterface* PDI)
+{
+	if (USceneComponent* SceneComponent = Cast<USceneComponent>(AsActorComponent()))
+	{
+		const FTransform& LocalToWorld = SceneComponent->GetComponentTransform();
+		const float UniformScale = View->WorldToScreen(LocalToWorld.GetLocation()).W * (4.0f / View->UnscaledViewRect.Width() / View->ViewMatrices.GetProjectionMatrix().M[0][0]);
+		const FVector BoxExtents(8, 8, 8);
+		const float ArrowLength = 60;
+		const float ArrowSize = 5;
+		const FColor Color = FColor::Turquoise;
+		DrawOrientedWireBox(PDI, LocalToWorld.GetLocation(), LocalToWorld.GetScaledAxis(EAxis::X), LocalToWorld.GetScaledAxis(EAxis::Y), LocalToWorld.GetScaledAxis(EAxis::Z), BoxExtents * UniformScale, Color, SDPG_Foreground);
+		DrawDirectionalArrow(PDI, LocalToWorld.ToMatrixWithScale(), Color, ArrowLength * UniformScale, ArrowSize * UniformScale, SDPG_Foreground);
+	}
+}
+
+bool ISodaVehicleComponent::IsDefaultComponent() 
+{
+	return AsActorComponent()->IsDefaultSubobject(); 
+}
+
+bool ISodaVehicleComponent::IsVehicleComponentSelected() const
+{
+	if (USodaGameViewportClient* GameViewportClient = Cast<USodaGameViewportClient>(Cast<UObject>(this)->GetWorld()->GetGameViewport()))
+	{
+		return GameViewportClient->GetWidgetTarget() && GameViewportClient->GetWidgetTarget() == Cast<UObject>(this);
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/IToolActor.cpp b/Source/UnrealSoda/Private/IToolActor.cpp
new file mode 100644
index 0000000..8cbbc28
--- /dev/null
+++ b/Source/UnrealSoda/Private/IToolActor.cpp
@@ -0,0 +1,292 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/IToolActor.h"
+#include "Kismet/GameplayStatics.h"
+#include "Soda/UnrealSoda.h"
+#include "UI/Wnds/SPinToolActorWindow.h"
+#include "Soda/SodaGameMode.h"
+
+#define TOOL_ACTOR_SLOT_PREFIX "Pinned"
+
+bool IToolActor::PinActor(const FString& SlotName)
+{
+	if (FindPinnedActorBySlotName(AsActor()->GetWorld(), SlotName))
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::PinActor(); Actor with same SloatName is already exist"));
+		return false;
+	}
+	ToolActorSlotName = SlotName;
+	return true;
+}
+
+void IToolActor::UnpinActor()
+{
+	ToolActorSlotName = "";
+}
+
+bool IToolActor::IsPinnedActor() const
+{
+	return ToolActorSlotName.Len() > 0;
+}
+
+FString IToolActor::GetPinnedActorSlotName() const
+{
+	return ToolActorSlotName;
+}
+
+FString IToolActor::GetPinnedActorName() const
+{
+	return ToolActorSlotName;
+}
+
+bool IToolActor::OnSetPinnedActor(bool bIsPinnedActor)
+{
+	if (bIsPinnedActor)
+	{
+		if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+		{
+			GameMode->OpenWindow(FString::Printf(TEXT("Pin \"%s\" Actor"), *AsActor()->GetName()), SNew(soda::SPinToolActorWindow, this));
+		}
+	}
+	else
+	{
+		UnpinActor();
+	}
+	return true;
+}
+
+bool IToolActor::SavePinnedActor() 
+{ 
+	if (!AsActor())
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::SavePinnedActor(); Forgot implement AsActor()?"));
+		return false;
+	}
+
+	if (!IsPinnedActor())
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::SavePinnedActor(); IsPinnedActor() == false"));
+		return false;
+	}
+
+	UPinnedToolActorsSaveGame* SaveGame = GetSaveGame();
+	if (!SaveGame)
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::SavePinnedActor(); Can't load SaveGame"));
+		return false;
+	}
+
+	FActorRecord & ActorRecord = SaveGame->ActorRecords.FindOrAdd(ToolActorSlotName);
+	if (!ActorRecord.SerializeActor(AsActor(), false))
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::SavePinnedActor(); Serialize actor"));
+		return false;
+	}
+
+	if (SaveAll())
+	{
+		ClearDirty();
+		return true;
+	}
+
+	return false;
+}
+
+bool IToolActor::DeserializePinnedActor(const FString& SlotName)
+{
+	if (!AsActor())
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::DeserializePinnedActor(); Forgot implement AsActor()?"));
+		return false;
+	}
+
+	UPinnedToolActorsSaveGame* SaveGame = GetSaveGame();
+	if (!SaveGame)
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::DeserializePinnedActor(); Can't load SaveGame"));
+		return false;
+	}
+
+	if (FindPinnedActorBySlotName(AsActor()->GetWorld(), SlotName))
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::DeserializePinnedActor(); Actor with same SloatName is already exist"));
+		return false;
+	}
+
+	for (auto& It : SaveGame->ActorRecords)
+	{
+		if (It.Key == SlotName)
+		{
+			if (It.Value.Class != AsActor()->GetClass())
+			{
+				UE_LOG(LogSoda, Error, TEXT("IToolActor::DeserializePinnedActor(); Slot class mismatch"));
+				return false;
+			}
+			if (It.Value.DeserializeActor(AsActor(), false, true))
+			{
+				ToolActorSlotName = SlotName;
+				return true;
+			}
+			return false;
+		}
+	}
+	return false;
+}
+
+AActor* IToolActor::LoadPinnedActor(UWorld* World, const FTransform& Transform, const FString& SlotName, bool bForceCreate, FName DesireName) const
+{
+	check(World);
+
+	if (!AsActor())
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::LoadPinnedActor(); Forgot implement AsActor()?"));
+		return nullptr;
+	}
+
+	if (FindPinnedActorBySlotName(AsActor()->GetWorld(), SlotName))
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::LoadPinnedActor(); Actor with same SloatName is already exist"));
+		return nullptr;
+	}
+
+	UPinnedToolActorsSaveGame* SaveGame = GetSaveGame();
+	if (!SaveGame)
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::LoadPinnedActor(); Can't load SaveGame"));
+		return nullptr;
+	}
+
+	AActor* Actor = nullptr;
+	for (auto& It : SaveGame->ActorRecords)
+	{
+		if (It.Key == SlotName)
+		{
+			if (It.Value.Class != AsActor()->GetClass())
+			{
+				UE_LOG(LogSoda, Error, TEXT("IToolActor::LoadPinnedActor(); Slot class mismatch"));
+				return nullptr;
+			}
+			It.Value.Name = DesireName;
+			Actor = It.Value.SpawnActor<AActor>(World, false);
+		}
+	}
+
+	if (!Actor)
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::LoadPinnedActor(); Can't find slot '%s' for actor class '%s'"), *SlotName, *AsActor()->GetClass()->GetName());
+		return nullptr;
+	}
+
+	if (!Actor && bForceCreate)
+	{
+		FActorSpawnParameters SpawnInfo;
+		SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
+		SpawnInfo.Name = DesireName.IsNone() ? NAME_None : FEditorUtils::MakeUniqueObjectName(World->GetCurrentLevel(), AsActor()->GetClass(), DesireName);
+		Actor = World->SpawnActor(AsActor()->GetClass(), &Transform, SpawnInfo);
+	}
+
+	if (Actor)
+	{
+		if (IToolActor* ActorTool = Cast<IToolActor>(Actor))
+		{
+			ActorTool->ToolActorSlotName = SlotName;
+		}
+	}
+
+	return Actor;
+}
+
+UPinnedToolActorsSaveGame* IToolActor::GetSaveGame() const
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		// Try find savegamae
+		UPinnedToolActorsSaveGame *& SaveGame = GameMode->PinnedToolActorsSaveGame.FindOrAdd(AsActor()->GetClass());
+		if (SaveGame)
+		{
+			if (SaveGame->Class != AsActor()->GetClass())
+			{
+				SaveGame->Class = AsActor()->GetClass();
+				UE_LOG(LogSoda, Warning, TEXT("IToolActor::GetSaveGame(); Found slot class mismatch"));
+			}
+			return SaveGame;
+		} 
+
+		// Try load savagame
+		const FString SlotName = FString(TOOL_ACTOR_SLOT_PREFIX) + "_" + AsActor()->GetClass()->GetName();
+		SaveGame = Cast<UPinnedToolActorsSaveGame>(UGameplayStatics::LoadGameFromSlot(SlotName, 0));
+		if (SaveGame)
+		{
+			if (SaveGame->Class != AsActor()->GetClass())
+			{
+				SaveGame->Class = AsActor()->GetClass();
+				UE_LOG(LogSoda, Warning, TEXT("IToolActor::GetSaveGame(); Loaded slot class mismatch"));
+			}
+			return SaveGame;
+		}
+
+		// Create savegame
+		SaveGame = NewObject< UPinnedToolActorsSaveGame>(GameMode);
+		SaveGame->Class = AsActor()->GetClass();
+		return SaveGame;
+	}
+	return nullptr;
+}
+
+IToolActor* IToolActor::FindPinnedActorBySlotName(const UWorld* World, const FString& SlotName) const
+{
+	TArray<AActor*> Actors;
+	UGameplayStatics::GetAllActorsOfClass(World, AsActor()->GetClass(), Actors);
+	for (auto& It : Actors)
+	{
+		if (IToolActor* ActorTool = Cast<IToolActor>(It))
+		{
+			if (ActorTool->IsPinnedActor() && ActorTool->GetPinnedActorSlotName() == SlotName)
+			{
+				return ActorTool;
+			}
+		}
+	}
+	return nullptr;
+}
+
+bool IToolActor::DeleteSlot(const UWorld* World, const FString& SlotName) const
+{
+	UPinnedToolActorsSaveGame* SaveGame = GetSaveGame();
+	if (!SaveGame)
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::DeleteSlot(); Can't load SaveGame"));
+		return false;
+	}
+
+	if (SaveGame->ActorRecords.Remove(SlotName) <= 0)
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::DeleteSlot(); Can't can't find '%s' slot name"), *SlotName);
+		return false;
+	}
+
+	SaveAll();
+
+	return true;
+}
+
+bool IToolActor::IToolActor::SaveAll() const
+{
+	UPinnedToolActorsSaveGame* SaveGame = GetSaveGame();
+	if (!SaveGame)
+	{
+		UE_LOG(LogSoda, Error, TEXT("IToolActor::SaveAll(); Can't load SaveGame"));
+		return false;
+	}
+
+	const FString SlotName = FString(TOOL_ACTOR_SLOT_PREFIX) + "_" + AsActor()->GetClass()->GetName();
+	return UGameplayStatics::SaveGameToSlot(SaveGame, SlotName, 0);
+}
+
+void IToolActor::ToolActorSerialize(FArchive& Ar)
+{  
+	if (Ar.IsSaveGame())
+	{
+		Ar << ToolActorSlotName;
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/LevelState.cpp b/Source/UnrealSoda/Private/LevelState.cpp
new file mode 100644
index 0000000..bac33a8
--- /dev/null
+++ b/Source/UnrealSoda/Private/LevelState.cpp
@@ -0,0 +1,551 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/LevelState.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Kismet/GameplayStatics.h"
+#include "Kismet/KismetSystemLibrary.h"
+#include "GameFramework/GameModeBase.h"
+#include "Kismet/KismetMathLibrary.h"
+#include "Misc/FileHelper.h"
+#include "EngineUtils.h"
+#include "Soda/VehicleComponents/Sensors/ImuOxtsSensor.h"
+#include "GameFramework/SpectatorPawn.h"
+#include "TimerManager.h"
+#include "Engine/LevelStreamingPersistent.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/SodaSpectator.h"
+#include "Soda/DBGateway.h"
+#include "Soda/Actors/RefPoint.h"
+#include "Soda/SodaGameMode.h"
+
+ALevelState* ALevelState::Get()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		return  GameMode->LevelState;
+	}
+	return nullptr;
+}
+
+ALevelState* ALevelState::GetChecked()
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	check(GameMode);
+	check(GameMode->LevelState);
+	return GameMode->LevelState;
+}
+
+void ULevelSaveGame::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+	Ar << LevelDataRecord;
+}
+
+FLevelStateSlotDescription ALevelState::StaticSlot;
+
+ALevelState::ALevelState()
+{
+	DefaultActorFactoryClass = ASodaActorFactory::StaticClass();
+}
+
+void ALevelState::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame())
+	{
+		Ar << ActorFactoryRecord;
+		Ar << SpectatorActorRecord;
+
+		if (Ar.IsSaving())
+		{
+			AdditionalActorRecords.Empty();
+			for (auto& Actor : AdditionalActorsForSerialize)
+			{
+				FActorRecord& Record = AdditionalActorRecords.Add_GetRef(FActorRecord());
+				Record.SerializeActor(Actor, true);
+
+			}
+			Ar << AdditionalActorRecords;
+		}
+		else if (Ar.IsLoading())
+		{
+			AdditionalActorRecords.Empty();
+			Ar << AdditionalActorRecords;
+			if (AdditionalActorRecords.Num() != AdditionalActorsForSerialize.Num())
+			{
+				if (AdditionalActorRecords.Num() != 0)
+				{
+					UE_LOG(LogSoda, Error, TEXT("ALevelState::Serialize() Additional actor records num is mismatched"));
+				}
+			}
+			else
+			{
+				for (int i = 0; i < AdditionalActorRecords.Num(); ++i)
+				{
+					AdditionalActorRecords[i].DeserializeActor(AdditionalActorsForSerialize[i], true, true);
+				}
+			}
+		}
+	}
+}
+
+ULevelSaveGame * ALevelState::CreateSaveGame(bool bSerializePinnedActorsAsUnpinned)
+{
+	ASodalSpectator* SpectatorActor = nullptr;
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode)
+	{
+		SpectatorActor = GameMode->GetSpectatorActor();
+	}
+
+	if (IsValid(SpectatorActor))
+	{
+		SpectatorActorRecord.SerializeActor(SpectatorActor, false);
+	}
+
+	if (IsValid(ActorFactory))
+	{
+		ActorFactory->SetSerializePinnedActorsAsUnpinned(bSerializePinnedActorsAsUnpinned);
+		ActorFactoryRecord.SerializeActor(ActorFactory, false);
+		ActorFactory->SetSerializePinnedActorsAsUnpinned(false);
+	}
+
+	ULevelSaveGame* SaveGame = NewObject<ULevelSaveGame>(this);
+	check(SaveGame);
+	SaveGame->Description = Slot.Description;
+	SaveGame->DateTime = Slot.DateTime;
+	SaveGame->LevelName = Slot.LevelName;
+	SaveGame->LevelDataRecord.SerializeActor(this, false);
+
+	return SaveGame;
+}
+
+bool ALevelState::SaveLevelLocallyAs(int SlotIndex, const FString& Description)
+{
+	if (SlotIndex > 255)
+	{
+		return false;
+	}
+
+	if (SlotIndex < 0)
+	{
+		for (int i = 0; i <= 255; ++i)
+		{
+			if (!UGameplayStatics::DoesSaveGameExist(GetLocalSaveSlotName(this, i), 0))
+			{
+				SlotIndex = i;
+				break;
+			}
+		}
+
+		if (SlotIndex < 0)
+		{
+			UE_LOG(LogSoda, Error, TEXT("ALevelState::SaveLevelLocallyAs(); Run out of free slots"));
+			return false;
+		}
+	}
+
+	Slot.Description = Description;
+	Slot.SlotIndex = SlotIndex;
+	Slot.ScenarioID = -1;
+	Slot.DateTime = FDateTime::Now();
+	Slot.LevelName = UGameplayStatics::GetCurrentLevelName(GetWorld(), true);
+	Slot.SlotSource = ELeveSlotSource::Local;
+
+	ULevelSaveGame* SaveGame = ALevelState::CreateSaveGame(false);
+	if (!SaveGame)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ALevelState::SaveLevelLocallyAs(); Can't CreateSaveGame()"));
+		return false;
+	}
+
+	if (!UGameplayStatics::SaveGameToSlot(SaveGame, GetLocalSaveSlotName(this, SlotIndex), 0))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ALevelState::SaveLevelLocallyAs(); Can't SaveGameToSlot()"));
+		return false;
+	}
+
+	bIsDirty = false;
+	StaticSlot = Slot;
+	return true;
+}
+
+bool ALevelState::SaveLevelRemotlyAs(int64 ScenarioID, const FString& Description)
+{
+	ULevelSaveGame* SaveGame = ALevelState::CreateSaveGame(false);
+	if (!SaveGame)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ALevelState::SaveLevelRemotlyAs(); Can't CreateSaveGame()"));
+		return false;
+	}
+
+	TArray<uint8> ObjectBytes;
+	if (!UGameplayStatics::SaveGameToMemory(SaveGame, ObjectBytes))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ALevelState::SaveLevelRemotlyAs(); Can't SaveGameToMemory()"));
+		return false;
+	}
+
+	FLevelStateSlotDescription NewSlot;
+	NewSlot.Description = Description;
+	NewSlot.ScenarioID = ScenarioID;
+	NewSlot.SlotIndex = -1;
+	NewSlot.DateTime = FDateTime::Now();
+	NewSlot.LevelName = UGameplayStatics::GetCurrentLevelName(GetWorld(), true);;
+	NewSlot.SlotSource = ELeveSlotSource::Remote;
+
+	ScenarioID = soda::FDBGateway::Instance().SaveLevelData(NewSlot, ObjectBytes);
+
+	if (ScenarioID >=0)
+	{
+		NewSlot.ScenarioID = ScenarioID;
+		StaticSlot = Slot = NewSlot;
+		bIsDirty = false;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+bool ALevelState::ReSaveLevel()
+{
+	switch (Slot.SlotSource)
+	{
+	case ELeveSlotSource::Local:
+		return Slot.SlotIndex >= 0 ? SaveLevelLocallyAs(Slot.SlotIndex, Slot.Description) : false;
+	case ELeveSlotSource::Remote:
+		return Slot.ScenarioID >= 0 ? SaveLevelRemotlyAs(Slot.ScenarioID, Slot.Description) : false;
+	default:
+		return false;
+	}
+}
+
+ULevelSaveGame* ALevelState::LoadSaveGameLocally(const UObject* WorldContextObject, int & SlotIndex)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	if (SlotIndex < 0)
+	{
+		TArray<FLevelStateSlotDescription> Slots;
+		GetLevelSlotsLocally(WorldContextObject, Slots, true);
+		if (Slots.Num())
+		{
+			SlotIndex = Slots[0].SlotIndex;
+		}
+	}
+	if (SlotIndex >= 0)
+	{
+		return Cast<ULevelSaveGame>(UGameplayStatics::LoadGameFromSlot(GetLocalSaveSlotName(WorldContextObject, SlotIndex), 0));
+	}
+	else
+	{
+		return nullptr;
+	}
+}
+
+ULevelSaveGame* ALevelState::LoadSaveGameRemotly(const UObject* WorldContextObject, int64 & ScenarioID)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	if (ScenarioID < 0)
+	{
+		TArray<FLevelStateSlotDescription> Slots;
+		GetLevelSlotsRemotly(WorldContextObject, Slots, true);
+		if (Slots.Num())
+		{
+			ScenarioID = Slots[0].SlotIndex;
+		}
+		else
+		{
+			return nullptr;
+		}
+	}
+
+	TArray<uint8> ObjectBytes;
+	if (!soda::FDBGateway::Instance().LoadLevelData(ScenarioID, ObjectBytes))
+	{
+		return nullptr;
+	}
+
+	return Cast<ULevelSaveGame>(UGameplayStatics::LoadGameFromMemory(ObjectBytes));
+}
+
+FString ALevelState::GetLocalSaveSlotName(const UObject* WorldContextObject, int SlotIndex)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	FString LevelName = UGameplayStatics::GetCurrentLevelName(WorldContextObject, true);
+	//LevelName.ReplaceCharInline('/', '_');
+	//LevelName.ReplaceCharInline('\\', '_');
+	return FString(TEXT("LevelState")) + TEXT("_") + LevelName + TEXT("_") + FString::FromInt(SlotIndex);
+}
+
+
+bool ALevelState::DeleteLevelLocally(const UObject* WorldContextObject, int SlotIndex)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	return UGameplayStatics::DeleteGameInSlot(GetLocalSaveSlotName(WorldContextObject, SlotIndex), 0);
+}
+
+bool ALevelState::DeleteLevelRemotly(const UObject* /*WorldContextObject*/, int64 ScenarioID)
+{
+	return soda::FDBGateway::Instance().DeleteLevelData(ScenarioID);
+}
+
+bool ALevelState::GetLevelSlotsLocally(const UObject* WorldContextObject, TArray<FLevelStateSlotDescription>& Slots, bool bSortByDateTime)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	Slots.Empty();
+
+	for (int i = 0; i < 255; ++i)
+	{
+		if (UGameplayStatics::DoesSaveGameExist(GetLocalSaveSlotName(WorldContextObject, i), 0))
+		{
+			if (ULevelSaveGame* SaveGameSlot = LoadSaveGameLocally(WorldContextObject, i))
+			{
+				FLevelStateSlotDescription Slot;
+				Slot.SlotIndex = i;
+				Slot.ScenarioID = -1;
+				Slot.Description = SaveGameSlot->Description;
+				Slot.DateTime = SaveGameSlot->DateTime;
+				Slot.LevelName = UGameplayStatics::GetCurrentLevelName(WorldContextObject, true);
+				Slot.SlotSource = ELeveSlotSource::Local;
+				Slots.Add(Slot);
+			}
+		}
+	}
+
+	if (bSortByDateTime)
+	{
+		Slots.Sort([](const FLevelStateSlotDescription& LHS, const FLevelStateSlotDescription& RHS) { return LHS.DateTime > RHS.DateTime; });
+	}
+
+	return true;
+}
+
+bool ALevelState::GetLevelSlotsRemotly(const UObject* WorldContextObject, TArray<FLevelStateSlotDescription>& Slots, bool bSortByDateTime)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+	FString LevelName = UGameplayStatics::GetCurrentLevelName(WorldContextObject, true);
+	return soda::FDBGateway::Instance().LoadLevelList(LevelName, bSortByDateTime, Slots);
+}
+
+bool ALevelState::ReloadLevelEmpty(const UObject* WorldContextObject)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	FString LevelName = UGameplayStatics::GetCurrentLevelName(WorldContextObject, true);
+	StaticSlot.LevelName = LevelName;
+	StaticSlot.SlotIndex = -1;
+	StaticSlot.ScenarioID = -1;
+	StaticSlot.SlotSource = ELeveSlotSource::NewSlot;
+	UGameplayStatics::OpenLevel(WorldContextObject, *LevelName, false);
+	return true;
+}
+
+
+bool ALevelState::ReloadLevelFromSlotLocally(const UObject* WorldContextObject, int SlotIndex)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	FString LevelName = UGameplayStatics::GetCurrentLevelName(WorldContextObject, true);
+	StaticSlot.LevelName = LevelName;
+	StaticSlot.SlotIndex = SlotIndex;
+	StaticSlot.ScenarioID = -1;
+	StaticSlot.SlotSource = ELeveSlotSource::Local;
+	UGameplayStatics::OpenLevel(WorldContextObject, *LevelName, false);
+	return true;
+}
+
+bool ALevelState::ReloadLevelFromSlotRemotly(const UObject* WorldContextObject, int64 ScenarioID)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	FString LevelName = UGameplayStatics::GetCurrentLevelName(WorldContextObject, true);
+	StaticSlot.LevelName = LevelName;
+	StaticSlot.SlotIndex = -1;
+	StaticSlot.ScenarioID = ScenarioID;
+	StaticSlot.SlotSource = ELeveSlotSource::Remote;
+	UGameplayStatics::OpenLevel(WorldContextObject, *LevelName, false);
+	return true;
+}
+
+ALevelState* ALevelState::CreateOrLoad(const UObject* WorldContextObject, UClass* DefaultClass)
+{
+	if (!WorldContextObject)
+	{
+		WorldContextObject = USodaStatics::GetGameWorld();
+	}
+
+	UWorld* World = WorldContextObject->GetWorld();
+	check(World);
+
+	ULevelSaveGame* LevelSaveGame = nullptr;
+
+	switch (StaticSlot.SlotSource)
+	{
+	case ELeveSlotSource::NoSlot:
+		StaticSlot.SlotIndex = -1;
+		LevelSaveGame = LoadSaveGameLocally(WorldContextObject, StaticSlot.SlotIndex);
+		StaticSlot.SlotSource = ELeveSlotSource::Local;
+		break;
+	case ELeveSlotSource::NewSlot:
+		StaticSlot.SlotIndex = -1;
+		StaticSlot.SlotSource = ELeveSlotSource::NoSlot;
+		break;
+	case ELeveSlotSource::Local:
+		LevelSaveGame = LoadSaveGameLocally(WorldContextObject, StaticSlot.SlotIndex);
+		StaticSlot.SlotSource = ELeveSlotSource::Local;
+		break;
+	case ELeveSlotSource::Remote:
+		LevelSaveGame = LoadSaveGameRemotly(WorldContextObject, StaticSlot.ScenarioID);
+		StaticSlot.SlotSource = ELeveSlotSource::Remote;
+		break;
+	}
+
+	auto It = TActorIterator<ALevelState>(World);
+	ALevelState* LevelState = It ? *It : nullptr;
+
+	if (LevelState)
+	{
+		if (LevelSaveGame)
+		{
+			LevelSaveGame->LevelDataRecord.DeserializeActor(LevelState, false);
+		}
+	}
+	else
+	{
+		if (LevelSaveGame)
+		{
+			LevelState = LevelSaveGame->LevelDataRecord.SpawnActor<ALevelState>(World, false);
+		}
+	}
+
+	if (!LevelState)
+	{
+		if (DefaultClass)
+		{
+			LevelState = World->SpawnActor<ALevelState>(DefaultClass);
+		}
+		else
+		{
+			LevelState = World->SpawnActor<ALevelState>();
+		}
+	}
+
+	check(LevelState)
+
+	if (LevelSaveGame)
+	{
+		LevelState->Slot.Description = LevelSaveGame->Description;
+		LevelState->Slot.DateTime = LevelSaveGame->DateTime;
+		LevelState->Slot.LevelName = LevelSaveGame->LevelName;
+		LevelState->Slot.SlotIndex = StaticSlot.SlotIndex;
+		LevelState->Slot.ScenarioID = StaticSlot.ScenarioID;
+		LevelState->Slot.SlotSource = StaticSlot.SlotSource;
+	}
+	else
+	{
+		LevelState->Slot = FLevelStateSlotDescription();
+	}
+
+	StaticSlot = LevelState->Slot;
+	return LevelState;
+}
+
+void ALevelState::FinishLoadLevel()
+{
+	UWorld* World = GetWorld();
+	check(World);
+
+	/* Initialize ActorFactory*/
+	if (!TActorIterator<ASodaActorFactory>(World))
+	{
+		ActorFactory = ActorFactoryRecord.SpawnActor<ASodaActorFactory>(World, false);
+		if (ActorFactory == nullptr && DefaultActorFactoryClass)
+		{
+			ActorFactory = World->SpawnActor<ASodaActorFactory>(DefaultActorFactoryClass);
+		}
+	}
+	else
+	{
+		ActorFactory = *TActorIterator<ASodaActorFactory>(World);
+		ActorFactoryRecord.DeserializeActor(ActorFactory, false);
+	}
+	if (ActorFactory)
+	{
+		ActorFactory->SpawnAllSavedActors();
+	}
+}
+
+void ALevelState::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void ALevelState::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ALevelState::SetGeoReference(double Lat, double Lon, double Alt, const FVector& OrignShift, float OrignDYaw)
+{
+	LLConverter.OrignLat = Lat;
+	LLConverter.OrignLon = Lon;
+	LLConverter.OrignAltitude = Alt;
+	LLConverter.OrignShift = OrignShift;
+	LLConverter.OrignDYaw = OrignDYaw;
+	LLConverter.Init();
+
+	for (TActorIterator<ARefPoint> It(GetWorld()); It; ++It)
+	{
+		It->SetActorLocation(LLConverter.OrignShift);
+		It->SetActorRotation(FRotator(0, LLConverter.OrignDYaw, 0));
+		It->Longitude = Lon;
+		It->Latitude = Lat;
+		It->Altitude = Alt;
+	}
+}
+
+void ALevelState::ClearLevel()
+{
+	if (ActorFactory)
+	{
+		ActorFactory->RemoveAllActors();
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/AsyncTaskManager.cpp b/Source/UnrealSoda/Private/Misc/AsyncTaskManager.cpp
new file mode 100644
index 0000000..386d8af
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/AsyncTaskManager.cpp
@@ -0,0 +1,171 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/AsyncTaskManager.h"
+#include "Soda/UnrealSoda.h"
+#include "Misc/ScopeLock.h"
+
+namespace soda
+{
+
+bool FAsyncTaskManager::Init(void)
+{
+	WorkEvent = FPlatformProcess::GetSynchEventFromPool();
+	return WorkEvent != nullptr;
+}
+
+uint32 FAsyncTaskManager::Run(void)
+{
+	do
+	{
+		WorkEvent->Wait(PollingInterval);
+		if (!bRequestingExit)
+		{
+			FScopeLock ScopeLock(&TickLock);
+			Tick();
+		}
+	} while (!bRequestingExit);
+
+	return 0;
+}
+
+void FAsyncTaskManager::Stop(void)
+{
+	bRequestingExit = true;
+	Trigger();
+}
+
+void FAsyncTaskManager::Exit(void)
+{
+	FPlatformProcess::ReturnSynchEventToPool(WorkEvent);
+	WorkEvent = nullptr;
+
+	//FScopeLock ScopeLock(&TasksLock);
+	//TaskQueue.Empty();
+}
+
+void FAsyncTaskManager::Tick()
+{
+	{
+		// Tick all the parallel tasks - Tick unrelated tasks together. 
+		TArray< TSharedPtr <FAsyncTask>> CopyTaskQueue;
+
+		// Grab a copy of the parallel list
+		{
+			FScopeLock ScopeLock(&TasksLock);
+			CopyTaskQueue = TaskQueue;
+		}
+
+		TSharedPtr <FAsyncTask> Task = nullptr;
+		for (auto It = CopyTaskQueue.CreateIterator(); It; ++It)
+		{
+			Task = *It;
+
+			if (!Task->IsDone())
+			{
+				//UE_LOG(LogSoda, Warning, TEXT("Start Tick %s %i"), *Task->ToString(), Task->IsDone());
+				Task->Tick();
+				//UE_LOG(LogSoda, Warning, TEXT("End Tick %s %i"), *Task->ToString(), Task->IsDone());
+			}
+
+			if (Task->IsDone())
+			{
+				if (Task->WasSuccessful())
+				{
+					UE_LOG(LogSoda, Verbose, TEXT("Async task '%s' succeeded in %f seconds"), *Task->ToString(), Task->GetElapsedTime());
+				}
+				else
+				{
+					UE_LOG(LogSoda, Warning, TEXT("Async task '%s' failed in %f seconds"), *Task->ToString(), Task->GetElapsedTime());
+				}
+
+				FScopeLock ScopeLock(&TasksLock);
+				TaskQueue.Remove(Task);
+			}
+		}
+	}
+}
+
+void FAsyncTaskManager::ClearQueue() 
+{ 
+	FScopeLock ScopeLock(&TickLock); 
+	TaskQueue.Empty(); 
+}
+
+TSharedPtr<FAsyncTask> AsyncTaskLoop(FAsyncTaskManager& AsyncTaskManager, TUniqueFunction < void()> Function)
+{
+	class FFunctionAsyncTask : public FAsyncTask
+	{
+	public:
+		FFunctionAsyncTask(TUniqueFunction < void()> InFunction) :
+			Function(MoveTemp(InFunction))
+		{
+		}
+
+		virtual FString ToString() const override { return "FFunctionAsyncTask"; }
+		virtual bool IsDone() const override { return bIsDone; }
+		virtual bool WasSuccessful() const override { return true; }
+		virtual void Tick() override
+		{
+			Function();
+		}
+
+	protected:
+		bool bIsDone = false;
+		TUniqueFunction < void()> Function;
+	};
+
+	TSharedPtr<FFunctionAsyncTask> Task = MakeShared<FFunctionAsyncTask>(MoveTemp(Function));
+	AsyncTaskManager.AddTask(Task);
+	AsyncTaskManager.Trigger();
+	return Task;
+}
+
+
+TFuture<bool> AsyncTask(FAsyncTaskManager& AsyncTaskManager, TUniqueFunction < bool()> Function, bool bSync)
+{
+	if (bSync)
+	{
+		TPromise<bool> Promise;
+		Promise.SetValue(Function());
+		return Promise.GetFuture();
+	}
+	else
+	{
+		class FTempAsyncTask : public FAsyncTask
+		{
+		public:
+			FTempAsyncTask(TUniqueFunction < bool()> InFunction) :
+				Promise(MakeShareable(new TPromise<bool>())),
+				Function(MoveTemp(InFunction))
+			{
+			}
+			virtual ~FTempAsyncTask()
+			{
+				if (!bIsDone) Promise->SetValue(false);
+			}
+
+			virtual FString ToString() const override { return "FTempAsyncTask"; }
+			virtual bool IsDone() const override { return bIsDone; }
+			virtual bool WasSuccessful() const override { return true; }
+			virtual void Tick() override
+			{
+				Promise->SetValue(Function());
+				bIsDone = true;
+			}
+
+			const TSharedRef<TPromise<bool>, ESPMode::ThreadSafe> Promise;
+
+		protected:
+			bool bIsDone = false;
+			TUniqueFunction < bool ()> Function;
+
+		};
+
+		TSharedPtr<FTempAsyncTask> Task = MakeShared<FTempAsyncTask>(MoveTemp(Function));
+		AsyncTaskManager.AddTask(Task);
+		AsyncTaskManager.Trigger();
+		return Task->Promise->GetFuture();
+	}
+}
+
+} // namespace spda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/AutosarCRC.cpp b/Source/UnrealSoda/Private/Misc/AutosarCRC.cpp
new file mode 100644
index 0000000..713e448
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/AutosarCRC.cpp
@@ -0,0 +1,154 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/AutosarCRC.h"
+#include "CoreMinimal.h"
+
+#define AUTOSAR_CRC_OPTIMIZED
+
+#ifdef AUTOSAR_CRC_OPTIMIZED
+
+static const uint8_t crc8_sae_j1850_table [] = 
+{
+    0x00U, 0x1DU, 0x3AU, 0x27U, 0x74U, 0x69U, 0x4EU, 0x53U, 0xE8U, 0xF5U, 0xD2U, 0xCFU, 0x9CU, 0x81U, 0xA6U, 0xBBU,
+    0xCDU, 0xD0U, 0xF7U, 0xEAU, 0xB9U, 0xA4U, 0x83U, 0x9EU, 0x25U, 0x38U, 0x1FU, 0x02U, 0x51U, 0x4CU, 0x6BU, 0x76U,
+    0x87U, 0x9AU, 0xBDU, 0xA0U, 0xF3U, 0xEEU, 0xC9U, 0xD4U, 0x6FU, 0x72U, 0x55U, 0x48U, 0x1BU, 0x06U, 0x21U, 0x3CU,
+    0x4AU, 0x57U, 0x70U, 0x6DU, 0x3EU, 0x23U, 0x04U, 0x19U, 0xA2U, 0xBFU, 0x98U, 0x85U, 0xD6U, 0xCBU, 0xECU, 0xF1U,
+    0x13U, 0x0EU, 0x29U, 0x34U, 0x67U, 0x7AU, 0x5DU, 0x40U, 0xFBU, 0xE6U, 0xC1U, 0xDCU, 0x8FU, 0x92U, 0xB5U, 0xA8U,
+    0xDEU, 0xC3U, 0xE4U, 0xF9U, 0xAAU, 0xB7U, 0x90U, 0x8DU, 0x36U, 0x2BU, 0x0CU, 0x11U, 0x42U, 0x5FU, 0x78U, 0x65U,
+    0x94U, 0x89U, 0xAEU, 0xB3U, 0xE0U, 0xFDU, 0xDAU, 0xC7U, 0x7CU, 0x61U, 0x46U, 0x5BU, 0x08U, 0x15U, 0x32U, 0x2FU,
+    0x59U, 0x44U, 0x63U, 0x7EU, 0x2DU, 0x30U, 0x17U, 0x0AU, 0xB1U, 0xACU, 0x8BU, 0x96U, 0xC5U, 0xD8U, 0xFFU, 0xE2U,
+    0x26U, 0x3BU, 0x1CU, 0x01U, 0x52U, 0x4FU, 0x68U, 0x75U, 0xCEU, 0xD3U, 0xF4U, 0xE9U, 0xBAU, 0xA7U, 0x80U, 0x9DU,
+    0xEBU, 0xF6U, 0xD1U, 0xCCU, 0x9FU, 0x82U, 0xA5U, 0xB8U, 0x03U, 0x1EU, 0x39U, 0x24U, 0x77U, 0x6AU, 0x4DU, 0x50U,
+    0xA1U, 0xBCU, 0x9BU, 0x86U, 0xD5U, 0xC8U, 0xEFU, 0xF2U, 0x49U, 0x54U, 0x73U, 0x6EU, 0x3DU, 0x20U, 0x07U, 0x1AU,
+    0x6CU, 0x71U, 0x56U, 0x4BU, 0x18U, 0x05U, 0x22U, 0x3FU, 0x84U, 0x99U, 0xBEU, 0xA3U, 0xF0U, 0xEDU, 0xCAU, 0xD7U,
+    0x35U, 0x28U, 0x0FU, 0x12U, 0x41U, 0x5CU, 0x7BU, 0x66U, 0xDDU, 0xC0U, 0xE7U, 0xFAU, 0xA9U, 0xB4U, 0x93U, 0x8EU,
+    0xF8U, 0xE5U, 0xC2U, 0xDFU, 0x8CU, 0x91U, 0xB6U, 0xABU, 0x10U, 0x0DU, 0x2AU, 0x37U, 0x64U, 0x79U, 0x5EU, 0x43U,
+    0xB2U, 0xAFU, 0x88U, 0x95U, 0xC6U, 0xDBU, 0xFCU, 0xE1U, 0x5AU, 0x47U, 0x60U, 0x7DU, 0x2EU, 0x33U, 0x14U, 0x09U,
+    0x7FU, 0x62U, 0x45U, 0x58U, 0x0BU, 0x16U, 0x31U, 0x2CU, 0x97U, 0x8AU, 0xADU, 0xB0U, 0xE3U, 0xFEU, 0xD9U, 0xC4U
+};
+
+static const uint16_t crc16_ccit_zero_table [] = 
+{
+    0x0000U, 0x1021U, 0x2042U, 0x3063U, 0x4084U, 0x50A5U, 0x60C6U, 0x70E7U, 0x8108U, 0x9129U, 0xA14AU, 0xB16BU, 0xC18CU, 0xD1ADU, 0xE1CEU, 0xF1EFU,
+    0x1231U, 0x0210U, 0x3273U, 0x2252U, 0x52B5U, 0x4294U, 0x72F7U, 0x62D6U, 0x9339U, 0x8318U, 0xB37BU, 0xA35AU, 0xD3BDU, 0xC39CU, 0xF3FFU, 0xE3DEU,
+    0x2462U, 0x3443U, 0x0420U, 0x1401U, 0x64E6U, 0x74C7U, 0x44A4U, 0x5485U, 0xA56AU, 0xB54BU, 0x8528U, 0x9509U, 0xE5EEU, 0xF5CFU, 0xC5ACU, 0xD58DU,
+    0x3653U, 0x2672U, 0x1611U, 0x0630U, 0x76D7U, 0x66F6U, 0x5695U, 0x46B4U, 0xB75BU, 0xA77AU, 0x9719U, 0x8738U, 0xF7DFU, 0xE7FEU, 0xD79DU, 0xC7BCU,
+    0x48C4U, 0x58E5U, 0x6886U, 0x78A7U, 0x0840U, 0x1861U, 0x2802U, 0x3823U, 0xC9CCU, 0xD9EDU, 0xE98EU, 0xF9AFU, 0x8948U, 0x9969U, 0xA90AU, 0xB92BU,
+    0x5AF5U, 0x4AD4U, 0x7AB7U, 0x6A96U, 0x1A71U, 0x0A50U, 0x3A33U, 0x2A12U, 0xDBFDU, 0xCBDCU, 0xFBBFU, 0xEB9EU, 0x9B79U, 0x8B58U, 0xBB3BU, 0xAB1AU,
+    0x6CA6U, 0x7C87U, 0x4CE4U, 0x5CC5U, 0x2C22U, 0x3C03U, 0x0C60U, 0x1C41U, 0xEDAEU, 0xFD8FU, 0xCDECU, 0xDDCDU, 0xAD2AU, 0xBD0BU, 0x8D68U, 0x9D49U,
+    0x7E97U, 0x6EB6U, 0x5ED5U, 0x4EF4U, 0x3E13U, 0x2E32U, 0x1E51U, 0x0E70U, 0xFF9FU, 0xEFBEU, 0xDFDDU, 0xCFFCU, 0xBF1BU, 0xAF3AU, 0x9F59U, 0x8F78U,
+    0x9188U, 0x81A9U, 0xB1CAU, 0xA1EBU, 0xD10CU, 0xC12DU, 0xF14EU, 0xE16FU, 0x1080U, 0x00A1U, 0x30C2U, 0x20E3U, 0x5004U, 0x4025U, 0x7046U, 0x6067U,
+    0x83B9U, 0x9398U, 0xA3FBU, 0xB3DAU, 0xC33DU, 0xD31CU, 0xE37FU, 0xF35EU, 0x02B1U, 0x1290U, 0x22F3U, 0x32D2U, 0x4235U, 0x5214U, 0x6277U, 0x7256U,
+    0xB5EAU, 0xA5CBU, 0x95A8U, 0x8589U, 0xF56EU, 0xE54FU, 0xD52CU, 0xC50DU, 0x34E2U, 0x24C3U, 0x14A0U, 0x0481U, 0x7466U, 0x6447U, 0x5424U, 0x4405U,
+    0xA7DBU, 0xB7FAU, 0x8799U, 0x97B8U, 0xE75FU, 0xF77EU, 0xC71DU, 0xD73CU, 0x26D3U, 0x36F2U, 0x0691U, 0x16B0U, 0x6657U, 0x7676U, 0x4615U, 0x5634U,
+    0xD94CU, 0xC96DU, 0xF90EU, 0xE92FU, 0x99C8U, 0x89E9U, 0xB98AU, 0xA9ABU, 0x5844U, 0x4865U, 0x7806U, 0x6827U, 0x18C0U, 0x08E1U, 0x3882U, 0x28A3U,
+    0xCB7DU, 0xDB5CU, 0xEB3FU, 0xFB1EU, 0x8BF9U, 0x9BD8U, 0xABBBU, 0xBB9AU, 0x4A75U, 0x5A54U, 0x6A37U, 0x7A16U, 0x0AF1U, 0x1AD0U, 0x2AB3U, 0x3A92U,
+    0xFD2EU, 0xED0FU, 0xDD6CU, 0xCD4DU, 0xBDAAU, 0xAD8BU, 0x9DE8U, 0x8DC9U, 0x7C26U, 0x6C07U, 0x5C64U, 0x4C45U, 0x3CA2U, 0x2C83U, 0x1CE0U, 0x0CC1U,
+    0xEF1FU, 0xFF3EU, 0xCF5DU, 0xDF7CU, 0xAF9BU, 0xBFBAU, 0x8FD9U, 0x9FF8U, 0x6E17U, 0x7E36U, 0x4E55U, 0x5E74U, 0x2E93U, 0x3EB2U, 0x0ED1U, 0x1EF0U
+};
+
+static uint8_t crc8_table (uint8_t init_value, uint8_t data_value) 
+{
+    uint8_t crc = init_value;
+    crc = crc8_sae_j1850_table [crc ^ data_value];
+    return crc;
+}
+
+static uint16_t crc16_table (uint16_t init_value, uint8_t data_value) 
+{
+    uint16_t crc = init_value;
+    uint8_t pos = (uint8_t)((crc >> 8U) & 0xFFU) ^ data_value;
+    crc = (uint16_t)((crc << 8U) ^ crc16_ccit_zero_table [pos]);
+    return crc;
+}
+
+#else
+static uint8_t crc8_polynom (uint8_t init_value, uint8_t data_value) 
+{
+    uint8_t crc = init_value;
+    crc ^= data_value;
+    /* Shift and XOR of each byte */
+    for (uint8_t i = 0; i < 8U; i++) 
+    {
+        crc = ((crc & 0x80U) != 0U) ? (uint8_t)(crc << 1U) ^ 0x1DU : (crc << 1U);
+    }
+    return crc;
+}
+static uint16_t crc16_polynom (uint16_t init_value, uint8_t data_value) 
+{
+    uint16_t crc = init_value;
+    crc ^= (uint16_t)data_value << 8U;
+    /* Shift and XOR of each byte */
+    for (uint8_t i = 0U; i < 8U; i++) 
+    {
+        crc = ((crc & 0x8000U) != 0U) ? (uint16_t)(crc << 1U) ^ 0x1021U : (crc << 1U);
+    }
+    return crc;
+}
+#endif
+
+
+uint8_t CalculateCRC8 (const uint8_t* Crc_DataPtr, uint32_t Crc_Length, uint8_t Crc_StartValue8, bool Crc_IsFirstCall) 
+{
+    uint8_t crc = 0U;
+    uint32_t data_size = Crc_Length;
+    uint32_t data_pos = 0U;
+
+    checkf(Crc_DataPtr, TEXT("[AUTOSAR CRC16]: NULL ptr on data block"));
+    checkf(Crc_Length, TEXT("[AUTOSAR CRC16]: Data array length is zero"));
+
+    if (Crc_IsFirstCall == false) 
+    {
+        crc = Crc_StartValue8 ^ 0xFFU;
+    } 
+    else 
+    {
+        crc = 0xFFU;
+    }
+    /* Loop over data array */
+    while (data_size > 0U) 
+    {
+
+#ifdef AUTOSAR_CRC_OPTIMIZED
+        crc = crc8_table (crc, Crc_DataPtr [data_pos]);
+#else
+        crc = crc8_polynom (crc, Crc_DataPtr [data_pos]);
+#endif
+        data_pos ++;
+        data_size --;
+    }
+    crc = crc ^ 0xFFU;
+    
+    return crc;
+}
+
+uint16_t CalculateCRC16 (const uint8_t* Crc_DataPtr, uint32_t Crc_Length, uint16_t Crc_StartValue16, bool Crc_IsFirstCall) 
+{
+    uint16_t crc = 0U;
+    uint32_t data_size = Crc_Length;
+    uint32_t data_pos = 0U;
+
+    checkf(Crc_DataPtr, TEXT("[AUTOSAR CRC16]: NULL ptr on data block"));
+    checkf(Crc_Length, TEXT("[AUTOSAR CRC16]: Data array length is zero"));
+
+    if (Crc_IsFirstCall == false) 
+    {
+        crc = Crc_StartValue16;
+    } 
+    else 
+    {
+        crc = 0xFFFFU;
+    }
+    while (data_size > 0U) 
+    {
+#ifdef AUTOSAR_CRC_OPTIMIZED
+        crc = crc16_table (crc, Crc_DataPtr [data_pos]);
+#else
+        crc = crc16_polynom (crc, Crc_DataPtr [data_pos]);
+#endif
+        data_pos ++;
+        data_size --;
+    }
+    
+    return crc;
+}
diff --git a/Source/UnrealSoda/Private/Misc/AutosarCRC2.cpp b/Source/UnrealSoda/Private/Misc/AutosarCRC2.cpp
new file mode 100644
index 0000000..9cd2466
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/AutosarCRC2.cpp
@@ -0,0 +1,79 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/AutosarCRC2.h"
+
+static const uint8_t crc8_9B_table[] = 
+{
+	0x00, 0x9B, 0xAD, 0x36, 0xC1, 0x5A, 0x6C, 0xF7,
+	0x19, 0x82, 0xB4, 0x2F, 0xD8, 0x43, 0x75, 0xEE,
+	0x32, 0xA9, 0x9F, 0x04, 0xF3, 0x68, 0x5E, 0xC5,
+	0x2B, 0xB0, 0x86, 0x1D, 0xEA, 0x71, 0x47, 0xDC,
+	0x64, 0xFF, 0xC9, 0x52, 0xA5, 0x3E, 0x08, 0x93,
+	0x7D, 0xE6, 0xD0, 0x4B, 0xBC, 0x27, 0x11, 0x8A,
+	0x56, 0xCD, 0xFB, 0x60, 0x97, 0x0C, 0x3A, 0xA1,
+	0x4F, 0xD4, 0xE2, 0x79, 0x8E, 0x15, 0x23, 0xB8,
+	0xC8, 0x53, 0x65, 0xFE, 0x09, 0x92, 0xA4, 0x3F,
+	0xD1, 0x4A, 0x7C, 0xE7, 0x10, 0x8B, 0xBD, 0x26,
+	0xFA, 0x61, 0x57, 0xCC, 0x3B, 0xA0, 0x96, 0x0D,
+	0xE3, 0x78, 0x4E, 0xD5, 0x22, 0xB9, 0x8F, 0x14,
+	0xAC, 0x37, 0x01, 0x9A, 0x6D, 0xF6, 0xC0, 0x5B,
+	0xB5, 0x2E, 0x18, 0x83, 0x74, 0xEF, 0xD9, 0x42,
+	0x9E, 0x05, 0x33, 0xA8, 0x5F, 0xC4, 0xF2, 0x69,
+	0x87, 0x1C, 0x2A, 0xB1, 0x46, 0xDD, 0xEB, 0x70,
+	0x0B, 0x90, 0xA6, 0x3D, 0xCA, 0x51, 0x67, 0xFC,
+	0x12, 0x89, 0xBF, 0x24, 0xD3, 0x48, 0x7E, 0xE5,
+	0x39, 0xA2, 0x94, 0x0F, 0xF8, 0x63, 0x55, 0xCE,
+	0x20, 0xBB, 0x8D, 0x16, 0xE1, 0x7A, 0x4C, 0xD7,
+	0x6F, 0xF4, 0xC2, 0x59, 0xAE, 0x35, 0x03, 0x98,
+	0x76, 0xED, 0xDB, 0x40, 0xB7, 0x2C, 0x1A, 0x81,
+	0x5D, 0xC6, 0xF0, 0x6B, 0x9C, 0x07, 0x31, 0xAA,
+	0x44, 0xDF, 0xE9, 0x72, 0x85, 0x1E, 0x28, 0xB3,
+	0xC3, 0x58, 0x6E, 0xF5, 0x02, 0x99, 0xAF, 0x34,
+	0xDA, 0x41, 0x77, 0xEC, 0x1B, 0x80, 0xB6, 0x2D,
+	0xF1, 0x6A, 0x5C, 0xC7, 0x30, 0xAB, 0x9D, 0x06,
+	0xE8, 0x73, 0x45, 0xDE, 0x29, 0xB2, 0x84, 0x1F,
+	0xA7, 0x3C, 0x0A, 0x91, 0x66, 0xFD, 0xCB, 0x50,
+	0xBE, 0x25, 0x13, 0x88, 0x7F, 0xE4, 0xD2, 0x49,
+	0x95, 0x0E, 0x38, 0xA3, 0x54, 0xCF, 0xF9, 0x62,
+	0x8C, 0x17, 0x21, 0xBA, 0x4D, 0xD6, 0xE0, 0x7B
+};
+
+
+static uint8_t crc8_ars430_table(uint8_t init_value, uint8_t data_value) 
+{
+	uint8_t crc = init_value;
+	crc = crc8_9B_table[crc ^ data_value];
+	return crc;
+}
+
+uint8_t CalculateCRC8_2(const uint8_t* Crc_DataPtr, uint32_t Crc_Length, uint8_t Crc_StartValue8, bool Crc_IsFirstCall) 
+{
+	uint8_t crc = 0U;
+	uint32_t data_size = Crc_Length;
+	uint32_t data_pos = 0U;
+
+	if (Crc_DataPtr == NULL) {
+
+	}
+	else if (Crc_Length == 0U) {
+
+	}
+	else {
+		if (Crc_IsFirstCall == false) {
+			crc = Crc_StartValue8;
+		}
+		else {
+			crc = 0xFFU;
+		}
+		/* Loop over data array */
+		while (data_size > 0U) {
+
+			crc = crc8_ars430_table(crc, Crc_DataPtr[data_pos]);
+
+			data_pos++;
+			data_size--;
+		}
+	}
+
+	return crc;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/DatasetBluprintTools.cpp b/Source/UnrealSoda/Private/Misc/DatasetBluprintTools.cpp
new file mode 100644
index 0000000..f31c3f0
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/DatasetBluprintTools.cpp
@@ -0,0 +1,84 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/DatasetBluprintTools.h"
+#include "Soda/UnrealSoda.h"
+#include "bsoncxx/builder/stream/helpers.hpp"
+#include "bsoncxx/exception/exception.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+#include "bsoncxx/builder/stream/array.hpp"
+#include "bsoncxx/json.hpp"
+
+
+bool UDatasetRecorder::BeginRecord(const FString& ActorDatasetName, const FString& DatasetType, const FJsonObjectWrapper& Descriptor)
+{
+	Dataset.Reset();
+
+	if (soda::FDBGateway::Instance().GetStatus() != soda::EDBGatewayStatus::Connected)
+	{
+		return false;
+	}
+
+	FString JsonString;
+	if (!Descriptor.JsonObjectToString(JsonString))
+	{
+		return false;
+	}
+
+	soda::FBsonDocument Doc;
+	try
+	{
+		Doc.Document.view() = bsoncxx::from_json(bsoncxx::stdx::string_view{TCHAR_TO_UTF8(*JsonString)});
+	}
+	catch (const std::system_error& e)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UDatasetRecorder::BeginRecord(); %s"), UTF8_TO_TCHAR(e.what()));
+		return false;
+	}
+
+	Dataset = soda::FDBGateway::Instance().CreateActorDataset(ActorDatasetName, DatasetType, GetClass()->GetName(), *Doc);
+	if (!Dataset)
+	{
+		return false;
+	}
+
+	return true;
+}
+
+void UDatasetRecorder::EndRecord()
+{
+	if (Dataset)
+	{
+		Dataset->PushAsync();
+		Dataset.Reset();
+	}
+}
+
+bool UDatasetRecorder::TickDataset(const FJsonObjectWrapper& DatasetTickData)
+{
+	if (!Dataset)
+	{
+		return false;
+	}
+
+	// TODO: dont convert DatasetTickData to string. Parse JsonObject insted
+	FString JsonString;
+	if (!DatasetTickData.JsonObjectToString(JsonString))
+	{
+		return false;
+	}
+
+	Dataset->BeginRow();
+
+	try
+	{
+		Dataset->GetRowDoc().view() = bsoncxx::from_json(bsoncxx::stdx::string_view{TCHAR_TO_UTF8(*JsonString)});
+	}
+	catch (const std::system_error& e)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UDatasetRecorder::TickDataset(); %s"), UTF8_TO_TCHAR(e.what()));
+		Dataset->EndRow();
+		return false;
+	}
+	Dataset->EndRow();
+	return true;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/EditorUtils.cpp b/Source/UnrealSoda/Private/Misc/EditorUtils.cpp
new file mode 100644
index 0000000..eb8e2ce
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/EditorUtils.cpp
@@ -0,0 +1,293 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/EditorUtils.h"
+#include "Slate/SGameLayerManager.h"
+#include "Engine/EngineTypes.h"
+#include "CollisionQueryParams.h"
+#include "SceneView.h"
+#include "Engine/GameViewportClient.h"
+#include "Engine/LocalPlayer.h"
+#include "Engine/EngineTypes.h"
+
+FEditorUtils::FViewportCursorLocation::FViewportCursorLocation(const FSceneView* View, USodaGameViewportClient* InViewportClient, int32 X, int32 Y)
+	: Origin(ForceInit), Direction(ForceInit), CursorPos(X, Y)
+{
+
+	FVector4 ScreenPos = View->PixelToScreen(X, Y, 0);
+
+	const FMatrix InvViewMatrix = View->ViewMatrices.GetInvViewMatrix();
+	const FMatrix InvProjMatrix = View->ViewMatrices.GetInvProjectionMatrix();
+
+	const float ScreenX = ScreenPos.X;
+	const float ScreenY = ScreenPos.Y;
+
+	ViewportClient = InViewportClient;
+
+	//if (ViewportClient->IsPerspective())
+	{
+		Origin = View->ViewMatrices.GetViewOrigin();
+		Direction = InvViewMatrix.TransformVector(FVector(InvProjMatrix.TransformFVector4(FVector4(ScreenX * GNearClippingPlane, ScreenY * GNearClippingPlane, 0.0f, GNearClippingPlane)))).GetSafeNormal();
+	}
+	/*
+	else
+	{
+		Origin = InvViewMatrix.TransformFVector4(InvProjMatrix.TransformFVector4(FVector4(ScreenX, ScreenY, 0.5f, 1.0f)));
+		Direction = InvViewMatrix.TransformVector(FVector(0, 0, 1)).GetSafeNormal();
+	}
+	*/
+}
+
+bool FEditorUtils::AbsoluteToScreenPosition(const UGameViewportClient* ViewportClient, const FVector2D & AbsoluteCoordinate, FVector2D & OutScreenPos)
+{
+	TSharedPtr<IGameLayerManager> GameLayerManager = ViewportClient->GetGameLayerManager();
+	if (GameLayerManager.IsValid())
+	{
+		FVector2D ViewportSize;
+		ViewportClient->GetViewportSize(ViewportSize);
+		const FGeometry& ViewportGeometry = GameLayerManager->GetViewportWidgetHostGeometry();
+		const FVector2D ViewportPosition = ViewportGeometry.AbsoluteToLocal(AbsoluteCoordinate);
+		OutScreenPos = (ViewportPosition / ViewportGeometry.GetLocalSize()) * ViewportSize;
+		return true;
+	}
+	return false;
+}
+
+void FEditorUtils::DeprojectScreenToWorld(const FVector2D& ScreenPos, const FIntRect& ViewRect, const FMatrix& InvViewProjMatrix, FVector& out_WorldOrigin, FVector& out_WorldDirection)
+{
+	float PixelX = ScreenPos.X;
+	float PixelY = ScreenPos.Y;
+
+	// Get the eye position and direction of the mouse cursor in two stages (inverse transform projection, then inverse transform view).
+	// This avoids the numerical instability that occurs when a view matrix with large translation is composed with a projection matrix
+
+	// Get the pixel coordinates into 0..1 normalized coordinates within the constrained view rectangle
+	const float NormalizedX = (PixelX - ViewRect.Min.X) / ((float)ViewRect.Width());
+	const float NormalizedY = (PixelY - ViewRect.Min.Y) / ((float)ViewRect.Height());
+
+	// Get the pixel coordinates into -1..1 projection space
+	const float ScreenSpaceX = (NormalizedX - 0.5f) * 2.0f;
+	const float ScreenSpaceY = ((1.0f - NormalizedY) - 0.5f) * 2.0f;
+
+	// The start of the ray trace is defined to be at mousex,mousey,1 in projection space (z=1 is near, z=0 is far - this gives us better precision)
+	// To get the direction of the ray trace we need to use any z between the near and the far plane, so let's use (mousex, mousey, 0.5)
+	// !!! But here we changed 0.5 to 0.01 compared to the original code
+	const FVector4 RayStartProjectionSpace = FVector4(ScreenSpaceX, ScreenSpaceY, 1.0f, 1.0f);
+	const FVector4 RayEndProjectionSpace = FVector4(ScreenSpaceX, ScreenSpaceY, 0.01f, 1.0f);
+
+	// Projection (changing the W coordinate) is not handled by the FMatrix transforms that work with vectors, so multiplications
+	// by the projection matrix should use homogeneous coordinates (i.e. FPlane).
+	const FVector4 HGRayStartWorldSpace = InvViewProjMatrix.TransformFVector4(RayStartProjectionSpace);
+	const FVector4 HGRayEndWorldSpace = InvViewProjMatrix.TransformFVector4(RayEndProjectionSpace);
+	FVector RayStartWorldSpace(HGRayStartWorldSpace.X, HGRayStartWorldSpace.Y, HGRayStartWorldSpace.Z);
+	FVector RayEndWorldSpace(HGRayEndWorldSpace.X, HGRayEndWorldSpace.Y, HGRayEndWorldSpace.Z);
+	// divide vectors by W to undo any projection and get the 3-space coordinate
+	if (HGRayStartWorldSpace.W != 0.0f)
+	{
+		RayStartWorldSpace /= HGRayStartWorldSpace.W;
+	}
+	if (HGRayEndWorldSpace.W != 0.0f)
+	{
+		RayEndWorldSpace /= HGRayEndWorldSpace.W;
+	}
+	const FVector RayDirWorldSpace = (RayEndWorldSpace - RayStartWorldSpace).GetSafeNormal();
+
+	// Finally, store the results in the outputs
+	out_WorldOrigin = RayStartWorldSpace;
+	out_WorldDirection = RayDirWorldSpace;
+}
+
+bool FEditorUtils::DeprojectScreenToWorld(const ULocalPlayer* LocalPlayer, const FVector2D& ScreenPos, FVector& WorldPosition, FVector& WorldDirection)
+{
+	if (LocalPlayer && LocalPlayer->ViewportClient)
+	{
+		// get the projection data
+		FSceneViewProjectionData ProjectionData;
+		if (LocalPlayer->GetProjectionData(LocalPlayer->ViewportClient->Viewport, ProjectionData))
+		{
+			FMatrix const InvViewProjMatrix = ProjectionData.ComputeViewProjectionMatrix().Inverse();
+			DeprojectScreenToWorld(ScreenPos, ProjectionData.GetConstrainedViewRect(), InvViewProjMatrix, WorldPosition, WorldDirection);
+			return true;
+		}
+	}
+
+	// something went wrong, zero things and return false
+	WorldPosition = FVector::ZeroVector;
+	WorldDirection = FVector::ZeroVector;
+	return false;
+}
+
+FEditorUtils::FActorPositionTraceResult FEditorUtils::TraceWorldForPosition(const UWorld* InWorld, const FVector& RayStart, const FVector& RayEnd, const TArray<AActor*>* IgnoreActors)
+{
+	TArray<FHitResult> Hits;
+
+	FCollisionQueryParams Param(SCENE_QUERY_STAT(DragDropTrace), true);
+
+	if (IgnoreActors)
+	{
+		Param.AddIgnoredActors(*IgnoreActors);
+	}
+
+	FActorPositionTraceResult Results;
+	if (InWorld->LineTraceMultiByObjectType(Hits, RayStart, RayEnd, FCollisionObjectQueryParams(FCollisionObjectQueryParams::InitType::AllObjects), Param))
+	{
+		// Go through all hits and find closest
+		float ClosestHitDistanceSqr = TNumericLimits<float>::Max();
+
+		for (const FHitResult& Hit : Hits)
+		{
+			const float DistanceToHitSqr = (Hit.ImpactPoint - RayStart).SizeSquared();
+			if (DistanceToHitSqr < ClosestHitDistanceSqr)
+			{
+				ClosestHitDistanceSqr = DistanceToHitSqr;
+				Results.Location = Hit.Location;
+				Results.SurfaceNormal = Hit.Normal.GetSafeNormal();
+				Results.State = FActorPositionTraceResult::HitSuccess;
+				Results.HitActor = Hit.HitObjectHandle.GetManagingActor();
+			}
+		}
+	}
+
+	if (Results.State == FActorPositionTraceResult::Failed)
+	{
+		Results.State = FActorPositionTraceResult::Default;
+		const float DistanceMultiplier = 20000; // And put it in front of the camera
+		Results.Location =  RayStart  + (RayEnd - RayStart).GetSafeNormal() * DistanceMultiplier;
+	}
+
+	return Results;
+}
+
+FEditorUtils::FActorPositionTraceResult FEditorUtils::TraceWorldForPosition(const UWorld* InWorld, const FVector2D& ScreenPos, const TArray<AActor*>* IgnoreActors)
+{
+	FVector Origin;
+	FVector Direction;
+	if (!DeprojectScreenToWorld(InWorld, ScreenPos, Origin, Direction))
+	{
+		return FEditorUtils::FActorPositionTraceResult();
+	}
+
+	const FVector RayEnd = Origin + Direction * HALF_WORLD_MAX;
+
+	return TraceWorldForPosition(InWorld, Origin, RayEnd, IgnoreActors);
+}
+
+
+bool FEditorUtils::DeprojectScreenToWorld(const UWorld* InWorld, const FVector2D& ScreenPos, FVector& Origin, FVector& Direction)
+{
+	if (!InWorld)
+	{
+		return false;
+	}
+
+	ULocalPlayer* LocalPlayer = InWorld->GetFirstLocalPlayerFromController();
+	if (!LocalPlayer)
+	{
+		return false;
+	}
+
+	/*
+	UGameViewportClient* ViewportClient = InWorld->GetGameViewport();
+	if (!ViewportClient)
+	{
+		return false;
+	}
+
+	
+	FSceneViewFamilyContext ViewFamily(
+		FSceneViewFamily::ConstructionValues(
+			ViewportClient->Viewport,
+			InWorld->Scene,
+			ViewportClient->EngineShowFlags)
+	);
+
+	FVector OutViewLocation;
+	FRotator OutViewRotation;
+	FSceneView* View = LocalPlayer->CalcSceneView(
+		&ViewFamily,
+		OutViewLocation,
+		OutViewRotation,
+		ViewportClient->Viewport
+	);
+
+	if (!View)
+	{
+		return false;
+	}
+	*/
+
+	/*
+	FSceneViewProjectionData ProjectionData;
+	if (!LocalPlayer->GetProjectionData(LocalPlayer->ViewportClient->Viewport, ProjectionData))
+	{
+		return false;
+	}
+	*/
+
+	if (!DeprojectScreenToWorld(LocalPlayer, ScreenPos, Origin, Direction))
+	{
+		return false;
+	}
+
+	return true;
+}
+
+FName FEditorUtils::MakeUniqueObjectName(UObject* Parent, const UClass* Class, FName InBaseName)
+{
+	check(Class && Parent);
+
+	if (InBaseName != NAME_None)
+	{
+		if (!StaticFindObjectFast(NULL, Parent, InBaseName))
+		{
+			return InBaseName;
+		}
+	}
+
+	FName BaseName;
+
+	if (InBaseName == NAME_None)
+	{
+		if (Class->HasAnyClassFlags(CLASS_CompiledFromBlueprint))
+		{
+			FString StrName = Class->GetFName().ToString();
+			StrName.RemoveFromEnd(TEXT("_C"), ESearchCase::CaseSensitive);
+			BaseName = FName(*StrName);
+		}
+		else
+		{
+			BaseName = Class->GetFName();
+		}
+	}
+	else
+	{
+		BaseName = InBaseName;
+	}
+
+	FName TestName;
+	UObject* ExistingObject;
+	do
+	{
+		int32 NameNumber = 0;
+		NameNumber = UpdateSuffixForNextNewObject(Parent, Class, [](int32& Index) { ++Index; });
+		TestName = FName(BaseName, NameNumber);
+		ExistingObject = StaticFindObjectFast(NULL, Parent, TestName);
+	} while (ExistingObject);
+
+	return TestName;
+}
+
+AActor* FEditorUtils::FindOuterActor(const UObject* InObject)
+{
+	for (UObject* Outer = InObject->GetOuter(); Outer != nullptr; Outer = Outer->GetOuter())
+	{
+		if (AActor* Actor = Cast<AActor>(Outer))
+		{
+			return Actor;
+		}
+		if (UActorComponent* Component = Cast<UActorComponent>(Outer))
+		{
+			return Component->GetOwner();
+		}
+	}
+	return nullptr;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/ExtraWindow.cpp b/Source/UnrealSoda/Private/Misc/ExtraWindow.cpp
new file mode 100644
index 0000000..ed63880
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/ExtraWindow.cpp
@@ -0,0 +1,72 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/ExtraWindow.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Brushes/SlateImageBrush.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/SWindow.h"
+
+UExtraWindow::UExtraWindow(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+UExtraWindow::~UExtraWindow()
+{
+	if (ExtraWindow.IsValid())
+		ExtraWindow->DestroyWindowImmediately();
+}
+
+void UExtraWindow::Close()
+{
+	if (ExtraWindow.IsValid())
+		ExtraWindow->RequestDestroyWindow();
+}
+
+void UExtraWindow::OnWindowClosed(const TSharedRef<SWindow>& Window)
+{
+	ExtraWindow.Reset();
+}
+
+void UExtraWindow::OpenCameraWindow(UTextureRenderTarget2D* NewTextureTarget)
+{
+	if (ExtraWindow.IsValid()) // is window opened
+		return;
+
+	if (NewTextureTarget == nullptr)
+		return;
+
+	float SizeX = NewTextureTarget->SizeX;
+	float SizeY = NewTextureTarget->SizeY;
+	const FSlateBrush* Brush = new FSlateImageBrush(NewTextureTarget, FVector2D(SizeX, SizeY));
+
+	float Coef = FMath::Max(SizeX, SizeY) / 1024.f;
+	if (Coef > 1.f) // if max image side exceeds 1024 pixels
+	{
+		SizeX /= Coef;
+		SizeY /= Coef;
+	}
+	TSharedRef<SWindow> WindowRef = SNew(SWindow).Visibility(EVisibility::Visible)
+		.ClientSize(FVector2D(SizeX, SizeY))
+		.SizingRule(ESizingRule::UserSized)
+		[
+			SNew(SImage).Image(Brush)
+		];
+	ExtraWindow = WindowRef;
+	FSlateApplication::Get().AddWindow(WindowRef, true);
+	ExtraWindow->GetOnWindowClosedEvent().AddUObject(this, &UExtraWindow::OnWindowClosed);
+}
+
+void UExtraWindow::OpenWidgetWindow(TSharedRef<SWidget> NewWidget)
+{
+	if (ExtraWindow.IsValid()) // is window opened
+		return;
+	TSharedRef<SWindow> WindowRef = SNew(SWindow).Visibility(EVisibility::Visible)
+		.SizingRule(ESizingRule::Autosized)
+		[
+			NewWidget
+		];
+	ExtraWindow = WindowRef;
+	FSlateApplication::Get().AddWindow(WindowRef, true);
+	ExtraWindow->GetOnWindowClosedEvent().AddUObject(this, &UExtraWindow::OnWindowClosed);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/GroundScaner.cpp b/Source/UnrealSoda/Private/Misc/GroundScaner.cpp
new file mode 100644
index 0000000..5360d94
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/GroundScaner.cpp
@@ -0,0 +1,251 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/GroundScaner.h"
+#include "Soda/UnrealSoda.h"
+#include "DrawDebugHelpers.h"
+#include <algorithm>
+#include "Soda/Misc/SodaPhysicsInterface.h"
+
+DECLARE_STATS_GROUP(TEXT("GroundScaner"), STATGROUP_GroundScaner, STATGROUP_Advanced);
+DECLARE_CYCLE_STAT(TEXT("Scan"), STAT_Scan, STATGROUP_GroundScaner);
+
+
+static inline FVector ToVector(const FVector2D & V, float Z = 0) { return FVector(V.X, V.Y, Z); }
+static inline FVector2D ToVector2D(const FVector & V) { return FVector2D(V.X, V.Y); }
+
+static inline void DrawDebugRect(
+	const UWorld * InWorld,
+	FVector const& Center,
+	FVector2D const& Extent,
+	float Yaw,
+	FColor const& Color,
+	bool bPersistentLines,
+	float LifeTime,
+	uint8 DepthPriority,
+	float Thickness
+) 
+{
+	FVector Pt1 = ToVector(FVector2D(Extent.X, Extent.Y).GetRotated(Yaw)) + Center;
+	FVector Pt2 = ToVector(FVector2D(Extent.X, -Extent.Y).GetRotated(Yaw)) + Center;
+	FVector Pt3 = ToVector(FVector2D(-Extent.X, -Extent.Y).GetRotated(Yaw)) + Center;
+	FVector Pt4 = ToVector(FVector2D(-Extent.X, Extent.Y).GetRotated(Yaw)) + Center;
+
+	DrawDebugLine(InWorld, Pt1, Pt2, Color, bPersistentLines, LifeTime, DepthPriority, Thickness);
+	DrawDebugLine(InWorld, Pt2, Pt3, Color, bPersistentLines, LifeTime, DepthPriority, Thickness);
+	DrawDebugLine(InWorld, Pt3, Pt4, Color, bPersistentLines, LifeTime, DepthPriority, Thickness);
+	DrawDebugLine(InWorld, Pt4, Pt1, Color, bPersistentLines, LifeTime, DepthPriority, Thickness);
+}
+
+UGroundScaner::UGroundScaner(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void UGroundScaner::BeginDestroy()
+{
+	Super::BeginDestroy();
+	//UE_LOG(LogSoda, Error, TEXT("UGroundScaner::BeginDestroy()"));
+}
+
+bool UGroundScaner::Scan(const FVector & Position, const FVector & Size, float Yaw)
+{
+	SCOPE_CYCLE_COUNTER(STAT_Scan);
+
+	
+	if(Size.X / MeshStepX > 200 || Size.Y / MeshStepY > 200)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UGroundScaner::Scan(); Map size (%f or %f) > 200"), Size.X / MeshStepX, Size.Y / MeshStepY );
+		return false;
+	}
+
+	FVector2D Bbox1 =  FVector2D(Size.X / 2 , Size.Y / 2).GetRotated(Yaw);
+	FVector2D Bbox2 =  FVector2D(-Size.X / 2 , Size.Y / 2).GetRotated(Yaw);
+
+	int HalfWidth = Floor(std::max(std::abs(Bbox1.X), std::abs(Bbox2.X)) / MeshStepX);
+	int HalfLength = Floor(std::max(std::abs(Bbox1.Y), std::abs(Bbox2.Y)) / MeshStepY);
+
+	int TmpX0 = Floor(Position.X / MeshStepX - HalfWidth);
+	int TmpY0 = Floor(Position.Y / MeshStepY - HalfLength);
+	
+	int TmpWidth = HalfWidth * 2 + 1;
+	int TmpLength = HalfLength * 2 + 1;
+
+	TmpMap.SetNum(TmpWidth * TmpLength, false);
+
+	TArray<FVector> Start;
+	TArray<FVector> End;
+	Start.Reserve(TmpLength * TmpWidth);
+	End.Reserve(TmpLength * TmpWidth);
+
+	for (int Y = 0; Y < TmpLength; ++Y) 
+	{ 
+		for (int X = 0; X < TmpWidth; ++X) 
+		{ 
+			FVector2D CheckPt = FVector2D((X - HalfWidth) * MeshStepX, (Y - HalfLength) * MeshStepY).GetRotated(-Yaw);
+			FVector Pt((X + TmpX0) * MeshStepX, (Y + TmpY0) * MeshStepY, Position.Z + Size.Z / 2.0);
+			if( CheckPt.X <=  Size.X/2  && CheckPt.X >= -Size.X/2  && CheckPt.Y <=  Size.Y/2  && CheckPt.Y >= -Size.Y/2 )
+			{
+				Start.Push({ Pt.X + 0.1f, Pt.Y + 0.1f, Pt.Z });
+				End.Push(Start.Last() + FVector(0, 0, -Size.Z));
+				TmpMap[Y * TmpWidth + X].Valid = true;
+			}
+			else
+			{
+				TmpMap[Y * TmpWidth + X].Valid = false;
+			}
+			TmpMap[Y * TmpWidth + X].Value = Pt;
+		} 
+	} 
+
+	TArray<FHitResult> OutHits;
+	{
+		//SCOPE_CYCLE_COUNTER(STAT_BatchExecute);
+
+		FSodaPhysicsInterface::RaycastSingleScope(
+			GetWorld(), OutHits, Start, End,
+			CollisionChannel,
+			CollisionQueryParams,
+			CollisionResponseParams,
+			CollisionObjectQueryParams);
+
+	};
+	check(OutHits.Num() == Start.Num());
+	
+	Mutex.lock();
+	X0 = TmpX0;
+	Y0 = TmpY0;
+	Width = TmpWidth;
+	Length = TmpLength;
+	Map.SetNum(Width * Length, false);
+	for (int i=0, j=0; i < Map.Num(); ++i) 
+	{ 
+		Map[i] = TmpMap[i];
+		if(Map[i].Valid)
+		{
+			if(OutHits[j].bBlockingHit)
+			{
+				Map[i].Value.Z = OutHits[j].Location.Z;
+			}
+			else
+			{
+				Map[i].Valid = false;
+			}
+			++j;
+		}
+	}
+	Mutex.unlock();
+
+	if(bDrawDebug)
+	{
+		UWorld* World = GetWorld();
+		check(World);
+
+		float fHalfWidth = std::max(std::abs(Bbox1.X), std::abs(Bbox2.X));
+		float fHalfLength = std::max(std::abs(Bbox1.Y), std::abs(Bbox2.Y));
+
+		DrawDebugRect(World, Position, ToVector2D(Size / 2) , Yaw, FColor(0, 255, 0), false, -1.f, 0, 2.f);
+		DrawDebugBox(World, Position, Size / 2, FRotator(0.f, Yaw, 0.f).Quaternion(), FColor(0, 255, 0), false, -1.f, 0, 2.f);
+		DrawDebugRect(World, Position, FVector2D(fHalfWidth, fHalfLength), 0, FColor(0, 0, 255), false, -1.f, 0, 2.f);
+		
+		for (auto& Pt : Map)
+		{
+			if (Pt.Valid)
+			{
+				DrawDebugPoint(World, Pt.Value, 5.f, FColor(0, 255, 0), false, -1.f, 0);
+			}
+		}
+	}
+
+	return true;
+
+}
+
+bool UGroundScaner::Scan(const FPhysBodyKinematic & VehicleKinematic, float DeltaTime)
+{
+	while(DtStat.size() < RenderTimeHistorySize) DtStat.push_back(0.5);
+	DtStat.push_back(DeltaTime);
+	DtStat.pop_front();
+	float MaxDeltaTime = DtStat[0];
+	for(auto & el : DtStat) MaxDeltaTime = std::max(el, MaxDeltaTime);
+	MaxDeltaTime += RenderTimeExtra;
+
+	if(MaxDeltaTime > 0.5) MaxDeltaTime = 0.5;
+	
+	FTransform NextWorldPose;
+	VehicleKinematic.EstimatePose(MaxDeltaTime, NextWorldPose);
+	FVector Pt1 = VehicleKinematic.Curr.GlobalPose.TransformPosition(FVector(WheelBase/2, 0.f, 0.f));
+	FVector Pt2 = NextWorldPose.TransformPosition(FVector(WheelBase/2, 0.f, 0.f));
+	FVector BodySize = FVector(WheelBase, TrackWidth, ScanHeight);
+	float Yaw = VehicleKinematic.Curr.GlobalPose.Rotator().Yaw;
+
+	float dYaw = NextWorldPose.Rotator().Yaw - Yaw;
+	FVector2D Shift = ToVector2D(Pt2 - Pt1).GetRotated(-Yaw);
+	FVector2D Points[8];
+	Points[0] = FVector2D(BodySize.X/2, BodySize.Y/2);
+	Points[1] = FVector2D(BodySize.X/2, -BodySize.Y/2);
+	Points[2] = FVector2D(-BodySize.X/2, -BodySize.Y/2);
+	Points[3] = FVector2D(-BodySize.X/2, BodySize.Y/2);
+	Points[4] = Points[0].GetRotated(dYaw) + Shift;
+	Points[5] = Points[1].GetRotated(dYaw) + Shift;
+	Points[6] = Points[2].GetRotated(dYaw) + Shift;
+	Points[7] = Points[3].GetRotated(dYaw) + Shift;
+
+	double MinX = FLT_MAX, MaxX = -FLT_MAX, MinY = FLT_MAX, MaxY = -FLT_MAX;
+	for(const auto & el : Points)
+	{
+		MinX = std::min(el.X, MinX);
+		MinY = std::min(el.Y, MinY);
+		MaxX = std::max(el.X, MaxX);
+		MaxY = std::max(el.Y, MaxY);
+	}
+
+	FVector Center = ToVector(FVector2D((MinX + MaxX) / 2, (MinY + MaxY) / 2).GetRotated(Yaw)) + Pt1;
+	FVector Size(MaxX - MinX + Border * 2, MaxY - MinY + Border * 2, ScanHeight);
+	if(!Scan(Center, Size, VehicleKinematic.Curr.GlobalPose.Rotator().Yaw))
+	{
+		return false;
+	}
+
+	if(bDrawDebug)
+	{
+		float NextYaw = NextWorldPose.Rotator().Yaw;
+
+		DrawDebugRect(GetWorld(), Pt1, FVector2D(BodySize.X/2, BodySize.Y/2), Yaw, FColor(255, 0, 0), false, -1.f, 0, 2.f);
+		DrawDebugRect(GetWorld(), Pt2, FVector2D(BodySize.X/2, BodySize.Y/2), NextYaw, FColor(255, 0, 0), false, -1.f, 0, 2.f);
+	}	
+
+	return true;
+}
+
+bool UGroundScaner::GetHeight(float X, float Y, float & Height)
+{
+	std::unique_lock<std::mutex> Locker(Mutex);
+
+	int X1 = (int)(X / MeshStepX - X0);
+	int X2 = (int)(X / MeshStepX - X0 + 1.0);
+	int Y1 = (int)(Y / MeshStepY - Y0);
+	int Y2 = (int)(Y / MeshStepY - Y0 + 1.0);
+	float nX = X / MeshStepX - X0;
+	float nY = Y / MeshStepY - Y0;
+
+	if( X1 < 0 || Y1 < 0 || X1 >= Width || Y1 >= Length || X2 < 0 || Y2 < 0 || X2 >= Width || Y2 >= Length)
+	{
+		return false;
+	}
+
+	auto & Q11 = Map[Y1 * Width + X1];
+	auto & Q12 = Map[Y2 * Width + X1];
+	auto & Q21 = Map[Y1 * Width + X2];
+	auto & Q22 = Map[Y2 * Width + X2];
+
+	if(Q11.Valid && Q12.Valid && Q21.Valid && Q22.Valid)
+	{
+		Height = BilinearInterpolation(Q11.Value.Z, Q12.Value.Z, Q21.Value.Z, Q22.Value.Z, X1, X2, Y1, Y2, nX, nY);
+	}
+	else
+	{
+		return false;
+	}
+
+	return true;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/JsonArchive.cpp b/Source/UnrealSoda/Private/Misc/JsonArchive.cpp
new file mode 100644
index 0000000..014edea
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/JsonArchive.cpp
@@ -0,0 +1,331 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/JsonArchive.h"
+#include "Soda/UnrealSodaVersion.h"
+#include "Soda/UnrealSoda.h"
+#include "JsonObjectConverter.h"
+#include "Misc/FileHelper.h"
+#include "GameFramework/Actor.h"
+#include "Components/SceneComponent.h"
+
+FJsonArchive::FJsonArchive()
+{
+	RootJsonObject = MakeShareable(new FJsonObject());
+}
+
+bool FJsonArchive::LoadFromString(const FString& JsonString)
+{
+	TSharedRef<TJsonReader<TCHAR>> Reader = TJsonReaderFactory<TCHAR>::Create(*JsonString);
+	if (!FJsonSerializer::Deserialize(Reader, RootJsonObject))
+	{
+		UE_LOG(LogSoda, Warning, TEXT("FJsonArchive::LoadFromString(); Can't deserialize"));
+		return false;
+	}
+
+	return PostLoad();
+}
+
+bool FJsonArchive::SaveToString(FString& JsonString)
+{
+	TSharedRef< TJsonWriter<> > Writer = TJsonWriterFactory<>::Create(&JsonString);
+	if (!FJsonSerializer::Serialize(RootJsonObject.ToSharedRef(), Writer))
+	{
+		UE_LOG(LogSoda, Error, TEXT("FJsonArchive::SaveToString(); Can't serialize"));
+		return false;
+	}
+	return true;
+}
+
+bool FJsonArchive::LoadFromFile(const FString& FileName)
+{
+	FString JsonString;
+	if (!FFileHelper::LoadFileToString(JsonString, *FileName))
+	{
+		UE_LOG(LogSoda, Warning, TEXT("FJsonArchive::LoadFromFile(); Can't read '%s' file"), *FileName);
+		return false;
+	}
+
+	return LoadFromString(JsonString);
+}
+
+bool FJsonArchive::SaveToFile(const FString& FileName)
+{
+	FString JsonString;
+	if (!SaveToString(JsonString))
+	{
+		return false;
+	}
+
+	if (!FFileHelper::SaveStringToFile(JsonString, *FileName))
+	{
+		UE_LOG(LogSoda, Error, TEXT("FJsonArchive::SaveToFile(); Can't write to '%s' file"), *FileName);
+		return false;
+	}
+
+	return true;
+}
+
+TSharedPtr<FJsonObject> FJsonArchive::UObjectToJsonObject(const UObject* InObject)
+{
+	if (!IsValid(InObject))
+	{
+		return TSharedPtr<FJsonObject>();
+	}
+
+	TSharedRef<FJsonObject> JsonObject = MakeShared<FJsonObject>();
+	if (FJsonObjectConverter::UStructToJsonObject(InObject->GetClass(), InObject, JsonObject, CPF_SaveGame, 0))
+	{
+		JsonObject->SetField(TEXT("__class__"), ClassToJsonValue(InObject->GetClass()));
+		JsonObject->SetStringField(TEXT("__name__"), InObject->GetName());
+
+		const USceneComponent* SceneComponent = nullptr;
+		if (const AActor* Actor = Cast<AActor>(InObject))
+		{
+			SceneComponent = Actor->GetRootComponent();
+		}
+		else
+		{
+			SceneComponent = Cast<USceneComponent>(InObject);
+		}
+		if (SceneComponent)
+		{
+			JsonObject->SetField(TEXT("__location__"), VectorToJsonValue(SceneComponent->GetRelativeLocation()));
+			JsonObject->SetField(TEXT("__rotation__"), RotatorToJsonValue(SceneComponent->GetRelativeRotation()));
+			JsonObject->SetField(TEXT("__scale3D__"), VectorToJsonValue(SceneComponent->GetRelativeScale3D()));
+		}
+
+		return JsonObject;
+	}
+	return TSharedPtr<FJsonObject>(); // something went wrong
+}
+
+
+bool FJsonArchive::JsonObjectToUObject(const TSharedRef<FJsonObject>& JsonObject, UObject* OutObject, bool bTransform)
+{
+	if (!IsValid(OutObject))
+	{
+		return false;
+	}
+
+	if (!FJsonObjectConverter::JsonObjectToUStruct(JsonObject, OutObject->GetClass(), OutObject, CPF_SaveGame, 0))
+	{
+		return false;
+	}
+
+	if (bTransform)
+	{
+		USceneComponent* SceneComponent = nullptr;
+		if (AActor* Actor = Cast<AActor>(OutObject))
+		{
+			SceneComponent = Actor->GetRootComponent();
+		}
+		else
+		{
+			SceneComponent = Cast<USceneComponent>(OutObject);
+			if (SceneComponent && SceneComponent->GetOwner() && SceneComponent->GetOwner()->GetRootComponent() == SceneComponent)
+			{
+				SceneComponent = nullptr;
+			}
+		}
+		if (SceneComponent)
+		{
+			TSharedPtr<FJsonValue> LocationValue = JsonObject->TryGetField(TEXT("__location__"));
+			TSharedPtr<FJsonValue> RotationValue = JsonObject->TryGetField(TEXT("__rotation__"));
+			TSharedPtr<FJsonValue> ScaleValue = JsonObject->TryGetField(TEXT("__scale3D__"));
+
+			if (LocationValue && RotationValue && ScaleValue)
+			{
+				FVector Location = JsonValueToVector(LocationValue);
+				FRotator Rotator = JsonValueToRotator(RotationValue);
+				FVector Scale = JsonValueToVector(ScaleValue);
+
+				SceneComponent->SetRelativeLocation(Location, false, nullptr, ETeleportType::ResetPhysics);
+				SceneComponent->SetRelativeRotation(Rotator, false, nullptr, ETeleportType::ResetPhysics);
+				SceneComponent->SetRelativeScale3D(Scale);
+			}
+		}
+	}
+
+	return true;
+}
+
+UClass* FJsonArchive::GetObjectClass(const TSharedPtr<FJsonObject>& Object)
+{
+	ClassHelper = nullptr;
+	TSharedPtr<FJsonValue> ClassValue = Object->TryGetField(TEXT("__class__"));
+	if (!ClassValue)
+	{
+		return nullptr;
+	}
+
+	return JsonValueToClass(ClassValue);
+}
+
+FString FJsonArchive::GetObjectName(const TSharedPtr<FJsonObject>& Object)
+{
+	FString Name;
+	if (Object->TryGetStringField(TEXT("__name__"), Name))
+	{
+		return Name;
+	}
+
+	return FString();
+}
+
+TSharedRef<FJsonValue> FJsonArchive::ClassToJsonValue(const UClass* Class)
+{
+	ClassHelper = const_cast<UClass*>(Class);
+	FProperty* ClassProperty = StaticStruct()->FindPropertyByName(TEXT("ClassHelper"));
+	check(ClassProperty);
+	const void* Value = ClassProperty->ContainerPtrToValuePtr<uint8>(this);
+	return FJsonObjectConverter::UPropertyToJsonValue(ClassProperty, Value, 0, 0).ToSharedRef();
+}
+
+TSharedRef<FJsonValue> FJsonArchive::VectorToJsonValue(const FVector& Vector)
+{
+	VectorHelper = Vector;
+	FProperty* ClassProperty = StaticStruct()->FindPropertyByName(TEXT("VectorHelper"));
+	check(ClassProperty);
+	const void* Value = ClassProperty->ContainerPtrToValuePtr<uint8>(this);
+	return FJsonObjectConverter::UPropertyToJsonValue(ClassProperty, Value, 0, 0).ToSharedRef();
+}
+
+TSharedRef<FJsonValue> FJsonArchive::RotatorToJsonValue(const FRotator& Rotator)
+{
+	RotatorHelper = Rotator;
+	FProperty* ClassProperty = StaticStruct()->FindPropertyByName(TEXT("RotatorHelper"));
+	check(ClassProperty);
+	const void* Value = ClassProperty->ContainerPtrToValuePtr<uint8>(this);
+	return FJsonObjectConverter::UPropertyToJsonValue(ClassProperty, Value, 0, 0).ToSharedRef();
+}
+
+UClass* FJsonArchive::JsonValueToClass(const TSharedPtr<FJsonValue>& ClassJsonValue)
+{
+	FProperty* Property = StaticStruct()->FindPropertyByName(TEXT("ClassHelper"));
+	check(Property);
+	void* Value = Property->ContainerPtrToValuePtr<uint8>(this);
+	if (!FJsonObjectConverter::JsonValueToUProperty(ClassJsonValue, Property, Value, 0, 0))
+	{
+		return nullptr;
+	}
+	return ClassHelper;
+}
+
+FVector FJsonArchive::JsonValueToVector(const TSharedPtr<FJsonValue>& VectorJsonValue)
+{
+	FProperty* Property = StaticStruct()->FindPropertyByName(TEXT("VectorHelper"));
+	check(Property);
+	void* Value = Property->ContainerPtrToValuePtr<uint8>(this);
+	if (!FJsonObjectConverter::JsonValueToUProperty(VectorJsonValue, Property, Value, 0, 0))
+	{
+		return FVector::ZeroVector;
+	}
+	return VectorHelper;
+}
+
+FRotator FJsonArchive::JsonValueToRotator(const TSharedPtr<FJsonValue>& RotatorJsonValue)
+{
+	FProperty* Property = StaticStruct()->FindPropertyByName(TEXT("RotatorHelper"));
+	check(Property);
+	void* Value = Property->ContainerPtrToValuePtr<uint8>(this);
+	if (!FJsonObjectConverter::JsonValueToUProperty(RotatorJsonValue, Property, Value, 0, 0))
+	{
+		return FRotator::ZeroRotator;
+	}
+	return RotatorHelper;
+}
+
+bool FJsonArchive::DeserializeObject(UObject* Object)
+{
+	return JsonObjectToUObject(RootJsonObject.ToSharedRef(), Object, false);
+}
+
+bool FJsonArchive::SerializeObject(const UObject* Object)
+{
+	RootJsonObject = UObjectToJsonObject(Object);
+	return !!RootJsonObject;
+}
+
+FJsonActorArchive::FJsonActorArchive()
+{
+	Components = MakeShareable(new FJsonObject());
+	RootJsonObject->SetObjectField(TEXT("__components__"), Components);
+}
+
+bool FJsonActorArchive::PostLoad()
+{
+	const TSharedPtr<FJsonObject>* ComponentsJsonObject;
+	if (!RootJsonObject->TryGetObjectField(TEXT("__components__"), ComponentsJsonObject))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::ImportVehicleFromJson(); Vehicle dosen't contain __components__"));
+		return false;
+	}
+	Components = *ComponentsJsonObject;
+	return true;
+}
+
+bool FJsonActorArchive::DeserializeActor(AActor* OutActor, bool bWithComponents)
+{
+	if (!JsonObjectToUObject(RootJsonObject.ToSharedRef(), OutActor, false))
+	{
+		return false;
+	}
+
+	if (bWithComponents)
+	{
+		const TSet<UActorComponent*>& ActorComponents = OutActor->GetComponents();
+		for (auto* Component : ActorComponents)
+		{
+			DeserializeComponent(Component);
+		}
+	}
+
+	return true;
+}
+
+bool FJsonActorArchive::SerializeActor(const AActor* OutActor, bool bWithComponents)
+{
+	RootJsonObject = UObjectToJsonObject(OutActor);
+	if (!RootJsonObject)
+	{
+		return false;
+	}
+
+	RootJsonObject->SetStringField(TEXT("__unreal_soda_ver__"), UNREALSODA_VERSION_STRING);
+	RootJsonObject->SetObjectField(TEXT("__components__"), Components);
+
+	if (bWithComponents)
+	{
+		const TSet<UActorComponent*>& ActorComponents = OutActor->GetComponents();
+		for (auto* Component : ActorComponents)
+		{
+			SerializeActorComponent(Component);
+		}
+	}
+
+	return (RootJsonObject.Get() != nullptr);
+}
+
+bool FJsonActorArchive::DeserializeComponent(UActorComponent* ActorComponent)
+{
+	if (TSharedPtr<FJsonValue>* JsonValue = Components->Values.Find(ActorComponent->GetName()))
+	{
+		TSharedPtr<FJsonObject> JsonObject = (*JsonValue)->AsObject();
+		if (JsonObject)
+		{
+			return JsonObjectToUObject(JsonObject.ToSharedRef(), ActorComponent, true);
+		}
+	}
+	return false;
+}
+
+bool FJsonActorArchive::SerializeActorComponent(const UActorComponent* ActorComponent)
+{
+	TSharedPtr<FJsonObject> JsonObject = UObjectToJsonObject(ActorComponent);
+	if (JsonObject)
+	{
+		Components->SetObjectField(ActorComponent->GetName(), JsonObject);
+		return true;
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/LLConverter.cpp b/Source/UnrealSoda/Private/Misc/LLConverter.cpp
new file mode 100644
index 0000000..f03afa7
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/LLConverter.cpp
@@ -0,0 +1,182 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/LLConverter.h"
+#include "Soda/Misc/MathUtils.hpp"
+#include "Math/RotationMatrix.h"
+
+#define _DEG2RAD(a) ((a) / (180.0 / M_PI))
+#define _RAD2DEG(a) ((a) * (180.0 / M_PI))
+
+// WGS-84 geodetic constants
+static const double earth_a = 6378137.0;                      // WGS-84 Earth semimajor axis (m)
+static const double earth_b = 6356752.314245;                 // Derived Earth semiminor axis (m)
+static const double earth_f = (earth_a - earth_b) / earth_a;  // Ellipsoid Flatness
+static const double earth_e_sq = earth_f * (2 - earth_f);     // Square of Eccentricity
+
+FLLConverter::FLLConverter()
+{
+	Init();
+}
+
+void FLLConverter::Init()
+{
+	orig_lambda = _DEG2RAD(OrignLat);
+	orig_phi = _DEG2RAD(OrignLon);
+	orig_s = std::sin(orig_lambda);
+	orig_N = earth_a / std::sqrt(1 - earth_e_sq * orig_s * orig_s);
+
+	orig_sin_lambda = std::sin(orig_lambda);
+	orig_cos_lambda = std::cos(orig_lambda);
+	orig_cos_phi = std::cos(orig_phi);
+	orig_sin_phi = std::sin(orig_phi);
+
+	x0 = (OrignAltitude + orig_N) * orig_cos_lambda * orig_cos_phi;
+	y0 = (OrignAltitude + orig_N) * orig_cos_lambda * orig_sin_phi;
+	z0 = (OrignAltitude + (1 - earth_e_sq) * orig_N) * orig_sin_lambda;
+
+}
+
+void FLLConverter::LLA2UE(FVector & Postion, double Lon, double Lat, double Alt) const
+{
+	double x, y, z;
+	GeodeticToEcef(Lat, Lon, Alt, x, y, z);
+
+	double xEast, yNorth, zUp;
+	EcefToEnu(x, y, z, xEast, yNorth, zUp);
+	
+	Postion = FVector(-xEast, yNorth, zUp) * 100.f;
+
+	//if (bInvertX) Postion.X = -Postion.X;
+	//if (bInvertY) Postion.Y = -Postion.Y;
+	if (OrignDYaw != 0) Postion = Postion.RotateAngleAxis(OrignDYaw, FVector(0, 0, 1)); 
+	Postion += OrignShift;
+}
+
+void FLLConverter::UE2LLA(const FVector & InPostion, double & Lon, double & Lat, double & Alt) const
+{
+	FVector Postion = InPostion - OrignShift;
+	if(OrignDYaw != 0) Postion = Postion.RotateAngleAxis(-OrignDYaw, FVector(0, 0, 1)); 
+	//if (bInvertX) Postion.X = -Postion.X;
+	//if (bInvertY) Postion.Y = -Postion.Y;
+	double xEast = -Postion.X / 100.f;
+	double yNorth = Postion.Y / 100.f;
+	double zUp = Postion.Z / 100.f;
+	double x, y, z;
+	EnuToEcef(xEast, yNorth, zUp, x, y, z);
+	EcefToGeodetic(x, y, z, Lat, Lon, Alt);
+}
+
+FRotator FLLConverter::ConvertRotationForward(const FRotator& InRot) const
+{
+	FRotator OutRot = InRot;
+	OutRot.Yaw -= OrignDYaw; 
+	/*
+	if (bInvertX)
+	{
+		OutRot.Yaw = 180 + OutRot.Yaw;
+		OutRot.Pitch = -OutRot.Pitch;
+	}
+	if (bInvertY)
+	{
+		OutRot.Yaw = -OutRot.Yaw;
+		OutRot.Roll = -OutRot.Roll;
+	}
+	*/
+	OutRot.Yaw = NormAngDeg(OutRot.Yaw);
+	return OutRot;
+}
+
+FRotator FLLConverter::ConvertRotationBackward(const FRotator& InRot) const
+{
+	FRotator OutRot = InRot;
+	/*
+	if (bInvertY)
+	{
+		OutRot.Yaw = -OutRot.Yaw;
+		OutRot.Roll = -OutRot.Roll;
+	}
+	if (bInvertX)
+	{
+		OutRot.Yaw =  OutRot.Yaw - 180;
+		OutRot.Pitch = -OutRot.Pitch;
+	}
+	*/
+	OutRot.Yaw += OrignDYaw;
+	OutRot.Yaw = NormAngDeg(OutRot.Yaw);
+	return OutRot;
+}
+
+FVector FLLConverter::ConvertDirForward(const FVector& InVec) const
+{
+	FVector Out = InVec.RotateAngleAxis(-OrignDYaw, FVector(0, 0, 1)); 
+	//if (bInvertX) Out.X = -Out.X;
+	//if (bInvertY) Out.Y = -Out.Y;
+	return Out;
+}
+
+FVector FLLConverter::ConvertDirBackward(const FVector& InVec) const
+{
+	FVector Out = InVec;
+	//if (bInvertX) Out.X = -Out.X;
+	//if (bInvertY) Out.Y = -Out.Y;
+	if (OrignDYaw != 0) Out = Out.RotateAngleAxis(OrignDYaw, FVector(0, 0, 1)); 
+	return Out;
+}
+
+void FLLConverter::GeodeticToEcef(double lat, double lon, double h, double & x, double & y, double & z) const
+{
+	double lambda = _DEG2RAD(lat);
+	double phi = _DEG2RAD(lon);
+	double s = std::sin(lambda);
+	double N = earth_a / std::sqrt(1 - earth_e_sq * s * s);
+
+	double sin_lambda = std::sin(lambda);
+	double cos_lambda = std::cos(lambda);
+	double cos_phi = std::cos(phi);
+	double sin_phi = std::sin(phi);
+
+	x = (h + N) * cos_lambda * cos_phi;
+	y = (h + N) * cos_lambda * sin_phi;
+	z = (h + (1 - earth_e_sq) * N) * sin_lambda;
+}
+
+void FLLConverter::EcefToGeodetic(double x, double y, double z, double & lat, double & lon, double & h) const
+{
+	double eps = earth_e_sq / (1.0 - earth_e_sq);
+	double p = std::sqrt(x * x + y * y);
+	double q = std::atan2((z * earth_a), (p * earth_b));
+	double sin_q = std::sin(q);
+	double cos_q = std::cos(q);
+	double sin_q_3 = sin_q * sin_q * sin_q;
+	double cos_q_3 = cos_q * cos_q * cos_q;
+	double phi = std::atan2((z + eps * earth_b * sin_q_3), (p - earth_e_sq * earth_a * cos_q_3));
+	double lambda = std::atan2(y, x);
+	double v = earth_a / std::sqrt(1.0 - earth_e_sq * std::sin(phi) * std::sin(phi));
+	h = (p / std::cos(phi)) - v;
+
+	lat = _RAD2DEG(phi);
+	lon = _RAD2DEG(lambda);
+}
+
+void FLLConverter::EcefToEnu(double x, double y, double z, double & xEast, double & yNorth, double & zUp) const
+{
+	double xd, yd, zd;
+	xd = x - x0;
+	yd = y - y0;
+	zd = z - z0;
+
+	xEast = -orig_sin_phi * xd + orig_cos_phi * yd;
+	yNorth = -orig_cos_phi * orig_sin_lambda * xd - orig_sin_lambda * orig_sin_phi * yd + orig_cos_lambda * zd;
+	zUp = orig_cos_lambda * orig_cos_phi * xd + orig_cos_lambda * orig_sin_phi * yd + orig_sin_lambda * zd;
+}
+
+void FLLConverter::EnuToEcef(double xEast, double yNorth, double zUp, double & x, double & y, double & z) const
+{
+	double xd = -orig_sin_phi * xEast - orig_cos_phi * orig_sin_lambda * yNorth + orig_cos_lambda * orig_cos_phi * zUp;
+	double yd = orig_cos_phi * xEast - orig_sin_lambda * orig_sin_phi * yNorth + orig_cos_lambda * orig_sin_phi * zUp;
+	double zd = orig_cos_lambda * yNorth + orig_sin_lambda * zUp;
+
+	x = xd + x0;
+	y = yd + y0;
+	z = zd + z0;
+}
diff --git a/Source/UnrealSoda/Private/Misc/MeshGenerationUtils.cpp b/Source/UnrealSoda/Private/Misc/MeshGenerationUtils.cpp
new file mode 100644
index 0000000..1999fd2
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/MeshGenerationUtils.cpp
@@ -0,0 +1,208 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "Soda/UnrealSoda.h"
+#include "DrawDebugHelpers.h"
+#include "Math/ConvexHull2d.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Soda/Misc/SodaPhysicsInterface.h"
+#include "Soda/Misc/MathUtils.hpp"
+#include "quickhull/QuickHull.hpp"
+#include "UObject/ConstructorHelpers.h"
+#include "ConstrainedDelaunay2.h"
+#include "DynamicMeshBuilder.h"
+
+namespace FMeshGenerationUtils
+{
+
+bool DelaunayTriangulation(const TArray<FVector2D>& Cloud, const TArray<int>& Hull, /*TArray<FVector2D>& OutCloud,*/ TArray<uint32>& OutTriangles, bool bFlip)
+{
+	//OutCloud.Empty();
+	OutTriangles.Empty();
+
+	UE::Geometry::FConstrainedDelaunay2d Triangulation;
+	//Triangulation.FillRule = UE::Geometry::FConstrainedDelaunay2d::EFillRule::Positive;
+
+	for (int i = 0; i < Cloud.Num(); ++i)
+	{
+		Triangulation.Vertices.Add({ Cloud[i].X, Cloud[i].Y });
+	}
+
+	for (int i = 0; i < Hull.Num() - 1; ++i)
+	{
+		Triangulation.Edges.Add(UE::Geometry::FIndex2i(Hull[i], Hull[i+1]));
+	}
+	Triangulation.Edges.Add(UE::Geometry::FIndex2i(Hull[Hull.Num() - 1], Hull[0]));
+
+	bool bTriangulationSuccess = Triangulation.Triangulate();
+
+	if (!bTriangulationSuccess)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FMeshGenerationUtils::DelaunayTriangulation() Can't triangulate mesh"));
+		return false;
+	}
+
+	if (Triangulation.Triangles.Num() == 0)
+	{
+		return false;
+	}
+
+	OutTriangles.Reserve(Triangulation.Triangles.Num() * 3);
+
+	if (bFlip)
+	{
+		for (const UE::Geometry::FIndex3i& Tri : Triangulation.Triangles)
+		{
+			OutTriangles.Add(Tri.A);
+			OutTriangles.Add(Tri.B);
+			OutTriangles.Add(Tri.C);
+		}
+	}
+	else
+	{
+		for (const UE::Geometry::FIndex3i& Tri : Triangulation.Triangles)
+		{
+			OutTriangles.Add(Tri.C);
+			OutTriangles.Add(Tri.B);
+			OutTriangles.Add(Tri.A);
+		}
+	}
+
+	return true;
+}
+
+bool GenerateFOVMesh2D(const TArray<FVector>& InCloud, const TArray<FVector2D>& InUVs, const TArray <int32> & InHull, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+	OutVertices.Empty();
+	OutIndices.Empty();
+	OutVertices.Reserve(InCloud.Num() + 1);
+	
+	for (auto& Pt : InCloud)
+	{
+		OutVertices.Add(FDynamicMeshVertex(FVector3f(Pt)));
+	}
+	OutVertices.Add(FDynamicMeshVertex(FVector3f(0, 0, 0)));
+	
+	//UKismetProceduralMeshLibrary::CalculateTangentsForMesh(const TArray<FVector>&Vertices, const TArray<int32>&Triangles, const TArray<FVector2D>&UVs, TArray<FVector>&Normals, TArray<FProcMeshTangent>&Tangents)
+
+	/*
+	 * DelaunayTriangulation
+	 */
+	if (!DelaunayTriangulation(InUVs, InHull, OutIndices, false))
+	{
+		UE_LOG(LogSoda, Error, TEXT("FMeshGenerationUtils::GenerateFOVMesh2D() . Delaunay triangulation faild"));
+		return false;
+	}
+	
+	/*
+	 * Build side faces 
+	 */
+
+	int CenterPointIndex = OutVertices.Num();
+	if (IsClockwise2D(InUVs, InHull))
+	{
+		for (int i = 0; i < InHull.Num(); ++i)
+		{
+			OutIndices.Add(CenterPointIndex);
+			OutIndices.Add(InHull[i]);
+			OutIndices.Add(InHull[(i + 1) % InHull.Num()]);
+		}
+	}
+	else
+	{
+		for (int i = 0; i < InHull.Num(); ++i)
+		{
+			OutIndices.Add(CenterPointIndex);
+			OutIndices.Add(InHull[(i + 1) % InHull.Num()]);
+			OutIndices.Add(InHull[i]);
+		}
+	}
+
+	return true;
+}
+
+bool GenerateConvexHullMesh3D(const TArray<FVector>& Cloud, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+	OutVertices.Empty();
+	OutIndices.Empty();
+	
+	quickhull::QuickHull<FVector::FReal> QuickHull;
+	auto Hull = QuickHull.getConvexHull((const FVector::FReal*)Cloud.GetData(), Cloud.Num(), true, false);
+
+	const auto& IndexBuffer = Hull.getIndexBuffer();
+	const auto& VertexBuffer = Hull.getVertexBuffer();
+
+	OutVertices.Reserve(Cloud.Num());
+	for (auto& Pt : VertexBuffer)
+	{
+		OutVertices.Add(FDynamicMeshVertex(FVector3f(Pt.x, Pt.y, Pt.z)));
+	}
+
+	OutIndices.Reserve(IndexBuffer.size());
+	for (auto& Ind : IndexBuffer) OutIndices.Add(Ind);
+
+	return true;
+}
+
+
+bool GenerateSimpleFOVMesh(float HFOV, float VFOV, uint32 HSize, uint32 VSize, float Length, float HRot, float VRot, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices)
+{
+	TArray<FVector> Cloud;
+	TArray<FVector2D> CloudUV;
+
+	Cloud.Reserve(VSize * HSize);
+	CloudUV.Reserve(VSize * HSize);
+
+	for (uint32 i = 0; i < VSize + 1; i++)
+	{
+		float VAng = VRot - VFOV / 2 + VFOV / (float)VSize * (float)i;
+		for (uint32 j = 0; j < HSize + 1; j++)
+		{
+			float HAng = HRot - HFOV / 2 + HFOV / (float)HSize * (float)j;
+			FVector RayNorm = FRotator(VAng, HAng, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0));
+
+			Cloud.Add(RayNorm * Length);
+			CloudUV.Add(FVector2D(j, VSize - i));
+		}
+	}
+
+	TArray <int32> Hull;
+	GenerateHullInexes(HSize + 1, VSize + 1, Hull);
+	GenerateFOVMesh2D(Cloud, CloudUV, Hull, OutVertices, OutIndices);
+
+	return true;
+}
+
+FBox CalcFOVBounds(float HFOV, float VFOV, float ViewDistance)
+{
+	TArray<FVector> Points = 
+	{ 
+		FVector::ZeroVector,
+		FVector(1.0, 0.0, 0.0) * ViewDistance,
+		FRotator(-VFOV / 2, -HFOV / 2, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0))* ViewDistance,
+		FRotator(-VFOV / 2, +HFOV / 2, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0))* ViewDistance,
+		FRotator(+VFOV / 2, -HFOV / 2, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0))* ViewDistance,
+		FRotator(+VFOV / 2, +HFOV / 2, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0))* ViewDistance,
+	};
+
+	if (HFOV > 90)
+	{
+		Points.Append({ 
+			FVector(0.0,  1.0, 0.0) * ViewDistance,
+			FVector(0.0, -1.0, 0.0) * ViewDistance 
+		});
+	}
+
+	if (VFOV > 90)
+	{
+		Points.Append({
+			FVector(0.0, 0.0, 1.0) * ViewDistance,
+			FVector(0.0, 0.0, -1.0) * ViewDistance
+		});
+	}
+
+	return FBox(Points);
+}
+
+} // FMeshGenerationUtils
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/PixelReader.cpp b/Source/UnrealSoda/Private/Misc/PixelReader.cpp
new file mode 100644
index 0000000..ca0fafa
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/PixelReader.cpp
@@ -0,0 +1,71 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/PixelReader.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "DataDrivenShaderPlatformInfo.h"
+
+void FCameraPixelReader::BeginRead(
+	UTextureRenderTarget2D& RenderTarget,
+	FRHICommandListImmediate& InRHICmdList,
+	TArrayView<FColor>& OutPixels, uint32& OutWidth)
+{
+	check(IsInRenderingThread());
+
+	Texture = RenderTarget.GetRenderTargetResource()->GetRenderTargetTexture();
+	checkf(Texture != nullptr, TEXT("FPixelReader: UTextureRenderTarget2D missing render target texture"));
+	const FTextureRenderTarget2DResource* RenderResource = static_cast<const FTextureRenderTarget2DResource*>(RenderTarget.GetResource());
+
+	if (IsVulkanPlatform(GMaxRHIShaderPlatform))
+	{
+		InRHICmdList.ReadSurfaceData(
+			Texture,
+			FIntRect(0, 0, RenderResource->GetSizeXY().X, RenderResource->GetSizeXY().Y),
+			Pixels,
+			FReadSurfaceDataFlags(RCM_UNorm, CubeFace_MAX));
+		OutPixels = TArrayView<FColor>(Pixels.GetData(), Pixels.Num());
+		OutWidth = RenderResource->GetSizeXY().X;
+	}
+	else
+	{
+		uint32 DestStride = 0;
+		FColor* Data = (FColor*)RHILockTexture2D(Texture, 0, RLM_ReadOnly, DestStride, false);
+		OutPixels = TArrayView<FColor>(Data, DestStride / 4 * RenderResource->GetSizeXY().Y);
+		OutWidth = DestStride / 4;
+	}
+}
+
+void FCameraPixelReader::EndRead()
+{
+	if (!IsVulkanPlatform(GMaxRHIShaderPlatform))
+	{
+		RHIUnlockTexture2D(Texture, 0, false);
+	}
+}
+
+void FCameraPixelReader::ReadPixels(UTextureRenderTarget2D& RenderTarget, FRHICommandListImmediate& InRHICmdList, TArray<FColor>& Pixels, uint32& Width)
+{
+	check(IsInRenderingThread());
+
+	FRHITexture2D* Texture = RenderTarget.GetRenderTargetResource()->GetRenderTargetTexture();
+	const FTextureRenderTarget2DResource* RenderResource = static_cast<const FTextureRenderTarget2DResource*>(RenderTarget.GetResource());
+	checkf(Texture != nullptr, TEXT("ReadPixels(). UTextureRenderTarget2D missing render target texture"));
+
+	if (IsVulkanPlatform(GMaxRHIShaderPlatform))
+	{
+		InRHICmdList.ReadSurfaceData(
+			Texture,
+			FIntRect(0, 0, RenderResource->GetSizeXY().X, RenderResource->GetSizeXY().Y),
+			Pixels,
+			FReadSurfaceDataFlags(RCM_UNorm, CubeFace_MAX));
+		Width = RenderResource->GetSizeXY().X;
+	}
+	else
+	{
+		uint32 DestStride = 0;
+		void* CpuDataPtr = (void*)RHILockTexture2D(Texture, 0, RLM_ReadOnly, DestStride, false);
+		Pixels.SetNum(DestStride * RenderResource->GetSizeXY().Y / 4);
+		FMemory::BigBlockMemcpy(Pixels.GetData(), CpuDataPtr, Pixels.Num() * 4);
+		RHIUnlockTexture2D(Texture, 0, false);
+		Width = DestStride / 4;
+	}
+}
diff --git a/Source/UnrealSoda/Private/Misc/SensorSceneProxy.cpp b/Source/UnrealSoda/Private/Misc/SensorSceneProxy.cpp
new file mode 100644
index 0000000..c548d3e
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/SensorSceneProxy.cpp
@@ -0,0 +1,165 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/SensorSceneProxy.h"
+#include "EngineGlobals.h"
+#include "RHI.h"
+#include "RenderingThread.h"
+#include "RenderResource.h"
+#include "VertexFactory.h"
+#include "LocalVertexFactory.h"
+#include "PrimitiveViewRelevance.h"
+#include "PrimitiveSceneProxy.h"
+#include "Engine/Engine.h"
+#include "MaterialShared.h"
+#include "Materials/Material.h"
+#include "Engine/CollisionProfile.h"
+#include "SceneManagement.h"
+#include "DynamicMeshBuilder.h"
+#include "UObject/UObjectHash.h"
+#include "UObject/UObjectIterator.h"
+#include "StaticMeshResources.h"
+
+#include "Materials/MaterialInstance.h"
+#include "Materials/MaterialInstanceDynamic.h"
+
+//#include "ConstrainedDelaunay2.h"
+//#include "Polygon2.h"
+//#include "DynamicMesh/DynamicMesh3.h"
+
+using namespace UE::Geometry;
+
+
+
+struct FSensoFOVProxy
+{
+	//FSensoFOVProxy(const FSensoFOVProxy& Other) = default;
+	//FSensoFOVProxy(FSensoFOVProxy&& Other) = default;
+	FSensoFOVProxy(ERHIFeatureLevel::Type InFeatureLevel) : 
+		VertexFactory(InFeatureLevel, "SensoFOVProxy") 
+	{
+	}
+
+	~FSensoFOVProxy()
+	{
+		ReleaseResources();
+	}
+
+	void InitMesh(TArray<FDynamicMeshVertex>& Vertices, TArray<uint32>& Indices)
+	{
+		if (Indices.Num() > 3)
+		{
+			IndexBuffer.Indices = Indices;
+			VertexBuffers.InitFromDynamicVertex(&VertexFactory, Vertices);
+			BeginInitResource(&VertexBuffers.PositionVertexBuffer);
+			BeginInitResource(&VertexBuffers.StaticMeshVertexBuffer);
+			BeginInitResource(&VertexBuffers.ColorVertexBuffer);
+			BeginInitResource(&VertexFactory);
+			BeginInitResource(&IndexBuffer);
+		}
+	}
+
+	void ReleaseResources()
+	{
+		VertexBuffers.PositionVertexBuffer.ReleaseResource();
+		VertexBuffers.StaticMeshVertexBuffer.ReleaseResource();
+		VertexBuffers.ColorVertexBuffer.ReleaseResource();
+		VertexFactory.ReleaseResource();
+		IndexBuffer.ReleaseResource();
+	}
+
+
+	//TArray<FVector> LanePoints;
+	FStaticMeshVertexBuffers VertexBuffers;
+	FDynamicMeshIndexBuffer32 IndexBuffer;
+	FLocalVertexFactory VertexFactory;
+	FMaterialRenderProxy* Material = nullptr;
+	//FLinearColor Color{ FColor(255, 255, 255) };
+};
+
+
+FSensorSceneProxy::FSensorSceneProxy(USensorComponent* Sensor)
+	: FPrimitiveSceneProxy(Sensor)
+	, Sensor(Sensor)
+
+{
+	if (Sensor->GetSensorFOVMaterial())
+	{
+		MaterialRenderProxy = Sensor->GetSensorFOVMaterial()->GetRenderProxy();
+		TArray<FSensorFOVMesh> Meshes;
+		if (Sensor->GenerateFOVMesh(Meshes))
+		{
+			for (auto& Mesh : Meshes)
+			{
+				FSensoFOVProxy& FOVProxy = *FOVProxies.Add_GetRef(MakeShared< FSensoFOVProxy>(GetScene().GetFeatureLevel()));
+				FOVProxy.InitMesh(Mesh.Vertices, Mesh.Indices);
+
+			}
+		}
+
+		MaterialRelevance |= Sensor->GetSensorFOVMaterial()->GetRelevance_Concurrent(GetScene().GetFeatureLevel());
+	}
+
+}
+
+void FSensorSceneProxy::GetDynamicMeshElements(const TArray<const FSceneView*>& Views, const FSceneViewFamily& ViewFamily, uint32 VisibilityMap, FMeshElementCollector& Collector) const
+{
+	for (int32 ViewIndex = 0; ViewIndex < Views.Num(); ViewIndex++)
+	{
+		if (VisibilityMap & (1 << ViewIndex))
+		{
+			const FSceneView* View = Views[ViewIndex];
+			FPrimitiveDrawInterface* PDI = Collector.GetPDI(ViewIndex);
+
+			for (const auto& FOVProxy : FOVProxies)
+			{
+				FDynamicPrimitiveUniformBuffer& DynamicPrimitiveUniformBuffer = Collector.AllocateOneFrameResource<FDynamicPrimitiveUniformBuffer>();
+
+				DynamicPrimitiveUniformBuffer.Set(GetLocalToWorld(), GetLocalToWorld(), GetBounds(), GetLocalBounds(), true, false, AlwaysHasVelocity());
+				
+
+				FMeshBatch& MeshBatch = Collector.AllocateMesh();
+				MeshBatch.MaterialRenderProxy = MaterialRenderProxy;
+				MeshBatch.VertexFactory = &FOVProxy->VertexFactory;
+				MeshBatch.ReverseCulling = IsLocalToWorldDeterminantNegative();
+				MeshBatch.Type = PT_TriangleList;
+				MeshBatch.DepthPriorityGroup = SDPG_World;
+				MeshBatch.bCanApplyViewModeOverrides = false;
+
+				FMeshBatchElement& BatchElement = MeshBatch.Elements[0];
+				BatchElement.IndexBuffer = &FOVProxy->IndexBuffer;
+				BatchElement.FirstIndex = 0;
+				BatchElement.NumPrimitives = FOVProxy->IndexBuffer.Indices.Num() / 3;
+				BatchElement.MinVertexIndex = 0;
+				BatchElement.MaxVertexIndex = FOVProxy->VertexBuffers.PositionVertexBuffer.GetNumVertices() - 1;
+				BatchElement.PrimitiveUniformBufferResource = &DynamicPrimitiveUniformBuffer.UniformBuffer;
+
+				Collector.AddMesh(ViewIndex, MeshBatch);
+			}
+		}
+	}
+}
+
+FPrimitiveViewRelevance FSensorSceneProxy::GetViewRelevance(const FSceneView* View) const
+{
+	FPrimitiveViewRelevance Result;
+	Result.bDrawRelevance = IsShown(View);
+	Result.bShadowRelevance = IsShadowCast(View);
+	Result.bDynamicRelevance = true;
+	Result.bRenderInMainPass = ShouldRenderInMainPass();
+	Result.bUsesLightingChannels = GetLightingChannelMask() != GetDefaultLightingChannelMask();
+	Result.bRenderCustomDepth = ShouldRenderCustomDepth();
+	Result.bTranslucentSelfShadow = bCastVolumetricTranslucentShadow;
+	MaterialRelevance.SetPrimitiveViewRelevance(Result);
+	Result.bVelocityRelevance = DrawsVelocity() && Result.bOpaque && Result.bRenderInMainPass;
+	return Result;
+}
+
+bool FSensorSceneProxy::CanBeOccluded() const
+{
+	return !MaterialRelevance.bDisableDepthTest;
+}
+
+void FSensorSceneProxy::OnTransformChanged()
+{
+	FPrimitiveSceneProxy::OnTransformChanged();
+}
diff --git a/Source/UnrealSoda/Private/Misc/SerializationHelpers.cpp b/Source/UnrealSoda/Private/Misc/SerializationHelpers.cpp
new file mode 100644
index 0000000..1c48e3a
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/SerializationHelpers.cpp
@@ -0,0 +1,253 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/SerializationHelpers.h"
+#include "Soda/UnrealSoda.h"
+#include "Serialization/MemoryReader.h"
+#include "Serialization/MemoryWriter.h"
+#include "UObject/UObjectGlobals.h"
+
+struct FSaveExtensionArchive : public FObjectAndNameAsStringProxyArchive 
+{
+	FSaveExtensionArchive(FArchive &InInnerArchive, bool bInLoadIfFindFails) : FObjectAndNameAsStringProxyArchive(InInnerArchive, bInLoadIfFindFails) 
+	{
+		ArIsSaveGame = true;
+    	ArNoDelta = true;
+	}
+
+	FArchive &operator<<(struct FSoftObjectPtr &Value)
+	{
+		*this << Value.GetUniqueID();
+		return *this;
+	}
+
+	FArchive &operator<<(struct FSoftObjectPath &Value)
+	{
+		FString Path = Value.ToString();
+		*this << Path;
+		if (IsLoading())
+		{
+			Value.SetPath(MoveTemp(Path));
+		}
+		return *this;
+	}
+};
+
+/******************************************************************
+* FObjectRecord
+*******************************************************************/
+void FObjectRecord::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaving() && !Name.IsNone() && !Class)
+	{
+		UE_LOG(LogSoda, Fatal, TEXT("FObjectRecord::Serialize(); Don't need to save named object without class"));
+	}
+	if (!Name.IsNone()) Ar << Class;
+	Ar << Data;
+}
+
+bool FObjectRecord::SerializeObject(UObject* Object)
+{
+	Data.Reset();
+	Name = NAME_None;
+	Class.Reset();
+
+	if (!IsValid(Object))
+	{
+		return false;
+	}
+
+	Name = Object->GetFName();
+	Class = Object->GetClass();
+
+	FMemoryWriter MemoryWriter(Data, true);
+	FSaveExtensionArchive Archive(MemoryWriter, false);
+	Object->Serialize(Archive);
+
+	return true;
+}
+
+bool FObjectRecord::DeserializeObject(UObject* Object)
+{
+	if (!IsRecordValid() || !IsValid(Object))
+	{
+		return false;
+	}
+
+	if (Object->GetClass() != Class)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("DeserializeObject(); Component %s: Class %s != Record.Class(%s)"),
+			*Object->GetFName().ToString(),
+			*Object->GetClass()->GetDefaultObjectName().ToString(),
+			*Class->GetDefaultObjectName().ToString());
+		return false;
+	}
+
+	FMemoryReader MemoryReader(Data, true);
+	FSaveExtensionArchive Archive(MemoryReader, false);
+	Object->Serialize(Archive);
+
+	return true;
+}
+
+/******************************************************************
+* FComponentRecord
+*******************************************************************/
+void FComponentRecord::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+	Ar << Transform;
+}
+
+bool FComponentRecord::SerializeComponent(UActorComponent* Component)
+{
+	if (!SerializeObject(Component))
+	{
+		return false;
+	}
+
+	const USceneComponent* Scene = Cast<USceneComponent>(Component);
+	if (Scene && Scene->Mobility == EComponentMobility::Movable)
+	{
+		Transform = Scene->GetRelativeTransform();
+	}
+
+	return true;
+}
+
+bool FComponentRecord::DeserializeComponent(UActorComponent* Component)
+{
+	if (!DeserializeObject(Component))
+	{
+		return false;
+	}
+
+	USceneComponent* Root = nullptr;
+	AActor* Actor = Component->GetOwner();
+	if (Actor) Root = Actor->GetRootComponent();
+
+	USceneComponent* Scene = Cast<USceneComponent>(Component);
+	if (Scene && Scene->Mobility == EComponentMobility::Movable && Scene != Root)
+	{
+		Scene->SetRelativeTransform(Transform);
+	}
+
+	return true;
+}
+
+/******************************************************************
+* FActorRecord
+*******************************************************************/
+void FActorRecord::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+	Ar << Transform;
+	Ar << ComponentRecords;
+}
+
+bool FActorRecord::SerializeComponent(UActorComponent* Component)
+{
+	if (!IsValid(Component))
+	{
+		return false;
+	}
+
+	FComponentRecord* ComponentRecord = ComponentRecords.FindByKey(Component);
+
+	if (!ComponentRecord)
+	{
+		ComponentRecord = &ComponentRecords.Add_GetRef(FComponentRecord());
+	}
+
+	return ComponentRecord->SerializeComponent(Component);;
+}
+
+bool FActorRecord::DeserializeComponent(UActorComponent* Component)
+{
+	if (!IsValid(Component))
+	{
+		return false;
+	}
+
+	if (FComponentRecord* Record = ComponentRecords.FindByKey(Component))
+	{
+		return Record->DeserializeComponent(Component);
+	}
+
+	return false;
+}
+
+bool FActorRecord::SerializeActor(AActor* Actor, bool bWithComponents)
+{
+	if (!SerializeObject(Actor))
+	{
+		return false;
+	}
+
+	Transform = Actor->GetTransform();
+
+	if (bWithComponents)
+	{
+		const TSet<UActorComponent*>& Components = Actor->GetComponents();
+		for (auto* Component : Components)
+		{
+			SerializeComponent(Component);
+		}
+	}
+
+	return true;
+}
+
+bool FActorRecord::DeserializeActor(AActor* Actor, bool bWithComponents, bool bSetTransform)
+{
+	if (!DeserializeObject(Actor))
+	{
+		return false;
+	}
+
+	if (bWithComponents)
+	{
+		const TSet<UActorComponent*>& Components = Actor->GetComponents();
+		for (auto* Component : Components)
+		{
+			DeserializeComponent(Component);
+		}
+	}
+
+	if (bSetTransform)
+	{
+		Actor->SetActorTransform(Transform, false, nullptr, ETeleportType::ResetPhysics);
+	}
+
+	return true;
+}
+
+/******************************************************************
+* USaveGameActor
+*******************************************************************/
+bool USaveGameActor::SerializeComponent(UActorComponent* Component)
+{
+	return ActorRecord.SerializeComponent(Component);
+}
+
+bool USaveGameActor::DeserializeComponent(UActorComponent* Component)
+{
+	return ActorRecord.DeserializeComponent(Component);
+}
+
+bool USaveGameActor::SerializeActor(AActor* Actor, bool bWithComponents)
+{
+	return ActorRecord.SerializeActor(Actor, bWithComponents);
+}
+
+bool USaveGameActor::DeserializeActor(AActor* Actor, bool bWithComponents)
+{
+	return ActorRecord.DeserializeActor(Actor, bWithComponents);
+}
+
+void USaveGameActor::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+	Ar << ActorRecord;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/SodaPhysicsInterface.cpp b/Source/UnrealSoda/Private/Misc/SodaPhysicsInterface.cpp
new file mode 100644
index 0000000..79a88f0
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/SodaPhysicsInterface.cpp
@@ -0,0 +1,613 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/SodaPhysicsInterface.h"
+#include "Engine/World.h"
+#include "CollisionDebugDrawingPublic.h"
+#include "Physics/Experimental/PhysScene_Chaos.h"
+#include "Physics/PhysicsInterfaceUtils.h"
+#include "Runtime/Engine/Private/Collision/CollisionConversions.h"
+#include "PhysicsEngine/ClusterUnionComponent.h"
+#include "Runtime/Engine/Private/PhysicsEngine/CollisionQueryFilterCallback.h"
+#include "PhysicsEngine/ExternalSpatialAccelerationPayload.h"
+#include "Runtime/Engine/Private/PhysicsEngine/ScopedSQHitchRepeater.h"
+#include "Runtime/Engine/Private/Collision/CollisionDebugDrawing.h"
+
+float DebugLineLifetime_ = 2.f;
+
+//#include "PhysicsEngine/CollisionAnalyzerCapture.h"
+
+#include "Physics/Experimental/ChaosInterfaceWrapper.h"
+#include "PBDRigidsSolver.h"
+
+namespace ECAQueryMode
+{
+	enum Type
+	{
+		Test,
+		Single,
+		Multi
+	};
+}
+
+
+//CSV_DEFINE_CATEGORY(SceneQuery, false);
+
+enum class ESingleMultiOrTest : uint8
+{
+	Single,
+	Multi,
+	Test
+};
+
+enum class ESweepOrRay : uint8
+{
+	Raycast,
+	Sweep,
+};
+
+struct FGeomSQAdditionalInputs
+{
+	FGeomSQAdditionalInputs(const FCollisionShape& InCollisionShape, const FQuat& InGeomRot)
+		: ShapeAdapter(InGeomRot, InCollisionShape)
+		, CollisionShape(InCollisionShape)
+	{
+	}
+
+	const FPhysicsGeometry* GetGeometry() const
+	{
+		return &ShapeAdapter.GetGeometry();
+	}
+
+	const FQuat* GetGeometryOrientation() const
+	{
+		return &ShapeAdapter.GetGeomOrientation();
+	}
+
+
+	const FCollisionShape* GetCollisionShape() const
+	{
+		return &CollisionShape;
+	}
+
+	FPhysicsShapeAdapter ShapeAdapter;
+	const FCollisionShape& CollisionShape;
+};
+
+struct FGeomCollectionSQAdditionalInputs
+{
+	FGeomCollectionSQAdditionalInputs(const FPhysicsGeometryCollection& InCollection, const FQuat& InGeomRot)
+		: Collection(InCollection)
+		, GeomRot(InGeomRot)
+	{
+	}
+
+	const FPhysicsGeometry* GetGeometry() const
+	{
+		return &Collection.GetGeometry();
+	}
+
+	const FQuat* GetGeometryOrientation() const
+	{
+		return &GeomRot;
+	}
+
+	const FPhysicsGeometryCollection* GetCollisionShape() const
+	{
+		return &Collection;
+	}
+
+	const FPhysicsGeometryCollection& Collection;
+	const FQuat& GeomRot;
+};
+
+struct FPhysicsGeometrySQAdditionalInputs
+{
+	FPhysicsGeometrySQAdditionalInputs(const FPhysicsGeometry& InGeometry, const FQuat& InGeomRot)
+		: Collection(FChaosEngineInterface::GetGeometryCollection(InGeometry))
+		, GeomRot(InGeomRot)
+	{
+	}
+
+	const FPhysicsGeometry* GetGeometry() const
+	{
+		return &Collection.GetGeometry();
+	}
+
+	const FQuat* GetGeometryOrientation() const
+	{
+		return &GeomRot;
+	}
+
+	const FPhysicsGeometryCollection* GetCollisionShape() const
+	{
+		return &Collection;
+	}
+private:
+	const FPhysicsGeometryCollection Collection;
+	const FQuat& GeomRot;
+};
+
+struct FRaycastSQAdditionalInputs
+{
+	const FPhysicsGeometry* GetGeometry() const
+	{
+		return nullptr;
+	}
+
+	const FQuat* GetGeometryOrientation() const
+	{
+		return nullptr;
+	}
+
+	const FCollisionShape* GetCollisionShape() const
+	{
+		return nullptr;
+	}
+};
+
+
+template<typename TGeom>
+using TGeomSQInputs = std::conditional_t<std::is_same_v<TGeom, FPhysicsGeometryCollection>, FGeomCollectionSQAdditionalInputs,
+	std::conditional_t<std::is_same_v<TGeom, FCollisionShape>, FGeomSQAdditionalInputs,
+	std::conditional_t<std::is_same_v<TGeom, FPhysicsGeometry>, FPhysicsGeometrySQAdditionalInputs,
+	void>>>;
+
+template<typename TGeom>
+TGeomSQInputs<TGeom> GeomToSQInputs(const TGeom& Geom, const FQuat& Rot)
+{
+	static_assert(!std::is_same_v<TGeomSQInputs<TGeom>, void>, "Invalid geometry passed to SQ.");
+	if constexpr (std::is_same_v<TGeom, FPhysicsGeometryCollection>)
+	{
+		return FGeomCollectionSQAdditionalInputs(Geom, Rot);
+	}
+	else if constexpr (std::is_same_v<TGeom, FPhysicsGeometry>)
+	{
+		return FPhysicsGeometrySQAdditionalInputs(Geom, Rot);
+	}
+	else if constexpr (std::is_same_v<TGeom, FCollisionShape>)
+	{
+		return FGeomSQAdditionalInputs(Geom, Rot);
+	}
+}
+
+template <typename InHitType, ESweepOrRay InGeometryQuery, ESingleMultiOrTest InSingleMultiOrTest>
+struct TSQTraits
+{
+	static const ESingleMultiOrTest SingleMultiOrTest = InSingleMultiOrTest;
+	static const ESweepOrRay GeometryQuery = InGeometryQuery;
+	using THitType = InHitType;
+	using TOutHits = typename TChooseClass<InSingleMultiOrTest == ESingleMultiOrTest::Multi, TArray<FHitResult>, FHitResult>::Result;
+	using THitBuffer = typename TChooseClass<InSingleMultiOrTest == ESingleMultiOrTest::Multi, FDynamicHitBuffer<InHitType>, FSingleHitBuffer<InHitType>>::Result;
+
+	// GetNumHits - multi
+	template <ESingleMultiOrTest T = SingleMultiOrTest>
+	static typename TEnableIf<T == ESingleMultiOrTest::Multi, int32>::Type GetNumHits(const THitBuffer& HitBuffer)
+	{
+		return HitBuffer.GetNumHits();
+	}
+
+	// GetNumHits - single/test
+	template <ESingleMultiOrTest T = SingleMultiOrTest>
+	static typename TEnableIf<T != ESingleMultiOrTest::Multi, int32>::Type GetNumHits(const THitBuffer& HitBuffer)
+	{
+		return GetHasBlock(HitBuffer) ? 1 : 0;
+	}
+
+	//GetHits - multi
+	template <ESingleMultiOrTest T = SingleMultiOrTest>
+	static typename TEnableIf<T == ESingleMultiOrTest::Multi, THitType*>::Type GetHits(THitBuffer& HitBuffer)
+	{
+		return HitBuffer.GetHits();
+	}
+
+	//GetHits - single/test
+	template <ESingleMultiOrTest T = SingleMultiOrTest>
+	static typename TEnableIf<T != ESingleMultiOrTest::Multi, THitType*>::Type GetHits(THitBuffer& HitBuffer)
+	{
+		return GetBlock(HitBuffer);
+	}
+
+	//SceneTrace - ray
+	template <typename TAccelContainer, typename TGeomInputs, ESweepOrRay T = GeometryQuery>
+	static typename TEnableIf<T == ESweepOrRay::Raycast, void>::Type SceneTrace(const TAccelContainer& Container, const TGeomInputs& GeomInputs, const FVector& Dir, float DeltaMag, const FTransform& StartTM, THitBuffer& HitBuffer, EHitFlags OutputFlags, EQueryFlags QueryFlags, const FCollisionFilterData& FilterData, const FCollisionQueryParams& Params, ICollisionQueryFilterCallbackBase* QueryCallback)
+	{
+		using namespace ChaosInterface;
+		FQueryFilterData QueryFilterData = MakeQueryFilterData(FilterData, QueryFlags, Params);
+		FQueryDebugParams DebugParams;
+#if !(UE_BUILD_TEST || UE_BUILD_SHIPPING)
+		DebugParams.bDebugQuery = Params.bDebugQuery;
+#endif
+		LowLevelRaycast(Container, StartTM.GetLocation(), Dir, DeltaMag, HitBuffer, OutputFlags, QueryFlags, FilterData, QueryFilterData, QueryCallback, DebugParams);	//todo(ocohen): namespace?
+	}
+
+	//SceneTrace - sweep
+	template <typename TAccelContainer, typename TGeomInputs, ESweepOrRay T = GeometryQuery>
+	static typename TEnableIf<T == ESweepOrRay::Sweep, void>::Type SceneTrace(const TAccelContainer& Container, const TGeomInputs& GeomInputs, const FVector& Dir, float DeltaMag, const FTransform& StartTM, THitBuffer& HitBuffer, EHitFlags OutputFlags, EQueryFlags QueryFlags, const FCollisionFilterData& FilterData, const FCollisionQueryParams& Params, ICollisionQueryFilterCallbackBase* QueryCallback)
+	{
+		using namespace ChaosInterface;
+		FQueryFilterData QueryFilterData = MakeQueryFilterData(FilterData, QueryFlags, Params);
+		FQueryDebugParams DebugParams;
+#if !(UE_BUILD_TEST || UE_BUILD_SHIPPING)
+		DebugParams.bDebugQuery = Params.bDebugQuery;
+#endif
+		LowLevelSweep(Container, *GeomInputs.GetGeometry(), StartTM, Dir, DeltaMag, HitBuffer, OutputFlags, QueryFlags, FilterData, QueryFilterData, QueryCallback, DebugParams);	//todo(ocohen): namespace?
+	}
+
+	/*
+	static void ResetOutHits(TArray<FHitResult>& OutHits, const FVector& Start, const FVector& End)
+	{
+		OutHits.Reset();
+	}
+
+	static void ResetOutHits(FHitResult& OutHit, const FVector& Start, const FVector& End)
+	{
+		OutHit = FHitResult();
+		OutHit.TraceStart = Start;
+		OutHit.TraceEnd = End;
+	}
+	*/
+
+	static void DrawTraces(const UWorld* World, const FVector& Start, const FVector& End, const FPhysicsGeometry* PGeom, const FQuat* PGeomRot, const TArray<FHitResult>& Hits)
+	{
+		if (IsRay())
+		{
+			DrawLineTraces(World, Start, End, Hits, DebugLineLifetime_);
+		}
+		else
+		{
+			DrawGeomSweeps(World, Start, End, *PGeom, *PGeomRot, Hits, DebugLineLifetime_);
+		}
+	}
+
+	static void DrawTraces(const UWorld* World, const FVector& Start, const FVector& End, const FPhysicsGeometry* PGeom, const FQuat* GeomRotation, const FHitResult& Hit)
+	{
+		TArray<FHitResult> Hits;
+		Hits.Add(Hit);
+
+		DrawTraces(World, Start, End, PGeom, GeomRotation, Hits);
+	}
+
+	template <typename TGeomInputs>
+	static void CaptureTraces(const UWorld* World, const FVector& Start, const FVector& End, const TGeomInputs& GeomInputs, ECollisionChannel TraceChannel, const FCollisionQueryParams& Params, const FCollisionResponseParams& ResponseParams, const FCollisionObjectQueryParams& ObjectParams, const TArray<FHitResult>& Hits, bool bHaveBlockingHit, double StartTime)
+	{
+#if ENABLE_COLLISION_ANALYZER
+		ECAQueryMode::Type QueryMode = IsMulti() ? ECAQueryMode::Multi : (IsSingle() ? ECAQueryMode::Single : ECAQueryMode::Test);
+		if (IsRay())
+		{
+			CAPTURERAYCAST(World, Start, End, QueryMode, TraceChannel, Params, ResponseParams, ObjectParams, Hits);
+		}
+		else
+		{
+			CAPTUREGEOMSWEEP(World, Start, End, *GeomInputs.GetGeometryOrientation(), QueryMode, *GeomInputs.GetCollisionShape(), TraceChannel, Params, ResponseParams, ObjectParams, Hits);
+		}
+#endif
+	}
+
+	template <typename TGeomInputs>
+	static void CaptureTraces(const UWorld* World, const FVector& Start, const FVector& End, const TGeomInputs& GeomInputs, ECollisionChannel TraceChannel, const FCollisionQueryParams& Params, const FCollisionResponseParams& ResponseParams, const FCollisionObjectQueryParams& ObjectParams, const FHitResult& Hit, bool bHaveBlockingHit, double StartTime)
+	{
+		TArray<FHitResult> Hits;
+		if (bHaveBlockingHit)
+		{
+			Hits.Add(Hit);
+		}
+		CaptureTraces(World, Start, End, GeomInputs, TraceChannel, Params, ResponseParams, ObjectParams, Hits, bHaveBlockingHit, StartTime);
+	}
+
+	static EHitFlags GetHitFlags()
+	{
+		if (IsTest())
+		{
+			return EHitFlags::None;
+		}
+		else
+		{
+			if (IsRay())
+			{
+				return EHitFlags::Position | EHitFlags::Normal | EHitFlags::Distance | EHitFlags::MTD | EHitFlags::FaceIndex;
+			}
+			else
+			{
+				if (IsSingle())
+				{
+					return EHitFlags::Position | EHitFlags::Normal | EHitFlags::Distance | EHitFlags::MTD;
+				}
+				else
+				{
+					return EHitFlags::Position | EHitFlags::Normal | EHitFlags::Distance | EHitFlags::MTD | EHitFlags::FaceIndex;
+				}
+			}
+		}
+	}
+
+	static EQueryFlags GetQueryFlags()
+	{
+		if (IsRay())
+		{
+			return (IsTest() ? (EQueryFlags::PreFilter | EQueryFlags::AnyHit) : EQueryFlags::PreFilter);
+		}
+		else
+		{
+			if (IsTest())
+			{
+				return (EQueryFlags::PreFilter | EQueryFlags::PostFilter | EQueryFlags::AnyHit);
+			}
+			else if (IsSingle())
+			{
+				return EQueryFlags::PreFilter;
+			}
+			else
+			{
+				return (EQueryFlags::PreFilter | EQueryFlags::PostFilter);
+			}
+		}
+	}
+
+	CA_SUPPRESS(6326);
+	constexpr static bool IsSingle() { return SingleMultiOrTest == ESingleMultiOrTest::Single; }
+
+	CA_SUPPRESS(6326);
+	constexpr static bool IsTest() { return SingleMultiOrTest == ESingleMultiOrTest::Test; }
+
+	CA_SUPPRESS(6326);
+	constexpr static bool IsMulti() { return SingleMultiOrTest == ESingleMultiOrTest::Multi; }
+
+	CA_SUPPRESS(6326);
+	constexpr static bool IsRay() { return GeometryQuery == ESweepOrRay::Raycast; }
+
+	CA_SUPPRESS(6326);
+	constexpr static bool IsSweep() { return GeometryQuery == ESweepOrRay::Sweep; }
+
+	/** Easy way to query whether this SQ trait is for the GT or the PT based on the based in hit type. */
+	constexpr static bool IsExternalData() { return std::is_base_of_v<ChaosInterface::FActorShape, InHitType>; }
+
+};
+
+enum class EThreadQueryContext
+{
+	GTData,		//use interpolated GT data
+	PTDataWithGTObjects,	//use pt data, but convert back to GT when possible
+	PTOnlyData,	//use only the PT data and don't try to convert anything back to GT
+};
+
+static EThreadQueryContext GetThreadQueryContext(const Chaos::FPhysicsSolver& Solver)
+{
+	if (Solver.IsGameThreadFrozen())
+	{
+		//If the game thread is frozen the solver is currently in fixed tick mode (i.e. fixed tick callbacks are being executed on GT)
+		if (IsInGameThread() || IsInParallelGameThread())
+		{
+			//Since we are on GT or parallel GT we must be in fixed tick, so use PT data and convert back to GT where possible
+			return EThreadQueryContext::PTDataWithGTObjects;
+		}
+		else
+		{
+			//The solver can't be running since it's calling fixed tick callbacks on gt, so it must be an unrelated thread task (audio, animation, etc...) so just use interpolated gt data
+			return EThreadQueryContext::GTData;
+		}
+	}
+	else
+	{
+		//TODO: need a way to know we are on a physics thread task (this isn't supported yet)
+		//For now just use interpolated data
+		return EThreadQueryContext::GTData;
+	}
+}
+
+struct FClusterUnionHit
+{
+	bool bIsClusterUnion = false;
+	bool bHit = false;
+};
+
+struct FDefaultAccelContainer
+{
+	static constexpr bool HasAccelerationStructureOverride()
+	{
+		return false;
+	}
+};
+
+template<typename TAccel>
+struct FOverrideAccelContainer
+{
+	explicit FOverrideAccelContainer(const TAccel& InSpatialAcceleration)
+		: SpatialAcceleration(InSpatialAcceleration)
+	{}
+
+	static constexpr bool HasAccelerationStructureOverride()
+	{
+		return true;
+	}
+
+	const TAccel& GetSpatialAcceleration() const
+	{
+		return SpatialAcceleration;
+	}
+
+private:
+	const TAccel& SpatialAcceleration;
+};
+
+template <typename Traits, typename TGeomInputs, typename TAccelContainer>
+bool TSceneCastCommonImp(const UWorld* World, TArray<typename Traits::TOutHits>& OutHits, const TGeomInputs& GeomInputs, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams, const TAccelContainer& AccelContainer)
+{
+	using namespace ChaosInterface;
+
+	FScopeCycleCounter Counter(Params.StatId);
+	//STARTQUERYTIMER();
+
+	if (!Traits::IsTest())
+	{
+		//Traits::ResetOutHits(OutHits, Start, End);
+		OutHits.Reset();
+	}
+
+	const int Num = FMath::Min(Start.Num(), End.Num());
+	OutHits.SetNum(Num);
+
+	// Track if we get any 'blocking' hits
+	bool bHaveBlockingHit = false;
+
+	// Enable scene locks, in case they are required
+	FPhysScene& PhysScene = *World->GetPhysicsScene();
+
+	FScopedSceneReadLock SceneLocks(PhysScene);
+
+	ParallelFor(Num, [&](int i)
+	{
+		const FVector& StartRef = Start[i];
+		const FVector& EndtRef = End[i];
+
+		FVector Delta = EndtRef - StartRef;
+		float DeltaSize = Delta.Size();
+		float DeltaMag = FMath::IsNearlyZero(DeltaSize) ? 0.f : DeltaSize;
+		float MinBlockingDistance = DeltaMag;
+
+		if (Traits::IsSweep() || DeltaMag > 0.f)
+		{
+			// Create filter data used to filter collisions 
+			CA_SUPPRESS(6326);
+			FCollisionFilterData Filter = CreateQueryFilterData(TraceChannel, Params.bTraceComplex, ResponseParams.CollisionResponse, Params, ObjectParams, Traits::SingleMultiOrTest == ESingleMultiOrTest::Multi);
+
+			CA_SUPPRESS(6326);
+			FCollisionQueryFilterCallback QueryCallback(Params, Traits::GeometryQuery == ESweepOrRay::Sweep);
+
+			CA_SUPPRESS(6326);
+			if (Traits::SingleMultiOrTest != ESingleMultiOrTest::Multi)
+			{
+				QueryCallback.bIgnoreTouches = true;
+			}
+
+			typename Traits::THitBuffer HitBufferSync;
+
+			bool bBlockingHit = false;
+			const FVector Dir = DeltaMag > 0.f ? (Delta / DeltaMag) : FVector(1, 0, 0);
+			const FTransform StartTM = Traits::IsRay() ? FTransform(StartRef) : FTransform(*GeomInputs.GetGeometryOrientation(), StartRef);
+
+			{
+				FScopedSQHitchRepeater<decltype(HitBufferSync)> HitchRepeater(HitBufferSync, QueryCallback, FHitchDetectionInfo(StartRef, EndtRef, TraceChannel, Params));
+				do
+				{
+					if constexpr (TAccelContainer::HasAccelerationStructureOverride())
+					{
+						Traits::SceneTrace(AccelContainer.GetSpatialAcceleration(), GeomInputs, Dir, DeltaMag, StartTM, HitchRepeater.GetBuffer(), Traits::GetHitFlags(), Traits::GetQueryFlags(), Filter, Params, &QueryCallback);
+					}
+					else
+					{
+						Traits::SceneTrace(PhysScene, GeomInputs, Dir, DeltaMag, StartTM, HitchRepeater.GetBuffer(), Traits::GetHitFlags(), Traits::GetQueryFlags(), Filter, Params, &QueryCallback);
+					}
+				} while (HitchRepeater.RepeatOnHitch());
+			}
+
+
+			const int32 NumHits = Traits::GetNumHits(HitBufferSync);
+
+			if (NumHits > 0 && GetHasBlock(HitBufferSync))
+			{
+				bBlockingHit = true;
+				MinBlockingDistance = GetDistance(Traits::GetHits(HitBufferSync)[NumHits - 1]);
+			}
+
+			if (NumHits > 0 && !Traits::IsTest())
+			{
+				bool bSuccess = ConvertTraceResults(bBlockingHit, World, NumHits, Traits::GetHits(HitBufferSync), DeltaMag, Filter, OutHits[i], StartRef, EndtRef, GeomInputs.GetGeometry(), StartTM, MinBlockingDistance, Params.bReturnFaceIndex, Params.bReturnPhysicalMaterial) == EConvertQueryResult::Valid;
+
+				if (!bSuccess)
+				{
+					// We don't need to change bBlockingHit, that's done by ConvertTraceResults if it removed the blocking hit.
+					UE_LOG(LogCollision, Error, TEXT("%s%s resulted in a NaN/INF in PHit!"), Traits::IsRay() ? TEXT("Raycast") : TEXT("Sweep"), Traits::IsMulti() ? TEXT("Multi") : (Traits::IsSingle() ? TEXT("Single") : TEXT("Test")));
+	#if ENABLE_NAN_DIAGNOSTIC
+					UE_LOG(LogCollision, Error, TEXT("--------TraceChannel : %d"), (int32)TraceChannel);
+					UE_LOG(LogCollision, Error, TEXT("--------Start : %s"), *StartRef.ToString());
+					UE_LOG(LogCollision, Error, TEXT("--------End : %s"), *EndtRef.ToString());
+					if (Traits::IsSweep())
+					{
+						UE_LOG(LogCollision, Error, TEXT("--------GeomRotation : %s"), *(GeomInputs.GetGeometryOrientation()->ToString()));
+					}
+					UE_LOG(LogCollision, Error, TEXT("--------%s"), *Params.ToString());
+	#endif
+				}
+
+				bHaveBlockingHit = bBlockingHit;
+			}
+		}
+	});
+
+
+	return bHaveBlockingHit;
+}
+
+template <typename Traits, typename PTTraits, typename TGeomInputs, typename TAccelContainer = FDefaultAccelContainer>
+bool TSceneCastCommon(const UWorld* World, TArray<typename Traits::TOutHits> & OutHits, const TGeomInputs& GeomInputs, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams, const TAccelContainer& AccelContainer = FDefaultAccelContainer{})
+{
+	if ((World == NULL) || (World->GetPhysicsScene() == NULL))
+	{
+		return false;
+	}
+
+	const EThreadQueryContext ThreadContext = GetThreadQueryContext(*World->GetPhysicsScene()->GetSolver());
+	if (ThreadContext == EThreadQueryContext::GTData)
+	{
+		return TSceneCastCommonImp<Traits, TGeomInputs>(World, OutHits, GeomInputs, Start, End, TraceChannel, Params, ResponseParams, ObjectParams, AccelContainer);
+	}
+	else
+	{
+		return TSceneCastCommonImp<PTTraits, TGeomInputs>(World, OutHits, GeomInputs, Start, End, TraceChannel, Params, ResponseParams, ObjectParams, AccelContainer);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+// RAYCAST
+
+bool FSodaPhysicsInterface::RaycastSingleScope(const UWorld* World, TArray<struct FHitResult>& OutHits, const TArray<FVector> & Start, const TArray<FVector> & End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams)
+{
+	using namespace ChaosInterface;
+
+	using TCastTraits = TSQTraits<FRaycastHit, ESweepOrRay::Raycast, ESingleMultiOrTest::Single>;
+	using TPTCastTraits = TSQTraits<FPTRaycastHit, ESweepOrRay::Raycast, ESingleMultiOrTest::Single>;
+	return TSceneCastCommon<TCastTraits, TPTCastTraits>(World, OutHits, FRaycastSQAdditionalInputs(), Start, End, TraceChannel, Params, ResponseParams, ObjectParams);
+}
+
+
+
+bool FSodaPhysicsInterface::RaycastMultiScope(const UWorld* World, TArray<TArray<struct FHitResult>>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams)
+{
+	using namespace ChaosInterface;
+
+	using TCastTraits = TSQTraits<FHitRaycast, ESweepOrRay::Raycast, ESingleMultiOrTest::Multi>;
+	using TPTCastTraits = TSQTraits<FPTRaycastHit, ESweepOrRay::Raycast, ESingleMultiOrTest::Multi>;
+	return TSceneCastCommon<TCastTraits, TPTCastTraits>(World, OutHits, FRaycastSQAdditionalInputs(), Start, End, TraceChannel, Params, ResponseParams, ObjectParams);
+}
+
+//////////////////////////////////////////////////////////////////////////
+// GEOM SWEEP
+
+
+bool FSodaPhysicsInterface::GeomSweepSingleScope(const UWorld* World, const struct FCollisionShape& CollisionShape, const FQuat& Rot, TArray<struct FHitResult>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams)
+{
+	using namespace ChaosInterface;
+
+	using TCastTraits = TSQTraits<FSweepHit, ESweepOrRay::Sweep, ESingleMultiOrTest::Single>;
+	using TPTCastTraits = TSQTraits<FPTSweepHit, ESweepOrRay::Sweep, ESingleMultiOrTest::Single>;
+	return TSceneCastCommon<TCastTraits, TPTCastTraits>(World, OutHits, FGeomSQAdditionalInputs(CollisionShape, Rot), Start, End, TraceChannel, Params, ResponseParams, ObjectParams);
+}
+
+bool FSodaPhysicsInterface::GeomSweepMultiScope(const UWorld* World, const FPhysicsGeometryCollection& InGeom, const FQuat& InGeomRot, TArray<TArray<FHitResult>>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const FCollisionQueryParams& Params, const FCollisionResponseParams& ResponseParams, const FCollisionObjectQueryParams& ObjectParams)
+{
+	using namespace ChaosInterface;
+
+	using TCastTraits = TSQTraits<FHitSweep, ESweepOrRay::Sweep, ESingleMultiOrTest::Multi>;
+	using TPTCastTraits = TSQTraits<FPTSweepHit, ESweepOrRay::Sweep, ESingleMultiOrTest::Multi>;
+	return TSceneCastCommon<TCastTraits, TPTCastTraits>(World, OutHits, FGeomCollectionSQAdditionalInputs(InGeom, InGeomRot), Start, End, TraceChannel, Params, ResponseParams, ObjectParams);
+}
+
+
+bool FSodaPhysicsInterface::GeomSweepMultiScope(const UWorld* World, const FCollisionShape& InGeom, const FQuat& InGeomRot, TArray<TArray<FHitResult>>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const FCollisionQueryParams& Params, const FCollisionResponseParams& ResponseParams, const FCollisionObjectQueryParams& ObjectParams)
+{
+	using namespace ChaosInterface;
+
+	using TCastTraits = TSQTraits<FHitSweep, ESweepOrRay::Sweep, ESingleMultiOrTest::Multi>;
+	using TPTCastTraits = TSQTraits<FPTSweepHit, ESweepOrRay::Sweep, ESingleMultiOrTest::Multi>;
+	return TSceneCastCommon<TCastTraits, TPTCastTraits>(World, OutHits, FGeomSQAdditionalInputs(InGeom, InGeomRot), Start, End, TraceChannel, Params, ResponseParams, ObjectParams);
+}
diff --git a/Source/UnrealSoda/Private/Misc/SodaRandomEngine.cpp b/Source/UnrealSoda/Private/Misc/SodaRandomEngine.cpp
new file mode 100644
index 0000000..991ce0d
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/SodaRandomEngine.cpp
@@ -0,0 +1,31 @@
+
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+#include "Soda/Misc/SodaRandomEngine.h"
+
+#include <limits>
+
+uint64 USodaRandomEngine::GenerateRandomId()
+{
+	// Tuned to be fast as this function might get called relatively often.
+	static thread_local std::mt19937_64 Engine((std::random_device())());
+	std::uniform_int_distribution< uint64 > Distribution(
+		std::numeric_limits< uint64 >::lowest(),
+		std::numeric_limits< uint64 >::max());
+	return Distribution(Engine);
+}
+
+int32 USodaRandomEngine::GenerateRandomSeed()
+{
+	std::random_device RandomDevice;
+	std::uniform_int_distribution< int32 > Distribution(
+		std::numeric_limits< int32 >::lowest(),
+		std::numeric_limits< int32 >::max());
+	return Distribution(RandomDevice);
+}
+
+int32 USodaRandomEngine::GenerateSeed()
+{
+	return GetUniformIntInRange(
+		std::numeric_limits< int32 >::lowest(),
+		std::numeric_limits< int32 >::max());
+}
diff --git a/Source/UnrealSoda/Private/Misc/SodaVehicleCommonExporter.cpp b/Source/UnrealSoda/Private/Misc/SodaVehicleCommonExporter.cpp
new file mode 100644
index 0000000..e8f18ae
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/SodaVehicleCommonExporter.cpp
@@ -0,0 +1,182 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaVehicleCommonExporter.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "Soda/VehicleComponents/Sensors/FisheyeCameraSensor.h"
+#include "Soda/UnrealSodaVersion.h"
+
+const FString FSodaVehicleCommonExporter::ExporterName = TEXT("Soda Sensors Common");
+const FString FSodaVehicleCommonExporter::ExporterFileType = TEXT("Soda Sensors Common (*.json)|*.json");
+
+bool FSodaVehicleCommonExporter::ExportToString(const ASodaVehicle* Vehicle, FString& JsonString)
+{
+	JsonString.Empty();
+
+	TSharedPtr<FJsonObject> RootObject = MakeShared<FJsonObject>();
+	RootObject->SetStringField("unreal_soda_ver", UNREALSODA_VERSION_STRING);
+	TSharedPtr<FJsonObject> SensorsObject = MakeShared<FJsonObject>();
+	RootObject->SetObjectField("sensors", SensorsObject);
+
+	TArray<USensorComponent*> Sensors;
+	Vehicle->GetComponents<USensorComponent>(Sensors);
+	for (auto Sensor : Sensors)
+	{
+		if (IsValid(Sensor))
+		{
+			TSharedPtr<FJsonObject> SensorObject = MakeShared<FJsonObject>();
+			TSharedPtr<FJsonObject> Int;
+			TSharedPtr<FJsonObject> Ext = GetSensorExtrinsics(Sensor);
+			if (UFisheyeCameraSensorComponent* FisheyeCameraSensor = Cast<UFisheyeCameraSensorComponent>(Sensor))
+			{
+				Int = GetFisheyeIntrinsics(FisheyeCameraSensor);
+			}
+			else if (UCameraBaseSensorComponent* CameraSensor = Cast<UCameraBaseSensorComponent>(Sensor))
+			{
+				Int = GetCameraIntrinsics(CameraSensor);
+			}
+			else if (UImuSensorComponent* ImuSensor = Cast<UImuSensorComponent>(Sensor))
+			{
+				Int = GetImuIntrinsics(ImuSensor);
+			}
+
+			if (Int)
+			{
+				SensorObject->SetObjectField("intrinsics", Int);
+			}
+			if (Ext)
+			{
+				SensorObject->SetObjectField("extrinsics", Ext);
+			}
+			SensorsObject->SetStringField("class", Sensor->GetClass()->GetName());
+			SensorsObject->SetObjectField(Sensor->GetName(), SensorObject);
+		}
+	}
+
+	TSharedRef< TJsonWriter<> > Writer = TJsonWriterFactory<>::Create(&JsonString);
+	if (!FJsonSerializer::Serialize(RootObject.ToSharedRef(), Writer))
+	{
+		UE_LOG(LogSoda, Error, TEXT("FSodaVehicleCommonExporter::ExportToString(); Can't serialize ot JSON "));
+		JsonString = "{}";
+		return false;
+	}
+	return true;
+}
+
+TSharedPtr<FJsonObject> FSodaVehicleCommonExporter::GetSensorExtrinsics(const USensorComponent* Sensor)
+{
+	FVector Loc = Sensor->GetRelativeLocation();
+	FRotator Rot = Sensor->GetRelativeRotation();
+	Loc = FVector(Loc.X, -Loc.Y, Loc.Z) / 100;
+	Rot = FRotator(Rot.Pitch, -Rot.Yaw, -Rot.Roll);
+	FMatrix Matrix = FRotationMatrix::Make(Rot);
+
+	TSharedPtr<FJsonObject> JsonObject = MakeShared<FJsonObject>();
+	TSharedPtr<FJsonObject> R = MakeShared<FJsonObject>();
+	TSharedPtr<FJsonObject> T = MakeShared<FJsonObject>();
+	JsonObject->SetObjectField(TEXT("R"), R);
+	JsonObject->SetObjectField(TEXT("T"), T);
+
+	R->SetNumberField("cols", 3);
+	R->SetNumberField("rows", 3);
+	R->SetArrayField("data", {
+		MakeShared<FJsonValueNumber>(Matrix.M[0][0]),
+		MakeShared<FJsonValueNumber>(Matrix.M[0][1]),
+		MakeShared<FJsonValueNumber>(Matrix.M[0][2]),
+		MakeShared<FJsonValueNumber>(Matrix.M[1][0]),
+		MakeShared<FJsonValueNumber>(Matrix.M[1][1]),
+		MakeShared<FJsonValueNumber>(Matrix.M[1][2]),
+		MakeShared<FJsonValueNumber>(Matrix.M[2][0]),
+		MakeShared<FJsonValueNumber>(Matrix.M[2][1]),
+		MakeShared<FJsonValueNumber>(Matrix.M[2][2])
+	});
+
+	T->SetNumberField("cols", 1);
+	T->SetNumberField("rows", 3);
+	T->SetArrayField("data", {
+		MakeShared<FJsonValueNumber>(Loc.X),
+		MakeShared<FJsonValueNumber>(Loc.Y),
+		MakeShared<FJsonValueNumber>(Loc.Z)
+	});
+
+	return JsonObject;
+}
+
+TSharedPtr<FJsonObject> FSodaVehicleCommonExporter::GetCameraIntrinsics(const UCameraBaseSensorComponent* Sensor)
+{
+	FCameraIntrinsics Intrinsics = Sensor->GetCameraIntrinsics();
+
+	TSharedPtr<FJsonObject> JsonObject = MakeShared<FJsonObject>();
+	TSharedPtr<FJsonObject> D = MakeShared<FJsonObject>();
+	TSharedPtr<FJsonObject> K = MakeShared<FJsonObject>();
+
+	D->SetNumberField("cols", 1);
+	D->SetNumberField("rows", 4);
+	D->SetArrayField("data", {
+		MakeShared<FJsonValueNumber>(Intrinsics.K1),
+		MakeShared<FJsonValueNumber>(Intrinsics.K2),
+		MakeShared<FJsonValueNumber>(Intrinsics.K3),
+		MakeShared<FJsonValueNumber>(Intrinsics.K4)
+	});
+
+	K->SetNumberField("cols", 3);
+	K->SetNumberField("rows", 3);
+	K->SetArrayField("data", {
+		MakeShared<FJsonValueNumber>(Intrinsics.Fx),
+		MakeShared<FJsonValueNumber>(0),
+		MakeShared<FJsonValueNumber>(Intrinsics.Cx),
+		MakeShared<FJsonValueNumber>(0),
+		MakeShared<FJsonValueNumber>(Intrinsics.Fy),
+		MakeShared<FJsonValueNumber>(Intrinsics.Cy),
+		MakeShared<FJsonValueNumber>(0),
+		MakeShared<FJsonValueNumber>(0),
+		MakeShared<FJsonValueNumber>(1.0)
+	});
+
+	JsonObject->SetObjectField("D", D);
+	JsonObject->SetObjectField("K", K);
+	JsonObject->SetNumberField("hfov", Sensor->GetHFOV());
+	JsonObject->SetNumberField("vfov", Sensor->GetVFOV());
+	JsonObject->SetNumberField("frame_width", Sensor->Width);
+	JsonObject->SetNumberField("frame_height", Sensor->Height);
+	JsonObject->SetStringField("projection_model", "opencv");
+
+	return JsonObject;
+}
+
+TSharedPtr<FJsonObject> FSodaVehicleCommonExporter::GetFisheyeIntrinsics(const UFisheyeCameraSensorComponent* Sensor)
+{
+	TSharedPtr<FJsonObject> JsonObject = GetCameraIntrinsics(Sensor);
+	check(JsonObject);
+	JsonObject->SetStringField("projection_model", "fisheye_opencv");
+	return JsonObject;
+}
+
+TSharedPtr<FJsonObject> FSodaVehicleCommonExporter::GetImuIntrinsics(const UImuSensorComponent* Sensor)
+{
+	TSharedPtr<FJsonObject> JsonObject = MakeShared<FJsonObject>();
+	TSharedPtr<FJsonObject> GyroBias = MakeShared<FJsonObject>();
+	TSharedPtr<FJsonObject> AccBias = MakeShared<FJsonObject>();
+
+	GyroBias->SetNumberField("cols", 1);
+	GyroBias->SetNumberField("rows", 3);
+	GyroBias->SetArrayField("data", {
+		MakeShared<FJsonValueNumber>(Sensor->NoiseParams.Gyro.ConstBias.X),
+		MakeShared<FJsonValueNumber>(Sensor->NoiseParams.Gyro.ConstBias.Y),
+		MakeShared<FJsonValueNumber>(Sensor->NoiseParams.Gyro.ConstBias.Z),
+	});
+
+	AccBias->SetNumberField("cols", 1);
+	AccBias->SetNumberField("rows", 3);
+	AccBias->SetArrayField("data", {
+		MakeShared<FJsonValueNumber>(Sensor->NoiseParams.Acceleration.ConstBias.X),
+		MakeShared<FJsonValueNumber>(Sensor->NoiseParams.Acceleration.ConstBias.X),
+		MakeShared<FJsonValueNumber>(Sensor->NoiseParams.Acceleration.ConstBias.X),
+	});
+
+	JsonObject->SetObjectField("gyro_bias", GyroBias);
+	JsonObject->SetObjectField("acc_bias", AccBias);
+
+	return JsonObject;
+}
diff --git a/Source/UnrealSoda/Private/Misc/SodaVehicleCommonExporter.h b/Source/UnrealSoda/Private/Misc/SodaVehicleCommonExporter.h
new file mode 100644
index 0000000..46f1ada
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/SodaVehicleCommonExporter.h
@@ -0,0 +1,25 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Dom/JsonObject.h"
+#include "Soda/Vehicles/ISodaVehicleExporter.h"
+
+class UImuSensorComponent;
+class UFisheyeCameraSensorComponent;
+class UCameraBaseSensorComponent;
+class USensorComponent;
+
+class FSodaVehicleCommonExporter : public ISodaVehicleExporter
+{
+public:
+	virtual bool ExportToString(const ASodaVehicle* Vehicle, FString& String) override;
+	virtual const FString& GetExporterName() const override { return ExporterName; }
+	virtual const FString& GetFileTypes() const override { return ExporterFileType; }
+
+	static const FString ExporterName;
+	static const FString ExporterFileType;
+
+	static TSharedPtr<FJsonObject> GetImuIntrinsics(const UImuSensorComponent* Sensor);
+	static TSharedPtr<FJsonObject> GetFisheyeIntrinsics(const UFisheyeCameraSensorComponent* Sensor);
+	static TSharedPtr<FJsonObject> GetCameraIntrinsics(const UCameraBaseSensorComponent* Sensor);
+	static TSharedPtr<FJsonObject> GetSensorExtrinsics(const USensorComponent* Sensor);
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/TelemetryGraph.cpp b/Source/UnrealSoda/Private/Misc/TelemetryGraph.cpp
new file mode 100644
index 0000000..872a30d
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/TelemetryGraph.cpp
@@ -0,0 +1,159 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/TelemetryGraph.h"
+#include "Engine/Engine.h"
+#include "Engine/Canvas.h"
+
+FFontRenderInfo FontRenderInfo;
+
+void FTelemetryGraph::Init(const FString & InTitle, int InWidth, int InHeight, float InMinY, float InMaxY, int InNumSamples, const TArray<FColor>& InColors)
+{
+	check(InColors.Num());
+
+	Title = InTitle;
+	Width = InWidth;
+	Height = InHeight;
+	MinY = InMinY;
+	MaxY = InMaxY;
+	NumSamples = InNumSamples;
+	Colors = InColors;
+	Points.SetNum(InColors.Num());
+
+	FontRenderInfo.bClipText = true;
+}
+
+void FTelemetryGraph::AddPoint(float Value, int Ind)
+{
+	Points[Ind].push_back(Value);
+	Points[Ind].pop_front();
+}
+
+float FTelemetryGraph::Draw(UCanvas* Canvas, float & XPos, float YPos)
+{
+	const float YPos0 = YPos;
+
+	for (auto& Pts : Points)
+	{
+		while (Pts.size() < NumSamples) Pts.push_back(MinY);
+	}
+
+	//inline float GetLastPoint() const { return Points.back(); }
+
+	FString Label = Title + FString::Printf(TEXT("[%.2f,%.2f]" /*%.3f*/),  MinY, MaxY/*, GetLastPoint()*/);
+	Canvas->SetDrawColor(FColor(255, 255, 0));
+	UFont *Font = GEngine->GetSmallFont();
+	Canvas->DrawText(Font, Label, XPos, YPos, 1.f, 1.f, FontRenderInfo);
+
+	float XL, YL;
+	Canvas->TextSize(Font, Label, XL, YL);
+	YPos += YL + 1;
+
+	for (int j = 0; j < Points.Num(); ++j)
+	{
+		Canvas->SetDrawColor(Colors[j]);
+		Canvas->DrawText(Font, FString::Printf(TEXT("%.3f"), Points[j].back()), XPos + 3, YPos + (YL * j + 1) + 3, 1.f, 1.f, FontRenderInfo);
+		//YPos += YL + 1;
+	}
+
+	YPos += 3;
+	FVector2D GraphPos = FVector2D(XPos, YPos);
+
+	FCanvasTileItem TileItem(GraphPos, GWhiteTexture, FVector2D(Width, Height), FLinearColor(0.0f, 0.125f, 0.0f, 0.25f));
+	TileItem.BlendMode = SE_BLEND_Translucent;
+	Canvas->DrawItem(TileItem);
+
+	FCanvasLineItem LineAsix( GraphPos + FVector2D(0, Height /2), GraphPos + FVector2D(Width, Height /2));
+	LineAsix.SetColor(FLinearColor(0.0f, 0.5f, 0.0f, 1.0f));
+	LineAsix.Draw(Canvas->Canvas);
+	Canvas->SetDrawColor(FColor(0, 32, 0, 128));
+
+	for (int j = 0; j < Points.Num(); ++j)
+	{
+		float PrevY = 0;
+		for (int i = 0; i < Width; ++i)
+		{
+			float x = float(NumSamples * i) / Width;
+			int x0 = int(x);
+			int x1 = int(x + 1.0);
+			float y0 = Points[j][x0];
+			float y1 = Points[j][x1];
+			float y = y0 + (y1 - y0) / float(x1 - x0) * float(x - x0);
+
+			y = (y - MinY) / (MaxY - MinY) * float(Height);
+			y = FMath::Clamp(y, 0.0f, float(Height));
+
+			if (i != 0)
+			{
+				FCanvasLineItem LineItem(
+					GraphPos + FVector2D(i - 1, Height - PrevY),
+					GraphPos + FVector2D(i, Height - y));
+				LineItem.SetColor(Colors[j]);
+				LineItem.Draw(Canvas->Canvas);
+			} 
+
+			PrevY = y;
+		}
+	}
+
+	YPos += Height;
+
+	XPos = GraphPos.X + Width + 10;
+	return YPos - YPos0 + 10.0f;
+}
+
+void FTelemetryGraphGrid::InitGrid(int Rows, int Cols, int InCellWidth, int InCellHeight, int InNumSamples)
+{
+	CellWidth = InCellWidth; 
+	CellHeight = InCellHeight; 
+	NumSamples = InNumSamples;
+
+	Grid.SetNum(Rows);
+	for (auto & Row : Grid) Row.SetNum(Cols);
+}
+
+FTelemetryGraphGrid::FCell & FTelemetryGraphGrid::InitCell(int Row, int Col, float MinY, float MaxY, const FString & Title, const FString & RowTitle, const TArray<FColor>& Colors, int OffsetX)
+{
+	check(Colors.Num());
+	FCell& Cell = Grid[Row][Col];
+	Cell.Graph.Init(Title, CellWidth, CellHeight, MinY, MaxY, NumSamples, Colors);
+	Cell.Caption = RowTitle;
+	Cell.Visible = true;
+	Cell.OffsetX = OffsetX;
+	return Cell;
+}
+
+void FTelemetryGraphGrid::AddPoint(int Row, int Col, float Value, int Ind)
+{
+	Grid[Row][Col].Graph.AddPoint(Value, Ind);
+}
+
+float FTelemetryGraphGrid::Draw(UCanvas* InCanvas, float & InXPos, float InYPos)
+{
+	UFont* RenderFont = GEngine->GetSmallFont();
+
+	float XPosMax = InXPos;
+	float XPos = InXPos;
+	float YPos = InYPos;
+	for(int i = 0; i < Grid.Num(); ++i )
+	{
+		XPos = InXPos;
+		float CaptionY = YPos; 
+		float GraphY = YPos;
+		float GraphShiftY = 0;
+		for(int j = 0; j < Grid[i].Num(); ++j )
+		{
+			if(Grid[i][j].Visible)
+			{
+				XPos += Grid[i][j].OffsetX;
+				InCanvas->SetDrawColor(FColor::White);
+				GraphY = CaptionY + InCanvas->DrawText(RenderFont, *Grid[i][j].Caption, XPos, CaptionY, 1.f, 1.f, FontRenderInfo);
+				GraphShiftY = Grid[i][j].Graph.Draw(InCanvas, XPos, GraphY);
+			}
+		}
+		YPos = GraphY + GraphShiftY;
+		XPosMax = std::max(XPosMax, XPos);
+	}
+
+	InXPos = XPosMax;
+	return (YPos - InYPos);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Misc/TrajectoryPlaner.cpp b/Source/UnrealSoda/Private/Misc/TrajectoryPlaner.cpp
new file mode 100644
index 0000000..682154e
--- /dev/null
+++ b/Source/UnrealSoda/Private/Misc/TrajectoryPlaner.cpp
@@ -0,0 +1,479 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Misc/TrajectoryPlaner.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/Actors/NavigationRoute.h"
+#include "EngineUtils.h"
+
+FTrajectoryPlaner::FWayPoint::FWayPoint(const FVector& InLocation, ANavigationRoute* InRoute)
+	: Location(InLocation)
+	, OwndedRoute(InRoute)
+{}
+
+
+FTrajectoryPlaner::~FTrajectoryPlaner()
+{
+	Deinit();
+}
+
+void FTrajectoryPlaner::Init(UWorld* World)
+{
+	check(World);
+	check(RouteSpline == nullptr);
+
+	RouteSpline = NewObject< USplineComponent >(World);
+	RouteSpline->RegisterComponentWithWorld(World);
+}
+
+void FTrajectoryPlaner::Deinit()
+{
+	if (IsValid(RouteSpline))
+	{
+		RouteSpline->DestroyComponent();
+	}
+	RouteSpline = nullptr;
+}
+
+USplineComponent* FTrajectoryPlaner::FindNearestRoute(
+	const UWorld* World,
+	const FTransform& Transform,
+	float MaxCodirAng,
+	float MaxDistance,
+	float MaxDistanceToEnd,
+	ANavigationRoute** OutRoutePlanner,
+	float* OutSplineOffest
+)
+{
+	USplineComponent* NearestSpline = nullptr;
+	float NearestDistance = TNumericLimits< float >::Max();
+	float NearestSplineKey = 0;
+	float NearestSplineKeyDistance = 0;
+
+	const FVector ActorLocation = Transform.GetTranslation();
+	const FVector ActorForwardVector = Transform.GetUnitAxis(EAxis::X);
+
+	for (TActorIterator< ANavigationRoute > It(World); It; ++It)
+	{
+		if ((*It)->bAllowForVehicles)
+		{
+			float Key = (*It)->Spline->FindInputKeyClosestToWorldLocation(ActorLocation);
+			FVector Location = (*It)->Spline->GetLocationAtSplineInputKey(Key, ESplineCoordinateSpace::World);
+			FVector Direction = (*It)->Spline->GetDirectionAtSplineInputKey(Key, ESplineCoordinateSpace::World);
+
+			float Distance = (Location - Location).Size();
+			float Angle = FMath::Acos(ActorForwardVector.CosineAngle2D(Direction)) / M_PI * 180;
+
+			if ((Distance < MaxDistance) && (Distance < NearestDistance) && (Angle < MaxCodirAng))
+			{
+				float KeyDistance = USodaStatics::GetDistanceAlongSpline(Key, (*It)->Spline);
+				if ((*It)->Spline->GetSplineLength() - KeyDistance > 200)
+				{
+					NearestDistance = Distance;
+					NearestSpline = (*It)->Spline;
+					NearestSplineKey = Key;
+					NearestSplineKeyDistance = KeyDistance;
+					if (OutRoutePlanner) *OutRoutePlanner = *It;
+				}
+			}
+		}
+	}
+
+	if (OutSplineOffest) *OutSplineOffest = NearestSplineKeyDistance;
+
+	return NearestSpline;
+}
+
+ANavigationRoute* FTrajectoryPlaner::FindRoutePlannerOverlapedByActor(const AActor* InActor)
+{
+	for (TActorIterator< ANavigationRoute > It(InActor->GetWorld()); It; ++It)
+	{
+		ANavigationRoute* RoutePlanner = *It;
+
+		if (RoutePlanner->bAllowForVehicles)
+		{
+			// Check if we are inside this route planner.
+			TSet< AActor* > OverlappingActors;
+			RoutePlanner->TriggerVolume->GetOverlappingActors(OverlappingActors, ASodaWheeledVehicle::StaticClass());
+			for (auto* Actor : OverlappingActors)
+			{
+				if (Actor == InActor)
+				{
+					return RoutePlanner;
+				}
+			}
+		}
+	}
+	return nullptr;
+}
+
+ANavigationRoute* FTrajectoryPlaner::FindRoutePlannerOverlapedByPoint(const UObject* WorldContextObject, const FVector& TargetLocation, bool bDriveBackvard, const TSet<FString>& AllowedRouteTags)
+{
+	for (TActorIterator< ANavigationRoute > It(WorldContextObject->GetWorld()); It; ++It)
+	{
+		ANavigationRoute* RoutePlanner = *It;
+
+		if (AllowedRouteTags.Num())
+		{
+			if (!RoutePlanner->IsRouteTagsAllowed(AllowedRouteTags))
+			{
+				continue;
+			}
+		}
+
+		if (RoutePlanner->bAllowForVehicles)
+		{
+			if (IsPointInsideBox(TargetLocation, RoutePlanner->TriggerVolume) && RoutePlanner->bDriveBackvard == bDriveBackvard)
+			{
+				return RoutePlanner;
+			}
+		}
+	}
+	return nullptr;
+}
+
+bool FTrajectoryPlaner::IsPointInsideBox(const FVector& Point, const UBoxComponent* BoxComponent, float Border)
+{
+	float xmin = BoxComponent->GetComponentLocation().X - BoxComponent->GetScaledBoxExtent().X - Border;
+	float xmax = BoxComponent->GetComponentLocation().X + BoxComponent->GetScaledBoxExtent().X + Border;
+	float ymin = BoxComponent->GetComponentLocation().Y - BoxComponent->GetScaledBoxExtent().Y - Border;
+	float ymax = BoxComponent->GetComponentLocation().Y + BoxComponent->GetScaledBoxExtent().Y + Border;
+	float zmin = BoxComponent->GetComponentLocation().Z - BoxComponent->GetScaledBoxExtent().Z - Border;
+	float zmax = BoxComponent->GetComponentLocation().Z + BoxComponent->GetScaledBoxExtent().Z + Border;
+
+	if ((Point.X <= xmax && Point.X >= xmin) && (Point.Y <= ymax && Point.Y >= ymin) && (Point.Z <= zmax && Point.Z >= zmin))
+	{
+		return true;
+	}
+	return false;
+}
+
+bool FTrajectoryPlaner::UpdateTarjectory(const UWorld* World, const FTransform& Transform, float PreloadDistance, const TSet<FString>& AllowedRouteTags)
+{
+	bool bAddedSpline = false;
+
+	FVector CurrentLocation = Transform.GetTranslation();
+	FRotator CurrentRotation = Transform.GetRotation().Rotator();
+
+	/* Remove passed points */
+	/*
+	if (bAutoSweep)
+	{
+		for (int i = int(CurrentSplineKey); i < WayPoints.Num(); ++i)
+		{
+			if ((WayPoints[i].Location - CurrentLocation).CosineAngle2D(CurrentRotation.Vector()) < 0)
+			{
+				CurrentSplineKey = i;
+			}
+			else
+			{
+				break;
+			}
+		}
+	}
+	*/
+
+	int WayPointsNum = WayPoints.Num() - int(CurrentSplineKey);
+
+	/* Try to append route */
+	if (WayPointsNum > 1)
+	{
+		FVector PrevLocation = CurrentLocation;
+		float DistToRouteEnd = 0;
+
+		for (size_t i = (size_t)CurrentSplineKey; i < WayPoints.Num(); ++i)
+		{
+			DistToRouteEnd += FVector::Dist(WayPoints[i].Location, PrevLocation);
+			PrevLocation = WayPoints[i].Location;
+		}
+
+		if (DistToRouteEnd < PreloadDistance)
+		{
+			if (ANavigationRoute* RoutePlanner = FindRoutePlannerOverlapedByPoint(World, WayPoints.Last().Location, false, AllowedRouteTags))
+			{
+				if (const USplineComponent* Route = RoutePlanner->GetSpline())
+				{
+					AddRouteBySpline(Route, 0, RoutePlanner, RoutePlanner->bDriveBackvard, false);
+					bAddedSpline = true;
+				}
+			}
+		}
+	}
+
+	/* Try to find new route */
+
+	/*
+	if (WayPointsNum == 0)
+	{
+		ANavigationRoute* RoutePlanne = FindRoutePlannerOverlapedByActor(Actor);
+		const USplineComponent* Route = nullptr;
+		float RouteOffest = 0;
+		if (RoutePlanne)
+		{
+			Route = RoutePlanne->GetSpline();
+		}
+		if (!Route)
+		{
+			Route = FindNearestRoute(World, Transform, 90, 500, 500, &RoutePlanne, &RouteOffest);
+		}
+		if (RoutePlanne && Route)
+		{
+			SetFixedRouteBySpline(Route, RoutePlanne->bDriveBackvard, false, RouteOffest);
+			bAddedSpline = true;
+		}
+	}
+	*/
+
+	return bAddedSpline;
+}
+
+bool FTrajectoryPlaner::AddRouteBySpline(const USplineComponent* SplineRoute, float StartOffset, ANavigationRoute* OwnedRoute, bool bNewDriveBackvard, bool bOverwriteCurrent, bool bUpdateSpline)
+{
+	const float Step = 50; // Points step in [cm]
+	const int Size = ((SplineRoute->GetSplineLength() - StartOffset) / Step);
+
+	if (Size <= 1)
+	{
+		return false;
+	}
+
+	if (bOverwriteCurrent)
+	{
+		WayPoints.Reset(0);
+		CurrentSplineKey = 0;
+	}
+	else
+	{
+		WayPoints.RemoveAt(0, (int)CurrentSplineKey);
+		CurrentSplineKey = CurrentSplineKey - (int)CurrentSplineKey;
+	}
+
+	for (auto i = 0; i < Size; ++i)
+	{
+		WayPoints.Add(FWayPoint(SplineRoute->GetLocationAtDistanceAlongSpline(StartOffset + i * Step, ESplineCoordinateSpace::World), OwnedRoute));
+	}
+
+	if (bUpdateSpline)
+	{
+		UpdateSpline();
+	}
+
+	return true;
+}
+
+bool FTrajectoryPlaner::AddRouteByWaypoints(const TArray< FVector >& Locations, ANavigationRoute* OwnedRoute, bool bNewDriveBackvard, bool bOverwriteCurrent, bool bUpdateSpline)
+{
+	if (bOverwriteCurrent)
+	{
+		WayPoints.Reset(0);
+		CurrentSplineKey = 0;
+	}
+	else
+	{
+		WayPoints.RemoveAt(0, (int)CurrentSplineKey);
+		CurrentSplineKey = CurrentSplineKey - (int)CurrentSplineKey;
+	}
+
+	for (auto& Location : Locations)
+	{
+		if (WayPoints.Num() == 0)
+			WayPoints.Add({Location, OwnedRoute});
+		else if ((WayPoints.Last().Location - Location).Size() > SamePointsDelta)
+			WayPoints.Add({ Location, OwnedRoute });
+	}
+
+	if (bUpdateSpline)
+	{
+		UpdateSpline();
+	}
+
+	return !!Locations.Num();
+}
+
+bool FTrajectoryPlaner::AddRouteByTransfoms(const FTransform& StartTransform, const FTransform& EndTransform, ANavigationRoute* OwnedRoute, bool bNewDriveBackvard, bool bOverwriteCurrent, bool bUpdateSpline)
+{
+	const float TangentSize = (StartTransform.GetTranslation() - EndTransform.GetTranslation()).Size();
+	FInterpCurveVector JoiningCurve;
+	JoiningCurve.Points.Add(FInterpCurvePoint<FVector>(
+		0,
+		StartTransform.GetTranslation(),
+		FVector::ZeroVector,
+		StartTransform.GetUnitAxis(EAxis::X) * TangentSize,
+		CIM_CurveUser));
+	JoiningCurve.Points.Add(FInterpCurvePoint<FVector>(
+		1,
+		EndTransform.GetTranslation(),
+		EndTransform.GetUnitAxis(EAxis::X) * TangentSize,
+		FVector::ZeroVector,
+		CIM_CurveUser));
+
+	TArray< FVector > Points;
+	const int Steps = 20;
+	Points.Reserve(Steps + 1);
+	for (int i = 0; i <= Steps; ++i)
+	{
+		Points.Add(JoiningCurve.Eval(i / float(Steps)));
+	}
+
+	return AddRouteByWaypoints(Points, OwnedRoute, bNewDriveBackvard, bOverwriteCurrent, bUpdateSpline);
+}
+
+void FTrajectoryPlaner::UpdateSpline()
+{
+	if (IsValid(RouteSpline))
+	{
+		RouteSpline->ClearSplinePoints(false);
+
+		TArray<FVector> Tmp;
+		Tmp.Reserve(WayPoints.Num());
+		for (auto& It : WayPoints)  Tmp.Add(It.Location);
+		RouteSpline->ClearSplinePoints(false);
+		RouteSpline->SetSplinePoints(Tmp, ESplineCoordinateSpace::World, true);
+	}
+}
+
+void FTrajectoryPlaner::DrawRoute(const UObject* WorldContextObject) const
+{
+	for (int j = 0, lenNumPoints = WayPoints.Num() - 1; j < lenNumPoints; ++j)
+	{
+		FVector p0 = WayPoints[j + 0].Location;
+		FVector p1 = WayPoints[j + 1].Location;
+
+		if (CurrentSplineKey <= j)
+		{
+			DrawDebugLine(WorldContextObject->GetWorld(), p0, p1, FColor(0, 255, 0), false, -1.f, 0, 20);
+		}
+		else
+		{
+			p0.Z -= 20;
+			p1.Z -= 20;
+			DrawDebugLine(WorldContextObject->GetWorld(), p0, p1, FColor(150, 150, 150), false, -1.f, 0, 20);
+		}
+	}
+}
+
+/*
+bool FTrajectoryPlaner::GoToNearesRoute(const UWorld * World, const FTransform & InTransform)
+{
+	float SplineOffest = 0;
+	USplineComponent* NearestSpline = FindNearestRoute(
+		World, InTransform, 45, 200, 200, nullptr, &SplineOffest);
+
+	if (!NearestSpline)
+	{
+		return false;
+	}
+
+	const FTransform Transform = NearestSpline->GetTransformAtDistanceAlongSpline(SplineOffest + WayOutOffset, ESplineCoordinateSpace::World, false);
+	const FVector StartLocation = InTransform.GetTranslation();
+	const FVector StartForwardVector = InTransform.GetUnitAxis(EAxis::X);
+	const FVector EndLocation = Transform.GetTranslation();
+	const FVector EndForwardVector = Transform.GetRotation().GetForwardVector();
+
+	check(IsValid(RouteSpline));
+	RouteSpline->ClearSplinePoints(false);
+	RouteSpline->AddPoint(FSplinePoint(0, StartLocation, StartForwardVector * WayOutTangentSize, StartForwardVector * WayOutTangentSize), false);
+	RouteSpline->AddPoint(FSplinePoint(1, EndLocation, EndForwardVector * WayOutTangentSize, EndForwardVector * WayOutTangentSize), true);
+
+	AddRouteBySpline(RouteSpline, false, true, 0, false);
+	AddRouteBySpline(NearestSpline, false, false, SplineOffest + WayOutOffset, true);
+
+	CurrentSplineKey = 0;
+
+	return true;
+}
+*/
+
+void FTrajectoryPlaner::Reset()
+{
+	CurrentSplineKey = 0;
+	WayPoints.Reset(0);
+	RouteSpline->ClearSplinePoints(true);
+}
+
+bool FTrajectoryPlaner::GoToLeftRoute(const UWorld* World, const FTransform& Transform, float Offset)
+{
+	if (int(CurrentSplineKey) < WayPoints.Num())
+	{
+		if (ANavigationRoute* OwndedRoute = WayPoints[int(CurrentSplineKey)].OwndedRoute.Get())
+		{
+			if (ANavigationRoute* LeftRoute = OwndedRoute->LeftRoute.Get())
+			{
+				return GoToRoute(World, Transform, Offset, LeftRoute);
+			}
+		}
+	}
+	return false;
+}
+
+bool FTrajectoryPlaner::GoToRightRoute(const UWorld* World, const FTransform& Transform, float Offset)
+{
+	if (int(CurrentSplineKey) < WayPoints.Num())
+	{
+		if (ANavigationRoute* OwndedRoute = WayPoints[int(CurrentSplineKey)].OwndedRoute.Get())
+		{
+			if (ANavigationRoute* RightRoute =OwndedRoute->RightRoute.Get())
+			{
+				return GoToRoute(World, Transform, Offset, RightRoute);
+			}
+		}
+	}
+	return false;
+}
+
+bool FTrajectoryPlaner::GoToRoute(const UWorld* World, const FTransform& Transform, float Offset, ANavigationRoute* Route)
+{
+	if (Route)
+	{
+		const float Key = Route->Spline->FindInputKeyClosestToWorldLocation(Transform.GetTranslation());
+		const float RouteOffset = Route->Spline->GetDistanceAlongSplineAtSplineInputKey(Key) + Offset;
+
+		if (RouteOffset <= Route->Spline->GetSplineLength())
+		{
+			const FTransform EndTransform = Route->Spline->GetTransformAtDistanceAlongSpline(RouteOffset, ESplineCoordinateSpace::World);
+			AddRouteByTransfoms(Transform, EndTransform, Route, false, true, false);
+			WayPoints.Pop();
+			AddRouteBySpline(Route->Spline, RouteOffset, Route, false, false, true);
+			CurrentSplineKey = 0;
+			return true;
+		}
+	}
+	return false;
+}
+
+void FTrajectoryPlaner::SetCurrentSplineKey(float Key)
+{
+	CurrentSplineKey = FMath::Clamp<float>(Key, 0.f, WayPoints.Num() - 1);
+}
+
+const FTrajectoryPlaner::FWayPoint* FTrajectoryPlaner::GetCurrentWayPoint() const
+{
+	int Ind = int(CurrentSplineKey);
+	if (Ind < WayPoints.Num())
+	{
+		return &WayPoints[Ind];
+	}
+	else
+	{
+		return nullptr;
+	}
+}
+
+FVector::FReal FTrajectoryPlaner::GetCurvatureAtKey(float Param) const
+{
+	// Since we need the first derivative (e.g. very similar to direction) to have its norm, we'll get the value directly
+	const FVector FirstDerivative = RouteSpline->SplineCurves.Position.EvalDerivative(Param, FVector::ZeroVector);
+	const FVector::FReal FirstDerivativeLength = FMath::Max(FirstDerivative.Length(), UE_DOUBLE_SMALL_NUMBER);
+	const FVector ForwardVector = FirstDerivative / FirstDerivativeLength;
+	const FVector SecondDerivative = RouteSpline->SplineCurves.Position.EvalSecondDerivative(Param, FVector::ZeroVector);
+	// Orthogonalize the second derivative and obtain the curvature vector
+	const FVector CurvatureVector = SecondDerivative - (SecondDerivative | ForwardVector) * ForwardVector;
+
+	// Finally, the curvature is the ratio of the norms of the curvature vector over the first derivative norm
+	const FVector::FReal Curvature = CurvatureVector.Length() / FirstDerivativeLength;
+
+	// Compute sign based on sign of curvature vs. right axis
+	const FVector RightVector = RouteSpline->GetRightVectorAtSplineInputKey(Param, ESplineCoordinateSpace::Local);
+	return FMath::Sign(RightVector | CurvatureVector) * Curvature;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioAction.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioAction.cpp
new file mode 100644
index 0000000..55d3f2c
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioAction.cpp
@@ -0,0 +1,192 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioAction.h"
+#include "Components/BoxComponent.h"
+#include "Components/BillboardComponent.h"
+#include "Soda/SodaTypes.h"
+#include "Soda/SodaGameMode.h"
+#include "UI/ScenarioAction/SScenarioActionEditor.h"
+#include "SodaStyleSet.h"
+#include "Soda/ScenarioAction/ScenarioActionConditionFunctionLibrary.h"
+#include "Soda/ScenarioAction/ScenarioActionBlock.h"
+#include "Soda/ScenarioAction/ScenarioActionEvent.h"
+#include "Styling/StyleColors.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Widgets/SWindow.h"
+#include "Soda/Misc/SerializationHelpers.h"
+
+AScenarioAction::AScenarioAction()
+{
+	PrimaryActorTick.bCanEverTick = true;
+}
+
+UScenarioActionBlock* AScenarioAction::CreateNewBlock()
+{
+	UScenarioActionBlock *& ScenarioBlock = ScenarioBlocks.Add_GetRef(NewObject< UScenarioActionBlock>(this));
+	check(ScenarioBlock);
+	ScenarioBlock->OwnedScenario = this;
+	return ScenarioBlock;
+}
+
+bool AScenarioAction::RemoveBlock(UScenarioActionBlock* Block)
+{
+	return ScenarioBlocks.Remove(Block) > 0;
+}
+
+void AScenarioAction::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void AScenarioAction::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+	CloseEditorWindow();
+}
+
+void AScenarioAction::Tick(float DeltaTime)
+{
+	Super::Tick(DeltaTime);
+
+	if (USodaGameModeComponent::Get()->IsScenarioRunning())
+	{
+		for (auto& It : ScenarioBlocks)
+		{
+			for (auto& EventIt : It->Events)
+			{
+				EventIt->Tick(DeltaTime);
+			}
+		}
+	}
+}
+
+void AScenarioAction::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame())
+	{
+		if (Ar.IsSaving())
+		{
+			int Num = ScenarioBlocks.Num();
+			Ar << Num;
+			for (auto& It : ScenarioBlocks)
+			{
+				FObjectRecord Record;
+				Record.SerializeObject(It);
+				Ar << Record;
+			}
+		}
+		else if (Ar.IsLoading())
+		{
+			int Num = 0;
+			Ar << Num;
+			for (int i = 0; i < Num; ++i)
+			{
+				FObjectRecord Record;
+				Ar << Record;
+				if (Record.IsRecordValid())
+				{
+					UScenarioActionBlock* Block = CreateNewBlock();
+					Record.DeserializeObject(Block);
+				}
+			}
+		}
+	}
+}
+
+void AScenarioAction::ScenarioBegin()
+{
+	CloseEditorWindow();
+
+	for (auto& It : ScenarioBlocks)
+	{
+		It->ResetExexuteCounter();
+		for (auto& EventIt : It->Events)
+		{
+			EventIt->EventDelegate.BindUObject(It, &UScenarioActionBlock::OnEvent);
+			EventIt->ScenarioBegin();
+		}
+	}
+}
+
+void AScenarioAction::ScenarioEnd()
+{
+	for (auto& It : ScenarioBlocks)
+	{
+		for (auto& EventIt : It->Events)
+		{
+			EventIt->ScenarioEnd();
+			EventIt->EventDelegate.Unbind();
+		}
+	}
+}
+
+TSharedPtr<SWidget> AScenarioAction::GenerateToolBar()
+{
+	FUniformToolBarBuilder ToolbarBuilder(TSharedPtr<const FUICommandList>(), FMultiBoxCustomization::None);
+	ToolbarBuilder.SetStyle(&FSodaStyle::Get(), "PaletteToolBar");
+	ToolbarBuilder.BeginSection(NAME_None);
+	ToolbarBuilder.AddToolBarButton(
+		FUIAction(
+			FExecuteAction::CreateLambda([this] 
+			{
+				CloseEditorWindow();
+				TSharedRef<SWindow> NewSlateWindow = SNew(SWindow)
+					.Title(FText::FromString(TEXT("Scenario Action Editor")))
+					.ClientSize(FVector2D(800, 600));
+				FSlateApplication::Get().AddWindow(NewSlateWindow);
+				NewSlateWindow->SetContent(
+					SAssignNew(ScenarioActionEditor, SScenarioActionEditor, this)
+				);
+			})),
+		NAME_None, 
+		FText::FromString("Editor"),
+		FText::FromString("Open Scenario Action Editor"), 
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "ScenarioAction.OpenEditor"),
+		EUserInterfaceActionType::Button
+	);
+	ToolbarBuilder.EndSection();
+
+	return
+		SNew(SBorder)
+		.BorderImage(FAppStyle::GetBrush("WhiteBrush"))
+		.BorderBackgroundColor(FStyleColors::Panel)
+		.Padding(3)
+		[
+			ToolbarBuilder.MakeWidget()
+		];
+}
+
+void AScenarioAction::CloseEditorWindow()
+{
+	if (ScenarioActionEditor.IsValid())
+	{
+		TSharedPtr<SWindow> ContainingWindow = FSlateApplication::Get().FindWidgetWindow(ScenarioActionEditor.ToSharedRef());
+		if (ContainingWindow.IsValid())
+		{
+			ContainingWindow->RequestDestroyWindow();
+		}
+	}
+
+	ScenarioActionEditor.Reset();
+}
+
+const FSodaActorDescriptor* AScenarioAction::GenerateActorDescriptor() const
+{
+
+	static FSodaActorDescriptor Desc{
+		TEXT("Scenario Action"), /*DisplayName*/
+		TEXT("Scenario"), /*Category*/
+		TEXT("Experimental"), /*SubCategory*/
+		TEXT("Icons.Sequence"), /*Icon*/
+		true, /*bAllowTransform*/
+		true, /*bAllowSpawn*/
+		FVector(0, 0, 50), /*SpawnOffset*/
+	};
+	return &Desc;
+}
+
+
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionBlock.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionBlock.cpp
new file mode 100644
index 0000000..8d8fc46
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionBlock.cpp
@@ -0,0 +1,166 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionBlock.h"
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Soda/ScenarioAction/ScenarioActionCondition.h"
+#include "Soda/ScenarioAction/ScenarioActionEvent.h"
+#include "Soda/Misc/SerializationHelpers.h"
+
+UScenarioActionBlock::UScenarioActionBlock(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+}
+
+void UScenarioActionBlock::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame())
+	{
+		
+		if (Ar.IsSaving())
+		{
+			// Saving the ConditionMatrix
+			int ConditionRowNum = ConditionMatrix.Num();
+			Ar << ConditionRowNum;
+			for (int i = 0; i < ConditionRowNum; ++i)
+			{
+				int ColNum = ConditionMatrix[i].ScenarioConditiones.Num();
+				Ar << ColNum;
+				for (int j = 0; j < ColNum; ++j)
+				{
+					UScenarioActionCondition* ActionCondition = ConditionMatrix[i].ScenarioConditiones[j];
+					check(IsValid(ActionCondition));
+					FObjectRecord Record;
+					Record.SerializeObject(ActionCondition);
+					Ar << Record;
+				}
+			}
+
+			// Saving the ActionNodes
+			int ActionRootNum = ActionRootNodes.Num();
+			Ar << ActionRootNum;
+			for (int i = 0; i < ActionRootNum; ++i)
+			{
+				UScenarioActionNode* ActionNode = ActionRootNodes[i];
+				check(IsValid(ActionNode));
+				FObjectRecord Record;
+				Record.SerializeObject(ActionNode);
+				Ar << Record;
+			}
+
+			// Saving the Events
+			int EventsNum = Events.Num();
+			Ar << EventsNum;
+			for (int i = 0; i < EventsNum; ++i)
+			{
+				UScenarioActionEvent* Event = Events[i];
+				check(IsValid(Event));
+				FObjectRecord Record;
+				Record.SerializeObject(Event);
+				Ar << Record;
+			}
+			
+		}
+		else if (Ar.IsLoading())
+		{
+			// Loading the ConditionMatrix
+			int ConditionRowNum = 0;
+			Ar << ConditionRowNum;
+			ConditionMatrix.SetNum(ConditionRowNum);
+			for (int i = 0; i < ConditionRowNum; ++i)
+			{
+				int ColNum = 0;
+				Ar << ColNum;
+				for (int j = 0; j < ColNum; ++j)
+				{
+					FObjectRecord Record;
+					Ar << Record;
+					if (Record.IsRecordValid())
+					{
+						UScenarioActionCondition *& ActionCondition = ConditionMatrix[i].ScenarioConditiones.Add_GetRef(nullptr);
+						ActionCondition = NewObject<UScenarioActionCondition>(this, Record.Class.Get());
+						check(ActionCondition);
+						Record.DeserializeObject(ActionCondition);
+					}
+				}
+			}
+
+			// Loading the ActionNodes
+			int ActionRootNum = 0;
+			Ar << ActionRootNum;
+			for (int i = 0; i < ActionRootNum; ++i)
+			{
+				FObjectRecord Record;
+				Ar << Record;
+				if (Record.IsRecordValid())
+				{
+					UScenarioActionNode*& ActionNode = ActionRootNodes.Add_GetRef(nullptr);
+					ActionNode = NewObject<UScenarioActionNode>(this, Record.Class.Get());
+					check(ActionNode);
+					Record.DeserializeObject(ActionNode);
+				}
+			}
+
+			// Loading the Events
+			int EventsNum = Events.Num();
+			Ar << EventsNum;
+			for (int i = 0; i < EventsNum; ++i)
+			{
+				FObjectRecord Record;
+				Ar << Record;
+				if (Record.IsRecordValid())
+				{
+					UScenarioActionEvent*& Event = Events.Add_GetRef(nullptr);
+					Event = NewObject<UScenarioActionEvent>(this, Record.Class.Get());
+					check(Event);
+					Record.DeserializeObject(Event);
+				}
+			}
+		}
+	}
+}
+
+void UScenarioActionBlock::ExecuteActions()
+{
+	for (auto& It : ActionRootNodes)
+	{
+		if (IsValid(It))
+		{
+			It->Execute();
+		}
+	}
+	++ExexuteCounter;
+}
+
+bool UScenarioActionBlock::ExecuteConditionMatrix()
+{
+	bool ThereIsCell = false;
+
+	for (auto& Row : ConditionMatrix)
+	{
+		bool RowRes = true;
+		for (auto& Col : Row.ScenarioConditiones)
+		{
+			ThereIsCell = true;
+			RowRes = RowRes && Col->Execute();
+			if (!RowRes) break;
+		}
+		if (RowRes) return true;
+	}
+
+	return !ThereIsCell;
+}
+
+bool UScenarioActionBlock::ExecuteBlock()
+{
+	if (GetActionBlockMode() == EScenarioActionBlockMode::MultipleExecute || ExexuteCounter == 0)
+	{
+		if (ExecuteConditionMatrix())
+		{
+			ExecuteActions();
+			return true;
+		}
+	}
+	return false;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionCondition.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionCondition.cpp
new file mode 100644
index 0000000..1a962af
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionCondition.cpp
@@ -0,0 +1,100 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionCondition.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IStructureDetailsView.h"
+#include "RuntimeMetaData.h"
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "Modules/ModuleManager.h"
+
+UScenarioActionCondition::UScenarioActionCondition(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("No Name"));
+}
+
+UScenarioActionConditionFunction::UScenarioActionConditionFunction(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+}
+
+void UScenarioActionConditionFunction::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame())
+	{
+		if (Ar.IsLoading() && Function.IsValid())
+		{
+			StructOnScope = MakeShared<FStructOnScope>(Function.Get());
+			DisplayName = FRuntimeMetaData::GetDisplayNameText(Function.Get());
+		}
+		FScenarioActionUtils::SerializeUStruct(Ar, Function.Get(), Function.IsValid() ? StructOnScope->GetStructMemory() : nullptr, true);
+	}
+}
+
+TSharedRef< SWidget > UScenarioActionConditionFunction::MakeWidget()
+{
+	if (StructOnScope)
+	{
+		int NumProperties = 0;
+		for (TFieldIterator<FProperty> It(StructOnScope->GetStruct()); It; ++It)
+		{
+			if (!It->HasAnyPropertyFlags(CPF_ReturnParm)) ++NumProperties;
+		}
+
+		//TSharedPtr< SWidget > Body;
+		if (NumProperties)
+		{
+			FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+			soda::FDetailsViewArgs Args;
+			Args.bHideSelectionTip = true;
+			Args.bLockable = false;
+			Args.bShowOptions = false;
+			Args.bAllowSearch = false;
+			Args.NameAreaSettings = soda::FDetailsViewArgs::HideNameArea;
+			Args.bHideRightColumn = true;
+			soda::FStructureDetailsViewArgs StructureArgs;
+			return RuntimeEditorModule.CreateStructureDetailView(Args, StructureArgs, StructOnScope)->GetWidget().ToSharedRef();
+		}
+	}
+	return SNullWidget::NullWidget;
+}
+
+bool UScenarioActionConditionFunction::Execute()
+{
+	//FScopedScriptExceptionHandler ExceptionHandler([](ELogVerbosity::Type Verbosity, const TCHAR* ExceptionMessage, const TCHAR* StackMessage) {});
+	FEditorScriptExecutionGuard ScriptGuard;
+
+	if (Function && StructOnScope.IsValid() && FunctionOwner.IsValid())
+	{
+		if (FProperty* RetProperty = Function->GetReturnProperty())
+		{
+			FunctionOwner.Get()->GetDefaultObject()->ProcessEvent(Function.Get(), StructOnScope->GetStructMemory());
+			bool* ReValue = RetProperty->ContainerPtrToValuePtr<bool>(StructOnScope->GetStructMemory());
+			if (ReValue)
+			{
+				return *ReValue;
+			}
+		}
+	}
+	return false;
+}
+
+void UScenarioActionConditionFunction::SetFunction(UFunction* InFunction, UClass* InOwnerClass)
+{
+	check(IsValid(InFunction) && IsValid(InOwnerClass));
+
+	Function = InFunction;
+	FunctionOwner = InOwnerClass;
+
+	StructOnScope = MakeShared< FStructOnScope>(Function.Get());
+	if (StructOnScope.IsValid())
+	{
+		DisplayName = FRuntimeMetaData::GetDisplayNameText(Function.Get());
+	}
+	else
+	{
+		DisplayName = FText::FromString(TEXT("No Name"));
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionConditionFunctionLibrary.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionConditionFunctionLibrary.cpp
new file mode 100644
index 0000000..bb0b54e
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionConditionFunctionLibrary.cpp
@@ -0,0 +1,33 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionConditionFunctionLibrary.h"
+
+UScenarioActionConditionFunctionLibraryBase::UScenarioActionConditionFunctionLibraryBase(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+}
+
+UScenarioActionConditionFunctionLibrary::UScenarioActionConditionFunctionLibrary(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+}
+
+bool UScenarioActionConditionFunctionLibrary::TestFunction1()
+{
+	return true;
+}
+
+bool UScenarioActionConditionFunctionLibrary::TestFunction2(bool Param1)
+{
+	return false;
+}
+
+bool UScenarioActionConditionFunctionLibrary::TestFunction3(bool Param1, int Param2, const FString& Param3)
+{
+	return false;
+}
+
+bool UScenarioActionConditionFunctionLibrary::TestFunction4(const FVector& Param1, const FRotator& Param2)
+{
+	return false;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionEvent.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionEvent.cpp
new file mode 100644
index 0000000..a82e006
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionEvent.cpp
@@ -0,0 +1,46 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionEvent.h"
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimeMetaData.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "Modules/ModuleManager.h"
+
+UScenarioActionEvent::UScenarioActionEvent(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("No Name"));
+}
+
+TSharedRef< SWidget > UScenarioActionEvent::MakeWidget() 
+{
+
+	FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+	soda::FDetailsViewArgs Args;
+	Args.bHideSelectionTip = true;
+	Args.bLockable = false;
+	Args.bShowOptions = false;
+	Args.bAllowSearch = false;
+	Args.NameAreaSettings = soda::FDetailsViewArgs::HideNameArea;
+	TSharedPtr<soda::IDetailsView> DetailView = RuntimeEditorModule.CreateDetailView(Args);
+	DetailView->SetObject(this);
+	/*
+	DetailView->SetIsPropertyVisibleDelegate(soda::FIsPropertyVisible::CreateLambda([](const soda::FPropertyAndParent& PropertyAndParent)
+	{
+		if(PropertyAndParent.ParentProperties.Num() == 0)
+		{
+			if (FRuntimeMetaData::HasMetaData(&PropertyAndParent.Property, TEXT("ScenarioAction")))
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		return true;
+	}));
+	*/
+	return DetailView.ToSharedRef();
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionEventLibrary.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionEventLibrary.cpp
new file mode 100644
index 0000000..be23fda
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionEventLibrary.cpp
@@ -0,0 +1,197 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionEventLibrary.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/Actors/ScenarioTriggerActors.h"
+#include "Components/ShapeComponent.h"
+#include "Soda/SodaStatics.h"
+
+//-------------------------------------------------------------------------------------------------
+UEventAtScenarioBegin::UEventAtScenarioBegin(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("At Scenario Begin"));
+}
+
+//-------------------------------------------------------------------------------------------------
+UEventAtScenarioEnd::UEventAtScenarioEnd(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("At Scenario End"));
+}
+
+//-------------------------------------------------------------------------------------------------
+UEventAtScenarioTick::UEventAtScenarioTick(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("At Scenario Tick"));
+}
+
+//-------------------------------------------------------------------------------------------------
+UEventAtScenarioTime::UEventAtScenarioTime(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("At Scenario Time"));
+}
+
+void UEventAtScenarioTime::ScenarioBegin()
+{
+	CurrentTime = 0;
+}
+
+void UEventAtScenarioTime::Tick(float DeltaTime)
+{
+	CurrentTime += DeltaTime;
+	if (CurrentTime >= ScenarioTime)
+	{
+		EventDelegate.ExecuteIfBound();
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+UEventOverlapTrigger::UEventOverlapTrigger(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("Reach Position"));
+}
+
+void UEventOverlapTrigger::Tick(float DeltaTime)
+{
+	if (Actor.Get() && Trigger.Get())
+	{
+		if (Trigger->GetCollisionComponent()->IsOverlappingActor(Actor.Get()))
+		{
+			EventDelegate.ExecuteIfBound();
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+UEventRelativeDistance::UEventRelativeDistance(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("Relative Distance"));
+}
+
+void UEventRelativeDistance::ScenarioBegin()
+{
+	if (FromActor.IsValid() && ToActor.IsValid())
+	{
+		FromActorExtent = USodaStatics::CalculateActorExtent(FromActor.Get());
+		ToActorExtent = USodaStatics::CalculateActorExtent(ToActor.Get());
+	}
+}
+
+void UEventRelativeDistance::Tick(float DeltaTime)
+{
+	if (FromActor.IsValid() && ToActor.IsValid())
+	{
+		float CurDistance = MAX_FLT;
+		if (OverlapEstimation == EScenarioEventOverlapEstimation::Position)
+		{
+			if (DistanceEstimation == EScenarioEventDistanceEstimation::Longotude)
+			{
+				CurDistance = FromActor.Get()->GetTransform().InverseTransformPositionNoScale(ToActor.Get()->GetActorLocation()).X;
+			}
+			else // EScenarioEventDistanceEstimation::Euclidean
+			{
+				CurDistance = (FromActor.Get()->GetActorLocation() - ToActor.Get()->GetActorLocation()).Size();
+			}
+		}
+		else // EScenarioEventOverlapEstimation::ClosesPoint
+		{
+			const FTransform& ToActorTransform = ToActor->GetTransform();
+			const FTransform& FromActorTransform = FromActor->GetTransform();
+
+			FVector Vertices[8];
+			ToActorExtent.GetVertices(Vertices);
+
+			FBox NewBox(ForceInit);
+			for (int32 VertexIndex = 0; VertexIndex < UE_ARRAY_COUNT(Vertices); VertexIndex++)
+			{
+				FVector ProjectedVertex = FromActorTransform.InverseTransformPosition(ToActorTransform.TransformPosition(Vertices[VertexIndex]));
+				NewBox += ProjectedVertex;
+			}
+
+			//DrawDebugBox(GetWorld(), FromActorExtent.GetCenter(), FromActorExtent.GetExtent(), FQuat::Identity, FColor::Red, false, -1.f, 0, 1.f);
+			//DrawDebugBox(GetWorld(), NewBox.GetCenter(), NewBox.GetExtent(), FQuat::Identity, FColor::Green, false, -1.f, 0, 1.f);
+
+			if (DistanceEstimation == EScenarioEventDistanceEstimation::Longotude)
+			{
+				CurDistance = NewBox.Min.X - FromActorExtent.Max.X;
+			}
+			else // EScenarioEventDistanceEstimation::Euclidean
+			{
+				CurDistance = FMath::Sqrt(FromActorExtent.ComputeSquaredDistanceToBox(NewBox));
+			}
+		}
+
+		//UE_LOG(LogSoda, Warning, TEXT("*** %f"), CurDistance);
+
+		switch (Conditional)
+		{
+		case EScenarioEventConditional::LessThan:
+			if (CurDistance < Distance)
+			{
+				EventDelegate.ExecuteIfBound();
+			}
+			break;
+		case EScenarioEventConditional::GreaterThan:
+			if (CurDistance > Distance)
+			{
+				EventDelegate.ExecuteIfBound();
+			}
+			break;
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+UEventRelativeSpeed::UEventRelativeSpeed(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("Relative Speed"));
+}
+
+void UEventRelativeSpeed::Tick(float DeltaTime)
+{
+	if (FromActor.IsValid() && ToActor.IsValid())
+	{
+		const FVector FromActorVelocity = FromActor->GetTransform().InverseTransformVectorNoScale(FromActor->GetVelocity());
+		const FVector ToActorVelocity = FromActor->GetTransform().InverseTransformVectorNoScale(ToActor->GetVelocity());
+		const float CurrVel = FromActor->GetTransform().InverseTransformVectorNoScale(FromActor->GetVelocity() - ToActor->GetVelocity()).X;
+
+		switch (Conditional)
+		{
+		case EScenarioEventConditional::LessThan:
+			if (CurrVel < Speed)
+			{
+				EventDelegate.ExecuteIfBound();
+			}
+			break;
+		case EScenarioEventConditional::GreaterThan:
+			if (CurrVel > Speed)
+			{
+				EventDelegate.ExecuteIfBound();
+			}
+			break;
+		}
+
+		UE_LOG(LogSoda, Warning, TEXT("V %f"), CurrVel);
+	}
+}
+
+//-------------------------------------------------------------------------------------------------
+UEventStandStill::UEventStandStill(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+	DisplayName = FText::FromString(TEXT("Stand Still"));
+}
+
+void UEventStandStill::Tick(float DeltaTime)
+{
+	//if ()
+	{
+		//EventDelegate.ExecuteIfBound();
+	}
+}
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionFunctionLibrary.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionFunctionLibrary.cpp
new file mode 100644
index 0000000..8b28d87
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionFunctionLibrary.cpp
@@ -0,0 +1,33 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionFunctionLibrary.h"
+
+UScenarioActionFunctionLibraryBase::UScenarioActionFunctionLibraryBase(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+}
+
+UScenarioActionFunctionLibrary::UScenarioActionFunctionLibrary(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+}
+
+bool UScenarioActionFunctionLibrary::TestFunction1()
+{
+	return true;
+}
+
+bool UScenarioActionFunctionLibrary::TestFunction2(bool Param1)
+{
+	return true;
+}
+
+bool UScenarioActionFunctionLibrary::TestFunction3(bool Param1, int Param2, const FString& Param3)
+{
+	return true;
+}
+
+bool UScenarioActionFunctionLibrary::TestFunction4(const FVector& Param1, const FRotator& Param2)
+{
+	return true;
+}
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionNode.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionNode.cpp
new file mode 100644
index 0000000..f1b1895
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionNode.cpp
@@ -0,0 +1,366 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Soda/ScenarioAction/ScenarioActionBlock.h"
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.h"
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.h"
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.h"
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.h"
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.h"
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "UObject/StructOnScope.h"
+#include "Widgets/Views/STableViewBase.h"
+
+//-------------------------------------------------------------------------------------------------------------------------
+UScenarioActionNode::UScenarioActionNode(const FObjectInitializer& InInitializer)
+	: Super(InInitializer)
+{
+}
+
+void UScenarioActionNode::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame() && ShouldSerializeChildren())
+	{
+		if (Ar.IsSaving())
+		{
+			int Num = 0;
+			for (int i = 0; i < Children.Num(); ++i)
+			{
+				UScenarioActionNode* Node = Children[i];
+				if (IsValid(Node) && !Node->IsTransitentActionNode())
+				{
+					++Num;
+				}
+			}
+			Ar << Num;
+			for (int i = 0; i < Children.Num(); ++i)
+			{
+				UScenarioActionNode* Node = Children[i];
+				if (IsValid(Node) && !Node->IsTransitentActionNode())
+				{
+					check(IsValid(Node));
+					FObjectRecord Record;
+					Record.SerializeObject(Node);
+					Ar << Record;
+				}
+			}
+		}
+		else if (Ar.IsLoading())
+		{
+			// Loading the ActionNodes
+			int Num = 0;
+			Ar << Num;
+			for (int i = 0; i < Num; ++i)
+			{
+				FObjectRecord Record;
+				Ar << Record;
+				if (Record.IsRecordValid())
+				{
+					UScenarioActionNode* Node = NewObject<UScenarioActionNode>(this, Record.Class.Get());
+					check(Node);
+					Record.DeserializeObject(Node);
+					AddChildrenNode(Node, true);
+				}
+			}
+		}
+	}
+}
+
+void UScenarioActionNode::AddChildrenNode(UScenarioActionNode* Node, bool bSaveHardRef)
+{
+	check(Node);
+	WeakChildren.Add(Node);
+	if (bSaveHardRef) Children.Add(Node);
+	Node->ParenNode = this;
+}
+
+bool UScenarioActionNode::RemoveChildrenNode(UScenarioActionNode* Node)
+{
+	return WeakChildren.Remove(Node) + Children.Remove(Node) ? true : false;
+}
+
+bool UScenarioActionNode::RemoveThisNode()
+{
+	if (UScenarioActionNode* Parent = GetParentNode())
+	{
+		return Parent->RemoveChildrenNode(this);
+	}
+
+	if (UScenarioActionBlock* Block = Cast<UScenarioActionBlock>(this->GetOuter()))
+	{
+		return Block->ActionRootNodes.Remove(this) > 0;
+	}
+
+	return false;
+}
+
+void UScenarioActionNode::Execute() 
+{
+	for (auto& It : Children)
+	{
+		if (IsValid(It))
+		{
+			It->Execute();
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------------------------------
+UScenarioObjectNode::UScenarioObjectNode(const FObjectInitializer& InInitializer)
+	: UScenarioActionNode(InInitializer) 
+{
+	ChildPropertyNode = CreateDefaultSubobject< UScenarioActionPropertyNode>(TEXT("Boody"));
+	AddChildrenNode(ChildPropertyNode.Get());
+}
+
+bool UScenarioObjectNode::IsNodeValid() const 
+{ 
+	return Object.IsValid() && StructOnScope.IsValid(); 
+}
+
+void UScenarioObjectNode::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	UClass* Class = Object.IsValid() ? Object.Get()->GetClass() : nullptr;
+	
+	if (Ar.IsSaveGame())
+	{
+		if (Ar.IsLoading())
+		{
+			StructOnScope = MakeShared<FStructOnScope>(Class);
+		}
+		FScenarioActionUtils::SerializeUStruct(Ar, Class, Class ? StructOnScope->GetStructMemory() : nullptr, false);
+
+		if (Ar.IsSaving())
+		{
+			// Save Properties
+			TArray<FString> SavedProperties;
+			for (auto& It : CapturedProperties)
+			{
+				if (It.IsValid())
+				{
+					SavedProperties.Add(It->GetName());
+				}
+			}
+			Ar << SavedProperties;
+		}
+		else if (Ar.IsLoading())
+		{
+			// Load Properties
+			TArray<FString> SavedProperties;
+			Ar << SavedProperties;
+			if (Object.IsValid())
+			{
+				for (auto& It : SavedProperties)
+				{
+					for (TFieldIterator<FProperty> PropIt(Object->GetClass()); PropIt; ++PropIt)
+					{
+						if (PropIt->GetName() == It)
+						{
+							CapturedProperties.Add(*PropIt);
+						}
+					}
+				}
+			}
+
+			ChildPropertyNode->UpdateChildBodyNode();
+		}
+	}
+}
+
+void UScenarioObjectNode::InitializeNode(UObject* InObject)
+{
+	check(InObject);
+	Object = InObject;
+	StructOnScope = MakeShared<FStructOnScope>(InObject->GetClass());
+}
+
+void UScenarioObjectNode::Execute()
+{
+	Super::Execute();
+
+	if (StructOnScope.IsValid() && Object.IsValid())
+	{
+		for (auto& Prop : CapturedProperties)
+		{
+			void* SrcPropertyValue = Prop->ContainerPtrToValuePtr<void>(StructOnScope->GetStructMemory());
+			void* DstPropertyValue = Prop->ContainerPtrToValuePtr<void>(Object.Get());
+			Prop->CopySingleValue(DstPropertyValue, SrcPropertyValue);
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------------------------------
+TSharedRef< ITableRow > UScenarioActionActorNode::MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)
+{
+	return SNew(SScenarioActionActorRow, OwnerTable, this, Tree);
+}
+
+bool UScenarioActionActorNode::IsNodeValid() const
+{
+	return Super::IsNodeValid() && Actor.IsValid(); 
+}
+
+void UScenarioActionActorNode::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame() && ShouldSerializeChildren())
+	{
+		if (Ar.IsSaving())
+		{
+
+		}
+		else if (Ar.IsLoading())
+		{
+
+		}
+	}
+}
+
+void UScenarioActionActorNode::InitializeNode(AActor* InActor)
+{ 
+	UScenarioObjectNode::InitializeNode(InActor); 
+	Actor = InActor; 
+}
+
+AActor* UScenarioActionActorNode::GetActor() const 
+{
+	return Actor.Get(); 
+}
+
+//-------------------------------------------------------------------------------------------------------------------------
+TSharedRef< ITableRow > UScenarioActionComponentNode::MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)
+{
+	return SNew(SScenarioActionComponentRow, OwnerTable, this, Tree);
+}
+
+void UScenarioActionComponentNode::InitializeNode(UActorComponent* InActorComponent)
+{ 
+	UScenarioObjectNode::InitializeNode(InActorComponent); 
+	ActorComponent = InActorComponent; 
+}
+
+UActorComponent* UScenarioActionComponentNode::GetActorComponent() const
+{ 
+	return ActorComponent.Get(); 
+}
+
+bool UScenarioActionComponentNode::IsNodeValid() const 
+{
+	return Super::IsNodeValid() && ActorComponent.IsValid(); 
+}
+
+//-------------------------------------------------------------------------------------------------------------------------
+UScenarioActionPropertyNode::UScenarioActionPropertyNode(const FObjectInitializer& InInitializer)
+	: UScenarioActionNode(InInitializer)
+{
+}
+
+bool UScenarioActionPropertyNode::IsNodeValid() const
+{ 
+	UScenarioObjectNode* ParentNode = Cast<UScenarioObjectNode>(GetParentNode()); 
+	return ParentNode && ParentNode->IsNodeValid(); 
+}
+
+void UScenarioActionPropertyNode::UpdateChildBodyNode()
+{
+	WeakChildren.Empty();
+	Children.Empty();
+
+	UScenarioObjectNode* Parent = Cast<UScenarioObjectNode>(GetParentNode());
+
+	if (Parent && Parent->GetCapturedProperties().Num())
+	{
+		ChildBodyNode = NewObject< UScenarioActionPropertyBodyNode>(this);
+		check(ChildBodyNode.IsValid());
+		AddChildrenNode(ChildBodyNode.Get());
+	}
+}
+
+TSharedRef< ITableRow > UScenarioActionPropertyNode::MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)
+{
+	return SNew(SScenarioActionPropertyRow, OwnerTable, this, Tree);
+}
+
+//-------------------------------------------------------------------------------------------------------------------------
+TSharedRef< ITableRow > UScenarioActionPropertyBodyNode::MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)
+{
+	return SNew(SScenarioActionPropertyBodyRow, OwnerTable, this, Tree);
+}
+
+bool UScenarioActionPropertyBodyNode::IsNodeValid() const 
+{
+	UScenarioActionPropertyNode* ParentNode = Cast<UScenarioActionPropertyNode>(GetParentNode()); 
+	return ParentNode && ParentNode->IsNodeValid(); 
+}
+
+//-------------------------------------------------------------------------------------------------------------------------
+UScenarioActionFunctionNode::UScenarioActionFunctionNode(const FObjectInitializer& InInitializer)
+	: UScenarioActionNode(InInitializer) 
+{
+	UScenarioActionFunctionBodyNode * ChildNode = CreateDefaultSubobject< UScenarioActionFunctionBodyNode>(TEXT("Boody"));
+	AddChildrenNode(ChildNode);
+}
+
+void UScenarioActionFunctionNode::InitializeNode(UObject* InFunctionOwner, UFunction* InFunction)
+{
+	check(InFunction && InFunctionOwner);
+	Function = InFunction;
+	StructOnScope = MakeShared< FStructOnScope>(InFunction);
+	FunctionOwner = InFunctionOwner;
+}
+
+void UScenarioActionFunctionNode::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame())
+	{
+		if (Ar.IsLoading() && Function.IsValid())
+		{
+			StructOnScope = MakeShared<FStructOnScope>(Function.Get());
+		}
+		FScenarioActionUtils::SerializeUStruct(Ar, Function.Get(), Function.IsValid() ? StructOnScope->GetStructMemory() : nullptr, true);
+	}
+}
+
+TSharedRef< ITableRow > UScenarioActionFunctionNode::MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)
+{
+	return SNew(SScenarioActionFunctionRow, OwnerTable, this, Tree);
+}
+
+void UScenarioActionFunctionNode::Execute()
+{
+	Super::Execute();
+
+	if (Function && StructOnScope.IsValid())
+	{
+		if (FunctionOwner)
+		{
+			FunctionOwner->ProcessEvent(Function.Get(), StructOnScope->GetStructMemory());
+		}
+		else
+		{
+			//TODO here ....
+			check(0);
+		}
+	}
+}
+
+//-------------------------------------------------------------------------------------------------------------------------
+TSharedRef< ITableRow > UScenarioActionFunctionBodyNode::MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)
+{
+	return SNew(SScenarioActionFunctionBodyRow, OwnerTable, this, Tree);
+}
+
+bool UScenarioActionFunctionBodyNode::IsNodeValid() const 
+{ 
+	UScenarioActionFunctionNode* ParentNode = Cast<UScenarioActionFunctionNode>(GetParentNode()); 
+	return ParentNode->IsNodeValid(); 
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionUtils.cpp b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionUtils.cpp
new file mode 100644
index 0000000..19fb77f
--- /dev/null
+++ b/Source/UnrealSoda/Private/ScenarioAction/ScenarioActionUtils.cpp
@@ -0,0 +1,204 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "Soda/ScenarioAction/ScenarioActionConditionFunctionLibrary.h"
+#include "Soda/ScenarioAction/ScenarioActionFunctionLibrary.h"
+#include "Soda/ScenarioAction/ScenarioActionEvent.h"
+#include "RuntimeMetaData.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "UObject/UObjectIterator.h"
+
+namespace FScenarioActionUtils
+{
+
+void GetComponentsByCategory(AActor* Actor, TMap<FString, TArray<UActorComponent*>> & Out)
+{
+	check(Actor);
+	for (auto& Component : Actor->GetComponents())
+	{
+		if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(Component))
+		{
+			Out.FindOrAdd(VehicleComponent->GetVehicleComponentGUI().Category).Add(Component);
+		}
+	}
+}
+
+
+void GetScenarioFunctionsByCategory(UClass* Class, TMap<FString, TArray<UFunction*>> & Out)
+{
+	for (TFieldIterator<UFunction> FuncIt(Class); FuncIt; ++FuncIt)
+	{
+		if (FRuntimeMetaData::HasMetaData(*FuncIt, TEXT("ScenarioAction")))
+		{
+			Out.FindOrAdd(FRuntimeMetaData::GetMetaData(*FuncIt, TEXT("Category"))).Add(*FuncIt);
+		}
+	}
+
+	do
+	{
+		for (auto& Interface : Class->Interfaces)
+		{
+			GetScenarioFunctionsByCategory(Interface.Class, Out);
+		}
+		Class = Class->GetSuperClass();
+	} 
+	while (Class);
+}
+
+void GetScenarioPropertiesByCategory(UClass* Class, TMap<FString, TArray<FProperty*>> & Out)
+{
+	// TODO: Try to invoke AddGeneratedMetadataToGlobalScope() once when object loaded
+	if (Class->ImplementsInterface(UEditableObject::StaticClass()))
+	{
+		FRuntimeMetaData::AddGeneratedMetadataToGlobalScope(Class);
+	}
+
+	for (TFieldIterator<FProperty> It(Class); It; ++It)
+	{
+		if (FRuntimeMetaData::HasMetaData(*It, TEXT("EditInRuntime")))
+		{
+			Out.FindOrAdd(FRuntimeMetaData::GetMetaData(*It, TEXT("Category"))).Add(*It);
+		}
+	}
+}
+
+void GetScenarioActionFunctionsByCategory(TMap<FString, TArray<UFunction*>> & Out)
+{
+	for (TObjectIterator<UClass> It; It; ++It)
+	{
+		if (It->IsChildOf(UScenarioActionFunctionLibraryBase::StaticClass()) &&
+			!It->HasAnyClassFlags(CLASS_Abstract | CLASS_Deprecated | CLASS_Hidden) &&
+			It->GetPackage() != GetTransientPackage())
+		{
+			for (TFieldIterator<UFunction> FuncIt(*It); FuncIt; ++FuncIt)
+			{
+				if (FRuntimeMetaData::HasMetaData(*FuncIt, TEXT("Category")))
+				{
+					Out.FindOrAdd(FRuntimeMetaData::GetMetaData(*FuncIt, TEXT("Category"))).Add(*FuncIt);
+				}
+			}
+		}
+	}
+}
+
+void GetScenarioConditionFunctionsByCategory(TMap<FString, TArray<UFunction*>> & Out)
+{
+	for (TObjectIterator<UClass> It; It; ++It)
+	{
+		if (It->IsChildOf(UScenarioActionConditionFunctionLibraryBase::StaticClass()) &&
+			!It->HasAnyClassFlags(CLASS_Abstract | CLASS_Deprecated | CLASS_Hidden) &&
+			It->GetPackage() != GetTransientPackage())
+		{
+			for (TFieldIterator<UFunction> FuncIt(*It); FuncIt; ++FuncIt)
+			{
+				if (FuncIt->GetReturnProperty())
+				{
+					if (FuncIt->GetReturnProperty()->IsA<FBoolProperty>())
+					{
+						Out.FindOrAdd(FRuntimeMetaData::GetMetaData(*FuncIt, TEXT("Category"))).Add(*FuncIt);
+					}
+				}
+			}
+		}
+	}
+}
+
+void GetScenarioActionEvents(TMap<FString, TArray<UClass*>> & Out)
+{
+	for (TObjectIterator<UClass> It; It; ++It)
+	{
+		if (It->IsChildOf(UScenarioActionEvent::StaticClass()) &&
+			!It->HasAnyClassFlags(CLASS_Abstract | CLASS_Deprecated | CLASS_Hidden) &&
+			It->GetPackage() != GetTransientPackage())
+		{
+			Out.FindOrAdd(TEXT("Default")).Add(*It);
+		}
+	}
+}
+
+bool SerializeUStruct(FArchive& Ar, UStruct * Struct, uint8* StructMemory, bool bForceSaveGame)
+{
+	//FScenarioActionUtils::Serialize(StructOnScope, Ar);
+
+	bool Res = false;
+
+	if (Ar.IsSaveGame())
+	{
+		if (bForceSaveGame)
+		{
+			Ar.ArIsSaveGame = 0; // Hack to serialize properties in UFunction
+		}
+
+		if (Ar.IsSaving())
+		{
+			// The following code serializes the size of the arguments to serialize so that when loading,
+			// we can skip over it if the function could not be loaded.
+			const int64 ArgumentsSizePos = Ar.Tell();
+
+			// Serialize a temporary value for the delta in order to end up with an archive of the right size.
+			int64 ArgumentsSize = 0;
+			Ar << ArgumentsSize;
+
+			// Serialize the number of argument bytes if there is actually an underlying buffer to seek to.
+			if (ArgumentsSizePos != INDEX_NONE && IsValid(Struct))
+			{
+				// Then serialize the arguments in order to get its size.
+				const int64 ArgsBegin = Ar.Tell();
+				Struct->SerializeTaggedProperties(Ar, StructMemory, Struct, nullptr);
+				const int64 ArgsEnd = Ar.Tell();
+				ArgumentsSize = (ArgsEnd - ArgsBegin);
+
+				// Come back to the temporary value we wrote and overwrite it with the arguments size we just calculated.
+				Ar.Seek(ArgumentsSizePos);
+				Ar << ArgumentsSize;
+
+				// And finally seek back to the end.
+				Ar.Seek(ArgsEnd);
+			}
+			Res = true;
+		}
+		else if (Ar.IsLoading())
+		{
+			int64 NumSerializedBytesFromArchive = 0;
+			Ar << NumSerializedBytesFromArchive;
+
+			if (NumSerializedBytesFromArchive > 0)
+			{
+				if (IsValid(Struct))
+				{
+					Struct->InitializeStruct(StructMemory);
+
+					const int64 ArgsBegin = Ar.Tell();
+					Struct->SerializeTaggedProperties(Ar, StructMemory, Struct, nullptr);
+					const int64 ArgsEnd = Ar.Tell();
+
+					if (ArgsEnd - ArgsBegin != NumSerializedBytesFromArchive)
+					{
+						UE_LOG(LogSoda, Warning, TEXT("Arguments size mismatch from size serialized in asset. Expected %d, Actual: %d"), NumSerializedBytesFromArchive, ArgsEnd - ArgsBegin);
+						Ar.SetError();
+					}
+					else
+					{
+						Res = true;
+					}
+				}
+				else
+				{
+					UE_LOG(LogSoda, Warning, TEXT("%s could not be loaded while deserialzing."), *Struct->GetStructPathName().ToString());
+					Ar.Seek(Ar.Tell() + NumSerializedBytesFromArchive);
+					Ar.SetError();
+				}
+			}
+		}
+
+		if (bForceSaveGame)
+		{
+			Ar.ArIsSaveGame = 1; // Return SaveGame flag 
+		}
+	}
+
+	return Res;
+}
+
+} // namespace FScenarioActionUtils
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/SodaActorFactory.cpp b/Source/UnrealSoda/Private/SodaActorFactory.cpp
new file mode 100644
index 0000000..5bd12bc
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaActorFactory.cpp
@@ -0,0 +1,292 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaActorFactory.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "UObject/UObjectHash.h"
+#include "Blueprint/WidgetTree.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/ISodaActor.h"
+#include "EngineUtils.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+
+void ASodaActorFactory::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if(Ar.IsSaveGame())
+	{
+		if (Ar.IsSaving())
+		{
+			TArray<FActorRecord> ActorRecords;
+			TArray<FPinnedActorRecord> PinnedActors;
+			for (auto& Actor : SpawnedActors)
+			{
+				if (IsValid(Actor) && Actor->GetClass()->ImplementsInterface(USodaActor::StaticClass()))
+				{
+					ISodaActor* SodaActor = Cast<ISodaActor>(Actor);
+					if (!bSerializePinnedActorsAsUnpinned && SodaActor && SodaActor->IsPinnedActor())
+					{
+						FPinnedActorRecord & Record = PinnedActors.Add_GetRef(FPinnedActorRecord());
+						Record.DesireName = Actor->GetFName();
+						Record.Class = Actor->GetClass();
+						Record.SlotName = SodaActor->GetPinnedActorSlotName();
+						Record.Transform = Actor->GetActorTransform();
+					}
+					else
+					{
+						FActorRecord Record;
+						if (Record.SerializeActor(Actor, true))
+						{
+							ActorRecords.Add(Record);
+						}
+					}
+				}
+			}
+			Ar << ActorRecords;
+			Ar << PinnedActors;
+		}
+		else if (Ar.IsLoading())
+		{
+			Ar << LoadedActorRecords;
+			Ar << LoadedPinnedActors;
+		}
+	}
+}
+
+AActor* ASodaActorFactory::SpawnActor(TSubclassOf<AActor> ActorClass, FTransform Transform)
+{
+	UWorld* World = GetWorld();
+	check(World);
+
+	if (!ActorClass)
+	{
+		return nullptr;
+	}
+
+	if (!ActorClass->ImplementsInterface(USodaActor::StaticClass()))
+	{
+		return nullptr;
+	}
+
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		const FSodaActorDescriptor& Desc = GameMode->GetSodaActorDescriptor(ActorClass.Get());
+		Transform.AddToTranslation(Desc.SpawnOffset);
+	}
+
+	FActorSpawnParameters SpawnInfo;
+	SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
+	SpawnInfo.bDeferConstruction = true;
+	//SpawnInfo.Name = FEditorUtils::MakeUniqueObjectName(World->GetCurrentLevel(), ActorClass);
+	AActor* NewActor = World->SpawnActor(ActorClass, &Transform, SpawnInfo);
+
+	if (IsValid(NewActor))
+	{
+		NewActor->FinishSpawning(Transform);
+		SpawnedActors.Add(NewActor);
+		OnInvalidateDelegate.Broadcast();
+		return NewActor;
+	}
+
+	return nullptr;
+}
+
+void ASodaActorFactory::AddActor(AActor* Actor)
+{
+	if (IsValid(Actor))
+	{
+		OnInvalidateDelegate.Broadcast();
+		SpawnedActors.Add(Actor);
+	}
+}
+
+void ASodaActorFactory::RemoveAllActors()
+{
+	for (auto& Actor : SpawnedActors) Actor->Destroy();
+	SpawnedActors.Empty();
+	OnInvalidateDelegate.Broadcast();
+}
+
+void ASodaActorFactory::SpawnAllSavedActors(bool bSaved, bool bPinned)
+{
+	RemoveAllActors();
+
+	UWorld* World = GetWorld();
+	check(World);
+
+	FSlateNotificationManager& NotificationManager = FSlateNotificationManager::Get();
+
+	int ErrorNum = 0;
+	const int MaxNotifyError = 10;
+
+	auto ShowError = [&ErrorNum, MaxNotifyError, &NotificationManager](const FString & Msg, const auto & Record)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaActorFactory::SpawnAllSavedActors(). %s %s"), *Msg, *Record.ToString());
+
+		if (ErrorNum < MaxNotifyError)
+		{
+			FNotificationInfo Info(FText::FromString(TEXT("Faild spawn pinned actor.") + Msg + TEXT(" ") + Record.ToString()));
+			Info.ExpireDuration = 5.0f;
+			Info.Image = FCoreStyle::Get().GetBrush(TEXT("Icons.WarningWithColor"));
+			NotificationManager.AddNotification(Info);
+		}
+		++ErrorNum;
+	};
+
+	if (bPinned)
+	{
+		if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+		{
+			for (auto& Record : LoadedPinnedActors)
+			{
+				UClass* Class = Record.Class.Get();
+				if (!Class)
+				{
+					Class = LoadObject<UClass>(nullptr, *Record.Class.ToString());
+				}
+				if (Class)
+				{
+					if (ISodaActor* SodaActor = Cast<ISodaActor>(Record.Class->GetDefaultObject()))
+					{
+						if (AActor* Actor = SodaActor->LoadPinnedActor(World, Record.Transform, Record.SlotName, false, Record.DesireName))
+						{
+							SpawnedActors.Add(Actor);
+						}
+						else
+						{
+							ShowError(TEXT("Can't load from slot."), Record);
+						}
+					}
+				}
+				else
+				{
+					ShowError(TEXT("Can't find class."), Record);
+				}
+			}
+		}
+	}
+
+	if (bSaved)
+	{
+		TArray<AActor*> NewActors;
+		for (int i = 0; i < LoadedActorRecords.Num(); ++i)
+		{
+			auto& Record = LoadedActorRecords[i];
+			if (Record.IsRecordValid())
+			{
+				UClass* Class = Record.Class.Get();
+				if (!Class)
+				{
+					Class = LoadObject<UClass>(nullptr, *Record.Class.ToString());
+				}
+				if (Class)
+				{
+					FActorSpawnParameters SpawnInfo;
+					SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
+					SpawnInfo.bDeferConstruction = true;
+					SpawnInfo.Name = Record.Name.IsNone() ? NAME_None : FEditorUtils::MakeUniqueObjectName(World->GetCurrentLevel(), Class, Record.Name);
+					NewActors.Add(World->SpawnActor(Class, &Record.Transform, SpawnInfo));
+				}
+				else
+				{
+					NewActors.Add(nullptr);
+					ShowError(TEXT("Can't find class."), Record);
+				}
+			}
+			else
+			{
+				NewActors.Add(nullptr);
+				ShowError(TEXT("Record is is invalid."), Record);
+			}
+		}
+
+		for (int i = 0; i < LoadedActorRecords.Num(); ++i)
+		{
+			auto& Record = LoadedActorRecords[i];
+			AActor* NewActor = NewActors[i];
+			if (Record.IsRecordValid() && IsValid(NewActor))
+			{
+				if (Record.DeserializeActor(NewActor, true))
+				{
+					NewActor->FinishSpawning(Record.Transform);
+					SpawnedActors.Add(NewActor);
+				}
+				else
+				{
+					NewActor->Destroy();
+					ShowError(TEXT("Faild deserialize actor."), Record);
+				}
+			}
+		}
+	}
+
+	if (ErrorNum > MaxNotifyError)
+	{
+		FNotificationInfo Info(FText::FromString(TEXT("Too many errors. See the log to see all.")));
+		Info.ExpireDuration = 5.0f;
+		Info.Image = FCoreStyle::Get().GetBrush(TEXT("Icons.WarningWithColor"));
+		NotificationManager.AddNotification(Info);
+	}
+
+	OnInvalidateDelegate.Broadcast();
+}
+
+bool ASodaActorFactory::ReplaceActor(AActor* NewActor, AActor* PreviewActor, bool bPushActorIfNotFound)
+{
+	if (SpawnedActors.Find(PreviewActor) != INDEX_NONE)
+	{
+		SpawnedActors.Remove(PreviewActor);
+		SpawnedActors.Add(NewActor);
+		OnInvalidateDelegate.Broadcast();
+		return true;
+	}
+
+	if (bPushActorIfNotFound)
+	{
+		SpawnedActors.Add(NewActor);
+		OnInvalidateDelegate.Broadcast();
+		return true;
+	}
+
+	return false;
+}
+
+bool ASodaActorFactory::RenameActor(AActor * Actor, const FString & NewName)
+{
+	if (!CheckActorIsExist(Actor))
+	{
+		return false;
+	}
+
+	for (TActorIterator<AActor> It(GetWorld()); It; ++It)
+	{
+		if (It->GetName() == NewName) return false;
+	}
+
+	if (Actor->Rename(*NewName))
+	{
+		OnInvalidateDelegate.Broadcast();
+		return true;
+	}
+
+	return false;
+}
+
+bool ASodaActorFactory::RemoveActor(AActor* Actor, bool bAndDestroy)
+{
+	if (SpawnedActors.Remove(Actor) == 0)
+	{
+		return false;
+	}
+
+	if (bAndDestroy && IsValid(Actor))
+	{
+		Actor->Destroy();
+	}
+
+	OnInvalidateDelegate.Broadcast();
+	return true;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/SodaApp.cpp b/Source/UnrealSoda/Private/SodaApp.cpp
new file mode 100644
index 0000000..df570c2
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaApp.cpp
@@ -0,0 +1,319 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaApp.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaGameMode.h"
+#include "HAL/RunnableThread.h"
+#include "PhysicsEngine/PhysicsSettings.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "EngineUtils.h"
+#include "Kismet/GameplayStatics.h"
+#include "Soda/SodaUserSettings.h"
+#include "Soda/DBC/Serialization.h"
+#include "UI/SOutputLog.h"
+// Http server
+#include "HttpServerModule.h"
+#include "IHttpRouter.h"
+#include "HttpServerRequest.h"
+#include "HttpRequestHandler.h"
+#include "HttpServerConstants.h"
+#include "HttpServerResponse.h"
+#include "IWebRemoteControlModule.h"
+#include "RemoteControlSettings.h"
+
+#include <thread>
+
+FSodaApp::FSodaApp()
+{
+}
+
+FSodaApp::~FSodaApp()
+{
+	Release();
+}
+
+void FSodaApp::Initialize()
+{
+	check(!bInitialized);
+
+	if (!ZmqCtx) ZmqCtx = new zmq::context_t();
+
+	OnPreTickHandle = FWorldDelegates::OnWorldTickStart.AddRaw(this, &FSodaApp::OnPreTick);
+	OnPostTickHandle = FWorldDelegates::OnWorldPostActorTick.AddRaw(this, &FSodaApp::OnPostTick);
+	//FWorldDelegates::OnPostWorldInitialization.AddRaw(this, &FSodaApp::PostWorldInitialization);
+
+	CamTaskManagerThread = FRunnableThread::Create(&CamTaskManager, TEXT("CamTaskManager"));
+	if (CamTaskManagerThread == nullptr)
+	{
+		UE_LOG(LogSoda, Fatal, TEXT("Can't create TaskManagerThread"));
+	}
+
+	EthTaskManagerThread = FRunnableThread::Create(&EthTaskManager, TEXT("EthTaskManager"));
+	if (EthTaskManagerThread == nullptr)
+	{
+		UE_LOG(LogSoda, Fatal, TEXT("Can't create EthTaskManager"));
+	}
+
+	int HttpServerPort = GetDefault<URemoteControlSettings>()->RemoteControlHttpServerPort;
+	if (!HttpRouter)
+	{
+		HttpRouter = FHttpServerModule::Get().GetHttpRouter(HttpServerPort);
+	}
+
+	/*
+	if (TSharedPtr<IHttpRouter> HttpRouter = FHttpServerModule::Get().GetHttpRouter(30010))
+	{
+		HttpRouter->BindRoute(
+			FHttpPath(TEXT("/test")),
+			EHttpServerRequestVerbs::VERB_PUT,
+			[this](const FHttpServerRequest& Request, const FHttpResultCallback& OnComplete)
+			{
+				UE_LOG(LogSoda, Error, TEXT("*******1"));
+				std::this_thread::sleep_for(std::chrono::milliseconds(5000));
+				OnComplete(FHttpServerResponse::Ok());
+				UE_LOG(LogSoda, Error, TEXT("*******2"));
+				return true;
+			}
+		);
+		FHttpServerModule::Get().StartAllListeners();
+	}
+	*/
+
+	IWebRemoteControlModule& WebRemoteControlModule = FModuleManager::LoadModuleChecked< IWebRemoteControlModule >("WebRemoteControl");
+	OnHttpServerStartedHandle = WebRemoteControlModule.OnHttpServerStarted().AddRaw(this, &FSodaApp::OnHttpServerStarted);
+	OnHttpServerStoppedHandle = WebRemoteControlModule.OnHttpServerStopped().AddRaw(this, &FSodaApp::OnHttpServerStopped);
+
+	OutputLogHistory = MakeShareable(new soda::FOutputLogHistory);
+
+	bInitialized = true;
+}
+
+void FSodaApp::Release()
+{
+	if (bInitialized)
+	{
+		bInitialized = false;
+
+		if (IWebRemoteControlModule* WebRemoteControlModule = FModuleManager::GetModulePtr< IWebRemoteControlModule >("WebRemoteControlModule"))
+		{
+			if (OnHttpServerStartedHandle.IsValid()) WebRemoteControlModule->OnHttpServerStarted().Remove(OnHttpServerStartedHandle);
+			if (OnHttpServerStoppedHandle.IsValid()) WebRemoteControlModule->OnHttpServerStopped().Remove(OnHttpServerStoppedHandle);
+		}
+
+		FWorldDelegates::OnWorldTickStart.Remove(OnPreTickHandle);
+		FWorldDelegates::OnWorldPostActorTick.Remove(OnPostTickHandle);
+
+		CamTaskManagerThread->Kill();
+		delete CamTaskManagerThread;
+
+		EthTaskManagerThread->Kill();
+		delete EthTaskManagerThread;
+
+		if (ZmqCtx) delete ZmqCtx;
+
+		OutputLogHistory.Reset();
+	}
+}
+
+void FSodaApp::OnPreTick(UWorld* World, ELevelTick TickType, float DeltaSeconds)
+{
+	if (GameWorld == World && TickType == ELevelTick::LEVELTICK_All)
+	{
+		++FrameIndex;
+		if(bSynchronousMode)
+		{
+			TotalTime += DeltaSeconds;
+			SimulationTimestamp = soda::ChronoTimestamp<std::chrono::system_clock, std::chrono::duration<double>>(TotalTime);
+
+			while (bSynchronousMode && TickCuesReceived <= 0)
+			{
+				std::this_thread::sleep_for(std::chrono::milliseconds(1));
+				FHttpServerModule::Get().Tick(0.1);
+			} 
+			--TickCuesReceived;
+			RealtimeTimestamp = std::chrono::system_clock::now();
+		}
+		else
+		{
+			RealtimeTimestamp = SimulationTimestamp = std::chrono::system_clock::now();
+		}
+	}
+}
+
+void FSodaApp::OnPostTick(UWorld* /*World*/, ELevelTick TickType, float DeltaSeconds)
+{
+}
+
+void FSodaApp::SetSynchronousMode(bool bEnable, double DeltaSeconds)
+{
+	FApp::SetBenchmarking(bEnable);
+	FApp::SetFixedDeltaTime(DeltaSeconds);
+	FixedDeltaSeconds = DeltaSeconds;
+	UPhysicsSettings* PhysSett = UPhysicsSettings::Get();
+	PhysSett->bSubstepping = !bEnable;
+	bSynchronousMode = bEnable;
+
+	if (IsValid(GameWorld))
+	{
+		TArray<AActor*> FoundVehicles;
+		UGameplayStatics::GetAllActorsOfClass(GameWorld, ASodaVehicle::StaticClass(), FoundVehicles);
+
+		for (auto & it : FoundVehicles)
+		{
+			ASodaVehicle* Vehicle = Cast<ASodaVehicle>(it);
+			if (IsValid(Vehicle))
+			{
+				Vehicle->RespawnVehcile();
+			}
+		}
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("FSodaApp::SetSynchronousMode(), forgot to call FSodaApp::NotifyInitGame() ?"));
+	}
+}
+
+void FSodaApp::NotifyInitGame(USodaGameModeComponent* InGameMode)
+{
+	check(IsValid(InGameMode) && IsValid(InGameMode->GetWorld()));
+	GameWorld = InGameMode->GetWorld();
+	SetGameMode(InGameMode);
+
+}
+
+void FSodaApp::NotifyEndGame()
+{
+	ResetGameMode();
+	GameWorld = nullptr;
+}
+
+bool FSodaApp::SynchTick(int64& TimestampMs, int& InFramIndex)
+{
+	if (bSynchronousMode && TickCuesReceived <= 0)
+	{
+		++TickCuesReceived;
+		TimestampMs = soda::RawTimestamp<std::chrono::milliseconds>(SimulationTimestamp);
+		InFramIndex = FrameIndex;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+void FSodaApp::OnHttpServerStarted(uint32 Port)
+{
+	HttpRouter = FHttpServerModule::Get().GetHttpRouter(Port);
+}
+
+void FSodaApp::OnHttpServerStopped()
+{
+	HttpRouter.Reset();
+}
+
+
+USodaGameModeComponent* FSodaApp::GetGameMode() const
+{
+	check(IsInGameThread());
+	return GameMode.Get();
+}
+
+USodaGameModeComponent* FSodaApp::GetGameModeChecked() const
+{
+	check(IsInGameThread());
+	check(GameMode.IsValid());
+	return GameMode.Get();
+}
+
+void FSodaApp::SetGameMode(USodaGameModeComponent* InGameMode)
+{
+	check(IsInGameThread());
+	GameMode = InGameMode;
+}
+
+void FSodaApp::ResetGameMode()
+{
+	check(IsInGameThread());
+	GameMode = nullptr;
+}
+
+const USodaUserSettings* FSodaApp::GetSodaUserSettings() const
+{
+	if (SodaUserSettings == NULL)
+	{
+		FSodaApp* ConstThis = const_cast<FSodaApp*>(this);	// Hack because Header Generator doesn't yet support mutable keyword
+		ConstThis->CreateSodaUserSettings();
+	}
+	return SodaUserSettings.Get();
+}
+
+USodaUserSettings* FSodaApp::GetSodaUserSettings()
+{
+	if (SodaUserSettings == NULL)
+	{
+		CreateSodaUserSettings();
+	}
+	return SodaUserSettings.Get();
+}
+
+void FSodaApp::CreateSodaUserSettings()
+{
+	USodaUserSettings::LoadConfigIni();
+	SodaUserSettings = NewObject<USodaUserSettings>(GetTransientPackage());
+	SodaUserSettings->LoadSettings();
+	SodaUserSettings->AddToRoot();
+}
+
+TSharedPtr<dbc::FMessageSerializator> FSodaApp::FindDBCSerializator(const FString& MessageName, const FString& Namespace)
+{
+	if (Namespace.IsEmpty())
+	{
+		for (auto& NamespaceIt : DBCPool)
+		{
+			if (auto MessageIt = NamespaceIt.Value.Find(MessageName))
+			{
+				return *MessageIt;
+			}
+		}
+	}
+	else
+	{
+		if (auto NamespaceIt = DBCPool.Find(Namespace))
+		{
+			if (auto MessageIt = NamespaceIt->Find(MessageName))
+			{
+				return *MessageIt;
+			}
+		}
+
+	}
+
+	return TSharedPtr<dbc::FMessageSerializator>();
+}
+
+
+bool FSodaApp::RegisterDBC(const FString& Namespace, const FString& FileName)
+{
+	UE_LOG(LogSoda, Log, TEXT("FSodaApp::RegisterDBC(\"%s\")"), *FileName);
+	auto & It = DBCPool.FindOrAdd(Namespace);
+	bool bRet =  dbc::LoadDBC(FileName, It);
+	if (!bRet)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("FSodaApp::RegisterDBC(); Can't load DBC: \"%s\""), *FileName);
+	}
+	return bRet;
+}
+
+void FSodaApp::RegisterVehicleExporter(TSharedPtr<ISodaVehicleExporter> Exporter)
+{
+	check(Exporter.IsValid());
+	VehicleExporters.FindOrAdd(Exporter->GetExporterName()) = Exporter;
+}
+
+void FSodaApp::UnregisterVehicleExporter(const FString& ExporteName)
+{
+	VehicleExporters.Remove(ExporteName);
+}
+
+FSodaApp SodaApp;
diff --git a/Source/UnrealSoda/Private/SodaGameMode.cpp b/Source/UnrealSoda/Private/SodaGameMode.cpp
new file mode 100644
index 0000000..879c046
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaGameMode.cpp
@@ -0,0 +1,762 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaGameMode.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Soda/LevelState.h"
+#include "Kismet/GameplayStatics.h"
+#include "Kismet/KismetSystemLibrary.h"
+#include "GameFramework/GameModeBase.h"
+#include "Kismet/KismetMathLibrary.h"
+#include "Misc/FileHelper.h"
+#include "EngineUtils.h"
+#include "Soda/SodaSpectator.h"
+#include "TimerManager.h"
+#include "Engine/LevelStreamingPersistent.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/SodaStatics.h"
+#include "Components/PanelWidget.h"
+#include "Engine/AssetManager.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "Soda/UI/SSodaViewport.h"
+#include "UI/Wnds/SSaveAllWindow.h"
+#include "Soda/UI/SToolBox.h"
+#include "Soda/UI/SWaitingPanel.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/IToolActor.h"
+#include "Soda/SodaLibraryPrimaryAsset.h"
+#include "RuntimeMetaData.h"
+#include "Soda/DBGateway.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Soda/SodaUserSettings.h"
+#include "UObject/UObjectIterator.h"
+#include "Async/Async.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/Editor/SodaSelection.h"
+
+#define SLOT_GAMEMODE "SodaGameMode"
+
+USodaGameModeComponent* USodaGameModeComponent::Get()
+{
+	return SodaApp.GetGameMode();
+}
+
+USodaGameModeComponent* USodaGameModeComponent::GetChecked()
+{
+	return SodaApp.GetGameModeChecked();
+}
+
+USodaGameModeComponent::USodaGameModeComponent()
+{
+	//bWantsInitializeComponent = true;
+	PrimaryComponentTick.bCanEverTick = true;
+	bTickInEditor = false;
+	PrimaryComponentTick.TickGroup = TG_PrePhysics;
+
+	DefaultLevelStateClass = ALevelState::StaticClass();
+	SpectatorClass = ASodalSpectator::StaticClass();
+}
+
+void USodaGameModeComponent::OnComponentCreated()
+{
+	Super::OnComponentCreated();
+
+	InitGameHandle = FGameModeEvents::GameModeInitializedEvent.AddUObject(this, &USodaGameModeComponent::InitGame);
+	PreEndGameHandle = FWorldDelegates::OnWorldBeginTearDown.AddUObject(this, &USodaGameModeComponent::PreEndGame);
+}
+
+void USodaGameModeComponent::OnComponentDestroyed(bool bDestroyingHierarchy)
+{
+	Super::OnComponentDestroyed(bDestroyingHierarchy);
+
+	SodaApp.NotifyEndGame();
+}
+
+void USodaGameModeComponent::InitGame(AGameModeBase* GameMode)
+{
+	UWorld* World = GetWorld();
+	check(World);
+
+	if (World->WorldType != EWorldType::Game && World->WorldType != EWorldType::PIE)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("USodaGameModeComponent::InitGame(); Wrong WorldType"));
+		return;
+	}
+
+	// Registre loadad SodaActors
+	for (TObjectIterator<UClass> It; It; ++It)
+	{
+		if (It->HasAnyClassFlags(CLASS_Abstract) ||
+			It->GetName().StartsWith(TEXT("SKEL_"), ESearchCase::CaseSensitive) ||
+			It->GetName().StartsWith(TEXT("REINST_"), ESearchCase::CaseSensitive) ||
+			It->HasAnyClassFlags(CLASS_Abstract) ||
+			!It->IsChildOf<AActor>() ||
+			!It->ImplementsInterface(USodaActor::StaticClass())
+			) continue;
+
+		if (ISodaActor* SodaActor = Cast<ISodaActor>(It->GetDefaultObject()))
+		{
+			if (const FSodaActorDescriptor* Desc = SodaActor->GenerateActorDescriptor())
+			{
+				SodaActorDescriptors.FindOrAdd(*It) = *Desc;
+			}
+		}
+	}
+
+	// Registre Metadata
+	FRuntimeMetaData::RegisterMetadataPrimaryAssets();
+
+	// Registre unloadad SodaActors
+	UAssetManager& AssetManager = UAssetManager::Get();
+	TArray<FPrimaryAssetId> PrimaryAssetIdList;
+	AssetManager.GetPrimaryAssetIdList(FPrimaryAssetType("SodaLibraryPrimaryAsset"), PrimaryAssetIdList);
+	for (auto& AssetId : PrimaryAssetIdList)
+	{
+		AssetManager.LoadPrimaryAsset(AssetId, TArray<FName>{TEXT("VehicleComponents")}, FStreamableDelegate::CreateLambda([this, AssetId]()
+		{
+			UAssetManager& AssetManager = UAssetManager::Get();
+			UClass* AssetObjectClass = AssetManager.GetPrimaryAssetObjectClass<USodaLibraryPrimaryAsset>(AssetId);
+			if (AssetObjectClass)
+			{
+				UE_LOG(LogSoda, Log, TEXT("USodaGameModeComponent::InitGame(); Loaded asset %s"), *AssetObjectClass->GetName());
+				for (auto& It : CastChecked<USodaLibraryPrimaryAsset>(AssetObjectClass->GetDefaultObject())->SodaActors)
+				{
+					SodaActorDescriptors.FindOrAdd(It.Key) = It.Value;
+					UE_LOG(LogSoda, Log, TEXT("USodaGameModeComponent::InitGame(); Registre \"%s\" [%s]"), *It.Key.ToString(), It.Key.Get() ? TEXT("Loaded") : TEXT("Unloaded"));
+				}
+			}
+			else
+			{
+				UE_LOG(LogSoda, Error, TEXT("USodaGameModeComponent::InitGame(); Primary asset \"%s\" load faild"), *AssetId.ToString());
+			}
+		}));
+	}
+
+	SodaApp.NotifyInitGame(this);
+
+	if (Cast<AGameModeBase>(GetOwner()) == nullptr)
+	{
+		UE_LOG(LogSoda, Fatal, TEXT("The USodaGameModeComponent must be child of AGameModeBase"));
+	}
+
+	if (SodaApp.GetSodaUserSettings()->bTagActorsAtBeginPlay)
+	{
+		USodaStatics::TagActorsInLevel(this, true);
+		USodaStatics::AddV2VComponentToAllVehiclesInLevel(this, ASodaVehicle::StaticClass()->GetClass());
+	}
+
+	/* Initialize LevelState */
+	LevelState = ALevelState::CreateOrLoad(this, DefaultLevelStateClass);
+	check(LevelState);
+	
+	/* Initialize level default pinned tool actors */
+	/*
+	for (TActorIterator<AActor> It(World); It; ++It)
+	{
+		if (IToolActor* ToolActor = Cast<IToolActor>(*It))
+		{
+			if (ToolActor->IsPinnedActor())
+			{
+				ToolActor->DeserializePinnedActor();
+			}
+		}
+	}
+	*/
+	
+	LevelState->FinishLoadLevel(); //Spawn all saved actors
+	
+	if (UGameInstance* Instance = UGameplayStatics::GetGameInstance(this))
+	{
+		UGameViewportClient* ViewPortClient = Instance->GetGameViewportClient();
+		if (ViewPortClient)
+		{
+			ViewPortClient->OnWindowCloseRequested().BindUObject(this, &USodaGameModeComponent::OnWindowCloseRequested);
+		}
+	}
+}
+
+void USodaGameModeComponent::PreEndGame(UWorld* World)
+{
+	if (World->WorldType != EWorldType::Game && World->WorldType != EWorldType::PIE)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("USodaGameModeComponent::PreEndGame(); Wrong WorldType"));
+		return;
+	}
+
+	ScenarioStop(EScenarioStopReason::QuitApplication);
+
+	if (InitGameHandle.IsValid())
+	{
+		FGameModeEvents::GameModeInitializedEvent.Remove(InitGameHandle);
+	}
+
+	if (PreEndGameHandle.IsValid())
+	{
+		FWorldDelegates::OnWorldBeginTearDown.Remove(PreEndGameHandle);
+	}
+
+	soda::FDBGateway::Instance().ClearDatasetsQueue();
+}
+
+bool USodaGameModeComponent::OnWindowCloseRequested()
+{
+	RequestQuit();
+	return false;
+}
+
+
+void USodaGameModeComponent::BeginPlay()
+{
+	Super::BeginPlay();
+
+	check(this == USodaGameModeComponent::Get());
+	UWorld* World = GetWorld();
+	check(World);
+	APlayerController* PlayerController = World->GetFirstPlayerController();
+	check(PlayerController);
+	FInputModeGameAndUI Mode;
+	Mode.SetHideCursorDuringCapture(true).SetLockMouseToViewportBehavior(EMouseLockMode::DoNotLock);
+	PlayerController->SetInputMode(Mode);
+	PlayerController->bShowMouseCursor = true;
+
+	ViewportClient = Cast<USodaGameViewportClient>(GetWorld()->GetGameViewport());
+	if (ViewportClient)
+	{
+		SAssignNew(SodaViewport, soda::SSodaViewport, GetWorld());
+		ViewportClient->InitUI(SodaViewport);
+	}
+
+	//if (bSetSpectatorModeOnStartUp)
+	{
+		SetSpectatorMode(true);
+	}
+
+	if (SodaApp.GetSodaUserSettings()->bAutoConnect)
+	{
+		UpdateDBGateway(false);
+	}
+}
+
+void USodaGameModeComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void USodaGameModeComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+
+	UWorld* World = GetWorld();
+	check(World);
+
+	if (IsScenarioRunning())
+	{
+		if (soda::FDBGateway::Instance().IsDatasetRecording() && soda::FDBGateway::Instance().IsDatasetRecordingStalled())
+		{
+			ShowMessageBox(soda::EMessageBoxType::OK, "Scenario Recording Failed", soda::FDBGateway::Instance().GetLastError());
+			ScenarioStop(EScenarioStopReason::InnerError);
+		}
+	}
+}
+
+void USodaGameModeComponent::PushToolBox(TSharedRef<soda::SToolBox> Widget, bool InstedPrev)
+{
+	if (SodaViewport.IsValid())
+	{
+		SodaViewport->PushToolBox(Widget, InstedPrev);;
+	}
+}
+
+bool USodaGameModeComponent::PopToolBox()
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->PopToolBox();
+	}
+	else
+	{
+		return false;
+	}
+}
+
+bool USodaGameModeComponent::CloseWindow(bool bCloseAllWindows)
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->CloseWindow(bCloseAllWindows);
+	}
+	else
+	{
+		return false;
+	}
+}
+
+void USodaGameModeComponent::SetSpectatorMode(bool bSpectatorMode)
+{
+	UWorld* World = GetWorld();
+	check(World);
+
+	APlayerController* PlayerController = World->GetFirstPlayerController();
+	if (!PlayerController)
+	{
+		return;
+	}
+
+	ASodaVehicle* Vehicle = PlayerController->GetPawn<ASodaVehicle>();
+
+	if (bSpectatorMode)
+	{
+		if (IsValid(SpectatorActor))
+		{
+			PlayerController->Possess(SpectatorActor);
+		}
+		else if (SpectatorClass.Get() )
+		{
+			FTransform Transform;
+			if (IsValid(LevelState) && LevelState->SpectatorActorRecord.IsRecordValid())
+			{
+				Transform = LevelState->SpectatorActorRecord.Transform;
+			}
+			else
+			{
+				FVector ViewLocation;
+				FRotator ViewRotation;
+				PlayerController->GetPlayerViewPoint(ViewLocation, ViewRotation);
+				Transform = FTransform(ViewRotation, ViewLocation);
+			}
+			if (IsValid(Vehicle))
+			{
+				UnpossesVehicle = Vehicle;
+			}
+			SpectatorActor = World->SpawnActorDeferred<ASodalSpectator>(
+				SpectatorClass.Get(),
+				Transform, nullptr, nullptr, ESpawnActorCollisionHandlingMethod::AlwaysSpawn);
+			check(SpectatorActor);
+			if (IsValid(LevelState)) LevelState->SpectatorActorRecord.DeserializeActor(SpectatorActor, false, true);
+			SpectatorActor->FinishSpawning(Transform);
+			PlayerController->Possess(SpectatorActor);
+		}
+	}
+	else
+	{
+		ASodaVehicle* PossesVehicle = UnpossesVehicle;
+		if (!IsValid(PossesVehicle)) // Try to find anouther vehicle
+		{
+			TActorIterator<ASodaVehicle> It(GetWorld());
+			if (It) PossesVehicle = *It;
+		}
+
+		if (IsValid(PossesVehicle))
+		{
+			if (IsValid(SpectatorActor))
+			{
+				if (AController* Controller = SpectatorActor->GetController())
+				{
+					SpectatorActor->SetActorRotation(Controller->GetControlRotation());
+				}
+				LevelState->SpectatorActorRecord.SerializeActor(SpectatorActor, false);
+				SpectatorActor->Destroy();
+				SpectatorActor = nullptr;
+			}
+			PlayerController->Possess(PossesVehicle);
+		}
+
+		UnpossesVehicle = nullptr;
+	}
+}
+
+ASodaVehicle* USodaGameModeComponent::GetActiveVehicle()
+{
+	UWorld* World = GetWorld();
+	check(World);
+
+	APlayerController* PlayerController = World->GetFirstPlayerController();
+
+	if (IsValid(PlayerController))
+	{
+		ASodaVehicle* Vehicle = PlayerController->GetPawn<ASodaVehicle>();
+
+		if (IsValid(Vehicle))
+		{
+			return Vehicle;
+		}
+	}
+
+	if (IsValid(UnpossesVehicle))
+	{
+		return UnpossesVehicle;
+	}
+
+	TActorIterator<ASodaVehicle> FirstVehicleIt(World);
+	if (FirstVehicleIt)
+	{
+		return *FirstVehicleIt;
+	}
+
+	return nullptr;
+}
+
+void USodaGameModeComponent::SetActiveVehicle(ASodaVehicle* Vehicle)
+{
+	UWorld* World = GetWorld();
+	check(World);
+
+	APlayerController* PlayerController = World->GetFirstPlayerController();
+	check(PlayerController);
+
+	if (IsValid(Vehicle))
+	{
+		SetSpectatorMode(false);
+		PlayerController->Possess(Vehicle);
+	}
+}
+
+void USodaGameModeComponent::ScenarioPlay()
+{
+	if (!bIsScenarioRunning)
+	{
+		ScenarioLevelSavedData.Memory.Empty();
+		ScenarioLevelSavedData.ActorsDirty.Empty();
+		ScenarioLevelSavedData.SelectedActor.Reset();
+		ScenarioLevelSavedData.PossesdActor.Reset();
+		if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController())
+		{
+			if (APawn * Pawn = PlayerController->GetPawn())
+			{
+				ScenarioLevelSavedData.PossesdActor = Pawn->GetName();
+			}
+		}
+		if (ViewportClient)
+		{
+			ScenarioLevelSavedData.Mode = SodaViewport->GetUIMode();
+			if (const AActor* Actor = ViewportClient->Selection->GetSelectedActor())
+			{
+				ScenarioLevelSavedData.SelectedActor = Actor->GetName();
+			}
+		}
+		ULevelSaveGame* LevelSaveGame = LevelState->CreateSaveGame(true);
+		UGameplayStatics::SaveGameToMemory(LevelSaveGame, ScenarioLevelSavedData.Memory);
+		for (auto& It : LevelState->ActorFactory->GetActors())
+		{
+			if (ISodaActor* SodaActor = Cast<ISodaActor>(It))
+			{
+				if (SodaActor->IsDirty())
+				{
+					ScenarioLevelSavedData.ActorsDirty.Add(It->GetName());
+				}
+			}
+		}
+
+		if (SodaApp.GetSodaUserSettings()->bRecordDataset)
+		{
+			if (soda::FDBGateway::Instance().BeginRecordDataset())
+			{
+				FNotificationInfo Info(FText::FromString(FString("Begin recording dataset; ID: ") + FString::FromInt(soda::FDBGateway::Instance().GetDatasetID())));
+				Info.ExpireDuration = 5.0f;
+				Info.Image = FCoreStyle::Get().GetBrush(TEXT("Icons.SuccessWithColor"));
+				FSlateNotificationManager::Get().AddNotification(Info);
+			}
+			else
+			{
+				ShowMessageBox(soda::EMessageBoxType::OK, "Scenario Play Failed", soda::FDBGateway::Instance().GetLastError());
+				return;
+			}
+		}
+
+		bIsScenarioRunning = true;
+		for (TActorIterator<AActor> It(GetWorld()); It; ++It)
+		{
+			if (It->GetClass()->ImplementsInterface(USodaActor::StaticClass()))
+			{
+				if (ISodaActor* SodaActor = Cast<ISodaActor>(*It))
+				{
+					SodaActor->ScenarioBegin();
+					if (SodaActor->GetActorHiddenInScenario())
+					{
+						It->SetActorHiddenInGame(true);
+					}
+				}
+				else
+				{
+					ISodaActor::Execute_ReceiveScenarioBegin(*It);
+				}
+			
+			}
+		}
+	}
+}
+
+void USodaGameModeComponent::ScenarioStop(EScenarioStopReason Reason)
+{
+	if (bIsScenarioRunning)
+	{
+		bIsScenarioRunning = false;
+
+		SodaViewport->SetUIMode(ScenarioLevelSavedData.Mode);
+
+		for (TActorIterator<AActor> It(GetWorld()); It; ++It)
+		{
+			if (It->GetClass()->ImplementsInterface(USodaActor::StaticClass()))
+			{
+				if (ISodaActor* SodaActor = Cast<ISodaActor>(*It))
+				{
+					SodaActor->ScenarioEnd();
+					if (SodaActor->GetActorHiddenInScenario())
+					{
+						It->SetActorHiddenInGame(false);
+					}
+				}
+				else
+				{
+					ISodaActor::Execute_ReceiveScenarioEnd(*It);
+				}
+			}
+		}
+		if (soda::FDBGateway::Instance().IsDatasetRecording())
+		{
+			soda::FDBGateway::Instance().EndRecordDataset(Reason);
+		}
+
+		if (ScenarioLevelSavedData.Memory.Num())
+		{
+			if (ULevelSaveGame* LevelSaveGame = Cast<ULevelSaveGame>(UGameplayStatics::LoadGameFromMemory(ScenarioLevelSavedData.Memory)))
+			{
+				if (LevelSaveGame->LevelDataRecord.DeserializeActor(LevelState, false))
+				{
+					LevelState->ClearLevel();
+					GEngine->ForceGarbageCollection(true);
+					FCoreUObjectDelegates::GetPostGarbageCollect().RemoveAll(this);
+					FCoreUObjectDelegates::GetPostGarbageCollect().AddUObject(this, &USodaGameModeComponent::OnPostGarbageCollect, 0.0f);
+				}
+				else
+				{
+					UE_LOG(LogSoda, Error, TEXT("USodaGameModeComponent::ScenarioStop(); Can't deserialize level save data"));
+				}
+				ScenarioLevelSavedData.Memory.Empty();
+			}
+			else
+			{
+				UE_LOG(LogSoda, Error, TEXT("USodaGameModeComponent::ScenarioStop(); Can't load level save data"));
+			}
+		}
+	}
+}
+
+void USodaGameModeComponent::OnPostGarbageCollect(float Delay /*= 0.0f*/)
+{
+	LevelState->FinishLoadLevel();
+	for (auto& It : ScenarioLevelSavedData.ActorsDirty)
+	{
+		AActor* const* Actor = LevelState->ActorFactory->GetActors().FindByPredicate([&It](const AActor* Actor) { return Actor->GetName() == It; });
+		if (ISodaActor* SodaActor = Cast<ISodaActor>(*Actor))
+		{
+			SodaActor->MarkAsDirty();
+		}
+	}
+	if (ViewportClient && !ScenarioLevelSavedData.SelectedActor.IsEmpty())
+	{
+		if (AActor* const* Actor = LevelState->ActorFactory->GetActors().FindByPredicate([this](const AActor* Actor) { return Actor->GetName() == ScenarioLevelSavedData.SelectedActor; }))
+		{
+			ViewportClient->Selection->SelectActor(*Actor, nullptr);
+		}			
+	}
+
+	if (APlayerController* PlayerController = GetWorld()->GetFirstPlayerController())
+	{
+		if (!PlayerController->GetPawn())
+		{
+			if (SpectatorActor && SpectatorActor->GetName() == ScenarioLevelSavedData.PossesdActor)
+			{
+				SetSpectatorMode(true);
+			}
+			else
+			{
+				for (TActorIterator<APawn> It(GetWorld()); It; ++It)
+				{
+					if (It->GetName() == ScenarioLevelSavedData.PossesdActor)
+					{
+						PlayerController->Possess(*It);
+						break;
+					}
+				}
+			}
+		}
+
+		if (!PlayerController->GetPawn())
+		{
+			SetSpectatorMode(true);
+		}
+	}
+	
+
+	FCoreUObjectDelegates::GetPostGarbageCollect().RemoveAll(this);
+}
+
+int64 USodaGameModeComponent::GetScenarioID() const
+{
+	if (!bIsScenarioRunning)
+	{
+		return -1;
+	}
+	else 
+	{
+		return soda::FDBGateway::Instance().GetDatasetID();
+	}
+}
+
+
+void USodaGameModeComponent::RequestQuit(bool bForce)
+{
+	ScenarioStop(EScenarioStopReason::QuitApplication);
+
+	CloseWindow(true);
+
+	if (!bForce && SodaViewport.IsValid())
+	{
+		OpenWindow("Quit", SNew(soda::SSaveAllWindow, soda::ESaveAllWindowMode::Quit, true));
+	}
+	else
+	{
+		//Delay before exiting to end the current scenario if it was running
+		GetWorld()->GetTimerManager().SetTimer(TimerHandle, [this]()
+		{
+			UKismetSystemLibrary::QuitGame(this, nullptr, EQuitPreference::Quit, false);
+		}, 0.2, false);
+	}
+
+}
+
+void USodaGameModeComponent::RequestRestartLevel(bool bForce)
+{
+	ScenarioStop(EScenarioStopReason::QuitApplication);
+
+	CloseWindow(true);
+
+	if (!bForce && SodaViewport.IsValid())
+	{
+		OpenWindow("Restart Level", SNew(soda::SSaveAllWindow, soda::ESaveAllWindowMode::Restart, true));
+	}
+	else
+	{
+		//Delay before exiting to end the current scenario if it was running
+		GetWorld()->GetTimerManager().SetTimer(TimerHandle, [this]() 
+		{
+			UGameplayStatics::OpenLevel(this, *UGameplayStatics::GetCurrentLevelName(this, true), false);
+		}, 0.2, false);
+	}
+}
+
+TSharedPtr<soda::SMessageBox> USodaGameModeComponent::ShowMessageBox(soda::EMessageBoxType Type, const FString& Caption, const FString& Text)
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->ShowMessageBox(Type, Caption, Text);
+	}
+	else
+	{
+		return TSharedPtr<soda::SMessageBox>();
+	}
+}
+
+TSharedPtr<soda::SMenuWindow> USodaGameModeComponent::OpenWindow(const FString& Caption, TSharedRef<soda::SMenuWindowContent> Content)
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->OpenWindow(Caption, Content);
+	}
+	else
+	{
+		return TSharedPtr<soda::SMenuWindow>();
+	}
+}
+
+bool USodaGameModeComponent::CloseWindow(soda::SMenuWindow * Wnd)
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->CloseWindow(Wnd);
+	}
+	else
+	{
+		return false;
+	}
+}
+
+
+void USodaGameModeComponent::NotifyLevelIsChanged()
+{
+
+}
+
+ASodaActorFactory* USodaGameModeComponent::GetActorFactory()
+{
+	check(LevelState);
+	return LevelState->ActorFactory;
+}
+
+const FSodaActorDescriptor& USodaGameModeComponent::GetSodaActorDescriptor(TSoftClassPtr<AActor> Class) const
+{
+	if (const FSodaActorDescriptor* Desc = SodaActorDescriptors.Find(Class))
+	{
+		return *Desc;
+	}
+
+	static FSodaActorDescriptor Default;
+	return Default;
+}
+
+const TMap<TSoftClassPtr<AActor>, FSodaActorDescriptor>& USodaGameModeComponent::GetSodaActorDescriptors() const
+{
+	return SodaActorDescriptors;
+}
+
+void USodaGameModeComponent::UpdateDBGateway(bool bSync)
+{
+	if (soda::FDBGateway::Instance().GetStatus() == soda::EDBGatewayStatus::Connecting)
+	{
+		ShowMessageBox(soda::EMessageBoxType::OK, "Faild", "The connecting is already in progress");
+		return;
+	}
+
+	soda::FDBGateway::Instance().Configure(SodaApp.GetSodaUserSettings()->MongoURL, SodaApp.GetSodaUserSettings()->DatabaseName, bSync);
+}
+
+TSharedPtr<soda::SWaitingPanel> USodaGameModeComponent::ShowWaitingPanel(const FString& Caption, const FString& SubCaption)
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->ShowWaitingPanel(Caption, SubCaption);
+	}
+	else
+	{
+		return TSharedPtr<soda::SWaitingPanel>();
+	}
+}
+
+bool USodaGameModeComponent::CloseWaitingPanel(soda::SWaitingPanel* InWaitingPanel = nullptr)
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->CloseWaitingPanel(InWaitingPanel);
+	}
+	else
+	{
+		return false;
+	}
+}
+
+bool USodaGameModeComponent::CloseWaitingPanel(bool bCloseAll)
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport->CloseWaitingPanel(bCloseAll);
+	}
+	else
+	{
+		return false;
+	}
+}
+
diff --git a/Source/UnrealSoda/Private/SodaGameViewportClient.cpp b/Source/UnrealSoda/Private/SodaGameViewportClient.cpp
new file mode 100644
index 0000000..697ca83
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaGameViewportClient.cpp
@@ -0,0 +1,853 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaGameViewportClient.h"
+#include "Engine/Canvas.h"
+#include "SceneViewExtension.h"
+#include "Engine/LocalPlayer.h"
+#include "EngineUtils.h"
+#include "Soda/SodaGameMode.h"
+#include "Editor/SodaWidget.h"
+#include "Components/BillboardComponent.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/Editor/SodaSelection.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/SodaGameMode.h"
+#include "Editor/PreviewActor.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "GenericPlatform/GenericApplication.h"
+#include "Widgets/SWeakWidget.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Framework/Commands/UICommandList.h"
+#include "Soda/LevelState.h"
+
+static void DrawSelectBox(FPrimitiveDrawInterface* PDI, const FBox& Box, float SizeK, const FLinearColor& Color, uint8 DepthPriority, float Thickness = 0.0f, float DepthBias = 0.0f, bool bScreenSpace = false)
+{
+	const float Size = Box.GetSize().GetMin() * SizeK;
+
+	PDI->DrawLine(FVector(Box.Min.X, Box.Min.Y, Box.Min.Z), FVector(Box.Min.X + Size, Box.Min.Y, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Min.Y, Box.Min.Z), FVector(Box.Min.X, Box.Min.Y + Size, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Min.Y, Box.Min.Z), FVector(Box.Min.X, Box.Min.Y, Box.Min.Z + Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+
+	PDI->DrawLine(FVector(Box.Min.X, Box.Max.Y, Box.Min.Z), FVector(Box.Min.X + Size, Box.Max.Y, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Max.Y, Box.Min.Z), FVector(Box.Min.X, Box.Max.Y - Size, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Max.Y, Box.Min.Z), FVector(Box.Min.X, Box.Max.Y, Box.Min.Z + Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+
+	PDI->DrawLine(FVector(Box.Max.X, Box.Max.Y, Box.Min.Z), FVector(Box.Max.X - Size, Box.Max.Y, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Max.Y, Box.Min.Z), FVector(Box.Max.X, Box.Max.Y - Size, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Max.Y, Box.Min.Z), FVector(Box.Max.X, Box.Max.Y, Box.Min.Z + Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+
+	PDI->DrawLine(FVector(Box.Max.X, Box.Min.Y, Box.Min.Z), FVector(Box.Max.X - Size, Box.Min.Y, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Min.Y, Box.Min.Z), FVector(Box.Max.X, Box.Min.Y + Size, Box.Min.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Min.Y, Box.Min.Z), FVector(Box.Max.X, Box.Min.Y, Box.Min.Z + Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+
+	//
+
+	PDI->DrawLine(FVector(Box.Min.X, Box.Min.Y, Box.Max.Z), FVector(Box.Min.X + Size, Box.Min.Y, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Min.Y, Box.Max.Z), FVector(Box.Min.X, Box.Min.Y + Size, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Min.Y, Box.Max.Z), FVector(Box.Min.X, Box.Min.Y, Box.Max.Z - Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+
+	PDI->DrawLine(FVector(Box.Min.X, Box.Max.Y, Box.Max.Z), FVector(Box.Min.X + Size, Box.Max.Y, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Max.Y, Box.Max.Z), FVector(Box.Min.X, Box.Max.Y - Size, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Min.X, Box.Max.Y, Box.Max.Z), FVector(Box.Min.X, Box.Max.Y, Box.Max.Z - Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+
+	PDI->DrawLine(FVector(Box.Max.X, Box.Max.Y, Box.Max.Z), FVector(Box.Max.X - Size, Box.Max.Y, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Max.Y, Box.Max.Z), FVector(Box.Max.X, Box.Max.Y - Size, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Max.Y, Box.Max.Z), FVector(Box.Max.X, Box.Max.Y, Box.Max.Z - Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+
+	PDI->DrawLine(FVector(Box.Max.X, Box.Min.Y, Box.Max.Z), FVector(Box.Max.X - Size, Box.Min.Y, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Min.Y, Box.Max.Z), FVector(Box.Max.X, Box.Min.Y + Size, Box.Max.Z), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+	PDI->DrawLine(FVector(Box.Max.X, Box.Min.Y, Box.Max.Z), FVector(Box.Max.X, Box.Min.Y, Box.Max.Z - Size), Color, DepthPriority, Thickness, DepthBias, bScreenSpace);
+}
+
+//************************************************************************************
+void USodaGameViewportClient::Init(struct FWorldContext& WorldContext, UGameInstance* OwningGameInstance, bool bCreateNewAudioDevice)
+{
+	Super::Init(WorldContext, OwningGameInstance, bCreateNewAudioDevice);
+
+	Selection = NewObject<USodaSelection>(this);
+	check(Selection);
+
+	TrackingWidgetMode = soda::EWidgetMode::WM_Translate;
+	CurrentAxis = EAxisList::None;
+	CoordSystem = soda::COORD_Local;
+}
+
+void USodaGameViewportClient::InitUI(const TWeakPtr<soda::SSodaViewport>& SodaViewportWidget)
+{
+	SodaViewport = SodaViewportWidget;
+	AddViewportWidgetContent(SNew(SWeakWidget).PossiblyNullContent(SodaViewport.Pin().ToSharedRef()), 13);
+}
+
+soda::EUIMode USodaGameViewportClient::GetGameMode() const
+{
+	if (SodaViewport.IsValid())
+	{
+		return SodaViewport.Pin()->GetUIMode();
+	}
+	else
+	{
+		return soda::EUIMode::Free;
+	}
+}
+
+void USodaGameViewportClient::Draw(FViewport* InViewport, FCanvas* SceneCanvas)
+{
+	UGameViewportClient::Draw(InViewport, SceneCanvas);
+
+	if (GetGameMode() == soda::EUIMode::Editing)
+	{
+		if (Widget)
+		{
+			Widget->DrawHUD(SceneCanvas);
+		}
+	}
+
+	DrawAxes(InViewport, SceneCanvas, nullptr, EAxisList::XYZ);
+}
+
+void USodaGameViewportClient::FinalizeViews(class FSceneViewFamily* ViewFamily, const TMap<ULocalPlayer*, FSceneView*>& PlayerViewMap)
+{
+	for (auto& It : PlayerViewMap)
+	{
+		check(!It.Value->Drawer);
+		It.Value->Drawer = this;
+	}
+}
+
+void USodaGameViewportClient::Draw(const FSceneView* View, FPrimitiveDrawInterface* PDI)
+{
+	if (GetGameMode() == soda::EUIMode::Editing)
+	{
+		if (Widget)
+		{
+			Widget->Render(View, PDI, this);
+		}
+
+		if (IsValid(DropPreviewActor))
+		{
+			DropPreviewActor->RenderTarget(PDI);
+		}
+
+		USodaGameModeComponent* SodaGameMode = USodaGameModeComponent::GetChecked();
+
+		AActor* SelectedActor = Selection->GetSelectedActor();
+		ISodaActor* SodaActor = Cast<ISodaActor>(SelectedActor);
+		if (SelectedActor && (!SodaActor || SodaActor->ShowSelectBox()))
+		{
+			DrawBoundingBox(View, PDI, SelectedActor, FLinearColor::White);
+		}
+
+		AActor* HoveredActor = Selection->GetHoveredActor();
+		if (HoveredActor/* && SodaGameMode->GetSodaActorDescriptor(HoveredActor->GetClass()).bDrawDebugSelectBox*/)
+		{
+			DrawBoundingBox(View, PDI, HoveredActor, FLinearColor(0, 0.8, 1, 0.8));
+		}
+		
+		if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(WidgetTargetComponent))
+		{
+			VehicleComponent->DrawSelection(View, PDI);
+		}
+	}
+
+}
+
+void USodaGameViewportClient::Tick(float DeltaTime)
+{
+
+	if (GetGameMode() == soda::EUIMode::Editing)
+	{
+		if (Widget)
+		{
+			Widget->TickWidget(this);
+
+			if (!bIsWidgetDragging)
+			{
+				CheckAxisUnderCursor();
+			}
+			else
+			{
+				UpdateMouseDelta();
+			}
+		}
+
+		if (EditorMouseCaptureMode == EEditorMouseCaptureMode::Default)
+		{
+			Selection->Tick(Viewport);
+		}
+	}
+
+	if (WidgetTargetComponent && !IsValid(WidgetTargetComponent))
+	{
+		SetWidgetTarget(nullptr);
+		StopTracking();
+	}
+}
+
+bool USodaGameViewportClient::InputKey(const FInputKeyEventArgs& InEventArgs)
+{
+	if (GetGameMode() == soda::EUIMode::Editing)
+	{
+		bool bIsLeftMouseButtonDown = InEventArgs.Viewport->KeyState(EKeys::LeftMouseButton);
+		bool bIsLeftMouseButtonEvent = InEventArgs.Key == EKeys::LeftMouseButton;
+
+		if (EditorMouseCaptureMode == EEditorMouseCaptureMode::Default)
+		{
+			if (bIsLeftMouseButtonDown && bIsLeftMouseButtonEvent && (InEventArgs.Event == IE_Pressed))
+			{
+				TryStartTracking(InEventArgs.Viewport->GetMouseX(), InEventArgs.Viewport->GetMouseY());
+				if (bIsWidgetDragging)
+				{
+					return Super::InputKey(InEventArgs);
+				}
+			}
+
+			// If we are tracking and no mouse button is down and this input event released the mouse button stop tracking and process any clicks if necessary
+			if (bIsWidgetDragging && !bIsLeftMouseButtonDown && bIsLeftMouseButtonEvent)
+			{
+				// Stop tracking if no mouse button is down
+				StopTracking();
+				bIsWidgetDragging = false;
+				return Super::InputKey(InEventArgs);
+			}
+
+			if (bIsWidgetDragging)
+			{
+				return Super::InputKey(InEventArgs);
+			}
+
+			if (EditorMouseCaptureMode == EEditorMouseCaptureMode::Default)
+			{
+				Selection->InputKey(InEventArgs);
+			}
+		}
+		else if (EditorMouseCaptureMode == EEditorMouseCaptureMode::Dragging)
+		{
+			if (bIsLeftMouseButtonDown && bIsLeftMouseButtonEvent && (InEventArgs.Event == IE_Pressed))
+			{
+				bEditorCaptureModeDragging = true;
+			}
+
+			if (!bIsLeftMouseButtonDown && bIsLeftMouseButtonEvent)
+			{
+				bEditorCaptureModeDragging = false;
+			}
+		}
+	}
+
+	if (Super::InputKey(InEventArgs))
+	{
+		return true;
+	}
+	else
+	{
+		if (SodaViewport.IsValid())
+		{
+			FModifierKeysState KeyState = FSlateApplication::Get().GetModifierKeys();
+			return SodaViewport.Pin()->GetCommandList()->ProcessCommandBindings(InEventArgs.Key, KeyState, (InEventArgs.Event == IE_Repeat));
+		}
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::InputKey(); %s "), *InEventArgs.Key.ToString());
+		return false;
+	}
+}
+
+bool USodaGameViewportClient::InputAxis(FViewport* InViewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples, bool bGamepad)
+{
+	if (GetGameMode() == soda::EUIMode::Editing)
+	{
+		if (bIsWidgetDragging && Widget)
+		{
+			FVector Wk = FVector(Key == EKeys::MouseX ? Delta : 0, Key == EKeys::MouseY ? Delta : 0, 0);
+
+			if (TrackingWidgetMode == soda::WM_Rotate)
+			{
+				const float RotateSpeedMultipler = 1.0f;
+				Wk *= RotateSpeedMultipler;
+			}
+			else if (TrackingWidgetMode == soda::WM_Scale)
+			{
+				const float ScaleSpeedMultipler = 0.01f;
+				Wk *= ScaleSpeedMultipler;
+			}
+
+			End += Wk;
+
+			return true;
+		}
+		else if (bEditorCaptureModeDragging)
+		{
+			return true;
+		}
+		else
+		{
+			Selection->InputAxis(InViewport, InputDevice, Key, Delta, DeltaTime, NumSamples, bGamepad);
+		}
+	}
+
+	return Super::InputAxis(InViewport, InputDevice, Key, Delta, DeltaTime, NumSamples, bGamepad);
+}
+
+EMouseCursor::Type USodaGameViewportClient::GetCursor(FViewport* InViewport, int32 X, int32 Y)
+{
+	CachedMouseX = X;
+	CachedMouseY = Y;
+
+	if (GetGameMode() == soda::EUIMode::Editing)
+	{
+		if (bIsWidgetDragging)
+		{
+			return EMouseCursor::GrabHand;
+		}
+		else if (GetCurrentWidgetAxis() != EAxisList::None)
+		{
+			return EMouseCursor::CardinalCross;
+		}
+		else
+		{
+			return EMouseCursor::Crosshairs;
+		}
+	}
+
+	return Super::GetCursor(InViewport, X, Y);
+}
+
+
+EMouseCaptureMode USodaGameViewportClient::GetMouseCaptureMode() const
+{
+	return IsDragging() ? EMouseCaptureMode::NoCapture : Super::GetMouseCaptureMode();
+}
+
+bool USodaGameViewportClient::LockDuringCapture()
+{
+	return IsDragging() ? false : Super::LockDuringCapture();
+}
+
+bool USodaGameViewportClient::ShouldAlwaysLockMouse()
+{
+	return IsDragging() ? false : Super::ShouldAlwaysLockMouse();
+}
+
+bool USodaGameViewportClient::HideCursorDuringCapture() const
+{
+	return IsDragging() ? false : Super::HideCursorDuringCapture();
+}
+
+bool USodaGameViewportClient::IsDragging() const
+{
+	return (bIsWidgetDragging && GetWidgetMode() == soda::WM_Translate) || bEditorCaptureModeDragging;
+}
+
+soda::EWidgetMode USodaGameViewportClient::GetWidgetMode() const
+{
+	return TrackingWidgetMode;
+}
+
+void USodaGameViewportClient::SetWidgetMode(soda::EWidgetMode InWidgetMode)
+{
+	TrackingWidgetMode = InWidgetMode;
+}
+
+soda::ECoordSystem USodaGameViewportClient::GetWidgetCoordSystemSpace() const
+{
+	return CoordSystem;
+}
+
+void USodaGameViewportClient::SetWidgetCoordSystemSpace(soda::ECoordSystem InCoordSystem)
+{
+	CoordSystem = InCoordSystem;
+}
+
+FVector USodaGameViewportClient::GetWidgetLocation() const
+{
+	if (WidgetTargetComponent)
+	{
+		return WidgetTargetComponent->GetComponentTransform().GetTranslation();
+	}
+	else
+	{
+		return FVector::ZeroVector;
+	}
+}
+
+FMatrix USodaGameViewportClient::GetLocalCoordinateSystem() const
+{
+	if (WidgetTargetComponent)
+	{
+		return FQuatRotationMatrix(WidgetTargetComponent->GetComponentTransform().GetRotation());
+	}
+	else
+	{
+		return FMatrix::Identity;
+	}
+}
+
+FMatrix USodaGameViewportClient::GetWidgetCoordSystem() const
+{
+	if (WidgetTargetComponent)
+	{
+
+		switch (GetWidgetCoordSystemSpace())
+		{
+		case soda::COORD_Local:
+			return FQuatRotationMatrix(WidgetTargetComponent->GetComponentTransform().GetRotation());
+
+		case soda::COORD_World:
+		default:
+			return FMatrix::Identity;
+		}
+	}
+	else
+	{
+		return FMatrix::Identity;
+	}
+}
+
+void USodaGameViewportClient::SetCurrentWidgetAxis(EAxisList::Type AxisList)
+{
+	if (Widget)
+	{
+		Widget->SetCurrentAxis(AxisList);
+		CurrentAxis = AxisList;
+	}
+}
+
+EAxisList::Type USodaGameViewportClient::GetCurrentWidgetAxis() const
+{
+	return CurrentAxis;
+}
+
+void USodaGameViewportClient::CheckAxisUnderCursor()
+{
+	const EAxisList::Type SaveAxis = Widget->GetCurrentAxis();
+	EAxisList::Type NewAxis = EAxisList::None;
+
+	const bool LeftMouseButtonDown = Viewport->KeyState(EKeys::LeftMouseButton) ? true : false;
+	const bool MiddleMouseButtonDown = Viewport->KeyState(EKeys::MiddleMouseButton) ? true : false;
+	const bool RightMouseButtonDown = Viewport->KeyState(EKeys::RightMouseButton) ? true : false;
+	const bool bMouseButtonDown = (LeftMouseButtonDown || MiddleMouseButtonDown || RightMouseButtonDown);
+	
+	if(!bMouseButtonDown)
+	{
+		// In the case of the widget mode being overridden we can have a hit proxy
+		// from the previous mode with an inappropriate axis for rotation.
+		EAxisList::Type ProxyAxis = ASodaWidget::GetAxisListAtScreenPos(GetWorld(), FVector2D(CachedMouseX, CachedMouseY));
+		if (GetWidgetMode() != soda::WM_Rotate || ProxyAxis == EAxisList::X || ProxyAxis == EAxisList::Y || ProxyAxis == EAxisList::Z)
+		{
+			NewAxis = ProxyAxis;
+		}
+	}
+
+	// If the current axis on the widget changed, repaint the viewport.
+	if (NewAxis != SaveAxis)
+	{
+		SetCurrentWidgetAxis(NewAxis);
+	}
+}
+
+void USodaGameViewportClient::SetWidgetTarget(USceneComponent* InWidgetTargetComponent)
+{
+	if (IsValid(InWidgetTargetComponent))
+	{
+		WidgetTargetComponent = InWidgetTargetComponent;
+		if(!Widget) Widget = GetWorld()->SpawnActor<ASodaWidget>();
+	}
+	else
+	{
+		WidgetTargetComponent = nullptr;
+		if (Widget)
+		{
+			Widget->Destroy();
+			Widget = nullptr;
+		}
+	}
+}
+
+void USodaGameViewportClient::Invalidate()
+{
+	StopTracking();
+	WidgetTargetComponent = nullptr;
+	if (Widget)
+	{
+		Widget->Destroy();
+		Widget = nullptr;
+	}
+	EditorMouseCaptureMode = EEditorMouseCaptureMode::Default;
+	bEditorCaptureModeDragging = false;
+}
+
+void USodaGameViewportClient::UpdateMouseDelta()
+{
+	if (Widget)
+	{
+		FVector DragDelta = End - Start;
+
+		// Convert the movement delta into drag/rotation deltas
+		FVector Drag = FVector::ZeroVector;
+		FRotator Rot = FRotator::ZeroRotator;
+		FVector Scale = FVector::ZeroVector;
+		EAxisList::Type CurrentAxis2 = Widget->GetCurrentAxis();
+
+		FSceneViewFamilyContext DragStartViewFamily(FSceneViewFamily::ConstructionValues(
+			Viewport,
+			GetWorld()->Scene,
+			EngineShowFlags)
+			.SetRealtimeUpdate(true));
+
+		FVector	 TmpViewLocation;
+		FRotator TmpViewRotation;
+		FSceneView* DragStartView = GetWorld()->GetFirstLocalPlayerFromController()->CalcSceneView(&DragStartViewFamily, TmpViewLocation, TmpViewRotation, Viewport);
+
+		switch (GetWidgetMode())
+		{
+		case soda::EWidgetMode::WM_Translate:
+			Widget->AbsoluteTranslationConvertMouseMovementToAxisMovement(DragStartView, this, GetWidgetLocation(), FVector2D(Viewport->GetMouseX(), Viewport->GetMouseY()), Drag, Rot, Scale);
+			break;
+		case soda::EWidgetMode::WM_Rotate:
+		case soda::EWidgetMode::WM_Scale:
+			Widget->ConvertMouseMovementToAxisMovement(DragStartView, this, false, DragDelta, Drag, Rot, Scale);
+			Widget->ConvertMouseMovementToAxisMovement(DragStartView, this, false, DragDelta, Drag, Rot, Scale);
+			break;
+		default:
+			break;
+		}
+
+		InputWidgetDelta(Viewport, CurrentAxis, Drag, Rot, Scale);
+
+		if (!Rot.IsZero())
+		{
+			Widget->UpdateDeltaRotation();
+		}
+
+		// Clean up
+		End -= DragDelta;
+	}
+}
+
+void USodaGameViewportClient::StopTracking()
+{
+	if (bIsWidgetDragging && Widget)
+	{
+		Widget->SetDragging(false);
+		Widget->ResetDeltaRotation();
+		Start = End = FVector::ZeroVector;
+		SetCurrentWidgetAxis(EAxisList::None);
+		bIsWidgetDragging = false;
+	}
+}
+
+void USodaGameViewportClient::TryStartTracking(const int32 InX, const int32 InY)
+{
+	if (Widget)
+	{
+		bIsWidgetDragging = (GetCurrentWidgetAxis() != EAxisList::None);
+
+		Widget->ResetInitialTranslationOffset();
+		Widget->SetDragStartPosition(FVector2D(InX, InY));
+		Widget->SetDragging(bIsWidgetDragging);
+		Widget->ResetDeltaRotation();
+
+		Start = End = FVector(InX, InY, 0);
+	}
+}
+
+bool USodaGameViewportClient::InputWidgetDelta(FViewport* InViewport, EAxisList::Type InCurrentAxis, FVector& Drag, FRotator& Rot, FVector& Scale)
+{
+	if (!WidgetTargetComponent)
+	{
+		return false;
+	}
+	
+	FTransform WidgetTransform = WidgetTargetComponent->GetComponentTransform();
+	WidgetTransform.AddToTranslation(Drag);
+	WidgetTransform.SetRotation(Rot.Quaternion() * WidgetTransform.GetRotation());
+	WidgetTransform.SetScale3D(WidgetTransform.GetScale3D() + Scale);
+
+	if (ISodaActor* SodaActor = Cast<ISodaActor>(Selection->GetSelectedActor()))
+	{
+		SodaActor->InputWidgetDelta(WidgetTargetComponent, WidgetTransform);
+
+		if (Selection->GetSelectedActor()->GetRootComponent() == WidgetTargetComponent)
+		{
+			if (ALevelState* LevelState = ALevelState::Get())
+			{
+				LevelState->MarkAsDirty();
+			}
+		}
+		else
+		{
+			SodaActor->MarkAsDirty();
+		}
+	}
+
+	WidgetTargetComponent->SetWorldTransform(WidgetTransform, false, nullptr, ETeleportType::ResetPhysics);
+	
+	return true;
+}
+
+
+void USodaGameViewportClient::DrawAxes(FViewport* InViewport, FCanvas* Canvas, const FRotator* InRotation, EAxisList::Type InAxis)
+{
+	FMatrix ViewTM = FMatrix::Identity;
+
+	FSceneViewFamilyContext DragStartViewFamily(FSceneViewFamily::ConstructionValues(
+		Viewport,
+		GetWorld()->Scene,
+		EngineShowFlags)
+		.SetRealtimeUpdate(true));
+	FVector	 TmpViewLocation;
+	FRotator TmpViewRotation;
+	FSceneView* DragStartView = GetWorld()->GetFirstLocalPlayerFromController()->CalcSceneView(&DragStartViewFamily, TmpViewLocation, TmpViewRotation, Viewport);
+	ViewTM = FRotationMatrix(TmpViewRotation);
+
+	/*
+	if (bUsingOrbitCamera)
+	{
+		FViewportCameraTransform& ViewTransform = GetViewTransform();
+		ViewTM = FRotationMatrix(ViewTransform.ComputeOrbitMatrix().InverseFast().Rotator());
+	}
+	else
+	{
+		ViewTM = FRotationMatrix(GetViewRotation());
+	}
+	*/
+
+
+	if (InRotation)
+	{
+		ViewTM = FRotationMatrix(*InRotation);
+	}
+
+	const int32 SizeX = InViewport->GetSizeXY().X / Canvas->GetDPIScale();
+	const int32 SizeY = InViewport->GetSizeXY().Y / Canvas->GetDPIScale();
+
+	const FIntPoint AxisOrigin(30, SizeY - 30);
+	const float AxisSize = 25.f;
+
+	UFont* Font = GEngine->GetSmallFont();
+	int32 XL, YL;
+	StringSize(Font, XL, YL, TEXT("Z"));
+
+	FVector AxisVec;
+	FIntPoint AxisEnd;
+	FCanvasLineItem LineItem;
+	FCanvasTextItem TextItem(FVector2D::ZeroVector, FText::GetEmpty(), Font, FLinearColor::White);
+	if ((InAxis & EAxisList::X) == EAxisList::X)
+	{
+		AxisVec = AxisSize * ViewTM.InverseTransformVector(FVector(1, 0, 0));
+		AxisEnd = AxisOrigin + FIntPoint(AxisVec.Y, -AxisVec.Z);
+		LineItem.SetColor(FLinearColor::Red);
+		TextItem.SetColor(FLinearColor::Red);
+		LineItem.Draw(Canvas, AxisOrigin, AxisEnd);
+		TextItem.Text = FText::FromString("X");
+		TextItem.Draw(Canvas, FVector2D(AxisEnd.X + 2, AxisEnd.Y - 0.5 * YL));
+	}
+
+	if ((InAxis & EAxisList::Y) == EAxisList::Y)
+	{
+		AxisVec = AxisSize * ViewTM.InverseTransformVector(FVector(0, 1, 0));
+		AxisEnd = AxisOrigin + FIntPoint(AxisVec.Y, -AxisVec.Z);
+		LineItem.SetColor(FLinearColor::Green);
+		TextItem.SetColor(FLinearColor::Green);
+		LineItem.Draw(Canvas, AxisOrigin, AxisEnd);
+		TextItem.Text = FText::FromString("Y");
+		TextItem.Draw(Canvas, FVector2D(AxisEnd.X + 2, AxisEnd.Y - 0.5 * YL));
+
+	}
+
+	if ((InAxis & EAxisList::Z) == EAxisList::Z)
+	{
+		AxisVec = AxisSize * ViewTM.InverseTransformVector(FVector(0, 0, 1));
+		AxisEnd = AxisOrigin + FIntPoint(AxisVec.Y, -AxisVec.Z);
+		LineItem.SetColor(FLinearColor::Blue);
+		TextItem.SetColor(FLinearColor::Blue);
+		LineItem.Draw(Canvas, AxisOrigin, AxisEnd);
+		TextItem.Text = FText::FromString("Z");
+		TextItem.Draw(Canvas, FVector2D(AxisEnd.X + 2, AxisEnd.Y - 0.5 * YL));
+	}
+}
+
+
+void USodaGameViewportClient::DrawBoundingBox(const FSceneView* View, FPrimitiveDrawInterface* PDI, const AActor* Actor, const FLinearColor& Color)
+{
+	check(Actor != NULL);
+
+	FBox ActorBox = Actor->GetComponentsBoundingBox(false);
+
+	if (!ActorBox.IsValid)
+	{
+		if (UBillboardComponent* Sprite = Actor->FindComponentByClass<UBillboardComponent>())
+		{
+			ActorBox = Sprite->Bounds.GetBox();
+		}
+	}
+
+	// If we didn't get a valid bounding box, just make a little one around the actor location
+	if (!ActorBox.IsValid)
+	{
+		ActorBox = FBox(Actor->GetActorLocation(), Actor->GetActorLocation());
+	}
+
+	DrawSelectBox(PDI, ActorBox.ExpandBy(20), 0.4, Color, SDPG_Foreground);
+}
+
+bool USodaGameViewportClient::UpdateDropPreviewActor(int32 MouseX, int32 MouseY)
+{
+	if (!HasDropPreviewActor())
+	{
+		return false;
+	}
+
+	// If the mouse did not move, there is no need to update anything
+	//if (MouseX == DropPreviewMouseX && MouseY == DropPreviewMouseY)
+	//{
+	//	return false;
+	//}
+
+	// Update the cached mouse position
+	//DropPreviewMouseX = MouseX;
+	//DropPreviewMouseY = MouseY;
+
+	const FEditorUtils::FActorPositionTraceResult TraceResult = FEditorUtils::TraceWorldForPosition(GetWorld(), FVector2D(MouseX, MouseY));
+	if (TraceResult.State != FEditorUtils::FActorPositionTraceResult::HitSuccess)
+	{
+		return false;
+	}
+
+	if (!TraceResult.HitActor.Get())
+	{
+		return false;
+	}
+
+	DropPreviewActor->SetActorLocation(TraceResult.Location);
+
+	FVector Test = DropPreviewActor->GetActorLocation();
+	
+	return true;
+}
+
+void USodaGameViewportClient::DestroyDropPreviewActor()
+{
+	if (HasDropPreviewActor())
+	{
+		GetWorld()->DestroyActor(DropPreviewActor);
+	}
+}
+
+bool USodaGameViewportClient::HasDropPreviewActor() const
+{
+	return IsValid(DropPreviewActor);
+}
+
+bool USodaGameViewportClient::DropActorAtCoordinates(int32 MouseX, int32 MouseY, UClass* ActorClass, AActor** OutNewActor, bool bAddToFactory)
+{
+	DestroyDropPreviewActor();
+
+	if (!ActorClass)
+	{
+		return false;
+	}
+
+	const FEditorUtils::FActorPositionTraceResult TraceResult = FEditorUtils::TraceWorldForPosition(GetWorld(), FVector2D(MouseX, MouseY));
+	if (TraceResult.State != FEditorUtils::FActorPositionTraceResult::HitSuccess)
+	{
+		return false;
+	}
+
+	AActor* NewActor = nullptr;
+
+	if (bAddToFactory)
+	{
+		USodaGameModeComponent* SodaGameMode = USodaGameModeComponent::Get();
+		if (!SodaGameMode)
+		{
+			return false;
+		}
+		ASodaActorFactory* ActorFactory = SodaGameMode->GetActorFactory();
+		NewActor = ActorFactory->SpawnActor(ActorClass, FTransform(FRotator::ZeroRotator, TraceResult.Location, FVector::OneVector));
+	}
+	else
+	{
+		FActorSpawnParameters SpawnInfo;
+		SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
+		SpawnInfo.bDeferConstruction = true;
+		//SpawnInfo.Name = ASodaActorFactory::MakeUniqueObjectName(GetWorld()->GetCurrentLevel(), ActorClass);
+		FTransform Transform(FRotator::ZeroRotator, TraceResult.Location, FVector::OneVector);
+		NewActor = GetWorld()->SpawnActor(ActorClass, &Transform, SpawnInfo);
+	}
+
+	if (!IsValid(NewActor))
+	{
+		return false;
+	}
+
+	if (OutNewActor)
+	{
+		*OutNewActor = NewActor;
+	}
+	return true;
+}
+
+
+bool USodaGameViewportClient::DropActorAtCoordinates(int32 MouseX, int32 MouseY, const FSpawnCastomActorDelegate& SpawnDelegate, AActor** OutNewActor, bool bAddToFactory)
+{
+	DestroyDropPreviewActor();
+
+	if (!SpawnDelegate.IsBound())
+	{
+		return false;
+	}
+
+	const FEditorUtils::FActorPositionTraceResult TraceResult = FEditorUtils::TraceWorldForPosition(GetWorld(), FVector2D(MouseX, MouseY));
+	if (TraceResult.State != FEditorUtils::FActorPositionTraceResult::HitSuccess)
+	{
+		return false;
+	}
+
+	AActor* NewActor = SpawnDelegate.Execute(FTransform(FRotator::ZeroRotator, TraceResult.Location, FVector::OneVector));
+
+	if (!NewActor)
+	{
+		return false;
+	}
+
+	if (bAddToFactory)
+	{
+		USodaGameModeComponent* SodaGameMode = USodaGameModeComponent::Get();
+		ASodaActorFactory* ActorFactory = SodaGameMode->GetActorFactory();
+		ActorFactory->AddActor(NewActor);
+		SodaGameMode->LevelState->MarkAsDirty();
+	}
+
+	if (OutNewActor)
+	{
+		*OutNewActor = NewActor;
+	}
+	return true;
+}
+
+bool USodaGameViewportClient::DropPreviewActorAtCoordinates(int32 MouseX, int32 MouseY)
+{
+	DestroyDropPreviewActor();
+
+	const FEditorUtils::FActorPositionTraceResult TraceResult = FEditorUtils::TraceWorldForPosition(GetWorld(), FVector2D(MouseX, MouseY));
+	if (TraceResult.State == FEditorUtils::FActorPositionTraceResult::Failed)
+	{
+		return false;
+	}
+
+	FActorSpawnParameters SpawnInfo;
+	SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
+	SpawnInfo.bDeferConstruction = true;
+	FTransform Transform(FRotator::ZeroRotator, TraceResult.Location, FVector::OneVector);
+	DropPreviewActor = GetWorld()->SpawnActor<APreviewActor>(APreviewActor::StaticClass(), Transform, SpawnInfo);
+	// TODO
+	/*
+	if (DropPreviewActor.IsValid())
+	{
+		DropPreviewActor->SetPreviwActorClass(ActorClass);
+	}
+	*/
+	
+	return IsValid(DropPreviewActor);
+}
diff --git a/Source/UnrealSoda/Private/SodaHUD.cpp b/Source/UnrealSoda/Private/SodaHUD.cpp
new file mode 100644
index 0000000..9c886b3
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaHUD.cpp
@@ -0,0 +1,53 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaHUD.h"
+#include "Soda/UnrealSodaVersion.h"
+#include "Engine/Canvas.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/Editor/SodaSelection.h"
+
+ASodaHUD::ASodaHUD(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void ASodaHUD::DrawHUD()
+{
+	Super::DrawHUD();
+	
+	if (bDrawVehicleDebugPanel)
+	{
+		ASodaVehicle* Vehicle = Cast< ASodaVehicle >(GetOwningPawn());
+		if (!Vehicle)
+		{
+			if (USodaGameViewportClient* ViewportClient = Cast<USodaGameViewportClient>(GetWorld()->GetGameViewport()))
+			{
+				if (ViewportClient->GetGameMode() == soda::EUIMode::Editing)
+				{
+					Vehicle = Cast< ASodaVehicle >(ViewportClient->Selection->GetSelectedActor());
+				}
+			}
+		}
+
+		if (Vehicle)
+		{
+			float YL = 10;
+			float YPos = 10;
+			Vehicle->DrawDebug(Canvas, YL, YPos);
+		}
+	}
+
+	UFont* RenderFont = GEngine->GetSmallFont();
+	Canvas->SetDrawColor(FColor::White);
+	Canvas->DrawText(RenderFont, FString::Printf(TEXT("Ver: %s"), UNREALSODA_VERSION_STRING), Canvas->SizeX - 100, Canvas->SizeY - 20);
+}
+
+void ASodaHUD::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void ASodaHUD::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/SodaLibraryPrimaryAsset.cpp b/Source/UnrealSoda/Private/SodaLibraryPrimaryAsset.cpp
new file mode 100644
index 0000000..7446eed
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaLibraryPrimaryAsset.cpp
@@ -0,0 +1,3 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaLibraryPrimaryAsset.h"
diff --git a/Source/UnrealSoda/Private/SodaSpectator.cpp b/Source/UnrealSoda/Private/SodaSpectator.cpp
new file mode 100644
index 0000000..8cdacf8
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaSpectator.cpp
@@ -0,0 +1,213 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaSpectator.h"
+#include "Camera/CameraComponent.h"
+#include "Components/SphereComponent.h"
+
+ASodalSpectator::ASodalSpectator(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	CameraComponent = CreateDefaultSubobject<UCameraComponent>(TEXT("Camera"));
+	RootComponent = CameraComponent;
+
+	for (int i = 0; i < 8; ++i)
+	{
+		SpeedProfile.Add(50 * std::pow(3, i));
+	}
+
+	CurrentSpeedProfile = 2;
+	Speed = SpeedProfile[CurrentSpeedProfile];
+	Mode = ESodaSpectatorMode::Perspective;
+}
+
+void ASodalSpectator::MoveRight(float Val)
+{
+	if (Val != 0.f)
+	{
+		if (Controller)
+		{
+			FRotator const ControlSpaceRot = Controller->GetControlRotation();
+
+			// transform to world space and add it
+			AddMovementInput(FRotationMatrix(ControlSpaceRot).GetScaledAxis(EAxis::Y), Val);
+		}
+	}
+}
+
+void ASodalSpectator::MoveForward(float Val)
+{
+	if (Val != 0.f)
+	{
+		if (Controller)
+		{
+			FRotator const ControlSpaceRot = Controller->GetControlRotation();
+
+			// transform to world space and add it
+			AddMovementInput(FRotationMatrix(ControlSpaceRot).GetScaledAxis(EAxis::X), Val);
+		}
+	}
+}
+
+void ASodalSpectator::MoveUp_World(float Val)
+{
+	if (Val != 0.f)
+	{
+		AddMovementInput(FVector::UpVector, Val);
+	}
+}
+
+void ASodalSpectator::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void ASodalSpectator::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void ASodalSpectator::Tick(float DeltaTime)
+{
+	Super::Tick(DeltaTime);
+
+	APlayerController* PlayerController = GetWorld()->GetFirstPlayerController();
+	UGameViewportClient* GameViewportClient = GetWorld()->GetGameViewport();
+
+	if (!PlayerController || !GameViewportClient)
+	{
+		return;
+	}
+
+	float ForwardInput =
+		(PlayerController->IsInputKeyDown(EKeys::W) ? 1.f : 0.f) +
+		(PlayerController->IsInputKeyDown(EKeys::S) ? -1.f : 0.f);
+
+	float RightInput =
+		(PlayerController->IsInputKeyDown(EKeys::A) ? -1.f : 0.f) +
+		(PlayerController->IsInputKeyDown(EKeys::D) ? 1.f : 0.f);
+
+	if (Mode == ESodaSpectatorMode::Perspective || Mode == ESodaSpectatorMode::OrthographicFree)
+	{
+		if (bAllowMove)
+		{
+			MoveForward(ForwardInput * Speed * DeltaTime);
+			MoveRight(RightInput * Speed * DeltaTime);
+		}
+		float X = 0, Y = 0;
+		PlayerController->GetInputMouseDelta(X, Y);
+		float Yaw = X * DeltaTime * MouseSpeed;
+		float Pitch = -Y * DeltaTime * MouseSpeed;
+
+		if (PlayerController->IsInputKeyDown(EKeys::Up))
+		{
+			Pitch -= DeltaTime * KeySpeed;
+		}
+
+		if (PlayerController->IsInputKeyDown(EKeys::Down))
+		{
+			Pitch += DeltaTime * KeySpeed;
+		}
+
+		if (PlayerController->IsInputKeyDown(EKeys::Left))
+		{
+			Yaw -= DeltaTime * KeySpeed;
+		}
+
+		if (PlayerController->IsInputKeyDown(EKeys::Right))
+		{
+			Yaw += DeltaTime * KeySpeed;
+		}
+
+		AddControllerYawInput(Yaw);
+		AddControllerPitchInput(Pitch);
+		SetActorRotation(GetControlRotation());
+	}
+	else
+	{
+		if (bAllowMove)
+		{
+			FVector Dir = FVector::ZeroVector;
+			switch (Mode)
+			{
+			case ESodaSpectatorMode::Top:    Dir = FVector(RightInput,  -ForwardInput , 0); break;
+			case ESodaSpectatorMode::Bottom: Dir = FVector(-RightInput,  -ForwardInput, 0); break;
+			case ESodaSpectatorMode::Left:   Dir = FVector(RightInput, 0, ForwardInput); break;
+			case ESodaSpectatorMode::Right:  Dir = FVector(-RightInput, 0, ForwardInput); break;
+			case ESodaSpectatorMode::Front:  Dir = FVector(0, -RightInput, ForwardInput); break;
+			case ESodaSpectatorMode::Back:   Dir = FVector(0, RightInput, ForwardInput); break;
+			}
+
+			static const float OrthoWidthSpeed = 0.01;
+			AddActorWorldOffset(Dir * CameraComponent->OrthoWidth * OrthoWidthSpeed);
+		}
+		
+		float X = 0, Y = 0;
+		PlayerController->GetInputMouseDelta(X, Y);
+		static const float OrthoWidthSpeed = 1.0;
+		CameraComponent->SetOrthoWidth(Y * OrthoWidthSpeed * DeltaTime * CameraComponent->OrthoWidth + CameraComponent->OrthoWidth);
+	}
+
+	FVector Delta = ConsumeMovementInputVector();
+	if (!Delta.IsNearlyZero())
+	{
+		AddActorWorldOffset(Delta);
+	}
+
+}
+
+void ASodalSpectator::SetSpeedProfile(int Ind)
+{
+	if (SpeedProfile.Num() == 0) return;
+	if (Ind < 0) Ind = 0;
+	else if (Ind >= SpeedProfile.Num()) Ind = SpeedProfile.Num() - 1;
+	Speed = SpeedProfile[Ind];
+	CurrentSpeedProfile = Ind;
+}
+
+void ASodalSpectator::SetMode(ESodaSpectatorMode InMode)
+{
+	Mode = InMode;
+
+	if (Mode == ESodaSpectatorMode::Perspective)
+	{
+		CameraComponent->SetProjectionMode(ECameraProjectionMode::Perspective);
+	}
+	else
+	{
+		CameraComponent->SetProjectionMode(ECameraProjectionMode::Orthographic);
+		CameraComponent->SetOrthoWidth(512);
+	}
+
+	switch (Mode)
+	{
+	//case ESodaSpectatorMode::Perspective:
+	//	break;
+
+	//case ESodaSpectatorMode::OrthographicFree:
+	//	break;
+
+	case ESodaSpectatorMode::Top:
+		SetActorRotation(FRotator(-90, -90,0)); 
+		break;
+
+	case ESodaSpectatorMode::Bottom:
+		SetActorRotation(FRotator(+90, +90, 0));
+		break;
+
+	case ESodaSpectatorMode::Left:
+		SetActorRotation(FRotator(0, -90, 0));
+		break;
+
+	case ESodaSpectatorMode::Right:
+		SetActorRotation(FRotator(0, +90, 0));
+		break;
+
+	case ESodaSpectatorMode::Front:
+		SetActorRotation(FRotator(0, 180, 0));
+		break;
+
+	case ESodaSpectatorMode::Back:
+		SetActorRotation(FRotator(0, 0, 0));
+		break;
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/SodaStatics.cpp b/Source/UnrealSoda/Private/SodaStatics.cpp
new file mode 100644
index 0000000..84960af
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaStatics.cpp
@@ -0,0 +1,1043 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaStatics.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Soda/VehicleComponents/Others/V2V.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/LevelState.h"
+#include "Soda/UnrealSodaVersion.h"
+#include "Soda/SodaUserSettings.h"
+#include "HAL/FileManager.h"
+#include "Misc/FileHelper.h"
+#include "Misc/Paths.h"
+#include "Components/StaticMeshComponent.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Components/SplineComponent.h"
+#include "Kismet/GameplayStatics.h"
+#include "EngineUtils.h"
+#include "ProceduralMeshComponent.h"
+#include "Engine/Engine.h"
+#include "CanvasItem.h"
+#include "Engine/Canvas.h"
+#include "Engine/StaticMesh.h"
+#include "Interfaces/IPluginManager.h"
+#include "Engine/SCS_Node.h"
+#include "Engine/StaticMesh.h"
+#include "Engine/ObjectLibrary.h"
+#include "HAL/PlatformFileManager.h"
+#include "PhysicsEngine/PhysicsAsset.h"
+#include <iostream>
+#include <fstream>
+#include <map>
+
+template < typename T >
+static auto CastEnum(T label)
+{
+	return static_cast<typename std::underlying_type< T >::type>(label);
+}
+
+static ESegmObjectLabel GetLabelByFolderName(const FString& String)
+{
+	if (String == "Buildings")
+		return ESegmObjectLabel::Buildings;
+	else if (String == "Fences")
+		return ESegmObjectLabel::Fences;
+	else if (String == "Pedestrians")
+		return ESegmObjectLabel::Pedestrians;
+	else if (String == "Pole")
+		return ESegmObjectLabel::Poles;
+	else if (String == "Props")
+		return ESegmObjectLabel::Other;
+	else if (String == "Road")
+		return ESegmObjectLabel::Roads;
+	else if (String == "RoadLines")
+		return ESegmObjectLabel::RoadLines;
+	else if (String == "SideWalk")
+		return ESegmObjectLabel::Sidewalks;
+	else if (String == "TrafficSigns")
+		return ESegmObjectLabel::TrafficSigns;
+	else if (String == "Vegetation")
+		return ESegmObjectLabel::Vegetation;
+	else if (String == "Vehicles")
+		return ESegmObjectLabel::Vehicles;
+	else if (String == "Walls")
+		return ESegmObjectLabel::Walls;
+
+	/*Soda Types*/
+	else if (String == "RoadLines_Solid")
+		return ESegmObjectLabel::RoadLines_Solid;
+	else if (String == "RoadLines_Dashed")
+		return ESegmObjectLabel::RoadLines_Dashed;
+	else if (String == "RoadLines_Crosswalk")
+		return ESegmObjectLabel::RoadLines_Crosswalk;
+	else if (String == "RoadLines_ZigZag")
+		return ESegmObjectLabel::RoadLines_ZigZag;
+	else if (String == "RoadLines_DoubleSide")
+		return ESegmObjectLabel::RoadLines_DoubleSide;
+	else if (String == "RoadLines_Stop")
+		return ESegmObjectLabel::RoadLines_Stop;
+	else if (String == "RoadLines_DoubleDashed")
+		return ESegmObjectLabel::RoadLines_DoubleDashed;
+	else if (String == "RoadLines_Nondrivable")
+		return ESegmObjectLabel::RoadLines_Nondrivable;
+	else
+		return ESegmObjectLabel::None;
+}
+
+template < typename T >
+static ESegmObjectLabel GetLabelByPath(const T* Object)
+{
+	if (Object)
+	{
+		const FString Path = Object->GetPathName();
+		TArray< FString > StringArray;
+		Path.ParseIntoArray(StringArray, TEXT("/"), false);
+		for (int i = 1; i < StringArray.Num() - 1; ++i)
+		{
+			ESegmObjectLabel Label = GetLabelByFolderName(StringArray[i]);
+			if (Label != ESegmObjectLabel::None)
+				return Label;
+		}
+	}
+	return ESegmObjectLabel::None;
+}
+
+static void SetStencilValue(UPrimitiveComponent& Component, const ESegmObjectLabel& Label, const bool bSetRenderCustomDepth)
+{
+	Component.SetCustomDepthStencilValue(CastEnum(Label));
+	Component.SetRenderCustomDepth(bSetRenderCustomDepth && (Label != ESegmObjectLabel::None));
+}
+
+USodaStatics::USodaStatics(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+FString USodaStatics::GetUnrealSodaVersion() 
+{
+	return UNREALSODA_VERSION_STRING; 
+}
+
+UWorld* USodaStatics::GetGameWorld(const UObject* WorldContextObject)
+{
+	if (WorldContextObject)
+	{
+		UWorld* World = GEngine->GetWorldFromContextObject(WorldContextObject, EGetWorldErrorMode::ReturnNull);
+		if (World) return World;
+	}
+
+	const TIndirectArray<FWorldContext>& WorldContexts = GEngine->GetWorldContexts();
+	for (auto& WorldContext : WorldContexts)
+	{
+		switch (WorldContext.WorldType)
+		{
+		case EWorldType::PIE:
+		case EWorldType::Game:
+			UWorld* World = WorldContext.World();
+			if (World && World->bBegunPlay)
+			{
+				return World;
+			}
+			break;
+		}
+	}
+	return nullptr;
+}
+
+USodaGameModeComponent* USodaStatics::GetSodaGameMode()
+{
+	return USodaGameModeComponent::Get();
+}
+
+FName USodaStatics::GetLevelName(const UObject* WorldContextObject)
+{
+	if (UWorld* World = GetGameWorld(WorldContextObject))
+	{
+		return FName(*World->GetName());
+	}
+	return NAME_None;
+}
+
+TArray<FString> USodaStatics::GetAllMapPaths()
+{
+	TArray<FString> Ret;
+
+	auto ObjectLibrary = UObjectLibrary::CreateLibrary(UWorld::StaticClass(), false, true);
+	ObjectLibrary->LoadAssetDataFromPath(TEXT("/Game"));
+	TArray<FAssetData> AssetDatas;
+	ObjectLibrary->GetAssetDataList(AssetDatas);
+	
+	for (int32 i = 0; i < AssetDatas.Num(); ++i)
+	{
+		FAssetData& AssetData = AssetDatas[i];
+
+		FString LevelName = AssetData.AssetName.ToString();
+
+		if (LevelName.StartsWith(TEXT("tr_"), ESearchCase::CaseSensitive))
+		{
+			continue;
+		}
+
+		Ret.Add(AssetData.PackagePath.ToString() / LevelName);
+
+	}
+	return Ret;
+}
+
+bool USodaStatics::OpenLevel(const UObject* WorldContextObject, FName LevelPath, FString Options)
+{
+	UWorld* World = GetGameWorld(WorldContextObject);
+	if (!World)
+	{
+		return false;
+	}
+
+	TArray<FString> LevelsPath = USodaStatics::GetAllMapPaths();
+	for (auto& l : LevelsPath)
+	{
+		if (l.Contains(LevelPath.ToString()))
+		{
+			UGameplayStatics::OpenLevel(World, LevelPath, true, Options);
+			return true;
+		}
+	}
+
+	UE_LOG(LogSoda, Error, TEXT("USodaStatics::OpenLevel(%s), The level isn't found"), *LevelPath.ToString());
+	return false;
+}
+
+
+void USodaStatics::TagActor(AActor* Actor, bool bTagForSemanticSegmentation, EActorTagMethod TagMethod, ESegmObjectLabel CustomLabel)
+{
+	if (!Actor)
+		return;
+
+	TArray< UPrimitiveComponent* > PrimitiveComponents;
+	Actor->GetComponents< UPrimitiveComponent >(PrimitiveComponents);
+	for (UPrimitiveComponent* Component : PrimitiveComponents)
+	{
+		ESegmObjectLabel Label = ESegmObjectLabel::None;
+		switch (TagMethod)
+		{
+		    case EActorTagMethod::Auto:
+				if (Component->ComponentTags.Find(TEXT("CusomSegmTag")) != INDEX_NONE)
+				{
+					Label = static_cast<ESegmObjectLabel> (Component->CustomDepthStencilValue);
+					if (Label != ESegmObjectLabel::None) break;
+				}
+			case EActorTagMethod::ByPrimitivePath: 
+				if (UStaticMeshComponent* MeshComponent = Cast<UStaticMeshComponent>(Component))
+				{
+					Label = GetLabelByPath(MeshComponent->GetStaticMesh().Get());
+				}
+				else if (USkeletalMeshComponent* SkeletalMeshComponent = Cast<USkeletalMeshComponent>(Component))
+				{
+					Label = GetLabelByPath(SkeletalMeshComponent->GetPhysicsAsset());
+				}
+				break;
+			case EActorTagMethod::ForceCurrentStencilValue: 
+				Label = static_cast<ESegmObjectLabel> (Component->CustomDepthStencilValue); 
+				break;
+			case EActorTagMethod::ForceCustomLabel: 
+				Label = CustomLabel; 
+				break;
+		}
+		if (TagMethod == EActorTagMethod::ForceCurrentStencilValue || TagMethod == EActorTagMethod::ForceCustomLabel)
+		{
+			Component->ComponentTags.AddUnique(TEXT("CusomSegmTag"));
+		}
+		SetStencilValue(*Component, Label, bTagForSemanticSegmentation);
+		Component->SetCollisionResponseToChannel(SodaApp.GetSodaUserSettings()->RadarCollisionChannel, ECollisionResponse::ECR_Overlap);
+	}
+}
+
+void USodaStatics::TagActorsInLevel(UObject* WorldContextObject, bool bTagForSemanticSegmentation)
+{
+	if (UWorld* World = GetGameWorld(WorldContextObject))
+	{
+		for (TActorIterator< AActor > it(World); it; ++it)
+		{
+			TagActor(*it, bTagForSemanticSegmentation);
+		}
+	}
+}
+
+void USodaStatics::GetTagsOfTaggedActor(AActor* Actor, TSet< ESegmObjectLabel >& Tags)
+{
+	if (!Actor)
+		return;
+	TArray< UPrimitiveComponent* > Components;
+	Actor->GetComponents< UPrimitiveComponent >(Components);
+	for (auto* Component : Components)
+	{
+		if (Component != nullptr)
+		{
+			const auto Tag = GetTagOfTaggedComponent(Component);
+			if (Tag != ESegmObjectLabel::None)
+			{
+				Tags.Add(Tag);
+			}
+		}
+	}
+}
+
+FString USodaStatics::GetTagAsString(const ESegmObjectLabel Label)
+{
+#define GET_LABEL_STR(lbl)      \
+	case ESegmObjectLabel::lbl: \
+		return TEXT(#lbl);
+	switch (Label)
+	{
+		GET_LABEL_STR(None)
+			GET_LABEL_STR(Buildings)
+			GET_LABEL_STR(Fences)
+			GET_LABEL_STR(Other)
+			GET_LABEL_STR(Pedestrians)
+			GET_LABEL_STR(Poles)
+			GET_LABEL_STR(RoadLines)
+			GET_LABEL_STR(Roads)
+			GET_LABEL_STR(Sidewalks)
+			GET_LABEL_STR(TrafficSigns)
+			GET_LABEL_STR(Vegetation)
+			GET_LABEL_STR(Vehicles)
+			GET_LABEL_STR(Walls)
+	default:
+		return "None";
+	}
+#undef GET_LABEL_STR
+}
+
+void USodaStatics::AddV2VComponentToAllVehiclesInLevel(UObject* WorldContextObject, TSubclassOf<AActor> VehicleClass)
+{
+	UWorld* World = GetGameWorld(WorldContextObject);
+	if (!World) return;
+
+	TArray<AActor*> FoundVehicles;
+	UGameplayStatics::GetAllActorsOfClass(World, VehicleClass, FoundVehicles);
+	if (FoundVehicles.Num() == 0)
+	{
+		UE_LOG(LogSoda, Log, TEXT("USodaStatics::AddV2VComponentToAllVehiclesInLevel - no vehicles found"));
+	}
+
+	for (auto& Vehicle : FoundVehicles)
+	{
+		if (Vehicle->GetComponentByClass(UV2VTransmitterComponent::StaticClass()) == 0)
+		{
+			FName V2VObjectName("V2V");
+
+			UV2VTransmitterComponent* NewV2VComp = NewObject<UV2VTransmitterComponent>(Vehicle, V2VObjectName);
+			check(NewV2VComp);
+
+			if (Vehicle->GetComponentByClass(UV2VReceiverComponent::StaticClass()) != 0)
+			{
+				NewV2VComp->DeactivateVehicleComponent();
+			}
+
+			NewV2VComp->RegisterComponent();       
+			NewV2VComp->AttachToComponent(Vehicle->GetRootComponent(), FAttachmentTransformRules::KeepRelativeTransform);
+			NewV2VComp->CalculateBoundingBox();
+			if (!NewV2VComp->bAssignUniqueIdAtStartup)
+			{
+				NewV2VComp->AssignUniqueId();
+			}
+			UE_LOG(LogSoda, Log, TEXT("USodaStatics V2VComponent added. Id = %d"), NewV2VComp->ID);
+		}
+	}
+}
+
+bool USodaStatics::WriteStringToFile(const FString& FileName, const FString& StringToWrite, bool AllowOwerWriting)
+{
+	if (!AllowOwerWriting)
+	{
+		if (IFileManager::Get().FileExists(*FileName))
+		{
+			return false;
+		}
+	}
+
+	return FFileHelper::SaveStringToFile(StringToWrite, *FileName);
+}
+
+bool USodaStatics::ReadStringFromFile(FString& Result, const FString& FileName)
+{
+	if (!IFileManager::Get().FileExists(*FileName))
+	{
+		return false;
+	}
+
+	return FFileHelper::LoadFileToString(Result, *FileName);
+}
+
+bool USodaStatics::SavePathToFile(USplineComponent* SplineComponent, float Distance, const FString& FileName, bool bIsLatLong)
+{
+	ALevelState* LevelState = ALevelState::Get();
+
+	if (!SplineComponent || !LevelState) return false;
+
+	std::ofstream OutFile;
+
+	try
+	{
+		OutFile.open(TCHAR_TO_UTF8(*FileName));
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("Can't open \"%s\" "), *FileName);
+		return false;
+	}
+
+	float SplineLength = SplineComponent->GetSplineLength();
+
+	try
+	{
+		if (!bIsLatLong)
+		{
+			OutFile << "X,Y,Z\n";
+			for (int i = 0; i < SplineLength / Distance; ++i)
+			{
+				FVector Pt = SplineComponent->GetLocationAtDistanceAlongSpline(i * Distance, ESplineCoordinateSpace::World);
+				OutFile << Pt.X << "," << Pt.Y << "," << Pt.Z << "\n";
+			}
+		}
+		else
+		{
+			OutFile << "Lon,Lat,Alt\n";
+			for (int i = 0; i < SplineLength / Distance; ++i)
+			{
+				FVector Pt = SplineComponent->GetLocationAtDistanceAlongSpline(i * Distance, ESplineCoordinateSpace::World);
+				double Lon, Lat, Alt;
+				LevelState->GetLLConverter().UE2LLA(Pt, Lon, Lat, Alt);
+				OutFile << Lon << "," << Lat << "," << Alt << "\n";
+			}
+		}
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("Can't write to \"%s\" "), *FileName);
+		return false;
+	}
+	OutFile.close();
+
+	UE_LOG(LogSoda, Warning, TEXT("Write spline to \"%s\" "), *FileName);
+
+	return true;
+}
+
+void USodaStatics::GetAllSubclassOfClass(const UClass* Class, TArray<UClass*>& SubClasses)
+{
+	if (!Class) return;
+
+	SubClasses.Empty();
+	for (TObjectIterator<UClass> It; It; ++It)
+	{
+		if (It->IsChildOf(Class) && !It->HasAnyClassFlags(CLASS_Abstract))
+			SubClasses.Add(*It);
+	}
+}
+
+UObject* USodaStatics::GetDefaultObject(const UClass* Class)
+{
+	if(Class) return Class->GetDefaultObject();
+	return nullptr;
+}
+
+bool USodaStatics::DelaunayTriangulation(
+	const TArray<FVector>& OutsidePolyline3D,
+	const TArray<FVector>& HolePolyline3D,
+	const TArray<FVector>& AdditionalPoints3D,
+	TArray<int32> & OutTriangles,
+	TArray<FVector> & OutVertices,
+	ETriangulationPlane Plane,
+	bool bFlip)
+{
+	return false;
+	// TODO: rewrite this algorithm to UE::Geometry::FConstrainedDelaunay2d
+	/*
+	OutTriangles.Empty();
+	OutVertices.Empty();
+
+	std::vector<p2t::Point> OutsidePolyline2D;
+	std::vector<p2t::Point> HolePolyline2D;
+	std::vector<p2t::Point> AdditionalPoints2D; 
+
+	switch (Plane)
+	{
+		case ETriangulationPlane::XY:
+			for (auto& Pt : OutsidePolyline3D) OutsidePolyline2D.push_back(p2t::Point(Pt.X, Pt.Y));
+			for (auto& Pt : HolePolyline3D) HolePolyline2D.push_back(p2t::Point(Pt.X, Pt.Y));
+			for (auto& Pt : AdditionalPoints3D) AdditionalPoints2D.push_back(p2t::Point(Pt.X, Pt.Y));
+			break;
+
+		case ETriangulationPlane::XZ:
+			for (auto& Pt : OutsidePolyline3D) OutsidePolyline2D.push_back(p2t::Point(Pt.X, Pt.Z));
+			for (auto& Pt : HolePolyline3D) HolePolyline2D.push_back(p2t::Point(Pt.X, Pt.Z));
+			for (auto& Pt : AdditionalPoints3D) AdditionalPoints2D.push_back(p2t::Point(Pt.X, Pt.Z));
+			break;
+
+		case ETriangulationPlane::YZ:
+			for (auto& Pt : OutsidePolyline3D) OutsidePolyline2D.push_back(p2t::Point(Pt.Y, Pt.Z));
+			for (auto& Pt : HolePolyline3D) HolePolyline2D.push_back(p2t::Point(Pt.Y, Pt.Z));
+			for (auto& Pt : AdditionalPoints3D) AdditionalPoints2D.push_back(p2t::Point(Pt.Y, Pt.Z));
+			break;
+	}
+
+	std::vector<p2t::Point*> OutsidePolyline2DPtr;
+	std::vector<p2t::Point*> HolePolyline2DPtr;
+
+	std::map<p2t::Point*, const FVector*> Pt2DtoPt3D;
+
+	for (int i =0; i< OutsidePolyline3D.Num(); ++i)
+	{
+		OutsidePolyline2DPtr.push_back(&OutsidePolyline2D[i]);
+		Pt2DtoPt3D[&OutsidePolyline2D[i]] = &OutsidePolyline3D[i];
+	}
+	for (int i = 0; i < HolePolyline3D.Num(); ++i)
+	{
+		HolePolyline2DPtr.push_back(&HolePolyline2D[i]);
+		Pt2DtoPt3D[&HolePolyline2D[i]] = &HolePolyline3D[i];
+	}
+
+	TSharedPtr<p2t::CDT> CDT;
+
+	try
+	{
+		CDT = MakeShared<p2t::CDT>(OutsidePolyline2DPtr);
+		if (HolePolyline3D.Num())CDT->AddHole(HolePolyline2DPtr);
+		for (int i = 0; i < AdditionalPoints2D.size(); ++i)
+		{
+
+			CDT->AddPoint(&AdditionalPoints2D[i]);
+			Pt2DtoPt3D[&AdditionalPoints2D[i]] = &AdditionalPoints3D[i];
+		}
+		CDT->Triangulate();
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("Can't triangulate mesh "));
+		return false;
+	}
+
+	std::vector<p2t::Triangle*> CDT_Triangulates = CDT->GetTriangles();
+	std::map<p2t::Point*, int> PointMap;
+	for (int i = 0; i < CDT->sweep_context_->point_count(); ++i)
+	{
+		PointMap[CDT->sweep_context_->GetPoint(i)] = i;
+	}
+
+	for (int i = 0; i < CDT->sweep_context_->point_count(); ++i)
+	{
+		OutVertices.Add(*Pt2DtoPt3D[CDT->sweep_context_->GetPoint(i)]);
+	}
+
+	if (bFlip)
+	{
+		for (auto& Triangle : CDT_Triangulates)
+		{
+			OutTriangles.Add(PointMap[Triangle->GetPoint(0)]);
+			OutTriangles.Add(PointMap[Triangle->GetPoint(1)]);
+			OutTriangles.Add(PointMap[Triangle->GetPoint(2)]);
+		}
+	}
+	else
+	{
+		for (auto& Triangle : CDT_Triangulates)
+		{
+			OutTriangles.Add(PointMap[Triangle->GetPoint(2)]);
+			OutTriangles.Add(PointMap[Triangle->GetPoint(1)]);
+			OutTriangles.Add(PointMap[Triangle->GetPoint(0)]);
+		}
+	}
+
+	return true;
+	*/
+}
+
+FName USodaStatics::GetSensorShortName(FName FullName)
+{
+	FString Name = FullName.ToString();
+	int32 Ind = Name.Find(TEXT("Component"), ESearchCase::CaseSensitive);
+	if (Ind != INDEX_NONE)
+	{
+		Name.RemoveAt(Ind, 9);
+	}
+
+	Ind = Name.Find(TEXT("Sensor"), ESearchCase::CaseSensitive);
+	if (Ind != INDEX_NONE)
+	{
+		Name.RemoveAt(Ind, 6);
+	}
+
+	
+	if (Name.EndsWith(TEXT("_C"), ESearchCase::CaseSensitive))
+	{
+		Name.RemoveAt(Name.Len() - 2, 2);
+	}
+
+	return FName(*Name);
+}
+
+float USodaStatics::DrawProgress(
+	UCanvas* Canvas,
+	float XPos,
+	float YPos,
+	float Width,
+	float Height,
+	float Value,
+	float Min,
+	float Max,
+	bool bAlingCenter,
+	const FString& TextValue)
+{
+
+	FCanvasTileItem TileItem1(FVector2D(XPos, YPos), GWhiteTexture, FVector2D(Width, Height), FLinearColor(0.0f, 0.125f, 0.0f, 0.25f));
+	TileItem1.BlendMode = SE_BLEND_Translucent;
+	Canvas->DrawItem(TileItem1);
+
+	if (bAlingCenter)
+	{
+		float NormValue = (FMath::Clamp(Value, Min, Max) - Min) / (Max - Min) * 2.0 - 1.0;
+		FCanvasTileItem TileItem2(FVector2D(XPos + Width / 2, YPos), GWhiteTexture, FVector2D(Width / 2 * NormValue, Height), FLinearColor(0.8f, 0.8f, 0.0f, 0.5f));
+		TileItem2.BlendMode = SE_BLEND_Translucent;
+		Canvas->DrawItem(TileItem2);
+	}
+	else
+	{
+		float NormValue = (FMath::Clamp(Value, Min, Max) - Min) / (Max - Min);
+		FCanvasTileItem TileItem2(FVector2D(XPos, YPos), GWhiteTexture, FVector2D(Width * NormValue, Height), FLinearColor(0.8f, 0.8f, 0.0f, 0.5f));
+		TileItem2.BlendMode = SE_BLEND_Translucent;
+		Canvas->DrawItem(TileItem2);
+	}
+
+	if (TextValue.Len())
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		float  TextWidth;
+		float  TextHeight;
+		Canvas->TextSize(RenderFont, TextValue, TextWidth, TextHeight, 1.0, 1.0);
+		Canvas->DrawText(RenderFont, TextValue, XPos + (Width - TextWidth) / 2.0, YPos + (Height - TextHeight) / 2.0);
+	}
+
+	return Height;
+}
+
+void USodaStatics::SetFKeyByName(FString& Name, FKey& Key)
+{
+	TArray<FKey> AllKeys;
+	EKeys::GetAllKeys(AllKeys);
+	for (FKey& It : AllKeys)
+	{
+		if (It.GetFName().ToString() == Name)
+		{
+			Key = It;
+			return;
+		}
+	}
+}
+
+void USodaStatics::GetActorLocalBounds(AActor* Actor, FBox& LocalBounds)
+{
+	if (USkeletalMeshComponent* SkeletalMeshComp = Actor->FindComponentByClass<USkeletalMeshComponent>())
+	{
+		FTransform UnrotatedTransform = FTransform(Actor->GetTransform().GetRotation().Inverse(), FVector::ZeroVector, FVector::OneVector);
+		FRotator SkeletalMeshRotator = SkeletalMeshComp->GetComponentRotation();
+		SkeletalMeshComp->SetAllPhysicsRotation(FRotator());
+		SkeletalMeshComp->InvalidateCachedBounds();
+		LocalBounds = Actor->CalculateComponentsBoundingBoxInLocalSpace(false);
+		SkeletalMeshComp->SetAllPhysicsRotation(SkeletalMeshRotator);
+		SkeletalMeshComp->InvalidateCachedBounds();
+	}
+	else if (UStaticMeshComponent* StaticMeshComp = Actor->FindComponentByClass<UStaticMeshComponent>())
+	{
+		if (UStaticMesh* StaticMesh = StaticMeshComp->GetStaticMesh())
+		{
+			FVector LocDelta = StaticMeshComp->GetComponentLocation() - Actor->GetActorLocation();
+			LocalBounds = StaticMesh->GetBoundingBox();
+			LocalBounds = LocalBounds.ShiftBy(LocDelta);
+		}
+	}
+}
+
+float USodaStatics::FindSplineInputKeyClosestToWorldLocationFast(const FVector& WorldLocation, int32& StartSegment, USplineComponent* Spline)
+{
+	const FVector LocalLocation = Spline->GetComponentTransform().InverseTransformPosition(WorldLocation);
+	const int32 NumPoints = Spline->SplineCurves.Position.Points.Num();
+	const int32 NumSegments = Spline->SplineCurves.Position.bIsLooped ? NumPoints : NumPoints - 1;
+	bool PerformFullSearch = false;
+	if (StartSegment == -1 || StartSegment >= NumSegments - 1)
+	{
+		PerformFullSearch = true;
+		StartSegment = 0;
+	}
+
+	if (NumPoints > 1)
+	{
+		float BestDistanceSq;
+		float BestResult = Spline->SplineCurves.Position.InaccurateFindNearestOnSegment(LocalLocation, StartSegment, BestDistanceSq);
+		int32 NewStartSegment = StartSegment;
+		for (int32 Segment = StartSegment + 1; Segment < NumSegments; ++Segment)
+		{
+			float LocalDistanceSq;
+			float LocalResult = Spline->SplineCurves.Position.InaccurateFindNearestOnSegment(LocalLocation, Segment, LocalDistanceSq);
+			if (LocalDistanceSq < BestDistanceSq)
+			{
+				BestDistanceSq = LocalDistanceSq;
+				BestResult = LocalResult;
+				NewStartSegment = Segment;
+			}
+			else if (!PerformFullSearch)
+			{
+				break;
+			}
+		}
+		for (int32 Segment = StartSegment - 1; Segment >= 0; --Segment)
+		{
+			float LocalDistanceSq;
+			float LocalResult = Spline->SplineCurves.Position.InaccurateFindNearestOnSegment(LocalLocation, Segment, LocalDistanceSq);
+			if (LocalDistanceSq < BestDistanceSq)
+			{
+				BestDistanceSq = LocalDistanceSq;
+				BestResult = LocalResult;
+				NewStartSegment = Segment;
+			}
+			else
+			{
+				break;
+			}
+		}
+		StartSegment = NewStartSegment;
+		return BestResult;
+	}
+
+	if (NumPoints == 1)
+	{
+		return Spline->SplineCurves.Position.Points[0].InVal;
+	}
+
+	return 0.0f;
+
+}
+
+
+float USodaStatics::GetDistanceAlongSpline(float InputKey, USplineComponent* InSplineComponent)
+{
+	float Frac, Int;
+	Frac = FMath::Modf(InputKey, &Int);
+	int Index = (int32)Int;
+
+	int MaxExclusiveInputKey = (float)(InSplineComponent->IsClosedLoop() ? InSplineComponent->GetNumberOfSplinePoints() : InSplineComponent->GetNumberOfSplinePoints() - 1);
+	check(Index <= MaxExclusiveInputKey);
+	if (Index == MaxExclusiveInputKey)
+	{
+		check(Frac < 0.0001f);
+		Index = MaxExclusiveInputKey - 1;
+		Frac = 1.0f;
+	}
+
+	return InSplineComponent->GetDistanceAlongSplineAtSplinePoint(Index)
+		+ InSplineComponent->SplineCurves.GetSegmentLength(Index, Frac, InSplineComponent->IsClosedLoop(), InSplineComponent->GetComponentTransform().GetScale3D());
+}
+
+// FPS
+bool USodaStatics::GetShowFPS(UObject* /*WorldContextObject*/)
+{
+	if (!GEngine->GameViewport)
+		return false;
+
+	return GEngine->GameViewport->IsStatEnabled(TEXT("FPS"));
+}
+
+bool USodaStatics::SetShowFPS(UObject* WorldContextObject, bool ShowFps)
+{
+	if (UWorld* World = GetGameWorld(WorldContextObject))
+	{
+		if (!GEngine->GameViewport)
+			return false;
+		GEngine->SetEngineStat(World, GEngine->GameViewport, TEXT("FPS"), ShowFps);
+		return true;
+	}
+	return false;
+}
+
+bool USodaStatics::DeleteFile(const FString& FileName)
+{
+	IPlatformFile& FileManager = FPlatformFileManager::Get().GetPlatformFile();
+	return FileManager.DeleteFile(*FileName);
+}
+
+
+UObject * USodaStatics::GetSubobjectByName(const UObject * Parent, FName ObjectName)
+{
+	UObject* Object = nullptr;
+	TArray<UObject*> SubObjects;
+
+	ForEachObjectWithOuter(Parent, [&SubObjects](UObject* Object)
+	{
+		SubObjects.Add(Object);
+	}, true);
+
+	for (UObject* SubObject : SubObjects)
+	{
+		if (SubObject->GetFName() == ObjectName)
+		{
+			Object = SubObject;
+			break;
+		}
+	}
+	return Object;
+}
+
+TArray<UObject*> USodaStatics::FindAllObjectsByClass(UObject* WorldContextObject, const UClass* Class)
+{
+	TArray<UObject*> SubObjects;
+	if (UWorld* World = GetGameWorld(WorldContextObject))
+	{
+		ForEachObjectWithOuter(World, [&SubObjects, Class](UObject* Object)
+			{
+				if (Object->GetClass()->IsChildOf(Class))
+				{
+					SubObjects.Add(Object);
+				}
+			}, true);
+	}
+	return SubObjects;
+}
+
+UActorComponent* USodaStatics::FindDefaultComponentByClass(
+	const TSubclassOf<AActor> InActorClass,
+	const TSubclassOf<UActorComponent> InComponentClass)
+{
+	if (!IsValid(InActorClass))
+	{
+		return nullptr;
+	}
+
+	// Check CDO.
+	AActor* ActorCDO = InActorClass->GetDefaultObject<AActor>();
+	UActorComponent* FoundComponent = ActorCDO->FindComponentByClass(InComponentClass);
+
+	if (FoundComponent != nullptr)
+	{
+		return FoundComponent;
+	}
+
+	// Check blueprint nodes. Components added in blueprint editor only (and not in code) are not available from
+	// CDO.
+	UBlueprintGeneratedClass* RootBlueprintGeneratedClass = Cast<UBlueprintGeneratedClass>(InActorClass);
+	UClass* ActorClass = InActorClass;
+
+	// Go down the inheritance tree to find nodes that were added to parent blueprints of our blueprint graph.
+	do
+	{
+		UBlueprintGeneratedClass* ActorBlueprintGeneratedClass = Cast<UBlueprintGeneratedClass>(ActorClass);
+		if (!ActorBlueprintGeneratedClass)
+		{
+			return nullptr;
+		}
+
+		if (!ActorBlueprintGeneratedClass->SimpleConstructionScript)
+		{
+			return nullptr;
+		}
+
+		const TArray<USCS_Node*>& ActorBlueprintNodes =
+			ActorBlueprintGeneratedClass->SimpleConstructionScript->GetAllNodes();
+
+		for (USCS_Node* Node : ActorBlueprintNodes)
+		{
+			if (Node->ComponentClass->IsChildOf(InComponentClass))
+			{
+				return Node->GetActualComponentTemplate(RootBlueprintGeneratedClass);
+			}
+		}
+
+		ActorClass = Cast<UClass>(ActorClass->GetSuperStruct());
+
+	} while (ActorClass != AActor::StaticClass());
+
+	return nullptr;
+}
+
+/*
+UObject* USodaStatics::FindObjectsByName(FName Name)
+{
+	const TIndirectArray<FWorldContext>& WorldContexts = GEngine->GetWorldContexts();
+	for (auto& WorldContext : WorldContexts)
+	{
+		switch (WorldContext.WorldType)
+		{
+		case EWorldType::PIE:
+		case EWorldType::Game:
+			UWorld* World = WorldContext.World();
+			if (World && World->bBegunPlay)
+			{
+				return StaticFindObject(UObject::StaticClass(), World, *Name.ToString(), false);
+			}
+			break;
+		}
+	}
+	return nullptr;
+}
+*/
+
+AActor* USodaStatics::FindActoByName(UObject* WorldContextObject, FName Name)
+{
+	if (UWorld* World = GetGameWorld(WorldContextObject))
+	{
+		for (TActorIterator< AActor > it(World); it; ++it)
+		{
+			if ((*it)->GetFName() == Name)
+			{
+				return *it;
+			}
+		}
+	}
+	return nullptr;
+}
+
+
+bool USodaStatics::UploadVehicleJSON(const FString& JSONStr, const FString& VehicleName)
+{
+
+	const FString VehiclesDir = FPaths::ProjectSavedDir() / TEXT("SodaVehicles");
+	const FString FileName = VehiclesDir / VehicleName + TEXT(".json");
+
+	if (!FFileHelper::SaveStringToFile(JSONStr, *FileName))
+	{
+		UE_LOG(LogSoda, Error, TEXT("USodaStatics::UploadVehicleJSON(); Can't write to '%s' file"), *FileName);
+		return false;
+	}
+	return true;
+}
+
+UProceduralMeshComponent * USodaStatics::GenerateRoadLine(
+	UProceduralMeshComponent* LaneMesh,
+	int SectionID,
+	const USplineComponent* SplineComponent, 
+	//float Offset,
+	float Width,
+	float LineLen,
+	float LineGap
+	//float Start,
+	//float End
+	)
+{
+	
+	TArray < FVector > Vertices;
+	TArray < int32 >Triangles;
+	TArray<FVector2D> UVs;
+	TArray<FVector> Normals;
+	TArray<FColor> Colors;
+	TArray<FProcMeshTangent> Tangents;
+
+	const float MeshStep = 100;
+
+	const float FullLength = SplineComponent->GetSplineLength();
+	const int SegmCount = FullLength / (LineLen + LineGap) + 1.f;
+
+	for (int s = 0; s < SegmCount; ++s)
+	{
+		const float CurrLen = s * (LineLen + LineGap);
+		const float SegmLen = std::min(SplineComponent->GetSplineLength() - CurrLen, LineLen);
+		const int SegmNum = SegmLen / MeshStep + 0.5;
+		const float MeshStep2 = SegmLen / SegmNum;
+
+		const int FirstVertices = Vertices.Num();
+
+		for (int i = 0; i < SegmNum + 1; ++i)
+		{
+			FVector CenterLine = SplineComponent->GetLocationAtDistanceAlongSpline(CurrLen + i * MeshStep2, ESplineCoordinateSpace::Local);
+			FVector RightVectors = SplineComponent->GetRightVectorAtDistanceAlongSpline(CurrLen + i * MeshStep2, ESplineCoordinateSpace::Local);
+			FVector RightVectors2D = RightVectors.GetSafeNormal2D();
+
+			Vertices.Add(CenterLine - RightVectors2D * Width / 2);
+			Vertices.Add(CenterLine + RightVectors2D * Width / 2);
+		}
+		for (int i = 0; i < SegmNum; ++i)
+		{
+			Triangles.Add(FirstVertices + i * 2 + 2);
+			Triangles.Add(FirstVertices + i * 2 + 1);
+			Triangles.Add(FirstVertices + i * 2 + 0);
+			Triangles.Add(FirstVertices + i * 2 + 2);
+			Triangles.Add(FirstVertices + i * 2 + 3);
+			Triangles.Add(FirstVertices + i * 2 + 1);
+		}
+	}
+
+	//LaneMesh->RegisterComponent();
+	LaneMesh->CreateMeshSection(SectionID, Vertices, Triangles, Normals, UVs, Colors, Tangents, false);
+	//LaneMesh->SetMaterial(road_id, Profile->Material);
+	LaneMesh->bCastCinematicShadow = false;
+	LaneMesh->bCastDynamicShadow = false;
+	LaneMesh->bCastStaticShadow = false;
+	LaneMesh->bCastFarShadow = false;
+	LaneMesh->SetCastShadow(false);
+	LaneMesh->SetCastInsetShadow(false);
+	//LaneMesh->SetCustomDepthStencilValue((uint8)Profile->Label);
+	//LaneMesh->SetRenderCustomDepth(true);
+	return LaneMesh;
+	
+}
+
+void USodaStatics::SetSynchronousMode(bool bEnable, float DeltaSeconds)
+{
+	SodaApp.SetSynchronousMode(bEnable, DeltaSeconds); 
+}
+
+bool USodaStatics::IsSynchronousMode()
+{ 
+	return SodaApp.IsSynchronousMode();
+}
+
+int USodaStatics::GetFrameIndex()
+{ 
+	return SodaApp.GetFrameIndex();
+}
+
+bool USodaStatics::SynchTick(int64& Timestamp, int& FramIndex)
+{ 
+	return SodaApp.SynchTick(Timestamp, FramIndex);
+}
+
+FString USodaStatics::Int64ToString(int64 Value) 
+{ 
+	return std::to_string(Value).c_str(); 
+}
+
+FBox USodaStatics::CalculateActorExtent(const AActor * Actor)
+{
+	FBox Box(ForceInit);
+
+	const FTransform& ActorToWorld = Actor->GetTransform();
+	const FTransform WorldToActor = ActorToWorld.Inverse();
+
+	for (UActorComponent* ActorComponent : Actor->GetComponents())
+	{
+		UPrimitiveComponent* PrimComp = Cast<UPrimitiveComponent>(ActorComponent);
+		if (PrimComp)
+		{
+			// Only use collidable components to find collision bounding box.
+			if (PrimComp->IsRegistered() && (/*bNonColliding ||*/ PrimComp->IsCollisionEnabled()))
+			{
+				if (USkeletalMeshComponent* SkeletalMeshComp = Cast<USkeletalMeshComponent>(PrimComp))
+				{
+					SkeletalMeshComp->InvalidateCachedBounds();
+				}
+				const FTransform ComponentToActor = PrimComp->GetComponentTransform() * WorldToActor;
+				FBoxSphereBounds ActorSpaceComponentBounds = PrimComp->CalcBounds(ComponentToActor);
+
+				Box += ActorSpaceComponentBounds.GetBox();
+			}
+		}
+	}
+
+	return Box;
+}
+
+ESegmObjectLabel USodaStatics::GetTagOfTaggedComponent(UPrimitiveComponent* Component)
+{
+	if (!Component) return ESegmObjectLabel::None;
+	return static_cast<ESegmObjectLabel>(Component->CustomDepthStencilValue);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/SodaTypes.cpp b/Source/UnrealSoda/Private/SodaTypes.cpp
new file mode 100644
index 0000000..fd5018f
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaTypes.cpp
@@ -0,0 +1,3 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaTypes.h"
diff --git a/Source/UnrealSoda/Private/SodaUserSettings.cpp b/Source/UnrealSoda/Private/SodaUserSettings.cpp
new file mode 100644
index 0000000..99c234f
--- /dev/null
+++ b/Source/UnrealSoda/Private/SodaUserSettings.cpp
@@ -0,0 +1,93 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/SodaUserSettings.h"
+//#include "HAL/FileManager.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Misc/ConfigContext.h"
+//#include "Misc/FileHelper.h"
+//#include "GenericPlatform/GenericApplication.h"
+//#include "Misc/App.h"
+//#include "EngineGlobals.h"
+//#include "Kismet/KismetSystemLibrary.h"
+//#include "Kismet/GameplayStatics.h"
+//#include "UnrealEngine.h"
+//#include "Framework/Application/SlateApplication.h"
+//#include "Engine/GameEngine.h"
+
+#define GPS_LEAP_SECONDS_OFFSET 17
+
+FString USodaUserSettings::SodaUserSettingsIni = TEXT("SodaUserSettings.ini");
+
+USodaUserSettings::USodaUserSettings(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	SetToDefaults();
+}
+
+void USodaUserSettings::LoadSettings(bool bForceReload/*=false*/)
+{
+	/*
+	if (bForceReload)
+	{
+		if (OnUpdateGameUserSettingsFileFromCloud.IsBound())
+		{
+			FString IniFileLocation = FPaths::GeneratedConfigDir() + UGameplayStatics::GetPlatformName() + "/" + GGameUserSettingsIni + ".ini";
+		}
+
+		LoadConfigIni(bForceReload);
+	}
+	*/
+
+	LoadConfig(GetClass(), *SodaUserSettingsIni);
+}
+
+void USodaUserSettings::SaveSettings()
+{
+	SaveConfig(CPF_Config, *SodaUserSettingsIni);
+}
+
+void USodaUserSettings::LoadConfigIni(bool bForceReload/*=false*/)
+{
+	FConfigContext Context = FConfigContext::ReadIntoGConfig();
+	Context.bForceReload = bForceReload;
+	Context.Load(TEXT("SodaUserSettings"), SodaUserSettingsIni);
+}
+
+void USodaUserSettings::SetToDefaults()
+{
+	KeyCruiseControl = EKeys::Divide;
+	KeySpeedLimiter = EKeys::Multiply;
+	ThrottleKeyInput = FKey("W");
+	SteeringLeftKeyInput = FKey("A");
+	SteeringRigtKeyInput = FKey("D");
+	BrakeKeyInput = FKey("S");
+	NeutralGearKeyInput = FKey("One");
+	DriveGearKeyInput = FKey("Two");
+	ReverseGearKeyInput = FKey("Three");
+	ParkGearKeyInput = FKey("Four");
+	ChangeModeKeyInput = FKey("M");
+	SafeStopKeyInput = FKey("K");
+	HeadlightsKeyInput = FKey("P");
+	HornKeyInput = FKey("B");
+	ZoomUpKeyInput = FKey("MouseScrollDown");
+	ZoomDownKeyInput = FKey("MouseScrollUp");
+
+	ThrottleJoyInput = FKey("SodaAxis2");
+	SteeringJoyInput = FKey("SodaAxis0");
+	BrakeJoyInput = FKey("SodaAxis3");
+	NeutralGearJoyInput = FKey("SodaButton0");
+	DriveGearJoyInput = FKey("SodaButton1");
+	ReverseGearJoyInput = FKey("SodaButton2");
+	ParkGearJoyInput = FKey("SodaButton3");
+
+	DPIScale = 1.0f;
+	VehicleDebugAreaWidth = 400;
+	bTagActorsAtBeginPlay = true;
+
+	MongoURL = "mongodb://localhost:27017";
+	DatabaseName = "sodasim";
+	bAutoConnect = false;
+	bRecordDataset = false;
+
+	GPSLeapOffset = GPS_LEAP_SECONDS_OFFSET;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/OpenDrive.hpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/OpenDrive.hpp
new file mode 100644
index 0000000..d04ce76
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/OpenDrive.hpp
@@ -0,0 +1,29 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include <opendrive/types.hpp>
+#include <string>
+
+namespace opendrive {
+
+bool Load(std::string const &file, opendrive::OpenDriveData &open_drive_data);
+bool Parse(std::string const &content, opendrive::OpenDriveData &open_drive_data);
+/**
+ * @brief Generates the full lane map
+ *
+ * @param[in] overlapMargin margin the lanes are narrowed when calculating overlaps.
+ *
+ */
+bool GenerateLaneMap(opendrive::OpenDriveData &open_drive_data, double const overlapMargin);
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/CenterLine.hpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/CenterLine.hpp
new file mode 100644
index 0000000..6ea859f
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/CenterLine.hpp
@@ -0,0 +1,61 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include <vector>
+#include "opendrive/geometry/Geometry.h"
+#include "opendrive/types.hpp"
+
+namespace opendrive {
+namespace geometry {
+
+struct CenterLine
+{
+  using GeometryVector = std::vector<std::unique_ptr<geometry::Geometry>>;
+  using LaneOffsetVector = std::vector<LaneOffset>;
+
+
+  GeometryVector geometry;
+
+  LaneOffsetVector offsetVector;
+
+  RoadProfiles roadProfiles;
+
+  double length{0.};
+
+  /**
+   * @brief Evalues the center line at the given position along the curve and returns a DirectedPoint
+   * which contains the position and the tangent vector.
+   * If applyLateralOffset is true, it will apply a lateral offset as defined by the lateral offset vector.
+   */
+  geometry::DirectedPoint eval(double s, bool applyLateralOffset = true) const;
+
+  double evalElevation(double s) const;
+
+  /**
+   * @brief Calculates the center line offset at the given position along the curve.
+   */
+  double calculateOffset(double s) const;
+
+  /**
+   * @brief Generates a list of sampling points along the center line between [0, arclength].
+   * The sampling points are optimized depending of the type of geometry of the inner segments.
+   */
+  std::vector<double> samplingPoints() const;
+};
+
+/**
+ * @brief Generates a center line object using the road geometry definition.
+ * Returns false if invalid geometry definitions are present.
+ */
+bool generateCenterLine(RoadInformation &roadInfo, CenterLine &centerLine);
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/Geometry.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/Geometry.h
new file mode 100644
index 0000000..3270fae
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/Geometry.h
@@ -0,0 +1,165 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+namespace opendrive {
+namespace geometry {
+
+inline double evaluate_polynomial(double a, double b, double c, double d, double x)
+{
+    return a + b * x + c * x * x + d * x * x *x;
+}
+
+/**
+ * @brief DirectedPoint is composed of a 2 dimensional position and an orientation
+ */
+struct DirectedPoint
+{
+  DirectedPoint();
+  DirectedPoint(const Point &point, double t);
+  DirectedPoint(double x, double y, double t);
+
+  Point location = {0, 0};
+  double tangent = 0.0; // [radians]
+
+  /**
+   * @brief Shifts the point by lateral_offset meters in the normal direction of the tangent
+   */
+  void ApplyLateralOffset(double lateral_offset);
+
+  /**
+   * @brief Compares two points, returns true if their parameters are identical
+   */
+  friend bool operator==(const DirectedPoint &lhs, const DirectedPoint &rhs)
+  {
+    return (lhs.location == rhs.location) && (lhs.tangent == rhs.tangent);
+  }
+};
+
+class Geometry
+{
+public:
+  /**
+   * @brief Returns the GeometryType associated to this geometry.
+   */
+  GeometryType GetType() const;
+
+  /**
+   * @brief Returns the length of the geometry.
+   */
+  double GetLength() const;
+
+  /**
+   * @brief Returns the start offset in s coordinates.
+   */
+  double GetStartOffset() const;
+
+  /**
+   * @brief Returns the heading at the start position.
+   */
+  double GetHeading() const;
+
+  /**
+   * @brief Returns the start position in the global reference frame.
+   */
+  const Point &GetStartPosition();
+
+  virtual ~Geometry() = default;
+
+  /**
+   * @brief Evaluates the geometry at a certain distance from the start position.
+   */
+  virtual const DirectedPoint PosFromDist(double dist) const = 0;
+
+protected:
+  Geometry(GeometryType type, double start_offset, double length, double heading, const Point &start_pos);
+
+protected:
+  GeometryType _type; // geometry type
+  double _length;     // length of the road section [meters]
+
+  double _start_position_offset; // s-offset [meters]
+  double _heading;               // start orientation [radians]
+
+  Point _start_position; // [meters]
+};
+
+class GeometryLine : public Geometry
+{
+public:
+  GeometryLine(double start_offset, double length, double heading, const Point &start_pos);
+
+  const DirectedPoint PosFromDist(const double dist) const override;
+};
+
+class GeometryArc : public Geometry
+{
+public:
+  GeometryArc(double start_offset, double length, double heading, const Point &start_pos, double curv);
+
+  const DirectedPoint PosFromDist(double dist) const override;
+
+  double GetCurvature() const;
+
+private:
+  double _curvature;
+};
+
+class GeometryPoly3 : public Geometry
+{
+public:
+  GeometryPoly3(
+    double start_offset, double length, double heading, const Point &start_pos, double a, double b, double c, double d);
+
+  const DirectedPoint PosFromDist(const double dist) const override;
+
+private:
+  double _a;
+  double _b;
+  double _c;
+  double _d;
+};
+
+class GeometryParamPoly3 : public Geometry
+{
+public:
+  GeometryParamPoly3(double start_offset,
+                     double length,
+                     double heading,
+                     const Point &start_pos,
+                     double aU,
+                     double bU,
+                     double cU,
+                     double dU,
+                     double aV,
+                     double bV,
+                     double cV,
+                     double dV);
+
+  const DirectedPoint PosFromDist(const double dist) const override;
+
+private:
+  double _aU;
+  double _bU;
+  double _cU;
+  double _dU;
+  double _aV;
+  double _bV;
+  double _cV;
+  double _dV;
+};
+
+} // namespace
+} // namespace
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/GeometryGenerator.hpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/GeometryGenerator.hpp
new file mode 100644
index 0000000..319b680
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/GeometryGenerator.hpp
@@ -0,0 +1,71 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include <algorithm>
+#include "opendrive/geometry/Geometry.h"
+#include "opendrive/types.hpp"
+
+namespace opendrive {
+namespace geometry {
+
+// we have AD driving maps, so less than 1 mm segments is actually ridicoulous
+const double MinimumSegmentLength = 1e-3;
+
+double laneWidth(std::vector<LaneWidth> const& laneWidthVector, double s);
+
+/**
+ * @brief Searches a road by id. Returns a const iterator to the road.
+ *
+ */
+inline std::vector<::opendrive::RoadInformation>::const_iterator findRoad(opendrive::OpenDriveData const &mapData,
+                                                                          int roadId)
+{
+  auto compare = [&roadId](::opendrive::RoadInformation const &road) { return road.attributes.id == roadId; };
+  return std::find_if(mapData.roads.begin(), mapData.roads.end(), compare);
+}
+
+/**
+ * @brief Searches a road by id. Returns an iterator to the road.
+ *
+ */
+inline std::vector<::opendrive::RoadInformation>::iterator findRoad(opendrive::OpenDriveData &mapData, int roadId)
+{
+  auto compare = [&roadId](::opendrive::RoadInformation const &road) { return road.attributes.id == roadId; };
+  return std::find_if(mapData.roads.begin(), mapData.roads.end(), compare);
+}
+
+/**
+ * @brief Calculates the parametric position of the start position relative to the lane section boundaries.
+ *
+ */
+inline double parametricPosition(double startPosition, LaneSection const &laneSection)
+{
+  return (startPosition - laneSection.start_position) / (laneSection.end_position - laneSection.start_position);
+}
+
+/**
+ * @brief Generates a full geometry description of the OpenDRIVE data.
+ * The OpenDRIVE data geometry is sampled, and left and right borders are created for every lane.
+ * All the lane's successors, predecessors, neighbors are calculated.
+ * Junction lanes are tested for overlaps.
+ * The landmark's positions are generated in the global reference frame and signal references are created
+ * for all the lanes.
+ *
+ * @param[in] overlapMargin margin the lanes are narrowed when calculating overlaps.
+ *
+ */
+bool GenerateGeometry(opendrive::OpenDriveData &open_drive_data, double const overlapMargin);
+
+bool GenerateRoadMarkLines(RoadInformation& roadInfo, std::vector<LaneMark>& LaneMarkers, float accuracy = 2.0);
+
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/LaneUtils.hpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/LaneUtils.hpp
new file mode 100644
index 0000000..f07cfcb
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/geometry/LaneUtils.hpp
@@ -0,0 +1,39 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include <cmath>
+#include "opendrive/types.hpp"
+
+namespace opendrive {
+namespace geometry {
+
+enum class ContactPlace
+{
+  Overlap,
+  LeftLeft,
+  RightLeft,
+  LeftRight,
+  RightRight,
+  None
+};
+
+ContactPlace contactPlace(Lane const &leftLane, Lane const &rightLane);
+
+//bool near(const opendrive::Point & left, const opendrive::Point & right, double resolution = 1e-3);
+//bool lanesOverlap(Lane const &leftLane, Lane const &rightLane, double const overlapMargin);
+//void invertLaneAndNeighbors(LaneMap &laneMap, Lane &lane);
+void checkAddSuccessor(Lane &lane, Lane const &otherLane);
+void checkAddPredecessor(Lane &lane, Lane const &otherLane);
+
+Id laneId(int roadId, int laneSectionIndex, int laneIndex);
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/GeoReferenceParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/GeoReferenceParser.h
new file mode 100644
index 0000000..e7b50f8
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/GeoReferenceParser.h
@@ -0,0 +1,28 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include <string>
+#include "opendrive/types.hpp"
+
+namespace opendrive {
+namespace parser {
+
+class GeoReferenceParser
+{
+public:
+  static ::opendrive::geom::GeoLocation Parse(const std::string &geo_reference_string);
+};
+
+} // parser
+} // opendrive
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/GeometryParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/GeometryParser.h
new file mode 100644
index 0000000..cb99c2f
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/GeometryParser.h
@@ -0,0 +1,41 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class GeometryParser
+{
+private:
+  void ParseArc(const pugi::xml_node &xmlNode, opendrive::GeometryAttributesArc *out_geometry_arc);
+
+  void ParseLine(const pugi::xml_node &xmlNode, opendrive::GeometryAttributesLine *out_geometry_line);
+
+  void ParseSpiral(const pugi::xml_node &xmlNode, opendrive::GeometryAttributesSpiral *out_geometry_spiral);
+
+  void ParsePoly3(const pugi::xml_node &xmlNode, opendrive::GeometryAttributesPoly3 *out_geometry_poly3);
+
+  void ParseParamPoly3(const pugi::xml_node &xmlNode,
+                       opendrive::GeometryAttributesParamPoly3 *out_geometry_param_poly3);
+
+public:
+  static void Parse(const pugi::xml_node &xmlNode,
+                    std::vector<std::unique_ptr<opendrive::GeometryAttributes>> &out_geometry_attributes);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/JunctionParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/JunctionParser.h
new file mode 100644
index 0000000..af75bce
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/JunctionParser.h
@@ -0,0 +1,33 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class JunctionParser
+{
+private:
+  void ParseConnection(const pugi::xml_node &xmlNode, std::vector<opendrive::JunctionConnection> &out_connections);
+
+  void ParseLaneLink(const pugi::xml_node &xmlNode, std::vector<opendrive::JunctionLaneLink> &out_lane_link);
+
+public:
+  static void Parse(const pugi::xml_node &xmlNode, std::vector<opendrive::Junction> &out_junction);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/LaneParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/LaneParser.h
new file mode 100644
index 0000000..96ac826
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/LaneParser.h
@@ -0,0 +1,42 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class LaneParser
+{
+private:
+  void ParseLane(const pugi::xml_node &xmlNode, std::vector<LaneInfo> &out_lane);
+
+  void ParseLaneSpeed(const pugi::xml_node &xmlNode, std::vector<LaneSpeed> &out_lane_speed);
+
+  void ParseLaneLink(const pugi::xml_node &xmlNode, std::unique_ptr<LaneLink> &out_lane_link);
+
+  void ParseLaneOffset(const pugi::xml_node &xmlNode, std::vector<LaneOffset> &out_lane_offset);
+
+  void ParseLaneWidth(const pugi::xml_node &xmlNode, std::vector<LaneWidth> &out_lane_width);
+
+  void ParseLaneRoadMark(const pugi::xml_node &xmlNode, std::vector<LaneRoadMark> &out_lane_mark);
+
+public:
+  static void Parse(const pugi::xml_node &xmlNode, Lanes &out_lanes);
+};
+
+} // parser
+} // opendrive
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/OpenDriveParser.hpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/OpenDriveParser.hpp
new file mode 100644
index 0000000..b06ee25
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/OpenDriveParser.hpp
@@ -0,0 +1,35 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include <string>
+#include "opendrive/types.hpp"
+
+namespace opendrive {
+namespace parser {
+
+enum class XmlInputType : int
+{
+  FILE,
+  CONTENT
+};
+
+struct OpenDriveParser
+{
+  static bool Parse(const char *xml,
+                    opendrive::OpenDriveData &out_open_drive_data,
+                    XmlInputType inputType,
+                    std::string *out_error = nullptr);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/ProfilesParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/ProfilesParser.h
new file mode 100644
index 0000000..dacc128
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/ProfilesParser.h
@@ -0,0 +1,33 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class ProfilesParser
+{
+private:
+  void ParseElevation(const pugi::xml_node &xmlNode, std::vector<opendrive::ElevationProfile> &out_elevation_profile);
+
+  void ParseLateral(const pugi::xml_node &xmlNode, std::vector<opendrive::LateralProfile> &out_lateral_profile);
+
+public:
+  static void Parse(const pugi::xml_node &xmlNode, opendrive::RoadProfiles &out_road_profiles);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/RoadLinkParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/RoadLinkParser.h
new file mode 100644
index 0000000..a32703b
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/RoadLinkParser.h
@@ -0,0 +1,31 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class RoadLinkParser
+{
+private:
+  void ParseLink(const pugi::xml_node &xmlNode, opendrive::RoadLinkInformation *out_link_information);
+
+public:
+  static void Parse(const pugi::xml_node &xmlNode, opendrive::RoadLink &out_road_link);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficGroupParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficGroupParser.h
new file mode 100644
index 0000000..385e3c9
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficGroupParser.h
@@ -0,0 +1,33 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class TrafficGroupParser
+{
+private:
+  void ParseTrafficLight(const pugi::xml_node &xmlNode, std::vector<opendrive::TrafficLight> &out_trafficLights);
+
+  void ParseBoxAreas(const pugi::xml_node &xmlNode, std::vector<opendrive::BoxComponent> &out_boxareas);
+
+public:
+  static void Parse(const pugi::xml_node &xmlNode, std::vector<opendrive::TrafficLightGroup> &out_trafficlightgroup);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficSignParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficSignParser.h
new file mode 100644
index 0000000..3332d22
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficSignParser.h
@@ -0,0 +1,31 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class TrafficSignParser
+{
+private:
+  void ParseBoxAreas(const pugi::xml_node &xmlNode, std::vector<opendrive::BoxComponent> &out_boxareas);
+
+public:
+  static void Parse(const pugi::xml_node &xmlNode, std::vector<opendrive::TrafficSign> &out_trafficsigns);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficSignalsParser.h b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficSignalsParser.h
new file mode 100644
index 0000000..42580df
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/parser/TrafficSignalsParser.h
@@ -0,0 +1,30 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include "opendrive/types.hpp"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+class TrafficSignalsParser
+{
+public:
+  static void Parse(const pugi::xml_node &xmlNode,
+                    std::vector<opendrive::TrafficSignalInformation> &out_traffic_signals,
+                    std::vector<opendrive::TrafficSignalReference> &out_traffic_signal_references);
+};
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/types.hpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/types.hpp
new file mode 100644
index 0000000..568967f
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/include/opendrive/types.hpp
@@ -0,0 +1,609 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#pragma once
+
+#include <cmath>
+#include <limits>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace opendrive {
+
+enum class GeometryType : unsigned int
+{
+  ARC,
+  LINE,
+  SPIRAL,
+  POLY3,
+  PARAMPOLY3
+};
+
+enum class LaneType : std::uint8_t
+{
+  None,
+  Driving,
+  Stop,
+  Shoulder,
+  Biking,
+  Sidewalk,
+  Border,
+  Restricted,
+  Parking,
+  Bidirectional,
+  Median,
+  Special1,
+  Special2,
+  Special3,
+  RoadWorks,
+  Tram,
+  Rail,
+  Entry,
+  Exit,
+  OffRamp,
+  OnRamp
+};
+
+enum class RoadType : std::uint8_t
+{
+  Unknown,
+  Tural,
+  Motorway,
+  Town,
+  LowSpeed,
+  Pedestrian,
+  Bicycle
+};
+
+enum class RoadmarkType : std::uint8_t
+{
+  None,
+  Solid,
+  Broken,
+  SolidSolid,
+  SolidBroken,
+  BrokenSolid,
+  BrokenBroken,
+  BottsDots,
+  Grass,
+  Curb
+};
+
+enum class ElementType : std::uint8_t
+{
+  Invalid,
+  Junction,
+  Road
+};
+
+enum class ContactPoint : std::uint8_t
+{
+  Invalid,
+  Start,
+  End
+};
+
+struct Point
+{
+  double x{0.};
+  double y{0.};
+
+  Point(double _x, double _y)
+    : x(_x)
+    , y(_y)
+  {
+  }
+
+  bool operator==(const Point &rhs) const
+  {
+    // Points are treated as equal when below 1 mm
+    return (std::fabs(x - rhs.x) < 1e-3) && (std::fabs(y - rhs.y) < 1e-3);
+  }
+  bool operator!=(const Point &rhs) const
+  {
+    return !operator==(rhs);
+  }
+
+  double normSquared() const
+  {
+    return x * x + y * y;
+  }
+
+  double norm() const
+  {
+    return sqrt(normSquared());
+  }
+
+  double dot(const Point &other) const
+  {
+    return x * other.x + y * other.y;
+  }
+};
+
+inline Point operator-(const Point &left, const Point &right)
+{
+  return Point(left.x - right.x, left.y - right.y);
+}
+
+struct GeometryAttributes
+{
+  GeometryType type; // geometry type
+  double length;     // length of the road section
+                     // [meters]
+
+  double start_position; // s-offset [meters]
+  double heading;        // start orientation [radians]
+
+  double start_position_x; // [meters]
+  double start_position_y; // [meters]
+};
+
+struct GeometryAttributesArc : public GeometryAttributes
+{
+  double curvature{0.};
+};
+
+struct GeometryAttributesLine : public GeometryAttributes
+{
+  // Nothing else here
+};
+
+struct GeometryAttributesSpiral : public GeometryAttributes
+{
+  double curve_start{0.};
+  double curve_end{0.};
+};
+
+struct GeometryAttributesPoly3 : public GeometryAttributes
+{
+  double a{0.};
+  double b{0.};
+  double c{0.};
+  double d{0.};
+};
+
+struct GeometryAttributesParamPoly3 : public GeometryAttributes
+{
+  double aU{0.};
+  double bU{0.};
+  double cU{0.};
+  double dU{0.};
+  double aV{0.};
+  double bV{0.};
+  double cV{0.};
+  double dV{0.};
+  std::string p_range{"arcLength"};
+};
+
+/////////////////////////////////////////////////////////////////
+
+struct LaneAttributes
+{
+  int id;
+  LaneType type;
+  std::string level;
+};
+
+struct LaneWidth
+{
+  double soffset; // start position (s-offset) [meters]
+  double a;       // a - width [meters]
+  double b;       // b
+  double c;       // c
+  double d;       // d
+};
+
+struct LaneRoadMark
+{
+  double soffset = 0.0;
+  double width = 0.0;
+
+  std::string type;
+  std::string weigth = "standard";
+
+  // See OpenDRIVE Format Specification, Rev. 1.4
+  // Doc No.: VI2014.107 (5.3.7.2.1.1.4 Road Mark Record)
+  std::string material = "standard";
+
+  std::string color = "white";
+  std::string lane_change = "none";
+};
+
+struct LaneOffset
+{
+  double s, a, b, c, d;
+};
+
+struct LaneSpeed
+{
+  double soffset;   // start position(s - offset from the
+                    // current lane section) [meters]
+  double max_speed; // maximum allowed speed [meters/second]
+  std::string unit;
+};
+
+struct LaneLink
+{
+  int predecessor_id;
+  int successor_id;
+};
+
+struct ParametricSpeed
+{
+  double start{0.};
+  double end{1.};
+  double speed{0.};
+
+  ParametricSpeed()
+    : start{0.}
+    , end{1.0}
+    , speed{0.}
+  {
+  }
+  ParametricSpeed(double _speed)
+    : start{0.}
+    , end{1.0}
+    , speed{_speed}
+  {
+  }
+};
+
+struct TrafficSignalReference
+{
+  int id{-1};
+  double start_position{0.}; // s
+  double track_position{0.}; // t
+  std::string orientation{""};
+};
+
+struct SignalReference
+{
+  int id{-1};
+  double parametricPosition{0.0};
+  bool inLaneOrientation{false};
+};
+
+using Id = uint64_t;
+using Edge = std::vector<Point>;
+
+struct LaneInfo
+{
+  std::vector<LaneSpeed> lane_speed;
+
+  LaneAttributes attributes;
+  std::vector<LaneWidth> lane_width;
+
+  std::vector<LaneRoadMark> road_marker;
+  std::unique_ptr<LaneLink> link;
+};
+
+struct LaneSection
+{
+  double start_position{0.};
+  double end_position{0.}; // extended value
+  std::vector<LaneInfo> left, center, right;
+};
+
+struct Lanes
+{
+  std::vector<LaneOffset> lane_offset;
+  std::vector<LaneSection> lane_sections;
+};
+
+/////////////////////////////////////////////////////////////////
+
+struct ElevationProfile
+{
+  double start_position;     // (S) start position(s -
+                             // offset)[meters]
+  double elevation;          // (A) elevation [meters]
+  double slope;              // (B)
+  double vertical_curvature; // (C)
+  double curvature_change;   // (D)
+};
+
+struct LateralProfile
+{
+  double start_position;     // (S) start position(s -
+                             // offset)[meters]
+  double elevation;          // (A) elevation [meters]
+  double slope;              // (B)
+  double vertical_curvature; // (C)
+  double curvature_change;   // (D)
+};
+
+struct RoadProfiles
+{
+  std::vector<ElevationProfile> elevation_profile;
+  std::vector<LateralProfile> lateral_profile;
+};
+
+/////////////////////////////////////////////////////////////////
+
+struct TrafficSignalInformation
+{
+  int id;
+
+  double start_position; // s
+  double track_position; // t
+
+  double zoffset; // z offset from track level
+  double value;   // value of the signal (e.g. speed,
+                  // mass � depending on type)
+
+  std::string name;        // name of the signal (e.g. gfx bead
+                           // name)
+  std::string dynamic;     // boolean identification whether
+                           // signal is a dynamic
+                           // signal(e.g.traffic light)
+  std::string orientation; // "+" = valid in positive track
+                           // direction; "-" = valid in
+                           // negative track direction; "none"
+                           // = valid in both directions
+
+  std::string country; // country code of the signa
+  std::string type;    // type identifier according to
+                       // country code or "-1" / "none"
+  std::string subtype; // subtype identifier according to
+                       // country code or "-1" / "none"
+};
+
+/////////////////////////////////////////////////////////////////
+
+struct RoadTypeInfo
+{
+  double s;
+  std::string type;
+};
+
+struct RoadSpeed
+{
+  double s;
+  double max;
+  std::string unit;
+};
+
+struct RoadAttributes
+{
+  std::string name;
+  int id, junction;
+  double length;
+  std::vector<RoadTypeInfo> type;
+  std::vector<RoadSpeed> speed;
+
+  RoadAttributes()
+    : id(-1)
+    , junction(-1)
+    , length(0.0)
+  {
+  }
+};
+
+struct RoadLinkInformation
+{
+  int id;
+  ElementType element_type;
+  ContactPoint contact_point;
+
+  RoadLinkInformation()
+    : id(-1)
+    , element_type(ElementType::Invalid)
+    , contact_point(ContactPoint::Invalid)
+  {
+  }
+};
+
+struct RoadLink
+{
+  std::unique_ptr<RoadLinkInformation> successor;
+  std::unique_ptr<RoadLinkInformation> predecessor;
+};
+
+struct RoadInformation
+{
+  RoadLink road_link;
+  RoadProfiles road_profiles;
+
+  RoadAttributes attributes;
+  Lanes lanes;
+
+  std::vector<TrafficSignalInformation> traffic_signals;
+  std::vector<TrafficSignalReference> traffic_signal_references;
+
+  std::vector<std::unique_ptr<GeometryAttributes>> geometry_attributes;
+};
+
+/////////////////////////////////////////////////////////////////
+
+struct JunctionAttribues
+{
+  int id;
+  std::string name;
+
+  JunctionAttribues()
+    : id(-1)
+  {
+  }
+};
+
+struct JunctionConnectionAttributes
+{
+  int id;
+  int incoming_road;
+  int connecting_road;
+  std::string contact_point;
+
+  JunctionConnectionAttributes()
+    : id(-1)
+    , incoming_road(-1)
+    , connecting_road(-1)
+  {
+  }
+};
+
+struct JunctionLaneLink
+{
+  int from;
+  int to;
+
+  JunctionLaneLink()
+    : from(-1)
+    , to(-1)
+  {
+  }
+};
+
+struct JunctionConnection
+{
+  JunctionConnectionAttributes attributes;
+  std::vector<JunctionLaneLink> links;
+};
+
+struct Junction
+{
+  JunctionAttribues attributes;
+  std::vector<JunctionConnection> connections;
+};
+
+struct BoxComponent
+{
+  double x_pos, y_pos, z_pos;
+  double x_rot, y_rot, z_rot;
+  double scale;
+  BoxComponent()
+    : x_pos(0.0)
+    , y_pos(0.0)
+    , z_pos(0.0)
+    , x_rot(0.0)
+    , y_rot(0.0)
+    , z_rot(0.0)
+    , scale(1.0)
+  {
+  }
+};
+
+struct TrafficLight
+{
+  double x_pos, y_pos, z_pos;
+  double x_rot, y_rot, z_rot;
+  double scale;
+  std::vector<BoxComponent> box_areas;
+
+  TrafficLight()
+    : x_pos(0.0)
+    , y_pos(0.0)
+    , z_pos(0.0)
+    , x_rot(0.0)
+    , y_rot(0.0)
+    , z_rot(0.0)
+    , scale(1.0)
+  {
+  }
+};
+
+struct TrafficLightGroup
+{
+  std::vector<TrafficLight> traffic_lights;
+  double red_time, yellow_time, green_time;
+};
+
+struct TrafficSign
+{
+  double x_pos, y_pos, z_pos;
+  double x_rot, y_rot, z_rot;
+  double scale;
+  int speed;
+  std::vector<BoxComponent> box_areas;
+
+  TrafficSign()
+    : x_pos(0.0)
+    , y_pos(0.0)
+    , z_pos(0.0)
+    , x_rot(0.0)
+    , y_rot(0.0)
+    , z_rot(0.0)
+    , scale(1.0)
+    , speed(30)
+  {
+  }
+};
+
+/////////////////////////////////////////////////////////////////
+namespace geom {
+struct GeoLocation
+{
+  double latitude{std::numeric_limits<double>::quiet_NaN()};
+  double longitude{std::numeric_limits<double>::quiet_NaN()};
+  double altitude{0.0};
+  std::string projection;
+};
+}
+
+/////////////////////////////////////////////////////////////////
+struct Lane
+{
+  Id id{0u};
+  LaneType type;
+  Edge leftEdge;
+  Edge rightEdge;
+  std::vector<Id> successors;
+  std::vector<Id> predecessors;
+  std::vector<Id> overlaps;
+  std::vector<ParametricSpeed> speed;
+  std::vector<SignalReference> signalReferences;
+
+  Id leftNeighbor{0u};
+  Id rightNeighbor{0u};
+  int index{0};
+  int junction{-1};
+};
+
+struct Landmark
+{
+  int id{-1};
+  int type{-1};
+  int subtype{-1};
+  Point position{0., 0.};
+  double orientation{0.};
+};
+
+struct Point3D
+{
+    double x;
+    double y;
+    double z;
+};
+
+struct LaneMark
+{
+    std::string type;
+    std::vector<Point3D> Edge;
+};
+
+using LaneMap = std::unordered_map<Id, Lane>;
+using LandmarkMap = std::unordered_map<int, Landmark>;
+
+struct OpenDriveData
+{
+  geom::GeoLocation geoReference;
+  std::vector<RoadInformation> roads;
+  std::vector<Junction> junctions;
+  std::vector<TrafficLightGroup> trafficlightgroups;
+  std::vector<TrafficSign> trafficsigns;
+
+  LaneMap laneMap;
+  LandmarkMap landmarks;
+  std::unordered_map<int, std::vector<Id>> intersectionLaneIds;
+};
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/OpenDrive.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/OpenDrive.cpp
new file mode 100644
index 0000000..118466d
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/OpenDrive.cpp
@@ -0,0 +1,34 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/OpenDrive.hpp"
+
+#include "opendrive/geometry/GeometryGenerator.hpp"
+#include "opendrive/parser/OpenDriveParser.hpp"
+
+namespace opendrive {
+
+bool Load(std::string const &file, opendrive::OpenDriveData &open_drive_data)
+{
+  return parser::OpenDriveParser::Parse(file.c_str(), open_drive_data, parser::XmlInputType::FILE);
+}
+
+bool Parse(std::string const &content, opendrive::OpenDriveData &open_drive_data)
+{
+  return parser::OpenDriveParser::Parse(content.c_str(), open_drive_data, parser::XmlInputType::CONTENT);
+}
+
+bool GenerateLaneMap(opendrive::OpenDriveData &open_drive_data, double const overlapMargin)
+{
+  return geometry::GenerateGeometry(open_drive_data, overlapMargin);
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/CenterLine.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/CenterLine.cpp
new file mode 100644
index 0000000..7b2b85d
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/CenterLine.cpp
@@ -0,0 +1,228 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/geometry/CenterLine.hpp"
+
+//#include <boost/array.hpp>
+//#include <boost/math/tools/rational.hpp>
+#include <cmath>
+#include <iostream>
+#include <limits>
+#include <float.h>
+
+namespace opendrive {
+namespace geometry {
+
+geometry::DirectedPoint CenterLine::eval(double s, bool applyLateralOffset) const
+{
+  if (s < 0.)
+  {
+    // as the curve is only defined betwen the range [0 , length], we return the line evaluated at s = 0
+    return eval(0.);
+  }
+
+  for (auto it = geometry.rbegin(); it != geometry.rend(); it++)
+  {
+    if (s >= (*it)->GetStartOffset())
+    {
+      auto directedPoint = (*it)->PosFromDist(s - (*it)->GetStartOffset());
+
+      // This is parametrized as the landmarks positions do not take into account the lateral offset
+      if (applyLateralOffset)
+      {
+        directedPoint.ApplyLateralOffset(calculateOffset(s));
+      }
+      return directedPoint;
+    }
+  }
+
+  auto &lastGeometry = geometry.back();
+  return lastGeometry->PosFromDist(s - lastGeometry->GetStartOffset());
+}
+
+double  CenterLine::evalElevation(double s) const
+{
+    for (int i = 0; i < roadProfiles.elevation_profile.size(); ++i)
+    {
+        auto & el = roadProfiles.elevation_profile[i];
+        double s0 = el.start_position;
+        double s1 = (i < (roadProfiles.elevation_profile.size() - 1)) ? roadProfiles.elevation_profile[i + 1].start_position : FLT_MAX;
+        if (s < s1)
+        {
+            return evaluate_polynomial(el.elevation, el.slope, el.vertical_curvature, el.curvature_change, s - s0);
+        }
+    }
+    return 0;
+}
+
+
+std::vector<double> CenterLine::samplingPoints() const
+{
+  std::vector<double> points;
+
+  points.push_back(length);
+  double const maxError = 1e-2; // max curve sampling error expected
+
+  for (auto it = geometry.rbegin(); it != geometry.rend(); it++)
+  {
+    if ((*it)->GetType() == ::opendrive::GeometryType::LINE)
+    {
+      // only start and end point
+    }
+    else if ((*it)->GetType() == ::opendrive::GeometryType::ARC)
+    {
+      auto arc = static_cast<::opendrive::geometry::GeometryArc *>((*it).get());
+      double theta = fabs(arc->GetCurvature()) * (*it)->GetLength();
+
+      if (theta < 1e-2)
+      {
+        points.insert(points.begin(), (*it)->GetStartOffset() + 0.5 * (*it)->GetLength());
+      }
+      else
+      {
+        double c = fabs(arc->GetCurvature());
+        double dsmax = 2.0 / c * acos(1.0 - c * maxError);
+        int segments = static_cast<int>((*it)->GetLength() / dsmax);
+        for (auto k = segments - 1; k > 0; --k)
+        {
+          double r = static_cast<double>(k) / static_cast<double>(segments);
+          points.insert(points.begin(), (*it)->GetStartOffset() + r * (*it)->GetLength());
+        }
+      }
+    }
+    else if ((*it)->GetType() == ::opendrive::GeometryType::POLY3)
+    {
+      int segments = 10;
+      for (auto k = segments - 1; k > 0; --k)
+      {
+        double r = static_cast<double>(k) / static_cast<double>(segments);
+        points.insert(points.begin(), (*it)->GetStartOffset() + r * (*it)->GetLength());
+      }
+    }
+    else if ((*it)->GetType() == ::opendrive::GeometryType::PARAMPOLY3)
+    {
+      int segments = 10;
+      for (auto k = segments - 1; k > 0; --k)
+      {
+        double r = static_cast<double>(k) / static_cast<double>(segments);
+        points.insert(points.begin(), (*it)->GetStartOffset() + r * (*it)->GetLength());
+      }
+    }
+    else
+    {
+      // nothing to do
+    }
+
+    points.insert(points.begin(), (*it)->GetStartOffset());
+  }
+
+  return points;
+}
+
+double CenterLine::calculateOffset(double s) const
+{
+  if (s < 0.)
+  {
+    return calculateOffset(0.);
+  }
+
+  for (auto it = offsetVector.rbegin(); it != offsetVector.rend(); it++)
+  {
+    if (s >= it->s)
+    {
+      return evaluate_polynomial(it->a, it->b, it->c, it->d, s - it->s);
+    }
+  }
+
+  return 0.0;
+}
+
+bool generateCenterLine(RoadInformation &roadInfo, CenterLine &centerLine)
+{
+  bool ok = true;
+
+  centerLine.geometry.clear();
+  centerLine.length = roadInfo.attributes.length;
+  centerLine.offsetVector = roadInfo.lanes.lane_offset;
+  centerLine.roadProfiles = roadInfo.road_profiles;
+
+  // Add geometry information
+  for (auto &geometry_attribute : roadInfo.geometry_attributes)
+  {
+    Point start(geometry_attribute->start_position_x, geometry_attribute->start_position_y);
+
+    try
+    {
+      switch (geometry_attribute->type)
+      {
+        case ::opendrive::GeometryType::ARC:
+        {
+          auto arc = static_cast<GeometryAttributesArc *>(geometry_attribute.get());
+          centerLine.geometry.emplace_back(std::make_unique<geometry::GeometryArc>(
+            arc->start_position, arc->length, arc->heading, start, arc->curvature));
+          break;
+        }
+        case ::opendrive::GeometryType::LINE:
+        {
+          auto line = static_cast<GeometryAttributesLine *>(geometry_attribute.get());
+          centerLine.geometry.emplace_back(
+            std::make_unique<geometry::GeometryLine>(line->start_position, line->length, line->heading, start));
+          break;
+        }
+        break;
+        case ::opendrive::GeometryType::SPIRAL:
+        {
+          // currently not yet supported
+          std::cerr << "generateCenterLine() spirals are currently not supported yet\n";
+          ok = false;
+          break;
+        }
+        break;
+        case ::opendrive::GeometryType::POLY3:
+        {
+          auto poly3 = static_cast<GeometryAttributesPoly3 *>(geometry_attribute.get());
+          centerLine.geometry.emplace_back(std::make_unique<geometry::GeometryPoly3>(
+            poly3->start_position, poly3->length, poly3->heading, start, poly3->a, poly3->b, poly3->c, poly3->d));
+          break;
+        }
+        break;
+        case ::opendrive::GeometryType::PARAMPOLY3:
+        {
+          auto paramPoly3 = static_cast<GeometryAttributesParamPoly3 *>(geometry_attribute.get());
+          centerLine.geometry.emplace_back(std::make_unique<geometry::GeometryParamPoly3>(paramPoly3->start_position,
+                                                                                          paramPoly3->length,
+                                                                                          paramPoly3->heading,
+                                                                                          start,
+                                                                                          paramPoly3->aU,
+                                                                                          paramPoly3->bU,
+                                                                                          paramPoly3->cU,
+                                                                                          paramPoly3->dU,
+                                                                                          paramPoly3->aV,
+                                                                                          paramPoly3->bV,
+                                                                                          paramPoly3->cV,
+                                                                                          paramPoly3->dV));
+          break;
+        }
+        break;
+        default:
+          break;
+      }
+    }
+    catch (...)
+    {
+      std::cerr << "generateCenterLine() Invalid geometry definition\n";
+      ok = false;
+    }
+  }
+
+  return ok;
+}
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/Geometry.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/Geometry.cpp
new file mode 100644
index 0000000..0af32b7
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/Geometry.cpp
@@ -0,0 +1,211 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/geometry/Geometry.h"
+
+#include "opendrive/types.hpp"
+
+//#include <boost/array.hpp>
+//#include <boost/math/tools/rational.hpp>
+#define _USE_MATH_DEFINES
+#include <cmath>
+#include <stdexcept>
+#include <algorithm>
+#include <math.h>
+
+namespace opendrive {
+namespace geometry {
+
+DirectedPoint::DirectedPoint()
+  : location(0, 0)
+  , tangent(0)
+{
+}
+DirectedPoint::DirectedPoint(const Point &point, double t)
+  : location(point)
+  , tangent(t)
+{
+}
+DirectedPoint::DirectedPoint(double x, double y, double t)
+  : location(x, y)
+  , tangent(t)
+{
+}
+
+void DirectedPoint::ApplyLateralOffset(double lateral_offset)
+{
+  auto normal_x = -std::sin(tangent);
+  auto normal_y = std::cos(tangent);
+  location.x += lateral_offset * normal_x;
+  location.y += lateral_offset * normal_y;
+}
+
+GeometryType Geometry::GetType() const
+{
+  return _type;
+}
+double Geometry::GetLength() const
+{
+  return _length;
+}
+double Geometry::GetStartOffset() const
+{
+  return _start_position_offset;
+}
+double Geometry::GetHeading() const
+{
+  return _heading;
+}
+
+const Point &Geometry::GetStartPosition()
+{
+  return _start_position;
+}
+
+Geometry::Geometry(GeometryType type, double start_offset, double length, double heading, const Point &start_pos)
+  : _type(type)
+  , _length(length)
+  , _start_position_offset(start_offset)
+  , _heading(heading)
+  , _start_position(start_pos)
+{
+  if (_length == 0.)
+  {
+    throw std::invalid_argument("Geometry of length 0");
+  }
+}
+
+GeometryLine::GeometryLine(double start_offset, double length, double heading, const Point &start_pos)
+  : Geometry(GeometryType::LINE, start_offset, length, heading, start_pos)
+{
+}
+
+const DirectedPoint GeometryLine::PosFromDist(const double dist) const
+{
+  DirectedPoint p(_start_position, _heading);
+  p.location.x += dist * std::cos(p.tangent);
+  p.location.y += dist * std::sin(p.tangent);
+  return p;
+}
+
+GeometryArc::GeometryArc(double start_offset, double length, double heading, const Point &start_pos, double curv)
+  : Geometry(GeometryType::ARC, start_offset, length, heading, start_pos)
+  , _curvature(curv)
+{
+}
+
+const DirectedPoint GeometryArc::PosFromDist(double dist) const
+{
+  if (std::fabs(_curvature) < 1e-15)
+  {
+    // case not supported given the small curvature
+    return DirectedPoint(_start_position, _heading);
+  }
+  const double radius = 1.0 / _curvature;
+  const double theta = _heading - M_PI/2;
+  double x = _start_position.x - radius * (cos(theta) - cos(theta + dist * _curvature));
+  double y = _start_position.y - radius * (sin(theta) - sin(theta + dist * _curvature));
+
+  double tangent = _heading + dist * _curvature;
+
+  DirectedPoint p(x, y, tangent);
+
+  return p;
+}
+
+double GeometryArc::GetCurvature() const
+{
+  return _curvature;
+}
+
+GeometryPoly3::GeometryPoly3(
+  double start_offset, double length, double heading, const Point &start_pos, double a, double b, double c, double d)
+  : Geometry(GeometryType::POLY3, start_offset, length, heading, start_pos)
+  , _a{a}
+  , _b{b}
+  , _c{c}
+  , _d{d}
+{
+}
+
+const DirectedPoint GeometryPoly3::PosFromDist(const double dist) const
+{
+  double u = dist;
+  double v = evaluate_polynomial(_a, _b, _c, _d, u);
+
+  const double cos_t = std::cos(_heading);
+  const double sin_t = std::sin(_heading);
+
+  double x0 = _start_position.x;
+  double y0 = _start_position.y;
+  double x = u * cos_t - v * sin_t;
+  double y = u * sin_t + v * cos_t;
+
+  //auto tangentPoly = boost::array<double, 4>{{_b, 2.0 * _c, 3.0 * _d}};
+
+  double tangentV = evaluate_polynomial(_b, 2.0 * _c, 3.0 * _d, 0, u);
+  double theta = atan2(tangentV, 1.0);
+
+  DirectedPoint point(x0 + x, y0 + y, _heading + theta);
+  return point;
+}
+
+GeometryParamPoly3::GeometryParamPoly3(double start_offset,
+                                       double length,
+                                       double heading,
+                                       const Point &start_pos,
+                                       double aU,
+                                       double bU,
+                                       double cU,
+                                       double dU,
+                                       double aV,
+                                       double bV,
+                                       double cV,
+                                       double dV)
+  : Geometry(GeometryType::PARAMPOLY3, start_offset, length, heading, start_pos)
+  , _aU{aU}
+  , _bU{bU}
+  , _cU{cU}
+  , _dU{dU}
+  , _aV{aV}
+  , _bV{bV}
+  , _cV{cV}
+  , _dV{dV}
+{
+}
+
+const DirectedPoint GeometryParamPoly3::PosFromDist(const double dist) const
+{
+  double p = std::min(1.0, dist / _length);
+
+
+
+  double u = evaluate_polynomial(_aU, _bU, _cU, _dU, p);
+  double v = evaluate_polynomial(_aV, _bV, _cV, _dV, p);
+
+  const double cos_t = std::cos(_heading);
+  const double sin_t = std::sin(_heading);
+  double x0 = _start_position.x;
+  double y0 = _start_position.y;
+  double x = u * cos_t - v * sin_t;
+  double y = u * sin_t + v * cos_t;
+
+  double tangentU = evaluate_polynomial(_bU, 2.0 * _cU, 3.0 * _dU, 0.0, p);
+  double tangentV = evaluate_polynomial(_bV, 2.0 * _cV, 3.0 * _dV, 0.0, p);
+  double theta = atan2(tangentV, tangentU);
+
+  DirectedPoint point(x0 + x, y0 + y, _heading + theta);
+  return point;
+}
+
+} // namespace
+} // namespace
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/GeometryGenerator.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/GeometryGenerator.cpp
new file mode 100644
index 0000000..e5d4b26
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/GeometryGenerator.cpp
@@ -0,0 +1,1101 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/geometry/GeometryGenerator.hpp"
+
+#include "opendrive/geometry/CenterLine.hpp"
+#include "opendrive/geometry/LaneUtils.hpp"
+
+#define _USE_MATH_DEFINES
+#include <cmath>
+#include <math.h>
+#include <algorithm>
+//#include <boost/math/tools/rational.hpp>
+#include <iostream>
+
+#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+//#include <proj_api.h>
+
+namespace opendrive {
+namespace geometry {
+
+double laneWidth(std::vector<LaneWidth> const &laneWidthVector, double s)
+{
+  if (s < 0.)
+  {
+    return laneWidth(laneWidthVector, 0.);
+  }
+
+  for (auto it = laneWidthVector.rbegin(); it != laneWidthVector.rend(); it++)
+  {
+    if (s >= it->soffset)
+    {
+
+      return evaluate_polynomial(it->a, it->b, it->c, it->d, s - it->soffset);
+    }
+  }
+  return 0.0;
+}
+
+bool isInvalidLaneSection(::opendrive::LaneSection const &laneSection)
+{
+  auto length = laneSection.end_position - laneSection.start_position;
+  if (length < MinimumSegmentLength)
+  {
+    std::cerr << "Invalid lane section of length " << length << "\n";
+    return true;
+  }
+  return false;
+}
+
+void calculateLaneSectionBounds(std::vector<::opendrive::LaneSection> &laneSections, double totalLength)
+{
+  for (auto it = laneSections.begin(); it != laneSections.end(); it++)
+  {
+    if (it + 1 == laneSections.end())
+    {
+      it->end_position = totalLength;
+    }
+    else
+    {
+      it->end_position = (it + 1)->start_position;
+    }
+  }
+}
+
+bool fixInvalidLaneSections(std::vector<::opendrive::LaneSection> &laneSections)
+{
+  for (auto it = laneSections.begin(); it != laneSections.end(); it++)
+  {
+    // for the moment do nothing
+    if (isInvalidLaneSection(*it))
+    {
+      return false;
+    }
+  }
+  return true;
+}
+
+void sortLanesByIndex(std::vector<::opendrive::LaneSection> &laneSections)
+{
+  auto compare = [](::opendrive::LaneInfo const &infoA, ::opendrive::LaneInfo const &infoB) {
+    return abs(infoA.attributes.id) < abs(infoB.attributes.id);
+  };
+
+  for (auto it = laneSections.begin(); it != laneSections.end(); it++)
+  {
+    std::sort(it->left.begin(), it->left.end(), compare);
+    std::sort(it->right.begin(), it->right.end(), compare);
+  }
+}
+
+void generateTrafficSignal(TrafficSignalInformation &trafficSignalInfo,
+                           CenterLine const &centerLine,
+                           ::opendrive::LandmarkMap &landmarks)
+{
+  Landmark landmark;
+  auto directedPoint = centerLine.eval(trafficSignalInfo.start_position, false);
+  directedPoint.ApplyLateralOffset(trafficSignalInfo.track_position);
+
+  landmark.position = directedPoint.location;
+  landmark.orientation = directedPoint.tangent + M_PI;
+
+  if (trafficSignalInfo.orientation == "-")
+  {
+    landmark.orientation += M_PI;
+  }
+
+  landmark.type = stoi(trafficSignalInfo.type);
+  landmark.id = trafficSignalInfo.id;
+  landmark.subtype = stoi(trafficSignalInfo.type);
+
+  if (landmark.id == -1)
+  {
+    landmark.id = landmarks.size() + 1;
+    trafficSignalInfo.id = landmark.id;
+  }
+  landmarks[landmark.id] = landmark;
+}
+
+std::vector<LaneSection>::iterator getLaneSection(double s, RoadInformation &roadInfo)
+{
+  for (auto it = roadInfo.lanes.lane_sections.end() - 1; it >= roadInfo.lanes.lane_sections.begin(); --it)
+  {
+    if (s >= it->start_position)
+    {
+      return it;
+    }
+  }
+  return roadInfo.lanes.lane_sections.end();
+}
+
+void addTrafficReferenceToLanes(TrafficSignalReference const &trafficSignalReference,
+                                RoadInformation &roadInfo,
+                                LaneMap &laneMap)
+{
+  auto laneSectionIt = getLaneSection(trafficSignalReference.start_position, roadInfo);
+
+  if (laneSectionIt == roadInfo.lanes.lane_sections.end())
+  {
+    std::cerr << "addTrafficReferenceToLanes() traffic reference outside road\n";
+    return;
+  }
+
+  auto laneSectionIndex = static_cast<uint32_t>(laneSectionIt - roadInfo.lanes.lane_sections.begin()) + 1;
+  double s = parametricPosition(trafficSignalReference.start_position, *laneSectionIt);
+
+  if (trafficSignalReference.orientation == "+")
+  {
+    for (auto &laneInfo : laneSectionIt->right)
+    {
+      SignalReference signalReference;
+      signalReference.id = trafficSignalReference.id;
+      signalReference.parametricPosition = s;
+      signalReference.inLaneOrientation = true;
+      auto id = laneId(roadInfo.attributes.id, laneSectionIndex, laneInfo.attributes.id);
+      laneMap[id].signalReferences.emplace_back(signalReference);
+    }
+  }
+  else
+  {
+    for (auto &laneInfo : laneSectionIt->left)
+    {
+      SignalReference signalReference;
+      signalReference.id = trafficSignalReference.id;
+      signalReference.parametricPosition = s;
+      signalReference.inLaneOrientation = false;
+      auto id = laneId(roadInfo.attributes.id, laneSectionIndex, laneInfo.attributes.id);
+      laneMap[id].signalReferences.emplace_back(signalReference);
+    }
+  }
+}
+
+void addTrafficSignals(RoadInformation &roadInfo, CenterLine const &centerLine, opendrive::OpenDriveData &mapData)
+{
+  for (auto &trafficSignalInfo : roadInfo.traffic_signals)
+  {
+    generateTrafficSignal(trafficSignalInfo, centerLine, mapData.landmarks);
+
+    // Create a signal reference to the given traffic signal
+    TrafficSignalReference trafficSignalReference;
+    trafficSignalReference.id = trafficSignalInfo.id;
+    trafficSignalReference.orientation = trafficSignalInfo.orientation;
+    trafficSignalReference.start_position = trafficSignalInfo.start_position;
+
+    addTrafficReferenceToLanes(trafficSignalReference, roadInfo, mapData.laneMap);
+  }
+
+  for (auto &trafficSignalReference : roadInfo.traffic_signal_references)
+  {
+    addTrafficReferenceToLanes(trafficSignalReference, roadInfo, mapData.laneMap);
+  }
+}
+
+bool addLane(OpenDriveData &mapData, RoadInformation const &roadInfo, LaneInfo const &laneInfo, Id laneId)
+{
+  if (mapData.laneMap.count(laneId) > 0)
+  {
+    std::cerr << "Duplicated lane Id " << laneId << "\n";
+    return false;
+  }
+
+  mapData.laneMap[laneId].leftEdge.clear();
+  mapData.laneMap[laneId].rightEdge.clear();
+  mapData.laneMap[laneId].index = laneInfo.attributes.id;
+  mapData.laneMap[laneId].id = laneId;
+  mapData.laneMap[laneId].type = laneInfo.attributes.type;
+  mapData.laneMap[laneId].junction = roadInfo.attributes.junction;
+
+  if (roadInfo.attributes.junction != -1)
+  {
+    mapData.intersectionLaneIds[roadInfo.attributes.junction].push_back(laneId);
+  }
+
+  return true;
+}
+
+bool initializeLaneMap(opendrive::OpenDriveData &mapData)
+{
+  bool ok = true;
+  for (auto const &roadInfo : mapData.roads)
+  {
+    auto const &roadId = roadInfo.attributes.id;
+    auto const &laneSections = roadInfo.lanes.lane_sections;
+
+    for (std::size_t k = 0; k != laneSections.size(); k++)
+    {
+      for (auto const &laneInfo : laneSections[k].left)
+      {
+        auto id = laneId(roadId, k + 1, laneInfo.attributes.id);
+        if (!addLane(mapData, roadInfo, laneInfo, id))
+        {
+          ok = false;
+        }
+      }
+
+      for (auto const &laneInfo : laneSections[k].right)
+      {
+        auto id = laneId(roadId, k + 1, laneInfo.attributes.id);
+        if (!addLane(mapData, roadInfo, laneInfo, id))
+        {
+          ok = false;
+        }
+      }
+    }
+  }
+
+  return ok;
+}
+
+void normalizeEdge(Id const id, std::string const &what, Edge &edge)
+{
+  if (edge.size() <= 2u)
+  {
+    // if edge only consists of 2 points we could only remove the whole edge in case the points are too near to each
+    // other
+    return;
+  }
+  std::size_t pointsToDrop = 0u;
+  Point previousEdgeDir(0., 0.);
+  for (std::size_t i = 1u; i < edge.size(); ++i)
+  {
+    // i-pointsToDrop > 0
+    if (pointsToDrop > 0u)
+    {
+      edge[i - pointsToDrop] = edge[i];
+    }
+    if (edge[i - pointsToDrop] == edge[i - pointsToDrop - 1])
+    {
+      // drop identical points
+      // std::cerr<< "normalizeEdge[" << id << "] dropping identical point from " << what << " edge at index: " << i <<
+      // std::endl;
+      pointsToDrop++;
+    }
+    else
+    {
+      //  moving the middle line in a narrow curve often leads to artifacts (circles) which are removed by the below
+      auto nextEdgeDir = edge[i - pointsToDrop] - edge[i - pointsToDrop - 1];
+      if (previousEdgeDir != Point(0., 0.))
+      {
+        auto dotProduct = previousEdgeDir.dot(nextEdgeDir);
+        if (dotProduct < 0.)
+        {
+          // std::cerr<< "normalizeEdge[" << id << "] dropping extreme direction changing point from " << what << " edge
+          // at index: " << i << std::endl;
+          pointsToDrop++;
+        }
+        else
+        {
+          previousEdgeDir = nextEdgeDir;
+        }
+      }
+      else
+      {
+        previousEdgeDir = nextEdgeDir;
+      }
+    }
+  }
+  if (pointsToDrop > 0u)
+  {
+    std::size_t const newEdgeSize = std::max(std::size_t(2u), edge.size() - pointsToDrop);
+    // std::cerr<< "normalizeEdge[" << id << "] dropping points from " << what << " edge: " << pointsToDrop << "
+    // remaining: " << newEdgeSize << std::endl;
+    edge.resize(newEdgeSize, Point(0., 0.));
+  }
+}
+
+bool generateRoadGeometry(RoadInformation &roadInfo, opendrive::OpenDriveData &mapData)
+{
+  bool ok = true;
+  auto roadId = roadInfo.attributes.id;
+  auto &laneSections = roadInfo.lanes.lane_sections;
+
+  CenterLine centerLine;
+  if (!generateCenterLine(roadInfo, centerLine))
+  {
+    ok = false;
+  }
+
+  calculateLaneSectionBounds(laneSections, centerLine.length);
+  if (!fixInvalidLaneSections(laneSections)) // currently just checks consistency
+  {
+    ok = false;
+  }
+  sortLanesByIndex(laneSections);
+
+  addTrafficSignals(roadInfo, centerLine, mapData);
+
+  auto samplingPoints = centerLine.samplingPoints();
+
+  for (auto it = laneSections.begin(); it != laneSections.end(); it++)
+  {
+    auto &laneSection = *it;
+    auto laneSectionIndex = static_cast<uint32_t>(it - laneSections.begin()) + 1;
+
+    // the tolerance at the end is necessary so that the lane offset applies only to the current lane section
+    double s0 = laneSection.start_position;
+    double s1 = (it + 1) == laneSections.end() ? centerLine.length : (it + 1)->start_position - 1e-12;
+
+    if (s1 < s0)
+    {
+      std::cerr << "Invalid lane section length s1, s0\n";
+      ok = false;
+    }
+
+    auto inRange = [&s0, &s1](double const &s) { return (s < s1) && (s > s0); };
+
+    std::vector<double> localSamplingPoints;
+    localSamplingPoints.push_back(s0);
+    std::copy_if(samplingPoints.begin(), samplingPoints.end(), std::back_inserter(localSamplingPoints), inRange);
+    localSamplingPoints.push_back(s1);
+
+    for (auto s : localSamplingPoints)
+    {
+      auto centerPoint = centerLine.eval(s);
+
+      double borderOffset = 0.;
+      for (auto &laneInfo : laneSection.left)
+      {
+        auto width = laneWidth(laneInfo.lane_width, s - s0);
+        auto rightPoint = centerPoint;
+        auto leftPoint = centerPoint;
+
+        leftPoint.ApplyLateralOffset(borderOffset + width);
+        rightPoint.ApplyLateralOffset(borderOffset);
+
+        auto const id = laneId(roadId, laneSectionIndex, laneInfo.attributes.id);
+
+        mapData.laneMap[id].leftEdge.push_back(leftPoint.location);
+        mapData.laneMap[id].rightEdge.push_back(rightPoint.location);
+        borderOffset += width;
+      }
+
+      // right lanes
+      borderOffset = 0.;
+      for (auto &laneInfo : laneSection.right)
+      {
+        auto width = laneWidth(laneInfo.lane_width, s - s0);
+        auto rightPoint = centerPoint;
+        auto leftPoint = centerPoint;
+
+        leftPoint.ApplyLateralOffset(borderOffset);
+        rightPoint.ApplyLateralOffset(borderOffset - width);
+
+        auto const id = laneId(roadId, laneSectionIndex, laneInfo.attributes.id);
+
+        mapData.laneMap[id].leftEdge.push_back(leftPoint.location);
+        mapData.laneMap[id].rightEdge.push_back(rightPoint.location);
+        borderOffset -= width;
+      }
+    }
+  }
+
+  for (auto &lane : mapData.laneMap)
+  {
+    normalizeEdge(lane.first, "left", lane.second.leftEdge);
+    normalizeEdge(lane.first, "right", lane.second.rightEdge);
+  }
+
+  return ok;
+}
+
+double convertToMetersPerSecond(double const value, std::string const &units)
+{
+  if (units == "m/s")
+  {
+    return value;
+  }
+  else if (units == "km/h")
+  {
+    return value / 3.6;
+  }
+  else if (units == "mph")
+  {
+    return value * 0.4470389;
+  }
+  else
+  {
+    std::cerr << "Unrecognized speed units\n";
+    return 0.0;
+  }
+}
+
+double speedAt(double s, std::vector<RoadSpeed> speed)
+{
+  for (auto it = speed.rbegin(); it != speed.rend(); ++it)
+  {
+    if (s >= it->s)
+    {
+      return convertToMetersPerSecond(it->max, it->unit);
+    }
+  }
+
+  std::cerr << "speedAt() Invalid parameter s\n";
+
+  if (speed.size() > 0)
+  {
+    return convertToMetersPerSecond(speed.front().max, speed.front().unit);
+  }
+
+  return 0.;
+}
+
+// Creates a parametric speed entries vector using the given road speed as reference
+// The range [s0, s1] is mapped to [0., 1.0]
+std::vector<ParametricSpeed> parametricSpeed(double s0, double s1, std::vector<RoadSpeed> speed)
+{
+  double length = s1 - s0;
+
+  if (length <= 0)
+  {
+    std::cerr << "parametricSpeed() Invalid parameters: s1 <= s0\n";
+    return {ParametricSpeed(speedAt(s0, speed))};
+  }
+
+  if (fabs(length) < MinimumSegmentLength)
+  {
+    std::cerr << "parametricSpeed() road segment too short length=" << length << "\n";
+    return {ParametricSpeed(speedAt(s0, speed))};
+  }
+
+  std::vector<double> speedPoints;
+  std::vector<ParametricSpeed> roadParametricSpeed;
+
+  speedPoints.push_back(s0);
+  for (auto it = speed.begin(); it != speed.end(); ++it)
+  {
+    if ((it->s > s0) && (it->s < s1))
+    {
+      speedPoints.push_back(it->s);
+    }
+  }
+  speedPoints.push_back(s1);
+
+  for (auto it = speedPoints.begin(); it != speedPoints.end(); ++it)
+  {
+    ::opendrive::ParametricSpeed parametricSpeed;
+    parametricSpeed.start = std::max(0., (*it - s0) / length);
+    parametricSpeed.speed = speedAt(*it, speed);
+
+    if ((it + 1 == speedPoints.end()) || (*(it + 1) > s1))
+    {
+      parametricSpeed.end = 1.0;
+    }
+    else
+    {
+      parametricSpeed.end = (*(it + 1) - s0) / length;
+    }
+    roadParametricSpeed.push_back(parametricSpeed);
+  }
+  return roadParametricSpeed;
+}
+
+std::vector<ParametricSpeed> calculateLaneSpeed(LaneInfo const &laneInfo, double laneSectionLength)
+{
+  if (laneSectionLength < MinimumSegmentLength)
+  {
+    std::cerr << "calculateLaneSpeed:: lane section length too short\n";
+  }
+
+  std::vector<ParametricSpeed> speed;
+  for (auto it = laneInfo.lane_speed.begin(); it != laneInfo.lane_speed.end(); ++it)
+  {
+    ::opendrive::ParametricSpeed parametricSpeed;
+    parametricSpeed.start = it->soffset / laneSectionLength;
+    parametricSpeed.speed = convertToMetersPerSecond(it->max_speed, it->unit);
+    if (it + 1 == laneInfo.lane_speed.end())
+    {
+      parametricSpeed.end = 1.0;
+    }
+    else
+    {
+      parametricSpeed.end = (it + 1)->soffset / laneSectionLength;
+    }
+    speed.push_back(parametricSpeed);
+  }
+  return speed;
+}
+
+void calculateSpeed(RoadInformation &roadInfo, LaneMap &laneMap)
+{
+  auto &laneSections = roadInfo.lanes.lane_sections;
+
+  auto &roadSpeed = roadInfo.attributes.speed;
+
+  uint32_t laneSectionIndex = 1;
+  for (auto &laneSection : laneSections)
+  {
+    std::vector<ParametricSpeed> laneSectionSpeed;
+    if (roadSpeed.empty())
+    {
+      // no speed info
+      laneSectionSpeed.push_back(ParametricSpeed(convertToMetersPerSecond(50.0, "km/h")));
+    }
+    else
+    {
+      laneSectionSpeed = parametricSpeed(laneSection.start_position, laneSection.end_position, roadSpeed);
+    }
+
+    for (auto &laneInfo : laneSection.left)
+    {
+      auto id = laneId(roadInfo.attributes.id, laneSectionIndex, laneInfo.attributes.id);
+      if (laneInfo.lane_speed.empty())
+      {
+        laneMap[id].speed = laneSectionSpeed;
+      }
+      else
+      {
+        laneMap[id].speed = calculateLaneSpeed(laneInfo, laneSection.end_position - laneSection.start_position);
+      }
+    }
+    for (auto &laneInfo : laneSection.right)
+    {
+      auto id = laneId(roadInfo.attributes.id, laneSectionIndex, laneInfo.attributes.id);
+      if (laneInfo.lane_speed.empty())
+      {
+        laneMap[id].speed = laneSectionSpeed;
+      }
+      else
+      {
+        laneMap[id].speed = calculateLaneSpeed(laneInfo, laneSection.end_position - laneSection.start_position);
+      }
+    }
+    laneSectionIndex++;
+  }
+}
+
+bool checkId(Id id, std::string const &text = "")
+{
+  if (id < 1)
+  {
+    std::cerr << "checkId() invalid id " << id << " " << text << "\n";
+    return false;
+  }
+  return true;
+}
+
+bool belongsToIntersection(::opendrive::RoadInformation const &roadInfo)
+{
+  return roadInfo.attributes.junction == -1 ? false : true;
+}
+
+void setPredecessor(::opendrive::OpenDriveData &mapData,
+                    ::opendrive::RoadInformation const &roadInfo,
+                    ::opendrive::LaneInfo const &laneInfo)
+{
+  auto const &contact = roadInfo.road_link.predecessor->contact_point;
+  auto roadIt = findRoad(mapData, roadInfo.road_link.predecessor->id);
+
+  // predecessor road is connected to the first lane section
+  uint32_t thisLaneSectionIndex = 1;
+  Id thisLaneId = laneId(roadInfo.attributes.id, thisLaneSectionIndex, laneInfo.attributes.id);
+
+  checkId(thisLaneId, "::SetPredecessor");
+
+  if (roadIt != mapData.roads.end())
+  {
+    auto const &roadId = roadIt->attributes.id;
+    Id predecessorId{0u};
+    if (contact == ::opendrive::ContactPoint::End)
+    {
+      predecessorId = laneId(roadId, roadIt->lanes.lane_sections.size(), laneInfo.link->predecessor_id);
+      checkAddSuccessor(mapData.laneMap[predecessorId], mapData.laneMap[thisLaneId]);
+    }
+    else if (contact == ::opendrive::ContactPoint::Start)
+    {
+      predecessorId = laneId(roadId, 1, laneInfo.link->predecessor_id);
+      checkAddPredecessor(mapData.laneMap[predecessorId], mapData.laneMap[thisLaneId]);
+    }
+    checkAddPredecessor(mapData.laneMap[thisLaneId], mapData.laneMap[predecessorId]);
+  }
+}
+
+void setSuccessor(::opendrive::OpenDriveData &mapData,
+                  ::opendrive::RoadInformation const &roadInfo,
+                  ::opendrive::LaneInfo const &laneInfo)
+{
+  auto const &contact = roadInfo.road_link.successor->contact_point;
+  auto roadIt = findRoad(mapData, roadInfo.road_link.successor->id);
+
+  // successor road is connected to the last lane section
+  uint32_t thisLaneSectionIndex = roadInfo.lanes.lane_sections.size();
+  Id thisLaneId = laneId(roadInfo.attributes.id, thisLaneSectionIndex, laneInfo.attributes.id);
+
+  checkId(thisLaneId, "::setSuccessor");
+
+  if (roadIt != mapData.roads.end())
+  {
+    auto const &roadId = roadIt->attributes.id;
+    Id successorId{0u};
+    if (contact == ::opendrive::ContactPoint::End)
+    {
+      successorId = laneId(roadId, roadIt->lanes.lane_sections.size(), laneInfo.link->successor_id);
+      checkAddSuccessor(mapData.laneMap[successorId], mapData.laneMap[thisLaneId]);
+    }
+    else if (contact == ::opendrive::ContactPoint::Start)
+    {
+      successorId = laneId(roadId, 1, laneInfo.link->successor_id);
+      checkAddPredecessor(mapData.laneMap[successorId], mapData.laneMap[thisLaneId]);
+    }
+    checkAddSuccessor(mapData.laneMap[thisLaneId], mapData.laneMap[successorId]);
+  }
+}
+
+bool hasSuccessorRoad(RoadInformation const &roadInfo)
+{
+  auto &link = roadInfo.road_link;
+  return link.successor != nullptr && link.successor->element_type == ::opendrive::ElementType::Road;
+}
+
+bool hasPredecessorRoad(RoadInformation const &roadInfo)
+{
+  auto &link = roadInfo.road_link;
+  return link.predecessor != nullptr && link.predecessor->element_type == ::opendrive::ElementType::Road;
+}
+
+void setSuccessorPredecessor(::opendrive::OpenDriveData &mapData,
+                             ::opendrive::RoadInformation const &roadInfo,
+                             ::opendrive::LaneInfo const &laneInfo,
+                             uint32_t const laneSectionIndex)
+{
+  if (laneInfo.link == nullptr)
+  {
+    return;
+  }
+
+  Id currentLaneId = laneId(roadInfo.attributes.id, laneSectionIndex, laneInfo.attributes.id);
+  auto &laneSections = roadInfo.lanes.lane_sections;
+
+  // First handle predecessors
+  if (laneSectionIndex == 1)
+  {
+    // set predecessor
+    if (laneInfo.link->predecessor_id != 0 && hasPredecessorRoad(roadInfo))
+    {
+      setPredecessor(mapData, roadInfo, laneInfo);
+    }
+  }
+  else
+  {
+    if (laneInfo.link->predecessor_id != 0)
+    {
+      Id predecessorId = laneId(roadInfo.attributes.id, laneSectionIndex - 1, laneInfo.link->predecessor_id);
+      checkAddPredecessor(mapData.laneMap[currentLaneId], mapData.laneMap[predecessorId]);
+    }
+  }
+
+  // Then handle successors
+  if (laneSectionIndex < laneSections.size())
+  {
+    if (laneInfo.link->successor_id != 0)
+    {
+      Id successorId = laneId(roadInfo.attributes.id, laneSectionIndex + 1, laneInfo.link->successor_id);
+      checkAddSuccessor(mapData.laneMap[currentLaneId], mapData.laneMap[successorId]);
+    }
+  }
+  else
+  {
+    // set successor
+    if (laneInfo.link->successor_id != 0 && hasSuccessorRoad(roadInfo))
+    {
+      setSuccessor(mapData, roadInfo, laneInfo);
+    }
+  }
+}
+
+void setLeftRightNeighbor(::opendrive::OpenDriveData &mapData,
+                          ::opendrive::RoadInformation const &roadInfo,
+                          uint32_t const laneSectionIndex)
+{
+  auto &laneSection = roadInfo.lanes.lane_sections[laneSectionIndex - 1];
+  auto numLeftLanes = laneSection.left.size();
+  auto numRightLanes = laneSection.right.size();
+
+  for (std::size_t k = 0; k < laneSection.left.size(); k++)
+  {
+    auto &laneInfo = laneSection.left[k];
+    Id thisLaneId = laneId(roadInfo.attributes.id, laneSectionIndex, laneInfo.attributes.id);
+    Id rightNeighborId{0u};
+    Id leftNeighborId{0u};
+
+    // right neighbor
+    if (k == 0)
+    {
+      if (numRightLanes > 0)
+      {
+        rightNeighborId = laneId(roadInfo.attributes.id, laneSectionIndex, laneSection.right.front().attributes.id);
+      }
+    }
+    else
+    {
+      rightNeighborId = laneId(roadInfo.attributes.id, laneSectionIndex, laneSection.left[k - 1].attributes.id);
+    }
+
+    // left neighbor
+    if (k + 1 < numLeftLanes)
+    {
+      leftNeighborId = laneId(roadInfo.attributes.id, laneSectionIndex, laneSection.left[k + 1].attributes.id);
+    }
+
+    mapData.laneMap[thisLaneId].rightNeighbor = rightNeighborId;
+    mapData.laneMap[thisLaneId].leftNeighbor = leftNeighborId;
+  }
+  for (std::size_t k = 0; k < laneSection.right.size(); k++)
+  {
+    auto &laneInfo = laneSection.right[k];
+    Id thisLaneId = laneId(roadInfo.attributes.id, laneSectionIndex, laneInfo.attributes.id);
+    Id rightNeighborId{0u};
+    Id leftNeighborId{0u};
+
+    // left neighbor
+    if (k == 0)
+    {
+      if (numLeftLanes > 0)
+      {
+        leftNeighborId = laneId(roadInfo.attributes.id, laneSectionIndex, laneSection.left.front().attributes.id);
+      }
+    }
+    else
+    {
+      leftNeighborId = laneId(roadInfo.attributes.id, laneSectionIndex, laneSection.right[k - 1].attributes.id);
+    }
+
+    // right neighbor
+    if (k + 1 < numRightLanes)
+    {
+      rightNeighborId = laneId(roadInfo.attributes.id, laneSectionIndex, laneSection.right[k + 1].attributes.id);
+    }
+
+    mapData.laneMap[thisLaneId].rightNeighbor = rightNeighborId;
+    mapData.laneMap[thisLaneId].leftNeighbor = leftNeighborId;
+  }
+}
+
+void generateTopology(RoadInformation &roadInfo, opendrive::OpenDriveData &mapData)
+{
+  auto &laneSections = roadInfo.lanes.lane_sections;
+
+  // left and right neighbors
+  for (std::size_t i = 0; i < laneSections.size(); ++i)
+  {
+    setLeftRightNeighbor(mapData, roadInfo, i + 1);
+  }
+  for (std::size_t i = 0; i < laneSections.size(); ++i)
+  {
+    auto &laneSection = laneSections[i];
+    auto laneSectionIndex = i + 1;
+
+    for (std::size_t k = 0; k < laneSection.left.size(); k++)
+    {
+      auto &laneInfo = laneSection.left[k];
+      setSuccessorPredecessor(mapData, roadInfo, laneInfo, laneSectionIndex);
+    }
+    for (std::size_t k = 0; k < laneSection.right.size(); k++)
+    {
+      auto &laneInfo = laneSection.right[k];
+      setSuccessorPredecessor(mapData, roadInfo, laneInfo, laneSectionIndex);
+    }
+  }
+}
+
+void autoConnectIntersectionLanes(opendrive::OpenDriveData &mapData, double const overlapMargin)
+{
+    /*
+  auto &laneMap = mapData.laneMap;
+  auto &intersectionLaneIds = mapData.intersectionLaneIds;
+
+  for (auto &element : intersectionLaneIds)
+  {
+    auto &lanes = element.second;
+    for (auto leftIt = lanes.begin(); leftIt != lanes.end(); leftIt++)
+    {
+      for (auto rightIt = leftIt; rightIt != lanes.end(); rightIt++)
+      {
+        if (lanesOverlap(laneMap[*leftIt], laneMap[*rightIt], overlapMargin))
+        {
+          laneMap[*leftIt].overlaps.push_back(*rightIt);
+          laneMap[*rightIt].overlaps.push_back(*leftIt);
+        }
+        switch (contactPlace(laneMap[*leftIt], laneMap[*rightIt]))
+        {
+          case ContactPlace::LeftLeft:
+            // lane and neighbors need inversion
+            invertLaneAndNeighbors(laneMap, mapData.laneMap[*rightIt]);
+          // fallthrough
+          case ContactPlace::LeftRight:
+            laneMap[*leftIt].leftNeighbor = *rightIt;
+            laneMap[*rightIt].rightNeighbor = *leftIt;
+            break;
+          case ContactPlace::RightRight:
+            // lane and neighbors need inversion
+            invertLaneAndNeighbors(laneMap, mapData.laneMap[*rightIt]);
+          // fallthrough
+          case ContactPlace::RightLeft:
+            laneMap[*leftIt].rightNeighbor = *rightIt;
+            laneMap[*rightIt].leftNeighbor = *leftIt;
+            break;
+          case ContactPlace::Overlap:
+          case ContactPlace::None:
+            // nothing to be done
+            break;
+        }
+      }
+    }
+  }
+  */
+}
+
+double length(::opendrive::Edge const &edge)
+{
+  double edgeLength = 0.0;
+  for (std::size_t i = 1u; i < edge.size(); ++i)
+  {
+    edgeLength += (edge[i - 1] - edge[i]).norm();
+  }
+  return edgeLength;
+}
+
+bool checkLaneConsistency(opendrive::OpenDriveData &mapData)
+{
+  bool ok = true;
+  auto &laneMap = mapData.laneMap;
+  std::vector<Id> deletionLanes;
+  for (auto element : laneMap)
+  {
+    auto &lane = element.second;
+    double leftLength = length(lane.leftEdge);
+    double rightLength = length(lane.rightEdge);
+
+    if (leftLength < 2.0e-10 || rightLength < 2.0e-10)
+    {
+      std::cerr << "checkLaneConsistency:: Invalid lane geometry for lane " << lane.id << "\n";
+      deletionLanes.push_back(lane.id);
+      ok = false;
+    }
+  }
+
+  return ok;
+}
+
+bool convertToGeoPoints(opendrive::OpenDriveData &mapData)
+{
+    /*
+  auto projPtr = pj_init_plus(mapData.geoReference.projection.c_str());
+  if (projPtr == nullptr)
+  {
+    if (std::isnan(mapData.geoReference.longitude) || std::isnan(mapData.geoReference.latitude))
+    {
+      return false;
+    }
+
+    std::string defaultProjection = "+proj=tmerc +ellps=WGS84 +lon_0=" + std::to_string(mapData.geoReference.longitude)
+      + " +lat_0=" + std::to_string(mapData.geoReference.latitude);
+    projPtr = pj_init_plus(defaultProjection.c_str());
+    std::cerr << "Using default projection: " << defaultProjection << "\n";
+    if (projPtr == nullptr)
+    {
+      std::cerr << "Unknown error while creating the projection\n";
+      return false;
+    }
+  }
+
+  auto convertENUToGeo = [&projPtr](Point &point) {
+    projXY enuPoint;
+    enuPoint.u = point.x;
+    enuPoint.v = point.y;
+
+    auto geoPoint = pj_inv(enuPoint, projPtr);
+    point.x = geoPoint.u * RAD_TO_DEG;
+    point.y = geoPoint.v * RAD_TO_DEG;
+
+  };
+
+  for (auto &element : mapData.laneMap)
+  {
+    auto &lane = element.second;
+    for (auto &point : lane.leftEdge)
+    {
+      convertENUToGeo(point);
+    }
+    for (auto &point : lane.rightEdge)
+    {
+      convertENUToGeo(point);
+    }
+  }
+
+  for (auto &element : mapData.landmarks)
+  {
+    convertENUToGeo(element.second.position);
+  }
+
+  pj_dalloc(projPtr);
+
+  */
+  return true;
+}
+
+bool GenerateGeometry(opendrive::OpenDriveData &open_drive_data, double const overlapMargin)
+{
+  bool ok = initializeLaneMap(open_drive_data);
+
+  for (auto &roadInfo : open_drive_data.roads)
+  {
+    if (!generateRoadGeometry(roadInfo, open_drive_data))
+    {
+      ok = false;
+    }
+  }
+
+  for (auto &roadInfo : open_drive_data.roads)
+  {
+    calculateSpeed(roadInfo, open_drive_data.laneMap);
+  }
+  for (auto &roadInfo : open_drive_data.roads)
+  {
+    generateTopology(roadInfo, open_drive_data);
+  }
+
+  if (!checkLaneConsistency(open_drive_data))
+  {
+    ok = false;
+  }
+  autoConnectIntersectionLanes(open_drive_data, overlapMargin);
+
+  if (!convertToGeoPoints(open_drive_data))
+  {
+    ok = false;
+  }
+
+  return ok;
+}
+
+
+
+bool GenerateRoadMarkLines(RoadInformation& roadInfo, std::vector<LaneMark>& LaneMarkers, float accuracy)
+{
+    bool ok = true;
+    auto roadId = roadInfo.attributes.id;
+    auto& laneSections = roadInfo.lanes.lane_sections;
+
+    CenterLine centerLine;
+    if (!generateCenterLine(roadInfo, centerLine))
+    {
+        return false;
+    }
+
+    calculateLaneSectionBounds(laneSections, centerLine.length);
+
+    /*
+    if (!fixInvalidLaneSections(laneSections)) // currently just checks consistency
+    {
+        return false;
+    }
+    */
+
+    sortLanesByIndex(laneSections);
+
+
+    //auto samplingPoints = centerLine.samplingPoints();
+
+    for (auto it = laneSections.begin(); it != laneSections.end(); it++)
+    {
+        auto& laneSection = *it;
+        auto laneSectionIndex = static_cast<uint32_t>(it - laneSections.begin()) + 1;
+
+        // the tolerance at the end is necessary so that the lane offset applies only to the current lane section
+        double s0 = laneSection.start_position;
+        double s1 = laneSection.end_position;
+
+        if ((s1 - s0) < MinimumSegmentLength)
+        {
+            std::cerr << "Invalid lane section length s1, s0\n";
+            continue;
+        }
+
+        auto EvalBorderOffset = [&](const std::vector<LaneInfo>& LanesInfo, const LaneInfo& target_line, double s)
+        {
+            double borderOffset = 0.;
+            for (auto& laneInfo : LanesInfo)
+            {
+                auto width = laneWidth(laneInfo.lane_width, s - s0);
+                borderOffset += width;
+
+                if (&laneInfo == &target_line) break;
+            }
+
+            return borderOffset;
+        };
+
+        auto AddMarksFormLineInfo = [&](const std::vector<LaneInfo>& LanesInfo, const LaneInfo& laneInfo, int dir)
+        {
+            double mark_s0 = laneInfo.road_marker[0].soffset;
+
+            for (int i = 0; i < laneInfo.road_marker.size(); ++i)
+            {
+                double mark_s1 = (i == laneInfo.road_marker.size() - 1) ? (s1 - s0) : laneInfo.road_marker[i + 1].soffset;
+
+                if (mark_s1 < mark_s0)
+                {
+                    std::cerr << "Invalid lane mark length mark_s1, mark_s0\n";
+                    break;
+                }
+
+                LaneMark laneMark;
+                laneMark.type = laneInfo.road_marker[i].type;
+
+             
+                const double mark_len = mark_s1 - mark_s0 - 0.001;
+
+                int count = int(mark_len / accuracy + 1);
+
+                const double step = double(mark_len) / count;
+
+                for (int j = 0; j <= count; ++j)
+                {
+                    double s = s0 + mark_s0 + step * j;
+                    auto centerPoint = centerLine.eval(s);
+                    double height = centerLine.evalElevation(s);
+                    double borderOffset = EvalBorderOffset(LanesInfo, laneInfo, s);
+
+                    switch (dir)
+                    {
+                    case -1: //right
+                        centerPoint.ApplyLateralOffset(-borderOffset);
+                        break;
+                    case 1: //left
+                        centerPoint.ApplyLateralOffset(borderOffset);
+                        break;
+                    }
+                    laneMark.Edge.push_back({ centerPoint.location.x, centerPoint.location.y, height });
+                }
+                
+
+                if (laneMark.Edge.size() > 1) LaneMarkers.push_back(laneMark);
+
+                mark_s0 = mark_s1;
+            }
+
+        };
+
+
+        for (auto& laneInfo : laneSection.left) 
+            AddMarksFormLineInfo(laneSection.left, laneInfo, 1);
+        for (auto& laneInfo : laneSection.right) 
+            AddMarksFormLineInfo(laneSection.right, laneInfo, -1);
+        AddMarksFormLineInfo(laneSection.center, laneSection.center[0], 0);
+
+    }
+
+    return ok;
+}
+
+
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/LaneUtils.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/LaneUtils.cpp
new file mode 100644
index 0000000..685d8c1
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/geometry/LaneUtils.cpp
@@ -0,0 +1,317 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/geometry/LaneUtils.hpp"
+#include "opendrive/geometry/Geometry.h"
+
+//#include <boost/geometry.hpp>
+//#include <boost/geometry/geometries/point_xy.hpp>
+#include <iostream>
+#include <vector>
+
+namespace opendrive {
+
+static bool points_near(const opendrive::Point & left, const opendrive::Point & right, double resolution = 1e-3)
+{
+    auto diff = left - right;
+    return (fabs(diff.x) < resolution) && (fabs(diff.y) < resolution);
+}
+
+namespace geometry {
+
+//typedef ::boost::geometry::model::d2::point_xy<double> Boost2dPoint;
+//typedef ::boost::geometry::model::polygon<Boost2dPoint> BoostPolygon;
+
+
+
+
+
+/**
+ * Convert lane to boost polygon
+ *
+ * move the lane edges by the given margin to the center (shrink the lane)
+ */
+
+/*
+BoostPolygon fromLane(Lane const &lane, double const margin)
+{
+  auto const &leftBorder = lane.leftEdge;
+  auto const &rightBorder = lane.rightEdge;
+
+  std::vector<Boost2dPoint> leftPoints;
+  std::vector<Boost2dPoint> rightPoints;
+
+  for (auto it = leftBorder.begin(); it != leftBorder.end(); ++it)
+  {
+    Boost2dPoint point({it->x, it->y});
+    // leave out consecutive identical points
+    if (leftPoints.empty() || (boost::geometry::distance(leftPoints.back(), point) > 0.001))
+    {
+      leftPoints.push_back(point);
+    }
+  }
+  for (auto it = rightBorder.begin(); it != rightBorder.end(); ++it)
+  {
+    Boost2dPoint point({it->x, it->y});
+    // leave out consecutive identical points
+    if (rightPoints.empty() || (boost::geometry::distance(rightPoints.back(), point) > 0.001))
+    {
+      rightPoints.push_back(point);
+    }
+  }
+
+  Boost2dPoint orthogonalDirection;
+  size_t i = 0;
+  if (leftPoints.size() > 1)
+  {
+    for (; i < leftPoints.size() - 1; i++)
+    {
+      Boost2dPoint direction = leftPoints[i + 1];
+      boost::geometry::subtract_point(direction, leftPoints[i]);
+      double normalizingFactor = 1.0 / boost::geometry::distance(leftPoints[i + 1], leftPoints[i]);
+      Boost2dPoint normalizedDirection = direction;
+      boost::geometry::multiply_value(normalizedDirection, normalizingFactor);
+
+      orthogonalDirection.x(normalizedDirection.y());
+      orthogonalDirection.y(-normalizedDirection.x());
+      boost::geometry::multiply_value(orthogonalDirection, margin);
+      boost::geometry::add_point(leftPoints[i], orthogonalDirection);
+    }
+    boost::geometry::add_point(leftPoints[i], orthogonalDirection);
+  }
+
+  if (rightPoints.size() > 1)
+  {
+    i = 0;
+    for (; i < rightPoints.size() - 1; i++)
+    {
+      Boost2dPoint direction = rightPoints[i + 1];
+      boost::geometry::subtract_point(direction, rightPoints[i]);
+      double normalizingFactor = 1.0 / boost::geometry::distance(rightPoints[i + 1], rightPoints[i]);
+      Boost2dPoint normalizedDirection = direction;
+      boost::geometry::multiply_value(normalizedDirection, normalizingFactor);
+
+      orthogonalDirection.x(-normalizedDirection.y());
+      orthogonalDirection.y(normalizedDirection.x());
+      boost::geometry::multiply_value(orthogonalDirection, margin);
+      boost::geometry::add_point(rightPoints[i], orthogonalDirection);
+    }
+    boost::geometry::add_point(rightPoints[i], orthogonalDirection);
+  }
+
+  std::vector<Boost2dPoint> points = leftPoints;
+  // insert the right points in vice versa direction
+  points.insert(points.end(), rightPoints.rbegin(), rightPoints.rend());
+  // close polygon
+  points.push_back(points.front());
+  BoostPolygon polygon;
+  ::boost::geometry::assign_points(polygon, points);
+  // ensure that all polygons have the same orientation
+  ::boost::geometry::correct(polygon);
+  return polygon;
+}
+
+void invertLane(Lane &lane)
+{
+  std::reverse(lane.leftEdge.begin(), lane.leftEdge.end());
+  std::reverse(lane.rightEdge.begin(), lane.rightEdge.end());
+  std::swap(lane.leftEdge, lane.rightEdge);
+  std::swap(lane.leftNeighbor, lane.rightNeighbor);
+  std::swap(lane.predecessors, lane.successors);
+  lane.index = -lane.index;
+
+  for (auto &signalReference : lane.signalReferences)
+  {
+    signalReference.inLaneOrientation = !signalReference.inLaneOrientation;
+    signalReference.parametricPosition = 1.0 - signalReference.parametricPosition;
+  }
+
+  for (auto &parametricSpeed : lane.speed)
+  {
+    auto start = 1.0 - parametricSpeed.end;
+    auto end = 1.0 - parametricSpeed.start;
+    parametricSpeed.end = end;
+    parametricSpeed.start = start;
+  }
+}
+
+void invertLaneAndNeighbors(LaneMap &laneMap, Lane &lane)
+{
+  std::set<Id> neighborhood;
+  neighborhood.insert(lane.id);
+  auto leftNeighbor = lane.leftNeighbor;
+  while (leftNeighbor != 0u)
+  {
+    auto insertResult = neighborhood.insert(leftNeighbor);
+    if (insertResult.second)
+    {
+      leftNeighbor = laneMap[leftNeighbor].leftNeighbor;
+    }
+    else
+    {
+      std::cerr << "invertLaneAndNeighbors(" << lane.id << ") recursion" << std::endl;
+      leftNeighbor = 0u;
+    }
+  }
+  auto rightNeighbor = lane.rightNeighbor;
+  while (rightNeighbor != 0u)
+  {
+    auto insertResult = neighborhood.insert(rightNeighbor);
+    if (insertResult.second)
+    {
+      rightNeighbor = laneMap[rightNeighbor].rightNeighbor;
+    }
+    else
+    {
+      std::cerr << "invertLaneAndNeighbors(" << lane.id << ") recursion" << std::endl;
+      rightNeighbor = 0u;
+    }
+  }
+  for (auto const &laneId : neighborhood)
+  {
+    invertLane(laneMap[laneId]);
+  }
+}
+
+ContactPlace contactPlace(Lane const &leftLane, Lane const &rightLane)
+{
+  if (leftLane.leftEdge.empty() || leftLane.rightEdge.empty())
+  {
+    std::cerr << "Empty left lane " << leftLane.id << "\n";
+    return ContactPlace::None;
+  }
+  if (rightLane.leftEdge.empty() || rightLane.rightEdge.empty())
+  {
+    std::cerr << "Empty right lane " << leftLane.id << "\n";
+    return ContactPlace::None;
+  }
+  auto const thisLeftStart = leftLane.leftEdge.front();
+  auto const thisRightStart = leftLane.rightEdge.front();
+  auto const otherLeftStart = rightLane.leftEdge.front();
+  auto const otherRightStart = rightLane.rightEdge.front();
+
+  auto const thisLeftEnd = leftLane.leftEdge.back();
+  auto const thisRightEnd = leftLane.rightEdge.back();
+  auto const otherLeftEnd = rightLane.leftEdge.back();
+  auto const otherRightEnd = rightLane.rightEdge.back();
+
+  if ((near(thisLeftStart, otherLeftStart) && near(thisLeftEnd, otherLeftEnd))
+      || (near(thisRightStart, otherRightStart) && near(thisRightEnd, otherRightEnd)))
+  {
+    return ContactPlace::Overlap;
+  }
+  else if (near(thisLeftStart, otherRightStart) && near(thisLeftEnd, otherRightEnd))
+  {
+    return ContactPlace::LeftRight;
+  }
+  else if (near(thisLeftStart, otherLeftEnd) && near(thisLeftEnd, otherLeftStart))
+  {
+    return ContactPlace::LeftLeft;
+  }
+  else if (near(thisRightStart, otherLeftStart) && near(thisRightEnd, otherLeftEnd))
+  {
+    return ContactPlace::RightLeft;
+  }
+  else if (near(thisRightStart, otherRightEnd) && near(thisRightEnd, otherRightStart))
+  {
+    return ContactPlace::RightRight;
+  }
+
+  return ContactPlace::None;
+}
+*/
+
+void checkAddPredecessor(Lane &lane, Lane const &otherLane)
+{
+  auto const thisLeftStart = lane.leftEdge.front();
+  auto const thisRightStart = lane.rightEdge.front();
+  auto const otherLeftStart = otherLane.leftEdge.front();
+  auto const otherRightStart = otherLane.rightEdge.front();
+  auto const otherLeftEnd = otherLane.leftEdge.back();
+  auto const otherRightEnd = otherLane.rightEdge.back();
+
+  if ((points_near(thisLeftStart, otherLeftEnd) && points_near(thisRightStart, otherRightEnd))
+      || (points_near(thisLeftStart, otherRightStart) && points_near(thisRightStart, otherLeftStart)))
+  {
+    lane.predecessors.push_back(otherLane.id);
+  }
+  else
+  {
+    // std::cerr << "checkAddPredecessor[" << lane.id << "] rejecting other lane:" << otherLane.id << std::endl;
+  }
+}
+
+void checkAddSuccessor(Lane &lane, Lane const &otherLane)
+{
+  auto const thisLeftEnd = lane.leftEdge.back();
+  auto const thisRightEnd = lane.rightEdge.back();
+  auto const otherLeftStart = otherLane.leftEdge.front();
+  auto const otherRightStart = otherLane.rightEdge.front();
+  auto const otherLeftEnd = otherLane.leftEdge.back();
+  auto const otherRightEnd = otherLane.rightEdge.back();
+
+  if ((points_near(thisLeftEnd, otherLeftStart) && points_near(thisRightEnd, otherRightStart))
+      || (points_near(thisLeftEnd, otherRightEnd) && points_near(thisRightEnd, otherLeftEnd)))
+  {
+    lane.successors.push_back(otherLane.id);
+  }
+  else
+  {
+    // std::cerr << "checkAddSuccessor[" << lane.id << "] rejecting other lane:" << otherLane.id << std::endl;
+  }
+}
+
+Id laneId(int roadId, int laneSectionIndex, int laneIndex)
+{
+  if (roadId < 0)
+  {
+    std::cerr << "Invalid road id " << roadId << "\n";
+  }
+
+  if (laneSectionIndex < 0)
+  {
+    std::cerr << "Invalid lane section index" << roadId << "\n";
+  }
+
+  Id road = static_cast<Id>(roadId) * 10000;
+  Id lane = static_cast<Id>(laneIndex) + 50;
+  Id laneSection = static_cast<Id>(laneSectionIndex) * 100;
+
+  return road + laneSection + lane;
+}
+/*
+bool lanesOverlap(Lane const &leftLane, Lane const &rightLane, double const overlapMargin)
+{
+  if (leftLane.id == rightLane.id)
+  {
+    return true;
+  }
+  if ((leftLane.type != LaneType::Driving) || (rightLane.type != LaneType::Driving))
+  {
+    return false;
+  }
+
+  try
+  {
+    auto leftPolygon = fromLane(leftLane, overlapMargin);
+    auto rightPolygon = fromLane(rightLane, overlapMargin);
+    std::deque<BoostPolygon> output;
+    (void)::boost::geometry::intersection(leftPolygon, rightPolygon, output);
+    return (!output.empty());
+  }
+  catch (...)
+  {
+    std::cerr << "Error while checking overlap between lanes " << leftLane.id << " and " << rightLane.id << "\n";
+    return false;
+  }
+}
+*/
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/GeoReferenceParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/GeoReferenceParser.cpp
new file mode 100644
index 0000000..078e410
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/GeoReferenceParser.cpp
@@ -0,0 +1,58 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/GeoReferenceParser.h"
+
+//#include <boost/algorithm/string.hpp>
+#include <iostream>
+#include <limits>
+#include <vector>
+
+namespace opendrive {
+namespace parser {
+
+::opendrive::geom::GeoLocation GeoReferenceParser::Parse(const std::string &geo_reference_string)
+{
+    
+  ::opendrive::geom::GeoLocation result{
+    std::numeric_limits<double>::quiet_NaN(), std::numeric_limits<double>::quiet_NaN(), 0.0, ""};
+  result.projection = geo_reference_string;
+
+  /*
+
+  std::vector<std::string> geo_ref_splitted;
+  boost::split(geo_ref_splitted, geo_reference_string, boost::is_any_of(" "));
+  for (auto const &element : geo_ref_splitted)
+  {
+    std::vector<std::string> geo_ref_key_value;
+    boost::split(geo_ref_key_value, element, boost::is_any_of("="));
+    if (geo_ref_key_value.size() != 2u)
+    {
+      continue;
+    }
+
+    if (geo_ref_key_value[0] == "+lat_0")
+    {
+      result.latitude = std::stod(geo_ref_key_value[1]);
+    }
+    else if (geo_ref_key_value[0] == "+lon_0")
+    {
+      result.longitude = std::stod(geo_ref_key_value[1]);
+    }
+  }
+  */
+
+  return result;
+}
+
+} // parser
+} // opendrive
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/GeometryParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/GeometryParser.cpp
new file mode 100644
index 0000000..7dfc418
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/GeometryParser.cpp
@@ -0,0 +1,122 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/GeometryParser.h"
+
+#include <cassert>
+
+#define ODP_ASSERT(x, ...) assert(x)
+#define ODP_UNUSED(x) (void)(x)
+
+void opendrive::parser::GeometryParser::ParseArc(const pugi::xml_node &xmlNode,
+                                                 opendrive::GeometryAttributesArc *out_geometry_arc)
+{
+  out_geometry_arc->type = opendrive::GeometryType::ARC;
+  out_geometry_arc->curvature = std::stod(xmlNode.attribute("curvature").value());
+}
+
+void opendrive::parser::GeometryParser::ParseLine(const pugi::xml_node &xmlNode,
+                                                  opendrive::GeometryAttributesLine *out_geometry_line)
+{
+  ODP_UNUSED(xmlNode);
+  out_geometry_line->type = opendrive::GeometryType::LINE;
+}
+
+void opendrive::parser::GeometryParser::ParseSpiral(const pugi::xml_node &xmlNode,
+                                                    opendrive::GeometryAttributesSpiral *out_geometry_spiral)
+{
+  out_geometry_spiral->type = opendrive::GeometryType::SPIRAL;
+  out_geometry_spiral->curve_end = std::stod(xmlNode.attribute("curvEnd").value());
+  out_geometry_spiral->curve_start = std::stod(xmlNode.attribute("curvStart").value());
+}
+
+void opendrive::parser::GeometryParser::ParsePoly3(const pugi::xml_node &xmlNode,
+                                                   opendrive::GeometryAttributesPoly3 *out_geometry_poly3)
+{
+  out_geometry_poly3->type = opendrive::GeometryType::POLY3;
+  out_geometry_poly3->a = std::stod(xmlNode.attribute("a").value());
+  out_geometry_poly3->b = std::stod(xmlNode.attribute("b").value());
+  out_geometry_poly3->c = std::stod(xmlNode.attribute("c").value());
+  out_geometry_poly3->d = std::stod(xmlNode.attribute("d").value());
+}
+
+void opendrive::parser::GeometryParser::ParseParamPoly3(
+  const pugi::xml_node &xmlNode, opendrive::GeometryAttributesParamPoly3 *out_geometry_param_poly3)
+{
+  out_geometry_param_poly3->type = opendrive::GeometryType::PARAMPOLY3;
+  out_geometry_param_poly3->aU = std::stod(xmlNode.attribute("aU").value());
+  out_geometry_param_poly3->bU = std::stod(xmlNode.attribute("bU").value());
+  out_geometry_param_poly3->cU = std::stod(xmlNode.attribute("cU").value());
+  out_geometry_param_poly3->dU = std::stod(xmlNode.attribute("dU").value());
+  out_geometry_param_poly3->aV = std::stod(xmlNode.attribute("aV").value());
+  out_geometry_param_poly3->bV = std::stod(xmlNode.attribute("bV").value());
+  out_geometry_param_poly3->cV = std::stod(xmlNode.attribute("cV").value());
+  out_geometry_param_poly3->dV = std::stod(xmlNode.attribute("dV").value());
+}
+
+void opendrive::parser::GeometryParser::Parse(
+  const pugi::xml_node &xmlNode, std::vector<std::unique_ptr<opendrive::GeometryAttributes>> &out_geometry_attributes)
+{
+  opendrive::parser::GeometryParser gometry_parser;
+
+  for (pugi::xml_node roadGeometry = xmlNode.child("geometry"); roadGeometry;
+       roadGeometry = roadGeometry.next_sibling("geometry"))
+  {
+    std::unique_ptr<opendrive::GeometryAttributes> geometry_attributes;
+    std::string firstChildName(roadGeometry.first_child().name());
+
+    if (firstChildName == "arc")
+    {
+      geometry_attributes = std::make_unique<opendrive::GeometryAttributesArc>();
+      gometry_parser.ParseArc(roadGeometry.first_child(),
+                              static_cast<opendrive::GeometryAttributesArc *>(geometry_attributes.get()));
+    }
+    else if (firstChildName == "line")
+    {
+      geometry_attributes = std::make_unique<opendrive::GeometryAttributesLine>();
+      gometry_parser.ParseLine(roadGeometry.first_child(),
+                               static_cast<opendrive::GeometryAttributesLine *>(geometry_attributes.get()));
+    }
+    else if (firstChildName == "spiral")
+    {
+      geometry_attributes = std::make_unique<opendrive::GeometryAttributesSpiral>();
+      gometry_parser.ParseSpiral(roadGeometry.first_child(),
+                                 static_cast<opendrive::GeometryAttributesSpiral *>(geometry_attributes.get()));
+    }
+    else if (firstChildName == "poly3")
+    {
+      geometry_attributes = std::make_unique<opendrive::GeometryAttributesPoly3>();
+      gometry_parser.ParsePoly3(roadGeometry.first_child(),
+                                static_cast<opendrive::GeometryAttributesPoly3 *>(geometry_attributes.get()));
+    }
+    else if (firstChildName == "paramPoly3")
+    {
+      geometry_attributes = std::make_unique<opendrive::GeometryAttributesParamPoly3>();
+      gometry_parser.ParseParamPoly3(roadGeometry.first_child(),
+                                     static_cast<opendrive::GeometryAttributesParamPoly3 *>(geometry_attributes.get()));
+    }
+    else
+    {
+      ODP_ASSERT(false, "Geometry type unknown");
+    }
+
+    geometry_attributes->start_position = std::stod(roadGeometry.attribute("s").value());
+
+    geometry_attributes->start_position_x = std::stod(roadGeometry.attribute("x").value());
+    geometry_attributes->start_position_y = std::stod(roadGeometry.attribute("y").value());
+
+    geometry_attributes->heading = std::stod(roadGeometry.attribute("hdg").value());
+    geometry_attributes->length = std::stod(roadGeometry.attribute("length").value());
+
+    out_geometry_attributes.emplace_back(std::move(geometry_attributes));
+  }
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/JunctionParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/JunctionParser.cpp
new file mode 100644
index 0000000..f85a808
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/JunctionParser.cpp
@@ -0,0 +1,60 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/JunctionParser.h"
+
+void opendrive::parser::JunctionParser::Parse(const pugi::xml_node &xmlNode,
+                                              std::vector<opendrive::Junction> &out_junction)
+{
+  opendrive::parser::JunctionParser parser;
+  opendrive::Junction junction;
+
+  junction.attributes.id = std::atoi(xmlNode.attribute("id").value());
+  junction.attributes.name = xmlNode.attribute("name").value();
+
+  parser.ParseConnection(xmlNode, junction.connections);
+  out_junction.emplace_back(junction);
+}
+
+void opendrive::parser::JunctionParser::ParseConnection(const pugi::xml_node &xmlNode,
+                                                        std::vector<opendrive::JunctionConnection> &out_connections)
+{
+  for (pugi::xml_node junctionConnection = xmlNode.child("connection"); junctionConnection;
+       junctionConnection = junctionConnection.next_sibling("connection"))
+  {
+    opendrive::JunctionConnection jConnection;
+
+    jConnection.attributes.id = std::atoi(junctionConnection.attribute("id").value());
+    jConnection.attributes.contact_point = junctionConnection.attribute("contactPoint").value();
+
+    jConnection.attributes.incoming_road = std::atoi(junctionConnection.attribute("incomingRoad").value());
+    jConnection.attributes.connecting_road = std::atoi(junctionConnection.attribute("connectingRoad").value());
+
+    ParseLaneLink(junctionConnection, jConnection.links);
+    out_connections.emplace_back(jConnection);
+  }
+}
+
+void opendrive::parser::JunctionParser::ParseLaneLink(const pugi::xml_node &xmlNode,
+                                                      std::vector<opendrive::JunctionLaneLink> &out_lane_link)
+{
+  for (pugi::xml_node junctionLaneLink = xmlNode.child("laneLink"); junctionLaneLink;
+       junctionLaneLink = junctionLaneLink.next_sibling("laneLink"))
+  {
+    opendrive::JunctionLaneLink jLaneLink;
+
+    jLaneLink.from = std::atoi(junctionLaneLink.attribute("from").value());
+    jLaneLink.to = std::atoi(junctionLaneLink.attribute("to").value());
+
+    out_lane_link.emplace_back(jLaneLink);
+  }
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/LaneParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/LaneParser.cpp
new file mode 100644
index 0000000..5cedc33
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/LaneParser.cpp
@@ -0,0 +1,268 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019-2020 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/LaneParser.h"
+#include <string>
+
+namespace opendrive {
+namespace parser {
+
+LaneType toLaneType(std::string const laneType)
+{
+  if (laneType == "none")
+  {
+    return LaneType::None;
+  }
+  else if (laneType == "driving")
+  {
+    return LaneType::Driving;
+  }
+  else if (laneType == "stop")
+  {
+    return LaneType::Stop;
+  }
+  else if (laneType == "shoulder")
+  {
+    return LaneType::Shoulder;
+  }
+  else if (laneType == "biking")
+  {
+    return LaneType::Biking;
+  }
+  else if (laneType == "sidewalk")
+  {
+    return LaneType::Sidewalk;
+  }
+  else if (laneType == "border")
+  {
+    return LaneType::Border;
+  }
+  else if (laneType == "restricted")
+  {
+    return LaneType::Restricted;
+  }
+  else if (laneType == "bidirectional")
+  {
+    return LaneType::Bidirectional;
+  }
+  else if (laneType == "parking")
+  {
+    return LaneType::Parking;
+  }
+  else if (laneType == "median")
+  {
+    return LaneType::Median;
+  }
+  else if (laneType == "special1")
+  {
+    return LaneType::Special1;
+  }
+  else if (laneType == "special2")
+  {
+    return LaneType::Special2;
+  }
+  else if (laneType == "special3")
+  {
+    return LaneType::Special3;
+  }
+  else if (laneType == "roadWorks")
+  {
+    return LaneType::RoadWorks;
+  }
+  else if (laneType == "tram")
+  {
+    return LaneType::Tram;
+  }
+  else if (laneType == "rail")
+  {
+    return LaneType::Rail;
+  }
+  else if (laneType == "entry")
+  {
+    return LaneType::Entry;
+  }
+  else if (laneType == "exit")
+  {
+    return LaneType::Exit;
+  }
+  else if (laneType == "offRamp")
+  {
+    return LaneType::OffRamp;
+  }
+  else if (laneType == "onRamp")
+  {
+    return LaneType::OnRamp;
+  }
+  else
+  {
+    return LaneType::None;
+  }
+}
+
+void LaneParser::ParseLane(const pugi::xml_node &xmlNode, std::vector<LaneInfo> &out_lane)
+{
+  for (pugi::xml_node lane = xmlNode.child("lane"); lane; lane = lane.next_sibling("lane"))
+  {
+    LaneInfo currentLane;
+
+    currentLane.attributes.type = toLaneType(lane.attribute("type").value());
+    currentLane.attributes.level = lane.attribute("level").value();
+    currentLane.attributes.id = std::atoi(lane.attribute("id").value());
+
+    ParseLaneSpeed(lane, currentLane.lane_speed);
+    ParseLaneWidth(lane, currentLane.lane_width);
+
+    ParseLaneLink(lane.child("link"), currentLane.link);
+    ParseLaneRoadMark(lane, currentLane.road_marker);
+
+    out_lane.emplace_back(std::move(currentLane));
+  }
+}
+
+void LaneParser::ParseLaneWidth(const pugi::xml_node &xmlNode, std::vector<LaneWidth> &out_lane_width)
+{
+  for (pugi::xml_node laneWidth = xmlNode.child("width"); laneWidth; laneWidth = laneWidth.next_sibling("width"))
+  {
+    LaneWidth laneWidthInfo;
+
+    laneWidthInfo.soffset = std::stod(laneWidth.attribute("sOffset").value());
+
+    laneWidthInfo.a = std::stod(laneWidth.attribute("a").value());
+    laneWidthInfo.b = std::stod(laneWidth.attribute("b").value());
+
+    laneWidthInfo.c = std::stod(laneWidth.attribute("c").value());
+    laneWidthInfo.d = std::stod(laneWidth.attribute("d").value());
+
+    out_lane_width.emplace_back(laneWidthInfo);
+  }
+}
+
+void LaneParser::ParseLaneLink(const pugi::xml_node &xmlNode, std::unique_ptr<LaneLink> &out_lane_link)
+{
+  const pugi::xml_node predecessorNode = xmlNode.child("predecessor");
+  const pugi::xml_node successorNode = xmlNode.child("successor");
+
+  out_lane_link = (predecessorNode || successorNode) ? std::make_unique<opendrive::LaneLink>() : nullptr;
+  if (out_lane_link == nullptr)
+  {
+    return;
+  }
+
+  out_lane_link->predecessor_id = predecessorNode ? std::atoi(predecessorNode.attribute("id").value()) : 0;
+  out_lane_link->successor_id = successorNode ? std::atoi(successorNode.attribute("id").value()) : 0;
+}
+
+void LaneParser::ParseLaneOffset(const pugi::xml_node &xmlNode, std::vector<LaneOffset> &out_lane_offset)
+{
+  LaneOffset lanesOffset;
+
+  lanesOffset.s = std::stod(xmlNode.attribute("s").value());
+  lanesOffset.a = std::stod(xmlNode.attribute("a").value());
+  lanesOffset.b = std::stod(xmlNode.attribute("b").value());
+  lanesOffset.c = std::stod(xmlNode.attribute("c").value());
+  lanesOffset.d = std::stod(xmlNode.attribute("d").value());
+
+  out_lane_offset.emplace_back(lanesOffset);
+}
+
+void LaneParser::ParseLaneRoadMark(const pugi::xml_node &xmlNode, std::vector<LaneRoadMark> &out_lane_mark)
+{
+  for (pugi::xml_node road_mark = xmlNode.child("roadMark"); road_mark; road_mark = road_mark.next_sibling("roadMark"))
+  {
+    LaneRoadMark roadMarker;
+
+    if (road_mark.attribute("sOffset") != nullptr)
+    {
+      roadMarker.soffset = std::stod(road_mark.attribute("sOffset").value());
+    }
+
+    if (road_mark.attribute("width") != nullptr)
+    {
+      roadMarker.width = std::stod(road_mark.attribute("width").value());
+    }
+
+    if (road_mark.attribute("type") != nullptr)
+    {
+      roadMarker.type = road_mark.attribute("type").value();
+    }
+
+    if (road_mark.attribute("weight") != nullptr)
+    {
+      roadMarker.weigth = road_mark.attribute("weight").value();
+    }
+
+    if (road_mark.attribute("material") != nullptr)
+    {
+      roadMarker.color = road_mark.attribute("material").value();
+    }
+
+    if (road_mark.attribute("color") != nullptr)
+    {
+      roadMarker.color = road_mark.attribute("color").value();
+    }
+
+    if (road_mark.attribute("laneChange") != nullptr)
+    {
+      roadMarker.lane_change = road_mark.attribute("laneChange").value();
+    }
+
+    out_lane_mark.emplace_back(roadMarker);
+  }
+}
+
+void LaneParser::ParseLaneSpeed(const pugi::xml_node &xmlNode, std::vector<LaneSpeed> &out_lane_speed)
+{
+  for (pugi::xml_node laneSpeed = xmlNode.child("speed"); laneSpeed; laneSpeed = laneSpeed.next_sibling("speed"))
+  {
+    LaneSpeed lane_speed = {0.0, 0.0, ""};
+
+    lane_speed.soffset = std::stod(laneSpeed.attribute("sOffset").value());
+    lane_speed.max_speed = std::stod(laneSpeed.attribute("max").value());
+    lane_speed.unit = laneSpeed.attribute("unit").value();
+
+    out_lane_speed.emplace_back(lane_speed);
+  }
+}
+
+void LaneParser::Parse(const pugi::xml_node &xmlNode, Lanes &out_lanes)
+{
+  LaneParser laneParser;
+
+  for (pugi::xml_node laneSection = xmlNode.child("laneOffset"); laneSection;
+       laneSection = laneSection.next_sibling("laneOffset"))
+  {
+    laneParser.ParseLaneOffset(laneSection, out_lanes.lane_offset);
+  }
+
+  for (pugi::xml_node laneSection = xmlNode.child("laneSection"); laneSection;
+       laneSection = laneSection.next_sibling("laneSection"))
+  {
+    LaneSection laneSec;
+    laneSec.start_position = std::stod(laneSection.attribute("s").value());
+    // until we know more, we set end to start
+    laneSec.end_position = laneSec.start_position;
+
+    pugi::xml_node lane = laneSection.child("left");
+    laneParser.ParseLane(lane, laneSec.left);
+
+    lane = laneSection.child("center");
+    laneParser.ParseLane(lane, laneSec.center);
+
+    lane = laneSection.child("right");
+    laneParser.ParseLane(lane, laneSec.right);
+
+    out_lanes.lane_sections.emplace_back(std::move(laneSec));
+  }
+}
+
+} // parser
+} // opendrive
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/OpenDriveParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/OpenDriveParser.cpp
new file mode 100644
index 0000000..e1461ef
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/OpenDriveParser.cpp
@@ -0,0 +1,142 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/OpenDriveParser.hpp"
+
+#include "opendrive/parser/GeoReferenceParser.h"
+#include "opendrive/parser/GeometryParser.h"
+#include "opendrive/parser/JunctionParser.h"
+#include "opendrive/parser/LaneParser.h"
+#include "opendrive/parser/ProfilesParser.h"
+#include "opendrive/parser/RoadLinkParser.h"
+#include "opendrive/parser/TrafficGroupParser.h"
+#include "opendrive/parser/TrafficSignParser.h"
+#include "opendrive/parser/TrafficSignalsParser.h"
+
+#include <pugixml.hpp>
+
+namespace opendrive {
+namespace parser {
+
+bool OpenDriveParser::Parse(const char *xml,
+                            opendrive::OpenDriveData &out_open_drive_data,
+                            XmlInputType inputType,
+                            std::string *out_error)
+{
+  namespace odp = opendrive::parser;
+
+  pugi::xml_document xmlDoc;
+  pugi::xml_parse_result pugiParseResult;
+
+  unsigned int const parse_options_ensure_no_doctype = pugi::parse_default & ~pugi::parse_doctype;
+  switch (inputType)
+  {
+    case XmlInputType::FILE:
+    {
+      pugiParseResult = xmlDoc.load_file(xml, parse_options_ensure_no_doctype);
+    }
+    break;
+
+    case XmlInputType::CONTENT:
+    {
+      pugiParseResult = xmlDoc.load_string(xml, parse_options_ensure_no_doctype);
+    }
+    break;
+
+    default:
+    {
+      // TODO: Log some kind of error
+      return false;
+    }
+    break;
+  }
+
+  if (pugiParseResult == false)
+  {
+    if (out_error != nullptr)
+    {
+      *out_error = pugiParseResult.description();
+    }
+
+    return false;
+  }
+
+  for (pugi::xml_node road = xmlDoc.child("OpenDRIVE").child("road"); road; road = road.next_sibling("road"))
+  {
+    opendrive::RoadInformation openDriveRoadInformation;
+
+    openDriveRoadInformation.attributes.name = road.attribute("name").value();
+    openDriveRoadInformation.attributes.id = std::atoi(road.attribute("id").value());
+    openDriveRoadInformation.attributes.length = std::stod(road.attribute("length").value());
+    openDriveRoadInformation.attributes.junction = std::atoi(road.attribute("junction").value());
+
+    // types
+    for (pugi::xml_node node_type : road.children("type"))
+    {
+      RoadTypeInfo type{0.0, ""};
+
+      type.s = node_type.attribute("s").as_double();
+      type.type = node_type.attribute("type").value();
+      openDriveRoadInformation.attributes.type.emplace_back(type);
+
+      // speed type
+      pugi::xml_node speed_node = node_type.child("speed");
+      if (speed_node)
+      {
+        RoadSpeed speed{0.0, 0.0, ""};
+        speed.s = type.s;
+        speed.max = speed_node.attribute("max").as_double();
+        speed.unit = speed_node.attribute("unit").value();
+        openDriveRoadInformation.attributes.speed.emplace_back(speed);
+      }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////////
+
+    odp::ProfilesParser::Parse(road, openDriveRoadInformation.road_profiles);
+
+    odp::RoadLinkParser::Parse(road.child("link"), openDriveRoadInformation.road_link);
+    odp::TrafficSignalsParser::Parse(road.child("signals"),
+                                     openDriveRoadInformation.traffic_signals,
+                                     openDriveRoadInformation.traffic_signal_references);
+
+    odp::LaneParser::Parse(road.child("lanes"), openDriveRoadInformation.lanes);
+    odp::GeometryParser::Parse(road.child("planView"), openDriveRoadInformation.geometry_attributes);
+
+    out_open_drive_data.roads.emplace_back(std::move(openDriveRoadInformation));
+  }
+
+  for (pugi::xml_node junction = xmlDoc.child("OpenDRIVE").child("junction"); junction;
+       junction = junction.next_sibling("junction"))
+  {
+    odp::JunctionParser::Parse(junction, out_open_drive_data.junctions);
+  }
+
+  for (pugi::xml_node tlgroup = xmlDoc.child("OpenDRIVE").child("tlGroup"); tlgroup;
+       tlgroup = tlgroup.next_sibling("tlGroup"))
+  {
+    odp::TrafficGroupParser::Parse(tlgroup, out_open_drive_data.trafficlightgroups);
+  }
+
+  for (pugi::xml_node trafficsigns = xmlDoc.child("OpenDRIVE").child("trafficsign"); trafficsigns;
+       trafficsigns = trafficsigns.next_sibling("trafficsign"))
+  {
+    odp::TrafficSignParser::Parse(trafficsigns, out_open_drive_data.trafficsigns);
+  }
+
+  out_open_drive_data.geoReference
+    = odp::GeoReferenceParser::Parse(xmlDoc.child("OpenDRIVE").child("header").child_value("geoReference"));
+
+  return true;
+}
+}
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/ProfilesParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/ProfilesParser.cpp
new file mode 100644
index 0000000..a4c0ec1
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/ProfilesParser.cpp
@@ -0,0 +1,57 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/ProfilesParser.h"
+
+void opendrive::parser::ProfilesParser::ParseElevation(const pugi::xml_node &xmlNode,
+                                                       std::vector<opendrive::ElevationProfile> &out_elevation_profile)
+{
+  for (pugi::xml_node laneSection = xmlNode.child("elevation"); laneSection;
+       laneSection = laneSection.next_sibling("elevation"))
+  {
+    opendrive::ElevationProfile elevationProfile;
+
+    elevationProfile.start_position = std::stod(laneSection.attribute("s").value());
+    elevationProfile.elevation = std::stod(laneSection.attribute("a").value());
+    elevationProfile.slope = std::stod(laneSection.attribute("b").value());
+    elevationProfile.vertical_curvature = std::stod(laneSection.attribute("c").value());
+    elevationProfile.curvature_change = std::stod(laneSection.attribute("d").value());
+
+    out_elevation_profile.emplace_back(elevationProfile);
+  }
+}
+
+void opendrive::parser::ProfilesParser::ParseLateral(const pugi::xml_node &xmlNode,
+                                                     std::vector<opendrive::LateralProfile> &out_lateral_profile)
+{
+  for (pugi::xml_node laneSection = xmlNode.child("superelevation"); laneSection;
+       laneSection = laneSection.next_sibling("superelevation"))
+  {
+    opendrive::LateralProfile lateralProfile;
+
+    lateralProfile.start_position = std::stod(laneSection.attribute("s").value());
+    lateralProfile.elevation = std::stod(laneSection.attribute("a").value());
+    lateralProfile.slope = std::stod(laneSection.attribute("b").value());
+    lateralProfile.vertical_curvature = std::stod(laneSection.attribute("c").value());
+    lateralProfile.curvature_change = std::stod(laneSection.attribute("d").value());
+
+    out_lateral_profile.emplace_back(lateralProfile);
+  }
+}
+
+void opendrive::parser::ProfilesParser::Parse(const pugi::xml_node &xmlNode, opendrive::RoadProfiles &out_road_profiles)
+{
+  opendrive::parser::ProfilesParser profilesParser;
+
+  profilesParser.ParseElevation(xmlNode.child("elevationProfile"), out_road_profiles.elevation_profile);
+  profilesParser.ParseLateral(xmlNode.child("lateralProfile"), out_road_profiles.lateral_profile);
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/RoadLinkParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/RoadLinkParser.cpp
new file mode 100644
index 0000000..d563bc6
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/RoadLinkParser.cpp
@@ -0,0 +1,71 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/RoadLinkParser.h"
+
+#include <cstdlib>
+
+opendrive::ElementType toElementType(std::string const elementType)
+{
+  if (elementType == "junction")
+  {
+    return opendrive::ElementType::Junction;
+  }
+  else if (elementType == "road")
+  {
+    return opendrive::ElementType::Road;
+  }
+
+  return opendrive::ElementType::Invalid;
+}
+
+opendrive::ContactPoint toContactPoint(std::string const contactPoint)
+{
+  if (contactPoint == "start")
+  {
+    return opendrive::ContactPoint::Start;
+  }
+  else if (contactPoint == "end")
+  {
+    return opendrive::ContactPoint::End;
+  }
+
+  return opendrive::ContactPoint::Invalid;
+}
+
+void opendrive::parser::RoadLinkParser::ParseLink(const pugi::xml_node &xmlNode,
+                                                  opendrive::RoadLinkInformation *out_link_information)
+{
+  out_link_information->id = std::atoi(xmlNode.attribute("elementId").value());
+  out_link_information->element_type = toElementType(xmlNode.attribute("elementType").value());
+  out_link_information->contact_point = toContactPoint(xmlNode.attribute("contactPoint").value());
+}
+
+void opendrive::parser::RoadLinkParser::Parse(const pugi::xml_node &xmlNode, opendrive::RoadLink &out_road_link)
+{
+  RoadLinkParser parser;
+
+  const pugi::xml_node predecessorNode = xmlNode.child("predecessor");
+  const pugi::xml_node successorNode = xmlNode.child("successor");
+
+  if (predecessorNode)
+  {
+    out_road_link.predecessor = std::make_unique<opendrive::RoadLinkInformation>();
+    parser.ParseLink(predecessorNode, out_road_link.predecessor.get());
+  }
+
+  if (successorNode)
+  {
+    out_road_link.successor = std::make_unique<opendrive::RoadLinkInformation>();
+    parser.ParseLink(successorNode, out_road_link.successor.get());
+  }
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficGroupParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficGroupParser.cpp
new file mode 100644
index 0000000..b2d8cae
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficGroupParser.cpp
@@ -0,0 +1,68 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/TrafficGroupParser.h"
+#include <iostream>
+
+void opendrive::parser::TrafficGroupParser::Parse(const pugi::xml_node &xmlNode,
+                                                  std::vector<opendrive::TrafficLightGroup> &out_trafficLights)
+{
+  opendrive::parser::TrafficGroupParser parser;
+  opendrive::TrafficLightGroup traffic_light_group;
+
+  traffic_light_group.red_time = std::atoi(xmlNode.attribute("redTime").value());
+  traffic_light_group.yellow_time = std::atoi(xmlNode.attribute("yellowTime").value());
+  traffic_light_group.green_time = std::atoi(xmlNode.attribute("greenTime").value());
+
+  parser.ParseTrafficLight(xmlNode, traffic_light_group.traffic_lights);
+  out_trafficLights.emplace_back(traffic_light_group);
+}
+
+void opendrive::parser::TrafficGroupParser::ParseTrafficLight(const pugi::xml_node &xmlNode,
+                                                              std::vector<opendrive::TrafficLight> &out_trafficLight)
+{
+  for (pugi::xml_node trafficlight = xmlNode.child("trafficlight"); trafficlight;
+       trafficlight = trafficlight.next_sibling("trafficlight"))
+  {
+    opendrive::TrafficLight jTrafficlight;
+
+    jTrafficlight.x_pos = std::stod(trafficlight.attribute("xPos").value());
+    jTrafficlight.y_pos = std::stod(trafficlight.attribute("yPos").value());
+    jTrafficlight.z_pos = std::stod(trafficlight.attribute("zPos").value());
+    jTrafficlight.x_rot = std::stod(trafficlight.attribute("xRot").value());
+    jTrafficlight.y_rot = std::stod(trafficlight.attribute("yRot").value());
+    jTrafficlight.z_rot = std::stod(trafficlight.attribute("zRot").value());
+
+    ParseBoxAreas(trafficlight, jTrafficlight.box_areas);
+
+    out_trafficLight.emplace_back(jTrafficlight);
+  }
+}
+
+void opendrive::parser::TrafficGroupParser::ParseBoxAreas(const pugi::xml_node &xmlNode,
+                                                          std::vector<opendrive::BoxComponent> &out_boxcomponent)
+{
+  for (pugi::xml_node boxcomponent = xmlNode.child("tfBox"); boxcomponent;
+       boxcomponent = boxcomponent.next_sibling("tfBox"))
+  {
+    opendrive::BoxComponent jBoxComponent;
+
+    jBoxComponent.x_pos = std::stod(boxcomponent.attribute("xPos").value());
+    jBoxComponent.y_pos = std::stod(boxcomponent.attribute("yPos").value());
+    jBoxComponent.z_pos = std::stod(boxcomponent.attribute("zPos").value());
+    jBoxComponent.x_rot = std::stod(boxcomponent.attribute("xRot").value());
+    jBoxComponent.y_rot = std::stod(boxcomponent.attribute("yRot").value());
+    jBoxComponent.z_rot = std::stod(boxcomponent.attribute("zRot").value());
+
+    out_boxcomponent.emplace_back(jBoxComponent);
+  }
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficSignParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficSignParser.cpp
new file mode 100644
index 0000000..5fedc50
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficSignParser.cpp
@@ -0,0 +1,51 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/TrafficSignParser.h"
+#include <iostream>
+
+void opendrive::parser::TrafficSignParser::Parse(const pugi::xml_node &xmlNode,
+                                                 std::vector<opendrive::TrafficSign> &out_trafficsigns)
+{
+  opendrive::parser::TrafficSignParser parser;
+  opendrive::TrafficSign trafficsign;
+
+  trafficsign.speed = std::atoi(xmlNode.attribute("speed").value());
+  trafficsign.x_pos = std::stod(xmlNode.attribute("xPos").value());
+  trafficsign.y_pos = std::stod(xmlNode.attribute("yPos").value());
+  trafficsign.z_pos = std::stod(xmlNode.attribute("zPos").value());
+  trafficsign.x_rot = std::stod(xmlNode.attribute("xRot").value());
+  trafficsign.y_rot = std::stod(xmlNode.attribute("yRot").value());
+  trafficsign.z_rot = std::stod(xmlNode.attribute("zRot").value());
+
+  parser.ParseBoxAreas(xmlNode, trafficsign.box_areas);
+  out_trafficsigns.emplace_back(trafficsign);
+}
+
+void opendrive::parser::TrafficSignParser::ParseBoxAreas(const pugi::xml_node &xmlNode,
+                                                         std::vector<opendrive::BoxComponent> &out_boxcomponent)
+{
+  for (pugi::xml_node boxcomponent = xmlNode.child("tsBox"); boxcomponent;
+       boxcomponent = boxcomponent.next_sibling("tsBox"))
+  {
+    opendrive::BoxComponent jBoxComponent;
+
+    jBoxComponent.x_pos = std::stod(boxcomponent.attribute("xPos").value());
+    jBoxComponent.y_pos = std::stod(boxcomponent.attribute("yPos").value());
+    jBoxComponent.z_pos = std::stod(boxcomponent.attribute("zPos").value());
+    jBoxComponent.x_rot = std::stod(boxcomponent.attribute("xRot").value());
+    jBoxComponent.y_rot = std::stod(boxcomponent.attribute("yRot").value());
+    jBoxComponent.z_rot = std::stod(boxcomponent.attribute("zRot").value());
+
+    out_boxcomponent.emplace_back(jBoxComponent);
+  }
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficSignalsParser.cpp b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficSignalsParser.cpp
new file mode 100644
index 0000000..4a8bdbf
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/opendrive_reader/src/parser/TrafficSignalsParser.cpp
@@ -0,0 +1,56 @@
+/*
+ * ----------------- BEGIN LICENSE BLOCK ---------------------------------
+ *
+ * Copyright (c) 2017 Computer Vision Center (CVC) at the Universitat Autonoma
+ * de Barcelona (UAB).
+ * Copyright (C) 2019 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * ----------------- END LICENSE BLOCK -----------------------------------
+ */
+
+#include "opendrive/parser/TrafficSignalsParser.h"
+#include <iostream>
+
+void opendrive::parser::TrafficSignalsParser::Parse(
+  const pugi::xml_node &xmlNode,
+  std::vector<opendrive::TrafficSignalInformation> &out_traffic_signals,
+  std::vector<opendrive::TrafficSignalReference> &out_traffic_signal_references)
+{
+  for (pugi::xml_node signal = xmlNode.child("signal"); signal; signal = signal.next_sibling("signal"))
+  {
+    opendrive::TrafficSignalInformation trafficSignalInformation;
+
+    trafficSignalInformation.id = std::atoi(signal.attribute("id").value());
+
+    trafficSignalInformation.start_position = std::stod(signal.attribute("s").value());
+    trafficSignalInformation.track_position = std::stod(signal.attribute("t").value());
+
+    trafficSignalInformation.zoffset = std::stod(signal.attribute("zOffset").value());
+
+    trafficSignalInformation.value = signal.attribute("value").as_double();
+
+    trafficSignalInformation.name = signal.attribute("name").value();
+    trafficSignalInformation.dynamic = signal.attribute("dynamic").value();
+    trafficSignalInformation.orientation = signal.attribute("orientation").value();
+
+    trafficSignalInformation.type = signal.attribute("type").value();
+    trafficSignalInformation.subtype = signal.attribute("subtype").value();
+    trafficSignalInformation.country = signal.attribute("country").value();
+
+    out_traffic_signals.emplace_back(trafficSignalInformation);
+  }
+
+  for (pugi::xml_node signal = xmlNode.child("signalReference"); signal;
+       signal = signal.next_sibling("signalReference"))
+  {
+    opendrive::TrafficSignalReference trafficSignalReference;
+
+    trafficSignalReference.id = std::atoi(signal.attribute("id").value());
+    trafficSignalReference.start_position = std::stod(signal.attribute("s").value());
+    trafficSignalReference.track_position = std::stod(signal.attribute("t").value());
+    trafficSignalReference.orientation = signal.attribute("orientation").value();
+    out_traffic_signal_references.emplace_back(trafficSignalReference);
+  }
+}
diff --git a/Source/UnrealSoda/Private/ThirdParty/pugixml/LICENSE.md b/Source/UnrealSoda/Private/ThirdParty/pugixml/LICENSE.md
new file mode 100644
index 0000000..91bdfc1
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/pugixml/LICENSE.md
@@ -0,0 +1,24 @@
+MIT License
+
+Copyright (c) 2006-2023 Arseny Kapoulkine
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/Source/UnrealSoda/Private/ThirdParty/pugixml/pugiconfig.hpp b/Source/UnrealSoda/Private/ThirdParty/pugixml/pugiconfig.hpp
new file mode 100644
index 0000000..c9c40e2
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/pugixml/pugiconfig.hpp
@@ -0,0 +1,77 @@
+/**
+ * pugixml parser - version 1.10
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at https://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef HEADER_PUGICONFIG_HPP
+#define HEADER_PUGICONFIG_HPP
+
+// Uncomment this to enable wchar_t mode
+// #define PUGIXML_WCHAR_MODE
+
+// Uncomment this to enable compact mode
+// #define PUGIXML_COMPACT
+
+// Uncomment this to disable XPath
+// #define PUGIXML_NO_XPATH
+
+// Uncomment this to disable STL
+// #define PUGIXML_NO_STL
+
+// Uncomment this to disable exceptions
+// #define PUGIXML_NO_EXCEPTIONS
+
+// Set this to control attributes for public classes/functions, i.e.:
+// #define PUGIXML_API __declspec(dllexport) // to export all public symbols from DLL
+// #define PUGIXML_CLASS __declspec(dllimport) // to import all classes from DLL
+// #define PUGIXML_FUNCTION __fastcall // to set calling conventions to all public functions to fastcall
+// In absence of PUGIXML_CLASS/PUGIXML_FUNCTION definitions PUGIXML_API is used instead
+
+// Tune these constants to adjust memory-related behavior
+// #define PUGIXML_MEMORY_PAGE_SIZE 32768
+// #define PUGIXML_MEMORY_OUTPUT_STACK 10240
+// #define PUGIXML_MEMORY_XPATH_PAGE_SIZE 4096
+
+// Tune this constant to adjust max nesting for XPath queries
+// #define PUGIXML_XPATH_DEPTH_LIMIT 1024
+
+// Uncomment this to switch to header-only version
+// #define PUGIXML_HEADER_ONLY
+
+// Uncomment this to enable long long support
+// #define PUGIXML_HAS_LONG_LONG
+
+#endif
+
+/**
+ * Copyright (c) 2006-2019 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/Source/UnrealSoda/Private/ThirdParty/pugixml/pugixml.cpp b/Source/UnrealSoda/Private/ThirdParty/pugixml/pugixml.cpp
new file mode 100644
index 0000000..5a665a3
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/pugixml/pugixml.cpp
@@ -0,0 +1,13005 @@
+/**
+ * pugixml parser - version 1.10
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at https://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef SOURCE_PUGIXML_CPP
+#define SOURCE_PUGIXML_CPP
+
+#include "pugixml.hpp"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+
+#ifdef PUGIXML_WCHAR_MODE
+#	include <wchar.h>
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+#	include <math.h>
+#	include <float.h>
+#endif
+
+#ifndef PUGIXML_NO_STL
+#	include <istream>
+#	include <ostream>
+#	include <string>
+#endif
+
+// For placement new
+#include <new>
+
+#ifdef _MSC_VER
+#	pragma warning(push)
+#	pragma warning(disable: 4127) // conditional expression is constant
+#	pragma warning(disable: 4324) // structure was padded due to __declspec(align())
+#	pragma warning(disable: 4702) // unreachable code
+#	pragma warning(disable: 4996) // this function or variable may be unsafe
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic push
+#	pragma clang diagnostic ignored "-Wdeprecated" // this function or variable may be unsafe
+#endif
+
+#ifdef __INTEL_COMPILER
+#	pragma warning(disable: 177) // function was declared but never referenced
+#	pragma warning(disable: 279) // controlling expression is constant
+#	pragma warning(disable: 1478 1786) // function was declared "deprecated"
+#	pragma warning(disable: 1684) // conversion from pointer to same-sized integral type
+#endif
+
+#if defined(__BORLANDC__) && defined(PUGIXML_HEADER_ONLY)
+#	pragma warn -8080 // symbol is declared but never used; disabling this inside push/pop bracket does not make the warning go away
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option push
+#	pragma warn -8008 // condition is always false
+#	pragma warn -8066 // unreachable code
+#endif
+
+#ifdef __SNC__
+// Using diag_push/diag_pop does not disable the warnings inside templates due to a compiler bug
+#	pragma diag_suppress=178 // function was declared but never referenced
+#	pragma diag_suppress=237 // controlling expression is constant
+#endif
+
+#ifdef __TI_COMPILER_VERSION__
+#	pragma diag_suppress 179 // function was declared but never referenced
+#endif
+
+// Inlining controls
+#if defined(_MSC_VER) && _MSC_VER >= 1300
+#	define PUGI__NO_INLINE __declspec(noinline)
+#elif defined(__GNUC__)
+#	define PUGI__NO_INLINE __attribute__((noinline))
+#else
+#	define PUGI__NO_INLINE
+#endif
+
+// Branch weight controls
+#if defined(__GNUC__) && !defined(__c2__)
+#	define PUGI__UNLIKELY(cond) __builtin_expect(cond, 0)
+#else
+#	define PUGI__UNLIKELY(cond) (cond)
+#endif
+
+// Simple static assertion
+#define PUGI__STATIC_ASSERT(cond) { static const char condition_failed[(cond) ? 1 : -1] = {0}; (void)condition_failed[0]; }
+
+// Digital Mars C++ bug workaround for passing char loaded from memory via stack
+#ifdef __DMC__
+#	define PUGI__DMC_VOLATILE volatile
+#else
+#	define PUGI__DMC_VOLATILE
+#endif
+
+// Integer sanitizer workaround; we only apply this for clang since gcc8 has no_sanitize but not unsigned-integer-overflow and produces "attribute directive ignored" warnings
+#if defined(__clang__) && defined(__has_attribute)
+#	if __has_attribute(no_sanitize)
+#		define PUGI__UNSIGNED_OVERFLOW __attribute__((no_sanitize("unsigned-integer-overflow")))
+#	else
+#		define PUGI__UNSIGNED_OVERFLOW
+#	endif
+#else
+#	define PUGI__UNSIGNED_OVERFLOW
+#endif
+
+// Borland C++ bug workaround for not defining ::memcpy depending on header include order (can't always use std::memcpy because some compilers don't have it at all)
+#if defined(__BORLANDC__) && !defined(__MEM_H_USING_LIST)
+using std::memcpy;
+using std::memmove;
+using std::memset;
+#endif
+
+// Some MinGW/GCC versions have headers that erroneously omit LLONG_MIN/LLONG_MAX/ULLONG_MAX definitions from limits.h in some configurations
+#if defined(PUGIXML_HAS_LONG_LONG) && defined(__GNUC__) && !defined(LLONG_MAX) && !defined(LLONG_MIN) && !defined(ULLONG_MAX)
+#	define LLONG_MIN (-LLONG_MAX - 1LL)
+#	define LLONG_MAX __LONG_LONG_MAX__
+#	define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+#endif
+
+// In some environments MSVC is a compiler but the CRT lacks certain MSVC-specific features
+#if defined(_MSC_VER) && !defined(__S3E__)
+#	define PUGI__MSVC_CRT_VERSION _MSC_VER
+#endif
+
+// Not all platforms have snprintf; we define a wrapper that uses snprintf if possible. This only works with buffers with a known size.
+#if __cplusplus >= 201103
+#	define PUGI__SNPRINTF(buf, ...) snprintf(buf, sizeof(buf), __VA_ARGS__)
+#elif defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400
+#	define PUGI__SNPRINTF(buf, ...) _snprintf_s(buf, _countof(buf), _TRUNCATE, __VA_ARGS__)
+#else
+#	define PUGI__SNPRINTF sprintf
+#endif
+
+// We put implementation details into an anonymous namespace in source mode, but have to keep it in non-anonymous namespace in header-only mode to prevent binary bloat.
+#ifdef PUGIXML_HEADER_ONLY
+#	define PUGI__NS_BEGIN namespace pugi { namespace impl {
+#	define PUGI__NS_END } }
+#	define PUGI__FN inline
+#	define PUGI__FN_NO_INLINE inline
+#else
+#	if defined(_MSC_VER) && _MSC_VER < 1300 // MSVC6 seems to have an amusing bug with anonymous namespaces inside namespaces
+#		define PUGI__NS_BEGIN namespace pugi { namespace impl {
+#		define PUGI__NS_END } }
+#	else
+#		define PUGI__NS_BEGIN namespace pugi { namespace impl { namespace {
+#		define PUGI__NS_END } } }
+#	endif
+#	define PUGI__FN
+#	define PUGI__FN_NO_INLINE PUGI__NO_INLINE
+#endif
+
+// uintptr_t
+#if (defined(_MSC_VER) && _MSC_VER < 1600) || (defined(__BORLANDC__) && __BORLANDC__ < 0x561)
+namespace pugi
+{
+#	ifndef _UINTPTR_T_DEFINED
+	typedef size_t uintptr_t;
+#	endif
+
+	typedef unsigned __int8 uint8_t;
+	typedef unsigned __int16 uint16_t;
+	typedef unsigned __int32 uint32_t;
+}
+#else
+#	include <stdint.h>
+#endif
+
+// Memory allocation
+PUGI__NS_BEGIN
+	PUGI__FN void* default_allocate(size_t size)
+	{
+		return malloc(size);
+	}
+
+	PUGI__FN void default_deallocate(void* ptr)
+	{
+		free(ptr);
+	}
+
+	template <typename T>
+	struct xml_memory_management_function_storage
+	{
+		static allocation_function allocate;
+		static deallocation_function deallocate;
+	};
+
+	// Global allocation functions are stored in class statics so that in header mode linker deduplicates them
+	// Without a template<> we'll get multiple definitions of the same static
+	template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate;
+	template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
+
+	typedef xml_memory_management_function_storage<int> xml_memory;
+PUGI__NS_END
+
+// String utilities
+PUGI__NS_BEGIN
+	// Get string length
+	PUGI__FN size_t strlength(const char_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		return strlen(s);
+	#endif
+	}
+
+	// Compare two strings
+	PUGI__FN bool strequal(const char_t* src, const char_t* dst)
+	{
+		assert(src && dst);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcscmp(src, dst) == 0;
+	#else
+		return strcmp(src, dst) == 0;
+	#endif
+	}
+
+	// Compare lhs with [rhs_begin, rhs_end)
+	PUGI__FN bool strequalrange(const char_t* lhs, const char_t* rhs, size_t count)
+	{
+		for (size_t i = 0; i < count; ++i)
+			if (lhs[i] != rhs[i])
+				return false;
+
+		return lhs[count] == 0;
+	}
+
+	// Get length of wide string, even if CRT lacks wide character support
+	PUGI__FN size_t strlength_wide(const wchar_t* s)
+	{
+		assert(s);
+
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcslen(s);
+	#else
+		const wchar_t* end = s;
+		while (*end) end++;
+		return static_cast<size_t>(end - s);
+	#endif
+	}
+PUGI__NS_END
+
+// auto_ptr-like object for exception recovery
+PUGI__NS_BEGIN
+	template <typename T> struct auto_deleter
+	{
+		typedef void (*D)(T*);
+
+		T* data;
+		D deleter;
+
+		auto_deleter(T* data_, D deleter_): data(data_), deleter(deleter_)
+		{
+		}
+
+		~auto_deleter()
+		{
+			if (data) deleter(data);
+		}
+
+		T* release()
+		{
+			T* result = data;
+			data = 0;
+			return result;
+		}
+	};
+PUGI__NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI__NS_BEGIN
+	class compact_hash_table
+	{
+	public:
+		compact_hash_table(): _items(0), _capacity(0), _count(0)
+		{
+		}
+
+		void clear()
+		{
+			if (_items)
+			{
+				xml_memory::deallocate(_items);
+				_items = 0;
+				_capacity = 0;
+				_count = 0;
+			}
+		}
+
+		void* find(const void* key)
+		{
+			if (_capacity == 0) return 0;
+
+			item_t* item = get_item(key);
+			assert(item);
+			assert(item->key == key || (item->key == 0 && item->value == 0));
+
+			return item->value;
+		}
+
+		void insert(const void* key, void* value)
+		{
+			assert(_capacity != 0 && _count < _capacity - _capacity / 4);
+
+			item_t* item = get_item(key);
+			assert(item);
+
+			if (item->key == 0)
+			{
+				_count++;
+				item->key = key;
+			}
+
+			item->value = value;
+		}
+
+		bool reserve(size_t extra = 16)
+		{
+			if (_count + extra >= _capacity - _capacity / 4)
+				return rehash(_count + extra);
+
+			return true;
+		}
+
+	private:
+		struct item_t
+		{
+			const void* key;
+			void* value;
+		};
+
+		item_t* _items;
+		size_t _capacity;
+
+		size_t _count;
+
+		bool rehash(size_t count);
+
+		item_t* get_item(const void* key)
+		{
+			assert(key);
+			assert(_capacity > 0);
+
+			size_t hashmod = _capacity - 1;
+			size_t bucket = hash(key) & hashmod;
+
+			for (size_t probe = 0; probe <= hashmod; ++probe)
+			{
+				item_t& probe_item = _items[bucket];
+
+				if (probe_item.key == key || probe_item.key == 0)
+					return &probe_item;
+
+				// hash collision, quadratic probing
+				bucket = (bucket + probe + 1) & hashmod;
+			}
+
+			assert(false && "Hash table is full"); // unreachable
+			return 0;
+		}
+
+		static PUGI__UNSIGNED_OVERFLOW unsigned int hash(const void* key)
+		{
+			unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key) & 0xffffffff);
+
+			// MurmurHash3 32-bit finalizer
+			h ^= h >> 16;
+			h *= 0x85ebca6bu;
+			h ^= h >> 13;
+			h *= 0xc2b2ae35u;
+			h ^= h >> 16;
+
+			return h;
+		}
+	};
+
+	PUGI__FN_NO_INLINE bool compact_hash_table::rehash(size_t count)
+	{
+		size_t capacity = 32;
+		while (count >= capacity - capacity / 4)
+			capacity *= 2;
+
+		compact_hash_table rt;
+		rt._capacity = capacity;
+		rt._items = static_cast<item_t*>(xml_memory::allocate(sizeof(item_t) * capacity));
+
+		if (!rt._items)
+			return false;
+
+		memset(rt._items, 0, sizeof(item_t) * capacity);
+
+		for (size_t i = 0; i < _capacity; ++i)
+			if (_items[i].key)
+				rt.insert(_items[i].key, _items[i].value);
+
+		if (_items)
+			xml_memory::deallocate(_items);
+
+		_capacity = capacity;
+		_items = rt._items;
+
+		assert(_count == rt._count);
+
+		return true;
+	}
+
+PUGI__NS_END
+#endif
+
+PUGI__NS_BEGIN
+#ifdef PUGIXML_COMPACT
+	static const uintptr_t xml_memory_block_alignment = 4;
+#else
+	static const uintptr_t xml_memory_block_alignment = sizeof(void*);
+#endif
+
+	// extra metadata bits
+	static const uintptr_t xml_memory_page_contents_shared_mask = 64;
+	static const uintptr_t xml_memory_page_name_allocated_mask = 32;
+	static const uintptr_t xml_memory_page_value_allocated_mask = 16;
+	static const uintptr_t xml_memory_page_type_mask = 15;
+
+	// combined masks for string uniqueness
+	static const uintptr_t xml_memory_page_name_allocated_or_shared_mask = xml_memory_page_name_allocated_mask | xml_memory_page_contents_shared_mask;
+	static const uintptr_t xml_memory_page_value_allocated_or_shared_mask = xml_memory_page_value_allocated_mask | xml_memory_page_contents_shared_mask;
+
+#ifdef PUGIXML_COMPACT
+	#define PUGI__GETHEADER_IMPL(object, page, flags) // unused
+	#define PUGI__GETPAGE_IMPL(header) (header).get_page()
+#else
+	#define PUGI__GETHEADER_IMPL(object, page, flags) (((reinterpret_cast<char*>(object) - reinterpret_cast<char*>(page)) << 8) | (flags))
+	// this macro casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+	#define PUGI__GETPAGE_IMPL(header) static_cast<impl::xml_memory_page*>(const_cast<void*>(static_cast<const void*>(reinterpret_cast<const char*>(&header) - (header >> 8))))
+#endif
+
+	#define PUGI__GETPAGE(n) PUGI__GETPAGE_IMPL((n)->header)
+	#define PUGI__NODETYPE(n) static_cast<xml_node_type>((n)->header & impl::xml_memory_page_type_mask)
+
+	struct xml_allocator;
+
+	struct xml_memory_page
+	{
+		static xml_memory_page* construct(void* memory)
+		{
+			xml_memory_page* result = static_cast<xml_memory_page*>(memory);
+
+			result->allocator = 0;
+			result->prev = 0;
+			result->next = 0;
+			result->busy_size = 0;
+			result->freed_size = 0;
+
+		#ifdef PUGIXML_COMPACT
+			result->compact_string_base = 0;
+			result->compact_shared_parent = 0;
+			result->compact_page_marker = 0;
+		#endif
+
+			return result;
+		}
+
+		xml_allocator* allocator;
+
+		xml_memory_page* prev;
+		xml_memory_page* next;
+
+		size_t busy_size;
+		size_t freed_size;
+
+	#ifdef PUGIXML_COMPACT
+		char_t* compact_string_base;
+		void* compact_shared_parent;
+		uint32_t* compact_page_marker;
+	#endif
+	};
+
+	static const size_t xml_memory_page_size =
+	#ifdef PUGIXML_MEMORY_PAGE_SIZE
+		(PUGIXML_MEMORY_PAGE_SIZE)
+	#else
+		32768
+	#endif
+		- sizeof(xml_memory_page);
+
+	struct xml_memory_string_header
+	{
+		uint16_t page_offset; // offset from page->data
+		uint16_t full_size; // 0 if string occupies whole page
+	};
+
+	struct xml_allocator
+	{
+		xml_allocator(xml_memory_page* root): _root(root), _busy_size(root->busy_size)
+		{
+		#ifdef PUGIXML_COMPACT
+			_hash = 0;
+		#endif
+		}
+
+		xml_memory_page* allocate_page(size_t data_size)
+		{
+			size_t size = sizeof(xml_memory_page) + data_size;
+
+			// allocate block with some alignment, leaving memory for worst-case padding
+			void* memory = xml_memory::allocate(size);
+			if (!memory) return 0;
+
+			// prepare page structure
+			xml_memory_page* page = xml_memory_page::construct(memory);
+			assert(page);
+
+			page->allocator = _root->allocator;
+
+			return page;
+		}
+
+		static void deallocate_page(xml_memory_page* page)
+		{
+			xml_memory::deallocate(page);
+		}
+
+		void* allocate_memory_oob(size_t size, xml_memory_page*& out_page);
+
+		void* allocate_memory(size_t size, xml_memory_page*& out_page)
+		{
+			if (PUGI__UNLIKELY(_busy_size + size > xml_memory_page_size))
+				return allocate_memory_oob(size, out_page);
+
+			void* buf = reinterpret_cast<char*>(_root) + sizeof(xml_memory_page) + _busy_size;
+
+			_busy_size += size;
+
+			out_page = _root;
+
+			return buf;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			void* result = allocate_memory(size + sizeof(uint32_t), out_page);
+			if (!result) return 0;
+
+			// adjust for marker
+			ptrdiff_t offset = static_cast<char*>(result) - reinterpret_cast<char*>(out_page->compact_page_marker);
+
+			if (PUGI__UNLIKELY(static_cast<uintptr_t>(offset) >= 256 * xml_memory_block_alignment))
+			{
+				// insert new marker
+				uint32_t* marker = static_cast<uint32_t*>(result);
+
+				*marker = static_cast<uint32_t>(reinterpret_cast<char*>(marker) - reinterpret_cast<char*>(out_page));
+				out_page->compact_page_marker = marker;
+
+				// since we don't reuse the page space until we reallocate it, we can just pretend that we freed the marker block
+				// this will make sure deallocate_memory correctly tracks the size
+				out_page->freed_size += sizeof(uint32_t);
+
+				return marker + 1;
+			}
+			else
+			{
+				// roll back uint32_t part
+				_busy_size -= sizeof(uint32_t);
+
+				return result;
+			}
+		}
+	#else
+		void* allocate_object(size_t size, xml_memory_page*& out_page)
+		{
+			return allocate_memory(size, out_page);
+		}
+	#endif
+
+		void deallocate_memory(void* ptr, size_t size, xml_memory_page* page)
+		{
+			if (page == _root) page->busy_size = _busy_size;
+
+			assert(ptr >= reinterpret_cast<char*>(page) + sizeof(xml_memory_page) && ptr < reinterpret_cast<char*>(page) + sizeof(xml_memory_page) + page->busy_size);
+			(void)!ptr;
+
+			page->freed_size += size;
+			assert(page->freed_size <= page->busy_size);
+
+			if (page->freed_size == page->busy_size)
+			{
+				if (page->next == 0)
+				{
+					assert(_root == page);
+
+					// top page freed, just reset sizes
+					page->busy_size = 0;
+					page->freed_size = 0;
+
+				#ifdef PUGIXML_COMPACT
+					// reset compact state to maximize efficiency
+					page->compact_string_base = 0;
+					page->compact_shared_parent = 0;
+					page->compact_page_marker = 0;
+				#endif
+
+					_busy_size = 0;
+				}
+				else
+				{
+					assert(_root != page);
+					assert(page->prev);
+
+					// remove from the list
+					page->prev->next = page->next;
+					page->next->prev = page->prev;
+
+					// deallocate
+					deallocate_page(page);
+				}
+			}
+		}
+
+		char_t* allocate_string(size_t length)
+		{
+			static const size_t max_encoded_offset = (1 << 16) * xml_memory_block_alignment;
+
+			PUGI__STATIC_ASSERT(xml_memory_page_size <= max_encoded_offset);
+
+			// allocate memory for string and header block
+			size_t size = sizeof(xml_memory_string_header) + length * sizeof(char_t);
+
+			// round size up to block alignment boundary
+			size_t full_size = (size + (xml_memory_block_alignment - 1)) & ~(xml_memory_block_alignment - 1);
+
+			xml_memory_page* page;
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(allocate_memory(full_size, page));
+
+			if (!header) return 0;
+
+			// setup header
+			ptrdiff_t page_offset = reinterpret_cast<char*>(header) - reinterpret_cast<char*>(page) - sizeof(xml_memory_page);
+
+			assert(page_offset % xml_memory_block_alignment == 0);
+			assert(page_offset >= 0 && static_cast<size_t>(page_offset) < max_encoded_offset);
+			header->page_offset = static_cast<uint16_t>(static_cast<size_t>(page_offset) / xml_memory_block_alignment);
+
+			// full_size == 0 for large strings that occupy the whole page
+			assert(full_size % xml_memory_block_alignment == 0);
+			assert(full_size < max_encoded_offset || (page->busy_size == full_size && page_offset == 0));
+			header->full_size = static_cast<uint16_t>(full_size < max_encoded_offset ? full_size / xml_memory_block_alignment : 0);
+
+			// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+			// header is guaranteed a pointer-sized alignment, which should be enough for char_t
+			return static_cast<char_t*>(static_cast<void*>(header + 1));
+		}
+
+		void deallocate_string(char_t* string)
+		{
+			// this function casts pointers through void* to avoid 'cast increases required alignment of target type' warnings
+			// we're guaranteed the proper (pointer-sized) alignment on the input string if it was allocated via allocate_string
+
+			// get header
+			xml_memory_string_header* header = static_cast<xml_memory_string_header*>(static_cast<void*>(string)) - 1;
+			assert(header);
+
+			// deallocate
+			size_t page_offset = sizeof(xml_memory_page) + header->page_offset * xml_memory_block_alignment;
+			xml_memory_page* page = reinterpret_cast<xml_memory_page*>(static_cast<void*>(reinterpret_cast<char*>(header) - page_offset));
+
+			// if full_size == 0 then this string occupies the whole page
+			size_t full_size = header->full_size == 0 ? page->busy_size : header->full_size * xml_memory_block_alignment;
+
+			deallocate_memory(header, full_size, page);
+		}
+
+		bool reserve()
+		{
+		#ifdef PUGIXML_COMPACT
+			return _hash->reserve();
+		#else
+			return true;
+		#endif
+		}
+
+		xml_memory_page* _root;
+		size_t _busy_size;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table* _hash;
+	#endif
+	};
+
+	PUGI__FN_NO_INLINE void* xml_allocator::allocate_memory_oob(size_t size, xml_memory_page*& out_page)
+	{
+		const size_t large_allocation_threshold = xml_memory_page_size / 4;
+
+		xml_memory_page* page = allocate_page(size <= large_allocation_threshold ? xml_memory_page_size : size);
+		out_page = page;
+
+		if (!page) return 0;
+
+		if (size <= large_allocation_threshold)
+		{
+			_root->busy_size = _busy_size;
+
+			// insert page at the end of linked list
+			page->prev = _root;
+			_root->next = page;
+			_root = page;
+
+			_busy_size = size;
+		}
+		else
+		{
+			// insert page before the end of linked list, so that it is deleted as soon as possible
+			// the last page is not deleted even if it's empty (see deallocate_memory)
+			assert(_root->prev);
+
+			page->prev = _root->prev;
+			page->next = _root;
+
+			_root->prev->next = page;
+			_root->prev = page;
+
+			page->busy_size = size;
+		}
+
+		return reinterpret_cast<char*>(page) + sizeof(xml_memory_page);
+	}
+PUGI__NS_END
+
+#ifdef PUGIXML_COMPACT
+PUGI__NS_BEGIN
+	static const uintptr_t compact_alignment_log2 = 2;
+	static const uintptr_t compact_alignment = 1 << compact_alignment_log2;
+
+	class compact_header
+	{
+	public:
+		compact_header(xml_memory_page* page, unsigned int flags)
+		{
+			PUGI__STATIC_ASSERT(xml_memory_block_alignment == compact_alignment);
+
+			ptrdiff_t offset = (reinterpret_cast<char*>(this) - reinterpret_cast<char*>(page->compact_page_marker));
+			assert(offset % compact_alignment == 0 && static_cast<uintptr_t>(offset) < 256 * compact_alignment);
+
+			_page = static_cast<unsigned char>(offset >> compact_alignment_log2);
+			_flags = static_cast<unsigned char>(flags);
+		}
+
+		void operator&=(uintptr_t mod)
+		{
+			_flags &= static_cast<unsigned char>(mod);
+		}
+
+		void operator|=(uintptr_t mod)
+		{
+			_flags |= static_cast<unsigned char>(mod);
+		}
+
+		uintptr_t operator&(uintptr_t mod) const
+		{
+			return _flags & mod;
+		}
+
+		xml_memory_page* get_page() const
+		{
+			// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+			const char* page_marker = reinterpret_cast<const char*>(this) - (_page << compact_alignment_log2);
+			const char* page = page_marker - *reinterpret_cast<const uint32_t*>(static_cast<const void*>(page_marker));
+
+			return const_cast<xml_memory_page*>(reinterpret_cast<const xml_memory_page*>(static_cast<const void*>(page)));
+		}
+
+	private:
+		unsigned char _page;
+		unsigned char _flags;
+	};
+
+	PUGI__FN xml_memory_page* compact_get_page(const void* object, int header_offset)
+	{
+		const compact_header* header = reinterpret_cast<const compact_header*>(static_cast<const char*>(object) - header_offset);
+
+		return header->get_page();
+	}
+
+	template <int header_offset, typename T> PUGI__FN_NO_INLINE T* compact_get_value(const void* object)
+	{
+		return static_cast<T*>(compact_get_page(object, header_offset)->allocator->_hash->find(object));
+	}
+
+	template <int header_offset, typename T> PUGI__FN_NO_INLINE void compact_set_value(const void* object, T* value)
+	{
+		compact_get_page(object, header_offset)->allocator->_hash->insert(object, value);
+	}
+
+	template <typename T, int header_offset, int start = -126> class compact_pointer
+	{
+	public:
+		compact_pointer(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift rounding for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) - start;
+
+				if (static_cast<uintptr_t>(offset) <= 253)
+					_data = static_cast<unsigned char>(offset + 1);
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+				_data = 0;
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 + start) * compact_alignment);
+				}
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		unsigned char _data;
+	};
+
+	template <typename T, int header_offset> class compact_pointer_parent
+	{
+	public:
+		compact_pointer_parent(): _data(0)
+		{
+		}
+
+		void operator=(const compact_pointer_parent& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(T* value)
+		{
+			if (value)
+			{
+				// value is guaranteed to be compact-aligned; 'this' is not
+				// our decoding is based on 'this' aligned to compact alignment downwards (see operator T*)
+				// so for negative offsets (e.g. -3) we need to adjust the diff by compact_alignment - 1 to
+				// compensate for arithmetic shift behavior for negative values
+				ptrdiff_t diff = reinterpret_cast<char*>(value) - reinterpret_cast<char*>(this);
+				ptrdiff_t offset = ((diff + int(compact_alignment - 1)) >> compact_alignment_log2) + 65533;
+
+				if (static_cast<uintptr_t>(offset) <= 65533)
+				{
+					_data = static_cast<unsigned short>(offset + 1);
+				}
+				else
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					if (PUGI__UNLIKELY(page->compact_shared_parent == 0))
+						page->compact_shared_parent = value;
+
+					if (page->compact_shared_parent == value)
+					{
+						_data = 65534;
+					}
+					else
+					{
+						compact_set_value<header_offset>(this, value);
+
+						_data = 65535;
+					}
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator T*() const
+		{
+			if (_data)
+			{
+				if (_data < 65534)
+				{
+					uintptr_t base = reinterpret_cast<uintptr_t>(this) & ~(compact_alignment - 1);
+
+					return reinterpret_cast<T*>(base + (_data - 1 - 65533) * compact_alignment);
+				}
+				else if (_data == 65534)
+					return static_cast<T*>(compact_get_page(this, header_offset)->compact_shared_parent);
+				else
+					return compact_get_value<header_offset, T>(this);
+			}
+			else
+				return 0;
+		}
+
+		T* operator->() const
+		{
+			return *this;
+		}
+
+	private:
+		uint16_t _data;
+	};
+
+	template <int header_offset, int base_offset> class compact_string
+	{
+	public:
+		compact_string(): _data(0)
+		{
+		}
+
+		void operator=(const compact_string& rhs)
+		{
+			*this = rhs + 0;
+		}
+
+		void operator=(char_t* value)
+		{
+			if (value)
+			{
+				xml_memory_page* page = compact_get_page(this, header_offset);
+
+				if (PUGI__UNLIKELY(page->compact_string_base == 0))
+					page->compact_string_base = value;
+
+				ptrdiff_t offset = value - page->compact_string_base;
+
+				if (static_cast<uintptr_t>(offset) < (65535 << 7))
+				{
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					uint16_t* base = reinterpret_cast<uint16_t*>(static_cast<void*>(reinterpret_cast<char*>(this) - base_offset));
+
+					if (*base == 0)
+					{
+						*base = static_cast<uint16_t>((offset >> 7) + 1);
+						_data = static_cast<unsigned char>((offset & 127) + 1);
+					}
+					else
+					{
+						ptrdiff_t remainder = offset - ((*base - 1) << 7);
+
+						if (static_cast<uintptr_t>(remainder) <= 253)
+						{
+							_data = static_cast<unsigned char>(remainder + 1);
+						}
+						else
+						{
+							compact_set_value<header_offset>(this, value);
+
+							_data = 255;
+						}
+					}
+				}
+				else
+				{
+					compact_set_value<header_offset>(this, value);
+
+					_data = 255;
+				}
+			}
+			else
+			{
+				_data = 0;
+			}
+		}
+
+		operator char_t*() const
+		{
+			if (_data)
+			{
+				if (_data < 255)
+				{
+					xml_memory_page* page = compact_get_page(this, header_offset);
+
+					// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+					const uint16_t* base = reinterpret_cast<const uint16_t*>(static_cast<const void*>(reinterpret_cast<const char*>(this) - base_offset));
+					assert(*base);
+
+					ptrdiff_t offset = ((*base - 1) << 7) + (_data - 1);
+
+					return page->compact_string_base + offset;
+				}
+				else
+				{
+					return compact_get_value<header_offset, char_t>(this);
+				}
+			}
+			else
+				return 0;
+		}
+
+	private:
+		unsigned char _data;
+	};
+PUGI__NS_END
+#endif
+
+#ifdef PUGIXML_COMPACT
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): header(page, 0), namevalue_base(0)
+		{
+			PUGI__STATIC_ASSERT(sizeof(xml_attribute_struct) == 8);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer<xml_attribute_struct, 6> prev_attribute_c;
+		impl::compact_pointer<xml_attribute_struct, 7, 0> next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): header(page, type), namevalue_base(0)
+		{
+			PUGI__STATIC_ASSERT(sizeof(xml_node_struct) == 12);
+		}
+
+		impl::compact_header header;
+
+		uint16_t namevalue_base;
+
+		impl::compact_string<4, 2> name;
+		impl::compact_string<5, 3> value;
+
+		impl::compact_pointer_parent<xml_node_struct, 6> parent;
+
+		impl::compact_pointer<xml_node_struct, 8, 0> first_child;
+
+		impl::compact_pointer<xml_node_struct,  9>    prev_sibling_c;
+		impl::compact_pointer<xml_node_struct, 10, 0> next_sibling;
+
+		impl::compact_pointer<xml_attribute_struct, 11, 0> first_attribute;
+	};
+}
+#else
+namespace pugi
+{
+	struct xml_attribute_struct
+	{
+		xml_attribute_struct(impl::xml_memory_page* page): name(0), value(0), prev_attribute_c(0), next_attribute(0)
+		{
+			header = PUGI__GETHEADER_IMPL(this, page, 0);
+		}
+
+		uintptr_t header;
+
+		char_t*	name;
+		char_t*	value;
+
+		xml_attribute_struct* prev_attribute_c;
+		xml_attribute_struct* next_attribute;
+	};
+
+	struct xml_node_struct
+	{
+		xml_node_struct(impl::xml_memory_page* page, xml_node_type type): name(0), value(0), parent(0), first_child(0), prev_sibling_c(0), next_sibling(0), first_attribute(0)
+		{
+			header = PUGI__GETHEADER_IMPL(this, page, type);
+		}
+
+		uintptr_t header;
+
+		char_t* name;
+		char_t* value;
+
+		xml_node_struct* parent;
+
+		xml_node_struct* first_child;
+
+		xml_node_struct* prev_sibling_c;
+		xml_node_struct* next_sibling;
+
+		xml_attribute_struct* first_attribute;
+	};
+}
+#endif
+
+PUGI__NS_BEGIN
+	struct xml_extra_buffer
+	{
+		char_t* buffer;
+		xml_extra_buffer* next;
+	};
+
+	struct xml_document_struct: public xml_node_struct, public xml_allocator
+	{
+		xml_document_struct(xml_memory_page* page): xml_node_struct(page, node_document), xml_allocator(page), buffer(0), extra_buffers(0)
+		{
+		}
+
+		const char_t* buffer;
+
+		xml_extra_buffer* extra_buffers;
+
+	#ifdef PUGIXML_COMPACT
+		compact_hash_table hash;
+	#endif
+	};
+
+	template <typename Object> inline xml_allocator& get_allocator(const Object* object)
+	{
+		assert(object);
+
+		return *PUGI__GETPAGE(object)->allocator;
+	}
+
+	template <typename Object> inline xml_document_struct& get_document(const Object* object)
+	{
+		assert(object);
+
+		return *static_cast<xml_document_struct*>(PUGI__GETPAGE(object)->allocator);
+	}
+PUGI__NS_END
+
+// Low-level DOM operations
+PUGI__NS_BEGIN
+	inline xml_attribute_struct* allocate_attribute(xml_allocator& alloc)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_attribute_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_attribute_struct(page);
+	}
+
+	inline xml_node_struct* allocate_node(xml_allocator& alloc, xml_node_type type)
+	{
+		xml_memory_page* page;
+		void* memory = alloc.allocate_object(sizeof(xml_node_struct), page);
+		if (!memory) return 0;
+
+		return new (memory) xml_node_struct(page, type);
+	}
+
+	inline void destroy_attribute(xml_attribute_struct* a, xml_allocator& alloc)
+	{
+		if (a->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(a->name);
+
+		if (a->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(a->value);
+
+		alloc.deallocate_memory(a, sizeof(xml_attribute_struct), PUGI__GETPAGE(a));
+	}
+
+	inline void destroy_node(xml_node_struct* n, xml_allocator& alloc)
+	{
+		if (n->header & impl::xml_memory_page_name_allocated_mask)
+			alloc.deallocate_string(n->name);
+
+		if (n->header & impl::xml_memory_page_value_allocated_mask)
+			alloc.deallocate_string(n->value);
+
+		for (xml_attribute_struct* attr = n->first_attribute; attr; )
+		{
+			xml_attribute_struct* next = attr->next_attribute;
+
+			destroy_attribute(attr, alloc);
+
+			attr = next;
+		}
+
+		for (xml_node_struct* child = n->first_child; child; )
+		{
+			xml_node_struct* next = child->next_sibling;
+
+			destroy_node(child, alloc);
+
+			child = next;
+		}
+
+		alloc.deallocate_memory(n, sizeof(xml_node_struct), PUGI__GETPAGE(n));
+	}
+
+	inline void append_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			xml_node_struct* tail = head->prev_sibling_c;
+
+			tail->next_sibling = child;
+			child->prev_sibling_c = tail;
+			head->prev_sibling_c = child;
+		}
+		else
+		{
+			node->first_child = child;
+			child->prev_sibling_c = child;
+		}
+	}
+
+	inline void prepend_node(xml_node_struct* child, xml_node_struct* node)
+	{
+		child->parent = node;
+
+		xml_node_struct* head = node->first_child;
+
+		if (head)
+		{
+			child->prev_sibling_c = head->prev_sibling_c;
+			head->prev_sibling_c = child;
+		}
+		else
+			child->prev_sibling_c = child;
+
+		child->next_sibling = head;
+		node->first_child = child;
+	}
+
+	inline void insert_node_after(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		if (node->next_sibling)
+			node->next_sibling->prev_sibling_c = child;
+		else
+			parent->first_child->prev_sibling_c = child;
+
+		child->next_sibling = node->next_sibling;
+		child->prev_sibling_c = node;
+
+		node->next_sibling = child;
+	}
+
+	inline void insert_node_before(xml_node_struct* child, xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		child->parent = parent;
+
+		if (node->prev_sibling_c->next_sibling)
+			node->prev_sibling_c->next_sibling = child;
+		else
+			parent->first_child = child;
+
+		child->prev_sibling_c = node->prev_sibling_c;
+		child->next_sibling = node;
+
+		node->prev_sibling_c = child;
+	}
+
+	inline void remove_node(xml_node_struct* node)
+	{
+		xml_node_struct* parent = node->parent;
+
+		if (node->next_sibling)
+			node->next_sibling->prev_sibling_c = node->prev_sibling_c;
+		else
+			parent->first_child->prev_sibling_c = node->prev_sibling_c;
+
+		if (node->prev_sibling_c->next_sibling)
+			node->prev_sibling_c->next_sibling = node->next_sibling;
+		else
+			parent->first_child = node->next_sibling;
+
+		node->parent = 0;
+		node->prev_sibling_c = 0;
+		node->next_sibling = 0;
+	}
+
+	inline void append_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			xml_attribute_struct* tail = head->prev_attribute_c;
+
+			tail->next_attribute = attr;
+			attr->prev_attribute_c = tail;
+			head->prev_attribute_c = attr;
+		}
+		else
+		{
+			node->first_attribute = attr;
+			attr->prev_attribute_c = attr;
+		}
+	}
+
+	inline void prepend_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		xml_attribute_struct* head = node->first_attribute;
+
+		if (head)
+		{
+			attr->prev_attribute_c = head->prev_attribute_c;
+			head->prev_attribute_c = attr;
+		}
+		else
+			attr->prev_attribute_c = attr;
+
+		attr->next_attribute = head;
+		node->first_attribute = attr;
+	}
+
+	inline void insert_attribute_after(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		if (place->next_attribute)
+			place->next_attribute->prev_attribute_c = attr;
+		else
+			node->first_attribute->prev_attribute_c = attr;
+
+		attr->next_attribute = place->next_attribute;
+		attr->prev_attribute_c = place;
+		place->next_attribute = attr;
+	}
+
+	inline void insert_attribute_before(xml_attribute_struct* attr, xml_attribute_struct* place, xml_node_struct* node)
+	{
+		if (place->prev_attribute_c->next_attribute)
+			place->prev_attribute_c->next_attribute = attr;
+		else
+			node->first_attribute = attr;
+
+		attr->prev_attribute_c = place->prev_attribute_c;
+		attr->next_attribute = place;
+		place->prev_attribute_c = attr;
+	}
+
+	inline void remove_attribute(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		if (attr->next_attribute)
+			attr->next_attribute->prev_attribute_c = attr->prev_attribute_c;
+		else
+			node->first_attribute->prev_attribute_c = attr->prev_attribute_c;
+
+		if (attr->prev_attribute_c->next_attribute)
+			attr->prev_attribute_c->next_attribute = attr->next_attribute;
+		else
+			node->first_attribute = attr->next_attribute;
+
+		attr->prev_attribute_c = 0;
+		attr->next_attribute = 0;
+	}
+
+	PUGI__FN_NO_INLINE xml_node_struct* append_new_node(xml_node_struct* node, xml_allocator& alloc, xml_node_type type = node_element)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_node_struct* child = allocate_node(alloc, type);
+		if (!child) return 0;
+
+		append_node(child, node);
+
+		return child;
+	}
+
+	PUGI__FN_NO_INLINE xml_attribute_struct* append_new_attribute(xml_node_struct* node, xml_allocator& alloc)
+	{
+		if (!alloc.reserve()) return 0;
+
+		xml_attribute_struct* attr = allocate_attribute(alloc);
+		if (!attr) return 0;
+
+		append_attribute(attr, node);
+
+		return attr;
+	}
+PUGI__NS_END
+
+// Helper classes for code generation
+PUGI__NS_BEGIN
+	struct opt_false
+	{
+		enum { value = 0 };
+	};
+
+	struct opt_true
+	{
+		enum { value = 1 };
+	};
+PUGI__NS_END
+
+// Unicode utilities
+PUGI__NS_BEGIN
+	inline uint16_t endian_swap(uint16_t value)
+	{
+		return static_cast<uint16_t>(((value & 0xff) << 8) | (value >> 8));
+	}
+
+	inline uint32_t endian_swap(uint32_t value)
+	{
+		return ((value & 0xff) << 24) | ((value & 0xff00) << 8) | ((value & 0xff0000) >> 8) | (value >> 24);
+	}
+
+	struct utf8_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80) return result + 1;
+			// U+0080..U+07FF
+			else if (ch < 0x800) return result + 2;
+			// U+0800..U+FFFF
+			else return result + 3;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			// U+10000..U+10FFFF
+			return result + 4;
+		}
+	};
+
+	struct utf8_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			// U+0000..U+007F
+			if (ch < 0x80)
+			{
+				*result = static_cast<uint8_t>(ch);
+				return result + 1;
+			}
+			// U+0080..U+07FF
+			else if (ch < 0x800)
+			{
+				result[0] = static_cast<uint8_t>(0xC0 | (ch >> 6));
+				result[1] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 2;
+			}
+			// U+0800..U+FFFF
+			else
+			{
+				result[0] = static_cast<uint8_t>(0xE0 | (ch >> 12));
+				result[1] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+				result[2] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+				return result + 3;
+			}
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			// U+10000..U+10FFFF
+			result[0] = static_cast<uint8_t>(0xF0 | (ch >> 18));
+			result[1] = static_cast<uint8_t>(0x80 | ((ch >> 12) & 0x3F));
+			result[2] = static_cast<uint8_t>(0x80 | ((ch >> 6) & 0x3F));
+			result[3] = static_cast<uint8_t>(0x80 | (ch & 0x3F));
+			return result + 4;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf16_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 2;
+		}
+	};
+
+	struct utf16_writer
+	{
+		typedef uint16_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint16_t>(ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			uint32_t msh = static_cast<uint32_t>(ch - 0x10000) >> 10;
+			uint32_t lsh = static_cast<uint32_t>(ch - 0x10000) & 0x3ff;
+
+			result[0] = static_cast<uint16_t>(0xD800 + msh);
+			result[1] = static_cast<uint16_t>(0xDC00 + lsh);
+
+			return result + 2;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			return (ch < 0x10000) ? low(result, ch) : high(result, ch);
+		}
+	};
+
+	struct utf32_counter
+	{
+		typedef size_t value_type;
+
+		static value_type low(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t)
+		{
+			return result + 1;
+		}
+	};
+
+	struct utf32_writer
+	{
+		typedef uint32_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+
+		static value_type any(value_type result, uint32_t ch)
+		{
+			*result = ch;
+
+			return result + 1;
+		}
+	};
+
+	struct latin1_writer
+	{
+		typedef uint8_t* value_type;
+
+		static value_type low(value_type result, uint32_t ch)
+		{
+			*result = static_cast<uint8_t>(ch > 255 ? '?' : ch);
+
+			return result + 1;
+		}
+
+		static value_type high(value_type result, uint32_t ch)
+		{
+			(void)ch;
+
+			*result = '?';
+
+			return result + 1;
+		}
+	};
+
+	struct utf8_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			const uint8_t utf8_byte_mask = 0x3f;
+
+			while (size)
+			{
+				uint8_t lead = *data;
+
+				// 0xxxxxxx -> U+0000..U+007F
+				if (lead < 0x80)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+
+					// process aligned single-byte (ascii) blocks
+					if ((reinterpret_cast<uintptr_t>(data) & 3) == 0)
+					{
+						// round-trip through void* to silence 'cast increases required alignment of target type' warnings
+						while (size >= 4 && (*static_cast<const uint32_t*>(static_cast<const void*>(data)) & 0x80808080) == 0)
+						{
+							result = Traits::low(result, data[0]);
+							result = Traits::low(result, data[1]);
+							result = Traits::low(result, data[2]);
+							result = Traits::low(result, data[3]);
+							data += 4;
+							size -= 4;
+						}
+					}
+				}
+				// 110xxxxx -> U+0080..U+07FF
+				else if (static_cast<unsigned int>(lead - 0xC0) < 0x20 && size >= 2 && (data[1] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xC0) << 6) | (data[1] & utf8_byte_mask));
+					data += 2;
+					size -= 2;
+				}
+				// 1110xxxx -> U+0800-U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE0) < 0x10 && size >= 3 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80)
+				{
+					result = Traits::low(result, ((lead & ~0xE0) << 12) | ((data[1] & utf8_byte_mask) << 6) | (data[2] & utf8_byte_mask));
+					data += 3;
+					size -= 3;
+				}
+				// 11110xxx -> U+10000..U+10FFFF
+				else if (static_cast<unsigned int>(lead - 0xF0) < 0x08 && size >= 4 && (data[1] & 0xc0) == 0x80 && (data[2] & 0xc0) == 0x80 && (data[3] & 0xc0) == 0x80)
+				{
+					result = Traits::high(result, ((lead & ~0xF0) << 18) | ((data[1] & utf8_byte_mask) << 12) | ((data[2] & utf8_byte_mask) << 6) | (data[3] & utf8_byte_mask));
+					data += 4;
+					size -= 4;
+				}
+				// 10xxxxxx or 11111xxx -> invalid
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf16_decoder
+	{
+		typedef uint16_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint16_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint16_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+D7FF
+				if (lead < 0xD800)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+E000..U+FFFF
+				else if (static_cast<unsigned int>(lead - 0xE000) < 0x2000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// surrogate pair lead
+				else if (static_cast<unsigned int>(lead - 0xD800) < 0x400 && size >= 2)
+				{
+					uint16_t next = opt_swap::value ? endian_swap(data[1]) : data[1];
+
+					if (static_cast<unsigned int>(next - 0xDC00) < 0x400)
+					{
+						result = Traits::high(result, 0x10000 + ((lead & 0x3ff) << 10) + (next & 0x3ff));
+						data += 2;
+						size -= 2;
+					}
+					else
+					{
+						data += 1;
+						size -= 1;
+					}
+				}
+				else
+				{
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	template <typename opt_swap> struct utf32_decoder
+	{
+		typedef uint32_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint32_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				uint32_t lead = opt_swap::value ? endian_swap(*data) : *data;
+
+				// U+0000..U+FFFF
+				if (lead < 0x10000)
+				{
+					result = Traits::low(result, lead);
+					data += 1;
+					size -= 1;
+				}
+				// U+10000..U+10FFFF
+				else
+				{
+					result = Traits::high(result, lead);
+					data += 1;
+					size -= 1;
+				}
+			}
+
+			return result;
+		}
+	};
+
+	struct latin1_decoder
+	{
+		typedef uint8_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const uint8_t* data, size_t size, typename Traits::value_type result, Traits)
+		{
+			while (size)
+			{
+				result = Traits::low(result, *data);
+				data += 1;
+				size -= 1;
+			}
+
+			return result;
+		}
+	};
+
+	template <size_t size> struct wchar_selector;
+
+	template <> struct wchar_selector<2>
+	{
+		typedef uint16_t type;
+		typedef utf16_counter counter;
+		typedef utf16_writer writer;
+		typedef utf16_decoder<opt_false> decoder;
+	};
+
+	template <> struct wchar_selector<4>
+	{
+		typedef uint32_t type;
+		typedef utf32_counter counter;
+		typedef utf32_writer writer;
+		typedef utf32_decoder<opt_false> decoder;
+	};
+
+	typedef wchar_selector<sizeof(wchar_t)>::counter wchar_counter;
+	typedef wchar_selector<sizeof(wchar_t)>::writer wchar_writer;
+
+	struct wchar_decoder
+	{
+		typedef wchar_t type;
+
+		template <typename Traits> static inline typename Traits::value_type process(const wchar_t* data, size_t size, typename Traits::value_type result, Traits traits)
+		{
+			typedef wchar_selector<sizeof(wchar_t)>::decoder decoder;
+
+			return decoder::process(reinterpret_cast<const typename decoder::type*>(data), size, result, traits);
+		}
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN void convert_wchar_endian_swap(wchar_t* result, const wchar_t* data, size_t length)
+	{
+		for (size_t i = 0; i < length; ++i)
+			result[i] = static_cast<wchar_t>(endian_swap(static_cast<wchar_selector<sizeof(wchar_t)>::type>(data[i])));
+	}
+#endif
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	enum chartype_t
+	{
+		ct_parse_pcdata = 1,	// \0, &, \r, <
+		ct_parse_attr = 2,		// \0, &, \r, ', "
+		ct_parse_attr_ws = 4,	// \0, &, \r, ', ", \n, tab
+		ct_space = 8,			// \r, \n, space, tab
+		ct_parse_cdata = 16,	// \0, ], >, \r
+		ct_parse_comment = 32,	// \0, -, >, \r
+		ct_symbol = 64,			// Any symbol > 127, a-z, A-Z, 0-9, _, :, -, .
+		ct_start_symbol = 128	// Any symbol > 127, a-z, A-Z, _, :
+	};
+
+	static const unsigned char chartype_table[256] =
+	{
+		55,  0,   0,   0,   0,   0,   0,   0,      0,   12,  12,  0,   0,   63,  0,   0,   // 0-15
+		0,   0,   0,   0,   0,   0,   0,   0,      0,   0,   0,   0,   0,   0,   0,   0,   // 16-31
+		8,   0,   6,   0,   0,   0,   7,   6,      0,   0,   0,   0,   0,   96,  64,  0,   // 32-47
+		64,  64,  64,  64,  64,  64,  64,  64,     64,  64,  192, 0,   1,   0,   48,  0,   // 48-63
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 64-79
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0,   0,   16,  0,   192, // 80-95
+		0,   192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 96-111
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 0, 0, 0, 0, 0,           // 112-127
+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192, // 128+
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192,
+		192, 192, 192, 192, 192, 192, 192, 192,    192, 192, 192, 192, 192, 192, 192, 192
+	};
+
+	enum chartypex_t
+	{
+		ctx_special_pcdata = 1,   // Any symbol >= 0 and < 32 (except \t, \r, \n), &, <, >
+		ctx_special_attr = 2,     // Any symbol >= 0 and < 32, &, <, ", '
+		ctx_start_symbol = 4,	  // Any symbol > 127, a-z, A-Z, _
+		ctx_digit = 8,			  // 0-9
+		ctx_symbol = 16			  // Any symbol > 127, a-z, A-Z, 0-9, _, -, .
+	};
+
+	static const unsigned char chartypex_table[256] =
+	{
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  2,  2,  3,  3,  2,  3,  3,     // 0-15
+		3,  3,  3,  3,  3,  3,  3,  3,     3,  3,  3,  3,  3,  3,  3,  3,     // 16-31
+		0,  0,  2,  0,  0,  0,  3,  2,     0,  0,  0,  0,  0, 16, 16,  0,     // 32-47
+		24, 24, 24, 24, 24, 24, 24, 24,    24, 24, 0,  0,  3,  0,  1,  0,     // 48-63
+
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 64-79
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  20,    // 80-95
+		0,  20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 96-111
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 0,  0,  0,  0,  0,     // 112-127
+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,    // 128+
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20,
+		20, 20, 20, 20, 20, 20, 20, 20,    20, 20, 20, 20, 20, 20, 20, 20
+	};
+
+#ifdef PUGIXML_WCHAR_MODE
+	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) ((static_cast<unsigned int>(c) < 128 ? table[static_cast<unsigned int>(c)] : table[128]) & (ct))
+#else
+	#define PUGI__IS_CHARTYPE_IMPL(c, ct, table) (table[static_cast<unsigned char>(c)] & (ct))
+#endif
+
+	#define PUGI__IS_CHARTYPE(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartype_table)
+	#define PUGI__IS_CHARTYPEX(c, ct) PUGI__IS_CHARTYPE_IMPL(c, ct, chartypex_table)
+
+	PUGI__FN bool is_little_endian()
+	{
+		unsigned int ui = 1;
+
+		return *reinterpret_cast<unsigned char*>(&ui) == 1;
+	}
+
+	PUGI__FN xml_encoding get_wchar_encoding()
+	{
+		PUGI__STATIC_ASSERT(sizeof(wchar_t) == 2 || sizeof(wchar_t) == 4);
+
+		if (sizeof(wchar_t) == 2)
+			return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+		else
+			return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+	}
+
+	PUGI__FN bool parse_declaration_encoding(const uint8_t* data, size_t size, const uint8_t*& out_encoding, size_t& out_length)
+	{
+	#define PUGI__SCANCHAR(ch) { if (offset >= size || data[offset] != ch) return false; offset++; }
+	#define PUGI__SCANCHARTYPE(ct) { while (offset < size && PUGI__IS_CHARTYPE(data[offset], ct)) offset++; }
+
+		// check if we have a non-empty XML declaration
+		if (size < 6 || !((data[0] == '<') & (data[1] == '?') & (data[2] == 'x') & (data[3] == 'm') & (data[4] == 'l') && PUGI__IS_CHARTYPE(data[5], ct_space)))
+			return false;
+
+		// scan XML declaration until the encoding field
+		for (size_t i = 6; i + 1 < size; ++i)
+		{
+			// declaration can not contain ? in quoted values
+			if (data[i] == '?')
+				return false;
+
+			if (data[i] == 'e' && data[i + 1] == 'n')
+			{
+				size_t offset = i;
+
+				// encoding follows the version field which can't contain 'en' so this has to be the encoding if XML is well formed
+				PUGI__SCANCHAR('e'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('c'); PUGI__SCANCHAR('o');
+				PUGI__SCANCHAR('d'); PUGI__SCANCHAR('i'); PUGI__SCANCHAR('n'); PUGI__SCANCHAR('g');
+
+				// S? = S?
+				PUGI__SCANCHARTYPE(ct_space);
+				PUGI__SCANCHAR('=');
+				PUGI__SCANCHARTYPE(ct_space);
+
+				// the only two valid delimiters are ' and "
+				uint8_t delimiter = (offset < size && data[offset] == '"') ? '"' : '\'';
+
+				PUGI__SCANCHAR(delimiter);
+
+				size_t start = offset;
+
+				out_encoding = data + offset;
+
+				PUGI__SCANCHARTYPE(ct_symbol);
+
+				out_length = offset - start;
+
+				PUGI__SCANCHAR(delimiter);
+
+				return true;
+			}
+		}
+
+		return false;
+
+	#undef PUGI__SCANCHAR
+	#undef PUGI__SCANCHARTYPE
+	}
+
+	PUGI__FN xml_encoding guess_buffer_encoding(const uint8_t* data, size_t size)
+	{
+		// skip encoding autodetection if input buffer is too small
+		if (size < 4) return encoding_utf8;
+
+		uint8_t d0 = data[0], d1 = data[1], d2 = data[2], d3 = data[3];
+
+		// look for BOM in first few bytes
+		if (d0 == 0 && d1 == 0 && d2 == 0xfe && d3 == 0xff) return encoding_utf32_be;
+		if (d0 == 0xff && d1 == 0xfe && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0xfe && d1 == 0xff) return encoding_utf16_be;
+		if (d0 == 0xff && d1 == 0xfe) return encoding_utf16_le;
+		if (d0 == 0xef && d1 == 0xbb && d2 == 0xbf) return encoding_utf8;
+
+		// look for <, <? or <?xm in various encodings
+		if (d0 == 0 && d1 == 0 && d2 == 0 && d3 == 0x3c) return encoding_utf32_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0 && d3 == 0) return encoding_utf32_le;
+		if (d0 == 0 && d1 == 0x3c && d2 == 0 && d3 == 0x3f) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0 && d2 == 0x3f && d3 == 0) return encoding_utf16_le;
+
+		// look for utf16 < followed by node name (this may fail, but is better than utf8 since it's zero terminated so early)
+		if (d0 == 0 && d1 == 0x3c) return encoding_utf16_be;
+		if (d0 == 0x3c && d1 == 0) return encoding_utf16_le;
+
+		// no known BOM detected; parse declaration
+		const uint8_t* enc = 0;
+		size_t enc_length = 0;
+
+		if (d0 == 0x3c && d1 == 0x3f && d2 == 0x78 && d3 == 0x6d && parse_declaration_encoding(data, size, enc, enc_length))
+		{
+			// iso-8859-1 (case-insensitive)
+			if (enc_length == 10
+				&& (enc[0] | ' ') == 'i' && (enc[1] | ' ') == 's' && (enc[2] | ' ') == 'o'
+				&& enc[3] == '-' && enc[4] == '8' && enc[5] == '8' && enc[6] == '5' && enc[7] == '9'
+				&& enc[8] == '-' && enc[9] == '1')
+				return encoding_latin1;
+
+			// latin1 (case-insensitive)
+			if (enc_length == 6
+				&& (enc[0] | ' ') == 'l' && (enc[1] | ' ') == 'a' && (enc[2] | ' ') == 't'
+				&& (enc[3] | ' ') == 'i' && (enc[4] | ' ') == 'n'
+				&& enc[5] == '1')
+				return encoding_latin1;
+		}
+
+		return encoding_utf8;
+	}
+
+	PUGI__FN xml_encoding get_buffer_encoding(xml_encoding encoding, const void* contents, size_t size)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// try to guess encoding (based on XML specification, Appendix F.1)
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+
+		return guess_buffer_encoding(data, size);
+	}
+
+	PUGI__FN bool get_mutable_buffer(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			out_buffer = static_cast<char_t*>(const_cast<void*>(contents));
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			if (contents)
+				memcpy(buffer, contents, length * sizeof(char_t));
+			else
+				assert(length == 0);
+
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN bool need_endian_swap_utf(xml_encoding le, xml_encoding re)
+	{
+		return (le == encoding_utf16_be && re == encoding_utf16_le) || (le == encoding_utf16_le && re == encoding_utf16_be) ||
+			   (le == encoding_utf32_be && re == encoding_utf32_le) || (le == encoding_utf32_le && re == encoding_utf32_be);
+	}
+
+	PUGI__FN bool convert_buffer_endian_swap(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const char_t* data = static_cast<const char_t*>(contents);
+		size_t length = size / sizeof(char_t);
+
+		if (is_mutable)
+		{
+			char_t* buffer = const_cast<char_t*>(data);
+
+			convert_wchar_endian_swap(buffer, data, length);
+
+			out_buffer = buffer;
+			out_length = length;
+		}
+		else
+		{
+			char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!buffer) return false;
+
+			convert_wchar_endian_swap(buffer, data, length);
+			buffer[length] = 0;
+
+			out_buffer = buffer;
+			out_length = length + 1;
+		}
+
+		return true;
+	}
+
+	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in wchar_t units
+		size_t length = D::process(data, data_length, 0, wchar_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to wchar_t
+		wchar_writer::value_type obegin = reinterpret_cast<wchar_writer::value_type>(buffer);
+		wchar_writer::value_type oend = D::process(data, data_length, obegin, wchar_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// get native encoding
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		// fast path: no conversion required
+		if (encoding == wchar_encoding)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, wchar_encoding))
+			return convert_buffer_endian_swap(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, utf8_decoder());
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_generic(out_buffer, out_length, contents, size, latin1_decoder());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#else
+	template <typename D> PUGI__FN bool convert_buffer_generic(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, D)
+	{
+		const typename D::type* data = static_cast<const typename D::type*>(contents);
+		size_t data_length = size / sizeof(typename D::type);
+
+		// first pass: get length in utf8 units
+		size_t length = D::process(data, data_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert utf16 input to utf8
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = D::process(data, data_length, obegin, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN size_t get_latin1_7bit_prefix_length(const uint8_t* data, size_t size)
+	{
+		for (size_t i = 0; i < size; ++i)
+			if (data[i] > 127)
+				return i;
+
+		return size;
+	}
+
+	PUGI__FN bool convert_buffer_latin1(char_t*& out_buffer, size_t& out_length, const void* contents, size_t size, bool is_mutable)
+	{
+		const uint8_t* data = static_cast<const uint8_t*>(contents);
+		size_t data_length = size;
+
+		// get size of prefix that does not need utf8 conversion
+		size_t prefix_length = get_latin1_7bit_prefix_length(data, data_length);
+		assert(prefix_length <= data_length);
+
+		const uint8_t* postfix = data + prefix_length;
+		size_t postfix_length = data_length - prefix_length;
+
+		// if no conversion is needed, just return the original buffer
+		if (postfix_length == 0) return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// first pass: get length in utf8 units
+		size_t length = prefix_length + latin1_decoder::process(postfix, postfix_length, 0, utf8_counter());
+
+		// allocate buffer of suitable length
+		char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+		if (!buffer) return false;
+
+		// second pass: convert latin1 input to utf8
+		memcpy(buffer, data, prefix_length);
+
+		uint8_t* obegin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* oend = latin1_decoder::process(postfix, postfix_length, obegin + prefix_length, utf8_writer());
+
+		assert(oend == obegin + length);
+		*oend = 0;
+
+		out_buffer = buffer;
+		out_length = length + 1;
+
+		return true;
+	}
+
+	PUGI__FN bool convert_buffer(char_t*& out_buffer, size_t& out_length, xml_encoding encoding, const void* contents, size_t size, bool is_mutable)
+	{
+		// fast path: no conversion required
+		if (encoding == encoding_utf8)
+			return get_mutable_buffer(out_buffer, out_length, contents, size, is_mutable);
+
+		// source encoding is utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf16_decoder<opt_true>());
+		}
+
+		// source encoding is utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return (native_encoding == encoding) ?
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_false>()) :
+				convert_buffer_generic(out_buffer, out_length, contents, size, utf32_decoder<opt_true>());
+		}
+
+		// source encoding is latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_latin1(out_buffer, out_length, contents, size, is_mutable);
+
+		assert(false && "Invalid encoding"); // unreachable
+		return false;
+	}
+#endif
+
+	PUGI__FN size_t as_utf8_begin(const wchar_t* str, size_t length)
+	{
+		// get length in utf8 characters
+		return wchar_decoder::process(str, length, 0, utf8_counter());
+	}
+
+	PUGI__FN void as_utf8_end(char* buffer, size_t size, const wchar_t* str, size_t length)
+	{
+		// convert to utf8
+		uint8_t* begin = reinterpret_cast<uint8_t*>(buffer);
+		uint8_t* end = wchar_decoder::process(str, length, begin, utf8_writer());
+
+		assert(begin + size == end);
+		(void)!end;
+		(void)!size;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN std::string as_utf8_impl(const wchar_t* str, size_t length)
+	{
+		// first pass: get length in utf8 characters
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		std::string result;
+		result.resize(size);
+
+		// second pass: convert to utf8
+		if (size > 0) as_utf8_end(&result[0], size, str, length);
+
+		return result;
+	}
+
+	PUGI__FN std::basic_string<wchar_t> as_wide_impl(const char* str, size_t size)
+	{
+		const uint8_t* data = reinterpret_cast<const uint8_t*>(str);
+
+		// first pass: get length in wchar_t units
+		size_t length = utf8_decoder::process(data, size, 0, wchar_counter());
+
+		// allocate resulting string
+		std::basic_string<wchar_t> result;
+		result.resize(length);
+
+		// second pass: convert to wchar_t
+		if (length > 0)
+		{
+			wchar_writer::value_type begin = reinterpret_cast<wchar_writer::value_type>(&result[0]);
+			wchar_writer::value_type end = utf8_decoder::process(data, size, begin, wchar_writer());
+
+			assert(begin + length == end);
+			(void)!end;
+		}
+
+		return result;
+	}
+#endif
+
+	template <typename Header>
+	inline bool strcpy_insitu_allow(size_t length, const Header& header, uintptr_t header_mask, char_t* target)
+	{
+		// never reuse shared memory
+		if (header & xml_memory_page_contents_shared_mask) return false;
+
+		size_t target_length = strlength(target);
+
+		// always reuse document buffer memory if possible
+		if ((header & header_mask) == 0) return target_length >= length;
+
+		// reuse heap memory if waste is not too great
+		const size_t reuse_threshold = 32;
+
+		return target_length >= length && (target_length < reuse_threshold || target_length - length < target_length / 2);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool strcpy_insitu(String& dest, Header& header, uintptr_t header_mask, const char_t* source, size_t source_length)
+	{
+		if (source_length == 0)
+		{
+			// empty string and null pointer are equivalent, so just deallocate old memory
+			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// mark the string as not allocated
+			dest = 0;
+			header &= ~header_mask;
+
+			return true;
+		}
+		else if (dest && strcpy_insitu_allow(source_length, header, header_mask, dest))
+		{
+			// we can reuse old buffer, so just copy the new data (including zero terminator)
+			memcpy(dest, source, source_length * sizeof(char_t));
+			dest[source_length] = 0;
+
+			return true;
+		}
+		else
+		{
+			xml_allocator* alloc = PUGI__GETPAGE_IMPL(header)->allocator;
+
+			if (!alloc->reserve()) return false;
+
+			// allocate new buffer
+			char_t* buf = alloc->allocate_string(source_length + 1);
+			if (!buf) return false;
+
+			// copy the string (including zero terminator)
+			memcpy(buf, source, source_length * sizeof(char_t));
+			buf[source_length] = 0;
+
+			// deallocate old buffer (*after* the above to protect against overlapping memory and/or allocation failures)
+			if (header & header_mask) alloc->deallocate_string(dest);
+
+			// the string is now allocated, so set the flag
+			dest = buf;
+			header |= header_mask;
+
+			return true;
+		}
+	}
+
+	struct gap
+	{
+		char_t* end;
+		size_t size;
+
+		gap(): end(0), size(0)
+		{
+		}
+
+		// Push new gap, move s count bytes further (skipping the gap).
+		// Collapse previous gap.
+		void push(char_t*& s, size_t count)
+		{
+			if (end) // there was a gap already; collapse it
+			{
+				// Move [old_gap_end, new_gap_start) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+			}
+
+			s += count; // end of current gap
+
+			// "merge" two gaps
+			end = s;
+			size += count;
+		}
+
+		// Collapse all gaps, return past-the-end pointer
+		char_t* flush(char_t* s)
+		{
+			if (end)
+			{
+				// Move [old_gap_end, current_pos) to [old_gap_start, ...)
+				assert(s >= end);
+				memmove(end - size, end, reinterpret_cast<char*>(s) - reinterpret_cast<char*>(end));
+
+				return s - size;
+			}
+			else return s;
+		}
+	};
+
+	PUGI__FN char_t* strconv_escape(char_t* s, gap& g)
+	{
+		char_t* stre = s + 1;
+
+		switch (*stre)
+		{
+			case '#':	// &#...
+			{
+				unsigned int ucsc = 0;
+
+				if (stre[1] == 'x') // &#x... (hex code)
+				{
+					stre += 2;
+
+					char_t ch = *stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 16 * ucsc + (ch - '0');
+						else if (static_cast<unsigned int>((ch | ' ') - 'a') <= 5)
+							ucsc = 16 * ucsc + ((ch | ' ') - 'a' + 10);
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+				else	// &#... (dec code)
+				{
+					char_t ch = *++stre;
+
+					if (ch == ';') return stre;
+
+					for (;;)
+					{
+						if (static_cast<unsigned int>(ch - '0') <= 9)
+							ucsc = 10 * ucsc + (ch - '0');
+						else if (ch == ';')
+							break;
+						else // cancel
+							return stre;
+
+						ch = *++stre;
+					}
+
+					++stre;
+				}
+
+			#ifdef PUGIXML_WCHAR_MODE
+				s = reinterpret_cast<char_t*>(wchar_writer::any(reinterpret_cast<wchar_writer::value_type>(s), ucsc));
+			#else
+				s = reinterpret_cast<char_t*>(utf8_writer::any(reinterpret_cast<uint8_t*>(s), ucsc));
+			#endif
+
+				g.push(s, stre - s);
+				return stre;
+			}
+
+			case 'a':	// &a
+			{
+				++stre;
+
+				if (*stre == 'm') // &am
+				{
+					if (*++stre == 'p' && *++stre == ';') // &amp;
+					{
+						*s++ = '&';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				else if (*stre == 'p') // &ap
+				{
+					if (*++stre == 'o' && *++stre == 's' && *++stre == ';') // &apos;
+					{
+						*s++ = '\'';
+						++stre;
+
+						g.push(s, stre - s);
+						return stre;
+					}
+				}
+				break;
+			}
+
+			case 'g': // &g
+			{
+				if (*++stre == 't' && *++stre == ';') // &gt;
+				{
+					*s++ = '>';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'l': // &l
+			{
+				if (*++stre == 't' && *++stre == ';') // &lt;
+				{
+					*s++ = '<';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			case 'q': // &q
+			{
+				if (*++stre == 'u' && *++stre == 'o' && *++stre == 't' && *++stre == ';') // &quot;
+				{
+					*s++ = '"';
+					++stre;
+
+					g.push(s, stre - s);
+					return stre;
+				}
+				break;
+			}
+
+			default:
+				break;
+		}
+
+		return stre;
+	}
+
+	// Parser utilities
+	#define PUGI__ENDSWITH(c, e)        ((c) == (e) || ((c) == 0 && endch == (e)))
+	#define PUGI__SKIPWS()              { while (PUGI__IS_CHARTYPE(*s, ct_space)) ++s; }
+	#define PUGI__OPTSET(OPT)           ( optmsk & (OPT) )
+	#define PUGI__PUSHNODE(TYPE)        { cursor = append_new_node(cursor, *alloc, TYPE); if (!cursor) PUGI__THROW_ERROR(status_out_of_memory, s); }
+	#define PUGI__POPNODE()             { cursor = cursor->parent; }
+	#define PUGI__SCANFOR(X)            { while (*s != 0 && !(X)) ++s; }
+	#define PUGI__SCANWHILE(X)          { while (X) ++s; }
+	#define PUGI__SCANWHILE_UNROLL(X)   { for (;;) { char_t ss = s[0]; if (PUGI__UNLIKELY(!(X))) { break; } ss = s[1]; if (PUGI__UNLIKELY(!(X))) { s += 1; break; } ss = s[2]; if (PUGI__UNLIKELY(!(X))) { s += 2; break; } ss = s[3]; if (PUGI__UNLIKELY(!(X))) { s += 3; break; } s += 4; } }
+	#define PUGI__ENDSEG()              { ch = *s; *s = 0; ++s; }
+	#define PUGI__THROW_ERROR(err, m)   return error_offset = m, error_status = err, static_cast<char_t*>(0)
+	#define PUGI__CHECK_ERROR(err, m)   { if (*s == 0) PUGI__THROW_ERROR(err, m); }
+
+	PUGI__FN char_t* strconv_comment(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_comment));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>')) // comment ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + (s[2] == '>' ? 3 : 2);
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	PUGI__FN char_t* strconv_cdata(char_t* s, char_t endch)
+	{
+		gap g;
+
+		while (true)
+		{
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_cdata));
+
+			if (*s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+			{
+				*s++ = '\n'; // replace first one with 0x0a
+
+				if (*s == '\n') g.push(s, 1);
+			}
+			else if (s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>')) // CDATA ends here
+			{
+				*g.flush(s) = 0;
+
+				return s + 1;
+			}
+			else if (*s == 0)
+			{
+				return 0;
+			}
+			else ++s;
+		}
+	}
+
+	typedef char_t* (*strconv_pcdata_t)(char_t*);
+
+	template <typename opt_trim, typename opt_eol, typename opt_escape> struct strconv_pcdata_impl
+	{
+		static char_t* parse(char_t* s)
+		{
+			gap g;
+
+			char_t* begin = s;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_pcdata));
+
+				if (*s == '<') // PCDATA ends here
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s + 1;
+				}
+				else if (opt_eol::value && *s == '\r') // Either a single 0x0d or 0x0d 0x0a pair
+				{
+					*s++ = '\n'; // replace first one with 0x0a
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (*s == 0)
+				{
+					char_t* end = g.flush(s);
+
+					if (opt_trim::value)
+						while (end > begin && PUGI__IS_CHARTYPE(end[-1], ct_space))
+							--end;
+
+					*end = 0;
+
+					return s;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI__FN strconv_pcdata_t get_strconv_pcdata(unsigned int optmask)
+	{
+		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_trim_pcdata == 0x0800);
+
+		switch (((optmask >> 4) & 3) | ((optmask >> 9) & 4)) // get bitmask for flags (trim eol escapes); this simultaneously checks 3 options from assertion above
+		{
+		case 0: return strconv_pcdata_impl<opt_false, opt_false, opt_false>::parse;
+		case 1: return strconv_pcdata_impl<opt_false, opt_false, opt_true>::parse;
+		case 2: return strconv_pcdata_impl<opt_false, opt_true, opt_false>::parse;
+		case 3: return strconv_pcdata_impl<opt_false, opt_true, opt_true>::parse;
+		case 4: return strconv_pcdata_impl<opt_true, opt_false, opt_false>::parse;
+		case 5: return strconv_pcdata_impl<opt_true, opt_false, opt_true>::parse;
+		case 6: return strconv_pcdata_impl<opt_true, opt_true, opt_false>::parse;
+		case 7: return strconv_pcdata_impl<opt_true, opt_true, opt_true>::parse;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	typedef char_t* (*strconv_attribute_t)(char_t*, char_t);
+
+	template <typename opt_escape> struct strconv_attribute_impl
+	{
+		static char_t* parse_wnorm(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			// trim leading whitespaces
+			if (PUGI__IS_CHARTYPE(*s, ct_space))
+			{
+				char_t* str = s;
+
+				do ++str;
+				while (PUGI__IS_CHARTYPE(*str, ct_space));
+
+				g.push(s, str - s);
+			}
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws | ct_space));
+
+				if (*s == end_quote)
+				{
+					char_t* str = g.flush(s);
+
+					do *str-- = 0;
+					while (PUGI__IS_CHARTYPE(*str, ct_space));
+
+					return s + 1;
+				}
+				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				{
+					*s++ = ' ';
+
+					if (PUGI__IS_CHARTYPE(*s, ct_space))
+					{
+						char_t* str = s + 1;
+						while (PUGI__IS_CHARTYPE(*str, ct_space)) ++str;
+
+						g.push(s, str - s);
+					}
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_wconv(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr_ws));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (PUGI__IS_CHARTYPE(*s, ct_space))
+				{
+					if (*s == '\r')
+					{
+						*s++ = ' ';
+
+						if (*s == '\n') g.push(s, 1);
+					}
+					else *s++ = ' ';
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_eol(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (*s == '\r')
+				{
+					*s++ = '\n';
+
+					if (*s == '\n') g.push(s, 1);
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+
+		static char_t* parse_simple(char_t* s, char_t end_quote)
+		{
+			gap g;
+
+			while (true)
+			{
+				PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPE(ss, ct_parse_attr));
+
+				if (*s == end_quote)
+				{
+					*g.flush(s) = 0;
+
+					return s + 1;
+				}
+				else if (opt_escape::value && *s == '&')
+				{
+					s = strconv_escape(s, g);
+				}
+				else if (!*s)
+				{
+					return 0;
+				}
+				else ++s;
+			}
+		}
+	};
+
+	PUGI__FN strconv_attribute_t get_strconv_attribute(unsigned int optmask)
+	{
+		PUGI__STATIC_ASSERT(parse_escapes == 0x10 && parse_eol == 0x20 && parse_wconv_attribute == 0x40 && parse_wnorm_attribute == 0x80);
+
+		switch ((optmask >> 4) & 15) // get bitmask for flags (wnorm wconv eol escapes); this simultaneously checks 4 options from assertion above
+		{
+		case 0:  return strconv_attribute_impl<opt_false>::parse_simple;
+		case 1:  return strconv_attribute_impl<opt_true>::parse_simple;
+		case 2:  return strconv_attribute_impl<opt_false>::parse_eol;
+		case 3:  return strconv_attribute_impl<opt_true>::parse_eol;
+		case 4:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 5:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 6:  return strconv_attribute_impl<opt_false>::parse_wconv;
+		case 7:  return strconv_attribute_impl<opt_true>::parse_wconv;
+		case 8:  return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 9:  return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 10: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 11: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 12: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 13: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		case 14: return strconv_attribute_impl<opt_false>::parse_wnorm;
+		case 15: return strconv_attribute_impl<opt_true>::parse_wnorm;
+		default: assert(false); return 0; // unreachable
+		}
+	}
+
+	inline xml_parse_result make_parse_result(xml_parse_status status, ptrdiff_t offset = 0)
+	{
+		xml_parse_result result;
+		result.status = status;
+		result.offset = offset;
+
+		return result;
+	}
+
+	struct xml_parser
+	{
+		xml_allocator* alloc;
+		char_t* error_offset;
+		xml_parse_status error_status;
+
+		xml_parser(xml_allocator* alloc_): alloc(alloc_), error_offset(0), error_status(status_ok)
+		{
+		}
+
+		// DOCTYPE consists of nested sections of the following possible types:
+		// <!-- ... -->, <? ... ?>, "...", '...'
+		// <![...]]>
+		// <!...>
+		// First group can not contain nested groups
+		// Second group can contain nested groups of the same type
+		// Third group can contain all other groups
+		char_t* parse_doctype_primitive(char_t* s)
+		{
+			if (*s == '"' || *s == '\'')
+			{
+				// quoted string
+				char_t ch = *s++;
+				PUGI__SCANFOR(*s == ch);
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s++;
+			}
+			else if (s[0] == '<' && s[1] == '?')
+			{
+				// <? ... ?>
+				s += 2;
+				PUGI__SCANFOR(s[0] == '?' && s[1] == '>'); // no need for ENDSWITH because ?> can't terminate proper doctype
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s += 2;
+			}
+			else if (s[0] == '<' && s[1] == '!' && s[2] == '-' && s[3] == '-')
+			{
+				s += 4;
+				PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && s[2] == '>'); // no need for ENDSWITH because --> can't terminate proper doctype
+				if (!*s) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				s += 3;
+			}
+			else PUGI__THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_doctype_ignore(char_t* s)
+		{
+			size_t depth = 0;
+
+			assert(s[0] == '<' && s[1] == '!' && s[2] == '[');
+			s += 3;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] == '[')
+				{
+					// nested ignore section
+					s += 3;
+					depth++;
+				}
+				else if (s[0] == ']' && s[1] == ']' && s[2] == '>')
+				{
+					// ignore section end
+					s += 3;
+
+					if (depth == 0)
+						return s;
+
+					depth--;
+				}
+				else s++;
+			}
+
+			PUGI__THROW_ERROR(status_bad_doctype, s);
+		}
+
+		char_t* parse_doctype_group(char_t* s, char_t endch)
+		{
+			size_t depth = 0;
+
+			assert((s[0] == '<' || s[0] == 0) && s[1] == '!');
+			s += 2;
+
+			while (*s)
+			{
+				if (s[0] == '<' && s[1] == '!' && s[2] != '-')
+				{
+					if (s[2] == '[')
+					{
+						// ignore
+						s = parse_doctype_ignore(s);
+						if (!s) return s;
+					}
+					else
+					{
+						// some control group
+						s += 2;
+						depth++;
+					}
+				}
+				else if (s[0] == '<' || s[0] == '"' || s[0] == '\'')
+				{
+					// unknown tag (forbidden), or some primitive group
+					s = parse_doctype_primitive(s);
+					if (!s) return s;
+				}
+				else if (*s == '>')
+				{
+					if (depth == 0)
+						return s;
+
+					depth--;
+					s++;
+				}
+				else s++;
+			}
+
+			if (depth != 0 || endch != '>') PUGI__THROW_ERROR(status_bad_doctype, s);
+
+			return s;
+		}
+
+		char_t* parse_exclamation(char_t* s, xml_node_struct* cursor, unsigned int optmsk, char_t endch)
+		{
+			// parse node contents, starting with exclamation mark
+			++s;
+
+			if (*s == '-') // '<!-...'
+			{
+				++s;
+
+				if (*s == '-') // '<!--...'
+				{
+					++s;
+
+					if (PUGI__OPTSET(parse_comments))
+					{
+						PUGI__PUSHNODE(node_comment); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+					}
+
+					if (PUGI__OPTSET(parse_eol) && PUGI__OPTSET(parse_comments))
+					{
+						s = strconv_comment(s, endch);
+
+						if (!s) PUGI__THROW_ERROR(status_bad_comment, cursor->value);
+					}
+					else
+					{
+						// Scan for terminating '-->'.
+						PUGI__SCANFOR(s[0] == '-' && s[1] == '-' && PUGI__ENDSWITH(s[2], '>'));
+						PUGI__CHECK_ERROR(status_bad_comment, s);
+
+						if (PUGI__OPTSET(parse_comments))
+							*s = 0; // Zero-terminate this segment at the first terminating '-'.
+
+						s += (s[2] == '>' ? 3 : 2); // Step over the '\0->'.
+					}
+				}
+				else PUGI__THROW_ERROR(status_bad_comment, s);
+			}
+			else if (*s == '[')
+			{
+				// '<![CDATA[...'
+				if (*++s=='C' && *++s=='D' && *++s=='A' && *++s=='T' && *++s=='A' && *++s == '[')
+				{
+					++s;
+
+					if (PUGI__OPTSET(parse_cdata))
+					{
+						PUGI__PUSHNODE(node_cdata); // Append a new node on the tree.
+						cursor->value = s; // Save the offset.
+
+						if (PUGI__OPTSET(parse_eol))
+						{
+							s = strconv_cdata(s, endch);
+
+							if (!s) PUGI__THROW_ERROR(status_bad_cdata, cursor->value);
+						}
+						else
+						{
+							// Scan for terminating ']]>'.
+							PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
+							PUGI__CHECK_ERROR(status_bad_cdata, s);
+
+							*s++ = 0; // Zero-terminate this segment.
+						}
+					}
+					else // Flagged for discard, but we still have to scan for the terminator.
+					{
+						// Scan for terminating ']]>'.
+						PUGI__SCANFOR(s[0] == ']' && s[1] == ']' && PUGI__ENDSWITH(s[2], '>'));
+						PUGI__CHECK_ERROR(status_bad_cdata, s);
+
+						++s;
+					}
+
+					s += (s[1] == '>' ? 2 : 1); // Step over the last ']>'.
+				}
+				else PUGI__THROW_ERROR(status_bad_cdata, s);
+			}
+			else if (s[0] == 'D' && s[1] == 'O' && s[2] == 'C' && s[3] == 'T' && s[4] == 'Y' && s[5] == 'P' && PUGI__ENDSWITH(s[6], 'E'))
+			{
+				s -= 2;
+
+				if (cursor->parent) PUGI__THROW_ERROR(status_bad_doctype, s);
+
+				char_t* mark = s + 9;
+
+				s = parse_doctype_group(s, endch);
+				if (!s) return s;
+
+				assert((*s == 0 && endch == '>') || *s == '>');
+				if (*s) *s++ = 0;
+
+				if (PUGI__OPTSET(parse_doctype))
+				{
+					while (PUGI__IS_CHARTYPE(*mark, ct_space)) ++mark;
+
+					PUGI__PUSHNODE(node_doctype);
+
+					cursor->value = mark;
+				}
+			}
+			else if (*s == 0 && endch == '-') PUGI__THROW_ERROR(status_bad_comment, s);
+			else if (*s == 0 && endch == '[') PUGI__THROW_ERROR(status_bad_cdata, s);
+			else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+
+			return s;
+		}
+
+		char_t* parse_question(char_t* s, xml_node_struct*& ref_cursor, unsigned int optmsk, char_t endch)
+		{
+			// load into registers
+			xml_node_struct* cursor = ref_cursor;
+			char_t ch = 0;
+
+			// parse node contents, starting with question mark
+			++s;
+
+			// read PI target
+			char_t* target = s;
+
+			if (!PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_pi, s);
+
+			PUGI__SCANWHILE(PUGI__IS_CHARTYPE(*s, ct_symbol));
+			PUGI__CHECK_ERROR(status_bad_pi, s);
+
+			// determine node type; stricmp / strcasecmp is not portable
+			bool declaration = (target[0] | ' ') == 'x' && (target[1] | ' ') == 'm' && (target[2] | ' ') == 'l' && target + 3 == s;
+
+			if (declaration ? PUGI__OPTSET(parse_declaration) : PUGI__OPTSET(parse_pi))
+			{
+				if (declaration)
+				{
+					// disallow non top-level declarations
+					if (cursor->parent) PUGI__THROW_ERROR(status_bad_pi, s);
+
+					PUGI__PUSHNODE(node_declaration);
+				}
+				else
+				{
+					PUGI__PUSHNODE(node_pi);
+				}
+
+				cursor->name = target;
+
+				PUGI__ENDSEG();
+
+				// parse value/attributes
+				if (ch == '?')
+				{
+					// empty node
+					if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_pi, s);
+					s += (*s == '>');
+
+					PUGI__POPNODE();
+				}
+				else if (PUGI__IS_CHARTYPE(ch, ct_space))
+				{
+					PUGI__SKIPWS();
+
+					// scan for tag end
+					char_t* value = s;
+
+					PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
+					PUGI__CHECK_ERROR(status_bad_pi, s);
+
+					if (declaration)
+					{
+						// replace ending ? with / so that 'element' terminates properly
+						*s = '/';
+
+						// we exit from this function with cursor at node_declaration, which is a signal to parse() to go to LOC_ATTRIBUTES
+						s = value;
+					}
+					else
+					{
+						// store value and step over >
+						cursor->value = value;
+
+						PUGI__POPNODE();
+
+						PUGI__ENDSEG();
+
+						s += (*s == '>');
+					}
+				}
+				else PUGI__THROW_ERROR(status_bad_pi, s);
+			}
+			else
+			{
+				// scan for tag end
+				PUGI__SCANFOR(s[0] == '?' && PUGI__ENDSWITH(s[1], '>'));
+				PUGI__CHECK_ERROR(status_bad_pi, s);
+
+				s += (s[1] == '>' ? 2 : 1);
+			}
+
+			// store from registers
+			ref_cursor = cursor;
+
+			return s;
+		}
+
+		char_t* parse_tree(char_t* s, xml_node_struct* root, unsigned int optmsk, char_t endch)
+		{
+			strconv_attribute_t strconv_attribute = get_strconv_attribute(optmsk);
+			strconv_pcdata_t strconv_pcdata = get_strconv_pcdata(optmsk);
+
+			char_t ch = 0;
+			xml_node_struct* cursor = root;
+			char_t* mark = s;
+
+			while (*s != 0)
+			{
+				if (*s == '<')
+				{
+					++s;
+
+				LOC_TAG:
+					if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // '<#...'
+					{
+						PUGI__PUSHNODE(node_element); // Append a new node to the tree.
+
+						cursor->name = s;
+
+						PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+						PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+
+						if (ch == '>')
+						{
+							// end of tag
+						}
+						else if (PUGI__IS_CHARTYPE(ch, ct_space))
+						{
+						LOC_ATTRIBUTES:
+							while (true)
+							{
+								PUGI__SKIPWS(); // Eat any whitespace.
+
+								if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) // <... #...
+								{
+									xml_attribute_struct* a = append_new_attribute(cursor, *alloc); // Make space for this attribute.
+									if (!a) PUGI__THROW_ERROR(status_out_of_memory, s);
+
+									a->name = s; // Save the offset.
+
+									PUGI__SCANWHILE_UNROLL(PUGI__IS_CHARTYPE(ss, ct_symbol)); // Scan for a terminator.
+									PUGI__ENDSEG(); // Save char in 'ch', terminate & step over.
+
+									if (PUGI__IS_CHARTYPE(ch, ct_space))
+									{
+										PUGI__SKIPWS(); // Eat any whitespace.
+
+										ch = *s;
+										++s;
+									}
+
+									if (ch == '=') // '<... #=...'
+									{
+										PUGI__SKIPWS(); // Eat any whitespace.
+
+										if (*s == '"' || *s == '\'') // '<... #="...'
+										{
+											ch = *s; // Save quote char to avoid breaking on "''" -or- '""'.
+											++s; // Step over the quote.
+											a->value = s; // Save the offset.
+
+											s = strconv_attribute(s, ch);
+
+											if (!s) PUGI__THROW_ERROR(status_bad_attribute, a->value);
+
+											// After this line the loop continues from the start;
+											// Whitespaces, / and > are ok, symbols and EOF are wrong,
+											// everything else will be detected
+											if (PUGI__IS_CHARTYPE(*s, ct_start_symbol)) PUGI__THROW_ERROR(status_bad_attribute, s);
+										}
+										else PUGI__THROW_ERROR(status_bad_attribute, s);
+									}
+									else PUGI__THROW_ERROR(status_bad_attribute, s);
+								}
+								else if (*s == '/')
+								{
+									++s;
+
+									if (*s == '>')
+									{
+										PUGI__POPNODE();
+										s++;
+										break;
+									}
+									else if (*s == 0 && endch == '>')
+									{
+										PUGI__POPNODE();
+										break;
+									}
+									else PUGI__THROW_ERROR(status_bad_start_element, s);
+								}
+								else if (*s == '>')
+								{
+									++s;
+
+									break;
+								}
+								else if (*s == 0 && endch == '>')
+								{
+									break;
+								}
+								else PUGI__THROW_ERROR(status_bad_start_element, s);
+							}
+
+							// !!!
+						}
+						else if (ch == '/') // '<#.../'
+						{
+							if (!PUGI__ENDSWITH(*s, '>')) PUGI__THROW_ERROR(status_bad_start_element, s);
+
+							PUGI__POPNODE(); // Pop.
+
+							s += (*s == '>');
+						}
+						else if (ch == 0)
+						{
+							// we stepped over null terminator, backtrack & handle closing tag
+							--s;
+
+							if (endch != '>') PUGI__THROW_ERROR(status_bad_start_element, s);
+						}
+						else PUGI__THROW_ERROR(status_bad_start_element, s);
+					}
+					else if (*s == '/')
+					{
+						++s;
+
+						mark = s;
+
+						char_t* name = cursor->name;
+						if (!name) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+
+						while (PUGI__IS_CHARTYPE(*s, ct_symbol))
+						{
+							if (*s++ != *name++) PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						if (*name)
+						{
+							if (*s == 0 && name[0] == endch && name[1] == 0) PUGI__THROW_ERROR(status_bad_end_element, s);
+							else PUGI__THROW_ERROR(status_end_element_mismatch, mark);
+						}
+
+						PUGI__POPNODE(); // Pop.
+
+						PUGI__SKIPWS();
+
+						if (*s == 0)
+						{
+							if (endch != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+						}
+						else
+						{
+							if (*s != '>') PUGI__THROW_ERROR(status_bad_end_element, s);
+							++s;
+						}
+					}
+					else if (*s == '?') // '<?...'
+					{
+						s = parse_question(s, cursor, optmsk, endch);
+						if (!s) return s;
+
+						assert(cursor);
+						if (PUGI__NODETYPE(cursor) == node_declaration) goto LOC_ATTRIBUTES;
+					}
+					else if (*s == '!') // '<!...'
+					{
+						s = parse_exclamation(s, cursor, optmsk, endch);
+						if (!s) return s;
+					}
+					else if (*s == 0 && endch == '?') PUGI__THROW_ERROR(status_bad_pi, s);
+					else PUGI__THROW_ERROR(status_unrecognized_tag, s);
+				}
+				else
+				{
+					mark = s; // Save this offset while searching for a terminator.
+
+					PUGI__SKIPWS(); // Eat whitespace if no genuine PCDATA here.
+
+					if (*s == '<' || !*s)
+					{
+						// We skipped some whitespace characters because otherwise we would take the tag branch instead of PCDATA one
+						assert(mark != s);
+
+						if (!PUGI__OPTSET(parse_ws_pcdata | parse_ws_pcdata_single) || PUGI__OPTSET(parse_trim_pcdata))
+						{
+							continue;
+						}
+						else if (PUGI__OPTSET(parse_ws_pcdata_single))
+						{
+							if (s[0] != '<' || s[1] != '/' || cursor->first_child) continue;
+						}
+					}
+
+					if (!PUGI__OPTSET(parse_trim_pcdata))
+						s = mark;
+
+					if (cursor->parent || PUGI__OPTSET(parse_fragment))
+					{
+						if (PUGI__OPTSET(parse_embed_pcdata) && cursor->parent && !cursor->first_child && !cursor->value)
+						{
+							cursor->value = s; // Save the offset.
+						}
+						else
+						{
+							PUGI__PUSHNODE(node_pcdata); // Append a new node on the tree.
+
+							cursor->value = s; // Save the offset.
+
+							PUGI__POPNODE(); // Pop since this is a standalone.
+						}
+
+						s = strconv_pcdata(s);
+
+						if (!*s) break;
+					}
+					else
+					{
+						PUGI__SCANFOR(*s == '<'); // '...<'
+						if (!*s) break;
+
+						++s;
+					}
+
+					// We're after '<'
+					goto LOC_TAG;
+				}
+			}
+
+			// check that last tag is closed
+			if (cursor != root) PUGI__THROW_ERROR(status_end_element_mismatch, s);
+
+			return s;
+		}
+
+	#ifdef PUGIXML_WCHAR_MODE
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			unsigned int bom = 0xfeff;
+			return (s[0] == static_cast<wchar_t>(bom)) ? s + 1 : s;
+		}
+	#else
+		static char_t* parse_skip_bom(char_t* s)
+		{
+			return (s[0] == '\xef' && s[1] == '\xbb' && s[2] == '\xbf') ? s + 3 : s;
+		}
+	#endif
+
+		static bool has_element_node_siblings(xml_node_struct* node)
+		{
+			while (node)
+			{
+				if (PUGI__NODETYPE(node) == node_element) return true;
+
+				node = node->next_sibling;
+			}
+
+			return false;
+		}
+
+		static xml_parse_result parse(char_t* buffer, size_t length, xml_document_struct* xmldoc, xml_node_struct* root, unsigned int optmsk)
+		{
+			// early-out for empty documents
+			if (length == 0)
+				return make_parse_result(PUGI__OPTSET(parse_fragment) ? status_ok : status_no_document_element);
+
+			// get last child of the root before parsing
+			xml_node_struct* last_root_child = root->first_child ? root->first_child->prev_sibling_c + 0 : 0;
+
+			// create parser on stack
+			xml_parser parser(static_cast<xml_allocator*>(xmldoc));
+
+			// save last character and make buffer zero-terminated (speeds up parsing)
+			char_t endch = buffer[length - 1];
+			buffer[length - 1] = 0;
+
+			// skip BOM to make sure it does not end up as part of parse output
+			char_t* buffer_data = parse_skip_bom(buffer);
+
+			// perform actual parsing
+			parser.parse_tree(buffer_data, root, optmsk, endch);
+
+			xml_parse_result result = make_parse_result(parser.error_status, parser.error_offset ? parser.error_offset - buffer : 0);
+			assert(result.offset >= 0 && static_cast<size_t>(result.offset) <= length);
+
+			if (result)
+			{
+				// since we removed last character, we have to handle the only possible false positive (stray <)
+				if (endch == '<')
+					return make_parse_result(status_unrecognized_tag, length - 1);
+
+				// check if there are any element nodes parsed
+				xml_node_struct* first_root_child_parsed = last_root_child ? last_root_child->next_sibling + 0 : root->first_child+ 0;
+
+				if (!PUGI__OPTSET(parse_fragment) && !has_element_node_siblings(first_root_child_parsed))
+					return make_parse_result(status_no_document_element, length - 1);
+			}
+			else
+			{
+				// roll back offset if it occurs on a null terminator in the source buffer
+				if (result.offset > 0 && static_cast<size_t>(result.offset) == length - 1 && endch == 0)
+					result.offset--;
+			}
+
+			return result;
+		}
+	};
+
+	// Output facilities
+	PUGI__FN xml_encoding get_write_native_encoding()
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return get_wchar_encoding();
+	#else
+		return encoding_utf8;
+	#endif
+	}
+
+	PUGI__FN xml_encoding get_write_encoding(xml_encoding encoding)
+	{
+		// replace wchar encoding with utf implementation
+		if (encoding == encoding_wchar) return get_wchar_encoding();
+
+		// replace utf16 encoding with utf16 with specific endianness
+		if (encoding == encoding_utf16) return is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+		// replace utf32 encoding with utf32 with specific endianness
+		if (encoding == encoding_utf32) return is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+		// only do autodetection if no explicit encoding is requested
+		if (encoding != encoding_auto) return encoding;
+
+		// assume utf8 encoding
+		return encoding_utf8;
+	}
+
+	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T)
+	{
+		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+	template <typename D, typename T> PUGI__FN size_t convert_buffer_output_generic(typename T::value_type dest, const char_t* data, size_t length, D, T, bool opt_swap)
+	{
+		PUGI__STATIC_ASSERT(sizeof(char_t) == sizeof(typename D::type));
+
+		typename T::value_type end = D::process(reinterpret_cast<const typename D::type*>(data), length, dest, T());
+
+		if (opt_swap)
+		{
+			for (typename T::value_type i = dest; i != end; ++i)
+				*i = endian_swap(*i);
+		}
+
+		return static_cast<size_t>(end - dest) * sizeof(*dest);
+	}
+
+#ifdef PUGIXML_WCHAR_MODE
+	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 1) return 0;
+
+		// discard last character if it's the lead of a surrogate pair
+		return (sizeof(wchar_t) == 2 && static_cast<unsigned int>(static_cast<uint16_t>(data[length - 1]) - 0xD800) < 0x400) ? length - 1 : length;
+	}
+
+	PUGI__FN size_t convert_buffer_output(char_t* r_char, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		// only endian-swapping is required
+		if (need_endian_swap_utf(encoding, get_wchar_encoding()))
+		{
+			convert_wchar_endian_swap(r_char, data, length);
+
+			return length * sizeof(char_t);
+		}
+
+		// convert to utf8
+		if (encoding == encoding_utf8)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), utf8_writer());
+
+		// convert to utf16
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, wchar_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		// convert to utf32
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, wchar_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		// convert to latin1
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, wchar_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#else
+	PUGI__FN size_t get_valid_length(const char_t* data, size_t length)
+	{
+		if (length < 5) return 0;
+
+		for (size_t i = 1; i <= 4; ++i)
+		{
+			uint8_t ch = static_cast<uint8_t>(data[length - i]);
+
+			// either a standalone character or a leading one
+			if ((ch & 0xc0) != 0x80) return length - i;
+		}
+
+		// there are four non-leading characters at the end, sequence tail is broken so might as well process the whole chunk
+		return length;
+	}
+
+	PUGI__FN size_t convert_buffer_output(char_t* /* r_char */, uint8_t* r_u8, uint16_t* r_u16, uint32_t* r_u32, const char_t* data, size_t length, xml_encoding encoding)
+	{
+		if (encoding == encoding_utf16_be || encoding == encoding_utf16_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf16_le : encoding_utf16_be;
+
+			return convert_buffer_output_generic(r_u16, data, length, utf8_decoder(), utf16_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_utf32_be || encoding == encoding_utf32_le)
+		{
+			xml_encoding native_encoding = is_little_endian() ? encoding_utf32_le : encoding_utf32_be;
+
+			return convert_buffer_output_generic(r_u32, data, length, utf8_decoder(), utf32_writer(), native_encoding != encoding);
+		}
+
+		if (encoding == encoding_latin1)
+			return convert_buffer_output_generic(r_u8, data, length, utf8_decoder(), latin1_writer());
+
+		assert(false && "Invalid encoding"); // unreachable
+		return 0;
+	}
+#endif
+
+	class xml_buffered_writer
+	{
+		xml_buffered_writer(const xml_buffered_writer&);
+		xml_buffered_writer& operator=(const xml_buffered_writer&);
+
+	public:
+		xml_buffered_writer(xml_writer& writer_, xml_encoding user_encoding): writer(writer_), bufsize(0), encoding(get_write_encoding(user_encoding))
+		{
+			PUGI__STATIC_ASSERT(bufcapacity >= 8);
+		}
+
+		size_t flush()
+		{
+			flush(buffer, bufsize);
+			bufsize = 0;
+			return 0;
+		}
+
+		void flush(const char_t* data, size_t size)
+		{
+			if (size == 0) return;
+
+			// fast path, just write data
+			if (encoding == get_write_native_encoding())
+				writer.write(data, size * sizeof(char_t));
+			else
+			{
+				// convert chunk
+				size_t result = convert_buffer_output(scratch.data_char, scratch.data_u8, scratch.data_u16, scratch.data_u32, data, size, encoding);
+				assert(result <= sizeof(scratch));
+
+				// write data
+				writer.write(scratch.data_u8, result);
+			}
+		}
+
+		void write_direct(const char_t* data, size_t length)
+		{
+			// flush the remaining buffer contents
+			flush();
+
+			// handle large chunks
+			if (length > bufcapacity)
+			{
+				if (encoding == get_write_native_encoding())
+				{
+					// fast path, can just write data chunk
+					writer.write(data, length * sizeof(char_t));
+					return;
+				}
+
+				// need to convert in suitable chunks
+				while (length > bufcapacity)
+				{
+					// get chunk size by selecting such number of characters that are guaranteed to fit into scratch buffer
+					// and form a complete codepoint sequence (i.e. discard start of last codepoint if necessary)
+					size_t chunk_size = get_valid_length(data, bufcapacity);
+					assert(chunk_size);
+
+					// convert chunk and write
+					flush(data, chunk_size);
+
+					// iterate
+					data += chunk_size;
+					length -= chunk_size;
+				}
+
+				// small tail is copied below
+				bufsize = 0;
+			}
+
+			memcpy(buffer + bufsize, data, length * sizeof(char_t));
+			bufsize += length;
+		}
+
+		void write_buffer(const char_t* data, size_t length)
+		{
+			size_t offset = bufsize;
+
+			if (offset + length <= bufcapacity)
+			{
+				memcpy(buffer + offset, data, length * sizeof(char_t));
+				bufsize = offset + length;
+			}
+			else
+			{
+				write_direct(data, length);
+			}
+		}
+
+		void write_string(const char_t* data)
+		{
+			// write the part of the string that fits in the buffer
+			size_t offset = bufsize;
+
+			while (*data && offset < bufcapacity)
+				buffer[offset++] = *data++;
+
+			// write the rest
+			if (offset < bufcapacity)
+			{
+				bufsize = offset;
+			}
+			else
+			{
+				// backtrack a bit if we have split the codepoint
+				size_t length = offset - bufsize;
+				size_t extra = length - get_valid_length(data - length, length);
+
+				bufsize = offset - extra;
+
+				write_direct(data - extra, strlength(data) + extra);
+			}
+		}
+
+		void write(char_t d0)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 1) offset = flush();
+
+			buffer[offset + 0] = d0;
+			bufsize = offset + 1;
+		}
+
+		void write(char_t d0, char_t d1)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 2) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			bufsize = offset + 2;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 3) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			bufsize = offset + 3;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 4) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			bufsize = offset + 4;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 5) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			bufsize = offset + 5;
+		}
+
+		void write(char_t d0, char_t d1, char_t d2, char_t d3, char_t d4, char_t d5)
+		{
+			size_t offset = bufsize;
+			if (offset > bufcapacity - 6) offset = flush();
+
+			buffer[offset + 0] = d0;
+			buffer[offset + 1] = d1;
+			buffer[offset + 2] = d2;
+			buffer[offset + 3] = d3;
+			buffer[offset + 4] = d4;
+			buffer[offset + 5] = d5;
+			bufsize = offset + 6;
+		}
+
+		// utf8 maximum expansion: x4 (-> utf32)
+		// utf16 maximum expansion: x2 (-> utf32)
+		// utf32 maximum expansion: x1
+		enum
+		{
+			bufcapacitybytes =
+			#ifdef PUGIXML_MEMORY_OUTPUT_STACK
+				PUGIXML_MEMORY_OUTPUT_STACK
+			#else
+				10240
+			#endif
+			,
+			bufcapacity = bufcapacitybytes / (sizeof(char_t) + 4)
+		};
+
+		char_t buffer[bufcapacity];
+
+		union
+		{
+			uint8_t data_u8[4 * bufcapacity];
+			uint16_t data_u16[2 * bufcapacity];
+			uint32_t data_u32[bufcapacity];
+			char_t data_char[bufcapacity];
+		} scratch;
+
+		xml_writer& writer;
+		size_t bufsize;
+		xml_encoding encoding;
+	};
+
+	PUGI__FN void text_output_escaped(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// While *s is a usual symbol
+			PUGI__SCANWHILE_UNROLL(!PUGI__IS_CHARTYPEX(ss, type));
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			switch (*s)
+			{
+				case 0: break;
+				case '&':
+					writer.write('&', 'a', 'm', 'p', ';');
+					++s;
+					break;
+				case '<':
+					writer.write('&', 'l', 't', ';');
+					++s;
+					break;
+				case '>':
+					writer.write('&', 'g', 't', ';');
+					++s;
+					break;
+				case '"':
+					if (flags & format_attribute_single_quote)
+						writer.write('"');
+					else
+						writer.write('&', 'q', 'u', 'o', 't', ';');
+					++s;
+					break;
+				case '\'':
+					if (flags & format_attribute_single_quote)
+						writer.write('&', 'a', 'p', 'o', 's', ';');
+					else
+						writer.write('\'');
+					++s;
+					break;
+				default: // s is not a usual symbol
+				{
+					unsigned int ch = static_cast<unsigned int>(*s++);
+					assert(ch < 32);
+
+					if (!(flags & format_skip_control_chars))
+						writer.write('&', '#', static_cast<char_t>((ch / 10) + '0'), static_cast<char_t>((ch % 10) + '0'), ';');
+				}
+			}
+		}
+	}
+
+	PUGI__FN void text_output(xml_buffered_writer& writer, const char_t* s, chartypex_t type, unsigned int flags)
+	{
+		if (flags & format_no_escapes)
+			writer.write_string(s);
+		else
+			text_output_escaped(writer, s, type, flags);
+	}
+
+	PUGI__FN void text_output_cdata(xml_buffered_writer& writer, const char_t* s)
+	{
+		do
+		{
+			writer.write('<', '!', '[', 'C', 'D');
+			writer.write('A', 'T', 'A', '[');
+
+			const char_t* prev = s;
+
+			// look for ]]> sequence - we can't output it as is since it terminates CDATA
+			while (*s && !(s[0] == ']' && s[1] == ']' && s[2] == '>')) ++s;
+
+			// skip ]] if we stopped at ]]>, > will go to the next CDATA section
+			if (*s) s += 2;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			writer.write(']', ']', '>');
+		}
+		while (*s);
+	}
+
+	PUGI__FN void text_output_indent(xml_buffered_writer& writer, const char_t* indent, size_t indent_length, unsigned int depth)
+	{
+		switch (indent_length)
+		{
+		case 1:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0]);
+			break;
+		}
+
+		case 2:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1]);
+			break;
+		}
+
+		case 3:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2]);
+			break;
+		}
+
+		case 4:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write(indent[0], indent[1], indent[2], indent[3]);
+			break;
+		}
+
+		default:
+		{
+			for (unsigned int i = 0; i < depth; ++i)
+				writer.write_buffer(indent, indent_length);
+		}
+		}
+	}
+
+	PUGI__FN void node_output_comment(xml_buffered_writer& writer, const char_t* s)
+	{
+		writer.write('<', '!', '-', '-');
+
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for -\0 or -- sequence - we can't output it since -- is illegal in comment body
+			while (*s && !(s[0] == '-' && (s[1] == '-' || s[1] == 0))) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(*s == '-');
+
+				writer.write('-', ' ');
+				++s;
+			}
+		}
+
+		writer.write('-', '-', '>');
+	}
+
+	PUGI__FN void node_output_pi_value(xml_buffered_writer& writer, const char_t* s)
+	{
+		while (*s)
+		{
+			const char_t* prev = s;
+
+			// look for ?> sequence - we can't output it since ?> terminates PI
+			while (*s && !(s[0] == '?' && s[1] == '>')) ++s;
+
+			writer.write_buffer(prev, static_cast<size_t>(s - prev));
+
+			if (*s)
+			{
+				assert(s[0] == '?' && s[1] == '>');
+
+				writer.write('?', ' ', '>');
+				s += 2;
+			}
+		}
+	}
+
+	PUGI__FN void node_output_attributes(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t enquotation_char = (flags & format_attribute_single_quote) ? '\'' : '"';
+
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+		{
+			if ((flags & (format_indent_attributes | format_raw)) == format_indent_attributes)
+			{
+				writer.write('\n');
+
+				text_output_indent(writer, indent, indent_length, depth + 1);
+			}
+			else
+			{
+				writer.write(' ');
+			}
+
+			writer.write_string(a->name ? a->name + 0 : default_name);
+			writer.write('=', enquotation_char);
+
+			if (a->value)
+				text_output(writer, a->value, ctx_special_attr, flags);
+
+			writer.write(enquotation_char);
+		}
+	}
+
+	PUGI__FN bool node_output_start(xml_buffered_writer& writer, xml_node_struct* node, const char_t* indent, size_t indent_length, unsigned int flags, unsigned int depth)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<');
+		writer.write_string(name);
+
+		if (node->first_attribute)
+			node_output_attributes(writer, node, indent, indent_length, flags, depth);
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (!node->value)
+		{
+			if (!node->first_child)
+			{
+				if (flags & format_no_empty_element_tags)
+				{
+					writer.write('>', '<', '/');
+					writer.write_string(name);
+					writer.write('>');
+
+					return false;
+				}
+				else
+				{
+					if ((flags & format_raw) == 0)
+						writer.write(' ');
+
+					writer.write('/', '>');
+
+					return false;
+				}
+			}
+			else
+			{
+				writer.write('>');
+
+				return true;
+			}
+		}
+		else
+		{
+			writer.write('>');
+
+			text_output(writer, node->value, ctx_special_pcdata, flags);
+
+			if (!node->first_child)
+			{
+				writer.write('<', '/');
+				writer.write_string(name);
+				writer.write('>');
+
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
+
+	PUGI__FN void node_output_end(xml_buffered_writer& writer, xml_node_struct* node)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+		const char_t* name = node->name ? node->name + 0 : default_name;
+
+		writer.write('<', '/');
+		writer.write_string(name);
+		writer.write('>');
+	}
+
+	PUGI__FN void node_output_simple(xml_buffered_writer& writer, xml_node_struct* node, unsigned int flags)
+	{
+		const char_t* default_name = PUGIXML_TEXT(":anonymous");
+
+		switch (PUGI__NODETYPE(node))
+		{
+			case node_pcdata:
+				text_output(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""), ctx_special_pcdata, flags);
+				break;
+
+			case node_cdata:
+				text_output_cdata(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_comment:
+				node_output_comment(writer, node->value ? node->value + 0 : PUGIXML_TEXT(""));
+				break;
+
+			case node_pi:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+
+				if (node->value)
+				{
+					writer.write(' ');
+					node_output_pi_value(writer, node->value);
+				}
+
+				writer.write('?', '>');
+				break;
+
+			case node_declaration:
+				writer.write('<', '?');
+				writer.write_string(node->name ? node->name + 0 : default_name);
+				node_output_attributes(writer, node, PUGIXML_TEXT(""), 0, flags | format_raw, 0);
+				writer.write('?', '>');
+				break;
+
+			case node_doctype:
+				writer.write('<', '!', 'D', 'O', 'C');
+				writer.write('T', 'Y', 'P', 'E');
+
+				if (node->value)
+				{
+					writer.write(' ');
+					writer.write_string(node->value);
+				}
+
+				writer.write('>');
+				break;
+
+			default:
+				assert(false && "Invalid node type"); // unreachable
+		}
+	}
+
+	enum indent_flags_t
+	{
+		indent_newline = 1,
+		indent_indent = 2
+	};
+
+	PUGI__FN void node_output(xml_buffered_writer& writer, xml_node_struct* root, const char_t* indent, unsigned int flags, unsigned int depth)
+	{
+		size_t indent_length = ((flags & (format_indent | format_indent_attributes)) && (flags & format_raw) == 0) ? strlength(indent) : 0;
+		unsigned int indent_flags = indent_indent;
+
+		xml_node_struct* node = root;
+
+		do
+		{
+			assert(node);
+
+			// begin writing current node
+			if (PUGI__NODETYPE(node) == node_pcdata || PUGI__NODETYPE(node) == node_cdata)
+			{
+				node_output_simple(writer, node, flags);
+
+				indent_flags = 0;
+			}
+			else
+			{
+				if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+					writer.write('\n');
+
+				if ((indent_flags & indent_indent) && indent_length)
+					text_output_indent(writer, indent, indent_length, depth);
+
+				if (PUGI__NODETYPE(node) == node_element)
+				{
+					indent_flags = indent_newline | indent_indent;
+
+					if (node_output_start(writer, node, indent, indent_length, flags, depth))
+					{
+						// element nodes can have value if parse_embed_pcdata was used
+						if (node->value)
+							indent_flags = 0;
+
+						node = node->first_child;
+						depth++;
+						continue;
+					}
+				}
+				else if (PUGI__NODETYPE(node) == node_document)
+				{
+					indent_flags = indent_indent;
+
+					if (node->first_child)
+					{
+						node = node->first_child;
+						continue;
+					}
+				}
+				else
+				{
+					node_output_simple(writer, node, flags);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+
+			// continue to the next node
+			while (node != root)
+			{
+				if (node->next_sibling)
+				{
+					node = node->next_sibling;
+					break;
+				}
+
+				node = node->parent;
+
+				// write closing node
+				if (PUGI__NODETYPE(node) == node_element)
+				{
+					depth--;
+
+					if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+						writer.write('\n');
+
+					if ((indent_flags & indent_indent) && indent_length)
+						text_output_indent(writer, indent, indent_length, depth);
+
+					node_output_end(writer, node);
+
+					indent_flags = indent_newline | indent_indent;
+				}
+			}
+		}
+		while (node != root);
+
+		if ((indent_flags & indent_newline) && (flags & format_raw) == 0)
+			writer.write('\n');
+	}
+
+	PUGI__FN bool has_declaration(xml_node_struct* node)
+	{
+		for (xml_node_struct* child = node->first_child; child; child = child->next_sibling)
+		{
+			xml_node_type type = PUGI__NODETYPE(child);
+
+			if (type == node_declaration) return true;
+			if (type == node_element) return false;
+		}
+
+		return false;
+	}
+
+	PUGI__FN bool is_attribute_of(xml_attribute_struct* attr, xml_node_struct* node)
+	{
+		for (xml_attribute_struct* a = node->first_attribute; a; a = a->next_attribute)
+			if (a == attr)
+				return true;
+
+		return false;
+	}
+
+	PUGI__FN bool allow_insert_attribute(xml_node_type parent)
+	{
+		return parent == node_element || parent == node_declaration;
+	}
+
+	PUGI__FN bool allow_insert_child(xml_node_type parent, xml_node_type child)
+	{
+		if (parent != node_document && parent != node_element) return false;
+		if (child == node_document || child == node_null) return false;
+		if (parent != node_document && (child == node_declaration || child == node_doctype)) return false;
+
+		return true;
+	}
+
+	PUGI__FN bool allow_move(xml_node parent, xml_node child)
+	{
+		// check that child can be a child of parent
+		if (!allow_insert_child(parent.type(), child.type()))
+			return false;
+
+		// check that node is not moved between documents
+		if (parent.root() != child.root())
+			return false;
+
+		// check that new parent is not in the child subtree
+		xml_node cur = parent;
+
+		while (cur)
+		{
+			if (cur == child)
+				return false;
+
+			cur = cur.parent();
+		}
+
+		return true;
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN void node_copy_string(String& dest, Header& header, uintptr_t header_mask, char_t* source, Header& source_header, xml_allocator* alloc)
+	{
+		assert(!dest && (header & header_mask) == 0);
+
+		if (source)
+		{
+			if (alloc && (source_header & header_mask) == 0)
+			{
+				dest = source;
+
+				// since strcpy_insitu can reuse document buffer memory we need to mark both source and dest as shared
+				header |= xml_memory_page_contents_shared_mask;
+				source_header |= xml_memory_page_contents_shared_mask;
+			}
+			else
+				strcpy_insitu(dest, header, header_mask, source, strlength(source));
+		}
+	}
+
+	PUGI__FN void node_copy_contents(xml_node_struct* dn, xml_node_struct* sn, xml_allocator* shared_alloc)
+	{
+		node_copy_string(dn->name, dn->header, xml_memory_page_name_allocated_mask, sn->name, sn->header, shared_alloc);
+		node_copy_string(dn->value, dn->header, xml_memory_page_value_allocated_mask, sn->value, sn->header, shared_alloc);
+
+		for (xml_attribute_struct* sa = sn->first_attribute; sa; sa = sa->next_attribute)
+		{
+			xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn));
+
+			if (da)
+			{
+				node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+				node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+			}
+		}
+	}
+
+	PUGI__FN void node_copy_tree(xml_node_struct* dn, xml_node_struct* sn)
+	{
+		xml_allocator& alloc = get_allocator(dn);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sn)) ? &alloc : 0;
+
+		node_copy_contents(dn, sn, shared_alloc);
+
+		xml_node_struct* dit = dn;
+		xml_node_struct* sit = sn->first_child;
+
+		while (sit && sit != sn)
+		{
+			// loop invariant: dit is inside the subtree rooted at dn
+			assert(dit);
+
+			// when a tree is copied into one of the descendants, we need to skip that subtree to avoid an infinite loop
+			if (sit != dn)
+			{
+				xml_node_struct* copy = append_new_node(dit, alloc, PUGI__NODETYPE(sit));
+
+				if (copy)
+				{
+					node_copy_contents(copy, sit, shared_alloc);
+
+					if (sit->first_child)
+					{
+						dit = copy;
+						sit = sit->first_child;
+						continue;
+					}
+				}
+			}
+
+			// continue to the next node
+			do
+			{
+				if (sit->next_sibling)
+				{
+					sit = sit->next_sibling;
+					break;
+				}
+
+				sit = sit->parent;
+				dit = dit->parent;
+
+				// loop invariant: dit is inside the subtree rooted at dn while sit is inside sn
+				assert(sit == sn || dit);
+			}
+			while (sit != sn);
+		}
+
+		assert(!sit || dit == dn->parent);
+	}
+
+	PUGI__FN void node_copy_attribute(xml_attribute_struct* da, xml_attribute_struct* sa)
+	{
+		xml_allocator& alloc = get_allocator(da);
+		xml_allocator* shared_alloc = (&alloc == &get_allocator(sa)) ? &alloc : 0;
+
+		node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
+		node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
+	}
+
+	inline bool is_text_node(xml_node_struct* node)
+	{
+		xml_node_type type = PUGI__NODETYPE(node);
+
+		return type == node_pcdata || type == node_cdata;
+	}
+
+	// get value with conversion functions
+	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW U string_to_integer(const char_t* value, U minv, U maxv)
+	{
+		U result = 0;
+		const char_t* s = value;
+
+		while (PUGI__IS_CHARTYPE(*s, ct_space))
+			s++;
+
+		bool negative = (*s == '-');
+
+		s += (*s == '+' || *s == '-');
+
+		bool overflow = false;
+
+		if (s[0] == '0' && (s[1] | ' ') == 'x')
+		{
+			s += 2;
+
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 16 + (*s - '0');
+				else if (static_cast<unsigned>((*s | ' ') - 'a') < 6)
+					result = result * 16 + ((*s | ' ') - 'a' + 10);
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			overflow = digits > sizeof(U) * 2;
+		}
+		else
+		{
+			// since overflow detection relies on length of the sequence skip leading zeros
+			while (*s == '0')
+				s++;
+
+			const char_t* start = s;
+
+			for (;;)
+			{
+				if (static_cast<unsigned>(*s - '0') < 10)
+					result = result * 10 + (*s - '0');
+				else
+					break;
+
+				s++;
+			}
+
+			size_t digits = static_cast<size_t>(s - start);
+
+			PUGI__STATIC_ASSERT(sizeof(U) == 8 || sizeof(U) == 4 || sizeof(U) == 2);
+
+			const size_t max_digits10 = sizeof(U) == 8 ? 20 : sizeof(U) == 4 ? 10 : 5;
+			const char_t max_lead = sizeof(U) == 8 ? '1' : sizeof(U) == 4 ? '4' : '6';
+			const size_t high_bit = sizeof(U) * 8 - 1;
+
+			overflow = digits >= max_digits10 && !(digits == max_digits10 && (*start < max_lead || (*start == max_lead && result >> high_bit)));
+		}
+
+		if (negative)
+		{
+			// Workaround for crayc++ CC-3059: Expected no overflow in routine.
+		#ifdef _CRAYC
+			return (overflow || result > ~minv + 1) ? minv : ~result + 1;
+		#else
+			return (overflow || result > 0 - minv) ? minv : 0 - result;
+		#endif
+		}
+		else
+			return (overflow || result > maxv) ? maxv : result;
+	}
+
+	PUGI__FN int get_value_int(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, static_cast<unsigned int>(INT_MIN), INT_MAX);
+	}
+
+	PUGI__FN unsigned int get_value_uint(const char_t* value)
+	{
+		return string_to_integer<unsigned int>(value, 0, UINT_MAX);
+	}
+
+	PUGI__FN double get_value_double(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(value, 0);
+	#else
+		return strtod(value, 0);
+	#endif
+	}
+
+	PUGI__FN float get_value_float(const char_t* value)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return static_cast<float>(wcstod(value, 0));
+	#else
+		return static_cast<float>(strtod(value, 0));
+	#endif
+	}
+
+	PUGI__FN bool get_value_bool(const char_t* value)
+	{
+		// only look at first char
+		char_t first = *value;
+
+		// 1*, t* (true), T* (True), y* (yes), Y* (YES)
+		return (first == '1' || first == 't' || first == 'T' || first == 'y' || first == 'Y');
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long get_value_llong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, static_cast<unsigned long long>(LLONG_MIN), LLONG_MAX);
+	}
+
+	PUGI__FN unsigned long long get_value_ullong(const char_t* value)
+	{
+		return string_to_integer<unsigned long long>(value, 0, ULLONG_MAX);
+	}
+#endif
+
+	template <typename U> PUGI__FN PUGI__UNSIGNED_OVERFLOW char_t* integer_to_string(char_t* begin, char_t* end, U value, bool negative)
+	{
+		char_t* result = end - 1;
+		U rest = negative ? 0 - value : value;
+
+		do
+		{
+			*result-- = static_cast<char_t>('0' + (rest % 10));
+			rest /= 10;
+		}
+		while (rest);
+
+		assert(result >= begin);
+		(void)begin;
+
+		*result = '-';
+
+		return result + !negative;
+	}
+
+	// set value with conversion functions
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_ascii(String& dest, Header& header, uintptr_t header_mask, char* buf)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		char_t wbuf[128];
+		assert(strlen(buf) < sizeof(wbuf) / sizeof(wbuf[0]));
+
+		size_t offset = 0;
+		for (; buf[offset]; ++offset) wbuf[offset] = buf[offset];
+
+		return strcpy_insitu(dest, header, header_mask, wbuf, offset);
+	#else
+		return strcpy_insitu(dest, header, header_mask, buf, strlen(buf));
+	#endif
+	}
+
+	template <typename U, typename String, typename Header>
+	PUGI__FN bool set_value_integer(String& dest, Header& header, uintptr_t header_mask, U value, bool negative)
+	{
+		char_t buf[64];
+		char_t* end = buf + sizeof(buf) / sizeof(buf[0]);
+		char_t* begin = integer_to_string(buf, end, value, negative);
+
+		return strcpy_insitu(dest, header, header_mask, begin, end - begin);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, float value, int precision)
+	{
+		char buf[128];
+		PUGI__SNPRINTF(buf, "%.*g", precision, double(value));
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_convert(String& dest, Header& header, uintptr_t header_mask, double value, int precision)
+	{
+		char buf[128];
+		PUGI__SNPRINTF(buf, "%.*g", precision, value);
+
+		return set_value_ascii(dest, header, header_mask, buf);
+	}
+
+	template <typename String, typename Header>
+	PUGI__FN bool set_value_bool(String& dest, Header& header, uintptr_t header_mask, bool value)
+	{
+		return strcpy_insitu(dest, header, header_mask, value ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"), value ? 4 : 5);
+	}
+
+	PUGI__FN xml_parse_result load_buffer_impl(xml_document_struct* doc, xml_node_struct* root, void* contents, size_t size, unsigned int options, xml_encoding encoding, bool is_mutable, bool own, char_t** out_buffer)
+	{
+		// check input buffer
+		if (!contents && size) return make_parse_result(status_io_error);
+
+		// get actual encoding
+		xml_encoding buffer_encoding = impl::get_buffer_encoding(encoding, contents, size);
+
+		// get private buffer
+		char_t* buffer = 0;
+		size_t length = 0;
+
+		// coverity[var_deref_model]
+		if (!impl::convert_buffer(buffer, length, buffer_encoding, contents, size, is_mutable)) return impl::make_parse_result(status_out_of_memory);
+
+		// delete original buffer if we performed a conversion
+		if (own && buffer != contents && contents) impl::xml_memory::deallocate(contents);
+
+		// grab onto buffer if it's our buffer, user is responsible for deallocating contents himself
+		if (own || buffer != contents) *out_buffer = buffer;
+
+		// store buffer for offset_debug
+		doc->buffer = buffer;
+
+		// parse
+		xml_parse_result res = impl::xml_parser::parse(buffer, length, doc, root, options);
+
+		// remember encoding
+		res.encoding = buffer_encoding;
+
+		return res;
+	}
+
+	// we need to get length of entire file to load it in memory; the only (relatively) sane way to do it is via seek/tell trick
+	PUGI__FN xml_parse_status get_file_size(FILE* file, size_t& out_result)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE)
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef __int64 length_type;
+
+		_fseeki64(file, 0, SEEK_END);
+		length_type length = _ftelli64(file);
+		_fseeki64(file, 0, SEEK_SET);
+	#elif defined(__MINGW32__) && !defined(__NO_MINGW_LFS) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR))
+		// there are 64-bit versions of fseek/ftell, let's use them
+		typedef off64_t length_type;
+
+		fseeko64(file, 0, SEEK_END);
+		length_type length = ftello64(file);
+		fseeko64(file, 0, SEEK_SET);
+	#else
+		// if this is a 32-bit OS, long is enough; if this is a unix system, long is 64-bit, which is enough; otherwise we can't do anything anyway.
+		typedef long length_type;
+
+		fseek(file, 0, SEEK_END);
+		length_type length = ftell(file);
+		fseek(file, 0, SEEK_SET);
+	#endif
+
+		// check for I/O errors
+		if (length < 0) return status_io_error;
+
+		// check for overflow
+		size_t result = static_cast<size_t>(length);
+
+		if (static_cast<length_type>(result) != length) return status_out_of_memory;
+
+		// finalize
+		out_result = result;
+
+		return status_ok;
+	}
+
+	// This function assumes that buffer has extra sizeof(char_t) writable bytes after size
+	PUGI__FN size_t zero_terminate_buffer(void* buffer, size_t size, xml_encoding encoding)
+	{
+		// We only need to zero-terminate if encoding conversion does not do it for us
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding wchar_encoding = get_wchar_encoding();
+
+		if (encoding == wchar_encoding || need_endian_swap_utf(encoding, wchar_encoding))
+		{
+			size_t length = size / sizeof(char_t);
+
+			static_cast<char_t*>(buffer)[length] = 0;
+			return (length + 1) * sizeof(char_t);
+		}
+	#else
+		if (encoding == encoding_utf8)
+		{
+			static_cast<char*>(buffer)[size] = 0;
+			return size + 1;
+		}
+	#endif
+
+		return size;
+	}
+
+	PUGI__FN xml_parse_result load_file_impl(xml_document_struct* doc, FILE* file, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		if (!file) return make_parse_result(status_file_not_found);
+
+		// get file size (can result in I/O errors)
+		size_t size = 0;
+		xml_parse_status size_status = get_file_size(file, size);
+		if (size_status != status_ok) return make_parse_result(size_status);
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// allocate buffer for the whole file
+		char* contents = static_cast<char*>(xml_memory::allocate(size + max_suffix_size));
+		if (!contents) return make_parse_result(status_out_of_memory);
+
+		// read file in memory
+		size_t read_size = fread(contents, 1, size, file);
+
+		if (read_size != size)
+		{
+			xml_memory::deallocate(contents);
+			return make_parse_result(status_io_error);
+		}
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, contents, size);
+
+		return load_buffer_impl(doc, doc, contents, zero_terminate_buffer(contents, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+
+	PUGI__FN void close_file(FILE* file)
+	{
+		fclose(file);
+	}
+
+#ifndef PUGIXML_NO_STL
+	template <typename T> struct xml_stream_chunk
+	{
+		static xml_stream_chunk* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xml_stream_chunk));
+			if (!memory) return 0;
+
+			return new (memory) xml_stream_chunk();
+		}
+
+		static void destroy(xml_stream_chunk* chunk)
+		{
+			// free chunk chain
+			while (chunk)
+			{
+				xml_stream_chunk* next_ = chunk->next;
+
+				xml_memory::deallocate(chunk);
+
+				chunk = next_;
+			}
+		}
+
+		xml_stream_chunk(): next(0), size(0)
+		{
+		}
+
+		xml_stream_chunk* next;
+		size_t size;
+
+		T data[xml_memory_page_size / sizeof(T)];
+	};
+
+	template <typename T> PUGI__FN xml_parse_status load_stream_data_noseek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		auto_deleter<xml_stream_chunk<T> > chunks(0, xml_stream_chunk<T>::destroy);
+
+		// read file to a chunk list
+		size_t total = 0;
+		xml_stream_chunk<T>* last = 0;
+
+		while (!stream.eof())
+		{
+			// allocate new chunk
+			xml_stream_chunk<T>* chunk = xml_stream_chunk<T>::create();
+			if (!chunk) return status_out_of_memory;
+
+			// append chunk to list
+			if (last) last = last->next = chunk;
+			else chunks.data = last = chunk;
+
+			// read data to chunk
+			stream.read(chunk->data, static_cast<std::streamsize>(sizeof(chunk->data) / sizeof(T)));
+			chunk->size = static_cast<size_t>(stream.gcount()) * sizeof(T);
+
+			// read may set failbit | eofbit in case gcount() is less than read length, so check for other I/O errors
+			if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+			// guard against huge files (chunk size is small enough to make this overflow check work)
+			if (total + chunk->size < total) return status_out_of_memory;
+			total += chunk->size;
+		}
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// copy chunk list to a contiguous buffer
+		char* buffer = static_cast<char*>(xml_memory::allocate(total + max_suffix_size));
+		if (!buffer) return status_out_of_memory;
+
+		char* write = buffer;
+
+		for (xml_stream_chunk<T>* chunk = chunks.data; chunk; chunk = chunk->next)
+		{
+			assert(write + chunk->size <= buffer + total);
+			memcpy(write, chunk->data, chunk->size);
+			write += chunk->size;
+		}
+
+		assert(write == buffer + total);
+
+		// return buffer
+		*out_buffer = buffer;
+		*out_size = total;
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI__FN xml_parse_status load_stream_data_seek(std::basic_istream<T>& stream, void** out_buffer, size_t* out_size)
+	{
+		// get length of remaining data in stream
+		typename std::basic_istream<T>::pos_type pos = stream.tellg();
+		stream.seekg(0, std::ios::end);
+		std::streamoff length = stream.tellg() - pos;
+		stream.seekg(pos);
+
+		if (stream.fail() || pos < 0) return status_io_error;
+
+		// guard against huge files
+		size_t read_length = static_cast<size_t>(length);
+
+		if (static_cast<std::streamsize>(read_length) != length || length < 0) return status_out_of_memory;
+
+		size_t max_suffix_size = sizeof(char_t);
+
+		// read stream data into memory (guard against stream exceptions with buffer holder)
+		auto_deleter<void> buffer(xml_memory::allocate(read_length * sizeof(T) + max_suffix_size), xml_memory::deallocate);
+		if (!buffer.data) return status_out_of_memory;
+
+		stream.read(static_cast<T*>(buffer.data), static_cast<std::streamsize>(read_length));
+
+		// read may set failbit | eofbit in case gcount() is less than read_length (i.e. line ending conversion), so check for other I/O errors
+		if (stream.bad() || (!stream.eof() && stream.fail())) return status_io_error;
+
+		// return buffer
+		size_t actual_length = static_cast<size_t>(stream.gcount());
+		assert(actual_length <= read_length);
+
+		*out_buffer = buffer.release();
+		*out_size = actual_length * sizeof(T);
+
+		return status_ok;
+	}
+
+	template <typename T> PUGI__FN xml_parse_result load_stream_impl(xml_document_struct* doc, std::basic_istream<T>& stream, unsigned int options, xml_encoding encoding, char_t** out_buffer)
+	{
+		void* buffer = 0;
+		size_t size = 0;
+		xml_parse_status status = status_ok;
+
+		// if stream has an error bit set, bail out (otherwise tellg() can fail and we'll clear error bits)
+		if (stream.fail()) return make_parse_result(status_io_error);
+
+		// load stream to memory (using seek-based implementation if possible, since it's faster and takes less memory)
+		if (stream.tellg() < 0)
+		{
+			stream.clear(); // clear error flags that could be set by a failing tellg
+			status = load_stream_data_noseek(stream, &buffer, &size);
+		}
+		else
+			status = load_stream_data_seek(stream, &buffer, &size);
+
+		if (status != status_ok) return make_parse_result(status);
+
+		xml_encoding real_encoding = get_buffer_encoding(encoding, buffer, size);
+
+		return load_buffer_impl(doc, doc, buffer, zero_terminate_buffer(buffer, size, real_encoding), options, real_encoding, true, true, out_buffer);
+	}
+#endif
+
+#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__) || (defined(__MINGW32__) && (!defined(__STRICT_ANSI__) || defined(__MINGW64_VERSION_MAJOR)))
+	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+		return _wfopen(path, mode);
+	}
+#else
+	PUGI__FN char* convert_path_heap(const wchar_t* str)
+	{
+		assert(str);
+
+		// first pass: get length in utf8 characters
+		size_t length = strlength_wide(str);
+		size_t size = as_utf8_begin(str, length);
+
+		// allocate resulting string
+		char* result = static_cast<char*>(xml_memory::allocate(size + 1));
+		if (!result) return 0;
+
+		// second pass: convert to utf8
+		as_utf8_end(result, size, str, length);
+
+		// zero-terminate
+		result[size] = 0;
+
+		return result;
+	}
+
+	PUGI__FN FILE* open_file_wide(const wchar_t* path, const wchar_t* mode)
+	{
+		// there is no standard function to open wide paths, so our best bet is to try utf8 path
+		char* path_utf8 = convert_path_heap(path);
+		if (!path_utf8) return 0;
+
+		// convert mode to ASCII (we mirror _wfopen interface)
+		char mode_ascii[4] = {0};
+		for (size_t i = 0; mode[i]; ++i) mode_ascii[i] = static_cast<char>(mode[i]);
+
+		// try to open the utf8 path
+		FILE* result = fopen(path_utf8, mode_ascii);
+
+		// free dummy buffer
+		xml_memory::deallocate(path_utf8);
+
+		return result;
+	}
+#endif
+
+	PUGI__FN bool save_file_impl(const xml_document& doc, FILE* file, const char_t* indent, unsigned int flags, xml_encoding encoding)
+	{
+		if (!file) return false;
+
+		xml_writer_file writer(file);
+		doc.save(writer, indent, flags, encoding);
+
+		return ferror(file) == 0;
+	}
+
+	struct name_null_sentry
+	{
+		xml_node_struct* node;
+		char_t* name;
+
+		name_null_sentry(xml_node_struct* node_): node(node_), name(node_->name)
+		{
+			node->name = 0;
+		}
+
+		~name_null_sentry()
+		{
+			node->name = name;
+		}
+	};
+PUGI__NS_END
+
+namespace pugi
+{
+	PUGI__FN xml_writer_file::xml_writer_file(void* file_): file(file_)
+	{
+	}
+
+	PUGI__FN void xml_writer_file::write(const void* data, size_t size)
+	{
+		size_t result = fwrite(data, 1, size, static_cast<FILE*>(file));
+		(void)!result; // unfortunately we can't do proper error handling here
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream): narrow_stream(&stream), wide_stream(0)
+	{
+	}
+
+	PUGI__FN xml_writer_stream::xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream): narrow_stream(0), wide_stream(&stream)
+	{
+	}
+
+	PUGI__FN void xml_writer_stream::write(const void* data, size_t size)
+	{
+		if (narrow_stream)
+		{
+			assert(!wide_stream);
+			narrow_stream->write(reinterpret_cast<const char*>(data), static_cast<std::streamsize>(size));
+		}
+		else
+		{
+			assert(wide_stream);
+			assert(size % sizeof(wchar_t) == 0);
+
+			wide_stream->write(reinterpret_cast<const wchar_t*>(data), static_cast<std::streamsize>(size / sizeof(wchar_t)));
+		}
+	}
+#endif
+
+	PUGI__FN xml_tree_walker::xml_tree_walker(): _depth(0)
+	{
+	}
+
+	PUGI__FN xml_tree_walker::~xml_tree_walker()
+	{
+	}
+
+	PUGI__FN int xml_tree_walker::depth() const
+	{
+		return _depth;
+	}
+
+	PUGI__FN bool xml_tree_walker::begin(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI__FN bool xml_tree_walker::end(xml_node&)
+	{
+		return true;
+	}
+
+	PUGI__FN xml_attribute::xml_attribute(): _attr(0)
+	{
+	}
+
+	PUGI__FN xml_attribute::xml_attribute(xml_attribute_struct* attr): _attr(attr)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_attribute(xml_attribute***)
+	{
+	}
+
+	PUGI__FN xml_attribute::operator xml_attribute::unspecified_bool_type() const
+	{
+		return _attr ? unspecified_bool_xml_attribute : 0;
+	}
+
+	PUGI__FN bool xml_attribute::operator!() const
+	{
+		return !_attr;
+	}
+
+	PUGI__FN bool xml_attribute::operator==(const xml_attribute& r) const
+	{
+		return (_attr == r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator!=(const xml_attribute& r) const
+	{
+		return (_attr != r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator<(const xml_attribute& r) const
+	{
+		return (_attr < r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator>(const xml_attribute& r) const
+	{
+		return (_attr > r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator<=(const xml_attribute& r) const
+	{
+		return (_attr <= r._attr);
+	}
+
+	PUGI__FN bool xml_attribute::operator>=(const xml_attribute& r) const
+	{
+		return (_attr >= r._attr);
+	}
+
+	PUGI__FN xml_attribute xml_attribute::next_attribute() const
+	{
+		return _attr ? xml_attribute(_attr->next_attribute) : xml_attribute();
+	}
+
+	PUGI__FN xml_attribute xml_attribute::previous_attribute() const
+	{
+		return _attr && _attr->prev_attribute_c->next_attribute ? xml_attribute(_attr->prev_attribute_c) : xml_attribute();
+	}
+
+	PUGI__FN const char_t* xml_attribute::as_string(const char_t* def) const
+	{
+		return (_attr && _attr->value) ? _attr->value + 0 : def;
+	}
+
+	PUGI__FN int xml_attribute::as_int(int def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_int(_attr->value) : def;
+	}
+
+	PUGI__FN unsigned int xml_attribute::as_uint(unsigned int def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_uint(_attr->value) : def;
+	}
+
+	PUGI__FN double xml_attribute::as_double(double def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_double(_attr->value) : def;
+	}
+
+	PUGI__FN float xml_attribute::as_float(float def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_float(_attr->value) : def;
+	}
+
+	PUGI__FN bool xml_attribute::as_bool(bool def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_bool(_attr->value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long xml_attribute::as_llong(long long def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_llong(_attr->value) : def;
+	}
+
+	PUGI__FN unsigned long long xml_attribute::as_ullong(unsigned long long def) const
+	{
+		return (_attr && _attr->value) ? impl::get_value_ullong(_attr->value) : def;
+	}
+#endif
+
+	PUGI__FN bool xml_attribute::empty() const
+	{
+		return !_attr;
+	}
+
+	PUGI__FN const char_t* xml_attribute::name() const
+	{
+		return (_attr && _attr->name) ? _attr->name + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_attribute::value() const
+	{
+		return (_attr && _attr->value) ? _attr->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN size_t xml_attribute::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_attr) / sizeof(xml_attribute_struct));
+	}
+
+	PUGI__FN xml_attribute_struct* xml_attribute::internal_object() const
+	{
+		return _attr;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(const char_t* rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned int rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(double rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(float rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(bool rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN xml_attribute& xml_attribute::operator=(long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute::operator=(unsigned long long rhs)
+	{
+		set_value(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI__FN bool xml_attribute::set_name(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->name, _attr->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_attribute::set_value(const char_t* rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::strcpy_insitu(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_attribute::set_value(int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned int rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned int>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(double rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(double rhs, int precision)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(float rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(float rhs, int precision)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_convert(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, precision);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(bool rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_bool(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs);
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN bool xml_attribute::set_value(long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0);
+	}
+
+	PUGI__FN bool xml_attribute::set_value(unsigned long long rhs)
+	{
+		if (!_attr) return false;
+
+		return impl::set_value_integer<unsigned long long>(_attr->value, _attr->header, impl::xml_memory_page_value_allocated_mask, rhs, false);
+	}
+#endif
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_attribute& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_node::xml_node(): _root(0)
+	{
+	}
+
+	PUGI__FN xml_node::xml_node(xml_node_struct* p): _root(p)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_node(xml_node***)
+	{
+	}
+
+	PUGI__FN xml_node::operator xml_node::unspecified_bool_type() const
+	{
+		return _root ? unspecified_bool_xml_node : 0;
+	}
+
+	PUGI__FN bool xml_node::operator!() const
+	{
+		return !_root;
+	}
+
+	PUGI__FN xml_node::iterator xml_node::begin() const
+	{
+		return iterator(_root ? _root->first_child + 0 : 0, _root);
+	}
+
+	PUGI__FN xml_node::iterator xml_node::end() const
+	{
+		return iterator(0, _root);
+	}
+
+	PUGI__FN xml_node::attribute_iterator xml_node::attributes_begin() const
+	{
+		return attribute_iterator(_root ? _root->first_attribute + 0 : 0, _root);
+	}
+
+	PUGI__FN xml_node::attribute_iterator xml_node::attributes_end() const
+	{
+		return attribute_iterator(0, _root);
+	}
+
+	PUGI__FN xml_object_range<xml_node_iterator> xml_node::children() const
+	{
+		return xml_object_range<xml_node_iterator>(begin(), end());
+	}
+
+	PUGI__FN xml_object_range<xml_named_node_iterator> xml_node::children(const char_t* name_) const
+	{
+		return xml_object_range<xml_named_node_iterator>(xml_named_node_iterator(child(name_)._root, _root, name_), xml_named_node_iterator(0, _root, name_));
+	}
+
+	PUGI__FN xml_object_range<xml_attribute_iterator> xml_node::attributes() const
+	{
+		return xml_object_range<xml_attribute_iterator>(attributes_begin(), attributes_end());
+	}
+
+	PUGI__FN bool xml_node::operator==(const xml_node& r) const
+	{
+		return (_root == r._root);
+	}
+
+	PUGI__FN bool xml_node::operator!=(const xml_node& r) const
+	{
+		return (_root != r._root);
+	}
+
+	PUGI__FN bool xml_node::operator<(const xml_node& r) const
+	{
+		return (_root < r._root);
+	}
+
+	PUGI__FN bool xml_node::operator>(const xml_node& r) const
+	{
+		return (_root > r._root);
+	}
+
+	PUGI__FN bool xml_node::operator<=(const xml_node& r) const
+	{
+		return (_root <= r._root);
+	}
+
+	PUGI__FN bool xml_node::operator>=(const xml_node& r) const
+	{
+		return (_root >= r._root);
+	}
+
+	PUGI__FN bool xml_node::empty() const
+	{
+		return !_root;
+	}
+
+	PUGI__FN const char_t* xml_node::name() const
+	{
+		return (_root && _root->name) ? _root->name + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN xml_node_type xml_node::type() const
+	{
+		return _root ? PUGI__NODETYPE(_root) : node_null;
+	}
+
+	PUGI__FN const char_t* xml_node::value() const
+	{
+		return (_root && _root->value) ? _root->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN xml_node xml_node::child(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_) const
+	{
+		if (!_root) return xml_attribute();
+
+		for (xml_attribute_struct* i = _root->first_attribute; i; i = i->next_attribute)
+			if (i->name && impl::strequal(name_, i->name))
+				return xml_attribute(i);
+
+		return xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::next_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->next_sibling; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::next_sibling() const
+	{
+		return _root ? xml_node(_root->next_sibling) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::previous_sibling(const char_t* name_) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->prev_sibling_c; i->next_sibling; i = i->prev_sibling_c)
+			if (i->name && impl::strequal(name_, i->name)) return xml_node(i);
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_attribute xml_node::attribute(const char_t* name_, xml_attribute& hint_) const
+	{
+		xml_attribute_struct* hint = hint_._attr;
+
+		// if hint is not an attribute of node, behavior is not defined
+		assert(!hint || (_root && impl::is_attribute_of(hint, _root)));
+
+		if (!_root) return xml_attribute();
+
+		// optimistically search from hint up until the end
+		for (xml_attribute_struct* i = hint; i; i = i->next_attribute)
+			if (i->name && impl::strequal(name_, i->name))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = i->next_attribute;
+
+				return xml_attribute(i);
+			}
+
+		// wrap around and search from the first attribute until the hint
+		// 'j' null pointer check is technically redundant, but it prevents a crash in case the assertion above fails
+		for (xml_attribute_struct* j = _root->first_attribute; j && j != hint; j = j->next_attribute)
+			if (j->name && impl::strequal(name_, j->name))
+			{
+				// update hint to maximize efficiency of searching for consecutive attributes
+				hint_._attr = j->next_attribute;
+
+				return xml_attribute(j);
+			}
+
+		return xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::previous_sibling() const
+	{
+		if (!_root) return xml_node();
+
+		if (_root->prev_sibling_c->next_sibling) return xml_node(_root->prev_sibling_c);
+		else return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::parent() const
+	{
+		return _root ? xml_node(_root->parent) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::root() const
+	{
+		return _root ? xml_node(&impl::get_document(_root)) : xml_node();
+	}
+
+	PUGI__FN xml_text xml_node::text() const
+	{
+		return xml_text(_root);
+	}
+
+	PUGI__FN const char_t* xml_node::child_value() const
+	{
+		if (!_root) return PUGIXML_TEXT("");
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+			return _root->value;
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (impl::is_text_node(i) && i->value)
+				return i->value;
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_node::child_value(const char_t* name_) const
+	{
+		return child(name_).child_value();
+	}
+
+	PUGI__FN xml_attribute xml_node::first_attribute() const
+	{
+		return _root ? xml_attribute(_root->first_attribute) : xml_attribute();
+	}
+
+	PUGI__FN xml_attribute xml_node::last_attribute() const
+	{
+		return _root && _root->first_attribute ? xml_attribute(_root->first_attribute->prev_attribute_c) : xml_attribute();
+	}
+
+	PUGI__FN xml_node xml_node::first_child() const
+	{
+		return _root ? xml_node(_root->first_child) : xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::last_child() const
+	{
+		return _root && _root->first_child ? xml_node(_root->first_child->prev_sibling_c) : xml_node();
+	}
+
+	PUGI__FN bool xml_node::set_name(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+
+		if (type_ != node_element && type_ != node_pi && type_ != node_declaration)
+			return false;
+
+		return impl::strcpy_insitu(_root->name, _root->header, impl::xml_memory_page_name_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN bool xml_node::set_value(const char_t* rhs)
+	{
+		xml_node_type type_ = _root ? PUGI__NODETYPE(_root) : node_null;
+
+		if (type_ != node_pcdata && type_ != node_cdata && type_ != node_comment && type_ != node_pi && type_ != node_doctype)
+			return false;
+
+		return impl::strcpy_insitu(_root->value, _root->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs));
+	}
+
+	PUGI__FN xml_attribute xml_node::append_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::prepend_attribute(const char_t* name_)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_attribute_after(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_attribute_before(const char_t* name_, const xml_attribute& attr)
+	{
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+
+		a.set_name(name_);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::append_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::append_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::prepend_copy(const xml_attribute& proto)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::prepend_attribute(a._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_copy_after(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_after(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_attribute xml_node::insert_copy_before(const xml_attribute& proto, const xml_attribute& attr)
+	{
+		if (!proto) return xml_attribute();
+		if (!impl::allow_insert_attribute(type())) return xml_attribute();
+		if (!attr || !impl::is_attribute_of(attr._attr, _root)) return xml_attribute();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_attribute();
+
+		xml_attribute a(impl::allocate_attribute(alloc));
+		if (!a) return xml_attribute();
+
+		impl::insert_attribute_before(a._attr, attr._attr, _root);
+		impl::node_copy_attribute(a._attr, proto._attr);
+
+		return a;
+	}
+
+	PUGI__FN xml_node xml_node::append_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_child(xml_node_type type_)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_before(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_after(xml_node_type type_, const xml_node& node)
+	{
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+
+		if (type_ == node_declaration) n.set_name(PUGIXML_TEXT("xml"));
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::append_child(const char_t* name_)
+	{
+		xml_node result = append_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_child(const char_t* name_)
+	{
+		xml_node result = prepend_child(node_element);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_after(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_after(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::insert_child_before(const char_t* name_, const xml_node& node)
+	{
+		xml_node result = insert_child_before(node_element, node);
+
+		result.set_name(name_);
+
+		return result;
+	}
+
+	PUGI__FN xml_node xml_node::append_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::append_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_copy(const xml_node& proto)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::prepend_node(n._root, _root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_copy_after(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_after(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::insert_copy_before(const xml_node& proto, const xml_node& node)
+	{
+		xml_node_type type_ = proto.type();
+		if (!impl::allow_insert_child(type(), type_)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		xml_node n(impl::allocate_node(alloc, type_));
+		if (!n) return xml_node();
+
+		impl::insert_node_before(n._root, node._root);
+		impl::node_copy_tree(n._root, proto._root);
+
+		return n;
+	}
+
+	PUGI__FN xml_node xml_node::append_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::append_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::prepend_move(const xml_node& moved)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::prepend_node(moved._root, _root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::insert_move_after(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_after(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI__FN xml_node xml_node::insert_move_before(const xml_node& moved, const xml_node& node)
+	{
+		if (!impl::allow_move(*this, moved)) return xml_node();
+		if (!node._root || node._root->parent != _root) return xml_node();
+		if (moved._root == node._root) return xml_node();
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return xml_node();
+
+		// disable document_buffer_order optimization since moving nodes around changes document order without changing buffer pointers
+		impl::get_document(_root).header |= impl::xml_memory_page_contents_shared_mask;
+
+		impl::remove_node(moved._root);
+		impl::insert_node_before(moved._root, node._root);
+
+		return moved;
+	}
+
+	PUGI__FN bool xml_node::remove_attribute(const char_t* name_)
+	{
+		return remove_attribute(attribute(name_));
+	}
+
+	PUGI__FN bool xml_node::remove_attribute(const xml_attribute& a)
+	{
+		if (!_root || !a._attr) return false;
+		if (!impl::is_attribute_of(a._attr, _root)) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_attribute(a._attr, _root);
+		impl::destroy_attribute(a._attr, alloc);
+
+		return true;
+	}
+
+	PUGI__FN bool xml_node::remove_attributes()
+	{
+		if (!_root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		for (xml_attribute_struct* attr = _root->first_attribute; attr; )
+		{
+			xml_attribute_struct* next = attr->next_attribute;
+
+			impl::destroy_attribute(attr, alloc);
+
+			attr = next;
+		}
+
+		_root->first_attribute = 0;
+
+		return true;
+	}
+
+	PUGI__FN bool xml_node::remove_child(const char_t* name_)
+	{
+		return remove_child(child(name_));
+	}
+
+	PUGI__FN bool xml_node::remove_child(const xml_node& n)
+	{
+		if (!_root || !n._root || n._root->parent != _root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		impl::remove_node(n._root);
+		impl::destroy_node(n._root, alloc);
+
+		return true;
+	}
+
+	PUGI__FN bool xml_node::remove_children()
+	{
+		if (!_root) return false;
+
+		impl::xml_allocator& alloc = impl::get_allocator(_root);
+		if (!alloc.reserve()) return false;
+
+		for (xml_node_struct* child = _root->first_child; child; )
+		{
+			xml_node_struct* next = child->next_sibling;
+
+			impl::destroy_node(child, alloc);
+
+			child = next;
+		}
+
+		_root->first_child = 0;
+
+		return true;
+	}
+
+	PUGI__FN xml_parse_result xml_node::append_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		// append_buffer is only valid for elements/documents
+		if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
+
+		// get document node
+		impl::xml_document_struct* doc = &impl::get_document(_root);
+
+		// disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense
+		doc->header |= impl::xml_memory_page_contents_shared_mask;
+
+		// get extra buffer element (we'll store the document fragment buffer there so that we can deallocate it later)
+		impl::xml_memory_page* page = 0;
+		impl::xml_extra_buffer* extra = static_cast<impl::xml_extra_buffer*>(doc->allocate_memory(sizeof(impl::xml_extra_buffer) + sizeof(void*), page));
+		(void)page;
+
+		if (!extra) return impl::make_parse_result(status_out_of_memory);
+
+	#ifdef PUGIXML_COMPACT
+		// align the memory block to a pointer boundary; this is required for compact mode where memory allocations are only 4b aligned
+		// note that this requires up to sizeof(void*)-1 additional memory, which the allocation above takes into account
+		extra = reinterpret_cast<impl::xml_extra_buffer*>((reinterpret_cast<uintptr_t>(extra) + (sizeof(void*) - 1)) & ~(sizeof(void*) - 1));
+	#endif
+
+		// add extra buffer to the list
+		extra->buffer = 0;
+		extra->next = doc->extra_buffers;
+		doc->extra_buffers = extra;
+
+		// name of the root has to be NULL before parsing - otherwise closing node mismatches will not be detected at the top level
+		impl::name_null_sentry sentry(_root);
+
+		return impl::load_buffer_impl(doc, _root, const_cast<void*>(contents), size, options, encoding, false, false, &extra->buffer);
+	}
+
+	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* name_, const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (i->name && impl::strequal(name_, i->name))
+			{
+				for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+					if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT("")))
+						return xml_node(i);
+			}
+
+		return xml_node();
+	}
+
+	PUGI__FN xml_node xml_node::find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const
+	{
+		if (!_root) return xml_node();
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			for (xml_attribute_struct* a = i->first_attribute; a; a = a->next_attribute)
+				if (a->name && impl::strequal(attr_name, a->name) && impl::strequal(attr_value, a->value ? a->value + 0 : PUGIXML_TEXT("")))
+					return xml_node(i);
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN string_t xml_node::path(char_t delimiter) const
+	{
+		if (!_root) return string_t();
+
+		size_t offset = 0;
+
+		for (xml_node_struct* i = _root; i; i = i->parent)
+		{
+			offset += (i != _root);
+			offset += i->name ? impl::strlength(i->name) : 0;
+		}
+
+		string_t result;
+		result.resize(offset);
+
+		for (xml_node_struct* j = _root; j; j = j->parent)
+		{
+			if (j != _root)
+				result[--offset] = delimiter;
+
+			if (j->name)
+			{
+				size_t length = impl::strlength(j->name);
+
+				offset -= length;
+				memcpy(&result[offset], j->name, length * sizeof(char_t));
+			}
+		}
+
+		assert(offset == 0);
+
+		return result;
+	}
+#endif
+
+	PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
+	{
+		xml_node context = path_[0] == delimiter ? root() : *this;
+
+		if (!context._root) return xml_node();
+
+		const char_t* path_segment = path_;
+
+		while (*path_segment == delimiter) ++path_segment;
+
+		const char_t* path_segment_end = path_segment;
+
+		while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end;
+
+		if (path_segment == path_segment_end) return context;
+
+		const char_t* next_segment = path_segment_end;
+
+		while (*next_segment == delimiter) ++next_segment;
+
+		if (*path_segment == '.' && path_segment + 1 == path_segment_end)
+			return context.first_element_by_path(next_segment, delimiter);
+		else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end)
+			return context.parent().first_element_by_path(next_segment, delimiter);
+		else
+		{
+			for (xml_node_struct* j = context._root->first_child; j; j = j->next_sibling)
+			{
+				if (j->name && impl::strequalrange(j->name, path_segment, static_cast<size_t>(path_segment_end - path_segment)))
+				{
+					xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
+
+					if (subsearch) return subsearch;
+				}
+			}
+
+			return xml_node();
+		}
+	}
+
+	PUGI__FN bool xml_node::traverse(xml_tree_walker& walker)
+	{
+		walker._depth = -1;
+
+		xml_node arg_begin(_root);
+		if (!walker.begin(arg_begin)) return false;
+
+		xml_node_struct* cur = _root ? _root->first_child + 0 : 0;
+
+		if (cur)
+		{
+			++walker._depth;
+
+			do
+			{
+				xml_node arg_for_each(cur);
+				if (!walker.for_each(arg_for_each))
+					return false;
+
+				if (cur->first_child)
+				{
+					++walker._depth;
+					cur = cur->first_child;
+				}
+				else if (cur->next_sibling)
+					cur = cur->next_sibling;
+				else
+				{
+					while (!cur->next_sibling && cur != _root && cur->parent)
+					{
+						--walker._depth;
+						cur = cur->parent;
+					}
+
+					if (cur != _root)
+						cur = cur->next_sibling;
+				}
+			}
+			while (cur && cur != _root);
+		}
+
+		assert(walker._depth == -1);
+
+		xml_node arg_end(_root);
+		return walker.end(arg_end);
+	}
+
+	PUGI__FN size_t xml_node::hash_value() const
+	{
+		return static_cast<size_t>(reinterpret_cast<uintptr_t>(_root) / sizeof(xml_node_struct));
+	}
+
+	PUGI__FN xml_node_struct* xml_node::internal_object() const
+	{
+		return _root;
+	}
+
+	PUGI__FN void xml_node::print(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		if (!_root) return;
+
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		impl::node_output(buffered_writer, _root, indent, flags, depth);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN void xml_node::print(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding, depth);
+	}
+
+	PUGI__FN void xml_node::print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags, unsigned int depth) const
+	{
+		xml_writer_stream writer(stream);
+
+		print(writer, indent, flags, encoding_wchar, depth);
+	}
+#endif
+
+	PUGI__FN ptrdiff_t xml_node::offset_debug() const
+	{
+		if (!_root) return -1;
+
+		impl::xml_document_struct& doc = impl::get_document(_root);
+
+		// we can determine the offset reliably only if there is exactly once parse buffer
+		if (!doc.buffer || doc.extra_buffers) return -1;
+
+		switch (type())
+		{
+		case node_document:
+			return 0;
+
+		case node_element:
+		case node_declaration:
+		case node_pi:
+			return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1;
+
+		case node_pcdata:
+		case node_cdata:
+		case node_comment:
+		case node_doctype:
+			return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1;
+
+		default:
+			assert(false && "Invalid node type"); // unreachable
+			return -1;
+		}
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_text::xml_text(xml_node_struct* root): _root(root)
+	{
+	}
+
+	PUGI__FN xml_node_struct* xml_text::_data() const
+	{
+		if (!_root || impl::is_text_node(_root)) return _root;
+
+		// element nodes can have value if parse_embed_pcdata was used
+		if (PUGI__NODETYPE(_root) == node_element && _root->value)
+			return _root;
+
+		for (xml_node_struct* node = _root->first_child; node; node = node->next_sibling)
+			if (impl::is_text_node(node))
+				return node;
+
+		return 0;
+	}
+
+	PUGI__FN xml_node_struct* xml_text::_data_new()
+	{
+		xml_node_struct* d = _data();
+		if (d) return d;
+
+		return xml_node(_root).append_child(node_pcdata).internal_object();
+	}
+
+	PUGI__FN xml_text::xml_text(): _root(0)
+	{
+	}
+
+	PUGI__FN static void unspecified_bool_xml_text(xml_text***)
+	{
+	}
+
+	PUGI__FN xml_text::operator xml_text::unspecified_bool_type() const
+	{
+		return _data() ? unspecified_bool_xml_text : 0;
+	}
+
+	PUGI__FN bool xml_text::operator!() const
+	{
+		return !_data();
+	}
+
+	PUGI__FN bool xml_text::empty() const
+	{
+		return _data() == 0;
+	}
+
+	PUGI__FN const char_t* xml_text::get() const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? d->value + 0 : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* xml_text::as_string(const char_t* def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? d->value + 0 : def;
+	}
+
+	PUGI__FN int xml_text::as_int(int def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_int(d->value) : def;
+	}
+
+	PUGI__FN unsigned int xml_text::as_uint(unsigned int def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_uint(d->value) : def;
+	}
+
+	PUGI__FN double xml_text::as_double(double def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_double(d->value) : def;
+	}
+
+	PUGI__FN float xml_text::as_float(float def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_float(d->value) : def;
+	}
+
+	PUGI__FN bool xml_text::as_bool(bool def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_bool(d->value) : def;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN long long xml_text::as_llong(long long def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_llong(d->value) : def;
+	}
+
+	PUGI__FN unsigned long long xml_text::as_ullong(unsigned long long def) const
+	{
+		xml_node_struct* d = _data();
+
+		return (d && d->value) ? impl::get_value_ullong(d->value) : def;
+	}
+#endif
+
+	PUGI__FN bool xml_text::set(const char_t* rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::strcpy_insitu(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, impl::strlength(rhs)) : false;
+	}
+
+	PUGI__FN bool xml_text::set(int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned int rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned int>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI__FN bool xml_text::set(long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+
+	PUGI__FN bool xml_text::set(float rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_float_precision) : false;
+	}
+
+	PUGI__FN bool xml_text::set(float rhs, int precision)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
+	}
+
+	PUGI__FN bool xml_text::set(double rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, default_double_precision) : false;
+	}
+
+	PUGI__FN bool xml_text::set(double rhs, int precision)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_convert(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, precision) : false;
+	}
+
+	PUGI__FN bool xml_text::set(bool rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_bool(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs) : false;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN bool xml_text::set(long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, rhs < 0) : false;
+	}
+
+	PUGI__FN bool xml_text::set(unsigned long long rhs)
+	{
+		xml_node_struct* dn = _data_new();
+
+		return dn ? impl::set_value_integer<unsigned long long>(dn->value, dn->header, impl::xml_memory_page_value_allocated_mask, rhs, false) : false;
+	}
+#endif
+
+	PUGI__FN xml_text& xml_text::operator=(const char_t* rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned int rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(double rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(float rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(bool rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_LONG_LONG
+	PUGI__FN xml_text& xml_text::operator=(long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+
+	PUGI__FN xml_text& xml_text::operator=(unsigned long long rhs)
+	{
+		set(rhs);
+		return *this;
+	}
+#endif
+
+	PUGI__FN xml_node xml_text::data() const
+	{
+		return xml_node(_data());
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xml_text& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN xml_node_iterator::xml_node_iterator()
+	{
+	}
+
+	PUGI__FN xml_node_iterator::xml_node_iterator(const xml_node& node): _wrap(node), _parent(node.parent())
+	{
+	}
+
+	PUGI__FN xml_node_iterator::xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI__FN bool xml_node_iterator::operator==(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_node_iterator::operator!=(const xml_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_node& xml_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI__FN xml_node* xml_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_node_iterator& xml_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap._root = _wrap._root->next_sibling;
+		return *this;
+	}
+
+	PUGI__FN xml_node_iterator xml_node_iterator::operator++(int)
+	{
+		xml_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_node_iterator& xml_node_iterator::operator--()
+	{
+		_wrap = _wrap._root ? _wrap.previous_sibling() : _parent.last_child();
+		return *this;
+	}
+
+	PUGI__FN xml_node_iterator xml_node_iterator::operator--(int)
+	{
+		xml_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator()
+	{
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent): _wrap(attr), _parent(parent)
+	{
+	}
+
+	PUGI__FN xml_attribute_iterator::xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent): _wrap(ref), _parent(parent)
+	{
+	}
+
+	PUGI__FN bool xml_attribute_iterator::operator==(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr == rhs._wrap._attr && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_attribute_iterator::operator!=(const xml_attribute_iterator& rhs) const
+	{
+		return _wrap._attr != rhs._wrap._attr || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_attribute& xml_attribute_iterator::operator*() const
+	{
+		assert(_wrap._attr);
+		return _wrap;
+	}
+
+	PUGI__FN xml_attribute* xml_attribute_iterator::operator->() const
+	{
+		assert(_wrap._attr);
+		return const_cast<xml_attribute*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator++()
+	{
+		assert(_wrap._attr);
+		_wrap._attr = _wrap._attr->next_attribute;
+		return *this;
+	}
+
+	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator++(int)
+	{
+		xml_attribute_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_attribute_iterator& xml_attribute_iterator::operator--()
+	{
+		_wrap = _wrap._attr ? _wrap.previous_attribute() : _parent.last_attribute();
+		return *this;
+	}
+
+	PUGI__FN xml_attribute_iterator xml_attribute_iterator::operator--(int)
+	{
+		xml_attribute_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(): _name(0)
+	{
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(const xml_node& node, const char_t* name): _wrap(node), _parent(node.parent()), _name(name)
+	{
+	}
+
+	PUGI__FN xml_named_node_iterator::xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name): _wrap(ref), _parent(parent), _name(name)
+	{
+	}
+
+	PUGI__FN bool xml_named_node_iterator::operator==(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root == rhs._wrap._root && _parent._root == rhs._parent._root;
+	}
+
+	PUGI__FN bool xml_named_node_iterator::operator!=(const xml_named_node_iterator& rhs) const
+	{
+		return _wrap._root != rhs._wrap._root || _parent._root != rhs._parent._root;
+	}
+
+	PUGI__FN xml_node& xml_named_node_iterator::operator*() const
+	{
+		assert(_wrap._root);
+		return _wrap;
+	}
+
+	PUGI__FN xml_node* xml_named_node_iterator::operator->() const
+	{
+		assert(_wrap._root);
+		return const_cast<xml_node*>(&_wrap); // BCC5 workaround
+	}
+
+	PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator++()
+	{
+		assert(_wrap._root);
+		_wrap = _wrap.next_sibling(_name);
+		return *this;
+	}
+
+	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator++(int)
+	{
+		xml_named_node_iterator temp = *this;
+		++*this;
+		return temp;
+	}
+
+	PUGI__FN const xml_named_node_iterator& xml_named_node_iterator::operator--()
+	{
+		if (_wrap._root)
+			_wrap = _wrap.previous_sibling(_name);
+		else
+		{
+			_wrap = _parent.last_child();
+
+			if (!impl::strequal(_wrap.name(), _name))
+				_wrap = _wrap.previous_sibling(_name);
+		}
+
+		return *this;
+	}
+
+	PUGI__FN xml_named_node_iterator xml_named_node_iterator::operator--(int)
+	{
+		xml_named_node_iterator temp = *this;
+		--*this;
+		return temp;
+	}
+
+	PUGI__FN xml_parse_result::xml_parse_result(): status(status_internal_error), offset(0), encoding(encoding_auto)
+	{
+	}
+
+	PUGI__FN xml_parse_result::operator bool() const
+	{
+		return status == status_ok;
+	}
+
+	PUGI__FN const char* xml_parse_result::description() const
+	{
+		switch (status)
+		{
+		case status_ok: return "No error";
+
+		case status_file_not_found: return "File was not found";
+		case status_io_error: return "Error reading from file/stream";
+		case status_out_of_memory: return "Could not allocate memory";
+		case status_internal_error: return "Internal error occurred";
+
+		case status_unrecognized_tag: return "Could not determine tag type";
+
+		case status_bad_pi: return "Error parsing document declaration/processing instruction";
+		case status_bad_comment: return "Error parsing comment";
+		case status_bad_cdata: return "Error parsing CDATA section";
+		case status_bad_doctype: return "Error parsing document type declaration";
+		case status_bad_pcdata: return "Error parsing PCDATA section";
+		case status_bad_start_element: return "Error parsing start element tag";
+		case status_bad_attribute: return "Error parsing element attribute";
+		case status_bad_end_element: return "Error parsing end element tag";
+		case status_end_element_mismatch: return "Start-end tags mismatch";
+
+		case status_append_invalid_root: return "Unable to append nodes: root is not an element or document";
+
+		case status_no_document_element: return "No document element found";
+
+		default: return "Unknown error";
+		}
+	}
+
+	PUGI__FN xml_document::xml_document(): _buffer(0)
+	{
+		_create();
+	}
+
+	PUGI__FN xml_document::~xml_document()
+	{
+		_destroy();
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xml_document::xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT: _buffer(0)
+	{
+		_create();
+		_move(rhs);
+	}
+
+	PUGI__FN xml_document& xml_document::operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		if (this == &rhs) return *this;
+
+		_destroy();
+		_create();
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN void xml_document::reset()
+	{
+		_destroy();
+		_create();
+	}
+
+	PUGI__FN void xml_document::reset(const xml_document& proto)
+	{
+		reset();
+
+		impl::node_copy_tree(_root, proto._root);
+	}
+
+	PUGI__FN void xml_document::_create()
+	{
+		assert(!_root);
+
+	#ifdef PUGIXML_COMPACT
+		// space for page marker for the first page (uint32_t), rounded up to pointer size; assumes pointers are at least 32-bit
+		const size_t page_offset = sizeof(void*);
+	#else
+		const size_t page_offset = 0;
+	#endif
+
+		// initialize sentinel page
+		PUGI__STATIC_ASSERT(sizeof(impl::xml_memory_page) + sizeof(impl::xml_document_struct) + page_offset <= sizeof(_memory));
+
+		// prepare page structure
+		impl::xml_memory_page* page = impl::xml_memory_page::construct(_memory);
+		assert(page);
+
+		page->busy_size = impl::xml_memory_page_size;
+
+		// setup first page marker
+	#ifdef PUGIXML_COMPACT
+		// round-trip through void* to avoid 'cast increases required alignment of target type' warning
+		page->compact_page_marker = reinterpret_cast<uint32_t*>(static_cast<void*>(reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page)));
+		*page->compact_page_marker = sizeof(impl::xml_memory_page);
+	#endif
+
+		// allocate new root
+		_root = new (reinterpret_cast<char*>(page) + sizeof(impl::xml_memory_page) + page_offset) impl::xml_document_struct(page);
+		_root->prev_sibling_c = _root;
+
+		// setup sentinel page
+		page->allocator = static_cast<impl::xml_document_struct*>(_root);
+
+		// setup hash table pointer in allocator
+	#ifdef PUGIXML_COMPACT
+		page->allocator->_hash = &static_cast<impl::xml_document_struct*>(_root)->hash;
+	#endif
+
+		// verify the document allocation
+		assert(reinterpret_cast<char*>(_root) + sizeof(impl::xml_document_struct) <= _memory + sizeof(_memory));
+	}
+
+	PUGI__FN void xml_document::_destroy()
+	{
+		assert(_root);
+
+		// destroy static storage
+		if (_buffer)
+		{
+			impl::xml_memory::deallocate(_buffer);
+			_buffer = 0;
+		}
+
+		// destroy extra buffers (note: no need to destroy linked list nodes, they're allocated using document allocator)
+		for (impl::xml_extra_buffer* extra = static_cast<impl::xml_document_struct*>(_root)->extra_buffers; extra; extra = extra->next)
+		{
+			if (extra->buffer) impl::xml_memory::deallocate(extra->buffer);
+		}
+
+		// destroy dynamic storage, leave sentinel page (it's in static memory)
+		impl::xml_memory_page* root_page = PUGI__GETPAGE(_root);
+		assert(root_page && !root_page->prev);
+		assert(reinterpret_cast<char*>(root_page) >= _memory && reinterpret_cast<char*>(root_page) < _memory + sizeof(_memory));
+
+		for (impl::xml_memory_page* page = root_page->next; page; )
+		{
+			impl::xml_memory_page* next = page->next;
+
+			impl::xml_allocator::deallocate_page(page);
+
+			page = next;
+		}
+
+	#ifdef PUGIXML_COMPACT
+		// destroy hash table
+		static_cast<impl::xml_document_struct*>(_root)->hash.clear();
+	#endif
+
+		_root = 0;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN void xml_document::_move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+	{
+		impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(_root);
+		impl::xml_document_struct* other = static_cast<impl::xml_document_struct*>(rhs._root);
+
+		// save first child pointer for later; this needs hash access
+		xml_node_struct* other_first_child = other->first_child;
+
+	#ifdef PUGIXML_COMPACT
+		// reserve space for the hash table up front; this is the only operation that can fail
+		// if it does, we have no choice but to throw (if we have exceptions)
+		if (other_first_child)
+		{
+			size_t other_children = 0;
+			for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+				other_children++;
+
+			// in compact mode, each pointer assignment could result in a hash table request
+			// during move, we have to relocate document first_child and parents of all children
+			// normally there's just one child and its parent has a pointerless encoding but
+			// we assume the worst here
+			if (!other->_hash->reserve(other_children + 1))
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				return;
+			#else
+				throw std::bad_alloc();
+			#endif
+			}
+		}
+	#endif
+
+		// move allocation state
+		doc->_root = other->_root;
+		doc->_busy_size = other->_busy_size;
+
+		// move buffer state
+		doc->buffer = other->buffer;
+		doc->extra_buffers = other->extra_buffers;
+		_buffer = rhs._buffer;
+
+	#ifdef PUGIXML_COMPACT
+		// move compact hash; note that the hash table can have pointers to other but they will be "inactive", similarly to nodes removed with remove_child
+		doc->hash = other->hash;
+		doc->_hash = &doc->hash;
+
+		// make sure we don't access other hash up until the end when we reinitialize other document
+		other->_hash = 0;
+	#endif
+
+		// move page structure
+		impl::xml_memory_page* doc_page = PUGI__GETPAGE(doc);
+		assert(doc_page && !doc_page->prev && !doc_page->next);
+
+		impl::xml_memory_page* other_page = PUGI__GETPAGE(other);
+		assert(other_page && !other_page->prev);
+
+		// relink pages since root page is embedded into xml_document
+		if (impl::xml_memory_page* page = other_page->next)
+		{
+			assert(page->prev == other_page);
+
+			page->prev = doc_page;
+
+			doc_page->next = page;
+			other_page->next = 0;
+		}
+
+		// make sure pages point to the correct document state
+		for (impl::xml_memory_page* page = doc_page->next; page; page = page->next)
+		{
+			assert(page->allocator == other);
+
+			page->allocator = doc;
+
+		#ifdef PUGIXML_COMPACT
+			// this automatically migrates most children between documents and prevents ->parent assignment from allocating
+			if (page->compact_shared_parent == other)
+				page->compact_shared_parent = doc;
+		#endif
+		}
+
+		// move tree structure
+		assert(!doc->first_child);
+
+		doc->first_child = other_first_child;
+
+		for (xml_node_struct* node = other_first_child; node; node = node->next_sibling)
+		{
+		#ifdef PUGIXML_COMPACT
+			// most children will have migrated when we reassigned compact_shared_parent
+			assert(node->parent == other || node->parent == doc);
+
+			node->parent = doc;
+		#else
+			assert(node->parent == other);
+			node->parent = doc;
+		#endif
+		}
+
+		// reset other document
+		new (other) impl::xml_document_struct(PUGI__GETPAGE(other));
+		rhs._buffer = 0;
+	}
+#endif
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options)
+	{
+		reset();
+
+		return impl::load_stream_impl(static_cast<impl::xml_document_struct*>(_root), stream, options, encoding_wchar, &_buffer);
+	}
+#endif
+
+	PUGI__FN xml_parse_result xml_document::load_string(const char_t* contents, unsigned int options)
+	{
+		// Force native encoding (skip autodetection)
+	#ifdef PUGIXML_WCHAR_MODE
+		xml_encoding encoding = encoding_wchar;
+	#else
+		xml_encoding encoding = encoding_utf8;
+	#endif
+
+		return load_buffer(contents, impl::strlength(contents) * sizeof(char_t), options, encoding);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load(const char_t* contents, unsigned int options)
+	{
+		return load_string(contents, options);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_file(const char* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(fopen(path_, "rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_file(const wchar_t* path_, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, L"rb"), impl::close_file);
+
+		return impl::load_file_impl(static_cast<impl::xml_document_struct*>(_root), file.data, options, encoding, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer(const void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, const_cast<void*>(contents), size, options, encoding, false, false, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer_inplace(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, false, &_buffer);
+	}
+
+	PUGI__FN xml_parse_result xml_document::load_buffer_inplace_own(void* contents, size_t size, unsigned int options, xml_encoding encoding)
+	{
+		reset();
+
+		return impl::load_buffer_impl(static_cast<impl::xml_document_struct*>(_root), _root, contents, size, options, encoding, true, true, &_buffer);
+	}
+
+	PUGI__FN void xml_document::save(xml_writer& writer, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		impl::xml_buffered_writer buffered_writer(writer, encoding);
+
+		if ((flags & format_write_bom) && encoding != encoding_latin1)
+		{
+			// BOM always represents the codepoint U+FEFF, so just write it in native encoding
+		#ifdef PUGIXML_WCHAR_MODE
+			unsigned int bom = 0xfeff;
+			buffered_writer.write(static_cast<wchar_t>(bom));
+		#else
+			buffered_writer.write('\xef', '\xbb', '\xbf');
+		#endif
+		}
+
+		if (!(flags & format_no_declaration) && !impl::has_declaration(_root))
+		{
+			buffered_writer.write_string(PUGIXML_TEXT("<?xml version=\"1.0\""));
+			if (encoding == encoding_latin1) buffered_writer.write_string(PUGIXML_TEXT(" encoding=\"ISO-8859-1\""));
+			buffered_writer.write('?', '>');
+			if (!(flags & format_raw)) buffered_writer.write('\n');
+		}
+
+		impl::node_output(buffered_writer, _root, indent, flags, 0);
+
+		buffered_writer.flush();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN void xml_document::save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding);
+	}
+
+	PUGI__FN void xml_document::save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent, unsigned int flags) const
+	{
+		xml_writer_stream writer(stream);
+
+		save(writer, indent, flags, encoding_wchar);
+	}
+#endif
+
+	PUGI__FN bool xml_document::save_file(const char* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(fopen(path_, (flags & format_save_file_text) ? "w" : "wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding);
+	}
+
+	PUGI__FN bool xml_document::save_file(const wchar_t* path_, const char_t* indent, unsigned int flags, xml_encoding encoding) const
+	{
+		using impl::auto_deleter; // MSVC7 workaround
+		auto_deleter<FILE> file(impl::open_file_wide(path_, (flags & format_save_file_text) ? L"w" : L"wb"), impl::close_file);
+
+		return impl::save_file_impl(*this, file.data, indent, flags, encoding);
+	}
+
+	PUGI__FN xml_node xml_document::document_element() const
+	{
+		assert(_root);
+
+		for (xml_node_struct* i = _root->first_child; i; i = i->next_sibling)
+			if (PUGI__NODETYPE(i) == node_element)
+				return xml_node(i);
+
+		return xml_node();
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const wchar_t* str)
+	{
+		assert(str);
+
+		return impl::as_utf8_impl(str, impl::strlength_wide(str));
+	}
+
+	PUGI__FN std::string PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t>& str)
+	{
+		return impl::as_utf8_impl(str.c_str(), str.size());
+	}
+
+	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const char* str)
+	{
+		assert(str);
+
+		return impl::as_wide_impl(str, strlen(str));
+	}
+
+	PUGI__FN std::basic_string<wchar_t> PUGIXML_FUNCTION as_wide(const std::string& str)
+	{
+		return impl::as_wide_impl(str.c_str(), str.size());
+	}
+#endif
+
+	PUGI__FN void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate)
+	{
+		impl::xml_memory::allocate = allocate;
+		impl::xml_memory::deallocate = deallocate;
+	}
+
+	PUGI__FN allocation_function PUGIXML_FUNCTION get_memory_allocation_function()
+	{
+		return impl::xml_memory::allocate;
+	}
+
+	PUGI__FN deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function()
+	{
+		return impl::xml_memory::deallocate;
+	}
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag _Iter_cat(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_attribute_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+
+	PUGI__FN std::bidirectional_iterator_tag __iterator_category(const pugi::xml_named_node_iterator&)
+	{
+		return std::bidirectional_iterator_tag();
+	}
+}
+#endif
+
+#ifndef PUGIXML_NO_XPATH
+// STL replacements
+PUGI__NS_BEGIN
+	struct equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs == rhs;
+		}
+	};
+
+	struct not_equal_to
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs != rhs;
+		}
+	};
+
+	struct less
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs < rhs;
+		}
+	};
+
+	struct less_equal
+	{
+		template <typename T> bool operator()(const T& lhs, const T& rhs) const
+		{
+			return lhs <= rhs;
+		}
+	};
+
+	template <typename T> inline void swap(T& lhs, T& rhs)
+	{
+		T temp = lhs;
+		lhs = rhs;
+		rhs = temp;
+	}
+
+	template <typename I, typename Pred> PUGI__FN I min_element(I begin, I end, const Pred& pred)
+	{
+		I result = begin;
+
+		for (I it = begin + 1; it != end; ++it)
+			if (pred(*it, *result))
+				result = it;
+
+		return result;
+	}
+
+	template <typename I> PUGI__FN void reverse(I begin, I end)
+	{
+		while (end - begin > 1)
+			swap(*begin++, *--end);
+	}
+
+	template <typename I> PUGI__FN I unique(I begin, I end)
+	{
+		// fast skip head
+		while (end - begin > 1 && *begin != *(begin + 1))
+			begin++;
+
+		if (begin == end)
+			return begin;
+
+		// last written element
+		I write = begin++;
+
+		// merge unique elements
+		while (begin != end)
+		{
+			if (*begin != *write)
+				*++write = *begin++;
+			else
+				begin++;
+		}
+
+		// past-the-end (write points to live element)
+		return write + 1;
+	}
+
+	template <typename T, typename Pred> PUGI__FN void insertion_sort(T* begin, T* end, const Pred& pred)
+	{
+		if (begin == end)
+			return;
+
+		for (T* it = begin + 1; it != end; ++it)
+		{
+			T val = *it;
+			T* hole = it;
+
+			// move hole backwards
+			while (hole > begin && pred(val, *(hole - 1)))
+			{
+				*hole = *(hole - 1);
+				hole--;
+			}
+
+			// fill hole with element
+			*hole = val;
+		}
+	}
+
+	template <typename I, typename Pred> inline I median3(I first, I middle, I last, const Pred& pred)
+	{
+		if (pred(*middle, *first))
+			swap(middle, first);
+		if (pred(*last, *middle))
+			swap(last, middle);
+		if (pred(*middle, *first))
+			swap(middle, first);
+
+		return middle;
+	}
+
+	template <typename T, typename Pred> PUGI__FN void partition3(T* begin, T* end, T pivot, const Pred& pred, T** out_eqbeg, T** out_eqend)
+	{
+		// invariant: array is split into 4 groups: = < ? > (each variable denotes the boundary between the groups)
+		T* eq = begin;
+		T* lt = begin;
+		T* gt = end;
+
+		while (lt < gt)
+		{
+			if (pred(*lt, pivot))
+				lt++;
+			else if (*lt == pivot)
+				swap(*eq++, *lt++);
+			else
+				swap(*lt, *--gt);
+		}
+
+		// we now have just 4 groups: = < >; move equal elements to the middle
+		T* eqbeg = gt;
+
+		for (T* it = begin; it != eq; ++it)
+			swap(*it, *--eqbeg);
+
+		*out_eqbeg = eqbeg;
+		*out_eqend = gt;
+	}
+
+	template <typename I, typename Pred> PUGI__FN void sort(I begin, I end, const Pred& pred)
+	{
+		// sort large chunks
+		while (end - begin > 16)
+		{
+			// find median element
+			I middle = begin + (end - begin) / 2;
+			I median = median3(begin, middle, end - 1, pred);
+
+			// partition in three chunks (< = >)
+			I eqbeg, eqend;
+			partition3(begin, end, *median, pred, &eqbeg, &eqend);
+
+			// loop on larger half
+			if (eqbeg - begin > end - eqend)
+			{
+				sort(eqend, end, pred);
+				end = eqbeg;
+			}
+			else
+			{
+				sort(begin, eqbeg, pred);
+				begin = eqend;
+			}
+		}
+
+		// insertion sort small chunk
+		insertion_sort(begin, end, pred);
+	}
+
+	PUGI__FN bool hash_insert(const void** table, size_t size, const void* key)
+	{
+		assert(key);
+
+		unsigned int h = static_cast<unsigned int>(reinterpret_cast<uintptr_t>(key));
+
+		// MurmurHash3 32-bit finalizer
+		h ^= h >> 16;
+		h *= 0x85ebca6bu;
+		h ^= h >> 13;
+		h *= 0xc2b2ae35u;
+		h ^= h >> 16;
+
+		size_t hashmod = size - 1;
+		size_t bucket = h & hashmod;
+
+		for (size_t probe = 0; probe <= hashmod; ++probe)
+		{
+			if (table[bucket] == 0)
+			{
+				table[bucket] = key;
+				return true;
+			}
+
+			if (table[bucket] == key)
+				return false;
+
+			// hash collision, quadratic probing
+			bucket = (bucket + probe + 1) & hashmod;
+		}
+
+		assert(false && "Hash table is full"); // unreachable
+		return false;
+	}
+PUGI__NS_END
+
+// Allocator used for AST and evaluation stacks
+PUGI__NS_BEGIN
+	static const size_t xpath_memory_page_size =
+	#ifdef PUGIXML_MEMORY_XPATH_PAGE_SIZE
+		PUGIXML_MEMORY_XPATH_PAGE_SIZE
+	#else
+		4096
+	#endif
+		;
+
+	static const uintptr_t xpath_memory_block_alignment = sizeof(double) > sizeof(void*) ? sizeof(double) : sizeof(void*);
+
+	struct xpath_memory_block
+	{
+		xpath_memory_block* next;
+		size_t capacity;
+
+		union
+		{
+			char data[xpath_memory_page_size];
+			double alignment;
+		};
+	};
+
+	struct xpath_allocator
+	{
+		xpath_memory_block* _root;
+		size_t _root_size;
+		bool* _error;
+
+		xpath_allocator(xpath_memory_block* root, bool* error = 0): _root(root), _root_size(0), _error(error)
+		{
+		}
+
+		void* allocate(size_t size)
+		{
+			// round size up to block alignment boundary
+			size = (size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			if (_root_size + size <= _root->capacity)
+			{
+				void* buf = &_root->data[0] + _root_size;
+				_root_size += size;
+				return buf;
+			}
+			else
+			{
+				// make sure we have at least 1/4th of the page free after allocation to satisfy subsequent allocation requests
+				size_t block_capacity_base = sizeof(_root->data);
+				size_t block_capacity_req = size + block_capacity_base / 4;
+				size_t block_capacity = (block_capacity_base > block_capacity_req) ? block_capacity_base : block_capacity_req;
+
+				size_t block_size = block_capacity + offsetof(xpath_memory_block, data);
+
+				xpath_memory_block* block = static_cast<xpath_memory_block*>(xml_memory::allocate(block_size));
+				if (!block)
+				{
+					if (_error) *_error = true;
+					return 0;
+				}
+
+				block->next = _root;
+				block->capacity = block_capacity;
+
+				_root = block;
+				_root_size = size;
+
+				return block->data;
+			}
+		}
+
+		void* reallocate(void* ptr, size_t old_size, size_t new_size)
+		{
+			// round size up to block alignment boundary
+			old_size = (old_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+			new_size = (new_size + xpath_memory_block_alignment - 1) & ~(xpath_memory_block_alignment - 1);
+
+			// we can only reallocate the last object
+			assert(ptr == 0 || static_cast<char*>(ptr) + old_size == &_root->data[0] + _root_size);
+
+			// try to reallocate the object inplace
+			if (ptr && _root_size - old_size + new_size <= _root->capacity)
+			{
+				_root_size = _root_size - old_size + new_size;
+				return ptr;
+			}
+
+			// allocate a new block
+			void* result = allocate(new_size);
+			if (!result) return 0;
+
+			// we have a new block
+			if (ptr)
+			{
+				// copy old data (we only support growing)
+				assert(new_size >= old_size);
+				memcpy(result, ptr, old_size);
+
+				// free the previous page if it had no other objects
+				assert(_root->data == result);
+				assert(_root->next);
+
+				if (_root->next->data == ptr)
+				{
+					// deallocate the whole page, unless it was the first one
+					xpath_memory_block* next = _root->next->next;
+
+					if (next)
+					{
+						xml_memory::deallocate(_root->next);
+						_root->next = next;
+					}
+				}
+			}
+
+			return result;
+		}
+
+		void revert(const xpath_allocator& state)
+		{
+			// free all new pages
+			xpath_memory_block* cur = _root;
+
+			while (cur != state._root)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+
+			// restore state
+			_root = state._root;
+			_root_size = state._root_size;
+		}
+
+		void release()
+		{
+			xpath_memory_block* cur = _root;
+			assert(cur);
+
+			while (cur->next)
+			{
+				xpath_memory_block* next = cur->next;
+
+				xml_memory::deallocate(cur);
+
+				cur = next;
+			}
+		}
+	};
+
+	struct xpath_allocator_capture
+	{
+		xpath_allocator_capture(xpath_allocator* alloc): _target(alloc), _state(*alloc)
+		{
+		}
+
+		~xpath_allocator_capture()
+		{
+			_target->revert(_state);
+		}
+
+		xpath_allocator* _target;
+		xpath_allocator _state;
+	};
+
+	struct xpath_stack
+	{
+		xpath_allocator* result;
+		xpath_allocator* temp;
+	};
+
+	struct xpath_stack_data
+	{
+		xpath_memory_block blocks[2];
+		xpath_allocator result;
+		xpath_allocator temp;
+		xpath_stack stack;
+		bool oom;
+
+		xpath_stack_data(): result(blocks + 0, &oom), temp(blocks + 1, &oom), oom(false)
+		{
+			blocks[0].next = blocks[1].next = 0;
+			blocks[0].capacity = blocks[1].capacity = sizeof(blocks[0].data);
+
+			stack.result = &result;
+			stack.temp = &temp;
+		}
+
+		~xpath_stack_data()
+		{
+			result.release();
+			temp.release();
+		}
+	};
+PUGI__NS_END
+
+// String class
+PUGI__NS_BEGIN
+	class xpath_string
+	{
+		const char_t* _buffer;
+		bool _uses_heap;
+		size_t _length_heap;
+
+		static char_t* duplicate_string(const char_t* string, size_t length, xpath_allocator* alloc)
+		{
+			char_t* result = static_cast<char_t*>(alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return 0;
+
+			memcpy(result, string, length * sizeof(char_t));
+			result[length] = 0;
+
+			return result;
+		}
+
+		xpath_string(const char_t* buffer, bool uses_heap_, size_t length_heap): _buffer(buffer), _uses_heap(uses_heap_), _length_heap(length_heap)
+		{
+		}
+
+	public:
+		static xpath_string from_const(const char_t* str)
+		{
+			return xpath_string(str, false, 0);
+		}
+
+		static xpath_string from_heap_preallocated(const char_t* begin, const char_t* end)
+		{
+			assert(begin <= end && *end == 0);
+
+			return xpath_string(begin, true, static_cast<size_t>(end - begin));
+		}
+
+		static xpath_string from_heap(const char_t* begin, const char_t* end, xpath_allocator* alloc)
+		{
+			assert(begin <= end);
+
+			if (begin == end)
+				return xpath_string();
+
+			size_t length = static_cast<size_t>(end - begin);
+			const char_t* data = duplicate_string(begin, length, alloc);
+
+			return data ? xpath_string(data, true, length) : xpath_string();
+		}
+
+		xpath_string(): _buffer(PUGIXML_TEXT("")), _uses_heap(false), _length_heap(0)
+		{
+		}
+
+		void append(const xpath_string& o, xpath_allocator* alloc)
+		{
+			// skip empty sources
+			if (!*o._buffer) return;
+
+			// fast append for constant empty target and constant source
+			if (!*_buffer && !_uses_heap && !o._uses_heap)
+			{
+				_buffer = o._buffer;
+			}
+			else
+			{
+				// need to make heap copy
+				size_t target_length = length();
+				size_t source_length = o.length();
+				size_t result_length = target_length + source_length;
+
+				// allocate new buffer
+				char_t* result = static_cast<char_t*>(alloc->reallocate(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
+				if (!result) return;
+
+				// append first string to the new buffer in case there was no reallocation
+				if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t));
+
+				// append second string to the new buffer
+				memcpy(result + target_length, o._buffer, source_length * sizeof(char_t));
+				result[result_length] = 0;
+
+				// finalize
+				_buffer = result;
+				_uses_heap = true;
+				_length_heap = result_length;
+			}
+		}
+
+		const char_t* c_str() const
+		{
+			return _buffer;
+		}
+
+		size_t length() const
+		{
+			return _uses_heap ? _length_heap : strlength(_buffer);
+		}
+
+		char_t* data(xpath_allocator* alloc)
+		{
+			// make private heap copy
+			if (!_uses_heap)
+			{
+				size_t length_ = strlength(_buffer);
+				const char_t* data_ = duplicate_string(_buffer, length_, alloc);
+
+				if (!data_) return 0;
+
+				_buffer = data_;
+				_uses_heap = true;
+				_length_heap = length_;
+			}
+
+			return const_cast<char_t*>(_buffer);
+		}
+
+		bool empty() const
+		{
+			return *_buffer == 0;
+		}
+
+		bool operator==(const xpath_string& o) const
+		{
+			return strequal(_buffer, o._buffer);
+		}
+
+		bool operator!=(const xpath_string& o) const
+		{
+			return !strequal(_buffer, o._buffer);
+		}
+
+		bool uses_heap() const
+		{
+			return _uses_heap;
+		}
+	};
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	PUGI__FN bool starts_with(const char_t* string, const char_t* pattern)
+	{
+		while (*pattern && *string == *pattern)
+		{
+			string++;
+			pattern++;
+		}
+
+		return *pattern == 0;
+	}
+
+	PUGI__FN const char_t* find_char(const char_t* s, char_t c)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcschr(s, c);
+	#else
+		return strchr(s, c);
+	#endif
+	}
+
+	PUGI__FN const char_t* find_substring(const char_t* s, const char_t* p)
+	{
+	#ifdef PUGIXML_WCHAR_MODE
+		// MSVC6 wcsstr bug workaround (if s is empty it always returns 0)
+		return (*p == 0) ? s : wcsstr(s, p);
+	#else
+		return strstr(s, p);
+	#endif
+	}
+
+	// Converts symbol to lower case, if it is an ASCII one
+	PUGI__FN char_t tolower_ascii(char_t ch)
+	{
+		return static_cast<unsigned int>(ch - 'A') < 26 ? static_cast<char_t>(ch | ' ') : ch;
+	}
+
+	PUGI__FN xpath_string string_value(const xpath_node& na, xpath_allocator* alloc)
+	{
+		if (na.attribute())
+			return xpath_string::from_const(na.attribute().value());
+		else
+		{
+			xml_node n = na.node();
+
+			switch (n.type())
+			{
+			case node_pcdata:
+			case node_cdata:
+			case node_comment:
+			case node_pi:
+				return xpath_string::from_const(n.value());
+
+			case node_document:
+			case node_element:
+			{
+				xpath_string result;
+
+				// element nodes can have value if parse_embed_pcdata was used
+				if (n.value()[0])
+					result.append(xpath_string::from_const(n.value()), alloc);
+
+				xml_node cur = n.first_child();
+
+				while (cur && cur != n)
+				{
+					if (cur.type() == node_pcdata || cur.type() == node_cdata)
+						result.append(xpath_string::from_const(cur.value()), alloc);
+
+					if (cur.first_child())
+						cur = cur.first_child();
+					else if (cur.next_sibling())
+						cur = cur.next_sibling();
+					else
+					{
+						while (!cur.next_sibling() && cur != n)
+							cur = cur.parent();
+
+						if (cur != n) cur = cur.next_sibling();
+					}
+				}
+
+				return result;
+			}
+
+			default:
+				return xpath_string();
+			}
+		}
+	}
+
+	PUGI__FN bool node_is_before_sibling(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		assert(ln->parent == rn->parent);
+
+		// there is no common ancestor (the shared parent is null), nodes are from different documents
+		if (!ln->parent) return ln < rn;
+
+		// determine sibling order
+		xml_node_struct* ls = ln;
+		xml_node_struct* rs = rn;
+
+		while (ls && rs)
+		{
+			if (ls == rn) return true;
+			if (rs == ln) return false;
+
+			ls = ls->next_sibling;
+			rs = rs->next_sibling;
+		}
+
+		// if rn sibling chain ended ln must be before rn
+		return !rs;
+	}
+
+	PUGI__FN bool node_is_before(xml_node_struct* ln, xml_node_struct* rn)
+	{
+		// find common ancestor at the same depth, if any
+		xml_node_struct* lp = ln;
+		xml_node_struct* rp = rn;
+
+		while (lp && rp && lp->parent != rp->parent)
+		{
+			lp = lp->parent;
+			rp = rp->parent;
+		}
+
+		// parents are the same!
+		if (lp && rp) return node_is_before_sibling(lp, rp);
+
+		// nodes are at different depths, need to normalize heights
+		bool left_higher = !lp;
+
+		while (lp)
+		{
+			lp = lp->parent;
+			ln = ln->parent;
+		}
+
+		while (rp)
+		{
+			rp = rp->parent;
+			rn = rn->parent;
+		}
+
+		// one node is the ancestor of the other
+		if (ln == rn) return left_higher;
+
+		// find common ancestor... again
+		while (ln->parent != rn->parent)
+		{
+			ln = ln->parent;
+			rn = rn->parent;
+		}
+
+		return node_is_before_sibling(ln, rn);
+	}
+
+	PUGI__FN bool node_is_ancestor(xml_node_struct* parent, xml_node_struct* node)
+	{
+		while (node && node != parent) node = node->parent;
+
+		return parent && node == parent;
+	}
+
+	PUGI__FN const void* document_buffer_order(const xpath_node& xnode)
+	{
+		xml_node_struct* node = xnode.node().internal_object();
+
+		if (node)
+		{
+			if ((get_document(node).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if (node->name && (node->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return node->name;
+				if (node->value && (node->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return node->value;
+			}
+
+			return 0;
+		}
+
+		xml_attribute_struct* attr = xnode.attribute().internal_object();
+
+		if (attr)
+		{
+			if ((get_document(attr).header & xml_memory_page_contents_shared_mask) == 0)
+			{
+				if ((attr->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0) return attr->name;
+				if ((attr->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0) return attr->value;
+			}
+
+			return 0;
+		}
+
+		return 0;
+	}
+
+	struct document_order_comparator
+	{
+		bool operator()(const xpath_node& lhs, const xpath_node& rhs) const
+		{
+			// optimized document order based check
+			const void* lo = document_buffer_order(lhs);
+			const void* ro = document_buffer_order(rhs);
+
+			if (lo && ro) return lo < ro;
+
+			// slow comparison
+			xml_node ln = lhs.node(), rn = rhs.node();
+
+			// compare attributes
+			if (lhs.attribute() && rhs.attribute())
+			{
+				// shared parent
+				if (lhs.parent() == rhs.parent())
+				{
+					// determine sibling order
+					for (xml_attribute a = lhs.attribute(); a; a = a.next_attribute())
+						if (a == rhs.attribute())
+							return true;
+
+					return false;
+				}
+
+				// compare attribute parents
+				ln = lhs.parent();
+				rn = rhs.parent();
+			}
+			else if (lhs.attribute())
+			{
+				// attributes go after the parent element
+				if (lhs.parent() == rhs.node()) return false;
+
+				ln = lhs.parent();
+			}
+			else if (rhs.attribute())
+			{
+				// attributes go after the parent element
+				if (rhs.parent() == lhs.node()) return true;
+
+				rn = rhs.parent();
+			}
+
+			if (ln == rn) return false;
+
+			if (!ln || !rn) return ln < rn;
+
+			return node_is_before(ln.internal_object(), rn.internal_object());
+		}
+	};
+
+	PUGI__FN double gen_nan()
+	{
+	#if defined(__STDC_IEC_559__) || ((FLT_RADIX - 0 == 2) && (FLT_MAX_EXP - 0 == 128) && (FLT_MANT_DIG - 0 == 24))
+		PUGI__STATIC_ASSERT(sizeof(float) == sizeof(uint32_t));
+		typedef uint32_t UI; // BCC5 workaround
+		union { float f; UI i; } u;
+		u.i = 0x7fc00000;
+		return double(u.f);
+	#else
+		// fallback
+		const volatile double zero = 0.0;
+		return zero / zero;
+	#endif
+	}
+
+	PUGI__FN bool is_nan(double value)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		return !!_isnan(value);
+	#elif defined(fpclassify) && defined(FP_NAN)
+		return fpclassify(value) == FP_NAN;
+	#else
+		// fallback
+		const volatile double v = value;
+		return v != v;
+	#endif
+	}
+
+	PUGI__FN const char_t* convert_number_to_string_special(double value)
+	{
+	#if defined(PUGI__MSVC_CRT_VERSION) || defined(__BORLANDC__)
+		if (_finite(value)) return (value == 0) ? PUGIXML_TEXT("0") : 0;
+		if (_isnan(value)) return PUGIXML_TEXT("NaN");
+		return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+	#elif defined(fpclassify) && defined(FP_NAN) && defined(FP_INFINITE) && defined(FP_ZERO)
+		switch (fpclassify(value))
+		{
+		case FP_NAN:
+			return PUGIXML_TEXT("NaN");
+
+		case FP_INFINITE:
+			return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+
+		case FP_ZERO:
+			return PUGIXML_TEXT("0");
+
+		default:
+			return 0;
+		}
+	#else
+		// fallback
+		const volatile double v = value;
+
+		if (v == 0) return PUGIXML_TEXT("0");
+		if (v != v) return PUGIXML_TEXT("NaN");
+		if (v * 2 == v) return value > 0 ? PUGIXML_TEXT("Infinity") : PUGIXML_TEXT("-Infinity");
+		return 0;
+	#endif
+	}
+
+	PUGI__FN bool convert_number_to_boolean(double value)
+	{
+		return (value != 0 && !is_nan(value));
+	}
+
+	PUGI__FN void truncate_zeros(char* begin, char* end)
+	{
+		while (begin != end && end[-1] == '0') end--;
+
+		*end = 0;
+	}
+
+	// gets mantissa digits in the form of 0.xxxxx with 0. implied and the exponent
+#if defined(PUGI__MSVC_CRT_VERSION) && PUGI__MSVC_CRT_VERSION >= 1400 && !defined(_WIN32_WCE)
+	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get base values
+		int sign, exponent;
+		_ecvt_s(buffer, sizeof(buffer), value, DBL_DIG + 1, &exponent, &sign);
+
+		// truncate redundant zeros
+		truncate_zeros(buffer, buffer + strlen(buffer));
+
+		// fill results
+		*out_mantissa = buffer;
+		*out_exponent = exponent;
+	}
+#else
+	PUGI__FN void convert_number_to_mantissa_exponent(double value, char (&buffer)[32], char** out_mantissa, int* out_exponent)
+	{
+		// get a scientific notation value with IEEE DBL_DIG decimals
+		PUGI__SNPRINTF(buffer, "%.*e", DBL_DIG, value);
+
+		// get the exponent (possibly negative)
+		char* exponent_string = strchr(buffer, 'e');
+		assert(exponent_string);
+
+		int exponent = atoi(exponent_string + 1);
+
+		// extract mantissa string: skip sign
+		char* mantissa = buffer[0] == '-' ? buffer + 1 : buffer;
+		assert(mantissa[0] != '0' && mantissa[1] == '.');
+
+		// divide mantissa by 10 to eliminate integer part
+		mantissa[1] = mantissa[0];
+		mantissa++;
+		exponent++;
+
+		// remove extra mantissa digits and zero-terminate mantissa
+		truncate_zeros(mantissa, exponent_string);
+
+		// fill results
+		*out_mantissa = mantissa;
+		*out_exponent = exponent;
+	}
+#endif
+
+	PUGI__FN xpath_string convert_number_to_string(double value, xpath_allocator* alloc)
+	{
+		// try special number conversion
+		const char_t* special = convert_number_to_string_special(value);
+		if (special) return xpath_string::from_const(special);
+
+		// get mantissa + exponent form
+		char mantissa_buffer[32];
+
+		char* mantissa;
+		int exponent;
+		convert_number_to_mantissa_exponent(value, mantissa_buffer, &mantissa, &exponent);
+
+		// allocate a buffer of suitable length for the number
+		size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4;
+		char_t* result = static_cast<char_t*>(alloc->allocate(sizeof(char_t) * result_size));
+		if (!result) return xpath_string();
+
+		// make the number!
+		char_t* s = result;
+
+		// sign
+		if (value < 0) *s++ = '-';
+
+		// integer part
+		if (exponent <= 0)
+		{
+			*s++ = '0';
+		}
+		else
+		{
+			while (exponent > 0)
+			{
+				assert(*mantissa == 0 || static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa ? *mantissa++ : '0';
+				exponent--;
+			}
+		}
+
+		// fractional part
+		if (*mantissa)
+		{
+			// decimal point
+			*s++ = '.';
+
+			// extra zeroes from negative exponent
+			while (exponent < 0)
+			{
+				*s++ = '0';
+				exponent++;
+			}
+
+			// extra mantissa digits
+			while (*mantissa)
+			{
+				assert(static_cast<unsigned int>(*mantissa - '0') <= 9);
+				*s++ = *mantissa++;
+			}
+		}
+
+		// zero-terminate
+		assert(s < result + result_size);
+		*s = 0;
+
+		return xpath_string::from_heap_preallocated(result, s);
+	}
+
+	PUGI__FN bool check_string_to_number_format(const char_t* string)
+	{
+		// parse leading whitespace
+		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+
+		// parse sign
+		if (*string == '-') ++string;
+
+		if (!*string) return false;
+
+		// if there is no integer part, there should be a decimal part with at least one digit
+		if (!PUGI__IS_CHARTYPEX(string[0], ctx_digit) && (string[0] != '.' || !PUGI__IS_CHARTYPEX(string[1], ctx_digit))) return false;
+
+		// parse integer part
+		while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+
+		// parse decimal part
+		if (*string == '.')
+		{
+			++string;
+
+			while (PUGI__IS_CHARTYPEX(*string, ctx_digit)) ++string;
+		}
+
+		// parse trailing whitespace
+		while (PUGI__IS_CHARTYPE(*string, ct_space)) ++string;
+
+		return *string == 0;
+	}
+
+	PUGI__FN double convert_string_to_number(const char_t* string)
+	{
+		// check string format
+		if (!check_string_to_number_format(string)) return gen_nan();
+
+		// parse string
+	#ifdef PUGIXML_WCHAR_MODE
+		return wcstod(string, 0);
+	#else
+		return strtod(string, 0);
+	#endif
+	}
+
+	PUGI__FN bool convert_string_to_number_scratch(char_t (&buffer)[32], const char_t* begin, const char_t* end, double* out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform conversion
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = convert_string_to_number(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+
+	PUGI__FN double round_nearest(double value)
+	{
+		return floor(value + 0.5);
+	}
+
+	PUGI__FN double round_nearest_nzero(double value)
+	{
+		// same as round_nearest, but returns -0 for [-0.5, -0]
+		// ceil is used to differentiate between +0 and -0 (we return -0 for [-0.5, -0] and +0 for +0)
+		return (value >= -0.5 && value <= 0) ? ceil(value) : floor(value + 0.5);
+	}
+
+	PUGI__FN const char_t* qualified_name(const xpath_node& node)
+	{
+		return node.attribute() ? node.attribute().name() : node.node().name();
+	}
+
+	PUGI__FN const char_t* local_name(const xpath_node& node)
+	{
+		const char_t* name = qualified_name(node);
+		const char_t* p = find_char(name, ':');
+
+		return p ? p + 1 : name;
+	}
+
+	struct namespace_uri_predicate
+	{
+		const char_t* prefix;
+		size_t prefix_length;
+
+		namespace_uri_predicate(const char_t* name)
+		{
+			const char_t* pos = find_char(name, ':');
+
+			prefix = pos ? name : 0;
+			prefix_length = pos ? static_cast<size_t>(pos - name) : 0;
+		}
+
+		bool operator()(xml_attribute a) const
+		{
+			const char_t* name = a.name();
+
+			if (!starts_with(name, PUGIXML_TEXT("xmlns"))) return false;
+
+			return prefix ? name[5] == ':' && strequalrange(name + 6, prefix, prefix_length) : name[5] == 0;
+		}
+	};
+
+	PUGI__FN const char_t* namespace_uri(xml_node node)
+	{
+		namespace_uri_predicate pred = node.name();
+
+		xml_node p = node;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* namespace_uri(xml_attribute attr, xml_node parent)
+	{
+		namespace_uri_predicate pred = attr.name();
+
+		// Default namespace does not apply to attributes
+		if (!pred.prefix) return PUGIXML_TEXT("");
+
+		xml_node p = parent;
+
+		while (p)
+		{
+			xml_attribute a = p.find_attribute(pred);
+
+			if (a) return a.value();
+
+			p = p.parent();
+		}
+
+		return PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const char_t* namespace_uri(const xpath_node& node)
+	{
+		return node.attribute() ? namespace_uri(node.attribute(), node.parent()) : namespace_uri(node.node());
+	}
+
+	PUGI__FN char_t* normalize_space(char_t* buffer)
+	{
+		char_t* write = buffer;
+
+		for (char_t* it = buffer; *it; )
+		{
+			char_t ch = *it++;
+
+			if (PUGI__IS_CHARTYPE(ch, ct_space))
+			{
+				// replace whitespace sequence with single space
+				while (PUGI__IS_CHARTYPE(*it, ct_space)) it++;
+
+				// avoid leading spaces
+				if (write != buffer) *write++ = ' ';
+			}
+			else *write++ = ch;
+		}
+
+		// remove trailing space
+		if (write != buffer && PUGI__IS_CHARTYPE(write[-1], ct_space)) write--;
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI__FN char_t* translate(char_t* buffer, const char_t* from, const char_t* to, size_t to_length)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			PUGI__DMC_VOLATILE char_t ch = *buffer++;
+
+			const char_t* pos = find_char(from, ch);
+
+			if (!pos)
+				*write++ = ch; // do not process
+			else if (static_cast<size_t>(pos - from) < to_length)
+				*write++ = to[pos - from]; // replace
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	PUGI__FN unsigned char* translate_table_generate(xpath_allocator* alloc, const char_t* from, const char_t* to)
+	{
+		unsigned char table[128] = {0};
+
+		while (*from)
+		{
+			unsigned int fc = static_cast<unsigned int>(*from);
+			unsigned int tc = static_cast<unsigned int>(*to);
+
+			if (fc >= 128 || tc >= 128)
+				return 0;
+
+			// code=128 means "skip character"
+			if (!table[fc])
+				table[fc] = static_cast<unsigned char>(tc ? tc : 128);
+
+			from++;
+			if (tc) to++;
+		}
+
+		for (int i = 0; i < 128; ++i)
+			if (!table[i])
+				table[i] = static_cast<unsigned char>(i);
+
+		void* result = alloc->allocate(sizeof(table));
+		if (!result) return 0;
+
+		memcpy(result, table, sizeof(table));
+
+		return static_cast<unsigned char*>(result);
+	}
+
+	PUGI__FN char_t* translate_table(char_t* buffer, const unsigned char* table)
+	{
+		char_t* write = buffer;
+
+		while (*buffer)
+		{
+			char_t ch = *buffer++;
+			unsigned int index = static_cast<unsigned int>(ch);
+
+			if (index < 128)
+			{
+				unsigned char code = table[index];
+
+				// code=128 means "skip character" (table size is 128 so 128 can be a special value)
+				// this code skips these characters without extra branches
+				*write = static_cast<char_t>(code);
+				write += 1 - (code >> 7);
+			}
+			else
+			{
+				*write++ = ch;
+			}
+		}
+
+		// zero-terminate
+		*write = 0;
+
+		return write;
+	}
+
+	inline bool is_xpath_attribute(const char_t* name)
+	{
+		return !(starts_with(name, PUGIXML_TEXT("xmlns")) && (name[5] == 0 || name[5] == ':'));
+	}
+
+	struct xpath_variable_boolean: xpath_variable
+	{
+		xpath_variable_boolean(): xpath_variable(xpath_type_boolean), value(false)
+		{
+		}
+
+		bool value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_number: xpath_variable
+	{
+		xpath_variable_number(): xpath_variable(xpath_type_number), value(0)
+		{
+		}
+
+		double value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_string: xpath_variable
+	{
+		xpath_variable_string(): xpath_variable(xpath_type_string), value(0)
+		{
+		}
+
+		~xpath_variable_string()
+		{
+			if (value) xml_memory::deallocate(value);
+		}
+
+		char_t* value;
+		char_t name[1];
+	};
+
+	struct xpath_variable_node_set: xpath_variable
+	{
+		xpath_variable_node_set(): xpath_variable(xpath_type_node_set)
+		{
+		}
+
+		xpath_node_set value;
+		char_t name[1];
+	};
+
+	static const xpath_node_set dummy_node_set;
+
+	PUGI__FN PUGI__UNSIGNED_OVERFLOW unsigned int hash_string(const char_t* str)
+	{
+		// Jenkins one-at-a-time hash (http://en.wikipedia.org/wiki/Jenkins_hash_function#one-at-a-time)
+		unsigned int result = 0;
+
+		while (*str)
+		{
+			result += static_cast<unsigned int>(*str++);
+			result += result << 10;
+			result ^= result >> 6;
+		}
+
+		result += result << 3;
+		result ^= result >> 11;
+		result += result << 15;
+
+		return result;
+	}
+
+	template <typename T> PUGI__FN T* new_xpath_variable(const char_t* name)
+	{
+		size_t length = strlength(name);
+		if (length == 0) return 0; // empty variable names are invalid
+
+		// $$ we can't use offsetof(T, name) because T is non-POD, so we just allocate additional length characters
+		void* memory = xml_memory::allocate(sizeof(T) + length * sizeof(char_t));
+		if (!memory) return 0;
+
+		T* result = new (memory) T();
+
+		memcpy(result->name, name, (length + 1) * sizeof(char_t));
+
+		return result;
+	}
+
+	PUGI__FN xpath_variable* new_xpath_variable(xpath_value_type type, const char_t* name)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			return new_xpath_variable<xpath_variable_node_set>(name);
+
+		case xpath_type_number:
+			return new_xpath_variable<xpath_variable_number>(name);
+
+		case xpath_type_string:
+			return new_xpath_variable<xpath_variable_string>(name);
+
+		case xpath_type_boolean:
+			return new_xpath_variable<xpath_variable_boolean>(name);
+
+		default:
+			return 0;
+		}
+	}
+
+	template <typename T> PUGI__FN void delete_xpath_variable(T* var)
+	{
+		var->~T();
+		xml_memory::deallocate(var);
+	}
+
+	PUGI__FN void delete_xpath_variable(xpath_value_type type, xpath_variable* var)
+	{
+		switch (type)
+		{
+		case xpath_type_node_set:
+			delete_xpath_variable(static_cast<xpath_variable_node_set*>(var));
+			break;
+
+		case xpath_type_number:
+			delete_xpath_variable(static_cast<xpath_variable_number*>(var));
+			break;
+
+		case xpath_type_string:
+			delete_xpath_variable(static_cast<xpath_variable_string*>(var));
+			break;
+
+		case xpath_type_boolean:
+			delete_xpath_variable(static_cast<xpath_variable_boolean*>(var));
+			break;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+		}
+	}
+
+	PUGI__FN bool copy_xpath_variable(xpath_variable* lhs, const xpath_variable* rhs)
+	{
+		switch (rhs->type())
+		{
+		case xpath_type_node_set:
+			return lhs->set(static_cast<const xpath_variable_node_set*>(rhs)->value);
+
+		case xpath_type_number:
+			return lhs->set(static_cast<const xpath_variable_number*>(rhs)->value);
+
+		case xpath_type_string:
+			return lhs->set(static_cast<const xpath_variable_string*>(rhs)->value);
+
+		case xpath_type_boolean:
+			return lhs->set(static_cast<const xpath_variable_boolean*>(rhs)->value);
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return false;
+		}
+	}
+
+	PUGI__FN bool get_variable_scratch(char_t (&buffer)[32], xpath_variable_set* set, const char_t* begin, const char_t* end, xpath_variable** out_result)
+	{
+		size_t length = static_cast<size_t>(end - begin);
+		char_t* scratch = buffer;
+
+		if (length >= sizeof(buffer) / sizeof(buffer[0]))
+		{
+			// need to make dummy on-heap copy
+			scratch = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
+			if (!scratch) return false;
+		}
+
+		// copy string to zero-terminated buffer and perform lookup
+		memcpy(scratch, begin, length * sizeof(char_t));
+		scratch[length] = 0;
+
+		*out_result = set->get(scratch);
+
+		// free dummy buffer
+		if (scratch != buffer) xml_memory::deallocate(scratch);
+
+		return true;
+	}
+PUGI__NS_END
+
+// Internal node set class
+PUGI__NS_BEGIN
+	PUGI__FN xpath_node_set::type_t xpath_get_order(const xpath_node* begin, const xpath_node* end)
+	{
+		if (end - begin < 2)
+			return xpath_node_set::type_sorted;
+
+		document_order_comparator cmp;
+
+		bool first = cmp(begin[0], begin[1]);
+
+		for (const xpath_node* it = begin + 1; it + 1 < end; ++it)
+			if (cmp(it[0], it[1]) != first)
+				return xpath_node_set::type_unsorted;
+
+		return first ? xpath_node_set::type_sorted : xpath_node_set::type_sorted_reverse;
+	}
+
+	PUGI__FN xpath_node_set::type_t xpath_sort(xpath_node* begin, xpath_node* end, xpath_node_set::type_t type, bool rev)
+	{
+		xpath_node_set::type_t order = rev ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+		if (type == xpath_node_set::type_unsorted)
+		{
+			xpath_node_set::type_t sorted = xpath_get_order(begin, end);
+
+			if (sorted == xpath_node_set::type_unsorted)
+			{
+				sort(begin, end, document_order_comparator());
+
+				type = xpath_node_set::type_sorted;
+			}
+			else
+				type = sorted;
+		}
+
+		if (type != order) reverse(begin, end);
+
+		return order;
+	}
+
+	PUGI__FN xpath_node xpath_first(const xpath_node* begin, const xpath_node* end, xpath_node_set::type_t type)
+	{
+		if (begin == end) return xpath_node();
+
+		switch (type)
+		{
+		case xpath_node_set::type_sorted:
+			return *begin;
+
+		case xpath_node_set::type_sorted_reverse:
+			return *(end - 1);
+
+		case xpath_node_set::type_unsorted:
+			return *min_element(begin, end, document_order_comparator());
+
+		default:
+			assert(false && "Invalid node set type"); // unreachable
+			return xpath_node();
+		}
+	}
+
+	class xpath_node_set_raw
+	{
+		xpath_node_set::type_t _type;
+
+		xpath_node* _begin;
+		xpath_node* _end;
+		xpath_node* _eos;
+
+	public:
+		xpath_node_set_raw(): _type(xpath_node_set::type_unsorted), _begin(0), _end(0), _eos(0)
+		{
+		}
+
+		xpath_node* begin() const
+		{
+			return _begin;
+		}
+
+		xpath_node* end() const
+		{
+			return _end;
+		}
+
+		bool empty() const
+		{
+			return _begin == _end;
+		}
+
+		size_t size() const
+		{
+			return static_cast<size_t>(_end - _begin);
+		}
+
+		xpath_node first() const
+		{
+			return xpath_first(_begin, _end, _type);
+		}
+
+		void push_back_grow(const xpath_node& node, xpath_allocator* alloc);
+
+		void push_back(const xpath_node& node, xpath_allocator* alloc)
+		{
+			if (_end != _eos)
+				*_end++ = node;
+			else
+				push_back_grow(node, alloc);
+		}
+
+		void append(const xpath_node* begin_, const xpath_node* end_, xpath_allocator* alloc)
+		{
+			if (begin_ == end_) return;
+
+			size_t size_ = static_cast<size_t>(_end - _begin);
+			size_t capacity = static_cast<size_t>(_eos - _begin);
+			size_t count = static_cast<size_t>(end_ - begin_);
+
+			if (size_ + count > capacity)
+			{
+				// reallocate the old array or allocate a new one
+				xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node)));
+				if (!data) return;
+
+				// finalize
+				_begin = data;
+				_end = data + size_;
+				_eos = data + size_ + count;
+			}
+
+			memcpy(_end, begin_, count * sizeof(xpath_node));
+			_end += count;
+		}
+
+		void sort_do()
+		{
+			_type = xpath_sort(_begin, _end, _type, false);
+		}
+
+		void truncate(xpath_node* pos)
+		{
+			assert(_begin <= pos && pos <= _end);
+
+			_end = pos;
+		}
+
+		void remove_duplicates(xpath_allocator* alloc)
+		{
+			if (_type == xpath_node_set::type_unsorted && _end - _begin > 2)
+			{
+				xpath_allocator_capture cr(alloc);
+
+				size_t size_ = static_cast<size_t>(_end - _begin);
+
+				size_t hash_size = 1;
+				while (hash_size < size_ + size_ / 2) hash_size *= 2;
+
+				const void** hash_data = static_cast<const void**>(alloc->allocate(hash_size * sizeof(void**)));
+				if (!hash_data) return;
+
+				memset(hash_data, 0, hash_size * sizeof(const void**));
+
+				xpath_node* write = _begin;
+
+				for (xpath_node* it = _begin; it != _end; ++it)
+				{
+					const void* attr = it->attribute().internal_object();
+					const void* node = it->node().internal_object();
+					const void* key = attr ? attr : node;
+
+					if (key && hash_insert(hash_data, hash_size, key))
+					{
+						*write++ = *it;
+					}
+				}
+
+				_end = write;
+			}
+			else
+			{
+				_end = unique(_begin, _end);
+			}
+		}
+
+		xpath_node_set::type_t type() const
+		{
+			return _type;
+		}
+
+		void set_type(xpath_node_set::type_t value)
+		{
+			_type = value;
+		}
+	};
+
+	PUGI__FN_NO_INLINE void xpath_node_set_raw::push_back_grow(const xpath_node& node, xpath_allocator* alloc)
+	{
+		size_t capacity = static_cast<size_t>(_eos - _begin);
+
+		// get new capacity (1.5x rule)
+		size_t new_capacity = capacity + capacity / 2 + 1;
+
+		// reallocate the old array or allocate a new one
+		xpath_node* data = static_cast<xpath_node*>(alloc->reallocate(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node)));
+		if (!data) return;
+
+		// finalize
+		_begin = data;
+		_end = data + capacity;
+		_eos = data + new_capacity;
+
+		// push
+		*_end++ = node;
+	}
+PUGI__NS_END
+
+PUGI__NS_BEGIN
+	struct xpath_context
+	{
+		xpath_node n;
+		size_t position, size;
+
+		xpath_context(const xpath_node& n_, size_t position_, size_t size_): n(n_), position(position_), size(size_)
+		{
+		}
+	};
+
+	enum lexeme_t
+	{
+		lex_none = 0,
+		lex_equal,
+		lex_not_equal,
+		lex_less,
+		lex_greater,
+		lex_less_or_equal,
+		lex_greater_or_equal,
+		lex_plus,
+		lex_minus,
+		lex_multiply,
+		lex_union,
+		lex_var_ref,
+		lex_open_brace,
+		lex_close_brace,
+		lex_quoted_string,
+		lex_number,
+		lex_slash,
+		lex_double_slash,
+		lex_open_square_brace,
+		lex_close_square_brace,
+		lex_string,
+		lex_comma,
+		lex_axis_attribute,
+		lex_dot,
+		lex_double_dot,
+		lex_double_colon,
+		lex_eof
+	};
+
+	struct xpath_lexer_string
+	{
+		const char_t* begin;
+		const char_t* end;
+
+		xpath_lexer_string(): begin(0), end(0)
+		{
+		}
+
+		bool operator==(const char_t* other) const
+		{
+			size_t length = static_cast<size_t>(end - begin);
+
+			return strequalrange(other, begin, length);
+		}
+	};
+
+	class xpath_lexer
+	{
+		const char_t* _cur;
+		const char_t* _cur_lexeme_pos;
+		xpath_lexer_string _cur_lexeme_contents;
+
+		lexeme_t _cur_lexeme;
+
+	public:
+		explicit xpath_lexer(const char_t* query): _cur(query)
+		{
+			next();
+		}
+
+		const char_t* state() const
+		{
+			return _cur;
+		}
+
+		void next()
+		{
+			const char_t* cur = _cur;
+
+			while (PUGI__IS_CHARTYPE(*cur, ct_space)) ++cur;
+
+			// save lexeme position for error reporting
+			_cur_lexeme_pos = cur;
+
+			switch (*cur)
+			{
+			case 0:
+				_cur_lexeme = lex_eof;
+				break;
+
+			case '>':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_greater_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_greater;
+				}
+				break;
+
+			case '<':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_less_or_equal;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_less;
+				}
+				break;
+
+			case '!':
+				if (*(cur+1) == '=')
+				{
+					cur += 2;
+					_cur_lexeme = lex_not_equal;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			case '=':
+				cur += 1;
+				_cur_lexeme = lex_equal;
+
+				break;
+
+			case '+':
+				cur += 1;
+				_cur_lexeme = lex_plus;
+
+				break;
+
+			case '-':
+				cur += 1;
+				_cur_lexeme = lex_minus;
+
+				break;
+
+			case '*':
+				cur += 1;
+				_cur_lexeme = lex_multiply;
+
+				break;
+
+			case '|':
+				cur += 1;
+				_cur_lexeme = lex_union;
+
+				break;
+
+			case '$':
+				cur += 1;
+
+				if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':' && PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // qname
+					{
+						cur++; // :
+
+						while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_var_ref;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+
+				break;
+
+			case '(':
+				cur += 1;
+				_cur_lexeme = lex_open_brace;
+
+				break;
+
+			case ')':
+				cur += 1;
+				_cur_lexeme = lex_close_brace;
+
+				break;
+
+			case '[':
+				cur += 1;
+				_cur_lexeme = lex_open_square_brace;
+
+				break;
+
+			case ']':
+				cur += 1;
+				_cur_lexeme = lex_close_square_brace;
+
+				break;
+
+			case ',':
+				cur += 1;
+				_cur_lexeme = lex_comma;
+
+				break;
+
+			case '/':
+				if (*(cur+1) == '/')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_slash;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_slash;
+				}
+				break;
+
+			case '.':
+				if (*(cur+1) == '.')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_dot;
+				}
+				else if (PUGI__IS_CHARTYPEX(*(cur+1), ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur; // .
+
+					++cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_dot;
+				}
+				break;
+
+			case '@':
+				cur += 1;
+				_cur_lexeme = lex_axis_attribute;
+
+				break;
+
+			case '"':
+			case '\'':
+			{
+				char_t terminator = *cur;
+
+				++cur;
+
+				_cur_lexeme_contents.begin = cur;
+				while (*cur && *cur != terminator) cur++;
+				_cur_lexeme_contents.end = cur;
+
+				if (!*cur)
+					_cur_lexeme = lex_none;
+				else
+				{
+					cur += 1;
+					_cur_lexeme = lex_quoted_string;
+				}
+
+				break;
+			}
+
+			case ':':
+				if (*(cur+1) == ':')
+				{
+					cur += 2;
+					_cur_lexeme = lex_double_colon;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+				break;
+
+			default:
+				if (PUGI__IS_CHARTYPEX(*cur, ctx_digit))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+
+					if (*cur == '.')
+					{
+						cur++;
+
+						while (PUGI__IS_CHARTYPEX(*cur, ctx_digit)) cur++;
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_number;
+				}
+				else if (PUGI__IS_CHARTYPEX(*cur, ctx_start_symbol))
+				{
+					_cur_lexeme_contents.begin = cur;
+
+					while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+
+					if (cur[0] == ':')
+					{
+						if (cur[1] == '*') // namespace test ncname:*
+						{
+							cur += 2; // :*
+						}
+						else if (PUGI__IS_CHARTYPEX(cur[1], ctx_symbol)) // namespace test qname
+						{
+							cur++; // :
+
+							while (PUGI__IS_CHARTYPEX(*cur, ctx_symbol)) cur++;
+						}
+					}
+
+					_cur_lexeme_contents.end = cur;
+
+					_cur_lexeme = lex_string;
+				}
+				else
+				{
+					_cur_lexeme = lex_none;
+				}
+			}
+
+			_cur = cur;
+		}
+
+		lexeme_t current() const
+		{
+			return _cur_lexeme;
+		}
+
+		const char_t* current_pos() const
+		{
+			return _cur_lexeme_pos;
+		}
+
+		const xpath_lexer_string& contents() const
+		{
+			assert(_cur_lexeme == lex_var_ref || _cur_lexeme == lex_number || _cur_lexeme == lex_string || _cur_lexeme == lex_quoted_string);
+
+			return _cur_lexeme_contents;
+		}
+	};
+
+	enum ast_type_t
+	{
+		ast_unknown,
+		ast_op_or,						// left or right
+		ast_op_and,						// left and right
+		ast_op_equal,					// left = right
+		ast_op_not_equal,				// left != right
+		ast_op_less,					// left < right
+		ast_op_greater,					// left > right
+		ast_op_less_or_equal,			// left <= right
+		ast_op_greater_or_equal,		// left >= right
+		ast_op_add,						// left + right
+		ast_op_subtract,				// left - right
+		ast_op_multiply,				// left * right
+		ast_op_divide,					// left / right
+		ast_op_mod,						// left % right
+		ast_op_negate,					// left - right
+		ast_op_union,					// left | right
+		ast_predicate,					// apply predicate to set; next points to next predicate
+		ast_filter,						// select * from left where right
+		ast_string_constant,			// string constant
+		ast_number_constant,			// number constant
+		ast_variable,					// variable
+		ast_func_last,					// last()
+		ast_func_position,				// position()
+		ast_func_count,					// count(left)
+		ast_func_id,					// id(left)
+		ast_func_local_name_0,			// local-name()
+		ast_func_local_name_1,			// local-name(left)
+		ast_func_namespace_uri_0,		// namespace-uri()
+		ast_func_namespace_uri_1,		// namespace-uri(left)
+		ast_func_name_0,				// name()
+		ast_func_name_1,				// name(left)
+		ast_func_string_0,				// string()
+		ast_func_string_1,				// string(left)
+		ast_func_concat,				// concat(left, right, siblings)
+		ast_func_starts_with,			// starts_with(left, right)
+		ast_func_contains,				// contains(left, right)
+		ast_func_substring_before,		// substring-before(left, right)
+		ast_func_substring_after,		// substring-after(left, right)
+		ast_func_substring_2,			// substring(left, right)
+		ast_func_substring_3,			// substring(left, right, third)
+		ast_func_string_length_0,		// string-length()
+		ast_func_string_length_1,		// string-length(left)
+		ast_func_normalize_space_0,		// normalize-space()
+		ast_func_normalize_space_1,		// normalize-space(left)
+		ast_func_translate,				// translate(left, right, third)
+		ast_func_boolean,				// boolean(left)
+		ast_func_not,					// not(left)
+		ast_func_true,					// true()
+		ast_func_false,					// false()
+		ast_func_lang,					// lang(left)
+		ast_func_number_0,				// number()
+		ast_func_number_1,				// number(left)
+		ast_func_sum,					// sum(left)
+		ast_func_floor,					// floor(left)
+		ast_func_ceiling,				// ceiling(left)
+		ast_func_round,					// round(left)
+		ast_step,						// process set left with step
+		ast_step_root,					// select root node
+
+		ast_opt_translate_table,		// translate(left, right, third) where right/third are constants
+		ast_opt_compare_attribute		// @name = 'string'
+	};
+
+	enum axis_t
+	{
+		axis_ancestor,
+		axis_ancestor_or_self,
+		axis_attribute,
+		axis_child,
+		axis_descendant,
+		axis_descendant_or_self,
+		axis_following,
+		axis_following_sibling,
+		axis_namespace,
+		axis_parent,
+		axis_preceding,
+		axis_preceding_sibling,
+		axis_self
+	};
+
+	enum nodetest_t
+	{
+		nodetest_none,
+		nodetest_name,
+		nodetest_type_node,
+		nodetest_type_comment,
+		nodetest_type_pi,
+		nodetest_type_text,
+		nodetest_pi,
+		nodetest_all,
+		nodetest_all_in_namespace
+	};
+
+	enum predicate_t
+	{
+		predicate_default,
+		predicate_posinv,
+		predicate_constant,
+		predicate_constant_one
+	};
+
+	enum nodeset_eval_t
+	{
+		nodeset_eval_all,
+		nodeset_eval_any,
+		nodeset_eval_first
+	};
+
+	template <axis_t N> struct axis_to_type
+	{
+		static const axis_t axis;
+	};
+
+	template <axis_t N> const axis_t axis_to_type<N>::axis = N;
+
+	class xpath_ast_node
+	{
+	private:
+		// node type
+		char _type;
+		char _rettype;
+
+		// for ast_step
+		char _axis;
+
+		// for ast_step/ast_predicate/ast_filter
+		char _test;
+
+		// tree node structure
+		xpath_ast_node* _left;
+		xpath_ast_node* _right;
+		xpath_ast_node* _next;
+
+		union
+		{
+			// value for ast_string_constant
+			const char_t* string;
+			// value for ast_number_constant
+			double number;
+			// variable for ast_variable
+			xpath_variable* variable;
+			// node test for ast_step (node name/namespace/node type/pi target)
+			const char_t* nodetest;
+			// table for ast_opt_translate_table
+			const unsigned char* table;
+		} _data;
+
+		xpath_ast_node(const xpath_ast_node&);
+		xpath_ast_node& operator=(const xpath_ast_node&);
+
+		template <class Comp> static bool compare_eq(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				if (lt == xpath_type_boolean || rt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number || rt == xpath_type_number)
+					return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+				else if (lt == xpath_type_string || rt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string ls = lhs->eval_string(c, stack);
+					xpath_string rs = rhs->eval_string(c, stack);
+
+					return comp(ls, rs);
+				}
+			}
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(string_value(*li, stack.result), string_value(*ri, stack.result)))
+							return true;
+					}
+
+				return false;
+			}
+			else
+			{
+				if (lt == xpath_type_node_set)
+				{
+					swap(lhs, rhs);
+					swap(lt, rt);
+				}
+
+				if (lt == xpath_type_boolean)
+					return comp(lhs->eval_boolean(c, stack), rhs->eval_boolean(c, stack));
+				else if (lt == xpath_type_number)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					double l = lhs->eval_number(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+
+					return false;
+				}
+				else if (lt == xpath_type_string)
+				{
+					xpath_allocator_capture cr(stack.result);
+
+					xpath_string l = lhs->eval_string(c, stack);
+					xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture cri(stack.result);
+
+						if (comp(l, string_value(*ri, stack.result)))
+							return true;
+					}
+
+					return false;
+				}
+			}
+
+			assert(false && "Wrong types"); // unreachable
+			return false;
+		}
+
+		static bool eval_once(xpath_node_set::type_t type, nodeset_eval_t eval)
+		{
+			return type == xpath_node_set::type_sorted ? eval != nodeset_eval_all : eval == nodeset_eval_any;
+		}
+
+		template <class Comp> static bool compare_rel(xpath_ast_node* lhs, xpath_ast_node* rhs, const xpath_context& c, const xpath_stack& stack, const Comp& comp)
+		{
+			xpath_value_type lt = lhs->rettype(), rt = rhs->rettype();
+
+			if (lt != xpath_type_node_set && rt != xpath_type_node_set)
+				return comp(lhs->eval_number(c, stack), rhs->eval_number(c, stack));
+			else if (lt == xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					double l = convert_string_to_number(string_value(*li, stack.result).c_str());
+
+					for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+					{
+						xpath_allocator_capture crii(stack.result);
+
+						if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+							return true;
+					}
+				}
+
+				return false;
+			}
+			else if (lt != xpath_type_node_set && rt == xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double l = lhs->eval_number(c, stack);
+				xpath_node_set_raw rs = rhs->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* ri = rs.begin(); ri != rs.end(); ++ri)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(l, convert_string_to_number(string_value(*ri, stack.result).c_str())))
+						return true;
+				}
+
+				return false;
+			}
+			else if (lt == xpath_type_node_set && rt != xpath_type_node_set)
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ls = lhs->eval_node_set(c, stack, nodeset_eval_all);
+				double r = rhs->eval_number(c, stack);
+
+				for (const xpath_node* li = ls.begin(); li != ls.end(); ++li)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					if (comp(convert_string_to_number(string_value(*li, stack.result).c_str()), r))
+						return true;
+				}
+
+				return false;
+			}
+			else
+			{
+				assert(false && "Wrong types"); // unreachable
+				return false;
+			}
+		}
+
+		static void apply_predicate_boolean(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() != xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_boolean(c, stack))
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack, bool once)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t i = 1;
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			// remove_if... or well, sort of
+			for (xpath_node* it = last; it != ns.end(); ++it, ++i)
+			{
+				xpath_context c(*it, i, size);
+
+				if (expr->eval_number(c, stack) == static_cast<double>(i))
+				{
+					*last++ = *it;
+
+					if (once) break;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		static void apply_predicate_number_const(xpath_node_set_raw& ns, size_t first, xpath_ast_node* expr, const xpath_stack& stack)
+		{
+			assert(ns.size() >= first);
+			assert(expr->rettype() == xpath_type_number);
+
+			size_t size = ns.size() - first;
+
+			xpath_node* last = ns.begin() + first;
+
+			xpath_context c(xpath_node(), 1, size);
+
+			double er = expr->eval_number(c, stack);
+
+			if (er >= 1.0 && er <= static_cast<double>(size))
+			{
+				size_t eri = static_cast<size_t>(er);
+
+				if (er == static_cast<double>(eri))
+				{
+					xpath_node r = last[eri - 1];
+
+					*last++ = r;
+				}
+			}
+
+			ns.truncate(last);
+		}
+
+		void apply_predicate(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, bool once)
+		{
+			if (ns.size() == first) return;
+
+			assert(_type == ast_filter || _type == ast_predicate);
+
+			if (_test == predicate_constant || _test == predicate_constant_one)
+				apply_predicate_number_const(ns, first, _right, stack);
+			else if (_right->rettype() == xpath_type_number)
+				apply_predicate_number(ns, first, _right, stack, once);
+			else
+				apply_predicate_boolean(ns, first, _right, stack, once);
+		}
+
+		void apply_predicates(xpath_node_set_raw& ns, size_t first, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			if (ns.size() == first) return;
+
+			bool last_once = eval_once(ns.type(), eval);
+
+			for (xpath_ast_node* pred = _right; pred; pred = pred->_next)
+				pred->apply_predicate(ns, first, stack, !pred->_next && last_once);
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* parent, xpath_allocator* alloc)
+		{
+			assert(a);
+
+			const char_t* name = a->name ? a->name + 0 : PUGIXML_TEXT("");
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (strequal(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+			case nodetest_all:
+				if (is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (starts_with(name, _data.nodetest) && is_xpath_attribute(name))
+				{
+					ns.push_back(xpath_node(xml_attribute(a), xml_node(parent)), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				;
+			}
+
+			return false;
+		}
+
+		bool step_push(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc)
+		{
+			assert(n);
+
+			xml_node_type type = PUGI__NODETYPE(n);
+
+			switch (_test)
+			{
+			case nodetest_name:
+				if (type == node_element && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_node:
+				ns.push_back(xml_node(n), alloc);
+				return true;
+
+			case nodetest_type_comment:
+				if (type == node_comment)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_text:
+				if (type == node_pcdata || type == node_cdata)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_type_pi:
+				if (type == node_pi)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_pi:
+				if (type == node_pi && n->name && strequal(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all:
+				if (type == node_element)
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			case nodetest_all_in_namespace:
+				if (type == node_element && n->name && starts_with(n->name, _data.nodetest))
+				{
+					ns.push_back(xml_node(n), alloc);
+					return true;
+				}
+				break;
+
+			default:
+				assert(false && "Unknown axis"); // unreachable
+			}
+
+			return false;
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_node_struct* n, xpath_allocator* alloc, bool once, T)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_attribute:
+			{
+				for (xml_attribute_struct* a = n->first_attribute; a; a = a->next_attribute)
+					if (step_push(ns, a, n, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_child:
+			{
+				for (xml_node_struct* c = n->first_child; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_descendant:
+			case axis_descendant_or_self:
+			{
+				if (axis == axis_descendant_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->first_child;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (cur == n) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_following_sibling:
+			{
+				for (xml_node_struct* c = n->next_sibling; c; c = c->next_sibling)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_preceding_sibling:
+			{
+				for (xml_node_struct* c = n->prev_sibling_c; c->next_sibling; c = c->prev_sibling_c)
+					if (step_push(ns, c, alloc) & once)
+						return;
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->next_sibling;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+				}
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				xml_node_struct* cur = n;
+
+				// exit from this node so that we don't include descendants
+				while (!cur->prev_sibling_c->next_sibling)
+				{
+					cur = cur->parent;
+
+					if (!cur) return;
+				}
+
+				cur = cur->prev_sibling_c;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child->prev_sibling_c;
+					else
+					{
+						// leaf node, can't be ancestor
+						if (step_push(ns, cur, alloc) & once)
+							return;
+
+						while (!cur->prev_sibling_c->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+
+							if (!node_is_ancestor(cur, n))
+								if (step_push(ns, cur, alloc) & once)
+									return;
+						}
+
+						cur = cur->prev_sibling_c;
+					}
+				}
+
+				break;
+			}
+
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self)
+					if (step_push(ns, n, alloc) & once)
+						return;
+
+				xml_node_struct* cur = n->parent;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_self:
+			{
+				step_push(ns, n, alloc);
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				if (n->parent)
+					step_push(ns, n->parent, alloc);
+
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, xml_attribute_struct* a, xml_node_struct* p, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+
+			switch (axis)
+			{
+			case axis_ancestor:
+			case axis_ancestor_or_self:
+			{
+				if (axis == axis_ancestor_or_self && _test == nodetest_type_node) // reject attributes based on principal node type test
+					if (step_push(ns, a, p, alloc) & once)
+						return;
+
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (step_push(ns, cur, alloc) & once)
+						return;
+
+					cur = cur->parent;
+				}
+
+				break;
+			}
+
+			case axis_descendant_or_self:
+			case axis_self:
+			{
+				if (_test == nodetest_type_node) // reject attributes based on principal node type test
+					step_push(ns, a, p, alloc);
+
+				break;
+			}
+
+			case axis_following:
+			{
+				xml_node_struct* cur = p;
+
+				while (cur)
+				{
+					if (cur->first_child)
+						cur = cur->first_child;
+					else
+					{
+						while (!cur->next_sibling)
+						{
+							cur = cur->parent;
+
+							if (!cur) return;
+						}
+
+						cur = cur->next_sibling;
+					}
+
+					if (step_push(ns, cur, alloc) & once)
+						return;
+				}
+
+				break;
+			}
+
+			case axis_parent:
+			{
+				step_push(ns, p, alloc);
+
+				break;
+			}
+
+			case axis_preceding:
+			{
+				// preceding:: axis does not include attribute nodes and attribute ancestors (they are the same as parent's ancestors), so we can reuse node preceding
+				step_fill(ns, p, alloc, once, v);
+				break;
+			}
+
+			default:
+				assert(false && "Unimplemented axis"); // unreachable
+			}
+		}
+
+		template <class T> void step_fill(xpath_node_set_raw& ns, const xpath_node& xn, xpath_allocator* alloc, bool once, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_has_attributes = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_descendant_or_self || axis == axis_following || axis == axis_parent || axis == axis_preceding || axis == axis_self);
+
+			if (xn.node())
+				step_fill(ns, xn.node().internal_object(), alloc, once, v);
+			else if (axis_has_attributes && xn.attribute() && xn.parent())
+				step_fill(ns, xn.attribute().internal_object(), xn.parent().internal_object(), alloc, once, v);
+		}
+
+		template <class T> xpath_node_set_raw step_do(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval, T v)
+		{
+			const axis_t axis = T::axis;
+			const bool axis_reverse = (axis == axis_ancestor || axis == axis_ancestor_or_self || axis == axis_preceding || axis == axis_preceding_sibling);
+			const xpath_node_set::type_t axis_type = axis_reverse ? xpath_node_set::type_sorted_reverse : xpath_node_set::type_sorted;
+
+			bool once =
+				(axis == axis_attribute && _test == nodetest_name) ||
+				(!_right && eval_once(axis_type, eval)) ||
+			    // coverity[mixed_enums]
+				(_right && !_right->_next && _right->_test == predicate_constant_one);
+
+			xpath_node_set_raw ns;
+			ns.set_type(axis_type);
+
+			if (_left)
+			{
+				xpath_node_set_raw s = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				// self axis preserves the original order
+				if (axis == axis_self) ns.set_type(s.type());
+
+				for (const xpath_node* it = s.begin(); it != s.end(); ++it)
+				{
+					size_t size = ns.size();
+
+					// in general, all axes generate elements in a particular order, but there is no order guarantee if axis is applied to two nodes
+					if (axis != axis_self && size != 0) ns.set_type(xpath_node_set::type_unsorted);
+
+					step_fill(ns, *it, stack.result, once, v);
+					if (_right) apply_predicates(ns, size, stack, eval);
+				}
+			}
+			else
+			{
+				step_fill(ns, c.n, stack.result, once, v);
+				if (_right) apply_predicates(ns, 0, stack, eval);
+			}
+
+			// child, attribute and self axes always generate unique set of nodes
+			// for other axis, if the set stayed sorted, it stayed unique because the traversal algorithms do not visit the same node twice
+			if (axis != axis_child && axis != axis_attribute && axis != axis_self && ns.type() == xpath_node_set::type_unsorted)
+				ns.remove_duplicates(stack.temp);
+
+			return ns;
+		}
+
+	public:
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, const char_t* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_string_constant);
+			_data.string = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, double value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_number_constant);
+			_data.number = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_variable* value):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(0), _right(0), _next(0)
+		{
+			assert(type == ast_variable);
+			_data.variable = value;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_value_type rettype_, xpath_ast_node* left = 0, xpath_ast_node* right = 0):
+			_type(static_cast<char>(type)), _rettype(static_cast<char>(rettype_)), _axis(0), _test(0), _left(left), _right(right), _next(0)
+		{
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(static_cast<char>(axis)), _test(static_cast<char>(test)), _left(left), _right(0), _next(0)
+		{
+			assert(type == ast_step);
+			_data.nodetest = contents;
+		}
+
+		xpath_ast_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test):
+			_type(static_cast<char>(type)), _rettype(xpath_type_node_set), _axis(0), _test(static_cast<char>(test)), _left(left), _right(right), _next(0)
+		{
+			assert(type == ast_filter || type == ast_predicate);
+		}
+
+		void set_next(xpath_ast_node* value)
+		{
+			_next = value;
+		}
+
+		void set_right(xpath_ast_node* value)
+		{
+			_right = value;
+		}
+
+		bool eval_boolean(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_or:
+				return _left->eval_boolean(c, stack) || _right->eval_boolean(c, stack);
+
+			case ast_op_and:
+				return _left->eval_boolean(c, stack) && _right->eval_boolean(c, stack);
+
+			case ast_op_equal:
+				return compare_eq(_left, _right, c, stack, equal_to());
+
+			case ast_op_not_equal:
+				return compare_eq(_left, _right, c, stack, not_equal_to());
+
+			case ast_op_less:
+				return compare_rel(_left, _right, c, stack, less());
+
+			case ast_op_greater:
+				return compare_rel(_right, _left, c, stack, less());
+
+			case ast_op_less_or_equal:
+				return compare_rel(_left, _right, c, stack, less_equal());
+
+			case ast_op_greater_or_equal:
+				return compare_rel(_right, _left, c, stack, less_equal());
+
+			case ast_func_starts_with:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return starts_with(lr.c_str(), rr.c_str());
+			}
+
+			case ast_func_contains:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lr = _left->eval_string(c, stack);
+				xpath_string rr = _right->eval_string(c, stack);
+
+				return find_substring(lr.c_str(), rr.c_str()) != 0;
+			}
+
+			case ast_func_boolean:
+				return _left->eval_boolean(c, stack);
+
+			case ast_func_not:
+				return !_left->eval_boolean(c, stack);
+
+			case ast_func_true:
+				return true;
+
+			case ast_func_false:
+				return false;
+
+			case ast_func_lang:
+			{
+				if (c.n.attribute()) return false;
+
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_string lang = _left->eval_string(c, stack);
+
+				for (xml_node n = c.n.node(); n; n = n.parent())
+				{
+					xml_attribute a = n.attribute(PUGIXML_TEXT("xml:lang"));
+
+					if (a)
+					{
+						const char_t* value = a.value();
+
+						// strnicmp / strncasecmp is not portable
+						for (const char_t* lit = lang.c_str(); *lit; ++lit)
+						{
+							if (tolower_ascii(*lit) != tolower_ascii(*value)) return false;
+							++value;
+						}
+
+						return *value == 0 || *value == '-';
+					}
+				}
+
+				return false;
+			}
+
+			case ast_opt_compare_attribute:
+			{
+				const char_t* value = (_right->_type == ast_string_constant) ? _right->_data.string : _right->_data.variable->get_string();
+
+				xml_attribute attr = c.n.node().attribute(_left->_data.nodetest);
+
+				return attr && strequal(attr.value(), value) && is_xpath_attribute(attr.name());
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_boolean)
+					return _data.variable->get_boolean();
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, we need to perform type conversion
+			switch (_rettype)
+			{
+			case xpath_type_number:
+				return convert_number_to_boolean(eval_number(c, stack));
+
+			case xpath_type_string:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return !eval_string(c, stack).empty();
+			}
+
+			case xpath_type_node_set:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return !eval_node_set(c, stack, nodeset_eval_any).empty();
+			}
+
+			default:
+				assert(false && "Wrong expression for return type boolean"); // unreachable
+				return false;
+			}
+		}
+
+		double eval_number(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_op_add:
+				return _left->eval_number(c, stack) + _right->eval_number(c, stack);
+
+			case ast_op_subtract:
+				return _left->eval_number(c, stack) - _right->eval_number(c, stack);
+
+			case ast_op_multiply:
+				return _left->eval_number(c, stack) * _right->eval_number(c, stack);
+
+			case ast_op_divide:
+				return _left->eval_number(c, stack) / _right->eval_number(c, stack);
+
+			case ast_op_mod:
+				return fmod(_left->eval_number(c, stack), _right->eval_number(c, stack));
+
+			case ast_op_negate:
+				return -_left->eval_number(c, stack);
+
+			case ast_number_constant:
+				return _data.number;
+
+			case ast_func_last:
+				return static_cast<double>(c.size);
+
+			case ast_func_position:
+				return static_cast<double>(c.position);
+
+			case ast_func_count:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_node_set(c, stack, nodeset_eval_all).size());
+			}
+
+			case ast_func_string_length_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(string_value(c.n, stack.result).length());
+			}
+
+			case ast_func_string_length_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return static_cast<double>(_left->eval_string(c, stack).length());
+			}
+
+			case ast_func_number_0:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(string_value(c.n, stack.result).c_str());
+			}
+
+			case ast_func_number_1:
+				return _left->eval_number(c, stack);
+
+			case ast_func_sum:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				double r = 0;
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_all);
+
+				for (const xpath_node* it = ns.begin(); it != ns.end(); ++it)
+				{
+					xpath_allocator_capture cri(stack.result);
+
+					r += convert_string_to_number(string_value(*it, stack.result).c_str());
+				}
+
+				return r;
+			}
+
+			case ast_func_floor:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? floor(r) : r;
+			}
+
+			case ast_func_ceiling:
+			{
+				double r = _left->eval_number(c, stack);
+
+				return r == r ? ceil(r) : r;
+			}
+
+			case ast_func_round:
+				return round_nearest_nzero(_left->eval_number(c, stack));
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_number)
+					return _data.variable->get_number();
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, we need to perform type conversion
+			switch (_rettype)
+			{
+			case xpath_type_boolean:
+				return eval_boolean(c, stack) ? 1 : 0;
+
+			case xpath_type_string:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(eval_string(c, stack).c_str());
+			}
+
+			case xpath_type_node_set:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				return convert_string_to_number(eval_string(c, stack).c_str());
+			}
+
+			default:
+				assert(false && "Wrong expression for return type number"); // unreachable
+				return 0;
+			}
+		}
+
+		xpath_string eval_string_concat(const xpath_context& c, const xpath_stack& stack)
+		{
+			assert(_type == ast_func_concat);
+
+			xpath_allocator_capture ct(stack.temp);
+
+			// count the string number
+			size_t count = 1;
+			for (xpath_ast_node* nc = _right; nc; nc = nc->_next) count++;
+
+			// allocate a buffer for temporary string objects
+			xpath_string* buffer = static_cast<xpath_string*>(stack.temp->allocate(count * sizeof(xpath_string)));
+			if (!buffer) return xpath_string();
+
+			// evaluate all strings to temporary stack
+			xpath_stack swapped_stack = {stack.temp, stack.result};
+
+			buffer[0] = _left->eval_string(c, swapped_stack);
+
+			size_t pos = 1;
+			for (xpath_ast_node* n = _right; n; n = n->_next, ++pos) buffer[pos] = n->eval_string(c, swapped_stack);
+			assert(pos == count);
+
+			// get total length
+			size_t length = 0;
+			for (size_t i = 0; i < count; ++i) length += buffer[i].length();
+
+			// create final string
+			char_t* result = static_cast<char_t*>(stack.result->allocate((length + 1) * sizeof(char_t)));
+			if (!result) return xpath_string();
+
+			char_t* ri = result;
+
+			for (size_t j = 0; j < count; ++j)
+				for (const char_t* bi = buffer[j].c_str(); *bi; ++bi)
+					*ri++ = *bi;
+
+			*ri = 0;
+
+			return xpath_string::from_heap_preallocated(result, ri);
+		}
+
+		xpath_string eval_string(const xpath_context& c, const xpath_stack& stack)
+		{
+			switch (_type)
+			{
+			case ast_string_constant:
+				return xpath_string::from_const(_data.string);
+
+			case ast_func_local_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_local_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(local_name(na));
+			}
+
+			case ast_func_name_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_name_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(qualified_name(na));
+			}
+
+			case ast_func_namespace_uri_0:
+			{
+				xpath_node na = c.n;
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_namespace_uri_1:
+			{
+				xpath_allocator_capture cr(stack.result);
+
+				xpath_node_set_raw ns = _left->eval_node_set(c, stack, nodeset_eval_first);
+				xpath_node na = ns.first();
+
+				return xpath_string::from_const(namespace_uri(na));
+			}
+
+			case ast_func_string_0:
+				return string_value(c.n, stack.result);
+
+			case ast_func_string_1:
+				return _left->eval_string(c, stack);
+
+			case ast_func_concat:
+				return eval_string_concat(c, stack);
+
+			case ast_func_substring_before:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+
+				return pos ? xpath_string::from_heap(s.c_str(), pos, stack.result) : xpath_string();
+			}
+
+			case ast_func_substring_after:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				xpath_string p = _right->eval_string(c, swapped_stack);
+
+				const char_t* pos = find_substring(s.c_str(), p.c_str());
+				if (!pos) return xpath_string();
+
+				const char_t* rbegin = pos + p.length();
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_2:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+
+				if (is_nan(first)) return xpath_string(); // NaN
+				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				assert(1 <= pos && pos <= s_length + 1);
+
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + s.length();
+
+				return s.uses_heap() ? xpath_string::from_heap(rbegin, rend, stack.result) : xpath_string::from_const(rbegin);
+			}
+
+			case ast_func_substring_3:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, swapped_stack);
+				size_t s_length = s.length();
+
+				double first = round_nearest(_right->eval_number(c, stack));
+				double last = first + round_nearest(_right->_next->eval_number(c, stack));
+
+				if (is_nan(first) || is_nan(last)) return xpath_string();
+				else if (first >= static_cast<double>(s_length + 1)) return xpath_string();
+				else if (first >= last) return xpath_string();
+				else if (last < 1) return xpath_string();
+
+				size_t pos = first < 1 ? 1 : static_cast<size_t>(first);
+				size_t end = last >= static_cast<double>(s_length + 1) ? s_length + 1 : static_cast<size_t>(last);
+
+				assert(1 <= pos && pos <= end && end <= s_length + 1);
+				const char_t* rbegin = s.c_str() + (pos - 1);
+				const char_t* rend = s.c_str() + (end - 1);
+
+				return (end == s_length + 1 && !s.uses_heap()) ? xpath_string::from_const(rbegin) : xpath_string::from_heap(rbegin, rend, stack.result);
+			}
+
+			case ast_func_normalize_space_0:
+			{
+				xpath_string s = string_value(c.n, stack.result);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_normalize_space_1:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = normalize_space(begin);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_func_translate:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_string s = _left->eval_string(c, stack);
+				xpath_string from = _right->eval_string(c, swapped_stack);
+				xpath_string to = _right->_next->eval_string(c, swapped_stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate(begin, from.c_str(), to.c_str(), to.length());
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_opt_translate_table:
+			{
+				xpath_string s = _left->eval_string(c, stack);
+
+				char_t* begin = s.data(stack.result);
+				if (!begin) return xpath_string();
+
+				char_t* end = translate_table(begin, _data.table);
+
+				return xpath_string::from_heap_preallocated(begin, end);
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_string)
+					return xpath_string::from_const(_data.variable->get_string());
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, we need to perform type conversion
+			switch (_rettype)
+			{
+			case xpath_type_boolean:
+				return xpath_string::from_const(eval_boolean(c, stack) ? PUGIXML_TEXT("true") : PUGIXML_TEXT("false"));
+
+			case xpath_type_number:
+				return convert_number_to_string(eval_number(c, stack), stack.result);
+
+			case xpath_type_node_set:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_node_set_raw ns = eval_node_set(c, swapped_stack, nodeset_eval_first);
+				return ns.empty() ? xpath_string() : string_value(ns.first(), stack.result);
+			}
+
+			default:
+				assert(false && "Wrong expression for return type string"); // unreachable
+				return xpath_string();
+			}
+		}
+
+		xpath_node_set_raw eval_node_set(const xpath_context& c, const xpath_stack& stack, nodeset_eval_t eval)
+		{
+			switch (_type)
+			{
+			case ast_op_union:
+			{
+				xpath_allocator_capture cr(stack.temp);
+
+				xpath_stack swapped_stack = {stack.temp, stack.result};
+
+				xpath_node_set_raw ls = _left->eval_node_set(c, stack, eval);
+				xpath_node_set_raw rs = _right->eval_node_set(c, swapped_stack, eval);
+
+				// we can optimize merging two sorted sets, but this is a very rare operation, so don't bother
+				ls.set_type(xpath_node_set::type_unsorted);
+
+				ls.append(rs.begin(), rs.end(), stack.result);
+				ls.remove_duplicates(stack.temp);
+
+				return ls;
+			}
+
+			case ast_filter:
+			{
+				xpath_node_set_raw set = _left->eval_node_set(c, stack, _test == predicate_constant_one ? nodeset_eval_first : nodeset_eval_all);
+
+				// either expression is a number or it contains position() call; sort by document order
+				if (_test != predicate_posinv) set.sort_do();
+
+				bool once = eval_once(set.type(), eval);
+
+				apply_predicate(set, 0, stack, once);
+
+				return set;
+			}
+
+			case ast_func_id:
+				return xpath_node_set_raw();
+
+			case ast_step:
+			{
+				switch (_axis)
+				{
+				case axis_ancestor:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor>());
+
+				case axis_ancestor_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_ancestor_or_self>());
+
+				case axis_attribute:
+					return step_do(c, stack, eval, axis_to_type<axis_attribute>());
+
+				case axis_child:
+					return step_do(c, stack, eval, axis_to_type<axis_child>());
+
+				case axis_descendant:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant>());
+
+				case axis_descendant_or_self:
+					return step_do(c, stack, eval, axis_to_type<axis_descendant_or_self>());
+
+				case axis_following:
+					return step_do(c, stack, eval, axis_to_type<axis_following>());
+
+				case axis_following_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_following_sibling>());
+
+				case axis_namespace:
+					// namespaced axis is not supported
+					return xpath_node_set_raw();
+
+				case axis_parent:
+					return step_do(c, stack, eval, axis_to_type<axis_parent>());
+
+				case axis_preceding:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding>());
+
+				case axis_preceding_sibling:
+					return step_do(c, stack, eval, axis_to_type<axis_preceding_sibling>());
+
+				case axis_self:
+					return step_do(c, stack, eval, axis_to_type<axis_self>());
+
+				default:
+					assert(false && "Unknown axis"); // unreachable
+					return xpath_node_set_raw();
+				}
+			}
+
+			case ast_step_root:
+			{
+				assert(!_right); // root step can't have any predicates
+
+				xpath_node_set_raw ns;
+
+				ns.set_type(xpath_node_set::type_sorted);
+
+				if (c.n.node()) ns.push_back(c.n.node().root(), stack.result);
+				else if (c.n.attribute()) ns.push_back(c.n.parent().root(), stack.result);
+
+				return ns;
+			}
+
+			case ast_variable:
+			{
+				assert(_rettype == _data.variable->type());
+
+				if (_rettype == xpath_type_node_set)
+				{
+					const xpath_node_set& s = _data.variable->get_node_set();
+
+					xpath_node_set_raw ns;
+
+					ns.set_type(s.type());
+					ns.append(s.begin(), s.end(), stack.result);
+
+					return ns;
+				}
+
+				// variable needs to be converted to the correct type, this is handled by the fallthrough block below
+				break;
+			}
+
+			default:
+				;
+			}
+
+			// none of the ast types that return the value directly matched, but conversions to node set are invalid
+			assert(false && "Wrong expression for return type node set"); // unreachable
+			return xpath_node_set_raw();
+		}
+
+		void optimize(xpath_allocator* alloc)
+		{
+			if (_left)
+				_left->optimize(alloc);
+
+			if (_right)
+				_right->optimize(alloc);
+
+			if (_next)
+				_next->optimize(alloc);
+
+			// coverity[var_deref_model]
+			optimize_self(alloc);
+		}
+
+		void optimize_self(xpath_allocator* alloc)
+		{
+			// Rewrite [position()=expr] with [expr]
+			// Note that this step has to go before classification to recognize [position()=1]
+			if ((_type == ast_filter || _type == ast_predicate) &&
+				_right && // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
+				_right->_type == ast_op_equal && _right->_left->_type == ast_func_position && _right->_right->_rettype == xpath_type_number)
+			{
+				_right = _right->_right;
+			}
+
+			// Classify filter/predicate ops to perform various optimizations during evaluation
+			if ((_type == ast_filter || _type == ast_predicate) && _right) // workaround for clang static analyzer (_right is never null for ast_filter/ast_predicate)
+			{
+				assert(_test == predicate_default);
+
+				if (_right->_type == ast_number_constant && _right->_data.number == 1.0)
+					_test = predicate_constant_one;
+				else if (_right->_rettype == xpath_type_number && (_right->_type == ast_number_constant || _right->_type == ast_variable || _right->_type == ast_func_last))
+					_test = predicate_constant;
+				else if (_right->_rettype != xpath_type_number && _right->is_posinv_expr())
+					_test = predicate_posinv;
+			}
+
+			// Rewrite descendant-or-self::node()/child::foo with descendant::foo
+			// The former is a full form of //foo, the latter is much faster since it executes the node test immediately
+			// Do a similar kind of rewrite for self/descendant/descendant-or-self axes
+			// Note that we only rewrite positionally invariant steps (//foo[1] != /descendant::foo[1])
+			if (_type == ast_step && (_axis == axis_child || _axis == axis_self || _axis == axis_descendant || _axis == axis_descendant_or_self) &&
+				_left && _left->_type == ast_step && _left->_axis == axis_descendant_or_self && _left->_test == nodetest_type_node && !_left->_right &&
+				is_posinv_step())
+			{
+				if (_axis == axis_child || _axis == axis_descendant)
+					_axis = axis_descendant;
+				else
+					_axis = axis_descendant_or_self;
+
+				_left = _left->_left;
+			}
+
+			// Use optimized lookup table implementation for translate() with constant arguments
+			if (_type == ast_func_translate &&
+				_right && // workaround for clang static analyzer (_right is never null for ast_func_translate)
+				_right->_type == ast_string_constant && _right->_next->_type == ast_string_constant)
+			{
+				unsigned char* table = translate_table_generate(alloc, _right->_data.string, _right->_next->_data.string);
+
+				if (table)
+				{
+					_type = ast_opt_translate_table;
+					_data.table = table;
+				}
+			}
+
+			// Use optimized path for @attr = 'value' or @attr = $value
+			if (_type == ast_op_equal &&
+				_left && _right && // workaround for clang static analyzer and Coverity (_left and _right are never null for ast_op_equal)
+                // coverity[mixed_enums]
+				_left->_type == ast_step && _left->_axis == axis_attribute && _left->_test == nodetest_name && !_left->_left && !_left->_right &&
+				(_right->_type == ast_string_constant || (_right->_type == ast_variable && _right->_rettype == xpath_type_string)))
+			{
+				_type = ast_opt_compare_attribute;
+			}
+		}
+
+		bool is_posinv_expr() const
+		{
+			switch (_type)
+			{
+			case ast_func_position:
+			case ast_func_last:
+				return false;
+
+			case ast_string_constant:
+			case ast_number_constant:
+			case ast_variable:
+				return true;
+
+			case ast_step:
+			case ast_step_root:
+				return true;
+
+			case ast_predicate:
+			case ast_filter:
+				return true;
+
+			default:
+				if (_left && !_left->is_posinv_expr()) return false;
+
+				for (xpath_ast_node* n = _right; n; n = n->_next)
+					if (!n->is_posinv_expr()) return false;
+
+				return true;
+			}
+		}
+
+		bool is_posinv_step() const
+		{
+			assert(_type == ast_step);
+
+			for (xpath_ast_node* n = _right; n; n = n->_next)
+			{
+				assert(n->_type == ast_predicate);
+
+				if (n->_test != predicate_posinv)
+					return false;
+			}
+
+			return true;
+		}
+
+		xpath_value_type rettype() const
+		{
+			return static_cast<xpath_value_type>(_rettype);
+		}
+	};
+
+	static const size_t xpath_ast_depth_limit =
+	#ifdef PUGIXML_XPATH_DEPTH_LIMIT
+		PUGIXML_XPATH_DEPTH_LIMIT
+	#else
+		1024
+	#endif
+		;
+
+	struct xpath_parser
+	{
+		xpath_allocator* _alloc;
+		xpath_lexer _lexer;
+
+		const char_t* _query;
+		xpath_variable_set* _variables;
+
+		xpath_parse_result* _result;
+
+		char_t _scratch[32];
+
+		size_t _depth;
+
+		xpath_ast_node* error(const char* message)
+		{
+			_result->error = message;
+			_result->offset = _lexer.current_pos() - _query;
+
+			return 0;
+		}
+
+		xpath_ast_node* error_oom()
+		{
+			assert(_alloc->_error);
+			*_alloc->_error = true;
+
+			return 0;
+		}
+
+		xpath_ast_node* error_rec()
+		{
+			return error("Exceeded maximum allowed query depth");
+		}
+
+		void* alloc_node()
+		{
+			return _alloc->allocate(sizeof(xpath_ast_node));
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, const char_t* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, double value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_variable* value)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, value) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_value_type rettype, xpath_ast_node* left = 0, xpath_ast_node* right = 0)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, rettype, left, right) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, axis_t axis, nodetest_t test, const char_t* contents)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, axis, test, contents) : 0;
+		}
+
+		xpath_ast_node* alloc_node(ast_type_t type, xpath_ast_node* left, xpath_ast_node* right, predicate_t test)
+		{
+			void* memory = alloc_node();
+			return memory ? new (memory) xpath_ast_node(type, left, right, test) : 0;
+		}
+
+		const char_t* alloc_string(const xpath_lexer_string& value)
+		{
+			if (!value.begin)
+				return PUGIXML_TEXT("");
+
+			size_t length = static_cast<size_t>(value.end - value.begin);
+
+			char_t* c = static_cast<char_t*>(_alloc->allocate((length + 1) * sizeof(char_t)));
+			if (!c) return 0;
+
+			memcpy(c, value.begin, length * sizeof(char_t));
+			c[length] = 0;
+
+			return c;
+		}
+
+		xpath_ast_node* parse_function(const xpath_lexer_string& name, size_t argc, xpath_ast_node* args[2])
+		{
+			switch (name.begin[0])
+			{
+			case 'b':
+				if (name == PUGIXML_TEXT("boolean") && argc == 1)
+					return alloc_node(ast_func_boolean, xpath_type_boolean, args[0]);
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("count") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_count, xpath_type_number, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("contains") && argc == 2)
+					return alloc_node(ast_func_contains, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("concat") && argc >= 2)
+					return alloc_node(ast_func_concat, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("ceiling") && argc == 1)
+					return alloc_node(ast_func_ceiling, xpath_type_number, args[0]);
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("false") && argc == 0)
+					return alloc_node(ast_func_false, xpath_type_boolean);
+				else if (name == PUGIXML_TEXT("floor") && argc == 1)
+					return alloc_node(ast_func_floor, xpath_type_number, args[0]);
+
+				break;
+
+			case 'i':
+				if (name == PUGIXML_TEXT("id") && argc == 1)
+					return alloc_node(ast_func_id, xpath_type_node_set, args[0]);
+
+				break;
+
+			case 'l':
+				if (name == PUGIXML_TEXT("last") && argc == 0)
+					return alloc_node(ast_func_last, xpath_type_number);
+				else if (name == PUGIXML_TEXT("lang") && argc == 1)
+					return alloc_node(ast_func_lang, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("local-name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_local_name_0 : ast_func_local_name_1, xpath_type_string, args[0]);
+				}
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("name") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_name_0 : ast_func_name_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("namespace-uri") && argc <= 1)
+				{
+					if (argc == 1 && args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(argc == 0 ? ast_func_namespace_uri_0 : ast_func_namespace_uri_1, xpath_type_string, args[0]);
+				}
+				else if (name == PUGIXML_TEXT("normalize-space") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_normalize_space_0 : ast_func_normalize_space_1, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("not") && argc == 1)
+					return alloc_node(ast_func_not, xpath_type_boolean, args[0]);
+				else if (name == PUGIXML_TEXT("number") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_number_0 : ast_func_number_1, xpath_type_number, args[0]);
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("position") && argc == 0)
+					return alloc_node(ast_func_position, xpath_type_number);
+
+				break;
+
+			case 'r':
+				if (name == PUGIXML_TEXT("round") && argc == 1)
+					return alloc_node(ast_func_round, xpath_type_number, args[0]);
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("string") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_0 : ast_func_string_1, xpath_type_string, args[0]);
+				else if (name == PUGIXML_TEXT("string-length") && argc <= 1)
+					return alloc_node(argc == 0 ? ast_func_string_length_0 : ast_func_string_length_1, xpath_type_number, args[0]);
+				else if (name == PUGIXML_TEXT("starts-with") && argc == 2)
+					return alloc_node(ast_func_starts_with, xpath_type_boolean, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-before") && argc == 2)
+					return alloc_node(ast_func_substring_before, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring-after") && argc == 2)
+					return alloc_node(ast_func_substring_after, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("substring") && (argc == 2 || argc == 3))
+					return alloc_node(argc == 2 ? ast_func_substring_2 : ast_func_substring_3, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("sum") && argc == 1)
+				{
+					if (args[0]->rettype() != xpath_type_node_set) return error("Function has to be applied to node set");
+					return alloc_node(ast_func_sum, xpath_type_number, args[0]);
+				}
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("translate") && argc == 3)
+					return alloc_node(ast_func_translate, xpath_type_string, args[0], args[1]);
+				else if (name == PUGIXML_TEXT("true") && argc == 0)
+					return alloc_node(ast_func_true, xpath_type_boolean);
+
+				break;
+
+			default:
+				break;
+			}
+
+			return error("Unrecognized function or wrong parameter count");
+		}
+
+		axis_t parse_axis_name(const xpath_lexer_string& name, bool& specified)
+		{
+			specified = true;
+
+			switch (name.begin[0])
+			{
+			case 'a':
+				if (name == PUGIXML_TEXT("ancestor"))
+					return axis_ancestor;
+				else if (name == PUGIXML_TEXT("ancestor-or-self"))
+					return axis_ancestor_or_self;
+				else if (name == PUGIXML_TEXT("attribute"))
+					return axis_attribute;
+
+				break;
+
+			case 'c':
+				if (name == PUGIXML_TEXT("child"))
+					return axis_child;
+
+				break;
+
+			case 'd':
+				if (name == PUGIXML_TEXT("descendant"))
+					return axis_descendant;
+				else if (name == PUGIXML_TEXT("descendant-or-self"))
+					return axis_descendant_or_self;
+
+				break;
+
+			case 'f':
+				if (name == PUGIXML_TEXT("following"))
+					return axis_following;
+				else if (name == PUGIXML_TEXT("following-sibling"))
+					return axis_following_sibling;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("namespace"))
+					return axis_namespace;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("parent"))
+					return axis_parent;
+				else if (name == PUGIXML_TEXT("preceding"))
+					return axis_preceding;
+				else if (name == PUGIXML_TEXT("preceding-sibling"))
+					return axis_preceding_sibling;
+
+				break;
+
+			case 's':
+				if (name == PUGIXML_TEXT("self"))
+					return axis_self;
+
+				break;
+
+			default:
+				break;
+			}
+
+			specified = false;
+			return axis_child;
+		}
+
+		nodetest_t parse_node_test_type(const xpath_lexer_string& name)
+		{
+			switch (name.begin[0])
+			{
+			case 'c':
+				if (name == PUGIXML_TEXT("comment"))
+					return nodetest_type_comment;
+
+				break;
+
+			case 'n':
+				if (name == PUGIXML_TEXT("node"))
+					return nodetest_type_node;
+
+				break;
+
+			case 'p':
+				if (name == PUGIXML_TEXT("processing-instruction"))
+					return nodetest_type_pi;
+
+				break;
+
+			case 't':
+				if (name == PUGIXML_TEXT("text"))
+					return nodetest_type_text;
+
+				break;
+
+			default:
+				break;
+			}
+
+			return nodetest_none;
+		}
+
+		// PrimaryExpr ::= VariableReference | '(' Expr ')' | Literal | Number | FunctionCall
+		xpath_ast_node* parse_primary_expression()
+		{
+			switch (_lexer.current())
+			{
+			case lex_var_ref:
+			{
+				xpath_lexer_string name = _lexer.contents();
+
+				if (!_variables)
+					return error("Unknown variable: variable set is not provided");
+
+				xpath_variable* var = 0;
+				if (!get_variable_scratch(_scratch, _variables, name.begin, name.end, &var))
+					return error_oom();
+
+				if (!var)
+					return error("Unknown variable: variable set does not contain the given name");
+
+				_lexer.next();
+
+				return alloc_node(ast_variable, var->type(), var);
+			}
+
+			case lex_open_brace:
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = parse_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_brace)
+					return error("Expected ')' to match an opening '('");
+
+				_lexer.next();
+
+				return n;
+			}
+
+			case lex_quoted_string:
+			{
+				const char_t* value = alloc_string(_lexer.contents());
+				if (!value) return 0;
+
+				_lexer.next();
+
+				return alloc_node(ast_string_constant, xpath_type_string, value);
+			}
+
+			case lex_number:
+			{
+				double value = 0;
+
+				if (!convert_string_to_number_scratch(_scratch, _lexer.contents().begin, _lexer.contents().end, &value))
+					return error_oom();
+
+				_lexer.next();
+
+				return alloc_node(ast_number_constant, xpath_type_number, value);
+			}
+
+			case lex_string:
+			{
+				xpath_ast_node* args[2] = {0};
+				size_t argc = 0;
+
+				xpath_lexer_string function = _lexer.contents();
+				_lexer.next();
+
+				xpath_ast_node* last_arg = 0;
+
+				if (_lexer.current() != lex_open_brace)
+					return error("Unrecognized function call");
+				_lexer.next();
+
+				size_t old_depth = _depth;
+
+				while (_lexer.current() != lex_close_brace)
+				{
+					if (argc > 0)
+					{
+						if (_lexer.current() != lex_comma)
+							return error("No comma between function arguments");
+						_lexer.next();
+					}
+
+					if (++_depth > xpath_ast_depth_limit)
+						return error_rec();
+
+					xpath_ast_node* n = parse_expression();
+					if (!n) return 0;
+
+					if (argc < 2) args[argc] = n;
+					else last_arg->set_next(n);
+
+					argc++;
+					last_arg = n;
+				}
+
+				_lexer.next();
+
+				_depth = old_depth;
+
+				return parse_function(function, argc, args);
+			}
+
+			default:
+				return error("Unrecognizable primary expression");
+			}
+		}
+
+		// FilterExpr ::= PrimaryExpr | FilterExpr Predicate
+		// Predicate ::= '[' PredicateExpr ']'
+		// PredicateExpr ::= Expr
+		xpath_ast_node* parse_filter_expression()
+		{
+			xpath_ast_node* n = parse_primary_expression();
+			if (!n) return 0;
+
+			size_t old_depth = _depth;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				if (n->rettype() != xpath_type_node_set)
+					return error("Predicate has to be applied to node set");
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				n = alloc_node(ast_filter, n, expr, predicate_default);
+				if (!n) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+
+				_lexer.next();
+			}
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		// Step ::= AxisSpecifier NodeTest Predicate* | AbbreviatedStep
+		// AxisSpecifier ::= AxisName '::' | '@'?
+		// NodeTest ::= NameTest | NodeType '(' ')' | 'processing-instruction' '(' Literal ')'
+		// NameTest ::= '*' | NCName ':' '*' | QName
+		// AbbreviatedStep ::= '.' | '..'
+		xpath_ast_node* parse_step(xpath_ast_node* set)
+		{
+			if (set && set->rettype() != xpath_type_node_set)
+				return error("Step has to be applied to node set");
+
+			bool axis_specified = false;
+			axis_t axis = axis_child; // implied child axis
+
+			if (_lexer.current() == lex_axis_attribute)
+			{
+				axis = axis_attribute;
+				axis_specified = true;
+
+				_lexer.next();
+			}
+			else if (_lexer.current() == lex_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_self, nodetest_type_node, 0);
+			}
+			else if (_lexer.current() == lex_double_dot)
+			{
+				_lexer.next();
+
+				if (_lexer.current() == lex_open_square_brace)
+					return error("Predicates are not allowed after an abbreviated step");
+
+				return alloc_node(ast_step, set, axis_parent, nodetest_type_node, 0);
+			}
+
+			nodetest_t nt_type = nodetest_none;
+			xpath_lexer_string nt_name;
+
+			if (_lexer.current() == lex_string)
+			{
+				// node name test
+				nt_name = _lexer.contents();
+				_lexer.next();
+
+				// was it an axis name?
+				if (_lexer.current() == lex_double_colon)
+				{
+					// parse axis name
+					if (axis_specified)
+						return error("Two axis specifiers in one step");
+
+					axis = parse_axis_name(nt_name, axis_specified);
+
+					if (!axis_specified)
+						return error("Unknown axis");
+
+					// read actual node test
+					_lexer.next();
+
+					if (_lexer.current() == lex_multiply)
+					{
+						nt_type = nodetest_all;
+						nt_name = xpath_lexer_string();
+						_lexer.next();
+					}
+					else if (_lexer.current() == lex_string)
+					{
+						nt_name = _lexer.contents();
+						_lexer.next();
+					}
+					else
+					{
+						return error("Unrecognized node test");
+					}
+				}
+
+				if (nt_type == nodetest_none)
+				{
+					// node type test or processing-instruction
+					if (_lexer.current() == lex_open_brace)
+					{
+						_lexer.next();
+
+						if (_lexer.current() == lex_close_brace)
+						{
+							_lexer.next();
+
+							nt_type = parse_node_test_type(nt_name);
+
+							if (nt_type == nodetest_none)
+								return error("Unrecognized node type");
+
+							nt_name = xpath_lexer_string();
+						}
+						else if (nt_name == PUGIXML_TEXT("processing-instruction"))
+						{
+							if (_lexer.current() != lex_quoted_string)
+								return error("Only literals are allowed as arguments to processing-instruction()");
+
+							nt_type = nodetest_pi;
+							nt_name = _lexer.contents();
+							_lexer.next();
+
+							if (_lexer.current() != lex_close_brace)
+								return error("Unmatched brace near processing-instruction()");
+							_lexer.next();
+						}
+						else
+						{
+							return error("Unmatched brace near node type test");
+						}
+					}
+					// QName or NCName:*
+					else
+					{
+						if (nt_name.end - nt_name.begin > 2 && nt_name.end[-2] == ':' && nt_name.end[-1] == '*') // NCName:*
+						{
+							nt_name.end--; // erase *
+
+							nt_type = nodetest_all_in_namespace;
+						}
+						else
+						{
+							nt_type = nodetest_name;
+						}
+					}
+				}
+			}
+			else if (_lexer.current() == lex_multiply)
+			{
+				nt_type = nodetest_all;
+				_lexer.next();
+			}
+			else
+			{
+				return error("Unrecognized node test");
+			}
+
+			const char_t* nt_name_copy = alloc_string(nt_name);
+			if (!nt_name_copy) return 0;
+
+			xpath_ast_node* n = alloc_node(ast_step, set, axis, nt_type, nt_name_copy);
+			if (!n) return 0;
+
+			size_t old_depth = _depth;
+
+			xpath_ast_node* last = 0;
+
+			while (_lexer.current() == lex_open_square_brace)
+			{
+				_lexer.next();
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				xpath_ast_node* expr = parse_expression();
+				if (!expr) return 0;
+
+				xpath_ast_node* pred = alloc_node(ast_predicate, 0, expr, predicate_default);
+				if (!pred) return 0;
+
+				if (_lexer.current() != lex_close_square_brace)
+					return error("Expected ']' to match an opening '['");
+				_lexer.next();
+
+				if (last) last->set_next(pred);
+				else n->set_right(pred);
+
+				last = pred;
+			}
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		// RelativeLocationPath ::= Step | RelativeLocationPath '/' Step | RelativeLocationPath '//' Step
+		xpath_ast_node* parse_relative_location_path(xpath_ast_node* set)
+		{
+			xpath_ast_node* n = parse_step(set);
+			if (!n) return 0;
+
+			size_t old_depth = _depth;
+
+			while (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+			{
+				lexeme_t l = _lexer.current();
+				_lexer.next();
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				if (l == lex_double_slash)
+				{
+					n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+					if (!n) return 0;
+				}
+
+				n = parse_step(n);
+				if (!n) return 0;
+			}
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		// LocationPath ::= RelativeLocationPath | AbsoluteLocationPath
+		// AbsoluteLocationPath ::= '/' RelativeLocationPath? | '//' RelativeLocationPath
+		xpath_ast_node* parse_location_path()
+		{
+			if (_lexer.current() == lex_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				// relative location path can start from axis_attribute, dot, double_dot, multiply and string lexemes; any other lexeme means standalone root path
+				lexeme_t l = _lexer.current();
+
+				if (l == lex_string || l == lex_axis_attribute || l == lex_dot || l == lex_double_dot || l == lex_multiply)
+					return parse_relative_location_path(n);
+				else
+					return n;
+			}
+			else if (_lexer.current() == lex_double_slash)
+			{
+				_lexer.next();
+
+				xpath_ast_node* n = alloc_node(ast_step_root, xpath_type_node_set);
+				if (!n) return 0;
+
+				n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+				if (!n) return 0;
+
+				return parse_relative_location_path(n);
+			}
+
+			// else clause moved outside of if because of bogus warning 'control may reach end of non-void function being inlined' in gcc 4.0.1
+			return parse_relative_location_path(0);
+		}
+
+		// PathExpr ::= LocationPath
+		//				| FilterExpr
+		//				| FilterExpr '/' RelativeLocationPath
+		//				| FilterExpr '//' RelativeLocationPath
+		// UnionExpr ::= PathExpr | UnionExpr '|' PathExpr
+		// UnaryExpr ::= UnionExpr | '-' UnaryExpr
+		xpath_ast_node* parse_path_or_unary_expression()
+		{
+			// Clarification.
+			// PathExpr begins with either LocationPath or FilterExpr.
+			// FilterExpr begins with PrimaryExpr
+			// PrimaryExpr begins with '$' in case of it being a variable reference,
+			// '(' in case of it being an expression, string literal, number constant or
+			// function call.
+			if (_lexer.current() == lex_var_ref || _lexer.current() == lex_open_brace ||
+				_lexer.current() == lex_quoted_string || _lexer.current() == lex_number ||
+				_lexer.current() == lex_string)
+			{
+				if (_lexer.current() == lex_string)
+				{
+					// This is either a function call, or not - if not, we shall proceed with location path
+					const char_t* state = _lexer.state();
+
+					while (PUGI__IS_CHARTYPE(*state, ct_space)) ++state;
+
+					if (*state != '(')
+						return parse_location_path();
+
+					// This looks like a function call; however this still can be a node-test. Check it.
+					if (parse_node_test_type(_lexer.contents()) != nodetest_none)
+						return parse_location_path();
+				}
+
+				xpath_ast_node* n = parse_filter_expression();
+				if (!n) return 0;
+
+				if (_lexer.current() == lex_slash || _lexer.current() == lex_double_slash)
+				{
+					lexeme_t l = _lexer.current();
+					_lexer.next();
+
+					if (l == lex_double_slash)
+					{
+						if (n->rettype() != xpath_type_node_set)
+							return error("Step has to be applied to node set");
+
+						n = alloc_node(ast_step, n, axis_descendant_or_self, nodetest_type_node, 0);
+						if (!n) return 0;
+					}
+
+					// select from location path
+					return parse_relative_location_path(n);
+				}
+
+				return n;
+			}
+			else if (_lexer.current() == lex_minus)
+			{
+				_lexer.next();
+
+				// precedence 7+ - only parses union expressions
+				xpath_ast_node* n = parse_expression(7);
+				if (!n) return 0;
+
+				return alloc_node(ast_op_negate, xpath_type_number, n);
+			}
+			else
+			{
+				return parse_location_path();
+			}
+		}
+
+		struct binary_op_t
+		{
+			ast_type_t asttype;
+			xpath_value_type rettype;
+			int precedence;
+
+			binary_op_t(): asttype(ast_unknown), rettype(xpath_type_none), precedence(0)
+			{
+			}
+
+			binary_op_t(ast_type_t asttype_, xpath_value_type rettype_, int precedence_): asttype(asttype_), rettype(rettype_), precedence(precedence_)
+			{
+			}
+
+			static binary_op_t parse(xpath_lexer& lexer)
+			{
+				switch (lexer.current())
+				{
+				case lex_string:
+					if (lexer.contents() == PUGIXML_TEXT("or"))
+						return binary_op_t(ast_op_or, xpath_type_boolean, 1);
+					else if (lexer.contents() == PUGIXML_TEXT("and"))
+						return binary_op_t(ast_op_and, xpath_type_boolean, 2);
+					else if (lexer.contents() == PUGIXML_TEXT("div"))
+						return binary_op_t(ast_op_divide, xpath_type_number, 6);
+					else if (lexer.contents() == PUGIXML_TEXT("mod"))
+						return binary_op_t(ast_op_mod, xpath_type_number, 6);
+					else
+						return binary_op_t();
+
+				case lex_equal:
+					return binary_op_t(ast_op_equal, xpath_type_boolean, 3);
+
+				case lex_not_equal:
+					return binary_op_t(ast_op_not_equal, xpath_type_boolean, 3);
+
+				case lex_less:
+					return binary_op_t(ast_op_less, xpath_type_boolean, 4);
+
+				case lex_greater:
+					return binary_op_t(ast_op_greater, xpath_type_boolean, 4);
+
+				case lex_less_or_equal:
+					return binary_op_t(ast_op_less_or_equal, xpath_type_boolean, 4);
+
+				case lex_greater_or_equal:
+					return binary_op_t(ast_op_greater_or_equal, xpath_type_boolean, 4);
+
+				case lex_plus:
+					return binary_op_t(ast_op_add, xpath_type_number, 5);
+
+				case lex_minus:
+					return binary_op_t(ast_op_subtract, xpath_type_number, 5);
+
+				case lex_multiply:
+					return binary_op_t(ast_op_multiply, xpath_type_number, 6);
+
+				case lex_union:
+					return binary_op_t(ast_op_union, xpath_type_node_set, 7);
+
+				default:
+					return binary_op_t();
+				}
+			}
+		};
+
+		xpath_ast_node* parse_expression_rec(xpath_ast_node* lhs, int limit)
+		{
+			binary_op_t op = binary_op_t::parse(_lexer);
+
+			while (op.asttype != ast_unknown && op.precedence >= limit)
+			{
+				_lexer.next();
+
+				if (++_depth > xpath_ast_depth_limit)
+					return error_rec();
+
+				xpath_ast_node* rhs = parse_path_or_unary_expression();
+				if (!rhs) return 0;
+
+				binary_op_t nextop = binary_op_t::parse(_lexer);
+
+				while (nextop.asttype != ast_unknown && nextop.precedence > op.precedence)
+				{
+					rhs = parse_expression_rec(rhs, nextop.precedence);
+					if (!rhs) return 0;
+
+					nextop = binary_op_t::parse(_lexer);
+				}
+
+				if (op.asttype == ast_op_union && (lhs->rettype() != xpath_type_node_set || rhs->rettype() != xpath_type_node_set))
+					return error("Union operator has to be applied to node sets");
+
+				lhs = alloc_node(op.asttype, op.rettype, lhs, rhs);
+				if (!lhs) return 0;
+
+				op = binary_op_t::parse(_lexer);
+			}
+
+			return lhs;
+		}
+
+		// Expr ::= OrExpr
+		// OrExpr ::= AndExpr | OrExpr 'or' AndExpr
+		// AndExpr ::= EqualityExpr | AndExpr 'and' EqualityExpr
+		// EqualityExpr ::= RelationalExpr
+		//					| EqualityExpr '=' RelationalExpr
+		//					| EqualityExpr '!=' RelationalExpr
+		// RelationalExpr ::= AdditiveExpr
+		//					  | RelationalExpr '<' AdditiveExpr
+		//					  | RelationalExpr '>' AdditiveExpr
+		//					  | RelationalExpr '<=' AdditiveExpr
+		//					  | RelationalExpr '>=' AdditiveExpr
+		// AdditiveExpr ::= MultiplicativeExpr
+		//					| AdditiveExpr '+' MultiplicativeExpr
+		//					| AdditiveExpr '-' MultiplicativeExpr
+		// MultiplicativeExpr ::= UnaryExpr
+		//						  | MultiplicativeExpr '*' UnaryExpr
+		//						  | MultiplicativeExpr 'div' UnaryExpr
+		//						  | MultiplicativeExpr 'mod' UnaryExpr
+		xpath_ast_node* parse_expression(int limit = 0)
+		{
+			size_t old_depth = _depth;
+
+			if (++_depth > xpath_ast_depth_limit)
+				return error_rec();
+
+			xpath_ast_node* n = parse_path_or_unary_expression();
+			if (!n) return 0;
+
+			n = parse_expression_rec(n, limit);
+
+			_depth = old_depth;
+
+			return n;
+		}
+
+		xpath_parser(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result): _alloc(alloc), _lexer(query), _query(query), _variables(variables), _result(result), _depth(0)
+		{
+		}
+
+		xpath_ast_node* parse()
+		{
+			xpath_ast_node* n = parse_expression();
+			if (!n) return 0;
+
+			assert(_depth == 0);
+
+			// check if there are unparsed tokens left
+			if (_lexer.current() != lex_eof)
+				return error("Incorrect query");
+
+			return n;
+		}
+
+		static xpath_ast_node* parse(const char_t* query, xpath_variable_set* variables, xpath_allocator* alloc, xpath_parse_result* result)
+		{
+			xpath_parser parser(query, variables, alloc, result);
+
+			return parser.parse();
+		}
+	};
+
+	struct xpath_query_impl
+	{
+		static xpath_query_impl* create()
+		{
+			void* memory = xml_memory::allocate(sizeof(xpath_query_impl));
+			if (!memory) return 0;
+
+			return new (memory) xpath_query_impl();
+		}
+
+		static void destroy(xpath_query_impl* impl)
+		{
+			// free all allocated pages
+			impl->alloc.release();
+
+			// free allocator memory (with the first page)
+			xml_memory::deallocate(impl);
+		}
+
+		xpath_query_impl(): root(0), alloc(&block, &oom), oom(false)
+		{
+			block.next = 0;
+			block.capacity = sizeof(block.data);
+		}
+
+		xpath_ast_node* root;
+		xpath_allocator alloc;
+		xpath_memory_block block;
+		bool oom;
+	};
+
+	PUGI__FN impl::xpath_ast_node* evaluate_node_set_prepare(xpath_query_impl* impl)
+	{
+		if (!impl) return 0;
+
+		if (impl->root->rettype() != xpath_type_node_set)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return 0;
+		#else
+			xpath_parse_result res;
+			res.error = "Expression does not evaluate to node set";
+
+			throw xpath_exception(res);
+		#endif
+		}
+
+		return impl->root;
+	}
+PUGI__NS_END
+
+namespace pugi
+{
+#ifndef PUGIXML_NO_EXCEPTIONS
+	PUGI__FN xpath_exception::xpath_exception(const xpath_parse_result& result_): _result(result_)
+	{
+		assert(_result.error);
+	}
+
+	PUGI__FN const char* xpath_exception::what() const throw()
+	{
+		return _result.error;
+	}
+
+	PUGI__FN const xpath_parse_result& xpath_exception::result() const
+	{
+		return _result;
+	}
+#endif
+
+	PUGI__FN xpath_node::xpath_node()
+	{
+	}
+
+	PUGI__FN xpath_node::xpath_node(const xml_node& node_): _node(node_)
+	{
+	}
+
+	PUGI__FN xpath_node::xpath_node(const xml_attribute& attribute_, const xml_node& parent_): _node(attribute_ ? parent_ : xml_node()), _attribute(attribute_)
+	{
+	}
+
+	PUGI__FN xml_node xpath_node::node() const
+	{
+		return _attribute ? xml_node() : _node;
+	}
+
+	PUGI__FN xml_attribute xpath_node::attribute() const
+	{
+		return _attribute;
+	}
+
+	PUGI__FN xml_node xpath_node::parent() const
+	{
+		return _attribute ? _node : _node.parent();
+	}
+
+	PUGI__FN static void unspecified_bool_xpath_node(xpath_node***)
+	{
+	}
+
+	PUGI__FN xpath_node::operator xpath_node::unspecified_bool_type() const
+	{
+		return (_node || _attribute) ? unspecified_bool_xpath_node : 0;
+	}
+
+	PUGI__FN bool xpath_node::operator!() const
+	{
+		return !(_node || _attribute);
+	}
+
+	PUGI__FN bool xpath_node::operator==(const xpath_node& n) const
+	{
+		return _node == n._node && _attribute == n._attribute;
+	}
+
+	PUGI__FN bool xpath_node::operator!=(const xpath_node& n) const
+	{
+		return _node != n._node || _attribute != n._attribute;
+	}
+
+#ifdef __BORLANDC__
+	PUGI__FN bool operator&&(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs && rhs;
+	}
+
+	PUGI__FN bool operator||(const xpath_node& lhs, bool rhs)
+	{
+		return (bool)lhs || rhs;
+	}
+#endif
+
+	PUGI__FN void xpath_node_set::_assign(const_iterator begin_, const_iterator end_, type_t type_)
+	{
+		assert(begin_ <= end_);
+
+		size_t size_ = static_cast<size_t>(end_ - begin_);
+
+		// use internal buffer for 0 or 1 elements, heap buffer otherwise
+		xpath_node* storage = (size_ <= 1) ? _storage : static_cast<xpath_node*>(impl::xml_memory::allocate(size_ * sizeof(xpath_node)));
+
+		if (!storage)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return;
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		// deallocate old buffer
+		if (_begin != _storage)
+			impl::xml_memory::deallocate(_begin);
+
+		// size check is necessary because for begin_ = end_ = nullptr, memcpy is UB
+		if (size_)
+			memcpy(storage, begin_, size_ * sizeof(xpath_node));
+
+		_begin = storage;
+		_end = storage + size_;
+		_type = type_;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN void xpath_node_set::_move(xpath_node_set& rhs) PUGIXML_NOEXCEPT
+	{
+		_type = rhs._type;
+		_storage[0] = rhs._storage[0];
+		_begin = (rhs._begin == rhs._storage) ? _storage : rhs._begin;
+		_end = _begin + (rhs._end - rhs._begin);
+
+		rhs._type = type_unsorted;
+		rhs._begin = rhs._storage;
+		rhs._end = rhs._storage;
+	}
+#endif
+
+	PUGI__FN xpath_node_set::xpath_node_set(): _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+	}
+
+	PUGI__FN xpath_node_set::xpath_node_set(const_iterator begin_, const_iterator end_, type_t type_): _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+		_assign(begin_, end_, type_);
+	}
+
+	PUGI__FN xpath_node_set::~xpath_node_set()
+	{
+		if (_begin != _storage)
+			impl::xml_memory::deallocate(_begin);
+	}
+
+	PUGI__FN xpath_node_set::xpath_node_set(const xpath_node_set& ns): _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+		_assign(ns._begin, ns._end, ns._type);
+	}
+
+	PUGI__FN xpath_node_set& xpath_node_set::operator=(const xpath_node_set& ns)
+	{
+		if (this == &ns) return *this;
+
+		_assign(ns._begin, ns._end, ns._type);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_node_set::xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT: _type(type_unsorted), _begin(_storage), _end(_storage)
+	{
+		_move(rhs);
+	}
+
+	PUGI__FN xpath_node_set& xpath_node_set::operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_begin != _storage)
+			impl::xml_memory::deallocate(_begin);
+
+		_move(rhs);
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN xpath_node_set::type_t xpath_node_set::type() const
+	{
+		return _type;
+	}
+
+	PUGI__FN size_t xpath_node_set::size() const
+	{
+		return _end - _begin;
+	}
+
+	PUGI__FN bool xpath_node_set::empty() const
+	{
+		return _begin == _end;
+	}
+
+	PUGI__FN const xpath_node& xpath_node_set::operator[](size_t index) const
+	{
+		assert(index < size());
+		return _begin[index];
+	}
+
+	PUGI__FN xpath_node_set::const_iterator xpath_node_set::begin() const
+	{
+		return _begin;
+	}
+
+	PUGI__FN xpath_node_set::const_iterator xpath_node_set::end() const
+	{
+		return _end;
+	}
+
+	PUGI__FN void xpath_node_set::sort(bool reverse)
+	{
+		_type = impl::xpath_sort(_begin, _end, _type, reverse);
+	}
+
+	PUGI__FN xpath_node xpath_node_set::first() const
+	{
+		return impl::xpath_first(_begin, _end, _type);
+	}
+
+	PUGI__FN xpath_parse_result::xpath_parse_result(): error("Internal error"), offset(0)
+	{
+	}
+
+	PUGI__FN xpath_parse_result::operator bool() const
+	{
+		return error == 0;
+	}
+
+	PUGI__FN const char* xpath_parse_result::description() const
+	{
+		return error ? error : "No error";
+	}
+
+	PUGI__FN xpath_variable::xpath_variable(xpath_value_type type_): _type(type_), _next(0)
+	{
+	}
+
+	PUGI__FN const char_t* xpath_variable::name() const
+	{
+		switch (_type)
+		{
+		case xpath_type_node_set:
+			return static_cast<const impl::xpath_variable_node_set*>(this)->name;
+
+		case xpath_type_number:
+			return static_cast<const impl::xpath_variable_number*>(this)->name;
+
+		case xpath_type_string:
+			return static_cast<const impl::xpath_variable_string*>(this)->name;
+
+		case xpath_type_boolean:
+			return static_cast<const impl::xpath_variable_boolean*>(this)->name;
+
+		default:
+			assert(false && "Invalid variable type"); // unreachable
+			return 0;
+		}
+	}
+
+	PUGI__FN xpath_value_type xpath_variable::type() const
+	{
+		return _type;
+	}
+
+	PUGI__FN bool xpath_variable::get_boolean() const
+	{
+		return (_type == xpath_type_boolean) ? static_cast<const impl::xpath_variable_boolean*>(this)->value : false;
+	}
+
+	PUGI__FN double xpath_variable::get_number() const
+	{
+		return (_type == xpath_type_number) ? static_cast<const impl::xpath_variable_number*>(this)->value : impl::gen_nan();
+	}
+
+	PUGI__FN const char_t* xpath_variable::get_string() const
+	{
+		const char_t* value = (_type == xpath_type_string) ? static_cast<const impl::xpath_variable_string*>(this)->value : 0;
+		return value ? value : PUGIXML_TEXT("");
+	}
+
+	PUGI__FN const xpath_node_set& xpath_variable::get_node_set() const
+	{
+		return (_type == xpath_type_node_set) ? static_cast<const impl::xpath_variable_node_set*>(this)->value : impl::dummy_node_set;
+	}
+
+	PUGI__FN bool xpath_variable::set(bool value)
+	{
+		if (_type != xpath_type_boolean) return false;
+
+		static_cast<impl::xpath_variable_boolean*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(double value)
+	{
+		if (_type != xpath_type_number) return false;
+
+		static_cast<impl::xpath_variable_number*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(const char_t* value)
+	{
+		if (_type != xpath_type_string) return false;
+
+		impl::xpath_variable_string* var = static_cast<impl::xpath_variable_string*>(this);
+
+		// duplicate string
+		size_t size = (impl::strlength(value) + 1) * sizeof(char_t);
+
+		char_t* copy = static_cast<char_t*>(impl::xml_memory::allocate(size));
+		if (!copy) return false;
+
+		memcpy(copy, value, size);
+
+		// replace old string
+		if (var->value) impl::xml_memory::deallocate(var->value);
+		var->value = copy;
+
+		return true;
+	}
+
+	PUGI__FN bool xpath_variable::set(const xpath_node_set& value)
+	{
+		if (_type != xpath_type_node_set) return false;
+
+		static_cast<impl::xpath_variable_node_set*>(this)->value = value;
+		return true;
+	}
+
+	PUGI__FN xpath_variable_set::xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+	}
+
+	PUGI__FN xpath_variable_set::~xpath_variable_set()
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_destroy(_data[i]);
+	}
+
+	PUGI__FN xpath_variable_set::xpath_variable_set(const xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			_data[i] = 0;
+
+		_assign(rhs);
+	}
+
+	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(const xpath_variable_set& rhs)
+	{
+		if (this == &rhs) return *this;
+
+		_assign(rhs);
+
+		return *this;
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_variable_set::xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+	}
+
+	PUGI__FN xpath_variable_set& xpath_variable_set::operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			_destroy(_data[i]);
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = 0;
+		}
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN void xpath_variable_set::_assign(const xpath_variable_set& rhs)
+	{
+		xpath_variable_set temp;
+
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+			if (rhs._data[i] && !_clone(rhs._data[i], &temp._data[i]))
+				return;
+
+		_swap(temp);
+	}
+
+	PUGI__FN void xpath_variable_set::_swap(xpath_variable_set& rhs)
+	{
+		for (size_t i = 0; i < sizeof(_data) / sizeof(_data[0]); ++i)
+		{
+			xpath_variable* chain = _data[i];
+
+			_data[i] = rhs._data[i];
+			rhs._data[i] = chain;
+		}
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::_find(const char_t* name) const
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var;
+
+		return 0;
+	}
+
+	PUGI__FN bool xpath_variable_set::_clone(xpath_variable* var, xpath_variable** out_result)
+	{
+		xpath_variable* last = 0;
+
+		while (var)
+		{
+			// allocate storage for new variable
+			xpath_variable* nvar = impl::new_xpath_variable(var->_type, var->name());
+			if (!nvar) return false;
+
+			// link the variable to the result immediately to handle failures gracefully
+			if (last)
+				last->_next = nvar;
+			else
+				*out_result = nvar;
+
+			last = nvar;
+
+			// copy the value; this can fail due to out-of-memory conditions
+			if (!impl::copy_xpath_variable(nvar, var)) return false;
+
+			var = var->_next;
+		}
+
+		return true;
+	}
+
+	PUGI__FN void xpath_variable_set::_destroy(xpath_variable* var)
+	{
+		while (var)
+		{
+			xpath_variable* next = var->_next;
+
+			impl::delete_xpath_variable(var->_type, var);
+
+			var = next;
+		}
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::add(const char_t* name, xpath_value_type type)
+	{
+		const size_t hash_size = sizeof(_data) / sizeof(_data[0]);
+		size_t hash = impl::hash_string(name) % hash_size;
+
+		// look for existing variable
+		for (xpath_variable* var = _data[hash]; var; var = var->_next)
+			if (impl::strequal(var->name(), name))
+				return var->type() == type ? var : 0;
+
+		// add new variable
+		xpath_variable* result = impl::new_xpath_variable(type, name);
+
+		if (result)
+		{
+			result->_next = _data[hash];
+
+			_data[hash] = result;
+		}
+
+		return result;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, bool value)
+	{
+		xpath_variable* var = add(name, xpath_type_boolean);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, double value)
+	{
+		xpath_variable* var = add(name, xpath_type_number);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, const char_t* value)
+	{
+		xpath_variable* var = add(name, xpath_type_string);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN bool xpath_variable_set::set(const char_t* name, const xpath_node_set& value)
+	{
+		xpath_variable* var = add(name, xpath_type_node_set);
+		return var ? var->set(value) : false;
+	}
+
+	PUGI__FN xpath_variable* xpath_variable_set::get(const char_t* name)
+	{
+		return _find(name);
+	}
+
+	PUGI__FN const xpath_variable* xpath_variable_set::get(const char_t* name) const
+	{
+		return _find(name);
+	}
+
+	PUGI__FN xpath_query::xpath_query(const char_t* query, xpath_variable_set* variables): _impl(0)
+	{
+		impl::xpath_query_impl* qimpl = impl::xpath_query_impl::create();
+
+		if (!qimpl)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			_result.error = "Out of memory";
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+		else
+		{
+			using impl::auto_deleter; // MSVC7 workaround
+			auto_deleter<impl::xpath_query_impl> impl(qimpl, impl::xpath_query_impl::destroy);
+
+			qimpl->root = impl::xpath_parser::parse(query, variables, &qimpl->alloc, &_result);
+
+			if (qimpl->root)
+			{
+				qimpl->root->optimize(&qimpl->alloc);
+
+				_impl = impl.release();
+				_result.error = 0;
+			}
+			else
+			{
+			#ifdef PUGIXML_NO_EXCEPTIONS
+				if (qimpl->oom) _result.error = "Out of memory";
+			#else
+				if (qimpl->oom) throw std::bad_alloc();
+				throw xpath_exception(_result);
+			#endif
+			}
+		}
+	}
+
+	PUGI__FN xpath_query::xpath_query(): _impl(0)
+	{
+	}
+
+	PUGI__FN xpath_query::~xpath_query()
+	{
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+	}
+
+#ifdef PUGIXML_HAS_MOVE
+	PUGI__FN xpath_query::xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+	}
+
+	PUGI__FN xpath_query& xpath_query::operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT
+	{
+		if (this == &rhs) return *this;
+
+		if (_impl)
+			impl::xpath_query_impl::destroy(static_cast<impl::xpath_query_impl*>(_impl));
+
+		_impl = rhs._impl;
+		_result = rhs._result;
+		rhs._impl = 0;
+		rhs._result = xpath_parse_result();
+
+		return *this;
+	}
+#endif
+
+	PUGI__FN xpath_value_type xpath_query::return_type() const
+	{
+		if (!_impl) return xpath_type_none;
+
+		return static_cast<impl::xpath_query_impl*>(_impl)->root->rettype();
+	}
+
+	PUGI__FN bool xpath_query::evaluate_boolean(const xpath_node& n) const
+	{
+		if (!_impl) return false;
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		bool r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_boolean(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return false;
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+	PUGI__FN double xpath_query::evaluate_number(const xpath_node& n) const
+	{
+		if (!_impl) return impl::gen_nan();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		double r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_number(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return impl::gen_nan();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r;
+	}
+
+#ifndef PUGIXML_NO_STL
+	PUGI__FN string_t xpath_query::evaluate_string(const xpath_node& n) const
+	{
+		if (!_impl) return string_t();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return string_t();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return string_t(r.c_str(), r.length());
+	}
+#endif
+
+	PUGI__FN size_t xpath_query::evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const
+	{
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_string r = _impl ? static_cast<impl::xpath_query_impl*>(_impl)->root->eval_string(c, sd.stack) : impl::xpath_string();
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			r = impl::xpath_string();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		size_t full_size = r.length() + 1;
+
+		if (capacity > 0)
+		{
+			size_t size = (full_size < capacity) ? full_size : capacity;
+			assert(size > 0);
+
+			memcpy(buffer, r.c_str(), (size - 1) * sizeof(char_t));
+			buffer[size - 1] = 0;
+		}
+
+		return full_size;
+	}
+
+	PUGI__FN xpath_node_set xpath_query::evaluate_node_set(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node_set();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_all);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node_set();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return xpath_node_set(r.begin(), r.end(), r.type());
+	}
+
+	PUGI__FN xpath_node xpath_query::evaluate_node(const xpath_node& n) const
+	{
+		impl::xpath_ast_node* root = impl::evaluate_node_set_prepare(static_cast<impl::xpath_query_impl*>(_impl));
+		if (!root) return xpath_node();
+
+		impl::xpath_context c(n, 1, 1);
+		impl::xpath_stack_data sd;
+
+		impl::xpath_node_set_raw r = root->eval_node_set(c, sd.stack, impl::nodeset_eval_first);
+
+		if (sd.oom)
+		{
+		#ifdef PUGIXML_NO_EXCEPTIONS
+			return xpath_node();
+		#else
+			throw std::bad_alloc();
+		#endif
+		}
+
+		return r.first();
+	}
+
+	PUGI__FN const xpath_parse_result& xpath_query::result() const
+	{
+		return _result;
+	}
+
+	PUGI__FN static void unspecified_bool_xpath_query(xpath_query***)
+	{
+	}
+
+	PUGI__FN xpath_query::operator xpath_query::unspecified_bool_type() const
+	{
+		return _impl ? unspecified_bool_xpath_query : 0;
+	}
+
+	PUGI__FN bool xpath_query::operator!() const
+	{
+		return !_impl;
+	}
+
+	PUGI__FN xpath_node xml_node::select_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node_set xml_node::select_nodes(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node_set(*this);
+	}
+
+	PUGI__FN xpath_node_set xml_node::select_nodes(const xpath_query& query) const
+	{
+		return query.evaluate_node_set(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_single_node(const char_t* query, xpath_variable_set* variables) const
+	{
+		xpath_query q(query, variables);
+		return q.evaluate_node(*this);
+	}
+
+	PUGI__FN xpath_node xml_node::select_single_node(const xpath_query& query) const
+	{
+		return query.evaluate_node(*this);
+	}
+}
+
+#endif
+
+#ifdef __BORLANDC__
+#	pragma option pop
+#endif
+
+// Intel C++ does not properly keep warning state for function templates,
+// so popping warning state at the end of translation unit leads to warnings in the middle.
+#if defined(_MSC_VER) && !defined(__INTEL_COMPILER)
+#	pragma warning(pop)
+#endif
+
+#if defined(_MSC_VER) && defined(__c2__)
+#	pragma clang diagnostic pop
+#endif
+
+// Undefine all local macros (makes sure we're not leaking macros in header-only mode)
+#undef PUGI__NO_INLINE
+#undef PUGI__UNLIKELY
+#undef PUGI__STATIC_ASSERT
+#undef PUGI__DMC_VOLATILE
+#undef PUGI__UNSIGNED_OVERFLOW
+#undef PUGI__MSVC_CRT_VERSION
+#undef PUGI__SNPRINTF
+#undef PUGI__NS_BEGIN
+#undef PUGI__NS_END
+#undef PUGI__FN
+#undef PUGI__FN_NO_INLINE
+#undef PUGI__GETHEADER_IMPL
+#undef PUGI__GETPAGE_IMPL
+#undef PUGI__GETPAGE
+#undef PUGI__NODETYPE
+#undef PUGI__IS_CHARTYPE_IMPL
+#undef PUGI__IS_CHARTYPE
+#undef PUGI__IS_CHARTYPEX
+#undef PUGI__ENDSWITH
+#undef PUGI__SKIPWS
+#undef PUGI__OPTSET
+#undef PUGI__PUSHNODE
+#undef PUGI__POPNODE
+#undef PUGI__SCANFOR
+#undef PUGI__SCANWHILE
+#undef PUGI__SCANWHILE_UNROLL
+#undef PUGI__ENDSEG
+#undef PUGI__THROW_ERROR
+#undef PUGI__CHECK_ERROR
+
+#endif
+
+/**
+ * Copyright (c) 2006-2019 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/Source/UnrealSoda/Private/ThirdParty/pugixml/pugixml.hpp b/Source/UnrealSoda/Private/ThirdParty/pugixml/pugixml.hpp
new file mode 100644
index 0000000..dc26615
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/pugixml/pugixml.hpp
@@ -0,0 +1,1499 @@
+/**
+ * pugixml parser - version 1.10
+ * --------------------------------------------------------
+ * Copyright (C) 2006-2019, by Arseny Kapoulkine (arseny.kapoulkine@gmail.com)
+ * Report bugs and download new versions at https://pugixml.org/
+ *
+ * This library is distributed under the MIT License. See notice at the end
+ * of this file.
+ *
+ * This work is based on the pugxml parser, which is:
+ * Copyright (C) 2003, by Kristen Wegner (kristen@tima.net)
+ */
+
+#ifndef PUGIXML_VERSION
+// Define version macro; evaluates to major * 1000 + minor * 10 + patch so that it's safe to use in less-than comparisons
+// Note: pugixml used major * 100 + minor * 10 + patch format up until 1.9 (which had version identifier 190); starting from pugixml 1.10, the minor version number is two digits
+#	define PUGIXML_VERSION 1100
+#endif
+
+// Include user configuration file (this can define various configuration macros)
+#include "pugiconfig.hpp"
+
+#ifndef HEADER_PUGIXML_HPP
+#define HEADER_PUGIXML_HPP
+
+// Include stddef.h for size_t and ptrdiff_t
+#include <stddef.h>
+
+// Include exception header for XPath
+#if !defined(PUGIXML_NO_XPATH) && !defined(PUGIXML_NO_EXCEPTIONS)
+#	include <exception>
+#endif
+
+// Include STL headers
+#ifndef PUGIXML_NO_STL
+#	include <iterator>
+#	include <iosfwd>
+#	include <string>
+#endif
+
+// Macro for deprecated features
+#ifndef PUGIXML_DEPRECATED
+#	if defined(__GNUC__)
+#		define PUGIXML_DEPRECATED __attribute__((deprecated))
+#	elif defined(_MSC_VER) && _MSC_VER >= 1300
+#		define PUGIXML_DEPRECATED __declspec(deprecated)
+#	else
+#		define PUGIXML_DEPRECATED
+#	endif
+#endif
+
+// If no API is defined, assume default
+#ifndef PUGIXML_API
+#	define PUGIXML_API
+#endif
+
+// If no API for classes is defined, assume default
+#ifndef PUGIXML_CLASS
+#	define PUGIXML_CLASS PUGIXML_API
+#endif
+
+// If no API for functions is defined, assume default
+#ifndef PUGIXML_FUNCTION
+#	define PUGIXML_FUNCTION PUGIXML_API
+#endif
+
+// If the platform is known to have long long support, enable long long functions
+#ifndef PUGIXML_HAS_LONG_LONG
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_LONG_LONG
+#	elif defined(_MSC_VER) && _MSC_VER >= 1400
+#		define PUGIXML_HAS_LONG_LONG
+#	endif
+#endif
+
+// If the platform is known to have move semantics support, compile move ctor/operator implementation
+#ifndef PUGIXML_HAS_MOVE
+#	if __cplusplus >= 201103
+#		define PUGIXML_HAS_MOVE
+#	elif defined(_MSC_VER) && _MSC_VER >= 1600
+#		define PUGIXML_HAS_MOVE
+#	endif
+#endif
+
+// If C++ is 2011 or higher, add 'noexcept' specifiers
+#ifndef PUGIXML_NOEXCEPT
+#	if __cplusplus >= 201103
+#		define PUGIXML_NOEXCEPT noexcept
+#	elif defined(_MSC_VER) && _MSC_VER >= 1900
+#		define PUGIXML_NOEXCEPT noexcept
+#	else
+#		define PUGIXML_NOEXCEPT
+#	endif
+#endif
+
+// Some functions can not be noexcept in compact mode
+#ifdef PUGIXML_COMPACT
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT
+#else
+#	define PUGIXML_NOEXCEPT_IF_NOT_COMPACT PUGIXML_NOEXCEPT
+#endif
+
+// If C++ is 2011 or higher, add 'override' qualifiers
+#ifndef PUGIXML_OVERRIDE
+#	if __cplusplus >= 201103
+#		define PUGIXML_OVERRIDE override
+#	elif defined(_MSC_VER) && _MSC_VER >= 1700
+#		define PUGIXML_OVERRIDE override
+#	else
+#		define PUGIXML_OVERRIDE
+#	endif
+#endif
+
+// If C++ is 2011 or higher, use 'nullptr'
+#ifndef PUGIXML_NULL
+#	if __cplusplus >= 201103
+#		define PUGIXML_NULL nullptr
+#	else
+#		define PUGIXML_NULL 0
+#	endif
+#endif
+
+// Character interface macros
+#ifdef PUGIXML_WCHAR_MODE
+#	define PUGIXML_TEXT(t) L ## t
+#	define PUGIXML_CHAR wchar_t
+#else
+#	define PUGIXML_TEXT(t) t
+#	define PUGIXML_CHAR char
+#endif
+
+namespace pugi
+{
+	// Character type used for all internal storage and operations; depends on PUGIXML_WCHAR_MODE
+	typedef PUGIXML_CHAR char_t;
+
+#ifndef PUGIXML_NO_STL
+	// String type used for operations that work with STL string; depends on PUGIXML_WCHAR_MODE
+	typedef std::basic_string<PUGIXML_CHAR, std::char_traits<PUGIXML_CHAR>, std::allocator<PUGIXML_CHAR> > string_t;
+#endif
+}
+
+// The PugiXML namespace
+namespace pugi
+{
+	// Tree node types
+	enum xml_node_type
+	{
+		node_null,			// Empty (null) node handle
+		node_document,		// A document tree's absolute root
+		node_element,		// Element tag, i.e. '<node/>'
+		node_pcdata,		// Plain character data, i.e. 'text'
+		node_cdata,			// Character data, i.e. '<![CDATA[text]]>'
+		node_comment,		// Comment tag, i.e. '<!-- text -->'
+		node_pi,			// Processing instruction, i.e. '<?name?>'
+		node_declaration,	// Document declaration, i.e. '<?xml version="1.0"?>'
+		node_doctype		// Document type declaration, i.e. '<!DOCTYPE doc>'
+	};
+
+	// Parsing options
+
+	// Minimal parsing mode (equivalent to turning all other flags off).
+	// Only elements and PCDATA sections are added to the DOM tree, no text conversions are performed.
+	const unsigned int parse_minimal = 0x0000;
+
+	// This flag determines if processing instructions (node_pi) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_pi = 0x0001;
+
+	// This flag determines if comments (node_comment) are added to the DOM tree. This flag is off by default.
+	const unsigned int parse_comments = 0x0002;
+
+	// This flag determines if CDATA sections (node_cdata) are added to the DOM tree. This flag is on by default.
+	const unsigned int parse_cdata = 0x0004;
+
+	// This flag determines if plain character data (node_pcdata) that consist only of whitespace are added to the DOM tree.
+	// This flag is off by default; turning it on usually results in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata = 0x0008;
+
+	// This flag determines if character and entity references are expanded during parsing. This flag is on by default.
+	const unsigned int parse_escapes = 0x0010;
+
+	// This flag determines if EOL characters are normalized (converted to #xA) during parsing. This flag is on by default.
+	const unsigned int parse_eol = 0x0020;
+
+	// This flag determines if attribute values are normalized using CDATA normalization rules during parsing. This flag is on by default.
+	const unsigned int parse_wconv_attribute = 0x0040;
+
+	// This flag determines if attribute values are normalized using NMTOKENS normalization rules during parsing. This flag is off by default.
+	const unsigned int parse_wnorm_attribute = 0x0080;
+
+	// This flag determines if document declaration (node_declaration) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_declaration = 0x0100;
+
+	// This flag determines if document type declaration (node_doctype) is added to the DOM tree. This flag is off by default.
+	const unsigned int parse_doctype = 0x0200;
+
+	// This flag determines if plain character data (node_pcdata) that is the only child of the parent node and that consists only
+	// of whitespace is added to the DOM tree.
+	// This flag is off by default; turning it on may result in slower parsing and more memory consumption.
+	const unsigned int parse_ws_pcdata_single = 0x0400;
+
+	// This flag determines if leading and trailing whitespace is to be removed from plain character data. This flag is off by default.
+	const unsigned int parse_trim_pcdata = 0x0800;
+
+	// This flag determines if plain character data that does not have a parent node is added to the DOM tree, and if an empty document
+	// is a valid document. This flag is off by default.
+	const unsigned int parse_fragment = 0x1000;
+
+	// This flag determines if plain character data is be stored in the parent element's value. This significantly changes the structure of
+	// the document; this flag is only recommended for parsing documents with many PCDATA nodes in memory-constrained environments.
+	// This flag is off by default.
+	const unsigned int parse_embed_pcdata = 0x2000;
+
+	// The default parsing mode.
+	// Elements, PCDATA and CDATA sections are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_default = parse_cdata | parse_escapes | parse_wconv_attribute | parse_eol;
+
+	// The full parsing mode.
+	// Nodes of all types are added to the DOM tree, character/reference entities are expanded,
+	// End-of-Line characters are normalized, attribute values are normalized using CDATA normalization rules.
+	const unsigned int parse_full = parse_default | parse_pi | parse_comments | parse_declaration | parse_doctype;
+
+	// These flags determine the encoding of input data for XML document
+	enum xml_encoding
+	{
+		encoding_auto,		// Auto-detect input encoding using BOM or < / <? detection; use UTF8 if BOM is not found
+		encoding_utf8,		// UTF8 encoding
+		encoding_utf16_le,	// Little-endian UTF16
+		encoding_utf16_be,	// Big-endian UTF16
+		encoding_utf16,		// UTF16 with native endianness
+		encoding_utf32_le,	// Little-endian UTF32
+		encoding_utf32_be,	// Big-endian UTF32
+		encoding_utf32,		// UTF32 with native endianness
+		encoding_wchar,		// The same encoding wchar_t has (either UTF16 or UTF32)
+		encoding_latin1
+	};
+
+	// Formatting flags
+
+	// Indent the nodes that are written to output stream with as many indentation strings as deep the node is in DOM tree. This flag is on by default.
+	const unsigned int format_indent = 0x01;
+
+	// Write encoding-specific BOM to the output stream. This flag is off by default.
+	const unsigned int format_write_bom = 0x02;
+
+	// Use raw output mode (no indentation and no line breaks are written). This flag is off by default.
+	const unsigned int format_raw = 0x04;
+
+	// Omit default XML declaration even if there is no declaration in the document. This flag is off by default.
+	const unsigned int format_no_declaration = 0x08;
+
+	// Don't escape attribute values and PCDATA contents. This flag is off by default.
+	const unsigned int format_no_escapes = 0x10;
+
+	// Open file using text mode in xml_document::save_file. This enables special character (i.e. new-line) conversions on some systems. This flag is off by default.
+	const unsigned int format_save_file_text = 0x20;
+
+	// Write every attribute on a new line with appropriate indentation. This flag is off by default.
+	const unsigned int format_indent_attributes = 0x40;
+
+	// Don't output empty element tags, instead writing an explicit start and end tag even if there are no children. This flag is off by default.
+	const unsigned int format_no_empty_element_tags = 0x80;
+
+	// Skip characters belonging to range [0; 32) instead of "&#xNN;" encoding. This flag is off by default.
+	const unsigned int format_skip_control_chars = 0x100;
+
+	// Use single quotes ' instead of double quotes " for enclosing attribute values. This flag is off by default.
+	const unsigned int format_attribute_single_quote = 0x200;
+
+	// The default set of formatting flags.
+	// Nodes are indented depending on their depth in DOM tree, a default declaration is output if document has none.
+	const unsigned int format_default = format_indent;
+
+	const int default_double_precision = 17;
+	const int default_float_precision = 9;
+
+	// Forward declarations
+	struct xml_attribute_struct;
+	struct xml_node_struct;
+
+	class xml_node_iterator;
+	class xml_attribute_iterator;
+	class xml_named_node_iterator;
+
+	class xml_tree_walker;
+
+	struct xml_parse_result;
+
+	class xml_node;
+
+	class xml_text;
+
+	#ifndef PUGIXML_NO_XPATH
+	class xpath_node;
+	class xpath_node_set;
+	class xpath_query;
+	class xpath_variable_set;
+	#endif
+
+	// Range-based for loop support
+	template <typename It> class xml_object_range
+	{
+	public:
+		typedef It const_iterator;
+		typedef It iterator;
+
+		xml_object_range(It b, It e): _begin(b), _end(e)
+		{
+		}
+
+		It begin() const { return _begin; }
+		It end() const { return _end; }
+
+	private:
+		It _begin, _end;
+	};
+
+	// Writer interface for node printing (see xml_node::print)
+	class PUGIXML_CLASS xml_writer
+	{
+	public:
+		virtual ~xml_writer() {}
+
+		// Write memory chunk into stream/file/whatever
+		virtual void write(const void* data, size_t size) = 0;
+	};
+
+	// xml_writer implementation for FILE*
+	class PUGIXML_CLASS xml_writer_file: public xml_writer
+	{
+	public:
+		// Construct writer from a FILE* object; void* is used to avoid header dependencies on stdio
+		xml_writer_file(void* file);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		void* file;
+	};
+
+	#ifndef PUGIXML_NO_STL
+	// xml_writer implementation for streams
+	class PUGIXML_CLASS xml_writer_stream: public xml_writer
+	{
+	public:
+		// Construct writer from an output stream object
+		xml_writer_stream(std::basic_ostream<char, std::char_traits<char> >& stream);
+		xml_writer_stream(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream);
+
+		virtual void write(const void* data, size_t size) PUGIXML_OVERRIDE;
+
+	private:
+		std::basic_ostream<char, std::char_traits<char> >* narrow_stream;
+		std::basic_ostream<wchar_t, std::char_traits<wchar_t> >* wide_stream;
+	};
+	#endif
+
+	// A light-weight handle for manipulating attributes in DOM tree
+	class PUGIXML_CLASS xml_attribute
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node;
+
+	private:
+		xml_attribute_struct* _attr;
+
+		typedef void (*unspecified_bool_type)(xml_attribute***);
+
+	public:
+		// Default constructor. Constructs an empty attribute.
+		xml_attribute();
+
+		// Constructs attribute from internal pointer
+		explicit xml_attribute(xml_attribute_struct* attr);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped attribute pointers)
+		bool operator==(const xml_attribute& r) const;
+		bool operator!=(const xml_attribute& r) const;
+		bool operator<(const xml_attribute& r) const;
+		bool operator>(const xml_attribute& r) const;
+		bool operator<=(const xml_attribute& r) const;
+		bool operator>=(const xml_attribute& r) const;
+
+		// Check if attribute is empty
+		bool empty() const;
+
+		// Get attribute name/value, or "" if attribute is empty
+		const char_t* name() const;
+		const char_t* value() const;
+
+		// Get attribute value, or the default value if attribute is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get attribute value as a number, or the default value if conversion did not succeed or attribute is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get attribute value as bool (returns true if first character is in '1tTyY' set), or the default value if attribute is empty
+		bool as_bool(bool def = false) const;
+
+		// Set attribute name/value (returns false if attribute is empty or there is not enough memory)
+		bool set_name(const char_t* rhs);
+		bool set_value(const char_t* rhs);
+
+		// Set attribute value with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set_value(int rhs);
+		bool set_value(unsigned int rhs);
+		bool set_value(long rhs);
+		bool set_value(unsigned long rhs);
+		bool set_value(double rhs);
+		bool set_value(double rhs, int precision);
+		bool set_value(float rhs);
+		bool set_value(float rhs, int precision);
+		bool set_value(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set_value(long long rhs);
+		bool set_value(unsigned long long rhs);
+	#endif
+
+		// Set attribute value (equivalent to set_value without error checking)
+		xml_attribute& operator=(const char_t* rhs);
+		xml_attribute& operator=(int rhs);
+		xml_attribute& operator=(unsigned int rhs);
+		xml_attribute& operator=(long rhs);
+		xml_attribute& operator=(unsigned long rhs);
+		xml_attribute& operator=(double rhs);
+		xml_attribute& operator=(float rhs);
+		xml_attribute& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_attribute& operator=(long long rhs);
+		xml_attribute& operator=(unsigned long long rhs);
+	#endif
+
+		// Get next/previous attribute in the attribute list of the parent node
+		xml_attribute next_attribute() const;
+		xml_attribute previous_attribute() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_attribute_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_attribute& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_attribute& lhs, bool rhs);
+#endif
+
+	// A light-weight handle for manipulating nodes in DOM tree
+	class PUGIXML_CLASS xml_node
+	{
+		friend class xml_attribute_iterator;
+		friend class xml_node_iterator;
+		friend class xml_named_node_iterator;
+
+	protected:
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_node***);
+
+	public:
+		// Default constructor. Constructs an empty node.
+		xml_node();
+
+		// Constructs node from internal pointer
+		explicit xml_node(xml_node_struct* p);
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators (compares wrapped node pointers)
+		bool operator==(const xml_node& r) const;
+		bool operator!=(const xml_node& r) const;
+		bool operator<(const xml_node& r) const;
+		bool operator>(const xml_node& r) const;
+		bool operator<=(const xml_node& r) const;
+		bool operator>=(const xml_node& r) const;
+
+		// Check if node is empty.
+		bool empty() const;
+
+		// Get node type
+		xml_node_type type() const;
+
+		// Get node name, or "" if node is empty or it has no name
+		const char_t* name() const;
+
+		// Get node value, or "" if node is empty or it has no value
+		// Note: For <node>text</node> node.value() does not return "text"! Use child_value() or text() methods to access text inside nodes.
+		const char_t* value() const;
+
+		// Get attribute list
+		xml_attribute first_attribute() const;
+		xml_attribute last_attribute() const;
+
+		// Get children list
+		xml_node first_child() const;
+		xml_node last_child() const;
+
+		// Get next/previous sibling in the children list of the parent node
+		xml_node next_sibling() const;
+		xml_node previous_sibling() const;
+
+		// Get parent node
+		xml_node parent() const;
+
+		// Get root of DOM tree this node belongs to
+		xml_node root() const;
+
+		// Get text object for the current node
+		xml_text text() const;
+
+		// Get child, attribute or next/previous sibling with the specified name
+		xml_node child(const char_t* name) const;
+		xml_attribute attribute(const char_t* name) const;
+		xml_node next_sibling(const char_t* name) const;
+		xml_node previous_sibling(const char_t* name) const;
+
+		// Get attribute, starting the search from a hint (and updating hint so that searching for a sequence of attributes is fast)
+		xml_attribute attribute(const char_t* name, xml_attribute& hint) const;
+
+		// Get child value of current node; that is, value of the first child node of type PCDATA/CDATA
+		const char_t* child_value() const;
+
+		// Get child value of child with specified name. Equivalent to child(name).child_value().
+		const char_t* child_value(const char_t* name) const;
+
+		// Set node name/value (returns false if node is empty, there is not enough memory, or node can not have name/value)
+		bool set_name(const char_t* rhs);
+		bool set_value(const char_t* rhs);
+
+		// Add attribute with specified name. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_attribute(const char_t* name);
+		xml_attribute prepend_attribute(const char_t* name);
+		xml_attribute insert_attribute_after(const char_t* name, const xml_attribute& attr);
+		xml_attribute insert_attribute_before(const char_t* name, const xml_attribute& attr);
+
+		// Add a copy of the specified attribute. Returns added attribute, or empty attribute on errors.
+		xml_attribute append_copy(const xml_attribute& proto);
+		xml_attribute prepend_copy(const xml_attribute& proto);
+		xml_attribute insert_copy_after(const xml_attribute& proto, const xml_attribute& attr);
+		xml_attribute insert_copy_before(const xml_attribute& proto, const xml_attribute& attr);
+
+		// Add child node with specified type. Returns added node, or empty node on errors.
+		xml_node append_child(xml_node_type type = node_element);
+		xml_node prepend_child(xml_node_type type = node_element);
+		xml_node insert_child_after(xml_node_type type, const xml_node& node);
+		xml_node insert_child_before(xml_node_type type, const xml_node& node);
+
+		// Add child element with specified name. Returns added node, or empty node on errors.
+		xml_node append_child(const char_t* name);
+		xml_node prepend_child(const char_t* name);
+		xml_node insert_child_after(const char_t* name, const xml_node& node);
+		xml_node insert_child_before(const char_t* name, const xml_node& node);
+
+		// Add a copy of the specified node as a child. Returns added node, or empty node on errors.
+		xml_node append_copy(const xml_node& proto);
+		xml_node prepend_copy(const xml_node& proto);
+		xml_node insert_copy_after(const xml_node& proto, const xml_node& node);
+		xml_node insert_copy_before(const xml_node& proto, const xml_node& node);
+
+		// Move the specified node to become a child of this node. Returns moved node, or empty node on errors.
+		xml_node append_move(const xml_node& moved);
+		xml_node prepend_move(const xml_node& moved);
+		xml_node insert_move_after(const xml_node& moved, const xml_node& node);
+		xml_node insert_move_before(const xml_node& moved, const xml_node& node);
+
+		// Remove specified attribute
+		bool remove_attribute(const xml_attribute& a);
+		bool remove_attribute(const char_t* name);
+
+		// Remove all attributes
+		bool remove_attributes();
+
+		// Remove specified child
+		bool remove_child(const xml_node& n);
+		bool remove_child(const char_t* name);
+
+		// Remove all children
+		bool remove_children();
+
+		// Parses buffer as an XML document fragment and appends all nodes as children of the current node.
+		// Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		// Note: append_buffer allocates memory that has the lifetime of the owning document; removing the appended nodes does not immediately reclaim that memory.
+		xml_parse_result append_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Find attribute using predicate. Returns first attribute for which predicate returned true.
+		template <typename Predicate> xml_attribute find_attribute(Predicate pred) const
+		{
+			if (!_root) return xml_attribute();
+
+			for (xml_attribute attrib = first_attribute(); attrib; attrib = attrib.next_attribute())
+				if (pred(attrib))
+					return attrib;
+
+			return xml_attribute();
+		}
+
+		// Find child node using predicate. Returns first child for which predicate returned true.
+		template <typename Predicate> xml_node find_child(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			for (xml_node node = first_child(); node; node = node.next_sibling())
+				if (pred(node))
+					return node;
+
+			return xml_node();
+		}
+
+		// Find node from subtree using predicate. Returns first node from subtree (depth-first), for which predicate returned true.
+		template <typename Predicate> xml_node find_node(Predicate pred) const
+		{
+			if (!_root) return xml_node();
+
+			xml_node cur = first_child();
+
+			while (cur._root && cur._root != _root)
+			{
+				if (pred(cur)) return cur;
+
+				if (cur.first_child()) cur = cur.first_child();
+				else if (cur.next_sibling()) cur = cur.next_sibling();
+				else
+				{
+					while (!cur.next_sibling() && cur._root != _root) cur = cur.parent();
+
+					if (cur._root != _root) cur = cur.next_sibling();
+				}
+			}
+
+			return xml_node();
+		}
+
+		// Find child node by attribute name/value
+		xml_node find_child_by_attribute(const char_t* name, const char_t* attr_name, const char_t* attr_value) const;
+		xml_node find_child_by_attribute(const char_t* attr_name, const char_t* attr_value) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Get the absolute node path from root as a text string.
+		string_t path(char_t delimiter = '/') const;
+	#endif
+
+		// Search for a node by path consisting of node names and . or .. elements.
+		xml_node first_element_by_path(const char_t* path, char_t delimiter = '/') const;
+
+		// Recursively traverse subtree with xml_tree_walker
+		bool traverse(xml_tree_walker& walker);
+
+	#ifndef PUGIXML_NO_XPATH
+		// Select single node by evaluating XPath query. Returns first node from the resulting node set.
+		xpath_node select_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		xpath_node select_node(const xpath_query& query) const;
+
+		// Select node set by evaluating XPath query
+		xpath_node_set select_nodes(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		xpath_node_set select_nodes(const xpath_query& query) const;
+
+		// (deprecated: use select_node instead) Select single node by evaluating XPath query.
+		PUGIXML_DEPRECATED xpath_node select_single_node(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL) const;
+		PUGIXML_DEPRECATED xpath_node select_single_node(const xpath_query& query) const;
+
+	#endif
+
+		// Print subtree using a writer object
+		void print(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Print subtree to stream
+		void print(std::basic_ostream<char, std::char_traits<char> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto, unsigned int depth = 0) const;
+		void print(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& os, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, unsigned int depth = 0) const;
+	#endif
+
+		// Child nodes iterators
+		typedef xml_node_iterator iterator;
+
+		iterator begin() const;
+		iterator end() const;
+
+		// Attribute iterators
+		typedef xml_attribute_iterator attribute_iterator;
+
+		attribute_iterator attributes_begin() const;
+		attribute_iterator attributes_end() const;
+
+		// Range-based for support
+		xml_object_range<xml_node_iterator> children() const;
+		xml_object_range<xml_named_node_iterator> children(const char_t* name) const;
+		xml_object_range<xml_attribute_iterator> attributes() const;
+
+		// Get node offset in parsed file/string (in char_t units) for debugging purposes
+		ptrdiff_t offset_debug() const;
+
+		// Get hash value (unique for handles to the same object)
+		size_t hash_value() const;
+
+		// Get internal pointer
+		xml_node_struct* internal_object() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_node& lhs, bool rhs);
+#endif
+
+	// A helper for working with text inside PCDATA nodes
+	class PUGIXML_CLASS xml_text
+	{
+		friend class xml_node;
+
+		xml_node_struct* _root;
+
+		typedef void (*unspecified_bool_type)(xml_text***);
+
+		explicit xml_text(xml_node_struct* root);
+
+		xml_node_struct* _data_new();
+		xml_node_struct* _data() const;
+
+	public:
+		// Default constructor. Constructs an empty object.
+		xml_text();
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Check if text object is empty
+		bool empty() const;
+
+		// Get text, or "" if object is empty
+		const char_t* get() const;
+
+		// Get text, or the default value if object is empty
+		const char_t* as_string(const char_t* def = PUGIXML_TEXT("")) const;
+
+		// Get text as a number, or the default value if conversion did not succeed or object is empty
+		int as_int(int def = 0) const;
+		unsigned int as_uint(unsigned int def = 0) const;
+		double as_double(double def = 0) const;
+		float as_float(float def = 0) const;
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		long long as_llong(long long def = 0) const;
+		unsigned long long as_ullong(unsigned long long def = 0) const;
+	#endif
+
+		// Get text as bool (returns true if first character is in '1tTyY' set), or the default value if object is empty
+		bool as_bool(bool def = false) const;
+
+		// Set text (returns false if object is empty or there is not enough memory)
+		bool set(const char_t* rhs);
+
+		// Set text with type conversion (numbers are converted to strings, boolean is converted to "true"/"false")
+		bool set(int rhs);
+		bool set(unsigned int rhs);
+		bool set(long rhs);
+		bool set(unsigned long rhs);
+		bool set(double rhs);
+		bool set(double rhs, int precision);
+		bool set(float rhs);
+		bool set(float rhs, int precision);
+		bool set(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		bool set(long long rhs);
+		bool set(unsigned long long rhs);
+	#endif
+
+		// Set text (equivalent to set without error checking)
+		xml_text& operator=(const char_t* rhs);
+		xml_text& operator=(int rhs);
+		xml_text& operator=(unsigned int rhs);
+		xml_text& operator=(long rhs);
+		xml_text& operator=(unsigned long rhs);
+		xml_text& operator=(double rhs);
+		xml_text& operator=(float rhs);
+		xml_text& operator=(bool rhs);
+
+	#ifdef PUGIXML_HAS_LONG_LONG
+		xml_text& operator=(long long rhs);
+		xml_text& operator=(unsigned long long rhs);
+	#endif
+
+		// Get the data node (node_pcdata or node_cdata) for this object
+		xml_node data() const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xml_text& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xml_text& lhs, bool rhs);
+#endif
+
+	// Child node iterator (a bidirectional iterator over a collection of xml_node)
+	class PUGIXML_CLASS xml_node_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+
+		xml_node_iterator(xml_node_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		xml_node_iterator(const xml_node& node);
+
+		// Iterator operators
+		bool operator==(const xml_node_iterator& rhs) const;
+		bool operator!=(const xml_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		const xml_node_iterator& operator++();
+		xml_node_iterator operator++(int);
+
+		const xml_node_iterator& operator--();
+		xml_node_iterator operator--(int);
+	};
+
+	// Attribute iterator (a bidirectional iterator over a collection of xml_attribute)
+	class PUGIXML_CLASS xml_attribute_iterator
+	{
+		friend class xml_node;
+
+	private:
+		mutable xml_attribute _wrap;
+		xml_node _parent;
+
+		xml_attribute_iterator(xml_attribute_struct* ref, xml_node_struct* parent);
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_attribute value_type;
+		typedef xml_attribute* pointer;
+		typedef xml_attribute& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_attribute_iterator();
+
+		// Construct an iterator which points to the specified attribute
+		xml_attribute_iterator(const xml_attribute& attr, const xml_node& parent);
+
+		// Iterator operators
+		bool operator==(const xml_attribute_iterator& rhs) const;
+		bool operator!=(const xml_attribute_iterator& rhs) const;
+
+		xml_attribute& operator*() const;
+		xml_attribute* operator->() const;
+
+		const xml_attribute_iterator& operator++();
+		xml_attribute_iterator operator++(int);
+
+		const xml_attribute_iterator& operator--();
+		xml_attribute_iterator operator--(int);
+	};
+
+	// Named node range helper
+	class PUGIXML_CLASS xml_named_node_iterator
+	{
+		friend class xml_node;
+
+	public:
+		// Iterator traits
+		typedef ptrdiff_t difference_type;
+		typedef xml_node value_type;
+		typedef xml_node* pointer;
+		typedef xml_node& reference;
+
+	#ifndef PUGIXML_NO_STL
+		typedef std::bidirectional_iterator_tag iterator_category;
+	#endif
+
+		// Default constructor
+		xml_named_node_iterator();
+
+		// Construct an iterator which points to the specified node
+		xml_named_node_iterator(const xml_node& node, const char_t* name);
+
+		// Iterator operators
+		bool operator==(const xml_named_node_iterator& rhs) const;
+		bool operator!=(const xml_named_node_iterator& rhs) const;
+
+		xml_node& operator*() const;
+		xml_node* operator->() const;
+
+		const xml_named_node_iterator& operator++();
+		xml_named_node_iterator operator++(int);
+
+		const xml_named_node_iterator& operator--();
+		xml_named_node_iterator operator--(int);
+
+	private:
+		mutable xml_node _wrap;
+		xml_node _parent;
+		const char_t* _name;
+
+		xml_named_node_iterator(xml_node_struct* ref, xml_node_struct* parent, const char_t* name);
+	};
+
+	// Abstract tree walker class (see xml_node::traverse)
+	class PUGIXML_CLASS xml_tree_walker
+	{
+		friend class xml_node;
+
+	private:
+		int _depth;
+
+	protected:
+		// Get current traversal depth
+		int depth() const;
+
+	public:
+		xml_tree_walker();
+		virtual ~xml_tree_walker();
+
+		// Callback that is called when traversal begins
+		virtual bool begin(xml_node& node);
+
+		// Callback that is called for each node traversed
+		virtual bool for_each(xml_node& node) = 0;
+
+		// Callback that is called when traversal ends
+		virtual bool end(xml_node& node);
+	};
+
+	// Parsing status, returned as part of xml_parse_result object
+	enum xml_parse_status
+	{
+		status_ok = 0,				// No error
+
+		status_file_not_found,		// File was not found during load_file()
+		status_io_error,			// Error reading from file/stream
+		status_out_of_memory,		// Could not allocate memory
+		status_internal_error,		// Internal error occurred
+
+		status_unrecognized_tag,	// Parser could not determine tag type
+
+		status_bad_pi,				// Parsing error occurred while parsing document declaration/processing instruction
+		status_bad_comment,			// Parsing error occurred while parsing comment
+		status_bad_cdata,			// Parsing error occurred while parsing CDATA section
+		status_bad_doctype,			// Parsing error occurred while parsing document type declaration
+		status_bad_pcdata,			// Parsing error occurred while parsing PCDATA section
+		status_bad_start_element,	// Parsing error occurred while parsing start element tag
+		status_bad_attribute,		// Parsing error occurred while parsing element attribute
+		status_bad_end_element,		// Parsing error occurred while parsing end element tag
+		status_end_element_mismatch,// There was a mismatch of start-end tags (closing tag had incorrect name, some tag was not closed or there was an excessive closing tag)
+
+		status_append_invalid_root,	// Unable to append nodes since root type is not node_element or node_document (exclusive to xml_node::append_buffer)
+
+		status_no_document_element	// Parsing resulted in a document without element nodes
+	};
+
+	// Parsing result
+	struct PUGIXML_CLASS xml_parse_result
+	{
+		// Parsing status (see xml_parse_status)
+		xml_parse_status status;
+
+		// Last parsed offset (in char_t units from start of input data)
+		ptrdiff_t offset;
+
+		// Source document encoding
+		xml_encoding encoding;
+
+		// Default constructor, initializes object to failed state
+		xml_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// Document class (DOM tree root)
+	class PUGIXML_CLASS xml_document: public xml_node
+	{
+	private:
+		char_t* _buffer;
+
+		char _memory[192];
+
+		// Non-copyable semantics
+		xml_document(const xml_document&);
+		xml_document& operator=(const xml_document&);
+
+		void _create();
+		void _destroy();
+		void _move(xml_document& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+
+	public:
+		// Default constructor, makes empty document
+		xml_document();
+
+		// Destructor, invalidates all node/attribute handles to this document
+		~xml_document();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xml_document(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+		xml_document& operator=(xml_document&& rhs) PUGIXML_NOEXCEPT_IF_NOT_COMPACT;
+	#endif
+
+		// Removes all nodes, leaving the empty document
+		void reset();
+
+		// Removes all nodes, then copies the entire contents of the specified document
+		void reset(const xml_document& proto);
+
+	#ifndef PUGIXML_NO_STL
+		// Load document from stream.
+		xml_parse_result load(std::basic_istream<char, std::char_traits<char> >& stream, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load(std::basic_istream<wchar_t, std::char_traits<wchar_t> >& stream, unsigned int options = parse_default);
+	#endif
+
+		// (deprecated: use load_string instead) Load document from zero-terminated string. No encoding conversions are applied.
+		PUGIXML_DEPRECATED xml_parse_result load(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from zero-terminated string. No encoding conversions are applied.
+		xml_parse_result load_string(const char_t* contents, unsigned int options = parse_default);
+
+		// Load document from file
+		xml_parse_result load_file(const char* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+		xml_parse_result load_file(const wchar_t* path, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer. Copies/converts the buffer, so it may be deleted or changed after the function returns.
+		xml_parse_result load_buffer(const void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should ensure that buffer data will persist throughout the document's lifetime, and free the buffer memory manually once document is destroyed.
+		xml_parse_result load_buffer_inplace(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Load document from buffer, using the buffer for in-place parsing (the buffer is modified and used for storage of document data).
+		// You should allocate the buffer with pugixml allocation function; document will free the buffer when it is no longer needed (you can't use it anymore).
+		xml_parse_result load_buffer_inplace_own(void* contents, size_t size, unsigned int options = parse_default, xml_encoding encoding = encoding_auto);
+
+		// Save XML document to writer (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(xml_writer& writer, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Save XML document to stream (semantics is slightly different from xml_node::print, see documentation for details).
+		void save(std::basic_ostream<char, std::char_traits<char> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		void save(std::basic_ostream<wchar_t, std::char_traits<wchar_t> >& stream, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default) const;
+	#endif
+
+		// Save XML to file
+		bool save_file(const char* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+		bool save_file(const wchar_t* path, const char_t* indent = PUGIXML_TEXT("\t"), unsigned int flags = format_default, xml_encoding encoding = encoding_auto) const;
+
+		// Get document element
+		xml_node document_element() const;
+	};
+
+#ifndef PUGIXML_NO_XPATH
+	// XPath query return type
+	enum xpath_value_type
+	{
+		xpath_type_none,	  // Unknown type (query failed to compile)
+		xpath_type_node_set,  // Node set (xpath_node_set)
+		xpath_type_number,	  // Number
+		xpath_type_string,	  // String
+		xpath_type_boolean	  // Boolean
+	};
+
+	// XPath parsing result
+	struct PUGIXML_CLASS xpath_parse_result
+	{
+		// Error message (0 if no error)
+		const char* error;
+
+		// Last parsed offset (in char_t units from string start)
+		ptrdiff_t offset;
+
+		// Default constructor, initializes object to failed state
+		xpath_parse_result();
+
+		// Cast to bool operator
+		operator bool() const;
+
+		// Get error description
+		const char* description() const;
+	};
+
+	// A single XPath variable
+	class PUGIXML_CLASS xpath_variable
+	{
+		friend class xpath_variable_set;
+
+	protected:
+		xpath_value_type _type;
+		xpath_variable* _next;
+
+		xpath_variable(xpath_value_type type);
+
+		// Non-copyable semantics
+		xpath_variable(const xpath_variable&);
+		xpath_variable& operator=(const xpath_variable&);
+
+	public:
+		// Get variable name
+		const char_t* name() const;
+
+		// Get variable type
+		xpath_value_type type() const;
+
+		// Get variable value; no type conversion is performed, default value (false, NaN, empty string, empty node set) is returned on type mismatch error
+		bool get_boolean() const;
+		double get_number() const;
+		const char_t* get_string() const;
+		const xpath_node_set& get_node_set() const;
+
+		// Set variable value; no type conversion is performed, false is returned on type mismatch error
+		bool set(bool value);
+		bool set(double value);
+		bool set(const char_t* value);
+		bool set(const xpath_node_set& value);
+	};
+
+	// A set of XPath variables
+	class PUGIXML_CLASS xpath_variable_set
+	{
+	private:
+		xpath_variable* _data[64];
+
+		void _assign(const xpath_variable_set& rhs);
+		void _swap(xpath_variable_set& rhs);
+
+		xpath_variable* _find(const char_t* name) const;
+
+		static bool _clone(xpath_variable* var, xpath_variable** out_result);
+		static void _destroy(xpath_variable* var);
+
+	public:
+		// Default constructor/destructor
+		xpath_variable_set();
+		~xpath_variable_set();
+
+		// Copy constructor/assignment operator
+		xpath_variable_set(const xpath_variable_set& rhs);
+		xpath_variable_set& operator=(const xpath_variable_set& rhs);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_variable_set(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_variable_set& operator=(xpath_variable_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Add a new variable or get the existing one, if the types match
+		xpath_variable* add(const char_t* name, xpath_value_type type);
+
+		// Set value of an existing variable; no type conversion is performed, false is returned if there is no such variable or if types mismatch
+		bool set(const char_t* name, bool value);
+		bool set(const char_t* name, double value);
+		bool set(const char_t* name, const char_t* value);
+		bool set(const char_t* name, const xpath_node_set& value);
+
+		// Get existing variable by name
+		xpath_variable* get(const char_t* name);
+		const xpath_variable* get(const char_t* name) const;
+	};
+
+	// A compiled XPath query object
+	class PUGIXML_CLASS xpath_query
+	{
+	private:
+		void* _impl;
+		xpath_parse_result _result;
+
+		typedef void (*unspecified_bool_type)(xpath_query***);
+
+		// Non-copyable semantics
+		xpath_query(const xpath_query&);
+		xpath_query& operator=(const xpath_query&);
+
+	public:
+		// Construct a compiled object from XPath expression.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on compilation errors.
+		explicit xpath_query(const char_t* query, xpath_variable_set* variables = PUGIXML_NULL);
+
+		// Constructor
+		xpath_query();
+
+		// Destructor
+		~xpath_query();
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_query(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+		xpath_query& operator=(xpath_query&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get query expression return type
+		xpath_value_type return_type() const;
+
+		// Evaluate expression as boolean value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		bool evaluate_boolean(const xpath_node& n) const;
+
+		// Evaluate expression as double value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		double evaluate_number(const xpath_node& n) const;
+
+	#ifndef PUGIXML_NO_STL
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		string_t evaluate_string(const xpath_node& n) const;
+	#endif
+
+		// Evaluate expression as string value in the specified context; performs type conversion if necessary.
+		// At most capacity characters are written to the destination buffer, full result size is returned (includes terminating zero).
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty  set instead.
+		size_t evaluate_string(char_t* buffer, size_t capacity, const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node set instead.
+		xpath_node_set evaluate_node_set(const xpath_node& n) const;
+
+		// Evaluate expression as node set in the specified context.
+		// Return first node in document order, or empty node if node set is empty.
+		// If PUGIXML_NO_EXCEPTIONS is not defined, throws xpath_exception on type mismatch and std::bad_alloc on out of memory errors.
+		// If PUGIXML_NO_EXCEPTIONS is defined, returns empty node instead.
+		xpath_node evaluate_node(const xpath_node& n) const;
+
+		// Get parsing result (used to get compilation errors in PUGIXML_NO_EXCEPTIONS mode)
+		const xpath_parse_result& result() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+	};
+
+	#ifndef PUGIXML_NO_EXCEPTIONS
+        #if defined(_MSC_VER)
+          // C4275 can be ignored in Visual C++ if you are deriving
+          // from a type in the Standard C++ Library
+          #pragma warning(push)
+          #pragma warning(disable: 4275)
+        #endif
+	// XPath exception class
+	class PUGIXML_CLASS xpath_exception: public std::exception
+	{
+	private:
+		xpath_parse_result _result;
+
+	public:
+		// Construct exception from parse result
+		explicit xpath_exception(const xpath_parse_result& result);
+
+		// Get error message
+		virtual const char* what() const throw() PUGIXML_OVERRIDE;
+
+		// Get parse result
+		const xpath_parse_result& result() const;
+	};
+        #if defined(_MSC_VER)
+          #pragma warning(pop)
+        #endif
+	#endif
+
+	// XPath node class (either xml_node or xml_attribute)
+	class PUGIXML_CLASS xpath_node
+	{
+	private:
+		xml_node _node;
+		xml_attribute _attribute;
+
+		typedef void (*unspecified_bool_type)(xpath_node***);
+
+	public:
+		// Default constructor; constructs empty XPath node
+		xpath_node();
+
+		// Construct XPath node from XML node/attribute
+		xpath_node(const xml_node& node);
+		xpath_node(const xml_attribute& attribute, const xml_node& parent);
+
+		// Get node/attribute, if any
+		xml_node node() const;
+		xml_attribute attribute() const;
+
+		// Get parent of contained node/attribute
+		xml_node parent() const;
+
+		// Safe bool conversion operator
+		operator unspecified_bool_type() const;
+
+		// Borland C++ workaround
+		bool operator!() const;
+
+		// Comparison operators
+		bool operator==(const xpath_node& n) const;
+		bool operator!=(const xpath_node& n) const;
+	};
+
+#ifdef __BORLANDC__
+	// Borland C++ workaround
+	bool PUGIXML_FUNCTION operator&&(const xpath_node& lhs, bool rhs);
+	bool PUGIXML_FUNCTION operator||(const xpath_node& lhs, bool rhs);
+#endif
+
+	// A fixed-size collection of XPath nodes
+	class PUGIXML_CLASS xpath_node_set
+	{
+	public:
+		// Collection type
+		enum type_t
+		{
+			type_unsorted,			// Not ordered
+			type_sorted,			// Sorted by document order (ascending)
+			type_sorted_reverse		// Sorted by document order (descending)
+		};
+
+		// Constant iterator type
+		typedef const xpath_node* const_iterator;
+
+		// We define non-constant iterator to be the same as constant iterator so that various generic algorithms (i.e. boost foreach) work
+		typedef const xpath_node* iterator;
+
+		// Default constructor. Constructs empty set.
+		xpath_node_set();
+
+		// Constructs a set from iterator range; data is not checked for duplicates and is not sorted according to provided type, so be careful
+		xpath_node_set(const_iterator begin, const_iterator end, type_t type = type_unsorted);
+
+		// Destructor
+		~xpath_node_set();
+
+		// Copy constructor/assignment operator
+		xpath_node_set(const xpath_node_set& ns);
+		xpath_node_set& operator=(const xpath_node_set& ns);
+
+	#ifdef PUGIXML_HAS_MOVE
+		// Move semantics support
+		xpath_node_set(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+		xpath_node_set& operator=(xpath_node_set&& rhs) PUGIXML_NOEXCEPT;
+	#endif
+
+		// Get collection type
+		type_t type() const;
+
+		// Get collection size
+		size_t size() const;
+
+		// Indexing operator
+		const xpath_node& operator[](size_t index) const;
+
+		// Collection iterators
+		const_iterator begin() const;
+		const_iterator end() const;
+
+		// Sort the collection in ascending/descending order by document order
+		void sort(bool reverse = false);
+
+		// Get first node in the collection by document order
+		xpath_node first() const;
+
+		// Check if collection is empty
+		bool empty() const;
+
+	private:
+		type_t _type;
+
+		xpath_node _storage[1];
+
+		xpath_node* _begin;
+		xpath_node* _end;
+
+		void _assign(const_iterator begin, const_iterator end, type_t type);
+		void _move(xpath_node_set& rhs) PUGIXML_NOEXCEPT;
+	};
+#endif
+
+#ifndef PUGIXML_NO_STL
+	// Convert wide string to UTF8
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const wchar_t* str);
+	std::basic_string<char, std::char_traits<char>, std::allocator<char> > PUGIXML_FUNCTION as_utf8(const std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> >& str);
+
+	// Convert UTF8 to wide string
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const char* str);
+	std::basic_string<wchar_t, std::char_traits<wchar_t>, std::allocator<wchar_t> > PUGIXML_FUNCTION as_wide(const std::basic_string<char, std::char_traits<char>, std::allocator<char> >& str);
+#endif
+
+	// Memory allocation function interface; returns pointer to allocated memory or NULL on failure
+	typedef void* (*allocation_function)(size_t size);
+
+	// Memory deallocation function interface
+	typedef void (*deallocation_function)(void* ptr);
+
+	// Override default memory management functions. All subsequent allocations/deallocations will be performed via supplied functions.
+	void PUGIXML_FUNCTION set_memory_management_functions(allocation_function allocate, deallocation_function deallocate);
+
+	// Get current memory management functions
+	allocation_function PUGIXML_FUNCTION get_memory_allocation_function();
+	deallocation_function PUGIXML_FUNCTION get_memory_deallocation_function();
+}
+
+#if !defined(PUGIXML_NO_STL) && (defined(_MSC_VER) || defined(__ICC))
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection for older versions (MSVC7/IC8 and earlier)
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION _Iter_cat(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#if !defined(PUGIXML_NO_STL) && defined(__SUNPRO_CC)
+namespace std
+{
+	// Workarounds for (non-standard) iterator category detection
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_node_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_attribute_iterator&);
+	std::bidirectional_iterator_tag PUGIXML_FUNCTION __iterator_category(const pugi::xml_named_node_iterator&);
+}
+#endif
+
+#endif
+
+// Make sure implementation is included in header-only mode
+// Use macro expansion in #include to work around QMake (QTBUG-11923)
+#if defined(PUGIXML_HEADER_ONLY) && !defined(PUGIXML_SOURCE)
+#	define PUGIXML_SOURCE "pugixml.cpp"
+#	include PUGIXML_SOURCE
+#endif
+
+/**
+ * Copyright (c) 2006-2019 Arseny Kapoulkine
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/.gitignore b/Source/UnrealSoda/Private/ThirdParty/quickhull/.gitignore
new file mode 100644
index 0000000..496ee2c
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/ConvexHull.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/ConvexHull.hpp
new file mode 100644
index 0000000..71b2ee1
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/ConvexHull.hpp
@@ -0,0 +1,182 @@
+#ifndef CONVEXHULL_HPP_
+#define CONVEXHULL_HPP_
+
+#include "Structs/Vector3.hpp"
+#include "Structs/Mesh.hpp"
+#include "Structs/VertexDataSource.hpp"
+#include <vector>
+#include <unordered_map>
+#include <fstream>
+#include <memory>
+
+namespace quickhull {
+
+	template<typename T>
+	class ConvexHull {
+		std::unique_ptr<std::vector<Vector3<T>>> m_optimizedVertexBuffer;
+		VertexDataSource<T> m_vertices;
+		std::vector<size_t> m_indices;
+	public:
+		ConvexHull() {}
+		
+		// Copy constructor
+		ConvexHull(const ConvexHull& o) {
+			m_indices = o.m_indices;
+			if (o.m_optimizedVertexBuffer) {
+				m_optimizedVertexBuffer.reset(new std::vector<Vector3<T>>(*o.m_optimizedVertexBuffer));
+				m_vertices = VertexDataSource<T>(*m_optimizedVertexBuffer);
+			}
+			else {
+				m_vertices = o.m_vertices;
+			}
+		}
+		
+		ConvexHull& operator=(const ConvexHull& o) {
+			if (&o == this) {
+				return *this;
+			}
+			m_indices = o.m_indices;
+			if (o.m_optimizedVertexBuffer) {
+				m_optimizedVertexBuffer.reset(new std::vector<Vector3<T>>(*o.m_optimizedVertexBuffer));
+				m_vertices = VertexDataSource<T>(*m_optimizedVertexBuffer);
+			}
+			else {
+				m_vertices = o.m_vertices;
+			}
+			return *this;
+		}
+		
+		ConvexHull(ConvexHull&& o) {
+			m_indices = std::move(o.m_indices);
+			if (o.m_optimizedVertexBuffer) {
+				m_optimizedVertexBuffer = std::move(o.m_optimizedVertexBuffer);
+				o.m_vertices = VertexDataSource<T>();
+				m_vertices = VertexDataSource<T>(*m_optimizedVertexBuffer);
+			}
+			else {
+				m_vertices = o.m_vertices;
+			}
+		}
+		
+		ConvexHull& operator=(ConvexHull&& o) {
+			if (&o == this) {
+				return *this;
+			}
+			m_indices = std::move(o.m_indices);
+			if (o.m_optimizedVertexBuffer) {
+				m_optimizedVertexBuffer = std::move(o.m_optimizedVertexBuffer);
+				o.m_vertices = VertexDataSource<T>();
+				m_vertices = VertexDataSource<T>(*m_optimizedVertexBuffer);
+			}
+			else {
+				m_vertices = o.m_vertices;
+			}
+			return *this;
+		}
+		
+		// Construct vertex and index buffers from half edge mesh and pointcloud
+		ConvexHull(const MeshBuilder<T>& mesh, const VertexDataSource<T>& pointCloud, bool CCW, bool useOriginalIndices) {
+			if (!useOriginalIndices) {
+				m_optimizedVertexBuffer.reset(new std::vector<Vector3<T>>());
+			}
+			
+			std::vector<bool> faceProcessed(mesh.m_faces.size(),false);
+			std::vector<size_t> faceStack;
+			std::unordered_map<size_t,size_t> vertexIndexMapping; // Map vertex indices from original point cloud to the new mesh vertex indices
+			for (size_t i = 0;i<mesh.m_faces.size();i++) {
+				if (!mesh.m_faces[i].isDisabled()) {
+					faceStack.push_back(i);
+					break;
+				}
+			}
+			if (faceStack.size()==0) {
+				return;
+			}
+
+			const size_t iCCW = CCW ? 1 : 0;
+			const size_t finalMeshFaceCount = mesh.m_faces.size() - mesh.m_disabledFaces.size();
+			m_indices.reserve(finalMeshFaceCount*3);
+
+			while (faceStack.size()) {
+				auto it = faceStack.end()-1;
+				size_t top = *it;
+				assert(!mesh.m_faces[top].isDisabled());
+				faceStack.erase(it);
+				if (faceProcessed[top]) {
+					continue;
+				}
+				else {
+					faceProcessed[top]=true;
+					auto halfEdges = mesh.getHalfEdgeIndicesOfFace(mesh.m_faces[top]);
+					size_t adjacent[] = {mesh.m_halfEdges[mesh.m_halfEdges[halfEdges[0]].m_opp].m_face,mesh.m_halfEdges[mesh.m_halfEdges[halfEdges[1]].m_opp].m_face,mesh.m_halfEdges[mesh.m_halfEdges[halfEdges[2]].m_opp].m_face};
+					for (auto a : adjacent) {
+						if (!faceProcessed[a] && !mesh.m_faces[a].isDisabled()) {
+							faceStack.push_back(a);
+						}
+					}
+					auto vertices = mesh.getVertexIndicesOfFace(mesh.m_faces[top]);
+					if (!useOriginalIndices) {
+						for (auto& v : vertices) {
+							auto itV = vertexIndexMapping.find(v);
+							if (itV == vertexIndexMapping.end()) {
+								m_optimizedVertexBuffer->push_back(pointCloud[v]);
+								vertexIndexMapping[v] = m_optimizedVertexBuffer->size()-1;
+								v = m_optimizedVertexBuffer->size()-1;
+							}
+							else {
+								v = itV->second;
+							}
+						}
+					}
+					m_indices.push_back(vertices[0]);
+					m_indices.push_back(vertices[1 + iCCW]);
+					m_indices.push_back(vertices[2 - iCCW]);
+				}
+			}
+			
+			if (!useOriginalIndices) {
+				m_vertices = VertexDataSource<T>(*m_optimizedVertexBuffer);
+			}
+			else {
+				m_vertices = pointCloud;
+			}
+		}
+
+		std::vector<size_t>& getIndexBuffer() {
+			return m_indices;
+		}
+
+		const std::vector<size_t>& getIndexBuffer() const {
+			return m_indices;
+		}
+
+		VertexDataSource<T>& getVertexBuffer() {
+			return m_vertices;
+		}
+		
+		const VertexDataSource<T>& getVertexBuffer() const {
+			return m_vertices;
+		}
+		
+		// Export the mesh to a Waveform OBJ file
+		void writeWaveformOBJ(const std::string& filename, const std::string& objectName = "quickhull") const
+		{
+			std::ofstream objFile;
+			objFile.open (filename);
+			objFile << "o " << objectName << "\n";
+			for (const auto& v : getVertexBuffer()) {
+				objFile << "v " << v.x << " " << v.y << " " << v.z << "\n";
+			}
+			const auto& indBuf = getIndexBuffer();
+			size_t triangleCount = indBuf.size()/3;
+			for (size_t i=0;i<triangleCount;i++) {
+				objFile << "f " << indBuf[i*3]+1 << " " << indBuf[i*3+1]+1 << " " << indBuf[i*3+2]+1 << "\n";
+			}
+			objFile.close();
+		}
+
+	};
+
+}
+
+#endif /* CONVEXHULL_HPP_ */
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/HalfEdgeMesh.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/HalfEdgeMesh.hpp
new file mode 100644
index 0000000..5800a35
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/HalfEdgeMesh.hpp
@@ -0,0 +1,77 @@
+#include "Structs/Mesh.hpp"
+
+#ifndef HalfEdgeMesh_h
+#define HalfEdgeMesh_h
+
+namespace quickhull {
+	
+	template<typename FloatType, typename IndexType>
+	class HalfEdgeMesh {
+	public:
+		
+		struct HalfEdge {
+			IndexType m_endVertex;
+			IndexType m_opp;
+			IndexType m_face;
+			IndexType m_next;
+		};
+		
+		struct Face {
+			IndexType m_halfEdgeIndex; // Index of one of the half edges of this face
+		};
+		
+		std::vector<Vector3<FloatType>> m_vertices;
+		std::vector<Face> m_faces;
+		std::vector<HalfEdge> m_halfEdges;
+		
+		HalfEdgeMesh(const MeshBuilder<FloatType>& builderObject, const VertexDataSource<FloatType>& vertexData )
+		{
+			std::unordered_map<IndexType,IndexType> faceMapping;
+			std::unordered_map<IndexType,IndexType> halfEdgeMapping;
+			std::unordered_map<IndexType, IndexType> vertexMapping;
+			
+			size_t i=0;
+			for (const auto& face : builderObject.m_faces) {
+				if (!face.isDisabled()) {
+					m_faces.push_back({static_cast<IndexType>(face.m_he)});
+					faceMapping[i] = m_faces.size()-1;
+					
+					const auto heIndices = builderObject.getHalfEdgeIndicesOfFace(face);
+					for (const auto heIndex : heIndices) {
+						const IndexType vertexIndex = builderObject.m_halfEdges[heIndex].m_endVertex;
+						if (vertexMapping.count(vertexIndex)==0) {
+							m_vertices.push_back(vertexData[vertexIndex]);
+							vertexMapping[vertexIndex] = m_vertices.size()-1;
+						}
+					}
+				}
+				i++;
+			}
+			
+			i=0;
+			for (const auto& halfEdge : builderObject.m_halfEdges) {
+				if (!halfEdge.isDisabled()) {
+					m_halfEdges.push_back({static_cast<IndexType>(halfEdge.m_endVertex),static_cast<IndexType>(halfEdge.m_opp),static_cast<IndexType>(halfEdge.m_face),static_cast<IndexType>(halfEdge.m_next)});
+					halfEdgeMapping[i] = m_halfEdges.size()-1;
+				}
+				i++;
+			}
+			
+			for (auto& face : m_faces) {
+				assert(halfEdgeMapping.count(face.m_halfEdgeIndex) == 1);
+				face.m_halfEdgeIndex = halfEdgeMapping[face.m_halfEdgeIndex];
+			}
+			
+			for (auto& he : m_halfEdges) {
+				he.m_face = faceMapping[he.m_face];
+				he.m_opp = halfEdgeMapping[he.m_opp];
+				he.m_next = halfEdgeMapping[he.m_next];
+				he.m_endVertex = vertexMapping[he.m_endVertex];
+			}
+		}
+		
+	};
+}
+
+
+#endif /* HalfEdgeMesh_h */
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/MathUtils.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/MathUtils.hpp
new file mode 100644
index 0000000..b87b3b9
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/MathUtils.hpp
@@ -0,0 +1,46 @@
+
+#ifndef QuickHull_MathUtils_hpp
+#define QuickHull_MathUtils_hpp
+
+#include "Structs/Vector3.hpp"
+#include "Structs/Ray.hpp"
+
+namespace quickhull {
+	
+	namespace mathutils {
+		
+		template <typename T>
+		inline T getSquaredDistanceBetweenPointAndRay(const Vector3<T>& p, const Ray<T>& r) {
+			const Vector3<T> s = p-r.m_S;
+			T t = s.dotProduct(r.m_V);
+			return s.getLengthSquared() - t*t*r.m_VInvLengthSquared;
+		}
+		
+		// Note that the unit of distance returned is relative to plane's normal's length (divide by N.getNormalized() if needed to get the "real" distance).
+		template <typename T>
+		inline T getSignedDistanceToPlane(const Vector3<T>& v, const Plane<T>& p) {
+			return p.m_N.dotProduct(v) + p.m_D;
+		}
+		
+		template <typename T>
+		inline Vector3<T> getTriangleNormal(const Vector3<T>& a,const Vector3<T>& b,const Vector3<T>& c) {
+			// We want to get (a-c).crossProduct(b-c) without constructing temp vectors
+			T x = a.x - c.x;
+			T y = a.y - c.y;
+			T z = a.z - c.z;
+			T rhsx = b.x - c.x;
+			T rhsy = b.y - c.y;
+			T rhsz = b.z - c.z;
+			T px = y * rhsz - z * rhsy ;
+			T py = z * rhsx - x * rhsz ;
+			T pz = x * rhsy - y * rhsx ;
+			return Vector3<T>(px,py,pz);
+		}
+		
+		
+	}
+	
+}
+
+
+#endif
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/QuickHull.cpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/QuickHull.cpp
new file mode 100644
index 0000000..1e3d1b6
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/QuickHull.cpp
@@ -0,0 +1,494 @@
+#include "QuickHull.hpp"
+#include "MathUtils.hpp"
+#include <cmath>
+#include <cassert>
+#include <iostream>
+#include <algorithm>
+#include <limits>
+#include "Structs/Mesh.hpp"
+
+namespace quickhull {
+
+
+	/*
+	 * Implementation of the algorithm
+	 */
+	
+	template<typename T>
+	ConvexHull<T> QuickHull<T>::getConvexHull(const std::vector<Vector3<T>>& pointCloud, bool CCW, bool useOriginalIndices, T epsilon) {
+		VertexDataSource<T> vertexDataSource(pointCloud);
+		return getConvexHull(vertexDataSource,CCW,useOriginalIndices,epsilon);
+	}
+	
+	template<typename T>
+	ConvexHull<T> QuickHull<T>::getConvexHull(const Vector3<T>* vertexData, size_t vertexCount, bool CCW, bool useOriginalIndices, T epsilon) {
+		VertexDataSource<T> vertexDataSource(vertexData,vertexCount);
+		return getConvexHull(vertexDataSource,CCW,useOriginalIndices,epsilon);
+	}
+	
+	template<typename T>
+	ConvexHull<T> QuickHull<T>::getConvexHull(const T* vertexData, size_t vertexCount, bool CCW, bool useOriginalIndices, T epsilon) {
+		VertexDataSource<T> vertexDataSource((const vec3*)vertexData,vertexCount);
+		return getConvexHull(vertexDataSource,CCW,useOriginalIndices,epsilon);
+	}
+	
+	template<typename FloatType>
+	HalfEdgeMesh<FloatType, size_t> QuickHull<FloatType>::getConvexHullAsMesh(const FloatType* vertexData, size_t vertexCount, bool CCW, FloatType epsilon) {
+		VertexDataSource<FloatType> vertexDataSource((const vec3*)vertexData,vertexCount);
+		buildMesh(vertexDataSource, CCW, false, epsilon);
+		return HalfEdgeMesh<FloatType, size_t>(m_mesh, m_vertexData);
+	}
+	
+	template<typename T>
+	void QuickHull<T>::buildMesh(const VertexDataSource<T>& pointCloud, bool CCW, bool useOriginalIndices, T epsilon) {
+		// CCW is unused for now
+		(void)CCW;
+		// useOriginalIndices is unused for now
+		(void)useOriginalIndices;
+
+		if (pointCloud.size()==0) {
+			m_mesh = MeshBuilder<T>();
+			return;
+		}
+		m_vertexData = pointCloud;
+		
+		// Very first: find extreme values and use them to compute the scale of the point cloud.
+		m_extremeValues = getExtremeValues();
+		m_scale = getScale(m_extremeValues);
+		
+		// Epsilon we use depends on the scale
+		m_epsilon = epsilon*m_scale;
+		m_epsilonSquared = m_epsilon*m_epsilon;
+		
+		// Reset diagnostics
+		m_diagnostics = DiagnosticsData();
+		
+		m_planar = false; // The planar case happens when all the points appear to lie on a two dimensional subspace of R^3.
+		createConvexHalfEdgeMesh();
+		if (m_planar) {
+			const size_t extraPointIndex = m_planarPointCloudTemp.size()-1;
+			for (auto& he : m_mesh.m_halfEdges) {
+				if (he.m_endVertex == extraPointIndex) {
+					he.m_endVertex = 0;
+				}
+			}
+			m_vertexData = pointCloud;
+			m_planarPointCloudTemp.clear();
+		}
+	}
+
+	template<typename T>
+	ConvexHull<T> QuickHull<T>::getConvexHull(const VertexDataSource<T>& pointCloud, bool CCW, bool useOriginalIndices, T epsilon) {
+		buildMesh(pointCloud,CCW,useOriginalIndices,epsilon);
+		return ConvexHull<T>(m_mesh,m_vertexData, CCW, useOriginalIndices);
+	}
+
+	template<typename T>
+	void QuickHull<T>::createConvexHalfEdgeMesh() {
+		m_visibleFaces.clear();
+		m_horizonEdges.clear();
+		m_possiblyVisibleFaces.clear();
+		
+		// Compute base tetrahedron
+		setupInitialTetrahedron();
+		assert(m_mesh.m_faces.size()==4);
+
+		// Init face stack with those faces that have points assigned to them
+		m_faceList.clear();
+		for (size_t i=0;i < 4;i++) {
+			auto& f = m_mesh.m_faces[i];
+			if (f.m_pointsOnPositiveSide && f.m_pointsOnPositiveSide->size()>0) {
+				m_faceList.push_back(i);
+				f.m_inFaceStack = 1;
+			}
+		}
+
+		// Process faces until the face list is empty.
+		size_t iter = 0;
+		while (!m_faceList.empty()) {
+			iter++;
+			if (iter == std::numeric_limits<size_t>::max()) {
+				// Visible face traversal marks visited faces with iteration counter (to mark that the face has been visited on this iteration) and the max value represents unvisited faces. At this point we have to reset iteration counter. This shouldn't be an
+				// issue on 64 bit machines.
+				iter = 0;
+			}
+			
+			const size_t topFaceIndex = m_faceList.front();
+			m_faceList.pop_front();
+			
+			auto& tf = m_mesh.m_faces[topFaceIndex];
+			tf.m_inFaceStack = 0;
+
+			assert(!tf.m_pointsOnPositiveSide || tf.m_pointsOnPositiveSide->size()>0);
+			if (!tf.m_pointsOnPositiveSide || tf.isDisabled()) {
+				continue;
+			}
+			
+			// Pick the most distant point to this triangle plane as the point to which we extrude
+			const vec3& activePoint = m_vertexData[tf.m_mostDistantPoint];
+			const size_t activePointIndex = tf.m_mostDistantPoint;
+
+			// Find out the faces that have our active point on their positive side (these are the "visible faces"). The face on top of the stack of course is one of them. At the same time, we create a list of horizon edges.
+			m_horizonEdges.clear();
+			m_possiblyVisibleFaces.clear();
+			m_visibleFaces.clear();
+			m_possiblyVisibleFaces.emplace_back(topFaceIndex,std::numeric_limits<size_t>::max());
+			while (m_possiblyVisibleFaces.size()) {
+				const auto faceData = m_possiblyVisibleFaces.back();
+				m_possiblyVisibleFaces.pop_back();
+				auto& pvf = m_mesh.m_faces[faceData.m_faceIndex];
+				assert(!pvf.isDisabled());
+				
+				if (pvf.m_visibilityCheckedOnIteration == iter) {
+					if (pvf.m_isVisibleFaceOnCurrentIteration) {
+						continue;
+					}
+				}
+				else {
+					const Plane<T>& P = pvf.m_P;
+					pvf.m_visibilityCheckedOnIteration = iter;
+					const T d = P.m_N.dotProduct(activePoint)+P.m_D;
+					if (d>0) {
+						pvf.m_isVisibleFaceOnCurrentIteration = 1;
+						pvf.m_horizonEdgesOnCurrentIteration = 0;
+						m_visibleFaces.push_back(faceData.m_faceIndex);
+						for (auto heIndex : m_mesh.getHalfEdgeIndicesOfFace(pvf)) {
+							if (m_mesh.m_halfEdges[heIndex].m_opp != faceData.m_enteredFromHalfEdge) {
+								m_possiblyVisibleFaces.emplace_back( m_mesh.m_halfEdges[m_mesh.m_halfEdges[heIndex].m_opp].m_face,heIndex );
+							}
+						}
+						continue;
+					}
+					assert(faceData.m_faceIndex != topFaceIndex);
+				}
+
+				// The face is not visible. Therefore, the halfedge we came from is part of the horizon edge.
+				pvf.m_isVisibleFaceOnCurrentIteration = 0;
+				m_horizonEdges.push_back(faceData.m_enteredFromHalfEdge);
+				// Store which half edge is the horizon edge. The other half edges of the face will not be part of the final mesh so their data slots can by recycled.
+				const auto halfEdges = m_mesh.getHalfEdgeIndicesOfFace(m_mesh.m_faces[m_mesh.m_halfEdges[faceData.m_enteredFromHalfEdge].m_face]);
+				const std::int8_t ind = (halfEdges[0]==faceData.m_enteredFromHalfEdge) ? 0 : (halfEdges[1]==faceData.m_enteredFromHalfEdge ? 1 : 2);
+				m_mesh.m_faces[m_mesh.m_halfEdges[faceData.m_enteredFromHalfEdge].m_face].m_horizonEdgesOnCurrentIteration |= (1<<ind);
+			}
+			const size_t horizonEdgeCount = m_horizonEdges.size();
+
+			// Order horizon edges so that they form a loop. This may fail due to numerical instability in which case we give up trying to solve horizon edge for this point and accept a minor degeneration in the convex hull.
+			if (!reorderHorizonEdges(m_horizonEdges)) {
+				m_diagnostics.m_failedHorizonEdges++;
+				std::cerr << "Failed to solve horizon edge." << std::endl;
+				auto it = std::find(tf.m_pointsOnPositiveSide->begin(),tf.m_pointsOnPositiveSide->end(),activePointIndex);
+				tf.m_pointsOnPositiveSide->erase(it);
+				if (tf.m_pointsOnPositiveSide->size()==0) {
+					reclaimToIndexVectorPool(tf.m_pointsOnPositiveSide);
+				}
+				continue;
+			}
+
+			// Except for the horizon edges, all half edges of the visible faces can be marked as disabled. Their data slots will be reused.
+			// The faces will be disabled as well, but we need to remember the points that were on the positive side of them - therefore
+			// we save pointers to them.
+			m_newFaceIndices.clear();
+			m_newHalfEdgeIndices.clear();
+			m_disabledFacePointVectors.clear();
+			size_t disableCounter = 0;
+			for (auto faceIndex : m_visibleFaces) {
+				auto& disabledFace = m_mesh.m_faces[faceIndex];
+				auto halfEdges = m_mesh.getHalfEdgeIndicesOfFace(disabledFace);
+				for (size_t j=0;j<3;j++) {
+					if ((disabledFace.m_horizonEdgesOnCurrentIteration & (1<<j)) == 0) {
+						if (disableCounter < horizonEdgeCount*2) {
+							// Use on this iteration
+							m_newHalfEdgeIndices.push_back(halfEdges[j]);
+							disableCounter++;
+						}
+						else {
+							// Mark for reusal on later iteration step
+							m_mesh.disableHalfEdge(halfEdges[j]);
+						}
+					}
+				}
+				// Disable the face, but retain pointer to the points that were on the positive side of it. We need to assign those points
+				// to the new faces we create shortly.
+				auto t = std::move(m_mesh.disableFace(faceIndex));
+				if (t) {
+					assert(t->size()); // Because we should not assign point vectors to faces unless needed...
+					m_disabledFacePointVectors.push_back(std::move(t));
+				}
+			}
+			if (disableCounter < horizonEdgeCount*2) {
+				const size_t newHalfEdgesNeeded = horizonEdgeCount*2-disableCounter;
+				for (size_t i=0;i<newHalfEdgesNeeded;i++) {
+					m_newHalfEdgeIndices.push_back(m_mesh.addHalfEdge());
+				}
+			}
+			
+			// Create new faces using the edgeloop
+			for (size_t i = 0; i < horizonEdgeCount; i++) {
+				const size_t AB = m_horizonEdges[i];
+
+				auto horizonEdgeVertexIndices = m_mesh.getVertexIndicesOfHalfEdge(m_mesh.m_halfEdges[AB]);
+				size_t A,B,C;
+				A = horizonEdgeVertexIndices[0];
+				B = horizonEdgeVertexIndices[1];
+				C = activePointIndex;
+
+				const size_t newFaceIndex = m_mesh.addFace();
+				m_newFaceIndices.push_back(newFaceIndex);
+
+				const size_t CA = m_newHalfEdgeIndices[2*i+0];
+				const size_t BC = m_newHalfEdgeIndices[2*i+1];
+
+				m_mesh.m_halfEdges[AB].m_next = BC;
+				m_mesh.m_halfEdges[BC].m_next = CA;
+				m_mesh.m_halfEdges[CA].m_next = AB;
+
+				m_mesh.m_halfEdges[BC].m_face = newFaceIndex;
+				m_mesh.m_halfEdges[CA].m_face = newFaceIndex;
+				m_mesh.m_halfEdges[AB].m_face = newFaceIndex;
+
+				m_mesh.m_halfEdges[CA].m_endVertex = A;
+				m_mesh.m_halfEdges[BC].m_endVertex = C;
+
+				auto& newFace = m_mesh.m_faces[newFaceIndex];
+
+				const Vector3<T> planeNormal = mathutils::getTriangleNormal(m_vertexData[A],m_vertexData[B],activePoint);
+				newFace.m_P = Plane<T>(planeNormal,activePoint);
+				newFace.m_he = AB;
+
+				m_mesh.m_halfEdges[CA].m_opp = m_newHalfEdgeIndices[i>0 ? i*2-1 : 2*horizonEdgeCount-1];
+				m_mesh.m_halfEdges[BC].m_opp = m_newHalfEdgeIndices[((i+1)*2) % (horizonEdgeCount*2)];
+			}
+
+			// Assign points that were on the positive side of the disabled faces to the new faces.
+			for (auto& disabledPoints : m_disabledFacePointVectors) {
+				assert(disabledPoints);
+				for (const auto& point : *(disabledPoints)) {
+					if (point == activePointIndex) {
+						continue;
+					}
+					for (size_t j=0;j<horizonEdgeCount;j++) {
+						if (addPointToFace(m_mesh.m_faces[m_newFaceIndices[j]], point)) {
+							break;
+						}
+					}
+				}
+				// The points are no longer needed: we can move them to the vector pool for reuse.
+				reclaimToIndexVectorPool(disabledPoints);
+			}
+
+			// Increase face stack size if needed
+			for (const auto newFaceIndex : m_newFaceIndices) {
+				auto& newFace = m_mesh.m_faces[newFaceIndex];
+				if (newFace.m_pointsOnPositiveSide) {
+					assert(newFace.m_pointsOnPositiveSide->size()>0);
+					if (!newFace.m_inFaceStack) {
+						m_faceList.push_back(newFaceIndex);
+						newFace.m_inFaceStack = 1;
+					}
+				}
+			}
+		}
+		
+		// Cleanup
+		m_indexVectorPool.clear();
+	}
+	
+	/*
+	 * Private helper functions
+	 */
+
+	template <typename T>
+	std::array<size_t,6> QuickHull<T>::getExtremeValues() {
+		std::array<size_t,6> outIndices{0,0,0,0,0,0};
+		T extremeVals[6] = {m_vertexData[0].x,m_vertexData[0].x,m_vertexData[0].y,m_vertexData[0].y,m_vertexData[0].z,m_vertexData[0].z};
+		const size_t vCount = m_vertexData.size();
+		for (size_t i=1;i<vCount;i++) {
+			const Vector3<T>& pos = m_vertexData[i];
+			if (pos.x>extremeVals[0]) {
+				extremeVals[0]=pos.x;
+				outIndices[0]=i;
+			}
+			else if (pos.x<extremeVals[1]) {
+				extremeVals[1]=pos.x;
+				outIndices[1]=i;
+			}
+			if (pos.y>extremeVals[2]) {
+				extremeVals[2]=pos.y;
+				outIndices[2]=i;
+			}
+			else if (pos.y<extremeVals[3]) {
+				extremeVals[3]=pos.y;
+				outIndices[3]=i;
+			}
+			if (pos.z>extremeVals[4]) {
+				extremeVals[4]=pos.z;
+				outIndices[4]=i;
+			}
+			else if (pos.z<extremeVals[5]) {
+				extremeVals[5]=pos.z;
+				outIndices[5]=i;
+			}
+		}
+		return outIndices;
+	}
+
+	template<typename T>
+	bool QuickHull<T>::reorderHorizonEdges(std::vector<size_t>& horizonEdges) {
+		const size_t horizonEdgeCount = horizonEdges.size();
+		for (size_t i=0;i<horizonEdgeCount-1;i++) {
+			const size_t endVertex = m_mesh.m_halfEdges[ horizonEdges[i] ].m_endVertex;
+			bool foundNext = false;
+			for (size_t j=i+1;j<horizonEdgeCount;j++) {
+				const size_t beginVertex = m_mesh.m_halfEdges[ m_mesh.m_halfEdges[horizonEdges[j]].m_opp ].m_endVertex;
+				if (beginVertex == endVertex) {
+					std::swap(horizonEdges[i+1],horizonEdges[j]);
+					foundNext = true;
+					break;
+				}
+			}
+			if (!foundNext) {
+				return false;
+			}
+		}
+		assert(m_mesh.m_halfEdges[ horizonEdges[horizonEdges.size()-1] ].m_endVertex == m_mesh.m_halfEdges[ m_mesh.m_halfEdges[horizonEdges[0]].m_opp ].m_endVertex);
+		return true;
+	}
+	
+	template <typename T>
+	T QuickHull<T>::getScale(const std::array<size_t,6>& extremeValues) {
+		T s = 0;
+		for (size_t i=0;i<6;i++) {
+			const T* v = (const T*)(&m_vertexData[extremeValues[i]]);
+			v += i/2;
+			auto a = std::abs(*v);
+			if (a>s) {
+				s = a;
+			}
+		}
+		return s;
+	}
+
+	template<typename T>
+	void QuickHull<T>::setupInitialTetrahedron() {
+		const size_t vertexCount = m_vertexData.size();
+		
+		// If we have at most 4 points, just return a degenerate tetrahedron:
+		if (vertexCount <= 4) {
+			size_t v[4] = {0,std::min((size_t)1,vertexCount-1),std::min((size_t)2,vertexCount-1),std::min((size_t)3,vertexCount-1)};
+			const Vector3<T> N = mathutils::getTriangleNormal(m_vertexData[v[0]],m_vertexData[v[1]],m_vertexData[v[2]]);
+			const Plane<T> trianglePlane(N,m_vertexData[v[0]]);
+			if (trianglePlane.isPointOnPositiveSide(m_vertexData[v[3]])) {
+				std::swap(v[0],v[1]);
+			}
+			return m_mesh.setup(v[0],v[1],v[2],v[3]);
+		}
+		
+		// Find two most distant extreme points.
+		T maxD = m_epsilonSquared;
+		std::pair<size_t,size_t> selectedPoints;
+		for (size_t i=0;i<6;i++) {
+			for (size_t j=i+1;j<6;j++) {
+				const T d = m_vertexData[ m_extremeValues[i] ].getSquaredDistanceTo( m_vertexData[ m_extremeValues[j] ] );
+				if (d > maxD) {
+					maxD=d;
+					selectedPoints={m_extremeValues[i],m_extremeValues[j]};
+				}
+			}
+		}
+		if (maxD == m_epsilonSquared) {
+			// A degenerate case: the point cloud seems to consists of a single point
+			return m_mesh.setup(0,std::min((size_t)1,vertexCount-1),std::min((size_t)2,vertexCount-1),std::min((size_t)3,vertexCount-1));
+		}
+		assert(selectedPoints.first != selectedPoints.second);
+		
+		// Find the most distant point to the line between the two chosen extreme points.
+		const Ray<T> r(m_vertexData[selectedPoints.first], (m_vertexData[selectedPoints.second] - m_vertexData[selectedPoints.first]));
+		maxD = m_epsilonSquared;
+		size_t maxI=std::numeric_limits<size_t>::max();
+		const size_t vCount = m_vertexData.size();
+		for (size_t i=0;i<vCount;i++) {
+			const T distToRay = mathutils::getSquaredDistanceBetweenPointAndRay(m_vertexData[i],r);
+			if (distToRay > maxD) {
+				maxD=distToRay;
+				maxI=i;
+			}
+		}
+		if (maxD == m_epsilonSquared) {
+			// It appears that the point cloud belongs to a 1 dimensional subspace of R^3: convex hull has no volume => return a thin triangle
+			// Pick any point other than selectedPoints.first and selectedPoints.second as the third point of the triangle
+			auto it = std::find_if(m_vertexData.begin(),m_vertexData.end(),[&](const vec3& ve) {
+				return ve != m_vertexData[selectedPoints.first] && ve != m_vertexData[selectedPoints.second];
+			});
+			const size_t thirdPoint = (it == m_vertexData.end()) ? selectedPoints.first : std::distance(m_vertexData.begin(),it);
+			it = std::find_if(m_vertexData.begin(),m_vertexData.end(),[&](const vec3& ve) {
+				return ve != m_vertexData[selectedPoints.first] && ve != m_vertexData[selectedPoints.second] && ve != m_vertexData[thirdPoint];
+			});
+			const size_t fourthPoint = (it == m_vertexData.end()) ? selectedPoints.first : std::distance(m_vertexData.begin(),it);
+			return m_mesh.setup(selectedPoints.first,selectedPoints.second,thirdPoint,fourthPoint);
+		}
+
+		// These three points form the base triangle for our tetrahedron.
+		assert(selectedPoints.first != maxI && selectedPoints.second != maxI);
+		std::array<size_t,3> baseTriangle{selectedPoints.first, selectedPoints.second, maxI};
+		const Vector3<T> baseTriangleVertices[]={ m_vertexData[baseTriangle[0]], m_vertexData[baseTriangle[1]],  m_vertexData[baseTriangle[2]] };
+		
+		// Next step is to find the 4th vertex of the tetrahedron. We naturally choose the point farthest away from the triangle plane.
+		maxD=m_epsilon;
+		maxI=0;
+		const Vector3<T> N = mathutils::getTriangleNormal(baseTriangleVertices[0],baseTriangleVertices[1],baseTriangleVertices[2]);
+		Plane<T> trianglePlane(N,baseTriangleVertices[0]);
+		for (size_t i=0;i<vCount;i++) {
+			const T d = std::abs(mathutils::getSignedDistanceToPlane(m_vertexData[i],trianglePlane));
+			if (d>maxD) {
+				maxD=d;
+				maxI=i;
+			}
+		}
+		if (maxD == m_epsilon) {
+			// All the points seem to lie on a 2D subspace of R^3. How to handle this? Well, let's add one extra point to the point cloud so that the convex hull will have volume.
+			m_planar = true;
+			const vec3 N1 = mathutils::getTriangleNormal(baseTriangleVertices[1],baseTriangleVertices[2],baseTriangleVertices[0]);
+			m_planarPointCloudTemp.clear();
+			m_planarPointCloudTemp.insert(m_planarPointCloudTemp.begin(),m_vertexData.begin(),m_vertexData.end());
+			const vec3 extraPoint = N1 + m_vertexData[0];
+			m_planarPointCloudTemp.push_back(extraPoint);
+			maxI = m_planarPointCloudTemp.size()-1;
+			m_vertexData = VertexDataSource<T>(m_planarPointCloudTemp);
+		}
+
+		// Enforce CCW orientation (if user prefers clockwise orientation, swap two vertices in each triangle when final mesh is created)
+		const Plane<T> triPlane(N,baseTriangleVertices[0]);
+		if (triPlane.isPointOnPositiveSide(m_vertexData[maxI])) {
+			std::swap(baseTriangle[0],baseTriangle[1]);
+		}
+
+		// Create a tetrahedron half edge mesh and compute planes defined by each triangle
+		m_mesh.setup(baseTriangle[0],baseTriangle[1],baseTriangle[2],maxI);
+		for (auto& f : m_mesh.m_faces) {
+			auto v = m_mesh.getVertexIndicesOfFace(f);
+			const Vector3<T>& va = m_vertexData[v[0]];
+			const Vector3<T>& vb = m_vertexData[v[1]];
+			const Vector3<T>& vc = m_vertexData[v[2]];
+			const Vector3<T> N1 = mathutils::getTriangleNormal(va, vb, vc);
+			const Plane<T> plane(N1,va);
+			f.m_P = plane;
+		}
+
+		// Finally we assign a face for each vertex outside the tetrahedron (vertices inside the tetrahedron have no role anymore)
+		for (size_t i=0;i<vCount;i++) {
+			for (auto& face : m_mesh.m_faces) {
+				if (addPointToFace(face, i)) {
+					break;
+				}
+			}
+		}
+	}
+	
+	/*
+	 * Explicit template specifications for float and double
+	 */
+
+	template class QuickHull<float>;
+	template class QuickHull<double>;
+}
+
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/QuickHull.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/QuickHull.hpp
new file mode 100644
index 0000000..b1b7fb8
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/QuickHull.hpp
@@ -0,0 +1,227 @@
+#ifndef QUICKHULL_HPP_
+#define QUICKHULL_HPP_
+#include <deque>
+#include <vector>
+#include <array>
+#include <limits>
+#include "Structs/Vector3.hpp"
+#include "Structs/Plane.hpp"
+#include "Structs/Pool.hpp"
+#include "Structs/Mesh.hpp"
+#include "ConvexHull.hpp"
+#include "HalfEdgeMesh.hpp"
+#include "MathUtils.hpp"
+
+/*
+ * Implementation of the 3D QuickHull algorithm by Antti Kuukka
+ *
+ * No copyrights. What follows is 100% Public Domain.
+ *
+ *
+ *
+ * INPUT:  a list of points in 3D space (for example, vertices of a 3D mesh)
+ *
+ * OUTPUT: a ConvexHull object which provides vertex and index buffers of the generated convex hull as a triangle mesh.
+ *
+ *
+ *
+ * The implementation is thread-safe if each thread is using its own QuickHull object.
+ *
+ *
+ * SUMMARY OF THE ALGORITHM:
+ *         - Create initial simplex (tetrahedron) using extreme points. We have four faces now and they form a convex mesh M.
+ *         - For each point, assign them to the first face for which they are on the positive side of (so each point is assigned to at most
+ *           one face). Points inside the initial tetrahedron are left behind now and no longer affect the calculations.
+ *         - Add all faces that have points assigned to them to Face Stack.
+ *         - Iterate until Face Stack is empty:
+ *              - Pop topmost face F from the stack
+ *              - From the points assigned to F, pick the point P that is farthest away from the plane defined by F.
+ *              - Find all faces of M that have P on their positive side. Let us call these the "visible faces".
+ *              - Because of the way M is constructed, these faces are connected. Solve their horizon edge loop.
+ *				- "Extrude to P": Create new faces by connecting P with the points belonging to the horizon edge. Add the new faces to M and remove the visible
+ *                faces from M.
+ *              - Each point that was assigned to visible faces is now assigned to at most one of the newly created faces.
+ *              - Those new faces that have points assigned to them are added to the top of Face Stack.
+ *          - M is now the convex hull.
+ *
+ * TO DO:
+ *  - Implement a proper 2D QuickHull and use that to solve the degenerate 2D case (when all the points lie on the same plane in 3D space).
+ * */
+
+namespace quickhull {
+	
+	struct DiagnosticsData {
+		size_t m_failedHorizonEdges; // How many times QuickHull failed to solve the horizon edge. Failures lead to degenerated convex hulls.
+		
+		DiagnosticsData() : m_failedHorizonEdges(0) { }
+	};
+	
+	template<typename FloatType>
+	FloatType defaultEps()
+	{
+		if(sizeof(FloatType) > 4) return 0.0000001;
+		return 0.0001f;
+	}
+
+	template<typename FloatType>
+	class QuickHull {
+		using vec3 = Vector3<FloatType>;
+
+		FloatType m_epsilon, m_epsilonSquared, m_scale;
+		bool m_planar;
+		std::vector<vec3> m_planarPointCloudTemp;
+		VertexDataSource<FloatType> m_vertexData;
+		MeshBuilder<FloatType> m_mesh;
+		std::array<size_t,6> m_extremeValues;
+		DiagnosticsData m_diagnostics;
+
+		// Temporary variables used during iteration process
+		std::vector<size_t> m_newFaceIndices;
+		std::vector<size_t> m_newHalfEdgeIndices;
+		std::vector< std::unique_ptr<std::vector<size_t>> > m_disabledFacePointVectors;
+		std::vector<size_t> m_visibleFaces;
+		std::vector<size_t> m_horizonEdges;
+		struct FaceData {
+			size_t m_faceIndex;
+			size_t m_enteredFromHalfEdge; // If the face turns out not to be visible, this half edge will be marked as horizon edge
+			FaceData(size_t fi, size_t he) : m_faceIndex(fi),m_enteredFromHalfEdge(he) {}
+		};
+		std::vector<FaceData> m_possiblyVisibleFaces;
+		std::deque<size_t> m_faceList;
+
+		// Create a half edge mesh representing the base tetrahedron from which the QuickHull iteration proceeds. m_extremeValues must be properly set up when this is called.
+		void setupInitialTetrahedron();
+
+		// Given a list of half edges, try to rearrange them so that they form a loop. Return true on success.
+		bool reorderHorizonEdges(std::vector<size_t>& horizonEdges);
+		
+		// Find indices of extreme values (max x, min x, max y, min y, max z, min z) for the given point cloud
+		std::array<size_t,6> getExtremeValues();
+		
+		// Compute scale of the vertex data.
+		FloatType getScale(const std::array<size_t,6>& extremeValues);
+		
+		// Each face contains a unique pointer to a vector of indices. However, many - often most - faces do not have any points on the positive
+		// side of them especially at the the end of the iteration. When a face is removed from the mesh, its associated point vector, if such
+		// exists, is moved to the index vector pool, and when we need to add new faces with points on the positive side to the mesh,
+		// we reuse these vectors. This reduces the amount of std::vectors we have to deal with, and impact on performance is remarkable.
+		Pool<std::vector<size_t>> m_indexVectorPool;
+		inline std::unique_ptr<std::vector<size_t>> getIndexVectorFromPool();
+		inline void reclaimToIndexVectorPool(std::unique_ptr<std::vector<size_t>>& ptr);
+		
+		// Associates a point with a face if the point resides on the positive side of the plane. Returns true if the points was on the positive side.
+		inline bool addPointToFace(typename MeshBuilder<FloatType>::Face& f, size_t pointIndex);
+		
+		// This will update m_mesh from which we create the ConvexHull object that getConvexHull function returns
+		void createConvexHalfEdgeMesh();
+		
+		// Constructs the convex hull into a MeshBuilder object which can be converted to a ConvexHull or Mesh object
+		void buildMesh(const VertexDataSource<FloatType>& pointCloud, bool CCW, bool useOriginalIndices, FloatType eps);
+		
+		// The public getConvexHull functions will setup a VertexDataSource object and call this
+		ConvexHull<FloatType> getConvexHull(const VertexDataSource<FloatType>& pointCloud, bool CCW, bool useOriginalIndices, FloatType eps);
+	public:
+		// Computes convex hull for a given point cloud.
+		// Params:
+		//   pointCloud: a vector of of 3D points
+		//   CCW: whether the output mesh triangles should have CCW orientation
+		//   useOriginalIndices: should the output mesh use same vertex indices as the original point cloud. If this is false,
+		//      then we generate a new vertex buffer which contains only the vertices that are part of the convex hull.
+		//   eps: minimum distance to a plane to consider a point being on positive of it (for a point cloud with scale 1)
+		ConvexHull<FloatType> getConvexHull(const std::vector<Vector3<FloatType>>& pointCloud,
+											bool CCW,
+											bool useOriginalIndices,
+											FloatType eps = defaultEps<FloatType>());
+		
+		// Computes convex hull for a given point cloud.
+		// Params:
+		//   vertexData: pointer to the first 3D point of the point cloud
+		//   vertexCount: number of vertices in the point cloud
+		//   CCW: whether the output mesh triangles should have CCW orientation
+		//   useOriginalIndices: should the output mesh use same vertex indices as the original point cloud. If this is false,
+		//      then we generate a new vertex buffer which contains only the vertices that are part of the convex hull.
+		//   eps: minimum distance to a plane to consider a point being on positive side of it (for a point cloud with scale 1)
+		ConvexHull<FloatType> getConvexHull(const Vector3<FloatType>* vertexData,
+											size_t vertexCount,
+											bool CCW,
+											bool useOriginalIndices,
+											FloatType eps = defaultEps<FloatType>());
+		
+		// Computes convex hull for a given point cloud. This function assumes that the vertex data resides in memory
+		// in the following format: x_0,y_0,z_0,x_1,y_1,z_1,...
+		// Params:
+		//   vertexData: pointer to the X component of the first point of the point cloud.
+		//   vertexCount: number of vertices in the point cloud
+		//   CCW: whether the output mesh triangles should have CCW orientation
+		//   useOriginalIndices: should the output mesh use same vertex indices as the original point cloud. If this is false,
+		//      then we generate a new vertex buffer which contains only the vertices that are part of the convex hull.
+		//   eps: minimum distance to a plane to consider a point being on positive side of it (for a point cloud with scale 1)
+		ConvexHull<FloatType> getConvexHull(const FloatType* vertexData,
+											size_t vertexCount,
+											bool CCW,
+											bool useOriginalIndices,
+											FloatType eps = defaultEps<FloatType>());
+		
+		// Computes convex hull for a given point cloud. This function assumes that the vertex data resides in memory
+		// in the following format: x_0,y_0,z_0,x_1,y_1,z_1,...
+		// Params:
+		//   vertexData: pointer to the X component of the first point of the point cloud.
+		//   vertexCount: number of vertices in the point cloud
+		//   CCW: whether the output mesh triangles should have CCW orientation
+		//   eps: minimum distance to a plane to consider a point being on positive side of it (for a point cloud with scale 1)
+		// Returns:
+		//   Convex hull of the point cloud as a mesh object with half edge structure.
+		HalfEdgeMesh<FloatType, size_t> getConvexHullAsMesh(const FloatType* vertexData,
+															size_t vertexCount,
+															bool CCW,
+															FloatType eps = defaultEps<FloatType>());
+		
+		// Get diagnostics about last generated convex hull
+		const DiagnosticsData& getDiagnostics() {
+			return m_diagnostics;
+		}
+	};
+	
+	/*
+	 * Inline function definitions
+	 */
+	
+	template<typename T>
+	std::unique_ptr<std::vector<size_t>> QuickHull<T>::getIndexVectorFromPool() {
+		auto r = m_indexVectorPool.get();
+		r->clear();
+		return r;
+	}
+	
+	template<typename T>
+	void QuickHull<T>::reclaimToIndexVectorPool(std::unique_ptr<std::vector<size_t>>& ptr) {
+		const size_t oldSize = ptr->size();
+		if ((oldSize+1)*128 < ptr->capacity()) {
+			// Reduce memory usage! Huge vectors are needed at the beginning of iteration when faces have many points on their positive side. Later on, smaller vectors will suffice.
+			ptr.reset(nullptr);
+			return;
+		}
+		m_indexVectorPool.reclaim(ptr);
+	}
+
+	template<typename T>
+	bool QuickHull<T>::addPointToFace(typename MeshBuilder<T>::Face& f, size_t pointIndex) {
+		const T D = mathutils::getSignedDistanceToPlane(m_vertexData[ pointIndex ],f.m_P);
+		if (D>0 && D*D > m_epsilonSquared*f.m_P.m_sqrNLength) {
+			if (!f.m_pointsOnPositiveSide) {
+				f.m_pointsOnPositiveSide = std::move(getIndexVectorFromPool());
+			}
+			f.m_pointsOnPositiveSide->push_back( pointIndex );
+			if (D > f.m_mostDistantPointDist) {
+				f.m_mostDistantPointDist = D;
+				f.m_mostDistantPoint = pointIndex;
+			}
+			return true;
+		}
+		return false;
+	}
+
+}
+
+
+#endif /* QUICKHULL_HPP_ */
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/README.md b/Source/UnrealSoda/Private/ThirdParty/quickhull/README.md
new file mode 100644
index 0000000..a36c081
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/README.md
@@ -0,0 +1,31 @@
+This implementation is 100% Public Domain.
+
+Feel free to use.
+ 
+C++11 is needed to compile it.
+
+Basic usage:
+
+	#include "quickhull/quickhull.hpp"
+
+	using namespace quickhull;
+	QuickHull<float> qh; // Could be double as well
+	std::vector<Vector3<float>> pointCloud;
+	// Add points to point cloud
+	...
+	auto hull = qh.getConvexHull(pointCloud, true, false);
+	const auto& indexBuffer = hull.getIndexBuffer();
+	const auto& vertexBuffer = hull.getVertexBuffer();
+	// Do what you want with the convex triangle mesh
+
+Vertex data can be passed as a pointer to float/double as long as the data is in X_0,Y_0,Z_0,X_1,Y_1,Z_1,...,X_N,Y_N_Z_N format:
+
+	auto hull = qh.getConvexHull(&pointCloud[0].x, pointCloud.size(), true, false);
+
+The first boolean parameter of getConvexHull specifies whether the resulting mesh should have its triangles in CCW orientation.
+
+The second boolean parameter specifies whether the mesh should use vertex indices of the original point cloud. If it is false, a new vertex buffer is generated which consists only of those vertices that are part of the convex hull. In this case, the new vertex buffer is owned by the returned ConvexHull object. Otherwise, the original point cloud is used as vertex buffer and since the vertices are not copied, make sure you don't call ConvexHull::getVertexBuffer after releasing the memory that contains the original point cloud data.
+
+This implementation is fast, because the convex hull is internally built using a half edge mesh representation which provides quick access to adjacent faces. It is also possible to get the output convex hull as a half edge mesh:
+
+	auto mesh = qh.getConvexHullAsMesh(&pointCloud[0].x, pointCloud.size(), true);
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Mesh.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Mesh.hpp
new file mode 100644
index 0000000..512fc1e
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Mesh.hpp
@@ -0,0 +1,254 @@
+#ifndef MESH_HPP_
+#define MESH_HPP_
+
+#include <vector>
+#include "Vector3.hpp"
+#include "Plane.hpp"
+#include "Pool.hpp"
+#include <array>
+#include <cassert>
+#include <limits>
+#include <memory>
+#include "VertexDataSource.hpp"
+#include <unordered_map>
+
+namespace quickhull {
+
+	template <typename T>
+	class MeshBuilder {
+	public:
+		struct HalfEdge {
+			size_t m_endVertex;
+			size_t m_opp;
+			size_t m_face;
+			size_t m_next;
+			
+			void disable() {
+				m_endVertex = std::numeric_limits<size_t>::max();
+			}
+			
+			bool isDisabled() const {
+				return m_endVertex == std::numeric_limits<size_t>::max();
+			}
+		};
+
+		struct Face {
+			size_t m_he;
+			Plane<T> m_P;
+			T m_mostDistantPointDist;
+			size_t m_mostDistantPoint;
+			size_t m_visibilityCheckedOnIteration;
+			std::uint8_t m_isVisibleFaceOnCurrentIteration : 1;
+			std::uint8_t m_inFaceStack : 1;
+			std::uint8_t m_horizonEdgesOnCurrentIteration : 3; // Bit for each half edge assigned to this face, each being 0 or 1 depending on whether the edge belongs to horizon edge
+			std::unique_ptr<std::vector<size_t>> m_pointsOnPositiveSide;
+
+			Face() : m_he(std::numeric_limits<size_t>::max()),
+					 m_mostDistantPointDist(0),
+					 m_mostDistantPoint(0),
+					 m_visibilityCheckedOnIteration(0),
+					 m_isVisibleFaceOnCurrentIteration(0),
+					 m_inFaceStack(0),
+					 m_horizonEdgesOnCurrentIteration(0)
+			{
+
+			}
+			
+			void disable() {
+				m_he = std::numeric_limits<size_t>::max();
+			}
+
+			bool isDisabled() const {
+				return m_he == std::numeric_limits<size_t>::max();
+			}
+		};
+
+		// Mesh data
+		std::vector<Face> m_faces;
+		std::vector<HalfEdge> m_halfEdges;
+		
+		// When the mesh is modified and faces and half edges are removed from it, we do not actually remove them from the container vectors.
+		// Insted, they are marked as disabled which means that the indices can be reused when we need to add new faces and half edges to the mesh.
+		// We store the free indices in the following vectors.
+		std::vector<size_t> m_disabledFaces,m_disabledHalfEdges;
+		
+		size_t addFace() {
+			if (m_disabledFaces.size()) {
+				size_t index = m_disabledFaces.back();
+				auto& f = m_faces[index];
+				assert(f.isDisabled());
+				assert(!f.m_pointsOnPositiveSide);
+				f.m_mostDistantPointDist = 0;
+				m_disabledFaces.pop_back();
+				return index;
+			}
+			m_faces.emplace_back();
+			return m_faces.size()-1;
+		}
+
+		size_t addHalfEdge()	{
+			if (m_disabledHalfEdges.size()) {
+				const size_t index = m_disabledHalfEdges.back();
+				m_disabledHalfEdges.pop_back();
+				return index;
+			}
+			m_halfEdges.emplace_back();
+			return m_halfEdges.size()-1;
+		}
+
+		// Mark a face as disabled and return a pointer to the points that were on the positive of it.
+		std::unique_ptr<std::vector<size_t>> disableFace(size_t faceIndex) {
+			auto& f = m_faces[faceIndex];
+			f.disable();
+			m_disabledFaces.push_back(faceIndex);
+			return std::move(f.m_pointsOnPositiveSide);
+		}
+
+		void disableHalfEdge(size_t heIndex) {
+			auto& he = m_halfEdges[heIndex];
+			he.disable();
+			m_disabledHalfEdges.push_back(heIndex);
+		}
+
+		MeshBuilder() = default;
+		
+		// Create a mesh with initial tetrahedron ABCD. Dot product of AB with the normal of triangle ABC should be negative.
+		void setup(size_t a, size_t b, size_t c, size_t d) {
+			m_faces.clear();
+			m_halfEdges.clear();
+			m_disabledFaces.clear();
+			m_disabledHalfEdges.clear();
+			
+			m_faces.reserve(4);
+			m_halfEdges.reserve(12);
+			
+			// Create halfedges
+			HalfEdge AB;
+			AB.m_endVertex = b;
+			AB.m_opp = 6;
+			AB.m_face = 0;
+			AB.m_next = 1;
+			m_halfEdges.push_back(AB);
+
+			HalfEdge BC;
+			BC.m_endVertex = c;
+			BC.m_opp = 9;
+			BC.m_face = 0;
+			BC.m_next = 2;
+			m_halfEdges.push_back(BC);
+
+			HalfEdge CA;
+			CA.m_endVertex = a;
+			CA.m_opp = 3;
+			CA.m_face = 0;
+			CA.m_next = 0;
+			m_halfEdges.push_back(CA);
+
+			HalfEdge AC;
+			AC.m_endVertex = c;
+			AC.m_opp = 2;
+			AC.m_face = 1;
+			AC.m_next = 4;
+			m_halfEdges.push_back(AC);
+
+			HalfEdge CD;
+			CD.m_endVertex = d;
+			CD.m_opp = 11;
+			CD.m_face = 1;
+			CD.m_next = 5;
+			m_halfEdges.push_back(CD);
+
+			HalfEdge DA;
+			DA.m_endVertex = a;
+			DA.m_opp = 7;
+			DA.m_face = 1;
+			DA.m_next = 3;
+			m_halfEdges.push_back(DA);
+
+			HalfEdge BA;
+			BA.m_endVertex = a;
+			BA.m_opp = 0;
+			BA.m_face = 2;
+			BA.m_next = 7;
+			m_halfEdges.push_back(BA);
+
+			HalfEdge AD;
+			AD.m_endVertex = d;
+			AD.m_opp = 5;
+			AD.m_face = 2;
+			AD.m_next = 8;
+			m_halfEdges.push_back(AD);
+
+			HalfEdge DB;
+			DB.m_endVertex = b;
+			DB.m_opp = 10;
+			DB.m_face = 2;
+			DB.m_next = 6;
+			m_halfEdges.push_back(DB);
+
+			HalfEdge CB;
+			CB.m_endVertex = b;
+			CB.m_opp = 1;
+			CB.m_face = 3;
+			CB.m_next = 10;
+			m_halfEdges.push_back(CB);
+
+			HalfEdge BD;
+			BD.m_endVertex = d;
+			BD.m_opp = 8;
+			BD.m_face = 3;
+			BD.m_next = 11;
+			m_halfEdges.push_back(BD);
+
+			HalfEdge DC;
+			DC.m_endVertex = c;
+			DC.m_opp = 4;
+			DC.m_face = 3;
+			DC.m_next = 9;
+			m_halfEdges.push_back(DC);
+
+			// Create faces
+			Face ABC;
+			ABC.m_he = 0;
+			m_faces.push_back(std::move(ABC));
+
+			Face ACD;
+			ACD.m_he = 3;
+			m_faces.push_back(std::move(ACD));
+
+			Face BAD;
+			BAD.m_he = 6;
+			m_faces.push_back(std::move(BAD));
+
+			Face CBD;
+			CBD.m_he = 9;
+			m_faces.push_back(std::move(CBD));
+		}
+
+		std::array<size_t,3> getVertexIndicesOfFace(const Face& f) const {
+			std::array<size_t,3> v;
+			const HalfEdge* he = &m_halfEdges[f.m_he];
+			v[0] = he->m_endVertex;
+			he = &m_halfEdges[he->m_next];
+			v[1] = he->m_endVertex;
+			he = &m_halfEdges[he->m_next];
+			v[2] = he->m_endVertex;
+			return v;
+		}
+
+		std::array<size_t,2> getVertexIndicesOfHalfEdge(const HalfEdge& he) const {
+			return {m_halfEdges[he.m_opp].m_endVertex,he.m_endVertex};
+		}
+
+		std::array<size_t,3> getHalfEdgeIndicesOfFace(const Face& f) const {
+			return {f.m_he,m_halfEdges[f.m_he].m_next,m_halfEdges[m_halfEdges[f.m_he].m_next].m_next};
+		}
+	};
+	
+
+
+}
+
+
+
+#endif 
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Plane.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Plane.hpp
new file mode 100644
index 0000000..903a7ef
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Plane.hpp
@@ -0,0 +1,36 @@
+#ifndef QHPLANE_HPP_
+#define QHPLANE_HPP_
+
+#include "Vector3.hpp"
+
+namespace quickhull {
+
+	template<typename T>
+	class Plane {
+	public:
+		Vector3<T> m_N;
+		
+		// Signed distance (if normal is of length 1) to the plane from origin
+		T m_D;
+		
+		// Normal length squared
+		T m_sqrNLength;
+
+		bool isPointOnPositiveSide(const Vector3<T>& Q) const {
+			T d = m_N.dotProduct(Q)+m_D;
+			if (d>=0) return true;
+			return false;
+		}
+
+		Plane() = default;
+
+		// Construct a plane using normal N and any point P on the plane
+		Plane(const Vector3<T>& N, const Vector3<T>& P) : m_N(N), m_D(-N.dotProduct(P)), m_sqrNLength(m_N.x*m_N.x+m_N.y*m_N.y+m_N.z*m_N.z) {
+			
+		}
+	};
+
+}
+
+
+#endif /* PLANE_HPP_ */
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Pool.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Pool.hpp
new file mode 100644
index 0000000..4216b4a
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Pool.hpp
@@ -0,0 +1,35 @@
+#ifndef Pool_h
+#define Pool_h
+
+#include <vector>
+#include <memory>
+
+namespace quickhull {
+	
+	template<typename T>
+	class Pool {
+		std::vector<std::unique_ptr<T>> m_data;
+	public:
+		void clear() {
+			m_data.clear();
+		}
+		
+		void reclaim(std::unique_ptr<T>& ptr) {
+			m_data.push_back(std::move(ptr));
+		}
+		
+		std::unique_ptr<T> get() {
+			if (m_data.size()==0) {
+				return std::unique_ptr<T>(new T());
+			}
+			auto it = m_data.end()-1;
+			std::unique_ptr<T> r = std::move(*it);
+			m_data.erase(it);
+			return r;
+		}
+		
+	};
+	
+}
+
+#endif /* Pool_h */
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Ray.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Ray.hpp
new file mode 100644
index 0000000..19b6072
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Ray.hpp
@@ -0,0 +1,21 @@
+#ifndef QuickHull_Ray_hpp
+#define QuickHull_Ray_hpp
+
+#include "Vector3.hpp"
+
+namespace quickhull {
+
+	template <typename T>
+	struct Ray {
+		const Vector3<T> m_S;
+		const Vector3<T> m_V;
+		const T m_VInvLengthSquared;
+		
+		Ray(const Vector3<T>& S,const Vector3<T>& V) : m_S(S), m_V(V), m_VInvLengthSquared(1/m_V.getLengthSquared()) {
+		}
+	};
+	
+}
+
+
+#endif
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Vector3.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Vector3.hpp
new file mode 100644
index 0000000..47a5f74
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/Vector3.hpp
@@ -0,0 +1,140 @@
+#ifndef QuickHull_Vector3_hpp
+#define QuickHull_Vector3_hpp
+
+#include <cmath>
+#include <iostream>
+
+namespace quickhull {
+	
+	template <typename T>
+	class Vector3
+	{
+	public:
+		Vector3() = default;
+		
+		Vector3(T x, T y, T z) : x(x), y(y), z(z) {
+			
+		}
+		
+		T x,y,z;
+		
+		T dotProduct(const Vector3& other) const {
+			return x*other.x+y*other.y+z*other.z;
+		}
+		
+		void normalize() {
+			const T len = getLength();
+			x/=len;
+			y/=len;
+			z/=len;
+		}
+		
+		Vector3 getNormalized() const {
+			const T len = getLength();
+			return Vector3(x/len,y/len,z/len);
+		}
+		
+		T getLength() const {
+			return std::sqrt(x*x+y*y+z*z);
+		}
+		
+		Vector3 operator-(const Vector3& other) const {
+			return Vector3(x-other.x,y-other.y,z-other.z);
+		}
+		
+		Vector3 operator+(const Vector3& other) const {
+			return Vector3(x+other.x,y+other.y,z+other.z);
+		}
+		
+		Vector3& operator+=(const Vector3& other) {
+			x+=other.x;
+			y+=other.y;
+			z+=other.z;
+			return *this;
+		}
+		Vector3& operator-=(const Vector3& other) {
+			x-=other.x;
+			y-=other.y;
+			z-=other.z;
+			return *this;
+		}
+		Vector3& operator*=(T c) {
+			x*=c;
+			y*=c;
+			z*=c;
+			return *this;
+		}
+		
+		Vector3& operator/=(T c) {
+			x/=c;
+			y/=c;
+			z/=c;
+			return *this;
+		}
+		
+		Vector3 operator-() const {
+			return Vector3(-x,-y,-z);
+		}
+
+		template<typename S>
+		Vector3 operator*(S c) const {
+			return Vector3(x*c,y*c,z*c);
+		}
+		
+		template<typename S>
+		Vector3 operator/(S c) const {
+			return Vector3(x/c,y/c,z/c);
+		}
+		
+		T getLengthSquared() const {
+			return x*x + y*y + z*z;
+		}
+		
+		bool operator!=(const Vector3& o) const {
+			return x != o.x || y != o.y || z != o.z;
+		}
+		
+		// Projection onto another vector
+		Vector3 projection(const Vector3& o) const {
+			T C = dotProduct(o)/o.getLengthSquared();
+			return o*C;
+		}
+		
+		Vector3 crossProduct (const Vector3& rhs ) {
+			T a = y * rhs.z - z * rhs.y ;
+			T b = z * rhs.x - x * rhs.z ;
+			T c = x * rhs.y - y * rhs.x ;
+			Vector3 product( a , b , c ) ;
+			return product ;
+		}
+		
+		T getDistanceTo(const Vector3& other) const {
+			Vector3 diff = *this - other;
+			return diff.getLength();
+		}
+		
+		T getSquaredDistanceTo(const Vector3& other) const {
+			const T dx = x-other.x;
+			const T dy = y-other.y;
+			const T dz = z-other.z;
+			return dx*dx+dy*dy+dz*dz;
+		}
+		
+	};
+	
+	// Overload also << operator for easy printing of debug data
+	template <typename T>
+	inline std::ostream& operator<<(std::ostream& os, const Vector3<T>& vec) {
+		os << "(" << vec.x << "," << vec.y << "," << vec.z << ")";
+		return os;
+	}
+	
+	template <typename T>
+	inline Vector3<T> operator*(T c, const Vector3<T>& v) {
+		return Vector3<T>(v.x*c,v.y*c,v.z*c);
+	}
+	
+}
+
+
+#endif
diff --git a/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/VertexDataSource.hpp b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/VertexDataSource.hpp
new file mode 100644
index 0000000..162b643
--- /dev/null
+++ b/Source/UnrealSoda/Private/ThirdParty/quickhull/Structs/VertexDataSource.hpp
@@ -0,0 +1,48 @@
+#ifndef VertexDataSource_h
+#define VertexDataSource_h
+
+#include "Vector3.hpp"
+
+namespace quickhull {
+	
+	template<typename T>
+	class VertexDataSource {
+		const Vector3<T>* m_ptr;
+		size_t m_count;
+	
+	public:
+		VertexDataSource(const Vector3<T>* ptr, size_t count) : m_ptr(ptr), m_count(count) {
+			
+		}
+		
+		VertexDataSource(const std::vector<Vector3<T>>& vec) : m_ptr(&vec[0]), m_count(vec.size()) {
+			
+		}
+		
+		VertexDataSource() : m_ptr(nullptr), m_count(0) {
+			
+		}
+		
+		VertexDataSource& operator=(const VertexDataSource& other) = default;
+		
+		size_t size() const {
+			return m_count;
+		}
+		
+		const Vector3<T>& operator[](size_t index) const {
+			return m_ptr[index];
+		}
+		
+		const Vector3<T>* begin() const {
+			return m_ptr;
+		}
+		
+		const Vector3<T>* end() const {
+			return m_ptr + m_count;
+		}
+	};
+	
+}
+
+
+#endif /* VertexDataSource_h */
diff --git a/Source/UnrealSoda/Private/Transport/GenericCameraPublisher.cpp b/Source/UnrealSoda/Private/Transport/GenericCameraPublisher.cpp
new file mode 100644
index 0000000..11ca18a
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/GenericCameraPublisher.cpp
@@ -0,0 +1,283 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/GenericCameraPublisher.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Async/ParallelFor.h"
+#include <errno.h>
+
+static uint8 GetCVSize(uint8 CVType)
+{
+	static const uint8 CV_2_SIZE[7] = { 1, 1, 2, 2, 4, 4, 8 };
+	return CV_2_SIZE[CVType];
+}
+
+UCameraPublisher::UCameraPublisher(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{}
+
+/***********************************************************************************************
+	FCameraAsyncTask
+***********************************************************************************************/
+class FCameraAsyncTask : public soda::FAsyncTask
+{
+
+public:
+	virtual ~FCameraAsyncTask() {}
+	virtual FString ToString() const override { return "CameraAsyncTask"; }
+	virtual void Initialize() override { bIsDone = false; }
+	virtual bool IsDone() const override { return bIsDone; }
+	virtual bool WasSuccessful() const override { return true; }
+	virtual void Tick() override;
+
+public:
+
+	FCameraFrame CameraFrame;
+	TArray<FColor> ImgBuffer;
+
+	TWeakObjectPtr<UGenericCameraPublisher> Publisher;
+
+protected:
+	bool bIsDone = true;
+};
+
+/***********************************************************************************************
+	FCameraFrontBackAsyncTask
+***********************************************************************************************/
+class FCameraFrontBackAsyncTask : public soda::FDoubleBufferAsyncTask<FCameraAsyncTask>
+{
+public:
+	FCameraFrontBackAsyncTask(UGenericCameraPublisher* Publisher)
+	{
+		FrontTask->Publisher = Publisher;
+		BackTask->Publisher = Publisher;
+	}
+	virtual ~FCameraFrontBackAsyncTask() {}
+	virtual FString ToString() const override { return "CameraFrontBackAsyncTask"; }
+};
+
+/***********************************************************************************************
+	UGenericCameraPublisher
+***********************************************************************************************/
+UGenericCameraPublisher::UGenericCameraPublisher(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+ {
+	 AsyncTask = MakeShareable(new FCameraFrontBackAsyncTask(this));
+ }
+
+bool UGenericCameraPublisher::Advertise()
+{
+	if (!SodaApp.GetZmqContext())
+	{
+		bIsWorking = false;
+		return false;
+	}
+
+	try
+	{
+		SockPub = new zmq::socket_t(*SodaApp.GetZmqContext(), ZMQ_PUB);
+	} 
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UGenericCameraPublisher::Advertise(), can't create socket, errno: %i"), errno);
+		bIsWorking = false;
+		return false;
+	}
+
+	SockPub->setsockopt(ZMQ_SNDHWM, 1);
+
+	try
+	{
+		SockPub->bind(std::string(TCHAR_TO_UTF8(*ZmqAddress)));
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UGenericCameraPublisher::Advertise() SockPub->bind('%s') failed"), *ZmqAddress);
+		delete SockPub;
+		SockPub = nullptr;
+		bIsWorking = false;
+		return false;
+	}
+
+	AsyncTask->Start();
+	SodaApp.CamTaskManager.AddTask(AsyncTask);
+	bIsWorking = true;
+	return true;
+}
+
+void UGenericCameraPublisher::Shutdown()
+{
+	AsyncTask->Finish();
+	SodaApp.CamTaskManager.RemoteTask(AsyncTask);
+
+	if (SockPub)
+	{
+		delete SockPub;
+	}
+
+	SockPub = nullptr;
+
+	bIsWorking = false;
+}
+
+void UGenericCameraPublisher::Publish(const void* ImgBGRA8Ptr, const FCameraFrame& CameraFrame)
+{
+	TArray<FColor> & Buf = LockFrontBuffer(CameraFrame);
+	FMemory::BigBlockMemcpy(Buf.GetData(), ImgBGRA8Ptr, Buf.Num());
+	UnlockFrontBuffer();
+
+}
+
+TArray<FColor> & UGenericCameraPublisher::LockFrontBuffer(const FCameraFrame& CameraFrame)
+{
+	TSharedPtr<FCameraAsyncTask> Task = AsyncTask->LockFrontTask();
+	if (!Task->IsDone())
+	{
+		UE_LOG(LogSoda, Warning, TEXT("UGenericCameraPublisher::LockFrontBuffer(). Skipped one frame") );
+	}
+	Task->ImgBuffer.SetNum(CameraFrame.ImageStride * CameraFrame.Height);
+	Task->CameraFrame = CameraFrame;
+	Task->Initialize();
+	return Task->ImgBuffer;
+}
+
+void UGenericCameraPublisher::UnlockFrontBuffer()
+{
+	if (AsyncTask.IsValid())
+	{
+		AsyncTask->UnlockFrontTask();
+	}
+	SodaApp.CamTaskManager.Trigger();
+}
+
+void UGenericCameraPublisher::Publish(const void * DataPtr, uint32 Size)
+{
+	if (!SockPub) return;
+	SockPub->send(DataPtr, Size);
+}
+
+void UGenericCameraPublisher::Publish(const soda::TensorMsgHeader& Header, const void* ImageDataPtr, uint32 Size)
+{
+	if (Size < sizeof(soda::TensorMsgHeader)) return;
+	static TArray<uint8> RawBuffer;
+	RawBuffer.SetNum(Size + sizeof(soda::TensorMsgHeader), false);
+	*((soda::TensorMsgHeader*)RawBuffer.GetData()) = Header;
+	FMemory::BigBlockMemcpy(&RawBuffer[sizeof(soda::TensorMsgHeader)], ImageDataPtr, Size);
+	Publish(RawBuffer.GetData(), RawBuffer.Num());
+}
+
+void FCameraAsyncTask::Tick()
+{
+	check(!bIsDone);
+	check(ImgBuffer.Num() > 0 && uint32(ImgBuffer.Num()) >= CameraFrame.ImageStride * CameraFrame.Height);
+
+	uint8 DType = 0;
+	uint8 Channels = 0;
+
+	switch (CameraFrame.OutFormat)
+	{
+	case ECameraSensorShader::SegmBGR8:
+	case ECameraSensorShader::ColorBGR8:
+	case ECameraSensorShader::HdrRGB8:
+	case ECameraSensorShader::CFA:
+		DType = CV_8U;
+		Channels = 3;
+		break;
+
+	case ECameraSensorShader::Segm8:
+	case ECameraSensorShader::Depth8:
+		DType = CV_8U;
+		Channels = 1;
+		break;
+
+	case ECameraSensorShader::DepthFloat32:
+		DType = CV_32F;
+		Channels = 1;
+		break;
+
+	case ECameraSensorShader::Depth16:
+		DType = CV_16U;
+		Channels = 1;
+		break;
+
+	default:
+		check(0);
+	}
+
+	static TArray<uint8> RawBuffer;
+	RawBuffer.SetNum(GetCVSize(DType) * Channels * CameraFrame.Height * CameraFrame.Width + sizeof(soda::TensorMsgHeader), false);
+	soda::TensorMsgHeader& Header = *((soda::TensorMsgHeader*)RawBuffer.GetData());
+	uint8* ImgBufferPtr = &RawBuffer[sizeof(soda::TensorMsgHeader)];
+
+	Header.tenser.shape.height = CameraFrame.Height;
+	Header.tenser.shape.width = CameraFrame.Width;
+	Header.tenser.shape.depth = 1;
+	Header.timestamp = soda::RawTimestamp<std::chrono::milliseconds>( CameraFrame.Timestamp);
+	Header.index = CameraFrame.Index;
+	Header.dtype = DType;
+	Header.tenser.shape.channels = Channels;
+
+	switch (CameraFrame.OutFormat)
+	{
+		case ECameraSensorShader::Segm8:
+			ParallelFor(CameraFrame.Height, [&](int32 i)
+				{
+					for (uint32 j = 0; j < CameraFrame.Width; j++)
+					{
+						ImgBufferPtr[i * CameraFrame.Width + j] = ImgBuffer[i * CameraFrame.ImageStride + j].R;  //Only R cnannel
+					}
+				});
+			break;
+
+		case ECameraSensorShader::ColorBGR8:
+		case ECameraSensorShader::SegmBGR8:
+		case ECameraSensorShader::HdrRGB8:
+		case ECameraSensorShader::CFA:
+			ParallelFor(CameraFrame.Height, [&](int32 i)
+				{
+					for (uint32 j = 0; j < CameraFrame.Width; j++)
+					{
+						uint32 out_ind = (i * CameraFrame.Width + j) * 3;
+						uint32 in_ind = (i * CameraFrame.ImageStride + j);
+						*(uint32*)&ImgBufferPtr[out_ind + 0] = *(uint32*)&ImgBuffer[in_ind + 0];
+					}
+				});
+			break;
+		
+
+		case ECameraSensorShader::DepthFloat32:
+			ParallelFor(CameraFrame.Height, [&](int32 i)
+				{
+					for (uint32 j = 0; j < CameraFrame.Width; j++)
+					{
+						((float*)ImgBufferPtr)[i * CameraFrame.Width + j] = Rgba2Float(ImgBuffer[CameraFrame.ImageStride * i + j]) * CameraFrame.MaxDepthDistance;
+					}
+				});
+			break;
+		
+
+		case ECameraSensorShader::Depth16:
+			ParallelFor(CameraFrame.Height, [&](int32 i)
+				{
+					for (uint32 j = 0; j < CameraFrame.Width; j++)
+					{
+						((uint16_t*)ImgBufferPtr)[i * CameraFrame.Width + j] = static_cast<uint16_t>(Rgba2Float(ImgBuffer[CameraFrame.ImageStride * i + j]) * 0xFFFF + 0.5f);
+					}
+				});
+			break;
+
+		case ECameraSensorShader::Depth8:
+			ParallelFor(CameraFrame.Height, [&](int32 i)
+				{
+					for (uint32 j = 0; j < CameraFrame.Width; j++)
+					{
+						ImgBufferPtr[i * CameraFrame.Width + j] = static_cast<uint8_t>(Rgba2Float(ImgBuffer[CameraFrame.ImageStride * i + j]) * 0xFF + 0.5f);
+					}
+				});
+			break;
+		
+	}
+	
+	Publisher->Publish(RawBuffer.GetData(), RawBuffer.Num());
+	bIsDone = true;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Transport/GenericLidarPublisher.cpp b/Source/UnrealSoda/Private/Transport/GenericLidarPublisher.cpp
new file mode 100644
index 0000000..6ed88a5
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/GenericLidarPublisher.cpp
@@ -0,0 +1,170 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/GenericLidarPublisher.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Common/TcpSocketBuilder.h"
+#include <numeric>
+#include <sstream>
+
+struct FLidarFrame
+{
+	uint16 DeviceID = 0;
+	int32 ScanID = 0;
+	int64 Timestamp = 0;
+	int PointsPerDatagram = 0;
+};
+
+/***********************************************************************************************
+	FLidarAsyncTask
+***********************************************************************************************/
+class FLidarAsyncTask : public soda::FAsyncTask
+{
+public:
+	virtual ~FLidarAsyncTask() {}
+	virtual FString ToString() const override { return "LidarAsyncTask"; }
+	virtual void Initialize() override { bIsDone = false; }
+	virtual bool IsDone() const override { return bIsDone; }
+	virtual bool WasSuccessful() const override { return true; }
+	virtual void Tick() override
+	{
+		check(!bIsDone);
+		Publisher->PublishSync(LidarFrame, Points);
+		bIsDone = true;
+	}
+
+public:
+	FLidarFrame LidarFrame;
+	std::vector<soda::LidarScanPoint> Points;
+	FGenericLidarPublisher* Publisher = nullptr;
+
+protected:
+	bool bIsDone = true;
+};
+
+/***********************************************************************************************
+	FLidarFrontBackAsyncTask
+***********************************************************************************************/
+class FLidarFrontBackAsyncTask : public soda::FDoubleBufferAsyncTask<FLidarAsyncTask>
+{
+public:
+	FLidarFrontBackAsyncTask(FGenericLidarPublisher* Publisher)
+	{
+		FrontTask->Publisher = Publisher;
+		BackTask->Publisher = Publisher;
+	}
+	virtual ~FLidarFrontBackAsyncTask() {}
+	virtual FString ToString() const override { return "FLidarFrontBackAsyncTask"; }
+};
+
+/***********************************************************************************************
+	FGenericLidarPublisher
+***********************************************************************************************/
+FGenericLidarPublisher::FGenericLidarPublisher()
+{
+	AsyncTask = MakeShareable(new FLidarFrontBackAsyncTask(this));
+}
+
+void FGenericLidarPublisher::Advertise()
+{
+	Shutdown();
+
+	Socket = TSharedPtr<FSocket> (ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateSocket(NAME_DGram, TEXT("default"), false));
+	Addr = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateInternetAddr();
+	Addr->SetPort(Port);
+
+	bool valid;
+	Addr->SetIp((const TCHAR*)(*Address), valid);
+
+	if (!valid)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericLidarPublisher::Advertise() IP address isn't valid"));
+		Shutdown();
+		return;
+	}
+
+	AsyncTask->Start();
+	SodaApp.EthTaskManager.AddTask(AsyncTask);
+}
+
+void FGenericLidarPublisher::Shutdown()
+{
+	AsyncTask->Finish();
+	SodaApp.EthTaskManager.RemoteTask(AsyncTask);
+
+	if (Socket)
+	{
+		Socket->Close();
+		Socket.Reset();
+	}
+}
+
+void FGenericLidarPublisher::PublishSync(const soda::LidarScan& ScanToPublish)
+{
+	if (!Socket)
+		return;
+
+	std::stringstream sout(std::ios_base::out | std::ios_base::binary);
+	int const points_count = soda::write(sout, ScanToPublish);
+	if (!sout)
+		UE_LOG(LogSoda, Fatal, TEXT("FGenericLidarPublisher::PublishSync() failed to serialize scan"));
+	sout.seekp(0, std::ios_base::end);
+	auto const length = sout.tellp();
+
+	int32 BytesSent;
+	if (!Socket->SendTo((const uint8*)sout.str().data(), sout.str().length(), BytesSent, *Addr))
+	{
+		ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+		UE_LOG(LogSoda, Error, TEXT("FGenericLidarPublisher::PublishSync() Can't send(), error code %i, error = %s"), int32(ErrorCode), ISocketSubsystem::Get()->GetSocketError(ErrorCode));
+	}
+}
+
+void FGenericLidarPublisher::PublishSync(const FLidarFrame& LidarFrame, std::vector<soda::LidarScanPoint>& Points)
+{
+	Scan.device_timestamp = LidarFrame.Timestamp;
+	Scan.scan_id = LidarFrame.ScanID;
+	Scan.block_id = 0;
+	Scan.block_count = (Points.size() / LidarFrame.PointsPerDatagram) + ((Points.size() % LidarFrame.PointsPerDatagram) ? 1 : 0);
+
+	for (int k = 0; k < Points.size(); )
+	{
+		int block_size = Points.size() - k;
+		if (block_size > LidarFrame.PointsPerDatagram) block_size = LidarFrame.PointsPerDatagram;
+
+		Scan.points.resize(block_size);
+		std::memcpy(&Scan.points[0], &Points[k], block_size * sizeof(soda::LidarScanPoint));
+		PublishSync(Scan);
+
+		k += block_size;
+		++Scan.block_id;
+	}
+}
+
+void FGenericLidarPublisher::Publish(TTimestamp Timestamp, std::vector<soda::LidarScanPoint>& Points, bool bAsync)
+{
+	if (bAsync)
+	{
+		TSharedPtr<FLidarAsyncTask> Task = AsyncTask->LockFrontTask();
+		if (!Task->IsDone())
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FGenericLidarPublisher::Publish(). Skipped one frame"));
+		}
+		Task->LidarFrame.DeviceID = DeviceID;
+		Task->LidarFrame.ScanID = ScanID++;
+		Task->LidarFrame.Timestamp = soda::RawTimestamp<std::chrono::milliseconds>(Timestamp);
+		Task->LidarFrame.PointsPerDatagram = PointsPerDatagram;
+		Task->Points = Points;
+		Task->Initialize();
+		AsyncTask->UnlockFrontTask();
+		SodaApp.EthTaskManager.Trigger();
+	}
+	else
+	{
+		FLidarFrame LidarFrame;
+		LidarFrame.DeviceID = DeviceID;
+		LidarFrame.ScanID = ScanID++;
+		LidarFrame.Timestamp = soda::RawTimestamp<std::chrono::milliseconds>(Timestamp);
+		LidarFrame.PointsPerDatagram = PointsPerDatagram;
+		PublishSync(LidarFrame, Points);
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Transport/GenericRadarPublisher.cpp b/Source/UnrealSoda/Private/Transport/GenericRadarPublisher.cpp
new file mode 100644
index 0000000..828255a
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/GenericRadarPublisher.cpp
@@ -0,0 +1,83 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/GenericRadarPublisher.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Common/TcpSocketBuilder.h"
+#include <numeric>
+#include <sstream>
+
+void FGenericRadarPublisher::Advertise()
+{
+	Shutdown();
+
+	Socket = TSharedPtr<FSocket>(ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateSocket(NAME_DGram, TEXT("default"), false));
+	if (!Socket)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericRadarPublisher::Advertise() Can't create socket"));
+		Shutdown();
+		return;
+	}
+
+	Addr = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateInternetAddr();
+	if (!Addr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericRadarPublisher::Advertise() Can't create internet addr"));
+		Shutdown();
+		return;
+	}
+
+	Addr->SetPort(Port);
+	bool Valid;
+	Addr->SetIp((const TCHAR*)(*Address), Valid);
+
+	if (!Valid)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericRadarPublisher::Advertise() IP address isn't valid"));
+		Shutdown();
+		return;
+	}
+}
+
+void FGenericRadarPublisher::Shutdown()
+{
+	if (Socket)
+	{
+		Socket->Close();
+		Socket.Reset();
+	}
+
+	if (Addr)
+	{
+		Addr.Reset();
+	}
+}
+
+void FGenericRadarPublisher::Publish(const soda::RadarScan& Scan, bool bAsync)
+{
+	if (!Socket) return;
+
+	std::stringstream sout(std::ios_base::out | std::ios_base::binary);
+	int const points_count = soda::write(sout, Scan);
+	if (!sout) UE_LOG(LogSoda, Fatal, TEXT("FGenericRadarPublisher::Publish() failed to serialize scan"));
+	sout.seekp(0, std::ios_base::end);
+
+	if (bAsync)
+	{
+		if (!AsyncTask->Publish(sout.str().data(), sout.str().length()))
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FGenericRadarPublisher::PublishAsync(). Skipped one frame"));
+		}
+		SodaApp.EthTaskManager.Trigger();
+	}
+	else
+	{
+		int32 BytesSent;
+		if (!Socket->SendTo((const uint8*)sout.str().data(), sout.str().length(), BytesSent, *Addr))
+		{
+			ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+			UE_LOG(LogSoda, Error, TEXT("FGenericRadarPublisher::Publish() Can't send(), error code %i"), int32(ErrorCode));
+		}
+	}
+}
+
diff --git a/Source/UnrealSoda/Private/Transport/GenericUltrasoncPublisher.cpp b/Source/UnrealSoda/Private/Transport/GenericUltrasoncPublisher.cpp
new file mode 100644
index 0000000..234dc85
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/GenericUltrasoncPublisher.cpp
@@ -0,0 +1,88 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/GenericUltrasoncPublisher.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Common/TcpSocketBuilder.h"
+#include <numeric>
+#include <sstream>
+
+
+void FGenericUltrasoncPublisher::Advertise()
+{
+	Shutdown();
+
+	Socket = TSharedPtr<FSocket>(ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateSocket(NAME_DGram, TEXT("default"), false));
+	if (!Socket)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericUltrasoncPublisher::Advertise() Can't create socket"));
+		Shutdown();
+		return;
+	}
+
+	Addr = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateInternetAddr();
+	if (!Addr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericUltrasoncPublisher::Advertise() Can't create internet addr"));
+		Shutdown();
+		return;
+	}
+
+	Addr->SetPort(Port);
+	bool Valid;
+	Addr->SetIp((const TCHAR*)(*Address), Valid);
+	if (!Valid)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericUltrasoncPublisher::Advertise() IP address isn't valid"));
+		Shutdown();
+		return;
+	}
+
+	AsyncTask = MakeShareable(new soda::FUDPFrontBackAsyncTask(Socket, Addr));
+	AsyncTask->Start();
+	SodaApp.EthTaskManager.AddTask(AsyncTask);
+}
+
+void FGenericUltrasoncPublisher::Shutdown()
+{
+	if (Socket)
+	{
+		Socket->Close();
+		Socket.Reset();
+	}
+
+	if (Addr)
+	{
+		Addr.Reset();
+	}
+}
+
+void FGenericUltrasoncPublisher::Publish(const soda::UltrasonicsHub& Scan, bool bAsync)
+{
+	if (!Socket)
+		return;
+
+	std::stringstream sout(std::ios_base::out | std::ios_base::binary);
+	int const points_count = soda::write(sout, Scan);
+	if (!sout)
+		UE_LOG(LogSoda, Fatal, TEXT("FGenericUltrasoncPublisher::Publish() failed to serialize scan"));
+	sout.seekp(0, std::ios_base::end);
+
+	if (bAsync)
+	{
+		if (!AsyncTask->Publish(sout.str().data(), sout.str().length()))
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FGenericUltrasoncPublisher::PublishAsync(). Skipped one frame"));
+		}
+		SodaApp.EthTaskManager.Trigger();
+	}
+	else
+	{
+		int32 BytesSent;
+		if (!Socket->SendTo((const uint8*)sout.str().data(), sout.str().length(), BytesSent, *Addr))
+		{
+			ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+			UE_LOG(LogSoda, Error, TEXT("FGenericUltrasoncPublisher::Publish() Can't send(), error code %i"), int32(ErrorCode));
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Transport/GenericV2XPublisher.cpp b/Source/UnrealSoda/Private/Transport/GenericV2XPublisher.cpp
new file mode 100644
index 0000000..2be4a17
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/GenericV2XPublisher.cpp
@@ -0,0 +1,108 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/GenericV2XPublisher.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "SocketSubsystem.h"
+#include "Sockets.h"
+
+FGenericV2XPublisher::FGenericV2XPublisher()
+{
+}
+
+void FGenericV2XPublisher::Advertise()
+{
+	Shutdown();
+
+	Socket = TSharedPtr<FSocket>(ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateSocket(NAME_DGram, TEXT("default"), false));
+	if (!Socket)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericV2XPublisher::Advertise() Can't create socket"));
+		Shutdown();
+		return;
+	}
+
+	Addr = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateInternetAddr();
+	if (!Addr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericV2XPublisher::Advertise() Can't create internet addr"));
+		Shutdown();
+		return;
+	}
+
+	Addr->SetBroadcastAddress();
+	Addr->SetPort(Port);
+	Socket->SetBroadcast(true);
+
+	AsyncTask = MakeShareable(new soda::FUDPFrontBackAsyncTask(Socket, Addr));
+	AsyncTask->Start();
+	SodaApp.EthTaskManager.AddTask(AsyncTask);
+}
+
+void FGenericV2XPublisher::Shutdown()
+{
+	if (AsyncTask)
+	{
+		AsyncTask->Finish();
+		SodaApp.EthTaskManager.RemoteTask(AsyncTask);
+		AsyncTask.Reset();
+	}
+
+	if (Socket)
+	{
+		Socket->Close();
+		Socket.Reset();
+	}
+
+	if (Addr)
+	{
+		Addr.Reset();
+	}
+}
+
+
+void FGenericV2XPublisher::Publish(const soda::V2VSimulatedObject& Msg, bool bAsync)
+{
+	if (!Socket) return;
+
+	if (bAsync)
+	{
+		if (!AsyncTask->Publish(&Msg, sizeof(Msg)))
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FGenericLidarPublisher::PublishAsync(). Skipped one frame"));
+		}
+		SodaApp.EthTaskManager.Trigger();
+	}
+	else
+	{
+		int32 BytesSent;
+		if (!Socket->SendTo((const uint8*)&Msg, sizeof(Msg), BytesSent, *Addr))
+		{
+			ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+			UE_LOG(LogSoda, Error, TEXT("FGenericV2XPublisher::Publish(); Can't send(), error code %i"), int32(ErrorCode));
+		}
+	}
+}
+
+void FGenericV2XPublisher::Publish(const soda::V2XRenderObject& Msg, bool bAsync)
+{
+	if (!Socket) return;
+
+	if (bAsync)
+	{
+		if (!AsyncTask->Publish(&Msg, sizeof(Msg)))
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FGenericLidarPublisher::PublishAsync(). Skipped one frame"));
+		}
+		SodaApp.EthTaskManager.Trigger();
+	}
+	else
+	{
+		int32 BytesSent;
+		if (!Socket->SendTo((const uint8*)&Msg, sizeof(Msg), BytesSent, *Addr))
+		{
+			ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+			UE_LOG(LogSoda, Error, TEXT("FGenericV2XPublisher::Publish(); Can't send(), error code %i"), int32(ErrorCode));
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Transport/GenericVehicleStatePublisher.cpp b/Source/UnrealSoda/Private/Transport/GenericVehicleStatePublisher.cpp
new file mode 100644
index 0000000..424d9ad
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/GenericVehicleStatePublisher.cpp
@@ -0,0 +1,91 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/GenericVehicleStatePublisher.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Common/TcpSocketBuilder.h"
+#include <numeric>
+#include <sstream>
+
+void FGenericVehicleStatePublisher::Advertise()
+{
+	Shutdown();
+
+	Socket = TSharedPtr<FSocket>(ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateSocket(NAME_DGram, TEXT("default"), false));
+	if (!Socket)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericVehicleStatePublisher::Advertise() Can't create socket"));
+		Shutdown();
+		return;
+	}
+	if (bIsBroadcast)
+	{
+		Socket->SetBroadcast(true);
+	}
+
+	Addr = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateInternetAddr();
+	if (!Addr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericVehicleStatePublisher::Advertise() Can't create internet addr"));
+		Shutdown();
+		return;
+	}
+
+	bool Valid;
+	Addr->SetIp((const TCHAR*)(*Address), Valid);
+	if (!Valid)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FGenericVehicleStatePublisher::Advertise() IP address isn't valid"));
+		Shutdown();
+		return;
+	}
+	Addr->SetPort(Port);
+
+	AsyncTask = MakeShareable(new soda::FUDPFrontBackAsyncTask(Socket, Addr));
+	AsyncTask->Start();
+	SodaApp.EthTaskManager.AddTask(AsyncTask);
+}
+
+void FGenericVehicleStatePublisher::Shutdown()
+{
+	if (AsyncTask)
+	{
+		AsyncTask->Finish();
+		SodaApp.EthTaskManager.RemoteTask(AsyncTask);
+		AsyncTask.Reset();
+	}
+
+	if (Socket)
+	{
+		Socket->Close();
+		Socket.Reset();
+	}
+
+	if (Addr)
+	{
+		Addr.Reset();
+	}
+}
+
+void FGenericVehicleStatePublisher::Publish(const soda::GenericVehicleState& Msg, bool bAsync)
+{
+	if (!Socket) return;
+
+	if (bAsync)
+	{
+		if (!AsyncTask->Publish(&Msg, sizeof(Msg)))
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FGenericVehicleStatePublisher::PublishAsync(). Skipped one frame"));
+		}
+		SodaApp.EthTaskManager.Trigger();
+	}
+	else
+	{
+		int32 BytesSent;
+		if (!Socket->SendTo((uint8*) & Msg, sizeof(Msg), BytesSent, *Addr))
+		{
+			ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+			UE_LOG(LogSoda, Error, TEXT("FGenericVehicleStatePublisher::Publish() Can't send(), error code %i"), int32(ErrorCode));
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Transport/OXTSPublisher.cpp b/Source/UnrealSoda/Private/Transport/OXTSPublisher.cpp
new file mode 100644
index 0000000..2a01414
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/OXTSPublisher.cpp
@@ -0,0 +1,131 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/OXTSPublisher.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Common/TcpSocketBuilder.h"
+#include <numeric>
+#include <sstream>
+
+FOXTSPublisher::FOXTSPublisher()
+{
+
+}
+
+void FOXTSPublisher::Advertise()
+{
+	Shutdown();
+
+	Socket = TSharedPtr<FSocket>(ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateSocket(NAME_DGram, TEXT("default"), false));
+	if (!Socket)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FOXTSPublisher::Advertise() Can't create socket"));
+		Shutdown();
+		return;
+	}
+	if (bIsBroadcast)
+	{
+		Socket->SetBroadcast(true);
+	}
+
+	Addr = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateInternetAddr();
+	if (!Addr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FOXTSPublisher::Advertise() Can't create internet addr"));
+		Shutdown();
+		return;
+	}
+
+	bool Valid;
+	Addr->SetIp((const TCHAR*)(*Address), Valid);
+	if (!Valid)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FOXTSPublisher::Advertise() IP address isn't valid"));
+		Shutdown();
+		return;
+	}
+	Addr->SetPort(Port);
+
+	AsyncTask = MakeShareable(new soda::FUDPFrontBackAsyncTask(Socket, Addr));
+	AsyncTask->Start();
+	SodaApp.EthTaskManager.AddTask(AsyncTask);
+}
+
+void FOXTSPublisher::Shutdown()
+{
+	if (AsyncTask)
+	{
+		AsyncTask->Finish();
+		SodaApp.EthTaskManager.RemoteTask(AsyncTask);
+		AsyncTask.Reset();
+	}
+
+	if (Socket)
+	{
+		Socket->Close();
+		Socket.Reset();
+	}
+
+	if (Addr)
+	{
+		Addr.Reset();
+	}
+}
+
+
+void FOXTSPublisher::Publish(const soda::OxtsPacket& Msg, bool bAsync)
+{
+	if (!Socket) return;
+
+	BitStream.SetOffset(0);
+	BitStream.SetBytes(Msg.sync, 1);
+	BitStream.SetBytes(Msg.time, 2);
+	BitStream.SetBytes(Msg.accel_x, 3);
+	BitStream.SetBytes(Msg.accel_y, 3);
+	BitStream.SetBytes(Msg.accel_z, 3);
+	BitStream.SetBytes(Msg.gyro_x, 3);
+	BitStream.SetBytes(Msg.gyro_y, 3);
+	BitStream.SetBytes(Msg.gyro_z, 3);
+	BitStream.SetBytes(Msg.nav_status, 1);
+	BitStream.SetBytes(Msg.chksum1, 1);
+	BitStream.SetBytes(Msg._lat.c, 8);
+	BitStream.SetBytes(Msg._lon.c, 8);
+	BitStream.SetBytes(Msg._alt.c, 4);
+	BitStream.SetBytes(Msg.vel_north, 3);
+	BitStream.SetBytes(Msg.vel_east, 3);
+	BitStream.SetBytes(Msg.vel_down, 3);
+	BitStream.SetBytes(Msg.heading, 3);
+	BitStream.SetBytes(Msg.pitch, 3);
+	BitStream.SetBytes(Msg.roll, 3);
+	BitStream.SetBytes(Msg.chksum2, 1);
+	BitStream.SetBytes(Msg.channel, 1);
+	BitStream.SetBytes(Msg.chan.bytes, 8);
+	BitStream.SetBytes(Msg.chksum3, 1);
+	check(BitStream.GetOffset() == 72 * 8);
+
+	if (bAsync)
+	{
+		if (!AsyncTask->Publish(BitStream.Buf.GetData(), 72))
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FOXTSPublisher::PublishAsync(). Skipped one frame"));
+		}
+		SodaApp.EthTaskManager.Trigger();
+	}
+	else
+	{
+		int32 BytesSent;
+		if (!Socket->SendTo(BitStream.Buf.GetData(), 72, BytesSent, *Addr))
+		{
+			ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+			UE_LOG(LogSoda, Error, TEXT("FOXTSPublisher::Publish() Can't send(), error code %i"), int32(ErrorCode));
+		}
+	}
+
+	chan_index = (chan_index + 1) % 128;
+}
+
+std::uint8_t FOXTSPublisher::Checksum(soda::OxtsPacket const& Packet, std::size_t Start, std::size_t End) noexcept
+{
+	auto* const RawData = reinterpret_cast< std::uint8_t const* >(&Packet);
+	return std::accumulate(RawData + Start, RawData + End, std::uint8_t(0));
+}
diff --git a/Source/UnrealSoda/Private/Transport/PublisherCommon.cpp b/Source/UnrealSoda/Private/Transport/PublisherCommon.cpp
new file mode 100644
index 0000000..23997f6
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/PublisherCommon.cpp
@@ -0,0 +1,44 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/PublisherCommon.h"
+#include "Soda/UnrealSoda.h"
+#include "Common/TcpSocketBuilder.h"
+#include <numeric>
+#include <sstream>
+
+namespace soda
+{
+	void FUDPAsyncTask::Tick()
+	{
+		check(!bIsDone);
+		int32 BytesSent;
+		if (!Socket->SendTo(Buf.GetData(), Buf.Num(), BytesSent, *Addr))
+		{
+			ESocketErrors ErrorCode = ISocketSubsystem::Get()->GetLastErrorCode();
+			UE_LOG(LogSoda, Error, TEXT("FUDPAsyncTask::Tick() Can't send(), error code %i, error = %s"), int32(ErrorCode), ISocketSubsystem::Get()->GetSocketError(ErrorCode));
+		}
+		bIsDone = true;
+	}
+
+	FUDPFrontBackAsyncTask::FUDPFrontBackAsyncTask(TSharedPtr< FSocket >& Socket, TSharedPtr< FInternetAddr >& Addr)
+	{
+		FrontTask->Socket = Socket;
+		FrontTask->Addr = Addr;
+		BackTask->Socket = Socket;
+		BackTask->Addr = Addr;
+	}
+
+	bool FUDPFrontBackAsyncTask::Publish(const void* Buf, int Len)
+	{
+		bool Ret = true;
+		TSharedPtr<FUDPAsyncTask> Task = LockFrontTask();
+		if (!Task->IsDone()) Ret = false;
+		Task->Buf.SetNum(Len);
+		FMemory::BigBlockMemcpy(Task->Buf.GetData(), Buf, Len);
+		Task->Buf.SetNum(Len);
+		Task->Initialize();
+		UnlockFrontTask();
+		return Ret;
+	}
+
+} //namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Transport/XCP.cpp b/Source/UnrealSoda/Private/Transport/XCP.cpp
new file mode 100644
index 0000000..11deef5
--- /dev/null
+++ b/Source/UnrealSoda/Private/Transport/XCP.cpp
@@ -0,0 +1,337 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Transport/XCP.h"
+#include "Soda/UnrealSoda.h"
+
+namespace xcp
+{
+
+enum SlaveToMasterPID: uint8
+{
+	SERV = 0xFC,
+	EV = 0xFD,
+	ERR = 0xFE,
+    RES = 0xFF,
+};
+
+enum MasterToSlavePID : uint8
+{
+    //Standard Commands:
+    CONNECT = 0xFF,
+    DISCONNECT = 0xFE,
+    GET_STATUS = 0xFD,
+    SYNCH = 0xFC,
+    GET_COMM_MODE_INFO = 0xFB,
+    GET_ID = 0xFA,
+    SET_REQUEST = 0xF9,
+    GET_SEED = 0xF8,
+    UNLOCK = 0xF7,
+    SET_MTA = 0xF6,
+    UPLOAD = 0xF5,
+    SHORT_UPLOAD = 0xF4,
+    BUILD_CHECKSUM = 0xF3,
+    TRANSPORT_LAYER_CMD = 0xF2,
+    USER_CMD = 0xF1,
+
+    //Calibration commands:
+	DOWNLOAD = 0xF0,
+	DOWNLOAD_NEXT = 0xEF,
+	DOWNLOAD_MAX = 0xEE,
+	SHORT_DOWNLOAD = 0xED,
+	MODIFY_BITS = 0xEC,
+
+    //Page switching commands:
+
+    //Basic data acquisition and stimulation commands:
+    SET_DAQ_PTR = 0xE2,
+    WRITE_DAQ = 0xE1,
+    SET_DAQ_LIST_MODE = 0xE0,
+    START_STOP_DAQ_LIST = 0xDE,
+    START_STOP_SYNCH = 0xDD,
+    WRITE_DAQ_MULTIPLE = 0xC7,
+    READ_DAQ = 0xDB,
+    GET_DAQ_CLOCK = 0xDC,
+    GET_DAQ_PROCESSOR_INFO = 0xDA,
+    GET_DAQ_RESOLUTION_INFO = 0xD9,
+    GET_DAQ_LIST_MODE = 0xDF,
+    GET_DAQ_EVENT_INFO = 0xD7,
+    DTO_CTR_PROPERTIES = 0xC5,
+
+    //Static data acquisition and stim commands:
+    CLEAR_DAQ_LIST = 0xE3,
+    GET_DAQ_LIST_INFO = 0xD8,
+
+    //Dynamic data acquisition and stim commands:
+    FREE_DAQ = 0xD6,
+    ALLOC_DAQ = 0xD5,
+    ALLOC_ODT = 0xD4,
+    ALLOC_ODT_ENTRY = 0xD3,
+
+    //Non-volatile memory programming commands:
+
+    //Time sync commands:
+};
+
+FPacket::FPacket(uint8 CMD)
+{
+	Data[0] = CMD;
+	Length = 1;
+}
+
+FPacket::FPacket(uint8 CMD, const uint8* InData, uint8 InLength)
+{
+	check(InLength <= 7);
+	Data[0] = CMD;
+	FMemory::Memcpy(&Data[1], InData, InLength);
+	Length = InLength + 1;
+}
+
+FPacket::FPacket(const uint8* InData, uint8 InLength)
+{
+	check(InLength <= 8);
+	*(uint64*)Data = *(uint64*)InData;
+	Length = InLength;
+}
+
+FString FPacket::ToString() const
+{
+	return  BytesToHex(Data, Length);
+}
+
+bool FBaseTransport::Request(const FPacket& SendPacket, FPacket & RecvPacket)
+{
+	if (!Send(SendPacket))
+	{
+		return false;
+	}
+	if (!ResQueue.PopBack(RecvPacket, Timeout))
+	{
+		return false;
+	}
+	if (RecvPacket.Data[0] == SlaveToMasterPID::ERR && SendPacket.Data[0] != MasterToSlavePID::SYNCH)
+	{
+		UE_LOG(LogSoda, Error, TEXT("FBaseTransport::Request(); Received error status: [%s]"), *RecvPacket.ToString());
+		return false;
+	}
+	return true;
+}
+
+inline bool FBaseTransport::Request(const FPacket& SendPacket)
+{
+	FPacket RecvPacket;
+	return Request(SendPacket, RecvPacket);
+}
+
+void FBaseTransport::ProcessResponse(const FPacket& Packet, int Counter, TTimestamp InRecvTimestamp)
+{
+	if (bIsDebug)
+	{
+		UE_LOG(LogSoda, Log, TEXT("FBaseTransport::ProcessResponse(); Received [%s]"), *Packet.ToString());
+	}
+
+	if (Counter == CounterReceived)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("FBaseTransport::ProcessResponse(); Duplicate message counter %i"), Counter);
+		return;
+	}
+
+	CounterReceived = Counter;
+	uint8 PID = Packet.Data[0];
+	if (PID == SlaveToMasterPID::ERR || PID == SlaveToMasterPID::RES)
+	{
+		ResQueue.Push(Packet);
+		RecvTimestamp = InRecvTimestamp;
+	}
+}
+
+FCANTransport::FCANTransport(UCANBusComponent* InCANDev)
+{
+	check(::IsValid(InCANDev));
+	CANBus = InCANDev;
+	CANDevObj = InCANDev;
+	CANBus->RecvDelegate.AddRaw(this , &FCANTransport::DataReceived);
+}
+
+bool FCANTransport::Send(const FPacket& Packet)
+{
+	return CANBus->SendFrame(dbc::FCanFrame(CAN_ID_MASTER, Packet.Length, Packet.Data)) >= 0;
+}
+
+void FCANTransport::DataReceived(TTimestamp Timestamp, const dbc::FCanFrame& CanFrame)
+{
+	if ((CanFrame.ID & 0x3FFFFFF) == (CAN_ID_SLAVE & 0x3FFFFFF))
+	{
+		ProcessResponse(FPacket(CanFrame.Data, CanFrame.Length), CounterReceived + 1, Timestamp);
+	}
+}
+
+FMaster::FMaster(const TSharedPtr<FBaseTransport>& InTransport)
+{
+	check(InTransport);
+	Transport = InTransport;
+}
+
+FMaster::~FMaster()
+{
+	if(Transport->IsValid()) Disconnect();
+}
+
+bool FMaster::Connect(uint8 mode)
+{
+	bIsConnected = false;
+
+
+	if (!Transport->IsValid())
+	{
+		return false;
+	}
+
+	FPacket Response;
+	if (!Transport->Request(FPacket(MasterToSlavePID::CONNECT, &mode, 1), Response))
+	{
+		return false;
+	}
+
+	if (Response.Length < 8)
+	{
+		return false;
+	}
+
+	ConnectionInfo.Resource = Response.Data[0];
+	ConnectionInfo.CommModeBasic = Response.Data[1];
+	ConnectionInfo.MaxCto = Response.Data[2];
+	ConnectionInfo.MaxDto = *(uint16*)&Response.Data[3];
+	ConnectionInfo.ProtocolLayerVersion = Response.Data[5];
+	ConnectionInfo.TransportLayerVersion = Response.Data[6];
+
+	bIsLittleEndian = ((ConnectionInfo.CommModeBasic & (uint8)EConnCommModeBasicBits::BYTE_ORDER_) == 0);
+	ConnectionInfo.MaxDto = WordSwap(ConnectionInfo.MaxDto);
+
+	UE_LOG(LogSoda, Log, TEXT("FMaster::Connect(), Resource %i, CommModeBasic %i, MaxCto %i, MaxDto %i, ProtocolLayerVersion %i, TransportLayerVersion %i"),
+		ConnectionInfo.Resource,
+		ConnectionInfo.CommModeBasic,
+		ConnectionInfo.MaxCto,
+		ConnectionInfo.MaxDto,
+		ConnectionInfo.ProtocolLayerVersion,
+		ConnectionInfo.TransportLayerVersion
+	);
+
+	bIsConnected = true;
+
+	return true;
+}
+
+bool FMaster::Disconnect()
+{
+	bIsConnected = false;
+	if (!Transport->IsValid())
+	{
+		return false;
+	}
+
+	if (!bIsConnected)
+	{
+		return true;
+	}
+	return Transport->Request(FPacket(MasterToSlavePID::DISCONNECT));;
+}
+
+bool FMaster::GetStatus(FConnectionStatus& ConnectionStatus)
+{
+	FPacket Response;
+	if (Transport->Request(FPacket(MasterToSlavePID::GET_STATUS), Response))
+	{
+		return false;
+	}
+
+	if (Response.Length < 6)
+	{
+		return false;
+	}
+
+	ConnectionStatus.GetCurrentSessionStatus = Response.Data[0];
+	ConnectionStatus.GetCurrentResourceProtection = Response.Data[1];
+	ConnectionStatus.GetStateNumber = Response.Data[2];
+	ConnectionStatus.GetSessionConfigurationId = WordSwap(*(uint16*)&Response.Data[3]);
+
+	return true;
+}
+
+bool FMaster::Synch()
+{
+	return Transport->Request(FPacket(MasterToSlavePID::SYNCH));
+}
+
+bool FMaster::SetMta(uint32 Address, uint8 AddressExt)
+{
+	FPacket Packet;
+	Packet.Length = 8;
+	Packet.Data[0] = MasterToSlavePID::SET_MTA;
+	Packet.Data[1] = 0;
+	Packet.Data[2] = 0;
+	Packet.Data[3] = AddressExt;
+	*(uint32*)&Packet.Data[4] = DwordSwap(Address);
+	return Transport->Request(Packet);
+}
+
+bool FMaster::Download(const uint8* Data, uint8 Length)
+{
+	check(Length <= 6);
+	FPacket Packet;
+	Packet.Length = Length + 2;
+	Packet.Data[0] = MasterToSlavePID::DOWNLOAD;
+	Packet.Data[1] = Length;
+	FMemory::Memcpy(&Packet.Data[2], Data, Length);
+	return Transport->Request(Packet);
+}
+
+bool FMaster::Upload(uint8* Data, uint8 Length)
+{
+	FPacket Response;
+	if (!Transport->Request(FPacket(MasterToSlavePID::UPLOAD, &Length, 1), Response))
+	{
+		return false;
+	}
+
+	if (Response.Length <= 1)
+	{
+		return false;
+	}
+
+	int Num = Response.Length - 1;
+	if (Num > Length) Num = Length;
+	FMemory::Memcpy(Data , &Response.Data[1], Num);
+
+
+	// larger sizes will send in multiple CAN messages
+	// each valid message will start with 0xFF followed by the upload bytes
+	// the last message might be padded to the required DLC
+	int Got = Num;
+	while (Got < Length)
+	{
+		if (Transport->ResQueue.PopBack(Response, Transport->Timeout) && Response.Data[0] == SlaveToMasterPID::RES && Response.Length > 1)
+		{
+			Num = Response.Length - 1;
+			if ((Num + Got) > Length) Num = Length - Got;
+			FMemory::Memcpy(&Data[Got], &Response.Data[1], Num);
+			Got += Num;
+		}
+		else
+		{
+			return false;
+		}	
+	}
+	return true;
+}
+
+inline uint16 FMaster::WordSwap(uint16 In) const
+{
+	return bIsLittleEndian ? In : Swap16(In);
+}
+
+inline uint32 FMaster::DwordSwap(uint32 In) const
+{
+	return bIsLittleEndian ? In : Swap32(In);
+}
+
+} // xcp
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Common/SActionButton.cpp b/Source/UnrealSoda/Private/UI/Common/SActionButton.cpp
new file mode 100644
index 0000000..9d2f382
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Common/SActionButton.cpp
@@ -0,0 +1,105 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Common/SActionButton.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SButton.h"
+#include "Styling/StyleColors.h"
+
+void SActionButton::Construct(const FArguments& InArgs)
+{
+	check(InArgs._Icon.IsSet());
+
+	TAttribute<FText> Text = InArgs._Text;
+
+	TSharedRef<SWidget> ButtonContent = SNullWidget::NullWidget;
+
+	if (InArgs._Icon.Get())
+	{
+		ButtonContent = SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				SNew(SImage)
+				.Image(InArgs._Icon)
+				.ColorAndOpacity(InArgs._IconColor)
+			]
+			+ SHorizontalBox::Slot()
+			.Padding(FMargin(3, 0, 0, 0))
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.TextStyle(FAppStyle::Get(), "SmallButtonText")
+				.Text(InArgs._Text)
+				.Visibility_Lambda([Text]() { return Text.Get(FText::GetEmpty()).IsEmpty() ? EVisibility::Collapsed : EVisibility::Visible; })
+			];
+	}
+	else
+	{
+		ButtonContent =
+			SNew(STextBlock)
+			.TextStyle(FAppStyle::Get(), "SmallButtonText")
+			.Text(InArgs._Text)
+			.Visibility_Lambda([Text]() { return Text.Get(FText::GetEmpty()).IsEmpty() ? EVisibility::Collapsed : EVisibility::Visible; });
+			
+	}
+
+	if (InArgs._OnClicked.IsBound())
+	{
+		ChildSlot
+		[
+			SAssignNew(Button, SButton)
+			.ContentPadding(InArgs._ContentPadding)
+			.ForegroundColor(FSlateColor::UseStyle())
+			.ButtonStyle(InArgs._ButtonStyle)
+			.IsEnabled(InArgs._IsEnabled)
+			.ToolTipText(InArgs._ToolTipText)
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			.OnClicked(InArgs._OnClicked)
+			[
+				ButtonContent
+			]
+		];
+	}
+	else
+	{
+		ChildSlot
+		[
+			SAssignNew(ComboButton, SComboButton)
+			.ContentPadding(InArgs._ContentPadding)
+			.HasDownArrow(false)
+			.ButtonStyle(InArgs._ButtonStyle)
+			.ForegroundColor(FSlateColor::UseStyle())
+			.IsEnabled(InArgs._IsEnabled)
+			.ToolTipText(InArgs._ToolTipText)
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			.ButtonContent()
+			[
+				ButtonContent
+			]
+			.MenuContent()
+			[
+				InArgs._MenuContent.Widget
+			]
+			.OnGetMenuContent(InArgs._OnGetMenuContent)
+			.OnMenuOpenChanged(InArgs._OnMenuOpenChanged)
+			.OnComboBoxOpened(InArgs._OnComboBoxOpened)
+		];
+	}
+}
+
+void SActionButton::SetMenuContentWidgetToFocus(TWeakPtr<SWidget> Widget)
+{
+	check(ComboButton.IsValid());
+	ComboButton->SetMenuContentWidgetToFocus(Widget);
+}
+
+void SActionButton::SetIsMenuOpen(bool bIsOpen, bool bIsFocused)
+{
+	check(ComboButton.IsValid());
+	ComboButton->SetIsOpen(bIsOpen, bIsFocused);
+}
diff --git a/Source/UnrealSoda/Private/UI/Common/SActionButton.h b/Source/UnrealSoda/Private/UI/Common/SActionButton.h
new file mode 100644
index 0000000..74a1607
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Common/SActionButton.h
@@ -0,0 +1,60 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Framework/SlateDelegates.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Styling/StyleColors.h"
+
+/** A Button that is used to call out/highlight a positive option (Add, Save etc). It can also be used to open a menu.
+*/
+class UNREALSODA_API SActionButton : public SCompoundWidget
+{
+public:
+
+	SLATE_BEGIN_ARGS(SActionButton) 
+		: _Icon(FAppStyle::Get().GetBrush("Icons.Plus"))
+		, _IconColor(FStyleColors::AccentGreen)
+		, _ContentPadding(FMargin(2.0f, 3.0f))
+		, _ButtonStyle(&FCoreStyle::Get().GetWidgetStyle< FButtonStyle >("Button"))
+		{}
+
+		/** The text to display in the button. */
+		SLATE_ATTRIBUTE(FText, Text)
+
+		SLATE_ATTRIBUTE(const FSlateBrush*, Icon)
+
+		SLATE_ATTRIBUTE(FSlateColor, IconColor)
+			
+		SLATE_ATTRIBUTE( FMargin, ContentPadding )
+
+		SLATE_STYLE_ARGUMENT( FButtonStyle, ButtonStyle )
+
+		/** The clicked handler. Note that if this is set, the button will behave as though it were just a button.
+		 * This means that OnGetMenuContent, OnComboBoxOpened and OnMenuOpenChanged will all be ignored, since there is no menu.
+		 */
+		SLATE_EVENT(FOnClicked, OnClicked)
+
+		/** The static menu content widget. */
+		SLATE_NAMED_SLOT(FArguments, MenuContent)
+
+		SLATE_EVENT(FOnGetContent, OnGetMenuContent)
+		SLATE_EVENT(FOnComboBoxOpened, OnComboBoxOpened)
+		SLATE_EVENT(FOnIsOpenChanged, OnMenuOpenChanged)
+
+	SLATE_END_ARGS()
+
+	SActionButton() {}
+
+	void Construct(const FArguments& InArgs);
+
+	void SetMenuContentWidgetToFocus(TWeakPtr<SWidget> Widget);
+	void SetIsMenuOpen(bool bIsOpen, bool bIsFocused);
+
+private:
+
+	TSharedPtr<SComboButton> ComboButton;
+	TSharedPtr<class SButton> Button;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Common/SPinWidget.cpp b/Source/UnrealSoda/Private/UI/Common/SPinWidget.cpp
new file mode 100644
index 0000000..4f80992
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Common/SPinWidget.cpp
@@ -0,0 +1,125 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SPinWidget.h"
+#include "Widgets/Views/STableRow.h"
+
+namespace soda
+{
+
+void SPinWidget::Construct(const FArguments& InArgs)
+{
+	CheckedHoveredBrush = InArgs._CheckedHoveredBrush;
+	CheckedNotHoveredBrush = InArgs._CheckedNotHoveredBrush;
+	NotCheckedHoveredBrush = InArgs._NotCheckedHoveredBrush;
+	NotCheckedNotHoveredBrush = InArgs._NotCheckedNotHoveredBrush;
+	OnClickedDelegate = InArgs._OnClicked;
+	IsChecked = InArgs._IsChecked;
+	Row = InArgs._Row;
+	bHideUnchecked = InArgs._bHideUnchecked;
+
+	SImage::Construct(
+		SImage::FArguments()
+		.IsEnabled(this, &SPinWidget::IsEnabled)
+		.ColorAndOpacity(this, &SPinWidget::GetForegroundColor)
+		.Image(this, &SPinWidget::GetBrush)
+	);
+}
+
+void SPinWidget::SetRow(TWeakPtr < ITableRow> InRow)
+{
+	check(InRow.IsValid());
+	Row = InRow;
+}
+
+bool SPinWidget::IsEnabled() const 
+{ 
+	return true; 
+}
+
+const FSlateBrush* SPinWidget::GetBrush() const
+{
+	if (IsChecked.IsBound() && IsChecked.Get())
+	{
+		return IsHovered() ? CheckedHoveredBrush.Get() : CheckedNotHoveredBrush.Get();
+	}
+	else
+	{
+		return IsHovered() ? NotCheckedHoveredBrush.Get() : NotCheckedNotHoveredBrush.Get();
+	}
+}
+
+FSlateColor SPinWidget::GetForegroundColor() const
+{
+	const bool bIsSelected = Row.IsValid() ? Row.Pin()->IsItemSelected() : false;
+	const bool bIsChecked = IsChecked.IsBound() && IsChecked.Get();
+
+	if (bHideUnchecked)
+	{
+		if (IsHovered())
+		{
+			if (bIsSelected)
+			{
+				return bIsChecked ? FAppStyle::Get().GetSlateColor("Colors.ForegroundHover") : FSlateColor(FLinearColor(1, 1, 1, 0.3));
+			}
+			else
+			{
+				return bIsChecked ? FAppStyle::Get().GetSlateColor("Colors.ForegroundHover") : FAppStyle::Get().GetSlateColor("Colors.Hover");
+			}
+		}
+		else
+		{
+			return bIsChecked ? FSlateColor::UseForeground() : FLinearColor::Transparent;
+		}		
+	}
+	else
+	{
+
+		// make the foreground brush transparent if it is not selected and it is visible
+		/*
+		if (bIsChecked && !IsHovered() && !bIsSelected)
+		{
+			return FLinearColor::Transparent;
+		}
+		else
+		*/
+		if (IsHovered() && !bIsSelected)
+		{
+			return FAppStyle::Get().GetSlateColor("Colors.ForegroundHover");
+		}
+	}
+
+	return FSlateColor::UseForeground();
+}
+
+FReply SPinWidget::OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.GetEffectingButton() != EKeys::LeftMouseButton)
+	{
+		return FReply::Unhandled();
+	}
+
+	if (IsEnabled())
+	{
+		if (OnClickedDelegate.IsBound() == true)
+		{
+			OnClickedDelegate.Execute();
+		}
+		return FReply::Handled();
+		
+	}
+
+	return FReply::Unhandled();
+}
+
+FReply SPinWidget::OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton)
+	{
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+
+
+} // namespace soda
diff --git a/Source/UnrealSoda/Private/UI/Common/SPinWidget.h b/Source/UnrealSoda/Private/UI/Common/SPinWidget.h
new file mode 100644
index 0000000..21dce25
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Common/SPinWidget.h
@@ -0,0 +1,60 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/Images/SImage.h"
+#include "SodaStyleSet.h"
+#include "Templates/SharedPointer.h"
+#include "Framework/SlateDelegates.h"
+
+class ITableRow;
+
+namespace soda
+{
+
+class SPinWidget : public SImage
+{
+public:
+	SLATE_BEGIN_ARGS(SPinWidget)
+		: _CheckedHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Level.VisibleHighlightIcon16x")))
+		, _CheckedNotHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Level.VisibleIcon16x")))
+		, _NotCheckedHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Level.NotVisibleHighlightIcon16x")))
+		, _NotCheckedNotHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Level.NotVisibleIcon16x")))
+		, _IsChecked(false)
+		, _bHideUnchecked(false)
+	{}
+		SLATE_ATTRIBUTE(const FSlateBrush*, CheckedHoveredBrush)
+		SLATE_ATTRIBUTE(const FSlateBrush*, CheckedNotHoveredBrush)
+		SLATE_ATTRIBUTE(const FSlateBrush*, NotCheckedHoveredBrush)
+		SLATE_ATTRIBUTE(const FSlateBrush*, NotCheckedNotHoveredBrush)
+		SLATE_ATTRIBUTE(bool, IsChecked)
+		SLATE_ARGUMENT(TWeakPtr < ITableRow>, Row)
+		SLATE_ARGUMENT(bool, bHideUnchecked)
+		SLATE_EVENT(FOnClicked, OnClicked)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs);
+
+	void SetRow(TWeakPtr < ITableRow> InRow);
+
+protected:
+	virtual bool IsEnabled() const;
+	virtual const FSlateBrush* GetBrush() const;
+	virtual FSlateColor GetForegroundColor() const;
+
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual FReply OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+
+protected:
+	bool bHideUnchecked = false;
+	TWeakPtr < ITableRow> Row;
+	FOnClicked OnClickedDelegate;
+	TAttribute<bool> IsChecked;
+	TAttribute<const FSlateBrush*> CheckedHoveredBrush;
+	TAttribute<const FSlateBrush*> CheckedNotHoveredBrush;
+	TAttribute<const FSlateBrush*> NotCheckedHoveredBrush;
+	TAttribute<const FSlateBrush*> NotCheckedNotHoveredBrush;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Common/SVehicleComponentClassCombo.cpp b/Source/UnrealSoda/Private/UI/Common/SVehicleComponentClassCombo.cpp
new file mode 100644
index 0000000..f04aafd
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Common/SVehicleComponentClassCombo.cpp
@@ -0,0 +1,855 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SVehicleComponentClassCombo.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/SToolTip.h"
+#include "Widgets/Views/SListView.h"
+#include "Widgets/Input/SComboBox.h"
+#include "Widgets/Layout/SSeparator.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "SodaStyleSet.h"
+#include "Components/SceneComponent.h"
+#include "Engine/Blueprint.h"
+#include "Styling/SlateIconFinder.h"
+#include "Misc/TextFilterExpressionEvaluator.h"
+#include "SPositiveActionButton.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "SodaEditorWidgets/SListViewSelectorDropdownMenu.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "UObject/UObjectIterator.h"
+
+#define LOCTEXT_NAMESPACE "VehicleComponentClassCombo"
+
+template<class PREDICATE_CLASS>
+static TArray<UClass*> GetVehicleComponents(const PREDICATE_CLASS& Predicate)
+{
+	TArray<UClass*> VehicleComponentsClasses;
+
+	for (TObjectIterator<UClass> It; It; ++It)
+	{
+		if (!It->HasAnyClassFlags(CLASS_Abstract) && It->ImplementsInterface(USodaVehicleComponent::StaticClass()))
+		{
+			UActorComponent* ActorComponent = It->GetDefaultObject<UActorComponent>();
+			ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(ActorComponent);
+			if (ActorComponent && VehicleComponent &&
+				!It->GetName().StartsWith(TEXT("SKEL_"), ESearchCase::CaseSensitive) &&
+				!It->GetName().StartsWith(TEXT("REINST_"), ESearchCase::CaseSensitive) &&
+				VehicleComponent->GetVehicleComponentGUI().bIsPresentInAddMenu &&
+				Predicate(*It, VehicleComponent)
+				)
+			{
+				VehicleComponentsClasses.Add(*It);
+			}
+		}
+	}
+	return VehicleComponentsClasses;
+}
+
+static TArray<UClass*> GetVehicleComponents()
+{
+	static auto Dummy = [](UClass*, ISodaVehicleComponent*) { return true; };
+	return GetVehicleComponents(Dummy);
+}
+
+static TArray<UClass*> GetVehicleComponentsByCategory(const FString& CategoryName)
+{
+	TArray<UClass*> VehicleComponentsClasses = GetVehicleComponents([CategoryName](const UClass* Class, const ISodaVehicleComponent* VehicleComponent)
+	{
+		return CategoryName == VehicleComponent->GetVehicleComponentGUI().Category;
+	});
+
+	/*
+	 * Sorting
+	*/
+	VehicleComponentsClasses.Heapify([](UClass& A, UClass& B)
+	{
+		return B.IsChildOf(&A);
+	});
+
+	TArray<UClass*> Res;
+	for (auto& It : VehicleComponentsClasses)
+	{
+		UActorComponent* ActorComponent = It->GetDefaultObject<UActorComponent>();
+		ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(ActorComponent);
+		if (!VehicleComponent->GetVehicleComponentGUI().bIsSubComponent)
+		{
+			Res.Add(It);
+		}
+	}
+	for (auto& It : VehicleComponentsClasses)
+	{
+		UActorComponent* ActorComponent = It->GetDefaultObject<UActorComponent>();
+		ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(ActorComponent);
+		if (VehicleComponent->GetVehicleComponentGUI().bIsSubComponent)
+		{
+			bool Flag = false;
+			for (int i = Res.Num() - 1; i >= 0; --i)
+			{
+				if (It->IsChildOf(Res[i]))
+				{
+					Res.Insert(It, i + 1);
+					Flag = true;
+					break;
+				}
+			}
+			if (!Flag)
+			{
+				Res.Insert(It, Res.Num());
+			}
+		}
+	}
+
+	return Res;
+}
+
+static TArray<FString> GetVehicleComponentsCategories()
+{
+	TArray<UClass*> VehicleComponentsClasses = GetVehicleComponents();
+	TSet<FString> Ret;
+	for (auto& It : VehicleComponentsClasses)
+	{
+		UActorComponent* ActorComponent = It->GetDefaultObject<UActorComponent>();
+		ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(ActorComponent);
+		if (VehicleComponent)
+		{
+			Ret.Add(VehicleComponent->GetVehicleComponentGUI().Category);
+		}
+	}
+	return Ret.Array();
+}
+
+//***********************************************************************************************
+FString FComponentClassComboEntry::GetClassName() const
+{
+	//return ComponentClass != nullptr ? ComponentClass->GetDisplayNameText().ToString() : ComponentName;
+	return ComponentClass != nullptr ? ComponentClass->GetName() : ComponentName;
+}
+
+void FComponentClassComboEntry::AddReferencedObjects(FReferenceCollector& Collector)
+{
+	UClass* RawClass = ComponentClass;
+	Collector.AddReferencedObject(RawClass);
+	if(RawClass && RawClass->IsChildOf(UActorComponent::StaticClass()))
+	{
+		ComponentClass = RawClass;
+	}
+	else
+	{
+		ComponentClass = nullptr;
+	}
+
+	Collector.AddReferencedObject(IconClass);
+}
+
+void SVehicleComponentClassCombo::Construct(const FArguments& InArgs)
+{
+	PrevSelectedIndex = INDEX_NONE;
+	OnComponentClassSelected = InArgs._OnComponentClassSelected;
+	//OnSubobjectClassSelected = InArgs._OnSubobjectClassSelected;
+	TextFilter = MakeShared<FTextFilterExpressionEvaluator>(ETextFilterExpressionEvaluatorMode::BasicString);
+	
+	/*
+	if(InArgs._CustomClassFilters.Num() > 0)
+	{
+		ComponentClassFilterData = MakeUnique<FComponentClassFilterData>();
+
+		ComponentClassFilterData->InitOptions = MakeShared<FClassViewerInitializationOptions>();
+		ComponentClassFilterData->InitOptions->ClassFilters.Append(InArgs._CustomClassFilters);
+
+		ComponentClassFilterData->ClassFilter = FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateClassFilter(*ComponentClassFilterData->InitOptions);
+		ComponentClassFilterData->FilterFuncs = FModuleManager::LoadModuleChecked<FClassViewerModule>("ClassViewer").CreateFilterFuncs();
+	}
+	*/
+
+	//FComponentTypeRegistry::Get().SubscribeToComponentList(Entries).AddRaw(this, &SVehicleComponentClassCombo::UpdateComponentClassList);
+
+	UpdateComponentClassList();
+
+	SAssignNew(ComponentClassListView, SListView<FComponentClassComboEntryPtr>)
+		.ListItemsSource(&FilteredComponentClassList)
+		.OnSelectionChanged( this, &SVehicleComponentClassCombo::OnAddComponentSelectionChanged )
+		.OnGenerateRow( this, &SVehicleComponentClassCombo::GenerateAddComponentRow )
+		.SelectionMode(ESelectionMode::Single);
+
+	SAssignNew(SearchBox, SSearchBox)
+		.HintText( LOCTEXT( "BlueprintAddComponentSearchBoxHint", "Search Components" ) )
+		.OnTextChanged( this, &SVehicleComponentClassCombo::OnSearchBoxTextChanged )
+		.OnTextCommitted( this, &SVehicleComponentClassCombo::OnSearchBoxTextCommitted );
+
+	ChildSlot
+	[
+		SAssignNew(AddNewButton, SPositiveActionButton)
+		.Icon(FAppStyle::Get().GetBrush("Icons.Plus"))
+		.Text(LOCTEXT("Add", "Add"))
+		.OnComboBoxOpened(this, &SVehicleComponentClassCombo::ClearSelection)
+		.MenuContent()
+		[
+			SNew(soda::SListViewSelectorDropdownMenu<FComponentClassComboEntryPtr>, SearchBox, ComponentClassListView)
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush("Menu.Background"))
+				.Padding(2)
+				[
+					SNew(SBox)
+					.WidthOverride(250)
+					[				
+						SNew(SVerticalBox)
+						+SVerticalBox::Slot()
+						.Padding(1.f)
+						.AutoHeight()
+						[
+							SNew(SHorizontalBox)
+							+SHorizontalBox::Slot()
+							[
+								SearchBox.ToSharedRef()
+							]
+							+SHorizontalBox::Slot()
+							.AutoWidth()
+							.Padding(2.0f, 2.0f)
+							[
+								SNew(SComboButton)
+								.ContentPadding(0)
+								.ForegroundColor(FSlateColor::UseForeground())
+								.ComboButtonStyle(FAppStyle::Get(), "SimpleComboButton")
+								.HasDownArrow(false)
+								.Visibility(this, &SVehicleComponentClassCombo::GetFilterOptionsButtonVisibility)
+								.OnGetMenuContent(this, &SVehicleComponentClassCombo::GetFilterOptionsMenuContent)
+								.ButtonContent()
+								[
+									SNew(SImage)
+									.Image(FAppStyle::Get().GetBrush("Icons.Settings"))
+									.ColorAndOpacity(FSlateColor::UseForeground())
+								]
+							]
+						]
+						+SVerticalBox::Slot()
+						.MaxHeight(400)
+						[
+							ComponentClassListView.ToSharedRef()
+						]
+					]
+				]
+			]
+		]
+	];
+
+	
+
+	ComponentClassListView->EnableToolTipForceField( true );
+	// The button can automatically handle setting focus to a specified control when the combo button is opened
+	AddNewButton->SetMenuContentWidgetToFocus( SearchBox );
+}
+
+SVehicleComponentClassCombo::~SVehicleComponentClassCombo()
+{
+	//FComponentTypeRegistry::Get().GetOnComponentTypeListChanged().RemoveAll(this);
+}
+
+void SVehicleComponentClassCombo::ClearSelection()
+{
+	SearchBox->SetText(FText::GetEmpty());
+
+	PrevSelectedIndex = INDEX_NONE;
+	
+	// Clear the selection in such a way as to also clear the keyboard selector
+	ComponentClassListView->SetSelection(NULL, ESelectInfo::OnNavigation);
+
+	// Make sure we scroll to the top
+	if (ComponentClassList.Num() > 0)
+	{
+		ComponentClassListView->RequestScrollIntoView(ComponentClassList[0]);
+	}
+}
+
+void SVehicleComponentClassCombo::GenerateFilteredComponentList()
+{
+	const bool bNoClassFilter = true;/*!ComponentClassFilterData.IsValid()*/;
+	const bool bHasFilterText = !TextFilter->GetFilterText().IsEmpty();
+
+	if (bNoClassFilter && !bHasFilterText)
+	{
+		FilteredComponentClassList = ComponentClassList;
+	}
+	else
+	{
+		FilteredComponentClassList.Empty();
+
+		int32 LastHeadingIndex = INDEX_NONE;
+		FComponentClassComboEntryPtr* LastHeadingPtr = nullptr;
+
+		int32 LastSeparatorIndex = INDEX_NONE;
+		FComponentClassComboEntryPtr* LastSeparatorPtr = nullptr;
+
+		for (int32 ComponentIndex = 0; ComponentIndex < ComponentClassList.Num(); ComponentIndex++)
+		{
+			FComponentClassComboEntryPtr& CurrentEntry = ComponentClassList[ComponentIndex];
+
+			if (CurrentEntry->IsHeading())
+			{
+				LastHeadingIndex = FilteredComponentClassList.Num();
+				LastHeadingPtr = &CurrentEntry;
+			}
+			else if (CurrentEntry->IsSeparator())
+			{
+				LastSeparatorIndex = FilteredComponentClassList.Num();
+				LastSeparatorPtr = &CurrentEntry;
+			}
+			else if(CurrentEntry->IsClass())
+			{
+				// Disallow class entries that are not to be seen when searching via text.
+				bool bAllowEntry = !bHasFilterText || CurrentEntry->IsIncludedInFilter();
+				if(bAllowEntry)
+				{
+					// Disallow class entries that don't match the custom class filter, if set.
+					bAllowEntry = bNoClassFilter || IsComponentClassAllowed(CurrentEntry);
+					if (bAllowEntry && bHasFilterText)
+					{
+						// Finally, disallow class entries that don't match the search box text.
+						FString FriendlyComponentName = GetSanitizedComponentName(CurrentEntry);
+						bAllowEntry = TextFilter->TestTextFilter(FBasicStringFilterExpressionContext(FriendlyComponentName));
+					}
+				}
+
+				if (bAllowEntry)
+				{
+					// Add the heading first if it hasn't already been added
+					if (LastHeadingPtr && LastHeadingIndex != INDEX_NONE)
+					{
+						FilteredComponentClassList.Insert(*LastHeadingPtr, LastHeadingIndex);
+						LastHeadingIndex = INDEX_NONE;
+						LastHeadingPtr = nullptr;
+					}
+
+					// Add the separator next so that it will precede the heading
+					if (LastSeparatorPtr && LastSeparatorIndex != INDEX_NONE)
+					{
+						FilteredComponentClassList.Insert(*LastSeparatorPtr, LastSeparatorIndex);
+						LastSeparatorIndex = INDEX_NONE;
+						LastSeparatorPtr = nullptr;
+					}
+
+					// Add the class
+					FilteredComponentClassList.Add(CurrentEntry);
+				}
+			}
+		}
+
+		if (ComponentClassListView.IsValid())
+		{
+			// Select the first non-category item that passed the filter
+			for (FComponentClassComboEntryPtr& TestEntry : FilteredComponentClassList)
+			{
+				if (TestEntry->IsClass())
+				{
+					ComponentClassListView->SetSelection(TestEntry, ESelectInfo::OnNavigation);
+					break;
+				}
+			}
+		}
+	}
+}
+
+FText SVehicleComponentClassCombo::GetCurrentSearchString() const
+{
+	return TextFilter->GetFilterText();
+}
+
+void SVehicleComponentClassCombo::OnSearchBoxTextChanged( const FText& InSearchText )
+{
+	TextFilter->SetFilterText(InSearchText);
+	SearchBox->SetError(TextFilter->GetFilterErrorText());
+
+	UpdateComponentClassList();
+}
+
+void SVehicleComponentClassCombo::OnSearchBoxTextCommitted(const FText& NewText, ETextCommit::Type CommitInfo)
+{
+	if(CommitInfo == ETextCommit::OnEnter)
+	{
+		auto SelectedItems = ComponentClassListView->GetSelectedItems();
+		if(SelectedItems.Num() > 0)
+		{
+			ComponentClassListView->SetSelection(SelectedItems[0]);
+		}
+	}
+}
+
+// @todo: move this to FKismetEditorUtilities
+static UClass* GetAuthoritativeBlueprintClass(UBlueprint const* const Blueprint)
+{
+	UClass* BpClass = (Blueprint->SkeletonGeneratedClass != nullptr) ? Blueprint->SkeletonGeneratedClass :
+		Blueprint->GeneratedClass;
+
+	if (BpClass == nullptr)
+	{
+		BpClass = Blueprint->ParentClass;
+	}
+
+	UClass* AuthoritativeClass = BpClass;
+	if (BpClass != nullptr)
+	{
+		AuthoritativeClass = BpClass->GetAuthoritativeClass();
+	}
+	return AuthoritativeClass;
+}
+
+void SVehicleComponentClassCombo::OnAddComponentSelectionChanged( FComponentClassComboEntryPtr InItem, ESelectInfo::Type SelectInfo )
+{
+	if ( InItem.IsValid() && InItem->IsClass() && SelectInfo != ESelectInfo::OnNavigation)
+	{
+		// We don't want the item to remain selected
+		ClearSelection();
+
+		if ( InItem->IsClass() )
+		{
+			// Neither do we want the combo dropdown staying open once the user has clicked on a valid option
+			AddNewButton->SetIsMenuOpen(false, false);
+
+			if( OnComponentClassSelected.IsBound() /* || OnSubobjectClassSelected.IsBound()*/)
+			{
+				UClass* ComponentClass = InItem->GetComponentClass();
+				if (ComponentClass == nullptr)
+				{
+					// The class is not loaded yet, so load it:
+					if (UObject* LoadedObject = LoadObject<UObject>(nullptr, *InItem->GetComponentPath()))
+					{
+						if (UClass* LoadedClass = Cast<UClass>(LoadedObject))
+						{
+							ComponentClass = LoadedClass;
+						}
+						else if (UBlueprint* LoadedBP = Cast<UBlueprint>(LoadedObject))
+						{
+							ComponentClass = GetAuthoritativeBlueprintClass(LoadedBP);
+						}
+					}
+				}
+
+				if (OnComponentClassSelected.IsBound())
+				{
+					OnComponentClassSelected.Execute(ComponentClass, InItem->GetAssetOverride());
+				}
+				
+				/*
+				FSubobjectDataHandle NewActorCompHandle =
+					OnSubobjectClassSelected.IsBound() ?
+					OnSubobjectClassSelected.Execute(ComponentClass, InItem->GetComponentCreateAction(), InItem->GetAssetOverride())
+					: FSubobjectDataHandle::InvalidHandle;
+				
+
+				if(NewActorCompHandle.IsValid())
+				{
+					InItem->GetOnSubobjectCreated().ExecuteIfBound(NewActorCompHandle);
+				}
+				*/
+			}
+		}
+	}
+	else if ( InItem.IsValid() && SelectInfo != ESelectInfo::OnMouseClick )
+	{
+		int32 SelectedIdx = INDEX_NONE;
+		if (FilteredComponentClassList.Find(InItem, /*out*/ SelectedIdx))
+		{
+			if (!InItem->IsClass())
+			{
+				int32 SelectionDirection = SelectedIdx - PrevSelectedIndex;
+
+				// Update the previous selected index
+				PrevSelectedIndex = SelectedIdx;
+
+				// Make sure we select past the category header if we started filtering with it selected somehow (avoiding the infinite loop selecting the same item forever)
+				if (SelectionDirection == 0)
+				{
+					SelectionDirection = 1;
+				}
+
+				if(SelectedIdx + SelectionDirection >= 0 && SelectedIdx + SelectionDirection < FilteredComponentClassList.Num())
+				{
+					ComponentClassListView->SetSelection(FilteredComponentClassList[SelectedIdx + SelectionDirection], ESelectInfo::OnNavigation);
+				}
+			}
+			else
+			{
+				// Update the previous selected index
+				PrevSelectedIndex = SelectedIdx;
+			}
+		}
+	}
+}
+
+TSharedRef<ITableRow> SVehicleComponentClassCombo::GenerateAddComponentRow( FComponentClassComboEntryPtr Entry, const TSharedRef<STableViewBase> &OwnerTable ) const
+{
+	check( Entry->IsHeading() || Entry->IsSeparator() || Entry->IsClass() );
+
+	if ( Entry->IsHeading() )
+	{
+		return 
+			SNew( STableRow< TSharedPtr<FString> >, OwnerTable )
+				.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>("TableView.NoHoverTableRow"))
+				.ShowSelection(false)
+			[
+				SNew(SBox)
+				.Padding(1.f)
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(Entry->GetHeadingText()))
+					.TextStyle(FSodaStyle::Get(), TEXT("Menu.Heading"))
+				]
+			];
+	}
+	else if ( Entry->IsSeparator() )
+	{
+		return 
+			SNew( STableRow< TSharedPtr<FString> >, OwnerTable )
+				.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>("TableView.NoHoverTableRow"))
+				.ShowSelection(false)
+			[
+				SNew(SSeparator)
+				.SeparatorImage(FSodaStyle::Get().GetBrush("Menu.Separator"))
+				.Thickness(1.0f)
+			];
+	}
+	else
+	{
+		
+		return
+			SNew( SComboRow< TSharedPtr<FString> >, OwnerTable )
+			.ToolTip( GetComponentToolTip(Entry) )
+			[
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(SSpacer)
+					.Size(FVector2D(Entry->IsSubObject() ? 30 : 8.0f, 1.0f))
+				]
+				+SHorizontalBox::Slot()
+				.Padding(1.0f)
+				.AutoWidth()
+				[
+					SNew(SImage)
+					.Image( 
+						
+						FSlateIconFinder::FindIconBrushForClass( 
+							Entry->GetIconOverrideBrushName() == NAME_None ? Entry->GetIconClass() : nullptr, 
+							Entry->GetIconOverrideBrushName() ) )
+					.ColorAndOpacity(FLinearColor(1, 1, 1, 0.7))
+				]
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(SSpacer)
+					.Size(FVector2D(3.0f,1.0f))
+				]
+				+SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.HighlightText(this, &SVehicleComponentClassCombo::GetCurrentSearchString)
+					.Text(this, &SVehicleComponentClassCombo::GetFriendlyComponentName, Entry)
+				]
+			];
+	}
+}
+
+void SVehicleComponentClassCombo::UpdateComponentClassList()
+{
+	ComponentClassList.Empty();
+
+	TArray<FString> Categories = GetVehicleComponentsCategories();
+	TSharedPtr<SVerticalBox> VerticalBox = SNew(SVerticalBox);
+	for (auto& Category : Categories)
+	{
+		ComponentClassList.Add(MakeShared<FComponentClassComboEntry>(Category));
+		ComponentClassList.Add(MakeShared<FComponentClassComboEntry>());
+		TArray<UClass*> Classes = GetVehicleComponentsByCategory(Category);
+		for (auto& Class : Classes)
+		{
+			UActorComponent* ActorComponent = Class->GetDefaultObject<UActorComponent>();
+			if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(ActorComponent))
+			{
+
+					FComponentEntryCustomizationArgs Args;
+					Args.ComponentNameOverride = VehicleComponent->GetVehicleComponentGUI().ComponentNameOverride.Len() ? VehicleComponent->GetVehicleComponentGUI().ComponentNameOverride : Class->GetName();
+					Args.IconOverrideBrushName = VehicleComponent->GetVehicleComponentGUI().IcanName;
+
+					ComponentClassList.Add(MakeShared<FComponentClassComboEntry>(
+						VehicleComponent->GetVehicleComponentGUI().ComponentNameOverride.Len() ? VehicleComponent->GetVehicleComponentGUI().ComponentNameOverride : Class->GetName(),
+						VehicleComponent->GetVehicleComponentGUI().bIsSubComponent,
+						TSubclassOf<UActorComponent>(Class),
+						true,
+						Args
+					));
+				
+			}
+		}
+	}
+
+	// Regenerate the filtered list
+	GenerateFilteredComponentList();
+
+	// Ask the combo to update its contents on next tick
+	if (ComponentClassListView.IsValid())
+	{
+		ComponentClassListView->RequestListRefresh();
+	}
+}
+
+FText SVehicleComponentClassCombo::GetFriendlyComponentName(FComponentClassComboEntryPtr Entry) const
+{
+	// Get a user friendly string from the component name
+	FString FriendlyComponentName;
+
+	/*
+	if( Entry->GetComponentCreateAction() == EComponentCreateAction::CreateNewCPPClass )
+	{
+		FriendlyComponentName = LOCTEXT("NewCPPComponentFriendlyName", "New C++ Component...").ToString();
+	}
+	else if (Entry->GetComponentCreateAction() == EComponentCreateAction::CreateNewBlueprintClass )
+	{
+		FriendlyComponentName = LOCTEXT("NewBlueprintComponentFriendlyName", "New Blueprint Script Component...").ToString();
+	}
+	else
+	*/
+	{
+		FriendlyComponentName = GetSanitizedComponentName(Entry);
+
+		// Don't try to match up assets for USceneComponent it will match lots of things and doesn't have any nice behavior for asset adds 
+		if (Entry->GetComponentClass() != USceneComponent::StaticClass() && Entry->GetComponentNameOverride().IsEmpty())
+		{
+			// Search the selected assets and look for any that can be used as a source asset for this type of component
+			// If there is one we append the asset name to the component name, if there are many we append "Multiple Assets"
+			FString AssetName;
+			UObject* PreviousMatchingAsset = NULL;
+
+			//FEditorDelegates::LoadSelectedAssetsIfNeeded.Broadcast();
+			//USelection* Selection = GEditor->GetSelectedObjects();
+			/*
+			for(FSelectionIterator ObjectIter(*Selection); ObjectIter; ++ObjectIter)
+			{
+				UObject* Object = *ObjectIter;
+				check(Object);
+				UClass* Class = Object->GetClass();
+
+				TArray<TSubclassOf<UActorComponent> > ComponentClasses = FComponentAssetBrokerage::GetComponentsForAsset(Object);
+				for(int32 ComponentIndex = 0; ComponentIndex < ComponentClasses.Num(); ComponentIndex++)
+				{
+					if(ComponentClasses[ComponentIndex]->IsChildOf(Entry->GetComponentClass()))
+					{
+						if(AssetName.IsEmpty())
+						{
+							// If there is no previous asset then we just accept the name
+							AssetName = Object->GetName();
+							PreviousMatchingAsset = Object;
+						}
+						else
+						{
+							// if there is a previous asset then check that we didn't just find multiple appropriate components
+							// in a single asset - if the asset differs then we don't display the name, just "Multiple Assets"
+							if(PreviousMatchingAsset != Object)
+							{
+								AssetName = LOCTEXT("MultipleAssetsForComponentAnnotation", "Multiple Assets").ToString();
+								PreviousMatchingAsset = Object;
+							}
+						}
+					}
+				}
+			}
+			*/
+
+			if(!AssetName.IsEmpty())
+			{
+				FriendlyComponentName += FString(" (") + AssetName + FString(")");
+			}
+		}
+	}
+	return FText::FromString(FriendlyComponentName);
+}
+
+FString SVehicleComponentClassCombo::GetSanitizedComponentName(FComponentClassComboEntryPtr Entry)
+{
+	FString DisplayName;
+	if (Entry->GetComponentNameOverride() != FString())
+	{
+		DisplayName = Entry->GetComponentNameOverride();
+	}
+	else if (UClass* ComponentClass = Entry->GetComponentClass())
+	{
+		/*
+		if (ComponentClass->HasMetaData(TEXT("DisplayName")))
+		{
+			DisplayName = ComponentClass->GetMetaData(TEXT("DisplayName"));
+		}
+		else
+		{
+			DisplayName = ComponentClass->GetDisplayNameText().ToString();
+			if (!ComponentClass->HasAnyClassFlags(CLASS_CompiledFromBlueprint))
+			{
+				DisplayName.RemoveFromEnd(TEXT("Component"), ESearchCase::IgnoreCase);
+			}
+		}
+		*/
+		return ComponentClass->GetName();
+	}
+	else
+	{
+		DisplayName = Entry->GetClassName();
+	}
+	return FName::NameToDisplayString(DisplayName, false);
+}
+
+TSharedRef<SToolTip> SVehicleComponentClassCombo::GetComponentToolTip(FComponentClassComboEntryPtr Entry) const
+{
+	// Special handling for the "New..." options
+	/*
+	if (Entry->GetComponentCreateAction() == EComponentCreateAction::CreateNewCPPClass)
+	{
+		return SNew(SToolTip)
+			.Text(LOCTEXT("NewCPPComponentToolTip", "Create a custom actor component using C++"));
+	}
+	else if (Entry->GetComponentCreateAction() == EComponentCreateAction::CreateNewBlueprintClass)
+	{
+		return SNew(SToolTip)
+			.Text(LOCTEXT("NewBlueprintComponentToolTip", "Create a custom actor component using Blueprints"));
+	}
+	*/
+	
+	// Handle components which have a currently loaded class
+	/*
+	if (const UClass* ComponentClass = Entry->GetComponentClass())
+	{
+		return FEditorClassUtils::GetTooltip(ComponentClass);
+	}
+	*/
+
+	// Fallback for components that don't currently have a loaded class
+	return SNew(SToolTip)
+		.Text(FText::FromString(Entry->GetClassName()));
+}
+
+bool SVehicleComponentClassCombo::IsComponentClassAllowed(FComponentClassComboEntryPtr Entry) const
+{
+	/*
+	if (Entry.IsValid() && Entry->IsClass() && ComponentClassFilterData.IsValid())
+	{
+		check(ComponentClassFilterData->InitOptions.IsValid());
+		check(ComponentClassFilterData->ClassFilter.IsValid());
+		check(ComponentClassFilterData->FilterFuncs.IsValid());
+
+		if (const UClass* ComponentClass = Entry->GetComponentClass())
+		{
+			return ComponentClassFilterData->ClassFilter->IsClassAllowed(*ComponentClassFilterData->InitOptions, ComponentClass, ComponentClassFilterData->FilterFuncs.ToSharedRef());
+		}
+		else
+		{
+			TSharedPtr<IUnloadedBlueprintData> UnloadedBlueprintData = Entry->GetUnloadedBlueprintData();
+			if (UnloadedBlueprintData.IsValid())
+			{
+				return ComponentClassFilterData->ClassFilter->IsUnloadedClassAllowed(*ComponentClassFilterData->InitOptions, UnloadedBlueprintData.ToSharedRef(), ComponentClassFilterData->FilterFuncs.ToSharedRef());
+			}
+		}
+	}
+	*/
+
+	// Allow all entries to otherwise pass by default.
+	return true;
+}
+
+/*
+void SVehicleComponentClassCombo::GetComponentClassFilterOptions(TArray<TSharedRef<FClassViewerFilterOption>>& OutFilterOptions) const
+{
+	if (ComponentClassFilterData.IsValid() && ComponentClassFilterData->InitOptions.IsValid())
+	{
+		TArray<TSharedRef<FClassViewerFilterOption>> FilterOptions;
+		if(ComponentClassFilterData->ClassFilter.IsValid())
+		{
+			ComponentClassFilterData->ClassFilter->GetFilterOptions(FilterOptions);
+			OutFilterOptions.Append(FilterOptions);
+		}
+
+		for (const TSharedRef<IClassViewerFilter>& ClassFilter : ComponentClassFilterData->InitOptions->ClassFilters)
+		{
+			FilterOptions.Reset();
+			ClassFilter->GetFilterOptions(FilterOptions);
+
+			OutFilterOptions.Append(FilterOptions);
+		}
+	}
+}
+*/
+
+TSharedRef<SWidget> SVehicleComponentClassCombo::GetFilterOptionsMenuContent()
+{
+	const bool bCloseSelfOnly = true;
+	const bool bShouldCloseWindowAfterMenuSelection = true;
+	FMenuBuilder MenuBuilder(bShouldCloseWindowAfterMenuSelection, /* InCommandList = */nullptr, /* InExtender = */nullptr, bCloseSelfOnly);
+
+	/*
+	TArray<TSharedRef<FClassViewerFilterOption>> ClassFilterOptions;
+	GetComponentClassFilterOptions(ClassFilterOptions);
+
+	if (ClassFilterOptions.Num() > 0)
+	{
+		MenuBuilder.BeginSection("ClassFilterOptions", LOCTEXT("ClassFilterOptionsHeading", "Class Filters"));
+		{
+			for (const TSharedRef<FClassViewerFilterOption>& ClassFilterOption : ClassFilterOptions)
+			{
+				MenuBuilder.AddMenuEntry(
+					ClassFilterOption->LabelText,
+					ClassFilterOption->ToolTipText,
+					FSlateIcon(),
+					FUIAction(
+						//FExecuteAction::CreateSP(this, &SVehicleComponentClassCombo::ToggleFilterOption, ClassFilterOption),
+						//FCanExecuteAction(),
+						//FIsActionChecked::CreateSP(this, &SVehicleComponentClassCombo::IsFilterOptionEnabled, ClassFilterOption)
+					),
+					NAME_None,
+					EUserInterfaceActionType::ToggleButton
+				);
+			}
+		}
+		MenuBuilder.EndSection();
+	}
+	*/
+
+	return MenuBuilder.MakeWidget();
+}
+
+/*
+void SVehicleComponentClassCombo::ToggleFilterOption(TSharedRef<FClassViewerFilterOption> FilterOption)
+{
+	FilterOption->bEnabled = !FilterOption->bEnabled;
+
+	if (FilterOption->OnOptionChanged.IsBound())
+	{
+		FilterOption->OnOptionChanged.Execute(FilterOption->bEnabled);
+	}
+
+	UpdateComponentClassList();
+}
+*/
+
+/*
+bool SVehicleComponentClassCombo::IsFilterOptionEnabled(TSharedRef<FClassViewerFilterOption> FilterOption) const
+{
+	return FilterOption->bEnabled;
+}
+*/
+
+EVisibility SVehicleComponentClassCombo::GetFilterOptionsButtonVisibility() const
+{
+	//TArray<TSharedRef<FClassViewerFilterOption>> FilterOptions;
+	//GetComponentClassFilterOptions(FilterOptions);
+
+	//return FilterOptions.Num() > 0 ? EVisibility::Visible : EVisibility::Collapsed;
+
+	return EVisibility::Visible;
+
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/Common/SVehicleComponentClassCombo.h b/Source/UnrealSoda/Private/UI/Common/SVehicleComponentClassCombo.h
new file mode 100644
index 0000000..e91a685
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Common/SVehicleComponentClassCombo.h
@@ -0,0 +1,296 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SlateFwd.h"
+#include "Templates/SubclassOf.h"
+#include "Components/ActorComponent.h"
+//#include "SubobjectData.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+
+class FComponentClassComboEntry;
+class SToolTip;
+class FTextFilterExpressionEvaluator;
+//class IClassViewerFilter;
+//class IUnloadedBlueprintData;
+//class FClassViewerFilterFuncs;
+//class FClassViewerFilterOption;
+//class FClassViewerInitializationOptions;
+
+typedef TSharedPtr<class FComponentClassComboEntry> FComponentClassComboEntryPtr;
+
+//////////////////////////////////////////////////////////////////////////
+
+
+//namespace EComponentCreateAction
+//{
+	//enum Type
+	//{
+		/** Create a new C++ class based off the specified ActorComponent class and then add it to the tree */
+		//CreateNewCPPClass,
+		/** Create a new blueprint class based off the specified ActorComponent class and then add it to the tree */
+		//CreateNewBlueprintClass,
+		/** Spawn a new instance of the specified ActorComponent class and then add it to the tree */
+		//SpawnExistingClass,
+	//};
+//}
+
+
+//DECLARE_DELEGATE_OneParam(FOnSubobjectCreated, FSubobjectDataHandle);
+
+DECLARE_DELEGATE_RetVal_TwoParams( UActorComponent*, FComponentClassSelected, TSubclassOf<UActorComponent>, UObject*);
+//DECLARE_DELEGATE_RetVal_ThreeParams( FSubobjectDataHandle, FSubobjectClassSelected, TSubclassOf<UActorComponent>, EComponentCreateAction::Type, UObject*);
+
+struct FComponentEntryCustomizationArgs
+{
+	/** Specific asset to use instead of the selected asset in the content browser */
+	TWeakObjectPtr<UObject> AssetOverride;
+	/** Custom name to display */
+	FString ComponentNameOverride;
+	
+	/** Callback when a new subobject is created */
+	//FOnSubobjectCreated OnSubobjectCreated;
+	/** Brush icon to use instead of the class icon */
+	FName IconOverrideBrushName;
+	/** Custom sort priority to use (smaller means sorted first) */
+	int32 SortPriority;
+
+	FComponentEntryCustomizationArgs()
+		: AssetOverride( nullptr )
+		, ComponentNameOverride()
+		, IconOverrideBrushName( NAME_None )
+		, SortPriority(0)
+	{
+	
+	}
+};
+class FComponentClassComboEntry: public TSharedFromThis<FComponentClassComboEntry>
+{
+public:
+	FComponentClassComboEntry( const FString& InHeadingText, bool bInIsSubObject, TSubclassOf<UActorComponent> InComponentClass, bool InIncludedInFilter, FComponentEntryCustomizationArgs InCustomizationArgs = FComponentEntryCustomizationArgs())
+		: ComponentClass(InComponentClass)
+		, IconClass(InComponentClass)
+		, ComponentName()
+		, ComponentPath()
+		, HeadingText(InHeadingText)
+		, bIncludedInFilter(InIncludedInFilter)
+		, bIsSubObject(bInIsSubObject)
+		, CustomizationArgs(InCustomizationArgs)
+	{}
+
+	FComponentClassComboEntry(const FString& InHeadingText, bool bInIsSubObject, const FString& InComponentName, FName InComponentPath, const UClass* InIconClass, bool InIncludedInFilter)
+		: ComponentClass(nullptr)
+		, IconClass(InIconClass)
+		, ComponentName(InComponentName)
+		, ComponentPath(InComponentPath)
+		, HeadingText(InHeadingText)
+		, bIncludedInFilter(InIncludedInFilter)
+	{}
+
+	FComponentClassComboEntry( const FString& InHeadingText )
+		: ComponentClass(nullptr)
+		, IconClass(nullptr)
+		, ComponentName()
+		, ComponentPath()
+		, HeadingText(InHeadingText)
+		, bIncludedInFilter(false)
+	{}
+
+	FComponentClassComboEntry()
+		: ComponentClass(nullptr)
+		, IconClass(nullptr)
+	{}
+
+
+	TSubclassOf<UActorComponent> GetComponentClass() const { return ComponentClass; }
+
+	const UClass* GetIconClass() const { return IconClass; }
+
+	const FString& GetHeadingText() const { return HeadingText; }
+
+	bool IsHeading() const
+	{
+		return ((ComponentClass == NULL && ComponentName == FString()) && !HeadingText.IsEmpty());
+	}
+	bool IsSeparator() const
+	{
+		return ((ComponentClass == NULL && ComponentName == FString()) && HeadingText.IsEmpty());
+	}
+	
+	bool IsClass() const
+	{
+		return (ComponentClass != NULL || ComponentName != FString());
+	}
+	
+	bool IsIncludedInFilter() const
+	{
+		return bIncludedInFilter;
+	}
+	
+	const FString& GetComponentNameOverride() const
+	{
+		return CustomizationArgs.ComponentNameOverride;
+	}
+
+	/*
+	EComponentCreateAction::Type GetComponentCreateAction() const
+	{
+		return ComponentCreateAction;
+	}
+	*/
+	
+	/*
+	FOnSubobjectCreated& GetOnSubobjectCreated()
+    {
+    	return CustomizationArgs.OnSubobjectCreated;
+    }
+	*/
+	
+	FString GetClassName() const;
+	FString GetComponentPath() const { return ComponentPath.ToString(); }
+
+	UObject* GetAssetOverride()
+	{
+		return CustomizationArgs.AssetOverride.Get();
+	}
+
+	FName GetIconOverrideBrushName() const { return CustomizationArgs.IconOverrideBrushName; }
+
+	int32 GetSortPriority() const { return CustomizationArgs.SortPriority; }
+
+	void AddReferencedObjects(FReferenceCollector& Collector);
+
+	// If the component type is not loaded, this stores data that can be used for class filtering.
+	//TSharedPtr<IUnloadedBlueprintData> GetUnloadedBlueprintData() const { return UnloadedBlueprintData; }
+
+	// Can optionally be called to set unloaded component type data to assist with class filtering.
+	//void SetUnloadedBlueprintData(TSharedPtr<IUnloadedBlueprintData> InUnloadedBlueprintData)
+	//{
+	//	UnloadedBlueprintData = InUnloadedBlueprintData;
+	//}
+
+	bool IsSubObject() const { return  bIsSubObject; }
+
+private:
+	TSubclassOf<UActorComponent> ComponentClass;
+	const UClass* IconClass;
+	// For components that are not loaded we just keep the name of the component,
+	// loading occurs when the blueprint is spawned, which should also trigger a refresh
+	// of the component list:
+	FString ComponentName;
+	FName ComponentPath;
+	FString HeadingText;
+	bool bIncludedInFilter;
+	bool bIsSubObject;
+	FComponentEntryCustomizationArgs CustomizationArgs;
+	//TSharedPtr<IUnloadedBlueprintData> UnloadedBlueprintData;
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+class  SVehicleComponentClassCombo : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SVehicleComponentClassCombo)
+		: _IncludeText(true)
+	{}
+
+		SLATE_ATTRIBUTE(bool, IncludeText)
+		SLATE_EVENT(FComponentClassSelected, OnComponentClassSelected)
+		//SLATE_EVENT(FSubobjectClassSelected, OnSubobjectClassSelected)
+		//SLATE_ARGUMENT(TArray<TSharedRef<IClassViewerFilter>>, CustomClassFilters)
+
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs);
+
+	~SVehicleComponentClassCombo();
+
+	/** Clear the current combo list selection */
+	void ClearSelection();
+
+	FText GetCurrentSearchString() const;
+
+	/**
+	 * Called when the user changes the text in the search box.
+	 * @param InSearchText The new search string.
+	 */
+	void OnSearchBoxTextChanged( const FText& InSearchText );
+
+	/** Callback when the user commits the text in the searchbox */
+	void OnSearchBoxTextCommitted(const FText& NewText, ETextCommit::Type CommitInfo);
+
+	void OnAddComponentSelectionChanged( FComponentClassComboEntryPtr InItem, ESelectInfo::Type SelectInfo );
+
+	TSharedRef<ITableRow> GenerateAddComponentRow( FComponentClassComboEntryPtr Entry, const TSharedRef<STableViewBase> &OwnerTable ) const;
+
+	/** Update list of component classes */
+	void UpdateComponentClassList();
+
+	/** Returns a component name without the substring "Component" and sanitized for display */
+	static FString GetSanitizedComponentName(FComponentClassComboEntryPtr Entry);
+
+protected:
+	/** Internal data used to facilitate component class filtering */
+	//struct FComponentClassFilterData
+	//{
+		//TSharedPtr<FClassViewerInitializationOptions> InitOptions;
+		//TSharedPtr<IClassViewerFilter> ClassFilter;
+		//TSharedPtr<FClassViewerFilterFuncs> FilterFuncs;
+	//};
+
+	/**
+	 * Updates the filtered list of component names.
+	 */
+	void GenerateFilteredComponentList();
+
+private:
+	
+	FText GetFriendlyComponentName(FComponentClassComboEntryPtr Entry) const;
+
+	TSharedRef<SToolTip> GetComponentToolTip(FComponentClassComboEntryPtr Entry) const;
+
+	bool IsComponentClassAllowed(FComponentClassComboEntryPtr Entry) const;
+
+	//void GetComponentClassFilterOptions(TArray<TSharedRef<FClassViewerFilterOption>>& OutFilterOptions) const;
+
+	TSharedRef<SWidget> GetFilterOptionsMenuContent();
+
+	//void ToggleFilterOption(TSharedRef<FClassViewerFilterOption> FilterOption);
+
+	//bool IsFilterOptionEnabled(TSharedRef<FClassViewerFilterOption> FilterOption) const;
+
+	EVisibility GetFilterOptionsButtonVisibility() const;
+	
+	FComponentClassSelected OnComponentClassSelected;
+
+	//FSubobjectClassSelected OnSubobjectClassSelected;
+	
+	/** List of component class names used by combo box */
+	TArray<FComponentClassComboEntryPtr> ComponentClassList;
+
+	/** List of component class names, filtered by the current search string */
+	TArray<FComponentClassComboEntryPtr> FilteredComponentClassList;
+
+	/** The current search string */
+	TSharedPtr<FTextFilterExpressionEvaluator> TextFilter;
+
+	/** The search box control - part of the combo drop down */
+	TSharedPtr<SSearchBox> SearchBox;
+
+	/** The Add combo button. */
+	TSharedPtr<class SPositiveActionButton> AddNewButton;
+
+	/** The component list control - part of the combo drop down */
+	TSharedPtr< SListView<FComponentClassComboEntryPtr> > ComponentClassListView;
+
+	/** Internal data that facilitates custom class filtering */
+	//TUniquePtr<FComponentClassFilterData> ComponentClassFilterData;
+
+	/** Cached selection index used to skip over unselectable items */
+	int32 PrevSelectedIndex;
+};
diff --git a/Source/UnrealSoda/Private/UI/SActorList.cpp b/Source/UnrealSoda/Private/UI/SActorList.cpp
new file mode 100644
index 0000000..fdb25b9
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SActorList.cpp
@@ -0,0 +1,484 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SActorList.h"
+#include "Soda/UnrealSoda.h"
+#include "EngineUtils.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Text/SInlineEditableTextBlock.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "Soda/ISodaActor.h"
+//#include "RuntimeEditorModule.h"
+//#include "RuntimePropertyEditor/IDetailsView.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/LevelState.h"
+#include "Soda/Editor/SodaSelection.h"
+#include "Soda/SodaGameViewportClient.h"
+//#include "Framework/SlateDelegates.h"
+#include "UI/Common/SPinWidget.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "GameFramework/Pawn.h"
+#include "GameFramework/PlayerController.h"
+
+#define LOCTEXT_NAMESPACE "ActorBar"
+
+namespace soda
+{
+
+static const FName Column_Pin("Pin");
+static const FName Column_ItemName("ItemName");
+static const FName Column_Type("Type");
+
+//********************************************************************************************************
+
+class SActorListRow : public SMultiColumnTableRow<TWeakObjectPtr<AActor>>
+{
+public:
+	SLATE_BEGIN_ARGS(SActorListRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<AActor> InActor, TWeakPtr<SActorList> InActorListView)
+	{
+		USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+		check(GameMode);
+		ASodaActorFactory * ActorFactory = GameMode->GetActorFactory();
+		check(ActorFactory);
+
+		Actor = InActor;
+		Desc = GameMode->GetSodaActorDescriptor(Actor->GetClass());
+		IsSpawnedActor = ActorFactory->CheckActorIsExist(Actor.Get());
+		ActorListView = InActorListView;
+
+		FSuperRowType::FArguments OutArgs;
+		//OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+		SMultiColumnTableRow<TWeakObjectPtr<AActor>>::Construct(OutArgs, InOwnerTable);
+	}
+
+	virtual TSharedRef<SWidget> GenerateWidgetForColumn(const FName& InColumnName) override
+	{
+		
+		if(InColumnName == Column_Pin)
+		{
+			TSharedPtr< SPinWidget > PinWidget;
+			return 
+				SNew(SBox)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SAssignNew(PinWidget, SPinWidget)
+					.CheckedHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Icons.Unpinned")))
+					.CheckedNotHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Icons.Unpinned")))
+					.NotCheckedHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Icons.Unpinned")))
+					.NotCheckedNotHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("Icons.Unpinned")))
+					.bHideUnchecked(true)
+					.IsChecked(TAttribute<bool>::CreateLambda([this]() 
+					{
+						ISodaActor* SodaActor = Cast<ISodaActor>(Actor.Get());
+						return SodaActor ? SodaActor->IsPinnedActor() : false;
+					}))
+					.OnClicked(ActorListView.Pin().Get(), &SActorList::OnPinClicked, Actor)
+					.Row(SharedThis(this))
+				];
+		}
+
+		if(InColumnName == Column_ItemName)
+		{
+			return 
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(5, 1, 1, 1)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SImage)
+					.Image(FSodaStyle::GetBrush(Desc.Icon))
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(5, 1, 1, 1)
+				[
+					SAssignNew(InlineTextBlock, SInlineEditableTextBlock)
+					.Text_Lambda([this]()
+					{
+						if(Actor.IsValid())
+						{
+							return FText::FromString(*Actor->GetName());
+						}
+						return FText::FromString("None");
+					})
+					.ColorAndOpacity_Lambda([this]() { return IsSpawnedActor ? FLinearColor(0.95, 0.9, 0.4) : FLinearColor::White; })
+					.OnTextCommitted(this, &SActorListRow::OnRenameActorCommited)
+					.IsSelected(this, &SMultiColumnTableRow<TWeakObjectPtr<AActor>>::IsSelectedExclusively)
+					.IsReadOnly(!IsSpawnedActor)
+				];
+		}
+
+		if (InColumnName == Column_Type)
+		{
+			return SNew(SBox)
+				.Padding(FMargin(5, 1, 1, 1))
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					[
+						SNew(STextBlock)
+						.Text(FText::FromString(*Desc.DisplayName))
+						.ColorAndOpacity(FLinearColor(0.5f, 0.5f, 0.5f))
+					]
+					+ SHorizontalBox::Slot()
+					.FillWidth(1)
+					[
+						SNew(STextBlock)
+						.Text_Lambda([this]()
+						{
+							FString Ret = "";
+							ISodaActor* SodaActor = Cast<ISodaActor>(Actor);
+							if (SodaActor && SodaActor->IsPinnedActor())
+							{
+								Ret = " [" + SodaActor->GetPinnedActorName() + "]";
+							}
+							return FText::FromString(*Ret);
+						})
+					]
+				];
+		}
+
+		return SNullWidget::NullWidget;
+	}
+
+	void OnRenameActorCommited(const FText& NewName, ETextCommit::Type Type)
+	{
+		USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+		check(GameMode);
+		ASodaActorFactory* ActorFactory = GameMode->GetActorFactory();
+		check(ActorFactory);
+
+		if (!Actor.IsValid())
+		{
+			UE_LOG(LogSoda, Error, TEXT("SActorListRow::OnRenameActorCommited(); Selected actor faild"));
+		}
+		else
+		{
+			if (!ActorFactory->RenameActor(Actor.Get(), NewName.ToString()))
+			{
+				ActorListView.Pin()->RebuilActorList();
+				GameMode->LevelState->MarkAsDirty();
+			}
+		}
+	}
+
+	TWeakObjectPtr<AActor> Actor;
+	FSodaActorDescriptor Desc;
+	bool IsSpawnedActor;
+	TWeakPtr<SActorList> ActorListView;
+	TSharedPtr<SInlineEditableTextBlock> InlineTextBlock;
+};
+
+//********************************************************************************************************************
+
+void SActorList::Construct(const FArguments& InArgs, USodaGameViewportClient * InViewportClient)
+{
+	check(IsValid(InViewportClient));
+	ViewportClient = InViewportClient;
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	ActorFactory = GameMode->GetActorFactory();
+	OnSelectionChangedDelegate = InArgs._OnSelectionChanged;
+	bIsInteractiveMode = InArgs._bInteractiveMode.Get();
+	ActorFilter = InArgs._ActorFilter;
+
+	InvalidateDelegateHandle = ActorFactory->OnInvalidateDelegate.AddLambda([this]() 
+	{ 
+		RebuilActorList(); 
+	});
+
+	ChildSlot
+	[
+		SNew(SVerticalBox)
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		[
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Recessed")))
+			.Padding(5)
+			[
+				SAssignNew(SearchBox, SSearchBox)
+				//.OnTextChanged(this, &SVehicleComponentClassCombo::OnSearchBoxTextChanged)
+				//.OnTextCommitted(this, &SVehicleComponentClassCombo::OnSearchBoxTextCommitted);
+			]
+		]
+		+ SVerticalBox::Slot()
+		.FillHeight(1)
+		[
+			SAssignNew(TreeView, SListView<TWeakObjectPtr<AActor>>)
+			.SelectionMode(ESelectionMode::Single)
+			.ListItemsSource(&ActorList)
+			.OnGenerateRow(this, &SActorList::MakeRowWidget)
+			.OnContextMenuOpening(this, &SActorList::OnMenuOpening)
+			.OnSelectionChanged(this, &SActorList::OnSelectionChanged)
+			.HeaderRow(
+				SNew(SHeaderRow)
+				+ SHeaderRow::Column(Column_Pin)
+				.FixedWidth(24)
+				.HAlignCell(HAlign_Center)
+				.HeaderContent()
+				[
+					SNew(SBox)
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					.Padding(0)
+					[
+						SNew(SImage)
+						.Image(FSodaStyle::Get().GetBrush(TEXT("Icons.Unpinned")))
+					]
+				]
+				+ SHeaderRow::Column(Column_ItemName)
+				.DefaultLabel(FText::FromString("Item Name"))
+				+ SHeaderRow::Column(Column_Type)
+				.DefaultLabel(FText::FromString("Type"))
+			)
+		]
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		[
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Header")))
+			.Padding(15, 5, 5, 5)
+			[
+				SNew(STextBlock)
+				.Text_Lambda([this]() {return FText::FromString(FString::FromInt(ActorList.Num()) + " actors"); })
+			]
+		]
+	];
+
+	RebuilActorList();
+}
+
+SActorList::~SActorList()
+{
+	if (ActorFactory.IsValid() && InvalidateDelegateHandle.IsValid())
+	{
+		ActorFactory->OnInvalidateDelegate.Remove(InvalidateDelegateHandle);
+	}
+}
+
+TSharedPtr<SWidget> SActorList::OnMenuOpening()
+{
+	if (TreeView->GetNumItemsSelected() != 1)
+	{
+		return TSharedPtr<SWidget>();
+	}
+
+	AActor* SelectedActor = GetSelectedActor();
+	if (!IsValid(SelectedActor))
+	{
+		return TSharedPtr<SWidget>();
+	}
+
+	bool IsSpawnedActor = ActorFactory->CheckActorIsExist(SelectedActor);
+
+	FMenuBuilder MenuBuilder(true /*bCloseAfterSelection*/, TSharedPtr<FUICommandList>());
+	MenuBuilder.BeginSection(NAME_None);
+
+	MenuBuilder.AddMenuEntry(
+		FText::FromString(TEXT("Delete")),
+		FText::GetEmpty(),
+		FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "Icons.Delete"),
+		FUIAction(
+			FExecuteAction::CreateSP(this, &SActorList::OnDeleteActor, SelectedActor),
+			FCanExecuteAction::CreateLambda([IsSpawnedActor]() { return IsSpawnedActor; })
+		));
+		
+	MenuBuilder.AddMenuEntry(
+		FText::FromString(TEXT("Rename")),
+		FText::GetEmpty(),
+		FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "Icons.Edit"),
+		FUIAction(
+			FExecuteAction::CreateSP(this, &SActorList::OnRenameActor, SelectedActor),
+			FCanExecuteAction::CreateLambda([IsSpawnedActor]() { return IsSpawnedActor; })
+		));
+
+	if (APawn* Pawn = Cast<APawn>(SelectedActor))
+	{
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Posses")),
+			FText::GetEmpty(),
+			FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "ClassIcon.Pawn"),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SActorList::OnPossesActor, Pawn)
+			));
+	}
+		
+	MenuBuilder.EndSection();
+	return MenuBuilder.MakeWidget();
+}
+
+FReply SActorList::OnPinClicked(TWeakObjectPtr<AActor> Actor)
+{
+	if (ISodaActor* SodaActor = Cast<ISodaActor>(Actor))
+	{
+		bool IsPinnedActor = !SodaActor->IsPinnedActor();
+		if (!SodaActor->OnSetPinnedActor(IsPinnedActor))
+		{
+			FSlateNotificationManager& NotificationManager = FSlateNotificationManager::Get();
+			FNotificationInfo Info(FText::FromString(TEXT("The \"") + Actor->GetClass()->GetName() + TEXT("\" actor can't be pinned")));
+			Info.ExpireDuration = 5.0f;
+			Info.Image = FCoreStyle::Get().GetBrush(TEXT("Icons.WarningWithColor"));
+			NotificationManager.AddNotification(Info);
+		}
+		SodaActor->MarkAsDirty();
+		USodaGameModeComponent::GetChecked()->LevelState->MarkAsDirty();
+	}
+	return FReply::Handled();
+}
+
+void SActorList::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+{
+	SCompoundWidget::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+
+	if (bIsInteractiveMode)
+	{
+		AActor* SelectedActor = ViewportClient->Selection->GetSelectedActor();
+		if (SelectedActor != SelectedItem.Get())
+		{
+			if (SelectedActor)
+			{
+				TreeView->SetSelection(SelectedActor);
+			}
+			else
+			{
+				TreeView->ClearSelection();
+			}
+		}
+	}
+
+	if (RequestedEditeTextBox.IsValid())
+	{
+		RequestedEditeTextBox.Pin()->EnterEditingMode();
+		RequestedEditeTextBox.Reset();
+	}
+}
+
+void SActorList::OnSelectionChanged(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo)
+{
+	SelectedItem = Actor;
+
+	if (bIsInteractiveMode)
+	{
+		if (Actor.IsValid())
+		{
+			if (ViewportClient->Selection)
+			{
+				ViewportClient->Selection->SelectActor(Actor.Get(), nullptr);
+			}
+		}
+		else
+		{
+			if (ViewportClient->Selection)
+			{
+				ViewportClient->Selection->UnselectActor();
+			}
+		}
+	}
+
+	OnSelectionChangedDelegate.ExecuteIfBound(Actor, SelectInfo);
+}
+
+void SActorList::RebuilActorList()
+{
+	ActorList.Empty();
+	if (!ViewportClient.IsValid())
+	{
+		return;
+	}
+	for (FActorIterator It(ViewportClient->GetWorld()); It; ++It)
+	{
+		AActor* Actor = *It;
+		if (IsValid(Actor) && Actor->GetClass()->ImplementsInterface(USodaActor::StaticClass()))
+		{
+			if (!ActorFilter.IsBound() || ActorFilter.Execute(Actor))
+			{
+				ActorList.Add(Actor);
+			}
+		}
+	}
+	TreeView->RebuildList();
+}
+
+void SActorList::OnDeleteActor(AActor* SelectedActor)
+{
+	if (IsValid(SelectedActor))
+	{
+		ActorFactory->RemoveActor(SelectedActor);
+		USodaGameModeComponent::GetChecked()->LevelState->MarkAsDirty();
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("SActorList::OnDeleteActor(); Selected actor faild"));
+	}
+}
+
+AActor* SActorList::GetSelectedActor() const
+{
+	return SelectedItem.Get();
+}
+
+
+TSharedRef< ITableRow > SActorList::MakeRowWidget(TWeakObjectPtr<AActor> Actor, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return SNew(SActorListRow, OwnerTable, Actor, SharedThis(this));
+}
+
+void SActorList::OnRenameActor(AActor* SelectedActor)
+{
+	if (!IsValid(SelectedActor))
+	{
+		UE_LOG(LogSoda, Error, TEXT("SActorList::OnRenameActor(); Selected item faild"));
+		RebuilActorList();
+		return;
+	}
+
+	TSharedPtr<ITableRow> TableRow = TreeView->WidgetFromItem(SelectedActor);
+	if (!TableRow.IsValid())
+	{
+		UE_LOG(LogSoda, Error, TEXT("SActorList::OnRenameActor(); Selected item faild"));
+		RebuilActorList();
+		return;
+	}
+
+	if (TableRow->AsWidget()->GetType() != "SActorListRow")
+	{
+		UE_LOG(LogSoda, Error, TEXT("SActorList::OnRenameActor(); Selected widget faild (%s)"), *TableRow->AsWidget()->GetTypeAsString());
+		RebuilActorList();
+		return;
+	}
+
+	SActorListRow* TableRowWidget = static_cast<SActorListRow*>(&TableRow->AsWidget().Get());
+
+	RequestedEditeTextBox = TableRowWidget->InlineTextBlock;
+}
+
+void SActorList::OnPossesActor(APawn* SelectedActor)
+{
+	if (IsValid(SelectedActor))
+	{
+		if (APlayerController* PlayerController = SelectedActor->GetWorld()->GetFirstPlayerController())
+		{
+			PlayerController->Possess(SelectedActor);
+		}
+	}
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/SMenuWindow.cpp b/Source/UnrealSoda/Private/UI/SMenuWindow.cpp
new file mode 100644
index 0000000..7311a53
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SMenuWindow.cpp
@@ -0,0 +1,108 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SMenuWindow.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SScaleBox.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Layout/SBackgroundBlur.h"
+#include "Soda/SodaGameMode.h"
+
+namespace soda
+{
+
+SMenuWindow::SMenuWindow()
+{
+}
+
+SMenuWindow::~SMenuWindow()
+{
+}
+
+void SMenuWindow::Construct( const FArguments& InArgs )
+{
+	check(InArgs._Content);
+
+	InArgs._Content->SetParentMenuWindow(SharedThis(this));	
+
+	ChildSlot
+	[
+		SNew(SBackgroundBlur)
+		.VAlign(VAlign_Center)
+		.HAlign(HAlign_Center)
+		.BlurStrength(4)
+		.Padding(20.0f)
+		.CornerRadius(FVector4(4.0f, 4.0f, 4.0f, 4.0f))
+		.Cursor(EMouseCursor::Default)
+		[
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::GetBrush("MenuWindow.Border"))
+			.Padding(4)
+			[
+				SNew(SVerticalBox)
+				+SVerticalBox::Slot()
+				.AutoHeight()
+				[
+					SNew(SBorder)
+					.BorderImage(FSodaStyle::GetBrush("MenuWindow.Caption"))
+					[
+						SNew(SHorizontalBox)
+						+ SHorizontalBox::Slot()
+						.Padding(5, 2, 5, 2)
+						.FillWidth(1.0)
+						[
+							SNew(STextBlock)
+							//.TextStyle(&FSodaStyle::Get().GetWidgetStyle<FTextBlockStyle>("SmallText"))
+							.Text(InArgs._Caption)
+						]
+						+ SHorizontalBox::Slot()
+						.Padding(2)
+						.AutoWidth()
+						[
+							SNew(SButton)
+							.ButtonStyle(FSodaStyle::Get(), "MenuWindow.CloseButton")
+							.OnClicked(FOnClicked::CreateLambda([this]() {
+								CloseWindow();
+								return FReply::Handled();
+							}))
+						]
+					]
+				]
+				+SVerticalBox::Slot()
+				.Padding(0, 5, 0, 0)
+				.FillHeight(1)
+				[
+					SNew(SBox)
+					.MinDesiredWidth(200)
+					.MinDesiredHeight(40)
+					[
+						InArgs._Content.ToSharedRef()
+					]
+				]
+			]
+		]
+	];
+}
+
+bool SMenuWindow::CloseWindow()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		if (!GameMode->CloseWindow(this))
+		{
+			checkf(true, TEXT("SMenuWindow::CloseWindow(), but the window isn't fins in the USodaGameModeComponent"));
+		}
+		else
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/SMessageBox.cpp b/Source/UnrealSoda/Private/UI/SMessageBox.cpp
new file mode 100644
index 0000000..12b60ea
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SMessageBox.cpp
@@ -0,0 +1,127 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SMessageBox.h"
+#include "SodaStyleSet.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Text/STextBlock.h"
+
+namespace soda
+{
+
+SMessageBox::SMessageBox()
+{
+}
+
+SMessageBox::~SMessageBox()
+{
+}
+
+void SMessageBox::Construct( const FArguments& InArgs )
+{
+	OnMessageBox = InArgs._OnMessageBox;
+
+	TSharedPtr<SHorizontalBox> ButtonsHorizontalBox;
+	SMenuWindow::Construct(SMenuWindow::FArguments()
+		.Caption(InArgs._Caption)
+		.Content(
+			SNew(SMenuWindowContent)
+			[
+				SNew(SVerticalBox)
+				+ SVerticalBox::Slot()
+				.Padding(5)
+				.FillHeight(1)
+				[
+					SNew(SBox)
+					.MaxDesiredWidth(500)
+					[
+						SNew(STextBlock)
+						.AutoWrapText(true)
+						.Text(InArgs._TextContent)
+					]
+				]
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				.HAlign(HAlign_Center)
+				[
+					SAssignNew(ButtonsHorizontalBox, SHorizontalBox)
+				]
+			]
+		)
+	);
+
+	if (InArgs._Type.Get() == EMessageBoxType::OK || InArgs._Type.Get() == EMessageBoxType::OK_CANCEL)
+	{
+		ButtonsHorizontalBox->AddSlot()
+		.Padding(3)
+		.AutoWidth()
+		[
+			SNew(SButton)
+			.Text(FText::FromString("Ok"))
+			.OnClicked(FOnClicked::CreateLambda([this]() {
+				ExecuteOnMessageBox(EMessageBoxButton::OK);
+				return FReply::Handled();
+			}))
+		];
+	}
+	else if (InArgs._Type.Get() == EMessageBoxType::YES_NO || InArgs._Type.Get() == EMessageBoxType::YES_NO_CANCEL)
+	{
+		ButtonsHorizontalBox->AddSlot()
+		.Padding(3)
+		.AutoWidth()
+		[
+			SNew(SButton)
+			.Text(FText::FromString("Yes"))
+			.OnClicked(FOnClicked::CreateLambda([this]() {
+				ExecuteOnMessageBox(EMessageBoxButton::YES);
+				return FReply::Handled();
+			}))
+		];
+
+		ButtonsHorizontalBox->AddSlot()
+		.Padding(3)
+		.AutoWidth()
+		[
+			SNew(SButton)
+			.Text(FText::FromString("No"))
+			.OnClicked(FOnClicked::CreateLambda([this]() {
+				ExecuteOnMessageBox(EMessageBoxButton::NO);
+				return FReply::Handled();
+			}))
+		];
+	}
+
+	if (InArgs._Type.Get() == EMessageBoxType::OK_CANCEL || InArgs._Type.Get() == EMessageBoxType::YES_NO_CANCEL)
+	{
+		ButtonsHorizontalBox->AddSlot()
+		.Padding(3)
+		.AutoWidth()
+		[
+			SNew(SButton)
+			.Text(FText::FromString("Cancle"))
+			.OnClicked(FOnClicked::CreateLambda([this]() {
+				ExecuteOnMessageBox(EMessageBoxButton::CANCEL);
+				return FReply::Handled();
+			}))
+		];
+	}
+}
+
+void SMessageBox::ExecuteOnMessageBox(EMessageBoxButton Button)
+{
+	if (OnMessageBox.IsBound())
+	{
+		OnMessageBox.Execute(Button);
+	}
+
+	CloseWindow();
+}
+
+void SMessageBox::SetOnMessageBox(FOnMessageBox InOnMessageBox)
+{
+	OnMessageBox = InOnMessageBox;
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/SOutputLog.cpp b/Source/UnrealSoda/Private/UI/SOutputLog.cpp
new file mode 100644
index 0000000..bfa2a23
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SOutputLog.cpp
@@ -0,0 +1,2120 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/SOutputLog.h"
+#include "Framework/Text/IRun.h"
+#include "Framework/Text/TextLayout.h"
+#include "Misc/ConfigCacheIni.h"
+#include "Misc/OutputDeviceHelper.h"
+#include "Misc/ScopeLock.h"
+#include "SlateOptMacros.h"
+#include "Textures/SlateIcon.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/Text/SlateTextLayout.h"
+#include "Framework/Text/SlateTextRun.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SMenuAnchor.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Widgets/Input/SMultiLineEditableTextBox.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Widgets/Views/SListView.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Features/IModularFeatures.h"
+#include "Misc/CoreDelegates.h"
+#include "HAL/PlatformOutputDevices.h"
+#include "HAL/FileManager.h"
+#include "Widgets/Input/SButton.h"
+#include "Framework/Docking/TabManager.h"
+#include "Widgets/Docking/SDockTab.h"
+#include "Widgets/Text/SlateEditableTextTypes.h"
+#include "SodaStyleSet.h"
+#include "SodaOutputLogSettings.h"
+//#include "OutputLogStyle.h"
+
+
+#define LOCTEXT_NAMESPACE "SOutputLog"
+
+namespace soda
+{
+
+class FCategoryLineHighlighter : public ISlateLineHighlighter
+{
+public:
+	static TSharedRef<FCategoryLineHighlighter> Create()
+	{
+		return MakeShareable(new FCategoryLineHighlighter());
+	}
+
+	virtual int32 OnPaint(const FPaintArgs& Args, const FTextLayout::FLineView& Line, const float OffsetX, const float Width, const FTextBlockStyle& DefaultStyle, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const override
+	{
+		const FVector2D Location(Line.Offset.X + OffsetX, Line.Offset.Y);
+
+		// If we've not been set to an explicit color, calculate a suitable one from the linked color
+		FLinearColor SelectionBackgroundColorAndOpacity = DefaultStyle.SelectedBackgroundColor.GetColor(InWidgetStyle);// *InWidgetStyle.GetColorAndOpacityTint();
+		SelectionBackgroundColorAndOpacity.A *= 0.2f;
+
+		// The block size and offset values are pre-scaled, so we need to account for that when converting the block offsets into paint geometry
+		const float InverseScale = Inverse(AllottedGeometry.Scale);
+
+		if (Width > 0.0f)
+		{
+			// Draw the actual highlight rectangle
+			FSlateDrawElement::MakeBox(
+				OutDrawElements,
+				++LayerId,
+				AllottedGeometry.ToPaintGeometry(TransformVector(InverseScale, FVector2D(Width, FMath::Max(Line.Size.Y, Line.TextHeight))), FSlateLayoutTransform(TransformPoint(InverseScale, Location))),
+				&DefaultStyle.HighlightShape,
+				bParentEnabled /*&& bHasKeyboardFocus*/ ? ESlateDrawEffect::None : ESlateDrawEffect::DisabledEffect,
+				SelectionBackgroundColorAndOpacity
+			);
+		}
+
+		return LayerId;
+	}
+
+protected:
+	FCategoryLineHighlighter()
+	{
+	}
+};
+
+
+class FCategoryBadgeHighlighter : public ISlateLineHighlighter
+{
+public:
+	static TSharedRef<FCategoryBadgeHighlighter> Create(const FLinearColor& InBadgeColor)
+	{
+		return MakeShareable(new FCategoryBadgeHighlighter(InBadgeColor));
+	}
+
+	virtual int32 OnPaint(const FPaintArgs& Args, const FTextLayout::FLineView& Line, const float OffsetX, const float Width, const FTextBlockStyle& DefaultStyle, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const override
+	{
+		const FVector2D Location(Line.Offset.X + OffsetX, Line.Offset.Y);
+
+		// The block size and offset values are pre-scaled, so we need to account for that when converting the block offsets into paint geometry
+		const float InverseScale = Inverse(AllottedGeometry.Scale);
+
+		if (Width > 0.0f)
+		{
+			// Draw the actual highlight rectangle
+			FSlateDrawElement::MakeBox(
+				OutDrawElements,
+				++LayerId,
+				AllottedGeometry.ToPaintGeometry(TransformVector(InverseScale, FVector2D(Width, FMath::Max(Line.Size.Y, Line.TextHeight))), FSlateLayoutTransform(TransformPoint(InverseScale, Location))),
+				&DefaultStyle.HighlightShape,
+				bParentEnabled ? ESlateDrawEffect::None : ESlateDrawEffect::DisabledEffect,
+				BadgeColor
+			);
+		}
+
+		return LayerId;
+	}
+
+protected:
+	FLinearColor BadgeColor;
+
+	FCategoryBadgeHighlighter(const FLinearColor& InBadgeColor)
+		: BadgeColor(InBadgeColor)
+	{
+	}
+};
+
+
+
+/** Expression context to test the given messages against the current text filter */
+class FLogFilter_TextFilterExpressionContextOutputLog : public ITextFilterExpressionContext
+{
+public:
+	explicit FLogFilter_TextFilterExpressionContextOutputLog(const FOutputLogMessage& InMessage) : Message(&InMessage) {}
+
+	/** Test the given value against the strings extracted from the current item */
+	virtual bool TestBasicStringExpression(const FTextFilterString& InValue, const ETextFilterTextComparisonMode InTextComparisonMode) const override { return TextFilterUtils::TestBasicStringExpression(*Message->Message, InValue, InTextComparisonMode); }
+
+	/**
+	* Perform a complex expression test for the current item
+	* No complex expressions in this case - always returns false
+	*/
+	virtual bool TestComplexExpression(const FName& InKey, const FTextFilterString& InValue, const ETextFilterComparisonOperation InComparisonOperation, const ETextFilterTextComparisonMode InTextComparisonMode) const override { return false; }
+
+private:
+	/** Message that is being filtered */
+	const FOutputLogMessage* Message;
+};
+
+SConsoleInputBox::SConsoleInputBox()
+	: bIgnoreUIUpdate(false)
+	, bHasTicked(false)
+{
+}
+
+BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
+void SConsoleInputBox::Construct(const FArguments& InArgs)
+{
+	OnConsoleCommandExecuted = InArgs._OnConsoleCommandExecuted;
+	ConsoleCommandCustomExec = InArgs._ConsoleCommandCustomExec;
+	OnCloseConsole = InArgs._OnCloseConsole;
+
+	if (!ConsoleCommandCustomExec.IsBound()) // custom execs always show the default executor in the UI (which has the selector disabled)
+	{
+		FString PreferredCommandExecutorStr;
+		if (GConfig->GetString(TEXT("OutputLog"), TEXT("PreferredCommandExecutor"), PreferredCommandExecutorStr, GEditorPerProjectIni))
+		{
+			PreferredCommandExecutorName = *PreferredCommandExecutorStr;
+		}
+	}
+
+	SyncActiveCommandExecutor();
+
+	IModularFeatures::Get().OnModularFeatureRegistered().AddSP(this, &SConsoleInputBox::OnCommandExecutorRegistered);
+	IModularFeatures::Get().OnModularFeatureUnregistered().AddSP(this, &SConsoleInputBox::OnCommandExecutorUnregistered);
+	EPopupMethod PopupMethod = GIsEditor ? EPopupMethod::CreateNewWindow : EPopupMethod::UseCurrentWindow;
+	ChildSlot
+	[
+		SAssignNew( SuggestionBox, SMenuAnchor )
+		.Method(PopupMethod)
+		.Placement( InArgs._SuggestionListPlacement )
+		[
+			SNew(SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(FMargin(0.0f, 0.0f, 4.0f, 0.0f))
+			[
+				SNew(SComboButton)
+				.IsEnabled(this, &SConsoleInputBox::IsCommandExecutorMenuEnabled)
+				.ComboButtonStyle(FSodaStyle::Get(), "SimpleComboButton")
+				.ContentPadding(0)
+				.OnGetMenuContent(this, &SConsoleInputBox::GetCommandExecutorMenuContent)
+				.ButtonContent()
+				[
+					SNew(SHorizontalBox)
+					+SHorizontalBox::Slot()
+					.Padding(2.0f)
+					.HAlign(HAlign_Left)
+					.VAlign(VAlign_Center)
+					.AutoWidth()
+					[
+						SNew(SImage)
+						.ColorAndOpacity(FSlateColor::UseForeground())
+						.Image(FSodaStyle::Get().GetBrush("DebugConsole.Icon"))
+					]
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.Padding(2.0f)
+					[
+						SNew(STextBlock)
+						.Text(this, &SConsoleInputBox::GetActiveCommandExecutorDisplayName)
+					]
+				]
+			]
+
+			+SHorizontalBox::Slot()
+			[
+				SAssignNew(InputText, SMultiLineEditableTextBox)
+				.Font(FSodaStyle::Get().GetWidgetStyle<FTextBlockStyle>("Log.Normal").Font)
+				.HintText(this, &SConsoleInputBox::GetActiveCommandExecutorHintText)
+				.AllowMultiLine(this, &SConsoleInputBox::GetActiveCommandExecutorAllowMultiLine)
+				.OnTextCommitted(this, &SConsoleInputBox::OnTextCommitted)
+				.OnTextChanged(this, &SConsoleInputBox::OnTextChanged)
+				.OnKeyCharHandler(this, &SConsoleInputBox::OnKeyCharHandler)
+				.OnKeyDownHandler(this, &SConsoleInputBox::OnKeyDownHandler)
+				.OnIsTypedCharValid(FOnIsTypedCharValid::CreateLambda([](const TCHAR InCh) { return true; })) // allow tabs to be typed into the field
+				.ClearKeyboardFocusOnCommit(false)
+				.ModiferKeyForNewLine(EModifierKey::Shift)
+			]
+		]
+		.MenuContent
+		(
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::Get().GetBrush("Menu.Background"))
+			.Padding( FMargin(2) )
+			[
+				SNew(SBox)
+				.HeightOverride(250) // avoids flickering, ideally this would be adaptive to the content without flickering
+				.MinDesiredWidth(300)
+				.MaxDesiredWidth(this, &SConsoleInputBox::GetSelectionListMaxWidth)
+				[
+					SAssignNew(SuggestionListView, SListView< TSharedPtr<FString> >)
+					.ListItemsSource(&Suggestions.SuggestionsList)
+					.SelectionMode( ESelectionMode::Single )							// Ideally the mouse over would not highlight while keyboard controls the UI
+					.OnGenerateRow(this, &SConsoleInputBox::MakeSuggestionListItemWidget)
+					.OnSelectionChanged(this, &SConsoleInputBox::SuggestionSelectionChanged)
+					.ItemHeight(18)
+				]
+			]
+		)
+	];
+}
+END_SLATE_FUNCTION_BUILD_OPTIMIZATION
+
+void SConsoleInputBox::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	bHasTicked = true;
+
+	if (!GIntraFrameDebuggingGameThread && !IsEnabled())
+	{
+		SetEnabled(true);
+	}
+	else if (GIntraFrameDebuggingGameThread && IsEnabled())
+	{
+		SetEnabled(false);
+	}
+}
+
+
+void SConsoleInputBox::SuggestionSelectionChanged(TSharedPtr<FString> NewValue, ESelectInfo::Type SelectInfo)
+{
+	if(bIgnoreUIUpdate)
+	{
+		return;
+	}
+
+	Suggestions.SelectedSuggestion = Suggestions.SuggestionsList.IndexOfByPredicate([&NewValue](const TSharedPtr<FString>& InSuggestion)
+	{
+		return InSuggestion == NewValue;
+	});
+
+	MarkActiveSuggestion();
+
+	// If the user selected this suggestion by clicking on it, then go ahead and close the suggestion
+	// box as they've chosen the suggestion they're interested in.
+	if( SelectInfo == ESelectInfo::OnMouseClick )
+	{
+		SuggestionBox->SetIsOpen( false );
+
+		// Jump the caret to the end of the newly auto-completed line. This makes it so that selecting
+		// an option doesn't leave the cursor in the middle of the suggestion (which makes it hard to 
+		// ctrl-back out, or to type "?" for help, etc.)
+		InputText->GoTo(ETextLocation::EndOfDocument);
+	}
+
+	// Ideally this would set the focus back to the edit control
+//	FWidgetPath WidgetToFocusPath;
+//	FSlateApplication::Get().GeneratePathToWidgetUnchecked( InputText.ToSharedRef(), WidgetToFocusPath );
+//	FSlateApplication::Get().SetKeyboardFocus( WidgetToFocusPath, EFocusCause::SetDirectly );
+}
+
+FOptionalSize SConsoleInputBox::GetSelectionListMaxWidth() const
+{
+	// Limit the width of the suggestions list to the work area that this widget currently resides on
+	const FSlateRect WidgetRect(GetCachedGeometry().GetAbsolutePosition(), GetCachedGeometry().GetAbsolutePosition() + GetCachedGeometry().GetAbsoluteSize());
+	const FSlateRect WidgetWorkArea = FSlateApplication::Get().GetWorkArea(WidgetRect);
+	return FMath::Max(300.0f, WidgetWorkArea.GetSize().X - 12.0f);
+}
+
+TSharedRef<ITableRow> SConsoleInputBox::MakeSuggestionListItemWidget(TSharedPtr<FString> Text, const TSharedRef<STableViewBase>& OwnerTable)
+{
+	check(Text.IsValid());
+
+	FString SanitizedText = *Text;
+	SanitizedText.ReplaceInline(TEXT("\r\n"), TEXT("\n"), ESearchCase::CaseSensitive);
+	SanitizedText.ReplaceInline(TEXT("\r"), TEXT(" "), ESearchCase::CaseSensitive);
+	SanitizedText.ReplaceInline(TEXT("\n"), TEXT(" "), ESearchCase::CaseSensitive);
+
+	return
+		SNew(STableRow< TSharedPtr<FString> >, OwnerTable)
+		[
+			SNew(STextBlock)
+			.Text(FText::FromString(SanitizedText))
+			.TextStyle(FSodaStyle::Get(), "Log.Normal")
+			.HighlightText(Suggestions.SuggestionsHighlight)
+			.ColorAndOpacity(FSlateColor::UseForeground())
+		];
+}
+
+void SConsoleInputBox::OnTextChanged(const FText& InText)
+{
+	if(bIgnoreUIUpdate)
+	{
+		return;
+	}
+
+	const FString& InputTextStr = InputText->GetText().ToString();
+	if(!InputTextStr.IsEmpty())
+	{
+		TArray<FString> AutoCompleteList;
+		
+		if (ActiveCommandExecutor)
+		{
+			ActiveCommandExecutor->GetAutoCompleteSuggestions(*InputTextStr, AutoCompleteList);
+		}
+		else
+		{
+			auto OnConsoleVariable = [&AutoCompleteList](const TCHAR *Name, IConsoleObject* CVar)
+			{
+#if (UE_BUILD_SHIPPING || UE_BUILD_TEST)
+				if (CVar->TestFlags(ECVF_Cheat))
+				{
+					return;
+				}
+#endif // (UE_BUILD_SHIPPING || UE_BUILD_TEST)
+				if (CVar->TestFlags(ECVF_Unregistered))
+				{
+					return;
+				}
+
+				AutoCompleteList.Add(Name);
+			};
+
+			IConsoleManager::Get().ForEachConsoleObjectThatContains(FConsoleObjectVisitor::CreateLambda(OnConsoleVariable), *InputTextStr);
+		}
+		AutoCompleteList.Sort([InputTextStr](const FString& A, const FString& B)
+		{ 
+			if (A.StartsWith(InputTextStr))
+			{
+				if (!B.StartsWith(InputTextStr))
+				{
+					return true;
+				}
+			}
+			else
+			{
+				if (B.StartsWith(InputTextStr))
+				{
+					return false;
+				}
+			}
+
+			return A < B;
+
+		});
+
+
+		SetSuggestions(AutoCompleteList, FText::FromString(InputTextStr));
+	}
+	else
+	{
+		ClearSuggestions();
+	}
+}
+
+void SConsoleInputBox::OnTextCommitted( const FText& InText, ETextCommit::Type CommitInfo)
+{
+	if (CommitInfo == ETextCommit::OnEnter)
+	{
+		if (!InText.IsEmpty())
+		{
+			// Copy the exec text string out so we can clear the widget's contents.  If the exec command spawns
+			// a new window it can cause the text box to lose focus, which will result in this function being
+			// re-entered.  We want to make sure the text string is empty on re-entry, so we'll clear it out
+			const FString ExecString = InText.ToString();
+
+			// Clear the console input area
+			bIgnoreUIUpdate = true;
+			InputText->SetText(FText::GetEmpty());
+			ClearSuggestions();
+			bIgnoreUIUpdate = false;
+			
+			// Exec!
+			if (ConsoleCommandCustomExec.IsBound())
+			{
+				IConsoleManager::Get().AddConsoleHistoryEntry(TEXT(""), *ExecString);
+				ConsoleCommandCustomExec.Execute(ExecString);
+			}
+			else if (ActiveCommandExecutor)
+			{
+				ActiveCommandExecutor->Exec(*ExecString);
+			}
+		}
+		else
+		{
+			ClearSuggestions();
+		}
+
+		OnConsoleCommandExecuted.ExecuteIfBound();
+	}
+}
+
+FReply SConsoleInputBox::OnPreviewKeyDown(const FGeometry& MyGeometry, const FKeyEvent& KeyEvent)
+{
+	if(SuggestionBox->IsOpen())
+	{
+		if(KeyEvent.GetKey() == EKeys::Up || KeyEvent.GetKey() == EKeys::Down)
+		{
+			Suggestions.StepSelectedSuggestion(KeyEvent.GetKey() == EKeys::Up ? -1 : +1);
+			MarkActiveSuggestion();
+
+			return FReply::Handled();
+		}
+		else if (KeyEvent.GetKey() == EKeys::Tab)
+		{
+			if (Suggestions.HasSuggestions())
+			{
+				if (Suggestions.HasSelectedSuggestion())
+				{
+					Suggestions.StepSelectedSuggestion(KeyEvent.IsShiftDown() ? -1 : +1);
+				}
+				else
+				{
+					Suggestions.SelectedSuggestion = 0;
+				}
+				MarkActiveSuggestion();
+			}
+
+			bConsumeTab = true;
+			return FReply::Handled();
+		}
+		else if (KeyEvent.GetKey() == EKeys::Escape)
+		{
+			SuggestionBox->SetIsOpen(false);
+			return FReply::Handled();
+		}
+	}
+	else
+	{
+		const FInputChord KeyEventAsInputChord = FInputChord(KeyEvent.GetKey(), EModifierKey::FromBools(KeyEvent.IsControlDown(), KeyEvent.IsAltDown(), KeyEvent.IsShiftDown(), KeyEvent.IsCommandDown()));
+
+		if(KeyEvent.GetKey() == EKeys::Up)
+		{
+			// If the command field isn't empty we need you to have pressed Control+Up to summon the history (to make sure you're not just using caret navigation)
+			const bool bIsMultiLine = GetActiveCommandExecutorAllowMultiLine();
+			const bool bShowHistory = InputText->GetText().IsEmpty() || KeyEvent.IsControlDown();
+			if (bShowHistory)
+			{
+				TArray<FString> History;
+				if (ActiveCommandExecutor)
+				{
+					ActiveCommandExecutor->GetExecHistory(History);
+				}
+				else
+				{
+					IConsoleManager::Get().GetConsoleHistory(TEXT(""), History);
+				}
+				SetSuggestions(History, FText::GetEmpty());
+				
+				if(Suggestions.HasSuggestions())
+				{
+					Suggestions.StepSelectedSuggestion(-1);
+					MarkActiveSuggestion();
+				}
+			}
+
+			// Need to always handle this for single-line controls to avoid them invoking widget navigation
+			if (!bIsMultiLine || bShowHistory)
+			{
+				return FReply::Handled();
+			}
+		}
+		else if (KeyEvent.GetKey() == EKeys::Escape)
+		{
+			if (InputText->GetText().IsEmpty())
+			{
+				OnCloseConsole.ExecuteIfBound();
+			}
+			else
+			{
+				// Clear the console input area
+				bIgnoreUIUpdate = true;
+				InputText->SetText(FText::GetEmpty());
+				bIgnoreUIUpdate = false;
+
+				ClearSuggestions();
+			}
+
+			return FReply::Handled();
+		}
+		else if (ActiveCommandExecutor && ActiveCommandExecutor->GetIterateExecutorHotKey() == KeyEventAsInputChord)
+		{
+			MakeNextCommandExecutorActive();
+			return FReply::Handled();
+		}
+	}
+
+	return FReply::Unhandled();
+}
+
+void SConsoleInputBox::SetSuggestions(TArray<FString>& Elements, FText Highlight)
+{
+	FString SelectionText;
+	if (Suggestions.HasSelectedSuggestion())
+	{
+		SelectionText = *Suggestions.GetSelectedSuggestion();
+	}
+
+	Suggestions.Reset();
+	Suggestions.SuggestionsHighlight = Highlight;
+
+	for(int32 i = 0; i < Elements.Num(); ++i)
+	{
+		Suggestions.SuggestionsList.Add(MakeShared<FString>(Elements[i]));
+
+		if (Elements[i] == SelectionText)
+		{
+			Suggestions.SelectedSuggestion = i;
+		}
+	}
+	SuggestionListView->RequestListRefresh();
+
+	if(Suggestions.HasSuggestions())
+	{
+		// Ideally if the selection box is open the output window is not changing it's window title (flickers)
+		SuggestionBox->SetIsOpen(true, false);
+		if (Suggestions.HasSelectedSuggestion())
+		{
+			SuggestionListView->RequestScrollIntoView(Suggestions.GetSelectedSuggestion());
+		}
+		else
+		{
+			SuggestionListView->ScrollToTop();
+		}
+	}
+	else
+	{
+		SuggestionBox->SetIsOpen(false);
+	}
+}
+
+void SConsoleInputBox::OnFocusLost( const FFocusEvent& InFocusEvent )
+{
+//	SuggestionBox->SetIsOpen(false);
+}
+
+void SConsoleInputBox::MarkActiveSuggestion()
+{
+	bIgnoreUIUpdate = true;
+	if (Suggestions.HasSelectedSuggestion())
+	{
+		TSharedPtr<FString> SelectedSuggestion = Suggestions.GetSelectedSuggestion();
+
+		SuggestionListView->SetSelection(SelectedSuggestion);
+		SuggestionListView->RequestScrollIntoView(SelectedSuggestion);	// Ideally this would only scroll if outside of the view
+
+		InputText->SetText(FText::FromString(*SelectedSuggestion));
+	}
+	else
+	{
+		SuggestionListView->ClearSelection();
+	}
+	bIgnoreUIUpdate = false;
+}
+
+void SConsoleInputBox::ClearSuggestions()
+{
+	SuggestionBox->SetIsOpen(false);
+	Suggestions.Reset();
+}
+
+void SConsoleInputBox::OnCommandExecutorRegistered(const FName& Type, class IModularFeature* ModularFeature)
+{
+	if (Type == IConsoleCommandExecutor::ModularFeatureName())
+	{
+		SyncActiveCommandExecutor();
+	}
+}
+
+void SConsoleInputBox::OnCommandExecutorUnregistered(const FName& Type, class IModularFeature* ModularFeature)
+{
+	if (Type == IConsoleCommandExecutor::ModularFeatureName() && ModularFeature == ActiveCommandExecutor)
+	{
+		SyncActiveCommandExecutor();
+	}
+}
+
+void SConsoleInputBox::SyncActiveCommandExecutor()
+{
+	TArray<IConsoleCommandExecutor*> CommandExecutors = IModularFeatures::Get().GetModularFeatureImplementations<IConsoleCommandExecutor>(IConsoleCommandExecutor::ModularFeatureName());
+	ActiveCommandExecutor = nullptr;
+
+	if (CommandExecutors.IsValidIndex(0))
+	{
+		ActiveCommandExecutor = CommandExecutors[0];
+	}
+	// to swap to a preferred executor, try and match from the active name
+	for (IConsoleCommandExecutor* CommandExecutor : CommandExecutors)
+	{
+		if (CommandExecutor->GetName() == PreferredCommandExecutorName)
+		{
+			ActiveCommandExecutor = CommandExecutor;
+			break;
+		}
+	}
+	
+}
+
+void SConsoleInputBox::SetActiveCommandExecutor(const FName InExecName)
+{
+	GConfig->SetString(TEXT("OutputLog"), TEXT("PreferredCommandExecutor"), *InExecName.ToString(), GEditorPerProjectIni);
+	PreferredCommandExecutorName = InExecName;
+	SyncActiveCommandExecutor();
+}
+
+FText SConsoleInputBox::GetActiveCommandExecutorDisplayName() const
+{
+	if (ActiveCommandExecutor)
+	{
+		return ActiveCommandExecutor->GetDisplayName();
+	}
+	return FText::GetEmpty();
+}
+
+FText SConsoleInputBox::GetActiveCommandExecutorHintText() const
+{
+	if (ActiveCommandExecutor)
+	{
+		return ActiveCommandExecutor->GetHintText();
+	}
+	return FText::GetEmpty();
+}
+
+bool SConsoleInputBox::GetActiveCommandExecutorAllowMultiLine() const
+{
+	if (ActiveCommandExecutor)
+	{
+		return ActiveCommandExecutor->AllowMultiLine();
+	}
+	return false;
+}
+
+bool SConsoleInputBox::IsCommandExecutorMenuEnabled() const
+{
+	return !ConsoleCommandCustomExec.IsBound(); // custom execs always show the default executor in the UI (which has the selector disabled)
+}
+
+void SConsoleInputBox::MakeNextCommandExecutorActive()
+{
+	// Sorted so the iteration order matches the displayed order.
+	TArray<IConsoleCommandExecutor*> CommandExecutors = IModularFeatures::Get().GetModularFeatureImplementations<IConsoleCommandExecutor>(IConsoleCommandExecutor::ModularFeatureName());
+	CommandExecutors.Sort([](IConsoleCommandExecutor& LHS, IConsoleCommandExecutor& RHS)
+		{
+			return LHS.GetDisplayName().CompareTo(RHS.GetDisplayName()) < 0;
+		});
+
+	int32 CurrentIndex = CommandExecutors.IndexOfByKey(ActiveCommandExecutor);
+	if (CurrentIndex >= 0)
+	{
+		CurrentIndex++;
+		if (CurrentIndex >= CommandExecutors.Num())
+		{
+			CurrentIndex = 0;
+		}
+
+		SetActiveCommandExecutor(CommandExecutors[CurrentIndex]->GetName());
+	}
+}
+
+TSharedRef<SWidget> SConsoleInputBox::GetCommandExecutorMenuContent()
+{
+	FMenuBuilder MenuBuilder(/*bInShouldCloseWindowAfterMenuSelection=*/true, nullptr);
+
+	MenuBuilder.BeginSection("CmdExecEntries");
+	{
+		TArray<IConsoleCommandExecutor*> CommandExecutors = IModularFeatures::Get().GetModularFeatureImplementations<IConsoleCommandExecutor>(IConsoleCommandExecutor::ModularFeatureName());
+		CommandExecutors.Sort([](IConsoleCommandExecutor& LHS, IConsoleCommandExecutor& RHS)
+		{
+			return LHS.GetDisplayName().CompareTo(RHS.GetDisplayName()) < 0;
+		});
+
+		for (const IConsoleCommandExecutor* CommandExecutor : CommandExecutors)
+		{
+			const bool bIsActiveCmdExec = ActiveCommandExecutor == CommandExecutor;
+
+			MenuBuilder.AddMenuEntry(
+				CommandExecutor->GetDisplayName(),
+				CommandExecutor->GetDescription(),
+				FSlateIcon(),
+				FUIAction(
+					FExecuteAction::CreateSP(this, &SConsoleInputBox::SetActiveCommandExecutor, CommandExecutor->GetName()),
+					FCanExecuteAction::CreateLambda([] { return true; }),
+					FIsActionChecked::CreateLambda([bIsActiveCmdExec] { return bIsActiveCmdExec; })
+					),
+				NAME_None,
+				EUserInterfaceActionType::Check
+			);
+		}
+	}
+	MenuBuilder.EndSection();
+
+	return MenuBuilder.MakeWidget();
+}
+
+FReply SConsoleInputBox::OnKeyDownHandler(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent)
+{
+	const FInputChord InputChord = FInputChord(InKeyEvent.GetKey(), EModifierKey::FromBools(InKeyEvent.IsControlDown(), InKeyEvent.IsAltDown(), InKeyEvent.IsShiftDown(), InKeyEvent.IsCommandDown()));
+
+	// Intercept the "open console" key
+	if (ActiveCommandExecutor && (ActiveCommandExecutor->AllowHotKeyClose() && ActiveCommandExecutor->GetHotKey() == InputChord))
+	{
+		OnCloseConsole.ExecuteIfBound();
+		return FReply::Handled();
+	}
+	
+	return FReply::Unhandled();
+}
+
+FReply SConsoleInputBox::OnKeyCharHandler(const FGeometry& MyGeometry, const FCharacterEvent& InCharacterEvent)
+{
+	// A printable key may be used to open the console, so consume all characters before our first Tick
+	if (!bHasTicked)
+	{
+		return FReply::Handled();
+	}
+
+	// Intercept tab if used for auto-complete
+	if (InCharacterEvent.GetCharacter() == '\t' && bConsumeTab)
+	{
+		bConsumeTab = false;
+		return FReply::Handled();
+	}
+
+	if (InCharacterEvent.GetModifierKeys().AnyModifiersDown() && InCharacterEvent.GetCharacter() == ' ')
+	{	
+		// Ignore space bar + a modifier key.  It should not type a space as this is used by other keyboard shortcuts
+		return FReply::Handled();
+	}
+
+	FInputChord OpenConsoleChord;
+	if (ActiveCommandExecutor && ActiveCommandExecutor->AllowHotKeyClose())
+	{
+		OpenConsoleChord = ActiveCommandExecutor->GetHotKey();
+
+		const uint32* KeyCode = nullptr;
+		const uint32* CharCode = nullptr;
+		FInputKeyManager::Get().GetCodesFromKey(OpenConsoleChord.Key, KeyCode, CharCode);
+		if (CharCode == nullptr)
+		{
+			return FReply::Unhandled();
+		}
+
+		// Intercept the "open console" key
+		if (InCharacterEvent.GetCharacter() == (TCHAR)*CharCode
+			&& OpenConsoleChord.NeedsControl() == InCharacterEvent.IsControlDown()
+			&& OpenConsoleChord.NeedsAlt() == InCharacterEvent.IsAltDown()
+			&& OpenConsoleChord.NeedsShift() == InCharacterEvent.IsShiftDown()
+			&& OpenConsoleChord.NeedsCommand() == InCharacterEvent.IsCommandDown())
+		{
+			return FReply::Handled();
+		}
+		else
+		{
+			return FReply::Unhandled();
+		}
+	}
+	else
+	{
+		return FReply::Unhandled();
+	}
+}
+
+TSharedRef< FOutputLogTextLayoutMarshaller > FOutputLogTextLayoutMarshaller::Create(TArray< TSharedPtr<FOutputLogMessage> > InMessages, FOutputLogFilter* InFilter)
+{
+	return MakeShareable(new FOutputLogTextLayoutMarshaller(MoveTemp(InMessages), InFilter));
+}
+
+FOutputLogTextLayoutMarshaller::~FOutputLogTextLayoutMarshaller()
+{
+}
+
+void FOutputLogTextLayoutMarshaller::SetText(const FString& SourceString, FTextLayout& TargetTextLayout)
+{
+	TextLayout = &TargetTextLayout;
+	NextPendingMessageIndex = 0;
+	SubmitPendingMessages();
+}
+
+void FOutputLogTextLayoutMarshaller::GetText(FString& TargetString, const FTextLayout& SourceTextLayout)
+{
+	SourceTextLayout.GetAsText(TargetString);
+}
+
+bool FOutputLogTextLayoutMarshaller::AppendPendingMessage(const TCHAR* InText, const ELogVerbosity::Type InVerbosity, const FName& InCategory)
+{
+	// We don't want to skip adding messages, so just try to acquire the lock
+	FScopeLock PendingMessagesAccess(&PendingMessagesCriticalSection);
+	return SOutputLog::CreateLogMessages(InText, InVerbosity, InCategory, PendingMessages);
+}
+
+bool FOutputLogTextLayoutMarshaller::SubmitPendingMessages()
+{
+	// We can always submit messages next tick. So only try to lock, if not possible return.
+	if (PendingMessagesCriticalSection.TryLock())
+	{
+		Messages.Append(MoveTemp(PendingMessages));
+		PendingMessages.Reset();
+		PendingMessagesCriticalSection.Unlock();
+	}
+	else
+	{
+		return false;
+	}
+
+	if (Messages.IsValidIndex(NextPendingMessageIndex))
+	{
+		const int32 CurrentMessagesCount = Messages.Num();
+
+		AppendPendingMessagesToTextLayout();
+		NextPendingMessageIndex = CurrentMessagesCount;
+		return true;
+	}
+
+	return false;
+}
+
+float FOutputLogTextLayoutMarshaller::GetCategoryHue(FName CategoryName)
+{
+	if (float* pResult = CategoryHueMap.Find(CategoryName))
+	{
+		return *pResult;
+	}
+	else
+	{
+		FRandomStream RNG(GetTypeHash(CategoryName));
+		const float Hue = RNG.FRandRange(0.0f, 360.0f);
+		CategoryHueMap.Add(CategoryName, Hue);
+		return Hue;
+	}
+}
+
+void FOutputLogTextLayoutMarshaller::AppendPendingMessagesToTextLayout()
+{
+	const int32 CurrentMessagesCount = Messages.Num();
+	const int32 NumPendingMessages = CurrentMessagesCount - NextPendingMessageIndex;
+
+	if (NumPendingMessages == 0)
+	{
+		return;
+	}
+
+	if (TextLayout)
+	{
+		// If we were previously empty, then we'd have inserted a dummy empty line into the document
+		// We need to remove this line now as it would cause the message indices to get out-of-sync with the line numbers, which would break auto-scrolling
+		const bool bWasEmpty = GetNumMessages() == 0;
+		if (bWasEmpty)
+		{
+			TextLayout->ClearLines();
+		}
+	}
+	else
+	{
+		MarkMessagesCacheAsDirty();
+		MakeDirty();
+	}
+
+	const ESodaLogCategoryColorizationMode CategoryColorizationMode = GetDefault<USodaOutputLogSettings>()->CategoryColorizationMode;
+
+	TArray<FTextLayout::FNewLineData> LinesToAdd;
+	LinesToAdd.Reserve(NumPendingMessages);
+	TArray<FTextLineHighlight> Highlights;
+
+	int32 NumAddedMessages = 0;
+
+	auto ComputeCategoryColor = [this](const FTextBlockStyle& OriginalStyle, const FName MessageCategory)
+	{
+		FTextBlockStyle Result = OriginalStyle;
+
+		FLinearColor HSV = OriginalStyle.ColorAndOpacity.GetSpecifiedColor().LinearRGBToHSV();
+		HSV.R = GetCategoryHue(MessageCategory);
+		HSV.G = FMath::Max(0.4f, HSV.G);
+		Result.ColorAndOpacity = HSV.HSVToLinearRGB();
+		return Result;
+	};
+
+	for (int32 MessageIndex = NextPendingMessageIndex; MessageIndex < CurrentMessagesCount; ++MessageIndex)
+	{
+		const TSharedPtr<FOutputLogMessage> Message = Messages[MessageIndex];
+		const int32 LineIndex = TextLayout->GetLineModels().Num() + NumAddedMessages;
+
+		if (!Message)
+		{
+			continue;
+		}
+
+		Filter->AddAvailableLogCategory(Message->Category);
+		if (!Filter->IsMessageAllowed(Message))
+		{
+			continue;
+		}
+
+		++NumAddedMessages;
+
+		const FTextBlockStyle& MessageTextStyle = FSodaStyle::Get().GetWidgetStyle<FTextBlockStyle>(Message->Style);
+
+		TSharedRef<FString> LineText = Message->Message;
+
+		TArray<TSharedRef<IRun>> Runs;
+
+
+		switch (CategoryColorizationMode)
+		{
+		case ESodaLogCategoryColorizationMode::None:
+			Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle));
+			break;
+		case ESodaLogCategoryColorizationMode::ColorizeWholeLine:
+			{
+				const bool bUseCategoryColor = (Message->Verbosity > ELogVerbosity::Warning);
+				Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, bUseCategoryColor ? ComputeCategoryColor(MessageTextStyle, Message->Category) : MessageTextStyle));
+			}
+			break;
+		case ESodaLogCategoryColorizationMode::ColorizeCategoryOnly:
+			{
+				if (Message->CategoryStartIndex >= 0)
+				{
+					const int32 CategoryStartIndex = Message->CategoryStartIndex;
+					const int32 CategoryStopIndex = CategoryStartIndex + (int32)Message->Category.GetStringLength() + 1;
+					if (CategoryStartIndex > 0)
+					{
+						Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle, FTextRange(0, CategoryStartIndex)));
+					}
+					Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, ComputeCategoryColor(MessageTextStyle, Message->Category), FTextRange(CategoryStartIndex, CategoryStopIndex)));
+					Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle, FTextRange(CategoryStopIndex, LineText->Len())));
+				}
+				else
+				{
+					Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle));
+				}
+			}
+			break;
+		case ESodaLogCategoryColorizationMode::ColorizeCategoryAsBadge:
+			{
+				if (Message->CategoryStartIndex >= 0)
+				{
+					const int32 CategoryStartIndex = Message->CategoryStartIndex;
+					const int32 CategoryStopIndex = CategoryStartIndex + (int32)Message->Category.GetStringLength();
+
+					FTextBlockStyle BadgeStyle = ComputeCategoryColor(MessageTextStyle, Message->Category);
+					Highlights.Emplace(LineIndex, FTextRange(CategoryStartIndex, CategoryStopIndex), /*Zorder=*/ -20, FCategoryBadgeHighlighter::Create(BadgeStyle.ColorAndOpacity.GetSpecifiedColor()));
+					BadgeStyle.ColorAndOpacity = FLinearColor::Black;
+
+					if (CategoryStartIndex > 0)
+					{
+						Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle, FTextRange(0, CategoryStartIndex)));
+					}
+					Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, BadgeStyle, FTextRange(CategoryStartIndex, CategoryStopIndex)));
+					Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle, FTextRange(CategoryStopIndex, LineText->Len())));
+				}
+				else
+				{
+					Runs.Add(FSlateTextRun::Create(FRunInfo(), LineText, MessageTextStyle));
+				}
+			}
+			break;
+		}
+
+		if (!Message->Category.IsNone() && (Message->Category == CategoryToHighlight))
+		{
+			Highlights.Emplace(LineIndex, FTextRange(0, LineText->Len()), /*Zorder=*/ -5, FCategoryLineHighlighter::Create());
+		}
+
+		LinesToAdd.Emplace(MoveTemp(LineText), MoveTemp(Runs));
+	}
+
+	// Increment the cached message count if the log is not being rebuilt
+	if ( !IsDirty() )
+	{
+		CachedNumMessages += NumAddedMessages;
+	}
+
+	TextLayout->AddLines(LinesToAdd);
+
+	for (const FTextLineHighlight& Highlight : Highlights)
+	{
+		TextLayout->AddLineHighlight(Highlight);
+	}
+}
+
+void FOutputLogTextLayoutMarshaller::ClearMessages()
+{
+	NextPendingMessageIndex = 0;
+	Messages.Empty();
+	MakeDirty();
+}
+
+void FOutputLogTextLayoutMarshaller::CountMessages()
+{
+	// Do not re-count if not dirty
+	if (!bNumMessagesCacheDirty)
+	{
+		return;
+	}
+
+	CachedNumMessages = 0;
+
+	for (int32 MessageIndex = 0; MessageIndex < NextPendingMessageIndex; ++MessageIndex)
+	{
+		const TSharedPtr<FOutputLogMessage> CurrentMessage = Messages[MessageIndex];
+		if (Filter->IsMessageAllowed(CurrentMessage))
+		{
+			CachedNumMessages++;
+		}
+	}
+
+	// Cache re-built, remove dirty flag
+	bNumMessagesCacheDirty = false;
+}
+
+int32 FOutputLogTextLayoutMarshaller::GetNumMessages() const
+{
+	const int32 NumPendingMessages = Messages.Num() - NextPendingMessageIndex;
+	return Messages.Num() - NumPendingMessages;
+}
+
+int32 FOutputLogTextLayoutMarshaller::GetNumFilteredMessages()
+{
+	// No need to filter the messages if the filter is not set
+	if (!Filter->IsFilterSet())
+	{
+		return GetNumMessages();
+	}
+
+	// Re-count messages if filter changed before we refresh
+	if (bNumMessagesCacheDirty)
+	{
+		CountMessages();
+	}
+
+	return CachedNumMessages;
+}
+
+void FOutputLogTextLayoutMarshaller::MarkMessagesCacheAsDirty()
+{
+	bNumMessagesCacheDirty = true;
+}
+
+FName FOutputLogTextLayoutMarshaller::GetCategoryForLocation(const FTextLocation Location) const
+{
+	if (Messages.IsValidIndex(Location.GetLineIndex()))
+	{
+		return Messages[Location.GetLineIndex()]->Category;
+	}
+
+	return NAME_None;
+}
+
+FTextLocation FOutputLogTextLayoutMarshaller::GetTextLocationAt(const FVector2D& Relative) const
+{
+	return TextLayout ? TextLayout->GetTextLocationAt(Relative) : FTextLocation(INDEX_NONE, INDEX_NONE);
+}
+
+FOutputLogTextLayoutMarshaller::FOutputLogTextLayoutMarshaller(TArray< TSharedPtr<FOutputLogMessage> > InMessages, FOutputLogFilter* InFilter)
+	: Messages(MoveTemp(InMessages))
+	, NextPendingMessageIndex(0)
+	, CachedNumMessages(0)
+	, Filter(InFilter)
+	, TextLayout(nullptr)
+{
+}
+
+BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
+void SOutputLog::Construct( const FArguments& InArgs, bool bCreateDrawerDockButton)
+{
+	bShouldCreateDrawerDockButton = bCreateDrawerDockButton;
+	BuildInitialLogCategoryFilter(InArgs);
+
+	MessagesTextMarshaller = FOutputLogTextLayoutMarshaller::Create(InArgs._Messages, &Filter);
+
+	MessagesTextBox = SNew(SMultiLineEditableTextBox)
+		.Style(FSodaStyle::Get(), "Log.TextBox")
+		.Marshaller(MessagesTextMarshaller)
+		.IsReadOnly(true)
+		.AlwaysShowScrollbars(true)
+		.AutoWrapText(this, &SOutputLog::IsWordWrapEnabled)
+		.OnVScrollBarUserScrolled(this, &SOutputLog::OnUserScrolled)
+		.ContextMenuExtender(this, &SOutputLog::ExtendTextBoxMenu);
+
+	ChildSlot
+	.Padding(3)
+	[
+		SNew(SVerticalBox)
+
+		// Output Log Filter
+		+SVerticalBox::Slot()
+		.AutoHeight()
+		.Padding(FMargin(0.0f, 4.0f, 0.0f, 4.0f))
+		[
+			SNew(SHorizontalBox)
+			+SHorizontalBox::Slot()
+			.Padding(0, 0, 4, 0)
+			.FillWidth(.65f)
+			[
+				SAssignNew(FilterTextBox, SSearchBox)
+				.HintText(LOCTEXT("SearchLogHint", "Search Log"))
+				.OnTextChanged(this, &SOutputLog::OnFilterTextChanged)
+				.OnTextCommitted(this, &SOutputLog::OnFilterTextCommitted)
+				.DelayChangeNotificationsWhileTyping(true)
+			]
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.HAlign(HAlign_Left)
+			[
+				SNew(SComboButton)
+				.ComboButtonStyle(FSodaStyle::Get(), "SimpleComboButton")
+				.ToolTipText(LOCTEXT("AddFilterToolTip", "Add an output log filter."))
+				.OnGetMenuContent(this, &SOutputLog::MakeAddFilterMenu)
+				.ButtonContent()
+				[
+					SNew(SHorizontalBox)
+					+SHorizontalBox::Slot()
+					.AutoWidth()
+					[
+						SNew(SImage)
+						.Image(FSodaStyle::Get().GetBrush("Icons.Filter"))
+						.ColorAndOpacity(FSlateColor::UseForeground())
+					]
+					+SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(2, 0, 0, 0)
+					[
+						SNew(STextBlock)
+						.Text(LOCTEXT("Filters", "Filters"))
+						.ColorAndOpacity(FSlateColor::UseForeground())
+					]
+				]
+			]
+			+SHorizontalBox::Slot()
+			.HAlign(HAlign_Right)
+			.VAlign(VAlign_Center)
+			.Padding(4, 0)
+			[
+				CreateDrawerDockButton()
+			]
+			+ SHorizontalBox::Slot()
+			.HAlign(HAlign_Right)
+			.AutoWidth()
+			[
+				SNew(SComboButton)
+				.ComboButtonStyle(FSodaStyle::Get(), "SimpleComboButton")
+				.OnGetMenuContent(this, &SOutputLog::GetViewButtonContent, InArgs._SettingsMenuFlags)
+				.ButtonContent()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.VAlign(VAlign_Center)
+					[
+						SNew(SImage)
+						.Image(FSodaStyle::Get().GetBrush("Icons.Settings"))
+						.ColorAndOpacity(FSlateColor::UseForeground())
+					]
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(2, 0, 0, 0)
+					.VAlign(VAlign_Center)
+					[
+						SNew(STextBlock)
+						.Text(LOCTEXT("SettingsButton", "Settings"))
+						.ColorAndOpacity(FSlateColor::UseForeground())
+					]
+				]
+			]
+		]
+
+		// Output log area
+		+SVerticalBox::Slot()
+		.FillHeight(1)
+		[
+			MessagesTextBox.ToSharedRef()
+		]
+
+		// The console input box
+		+SVerticalBox::Slot()
+		.AutoHeight()
+		[
+			SAssignNew(ConsoleInputBox, SConsoleInputBox)
+			.OnConsoleCommandExecuted(this, &SOutputLog::OnConsoleCommandExecuted)
+			.OnCloseConsole(InArgs._OnCloseConsole)
+			// Always place suggestions above the input line for the output log widget
+			.SuggestionListPlacement(MenuPlacement_AboveAnchor) 
+		]
+	];
+
+	GLog->AddOutputDevice(this);
+
+#if WITH_EDITOR
+	// Listen for style changes
+	USodaOutputLogSettings* Settings = GetMutableDefault<USodaOutputLogSettings>();
+	SettingsWatchHandle = Settings->OnSettingChanged().AddRaw(this, &SOutputLog::HandleSettingChanged);
+#endif
+
+	bIsUserScrolled = false;
+	RequestForceScroll();
+}
+END_SLATE_FUNCTION_BUILD_OPTIMIZATION
+
+SOutputLog::~SOutputLog()
+{
+	if (GLog != nullptr)
+	{
+		GLog->RemoveOutputDevice(this);
+	}
+	FCoreDelegates::OnHandleSystemError.RemoveAll(this);
+
+#if WITH_EDITOR
+	if (UObjectInitialized() && !GExitPurge)
+	{
+		USodaOutputLogSettings* Settings = GetMutableDefault<USodaOutputLogSettings>();
+		Settings->OnSettingChanged().Remove(SettingsWatchHandle);
+	}
+#endif
+
+}
+
+void SOutputLog::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+{
+	if (MessagesTextMarshaller->SubmitPendingMessages())
+	{
+		// Don't scroll to the bottom automatically when the user is scrolling the view or has scrolled it away from the bottom.
+		RequestForceScroll(true);
+	}
+
+	SCompoundWidget::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+}
+
+static const FName NAME_StyleLogCommand(TEXT("Log.Command"));
+static const FName NAME_StyleLogError(TEXT("Log.Error"));
+static const FName NAME_StyleLogWarning(TEXT("Log.Warning"));
+static const FName NAME_StyleLogNormal(TEXT("Log.Normal"));
+
+bool SOutputLog::CreateLogMessages( const TCHAR* V, ELogVerbosity::Type Verbosity, const class FName& Category, TArray< TSharedPtr<FOutputLogMessage> >& OutMessages )
+{
+	if (Verbosity == ELogVerbosity::SetColor)
+	{
+		// Skip Color Events
+		return false;
+	}
+	else
+	{
+		// Get the style for this message. When piping output from child processes (e.g., when cooking through the editor), we want to highlight messages
+		// according to their original verbosity, so also check for "Error:" and "Warning:" substrings. This is consistent with how the build system processes logs.
+		FName Style;
+		if (Category == NAME_Cmd)
+		{
+			Style = NAME_StyleLogCommand;
+		}
+		else if (Verbosity == ELogVerbosity::Error || FCString::Stristr(V, TEXT("Error:")) != nullptr)
+		{
+			Style = NAME_StyleLogError;
+		}
+		else if (Verbosity == ELogVerbosity::Warning || FCString::Stristr(V, TEXT("Warning:")) != nullptr)
+		{
+			Style = NAME_StyleLogWarning;
+		}
+		else
+		{
+			Style = NAME_StyleLogNormal;
+		}
+
+		// Determine how to format timestamps
+		static ELogTimes::Type LogTimestampMode = ELogTimes::None;
+		if (UObjectInitialized() && !GExitPurge)
+		{
+			// Logging can happen very late during shutdown, even after the UObject system has been torn down, hence the init check above
+			LogTimestampMode = GetDefault<USodaOutputLogSettings>()->LogTimestampMode;
+		}
+
+		const int32 OldNumMessages = OutMessages.Num();
+
+		// handle multiline strings by breaking them apart by line
+		TArray<FTextRange> LineRanges;
+		FString CurrentLogDump = V;
+		FTextRange::CalculateLineRangesFromString(CurrentLogDump, LineRanges);
+
+		bool bIsFirstLineInMessage = true;
+		for (const FTextRange& LineRange : LineRanges)
+		{
+			if (!LineRange.IsEmpty())
+			{
+				FString Line = CurrentLogDump.Mid(LineRange.BeginIndex, LineRange.Len());
+				Line = Line.ConvertTabsToSpaces(4);
+
+				// Hard-wrap lines to avoid them being too long
+				static const int32 HardWrapLen = 600;
+				for (int32 CurrentStartIndex = 0; CurrentStartIndex < Line.Len();)
+				{
+					int32 HardWrapLineLen = 0;
+					if (bIsFirstLineInMessage)
+					{
+						int32 CategoryStartIndex;
+						const FString MessagePrefix = FOutputDeviceHelper::FormatLogLine(Verbosity, Category, nullptr, LogTimestampMode, -1.0, /*out*/ &CategoryStartIndex);
+						
+						HardWrapLineLen = FMath::Min(HardWrapLen - MessagePrefix.Len(), Line.Len() - CurrentStartIndex);
+						const FString HardWrapLine = Line.Mid(CurrentStartIndex, HardWrapLineLen);
+
+						OutMessages.Add(MakeShared<FOutputLogMessage>(MakeShared<FString>(MessagePrefix + HardWrapLine), Verbosity, Category, Style, CategoryStartIndex));
+					}
+					else
+					{
+						HardWrapLineLen = FMath::Min(HardWrapLen, Line.Len() - CurrentStartIndex);
+						FString HardWrapLine = Line.Mid(CurrentStartIndex, HardWrapLineLen);
+						
+						OutMessages.Add(MakeShared<FOutputLogMessage>(MakeShared<FString>(MoveTemp(HardWrapLine)), Verbosity, Category, Style, INDEX_NONE));
+					}
+
+					bIsFirstLineInMessage = false;
+					CurrentStartIndex += HardWrapLineLen;
+				}
+			}
+		}
+
+		return OldNumMessages != OutMessages.Num();
+	}
+}
+
+void SOutputLog::Serialize(const TCHAR* V, ELogVerbosity::Type Verbosity, const class FName& Category)
+{
+	MessagesTextMarshaller->AppendPendingMessage(V, Verbosity, Category);
+}
+
+void SOutputLog::ExtendTextBoxMenu(FMenuBuilder& Builder)
+{
+	FUIAction ClearOutputLogAction(
+		FExecuteAction::CreateRaw( this, &SOutputLog::OnClearLog ),
+		FCanExecuteAction::CreateSP( this, &SOutputLog::CanClearLog )
+		);
+
+	Builder.AddMenuEntry(
+		NSLOCTEXT("OutputLog", "ClearLogLabel", "Clear Log"), 
+		NSLOCTEXT("OutputLog", "ClearLogTooltip", "Clears all log messages"), 
+		FSlateIcon(), 
+		ClearOutputLogAction
+		);
+
+	const FVector2D CursorPos = FSlateApplication::Get().GetCursorPos();
+	const FVector2D RelativeCursorPos = MessagesTextBox->GetTickSpaceGeometry().AbsoluteToLocal(CursorPos);
+	const FTextLocation CursorTextLocation = MessagesTextMarshaller->GetTextLocationAt(RelativeCursorPos);
+
+	if (CursorTextLocation.IsValid())
+	{
+		const FName CategoryName = MessagesTextMarshaller->GetCategoryForLocation(CursorTextLocation);
+
+		if (!CategoryName.IsNone())
+		{
+			Builder.BeginSection(NAME_None, FText::Format(LOCTEXT("CategoryActionsSectionHeading", "Category {0}"), FText::FromName(CategoryName)));
+
+			if (CategoryName == MessagesTextMarshaller->GetCategoryToHighlight())
+			{
+				FUIAction StopHighlightingCategoryAction(
+					FExecuteAction::CreateRaw(this, &SOutputLog::OnHighlightCategory, FName())
+				);
+
+				Builder.AddMenuEntry(
+					LOCTEXT("StopHighlightCategoryAction", "Remove category highlights"),
+					LOCTEXT("StopHighlightCategoryActionTooltip", "Stop highlighting all messages for this category"),
+					FSlateIcon(),
+					StopHighlightingCategoryAction
+				);
+			}
+			else
+			{
+				FUIAction HighlightCategoryAction(
+					FExecuteAction::CreateRaw(this, &SOutputLog::OnHighlightCategory, CategoryName)
+				);
+
+				Builder.AddMenuEntry(
+					FText::Format(LOCTEXT("HighlightCategoryAction", "Highlight category {0}"), FText::FromName(CategoryName)),
+					LOCTEXT("HighlightCategoryActionTooltip", "Highlights all messages for this category"),
+					FSlateIcon(),
+					HighlightCategoryAction
+				);
+			}
+
+			Builder.EndSection();
+		}
+	}
+}
+
+void SOutputLog::OnClearLog()
+{
+	// Make sure the cursor is back at the start of the log before we clear it
+	MessagesTextBox->GoTo(FTextLocation(0));
+
+	MessagesTextMarshaller->ClearMessages();
+	MessagesTextBox->Refresh();
+	bIsUserScrolled = false;
+}
+
+void SOutputLog::OnHighlightCategory(FName NewCategoryToHighlight)
+{
+	MessagesTextMarshaller->SetCategoryToHighlight(NewCategoryToHighlight);
+
+	RefreshAllPreservingLocation();
+}
+
+void SOutputLog::HandleSettingChanged(FName ChangedSettingName)
+{
+	RefreshAllPreservingLocation();
+}
+
+void SOutputLog::RefreshAllPreservingLocation()
+{
+	const FTextLocation LastCursorTextLocation = MessagesTextBox->GetCursorLocation();
+
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+	MessagesTextMarshaller->MakeDirty();
+	MessagesTextBox->Refresh();
+
+	//@TODO: Without this, the window will scroll if the last 'normally clicked location' is not on screen
+	// (even with the right-click set cursor pos fix, the refresh will scroll you back to the top of the screen
+	// until you left click, or to where you last left clicked otherwise if off screen; spooky...)
+	// Ideally we could read the current location or fix the bug where a refresh causes a scroll
+	MessagesTextBox->GoTo(LastCursorTextLocation);
+}
+
+void SOutputLog::OnUserScrolled(float ScrollOffset)
+{
+	bIsUserScrolled = ScrollOffset < 1.0 && !FMath::IsNearlyEqual(ScrollOffset, 1.0f);
+}
+
+bool SOutputLog::CanClearLog() const
+{
+	return MessagesTextMarshaller->GetNumMessages() > 0;
+}
+
+void SOutputLog::FocusConsoleCommandBox()
+{
+	FSlateApplication::Get().SetKeyboardFocus(ConsoleInputBox->GetEditableTextBox(), EFocusCause::SetDirectly);
+}
+
+void SOutputLog::OnConsoleCommandExecuted()
+{
+	// Submit pending messages when executing a command to keep the log feeling responsive to input
+	MessagesTextMarshaller->SubmitPendingMessages();
+	RequestForceScroll();
+}
+
+void SOutputLog::RequestForceScroll(bool bIfUserHasNotScrolledUp)
+{
+	if (MessagesTextMarshaller->GetNumFilteredMessages() > 0
+		&& (!bIfUserHasNotScrolledUp || !bIsUserScrolled))
+	{
+		MessagesTextBox->ScrollTo(ETextLocation::EndOfDocument);
+		bIsUserScrolled = false;
+	}
+}
+
+void SOutputLog::Refresh()
+{
+	// Re-count messages if filter changed before we refresh
+	MessagesTextMarshaller->CountMessages();
+
+	MessagesTextBox->GoTo(FTextLocation(0));
+	MessagesTextMarshaller->MakeDirty();
+	MessagesTextBox->Refresh();
+	RequestForceScroll();
+}
+
+bool SOutputLog::IsWordWrapEnabled() const
+{
+	const USodaOutputLogSettings* Settings = GetDefault<USodaOutputLogSettings>();
+	return Settings ? Settings->bEnableOutputLogWordWrap : false;
+}
+
+void SOutputLog::SetWordWrapEnabled(ECheckBoxState InValue)
+{
+	const bool bWordWrapEnabled = (InValue == ECheckBoxState::Checked);
+	USodaOutputLogSettings* Settings = GetMutableDefault<USodaOutputLogSettings>();
+	if (Settings)
+	{
+		Settings->bEnableOutputLogWordWrap = bWordWrapEnabled;
+		Settings->SaveConfig();
+	}
+
+	RequestForceScroll(true);
+}
+
+ELogTimes::Type SOutputLog::GetSelectedTimestampMode() 
+{
+	const USodaOutputLogSettings* Settings = GetDefault<USodaOutputLogSettings>();
+	return Settings->LogTimestampMode;
+}
+
+bool SOutputLog::IsSelectedTimestampMode(ELogTimes::Type NewType)
+{
+	return GetSelectedTimestampMode() == NewType;
+}
+
+void SOutputLog::AddTimestampMenuSection(FMenuBuilder& Menu)
+{
+
+	Menu.BeginSection("LoggingTimestampSection");
+	{
+		const UEnum* Enum = StaticEnum<ELogTimes::Type>();
+
+		for (int CurrentTimeStampType = 0; CurrentTimeStampType < Enum->NumEnums() - 1; CurrentTimeStampType++)
+		{
+			
+			ELogTimes::Type TimeStampType = static_cast<ELogTimes::Type>(CurrentTimeStampType);
+			FText Tooltip;
+
+			#if WITH_EDITOR
+				Tooltip = Enum->GetToolTipTextByIndex(CurrentTimeStampType);
+			#endif // WITH_EDITOR
+			
+			Menu.AddMenuEntry(Enum->GetDisplayNameTextByIndex(CurrentTimeStampType),
+				Tooltip,
+				FSlateIcon(),
+				FUIAction(
+					FExecuteAction::CreateLambda([this, TimeStampType] {
+						SetTimestampMode(TimeStampType);
+						}),
+					FCanExecuteAction::CreateLambda([] { return true; }),
+					FIsActionChecked::CreateLambda([this, TimeStampType] { return IsSelectedTimestampMode(TimeStampType); })
+							),
+				NAME_None,
+				EUserInterfaceActionType::RadioButton);
+
+		}
+	}
+	Menu.EndSection();
+}
+
+void SOutputLog::SetTimestampMode(ELogTimes::Type InValue)
+{
+	 USodaOutputLogSettings* Settings = GetMutableDefault<USodaOutputLogSettings>();
+	if (Settings)
+	{
+		Settings->LogTimestampMode = InValue;
+		Settings->SaveConfig();
+	}
+	RequestForceScroll(true);
+}
+
+#if WITH_EDITOR
+bool SOutputLog::IsClearOnPIEEnabled() const
+{
+	const USodaOutputLogSettings* Settings = GetDefault<USodaOutputLogSettings>();
+	return Settings ? Settings->bEnableOutputLogClearOnPIE : false;
+}
+
+void SOutputLog::SetClearOnPIE(ECheckBoxState InValue)
+{
+	const bool bClearOnPIEEnabled = (InValue == ECheckBoxState::Checked);
+	USodaOutputLogSettings* Settings = GetMutableDefault<USodaOutputLogSettings>();
+	if (Settings)
+	{
+		Settings->bEnableOutputLogClearOnPIE = bClearOnPIEEnabled;
+		Settings->SaveConfig();
+	}
+}
+#endif
+
+void SOutputLog::BuildInitialLogCategoryFilter(const FArguments& InArgs)
+{
+	for (const auto& Message : InArgs._Messages)
+	{
+		Filter.AddAvailableLogCategory(Message->Category);
+		const bool bIsDeselectedByDefault = InArgs._AllowInitialLogCategory.IsBound() && !InArgs._AllowInitialLogCategory.Execute(Message->Category);
+		if (bIsDeselectedByDefault && Filter.IsLogCategoryEnabled(Message->Category))
+		{
+			Filter.bShowAllCategories = false;
+			Filter.ToggleLogCategory(Message->Category);
+		}
+	}
+
+	for (auto DefaultCategorySelectionIt = InArgs._DefaultCategorySelection.CreateConstIterator(); DefaultCategorySelectionIt; ++DefaultCategorySelectionIt)
+	{
+		const FName Category = DefaultCategorySelectionIt->Key;
+		Filter.AddAvailableLogCategory(Category);
+
+		Filter.bShowAllCategories &= DefaultCategorySelectionIt->Value;
+		if (Filter.IsLogCategoryEnabled(Category) != DefaultCategorySelectionIt->Value)
+		{
+			Filter.ToggleLogCategory(Category);
+		}
+	}
+}
+
+void SOutputLog::OnFilterTextChanged(const FText& InFilterText)
+{
+	if (Filter.GetFilterText().ToString().Equals(InFilterText.ToString(), ESearchCase::CaseSensitive))
+	{
+		// nothing to do
+		return;
+	}
+
+	// Flag the messages count as dirty
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+
+	// Set filter phrases
+	Filter.SetFilterText(InFilterText);
+
+	// Report possible syntax errors back to the user
+	FilterTextBox->SetError(Filter.GetSyntaxErrors());
+
+	// Repopulate the list to show only what has not been filtered out.
+	Refresh();
+
+	// Apply the new search text
+	MessagesTextBox->BeginSearch(InFilterText);
+}
+
+void SOutputLog::OnFilterTextCommitted(const FText& InFilterText, ETextCommit::Type InCommitType)
+{
+	OnFilterTextChanged(InFilterText);
+}
+
+TSharedRef<SWidget> SOutputLog::MakeAddFilterMenu()
+{
+	FMenuBuilder MenuBuilder(/*bInShouldCloseWindowAfterMenuSelection=*/true, nullptr);
+	
+	MenuBuilder.BeginSection("OutputLogVerbosityEntries", LOCTEXT("OutputLogVerbosityHeading", "Verbosity"));
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("ShowMessages", "Messages"), 
+			LOCTEXT("ShowMessages_Tooltip", "Filter the Output Log to show messages"), 
+			FSlateIcon(), 
+			FUIAction(FExecuteAction::CreateSP(this, &SOutputLog::VerbosityLogs_Execute), 
+				FCanExecuteAction::CreateLambda([] { return true; }), 
+				FIsActionChecked::CreateSP(this, &SOutputLog::VerbosityLogs_IsChecked)), 
+			NAME_None, 
+			EUserInterfaceActionType::ToggleButton
+		);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("ShowWarnings", "Warnings"), 
+			LOCTEXT("ShowWarnings_Tooltip", "Filter the Output Log to show warnings"), 
+			FSlateIcon(), 
+			FUIAction(FExecuteAction::CreateSP(this, &SOutputLog::VerbosityWarnings_Execute), 
+				FCanExecuteAction::CreateLambda([] { return true; }), 
+				FIsActionChecked::CreateSP(this, &SOutputLog::VerbosityWarnings_IsChecked)), 
+			NAME_None, 
+			EUserInterfaceActionType::ToggleButton
+		);
+
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("ShowErrors", "Errors"), 
+			LOCTEXT("ShowErrors_Tooltip", "Filter the Output Log to show errors"), 
+			FSlateIcon(), 
+			FUIAction(FExecuteAction::CreateSP(this, &SOutputLog::VerbosityErrors_Execute), 
+				FCanExecuteAction::CreateLambda([] { return true; }), 
+				FIsActionChecked::CreateSP(this, &SOutputLog::VerbosityErrors_IsChecked)), 
+			NAME_None, 
+			EUserInterfaceActionType::ToggleButton
+		);
+	}
+	MenuBuilder.EndSection();
+
+	MenuBuilder.BeginSection("OutputLogMiscEntries", LOCTEXT("OutputLogMiscHeading", "Miscellaneous"));
+	{
+		MenuBuilder.AddSubMenu(
+			LOCTEXT("Categories", "Categories"), 
+			LOCTEXT("SelectCategoriesToolTip", "Select Categories to display."), 
+			FNewMenuDelegate::CreateSP(this, &SOutputLog::MakeSelectCategoriesSubMenu)
+		);
+	}
+
+	return MenuBuilder.MakeWidget();
+}
+
+void SOutputLog::MakeSelectCategoriesSubMenu(FMenuBuilder& MenuBuilder)
+{
+	MenuBuilder.BeginSection("OutputLogCategoriesEntries");
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("ShowAllCategories", "Show All"),
+			LOCTEXT("ShowAllCategories_Tooltip", "Filter the Output Log to show all categories"),
+			FSlateIcon(),
+			FUIAction(FExecuteAction::CreateSP(this, &SOutputLog::CategoriesShowAll_Execute),
+			FCanExecuteAction::CreateLambda([] { return true; }),
+			FIsActionChecked::CreateSP(this, &SOutputLog::CategoriesShowAll_IsChecked)),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+		
+		for (const FName& Category : Filter.GetAvailableLogCategories())
+		{
+			MenuBuilder.AddMenuEntry(
+				FText::AsCultureInvariant(Category.ToString()),
+				FText::Format(LOCTEXT("Category_Tooltip", "Filter the Output Log to show category: {0}"), FText::AsCultureInvariant(Category.ToString())),
+				FSlateIcon(),
+				FUIAction(FExecuteAction::CreateSP(this, &SOutputLog::CategoriesSingle_Execute, Category),
+				FCanExecuteAction::CreateLambda([] { return true; }),
+				FIsActionChecked::CreateSP(this, &SOutputLog::CategoriesSingle_IsChecked, Category)),
+				NAME_None,
+				EUserInterfaceActionType::ToggleButton
+			);
+		}
+	}
+	MenuBuilder.EndSection();
+}
+
+bool SOutputLog::VerbosityLogs_IsChecked() const
+{
+	return Filter.bShowLogs;
+}
+
+bool SOutputLog::VerbosityWarnings_IsChecked() const
+{
+	return Filter.bShowWarnings;
+}
+
+bool SOutputLog::VerbosityErrors_IsChecked() const
+{
+	return Filter.bShowErrors;
+}
+
+void SOutputLog::VerbosityLogs_Execute()
+{ 
+	Filter.bShowLogs = !Filter.bShowLogs;
+
+	// Flag the messages count as dirty
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+
+	Refresh();
+}
+
+void SOutputLog::VerbosityWarnings_Execute()
+{
+	Filter.bShowWarnings = !Filter.bShowWarnings;
+
+	// Flag the messages count as dirty
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+
+	Refresh();
+}
+
+void SOutputLog::VerbosityErrors_Execute()
+{
+	Filter.bShowErrors = !Filter.bShowErrors;
+
+	// Flag the messages count as dirty
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+
+	Refresh();
+}
+
+bool SOutputLog::CategoriesShowAll_IsChecked() const
+{
+	return Filter.bShowAllCategories;
+}
+
+bool SOutputLog::CategoriesSingle_IsChecked(FName InName) const
+{
+	return Filter.IsLogCategoryEnabled(InName);
+}
+
+void SOutputLog::CategoriesShowAll_Execute()
+{
+	Filter.bShowAllCategories = !Filter.bShowAllCategories;
+
+	Filter.ClearSelectedLogCategories();
+	if (Filter.bShowAllCategories)
+	{
+		for (const auto& AvailableCategory : Filter.GetAvailableLogCategories())
+		{
+			Filter.ToggleLogCategory(AvailableCategory);
+		}
+	}
+
+	// Flag the messages count as dirty
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+
+	Refresh();
+}
+
+void SOutputLog::CategoriesSingle_Execute(FName InName)
+{
+	Filter.ToggleLogCategory(InName);
+
+	// Flag the messages count as dirty
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+
+	Refresh();
+}
+
+void SOutputLog::UpdateOutputLogFilter(const TArray<FName>& CategoriesToShow, TOptional<bool> bShowErrors, TOptional<bool> bShowWarnings, TOptional<bool> bShowLogs)
+{
+	if (bShowErrors.IsSet())
+	{
+		Filter.bShowErrors = bShowErrors.GetValue();
+	}
+	if (bShowWarnings.IsSet())
+	{
+		Filter.bShowWarnings = bShowWarnings.GetValue();
+	}
+	if (bShowLogs.IsSet())
+	{
+		Filter.bShowLogs = bShowLogs.GetValue();
+	}
+
+	// Show all categories if empty list is passed in. This means there's no way to change the Show* bools
+	// and also leave the categories as-is, but that use case is probably minimal. It can be added if needed.
+	Filter.bShowAllCategories = CategoriesToShow.Num() == 0;
+	Filter.ClearSelectedLogCategories();
+	const TArray<FName> ActualCategoriesToShow = Filter.bShowAllCategories ? Filter.GetAvailableLogCategories() : CategoriesToShow;
+	for (const auto& AvailableCategory : ActualCategoriesToShow)
+	{
+		Filter.ToggleLogCategory(AvailableCategory);
+	}
+
+	MessagesTextMarshaller->MarkMessagesCacheAsDirty();
+	Refresh();
+}
+
+TSharedRef<SWidget> SOutputLog::GetViewButtonContent(EOutputLogSettingsMenuFlags Flags)
+{
+	TSharedPtr<FExtender> Extender;
+	FMenuBuilder MenuBuilder(true, nullptr, Extender, true);
+
+	const bool bSupportWordWrapping = (Flags & EOutputLogSettingsMenuFlags::SkipEnableWordWrapping) == EOutputLogSettingsMenuFlags::None;
+	if (bSupportWordWrapping)
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("WordWrapEnabledOption", "Enable Word Wrapping"),
+			LOCTEXT("WordWrapEnabledOptionToolTip", "Enable word wrapping in the Output Log."),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateLambda([this] {
+					// This is a toggle, hence that it is inverted
+					SetWordWrapEnabled(IsWordWrapEnabled() ? ECheckBoxState::Unchecked : ECheckBoxState::Checked);
+				}),
+				FCanExecuteAction::CreateLambda([] { return true; }),
+				FIsActionChecked::CreateSP(this, &SOutputLog::IsWordWrapEnabled)
+			),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+	}
+	FText Tooltip;
+
+	#if WITH_EDITORONLY_DATA
+		Tooltip = USodaOutputLogSettings::StaticClass()->FindPropertyByName(
+			GET_MEMBER_NAME_CHECKED(USodaOutputLogSettings, LogTimestampMode))->GetToolTipText();
+	#endif // WITH_EDITORONLY_DATA
+	MenuBuilder.AddSubMenu(
+		TAttribute<FText>::CreateLambda([this]()
+			{
+				const UEnum* Enum = StaticEnum<ELogTimes::Type>();
+				return FText::Format(LOCTEXT("TimestampsSubmenu", "Timestamp Mode: {0}"),
+					Enum->GetDisplayNameTextByIndex(this->GetSelectedTimestampMode()));
+			}),
+		Tooltip,
+		FNewMenuDelegate::CreateSP(this, &SOutputLog::AddTimestampMenuSection));
+
+
+#if WITH_EDITOR
+	const bool bSupportClearOnPie = (Flags & EOutputLogSettingsMenuFlags::SkipClearOnPie) == EOutputLogSettingsMenuFlags::None;
+	if (bSupportClearOnPie)
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("ClearOnPIE", "Clear on PIE"),
+			LOCTEXT("ClearOnPIEToolTip", "Enable clearing of the Output Log on PIE startup."),
+			FSlateIcon(),
+			FUIAction(
+				FExecuteAction::CreateLambda([this] {
+					// This is a toggle, hence that it is inverted
+					SetClearOnPIE(IsClearOnPIEEnabled() ? ECheckBoxState::Unchecked : ECheckBoxState::Checked);
+				}),
+				FCanExecuteAction::CreateLambda([] { return true; }),
+				FIsActionChecked::CreateSP(this, &SOutputLog::IsClearOnPIEEnabled)
+			),
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton
+		);
+	}
+#else
+	constexpr bool bSupportClearOnPie = false;
+#endif
+
+	const bool bSupportSourceLocation = (Flags & EOutputLogSettingsMenuFlags::SkipOpenSourceButton) == EOutputLogSettingsMenuFlags::None;
+	const bool bSupportExternalEditor = (Flags & EOutputLogSettingsMenuFlags::SkipOpenInExternalEditorButton) == EOutputLogSettingsMenuFlags::None;
+	const bool bNeedsSeparator = (bSupportWordWrapping || bSupportClearOnPie) && (bSupportSourceLocation || bSupportExternalEditor);
+	if (bNeedsSeparator)
+	{
+		MenuBuilder.AddMenuSeparator();
+	}
+
+	if (bSupportSourceLocation)
+	{
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("FindSourceFile", "Open Source Location"),
+			LOCTEXT("FindSourceFileTooltip", "Opens the folder containing the source of the Output Log."),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "OutputLog.OpenSourceLocation"),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SOutputLog::OpenLogFileInExplorer)
+			)
+		);
+	}
+	
+	if (bSupportExternalEditor)
+	{
+		// Open In External Editor
+		MenuBuilder.AddMenuEntry(
+			LOCTEXT("OpenInExternalEditor", "Open In External Editor"),
+			LOCTEXT("OpenInExternalEditorTooltip", "Opens the Output Log in the default external editor."),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "OutputLog.OpenInExternalEditor"),
+			FUIAction(
+				FExecuteAction::CreateSP(this, &SOutputLog::OpenLogFileInExternalEditor)
+			)
+		);
+	}
+
+	return MenuBuilder.MakeWidget();
+}
+
+TSharedRef<SWidget> SOutputLog::CreateDrawerDockButton()
+{
+	/*
+	if (bShouldCreateDrawerDockButton)
+	{
+		return
+			SNew(SButton)
+			.ButtonStyle(FSodaStyle::Get(), "SimpleButton")
+			.ToolTipText(LOCTEXT("DockInLayout_Tooltip", "Docks this output log in the current layout.\nThe drawer will still be usable as a temporary log."))
+			.ContentPadding(FMargin(1, 0))
+			.Visibility_Lambda(
+				[]()
+				{
+					return FOutputLogModule::Get().GetOutputLogTab() == nullptr ? EVisibility::Visible : EVisibility::Hidden;
+				})
+			.OnClicked(this, &SOutputLog::OnDockInLayoutClicked)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				.Padding(4.0, 0.0f)
+				[
+					SNew(SImage)
+					.ColorAndOpacity(FSlateColor::UseForeground())
+					.Image(FSodaStyle::Get().GetBrush("Icons.Layout"))
+				]
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.Padding(4.0, 0.0f)
+				[
+					SNew(STextBlock)
+					.Text(LOCTEXT("DockInLayout", "Dock in Layout"))
+					.ColorAndOpacity(FSlateColor::UseForeground())
+				]
+			];
+	}
+	*/
+
+	return SNullWidget::NullWidget;
+}
+
+void SOutputLog::OpenLogFileInExplorer()
+{
+	FString Path = FPaths::ConvertRelativePathToFull(FPaths::ProjectLogDir());
+	if (!Path.Len() || !IFileManager::Get().DirectoryExists(*Path))
+	{
+		return;
+	}
+
+	FPlatformProcess::ExploreFolder(*FPaths::GetPath(Path));
+}
+
+void SOutputLog::OpenLogFileInExternalEditor()
+{
+	FString Path = FPaths::ConvertRelativePathToFull(FGenericPlatformOutputDevices::GetAbsoluteLogFilename());
+	if (!Path.Len() || IFileManager::Get().FileSize(*Path) == INDEX_NONE)
+	{
+		return;
+	}
+
+	FPlatformProcess::LaunchFileInDefaultExternalApplication(*Path, NULL, ELaunchVerb::Open);
+}
+
+FReply SOutputLog::OnDockInLayoutClicked()
+{
+	TSharedPtr<SDockTab> DockedTab;
+
+	static const FName OutputLogTabName = FName("OutputLog");
+	if (TSharedPtr<SDockTab> ActiveTab = FGlobalTabmanager::Get()->GetActiveTab())
+	{
+		if (TSharedPtr<FTabManager> TabManager = ActiveTab->GetTabManagerPtr())
+		{
+			DockedTab = TabManager->TryInvokeTab(OutputLogTabName);
+		}
+	}
+	
+	if (!DockedTab)
+	{
+		FGlobalTabmanager::Get()->TryInvokeTab(OutputLogTabName);
+	}
+
+	return FReply::Handled();
+}
+
+
+bool FOutputLogFilter::IsMessageAllowed(const TSharedPtr<FOutputLogMessage>& Message)
+{
+	// Filter Verbosity
+	{
+		if (Message->Verbosity == ELogVerbosity::Error && !bShowErrors)
+		{
+			return false;
+		}
+
+		if (Message->Verbosity == ELogVerbosity::Warning && !bShowWarnings)
+		{
+			return false;
+		}
+
+		if (Message->Verbosity != ELogVerbosity::Error && Message->Verbosity != ELogVerbosity::Warning && !bShowLogs)
+		{
+			return false;
+		}
+	}
+
+	// Filter by Category
+	{
+		if (!IsLogCategoryEnabled(Message->Category))
+		{
+			return false;
+		}
+	}
+
+	// Filter search phrase
+	{
+		if (!TextFilterExpressionEvaluator.TestTextFilter(FLogFilter_TextFilterExpressionContextOutputLog(*Message)))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+void FOutputLogFilter::AddAvailableLogCategory(const FName& LogCategory)
+{
+	// Use an insert-sort to keep AvailableLogCategories alphabetically sorted
+	int32 InsertIndex = 0;
+	for (InsertIndex = AvailableLogCategories.Num()-1; InsertIndex >= 0; --InsertIndex)
+	{
+		FName CheckCategory = AvailableLogCategories[InsertIndex];
+		// No duplicates
+		if (CheckCategory == LogCategory)
+		{
+			return;
+		}
+		else if (CheckCategory.Compare(LogCategory) < 0)
+		{
+			break;
+		}
+	}
+	AvailableLogCategories.Insert(LogCategory, InsertIndex+1);
+	if (bShowAllCategories)
+	{
+		ToggleLogCategory(LogCategory);
+	}
+}
+
+void FOutputLogFilter::ToggleLogCategory(const FName& LogCategory)
+{
+	int32 FoundIndex = SelectedLogCategories.Find(LogCategory);
+	if (FoundIndex == INDEX_NONE)
+	{
+		SelectedLogCategories.Add(LogCategory);
+	}
+	else
+	{
+		SelectedLogCategories.RemoveAt(FoundIndex, /*Count=*/1, /*bAllowShrinking=*/false);
+	}
+}
+
+bool FOutputLogFilter::IsLogCategoryEnabled(const FName& LogCategory) const
+{
+	return SelectedLogCategories.Contains(LogCategory);
+}
+
+void FOutputLogFilter::ClearSelectedLogCategories()
+{
+	// No need to churn memory each time the selected categories are cleared
+	SelectedLogCategories.Reset();
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/SOutputLog.h b/Source/UnrealSoda/Private/UI/SOutputLog.h
new file mode 100644
index 0000000..cc6fefb
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SOutputLog.h
@@ -0,0 +1,649 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SlateFwd.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Input/Reply.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Input/SMultiLineEditableTextBox.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "Framework/Text/BaseTextLayoutMarshaller.h"
+#include "Misc/TextFilterExpressionEvaluator.h"
+#include "HAL/CriticalSection.h"
+#include "HAL/IConsoleManager.h"
+
+class FMenuBuilder;
+class FTextLayout;
+class SMenuAnchor;
+class IModularFeature;
+
+namespace soda
+{
+class FOutputLogTextLayoutMarshaller;
+
+enum class EOutputLogSettingsMenuFlags
+{
+	None = 0x00,
+
+	/** The clear on Pie button should not be created */
+	SkipClearOnPie = 0x01,
+	/** The Enable world wrapping button should not be created */
+	SkipEnableWordWrapping = 0x02,
+
+	/** Skip the button that opens the source folder of the output log module */
+	SkipOpenSourceButton = 0x03,
+	/** Skip the button which opens the log in a text editor */
+	SkipOpenInExternalEditorButton = 0x04
+	
+};
+ENUM_CLASS_FLAGS(EOutputLogSettingsMenuFlags)
+
+DECLARE_DELEGATE_RetVal_OneParam(bool, FAllowLogCategoryCallback, const FName);
+using FDefaultCategorySelectionMap = TMap<FName, bool>;
+
+struct FOutputLogCreationParams
+{
+	/** Whether to create the button for docking the log */
+	bool bCreateDockInLayoutButton = false;
+
+	/** Determines what entries the Settings drop-down will ignore */
+	EOutputLogSettingsMenuFlags SettingsMenuCreationFlags = EOutputLogSettingsMenuFlags::None;
+
+	/** Called when building the initial set of selected log categories */
+	FAllowLogCategoryCallback AllowAsInitialLogCategory;
+
+	/** Maps each log category to whether it should be selected or deselected by default. The caller is responsible to enter valid category names. */
+	FDefaultCategorySelectionMap DefaultCategorySelection;
+	
+	FSimpleDelegate OnCloseConsole;
+};
+
+/**
+* A single log message for the output log, holding a message and
+* a style, for color and bolding of the message.
+*/
+struct FOutputLogMessage
+{
+	TSharedRef<FString> Message;
+	ELogVerbosity::Type Verbosity;
+	int8 CategoryStartIndex;
+	FName Category;
+	FName Style;
+
+	FOutputLogMessage(const TSharedRef<FString>& NewMessage, ELogVerbosity::Type NewVerbosity, FName NewCategory, FName NewStyle, int32 InCategoryStartIndex)
+		: Message(NewMessage)
+		, Verbosity(NewVerbosity)
+		, CategoryStartIndex((int8)InCategoryStartIndex)
+		, Category(NewCategory)
+		, Style(NewStyle)
+	{
+	}
+};
+
+/**
+ * Console input box with command-completion support
+ */
+class SConsoleInputBox
+	: public SCompoundWidget
+{
+
+public:
+	DECLARE_DELEGATE_OneParam(FExecuteConsoleCommand, const FString& /*ExecCommand*/)
+
+	SLATE_BEGIN_ARGS( SConsoleInputBox )
+		: _SuggestionListPlacement( MenuPlacement_BelowAnchor )
+		{}
+
+		/** Where to place the suggestion list */
+		SLATE_ARGUMENT( EMenuPlacement, SuggestionListPlacement )
+
+		/** Custom executor for console command, will be used when bound */
+		SLATE_EVENT( FExecuteConsoleCommand, ConsoleCommandCustomExec)
+
+		/** Called when a console command is executed */
+		SLATE_EVENT( FSimpleDelegate, OnConsoleCommandExecuted )
+
+		/** Delegate to call to close the console */
+		SLATE_EVENT( FSimpleDelegate, OnCloseConsole )
+	SLATE_END_ARGS()
+
+	/** Protected console input box widget constructor, called by Slate */
+	SConsoleInputBox();
+
+	/**
+	 * Construct this widget.  Called by the SNew() Slate macro.
+	 *
+	 * @param	InArgs	Declaration used by the SNew() macro to construct this widget
+	 */
+	void Construct( const FArguments& InArgs );
+
+	/** Returns the editable text box associated with this widget.  Used to set focus directly. */
+	TSharedRef< SMultiLineEditableTextBox > GetEditableTextBox()
+	{
+		return InputText.ToSharedRef();
+	}
+
+	/** SWidget interface */
+	virtual void Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime ) override;
+
+protected:
+
+	virtual bool SupportsKeyboardFocus() const override { return true; }
+
+	// e.g. Tab or Key_Up
+	virtual FReply OnPreviewKeyDown( const FGeometry& MyGeometry, const FKeyEvent& KeyEvent ) override;
+
+	void OnFocusLost( const FFocusEvent& InFocusEvent ) override;
+
+	/** Handles entering in a command */
+	void OnTextCommitted(const FText& InText, ETextCommit::Type CommitInfo);
+
+	void OnTextChanged(const FText& InText);
+
+	/** Get the maximum width of the selection list */
+	FOptionalSize GetSelectionListMaxWidth() const;
+
+	/** Makes the widget for the suggestions messages in the list view */
+	TSharedRef<ITableRow> MakeSuggestionListItemWidget(TSharedPtr<FString> Message, const TSharedRef<STableViewBase>& OwnerTable);
+
+	void SuggestionSelectionChanged(TSharedPtr<FString> NewValue, ESelectInfo::Type SelectInfo);
+		
+	void SetSuggestions(TArray<FString>& Elements, FText Highlight);
+
+	void MarkActiveSuggestion();
+
+	void ClearSuggestions();
+
+	void OnCommandExecutorRegistered(const FName& Type, IModularFeature* ModularFeature);
+
+	void OnCommandExecutorUnregistered(const FName& Type, IModularFeature* ModularFeature);
+
+	void SyncActiveCommandExecutor();
+
+	void SetActiveCommandExecutor(const FName InExecName);
+
+	void MakeNextCommandExecutorActive();
+
+	FText GetActiveCommandExecutorDisplayName() const;
+
+	FText GetActiveCommandExecutorHintText() const;
+
+	bool GetActiveCommandExecutorAllowMultiLine() const;
+
+	bool IsCommandExecutorMenuEnabled() const;
+
+	TSharedRef<SWidget> GetCommandExecutorMenuContent();
+
+	FReply OnKeyDownHandler(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent);
+
+	FReply OnKeyCharHandler(const FGeometry& MyGeometry, const FCharacterEvent& InCharacterEvent);
+
+private:
+
+	struct FSuggestions
+	{
+		FSuggestions()
+			: SelectedSuggestion(INDEX_NONE)
+		{
+		}
+
+		void Reset()
+		{
+			SelectedSuggestion = INDEX_NONE;
+			SuggestionsList.Reset();
+			SuggestionsHighlight = FText::GetEmpty();
+		}
+
+		bool HasSuggestions() const
+		{
+			return SuggestionsList.Num() > 0;
+		}
+
+		bool HasSelectedSuggestion() const
+		{
+			return SuggestionsList.IsValidIndex(SelectedSuggestion);
+		}
+
+		void StepSelectedSuggestion(const int32 Step)
+		{
+			SelectedSuggestion += Step;
+			if (SelectedSuggestion < 0)
+			{
+				SelectedSuggestion = SuggestionsList.Num() - 1;
+			}
+			else if (SelectedSuggestion >= SuggestionsList.Num())
+			{
+				SelectedSuggestion = 0;
+			}
+		}
+
+		TSharedPtr<FString> GetSelectedSuggestion() const
+		{
+			return SuggestionsList.IsValidIndex(SelectedSuggestion) ? SuggestionsList[SelectedSuggestion] : nullptr;
+		}
+
+		/** INDEX_NONE if not set, otherwise index into SuggestionsList */
+		int32 SelectedSuggestion;
+
+		/** All log messages stored in this widget for the list view */
+		TArray<TSharedPtr<FString>> SuggestionsList;
+
+		/** Highlight text to use for the suggestions list */
+		FText SuggestionsHighlight;
+	};
+
+	/** Editable text widget */
+	TSharedPtr< SMultiLineEditableTextBox > InputText;
+
+	/** history / auto completion elements */
+	TSharedPtr< SMenuAnchor > SuggestionBox;
+
+	/** The list view for showing all log messages. Should be replaced by a full text editor */
+	TSharedPtr< SListView< TSharedPtr<FString> > > SuggestionListView;
+
+	/** Active list of suggestions */
+	FSuggestions Suggestions;
+
+	/** Delegate to call when a console command is executed */
+	FSimpleDelegate OnConsoleCommandExecuted;
+
+	/** Delegate to call to execute console command */
+	FExecuteConsoleCommand ConsoleCommandCustomExec;
+
+	/** Delegate to call to close the console */
+	FSimpleDelegate OnCloseConsole;
+
+	/** Name of the preferred command executor (may not always be the active executor) */
+	FName PreferredCommandExecutorName;
+
+	/** The currently active command executor */
+	IConsoleCommandExecutor* ActiveCommandExecutor;
+
+	/** to prevent recursive calls in UI callback */
+	bool bIgnoreUIUpdate;
+
+	/** true if this widget has been Ticked at least once */
+	bool bHasTicked;
+
+	/** True if we consumed a tab key in OnPreviewKeyDown, so we can ignore it in OnKeyCharHandler as well */
+	bool bConsumeTab;
+
+};
+
+/**
+* Holds information about filters
+*/
+struct FOutputLogFilter
+{
+	/** true to show Logs. */
+	bool bShowLogs;
+
+	/** true to show Warnings. */
+	bool bShowWarnings;
+
+	/** true to show Errors. */
+	bool bShowErrors;
+
+	/** true to allow all Log Categories */
+	bool bShowAllCategories;
+
+	/** Enable all filters by default */
+	FOutputLogFilter() : TextFilterExpressionEvaluator(ETextFilterExpressionEvaluatorMode::BasicString)
+	{
+		bShowErrors = bShowLogs = bShowWarnings = bShowAllCategories = true;
+	}
+
+	/** Returns true if any messages should be filtered out */
+	bool IsFilterSet() { return !bShowErrors || !bShowLogs || !bShowWarnings || TextFilterExpressionEvaluator.GetFilterType() != ETextFilterExpressionType::Empty || !TextFilterExpressionEvaluator.GetFilterText().IsEmpty(); }
+
+	/** Checks the given message against set filters */
+	bool IsMessageAllowed(const TSharedPtr<FOutputLogMessage>& Message);
+
+	/** Set the Text to be used as the Filter's restrictions */
+	void SetFilterText(const FText& InFilterText) { TextFilterExpressionEvaluator.SetFilterText(InFilterText); }
+
+	/** Get the Text currently being used as the Filter's restrictions */
+	const FText GetFilterText() const { return TextFilterExpressionEvaluator.GetFilterText(); }
+
+	/** Returns Evaluator syntax errors (if any) */
+	FText GetSyntaxErrors() { return TextFilterExpressionEvaluator.GetFilterErrorText(); }
+
+	const TArray<FName>& GetAvailableLogCategories() { return AvailableLogCategories; }
+
+	/** Adds a Log Category to the list of available categories, if it isn't already present */
+	void AddAvailableLogCategory(const FName& LogCategory);
+
+	/** Enables or disables a Log Category in the filter */
+	void ToggleLogCategory(const FName& LogCategory);
+
+	/** Returns true if the specified log category is enabled */
+	bool IsLogCategoryEnabled(const FName& LogCategory) const;
+
+	/** Empties the list of selected log categories */
+	void ClearSelectedLogCategories();
+
+private:
+	/** Expression evaluator that can be used to perform complex text filter queries */
+	FTextFilterExpressionEvaluator TextFilterExpressionEvaluator;
+
+	/** Array of Log Categories which are available for filter -- i.e. have been used in a log this session */
+	TArray<FName> AvailableLogCategories;
+
+	/** Array of Log Categories which are being used in the filter */
+	TArray<FName> SelectedLogCategories;
+};
+
+/**
+ * Widget which holds a list view of logs of the program output
+ * as well as a combo box for entering in new commands
+ */
+class SOutputLog 
+	: public SCompoundWidget, public FOutputDevice
+{
+
+public:
+
+	SLATE_BEGIN_ARGS( SOutputLog )
+		: _Messages()
+		{}
+		
+		SLATE_EVENT(FSimpleDelegate, OnCloseConsole)
+
+		/** All messages captured before this log window has been created */
+		SLATE_ARGUMENT( TArray< TSharedPtr<FOutputLogMessage> >, Messages )
+
+		/**  */
+		SLATE_ARGUMENT( EOutputLogSettingsMenuFlags, SettingsMenuFlags)
+
+		SLATE_ARGUMENT( FDefaultCategorySelectionMap, DefaultCategorySelection )
+
+		/** Used to determine the set of initially discovered log categories that should be selected */
+		SLATE_EVENT( FAllowLogCategoryCallback, AllowInitialLogCategory )
+
+	SLATE_END_ARGS()
+
+	/** Destructor for output log, so we can unregister from notifications */
+	virtual ~SOutputLog();
+
+	/**
+	 * Construct this widget.  Called by the SNew() Slate macro.
+	 *
+	 * @param	InArgs	Declaration used by the SNew() macro to construct this widget
+	 */
+	void Construct( const FArguments& InArgs, bool bCreateDrawerDockButton );
+
+	// SWidget interface
+	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override;
+
+	/**
+	 * Creates FOutputLogMessage objects from FOutputDevice log callback
+	 *
+	 * @param	V Message text
+	 * @param Verbosity Message verbosity
+	 * @param Category Message category
+	 * @param OutMessages Array to receive created FOutputLogMessage messages
+	 * @param Filters [Optional] Filters to apply to Messages
+	 *
+	 * @return true if any messages have been created, false otherwise
+	 */
+	static bool CreateLogMessages(const TCHAR* V, ELogVerbosity::Type Verbosity, const FName& Category, TArray< TSharedPtr<FOutputLogMessage> >& OutMessages);
+
+	/**
+	* Called when delete all is selected
+	*/
+	void OnClearLog();
+
+	/** Called when a category is selected to be highlighted */
+	void OnHighlightCategory(FName NewCategoryToHighlight);
+
+	/** Called when the editor style settings are modified */
+	void HandleSettingChanged(FName ChangedSettingName);
+
+	void RefreshAllPreservingLocation();
+
+	/**
+	 * Called to determine whether delete all is currently a valid command
+	 */
+	bool CanClearLog() const;
+
+	/** Focuses the edit box where you type in console commands */
+	void FocusConsoleCommandBox();
+
+	/** Change the output log's filter. If CategoriesToShow is empty, all categories will be shown. */
+	void UpdateOutputLogFilter(const TArray<FName>& CategoriesToShow, TOptional<bool> bShowErrors = TOptional<bool>(), TOptional<bool> bShowWarnings = TOptional<bool>(), TOptional<bool> bShowLogs = TOptional<bool>());
+protected:
+
+	virtual void Serialize( const TCHAR* V, ELogVerbosity::Type Verbosity, const FName& Category ) override;
+
+protected:
+	/**
+	 * Extends the context menu used by the text box
+	 */
+	void ExtendTextBoxMenu(FMenuBuilder& Builder);
+	
+	/**
+	 * Called when the user scrolls the log window vertically
+	 */
+	void OnUserScrolled(float ScrollOffset);
+
+	/** Called when a console command is entered for this output log */
+	void OnConsoleCommandExecuted();
+
+	/** Request we immediately force scroll to the bottom of the log */
+	void RequestForceScroll(bool bIfUserHasNotScrolledUp = false);
+
+	/** Converts the array of messages into something the text box understands */
+	TSharedPtr< FOutputLogTextLayoutMarshaller > MessagesTextMarshaller;
+
+	/** The editable text showing all log messages */
+	TSharedPtr< SMultiLineEditableTextBox > MessagesTextBox;
+
+	/** The editable text showing all log messages */
+	TSharedPtr< SSearchBox > FilterTextBox;
+
+	/** True if the user has scrolled the window upwards */
+	bool bIsUserScrolled;
+
+private:
+
+	void BuildInitialLogCategoryFilter(const FArguments& InArgs);
+	
+	/** Called by Slate when the filter box changes text. */
+	void OnFilterTextChanged(const FText& InFilterText);
+
+	/** Called by Slate when the filter text box is confirmed. */
+	void OnFilterTextCommitted(const FText& InFilterText, ETextCommit::Type InCommitType); 
+
+	/** Make the "Filters" menu. */
+	TSharedRef<SWidget> MakeAddFilterMenu();
+
+	/** Make the "Categories" sub-menu. */
+	void MakeSelectCategoriesSubMenu(FMenuBuilder& MenuBuilder);
+
+	/** Toggles Verbosity "Logs" true/false. */
+	void VerbosityLogs_Execute();
+
+	/** Returns the state of Verbosity "Logs". */
+	bool VerbosityLogs_IsChecked() const;
+
+	/** Toggles Verbosity "Warnings" true/false. */
+	void VerbosityWarnings_Execute();
+
+	/** Returns the state of Verbosity "Warnings". */
+	bool VerbosityWarnings_IsChecked() const;
+
+	/** Toggles Verbosity "Errors" true/false. */
+	void VerbosityErrors_Execute();
+
+	/** Returns the state of Verbosity "Errors". */
+	bool VerbosityErrors_IsChecked() const;
+
+	/** Toggles All Categories true/false. */
+	void CategoriesShowAll_Execute();
+
+	/** Returns the state of "Show All" */
+	bool CategoriesShowAll_IsChecked() const;
+
+	/** Toggles the given category true/false. */
+	void CategoriesSingle_Execute(FName InName);
+
+	/** Returns the state of the given category */
+	bool CategoriesSingle_IsChecked(FName InName) const;
+
+	/** Forces re-population of the messages list */
+	void Refresh();
+
+	bool IsWordWrapEnabled() const;
+
+	void SetWordWrapEnabled(ECheckBoxState InValue);
+
+	void SetTimestampMode(ELogTimes::Type InValue);
+
+	bool IsSelectedTimestampMode(ELogTimes::Type NewType);
+
+	void AddTimestampMenuSection(FMenuBuilder& Menu);
+
+	ELogTimes::Type GetSelectedTimestampMode();
+
+#if WITH_EDITOR
+	bool IsClearOnPIEEnabled() const;
+
+	void SetClearOnPIE(ECheckBoxState InValue);
+#endif
+
+	FSlateColor GetViewButtonForegroundColor() const;
+
+	TSharedRef<SWidget> GetViewButtonContent(EOutputLogSettingsMenuFlags Flags);
+
+	TSharedRef<SWidget> CreateDrawerDockButton();
+
+	void OpenLogFileInExplorer();
+
+	void OpenLogFileInExternalEditor();
+
+	FReply OnDockInLayoutClicked();
+protected:
+	TSharedPtr<SConsoleInputBox> ConsoleInputBox;
+
+	/** Visible messages filter */
+	FOutputLogFilter Filter;
+
+	FDelegateHandle SettingsWatchHandle;
+
+	bool bShouldCreateDrawerDockButton = false;
+};
+
+/** Output log text marshaller to convert an array of FOutputLogMessages into styled lines to be consumed by an FTextLayout */
+class FOutputLogTextLayoutMarshaller : public FBaseTextLayoutMarshaller
+{
+public:
+
+	static TSharedRef< FOutputLogTextLayoutMarshaller > Create(TArray< TSharedPtr<FOutputLogMessage> > InMessages, FOutputLogFilter* InFilter);
+
+	virtual ~FOutputLogTextLayoutMarshaller();
+	
+	// ITextLayoutMarshaller
+	virtual void SetText(const FString& SourceString, FTextLayout& TargetTextLayout) override;
+	virtual void GetText(FString& TargetString, const FTextLayout& SourceTextLayout) override;
+
+	bool AppendPendingMessage(const TCHAR* InText, const ELogVerbosity::Type InVerbosity, const FName& InCategory);
+	bool SubmitPendingMessages();
+	void ClearMessages();
+
+	void CountMessages();
+
+	int32 GetNumMessages() const;
+	int32 GetNumFilteredMessages();
+
+	void MarkMessagesCacheAsDirty();
+
+	FName GetCategoryForLocation(const FTextLocation Location) const;
+
+	FTextLocation GetTextLocationAt(const FVector2D& Relative) const;
+
+	FName GetCategoryToHighlight() const { return CategoryToHighlight; }
+
+	void SetCategoryToHighlight(FName InCategory) { CategoryToHighlight = InCategory; }
+
+protected:
+
+	FOutputLogTextLayoutMarshaller(TArray< TSharedPtr<FOutputLogMessage> > InMessages, FOutputLogFilter* InFilter);
+
+	void AppendPendingMessagesToTextLayout();
+
+	TMap<FName, float> CategoryHueMap;
+
+	float GetCategoryHue(FName CategoryName);
+
+	/** All log messages to show in the text box */
+	TArray< TSharedPtr<FOutputLogMessage> > Messages;
+
+	/** Messages pending add, kept separate to avoid a race condition when reading Messages */
+	TArray< TSharedPtr<FOutputLogMessage> > PendingMessages;
+
+	/** Index of the next entry in the Messages array that is pending submission to the text layout */
+	int32 NextPendingMessageIndex;
+
+	/** Holds cached numbers of messages to avoid unnecessary re-filtering */
+	int32 CachedNumMessages;
+	
+	/** Flag indicating the messages count cache needs rebuilding */
+	bool bNumMessagesCacheDirty;
+
+	/** Visible messages filter */
+	FOutputLogFilter* Filter;
+
+	FName CategoryToHighlight;
+
+	FTextLayout* TextLayout;
+
+	/** Output log runs own its own "OutputDeviceRedirector" thread, lock against messages to prevent race conditions */
+	FCriticalSection PendingMessagesCriticalSection;
+};
+
+
+/** This class is to capture all log output even if the log window is closed */
+class FOutputLogHistory : public FOutputDevice
+{
+public:
+
+	FOutputLogHistory()
+	{
+		GLog->AddOutputDevice(this);
+		GLog->SerializeBacklog(this);
+	}
+
+	~FOutputLogHistory()
+	{
+		// At shutdown, GLog may already be null
+		if (GLog != NULL)
+		{
+			GLog->RemoveOutputDevice(this);
+		}
+	}
+
+	/** Gets all captured messages */
+	const TArray< TSharedPtr<FOutputLogMessage> >& GetMessages() const
+	{
+		return Messages;
+	}
+
+protected:
+
+	virtual void Serialize(const TCHAR* V, ELogVerbosity::Type Verbosity, const class FName& Category) override
+	{
+		// Capture all incoming messages and store them in history
+		SOutputLog::CreateLogMessages(V, Verbosity, Category, Messages);
+	}
+
+private:
+
+	/** All log messsges since this module has been started */
+	TArray< TSharedPtr<FOutputLogMessage> > Messages;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/SResetScaleBox.cpp b/Source/UnrealSoda/Private/UI/SResetScaleBox.cpp
new file mode 100644
index 0000000..1a70d03
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SResetScaleBox.cpp
@@ -0,0 +1,48 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SResetScaleBox.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+#include "Layout/ArrangedChildren.h"
+
+namespace soda
+{
+
+SResetScaleBox::SResetScaleBox()
+{
+	bHasRelativeLayoutScale = true;
+}
+
+float SResetScaleBox::GetRelativeLayoutScale(int32 ChildIndex, float LayoutScaleMultiplier) const
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::GetChecked();
+
+	CashedScale = 1 / LayoutScaleMultiplier * GameMode->GetWorld()->GetGameViewport()->GetDPIScale() * SodaApp.GetSodaUserSettings()->DPIScale;
+	return CashedScale;
+}
+
+void SResetScaleBox::OnArrangeChildren(const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren) const 
+{
+	const EVisibility MyVisibility = this->GetVisibility();
+	if (ArrangedChildren.Accepts(MyVisibility))
+	{
+		ArrangedChildren.AddWidget(AllottedGeometry.MakeChild(
+			this->ChildSlot.GetWidget(),
+			FVector2D::ZeroVector,
+			AllottedGeometry.GetLocalSize() / CashedScale,
+			CashedScale
+		));
+	}
+}
+
+FVector2D SResetScaleBox::ComputeDesiredSize(float) const
+{
+	if (ensure(CashedScale > 0.f))
+	{
+		return CashedScale * ChildSlot.GetWidget()->GetDesiredSize();
+	}
+	return ChildSlot.GetWidget()->GetDesiredSize();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/SSodaViewport.cpp b/Source/UnrealSoda/Private/UI/SSodaViewport.cpp
new file mode 100644
index 0000000..392d71d
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SSodaViewport.cpp
@@ -0,0 +1,1048 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SSodaViewport.h"
+#include "Misc/Paths.h"
+#include "Framework/Commands/UICommandList.h"
+#include "Misc/App.h"
+#include "EngineGlobals.h"
+#include "Engine/TextureStreamingTypes.h"
+#include "Slate/SceneViewport.h"
+#include "Slate/SGameLayerManager.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Input/SSpinBox.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "Widgets/Layout/SScaleBox.h"
+#include "Widgets/Layout/SSplitter.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Colors/SComplexGradient.h"
+#include "Widgets/LayerManager/STooltipPresenter.h"
+#include "Widgets/Layout/SPopup.h"
+#include "Widgets/SWeakWidget.h"
+#include "SodaStyleSet.h"
+#include "Soda/UI/SToolBox.h"
+#include "Soda/UI/SodaViewportCommands.h"
+#include "UI/Toolbar/SodaDragDropOp.h"
+#include "UI/Toolbar/SSodaViewportToolBar.h"
+#include "UI/Toolbar/SPlacementModeTools.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "UI/Wnds/SSaveAllWindow.h"
+#include "Soda/UI/SWaitingPanel.h"
+#include "UI/SOutputLog.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/SodaSpectator.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+#include "Soda/Editor/SodaSelection.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/SodaHUD.h"
+#include "GameFramework/GameUserSettings.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "Framework/Commands/UICommandInfo.h"
+#include "UI/ToolBoxes/SActorToolBox.h"
+#include "Soda/LevelState.h"
+#include "EngineUtils.h"
+#include "Soda/SodaStatics.h"
+
+#define LOCTEXT_NAMESPACE "SodaViewport"
+
+namespace soda
+{
+
+class SToolBoxBorder : public SBorder
+{
+public:
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		return FReply::Handled();
+	}
+	virtual FReply OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		return FReply::Handled();
+	}
+	//virtual FReply OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	//{
+		//return FReply::Handled();
+	//}
+	virtual FReply OnMouseWheel(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		return FReply::Handled();
+	}
+};
+
+SSodaViewport::SSodaViewport()
+{
+}
+
+SSodaViewport::~SSodaViewport()
+{
+}
+
+void SSodaViewport::Construct( const FArguments& InArgs, UWorld* InWorld)
+{
+	check(InWorld);
+	World = InWorld;
+	ViewportClient = Cast<USodaGameViewportClient>(InWorld->GetGameViewport());
+	check(ViewportClient.IsValid());
+	Viewport = ViewportClient->Viewport;
+	check(Viewport);
+
+	CommandList = MakeShareable(new FUICommandList);
+	BindCommands();
+
+	ChildSlot
+	[
+		SNew(SOverlay)
+		+ SOverlay::Slot()
+		[
+			SAssignNew(MajorSplitter, SSplitter)
+			//.VAlign(VAlign_Fill)
+			//.HAlign(HAlign_Fill)
+			.Orientation(EOrientation::Orient_Horizontal)
+			+SSplitter::Slot()
+			.Value(1 - ToolBoxSize)
+			[
+				SAssignNew(MinorSplitter, SSplitter)
+				.Orientation(EOrientation::Orient_Vertical)
+				+ SSplitter::Slot()
+				.Value(0.8)
+				[
+					MakeViewportToolbar().ToSharedRef()
+				]
+			]
+		]
+		+ SOverlay::Slot()
+		[
+			SAssignNew(ViewportOverlayWidget, SOverlay)
+		]
+		+ SOverlay::Slot()
+		[
+			SNew(SPopup)
+			[
+				SAssignNew(TooltipPresenter, STooltipPresenter)
+			]
+		]
+	];
+
+}
+
+bool SSodaViewport::OnVisualizeTooltip(const TSharedPtr<SWidget>& TooltipContent)
+{
+	TooltipPresenter->SetContent(TooltipContent); 
+
+	return true;
+}
+
+FReply SSodaViewport::OnKeyDown( const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent )
+{
+	FReply Reply = FReply::Unhandled();
+	if( CommandList->ProcessCommandBindings( InKeyEvent ) )
+	{
+		return FReply::Handled();
+	}
+	return SResetScaleBox::OnKeyDown(MyGeometry, InKeyEvent);		
+}
+
+void SSodaViewport::Tick( const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime )
+{
+	SResetScaleBox::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+}
+
+bool SSodaViewport::IsLogVisible() const
+{
+	return OutputLog.IsValid();
+}
+
+void SSodaViewport::SetLogVisible(bool bVisible)
+{
+	if (bVisible)
+	{
+		if (!OutputLog.IsValid())
+		{
+			if (MinorSplitter->GetChildren()->Num() == 1)
+			{
+				MinorSplitter->AddSlot()
+				//.Value(0.3)
+				[
+					SNew(SToolBoxBorder)
+					.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Recessed")))
+					[
+						SAssignNew(OutputLog, SOutputLog, false)
+						.Messages(SodaApp.GetOutputLogHistory()->GetMessages())
+					]
+				];
+			}
+		}
+	}
+	else
+	{
+		if (MinorSplitter->GetChildren()->Num() == 2)
+		{
+			ToolBoxSize = MinorSplitter->SlotAt(1).GetSizeValue();
+			MinorSplitter->RemoveAt(1);
+		}
+		OutputLog.Reset();
+	}
+}
+
+void SSodaViewport::BindCommands()
+{
+	FUICommandList& CommandListRef = *CommandList;
+
+	const FSodalViewportCommands& Commands = FSodalViewportCommands::Get();
+
+	USodaGameViewportClient* ClientRef = ViewportClient.Get();
+
+	CommandListRef.MapAction( 
+		Commands.ToggleFPS,
+		FExecuteAction::CreateSP(this, &SSodaViewport::ToggleStatCommand, FString("FPS")),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsStatCommandVisible, FString("FPS"))
+	);
+
+	CommandListRef.MapAction(
+		Commands.ToggleVehiclePanel,
+		FExecuteAction::CreateLambda([World=GetWorld()]()
+		{
+			if (IsValid(World))
+			{
+				if (ASodaHUD* SodaHUD = World->GetFirstPlayerController()->GetHUD<ASodaHUD>())
+				{
+					SodaHUD->bDrawVehicleDebugPanel = !SodaHUD->bDrawVehicleDebugPanel;
+				}
+			}
+		}),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateLambda([World=GetWorld()]()
+		{
+			if (IsValid(World))
+			{
+				if (ASodaHUD* SodaHUD = World->GetFirstPlayerController()->GetHUD<ASodaHUD>())
+				{
+					return SodaHUD->bDrawVehicleDebugPanel;
+				}
+			}
+			return false;
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.ToggleFullScreen,
+		FExecuteAction::CreateLambda([]()
+		{
+			if (UGameUserSettings* GameUserSettings = UGameUserSettings::GetGameUserSettings())
+			{
+				EWindowMode::Type Mode = GameUserSettings->GetFullscreenMode();
+				bool bIsFullscreen = (Mode == EWindowMode::Fullscreen || Mode == EWindowMode::WindowedFullscreen);
+				GameUserSettings->SetFullscreenMode(bIsFullscreen ? EWindowMode::Windowed : EWindowMode::WindowedFullscreen);
+			}
+		}),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateLambda([]()
+		{
+			if (UGameUserSettings* GameUserSettings = UGameUserSettings::GetGameUserSettings())
+			{
+				EWindowMode::Type Mode = GameUserSettings->GetFullscreenMode();
+				bool bIsFullscreen = (Mode == EWindowMode::Fullscreen || Mode == EWindowMode::WindowedFullscreen);
+				return bIsFullscreen;
+			}
+			return false;
+		})
+	);
+
+	CommandListRef.MapAction( 
+		Commands.Perspective,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::Perspective),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::Perspective));
+
+	CommandListRef.MapAction(
+		Commands.OrthographicFree,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::OrthographicFree),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::OrthographicFree));
+
+	CommandListRef.MapAction( 
+		Commands.Front,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::Front),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::Front));
+
+	CommandListRef.MapAction( 
+		Commands.Left,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::Left),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::Left));
+
+	CommandListRef.MapAction( 
+		Commands.Top,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::Top),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::Top));
+
+	CommandListRef.MapAction(
+		Commands.Back,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::Back),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::Back));
+
+	CommandListRef.MapAction(
+		Commands.Right,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::Right),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::Right));
+
+	CommandListRef.MapAction(
+		Commands.Bottom,
+		FExecuteAction::CreateSP(this, &SSodaViewport::SetViewportType, ESodaSpectatorMode::Bottom),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsActiveViewportType, ESodaSpectatorMode::Bottom));
+
+	CommandListRef.MapAction(
+		Commands.SelectMode,
+		FExecuteAction::CreateUObject(ClientRef, &USodaGameViewportClient::SetWidgetMode, soda::WM_None),
+		FCanExecuteAction::CreateSP(this, &SSodaViewport::CanSetWidgetMode, soda::WM_None),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsWidgetModeActive, soda::WM_None)
+	);
+
+	CommandListRef.MapAction(
+		Commands.TranslateMode,
+		FExecuteAction::CreateUObject(ClientRef, &USodaGameViewportClient::SetWidgetMode, soda::WM_Translate ),
+		FCanExecuteAction::CreateSP(this, &SSodaViewport::CanSetWidgetMode, soda::WM_Translate ),
+		FIsActionChecked::CreateSP( this, &SSodaViewport::IsWidgetModeActive, soda::WM_Translate )
+	);
+
+	CommandListRef.MapAction( 
+		Commands.RotateMode,
+		FExecuteAction::CreateUObject(ClientRef, &USodaGameViewportClient::SetWidgetMode, soda::WM_Rotate ),
+		FCanExecuteAction::CreateSP(this, &SSodaViewport::CanSetWidgetMode, soda::WM_Rotate ),
+		FIsActionChecked::CreateSP( this, &SSodaViewport::IsWidgetModeActive, soda::WM_Rotate )
+	);
+		
+	CommandListRef.MapAction( 
+		Commands.ScaleMode,
+		FExecuteAction::CreateUObject(ClientRef, &USodaGameViewportClient::SetWidgetMode, soda::WM_Scale ),
+		FCanExecuteAction::CreateSP(this, &SSodaViewport::CanSetWidgetMode, soda::WM_Scale ),
+		FIsActionChecked::CreateSP( this, &SSodaViewport::IsWidgetModeActive, soda::WM_Scale )
+	);
+	
+	CommandListRef.MapAction( 
+		Commands.RelativeCoordinateSystem_World,
+		FExecuteAction::CreateUObject( ClientRef, &USodaGameViewportClient::SetWidgetCoordSystemSpace, soda::COORD_World ),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP( this, &SSodaViewport::IsCoordSystemActive, soda::COORD_World )
+	);
+
+	CommandListRef.MapAction( 
+		Commands.RelativeCoordinateSystem_Local,
+		FExecuteAction::CreateUObject( ClientRef, &USodaGameViewportClient::SetWidgetCoordSystemSpace, soda::COORD_Local ),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP( this, &SSodaViewport::IsCoordSystemActive, soda::COORD_Local )
+	);
+	
+	CommandListRef.MapAction(
+		Commands.HideAllStats,
+		FExecuteAction::CreateSP(this, &SSodaViewport::OnToggleAllStatCommands, false));
+
+	CommandListRef.MapAction(
+		Commands.RestartLevel,
+		FExecuteAction::CreateLambda([]()
+		{
+			if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+			{
+				GameMode->RequestRestartLevel(false);
+			}
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.ClearLevel,
+		FExecuteAction::CreateLambda([&]()
+		{
+			if (ALevelState* LevelState = ALevelState::Get())
+			{
+				LevelState->ReloadLevelEmpty(GetWorld());
+			}
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.AutoConnectDB,
+		FExecuteAction::CreateLambda([]()
+		{
+			SodaApp.GetSodaUserSettings()->bAutoConnect = !SodaApp.GetSodaUserSettings()->bAutoConnect;
+			SodaApp.GetSodaUserSettings()->SaveSettings();
+		}),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateLambda([]()
+		{
+			return SodaApp.GetSodaUserSettings()->bAutoConnect;
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.RecordDataset,
+		FExecuteAction::CreateLambda([]()
+		{
+			SodaApp.GetSodaUserSettings()->bRecordDataset = !SodaApp.GetSodaUserSettings()->bRecordDataset;
+			SodaApp.GetSodaUserSettings()->SaveSettings();
+		}),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateLambda([]()
+		{
+			return SodaApp.GetSodaUserSettings()->bRecordDataset;
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.ToggleSpectatorMode,
+		FExecuteAction::CreateLambda([]()
+		{
+			if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+			{
+				APlayerController* PlayerController = GameMode->GetWorld()->GetFirstPlayerController();
+				check(PlayerController);
+
+				APawn* Pawn = PlayerController->GetPawn();
+
+				if (Cast<ASodaVehicle>(Pawn))
+				{
+					GameMode->SetSpectatorMode(true);
+				}
+				else if (Cast<ASodalSpectator>(Pawn))
+				{
+					GameMode->SetSpectatorMode(false);
+				}
+				else
+				{
+					GameMode->SetSpectatorMode(true);
+				}
+			}
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.PossesNextVehicle,
+		FExecuteAction::CreateLambda([]()
+		{
+			if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+			{
+				APlayerController* PlayerController = GameMode->GetWorld()->GetFirstPlayerController();
+				check(PlayerController);
+
+				ASodaVehicle* Vehicle = GameMode->GetActiveVehicle();
+				if (Vehicle)
+				{
+					for (TActorIterator<ASodaVehicle> It(GameMode->GetWorld()); It; ++It)
+					{
+						if (*It == Vehicle)
+						{
+							++It;
+							if (It)
+							{
+								GameMode->SetActiveVehicle(*It);
+							}
+							else
+							{
+								GameMode->SetActiveVehicle(*TActorIterator<ASodaVehicle>(GameMode->GetWorld()));
+							}
+							break;
+						}
+					}
+				}
+				else
+				{
+					TActorIterator<ASodaVehicle> It(GameMode->GetWorld());
+					if (It)
+					{
+						GameMode->SetActiveVehicle(*It);
+					}
+				}
+			}
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.BackMenu,
+		FExecuteAction::CreateSP(this, &SSodaViewport::BackMenu)
+	);
+
+#if WITH_EDITOR
+	CommandListRef.MapAction(
+		Commands.BackMenuEditor,
+		FExecuteAction::CreateSP(this, &SSodaViewport::BackMenu)
+	);
+#endif
+
+	CommandListRef.MapAction(
+		Commands.TagActors,
+		FExecuteAction::CreateLambda([this]()
+		{
+			USodaStatics::TagActorsInLevel(GetWorld(), true);
+			USodaStatics::AddV2VComponentToAllVehiclesInLevel(GetWorld(), ASodaVehicle::StaticClass());
+		})
+	);
+
+	CommandListRef.MapAction(
+		Commands.Exit,
+		FExecuteAction::CreateLambda([]()
+		{
+			if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+			{
+				GameMode->RequestQuit();
+			}
+		})
+	);
+
+	for (auto StatCatIt = Commands.ShowStatCatCommands.CreateConstIterator(); StatCatIt; ++StatCatIt)
+	{
+		const TArray< FSodalViewportCommands::FShowMenuCommand >& ShowStatCommands = StatCatIt.Value();
+		for (int32 StatIndex = 0; StatIndex < ShowStatCommands.Num(); ++StatIndex)
+		{
+			const FSodalViewportCommands::FShowMenuCommand& StatCommand = ShowStatCommands[StatIndex];
+			BindStatCommand(StatCommand.ShowMenuItem, StatCommand.LabelOverride.ToString());
+		}
+	}
+
+	// Bind a listener here for any additional stat commands that get registered later.
+	FSodalViewportCommands::NewStatCommandDelegate.AddRaw(this, &SSodaViewport::BindStatCommand);
+	
+	CommandListRef.MapAction(
+		Commands.CycleTransformGizmoCoordSystem,
+		FExecuteAction::CreateSP( this, &SSodaViewport::OnCycleCoordinateSystem )
+		);
+
+}
+
+void SSodaViewport::BindStatCommand(const TSharedPtr<FUICommandInfo> InMenuItem, const FString& InCommandName)
+{
+	CommandList->MapAction(
+		InMenuItem,
+		FExecuteAction::CreateSP(this, &SSodaViewport::ToggleStatCommand, InCommandName),
+		FCanExecuteAction(),
+		FIsActionChecked::CreateSP(this, &SSodaViewport::IsStatCommandVisible, InCommandName));
+}
+
+void SSodaViewport::BackMenu()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		if (!GameMode->CloseWindow())
+		{
+			GameMode->PopToolBox();
+		}
+	}
+}
+
+void SSodaViewport::OnCycleCoordinateSystem()
+{
+	ViewportClient->SetWidgetCoordSystemSpace(ViewportClient->GetWidgetCoordSystemSpace() == soda::COORD_World ? soda::COORD_Local : soda::COORD_World);
+}
+
+void SSodaViewport::OnToggleStats()
+{
+	/*
+	bool bIsEnabled = ViewportClient->ShouldShowStats();
+	ViewportClient->SetShowStats( !bIsEnabled );
+
+	if( !bIsEnabled )
+	{
+		 // let the user know how they can enable stats via the console
+		 FNotificationInfo Info(LOCTEXT("StatsEnableHint", "Stats display can be toggled via the STAT [type] console command"));
+		 Info.ExpireDuration = 3.0f;
+
+		 FSlateNotificationManager::Get().AddNotification(Info);
+	}
+	*/
+}
+
+void SSodaViewport::OnToggleAllStatCommands(bool bVisible)
+{
+	check(bVisible == 0);
+	// If it's in the array, it's visible so just toggle it again
+	const TArray<FString>* EnabledStats = ViewportClient->GetEnabledStats();
+	check(EnabledStats);
+	while (EnabledStats->Num() > 0)
+	{
+		const FString& CommandName = EnabledStats->Last();
+		ToggleStatCommand(CommandName);
+	}
+}
+
+void SSodaViewport::ToggleStatCommand(FString CommandName)
+{
+	GEngine->ExecEngineStat(GetWorld(), ViewportClient.Get(), *CommandName);
+}
+
+bool SSodaViewport::IsStatCommandVisible(FString CommandName) const
+{
+	return ViewportClient->IsStatEnabled(CommandName);
+}
+
+bool SSodaViewport::IsWidgetModeActive(soda::EWidgetMode Mode ) const
+{
+	return ViewportClient->GetWidgetMode() == Mode;
+}
+
+bool SSodaViewport::CanSetWidgetMode(soda::EWidgetMode NewMode) const
+{
+	return  true;
+}
+
+bool SSodaViewport::IsCoordSystemActive(ECoordSystem CoordSystem) const
+{
+	return ViewportClient->GetWidgetCoordSystemSpace() == CoordSystem;
+}
+
+void SSodaViewport::OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	if (HandleDragObjects(MyGeometry, DragDropEvent))
+	{
+		DragDropEvent.GetOperation()->SetDecoratorVisibility(false);
+		if (!HandlePlaceDraggedObjects(MyGeometry, DragDropEvent, /*bCreateDropPreview=*/true))
+		{
+			//DragDropEvent.GetOperation()->SetDecoratorVisibility(true);
+		}
+	}
+}
+
+void SSodaViewport::OnDragLeave(const FDragDropEvent& DragDropEvent)
+{
+	if (ViewportClient->HasDropPreviewActor())
+	{
+		ViewportClient->DestroyDropPreviewActor();
+	}
+
+	TSharedPtr<FDragDropOperation> Operation = DragDropEvent.GetOperation();
+	if (Operation.IsValid())
+	{
+		if (Operation->IsOfType<soda::FSodaDecoratedDragDropOp>())
+		{
+			TSharedPtr<soda::FSodaDecoratedDragDropOp> DragDropOp = StaticCastSharedPtr<soda::FSodaDecoratedDragDropOp>(Operation);
+			DragDropOp->ResetToDefaultToolTip();
+			Operation->SetDecoratorVisibility(false);
+		}
+	}
+}
+
+bool SSodaViewport::HandleDragObjects(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	bool bValidDrag = false;
+
+	TSharedPtr< FDragDropOperation > Operation = DragDropEvent.GetOperation();
+	if (!Operation.IsValid())
+	{
+		return false;
+	}
+
+	if (Operation->IsOfType<FSodaActorDragDropOp>())
+	{
+		auto SodaActorDragDropOp = StaticCastSharedPtr<FSodaActorDragDropOp>(DragDropEvent.GetOperation());
+
+		FVector2D ScreenPos;
+		if (!FEditorUtils::AbsoluteToScreenPosition(ViewportClient.Get(), DragDropEvent.GetLastScreenSpacePosition(), ScreenPos))
+		{
+			return false;
+		}
+
+		if (ViewportClient->UpdateDropPreviewActor(ScreenPos.X, ScreenPos.Y))
+		{
+			//Operation->SetDecoratorVisibility(false);
+			Operation->SetCursorOverride(TOptional<EMouseCursor::Type>());
+		}
+		else
+		{
+			Operation->SetCursorOverride(EMouseCursor::SlashedCircle);
+		}
+
+		//FText HintText = FText::FromString("***");
+		//SodaActorDragDropOp->SetToolTip(HintText, nullptr);
+
+		return true;
+	}
+
+	return false;
+}
+
+FReply SSodaViewport::OnDragOver(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	if (HandleDragObjects(MyGeometry, DragDropEvent))
+	{
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+
+bool SSodaViewport::HandlePlaceDraggedObjects(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent, bool bCreateDropPreview)
+{
+	TSharedPtr< FDragDropOperation > Operation = DragDropEvent.GetOperation();
+	if (!Operation.IsValid())
+	{
+		return false;
+	}
+
+	// Don't handle the placement if we couldn't handle the drag
+	if (!HandleDragObjects(MyGeometry, DragDropEvent))
+	{
+		return false;
+	}
+
+	if (!Operation->IsOfType<FSodaActorDragDropOp>())
+	{
+		return false;
+	}
+
+	TSharedPtr<FSodaActorDragDropOp> DragDropOp = StaticCastSharedPtr<FSodaActorDragDropOp>(Operation);
+
+	TSharedPtr<const FPlaceableItem> Item = DragDropOp->GetPlaceableItem();
+	if (!Item)
+	{
+		return false;
+	}
+	
+	FVector2D ScreenPos;
+	if (!FEditorUtils::AbsoluteToScreenPosition(ViewportClient.Get(), DragDropEvent.GetLastScreenSpacePosition(), ScreenPos))
+	{
+		return false;
+	}
+
+	AActor* NewActor = nullptr;
+
+	if (bCreateDropPreview)
+	{
+		ViewportClient->DropPreviewActorAtCoordinates(ScreenPos.X, ScreenPos.Y);
+	}
+	else
+	{
+		if (!Item->DefaultActor.IsNull())
+		{
+			UClass* Class = Item->DefaultActor.Get();
+			if (!Class)
+			{
+				Class = LoadObject<UClass>(nullptr, *Item->DefaultActor.ToString());
+			}
+
+			if (!Class)
+			{
+				return false;
+			}
+
+			if (!ViewportClient->DropActorAtCoordinates(ScreenPos.X, ScreenPos.Y, Class, &NewActor, true))
+			{
+				//FNotificationInfo Info(LOCTEXT("Error_OperationDisall", "Operation failed"));
+				//Info.ExpireDuration = 3.0f;
+				//FSlateNotificationManager::Get().AddNotification(Info);
+				return false;
+			}
+		}
+		else if (Item->SpawnCastomActorDelegate.IsBound())
+		{
+			if (!ViewportClient->DropActorAtCoordinates(ScreenPos.X, ScreenPos.Y, Item->SpawnCastomActorDelegate, &NewActor, true))
+			{
+				//FNotificationInfo Info(LOCTEXT("Error_OperationDisall", "Operation failed"));
+				//Info.ExpireDuration = 3.0f;
+				//FSlateNotificationManager::Get().AddNotification(Info);
+				return false;
+			}
+		}
+		else
+		{
+			return false;
+		}
+
+	}
+
+	if (!bCreateDropPreview && NewActor && ViewportClient->Selection)
+	{
+		ViewportClient->Selection->SelectActor(NewActor, nullptr);
+	}
+
+	return true;
+}
+
+FReply SSodaViewport::OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent)
+{
+	bool bDroped = HandlePlaceDraggedObjects(MyGeometry, DragDropEvent, /*bCreateDropPreview=*/false);
+
+	return bDroped ? FReply::Handled() : FReply::Unhandled();
+}
+
+TSharedPtr<SWidget> SSodaViewport::MakeViewportToolbar() 
+{ 
+	// Build our toolbar level toolbar
+	TSharedRef< SSodaViewportToolBar > ToolBar =
+		SNew( SSodaViewportToolBar )
+		.Viewport( SharedThis( this ) )
+		//.Visibility( this, &SSodaViewport::GetToolBarVisibility )
+		.IsEnabled( FSlateApplication::Get().GetNormalExecutionAttribute() );
+
+
+	return 
+		SNew(SVerticalBox)
+		.Visibility( EVisibility::SelfHitTestInvisible )
+		+SVerticalBox::Slot()
+		.AutoHeight()
+		.Padding(0, 1.0f, 0, 0)
+		.VAlign(VAlign_Top)
+		[
+			ToolBar
+		];
+}
+
+void SSodaViewport::SetToolBoxWidget(TSharedRef<SToolBox> InWidget)
+{
+	RemoveToolBoxWidget();
+
+	if (MajorSplitter->GetChildren()->Num() == 1)
+	{
+		MajorSplitter->AddSlot()
+		.Value(ToolBoxSize)
+		[
+			SNew(SToolBoxBorder)
+			.Padding(FMargin(0, 0, 4, 4))
+			.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Recessed")))
+			.Cursor(EMouseCursor::Default)
+			[
+				SNew(SVerticalBox)
+				+ SVerticalBox::Slot()
+				.AutoHeight()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.Padding(5)
+					[
+						SNew(STextBlock)
+						.Text(InWidget->GetCaption())
+					]
+					.FillWidth(1.0)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					[
+						SNew(SButton)
+						.ButtonStyle(FSodaStyle::Get(), "MenuWindow.CloseButton")
+						.OnClicked(FOnClicked::CreateLambda([this]() 
+						{
+							if(USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+							{
+								GameMode->PopToolBox();
+							}
+							return FReply::Handled();
+						}))
+					]
+				
+				]
+				+ SVerticalBox::Slot()
+				.FillHeight(1)
+				[ InWidget  ]
+			]
+
+		];
+	}
+}
+
+void SSodaViewport::RemoveToolBoxWidget()
+{
+	if (MajorSplitter->GetChildren()->Num() == 2)
+	{
+		ToolBoxSize = MajorSplitter->SlotAt(1).GetSizeValue();
+		MajorSplitter->RemoveAt(1);
+	}
+}
+
+void SSodaViewport::SetViewportType(ESodaSpectatorMode InMode)
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode && GameMode->SpectatorActor)
+	{
+		GameMode->SpectatorActor->SetMode(InMode);
+	}
+}
+
+bool SSodaViewport::IsActiveViewportType(ESodaSpectatorMode InMode)
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode && GameMode->SpectatorActor)
+	{
+		return GameMode->SpectatorActor->GetMode() == InMode;
+	}
+	return false;
+}
+
+void SSodaViewport::AddViewportWidgetContent(TSharedRef<SWidget> ViewportContent, const int32 ZOrder)
+{
+	if (ViewportOverlayWidget.IsValid())
+	{
+		ViewportOverlayWidget->AddSlot(ZOrder)
+		[
+			ViewportContent
+		];
+	}
+}
+
+void SSodaViewport::RemoveViewportWidgetContent(TSharedRef<SWidget> ViewportContent)
+{
+	if (ViewportOverlayWidget.IsValid())
+	{
+		ViewportOverlayWidget->RemoveSlot(ViewportContent);
+	}
+}
+
+void SSodaViewport::SetUIMode(soda::EUIMode InMode)
+{
+	UIMode = InMode;
+	StackToolBox.Empty();
+
+	switch (UIMode)
+	{
+	case soda::EUIMode::Free:
+		RemoveToolBoxWidget();
+		break;
+	case soda::EUIMode::Editing:
+		PushToolBox(SNew(soda::SActorToolBox).Viewport(SharedThis(this)));
+		break;
+	}
+	
+	if (ViewportClient.IsValid())
+	{
+		ViewportClient->Invalidate();
+	}
+}
+
+soda::EUIMode SSodaViewport::GetUIMode() const
+{
+	return UIMode;
+}
+
+void SSodaViewport::PushToolBox(TSharedRef<soda::SToolBox> Widget, bool InstedPrev)
+{
+	if (StackToolBox.Num() && InstedPrev)
+	{
+		StackToolBox.Pop();
+	}
+	StackToolBox.Add(Widget);
+	SetToolBoxWidget(Widget);
+}
+
+bool SSodaViewport::PopToolBox()
+{
+	if (StackToolBox.Num() == 0)
+	{
+		return false;
+	}
+
+	StackToolBox.Pop()->OnPop();
+
+	if (StackToolBox.Num() == 0)
+	{
+		SetUIMode(EUIMode::Free);
+		return true;
+	}
+	
+	SetToolBoxWidget(StackToolBox.Last().ToSharedRef());
+	StackToolBox.Last()->OnPush();
+	return true;
+}
+
+
+TSharedPtr<soda::SMessageBox> SSodaViewport::ShowMessageBox(soda::EMessageBoxType Type, const FString& Caption, const FString& Text)
+{
+	TSharedPtr<soda::SMessageBox> WindowWidget;
+	SAssignNew(WindowWidget, soda::SMessageBox)
+		.Caption(FText::FromString(Caption))
+		.TextContent(FText::FromString(Text))
+		.Type(Type);
+
+	AddViewportWidgetContent(SNew(SWeakWidget).PossiblyNullContent(WindowWidget.ToSharedRef()), 14);
+	OpenedWindows.Add(WindowWidget);
+	return WindowWidget;
+}
+
+TSharedPtr<soda::SMenuWindow> SSodaViewport::OpenWindow(const FString& Caption, TSharedRef<soda::SMenuWindowContent> Content)
+{
+	TSharedPtr<soda::SMenuWindow> WindowWidget;
+	SAssignNew(WindowWidget, soda::SMenuWindow)
+		.Caption(FText::FromString(Caption))
+		.Content(Content);
+	AddViewportWidgetContent(SNew(SWeakWidget).PossiblyNullContent(WindowWidget.ToSharedRef()), 14);
+	OpenedWindows.Add(WindowWidget);
+	return WindowWidget;
+}
+
+bool SSodaViewport::CloseWindow(soda::SMenuWindow* Wnd)
+{
+	for (auto It = OpenedWindows.CreateIterator(); It; ++It)
+	{
+		if (It->Get() == Wnd)
+		{
+			It.RemoveCurrent();
+			return true;
+		}
+	}
+	return false;
+}
+
+TSharedPtr<soda::SWaitingPanel> SSodaViewport::ShowWaitingPanel(const FString& Caption, const FString& SubCaption)
+{
+	TSharedPtr<soda::SWaitingPanel> WaitingPanel;
+	SAssignNew(WaitingPanel, soda::SWaitingPanel)
+		.Caption(FText::FromString(Caption))
+		.SubCaption(FText::FromString(SubCaption));
+	AddViewportWidgetContent(SNew(SWeakWidget).PossiblyNullContent(WaitingPanel.ToSharedRef()), 15);
+	return WaitingPanel;
+}
+
+bool SSodaViewport::CloseWaitingPanel(soda::SWaitingPanel* InWaitingPanel = nullptr)
+{
+	for (auto It = WaitingPanels.CreateIterator(); It; ++It)
+	{
+		if (It->Get() == InWaitingPanel)
+		{
+			It.RemoveCurrent();
+			return true;
+		}
+	}
+	return false;
+}
+
+bool SSodaViewport::CloseWaitingPanel(bool bCloseAll)
+{
+	bool Res = false;
+	while (WaitingPanels.Num())
+	{
+		auto  Wnd = WaitingPanels.Pop();
+		if (Wnd)
+		{
+			RemoveViewportWidgetContent(Wnd.ToSharedRef());
+			Res = true;
+			if (!bCloseAll) return true;
+		}
+	}
+	return Res;
+}
+
+bool SSodaViewport::CloseWindow(bool bCloseAllWindows)
+{
+	bool Res = false;
+
+	while (OpenedWindows.Num())
+	{
+		auto  Wnd = OpenedWindows.Pop();
+		if (Wnd)
+		{
+			RemoveViewportWidgetContent(Wnd.ToSharedRef());
+			Res = true;
+			if (!bCloseAllWindows) return true;
+		}
+	}
+	return Res;
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/SToolBox.cpp b/Source/UnrealSoda/Private/UI/SToolBox.cpp
new file mode 100644
index 0000000..b6e2912
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SToolBox.cpp
@@ -0,0 +1,28 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SToolBox.h"
+#include "SodaStyleSet.h"
+
+namespace soda
+{
+
+
+void SToolBox::Construct( const FArguments& InArgs )
+{
+	ChildSlot
+	.HAlign(HAlign_Fill)
+	.VAlign(VAlign_Fill)
+	[
+		InArgs._Content.Widget
+	];
+	
+	if (InArgs._Caption.IsSet())
+	{
+		Caption = InArgs._Caption.Get();
+	}
+}
+
+
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/SVehicleComponentsList.cpp b/Source/UnrealSoda/Private/UI/SVehicleComponentsList.cpp
new file mode 100644
index 0000000..0cb3d8a
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SVehicleComponentsList.cpp
@@ -0,0 +1,1005 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SVehicleComponentsList.h"
+#include "Soda/UnrealSoda.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/SInlineEditableTextBlock.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "Kismet/GameplayStatics.h"
+#include "Soda/ISodaActor.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/Editor/SodaSelection.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "UI/Common/SVehicleComponentClassCombo.h"
+#include "UI/Common/SPinWidget.h"
+#include "UI/Toolbar/SodaDragDropOp.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/UI/SToolBox.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Components/ActorComponent.h"
+
+#define LOCTEXT_NAMESPACE "VehicleComponentsBar"
+
+namespace soda
+{
+
+static const FName Column_CB_Enable("Enable");
+static const FName Column_CB_StartUp("StartUp");
+static const FName Column_CB_ItemName("ItemName");
+static const FName Column_CB_Remark("Remark");
+static const FName Column_CB_Health("Health");
+
+enum class  EComponentsBarTreeType
+{
+	Filter,
+	Component
+};
+
+/***********************************************************************************/
+class FVehcielComponentDragDropOp : public FSodaDecoratedDragDropOp
+{
+public:
+	DRAG_DROP_OPERATOR_TYPE(FVehcielComponentDragDropOp, FDragDropOperation)
+
+	static TSharedRef<FVehcielComponentDragDropOp> New(TWeakInterfacePtr<ISodaVehicleComponent> InComponent)
+	{
+		check(InComponent.IsValid());
+		auto DragDropOp = MakeShared<FVehcielComponentDragDropOp>();
+		DragDropOp->CurrentHoverText = FText::FromString(InComponent->AsActorComponent()->GetName());
+		DragDropOp->CurrentIconBrush = FSodaStyle::GetBrush(InComponent->GetVehicleComponentGUI().IcanName);
+		DragDropOp->Component = InComponent;
+		DragDropOp->Construct();
+		DragDropOp->SetupDefaults();
+		return DragDropOp;
+	}
+
+	TWeakInterfacePtr<ISodaVehicleComponent> Component;
+};
+
+/***********************************************************************************/
+class IComponentsBarTreeNode
+{
+public:
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable) = 0;
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() = 0;
+	virtual EComponentsBarTreeType GetType() = 0;
+	virtual TArray< TSharedRef<IComponentsBarTreeNode> > & GetChildren() = 0;
+};
+
+/***********************************************************************************/
+class SComponentTreeRow : public SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>
+{
+public:
+	SLATE_BEGIN_ARGS(SComponentTreeRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakInterfacePtr<ISodaVehicleComponent> InComponent, TWeakPtr<SVehicleComponentsList> InVehicleComponentsBar)
+	{
+		check(InComponent.IsValid());
+		Component = InComponent;
+		VehicleComponentsBar = InVehicleComponentsBar;
+		FSuperRowType::FArguments OutArgs;
+		//OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+		SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>::Construct(OutArgs, InOwnerTable);
+	}
+
+	virtual int32 OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const override
+	{
+		LayerId = SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>::OnPaint(Args, AllottedGeometry, MyCullingRect, OutDrawElements, LayerId, InWidgetStyle, bParentEnabled);
+
+		if (bIsDragEventRecognized)
+		{
+			const float Width = 2.0f;
+			FSlateDrawElement::MakeBox(
+				OutDrawElements,
+				LayerId++,
+				AllottedGeometry.ToPaintGeometry(
+					FVector2D(0, 0), 
+					FVector2D(AllottedGeometry.GetLocalSize().X, Width)),
+				FSodaStyle::Get().GetBrush(TEXT("Brushes.White")),
+				ESlateDrawEffect::None,
+				FLinearColor(1, 1, 1, 0.8f));
+		}
+
+		return LayerId;
+	}
+
+	virtual FReply OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override
+	{
+		return FReply::Handled().BeginDragDrop(FVehcielComponentDragDropOp::New(Component));
+	}
+
+	virtual void OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override
+	{
+		SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>::OnDragEnter(MyGeometry, DragDropEvent);
+
+		TSharedPtr< FDragDropOperation > Operation = DragDropEvent.GetOperation();
+		if (!Operation.IsValid())
+		{
+			return;
+		}
+
+		if (!Operation->IsOfType<FVehcielComponentDragDropOp>())
+		{
+			return;
+		}
+
+		bIsDragEventRecognized = true;
+		TSharedPtr<FVehcielComponentDragDropOp> DragDropOp = StaticCastSharedPtr<FVehcielComponentDragDropOp>(Operation);
+		if (Component->GetVehicleComponentGUI().Category == DragDropOp->Component->GetVehicleComponentGUI().Category)
+		{
+			DragDropOp->CurrentIconBrush = FSodaStyle::GetBrush("Icons.Success");
+			DragDropOp->CurrentIconColorAndOpacity = FSlateColor(FLinearColor(0.2f, 8.0f, 0.2f, 0.5f));
+		}
+		else
+		{
+			DragDropOp->CurrentIconBrush = FSodaStyle::GetBrush("Icons.Warning");
+			DragDropOp->CurrentIconColorAndOpacity = FSlateColor(FLinearColor(0.8f, 0.2f, 0.2f, 0.5f));
+		}
+	}
+	
+	virtual void OnDragLeave(const FDragDropEvent& DragDropEvent) override
+	{
+		SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>::OnDragLeave(DragDropEvent);
+
+		TSharedPtr< FDragDropOperation > Operation = DragDropEvent.GetOperation();
+		if (!Operation.IsValid())
+		{
+			return;
+		}
+
+		if (!Operation->IsOfType<FVehcielComponentDragDropOp>())
+		{
+			return;
+		}
+
+		bIsDragEventRecognized = false;
+		TSharedPtr<FVehcielComponentDragDropOp> DragDropOp = StaticCastSharedPtr<FVehcielComponentDragDropOp>(Operation);
+		DragDropOp->ResetToDefaultToolTip();
+	}
+	
+	virtual FReply OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override
+	{
+		TSharedPtr< FDragDropOperation > Operation = DragDropEvent.GetOperation();
+		if (!Operation.IsValid())
+		{
+			return FReply::Unhandled();
+		}
+
+		if (!Operation->IsOfType<FVehcielComponentDragDropOp>())
+		{
+			return FReply::Unhandled();
+		}
+
+		bIsDragEventRecognized = false;
+		TSharedPtr<FVehcielComponentDragDropOp> DragDropOp = StaticCastSharedPtr<FVehcielComponentDragDropOp>(Operation);
+		TWeakInterfacePtr<ISodaVehicleComponent> TargetComponent = DragDropOp->Component;
+
+		if (TargetComponent.IsValid() && Component.IsValid() && IsValid(Component->GetVehicle()) && IsValid(TargetComponent->GetVehicle()) && Component->GetVehicle() == TargetComponent->GetVehicle())
+		{
+			if (Component->GetVehicleComponentGUI().Category == DragDropOp->Component->GetVehicleComponentGUI().Category)
+			{
+				TargetComponent->GetVehicleComponentGUI().Order = Component->GetVehicleComponentGUI().Order;
+				bool bIncriment = false;
+				for (auto& It : Component->GetVehicle()->GetVehicleComponentsSorted(Component->GetVehicleComponentGUI().Category, true))
+				{
+					if (It == Component.Get()) bIncriment = true;
+					if(It != TargetComponent.Get() && bIncriment)
+					{
+						++It->GetVehicleComponentGUI().Order;
+					}
+				}
+				Component->GetVehicle()->GetVehicleComponentsSorted("", true); //Just normalize
+				Component->MarkAsDirty();
+				VehicleComponentsBar.Pin()->RequestSelectRow(TargetComponent.Get());
+				VehicleComponentsBar.Pin()->RebuildNodes();
+			}
+		}
+		return FReply::Handled();
+	}
+
+	virtual TSharedRef<SWidget> GenerateWidgetForColumn(const FName& InColumnName) override
+	{
+		check(Component.IsValid());
+		if (InColumnName == Column_CB_Enable)
+		{
+			return
+				SNew(SBox)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SPinWidget)
+					.CheckedHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Sensor")))
+					.CheckedNotHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Sensor")))
+					.NotCheckedHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Sensor")))
+					.NotCheckedNotHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Sensor")))
+					.bHideUnchecked(true)
+					.IsChecked(TAttribute<bool>::CreateLambda([this]() { return Component->IsVehicleComponentActiveted(); }))
+					.OnClicked(FOnClicked::CreateLambda([this]() { Component->Toggle(); return FReply::Handled(); }))
+					.Row(SharedThis(this))
+				];
+		}
+
+		if (InColumnName == Column_CB_StartUp)
+		{
+			return
+				SNew(SBox)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SPinWidget)
+					.ToolTipText_Lambda([this]() 
+					{
+						switch(Component->GetVehicleComponentCommon().Activation)
+						{
+						//case EVehicleComponentActivation::None:
+						case EVehicleComponentActivation::OnBeginPlay:
+							return FText::FromString("Activate on creation");
+						case EVehicleComponentActivation::OnStartScenario:
+							return FText::FromString("Activate on scaenario run");
+						}
+						return FText::FromString("Don't activate");
+					})
+					.CheckedHoveredBrush_Lambda([this]() 
+					{
+						switch(Component->GetVehicleComponentCommon().Activation)
+						{
+						//case EVehicleComponentActivation::None:
+						case EVehicleComponentActivation::OnBeginPlay:
+							return FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Forever"));
+						case EVehicleComponentActivation::OnStartScenario:
+							return FSodaStyle::Get().GetBrush(TEXT("SodaViewport.ToggleRealTime"));
+						}
+						return FSodaStyle::Get().GetBrush(TEXT("None"));
+					})
+					.CheckedNotHoveredBrush_Lambda([this]() 
+					{
+						switch(Component->GetVehicleComponentCommon().Activation)
+						{
+						//case EVehicleComponentActivation::None:
+						case EVehicleComponentActivation::OnBeginPlay:
+							return FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Forever"));
+						case EVehicleComponentActivation::OnStartScenario:
+							return FSodaStyle::Get().GetBrush(TEXT("SodaViewport.ToggleRealTime"));
+						}
+						return FSodaStyle::Get().GetBrush(TEXT("None"));
+					})
+					.NotCheckedHoveredBrush_Lambda([this]() {
+						if (Component->GetVehicleComponentCommon().Activation == EVehicleComponentActivation::None)
+						{
+							return FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Forever"));
+						}
+						return FSodaStyle::Get().GetBrush(TEXT("None"));
+					})
+					//.NotCheckedNotHoveredBrush(FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Sensor")))
+					.bHideUnchecked(true)
+					.IsChecked(TAttribute<bool>::CreateLambda([this]() 
+					{
+						return Component->GetVehicleComponentCommon().Activation != EVehicleComponentActivation::None;
+					}))
+					.OnClicked(FOnClicked::CreateLambda([this]() 
+					{ 
+						switch(Component->GetVehicleComponentCommon().Activation)
+						{
+						case EVehicleComponentActivation::None:
+							Component->GetVehicleComponentCommon().Activation = EVehicleComponentActivation::OnBeginPlay;
+							break;
+						case EVehicleComponentActivation::OnBeginPlay:
+							Component->GetVehicleComponentCommon().Activation = EVehicleComponentActivation::OnStartScenario;
+							break;
+						case EVehicleComponentActivation::OnStartScenario:
+							Component->GetVehicleComponentCommon().Activation = EVehicleComponentActivation::None;
+							break;
+						}
+						Component->MarkAsDirty();
+						return FReply::Handled();
+					}))
+					.Row(SharedThis(this))
+				];
+		}
+
+		if (InColumnName == Column_CB_ItemName)
+		{
+			return
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(18, 1, 6, 1)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SImage)
+					.Image(FSodaStyle::GetBrush(Component->GetVehicleComponentGUI().IcanName))
+					.ColorAndOpacity(FLinearColor(1, 1, 1, 0.7))
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(5, 1, 1, 1)
+				[
+					SAssignNew(InlineTextBlock, SInlineEditableTextBlock)
+					.Text(FText::FromString(Component->AsActorComponent()->GetName()))
+					.OnTextCommitted(this, &SComponentTreeRow::OnRenameComponent)
+					.IsSelected(this, &SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>::IsSelectedExclusively)
+				];
+		}
+
+		if (InColumnName == Column_CB_Remark)
+		{
+			return
+				SNew(STextBlock)
+				.Text_Lambda([this]() 
+				{
+					FString Remark;
+					Component->GetRemark(Remark);
+					return FText::FromString(Remark); 
+				})
+				.ColorAndOpacity(FLinearColor(0.3f, 0.3f, 0.3f));
+		}
+
+		if (InColumnName == Column_CB_Health)
+		{
+			return SNew(SBox)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SImage)
+					.Image( this, &SComponentTreeRow::GetComponentHealthBrush)
+					.ToolTipText(this, &SComponentTreeRow::GetComponentHealthToolTip)
+					.ColorAndOpacity(this, &SComponentTreeRow::GetComponentHealthColor)
+				];
+		}
+
+		return SNullWidget::NullWidget;
+	}
+
+	void OnRenameComponent(const FText& NewName, ETextCommit::Type Type)
+	{
+		if (Component.IsValid() && Component->RenameVehicleComponent(NewName.ToString()) && Component->GetVehicleComponentCommon().bIsTopologyComponent)
+		{
+			//ASodaVehicle* Vehicle = Component->GetVehicle();
+			//check(Vehicle);
+			//ASodaVehicle* NewVehicle = Vehicle->RespawnVehcile(FVector(0, 0, 50), FRotator::ZeroRotator, true, nullptr);
+			//VehicleComponentsBar->SetVehicle(NewVehicle);
+		}
+		VehicleComponentsBar.Pin()->RebuildNodes();
+	}
+
+	const FSlateBrush* GetComponentHealthBrush() const
+	{
+		if (Component->IsVehicleComponentInitializing())
+		{
+			return FSodaStyle::GetBrush("SodaIcons.Hourglass");
+		}
+		switch (Component->GetHealth())
+		{
+		case EVehicleComponentHealth::Disabled:
+			return FSodaStyle::GetBrush("Icons.Hidden");
+		case EVehicleComponentHealth::Ok:
+			return FSodaStyle::GetBrush("Icons.Success");
+		case EVehicleComponentHealth::Warning:
+			return FSodaStyle::GetBrush("Icons.Warning");
+		case EVehicleComponentHealth::Error:
+			return FSodaStyle::GetBrush("SodaIcons.Critical");
+		case EVehicleComponentHealth::Undefined:
+		default:
+			return FSodaStyle::GetBrush("SodaIcons.WTF");
+		}
+	}
+
+	FSlateColor GetComponentHealthColor() const
+	{
+		if (Component->IsVehicleComponentInitializing())
+		{
+			return FSlateColor(FLinearColor(0.0f, 0.5f, 0.8f, 0.5f));
+		}
+		switch (Component->GetHealth())
+		{
+		case EVehicleComponentHealth::Disabled:
+			return FSlateColor(FLinearColor(1.0f, 1.0f, 1.0f, 0.2f));
+		case EVehicleComponentHealth::Ok:
+			return FSlateColor(FLinearColor(0.2f, 8.0f, 0.2f, 0.5f));
+		case EVehicleComponentHealth::Warning:
+			return FSlateColor(FLinearColor(0.8f, 0.8f, 0.2f, 0.5f));
+		case EVehicleComponentHealth::Error:
+			return FSlateColor(FLinearColor(0.8f, 0.2f, 0.2f, 0.5f));
+		case EVehicleComponentHealth::Undefined:
+		default:
+			return FSlateColor(FLinearColor(0.8f, 0.2f, 0.2f, 0.5f));
+		}
+	}
+
+	FText GetComponentHealthToolTip() const
+	{
+		if (Component->IsVehicleComponentInitializing())
+		{
+			return FText::FromString("Component is initializing...");
+		}
+		switch (Component->GetHealth())
+		{
+		case EVehicleComponentHealth::Disabled:
+			return FText::FromString("Component is disabled");
+			break;
+		case EVehicleComponentHealth::Ok:
+			return FText::FromString("Component is OK");
+		case EVehicleComponentHealth::Warning:
+			return FText::FromString("There is/are some warning(s)");
+		case EVehicleComponentHealth::Error:
+			return FText::FromString("Component health is critical");
+		case EVehicleComponentHealth::Undefined:
+		default:
+			return FText::FromString("Undefined health");
+		}
+	}
+
+	TWeakInterfacePtr<ISodaVehicleComponent> Component;
+	bool bIsDragEventRecognized = false;
+	TWeakPtr <SVehicleComponentsList> VehicleComponentsBar;
+	TSharedPtr<SInlineEditableTextBlock> InlineTextBlock;
+};
+
+/***********************************************************************************/
+class SFilterTreeRow : public SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>
+{
+public:
+	SLATE_BEGIN_ARGS(SFilterTreeRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, const FString & InCategory, TWeakPtr<SVehicleComponentsList> InVehicleComponentsBar)
+	{
+		Category = InCategory;
+		VehicleComponentsBar = InVehicleComponentsBar;
+		FSuperRowType::FArguments OutArgs;
+		//OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+		SMultiColumnTableRow<TSharedRef<IComponentsBarTreeNode>>::Construct(OutArgs, InOwnerTable);
+	}
+
+	virtual TSharedRef<SWidget> GenerateWidgetForColumn(const FName& InColumnName) override
+	{
+		if (InColumnName == Column_CB_ItemName)
+		{
+			return
+				SNew(SBox)
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(2, 0, 2, 0)
+					[
+						SNew(SExpanderArrow, SharedThis(this)).IndentAmount(12)
+					]
+					+ SHorizontalBox::Slot()
+					.FillWidth(1.0f)
+					[
+						SNew(STextBlock)
+						.Text(FText::FromString(Category))
+						.ColorAndOpacity(FLinearColor(1, 1, 1, 0.5))
+					]
+				];
+		}
+
+
+		return SNullWidget::NullWidget;
+	}
+
+	FString Category;
+	TWeakPtr<SVehicleComponentsList> VehicleComponentsBar;
+};
+
+/***********************************************************************************/
+class FComponentTreeNode : public IComponentsBarTreeNode, public TSharedFromThis<FComponentTreeNode>
+{
+public:
+	FComponentTreeNode(TWeakInterfacePtr<ISodaVehicleComponent> InComponent, TWeakPtr<SVehicleComponentsList> InVehicleComponentsBar) :
+		Component(InComponent),
+		VehicleComponentsBar(InVehicleComponentsBar)
+	{}
+	virtual ~FComponentTreeNode() {}
+
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable) override
+	{
+		return SAssignNew(TreeRow, SComponentTreeRow, OwnerTable, Component, VehicleComponentsBar);
+	}
+
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override
+	{
+		const bool bCloseAfterSelection = true;
+		FMenuBuilder MenuBuilder(bCloseAfterSelection, TSharedPtr<FUICommandList>());
+		MenuBuilder.BeginSection(NAME_None);
+
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Delete")),
+			FText::GetEmpty(),
+			FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "Icons.Delete"),
+			FUIAction(FExecuteAction::CreateSP(this, &FComponentTreeNode::OnDeleteComponent)));
+
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Rename")),
+			FText::GetEmpty(),
+			FSlateIcon(FCoreStyle::Get().GetStyleSetName(), "Icons.Edit"),
+			FUIAction(FExecuteAction::CreateSP(this, &FComponentTreeNode::OnRenameComponent)));
+
+		if (Component->GetVehicleComponentGUI().bIsDeleted)
+		{
+			MenuBuilder.AddMenuEntry(
+				FText::FromString(TEXT("Restore")),
+				FText::GetEmpty(),
+				FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Reset"),
+				FUIAction(FExecuteAction::CreateSP(this, &FComponentTreeNode::OnRestoreComponent)));
+		}
+
+
+		MenuBuilder.EndSection();
+
+		return MenuBuilder.MakeWidget();
+	}
+
+	virtual EComponentsBarTreeType GetType() override { return EComponentsBarTreeType::Component; }
+
+	virtual TArray<TSharedRef<IComponentsBarTreeNode>> & GetChildren() override 
+	{ 
+		static TArray<TSharedRef<IComponentsBarTreeNode>> Dummy;
+		return Dummy;
+	}
+
+	void OnRenameComponent()
+	{
+		VehicleComponentsBar.Pin()->RequestEditeTextBox(TreeRow->InlineTextBlock);
+	}
+
+	void OnRestoreComponent()
+	{
+		Component->GetVehicleComponentGUI().bIsDeleted = false;
+		Component->MarkAsDirty();
+
+		if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+		{
+			TSharedPtr<soda::SMessageBox> MsgBox = GameMode->ShowMessageBox(
+				soda::EMessageBoxType::OK, "Restore Vehicle Component", "Save and restart vehicle to apply the changes");
+		}
+
+	}
+
+	void OnDeleteComponent()
+	{
+		if (Component.IsValid())
+		{
+			//bool bIsTopologyComponent = Component->GetVehicleComponentCommon().bIsTopologyComponent;
+			ASodaVehicle* Vehicle = Component->GetVehicle();
+			check(Vehicle);
+			Component->GetVehicle()->MarkAsDirty();
+			Component->RemoveVehicleComponent();
+			//if (bIsTopologyComponent)
+			//{
+			//	ASodaVehicle * NewVehicle = Vehicle->RespawnVehcile(FVector(0, 0, 50), FRotator::ZeroRotator, true, nullptr);
+			//	VehicleComponentsBar->SetVehicle(NewVehicle);
+			//}
+			VehicleComponentsBar.Pin()->RebuildNodes();
+		}
+	}
+
+	TWeakInterfacePtr< ISodaVehicleComponent> & GetComponent() { return Component; }
+
+private:
+	TWeakInterfacePtr<ISodaVehicleComponent> Component;
+	TWeakPtr<SVehicleComponentsList> VehicleComponentsBar;
+	TSharedPtr< SComponentTreeRow > TreeRow;
+};
+
+/***********************************************************************************/
+class FFilterTreeNode: public IComponentsBarTreeNode, public TSharedFromThis<FFilterTreeNode>
+{
+public:
+	FFilterTreeNode(TWeakObjectPtr<ASodaVehicle> InVehicle, const FString& InCategory, const TSharedPtr<SVehicleComponentsList>& InVehicleComponentsBar) :
+		Vehicle(InVehicle),
+		Category(InCategory),
+		VehicleComponentsBar(InVehicleComponentsBar)
+	{
+		TArray<ISodaVehicleComponent*> VehicleComponents = Vehicle->GetVehicleComponentsSorted(InCategory);
+		for (auto& It : VehicleComponents)
+		{
+			ChildNodes.Add(MakeShared<FComponentTreeNode>(It, VehicleComponentsBar));
+		}
+	}
+
+	virtual ~FFilterTreeNode() {}
+
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable) override
+	{
+		return SNew(SFilterTreeRow, OwnerTable, Category, VehicleComponentsBar);
+	}
+
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override
+	{
+		return TSharedPtr<SWidget>();
+	}
+
+	virtual EComponentsBarTreeType GetType() override { return EComponentsBarTreeType::Filter; }
+
+	virtual TArray< TSharedRef<IComponentsBarTreeNode> > & GetChildren() override { return ChildNodes; }
+
+private:
+	TWeakObjectPtr<ASodaVehicle> Vehicle;
+	FString Category;
+	TArray<TSharedRef<IComponentsBarTreeNode>> ChildNodes;
+	TWeakPtr<SVehicleComponentsList> VehicleComponentsBar;
+};
+
+/***********************************************************************************/
+
+SVehicleComponentsList::~SVehicleComponentsList()
+{
+	if (bInteractiveMode && Vehicle.IsValid())
+	{
+		if (USodaGameViewportClient* ViewportClient = Cast<USodaGameViewportClient>(Vehicle->GetWorld()->GetGameViewport()))
+		{
+			ViewportClient->Selection->UnfreeseSelectedActor();
+		}
+	}
+
+	if (LastSelectdComponen.IsValid())
+	{
+		if (UPrimitiveComponent* PrimitiveComponent = Cast<UPrimitiveComponent>(LastSelectdComponen.Get()))
+		{
+			PrimitiveComponent->MarkRenderStateDirty();
+		}
+	}
+}
+
+void SVehicleComponentsList::Construct( const FArguments& InArgs, ASodaVehicle* InVehicle, bool bInInteractiveMode)
+{
+	Vehicle = InVehicle;
+	bInteractiveMode = bInInteractiveMode;
+
+	if (bInteractiveMode)
+	{
+		if (USodaGameViewportClient* ViewportClient = Cast<USodaGameViewportClient>(Vehicle->GetWorld()->GetGameViewport()))
+		{
+			ViewportClient->Selection->FreeseSelectedActor();
+		}
+	}
+
+	ChildSlot
+	[
+		SNew(SVerticalBox)
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		[
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Recessed")))
+			.Padding(5)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				//.Padding(0, 0, 0, 0)
+				[
+					SNew(SVehicleComponentClassCombo)
+					.OnComponentClassSelected(this, &SVehicleComponentsList::OnComponentClassSelected)
+				]
+				+ SHorizontalBox::Slot()
+				.FillWidth(1.0)
+				.VAlign(VAlign_Center)
+				.Padding(5, 0, 0, 0)
+				[
+					SAssignNew(SearchBox, SSearchBox)
+					//.OnTextChanged(this, &SVehicleComponentClassCombo::OnSearchBoxTextChanged)
+					//.OnTextCommitted(this, &SVehicleComponentClassCombo::OnSearchBoxTextCommitted);
+				] 
+			]
+		]
+		+ SVerticalBox::Slot()
+		.AutoHeight()
+		.Padding(2)
+		+ SVerticalBox::Slot()
+		.FillHeight(1)
+		[
+			SAssignNew(TreeView, STreeView<TSharedRef<IComponentsBarTreeNode>>)
+			.HeaderRow(
+				SNew(SHeaderRow)
+				+SHeaderRow::Column(Column_CB_Enable)
+				.ToolTipText(FText::FromString("Activate/deactivate vehicle Component"))
+				.FixedWidth(24)
+				.HAlignCell(HAlign_Center)
+				.HeaderContent()
+				[
+					SNew(SBox)
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					.Padding(0)
+					[
+						SNew(SImage)
+						.Image(FSodaStyle::Get().GetBrush(TEXT("SodaIcons.Sensor")))
+					]
+				]
+				+SHeaderRow::Column(Column_CB_StartUp)
+				.ToolTipText(FText::FromString("Sensor auto-activation behavior (never / after creation / when scenario is run)"))
+				.FixedWidth(24)
+				.HAlignCell(HAlign_Center)
+				.HeaderContent()
+				[
+					SNew(SBox)
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					.Padding(0)
+					[
+						SNew(SImage)
+						.Image(FSodaStyle::Get().GetBrush(TEXT("SodaIcons.LapCount")))
+					]
+				]
+				+ SHeaderRow::Column(Column_CB_ItemName)
+				.DefaultLabel(FText::FromString("Component Name"))
+				+ SHeaderRow::Column(Column_CB_Remark)
+				.DefaultLabel(FText::FromString("Remark"))
+				+ SHeaderRow::Column(Column_CB_Health)	
+				.FixedWidth(24)
+				.DefaultLabel(FText::FromString(""))
+			)
+			.SelectionMode(ESelectionMode::Single)
+			.TreeItemsSource(&RootNodes)
+			.OnGenerateRow(this, &SVehicleComponentsList::MakeRowWidget)
+			.OnSelectionChanged(this, &SVehicleComponentsList::OnSelectionChanged)
+			.OnContextMenuOpening(this, &SVehicleComponentsList::OnContextMenuOpening)
+			.OnGetChildren(this, &SVehicleComponentsList::OnGetChildren)
+			.OnMouseButtonDoubleClick(this, &SVehicleComponentsList::OnDoubleClick)
+		]
+	];
+	
+	RebuildNodes();
+}
+
+UActorComponent* SVehicleComponentsList::OnComponentClassSelected(TSubclassOf<UActorComponent> Component, UObject* Object)
+{
+	if (Vehicle.IsValid())
+	{
+		TWeakInterfacePtr<ISodaVehicleComponent> NewComponent = Vehicle->AddVehicleComponent(Component, NAME_None);
+		if (NewComponent.IsValid())
+		{
+			RequestSelectRow(NewComponent.Get());
+			Vehicle->MarkAsDirty();
+		}
+		RebuildNodes();
+	}
+	return nullptr;
+}
+
+void SVehicleComponentsList::RebuildNodes()
+{
+	RootNodes.Empty();
+
+	if (!Vehicle.IsValid())
+	{
+		TreeView->RebuildList();
+		return;
+	}
+
+	TArray<ISodaVehicleComponent*> Components = Vehicle->GetVehicleComponents();
+	TSet<FString> Categories;
+	for (auto& It : Components)
+	{
+		Categories.Add(It->GetVehicleComponentGUI().Category);
+	}
+	TArray<FString> CategoriesSorted = Categories.Array();
+	CategoriesSorted.Sort([](const auto& A, const auto& B) { return A.Compare(B, ESearchCase::IgnoreCase) < 0; });
+	bool bLastNodeIsDeleted = false;
+	if (CategoriesSorted.Remove("DELETED") > 0)
+	{
+		CategoriesSorted.Add("DELETED"); // Push "DELETED" to the ånd of the array
+		bLastNodeIsDeleted = true;
+	}
+	for (auto& It : CategoriesSorted)
+	{
+		RootNodes.Add(MakeShared<FFilterTreeNode>(Vehicle, It, SharedThis(this)));
+	}
+
+	TreeView->RebuildList();
+
+	for (auto& It : RootNodes)
+	{
+		TreeView->SetItemExpansion(It, true);
+	}
+
+	if (bLastNodeIsDeleted)
+	{
+		TreeView->SetItemExpansion(RootNodes.Last(), false);
+	}
+}
+
+TSharedRef< ITableRow > SVehicleComponentsList::MakeRowWidget(TSharedRef<IComponentsBarTreeNode> Item, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return Item->MakeRowWidget(OwnerTable);
+}
+
+void SVehicleComponentsList::OnGetChildren(TSharedRef<IComponentsBarTreeNode> InTreeNode, TArray< TSharedRef<IComponentsBarTreeNode> >& OutChildren)
+{
+	OutChildren = InTreeNode->GetChildren();
+}
+
+void SVehicleComponentsList::OnSelectionChanged(TSharedPtr<IComponentsBarTreeNode> Node, ESelectInfo::Type SelectInfo)
+{
+	if (USodaGameViewportClient* ViewportClient = Cast<USodaGameViewportClient>(Vehicle->GetWorld()->GetGameViewport()))
+	{
+		if (LastSelectdComponen.IsValid())
+		{
+			if (UPrimitiveComponent* PrimitiveComponent = Cast<UPrimitiveComponent>(LastSelectdComponen.Get()))
+			{
+				PrimitiveComponent->MarkRenderStateDirty();
+			}
+			LastSelectdComponen.Reset();
+		}
+
+		if (Node)
+		{
+			if (Node->GetType() == EComponentsBarTreeType::Component)
+			{
+				FComponentTreeNode* ComponentNode = static_cast<FComponentTreeNode*> (Node.Get());
+				TWeakInterfacePtr<ISodaVehicleComponent> Component = ComponentNode->GetComponent();
+				LastSelectdComponen = Component;
+				if (Component.IsValid())
+				{
+					
+					if (UPrimitiveComponent* PrimitiveComponent = Cast<UPrimitiveComponent>(Component.Get()))
+					{
+						PrimitiveComponent->MarkRenderStateDirty();
+					}
+
+					if (USceneComponent* SceneComponent = Cast<USceneComponent>(Component.Get()))
+					{
+						ViewportClient->SetWidgetTarget(SceneComponent);
+						return;
+					}
+				}
+			}
+		}
+		ViewportClient->SetWidgetTarget(nullptr);
+	}
+}
+
+void SVehicleComponentsList::OnDoubleClick(TSharedRef<IComponentsBarTreeNode> Node)
+{
+	if (Node->GetType() == EComponentsBarTreeType::Component)
+	{
+		FComponentTreeNode* ComponentNode = static_cast<FComponentTreeNode*> (&Node.Get());
+		TWeakInterfacePtr<ISodaVehicleComponent> Component = ComponentNode->GetComponent();
+		if (Component.IsValid())
+		{
+			if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+			{
+				GameMode->PushToolBox(
+					SNew(SToolBox)
+					.Caption(FText::FromString(Component->AsActorComponent()->GetOwner()->GetName() + " -> " + Component->AsActorComponent()->GetName()))
+					[
+						MakeComponentDetailsBar(Component.Get())
+					]
+				);
+			}
+		}
+	}
+}
+
+TSharedPtr<SWidget> SVehicleComponentsList::OnContextMenuOpening()
+{
+	const int32 NumItems = TreeView->GetNumItemsSelected();
+	if (NumItems == 1)
+	{
+		TArray<TSharedRef<IComponentsBarTreeNode>> SelectedNodes;
+		TreeView->GetSelectedItems(SelectedNodes);
+		return SelectedNodes[0]->OnContextMenuOpening();
+	}
+	return TSharedPtr<SWidget>();
+}
+
+FReply SVehicleComponentsList::OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.GetEffectingButton() == EKeys::RightMouseButton)
+	{
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+
+void SVehicleComponentsList::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+{
+	SCompoundWidget::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+
+	if (!Vehicle.IsValid() && RootNodes.Num())
+	{
+		RebuildNodes();
+		RequestedSelecteComponent.Reset();
+		RequestedEditeTextBox.Reset();
+		return;
+	}
+
+	if (!TreeView->IsPendingRefresh())
+	{
+		if (RequestedSelecteComponent.IsValid())
+		{
+			class STreeViewPrivate: public STreeView<TSharedRef<IComponentsBarTreeNode>>
+			{
+			public:
+				TArray<TSharedRef<IComponentsBarTreeNode>>& GetLinearizedItems() { return LinearizedItems; }
+			};
+			STreeViewPrivate* TreeViewPrivate = static_cast<STreeViewPrivate*>(TreeView.Get());
+			TArray<TSharedRef<IComponentsBarTreeNode>>& LinearizedItems = TreeViewPrivate->GetLinearizedItems();
+			for (auto& It : LinearizedItems)
+			{
+				if (It->GetType() == EComponentsBarTreeType::Component)
+				{
+					FComponentTreeNode* Node = static_cast<FComponentTreeNode*>(&It.Get());
+					if (Node->GetComponent().IsValid() && Node->GetComponent() == RequestedSelecteComponent)
+					{
+						TreeView->SetSelection(It);
+					}
+				}
+			}
+			RequestedSelecteComponent.Reset();
+		}
+	}
+
+	if (RequestedEditeTextBox.IsValid())
+	{
+		RequestedEditeTextBox.Pin()->EnterEditingMode();
+		RequestedEditeTextBox.Reset();
+	}
+}
+
+TSharedRef<SWidget> SVehicleComponentsList::MakeComponentDetailsBar(ISodaVehicleComponent* VehicleComponent)
+{
+	check(VehicleComponent);
+
+	FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+	soda::FDetailsViewArgs Args;
+	Args.bHideSelectionTip = true;
+	Args.bLockable = false;
+	Args.NameAreaSettings = soda::FDetailsViewArgs::HideNameArea;
+	Args.bGameModeOnlyVisible = true;
+	TSharedPtr<soda::IDetailsView> DetailView = RuntimeEditorModule.CreateDetailView(Args);
+	DetailView->SetObject(VehicleComponent->AsActorComponent());
+	DetailView->SetIsPropertyVisibleDelegate(soda::FIsPropertyVisible::CreateLambda([](const soda::FPropertyAndParent& PropertyAndParent)
+	{
+		// For details views in the level editor all properties are the instanced versions
+		if (PropertyAndParent.Property.HasAllPropertyFlags(CPF_DisableEditOnInstance))
+		{
+			return false;
+		}
+
+		const FProperty& Property = PropertyAndParent.Property;
+		const FArrayProperty* ArrayProperty = CastField<const FArrayProperty>(&Property);
+		const FSetProperty* SetProperty = CastField<const FSetProperty>(&Property);
+		const FMapProperty* MapProperty = CastField<const FMapProperty>(&Property);
+
+		const FProperty* TestProperty = ArrayProperty ? ArrayProperty->Inner : &Property;
+		const FObjectPropertyBase* ObjectProperty = CastField<const FObjectPropertyBase>(TestProperty);
+		bool bIsActorProperty = (ObjectProperty != nullptr && ObjectProperty->PropertyClass->IsChildOf(AActor::StaticClass()));
+
+		bool bIsComponent = (ObjectProperty != nullptr && ObjectProperty->PropertyClass->IsChildOf(UActorComponent::StaticClass()));
+
+		if (bIsComponent)
+		{
+			// Don't show sub components properties, thats what selecting components in the component tree is for.
+			return false;
+		}
+		return true;
+	}));
+
+	return DetailView.ToSharedRef();
+}
+
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/SWaitingPanel.cpp b/Source/UnrealSoda/Private/UI/SWaitingPanel.cpp
new file mode 100644
index 0000000..cbe746b
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SWaitingPanel.cpp
@@ -0,0 +1,73 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SWaitingPanel.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBackgroundBlur.h"
+#include "Widgets/Images/SThrobber.h"
+#include "Widgets/SBoxPanel.h"
+#include "Soda/SodaGameMode.h"
+
+namespace soda
+{
+
+
+void SWaitingPanel::Construct( const FArguments& InArgs )
+{
+	ChildSlot
+	[
+		SNew(SBackgroundBlur)
+		.VAlign(VAlign_Center)
+		.HAlign(HAlign_Center)
+		.BlurStrength(4)
+		//.Padding(20.0f)
+		.CornerRadius(FVector4(4.0f, 4.0f, 4.0f, 4.0f))
+		.Cursor(EMouseCursor::Default)
+		[
+			SNew(SVerticalBox)
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SCircularThrobber)
+			]
+			+SVerticalBox::Slot()
+			.Padding(0, 5, 0, 0)
+			.AutoHeight()
+			[
+				SNew(STextBlock)
+				//.TextStyle(&FSodaStyle::Get().GetWidgetStyle<FTextBlockStyle>("SmallText"))
+				.Text(InArgs._Caption)
+			]
+			+SVerticalBox::Slot()
+			.Padding(0, 5, 0, 0)
+			.AutoHeight()
+			[
+				SNew(STextBlock)
+				//.TextStyle(&FSodaStyle::Get().GetWidgetStyle<FTextBlockStyle>("SmallText"))
+				.Text(InArgs._SubCaption)
+			]
+		]
+		
+	];
+}
+
+bool SWaitingPanel::CloseWindow()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		if (!GameMode->CloseWaitingPanel(this))
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.cpp
new file mode 100644
index 0000000..9619901
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.cpp
@@ -0,0 +1,209 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.h"
+#include "UI/ScenarioAction/SScenarioActionTree.h"
+#include "UI/Common/SActionButton.h"
+#include "SodaStyleSet.h"
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "Soda/ISodaActor.h" 
+#include "Soda/SodaGameMode.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Widgets/Input/SButton.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+
+void SScenarioActionActorRow::Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UScenarioActionActorNode> InNode, const TSharedRef<SScenarioActionTree>& InTree)
+{
+	check(InNode.IsValid());
+	Node = InNode;
+	Tree = InTree;
+
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	check(GameMode);
+
+	FName Icon = TEXT("ClassIcon.Actor");
+	if (ISodaActor* SodaActor = Cast<ISodaActor>(Node->GetActor()))
+	{
+		const FSodaActorDescriptor& Desc = GameMode->GetSodaActorDescriptor(Node->GetActor()->GetClass());
+		Icon = Desc.Icon;
+	}
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::FArguments OutArgs;
+	OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::Construct(OutArgs
+		.Padding(2)
+		.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>(TEXT("ScenarioAction.ActionRowDefault")))
+		.Content()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(1, 1, 3, 1)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SImage)
+				.Image(FSodaStyle::GetBrush(Icon))
+				.ColorAndOpacity(FLinearColor(1, 1, 1, 0.5))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(Node->GetActor()->GetName()))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			.Padding(0, 0, 5, 0)
+			[
+				SNew(SActionButton)
+				.Icon(nullptr)
+				.ContentPadding(8)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.AddButton")
+				.MenuContent()
+				[
+					GenerateAddMenu()
+				]
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				SNew(SButton)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+				.OnClicked(this, &SScenarioActionActorRow::OnDeleteAction)
+			]
+		], 
+		InOwnerTable);
+}
+
+TSharedRef<SWidget> SScenarioActionActorRow::GenerateAddMenu()
+{
+	if (Node.IsValid() && Node->GetActor())
+	{
+		FMenuBuilder MenuBuilder(true, nullptr);
+
+		if (Cast<ASodaVehicle>(Node->GetActor()))
+		{
+			MenuBuilder.BeginSection(NAME_None, FText::FromString(TEXT("Vehicle Components")));
+			MenuBuilder.AddSubMenu(
+				FText::FromString("Components"),
+				FText::FromString("Components"),
+				FNewMenuDelegate::CreateRaw(this, &SScenarioActionActorRow::GenerateAddComponentMenu),
+				false,
+				FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaViewport.SubMenu.Stats")
+			);
+			MenuBuilder.EndSection();
+		}
+
+		TMap<FString, TArray<UFunction*>> FunctionMap;
+		FScenarioActionUtils::GetScenarioFunctionsByCategory(Node->GetActor()->GetClass(), FunctionMap);
+		TArray<FString> Categories;
+		FunctionMap.GetKeys(Categories);
+
+		for (auto& Category : Categories)
+		{
+			MenuBuilder.BeginSection(NAME_None, FText::FromString(Category));
+			TArray<UFunction*>& Functions = FunctionMap[Category];
+			for (auto& Function : Functions)
+			{
+				MenuBuilder.AddMenuEntry(
+					FText::FromString(Function->GetName()),
+					FText::FromString(Function->GetName()),
+					FSlateIcon(),
+					FExecuteAction::CreateRaw(this, &SScenarioActionActorRow::OnAddFunctionNode, Function));
+			}
+			MenuBuilder.EndSection();
+		}
+		
+		return MenuBuilder.MakeWidget();
+	}
+	else
+	{
+		return SNullWidget::NullWidget;
+	}
+}
+
+void SScenarioActionActorRow::GenerateAddComponentMenu(FMenuBuilder& MenuBuilder)
+{
+	if (Node.IsValid() && Node->GetActor())
+	{
+		TMap<FString, TArray<UActorComponent*>> ComponentMap;
+		FScenarioActionUtils::GetComponentsByCategory(Node->GetActor(), ComponentMap);
+		TArray<FString> Categories;
+		ComponentMap.GetKeys(Categories);
+		
+		for (auto& Category : Categories)
+		{
+			MenuBuilder.BeginSection(NAME_None, FText::FromString(Category));
+			TArray<UActorComponent*>& Components = ComponentMap[Category];
+			for (auto& Component : Components)
+			{
+				ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(Component);
+				check(VehicleComponent);
+
+				MenuBuilder.AddMenuEntry(
+					FText::FromString(Component->GetName()),
+					FText::FromString(Component->GetName()),
+					FSlateIcon(FSodaStyle::Get().GetStyleSetName(), VehicleComponent->GetVehicleComponentGUI().IcanName),
+					FExecuteAction::CreateRaw(this, &SScenarioActionActorRow::OnAddComponentNode, Component));
+			}
+			MenuBuilder.EndSection();
+		}
+	}
+}
+
+void SScenarioActionActorRow::GenerateAddFunctionsMenu(FMenuBuilder& MenuBuilder)
+{
+
+}
+
+void SScenarioActionActorRow::OnAddComponentNode(UActorComponent * Component)
+{
+	if (Node.IsValid() && Node->GetActor())
+	{
+		UScenarioActionComponentNode* ComponentNode = NewObject<UScenarioActionComponentNode>(Node.Get());
+		check(ComponentNode);
+		ComponentNode->InitializeNode(Component);
+		Node->AddChildrenNode(ComponentNode);
+		Tree->RebuildNodes();
+	}
+}
+
+void SScenarioActionActorRow::OnAddFunctionNode(UFunction* Function)
+{
+	if (Node.IsValid() && Node->GetActor())
+	{
+		UScenarioActionFunctionNode* FunctionNode = NewObject<UScenarioActionFunctionNode>(Node.Get());
+		check(FunctionNode);
+		FunctionNode->InitializeNode(Node->GetActor(), Function);
+		Node->AddChildrenNode(FunctionNode);
+		Tree->RebuildNodes();
+	}
+}
+
+void SScenarioActionActorRow::OnAddPropertyNode(FProperty * Property)
+{
+	check(Property);
+	if (Node.IsValid() && Node->GetActor())
+	{
+		UScenarioActionPropertyNode* PropertyNode = NewObject<UScenarioActionPropertyNode>(Node.Get());
+		check(PropertyNode);
+		Node->CaptureProperty(Property);
+		PropertyNode->UpdateChildBodyNode();
+		Node->AddChildrenNode(PropertyNode);
+		Tree->RebuildNodes();
+	}
+}
+
+FReply SScenarioActionActorRow::OnDeleteAction()
+{
+	if (Node.IsValid())
+	{
+		Node->RemoveThisNode();
+		Tree->RebuildNodes();
+	}
+	return FReply::Handled();
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.h b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.h
new file mode 100644
index 0000000..ee93b81
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionActorRow.h
@@ -0,0 +1,33 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Widgets/Views/STableRow.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class FMenuBuilder;
+class UActorComponent;
+class FProperty;
+class UFunction;
+
+class SScenarioActionActorRow : public STableRow<TWeakObjectPtr<UScenarioActionNode>>
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionActorRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& Args, const TSharedRef<STableViewBase>& OwnerTable, TWeakObjectPtr<UScenarioActionActorNode> Node, const TSharedRef<SScenarioActionTree>& OwnerTree);
+
+	TWeakObjectPtr<UScenarioActionActorNode> Node;
+	//bool bIsDragEventRecognized = false;
+	TSharedPtr<SScenarioActionTree> Tree;
+
+private:
+	TSharedRef<SWidget> GenerateAddMenu();
+	void GenerateAddComponentMenu(FMenuBuilder& MenuBuilder);
+	void GenerateAddFunctionsMenu(FMenuBuilder& MenuBuilder);
+	void OnAddComponentNode(UActorComponent* Component);
+	void OnAddPropertyNode(FProperty* Property);
+	void OnAddFunctionNode(UFunction* Function);
+	FReply OnDeleteAction();
+};
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.cpp
new file mode 100644
index 0000000..11a625a
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.cpp
@@ -0,0 +1,149 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.h"
+#include "UI/ScenarioAction/SScenarioActionTree.h"
+#include "UI/Common/SActionButton.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "SodaStyleSet.h"
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Widgets/Input/SButton.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Components/ActorComponent.h"
+
+void SScenarioActionComponentRow::Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UScenarioActionComponentNode> InNode, const TSharedRef<SScenarioActionTree>& InTree)
+{
+	check(InNode.IsValid());
+	Node = InNode;
+	Tree = InTree;
+
+	FName Icon = TEXT("ClassIcon.Actor");
+	if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(Node->GetActorComponent()))
+	{
+		Icon = VehicleComponent->GetVehicleComponentGUI().IcanName;
+	}
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::FArguments OutArgs;
+	OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::Construct(
+		OutArgs
+		.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>(TEXT("ScenarioAction.ActionRowDefault")))
+		.Padding(2)
+		.Content()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(1, 1, 3, 1)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SImage)
+				.Image(FSodaStyle::GetBrush(Icon))
+				.ColorAndOpacity(FLinearColor(1, 1, 1, 0.5))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(Node->GetActorComponent()->GetName()))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			.Padding(0, 0, 5, 0)
+			[
+				SNew(SActionButton)
+				.Icon(nullptr)
+				.ContentPadding(8)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.AddButton")
+				.MenuContent()
+				[
+					GenerateAddMenu()
+				]
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				SNew(SButton)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+				.OnClicked(this, &SScenarioActionComponentRow::OnDeleteAction)
+			]
+		],
+		InOwnerTable
+	);
+}
+
+
+TSharedRef<SWidget> SScenarioActionComponentRow::GenerateAddMenu()
+{
+	if (Node.IsValid() && Node->GetActorComponent())
+	{
+		FMenuBuilder MenuBuilder(true, nullptr);
+
+		TMap<FString, TArray<UFunction*>> FunctionMap;
+		FScenarioActionUtils::GetScenarioFunctionsByCategory(Node->GetActorComponent()->GetClass(), FunctionMap);
+		TArray<FString> Categories;
+		FunctionMap.GetKeys(Categories);
+
+		for (auto& Category : Categories)
+		{
+			MenuBuilder.BeginSection(NAME_None, FText::FromString(Category));
+			TArray<UFunction*>& Functions = FunctionMap[Category];
+			for (auto& Function : Functions)
+			{
+				MenuBuilder.AddMenuEntry(
+					FText::FromString(Function->GetName()),
+					FText::FromString(Function->GetName()),
+					FSlateIcon(),
+					FExecuteAction::CreateRaw(this, &SScenarioActionComponentRow::OnAddFunctionNode, Function));
+			}
+			MenuBuilder.EndSection();
+		}
+
+		return MenuBuilder.MakeWidget();
+	}
+	else
+	{
+		return SNullWidget::NullWidget;
+	}
+}
+
+void SScenarioActionComponentRow::OnAddFunctionNode(UFunction* Function)
+{
+	if (Node.IsValid() && Node->GetActorComponent())
+	{
+		UScenarioActionFunctionNode* FunctionNode = NewObject<UScenarioActionFunctionNode>(Node.Get());
+		check(FunctionNode);
+		FunctionNode->InitializeNode(Node->GetActorComponent(), Function);
+		Node->AddChildrenNode(FunctionNode);
+		Tree->RebuildNodes();
+	}
+}
+
+void SScenarioActionComponentRow::OnAddPropertyNode(FProperty* Property)
+{
+	check(Property);
+	if (Node.IsValid() && Node->GetActorComponent())
+	{
+		UScenarioActionPropertyNode* PropertyNode = NewObject<UScenarioActionPropertyNode>(Node.Get());
+		check(PropertyNode);
+		Node->CaptureProperty(Property);
+		PropertyNode->UpdateChildBodyNode();
+		Node->AddChildrenNode(PropertyNode);
+		Tree->RebuildNodes();
+	}
+}
+
+FReply SScenarioActionComponentRow::OnDeleteAction()
+{
+	if (Node.IsValid())
+	{
+		Node->RemoveThisNode();
+		Tree->RebuildNodes();
+	}
+	return FReply::Handled();
+}
+
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.h b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.h
new file mode 100644
index 0000000..360e0ac
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionComponentRow.h
@@ -0,0 +1,25 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Widgets/Views/SListView.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class SScenarioActionComponentRow : public STableRow<TWeakObjectPtr<UScenarioActionNode>>
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionComponentRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& Args, const TSharedRef<STableViewBase>& OwnerTable, TWeakObjectPtr<UScenarioActionComponentNode> Node, const TSharedRef<SScenarioActionTree>& OwnerTree);
+
+	TWeakObjectPtr<UScenarioActionComponentNode> Node;
+	//bool bIsDragEventRecognized = false;
+	TSharedPtr<SScenarioActionTree> Tree;
+
+private:
+	TSharedRef<SWidget> GenerateAddMenu();
+	void OnAddPropertyNode(FProperty* Property);
+	void OnAddFunctionNode(UFunction* Function);
+	FReply OnDeleteAction();
+};
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.cpp
new file mode 100644
index 0000000..a6d9b02
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.cpp
@@ -0,0 +1,58 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.h"
+#include "RuntimeMetaData.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IStructureDetailsView.h"
+#include "Styling/StyleColors.h"
+#include "Modules/ModuleManager.h"
+
+void SScenarioActionFunctionBodyRow::Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UScenarioActionFunctionBodyNode> InNode, const TSharedRef<SScenarioActionTree>& InTree)
+{
+	check(InNode.IsValid());
+	Node = InNode;
+	Tree = InTree;
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::FArguments OutArgs;
+	OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+
+	TSharedRef<SWidget> Body = SNullWidget::NullWidget;
+	if (Node->GetParentNode() && Node->GetParentNode()->IsNodeValid())
+	{
+		FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+		soda::FDetailsViewArgs Args;
+		Args.bHideSelectionTip = true;
+		Args.bLockable = false;
+		Args.bShowOptions = false;
+		Args.bAllowSearch = false;
+		Args.NameAreaSettings = soda::FDetailsViewArgs::HideNameArea;
+		Args.bHideRightColumn = true;
+		soda::FStructureDetailsViewArgs StructureArgs;
+		Body = RuntimeEditorModule.CreateStructureDetailView(Args, StructureArgs, Node->GetParentNodeChecked<UScenarioActionFunctionNode>()->GetStructOnScope())->GetWidget().ToSharedRef();
+	}
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::Construct(
+		OutArgs
+		.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>(TEXT("ScenarioAction.ActionRowContent")))
+		.Padding(4)
+		.Content()
+		[
+			SNew(SBox)
+			.HAlign(HAlign_Left)
+			[
+				SNew(SBox)
+				.MinDesiredWidth(350)
+				[
+					SNew(SBorder)
+					.Padding(2, 8, 2, 8)
+					.BorderImage(FSodaStyle::GetBrush("ScenarioAction.ActionNode"))
+					[
+						Body
+					]
+				]
+			]
+		], 
+		InOwnerTable
+	);
+}
+
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.h b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.h
new file mode 100644
index 0000000..64883cc
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionBodyRow.h
@@ -0,0 +1,19 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Widgets/Views/SListView.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+#include "Templates/SharedPointer.h"
+
+class SScenarioActionFunctionBodyRow : public STableRow<TWeakObjectPtr<UScenarioActionNode>>
+{
+	SLATE_BEGIN_ARGS(SScenarioActionFunctionBodyRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& Args, const TSharedRef<STableViewBase>& OwnerTable, TWeakObjectPtr<UScenarioActionFunctionBodyNode> Node, const TSharedRef<SScenarioActionTree>& OwnerTree);
+
+	TWeakObjectPtr<UScenarioActionFunctionBodyNode> Node;
+	//bool bIsDragEventRecognized = false;
+	TSharedPtr<SScenarioActionTree> Tree;
+};
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.cpp
new file mode 100644
index 0000000..b2c7696
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.cpp
@@ -0,0 +1,61 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.h"
+#include "UI/ScenarioAction/SScenarioActionTree.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Input/SButton.h"
+#include "UObject/StructOnScope.h"
+
+void SScenarioActionFunctionRow::Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UScenarioActionFunctionNode> InNode, const TSharedRef<SScenarioActionTree>& InTree)
+{
+	check(InNode.IsValid());
+	Node = InNode;
+	Tree = InTree;
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::FArguments OutArgs;
+	OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::Construct(
+		OutArgs
+		.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>(TEXT("ScenarioAction.ActionRowDefault")))
+		.Padding(2)
+		.Content()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(1, 1, 3, 1)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SImage)
+				.Image(FSodaStyle::GetBrush(TEXT("Icons.Function")))
+				.ColorAndOpacity(FLinearColor(1, 1, 1, 0.5))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(Node->GetStructOnScope()->GetStruct()->GetName()))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			[
+				SNew(SButton)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+				.OnClicked(this, &SScenarioActionFunctionRow::OnDeleteAction)
+			]
+		],
+		InOwnerTable
+	);
+}
+
+FReply SScenarioActionFunctionRow::OnDeleteAction()
+{
+	if (Node.IsValid())
+	{
+		Node->RemoveThisNode();
+		Tree->RebuildNodes();
+	}
+	return FReply::Handled();
+}
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.h b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.h
new file mode 100644
index 0000000..b1d8627
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionFunctionRow.h
@@ -0,0 +1,21 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Widgets/Views/SListView.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class SScenarioActionFunctionRow : public STableRow<TWeakObjectPtr<UScenarioActionNode>>
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionFunctionRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& Args, const TSharedRef<STableViewBase>& OwnerTable, TWeakObjectPtr<UScenarioActionFunctionNode> Node, const TSharedRef<SScenarioActionTree>& OwnerTree);
+
+	FReply OnDeleteAction();
+
+	TWeakObjectPtr<UScenarioActionFunctionNode> Node;
+	//bool bIsDragEventRecognized = false;
+	TSharedPtr<SScenarioActionTree> Tree;
+};
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.cpp
new file mode 100644
index 0000000..ea2b8a6
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.cpp
@@ -0,0 +1,104 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.h"
+#include "UI/ScenarioAction/SScenarioActionTree.h"
+#include "RuntimeMetaData.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IStructureDetailsView.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Modules/ModuleManager.h"
+
+void SScenarioActionPropertyBodyRow::Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UScenarioActionPropertyBodyNode> InNode, const TSharedRef<SScenarioActionTree>& InTree)
+{
+	check(InNode.IsValid() && InNode->IsNodeValid());
+	Node = InNode;
+	Tree = InTree;
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::FArguments OutArgs;
+	OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+
+	TSharedRef<SWidget> Body = SNullWidget::NullWidget;
+
+	UScenarioObjectNode* ObjectNode = nullptr;
+	
+	if (Node.IsValid() && Node->GetParentNode() && Node->GetParentNode())
+	{
+		ObjectNode = Cast<UScenarioObjectNode>(Node->GetParentNode()->GetParentNode());
+	}
+
+	if (ObjectNode && ObjectNode->GetCapturedProperties().Num())
+	{
+		FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+		soda::FDetailsViewArgs Args;
+		Args.bHideSelectionTip = true;
+		Args.bLockable = false;
+		Args.bShowOptions = false;
+		Args.bAllowSearch = false;
+		Args.NameAreaSettings = soda::FDetailsViewArgs::HideNameArea;
+		//Args.bHideRightColumn = true;
+		Args.OnGeneratLocalRowExtension.AddLambda([this](const soda::FOnGenerateGlobalRowExtensionArgs& Args, TArray<soda::FPropertyRowExtensionButton>& OutExtensions) 
+		{
+			soda::FPropertyRowExtensionButton& RemovePreoperty = OutExtensions.AddDefaulted_GetRef();
+			RemovePreoperty.Label = FText::FromString(TEXT("Remove Property"));
+			RemovePreoperty.ToolTip = FText::FromString(TEXT("Remove Property"));
+			RemovePreoperty.Icon = FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Delete");
+			RemovePreoperty.UIAction = FUIAction(
+				FExecuteAction::CreateSP(this, &SScenarioActionPropertyBodyRow::OnDeleteAction, Args.PropertyHandle->GetProperty())
+			);
+		});
+
+		soda::FStructureDetailsViewArgs StructureArgs;
+		TSharedRef<soda::IStructureDetailsView> StructureDetailsView = RuntimeEditorModule.CreateStructureDetailView(Args, StructureArgs, TSharedPtr<FStructOnScope>());
+		StructureDetailsView->GetDetailsView()->SetIsPropertyVisibleDelegate(soda::FIsPropertyVisible::CreateLambda([ObjectNode =TWeakObjectPtr<UScenarioObjectNode>(ObjectNode)](const soda::FPropertyAndParent& PropertyAndParent)
+		{
+			return ObjectNode.IsValid() && (
+				PropertyAndParent.ParentProperties.Num() >= 1 || 
+				ObjectNode->GetCapturedProperties().Contains(const_cast<FProperty*>(&PropertyAndParent.Property))
+			);
+		}));
+		StructureDetailsView->SetStructureData(ObjectNode->GetStructOnScope());
+		Body = StructureDetailsView->GetWidget().ToSharedRef();
+	}
+	else
+	{
+		Body = SNew(STextBlock)
+			.TextStyle(FAppStyle::Get(), "HintText")
+			.Margin(10)
+			.Text(FText::FromString(TEXT("Add properties you want to edit")));
+	}
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::Construct(
+		OutArgs
+		.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>(TEXT("ScenarioAction.ActionRowContent")))
+		.Padding(4)
+		.Content()
+		[
+			SNew(SBox)
+			.HAlign(HAlign_Left)
+			[
+				SNew(SBox)
+				.MinDesiredWidth(350)
+				[
+					SNew(SBorder)
+					.Padding(2, 8, 2, 8)
+					.BorderImage(FSodaStyle::GetBrush("ScenarioAction.ActionNode"))
+					[
+						Body
+					]
+				]
+			]
+
+		],
+		InOwnerTable
+	);
+}
+
+void SScenarioActionPropertyBodyRow::OnDeleteAction(FProperty* Property)
+{
+	if (Node.IsValid() && Node->GetParentNode() && Node->GetParentNode()->GetParentNode())
+	{
+		UScenarioObjectNode* ObjectNode = Node->GetParentNode()->GetParentNodeChecked<UScenarioObjectNode>();
+		ObjectNode->GetCapturedProperties().Remove(Property);
+		Tree->RebuildNodes();
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.h b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.h
new file mode 100644
index 0000000..96ddf1a
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyBodyRow.h
@@ -0,0 +1,22 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Widgets/Views/SListView.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class SScenarioActionPropertyBodyRow : public STableRow<TWeakObjectPtr<UScenarioActionNode>>
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionPropertyBodyRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& Args, const TSharedRef<STableViewBase>& OwnerTable, TWeakObjectPtr<UScenarioActionPropertyBodyNode> Node, const TSharedRef<SScenarioActionTree>& OwnerTree);
+
+	TWeakObjectPtr<UScenarioActionPropertyBodyNode> Node;
+	//bool bIsDragEventRecognized = false;
+	TSharedPtr<SScenarioActionTree> Tree;
+
+protected:
+	void OnDeleteAction(FProperty* Property);
+};
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.cpp
new file mode 100644
index 0000000..a343c3e
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.cpp
@@ -0,0 +1,117 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.h"
+#include "UI/ScenarioAction/SScenarioActionTree.h"
+#include "UI/Common/SActionButton.h"
+#include "RuntimeMetaData.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IStructureDetailsView.h"
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+
+void SScenarioActionPropertyRow::Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UScenarioActionPropertyNode> InNode, const TSharedRef<SScenarioActionTree>& InTree)
+{
+	check(InNode.IsValid() && InNode->IsNodeValid());
+	Node = InNode;
+	Tree = InTree;
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::FArguments OutArgs;
+	OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+
+	STableRow<TWeakObjectPtr<UScenarioActionNode>>::Construct(
+		OutArgs
+		.Style(&FSodaStyle::Get().GetWidgetStyle<FTableRowStyle>(TEXT("ScenarioAction.ActionRowDefault")))
+		.Padding(2)
+		.Content()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(1, 1, 3, 1)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SImage)
+				.Image(FSodaStyle::GetBrush(TEXT("Icons.Pillset")))
+				.ColorAndOpacity(FLinearColor(1, 1, 1, 0.5))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(1)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(TEXT("Properties")))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.AutoWidth()
+			.Padding(0, 0, 21, 0)
+			[
+				SNew(SActionButton)
+				.Icon(nullptr)
+				.ContentPadding(8)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.AddButton")
+				.MenuContent()
+				[
+					GenerateAddMenu()
+				]
+			]			
+		],
+		InOwnerTable
+	);
+}
+
+TSharedRef<SWidget> SScenarioActionPropertyRow::GenerateAddMenu()
+{
+	if (Node.IsValid() && Node->GetParentNode() && Node->GetParentNode())
+	{
+		UScenarioObjectNode* ParentNode = Node->GetParentNode<UScenarioObjectNode>();
+		if (ParentNode && ParentNode->GetObject())
+		{
+			TMap<FString, TArray<FProperty*>> PropertyMap;
+			FScenarioActionUtils::GetScenarioPropertiesByCategory(ParentNode->GetObject()->GetClass(), PropertyMap);
+			TArray<FString> Categories;
+			PropertyMap.GetKeys(Categories);
+
+			FMenuBuilder MenuBuilder(true, nullptr);
+
+			for (auto& Category : Categories)
+			{
+				MenuBuilder.BeginSection(NAME_None, FText::FromString(Category));
+				TArray<FProperty*>& Properties = PropertyMap[Category];
+				for (auto& Propertiy : Properties)
+				{
+					MenuBuilder.AddMenuEntry(
+						FText::FromString(Propertiy->GetName()),
+						FText::FromString(Propertiy->GetName()),
+						FSlateIcon(),
+						FExecuteAction::CreateRaw(this, &SScenarioActionPropertyRow::OnAddPropertyNode, Propertiy));
+				}
+				MenuBuilder.EndSection();
+			}
+			return MenuBuilder.MakeWidget();
+		}
+	}
+
+	return SNew(STextBlock)
+		.TextStyle(FAppStyle::Get(), "HintText")
+		.Text(FText::FromString(TEXT("Invalid Node")));
+}
+
+void SScenarioActionPropertyRow::OnAddPropertyNode(FProperty* Property)
+{
+	check(Property);
+	if (Node.IsValid() && Node->GetParentNode())
+	{
+		if (UScenarioObjectNode* Parent = Cast<UScenarioObjectNode>(Node->GetParentNode()))
+		{
+			if (Parent->GetObject())
+			{
+				Parent->CaptureProperty(Property);
+				Node->UpdateChildBodyNode();
+				Tree->RebuildNodes();
+			}
+		}
+	}
+}
+
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.h b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.h
new file mode 100644
index 0000000..66c058f
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/ActionNodeRow/SScenarioActionPropertyRow.h
@@ -0,0 +1,23 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Widgets/Views/SListView.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class SScenarioActionPropertyRow : public STableRow<TWeakObjectPtr<UScenarioActionNode>>
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionPropertyRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& Args, const TSharedRef<STableViewBase>& OwnerTable, TWeakObjectPtr<UScenarioActionPropertyNode> Node, const TSharedRef<SScenarioActionTree>& OwnerTree);
+
+	TWeakObjectPtr<UScenarioActionPropertyNode> Node;
+	//bool bIsDragEventRecognized = false;
+	TSharedPtr<SScenarioActionTree> Tree;
+
+private:
+	TSharedRef<SWidget> GenerateAddMenu();
+	void OnAddPropertyNode(FProperty* Property);
+};
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionBlock.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionBlock.cpp
new file mode 100644
index 0000000..0570a52
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionBlock.cpp
@@ -0,0 +1,769 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SScenarioActionBlock.h"
+#include "Soda/UnrealSoda.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Layout/SSplitter.h"
+#include "SPositiveActionButton.h"
+#include "Kismet/GameplayStatics.h"
+#include "Styling/StyleColors.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Framework/Application/SlateApplication.h"
+//#include "Soda/ISodaActor.h"
+//#include "RuntimeEditorModule.h"
+//#include "RuntimePropertyEditor/IDetailsView.h"
+//#include "Soda/SodaStatics.h"
+//#include "Soda/SodaGameMode.h"
+//#include "Soda/Vehicles/SodaVehicle.h"
+//#include "Soda/UI/ToolBoxes/Common/SVehicleComponentClassCombo.h"
+//#include "Soda/UI/ToolBoxes/Common/SPinWidget.h"
+//#include "Soda/UI/SMessageBox.h"
+//#include "Soda/SodaGameViewportClient.h"
+
+
+#include "Soda/ScenarioAction/ScenarioAction.h"
+#include "Soda/ScenarioAction/ScenarioActionBlock.h"
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Soda/ScenarioAction/ScenarioActionCondition.h"
+#include "Soda/ScenarioAction/ScenarioActionUtils.h"
+#include "Soda/ScenarioAction/ScenarioActionEvent.h"
+
+#include "UI/Common/SActionButton.h"
+#include "UI/ScenarioAction/SScenarioActionEditor.h"
+#include "UI/ScenarioAction/SScenarioActionTree.h"
+#include "Soda/UI/SActorList.h"
+
+#include "Widgets/Layout/SExpandableArea.h"
+#include "SPositiveActionButton.h"
+
+#include "Soda/SodaGameViewportClient.h"
+
+
+
+#define LOCTEXT_NAMESPACE "ScenarioBlock"
+
+
+void SScenarioActionBlock::Construct(const FArguments& InArgs, UScenarioActionBlock* InBlock, TSharedRef<SScenarioActionEditor> InScenarioEditor)
+{
+	check(InBlock);
+	Block = InBlock;
+	ScenarioEditor = InScenarioEditor;
+
+	ChildSlot
+	[
+		SNew(SScrollBox)
+		.Orientation(Orient_Vertical) 
+		+ SScrollBox::Slot()
+		.HAlign(HAlign_Fill)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.Padding(0, 0, 0, 10)
+			.AutoHeight()
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Panel")))
+				.HAlign(HAlign_Left)
+				.Padding(5)
+				[
+					SNew(SBox)
+					.MinDesiredHeight(30)
+					.VAlign(VAlign_Center)
+					[
+						SNew(SHorizontalBox)
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						[
+							SNew(STextBlock)
+							.Text(FText::FromString(TEXT("Execution Mode:")))
+						]
+						+ SHorizontalBox::Slot()
+						.VAlign(VAlign_Center)
+						[
+							SNew(SComboButton)
+							.ContentPadding(3)
+							.OnGetMenuContent(this, &SScenarioActionBlock::GetComboModeContent)
+							.ButtonContent()
+							[
+								SNew(SHorizontalBox)
+								+ SHorizontalBox::Slot()
+								.VAlign(VAlign_Center)
+								.HAlign(HAlign_Center)
+								.Padding(0, 0, 5, 0)
+								.AutoWidth()
+								[
+									SNew(SImage)
+									.Image_Lambda([this]()
+									{
+										if(this->Block.IsValid())
+										{
+											if(this->Block->GetActionBlockMode() == EScenarioActionBlockMode::SingleExecute)
+											{
+												return FSodaStyle::Get().GetBrush("Icons.Step");
+											}
+											else
+											{
+												return FSodaStyle::Get().GetBrush("Icons.Loop");
+											}
+										}
+										else
+										{
+											return FSodaStyle::Get().GetBrush("Icons.Error");
+										}
+									})
+								]
+								+ SHorizontalBox::Slot()
+								.VAlign(VAlign_Center)
+								.HAlign(HAlign_Center)
+								.Padding(0, 0, 5, 0)
+								[
+									SNew(STextBlock)
+									.MinDesiredWidth(50)
+									.Text_Lambda([this]()
+									{
+										if(this->Block.IsValid())
+										{
+											if(this->Block->GetActionBlockMode() == EScenarioActionBlockMode::SingleExecute)
+											{
+												return FText::FromString("Single");
+											}
+											else
+											{
+												return FText::FromString("Multiple");
+											}
+										}
+										else
+										{
+											return FText::FromString("Error");
+										}
+									})
+								]
+							]
+						]
+					]
+				]
+			]
+			+SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SOverlay)
+				+ SOverlay::Slot()
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(TEXT("EVENT")))
+					.ColorAndOpacity(FStyleColors::AccentRed)
+					.RenderTransform(FTransform2D(TQuat2<float>(-PI / 2), {0, 50}))
+				]
+				+ SOverlay::Slot()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(20, 0, 12, 0)
+					[
+						SNew(SBorder)
+						.Padding(2, 2, 2, 90)
+						.BorderImage(FSodaStyle::GetBrush(TEXT("ScenarioAction.EventMark")))
+					]
+					+ SHorizontalBox::Slot()
+					.FillWidth(1)
+					.VAlign(VAlign_Top)
+					[
+						SAssignNew(Events, SHorizontalBox)
+					]
+				]
+			]
+			+ SVerticalBox::Slot()
+			.Padding(0, 12, 0, 12)
+			.AutoHeight()
+			[
+				SNew(SBorder)
+				.Padding(2)
+				.BorderImage(FSodaStyle::GetBrush(TEXT("ScenarioAction.ConditionalSeparator")))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SOverlay)
+				+ SOverlay::Slot()
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(TEXT("CONDTN")))
+					.ColorAndOpacity(FStyleColors::AccentOrange)
+					.RenderTransform(FTransform2D(TQuat2<float>(-PI / 2), {0, 65}))
+				]
+				+ SOverlay::Slot()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(20, 0, 12, 0)
+					[
+						SNew(SBorder)
+						.Padding(2, 2, 2, 90)
+						.BorderImage(FSodaStyle::GetBrush(TEXT("ScenarioAction.ConditionalMark")))
+					]
+					+ SHorizontalBox::Slot()
+					.FillWidth(1)
+					[
+						SAssignNew(ConditionRows, SVerticalBox)
+					]
+				]
+			]
+			+ SVerticalBox::Slot()
+			.Padding(0, 12, 0, 12)
+			.AutoHeight()
+			[
+				SNew(SBorder)
+				.Padding(2)
+				.BorderImage(FSodaStyle::GetBrush(TEXT("ScenarioAction.ConditionalSeparator")))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SOverlay)
+				+ SOverlay::Slot()
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(TEXT("ACTION")))
+					.ColorAndOpacity(FStyleColors::AccentGreen)
+					.RenderTransform(FTransform2D(TQuat2<float>(-PI / 2), {0, 60}))
+				]
+				+ SOverlay::Slot()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.AutoWidth()
+					.Padding(20, 0, 12, 0)
+					[
+						SNew(SBorder)
+						.Padding(2,2,2,90)
+						.BorderImage(FSodaStyle::GetBrush(TEXT("ScenarioAction.ActionMark")))
+					]
+					+ SHorizontalBox::Slot()
+					.FillWidth(1)
+					[
+						SNew(SVerticalBox)
+						+ SVerticalBox::Slot()
+						.HAlign(HAlign_Left)
+						.AutoHeight()
+						.Padding(0, 0, 0, 5)
+						[
+							SNew(SActionButton)
+							.ButtonStyle(FSodaStyle::Get(), "ScenarioAction.AddActionButton")
+							.Text(FText::FromString("Add"))
+							.MenuContent()
+							[
+								GenerateAddActionMenu()
+							]
+						]
+						+ SVerticalBox::Slot()
+						.FillHeight(1.0)
+						[
+							SAssignNew(ActionTree, SScenarioActionTree, Block)
+						]
+					]
+				]
+			]
+		]
+	];
+
+	RebuildConditionalBlock();
+	RebuildEventsBlock();
+}
+
+void SScenarioActionBlock::RebuildEventsBlock()
+{
+	Events->ClearChildren();
+
+	for (int i = 0; i < Block->Events.Num(); ++i)
+	{
+		Events->AddSlot()
+		.AutoWidth()
+		[
+			SNew(SBox)
+			.MinDesiredWidth(200)
+			.MinDesiredHeight(100)
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush("ScenarioAction.EventNode"))
+				[
+					SNew(SVerticalBox)
+					+ SVerticalBox::Slot()
+					.Padding(4)
+					.AutoHeight()
+					[
+						SNew(SHorizontalBox)
+						+ SHorizontalBox::Slot()
+						.FillWidth(1)
+						[
+							SNew(STextBlock)
+							.Text(Block->Events[i]->GetDisplayName())
+						]
+						+ SHorizontalBox::Slot()
+						.AutoWidth()
+						[
+							SNew(SButton)
+							.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+							.OnClicked(this, &SScenarioActionBlock::OnDeleteEvent, Block->Events[i])
+						]
+					]
+					+ SVerticalBox::Slot()
+					.Padding(4)
+					.FillHeight(1)
+					.VAlign(VAlign_Top)
+					[
+						Block->Events[i]->MakeWidget()
+					]
+				]
+			]
+		];
+
+		// OR seporator
+		Events->AddSlot()
+		.AutoWidth()
+		[
+			SNew(SBox)
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			.Padding(4)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(TEXT("or")))
+			]
+		];
+	}
+
+	// Add ADD button
+	Events->AddSlot()
+	.AutoWidth()
+	[
+		SNew(SActionButton)
+		.Text(FText::FromString(TEXT("Add")))
+		.IconColor(FStyleColors::AccentRed)
+		.ButtonStyle(&FSodaStyle::Get().GetWidgetStyle<FButtonStyle>("ScenarioAction.AddEventButton"))
+		.MenuContent()
+		[
+			GenerateAddEventMenu()
+		]
+	];
+}
+
+void SScenarioActionBlock::RebuildConditionalBlock()
+{
+	ConditionRows->ClearChildren();
+
+	for (int i = 0; i < Block->ConditionMatrix.Num() - 1; ++i)
+	{
+		if (Block->ConditionMatrix[i].ScenarioConditiones.Num() == 0)
+		{
+			Block->ConditionMatrix.RemoveAt(i);
+			--i;
+		}
+	}
+
+	for (int i = 0; i < Block->ConditionMatrix.Num(); ++i)
+	{
+		auto& Row = Block->ConditionMatrix[i];
+		TSharedPtr<SHorizontalBox> ConditionColls;
+		ConditionRows->AddSlot()
+		.AutoHeight()
+		[
+			SNew(SScrollBox)
+			.Orientation(Orient_Horizontal)
+			+ SScrollBox::Slot()
+			//.Padding(8)
+			[
+				SNew(SBox)
+				.MinDesiredHeight(100)
+				[
+					SAssignNew(ConditionColls, SHorizontalBox)
+				]
+			]
+		];
+
+		for (auto & Col : Row.ScenarioConditiones)
+		{
+			ConditionColls->AddSlot()
+			.AutoWidth()
+			[
+				SNew(SBox)
+				.MinDesiredWidth(200)
+				.MinDesiredHeight(100)
+				[
+					SNew(SBorder)
+					.BorderImage(FSodaStyle::GetBrush("ScenarioAction.ConditionalNode"))
+					[
+						SNew(SVerticalBox)
+						+ SVerticalBox::Slot()
+						.Padding(4)
+						.AutoHeight()
+						[
+							SNew(SHorizontalBox)
+							+ SHorizontalBox::Slot()
+							.FillWidth(1)
+							[
+								SNew(STextBlock)
+								.Text(Col->GetDisplayName())
+							]
+							+ SHorizontalBox::Slot()
+							.AutoWidth()
+							[
+								SNew(SButton)
+								.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+								.OnClicked(this, &SScenarioActionBlock::OnDeleteConditional, Col, i)
+							]
+						]
+						+ SVerticalBox::Slot()
+						.Padding(4)
+						.FillHeight(1)
+						.VAlign(VAlign_Top)
+						[
+							Col->MakeWidget()
+						]
+					]
+				]
+			];
+
+			// AND seporator
+			ConditionColls->AddSlot()
+			.AutoWidth()
+			[
+				SNew(SBox)
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				.Padding(4)
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(TEXT("&")))
+				]
+			];
+			
+		}
+
+		// Button "Add AND conditional block"
+		ConditionColls->AddSlot()
+		.AutoWidth()
+		[
+			SNew(SActionButton)
+			.ButtonStyle(&FSodaStyle::Get().GetWidgetStyle<FButtonStyle>("ScenarioAction.AddConditionalButton"))
+			.IconColor(FStyleColors::AccentOrange)
+			.Text(FText::FromString(TEXT("Add")))
+			.MenuContent()
+			[
+				GenerateAddConditionalMenu(i)
+			]
+		];
+
+		// OR seporator
+		ConditionRows->AddSlot()
+		.Padding(0, 4, 0, 4)
+		.AutoHeight()
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(0.2)
+			[
+				SNew(SBorder)
+				.Padding(0, 1, 0, 0)
+				.BorderImage(FSodaStyle::GetBrush(TEXT("ScenarioAction.ConditionalSeparator")))
+			]
+			+ SHorizontalBox::Slot()
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			.Padding(10, 0, 10, 0)
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(TEXT("or")))
+			]
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.FillWidth(0.2)
+			[
+				SNew(SBorder)
+				.Padding(0, 1, 0, 0)
+				.BorderImage(FSodaStyle::GetBrush(TEXT("ScenarioAction.ConditionalSeparator")))
+			]
+			+ SHorizontalBox::Slot()
+			.FillWidth(0.5)
+		];
+	}
+
+	// Button "Add OR conditional block"
+	ConditionRows->AddSlot()
+	.AutoHeight()
+	[
+		SNew(SBox)
+		.HAlign(HAlign_Left)
+		[
+			SNew(SActionButton)
+			.ButtonStyle(&FSodaStyle::Get().GetWidgetStyle<FButtonStyle>("ScenarioAction.AddConditionalButton"))
+			.IconColor(FStyleColors::AccentOrange)
+			.Text(FText::FromString(TEXT("Add")))
+			.MenuContent()
+			[
+				GenerateAddConditionalMenu(-1)
+			]
+		]
+	];
+}
+
+void SScenarioActionBlock::OnAddConditional(UFunction* Function, int RowIndex)
+{
+	if (Block.IsValid() && (RowIndex < 0 || (RowIndex >= 0 && Block->ConditionMatrix.IsValidIndex(RowIndex))))
+	{
+		UScenarioActionConditionFunction* ScenarioCondition = NewObject<UScenarioActionConditionFunction>(Block.Get());
+		check(ScenarioCondition);
+		ScenarioCondition->SetFunction(Function, Function->GetOuterUClassUnchecked());
+
+		if (RowIndex >= 0)
+		{
+			Block->ConditionMatrix[RowIndex].ScenarioConditiones.Add(ScenarioCondition);
+		}
+		else
+		{
+			Block->ConditionMatrix.Add_GetRef({}).ScenarioConditiones.Add(ScenarioCondition);
+		}
+		RebuildConditionalBlock();
+	}
+}
+
+FReply SScenarioActionBlock::OnDeleteConditional(UScenarioActionCondition* Condition, int RowIndex)
+{
+	if (IsValid(Condition) && Block.IsValid() && Block->ConditionMatrix.IsValidIndex(RowIndex))
+	{
+		Block->ConditionMatrix[RowIndex].ScenarioConditiones.Remove(Condition);
+		
+
+		if (Block->ConditionMatrix[RowIndex].ScenarioConditiones.Num() == 0)
+		{
+			Block->ConditionMatrix.RemoveAt(RowIndex);
+		}
+
+		RebuildConditionalBlock();
+	}
+	return FReply::Handled();
+}
+
+FReply SScenarioActionBlock::OnDeleteEvent(UScenarioActionEvent* Event)
+{
+	if (Block.IsValid())
+	{
+		Block->Events.Remove(Event);
+		RebuildEventsBlock();
+	}
+	return FReply::Handled();
+}
+
+TSharedRef<SWidget> SScenarioActionBlock::GenerateAddEventMenu()
+{
+	if (Block.IsValid())
+	{
+		TMap<FString, TArray<UClass*>> EventMap;
+		FScenarioActionUtils::GetScenarioActionEvents(EventMap);
+		TArray<FString> Categories;
+		EventMap.GetKeys(Categories);
+
+		FMenuBuilder MenuBuilder(true, nullptr);
+
+		for (auto& Category : Categories)
+		{
+			MenuBuilder.BeginSection(NAME_None, FText::FromString(Category));
+			for (auto& Event : EventMap[Category])
+			{
+				MenuBuilder.AddMenuEntry(
+					FText::FromString(Event->GetName()),
+					FText::FromString(Event->GetName()),
+					FSlateIcon(),
+					FExecuteAction::CreateRaw(this, &SScenarioActionBlock::OnAddEvent, Event));
+			}
+			MenuBuilder.EndSection();
+		}
+
+		return MenuBuilder.MakeWidget();
+
+
+	}
+	else
+	{
+		return SNullWidget::NullWidget;
+	}
+}
+
+TSharedRef<SWidget> SScenarioActionBlock::GenerateAddConditionalMenu(int RowIndex)
+{
+	if (Block.IsValid())
+	{
+		TMap<FString, TArray<UFunction*>> FunctionMap;
+		FScenarioActionUtils::GetScenarioConditionFunctionsByCategory(FunctionMap);
+		TArray<FString> Categories;
+		FunctionMap.GetKeys(Categories);
+
+		FMenuBuilder MenuBuilder(true, nullptr);
+		
+		for (auto& Category : Categories)
+		{
+			MenuBuilder.BeginSection(NAME_None, FText::FromString(Category));
+			for (auto& Function : FunctionMap[Category])
+			{
+				MenuBuilder.AddMenuEntry(
+					FText::FromString(Function->GetName()),
+					FText::FromString(Function->GetName()),
+					FSlateIcon(),
+					FExecuteAction::CreateRaw(this, &SScenarioActionBlock::OnAddConditional, Function, RowIndex));
+			}
+			MenuBuilder.EndSection();
+		}
+
+		return MenuBuilder.MakeWidget();
+	}
+	else
+	{
+		return SNullWidget::NullWidget;
+	}
+}
+
+TSharedRef<SWidget> SScenarioActionBlock::GenerateAddActionMenu()
+{
+	FMenuBuilder MenuBuilder(true, nullptr);
+
+	MenuBuilder.BeginSection(NAME_None, FText::FromString("Actors"));
+
+	MenuBuilder.AddWrapperSubMenu(
+		FText::FromString(TEXT("Actors")), 
+		FText::GetEmpty(), 
+		FOnGetContent::CreateLambda([this]() 
+		{
+			return 
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Header")))
+			.Padding(1)
+			[
+				SNew(SBox)
+				.MinDesiredWidth(200)
+				.MinDesiredHeight(200)
+				[
+					SNew(soda::SActorList, Cast<USodaGameViewportClient>(Block->GetWorld()->GetGameViewport()))
+					.bInteractiveMode(false)
+					.OnSelectionChanged(this, &SScenarioActionBlock::OnAddActorActionNode)
+				]
+			];
+		}),
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "ClassIcon.Actor")
+	);
+
+	MenuBuilder.EndSection();
+
+	TMap<FString, TArray<UFunction*>> ActionMap;
+	FScenarioActionUtils::GetScenarioActionFunctionsByCategory(ActionMap);
+	TArray<FString> Categories;
+	ActionMap.GetKeys(Categories);
+
+	for (auto& Category : Categories)
+	{
+		MenuBuilder.BeginSection(NAME_None, FText::FromString(Category));
+		for (auto& Action : ActionMap[Category])
+		{
+			MenuBuilder.AddMenuEntry(
+				FText::FromString(Action->GetName()),
+				FText::FromString(Action->GetName()),
+				FSlateIcon(),
+				FExecuteAction::CreateRaw(this, &SScenarioActionBlock::OnAddFunctionActionNode, Action));
+		}
+		MenuBuilder.EndSection();
+	}
+
+	return MenuBuilder.MakeWidget();
+}
+
+void SScenarioActionBlock::OnAddActorActionNode(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo)
+{
+	if (Actor.IsValid() && Block.IsValid())
+	{
+		UScenarioActionActorNode* Node = NewObject<UScenarioActionActorNode>(Block.Get());
+		check(Node);
+		Node->InitializeNode(Actor.Get());
+		Block->ActionRootNodes.Add(Node);
+		ActionTree->RebuildNodes();
+	}
+	FSlateApplication::Get().DismissAllMenus();
+}
+
+void SScenarioActionBlock::OnAddFunctionActionNode(UFunction* Function)
+{
+	check(Function);
+	if (Block.IsValid())
+	{
+		UScenarioActionFunctionNode* Node = NewObject<UScenarioActionFunctionNode>(Block.Get());
+		check(Node);
+		Node->InitializeNode(Function->GetOwnerClass(), Function);
+		Block->ActionRootNodes.Add(Node);
+		ActionTree->RebuildNodes();
+	}
+}
+
+void SScenarioActionBlock::OnAddEvent(UClass* Class)
+{
+	if (Block.IsValid() && IsValid(Class))
+	{
+		UScenarioActionEvent* Event = NewObject<UScenarioActionEvent>(Block.Get(), Class);
+		check(Event);
+		Block->Events.Add(Event);
+		RebuildEventsBlock();
+	}
+}
+
+
+TSharedRef<SWidget> SScenarioActionBlock::GetComboModeContent()
+{
+	FMenuBuilder MenuBuilder(
+		/*bShouldCloseWindowAfterMenuSelection*/ true, 
+		/* InCommandList = */nullptr, 
+		/* InExtender = */nullptr, 
+		/*bCloseSelfOnly*/ false,
+		&FSodaStyle::Get());
+
+	MenuBuilder.BeginSection("Section");
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([this]() 
+		{
+			Block->SetActionBlockMode(EScenarioActionBlockMode::SingleExecute);
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Single")),
+			FText::FromString(TEXT("Single")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Step"),
+			Action);
+	}
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([this]() 
+		{
+			Block->SetActionBlockMode(EScenarioActionBlockMode::MultipleExecute);
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Multiple")),
+			FText::FromString(TEXT("Multiple")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Loop"),
+			Action);
+	}
+
+	MenuBuilder.EndSection();
+
+	return MenuBuilder.MakeWidget();
+}
+
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionBlock.h b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionBlock.h
new file mode 100644
index 0000000..65ddf3f
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionBlock.h
@@ -0,0 +1,50 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Templates/SharedPointer.h"
+#include "Widgets/SBoxPanel.h"
+
+class SScenarioActionTree;
+class UScenarioActionBlock;
+class SScenarioActionEditor;
+class UScenarioActionCondition;
+class UScenarioActionEvent;
+
+class SScenarioActionBlock : public SCompoundWidget
+{
+	SLATE_BEGIN_ARGS(SScenarioActionBlock)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, UScenarioActionBlock* InBlock, TSharedRef<SScenarioActionEditor> InScenarioEditor);
+
+	void RebuildEventsBlock();
+	void RebuildConditionalBlock();
+
+protected:
+	TSharedRef<SWidget> GenerateAddConditionalMenu(int RowIndex);
+	TSharedRef<SWidget> GenerateAddActionMenu();
+	TSharedRef<SWidget> GenerateAddEventMenu();
+
+	void OnAddConditional(UFunction* Function, int RowIndex);
+	FReply OnDeleteConditional(UScenarioActionCondition* Condition, int RowIndex);
+
+	void OnAddActorActionNode(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo);
+	void OnAddFunctionActionNode(UFunction* Function);
+
+	void OnAddEvent(UClass* Class);
+	FReply OnDeleteEvent(UScenarioActionEvent * Event);
+
+	TSharedRef<SWidget> GetComboModeContent();
+
+protected:
+	TWeakObjectPtr< UScenarioActionBlock> Block;
+	TWeakPtr<SScenarioActionEditor> ScenarioEditor;
+	TSharedPtr<SScenarioActionTree> ActionTree;
+	TSharedPtr<SVerticalBox> ConditionRows;
+	TSharedPtr<SHorizontalBox> Events;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionEditor.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionEditor.cpp
new file mode 100644
index 0000000..01c3245
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionEditor.cpp
@@ -0,0 +1,236 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SScenarioActionEditor.h"
+#include "Soda/UnrealSoda.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/SInlineEditableTextBlock.h"
+#include "Widgets/Layout/SSplitter.h"
+#include "SPositiveActionButton.h"
+#include "Kismet/GameplayStatics.h"
+#include "Soda/ScenarioAction/ScenarioAction.h"
+#include "Soda/ScenarioAction/ScenarioActionBlock.h"
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+#include "Soda/ScenarioAction/ScenarioActionCondition.h"
+#include "UI/ScenarioAction/SScenarioActionTree.h"
+#include "UI/ScenarioAction/SScenarioActionBlock.h"
+
+
+#define LOCTEXT_NAMESPACE "ScenarioEditor"
+
+class SScenarioActionBlockRow : public STableRow<TWeakObjectPtr<UScenarioActionBlock>>
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionBlockRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakObjectPtr<UScenarioActionBlock> InBlock, const TSharedPtr<SScenarioActionEditor>& InActionEditor)
+	{
+		check(InActionEditor);
+		check(InBlock.IsValid());
+
+		Block = InBlock;
+		ActionEditor = InActionEditor;
+
+		STableRow<TWeakObjectPtr<UScenarioActionBlock>>::FArguments Args;
+		STableRow<TWeakObjectPtr<UScenarioActionBlock>>::Construct(Args, InOwnerTable);
+
+		ChildSlot
+		.Padding(3)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(FMargin(0, 0, 5, 0))
+			.FillWidth(1.0)
+			[
+				SAssignNew(InlineTextBlock, SInlineEditableTextBlock)
+				.Text_Lambda([this]()
+				{
+					if(Block.IsValid())
+					{
+						return FText::FromName(Block->GetDisplayName());
+					}
+					return FText::FromString("None");
+				})
+				.OnTextCommitted(this, &SScenarioActionBlockRow::OnRenameBlockCommited)
+				.IsSelected(this, &SScenarioActionBlockRow::IsSelectedExclusively)
+
+			]
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			[
+				SNew(SButton)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+				.OnClicked(this, &SScenarioActionBlockRow::OnDeleteBlock)
+			]
+		];
+	}
+
+	FReply OnDeleteBlock()
+	{
+		if (ActionEditor.IsValid() && ActionEditor->GetScenarioAction().IsValid() && Block.IsValid())
+		{
+			ActionEditor->GetScenarioAction()->RemoveBlock(Block.Get());
+			ActionEditor->RefreshList();
+		}
+		return FReply::Handled();
+	}
+
+	void OnRenameBlockCommited(const FText& NewName, ETextCommit::Type Type)
+	{
+		if (ActionEditor.IsValid() && ActionEditor->GetScenarioAction().IsValid() && Block.IsValid())
+		{
+			Block->SetDisplayName(FName(NewName.ToString()));
+			ActionEditor->RefreshList();
+		}
+	}
+protected:
+	TWeakObjectPtr<UScenarioActionBlock> Block;
+	TSharedPtr<SInlineEditableTextBlock> InlineTextBlock;
+	TSharedPtr<SScenarioActionEditor> ActionEditor;
+};
+
+
+void SScenarioActionEditor::Construct( const FArguments& InArgs, TWeakObjectPtr<AScenarioAction> InScenario)
+{
+	Scenario = InScenario;
+
+	ChildSlot
+	[
+		SNew(SSplitter)
+		.Orientation(EOrientation::Orient_Horizontal)
+		+ SSplitter::Slot()
+		.Value(0.3)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Recessed")))
+				[
+					SNew(SBorder)
+					.HAlign(HAlign_Left)
+					.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Panel")))
+					.Padding(5)
+					[
+						SNew(SBox)
+						.MinDesiredHeight(30)
+						.VAlign(VAlign_Center)
+						[
+							SNew(SPositiveActionButton)
+							.Icon(FAppStyle::Get().GetBrush("Icons.Plus"))
+							.Text(LOCTEXT("Add", "Add Block"))
+							.OnClicked(this, &SScenarioActionEditor::OnAddBlock)
+						]
+					]
+				]
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			.Padding(5)
+			[
+				SAssignNew(ListView, SListView<TWeakObjectPtr<UScenarioActionBlock>>)
+				.ListItemsSource(&Source)
+				.SelectionMode(ESelectionMode::Single)
+				.OnGenerateRow(this, &SScenarioActionEditor::OnGenerateRow)
+				.OnSelectionChanged(this, &SScenarioActionEditor::OnSelectionChanged)
+			]
+		]
+		+ SSplitter::Slot()
+		.Value(0.7)
+		[
+			SNew(SBorder)
+			.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Recessed")))
+			.HAlign(HAlign_Fill)
+			.VAlign(VAlign_Fill)
+			[
+				SAssignNew(BlockContent, SBox)
+			]
+		]
+	];
+	
+	RefreshList();
+
+	if (Source.Num())
+	{
+		ListView->SetSelection(Source.Last());
+	}
+	else
+	{
+		ListView->SetSelection(nullptr);
+	}
+}
+
+void SScenarioActionEditor::RefreshList()
+{
+	BlockContent->SetContent(SNullWidget::NullWidget);
+
+	Source.Empty();
+
+	for (auto& It : Scenario->ScenarioBlocks)
+	{
+		if (IsValid(It))
+		{
+			Source.Add(It);
+		}
+	}
+
+	ListView->RequestListRefresh();
+}
+
+FReply SScenarioActionEditor::OnAddBlock()
+{
+	if (Scenario.IsValid())
+	{
+		Scenario->CreateNewBlock()->SetDisplayName(TEXT("New Action Block"));
+		RefreshList();
+	}
+	return FReply::Handled();
+}
+
+TSharedRef<ITableRow> SScenarioActionEditor::OnGenerateRow(TWeakObjectPtr<UScenarioActionBlock> Block, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return SNew(SScenarioActionBlockRow, OwnerTable, Block, SharedThis(this));
+}
+
+void SScenarioActionEditor::OnSelectionChanged(TWeakObjectPtr<UScenarioActionBlock> Block, ESelectInfo::Type SelectInfo)
+{
+	if (Block.IsValid())
+	{
+		BlockContent->SetContent(SNew(SScenarioActionBlock, Block.Get(), SharedThis(this)));
+	}
+	else
+	{
+		BlockContent->SetContent(
+			SNew(SBox)
+			.HAlign(HAlign_Center)
+			.Padding(0, 80, 0, 0)
+			[
+				SNew(STextBlock)
+				.TextStyle(FAppStyle::Get(), "HintText")
+				.Text(FText::FromString(TEXT("Select any action block to start editing")))
+			]
+		);
+	}
+}
+
+void SScenarioActionEditor::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+{
+	SCompoundWidget::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+
+	if (RequestedEditeTextBox.IsValid())
+	{
+		RequestedEditeTextBox.Pin()->EnterEditingMode();
+		RequestedEditeTextBox.Reset();
+	}
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionEditor.h b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionEditor.h
new file mode 100644
index 0000000..b07c3ce
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionEditor.h
@@ -0,0 +1,45 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "Templates/SharedPointer.h"
+#include "Widgets/Views/SListView.h"
+#include "Templates/SharedPointer.h"
+
+class AScenarioAction;
+class UScenarioActionBlock;
+class ITableRow;
+class STableViewBase;
+class SInlineEditableTextBlock;
+
+class  SScenarioActionEditor : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionEditor)
+	{ }
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, TWeakObjectPtr<AScenarioAction> Scenario);
+	void RefreshList();
+
+	const TWeakObjectPtr<AScenarioAction>& GetScenarioAction() const { return Scenario; }
+
+	void SetRequestedEditeTextBox(TWeakPtr<SInlineEditableTextBlock> InRequestedEditeTextBox) { RequestedEditeTextBox = InRequestedEditeTextBox; }
+
+protected:
+	virtual void Tick(const FGeometry& AllottedGeometry, const double CurrentTime, const float DeltaTime) override;
+
+	FReply OnAddBlock();
+	TSharedRef<ITableRow> OnGenerateRow(TWeakObjectPtr<UScenarioActionBlock> Block, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnSelectionChanged(TWeakObjectPtr<UScenarioActionBlock> Block, ESelectInfo::Type SelectInfo);
+
+protected:
+	TWeakObjectPtr<AScenarioAction> Scenario;
+	TSharedPtr<SBox> BlockContent;
+	TSharedPtr<SListView<TWeakObjectPtr<UScenarioActionBlock>>> ListView;
+	TArray<TWeakObjectPtr<UScenarioActionBlock>> Source;
+	TWeakPtr<SInlineEditableTextBlock> RequestedEditeTextBox;
+};
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionTree.cpp b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionTree.cpp
new file mode 100644
index 0000000..a417ad4
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionTree.cpp
@@ -0,0 +1,117 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SScenarioActionTree.h"
+#include "Soda/UnrealSoda.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/SInlineEditableTextBlock.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "SPositiveActionButton.h"
+#include "Kismet/GameplayStatics.h"
+//#include "Soda/ISodaActor.h"
+//#include "RuntimeEditorModule.h"
+//#include "RuntimePropertyEditor/IDetailsView.h"
+//#include "Soda/SodaStatics.h"
+//#include "Soda/SodaGameMode.h"
+//#include "Soda/Vehicles/SodaVehicle.h"
+//#include "Soda/UI/ToolBoxes/Common/SVehicleComponentClassCombo.h"
+//#include "Soda/UI/ToolBoxes/Common/SPinWidget.h"
+//#include "Soda/UI/SMessageBox.h"
+//#include "Soda/SodaGameViewportClient.h"
+
+
+#include "Soda/ScenarioAction/ScenarioAction.h"
+#include "Soda/ScenarioAction/ScenarioActionBlock.h"
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+
+#include "Widgets/Layout/SExpandableArea.h"
+
+#define LOCTEXT_NAMESPACE "ScenarioActionTree"
+
+
+/***********************************************************************************/
+void SScenarioActionTree::Construct( const FArguments& InArgs, TWeakObjectPtr<UScenarioActionBlock> InScenarioBlock)
+{
+	ScenarioBlock = InScenarioBlock;
+
+	ChildSlot
+	[
+		SAssignNew(TreeView, STreeView<TWeakObjectPtr<UScenarioActionNode>>)
+		.SelectionMode(ESelectionMode::Single)
+		.TreeItemsSource(&RootNodes)
+		.OnGenerateRow(this, &SScenarioActionTree::MakeRowWidget)
+		.OnSelectionChanged(this, &SScenarioActionTree::OnSelectionChanged)
+		.OnContextMenuOpening(this, &SScenarioActionTree::OnContextMenuOpening)
+		.OnGetChildren(this, &SScenarioActionTree::OnGetChildren)
+		//.OnMouseButtonDoubleClick(this, &SScenarioActionTree::OnDoubleClick)
+	];
+	
+	RebuildNodes();
+}
+
+void SScenarioActionTree::RebuildNodes()
+{
+	//SExpandableArea
+
+	RootNodes.Empty();
+	if (ScenarioBlock.IsValid())
+	{
+		for (auto& It : ScenarioBlock.Get()->ActionRootNodes)
+		{
+			if (It->IsNodeValid())
+			{
+				RootNodes.Add(It);
+			}
+		}
+	}
+	TreeView->RebuildList();
+
+	/*
+	for (auto& It : RootNodes)
+	{
+		TreeView->SetItemExpansion(It, true);
+	}
+	*/
+}
+
+TSharedRef< ITableRow > SScenarioActionTree::MakeRowWidget(TWeakObjectPtr<UScenarioActionNode> Node, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return Node->MakeRowWidget(OwnerTable, SharedThis(this));
+}
+
+void SScenarioActionTree::OnGetChildren(TWeakObjectPtr<UScenarioActionNode> Node, TArray< TWeakObjectPtr<UScenarioActionNode> >& OutChildren)
+{
+	OutChildren = Node->GetChildren();
+}
+
+void SScenarioActionTree::OnSelectionChanged(TWeakObjectPtr<UScenarioActionNode> Node, ESelectInfo::Type SelectInfo)
+{
+}
+
+TSharedPtr<SWidget> SScenarioActionTree::OnContextMenuOpening()
+{
+	return TSharedPtr<SWidget>();
+}
+
+FReply SScenarioActionTree::OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.GetEffectingButton() == EKeys::RightMouseButton)
+	{
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+
+void SScenarioActionTree::Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime)
+{
+	SCompoundWidget::Tick(AllottedGeometry, InCurrentTime, InDeltaTime);
+}
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionTree.h b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionTree.h
new file mode 100644
index 0000000..a4bd75d
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ScenarioAction/SScenarioActionTree.h
@@ -0,0 +1,40 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "Widgets/Views/STreeView.h"
+#include "Soda/ScenarioAction/ScenarioActionBlock.h"
+#include "Soda/ScenarioAction/ScenarioActionNode.h"
+
+
+
+class  SScenarioActionTree : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SScenarioActionTree)
+	{ }
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, TWeakObjectPtr<UScenarioActionBlock> ScenarioBlock);
+	void RebuildNodes();
+	void RequestSelectRow(UScenarioActionNode* Node) { RequestedSelecteNode = Node; }
+	const TSharedPtr<STreeView<TWeakObjectPtr<UScenarioActionNode>>>& GetTreeView() const { return TreeView; }
+
+protected:
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override;
+
+protected:
+	TSharedRef< ITableRow > MakeRowWidget(TWeakObjectPtr<UScenarioActionNode> Node, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnSelectionChanged(TWeakObjectPtr<UScenarioActionNode> Component, ESelectInfo::Type SelectInfo);
+	TSharedPtr<SWidget> OnContextMenuOpening();
+	void OnGetChildren(TWeakObjectPtr<UScenarioActionNode> InTreeNode, TArray< TWeakObjectPtr<UScenarioActionNode> >& OutChildren);
+
+protected:
+	TArray<TWeakObjectPtr<UScenarioActionNode>> RootNodes;
+	TSharedPtr<STreeView<TWeakObjectPtr<UScenarioActionNode>>> TreeView;
+	TWeakObjectPtr<UScenarioActionBlock> ScenarioBlock;
+	TWeakObjectPtr<UScenarioActionNode> RequestedSelecteNode;
+};
diff --git a/Source/UnrealSoda/Private/UI/SodaOutputLogSettings.h b/Source/UnrealSoda/Private/UI/SodaOutputLogSettings.h
new file mode 100644
index 0000000..3eb11af
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SodaOutputLogSettings.h
@@ -0,0 +1,98 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "UObject/ObjectMacros.h"
+#include "UObject/Object.h"
+#include "Styling/SlateBrush.h"
+#include "Containers/EnumAsByte.h"
+#include "Misc/OutputDevice.h"
+#include "Delegates/DelegateCombinations.h"
+#include "SodaOutputLogSettings.generated.h"
+
+UENUM()
+enum class ESodaLogCategoryColorizationMode : uint8
+{
+	/** Do not colorize based on log categories */
+	None,
+
+	/** Colorize the entire log line, but not warnings or errors */
+	ColorizeWholeLine,
+
+	/** Colorize only the category name (including on warnings and errors) */
+	ColorizeCategoryOnly,
+
+	/** Colorize the background of the category name (including on warnings and errors) */
+	ColorizeCategoryAsBadge
+};
+
+/**
+ * Implements the Editor style settings.
+ */
+UCLASS(config=Game)
+class UNREALSODA_API USodaOutputLogSettings : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	USodaOutputLogSettings()
+	{
+		bCycleToOutputLogDrawer = true;
+		LogTimestampMode = ELogTimes::None;
+	}
+
+	/** The font size used in the output log */
+	UPROPERTY(EditAnywhere, config, Category="Output Log", meta=(DisplayName="Log Font Size", ConfigRestartRequired=true))
+	int32 LogFontSize;
+
+	/** The display mode for timestamps in the output log window */
+	UPROPERTY(EditAnywhere, config, Category="Output Log", meta=(DisplayName = "Output Log Window Timestamp Mode"))
+	TEnumAsByte<ELogTimes::Type> LogTimestampMode;
+
+	/** How should categories be colorized in the output log? */
+	UPROPERTY(EditAnywhere, config, Category = "Output Log")
+	ESodaLogCategoryColorizationMode CategoryColorizationMode;
+
+	/**
+	 * If checked pressing the console command shortcut will cycle between focusing the status bar console, opening the output log drawer, and back to the previous focus target. 
+	 * If unchecked, the console command shortcut will only focus the status bar console
+	 */
+	UPROPERTY(EditAnywhere, config, Category = "Output Log", meta = (DisplayName = "Open Output Log Drawer with Console Command Shortcut"))
+	bool bCycleToOutputLogDrawer;
+
+	UPROPERTY(EditAnywhere, config, Category = "Output Log")
+	bool bEnableOutputLogWordWrap;
+
+#if WITH_EDITORONLY_DATA
+	UPROPERTY(config)
+	bool bEnableOutputLogClearOnPIE;
+#endif
+
+public:
+
+	/**
+	 * Returns an event delegate that is executed when a setting has changed.
+	 *
+	 * @return The delegate.
+	 */
+	DECLARE_EVENT_OneParam(USodaOutputLogSettings, FSettingChangedEvent, FName /*PropertyName*/);
+	FSettingChangedEvent& OnSettingChanged() { return SettingChangedEvent; }
+
+protected:
+#if WITH_EDITOR
+	// UObject overrides
+	virtual void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent) override
+	{
+		Super::PostEditChangeProperty(PropertyChangedEvent);
+
+		SaveConfig();
+		const FName PropertyName = (PropertyChangedEvent.Property != nullptr) ? PropertyChangedEvent.Property->GetFName() : NAME_None;
+		SettingChangedEvent.Broadcast(PropertyName);
+	}
+#endif
+
+private:
+
+	// Holds an event delegate that is executed when a setting has changed.
+	FSettingChangedEvent SettingChangedEvent;
+};
diff --git a/Source/UnrealSoda/Private/UI/SodaViewportCommands.cpp b/Source/UnrealSoda/Private/UI/SodaViewportCommands.cpp
new file mode 100644
index 0000000..f5ee6d4
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/SodaViewportCommands.cpp
@@ -0,0 +1,176 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UI/SodaViewportCommands.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Components/PrimitiveComponent.h"
+#include "AssetRegistry/AssetData.h"
+#include "Modules/ModuleManager.h"
+#include "Materials/MaterialInterface.h"
+#include "MaterialShared.h"
+#include "Engine/Texture2D.h"
+#include "Stats/StatsData.h"
+
+#define LOCTEXT_NAMESPACE "SodaViewportCommands"
+
+namespace soda
+{
+
+FSodalViewportCommands::FOnNewStatCommandAdded FSodalViewportCommands::NewStatCommandDelegate;
+
+FSodalViewportCommands::FSodalViewportCommands()
+	: TCommands<FSodalViewportCommands>
+	(
+		TEXT("SodaViewport"),
+		NSLOCTEXT("Contexts", "SodaViewportCommands", "Soda Viewport Commands"),
+		NAME_None,
+		FSodaStyle::GetStyleSetName() // Icon Style Set
+	)
+{
+}
+
+FSodalViewportCommands::~FSodalViewportCommands()
+{
+	UEngine::NewStatDelegate.RemoveAll(this);
+	FStatGroupGameThreadNotifier::Get().NewStatGroupDelegate.Unbind();
+}
+
+void FSodalViewportCommands::RegisterCommands()
+{
+	UI_COMMAND( Perspective, "Perspective", "Switches the viewport to perspective view", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Alt, EKeys::G ) );
+	UI_COMMAND( OrthographicFree, "OrthographicFree", "Switches the viewport to orthographic free view", EUserInterfaceActionType::RadioButton, FInputChord(EModifierKey::Alt, EKeys::O));
+	UI_COMMAND( Front, "Front", "Switches the viewport to front view", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Alt, EKeys::H ) );
+	UI_COMMAND( Back, "Back", "Switches the viewport to back view", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Alt | EModifierKey::Shift, EKeys::H ) );
+	UI_COMMAND( Top, "Top", "Switches the viewport to top view", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Alt, EKeys::J ) );
+	UI_COMMAND( Bottom, "Bottom", "Switches the viewport to bottom view", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Alt | EModifierKey::Shift, EKeys::J ) );
+	UI_COMMAND( Left, "Left", "Switches the viewport to left view", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Alt, EKeys::K ) );
+	UI_COMMAND( Right, "Right", "Switches the viewport to right view", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Alt | EModifierKey::Shift, EKeys::K ) );
+	UI_COMMAND( Next, "Next", "Rotate through each view options", EUserInterfaceActionType::RadioButton, FInputChord( EModifierKey::Control | EModifierKey::Shift, EKeys::SpaceBar ) );
+
+	UI_COMMAND( ToggleStats, "Show Stats", "Toggles the ability to show stats in this viewport (enables realtime)", EUserInterfaceActionType::ToggleButton, FInputChord( EModifierKey::Shift, EKeys::L ) );
+	UI_COMMAND( ToggleFPS, "Show FPS", "Toggles showing frames per second in this viewport (enables realtime)", EUserInterfaceActionType::ToggleButton, FInputChord( EModifierKey::Control|EModifierKey::Shift, EKeys::H ) );
+	UI_COMMAND( ToggleVehiclePanel, "Show Vehicle Panel", "Toggles the debug vehicle panel", EUserInterfaceActionType::ToggleButton, FInputChord(EModifierKey::Control | EModifierKey::Shift, EKeys::V));
+	UI_COMMAND( ToggleFullScreen, "Full Screen", "Toggles full screen", EUserInterfaceActionType::ToggleButton, FInputChord());
+	
+	UI_COMMAND( SelectMode, "Select Mode", "Select objects", EUserInterfaceActionType::ToggleButton, FInputChord());
+	UI_COMMAND( TranslateMode, "Translate Mode", "Select and translate objects", EUserInterfaceActionType::ToggleButton, FInputChord() );
+	UI_COMMAND( RotateMode, "Rotate Mode", "Select and rotate objects", EUserInterfaceActionType::ToggleButton, FInputChord() );
+	UI_COMMAND( ScaleMode, "Scale Mode", "Select and scale objects", EUserInterfaceActionType::ToggleButton, FInputChord() );
+
+	UI_COMMAND( RelativeCoordinateSystem_World, "World-relative Transform", "Move and rotate objects relative to the cardinal world axes", EUserInterfaceActionType::RadioButton, FInputChord() );
+	UI_COMMAND( RelativeCoordinateSystem_Local, "Local-relative Transform", "Move and rotate objects relative to the object's local axes", EUserInterfaceActionType::RadioButton, FInputChord() );
+
+#if PLATFORM_MAC
+	UI_COMMAND( CycleTransformGizmoCoordSystem, "Cycle Transform Coordinate System", "Cycles the transform gizmo coordinate systems between world and local (object) space", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Command, EKeys::Tilde));
+#else
+	UI_COMMAND( CycleTransformGizmoCoordSystem, "Cycle Transform Coordinate System", "Cycles the transform gizmo coordinate systems between world and local (object) space", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Control, EKeys::Tilde));
+#endif
+	UI_COMMAND( CycleTransformGizmos, "Cycle Between Translate, Rotate, and Scale", "Cycles the transform gizmos between translate, rotate, and scale", EUserInterfaceActionType::Button, FInputChord(EKeys::SpaceBar) );
+	
+	
+	UI_COMMAND(HideAllStats, "Hide All Stats", "Hides all Stats", EUserInterfaceActionType::Button, FInputChord());
+
+	UI_COMMAND(RestartLevel, "Restart Level", "Restart current level", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Shift, EKeys::F));
+	UI_COMMAND(ClearLevel, "Clear Level", "Reload level without saved data", EUserInterfaceActionType::Button, FInputChord());
+
+	UI_COMMAND(RecordDataset, "Record Dataset", "Record dataset when a scenario is running", EUserInterfaceActionType::ToggleButton, FInputChord());
+	UI_COMMAND(AutoConnectDB, "Auto Connect", "Automatically connect to the database on application startup", EUserInterfaceActionType::ToggleButton, FInputChord());
+
+	UI_COMMAND(ToggleSpectatorMode, "Toggle Spectator Mode", "Enbale/disable the spectator mode", EUserInterfaceActionType::Button, FInputChord(EKeys::Enter));
+	UI_COMMAND(PossesNextVehicle, "Posses Next Vehicle", "Posses next Soda Vehicle", EUserInterfaceActionType::Button, FInputChord(EKeys::X));
+	UI_COMMAND(BackMenu, "Back Menu", "Back menu", EUserInterfaceActionType::Button, FInputChord(EKeys::Escape));
+	UI_COMMAND(BackMenuEditor, "Back Menu", "Back menu", EUserInterfaceActionType::Button, FInputChord(EKeys::Tab));
+	UI_COMMAND(TagActors, "Tag Actors", "Tag all actors for semantic segmentation and add V2V components for all SodaVehicles", EUserInterfaceActionType::Button, FInputChord());
+	UI_COMMAND(Exit, "Exit", "Exit application", EUserInterfaceActionType::Button, FInputChord(EModifierKey::Shift, EKeys::Q));
+	
+
+	// Bind a listener here for any additional stat commands that get registered later.
+	UEngine::NewStatDelegate.AddRaw(this, &FSodalViewportCommands::HandleNewStat);
+	FStatGroupGameThreadNotifier::Get().NewStatGroupDelegate.BindRaw(this, &FSodalViewportCommands::HandleNewStatGroup);
+}
+
+void FSodalViewportCommands::HandleNewStatGroup(const TArray<FStatNameAndInfo>& NameAndInfos)
+{
+	// #Stats: FStatNameAndInfo should be private and visible only to stats2 system
+	for (int32 InfoIdx = 0; InfoIdx < NameAndInfos.Num(); InfoIdx++)
+	{
+		const FStatNameAndInfo& NameAndInfo = NameAndInfos[InfoIdx];
+		const FName GroupName = NameAndInfo.GetGroupName();
+		const FName GroupCategory = NameAndInfo.GetGroupCategory();
+		const FText GroupDescription = FText::FromString(NameAndInfo.GetDescription());	// @todo localize description?
+		HandleNewStat(GroupName, GroupCategory, GroupDescription);
+	}
+}
+
+void FSodalViewportCommands::HandleNewStat(const FName& InStatName, const FName& InStatCategory, const FText& InStatDescription)
+{
+	FString CommandName = InStatName.ToString();
+	if (CommandName.RemoveFromStart(TEXT("STATGROUP_")) || CommandName.RemoveFromStart(TEXT("STAT_")))
+	{
+		// Trim the front to get our category name
+		FString GroupCategory = InStatCategory.ToString();
+		if (!GroupCategory.RemoveFromStart(TEXT("STATCAT_")))
+		{
+			GroupCategory.Empty();
+		}
+
+		// If we already have an entry (which can happen if a category has changed [when loading older saved stat data]) or we don't have a valid category then skip adding
+		if (!FInputBindingManager::Get().FindCommandInContext(this->GetContextName(), InStatName).IsValid() && !GroupCategory.IsEmpty())
+		{
+			// Find or Add the category
+			TArray<FShowMenuCommand>* ShowStatCommands = ShowStatCatCommands.Find(GroupCategory);
+			if (!ShowStatCommands)
+			{
+				// New category means we'll need to resort
+				ShowStatCatCommands.Add(GroupCategory);
+				ShowStatCatCommands.KeySort(TLess<FString>());
+				ShowStatCommands = ShowStatCatCommands.Find(GroupCategory);
+			}
+
+			const int32 NewIndex = FindStatIndex(ShowStatCommands, CommandName);
+			if (NewIndex != INDEX_NONE)
+			{
+				const FText DisplayName = FText::FromString(CommandName);
+
+				FText DescriptionName = InStatDescription;
+				FFormatNamedArguments Args;
+				Args.Add(TEXT("StatName"), DisplayName);
+				if (DescriptionName.IsEmpty())
+				{
+					DescriptionName = FText::Format(NSLOCTEXT("UICommands", "StatShowCommandName", "Show {StatName} Stat"), Args);
+				}
+
+				TSharedPtr<FUICommandInfo> StatCommand
+					= FUICommandInfoDecl(this->AsShared(), InStatName, DisplayName, DescriptionName)
+					.UserInterfaceType(EUserInterfaceActionType::ToggleButton);
+
+				FSodalViewportCommands::FShowMenuCommand ShowStatCommand(StatCommand, DisplayName);
+				ShowStatCommands->Insert(ShowStatCommand, NewIndex);
+				NewStatCommandDelegate.Broadcast(ShowStatCommand.ShowMenuItem, ShowStatCommand.LabelOverride.ToString());
+			}
+		}
+	}
+}
+
+int32 FSodalViewportCommands::FindStatIndex(const TArray< FShowMenuCommand >* ShowStatCommands, const FString& InCommandName) const
+{
+	check(ShowStatCommands);
+	for (int32 StatIndex = 0; StatIndex < ShowStatCommands->Num(); ++StatIndex)
+	{
+		const FString CommandName = (*ShowStatCommands)[StatIndex].LabelOverride.ToString();
+		const int32 Compare = InCommandName.Compare(CommandName);
+		if (Compare == 0)
+		{
+			return INDEX_NONE;
+		}
+		else if (Compare < 0)
+		{
+			return StatIndex;
+		}
+	}
+	return ShowStatCommands->Num();
+}
+
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/ToolBoxes/SActorToolBox.cpp b/Source/UnrealSoda/Private/UI/ToolBoxes/SActorToolBox.cpp
new file mode 100644
index 0000000..f9ed7f1
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ToolBoxes/SActorToolBox.cpp
@@ -0,0 +1,152 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SActorToolBox.h"
+#include "Soda/UnrealSoda.h"
+#include "EngineUtils.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Input/SSearchBox.h"
+#include "Soda/ISodaActor.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/Editor/SodaSelection.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/UI/SSodaViewport.h"
+
+#define LOCTEXT_NAMESPACE "ActorBar"
+
+namespace soda
+{
+
+void SActorToolBox::Construct( const FArguments& InArgs )
+{
+	Viewport = InArgs._Viewport;
+
+	check(InArgs._Viewport);
+	ViewportClient = InArgs._Viewport->GetViewportClient();
+	check(ViewportClient.IsValid());
+
+	Caption = FText::FromString(TEXT("Editing Mode"));
+
+	FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+	soda::FDetailsViewArgs Args;
+	Args.bHideSelectionTip = true;
+	Args.bLockable = true;
+	Args.DefaultsOnlyVisibility = EEditDefaultsOnlyNodeVisibility::Hide;
+	Args.NameAreaSettings = soda::FDetailsViewArgs::HideNameArea;
+	Args.bGameModeOnlyVisible = true;
+	DetailView = RuntimeEditorModule.CreateDetailView(Args);
+	DetailView->SetIsPropertyVisibleDelegate(soda::FIsPropertyVisible::CreateLambda([](const soda::FPropertyAndParent& PropertyAndParent)
+	{
+		// For details views in the level editor all properties are the instanced versions
+		if (PropertyAndParent.Property.HasAllPropertyFlags(CPF_DisableEditOnInstance))
+		{
+			return false;
+		}
+
+		const FProperty& Property = PropertyAndParent.Property;
+		const FArrayProperty* ArrayProperty = CastField<const FArrayProperty>(&Property);
+		const FSetProperty* SetProperty = CastField<const FSetProperty>(&Property);
+		const FMapProperty* MapProperty = CastField<const FMapProperty>(&Property);
+
+		const FProperty* TestProperty = ArrayProperty ? ArrayProperty->Inner : &Property;
+		const FObjectPropertyBase* ObjectProperty = CastField<const FObjectPropertyBase>(TestProperty);
+		bool bIsActorProperty = (ObjectProperty != nullptr && ObjectProperty->PropertyClass->IsChildOf(AActor::StaticClass()));
+
+		bool bIsComponent = (ObjectProperty != nullptr && ObjectProperty->PropertyClass->IsChildOf(UActorComponent::StaticClass()));
+
+		if (bIsComponent)
+		{
+			// Don't show sub components properties, thats what selecting components in the component tree is for.
+			return false;
+		}
+		return true;
+	}));
+
+	ChildSlot
+	[
+		SNew(SSplitter)
+		.Orientation(EOrientation::Orient_Vertical)
+		+ SSplitter::Slot()
+		.Value(0.4)
+		[
+			SAssignNew(ListView, SActorList, ViewportClient.Get())
+			.OnSelectionChanged(this, &SActorToolBox::OnSelectionChanged)
+		]
+		+ SSplitter::Slot()
+		.Value(0.6)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			[
+				SAssignNew(EmptyBox, SBox)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			[
+				DetailView.ToSharedRef()
+			]
+		]
+	];
+
+	ClearSelection();
+	
+	//ListView->RebuilActorList();
+}
+
+FReply SActorToolBox::OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if (MouseEvent.GetEffectingButton() == EKeys::RightMouseButton)
+	{
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+
+void SActorToolBox::OnPush()
+{
+	if (ViewportClient->Selection)
+	{
+		ViewportClient->Selection->RetargetWidgetForSelectedActor();
+	}
+}
+
+void SActorToolBox::OnSelectionChanged(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo)
+{
+	if (Actor.IsValid())
+	{
+		DetailView->SetObject(Actor.Get());
+		EmptyBox->SetContent(SNullWidget::NullWidget);
+	}
+	else
+	{
+		ClearSelection();
+	}
+}
+
+void SActorToolBox::ClearSelection()
+{
+	DetailView->SetObjects(TArray<UObject*>());
+	EmptyBox->SetContent(
+		SNew(STextBlock)
+		.TextStyle(FAppStyle::Get(), "HintText")
+		.Margin(FMargin(0, 20, 0, 0))
+		.Text(FText::FromString("Select an actor to view details."))
+	);
+}
+
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/ToolBoxes/SActorToolBox.h b/Source/UnrealSoda/Private/UI/ToolBoxes/SActorToolBox.h
new file mode 100644
index 0000000..01b427e
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ToolBoxes/SActorToolBox.h
@@ -0,0 +1,42 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SToolBox.h"
+#include "Soda/UI/SActorList.h"
+
+class USodaGameViewportClient;
+
+namespace soda
+{
+class SSodaViewport;
+class IDetailsView;
+
+class  SActorToolBox : public SToolBox
+{
+public:
+	SLATE_BEGIN_ARGS(SActorToolBox)
+	{ }
+	SLATE_ARGUMENT(TSharedPtr<SSodaViewport>, Viewport)
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs );
+
+protected:
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+
+	virtual void OnPush() override;
+
+	void OnSelectionChanged(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo);
+	void ClearSelection();
+
+	TWeakObjectPtr<USodaGameViewportClient> ViewportClient;
+	TWeakPtr<soda::SSodaViewport> Viewport;
+	
+	TSharedPtr<SActorList> ListView;
+	TSharedPtr<soda::IDetailsView> DetailView;
+	TSharedPtr<SBox> EmptyBox;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/ToolBoxes/SVehicleComponentsToolBox.cpp b/Source/UnrealSoda/Private/UI/ToolBoxes/SVehicleComponentsToolBox.cpp
new file mode 100644
index 0000000..c79541f
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ToolBoxes/SVehicleComponentsToolBox.cpp
@@ -0,0 +1,28 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SVehicleComponentsToolBox.h"
+#include "Soda/UI/SVehicleComponentsList.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/SodaGameViewportClient.h"
+
+#define LOCTEXT_NAMESPACE "VehicleComponentsBar"
+
+namespace soda
+{
+
+void SVehicleComponentsToolBox::Construct( const FArguments& InArgs, ASodaVehicle* InVehicle)
+{
+	check(InVehicle);
+
+	Vehicle = InVehicle;
+	Caption = FText::FromString(InVehicle->GetName());
+
+	ChildSlot
+	[
+		SNew(SVehicleComponentsList, InVehicle, true)
+	];
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/ToolBoxes/SVehicleComponentsToolBox.h b/Source/UnrealSoda/Private/UI/ToolBoxes/SVehicleComponentsToolBox.h
new file mode 100644
index 0000000..2827068
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/ToolBoxes/SVehicleComponentsToolBox.h
@@ -0,0 +1,26 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "Soda/UI/SToolBox.h"
+
+class ASodaVehicle;
+
+namespace soda
+{
+class  SVehicleComponentsToolBox : public SToolBox
+{
+public:
+	SLATE_BEGIN_ARGS(SVehicleComponentsToolBox)
+	{ }
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs, ASodaVehicle* Vehicle);
+
+protected:
+	TWeakObjectPtr<ASodaVehicle> Vehicle;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBar.cpp b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBar.cpp
new file mode 100644
index 0000000..45b92cd
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBar.cpp
@@ -0,0 +1,36 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SViewportToolBar.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Widgets/Input/SMenuAnchor.h"
+#include "SodaStyleSet.h"
+
+#define LOCTEXT_NAMESPACE "ViewportToolBar"
+
+namespace soda
+{
+
+void SViewportToolBar::Construct( const FArguments& InArgs )
+{
+	bIsHovered = false;
+}
+
+TWeakPtr<SMenuAnchor> SViewportToolBar::GetOpenMenu() const
+{
+	return OpenedMenu;
+}
+
+void SViewportToolBar::SetOpenMenu( TSharedPtr< SMenuAnchor >& NewMenu )
+{
+	if( OpenedMenu.IsValid() && OpenedMenu.Pin() != NewMenu )
+	{
+		// Close any other open menus
+		OpenedMenu.Pin()->SetIsOpen( false );
+	}
+	OpenedMenu = NewMenu;
+}
+
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBar.h b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBar.h
new file mode 100644
index 0000000..e4ac4db
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBar.h
@@ -0,0 +1,47 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Engine/EngineBaseTypes.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Animation/CurveSequence.h"
+
+class SMenuAnchor;
+
+namespace soda
+{
+
+/**
+ * A level viewport toolbar widget that is placed in a viewport
+ */
+class SViewportToolBar : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS( SViewportToolBar ){}
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs );
+
+	/**
+	 * @return The currently open pull down menu if there is one
+	 */
+	TWeakPtr<SMenuAnchor> GetOpenMenu() const;
+
+	/**
+	 * Sets the open menu to a new menu and closes any currently opened one
+	 *
+	 * @param NewMenu The new menu that is opened
+	 */
+	void SetOpenMenu( TSharedPtr< SMenuAnchor >& NewMenu );
+
+private:
+	/** The pulldown menu that is open if any */
+	TWeakPtr< SMenuAnchor > OpenedMenu;
+	/** True if the mouse is inside the toolbar */
+	bool bIsHovered;
+};
+
+}
+
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarButton.cpp b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarButton.cpp
new file mode 100644
index 0000000..71c1bcc
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarButton.cpp
@@ -0,0 +1,106 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SViewportToolBarButton.h"
+#include "Styling/SlateTypes.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "SodaStyleSet.h"
+
+namespace soda
+{
+
+void SViewportToolBarButton::Construct( const FArguments& Declaration)
+{
+	OnClickedDelegate = Declaration._OnClicked;
+	IsChecked = Declaration._IsChecked;
+	const TSharedRef<SWidget>& ContentSlotWidget = Declaration._Content.Widget;
+
+	bool bContentOverride = ContentSlotWidget != SNullWidget::NullWidget;
+
+	EUserInterfaceActionType ButtonType = Declaration._ButtonType;
+	
+	// The style of the image to show in the button
+	const FName ImageStyleName = Declaration._Image.Get();
+
+	TSharedPtr<SWidget> ButtonWidget;
+
+	if( ButtonType == EUserInterfaceActionType::Button )
+	{
+		const FSlateBrush* Brush = FSodaStyle::GetBrush( ImageStyleName );
+
+		ButtonWidget =
+			SNew( SButton )
+			.ButtonStyle(Declaration._ButtonStyle)
+			.OnClicked( OnClickedDelegate )
+			.HAlign( HAlign_Center )
+			.VAlign( VAlign_Center )
+			.ContentPadding(FMargin(4.f, 0.f))
+			.IsFocusable(false)
+			[
+				// If we have a content override use it instead of the default image
+				bContentOverride
+					? ContentSlotWidget
+					: TSharedRef<SWidget>( SNew( SImage ) .Image( Brush ) )
+			];
+	}
+	else
+	{
+		// Cache off checked/unchecked image states
+		NormalBrush = FSodaStyle::GetBrush( ImageStyleName, ".Normal" );
+		CheckedBrush = FSodaStyle::GetBrush( ImageStyleName, ".Checked" );
+
+		if( CheckedBrush->GetResourceName() == FName("Default") )
+		{
+			// A different checked brush was not specified so use the normal image when checked
+			CheckedBrush = NormalBrush;
+		}
+
+		ButtonWidget = 
+			SNew( SCheckBox )
+			.IsFocusable(false)
+			.Style(Declaration._CheckBoxStyle)
+			.OnCheckStateChanged( this, &SViewportToolBarButton::OnCheckStateChanged )
+			.IsChecked( this, &SViewportToolBarButton::OnIsChecked )
+			[
+				bContentOverride ? ContentSlotWidget :
+				TSharedRef<SWidget>(
+					SNew( SBox )
+					.Padding(0.0f)
+					.VAlign( VAlign_Center )
+					.HAlign( HAlign_Center )
+					[
+						SNew( SImage )
+						.Image( this, &SViewportToolBarButton::OnGetButtonImage )
+						.ColorAndOpacity(FSlateColor::UseForeground())
+					])
+			];
+	}
+
+	ChildSlot
+	[
+		ButtonWidget.ToSharedRef()
+	];
+}
+
+void SViewportToolBarButton::OnCheckStateChanged( ECheckBoxState NewCheckedState )
+{
+	// When the check state changes (can only happen during clicking in this case) execute our on clicked delegate
+	if(OnClickedDelegate.IsBound() == true)
+	{
+		OnClickedDelegate.Execute();
+	}
+}
+
+const FSlateBrush* SViewportToolBarButton::OnGetButtonImage() const
+{
+	return IsChecked.Get() == true ? CheckedBrush : NormalBrush;
+}
+
+ECheckBoxState SViewportToolBarButton::OnIsChecked() const
+{
+	return IsChecked.Get() == true ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+}
+
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarButton.h b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarButton.h
new file mode 100644
index 0000000..5f249d7
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarButton.h
@@ -0,0 +1,90 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Framework/SlateDelegates.h"
+#include "Framework/Commands/UICommandInfo.h"
+#include "Styling/SlateTypes.h"
+#include "SodaStyleSet.h"
+#include "Styling/SlateWidgetStyleAsset.h"
+#include "Styling/ToolBarStyle.h"
+
+struct FSlateBrush;
+enum class ECheckBoxState : uint8;
+
+namespace soda
+{
+
+/**
+ * A simple class that represents a toolbar button in an editor viewport toolbar
+ */
+class SViewportToolBarButton : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SViewportToolBarButton)
+		: _ButtonType(EUserInterfaceActionType::Button)
+		, _ButtonStyle(&FSodaStyle::Get().GetWidgetStyle<FToolBarStyle>("EditorViewportToolBar").ButtonStyle)
+		, _CheckBoxStyle(&FSodaStyle::Get().GetWidgetStyle<FToolBarStyle>("EditorViewportToolBar").ToggleButton)
+		, _IsChecked(false)
+		{}
+
+		/** Called when the button is clicked */
+		SLATE_EVENT(FOnClicked, OnClicked)
+
+		/** The button type to use */
+		SLATE_ARGUMENT(EUserInterfaceActionType, ButtonType)
+
+		/** Style to use when this is a regular button type */
+		SLATE_STYLE_ARGUMENT(FButtonStyle, ButtonStyle)
+
+		/** Style to use when this is a check box type */
+		SLATE_STYLE_ARGUMENT(FCheckBoxStyle, CheckBoxStyle)
+
+		/** Checked state of the button */
+		SLATE_ATTRIBUTE(bool, IsChecked)
+
+		/** Style name of an image to use. Simple two state images are supported.  An image can be different depending on checked/unchecked state */
+		SLATE_ATTRIBUTE(FName, Image)
+		/** Any custom content to show in the button in place of other content */
+		SLATE_DEFAULT_SLOT( FArguments, Content )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& Declaration );
+private:
+	/** 
+	 * Called when the button check state changes
+	 * 
+	 * @param NewCheckedState	The new state of the check box
+	 */
+	void OnCheckStateChanged( ECheckBoxState NewCheckedState );
+
+	/**
+	 * Called when we need to get the image to show in the button
+	 *
+	 * @return The brush defining the image to use
+	 */
+	const FSlateBrush* OnGetButtonImage() const;
+
+	/**
+	 * Called when we need to get the state of the check box button
+	 *
+	 * @return The state of the check box button
+	 */
+	ECheckBoxState OnIsChecked() const;
+
+private:
+	/** Attribute used to get the state of a checkbox */
+	TAttribute<bool> IsChecked;
+	/** Delegate to call when the button is clicked */
+	FOnClicked OnClickedDelegate;
+	/** Cached brush to use when the button is checked */
+	const FSlateBrush* CheckedBrush;
+	/** Cached brush to use when the button is unchecked */
+	const FSlateBrush* NormalBrush;
+};
+
+} // namespace soda
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenu.cpp b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenu.cpp
new file mode 100644
index 0000000..eaccdfe
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenu.cpp
@@ -0,0 +1,197 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SViewportToolBarMenu.h"
+#include "SViewportToolBarMenuButton.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Input/SMenuAnchor.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/SOverlay.h"
+#include "SodaStyleSet.h"
+
+namespace soda
+{
+
+void SViewportToolbarMenu::Construct( const FArguments& Declaration )
+{
+	const TAttribute<FText>& Label = Declaration._Label;
+
+	SetToolTipText(FText::GetEmpty());
+
+	const FName ImageName = Declaration._Image;
+	const FSlateBrush* ImageBrush = FSodaStyle::GetBrush( ImageName );
+
+	LabelIconBrush = Declaration._LabelIcon;
+	OverlayLabelIconBrush = Declaration._OverlayLabelIcon;
+
+	ParentToolBar = Declaration._ParentToolBar;
+	checkf(ParentToolBar.IsValid(), TEXT("The parent toolbar must be specified") );
+
+	TSharedPtr<SWidget> ButtonContent;
+
+	// Create the content for the button.  We always use an image over a label if it is valid
+	if( ImageName != NAME_None )
+	{
+		ButtonContent = 
+			SNew(SBox)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SImage)	
+				.Image(ImageBrush)
+				.ColorAndOpacity(FSlateColor::UseForeground())
+			];
+	}
+	else
+	{
+		if( LabelIconBrush.IsBound() || LabelIconBrush.Get() != NULL )
+		{
+			TSharedPtr<SWidget> IconWidget;
+			if(OverlayLabelIconBrush.IsBound() || OverlayLabelIconBrush.Get() != NULL)
+			{
+				IconWidget = SNew(SOverlay)
+				.Visibility(this, &SViewportToolbarMenu::GetLabelIconVisibility)
+				+ SOverlay::Slot()
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Top)
+				[
+					SNew( SImage )
+					.Image(LabelIconBrush)
+					.ColorAndOpacity(FSlateColor::UseForeground())
+				]
+				+ SOverlay::Slot()
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Top)
+				[
+					SNew( SImage )
+					.Image(OverlayLabelIconBrush)
+					.ColorAndOpacity(FSlateColor::UseForeground())
+				];
+			} 
+			else
+			{
+				IconWidget = SNew( SImage )
+				.Visibility(this, &SViewportToolbarMenu::GetLabelIconVisibility)
+				.Image(LabelIconBrush)
+				.ColorAndOpacity(FSlateColor::UseForeground());
+			}
+
+			// Label with an icon to the left
+			ButtonContent = 
+				SNew(SHorizontalBox)
+				+SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				.AutoWidth()
+				.Padding(4.0f, 0.0f, 4.f, 0.0f)
+				[
+					IconWidget.ToSharedRef()
+				]
+				+SHorizontalBox::Slot()
+				.Padding(0.0f, 0.0f, 4.f, 0.0f)
+				.AutoWidth()
+				.VAlign(VAlign_Center)
+				[
+					SNew(STextBlock)
+					.Text(Label)
+				];
+		}
+		else
+		{
+			// Just the label text, no icon
+			ButtonContent = 
+				SNew(SBox)
+				.VAlign(VAlign_Center)
+				.Padding(FMargin(4.f, 0.f))
+				[
+					SNew( STextBlock )
+					.Text(Label)
+				];
+		}
+	}
+
+	ChildSlot
+	[
+		SAssignNew( MenuAnchor, SMenuAnchor )
+		.Placement( MenuPlacement_BelowAnchor )
+		.OnGetMenuContent( Declaration._OnGetMenuContent )
+	];
+
+	MenuAnchor->SetContent(
+		SNew( SViewportToolBarMenuButton, MenuAnchor.ToSharedRef() )
+		.ContentPadding( FMargin(0.0f, 0.0f) )
+		.VAlign(VAlign_Center)
+		.ButtonStyle(Declaration._MenuStyle)
+		.ToolTipText(this, &SViewportToolbarMenu::GetFilteredToolTipText, Declaration._ToolTipText)
+		.OnClicked( this, &SViewportToolbarMenu::OnMenuClicked )
+		.ForegroundColor(Declaration._ForegroundColor)
+		[
+			ButtonContent.ToSharedRef()
+		]
+	);
+}
+
+FText SViewportToolbarMenu::GetFilteredToolTipText(TAttribute<FText> ToolTipText) const
+{
+	// If we're part of a toolbar that has a currently open menu, then we suppress our tool-tip
+	// as it will just get in the way
+	TWeakPtr<SMenuAnchor> OpenedMenu = ParentToolBar.Pin()->GetOpenMenu();
+	if (OpenedMenu.IsValid() && OpenedMenu.Pin()->IsOpen())
+	{
+		return FText::GetEmpty();
+	}
+
+	return ToolTipText.Get();
+}
+
+FReply SViewportToolbarMenu::OnMenuClicked()
+{
+	// If the menu button is clicked toggle the state of the menu anchor which will open or close the menu
+	if (MenuAnchor->ShouldOpenDueToClick())
+	{
+		MenuAnchor->SetIsOpen( true );
+		ParentToolBar.Pin()->SetOpenMenu( MenuAnchor );
+	}
+	else
+	{
+		MenuAnchor->SetIsOpen( false );
+		TSharedPtr<SMenuAnchor> NullAnchor;
+		ParentToolBar.Pin()->SetOpenMenu( NullAnchor );
+	}
+
+	return FReply::Handled();
+}
+
+void SViewportToolbarMenu::OnMouseEnter( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent )
+{
+	SCompoundWidget::OnMouseEnter(MyGeometry, MouseEvent);
+
+	// See if there is another menu on the same tool bar already open
+	TWeakPtr<SMenuAnchor> OpenedMenu = ParentToolBar.Pin()->GetOpenMenu();
+	if( OpenedMenu.IsValid() && OpenedMenu.Pin()->IsOpen() && OpenedMenu.Pin() != MenuAnchor )
+	{
+		// There is another menu open so we open this menu and close the other
+		ParentToolBar.Pin()->SetOpenMenu( MenuAnchor ); 
+		MenuAnchor->SetIsOpen( true );
+	}
+
+}
+
+EVisibility SViewportToolbarMenu::GetLabelIconVisibility() const
+{
+	return LabelIconBrush.Get() != NULL ? EVisibility::Visible : EVisibility::Collapsed;
+}
+
+TWeakPtr<class SViewportToolBar> SViewportToolbarMenu::GetParentToolBar() const
+{
+	return ParentToolBar;
+}
+
+bool SViewportToolbarMenu::IsMenuOpen() const
+{
+	return MenuAnchor->IsOpen();
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenu.h b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenu.h
new file mode 100644
index 0000000..110ab85
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenu.h
@@ -0,0 +1,115 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Misc/Attribute.h"
+#include "Layout/Visibility.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Input/Reply.h"
+#include "Widgets/SCompoundWidget.h"
+#include "SViewportToolBar.h"
+#include "Framework/SlateDelegates.h"
+#include "Styling/SlateTypes.h"
+#include "SodaStyleSet.h"
+#include "Styling/SlateWidgetStyleAsset.h"
+
+class SMenuAnchor;
+struct FSlateBrush;
+
+namespace soda
+{
+
+namespace EMenuItemType
+{
+	enum Type
+	{
+		Default,
+		Header,
+		Separator,
+	};
+}
+
+
+/**
+ * Widget that opens a menu when clicked
+ */
+class SViewportToolbarMenu : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SViewportToolbarMenu)
+		: _MenuStyle(&FSodaStyle::GetWidgetStyle<FButtonStyle>("EditorViewportToolBar.Button"))
+		, _ForegroundColor(FSlateColor::UseStyle())
+	{}
+		/** We need to know about the toolbar we are in */
+		SLATE_ARGUMENT(TSharedPtr<SViewportToolBar>, ParentToolBar);
+		/** Style to use */
+		SLATE_STYLE_ARGUMENT(FButtonStyle, MenuStyle)
+		/** The label to show in the menu */
+		SLATE_ATTRIBUTE(FText, Label)
+		/** Optional icon to display next to the label */
+		SLATE_ATTRIBUTE(const FSlateBrush*, LabelIcon)
+		/** Optional overlay icon to display next to the label */
+		SLATE_ATTRIBUTE(const FSlateBrush*, OverlayLabelIcon)
+		/** The image to show in the menu.  If both the label and image are valid, the button image is used.  Note that if this image is used, the label icon will not be displayed. */
+		SLATE_ARGUMENT(FName, Image)
+		/** Content to show in the menu */
+		SLATE_EVENT(FOnGetContent, OnGetMenuContent)
+		/** The foreground color of the content */
+		SLATE_ATTRIBUTE(FSlateColor, ForegroundColor)
+	SLATE_END_ARGS()
+
+	/**
+	 * Constructs the menu
+	 */
+	void Construct( const FArguments& Declaration );
+
+	/**
+	 * Returns parent tool bar
+	 */
+	TWeakPtr<SViewportToolBar> GetParentToolBar() const;
+
+	/**
+	 * @return true if this menu is open
+	 */
+	bool IsMenuOpen() const;
+
+private:
+	/**
+	 * Called when the menu button is clicked.  Will toggle the visibility of the menu content                   
+	 */
+	FReply OnMenuClicked();
+
+	/**
+	 * Called when the mouse enters a menu button.  If there was a menu previously opened
+	 * we open this menu automatically
+	 */
+	void OnMouseEnter( const FGeometry& MyGeometry, const FPointerEvent& MouseEvent );
+
+	EVisibility GetLabelIconVisibility() const;
+
+protected:
+	/** Parent tool bar for querying other open menus */
+	TWeakPtr<SViewportToolBar> ParentToolBar;
+
+	/** Name of tool menu */
+	FName MenuName;
+
+	/**
+	 * Called to query the tool tip text for this widget, but will return an empty text for menu bar items
+	 * when a menu for that menu bar is already open
+	 *
+	 * @param	ToolTipText	Tool tip text to display, if possible
+	 *
+	 * @return	Tool tip text, or an empty text if filtered out
+	 */
+	FText GetFilteredToolTipText(TAttribute<FText> ToolTipText) const;
+
+private:
+	/** Our menus anchor */
+	TSharedPtr<SMenuAnchor> MenuAnchor;
+	TAttribute<const FSlateBrush*> LabelIconBrush;
+	TAttribute<const FSlateBrush*> OverlayLabelIconBrush;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenuButton.cpp b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenuButton.cpp
new file mode 100644
index 0000000..59b6725
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenuButton.cpp
@@ -0,0 +1,40 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SViewportToolBarMenuButton.h"
+#include "Widgets/Input/SMenuAnchor.h"
+
+namespace soda
+{
+
+void SViewportToolBarMenuButton::Construct(const FArguments& InArgs, TSharedRef<SMenuAnchor> InMenuAnchor)
+{
+	SButton::Construct(SButton::FArguments()
+		// Allows users to drag with the mouse to select options after opening the menu
+		.ClickMethod(EButtonClickMethod::MouseDown)
+		.OnClicked(InArgs._OnClicked)
+		.ForegroundColor(InArgs._ForegroundColor)
+		.HAlign(InArgs._HAlign)
+		.VAlign(InArgs._VAlign)
+		.ContentPadding(InArgs._ContentPadding)
+		.ButtonStyle(InArgs._ButtonStyle)
+		.IsFocusable(false)
+		[
+			InArgs._Content.Widget
+		]
+	);
+
+	SetAppearPressed(TAttribute<bool>::CreateSP(this, &SViewportToolBarMenuButton::IsMenuOpen));
+	MenuAnchor = InMenuAnchor;
+}
+
+bool SViewportToolBarMenuButton::IsMenuOpen() const
+{
+	if (TSharedPtr<SMenuAnchor> MenuAnchorPinned = MenuAnchor.Pin())
+	{
+		return MenuAnchorPinned->IsOpen();
+	}
+
+	return false;
+}
+
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenuButton.h b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenuButton.h
new file mode 100644
index 0000000..f5db923
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/Common/SViewportToolBarMenuButton.h
@@ -0,0 +1,50 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Layout/Margin.h"
+#include "Styling/SlateColor.h"
+#include "Styling/SlateTypes.h"
+#include "Types/SlateEnums.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/Input/SButton.h"
+#include "Styling/SlateWidgetStyleAsset.h"
+
+class SMenuAnchor;
+
+namespace soda
+{
+
+/**
+ * Button subclass that appears pressed while its menu anchor has a menu open.
+ * Mimics the behavior of the button for pulldown menus.
+ */
+class SViewportToolBarMenuButton : public SButton
+{
+public:
+	SLATE_BEGIN_ARGS(SViewportToolBarMenuButton)
+		: _ForegroundColor(FSlateColor::UseStyle())
+		, _HAlign(HAlign_Fill)
+		, _VAlign(VAlign_Fill)
+		, _ContentPadding(FMargin(4.0, 2.0))
+		, _ButtonStyle(&FCoreStyle::Get().GetWidgetStyle< FButtonStyle >("Button"))
+	{
+	}
+		SLATE_ATTRIBUTE(FSlateColor, ForegroundColor)
+		SLATE_ARGUMENT(EHorizontalAlignment, HAlign)
+		SLATE_ARGUMENT(EVerticalAlignment, VAlign)
+		SLATE_ATTRIBUTE(FMargin, ContentPadding)
+		SLATE_STYLE_ARGUMENT(FButtonStyle, ButtonStyle)
+		SLATE_DEFAULT_SLOT(FArguments, Content)
+		SLATE_EVENT(FOnClicked, OnClicked)
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, TSharedRef<SMenuAnchor> InMenuAnchor);
+
+private:
+	bool IsMenuOpen() const;
+
+	TWeakPtr<SMenuAnchor> MenuAnchor;
+};
+
+} // namespace soda
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SCameraViewportToolbar.cpp b/Source/UnrealSoda/Private/UI/Toolbar/SCameraViewportToolbar.cpp
new file mode 100644
index 0000000..ffa9182
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SCameraViewportToolbar.cpp
@@ -0,0 +1,245 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SCameraViewportToolbar.h"
+#include "Styling/SlateTypes.h"
+#include "Framework/Commands/UIAction.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "Widgets/Input/SSlider.h"
+#include "Widgets/Input/SNumericEntryBox.h"
+#include "SodaStyleSet.h"
+#include "Soda/UI/SodaViewportCommands.h"
+#include "UI/Toolbar/Common/SViewportToolBarMenu.h"
+#include "UI/Toolbar/Common/SViewportToolBarButton.h"
+#include "Soda/UI/SSodaViewport.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/SodaSpectator.h"
+#include "Soda/SodaGameMode.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+
+#define LOCTEXT_NAMESPACE "TransformToolBar"
+
+namespace soda
+{
+void SCameraViewportToolbar::Construct( const FArguments& InArgs )
+{
+	Viewport = InArgs._Viewport;
+	CommandList = InArgs._CommandList;
+
+	ChildSlot
+	[
+		GenerateCameraToolBar(InArgs._Extenders)
+	];
+
+	SViewportToolBar::Construct(SViewportToolBar::FArguments());
+}
+
+TSharedRef< SWidget > SCameraViewportToolbar::GenerateCameraToolBar(const TSharedPtr< FExtender > InExtenders)
+{
+	FSlimHorizontalToolBarBuilder ToolbarBuilder(Viewport.Pin()->GetCommandList().ToSharedRef(), FMultiBoxCustomization::None, InExtenders);
+	ToolbarBuilder.SetStyle(&FSodaStyle::Get(), "EditorViewportToolBar");
+	ToolbarBuilder.SetIsFocusable(false);
+
+	ToolbarBuilder.BeginSection("Projection");
+	{
+		ToolbarBuilder.AddWidget(
+			SNew(SViewportToolbarMenu)
+			.ParentToolBar(SharedThis(this))
+			.ToolTipText(LOCTEXT("CameraSpeed_ToolTip", "Projection"))
+			.LabelIcon(this, &SCameraViewportToolbar::GetProjectionIcon)
+			.OnGetMenuContent(this, &SCameraViewportToolbar::GenerateProjectionMenu),
+			FName(TEXT("Projection")),
+			false
+		);
+	}
+	ToolbarBuilder.EndSection();
+
+	ToolbarBuilder.BeginSection("CameraSpeed");
+	{
+		ToolbarBuilder.AddWidget(
+			SNew(SViewportToolbarMenu)
+			.ParentToolBar(SharedThis(this))
+			.ToolTipText(LOCTEXT("CameraSpeed_ToolTip", "Camera Speed"))
+			.LabelIcon(FSodaStyle::Get().GetBrush("SodaViewport.CamSpeedSetting"))
+			.Label(this, &SCameraViewportToolbar::GetCameraSpeedLabel)
+			.OnGetMenuContent(this, &SCameraViewportToolbar::FillCameraSpeedMenu),
+			FName(TEXT("CameraSpeed")),
+			false,
+			HAlign_Fill
+		);
+	}
+	ToolbarBuilder.EndSection();
+
+	TSharedRef < SWidget > Widget = ToolbarBuilder.MakeWidget();
+
+
+	return Widget;
+}
+
+TSharedRef<SWidget> SCameraViewportToolbar::FillCameraSpeedMenu()
+{
+	TSharedRef<SWidget> ReturnWidget = SNew(SBorder)
+	.BorderImage(FSodaStyle::GetBrush(TEXT("Menu.Background")))
+	[
+		SNew( SVerticalBox )
+		//Camera Speed
+		+SVerticalBox::Slot()
+		.AutoHeight()
+		.Padding( FMargin(8.0f, 2.0f, 60.0f, 2.0f) )
+		.HAlign( HAlign_Left )
+		[
+			SNew( STextBlock )
+			.Text( LOCTEXT("MouseSettingsCamSpeed", "Camera Speed")  )
+			.Font(FSodaStyle::GetFontStyle( TEXT( "MenuItem.Font" ) ) )
+		]
+		+SVerticalBox::Slot()
+		.AutoHeight()
+		.Padding( FMargin(8.0f, 4.0f) )
+		[	
+			SNew( SHorizontalBox )
+			+SHorizontalBox::Slot()
+			.FillWidth(1)
+			.Padding( FMargin(0.0f, 2.0f) )
+			[
+				SAssignNew(CamSpeedSlider, SSlider)
+				.Value(this, &SCameraViewportToolbar::GetCamSpeedSliderPosition)
+				.OnValueChanged(this, &SCameraViewportToolbar::OnSetCamSpeed)
+			]
+			+SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding( 8.0f, 2.0f, 0.0f, 2.0f)
+			[
+				SNew( STextBlock )
+				.Text(this, &SCameraViewportToolbar::GetCameraSpeedLabel )
+				.Font(FSodaStyle::GetFontStyle( TEXT( "MenuItem.Font" ) ) )
+			]
+		] 
+	];
+
+	return ReturnWidget;
+}
+
+TSharedRef<SWidget> SCameraViewportToolbar::GenerateProjectionMenu() const
+{
+	const bool bInShouldCloseWindowAfterMenuSelection = true;
+
+	FMenuBuilder CameraMenuBuilder(bInShouldCloseWindowAfterMenuSelection, CommandList);
+
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Perspective);
+
+	CameraMenuBuilder.BeginSection("LevelViewportCameraType_Ortho", NSLOCTEXT("BlueprintEditor", "CameraTypeHeader_Ortho", "Orthographic"));
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().OrthographicFree);
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Top);
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Bottom);
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Left);
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Right);
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Front);
+	CameraMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Back);
+	CameraMenuBuilder.EndSection();
+
+	return CameraMenuBuilder.MakeWidget();
+}
+
+FText SCameraViewportToolbar::GetCameraSpeedLabel() const
+{
+	ESodaSpectatorMode Mode = ESodaSpectatorMode::Perspective;
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode && GameMode->SpectatorActor)
+	{
+		return FText::AsNumber(GameMode->SpectatorActor->GetSpeedProfile() + 1);
+	}
+	return FText::FromString("#");
+}
+
+float SCameraViewportToolbar::GetCamSpeedSliderPosition() const
+{
+	ESodaSpectatorMode Mode = ESodaSpectatorMode::Perspective;
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode && GameMode->SpectatorActor)
+	{
+		const float MaxValue = GameMode->SpectatorActor->SpeedProfile.Num();
+		return (float)GameMode->SpectatorActor->GetSpeedProfile() / (MaxValue - 1.f);
+	}
+
+	return 0;
+}
+
+void SCameraViewportToolbar::OnSetCamSpeed(float NewValue)
+{
+	ESodaSpectatorMode Mode = ESodaSpectatorMode::Perspective;
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode && GameMode->SpectatorActor)
+	{
+		const int32 MaxValue = GameMode->SpectatorActor->SpeedProfile.Num();
+		const int32 NewSpeedSetting = NewValue * ((float)MaxValue - 1) + 0.5;
+		GameMode->SpectatorActor->SetSpeedProfile(NewSpeedSetting);
+	}
+}
+
+const FSlateBrush * SCameraViewportToolbar::GetProjectionIcon() const
+{
+	ESodaSpectatorMode Mode = ESodaSpectatorMode::Perspective;
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode && GameMode->SpectatorActor)
+	{
+		Mode = GameMode->SpectatorActor->GetMode();
+	}
+	else
+	{
+		return FSodaStyle::GetBrush(NAME_None);
+	}
+
+	static FName PerspectiveIcon("SodaViewport.Perspective");
+	static FName TopIcon("SodaViewport.Top");
+	static FName LeftIcon("SodaViewport.Left");
+	static FName FrontIcon("SodaViewport.Front");
+	static FName BottomIcon("SodaViewport.Bottom");
+	static FName RightIcon("SodaViewport.Right");
+	static FName BackIcon("SodaViewport.Back");
+
+	FName Icon = NAME_None;
+
+	switch (Mode)
+	{
+	case ESodaSpectatorMode::Perspective:
+		Icon = PerspectiveIcon;
+		break;
+
+	case ESodaSpectatorMode::OrthographicFree:
+		Icon = PerspectiveIcon;
+		break;
+
+	case ESodaSpectatorMode::Top:
+		Icon = TopIcon;
+		break;
+
+	case ESodaSpectatorMode::Left:
+		Icon = LeftIcon;
+		break;
+
+	case ESodaSpectatorMode::Front:
+		Icon = FrontIcon;
+		break;
+
+	case ESodaSpectatorMode::Bottom:
+		Icon = BottomIcon;
+		break;
+
+	case ESodaSpectatorMode::Right:
+		Icon = RightIcon;
+		break;
+
+	case ESodaSpectatorMode::Back:
+		Icon = BackIcon;
+		break;
+	}
+
+	return FSodaStyle::GetBrush(Icon);
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE 
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SCameraViewportToolbar.h b/Source/UnrealSoda/Private/UI/Toolbar/SCameraViewportToolbar.h
new file mode 100644
index 0000000..905e6ed
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SCameraViewportToolbar.h
@@ -0,0 +1,49 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SWidget.h"
+#include "Textures/SlateIcon.h"
+#include "UI/Toolbar/Common/SViewportToolBar.h"
+
+class FExtender;
+class FUICommandList;
+class SSlider;
+
+namespace soda
+{
+class SSodaViewport;
+class STransformViewportToolBar;
+struct FProjectionComboEntry;
+
+
+class SCameraViewportToolbar : public SViewportToolBar
+{
+
+public:
+	SLATE_BEGIN_ARGS(SCameraViewportToolbar){}
+		SLATE_ARGUMENT( TSharedPtr<SSodaViewport>, Viewport )
+		SLATE_ARGUMENT( TSharedPtr<FUICommandList>, CommandList )
+		SLATE_ARGUMENT( TSharedPtr<FExtender>, Extenders )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs );
+
+private:
+	TSharedRef<SWidget> GenerateCameraToolBar(const TSharedPtr< FExtender > InExtenders);
+	TSharedRef<SWidget> FillCameraSpeedMenu();
+	FText GetCameraSpeedLabel() const;
+	float GetCamSpeedSliderPosition() const;
+	void OnSetCamSpeed(float NewValue);
+
+	TSharedRef<SWidget> GenerateProjectionMenu() const;
+	const FSlateBrush * GetProjectionIcon() const;
+
+private:
+	TSharedPtr<SSlider> CamSpeedSlider;
+	TWeakPtr<soda::SSodaViewport> Viewport;
+	TSharedPtr<FUICommandList> CommandList;
+};
+
+} // namespace soda
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SPlacementModeTools.cpp b/Source/UnrealSoda/Private/UI/Toolbar/SPlacementModeTools.cpp
new file mode 100644
index 0000000..95d7f42
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SPlacementModeTools.cpp
@@ -0,0 +1,248 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SPlacementModeTools.h"
+#include "Application/SlateApplicationBase.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SScrollBar.h"
+#include "Widgets/Views/SListView.h"
+#include "Widgets/Input/SCheckBox.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Input/SSearchBox.h"
+//#include "ClassIconFinder.h"
+//#include "Widgets/Docking/SDockTab.h"
+//#include "ThumbnailRendering/ThumbnailManager.h"
+//#include "ActorFactories/ActorFactory.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Styling/SlateIconFinder.h"
+
+#include "SodaDragDropOp.h"
+
+#define LOCTEXT_NAMESPACE "PlacementMode"
+
+
+namespace soda
+{
+
+void SPlacementAssetMenuEntry::Construct(const FArguments& InArgs, const TSharedPtr<const FPlaceableItem>& InItem)
+{	
+	bIsPressed = false;
+
+	check(InItem.IsValid());
+
+	Item = InItem;
+
+	AssetImage = nullptr;
+
+	TSharedPtr< SHorizontalBox > ActorType = SNew( SHorizontalBox );
+
+	//const bool bIsClass = Item->AssetData.GetClass() == UClass::StaticClass();
+	//const bool bIsActor = bIsClass ? CastChecked<UClass>(Item->AssetData.GetAsset())->IsChildOf(AActor::StaticClass()) : false;
+
+	//AActor* DefaultActor = nullptr;
+	/*
+	if (Item->Factory != nullptr)
+	{
+		DefaultActor = Item->Factory->GetDefaultActor(Item->AssetData);
+	}
+	else
+	
+	if (bIsActor)
+	{
+		DefaultActor = CastChecked<AActor>(CastChecked<UClass>(Item->AssetData.GetAsset())->ClassDefaultObject);
+	}
+	*/
+
+	UClass* DocClass = nullptr;
+	TSharedPtr<IToolTip> AssetEntryToolTip;
+	if(Item->DefaultActor != nullptr)
+	{
+		//DocClass = DefaultActor->GetClass();
+		//AssetEntryToolTip = FEditorClassUtils::GetTooltip(DefaultActor->GetClass());
+	}
+
+	if (!AssetEntryToolTip.IsValid())
+	{
+		AssetEntryToolTip = FSlateApplicationBase::Get().MakeToolTip(FText::FromName(Item->DisplayName));
+	}
+	
+	const FButtonStyle& ButtonStyle = FAppStyle::Get().GetWidgetStyle<FButtonStyle>( "Menu.Button" );
+	const float MenuIconSize = FAppStyle::Get().GetFloat("Menu.MenuIconSize");
+
+	Style = &ButtonStyle;
+
+	// Create doc link widget if there is a class to link to
+	TSharedRef<SWidget> DocWidget = SNew(SSpacer);
+
+
+	ChildSlot
+	.HAlign(HAlign_Fill)
+	.VAlign(VAlign_Fill)
+	[
+		SNew(SBorder)
+		.BorderImage( this, &SPlacementAssetMenuEntry::GetBorder )
+		.Cursor( EMouseCursor::GrabHand )
+		.ToolTip( AssetEntryToolTip )
+		.Padding(FMargin(27.f, 3.f, 5.f, 3.f))
+		[
+			SNew( SHorizontalBox )
+
+			+ SHorizontalBox::Slot()
+			.Padding(14.0f, 0.f, 10.f, 0.0f)
+			.AutoWidth()
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			[
+				SNew(SBox)
+				.WidthOverride(MenuIconSize)
+				.HeightOverride(MenuIconSize)
+				[
+					SNew(SImage)
+					.Image(this, &SPlacementAssetMenuEntry::GetIcon)
+					.ColorAndOpacity(FSlateColor::UseSubduedForeground())
+				]
+			]
+
+			+ SHorizontalBox::Slot()
+			.FillWidth(1.f)
+			.Padding(1.f, 0.f, 0.f, 0.f)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Left)
+			[
+
+				SNew( STextBlock )
+				.ColorAndOpacity(FSlateColor::UseForeground())
+				.Text(FText::FromName(Item->DisplayName) )
+			]
+
+
+			+ SHorizontalBox::Slot()
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Right)
+			.AutoWidth()
+			[
+				SNew(SImage)
+                .ColorAndOpacity(FSlateColor::UseSubduedForeground())
+				.Image(FSodaStyle::Get().GetBrush("Icons.DragHandle"))
+			]
+		]
+	];
+}
+
+
+FReply SPlacementAssetMenuEntry::OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if ( MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton )
+	{
+		bIsPressed = true;
+
+		return FReply::Handled().DetectDrag( SharedThis( this ), MouseEvent.GetEffectingButton() );
+	}
+
+	return FReply::Unhandled();
+}
+
+FReply SPlacementAssetMenuEntry::OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	if ( MouseEvent.GetEffectingButton() == EKeys::LeftMouseButton )
+	{
+		bIsPressed = false;
+
+		AActor* NewActor = nullptr;
+
+		/*
+		FTransform TempTransform;
+		//UActorFactory* Factory = Item->Factory;
+		if (!Item->Factory)
+		{
+			// If no actor factory was found or failed, add the actor from the uclass
+			UObject* ClassObject = Item->AssetData.GetClass()->GetDefaultObject();
+			FActorFactoryAssetProxy::GetFactoryForAssetObject(ClassObject);
+		}
+		NewActor = FLevelEditorActionCallbacks::AddActor(Factory, Item->AssetData, &TempTransform);
+		if (NewActor && GCurrentLevelEditingViewportClient)
+		{
+  			GEditor->MoveActorInFrontOfCamera(*NewActor, 
+  				GCurrentLevelEditingViewportClient->GetViewLocation(), 
+  				GCurrentLevelEditingViewportClient->GetViewRotation().Vector()
+  			);
+		}
+		*/
+
+		FSlateApplication::Get().DismissAllMenus();
+
+		return FReply::Handled();
+	}
+
+	return FReply::Unhandled();
+}
+
+FReply SPlacementAssetMenuEntry::OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
+{
+	bIsPressed = false;
+
+	/*
+	if (FEditorDelegates::OnAssetDragStarted.IsBound())
+	{
+		TArray<FAssetData> DraggedAssetDatas;
+		DraggedAssetDatas.Add( Item->AssetData );
+		FEditorDelegates::OnAssetDragStarted.Broadcast( DraggedAssetDatas, Item->Factory );
+		return FReply::Handled();
+	}
+	*/
+
+	if( MouseEvent.IsMouseButtonDown( EKeys::LeftMouseButton ) )
+	{
+		FSlateApplication::Get().DismissAllMenus();
+		return FReply::Handled().BeginDragDrop(FSodaActorDragDropOp::New(Item/*, Item->Factory*/));
+	}
+	else
+	{
+		FSlateApplication::Get().DismissAllMenus();
+		return FReply::Handled();
+	}
+}
+
+bool SPlacementAssetMenuEntry::IsPressed() const
+{
+	return bIsPressed;
+}
+
+const FSlateBrush* SPlacementAssetMenuEntry::GetBorder() const
+{
+	if ( IsPressed() )
+	{
+		return &(Style->Pressed);
+	}
+	else if ( IsHovered() )
+	{
+		return &(Style->Hovered);
+	}
+	else
+	{
+		return &(Style->Normal);
+	}
+}
+
+FSlateColor SPlacementAssetMenuEntry::GetForegroundColor() const
+{
+	if (IsPressed())
+	{
+		return Style->PressedForeground;
+	}
+	else if (IsHovered())
+	{
+		return Style->HoveredForeground;
+	}
+	else
+	{
+		return Style->NormalForeground;
+	}
+}
+
+
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SPlacementModeTools.h b/Source/UnrealSoda/Private/UI/Toolbar/SPlacementModeTools.h
new file mode 100644
index 0000000..07605b7
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SPlacementModeTools.h
@@ -0,0 +1,140 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Input/Reply.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Layout/SUniformWrapPanel.h"
+#include "Widgets/Views/STableViewBase.h"
+#include "Widgets/Views/STableRow.h"
+#include "Misc/TextFilter.h"
+#include "Styling/SlateIconFinder.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/SodaGameViewportClient.h"
+
+namespace soda
+{
+
+struct FPlaceableItem
+{
+	FPlaceableItem(
+		TSoftClassPtr<AActor> InDefaultActor,
+		FName InClassThumbnailBrushOverride = NAME_None,
+		FName InClassIconBrushOverride = NAME_None,
+		TOptional<FLinearColor> InAssetTypeColorOverride = TOptional<FLinearColor>(),
+		TOptional<FName> InDisplayName = TOptional<FName>()
+	)
+		: DefaultActor(InDefaultActor)
+		, ClassThumbnailBrushOverride(InClassThumbnailBrushOverride)
+		, ClassIconBrushOverride(InClassIconBrushOverride)
+		, AssetTypeColorOverride(InAssetTypeColorOverride)
+	{
+		if (InDisplayName.IsSet())
+		{
+			DisplayName = InDisplayName.GetValue();
+		}
+		else if(InDefaultActor.Get())
+		{
+			DisplayName = InDefaultActor.Get()->GetDefaultObject()->GetFName();
+		}
+		else
+		{
+			DisplayName = *InDefaultActor.GetAssetName();
+		}
+	}
+
+	FPlaceableItem(
+		const FSpawnCastomActorDelegate & InSpawnDelegate,
+		FName InClassThumbnailBrushOverride = NAME_None,
+		FName InClassIconBrushOverride = NAME_None,
+		TOptional<FLinearColor> InAssetTypeColorOverride = TOptional<FLinearColor>(),
+		TOptional<FName> InDisplayName = TOptional<FName>()
+	)
+		: SpawnCastomActorDelegate(InSpawnDelegate)
+		, ClassThumbnailBrushOverride(InClassThumbnailBrushOverride)
+		, ClassIconBrushOverride(InClassIconBrushOverride)
+		, AssetTypeColorOverride(InAssetTypeColorOverride)
+	{
+		if (InDisplayName.IsSet())
+		{
+			DisplayName = InDisplayName.GetValue();
+		}
+		else
+		{
+			DisplayName = TEXT("Undefined");
+		}
+	}
+
+public:
+	TSoftClassPtr<AActor> DefaultActor;
+
+	FSpawnCastomActorDelegate SpawnCastomActorDelegate;
+
+	/** This item's display name */
+	FName DisplayName;
+
+	/** Optional override for the thumbnail brush (passed to FClassIconFinder::FindThumbnailForClass in the form ClassThumbnail.<override>) */
+	FName ClassThumbnailBrushOverride;
+
+	/** Optional override for the small icon brush */
+	FName ClassIconBrushOverride;
+
+	/** Optional overridden color tint for the asset */
+	TOptional<FLinearColor> AssetTypeColorOverride;
+};
+
+/**
+ * SPlacementAssetMenuEntry
+ */
+class SPlacementAssetMenuEntry : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SPlacementAssetMenuEntry){}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, const TSharedPtr<const FPlaceableItem>& InItem);
+
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual FReply OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual FReply OnDragDetected(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+
+	bool IsPressed() const;
+
+	TSharedPtr<const FPlaceableItem> Item;
+
+	virtual FSlateColor GetForegroundColor() const override;
+
+private:
+	const FSlateBrush* GetBorder() const;
+	const FSlateBrush* GetIcon() const
+	{
+		if (AssetImage != nullptr)
+		{
+			return AssetImage;
+		}
+
+		if (Item->ClassIconBrushOverride != NAME_None)
+		{
+			AssetImage = FSlateIconFinder::FindCustomIconBrushForClass(nullptr, TEXT("ClassIcon"), Item->ClassIconBrushOverride);
+		}
+
+		if (!AssetImage)
+		{
+			AssetImage = FSlateIconFinder::FindCustomIconBrushForClass(nullptr, TEXT("ClassIcon"), FName(TEXT("ClassIcon.Actor")));
+		}
+
+		return AssetImage;
+	}
+
+	bool bIsPressed;
+
+	const FButtonStyle* Style;
+	
+	mutable const FSlateBrush* AssetImage;
+};
+
+
+} //namespace soda
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SSodaViewportToolBar.cpp b/Source/UnrealSoda/Private/UI/Toolbar/SSodaViewportToolBar.cpp
new file mode 100644
index 0000000..28a4bf2
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SSodaViewportToolBar.cpp
@@ -0,0 +1,937 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SSodaViewportToolBar.h"
+#include "Framework/Commands/UIAction.h"
+#include "Framework/MultiBox/MultiBoxDefs.h"
+#include "Framework/MultiBox/MultiBoxExtender.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "HAL/PlatformFileManager.h"
+#include "Modules/ModuleManager.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Input/SSpinBox.h"
+#include "Widgets/Input/SComboBox.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "SodaStyleSet.h"
+#include "Camera/CameraActor.h"
+#include "GameFramework/WorldSettings.h"
+#include "Soda/SodaGameMode.h"
+#include "Kismet/GameplayStatics.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/SodaActorFactory.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/UI/SToolBox.h"
+#include "Soda/UI/SodaViewportCommands.h"
+#include "Soda/DBGateway.h"
+#include "UI/Toolbar/STransformViewportToolbar.h"
+#include "UI/Toolbar/SCameraViewportToolbar.h"
+#include "UI/Toolbar/Common/SViewportToolBarMenu.h"
+#include "UI/Toolbar/Common/SViewportToolBarButton.h"
+#include "UI/Wnds/SChooseMapWindow.h"
+#include "UI/Wnds/SLevelSaveLoadWindow.h"
+#include "UI/Wnds/SVehcileManagerWindow.h"
+#include "UI/Wnds/SAboutWindow.h"
+#include "SPlacementModeTools.h"
+#include "Soda/ISodaActor.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IDetailsView.h"
+#include "Soda/UnrealSoda.h"
+#include "Misc/Paths.h"
+#include "Soda/DBGateway.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+#include "JoystickGameSettings.h"
+#include "SodaJoystick.h"
+
+#define LOCTEXT_NAMESPACE "SodaViewportToolBar"
+
+namespace soda
+{
+
+static void FillShowMenuStatic(FMenuBuilder& MenuBuilder, TArray< FSodalViewportCommands::FShowMenuCommand > MenuCommands, int32 EntryOffset)
+{
+
+	// Generate entries for the standard show flags
+	// Assumption: the first 'n' entries types like 'Show All' and 'Hide All' buttons, so insert a separator after them
+	for (int32 EntryIndex = 0; EntryIndex < MenuCommands.Num(); ++EntryIndex)
+	{
+		MenuBuilder.AddMenuEntry(
+			MenuCommands[EntryIndex].ShowMenuItem,
+			NAME_None,
+			MenuCommands[EntryIndex].LabelOverride
+		);
+
+		if (EntryIndex == EntryOffset - 1)
+		{
+			MenuBuilder.AddSeparator(NAME_None);
+		}
+	}
+}
+
+static void FillShowStatsSubMenus(FMenuBuilder& MenuBuilder, TArray< FSodalViewportCommands::FShowMenuCommand > MenuCommands, TMap< FString, TArray< FSodalViewportCommands::FShowMenuCommand > > StatCatCommands)
+{
+	MenuBuilder.BeginSection(NAME_None);
+
+	FillShowMenuStatic(MenuBuilder, MenuCommands, 1);
+
+	// Separate out stats into two list, those with and without submenus
+	TArray< FSodalViewportCommands::FShowMenuCommand > SingleStatCommands;
+	TMap< FString, TArray< FSodalViewportCommands::FShowMenuCommand > > SubbedStatCommands;
+	for (auto StatCatIt = StatCatCommands.CreateConstIterator(); StatCatIt; ++StatCatIt)
+	{
+		const TArray< FSodalViewportCommands::FShowMenuCommand >& ShowStatCommands = StatCatIt.Value();
+		const FString& CategoryName = StatCatIt.Key();
+
+		// If no category is specified, or there's only one category, don't use submenus
+		FString NoCategory = "NoCategory";
+		NoCategory.RemoveFromStart(TEXT("STATCAT_"));
+		if (CategoryName == NoCategory || StatCatCommands.Num() == 1)
+		{
+			for (int32 StatIndex = 0; StatIndex < ShowStatCommands.Num(); ++StatIndex)
+			{
+				const FSodalViewportCommands::FShowMenuCommand& StatCommand = ShowStatCommands[StatIndex];
+				SingleStatCommands.Add(StatCommand);
+			}
+		}
+		else
+		{
+			SubbedStatCommands.Add(CategoryName, ShowStatCommands);
+		}
+	}
+
+	// First add all the stats that don't have a sub menu
+	for (auto StatCatIt = SingleStatCommands.CreateConstIterator(); StatCatIt; ++StatCatIt)
+	{
+		const FSodalViewportCommands::FShowMenuCommand& StatCommand = *StatCatIt;
+		MenuBuilder.AddMenuEntry(
+			StatCommand.ShowMenuItem,
+			NAME_None,
+			StatCommand.LabelOverride
+		);
+	}
+
+	// Now add all the stats that have sub menus
+	for (auto StatCatIt = SubbedStatCommands.CreateConstIterator(); StatCatIt; ++StatCatIt)
+	{
+		const TArray< FSodalViewportCommands::FShowMenuCommand >& StatCommands = StatCatIt.Value();
+		const FText CategoryName = FText::FromString(StatCatIt.Key());
+
+		FFormatNamedArguments Args;
+		Args.Add(TEXT("StatCat"), CategoryName);
+		const FText CategoryDescription = FText::Format(NSLOCTEXT("UICommands", "StatShowCatName", "Show {StatCat} stats"), Args);
+
+		MenuBuilder.AddSubMenu(
+			CategoryName, 
+			CategoryDescription,
+			FNewMenuDelegate::CreateStatic(&FillShowMenuStatic, StatCommands, 0));
+	}
+
+	MenuBuilder.EndSection();
+}
+
+void SSodaViewportToolBar::Construct( const FArguments& InArgs )
+{
+	Viewport = InArgs._Viewport;
+	TSharedRef<SSodaViewport> ViewportRef = Viewport.Pin().ToSharedRef();
+
+	TSharedRef<FUICommandList> CommandList = Viewport.Pin()->GetCommandList().ToSharedRef();
+	FSlimHorizontalToolBarBuilder ToolbarBuilder(CommandList, FMultiBoxCustomization::None);
+	ToolbarBuilder.SetLabelVisibility(EVisibility::Collapsed);
+	ToolbarBuilder.SetIsFocusable(false);
+	ToolbarBuilder.SetStyle(&FSodaStyle::Get(), "EditorViewportToolBar");
+
+	ToolbarBuilder.BeginSection(NAME_None);
+
+	ToolbarBuilder.AddWidget
+	(
+		SNew(SViewportToolbarMenu)
+		.ParentToolBar(SharedThis(this))
+		.Image("EditorViewportToolBar.OptionsDropdown")
+		.OnGetMenuContent(this, &SSodaViewportToolBar::GenerateMainMenu)
+		.ToolTipText(FText::FromString(TEXT("Main menu")))
+	);
+
+	ToolbarBuilder.AddSeparator();
+	ToolbarBuilder.AddWidget
+	(
+		SNew(SViewportToolbarMenu)
+		.ParentToolBar(SharedThis(this))
+		.Image("Icons.Toolbar.Settings")
+		.OnGetMenuContent(this, &SSodaViewportToolBar::GenerateOptionsMenu)
+		.ToolTipText(FText::FromString(TEXT("Settings Menu")))
+	);
+
+	ToolbarBuilder.AddSeparator();
+	ToolbarBuilder.AddWidget
+	(
+		SNew(SViewportToolBarButton)
+		.ToolTipText(FText::FromString(TEXT("Scenario Play/Stop")))
+		//.Visibility(Viewport.Pin().Get(), &SSodaViewport::GetToolbarVisibility)
+		.OnClicked(FOnClicked::CreateLambda([this]()
+		{
+			USodaGameModeComponent * GameMode = USodaGameModeComponent::GetChecked();
+			if (GameMode->IsScenarioRunning())
+			{
+				GameMode->ScenarioStop(EScenarioStopReason::UserRequest);
+			}
+			else
+			{
+				GameMode->ScenarioPlay();
+			}
+			return FReply::Handled();
+		}))
+		[
+			SNew(SImage)
+			.Image_Lambda([]()
+			{
+				return FSodaStyle::GetBrush(USodaGameModeComponent::Get()->IsScenarioRunning() ? "Icons.Toolbar.Stop" : "Icons.Toolbar.Play");
+			})
+		]
+	);
+
+	ToolbarBuilder.AddSeparator();
+	ToolbarBuilder.AddWidget
+	(
+		SNew(SViewportToolBarButton)
+		.IsEnabled_Lambda([]() {return !USodaGameModeComponent::Get()->IsScenarioRunning(); })
+		.Image("Icons.Save")
+		.ToolTipText(FText::FromString(TEXT("Save/Load scenario")))
+		.OnClicked(FOnClicked::CreateLambda([this]()
+		{
+			OnOpenSaveLoadWindow();
+			return FReply::Handled();
+		}))
+	);
+
+	ToolbarBuilder.AddSeparator();
+
+	static const FSlateIcon IconDB_Connected = FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.DB.ConnectedBG", NAME_None, "SodaIcons.DB.Connected");
+	static const FSlateIcon IconDB_Disabled = FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.DB.DisabledBG", NAME_None, "SodaIcons.DB.Disabled");
+	static const FSlateIcon IconDB_Connecting = FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.DB.ConnectingBG", NAME_None, "SodaIcons.DB.Connecting");
+	static const FSlateIcon IconDB_Warning = FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.DB.WarningBG", NAME_None, "SodaIcons.DB.Warning");
+
+	ToolbarBuilder.AddSeparator();
+	ToolbarBuilder.AddWidget
+	(
+
+		SNew(SViewportToolbarMenu)
+		.ParentToolBar(SharedThis(this))
+		.LabelIcon_Lambda([]() {
+			switch (FDBGateway::Instance().GetStatus())
+			{
+			case EDBGatewayStatus::Connected:
+				return IconDB_Connected.GetIcon();
+			case EDBGatewayStatus::Disabled:
+				return IconDB_Disabled.GetIcon();
+			case EDBGatewayStatus::Connecting:
+				return IconDB_Connecting.GetIcon();
+			case EDBGatewayStatus::Faild:
+			default:
+				return IconDB_Warning.GetIcon();
+			}
+		})
+		.OverlayLabelIcon_Lambda([]() {
+			switch (FDBGateway::Instance().GetStatus())
+			{
+			case EDBGatewayStatus::Connected:
+				return IconDB_Connected.GetOverlayIcon();
+			case EDBGatewayStatus::Disabled:
+				return IconDB_Disabled.GetOverlayIcon();
+			case EDBGatewayStatus::Connecting:
+				return IconDB_Connecting.GetOverlayIcon();
+			case EDBGatewayStatus::Faild:
+			default:
+				return IconDB_Warning.GetOverlayIcon();
+			}
+		})
+		.ToolTipText_Lambda([]() {
+			switch (FDBGateway::Instance().GetStatus())
+			{
+			case EDBGatewayStatus::Connected:
+				return FText::FromString("Connected");
+			case EDBGatewayStatus::Disabled:
+				return FText::FromString("Disconnected");
+			case EDBGatewayStatus::Connecting:
+				return FText::FromString("Connecting....");
+			case EDBGatewayStatus::Faild:
+			default:
+				return FText::FromString("Faild");
+			}
+		})
+		.OnGetMenuContent(this, &SSodaViewportToolBar::GenerateDBMenu)
+		.IsEnabled_Lambda([]() {return !USodaGameModeComponent::Get()->IsScenarioRunning(); })
+	);
+
+	ToolbarBuilder.AddSeparator();
+	ToolbarBuilder.AddWidget
+	(
+		SNew(SViewportToolbarMenu)
+		.ParentToolBar(SharedThis(this))
+		.Label(this, &SSodaViewportToolBar::GetModeMenuLabel)
+		.LabelIcon(this, &SSodaViewportToolBar::GetModeMenuLabelIcon)
+		//.IsEnabled_Lambda([]() {return !USodaGameModeComponent::Get()->IsScenarioRunning(); })
+		.OnGetMenuContent(this, &SSodaViewportToolBar::GenerateModeMenu)
+		.ToolTipText(FText::FromString(TEXT("Change UI mode")))
+	);
+
+	ToolbarBuilder.AddSeparator();
+	FUIAction AddAction;
+	AddAction.IsActionVisibleDelegate.BindLambda([this]() {return Viewport.Pin()->GetUIMode() == soda::EUIMode::Editing; });
+	ToolbarBuilder.AddComboButton
+	(
+		AddAction,
+		FOnGetContent::CreateSP(this, &SSodaViewportToolBar::GenerateAddMenu),
+		LOCTEXT("AddContent_Label", "Add"),
+		LOCTEXT("AddContent_Tooltip", "Add a new actor to the scene"),
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "LevelEditor.OpenAddContent.Background", NAME_None, "LevelEditor.OpenAddContent.Overlay")
+	);
+
+	/*
+	ToolbarBuilder.AddSeparator();
+	ToolbarBuilder.AddWidget
+	(
+		SNew(SViewportToolbarMenu)
+		.ParentToolBar(SharedThis(this))
+		.Image("Icons.Toolbar.Settings")
+	);
+	*/
+
+	ToolbarBuilder.EndSection();
+
+	const FMargin ToolbarSlotPadding(4.0f, 1.0f);
+
+	ChildSlot
+	[
+		SNew(SBorder)
+		.BorderImage(FSodaStyle::Get().GetBrush("EditorViewportToolBar.Background"))
+		.Cursor(EMouseCursor::Default)
+		[
+			SNew( SHorizontalBox )
+			+ SHorizontalBox::Slot()
+			.FillWidth(1.0)
+			.Padding(ToolbarSlotPadding)
+			[
+				ToolbarBuilder.MakeWidget()
+			]
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(ToolbarSlotPadding)
+			.HAlign(HAlign_Right)
+			[
+				SNew(STransformViewportToolBar)
+				.Viewport(ViewportRef)
+				.CommandList(ViewportRef->GetCommandList())
+				//.Extenders(LevelEditorModule.GetToolBarExtensibilityManager()->GetAllExtenders())
+				.Visibility(this, &SSodaViewportToolBar::IsEditorMode)
+			]
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			.Padding(ToolbarSlotPadding)
+			.HAlign(HAlign_Right)
+			[
+				SNew(SCameraViewportToolbar)
+				.Viewport(ViewportRef)
+				.CommandList(ViewportRef->GetCommandList())
+				//.Extenders(LevelEditorModule.GetToolBarExtensibilityManager()->GetAllExtenders())
+				.Visibility(this, &SSodaViewportToolBar::IsSpectatorMode)
+			]
+		]
+	];
+
+	SViewportToolBar::Construct(SViewportToolBar::FArguments());
+}
+
+/*
+FLevelEditorViewportClient* SSodaViewportToolBar::GetLevelViewportClient()
+{
+	if (Viewport.IsValid())
+	{
+		return &Viewport.Pin()->GetLevelViewportClient();
+	}
+
+	return nullptr;
+}
+
+*/
+
+FText SSodaViewportToolBar::GetModeMenuLabel() const
+{
+	switch (Viewport.Pin()->GetUIMode())
+	{
+	case soda::EUIMode::Free: return FText::FromString("Free");
+	case soda::EUIMode::Editing: return FText::FromString("Editor");
+	}
+	return FText::FromString("None");
+}
+
+const FSlateBrush* SSodaViewportToolBar::GetModeMenuLabelIcon() const
+{	
+	switch (Viewport.Pin()->GetUIMode())
+	{
+	case soda::EUIMode::Free: return FSodaStyle::GetOptionalBrush("Icons.Toolbar.FreeMode");
+	case soda::EUIMode::Editing:   return FSodaStyle::GetOptionalBrush("Icons.Toolbar.EditorMode");
+	}
+	return FStyleDefaults::GetNoBrush();
+}
+
+TSharedRef<SWidget> SSodaViewportToolBar::GenerateMainMenu()
+{
+	FMenuBuilder MenuBuilder(true, Viewport.Pin()->GetCommandList(), TSharedPtr<FExtender>(), false, &FSodaStyle::Get());
+
+	MenuBuilder.BeginSection(NAME_None);
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindSP(this, &SSodaViewportToolBar::OnOpenLevelWindow);
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Open Level")),
+			FText::FromString(TEXT("Open Level")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Level"),
+			Action);
+	}
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindSP(this, &SSodaViewportToolBar::OnOpenVehicleManagerWindow);
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Vehicle Manager")),
+			FText::FromString(TEXT("Vehicle Manager")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.Car"),
+			Action);
+	}
+
+
+	MenuBuilder.AddMenuSeparator();
+	
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().ToggleSpectatorMode);
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().PossesNextVehicle);
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().ClearLevel);
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().RestartLevel);
+
+	MenuBuilder.AddMenuSeparator();
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindSP(this, &SSodaViewportToolBar::OnOpenAboutWindow);
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("About")),
+			FText::FromString(TEXT("About")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.Soda"),
+			Action);
+	}
+
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().Exit);
+
+	MenuBuilder.EndSection();
+
+	return MenuBuilder.MakeWidget();
+}
+
+TSharedRef<SWidget> SSodaViewportToolBar::GenerateOptionsMenu() 
+{
+	FMenuBuilder MenuBuilder(true, Viewport.Pin()->GetCommandList(), TSharedPtr<FExtender>(), false, &FSodaStyle::Get());
+	MenuBuilder.BeginSection(NAME_None);
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([]() 
+		{
+			USodaGameModeComponent* GameMode = USodaGameModeComponent::GetChecked();
+			FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+			soda::FDetailsViewArgs Args;
+			Args.bHideSelectionTip = true;
+			Args.bLockable = false;
+			TSharedPtr<soda::IDetailsView> DetailView = RuntimeEditorModule.CreateDetailView(Args);
+			DetailView->SetObject(SodaApp.GetSodaUserSettings());
+			GameMode->PushToolBox(
+				SNew(SToolBox)
+				.Caption(FText::FromString("Common Settings"))
+				[
+					SNew(SVerticalBox)
+					+ SVerticalBox::Slot()
+					.FillHeight(1)
+					
+					[
+						DetailView.ToSharedRef()
+					]
+					+ SVerticalBox::Slot()
+					.AutoHeight()
+					.VAlign(VAlign_Top)
+					.HAlign(HAlign_Center)
+					[
+						SNew(SHorizontalBox)
+						+ SHorizontalBox::Slot()
+						.Padding(5)
+						[
+							SNew(SButton)
+							.Text(FText::FromString(TEXT("Save")))
+							.OnClicked(FOnClicked::CreateLambda([]()
+							{
+								SodaApp.GetSodaUserSettings()->SaveSettings();
+								return FReply::Handled();
+							}))
+						]
+						+ SHorizontalBox::Slot()
+						.Padding(5)
+						[
+							SNew(SButton)
+							.Text(FText::FromString(TEXT("Reset")))
+							.OnClicked(FOnClicked::CreateLambda([]()
+							{
+								SodaApp.GetSodaUserSettings()->SetToDefaults();
+								return FReply::Handled();
+							}))
+						]
+					]
+				]);
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString("Common Settings"),
+			FText::FromString("Common Settings"),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Adjust"),
+			Action);
+	}
+
+	{
+		MenuBuilder.AddSubMenu(
+			FText::FromString("Graphics Settings"),
+			FText::FromString("Graphics Settings"),
+			FNewMenuDelegate::CreateLambda([](FMenuBuilder& MenuBuilder)
+				{
+					MenuBuilder.BeginSection(NAME_None);
+					FUIAction Action;
+					MenuBuilder.AddMenuEntry(
+						FText::FromString("TODO"),
+						FText::FromString("TODO"),
+						FSlateIcon(),
+						Action);
+					MenuBuilder.EndSection();
+				}),
+			false,
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaViewport.SubMenu.Stats"));
+	}
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([]() 
+		{
+			USodaGameModeComponent* GameMode = USodaGameModeComponent::GetChecked();
+			FRuntimeEditorModule& RuntimeEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+			soda::FDetailsViewArgs Args;
+			Args.bHideSelectionTip = true;
+			Args.bLockable = false;
+			TSharedPtr<soda::IDetailsView> DetailView = RuntimeEditorModule.CreateDetailView(Args);
+			DetailView->SetObject(GetMutableDefault<UJoystickGameSettings>());
+			GameMode->PushToolBox(
+				SNew(SToolBox)
+				.Caption(FText::FromString("Joystic Settings"))
+				[
+					SNew(SVerticalBox)
+					+ SVerticalBox::Slot()
+					.FillHeight(1)
+					
+					[
+						DetailView.ToSharedRef()
+					]
+					+ SVerticalBox::Slot()
+					.AutoHeight()
+					.VAlign(VAlign_Top)
+					.HAlign(HAlign_Center)
+					[
+						SNew(SHorizontalBox)
+						+ SHorizontalBox::Slot()
+						.Padding(5)
+						[
+							SNew(SButton)
+							.Text(FText::FromString(TEXT("Save")))
+							.OnClicked(FOnClicked::CreateLambda([]()
+							{
+								GetMutableDefault<UJoystickGameSettings>()->SaveConfig();
+								ISodaJoystickPlugin::Get().UpdateSettings();
+								return FReply::Handled();
+							}))
+						]
+						+ SHorizontalBox::Slot()
+						.Padding(5)
+						[
+							SNew(SButton)
+							.Text(FText::FromString(TEXT("Reset")))
+							.OnClicked(FOnClicked::CreateLambda([]()
+							{
+								GetMutableDefault<UJoystickGameSettings>()->LoadConfig();
+								ISodaJoystickPlugin::Get().UpdateSettings();
+								return FReply::Handled();
+							}))
+						]
+					]
+				]);
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString("Joystic Settings"),
+			FText::FromString("Joystic Settings"),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.Joystick"),
+			Action);
+	}
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([this]() 
+		{
+			Viewport.Pin()->SetLogVisible(!Viewport.Pin()->IsLogVisible());
+		});
+		Action.GetActionCheckState.BindLambda([this]() 
+		{
+			return Viewport.Pin()->IsLogVisible() ? ECheckBoxState::Checked : ECheckBoxState::Unchecked;
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString("Show Log"),
+			FText::FromString("Show Log"),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Log"),
+			Action,
+			NAME_None,
+			EUserInterfaceActionType::ToggleButton);
+	}
+
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().ToggleVehiclePanel);
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().ToggleFPS); 
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().ToggleFullScreen);
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().TagActors);
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().ToggleStats);
+	
+	{
+		const FSodalViewportCommands& SodaViewportCommands = FSodalViewportCommands::Get();
+		TArray< FSodalViewportCommands::FShowMenuCommand > HideStatsMenu;
+		HideStatsMenu.Add(FSodalViewportCommands::FShowMenuCommand(SodaViewportCommands.HideAllStats, LOCTEXT("HideAllLabel", "Hide All"))); // 'Hide All' button
+
+		MenuBuilder.AddSubMenu(
+			LOCTEXT("ShowStatsMenu", "Stat"),
+			LOCTEXT("ShowStatsMenu_ToolTip", "Show Stat commands"),
+			FNewMenuDelegate::CreateStatic(&FillShowStatsSubMenus, HideStatsMenu, SodaViewportCommands.ShowStatCatCommands),
+			false,
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaViewport.SubMenu.Stats"));
+	}
+
+	MenuBuilder.EndSection();
+	return MenuBuilder.MakeWidget();
+}
+
+TSharedRef<SWidget> SSodaViewportToolBar::GenerateDBMenu()
+{
+	FMenuBuilder MenuBuilder(true, Viewport.Pin()->GetCommandList(), TSharedPtr<FExtender>(), false, &FSodaStyle::Get());
+	MenuBuilder.BeginSection(NAME_None);
+
+	{
+		FUIAction Action;
+		Action.CanExecuteAction.BindLambda([]() 
+		{
+			return FDBGateway::Instance().GetStatus() == EDBGatewayStatus::Disabled;
+		});
+		Action.ExecuteAction.BindLambda([]() 
+		{
+			USodaGameModeComponent::GetChecked()->UpdateDBGateway(false);
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString("Connect to DB"),
+			FText::FromString("Connect to DB"),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.DB.ConnectingFull"),
+			Action);
+	}
+
+	{
+		FUIAction Action;
+		Action.CanExecuteAction.BindLambda([]() 
+		{
+			return soda::FDBGateway::Instance().GetStatus() == soda::EDBGatewayStatus::Connected || soda::FDBGateway::Instance().GetStatus() == EDBGatewayStatus::Faild;
+		});
+		Action.ExecuteAction.BindLambda([]() 
+		{
+			soda::FDBGateway::Instance().Disable();
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString("Disconnect from DB"),
+			FText::FromString("Disconnect from DB"),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaIcons.DB.DisabledFull"),
+			Action);
+	}
+
+	
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().AutoConnectDB);
+	MenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().RecordDataset);
+
+	MenuBuilder.EndSection();
+	return MenuBuilder.MakeWidget();
+}
+
+TSharedRef<SWidget> SSodaViewportToolBar::GenerateAddMenu()
+{
+	FMenuBuilder MenuBuilder(true, Viewport.Pin()->GetCommandList(), TSharedPtr<FExtender>(), false, &FSodaStyle::Get());
+
+	// Build menu by categiries
+	MenuBuilder.BeginSection(NAME_None);
+	TMap<FString, TMap<FString, TArray<TSoftClassPtr<AActor>>>> ActorsMap;
+	for (const auto & It : USodaGameModeComponent::GetChecked()->GetSodaActorDescriptors())
+	{
+		if (It.Value.bAllowSpawn)
+		{
+			auto & Categoty = ActorsMap.FindOrAdd(It.Value.Category);
+			FString SubCategory = It.Value.SubCategory;
+			if (It.Value.SubCategory == "" || It.Value.SubCategory.Compare("default", ESearchCase::IgnoreCase) == 0)
+			{
+				SubCategory = "";
+			}
+			auto & SubCategoty = Categoty.FindOrAdd(SubCategory);
+			SubCategoty.AddUnique(It.Key);
+		}
+	}
+	TArray<FString> CategoryKeys;
+	ActorsMap.GetKeys(CategoryKeys);
+	CategoryKeys.Sort();
+	for (const FString& Category : CategoryKeys)
+	{
+		MenuBuilder.AddSubMenu(
+			FText::FromString(Category),
+			FText::GetEmpty(),
+			FNewMenuDelegate::CreateLambda([CategoryMap=ActorsMap[Category]](FMenuBuilder& MenuBuilder)
+			{
+				TArray<FString> SubCategoryKeys;
+				CategoryMap.GetKeys(SubCategoryKeys);
+				SubCategoryKeys.Sort();
+				//SubCategoryKeys.FindByPredicate([](const FString& Str) { return Str.Compare("default", ESearchCase::IgnoreCase) == 0; });
+				for (auto& SubCategory : SubCategoryKeys)
+				{
+					MenuBuilder.BeginSection(NAME_None, FText::FromString(SubCategory == "" ? TEXT("Default") : *SubCategory));
+					for (auto & Actor : CategoryMap[SubCategory])
+					{
+						const FSodaActorDescriptor & Desc = USodaGameModeComponent::GetChecked()->GetSodaActorDescriptor(Actor);
+						TSharedPtr<FPlaceableItem> Item = MakeShared<FPlaceableItem>(
+							Actor,
+							Desc.Icon, 
+							Desc.Icon, 
+							TOptional<FLinearColor>(), 
+							FName(Desc.DisplayName.Len() ? *Desc.DisplayName : *FName::NameToDisplayString(Actor.GetAssetName(), false))
+						);
+						MenuBuilder.AddWidget(
+							SNew(SPlacementAssetMenuEntry, Item), FText()
+						);
+					}
+					MenuBuilder.EndSection();
+				}
+			})
+		);
+	}
+	MenuBuilder.EndSection();
+
+	// Build Local Vehicles menu
+	MenuBuilder.BeginSection(NAME_None);
+	MenuBuilder.AddSeparator();
+	MenuBuilder.AddSubMenu(
+		FText::FromString("Local Vehicles"),
+		FText::GetEmpty(),
+		FNewMenuDelegate::CreateLambda([World=GetWorld()](FMenuBuilder& MenuBuilder)
+		{
+			MenuBuilder.BeginSection(NAME_None);
+			TArray<FVechicleSaveAddress> VehicleAddresses;
+			ASodaVehicle::GetSavedVehiclesLocal(VehicleAddresses);
+			for (auto& It : VehicleAddresses)
+			{
+				TSharedPtr<FPlaceableItem> Item = MakeShared<FPlaceableItem>(
+					FSpawnCastomActorDelegate::CreateLambda([World, It](const FTransform& Transform) {
+						ASodaVehicle * Vehicle = ASodaVehicle::SpawnVehicleFormAddress(World.Get(), It, Transform.GetTranslation(), Transform.GetRotation().Rotator(), false, NAME_None, true);
+						return Vehicle;
+					}),
+					TEXT("Icons.Save"),
+					TEXT("Icons.Save"),
+					TOptional<FLinearColor>(),
+					FName(*It.ToVehicleName())
+				);
+				MenuBuilder.AddWidget(
+					SNew(SPlacementAssetMenuEntry, Item), FText()
+				);
+			}
+			MenuBuilder.EndSection();
+		}),
+		false,
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Save")
+	);
+	MenuBuilder.EndSection();
+
+	if (FDBGateway::Instance().IsConnected())
+	{
+		// Build Remote Vehicles menu
+		MenuBuilder.BeginSection(NAME_None);
+		MenuBuilder.AddSubMenu(
+			FText::FromString("Remote Vehicles"),
+			FText::GetEmpty(),
+			FNewMenuDelegate::CreateLambda([World = GetWorld()](FMenuBuilder& MenuBuilder)
+				{
+					MenuBuilder.BeginSection(NAME_None);
+					TArray<FVechicleSaveAddress> VehicleAddresses;
+					if (!ASodaVehicle::GetSavedVehiclesDB(VehicleAddresses))
+					{
+						MenuBuilder.AddMenuEntry(FText::FromString(TEXT("Error load from DB")), FText::FromString(TEXT("Error load from DB")), FSlateIcon(), FUIAction());
+					}
+					for (auto& It : VehicleAddresses)
+					{
+						TSharedPtr<FPlaceableItem> Item = MakeShared<FPlaceableItem>(
+							FSpawnCastomActorDelegate::CreateLambda([World, It](const FTransform& Transform) {
+								ASodaVehicle* Vehicle = ASodaVehicle::SpawnVehicleFormAddress(World.Get(), It, Transform.GetTranslation(), Transform.GetRotation().Rotator(), false, NAME_None, true);
+								return Vehicle;
+								}),
+							TEXT("Icons.Save"),
+							TEXT("Icons.Save"),
+							TOptional<FLinearColor>(),
+							FName(*It.ToVehicleName())
+						);
+						MenuBuilder.AddWidget(
+							SNew(SPlacementAssetMenuEntry, Item), FText()
+						);
+					}
+					MenuBuilder.EndSection();
+				}),
+			false,
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Save")
+		);
+		MenuBuilder.EndSection();
+	}
+	
+	return MenuBuilder.MakeWidget();
+}
+
+TSharedRef<SWidget> SSodaViewportToolBar::GenerateModeMenu()
+{
+	FMenuBuilder MenuBuilder(true, Viewport.Pin()->GetCommandList(), TSharedPtr<FExtender>(), false, &FSodaStyle::Get());
+	MenuBuilder.BeginSection(NAME_None);
+
+	{
+		FUIAction Action(
+			FExecuteAction::CreateSP(this, &SSodaViewportToolBar::ChangeMode, EUIMode::Free),
+			FCanExecuteAction(),
+			FIsActionChecked::CreateSP(this, &SSodaViewportToolBar::ModeIs, EUIMode::Free)
+		);
+		MenuBuilder.AddMenuEntry(
+			FText::FromString("Free Mode"),
+			FText::GetEmpty(),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Toolbar.FreeMode"),
+			Action,
+			NAME_None,
+			EUserInterfaceActionType::RadioButton);
+	}
+
+	{
+		FUIAction Action(
+			FExecuteAction::CreateSP(this, &SSodaViewportToolBar::ChangeMode, EUIMode::Editing),
+			FCanExecuteAction(),
+			FIsActionChecked::CreateSP(this, &SSodaViewportToolBar::ModeIs, EUIMode::Editing)
+		);
+		MenuBuilder.AddMenuEntry(
+			FText::FromString("Editor Mode"),
+			FText::GetEmpty(),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Toolbar.EditorMode"),
+			Action,
+			NAME_None,
+			EUserInterfaceActionType::RadioButton);
+	}
+
+
+	MenuBuilder.EndSection();
+	return MenuBuilder.MakeWidget();
+}
+
+
+void SSodaViewportToolBar::ChangeMode(soda::EUIMode InMode) const 
+{ 
+	Viewport.Pin()->SetUIMode(InMode);
+}
+
+bool SSodaViewportToolBar::ModeIs(soda::EUIMode InMode) const 
+{ 
+	return InMode == Viewport.Pin()->GetUIMode();
+}
+
+TWeakObjectPtr<UWorld> SSodaViewportToolBar::GetWorld() const
+{
+	if (Viewport.IsValid())
+	{
+		return Viewport.Pin()->GetWorld();
+	}
+	return nullptr;
+}
+
+/*
+TSharedPtr<FExtender> SSodaViewportToolBar::GetViewMenuExtender()
+{
+	FLevelEditorModule& LevelEditorModule = FModuleManager::GetModuleChecked<FLevelEditorModule>(TEXT("LevelEditor"));
+	return LevelEditorModule.GetMenuExtensibilityManager()->GetAllExtenders();
+}
+*/
+
+/*
+FLevelEditorViewportClient* ULevelViewportToolBarContext::GetLevelViewportClient()
+{
+	if (LevelViewportToolBarWidget.IsValid())
+	{
+		return LevelViewportToolBarWidget.Pin()->GetLevelViewportClient();
+	}
+
+	return nullptr;
+}
+*/
+
+void SSodaViewportToolBar::OnOpenLevelWindow()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->OpenWindow("Choose Map", SNew(SChooseMapWindow));
+	}	
+}
+
+
+void SSodaViewportToolBar::OnOpenAboutWindow()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->OpenWindow("About SodaSim", SNew(SAboutWindow));
+	}
+}
+
+void SSodaViewportToolBar::OnOpenVehicleManagerWindow()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->OpenWindow("Vehicle Manager", SNew(SVehcileManagerWindow, nullptr));
+	}
+}
+
+void SSodaViewportToolBar::OnOpenSaveLoadWindow()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->OpenWindow("Save & Load", SNew(SLevelSaveLoadWindow));
+	}
+}
+
+EVisibility SSodaViewportToolBar::IsEditorMode() const
+{
+	return Viewport.Pin()->GetUIMode() == EUIMode::Editing ?
+		EVisibility::Visible :
+		EVisibility::Collapsed;
+}
+
+EVisibility SSodaViewportToolBar::IsSpectatorMode() const
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (GameMode && GameMode->SpectatorActor)
+	{
+		return EVisibility::Visible;
+	}
+	else
+	{
+		return EVisibility::Collapsed;
+	}
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SSodaViewportToolBar.h b/Source/UnrealSoda/Private/UI/Toolbar/SSodaViewportToolBar.h
new file mode 100644
index 0000000..375380c
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SSodaViewportToolBar.h
@@ -0,0 +1,67 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Widgets/SWidget.h"
+#include "Widgets/DeclarativeSyntaxSupport.h"
+#include "Soda/UI/SSodaViewport.h"
+#include "UI/Toolbar/Common/SViewportToolBar.h"
+#include "Widgets/Input/SSpinBox.h"
+
+class FExtender;
+enum class EUIMode : uint8;
+
+namespace soda
+{
+
+/**
+ * A level viewport toolbar widget that is placed in a viewport
+ */
+class SSodaViewportToolBar : public SViewportToolBar
+{
+public:
+	SLATE_BEGIN_ARGS( SSodaViewportToolBar ){}
+		SLATE_ARGUMENT( TSharedPtr<class SSodaViewport>, Viewport )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs );
+
+	/** @return Level editor viewport client. */ 
+	//FLevelEditorViewportClient* GetLevelViewportClient();
+
+	/** Gets the world we are editing */
+	TWeakObjectPtr<UWorld> GetWorld() const;
+
+private:
+	// Mode Menu
+	FText GetModeMenuLabel() const;
+	const FSlateBrush* GetModeMenuLabelIcon() const;
+	void ChangeMode(EUIMode InMode) const;
+	bool ModeIs(EUIMode InMode) const;
+
+	void OnOpenLevelWindow();
+	void OnOpenAboutWindow();
+	void OnOpenVehicleManagerWindow();
+	void OnOpenSaveLoadWindow();
+
+	EVisibility IsEditorMode() const;
+	EVisibility IsSpectatorMode() const;
+
+private:
+	TSharedRef<SWidget> GenerateMainMenu();
+	TSharedRef<SWidget> GenerateOptionsMenu();
+	TSharedRef<SWidget> GenerateAddMenu();
+	TSharedRef<SWidget> GenerateModeMenu();
+	TSharedRef<SWidget> GenerateDBMenu();
+
+	/** Gets the extender for the view menu */
+	TSharedPtr<FExtender> GetViewMenuExtender();
+
+	/** The viewport that we are in */
+	TWeakPtr<SSodaViewport> Viewport;
+};
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/STransformViewportToolbar.cpp b/Source/UnrealSoda/Private/UI/Toolbar/STransformViewportToolbar.cpp
new file mode 100644
index 0000000..885bbcb
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/STransformViewportToolbar.cpp
@@ -0,0 +1,132 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "STransformViewportToolbar.h"
+#include "EngineDefines.h"
+#include "Modules/ModuleManager.h"
+#include "Widgets/SBoxPanel.h"
+#include "Styling/SlateTypes.h"
+#include "Framework/Commands/UIAction.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SUniformGridPanel.h"
+#include "Widgets/Layout/SSpacer.h"
+#include "SodaStyleSet.h"
+#include "Soda/UI/SodaViewportCommands.h"
+#include "Widgets/Input/SNumericEntryBox.h"
+#include "Styling/ToolBarStyle.h"
+#include "UI/Toolbar/Common/SViewportToolBarMenu.h"
+#include "UI/Toolbar/Common/SViewportToolBarButton.h"
+#include "Soda/UI/SSodaViewport.h"
+#include "Soda/SodaGameViewportClient.h"
+#include "Soda/SodaGameMode.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+
+#define LOCTEXT_NAMESPACE "TransformToolBar"
+
+namespace soda
+{
+
+void STransformViewportToolBar::Construct( const FArguments& InArgs )
+{
+	Viewport = InArgs._Viewport;
+	CommandList = InArgs._CommandList;
+
+	ChildSlot
+	[
+		MakeTransformToolBar(InArgs._Extenders)
+	];
+
+	SViewportToolBar::Construct(SViewportToolBar::FArguments());
+}
+
+TSharedRef< SWidget > STransformViewportToolBar::MakeTransformToolBar( const TSharedPtr< FExtender > InExtenders )
+{
+	FSlimHorizontalToolBarBuilder ToolbarBuilder( CommandList, FMultiBoxCustomization::None, InExtenders );
+
+	// Use a custom style
+	FName ToolBarStyle = "EditorViewportToolBar";
+	ToolbarBuilder.SetStyle(&FSodaStyle::Get(), ToolBarStyle);
+	ToolbarBuilder.SetLabelVisibility(EVisibility::Collapsed);
+
+	// Transform controls cannot be focusable as it fights with the press space to change transform mode feature
+	ToolbarBuilder.SetIsFocusable( false );
+
+	ToolbarBuilder.BeginSection("Transform");
+	{
+		ToolbarBuilder.BeginBlockGroup();
+
+		//Select Mode
+		static FName SelectModeName = FName(TEXT("SelectMode"));
+		ToolbarBuilder.AddToolBarButton(FSodalViewportCommands::Get().SelectMode, NAME_None, TAttribute<FText>(), TAttribute<FText>(), 
+			FSlateIcon(FSodaStyle::GetStyleSetName(), "SodaViewport.SelectMode"), SelectModeName);
+
+		// Translate Mode
+		static FName TranslateModeName = FName(TEXT("TranslateMode"));
+		ToolbarBuilder.AddToolBarButton( FSodalViewportCommands::Get().TranslateMode, NAME_None, TAttribute<FText>(), TAttribute<FText>(), 
+			FSlateIcon(FSodaStyle::GetStyleSetName(), "SodaViewport.TranslateMode"), TranslateModeName);
+
+		// Rotate Mode
+		static FName RotateModeName = FName(TEXT("RotateMode"));
+		ToolbarBuilder.AddToolBarButton( FSodalViewportCommands::Get().RotateMode, NAME_None, TAttribute<FText>(), TAttribute<FText>(), 
+			FSlateIcon(FSodaStyle::GetStyleSetName(), "SodaViewport.RotateMode"), RotateModeName );
+
+		// Scale Mode
+		static FName ScaleModeName = FName(TEXT("ScaleMode"));
+		ToolbarBuilder.AddToolBarButton( FSodalViewportCommands::Get().ScaleMode, NAME_None, TAttribute<FText>(), TAttribute<FText>(), 
+			FSlateIcon(FSodaStyle::GetStyleSetName(), "SodaViewport.ScaleMode"), ScaleModeName );
+
+
+		ToolbarBuilder.EndBlockGroup();
+		ToolbarBuilder.AddSeparator();
+
+		ToolbarBuilder.SetIsFocusable( false );
+
+		ToolbarBuilder.AddToolBarButton( FSodalViewportCommands::Get().CycleTransformGizmoCoordSystem,
+			NAME_None,
+			TAttribute<FText>(),
+			TAttribute<FText>(),
+			TAttribute<FSlateIcon>(this, &STransformViewportToolBar::GetLocalToWorldIcon),
+			FName(TEXT("CycleTransformGizmoCoordSystem")),
+
+			// explictly specify what this widget should look like as a menu item
+			FNewMenuDelegate::CreateLambda( []( FMenuBuilder& InMenuBuilder )
+			{
+				InMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().RelativeCoordinateSystem_World);
+				InMenuBuilder.AddMenuEntry(FSodalViewportCommands::Get().RelativeCoordinateSystem_Local);
+			}
+		));
+		
+	}
+
+	ToolbarBuilder.EndSection();
+
+	return ToolbarBuilder.MakeWidget();
+}
+
+FReply STransformViewportToolBar::OnCycleCoordinateSystem()
+{
+	if( Viewport.IsValid() )
+	{
+		Viewport.Pin()->OnCycleCoordinateSystem();
+	}
+	
+	return FReply::Handled();
+}
+
+FSlateIcon STransformViewportToolBar::GetLocalToWorldIcon() const
+{
+	if( Viewport.IsValid() && Viewport.Pin()->IsCoordSystemActive(soda::COORD_World) )
+	{
+		static FName WorldIcon("SodaViewport.RelativeCoordinateSystem_World");
+		return FSlateIcon(FSodaStyle::GetStyleSetName(), WorldIcon);
+	}
+	
+	static FName LocalIcon("Icons.Transform");
+	return FSlateIcon(FSodaStyle::GetStyleSetName(), LocalIcon);
+}
+
+} // namespace soda
+
+#undef LOCTEXT_NAMESPACE 
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/STransformViewportToolbar.h b/Source/UnrealSoda/Private/UI/Toolbar/STransformViewportToolbar.h
new file mode 100644
index 0000000..204d6c9
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/STransformViewportToolbar.h
@@ -0,0 +1,42 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UI/Toolbar/Common/SViewportToolBar.h"
+#include "Textures/SlateIcon.h"
+
+class FExtender;
+class FUICommandList;
+class SSlider;
+
+namespace soda
+{
+
+class SSodaViewport;
+class SViewportToolbarMenu;
+
+class STransformViewportToolBar : public SViewportToolBar
+{
+
+public:
+	SLATE_BEGIN_ARGS( STransformViewportToolBar ){}
+		SLATE_ARGUMENT( TSharedPtr<SSodaViewport>, Viewport )
+		SLATE_ARGUMENT( TSharedPtr<FUICommandList>, CommandList )
+		SLATE_ARGUMENT( TSharedPtr<FExtender>, Extenders )
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs );
+
+private:
+	TSharedRef<SWidget> MakeTransformToolBar(const TSharedPtr< FExtender > InExtenders);
+	FSlateIcon GetLocalToWorldIcon() const;
+	FSlateIcon GetSurfaceSnappingIcon() const;
+	FReply OnCycleCoordinateSystem();
+
+private:
+	TWeakPtr<soda::SSodaViewport> Viewport;
+	TSharedPtr<FUICommandList> CommandList;
+};
+
+} // namespace soda
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SodaDragDropOp.cpp b/Source/UnrealSoda/Private/UI/Toolbar/SodaDragDropOp.cpp
new file mode 100644
index 0000000..3dbf17f
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SodaDragDropOp.cpp
@@ -0,0 +1,34 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDragDropOp.h"
+#include "Engine/Level.h"
+#include "GameFramework/Actor.h"
+#include "Widgets/SOverlay.h"
+#include "Widgets/Layout/SBox.h"
+//#include "ClassIconFinder.h"
+
+namespace soda
+{
+
+FSodaActorDragDropOp::~FSodaActorDragDropOp()
+{
+}
+
+TSharedPtr<SWidget> FSodaActorDragDropOp::GetDefaultDecorator() const
+{
+	return FSodaDecoratedDragDropOp::GetDefaultDecorator();
+}
+
+FText FSodaActorDragDropOp::GetDecoratorText() const
+{
+	return CurrentHoverText;
+}
+
+void FSodaActorDragDropOp::Init(TSharedPtr<const FPlaceableItem>& InItem)
+{
+	MouseCursor = EMouseCursor::GrabHandClosed;
+	ThumbnailSize = 32;
+	Item = InItem;
+}
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Toolbar/SodaDragDropOp.h b/Source/UnrealSoda/Private/UI/Toolbar/SodaDragDropOp.h
new file mode 100644
index 0000000..4b440b5
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Toolbar/SodaDragDropOp.h
@@ -0,0 +1,167 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Input/DragAndDrop.h"
+#include "Widgets/SBoxPanel.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/Text/STextBlock.h"
+#include "SodaStyleSet.h"
+
+namespace soda
+{
+
+struct FPlaceableItem;
+
+/**
+ * FSodaDecoratedDragDropOp
+ */
+class FSodaDecoratedDragDropOp : public FDragDropOperation
+{
+public:
+	DRAG_DROP_OPERATOR_TYPE(FSodaDecoratedDragDropOp, FDragDropOperation)
+
+	/** String to show as hover text */
+	FText								CurrentHoverText;
+
+	/** Icon to be displayed */
+	const FSlateBrush*					CurrentIconBrush;
+
+	/** The color of the icon to be displayed. */
+	FSlateColor							CurrentIconColorAndOpacity;
+
+	FSodaDecoratedDragDropOp()
+		: CurrentIconBrush(FSodaStyle::GetBrush(TEXT("Icons.Warning")))
+		, CurrentIconColorAndOpacity(FLinearColor::White)
+		, DefaultHoverIcon(FSodaStyle::GetBrush(TEXT("Icons.Warning")))
+		, DefaultHoverIconColorAndOpacity(FLinearColor::White)
+	{ }
+
+	/** Overridden to provide public access */
+	virtual void Construct() override
+	{
+		FDragDropOperation::Construct();
+	}
+
+	/** Set the decorator back to the icon and text defined by the default */
+	virtual void ResetToDefaultToolTip()
+	{
+		CurrentHoverText = DefaultHoverText;
+		CurrentIconBrush = DefaultHoverIcon;
+		CurrentIconColorAndOpacity = DefaultHoverIconColorAndOpacity;
+	}
+
+	/** The widget decorator to use */
+	virtual TSharedPtr<SWidget> GetDefaultDecorator() const override
+	{
+		// Create hover widget
+		return SNew(SBorder)
+			.BorderImage(FSodaStyle::GetBrush("Brushes.Recessed"))
+			.Content()
+			[			
+				SNew(SHorizontalBox)
+				
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding( 0.0f, 0.0f, 3.0f, 0.0f )
+				.VAlign( VAlign_Center )
+				[
+					SNew( SImage )
+					.Image( this, &FSodaDecoratedDragDropOp::GetIcon )
+					.ColorAndOpacity( this, &FSodaDecoratedDragDropOp::GetIconColorAndOpacity)
+				]
+
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.VAlign( VAlign_Center )
+				[
+					SNew(STextBlock) 
+					.Text( this, &FSodaDecoratedDragDropOp::GetHoverText )
+				]
+			];
+	}
+
+	FText GetHoverText() const
+	{
+		return CurrentHoverText;
+	}
+
+	const FSlateBrush* GetIcon( ) const
+	{
+		return CurrentIconBrush;
+	}
+
+	FSlateColor GetIconColorAndOpacity() const
+	{
+		return CurrentIconColorAndOpacity;
+	}
+
+	/** Set the text and icon for this tooltip */
+	void SetToolTip(const FText& Text, const FSlateBrush* Icon)
+	{
+		CurrentHoverText = Text;
+		CurrentIconBrush = Icon;
+	}
+
+	/** Setup some default values for the decorator */
+	void SetupDefaults()
+	{
+		DefaultHoverText = CurrentHoverText;
+		DefaultHoverIcon = CurrentIconBrush;
+		DefaultHoverIconColorAndOpacity = CurrentIconColorAndOpacity;
+	}
+
+	/** Gets the default hover text for this drag drop op. */
+	FText GetDefaultHoverText() const
+	{
+		return DefaultHoverText;
+	}
+
+protected:
+
+	/** Default string to show as hover text */
+	FText								DefaultHoverText;
+
+	/** Default icon to be displayed */
+	const FSlateBrush*					DefaultHoverIcon;
+
+	/** Default color and opacity for the default icon to be displayed. */
+	FSlateColor							DefaultHoverIconColorAndOpacity;
+};
+
+
+/**
+ * FSodaActorDragDropOp
+ */
+class FSodaActorDragDropOp : public FSodaDecoratedDragDropOp
+{
+public:
+	DRAG_DROP_OPERATOR_TYPE(FSodaActorDragDropOp, FSodaDecoratedDragDropOp)
+
+	static TSharedRef<FSodaActorDragDropOp> New(TSharedPtr<const FPlaceableItem> & InItem)
+	{
+		TSharedRef<FSodaActorDragDropOp> Operation = MakeShared<FSodaActorDragDropOp>();
+		Operation->Init(InItem/*, ActorFactory*/);
+		Operation->Construct();
+		return Operation;
+	}
+
+public:
+	virtual ~FSodaActorDragDropOp();
+
+	virtual TSharedPtr<SWidget> GetDefaultDecorator() const override;
+
+	FText GetDecoratorText() const;
+
+	TSharedPtr<const FPlaceableItem> GetPlaceableItem() const { return Item; }
+
+protected:
+	void Init(TSharedPtr<const FPlaceableItem>& InItem/* TArray<FAssetData> InAssetData, TArray<FString> InAssetPaths , UActorFactory* InActorFactory*/);
+
+protected:
+	int32 ThumbnailSize = 0;
+	TSharedPtr<const FPlaceableItem> Item;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SAboutWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SAboutWindow.cpp
new file mode 100644
index 0000000..094938c
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SAboutWindow.cpp
@@ -0,0 +1,124 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SAboutWindow.h"
+#include "Soda/UnrealSodaVersion.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/SBoxPanel.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/LevelState.h"
+#include "SodaStyleSet.h"
+
+namespace soda
+{
+
+void SAboutWindow::Construct(const FArguments& InArgs)
+{
+	
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	check(GameMode);
+	//UWorld * World = GameMode->GetWorld();
+	//check(World);
+
+	FString LevelSource;
+
+	switch (GameMode->LevelState->Slot.SlotSource)
+	{
+	case ELeveSlotSource::Local: LevelSource = "Local"; break;
+	case ELeveSlotSource::Remote: LevelSource = "Remote"; break;
+	case ELeveSlotSource::NoSlot: LevelSource = "NoSlot"; break;
+	case ELeveSlotSource::NewSlot: LevelSource = "NewSlot"; break;
+	}
+
+	ChildSlot
+	[
+		SNew(SBox)
+		.Padding(5)
+		.MinDesiredWidth(500)
+		.MinDesiredHeight(150)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString("SodaSim (c)"))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString("Version: " UNREALSODA_VERSION_STRING))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString("Level Info: " ) + GameMode->LevelState->Slot.LevelName))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(15, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString("LevelName: " ) + GameMode->LevelState->Slot.LevelName))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(15, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString("Source: " ) + LevelSource))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(15, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString("Description: " ) + GameMode->LevelState->Slot.Description))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(15, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString("DateTime: " ) + GameMode->LevelState->Slot.DateTime.ToString()))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(15, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString("SlotIndex: " ) + FString::FromInt(GameMode->LevelState->Slot.SlotIndex)))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(15, 0, 0, 0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString("ScenarioID: " ) + FString::FromInt(GameMode->LevelState->Slot.ScenarioID)))
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			+ SVerticalBox::Slot()
+			.Padding(3)
+			.AutoHeight()
+			.HAlign(HAlign_Center)
+			.VAlign(VAlign_Center)
+			[
+				SNew(SButton)
+				.Text(FText::FromString("Close"))
+				.OnClicked_Lambda([this]() { CloseWindow(); return FReply::Handled(); })
+			]
+		]
+	];
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SAboutWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SAboutWindow.h
new file mode 100644
index 0000000..a5266ce
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SAboutWindow.h
@@ -0,0 +1,22 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+
+namespace soda
+{
+
+class  SAboutWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SAboutWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SAboutWindow() {}
+	void Construct( const FArguments& InArgs);
+};
+
+} // namespace
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SChooseMapWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SChooseMapWindow.cpp
new file mode 100644
index 0000000..3498616
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SChooseMapWindow.cpp
@@ -0,0 +1,66 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SChooseMapWindow.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/SodaGameMode.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Views/SListView.h"
+#include "Kismet/GameplayStatics.h"
+
+namespace soda
+{
+
+struct FLevelInfo
+{
+	FLevelInfo(const FString& InPath, const FString& InName) :
+		Path(InPath),
+		Name(InName) 
+	{}
+	FString Path;
+	FString Name;
+};
+
+void SChooseMapWindow::Construct( const FArguments& InArgs )
+{
+	TArray<FString> MapPaths = USodaStatics::GetAllMapPaths();
+	for (auto& Path : MapPaths)
+	{
+		Source.Add(MakeShared<FLevelInfo>(Path, FPaths::GetBaseFilename(Path)));
+	}
+
+	ChildSlot
+	[
+		SNew(SBorder)
+		.BorderImage(FSodaStyle::GetBrush("MenuWindow.Content"))
+		.Padding(5.0f)
+		[
+			SNew(SListView<TSharedPtr<FLevelInfo>>)
+			.ListItemsSource(&Source)
+			.SelectionMode(ESelectionMode::Single)
+			.OnGenerateRow(this, &SChooseMapWindow::OnGenerateRow)
+			.OnMouseButtonDoubleClick(this, &SChooseMapWindow::OnDoubleClick)
+		]
+	];
+}
+
+TSharedRef<ITableRow> SChooseMapWindow::OnGenerateRow(TSharedPtr<FLevelInfo> LevelInfo, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return
+		SNew(STableRow<TSharedPtr<FLevelInfo>>, OwnerTable)
+		[
+			SNew(STextBlock)
+			.Text(FText::FromString(*LevelInfo->Path))
+		];
+}
+
+void SChooseMapWindow::OnDoubleClick(TSharedPtr<FLevelInfo> LevelInfo)
+{
+	UGameplayStatics::OpenLevel(USodaStatics::GetGameWorld(), FName(*LevelInfo->Path), true);
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SChooseMapWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SChooseMapWindow.h
new file mode 100644
index 0000000..c3abd9b
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SChooseMapWindow.h
@@ -0,0 +1,33 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "Templates/SharedPointer.h"
+
+class ITableRow;
+class STableViewBase;
+
+namespace soda
+{
+struct FLevelInfo;
+
+class  SChooseMapWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SChooseMapWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SChooseMapWindow() {}
+	void Construct( const FArguments& InArgs );
+
+protected:
+	TSharedRef<ITableRow> OnGenerateRow(TSharedPtr<FLevelInfo> LevelInfo, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnDoubleClick(TSharedPtr<FLevelInfo> LevelInfo);
+
+	TArray<TSharedPtr<FLevelInfo>> Source;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SExportVehicleWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SExportVehicleWindow.cpp
new file mode 100644
index 0000000..38a08a9
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SExportVehicleWindow.cpp
@@ -0,0 +1,141 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SExportVehicleWindow.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "UI/Wnds/SVehcileManagerWindow.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaApp.h"
+#include "DesktopPlatformModule.h"
+#include "Misc/FileHelper.h"
+
+namespace soda
+{
+
+void SExportVehicleWindow::Construct( const FArguments& InArgs, TWeakObjectPtr<ASodaVehicle> InVehicle)
+{
+	Vehicle = InVehicle;
+	check(Vehicle.IsValid());
+
+	ChildSlot
+	[
+		SNew(SBox)
+		.Padding(5)
+		.MinDesiredWidth(600)
+		.MinDesiredHeight(400)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString("Export To:"))
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush("MenuWindow.Content"))
+				.Padding(5.0f)
+				[
+					SAssignNew(ListView, SListView<TSharedPtr<ISodaVehicleExporter>>)
+					.ListItemsSource(&Source)
+					.SelectionMode(ESelectionMode::Single)
+					.OnGenerateRow(this, &SExportVehicleWindow::OnGenerateRow)
+					.OnSelectionChanged(this, &SExportVehicleWindow::OnSelectionChanged)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.HAlign(HAlign_Left)
+			[
+				SAssignNew(ExportButton, SButton)
+				.Text(FText::FromString("Export"))
+				.OnClicked(this, &SExportVehicleWindow::OnExportAs)
+			]
+		]
+	];
+
+	UpdateSlots();
+}
+
+void SExportVehicleWindow::UpdateSlots()
+{
+	Source.Empty();
+	ExportButton->SetEnabled(false);
+	SodaApp.GetVehicleExporters().GenerateValueArray(Source);
+}
+
+TSharedRef<ITableRow> SExportVehicleWindow::OnGenerateRow(TSharedPtr<ISodaVehicleExporter> Exporter, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return 
+		SNew(STableRow<TSharedPtr<ISodaVehicleExporter>>, OwnerTable)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(FMargin(0, 0, 5, 0))
+			//.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(Exporter->GetExporterName()))
+			]
+		];
+}
+
+void SExportVehicleWindow::OnSelectionChanged(TSharedPtr<ISodaVehicleExporter> Exporter, ESelectInfo::Type SelectInfo)
+{
+	ExportButton->SetEnabled(Exporter.IsValid());
+}
+
+FReply SExportVehicleWindow::OnExportAs()
+{
+	TSharedPtr<ISodaVehicleExporter> Exporter;
+	if (ListView->GetSelectedItems().Num() == 1) Exporter = *ListView->GetSelectedItems().begin();
+
+	if (!Exporter)
+	{
+		FReply::Handled();
+	}
+		
+	IDesktopPlatform* DesktopPlatform = FDesktopPlatformModule::Get();
+	if (!DesktopPlatform)
+	{
+		UE_LOG(LogSoda, Error, TEXT("SExportVehicleWindow::OnExportAs(); Can't get the IDesktopPlatform ref"));
+		FReply::Handled();
+	}
+
+	const FString FileTypes = Exporter->GetFileTypes(); 
+
+	TArray<FString> OutFilenames;
+	if (!DesktopPlatform->SaveFileDialog(nullptr, FString(TEXT("Export to ")) + Exporter->GetExporterName(), TEXT(""), TEXT(""), FileTypes, EFileDialogFlags::None, OutFilenames) || OutFilenames.Num() <= 0)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("SExportVehicleWindow::OnExportAs(); File isn't change"));
+		FReply::Handled();
+	}
+
+	FString JsonString;
+	if (!Exporter->ExportToString(Vehicle.Get(), JsonString))
+	{
+		UE_LOG(LogSoda, Error, TEXT("SExportVehicleWindow::OnExportAs(); Can't export to '%s'"), *Exporter->GetExporterName());
+		FReply::Handled();
+	}
+
+	if (!FFileHelper::SaveStringToFile(JsonString, *OutFilenames[0]))
+	{
+		UE_LOG(LogSoda, Error, TEXT("SExportVehicleWindow::OnExportAs(); Can't write to '%s' file"), *OutFilenames[0]);
+		FReply::Handled();
+	}
+	
+	CloseWindow();
+	return FReply::Handled();
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SExportVehicleWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SExportVehicleWindow.h
new file mode 100644
index 0000000..86f49e9
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SExportVehicleWindow.h
@@ -0,0 +1,42 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "Templates/SharedPointer.h"
+#include "Input/Reply.h"
+#include "Widgets/Views/SListView.h"
+#include "Soda/Vehicles/ISodaVehicleExporter.h"
+
+class ASodaVehicle;
+
+namespace soda
+{
+
+class  SExportVehicleWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SExportVehicleWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SExportVehicleWindow() {}
+	void Construct( const FArguments& InArgs, TWeakObjectPtr<ASodaVehicle> Vehicle);
+
+protected:
+	void UpdateSlots();
+
+	TSharedRef<ITableRow> OnGenerateRow(TSharedPtr<ISodaVehicleExporter> Exporter, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnSelectionChanged(TSharedPtr<ISodaVehicleExporter> Exporter, ESelectInfo::Type SelectInfo);
+
+	FReply OnExportAs();
+
+	TArray<TSharedPtr<ISodaVehicleExporter>> Source;
+	TSharedPtr<SListView<TSharedPtr<ISodaVehicleExporter>>> ListView;
+	TSharedPtr<SButton> ExportButton;
+	TWeakObjectPtr<ASodaVehicle> Vehicle;
+};
+
+
+} // namespace
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SLevelSaveLoadWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SLevelSaveLoadWindow.cpp
new file mode 100644
index 0000000..18e5aa2
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SLevelSaveLoadWindow.cpp
@@ -0,0 +1,397 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SLevelSaveLoadWindow.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Layout/SWidgetSwitcher.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/LevelState.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/DBGateway.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+
+namespace soda
+{
+
+void SLevelSaveLoadWindow::Construct( const FArguments& InArgs )
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (!GameMode || !GameMode->LevelState)
+	{
+		return;
+	}
+
+	if (FDBGateway::Instance().IsConnected() && GameMode->LevelState->Slot.SlotSource == ELeveSlotSource::Remote)
+	{
+		SetMode(ELevelSaveLoadWindowMode::Remote);
+	}
+
+	ChildSlot
+	[
+		SNew(SBox)
+		.Padding(5)
+		.MinDesiredWidth(600)
+		.MinDesiredHeight(400)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				.Padding(0, 0, 5, 0)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString("Description"))
+				]
+				+ SHorizontalBox::Slot()
+				.FillWidth(1.0)
+				.Padding(0, 0, 5, 0)
+				[
+					SAssignNew(EditableTextBoxDesc, SEditableTextBox)
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("New Save"))
+					.OnClicked(this, &SLevelSaveLoadWindow::OnNewSave)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush("MenuWindow.Content"))
+				.Padding(5.0f)
+				[
+					SAssignNew(ListView, SListView<TSharedPtr<FLevelStateSlotDescription>>)
+					.ListItemsSource(&Source)
+					.SelectionMode(ESelectionMode::Single)
+					.OnGenerateRow(this, &SLevelSaveLoadWindow::OnGenerateRow)
+					.OnSelectionChanged(this, &SLevelSaveLoadWindow::OnSelectionChanged)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.HAlign(HAlign_Right)
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SComboButton)
+				.ContentPadding(3)
+				.OnGetMenuContent(this, &SLevelSaveLoadWindow::GetComboMenuContent)
+				.Visibility_Lambda([]()
+				{
+					return FDBGateway::Instance().IsConnected() ? EVisibility::Visible : EVisibility::Hidden;
+				})
+				.ButtonContent()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					.Padding(0, 0, 5, 0)
+					.AutoWidth()
+					[
+						SNew(SImage)
+						.Image_Lambda([this]()
+						{
+							if(this->GetMode() == ELevelSaveLoadWindowMode::Local)
+							{
+								return FSodaStyle::Get().GetBrush("Icons.FolderClosed");
+							}
+							else
+							{
+								return FSodaStyle::Get().GetBrush("Icons.Server");
+							}
+							
+						})
+					]
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					.Padding(0, 0, 5, 0)
+					[
+						SNew(STextBlock)
+						.MinDesiredWidth(50)
+						.Text_Lambda([this]()
+						{
+							if(this->GetMode() == ELevelSaveLoadWindowMode::Local)
+							{
+								return FText::FromString("Local");
+							}
+							else
+							{
+								return FText::FromString("Remote");
+							}
+						})
+					]
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.Padding(0, 0, 5, 0)
+				[
+					SAssignNew(SaveButton, SButton)
+					.Text(FText::FromString("Save"))
+					.OnClicked(this, &SLevelSaveLoadWindow::OnSave)
+				]
+				+ SHorizontalBox::Slot()
+				[
+					SAssignNew(LoadButton, SButton)
+					.Text(FText::FromString("Load"))
+					.OnClicked(this, &SLevelSaveLoadWindow::OnLoad)
+				]
+			]
+		]
+	];
+
+	UpdateSlots();
+}
+
+void SLevelSaveLoadWindow::UpdateSlots()
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (!GameMode || !GameMode->LevelState)
+	{
+		return;
+	}
+
+	Source.Empty();
+
+	SaveButton->SetEnabled(false);
+	LoadButton->SetEnabled(false);
+
+	TArray<FLevelStateSlotDescription> Slots;
+
+	if (GetMode() == ELevelSaveLoadWindowMode::Local)
+	{
+		ALevelState::GetLevelSlotsLocally(nullptr, Slots, true);
+	}
+	else
+	{
+		if (!ALevelState::GetLevelSlotsRemotly(nullptr, Slots, true))
+		{
+			USodaGameModeComponent::GetChecked()->ShowMessageBox(soda::EMessageBoxType::OK, "Error", "MongoDB error. See log for more information");
+		}
+	}
+
+	for (auto& Slot : Slots)
+	{
+		Source.Add(MakeShared<FLevelStateSlotDescription>(Slot));
+	}
+
+	for (auto& It : Source)
+	{
+		if ((It->SlotSource == GameMode->LevelState->Slot.SlotSource) && (
+				(It->SlotSource == ELeveSlotSource::Local && It->SlotIndex == GameMode->LevelState->Slot.SlotIndex) ||
+				(It->SlotSource == ELeveSlotSource::Remote && It->ScenarioID == GameMode->LevelState->Slot.ScenarioID)))
+		{
+			ListView->SetSelection(It);
+			break;
+		}
+	}
+	
+	ListView->RequestListRefresh();
+}
+
+TSharedRef<SWidget> SLevelSaveLoadWindow::GetComboMenuContent()
+{
+	FMenuBuilder MenuBuilder(
+		/*bShouldCloseWindowAfterMenuSelection*/ true, 
+		/* InCommandList = */nullptr, 
+		/* InExtender = */nullptr, 
+		/*bCloseSelfOnly*/ false,
+		&FSodaStyle::Get());
+
+	MenuBuilder.BeginSection("Section");
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([this]() 
+		{
+			SetMode(ELevelSaveLoadWindowMode::Remote);
+			UpdateSlots();
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Remote")),
+			FText::FromString(TEXT("Remote")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Server"),
+			Action);
+	}
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([this]() 
+		{
+			SetMode(ELevelSaveLoadWindowMode::Local);
+			UpdateSlots();
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Local")),
+			FText::FromString(TEXT("Local")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.FolderClosed"),
+			Action);
+	}
+
+	MenuBuilder.EndSection();
+
+	return MenuBuilder.MakeWidget();
+}
+
+TSharedRef<ITableRow> SLevelSaveLoadWindow::OnGenerateRow(TSharedPtr<FLevelStateSlotDescription> Slot, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return 
+		SNew(STableRow<TSharedPtr<FLevelStateSlotDescription>>, OwnerTable)
+		[
+			SNew(SHorizontalBox)
+			+ SHorizontalBox::Slot()
+			.Padding(FMargin(0, 0, 5, 0))
+			.AutoWidth()
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(Slot->DateTime.ToString()))
+			]
+			+ SHorizontalBox::Slot()
+			.FillWidth(1.0)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(Slot->Description))
+			]
+			+ SHorizontalBox::Slot()
+			.AutoWidth()
+			[
+				SNew(SButton)
+				.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+				.OnClicked(this, &SLevelSaveLoadWindow::OnDeleteSlot, Slot)
+			]
+		];
+}
+
+void SLevelSaveLoadWindow::OnSelectionChanged(TSharedPtr<FLevelStateSlotDescription> Slot, ESelectInfo::Type SelectInfo)
+{
+	if (Slot)
+	{
+		EditableTextBoxDesc->SetText(FText::FromString(Slot->Description));
+		SaveButton->SetEnabled(true);
+		LoadButton->SetEnabled(true);
+	}
+	else
+	{
+		EditableTextBoxDesc->SetText(FText::GetEmpty());
+		SaveButton->SetEnabled(false);
+		LoadButton->SetEnabled(false);
+	}
+}
+
+FReply SLevelSaveLoadWindow::OnSave()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		TSharedPtr<FLevelStateSlotDescription> SelectedItem;
+		if (ListView->GetSelectedItems().Num() == 1) SelectedItem = *ListView->GetSelectedItems().begin();
+		if (SelectedItem)
+		{
+			if (SelectedItem->SlotSource == ELeveSlotSource::Remote)
+			{
+				check(SelectedItem->ScenarioID >= 0);
+				GameMode->LevelState->SaveLevelRemotlyAs(SelectedItem->ScenarioID, EditableTextBoxDesc->GetText().ToString());
+			}
+			else
+			{
+				check(SelectedItem->SlotIndex >= 0);
+				GameMode->LevelState->SaveLevelLocallyAs(SelectedItem->SlotIndex, EditableTextBoxDesc->GetText().ToString());
+			}
+			this->UpdateSlots();
+		}
+	}
+	return FReply::Handled();
+}
+
+FReply SLevelSaveLoadWindow::OnNewSave()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		if (GetMode() == ELevelSaveLoadWindowMode::Local)
+		{
+			GameMode->LevelState->SaveLevelLocallyAs(-1, EditableTextBoxDesc->GetText().ToString());
+		}
+		else
+		{
+			GameMode->LevelState->SaveLevelRemotlyAs(-1, EditableTextBoxDesc->GetText().ToString());
+		}
+		this->UpdateSlots();
+	}
+	return FReply::Handled();
+}
+
+FReply SLevelSaveLoadWindow::OnLoad()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		TSharedPtr<FLevelStateSlotDescription> SelectedItem;
+		if (ListView->GetSelectedItems().Num() == 1) SelectedItem = *ListView->GetSelectedItems().begin();
+		if (SelectedItem)
+		{
+			if (SelectedItem->SlotSource == ELeveSlotSource::Remote)
+			{
+				check(SelectedItem->ScenarioID >= 0);
+				ALevelState::ReloadLevelFromSlotRemotly(nullptr, SelectedItem->ScenarioID);
+			}
+			else
+			{
+				check(SelectedItem->SlotIndex >= 0);
+				ALevelState::ReloadLevelFromSlotLocally(nullptr, SelectedItem->SlotIndex);
+			}
+		}
+	}
+	return FReply::Handled();
+}
+
+FReply SLevelSaveLoadWindow::OnDeleteSlot(TSharedPtr<FLevelStateSlotDescription> SelectedItem)
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		TSharedPtr<soda::SMessageBox> MsgBox = GameMode->ShowMessageBox(
+			soda::EMessageBoxType::YES_NO_CANCEL,
+			"Delete Slot",
+			"Are you sure you want to delete the \"" + SelectedItem->Description + "\" slot?");
+		MsgBox->SetOnMessageBox(soda::FOnMessageBox::CreateLambda([this, SelectedItem](soda::EMessageBoxButton Button)
+		{
+			if (Button == soda::EMessageBoxButton::YES)
+			{
+				if (SelectedItem->SlotSource == ELeveSlotSource::Remote)
+				{
+					check(SelectedItem->ScenarioID >= 0);
+					ALevelState::DeleteLevelRemotly(nullptr, SelectedItem->ScenarioID);
+				}
+				else
+				{
+					check(SelectedItem->SlotIndex >= 0);
+					ALevelState::DeleteLevelLocally(nullptr, SelectedItem->SlotIndex);
+				}
+				this->UpdateSlots();
+			}
+		}));
+	}
+	return FReply::Handled();
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SLevelSaveLoadWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SLevelSaveLoadWindow.h
new file mode 100644
index 0000000..87b0a8f
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SLevelSaveLoadWindow.h
@@ -0,0 +1,61 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "Templates/SharedPointer.h"
+#include "Input/Reply.h"
+#include "Widgets/Views/SListView.h"
+
+class SEditableTextBox;
+struct FLevelStateSlotDescription;
+class ITableRow;
+class STableViewBase;
+class SButton;
+
+namespace soda
+{
+
+enum class ELevelSaveLoadWindowMode
+{
+	Local,
+	Remote
+};
+
+class  SLevelSaveLoadWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SLevelSaveLoadWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SLevelSaveLoadWindow() {}
+	void Construct( const FArguments& InArgs );
+
+	ELevelSaveLoadWindowMode GetMode() const { return Mode; }
+	void SetMode(ELevelSaveLoadWindowMode InMode) { Mode = InMode; }
+
+protected:
+	void UpdateSlots();
+
+	TSharedRef<ITableRow> OnGenerateRow(TSharedPtr<FLevelStateSlotDescription> Slot, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnSelectionChanged(TSharedPtr<FLevelStateSlotDescription> Slot, ESelectInfo::Type SelectInfo);
+	TSharedRef<SWidget> GetComboMenuContent();
+
+	FReply OnSave();
+	FReply OnNewSave();
+	FReply OnLoad();
+	FReply OnDeleteSlot(TSharedPtr<FLevelStateSlotDescription> Slot);
+
+	TArray<TSharedPtr<FLevelStateSlotDescription>> Source;
+	TSharedPtr<SListView<TSharedPtr<FLevelStateSlotDescription>>> ListView;
+	TSharedPtr<SEditableTextBox> EditableTextBoxDesc;
+	TSharedPtr<SButton> SaveButton;
+	TSharedPtr<SButton> LoadButton;
+
+	ELevelSaveLoadWindowMode Mode = ELevelSaveLoadWindowMode::Local;
+};
+
+
+} // namespace
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SPinToolActorWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SPinToolActorWindow.cpp
new file mode 100644
index 0000000..cc56c73
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SPinToolActorWindow.cpp
@@ -0,0 +1,194 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SPinToolActorWindow.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Layout/SScrollBox.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/LevelState.h"
+#include "Soda/SodaActorFactory.h"
+
+namespace soda
+{
+
+void SPinToolActorWindow::Construct( const FArguments& InArgs, IToolActor* InToolActor)
+{
+	ToolActor = InToolActor;
+	check(ToolActor.IsValid());
+
+	ChildSlot
+	[
+		SNew(SBox)
+		.Padding(5)
+		.MinDesiredWidth(600)
+		.MinDesiredHeight(400)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				.Padding(0, 0, 5, 0)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString("Name"))
+				]
+				+ SHorizontalBox::Slot()
+				.FillWidth(1.0)
+				.Padding(0, 0, 5, 0)
+				[
+					SAssignNew(EditableTextBox, SEditableTextBox)
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("New Slot"))
+					.OnClicked(this, &SPinToolActorWindow::OnNewSave)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush("MenuWindow.Content"))
+				.Padding(5.0f)
+				[
+					SAssignNew(ListView, SListView<TSharedPtr<FString>>)
+					.ListItemsSource(&Source)
+					.SelectionMode(ESelectionMode::Single)
+					.OnGenerateRow(this, &SPinToolActorWindow::OnGenerateRow)
+					.OnMouseButtonDoubleClick(this, &SPinToolActorWindow::OnDoubleClickRow)
+				]
+			]
+		]
+	];
+
+	UpdateSlots();
+}
+
+void SPinToolActorWindow::UpdateSlots()
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	if (!GameMode || !GameMode->LevelState)
+	{
+		return;
+	}
+
+	Source.Empty();
+
+	if (ToolActor.IsValid())
+	{
+		if (UPinnedToolActorsSaveGame* SaveGame = ToolActor->GetSaveGame())
+		{
+			for (auto& It : SaveGame->ActorRecords)
+			{
+				Source.Add(MakeShared<FString>(It.Key));
+			}
+		}
+	}
+
+	ListView->RequestListRefresh();
+}
+
+TSharedRef<ITableRow> SPinToolActorWindow::OnGenerateRow(TSharedPtr<FString> Slot, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	auto Row = SNew(STableRow<TSharedPtr<FString>>, OwnerTable);
+	Row->ConstructChildren(OwnerTable->TableViewMode, FMargin(1),
+		SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.Padding(FMargin(0, 0, 5, 0))
+		.FillWidth(1.0)
+		[
+			SNew(STextBlock)
+			.Text(FText::FromString(*Slot.Get()))
+		]
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		[
+			SNew(SButton)
+			.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+			.OnClicked(this, &SPinToolActorWindow::OnDeleteSlot, Slot)
+			.ButtonColorAndOpacity_Lambda([Row]()
+			{
+				return Row->IsHovered() ? FLinearColor(1, 1, 1, 1) : FLinearColor(1, 1, 1, 0);
+			})
+		]
+	);
+	return Row;
+}
+
+FReply SPinToolActorWindow::OnNewSave()
+{
+	if (ToolActor.IsValid())
+	{
+		if (ToolActor->PinActor(EditableTextBox->GetText().ToString()))
+		{
+			ToolActor->SavePinnedActor();
+		}
+	}
+	CloseWindow();
+	return FReply::Handled();
+}
+
+FReply SPinToolActorWindow::OnDeleteSlot(TSharedPtr<FString> Slot)
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		TSharedPtr<soda::SMessageBox> MsgBox = GameMode->ShowMessageBox(
+			soda::EMessageBoxType::YES_NO_CANCEL,
+			"Delete Slot",
+			"Are you sure you want to delete the \"" + *Slot.Get() + "\" slot?");
+		MsgBox->SetOnMessageBox(soda::FOnMessageBox::CreateLambda([this, Slot](soda::EMessageBoxButton Button)
+		{
+			if (Button == soda::EMessageBoxButton::YES)
+			{
+				if (ToolActor.IsValid())
+				{
+					ToolActor->DeleteSlot(ToolActor->AsActor()->GetWorld(), *Slot);
+					this->UpdateSlots();
+				}
+			}
+		}));
+	}
+	return FReply::Handled();
+}
+
+void SPinToolActorWindow::OnDoubleClickRow(TSharedPtr<FString> Slot)
+{
+	if (ToolActor.IsValid())
+	{
+		AActor* Actor = ToolActor->AsActor();
+		if (IToolActor* DefaultToolActor = Cast<IToolActor>(Actor->GetClass()->GetDefaultObject()))
+		{
+			UWorld* World = Actor->GetWorld();
+			FTransform Transform = ToolActor->AsActor()->GetActorTransform();
+			FName ActorName = ToolActor->AsActor()->GetFName();
+			Actor->Destroy();
+			AActor* NewActor = DefaultToolActor->LoadPinnedActor(World, Transform, *Slot.Get(), false, ActorName);
+			if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+			{
+				if (GameMode->LevelState)
+				{
+					if(GameMode->LevelState->ActorFactory) GameMode->LevelState->ActorFactory->ReplaceActor(NewActor, Actor, false);
+					GameMode->LevelState->MarkAsDirty();
+				}
+			}
+		}
+	}
+	CloseWindow();
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SPinToolActorWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SPinToolActorWindow.h
new file mode 100644
index 0000000..f646beb
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SPinToolActorWindow.h
@@ -0,0 +1,45 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "Soda/IToolActor.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "Templates/SharedPointer.h"
+#include "Widgets/Views/SListView.h"
+
+class SEditableTextBox;
+class ITableRow;
+class STableViewBase;
+
+
+namespace soda
+{
+
+class  SPinToolActorWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SPinToolActorWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SPinToolActorWindow() {}
+	void Construct( const FArguments& InArgs, IToolActor* ToolActor);
+
+protected:
+	void UpdateSlots();
+
+	TSharedRef<ITableRow> OnGenerateRow(TSharedPtr<FString> Slot, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnDoubleClickRow(TSharedPtr<FString> Slot);
+
+	FReply OnNewSave();
+	FReply OnDeleteSlot(TSharedPtr<FString> Slot);
+
+	TArray<TSharedPtr<FString>> Source;
+	TSharedPtr<SListView<TSharedPtr<FString>>> ListView;
+	TSharedPtr<SEditableTextBox> EditableTextBox;
+	TWeakInterfacePtr<IToolActor> ToolActor;
+};
+
+} // namespace
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SSaveAllWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SSaveAllWindow.cpp
new file mode 100644
index 0000000..c8212b1
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SSaveAllWindow.cpp
@@ -0,0 +1,314 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SSaveAllWindow.h"
+#include "UI/Wnds/SLevelSaveLoadWindow.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/LevelState.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "EngineUtils.h"
+#include "Soda/ISodaActor.h"
+#include "SodaStyleSet.h"
+
+namespace soda
+{
+class SSaveAllWindowRow;
+
+static const FName Column_SG_ItemName("ItemName");
+static const FName Column_SG_ClassName("ClassName");
+static const FName Column_SG_SaveButton("SaveButton");
+
+
+class SSaveAllWindowRow : public SMultiColumnTableRow<TSharedPtr<FSaveAllWindowItem>>
+{
+public:
+	SLATE_BEGIN_ARGS(SSaveAllWindowRow)
+	{}
+	SLATE_END_ARGS()
+
+	void Construct(const FArguments& InArgs, const TSharedRef<STableViewBase>& InOwnerTable, TWeakPtr<FSaveAllWindowItem> InItem)
+	{
+		Item = InItem;
+		FSuperRowType::FArguments OutArgs;
+		//OutArgs._SignalSelectionMode = ETableRowSignalSelectionMode::Instantaneous;
+		SMultiColumnTableRow<TSharedPtr<FSaveAllWindowItem>>::Construct(OutArgs, InOwnerTable);
+	}
+
+	virtual TSharedRef<SWidget> GenerateWidgetForColumn(const FName& InColumnName) override
+	{
+		if (InColumnName == Column_SG_ItemName)
+		{
+			return
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(5, 1, 1, 1)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(SImage)
+					.Image(FSodaStyle::GetBrush(Item.Pin()->IconName))
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				.Padding(5, 1, 1, 1)
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString(Item.Pin()->Caption))
+				];
+		}
+
+		if (InColumnName == Column_SG_ClassName)
+		{
+			return
+				SNew(STextBlock)
+				.Text(FText::FromName(Item.Pin()->ClassName));
+		}
+
+		if (InColumnName == Column_SG_SaveButton)
+		{
+			TSharedRef<SButton> Button = SNew(SButton)
+			.ButtonStyle(FSodaStyle::Get(), "MenuWindow.SaveButton")
+			.OnClicked_Lambda([this]()
+				{
+					Item.Pin()->Action.Execute();
+					return FReply::Handled();
+				}
+			);
+
+			Button->SetEnabled(TAttribute<bool>::CreateLambda([this]()
+				{
+					return Item.Pin()->Action.CanExecute();
+				}
+			));
+			return
+				SNew(SBox)
+				.HAlign(HAlign_Center)
+				.VAlign(VAlign_Center)
+				[
+					Button
+				];
+		}
+
+		return SNullWidget::NullWidget;
+	}
+
+	TWeakPtr<FSaveAllWindowItem> Item;
+};
+
+/***********************************************************************************/
+
+void SSaveAllWindow::Construct(const FArguments& InArgs, ESaveAllWindowMode Mode, bool bExecuteModeIfNothingToSave)
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::Get();
+	check(GameMode);
+	UWorld * World = GameMode->GetWorld();
+	check(World);
+
+	// Add Level State
+	TWeakObjectPtr<ALevelState> LevelState = GameMode->LevelState;
+	if(LevelState.IsValid() && LevelState->IsDirty())
+	{
+		TSharedPtr<FSaveAllWindowItem> LevelItem = MakeShared<FSaveAllWindowItem>();
+		Source.Add(LevelItem);
+		LevelItem->Caption = World->GetMapName() + " [" + ((LevelState->Slot.SlotSource == ELeveSlotSource::NoSlot) ? LevelState->Slot.Description : FString("New")) + "]";
+		LevelItem->Caption.RemoveFromStart(World->StreamingLevelsPrefix);
+		LevelItem->IconName = "Icons.Level";
+		LevelItem->ClassName = "Level";
+		LevelItem->Action.CanExecuteAction.BindLambda([LevelState]()
+		{
+			if (LevelState.IsValid())
+			{
+				return LevelState->IsDirty();
+			}
+			return false;
+		});
+		LevelItem->Action.ExecuteAction.BindLambda([LevelState, GameMode]()
+		{
+			if (LevelState.IsValid())
+			{
+				if (LevelState->Slot.SlotSource == ELeveSlotSource::Local)
+				{
+					LevelState->SaveLevelLocallyAs(-1, LevelState->Slot.Description);
+				}
+				else
+				{
+					GameMode->OpenWindow("Level Save & Load", SNew(SLevelSaveLoadWindow));
+				}
+			}
+		});
+	}
+
+	// Add Pinned Actors
+	for (FActorIterator It(World); It; ++It)
+	{
+		AActor* Actor = *It;
+		TWeakInterfacePtr<ISodaActor> SodaActor = Cast<ISodaActor>(Actor);
+		if (SodaActor.IsValid())
+		{
+			if (SodaActor->IsPinnedActor() && SodaActor->IsDirty())
+			{
+				TSharedPtr<FSaveAllWindowItem> PinnedItem = MakeShared<FSaveAllWindowItem>();
+				Source.Add(PinnedItem);
+				const FSodaActorDescriptor & Desc = GameMode->GetSodaActorDescriptor(Actor->GetClass());
+				PinnedItem->Caption = SodaActor->GetPinnedActorName();
+				PinnedItem->IconName = Desc.Icon;
+				PinnedItem->ClassName = Actor->GetClass()->GetFName();
+				PinnedItem->Action.CanExecuteAction.BindLambda([SodaActor]()
+				{
+					if (SodaActor.IsValid())
+					{
+						return SodaActor->IsDirty();
+					}
+					return false;
+				});
+				PinnedItem->Action.ExecuteAction.BindLambda([SodaActor, GameMode]()
+				{
+					if (SodaActor.IsValid())
+					{
+						SodaActor->SavePinnedActor();
+					}
+				});
+			}
+		}
+	}
+
+	if (bExecuteModeIfNothingToSave && Source.Num() == 0)
+	{
+		switch (Mode)
+		{
+		case ESaveAllWindowMode::Restart:
+			GameMode->RequestRestartLevel(true);
+			ChildSlot
+			[
+				SNew(SBox)
+				.Padding(30.0f)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString("Restarting..."))
+				]
+			];
+			return;
+		case ESaveAllWindowMode::Quit:
+			GameMode->RequestQuit(true);
+			ChildSlot
+			[
+				SNew(SBox)
+				.Padding(30.0f)
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString("Good bay!"))
+				]
+			];
+			return;
+		}
+	}
+
+	ChildSlot
+	[
+		SNew(SBox)
+		.Padding(5)
+		.MinDesiredWidth(600)
+		.MinDesiredHeight(400)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.FillHeight(1)
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush(TEXT("Brushes.Recessed")))
+				.Padding(1.0f)
+				[
+					SNew(SListView<TSharedPtr<FSaveAllWindowItem>>)
+					.ListItemsSource(&Source)
+					.SelectionMode(ESelectionMode::Single)
+					.OnGenerateRow(this, &SSaveAllWindow::OnGenerateRow)
+					.HeaderRow(
+						SNew(SHeaderRow)
+						+ SHeaderRow::Column(Column_SG_ItemName)
+						.DefaultLabel(FText::FromString("Item Name"))
+						+ SHeaderRow::Column(Column_SG_ClassName)
+						.DefaultLabel(FText::FromString("Item Class"))
+						+ SHeaderRow::Column(Column_SG_SaveButton)
+						.FixedWidth(24)
+						.DefaultLabel(FText::FromString(""))
+					)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.Padding(3)
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("Restart"))
+					.Visibility(Mode == ESaveAllWindowMode::Restart ? EVisibility::Visible : EVisibility::Collapsed)
+					.OnClicked(this, &SSaveAllWindow::OnRestart)
+				]
+				+ SHorizontalBox::Slot()
+				.Padding(3)
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("Quit"))
+					.Visibility(Mode == ESaveAllWindowMode::Quit ? EVisibility::Visible : EVisibility::Collapsed)
+					.OnClicked(this, &SSaveAllWindow::OnQuit)
+				]
+				+ SHorizontalBox::Slot()
+				.Padding(3)
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("Cancle"))
+					.OnClicked(this, &SSaveAllWindow::OnCancle)
+				]
+			]
+		]
+	];
+}
+
+TSharedRef<ITableRow> SSaveAllWindow::OnGenerateRow(TSharedPtr<FSaveAllWindowItem> Item, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	return SNew(SSaveAllWindowRow, OwnerTable, Item);
+}
+
+FReply SSaveAllWindow::OnQuit()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->RequestQuit(true);
+	}
+	return FReply::Handled();
+}
+
+FReply SSaveAllWindow::OnRestart()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->RequestRestartLevel(true);
+	}
+	return FReply::Handled();
+}
+
+FReply SSaveAllWindow::OnCancle()
+{
+	CloseWindow();
+	return FReply::Handled();
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SSaveAllWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SSaveAllWindow.h
new file mode 100644
index 0000000..c3f8203
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SSaveAllWindow.h
@@ -0,0 +1,50 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "Framework/Commands/UIAction.h"
+#include "Templates/SharedPointer.h"
+
+class STableViewBase;
+class ITableRow;
+
+namespace soda
+{
+
+enum class ESaveAllWindowMode
+{
+	Quit,
+	Restart
+};
+
+struct FSaveAllWindowItem
+{
+	FString Caption;
+	FUIAction Action;
+	FName IconName;
+	FName ClassName;
+};
+
+class  SSaveAllWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SSaveAllWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SSaveAllWindow() {}
+	void Construct( const FArguments& InArgs, ESaveAllWindowMode Mode, bool bExecuteModeIfNothingToSave);
+
+private:
+	TSharedRef<ITableRow> OnGenerateRow(TSharedPtr<FSaveAllWindowItem> Item, const TSharedRef< STableViewBase >& OwnerTable);
+	FReply OnQuit();
+	FReply OnRestart();
+	FReply OnCancle();
+
+	TArray<TSharedPtr<FSaveAllWindowItem>> Source;
+	//SListView<TSharedPtr<FSaveAllWindowItem>> ListView;
+};
+
+} // namespace
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SSaveVehicleRequestWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SSaveVehicleRequestWindow.cpp
new file mode 100644
index 0000000..ab91abc
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SSaveVehicleRequestWindow.cpp
@@ -0,0 +1,106 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SSaveVehicleRequestWindow.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "UI/Wnds/SVehcileManagerWindow.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/SodaGameMode.h"
+
+namespace soda
+{
+
+void SSaveVehicleRequestWindow::Construct( const FArguments& InArgs, TWeakObjectPtr<ASodaVehicle> InVehicle)
+{
+	Vehicle = InVehicle;
+	check(Vehicle.IsValid());
+
+	ChildSlot
+	[
+		SNew(SBox)
+		.Padding(5)
+		.MinDesiredWidth(300)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 2, 0, 2)
+			[
+				SNew(STextBlock)
+				.Text(FText::FromString(FString::Printf(TEXT("Save vehicle \"%s\" as: "), *FPaths::GetBaseFilename(Vehicle->GetSaveAddress().ToVehicleName()))))
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 2, 0, 2)
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.Padding(3)
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("Save As New"))
+					.OnClicked(this, &SSaveVehicleRequestWindow::OnSaveAs)
+				]
+				+ SHorizontalBox::Slot()
+				.Padding(3)
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("Resave"))
+					.OnClicked(this, &SSaveVehicleRequestWindow::OnResave)
+				]
+				+ SHorizontalBox::Slot()
+				.Padding(3)
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("Cancle"))
+					.OnClicked(this, &SSaveVehicleRequestWindow::OnCancle)
+				]
+			]
+		]
+	];
+}
+
+FReply SSaveVehicleRequestWindow::OnSaveAs()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		if (Vehicle.IsValid())
+		{
+			GameMode->OpenWindow("Save Vehicle As", SNew(SVehcileManagerWindow, Vehicle.Get()));
+		}
+	}
+	CloseWindow();
+	return FReply::Handled();
+}
+
+FReply SSaveVehicleRequestWindow::OnResave()
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		if (!(Vehicle.IsValid() && Vehicle->Resave()))
+		{
+			TSharedPtr<soda::SMessageBox> MsgBox = GameMode->ShowMessageBox(
+				soda::EMessageBoxType::OK, "Error", "Can't save vehilce");
+		}
+	}
+	CloseWindow();
+	return FReply::Handled();
+}
+
+FReply SSaveVehicleRequestWindow::OnCancle()
+{
+	CloseWindow();
+	return FReply::Handled();
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SSaveVehicleRequestWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SSaveVehicleRequestWindow.h
new file mode 100644
index 0000000..73a2129
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SSaveVehicleRequestWindow.h
@@ -0,0 +1,32 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+
+class ASodaVehicle;
+
+namespace soda
+{
+
+class  SSaveVehicleRequestWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SSaveVehicleRequestWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SSaveVehicleRequestWindow() {}
+	void Construct( const FArguments& InArgs, TWeakObjectPtr<ASodaVehicle> Vehicle);
+
+protected:
+	FReply OnResave();
+	FReply OnSaveAs();
+	FReply OnCancle();
+
+	TWeakObjectPtr<ASodaVehicle> Vehicle;
+};
+
+
+} // namespace
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SVehcileManagerWindow.cpp b/Source/UnrealSoda/Private/UI/Wnds/SVehcileManagerWindow.cpp
new file mode 100644
index 0000000..96c9b97
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SVehcileManagerWindow.cpp
@@ -0,0 +1,382 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UI/Wnds/SVehcileManagerWindow.h"
+#include "SodaStyleSet.h"
+#include "Widgets/Layout/SBox.h"
+#include "Widgets/Layout/SBorder.h"
+#include "Widgets/Text/STextBlock.h"
+#include "Widgets/Input/SButton.h"
+#include "Widgets/Input/SEditableTextBox.h"
+#include "Widgets/Input/SComboButton.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/DBGateway.h"
+#include "GenericPlatform/GenericPlatformFile.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Soda/SodaGameMode.h"
+#include "Framework/Notifications/NotificationManager.h"
+#include "Widgets/Notifications/SNotificationList.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+
+namespace soda
+{
+
+void SVehcileManagerWindow::Construct( const FArguments& InArgs, ASodaVehicle* InVehicle)
+{
+	Vehicle = InVehicle;
+
+	if (Vehicle.IsValid())
+	{
+		if (FDBGateway::Instance().IsConnected() && Vehicle->GetSaveAddress().Source == EVehicleSaveSource::DB)
+		{
+			SetSource(EVehicleManagerSource::Remote);
+		}
+	}
+	
+	ChildSlot
+	[
+		SNew(SBox)
+		.MinDesiredWidth(600)
+		.MinDesiredHeight(300)
+		.Padding(5)
+		[
+			SNew(SVerticalBox)
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.VAlign(VAlign_Center)
+				.HAlign(HAlign_Center)
+				.Padding(0, 0, 5, 0)
+				.AutoWidth()
+				[
+					SNew(STextBlock)
+					.Text(FText::FromString("Name"))
+				]
+				+ SHorizontalBox::Slot()
+				.FillWidth(1.0)
+				.Padding(0, 0, 5, 0)
+				[
+					SAssignNew(EditableTextBox, SEditableTextBox)
+					.IsEnabled(Vehicle.IsValid())
+				]
+				+ SHorizontalBox::Slot()
+				.AutoWidth()
+				[
+					SNew(SButton)
+					.Text(FText::FromString("New Slot"))
+					.IsEnabled(Vehicle.IsValid())
+					.OnClicked(this, &SVehcileManagerWindow::OnNewSave)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.FillHeight(1.0)
+			.Padding(0, 0, 0, 5)
+			[
+				SNew(SBorder)
+				.BorderImage(FSodaStyle::GetBrush("MenuWindow.Content"))
+				.Padding(5.0f)
+				[
+					SAssignNew(ListView, SListView<TSharedPtr<FVechicleSaveAddress>>)
+					.ListItemsSource(&SavedVehicles)
+					.SelectionMode(ESelectionMode::Single)
+					.OnGenerateRow(this, &SVehcileManagerWindow::OnGenerateRow)
+					.OnSelectionChanged(this, &SVehcileManagerWindow::OnSelectionChanged)
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.HAlign(HAlign_Right)
+			[
+				SNew(SComboButton)
+				.ContentPadding(3)
+				.OnGetMenuContent(this, &SVehcileManagerWindow::GetComboMenuContent)
+				.Visibility_Lambda([]()
+				{
+					return FDBGateway::Instance().IsConnected() ? EVisibility::Visible : EVisibility::Hidden;
+				})
+				.ButtonContent()
+				[
+					SNew(SHorizontalBox)
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					.Padding(0, 0, 5, 0)
+					.AutoWidth()
+					[
+						SNew(SImage)
+						.Image_Lambda([this]()
+						{
+							if(this->GetSource() == EVehicleManagerSource::Local)
+							{
+								return FSodaStyle::Get().GetBrush("Icons.FolderClosed");
+							}
+							else
+							{
+								return FSodaStyle::Get().GetBrush("Icons.Server");
+							}
+							
+						})
+					]
+					+ SHorizontalBox::Slot()
+					.VAlign(VAlign_Center)
+					.HAlign(HAlign_Center)
+					.Padding(0, 0, 5, 0)
+					[
+						SNew(STextBlock)
+						.MinDesiredWidth(50)
+						.Text_Lambda([this]()
+						{
+							if(this->GetSource() == EVehicleManagerSource::Local)
+							{
+								return FText::FromString("Local");
+							}
+							else
+							{
+								return FText::FromString("Remote");
+							}
+						})
+					]
+				]
+			]
+			+ SVerticalBox::Slot()
+			.AutoHeight()
+			.VAlign(VAlign_Center)
+			.HAlign(HAlign_Center)
+			[
+				SNew(SHorizontalBox)
+				+ SHorizontalBox::Slot()
+				.Padding(0, 0, 5, 0)
+				[
+					SNew( SButton)
+					.Text(FText::FromString("Save"))
+					.IsEnabled(Vehicle.IsValid())
+					.OnClicked(this, &SVehcileManagerWindow::OnSave)
+				]
+				+ SHorizontalBox::Slot()
+				[
+					SNew( SButton)
+					.Text(FText::FromString("Load"))
+					.IsEnabled(Vehicle.IsValid())
+					.OnClicked(this, &SVehcileManagerWindow::OnLoad)
+				]
+			]
+		]
+	];
+
+	UpdateSlots();
+}
+
+TSharedRef<ITableRow> SVehcileManagerWindow::OnGenerateRow(TSharedPtr<FVechicleSaveAddress> Address, const TSharedRef< STableViewBase >& OwnerTable)
+{
+	auto Row = SNew(STableRow<TSharedPtr<FString>>, OwnerTable);
+	Row->ConstructChildren(OwnerTable->TableViewMode, FMargin(1),
+		SNew(SHorizontalBox)
+		+ SHorizontalBox::Slot()
+		.FillWidth(1.0)
+		[
+			SNew(STextBlock)
+			.Text(FText::FromString(Address->ToVehicleName()))
+		]
+		+ SHorizontalBox::Slot()
+		.AutoWidth()
+		[
+			SNew(SButton)
+			.ButtonStyle(FSodaStyle::Get(), "MenuWindow.DeleteButton")
+			.OnClicked(this, &SVehcileManagerWindow::OnDeleteSlot, Address)
+			.ButtonColorAndOpacity_Lambda([Row]()
+			{
+				return Row->IsHovered() ? FLinearColor(1, 1, 1, 1) : FLinearColor(1, 1, 1, 0);
+			})
+		]
+	);
+
+	return Row;
+}
+
+FReply SVehcileManagerWindow::OnDeleteSlot(TSharedPtr<FVechicleSaveAddress> Address)
+{
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		TSharedPtr<soda::SMessageBox> MsgBox = GameMode->ShowMessageBox(
+			soda::EMessageBoxType::YES_NO_CANCEL, 
+			"Delete Vehicle", 
+			"Are you sure you want to delete the \"" + Address->ToVehicleName() + "\" vehicle?");
+		MsgBox->SetOnMessageBox(soda::FOnMessageBox::CreateLambda([this, Address](soda::EMessageBoxButton Button)
+		{
+			if (Button == soda::EMessageBoxButton::YES)
+			{
+				if (!ASodaVehicle::DeleteVehicleSave(*Address))
+				{
+					FSlateNotificationManager& NotificationManager = FSlateNotificationManager::Get();
+					FNotificationInfo Info(FText::FromString(TEXT("Can't delete the vehicle data: ") + Address->ToUrl()));
+					Info.ExpireDuration = 5.0f;
+					Info.Image = FCoreStyle::Get().GetBrush(TEXT("Icons.WarningWithColor"));
+					NotificationManager.AddNotification(Info);
+				}
+				UpdateSlots();
+			}
+		}));
+	}
+	return FReply::Handled();
+}
+
+FReply SVehcileManagerWindow::OnNewSave()
+{
+	if (Vehicle.IsValid())
+	{
+		FVechicleSaveAddress Address =
+			Source == EVehicleManagerSource::Local ?
+			FVechicleSaveAddress(EVehicleSaveSource::JsonLocal, EditableTextBox->GetText().ToString()) : 
+			FVechicleSaveAddress(EVehicleSaveSource::DB, EditableTextBox->GetText().ToString());
+
+		if (!Vehicle->SaveToAddress(Address, true))
+		{
+			if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+			{
+				TSharedPtr<soda::SMessageBox> MsgBox = GameMode->ShowMessageBox(
+					soda::EMessageBoxType::OK, "Error", "Can't save vehilce");
+			}
+		}
+	}
+	CloseWindow();
+	return FReply::Handled();
+}
+
+void SVehcileManagerWindow::UpdateSlots()
+{
+	SavedVehicles.Empty();
+
+	TArray<FVechicleSaveAddress> Addresses;
+	if (Source == EVehicleManagerSource::Local)
+	{
+		ASodaVehicle::GetSavedVehiclesLocal(Addresses);
+	}
+	else
+	{
+		if (!ASodaVehicle::GetSavedVehiclesDB(Addresses))
+		{
+			USodaGameModeComponent::GetChecked()->ShowMessageBox(soda::EMessageBoxType::OK, "Error", "MongoDB error. See log for more information");
+		}
+	}
+
+	for (auto& It : Addresses)
+	{
+		SavedVehicles.Add(MakeShared<FVechicleSaveAddress>(It));
+	}
+
+	if (Vehicle.IsValid())
+	{
+		for (auto& It : SavedVehicles)
+		{
+			if (*It == Vehicle->GetSaveAddress()) 
+			{
+				ListView->SetSelection(It);
+				break;
+			}
+		}
+	}
+
+	ListView->RequestListRefresh();
+}
+
+TSharedRef<SWidget> SVehcileManagerWindow::GetComboMenuContent()
+{
+	FMenuBuilder MenuBuilder(
+		/*bShouldCloseWindowAfterMenuSelection*/ true, 
+		/* InCommandList = */nullptr, 
+		/* InExtender = */nullptr, 
+		/*bCloseSelfOnly*/ false,
+		&FSodaStyle::Get());
+
+	MenuBuilder.BeginSection(NAME_None);
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([this]() 
+		{
+			SetSource(EVehicleManagerSource::Remote);
+			UpdateSlots();
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Remote")),
+			FText::FromString(TEXT("Remote")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.Server"),
+			Action);
+	}
+
+	{
+		FUIAction Action;
+		Action.ExecuteAction.BindLambda([this]() 
+		{
+			SetSource(EVehicleManagerSource::Local);
+			UpdateSlots();
+		});
+		MenuBuilder.AddMenuEntry(
+			FText::FromString(TEXT("Local")),
+			FText::FromString(TEXT("Local")),
+			FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "Icons.FolderClosed"),
+			Action);
+	}
+
+	MenuBuilder.EndSection();
+
+	return MenuBuilder.MakeWidget();
+}
+
+void SVehcileManagerWindow::OnSelectionChanged(TSharedPtr<FVechicleSaveAddress> Address, ESelectInfo::Type SelectInfo)
+{
+	if (Address)
+	{
+		EditableTextBox->SetText(FText::FromString(Address->ToVehicleName()));
+		//SaveButton->SetEnabled(true);
+		//LoadButton->SetEnabled(true);
+	}
+	else
+	{
+		EditableTextBox->SetText(FText::GetEmpty());
+		//SaveButton->SetEnabled(false);
+		//LoadButton->SetEnabled(false);
+	}
+}
+
+FReply SVehcileManagerWindow::OnSave()
+{
+	if (Vehicle.IsValid())
+	{
+		TSharedPtr<FVechicleSaveAddress> Address;
+		if (ListView->GetSelectedItems().Num() == 1) Address = *ListView->GetSelectedItems().begin();
+		if (Address)
+		{
+			if (!Vehicle->Resave())
+			{
+				if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+				{
+					TSharedPtr<soda::SMessageBox> MsgBox = GameMode->ShowMessageBox(
+						soda::EMessageBoxType::OK, "Error", "Can't save vehilce");
+				}
+			}
+		}
+	}
+	CloseWindow();
+	return FReply::Handled();
+}
+
+FReply SVehcileManagerWindow::OnLoad()
+{
+	if (Vehicle.IsValid())
+	{
+		TSharedPtr<FVechicleSaveAddress> Address;
+		if (ListView->GetSelectedItems().Num() == 1) Address = *ListView->GetSelectedItems().begin();
+		if (Address)
+		{
+			Vehicle->RespawnVehcileFromAddress(*Address, FVector(0, 0, 20), FRotator::ZeroRotator, true);
+		}
+	}
+	CloseWindow();
+	return FReply::Handled();
+}
+
+} // namespace soda
+
diff --git a/Source/UnrealSoda/Private/UI/Wnds/SVehcileManagerWindow.h b/Source/UnrealSoda/Private/UI/Wnds/SVehcileManagerWindow.h
new file mode 100644
index 0000000..edd088f
--- /dev/null
+++ b/Source/UnrealSoda/Private/UI/Wnds/SVehcileManagerWindow.h
@@ -0,0 +1,59 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SMenuWindow.h"
+#include "Templates/SharedPointer.h"
+#include "Widgets/Views/SListView.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class SEditableTextBox;
+class ASodaVehicle;
+struct FVechicleSaveAddress;
+class STableViewBase;
+
+class ITableRow;
+
+namespace soda
+{
+
+enum class EVehicleManagerSource
+{
+	Local,
+	Remote
+};
+
+class SVehcileManagerWindow : public SMenuWindowContent
+{
+public:
+	SLATE_BEGIN_ARGS(SVehcileManagerWindow)
+	{}
+	SLATE_END_ARGS()
+	
+	virtual ~SVehcileManagerWindow() {}
+	void Construct( const FArguments& InArgs, ASodaVehicle* Vehicle);
+
+	EVehicleManagerSource GetSource() const { return Source; }
+	void SetSource(EVehicleManagerSource InSource) { Source = InSource; }
+
+protected:
+	void UpdateSlots();
+
+	TSharedRef<ITableRow> OnGenerateRow(TSharedPtr<FVechicleSaveAddress> Address, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnSelectionChanged(TSharedPtr<FVechicleSaveAddress> Address, ESelectInfo::Type SelectInfo);
+
+	FReply OnNewSave();
+	FReply OnSave();
+	FReply OnLoad();
+	FReply OnDeleteSlot(TSharedPtr<FVechicleSaveAddress> Address);
+	TSharedRef<SWidget> GetComboMenuContent();
+
+	TSharedPtr<SListView<TSharedPtr<FVechicleSaveAddress>>> ListView;
+	TSharedPtr<SEditableTextBox> EditableTextBox;
+	TArray<TSharedPtr<FVechicleSaveAddress>> SavedVehicles;
+	TWeakObjectPtr<ASodaVehicle> Vehicle;
+	EVehicleManagerSource Source = EVehicleManagerSource::Local;
+};
+
+} // namespace
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/UnrealSoda.cpp b/Source/UnrealSoda/Private/UnrealSoda.cpp
new file mode 100644
index 0000000..126b82c
--- /dev/null
+++ b/Source/UnrealSoda/Private/UnrealSoda.cpp
@@ -0,0 +1,186 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Soda/UI/SodaViewportCommands.h"
+#include "RuntimeEditorModule.h"
+#include "Customization/SoftSodaActorPtrCustomization.h"
+#include "Customization/SoftSodaVehicleComponentPtrCustomization.h"
+#include "Customization/SubobjectReferenceCustomization.h"
+#include "RuntimePropertyEditor/PropertyHandle.h"
+#include "Interfaces/IPluginManager.h"
+#include "HAL/PlatformProcess.h"
+#include "Misc/Paths.h"
+#include "Soda/Vehicles/ISodaVehicleExporter.h"
+#include "Soda/Misc/JsonArchive.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Misc/SodaVehicleCommonExporter.h"
+
+#define LOCTEXT_NAMESPACE "FUnrealSodaModule"
+
+class FSodaVehicleJSONExporter : public ISodaVehicleExporter
+{
+public:
+	virtual bool ExportToString(const ASodaVehicle* Vehicle, FString& String) override
+	{
+		FJsonActorArchive Ar;
+		if (Ar.SerializeActor(const_cast<ASodaVehicle*>(Vehicle), true))
+		{
+			if (!Ar.SaveToString(String))
+			{
+				UE_LOG(LogSoda, Error, TEXT("FSodaVehicleJSONExporter::ExportToString(); Can't serialize"));
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+		else
+		{
+			UE_LOG(LogSoda, Error, TEXT("FSodaVehicleJSONExporter::ExportToString(); Can't save to string"));
+			return false;
+		}
+	}
+
+	virtual const FString& GetExporterName() const override { return ExporterName; }
+	virtual const FString& GetFileTypes() const override { return ExporterFileType; }
+
+	static const FString ExporterName;
+	static const FString ExporterFileType;
+};
+
+const FString FSodaVehicleJSONExporter::ExporterName = TEXT("Soda JSON Vehicles");
+const FString FSodaVehicleJSONExporter::ExporterFileType = TEXT("Soda JSON Vehicles (*.json)|*.json");
+
+
+void FUnrealSodaModule::StartupModule()
+{
+#if PLATFORM_WINDOWS
+	FString DllDirectory = FPaths::Combine(IPluginManager::Get().FindPlugin(TEXT("SodaSim"))->GetBaseDir(), TEXT("/Binaries/Win64"));
+	TArray<FString> DllNames = { "libsodium.dll", "libzmq-v141-mt-4_3_2.dll", "SDL2.dll" };
+	FPlatformProcess::PushDllDirectory(*DllDirectory);
+
+	for (auto& It : DllNames)
+	{
+		FString DllPath = FPaths::Combine(DllDirectory, It);
+		void * LibHandle = FPlatformProcess::GetDllHandle(*DllPath);
+		if (LibHandle == nullptr)
+		{
+			UE_LOG(LogSoda, Fatal, TEXT("FUnrealSodaModule::StartupModule(): Failed to load required library %s. Plug-in will not be functional."), *DllPath);
+		}
+		else
+		{
+			LoadedDlls.Add(LibHandle);
+		}
+	}
+	FPlatformProcess::PopDllDirectory(*DllDirectory);
+#endif
+
+	FModuleManager::LoadModuleChecked<IModuleInterface>("SodaStyle");
+	FRuntimeEditorModule& PropertyEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+
+	SodaApp.Initialize();
+	soda::FSodalViewportCommands::Register();
+
+	{
+		class FSodaActorPropertyTypeIdentifier : public soda::IPropertyTypeIdentifier
+		{
+			virtual bool IsPropertyTypeCustomized(const soda::IPropertyHandle& PropertyHandle) const override
+			{
+				const FProperty* NodeProperty = PropertyHandle.GetProperty();
+
+				const FObjectPropertyBase* ObjectProperty = CastField<const FObjectPropertyBase>(NodeProperty);
+				const FInterfaceProperty* InterfaceProperty = CastField<const FInterfaceProperty>(NodeProperty);
+
+				if ((ObjectProperty != nullptr || InterfaceProperty != nullptr)
+					&& !NodeProperty->IsA(FClassProperty::StaticClass())
+					&& !NodeProperty->IsA(FSoftClassProperty::StaticClass())
+					&& ObjectProperty->PropertyClass
+					&& ObjectProperty->PropertyClass->IsChildOf(AActor::StaticClass()))
+				{
+					return true;
+				}
+
+				return false;
+			}
+		};
+
+		PropertyEditorModule.RegisterCustomPropertyTypeLayout(
+			"SoftObjectProperty",
+			soda::FOnGetPropertyTypeCustomizationInstance::CreateStatic(&soda::FSoftSodaActorPtrCustomization::MakeInstance),
+			MakeShared<FSodaActorPropertyTypeIdentifier>()
+		);
+	}
+
+	{
+		class FSodaVehicleComponentPropertyTypeIdentifier : public soda::IPropertyTypeIdentifier
+		{
+			virtual bool IsPropertyTypeCustomized(const soda::IPropertyHandle& PropertyHandle) const override
+			{
+				const FProperty* NodeProperty = PropertyHandle.GetProperty();
+
+				const FObjectPropertyBase* ObjectProperty = CastField<const FObjectPropertyBase>(NodeProperty);
+				const FInterfaceProperty* InterfaceProperty = CastField<const FInterfaceProperty>(NodeProperty);
+
+				if ((ObjectProperty != nullptr || InterfaceProperty != nullptr)
+					&& !NodeProperty->IsA(FClassProperty::StaticClass())
+					&& !NodeProperty->IsA(FSoftClassProperty::StaticClass())
+					&& ObjectProperty->PropertyClass
+					&& ObjectProperty->PropertyClass->ImplementsInterface(USodaVehicleComponent::StaticClass()))
+				{
+					return true;
+				}
+
+				return false;
+			}
+		};
+
+		PropertyEditorModule.RegisterCustomPropertyTypeLayout(
+			"SoftObjectProperty",
+			soda::FOnGetPropertyTypeCustomizationInstance::CreateStatic(&soda::FSoftSodaVehicleComponentPtrCustomization::MakeInstance),
+			MakeShared<FSodaVehicleComponentPropertyTypeIdentifier>()
+		);
+	}
+
+	{
+		PropertyEditorModule.RegisterCustomPropertyTypeLayout(
+			"SubobjectReference",
+			soda::FOnGetPropertyTypeCustomizationInstance::CreateStatic(&soda::FSubobjectReferenceCustomization::MakeInstance)
+		);
+	}
+
+	PropertyEditorModule.NotifyCustomizationModuleChanged();
+
+	SodaApp.RegisterVehicleExporter(MakeShared<FSodaVehicleJSONExporter>());
+	SodaApp.RegisterVehicleExporter(MakeShared<FSodaVehicleCommonExporter>());
+}
+
+void FUnrealSodaModule::ShutdownModule()
+{
+	SodaApp.UnregisterVehicleExporter(FSodaVehicleJSONExporter::ExporterName);
+	SodaApp.UnregisterVehicleExporter(FSodaVehicleCommonExporter::ExporterName);
+
+	SodaApp.Release();
+
+	if (FModuleManager::Get().IsModuleLoaded("PropertyEditor"))
+	{
+		FRuntimeEditorModule& PropertyEditorModule = FModuleManager::LoadModuleChecked<FRuntimeEditorModule>("RuntimeEditor");
+		//PropertyEditorModule.UnregisterCustomPropertyTypeLayout("SoftSodaActorPtr");
+		//PropertyEditorModule.UnregisterCustomPropertyTypeLayout("SoftSodaActorPtr");
+		PropertyEditorModule.NotifyCustomizationModuleChanged();
+	}
+
+#if PLATFORM_WINDOWS
+	for (auto& It : LoadedDlls)
+	{
+		FPlatformProcess::FreeDllHandle(It);
+	}
+#endif
+}
+
+#undef LOCTEXT_NAMESPACE
+
+DEFINE_LOG_CATEGORY(LogSoda);
+IMPLEMENT_MODULE(FUnrealSodaModule, UnrealSoda)
diff --git a/Source/UnrealSoda/Private/UnrealSodaPrivatePCH.h b/Source/UnrealSoda/Private/UnrealSodaPrivatePCH.h
new file mode 100644
index 0000000..7edaa8d
--- /dev/null
+++ b/Source/UnrealSoda/Private/UnrealSodaPrivatePCH.h
@@ -0,0 +1,6 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+//#include "Soda/UnrealSoda.h"
+
+// You should place include statements to your module's private header files here.  You only need to
+// add includes for headers that are used in most of your module's source files though.
diff --git a/Source/UnrealSoda/Private/VehicleComponents/CANBus.cpp b/Source/UnrealSoda/Private/VehicleComponents/CANBus.cpp
new file mode 100644
index 0000000..b114fc6
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/CANBus.cpp
@@ -0,0 +1,275 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/CANBus.h"
+#include "Soda/VehicleComponents/CANDev.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Canvas.h"
+#include "Soda/DBC/Serialization.h"
+
+UCANBusComponent::UCANBusComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("CAN");
+	GUI.IcanName = TEXT("SodaIcons.Net");
+	GUI.ComponentNameOverride = TEXT("CAN Bus");
+	GUI.bIsPresentInAddMenu = true;
+
+	Common.bIsTopologyComponent = true;
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+void UCANBusComponent::OnPreActivateVehicleComponent()
+{
+	RegistredCANDev.Empty();
+}
+
+bool UCANBusComponent::OnActivateVehicleComponent()
+{
+	//RecvMessages.clear();
+	//SendMessages.clear();
+
+	return Super::OnActivateVehicleComponent();
+}
+
+void UCANBusComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	//RecvMessages.clear();
+	//SendMessages.clear();
+}
+
+void UCANBusComponent::RegisterCanDev(UCANDevComponent* CANDev)
+{
+	if (IsValid(CANDev))
+	{
+		RegistredCANDev.Add(CANDev);
+	}
+}
+
+int UCANBusComponent::SendFrame(const dbc::FCanFrame& CanFrame)
+{ 
+	if (bLoopFrames)
+	{
+		ProcessRecvMessage(SodaApp.GetRealtimeTimestamp(), CanFrame);
+	}
+
+	for (auto& It : RegistredCANDev)
+	{
+		if (It->SendFrame(CanFrame) < 0)
+		{
+			++PkgSentErr;
+		}
+	}
+
+	++PkgSent;
+
+	return -1;
+}
+
+/*
+int UCANBusComponent::SendFrame(const dbc::FCANMessage* Msg)
+{
+	dbc::FCanFrame Frame;
+	Frame.Length = Msg->Serializer->GetMessageSize();
+	Frame.ID = Msg->Serializer->GetID();
+
+	
+	//if(!Msg->Ser(Msg->GetLength(), Frame.Data))
+	//{
+	//	UE_LOG(LogSoda, Error, TEXT("UCANBusComponent::SendFrame(); Can't serialize CAN_ID == %i"), Msg->GetID());
+	//	return -1;
+	//}
+	
+
+	const_cast<dbc::FCANMessage*>(Msg)->SendTimestamp = SodaApp.GetRealtimeTimestamp();
+
+	if (Msg->OnPreSend.IsBound())
+	{
+		Msg->OnPreSend.Execute(Frame);
+	}
+
+	return SendFrame(Frame);
+}
+
+int UCANBusComponent::SendFrameCustomID(const dbc::FCANMessage* Msg, int64 CustomID)
+{
+	dbc::FCanFrame Frame;
+	Frame.Length = Msg->Serializer->GetMessageSize();
+	Frame.ID = CustomID;
+
+	
+	//if(!Msg->Ser(Msg->GetLength(), Frame.Data))
+	//{
+	//	UE_LOG(LogSoda, Error, TEXT("UCANBusComponent::SendFrameCustomID(); Can't serialize CAN_ID == %i"), CustomID);
+	//	return -1;
+	//}
+	
+
+	const_cast<dbc::FCANMessage*>(Msg)->SendTimestamp = SodaApp.GetRealtimeTimestamp();
+
+	if (Msg->OnPreSend.IsBound())
+	{
+		Msg->OnPreSend.Execute(Frame);
+	}
+
+	return SendFrame(Frame);
+}
+
+int UCANBusComponent::SendFrameJ1939(const dbc::FCANMessage* Msg, int J1939Addr)
+{
+	return SendFrameCustomID(Msg, (Msg->Serializer->GetID() & 0xFFFFFF00) | (J1939Addr & 0xFF));
+}
+*/
+
+TSharedPtr<dbc::FCANMessage> UCANBusComponent::RegRecvMsg(const FString& MessageName, int64 CAN_ID)
+{
+	auto Serializer = SodaApp.FindDBCSerializator(MessageName);
+	if (!Serializer)
+	{
+		return TSharedPtr<dbc::FCANMessageDynamic>();
+	}
+
+	CAN_ID = CAN_ID == CANID_DEFAULT ? Serializer->GetID() : CAN_ID;
+
+	if (auto it = RecvMessages.find(CAN_ID); it != RecvMessages.end())
+	{
+		return it->second;
+	}
+	else
+	{
+		auto Msg = MakeShared<dbc::FCANMessageDynamic>(CAN_ID, Serializer);
+		RecvMessages[CAN_ID] = Msg;
+		return Msg;
+	}
+}
+
+TSharedPtr<dbc::FCANMessage> UCANBusComponent::RegSendMsg(const FString& MessageName, int64 CAN_ID)
+{
+	auto Serializer = SodaApp.FindDBCSerializator(MessageName);
+	if (!Serializer)
+	{
+		return TSharedPtr<dbc::FCANMessageDynamic>();
+	}
+
+	CAN_ID = CAN_ID == CANID_DEFAULT ? Serializer->GetID() : CAN_ID;
+
+	if (auto it = SendMessages.find(CAN_ID); it != SendMessages.end())
+	{
+		return it->second;
+	}
+	else
+	{
+		auto Msg = MakeShared<dbc::FCANMessageDynamic>(CAN_ID, Serializer);
+		SendMessages[CAN_ID] = Msg;
+		return Msg;
+	}
+}
+
+void UCANBusComponent::UnregRecvMsg(int64 CAN_ID)
+{
+	RecvMessages.erase(CAN_ID);
+}
+
+void UCANBusComponent::UnregSendMsg(int64 CAN_ID)
+{
+	SendMessages.erase(CAN_ID);
+}
+
+TSharedPtr<dbc::FCANMessage> UCANBusComponent::RegRecvMsgJ1939(const FString& MessageName, uint8 SourceAddress)
+{ 
+	if (auto Serializer = SodaApp.FindDBCSerializator(MessageName))
+	{
+		return RegRecvMsg(MessageName, (Serializer->GetID() & 0x3FFFF00) | SourceAddress);
+	}
+	else
+	{
+		return TSharedPtr<dbc::FCANMessageDynamic>();
+	}
+}
+
+TSharedPtr<dbc::FCANMessage> UCANBusComponent::RegSendMsgJ1939(const FString& MessageName, uint8 SourceAddress)
+{ 
+	if (auto Serializer = SodaApp.FindDBCSerializator(MessageName))
+	{
+		return RegSendMsg(MessageName, (Serializer->GetID() & 0x3FFFF00) | SourceAddress);
+	}
+	else
+	{
+		return TSharedPtr<dbc::FCANMessageDynamic>();
+	}
+}
+
+void UCANBusComponent::UnregRecvMsgJ1939(const FString& MessageName, uint8 SourceAddress)
+{ 
+	if (auto Serializer = SodaApp.FindDBCSerializator(MessageName))
+	{
+		UnregRecvMsg(Serializer->GetID() & (0x3FFFF00 | SourceAddress));
+	}
+}
+
+void UCANBusComponent::UnregSendMsgJ1939(const FString& MessageName, uint8 SourceAddress)
+{ 
+	if (auto Serializer = SodaApp.FindDBCSerializator(MessageName))
+	{
+		UnregSendMsg((Serializer->GetID() & 0x3FFFF00) | SourceAddress);
+	}
+}
+
+bool UCANBusComponent::ProcessRecvMessage(const TTimestamp& Timestamp, const dbc::FCanFrame & CanFrame)
+{
+	++PkgReceived;
+
+	RecvDelegate.Broadcast(Timestamp, CanFrame);
+
+	// Try to find msg by pure CAN ID
+	auto It = RecvMessages.find(CanFrame.ID);
+
+	// Try to find J1939 msg by PGN + source address
+	if (It == RecvMessages.end())
+	{
+		It = RecvMessages.find(CanFrame.ID & 0x3FFFFFF);
+	}
+
+	// Try to find J1939 msg by broadcast PGN 
+	if (It == RecvMessages.end())
+	{
+		It = RecvMessages.find((CanFrame.ID & 0x3FFFF00) | 0xFE);
+	}
+
+	if(It != RecvMessages.end())
+	{
+		It->second->RecvTimestamp = Timestamp;
+		It->second->Frame = CanFrame;
+		It->second->OnAfterRecv();
+		++PkgDecoded;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+void UCANBusComponent::GetRemark(FString& Info) const
+{
+}
+
+void UCANBusComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Registred send msgs: %d"), RecvMessages.size()), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Registred recv msgs: %d"), SendMessages.size()), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("PkgSent: %d"), PkgSent), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("PkgReceived: %d"), PkgReceived), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("PkgSentErr: %d"), PkgSentErr), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("PkgDecoded: %d"), PkgDecoded), 16, YPos);
+	}
+}
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/CANDev.cpp b/Source/UnrealSoda/Private/VehicleComponents/CANDev.cpp
new file mode 100644
index 0000000..15c0ac1
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/CANDev.cpp
@@ -0,0 +1,78 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/CANDev.h"
+#include "Soda/VehicleComponents/CANBus.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Canvas.h"
+#include "Soda/DBC/Serialization.h"
+
+UCANDevComponent::UCANDevComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("CAN");
+	GUI.IcanName = TEXT("SodaIcons.CAN");
+
+	Common.bIsTopologyComponent = true;
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+bool UCANDevComponent::OnActivateVehicleComponent()
+{
+	CANBus = LinkToCANBus.GetObject<UCANBusComponent>(GetOwner());
+	if (!CANBus)
+	{
+		SetHealth(EVehicleComponentHealth::Warning, TEXT("CAN bus isn't connectd"));
+	}
+	else
+	{
+		CANBus->RegisterCanDev(this);
+	}
+
+	//RecvMessages.clear();
+	//SendMessages.clear();
+
+	return Super::OnActivateVehicleComponent();
+}
+
+void UCANDevComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	CANBus = nullptr;
+
+	//RecvMessages.clear();
+	//SendMessages.clear();
+}
+
+int UCANDevComponent::SendFrame(const dbc::FCanFrame& CanFrame) 
+{ 
+	return -1;
+}
+
+void UCANDevComponent::ProcessRecvMessage(const TTimestamp& Timestamp, const dbc::FCanFrame& CanFrame)
+{
+	if (CANBus)
+	{
+		CANBus->ProcessRecvMessage(Timestamp, CanFrame);
+	}
+}
+
+
+void UCANDevComponent::GetRemark(FString& Info) const
+{
+	Info = "Bus:" + LinkToCANBus.PathToSubobject;
+}
+
+void UCANDevComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Bus: %s"), *LinkToCANBus.PathToSubobject), 16, YPos);
+		
+	}
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Drivers/VehicleDriverGenericComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Drivers/VehicleDriverGenericComponent.cpp
new file mode 100644
index 0000000..5ba0ec8
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Drivers/VehicleDriverGenericComponent.cpp
@@ -0,0 +1,330 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Drivers/VehicleDriverGenericComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Engine.h"
+#include "Engine/Canvas.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleSteeringComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleEngineComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleGearBoxComponent.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/LevelState.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include <cmath>
+
+
+static inline float NormAng(float a)
+{
+	return (a > M_PI) ? (a - 2.0 * M_PI) : ((a < -M_PI) ? (a + 2 * M_PI) : a);
+}
+
+UVehicleDriverGenericComponent::UVehicleDriverGenericComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("General UDP");
+	GUI.bIsPresentInAddMenu = true;
+
+	TickData.bAllowVehiclePrePhysTick = true;
+	TickData.bAllowVehiclePostDeferredPhysTick = true;
+
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+bool UVehicleDriverGenericComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (!GetWheeledVehicle()->Is4WDVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Support only 4WD vehicles"));
+		return false;
+	}
+
+	Shutdown();
+
+	Engine = LinkToEngine.GetObject<UVehicleEngineBaseComponent>(GetOwner()); 
+	SteeringRack = LinkToSteering.GetObject<UVehicleSteeringRackBaseComponent>(GetOwner());
+	BrakeSystem = LinkToBrakeSystem.GetObject<UVehicleBrakeSystemBaseComponent>(GetOwner());
+	HandBrake = LinkToHandBrake.GetObject<UVehicleHandBrakeBaseComponent>(GetOwner());
+	GearBox = LinkToGearBox.GetObject<UVehicleGearBoxBaseComponent>(GetOwner());
+
+	//Send socket
+	Publisher.Advertise();
+	if (!Publisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Warning, TEXT("Can't init SendSocket"));
+		return false;
+	}
+
+	//Recv socket
+	FIPv4Endpoint Endpoint(FIPv4Address(0, 0, 0, 0), RecvPort);
+	ListenSocket = FUdpSocketBuilder(TEXT("PathViwer"))
+					   .AsNonBlocking()
+					   .AsReusable()
+					   .BoundToEndpoint(Endpoint)
+					   .WithReceiveBufferSize(0xFFFF);
+	check(ListenSocket);
+	FTimespan ThreadWaitTime = FTimespan::FromMilliseconds(100);
+	UDPReceiver = new FUdpSocketReceiver(ListenSocket, ThreadWaitTime, TEXT("VApiUdp"));
+	check(UDPReceiver);
+	UDPReceiver->OnDataReceived().BindUObject(this, &UVehicleDriverGenericComponent::Recv);
+	UDPReceiver->Start();
+
+	if (!Engine)
+	{
+		AddDebugMessage(EVehicleComponentHealth::Error, TEXT("Engine  isn't connected"));
+	}
+
+	if (!BrakeSystem)
+	{
+		AddDebugMessage(EVehicleComponentHealth::Error, TEXT("Brake system isn't connected"));
+	}
+
+	if (!SteeringRack)
+	{
+		AddDebugMessage(EVehicleComponentHealth::Error, TEXT("Steering rack isn't connected"));
+	}
+
+	if (!HandBrake)
+	{
+		AddDebugMessage(EVehicleComponentHealth::Error, TEXT("Hand brake isn't connected"));
+	}
+
+	if (!GearBox)
+	{
+		AddDebugMessage(EVehicleComponentHealth::Error, TEXT("GearBox isn't connected"));
+	}
+
+	if (!Engine || !SteeringRack || !BrakeSystem || !HandBrake)
+	{
+		SetHealth(EVehicleComponentHealth::Warning);
+	}
+
+	return true;
+}
+
+void UVehicleDriverGenericComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	Shutdown();
+}
+
+void UVehicleDriverGenericComponent::Shutdown()
+{
+	if (UDPReceiver)
+	{
+		UDPReceiver->Stop();
+		delete UDPReceiver;
+	}
+	UDPReceiver = 0;
+
+	if (ListenSocket)
+	{
+		ListenSocket->Close();
+		delete ListenSocket;
+	}
+	ListenSocket = 0;
+
+	Publisher.Shutdown();
+
+	Engine = nullptr;
+	SteeringRack = nullptr;
+	BrakeSystem = nullptr;
+	HandBrake = nullptr;
+	GearBox = nullptr;
+}
+
+void UVehicleDriverGenericComponent::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	Super::PostPhysicSimulationDeferred(DeltaTime, VehicleKinematic, Timestamp);
+
+	if (HealthIsWorkable())
+	{
+		FTransform WorldPose;
+		FVector WorldVel;
+		FVector LocalAcc;
+		FVector Gyro;
+		VehicleKinematic.CalcIMU(GetRelativeTransform(), WorldPose, WorldVel, LocalAcc, Gyro);
+		FRotator WorldRot = WorldPose.Rotator();
+		FVector WorldLoc = WorldPose.GetTranslation();
+		FVector LocVel = WorldRot.UnrotateVector(WorldVel);
+		double Lon, Lat, Alt;
+		GetLevelState()->GetLLConverter().UE2LLA(WorldLoc, Lon, Lat, Alt);
+
+		static auto ToSodaVec = [](const FVector& V) { return soda::Vector{ V.X, -V.Y, V.Z }; };
+		static auto ToSodaRot = [](const FVector& V) { return soda::Vector{ -V.X, V.Y, -V.Z }; };
+
+		soda::GenericVehicleState MsgOut {};
+		MsgOut.navigation_state.timestamp = soda::RawTimestamp<std::chrono::nanoseconds>(Timestamp);
+		MsgOut.navigation_state.longitude = Lon;
+		MsgOut.navigation_state.latitude = Lat;
+		MsgOut.navigation_state.altitude = Alt;
+		MsgOut.navigation_state.rotation.roll = -NormAngRad(WorldRot.Roll / 180.0 * M_PI);
+		MsgOut.navigation_state.rotation.pitch = NormAngRad(WorldRot.Pitch / 180.0 * M_PI);
+		MsgOut.navigation_state.rotation.yaw = -NormAngRad(WorldRot.Yaw / 180.0 * M_PI);
+		MsgOut.navigation_state.position = ToSodaVec(WorldLoc * 0.01);
+		MsgOut.navigation_state.world_velocity = ToSodaVec(WorldVel * 0.01);
+		MsgOut.navigation_state.loc_velocity = ToSodaVec(LocVel * 0.01);
+		MsgOut.navigation_state.angular_velocity = ToSodaRot(Gyro);
+		MsgOut.navigation_state.acceleration = ToSodaVec(LocalAcc * 0.01);
+		MsgOut.steer = SteeringRack ? -SteeringRack->GetCurrentSteer() : 0;
+		MsgOut.gear = soda::EGear(GetGear());
+		MsgOut.mode = soda::EControlMode(GetDriveMode());
+		for (int i = 0; i < 4; i++)
+		{
+			USodaVehicleWheelComponent* Wheel = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex(i));
+			MsgOut.wheels_state[i].ang_vel = Wheel->AngularVelocity;
+			MsgOut.wheels_state[i].torq = Wheel->ReqTorq;
+			MsgOut.wheels_state[i].brake_torq = Wheel->ReqBrakeTorque;
+		}
+		Publisher.Publish(MsgOut);
+	}
+}
+
+void UVehicleDriverGenericComponent::PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	Super::PrePhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+
+	static const std::chrono::nanoseconds Timeout(500000000ll); // 500ms
+
+	bVapiPing = bIsVehicleDriveDebugMode || ((SodaApp.GetRealtimeTimestamp() - RecvTimestamp > Timeout));
+
+	UVehicleInputComponent* VehicleInput = GetWheeledVehicle()->GetActiveVehicleInput();
+
+	if (VehicleInput)
+	{
+		bIsADMode = VehicleInput->bADModeInput;
+	}
+	
+	if (GetDriveMode() == ESodaVehicleDriveMode::Manual || GetDriveMode() == ESodaVehicleDriveMode::ReadyToAD) // Manual mode
+	{
+		if (VehicleInput)
+		{
+			Gear = VehicleInput->GetGearInput();
+			float SteerReq = VehicleInput->GetSteeringInput();
+			float ThrottleReq = VehicleInput->GetThrottleInput();
+			float BrakeReq = VehicleInput->GetBrakeInput();
+			float HandBrakeReq = 0;
+
+			switch (Gear)
+			{
+			case ENGear::Neutral:
+				ThrottleReq = 0;
+				break;
+			case ENGear::Drive:
+			case ENGear::Reverse:
+				break;
+			case ENGear::Park:
+				ThrottleReq = 0;
+				BrakeReq = 0;
+				HandBrakeReq = 1;
+			}
+
+			if (GearBox) GearBox->SetGear(Gear);
+			if (Engine) Engine->RequestByRatio(ThrottleReq);
+			if (BrakeSystem) BrakeSystem->RequestByRatio(BrakeReq, DeltaTime);
+			if (SteeringRack) SteeringRack->RequestByRatio(SteerReq);
+			if (HandBrake) HandBrake->RequestByRatio(HandBrakeReq);
+		}
+	}
+	else if ((GetDriveMode() == ESodaVehicleDriveMode::SafeStop) || (GetDriveMode() == ESodaVehicleDriveMode::AD && !bVapiPing)) // SafeStop mode
+	{
+		if (GearBox) GearBox->SetGear(ENGear::Neutral);
+		if (Engine) Engine->RequestByRatio(0.0);
+		if (BrakeSystem) BrakeSystem->RequestByRatio(0.0, DeltaTime);
+		if (SteeringRack) SteeringRack->RequestByRatio(0.0);
+		if (HandBrake) HandBrake->RequestByRatio(1.0);
+	}
+	else // AD mode
+	{
+		Gear = (ENGear)MsgIn.gear_req;
+		float SteerReq = -MsgIn.steer_req;
+		float AccReq = 0;
+		float DeaccReq = 0;
+		float HandBrakeReq = 0;
+
+		if (MsgIn.acc_decel_req >= 0)
+		{
+			AccReq = MsgIn.acc_decel_req;
+		}
+		else
+		{
+			DeaccReq = -MsgIn.acc_decel_req;
+		}
+
+		switch (Gear)
+		{
+		case ENGear::Neutral:
+			AccReq = 0;
+			break;
+		case ENGear::Drive:
+		case ENGear::Reverse:
+			break;
+		case ENGear::Park:
+			AccReq = 0;
+			DeaccReq = 0;
+			HandBrakeReq = 1;
+			break;
+		}
+
+		if (GearBox) GearBox->SetGear(Gear);
+		if (Engine) Engine->RequestByTorque(AccReq / EngineToWheelsRatio * VehicleWheelRadius / 100.0);
+		if (BrakeSystem) BrakeSystem->RequestByAcceleration(DeaccReq, DeltaTime);
+		if (SteeringRack) SteeringRack->RequestByAngle(SteerReq);
+		if (HandBrake) HandBrake->RequestByRatio(HandBrakeReq);
+	}
+}
+
+ESodaVehicleDriveMode UVehicleDriverGenericComponent::GetDriveMode() const
+{
+	UVehicleInputComponent* VehicleInput = GetWheeledVehicle()->GetActiveVehicleInput();
+
+	if (!VehicleInput || VehicleInput->bSafeStopInput) return ESodaVehicleDriveMode::SafeStop;
+
+	if (bVapiPing)
+	{
+
+		if (VehicleInput->bADModeInput) return  ESodaVehicleDriveMode::AD;
+		else return ESodaVehicleDriveMode::ReadyToAD;
+
+	}
+
+	if (VehicleInput->bADModeInput) return ESodaVehicleDriveMode::SafeStop;
+	
+	return ESodaVehicleDriveMode::Manual;
+}
+
+void UVehicleDriverGenericComponent::Recv(const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt)
+{	
+	if (ArrayReaderPtr->Num() == sizeof(MsgIn))
+	{
+		::memcpy(&MsgIn, ArrayReaderPtr->GetData(), ArrayReaderPtr->Num());
+		RecvTimestamp = SodaApp.GetRealtimeTimestamp();
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("UVehicleDriverGenericComponent::Recv(); Got %i bytes, expected %i"), ArrayReaderPtr->Num(), sizeof(MsgIn));
+	}
+}
+
+void UVehicleDriverGenericComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas && GetHealth() != EVehicleComponentHealth::Disabled)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("SteerReq: %.2f"), MsgIn.steer_req), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("AccDecelReq: %.1f"), MsgIn.acc_decel_req), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("GearReq: %d"), (int)MsgIn.gear_req), 16, YPos);
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputAIComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputAIComponent.cpp
new file mode 100644
index 0000000..1053578
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputAIComponent.cpp
@@ -0,0 +1,720 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Actors/NavigationRoute.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "EngineUtils.h"
+#include "Components/CapsuleComponent.h"
+#include "GameFramework/Character.h"
+#include "GameFramework/Pawn.h"
+#include "DrawDebugHelpers.h"
+#include "Kismet/GameplayStatics.h"
+#include "Soda/SodaStatics.h"
+#include "Engine/Canvas.h"
+#include "VehicleUtility.h"
+#include "WheeledVehiclePawn.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+
+#define _DEG2RAD(a) ((a) / (180.0 / M_PI))
+#define _RAD2DEG(a) ((a) * (180.0 / M_PI))
+
+DECLARE_STATS_GROUP(TEXT("UVehicleInputAIComponent"), STATGROUP_UWheeledVehicleAIControllerComponent, STATGROUP_Advanced);
+DECLARE_CYCLE_STAT(TEXT("TickComponent"), STAT_AI_TickComponent, STATGROUP_UWheeledVehicleAIControllerComponent);
+DECLARE_CYCLE_STAT(TEXT("CalcStreeringValue"), STAT_AI_CalcStreeringValue, STATGROUP_UWheeledVehicleAIControllerComponent);
+DECLARE_CYCLE_STAT(TEXT("GetDistanceToObstacle"), STAT_AI_GetDistanceToObstacle, STATGROUP_UWheeledVehicleAIControllerComponent);
+DECLARE_CYCLE_STAT(TEXT("CalcSpeedValue"), STAT_AI_CalcSpeedValue, STATGROUP_UWheeledVehicleAIControllerComponent);
+DECLARE_CYCLE_STAT(TEXT("FindInputKeyClosestToWorldLocation"), STAT_AI_FindInputKeyClosestToWorldLocation, STATGROUP_UWheeledVehicleAIControllerComponent);
+DECLARE_CYCLE_STAT(TEXT("GetDirectionAtSplineInputKey"), STAT_AI_GetDirectionAtSplineInputKey, STATGROUP_UWheeledVehicleAIControllerComponent);
+
+static float GetDistanceFromLineToPoint(FVector Start, FVector End, FVector Pnt, bool LimitByLineEnd)
+{
+	FVector Line = (End - Start);
+	float Len = Line.Size();
+	Line.Normalize();
+
+	FVector v = Pnt - Start;
+	float d = FVector::DotProduct(v, Line);
+	if (LimitByLineEnd)
+		d = FMath::Clamp(d, 0.f, Len);
+	return (Pnt - (Start + Line * d)).Size();
+}
+
+UVehicleInputAIComponent::UVehicleInputAIComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("AI");
+	GUI.IcanName = TEXT("SodaIcons.AI");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	bTickInEditor = false;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+
+	InputType = EVehicleInputType::AI;
+}
+
+bool UVehicleInputAIComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	ResetAutopilot();
+
+	return true;
+}
+
+void UVehicleInputAIComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UVehicleInputAIComponent::BeginPlay()
+{
+	Super::BeginPlay();
+
+	RouteSpline = NewObject< USplineComponent >(GetWorld());
+	RouteSpline->RegisterComponentWithWorld(GetWorld());
+}
+
+void UVehicleInputAIComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	if (bForceUpdateInputStates && GetWheeledVehicle()->GetActiveVehicleInput() != this)
+	{
+		UpdateInputStatesInner(DeltaTime);
+	}
+}
+
+void UVehicleInputAIComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	if (IsValid(RouteSpline))
+	{
+		RouteSpline->DestroyComponent();
+	}
+}
+
+void UVehicleInputAIComponent::ResetAutopilot()
+{
+	TargetLocations.Reset(0);
+}
+
+bool UVehicleInputAIComponent::TryToStartRandomRoute()
+{
+	//TODO: Check this code insted previews
+	TSet< AActor* > OverlappingActors;
+	GetVehicle()->GetOverlappingActors(OverlappingActors, ANavigationRoute::StaticClass());
+	for (auto & It : OverlappingActors)
+	{
+		ANavigationRoute* RoutePlanner = Cast<ANavigationRoute>(It);
+		if (RoutePlanner && RoutePlanner->bAllowForVehicles)
+		{
+			return AssignRoute(RoutePlanner);
+		}
+	}
+	
+
+	/*
+	for (TActorIterator< ANavigationRoute > It(GetWorld()); It; ++It)
+	{
+		ANavigationRoute* RoutePlanner = *It;
+
+		if (RoutePlanner->bAllowForVehicles)
+		{
+			// Check if we are inside this route planner.
+			TSet< AActor* > OverlappingActors;
+			RoutePlanner->TriggerVolume->GetOverlappingActors(OverlappingActors, ASodaWheeledVehicle::StaticClass());
+			for (auto* Actor : OverlappingActors)
+			{
+				if (Actor == GetVehicle())
+				{
+					return AssignRoute(RoutePlanner);
+				}
+			}
+		}
+	}
+	*/
+
+	return false;
+}
+
+bool UVehicleInputAIComponent::TryToFindNearestRoute()
+{
+	USplineComponent * NearestSpline = nullptr;
+	float NearestDistance = TNumericLimits< float >::Max();
+	float NearestSplineKey = 0;
+	float NearestSplineKeyDistance = 0;
+
+	FVector VehicleLocation = GetVehicle()->GetActorLocation();
+	FVector VehicleForwardVector = GetVehicle()->GetActorForwardVector();
+
+	for (TActorIterator< ANavigationRoute > It(GetWorld()); It; ++It)
+	{
+		if ((*It)->bAllowForVehicles)
+		{
+			float Key = (*It)->Spline->FindInputKeyClosestToWorldLocation(VehicleLocation);
+			FVector Location = (*It)->Spline->GetLocationAtSplineInputKey(Key, ESplineCoordinateSpace::World);
+			FVector Direction = (*It)->Spline->GetDirectionAtSplineInputKey(Key, ESplineCoordinateSpace::World);
+
+			float Distance = (VehicleLocation - Location).Size();
+			float Angle = FMath::Acos(VehicleForwardVector.CosineAngle2D(Direction));
+
+			if ((Distance < 200) && (Distance < NearestDistance) && (Angle < M_PI / 2))
+			{
+				float KeyDistance = USodaStatics::GetDistanceAlongSpline(Key, (*It)->Spline);
+				if ((*It)->Spline->GetSplineLength() - KeyDistance > 200)
+				{
+					NearestDistance = Distance;
+					NearestSpline = (*It)->Spline;
+					NearestSplineKey = Key;
+					NearestSplineKeyDistance = KeyDistance;
+				}
+			}
+		}
+	}
+
+	if (NearestSpline)
+	{
+		return SetFixedRouteBySpline(NearestSpline, bDriveBackvard, false, NearestSplineKeyDistance);
+	}
+	return false;
+}
+
+bool UVehicleInputAIComponent::TryToAppendRandomRoute()
+{
+	for (TActorIterator< ANavigationRoute > It(GetWorld()); It; ++It)
+	{
+		ANavigationRoute* RoutePlanner = *It;
+
+		if (RoutePlanner->bAllowForVehicles)
+		{
+			// Check if last target location is inside this route planner.
+			if (IsPointInsideBox(TargetLocations.Last(), RoutePlanner->TriggerVolume) && RoutePlanner->bDriveBackvard == bDriveBackvard)
+			{
+				return AssignRoute(RoutePlanner);
+			}
+		}
+	}
+	return false;
+}
+
+void UVehicleInputAIComponent::SetFixedRouteByWaypoints(const TArray< FVector >& Locations, bool bNewDriveBackvard, const bool bOverwriteCurrent)
+{
+	if (bOverwriteCurrent)
+	{
+		TargetLocations.Reset(0);
+	}
+
+	bDriveBackvard = bNewDriveBackvard;
+
+	for (auto& Location : Locations)
+	{
+		if (TargetLocations.Num() == 0)
+			TargetLocations.Add(Location);
+		else if ((TargetLocations.Last() - Location).Size() > SamePointsDelta)
+			TargetLocations.Add(Location);
+		else if (bDebugOutputLog)
+			if(bDebugOutputLog) UE_LOG(LogSoda, Error, TEXT("UVehicleInputAIComponent Waypoint (%f, %f, %f) purged."), Location.X, Location.Y, Location.Z);
+	}
+	RouteSpline->ClearSplinePoints(false);
+	RouteSpline->SetSplinePoints(TargetLocations, ESplineCoordinateSpace::World, true);
+	CurrentSplineSegment = -1;
+}
+
+bool UVehicleInputAIComponent::SetFixedRouteBySpline(const USplineComponent* SplineRoute, bool bNewDriveBackvard, bool bOverwriteCurrent, float StartOffset)
+{
+
+	TArray< FVector > WayPoints;
+	const float Step = 50; // Points step in [cm]
+	const auto Size = (size_t)((SplineRoute->GetSplineLength() - StartOffset) / Step);
+
+	if (Size > 1)
+	{
+		WayPoints.Reserve(Size);
+		for (auto i = 1; i < Size; ++i)
+		{
+			WayPoints.Add(SplineRoute->GetLocationAtDistanceAlongSpline(StartOffset + i * Step, ESplineCoordinateSpace::World));
+		}
+		SetFixedRouteByWaypoints(WayPoints, bNewDriveBackvard, bOverwriteCurrent);
+		return true;
+	}
+	else
+	{
+		if(bDebugOutputLog) UE_LOG(LogSoda, Error, TEXT("UVehicleInputAIComponent '%s' has a route with zero way-points."), *GetName());
+		return false;
+	}
+}
+
+void UVehicleInputAIComponent::UpdateInputStatesInner(float DeltaTime)
+{
+	if (!GetWheeledVehicle()->GetWheeledComponentInterface()) return;
+	
+	const auto Speed = Chaos::CmSToKmH(GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GetLocalVelocity().X);
+	const auto AbsSpeed = fabsf(Speed);
+	const FVector CurrentLocation = GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GlobalPose.GetLocation();
+	CurrentObstacleDistance = GetDistanceToObstacle();
+	const float TargetSpeed = CalcSpeedValue(CurrentObstacleDistance);
+	const FVector Forward = GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GlobalPose.GetRotation().Rotator().Vector() *
+		(bDriveBackvard ? -1.0 : 1.0);
+
+	// Clear target locations
+	while (TargetLocations.Num() > 0 && (TargetLocations[0] - CurrentLocation).CosineAngle2D(Forward) < 0 /*&& AbsSpeed > 1.f*/)
+	{
+		TargetLocations.RemoveAt(0);
+	}
+
+	// Append route on the end of current spline
+	if (TargetLocations.Num() > 2)
+	{
+		auto PrevLocation = CurrentLocation;
+		float DistToRouteEnd = 0;
+		for (size_t i = 0; i < TargetLocations.Num(); ++i)
+		{
+			DistToRouteEnd += FVector::Dist(TargetLocations[i], PrevLocation);
+			PrevLocation = TargetLocations[i];
+		}
+
+		const float RoutePreloadDistance = 10000.f; // [cm]
+		if (DistToRouteEnd < RoutePreloadDistance || DistToRouteEnd < GetSlowingDistance())
+		{
+			TryToAppendRandomRoute();
+		}
+	}
+
+	// Finding new spline for route
+	if (TargetLocations.Num() == 0)
+	{
+		if (!TryToStartRandomRoute())
+		{
+			TryToFindNearestRoute();
+		}
+	}
+
+	//Compute Throttle, Steering, Gear
+	Throttle = 0;
+	Steering = TargetLocations.Num() ? CalcStreeringValue(DeltaTime) : 0.0f;
+	Gear = bDriveBackvard ? ENGear::Reverse : ENGear::Drive;
+
+	if (CurrentObstacleDistance > 0.f && CurrentObstacleDistance < ObstacleStopDistance * 100 && !bDriveBackvard) // Stop if Obstacle
+	{
+		Throttle = ThrottleStop(AbsSpeed);
+	}
+	else if ((Speed > 0.05f && bDriveBackvard) || (Speed < -0.05f && !bDriveBackvard)) // Stop if wrong moving diretion
+	{
+		Throttle = ThrottleStop(AbsSpeed);
+		Steering = 0.0f;
+	}
+	else if (TargetLocations.Num() == 0) // Route is end. Stopping...
+	{
+		Throttle = ThrottleStop(AbsSpeed);
+		Steering = 0.0f;
+		if (AbsSpeed < 0.1f)
+		{
+			Gear = ENGear::Park;
+		}
+
+	}
+	else // Continue moving
+	{
+		Throttle = ThrottleMove(AbsSpeed, TargetSpeed);
+	}
+
+	if(bDrawCurrentRoute)
+	{
+		DrawCurrentRoute();
+	}
+}
+
+void UVehicleInputAIComponent::UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController)
+{
+	Super::UpdateInputStates(DeltaTime, ForwardSpeed, PlayerController);
+
+	check(GetWheeledVehicle() != nullptr);
+
+	SCOPE_CYCLE_COUNTER(STAT_AI_TickComponent);	
+
+	UpdateInputStatesInner(DeltaTime);
+
+	BrakeInput    = BrakeInputRate.InterpInputValue(DeltaTime, BrakeInput, FMath::Clamp(-1.f * Throttle, 0.f, 1.f)); 
+	ThrottleInput = ThrottleInputRate.InterpInputValue(DeltaTime, ThrottleInput, FMath::Min(FMath::Clamp(Throttle, 0.f, 1.f), ThrottlePedalLimit));
+	SteeringInput = SteerInputRate.InterpInputValue(DeltaTime, SteeringInput, Steering);
+	GearInput = Gear;
+}
+
+float UVehicleInputAIComponent::CalcStreeringValue(float DeltaTime)
+{
+	SCOPE_CYCLE_COUNTER(STAT_AI_CalcStreeringValue);
+
+	const FVector CurrentLocation = GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GlobalPose.GetLocation();
+	const FVector Forward = GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GlobalPose.GetRotation().Rotator().Vector() *
+		(bDriveBackvard ? -1.0 : 1.0);
+	const auto Speed = Chaos::CmSToKmH(GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GetLocalVelocity().X);
+
+	const auto ForvardedLocationDir = CurrentLocation + Forward.GetSafeNormal() * ForwardingDistanceDir;
+	const auto ForvardedLocationLoc = CurrentLocation + Forward.GetSafeNormal() * ForwardingDistanceLoc;
+
+	const float SplineKey = USodaStatics::FindSplineInputKeyClosestToWorldLocationFast(CurrentLocation, CurrentSplineSegment, RouteSpline);
+	const float SplineDirAtCurrentLoc = _RAD2DEG(RouteSpline->GetDirectionAtSplineInputKey(SplineKey, ESplineCoordinateSpace::World).GetUnsafeNormal().UnitCartesianToSpherical().Y);
+
+	float SplineInputKeyDir = 0;
+	float SplineInputKeyLoc = 0;
+
+	{
+		SCOPE_CYCLE_COUNTER(STAT_AI_FindInputKeyClosestToWorldLocation);
+		SplineInputKeyDir = USodaStatics::FindSplineInputKeyClosestToWorldLocationFast(ForvardedLocationDir, CurrentSplineSegment, RouteSpline);
+		SplineInputKeyLoc = USodaStatics::FindSplineInputKeyClosestToWorldLocationFast(ForvardedLocationLoc, CurrentSplineSegment, RouteSpline);
+	}
+
+	FVector ForwardedSplineDirection;
+	FVector ForwardedSplineLocation;
+	{
+		SCOPE_CYCLE_COUNTER(STAT_AI_GetDirectionAtSplineInputKey);
+		ForwardedSplineDirection = RouteSpline->GetDirectionAtSplineInputKey(SplineInputKeyDir, ESplineCoordinateSpace::World).GetUnsafeNormal();
+		ForwardedSplineLocation = RouteSpline->GetLocationAtSplineInputKey(SplineInputKeyLoc, ESplineCoordinateSpace::World);
+	}
+
+	SideError = (RouteSpline->GetLocationAtSplineInputKey(SplineKey, ESplineCoordinateSpace::World) - CurrentLocation).Size2D();
+
+	auto LocErrorVector = ForwardedSplineLocation - CurrentLocation;
+	LocErrorVector.Z = 0;
+
+	FVector DirectionToCorrectSideError = LocErrorVector.GetUnsafeNormal().GetSafeNormal();
+
+	float ForwardedSplineDirAngle = _RAD2DEG(ForwardedSplineDirection.UnitCartesianToSpherical().Y);
+	float DirectionToCorrectSideErrorAngle = _RAD2DEG(DirectionToCorrectSideError.UnitCartesianToSpherical().Y);
+	float ActorAngle = _RAD2DEG(Forward.UnitCartesianToSpherical().Y);
+
+	float ErrorAngle = FMath::UnwindDegrees(DirectionToCorrectSideErrorAngle - ActorAngle) * SteerDirToLocErrorCoef + FMath::UnwindDegrees(ForwardedSplineDirAngle - ActorAngle) * (1.f - SteerDirToLocErrorCoef);
+
+	if (bDriveBackvard)
+	{
+		ErrorAngle *= -1.f;
+	}
+
+	float FeedForwardAngle = FMath::UnwindDegrees(ForwardedSplineDirAngle - SplineDirAtCurrentLoc);
+
+	if (bDriveBackvard)
+	{
+		FeedForwardAngle *= -1.f;
+	}
+
+	const float MaxSpeedToErrorReducing = 50.f; // [km/h]
+	ErrorAngle *= FMath::Lerp(SteeringDirErrorReducingAtLowSpeedCoef, 1.f, FMath::Clamp(fabsf(Speed) / MaxSpeedToErrorReducing, 0.f, 1.f));
+
+	return FMath::Clamp(SteeringPID.CalculatePID(FeedForwardAngle, ErrorAngle, DeltaTime), -1.f, 1.f);
+}
+
+float UVehicleInputAIComponent::CalcSpeedValue(float ObstacleDistance)
+{
+	SCOPE_CYCLE_COUNTER(STAT_AI_CalcSpeedValue);
+
+	const FVector CurrentLocation = GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GlobalPose.GetLocation();
+
+	if (TargetLocations.Num() == 0)
+	{
+		return 0;
+	}
+	else if (TargetLocations.Num() == 1)
+	{
+		return SpeedSlow;
+	}
+
+	float Dist = FVector::Dist(TargetLocations[0], CurrentLocation);
+	float DistAlongRoute = 0;
+	FVector PrevLocation = CurrentLocation;
+	float Speed = Chaos::CmSToKmH(GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GetLocalVelocity().X);
+	float SlowingDistance = GetSlowingDistance();
+	float FusedCurvature = 0;
+
+	float DistToRouteEnd = 0;
+	for (size_t i = 0; i < TargetLocations.Num(); ++i)
+	{
+		DistToRouteEnd += FVector::Dist(TargetLocations[i], PrevLocation);
+		PrevLocation = TargetLocations[i];
+	}
+	if (!bDriveBackvard && ObstacleDistance > 0.f)
+		DistToRouteEnd = fminf(DistToRouteEnd, ObstacleDistance - ObstacleStopDistance * 100);
+
+	float MaxSpeed = FMath::Lerp(0.0f, SpeedLimit, FMath::Clamp(DistToRouteEnd / SlowingDistance, 0.f, 1.f));
+	float RetSpeed = SpeedLimit;
+
+	float DebugAngle = 0;
+	float DebugMeanCurv = 0;
+	float DebugFusedCurvature = 0;
+	float DebugCalcSpeed = 0;
+	float DebugNextTurnAngle = 0;
+	float DebugDistAlongRoute = 0;
+
+	if (TargetLocations.Num() >= 2)
+	{
+		PrevLocation = TargetLocations[0];
+
+		for (size_t i = 1; i < TargetLocations.Num() - 1 && DistAlongRoute < SlowingDistance; ++i)
+		{
+			DistAlongRoute += FVector::Dist(TargetLocations[i], PrevLocation);
+			if (acos(FMath::Clamp((TargetLocations[i] - PrevLocation).CosineAngle2D(TargetLocations[i + 1] - TargetLocations[i]), -1.f, 1.f)) > PI * 0.75f || FVector::Dist(TargetLocations[i], PrevLocation) < 20.f || FVector::Dist(TargetLocations[i], TargetLocations[i + 1]) < 20.f)
+			{
+				PrevLocation = TargetLocations[i];
+				continue;
+			}
+
+			float Angle = acos(FMath::Clamp((TargetLocations[i] - PrevLocation).CosineAngle2D(TargetLocations[i + 1] - TargetLocations[i]), -1.f, 1.f));
+			float MeanCurv = Angle / FVector::Dist(TargetLocations[i], PrevLocation);
+			FusedCurvature = (1.f - CurvatreSmoothingCoef) * FusedCurvature + CurvatreSmoothingCoef * MeanCurv;
+			float CalcSpeed = fminf(MaxSpeed, fmaxf(SpeedSlow, 1.0f / (FusedCurvature * SpeedToCurvatureCoef + SideError * SideErrorSpeedCoef + 0.0001f)));
+			float NewRetSpeed = Rate * FMath::Lerp(CalcSpeed, MaxSpeed, FMath::Clamp(DistAlongRoute / SlowingDistance, 0.f, 1.f));
+			if (NewRetSpeed < RetSpeed)
+			{
+				RetSpeed = NewRetSpeed;
+				DebugAngle = Angle;
+				DebugFusedCurvature = FusedCurvature * SpeedToCurvatureCoef;
+				DebugCalcSpeed = CalcSpeed;
+				DebugDistAlongRoute = DistAlongRoute;
+			}
+
+			PrevLocation = TargetLocations[i];
+		}
+	}
+
+	if (bDebugOutputLog)
+	{
+		UE_LOG(LogSoda, Warning, TEXT(/*"DistToRouteEnd = %f, ObstacleDist = %f, DistAlongRoute = %f, */"SlowingDist = %f, Angle = %f, FusedCurvPart = %f, SideErrorPart = %f, CalcSpeed = %f, RetSpeed = %f, CurSpeed = %f"),
+			   /*DistToRouteEnd * 0.01f, ObstacleDistance * 0.01f, DebugDistAlongRoute * 0.01f, */SlowingDistance * 0.01f, DebugAngle, DebugFusedCurvature, SideError * SideErrorSpeedCoef, DebugCalcSpeed, RetSpeed, Speed);
+	}
+	return RetSpeed;
+}
+
+float UVehicleInputAIComponent::GetSlowingDistance() const
+{
+	float Speed = GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GetLocalVelocity().X * 0.01f;
+	float BreakingTime = Speed / MaxBreakingAcceleration;
+	return 100 * (Speed * (BreakingTime + BreakingApplyingLag) - (MaxBreakingAcceleration * BreakingTime * BreakingTime) / 2);
+}
+
+float UVehicleInputAIComponent::ThrottleMove(float CurSpeed, float TargetSpeed)
+{
+	if (TargetSpeed < 0.1f && (CurSpeed * ThrottlePropCoef) < 1.f)
+		return -1.f;
+	return FMath::Clamp((TargetSpeed - CurSpeed) * ThrottlePropCoef, -1.f, 1.f);
+}
+
+float UVehicleInputAIComponent::RayCast(const FVector& Start, const FVector& End)
+{	
+	FHitResult OutHit;
+	static FName TraceTag = FName(TEXT("VehicleTrace"));
+	FCollisionQueryParams CollisionParams(TraceTag, true);
+	CollisionParams.AddIgnoredActor(GetVehicle());
+	CollisionParams.bFindInitialOverlaps = true;
+
+	const bool Success = GetVehicle()->GetWorld()->SweepSingleByChannel(
+		OutHit, Start, End, (End - Start).Rotation().Quaternion(),
+		ECollisionChannel::ECC_Visibility,
+		FCollisionShape::MakeBox(FVector(50, 150, 100)), CollisionParams);
+
+	if (Success && OutHit.bBlockingHit)
+	{
+		return OutHit.Distance;
+	}
+
+	return -1.f;
+}
+
+float UVehicleInputAIComponent::CheckIntersectionWithOtherActors(const FVector& Start, const FVector& End, const TArray<AActor*> ActorsToCheck)
+{
+	const float DistanceToDetectIntersection = 100.f;
+	for (AActor* Actor : ActorsToCheck)
+	{
+		FVector ActorLoc = Actor->GetActorLocation();
+		ActorLoc.Z = Start.Z;
+		if (bDrawCurrentRoute)
+			DrawDebugString(GetWorld(), ActorLoc, *FString::Printf(TEXT("ActorToCheck=%s"), *Actor->GetName()), NULL, FColor::Red, 0.01f, false);
+
+		if (GetDistanceFromLineToPoint(Start, End, ActorLoc, false) < DistanceToDetectIntersection)
+		{
+			FVector Line = (End - Start);
+			Line.Normalize();
+
+			FVector Vec = Actor->GetActorLocation() - Start;
+			float Dist = FVector::DotProduct(Vec, Line);
+			if (Dist > 0.f)
+				return Dist;
+		} 
+	}
+	return -1.f;
+}
+
+float UVehicleInputAIComponent::GetDistanceToObstacle()
+{
+	SCOPE_CYCLE_COUNTER(STAT_AI_GetDistanceToObstacle);
+
+	if (TargetLocations.Num() < 2)
+		return -1.f;
+
+	float DistAlongRoute = 0;
+	size_t SegmentBeginIndex = 0;
+	int CollidersUsed = 0;
+
+	const float LookoutDistance = GetSlowingDistance() + ObstacleStopDistance * 100.f;
+
+	TArray<AActor*> ActorsToCheck;
+	if (bUseActorsPositionChecking)
+	{
+		TArray<AActor*> TempActors;
+		UGameplayStatics::GetAllActorsOfClass(GetWorld(), AWheeledVehiclePawn::StaticClass(), ActorsToCheck);
+		ActorsToCheck.Append(TempActors);
+		UGameplayStatics::GetAllActorsOfClass(GetWorld(), ASodaWheeledVehicle::StaticClass(), TempActors);
+		ActorsToCheck.Append(TempActors);
+
+		ActorsToCheck.RemoveAll([this, LookoutDistance](const AActor* Ptr) {
+			return ((Ptr->GetActorLocation() - TargetLocations[0]).Size() > LookoutDistance ||
+					 Ptr->GetName().Contains("BP_ArrivalFakeCar_C"));
+		});
+		ActorsToCheck.Remove(GetVehicle());
+
+		if (ActorsToCheck.Num() == 0)
+			return -1.f;
+	}
+
+	for (size_t i = 0; i + 1 < TargetLocations.Num() && DistAlongRoute < LookoutDistance; i++)
+	{
+		float Error = GetDistanceFromLineToPoint(TargetLocations[SegmentBeginIndex], TargetLocations[SegmentBeginIndex + 1], TargetLocations[i + 1], false);
+		if (i + 2 >= TargetLocations.Num() ||
+			Error > RouteSectionPointMaxSideDeviation)
+		{
+			const FVector StartCenter = TargetLocations[SegmentBeginIndex];
+			const FVector EndCenter = TargetLocations[i];
+
+			float HitDistance = -1;
+			if (bUseRayCast)
+			{
+				HitDistance = RayCast(StartCenter, EndCenter);
+				CollidersUsed++;
+			}
+			if (bUseActorsPositionChecking)
+				HitDistance = CheckIntersectionWithOtherActors(StartCenter, EndCenter, ActorsToCheck);
+
+			if (bDrawTargetLocations)
+			{
+				DrawDebugString(GetWorld(), TargetLocations[SegmentBeginIndex], *FString::Printf(TEXT("PointSideError=%f, Segment: BeginIndex=%d, EndIndex=%d"), Error, SegmentBeginIndex, i), NULL, FColor::Yellow, 0.01f, false);
+
+				DrawDebugLine(
+					GetWorld(),
+					StartCenter,
+					EndCenter,
+					HitDistance > 0.f ? FColor::Red : FColor::Yellow,
+					false, -1.f, 0, 2.f);
+				DrawDebugPoint(GetWorld(), EndCenter, 10, HitDistance > 0.f ? FColor::Red : FColor::Yellow, false, -1.0f);
+			}
+
+			if (HitDistance > 0.f)
+			{
+				if (bUseRayCast && bDrawTargetLocations) DrawDebugString(GetWorld(), TargetLocations[0] + FVector(0, 0, 20.f), *FString::Printf(TEXT("Total colliders used=%d"), CollidersUsed), NULL, FColor::Green, 0.01f, false);
+
+				return HitDistance + DistAlongRoute;
+			}
+
+			SegmentBeginIndex = i;
+			DistAlongRoute += (EndCenter - StartCenter).Size();
+		}
+	}
+	if (bUseRayCast && bDrawTargetLocations) DrawDebugString(GetWorld(), TargetLocations[0] + FVector(0, 0, 20.f), *FString::Printf(TEXT("Total colliders used=%d"), CollidersUsed), NULL, FColor::Green, 0.01f, false);
+
+	return -1.f;
+}
+
+bool UVehicleInputAIComponent::IsPointInsideBox(FVector Point, UBoxComponent* BoxComponent) const
+{
+	float xmin = BoxComponent->GetComponentLocation().X - BoxComponent->GetScaledBoxExtent().X - 100;
+	float xmax = BoxComponent->GetComponentLocation().X + BoxComponent->GetScaledBoxExtent().X + 100;
+	float ymin = BoxComponent->GetComponentLocation().Y - BoxComponent->GetScaledBoxExtent().Y - 100;
+	float ymax = BoxComponent->GetComponentLocation().Y + BoxComponent->GetScaledBoxExtent().Y + 100;
+	float zmin = BoxComponent->GetComponentLocation().Z - BoxComponent->GetScaledBoxExtent().Z - 100;
+	float zmax = BoxComponent->GetComponentLocation().Z + BoxComponent->GetScaledBoxExtent().Z + 100;
+
+	if ((Point.X <= xmax && Point.X >= xmin) && (Point.Y <= ymax && Point.Y >= ymin) && (Point.Z <= zmax && Point.Z >= zmin))
+	{
+		return true;
+	}
+	return false;
+}
+
+void UVehicleInputAIComponent::DrawCurrentRoute()
+{
+	bool ModeAI = GetWheeledVehicle()->GetActiveVehicleInput() == this;
+
+	for (int j = 0, lenNumPoints = TargetLocations.Num() - 1; j < lenNumPoints; ++j)
+	{
+		const FVector p0 = TargetLocations[j + 0];
+		const FVector p1 = TargetLocations[j + 1];
+
+		static const float MinThickness = 3.f;
+		static const float MaxThickness = 15.f;
+
+		const float Dist = (float)j / (float)lenNumPoints;
+		const float OneMinusDist = 1.f - Dist;
+		const float Thickness = OneMinusDist * MaxThickness + MinThickness;
+
+		if (!ModeAI)
+		{
+			// from blue to black
+			DrawDebugLine(
+				GetWorld(), p0, p1, FColor(0, 0, 255 * OneMinusDist),
+				false, -1.f, 0, Thickness);
+		}
+		else
+		{
+			// from green to black
+			DrawDebugLine(
+				GetWorld(), p0, p1, FColor(0, 255 * OneMinusDist, 0),
+				false, -1.f, 0, Thickness);
+		}
+	}
+}
+
+void UVehicleInputAIComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	if (GetWheeledVehicle() && (GetWheeledVehicle()->GetActiveVehicleInput() == this))
+	{
+		Super::DrawDebug(Canvas, YL, YPos);
+
+		if (Common.bDrawDebugCanvas)
+		{
+			UFont* RenderFont = GEngine->GetSmallFont();
+			Canvas->SetDrawColor(FColor::White);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Steering: %.2f"), GetSteeringInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Throttle: %.2f"), GetThrottleInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Brake: %.2f"), GetBrakeInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("TargetLocations: %i"), TargetLocations.Num()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("SideError: %f"), SideError), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("ObstacleDistance: %f"), CurrentObstacleDistance), 16, YPos);
+		}
+	}
+}
+
+bool UVehicleInputAIComponent::AssignRoute(const ANavigationRoute* RoutePlanner)
+{
+	check(RoutePlanner);
+	if (auto* Route = RoutePlanner->GetSpline())
+	{
+		SetFixedRouteBySpline(Route, RoutePlanner->bDriveBackvard, false);
+	}
+	return false;
+}
+
+void UVehicleInputAIComponent::CopyInputStates(UVehicleInputComponent* Previous)
+{
+	if (Previous)
+	{
+		SteeringInput = Previous->GetSteeringInput();
+		ThrottleInput = Previous->GetThrottleInput();
+		BrakeInput = Previous->GetBrakeInput();
+		GearInput = Previous->GetGearInput();
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputExternalComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputExternalComponent.cpp
new file mode 100644
index 0000000..03f9e19
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputExternalComponent.cpp
@@ -0,0 +1,63 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Inputs/VehicleInputExternalComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Engine/Canvas.h"
+
+UVehicleInputExternalComponent::UVehicleInputExternalComponent(const FObjectInitializer &ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Exteran");
+	GUI.IcanName = TEXT("SodaIcons.External");
+	GUI.bIsPresentInAddMenu = true;
+
+	InputType = EVehicleInputType::External;
+}
+
+bool UVehicleInputExternalComponent::OnActivateVehicleComponent()
+{
+	return Super::OnActivateVehicleComponent();
+}
+
+void UVehicleInputExternalComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UVehicleInputExternalComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	if ((GetWheeledVehicle()->GetActiveVehicleInput() == this))
+	{
+		Super::DrawDebug(Canvas, YL, YPos);
+
+		if (Common.bDrawDebugCanvas && GetWheeledVehicle())
+		{
+			UFont* RenderFont = GEngine->GetSmallFont();
+			Canvas->SetDrawColor(FColor::White);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Steering: %.2f"), GetSteeringInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Throttle: %.2f"), GetThrottleInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Brake: %.2f"), GetBrakeInput()), 16, YPos);
+		}
+	}
+}
+
+void UVehicleInputExternalComponent::CopyInputStates(UVehicleInputComponent* Previous)
+{
+	if (Previous)
+	{
+		SteeringInput = Previous->GetSteeringInput();
+		ThrottleInput = Previous->GetThrottleInput();
+		BrakeInput = Previous->GetBrakeInput();
+		GearInput = Previous->GetGearInput();
+	}
+}
+
+void UVehicleInputExternalComponent::UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController)
+{
+	Super::UpdateInputStates(DeltaTime, ForwardSpeed, PlayerController);
+
+	ThrottleInput = ThrottleInputRate.InterpInputValue(DeltaTime, ThrottleInput, ThrottleInputTarget);
+	BrakeInput = BrakeInputRate.InterpInputValue(DeltaTime, BrakeInput, BrakeInputTarget);
+	SteeringInput = SteerInputRate.InterpInputValue(DeltaTime, SteeringInput, SteeringInputTarget);
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputJoyComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputJoyComponent.cpp
new file mode 100644
index 0000000..df83d46
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputJoyComponent.cpp
@@ -0,0 +1,285 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Inputs/VehicleInputJoyComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Engine/Canvas.h"
+#include "InputCoreTypes.h"
+#include "Soda/SodaStatics.h"
+#include "SodaJoystick.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleSteeringComponent.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+#include "UObject/ConstructorHelpers.h"
+
+UVehicleInputJoyComponent::UVehicleInputJoyComponent(const FObjectInitializer &ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Joy");
+	GUI.IcanName = TEXT("SodaIcons.Joystick");
+	GUI.bIsPresentInAddMenu = true;
+
+	InputType = EVehicleInputType::Joy;
+
+	static ConstructorHelpers::FObjectFinder<UCurveFloat> FeedbackAutocenterCurvePtr(TEXT("/SodaSim/Assets/CPP/Curves/JoyInput/FeedbackAutocenterCurve.FeedbackAutocenterCurve"));
+	static ConstructorHelpers::FObjectFinder<UCurveFloat> FeedbackDiffCurvePtr(TEXT("/SodaSim/Assets/CPP/Curves/JoyInput/FeedbackDiffCurve.FeedbackDiffCurve"));
+	static ConstructorHelpers::FObjectFinder<UCurveFloat> FeedbackResistionCurvePtr(TEXT("/SodaSim/Assets/CPP/Curves/JoyInput/FeedbackResistionCurve.FeedbackResistionCurve"));
+
+	FeedbackAutocenterCurve.ExternalCurve = FeedbackAutocenterCurvePtr.Object;
+	FeedbackDiffCurve.ExternalCurve = FeedbackDiffCurvePtr.Object;
+	FeedbackResistionCurve.ExternalCurve = FeedbackResistionCurvePtr.Object;
+}
+
+bool UVehicleInputJoyComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (!ISodaJoystickPlugin::IsAvailable())
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Warning, TEXT("UVehicleInputJoyComponent::OnActivateVehicleComponent(); ISodaJoystickPlugin not avalible"));
+		return false;
+	}
+
+	Joy = &ISodaJoystickPlugin::Get();
+	check(Joy);
+	if (Joy->GetJoyNum() <= 0)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Warning, TEXT("UVehicleInputJoyComponent::OnActivateVehicleComponent(); SodaJoystick is not find"));
+		return false;
+	}
+
+	if (!FeedbackAutocenterCurve.ExternalCurve)
+	{
+		SetHealth(EVehicleComponentHealth::Warning, TEXT("FeedbackAutocenterCurve isn't set"));
+	}
+
+	if (!FeedbackDiffCurve.ExternalCurve)
+	{
+		SetHealth(EVehicleComponentHealth::Warning, TEXT("FeedbackDiffCurve isn't set"));
+	}
+
+	if (!FeedbackResistionCurve.ExternalCurve)
+	{
+		SetHealth(EVehicleComponentHealth::Warning, TEXT("FeedbackResistionCurve isn't set"));
+	}
+
+	if (!GetWheeledComponentInterface())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Need WheeledComponentInterface"));
+		return false;
+	}
+
+	if (UVehicleSteeringRackBaseComponent* SteeringRack = LinkToSteering.GetObject<UVehicleSteeringRackBaseComponent>(GetOwner()))
+	{
+		MaxSteer = SteeringRack->GetMaxSteer() / M_PI * 180.0;
+	}
+	else
+	{
+		SetHealth(EVehicleComponentHealth::Warning, TEXT("LinkToSteering isn't set"));
+		MaxSteer = 30 / M_PI * 180.0;
+	}
+
+	return HealthIsWorkable();
+}
+
+void UVehicleInputJoyComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	if (Joy)
+	{
+		Joy->StopConstantForceEffect();
+	}
+	Joy = nullptr;
+}
+
+void UVehicleInputJoyComponent::UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController)
+{
+	Super::UpdateInputStates(DeltaTime, ForwardSpeed, PlayerController);
+
+	if (!GetWheeledVehicle()->GetWheeledComponentInterface()) return;
+
+	if (!Joy || !PlayerController || !HealthIsWorkable())
+	{
+		//ThrottleInput = 0;
+		//SteeringInput = 0;
+		//BrakeInput = 1.0;
+		return;
+	}
+
+	USodaUserSettings* Settings = SodaApp.GetSodaUserSettings();
+
+	const float PrevSteeringInput = SteeringInput;
+
+	ThrottleInput = FMath::Clamp(PlayerController->GetInputAnalogKeyState(Settings->ThrottleJoyInput), 0.f, 1.f);
+	SteeringInput = FMath::Clamp(PlayerController->GetInputAnalogKeyState(Settings->SteeringJoyInput), -1.f, 1.f);
+	BrakeInput = FMath::Clamp(PlayerController->GetInputAnalogKeyState(Settings->BrakeJoyInput), 0.f, 1.f);
+
+	if (std::abs(BrakeInput) < InputBrakeDeadzone)
+	{
+		BrakeInput = 0.f;
+	}
+
+	bool GearChangePossible = bCreepMode == false || BrakeInput > 0.1f;
+
+	/**********************************
+	* Change Gear
+	***********************************/
+	if (PlayerController->IsInputKeyDown(Settings->NeutralGearJoyInput) || PlayerController->IsInputKeyDown(Settings->NeutralGearKeyInput))
+		GearInput = ENGear::Neutral;
+	else if (GearChangePossible && (PlayerController->IsInputKeyDown(Settings->DriveGearJoyInput) || PlayerController->IsInputKeyDown(Settings->DriveGearKeyInput)))
+		GearInput = ENGear::Drive;
+	else if (GearChangePossible && (PlayerController->IsInputKeyDown(Settings->ReverseGearJoyInput) || PlayerController->IsInputKeyDown(Settings->ReverseGearKeyInput)))
+		GearInput = ENGear::Reverse;
+	else if (GearChangePossible && (PlayerController->IsInputKeyDown(Settings->ParkGearJoyInput) || PlayerController->IsInputKeyDown(Settings->ParkGearKeyInput)))
+		GearInput = ENGear::Park;
+
+	if (bCreepMode && (GearInput == ENGear::Drive || GearInput == ENGear::Reverse))
+	{
+		float SpeedError = CreepSpeed - std::abs(ForwardSpeed);
+		float CreepThrottleInput = FMath::Clamp(SpeedError / CreepSpeed, 0.0f, MaxCreepThrottle);
+		ThrottleInput = FMath::Max(CreepThrottleInput, ThrottleInput);
+	}
+		
+	const float InputSteeringSpeed = (SteeringInput - PrevSteeringInput) / DeltaTime;
+	const float CurrSteer = GetWheeledVehicle()->GetSteer() / M_PI * 180.0;
+
+	FeedbackAutocenterFactor = 0;
+	FeedbackDiffFactor = 0;
+	FeedbackResistionFactor = 0;
+
+	if (FeedbackAutocenterCurve.ExternalCurve && bFeedbackAutocenterEnabled)
+	{
+		FeedbackAutocenterFactor = FeedbackAutocenterCurve.ExternalCurve->GetFloatValue(ForwardSpeed) *
+			CurrSteer / MaxSteer * FeedbackAutocenterCoeff;
+	}
+
+	if (FeedbackDiffCurve.ExternalCurve && bFeedbackDiffEnabled)
+	{
+		FeedbackDiffFactor = FeedbackDiffCurve.ExternalCurve->GetFloatValue(MaxSteer * SteeringInput - CurrSteer) * FeedbackDiffCoeff;
+	}
+
+	if (FeedbackResistionCurve.ExternalCurve && bFeedbackResistionEnabled)
+	{
+		FeedbackResistionFactor = FeedbackResistionCurve.ExternalCurve->GetFloatValue(InputSteeringSpeed) * FeedbackResistionCoeff;
+	}
+
+	FeedbackFullFactor =
+		(FeedbackFullFactor * FeedbackFilter) +
+		(FeedbackAutocenterFactor + FeedbackDiffFactor + FeedbackResistionFactor) * (1.0 - FeedbackFilter);
+
+	Joy->ApplyConstantForce(FMath::Clamp(int(FeedbackFullFactor * 32767 + 0.5), -32768, 32767));
+
+	FeedbackDriverSteerTension = FeedbackFullFactor;
+
+	if (FeedbackDriverSteerTension > 0)
+	{
+		FeedbackDriverSteerTension -= CalcDriverForceCompensationDeadZone;
+		if (FeedbackDriverSteerTension < 0) FeedbackDriverSteerTension = 0;
+	}
+	else if (FeedbackDriverSteerTension < 0)
+	{
+		FeedbackDriverSteerTension += CalcDriverForceCompensationDeadZone;
+		if (FeedbackDriverSteerTension > 0) FeedbackDriverSteerTension = 0;
+	}
+
+	FeedbackDriverSteerTension *= CalcDriverForceCompensationCoeff;
+
+	//UE_LOG(LogSoda, Warning, TEXT("---- %f %f"), GetMaxSteerAngle() * SteeringInput, OutputRegs.GetSteer() / M_PI * 180.0);
+	//UE_LOG(LogSoda, Warning, TEXT("**** %f %f %f %f %f"), DriverInputSteerTension, WheelTension, AutocenterCurveValue, FullTension, SteeringInputSpeed);
+
+	if (bEnableBumpEffect && GetWheeledVehicle()->Is4WDVehicle())
+	{
+		float NewOffsetLeft = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->SuspensionOffset;
+		float NewOffsetRight = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->SuspensionOffset;
+		float SuspensionTranslationSpeedLeft = (FrontWheelPrevSuspensionOffset[0] - NewOffsetLeft) / DeltaTime;
+		float SuspensionTranslationSpeedRight = (FrontWheelPrevSuspensionOffset[1] - NewOffsetRight) / DeltaTime;
+		FrontWheelPrevSuspensionOffset[0] = NewOffsetLeft;
+		FrontWheelPrevSuspensionOffset[1] = NewOffsetRight;
+		float RightLeftDiff = SuspensionTranslationSpeedRight - SuspensionTranslationSpeedLeft;
+		float RightLeftSumm = SuspensionTranslationSpeedRight + SuspensionTranslationSpeedLeft;
+		if (fabs(RightLeftDiff) > BumpEffectThreshold)
+		{
+			const int BaseFarceVal = 7000;
+			const int BaseLen = 100000;
+			int Force = (int)((BaseFarceVal * ((RightLeftDiff < 0) ? -1 : 1) + RightLeftDiff * BumpEffectForceCoef) * ((RightLeftSumm < 0) ? 1 : -1));
+			int Len = (int)FMath::Clamp(float(BaseLen) / (ForwardSpeed + 1.f), 50.f, 1000.f);
+			Joy->ApplyBumpEffect(Force, Len);
+			//UE_LOG(LogSoda, Log, TEXT("Appying bump effect. Force:= %d, Len = %d"), Force, Len);
+		}
+	}
+
+	ThrottleInput = GetCruiseControlModulatedThrottleInput(ThrottleInput);
+}
+
+void UVehicleInputJoyComponent::ReinitDevice()
+{
+	if (Joy)
+	{
+		Joy->Reset();
+	}
+}
+
+void UVehicleInputJoyComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	if (GetWheeledVehicle() && (GetWheeledVehicle()->GetActiveVehicleInput() == this))
+	{
+		Super::DrawDebug(Canvas, YL, YPos);
+
+		if (Common.bDrawDebugCanvas)
+		{
+			UFont* RenderFont = GEngine->GetSmallFont();
+			Canvas->SetDrawColor(FColor::White);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Steering: %.2f"), GetSteeringInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Throttle: %.2f"), GetThrottleInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Brake: %.2f"), GetBrakeInput()), 16, YPos);
+
+			if (Joy)
+			{
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Joy Num: %i"), Joy->GetJoyNum()), 16, YPos);
+				
+			}
+
+			if (bShowFeedback)
+			{
+				YPos += Canvas->DrawText(RenderFont, TEXT("Feedback:"), 16, YPos + 4);
+
+				Canvas->DrawText(RenderFont, TEXT("DiffFactor:"), 16, YPos + 4);
+				YPos += USodaStatics::DrawProgress(Canvas, 120, YPos + 4, 120, 16, FeedbackDiffFactor, -1.0, 1.0, true,
+					FString::Printf(TEXT("%i%%"), int(FeedbackDiffFactor * 100)));
+
+				Canvas->DrawText(RenderFont, TEXT("ResistionFactor:"), 16, YPos + 4);
+				YPos += USodaStatics::DrawProgress(Canvas, 120, YPos + 4, 120, 16, FeedbackResistionFactor, -1.0, 1.0, true,
+					FString::Printf(TEXT("%i%%"), int(FeedbackResistionFactor * 100)));
+
+				Canvas->DrawText(RenderFont, TEXT("AutocenterFactor:"), 16, YPos + 4);
+				YPos += USodaStatics::DrawProgress(Canvas, 120, YPos + 4, 120, 16, FeedbackAutocenterFactor, -1.0, 1.0, true,
+					FString::Printf(TEXT("%i%%"), int(FeedbackAutocenterFactor * 100)));
+
+				Canvas->DrawText(RenderFont, TEXT("FullFactor:"), 16, YPos + 4);
+				YPos += USodaStatics::DrawProgress(Canvas, 120, YPos + 4, 120, 16, FeedbackFullFactor, -1.0, 1.0, true,
+					FString::Printf(TEXT("%i%%"), int(FeedbackFullFactor * 100)));
+
+				Canvas->DrawText(RenderFont, TEXT("DriverTension:"), 16, YPos + 4);
+				YPos += USodaStatics::DrawProgress(Canvas, 120, YPos + 4, 120, 16, FeedbackDriverSteerTension, -1.0, 1.0, true,
+					FString::Printf(TEXT("%i%%"), int(FeedbackDriverSteerTension * 100)));
+			}
+		}
+	}
+}
+
+void UVehicleInputJoyComponent::CopyInputStates(UVehicleInputComponent* Previous)
+{
+	if (Previous)
+	{
+		SteeringInput = Previous->GetSteeringInput();
+		ThrottleInput = Previous->GetThrottleInput();
+		BrakeInput = Previous->GetBrakeInput();
+		GearInput = Previous->GetGearInput();
+	}
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputKeyboardComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputKeyboardComponent.cpp
new file mode 100644
index 0000000..55d6831
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Inputs/VehicleInputKeyboardComponent.cpp
@@ -0,0 +1,213 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Inputs/VehicleInputKeyboardComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Engine/Canvas.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+#include "UObject/ConstructorHelpers.h"
+
+UVehicleInputKeyboardComponent::UVehicleInputKeyboardComponent(const FObjectInitializer &ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Keyboard");
+	GUI.IcanName = TEXT("SodaIcons.Keyboard");
+	GUI.bIsPresentInAddMenu = true;
+
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+
+	PrimaryComponentTick.bCanEverTick = true;
+
+	static ConstructorHelpers::FObjectFinder<UCurveFloat> InputSteeringSpeedCurvePtr(TEXT("/SodaSim/Assets/CPP/Curves/KeyboardInput/KeyInputSteeringSpeed.KeyInputSteeringSpeed"));
+	static ConstructorHelpers::FObjectFinder<UCurveFloat> InputMaxSteerPerSpeedCurvePtr(TEXT("/SodaSim/Assets/CPP/Curves/KeyboardInput/KeyInputMaxSteeringAngel.KeyInputMaxSteeringAngel"));
+
+	InputSteeringSpeedCurve.ExternalCurve = InputSteeringSpeedCurvePtr.Object;
+	InputMaxSteerPerSpeedCurve.ExternalCurve = InputMaxSteerPerSpeedCurvePtr.Object;
+
+	InputType = EVehicleInputType::Keyboard;
+}
+
+bool UVehicleInputKeyboardComponent::OnActivateVehicleComponent()
+{
+	return Super::OnActivateVehicleComponent();
+}
+
+void UVehicleInputKeyboardComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UVehicleInputKeyboardComponent::UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController)
+{
+	Super::UpdateInputStates(DeltaTime, ForwardSpeed, PlayerController);
+
+	if (!PlayerController)
+	{
+		return;
+	}
+
+	USodaUserSettings* Settings = SodaApp.GetSodaUserSettings();
+
+	RawSteeringInput = -PlayerController->GetInputAnalogKeyState(Settings->SteeringLeftKeyInput) + PlayerController->GetInputAnalogKeyState(Settings->SteeringRigtKeyInput);
+
+	if (PlayerController->IsInputKeyDown(Settings->NeutralGearKeyInput))
+		GearInput = ENGear::Neutral;
+	else if (PlayerController->IsInputKeyDown(Settings->ParkGearKeyInput))
+		GearInput = ENGear::Park;
+
+	if (bAutoGearBox)
+	{
+		float Throttle = PlayerController->GetInputAnalogKeyState(Settings->ThrottleKeyInput);
+		float Brake = PlayerController->GetInputAnalogKeyState(Settings->BrakeKeyInput);
+
+		if (std::abs(ForwardSpeed) < 2.0)
+			AutoGearBrakeTimeCounter += DeltaTime;
+		else
+			AutoGearBrakeTimeCounter = 0;
+
+		RawThrottleInput = 0.f;
+		RawBrakeInput = 0.f;
+
+		if (Throttle > 0.1)
+		{
+			if (GearInput == ENGear::Drive)
+			{
+				RawThrottleInput = Throttle;
+				RawBrakeInput = 0;
+			}
+			else if (GearInput == ENGear::Reverse)
+			{
+				RawThrottleInput = 0;
+				RawBrakeInput = Throttle;
+				if (AutoGearBrakeTimeCounter > AutoGearChangeTime)
+					GearInput = ENGear::Drive;
+			}
+			else
+			{
+				GearInput = ENGear::Drive;
+				RawThrottleInput = Throttle;
+				RawBrakeInput = 0;
+			}
+		}
+
+		if (Brake > 0.1)
+		{
+			if (GearInput == ENGear::Drive)
+			{
+				RawThrottleInput = 0;
+				RawBrakeInput = Brake;
+				if (AutoGearBrakeTimeCounter > AutoGearChangeTime)
+					GearInput = ENGear::Reverse;
+			}
+			else if (GearInput == ENGear::Reverse)
+			{
+				RawThrottleInput = Brake;
+				RawBrakeInput = 0;
+			}
+			else
+			{
+				GearInput = ENGear::Reverse;
+				RawThrottleInput = 0;
+				RawBrakeInput = Brake;
+			}
+		}
+	}
+	else
+	{
+		RawThrottleInput = PlayerController->GetInputAnalogKeyState(Settings->ThrottleKeyInput);
+		RawBrakeInput = PlayerController->GetInputAnalogKeyState(Settings->BrakeKeyInput);
+		if (PlayerController->IsInputKeyDown(Settings->DriveGearKeyInput))
+			GearInput = ENGear::Drive;
+		else if (PlayerController->IsInputKeyDown(Settings->ReverseGearKeyInput))
+			GearInput = ENGear::Reverse;
+	}
+
+	if (std::abs(RawSteeringInput) > 0.1)
+	{
+		if (RawSteeringInput > 0) FeedbackDriverSteerTension = 1.0;
+		else FeedbackDriverSteerTension = -1.0;
+	}
+	else
+	{
+		FeedbackDriverSteerTension = 0;
+	}
+
+	
+	/* Compute Steering input */
+	float SteerInputTarget;
+	if (InputMaxSteerPerSpeedCurve.ExternalCurve)
+	{
+		SteerInputTarget = InputMaxSteerPerSpeedCurve.ExternalCurve->GetFloatValue(ForwardSpeed) * RawSteeringInput;
+	}
+	else
+	{
+		SteerInputTarget = RawSteeringInput;
+	}
+
+	if (InputSteeringSpeedCurve.ExternalCurve)
+	{
+		SteerRate.RiseRate = InputSteeringSpeedCurve.ExternalCurve->GetFloatValue(ForwardSpeed);
+		SteerRate.FallRate = InputSteeringSpeedCurve.ExternalCurve->GetFloatValue(ForwardSpeed);
+		SteeringInput = SteerRate.InterpInputValue(DeltaTime, SteeringInput, SteerInputTarget);
+	}
+	else
+	{
+		SteeringInput = SteerInputTarget;
+	}
+
+	/* Compute Throttle Input */
+	ThrottleInput = ThrottleInputRate.InterpInputValue(DeltaTime, ThrottleInput, RawThrottleInput);
+
+	/* Compute Brake Input*/
+	BrakeInput = BrakeInputRate.InterpInputValue(DeltaTime, BrakeInput, RawBrakeInput);
+}
+
+float UVehicleInputKeyboardComponent::GetSteeringInput() const
+{
+	return SteeringInput * InputSteeringLimit;
+}
+
+float UVehicleInputKeyboardComponent::GetThrottleInput() const
+{ 
+	return GetCruiseControlModulatedThrottleInput(ThrottleInput * InputThrottleLimit);
+}
+
+float UVehicleInputKeyboardComponent::GetBrakeInput() const
+{
+	return BrakeInput *  InputBrakeLimit; 
+}
+
+void UVehicleInputKeyboardComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	if (GetWheeledVehicle() && (GetWheeledVehicle()->GetActiveVehicleInput() == this))
+	{
+		Super::DrawDebug(Canvas, YL, YPos);
+
+		if (Common.bDrawDebugCanvas)
+		{
+			UFont* RenderFont = GEngine->GetSmallFont();
+			Canvas->SetDrawColor(FColor::White);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Steering: %.2f"), GetSteeringInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Throttle: %.2f"), GetThrottleInput()), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Brake: %.2f"), GetBrakeInput()), 16, YPos);
+			Canvas->DrawText(RenderFont, TEXT("DriverTension:"), 16, YPos);
+			YPos += USodaStatics::DrawProgress(Canvas, 120, YPos + 4, 120, 16, FeedbackDriverSteerTension, -1.0, 1.0, true,
+				FString::Printf(TEXT("%i%%"), int(FeedbackDriverSteerTension * 100)));
+		}
+	}
+}
+
+void UVehicleInputKeyboardComponent::CopyInputStates(UVehicleInputComponent* Previous)
+{
+	if (Previous)
+	{
+		RawSteeringInput = SteeringInput = Previous->GetSteeringInput();
+		RawThrottleInput = ThrottleInput = Previous->GetThrottleInput();
+		RawBrakeInput = BrakeInput = Previous->GetBrakeInput();
+		GearInput = Previous->GetGearInput();
+	}
+}
+
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.cpp
new file mode 100644
index 0000000..a2b97db
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.cpp
@@ -0,0 +1,259 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Engine/Canvas.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+
+UWheelBrake::UWheelBrake(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+UVehicleBrakeSystemBaseComponent::UVehicleBrakeSystemBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Mechanicles");
+	GUI.IcanName = TEXT("SodaIcons.Braking");
+}
+
+/*
+ * UWheelBrakeSimple
+ */
+
+UWheelBrakeSimple::UWheelBrakeSimple(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void UWheelBrakeSimple::RequestByPressure(float InBar, double DeltaTime)
+{
+	const float BarToTorq = double(1e5) * BrakeSetup.PadFricCoeff * BrakeSetup.ClpPistNo * BrakeSetup.PistAr * BrakeSetup.EfcRd;
+	CurrentTorque = BrakeSystem->MechanicalBrakeRate.InterpInputValue(DeltaTime, CurrentTorque, InBar * BarToTorq);
+	ConnectedWheel->ReqBrakeTorque += CurrentTorque;
+	CurrentBar = InBar;
+}
+
+void UWheelBrakeSimple::RequestByTorque(float InTorque, double DeltaTime)
+{
+	const float BarToTorq = double(1e5) * BrakeSetup.PadFricCoeff * BrakeSetup.ClpPistNo * BrakeSetup.PistAr * BrakeSetup.EfcRd;
+	ConnectedWheel->ReqBrakeTorque += BrakeSystem->MechanicalBrakeRate.InterpInputValue(DeltaTime, CurrentTorque, InTorque);
+	CurrentTorque = InTorque;
+	CurrentBar = InTorque / BarToTorq;
+}
+
+void UWheelBrakeSimple::RequestByRatio(float InRatio, double DeltaTime)
+{
+	ConnectedWheel->ReqBrakeTorque += BrakeSystem->MechanicalBrakeRate.InterpInputValue(DeltaTime, CurrentTorque, BrakeSetup.MaxTorque * InRatio);
+}
+
+float UWheelBrakeSimple::GetTorque() const
+{
+	return CurrentTorque;
+}
+
+float UWheelBrakeSimple::GetPressure() const
+{
+	return CurrentBar;
+}
+
+float UWheelBrakeSimple::GetLoad() const
+{
+	return CurrentTorque / BrakeSetup.MaxTorque;
+}
+
+/*
+ * UVehicleBrakeSystemSimpleComponent
+ */
+
+UVehicleBrakeSystemSimpleComponent::UVehicleBrakeSystemSimpleComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.bIsPresentInAddMenu = true;
+	GUI.ComponentNameOverride = TEXT("Brake System Simple");
+
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+
+	TickData.bAllowVehiclePrePhysTick = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	bTickInEditor = false;
+	PrimaryComponentTick.TickGroup = TG_PrePhysics;
+
+	WheelBrakesSetup.SetNum(4);
+}
+
+void UVehicleBrakeSystemSimpleComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+}
+
+UWheelBrake* UVehicleBrakeSystemSimpleComponent::GetWheel4WD(E4WDWheelIndex Ind) const
+{
+	if (WheelBrakes4WD.Num() == 4 && Ind != E4WDWheelIndex::None)
+	{
+		return WheelBrakes4WD[int(Ind)].Get();;
+	}
+	else
+	{
+		return nullptr;
+	}
+}
+
+bool UVehicleBrakeSystemSimpleComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	PedalPos = 0;
+
+	WheelBrakes.Empty();
+	WheelBrakes4WD.Empty();
+
+	const TArray<USodaVehicleWheelComponent*> & Wheels = GetWheeledVehicle()->GetWheels();
+	for (auto& Setup : WheelBrakesSetup)
+	{
+		UWheelBrakeSimple * WheelBrake = NewObject<UWheelBrakeSimple>(this);
+		check(WheelBrake);
+		WheelBrake->ConnectedWheel = Setup.ConnectedWheel.GetObject<USodaVehicleWheelComponent>(GetOwner());
+		if (!IsValid(WheelBrake->ConnectedWheel))
+		{
+			WheelBrakes.Empty();
+			SetHealth(EVehicleComponentHealth::Error, TEXT("Can't setup WheelBrake \"") + Setup.ConnectedWheel.PathToSubobject + TEXT("\""));
+			return false;
+		}
+		WheelBrake->BrakeSystem = this;
+		WheelBrake->BrakeSetup = Setup;
+
+		WheelBrakes.Add(WheelBrake);
+	}
+
+	if (GetWheeledVehicle()->Is4WDVehicle())
+	{
+		auto Add4WDWheel = [this](E4WDWheelIndex Index)
+		{
+			if (UWheelBrakeSimple** Wheel = WheelBrakes.FindByPredicate([this, Index](const UWheelBrakeSimple* Wheel) { return IsValid(Wheel->ConnectedWheel) && Wheel->ConnectedWheel->WheelIndex4WD == Index; }))
+			{
+				WheelBrakes4WD.Add(*Wheel);
+			}
+		};
+
+		Add4WDWheel(E4WDWheelIndex::FL);
+		Add4WDWheel(E4WDWheelIndex::FR);
+		Add4WDWheel(E4WDWheelIndex::RL);
+		Add4WDWheel(E4WDWheelIndex::RR);
+		if (WheelBrakes4WD.Num() != 4)
+		{
+			WheelBrakes4WD.Empty();
+		}
+	}
+
+	return true;
+}
+void UVehicleBrakeSystemSimpleComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	for (auto& It : WheelBrakes)
+	{
+		It->ConditionalBeginDestroy();
+	}
+	WheelBrakes.Empty();
+	WheelBrakes4WD.Empty();
+	PedalPos = 0;
+}
+
+void UVehicleBrakeSystemSimpleComponent::RequestByAcceleration(float InAcceleration, double DeltaTime)
+{
+	RequestByForce(InAcceleration * GetWheeledComponentInterface()->GetVehicleMass(), DeltaTime);
+}
+
+void UVehicleBrakeSystemSimpleComponent::RequestByForce(float InForce, double DeltaTime)
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		for (int i = 0; i < WheelBrakesSetup.Num(); ++i)
+		{
+			float BrakeTorq = FMath::Clamp(
+				float(InForce * WheelBrakesSetup[i].BrakeDist * WheelBrakes[i]->ConnectedWheel->Radius / 100.f),
+				0.0f,
+				WheelBrakesSetup[i].MaxTorque);
+
+			WheelBrakes[i]->RequestByTorque(BrakeTorq, DeltaTime);
+		}
+	}
+}
+
+void UVehicleBrakeSystemSimpleComponent::RequestByRatio(float InRatio, double DeltaTime)
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		for (int i = 0; i < WheelBrakesSetup.Num(); ++i)
+		{
+			WheelBrakes[i]->RequestByTorque(WheelBrakesSetup[i].MaxTorque * InRatio, DeltaTime);
+		}
+	}
+}
+
+void UVehicleBrakeSystemSimpleComponent::RequestByPressure(float InBar, double DeltaTime)
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		for (int i = 0; i < WheelBrakesSetup.Num(); ++i)
+		{
+			WheelBrakes[i]->RequestByPressure(WheelBrakesSetup[i].BrakeDist * InBar, DeltaTime);
+		}
+	}
+}
+
+float UVehicleBrakeSystemSimpleComponent::ComputeFullTorqByRatio(float InRatio)
+{
+	return (WheelBrakesSetup[0].MaxTorque + WheelBrakesSetup[1].MaxTorque + WheelBrakesSetup[2].MaxTorque + WheelBrakesSetup[3].MaxTorque) * InRatio;
+}
+
+void UVehicleBrakeSystemSimpleComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos) 
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas && (GetHealth() == EVehicleComponentHealth::Ok))
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		for (int i = 0; i < WheelBrakesSetup.Num(); ++i)
+		{
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Wheel[%i]: %.1fH/mf %i%% "), i, WheelBrakes[i]->GetTorque(), int(WheelBrakes[i]->GetLoad() * 100 + 0.5)), 16, YPos);
+		}
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Pedal Pos: %f"), PedalPos), 16, YPos);
+	}
+}
+
+void UVehicleBrakeSystemSimpleComponent::PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	Super::PrePhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+
+	if (bAcceptPedalFromVehicleInput)
+	{
+		RequestByRatio(PedalPos, DeltaTime);
+	}
+}
+
+void UVehicleBrakeSystemSimpleComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+
+	if (bAcceptPedalFromVehicleInput)
+	{
+		if (UVehicleInputComponent* VehicleInput = GetWheeledVehicle()->GetActiveVehicleInput())
+		{
+			PedalPos = VehicleInput->GetBrakeInput();
+		}
+		else
+		{
+			PedalPos = 0;
+		}
+	}
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleDifferentialComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleDifferentialComponent.cpp
new file mode 100644
index 0000000..7c01989
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleDifferentialComponent.cpp
@@ -0,0 +1,120 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Mechanicles/VehicleDifferentialComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Engine/Canvas.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+
+UVehicleDifferentialBaseComponent::UVehicleDifferentialBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Mechanicles");
+	GUI.IcanName = TEXT("SodaIcons.Differential");
+
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+UVehicleDifferentialSimpleComponent::UVehicleDifferentialSimpleComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Differential Simple");
+	GUI.bIsPresentInAddMenu = true;
+}
+
+bool UVehicleDifferentialSimpleComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (!GetWheeledVehicle()->Is4WDVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Support only 4WD vehicles"));
+		return false;
+	}
+
+	return true;
+}
+
+void UVehicleDifferentialSimpleComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UVehicleDifferentialSimpleComponent::PassTorque(float InTorque)
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		DebugInTorq = InTorque;
+		DebugOutTorq = InTorque * Ratio * 0.5;
+
+		switch (DifferentialType)
+		{
+		case EVehicleDifferentialType::Open_FrontDrive:
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->ReqTorq += DebugOutTorq;
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->ReqTorq += DebugOutTorq;
+			break;
+
+		case EVehicleDifferentialType::Open_RearDrive:
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->ReqTorq += DebugOutTorq;
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->ReqTorq += DebugOutTorq;
+			break;
+		}
+	}
+	else
+	{
+		DebugInTorq = 0;
+		DebugOutTorq = 0;
+	}
+}
+
+float UVehicleDifferentialSimpleComponent::ResolveAngularVelocity() const
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		switch (DifferentialType)
+		{
+		case EVehicleDifferentialType::Open_FrontDrive:
+			DebugInAngularVelocity = std::max(GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->AngularVelocity, GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->AngularVelocity);
+			break;
+		case EVehicleDifferentialType::Open_RearDrive:
+			DebugInAngularVelocity = std::max(GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->AngularVelocity, GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->AngularVelocity);
+			break;
+		}
+		DebugOutAngularVelocity = DebugInAngularVelocity * Ratio;
+		return DebugOutAngularVelocity;
+	}
+	return 0;
+}
+
+float UVehicleDifferentialSimpleComponent::FindWheelRadius() const
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		switch (DifferentialType)
+		{
+		case EVehicleDifferentialType::Open_FrontDrive:
+			return (GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->Radius + GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->Radius) / 2.0;
+		case EVehicleDifferentialType::Open_RearDrive:
+			return (GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->Radius + GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->Radius) / 2.0;
+		}
+	}
+	return 0;
+}
+
+void UVehicleDifferentialSimpleComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("InTorq: %.2f "), DebugInTorq), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OutTorq: %.2f "), DebugOutTorq), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("InAngVel: %.2f "), DebugInAngularVelocity), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OutAngVel: %.2f "), DebugOutAngularVelocity), 16, YPos);
+	}
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleEngineComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleEngineComponent.cpp
new file mode 100644
index 0000000..04fbe91
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleEngineComponent.cpp
@@ -0,0 +1,208 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Mechanicles/VehicleEngineComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/SodaStatics.h"
+#include "Engine/Canvas.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "UObject/ConstructorHelpers.h"
+
+UVehicleEngineBaseComponent::UVehicleEngineBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Mechanicles");
+	GUI.IcanName = TEXT("SodaIcons.Motor");
+
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+bool UVehicleEngineBaseComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	UObject* TorqueTransmissionObject = LinkToTorqueTransmission.GetObject<UObject>(GetOwner());
+	ITorqueTransmission* TorqueTransmissionInterface = Cast<ITorqueTransmission>(TorqueTransmissionObject);
+	if (TorqueTransmissionObject && TorqueTransmissionInterface)
+	{
+		OutputTorqueTransmission.SetInterface(TorqueTransmissionInterface);
+		OutputTorqueTransmission.SetObject(TorqueTransmissionObject);
+	}
+	else
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Transmission isn't connected"));
+		return false;
+	}
+	
+	return true;
+}
+
+void UVehicleEngineBaseComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+float UVehicleEngineBaseComponent::FindWheelRadius() const
+{
+	float Ret = 0;
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		Ret = OutputTorqueTransmission->FindWheelRadius();
+	}
+
+	if (bVerboseLog)
+	{
+		UE_LOG(LogSoda, Log, TEXT("UVehicleEngineBaseComponent::FindWheelRadius() return %f; Name: %s"), Ret, *GetFName().ToString());
+	}
+
+	return Ret;
+}
+
+float UVehicleEngineBaseComponent::FindToWheelRatio() const
+{
+	float Ret = 1;
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		Ret = OutputTorqueTransmission->FindToWheelRatio() * Ratio;
+	}
+
+	if (bVerboseLog)
+	{
+		UE_LOG(LogSoda, Log, TEXT("UVehicleEngineBaseComponent::FindToWheelRatio() return %f; Name: %s"), Ret, *GetFName().ToString());
+	}
+
+	return Ret;
+}
+
+/********************************************************************************************************/
+
+UVehicleEngineSimpleComponent::UVehicleEngineSimpleComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Engine Simple");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+
+	TickData.bAllowVehiclePrePhysTick = true;
+	TickData.bAllowVehiclePostPhysTick = true;
+	TickData.PostPhysTickGroup = EVehicleComponentPostPhysTickGroup::TickGroup5;
+
+	static ConstructorHelpers::FObjectFinder<UCurveFloat> EngineCurevePtr(TEXT("/SodaSim/Assets/CPP/Curves/ElectricEngine/Engine_100Hm.Engine_100Hm"));
+	TorqueCurve.ExternalCurve = EngineCurevePtr.Object;
+}
+
+void UVehicleEngineSimpleComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		MaxTorq = TorqueCurve.ExternalCurve->GetFloatValue(AngularVelocity * ANG2RPM) * TorqueCurveMultiplier;
+	}
+
+	if (bAcceptPedalFromVehicleInput)
+	{
+		if (UVehicleInputComponent* VehicleInput = GetWheeledVehicle()->GetActiveVehicleInput())
+		{
+			PedalPos = VehicleInput->GetThrottleInput();
+		}
+		else
+		{
+			PedalPos = 0;
+		}
+	}
+}
+
+bool UVehicleEngineSimpleComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	PedalPos = 0;
+
+	if (!TorqueCurve.ExternalCurve)
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("TorqueCurve isn't set"));
+		return false;
+	}
+
+	return true;
+}
+
+void UVehicleEngineSimpleComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	PedalPos = 0;
+}
+
+void UVehicleEngineSimpleComponent::RequestByTorque(float InTorque)
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		RequestedTorque = InTorque;
+		if (InTorque >= 0)
+		{
+			ActualTorque = std::min(InTorque, MaxTorq);
+		}
+		else
+		{
+			ActualTorque = -std::min(-InTorque, MaxTorq);
+		}
+
+		float Out = ActualTorque * Ratio;
+
+		if (bVerboseLog)
+		{
+			UE_LOG(LogSoda, Log, TEXT("UVehicleEngineBaseComponent::RequestByTorque(); In torq: %f; Out torq: %f; Name: %s"), InTorque,  Out, *GetFName().ToString());
+		}
+
+		OutputTorqueTransmission->PassTorque(Out);
+	}
+}
+
+void UVehicleEngineSimpleComponent::PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	Super::PrePhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+
+	if (bAcceptPedalFromVehicleInput)
+	{
+		RequestByRatio(PedalPos);
+	}
+}
+
+void UVehicleEngineSimpleComponent::PostPhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp & Timestamp)
+{
+	Super::PostPhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		AngularVelocity = OutputTorqueTransmission->ResolveAngularVelocity() * Ratio;
+		if (bVerboseLog)
+		{
+			UE_LOG(LogSoda, Log, TEXT("UVehicleEngineBaseComponent::PostPhysicSimulation(); AngularVelocity: %f; MaxTorq: %f Name: %s"), AngularVelocity, MaxTorq, *GetFName().ToString());
+		}
+	}
+}
+
+void UVehicleEngineSimpleComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Req/Act/Max Torq: %.2f / %.2f / %.2f H/m"), RequestedTorque, ActualTorque, MaxTorq), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Load: %d"), int(GetEngineLoad() * 100 + 0.5)), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("AngVel: %.2f rad/s"), AngularVelocity), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Pedal Pos: %.2f"), PedalPos), 16, YPos);
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleGearBoxComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleGearBoxComponent.cpp
new file mode 100644
index 0000000..61d991f
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleGearBoxComponent.cpp
@@ -0,0 +1,179 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Mechanicles/VehicleGearBoxComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Engine/Canvas.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+
+UVehicleGearBoxBaseComponent::UVehicleGearBoxBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Mechanicles");
+	GUI.IcanName = TEXT("SodaIcons.GearBox");
+
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+UVehicleGearBoxSimpleComponent::UVehicleGearBoxSimpleComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Gear Box Simple");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	bTickInEditor = false;
+	PrimaryComponentTick.TickGroup = TG_PrePhysics;
+}
+
+bool UVehicleGearBoxSimpleComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (GetVehicle())
+	{
+		UObject* TorqueTransmissionObject = LinkToTorqueTransmission.GetObject<UObject>(GetOwner());
+		ITorqueTransmission* TorqueTransmissionInterface = Cast<ITorqueTransmission>(TorqueTransmissionObject);
+		if (TorqueTransmissionObject && TorqueTransmissionInterface)
+		{
+			OutputTorqueTransmission.SetInterface(TorqueTransmissionInterface);
+			OutputTorqueTransmission.SetObject(TorqueTransmissionObject);
+		}
+		else
+		{
+			AddDebugMessage(EVehicleComponentHealth::Error, TEXT("Transmission isn't connected"));
+		}
+	}
+
+	if (!OutputTorqueTransmission)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		return false;
+	}
+
+	return true;
+}
+
+void UVehicleGearBoxSimpleComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+
+void UVehicleGearBoxSimpleComponent::PassTorque(float InTorque)
+{
+	DebugInTorq = InTorque;
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		DebugOutTorq = InTorque * Ratio;
+		OutputTorqueTransmission->PassTorque(DebugOutTorq);
+	}
+	else
+	{
+		DebugInTorq = 0;
+		DebugOutTorq = 0;
+	}
+}
+
+float UVehicleGearBoxSimpleComponent::ResolveAngularVelocity() const
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		DebugInAngularVelocity = OutputTorqueTransmission->ResolveAngularVelocity();
+		DebugOutAngularVelocity = DebugInAngularVelocity * Ratio;
+		return DebugOutAngularVelocity;
+	}
+	else
+	{
+		DebugInAngularVelocity = 0;
+		DebugOutAngularVelocity = 0;
+		return 0;
+	}
+}
+
+float UVehicleGearBoxSimpleComponent::FindWheelRadius() const
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		return OutputTorqueTransmission->FindWheelRadius();
+	}
+	return 0;
+}
+
+float UVehicleGearBoxSimpleComponent::FindToWheelRatio() const
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		return OutputTorqueTransmission->FindToWheelRatio() * Ratio;
+	}
+	return 1.0;
+}
+
+FString UVehicleGearBoxSimpleComponent::GetGearChar() const
+{
+	switch (Gear)
+	{
+	case ENGear::Neutral: return TEXT("N");
+	case ENGear::Drive: return TEXT("D");
+	case ENGear::Reverse: return TEXT("R");
+	case ENGear::Park: return TEXT("P");
+	}
+	return TEXT("?");
+}
+
+void UVehicleGearBoxSimpleComponent::SetGear(ENGear InGear)
+{
+	Gear = InGear;
+
+	switch(Gear)
+	{
+	case ENGear::Drive:
+		Ratio = DGearRatio;
+		break;
+	case ENGear::Reverse:
+		Ratio = -RGearRatio;
+		break;
+	case ENGear::Park:
+	case ENGear::Neutral:
+		Ratio = 0;
+		break;
+	};
+}
+
+void UVehicleGearBoxSimpleComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+
+	if (bAcceptGearFromVehicleInput)
+	{
+		if (UVehicleInputComponent* VehicleInput = GetWheeledVehicle()->GetActiveVehicleInput())
+		{
+			ENGear NewGear = VehicleInput->GetGearInput();
+			if (Gear != NewGear)
+			{
+				SetGear(NewGear);
+			}
+		}
+	}
+}
+
+void UVehicleGearBoxSimpleComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Gear: %s "), *GetGearChar()), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Ratio: %.2f "), Ratio), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("InTorq: %.2f "), DebugInTorq), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OutTorq: %.2f "), DebugOutTorq), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("InAngVel: %.2f "), DebugInAngularVelocity), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OutAngVel: %.2f "), DebugOutAngularVelocity), 16, YPos);
+	}
+}
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.cpp
new file mode 100644
index 0000000..e136a7c
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.cpp
@@ -0,0 +1,81 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Engine/Canvas.h"
+
+UVehicleHandBrakeBaseComponent::UVehicleHandBrakeBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Mechanicles");
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+UVehicleHandBrakeSimpleComponent::UVehicleHandBrakeSimpleComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Hand Brake Simple");
+	GUI.IcanName = TEXT("SodaIcons.Braking");
+	GUI.bIsPresentInAddMenu = true;
+}
+
+bool UVehicleHandBrakeSimpleComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (!GetWheeledVehicle()->Is4WDVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Support only 4WD vehicles"));
+		return false;
+	}
+
+	return true;
+}
+
+void UVehicleHandBrakeSimpleComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UVehicleHandBrakeSimpleComponent::RequestByRatio(float InRatio)
+{
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+	{
+		switch (HandBrakeMode)
+		{
+		case EHandBrakeMode::FrontWheels:
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			break;
+		case EHandBrakeMode::RearWheels:
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			break;
+		case EHandBrakeMode::FourWheel:
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->ReqBrakeTorque += MaxHandBrakeTorque * InRatio;
+			break;
+		}
+
+		CurrentRatio = 0;
+	}
+}
+
+void UVehicleHandBrakeSimpleComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Ratio: %.2f"), CurrentRatio), 16, YPos);
+	}
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleSteeringComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleSteeringComponent.cpp
new file mode 100644
index 0000000..ab7d235
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Mechanicles/VehicleSteeringComponent.cpp
@@ -0,0 +1,130 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Mechanicles/VehicleSteeringComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Engine/Canvas.h"
+#include "VehicleUtility.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "UObject/ConstructorHelpers.h"
+#include <algorithm>
+
+UVehicleSteeringRackBaseComponent::UVehicleSteeringRackBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Mechanicles");
+	GUI.IcanName = TEXT("SodaIcons.Steering");
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+UVehicleSteeringRackSimpleComponent::UVehicleSteeringRackSimpleComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Steering Rack Simple");
+	GUI.bIsPresentInAddMenu = true;
+
+	TickData.bAllowVehiclePrePhysTick = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	bTickInEditor = false;
+	PrimaryComponentTick.TickGroup = TG_PrePhysics;
+
+	static ConstructorHelpers::FObjectFinder<UCurveFloat> SteeringCurvePtr(TEXT("/SodaSim/Assets/CPP/Curves/SteeringRack_SteerSpeed.SteeringRack_SteerSpeed"));
+	SteeringCurve.ExternalCurve = SteeringCurvePtr.Object;
+}
+
+bool UVehicleSteeringRackSimpleComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	SteerInputRatio = 0;
+
+	if (!GetWheeledVehicle()->Is4WDVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Support only 4WD vehicles"));
+		return false;
+	}
+
+	if (!SteeringCurve.ExternalCurve)
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("SteeringCurve isn't set"));
+		return false;
+	}
+
+	return true;
+}
+
+void UVehicleSteeringRackSimpleComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	SteerInputRatio = 0;
+}
+
+void UVehicleSteeringRackSimpleComponent::UpdateSteer(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	float ForwardSpeed = Chaos::CmSToKmH(VehicleKinematic.Curr.GetLocalVelocity().X);
+
+	float SteerSpeed = SteeringCurve.ExternalCurve->GetFloatValue(ForwardSpeed) / 180.0 * M_PI;
+	float DeltaSteerReq = TargetSteerAng - CurrentSteerAng;
+	float DeltaSteer = SteerSpeed * DeltaTime;
+
+	if (DeltaSteerReq < 0) DeltaSteer = -DeltaSteer;
+
+	CurrentSteerAng += std::abs(DeltaSteerReq) < std::abs(DeltaSteer) ? DeltaSteerReq : DeltaSteer;
+	CurrentSteerAng = FMath::Clamp(CurrentSteerAng, -MaxSteerAngle, MaxSteerAngle);
+
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->ReqSteer = CurrentSteerAng;
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->ReqSteer = CurrentSteerAng;
+}
+
+void UVehicleSteeringRackSimpleComponent::PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp & Timestamp)
+{
+	Super::PrePhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+
+	if (GetHealth() != EVehicleComponentHealth::Ok) return;
+
+	if (bAcceptSteerFromVehicleInput)
+	{
+		RequestByRatio(SteerInputRatio);
+	}
+
+	UpdateSteer(DeltaTime, VehicleKinematic, Timestamp);
+}
+
+void UVehicleSteeringRackSimpleComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Current Angle: %.2f "), CurrentSteerAng / M_PI * 180), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Target Angle:  %.2f "), TargetSteerAng / M_PI * 180), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Steer Input Ratio:  %.2f "), SteerInputRatio), 16, YPos);
+	}
+}
+
+void UVehicleSteeringRackSimpleComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+
+	if (bAcceptSteerFromVehicleInput)
+	{
+		if (UVehicleInputComponent* VehicleInput = GetWheeledVehicle()->GetActiveVehicleInput())
+		{
+			SteerInputRatio = VehicleInput->GetSteeringInput();
+		}
+		else
+		{
+			SteerInputRatio = 0;
+		}
+	}
+}
+
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Others/CsvLogger.cpp b/Source/UnrealSoda/Private/VehicleComponents/Others/CsvLogger.cpp
new file mode 100644
index 0000000..30b3002
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Others/CsvLogger.cpp
@@ -0,0 +1,175 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Others/CsvLogger.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "DrawDebugHelpers.h"
+
+UCSVLoggerComponent::UCSVLoggerComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Other");
+	GUI.ComponentNameOverride = TEXT("CSV Logger");
+	GUI.bIsPresentInAddMenu = true;
+
+	TickData.bAllowVehiclePostDeferredPhysTick = true;
+}
+
+
+void UCSVLoggerComponent::PostPhysicSimulationDeferred(float DeltaTimeIn, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& TimestampIn)
+{
+	Super::PostPhysicSimulationDeferred(DeltaTimeIn, VehicleKinematic, TimestampIn);
+
+	/*
+	if (Health != EVehicleComponentHealth::Ok) return;
+>>>>>>> release_0.12.0:Source/UnrealSoda/Private/VehicleComponents/Others/CsvLogger.cpp
+
+	FTransform WorldPose;
+	FVector WorldVel;
+	FVector LocalAcc;
+	FVector Gyro;
+	VehicleKinematic.CalcIMU(GetRelativeTransform(), WorldPose, WorldVel, LocalAcc, Gyro);
+
+	auto DeltaTime = TimestampIn - PrevTimestamp;
+	PrevTimestamp = TimestampIn;
+
+	auto LogDeltaTime = TimestampIn - PrevLoggedTimeMark;
+	const std::chrono::nanoseconds Period2((int64)(Period * 1000));
+
+	if (LogDeltaTime < Period2)
+		return;
+
+	if (LogDeltaTime < Period2)
+		PrevLoggedTimeMark += Period2;
+	else
+		PrevLoggedTimeMark = TimestampIn;
+
+	FVector WorldLoc = GetComponentLocation();
+	FRotator WorldRot = GetComponentRotation();
+	FVector LocalVel = WorldPose.Rotator().UnrotateVector(WorldVel);
+
+	float DeltaTravel = (WorldLoc - PrevLocaion).Size() / 100;
+	PrevLocaion = WorldLoc;
+
+	UVehicleInputComponent* VehicleInput = WheeledVehicle->GetActiveVehicleInput();
+	
+	if (VehicleInput)
+	{
+		DistanceTravelled += DeltaTravel;
+
+		float VelMPH = (fabs(LocalVel.X) / 100) * 2.23694f; // convert to mph 
+
+		TimeTravelled += DeltaTime;
+
+		FVector Travel = WorldLoc - StartLocation;
+
+		FString Output;
+		Output += FString::FromInt(TimeTravelled) + ", ";
+		Output += FString::SanitizeFloat(DistanceTravelled) + ", ";
+		Output += FString(LocalVel.X > 0.f ? "Forward" : "Backward") + ", ";
+		Output += FString::SanitizeFloat(VelMPH) + ", ";
+		Output += FString::SanitizeFloat(LocalAcc.X / 100) + ", ";
+		Output += FString::SanitizeFloat(Travel.X / 100) + ", " + FString::SanitizeFloat(Travel.Y / 100) + ", ";
+		Output += FString::SanitizeFloat(LocalAcc.Y / 100) + ", ";
+		Output += FString::SanitizeFloat(VehicleInput->GetThrottleInput() * 100) + ", ";
+		Output += FString::SanitizeFloat(VehicleInput->GetBrakeInput() * 100) + ", ";
+		Output += FString::SanitizeFloat(VehicleInput->GetSteeringInput() * 100) + ", ";
+
+		switch (VehicleInput->GetGearInput())
+		{
+		case ENGear::Park:
+			Output += "Park";
+			break;
+
+		case ENGear::Reverse:
+			Output += "Reverse";
+			break;
+
+		case ENGear::Neutral:
+			Output += "Neutral";
+			break;
+
+		case ENGear::Drive:
+			Output += "Drive";
+			break;
+		}
+
+		if (bAddTimeMarkToNextTick)
+		{
+			Output += FString::Printf(TEXT(", %lld"), TimestampIn);
+			bAddTimeMarkToNextTick = false;
+		}
+
+		CsvOutFile << TCHAR_TO_UTF8(*Output) << "\n";
+		if (bDrawDebugCanvas)
+			UE_LOG(LogSoda, Log, TEXT("UCSVLoggerComponent: %s"), *Output);
+	}
+	*/
+}
+
+void UCSVLoggerComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	/*
+	if (!IsTickOnCurrentFrame()) return;
+
+	if (GetHealth() == EVehicleComponentHealth::Ok)
+		GEngine->AddOnScreenDebugMessage(INDEX_NONE, 0.f, FColor::Red, FString("DATALOG REC"));
+
+	UWorld* World = GetWorld();
+	APlayerController* PlayerController = World->GetFirstPlayerController();
+	if ((PlayerController != nullptr) && (WheeledVehicle != nullptr) && (WheeledVehicle->IsPlayerControlled()))
+	{
+		if (PlayerController->WasInputKeyJustPressed(ToggleKeyInput))
+		{
+			Toggle();
+		}
+
+		bAddTimeMarkToNextTick = PlayerController->WasInputKeyJustPressed(PutTimeMarkKeyInput);
+	}
+	*/
+
+}
+
+bool UCSVLoggerComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	/*
+
+	CsvOutFile.close();
+
+	FString Filename = CvsFileNameBase;
+	Filename.Appendf(TEXT("_%d.csv"), CvsFileNameIndex);
+	CsvOutFile.open(TCHAR_TO_UTF8(*Filename), std::ofstream::out);
+
+	if (CsvOutFile.is_open())
+	{
+		CsvOutFile << "Time travelled (ms), Distance travelled (m), Movement direction, Speed(mph), Longitudinal acceleration (m/s2), Movement of the vehicle relative to the starting position (X Y) (m), Lateral acceleration(m/s2), Throttle input(%), Brake input(%), Steering wheel input(%), Gear, TimeMark\n";
+		CvsFileNameIndex++;
+	}
+	else
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		return false;
+	}
+	*/
+
+	return true;
+}
+
+void UCSVLoggerComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	/*
+	CsvOutFile.close();
+	*/
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Others/OdometryTest.cpp b/Source/UnrealSoda/Private/VehicleComponents/Others/OdometryTest.cpp
new file mode 100644
index 0000000..1e64d73
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Others/OdometryTest.cpp
@@ -0,0 +1,170 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Others/OdometryTest.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Misc/MathUtils.hpp"
+#include "Soda/SodaTypes.h"
+#include "Engine/CanvasRenderTarget2D.h"
+#include "Kismet/KismetRenderingLibrary.h"
+#include "Engine/Canvas.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Widgets/SWindow.h"
+
+UOdometryTestComponent::UOdometryTestComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Odometry Test");
+	GUI.Category = TEXT("Other");
+	GUI.bIsPresentInAddMenu = true;
+
+	TelemetryGrid.InitGrid(1, 3, 300, 300, 500);	
+	TelemetryGrid.InitCell(0, 0, -50, 50, "", TEXT("Velocity [cm/s]"), { {255, 0, 0, 128}, {0, 255, 0, 128}, {0, 0, 255, 128} });
+	TelemetryGrid.InitCell(0, 1, -0.5, 0.5, "", TEXT("Orientation [deg]"), { {255, 0, 0, 128}, {0, 255, 0}, {0, 0, 255, 128} });
+	TelemetryGrid.InitCell(0, 2, -5, 5, "", TEXT("Pose [m]"), { {255, 0, 0, 128}, {0, 255, 0, 128}, {0, 0, 255, 128} });
+}
+
+void UOdometryTestComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+}
+
+void UOdometryTestComponent::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+}
+
+bool UOdometryTestComponent::OnActivateVehicleComponent()
+{
+	return Super::OnActivateVehicleComponent();
+}
+
+void UOdometryTestComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	if (IsValid(GraphWindow))
+	{
+		GraphWindow->Close();
+	}
+}
+
+void UOdometryTestComponent::GetRemark(FString & Info) const
+{
+	Info = "";
+}
+
+void UOdometryTestComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if(Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+
+		Canvas->SetDrawColor(FColor::White);
+		//YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS mode: %d"), OXTS_PositionMode), 16, YPos);
+	}
+
+	if (IsValid(GraphWindow) && GraphWindow->ExtraWindow && IsValid(CanvasRenderTarget2D))
+	{
+		const int Width = int(GraphWindow->ExtraWindow->GetClientSizeInScreen().X);
+		const int Height = int(GraphWindow->ExtraWindow->GetClientSizeInScreen().Y);
+		if (CanvasRenderTarget2D->GetSurfaceWidth() != Width || CanvasRenderTarget2D->GetSurfaceHeight() != Height)
+		{
+			CanvasRenderTarget2D->ResizeTarget(Width, Height);
+		}
+		CanvasRenderTarget2D->UpdateResource();
+
+		FDrawToRenderTargetContext Context;
+		UCanvas* Canvas2 = nullptr;
+		FVector2D CanvasSize;
+		UKismetRenderingLibrary::BeginDrawCanvasToRenderTarget(this, CanvasRenderTarget2D, Canvas2, CanvasSize, Context);
+		float XPos = 10;
+		TelemetryGrid.Draw(Canvas2, XPos, 10);
+		UKismetRenderingLibrary::EndDrawCanvasToRenderTarget(this, Context);
+
+	}
+}
+
+void UOdometryTestComponent::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp & Timestamp)
+{
+	Super::PostPhysicSimulationDeferred(DeltaTime, VehicleKinematic, Timestamp);
+
+	const static FVector G { 0, 0, -980.f };
+
+	if (!HealthIsWorkable()) return;
+
+	VehicleKinematic.CalcIMU(GetRelativeTransform(), WorldPose, WorldVel, LocalAcc, Gyro, G.Z);
+
+	if (bIsFirstTick)
+	{
+		bIsFirstTick = false;
+		if (bInitPositionFromZero)
+		{
+			P = { 0, 0, 0 };
+			Q = FQuat(EForceInit::ForceInit);
+		}
+		else
+		{
+			P = WorldPose.GetTranslation();
+			Q = WorldPose.GetRotation();
+		}
+		V = WorldVel;
+	}
+
+	/* Compute odometry */
+
+	const FVector Acc = Q.RotateVector(-LocalAcc) + G;
+	P += (V * DeltaTime + (Acc * DeltaTime * DeltaTime * 0.5));
+	V += Acc * DeltaTime;
+	Q *= QExp(Gyro * DeltaTime);
+	Q.Normalize();
+
+	if (IsValid(GraphWindow) && GraphWindow->ExtraWindow && IsValid(CanvasRenderTarget2D))
+	{
+		FVector dV = (V - WorldVel);
+		FVector dP = (P - WorldPose.GetTranslation()) / 100;
+		FRotator dR = Q.Rotator() - WorldPose.GetRotation().Rotator();
+
+		TelemetryGrid.AddPoint(0, 0, dV.X, 0);
+		TelemetryGrid.AddPoint(0, 0, dV.Y, 1);
+		TelemetryGrid.AddPoint(0, 0, dV.Z, 2);
+		TelemetryGrid.AddPoint(0, 1, dR.Roll , 0);
+		TelemetryGrid.AddPoint(0, 1, dR.Pitch, 1);
+		TelemetryGrid.AddPoint(0, 1, dR.Yaw, 2);
+		TelemetryGrid.AddPoint(0, 2, dP.X, 0);
+		TelemetryGrid.AddPoint(0, 2, dP.Y, 1);
+		TelemetryGrid.AddPoint(0, 2, dP.Z, 2);
+	}
+
+	//UE_LOG(LogSoda, Log, TEXT("%s | %s"),* Q.Rotator().ToString(), *WorldPose.GetRotation().Rotator().ToString());
+	//UE_LOG(LogSoda, Log, TEXT("%s | %s"), *V.ToString(), *WorldVel.ToString());
+	//UE_LOG(LogSoda, Log, TEXT("%s | %s"), *P.ToString(), *WorldPose.GetTranslation().ToString());
+}
+
+FOdometryData UOdometryTestComponent::GetOdometry() const
+{
+	FScopeLock ScopeLock(&GetVehicle()->PhysicMutex);
+
+	return FOdometryData {
+		P, Q.Rotator(), V,
+		WorldPose.GetTranslation(),  WorldPose.GetRotation().Rotator(), WorldVel
+	};
+}
+
+void UOdometryTestComponent::ShowGraphs()
+{
+	if (!IsValid(GraphWindow))
+	{
+		GraphWindow = NewObject<UExtraWindow>();
+		check(GraphWindow);
+	}
+
+	if (!IsValid(CanvasRenderTarget2D))
+	{
+		CanvasRenderTarget2D = UCanvasRenderTarget2D::CreateCanvasRenderTarget2D(this, UCanvasRenderTarget2D::StaticClass(), 1050, 500); 
+		check(CanvasRenderTarget2D);
+	}
+
+	GraphWindow->OpenCameraWindow(CanvasRenderTarget2D);
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Others/V2V.cpp b/Source/UnrealSoda/Private/VehicleComponents/Others/V2V.cpp
new file mode 100644
index 0000000..a88430c
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Others/V2V.cpp
@@ -0,0 +1,345 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Others/V2V.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "DrawDebugHelpers.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Engine/StaticMesh.h"
+#include "Soda/SodaStatics.h"
+#include "Sockets.h"
+#include "SocketSubsystem.h"
+#include "Soda/LevelState.h"
+
+int UV2VTransmitterComponent::IDsCounter = 10000;
+
+UV2VTransmitterComponent::UV2VTransmitterComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Other");
+	GUI.ComponentNameOverride = TEXT("V2V Transmitter");
+	GUI.IcanName = TEXT("SodaIcons.Modem");
+	GUI.bIsPresentInAddMenu = true;
+}
+
+void UV2VTransmitterComponent::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if (bAutoCalculateBoundingBox)
+	{
+		CalculateBoundingBox();
+	}
+
+	if (bAssignUniqueIdAtStartup)
+	{
+		ID = IDsCounter;
+	}
+
+	++IDsCounter;
+}
+
+void UV2VTransmitterComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	//if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+}
+
+bool UV2VTransmitterComponent::OnActivateVehicleComponent()
+{
+	return Super::OnActivateVehicleComponent();
+}
+
+void UV2VTransmitterComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UV2VTransmitterComponent::GetRemark(FString& Info) const
+{
+	Info = "ID: " + FString::FromInt(ID);
+}
+
+bool UV2VTransmitterComponent::FillV2VMsg(soda::V2VSimulatedObject& V2V_data, bool RecalculateBoundingBox, bool DrawDebug)
+{
+	if (RecalculateBoundingBox)
+	{
+		CalculateBoundingBox();
+	}
+	UPrimitiveComponent* BasePrimComp = Cast< UPrimitiveComponent >(GetAttachParent());
+	if (BasePrimComp)
+	{
+		FVector WorldLoc = GetComponentLocation();
+		FRotator WorldRot = GetComponentRotation();
+		FTransform Trans = GetComponentTransform();
+		FVector WorldVel = BasePrimComp->GetPhysicsLinearVelocityAtPoint(GetComponentLocation());
+		FVector AngVel = BasePrimComp->GetPhysicsAngularVelocityInRadians();
+		FVector LocalVel = Trans.Rotator().UnrotateVector(WorldVel);
+
+		V2V_data.id = ID;
+
+		V2V_data.bounding_box0_X = BoundingBox0.X;
+		V2V_data.bounding_box0_Y = BoundingBox0.Y;
+		V2V_data.bounding_box1_X = BoundingBox1.X;
+		V2V_data.bounding_box1_Y = BoundingBox1.Y;
+		V2V_data.bounding_box2_X = BoundingBox2.X;
+		V2V_data.bounding_box2_Y = BoundingBox2.Y;
+		V2V_data.bounding_box3_X = BoundingBox3.X;
+		V2V_data.bounding_box3_Y = BoundingBox3.Y;
+
+		V2V_data.bounding_3d_box0_X = BoundingBox0.X;
+		V2V_data.bounding_3d_box0_Y = BoundingBox0.Y;
+		V2V_data.bounding_3d_box0_Z = BoundingBox0.Z;
+		V2V_data.bounding_3d_box1_X = BoundingBox1.X;
+		V2V_data.bounding_3d_box1_Y = BoundingBox1.Y;
+		V2V_data.bounding_3d_box1_Z = BoundingBox1.Z;
+		V2V_data.bounding_3d_box2_X = BoundingBox2.X;
+		V2V_data.bounding_3d_box2_Y = BoundingBox2.Y;
+		V2V_data.bounding_3d_box2_Z = BoundingBox2.Z;
+		V2V_data.bounding_3d_box3_X = BoundingBox3.X;
+		V2V_data.bounding_3d_box3_Y = BoundingBox3.Y;
+		V2V_data.bounding_3d_box3_Z = BoundingBox3.Z;
+		V2V_data.bounding_3d_box4_X = BoundingBox4.X;
+		V2V_data.bounding_3d_box4_Y = BoundingBox4.Y;
+		V2V_data.bounding_3d_box4_Z = BoundingBox4.Z;
+		V2V_data.bounding_3d_box5_X = BoundingBox5.X;
+		V2V_data.bounding_3d_box5_Y = BoundingBox5.Y;
+		V2V_data.bounding_3d_box5_Z = BoundingBox5.Z;
+		V2V_data.bounding_3d_box6_X = BoundingBox6.X;
+		V2V_data.bounding_3d_box6_Y = BoundingBox6.Y;
+		V2V_data.bounding_3d_box6_Z = BoundingBox6.Z;
+		V2V_data.bounding_3d_box7_X = BoundingBox7.X;
+		V2V_data.bounding_3d_box7_Y = BoundingBox7.Y;
+		V2V_data.bounding_3d_box7_Z = BoundingBox7.Z;
+
+		FVector Desp(100.f * (BoundingBox0.X + BoundingBox2.X) / 2, 100.f * (BoundingBox0.Y + BoundingBox2.Y) / 2, 100.f * (BoundingBox0.Z + BoundingBox6.Z) / 2);
+		FVector Extent(100.f * (BoundingBox0.X - BoundingBox2.X), 100.f * (BoundingBox0.Y - BoundingBox2.Y), 100.f * (BoundingBox6.Z - BoundingBox0.Z));
+
+		double Lon, Lat, Alt;
+		GetLevelState()->GetLLConverter().UE2LLA(WorldLoc, Lon, Lat, Alt);
+
+		V2V_data.timestamp = soda::RawTimestamp<std::chrono::milliseconds>(SodaApp.GetSimulationTimestamp());
+		V2V_data.longitude = Lon / 180.0 * M_PI;
+		V2V_data.latitude = Lat / 180.0 * M_PI;
+		V2V_data.altitude = Alt;
+		V2V_data.roll = WorldRot.Roll / 180.0 * M_PI;
+		V2V_data.pitch = WorldRot.Pitch / 180.0 * M_PI;
+		V2V_data.yaw = NormAngRad(-WorldRot.Yaw / 180 * M_PI + M_PI);
+		V2V_data.vel_forward = LocalVel.X / 100.0;
+		V2V_data.vel_lateral = -LocalVel.Y / 100.0;
+		V2V_data.vel_up = LocalVel.Z / 100.0;
+		V2V_data.ang_vel_roll = -AngVel.X;
+		V2V_data.ang_vel_pitch = AngVel.Y;
+		V2V_data.ang_vel_yaw = AngVel.Z;
+
+		if (DrawDebug)
+		{
+#if ENABLE_DRAW_DEBUG
+			DrawDebugBox(GetWorld(), WorldLoc + WorldRot.RotateVector(Desp), Extent * 0.5f, FQuat(WorldRot), FColor::Green, false, -1.f, 0.0f, 5.f);
+			DrawDebugString(GetWorld(), WorldLoc, *FString::Printf(TEXT("object_id=%d, yaw=%f"), V2V_data.id, V2V_data.yaw), NULL, FColor::Green, 0.0f, false);
+#endif
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+bool UV2VTransmitterComponent::FillV2VMsg(soda::V2XRenderObject& V2V_data, bool RecalculateBoundingBox, bool DrawDebug)
+{
+	if (RecalculateBoundingBox)
+	{
+		CalculateBoundingBox();
+	}
+	UPrimitiveComponent* BasePrimComp = Cast< UPrimitiveComponent >(GetAttachParent());
+
+	if (BasePrimComp)
+	{
+		FVector WorldLoc = GetComponentLocation();
+		FRotator WorldRot = GetComponentRotation();
+		FTransform Trans = GetComponentTransform();
+		FVector WorldVel = BasePrimComp->GetPhysicsLinearVelocityAtPoint(GetComponentLocation());
+		FVector AngVel = BasePrimComp->GetPhysicsAngularVelocityInRadians();
+		FVector LocalVel = Trans.Rotator().UnrotateVector(WorldVel);
+
+		FVector Desp = FVector((BoundingBox0.X + BoundingBox2.X) / 2, (BoundingBox0.Y + BoundingBox2.Y) / 2, (BoundingBox0.Z + BoundingBox6.Z) / 2) * 100;
+		FVector Extent = FVector((BoundingBox0.X - BoundingBox2.X), (BoundingBox0.Y - BoundingBox2.Y), (BoundingBox6.Z - BoundingBox0.Z)) * 100;
+		FVector BoxWorldCenter = WorldLoc + WorldRot.RotateVector(Desp);
+
+		V2V_data.reserved = 0;
+		V2V_data.object_type = (uint32_t)soda::V2XRenderObjectType::VEHICLE;
+		V2V_data.object_id = ID;
+		V2V_data.timestamp = soda::RawTimestamp<std::chrono::duration<double>>(SodaApp.GetSimulationTimestamp());
+		V2V_data.east = -BoxWorldCenter.X / 100.0;
+		V2V_data.north = BoxWorldCenter.Y / 100.0;
+		V2V_data.up = BoxWorldCenter.Z / 100.0;
+		V2V_data.heading = NormAngRad(-WorldVel.ToOrientationRotator().Yaw / 180.0 * M_PI + M_PI);
+		V2V_data.velocity = WorldVel.Size() / 100.0;
+		V2V_data.status = 0;
+		V2V_data.position_accuracy = 0.001;
+		V2V_data.heading_accuracy = 0.001;
+		V2V_data.velocity_accuracy = 0.001;
+		V2V_data.vertical_velocity = WorldVel.Z / 100.0;
+		V2V_data.length = Extent.X / 100;
+		V2V_data.width = Extent.Y / 100;
+		V2V_data.height = Extent.Z / 100;
+		V2V_data.yaw_angle = NormAngRad(-WorldRot.Yaw / 180 * M_PI + M_PI);
+		V2V_data.pitch_angle = WorldRot.Pitch / 180 * M_PI;
+		V2V_data.roll_angle = -WorldRot.Roll / 180 * M_PI;
+		V2V_data.orientation_accuracy = 0.001;
+
+		if (DrawDebug)
+		{
+#if ENABLE_DRAW_DEBUG
+			DrawDebugBox(GetWorld(), BoxWorldCenter, Extent * 0.5f, FQuat(WorldRot), FColor::Green, false, -1.f, 0.0f, 5.f);
+			DrawDebugString(GetWorld(), BoxWorldCenter, *FString::Printf(TEXT("object_id=%d, heading=%f, velocity=%f, yaw=%f, east=%f, north=%f"), V2V_data.object_id, V2V_data.heading, V2V_data.velocity, V2V_data.yaw_angle, V2V_data.east, V2V_data.north), NULL, FColor::Green, 0.0f, false);
+#endif
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+void UV2VTransmitterComponent::CalculateBoundingBox()
+{
+	if (AActor* ParentActor = GetOwner())
+	{
+		FBox LocalBounds;
+		USodaStatics::GetActorLocalBounds(ParentActor, LocalBounds);
+// Todo: move wheels bounding logic to SodaWheeledVehicleMovement classes
+/*		if (UArrivalPhisXWheeledVehicleMovementComponent* WheeledVehicleMovementComponent = ParentActor->FindComponentByClass<UArrivalPhisXWheeledVehicleMovementComponent>())
+		{
+			for (UStaticMeshComponent* Wheel : WheeledVehicleMovementComponent->WheelMesheComponents)
+			{
+				if (UStaticMesh* StaticMesh = Wheel->GetStaticMesh())
+				{
+					FBox WheelBox = StaticMesh->GetBoundingBox();
+
+					FVector WorldLoc = Wheel->GetComponentLocation();
+					FRotator WorldRot = Wheel->GetComponentRotation();
+					DrawDebugBox(GetWorld(), WorldLoc + WorldRot.RotateVector(WheelBox.GetCenter()), WheelBox.GetExtent() * 0.5f, FQuat(WorldRot), FColor::Green, false, -1.f, 0.0f, 5.f);
+
+				}
+			}
+		}*/
+		BoundingBox0.X = LocalBounds.Max.X / 100;
+		BoundingBox0.Y = LocalBounds.Max.Y / 100;
+		BoundingBox0.Z = LocalBounds.Min.Z / 100;
+		BoundingBox1.X = LocalBounds.Min.X / 100;
+		BoundingBox1.Y = LocalBounds.Max.Y / 100;
+		BoundingBox1.Z = LocalBounds.Min.Z / 100;
+		BoundingBox2.X = LocalBounds.Min.X / 100;
+		BoundingBox2.Y = LocalBounds.Min.Y / 100;
+		BoundingBox2.Z = LocalBounds.Min.Z / 100;
+		BoundingBox3.X = LocalBounds.Max.X / 100;
+		BoundingBox3.Y = LocalBounds.Min.Y / 100;
+		BoundingBox3.Z = LocalBounds.Min.Z / 100;
+		BoundingBox4.X = LocalBounds.Max.X / 100;
+		BoundingBox4.Y = LocalBounds.Max.Y / 100;
+		BoundingBox4.Z = LocalBounds.Max.Z / 100;
+		BoundingBox5.X = LocalBounds.Min.X / 100;
+		BoundingBox5.Y = LocalBounds.Max.Y / 100;
+		BoundingBox5.Z = LocalBounds.Max.Z / 100;
+		BoundingBox6.X = LocalBounds.Min.X / 100;
+		BoundingBox6.Y = LocalBounds.Min.Y / 100;
+		BoundingBox6.Z = LocalBounds.Max.Z / 100;
+		BoundingBox7.X = LocalBounds.Max.X / 100;
+		BoundingBox7.Y = LocalBounds.Min.Y / 100;
+		BoundingBox7.Z = LocalBounds.Max.Z / 100;
+	}
+}
+
+/*********************************************************************************************************************/
+UV2VReceiverComponent::UV2VReceiverComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Other");
+	GUI.ComponentNameOverride = TEXT("V2V Receiver");
+	GUI.IcanName = TEXT("SodaIcons.Modem");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+}
+
+void UV2VReceiverComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	soda::V2VSimulatedObject V2VDataOld;
+	soda::V2XRenderObject V2VDataNew;
+
+	int SentMessages = 0;
+	FString VehiclesIds;
+
+	auto World = GetWorld();
+	for (TObjectIterator< UV2VTransmitterComponent > V2VItr; V2VItr; ++V2VItr)
+	{
+		if (V2VItr->GetWorld() == World)
+		{
+			if (((*V2VItr)->GetComponentLocation() - GetComponentLocation()).Size() < Radius * 100)
+			{
+				if (bUseNewProtocol)
+				{
+					if ((*V2VItr)->FillV2VMsg(V2VDataNew, bRecalculateBoundingBoxEveryTick, Common.bDrawDebugCanvas))
+					{
+						Publisher.Publish(V2VDataNew);
+					}
+					if (bLogMessages)
+					{
+						SentMessages++;
+						VehiclesIds.Appendf(TEXT("%d, "), V2VDataNew.object_id);
+					}
+				}
+				else
+				{
+					if ((*V2VItr)->FillV2VMsg(V2VDataOld, bRecalculateBoundingBoxEveryTick, Common.bDrawDebugCanvas))
+					{
+						Publisher.Publish(V2VDataOld);
+					}
+					if (bLogMessages)
+					{
+						SentMessages++;
+						VehiclesIds.Appendf(TEXT("%d, "), V2VDataOld.id);
+					}
+				}
+			}
+		}
+	}
+	if (bLogMessages)
+	{
+		UE_LOG(LogSoda, Log, TEXT("UV2VReceiverComponent() sent %d message(s), v2v ids:{ %s }"), SentMessages, *VehiclesIds);
+	}
+}
+
+bool UV2VReceiverComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	Publisher.Advertise();
+
+	if (!Publisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		return false;
+	}
+
+	return true;
+}
+
+void UV2VReceiverComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	Publisher.Shutdown();
+}
+
+void UV2VReceiverComponent::GetRemark(FString & Info) const
+{
+	Info = "Port: " +  FString::FromInt(Publisher.Port);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Others/WheelsRendering.cpp b/Source/UnrealSoda/Private/VehicleComponents/Others/WheelsRendering.cpp
new file mode 100644
index 0000000..060c7d3
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Others/WheelsRendering.cpp
@@ -0,0 +1,135 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Others/WheelsRendering.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+
+UWheelsRenderingComponent::UWheelsRenderingComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Other");
+	GUI.ComponentNameOverride = TEXT("Wheels Rendering");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PrePhysics;
+
+	WheelsAnimationData.SetNumZeroed(4);
+}
+
+void UWheelsRenderingComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!HealthIsWorkable()) return;
+
+	for (int32 i = 0; i < 4; ++i)
+	{
+		FWheelAnimationData& WheelInstance = WheelsAnimationData[i];
+		const USodaVehicleWheelComponent* SodaWheel = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex(i));
+		UStaticMeshComponent* WheelMesheComponent = WheelMesheComponents[i];
+		bool bFlip = bool(((i % 2 != 0) + bFlipWheelsMesh) % 2);
+
+		if (bStagecoachEffect && WheelSpokeCount > 0 && ShutterSpeed > 0 && MaxAngularVelocity > SMALL_NUMBER) // employ stagecoach effect
+		{
+			// normalized spoke transition value
+			float AngularVelocity = SodaWheel->AngularVelocity / M_PI * 180;
+			float DegreesPerFrame = AngularVelocity / ShutterSpeed;
+			float DegreesPerSpoke = 360.f / WheelSpokeCount;
+
+			float IntegerPart = 0;
+			float SpokeTransition = FMath::Modf(DegreesPerFrame / DegreesPerSpoke, &IntegerPart);
+			float StagecoachEffectVelocity = FMath::Sin(SpokeTransition * TWO_PI) * MaxAngularVelocity;
+
+			// blend
+			float OffsetVelocity = FMath::Abs(AngularVelocity) - MaxAngularVelocity;
+			if (OffsetVelocity < 0.f)
+			{
+				OffsetVelocity = 0.f;
+			}
+
+			float BlendAlpha = FMath::Clamp(OffsetVelocity / MaxAngularVelocity, 0.f, 1.f);
+
+			float CorrectedAngularVelocity = FMath::Lerp(AngularVelocity, StagecoachEffectVelocity, BlendAlpha);
+			CorrectedAngularVelocity = FMath::Clamp(CorrectedAngularVelocity, -MaxAngularVelocity, MaxAngularVelocity);
+
+			// integrate to angular position
+			float RotationDelta = CorrectedAngularVelocity * DeltaTime;
+			WheelInstance.RotOffset.Pitch += RotationDelta;
+
+			int ExcessRotations = (int)(WheelInstance.RotOffset.Pitch / 360.0f);
+			if (FMath::Abs(ExcessRotations) > 1)
+			{
+				WheelInstance.RotOffset.Pitch -= ExcessRotations * 360.0f * (bFlip ? -1 : 1);
+			}
+		}
+		else
+		{
+			WheelInstance.RotOffset.Pitch = SodaWheel->Pitch / M_PI * 180 * (bFlip ? -1 : 1);
+		}
+
+		WheelInstance.RotOffset.Yaw = SodaWheel->Steer / M_PI * 180 + (bFlip ? 180 : 0);
+		WheelInstance.RotOffset.Roll = 0.f;
+		WheelInstance.LocOffset = FVector(0, 0, SodaWheel->SuspensionOffset);
+
+		/*
+		if (i % 2)
+		{
+			Rot = FRotator(-WheelInstance.RotOffset., WheelSteer + 180.0, 0.0);
+		}
+		
+		else
+		{
+			Rot = FRotator(Wheels[i]->Pitch / M_PI * 180.0, WheelSteer, 0.0);
+		}
+		*/
+		
+
+		WheelMesheComponent->SetRelativeTransform(
+			FTransform(
+				SodaWheel->RestingRotation + WheelInstance.RotOffset,
+				SodaWheel->RestingLocation + WheelInstance.LocOffset),
+			false, nullptr, ETeleportType::None);
+	}
+}
+
+bool UWheelsRenderingComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (!GetWheeledVehicle()->Is4WDVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Support only 4WD vehicles"));
+		return false;
+	}
+
+	for (size_t i = 0; i < GetWheeledVehicle()->GetWheels().Num(); i++)
+	{
+		UStaticMeshComponent* WheelMeshComponent = NewObject<UStaticMeshComponent>(this);
+		WheelMeshComponent->SetupAttachment(GetWheeledVehicle()->GetMesh());
+		WheelMeshComponent->SetCollisionProfileName(UCollisionProfile::NoCollision_ProfileName);
+		//WheelMeshComponent->SetRelativeLocation(Mesh->GetBoneLocation(WheelSetups[i].BoneName, EBoneSpaces::ComponentSpace));
+		//WheelMeshComponent->SetRelativeRotation(Mesh->GetBoneQuaternion(WheelSetups[i].BoneName, EBoneSpaces::ComponentSpace).Rotator());
+		WheelMeshComponent->SetStaticMesh((i < 2) ? FrontWheelMesh : RearWheelMesh); // TODO: Determinate front/reaer wheel
+		WheelMeshComponent->RegisterComponent();
+		WheelMesheComponents.Add(WheelMeshComponent);
+	}
+
+	WheelsAnimationData.SetNumZeroed(4);
+
+	return true;
+}
+
+void UWheelsRenderingComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	for (auto& It : WheelMesheComponents)
+	{
+		It->DestroyComponent();
+	}
+	WheelMesheComponents.Empty();
+}
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Others/WheelsSkidEffect.cpp b/Source/UnrealSoda/Private/VehicleComponents/Others/WheelsSkidEffect.cpp
new file mode 100644
index 0000000..44734d2
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Others/WheelsSkidEffect.cpp
@@ -0,0 +1,131 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Others/WheelsSkidEffect.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Particles/ParticleSystemComponent.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+
+UWheelsSkidEffectComponent::UWheelsSkidEffectComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PrePhysics;
+
+	GUI.Category = TEXT("Other");
+	GUI.ComponentNameOverride = TEXT("Skid Effect");
+	GUI.bIsPresentInAddMenu = true;
+}
+
+void UWheelsSkidEffectComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!HealthIsWorkable()) return;
+
+	if (MarkParticleSystem.Num() == SmokeParticleSystem.Num() == GetWheeledVehicle()->GetWheels().Num())
+	{
+		for (int i = 0; i < GetWheeledVehicle()->GetWheels().Num(); ++i)
+		{
+			USodaVehicleWheelComponent * SodaWheel = GetWheeledVehicle()->GetWheels()[i];
+
+			FVector GlobalVelocity = GetWheeledComponentInterface()->GetSimData().VehicleKinematic.Curr.GetGlobaVelocityAtGlobalPoint(SodaWheel->GetWheelLocation(true, true));
+			//FVector LocalVelocity = GetVehicleDriver()->GetLastOutputRegs().Dyn.Curr.GlobalPose.Rotator().UnrotateVector(GlobalVelocity);
+			FQuat Quat = GlobalVelocity.Rotation().Quaternion();
+			//FVector2D Slip2D = GetWheeledComponentInterface()->GetWheelSlip(i);
+			//float Slip = FMath::Abs(GetWheeledComponentInterface()->GetWheelSlip(i).Size());
+
+			FVector WheelVelocity = GetWheeledVehicle()->GetWheels()[i]->GetWheelLocalVelocity();
+
+			float SlipVx = WheelVelocity.X - SodaWheel->AngularVelocity * SodaWheel->Radius;
+			float SlipVy = WheelVelocity.Y;
+			float SlipV = FMath::Sqrt(SlipVx * SlipVx + SlipVy * SlipVy);
+
+			if (MarkParticleSystem.Num() == 4)
+			{
+				MarkParticleSystem[i]->SetActive(SlipV > SkidEffectTreshold);
+				MarkParticleSystem[i]->SetWorldRotation(Quat * FRotator(0, 0, 90).Quaternion());
+				MarkParticleSystem[i]->SetRelativeLocation(
+					SodaWheel->GetWheelLocation(false, false) +
+					FVector(0, 0, -SodaWheel->Radius + 2.0));
+			}
+
+			if (SmokeParticleSystem.Num() == 4)
+			{
+				SmokeParticleSystem[i]->SetActive(SlipV > SkidEffectTreshold);
+				SmokeParticleSystem[i]->SetFloatParameter(TEXT("Rate"), SlipV * SkidSmokeRateMultiplier);
+				SmokeParticleSystem[i]->SetWorldRotation(Quat);
+				MarkParticleSystem[i]->SetRelativeLocation(
+					SodaWheel->GetWheelLocation(false, false) +
+					FVector(0, 0, -SodaWheel->Radius + 2.0));
+			}
+		}
+	}
+}
+
+bool UWheelsSkidEffectComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (MarkEmitterTemplate)
+	{
+		for (int i = 0; i < GetWheeledVehicle()->GetWheels().Num(); ++i)
+		{
+			UParticleSystemComponent* PSC = NewObject<UParticleSystemComponent>(this);
+			PSC->SetupAttachment(GetWheeledVehicle()->GetMesh());
+			PSC->RegisterComponent();
+			PSC->bAutoDestroy = false;
+			PSC->bAllowAnyoneToDestroyMe = true;
+			PSC->SecondsBeforeInactive = 0.0f;
+			PSC->bAutoActivate = false;
+			PSC->SetTemplate(MarkEmitterTemplate);
+			PSC->bOverrideLODMethod = false;
+			PSC->SetRelativeRotation(FRotator(0, 0, 90));
+			PSC->ActivateSystem(true);
+			PSC->SetTranslucentSortPriority(0);
+			MarkParticleSystem.Add(PSC);
+		}
+	}
+
+	if (SmokeEmitterTemplate)
+	{
+		for (int i = 0; i < GetWheeledVehicle()->GetWheels().Num(); ++i)
+		{
+			UParticleSystemComponent* PSC = NewObject<UParticleSystemComponent>(this);
+			PSC->SetupAttachment(GetWheeledVehicle()->GetMesh());
+			PSC->RegisterComponent();
+			PSC->bAutoDestroy = false;
+			PSC->bAllowAnyoneToDestroyMe = true;
+			PSC->SecondsBeforeInactive = 0.0f;
+			PSC->bAutoActivate = false;
+			PSC->SetTemplate(SmokeEmitterTemplate);
+			PSC->bOverrideLODMethod = false;
+			PSC->SetRelativeRotation(FRotator(0, 0, 90));
+			PSC->ActivateSystem(true);
+			PSC->SetTranslucentSortPriority(1);
+			SmokeParticleSystem.Add(PSC);
+		}
+	}
+
+	return true;
+}
+
+void UWheelsSkidEffectComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	for (auto& It : MarkParticleSystem)
+	{
+		It->DestroyComponent();
+	}
+	MarkParticleSystem.Empty();
+
+	for (auto& It : SmokeParticleSystem)
+	{
+		It->DestroyComponent();
+	}
+	SmokeParticleSystem.Empty();
+}
+
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/CameraBaseSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/CameraBaseSensor.cpp
new file mode 100644
index 0000000..3a6371f
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/CameraBaseSensor.cpp
@@ -0,0 +1,539 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/CameraBaseSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "Runtime/Engine/Public/SceneView.h"
+#include "Runtime/RHI/Public/RHICommandList.h"
+//#include "Runtime/Renderer/Private/PostProcess/SceneRenderTargets.h"
+#include "Brushes/SlateImageBrush.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/SWindow.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Materials/Material.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Kismet/KismetRenderingLibrary.h"
+#include "Engine/Canvas.h"
+#include "Soda/SodaStatics.h"
+#include "Async/ParallelFor.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "ImagePixelData.h"
+#include "ImageWriteTask.h"
+#include "HighResScreenshot.h"
+#include "ImageWriteQueue.h"
+#include "DesktopPlatformModule.h"
+#include "Soda/Misc/ExtraWindow.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimePropertyEditor/IStructureDetailsView.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "DynamicMeshBuilder.h"
+
+/*
+DECLARE_STATS_GROUP(TEXT("CameraSensor"), STATGROUP_CameraSensor, STATGROUP_Advanced);
+DECLARE_CYCLE_STAT(TEXT("TickComponent"), STAT_CameraTick, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("Publish"), STAT_CameraPublish, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("Compute"), STAT_CameraCompute, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("ReadPixels"), STAT_CameraRead, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("BigBlockMemcpy"), STAT_CameraBigBlockMemcpy, STATGROUP_CameraSensor);
+*/
+
+static FString WrapParamStingToYaml(const FString& ParamName, const FString& String, int Indent)
+{
+	FString Yaml;
+	for (int i = 0; i < Indent; ++i)
+	{
+		Yaml.Append(" ");
+	}
+
+	if (!ParamName.IsEmpty())
+	{
+		Yaml += ParamName + ": ";
+	}
+
+	Yaml.Append(String);
+	Yaml.Append("\r\n");
+	return Yaml;
+}
+
+/* **********************************************************************************************
+ * UCameraBaseSensorComponent
+ * **********************************************************************************************/
+
+UCameraBaseSensorComponent::UCameraBaseSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+	, ShowFlags(FEngineShowFlags(ESFIM_Game))
+{
+	//CameraPublisherClass = UGenericCameraPublisher::StaticClass();
+
+	GUI.Category = TEXT("Camera Sensors");
+	GUI.ComponentNameOverride = TEXT("Base Camera");
+	GUI.IcanName = TEXT("SodaIcons.Camera");
+	GUI.bIsPresentInAddMenu = false;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	bTickInEditor = false;
+
+	//ShowFlags.SetMotionBlur(0);
+	//ShowFlags.SetSeparateTranslucency(0);
+	//ShowFlags.SetHMDDistortion(0);
+
+	//CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
+	
+	//PostProcessSettings.AutoExposureMinBrightness = 0.3;
+	//PostProcessSettings.AutoExposureMaxBrightness = 0.6;
+	//PostProcessSettings.AutoExposureBias = 0.4;
+	//PostProcessSettings.bOverride_AutoExposureMinBrightness = true;
+	//PostProcessSettings.bOverride_AutoExposureMaxBrightness = true;
+	//PostProcessSettings.bOverride_AutoExposureBias = true;
+
+	AutoExposureMinBrightness = PostProcessSettings.AutoExposureMinBrightness;
+	AutoExposureMaxBrightness = PostProcessSettings.AutoExposureMaxBrightness;
+	AutoExposureBias = PostProcessSettings.AutoExposureBias;
+
+	static ConstructorHelpers::FObjectFinder< UMaterial > CameraDepthAbsMatPtr(TEXT("/SodaSim/Assets/CPP/CameraPostProcess/CameraDepthAbs"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > CameraDepthAbsEncMatPtr(TEXT("/SodaSim/Assets/CPP/CameraPostProcess/CameraDepthAbsEnc"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > CameraDepthNormMatPtr(TEXT("/SodaSim/Assets/CPP/CameraPostProcess/CameraDepthNorm"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > CameraDepthNormEncMatPtr(TEXT("/SodaSim/Assets/CPP/CameraPostProcess/CameraDepthNormEnc"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > CameraSegmMatPtr(TEXT("/SodaSim/Assets/CPP/CameraPostProcess/CameraSegm"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > CameraSegmColorMatPtr(TEXT("/SodaSim/Assets/CPP/CameraPostProcess/CameraSegmColor"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > CameraCFAPtr(TEXT("/SodaSim/Assets/CPP/CameraPostProcess/CFA"));
+
+	if (CameraDepthAbsMatPtr.Succeeded())     CameraPostProcessMaterals.DepthAbs = CameraDepthAbsMatPtr.Object;
+	if (CameraDepthAbsEncMatPtr.Succeeded())  CameraPostProcessMaterals.DepthAbsEnc = CameraDepthAbsEncMatPtr.Object;
+	if (CameraDepthNormMatPtr.Succeeded())    CameraPostProcessMaterals.DepthNorm = CameraDepthNormMatPtr.Object;
+	if (CameraDepthNormEncMatPtr.Succeeded()) CameraPostProcessMaterals.DepthNormEnc = CameraDepthNormEncMatPtr.Object;
+	if (CameraSegmMatPtr.Succeeded())         CameraPostProcessMaterals.Segm = CameraSegmMatPtr.Object;
+	if (CameraSegmColorMatPtr.Succeeded())    CameraPostProcessMaterals.SegmColor = CameraSegmColorMatPtr.Object;
+	if (CameraCFAPtr.Succeeded())             CameraPostProcessMaterals.CFA = CameraCFAPtr.Object;
+}
+
+bool UCameraBaseSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	CameraFrame.Height = Height;
+	CameraFrame.Width = Width;
+	CameraFrame.OutFormat = Format;
+	CameraFrame.MaxDepthDistance = MaxDepthDistance;
+
+	if (CameraPublisher)
+	{
+		if (!CameraPublisher->Advertise())
+		{
+			SetHealth(EVehicleComponentHealth::Warning, "Can't Initialize publisher");
+		}
+	}
+
+	// Create CFA Texture
+	/*
+	CFATexture = UTexture2D::CreateTransient(2, 2, EPixelFormat::PF_B8G8R8A8);
+	checkf(CFATexture);
+	CFATexture->AddressX = TextureAddress::TA_Clamp;
+	CFATexture->AddressY = TextureAddress::TA_Clamp;
+
+	struct FTexData { uint8 B; uint8 G; uint8 R; uint8 A; };
+	check(sizeof(FTexData) == 4);
+
+	FTexData* TextureData = (FTexData*)TextureData->PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
+	check(TextureData);
+
+	TextureData[0] = CFA_0.ToFColor();
+	TextureData[1] = CFA_1.ToFColor();
+	TextureData[2] = CFA_2.ToFColor();
+	TextureData[3] = CFA_3.ToFColor();
+
+	TextureData->PlatformData->Mips[0].BulkData.Unlock();
+	*/
+
+	return true;
+
+}
+
+void UCameraBaseSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	RenderFence.Wait();
+
+	if (CameraPublisher)
+	{
+		CameraPublisher->Shutdown();
+	}
+
+	if (IsValid(CameraWindow)) CameraWindow->Close();
+	CameraWindow = nullptr;
+}
+
+void UCameraBaseSensorComponent::GetRemark(FString & Info) const
+{
+	Info = ComponentDesc;
+}
+
+void UCameraBaseSensorComponent::SaveCameraIntrinsicsAs() const
+{
+	FCameraIntrinsics Intrinsics = GetCameraIntrinsics();
+
+	FString Yaml;
+	IDesktopPlatform* DesktopPlatform = FDesktopPlatformModule::Get();
+	if (!DesktopPlatform)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UCameraBaseSensorComponent::SaveCameraIntrinsicsAs() Can't get the IDesktopPlatform ref"));
+		return;
+	}
+
+	const FString FileTypes = TEXT("Intrinsics YAML (*.yaml)|*.yaml");
+
+	TArray<FString> OpenFilenames;
+	if (!DesktopPlatform->SaveFileDialog(nullptr, TEXT("Export Intrinsics to YAML"), FPaths::GetProjectFilePath(), TEXT(""), FileTypes, EFileDialogFlags::None, OpenFilenames) || OpenFilenames.Num() <= 0)
+	{
+		return;
+	}
+
+	int Indent = 4;
+
+	Yaml += WrapParamStingToYaml("version", "1.1", 0);
+	Yaml += WrapParamStingToYaml("frame_width", FString::FromInt(Width), 0);
+	Yaml += WrapParamStingToYaml("frame_height", FString::FromInt(Height), 0);
+
+	Yaml += WrapParamStingToYaml("K", "!!opencv-matrix", 0);
+	Yaml += WrapParamStingToYaml("rows", "3", Indent);
+	Yaml += WrapParamStingToYaml("cols", "3", Indent);
+	Yaml += WrapParamStingToYaml("dt", "d", Indent);
+
+	//wrap K matrix
+	int DataIndent = Indent + 7;
+	FString Data;
+	Data.Append(" [ ");
+	Data.Append(FString::SanitizeFloat(Intrinsics.Fx) + ", " + "0., " + FString::SanitizeFloat(Intrinsics.Cx) + ",\r\n");
+
+	for (int i = 0; i < DataIndent; ++i)
+	{
+		Data.Append(" ");
+	}
+
+	Data.Append("0., " + FString::SanitizeFloat(Intrinsics.Fy) + ", " + FString::SanitizeFloat(Intrinsics.Cy) + ",\r\n");
+	for (int i = 0; i < DataIndent; ++i)
+	{
+		Data.Append(" ");
+	}
+
+	Data.Append("0., 0., 1.");
+	Data.Append(" ]\r\n");
+
+	Yaml += WrapParamStingToYaml("data", Data, Indent);
+
+	//wrap D matrix
+	
+	Yaml += WrapParamStingToYaml("D", "!!opencv-matrix", 0);
+	Yaml += WrapParamStingToYaml("rows", "5", Indent);
+	Yaml += WrapParamStingToYaml("cols", "1", Indent);
+	Yaml += WrapParamStingToYaml("dt", "d", Indent);
+	Yaml += WrapParamStingToYaml("data", 
+		"[ " + FString::SanitizeFloat(Intrinsics.K1) +
+		", " + FString::SanitizeFloat(Intrinsics.K2) +
+		", " + FString::SanitizeFloat(Intrinsics.K3) +
+		", " + FString::SanitizeFloat(Intrinsics.K4) +
+		", " + FString::SanitizeFloat(0) +
+		" ]\r\n", Indent);
+
+	USodaStatics::WriteStringToFile(OpenFilenames[0], Yaml, true);
+	return;
+}
+
+UTextureRenderTarget2D* UCameraBaseSensorComponent::GetRenderTarget2DTexture()
+{
+	if (GetSceneCaptureComponent2D() != nullptr)
+		return GetSceneCaptureComponent2D()->TextureTarget;
+	return nullptr;
+}
+
+void UCameraBaseSensorComponent::ShowRenderTarget()
+{
+	if (!IsValid(CameraWindow))
+	{
+		CameraWindow = NewObject<UExtraWindow>();
+	}
+	if (GetSceneCaptureComponent2D() && GetSceneCaptureComponent2D()->TextureTarget)
+	{
+		CameraWindow->OpenCameraWindow(GetSceneCaptureComponent2D()->TextureTarget);
+	}
+}
+
+void UCameraBaseSensorComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+
+	if (CameraPublisher)
+	{
+		if (HealthIsWorkable() && GetHealth() != EVehicleComponentHealth::Warning)
+		{
+			if (!CameraPublisher->IsWorking() && !CameraPublisher->IsInitializing())
+			{
+				SetHealth(EVehicleComponentHealth::Warning, "Can't Initialize publisher");
+			}
+		}
+	}
+
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	//SCOPE_CYCLE_COUNTER(STAT_CameraTick);
+
+	TTimestamp Timestamp = SodaApp.GetSimulationTimestamp();
+	int64 IndexSaved = SodaApp.GetFrameIndex();
+
+	if(bLogTick)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("Camera name: %s, timestamp: %s, Index: %s"), 
+			*GetFName().ToString(), 
+			*soda::ToString(Timestamp),
+			*USodaStatics::Int64ToString(IndexSaved));
+	}
+
+	GetWorld()->GetCanvasForRenderingToTarget(); // Create Canvas if needed
+
+	ENQUEUE_RENDER_COMMAND(SceneDrawCompletion)(
+	[this, Timestamp, IndexSaved](FRHICommandListImmediate& RHICmdList)
+	{
+		if(!IsValid(this) || !IsValid(GetSceneCaptureComponent2D())) return;
+
+		// TODO: This has not been working from the UE5, need somehow move it to the GameTread
+		/*
+		if (bDrawDebugText)
+		{
+			if (ASodaVehicle* Vehicle = GetVehicle())
+			{
+				FDrawToRenderTargetContext Context;
+				UCanvas* Canvas;
+				FVector2D CanvasSize(CameraFrame.Width, CameraFrame.Height);
+				UKismetRenderingLibrary::BeginDrawCanvasToRenderTarget(this, GetSceneCaptureComponent2D()->TextureTarget, Canvas, CanvasSize, Context);
+				UFont* RenderFont = GEngine->GetSmallFont();
+				Canvas->SetDrawColor(FColor::Green);
+				float YPos = 10;
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Camera name: %s"), *GetFName().ToString()), 4, YPos);
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Frame timestamp: %s"), *soda::ToString(Timestamp)), 4, YPos);
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Frame Index: %s"), *USodaStatics::Int64ToString(IndexSaved)), 4, YPos) + 4;
+
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Phys step: %i"), Vehicle->GetSimData(true).SimulatedStep), 4, YPos);
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Phys timestamp: %s"), *soda::ToString(Vehicle->GetSimData(true).SimulatedTimestamp)), 4, YPos) + 4;
+
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Fixed phys step: %i"), Vehicle->GetSimData(true).RenderStep), 4, YPos);
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Fixed phys timestamp: %s"), *soda::ToString(Vehicle->GetSimData(true).RenderTimestamp)), 4, YPos) + 4;
+
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Vehicle pos: %s"), *Vehicle->GetActorLocation().ToString()), 4, YPos);
+				UKismetRenderingLibrary::EndDrawCanvasToRenderTarget(this, Context);
+			}
+		}
+		*/
+
+		if (CameraPublisher && CameraPublisher->IsWorking())
+		{
+			CameraFrame.Timestamp = Timestamp;
+			CameraFrame.Index = IndexSaved;
+			TArray<FColor>& Pixels = CameraPublisher->LockFrontBuffer(CameraFrame);
+			{
+				//SCOPE_CYCLE_COUNTER(STAT_CameraRead);
+				FCameraPixelReader::ReadPixels(*GetSceneCaptureComponent2D()->TextureTarget, RHICmdList, Pixels, CameraFrame.ImageStride);
+			}
+
+			CameraPublisher->UnlockFrontBuffer();
+		}
+
+	});
+	RenderFence.BeginFence();
+}
+
+bool UCameraBaseSensorComponent::IsVehicleComponentInitializing() const
+{
+	if (CameraPublisher)
+	{
+		return CameraPublisher->IsInitializing();
+	}
+	return false;
+}
+
+FCameraIntrinsics UCameraBaseSensorComponent::GetCameraIntrinsics() const
+{
+	float FocalLength = Width / (std::tan(GetHFOV() / 2 / 180 * M_PI) * 2);
+	float Cx = (Width / 2);
+	float Cy = (Height / 2);
+	return { 0.f, 0.f, 0.f, 0.f, Cx, Cy, FocalLength, FocalLength };
+}
+
+void UCameraBaseSensorComponent::MakeScreenshot(const FString& InFileName)
+{
+	if (!GetSceneCaptureComponent2D()->bCaptureEveryFrame)
+	{
+		GetSceneCaptureComponent2D()->CaptureScene();
+	}
+
+	ENQUEUE_RENDER_COMMAND(SceneDrawCompletion)(
+		[this, InFileName](FRHICommandListImmediate& RHICmdList)
+		{
+			switch (Format)
+			{
+			case ECameraSensorShader::ColorBGR8:
+			case ECameraSensorShader::SegmBGR8:
+			case ECameraSensorShader::HdrRGB8:
+			case ECameraSensorShader::CFA:
+			{
+				TArrayView<FColor> OutPixels;
+				uint32 ImageStride;
+				PixelReader.BeginRead(*GetSceneCaptureComponent2D()->TextureTarget, RHICmdList, OutPixels, ImageStride);
+
+				TUniquePtr<TImagePixelData<FColor>> PixelData = MakeUnique<TImagePixelData<FColor>>(FIntPoint(CameraFrame.Width, CameraFrame.Height));
+				PixelData->Pixels.SetNum(CameraFrame.Width * CameraFrame.Height, false);
+				ParallelFor(CameraFrame.Height, [&](int32 i)
+					{
+						FMemory::Memcpy(
+							&PixelData->Pixels[i * CameraFrame.Width],
+							&OutPixels[i * ImageStride],
+							CameraFrame.Width * 4);
+					});
+
+				TUniquePtr<FImageWriteTask> ImageTask = MakeUnique<FImageWriteTask>();
+				ImageTask->PixelData = MoveTemp(PixelData);
+				ImageTask->Filename = InFileName;
+				ImageTask->Format = EImageFormat::PNG;
+				ImageTask->CompressionQuality = (int32)EImageCompressionQuality::Default;
+				ImageTask->bOverwriteFile = true;
+				//ImageTask->PixelPreProcessors.Add(TAsyncAlphaWrite<FColor>(255));
+				FHighResScreenshotConfig& HighResScreenshotConfig = GetHighResScreenshotConfig();
+				//TFuture<bool> Res = 
+				HighResScreenshotConfig.ImageWriteQueue->Enqueue(MoveTemp(ImageTask));
+				break;
+			}
+
+			default:
+				UE_LOG(LogSoda, Error, TEXT("The output image format is not supported for taking screenshots"));
+			}
+		});
+}
+
+void UCameraBaseSensorComponent::MakeScreenshotToDefault()
+{
+	MakeScreenshot(FString::Format(*DefaultSavePath, { FDateTime::Now().ToString() }));
+}
+
+bool UCameraBaseSensorComponent::IsColorFormat(ECameraSensorShader Fromat)
+{
+	switch (Fromat)
+	{
+	case ECameraSensorShader::ColorBGR8:
+	case ECameraSensorShader::HdrRGB8:
+	case ECameraSensorShader::CFA:
+	case ECameraSensorShader::SegmBGR8:
+		return true;
+
+	case ECameraSensorShader::Segm8:
+	case ECameraSensorShader::Depth8:
+	case ECameraSensorShader::DepthFloat32:
+	case ECameraSensorShader::Depth16:
+	default:
+		return false;
+	}
+}
+
+void UCameraBaseSensorComponent::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	FProperty* Property = PropertyChangedEvent.Property;
+	FProperty* MemberProperty = nullptr;
+	if (PropertyChangedEvent.PropertyChain.GetActiveMemberNode())
+	{
+		MemberProperty = PropertyChangedEvent.PropertyChain.GetActiveMemberNode()->GetValue();
+	}
+
+	if (MemberProperty != nullptr && Property != nullptr)
+	{
+		const FName MemberPropertyName = MemberProperty->GetFName();
+		const FName PropertyName = Property->GetFName();
+		if (MemberPropertyName == GET_MEMBER_NAME_CHECKED(UCameraBaseSensorComponent, CameraPublisherClass))
+		{
+			RefreshPublisherClass();
+		}
+		else if (MemberPropertyName == GET_MEMBER_NAME_CHECKED(UCameraBaseSensorComponent, CameraPublisher))
+		{
+			if (!CameraPublisher && CameraPublisherClass)
+			{
+				RefreshPublisherClass();
+			}
+		}
+		
+	}
+}
+
+#if WITH_EDITOR
+void UCameraBaseSensorComponent::PostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	Super::PostEditChangeChainProperty(PropertyChangedEvent);
+	RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+}
+
+void UCameraBaseSensorComponent::PostInitProperties()
+{
+	Super::PostInitProperties();
+	RefreshPublisherClass();
+}
+#endif
+
+void UCameraBaseSensorComponent::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	if (Ar.IsSaveGame())
+	{
+		if (Ar.IsLoading())
+		{
+			RefreshPublisherClass();
+		}
+
+		if (IsValid(CameraPublisher))
+		{
+			CameraPublisher->Serialize(FStructuredArchiveFromArchive(Ar).GetSlot().EnterRecord().EnterRecord(TEXT("CameraPublisherRecord")));
+		}
+	}
+}
+
+void UCameraBaseSensorComponent::RefreshPublisherClass()
+{
+	if (CameraPublisherClass)
+	{
+		if (CameraPublisher)
+		{
+			CameraPublisher->MarkAsGarbage();
+			CameraPublisher = nullptr;
+		}
+		CameraPublisher = NewObject< UCameraPublisher>(this, CameraPublisherClass);
+		CameraPublisher->SetFlags(RF_Transactional | RF_ArchetypeObject | RF_Public);
+	}
+	else
+	{
+		if (CameraPublisher)
+		{
+			CameraPublisher->MarkAsGarbage();
+		}
+
+		CameraPublisher = nullptr;
+	}
+
+	//ComponentDesc = ColorPublisher.Addr;
+	//ComponentDesc = FString(TEXT("FPDLink: ")) + FString::FromInt(FPDLinkPublisher.Card) + TEXT("-") + FString::FromInt(FPDLinkPublisher.Channel);
+}
+
+bool UCameraBaseSensorComponent::NeedRenderSensorFOV() const
+{
+	return (FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::Ever) ||
+		(FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::OnSelect && IsVehicleComponentSelected());
+}
+
+FBoxSphereBounds UCameraBaseSensorComponent::CalcBounds(const FTransform& LocalToWorld) const
+{
+	return FBoxSphereBounds(FMeshGenerationUtils::CalcFOVBounds(GetVFOV(), GetHFOV(), FOVSetup.MaxViewDistance)).TransformBy(LocalToWorld);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/CameraSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/CameraSensor.cpp
new file mode 100644
index 0000000..2ec951f
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/CameraSensor.cpp
@@ -0,0 +1,182 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/CameraSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "Runtime/Engine/Public/SceneView.h"
+#include "Runtime/RHI/Public/RHICommandList.h"
+//#include "Runtime/Renderer/Private/PostProcess/SceneRenderTargets.h"
+#include "Brushes/SlateImageBrush.h"
+#include "Widgets/Images/SImage.h"
+#include "Widgets/SWindow.h"
+#include "Framework/Application/SlateApplication.h"
+#include "Materials/Material.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Kismet/KismetRenderingLibrary.h"
+#include "Engine/Canvas.h"
+#include "Soda/SodaStatics.h"
+#include "Async/ParallelFor.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "ImagePixelData.h"
+#include "ImageWriteTask.h"
+#include "HighResScreenshot.h"
+#include "ImageWriteQueue.h"
+#include "DesktopPlatformModule.h"
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "DynamicMeshBuilder.h"
+
+/*
+DECLARE_STATS_GROUP(TEXT("CameraSensor"), STATGROUP_CameraSensor, STATGROUP_Advanced);
+DECLARE_CYCLE_STAT(TEXT("TickComponent"), STAT_CameraTick, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("Publish"), STAT_CameraPublish, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("Compute"), STAT_CameraCompute, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("ReadPixels"), STAT_CameraRead, STATGROUP_CameraSensor);
+DECLARE_CYCLE_STAT(TEXT("BigBlockMemcpy"), STAT_CameraBigBlockMemcpy, STATGROUP_CameraSensor);
+*/
+
+/* **********************************************************************************************
+ * UCameraSensorComponent
+ * **********************************************************************************************/
+
+UCameraSensorComponent::UCameraSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Camera Sensors");
+	GUI.ComponentNameOverride = TEXT("Generic Camera");
+	GUI.bIsPresentInAddMenu = true;
+
+	FOVSetup.Color = FLinearColor(0.1, 0.5, 0.5, 1.0);
+	FOVSetup.MaxViewDistance = 300;
+}
+
+bool UCameraSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	Clean();
+
+	if (bUseCustomAutoExposure)
+	{
+		PostProcessSettings.AutoExposureMinBrightness = AutoExposureMinBrightness;
+		PostProcessSettings.AutoExposureMaxBrightness = AutoExposureMaxBrightness;
+		PostProcessSettings.AutoExposureBias = AutoExposureBias;
+
+		PostProcessSettings.bOverride_AutoExposureMinBrightness = true;
+		PostProcessSettings.bOverride_AutoExposureMaxBrightness = true;
+		PostProcessSettings.bOverride_AutoExposureBias = true;
+	}
+
+	switch (Format)
+	{
+	case ECameraSensorShader::Segm8:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.Segm, this);
+		break;
+
+	case ECameraSensorShader::CFA:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.CFA, this);
+		break;
+
+	case ECameraSensorShader::SegmBGR8:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.SegmColor, this);
+		break;
+
+	case ECameraSensorShader::DepthFloat32:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.DepthAbsEnc, this);
+		break;
+
+	case ECameraSensorShader::Depth8:
+	case ECameraSensorShader::Depth16:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.DepthNormEnc, this);
+		PostProcessMat->SetScalarParameterValue("MaxDist", MaxDepthDistance * 100.f);
+		break;
+	}
+
+	if (PostProcessMat)
+	{
+		PostProcessSettings.WeightedBlendables.Array.AddDefaulted(1);
+		PostProcessSettings.WeightedBlendables.Array[0].Object = PostProcessMat;
+		PostProcessSettings.WeightedBlendables.Array[0].Weight = 1.f;
+	}
+
+	CaptureComponent = NewObject< USceneCaptureComponent2D >(this);
+	CaptureComponent->TextureTarget = NewObject< UTextureRenderTarget2D >(this);
+	CaptureComponent->TextureTarget->InitCustomFormat(Width, Height, EPixelFormat::PF_B8G8R8A8, !IsColorFormat(Format) || bForceLinearGamma);
+	CaptureComponent->bCaptureEveryFrame = true;
+	CaptureComponent->bCaptureOnMovement = true;
+	CaptureComponent->PrimitiveRenderMode = PrimitiveRenderMode;
+	CaptureComponent->HiddenActors = HiddenActors;
+	CaptureComponent->ShowOnlyActors = ShowOnlyActors;
+	CaptureComponent->bAlwaysPersistRenderingState = bAlwaysPersistRenderingState;
+	CaptureComponent->LODDistanceFactor = LODDistanceFactor;
+	CaptureComponent->MaxViewDistanceOverride = MaxViewDistanceOverride;
+	CaptureComponent->CaptureSortPriority = CaptureSortPriority;
+	CaptureComponent->ShowFlags = ShowFlags;
+	//CaptureComponent->ProjectionType = ProjectionType;
+	CaptureComponent->FOVAngle = FOVAngle;
+	//CaptureComponent->OrthoWidth = OrthoWidth;
+	CaptureComponent->CompositeMode = CompositeMode;
+	CaptureComponent->PostProcessSettings = PostProcessSettings;
+	CaptureComponent->PostProcessBlendWeight = PostProcessBlendWeight;
+	CaptureComponent->ShowFlagSettings = ShowFlagSettings;
+	CaptureComponent->ShowFlags.EnableAdvancedFeatures();
+	CaptureComponent->CaptureSource = (Format == ECameraSensorShader::HdrRGB8) ? ESceneCaptureSource::SCS_SceneColorHDR : ESceneCaptureSource::SCS_FinalColorLDR;
+	CaptureComponent->HideComponent(this);
+	CaptureComponent->SetupAttachment(this);
+	CaptureComponent->RegisterComponent();
+
+	return true;
+}
+
+void UCameraSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	Clean();
+}
+
+void UCameraSensorComponent::Clean()
+{
+	if (IsValid(CaptureComponent))
+	{
+		CaptureComponent->DestroyComponent();
+		if (CaptureComponent->TextureTarget)
+		{
+			CaptureComponent->TextureTarget->ConditionalBeginDestroy();
+		}
+	}
+	CaptureComponent = nullptr;
+
+	if (IsValid(PostProcessMat)) PostProcessMat->ConditionalBeginDestroy();
+	PostProcessMat = nullptr;
+	PostProcessSettings.WeightedBlendables.Array.Empty();
+}
+
+void UCameraSensorComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+}
+
+bool UCameraSensorComponent::GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes)
+{
+	FSensorFOVMesh MeshData;
+	if (FMeshGenerationUtils::GenerateSimpleFOVMesh(
+		GetHFOV(),
+		GetVFOV(),
+		20, 20, FOVSetup.MaxViewDistance, 0, 0,
+		MeshData.Vertices, MeshData.Indices))
+	{
+		for (auto& it : MeshData.Vertices) it.Color = FOVSetup.Color.ToFColor(true);
+		Meshes.Add(MoveTempIfPossible(MeshData));
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/FisheyeCameraSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/FisheyeCameraSensor.cpp
new file mode 100644
index 0000000..91dd895
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/FisheyeCameraSensor.cpp
@@ -0,0 +1,768 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/FisheyeCameraSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Engine/CollisionProfile.h"
+#include "Materials/Material.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Engine/StaticMesh.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "DrawDebugHelpers.h"
+#include "Misc/FileHelper.h"
+#include "HAL/PlatformFileManager.h"
+#include "KismetProceduralMeshLibrary.h"
+#include "Containers/UnrealString.h"
+#include "Kismet/GameplayStatics.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Engine/Engine.h"
+#include <random>
+#include "Misc/SecureHash.h"
+#include "DesktopPlatformModule.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Async/Async.h"
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "Async/Future.h"
+#include "DynamicMeshBuilder.h"
+
+template <typename  T>
+static void AddToBuf(TArray<uint8>& Buf, T && Value)
+{
+	for (int i = 0; i < sizeof(Value); ++i) Buf.Add(((uint8*)&Value)[i]);
+}
+
+USceneCaptureDeferredComponent2D::USceneCaptureDeferredComponent2D(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void USceneCaptureDeferredComponent2D::UpdateSceneCaptureContents(FSceneInterface* Scene)
+{
+	if (IsValid(CustomWorld))
+	{
+		USceneCaptureComponent2D::UpdateSceneCaptureContents(CustomWorld->Scene);
+	}
+}
+
+bool FFisheyeCameraModel::ProjectUV2XYZ(const FVector2D& UV, FVector & Normal) const
+{
+	const double x_double_primed = ((double)UV.X - Cx) / Fx;
+	const double y_double_primed = -((double)UV.Y - Cy) / Fy; //(-) - from UE4 UVs to OpenCV UVs
+
+	const double r_double_primed = std::sqrt(x_double_primed*x_double_primed + y_double_primed*y_double_primed);
+
+	const double cos_phi = x_double_primed / r_double_primed;
+	const double sin_phi = y_double_primed / r_double_primed;
+
+	//initial value for the ray incidence angle, theta
+	const double theta_init = r_double_primed;
+	double theta = theta_init;
+
+	//find ray incidence angle using Newton's method
+	for(int i = 0; i < N_Iter_Max; ++i) 
+	{
+		theta = theta - (R_D(theta) - r_double_primed) / R_D_Deriv(theta);
+		if (std::fabs((R_D(theta) - r_double_primed)) < Eps) break;
+	}
+
+	//if (std::fabs(theta - theta_init) / M_PI > 0.1)
+	//	return false;
+
+	//Unit vector in the direction of the ray corresponding to the (u, v) pixel
+	const double x = std::sin(theta) * cos_phi;
+	const double y = std::sin(theta) * sin_phi;
+	const double z = std::cos(theta);
+
+	//From OpenCV to UE4 camera coordinate space
+	Normal = FVector(+z, +x, -y); // Why +x, not -x ? I dont know...
+	return true;
+}
+
+void FFisheyeCameraModel::ProjectXYZ2UV(const FVector& Point, FVector2D & UV) const
+{
+	//From UE4 to  OpenCV camera coordinate space
+	const double x = +Point.Y; // Why +y, not -y ? I dont know...
+	const double y = -Point.Z; 
+	const double z = +Point.X;
+
+	const double r = std::sqrt(x * x + y * y) + 1e-8;
+	const double cs = x / r;
+	const double sn = y / r;
+	const double theta = std::atan2(r, z);
+
+	const double theta_nl = Kb_Compute_Theta_Nl(theta);
+
+	const double xn = cs * theta_nl;
+	const double yn = sn * theta_nl;
+
+	UV.X = Fx * xn + Cx;
+	UV.Y = -Fy * yn + Cy; //(-) - From UE4 UVs to OpenCV UVs
+}
+
+double FFisheyeCameraModel::R_D(double theta) const
+{
+	return theta * (1.0 + K1 * std::pow(theta, 2.0) + K2 * std::pow(theta, 4.0) + K3 * std::pow(theta, 6.0) + K4 * std::pow(theta, 8.0));
+}
+
+double FFisheyeCameraModel::R_D_Deriv(double theta) const
+{
+	return (1 + 3.0 * K1 * std::pow(theta, 2.0) + 5.0 * K2 * std::pow(theta, 4.0) + 7.0 * K3 * std::pow(theta, 6.0) + 9.0 * K4 * std::pow(theta, 8.0));
+}
+
+double FFisheyeCameraModel::Kb_Compute_Theta_Nl(double theta) const
+{
+	return theta + K1 * std::pow(theta, 3) + K2 * std::pow(theta, 5) + K3 * std::pow(theta, 7) + K4 * std::pow(theta, 9);
+}
+
+UFisheyeCameraSensorComponent::UFisheyeCameraSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+
+{
+	GUI.ComponentNameOverride = TEXT("Generic Fisheye Camera");
+	GUI.bIsPresentInAddMenu = true;
+
+	static ConstructorHelpers::FObjectFinder< UStaticMesh > Mesh1(TEXT("/Engine/BasicShapes/Plane"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > Mat1(TEXT("/SodaSim/Assets/CPP/FisheyeCamera/FisheyeMat1"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > Mat2(TEXT("/SodaSim/Assets/CPP/FisheyeCamera/FisheyeMat2"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > Mat3(TEXT("/SodaSim/Assets/CPP/FisheyeCamera/FisheyeMat3"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > Mat4(TEXT("/SodaSim/Assets/CPP/FisheyeCamera/FisheyeMat4"));
+	static ConstructorHelpers::FObjectFinder< UMaterial > Mat5(TEXT("/SodaSim/Assets/CPP/FisheyeCamera/FisheyeMat5"));
+
+	SqureMaterials.SetNum(5);
+
+	if (Mesh1.Succeeded()) StaticMeshSqure = Mesh1.Object;
+	if (Mat1.Succeeded()) SqureMaterials[0] = Mat1.Object;
+	if (Mat2.Succeeded()) SqureMaterials[1] = Mat2.Object;
+	if (Mat3.Succeeded()) SqureMaterials[2] = Mat3.Object;
+	if (Mat4.Succeeded()) SqureMaterials[3] = Mat4.Object;
+	if (Mat5.Succeeded()) SqureMaterials[4] = Mat5.Object;
+
+	Format = ECameraSensorShader::HdrRGB8;
+
+	DebugRings.Add(60);
+	DebugRings.Add(90);
+	DebugRings.Add(120);
+	DebugRings.Add(150);
+	DebugRings.Add(180);
+
+	Width = 1920;
+	Height = 1208;
+
+	FOVSetup.Color = FLinearColor(0.1, 0.5, 0.5, 1.0);
+	FOVSetup.MaxViewDistance = 200;
+
+	bUseCustomAutoExposure = true;
+	AutoExposureMinBrightness = 3.0;
+	AutoExposureMaxBrightness = 4.0;
+	AutoExposureBias = 0.0;
+}
+
+void UFisheyeCameraSensorComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+	TmpFileName = FPaths::CreateTempFilename(*(FPaths::ProjectSavedDir() / TEXT("FisheyeMap")), TEXT(""), TEXT(".tmp"));
+}
+
+void UFisheyeCameraSensorComponent::Clean()
+{
+	if (IsValid(CaptureComponent))
+	{
+		CaptureComponent->DestroyComponent();
+		if (CaptureComponent->TextureTarget)
+		{
+			CaptureComponent->TextureTarget->ConditionalBeginDestroy();
+		}
+	}
+	CaptureComponent = nullptr;
+
+	if (IsValid(PostProcessMat)) PostProcessMat->ConditionalBeginDestroy();
+	PostProcessMat = nullptr;
+	PostProcessSettings.WeightedBlendables.Array.Empty();
+
+	if (IsValid(Mesh)) Mesh->DestroyComponent();
+	Mesh = nullptr;
+
+	if (IsValid(MaterialDyn)) MaterialDyn->ConditionalBeginDestroy();
+	MaterialDyn = nullptr;
+	
+	if (CustomWorld)
+	{
+		GEngine->DestroyWorldContext(CustomWorld);
+		CustomWorld->DestroyWorld(false);
+		CustomWorld = nullptr;
+	}
+
+	for (int i = 0; i < FisheyeSides.Num(); ++i)
+	{
+		if (IsValid(FisheyeSides[i].SceneCapture))
+		{
+			FisheyeSides[i].SceneCapture->DestroyComponent();
+			if (FisheyeSides[i].SceneCapture->TextureTarget)
+			{
+				FisheyeSides[i].SceneCapture->TextureTarget->ConditionalBeginDestroy();
+			}
+		}
+	}
+	FisheyeSides.Empty();
+}
+
+void UFisheyeCameraSensorComponent::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+
+	if (FPaths::FileExists(*TmpFileName))
+	{
+		IFileManager::Get().Delete(*TmpFileName);
+	}
+}
+
+void UFisheyeCameraSensorComponent::ComputeProjectionMap(TArray<FVector>& ProjMap) const
+{
+	ProjMap.Empty();
+
+	/*
+	 * Try load projection map from temp file
+	 */
+	if (bStoreTempProjMap && FPaths::FileExists(*TmpFileName))
+	{
+		TArray<uint8> Data;
+		if (!FFileHelper::LoadFileToArray(Data, *TmpFileName))
+		{
+			UE_LOG(LogSoda, Error, TEXT("UFisheyeCameraSensorComponent::ComputeProjectionMap(); Can't load fisheye map '%s'"), *TmpFileName);
+		}
+		else
+		{
+			FMemoryReader MemoryReader(Data, true);
+			MemoryReader << ProjMap;
+			const int ExpectSize = Height * Width * FisheyeSides.Num();
+			if (ProjMap.Num() != ExpectSize)
+			{
+				UE_LOG(LogSoda, Error, TEXT("UFisheyeCameraSensorComponent::ComputeProjectionMap(); \"%s\" not suitable; Red %i , expect %i"), *TmpFileName, ProjMap.Num(), ExpectSize);
+				ProjMap.Empty();
+			}
+		}
+	}
+
+	/*
+	 * Otherwise compute projection map
+	 */
+	if (ProjMap.Num() == 0)
+	{
+		//auto t0 = soda::NowRaw();
+
+		TArray<FVector> FisheyeXYZ;
+		{
+			FisheyeXYZ.SetNum(Width * Height);
+			for (int v = 0; v < Height; ++v)
+				for (int u = 0; u < Width; ++u)
+				{
+					FVector2D UV(u, Height - v);
+					if (!FisheyeModel.ProjectUV2XYZ(UV, FisheyeXYZ[v * Width + u]))
+						FisheyeXYZ[v * Width + u] = FVector::ZeroVector;
+				}
+		}
+
+		float EdgeWidth = 0;
+		if (bDrawEdges) EdgeWidth = 0.01;
+
+		ProjMap.SetNum(Width * Height * FisheyeSides.Num());
+
+		for (int i = 0; i < FisheyeSides.Num(); ++i)
+		{
+			FMatrix ProjectionMatrix;
+			if ((int32)ERHIZBuffer::IsInverted)
+			{
+				ProjectionMatrix = FReversedZPerspectiveMatrix(
+					FisheyeSides[i].FOV * (float)PI / 360.0f,
+					FisheyeSides[i].FOV * (float)PI / 360.0f,
+					1.0f,
+					FisheyeSides[i].Width / (float)FisheyeSides[i].Height,
+					GNearClippingPlane,
+					GNearClippingPlane);
+			}
+			else
+			{
+				ProjectionMatrix = FPerspectiveMatrix(
+					FisheyeSides[i].FOV * (float)PI / 360.0f,
+					FisheyeSides[i].FOV * (float)PI / 360.0f,
+					1.0f,
+					FisheyeSides[i].Width / (float)FisheyeSides[i].Height,
+					GNearClippingPlane,
+					GNearClippingPlane);
+			}
+
+			FMatrix ViewRotationMatrix = FRotationMatrix::Make(CommonQuat * FisheyeSides[i].CamRotator).Inverse() * FMatrix(
+				FPlane(0, 0, 1, 0),
+				FPlane(1, 0, 0, 0),
+				FPlane(0, 1, 0, 0),
+				FPlane(0, 0, 0, 1));
+			FMatrix ViewProjectionMatrix = ViewRotationMatrix * ProjectionMatrix;
+
+			for (int n = 0; n < Width * Height; ++n)
+			{
+				FVector XYZ = FisheyeXYZ[n];
+				FVector2D UV;
+				static FIntRect ViewRect(0, 0, 1, 1);
+				if (!XYZ.IsZero() && FSceneView::ProjectWorldToScreen(XYZ * 100, ViewRect, ViewProjectionMatrix, UV))
+				{
+					ProjMap[n + Width * Height * i].X = UV.X;
+					ProjMap[n + Width * Height * i].Y = UV.Y;
+					ProjMap[n + Width * Height * i].Z = (UV.X >= EdgeWidth && UV.X < (1 - EdgeWidth) && UV.Y >= EdgeWidth && UV.Y < (1 - EdgeWidth)) ? 1 : 0;
+				}
+				else
+				{
+					ProjMap[n + Width * Height * i] = FVector::ZeroVector;
+				}
+			}
+		}
+
+		//UE_LOG(LogSoda, Log, TEXT("Calculated/loaded fisheye camera model for %d ms"), int(soda::NowRaw() - t0));
+
+		/*
+		 * Save projection map
+		 */
+		if (bStoreTempProjMap)
+		{
+			TArray<uint8> Data;
+			FMemoryWriter MemoryWriter(Data, true);
+			MemoryWriter << ProjMap;
+			if (!FFileHelper::SaveArrayToFile(Data, *TmpFileName))
+			{
+				UE_LOG(LogSoda, Error, TEXT("UFisheyeCameraSensorComponent::ComputeProjectionMap(); Can't save fisheye map to '%s'"), *TmpFileName);
+			}
+		}
+	}
+}
+
+bool UFisheyeCameraSensorComponent::ApplyProjectionMap(const TArray<FVector> & ProjMap)
+{
+	check(CaptureComponent);
+	check(MaterialDyn);
+	check(ProjMap.Num() == Width * Height * FisheyeSides.Num());
+
+	CaptureComponent->bCaptureEveryFrame = false;
+	for (int i = 0; i < FisheyeSides.Num(); i++) FisheyeSides[i].SceneCapture->bCaptureEveryFrame = false;
+	
+	for(int i = 0; i < FisheyeSides.Num(); ++i)
+	{
+		FisheyeSides[i].SceneCapture->TextureTarget->InitAutoFormat(FisheyeSides[i].Width, FisheyeSides[i].Height);
+		FisheyeSides[i].UVTexture = UTexture2D::CreateTransient(Width, Height, EPixelFormat::PF_A32B32G32R32F);
+		checkf(FisheyeSides[i].UVTexture, TEXT("Can't create texture"));
+		FisheyeSides[i].UVTexture->AddressX = TextureAddress::TA_Clamp;
+		FisheyeSides[i].UVTexture->AddressY = TextureAddress::TA_Clamp;
+
+		struct FTexData { float R; float G; float B; float A; };
+		check(sizeof(FTexData) == 4*4);
+
+		FTexData * TextureData = (FTexData*)FisheyeSides[i].UVTexture->PlatformData->Mips[0].BulkData.Lock(LOCK_READ_WRITE);
+		check(TextureData);
+
+		for(int n = 0; n < Width * Height; ++n)
+		{
+			TextureData[n].R = ProjMap[n + Width * Height * i].X;
+			TextureData[n].G = ProjMap[n + Width * Height * i].Y;
+			TextureData[n].A = ProjMap[n + Width * Height * i].Z;
+			TextureData[n].B = 0;
+		}
+
+		FisheyeSides[i].UVTexture->PlatformData->Mips[0].BulkData.Unlock();
+
+
+	}
+
+	auto UpdateTex = [this]()
+	{
+		for (int i = 0; i < FisheyeSides.Num(); ++i)
+		{
+			FisheyeSides[i].UVTexture->UpdateResource();
+			MaterialDyn->SetTextureParameterValue(*(FString("bitmap_tex") + FString::FromInt(i)), FisheyeSides[i].SceneCapture->TextureTarget);
+			MaterialDyn->SetTextureParameterValue(*(FString("uv_tex") + FString::FromInt(i)), FisheyeSides[i].UVTexture);
+		}
+	};
+
+	if (!IsInGameThread())
+	{
+		AsyncTask(ENamedThreads::GameThread, [this, UpdateTex]()
+		{
+			if(IsValid(this) && FisheyeSides.Num())
+			{
+				UpdateTex();
+			} 
+		});
+	}
+	else
+	{
+		UpdateTex();
+	}
+
+	CaptureComponent->bCaptureEveryFrame = true;
+	for (int i = 0; i < FisheyeSides.Num(); i++) FisheyeSides[i].SceneCapture->bCaptureEveryFrame = true;
+
+	return true;
+}
+
+void UFisheyeCameraSensorComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+
+	if (bDrawDebugRings)
+	{
+		static const  int ReingSteps = 80;
+		static const float RayLength = 1;
+
+		FTransform Trans = GetComponentTransform();
+		for (float RingAng : DebugRings)
+		{
+			float X = RayLength * cos(RingAng / 2.0 / 180.0 * M_PI);
+			float R = RayLength * sin(RingAng / 2.0 / 180.0 * M_PI);
+			FVector Pt1 = Trans.TransformPosition(FVector(X, R, 0.0));
+			for (int i = 0; i < ReingSteps; i++)
+			{
+				float A = float((i + 1) % ReingSteps) / float(ReingSteps) * 2.0 * M_PI;
+				FVector Pt2 = Trans.TransformPosition(FVector(X, cos(A) * R, sin(A) * R));
+				DrawDebugLine(GetWorld(), Pt1, Pt2, FColor(0, 255, 0), false, 0.0f, 0, 0.005f);
+				Pt1 = Pt2;
+			}
+		}
+	}
+
+	//if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+}
+
+bool UFisheyeCameraSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (InitializeProjectionFuture.valid()) InitializeProjectionFuture.wait();
+
+	Clean();
+
+	FisheyeModel.K1 = IntrinsicsD0;
+	FisheyeModel.K2 = IntrinsicsD1;
+	FisheyeModel.K3 = IntrinsicsD2;
+	FisheyeModel.K4 = IntrinsicsD3;
+	FisheyeModel.Cx = IntrinsicsCX;
+	FisheyeModel.Cy = IntrinsicsCY;
+	FisheyeModel.Fx = IntrinsicsFX;
+	FisheyeModel.Fy = IntrinsicsFY;
+
+	CustomWorld = UWorld::CreateWorld(EWorldType::Game, false);
+	check(CustomWorld);
+	FWorldContext& WorldContext = GEngine->CreateNewWorldContext(EWorldType::Game);
+	WorldContext.SetCurrentWorld(CustomWorld);
+
+	switch (Format)
+	{
+	case ECameraSensorShader::Segm8:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.Segm, this);
+		break;
+
+	case ECameraSensorShader::SegmBGR8:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.SegmColor, this);
+		break;
+
+	case ECameraSensorShader::CFA:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.CFA, this);
+		break;
+
+	case ECameraSensorShader::DepthFloat32:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.DepthAbsEnc, this);
+		break;
+
+	case ECameraSensorShader::Depth8:
+	case ECameraSensorShader::Depth16:
+		PostProcessMat = UMaterialInstanceDynamic::Create(CameraPostProcessMaterals.DepthNormEnc, this);
+		PostProcessMat->SetScalarParameterValue("MaxDist", MaxDepthDistance * 100.f);
+		break;
+	}
+
+	if (PostProcessMat)
+	{
+		PostProcessSettings.WeightedBlendables.Array.AddDefaulted(1);
+		PostProcessSettings.WeightedBlendables.Array[0].Object = PostProcessMat;
+		PostProcessSettings.WeightedBlendables.Array[0].Weight = 1.f;
+	}
+
+	const FFisheyeSide FisheyeSidesCenter(FQuat(FRotator(0, 0, 0)), CenterFaceFOV, CenterFaceTexWidth, CenterFaceTexHeight);
+	const FFisheyeSide FisheyeSidesLeft(FQuat(FRotator(0, -(CenterFaceFOV + LeftRightFaceFOV) / 2, 0)), LeftRightFaceFOV, LeftRightFaceTexWidth, LeftRightFaceTexHeight);
+	const FFisheyeSide FisheyeSidesRight(FQuat(FRotator(0, (CenterFaceFOV + LeftRightFaceFOV) / 2, 0)), LeftRightFaceFOV, LeftRightFaceTexWidth, LeftRightFaceTexHeight);
+	const FFisheyeSide FisheyeSidesUp(FQuat(FRotator((CenterFaceFOV + UpDownFaceFOV) / 2, 0, 0)), UpDownFaceFOV, UpDownFaceTexWidth, UpDownFaceTexHeight);
+	const FFisheyeSide FisheyeSidesDown(FQuat(FRotator(-(CenterFaceFOV + UpDownFaceFOV) / 2, 0, 0)), UpDownFaceFOV, UpDownFaceTexWidth, UpDownFaceTexHeight);
+
+	switch (FisheyeConstructMode)
+	{
+	case EFisheyeConstructMode::OneFace:
+		FisheyeSides.SetNum(1);
+		FisheyeSides[0] = FisheyeSidesCenter;
+		CommonQuat = FQuat(FRotator(0, 0, 0));
+		break;
+
+	case EFisheyeConstructMode::TowFaces:
+		FisheyeSides.SetNum(2);
+		FisheyeSides[0] = FisheyeSidesCenter;
+		FisheyeSides[1] = FisheyeSidesLeft;
+		CommonQuat = FQuat(FRotator(0, CenterFaceFOV / 2, 0));
+		break;
+
+	case EFisheyeConstructMode::ThreeFacesLine:
+		FisheyeSides.SetNum(3);
+		FisheyeSides[0] = FisheyeSidesCenter;
+		FisheyeSides[1] = FisheyeSidesLeft;
+		FisheyeSides[2] = FisheyeSidesRight;
+		CommonQuat = FQuat(FRotator(0, 0, 0));
+		break;
+
+	case EFisheyeConstructMode::ThreeFaces:
+		FisheyeSides.SetNum(3);
+		FisheyeSides[0] = FisheyeSidesCenter;
+		FisheyeSides[1] = FisheyeSidesLeft;
+		FisheyeSides[2] = FisheyeSidesDown;
+		CommonQuat = FQuat(FRotator(45, 0, -45));
+		break;
+
+	case EFisheyeConstructMode::FourFaces:
+		FisheyeSides.SetNum(4);
+		FisheyeSides[0] = FisheyeSidesCenter;
+		FisheyeSides[1] = FisheyeSidesLeft;
+		FisheyeSides[2] = FisheyeSidesRight;
+		FisheyeSides[3] = FisheyeSidesDown;
+		CommonQuat = FQuat(FRotator(CenterFaceFOV / 2, 0, 0));
+		break;
+
+	case EFisheyeConstructMode::FiveFaces:
+		FisheyeSides.SetNum(5);
+		FisheyeSides[0] = FisheyeSidesCenter;
+		FisheyeSides[1] = FisheyeSidesLeft;
+		FisheyeSides[2] = FisheyeSidesRight;
+		FisheyeSides[3] = FisheyeSidesUp;
+		FisheyeSides[4] = FisheyeSidesDown;
+		CommonQuat = FQuat(FRotator(0, 0, 0));
+		break;
+
+	default:
+		check(0);
+	}
+
+	if (bUseCustomProjectRotation)
+	{
+		CommonQuat = FQuat(CustomProjectRotation);
+	}
+
+	for (int i = 0; i < FisheyeSides.Num(); ++i)
+	{
+		FisheyeSides[i].SceneCapture = NewObject< USceneCaptureComponent2D >(this);
+		FisheyeSides[i].SceneCapture->HideComponent(this);
+		FisheyeSides[i].SceneCapture->CaptureSortPriority = 2;
+		FisheyeSides[i].SceneCapture->CaptureSource = (Format == ECameraSensorShader::HdrRGB8) ? ESceneCaptureSource::SCS_SceneColorHDR : ESceneCaptureSource::SCS_FinalColorLDR;
+		FisheyeSides[i].SceneCapture->TextureTarget = NewObject< UTextureRenderTarget2D >(this);
+		FisheyeSides[i].SceneCapture->TextureTarget->bForceLinearGamma = true;
+		FisheyeSides[i].SceneCapture->TextureTarget->RenderTargetFormat = RTF_RGBA16f;
+		FisheyeSides[i].SceneCapture->TextureTarget->AddressX = TextureAddress::TA_Clamp;
+		FisheyeSides[i].SceneCapture->TextureTarget->AddressY = TextureAddress::TA_Clamp;
+		if (Format == ECameraSensorShader::Segm8) FisheyeSides[i].SceneCapture->TextureTarget->Filter = TextureFilter::TF_Nearest;
+		FisheyeSides[i].SceneCapture->FOVAngle = FisheyeSides[i].FOV;
+		FisheyeSides[i].SceneCapture->PrimitiveRenderMode = PrimitiveRenderMode;
+		FisheyeSides[i].SceneCapture->HiddenActors = HiddenActors;
+		FisheyeSides[i].SceneCapture->ShowOnlyActors = ShowOnlyActors;
+		FisheyeSides[i].SceneCapture->bAlwaysPersistRenderingState = bAlwaysPersistRenderingState;
+		FisheyeSides[i].SceneCapture->LODDistanceFactor = LODDistanceFactor;
+		FisheyeSides[i].SceneCapture->MaxViewDistanceOverride = MaxViewDistanceOverride;
+		FisheyeSides[i].SceneCapture->ShowFlags = ShowFlags;
+		//FisheyeSides[i].SceneCapture->ShowFlags.EnableAdvancedFeatures();
+		FisheyeSides[i].SceneCapture->CompositeMode = CompositeMode;
+		FisheyeSides[i].SceneCapture->PostProcessSettings = PostProcessSettings;
+		FisheyeSides[i].SceneCapture->PostProcessBlendWeight = PostProcessBlendWeight;
+		FisheyeSides[i].SceneCapture->ShowFlagSettings = ShowFlagSettings;
+		FisheyeSides[i].SceneCapture->bCaptureOnMovement = false;
+		FisheyeSides[i].SceneCapture->bCaptureEveryFrame = false;
+		FisheyeSides[i].SceneCapture->SetupAttachment(this);
+		FisheyeSides[i].SceneCapture->SetRelativeRotation(CommonQuat * FisheyeSides[i].CamRotator);
+		FisheyeSides[i].SceneCapture->RegisterComponent();
+		//FisheyeSides[i].SceneCapture->HideComponent(Mesh);
+	}
+
+	MaterialDyn = UMaterialInstanceDynamic::Create(SqureMaterials[FisheyeSides.Num() - 1], CustomWorld);
+	Mesh = NewObject< UStaticMeshComponent >(CustomWorld);
+	Mesh->SetCollisionProfileName(UCollisionProfile::NoCollision_ProfileName);
+	Mesh->SetStaticMesh(StaticMeshSqure);
+	Mesh->SetRelativeRotation(FRotator(0.0, 90.0, 90.0));
+	Mesh->SetRelativeScale3D(FVector(1, 1 * float(Height) / Width, 1.0));
+	Mesh->SetMaterial(0, MaterialDyn);
+	Mesh->SetWorldLocation(FVector(1, 0, 0));
+	Mesh->RegisterComponentWithWorld(CustomWorld);
+
+	if (bUseCustomAutoExposure)
+	{
+		FisheyePostProcessSettings.AutoExposureMinBrightness = AutoExposureMinBrightness;
+		FisheyePostProcessSettings.AutoExposureMaxBrightness = AutoExposureMaxBrightness;
+		FisheyePostProcessSettings.AutoExposureBias = AutoExposureBias;
+
+		FisheyePostProcessSettings.bOverride_AutoExposureMinBrightness = true;
+		FisheyePostProcessSettings.bOverride_AutoExposureMaxBrightness = true;
+		FisheyePostProcessSettings.bOverride_AutoExposureBias = true;
+	}
+
+	FisheyePostProcessSettings.bOverride_BloomIntensity = true;
+	FisheyePostProcessSettings.BloomIntensity = BloomIntensity;
+
+	CaptureComponent = NewObject< USceneCaptureDeferredComponent2D >(this);
+	CaptureComponent->CustomWorld = CustomWorld;
+	CaptureComponent->TextureTarget = NewObject< UTextureRenderTarget2D >(this);
+	CaptureComponent->TextureTarget->InitCustomFormat(Width, Height, EPixelFormat::PF_B8G8R8A8, !IsColorFormat(Format) || bForceLinearGamma);
+	CaptureComponent->bCaptureEveryFrame = false;
+	CaptureComponent->bCaptureOnMovement = false;
+	CaptureComponent->ProjectionType = ECameraProjectionMode::Orthographic;
+	CaptureComponent->OrthoWidth = 100;
+	CaptureComponent->PostProcessSettings = FisheyePostProcessSettings;
+	CaptureComponent->PostProcessBlendWeight = 1.0;
+	CaptureComponent->CaptureSource = (IsColorFormat(Format) ? ESceneCaptureSource::SCS_FinalColorLDR : ESceneCaptureSource::SCS_SceneColorHDR);
+	CaptureComponent->ShowOnlyComponent(Mesh);
+	CaptureComponent->SetWorldLocation(FVector(0, 0, 0));
+	CaptureComponent->RegisterComponent();
+
+	bIsProjectionInitializing = true;
+	InitializeProjectionFuture = std::async(std::launch::async, [this]()
+	{
+		TArray<FVector> ProjMap;
+		ComputeProjectionMap(ProjMap);
+		ApplyProjectionMap(ProjMap);
+		
+		bIsProjectionInitializing = false;
+	});
+	
+	return true;
+}
+
+void UFisheyeCameraSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	if (InitializeProjectionFuture.valid()) InitializeProjectionFuture.wait();
+
+	Clean();
+}
+
+void UFisheyeCameraSensorComponent::RecalculateProjection()
+{
+	if (FPaths::FileExists(*TmpFileName))
+	{
+		IFileManager::Get().Delete(*TmpFileName);
+	}
+
+	TArray<FVector> ProjMap;
+	ComputeProjectionMap(ProjMap);
+	if (HealthIsWorkable())
+	{
+		ApplyProjectionMap(ProjMap);
+	}
+
+	MarkRenderStateDirty();
+}
+
+bool UFisheyeCameraSensorComponent::GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes)
+{
+	static const  int RingsSteps = 30;
+	static const int RadStep = 15;
+
+
+	FVector2D UV1, UV2;
+	FisheyeModel.K1 = IntrinsicsD0;
+	FisheyeModel.K2 = IntrinsicsD1;
+	FisheyeModel.K3 = IntrinsicsD2;
+	FisheyeModel.K4 = IntrinsicsD3;
+	FisheyeModel.Cx = IntrinsicsCX;
+	FisheyeModel.Cy = IntrinsicsCY;
+	FisheyeModel.Fx = IntrinsicsFX;
+	FisheyeModel.Fy = IntrinsicsFY;
+	FisheyeModel.ProjectXYZ2UV(FVector(1, 0, 0).RotateAngleAxis(MaxFOV / 2, FVector(0, 0, 1)), UV1);
+	FisheyeModel.ProjectXYZ2UV(FVector(1, 0, 0).RotateAngleAxis(-MaxFOV / 2, FVector(0, 0, 1)), UV2);
+	
+	const float UVMaxRad = std::abs(UV1.X - UV2.X) / 2;
+	const FVector2D Center(float(Width) / 2, float(Height) / 2);
+
+	TArray<FVector> Cloud;
+	TArray<FVector2D> CloudUV;
+	TArray <int32> Hull;
+
+	Cloud.Add(FVector(1, 0, 0) * FOVSetup.MaxViewDistance);
+	CloudUV.Add(Center);
+
+	for (int j = 0; j < RingsSteps; j++)
+	{
+		float A = float((j + 1) % RingsSteps) / float(RingsSteps) * 2 * M_PI;
+		FVector2D Vec(cos(A), sin(A));
+		bool IsAdded = false;
+		for (int i = 1; i <= RadStep; i++)
+		{
+			float R = UVMaxRad / float(RadStep) * i;
+			FVector2D UV = Vec * R + Center;
+			FVector2D UVt = UV;
+			UV.Y = Height - UV.Y;
+			bool IsEnd = false;
+			if (UV.X < 0)
+			{ 
+				if (!Intersection(Center, UV, FVector2D(0, 0), FVector2D(0, Height), &UV)) break;
+				IsEnd = true;
+			} 
+			else if (UV.Y < 0)
+			{
+				if (!Intersection(Center, UV, FVector2D(0, 0), FVector2D(Width, 0), &UV)) break;
+				IsEnd = true;
+			}
+			else if (UV.X >= Width)
+			{
+				if (!Intersection(Center, UV, FVector2D(Width, 0), FVector2D(Width, Height), &UV)) break;
+				IsEnd = true;
+			}
+			else if (UV.Y >= Height)
+			{
+				if (!Intersection(Center, UV, FVector2D(0, Height), FVector2D(Width, Height), &UV)) break;
+				IsEnd = true;
+			}
+						
+			FVector Norm;
+			if (FisheyeModel.ProjectUV2XYZ(UV, Norm))
+			{
+				Cloud.Add(Norm * FOVSetup.MaxViewDistance);
+				CloudUV.Add((UVt));
+				IsAdded = true;
+			}			
+			
+			if (IsEnd) break;
+		}
+
+		if(IsAdded) Hull.Add(CloudUV.Num() - 1);
+
+	}
+
+	FSensorFOVMesh MeshData;
+	if (FMeshGenerationUtils::GenerateFOVMesh2D(Cloud, CloudUV, Hull, MeshData.Vertices, MeshData.Indices))
+	{
+		for (auto& it : MeshData.Vertices) it.Color = FOVSetup.Color.ToFColor(true);
+		Meshes.Add(MoveTempIfPossible(MeshData));
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+void UFisheyeCameraSensorComponent::MakeScreenshot(const FString& InFileName)
+{
+	if (!HealthIsWorkable()) return;
+
+	if (!CaptureComponent->bCaptureEveryFrame)
+	{
+		for (int i = 0; i < FisheyeSides.Num(); i++)
+		{
+			FisheyeSides[i].SceneCapture->CaptureScene();
+		}
+	}
+
+	Super::MakeScreenshot(InFileName);
+}
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/GenericVehicleState.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/GenericVehicleState.cpp
new file mode 100644
index 0000000..f2e8d14
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/GenericVehicleState.cpp
@@ -0,0 +1,131 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/GenericVehicleState.h"
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "DrawDebugHelpers.h"
+#include "Soda/LevelState.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+
+UGenericVehicleStateComponent::UGenericVehicleStateComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("GenericVehicleState");
+	GUI.bIsPresentInAddMenu = true;
+	GUI.IcanName = TEXT("SodaIcons.GPS");
+}
+
+void UGenericVehicleStateComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	//if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+}
+
+void UGenericVehicleStateComponent::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp & Timestamp)
+{
+	Super::PostPhysicSimulationDeferred(DeltaTime, VehicleKinematic, Timestamp);
+
+	if (!Publisher.IsAdvertised())
+		return;
+
+	FTransform WorldPose;
+	FVector WorldVel;
+	FVector LocalAcc;
+	FVector Gyro;
+	VehicleKinematic.CalcIMU(GetRelativeTransform(), WorldPose, WorldVel, LocalAcc, Gyro);
+	FRotator WorldRot = WorldPose.Rotator();
+	FVector WorldLoc = WorldPose.GetTranslation();
+
+	if (bImuNoiseEnabled)
+	{
+		FVector RotNoize = NoiseParams.Rotation.Step();
+		WorldRot += FRotator(RotNoize.Y, RotNoize.Z, RotNoize.X);
+		WorldLoc += NoiseParams.Location.Step() * 100;
+		LocalAcc += NoiseParams.Acceleration.Step() * 100;
+		WorldVel += NoiseParams.Velocity.Step() * 100;
+		Gyro += NoiseParams.Gyro.Step();
+	}
+	FVector LocVel = WorldRot.UnrotateVector(WorldVel);
+
+	double Lon, Lat, Alt;
+	GetLevelState()->GetLLConverter().UE2LLA(WorldLoc, Lon, Lat, Alt);
+
+	if (OutFile.is_open())
+	{
+		WriteCsvLog(FVector::ZeroVector, FRotator::ZeroRotator, FVector::ZeroVector, LocalAcc, Gyro, 0, 0, 0, Timestamp);
+	}
+
+	static auto ToSodaVec = [](const FVector& V) { return soda::Vector{ V.X, -V.Y, V.Z }; };
+	static auto ToSodaRot = [](const FVector& V) { return soda::Vector{ -V.X, V.Y, -V.Z }; };
+
+	soda::GenericVehicleState Msg {};
+
+	Msg.navigation_state.timestamp = soda::RawTimestamp<std::chrono::nanoseconds>(Timestamp);
+	Msg.navigation_state.longitude = Lon;
+	Msg.navigation_state.latitude = Lat;
+	Msg.navigation_state.altitude = Alt;
+	Msg.navigation_state.rotation.roll =  -NormAngRad(WorldRot.Roll / 180.0 * M_PI);
+	Msg.navigation_state.rotation.pitch =  NormAngRad(WorldRot.Pitch / 180.0 * M_PI);
+	Msg.navigation_state.rotation.yaw =   -NormAngRad(WorldRot.Yaw / 180.0 * M_PI);
+	Msg.navigation_state.position = ToSodaVec(WorldLoc * 0.01);
+	Msg.navigation_state.world_velocity = ToSodaVec(WorldVel * 0.01);
+	Msg.navigation_state.loc_velocity  = ToSodaVec(LocVel * 0.01);
+	Msg.navigation_state.angular_velocity = ToSodaRot(Gyro);
+	Msg.navigation_state.acceleration = ToSodaVec(LocalAcc * 0.01);
+	Msg.navigation_state.gyro_biases = ToSodaRot(NoiseParams.Gyro.GetAccuracy());
+	Msg.navigation_state.acc_biases = ToSodaVec(NoiseParams.Acceleration.GetAccuracy());
+
+	if (VehicleDriver)
+	{
+		Msg.gear = soda::EGear(VehicleDriver->GetGear());
+		Msg.mode = soda::EControlMode(VehicleDriver->GetDriveMode());
+	}
+
+	if (bIs4WDVehicle)
+	{
+		Msg.steer = -(WheeledVehicle->GetWheel4WD(E4WDWheelIndex::FL)->Steer + WheeledVehicle->GetWheel4WD(E4WDWheelIndex::FR)->Steer) / 2;
+		for (int i = 0; i < 4; i++)
+		{
+			USodaVehicleWheelComponent* Wheel = WheeledVehicle->GetWheel4WD(E4WDWheelIndex(i));
+			Msg.wheels_state[i].ang_vel = Wheel->AngularVelocity;
+			Msg.wheels_state[i].torq = Wheel->ReqTorq;
+			Msg.wheels_state[i].brake_torq = Wheel->ReqBrakeTorque;
+		}
+	}
+
+	Publisher.Publish(Msg);
+}
+
+bool UGenericVehicleStateComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	Publisher.Advertise();
+
+	if (!Publisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		return false;
+	}
+
+	WheeledVehicle = Cast<ASodaWheeledVehicle>(GetVehicle());
+	bIs4WDVehicle = WheeledVehicle && WheeledVehicle->Is4WDVehicle();
+	VehicleDriver = LinkToVehicleDriver.GetObject<UVehicleDriverComponent>(GetOwner());
+
+	return true;
+}
+
+void UGenericVehicleStateComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	Publisher.Shutdown();
+}
+
+void UGenericVehicleStateComponent::GetRemark(FString& Info) const
+{
+	Info = Publisher.Address + ":" + FString::FromInt(Publisher.Port);
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/GpsDSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/GpsDSensor.cpp
new file mode 100644
index 0000000..8a1a9d0
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/GpsDSensor.cpp
@@ -0,0 +1,572 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/GpsDSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Dom/JsonValue.h"
+#include "Dom/JsonObject.h"
+#include "HAL/PlatformProcess.h"
+#include "Serialization/JsonWriter.h"
+#include "Serialization/JsonSerializer.h"
+#include <ctime>
+#include "SodaSimProto/NComRxDefines.h"
+#include "Soda/LevelState.h"
+#include "HAL/UnrealMemory.h"
+#include "Policies/CondensedJsonPrintPolicy.h"
+#include "Serialization/JsonWriter.h"
+
+UGpsDSensorComponent::UGpsDSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+
+{
+	GUI.ComponentNameOverride = TEXT("GPSD");
+	GUI.bIsPresentInAddMenu = true;
+	GUI.IcanName = TEXT("SodaIcons.GPS");
+
+	NoiseParams.Gyro.StdDev = FVector(0.00087);
+	NoiseParams.Gyro.ConstBias = FVector(0.001);
+	NoiseParams.Gyro.GMBiasStdDev = FVector(0.00001);
+
+	NoiseParams.Acceleration.StdDev = FVector(0.02);
+	NoiseParams.Acceleration.ConstBias = FVector(0.03);
+	NoiseParams.Acceleration.GMBiasStdDev = FVector(0.0001);
+}
+
+bool UGpsDSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	Shutdown();
+
+	FIPv4Address V4Addr;
+	if (!FIPv4Address::Parse(Address, V4Addr))
+	{
+		UE_LOG(LogSoda, Error, TEXT("FInnovizProPublisher::OnActivateVehicleComponent() : Tcp address %s parse error"), *Address);
+	}
+	FIPv4Endpoint Endpoint(V4Addr, TcpPort);
+	TcpServerSocket = FTcpSocketBuilder("GpsDSensor").AsNonBlocking().AsReusable().BoundToEndpoint(Endpoint).Listening(8).Build();
+	if (!TcpServerSocket)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UGpsDSensorComponent::OnActivateVehicleComponent(): Can't create TCP server socket"));
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't create server socket"));
+		return false;
+	}
+
+	TcpListener = new FTcpListener(*TcpServerSocket);
+	TcpListener->OnConnectionAccepted().BindUObject(this, &UGpsDSensorComponent::OnConnected);
+	if (!TcpListener->Init())
+	{
+		UE_LOG(LogSoda, Error, TEXT("Can not start listening on port %d"), TcpPort);
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't start server listen"));
+		return false;
+	}
+
+	return true;
+}
+
+void UGpsDSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	Shutdown();
+}
+
+void UGpsDSensorComponent::Shutdown()
+{
+	Mutex.lock();
+	for (FGpsDConnection& Connection : Connections)
+	{
+		Connection.ConnectionSocket->Close();
+		ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->DestroySocket(Connection.ConnectionSocket);
+	}
+	Connections.Empty();
+	Mutex.unlock();
+
+	if (TcpListener)
+	{
+		TcpListener->Stop();
+		FPlatformProcess::Sleep(0.f);
+		delete TcpListener;
+		TcpListener = 0;
+	}
+	if (TcpServerSocket)
+	{
+		TcpServerSocket->Close();
+		ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->DestroySocket(TcpServerSocket);
+	}
+	TcpServerSocket = 0;
+}
+
+void UGpsDSensorComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos) 
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+	if(Common.bDrawDebugCanvas)
+	{
+	}
+}
+
+void UGpsDSensorComponent::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& TimestampIn)
+{
+	Super::PostPhysicSimulationDeferred(DeltaTime, VehicleKinematic, TimestampIn);
+
+	if (!TcpListener || !TcpListener->IsActive() || !GetLevelState()) return;
+
+	VehicleKinematic.CalcIMU(GetRelativeTransform(), WorldPose, WorldVel, LocalAcc, Gyro);
+	WorldRot = WorldPose.Rotator();
+	WorldLoc = WorldPose.GetTranslation();
+	Timestamp = TimestampIn;
+
+	if (bImuNoiseEnabled)
+	{
+		FVector RotNoize = NoiseParams.Rotation.Step();
+		WorldRot += FRotator(RotNoize.Y, RotNoize.Z, RotNoize.X);
+		WorldLoc += NoiseParams.Location.Step() * 100;
+		LocalAcc += NoiseParams.Acceleration.Step() * 100;
+		WorldVel += NoiseParams.Velocity.Step() * 100;
+		Gyro += NoiseParams.Gyro.Step();
+	}
+	WorldRot = GetLevelState()->GetLLConverter().ConvertRotationForward(WorldRot);
+	WorldVel = GetLevelState()->GetLLConverter().ConvertDirForward(WorldVel);
+	CurVehicleKinematic = VehicleKinematic;
+	GetLevelState()->GetLLConverter().UE2LLA(WorldLoc, Lon, Lat, Alt);
+
+	if (OutFile.is_open())
+	{
+		WriteCsvLog(WorldLoc, WorldRot, WorldVel, LocalAcc, Gyro, Lon, Lat, Alt, Timestamp);
+	}
+
+	Mutex.lock();
+	for (size_t i = 0; i < Connections.Num();/*Nothing here*/)
+	{
+		if (Connections[i].ConnectionSocket->GetConnectionState() != ESocketConnectionState::SCS_Connected || Connections[i].SocketDead)
+		{
+			if (bBaseDebugOutput)
+				UE_LOG(LogSoda, Log, TEXT("UGpsDSensorComponent::UpdateImu(): Closing connection for connection[%d]"), i);
+
+			Connections[i].ConnectionSocket->Close();
+			ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->DestroySocket(Connections[i].ConnectionSocket);
+			Connections.RemoveAt(i);
+		}
+		else
+		{
+			i++;
+		}
+	}
+
+	std::chrono::milliseconds WatcherModePeriod_(int64(WatcherModePeriod * 1000 + 0.5));
+
+	auto SendDeltaTime = TimestampIn - PrevSendTimeMark;
+	if (SendDeltaTime >= WatcherModePeriod_)
+	{
+		if (SendDeltaTime < WatcherModePeriod_)
+			PrevSendTimeMark += WatcherModePeriod_;
+		else
+			PrevSendTimeMark = TimestampIn;
+
+		for (size_t i = 0; i < Connections.Num(); ++i)
+		{
+			if (Connections[i].WatcherMode && Connections[i].WatcherJson)
+			{
+				if (bLogTcpDebugOutput)
+					UE_LOG(LogSoda, Log, TEXT("UGpsDSensorComponent::UpdateImu(): Send data to connection[%d] by Watcher mode"), i);
+
+				if(bWatcherModeSKY) SendSKY(Connections[i]);
+				if(bWatcherModeTPV) SendTPV(Connections[i]);
+				if(bWatcherModeATT) SendATT_IMU(Connections[i], true);
+			}
+		}
+	}
+
+	if (bWatcherModeIMU)
+	{
+		for (size_t i = 0; i < Connections.Num(); ++i)
+		{
+			if (Connections[i].WatcherMode && Connections[i].WatcherJson)
+			{
+				SendATT_IMU(Connections[i], false);
+			}
+		}
+	}
+
+	for (int i = 0; i < Connections.Num(); ++i)
+	{
+		TArray< uint8 > ReceivedData;
+
+		uint32 Size;
+		int32 Read = 0;
+		if (Connections[i].ConnectionSocket->HasPendingData(Size))
+		{
+			ReceivedData.Init(0, FMath::Min(Size, 65507u));
+
+			Connections[i].ConnectionSocket->Recv(ReceivedData.GetData(), ReceivedData.Num(), Read);
+			if (bLogTcpDebugOutput)
+			{
+				UE_LOG(LogSoda, Log, TEXT("UGpsDSensorComponent::UpdateImu(): Data Read from connection[%d]: %d"), i, Read);
+			}
+		}
+		//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+		if (ReceivedData.Num() <= 0)
+		{
+			//No Data Received
+			continue;
+		}
+
+		for (uint8 &Elem : ReceivedData)
+		{
+			char CharElem = (char)Elem;
+			if (CharElem == '?')
+			{
+				Connections[i].RequestNameBuffer.Empty();
+				Connections[i].RequestJsonBuffer.Empty();
+				Connections[i].ParseAsJson = false;
+			}
+			else if (CharElem == '=')
+			{
+				Connections[i].ParseAsJson = true;
+			}
+			else if (CharElem == ';' || CharElem == '\n')
+			{
+
+				TSharedPtr<FJsonObject> RequestJsonObject = MakeShareable(new FJsonObject);
+				TSharedRef< TJsonReader<> > Reader = TJsonReaderFactory<>::Create(Connections[i].RequestJsonBuffer);
+				FJsonSerializer::Deserialize(Reader, RequestJsonObject);
+				
+				if (Connections[i].RequestNameBuffer.Contains(TEXT("WATCH"), ESearchCase::IgnoreCase))
+				{
+					if (RequestJsonObject.Get())
+					{
+						const TSharedPtr<FJsonValue> ValEnableField = RequestJsonObject.Get()->TryGetField(TEXT("enable"));
+						if (ValEnableField.IsValid())
+						{
+							if (ValEnableField->Type == EJson::Boolean)
+							{
+								Connections[i].WatcherMode = ValEnableField->AsBool();
+							}
+						}
+						const TSharedPtr<FJsonValue> ValJsonField = RequestJsonObject.Get()->TryGetField(TEXT("json"));
+						if (ValJsonField.IsValid())
+						{
+							if (ValJsonField->Type == EJson::Boolean)
+							{
+								Connections[i].WatcherJson = ValJsonField->AsBool();
+							}
+						}
+						const TSharedPtr<FJsonValue> ValDeviceField = RequestJsonObject.Get()->TryGetField(TEXT("device"));
+						if (ValDeviceField.IsValid())
+						{
+							/*
+							if (ValDeviceField->Type == EJson::String)
+							{
+								Connections[i].DeviceName = ValDeviceField->AsString();
+							}
+							*/
+						}
+					}
+					if (bBaseDebugOutput)
+						UE_LOG(LogSoda, Log, TEXT("UGpsDSensorComponent::UpdateImu(): Received Watch to connection[%d]: enable=%d, json=%d, device=%s"), i, Connections[i].WatcherMode, Connections[i].WatcherJson, *DeviceName);
+					SendWatch(Connections[i]);
+					SendDevices(Connections[i]);
+
+				}
+
+				if (bBaseDebugOutput)
+					UE_LOG(LogSoda, Log, TEXT("UGpsDSensorComponent::UpdateImu(): RequestBuffer of connection[%d] emptied on: %s=%s"), i, *Connections[i].RequestNameBuffer, *Connections[i].RequestJsonBuffer);
+				Connections[i].RequestNameBuffer.Empty();
+				Connections[i].RequestJsonBuffer.Empty();
+			}
+			else
+			{
+				if (!Connections[i].ParseAsJson)
+				{
+					Connections[i].RequestNameBuffer.AppendChar((TCHAR)CharElem);
+				}
+				else
+				{
+					Connections[i].RequestJsonBuffer.AppendChar((TCHAR)CharElem);
+				}
+			}
+		}
+	}
+	Mutex.unlock();
+}
+
+bool UGpsDSensorComponent::OnConnected(FSocket* ClientSocket, const FIPv4Endpoint& ClientEndpoint)
+{
+	Mutex.lock();
+	if (bBaseDebugOutput)
+		UE_LOG(LogSoda, Log, TEXT("UGpsDSensorComponent::OnConnected [%d]"), Connections.Num());
+	Connections.Add(FGpsDConnection(ClientSocket, ClientEndpoint.ToInternetAddr()));
+	SendVersion(Connections.Last());
+	Mutex.unlock();
+	return true;
+}
+
+void UGpsDSensorComponent::SendTPV(FGpsDConnection& Connection)
+{
+	TSharedPtr<FJsonObject> TPVObject = MakeShareable(new FJsonObject);
+	
+	TPVObject->SetStringField("class", "TPV");
+	TPVObject->SetStringField("device", DeviceName);
+	TPVObject->SetNumberField("status", 2);
+	char time[100];
+	SPrintfFormatedTime(soda::RawTimestamp<std::chrono::milliseconds>(Timestamp), time);
+	TPVObject->SetStringField("time", time);
+	TPVObject->SetNumberField("leapseconds", 18);
+	TPVObject->SetNumberField("mode", 3);
+	TPVObject->SetNumberField("lat", Lat);
+	TPVObject->SetNumberField("lon", Lon);
+	TPVObject->SetNumberField("alt", Alt);
+	float Track = WorldVel.Rotation().Yaw - 90.f;
+	Track = Track < 0.f ? Track + 360.f : Track > 360.f ? Track - 360.f : Track;
+	TPVObject->SetNumberField("track", Track);
+	TPVObject->SetNumberField("speed", FVector2D(WorldVel).Size() / 100.f);
+	TPVObject->SetNumberField("climb", WorldVel.Z / 100.f);
+	
+	TPVObject->SetNumberField(TEXT("ept"), 0.005);
+	TPVObject->SetNumberField(TEXT("epx") , 13.725);
+	TPVObject->SetNumberField(TEXT("epy") , 13.949);
+	TPVObject->SetNumberField(TEXT("epv") , 5.808);
+	TPVObject->SetNumberField(TEXT("epd") , 71.0492);
+	TPVObject->SetNumberField(TEXT("eps") , 0.03);
+	TPVObject->SetNumberField(TEXT("epc") , 298.04);
+	TPVObject->SetNumberField(TEXT("ecefx") , 3926933.52);
+	TPVObject->SetNumberField(TEXT("ecefy") , -91416.57);
+	TPVObject->SetNumberField(TEXT("ecefz") , 5008412.79);
+	TPVObject->SetNumberField(TEXT("ecefvx") , -0.07);
+	TPVObject->SetNumberField(TEXT("ecefvy") , -0.01);
+	TPVObject->SetNumberField(TEXT("ecefvz") , -0.04);
+	TPVObject->SetNumberField(TEXT("ecefpAcc") , 7.76);
+	TPVObject->SetNumberField(TEXT("ecefvAcc") , 0.21);
+	TPVObject->SetNumberField(TEXT("eph") , 5.150);
+//	TPVObject->SetNumberField(TEXT("sep") , 1899.810);
+	
+	
+	FString JsonString;
+	TSharedRef<TJsonWriter<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>> Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&JsonString);
+	if (FJsonSerializer::Serialize(TPVObject.ToSharedRef(), Writer))
+	{
+		Send(Connection, JsonString + TEXT("\r\n"));
+	}
+}
+
+void UGpsDSensorComponent::SendATT_IMU(FGpsDConnection& Connection, bool bIsATT)
+{
+	int64 TimestampMs = soda::RawTimestamp<std::chrono::milliseconds>(Timestamp);
+
+	TSharedPtr<FJsonObject> TPVObject = MakeShareable(new FJsonObject);
+	TPVObject->SetStringField("class", bIsATT ? "ATT" : "IMU");
+	TPVObject->SetStringField("device", DeviceName);
+	time_t CurTime = TimestampMs / 1000;
+	tm* ptm = std::gmtime(&CurTime);
+	char time[100];
+	SPrintfFormatedTime(TimestampMs, time);
+	TPVObject->SetStringField("time", time);
+	float Heading = WorldRot.Yaw - 90.f;
+	Heading = Heading < 0.f ? Heading + 360.f : Heading > 360.f ? Heading - 360.f : Heading;
+	TPVObject->SetNumberField("heading", Heading);
+	TPVObject->SetNumberField("pitch", WorldRot.Pitch);
+	TPVObject->SetStringField("pitch_st", "N");
+	TPVObject->SetNumberField("roll", WorldRot.Roll);
+	TPVObject->SetStringField("roll_st", "N");
+	TPVObject->SetNumberField("yaw", WorldRot.Yaw);
+	TPVObject->SetStringField("yaw_st", "N");
+	TPVObject->SetNumberField("acc_len", LocalAcc.Size() / 100.0);
+	TPVObject->SetNumberField("acc_x", -LocalAcc.X / 100.0);
+	TPVObject->SetNumberField("acc_y", -LocalAcc.Y / 100.0);
+	TPVObject->SetNumberField("acc_z", LocalAcc.Z / 100.0);
+	TPVObject->SetNumberField("gyro_x", -Gyro.X);
+	TPVObject->SetNumberField("gyro_y", -Gyro.Y);
+
+	FString JsonString;
+	TSharedRef<TJsonWriter<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>> Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&JsonString);
+	if (FJsonSerializer::Serialize(TPVObject.ToSharedRef(), Writer))
+	{
+		Send(Connection, JsonString + TEXT("\r\n"));
+	}
+}
+
+void UGpsDSensorComponent::SendSKY(FGpsDConnection& Connection)
+{
+	TSharedPtr<FJsonObject> SKYObject = MakeShareable(new FJsonObject);
+	SKYObject->SetStringField("class", "SKY");
+	SKYObject->SetStringField("device", DeviceName);
+	//time_t CurTime = Timestamp / 1000;
+	//tm* ptm = std::gmtime(&CurTime);
+	//char time[100];
+	//SPrintfFormatedTime(Timestamp, time);
+	//SKYObject->SetStringField("time", time);
+	SKYObject->SetNumberField("xdop", 0.76);
+	SKYObject->SetNumberField("ydop", 0.61);
+	SKYObject->SetNumberField("vdop", 1.03);
+	SKYObject->SetNumberField("tdop", 0.74);
+	SKYObject->SetNumberField("hdop", 0.89);
+	SKYObject->SetNumberField("gdop", 1.55);
+	SKYObject->SetNumberField("pdop", 1.37);
+
+	TArray<TSharedPtr<FJsonValue> > SatellitesArray;
+
+	TSharedPtr<FJsonObject> SatelliteObject1 = MakeShareable(new FJsonObject);
+	SatelliteObject1->SetNumberField("PRN", 1);
+	SatelliteObject1->SetNumberField("el", 85);
+	SatelliteObject1->SetNumberField("az", 349);
+	SatelliteObject1->SetNumberField("ss", 38);
+	SatelliteObject1->SetBoolField("used", true);
+	SatelliteObject1->SetNumberField("gnssid", 0);
+	SatelliteObject1->SetNumberField("svid", 1);
+	TSharedRef< FJsonValueObject > JsonDeviceValue1 = MakeShareable(new FJsonValueObject(SatelliteObject1));
+	SatellitesArray.Add(JsonDeviceValue1);
+
+	TSharedPtr<FJsonObject> SatelliteObject2 = MakeShareable(new FJsonObject);
+	SatelliteObject2->SetNumberField("PRN", 3);
+	SatelliteObject2->SetNumberField("el", 57);
+	SatelliteObject2->SetNumberField("az", 224);
+	SatelliteObject2->SetNumberField("ss", 36);
+	SatelliteObject2->SetBoolField("used", true);
+	SatelliteObject2->SetNumberField("gnssid", 0);
+	SatelliteObject2->SetNumberField("svid", 3);
+	TSharedRef< FJsonValueObject > JsonDeviceValue2 = MakeShareable(new FJsonValueObject(SatelliteObject2));
+	SatellitesArray.Add(JsonDeviceValue2);
+
+	TSharedPtr<FJsonObject> SatelliteObject3 = MakeShareable(new FJsonObject);
+	SatelliteObject3->SetNumberField("PRN", 4);
+	SatelliteObject3->SetNumberField("el", 2);
+	SatelliteObject3->SetNumberField("az", 180);
+	SatelliteObject3->SetNumberField("ss", 42);
+	SatelliteObject3->SetBoolField("used", true);
+	SatelliteObject3->SetNumberField("gnssid", 0);
+	SatelliteObject3->SetNumberField("svid", 4);
+	TSharedRef< FJsonValueObject > JsonDeviceValue3 = MakeShareable(new FJsonValueObject(SatelliteObject3));
+	SatellitesArray.Add(JsonDeviceValue3);
+
+	TSharedPtr<FJsonObject> SatelliteObject4 = MakeShareable(new FJsonObject);
+	SatelliteObject4->SetNumberField("PRN", 6);
+	SatelliteObject4->SetNumberField("el", 25);
+	SatelliteObject4->SetNumberField("az", 132);
+	SatelliteObject4->SetNumberField("ss", 42);
+	SatelliteObject4->SetBoolField("used", true);
+	SatelliteObject4->SetNumberField("gnssid", 0);
+	SatelliteObject4->SetNumberField("svid", 8);
+	TSharedRef< FJsonValueObject > JsonDeviceValue4 = MakeShareable(new FJsonValueObject(SatelliteObject4));
+	SatellitesArray.Add(JsonDeviceValue4);
+
+	TSharedPtr<FJsonObject> SatelliteObject5 = MakeShareable(new FJsonObject);
+	SatelliteObject5->SetNumberField("PRN", 9);
+	SatelliteObject5->SetNumberField("el", 7);
+	SatelliteObject5->SetNumberField("az", 94);
+	SatelliteObject5->SetNumberField("ss",42);
+	SatelliteObject5->SetBoolField("used", true);
+	SatelliteObject5->SetNumberField("gnssid", 0);
+	SatelliteObject5->SetNumberField("svid", 12);
+	TSharedRef< FJsonValueObject > JsonDeviceValue5 = MakeShareable(new FJsonValueObject(SatelliteObject5));
+	SatellitesArray.Add(JsonDeviceValue5);
+
+	SKYObject->SetArrayField("satellites", SatellitesArray);
+
+	FString JsonString;
+	TSharedRef<TJsonWriter<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>> Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&JsonString);
+	if (FJsonSerializer::Serialize(SKYObject.ToSharedRef(), Writer))
+	{
+		Send(Connection, JsonString + TEXT("\r\n"));
+	}
+
+}
+
+void UGpsDSensorComponent::SendVersion(FGpsDConnection& Connection)
+{
+	TSharedPtr<FJsonObject> VerObject = MakeShareable(new FJsonObject);
+	VerObject->SetStringField("class", "VERSION");
+	VerObject->SetStringField("release", "2.40dev");
+	VerObject->SetStringField("rev", "06f62e14eae9886cde907dae61c124c53eb1101f");
+	VerObject->SetNumberField("proto_major", 3);
+	VerObject->SetNumberField("proto_minor", 1);
+	FString JsonString;
+	TSharedRef<TJsonWriter<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>> Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&JsonString);
+	if (FJsonSerializer::Serialize(VerObject.ToSharedRef(), Writer))
+	{
+		Send(Connection, JsonString + TEXT("\r\n"));
+	}
+}
+
+
+void UGpsDSensorComponent::SendWatch(FGpsDConnection& Connection)
+{
+	TSharedPtr<FJsonObject> WatchObject = MakeShareable(new FJsonObject);
+	WatchObject->SetStringField("class", "WATCH");
+	WatchObject->SetBoolField("enable", Connection.WatcherMode);
+	WatchObject->SetBoolField("json", Connection.WatcherJson);
+	WatchObject->SetBoolField("nmea", false);
+	WatchObject->SetNumberField("raw", 0);
+	WatchObject->SetBoolField("scaled", false);
+	WatchObject->SetBoolField("timing", false);
+	WatchObject->SetBoolField("pps", false);
+
+	FString JsonString;
+	TSharedRef<TJsonWriter<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>> Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&JsonString);
+	if (FJsonSerializer::Serialize(WatchObject.ToSharedRef(), Writer))
+	{
+		Send(Connection, JsonString + TEXT("\r\n"));
+	}
+}
+
+void UGpsDSensorComponent::SendDevices(FGpsDConnection& Connection)
+{
+	TSharedPtr<FJsonObject> DevicesObject = MakeShareable(new FJsonObject);
+	DevicesObject->SetStringField("class", "DEVICES");
+	TArray<TSharedPtr<FJsonValue> > ValuesArray;
+
+	TSharedPtr<FJsonObject> DeviceObject = MakeShareable(new FJsonObject);
+	DeviceObject->SetStringField("class", "DEVICE");
+	//DeviceObject->SetStringField("path", Connection.DeviceName);
+	//DeviceObject->SetStringField("activated", time);
+	DeviceObject->SetNumberField("native", 0);
+	DeviceObject->SetNumberField("bps", 4800);
+	DeviceObject->SetStringField("parity", "N");
+	DeviceObject->SetNumberField("stopbits", 1);
+	DeviceObject->SetNumberField("cycle", 1.00);
+	TSharedRef< FJsonValueObject > JsonDeviceValue = MakeShareable(new FJsonValueObject(DeviceObject));
+	ValuesArray.Add(JsonDeviceValue);
+	DevicesObject->SetArrayField("devices", ValuesArray);
+	FString JsonString;
+	TSharedRef<TJsonWriter<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>> Writer = TJsonWriterFactory<TCHAR, TCondensedJsonPrintPolicy<TCHAR>>::Create(&JsonString);
+	if (FJsonSerializer::Serialize(DevicesObject.ToSharedRef(), Writer))
+	{
+		Send(Connection, JsonString + TEXT("\r\n"));
+	}
+}
+
+bool UGpsDSensorComponent::Send(FGpsDConnection &Connection, const FString& Data)
+{
+	if (Connection.ConnectionSocket)
+	{
+		TArray<char> ByteArray;
+
+		ByteArray.Append(TCHAR_TO_ANSI(*Data), Data.Len());
+		int32 BytesSent;
+		bool res = Connection.ConnectionSocket->SendTo((uint8*)ByteArray.GetData(), ByteArray.Num(), BytesSent, *Connection.ConnectionAddress);
+		if (bLogTcpDebugOutput || (!res && bBaseDebugOutput))
+		{
+			UE_LOG(LogSoda, Log, TEXT("UGpsDSensorComponent::Send: returned %d, Size = %d, bytes sent = %d, String = %s"), (int)res, ByteArray.Num(), BytesSent, *Data);
+		}
+		if (!res)
+			Connection.SocketDead = true;
+		return res;
+	}
+	return false;
+}
+
+void UGpsDSensorComponent::SPrintfFormatedTime(int64_t TimestampIn, char* Buffer)
+{
+#if PLATFORM_LINUX
+	time_t CurTime = TimestampIn / 1000;
+	tm* ptm = std::gmtime(&CurTime);
+	sprintf(Buffer, "%04d-%02d-%02dT%02d:%02d:%02d.%03ld", 1900 + ptm->tm_year, 1 + ptm->tm_mon, ptm->tm_mday, ptm->tm_hour, ptm->tm_min, ptm->tm_sec, TimestampIn % 1000);
+#else
+	time_t CurTime = TimestampIn / 1000;
+	tm ptm;
+	FMemory::Memzero(&ptm, sizeof(ptm));
+	gmtime_s(&ptm, &CurTime);
+	sprintf(Buffer, "%04d-%02d-%02dT%02d:%02d:%02d.%03lld", 1900 + ptm.tm_year, 1 + ptm.tm_mon, ptm.tm_mday, ptm.tm_hour, ptm.tm_min, ptm.tm_sec, TimestampIn % 1000);
+#endif
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/ImuOxtsSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/ImuOxtsSensor.cpp
new file mode 100644
index 0000000..03ff850
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/ImuOxtsSensor.cpp
@@ -0,0 +1,181 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/ImuOxtsSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "SodaSimProto/NComRxC.h"
+#include "SodaSimProto/NComRxDefines.h"
+#include "Soda/LevelState.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+#include "Engine/Canvas.h"
+#include "Dom/JsonObject.h"
+#include "Dom/JsonValue.h"
+#include <cstddef>
+
+UImuOxtsSensorComponent::UImuOxtsSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("OxTS RT3000");
+	GUI.bIsPresentInAddMenu = true;
+	GUI.IcanName = TEXT("SodaIcons.GPS");
+
+	NoiseParams.Gyro.StdDev = FVector(0.007);
+	NoiseParams.Gyro.ConstBias = FVector(0.003);
+	NoiseParams.Gyro.GMBiasStdDev = FVector(0.000004);
+
+	NoiseParams.Acceleration.StdDev = FVector(0.03);
+	NoiseParams.Acceleration.ConstBias = FVector(0.01);
+	NoiseParams.Acceleration.GMBiasStdDev = FVector(0.0001);
+}
+
+bool UImuOxtsSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	Index = 0;
+	Publisher.Advertise();
+
+	if (!Publisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't advertise publisher"));
+		return false;
+	}
+
+	return true;
+}
+
+void UImuOxtsSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	Publisher.Shutdown();
+}
+
+void UImuOxtsSensorComponent::GetRemark(FString & Info) const
+{
+	Info = "Port: " +  FString::FromInt(Publisher.Port);
+}
+
+void UImuOxtsSensorComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos) 
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if(Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS mode: %d"), OXTS_PositionMode), 16, YPos);
+	}
+}
+
+void UImuOxtsSensorComponent::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp & Timestamp)
+{
+	Super::PostPhysicSimulationDeferred(DeltaTime, VehicleKinematic, Timestamp);
+
+	if (!Publisher.IsAdvertised() || !GetLevelState()) return;
+
+	int64 TimestampMs = soda::RawTimestamp<std::chrono::milliseconds>(Timestamp);
+	FTransform WorldPose;
+	FVector WorldVel;
+	FVector LocalAcc;
+	FVector Gyro = VehicleKinematic.Curr.AngularVelocity;
+	VehicleKinematic.CalcIMU(GetRelativeTransform(), WorldPose, WorldVel, LocalAcc, Gyro);
+	FRotator WorldRot = WorldPose.Rotator();
+	FVector WorldLoc = WorldPose.GetTranslation();
+
+	if (bImuNoiseEnabled)
+	{
+		FVector RotNoize = NoiseParams.Rotation.Step();
+		WorldRot += FRotator(RotNoize.Y, RotNoize.Z, RotNoize.X);
+		WorldLoc += NoiseParams.Location.Step() * 100;
+		LocalAcc += NoiseParams.Acceleration.Step() * 100;
+		WorldVel += NoiseParams.Velocity.Step() * 100;
+		Gyro += NoiseParams.Gyro.Step();
+	}
+
+	double Lon, Lat, Alt;
+	GetLevelState()->GetLLConverter().UE2LLA(WorldLoc, Lon, Lat, Alt);
+	WorldRot = GetLevelState()->GetLLConverter().ConvertRotationForward(WorldRot);
+	WorldVel = GetLevelState()->GetLLConverter().ConvertDirForward(WorldVel);
+
+	if (OutFile.is_open())
+	{
+		WriteCsvLog(WorldLoc, WorldRot, WorldVel, LocalAcc, Gyro, Lon, Lat, Alt, Timestamp);
+	}
+
+	int64 GPSTimeStemp = TimestampMs + int64(SodaApp.GetSodaUserSettings()->GetGPSTimestempOffset()) * 1000LL;
+
+	memset(&Msg, 0, sizeof(Msg));
+	Msg.sync = NCOM_SYNC;
+	Msg.time = static_cast< std::uint16_t >(GPSTimeStemp % 60000);
+	Msg.accel_x = std::int32_t(-LocalAcc.X / 100.0 / ACC2MPS2);
+	Msg.accel_y = std::int32_t(-LocalAcc.Y / 100.0 / ACC2MPS2);
+	Msg.accel_z = std::int32_t(LocalAcc.Z / 100.0 / ACC2MPS2);
+	Msg.gyro_x = -std::int32_t(Gyro.X / RATE2RPS);
+	Msg.gyro_y = -std::int32_t(Gyro.Y / RATE2RPS);
+	Msg.gyro_z = std::int32_t(Gyro.Z / RATE2RPS);
+	Msg.nav_status = NAVIGATION_STATUS_LOCKED;
+	Msg.chksum1 = FOXTSPublisher::Checksum(Msg, sizeof(Msg.sync), offsetof(soda::OxtsPacket, chksum1));
+	Msg._lon.longitude = Lon / 180.0 * M_PI;
+	Msg._lat.latitude = Lat / 180.0 * M_PI;
+	Msg._alt.altitude = Alt;
+	Msg.vel_east = -std::int32_t(WorldVel.X / 100.0 / VEL2MPS);
+	Msg.vel_north = std::int32_t(WorldVel.Y / 100.0 / VEL2MPS);
+	Msg.vel_down = -std::int32_t(WorldVel.Z / 100.0 / VEL2MPS);
+	Msg.heading = std::int32_t(NormAngRad(WorldRot.Yaw / 180.0 * M_PI - M_PI / 2) / ANG2RAD);
+	Msg.pitch = std::int32_t(NormAngRad(WorldRot.Pitch / 180.0 * M_PI) / ANG2RAD);
+	Msg.roll = std::int32_t(NormAngRad(WorldRot.Roll / 180.0 * M_PI) / ANG2RAD);
+	Msg.chksum2 = FOXTSPublisher::Checksum(Msg, sizeof(Msg.sync), offsetof(soda::OxtsPacket, chksum2));
+	std::memset(&Msg.chan, 0, sizeof(Msg.chan));
+	Msg.channel = Publisher.GetChanID();
+	switch (Msg.channel)
+	{
+	case 3:
+	{
+		FVector Accuracy = NoiseParams.Location.GetAccuracy();
+		Msg.chan.chan3.acc_position_north = Accuracy.X / (1e-3);
+		Msg.chan.chan3.acc_position_east = Accuracy.Y / (1e-3);
+		Msg.chan.chan3.acc_position_down = Accuracy.Z / (1e-3);
+		break;
+	}
+	case 4:
+	{
+		FVector Accuracy = NoiseParams.Velocity.GetAccuracy();
+		Msg.chan.chan4.acc_velocity_north = Accuracy.X / (1e-3);
+		Msg.chan.chan4.acc_velocity_east = Accuracy.Y / (1e-3);
+		Msg.chan.chan4.acc_velocity_down = Accuracy.Z / (1e-3);
+		break;
+	}
+	case 5:
+	{
+		FVector Accuracy = NoiseParams.Rotation.GetAccuracy();
+		Msg.chan.chan5.acc_heading = Accuracy.X / (1e-5);
+		Msg.chan.chan5.acc_pitch = Accuracy.Y / (1e-5);
+		Msg.chan.chan5.acc_roll = Accuracy.Z / (1e-5);
+		break;
+	}
+	case 20:
+		Msg.chan.chan20.base_station_age = DifferentialCorrectionsAge;
+		break;
+	case 27:
+		Msg.chan.chan27.heading_quality =  OXTS_HeadingQuality;
+		break;
+	case 0:
+	default:
+		Msg.channel = 0;
+		Msg.chan.chan0.num_sats = SatellitesNumber;
+		Msg.chan.chan0.position_mode = OXTS_PositionMode;
+		Msg.chan.chan0.velocity_mode = OXTS_VelocityMode;
+		Msg.chan.chan0.orientation_mode = OXTS_OrientationMode;
+		Msg.chan.chan0.gps_minutes = GPSTimeStemp / 60000;
+		break;
+	}
+	Msg.chksum3 = FOXTSPublisher::Checksum(Msg, sizeof(Msg.sync), offsetof(soda::OxtsPacket, chksum3));
+
+	Publisher.Publish(Msg);
+	Index++;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/ImuSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/ImuSensor.cpp
new file mode 100644
index 0000000..fdd2ae4
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/ImuSensor.cpp
@@ -0,0 +1,98 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "Soda/UnrealSoda.h"
+#include <iomanip>
+
+UImuSensorComponent::UImuSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("IMU & GNSS Sensors");
+	GUI.IcanName = TEXT("SodaIcons.IMU");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+
+	TickData.bAllowVehiclePostDeferredPhysTick = true;
+}
+
+bool UImuSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (bSaveCSV)
+	{
+		OutFile.close();
+		OutFile.open(TCHAR_TO_UTF8(*CSVPath));
+		if (OutFile.is_open())
+		{
+			OutFile << "LocX,LocY,LocZ,Heading,Pitch,Roll,VelEast,VelNorth,VelDown,AccX,AccY,AccZ,GyroX,GyroY,GyroZ,Lon,Lat,Alt,Timestemp\n";
+		}
+	}
+
+	NoiseParams.UpdateParameters();
+
+	return true;
+}
+
+void UImuSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	if (OutFile.is_open())
+	{
+		OutFile.close();
+	}
+}
+
+void UImuSensorComponent::SetImuNoiseParams(const FImuNoiseParams & NewImuNoiseParams)
+{
+	if (!bIsStoredParams)
+	{
+		StoredParams = NoiseParams;
+		bIsStoredParams = true;
+	}
+	NoiseParams = NewImuNoiseParams;
+	NoiseParams.UpdateParameters();
+}
+
+void UImuSensorComponent::RestoreBaseImuNoiseParams()
+{
+	if (bIsStoredParams)
+	{
+		NoiseParams = StoredParams;
+		NoiseParams.UpdateParameters();
+		bIsStoredParams = false;
+	}
+}
+
+void UImuSensorComponent::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& TimestampIn)
+{
+	Super::PostPhysicSimulationDeferred(DeltaTime,  VehicleKinematic, TimestampIn);
+}
+
+void UImuSensorComponent::WriteCsvLog(
+	const FVector& InWorldLoc,
+	const FRotator& InWorldRot,
+	const FVector& InWorldVel,
+	const FVector& InLocalAcc,
+	const FVector& InGyro,
+	double InLon,
+	double InLat,
+	double InAlt,
+	const TTimestamp& Timestamp)
+{
+	OutFile << std::setprecision(12)
+		<< InWorldLoc.X / 100.0 << "," << -InWorldLoc.Y / 100.0 << "," << InWorldLoc.Z / 100.0 << ","
+		<< NormAngDeg(InWorldRot.Yaw - 90) << ","
+		<< NormAngDeg(InWorldRot.Pitch) << ","
+		<< NormAngDeg(InWorldRot.Roll) << ","
+		<< -InWorldVel.X / 100.0 << "," << InWorldVel.Y / 100.0 << "," << -InWorldVel.Z / 100.0 << ","
+		<< -InLocalAcc.X / 100.0 << "," << -InLocalAcc.Y / 100.0 << "," << InLocalAcc.Z / 100.0 << ","
+		<< -InGyro.X << "," << -InGyro.Y << "," << InGyro.Z << ","
+		<< InLon << "," << InLat << "," << InAlt << "," << soda::RawTimestamp<std::chrono::milliseconds>(Timestamp) << "\n";
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarDepthSensor2D.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarDepthSensor2D.cpp
new file mode 100644
index 0000000..5ab155c
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarDepthSensor2D.cpp
@@ -0,0 +1,427 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/LidarDepthSensor2D.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "Engine/Canvas.h"
+#include "DrawDebugHelpers.h"
+#include "Soda/Misc/ExtraWindow.h"
+#include "UObject/ConstructorHelpers.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "DynamicMeshBuilder.h"
+
+#if PLATFORM_LINUX
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+#define _DEG2RAD(a) ((a) / (180.0 / M_PI))
+#define _RAD2DEG(a) ((a) * (180.0 / M_PI))
+
+ULidarDepthSensor2DComponent::ULidarDepthSensor2DComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("LiDAR Sensors");
+	GUI.ComponentNameOverride = TEXT("Generic LiDAR Depth 2D");
+	GUI.IcanName = TEXT("SodaIcons.Lidar");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+
+	FOVSetup.Color = FLinearColor(1.0, 0.1, 0.3, 1.0);
+	FOVSetup.MaxViewDistance = 700;
+
+	static ConstructorHelpers::FObjectFinder< UObject > PostProcess(TEXT("/SodaSim/Assets/CPP/Lidar/DepthMapLidar"));
+	if (PostProcess.Succeeded())
+	{
+		LidarPostProcessSettings.WeightedBlendables.Array.AddDefaulted(1);
+		LidarPostProcessSettings.WeightedBlendables.Array[0].Object = PostProcess.Object;
+		LidarPostProcessSettings.WeightedBlendables.Array[0].Weight = 1.f;
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("Absent LidarPostProcessSettings for ULidarDepthSensor2DComponent"));
+	}
+
+	DepthMapPublisher = CreateDefaultSubobject< UGenericCameraPublisher>(TEXT("DepthMapPublisher"));
+}
+
+void ULidarDepthSensor2DComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+
+	CameraWindow = NewObject<UExtraWindow>();
+}
+
+void ULidarDepthSensor2DComponent::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+}
+
+void ULidarDepthSensor2DComponent::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if (LidarPostProcessSettings.WeightedBlendables.Array.Num() && LidarPostProcessSettings.WeightedBlendables.Array[0].Object)
+	{
+		UMaterialInterface* DepthMaterialInterface = Cast< UMaterialInterface >(LidarPostProcessSettings.WeightedBlendables.Array[0].Object);
+		if (DepthMaterialInterface)
+		{
+			DepthMaterialDyn = UMaterialInstanceDynamic::Create(DepthMaterialInterface, this);
+			LidarPostProcessSettings.WeightedBlendables.Array[0].Object = DepthMaterialDyn;
+		}
+	}
+
+}
+
+void ULidarDepthSensor2DComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	int ChanelsThreadSafe = Channels;
+	int StepThreadSafe = Step;
+	TTimestamp TimestampThreadSafe = SodaApp.GetSimulationTimestamp();
+	FVector Loc = GetComponentLocation();
+	FRotator Rot = GetComponentRotation();
+
+	ENQUEUE_RENDER_COMMAND(SceneDrawCompletion)([this, ChanelsThreadSafe, StepThreadSafe, TimestampThreadSafe, Loc, Rot](FRHICommandListImmediate& RHICmdList)
+	{
+		if (!IsValid(this) || !IsValid(SceneCaptureComponent2D)) return;
+
+		Points.resize(ChanelsThreadSafe * StepThreadSafe);
+
+		TArrayView<FColor> OutPixels;
+		PixelReader.BeginRead(*SceneCaptureComponent2D->TextureTarget, RHICmdList, OutPixels, CameraFrame.ImageStride);
+
+		if (OutPixels.Num() < int(CameraFrame.Height * CameraFrame.Width))
+		{
+			UE_LOG(LogSoda, Error, TEXT("ULidarDepthSensor2DComponent::TickComponent(); Read %i pixels"), OutPixels.Num());
+			PixelReader.EndRead();
+			return;
+		}
+
+		if (!IsValid(this) || !IsValid(SceneCaptureComponent2D)) return;
+
+		ParallelFor(CameraFrame.Height, [&](uint32 y)
+		{
+			for (uint32 x = 0; x < CameraFrame.Width; x++)
+			{
+				Map[y * CameraFrame.Width + x] = Rgba2Float(OutPixels[y * CameraFrame.ImageStride + x]);
+			}
+		});
+
+		if (bPublishDepthMap)
+		{
+			CameraFrame.ImageStride = CameraFrame.ImageStride;
+			DepthMapPublisher->Publish(OutPixels.GetData(), CameraFrame);
+		}
+
+		PixelReader.EndRead();
+
+		int PointsSkiped = 0;
+
+		for (int k = 0; k < ChanelsThreadSafe * StepThreadSafe; ++k)
+		{
+			float Depth = 0;
+			float x = UVs[k].X;
+			float y = UVs[k].Y;
+
+			switch (Interpolation)
+			{
+				case ELidarInterpolation::Min:
+				case ELidarInterpolation::Bilinear:
+				{
+					int x1 = (int)(x);
+					int x2 = (int)(x + 1.0);
+					int y1 = (int)(y);
+					int y2 = (int)(y + 1.0);
+
+					if (x1 < 0 || x2 < 0 || y1 < 0 || y2 < 0 || x1 >= (int)CameraFrame.Width || x2 >= (int)CameraFrame.Width || y1 >= (int)CameraFrame.Height || y2 >= (int)CameraFrame.Height)
+					{
+						++PointsSkiped;
+						break;
+					}
+
+					float q11 = Map[y1 * CameraFrame.Width + x1];
+					float q12 = Map[y2 * CameraFrame.Width + x1];
+					float q21 = Map[y1 * CameraFrame.Width + x2];
+					float q22 = Map[y2 * CameraFrame.Width + x2];
+
+					if (Interpolation == ELidarInterpolation::Bilinear)
+					{
+						Depth = BilinearInterpolation(q11, q12, q21, q22, x1, x2, y1, y2, x, y);
+					}
+					else
+					{
+						Depth = std::min(std::min(q11, q12), std::min(q21, q22));
+					}
+				}
+				break;
+
+				case ELidarInterpolation::Nearest:
+				{
+					int x1 = (int)(x + 0.5);
+					int y1 = (int)(y + 0.5);
+
+					if (x1 < 0 || y1 < 0 || x1 >= (int)CameraFrame.Width || y1 >= (int)CameraFrame.Height)
+					{
+						++PointsSkiped;
+						break;
+					}
+
+					Depth = Map[y1 * CameraFrame.Width + x1];
+				}
+				break;
+			}
+
+			FVector RayPoint = LidarRays[k] * Depth;
+			float RayLen = RayPoint.Size();
+
+			if (RayLen < DistanseMin / 100.0 || RayLen > DistanseMax / 100.0)
+			{
+				RayPoint = FVector(0.0, 0.0, 0.0);
+			}
+				
+			soda::LidarScanPoint& pt = Points[k];
+
+			pt.coords.x = RayPoint.X;
+			pt.coords.y = RayPoint.Y;
+			pt.coords.z = RayPoint.Z;
+
+			if (Common.bDrawDebugCanvas)
+			{
+				RayPoint *= 100.f;
+				RayPoint = Rot.RotateVector(RayPoint) + Loc;
+				DrawDebugPoint(GetWorld(), RayPoint, 5, FColor::Green, false, -1.0f);
+			}
+
+		}
+
+		PointCloudPublisher.Publish(TimestampThreadSafe, Points);
+
+		if (PointsSkiped)
+		{
+			UE_LOG(LogSoda, Warning, TEXT("ULidarDepthSensor2DComponent::TickComponent(); %i point(s) did't include into the FOV of %s"), PointsSkiped, *GetFName().ToString());
+		}
+
+	});
+	RenderFence.BeginFence();
+}
+
+bool ULidarDepthSensor2DComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (!DepthMaterialDyn)
+	{
+		UE_LOG(LogSoda, Error, TEXT("%s - LidarPostProcess Material NOT loaded!"), *(this->GetName()));
+		SetHealth(EVehicleComponentHealth::Error);
+		return false;
+	}
+
+	DepthMaterialDyn->SetScalarParameterValue("MaxDist", DistanseMax);
+
+	// Computing LidarRays and UVs
+	FMatrix ProjectionMatrix;
+	if ((int32)ERHIZBuffer::IsInverted)
+	{
+		ProjectionMatrix = FReversedZPerspectiveMatrix(
+			FOVAngle * (float)PI / 360.0f,
+			FOVAngle * (float)PI / 360.0f,
+			1.0f,
+			Width / (float)Height,
+			GNearClippingPlane,
+			GNearClippingPlane);
+	}
+	else
+	{
+		ProjectionMatrix = FPerspectiveMatrix(
+			FOVAngle * (float)PI / 360.0f,
+			FOVAngle * (float)PI / 360.0f,
+			1.0f,
+			Width / (float)Height,
+			GNearClippingPlane,
+			GNearClippingPlane);
+	}
+
+	FQuat CommonQuat = FQuat(FRotator(0, 0, 0));
+	FMatrix ViewRotationMatrix = FRotationMatrix::Make(CommonQuat).Inverse() * FMatrix(
+		FPlane(0, 0, 1, 0),
+		FPlane(1, 0, 0, 0),
+		FPlane(0, 1, 0, 0),
+		FPlane(0, 0, 0, 1));
+	FMatrix ViewProjectionMatrix = ViewRotationMatrix * ProjectionMatrix;
+
+	LidarRays.SetNum(Channels * Step);
+	UVs.SetNum(Channels * Step);
+	for (int v = 0; v < Channels; ++v)
+	{
+		for (int u = 0; u < Step; ++u)
+		{
+			LidarRays[Step * v + u] = FVector::ForwardVector;
+
+			float AngleX = FOV_Horizontal / -2.f + FOV_Horizontal / (float)(Step - 1) * (float)u;
+			float AngleY = FOV_VerticalMin + (FOV_VerticalMax - FOV_VerticalMin) / (float)(Channels - 1) * (float)v;
+
+			LidarRays[Step * v + u] = LidarRays[Step * v + u].RotateAngleAxis(AngleY, FVector(0.f, 1.f, 0.f));
+			LidarRays[Step * v + u] = LidarRays[Step * v + u].RotateAngleAxis(AngleX, FVector(0.f, 0.f, 1.f));
+
+			LidarRays[Step * v + u] *= DepthMapNorm;
+
+			float LenCoef = cos(_DEG2RAD(AngleX)) * cos(_DEG2RAD(AngleY));
+			LidarRays[Step * v + u] /= LenCoef;
+
+			static FIntRect ViewRect(0, 0, Width - 1, Height - 1);
+			UVs[Step * v + u] = FVector2D::ZeroVector;
+			FVector2D UV;
+			if (FSceneView::ProjectWorldToScreen(LidarRays[Step * v + u] * 100, ViewRect, ViewProjectionMatrix, UV))
+			{
+				UVs[Step * v + u] = UV;
+			}
+		}
+	}
+
+	// SceneCaptureComponent2D
+	SceneCaptureComponent2D = NewObject< USceneCaptureComponent2D >(this);
+	SceneCaptureComponent2D->SetupAttachment(this);
+	SceneCaptureComponent2D->CaptureSortPriority = 2;
+	SceneCaptureComponent2D->CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
+	SceneCaptureComponent2D->TextureTarget = NewObject< UTextureRenderTarget2D >(this);
+	SceneCaptureComponent2D->TextureTarget->InitCustomFormat(Width, Height, /*EPixelFormat::PF_A16B16G16R16*/ EPixelFormat::PF_B8G8R8A8, true);
+	SceneCaptureComponent2D->TextureTarget->AddressX = TextureAddress::TA_Clamp;
+	SceneCaptureComponent2D->TextureTarget->AddressY = TextureAddress::TA_Clamp;
+	SceneCaptureComponent2D->bCaptureOnMovement = false;
+	SceneCaptureComponent2D->bCaptureEveryFrame = true;
+	SceneCaptureComponent2D->FOVAngle = FOVAngle;
+	SceneCaptureComponent2D->SetRelativeRotation(CommonQuat);
+	SceneCaptureComponent2D->RegisterComponent();
+	SceneCaptureComponent2D->bCaptureOnMovement = PointCloudPublisher.IsAdvertised();
+	SceneCaptureComponent2D->bCaptureEveryFrame = PointCloudPublisher.IsAdvertised();
+	SceneCaptureComponent2D->PostProcessSettings = LidarPostProcessSettings;
+	SceneCaptureComponent2D->HideComponent(this);
+
+	CameraFrame.Height = Height;
+	CameraFrame.Width = Width;
+	CameraFrame.OutFormat = ECameraSensorShader::Depth8;
+
+	Map.resize(Height * Width);
+
+	// Publisher
+	PointCloudPublisher.Advertise();
+	DepthMapPublisher->Advertise();
+
+	if (!PointCloudPublisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't advertise publisher"));
+		return false;
+	}
+
+	return true;
+}
+
+void ULidarDepthSensor2DComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	RenderFence.Wait();
+
+	PointCloudPublisher.Shutdown();
+	DepthMapPublisher->Shutdown();
+
+	if (IsValid(SceneCaptureComponent2D)) SceneCaptureComponent2D->ConditionalBeginDestroy();
+	SceneCaptureComponent2D = nullptr;
+	
+	Map.clear();
+	LidarRays.Empty();
+	UVs.Empty();
+
+	if (IsValid(CameraWindow)) CameraWindow->Close();
+	CameraWindow = nullptr;
+}
+
+void ULidarDepthSensor2DComponent::GetRemark(FString& Info) const
+{
+	Info = PointCloudPublisher.Address + ":" + FString::FromInt(PointCloudPublisher.Port);
+}
+
+void ULidarDepthSensor2DComponent::SetPrecipitation(float Probability)
+{
+	if (DepthMaterialDyn)
+	{
+		DepthMaterialDyn->SetScalarParameterValue("Precipitation", Probability * 5.0);
+	}
+}
+
+void ULidarDepthSensor2DComponent::SetNoize(float Probability, float MaxDistance)
+{
+	if (DepthMaterialDyn)
+	{
+		DepthMaterialDyn->SetScalarParameterValue("NoizeProbability", Probability);
+		DepthMaterialDyn->SetScalarParameterValue("NoizeMaxDistance", MaxDistance);
+	}
+}
+
+void ULidarDepthSensor2DComponent::SetDepthMapMaxView(float Distance)
+{
+	if (DepthMaterialDyn)
+	{
+		DepthMaterialDyn->SetScalarParameterValue("MaxDistance", Distance);
+	}
+}
+
+UTextureRenderTarget2D* ULidarDepthSensor2DComponent::GetRenderTarget2DTexture()
+{
+	if (SceneCaptureComponent2D != nullptr)
+		return SceneCaptureComponent2D->TextureTarget;
+	return nullptr;
+}
+
+void ULidarDepthSensor2DComponent::ShowRenderTarget()
+{
+	if (!IsValid(CameraWindow))
+	{
+		CameraWindow = NewObject<UExtraWindow>();
+	}
+	if (SceneCaptureComponent2D && SceneCaptureComponent2D->TextureTarget)
+	{
+		CameraWindow->OpenCameraWindow(SceneCaptureComponent2D->TextureTarget);
+	}
+}
+
+bool ULidarDepthSensor2DComponent::GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes)
+{
+	FSensorFOVMesh MeshData;
+	if (FMeshGenerationUtils::GenerateSimpleFOVMesh(
+		FOV_Horizontal,
+		FOV_VerticalMax - FOV_VerticalMin,
+		20, 20, FOVSetup.MaxViewDistance,
+		0, (FOV_VerticalMin + FOV_VerticalMax) / 2,
+		MeshData.Vertices, MeshData.Indices))
+	{
+		for (auto& it : MeshData.Vertices) it.Color = FOVSetup.Color.ToFColor(true);
+		Meshes.Add(MoveTempIfPossible(MeshData));
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+bool ULidarDepthSensor2DComponent::NeedRenderSensorFOV() const
+{
+	return (FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::Ever) ||
+		(FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::OnSelect && IsVehicleComponentSelected());
+}
+
+FBoxSphereBounds ULidarDepthSensor2DComponent::CalcBounds(const FTransform& LocalToWorld) const
+{
+	return FBoxSphereBounds(FMeshGenerationUtils::CalcFOVBounds(FOV_Horizontal, FOV_VerticalMax - FOV_VerticalMin, FOVSetup.MaxViewDistance)).TransformBy(LocalToWorld);;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarDepthSensorCube.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarDepthSensorCube.cpp
new file mode 100644
index 0000000..2dca6d1
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarDepthSensorCube.cpp
@@ -0,0 +1,272 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/LidarDepthSensorCube.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Engine/TextureRenderTarget2D.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "DynamicMeshBuilder.h"
+
+#if PLATFORM_LINUX
+#pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+
+ULidarDepthSensorCubeComponent::ULidarDepthSensorCubeComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("LiDAR Sensors");
+	GUI.ComponentNameOverride = TEXT("Generic LiDAR Depth Cube");
+	GUI.IcanName = TEXT("SodaIcons.Lidar");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	//PrimaryComponentTick.TickGroup = TG_PostPhysics;
+	SceneCaptureComponent2D.SetNum(4, true);
+
+	DepthMapPublisher = CreateDefaultSubobject< UGenericCameraPublisher>(TEXT("DepthMapPublisher"));
+}
+
+bool ULidarDepthSensorCubeComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	for (int i = 0; i < 4; i++)
+	{
+		if (SceneCaptureComponent2D[i])SceneCaptureComponent2D[i]->ConditionalBeginDestroy();
+		SceneCaptureComponent2D[i] = NewObject< USceneCaptureComponent2D >(this);
+		SceneCaptureComponent2D[i]->SetupAttachment(this);
+		SceneCaptureComponent2D[i]->TextureTarget = NewObject< UTextureRenderTarget2D >(this);
+		SceneCaptureComponent2D[i]->TextureTarget->InitCustomFormat(Size, Size, EPixelFormat::PF_B8G8R8A8, true);
+		SceneCaptureComponent2D[i]->PostProcessSettings = LidarPostProcessSettings;
+		SceneCaptureComponent2D[i]->HiddenActors = HiddenActors;
+		SceneCaptureComponent2D[i]->ShowOnlyActors = ShowOnlyActors;
+		SceneCaptureComponent2D[i]->bCaptureEveryFrame = true;
+		SceneCaptureComponent2D[i]->bCaptureOnMovement = false;
+		SceneCaptureComponent2D[i]->LODDistanceFactor = LODDistanceFactor;
+		SceneCaptureComponent2D[i]->MaxViewDistanceOverride = MaxViewDistanceOverride;
+		SceneCaptureComponent2D[i]->CaptureSortPriority = CaptureSortPriority;
+		SceneCaptureComponent2D[i]->SetRelativeRotation(FRotator(0.0, (float)(i) * 90.0, 0.0));
+		SceneCaptureComponent2D[i]->CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
+		SceneCaptureComponent2D[i]->HideComponent(this);
+		SceneCaptureComponent2D[i]->RegisterComponent();			
+	}
+
+	Points.resize(Channels * StepToFace * 4);
+
+	CameraFrame.Height = Size;
+	CameraFrame.Width = Size * 4;
+	CameraFrame.OutFormat = ECameraSensorShader::Depth8;
+	CameraFrame.ImageStride = Size * 4;
+
+	Map.resize(Size * Size * 4);
+
+	PointCloudPublisher.Advertise();
+	DepthMapPublisher->Advertise();
+
+	if (!PointCloudPublisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't advertise publisher"));
+		return false;
+	}
+
+	return true;
+}
+
+void ULidarDepthSensorCubeComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	RenderFence.Wait();
+
+	PointCloudPublisher.Shutdown();
+	DepthMapPublisher->Shutdown();
+
+	for (int i = 0; i < 4; i++)
+	{
+		SceneCaptureComponent2D[i]->ConditionalBeginDestroy();
+		SceneCaptureComponent2D[i] = nullptr;
+	}
+
+	Map.clear();
+}
+
+void ULidarDepthSensorCubeComponent::GetRemark(FString & Info) const
+{
+	Info =  PointCloudPublisher.Address + ":" + FString::FromInt(PointCloudPublisher.Port);
+}
+
+void ULidarDepthSensorCubeComponent::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if (LidarPostProcessSettings.WeightedBlendables.Array.Num() && LidarPostProcessSettings.WeightedBlendables.Array[0].Object)
+	{
+		UMaterialInterface* DepthMaterialInterface = Cast< UMaterialInterface >(LidarPostProcessSettings.WeightedBlendables.Array[0].Object);
+		if (DepthMaterialInterface)
+		{
+			DepthMaterialDyn = UMaterialInstanceDynamic::Create(DepthMaterialInterface, this);
+			LidarPostProcessSettings.WeightedBlendables.Array[0].Object = DepthMaterialDyn;
+		}
+	}
+}
+
+void ULidarDepthSensorCubeComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	TTimestamp Timestemp = SodaApp.GetSimulationTimestamp();
+	CameraFrame.Timestamp = Timestemp;
+
+	FaceReady = 0;
+
+	for (int iFace = 0; iFace < 4; iFace++)
+	{
+		ENQUEUE_RENDER_COMMAND(SceneDrawCompletion)(
+		[this, iFace, Timestemp](FRHICommandListImmediate& RHICmdList)
+		{
+			TArrayView<FColor> OutPixels;
+			uint32 OutWidth;
+			PixelReader.BeginRead(*SceneCaptureComponent2D[iFace]->TextureTarget, RHICmdList, OutPixels, OutWidth);
+
+			if (OutPixels.Num() < int(OutWidth * Size))
+			{
+				UE_LOG(LogSoda, Error, TEXT("ULidarDepthSensorCubeComponent::TickComponent(); Read %i pixels"), OutPixels.Num());
+				PixelReader.EndRead();
+				return;
+			}
+
+			for (int i = 0; i < Size; i++)
+				for (int j = 0; j < Size; j++)
+				{
+					float Depth = Rgba2Float(OutPixels[OutWidth * i + j]);
+					Map[i * Size * 4 + iFace * Size + j] = Depth;
+				}
+
+			PixelReader.EndRead();
+
+			for (int i = 0; i < Channels; i++)
+			{
+				float ai = (FOV_VerticalMin + (FOV_VerticalMax - FOV_VerticalMin) / (float)(Channels - 1) * (float)i) / 180.0 * M_PI;
+
+				for (int j = 0; j < StepToFace; j++)
+				{
+					float aj = -M_PI / 4.0 + M_PI / 2.0 / (float)StepToFace * (float)j;
+
+					float ajj = (1 + tanf(aj)) * Size / 2.0;
+					float aii = (1 - tanf(ai) / cos(aj)) * Size / 2.0;
+
+					float x = ajj + iFace * Size;
+					float y = aii;
+
+					float Depth = 0;
+
+					switch (Interpolation)
+					{
+					case ELidarInterpolation::Min:
+					case ELidarInterpolation::Bilinear:
+					{
+
+						int x1 = (int)(x);
+						int x2 = (int)(x + 1.0);
+						int y1 = (int)(y);
+						int y2 = (int)(y + 1.0);
+						if (x1 < 0)
+							x1 = Size * 4 - 1;
+						if (x2 >= Size * 4)
+							x2 = 0;
+						float q11 = Map[y1 * Size * 4 + x1];
+						float q12 = Map[y2 * Size * 4 + x1];
+						float q21 = Map[y1 * Size * 4 + x2];
+						float q22 = Map[y2 * Size * 4 + x2];
+
+						if (Interpolation == ELidarInterpolation::Bilinear)
+						{
+							Depth = BilinearInterpolation(q11, q12, q21, q22, x1, x2, y1, y2, x, y);
+						}
+						else
+						{
+							Depth = std::min(std::min(q11, q12), std::min(q21, q22));
+						}
+					}
+					break;
+
+					case ELidarInterpolation::Nearest:
+					{
+						int x1 = (int)(x + 0.5);
+						int y1 = (int)(y + 0.5);
+						if (x1 >= Size * 4)
+							x1 = 0;
+						Depth = Map[y1 * Size * 4 + x1];
+					}
+					break;
+					}
+
+					float pz = Depth * DepthMapNorm;
+					float px = (-1 + 2.0 / (float)Size * ajj) * pz;
+					float py = (+1 - 2.0 / (float)Size * aii) * pz;
+
+					FVector RayPoint = FVector(pz, px, py);
+					float RayLen = RayPoint.Size();
+
+					if (RayLen > DistanseMin / 100.0 && RayLen < DistanseMax / 100.0)
+					{
+						RayPoint = FRotator(0.0, iFace * 90.0, 0.0).RotateVector(RayPoint);
+					}
+					else
+					{
+						RayPoint = FVector(0.0, 0.0, 0.0);
+					}
+
+					soda::LidarScanPoint& pt = Points[(StepToFace * 4 * i) + (j + StepToFace * iFace)];
+
+					pt.coords.x = RayPoint.X;
+					pt.coords.y = RayPoint.Y;
+					pt.coords.z = RayPoint.Z;
+				}
+			}
+
+			FaceReady++;
+
+			if (FaceReady == 4)
+			{
+				if (SceneCaptureComponent2D[iFace]->TextureTarget)
+				{
+					PointCloudPublisher.Publish(Timestemp, Points);
+					//DepthMapPublisher.Publish(&Map[0]);
+				}
+			}
+		});
+	}
+	RenderFence.BeginFence();
+}
+
+void ULidarDepthSensorCubeComponent::SetPrecipitation(float Probability)
+{
+	if (DepthMaterialDyn)
+	{
+		DepthMaterialDyn->SetScalarParameterValue("Precipitation", Probability * 5.0);
+	}
+}
+
+void ULidarDepthSensorCubeComponent::SetNoize(float Probability, float MaxDistance)
+{
+	if (DepthMaterialDyn)
+	{
+		DepthMaterialDyn->SetScalarParameterValue("NoizeProbability", Probability);
+		DepthMaterialDyn->SetScalarParameterValue("NoizeMaxDistance", MaxDistance);
+	}
+}
+
+void ULidarDepthSensorCubeComponent::SetDepthMapMaxView(float Distance)
+{
+	if (DepthMaterialDyn)
+	{
+		DepthMaterialDyn->SetScalarParameterValue("MaxDistance", Distance);
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarRayTraceSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarRayTraceSensor.cpp
new file mode 100644
index 0000000..2c7bc5e
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/LidarRayTraceSensor.cpp
@@ -0,0 +1,213 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/LidarRayTraceSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Physics/PhysicsFiltering.h"
+#include "DrawDebugHelpers.h"
+#include "UObject/UObjectIterator.h"
+#include "Soda/Misc/SodaPhysicsInterface.h"
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "DynamicMeshBuilder.h"
+
+DECLARE_STATS_GROUP(TEXT("LidarRayTraceSensor"), STATGROUP_LidarRayTraceSensor, STATGROUP_Advanced);
+DECLARE_CYCLE_STAT(TEXT("TickComponent"), STAT_TickComponent, STATGROUP_LidarRayTraceSensor);
+DECLARE_CYCLE_STAT(TEXT("batch execute"), STAT_BatchExecute, STATGROUP_LidarRayTraceSensor);
+DECLARE_CYCLE_STAT(TEXT("Add to batch execute"), STAT_AddToBatch, STATGROUP_LidarRayTraceSensor);
+DECLARE_CYCLE_STAT(TEXT("Process query results"), STAT_ProcessQueryResults, STATGROUP_LidarRayTraceSensor);
+DECLARE_CYCLE_STAT(TEXT("Publish results"), STAT_PublishResults, STATGROUP_LidarRayTraceSensor);
+
+ULidarRayTraceSensorComponent::ULidarRayTraceSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("LiDAR Sensors");
+	GUI.ComponentNameOverride = TEXT("Generic LiDAR Ray Trace");
+	GUI.IcanName = TEXT("SodaIcons.Lidar");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+
+	FOVSetup.Color = FLinearColor(1.0, 0.1, 0.3, 1.0);
+	FOVSetup.MaxViewDistance = 700;
+}
+
+bool ULidarRayTraceSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	PointCloudPublisher.Advertise();
+
+	if (!PointCloudPublisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't advertise publisher"));
+		return false;
+	}
+
+	return true;
+}
+
+void ULidarRayTraceSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	PointCloudPublisher.Shutdown();
+}
+
+void ULidarRayTraceSensorComponent::GetRemark(FString & Info) const
+{
+	Info = PointCloudPublisher.Address + ":" + FString::FromInt(PointCloudPublisher.Port);
+}
+
+void ULidarRayTraceSensorComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	SCOPE_CYCLE_COUNTER(STAT_TickComponent);
+
+	if (!IsTickOnCurrentFrame()) return;
+
+	if (!PointCloudPublisher.IsAdvertised())
+	{
+		return;
+	}
+
+	FVector Loc = GetComponentLocation();
+	FRotator Rot = GetComponentRotation();
+	FTransform RelTrans = GetRelativeTransform();
+	
+	TTimestamp Timestemp = SodaApp.GetSimulationTimestamp();
+
+	if(bLogTick)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("LidarRay name: %s, timestamp: %s"), 
+			*GetFName().ToString(),  
+			*soda::ToString(Timestemp));
+	}
+
+	BatchStart.SetNum(Channels * Step, false);
+	BatchEnd.SetNum(Channels * Step, false);
+	{
+		SCOPE_CYCLE_COUNTER(STAT_AddToBatch);
+		for (int i = 0; i < Channels; i++)
+		{
+			float VerticalAng = FOV_VerticalMin + (FOV_VerticalMax - FOV_VerticalMin) / (float)Channels * (float)i;
+			for (int j = 0; j < Step; j++)
+			{
+				float HorizontAng = FOV_HorizontMin + (FOV_HorizontMax - FOV_HorizontMin) / (float)Step * (float)j;
+
+				FVector RayNorm = Rot.RotateVector(FRotator(VerticalAng, HorizontAng, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0)));
+
+				BatchStart[i * Step + j] = Loc + RayNorm * DistanseMin;
+				BatchEnd[i * Step + j] = Loc + RayNorm * DistanseMax;
+
+			}
+		}
+	}
+	TArray<FHitResult> OutHits;
+	{
+		SCOPE_CYCLE_COUNTER(STAT_BatchExecute);
+
+		FSodaPhysicsInterface::RaycastSingleScope(
+			GetWorld(), OutHits, BatchStart, BatchEnd,
+			ECollisionChannel::ECC_Visibility,
+			FCollisionQueryParams(NAME_None, false, GetOwner()),
+			FCollisionResponseParams::DefaultResponseParam,
+			FCollisionObjectQueryParams::DefaultObjectQueryParam);
+
+	};
+	check(OutHits.Num() == Channels * Step);
+
+	Points.resize(Channels * Step);
+
+	for (int k = 0; k < Channels * Step ; ++k)
+	{
+		bool Traced = OutHits[k].bBlockingHit;
+		FVector HitPosition = PublishAbsoluteCoordinates ? Rot.UnrotateVector(OutHits[k].Location - Loc) : OutHits[k].Location;
+		soda::LidarScanPoint& pt = Points[k];
+		pt.coords.x = HitPosition.X / 100;
+		pt.coords.y = -HitPosition.Y / 100;
+		pt.coords.z = HitPosition.Z / 100;
+		pt.layer = Channels - k / Step - 1;
+		pt.properties = soda::LidarScanPoint::Properties::None;
+
+		if (Traced)
+		{
+			pt.properties = soda::LidarScanPoint::Properties::Valid;
+
+			if (EnabledGroundFilter)
+			{
+				if ((Loc.Z - HitPosition.Z) > DistanceToGround)
+				{
+					pt.properties = soda::LidarScanPoint::Properties::None;
+					Traced = false;
+				}
+			}
+		}
+	}
+
+	{
+		SCOPE_CYCLE_COUNTER(STAT_PublishResults);
+		PointCloudPublisher.Publish(Timestemp, Points);
+	}
+
+	if(DrawTracedRays || DrawNotTracedRays) 
+	{
+		for (int i = 0; i < Channels; i++)
+		{
+			float VerticalAng = FOV_VerticalMin + (FOV_VerticalMax - FOV_VerticalMin) / (float)Channels * (float)i;
+			for (int j = 0; j < Step; j++)
+			{
+				float HorizontAng = FOV_HorizontMin + (FOV_HorizontMax - FOV_HorizontMin) / (float)Step * (float)j;
+				FVector RayNorm = Rot.RotateVector(FRotator(VerticalAng, HorizontAng, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0)));
+				bool Traced = OutHits[i * Step + j].bBlockingHit;
+				FVector HitPosition = OutHits[i * Step + j].Location;
+				if (DrawTracedRays && Traced)
+				{
+					DrawDebugLine(GetWorld(), Loc + RayNorm * DistanseMin, HitPosition, FColor(255, 0, 0), false, -1.f, 0, 2.f);
+				}
+				else if (DrawNotTracedRays && !Traced)
+				{
+					DrawDebugLine(GetWorld(), Loc + RayNorm * DistanseMin, Loc + RayNorm * DistanseMax, FColor(0, 255, 0), false, -1.f, 0, 2.f);
+				}
+			}
+		}
+	}
+}
+
+bool ULidarRayTraceSensorComponent::GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes)
+{
+	FSensorFOVMesh MeshData;
+	if (FMeshGenerationUtils::GenerateSimpleFOVMesh(
+		FOV_HorizontMax - FOV_HorizontMin,
+		FOV_VerticalMax - FOV_VerticalMin,
+		20, 20, FOVSetup.MaxViewDistance,
+		(FOV_HorizontMax + FOV_HorizontMin) / 2,
+		(FOV_VerticalMin + FOV_VerticalMax) / 2,
+		MeshData.Vertices, MeshData.Indices))
+	{
+		for (auto& it : MeshData.Vertices) it.Color = FOVSetup.Color.ToFColor(true);
+		Meshes.Add(MoveTempIfPossible(MeshData));
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+bool ULidarRayTraceSensorComponent::NeedRenderSensorFOV() const
+{
+	return (FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::Ever) ||
+		(FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::OnSelect && IsVehicleComponentSelected());
+}
+
+
+FBoxSphereBounds ULidarRayTraceSensorComponent::CalcBounds(const FTransform& LocalToWorld) const
+{
+	return FBoxSphereBounds(FMeshGenerationUtils::CalcFOVBounds(FOV_HorizontMax - FOV_HorizontMin, FOV_VerticalMax - FOV_VerticalMin, FOVSetup.MaxViewDistance)).TransformBy(LocalToWorld);;
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/RadarBaseSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/RadarBaseSensor.cpp
new file mode 100644
index 0000000..a57da00
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/RadarBaseSensor.cpp
@@ -0,0 +1,687 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/RadarBaseSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Physics/PhysicsFiltering.h"
+#include "CollisionQueryParams.h"
+#include "DrawDebugHelpers.h"
+#include "PhysicsEngine/BodySetup.h"
+#include "Components/StaticMeshComponent.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Soda/Misc/SodaPhysicsInterface.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "Soda/SodaUserSettings.h"
+#include "DynamicMeshBuilder.h"
+
+#define _DEG2RAD(a) ((a) / (180.0 / M_PI))
+#define _RAD2DEG(a) ((a) * (180.0 / M_PI))
+#define CAN_FRAME_TIMEOUT_MS 200
+#define RADAR_TOUCH_CNT 10
+
+DEFINE_LOG_CATEGORY(SodaRadar);
+
+DECLARE_STATS_GROUP(TEXT("RadarSensor"), STATGROUP_RadarSensor, STATGROUP_Advanced);
+DECLARE_CYCLE_STAT(TEXT("RadarTickComponent"), STAT_RadarTickComponent, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("batch execute"), STAT_RadarBatchExecute, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Add to batch execute"), STAT_RadarAddToBatch, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Process query results"), STAT_RadarProcessQueryResults, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Publish results"), STAT_RadarPublishResults, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Add Cluster"), STAT_AddCluster, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Find Cluster"), STAT_FindCluster, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Create Cluster"), STAT_CreateCluster, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Add to existing Cluster"), STAT_AddToExistingCluster, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Radar Show Debug"), STAT_RadarShowDebug, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Add Object"), STAT_AddObject, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Add to existing Object"), STAT_AddToExistingObject, STATGROUP_RadarSensor);
+DECLARE_CYCLE_STAT(TEXT("Create Object"), STAT_CreateObject, STATGROUP_RadarSensor);
+
+URadarBaseSensorComponent::URadarBaseSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Radar Sensors");
+	GUI.IcanName = TEXT("SodaIcons.Radar");
+	
+	bWantsInitializeComponent = true;
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+
+	ObjectCategories.Add(ESegmObjectLabel::Buildings, FRadarObjectCatagory(BuildingsRCS, true));
+	ObjectCategories.Add(ESegmObjectLabel::Fences, FRadarObjectCatagory(FencesRCS, false));
+	//ObjectCategories.Add(ESegmObjectLabel::Other,        FRadarObjectCatagory(1.0, true));
+	ObjectCategories.Add(ESegmObjectLabel::Pedestrians, FRadarObjectCatagory(PedestriansRCS, false));
+	ObjectCategories.Add(ESegmObjectLabel::Poles, FRadarObjectCatagory(PolesRCS, false));
+	//ObjectCategories.Add(ESegmObjectLabel::RoadLines,    FRadarObjectCatagory(1.0, true));
+	//ObjectCategories.Add(ESegmObjectLabel::Roads,        FRadarObjectCatagory(1.0, true));
+	//ObjectCategories.Add(ESegmObjectLabel::Sidewalks,    FRadarObjectCatagory(1.0, true));
+	ObjectCategories.Add(ESegmObjectLabel::TrafficSigns, FRadarObjectCatagory(TrafficSignsRCS, true));
+	ObjectCategories.Add(ESegmObjectLabel::Vegetation,   FRadarObjectCatagory(VegetationRCS, false));
+	ObjectCategories.Add(ESegmObjectLabel::Vehicles, FRadarObjectCatagory(VehiclesRCS, true));
+	ObjectCategories.Add(ESegmObjectLabel::Walls, FRadarObjectCatagory(WallsRCS, true));
+
+	/*
+	FOVSetupNear.Color = FLinearColor(1.0, 1.0, 0.3, 0.5);
+	FOVSetupNear.WireframeColor = FLinearColor(0.4, 0.4, 0, 1);
+	FOVSetupNear.MaxViewDistance = RadarParamsNear.DistanseMax * 100;
+
+	FOVSetupFar.Color = FLinearColor(1.0, 0.6, 0.3, 0.5);
+	FOVSetupFar.WireframeColor = FLinearColor(0.4, 0.4, 0, 1);
+	FOVSetupFar.MaxViewDistance = RadarParamsFar.DistanseMax * 100;
+	*/
+}
+
+bool URadarBaseSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	PrevTickTime = SodaApp.GetSimulationTimestamp();
+
+	return true;
+}
+
+void URadarBaseSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void URadarBaseSensorComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction *ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+
+	SCOPE_CYCLE_COUNTER(STAT_RadarTickComponent);
+
+	TTimestamp Timestamp = SodaApp.GetSimulationTimestamp();
+
+	auto StatusSendDeltaTimeMs = Timestamp - PrevTickTime;
+	std::chrono::milliseconds Period_(int64(Period * 1000));
+	if (StatusSendDeltaTimeMs < Period_)
+		return;
+
+	if (StatusSendDeltaTimeMs < Period_)
+		PrevTickTime += Period_;
+	else
+		PrevTickTime = Timestamp;
+
+	Clusters.Clear();
+	Objects.ResetScan();
+
+	for (auto& It : GetRadarParams())
+	{
+		if (It.bEnabled)
+		{
+			ProcessRadarBeams(It);
+		}
+	}
+
+	switch (GetRadarMode())
+	{
+	case ERadarMode::ClusterMode:
+		break;
+
+	case ERadarMode::ObjectMode:
+		Objects.FinishScan(*this);
+		break;
+	}
+
+	PublishResults();
+
+	if (bDrawDebugPoints)
+	{
+		ShowDebudPoints();
+	}
+
+	MeasurementCounter++;
+	
+}
+
+void URadarBaseSensorComponent::ProcessHit(const FHitResult* Hit, const FRadarParams* Params)
+{
+	check(Params && Hit);
+
+	if (Hit->Distance <= 0.f)
+	{
+		return; // TODO: WTF?
+	}
+
+	const FVector Loc = GetComponentLocation();
+	const FRotator Rot = GetComponentRotation();
+
+	FRadarHit RadarHit;
+	RadarHit.Hit = Hit;
+	RadarHit.SensorView = GetComponentTransform();
+	RadarHit.HitPosition = Hit->ImpactPoint;
+	FVector LocalHitPosition = RadarHit.SensorView.InverseTransformPosition(RadarHit.HitPosition);
+	LocalHitPosition.Z = 0;
+	RadarHit.HitPosition.Z = RadarHit.SensorView.TransformPosition(LocalHitPosition).Z;
+
+	if (!Hit->GetActor())
+	{
+		return;
+	}
+	const FRotator HitRot = (RadarHit.HitPosition - Loc).Rotation();
+	const FRotator RelHitRot = HitRot - Rot;
+
+	RadarHit.Distance = (RadarHit.HitPosition - Loc).Size();
+	RadarHit.Azimuth = RelHitRot.Yaw;
+
+	if (RadarHit.Distance > Params->DistanseMax * 100)
+	{
+		return;
+	}
+
+	/*
+	if (fabs(FRotator::NormalizeAxis(RadarHit.Azimuth)) > Params->FOV_HorizontMax)
+	{
+		return;
+	}
+	*/
+
+	TArray<UStaticMeshComponent *> StaticMeshComponents;
+	RadarHit.Hit->GetActor()->GetComponents<UStaticMeshComponent>(StaticMeshComponents);
+	RadarHit.ObjectCategory = ESegmObjectLabel::None;
+	for (UStaticMeshComponent *Component : StaticMeshComponents)
+	{
+		RadarHit.ObjectCategory = USodaStatics::GetTagOfTaggedComponent(Component);
+
+		if (RadarHit.ObjectCategory != ESegmObjectLabel::None)
+		{
+			break;
+		}
+	}
+	if (RadarHit.ObjectCategory == ESegmObjectLabel::None)
+	{
+		// Iterate skeletal meshes.
+		TArray< USkeletalMeshComponent* > SkeletalMeshComponents;
+		RadarHit.Hit->GetActor()->GetComponents< USkeletalMeshComponent >(SkeletalMeshComponents);
+		for (USkeletalMeshComponent* Component : SkeletalMeshComponents)
+		{
+			RadarHit.ObjectCategory = USodaStatics::GetTagOfTaggedComponent(Component);
+			if (RadarHit.ObjectCategory != ESegmObjectLabel::None)
+			{
+				break;
+			}
+		}
+	}
+
+	if (!ObjectCategories.Contains(RadarHit.ObjectCategory))
+	{
+		if (bDebugLog && RadarHit.ObjectCategory != ESegmObjectLabel::None)
+		{
+			UE_LOG(SodaRadar, Log, TEXT("Radar: !ObjectCategories.Contains(Label), Label = %d"), RadarHit.ObjectCategory);
+		}
+		return;
+	}
+
+	RadarHit.RCS = ObjectCategories[RadarHit.ObjectCategory].RCS;
+	if (RadarHit.RCS < Params->MinSignalCoef)
+	{
+		//	UE_LOG(SodaRadar, Log, TEXT("Radar: Yaw = %f, RCS = %f"), HitRot.Yaw, RCS);
+		return;
+	}
+
+	const FVector Vel = (RadarHit.Hit->GetActor()->GetVelocity() - GetVehicle()->GetVelocity()) * 0.01f; // TODO: compute velocity in the radar point
+	RadarHit.VelRelToRadar = Rot.UnrotateVector(Vel);
+	RadarHit.Resolution = Params->GetResolutionForAngle(RadarHit.Azimuth);
+
+	switch (GetRadarMode())
+	{
+	case ERadarMode::ClusterMode:
+		Clusters.AddHit(RadarHit, *this);
+		break;
+
+	case ERadarMode::ObjectMode:
+		RadarHit.RCS *= RCSObjectModeMultiplier;
+		Objects.AddHit(RadarHit, *this);
+		break;
+	}
+}
+
+void URadarBaseSensorComponent::ShowDebudPoints()
+{
+	
+	FVector Loc = GetComponentLocation();
+	switch (GetRadarMode())
+	{
+	case ERadarMode::ClusterMode:
+	{
+		SCOPE_CYCLE_COUNTER(STAT_RadarShowDebug);
+		for (auto It = Clusters.Clusters.CreateConstIterator(); It; ++It)
+		{
+			DrawDebugLine(GetWorld(), Loc, It->HitPosition, FColor(255, 255, 0), false, -1.f, 0, 2.f);
+			DrawDebugPoint(GetWorld(), It->HitPosition, 10, FColor::Yellow, false, -1.0f);
+			if (bDrawDebugLabels)
+				DrawDebugString(GetWorld(), It->HitPosition, *FString::Printf(TEXT("RCS=%f, hits=%d, Dist=%f"), It->RCS, It->Hits.Num(), It->Distance), NULL, FColor::Yellow, 0.01f, false);
+		}
+	}
+	break;
+
+	case ERadarMode::ObjectMode:
+	{
+		SCOPE_CYCLE_COUNTER(STAT_RadarShowDebug);
+		for (auto It = Objects.Objects.CreateConstIterator(); It; ++It)
+		{
+			auto& Object = It.Value();
+			FVector TracedPoint = GetComponentTransform().TransformPosition(It->Value.GetObjectPoint());
+			FColor Color = It->Value.bUpdated ? FColor::Green : FColor::Red;
+			DrawDebugLine(GetWorld(), Loc, TracedPoint, Color, false, -1, 0, 2.f);
+			DrawDebugPoint(GetWorld(), TracedPoint, 10, Color);
+			if (bDrawDebugLabels)
+			{
+				DrawDebugString(GetWorld(), TracedPoint, *FString::Printf(TEXT("Id=%d, RCS=%f, Dist=%f, RelLonVel=%f, RelLatVel=%f"),
+					Object.RadarObjectId, Object.RCS, Object.GetDistance(), Object.Lon, Object.Lat), NULL, Color, 0);
+			}
+
+			FVector Center, Extents;
+			Object.LocalBounds.GetCenterAndExtents(Center, Extents);
+			DrawDebugBox(GetWorld(), this->GetComponentTransform().TransformPosition(Center), Extents, GetComponentRotation().Quaternion(), Color);
+		}
+
+	}
+	break;
+	}
+}
+
+void URadarBaseSensorComponent::ProcessRadarBeams(const FRadarParams & RadarParams)
+{
+	SCOPE_CYCLE_COUNTER(STAT_RadarAddToBatch);
+
+	static FQuat ZeroQaud = FQuat::MakeFromRotator(FRotator::ZeroRotator);
+
+	BatchStart.SetNum(0, false);
+	BatchEnd.SetNum(0, false);
+
+	const FVector Loc = GetComponentLocation();
+	const FRotator Rot = GetComponentRotation();
+	const FTransform RelTrans = GetRelativeTransform();
+	const float BeamVerticalSize = RadarParams.GetBeamHeight();
+	const float BeamRadius = RadarParams.GetBeamWidth() / 2;
+	const float Step = 2 * RadarParams.FOV_HorizontMax / (float)RadarParams.GetBeamsNum();
+	const FCollisionShape Collider = FCollisionShape::MakeCapsule(BeamRadius, BeamVerticalSize * 0.5f);
+	const float DistanseMin = FMath::Max(0.f, RadarParams.DistanseMin * 100 - BeamRadius);
+
+	for (int i = 0; i < RadarParams.GetBeamsNum(); i++)
+	{
+		const float HorizontAng = -1.f * RadarParams.FOV_HorizontMax + Step * i;
+		const FVector Norm = Rot.RotateVector(FRotator(0.0f, HorizontAng, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0)));
+		const FQuat Q = RelTrans.GetRotation() * FQuat(FRotator(90.f, 0.f, 0.f));
+		const float Dist = RadarParams.GetRayLength(HorizontAng) * 100;
+
+		const FVector Start = Loc + Norm * DistanseMin;
+		const FVector End = Loc + Norm * (DistanseMin + Dist);
+
+		BatchStart.Add(Start);
+		BatchEnd.Add(End);
+		
+		if (RadarParams.bShowDebugCapsules)
+		{
+			DrawDebugCapsule(GetWorld(),
+				Start + Norm * Dist * RadarParams.DebugCapsulesRang,
+				BeamVerticalSize * 0.5f,
+				BeamRadius,
+				RelTrans.GetRotation(),
+				FColor::Cyan);
+		}
+	}
+
+	UWorld* World = GetWorld();
+	TArray<TArray<struct FHitResult>> OutHits;
+	bool Res = FSodaPhysicsInterface::GeomSweepMultiScope(World, Collider, ZeroQaud, OutHits, BatchStart, BatchEnd,
+		SodaApp.GetSodaUserSettings()->RadarCollisionChannel,
+		FCollisionQueryParams(NAME_None, true, GetOwner()), 
+		FCollisionResponseParams::DefaultResponseParam,
+		FCollisionObjectQueryParams::DefaultObjectQueryParam);
+
+	for (auto& Hits : OutHits)
+	{
+		for (auto& Hit : Hits)
+		{
+			if (Hit.IsValidBlockingHit())
+			{
+				ProcessHit(&Hit, &RadarParams);
+			}
+		}
+	}
+	
+
+	if (bDrawDebugPoints)
+	{
+		for (auto& Hits : OutHits)
+		{
+			for (auto& Hit : Hits)
+			{
+				if (Hit.IsValidBlockingHit())
+				{
+					DrawDebugPoint(World, Hit.ImpactPoint, 10, FColor::Red, false, -1.0f);
+				}
+			}
+		}
+	}
+}
+
+void FRadarClusters::AddHit(const FRadarHit& RadarHit, const URadarBaseSensorComponent& Radar)
+{
+	SCOPE_CYCLE_COUNTER(STAT_AddCluster);
+
+	// UE_LOG(SodaRadar, Log, TEXT("Radar: Create Cluster Azimuth = %f, Distance = %f"), Azimuth, NewHit->distance);
+	SCOPE_CYCLE_COUNTER(STAT_CreateCluster);
+	FRadarCluster & Cluster = Clusters.Add_GetRef(FRadarCluster());
+	Cluster.Hits.Add(RadarHit.Hit);
+	Cluster.Azimuth = RadarHit.Azimuth;
+	Cluster.Distance = RadarHit.Distance * 0.01f;
+	Cluster.HitPosition = RadarHit.HitPosition;
+	Cluster.RCS = RadarHit.RCS;
+	Cluster.Lat = RadarHit.VelRelToRadar.Y;
+	Cluster.Lon = RadarHit.VelRelToRadar.X;
+}
+
+void FRadarObjects::ResetScan()
+{
+	for (auto & It : Objects)
+	{
+		It.Value.bUpdated = false;
+	}
+}
+
+void FRadarObjects::FinishScan(const URadarBaseSensorComponent& Radar)
+{
+	TTimestamp Timestamp = SodaApp.GetSimulationTimestamp();
+
+	for (auto It = Objects.CreateIterator(); It; ++It)
+	{
+		FRadarObject& Object = It.Value();
+
+		FVector2D LocalObjectVelocity = FVector2D(Object.Lon, Object.Lat);
+		Object.TrackingData.LifeCyclesCounter++;
+		Object.TrackingData.Acceleration = (LocalObjectVelocity - Object.TrackingData.PrevVelocity) /
+			std::chrono::duration_cast<std::chrono::duration<double>>(Timestamp - Object.TrackingData.PrevUpdatedTimestamp).count();
+		Object.TrackingData.PrevVelocity = LocalObjectVelocity;
+		Object.TrackingData.PrevUpdatedTimestamp = Timestamp;
+		if (Object.bUpdated)
+		{
+			const FBox Bounds = Object.ObjectActor->GetComponentsBoundingBox(false).InverseTransformBy(Radar.GetComponentTransform());
+			Object.LocalBounds.Min.Z = Bounds.Min.Z;
+			Object.LocalBounds.Max.Z = Bounds.Max.Z;
+			const FVector BoundsSize = Object.LocalBounds.GetSize();
+			const static float MinBoxSize = 10;
+			if (BoundsSize.X < MinBoxSize) Object.LocalBounds.Max.X += (MinBoxSize - BoundsSize.X);
+			if (BoundsSize.Y < MinBoxSize) { Object.LocalBounds.Min.Y -= MinBoxSize / 2; Object.LocalBounds.Max.Y += MinBoxSize / 2; }
+			if (BoundsSize.Z < MinBoxSize) { Object.LocalBounds.Min.Z -= MinBoxSize / 2; Object.LocalBounds.Max.Z += MinBoxSize / 2; }
+			auto PointGlobal = Radar.GetComponentTransform().TransformPosition(Object.LocalBounds.GetCenter());
+			Object.BoundCenterActorLocal = Object.ObjectActor->GetActorTransform().InverseTransformPosition(PointGlobal);
+			Object.TrackingData.ProbabilityCounter = FMath::Min(Object.TrackingData.ProbabilityCounter + 1, FTrackingObjectData::kProbabilityCounterMax);
+		}
+		else
+		{
+			--Object.TrackingData.ProbabilityCounter;
+			if (Object.TrackingData.ProbabilityCounter < 0 || !IsValid(Object.ObjectActor))
+			{
+				It.RemoveCurrent();
+				continue;
+			}
+			else
+			{
+				auto PointGlobal = Object.ObjectActor->GetActorTransform().TransformPosition(Object.BoundCenterActorLocal);
+				auto PointLocal = Radar.GetComponentTransform().InverseTransformPosition(PointGlobal);
+				Object.LocalBounds = Object.LocalBounds.MoveTo(PointLocal);
+			}
+		}
+
+		Object.CachedObjectPoint = FVector(Object.LocalBounds.Min.X, (Object.LocalBounds.Min.Y + Object.LocalBounds.Max.Y) * 0.5f, 0);
+		Object.CachedDistance = Object.CachedObjectPoint.Size();
+		Object.CachedAzimuth = std::atan2(Object.CachedObjectPoint.Y, Object.CachedObjectPoint.X) / M_PI * 180;
+	}
+}
+
+void FRadarObjects::AddHit(const FRadarHit& RadarHit, const URadarBaseSensorComponent& Radar)
+{
+
+	SCOPE_CYCLE_COUNTER(STAT_AddObject);
+
+	int ActorId = RadarHit.Hit->GetActor()->GetUniqueID();
+	AActor* Actor = RadarHit.Hit->GetActor();
+	check(Actor);
+
+	FRadarObject* ObjectToAddHit = Objects.Find(ActorId);
+	if (ObjectToAddHit == nullptr)
+	{
+		if (Objects.Num() >= ObjectsMaxNum)
+		{
+			return;
+		}
+
+		FRadarObject& NewObj = Objects.Add(ActorId);
+		NewObj.bUpdated = true;
+		NewObj.Hits.Add(RadarHit.Hit);
+		NewObj.RCS = RadarHit.RCS;
+		NewObj.Lat = RadarHit.VelRelToRadar.Y;
+		NewObj.Lon = RadarHit.VelRelToRadar.X;
+		NewObj.ObjectActorId = ActorId;
+		NewObj.ObjectActor = Actor;
+		NewObj.ObjectCategory = RadarHit.ObjectCategory;
+		NewObj.LocalBounds += Radar.GetComponentTransform().InverseTransformPosition(RadarHit.HitPosition);
+		NewObj.TrackingData.RadarObjectId = GetRadarObjectIdForActorId(ActorId);
+		NewObj.TrackingData.ProbabilityCounter = 0;
+		NewObj.TrackingData.LifeCyclesCounter = 0;
+		NewObj.TrackingData.Acceleration = FVector2D(0.f);
+		NewObj.TrackingData.PrevVelocity = FVector2D(NewObj.Lon, NewObj.Lat);
+		NewObj.TrackingData.PrevUpdatedTimestamp = SodaApp.GetSimulationTimestamp();
+	}
+	else
+	{
+		if (ObjectToAddHit->bUpdated)
+		{
+			ObjectToAddHit->LocalBounds += Radar.GetComponentTransform().InverseTransformPosition(RadarHit.HitPosition);
+			ObjectToAddHit->RCS += RadarHit.RCS;
+		}
+		else
+		{
+			ObjectToAddHit->bUpdated = true;
+			ObjectToAddHit->LocalBounds.Init();
+			ObjectToAddHit->LocalBounds += Radar.GetComponentTransform().InverseTransformPosition(RadarHit.HitPosition);
+			ObjectToAddHit->RCS = RadarHit.RCS;
+			ObjectToAddHit->Hits.Empty();
+		}
+
+		ObjectToAddHit->Lat = RadarHit.VelRelToRadar.Y;
+		ObjectToAddHit->Lon = RadarHit.VelRelToRadar.X;
+		ObjectToAddHit->Hits.Add(RadarHit.Hit);
+	}
+
+}
+
+uint8 FRadarObjects::GetFreeRadarObjectId()
+{
+	if (Objects.Num() == 0 || Objects.Num() >= 256)
+	{
+		return 0;
+	}
+
+	uint8 MaxVal = 0;
+	for (auto& Elem : Objects)
+	{
+		if (Elem.Value.RadarObjectId > MaxVal)
+		{
+			MaxVal = Elem.Value.RadarObjectId;
+		}
+	}
+
+	for (uint8 NewId = MaxVal + 1; NewId != MaxVal; ++NewId)
+	{
+		bool IdExists = false;
+		for (auto& CheckElem : Objects)
+		{
+			if (CheckElem.Value.RadarObjectId == NewId)
+			{
+				IdExists = true;
+				break;
+			}
+		}
+		if (IdExists == false)
+		{
+			return NewId;
+		}
+	}
+	return 0;
+}
+
+uint8 FRadarObjects::GetRadarObjectIdForActorId(uint32 ActorId)
+{
+	if (Objects.Contains(ActorId))
+	{
+		return Objects[ActorId].RadarObjectId;
+	}
+	return GetFreeRadarObjectId();
+}
+
+void FRadarObjects::SortObjectsByDistance(TArray<FRadarObject* >& SortedObjects)
+{
+	SortedObjects.SetNum(Objects.Num());
+	int i = 0;
+	for (auto& Obj : Objects)
+	{
+		SortedObjects[i] = &Obj.Value;
+		++i;
+	}
+	SortedObjects.Sort([](const FRadarObject& Left, const FRadarObject& Right) { return Left.GetDistance() > Right.GetDistance(); });
+}
+
+float FRadarParams::GetBeamWidth() const
+{
+	return 2 * DistanseMax * 100 * atan(_DEG2RAD(HorizontalBestResolution / 2));
+}
+
+float FRadarParams::GetBeamHeight() const
+{
+	return 2 * DistanseMax * 100 * atan(_DEG2RAD(FOV_Vertical / 2));
+}
+
+float FRadarParams::GetResolutionForAngle(float Angle) const
+{
+	Angle = fabs(Angle);
+	if (Angle < FOV_HorizontFullDist)
+	{
+		return FMath::Lerp(HorizontalBestResolution, HorizontalResolutionFullDistAngle, Angle / FOV_HorizontFullDist);
+	}
+	else
+	{
+		return FMath::Lerp(HorizontalResolutionFullDistAngle, HorizontalResolutionMaxAngle, (Angle - FOV_HorizontFullDist) / (FOV_HorizontMax - FOV_HorizontFullDist));
+	}
+}
+
+float FRadarParams::GetRayLength(float HorizontAng) const
+{
+	float Dist = DistanseMax;
+	if (fabs(HorizontAng) > FOV_HorizontFullDist)
+	{
+		Dist = FMath::Lerp(Dist, DistanseOnMaxAngle, (fabs(HorizontAng) - FOV_HorizontFullDist) / (FOV_HorizontMax - FOV_HorizontFullDist));
+	}
+	return Dist - DistanseMin;
+}
+
+bool URadarBaseSensorComponent::AddFOVMesh(const FRadarParams& Params, TArray<FSensorFOVMesh>& OutMeshes)
+{
+	static const float DegPerCell = 5.0;
+
+	const int FovChannels = int((Params.FOV_Vertical) / DegPerCell + 0.5);
+	const int FovStep = int(Params.FOV_HorizontMax / DegPerCell + 0.5);
+
+	TArray<FVector> Cloud;
+	TArray<FVector2D> CloudUV;
+
+	for (int i = 0; i < FovChannels + 1; i++)
+	{
+		float VerticalAng = -Params.FOV_Vertical / 2 + Params.FOV_Vertical / (float)FovChannels * (float)i;
+		for (int j = 0; j < FovStep + 1; j++)
+		{
+			float HorizontAng = -Params.FOV_HorizontMax / 2 + Params.FOV_HorizontMax / (float)FovStep * (float)j;
+			FVector RayNorm = FRotator(VerticalAng, HorizontAng, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0));
+
+			//TODO: Implement FOV_HorizontMax& FOV_HorizontFullDist view
+
+			/*
+			float Distance;
+			if (FMath::Abs(HorizontAng) > Params.FOV_HorizontFullDist / 2)
+			{
+				Distance = FMath::Lerp(
+					Params.DistanseMax,
+					Params.DistanseOnMaxAngle,
+					FMath::Abs((Params.FOV_HorizontFullDist / 2.0 - FMath::Abs(HorizontAng)) / (Params.FOV_HorizontMax / 2.0 - Params.FOV_HorizontFullDist / 2.0))) * 100;
+			}
+			else
+			{
+				Distance = Params.DistanseMax * 100;
+			}
+
+			Cloud.Add(RayNorm * Distance);
+			*/
+
+
+			Cloud.Add(RayNorm * Params.FOVSetup.MaxViewDistance);
+			CloudUV.Add(FVector2D(j, FovChannels - i));
+		}
+	}
+
+	TArray <int32> Hull;
+	FMeshGenerationUtils::GenerateHullInexes(FovStep + 1, FovChannels + 1, Hull);
+
+	FSensorFOVMesh MeshData;
+	if (FMeshGenerationUtils::GenerateFOVMesh2D(Cloud, CloudUV, Hull, MeshData.Vertices, MeshData.Indices))
+	{
+		for (auto& it : MeshData.Vertices) it.Color = Params.FOVSetup.Color.ToFColor(true);
+		OutMeshes.Add(MoveTempIfPossible(MeshData));
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+
+
+}
+
+bool URadarBaseSensorComponent::GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes)
+{
+	Meshes.Empty();
+	bool bRet = false;
+	const TArray<FRadarParams>& RadarParams = GetRadarParams();
+	for (auto & It : RadarParams)
+	{
+		if (It.bEnabled)
+		{
+			bRet = AddFOVMesh(It, Meshes) || bRet;
+		}
+	}
+	return bRet;
+}
+
+bool URadarBaseSensorComponent::NeedRenderSensorFOV() const
+{
+	const TArray<FRadarParams>& RadarParams = GetRadarParams();
+	const bool bIsSelected = IsVehicleComponentSelected();
+	for (auto& It : RadarParams)
+	{
+		if ((It.FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::Ever) ||
+			(It.FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::OnSelect && bIsSelected))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+FBoxSphereBounds URadarBaseSensorComponent::CalcBounds(const FTransform& LocalToWorld) const
+{
+	FBox Box;
+	const TArray<FRadarParams>& RadarParams = GetRadarParams();
+	for (auto& It : RadarParams)
+	{
+		Box += FMeshGenerationUtils::CalcFOVBounds(It.FOV_HorizontMax, It.FOV_Vertical, It.FOVSetup.MaxViewDistance);
+	}
+	return FBoxSphereBounds(Box).TransformBy(LocalToWorld);
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/RadarGenericSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/RadarGenericSensor.cpp
new file mode 100644
index 0000000..cdec4fb
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/RadarGenericSensor.cpp
@@ -0,0 +1,120 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/RadarGenericSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaStatics.h"
+
+
+UGeneralRadarSensorComponent::UGeneralRadarSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("GeneralRadar");
+	GUI.bIsPresentInAddMenu = true;
+
+	FRadarParams& RadarParamsNearest = RadarParams.Add_GetRef(FRadarParams());
+	RadarParamsNearest.Tag = "Nearest";
+	RadarParamsNearest.FOV_HorizontMax = 60;
+	RadarParamsNearest.FOV_HorizontFullDist = 40;
+	RadarParamsNearest.FOV_Vertical = 20;
+	RadarParamsNearest.DistanseMin = 0.2;
+	RadarParamsNearest.DistanseMax = 70 * 0.18;
+	RadarParamsNearest.DistanseOnMaxAngle = 40;
+	RadarParamsNearest.HorizontalBestResolution = 1.0f;
+	RadarParamsNearest.HorizontalResolutionFullDistAngle = 4.5f;
+	RadarParamsNearest.HorizontalResolutionMaxAngle = 12.3f;
+	RadarParamsNearest.MinSignalCoef = 0.002f;
+	RadarParamsNearest.FOVSetup.MaxViewDistance = 600;
+
+	FRadarParams& RadarParamsNear = RadarParams.Add_GetRef(FRadarParams());
+	RadarParamsNear.Tag = "Near";
+	RadarParamsNear.FOV_HorizontMax = 60;
+	RadarParamsNear.FOV_HorizontFullDist = 40;
+	RadarParamsNear.FOV_Vertical = 20;
+	RadarParamsNear.DistanseMin = 70 * 0.18;
+	RadarParamsNear.DistanseMax = 70;
+	RadarParamsNear.DistanseOnMaxAngle = 40;
+	RadarParamsNear.HorizontalBestResolution = 1.0f;
+	RadarParamsNear.HorizontalResolutionFullDistAngle = 4.5f;
+	RadarParamsNear.HorizontalResolutionMaxAngle = 12.3f;
+	RadarParamsNear.MinSignalCoef = 0.002f;
+	RadarParamsNear.FOVSetup.MaxViewDistance = 800;
+
+	FRadarParams& RadarParamsFar = RadarParams.Add_GetRef(FRadarParams());
+	RadarParamsFar.Tag = "Far";
+	RadarParamsFar.FOV_HorizontMax = 9;
+	RadarParamsFar.FOV_HorizontFullDist = 4;
+	RadarParamsFar.FOV_Vertical = 20;
+	RadarParamsFar.DistanseMin = 1;
+	RadarParamsFar.DistanseMax = 250;
+	RadarParamsFar.DistanseOnMaxAngle = 150;
+	RadarParamsFar.HorizontalBestResolution = 1.0f;
+	RadarParamsFar.HorizontalResolutionFullDistAngle = 4.5f;
+	RadarParamsFar.HorizontalResolutionMaxAngle = 12.3f;
+	RadarParamsFar.MinSignalCoef = 0.002f;
+	RadarParamsFar.FOVSetup.MaxViewDistance = 1000;
+}
+
+bool UGeneralRadarSensorComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	PointCloudPublisher.Advertise();
+	if (!PointCloudPublisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't advertise publisher"));
+		return false;
+	}
+
+	return true;
+}
+
+void UGeneralRadarSensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	PointCloudPublisher.Shutdown();
+}
+
+void UGeneralRadarSensorComponent::PublishResults()
+{
+	Scan.items.resize(Clusters.Clusters.Num());
+	Scan.device_timestamp = soda::RawTimestamp<std::chrono::milliseconds>( SodaApp.GetSimulationTimestamp());
+
+	FVector Loc = GetComponentLocation();
+	FRotator Rot = GetComponentRotation();
+
+	switch (GetRadarMode())
+	{
+	case ERadarMode::ClusterMode:
+		for (int i = 0; i < Clusters.Clusters.Num(); ++i)
+		{
+			soda::RadarCluster& Pt = Scan.items[i];
+			FVector TracedPoint = Rot.UnrotateVector(Clusters.Clusters[i].HitPosition - Loc) / 100.0;
+			Pt.id = i;
+			Pt.coords.x = TracedPoint.X;
+			Pt.coords.y = -TracedPoint.Y;
+			Pt.coords.z = 0;
+			Pt.velocity.lat = Clusters.Clusters[i].Lat;
+			Pt.velocity.lon = Clusters.Clusters[i].Lon;
+			Pt.property = soda::RadarCluster::property_t::moving;
+			Pt.RCS = Clusters.Clusters[i].RCS;
+		}
+		{
+			//SCOPE_CYCLE_COUNTER(STAT_RadarPublishResults);
+			PointCloudPublisher.Publish(Scan);
+		}
+		break;
+
+	case ERadarMode::ObjectMode:
+		break;
+	}
+}
+
+void UGeneralRadarSensorComponent::GetRemark(FString& Info) const
+{
+	Info = PointCloudPublisher.Address + ":" + FString::FromInt(PointCloudPublisher.Port);
+}
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/Sensors/UltrasonicSensor.cpp b/Source/UnrealSoda/Private/VehicleComponents/Sensors/UltrasonicSensor.cpp
new file mode 100644
index 0000000..2eaabc0
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/Sensors/UltrasonicSensor.cpp
@@ -0,0 +1,342 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/Sensors/UltrasonicSensor.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaStatics.h"
+#include "DrawDebugHelpers.h"
+#include "Soda/Misc/SodaPhysicsInterface.h"
+#include "Soda/Misc/MeshGenerationUtils.h"
+#include "DynamicMeshBuilder.h"
+
+DECLARE_STATS_GROUP(TEXT("UltrasonicSensorHub"), STATGROUP_UltrasonicSensorHub, STATGROUP_Advanced);
+DECLARE_CYCLE_STAT(TEXT("TickComponent"), STAT_UltrasonicTickComponent, STATGROUP_UltrasonicSensorHub);
+DECLARE_CYCLE_STAT(TEXT("batch execute"), STAT_UltrasonicBatchExecute, STATGROUP_UltrasonicSensorHub);
+DECLARE_CYCLE_STAT(TEXT("Add to batch execute"), STAT_UltrasonicAddToBatch, STATGROUP_UltrasonicSensorHub);
+DECLARE_CYCLE_STAT(TEXT("Process query results"), STAT_UltrasonicProcessQueryResults, STATGROUP_UltrasonicSensorHub);
+DECLARE_CYCLE_STAT(TEXT("Publish results"), STAT_UltrasonicPublishResults, STATGROUP_UltrasonicSensorHub);
+DECLARE_CYCLE_STAT(TEXT("Add Echo"), STAT_UltrasonicAddEcho, STATGROUP_UltrasonicSensorHub);
+
+UUltrasonicSensorComponent::UUltrasonicSensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Other Sensors");
+	GUI.ComponentNameOverride = TEXT("Generic Ultrasonic");
+	GUI.IcanName = TEXT("SodaIcons.Ultrasonic");
+	GUI.bIsPresentInAddMenu = true;
+
+	FOVSetup.Color = FLinearColor(0.1, 0.1, 1.0, 1.0);
+	FOVSetup.MaxViewDistance = 100;
+}
+
+bool UUltrasonicSensorComponent::GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes)
+{
+
+	TArray<FVector> Cloud;
+	static const  int RingsSteps = 20;
+	static const int RadStep = 20;
+
+	float L0 = std::cos(FOV_Horizont / 180 * M_PI / 2);
+	float R0 = std::sin(FOV_Horizont / 180 * M_PI / 2);
+	float ZScale = FOV_Vertical / FOV_Horizont;
+	float XScale = 0.5;
+
+	for (int j = 0; j < RingsSteps; j++)
+	{
+		float A = float(j) / float(RingsSteps) * M_PI / 2;
+		float R1 = std::cos(A) * R0;
+		float L1 = std::sin(A) * XScale + L0;
+
+		for (int i = 0; i < RadStep; i++)
+		{
+			float A1 = float(i) / float(RadStep) * M_PI * 2;
+			Cloud.Add(FVector(L1, std::cos(A1) * R1, std::sin(A1) * R1 * ZScale) * FOVSetup.MaxViewDistance);
+		}
+	}
+	Cloud.Add(FVector(1, 0, 0) * FOVSetup.MaxViewDistance);
+	Cloud.Add(FVector(0));
+
+	FSensorFOVMesh MeshData;
+	if (FMeshGenerationUtils::GenerateConvexHullMesh3D(Cloud, MeshData.Vertices, MeshData.Indices))
+	{
+		for (auto& it : MeshData.Vertices) it.Color = FOVSetup.Color.ToFColor(true);
+		Meshes.Add(MoveTempIfPossible(MeshData));
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+
+	return false;
+}
+
+bool UUltrasonicSensorComponent::NeedRenderSensorFOV() const
+{
+	return (FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::Ever) ||
+		(FOVSetup.FOVRenderingStrategy == EFOVRenderingStrategy::OnSelect && IsVehicleComponentSelected());
+	return false;
+}
+
+FBoxSphereBounds UUltrasonicSensorComponent::CalcBounds(const FTransform& LocalToWorld) const
+{
+	return FBoxSphereBounds(FMeshGenerationUtils::CalcFOVBounds(FOV_Horizont, FOV_Horizont, FOVSetup.MaxViewDistance)).TransformBy(LocalToWorld);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+UUltrasonicSensorHubComponent::UUltrasonicSensorHubComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Other Sensors");
+	GUI.ComponentNameOverride = TEXT("Generic Ultrasonic Hub");
+	GUI.IcanName = TEXT("SodaIcons.Ultrasonic");
+	GUI.bIsPresentInAddMenu = true;
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+}
+
+
+void UUltrasonicSensorHubComponent::TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!IsTickOnCurrentFrame() || !HealthIsWorkable()) return;
+	
+	if (!PointCloudPublisher.IsAdvertised() || Sensors.Num() == 0) return;
+
+	for (FUltrasonicEchos &Echo : EchoCollections) Echo.Clear();
+
+	check(Sensors.Num() > CurrentTransmitter);
+
+	Scan.device_timestamp = soda::RawTimestamp<std::chrono::milliseconds>(SodaApp.GetSimulationTimestamp());
+
+	UUltrasonicSensorComponent * Sensor = Sensors[CurrentTransmitter];
+
+	FVector Loc = Sensor->GetComponentLocation();
+	FRotator Rot = Sensor->GetComponentRotation();
+	FTransform RelTrans = Sensor->GetRelativeTransform();
+
+	BatchStart.SetNum(0, false);
+	BatchEnd.SetNum(0, false);
+
+	if (bLogTick)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("UltrasonicHub name: %s, transmitter %d, timestamp: %s"),
+			*GetFName().ToString(),
+			CurrentTransmitter,
+			*USodaStatics::Int64ToString(Scan.device_timestamp));
+	}
+
+	if (DrawTracedRays)
+	{
+		DrawDebugLine(GetWorld(), Loc + Rot.RotateVector(FVector(1.0, 0.0, 0.0)) * Sensor->DistanseMin, Loc + Rot.RotateVector(FVector(1.0, 0.0, 0.0)) * Sensor->DistanseMax, FColor(0, 0, 255), false, -1.f, 0, 2.f);
+	}
+
+	{
+		SCOPE_CYCLE_COUNTER(STAT_UltrasonicAddToBatch);
+		for (int i = 0; i < Sensor->Rows; i++)
+		{
+			float VerticalAng = Sensor->FOV_Vertical * -0.5f + Sensor->FOV_Vertical / (float)Sensor->Rows * (float)i;
+			for (int j = 0; j < Sensor->Step; j++)
+			{
+				float HorizontAng = Sensor->FOV_Horizont * -0.5f + Sensor->FOV_Horizont / (float)Sensor->Step * (float)j;
+				FVector RayNorm = Rot.RotateVector(FRotator(VerticalAng, HorizontAng, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0)));
+				BatchStart.Add(Loc + RayNorm * Sensor->DistanseMin);
+				BatchEnd.Add(Loc + RayNorm * Sensor->DistanseMax);
+			}
+		}
+	}
+
+	TArray<FHitResult> OutHits;
+
+	{
+		SCOPE_CYCLE_COUNTER(STAT_UltrasonicBatchExecute);
+		FSodaPhysicsInterface::RaycastSingleScope(
+			GetWorld(), OutHits, BatchStart, BatchEnd,
+			ECollisionChannel::ECC_Visibility,
+			FCollisionQueryParams(NAME_None, false, GetOwner()),
+			FCollisionResponseParams::DefaultResponseParam,
+			FCollisionObjectQueryParams::DefaultObjectQueryParam);
+	}
+
+	check(OutHits.Num() == BatchStart.Num());
+
+	{
+		SCOPE_CYCLE_COUNTER(STAT_UltrasonicProcessQueryResults);
+
+		for (int i = 0; i < Sensor->Rows; i++)
+		{
+			float VerticalAng = Sensor->FOV_Vertical * -0.5f + Sensor->FOV_Vertical / (float)Sensor->Rows * (float)i;
+			for (int j = 0; j < Sensor->Step; j++)
+			{
+				FHitResult& Hit = OutHits[i * Sensor->Step + j];
+				bool Traced = Hit.bBlockingHit;
+
+				if (Traced)
+				{
+					if (EnabledGroundFilter)
+					{
+						if ((Loc.Z - Hit.Location.Z) > DistanceToGround)
+						{
+							Traced = false;
+						}
+					}
+				}
+
+				if (Traced)
+				{
+					for (size_t k = 0; k < EchoCollections.Num(); ++k)
+					{
+						FVector CurLoc = Sensors[k]->GetComponentLocation();
+						FRotator CurRot = Sensors[k]->GetComponentRotation();
+						FVector TracedVector = CurRot.UnrotateVector(Hit.Location - CurLoc);
+						FVector2D VHor(TracedVector.X, TracedVector.Y);
+						float CosHor = VHor.X / VHor.Size();
+						FVector2D VVert(TracedVector.X, TracedVector.Z);
+						float CosVert = VVert.X / VVert.Size();
+						float CurDistance = (Hit.Location - CurLoc).Size();
+						FVector MirrorPerpendicular = ((CurLoc - Hit.Location) + (Loc - Hit.Location)) / 2;
+						float Dot = FVector::DotProduct(Hit.Normal.GetSafeNormal(), MirrorPerpendicular.GetSafeNormal());
+						float Power = powf(Dot / (CurDistance / 100.f), 2);
+						if (CosHor < Sensor->CosFovHorizontal || CosVert < Sensor->CosFovVertical || CurDistance > Sensor->DistanseMax || Power < SensorThreshold)
+							continue;
+
+						EchoCollections[k].AddHit(&Hit, (k == CurrentTransmitter) ? CurDistance : CurDistance + (Hit.Location - Sensors[CurrentTransmitter]->GetComponentLocation()).Size(), Power, MinDistGap);
+					}
+				}
+
+				if (DrawTracedRays || DrawNotTracedRays)
+				{
+					float HorizontAng = Sensor->FOV_Horizont * -0.5f + Sensor->FOV_Horizont / (float)Sensor->Step * (float)j;
+					FVector RayNorm = Rot.RotateVector(FRotator(VerticalAng, HorizontAng, 0.0f).RotateVector(FVector(1.0, 0.0, 0.0)));
+
+					if (DrawTracedRays && Traced)
+					{
+						DrawDebugLine(GetWorld(), Loc + RayNorm * Sensor->DistanseMin, Hit.Location, FColor(255, 0, 0), false, -1.f, 0, 2.f);
+					}
+					else if (DrawNotTracedRays && !Traced)
+					{
+						DrawDebugLine(GetWorld(), Loc + RayNorm * Sensor->DistanseMin, Loc + RayNorm * Sensor->DistanseMax, FColor(0, 255, 0), false, -1.f, 0, 2.f);
+					}
+				}
+			}
+		}
+
+		for (size_t i = 0; i < EchoCollections.Num(); ++i)
+		{
+			EchoCollections[i].RemoveExcessEchos();
+			EchoCollections[i].Echos.Sort(FUltrasonicEcho::DistancePredicate);
+
+			Scan.ultrasonics[i].properties = (i == CurrentTransmitter) ? soda::Ultrasonic::Properties::transmitter : soda::Ultrasonic::Properties::none;
+			Scan.ultrasonics[i].echoes.resize(EchoCollections[i].Echos.Num(), 0.f);
+
+			for (size_t j = 0; j < EchoCollections[i].Echos.Num(); ++j)
+			{
+				Scan.ultrasonics[i].echoes[j] = EchoCollections[i].Echos[j].BeginDistance / 100.f;
+				if (DrawEchos)
+				{
+					FColor Color = (i == CurrentTransmitter) ? FColor(255, 255, 0) : FColor(120, 120, 255);
+					DrawDebugLine(GetWorld(), Sensors[i]->GetComponentLocation(), EchoCollections[i].Echos[j].EchoPosition, Color, false, -1.f, 0, 2.f);
+					DrawDebugPoint(GetWorld(), EchoCollections[i].Echos[j].EchoPosition, 10.f, Color, false, -1.f, 0);
+				}
+				if (bLogEchos)
+					UE_LOG(LogSoda, Log, TEXT("ULTRASONIC Echo power = %f, BeginDistance = %f, EndDistance = %f, IsTransmitter = %d"), EchoCollections[i].Echos[j].ReturnPower, EchoCollections[i].Echos[j].BeginDistance, EchoCollections[i].Echos[j].EndDistance, (int)(i == CurrentTransmitter));
+			}
+		}
+	}
+
+	{
+		SCOPE_CYCLE_COUNTER(STAT_UltrasonicPublishResults);
+		PointCloudPublisher.Publish(Scan);
+	}
+
+	CurrentTransmitter = (CurrentTransmitter + 1) % Sensors.Num();
+}
+
+bool UUltrasonicSensorHubComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (AActor* Owner = GetOwner())
+	{
+		Owner->GetComponents(Sensors, false);
+	}
+
+	EchoCollections.SetNum(Sensors.Num());
+	Scan.ultrasonics.resize(Sensors.Num());
+	for (int i = 0; i< Sensors.Num(); ++i) 
+	{
+		Scan.ultrasonics[i].hfov = Sensors[i]->FOV_Horizont;
+		Scan.ultrasonics[i].vfov = Sensors[i]->FOV_Vertical;
+
+		Sensors[i]->CosFovVertical = cos(Sensors[i]->FOV_Vertical / 180.0 * M_PI / 2);
+		Sensors[i]->CosFovHorizontal = cos(Sensors[i]->FOV_Horizont / 180.0 * M_PI / 2);
+	}
+
+	PointCloudPublisher.Advertise();
+	if (!PointCloudPublisher.IsAdvertised())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Can't advertise publisher"));
+		return false;
+	}
+
+	return true;
+}
+
+void UUltrasonicSensorHubComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+	PointCloudPublisher.Shutdown();
+}
+
+void UUltrasonicSensorHubComponent::GetRemark(FString& Info) const
+{
+	Info = PointCloudPublisher.Address + ":" + FString::FromInt(PointCloudPublisher.Port);
+}
+
+void FUltrasonicEchos::AddHit(FHitResult* NewHit, float Distance, float Power, float MinDistGap)
+{
+	{
+		SCOPE_CYCLE_COUNTER(STAT_UltrasonicAddEcho);
+		
+
+		FUltrasonicEcho* EchoToAddHit = Echos.FindByPredicate([this, NewHit, Distance, MinDistGap](FUltrasonicEcho EchoToCheck) { return (Distance > EchoToCheck.BeginDistance - MinDistGap) && (Distance < EchoToCheck.EndDistance + MinDistGap); });
+		if (EchoToAddHit == 0)
+		{
+			Echos.Add(FUltrasonicEcho());
+			Echos.Last().Hits.Add(NewHit);
+			Echos.Last().BeginDistance = Distance;
+			Echos.Last().EndDistance = Distance;
+			Echos.Last().ReturnPower = Power;
+			Echos.Last().EchoPosition = NewHit->Location;
+		}
+		else
+		{
+			if (Distance < EchoToAddHit->BeginDistance)
+			{
+				EchoToAddHit->EchoPosition = NewHit->Location;
+			}
+			EchoToAddHit->BeginDistance = (std::min)(EchoToAddHit->BeginDistance, Distance);
+			EchoToAddHit->EndDistance = (std::max)(EchoToAddHit->EndDistance, Distance);
+			EchoToAddHit->ReturnPower = (std::max)(EchoToAddHit->ReturnPower, Power);
+			
+			EchoToAddHit->Hits.Add(NewHit);
+		}
+	}
+}
+
+
+void FUltrasonicEchos::RemoveExcessEchos()
+{
+	if (Echos.Num() <= EchosMaxNum)
+		return;
+
+	Echos.Sort(FUltrasonicEcho::ReturnPowerPredicate);
+	Echos.SetNum(EchosMaxNum);
+}
+
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/VehicleBaseComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/VehicleBaseComponent.cpp
new file mode 100644
index 0000000..664261f
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/VehicleBaseComponent.cpp
@@ -0,0 +1,49 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/VehicleBaseComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Canvas.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/LevelState.h"
+#include "RuntimeEditorModule.h"
+
+UVehicleBaseComponent::UVehicleBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	bWantsInitializeComponent = true;
+	//PrimaryComponentTick.bCanEverTick = true;
+	//bTickInEditor = false;
+	//PrimaryComponentTick.TickGroup = TG_PostPhysics;
+}
+
+void UVehicleBaseComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+	Vehicle = Cast<ASodaVehicle>(GetOwner());
+}
+
+void UVehicleBaseComponent::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+}
+
+void UVehicleBaseComponent::BeginPlay()
+{
+	GameMode = USodaGameModeComponent::GetChecked();
+	LevelState = GameMode->LevelState;
+	check(LevelState);
+
+	Super::BeginPlay();
+}
+
+void UVehicleBaseComponent::EndPlay(EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	if (IsVehicleComponentActiveted())
+	{
+		OnDeactivateVehicleComponent();
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/VehicleDriverComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/VehicleDriverComponent.cpp
new file mode 100644
index 0000000..aab5fc9
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/VehicleDriverComponent.cpp
@@ -0,0 +1,74 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Engine/Canvas.h"
+#include "SodaJoystick.h"
+#include "InputCoreTypes.h"
+#include "Soda/SodaGameMode.h"
+
+FString ToString(ESodaVehicleDriveMode Mode)
+{
+	switch(Mode)
+	{
+		case ESodaVehicleDriveMode::Manual: return "Manual";
+		case ESodaVehicleDriveMode::AD: return "AD";
+		case ESodaVehicleDriveMode::SafeStop: return "SafeStop";
+		case ESodaVehicleDriveMode::ReadyToAD: return "ReadyToAD";	
+		default: return "Unknown";
+	}
+}
+
+UVehicleDriverComponent::UVehicleDriverComponent(const FObjectInitializer &ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Drivers");
+	GUI.IcanName = TEXT("SodaIcons.Device");
+
+	Common.UniqueVehiceComponentClass = UVehicleDriverComponent::StaticClass();
+}
+
+bool UVehicleDriverComponent::IsEnabledBrakeLight() const 
+{
+	for (auto & Wheel : GetWheeledVehicle()->GetWheels())
+	{
+		if(Wheel->ReqBrakeTorque > 0.1) return true;
+	}
+	return false;
+}
+
+bool UVehicleDriverComponent::IsEnabledReversLights() const 
+{
+	return (GetGear() == ENGear::Reverse);
+}
+
+ESodaVehicleDriveMode UVehicleDriverComponent::GetDriveMode() const 
+{
+	bool bSafeStopInput = false;
+	bool bADModeInput = false;
+
+	if (UVehicleInputComponent* VehicleInput = GetWheeledVehicle()->GetActiveVehicleInput())
+	{
+		bSafeStopInput = VehicleInput->bSafeStopInput;
+		bADModeInput = VehicleInput->bADModeInput;
+	}
+
+	if(bSafeStopInput || (bADModeInput && !IsADPing())) return ESodaVehicleDriveMode::SafeStop;
+	if(bADModeInput) return ESodaVehicleDriveMode::AD;
+	return ESodaVehicleDriveMode::Manual; 	
+}
+
+FColor UVehicleDriverComponent::GetLED() const
+{
+	switch(GetDriveMode())
+	{
+		case ESodaVehicleDriveMode::Manual: return FColor(0, 255, 0);
+		case ESodaVehicleDriveMode::AD: return FColor(0, 0, 255);
+		case ESodaVehicleDriveMode::SafeStop: return FColor(255, 0, 0);
+		case ESodaVehicleDriveMode::ReadyToAD: return FColor(0, 0, 255);
+		default: return FColor(0, 0, 0);
+	}
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/VehicleInputComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/VehicleInputComponent.cpp
new file mode 100644
index 0000000..f61d92b
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/VehicleInputComponent.cpp
@@ -0,0 +1,140 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "InputCoreTypes.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+
+UVehicleInputComponent::UVehicleInputComponent(const FObjectInitializer &ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Inputs");
+	Common.UniqueVehiceComponentClass = UVehicleInputComponent::StaticClass();
+	Common.bDrawDebugCanvas = true;
+}
+
+bool UVehicleInputComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	UVehicleInputComponent* ActiveVehicleInput = GetWheeledVehicle()->GetActiveVehicleInput();
+	CopyInputStates(ActiveVehicleInput);
+	GetWheeledVehicle()->OnSetActiveVehicleInput(this);
+
+	return true;
+}
+
+void UVehicleInputComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UVehicleInputComponent::UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController)
+{
+	if (!PlayerController)
+	{
+		return;
+	}
+
+	USodaUserSettings* Settings = SodaApp.GetSodaUserSettings();
+
+	if (PlayerController->WasInputKeyJustPressed(Settings->ChangeModeKeyInput))
+	{
+		bADModeInput = !bADModeInput;
+	}
+
+	if (PlayerController->WasInputKeyJustPressed(Settings->SafeStopKeyInput))
+	{
+		bSafeStopInput = !bSafeStopInput;
+	}
+
+	if (PlayerController->WasInputKeyJustPressed(Settings->HeadlightsKeyInput))
+	{
+		bEnabledHeadlightsInput = !bEnabledHeadlightsInput;
+	}
+
+	bEnabledHornInput = PlayerController->IsInputKeyDown(Settings->HornKeyInput);
+
+
+	/**********************************
+	* Change Cruise Control Mode
+	***********************************/
+	if (PlayerController->WasInputKeyJustPressed(Settings->KeyCruiseControl))
+	{
+
+		if (CruiseControlMode != ECruiseControlMode::CruiseControlActive)
+		{
+			CruiseControlMode = ECruiseControlMode::CruiseControlActive;
+			CruiseControlTargetSpeed = ForwardSpeed;
+		}
+		else
+		{
+			CruiseControlMode = ECruiseControlMode::Off;
+		}
+	}
+
+	/**********************************
+	* Change Speed Limiter Mode
+	***********************************/
+	if (PlayerController->WasInputKeyJustPressed(Settings->KeySpeedLimiter))
+	{
+		if (CruiseControlMode != ECruiseControlMode::SpeedLimiterActive)
+		{
+			CruiseControlMode = ECruiseControlMode::SpeedLimiterActive;
+			CruiseControlTargetSpeed = ForwardSpeed;
+		}
+		else
+		{
+			CruiseControlMode = ECruiseControlMode::Off;
+		}
+	}
+
+	if ((CruiseControlMode == ECruiseControlMode::CruiseControlActive && GetBrakeInput() > 0.1f) || GetGearInput() != ENGear::Drive)
+	{
+		CruiseControlMode = ECruiseControlMode::Off;
+	}
+
+	CCThrottleInput = FMath::Clamp(CruiseControlPropCoef * (CruiseControlTargetSpeed - std::abs(ForwardSpeed)), 0.0f, CruiseControlMode == ECruiseControlMode::CruiseControlActive ? MaxCruiseControlThrottle : 1.f);
+}
+
+float UVehicleInputComponent::GetCruiseControlModulatedThrottleInput(float ThrottleInput) const
+{
+	switch (CruiseControlMode)
+	{
+	case ECruiseControlMode::CruiseControlActive:
+		ThrottleInput = FMath::Max(CCThrottleInput, ThrottleInput);
+		break;
+
+	case ECruiseControlMode::SpeedLimiterActive:
+		ThrottleInput = FMath::Min(CCThrottleInput, ThrottleInput);
+		break;
+	}
+	return ThrottleInput;
+}
+
+
+void UVehicleInputComponent::SetSteeringInput(float /*Value*/)
+{
+	UE_LOG(LogSoda, Warning, TEXT("UVehicleInputComponent::SetSteeringInput() is not supported for this InputComponent"));
+}
+
+void UVehicleInputComponent::SetThrottleInput(float /*Value*/) 
+{
+	UE_LOG(LogSoda, Warning, TEXT("UVehicleInputComponent::SetThrottleInput() is not supported for this InputComponent"));
+}
+
+void UVehicleInputComponent::SetBrakeInput(float /*Value*/) 
+{
+	UE_LOG(LogSoda, Warning, TEXT("UVehicleInputComponent::SetBrakeInput() is not supported for this InputComponent"));
+}
+
+void UVehicleInputComponent::SetGearInput(ENGear /*Value*/) 
+{
+	UE_LOG(LogSoda, Warning, TEXT("UVehicleInputComponent::SetGearInput() is not supported for this InputComponent"));
+}
+
diff --git a/Source/UnrealSoda/Private/VehicleComponents/VehicleSensorComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/VehicleSensorComponent.cpp
new file mode 100644
index 0000000..e2180c6
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/VehicleSensorComponent.cpp
@@ -0,0 +1,106 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Misc/SensorSceneProxy.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "RuntimeMetaData.h"
+
+USensorComponent::USensorComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.IcanName = TEXT("SodaIcons.Sensor");
+
+	SetCollisionProfileName(UCollisionProfile::NoCollision_ProfileName);
+	//SetGenerateOverlapEvents(false);
+
+	static ConstructorHelpers::FObjectFinder< UMaterial > SensorFOVMaterialFinder(TEXT("/SodaSim/Assets/CPP/SensorFOVMaterial"));
+	SensorFOVMaterial = SensorFOVMaterialFinder.Object;
+}
+
+void USensorComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void USensorComponent::HideActorComponentsFromSensorView(AActor* Actor)
+{
+	const TArray<USceneComponent*> Children = GetAttachChildren();
+
+	for (auto& Child : Children)
+	{
+		USceneCaptureComponent2D* Capture2D = Cast<USceneCaptureComponent2D>(Child);
+		if (Capture2D)
+		{
+			Capture2D->HideActorComponents(Actor);
+		}
+	}
+}
+
+void USensorComponent::HideComponentFromSensorView(UPrimitiveComponent* PrimitiveComponent)
+{
+	const TArray<USceneComponent*> Children = GetAttachChildren();
+
+	for (auto& Child : Children)
+	{
+		USceneCaptureComponent2D* Capture2D = Cast<USceneCaptureComponent2D>(Child);
+		if (Capture2D)
+		{
+			Capture2D->HideComponent(PrimitiveComponent);
+		}
+	}
+}
+
+bool USensorComponent::OnActivateVehicleComponent()
+{
+	bool bRet =  Super::OnActivateVehicleComponent();
+
+	MarkRenderStateDirty();
+
+	return bRet;
+}
+
+void USensorComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+FPrimitiveSceneProxy* USensorComponent::CreateSceneProxy()
+{
+	if (NeedRenderSensorFOV())
+	{
+		return new FSensorSceneProxy(this);
+	}
+	else
+	{
+		return nullptr;
+	}
+}
+
+void USensorComponent::GetUsedMaterials(TArray<UMaterialInterface*>& OutMaterials, bool bGetDebugMaterials) const
+{
+	if (SensorFOVMaterial)
+	{
+		OutMaterials.AddUnique(SensorFOVMaterial);
+	}
+}
+
+void USensorComponent::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeProperty(PropertyChangedEvent);
+
+	if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, "UpdateFOVRendering"))
+	{
+		MarkRenderStateDirty();
+	}
+}
+
+void USensorComponent::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	Super::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, "UpdateFOVRendering"))
+	{
+		MarkRenderStateDirty();
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleComponent.cpp
new file mode 100644
index 0000000..9fe1100
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleComponent.cpp
@@ -0,0 +1,62 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Canvas.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/SodaGameMode.h"
+#include "RuntimeEditorModule.h"
+
+UWheeledVehicleComponent::UWheeledVehicleComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	Common.bIsTopologyComponent = true;
+}
+
+void UWheeledVehicleComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+	WheeledVehicle = Cast<ASodaWheeledVehicle>(GetOwner());
+}
+
+void UWheeledVehicleComponent::BeginPlay()
+{
+	Super::BeginPlay();
+
+	if (IsValid(WheeledVehicle))
+	{
+		WheeledComponentInterface = WheeledVehicle->GetWheeledComponentInterface();
+	}
+}
+
+bool UWheeledVehicleComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (IsValid(WheeledVehicle))
+	{
+		WheeledComponentInterface = WheeledVehicle->GetWheeledComponentInterface();
+	}
+
+	if (!GetWheeledComponentInterface())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Need WheeledComponentInterface"));
+		return false;
+	}
+
+	return true;
+}
+
+void UWheeledVehicleComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UWheeledVehicleComponent::OnPushDataset(soda::FActorDatasetData& Dataset) const
+{
+	Super::OnPushDataset(Dataset);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovementBaseComponent.cpp b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovementBaseComponent.cpp
new file mode 100644
index 0000000..610b5dd
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovementBaseComponent.cpp
@@ -0,0 +1,48 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/WheeledVehicleMovementBaseComponent.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/UnrealSoda.h"
+
+UWheeledVehicleMovementBaseComponent::UWheeledVehicleMovementBaseComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Physic");
+	GUI.IcanName = TEXT("SodaIcons.Tire");
+	GUI.bIsPresentInAddMenu = true;
+	Common.UniqueVehiceComponentClass = UWheeledVehicleMovementInterface::StaticClass();
+	Common.bIsTopologyComponent = true;
+}
+
+void UWheeledVehicleMovementBaseComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+	WheeledVehicle = Cast<ASodaWheeledVehicle>(GetOwner());
+}
+
+ASodaVehicle* UWheeledVehicleMovementBaseComponent::GetVehicle() const 
+{
+	return Cast<ASodaVehicle>(GetOwner()); 
+}
+
+bool UWheeledVehicleMovementBaseComponent::OnActivateVehicleComponent()
+{
+	if (!ISodaVehicleComponent::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (!GetWheeledVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Paren isn't ASodaWheeledVehicle"));
+		UE_LOG(LogSoda, Error, TEXT("UWheeledVehicleMovementBaseComponent::OnActivateVehicleComponent(); Parent actor must be ASodaWheeledVehicle"));
+		return false;
+	}
+
+	return true;
+}
+
+void UWheeledVehicleMovementBaseComponent::OnDeactivateVehicleComponent()
+{
+	ISodaVehicleComponent::OnDeactivateVehicleComponent();
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Bicycle/dyncar_bicycle.h b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Bicycle/dyncar_bicycle.h
new file mode 100644
index 0000000..4eb5150
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Bicycle/dyncar_bicycle.h
@@ -0,0 +1,572 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#ifndef DYNCAR_BICYCLE_H
+#define DYNCAR_BICYCLE_H
+
+#ifndef _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES
+#endif
+//#define MEX_DEBUG_PRINTF
+#include <math.h>
+
+//#include <fstream>//+++++++++++++++++++++++++++
+//#include <iostream>//+++++++++++++++++++++++++++++
+
+#ifdef __cplusplus //================================
+extern "C" {       //================================
+#endif             //===============================
+
+typedef struct __car_state {
+
+  int state;   // is equal 1 when car is moving ; state = 0 when object DynamicCar being created
+
+  double psi;  // yaw of the car // in world coordinate system
+  double x;  //
+  double y;  // x,y of the Center of Gravitaty (CG) // in world coordinate system
+
+  double xc; // analogious coodinates x,y for Center of Rear axe of car (CR)
+  double yc;  // in world coordinate system
+
+  double Vx;   //Velocity of CG in coordinate system related to car:OX pointing along central axe of the car; OY pointing to left
+  double Vy;  // So, Vx - longitudal speed, Vy - lateral speed of the car
+
+  double Vdes; // Desired longitudal speed from Path Matcher (Control) // (only for logging)
+
+  double Om;  // angular velocity of car in world coordinate system
+
+  double dVxdt; // d(Vx)/dt
+  double dVydt; // d(Vy)/dt
+
+  double dOmdt; // d(Om)/dt
+
+  double OmWr; // rotational speed of rear wheel
+  double OmWf; // rotational speed of forward wheel
+
+  double dOmWfdt; // d(OmWf)/dt
+  double dOmWrdt; // d(OmWr)/dt
+
+  // Diagnosis
+  int callcount;
+  int initialized;
+
+  // Control data
+  double steer_alpha_req; // required steering angle from Control
+  double steer_alpha;  // steering angle (angle of turning of forward wheel)
+  double accel;        // desired acceleration (decceleration) for car from Control
+
+
+  //Forces
+
+  double Nr;// Load on rear wheel
+  double Nf;// Load on forward wheel
+
+  double Fdrag; // drag force acting on car
+  double Fdrag_PM; // evaluated drag force to have to be added to massa*accel force which is requested by Control
+
+  double FXreq; // whole force which being requested from engines/brakes (= massa*accel + Fdrag_PM)
+
+  double FXr_act;  // Requested Force for rear engines (actuators)
+  double FXf_act;  // requested force for forward engines (distributed from Fxreq in correspondence to drive distribution)
+
+  double FXr_req;  // Force for rear wheel (from engines and brakes)
+  double FXf_req;  // force for forward wheel // These forces are requested from tyres in longitudal directional
+
+  double FYr_req;  // these forces    are requested   // rear
+  double FYf_req;  // from tyres in lateral direction // forward
+
+  double FXr;      // real forces acting on tyres // rear
+  double FXf;      // in longitudinal direction    // forward
+
+  double FYr; // real forces acting on tyres // rear
+  double FYf; // in lateral direction        // forward
+
+  // brakes: Fbrake = car_par.n_brakes * car_state.B_pressure *(
+  //                      (car_par.kBrake_f / car_par.frontWheelRad) +  (car_par.kBrake_f / car_par.frontWheelRad) )
+  //
+
+  double B_pressure; // Pressure for brakes
+  double B_pressure_req; // Requested pressure
+
+  double Nbrake_f;
+  double Nbrake_r;
+  double Nmot_f;
+  double Nmot_r;
+
+  double addedFx;
+  double addedFy;
+  double addedN;
+
+  // wheels
+
+  double slipAng_r; // lateral slip // rear
+  double slipAng_f; // angles       // forward
+
+  double long_slip_r; // longitudal slip // rear
+  double long_slip_f; // angles          // forward
+
+  double evTrqW_r;
+  double evTrqW_f;
+
+  int flDW_r;
+  int flDW_f;
+
+  double lat_slip;
+
+} car_state_t;
+typedef struct __CarParameters {
+                //--- kinematic ----//
+                double a;
+                double b;
+                double L;
+                double max_steer;
+
+                // --- corrected ------/
+                double mu;
+                double max_accel;  // should be bounded by mu*g
+
+                //-- Dynamic ----------/
+                double drive_distrib;  //  0 - RWD, 1 - FWD, 0.5 - AWD etc.
+                double mass;
+                double moment_inertia;
+                double CGvert;  // high of CG
+
+                // stiftness of tyres in lateral direction (for 2 wheels):
+                double Cy_r;
+                double Cy_f;
+
+                // stiftness of tyres in longitudal direction (for 2 wheels):
+                double Cx_r;
+                double Cx_f;
+
+                // actuators -----------/
+
+                double rearWheelRad;
+                double frontWheelRad;    // m
+                double maxPowerEngine;   // for one engine, watt
+                double maxTorqueEngine;  // for one engine, on wheels, N*m
+                double n_engines;
+
+                // torque curve
+                double Om_maxTorque;
+                double Om_nullTorque;         // for wheels
+                double maxBrakePressure;      // Bar
+                double maxGradBrakePressure;  // Bar/s
+                double kBrake_f;              // N*m/Bar
+                double kBrake_r;              //
+                double n_brakes;
+                double maxGradSteer;  // rad/s
+
+                //------------------/
+
+                // drag parameters --/
+
+                double rollingResistance;               // [N] Rolling resistance //
+                double rollingResistanceSpeedDepended;  // [N*s/m] Rolling resistance
+                double Cxx;                             // Coefficient of aero drag
+
+                // -- in old PM:
+                // turningDrag   = m*b/(a+b)*abs(yawRate*vxCG)*abs(tan(delta));
+                // aeroDrag      = C_xx * vxCG * vxCG;
+                // inclinedDrag  = -m*g*sin(grade);  %negative sign due to GPS convention for
+                // grade FxDrag = turningDrag + rollingResistance + aeroDrag + inclinedDrag;
+                //-------------------/
+
+                //-----------------/
+
+                double fWIn;  // moment of inertia fo front train
+                double rWIn;  // -''- rear
+        }CarParameters;
+
+#ifdef __cplusplus   //========================
+};                   //======================
+#endif              //=======================
+
+#ifdef __cplusplus  //=======================
+
+#ifdef __GNUC__
+#	pragma GCC diagnostic push
+#	pragma GCC diagnostic ignored "-Wshadow"
+#endif
+
+#include <Eigen/Eigen>
+
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
+
+// ------ Control structures
+// --------------------------------------------------------------------------------------------//
+
+struct CulcParameters {
+
+  int fl_drag_taking; // if 1 then drag forces being taked into account
+  int fl_Long_Circ;  // 0 || 1 || 2 ; 2 is default value (combined slip mode)
+  int fl_static_load; // 1 for static case of loads on rear and forward wheel
+  int fl_RunKut; // 1 for Runge Kutta integration; -1 for Local Grid Refinement (more expensive) // 0 is default (Eiler)
+  int nsteps; // sampling for integration on [t,t+dt] interval // 400 is default for Eiler
+  int fl_act_low; // Lawes for actuators;// 2 is default
+
+  int implicit_solver;
+  int num_impl_nonlin_it;
+  int corr_impl_step;
+
+};
+/*
+struct CarParameters {
+  //--- kinematic ----//
+
+  double a; // distance from CG to forward wheel
+  double b; // distance from CG to rear wheel
+  double L; // wheel base (= a+b)
+
+
+  double max_steer; // max turning angle for forward wheel
+
+  double max_accel;  // maximal value of requested acceleration/decceleration
+
+  //-- Dynamic ----------/
+  double drive_distrib;  //  drive distribution: 0 - RWD, 1 - FWD, 0.5 - AWD etc.
+  double mass;           // mass of car
+  double moment_inertia; // yaw moment of inertia for car
+  double CGvert;         // high of CG
+  double mu;             // mu (friction coefficient)
+
+  // stiftness of tyres in lateral direction (for 2 wheels):
+  double Cy_r; // rear
+  double Cy_f; // forward
+
+  // stiftness of tyres in longitudal direction (for 2 wheels):
+  double Cx_r; // rear
+  double Cx_f; // forward
+
+  // actuators -----------/
+
+  double rearWheelRad; // radiuses of // rear
+  double frontWheelRad; // wheels,m   // forward
+
+  double maxPowerEngine;   // for one engine, watt
+  double maxTorqueEngine;  // for one engine, on wheels, N*m
+  double n_engines;        // number of engines for rear and forward wheels (this numbers are the same for rear and forward wheel)
+
+  // torque curve
+  double Om_maxTorque; // parameters of            //
+  double Om_nullTorque; // torque curve for engines//
+
+  // Brakes parameters:
+  double maxBrakePressure;      // Bar
+  double maxGradBrakePressure;  // Bar/s
+  double kBrake_f;              // N*m/Bar
+  double kBrake_r;              //
+  double n_brakes;
+
+
+  double maxGradSteer;  // rad/s // speed of turning of forward wheel (speed of steering changes)
+
+  //------------------/
+
+  // drag parameters --/
+
+  double rollingResistance;               // [N] Rolling resistance //
+  double rollingResistanceSpeedDepended;  // [N*s/m] Rolling resistance
+  double Cxx;                             // Coefficient of aero drag
+
+  // -- in old PM:
+  // turningDrag   = m*b/(a+b)*abs(yawRate*vxCG)*abs(tan(delta));
+  // aeroDrag      = C_xx * vxCG * vxCG;
+  // inclinedDrag  = -m*g*sin(grade);  %negative sign due to GPS convention for
+  // grade FxDrag = turningDrag + rollingResistance + aeroDrag + inclinedDrag;
+  //-------------------/
+
+  //-----------------/
+
+  double fWIn;  // moment of inertia fo front train
+  double rWIn;  // -''- rear
+};
+*/
+struct PM_data{
+
+    struct {
+
+        int ind_tr;
+
+        double s;
+
+        double e;
+
+        double psi_des;
+
+        double curve;
+
+        std::vector<double> xy_des;
+
+        double speed_des;
+
+        double accel_des;
+
+    } des_state;
+
+    double dpsi;
+
+    double steer_FBFFW;
+
+    double accel_FBFFW;
+};
+
+struct ImplSolverData{
+
+    Eigen::VectorXd F;
+
+    Eigen::MatrixXd dFdX;
+
+    Eigen::VectorXd dX;
+
+    int Nsys;
+
+    int fl_first_call;
+
+    double DFX_rDlat;
+    double DFX_rDlon;
+    double DFX_rDN;
+    double DFY_rDlat;
+    double DFY_rDlon;
+    double DFY_rDN;
+
+    double DFX_fDlat;
+    double DFX_fDlon;
+    double DFX_fDN;
+    double DFY_fDlat;
+    double DFY_fDlon;
+    double DFY_fDN;
+
+    double Dlat_rDOm;
+    double Dlat_rDVx;
+    double Dlat_rDVy;
+    double Dlat_rDOmWr;
+
+    double Dlon_rDOm;
+    double Dlon_rDVx;
+    double Dlon_rDVy;
+    double Dlon_rDOmWr;
+
+    double Dlat_fDOm;
+    double Dlat_fDVx;
+    double Dlat_fDVy;
+    double Dlat_fDOmWf;
+
+    double Dlon_fDOm;
+    double Dlon_fDVx;
+    double Dlon_fDVy;
+    double Dlon_fDOmWf;
+};
+
+struct DynamicPar {
+
+  CulcParameters culc_par;
+
+  CarParameters car_par;
+
+  int fl_Dynamic;    //  not used
+  int fl_Dynamic_PM; // not used
+
+  DynamicPar() {
+    fl_Dynamic = 1;
+    fl_Dynamic_PM = 1;
+
+    // Parameters of calculations
+    culc_par.fl_drag_taking = 1;
+    culc_par.fl_Long_Circ = 3;
+    culc_par.fl_static_load = 0;
+    culc_par.fl_RunKut = 0;
+    culc_par.nsteps = 10;
+    culc_par.fl_act_low = 2;
+
+    culc_par.implicit_solver = 1;
+    culc_par.num_impl_nonlin_it = 4;
+    culc_par.corr_impl_step = 0;
+    //----------------------------------------
+    // default kinematic and dynamic parameters
+    car_par.a = 1.73;
+    car_par.b = 1.168;  // 1.35;
+    car_par.L = car_par.a + car_par.b;
+    car_par.max_steer = 22.0 * M_PI / 180.0;  // 52.0*M_PI/180.0;
+
+    //-----------------------------
+    car_par.mu = 1.0;
+    car_par.max_accel = 8.0;  // 50.0
+    car_par.CGvert = 0.4;
+    car_par.mass = 1196.0;
+    car_par.moment_inertia = 1260.0;
+
+    //------------------------------------
+    car_par.Cy_f = 226000.0;
+    car_par.Cy_r = 240000.0;
+    car_par.Cx_f = 376000.0;
+    car_par.Cx_r = 284000.0;
+
+    //------------------------------------
+    car_par.drive_distrib = 0.0;  // 0.5 = AWD, 1.0 = FWD, 0.0 = RWD
+    car_par.frontWheelRad = 0.31;
+    car_par.rearWheelRad = 0.35;
+    car_par.maxPowerEngine = 135000.0;
+    car_par.maxTorqueEngine = 200.0 * 6.25;
+    car_par.n_engines = 2.0;
+    car_par.Om_maxTorque = 192.68;
+    car_par.Om_nullTorque = 201.06;
+    //
+    car_par.maxBrakePressure = 60.0;
+    car_par.maxGradBrakePressure = 250.0;
+    car_par.kBrake_f = 70.0;
+    car_par.kBrake_r = 70.0;
+    car_par.n_brakes = 1.0;
+    car_par.maxGradSteer = 8.22;
+
+    //------------------------------------
+    car_par.rollingResistance = 600.0;
+    car_par.rollingResistanceSpeedDepended = 0.0;
+    car_par.Cxx = 1.0;
+
+    //-----------------------------------------------
+
+    car_par.fWIn = 1.42;
+    car_par.rWIn = 2.06;
+  }
+};
+
+//----- Dynamic Car
+//---------------------------------------------------------------------------------------------------//
+
+class DynamicCar {
+ protected:
+  void newFXreq();
+
+  void getDrag();
+
+  void getVerticalLoads();
+
+  void newLongForce();
+
+  void newLatForce();
+
+//  void analize_Fdrag(double& dVxdt);
+
+  void evolutionControl(double dt);
+
+  void combinedSlip();
+
+  double brushModel_combined(double slip_angle, double Fz);
+  double brushModel_combined_diff(double slip_angle, double Fz);
+  double brushModel_combined_diff_N(double slip_angle, double Fz);
+
+  void integrNav(double dt);
+
+  void integrNavkinematictest(double dt);
+
+  void addToMPClog(double dtk);
+
+  void addToLog(double dt);
+
+  double analize_dt(double t);
+
+  void evalTireDissForces(double NmotF,double NmotR,double NBrkF,double NBrkR);
+  void analyseDissForces(double NmotF,double NmotR,double NBrkF,double NBrkR);
+
+  void treatSingularities();
+  std::vector<double> linearizatedSystem(double NmotF, double NmotR, double NBrkF, double NBrkR, double dt, int fl_dX = 1);
+  std::vector<double> updateState(double step, double dt, double NmotF, double NmotR, double NBrkF, double NBrkR, int fl_r, int fl_f, int fl = 0);
+  double updStep(double t0, double t1, double f0, double f1, double df0, double df1, bool &fl);
+
+  ImplSolverData solverDat;
+
+  void evWheel(double dt,double omW_0,double&omW, double Trq, int fl_Trq,double Iin);
+
+  void integrNavBase(double dt, double NmotF, double NmotR, double NBrkF, double NBrkR);
+  void integrNavBase_implicit(double dt, double NmotF, double NmotR, double NBrkF, double NBrkR);
+
+ public:
+  DynamicCar(Eigen::Vector3d init_navig);
+
+  DynamicCar(DynamicPar& params, double x, double y, double psi, double v = 0.0);
+
+  virtual ~DynamicCar();
+
+  int fl_first_call;
+  int fl_first_it;
+
+  double in_time;
+  double d_time;
+  int fl_fileDyn;
+
+  int fl_out;
+
+  double timeMPClog;
+  int fl_MPClog;
+
+//  std::ofstream fileDyn; // ++++++++++++++++++++++++++++++++ (!)
+
+//  std::ofstream fileDynPM;
+
+//  std::ofstream fileMPClog; // ++++++++++++++++++++++++++++++++ (!)
+
+
+  void dynamicNav_ev(double steer, double accel_des, double dt, int reverse_fl,
+                     double speed_des,double addFx = 0.0,double addFy = 0.0,
+                     double addN = 0.0);
+
+  void dynamicNav_ev_Base(double dt,double steer,double NmotF,double NmotR,double NBrkF,double NBrkR,double addFx = 0.0,double addFy = 0.0,
+          double addN = 0.0);
+
+  void dynamicNav_ev_Base_test(double steer, double accel_des, double dt,
+                                 int reverse_fl, double speed_des);
+
+  void init_nav(double x, double y, double psi, double v);
+  void reset_state();
+
+  int fl_reverse;
+  double fl_AccBrkMode;
+  double fl_AccBrk_fact;
+  //-----------------------------
+
+  void nav_to_cog(int fl_reverse);
+
+  void getAccBrkMode();
+  void getDrag_PM();
+
+  double brushModel_solver(double FY, int fl_forwardWheel, int& fl_OK);
+
+  double brushModel(double slip_angle, double Fz, double Ctyre);
+
+  void getLatSlip();
+
+  //-----------------------------
+
+  CulcParameters culc_par;
+  CarParameters car_par;
+
+  car_state_t car_state;
+
+  car_state_t car_state_0;
+
+   PM_data current_PM_data;
+};
+
+// /*
+#endif  // __cplusplus__
+
+// /*
+#ifdef __cplusplus
+extern "C" {
+#endif
+void initModel(double x, double y, double psi, double v);
+// void stepFunc(double steer, double accel_des, double dt, int reverse_fl,
+//               double speed_des, car_state_t* __dcar);
+void stepFunc1(double steer, double accel_des, double dt,
+                int reverse_fl, double speed_des, double X_init, double Y_init, double Psi_init, double Vx_init,
+                CarParameters *__params, int VehReset, car_state_t* __dcar);
+void myTerminateFunction();
+void mySetParamFunction(CarParameters *new_par);
+#ifdef __cplusplus
+};
+#endif
+// */ //==========================================
+
+#endif  // DYNCAR_BICYCLE_H
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Bicycle/dyncar_bycicle.cpp b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Bicycle/dyncar_bycicle.cpp
new file mode 100644
index 0000000..fff2b31
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Bicycle/dyncar_bycicle.cpp
@@ -0,0 +1,3803 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include <iostream>
+#include "dyncar_bicycle.h"
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//---/////////////////////////////////////////////////
+#ifdef MEX_DEBUG_PRINTF
+
+#include "mex.h"
+#include <stdio.h>
+class mystream : public std::streambuf
+{
+protected:
+	virtual std::streamsize xsputn(const char *s, std::streamsize n) { mexPrintf("%.*s", n, s); return n; }
+	virtual int overflow(int c = EOF) { if (c != EOF) { mexPrintf("%.1s", &c); } return 1; }
+};
+class scoped_redirect_cout
+{
+public:
+	scoped_redirect_cout() { old_buf = std::cout.rdbuf(); std::cout.rdbuf(&mout); }
+	~scoped_redirect_cout() { std::cout.rdbuf(old_buf); }
+private:
+	mystream mout;
+	std::streambuf *old_buf;
+};
+scoped_redirect_cout mycout_redirect;
+#endif // MEX_DEBUG_PRINTF
+
+//-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-//////////////////////////////////////////
+
+// DYNAMIC
+
+// CAR
+
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+DynamicCar::~DynamicCar() {}
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+DynamicCar::DynamicCar(Eigen::Vector3d init_navig) {
+
+fl_first_call = 1;
+fl_first_it = 1;
+  //==========================================
+
+  // Parameters of culculations
+  culc_par.fl_drag_taking = 1;
+  culc_par.fl_Long_Circ = 3;
+  culc_par.fl_static_load = 0;
+  culc_par.fl_RunKut = 0;
+  culc_par.nsteps = 1000;
+  culc_par.fl_act_low = 2;
+  culc_par.implicit_solver = 0;
+  culc_par.num_impl_nonlin_it = 4;
+  culc_par.corr_impl_step = 0;
+  //----------------------------------------
+  // default kinematic and dynamic parameters
+  car_par.a = 1.73;
+  car_par.b = 1.168;  // 1.35;
+  car_par.L = car_par.a + car_par.b;
+  car_par.max_steer = 22.0 * M_PI / 180.0;  // 52.0*M_PI/180.0;
+
+  //-----------------------------
+  car_par.mu = 1.0;
+  car_par.max_accel = 8.0;  // 50.0
+  car_par.CGvert = 0.4;
+  car_par.mass = 1196.0;
+  car_par.moment_inertia = 1260.0;
+
+  //------------------------------------
+  car_par.Cy_f = 226000.0;
+  car_par.Cy_r = 240000.0;
+  car_par.Cx_f = 376000.0;
+  car_par.Cx_r = 284000.0;
+
+  //------------------------------------
+  car_par.drive_distrib = 0.0;  // 0.5 = AWD, 1.0 = FWD, 0.0 = RWD
+  car_par.frontWheelRad = 0.31;
+  car_par.rearWheelRad = 0.35;
+  car_par.maxPowerEngine = 135000.0;
+  car_par.maxTorqueEngine = 200.0 * 6.25;
+  car_par.n_engines = 2.0;
+  car_par.Om_maxTorque = 192.68;
+  car_par.Om_nullTorque = 201.06;
+  //
+  car_par.maxBrakePressure = 60.0;
+  car_par.maxGradBrakePressure = 250.0;
+  car_par.kBrake_f = 70.0;
+  car_par.kBrake_r = 70.0;
+  car_par.n_brakes = 1.0;
+  car_par.maxGradSteer = 8.22;
+
+  //------------------------------------
+  car_par.rollingResistance = 600.0;
+  car_par.rollingResistanceSpeedDepended = 0.0;
+  car_par.Cxx = 1.0;
+
+  //-----------------------------------------------
+
+  car_par.fWIn = 1.42;
+  car_par.rWIn = 2.06;
+
+
+  //-----------------------------------------------
+  // initial state ------------------------------//
+
+  fl_reverse = 0;
+
+  car_state.state = 0;
+
+  car_state.xc = init_navig(0);
+  car_state.yc = init_navig(1);
+  car_state.psi = init_navig(2);
+
+  nav_to_cog(0);
+
+  car_state.Vx = 0.0;
+  car_state.Vy = 0.0;
+  car_state.Om = 0.0;
+
+  car_state.accel = 0.0;
+  car_state.Vdes = 0.0;
+
+  car_state.steer_alpha = 0.0;
+  car_state.steer_alpha_req = 0.0;
+
+  car_state.dVxdt = 0.0;
+  car_state.dVydt =  0.0;
+  car_state.dOmdt =  0.0;
+
+  car_state.slipAng_f = 0.0;
+  car_state.slipAng_r = 0.0;
+
+
+  car_state.Nr = 9.89*car_par.mass*car_par.a/car_par.L;
+  car_state.Nf = 9.89*car_par.mass*car_par.b/car_par.L;
+
+  car_state.FYf = 0.0;
+  car_state.FYr = 0.0;
+
+  car_state.FXf = 0.0;
+  car_state.FXr = 0.0;
+
+  car_state.FXf_req = 0.0;
+  car_state.FXr_req = 0.0;
+
+  car_state.B_pressure = 0.0;
+  car_state.B_pressure_req = 0.0;
+
+  car_state.Nbrake_f = 0.0;
+  car_state.Nbrake_r = 0.0;
+  car_state.Nmot_f = 0.0;
+  car_state.Nmot_r = 0.0;
+
+  car_state.addedFx = 0.0;
+  car_state.addedFy = 0.0;
+  car_state.addedN = 0.0;
+
+  car_state.OmWf = 0.0;
+  car_state.OmWr = 0.0;
+
+  car_state.evTrqW_f = 0.0;
+  car_state.evTrqW_r = 0.0;
+
+  car_state.flDW_f = 1;
+  car_state.flDW_r = 1;
+
+  car_state.long_slip_f = 0.0;
+  car_state.long_slip_r = 0.0;
+
+  car_state.initialized = 0;
+  car_state.callcount = 0;
+  //===================================================
+
+  //------------------------------------
+
+  fl_out = 0;
+
+  fl_fileDyn = 0;
+
+  in_time = 0.0;
+  d_time = 0.0;
+
+  fl_MPClog = 0;
+
+  timeMPClog = 0.0;
+}
+
+//--------------------------------------------------------------------------------------
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+DynamicCar::DynamicCar(DynamicPar& params, double x, double y, double psi, double v) {
+
+
+  fl_first_call = 1;
+  //==========================================
+
+  culc_par = params.culc_par;
+  car_par = params.car_par;
+
+  //-----------------------------------------------
+  // initial state ------------------------------//
+
+  fl_reverse = 0;
+
+  car_state.state = 0;
+
+  //car_state.xc = init_navig(0);
+  //car_state.yc = init_navig(1);
+  //car_state.psi = init_navig(2);
+  //nav_to_cog(0);
+
+  car_state.Vx = 0.0;
+  car_state.Vy = 0.0;
+  car_state.Om = 0.0;
+
+  car_state.accel = 0.0;
+  car_state.Vdes = 0.0;
+
+  car_state.steer_alpha = 0.0;
+  car_state.steer_alpha_req = 0.0;
+
+  car_state.dVxdt = 0.0;
+  car_state.dVydt =  0.0;
+  car_state.dOmdt =  0.0;
+
+  car_state.Nr = 9.89*car_par.mass*car_par.a/car_par.L;
+  car_state.Nf = 9.89*car_par.mass*car_par.b/car_par.L;
+
+  car_state.slipAng_f = 0.0;
+  car_state.slipAng_r = 0.0;
+
+  car_state.FYf = 0.0;
+  car_state.FYr = 0.0;
+
+  car_state.FXf = 0.0;
+  car_state.FXr = 0.0;
+
+  car_state.FXf_req = 0.0;
+  car_state.FXr_req = 0.0;
+
+  car_state.B_pressure = 0.0;
+  car_state.B_pressure_req = 0.0;
+
+  car_state.Nbrake_f = 0.0;
+  car_state.Nbrake_r = 0.0;
+  car_state.Nmot_f = 0.0;
+  car_state.Nmot_r = 0.0;
+
+  car_state.addedFx = 0.0;
+  car_state.addedFy = 0.0;
+  car_state.addedN = 0.0;
+
+  car_state.OmWf = 0.0;
+  car_state.OmWr = 0.0;
+
+  car_state.evTrqW_f = 0.0;
+  car_state.evTrqW_r = 0.0;
+
+  car_state.flDW_f = 1;
+  car_state.flDW_r = 1;
+
+  car_state.long_slip_f = 0.0;
+  car_state.long_slip_r = 0.0;
+
+  car_state.initialized = 1;
+  car_state.callcount = 0;
+  //===================================================
+  init_nav(x, y, psi, v);
+  //------------------------------------
+
+  fl_out = 0;
+
+  fl_fileDyn = 0;
+
+  in_time = 0.0;
+  d_time = 0.0;
+
+  fl_MPClog = 0;
+
+  timeMPClog = 0.0;
+}
+
+//--------------------------------------------------------------------------------------
+
+//-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+//-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//+++++++++++++++++
+void DynamicCar::newFXreq() {
+  if (fabs(car_state.accel) < 0.00001) car_state.accel = 0.0;
+
+  if (fabs(car_state.accel) > car_par.max_accel)
+    car_state.accel =
+        car_par.max_accel * (car_state.accel / fabs(car_state.accel));
+
+  car_state.FXreq = car_par.mass * car_state.accel;
+
+  // FXreq being force which one requests from car
+
+  if ((fl_AccBrkMode > 0) || (culc_par.fl_act_low < 2)) {
+    if (car_par.drive_distrib < 0.0) car_par.drive_distrib = 0.0;
+
+    if (fabs(car_par.drive_distrib) > 1.0) car_par.drive_distrib = 1.0;
+
+    if (car_par.drive_distrib < 0.01) {
+      car_state.FXr_act = car_state.FXreq;
+      car_state.FXf_act = 0.0;
+
+    } else if (car_par.drive_distrib > 0.99) {
+      car_state.FXf_act = car_state.FXreq;
+      car_state.FXr_act = 0.0;
+    } else {
+      car_state.FXf_act = car_par.drive_distrib * car_state.FXreq;
+      car_state.FXr_act = (1.0 - car_par.drive_distrib) * car_state.FXreq;
+    }
+
+    car_state.B_pressure_req = 0.0;
+  } else {
+    car_state.FXf_act = 0.0;
+    car_state.FXr_act = 0.0;
+
+    car_state.B_pressure_req = (fabs(car_state.FXreq) / car_par.n_brakes) /
+                               ((car_par.kBrake_f / car_par.frontWheelRad) +
+                                (car_par.kBrake_r / car_par.rearWheelRad));
+
+    if (car_state.B_pressure_req > car_par.maxBrakePressure)
+      car_state.B_pressure_req = car_par.maxBrakePressure;
+  }
+}
+//-----------------------------------------------------------------------------------------
+//-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//+++++++++++++++++
+
+void DynamicCar::getDrag() {
+  car_state.Fdrag = 0.0;
+
+  if (culc_par.fl_drag_taking > 0) {
+    car_state.Fdrag =
+                car_par.Cxx * car_state.Vx * car_state.Vx;
+
+    if (car_state.Vx < 0.0) car_state.Fdrag *= -1.0;
+  }
+}
+
+//-----------------------------------------------------------------------------------------
+
+//-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//+++++++++++++++++
+
+void DynamicCar::getDrag_PM() {
+  car_state.Fdrag_PM = 0.0;
+
+  return;
+
+  // turn resistance   //-----------------------------------------
+
+  double acc_turn =
+      (car_par.b / car_par.L) * car_state.Vdes * (car_state.Vdes / car_par.L) *
+      tan(car_state.steer_alpha_req) * sin(car_state.steer_alpha_req);
+
+  if (fl_reverse > 0) acc_turn *= -1.0;
+
+  car_state.accel += acc_turn;
+
+  if (culc_par.fl_drag_taking > 0) {
+    car_state.Fdrag_PM =
+        car_par.rollingResistance +
+        car_par.rollingResistanceSpeedDepended * fabs(car_state.Vdes) +
+        car_par.Cxx * car_state.Vdes * car_state.Vdes;
+
+    if (fl_reverse > 0) car_state.Fdrag_PM *= -1.0;
+
+    car_state.accel += (car_state.Fdrag_PM / car_par.mass);
+
+    // one has to take into account different behaviours of Fdrag in the cases
+    // of acceleration and braking. !! Fdrag_PM is usually culculated by PM.
+    // Here is located such evaluation. After Fdrag_PM having evaluated the
+    // car_state.accel should be corrected
+  }
+}
+//-----------------------------------------------------------------------------------------
+
+//-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//+++++++++++++++++
+void DynamicCar::getVerticalLoads() {
+
+    double Trq_tyres = (car_state.FXr + car_state.addedFx +
+                        car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha))*car_par.CGvert;
+    double weight = 9.89*car_par.mass;
+
+    if(culc_par.fl_static_load > 0)
+        Trq_tyres = 0.0;
+    else if (culc_par.fl_static_load < 0)
+        Trq_tyres = car_state.dVxdt*car_par.mass*car_par.CGvert;
+
+    car_state.Nr = (weight*car_par.a + Trq_tyres)/car_par.L;
+
+    if(car_state.Nr <= 0.0)
+        car_state.Nr = 0.001;
+
+    car_state.Nf = (weight*car_par.b - Trq_tyres)/car_par.L;
+
+    if(car_state.Nf <= 0.0)
+        car_state.Nf = 0.001;
+}
+
+//-----------------------------------------------------------------------------------------
+
+//-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//+++++++++++++++++
+void DynamicCar::evolutionControl(double dt) {
+    if (fabs(car_state.steer_alpha_req) >= car_par.max_steer)
+      car_state.steer_alpha_req =
+          (car_par.max_steer - 0.00001) *
+          (car_state.steer_alpha_req / fabs(car_state.steer_alpha_req));
+
+    car_state.FXf_req = car_state.FXf_act;
+
+    car_state.FXr_req = car_state.FXr_act;
+
+    double Fbrake_f = 0.0;
+
+    double Fbrake_r = 0.0;
+
+
+    if (culc_par.fl_act_low < 1) {  // For simplifying
+
+      car_state.steer_alpha = car_state.steer_alpha_req;
+
+    } else {
+      double steer_change = car_par.maxGradSteer * dt;
+
+      if((culc_par.fl_RunKut > 0)&&(car_state.state == 0))
+          steer_change = 0.0;
+
+      if (fabs(car_state.steer_alpha_req - car_state.steer_alpha) <= steer_change)
+        car_state.steer_alpha = car_state.steer_alpha_req;
+      else {
+        double dir_ch = 1.0;
+
+        if (car_state.steer_alpha > car_state.steer_alpha_req) dir_ch = -1.0;
+
+        car_state.steer_alpha += steer_change * dir_ch;
+      }
+
+      if (culc_par.fl_act_low > 1) {
+        double press_change = car_par.maxGradBrakePressure * dt;
+
+        if (fabs(car_state.B_pressure_req - car_state.B_pressure) <= press_change)
+          car_state.B_pressure = car_state.B_pressure_req;
+        else {
+          double dir_ch = 1.0;
+
+          if (car_state.B_pressure > car_state.B_pressure_req) dir_ch = -1.0;
+
+          car_state.B_pressure += press_change * dir_ch;
+        }
+
+        Fbrake_f = car_par.n_brakes * car_state.B_pressure *
+                          car_par.kBrake_f / car_par.frontWheelRad;
+        Fbrake_r = car_par.n_brakes * car_state.B_pressure *
+                          car_par.kBrake_r / car_par.rearWheelRad;
+
+
+
+   //     if (fl_reverse < 1) {
+   //       Fbrake_f *= -1.0;
+  //        Fbrake_r *= -1.0;
+  //      }
+
+        if (fl_AccBrkMode > 0) {
+          // rear engine
+
+          double Fmax =
+              car_par.n_engines * car_par.maxTorqueEngine / car_par.rearWheelRad;
+
+          if (fabs(car_state.FXr_act) > Fmax)
+            car_state.FXr_req =
+                car_state.FXr_act * Fmax / fabs(car_state.FXr_act);
+
+          double VWheel = fabs(car_state.Vx);
+
+          double Power_req = fabs(car_state.FXr_req) * VWheel;
+
+          if (Power_req > car_par.n_engines * car_par.maxPowerEngine)
+            car_state.FXr_req =
+                car_state.FXr_req *
+                (car_par.n_engines * car_par.maxPowerEngine / Power_req);
+
+          // engine curve
+          double OmWheel = VWheel / car_par.rearWheelRad;
+
+          if (OmWheel >= car_par.Om_nullTorque) {
+            //          std::cout << "-> FXr_req:" << car_state.FXr_req //
+            //                    << "-> OmWheel:" << OmWheel //
+            //                    << "-> Om_nullTorque:" << car_par.Om_nullTorque
+            //                    //
+            //                    << std::endl;
+            car_state.FXr_req = 0.0;
+        //    std::cout << "-> FXr_req:" << car_state.FXr_req << std::endl;
+          } else if (OmWheel > car_par.Om_maxTorque) {
+            double F1 = car_par.n_engines * car_par.maxPowerEngine /
+                        (car_par.Om_maxTorque * car_par.rearWheelRad);
+
+            Fmax = F1 * (car_par.Om_nullTorque - OmWheel) /
+                   (car_par.Om_nullTorque - car_par.Om_maxTorque);
+
+            if (fabs(car_state.FXr_req) > Fmax) {
+              if (car_state.FXr_req < 0.0)
+                car_state.FXr_req = (-1.0) * Fmax;
+              else
+                car_state.FXr_req = Fmax;
+            }
+          }
+
+          // front engine
+
+          Fmax =
+              car_par.n_engines * car_par.maxTorqueEngine / car_par.frontWheelRad;
+
+          if (fabs(car_state.FXf_act) > Fmax)
+            car_state.FXf_req =
+                car_state.FXf_act * Fmax / fabs(car_state.FXf_act);
+
+          VWheel = fabs(car_state.Vx / cos(car_state.steer_alpha));
+
+          Power_req = fabs(car_state.FXf_req) * VWheel;
+
+          if (Power_req > car_par.n_engines * car_par.maxPowerEngine)
+            car_state.FXf_req =
+                car_state.FXf_req *
+                (car_par.n_engines * car_par.maxPowerEngine / Power_req);
+
+          // engine curve
+          OmWheel = VWheel / car_par.frontWheelRad;
+
+          if (OmWheel >= car_par.Om_nullTorque)
+            car_state.FXf_req = 0.0;
+          else if (OmWheel > car_par.Om_maxTorque) {
+            double F1 = car_par.n_engines * car_par.maxPowerEngine /
+                        (car_par.Om_maxTorque * car_par.frontWheelRad);
+
+            Fmax = F1 * (car_par.Om_nullTorque - OmWheel) /
+                   (car_par.Om_nullTorque - car_par.Om_maxTorque);
+
+            if (fabs(car_state.FXf_req) > Fmax) {
+              if (car_state.FXf_req < 0.0)
+                car_state.FXf_req = (-1.0) * Fmax;
+              else
+                car_state.FXf_req = Fmax;
+            }
+          }
+        }
+
+    //    car_state.FXf_req += Fbrake_f;
+    //    car_state.FXr_req += Fbrake_r;
+      }
+    }
+
+
+    car_state.Nbrake_f = Fbrake_f*car_par.frontWheelRad;
+    car_state.Nbrake_r = Fbrake_r*car_par.rearWheelRad;
+
+    car_state.Nmot_f = car_state.FXf_req*car_par.frontWheelRad;
+    car_state.Nmot_r = car_state.FXr_req*car_par.rearWheelRad;
+
+
+
+    double drFrc_f = car_par.rollingResistance*car_par.drive_distrib;
+    double drFrc_r = car_par.rollingResistance*(1.0 - car_par.drive_distrib);
+
+    if(culc_par.fl_drag_taking == 0){
+
+        drFrc_f = 0.0;
+        drFrc_r = 0.0;
+
+
+    }
+
+
+    Fbrake_f += drFrc_f;
+    Fbrake_r += drFrc_r;
+
+    if(car_state.state == 0){
+
+
+       if(fabs(car_state.FXf_req + car_state.FXr_req) - Fbrake_f - Fbrake_r > 1.0){
+
+
+          if(fl_reverse < 1){
+
+              Fbrake_f *= -1.0;
+              Fbrake_r *= -1.0;
+          }
+
+          car_state.FXf_req += Fbrake_f;
+          car_state.FXr_req += Fbrake_r;
+
+          car_state.state = 1;
+          fl_AccBrk_fact = 1.0;
+
+       }
+       else
+         fl_AccBrk_fact = -1.0;
+
+
+    }
+    else{
+
+            if(fabs(car_state.FXf_req + car_state.FXr_req) - Fbrake_f - Fbrake_r > 0.0)
+              fl_AccBrk_fact = 1.0;
+            else
+              fl_AccBrk_fact = -1.0;
+
+
+
+            if(culc_par.fl_Long_Circ < 2){
+
+               car_state.OmWr = car_state.Vx/car_par.rearWheelRad;
+
+               double Vxf = car_state.Vx;
+               double Vyf = car_state.Vy + car_state.Om * car_par.a;
+
+               double cs = cos(car_state.steer_alpha);
+               double sn = sin(car_state.steer_alpha);
+
+               double Vxw = Vxf * cs + Vyf * sn;
+               double Vyw = Vyf * cs - Vxf * sn;
+
+               car_state.OmWf = Vxw/car_par.frontWheelRad;
+
+            }
+
+            double fct_br_f = 1.0;
+
+            double fct_br_r = 1.0;
+
+            if(fl_reverse == 0){
+
+
+                fct_br_f = -1.0;
+                fct_br_r = -1.0;
+
+                if(car_state.OmWf < 0.0)
+                 fct_br_f = 1.0;
+
+
+                if(car_state.OmWr < 0.0)
+                 fct_br_r = 1.0;
+
+            }
+            else{
+
+                if(car_state.OmWf > 0.0)
+                 fct_br_f = -1.0;
+
+
+                if(car_state.OmWr > 0.0)
+                 fct_br_r = -1.0;
+
+            }
+
+            Fbrake_f *= fct_br_f;
+            Fbrake_r *= fct_br_r;
+
+            car_state.FXf_req += Fbrake_f;
+            car_state.FXr_req += Fbrake_r;
+
+
+
+    }
+
+
+
+}
+
+//-----------------------------------------------------------------------------------------
+
+//-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//+++++++++++++++++
+
+void DynamicCar::newLongForce() {
+  // verical force distribution:
+
+  getVerticalLoads();
+
+  // tyre force distribution:
+
+  // REAR:
+
+  double FXBound_r = car_par.mu * car_state.Nr;
+
+  if (culc_par.fl_Long_Circ < 0) {
+    if (fabs(car_state.FYr) >= FXBound_r)
+      FXBound_r = 0.0;
+    else
+      FXBound_r = sqrt(FXBound_r * FXBound_r - car_state.FYr * car_state.FYr);
+  }
+
+  if (fabs(car_state.FXr_req) < 0.001)
+    car_state.FXr = 0.0;
+  else if(culc_par.fl_Long_Circ <= 0){
+
+    if (fabs(car_state.FXr_req) > FXBound_r) {
+      car_state.FXr = FXBound_r;
+
+      if (car_state.FXr_req < 0.0) car_state.FXr = (-1.0) * car_state.FXr;
+
+    } else
+      car_state.FXr = car_state.FXr_req;
+  }
+  else car_state.FXr = car_state.FXr_req;
+
+  // FORWARD:
+
+  double FXBound_f = car_par.mu * car_state.Nf;
+
+  if (culc_par.fl_Long_Circ < 0) {
+    if (fabs(car_state.FYf) >= FXBound_f)
+      FXBound_f = 0.0;
+    else
+      FXBound_f = sqrt(FXBound_f * FXBound_f - car_state.FYf * car_state.FYf);
+  }
+
+  if (fabs(car_state.FXf_req) < 0.001)
+    car_state.FXf = 0.0;
+  else if(culc_par.fl_Long_Circ <= 0){
+    if (fabs(car_state.FXf_req) > FXBound_f) {
+      car_state.FXf = FXBound_f;
+
+      if (car_state.FXf_req < 0.0) car_state.FXf = (-1.0) * car_state.FXf;
+    } else
+      car_state.FXf = car_state.FXf_req;
+  }
+  else car_state.FXf = car_state.FXf_req;
+
+}
+//--------------------------------------------------------------------------------------------------------------------
+
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::newLatForce() {
+  getLatSlip();
+  getVerticalLoads();
+
+  // FORWARD
+
+  car_state.FYf_req =
+      brushModel(car_state.slipAng_f, car_state.Nf, car_par.Cy_f);
+
+  if (culc_par.fl_Long_Circ < 0) {
+    double FBound = car_par.mu * car_state.Nf;
+
+    if (fabs(car_state.FXf) >= FBound)
+      FBound = 0.0;
+    else
+      FBound = sqrt(FBound * FBound - car_state.FXf * car_state.FXf);
+
+    if (fabs(car_state.FYf_req) > FBound) {
+      car_state.FYf = FBound;
+
+      if (car_state.FYf_req < 0.0) car_state.FYf = (-1.0) * FBound;
+    } else
+      car_state.FYf = car_state.FYf_req;
+  } else
+    car_state.FYf = car_state.FYf_req;
+
+  // REAR
+
+  car_state.FYr_req =
+      brushModel(car_state.slipAng_r, car_state.Nr, car_par.Cy_r);
+
+  if (culc_par.fl_Long_Circ < 0) {
+    double FBound = car_par.mu * car_state.Nr;
+
+    if (fabs(car_state.FXr) >= FBound)
+      FBound = 0.0;
+    else
+      FBound = sqrt(FBound * FBound - car_state.FXr * car_state.FXr);
+
+    if (fabs(car_state.FYr_req) > FBound) {
+      car_state.FYr = FBound;
+
+      if (car_state.FYr_req < 0.0) car_state.FYr = (-1.0) * FBound;
+    } else
+      car_state.FYr = car_state.FYr_req;
+  } else
+    car_state.FYr = car_state.FYr_req;
+
+}
+
+//--------------------------------------------------------------------------------------------------------------------
+
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::getLatSlip() {
+  // Rear:
+
+  double Vxr = car_state.Vx;
+  double Vyr = car_state.Vy - car_state.Om * car_par.b;
+
+  if (Vxr < 0.0) Vxr = (-1.0) * Vxr;
+
+  car_state.slipAng_r = atan2(Vyr, Vxr);
+
+ // if (Vxr < 0.001) car_state.slipAng_r = 0.0;
+
+  double Vxf = car_state.Vx;
+  double Vyf = car_state.Vy + car_state.Om * car_par.a;
+
+  double cs = cos(car_state.steer_alpha);
+  double sn = sin(car_state.steer_alpha);
+
+  double Vxw = Vxf * cs + Vyf * sn;
+  double Vyw = Vyf * cs - Vxf * sn;
+
+  if (Vxw < 0.0) Vxw = (-1.0) * Vxw;
+
+  car_state.slipAng_f = atan2(Vyw, Vxw);
+
+ // if (Vxw < 0.001) car_state.slipAng_f = 0.0;
+}
+
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+double DynamicCar::brushModel_solver(double FY, int fl_forwardWheel,
+                                     int& fl_OK) {
+  // TO DO: It should be changed to lookup-table;
+
+  double Fslip = fabs(FY);
+
+  double Ctyre = car_par.Cy_f;
+
+  double Fz = car_par.mass * 9.89 / car_par.L;
+
+  if (fl_forwardWheel > 0) {
+    Fz = Fz * car_par.b;
+
+  } else {
+    Ctyre = car_par.Cy_r;
+    Fz = Fz * car_par.a;
+  }
+
+  fl_OK = 1.0;
+
+  double alpha_slide = car_par.mu * ((3.0 * Fz) / Ctyre);
+
+  double slip = 0.0;
+
+  if (Fslip >= car_par.mu * Fz) {
+    slip = alpha_slide;
+
+    if (FY > 0) slip = slip * (-1.0);
+
+    return slip;
+  }
+
+  if (Fslip <= Ctyre * 0.0001)
+    slip = Fslip / Ctyre;
+  else {
+    slip = alpha_slide * 0.5;
+
+    int iter = 0;
+
+    do {
+      iter++;
+
+      fl_OK = iter;
+
+      double F = -brushModel(slip, Fz, Ctyre) - Fslip;
+
+      if (fabs(F) < 1.0) break;
+
+      if (iter > 8) {
+        fl_OK = 0;
+        break;
+      }
+
+      if (true)
+        if (slip > 0.98 * alpha_slide) {
+          if (F < 0.0) {
+            double F1 =
+                -brushModel(slip + 0.5 * (alpha_slide - slip), Fz, Ctyre) -
+                Fslip;
+
+            if (fabs(F1) < fabs(F)) slip += 0.5 * (alpha_slide - slip);
+
+            break;
+
+          } else {
+            slip = 0.98 * alpha_slide;
+          }
+        }
+
+      double slip_rel = slip / alpha_slide;
+
+      double dF = Ctyre * (1.0 - 2.0 * slip_rel + slip_rel * slip_rel);
+
+      slip += -F / dF;
+
+      if (slip < 0.0) slip = 0.0;
+
+      if (slip >= alpha_slide) slip = 0.99 * alpha_slide;
+
+    } while (true);
+  }
+
+  if (FY > 0) slip = slip * (-1.0);
+
+  return slip;
+}
+//-------------------------------------------------------------------------------------------------------------------
+
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+double DynamicCar::brushModel(double slip_angle, double Fz, double Ctyre) {
+  double Fslip = 0.0;
+
+  double alpha_slide = car_par.mu * ((3.0 * Fz) / Ctyre);
+
+  if (fabs(slip_angle) >= alpha_slide) {
+    Fslip = car_par.mu * Fz;
+
+    if (slip_angle > 0.0) Fslip = Fslip * (-1.0);
+
+  } else {
+    double tal = tan(slip_angle);
+    double slip_rel = fabs(tal) / alpha_slide;
+
+    Fslip = -Ctyre * tal * (1.0 - slip_rel + (1.0 / 3.0) * slip_rel * slip_rel);
+  }
+
+  return Fslip;
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+double DynamicCar::brushModel_combined(double slip_angle, double Fz) {
+  double Fslip = 0.0;
+
+  double alpha_slide = car_par.mu * (3.0 * Fz);
+
+  if (fabs(slip_angle) >= alpha_slide) {
+    Fslip = car_par.mu * Fz;
+
+  } else {
+    double slip_rel = fabs(slip_angle) / alpha_slide;
+
+    Fslip = slip_angle * (1.0 - slip_rel + (1.0 / 3.0) * slip_rel * slip_rel);
+  }
+
+  return Fslip;
+}
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+double DynamicCar::brushModel_combined_diff_N(double slip_angle, double Fz) {
+  double dFslip = 0.0;
+
+  double alpha_slide = car_par.mu * (3.0 * Fz);
+
+  if (fabs(slip_angle) < alpha_slide) {
+
+    double slip_rel = fabs(slip_angle) / alpha_slide;
+    double slip_rel2 = slip_rel*slip_rel;
+    double slip_rel3 = slip_rel2*slip_rel;
+
+    dFslip = 3.0*car_par.mu* (slip_rel2 - (2.0 / 3.0) * slip_rel3);
+  }
+  else
+    dFslip = car_par.mu;
+
+  return dFslip;
+}
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+double DynamicCar::brushModel_combined_diff(double slip_angle, double Fz) {
+  double dFslip = 0.0;
+
+  double alpha_slide = car_par.mu * (3.0 * Fz);
+
+
+  if (fabs(slip_angle) < alpha_slide)
+  {
+    double slip_rel = fabs(slip_angle) / alpha_slide;
+
+    dFslip = (1.0 - 2.0*slip_rel + slip_rel * slip_rel);
+  }
+
+  return dFslip;
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::combinedSlip() {
+  if (culc_par.fl_Long_Circ < 2) {
+    newLatForce();   //
+    newLongForce();  // Here Longitude and Lateral tyre forces being evaluated;
+    // these functions use (or don't use) cyrcle of tyre force (rough model).
+
+    if(culc_par.fl_Long_Circ == 1){
+
+        double f_r = sqrt(car_state.FXr*car_state.FXr + car_state.FYr*car_state.FYr);
+
+        double fmax_r = car_state.Nr*car_par.mu;
+
+        if(f_r > fmax_r){
+
+            double df = fmax_r/f_r;
+
+            car_state.FXr *= df;
+            car_state.FYr *= df;
+        }
+
+        double f_f = sqrt(car_state.FXf*car_state.FXf + car_state.FYf*car_state.FYf);
+        double fmax_f = car_state.Nf*car_par.mu;
+
+        if(f_f > fmax_f){
+
+             double df = fmax_f/f_f;
+
+             car_state.FXf *= df;
+             car_state.FYf *= df;
+        }
+    }
+
+  } else {
+    getVerticalLoads();
+
+    double Vxr = car_state.Vx;
+    double WVr = car_state.OmWr * car_par.rearWheelRad;
+    double Vyr = car_state.Vy - car_state.Om * car_par.b;
+
+    if (culc_par.fl_Long_Circ < 3)
+      if ((car_par.drive_distrib > 0.99) && (fl_AccBrkMode > 0)) {
+        WVr = Vxr;
+        car_state.OmWr = Vxr / car_par.rearWheelRad;
+      }
+
+    double DWr = WVr - Vxr;
+
+    double normK_r = fabs(WVr) + 0.0001;
+
+    car_state.long_slip_r = DWr / normK_r;
+
+    if (Vxr < 0.0) Vxr = (-1.0) * Vxr;
+
+    car_state.slipAng_r = atan2(Vyr, Vxr);
+
+    double sig_xr = car_par.Cx_r * car_state.long_slip_r;
+    double sig_yr = -car_par.Cy_r * Vyr / normK_r;
+
+    double gama_r = sqrt(sig_xr * sig_xr + sig_yr * sig_yr);
+
+    double Fslip_r = brushModel_combined(gama_r, car_state.Nr);
+
+    car_state.FXr = (sig_xr / (gama_r + 0.0001)) * Fslip_r;
+    car_state.FYr = (sig_yr / (gama_r + 0.0001)) * Fslip_r;
+
+    double Vxf = car_state.Vx;
+    double Vyf = car_state.Vy + car_state.Om * car_par.a;
+
+    double cs = cos(car_state.steer_alpha);
+    double sn = sin(car_state.steer_alpha);
+
+    double Vxw = Vxf * cs + Vyf * sn;
+    double Vyw = Vyf * cs - Vxf * sn;
+
+    double WVf = car_state.OmWf * car_par.frontWheelRad;
+
+    if (culc_par.fl_Long_Circ < 3)
+      if ((car_par.drive_distrib < 0.01) && (fl_AccBrkMode > 0)) {
+        WVf = Vxw;
+        car_state.OmWf = Vxw / car_par.frontWheelRad;
+      }
+
+    double DWf = WVf - Vxw;
+
+    double normK_f = fabs(WVf) + 0.0001;
+
+    car_state.long_slip_f = DWf / normK_f;
+
+    if (Vxw < 0.0) Vxw = (-1.0) * Vxw;
+
+    car_state.slipAng_f = atan2(Vyw, Vxw);
+
+    double sig_xf = car_par.Cx_f * car_state.long_slip_f;
+    double sig_yf = -car_par.Cy_f * Vyw / normK_f;
+
+    double gama_f = sqrt(sig_xf * sig_xf + sig_yf * sig_yf);
+
+    double Fslip_f = brushModel_combined(gama_f, car_state.Nf);
+
+    car_state.FXf = (sig_xf / (gama_f + 0.0001)) * Fslip_f;
+    car_state.FYf = (sig_yf / (gama_f + 0.0001)) * Fslip_f;
+  }
+
+
+}
+
+//---------------------------------------------------------------------
+
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+
+void DynamicCar::getAccBrkMode() {
+  fl_AccBrkMode = 1.0;  // acceleration mode; -1.0 - braking mode
+  fl_AccBrk_fact = 1.0;
+
+  if (fabs(car_state.accel) < 0.00001) return;
+
+  double fl = 1000.0;
+
+  if (fl_reverse > 0) fl = -1000.0;
+
+  if (fl * car_state.accel < 0.0) fl_AccBrkMode = -1.0;
+
+  fl_AccBrk_fact = fl_AccBrkMode;
+}
+//---------------------------------------------------------------------
+//-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////
+void DynamicCar::addToMPClog(double dtk) {
+
+  //combinedSlip();
+
+#if 0
+     fileMPClog << timeMPClog
+                << "     "
+                << car_state.steer_alpha << "  "
+                << car_state.FXf_req << "  " << car_state.FXr_req << "  "
+                << car_state.Vx << "  " << car_state.Vy << "  " <<
+                car_state.Om << "  " << car_state.x << "  " << car_state.y <<
+                "  "<< car_state.psi << "  "
+                << car_state.OmWf << "  " << car_state.OmWr << "  " <<
+                car_state.dVxdt << "  " << car_state.dVydt << "  " <<
+                car_state.dOmdt << "  "
+                << car_state.Vx*cos(car_state.psi) -
+                car_state.Vy*sin(car_state.psi) << "  "
+                << car_state.Vx*sin(car_state.psi) +
+                car_state.Vy*cos(car_state.psi) << "  "
+                << car_state.Om << "  "
+                << car_state.dOmWfdt << "  " << car_state.dOmWrdt << "  "
+                << std::endl;
+#endif
+
+  timeMPClog += dtk;
+}
+//---------------------------------------------------------------------
+//-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////
+void DynamicCar::addToLog(double dt) {
+
+  in_time += dt;
+  d_time += dt;
+
+#if 0
+   if(d_time >= 0.01){
+
+       double FY = (1.0/car_par.L)*car_par.mass*car_state.Vx*car_state.Om;
+
+       double FYr_st = car_par.a*FY;
+       double FYf_st = car_par.b*FY;
+
+       int flOKr = 1;
+       double al_r = brushModel_solver(FYr_st,0,flOKr);
+       if(flOKr < 1)
+           al_r = 0.0;
+
+       int flOKf = 1;
+       double al_f = brushModel_solver(FYf_st,1,flOKf);
+       if(flOKf < 1)
+           al_f = 0.0;
+
+       double Vdes = car_state.Vdes;
+
+       if(fl_reverse > 0)
+           Vdes = -Vdes;
+
+
+
+      fileDyn << in_time << "      " << (180.0/M_PI)*car_state.Om
+              //<< "   " <<   (180.0/M_PI)*(tan(car_state.steer_alpha +car_state.slipAng_f) - tan(car_state.slipAng_r))*car_state.Vx/car_par.L
+              << "   " <<   (180.0/M_PI)*(tan(car_state.steer_alpha + al_f) - tan(al_r))*car_state.Vx/car_par.L
+              << "   " <<(180.0/M_PI)*tan(car_state.steer_alpha)*car_state.Vx/car_par.L
+              << "      "
+              << car_state.slipAng_r*(180.0/M_PI) << "   " <<  al_r*(180.0/M_PI)
+              << "      "
+              << car_state.slipAng_f*(180.0/M_PI) << "   " <<  al_f*(180.0/M_PI)
+              << "      "
+              << car_state.steer_alpha*(180.0/M_PI) << "   " << car_state.steer_alpha_req*(180.0/M_PI)
+              << "      "
+              << car_state.Vx << "   " << Vdes << "     "
+              << car_state.x << "   " << car_state.y << "   " << car_state.psi
+              << "      " << car_state.Vy << "   " << car_state.Vx*(car_par.b*tan(car_state.steer_alpha)/car_par.L + tan(al_r))
+              << "      " << (180.0/M_PI)*atan2(car_state.Vy,car_state.Vx) << "   "
+              << (180.0/M_PI)*atan2(car_state.Vx*(car_par.b*tan(car_state.steer_alpha)/car_par.L + tan(al_r)),car_state.Vx)
+              << "      " << car_state.FXr_req << " "
+              << car_state.FXr << "  " << car_state.FYr << " " << fabs(car_state.Nr*car_par.mu)
+              << " " << fabs(car_state.Nr*car_par.mu) - sqrt(car_state.FXr*car_state.FXr + car_state.FYr*car_state.FYr)
+              << "      " << car_state.FXf << "  " << car_state.FYf<< " " << fabs(car_state.Nf*car_par.mu)
+              << " " << fabs(car_state.Nf*car_par.mu) - sqrt(car_state.FXf*car_state.FXf + car_state.FYf*car_state.FYf)
+              << "      " << car_state.state << "      " << car_state.B_pressure
+              << "      " << car_state.long_slip_f*(180.0/M_PI) << "  " << car_state.long_slip_r*(180.0/M_PI)
+              << "      " << car_state.dVxdt
+              << "       " << car_state.Om*car_state.Vy + (car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                         + car_state.FXr)/car_par.mass - car_state.Fdrag/car_par.mass
+              << "    " << car_state.Om*car_state.Vx << "   " << 9.89 - sqrt(car_state.dVxdt*car_state.dVxdt
+                                                                                + car_state.Om*car_state.Vx*car_state.Om*car_state.Vx)
+
+              << "            " << car_state.accel - (car_state.Fdrag_PM/car_par.mass)
+              << "         " << car_state.OmWr*car_par.rearWheelRad << "   " << car_state.Vx
+              << "         " << car_state.OmWf*car_par.frontWheelRad
+              << "         " << car_state.Nbrake_r/car_par.rearWheelRad << "    " << car_state.Nbrake_f/car_par.frontWheelRad
+              << std::endl;
+
+
+       d_time = 0.0;
+
+       if(fl_out > 0)
+         std::cout<< "intime = " << in_time << std::endl;
+
+    }
+
+#endif
+
+}
+
+//---------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+
+void DynamicCar::dynamicNav_ev_Base_test(double steer, double accel_des, double dt,
+                               int reverse_fl, double speed_des) {
+  // +++   Here is passed the required control for actuators; evolution of
+  // actuators is defined in evolutionControl()
+
+  car_state.steer_alpha_req = steer;
+  car_state.accel =
+      accel_des;  // with sign corresponding car system of coordinate
+
+  fl_reverse = reverse_fl;
+  car_state.Vdes = speed_des;  // For Fdrag_PM  being evaluated
+
+  getAccBrkMode();  // getting choice of fl_AccBrkMode
+
+  getDrag_PM();  // correction of car_state.accel to take into account FDrag_PM
+                 // (evaluation of drag force for PM is located here !);
+
+  newFXreq();  // distribution of required forces to engines (forces being
+               // distributed as requested values in corresponding to drive
+               // type)
+
+  //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  double dtk = dt / double(culc_par.nsteps);
+
+  int nsteps = 1;
+
+  do {
+    if (fl_MPClog > 0) addToMPClog(dtk);
+
+    // integrNavkinematictest(dtk);
+    integrNav(dtk);
+
+    // t = t + dtk;
+
+    nsteps++;
+
+  } while (nsteps <= culc_par.nsteps);
+
+  if (fl_fileDyn > 0) addToLog(dt);
+
+  car_state.callcount += 1;
+}
+
+//-------------------------------------------------------------------------------------------------------------------
+
+//---------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+
+void DynamicCar::dynamicNav_ev(double steer, double accel_des, double dt,
+                               int reverse_fl, double speed_des,
+                               double addFx,double addFy,double addN) {
+  // +++   Here is passed the required control for actuators; evolution of
+  // actuators is defined in evolutionControl()
+
+  car_state.steer_alpha_req = steer;
+  car_state.accel =
+      accel_des;  // with sign corresponding car system of coordinate
+
+  fl_reverse = reverse_fl;
+  car_state.Vdes = speed_des;  // For Fdrag_PM  being evaluated
+
+  getAccBrkMode();  // getting choice of fl_AccBrkMode
+
+  getDrag_PM();  // correction of car_state.accel to take into account FDrag_PM
+                 // (evaluation of drag force for PM is located here !);
+
+  newFXreq();  // distribution of required forces to engines (forces being
+               // distributed as requested values in corresponding to drive
+               // type)
+
+  evolutionControl(dt);
+
+ // std::cout<< "N_r = " << car_state.Nmot_r << "    "<< "N_f = " << car_state.Nmot_f << "    "<< "Brk_f = " << car_state.Nbrake_f << "    "
+ //             << "Brk_r = " << car_state.Nbrake_r << std::endl;
+
+  dynamicNav_ev_Base(dt,car_state.steer_alpha,car_state.Nmot_f,car_state.Nmot_r,car_state.Nbrake_f,car_state.Nbrake_r,
+                     addFx, addFy, addN);
+}
+
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+
+void DynamicCar::dynamicNav_ev_Base(double dt,double steer,double NmotF,double NmotR,double NBrkF,double NBrkR,
+                                    double addFx,double addFy,double addN){
+  // +++   Here is passed the required control
+
+  // For loging if call of dynamicNav_ev_Base() occuring not from dynamicNav_ev() :
+    car_state.steer_alpha = steer;
+
+    car_state.Nmot_f = NmotF;
+    car_state.Nmot_r = NmotR;
+    car_state.Nbrake_f = NBrkF;
+    car_state.Nbrake_r = NBrkR;
+
+    car_state.addedFx = addFx;
+    car_state.addedFy = addFy;
+    car_state.addedN = addN;
+
+
+  double dtk = dt / double(culc_par.nsteps);
+
+  int nsteps = 1;
+
+  do {
+    if (fl_MPClog > 0) addToMPClog(dtk);
+
+    if(culc_par.implicit_solver == 0)
+       integrNavBase(dtk,NmotF,NmotR,NBrkF,NBrkR);
+    else
+       integrNavBase_implicit(dtk,NmotF,NmotR,NBrkF,NBrkR);
+
+    // t = t + dtk;
+
+    nsteps++;
+
+  } while (nsteps <= culc_par.nsteps);
+
+  if (fl_fileDyn > 0) addToLog(dt);
+
+  car_state.callcount += 1;
+}
+
+//-------------------------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::integrNav(double dt){
+
+    //dVxdt = Om*Vy + (FXr + FXf - Fdrag)/m;
+    //dVydt = -Om*Vx + (FYf*cos(steer) + FXf*sin(steer) + FYr)/m;
+    //dOmdt = (-FYr*b + (FYf*cos(steer) +FXf*sin(steer))*a)/mI;
+    //dpsidt = Om;
+    //dxdt = Vx*cos(psi)-Vy*sin(psi);
+    //dydt = Vx*sin(psi)+Vy*cos(psi);
+
+
+ //   std::cout << "Vx = " << car_state.Vx << "    =====================================" << std::endl;
+
+    if((culc_par.fl_RunKut < 1)||(car_state.state == 0))
+        evolutionControl(dt);
+
+
+    if(car_state.state == 0)
+        return;
+
+
+
+    // in the case of Run-Kut the actuators have initial state on this step;
+
+    combinedSlip();
+    getDrag();
+
+
+    double kx1 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+    double ky1 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+    double kpsi1 = car_state.Om;
+    double kVx1 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                                                                            -car_state.Fdrag)/car_par.mass);
+    double kVy1 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +
+                                                   car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+    double kOm1 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                      car_state.FXf*sin(car_state.steer_alpha)*car_par.a)/car_par.moment_inertia;
+
+    double kOmWf1 = car_par.frontWheelRad*(car_state.FXf_req - car_state.FXf)/car_par.fWIn;
+    double kOmWr1 = car_par.rearWheelRad*(car_state.FXr_req - car_state.FXr)/car_par.rWIn;
+
+
+    double x0 = car_state.x;
+    double y0 = car_state.y;
+    double psi0 = car_state.psi;
+    double Vx0 = car_state.Vx;
+    double Vy0 = car_state.Vy;
+    double Om0 = car_state.Om;
+
+    double OmWf0 = car_state.OmWf;
+    double OmWr0 = car_state.OmWr;
+
+
+    if(culc_par.fl_RunKut > 0){
+
+
+        car_state.x = x0 + 0.5*kx1*dt;
+        car_state.y = y0 + 0.5*ky1*dt;
+        car_state.psi = psi0 + 0.5*kpsi1*dt;
+        car_state.Vx = Vx0 + 0.5*kVx1*dt;
+        car_state.Vy = Vy0 + 0.5*kVy1*dt;
+        car_state.Om = Om0 + 0.5*kOm1*dt;
+
+        if(culc_par.fl_Long_Circ > 1){
+
+            car_state.OmWf = OmWf0 + 0.5*kOmWf1*dt;
+            car_state.OmWr = OmWr0 + 0.5*kOmWr1*dt;
+
+        }
+
+        evolutionControl(0.5*dt);
+
+        combinedSlip();
+        getDrag();
+
+        double kx2 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+        double ky2 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+        double kpsi2 = car_state.Om;
+        double kVx2 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                    - car_state.Fdrag)/car_par.mass);
+
+        double kVy2 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +
+                                                   car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+        double kOm2 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                      car_state.FXf*sin(car_state.steer_alpha)*car_par.a)/car_par.moment_inertia;
+
+
+        double kOmWf2 = car_par.frontWheelRad*(car_state.FXf_req - car_state.FXf)/car_par.fWIn;
+        double kOmWr2 = car_par.rearWheelRad*(car_state.FXr_req - car_state.FXr)/car_par.rWIn;
+
+
+
+        car_state.x = x0 + 0.5*kx2*dt;
+        car_state.y = y0 + 0.5*ky2*dt;
+        car_state.psi = psi0 + 0.5*kpsi2*dt;
+        car_state.Vx = Vx0 + 0.5*kVx2*dt;
+        car_state.Vy = Vy0 + 0.5*kVy2*dt;
+        car_state.Om = Om0 + 0.5*kOm2*dt;
+
+        if(culc_par.fl_Long_Circ > 1){
+
+            car_state.OmWf = OmWf0 + 0.5*kOmWf2*dt;
+            car_state.OmWr = OmWr0 + 0.5*kOmWr2*dt;
+        }
+
+        // actuators have the same state (t+0.5*dt)
+
+        combinedSlip();
+        getDrag();
+
+        double kx3 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+        double ky3 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+        double kpsi3 = car_state.Om;
+        double kVx3 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                                        -car_state.Fdrag)/car_par.mass);
+
+        double kVy3 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +
+                                                   car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+        double kOm3 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                      car_state.FXf*sin(car_state.steer_alpha)*car_par.a)/car_par.moment_inertia;
+
+        double kOmWf3 = car_par.frontWheelRad*(car_state.FXf_req - car_state.FXf)/car_par.fWIn;
+        double kOmWr3 = car_par.rearWheelRad*(car_state.FXr_req - car_state.FXr)/car_par.rWIn;
+
+
+        car_state.x = x0 + kx3*dt;
+        car_state.y = y0 + ky3*dt;
+        car_state.psi = psi0 + kpsi3*dt;
+        car_state.Vx = Vx0 + kVx3*dt;
+        car_state.Vy = Vy0 + kVy3*dt;
+        car_state.Om = Om0 + kOm3*dt;
+
+        if(culc_par.fl_Long_Circ > 1){
+
+            car_state.OmWf = OmWf0 + kOmWf3*dt;
+            car_state.OmWr = OmWr0 + kOmWr3*dt;
+        }
+
+
+        evolutionControl(0.5*dt); // actuators have changed in corresponding to changing time from t to t + dt
+        combinedSlip();
+        getDrag();
+
+        double kx4 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+        double ky4 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+        double kpsi4 = car_state.Om;
+        double kVx4 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                    - car_state.Fdrag)/car_par.mass);
+
+        double kVy4 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +
+                                                   car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+        double kOm4 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                      car_state.FXf*sin(car_state.steer_alpha)*car_par.a)/car_par.moment_inertia;
+
+        double kOmWf4 = car_par.frontWheelRad*(car_state.FXf_req - car_state.FXf)/car_par.fWIn;
+        double kOmWr4 = car_par.rearWheelRad*(car_state.FXr_req - car_state.FXr)/car_par.rWIn;
+
+
+        // Runge modifications:
+
+        kx1 = (kx1 + 2*kx2 + 2*kx3 + kx4)/6.0;
+        ky1 = (ky1 + 2*ky2 + 2*ky3 + ky4)/6.0;
+        kpsi1 = (kpsi1 + 2*kpsi2 + 2*kpsi3 + kpsi4)/6.0;
+        kVx1 = (kVx1 + 2*kVx2 + 2*kVx3 + kVx4)/6.0;
+        kVy1 = (kVy1 + 2*kVy2 + 2*kVy3 + kVy4)/6.0;
+        kOm1 = (kOm1 + 2*kOm2 + 2*kOm3 + kOm4)/6.0;
+
+        kOmWf1 = (kOmWf1 + 2*kOmWf2 + 2*kOmWf3 + kOmWf4)/6.0;
+        kOmWr1 = (kOmWr1 + 2*kOmWr2 + 2*kOmWr3 + kOmWr4)/6.0;
+
+    }
+    else{
+
+        car_state.dVxdt = kVx1;
+        car_state.dOmWrdt = kOmWr1;
+
+        double dti = analize_dt(dt);
+
+        while(dt > dti){
+
+            car_state.x = x0 + kx1*dti;
+            car_state.y = y0 + ky1*dti;
+            car_state.psi = psi0 + kpsi1*dti;
+            car_state.Vx = Vx0 + kVx1*dti;
+            car_state.Vy = Vy0 + kVy1*dti;
+            car_state.Om = Om0 + kOm1*dti;
+
+            if(culc_par.fl_Long_Circ > 1){
+                car_state.OmWf = OmWf0 + kOmWf1*dti;
+                car_state.OmWr = OmWr0 + kOmWr1*dti;
+            }
+
+            if(dt > dti)
+                dt = dt - dti;
+            else
+                dti = dt;
+
+            combinedSlip();
+            getDrag();
+
+            kx1 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+            ky1 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+            kpsi1 = car_state.Om;
+            kVx1 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                        - car_state.Fdrag)/car_par.mass);
+
+            kVy1 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +
+                                                           car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+            kOm1 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                              car_state.FXf*sin(car_state.steer_alpha)*car_par.a)/car_par.moment_inertia;
+
+            kOmWf1 = car_par.frontWheelRad*(car_state.FXf_req - car_state.FXf)/car_par.fWIn;
+            kOmWr1 = car_par.rearWheelRad*(car_state.FXr_req - car_state.FXr)/car_par.rWIn;
+
+
+            x0 = car_state.x;
+            y0 = car_state.y;
+            psi0 = car_state.psi;
+            Vx0 = car_state.Vx;
+            Vy0 = car_state.Vy;
+            Om0 = car_state.Om;
+
+            OmWf0 = car_state.OmWf;
+            OmWr0 = car_state.OmWr;
+        }
+
+    }
+
+
+
+
+    car_state.x = x0 + kx1*dt;
+    car_state.y = y0 + ky1*dt;
+    car_state.psi = psi0 + kpsi1*dt;
+    car_state.Vx = Vx0 + kVx1*dt;
+    car_state.Vy = Vy0 + kVy1*dt;
+    car_state.Om = Om0 + kOm1*dt;
+
+    if(culc_par.fl_Long_Circ > 1){
+        car_state.OmWf = OmWf0 + kOmWf1*dt;
+        car_state.OmWr = OmWr0 + kOmWr1*dt;
+    }
+
+    car_state.dVxdt = kVx1;
+    car_state.dVydt = kVy1;
+    car_state.dOmdt = kOm1;
+    car_state.dOmWfdt = kOmWf1;
+    car_state.dOmWrdt = kOmWr1;
+
+
+
+    if(fl_AccBrk_fact < 0.0){
+
+            double Vvh = sqrt(car_state.Vx*car_state.Vx + car_state.Vy*car_state.Vy);
+
+            if(Vvh < 0.01)
+            {
+
+
+                car_state.Vx = 0.0;
+                car_state.Vy = 0.0;
+                car_state.Om = 0.0;
+
+                car_state.OmWf = 0.0;
+                car_state.OmWr = 0.0;
+
+                car_state.long_slip_r = 0.0;
+                car_state.long_slip_f = 0.0;
+
+                car_state.slipAng_r = 0.0;
+                car_state.slipAng_f = 0.0;
+
+                car_state.dVxdt = 0.0;
+                car_state.dVydt = 0.0;
+                car_state.dOmdt = 0.0;
+                car_state.dOmWfdt = 0.0;
+                car_state.dOmWrdt = 0.0;
+
+                car_state.state = 0;
+
+
+            }
+
+
+
+    }
+
+
+    if(culc_par.fl_Long_Circ > 1)
+       combinedSlip();
+
+    nav_to_cog(1);
+
+
+
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void DynamicCar::evalTireDissForces(double NmotF,double NmotR,double NBrkF,double NBrkR){
+
+    car_state.flDW_f = 1;
+    car_state.flDW_r = 1;
+  // Tire Forces (Combined Slip)
+
+    double Vxw;
+    double Vyw; // velocity components at the point of front wheel in the inertial coordinate system of front wheel
+
+    getVerticalLoads();
+
+    double Vxr = car_state.Vx;
+    double WVr = car_state.OmWr * car_par.rearWheelRad;
+    double Vyr = car_state.Vy - car_state.Om * car_par.b;
+
+    if (culc_par.fl_Long_Circ < 3)
+      if ((car_par.drive_distrib > 0.99) && (NBrkR < 0.001))
+      {
+        WVr = Vxr;
+        car_state.OmWr = Vxr / car_par.rearWheelRad;
+        NBrkR = 0.0;
+         car_state.flDW_r = -1;
+      }
+
+    double DWr = WVr - Vxr;
+
+    double normK_r = fabs(WVr) + 0.0001;
+
+    car_state.long_slip_r = DWr / normK_r;
+
+    if (Vxr < 0.0) Vxr = (-1.0) * Vxr;
+
+    car_state.slipAng_r = atan2(Vyr, Vxr);
+
+    double sig_xr = car_par.Cx_r * car_state.long_slip_r;
+    double sig_yr = -car_par.Cy_r * Vyr / normK_r;
+
+    double gama_r = sqrt(sig_xr * sig_xr + sig_yr * sig_yr);
+
+    double Fslip_r = brushModel_combined(gama_r, car_state.Nr);
+
+    car_state.FXr = (sig_xr / (gama_r + 0.0001)) * Fslip_r;
+    car_state.FYr = (sig_yr / (gama_r + 0.0001)) * Fslip_r;
+
+    double Vxf = car_state.Vx;
+    double Vyf = car_state.Vy + car_state.Om * car_par.a;
+
+    double cs = cos(car_state.steer_alpha);
+    double sn = sin(car_state.steer_alpha);
+
+    Vxw = Vxf * cs + Vyf * sn;
+    Vyw = Vyf * cs - Vxf * sn;
+
+    double WVf = car_state.OmWf * car_par.frontWheelRad;
+
+    if (culc_par.fl_Long_Circ < 3)
+      if ((car_par.drive_distrib < 0.01) && (NBrkF < 0.001)) {
+        WVf = Vxw;
+        car_state.OmWf = Vxw / car_par.frontWheelRad;
+        NBrkF = 0.0;
+        car_state.flDW_f = -1;
+      }
+
+    double DWf = WVf - Vxw;
+
+    double normK_f = fabs(WVf) + 0.0001;
+
+    car_state.long_slip_f = DWf / normK_f;
+
+    if (Vxw < 0.0) Vxw = (-1.0) * Vxw;
+
+    car_state.slipAng_f = atan2(Vyw, Vxw);
+
+    double sig_xf = car_par.Cx_f * car_state.long_slip_f;
+    double sig_yf = -car_par.Cy_f * Vyw / normK_f;
+
+    double gama_f = sqrt(sig_xf * sig_xf + sig_yf * sig_yf);
+
+    double Fslip_f = brushModel_combined(gama_f, car_state.Nf);
+
+    car_state.FXf = (sig_xf / (gama_f + 0.0001)) * Fslip_f;
+    car_state.FYf = (sig_yf / (gama_f + 0.0001)) * Fslip_f;
+
+  // Dissipative Forces
+
+    car_state.evTrqW_f = 0.0;
+    car_state.evTrqW_r = 0.0;
+
+
+
+    if(car_par.drive_distrib < 0.01)
+        NBrkR += car_par.rollingResistance*car_par.rearWheelRad;
+    else if(car_par.drive_distrib > 0.99)
+        NBrkF += car_par.rollingResistance*car_par.frontWheelRad;
+    else{
+
+        NBrkR += car_par.rollingResistance*car_par.rearWheelRad*(1.0 - car_par.drive_distrib);
+        NBrkF += car_par.rollingResistance*car_par.frontWheelRad*car_par.drive_distrib;
+      }
+
+    // Rear
+
+    if(car_state.flDW_r > -1){
+
+      if(fabs(NmotR- car_state.FXr*car_par.rearWheelRad) > NBrkR)
+        car_state.flDW_r = 1;
+      else
+        car_state.flDW_r = 0;
+
+      if(car_state.OmWr > 0.0 || ((car_state.OmWr == 0.0)&&(car_state.Vx > 0.0)))
+          car_state.evTrqW_r = NmotR - NBrkR - car_state.FXr*car_par.rearWheelRad;
+      else if(car_state.OmWr < 0.0 || ((car_state.OmWr == 0.0)&&(car_state.Vx < 0.0)))
+          car_state.evTrqW_r = NmotR + NBrkR - car_state.FXr*car_par.rearWheelRad;
+      else if((car_state.OmWr == 0.0)&&(car_state.Vx == 0.0)){
+
+        if(fabs(NmotR) < NBrkR)
+          car_state.flDW_r = -1;
+        else{
+
+            if(NmotR > 0.0)
+              car_state.evTrqW_r = NmotR - NBrkR;
+            else
+              car_state.evTrqW_r = NmotR + NBrkR;
+
+        }
+      }
+    }
+
+    // Front
+
+    if(car_state.flDW_f > -1){
+
+      if(fabs(NmotF- car_state.FXf*car_par.frontWheelRad) > NBrkF)
+        car_state.flDW_f = 1;
+      else
+        car_state.flDW_f = 0;
+
+      if(car_state.OmWf > 0.0 || ((car_state.OmWf == 0.0)&&(Vxw > 0.0)))
+          car_state.evTrqW_f = NmotF - NBrkF - car_state.FXf*car_par.frontWheelRad;
+      else if(car_state.OmWf < 0.0 || ((car_state.OmWf == 0.0)&&(Vxw < 0.0)))
+          car_state.evTrqW_f = NmotF + NBrkF - car_state.FXf*car_par.frontWheelRad;
+      else if((car_state.OmWf == 0.0)&&(Vxw == 0.0)){
+
+        if(fabs(NmotF) < NBrkF)
+          car_state.flDW_f = -1;
+        else{
+
+            if(NmotF > 0.0)
+              car_state.evTrqW_f = NmotF - NBrkF;
+            else
+              car_state.evTrqW_f = NmotF + NBrkF;
+
+        }
+      }
+    }
+
+
+}
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::evWheel(double dt,double omW_0,double&omW, double Trq, int fl_Trq,double Iin){
+
+  double dOmW = Trq/Iin;
+
+  if(fl_Trq < 0){
+
+      omW = omW_0;
+      return;
+   }
+
+  if(omW_0 == 0.0){
+
+      if(fl_Trq < 1)
+        omW = omW_0;
+     else
+        omW = omW_0 + dOmW*dt;
+
+  }
+  else{
+
+      omW = omW_0 + dOmW*dt;
+
+      if(fl_Trq < 1)
+          if((omW < 0.0 && omW_0 > 0.0)||(omW > 0.0 && omW_0 < 0.0))
+              omW = 0.0;
+
+  }
+
+
+
+
+}
+
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::integrNavBase(double dt,double NmotF,double NmotR,double NBrkF,double NBrkR){
+
+    //dVxdt = Om*Vy + (FXr + FXf - Fdrag)/m;
+    //dVydt = -Om*Vx + (FYf*cos(steer) + FXf*sin(steer) + FYr)/m;
+    //dOmdt = (-FYr*b + (FYf*cos(steer) +FXf*sin(steer))*a)/mI;
+    //dpsidt = Om;
+    //dxdt = Vx*cos(psi)-Vy*sin(psi);
+    //dydt = Vx*sin(psi)+Vy*cos(psi);
+
+
+  //  car_state.steer_alpha = steer;
+
+
+    if(fabs(NmotF + NmotR) > NBrkF + NBrkR + car_par.rollingResistance*
+     (car_par.drive_distrib*car_par.frontWheelRad + (1.0 - car_par.drive_distrib)*car_par.rearWheelRad))
+      fl_AccBrk_fact = 1;
+    else
+      fl_AccBrk_fact = -1;
+
+
+    if(fl_AccBrk_fact < 0)
+      if(sqrt(car_state.addedFx*car_state.addedFx + car_state.addedFy*car_state.addedFy) > 100.0) fl_AccBrk_fact = 1;
+
+
+    if(car_state.state == 0){
+
+        if(fl_AccBrk_fact == 1)
+          car_state.state = 1;
+        else
+          return;
+     }
+
+
+
+
+    // in the case of Run-Kut the actuators have initial state on this step;
+
+
+    evalTireDissForces(NmotF,NmotR,NBrkF,NBrkR);
+    getDrag();
+
+
+    double kx1 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+    double ky1 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+    double kpsi1 = car_state.Om;
+    double kVx1 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                                                                 +car_state.addedFx -car_state.Fdrag)/car_par.mass);
+    double kVy1 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +car_state.addedFy+
+                                                   car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+    double kOm1 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                      car_state.FXf*sin(car_state.steer_alpha)*car_par.a + car_state.addedN)/car_par.moment_inertia;
+
+    double kOmWf1 = car_state.evTrqW_f;
+    double kOmWr1 = car_state.evTrqW_r;
+
+    int flD_r = car_state.flDW_r;
+    int flD_f = car_state.flDW_f;
+
+
+    double x0 = car_state.x;
+    double y0 = car_state.y;
+    double psi0 = car_state.psi;
+    double Vx0 = car_state.Vx;
+    double Vy0 = car_state.Vy;
+    double Om0 = car_state.Om;
+
+    double OmWf0 = car_state.OmWf;
+    double OmWr0 = car_state.OmWr;
+
+
+    if(culc_par.fl_RunKut > 0){
+
+
+        car_state.x = x0 + 0.5*kx1*dt;
+        car_state.y = y0 + 0.5*ky1*dt;
+        car_state.psi = psi0 + 0.5*kpsi1*dt;
+        car_state.Vx = Vx0 + 0.5*kVx1*dt;
+        car_state.Vy = Vy0 + 0.5*kVy1*dt;
+        car_state.Om = Om0 + 0.5*kOm1*dt;
+
+        evWheel(0.5*dt,OmWf0,car_state.OmWf,car_state.evTrqW_f,car_state.flDW_f,car_par.fWIn);
+        evWheel(0.5*dt,OmWr0,car_state.OmWr,car_state.evTrqW_r,car_state.flDW_r,car_par.rWIn);
+
+        evalTireDissForces(NmotF,NmotR,NBrkF,NBrkR);
+        getDrag();
+
+
+        double kx2 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+        double ky2 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+        double kpsi2 = car_state.Om;
+        double kVx2 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                                                                     +car_state.addedFx -car_state.Fdrag)/car_par.mass);
+        double kVy2 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +car_state.addedFy+
+                                                       car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+        double kOm2 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                          car_state.FXf*sin(car_state.steer_alpha)*car_par.a + car_state.addedN)/car_par.moment_inertia;
+
+
+        double kOmWf2 = car_state.evTrqW_f;
+        double kOmWr2 = car_state.evTrqW_r;
+
+
+
+        car_state.x = x0 + 0.5*kx2*dt;
+        car_state.y = y0 + 0.5*ky2*dt;
+        car_state.psi = psi0 + 0.5*kpsi2*dt;
+        car_state.Vx = Vx0 + 0.5*kVx2*dt;
+        car_state.Vy = Vy0 + 0.5*kVy2*dt;
+        car_state.Om = Om0 + 0.5*kOm2*dt;
+
+        evWheel(0.5*dt,OmWf0,car_state.OmWf,car_state.evTrqW_f,car_state.flDW_f,car_par.fWIn);
+        evWheel(0.5*dt,OmWr0,car_state.OmWr,car_state.evTrqW_r,car_state.flDW_r,car_par.rWIn);
+
+        //
+
+        evalTireDissForces(NmotF,NmotR,NBrkF,NBrkR);
+        getDrag();
+
+        double kx3 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+        double ky3 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+        double kpsi3 = car_state.Om;
+        double kVx3 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                                                                     +car_state.addedFx -car_state.Fdrag)/car_par.mass);
+        double kVy3 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +car_state.addedFy+
+                                                       car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+        double kOm3 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                          car_state.FXf*sin(car_state.steer_alpha)*car_par.a + car_state.addedN)/car_par.moment_inertia;
+
+
+        double kOmWf3 = car_state.evTrqW_f;
+        double kOmWr3 = car_state.evTrqW_r;
+
+
+        car_state.x = x0 + kx3*dt;
+        car_state.y = y0 + ky3*dt;
+        car_state.psi = psi0 + kpsi3*dt;
+        car_state.Vx = Vx0 + kVx3*dt;
+        car_state.Vy = Vy0 + kVy3*dt;
+        car_state.Om = Om0 + kOm3*dt;
+
+        evWheel(dt,OmWf0,car_state.OmWf,car_state.evTrqW_f,car_state.flDW_f,car_par.fWIn);
+        evWheel(dt,OmWr0,car_state.OmWr,car_state.evTrqW_r,car_state.flDW_r,car_par.rWIn);
+
+
+        evalTireDissForces(NmotF,NmotR,NBrkF,NBrkR);
+        getDrag();
+
+        double kx4 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+        double ky4 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+        double kpsi4 = car_state.Om;
+        double kVx4 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                                                                     +car_state.addedFx -car_state.Fdrag)/car_par.mass);
+        double kVy4 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +car_state.addedFy+
+                                                       car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+        double kOm4 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                          car_state.FXf*sin(car_state.steer_alpha)*car_par.a + car_state.addedN)/car_par.moment_inertia;
+
+        double kOmWf4 = car_state.evTrqW_f;
+        double kOmWr4 = car_state.evTrqW_r;
+
+
+        // Runge modifications:
+
+        kx1 = (kx1 + 2*kx2 + 2*kx3 + kx4)/6.0;
+        ky1 = (ky1 + 2*ky2 + 2*ky3 + ky4)/6.0;
+        kpsi1 = (kpsi1 + 2*kpsi2 + 2*kpsi3 + kpsi4)/6.0;
+        kVx1 = (kVx1 + 2*kVx2 + 2*kVx3 + kVx4)/6.0;
+        kVy1 = (kVy1 + 2*kVy2 + 2*kVy3 + kVy4)/6.0;
+        kOm1 = (kOm1 + 2*kOm2 + 2*kOm3 + kOm4)/6.0;
+
+        kOmWf1 = (kOmWf1 + 2*kOmWf2 + 2*kOmWf3 + kOmWf4)/6.0;
+        kOmWr1 = (kOmWr1 + 2*kOmWr2 + 2*kOmWr3 + kOmWr4)/6.0;
+
+    }
+    else{
+
+        car_state.dVxdt = kVx1;
+        car_state.dOmWrdt = kOmWr1;
+
+        double dti = analize_dt(dt);
+
+        while(dt > dti){
+
+            car_state.x = x0 + kx1*dti;
+            car_state.y = y0 + ky1*dti;
+            car_state.psi = psi0 + kpsi1*dti;
+            car_state.Vx = Vx0 + kVx1*dti;
+            car_state.Vy = Vy0 + kVy1*dti;
+            car_state.Om = Om0 + kOm1*dti;
+
+            evWheel(dti,OmWf0,car_state.OmWf,kOmWf1,flD_f,car_par.fWIn);
+            evWheel(dti,OmWr0,car_state.OmWr,kOmWr1,flD_r,car_par.rWIn);
+
+            if(dt > dti)
+                dt = dt - dti;
+            else
+                dti = dt;
+
+            evalTireDissForces(NmotF,NmotR,NBrkF,NBrkR);
+            getDrag();
+
+            kx1 = (car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi));
+            ky1 = (car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi));
+            kpsi1 = car_state.Om;
+            kVx1 = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha) - car_state.FYf*sin(car_state.steer_alpha)
+                                                                                                         +car_state.addedFx -car_state.Fdrag)/car_par.mass);
+            kVy1 = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) +car_state.addedFy+
+                                                           car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+            kOm1 = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                              car_state.FXf*sin(car_state.steer_alpha)*car_par.a + car_state.addedN)/car_par.moment_inertia;
+
+
+            kOmWf1 = car_state.evTrqW_f;
+            kOmWr1 = car_state.evTrqW_r;
+
+            flD_r = car_state.flDW_r;
+            flD_f = car_state.flDW_f;
+
+            x0 = car_state.x;
+            y0 = car_state.y;
+            psi0 = car_state.psi;
+            Vx0 = car_state.Vx;
+            Vy0 = car_state.Vy;
+            Om0 = car_state.Om;
+
+            OmWf0 = car_state.OmWf;
+            OmWr0 = car_state.OmWr;
+        }
+
+    }
+
+
+
+
+    car_state.x = x0 + kx1*dt;
+    car_state.y = y0 + ky1*dt;
+    car_state.psi = psi0 + kpsi1*dt;
+    car_state.Vx = Vx0 + kVx1*dt;
+    car_state.Vy = Vy0 + kVy1*dt;
+    car_state.Om = Om0 + kOm1*dt;
+
+    evWheel(dt,OmWf0,car_state.OmWf,kOmWf1,flD_f,car_par.fWIn);
+    evWheel(dt,OmWr0,car_state.OmWr,kOmWr1,flD_r,car_par.rWIn);
+
+    car_state.dVxdt = kVx1;
+    car_state.dVydt = kVy1;
+    car_state.dOmdt = kOm1;
+    car_state.dOmWfdt = kOmWf1;
+    car_state.dOmWrdt = kOmWr1;
+
+
+
+    if(fl_AccBrk_fact < 0.0){
+
+            double Vvh = sqrt(car_state.Vx*car_state.Vx + car_state.Vy*car_state.Vy+ 3.0*car_state.Om*car_state.Om);
+
+            if(Vvh < 0.01)
+            {
+
+
+                car_state.Vx = 0.0;
+                car_state.Vy = 0.0;
+                car_state.Om = 0.0;
+
+                car_state.OmWf = 0.0;
+                car_state.OmWr = 0.0;
+
+                car_state.long_slip_r = 0.0;
+                car_state.long_slip_f = 0.0;
+
+                car_state.slipAng_r = 0.0;
+                car_state.slipAng_f = 0.0;
+
+                car_state.dVxdt = 0.0;
+                car_state.dVydt = 0.0;
+                car_state.dOmdt = 0.0;
+                car_state.dOmWfdt = 0.0;
+                car_state.dOmWrdt = 0.0;
+
+                car_state.state = 0;
+
+
+            }
+
+
+
+    }
+
+    evalTireDissForces(NmotF,NmotR,NBrkF,NBrkR);
+
+    nav_to_cog(1);
+
+  //  std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!! state = " << car_state.state << std::endl;
+
+
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::integrNavBase_implicit(double dt,double NmotF,double NmotR,double NBrkF,double NBrkR){
+
+    //dVxdt = Om*Vy + (FXr + FXf - Fdrag)/m;
+    //dVydt = -Om*Vx + (FYf*cos(steer) + FXf*sin(steer) + FYr)/m;
+    //dOmdt = (-FYr*b + (FYf*cos(steer) +FXf*sin(steer))*a)/mI;
+    //dpsidt = Om;
+    //dxdt = Vx*cos(psi)-Vy*sin(psi);
+    //dydt = Vx*sin(psi)+Vy*cos(psi);
+
+
+  //  car_state.steer_alpha = steer;
+
+  // Getting current temporal layer fixed =================
+
+  car_state_0.x = car_state.x;
+  car_state_0.y = car_state.y;
+  car_state_0.psi = car_state.psi;
+  car_state_0.Vx = car_state.Vx;
+  car_state_0.Vy = car_state.Vy;
+  car_state_0.Om = car_state.Om;
+
+  car_state_0.OmWf = car_state.OmWf;
+  car_state_0.OmWr = car_state.OmWr;
+
+  solverDat.fl_first_call = 1;
+
+  //=======================================================
+
+  int nonlin_it = culc_par.num_impl_nonlin_it;
+
+  bool show_errors = false;
+  std::vector<double> errors_on_it(nonlin_it,-1.0);
+  int k_err = 0;
+  //+++++++++++++++++++++++++++++++++++++++ Nonlinear Itterations ++++++++++++++++++++++++++++++++++ +++++++++++++++++++++++++++++++++++
+
+  // Analizing of total dissipation ---------------------------------------------
+
+  if(fabs(NmotF + NmotR) > NBrkF + NBrkR + car_par.rollingResistance*
+   (car_par.drive_distrib*car_par.frontWheelRad + (1.0 - car_par.drive_distrib)*car_par.rearWheelRad))
+    fl_AccBrk_fact = 1.0;
+  else
+    fl_AccBrk_fact = -1.0;
+
+  if(fl_AccBrk_fact < 0)
+    if(sqrt(car_state.addedFx*car_state.addedFx + car_state.addedFy*car_state.addedFy) > 100.0) fl_AccBrk_fact = 1;
+
+
+  if(car_state.state == 0){
+
+      if(fl_AccBrk_fact > 0.0)
+        car_state.state = 1;
+
+   }
+
+ // fl_first_it = 1;
+  while(nonlin_it > 0 && car_state.state >0){
+
+
+   // if(false)
+    if(fl_AccBrk_fact < 0.0){
+
+            double Vvh = sqrt(car_state.Vx*car_state.Vx + car_state.Vy*car_state.Vy + 3.0*car_state.Om*car_state.Om);
+
+            if(Vvh < 0.01)
+            {
+
+
+                car_state.Vx = 0.0;
+                car_state.Vy = 0.0;
+                car_state.Om = 0.0;
+
+                car_state.OmWf = 0.0;
+                car_state.OmWr = 0.0;
+
+                car_state.long_slip_r = 0.0;
+                car_state.long_slip_f = 0.0;
+
+                car_state.slipAng_r = 0.0;
+                car_state.slipAng_f = 0.0;
+
+                car_state.dVxdt = 0.0;
+                car_state.dVydt = 0.0;
+                car_state.dOmdt = 0.0;
+                car_state.dOmWfdt = 0.0;
+                car_state.dOmWrdt = 0.0;
+
+                car_state.state = 0;
+
+                break;
+            }
+
+    }
+
+    // Nonlinear system and step
+    std::vector<double> FdF;
+
+    FdF = linearizatedSystem(NmotF,NmotR,NBrkF,NBrkR,dt);
+
+
+    int fl_r = car_state.flDW_r;
+    int fl_f = car_state.flDW_f;
+
+    if(show_errors)
+      std::cout << fl_r << " ---<>--- " << fl_f << " --- <  > ----" ;
+
+    // update
+
+
+    double step = 1.0;
+
+    if(culc_par.corr_impl_step > 0 && fl_first_it < 1){
+
+        int it = 4;
+
+        double step1 = step;
+        double step0 = 0.0;
+
+        step = step1;
+        std::vector<double> mFF;
+        mFF = updateState(step,dt,NmotF,NmotR,NBrkF,NBrkR,fl_r,fl_f,1);
+
+        while(it > 0){
+
+          bool fl_it = true;
+
+          step = updStep(step0,step1,FdF[0],mFF[0],FdF[1],mFF[1],fl_it);
+
+          if(!fl_it)
+            break;
+
+          if(it > 1){
+            std::vector<double> mF1;
+            mF1 = updateState(step,dt,NmotF,NmotR,NBrkF,NBrkR,fl_r,fl_f,1);
+
+            if((mF1[1] < 0.0)&&(mF1[0] < FdF[0])){
+
+              step0 = step;
+              FdF = mF1;
+            }
+            else{
+
+              step1 = step;
+              mFF = mF1;
+            }
+          }
+          it--;
+        }
+
+        std::cout << step << "  ";
+        FdF = updateState(step,dt,NmotF,NmotR,NBrkF,NBrkR,fl_r,fl_f,2);
+     }
+    else{
+
+        if(show_errors)
+          FdF = updateState(step,dt,NmotF,NmotR,NBrkF,NBrkR,fl_r,fl_f,2);
+        else
+          updateState(step,dt,NmotF,NmotR,NBrkF,NBrkR,fl_r,fl_f,0);
+    }
+    if(show_errors)
+    {
+      errors_on_it[k_err]= std::sqrt(FdF[0]);
+
+
+      k_err++;
+    }
+
+    nonlin_it--;
+    fl_first_it = 0;
+ }
+
+  if(show_errors)
+  {
+   std::cout<< "errors: ---------------      ";
+   for(int k_e=0;k_e<culc_par.num_impl_nonlin_it;k_e++)
+   std::cout << errors_on_it[k_e] << "     ";
+   std::cout << "-------------------------------"<< std::endl;
+  }
+  //++++++++++++++++++++++++++ END of Nonlinear Itterations ++++++++++++++++++++++++++++++++++++++  +++++++++++++++++++++++++++++++
+
+  car_state.psi = car_state_0.psi + 0.5*(car_state.Om + car_state_0.Om)*dt;
+  car_state.x = car_state_0.x + 0.5*(car_state.Vx*cos(car_state.psi) - car_state.Vy*sin(car_state.psi))*dt
+      + 0.5*(car_state_0.Vx*cos(car_state_0.psi) - car_state_0.Vy*sin(car_state_0.psi))*dt;
+  car_state.y = car_state_0.y + 0.5*(car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi))*dt
+      + 0.5*(car_state.Vx*sin(car_state.psi) + car_state.Vy*cos(car_state.psi))*dt;
+
+  analyseDissForces(NmotF,NmotR,NBrkF,NBrkR);
+
+  car_state.dVxdt = (car_state.Om*car_state.Vy + (car_state.FXr + car_state.FXf*cos(car_state.steer_alpha)
+                                                  - car_state.FYf*sin(car_state.steer_alpha)+car_state.addedFx
+                                                  -car_state.Fdrag)/car_par.mass);
+  car_state.dVydt = (-car_state.Om*car_state.Vx + (car_state.FYr + car_state.FXf*sin(car_state.steer_alpha) + car_state.addedFy
+                                                 + car_state.FYf*cos(car_state.steer_alpha) )/car_par.mass);
+  car_state.dOmdt = (-car_state.FYr*car_par.b + car_state.FYf*cos(car_state.steer_alpha)*car_par.a +
+                    car_state.FXf*sin(car_state.steer_alpha)*car_par.a + car_state.addedN)/car_par.moment_inertia;
+
+  car_state.dOmWfdt = (car_state.evTrqW_f- car_state.FXf*car_par.frontWheelRad)/car_par.fWIn;
+  car_state.dOmWrdt = (car_state.evTrqW_r- car_state.FXr*car_par.rearWheelRad)/car_par.rWIn;
+
+
+
+  nav_to_cog(1);
+
+
+
+}
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+//-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+double DynamicCar::updStep(double t0,double t1,double f0,double f1,double df0,double df1,bool& fl){
+
+  double t = t1 - t0;
+
+  if(fabs(t) < 0.01){
+
+      fl = false;
+      return t1;
+  }
+
+  double t2 = t*t;
+  double t3 = t2*t;
+
+  double s = (t0 + 2.0*t1)/3.0;
+
+  //return s;
+
+  if(df1 < 0.0){
+      // f = c0 + c1*(s-t0) + c2*(s-t0)^2 + c3*(s-t0)^3;
+
+      double c0 = f0;
+      double c1 = df0;
+
+      double A = f1 - c0 - c1*t;
+      double B = df1 - df0;
+
+      double c2 = (3.0*A - B*t)/t2;
+
+      if(c2 < 0.0){
+        double c3 = -(2.0*A - B*t)/t3;
+
+        if(fabs(c3) > 0.000001){
+
+          double D = c2*c2-3.0*c3*c1;
+          if(D>=0){
+
+             double cs = -1.0*(c2 + sqrt(D))/(3.0*c3);
+             if((cs >= 0.01)&&(cs <= t1 - t0))
+               s = t0 + cs;
+          }
+        }
+      }
+  }
+  else{
+      // f = c0 + c1*(s-t0) + c2*(s-t0)^2;
+
+      double c0 = f0;
+      double c1 = df0;
+      double c2 = (f1 -f0 - c1*t)/t2;
+
+      if(c2 > 0.000001){
+
+          double cs = -c1/(2.0*c2);
+          if((cs >= 0.01)&&(cs <= t1 - t0))
+            s = t0 + cs;
+      }
+  }
+
+  return s;
+}
+//==////////////////////////////////////////////////////////////////////////-------------------------------------------
+std::vector<double> DynamicCar::updateState(double step,double dt,double NmotF,double NmotR,double NBrkF,double NBrkR,int fl_r,int fl_f,int fl){
+
+  std::vector<double> FdF;
+  FdF.resize(2,0.0);
+
+  bool ky = true;
+
+  double OmWr = car_state.OmWr;
+  double OmWf = car_state.OmWf;
+  double Nr = car_state.Nr;
+  double Nf = car_state.Nf;
+  double Om = car_state.Om;
+  double Vx = car_state.Vx;
+  double Vy = car_state.Vy;
+
+  if((fl_r > -1)&&(fl_f > -1)){
+
+      double W_r = car_state.OmWr + step*solverDat.dX(5);
+
+      if((fl_r < 1)&& ky)
+        if((car_state.OmWr < 0.0 && W_r > 0.0) ||(car_state.OmWr > 0.0 && W_r < 0.0)){
+
+            if(fabs(W_r) > 0.0001)
+                step = - car_state.OmWr/solverDat.dX(5);
+
+            W_r = 0.0;
+        }
+
+      double W_f = car_state.OmWf + step*solverDat.dX(6);
+
+      if((fl_f < 1)&& ky)
+        if((car_state.OmWf < 0.0 && W_f > 0.0) ||(car_state.OmWf > 0.0 && W_f < 0.0)){
+
+            if(fabs(W_f) > 0.0001){
+                step = - car_state.OmWf/solverDat.dX(6);
+                W_r = car_state.OmWr + step*solverDat.dX(5);
+              }
+
+            W_f = 0.0;
+        }
+
+
+      car_state.OmWr = W_r;
+      car_state.OmWf = W_f;
+
+  }else if((fl_f > -1)&&(fl_r == -1)){
+
+    double W_f = car_state.OmWf + step*solverDat.dX(5);
+
+    if((fl_f < 1)&& ky)
+      if((car_state.OmWf < 0.0 && W_f > 0.0) ||(car_state.OmWf > 0.0 && W_f < 0.0)){
+
+          if(fabs(W_f) > 0.0001)
+              step = - car_state.OmWf/solverDat.dX(5);
+
+          W_f = 0.0;
+      }
+
+    car_state.OmWf = W_f;
+
+  }else if((fl_r > -1)&&(fl_f == -1)){
+
+    double W_r = car_state.OmWr + step*solverDat.dX(5);
+
+    if((fl_r < 1)&& ky )
+      if((car_state.OmWr < 0.0 && W_r > 0.0) ||(car_state.OmWr > 0.0 && W_r < 0.0)){
+
+          if(fabs(W_r) > 0.0001)
+              step = - car_state.OmWr/solverDat.dX(5);
+
+          W_r = 0.0;
+      }
+
+    car_state.OmWr = W_r;
+
+  }
+
+  car_state.Nr += step*solverDat.dX(0);
+  car_state.Nf += step*solverDat.dX(1);
+  car_state.Om += step*solverDat.dX(2);
+  car_state.Vx += step*solverDat.dX(3);
+  car_state.Vy += step*solverDat.dX(4);
+
+  if(fl > 0){
+
+
+      FdF = linearizatedSystem(NmotF,NmotR,NBrkF,NBrkR,dt,0);
+
+
+      if(fl < 2){
+
+          car_state.OmWr = OmWr;
+          car_state.OmWf = OmWf;
+          car_state.Nr = Nr;
+          car_state.Nf = Nf;
+          car_state.Om = Om;
+          car_state.Vx = Vx;
+          car_state.Vy = Vy;
+
+          car_state.flDW_r = fl_r;
+          car_state.flDW_f = fl_f;
+      }
+
+
+  }
+
+
+  return FdF;
+
+
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+std::vector<double> DynamicCar::linearizatedSystem(double NmotF,double NmotR,double NBrkF,double NBrkR,double dt1,int fl_dX){
+
+
+
+ // dt1 = 1.0/dt1;
+ // double dt = 1.0;
+
+  double dt = dt1;
+  dt1 = 1.0;
+
+  double normF = -1.0;
+  //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  car_state.flDW_f = 1;
+
+  car_state.flDW_r = 1;
+
+  // Dissipative Forces
+
+    car_state.evTrqW_f = 0.0;
+
+
+    if(car_par.drive_distrib < 0.01)
+        NBrkR += car_par.rollingResistance*car_par.rearWheelRad;
+    else if(car_par.drive_distrib > 0.99)
+        NBrkF += car_par.rollingResistance*car_par.frontWheelRad;
+    else{
+
+        NBrkR += car_par.rollingResistance*car_par.rearWheelRad*(1.0 - car_par.drive_distrib);
+        NBrkF += car_par.rollingResistance*car_par.frontWheelRad*car_par.drive_distrib;
+      }
+
+  // REAR wheel Forces ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  double Vxw;
+  double Vyw;
+
+  double Vxr = car_state.Vx;
+  double WVr = car_state.OmWr * car_par.rearWheelRad;
+  double Vyr = car_state.Vy - car_state.Om * car_par.b;
+
+  if (culc_par.fl_Long_Circ < 3)
+    if ((car_par.drive_distrib > 0.99) && (NBrkR < 0.001))
+    {
+      WVr = Vxr;
+      car_state.OmWr = Vxr / car_par.rearWheelRad;
+      NBrkR = 0.0;
+       car_state.flDW_r = -1;
+    }
+
+  double DWr = WVr - Vxr;
+
+  double normK_r = fabs(WVr) + 0.0001;
+
+  car_state.long_slip_r = DWr / normK_r;
+
+  if (Vxr < 0.0) Vxr = (-1.0) * Vxr;
+
+  car_state.slipAng_r = atan2(Vyr, Vxr);
+
+  double sig_xr = car_par.Cx_r * car_state.long_slip_r;
+  double sig_yr = -car_par.Cy_r * Vyr / normK_r;
+
+  double gama_r = sqrt(sig_xr * sig_xr + sig_yr * sig_yr + 0.0001);
+
+  double Fslip_r = brushModel_combined(gama_r, car_state.Nr);
+
+
+  car_state.FXr = (sig_xr / gama_r) * Fslip_r;
+  car_state.FYr = (sig_yr / gama_r) * Fslip_r;
+
+
+
+    // Rear Torque
+
+    car_state.evTrqW_r = 0.0;
+
+    if(car_state.flDW_r > -1){
+
+      if(fabs(NmotR- car_state.FXr*car_par.rearWheelRad) > NBrkR)
+        car_state.flDW_r = 1;
+      else
+        car_state.flDW_r = 0;
+
+      if(car_state.flDW_r < 1 && car_state.OmWr == 0.0)
+        car_state.flDW_r = -1;
+
+      if(car_state.OmWr > 0.0 || ((car_state.OmWr == 0.0)&&(car_state.Vx > 0.0)))
+          car_state.evTrqW_r = NmotR - NBrkR; //- car_state.FXr*car_par.rearWheelRad;
+      else if(car_state.OmWr < 0.0 || ((car_state.OmWr == 0.0)&&(car_state.Vx < 0.0)))
+          car_state.evTrqW_r = NmotR + NBrkR; // - car_state.FXr*car_par.rearWheelRad;
+      else if((car_state.OmWr == 0.0)&&(car_state.Vx == 0.0)){
+
+        if(fabs(NmotR) < NBrkR)
+          car_state.flDW_r = -1;
+        else{
+
+            if(NmotR > 0.0)
+              car_state.evTrqW_r = NmotR - NBrkR;
+            else
+              car_state.evTrqW_r = NmotR + NBrkR;
+
+        }
+      }
+    }
+
+    // for adjusting singularities
+
+    double intention_r = 1.0;
+
+    if(car_state.OmWr > 0.0)
+      intention_r = 1.0;
+    else if(car_state.OmWr < 0.0)
+      intention_r = -1.0;
+    else if(car_state.OmWr == 0.0){
+
+         if(car_state.flDW_r > -1){
+
+             if(car_state.evTrqW_r - car_state.FXr*car_par.rearWheelRad > 0.0)
+               intention_r = 1.0;
+             else if(car_state.evTrqW_r - car_state.FXr*car_par.rearWheelRad < 0.0)
+               intention_r = -1.0;
+             else
+               intention_r = 0.0;
+
+           }
+
+      }
+
+
+  //------------- Diffs
+
+  if(solverDat.fl_first_call > 0)
+  {
+    double DFslip_r = brushModel_combined_diff(gama_r, car_state.Nr);
+    double DFslip_rDN= brushModel_combined_diff_N(gama_r, car_state.Nr);
+
+    double Fslip = Fslip_r/gama_r;
+    double sig_x = sig_xr/gama_r;
+    double sig_y = sig_yr/gama_r;
+
+    solverDat.DFX_rDlon = car_par.Cx_r*( Fslip - Fslip*sig_x*sig_x + DFslip_r*sig_x*sig_x);
+    solverDat.DFX_rDlat = car_par.Cy_r*sig_x*sig_y*(Fslip - DFslip_r);
+    solverDat.DFY_rDlon =  car_par.Cx_r*sig_x*sig_y*(DFslip_r - Fslip);
+    solverDat.DFY_rDlat = -car_par.Cy_r*( Fslip - Fslip*sig_y*sig_y + DFslip_r*sig_y*sig_y);
+    solverDat.DFX_rDN = sig_x*DFslip_rDN;
+    solverDat.DFY_rDN = sig_y*DFslip_rDN;
+
+    double lat_r =  Vyr / normK_r;
+    double lon_r = car_state.long_slip_r;
+
+    solverDat.Dlat_rDVx = 0.0;
+    solverDat.Dlat_rDVy = (1.0/normK_r);
+    solverDat.Dlat_rDOm = - solverDat.Dlat_rDVy*car_par.b;
+    solverDat.Dlat_rDOmWr = -(lat_r*solverDat.Dlat_rDVy)*car_par.rearWheelRad*intention_r;
+    //if(car_state.OmWr < 0.0)
+    //  solverDat.Dlat_rDOmWr *= -1.0;
+
+    solverDat.Dlon_rDVx = -(1.0/normK_r);
+    solverDat.Dlon_rDVy = 0.0;
+    solverDat.Dlon_rDOm = 0.0;
+    double dlon_rDOmWr1 = lon_r*solverDat.Dlon_rDVx*car_par.rearWheelRad*intention_r;
+    //if(car_state.OmWr < 0.0)
+    //  dlon_rDOmWr1 *= -1.0;
+    solverDat.Dlon_rDOmWr =dlon_rDOmWr1 - solverDat.Dlon_rDVx*car_par.rearWheelRad;
+  }
+
+
+
+  // Front wheel forces+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  double Vxf = car_state.Vx;
+  double Vyf = car_state.Vy + car_state.Om * car_par.a;
+
+  double cs = cos(car_state.steer_alpha);
+  double sn = sin(car_state.steer_alpha);
+
+  Vxw = Vxf * cs + Vyf * sn;
+  Vyw = Vyf * cs - Vxf * sn;
+
+  double WVf = car_state.OmWf * car_par.frontWheelRad;
+
+  if (culc_par.fl_Long_Circ < 3)
+    if ((car_par.drive_distrib < 0.01) && (NBrkF < 0.001)) {
+      WVf = Vxw;
+      car_state.OmWf = Vxw / car_par.frontWheelRad;
+      NBrkF = 0.0;
+      car_state.flDW_f = -1;
+    }
+
+
+  double DWf = WVf - Vxw;
+
+  double normK_f = fabs(WVf) + 0.0001;
+
+  car_state.long_slip_f = DWf / normK_f;
+
+  if (Vxw < 0.0) Vxw = (-1.0) * Vxw;
+
+  car_state.slipAng_f = atan2(Vyw, Vxw);
+
+  double sig_xf = car_par.Cx_f * car_state.long_slip_f;
+  double sig_yf = -car_par.Cy_f * Vyw / normK_f;
+
+  double gama_f = sqrt(sig_xf * sig_xf + sig_yf * sig_yf + 0.0001);
+
+  double Fslip_f = brushModel_combined(gama_f, car_state.Nf);
+
+  car_state.FXf = (sig_xf / gama_f) * Fslip_f;
+  car_state.FYf = (sig_yf / gama_f) * Fslip_f;
+
+  // Front Torque
+
+  if(car_state.flDW_f > -1){
+
+    if(fabs(NmotF- car_state.FXf*car_par.frontWheelRad) > NBrkF)
+      car_state.flDW_f = 1;
+    else
+      car_state.flDW_f = 0;
+
+    if(car_state.flDW_f < 1 && car_state.OmWf == 0.0)
+      car_state.flDW_f = -1;
+
+    if(car_state.OmWf > 0.0 || ((car_state.OmWf == 0.0)&&(Vxw > 0.0)))
+        car_state.evTrqW_f = NmotF - NBrkF;// - car_state.FXf*car_par.frontWheelRad;
+    else if(car_state.OmWf < 0.0 || ((car_state.OmWf == 0.0)&&(Vxw < 0.0)))
+        car_state.evTrqW_f = NmotF + NBrkF;// - car_state.FXf*car_par.frontWheelRad;
+    else if((car_state.OmWf == 0.0)&&(Vxw == 0.0)){
+
+      if(fabs(NmotF) < NBrkF)
+        car_state.flDW_f = -1;
+      else{
+
+          if(NmotF > 0.0)
+            car_state.evTrqW_f = NmotF - NBrkF;
+          else
+            car_state.evTrqW_f = NmotF + NBrkF;
+
+      }
+    }
+  }
+
+  // for adjusting singularities
+
+  double intention_f = 1.0;
+
+  if(car_state.OmWf > 0.0)
+    intention_f = 1.0;
+  else if(car_state.OmWf < 0.0)
+    intention_f = -1.0;
+  else if(car_state.OmWf == 0.0){
+
+       if(car_state.flDW_f > -1){
+
+           if(car_state.evTrqW_f - car_state.FXf*car_par.frontWheelRad > 0.0)
+             intention_f = 1.0;
+           else if(car_state.evTrqW_f - car_state.FXf*car_par.frontWheelRad < 0.0)
+             intention_f = -1.0;
+           else
+             intention_f = 0.0;
+
+         }
+
+    }
+
+  //-------------------- Diffs
+  if(solverDat.fl_first_call > 0)
+  {
+    double DFslip_f = brushModel_combined_diff(gama_f, car_state.Nf);
+    double DFslip_fDN= brushModel_combined_diff_N(gama_f, car_state.Nf);
+
+    double Fslip = Fslip_f/gama_f;
+    double sig_x = sig_xf/gama_f;
+    double sig_y = sig_yf/gama_f;
+
+    solverDat.DFX_fDlon = car_par.Cx_f*( Fslip - Fslip*sig_x*sig_x + DFslip_f*sig_x*sig_x);
+    solverDat.DFX_fDlat = car_par.Cy_f*sig_x*sig_y*(Fslip - DFslip_f);
+    solverDat.DFY_fDlon =  car_par.Cx_f*sig_x*sig_y*(DFslip_f - Fslip);
+    solverDat.DFY_fDlat = -car_par.Cy_f*( Fslip - Fslip*sig_y*sig_y + DFslip_f*sig_y*sig_y);
+    solverDat.DFX_fDN = sig_x*DFslip_fDN;
+    solverDat.DFY_fDN = sig_y*DFslip_fDN;
+
+    double lat_f =  Vyw / normK_f;
+    double lon_f = car_state.long_slip_f;
+
+    double Dlat_fdvy = (1.0/normK_f);
+
+    double dvyDVx= -sn;
+    double dvyDVy = cs;
+    double dvyDOm = cs*car_par.a;
+
+    solverDat.Dlat_fDVx =Dlat_fdvy*dvyDVx;
+    solverDat.Dlat_fDVy =Dlat_fdvy*dvyDVy;
+    solverDat.Dlat_fDOm =Dlat_fdvy*dvyDOm;
+    solverDat.Dlat_fDOmWf = -(lat_f*Dlat_fdvy)*car_par.frontWheelRad*intention_f;
+    //if(car_state.OmWf < 0.0)
+    //  solverDat.Dlat_fDOmWf *= -1.0;
+
+    double Dlon_fdvx = -(1.0/normK_f);
+
+    double dvxDVx = cs;
+    double dvxDVy = sn;
+    double dvxDOm = sn*car_par.a;
+
+    solverDat.Dlon_fDVx = Dlon_fdvx*dvxDVx;
+    solverDat.Dlon_fDVy = Dlon_fdvx*dvxDVy;
+    solverDat.Dlon_fDOm = Dlon_fdvx*dvxDOm;
+    double dlon_fDOmWf1 = lon_f*Dlon_fdvx*car_par.frontWheelRad*intention_f;
+    //if(car_state.OmWf < 0.0)
+    //  dlon_fDOmWf1 *= -1.0;
+    solverDat.Dlon_fDOmWf =dlon_fDOmWf1 - Dlon_fdvx*car_par.frontWheelRad;
+  }
+
+  //-------------------------------------------------------------------------
+
+  Eigen::VectorXd Y(4);
+  //Y.resize(4);
+  //Y.fill(0.0);
+
+  Y(0) = car_state.FXr;
+  Y(1) = car_state.FYr;
+  Y(2) = car_state.FXf;
+  Y(3) = car_state.FYf;
+
+  Eigen::MatrixXd DYDZ = Eigen::MatrixXd::Zero(4,6);
+  // Z = [lat_r,lon_r,lat_f,lon_f,Nr,Nf]';
+  if(solverDat.fl_first_call > 0)
+  {
+    //DYDZ.resize(4,6);
+    //DYDZ.fill(0.0);
+
+    DYDZ(0,0)=solverDat.DFX_rDlat;
+    DYDZ(0,1)=solverDat.DFX_rDlon;
+    DYDZ(0,4)=solverDat.DFX_rDN;
+    DYDZ(1,0)=solverDat.DFY_rDlat;
+    DYDZ(1,1)=solverDat.DFY_rDlon;
+    DYDZ(1,4)=solverDat.DFY_rDN;
+
+    DYDZ(2,2)=solverDat.DFX_fDlat;
+    DYDZ(2,3)=solverDat.DFX_fDlon;
+    DYDZ(2,5)=solverDat.DFX_fDN;
+    DYDZ(3,2)=solverDat.DFY_fDlat;
+    DYDZ(3,3)=solverDat.DFY_fDlon;
+    DYDZ(3,5)=solverDat.DFY_fDN;
+  }
+
+  Eigen::MatrixXd E;
+  Eigen::VectorXd X;
+
+  Eigen::MatrixXd DZDX;
+  Eigen::VectorXd D;
+  Eigen::MatrixXd G;
+
+  if((car_state.flDW_r > -1)&&(car_state.flDW_f > -1)){
+
+      solverDat.Nsys = 7;
+
+      E = Eigen::MatrixXd::Identity(7,7);
+
+      E(5,5) = dt1;
+      E(6,6) = dt1;
+
+      X = Eigen::VectorXd::Zero(7);
+
+
+      X(5) = car_state.OmWr;
+      X(6) = car_state.OmWf;
+
+      if(solverDat.fl_first_call > 0)
+      {
+
+        DZDX = Eigen::MatrixXd::Zero(6,7);
+
+      // Z = [lat_r,lon_r,lat_f,lon_f,Nr,Nf]';
+
+        DZDX(0,5)= solverDat.Dlat_rDOmWr;
+        DZDX(1,5)= solverDat.Dlon_rDOmWr;
+
+        DZDX(2,6)= solverDat.Dlat_fDOmWf;
+        DZDX(3,6)= solverDat.Dlon_fDOmWf;
+      }
+
+      D = Eigen::VectorXd::Zero(7);
+
+      D(5) = -dt1*car_state_0.OmWr - dt*(car_state.evTrqW_r/car_par.rWIn);
+      D(6) = -dt1*car_state_0.OmWf - dt*(car_state.evTrqW_f/car_par.fWIn);
+
+
+      G = Eigen::MatrixXd::Zero(7,4);
+
+      G(5,0) = dt*car_par.rearWheelRad/car_par.rWIn;
+      G(6,2) = dt*car_par.frontWheelRad/car_par.fWIn;
+
+  }
+  else if((car_state.flDW_f == -1)&&(car_state.flDW_r > -1)){
+
+      solverDat.Nsys = 6;
+
+      E = Eigen::MatrixXd::Identity(6,6);
+
+      E(5,5) = dt1;
+
+      X = Eigen::VectorXd::Zero(6);
+
+      X(5) = car_state.OmWr;
+
+      if(solverDat.fl_first_call > 0)
+      {
+
+        DZDX = Eigen::MatrixXd::Zero(6,6);
+        // Z = [lat_r,lon_r,lat_f,lon_f,Nr,Nf]';
+        DZDX(0,5)= solverDat.Dlat_rDOmWr;
+        DZDX(1,5)= solverDat.Dlon_rDOmWr;
+      }
+
+      D = Eigen::VectorXd::Zero(6);
+
+      D(5) = -dt1*car_state_0.OmWr - dt*(car_state.evTrqW_r/car_par.rWIn);
+
+      G = Eigen::MatrixXd::Zero(6,4);
+
+      G(5,0) = dt*car_par.rearWheelRad/car_par.rWIn;
+
+  }
+  else if((car_state.flDW_f > -1)&&(car_state.flDW_r == -1)){
+
+      solverDat.Nsys = 6;
+
+      E = Eigen::MatrixXd::Identity(6,6);
+      E(5,5) = dt1;
+
+      X = Eigen::VectorXd::Zero(6);
+      X(5) = car_state.OmWf;
+
+      if(solverDat.fl_first_call > 0)
+      {
+        DZDX = Eigen::MatrixXd::Zero(6,6);
+        // Z = [lat_r,lon_r,lat_f,lon_f,Nr,Nf]';
+        DZDX(2,5)= solverDat.Dlat_fDOmWf;
+        DZDX(3,5)= solverDat.Dlon_fDOmWf;
+      }
+
+      D = Eigen::VectorXd::Zero(6);
+      D(5) = -dt1*car_state_0.OmWf - dt*(car_state.evTrqW_f/car_par.fWIn);
+
+      G = Eigen::MatrixXd::Zero(6,4);
+      G(5,2) = dt*car_par.frontWheelRad/car_par.fWIn;
+  }
+  else{
+
+      solverDat.Nsys = 5;
+      E = Eigen::MatrixXd::Identity(5,5);
+
+      X = Eigen::VectorXd::Zero(5);
+
+      if(solverDat.fl_first_call > 0)
+      {
+        DZDX = Eigen::MatrixXd::Zero(6,5);
+
+      }
+      // Z = [lat_r,lon_r,lat_f,lon_f,Nr,Nf]';
+
+      D = Eigen::VectorXd::Zero(5);
+
+      G = Eigen::MatrixXd::Zero(5,4);
+
+
+  }
+
+  X(0) = car_state.Nr;
+  X(1) = car_state.Nf;
+  X(2) = car_state.Om;
+  X(3) = car_state.Vx;
+  X(4) = car_state.Vy;
+
+  if(solverDat.fl_first_call > 0)
+  {
+    DZDX(0,2)= solverDat.Dlat_rDOm;
+    DZDX(0,3)= solverDat.Dlat_rDVx;
+    DZDX(0,4)= solverDat.Dlat_rDVy;
+
+    DZDX(1,2)= solverDat.Dlon_rDOm;
+    DZDX(1,3)= solverDat.Dlon_rDVx;
+    DZDX(1,4)= solverDat.Dlon_rDVy;
+
+    DZDX(2,2)= solverDat.Dlat_fDOm;
+    DZDX(2,3)= solverDat.Dlat_fDVx;
+    DZDX(2,4)= solverDat.Dlat_fDVy;
+
+    DZDX(3,2)= solverDat.Dlon_fDOm;
+    DZDX(3,3)= solverDat.Dlon_fDVx;
+    DZDX(3,4)= solverDat.Dlon_fDVy;
+
+    DZDX(4,0) = 1.0;
+    DZDX(5,1) = 1.0;
+  }
+
+  D(0) = -car_par.mass*9.89*car_par.a/car_par.L;
+  D(1) = -car_par.mass*9.89*car_par.b/car_par.L;
+  D(2) = -dt1*car_state_0.Om;
+  D(3) = -dt1*car_state_0.Vx;
+  D(4) = -dt1*car_state_0.Vy;
+
+  double hc = car_par.CGvert/car_par.L;
+  G(0,0) = -hc;
+  G(0,2) = -hc*cs;
+  G(0,3) = hc*sn;
+  G(1,0) = hc;
+  G(1,2) = hc*cs;
+  G(1,3) = -hc*sn;
+  double dt_inrt = dt/car_par.moment_inertia;
+  G(2,1) = dt_inrt*car_par.b;
+  G(2,2) = -dt_inrt*sn*car_par.a;
+  G(2,3) = -dt_inrt*cs*car_par.a;
+  double dt_mass = (dt/car_par.mass);
+  G(3,0) = -dt_mass;
+  G(3,2) = -dt_mass*cs;
+  G(3,3) = dt_mass*sn;
+  G(4,1) = -dt_mass;
+  G(4,2) = -dt_mass*sn;
+  G(4,3) = -dt_mass*cs;
+
+  E(2,2) = dt1;
+  E(3,3) = dt1;
+  E(4,4) = dt1;
+
+  solverDat.F = E*X + G*Y + D;
+
+ // solverDat.F = X + G*Y + D;
+
+  car_state.Fdrag = car_par.Cxx*X(3)*X(3);
+  if(X(3) < 0.0)
+    car_state.Fdrag *= -1.0;
+
+  solverDat.F(3) = solverDat.F(3) + (dt/car_par.mass)*(car_state.Fdrag - car_state.addedFx);
+  solverDat.F(4) = solverDat.F(4) - (dt/car_par.mass)*car_state.addedFy;
+  solverDat.F(2) = solverDat.F(2) - (dt/car_par.moment_inertia)*car_state.addedN;
+  solverDat.F(0) = solverDat.F(0) - hc*car_state.addedFx;
+  solverDat.F(1) = solverDat.F(1) + hc*car_state.addedFx;
+
+  solverDat.F(3) = solverDat.F(3) - X(2)*X(4)*dt;
+  solverDat.F(4) = solverDat.F(4) + X(2)*X(3)*dt;
+
+  if(solverDat.fl_first_call > 0)
+  {
+    solverDat.dFdX = E + G*(DYDZ*DZDX);
+
+    solverDat.dFdX(3,2) = solverDat.dFdX(3,2) - X(4)*dt;
+    solverDat.dFdX(3,4) = solverDat.dFdX(3,4) - X(2)*dt;
+    solverDat.dFdX(4,2) = solverDat.dFdX(4,2) + X(3)*dt;
+    solverDat.dFdX(4,3) = solverDat.dFdX(4,3) + X(2)*dt;
+
+    double dFdrag = 2.0*car_par.Cxx*X(3);
+    if(X(3) < 0.0)
+      dFdrag *= -1.0;
+
+    solverDat.dFdX(3,3) = solverDat.dFdX(3,3) + (dt/car_par.mass)*dFdrag;
+  }
+
+  //solverDat.dX.resize(solverDat.Nsys);
+  if(false)
+    {
+      Eigen::VectorXd vec(solverDat.Nsys-2);
+      for(int i=2;i<solverDat.Nsys;i++)
+        vec(i-2) = X(i)+D(i)/dt1;
+
+      std::cout << sqrt(solverDat.F.transpose()*solverDat.F) << "  1  "
+          << sqrt((vec.transpose())*vec)<< " 2  " << dt*(car_state.evTrqW_r/car_par.rWIn)
+          << " 3  " << dt*(car_state.evTrqW_f/car_par.fWIn) << std::endl;
+    }
+
+  normF = solverDat.F.transpose()*solverDat.F;
+
+  if(fl_dX > 0){
+
+      if(solverDat.fl_first_call > 0)
+      {
+        solverDat.dX = solverDat.dFdX.partialPivLu().solve(-solverDat.F);
+        // solverDat.dX = solverDat.dFdX.colPivHouseholderQr().solve(-solverDat.F);
+      }
+      else
+        solverDat.dX =-solverDat.F;
+  }
+ //   solverDat.fl_first_call--;
+
+  double normdFdX = 0.0;
+
+  if(solverDat.dX.rows() == solverDat.dFdX.cols())
+    normdFdX = 2.0*solverDat.F.transpose()*(solverDat.dFdX*solverDat.dX);
+
+  std::vector<double> out_dat(2,0.0);
+  out_dat[0] = normF;
+  out_dat[1] = normdFdX;
+
+  return out_dat;
+
+
+}
+
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void DynamicCar::treatSingularities(){
+
+ // return;
+
+  double treshsld = 0.0000001;
+
+   if(car_state.flDW_r > -1)
+    if(fabs(car_state.OmWr) < treshsld){
+
+       if(car_state.flDW_r < 1){
+
+           car_state.OmWr = 0.0;
+           car_state.flDW_r = -1;
+
+
+       }
+       else{
+
+           car_state.OmWr = treshsld;
+           if(car_state.evTrqW_r- car_state.FXr*car_par.rearWheelRad < 0.0)
+             car_state.OmWr = -treshsld;
+         }
+
+    }
+
+
+   if(car_state.flDW_f > -1)
+    if(fabs(car_state.OmWf) < treshsld){
+
+       if(car_state.flDW_f < 1){
+
+           car_state.OmWf = 0.0;
+           car_state.flDW_f = -1;
+
+
+       }
+       else{
+
+           car_state.OmWf = treshsld;
+           if(car_state.evTrqW_f- car_state.FXf*car_par.frontWheelRad < 0.0)
+             car_state.OmWf = -treshsld;
+         }
+
+    }
+
+
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void DynamicCar::analyseDissForces(double NmotF,double NmotR,double NBrkF,double NBrkR){
+
+    car_state.flDW_f = 1;
+    car_state.flDW_r = 1;
+
+  // Tire Forces (Combined Slip)
+
+    double Vxw;
+    double Vyw; // velocity components at the point of front wheel in the inertial coordinate system of front wheel
+
+    double Vxr = car_state.Vx;
+    double WVr = car_state.OmWr * car_par.rearWheelRad;
+    double Vyr = car_state.Vy - car_state.Om * car_par.b;
+
+    if (culc_par.fl_Long_Circ < 3)
+      if ((car_par.drive_distrib > 0.99) && (NBrkR < 0.001))
+      {
+        WVr = Vxr;
+        car_state.OmWr = Vxr / car_par.rearWheelRad;
+        NBrkR = 0.0;
+         car_state.flDW_r = -1;
+      }
+
+    double DWr = WVr - Vxr;
+
+    double normK_r = fabs(WVr) + 0.0001;
+
+    car_state.long_slip_r = DWr / normK_r;
+
+    if (Vxr < 0.0) Vxr = (-1.0) * Vxr;
+
+    car_state.slipAng_r = atan2(Vyr, Vxr);
+
+    double sig_xr = car_par.Cx_r * car_state.long_slip_r;
+    double sig_yr = -car_par.Cy_r * Vyr / normK_r;
+
+    double gama_r = sqrt(sig_xr * sig_xr + sig_yr * sig_yr + 0.0001);
+
+    double Fslip_r = brushModel_combined(gama_r, car_state.Nr);
+
+    car_state.FXr = (sig_xr / gama_r) * Fslip_r;
+    car_state.FYr = (sig_yr / gama_r) * Fslip_r;
+
+    double Vxf = car_state.Vx;
+    double Vyf = car_state.Vy + car_state.Om * car_par.a;
+
+    double cs = cos(car_state.steer_alpha);
+    double sn = sin(car_state.steer_alpha);
+
+    Vxw = Vxf * cs + Vyf * sn;
+    Vyw = Vyf * cs - Vxf * sn;
+
+    double WVf = car_state.OmWf * car_par.frontWheelRad;
+
+    if (culc_par.fl_Long_Circ < 3)
+      if ((car_par.drive_distrib < 0.01) && (NBrkF < 0.001)) {
+        WVf = Vxw;
+        car_state.OmWf = Vxw / car_par.frontWheelRad;
+        NBrkF = 0.0;
+        car_state.flDW_f = -1;
+      }
+
+    double DWf = WVf - Vxw;
+
+    double normK_f = fabs(WVf) + 0.0001;
+
+    car_state.long_slip_f = DWf / normK_f;
+
+    if (Vxw < 0.0) Vxw = (-1.0) * Vxw;
+
+    car_state.slipAng_f = atan2(Vyw, Vxw);
+
+    double sig_xf = car_par.Cx_f * car_state.long_slip_f;
+    double sig_yf = -car_par.Cy_f * Vyw / normK_f;
+
+    double gama_f = sqrt(sig_xf * sig_xf + sig_yf * sig_yf + 0.0001);
+
+    double Fslip_f = brushModel_combined(gama_f, car_state.Nf);
+
+    car_state.FXf = (sig_xf / gama_f) * Fslip_f;
+    car_state.FYf = (sig_yf / gama_f) * Fslip_f;
+
+  // Dissipative Forces
+
+    car_state.evTrqW_f = 0.0;
+    car_state.evTrqW_r = 0.0;
+
+    if(car_par.drive_distrib < 0.01)
+        NBrkR += car_par.rollingResistance*car_par.rearWheelRad;
+    else if(car_par.drive_distrib > 0.99)
+        NBrkF += car_par.rollingResistance*car_par.frontWheelRad;
+    else{
+
+        NBrkR += car_par.rollingResistance*car_par.rearWheelRad*(1.0 - car_par.drive_distrib);
+        NBrkF += car_par.rollingResistance*car_par.frontWheelRad*car_par.drive_distrib;
+      }
+
+    // Rear
+
+    if(car_state.flDW_r > -1){
+
+      if(fabs(NmotR- car_state.FXr*car_par.rearWheelRad) > NBrkR)
+        car_state.flDW_r = 1;
+      else
+        car_state.flDW_r = 0;
+
+      if(car_state.OmWr > 0.0 || ((car_state.OmWr == 0.0)&&(car_state.Vx > 0.0)))
+          car_state.evTrqW_r = NmotR - NBrkR; //- car_state.FXr*car_par.rearWheelRad;
+      else if(car_state.OmWr < 0.0 || ((car_state.OmWr == 0.0)&&(car_state.Vx < 0.0)))
+          car_state.evTrqW_r = NmotR + NBrkR; // - car_state.FXr*car_par.rearWheelRad;
+      else if((car_state.OmWr == 0.0)&&(car_state.Vx == 0.0)){
+
+        if(fabs(NmotR) < NBrkR)
+          car_state.flDW_r = -1;
+        else{
+
+            if(NmotR > 0.0)
+              car_state.evTrqW_r = NmotR - NBrkR;
+            else
+              car_state.evTrqW_r = NmotR + NBrkR;
+
+        }
+      }
+    }
+
+    // Front
+
+    if(car_state.flDW_f > -1){
+
+      if(fabs(NmotF- car_state.FXf*car_par.frontWheelRad) > NBrkF)
+        car_state.flDW_f = 1;
+      else
+        car_state.flDW_f = 0;
+
+      if(car_state.OmWf > 0.0 || ((car_state.OmWf == 0.0)&&(Vxw > 0.0)))
+          car_state.evTrqW_f = NmotF - NBrkF;// - car_state.FXf*car_par.frontWheelRad;
+      else if(car_state.OmWf < 0.0 || ((car_state.OmWf == 0.0)&&(Vxw < 0.0)))
+          car_state.evTrqW_f = NmotF + NBrkF;// - car_state.FXf*car_par.frontWheelRad;
+      else if((car_state.OmWf == 0.0)&&(Vxw == 0.0)){
+
+        if(fabs(NmotF) < NBrkF)
+          car_state.flDW_f = -1;
+        else{
+
+            if(NmotF > 0.0)
+              car_state.evTrqW_f = NmotF - NBrkF;
+            else
+              car_state.evTrqW_f = NmotF + NBrkF;
+
+        }
+      }
+    }
+
+    // AERO Drag
+
+    car_state.Fdrag = car_par.Cxx*car_state.Vx*car_state.Vx;
+
+    if(car_state.Vx < 0.0)
+      car_state.Fdrag *= -1.0;
+
+
+
+
+}
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+
+//-////////////////////////////////////
+double DynamicCar::analize_dt(double t){
+
+
+
+    double dt = t;
+
+    if(culc_par.fl_RunKut >= 0)
+      return dt;
+
+    if(fl_first_call == 1){
+
+        fl_first_call =0;
+
+        return dt = 0.0000001;
+    }
+
+
+    if(culc_par.fl_RunKut < -1){
+
+        if(car_par.drive_distrib > 0.01)
+            return dt;
+
+        if(car_state.OmWr < 0.0)
+            return dt;
+
+        if(car_state.Vx < 0.0)
+            return dt;
+
+        double VW = car_par.rearWheelRad*car_state.OmWr;
+        double AW = car_par.rearWheelRad*car_state.dOmWrdt;
+
+        double f = (-VW*car_state.dVxdt + AW*car_state.Vx + 0.001*(AW - car_state.dVxdt))/((VW +0.001)*(VW + 0.001));
+
+        if(f <= 1.0)
+            return dt;
+
+        if(f >= 10000.0)
+            dt = 0.000001;
+        else
+            dt = 0.01/f;
+
+        dt = 0.0000001;
+    }
+    else{
+
+        double Vxr = car_state.Vx;
+        double WVr = car_state.OmWr*car_par.rearWheelRad;
+        double Vyr = car_state.Vy - car_state.Om*car_par.b;
+
+        double DWr = WVr - Vxr;
+
+        double normK_r = fabs(WVr) + 0.001;
+
+        double long_slip_r = fabs(DWr/normK_r);
+
+
+        if(culc_par.fl_Long_Circ < 3)
+            if((car_par.drive_distrib > 0.99)&&(fl_AccBrkMode > 0)){
+
+               long_slip_r = 0.0;
+            }
+
+        if(Vxr < 0.0)
+            Vxr = (-1.0)*Vxr;
+
+        double slipAng_r = fabs(atan2(Vyr,Vxr+0.001));
+
+
+        double Vxf = car_state.Vx;
+        double Vyf = car_state.Vy + car_state.Om*car_par.a;
+
+        double cs = cos(car_state.steer_alpha);
+        double sn = sin(car_state.steer_alpha);
+
+        double Vxw = Vxf*cs + Vyf*sn;
+        double Vyw = Vyf*cs - Vxf*sn;
+
+
+
+        double WVf = car_state.OmWf*car_par.frontWheelRad;
+
+
+
+        double DWf = WVf - Vxw;
+
+        double normK_f = fabs(WVf) + 0.001;
+
+        double long_slip_f = fabs(DWf/normK_f);
+
+        if(culc_par.fl_Long_Circ < 3)
+            if((car_par.drive_distrib < 0.01)&&(fl_AccBrkMode > 0)){
+
+                long_slip_f = 0.0;
+            }
+
+
+        if(Vxw < 0.0)
+            Vxw = (-1.0)*Vxw;
+
+        double slipAng_f = fabs(atan2(Vyw,Vxw + 0.001));
+
+        double lim_angle = 2.0*(M_PI/180.0);
+
+        if(((long_slip_f > lim_angle)||(slipAng_f > lim_angle))||((long_slip_r > lim_angle)||(slipAng_r > lim_angle)))
+            dt = 0.0000001;
+        else if(fabs(car_state.Vx) < 2.0)
+            dt = 0.0000001;
+
+
+    }
+
+  //  std::cout << " ----------------------- dt correction ---------------------------" << std::endl;
+
+    return dt;
+
+
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::integrNavkinematictest(double dt) {
+  // dVxdt = ax;
+  // Vy = 0
+  // Om = Vx*tan(steer_alpha)/L;
+  // dpsidt = Om;
+  // dxdt = Vx*cos(psi);
+  // dydt = Vx*sin(psi);
+
+  if (culc_par.fl_RunKut < 1) evolutionControl(dt);
+
+  combinedSlip();
+
+  car_state.Om = car_state.Vx * tan(car_state.steer_alpha) / car_par.L;
+  car_state.Vy = car_state.Om * car_par.b;
+  double kx1 =
+      (car_state.Vx * cos(car_state.psi) - car_state.Vy * sin(car_state.psi));
+  double ky1 =
+      (car_state.Vx * sin(car_state.psi) + car_state.Vy * cos(car_state.psi));
+  double kpsi1 = car_state.Om;
+  double kVx1 = car_state.accel;
+
+  double x0 = car_state.x;
+  double y0 = car_state.y;
+  double psi0 = car_state.psi;
+  double Vx0 = car_state.Vx;
+
+  if (culc_par.fl_RunKut > 0) {
+    car_state.x = x0 + 0.5 * kx1 * dt;
+    car_state.y = y0 + 0.5 * ky1 * dt;
+    car_state.psi = psi0 + 0.5 * kpsi1 * dt;
+    car_state.Vx = Vx0 + 0.5 * kVx1 * dt;
+
+    car_state.dVxdt = car_state.accel;
+
+    evolutionControl(0.5 * dt);
+
+    car_state.Om = car_state.Vx * tan(car_state.steer_alpha) / car_par.L;
+    car_state.Vy = car_state.Om * car_par.b;
+    double kx2 =
+        (car_state.Vx * cos(car_state.psi) - car_state.Vy * sin(car_state.psi));
+    double ky2 =
+        (car_state.Vx * sin(car_state.psi) + car_state.Vy * cos(car_state.psi));
+    double kpsi2 = car_state.Om;
+    double kVx2 = car_state.accel;
+
+    car_state.x = x0 + 0.5 * kx2 * dt;
+    car_state.y = y0 + 0.5 * ky2 * dt;
+    car_state.psi = psi0 + 0.5 * kpsi2 * dt;
+    car_state.Vx = Vx0 + 0.5 * kVx2 * dt;
+
+    car_state.dVxdt = car_state.accel;
+
+    // actuators have the same state (t+0.5*dt)
+
+    car_state.Om = car_state.Vx * tan(car_state.steer_alpha) / car_par.L;
+    car_state.Vy = car_state.Om * car_par.b;
+    double kx3 =
+        (car_state.Vx * cos(car_state.psi) - car_state.Vy * sin(car_state.psi));
+    double ky3 =
+        (car_state.Vx * sin(car_state.psi) + car_state.Vy * cos(car_state.psi));
+    double kpsi3 = car_state.Om;
+    double kVx3 = car_state.accel;
+
+    car_state.x = x0 + 0.5 * kx3 * dt;
+    car_state.y = y0 + 0.5 * ky3 * dt;
+    car_state.psi = psi0 + 0.5 * kpsi3 * dt;
+    car_state.Vx = Vx0 + 0.5 * kVx3 * dt;
+
+    car_state.dVxdt = car_state.accel;
+
+    evolutionControl(0.5 * dt);  // actuators have changed in corresponding to
+                                 // changing time from t to t + dt
+    combinedSlip();
+
+    car_state.Om = car_state.Vx * tan(car_state.steer_alpha) / car_par.L;
+    car_state.Vy = car_state.Om * car_par.b;
+    double kx4 =
+        (car_state.Vx * cos(car_state.psi) - car_state.Vy * sin(car_state.psi));
+    double ky4 =
+        (car_state.Vx * sin(car_state.psi) + car_state.Vy * cos(car_state.psi));
+    double kpsi4 = car_state.Om;
+    double kVx4 = car_state.accel;
+    // Runge modifications:
+
+    kx1 = (kx1 + 2 * kx2 + 2 * kx3 + kx4) / 6.0;
+    ky1 = (ky1 + 2 * ky2 + 2 * ky3 + ky4) / 6.0;
+    kpsi1 = (kpsi1 + 2 * kpsi2 + 2 * kpsi3 + kpsi4) / 6.0;
+    kVx1 = (kVx1 + 2 * kVx2 + 2 * kVx3 + kVx4) / 6.0;
+  }
+
+  car_state.x = x0 + kx1 * dt;
+  car_state.y = y0 + ky1 * dt;
+  car_state.psi = psi0 + kpsi1 * dt;
+  car_state.Vx = Vx0 + kVx1 * dt;
+  car_state.Om = car_state.Vx * tan(car_state.steer_alpha) / car_par.L;
+  car_state.Vy = car_state.Om * car_par.b;
+
+  car_state.dVxdt = kVx1;
+
+  if (((car_state.Vx < 0.0) && (fl_reverse == 0)) ||
+      ((car_state.Vx > 0.0) && (fl_reverse > 0))) {
+    car_state.x = x0;
+    car_state.y = y0;
+    car_state.psi = psi0;
+    car_state.Vx = 0.0;
+    car_state.Vy = 0.0;
+    car_state.Om = 0.0;
+
+    car_state.dVxdt = 0.0;
+  }
+
+  nav_to_cog(1);
+}
+//-------------------------------------------------------------------------------------------------------------------
+//-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//-////////////////////////////////////
+void DynamicCar::nav_to_cog(int Fl_reverse) {
+  double cs = cos(car_state.psi);
+  double sn = sin(car_state.psi);
+
+  if (Fl_reverse == 0) {
+    car_state.x = car_state.xc + car_par.b * cs;
+    car_state.y = car_state.yc + car_par.b * sn;
+
+  } else {
+    car_state.xc = car_state.x - car_par.b * cs;
+    car_state.yc = car_state.y - car_par.b * sn;
+  }
+}
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+//---/////////////////////////////////////////////////
+void DynamicCar::init_nav(double x, double y, double psi, double v) {
+  car_state.x = x;
+  car_state.y = y;
+  car_state.psi = psi;
+  car_state.Vx = v;
+
+  nav_to_cog(1);
+
+  //---------------
+
+  car_state.OmWf = car_state.Vx / car_par.frontWheelRad;
+  car_state.OmWr = car_state.Vx / car_par.rearWheelRad;
+
+  if (fabs(car_state.Vx) > 0.00001) car_state.state = 1;
+
+  car_state.initialized += 1;
+
+  car_state.Nr = 9.89*car_par.mass*car_par.a/car_par.L;
+  car_state.Nf = 9.89*car_par.mass*car_par.b/car_par.L;
+
+
+  //  std::cout << "V0 = " << car_state.Vx << std::endl;
+}
+
+void DynamicCar::reset_state() {
+	fl_reverse = 0;
+	car_state.state = 0;
+	car_state.xc = 0;
+	car_state.yc = 0;
+	car_state.psi = 0;
+	nav_to_cog(0);
+	car_state.Vx = 0.0;
+	car_state.Vy = 0.0;
+	car_state.accel = 0.0;
+	car_state.steer_alpha = 0.0;
+	car_state.dVxdt = 0.0;
+	//   car_state.dVydt =  0.0;
+	//   car_state.dOmdt =  0.0;
+	car_state.slipAng_f = 0.0;
+	car_state.slipAng_r = 0.0;
+	car_state.FYf = 0.0;
+	car_state.FYr = 0.0;
+	car_state.FXf = 0.0;
+	car_state.FXr = 0.0;
+	car_state.FXf_req = 0.0;
+	car_state.FXr_req = 0.0;
+	car_state.B_pressure = 0.0;
+	car_state.B_pressure_req = 0.0;
+	car_state.OmWf = 0.0;
+	car_state.OmWr = 0.0;
+	car_state.long_slip_f = 0.0;
+	car_state.long_slip_r = 0.0;
+	car_state.callcount = 0;
+	car_state.Nr = 9.89*car_par.mass*car_par.a/car_par.L;
+	car_state.Nf = 9.89*car_par.mass*car_par.b/car_par.L;
+}
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// /*
+
+static DynamicCar dcar(Eigen::Vector3d::Zero(3));
+static DynamicPar *dynpar_pt;
+
+extern "C" void initModel(double x, double y, double psi, double v ) {
+  dynpar_pt = new DynamicPar();
+  dcar.culc_par = dynpar_pt->culc_par;
+  dcar.car_par = dynpar_pt->car_par;
+  dcar.reset_state();
+  dcar.init_nav(x, y, psi, v);
+
+  //dcar.car_par.Om_nullTorque = 201.0;
+  //std::cout << "initModel(): " << dcar.car_par.Om_nullTorque << std::endl;
+
+  std::cout << "Vehicle initModel() with params: " << std::endl;
+
+  //output parameters
+  std::cout << "fl_drag_taking: " << dcar.culc_par.fl_drag_taking << std::endl;
+  std::cout << "fl_Long_Circ: " << dcar.culc_par.fl_Long_Circ << std::endl;
+  std::cout << "fl_static_load: " << dcar.culc_par.fl_static_load << std::endl;
+  std::cout << "fl_RunKut: " << dcar.culc_par.fl_RunKut << std::endl;
+  std::cout << "implicit_solver: " << dcar.culc_par.implicit_solver << std::endl;
+  std::cout << "num_impl_nonlin_it: " << dcar.culc_par.num_impl_nonlin_it << std::endl;
+  std::cout << "nsteps: " << dcar.culc_par.nsteps << std::endl;
+  std::cout << "fl_act_low: " << dcar.culc_par.fl_act_low << std::endl;
+  std::cout << "a: " << dcar.car_par.a << std::endl;
+  std::cout << "b: " << dcar.car_par.b << std::endl;
+  std::cout << "L: " << dcar.car_par.L << std::endl;
+  std::cout << "max_steer: " << dcar.car_par.max_steer << std::endl;
+  std::cout << "mu: " << dcar.car_par.mu << std::endl;
+  std::cout << "max_accel: " << dcar.car_par.max_accel << std::endl;
+  std::cout << "CGvert: " << dcar.car_par.CGvert << std::endl;
+  std::cout << "mass: " << dcar.car_par.mass << std::endl;
+  std::cout << "moment_inertia: " << dcar.car_par.moment_inertia << std::endl;
+  std::cout << "Cy_f: " << dcar.car_par.Cy_f << std::endl;
+  std::cout << "Cy_r: " << dcar.car_par.Cy_r << std::endl;
+  std::cout << "Cx_f: " << dcar.car_par.Cx_f << std::endl;
+  std::cout << "Cx_r: " << dcar.car_par.Cx_r << std::endl;
+  std::cout << "drive_distrib: " << dcar.car_par.drive_distrib << std::endl;
+  std::cout << "frontWheelRad: " << dcar.car_par.frontWheelRad << std::endl;
+  std::cout << "rearWheelRad: " << dcar.car_par.rearWheelRad << std::endl;
+  std::cout << "maxPowerEngine: " << dcar.car_par.maxPowerEngine << std::endl;
+  std::cout << "maxTorqueEngine: " << dcar.car_par.maxTorqueEngine << std::endl;
+  std::cout << "n_engines: " << dcar.car_par.n_engines << std::endl;
+  std::cout << "maxBrakePressure: " << dcar.car_par.maxBrakePressure << std::endl;
+  std::cout << "maxGradBrakePressure: " << dcar.car_par.maxGradBrakePressure << std::endl;
+  std::cout << "kBrake_f: " << dcar.car_par.kBrake_f << std::endl;
+  std::cout << "kBrake_r: " << dcar.car_par.kBrake_r << std::endl;
+  std::cout << "n_brakes: " << dcar.car_par.n_brakes << std::endl;
+  std::cout << "maxGradSteer: " << dcar.car_par.maxGradSteer << std::endl;
+  std::cout << "rollingResistance: " << dcar.car_par.rollingResistance << std::endl;
+  std::cout << "rollingResistanceSpeedDepended: " << dcar.car_par.rollingResistanceSpeedDepended << std::endl;
+  std::cout << "Cxx: " << dcar.car_par.Cxx << std::endl;
+  std::cout << "fWIn: " << dcar.car_par.fWIn << std::endl;
+  std::cout << "rWIn: " << dcar.car_par.rWIn << std::endl;
+ }
+
+extern "C" void stepFunc1(double steer, double accel_des, double dt,
+			 int reverse_fl, double speed_des, double X_init, double Y_init, double Psi_init, double Vx_init,
+						CarParameters *__params, int VehReset, car_state_t* __dcar) {
+  double ax = accel_des / dcar.car_par.mass;
+
+  if ((!dcar.car_state.initialized) | (VehReset))  {
+      initModel(X_init, Y_init, Psi_init, Vx_init);
+      mySetParamFunction(__params);
+  }
+
+
+
+  dcar.dynamicNav_ev(steer, ax, dt, reverse_fl, 0.0001);
+  *__dcar = dcar.car_state;
+  // std::cout << " X: " << dcar.car_state.x << std::endl;
+  //  __dcar->lat_slip = (__dcar->slipAng_r + __dcar->slipAng_f) / 2.0;
+}
+
+
+extern "C" void myTerminateFunction() {
+	if (dynpar_pt)
+	{
+		free(dynpar_pt);
+		std::cout << "Vehicle terminated " << std::endl;
+	}
+}
+
+extern "C" void mySetParamFunction(CarParameters *new_par) {
+	dcar.car_par = *new_par;
+
+	std::cout << "Setting new car params: " << std::endl;
+	//output parameters
+	std::cout << "a: " << dcar.car_par.a << std::endl;
+	std::cout << "b: " << dcar.car_par.b << std::endl;
+	std::cout << "L: " << dcar.car_par.L << std::endl;
+	std::cout << "max_steer: " << dcar.car_par.max_steer << std::endl;
+	std::cout << "mu: " << dcar.car_par.mu << std::endl;
+	std::cout << "max_accel: " << dcar.car_par.max_accel << std::endl;
+	std::cout << "CGvert: " << dcar.car_par.CGvert << std::endl;
+	std::cout << "mass: " << dcar.car_par.mass << std::endl;
+	std::cout << "moment_inertia: " << dcar.car_par.moment_inertia << std::endl;
+	std::cout << "Cy_f: " << dcar.car_par.Cy_f << std::endl;
+	std::cout << "Cy_r: " << dcar.car_par.Cy_r << std::endl;
+	std::cout << "Cx_f: " << dcar.car_par.Cx_f << std::endl;
+	std::cout << "Cx_r: " << dcar.car_par.Cx_r << std::endl;
+	std::cout << "drive_distrib: " << dcar.car_par.drive_distrib << std::endl;
+	std::cout << "frontWheelRad: " << dcar.car_par.frontWheelRad << std::endl;
+	std::cout << "rearWheelRad: " << dcar.car_par.rearWheelRad << std::endl;
+	std::cout << "maxPowerEngine: " << dcar.car_par.maxPowerEngine << std::endl;
+	std::cout << "maxTorqueEngine: " << dcar.car_par.maxTorqueEngine << std::endl;
+	std::cout << "n_engines: " << dcar.car_par.n_engines << std::endl;
+	std::cout << "maxBrakePressure: " << dcar.car_par.maxBrakePressure << std::endl;
+	std::cout << "maxGradBrakePressure: " << dcar.car_par.maxGradBrakePressure << std::endl;
+	std::cout << "kBrake_f: " << dcar.car_par.kBrake_f << std::endl;
+	std::cout << "kBrake_r: " << dcar.car_par.kBrake_r << std::endl;
+	std::cout << "n_brakes: " << dcar.car_par.n_brakes << std::endl;
+	std::cout << "maxGradSteer: " << dcar.car_par.maxGradSteer << std::endl;
+	std::cout << "rollingResistance: " << dcar.car_par.rollingResistance << std::endl;
+	std::cout << "rollingResistanceSpeedDepended: " << dcar.car_par.rollingResistanceSpeedDepended << std::endl;
+	std::cout << "Cxx: " << dcar.car_par.Cxx << std::endl;
+	std::cout << "fWIn: " << dcar.car_par.fWIn << std::endl;
+	std::cout << "rWIn: " << dcar.car_par.rWIn << std::endl;
+}
+
+// */
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/NCOMWheeledVehicleMovement.cpp b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/NCOMWheeledVehicleMovement.cpp
new file mode 100644
index 0000000..1e5f89c
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/NCOMWheeledVehicleMovement.cpp
@@ -0,0 +1,395 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/WheeledVehicleMovements/NCOMWheeledVehicleMovement.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Engine.h"
+#include "Engine/Canvas.h"
+#include "Engine/CollisionProfile.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/LevelState.h"
+#include "SodaSimProto/NComRxC.h"
+#include "SodaSimProto/NComRxDefines.h"
+#include "Components/SkinnedMeshComponent.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+
+#if PLATFORM_LINUX
+#include "BSDSockets/SocketsBSD.h"
+#	ifndef SO_REUSEPORT 
+#		define SO_REUSEPORT	15
+#	endif
+#endif
+
+UNCOMWheeledVehicleMovement::UNCOMWheeledVehicleMovement(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("NCOM Vehicle");
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+	bWantsInitializeComponent = true;
+}
+
+void UNCOMWheeledVehicleMovement::InitializeComponent()
+{
+	Super::InitializeComponent();
+
+	LevelState = ALevelState::Get();
+}
+
+void UNCOMWheeledVehicleMovement::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+}
+
+void UNCOMWheeledVehicleMovement::BeginPlay()
+{
+	Super::BeginPlay();
+	check(LevelState);
+}
+
+void UNCOMWheeledVehicleMovement::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	if (UDPReceiver)
+	{
+		UDPReceiver->Stop();
+		delete UDPReceiver;
+	}
+
+	if (ListenSocket)
+	{
+		delete ListenSocket;
+	}
+}
+
+void UNCOMWheeledVehicleMovement::OnPreActivateVehicleComponent()
+{
+	Super::OnPreActivateVehicleComponent();
+
+	if (GetWheeledVehicle()->Is4WDVehicle())
+	{
+		GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->Radius = FrontWheelRadius;
+		GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->Radius = FrontWheelRadius;
+		GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->Radius = RearWheelRadius;
+		GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->Radius = RearWheelRadius;
+	}
+
+
+	OnSetActiveMovement();
+}
+
+bool UNCOMWheeledVehicleMovement::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	InitTransform = UpdatedPrimitive->GetComponentTransform();
+
+	USkinnedMeshComponent* Mesh = Cast< USkinnedMeshComponent >(UpdatedPrimitive);
+	if (!Mesh)
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Forgot UNCOMWheeledVehicleMovement"));
+		UE_LOG(LogSoda, Error, TEXT("Forgot to set Mesh to UNCOMWheeledVehicleMovement?"));
+		return false;
+	}
+
+	Mesh->SetEnableGravity(false);
+	Mesh->SetSimulatePhysics(false);
+	Mesh->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Overlap);
+	Mesh->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = UpdatedPrimitive->GetComponentTransform();
+
+
+	FIPv4Endpoint Endpoint(FIPv4Address(0, 0, 0, 0), NCOMPort);
+	ListenSocket = FUdpSocketBuilder(TEXT("NCOMWheeledVehicleMovement"))
+		.AsNonBlocking()
+		.AsReusable()
+		.BoundToEndpoint(Endpoint)
+		.WithReceiveBufferSize(0xFFFF);
+
+	if (ListenSocket)
+	{
+#if PLATFORM_LINUX
+		SOCKET RawSocket = ((FSocketBSD*)ListenSocket)->GetNativeSocket();
+		int Param = 1;
+		if (setsockopt(RawSocket, SOL_SOCKET, SO_REUSEPORT, (char*)&Param, sizeof(Param)) != 0)
+		{
+			UE_LOG(LogSoda, Warning, TEXT("UNCOMWheeledVehicleMovement::BeginPlay(). Can't setsockopt(SO_REUSEPORT)"));
+		}
+#endif
+		FTimespan ThreadWaitTime = FTimespan::FromMilliseconds(100);
+		UDPReceiver = new FUdpSocketReceiver(ListenSocket, ThreadWaitTime, TEXT("NCOMWheeledVehicleMovement"));
+		UDPReceiver->OnDataReceived().BindLambda([this](const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt)
+			{
+				Recv(ArrayReaderPtr, EndPt);
+			});
+		UDPReceiver->Start();
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("UNCOMWheeledVehicleMovement::BeginPlay(). Can't create socket"));
+		return false;
+	}
+
+	return true;
+}
+
+void UNCOMWheeledVehicleMovement::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+}
+
+void UNCOMWheeledVehicleMovement::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!HealthIsWorkable()) return;
+
+	/*
+	if(bLogPhysStemp)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("2WDVehicle, FixSimSetp: %i, FixSimTimeStep: %s , Pos: %s"), RenderFrameSimulatedStep, *USodaStatics::Int64ToString(FixedSimTimeStep), *NewLoc.ToString());
+	}
+	*/
+
+	static const std::chrono::nanoseconds Timeout(100000000ll);
+
+	bIsConnected = (soda::Now() - LastPacketTimestamp) < Timeout;
+
+	if (bIsConnected && bIsOXTSDataValid)
+	{
+
+		Mutex.lock();
+		FPhysBodyKinematic SavedVehicleKinematic = VehicleSimData.VehicleKinematic;
+		VehicleSimData.RenderStep = VehicleSimData.SimulatedStep;
+		VehicleSimData.RenderTimestamp = VehicleSimData.SimulatedTimestamp;
+		Mutex.unlock();
+
+		if (UpdatedPrimitive)
+		{
+			UpdatedPrimitive->SetWorldLocationAndRotationNoPhysics(
+				SavedVehicleKinematic.Curr.GlobalPose.GetTranslation(),
+				SavedVehicleKinematic.Curr.GlobalPose.Rotator());
+		}
+	}
+}
+
+void UNCOMWheeledVehicleMovement::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+	
+	if (Common.bDrawDebugCanvas && GetHealth() != EVehicleComponentHealth::Disabled)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+
+		if (bIsConnected)
+		{
+			if (!bIsOXTSDataValid)
+			{
+				Canvas->SetDrawColor(FColor::Red);
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Connected: true")), 16, YPos);
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("NCOM data not valid")), 16, YPos);
+				Canvas->SetDrawColor(FColor::White);
+			}
+			else
+			{
+				Canvas->SetDrawColor(FColor::White);
+				YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Connected: true")), 16, YPos);
+			}
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS_SatellitesNumber: %i"), OXTS_SatellitesNumber), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS_PositionMode: %i"), OXTS_PositionMode), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS_VelocityMode: %i"), OXTS_VelocityMode), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS_OrientationMode: %i"), OXTS_OrientationMode), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS_GPSMinutes: %i"), OXTS_GPSMinutes), 16, YPos);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("OXTS_Miliseconds: %i"), OXTS_Miliseconds), 16, YPos);
+		}
+		else
+		{
+			Canvas->SetDrawColor(FColor::Red);
+			YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Connected: false")), 16, YPos);
+		}
+	}
+}
+
+bool UNCOMWheeledVehicleMovement::SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation)
+{
+	return false;
+}
+
+void UNCOMWheeledVehicleMovement::Recv(const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt)
+{
+	bool bIsOXTSDataValidTmp = true;
+	if (ArrayReaderPtr->Num() != 72)
+	{
+		UE_LOG(LogSoda, Error, TEXT("UNCOMWheeledVehicleMovement::Recv(); Protocol error, recve %d bytes, was expected 72 bytes"), ArrayReaderPtr->Num());
+		bIsOXTSDataValidTmp = false;
+		return;
+	}
+
+	BitStream.Buf.SetNum(72);
+	::memcpy(BitStream.Buf.GetData(), ArrayReaderPtr->GetData(), 72);
+
+	BitStream.SetOffset(0);
+	OXTSPacket.sync       = BitStream.GetBytes<uint8_t>(1);
+	OXTSPacket.time       = BitStream.GetBytes<uint16_t>(2);
+	OXTSPacket.accel_x    = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.accel_y    = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.accel_z    = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.gyro_x     = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.gyro_y     = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.gyro_z     = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.nav_status = BitStream.GetBytes<uint8_t>(1);
+	OXTSPacket.chksum1    = BitStream.GetBytes<uint8_t>(1);
+	BitStream.GetBytes(&OXTSPacket._lat.c, 8);
+	BitStream.GetBytes(&OXTSPacket._lon.c, 8);
+	BitStream.GetBytes(&OXTSPacket._alt.c, 4);
+	OXTSPacket.vel_north  = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.vel_east   = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.vel_down   = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.heading    = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.pitch      = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.roll       = BitStream.GetBytes<int32_t>(3);
+	OXTSPacket.chksum2    = BitStream.GetBytes<uint8_t>(1);
+	OXTSPacket.channel    = BitStream.GetBytes<uint8_t>(1);
+	BitStream.GetBytes(&OXTSPacket.chan.bytes, 8);
+	OXTSPacket.chksum3    = BitStream.GetBytes<uint8_t>(1);
+	check(BitStream.GetOffset() == 72 * 8);
+
+	auto Timestemp = soda::Now();
+	double DeltaTime = std::chrono::duration_cast<std::chrono::duration<double>>(Timestemp - LastPacketTimestamp).count();
+	LastPacketTimestamp = Timestemp;
+	
+	FVector WorldPos;
+	FRotator WorldRot;
+	FVector LocalAcc;
+	FVector AngularVelocity;
+	FVector WorldVel;
+
+
+	OXTS_Miliseconds = OXTSPacket.time;
+	//OXTSPacket.sync == NCOM_SYNC;
+	//OXTSPacket.nav_status == NAVIGATION_STATUS_LOCKED;
+	//OXTSPacket.chksum1 == FOXTSPublisher::Checksum(OXTSPacket, sizeof(OXTSPacket.sync), offsetof(soda::OxtsPacket, chksum1));
+	//OXTSPacket.chksum2 == FOXTSPublisher::Checksum(OXTSPacket, sizeof(OXTSPacket.sync), offsetof(soda::OxtsPacket, chksum2));
+	//OXTSPacket.chksum3 == FOXTSPublisher::Checksum(OXTSPacket, sizeof(OXTSPacket.sync), offsetof(soda::OxtsPacket, chksum3));
+
+	LocalAcc.X = -float(OXTSPacket.accel_x) * 100.0 * ACC2MPS2;
+	LocalAcc.Y = -float(OXTSPacket.accel_y) * 100.0 * ACC2MPS2;
+	LocalAcc.Z =  float(OXTSPacket.accel_z) * 100.0 * ACC2MPS2;
+	AngularVelocity.X = -float(OXTSPacket.gyro_x) * RATE2RPS;
+	AngularVelocity.Y = -float(OXTSPacket.gyro_y) * RATE2RPS;
+	AngularVelocity.Z =  float(OXTSPacket.gyro_z) * RATE2RPS;
+	double Lon = OXTSPacket._lon.longitude / M_PI * 180;
+	double Lat = OXTSPacket._lat.latitude / M_PI * 180;
+	double Alt = OXTSPacket._alt.altitude;
+	WorldVel.X = -float(OXTSPacket.vel_east) * 100.0 * VEL2MPS;
+	WorldVel.Y =  float(OXTSPacket.vel_north) * 100.0 * VEL2MPS;
+	WorldVel.Z = -float(OXTSPacket.vel_down) * 100.0 * VEL2MPS;
+	WorldRot.Yaw   = float(OXTSPacket.heading) * ANG2RAD / M_PI * 180.0  + 90;
+	WorldRot.Pitch = float(OXTSPacket.pitch) * ANG2RAD / M_PI * 180.0;
+	WorldRot.Roll  = float(OXTSPacket.roll) * ANG2RAD / M_PI * 180.0;
+	LevelState->GetLLConverter().LLA2UE(WorldPos, Lon, Lat, Alt);
+	WorldRot = LevelState->GetLLConverter().ConvertRotationBackward(WorldRot);
+	WorldVel = LevelState->GetLLConverter().ConvertDirBackward(WorldVel);
+
+	if (WorldPos.ContainsNaN() || (WorldPos.GetAbsMax() > 2000000)) // 20km 
+	{
+		UE_LOG(LogSoda, Error, TEXT("UNCOMWheeledVehicleMovement::Recv(), Got invalid package; Lon: %f; Lat: %f; Alt: %f; WorldPos: %s"), Lon, Lat, Alt, *WorldPos.ToString());
+		WorldPos = FVector(0, 0, 0);
+		bIsOXTSDataValidTmp = false;
+	}
+
+	if (WorldRot.ContainsNaN()) 
+	{
+		UE_LOG(LogSoda, Error, TEXT("UNCOMWheeledVehicleMovement::Recv(), Got invalid package; Rot: %s"), *WorldRot.ToString());
+		WorldRot = FRotator(0, 0, 0);
+		bIsOXTSDataValidTmp = false;
+	}
+
+	if (WorldPos.ContainsNaN() || (WorldPos.GetAbsMax() > 2000000)) // 20km 
+	{
+		UE_LOG(LogSoda, Error, TEXT("UNCOMWheeledVehicleMovement::Recv(), Got invalid package; Lon: %f; Lat: %f; Alt: %f; WorldPos: %s"), Lon, Lat, Alt, *WorldPos.ToString());
+		WorldPos = FVector(0, 0, 0);
+		bIsOXTSDataValidTmp = false;
+	}
+
+	if (WorldRot.ContainsNaN()) 
+	{
+		UE_LOG(LogSoda, Error, TEXT("UNCOMWheeledVehicleMovement::Recv(), Got invalid package; Rot: %s"), *WorldRot.ToString());
+		WorldRot = FRotator(0, 0, 0);
+		bIsOXTSDataValidTmp = false;
+	}
+
+	switch (OXTSPacket.channel)
+	{
+	case 0:
+		OXTS_SatellitesNumber = OXTSPacket.chan.chan0.num_sats;
+		OXTS_PositionMode = OXTSPacket.chan.chan0.position_mode;
+		OXTS_VelocityMode = OXTSPacket.chan.chan0.velocity_mode;
+		OXTS_OrientationMode = OXTSPacket.chan.chan0.orientation_mode;
+		OXTS_GPSMinutes = OXTSPacket.chan.chan0.gps_minutes;
+		break;
+	}
+
+	PrePhysicSimulation(LastDeltatime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+
+	Mutex.lock();
+
+	bIsOXTSDataValid = bIsOXTSDataValidTmp;
+
+	for (auto& Wheel : GetWheeledVehicle()->GetWheels())
+	{
+		Wheel->AngularVelocity = 0;
+		Wheel->AngularVelocity = 0;
+		Wheel->AngularVelocity = 0;
+		Wheel->AngularVelocity = 0;
+
+		Wheel->Steer = 0;
+		Wheel->Steer = 0;
+
+		Wheel->Slip = FVector2D::ZeroVector;
+		Wheel->Slip = FVector2D::ZeroVector;
+		Wheel->Slip = FVector2D::ZeroVector;
+		Wheel->Slip = FVector2D::ZeroVector;
+	}
+
+	VehicleSimData.VehicleKinematic.Push(DeltaTime);
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = FTransform(NCOMRotation, NCOMOffest).Inverse() *  FTransform(WorldRot, WorldPos);
+	VehicleSimData.VehicleKinematic.Curr.GlobalVelocityOfCenterMass = WorldVel + (AngularVelocity ^ (CenterOfMass - NCOMOffest)); //TODO: Need to check it
+	VehicleSimData.VehicleKinematic.Curr.AngularVelocity = AngularVelocity;
+	VehicleSimData.VehicleKinematic.Curr.CenterOfMassLocal = CenterOfMass;
+
+	++VehicleSimData.SimulatedStep;
+	VehicleSimData.SimulatedTimestamp = soda::Now();
+
+	Mutex.unlock();
+
+
+	PostPhysicSimulation(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+	PostPhysicSimulationDeferred(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+
+	LastDeltatime = DeltaTime;
+}
+
+void UNCOMWheeledVehicleMovement::ResetPosition()
+{
+	FVector OrignShift = LevelState->GetLLConverter().OrignShift;
+	float OrignDYaw = LevelState->GetLLConverter().OrignDYaw;
+
+	FVector RawPos = (UpdatedPrimitive->GetComponentTransform().GetTranslation() - OrignShift).RotateAngleAxis(-OrignDYaw, FVector(0, 0, 1));
+	FVector NewPos = RawPos.RotateAngleAxis(OrignDYaw, FVector(0, 0, 1)) + OrignShift;
+
+	LevelState->SetGeoReference(
+		LevelState->GetLLConverter().OrignLat,
+		LevelState->GetLLConverter().OrignLon,
+		LevelState->GetLLConverter().OrignAltitude,
+		OrignShift + (InitTransform.GetTranslation() - NewPos),
+		OrignDYaw + (InitTransform.Rotator().Yaw - UpdatedPrimitive->GetComponentTransform().Rotator().Yaw)
+	);
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Soda2DWheeledVehicleMovement.cpp b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Soda2DWheeledVehicleMovement.cpp
new file mode 100644
index 0000000..cf9e315
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/Soda2DWheeledVehicleMovement.cpp
@@ -0,0 +1,496 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/WheeledVehicleMovements/Soda2DWheeledVehicleMovement.h"
+#include "VehicleComponents/WheeledVehicleMovements/Bicycle/dyncar_bicycle.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Engine.h"
+#include "Engine/Canvas.h"
+#include "Engine/CollisionProfile.h"
+#include "Soda/Misc/MathUtils.hpp"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+
+DECLARE_CYCLE_STAT(TEXT("BicycleCompute"), STAT_BicycleCompute, STATGROUP_SodaVehicle);
+DECLARE_CYCLE_STAT(TEXT("SimulationTick"), STAT_UpdateSimulationTick, STATGROUP_SodaVehicle);
+
+static inline float CalcWheelSpeed(float Vt, float Slip, float R)
+{
+	return (Vt / (1.0 - Slip) - 0.001 * Slip / (1 - Slip)) / R;
+}
+
+
+/*
+float Trapezoid(float dy0, float dy1, float dx)
+{
+	return (dy0 + dy1) * dx / 2.0;
+}
+*/
+
+
+USoda2DWheeledVehicleMovementComponent::USoda2DWheeledVehicleMovementComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Soda 2WD Vehicle");
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+	bWantsInitializeComponent = true;
+
+	TelemetryGrid.InitGrid(4, 4, 120, 120, 500);
+	for(int i = 0; i < 4; ++i)
+	{
+		TelemetryGrid.InitCell(0, i, -5, 5, "", FString::Printf(TEXT("ToGround[%i]"), i));
+		TelemetryGrid.InitCell(1, i , -1, 1, "", FString::Printf(TEXT("Tension[%i]"), i));
+		TelemetryGrid.InitCell(2, i, -1, 1, "", FString::Printf(TEXT("ZVel[%i]"),     i));
+		TelemetryGrid.InitCell(3, i , -1, 1, "", FString::Printf(TEXT("Damping[%i]"), i));
+	}
+}
+
+void USoda2DWheeledVehicleMovementComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+}
+
+void USoda2DWheeledVehicleMovementComponent::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+}
+
+void USoda2DWheeledVehicleMovementComponent::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void USoda2DWheeledVehicleMovementComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void USoda2DWheeledVehicleMovementComponent::OnPreActivateVehicleComponent()
+{
+	Super::OnPreActivateVehicleComponent();
+
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->Radius = FrontWheelRadius * 100;
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->Radius = FrontWheelRadius * 100;
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->Radius = RearWheelRadius * 100;
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->Radius = RearWheelRadius * 100;
+
+
+	GroundScaner = NewObject< UGroundScaner>(this);
+
+	OnSetActiveMovement();
+}
+
+
+bool USoda2DWheeledVehicleMovementComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	check(GetWheeledVehicle());
+
+	if (!GetWheeledVehicle()->Is4WDVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error, TEXT("Support only 4WD vehicles"));
+		return false;
+	}
+
+	USkinnedMeshComponent* Mesh = Cast< USkinnedMeshComponent >(UpdatedPrimitive);
+	if (!Mesh)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("Forgot to set Mesh to USoda2DWheeledVehicleMovementComponent?"));
+		return false;
+	}
+
+	if (WheelSetups.Num() != 4)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("WheelSetups.Num() != 4 in USoda2DWheeledVehicleMovementComponent"));
+		return false;
+	}
+
+	Mesh->SetEnableGravity(false);
+
+	if (bDisableCollisions)
+	{
+		Mesh->SetSimulatePhysics(false);
+		Mesh->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Overlap);
+		Mesh->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	}
+
+	check(!DynCar);
+	DynCar = MakeShared<DynamicCar>(Eigen::Vector3d::Zero(3));
+	DynamicPar dynpar = DynamicPar();
+
+	DynCar->culc_par = dynpar.culc_par;
+	DynCar->car_par = dynpar.car_par;
+	DynCar->culc_par.fl_drag_taking = FlDragTaking;
+	DynCar->culc_par.fl_Long_Circ = FlLongCirc;
+	DynCar->culc_par.fl_static_load = FlStaticLoad;
+	DynCar->culc_par.fl_RunKut = FlRunKut;
+	DynCar->culc_par.nsteps = NSteps;
+	DynCar->culc_par.fl_act_low = FlActLow;
+	DynCar->culc_par.implicit_solver = ImplicitSolver;
+	DynCar->culc_par.num_impl_nonlin_it = NumImpLonlinIt;
+	DynCar->culc_par.corr_impl_step = CorrImplStep;
+	DynCar->car_par.a = A;
+	DynCar->car_par.b = B;
+	DynCar->car_par.L = A + B;
+	DynCar->car_par.mass = Mass;
+	DynCar->car_par.moment_inertia = MomentOfInertia.Z;
+	DynCar->car_par.CGvert = CGvert;
+	DynCar->car_par.mu = Friction;
+	DynCar->car_par.Cy_r = RearWheelLatStiff;
+	DynCar->car_par.Cy_f = ForwardWheelLatStiff;
+	DynCar->car_par.Cx_r = RearWheelLonStiff;
+	DynCar->car_par.Cx_f = ForwardWheelLonStiff;
+	DynCar->car_par.rearWheelRad = RearWheelRadius;
+	DynCar->car_par.frontWheelRad = FrontWheelRadius;
+	DynCar->car_par.rollingResistance = DragRollingResistance;
+	DynCar->car_par.rollingResistanceSpeedDepended = DragRollingResistanceSpeedDepended;
+	DynCar->car_par.Cxx = DragCxx;
+	DynCar->car_par.fWIn = MomentOfInertiaFrontTrain;
+	DynCar->car_par.rWIn = MomentOfInertiaRearTrain;
+	
+	FRotator WorldRot = UpdatedPrimitive->GetComponentRotation();
+	FTransform Transform = UpdatedPrimitive->GetComponentTransform();
+	FVector WorldLoc = Transform.TransformPosition(FVector(B * 100.0, 0.0, 0.0));
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = FTransform(WorldRot, WorldLoc, FVector(1.0, 1.0, 1.0));
+	DynCar->init_nav(WorldLoc.X / 100.0, -WorldLoc.Y / 100.0, -WorldRot.Yaw / 180.0 * M_PI, 0.0);
+	GroundScaner->WheelBase = GetWheelBaseWidth();
+	GroundScaner->TrackWidth = GetTrackWidth();
+	GroundScaner->CollisionQueryParams = FCollisionQueryParams(NAME_None, false, GetOwner());
+	bSynchronousMode = SodaApp.IsSynchronousMode();
+	PrecisionTimer.TimerDelegate.BindLambda([this](const std::chrono::nanoseconds& Deltatime, const std::chrono::nanoseconds& Elapsed)
+	{
+		UpdateSimulation(Deltatime, Elapsed);
+	});	
+
+	return true;
+}
+
+void USoda2DWheeledVehicleMovementComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+
+	PrecisionTimer.TimerStop();
+	DynCar.Reset();
+}
+
+void USoda2DWheeledVehicleMovementComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!HealthIsWorkable()) return;
+
+	if (!bSynchronousMode)
+	{
+		if (!PrecisionTimer.IsJoinable())
+		{
+			PrecisionTimer.TimerStart(std::chrono::milliseconds(TimeStep), std::chrono::duration<float>(ModelStartUpDelay));
+			return;
+		}
+	}
+	else
+	{
+		const std::chrono::nanoseconds dt = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::duration<float>(DeltaTime));
+		UpdateSimulation(dt, std::chrono::nanoseconds::zero());
+	}
+
+	VehicleSimData.RenderStep = VehicleSimData.SimulatedStep;
+	VehicleSimData.RenderTimestamp = VehicleSimData.SimulatedTimestamp;
+
+	FVehicleSimData VehicleSimDataCopy = VehicleSimData;
+
+	FVector NewLoc = VehicleSimDataCopy.VehicleKinematic.Curr.GlobalPose.GetTranslation();
+	FRotator NewRot = VehicleSimDataCopy.VehicleKinematic.Curr.GlobalPose.Rotator();
+	float Steer = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->Steer / M_PI * 180;
+
+	if (bLogPhysStemp)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("2WDVehicle, RenderStep: %i, RenderTimestamp: %s , Pos: %s"),
+			VehicleSimData.RenderStep,
+			*soda::ToString(VehicleSimData.RenderTimestamp),
+			*NewLoc.ToString());
+	}
+
+	if (UpdatedPrimitive)
+	{
+		FScopeLock ScopeLock(&WheeledVehicle->PhysicMutex);
+
+		FVector AngVel0 = UpdatedPrimitive->GetPhysicsAngularVelocityInRadians();
+		FVector LineerVel0 = UpdatedPrimitive->GetPhysicsLinearVelocity();
+
+		FHitResult Hit;
+		UpdatedPrimitive->SetPhysicsLinearVelocity(VehicleSimDataCopy.VehicleKinematic.Curr.GlobalVelocityOfCenterMass);
+		UpdatedPrimitive->SetPhysicsAngularVelocityInRadians(VehicleSimDataCopy.VehicleKinematic.Curr.AngularVelocity);
+		UpdatedPrimitive->SetWorldLocationAndRotation(NewLoc, NewRot, true, &Hit, ETeleportType::TeleportPhysics);
+
+		FVector NewLoc1 = UpdatedPrimitive->GetComponentToWorld().GetLocation();
+		FQuat NewRot1 = UpdatedPrimitive->GetComponentToWorld().GetRotation();
+
+		FVector DiffLoc = NewLoc - NewLoc1;
+		FQuat DiffRot = NewRot.Quaternion() - NewRot1;
+		FVector LocalVel = NewRot1.UnrotateVector(LineerVel0);
+
+		if (DiffLoc.Size() > 1.0 || Hit.bBlockingHit)
+		{
+			UE_LOG(LogSoda, Warning, TEXT("Bicycle hit detected"));
+
+			FTransform Transform = UpdatedPrimitive->GetComponentTransform();
+			FVector WorldLoc = Transform.TransformPosition(FVector(B * 100.0, 0.0, 0.0));
+
+			DynCar->car_state.x = WorldLoc.X / 100.0;
+			DynCar->car_state.y = -WorldLoc.Y / 100.0;
+			DynCar->car_state.psi = -NewRot1.Rotator().Yaw / 180.0 * M_PI;
+
+			DynCar->car_state.Vx = LocalVel.X / 100;
+			DynCar->car_state.Vy = -LocalVel.Y / 100;
+			DynCar->car_state.Om = -AngVel0.Z;
+
+			VehicleSimData.VehicleKinematic.Curr.AngularVelocity = AngVel0;
+			VehicleSimData.VehicleKinematic.Curr.GlobalVelocityOfCenterMass = LineerVel0;
+			VehicleSimData.VehicleKinematic.Curr.GlobalPose = UpdatedPrimitive->GetComponentToWorld();
+
+			ZDotDot = 0;
+			PitchDotDot = 0;
+			RollDotDot = 0;
+
+			ZDot = LineerVel0.Z;
+			PitchDot = AngVel0.Y;
+			RollDot = AngVel0.X;
+			
+		}
+	}
+
+
+
+	if(bUseGroundScaner)
+		GroundScaner->Scan(VehicleSimDataCopy.VehicleKinematic, DeltaTime);
+}
+
+void USoda2DWheeledVehicleMovementComponent::UpdateSimulation(const std::chrono::nanoseconds& InDeltatime, const std::chrono::nanoseconds& Elapsed)
+{
+	//Check Deltatime
+	/*
+	static auto PrevTime = std::chrono::steady_clock::now();
+	auto CurrTime = std::chrono::steady_clock::now();
+	UE_LOG(LogSoda, Error, TEXT("***** %i"), std::chrono::duration_cast<std::chrono::microseconds>(CurrTime - PrevTime).count());
+	PrevTime = CurrTime;
+	*/
+
+	if (Elapsed > std::chrono::nanoseconds::zero())
+	{
+		UE_LOG(LogSoda, Warning, TEXT("USoda2DWheeledVehicleMovementComponent::UpdateSimulation().Realtime expired by %i micro sec"), std::chrono::duration_cast<std::chrono::microseconds>(Elapsed).count());
+	}
+
+	//FScopeLock ScopeLock(&WheeledVehicle->PhysicMutex);
+	while (!WheeledVehicle->PhysicMutex.TryLock() && PrecisionTimer.IsTimerWorking())
+	{
+		FPlatformProcess::Yield();
+	}
+
+	float DeltaTime = (std::chrono::duration_cast<std::chrono::duration<float>>(InDeltatime)).count();
+
+	PrePhysicSimulation(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+
+    {
+		const float Steer = -(GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->ReqSteer + GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->ReqSteer) / 2;
+		const float FrontTorq = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->ReqTorq + GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->ReqTorq;
+		const float RearTorq = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->ReqTorq + GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->ReqTorq;
+		const float BrakeFrontTorq = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->ReqBrakeTorque + GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->ReqBrakeTorque;
+		const float BrakeRearTorq = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->ReqBrakeTorque + GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->ReqBrakeTorque;
+
+		// UE_LOG(LogSoda, Warning, TEXT("USoda2DWheeledVehicleMovementComponent::UpdateSimulation(). %.2f; %.2f"), FrontTorq, RearTorq);
+
+		SCOPE_CYCLE_COUNTER(STAT_BicycleCompute);
+		DynCar->dynamicNav_ev_Base(DeltaTime, Steer, FrontTorq, RearTorq, BrakeFrontTorq, BrakeRearTorq);
+	}
+
+	FVector2D V_FL(DynCar->car_state.Vx - TrackWidth / 2 * DynCar->car_state.Om, DynCar->car_state.Vy + A * DynCar->car_state.Om);
+	FVector2D V_RL(DynCar->car_state.Vx - TrackWidth / 2 * DynCar->car_state.Om, DynCar->car_state.Vy - B * DynCar->car_state.Om);
+	FVector2D V_RR(DynCar->car_state.Vx + TrackWidth / 2 * DynCar->car_state.Om, DynCar->car_state.Vy - B * DynCar->car_state.Om);
+	FVector2D V_FR(DynCar->car_state.Vx + TrackWidth / 2 * DynCar->car_state.Om, DynCar->car_state.Vy + A * DynCar->car_state.Om);
+	float Vt_FL = V_FL.GetRotated(-DynCar->car_state.steer_alpha / M_PI * 180.0).X;
+	float Vt_FR = V_FR.GetRotated(-DynCar->car_state.steer_alpha / M_PI * 180.0).X;
+
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->AngularVelocity = CalcWheelSpeed(Vt_FL, DynCar->car_state.long_slip_f, FrontWheelRadius );
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->AngularVelocity = CalcWheelSpeed(Vt_FR, DynCar->car_state.long_slip_f, FrontWheelRadius );
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->AngularVelocity = CalcWheelSpeed(V_RL.X, DynCar->car_state.long_slip_r, RearWheelRadius );
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->AngularVelocity = CalcWheelSpeed(V_RR.X, DynCar->car_state.long_slip_r, RearWheelRadius );
+
+	for(int i = 0; i < 4; i++)
+	{
+		USodaVehicleWheelComponent * Wheel = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex(i));
+		Wheel->Pitch = NormAngRad(Wheel->Pitch - Wheel->AngularVelocity * DeltaTime);
+	}
+
+	FVector Pos = VehicleSimData.VehicleKinematic.Curr.GlobalPose.GetTranslation();
+	FRotator Rot = VehicleSimData.VehicleKinematic.Curr.GlobalPose.Rotator();
+	FQuat PreQuat = VehicleSimData.VehicleKinematic.Curr.GlobalPose.GetRotation();
+
+	Pos.X = DynCar->car_state.xc * 100;
+	Pos.Y = -DynCar->car_state.yc * 100;
+	Rot.Yaw = -DynCar->car_state.psi / M_PI * 180.f;
+
+	const float DZ = ZDot * DeltaTime;
+	const float DPitch = (PitchDot * DeltaTime / M_PI * 180.f);
+	const float DRoll = (RollDot * DeltaTime / M_PI * 180.f);
+
+	const FVector CoF = FVector(B * 100.0, 0.0, 0.0);
+
+	if(bUseGroundScaner)
+	{
+		FTransform GlobalPose = FTransform(Rot, Pos, FVector(1.0, 1.0, 1.0));
+
+		float R =-Mass * Gravity;
+		FVector M(0);
+
+		for(int i = 0; i < 4; i++)
+		{
+			USodaVehicleWheelComponent * SodaWheel = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex(i));
+
+			FVector Pt = GlobalPose.TransformPosition(SodaWheel->RestingLocation);
+			
+			float GroundLevel;
+			if(!GroundScaner->GetHeight(Pt.X, Pt.Y, GroundLevel))  GroundLevel = -FLT_MAX;
+
+			float PrevToGround = WheelsData[i].ToGround;
+			WheelsData[i].ToGround = SodaWheel->Radius - (Pt.Z - GroundLevel);
+			SodaWheel->SuspensionOffset = FMath::Clamp(WheelsData[i].ToGround, -WheelSetups[i].SuspensionRise, WheelSetups[i].SuspensionFall);
+			WheelsData[i].ToGroundVelocity = FMath::Clamp( float((PrevToGround - WheelsData[i].ToGround ) / DeltaTime), -300.f, 300.f);
+			
+			float TensionFactor = 0;
+			float DampingFactor = 0;
+
+			if (WheelsData[i].ToGround < SodaWheel->Radius  + WheelSetups[i].SuspensionRise )
+			{
+				TensionFactor = FMath::Clamp(float((WheelsData[i].ToGround - WheelSetups[i].SuspensionRise) / (WheelSetups[i].SuspensionFall + WheelSetups[i].SuspensionRise) + 1.f) * 2.f, 0.f, 2.f) * WheelSetups[i].SuspensionDist;
+				if (WheelsData[i].ToGroundVelocity >= 0)
+				{
+					if (WheelsData[i].ToGround > -WheelSetups[i].SuspensionFall && WheelsData[i].ToGround < WheelSetups[i].SuspensionRise)
+					{
+						DampingFactor = -WheelSetups[i].DampingFallFactor;
+					}
+				}
+				else
+				{
+					if (WheelsData[i].ToGround > -WheelSetups[i].SuspensionFall)
+					{
+						DampingFactor = WheelSetups[i].DampingRiseFactor;
+					}
+					/*
+					if (Wheels[i].ToGround > WheelSetups[i].SuspensionRise)
+					{
+						DampingFactor += 0.05 * (Wheels[i].ToGround -  WheelSetups[i].SuspensionRise);
+						DampingFactor = FMath::Clamp(DampingFactor, 0.f, 0.5f);
+					}*/
+				}
+			}
+
+			WheelsData[i].SpringForce = Mass * Gravity * TensionFactor;
+			WheelsData[i].DampingForce = std::abs(WheelsData[i].ToGroundVelocity ) * Mass / DeltaTime * DampingFactor;
+
+			float FullRorce = WheelsData[i].SpringForce + WheelsData[i].DampingForce;
+
+			FVector r = SodaWheel->RestingLocation - CoF;
+
+			R += FullRorce;
+			M += (r ^ FVector(0.0f, 0.0, FullRorce));
+
+			//UE_LOG(LogSoda, Error, TEXT("ind: %i; M: %s R: %f: FullRorce: %f"), i, *M.ToString(), R, FullRorce);
+
+			if(bDrawTelemetry)
+			{
+				TelemetryGrid.AddPoint(0, i, WheelsData[i].ToGround);
+				TelemetryGrid.AddPoint(1, i, TensionFactor);
+				TelemetryGrid.AddPoint(2, i, WheelsData[i].ToGroundVelocity  / 100);
+				TelemetryGrid.AddPoint(3, i, DampingFactor);
+			}
+		}
+
+		ZDotDot = ZDotDot * GlobalDampingFactor  +  R/Mass * (1.f - GlobalDampingFactor);
+		ZDot += (ZDotDot * DeltaTime);
+
+		PitchDotDot =  PitchDotDot * GlobalDampingFactor - M.Y / MomentOfInertia.Y / 100000 * (1.f - GlobalDampingFactor);
+		PitchDot += (PitchDotDot * DeltaTime);
+
+		RollDotDot =  RollDotDot * GlobalDampingFactor - M.X / MomentOfInertia.X / 100000 * (1.f - GlobalDampingFactor);
+		RollDot += (RollDotDot * DeltaTime);
+	}
+
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->Steer = -DynCar->car_state.steer_alpha;
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->Steer = -DynCar->car_state.steer_alpha;
+
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FL)->Slip = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::FR)->Slip = FVector2D(DynCar->car_state.long_slip_f, DynCar->car_state.slipAng_f);
+	GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RL)->Slip = GetWheeledVehicle()->GetWheel4WD(E4WDWheelIndex::RR)->Slip = FVector2D(DynCar->car_state.long_slip_r, DynCar->car_state.slipAng_r);
+
+	Pos.Z += DZ;
+	Rot.Pitch += DPitch;
+	Rot.Roll += DRoll;
+
+	VehicleSimData.VehicleKinematic.Push(DeltaTime);
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = FTransform(Rot, Pos - FRotator(DPitch, 0, DRoll).RotateVector(CoF) + CoF, FVector(1.0, 1.0, 1.0));
+	VehicleSimData.VehicleKinematic.Curr.GlobalVelocityOfCenterMass = FVector(DynCar->car_state.Vx * 100, -DynCar->car_state.Vy * 100, ZDot).RotateAngleAxis(
+		-DynCar->car_state.psi / M_PI * 180.0, FVector(0.f, 0.f, 1.f));
+	VehicleSimData.VehicleKinematic.Curr.CenterOfMassLocal = CoF;
+	//VehicleKinematic.Curr.AngularVelocity = QLog((PreQuat.Inverse() * Rot.Quaternion()).GetNormalized()) / DeltaTime;
+	VehicleSimData.VehicleKinematic.ComputeAngularVelocity();
+	//VehicleKinematic.ComputeGlobalVelocityOfCenterMass(); 
+	VehicleSimData.VehicleKinematic.ComputeGlobalAcceleration();
+	++VehicleSimData.SimulatedStep;
+	VehicleSimData.SimulatedTimestamp = bSynchronousMode ? SodaApp.GetSimulationTimestamp() : soda::Now();
+	if(bLogPhysStemp)
+	{
+		UE_LOG(LogSoda, Warning, TEXT("2WDVehicle, SimulatedStep: %i, SimulatedTimestamp: %s, Pos: %s"), 
+			VehicleSimData.SimulatedStep,
+			*soda::ToString(VehicleSimData.SimulatedTimestamp),
+			*Pos.ToString());
+	}
+
+	PostPhysicSimulation(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+	PostPhysicSimulationDeferred(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+
+	WheeledVehicle->PhysicMutex.Unlock();
+}
+
+void USoda2DWheeledVehicleMovementComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas && GetHealth() != EVehicleComponentHealth::Disabled)
+	{
+
+		UFont* RenderFont = GEngine->GetSmallFont();
+		// draw drive data
+
+		Canvas->SetDrawColor(FColor::Green);
+		YPos += Canvas->DrawText(RenderFont, TEXT("Bicycle Vehicle:"), 4, YPos + 4);
+
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Vx (km/h): %.1f"), DynCar->car_state.Vx * 3.6), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Vy (km/h): %.1f"), DynCar->car_state.Vy * 3.6), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Acc x (m/s^2): %.1f"), DynCar->car_state.dVxdt), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Acc y (m/s^2): %.1f"), DynCar->car_state.dVydt), 16, YPos);
+
+		if (bDrawTelemetry)
+		{
+			float XPos = SodaApp.GetSodaUserSettings()->VehicleDebugAreaWidth + 10;
+			TelemetryGrid.Draw(Canvas, XPos, 10);
+		}
+	}
+}
+
+bool USoda2DWheeledVehicleMovementComponent::SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation)
+{
+	if (DynCar != nullptr)
+	{
+		VehicleSimData.VehicleKinematic.Curr.GlobalPose = FTransform(NewRotation, NewLocation, FVector(1.0, 1.0, 1.0));
+		DynCar->init_nav(NewLocation.X / 100.0, -NewLocation.Y / 100.0, -NewRotation.Yaw / 180.0 * M_PI, 0.0);
+		return true;
+	}
+	return false;
+}
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/SodaChaosWheeledVehicleMovement.cpp b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/SodaChaosWheeledVehicleMovement.cpp
new file mode 100644
index 0000000..4692b8e
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/SodaChaosWheeledVehicleMovement.cpp
@@ -0,0 +1,473 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/WheeledVehicleMovements/SodaChaosWheeledVehicleMovement.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "DisplayDebugHelpers.h"
+#include "PhysicalMaterials/PhysicalMaterial.h"
+#include "Engine/Engine.h"
+#include "Engine/Canvas.h"
+#include "Engine/CollisionProfile.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "ChaosVehicleWheel.h"
+#include "ChaosWheeledVehicleMovementComponent.h"
+#include "SimpleVehicle.h"
+#include "VehicleUtility.h"
+#include "ChaosVehicleManager.h"
+
+/**********************************************************************************
+ * USodaChaosWheeledVehicleSimulation 
+ **********************************************************************************/
+
+USodaChaosWheeledVehicleSimulation::USodaChaosWheeledVehicleSimulation(ASodaWheeledVehicle* WheeledVehicleIn, USodaChaosWheeledVehicleMovementComponent* InWheeledVehicleComponent) :
+	WheeledVehicle(WheeledVehicleIn),
+	WheeledVehicleComponent(InWheeledVehicleComponent)
+{
+	check(WheeledVehicleIn);
+	check(InWheeledVehicleComponent);
+}
+
+void USodaChaosWheeledVehicleSimulation::Init(TUniquePtr<Chaos::FSimpleWheeledVehicle>& PVehicleIn)
+{
+	UChaosWheeledVehicleSimulation::Init(PVehicleIn);
+
+	VehicleSimData.VehicleKinematic.Push(0.1);
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = VehicleState.VehicleWorldTransform;
+	VehicleSimData.VehicleKinematic.Curr.GlobalVelocityOfCenterMass = VehicleState.VehicleWorldVelocity;
+	VehicleSimData.VehicleKinematic.Curr.AngularVelocity = VehicleState.VehicleWorldAngularVelocity;
+	VehicleSimData.VehicleKinematic.Curr.CenterOfMassLocal = VehicleState.VehicleWorldCOM - VehicleState.VehicleWorldTransform.GetTranslation();
+}
+
+void USodaChaosWheeledVehicleSimulation::UpdateSimulation(float DeltaTime, const FChaosVehicleAsyncInput& InputData, Chaos::FRigidBodyHandle_Internal* Handle)
+{
+	UChaosWheeledVehicleSimulation::UpdateSimulation(DeltaTime, InputData, Handle);
+
+	//TODO: Add realtime indicator
+	//auto Diff = soda::Now() - VehicleSimData.SimulatedTimestamp;
+	//UE_LOG(LogSoda, Warning, TEXT("*** %f %f"), std::chrono::duration_cast<float>(Diff).count(), DeltaTime);
+
+	FScopeLock ScopeLock(&WheeledVehicle->PhysicMutex);
+
+	const auto& ChaosWheels = PVehicle->Wheels;
+	const auto& SodaChaosWheelSetup = WheeledVehicleComponent->SodaWheelSetups;
+
+	check(SodaChaosWheelSetup.Num() == ChaosWheels.Num());
+
+	/*
+	 *    Post Simulation
+	 */
+	
+	VehicleSimData.VehicleKinematic.Push(DeltaTime);
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = VehicleState.VehicleWorldTransform;
+	VehicleSimData.VehicleKinematic.Curr.GlobalVelocityOfCenterMass = VehicleState.VehicleWorldVelocity;
+	//VehicleSimData.VehicleKinematic.Curr.AngularVelocity = VehicleState.VehicleWorldAngularVelocity;
+	VehicleSimData.VehicleKinematic.Curr.CenterOfMassLocal = VehicleState.VehicleWorldCOM; // VehicleWorldCOM is local space (not world). Is it bug of UE source? 
+	VehicleSimData.VehicleKinematic.ComputeAngularVelocity();
+	//VehicleSimData.VehicleKinematic.ComputeGlobalVelocityOfCenterMass(); 
+	VehicleSimData.VehicleKinematic.ComputeGlobalAcceleration();
+	++VehicleSimData.SimulatedStep;
+	VehicleSimData.SimulatedTimestamp = /*bSynchronousMode ? SodaApp.GetSimulationTimestamp() :*/ soda::Now();
+
+	
+	for (int i = 0; i < ChaosWheels.Num(); ++i)
+	{
+		
+		SodaChaosWheelSetup[i].SodaWheel->Pitch = -ChaosWheels[i].GetAngularPosition();
+		SodaChaosWheelSetup[i].SodaWheel->Steer = ChaosWheels[i].GetSteeringAngle() / 180 * M_PI;
+		SodaChaosWheelSetup[i].SodaWheel->AngularVelocity = -ChaosWheels[i].GetAngularVelocity();
+		SodaChaosWheelSetup[i].SodaWheel->Slip = FVector2D(std::cos(ChaosWheels[i].GetSlipAngle()), std::sin(ChaosWheels[i].GetSlipAngle())) * ChaosWheels[i].GetSlipMagnitude();
+		SodaChaosWheelSetup[i].SodaWheel->SuspensionOffset = PVehicle->Suspension[i].GetSuspensionOffset();
+	}
+
+	WheeledVehicleComponent->PostPhysicSimulation(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+	WheeledVehicleComponent->PostPhysicSimulationDeferred(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+	
+	/*
+	 *   Pre Simulation
+	 */
+	
+	WheeledVehicleComponent->PrePhysicSimulation(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+
+	for (int32 i = 0; i < ChaosWheels.Num(); i++)
+	{
+		PVehicle->Wheels[i].SetDriveTorque(Chaos::TorqueMToCm(SodaChaosWheelSetup[i].SodaWheel->ReqTorq));
+		PVehicle->Wheels[i].SetSteeringAngle(SodaChaosWheelSetup[i].SodaWheel->ReqSteer / M_PI * 180);
+		PVehicle->Wheels[i].SetBrakeTorque(Chaos::TorqueMToCm(SodaChaosWheelSetup[i].SodaWheel->ReqBrakeTorque));
+	}
+	
+}
+
+/**********************************************************************************
+ * USodaChaosWheeledVehicleMovementComponent
+ **********************************************************************************/
+USodaChaosWheeledVehicleMovementComponent::USodaChaosWheeledVehicleMovementComponent(const FObjectInitializer &ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Vehicle Physic");
+	GUI.IcanName = TEXT("SodaIcons.Tire");
+	GUI.ComponentNameOverride = TEXT("Chaos Physic");
+	GUI.bIsPresentInAddMenu = true;
+	Common.UniqueVehiceComponentClass = UWheeledVehicleMovementInterface::StaticClass();
+	Common.bIsTopologyComponent = true;
+
+	WheelSetups.SetNum(4);
+	bWantsInitializeComponent = true;
+
+	bMechanicalSimEnabled = false;
+}
+
+void USodaChaosWheeledVehicleMovementComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+}
+
+void USodaChaosWheeledVehicleMovementComponent::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+}
+
+void USodaChaosWheeledVehicleMovementComponent::BeginPlay()
+{
+	Super::BeginPlay();
+	WheeledVehicle = Cast<ASodaWheeledVehicle>(GetOwner());
+}
+
+void USodaChaosWheeledVehicleMovementComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void USodaChaosWheeledVehicleMovementComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction *ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!HealthIsWorkable()) return;
+
+	FVehicleSimData& VehicleSimData = static_cast<USodaChaosWheeledVehicleSimulation*>(VehicleSimulationPT.Get())->VehicleSimData;
+
+	VehicleSimData.RenderStep = VehicleSimData.SimulatedStep;
+	VehicleSimData.RenderTimestamp = VehicleSimData.SimulatedTimestamp;
+
+	USkinnedMeshComponent *Mesh = Cast< USkinnedMeshComponent >(UpdatedPrimitive);
+	if (!Mesh) return;	
+}
+
+void USodaChaosWheeledVehicleMovementComponent::DrawDebug(UCanvas *Canvas, float &YL, float &YPos)
+{
+	ISodaVehicleComponent::DrawDebug(Canvas, YL, YPos);
+
+	/*
+	if (PVehicle == NULL) return;
+
+	UFont* RenderFont = GEngine->GetSmallFont();
+
+	Canvas->SetDrawColor(FColor::Green);
+	YPos += Canvas->DrawText(RenderFont, TEXT("PhysX Vehicle:"), 4, YPos + 4);
+
+	Canvas->SetDrawColor(FColor::White);
+	//YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Speed (km/h): %.1f"), CmSToKmH(ForwardSpeed)), 4, YPos);
+	//YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Acc (m/s^2): %.1f"), FowardAcc / 100.0), 4, YPos);
+
+	FPhysXVehicleManager *MyVehicleManager = FPhysXVehicleManager::GetVehicleManagerFromScene(GetWorld()->GetPhysicsScene());
+	MyVehicleManager->SetRecordTelemetry(this, true);
+
+
+	SCOPED_SCENE_READ_LOCK(MyVehicleManager->GetScene());
+	PxWheelQueryResult *WheelsStates = MyVehicleManager->GetWheelsStates_AssumesLocked(this);
+	check(WheelsStates);
+
+	float XPos = 4.f;
+	auto GetXPos = [&XPos](float Amount) -> float {
+		float Ret = XPos;
+		XPos += Amount;
+		return Ret;
+	};
+
+	if (bShowWheelSates)
+	{
+		for (uint32 w = 0; w < PVehicle->mWheelsSimData.getNbWheels(); ++w)
+		{
+			XPos = 4.f;
+			const PxMaterial *ContactSurface = WheelsStates[w].tireSurfaceMaterial;
+			const PxReal TireFriction = WheelsStates[w].tireFriction;
+			const PxReal LatSlip = WheelsStates[w].lateralSlip;
+			const PxReal LongSlip = WheelsStates[w].longitudinalSlip;
+			const PxReal WheelRPM = OmegaToRPM(PVehicle->mWheelsDynData.getWheelRotationSpeed(w));
+
+			UPhysicalMaterial *ContactSurfaceMaterial = ContactSurface
+															? FPhysxUserData::Get<UPhysicalMaterial>(ContactSurface->userData)
+															: NULL;
+			const FString ContactSurfaceString = ContactSurfaceMaterial ? ContactSurfaceMaterial->GetName() : FString(TEXT("NONE"));
+
+			Canvas->SetDrawColor(FColor::White);
+			Canvas->DrawText(RenderFont, FString::Printf(TEXT("[%d]"), w), GetXPos(20.f), YPos);
+			Canvas->DrawText(RenderFont, FString::Printf(TEXT("RPM: %.1f"), WheelRPM), GetXPos(80.f), YPos);
+			Canvas->DrawText(RenderFont, FString::Printf(TEXT("Slip Ratio: %.2f"), LongSlip), GetXPos(100.f), YPos);
+			Canvas->DrawText(RenderFont, FString::Printf(TEXT("Slip Angle (degrees): %.1f"), FMath::RadiansToDegrees(LatSlip)), GetXPos(180.f), YPos);
+			Canvas->DrawText(RenderFont, FString::Printf(TEXT("Contact Surface: %s"), *ContactSurfaceString), GetXPos(200.f), YPos);
+
+			YPos += YL;
+			XPos = 24.f;
+			if ((int32)w < Wheels.Num())
+			{
+				UVehicleWheel *Wheel = Wheels[w];
+				Canvas->DrawText(RenderFont, FString::Printf(TEXT("Normalized Load: %.1f"), Wheel->DebugNormalizedTireLoad), GetXPos(150.f), YPos);
+				Canvas->DrawText(RenderFont, FString::Printf(TEXT("Torque (Nm): %.1f"), Cm2ToM2(Wheel->DebugWheelTorque)), GetXPos(150.f), YPos);
+				Canvas->DrawText(RenderFont, FString::Printf(TEXT("Long Force: %.1fN (%.1f%%)"), Wheel->DebugLongForce / 100.f, 100.f * Wheel->DebugLongForce / Wheel->DebugTireLoad), GetXPos(200.f), YPos);
+				Canvas->DrawText(RenderFont, FString::Printf(TEXT("Lat Force: %.1fN (%.1f%%)"), Wheel->DebugLatForce / 100.f, 100.f * Wheel->DebugLatForce / Wheel->DebugTireLoad), GetXPos(200.f), YPos);
+			}
+			else
+			{
+				Canvas->DrawText(RenderFont, TEXT("Wheels array insufficiently sized!"), YL * 50, YPos);
+			}
+
+			YPos += YL * 1.2f;
+		}
+	}
+
+	if (bShowWheelGraph)
+	{
+		PxVehicleTelemetryData *TelemetryData = MyVehicleManager->GetTelemetryData_AssumesLocked();
+
+		if (TelemetryData)
+		{
+			const float GraphWidth(100.0f), GraphHeight(100.0f);
+
+			int GraphChannels[] = {PxVehicleWheelGraphChannel::eWHEEL_OMEGA,
+								   PxVehicleWheelGraphChannel::eSUSPFORCE,
+								   PxVehicleWheelGraphChannel::eTIRE_LONG_SLIP,
+								   PxVehicleWheelGraphChannel::eNORM_TIRE_LONG_FORCE,
+								   PxVehicleWheelGraphChannel::eTIRE_LAT_SLIP,
+								   PxVehicleWheelGraphChannel::eNORM_TIRE_LAT_FORCE,
+								   PxVehicleWheelGraphChannel::eNORMALIZED_TIRELOAD,
+								   PxVehicleWheelGraphChannel::eTIRE_FRICTION};
+
+			for (uint32 w = 0; w < PVehicle->mWheelsSimData.getNbWheels(); ++w)
+			{
+				float CurX = 4;
+				for (uint32 i = 0; i < UE_ARRAY_COUNT(GraphChannels); ++i)
+				{
+					float OutX = GraphWidth;
+					DrawTelemetryGraph(GraphChannels[i], TelemetryData->getWheelGraph(w), Canvas, CurX, YPos, GraphWidth, GraphHeight, OutX);
+					CurX += OutX + 10.f;
+				}
+
+				YPos += GraphHeight + 10.f;
+				YPos += YL;
+			}
+		}
+	}
+	
+
+	if (bDrawDebugLines)
+	{
+		DrawDebugLines();
+	}
+*/
+}
+
+TUniquePtr<Chaos::FSimpleWheeledVehicle> USodaChaosWheeledVehicleMovementComponent::CreatePhysicsVehicle() 
+{
+	WheeledVehicle = Cast<ASodaWheeledVehicle>(GetOwner());
+	VehicleSimulationPT = MakeUnique<USodaChaosWheeledVehicleSimulation>(WheeledVehicle, this);
+	return UChaosVehicleMovementComponent::CreatePhysicsVehicle();
+}
+
+void USodaChaosWheeledVehicleMovementComponent::ProcessSleeping(const FControlInputs& ControlInputs)
+{
+	// Do not sleep
+
+	FBodyInstance* TargetInstance = GetBodyInstance();
+	if (TargetInstance)
+	{
+		bool PrevSleeping = VehicleState.bSleeping;
+		VehicleState.bSleeping = !TargetInstance->IsInstanceAwake();
+
+		// The physics system has woken vehicle up due to a collision or something
+		if (PrevSleeping && !VehicleState.bSleeping)
+		{
+			VehicleState.SleepCounter = 0;
+		}
+
+		//if ((VehicleState.bSleeping && bControlInputPressed) || GVehicleDebugParams.DisableVehicleSleep)
+		{
+			VehicleState.bSleeping = false;
+			VehicleState.SleepCounter = 0;
+			SetSleeping(false);
+		}
+
+	}
+}
+
+bool USodaChaosWheeledVehicleMovementComponent::SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation)
+{
+	/*
+	if (IsValid(GetWheeledVehicle()))
+	{
+		WheeledVehicle->SetActorLocation(NewLocation, false, nullptr, ETeleportType::ResetPhysics);
+		WheeledVehicle->SetActorRotation(NewRotation, ETeleportType::ResetPhysics);
+		RecreatePhysicsState();
+		return true;
+	}
+	*/
+	return false;
+}
+
+const FVehicleSimData& USodaChaosWheeledVehicleMovementComponent::GetSimData() const
+{
+	if (VehicleSimulationPT)
+	{
+		return static_cast<USodaChaosWheeledVehicleSimulation*>(VehicleSimulationPT.Get())->VehicleSimData;
+	}
+	else
+	{
+		return FVehicleSimData::Zero;
+	}
+}
+
+void USodaChaosWheeledVehicleMovementComponent::OnPreActivateVehicleComponent()
+{
+	//Super::OnPreActivateVehicleComponent();
+
+	OnSetActiveMovement();
+}
+
+bool USodaChaosWheeledVehicleMovementComponent::OnActivateVehicleComponent()
+{
+	if (!ISodaVehicleComponent::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (PVehicleOutput.IsValid())
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("USodaChaosWheeledVehicleMovementComponent::OnActivateVehicleComponent(); PVehicleOutput already is exist"));
+		return false;
+	}
+
+	if (!CanCreateVehicle())
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("USodaChaosWheeledVehicleMovementComponent::OnActivateVehicleComponent(); CanCreateVehicle()==false"));
+		return false;
+	}
+
+	if (GetWheeledVehicle()->GetWheels().Num() != SodaWheelSetups.Num())
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("USodaChaosWheeledVehicleMovementComponent::OnActivateVehicleComponent(); Mismatch count of SodaWheels[%i] and SodaWheelSetups[%i]"), GetWheeledVehicle()->GetWheels().Num(), SodaWheelSetups.Num());
+		return false;
+	}
+
+	if (GetWheeledVehicle()->GetWheels().Num() == 0)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		UE_LOG(LogSoda, Error, TEXT("USodaChaosWheeledVehicleMovementComponent::OnActivateVehicleComponent(); wheels num == 0"));
+		return false;
+	}
+
+	for (auto& It : SodaWheelSetups)
+	{
+
+		USodaVehicleWheelComponent* SodaWheel = It.ConnectedSodaWheel.GetObject<USodaVehicleWheelComponent>(GetOwner());
+		if (SodaWheel)
+		{
+			It.SodaWheel = SodaWheel;
+		}
+		else
+		{
+			SetHealth(EVehicleComponentHealth::Error);
+			UE_LOG(LogSoda, Error, TEXT("USodaChaosWheeledVehicleMovementComponent::OnActivateVehicleComponent(); Can't find USodaVehicleWheelComponent with name \"%s\""), *It.ConnectedSodaWheel.PathToSubobject);
+			return false;
+		}
+
+		//(*SodaWheel)->Radius = It->WheelRadius;
+	}
+
+	if (UpdatedPrimitive)
+	{
+		UpdatedPrimitive->SetSimulatePhysics(true);
+	}
+
+	/***    Activate chaos vehicle   ***/
+	bAllowCreatePhysicsState = true;
+	CreatePhysicsState(true);
+
+
+	if (USkeletalMeshComponent* SkeletalMesh = GetSkeletalMesh())
+	{
+		SkeletalMesh->VisibilityBasedAnimTickOption = EVisibilityBasedAnimTickOption::OnlyTickPoseWhenRendered;
+		SkeletalMesh->InitAnim(true);
+	}
+
+	USkinnedMeshComponent* Mesh = Cast< USkinnedMeshComponent >(UpdatedPrimitive);
+	if (!Mesh)
+	{
+		SetHealth(EVehicleComponentHealth::Error);
+		return false;
+	}
+
+	bSynchronousMode = SodaApp.IsSynchronousMode();
+
+	return true;
+}
+
+void USodaChaosWheeledVehicleMovementComponent::OnDeactivateVehicleComponent()
+{
+	ISodaVehicleComponent::OnDeactivateVehicleComponent();
+
+	DestroyPhysicsState();
+	bAllowCreatePhysicsState = false;
+}
+
+bool USodaChaosWheeledVehicleMovementComponent::ShouldCreatePhysicsState() const
+{
+	return bAllowCreatePhysicsState && Super::ShouldCreatePhysicsState();
+}
+
+#if WITH_EDITOR
+
+void USodaChaosWheeledVehicleMovementComponent::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	Super::PostEditChangeProperty(PropertyChangedEvent);
+}
+
+void USodaChaosWheeledVehicleMovementComponent::PostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	Super::PostEditChangeChainProperty(PropertyChangedEvent);
+
+	if ((PropertyChangedEvent.Property != nullptr) && (PropertyChangedEvent.Property->GetFName() == GET_MEMBER_NAME_CHECKED(UChaosWheeledVehicleMovementComponent, WheelSetups)))
+	{
+		if (PropertyChangedEvent.ChangeType == EPropertyChangeType::ArrayAdd)
+		{
+			//const int32 AddedAtIndex = PropertyChangedEvent.GetArrayIndex(PropertyChangedEvent.Property->GetFName().ToString());
+			//check(AddedAtIndex != INDEX_NONE);
+			SodaWheelSetups.Add({});
+		}
+		else if (PropertyChangedEvent.ChangeType == EPropertyChangeType::ArrayRemove)
+		{
+			SodaWheelSetups.RemoveAt(SodaWheelSetups.Num() - 1);
+		}
+
+		if (SodaWheelSetups.Num() != WheelSetups.Num())
+		{
+			SodaWheelSetups.SetNum(WheelSetups.Num());
+		}
+	}
+}
+
+void USodaChaosWheeledVehicleMovementComponent::PostEditUndo()
+{
+	Super::PostEditUndo();
+}
+
+void USodaChaosWheeledVehicleMovementComponent::PostInitProperties()
+{
+	Super::PostInitProperties();
+	if (SodaWheelSetups.Num() != WheelSetups.Num())
+	{
+		SodaWheelSetups.SetNum(WheelSetups.Num());
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/StaticWheeledVehicleMovement.cpp b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/StaticWheeledVehicleMovement.cpp
new file mode 100644
index 0000000..87f1b4a
--- /dev/null
+++ b/Source/UnrealSoda/Private/VehicleComponents/WheeledVehicleMovements/StaticWheeledVehicleMovement.cpp
@@ -0,0 +1,105 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/VehicleComponents/WheeledVehicleMovements/StaticWheeledVehicleMovement.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Engine/Engine.h"
+#include "Engine/Canvas.h"
+
+UStaticWheeledVehicleMovementComponent::UStaticWheeledVehicleMovementComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.ComponentNameOverride = TEXT("Static Vehicle");
+
+	PrimaryComponentTick.bCanEverTick = true;
+	PrimaryComponentTick.TickGroup = TG_PostPhysics;
+	bWantsInitializeComponent = true;
+}
+
+void UStaticWheeledVehicleMovementComponent::InitializeComponent()
+{
+	Super::InitializeComponent();
+}
+
+void UStaticWheeledVehicleMovementComponent::UninitializeComponent()
+{
+	Super::UninitializeComponent();
+}
+
+void UStaticWheeledVehicleMovementComponent::BeginPlay()
+{
+	Super::BeginPlay();
+}
+
+void UStaticWheeledVehicleMovementComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+}
+
+void UStaticWheeledVehicleMovementComponent::OnPreActivateVehicleComponent()
+{
+	Super::OnPreActivateVehicleComponent();
+
+
+	OnSetActiveMovement();
+}
+
+bool UStaticWheeledVehicleMovementComponent::OnActivateVehicleComponent()
+{
+	if (!Super::OnActivateVehicleComponent())
+	{
+		return false;
+	}
+
+	if (UpdatedPrimitive)
+	{
+		UpdatedPrimitive->SetSimulatePhysics(false);
+		UpdatedPrimitive->SetCollisionResponseToAllChannels(ECollisionResponse::ECR_Overlap);
+		UpdatedPrimitive->SetCollisionEnabled(ECollisionEnabled::QueryOnly);
+	}
+
+	return true;
+}
+
+void UStaticWheeledVehicleMovementComponent::OnDeactivateVehicleComponent()
+{
+	Super::OnDeactivateVehicleComponent();
+}
+
+void UStaticWheeledVehicleMovementComponent::TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction)
+{
+	Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
+	if (!HealthIsWorkable()) return;
+
+	PrePhysicSimulation(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = UpdatedPrimitive->GetComponentTransform();
+	VehicleSimData.VehicleKinematic.Prev.GlobalPose = UpdatedPrimitive->GetComponentTransform();
+
+	++VehicleSimData.SimulatedStep;
+	VehicleSimData.SimulatedTimestamp = SodaApp.GetSimulationTimestamp();
+
+	VehicleSimData.RenderStep = VehicleSimData.SimulatedStep;
+	VehicleSimData.RenderTimestamp = VehicleSimData.SimulatedTimestamp;
+
+	VehicleSimData.VehicleKinematic.Curr.GlobalPose = UpdatedPrimitive->GetComponentTransform();
+	VehicleSimData.VehicleKinematic.Prev.GlobalPose = UpdatedPrimitive->GetComponentTransform();
+
+	PostPhysicSimulation(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+	PostPhysicSimulationDeferred(DeltaTime, VehicleSimData.VehicleKinematic, VehicleSimData.SimulatedTimestamp);
+}
+
+bool UStaticWheeledVehicleMovementComponent::SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation)
+{
+	if (UpdatedPrimitive)
+	{
+		VehicleSimData.VehicleKinematic.Prev.GlobalPose = VehicleSimData.VehicleKinematic.Curr.GlobalPose = FTransform(NewRotation, NewLocation, FVector(1.0, 1.0, 1.0));
+		UpdatedPrimitive->SetWorldLocationAndRotation(NewLocation, NewRotation, true, nullptr, ETeleportType::TeleportPhysics);
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
diff --git a/Source/UnrealSoda/Private/Vehicles/GazeboVehicle.cpp b/Source/UnrealSoda/Private/Vehicles/GazeboVehicle.cpp
new file mode 100644
index 0000000..896e373
--- /dev/null
+++ b/Source/UnrealSoda/Private/Vehicles/GazeboVehicle.cpp
@@ -0,0 +1,280 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Vehicles/GazeboVehicle.h"
+#include "Soda/UnrealSoda.h"
+#include "DrawDebugHelpers.h"
+#include "Components/PrimitiveComponent.h"
+
+const FVector V2V(const soda::Vector3D& V)
+{
+	return FVector(V.x * 100, -V.y * 100, V.z * 100);
+}
+
+const soda::Vector3D V2V(const FVector& V)
+{
+	return soda::Vector3D(V.X / 100, -V.Y / 100, V.Z / 100);
+}
+
+void FSecondaryTickFunction::ExecuteTick(
+	float DeltaTime,
+	ELevelTick TickType,
+	ENamedThreads::Type CurrentThread,
+	const FGraphEventRef& MyCompletionGraphEvent)
+{
+
+	if (Target && !Target->IsPendingKillOrUnreachable())
+	{
+		if (TickType != LEVELTICK_ViewportsOnly || Target->ShouldTickIfViewportsOnly())
+		{
+			FScopeCycleCounterUObject ActorScope(Target);
+			Target->TickActor2(DeltaTime * Target->CustomTimeDilation, TickType, *this);
+		}
+	}
+}
+
+FString FSecondaryTickFunction::DiagnosticMessage()
+{
+	return Target->GetFullName() + TEXT("[TickActor2]");
+}
+
+AGazeboPawn::AGazeboPawn()
+{
+	/*
+	Ctx = new zmq::context_t();
+	SockSub = new zmq::socket_t(*Ctx, ZMQ_SUB);
+	SockPub = new zmq::socket_t(*Ctx, ZMQ_PUB);
+
+	SockSub->setsockopt(ZMQ_SUBSCRIBE, 0, 0);
+	SockPub->setsockopt(ZMQ_SNDHWM, 1);
+	*/
+
+	PrimaryActorTick.bCanEverTick = true;
+	PrimaryActorTick.bTickEvenWhenPaused = false;
+	PrimaryActorTick.TickGroup = TG_PrePhysics;
+	PrimaryActorTick.bStartWithTickEnabled = true;
+
+	//PrimaryActorTick.bAllowTickOnDedicatedServer = true;
+
+	SecondaryActorTick.bCanEverTick = true;
+	SecondaryActorTick.bTickEvenWhenPaused = false;
+	SecondaryActorTick.TickGroup = TG_PostPhysics;
+	SecondaryActorTick.bStartWithTickEnabled = true;
+}
+
+AGazeboPawn::~AGazeboPawn()
+{
+	/*
+	delete SockSub;
+	delete SockPub;
+	delete Ctx;
+	*/
+}
+
+void AGazeboPawn::PostInitProperties()
+{
+	Super::PostInitProperties();
+
+	if (!IsTemplate() && SecondaryActorTick.bCanEverTick)
+	{
+		SecondaryActorTick.Target = this;
+		SecondaryActorTick.SetTickFunctionEnable(SecondaryActorTick.bStartWithTickEnabled || SecondaryActorTick.IsTickFunctionEnabled());
+		SecondaryActorTick.RegisterTickFunction(GetLevel());
+	}
+}
+
+void AGazeboPawn::BeginPlay()
+{
+	Super::BeginPlay();
+
+	//int Confl = 1;
+
+	/*
+	try
+	{
+		//SockSub->setsockopt(ZMQ_CONFLATE, &Confl, sizeof(confl)); // Keep only last message
+		SockSub->connect(std::string(TCHAR_TO_UTF8(*ModelStateSubAddr)));
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("sock_sub->connect('%s') failed"), *ModelStateSubAddr);
+	}
+
+	try
+	{
+		//SockPub->setsockopt(ZMQ_CONFLATE, &Confl, sizeof(confl)); // Keep only last message
+		SockPub->bind(std::string(TCHAR_TO_UTF8(*CollisionPublisherAddr)));
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("sock_pub->bind('%s')"), *CollisionPublisherAddr);
+	}
+	*/
+
+	CollisionMsg.msg_id = 0;
+	StateMsg.msg_id = 0;
+}
+
+void AGazeboPawn::EndPlay(const EEndPlayReason::Type EndPlayReason)
+{
+	Super::EndPlay(EndPlayReason);
+
+	/*
+
+	try
+	{
+		SockSub->disconnect(TCHAR_TO_UTF8(*ModelStateSubAddr));
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("sock_sub->disconnect('%s')"), *ModelStateSubAddr);
+	}
+
+	try
+	{
+		SockPub->unbind(TCHAR_TO_UTF8(*CollisionPublisherAddr));
+	}
+	catch (...)
+	{
+		UE_LOG(LogSoda, Error, TEXT("sock_pub->unbind('%s')"), *CollisionPublisherAddr);
+	}
+	*/
+}
+
+void AGazeboPawn::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+
+	zmq::message_t Msg;
+	int Pkgs = 0;
+
+	/*
+	while (SockSub->recv(&Msg, ZMQ_NOBLOCK))
+	{
+		StateMsg.Deserialize((unsigned char*)Msg.data(), Msg.size());
+		Pkgs++;
+	}
+	*/
+
+	/*
+	UE_LOG(LogSoda, Warning, TEXT("*** PrePhysics; pkgs: %i; state_msg.last_collision_msg: %i; last_collision_msg: %i; acc_z: %f"), 
+		pkgs, 
+		state_msg.last_collision_msg, 
+		collision_msg.msg_id,
+		state_msg.liner_acceleration.z);
+	*/
+
+	if (!Model || !Pkgs)
+		return;
+
+	/*
+	UE_LOG(LogSoda, Warning, TEXT("*** pos (%f %f %f); yaw: %f; pitch: %f; roll: %f; V (%f %f %f); A (%f %f %f);"), 
+		state.x, state.y, state.z, 
+		state.yaw, state.pitch, state.roll, 
+		state.vx, state.vy, state.vz,
+		state.ax, state.ay, state.az
+	);*/
+
+	Model->AddForce(FVector(0, 0, (StateMsg.liner_acceleration.z - StateMsg.add_acc_z) * 1.5 * 100));
+
+	Model->SetWorldTransform(FTransform(
+								 FRotator(-StateMsg.pitch / PI * 180, -StateMsg.yaw / PI * 180, StateMsg.roll / PI * 180).Quaternion(),
+								 V2V(StateMsg.position)),
+							 true);
+
+	Model->SetPhysicsLinearVelocity(V2V(StateMsg.liner_velocity));
+	Model->SetPhysicsAngularVelocityInRadians(FVector(-StateMsg.angular_velocity.x, StateMsg.angular_velocity.y, -StateMsg.angular_velocity.z));
+
+	if (GazeboJoints.Num() != StateMsg.chanels.size())
+		GazeboJoints.SetNum(StateMsg.chanels.size());
+
+	for (size_t i = 0; i < GazeboJoints.Num(); i++)
+		GazeboJoints[i] = StateMsg.chanels[i];
+
+	/*
+    FVector v = Model->GetPhysicsLinearVelocity();
+	UE_LOG(LogSoda, Warning, TEXT("*** PrePhysics; V: (%f %f %f);"), 
+		v.X, v.Y, v.Z
+	);
+*/
+}
+
+void AGazeboPawn::TickActor2(float DeltaTime, enum ELevelTick TickType, FSecondaryTickFunction& ThisTickFunction)
+{
+	/*
+    const bool bShouldTick = ((TickType != LEVELTICK_ViewportsOnly) || ShouldTickIfViewportsOnly());
+    if (bShouldTick)
+    {
+      	if (!IsPendingKill() && GetWorld())
+       	{
+			if (GetWorldSettings()!=NULL &&
+				(bAllowReceiveTickEventOnDedicatedServer||!IsRunningDedicatedServer()))
+				{
+					//My cool post physics tick stuff
+				}
+       	}
+    }
+*/
+
+	/*
+	FVector v = Model->GetPhysicsLinearVelocity();
+	UE_LOG(LogSoda, Warning, TEXT("*** PostPhysics; V: (%f %f %f);"), 
+		v.X, v.Y, v.Z
+	);
+*/
+}
+
+void AGazeboPawn::NotifyHit(class UPrimitiveComponent* MyComp, class AActor* Other, class UPrimitiveComponent* OtherComp, bool bSelfMoved, FVector HitLocation,
+							FVector HitNormal, FVector NormalImpulse, const FHitResult& Hit)
+{
+	if (!Model)
+		return;
+
+	/*
+	UE_LOG(LogSoda, Warning, TEXT("Hit location (%f %f %f), normal (%f %f %f);"), 
+		HitLocation.X, HitLocation.Y, HitLocation.Z, 
+		NormalImpulse.X, NormalImpulse.Y, NormalImpulse.Z);
+*/
+	FVector Pos = Model->GetComponentLocation();
+	FRotator Rot = Model->GetComponentRotation();
+	FVector CMass = Model->GetCenterOfMass();
+	FVector V = Model->GetPhysicsLinearVelocity();
+	FVector W = Model->GetPhysicsAngularVelocityInRadians();
+
+	//FTransform Trans = Model->GetComponentTransform().Inverse();
+	//FVector HitPos = trans.TransformPosition(HitLocation);
+	//FVector NormalImpulseTrans =  trans.TransformVector(NormalImpulse);
+
+	CollisionMsg.position = V2V(Pos);
+	CollisionMsg.yaw = -Rot.Yaw / 180.0 * PI;
+	CollisionMsg.pitch = -Rot.Pitch / 180.0 * PI;
+	CollisionMsg.roll = Rot.Roll / 180.0 * PI;
+	CollisionMsg.liner_velocity = V2V(V);
+	CollisionMsg.angular_velocity = soda::Vector3D(-W.X, W.Y, -W.Z);
+	CollisionMsg.hit_location = V2V(HitLocation);
+	CollisionMsg.hit_normal = V2V(HitNormal);
+	CollisionMsg.hit_normal_impulse = V2V(NormalImpulse);
+	CollisionMsg.msg_id++;
+	CollisionMsg.last_state_msg = StateMsg.msg_id;
+
+	CollisionMsg.Serialize(SendBuf);
+
+	//SockPub->send(&SendBuf[0], SendBuf.size(), ZMQ_NOBLOCK);
+
+	if (DebugOut)
+	{
+		DrawDebugLine(
+			GetWorld(),
+			HitLocation,
+			HitLocation + NormalImpulse * 30,
+			FColor(0, 255, 0), false, 2.0, 0, 12.333);
+		/*
+		UE_LOG(LogSoda, Warning, TEXT("*** NotifyHit; V: (%f %f %f); id: %i"),
+			   V.X, V.Y, V.Z, CollisionMsg.msg_id);
+		*/
+	}
+}
+
+void AGazeboPawn::PostInitializeComponents()
+{
+	Super::PostInitializeComponents();
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Vehicles/IWheeledVehicleMovementInterface.cpp b/Source/UnrealSoda/Private/Vehicles/IWheeledVehicleMovementInterface.cpp
new file mode 100644
index 0000000..a8df182
--- /dev/null
+++ b/Source/UnrealSoda/Private/Vehicles/IWheeledVehicleMovementInterface.cpp
@@ -0,0 +1,61 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+
+
+float IWheeledVehicleMovementInterface::GetWheelBaseWidth() const
+{
+	ASodaWheeledVehicle* WheeledVehicle = GetWheeledVehicle();
+
+	if (WheeledVehicle->Is4WDVehicle())
+	{
+		return FMath::Abs(WheeledVehicle->GetWheel4WD(E4WDWheelIndex::FL)->RestingLocation.X - WheeledVehicle->GetWheel4WD(E4WDWheelIndex::RL)->RestingLocation.X);
+	}
+	else
+	{
+		checkf(false, TEXT("Nessessory override GetWheelBaseWidth() for no 4WD vehicle"));
+		return 100;
+	}
+}
+
+float IWheeledVehicleMovementInterface::GetTrackWidth() const
+{
+	ASodaWheeledVehicle* WheeledVehicle = GetWheeledVehicle();
+
+	if (WheeledVehicle->Is4WDVehicle())
+	{
+		return FMath::Abs(WheeledVehicle->GetWheel4WD(E4WDWheelIndex::FL)->RestingLocation.Y - WheeledVehicle->GetWheel4WD(E4WDWheelIndex::FR)->RestingLocation.Y);
+	}
+	else
+	{
+		checkf(false, TEXT("Nessessory override GetTrackWidth() for no 4WD vehicle"));
+		return 100;
+	}
+	
+}
+
+void IWheeledVehicleMovementInterface::PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	for (auto & Wheel : GetWheeledVehicle()->GetWheels())
+	{
+		Wheel->ReqTorq = 0;
+		Wheel->ReqBrakeTorque = 0;
+	}
+	GetWheeledVehicle()->PrePhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+}
+
+void IWheeledVehicleMovementInterface::PostPhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	GetWheeledVehicle()->PostPhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+}
+
+void IWheeledVehicleMovementInterface::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	GetWheeledVehicle()->PostPhysicSimulationDeferred(DeltaTime, VehicleKinematic, Timestamp);
+}
+
+void IWheeledVehicleMovementInterface::OnSetActiveMovement()
+{
+	GetWheeledVehicle()->OnSetActiveMovement(this);
+}
diff --git a/Source/UnrealSoda/Private/Vehicles/SodaVehicle.cpp b/Source/UnrealSoda/Private/Vehicles/SodaVehicle.cpp
new file mode 100644
index 0000000..635b679
--- /dev/null
+++ b/Source/UnrealSoda/Private/Vehicles/SodaVehicle.cpp
@@ -0,0 +1,1699 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/SodaApp.h"
+#include "Soda/UI/SMessageBox.h"
+#include "Serialization/BufferArchive.h"
+#include "Misc/FileHelper.h"
+#include "HAL/PlatformFileManager.h"
+#include "Serialization/MemoryReader.h"
+#include "Kismet/GameplayStatics.h"
+#include "GameFramework/PawnMovementComponent.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "DisplayDebugHelpers.h"
+#include "Soda/SodaStatics.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/SodaActorFactory.h"
+#include "Interfaces/IPluginManager.h"
+#include "Misc/Paths.h"
+#include "EngineUtils.h"
+#include "Soda/LevelState.h"
+#include "DesktopPlatformModule.h"
+#include "CanvasItem.h"
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Engine/Canvas.h"
+#include "RuntimeEditorModule.h"
+#include "RuntimeMetaData.h"
+#include "Soda/VehicleComponents/CANBus.h"
+#include "Soda/DBGateway.h"
+#include "Misc/Paths.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+#include "Framework/MultiBox/MultiBoxBuilder.h"
+#include "Widgets/Images/SImage.h"
+#include "Styling/StyleColors.h"
+#include "UI/Wnds/SVehcileManagerWindow.h"
+#include "UI/Wnds/SVehcileManagerWindow.h"
+#include "UI/Wnds/SSaveVehicleRequestWindow.h"
+#include "UI/Wnds/SExportVehicleWindow.h"
+#include "UI/ToolBoxes/SVehicleComponentsToolBox.h"
+#include "SodaStyleSet.h"
+
+#include "bsoncxx/builder/stream/helpers.hpp"
+#include "bsoncxx/exception/exception.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+#include "bsoncxx/builder/stream/array.hpp"
+#include "bsoncxx/json.hpp"
+
+#define PARCE_VEC(V, Mul) V.X * Mul, V.Y * Mul, V.Z * Mul
+
+FVehicleSimData FVehicleSimData::Zero{};
+
+FString FVechicleSaveAddress::ToVehicleName() const
+{
+	switch (Source)
+	{
+	case EVehicleSaveSource::NoSave:
+		return TEXT("(New Vehicle)");
+
+	case EVehicleSaveSource::BinExternal:
+		return FPaths::GetBaseFilename(Location);
+
+	case EVehicleSaveSource::BinLocal:
+		return Location;
+
+	case EVehicleSaveSource::Slot:
+		return Location;
+
+	case EVehicleSaveSource::BinLevel:
+		return TEXT("(Level Vehicle)");
+
+	case EVehicleSaveSource::JsonLocal:
+		return Location;
+
+	case EVehicleSaveSource::JsonExternal:
+		return FPaths::GetBaseFilename(Location);
+
+	case EVehicleSaveSource::DB:
+		return Location;
+
+	default:
+		return TEXT("wtf?");
+	}
+}
+
+FString FVechicleSaveAddress::ToUrl() const
+{
+	switch (Source)
+	{
+	case EVehicleSaveSource::NoSave:
+		return TEXT("");
+
+	case EVehicleSaveSource::BinExternal:
+		return FString(TEXT("binext://")) + Location;
+
+	case EVehicleSaveSource::BinLocal:
+		return FString(TEXT("binloc://")) + Location;
+
+	case EVehicleSaveSource::Slot:
+		return FString(TEXT("slot://")) + Location;
+
+	case EVehicleSaveSource::BinLevel:
+		return FString(TEXT("level://")) + Location;
+
+	case EVehicleSaveSource::JsonLocal:
+		return FString(TEXT("jsonloc://")) + Location;
+
+	case EVehicleSaveSource::JsonExternal:
+		return FString(TEXT("jsonext://")) + Location;
+
+	case EVehicleSaveSource::DB:
+		return FString(TEXT("mongodb://")) + Location;
+
+	default:
+		return TEXT("");
+	}
+}
+
+bool FVechicleSaveAddress::SetFromUrl(const FString& Url)
+{
+	FString SourceStr, TmpLocation;
+	if (!Url.Split(TEXT("://"), &SourceStr, &TmpLocation))
+	{
+		return false;
+	}
+
+	if (SourceStr == TEXT("binext"))
+	{
+		Source = EVehicleSaveSource::BinExternal;
+		Location = TmpLocation;
+		return true;
+	}
+	else if (SourceStr == TEXT("binloc"))
+	{
+		Source = EVehicleSaveSource::BinLocal;
+		Location = TmpLocation;
+		return true;
+	}
+	else if (SourceStr == TEXT("slot"))
+	{
+		Source = EVehicleSaveSource::Slot;
+		Location = TmpLocation;
+		return true;
+	}
+	else if (SourceStr == TEXT("level"))
+	{
+		Source = EVehicleSaveSource::BinLevel;
+		Location = TmpLocation;
+		return true;
+	}
+	else if (SourceStr == TEXT("jsonloc"))
+	{
+		Source = EVehicleSaveSource::JsonLocal;
+		Location = TmpLocation;
+		return true;
+	}
+	else if (SourceStr == TEXT("jsonext"))
+	{
+		Source = EVehicleSaveSource::JsonExternal;
+		Location = TmpLocation;
+		return true;
+	}
+	else if (SourceStr == TEXT("mongodb"))
+	{
+		Source = EVehicleSaveSource::DB;
+		Location = TmpLocation;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+ASodaVehicle::ASodaVehicle(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+}
+
+void ASodaVehicle::PreInitializeComponents()
+{
+	Super::PreInitializeComponents();
+
+	TArray<UActorComponent*> ActorComponents;
+	GetComponents<UActorComponent>(ActorComponents);
+
+	/* Deserialize components from Bin */
+	if (ComponentRecords.Num())
+	{
+		for (auto* Component : ActorComponents)
+		{
+			if (FComponentRecord* Record = ComponentRecords.FindByKey(Component))
+			{
+				Record->DeserializeComponent(Component);
+			}
+			else
+			{
+				if (ISodaVehicleComponent* SodaComponent = Cast<ISodaVehicleComponent>(Component))
+				{
+					//Component->DestroyComponent();
+					SodaComponent->GetVehicleComponentGUI().bIsDeleted = true;
+				}
+			}
+		}
+
+		for (auto& ComponentRecord : ComponentRecords)
+		{
+			if (ComponentRecord.Class->ImplementsInterface(USodaVehicleComponent::StaticClass()))
+			{
+				if (!FindVehicleComponentByName(ComponentRecord.Name.ToString()))
+				{
+					UClass* Class = ComponentRecord.Class.Get();
+					if (!Class)
+					{
+						Class = LoadObject<UClass>(nullptr, *ComponentRecord.Class.ToString());
+					}
+					if (Class)
+					{
+						UActorComponent* Component = AddVehicleComponent(Class, ComponentRecord.Name);
+						check(Component);
+						ComponentRecord.DeserializeComponent(Component);
+					}
+				}
+			}
+		}
+	}
+
+	/* Deserialize components from Json */
+	if (JsonAr)
+	{
+		for (auto* Component : ActorComponents)
+		{
+			if (!JsonAr->DeserializeComponent(Component))
+			{
+				if (ISodaVehicleComponent * SodaComponent =  Cast<ISodaVehicleComponent>(Component))
+				{
+					//Component->DestroyComponent();
+					SodaComponent->GetVehicleComponentGUI().bIsDeleted = true;
+				}
+			}
+		}
+
+		for (auto& It : JsonAr->Components->Values)
+		{
+			TSharedPtr<FJsonObject> ComponentObject = It.Value->AsObject();
+			if (!ComponentObject)
+			{
+				continue;
+			}
+			UClass* Class = JsonAr->GetObjectClass(ComponentObject);
+			
+			if (Class)
+			{
+				if (!FindVehicleComponentByName(It.Key) && Class->ImplementsInterface(USodaVehicleComponent::StaticClass()))
+				{
+					UActorComponent* Component = AddVehicleComponent(Class, FName(*It.Key));
+					check(Component);
+					JsonAr->JsonObjectToUObject(ComponentObject.ToSharedRef(), Component, true);
+				}
+			}
+			else
+			{
+				UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::PreInitializeComponents(); Can't find component class \"%s\""), *ComponentObject->GetStringField(TEXT("__class__")));
+			}
+		}
+	}
+
+	for (auto* Component : ActorComponents)
+	{
+		if (ISodaVehicleComponent* SodaComponent = Cast<ISodaVehicleComponent>(Component))
+		{
+			if (SodaComponent->GetVehicleComponentGUI().bIsDeleted)
+			{
+				SodaComponent->GetVehicleComponentGUI().Category = "DELETED";
+				SodaComponent->GetVehicleComponentCommon().Activation = EVehicleComponentActivation::None;
+			}
+		}
+	}
+}
+
+void ASodaVehicle::BeginPlay()
+{
+	Super::BeginPlay();
+
+	check(USodaGameModeComponent::Get());
+
+	VehicelExtent = USodaStatics::CalculateActorExtent(this);
+	UpdateProperties();
+
+	PhysicMutex.Lock();
+
+	ReRegistreVehicleComponents();
+	
+	for (auto& Component : GetVehicleComponents())
+	{
+		if ((Component->GetVehicleComponentCommon().Activation == EVehicleComponentActivation::OnBeginPlay) && !Component->IsVehicleComponentActiveted())
+		{
+			Component->OnPreActivateVehicleComponent();
+		}
+	}
+
+	for (auto& Component : GetVehicleComponents())
+	{
+		if ((Component->GetVehicleComponentCommon().Activation == EVehicleComponentActivation::OnBeginPlay) && !Component->IsVehicleComponentActiveted())
+		{
+			Component->OnActivateVehicleComponent();
+		}
+	}
+
+	PhysicMutex.Unlock();
+}
+
+void ASodaVehicle::EndPlay(const EEndPlayReason::Type EndPlayReason) 
+{
+	for (auto& Component : GetVehicleComponents())
+	{
+		if (Component->IsVehicleComponentActiveted())
+		{
+			Component->OnDeactivateVehicleComponent();
+		}
+	}
+
+	Super::EndPlay(EndPlayReason);
+}
+
+void ASodaVehicle::PossessedBy(AController* NewController)
+{
+	Super::PossessedBy(NewController);
+
+	if (IsValid(VehicleWidget1) && Cast<APlayerController>(NewController))
+	{
+		VehicleWidget1->AddToViewport(0);
+	}
+
+	if (IsValid(VehicleWidget2) && Cast<APlayerController>(NewController))
+	{
+		VehicleWidget2->AddToViewport(0);
+	}
+}
+
+void ASodaVehicle::UnPossessed()
+{
+	Super::UnPossessed();
+
+	if (IsValid(VehicleWidget1))
+	{
+		VehicleWidget1->RemoveFromParent();
+	}
+
+	if (IsValid(VehicleWidget2))
+	{
+		VehicleWidget2->RemoveFromParent();
+	}
+
+	USodaGameModeComponent::GetChecked()->UnpossesVehicle = this;
+}
+
+void ASodaVehicle::Serialize(FArchive& Ar)
+{
+	Super::Serialize(Ar);
+
+	ComponentRecords.Empty();
+	const TSet<UActorComponent*>& Components = GetComponents();
+
+	if (Ar.IsSaveGame())
+	{
+		if (Ar.IsSaving())
+		{
+			for (auto* Component : Components)
+			{
+				FComponentRecord& ComponentRecord = ComponentRecords.Add_GetRef(FComponentRecord());
+				ComponentRecord.SerializeComponent(Component);
+			}
+			Ar << ComponentRecords;
+		}
+		else if (Ar.IsLoading())
+		{
+			Ar << ComponentRecords;
+		}
+	}
+}
+
+UActorComponent* ASodaVehicle::FindVehicleComponentByName(const FString & ComponentName) const
+{
+	TArray<UActorComponent*> Components = GetComponentsByInterface(USodaVehicleComponent::StaticClass());
+	for(auto & Component: Components)
+	{
+		if(Component->GetName() == ComponentName)
+		{
+			return Component;
+		}
+	}
+	return nullptr;
+}
+
+UActorComponent* ASodaVehicle::FindComponentByName(const FString& ComponentName) const
+{
+	const TSet<UActorComponent*>& Components = GetComponents();
+
+	for (auto& Component : Components)
+	{
+		if (Component->GetName() == ComponentName)
+		{
+			return Component;
+		}
+	}
+
+	return nullptr;
+}
+
+UActorComponent* ASodaVehicle::AddVehicleComponent(TSubclassOf<UActorComponent> Class, FName Name)
+{
+	FScopeLock ScopeLock(&PhysicMutex);
+
+	if (Class.Get() == nullptr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::AddVehicleComponent(); Null class cannot be created "));
+		return nullptr;
+	}
+
+	if (!Class->ImplementsInterface(USodaVehicleComponent::StaticClass()))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::AddVehicleComponent(); The class isn't the ISodaVehicleComponent"));
+		return nullptr;
+	}
+
+	/* Check component name*/
+	FString ComponentName;
+	if (Name.IsNone())
+	{
+		Name = USodaStatics::GetSensorShortName(Class->GetFName());
+	}
+	ComponentName = Name.ToString();
+	
+	TArray<UActorComponent*> ActorComponents;
+	GetComponents<UActorComponent>(ActorComponents);
+	int i = 0;
+	bool isOk = false;
+	while(!isOk)
+	{
+		isOk = true;
+		for (auto& Component : ActorComponents)
+		{
+			if (Component->GetName() == ComponentName)
+			{
+				ComponentName = Name.ToString() + FString::FromInt(++i);
+				isOk = false;
+				break;
+			}
+		}
+	}
+
+	UActorComponent* NewComponent = NewObject<UActorComponent>(this, Class, FName(*ComponentName));
+	if (!NewComponent)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::AddVehicleComponent(); Can't create non-default component; Name: '%s', Class: '%s'"), *ComponentName, *Class->GetFName().ToString());
+		return nullptr;
+	}
+
+	if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(NewComponent))
+	{
+		int MaxOrder = -1;
+		for (auto& Component : GetVehicleComponents())
+		{
+			MaxOrder = std::max(MaxOrder, Component->GetVehicleComponentGUI().Order);
+		}
+		VehicleComponent->GetVehicleComponentGUI().Order = MaxOrder + 1;
+		if (HasActorBegunPlay())
+		{
+			VehicleComponent->GetVehicleComponentCommon().Activation = EVehicleComponentActivation::None;
+		}
+	}
+
+	if (USceneComponent* SceneComponent = Cast<USceneComponent>(NewComponent))
+	{
+		SceneComponent->SetupAttachment(RootComponent);
+	}
+
+	NewComponent->RegisterComponent();
+
+	UE_LOG(LogSoda, Log, TEXT("Create non-default component; Name: '%s', Class: '%s'"), *ComponentName, *Class->GetFName().ToString());
+
+	if (HasActorBegunPlay())
+	{
+		ReActivateVehicleComponents(true);
+	}
+
+	return NewComponent;
+}
+
+bool ASodaVehicle::RemoveVehicleComponentByName(FName Name)
+{
+	FScopeLock ScopeLock(&PhysicMutex);
+
+	ISodaVehicleComponent* Component = Cast<ISodaVehicleComponent>(FindVehicleComponentByName(Name.ToString()));
+
+	if (Component == nullptr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::RemoveVehicleComponentByName(); Can't find component '%s'"), *Name.ToString());
+		return false;
+	}
+
+	Component->RemoveVehicleComponent();
+
+	return true;
+}
+
+TArray<ISodaVehicleComponent*> ASodaVehicle::GetVehicleComponentsSorted(const FString& GUICategory, bool bNormalizeIfNecessary )
+{
+	TArray<ISodaVehicleComponent*> Components = GetVehicleComponents();
+
+	if (bNormalizeIfNecessary)
+	{
+		int Ind = 0;
+		for (auto& Component : GetVehicleComponentsSorted("", false))
+		{
+			Component->GetVehicleComponentGUI().Order = Ind++;
+		}
+	}
+
+	if (GUICategory.Len() > 0)
+	{
+		Components.RemoveAll([GUICategory](const auto& El) { return El->GetVehicleComponentGUI().Category != GUICategory; });
+		Components.Sort([](const auto& A, const auto& B) { return A.GetVehicleComponentGUI().Order < B.GetVehicleComponentGUI().Order; });
+	}
+	else
+	{
+		Components.Sort([](const auto& A, const auto& B)
+		{
+			int Ret = A.GetVehicleComponentGUI().Category.Compare(B.GetVehicleComponentGUI().Category, ESearchCase::IgnoreCase);
+			if (Ret == 0)
+			{
+				return A.GetVehicleComponentGUI().Order < B.GetVehicleComponentGUI().Order;
+			}
+			else if (Ret < 0)
+			{
+				return true;
+			}
+			else // Ret > 0
+			{
+				return false;
+			}
+		});
+	}
+
+	return Components;
+}
+
+ASodaVehicle * ASodaVehicle::RespawnVehcile(FVector Location, FRotator Rotation, bool IsOffset, const UClass* NewVehicleClass)
+{
+	UWorld * World = GetWorld();
+	check(World);
+
+	FTransform SpawnTransform = IsOffset ? 
+		FTransform(FRotator(0.f, GetActorRotation().Yaw, 0.f) + Rotation, GetActorLocation() + Location, FVector(1.0f, 1.0f, 1.0f)) :
+		FTransform(Rotation, Location, FVector(1.0f, 1.0f, 1.0f));
+
+	const UClass* Class = (NewVehicleClass != nullptr) ? NewVehicleClass : GetClass();
+
+	ASodaVehicle * NewVehicle = World->SpawnActorDeferred<ASodaVehicle>(
+		const_cast<UClass*>(Class),
+		SpawnTransform, 
+		nullptr, nullptr, 
+		ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn);
+
+	if(NewVehicle == nullptr)
+	{
+		return nullptr;
+	}
+
+	if (NewVehicleClass == nullptr)
+	{
+		FActorRecord SavedActorRecord;
+		SavedActorRecord.SerializeActor(this, false);
+		SavedActorRecord.DeserializeActor(NewVehicle, false);
+		NewVehicle->bIsDirty = IsDirty();
+	}
+
+	if (NewVehicleClass == nullptr || GetClass() == NewVehicleClass)
+	{
+		NewVehicle->SaveAddress = SaveAddress;
+	}
+
+	if (GetClass() == NewVehicleClass)
+	{
+		NewVehicle->MarkAsDirty();
+	}
+
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::GetChecked();
+	GameMode->NotifyLevelIsChanged();
+
+	if (GameMode->LevelState && GameMode->LevelState->ActorFactory)
+	{
+		GameMode->LevelState->ActorFactory->ReplaceActor(NewVehicle, this, false);
+	}
+	if(GameMode->UnpossesVehicle == this) GameMode->UnpossesVehicle = NewVehicle;
+	
+
+	bool NeedPosses = IsPlayerControlled();
+
+	if (IsValid(VehicleWidget1))
+		VehicleWidget1->Vehcile = nullptr;
+
+	if (IsValid(VehicleWidget2))
+		VehicleWidget2->Vehcile = nullptr;
+	Destroy();
+
+	NewVehicle->FinishSpawning(SpawnTransform);
+
+	APlayerController *PlayerController = World->GetFirstPlayerController();
+	if ( PlayerController != nullptr && NeedPosses )
+	{
+		PlayerController->Possess(NewVehicle);
+	}
+
+	return NewVehicle;
+}
+
+ASodaVehicle* ASodaVehicle::RespawnVehcileFromAddress(const FVechicleSaveAddress& Address, FVector Location, FRotator Rotation, bool IsOffset)
+{
+	UWorld* World = GetWorld();
+	check(World);
+
+	FTransform SpawnTransform = IsOffset ?
+		FTransform(FRotator(0.f, GetActorRotation().Yaw, 0.f) + Rotation, GetActorLocation() + Location, FVector(1.0f, 1.0f, 1.0f)) :
+		FTransform(Rotation, Location, FVector(1.0f, 1.0f, 1.0f));
+
+	bool NeedPosses = IsPlayerControlled();
+
+	Destroy();
+
+	ASodaVehicle* NewVehicle = ASodaVehicle::SpawnVehicleFormAddress(World, Address, SpawnTransform.GetTranslation(), SpawnTransform.GetRotation().Rotator(), NeedPosses);
+
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::GetChecked();
+	GameMode->NotifyLevelIsChanged();
+	if (GameMode->LevelState && GameMode->LevelState->ActorFactory)
+	{
+		GameMode->LevelState->ActorFactory->ReplaceActor(NewVehicle, this, false);
+	}
+	if (GameMode->UnpossesVehicle == this) GameMode->UnpossesVehicle = NewVehicle;
+	
+	return NewVehicle;
+}
+
+
+bool ASodaVehicle::DrawDebug(class UCanvas* Canvas, float& YL, float& YPos)
+{
+	YPos += 30;
+
+	FCanvasTileItem TileItem(FVector2D(0, 0), GWhiteTexture, FVector2D(SodaApp.GetSodaUserSettings()->VehicleDebugAreaWidth, Canvas->SizeY), FLinearColor(0.0f, 0.0f, 0.0f, 0.3f));
+	TileItem.BlendMode = SE_BLEND_Translucent;
+	Canvas->DrawItem(TileItem);
+
+	UFont* RenderFont = GEngine->GetSmallFont();
+	static FColor SubCaption(170, 170, 170);
+
+	Canvas->SetDrawColor(FColor(51, 102, 204));
+	YPos += Canvas->DrawText(UEngine::GetMediumFont(), TEXT("Vehicle: ") + SaveAddress.ToVehicleName() + (IsDirty() ? TEXT("*") : TEXT("")), 4, YPos + 4);
+	YPos += Canvas->DrawText(UEngine::GetMediumFont(), TEXT("Source: ") + UEnum::GetValueAsString(SaveAddress.Source), 4, YPos + 4);
+
+	if (bShowPhysBodyKinematic)
+	{
+		Canvas->SetDrawColor(SubCaption);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("PhysBodyKinematic:")), 16, YPos);
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Acc: [%.1f, %.1f, %.1f] m/s^2"),          PARCE_VEC(PhysBodyKinematicCashed.Curr.GetLocalAcceleration(), 0.01)), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Ang Velocity: [%.1f, %.1f, %.1f] rad/s"), PARCE_VEC(PhysBodyKinematicCashed.Curr.AngularVelocity, 1)), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Vel : [%.1f, %.1f, %.1f] m/s"),           PARCE_VEC(PhysBodyKinematicCashed.Curr.GetLocalVelocity(), 0.01)), 16, YPos);
+	}
+
+	return true;
+}
+
+void ASodaVehicle::ReRegistreVehicleComponents()
+{
+	PreTickedVehicleComponens.Empty();
+	PostTickedVehicleComponens.Empty();
+	PostTickedDeferredVehicleComponens.Empty();
+
+	for (auto& It : GetVehicleComponents())
+	{
+		if (IVehicleTickablObject* Component = Cast<IVehicleTickablObject>(It))
+		{
+			if (Component->GetVehicleComponentTick().bAllowVehiclePrePhysTick)
+			{
+				PreTickedVehicleComponens.Add(Component);
+			}
+			if (Component->GetVehicleComponentTick().bAllowVehiclePostPhysTick)
+			{
+				PostTickedVehicleComponens.Add(Component);
+			}
+			if (Component->GetVehicleComponentTick().bAllowVehiclePostDeferredPhysTick)
+			{
+				PostTickedDeferredVehicleComponens.Add(Component);
+			}
+		}
+
+		It->OnRegistreVehicleComponent();
+	}
+
+	PreTickedVehicleComponens.Sort([](const auto& LHS, const auto& RHS) { return LHS.GetVehicleComponentTick().PrePhysTickGroup > RHS.GetVehicleComponentTick().PrePhysTickGroup; });
+	PostTickedVehicleComponens.Sort([](const auto& LHS, const auto& RHS) { return LHS.GetVehicleComponentTick().PostPhysTickGroup > RHS.GetVehicleComponentTick().PostPhysTickGroup; });
+	PostTickedDeferredVehicleComponens.Sort([](const auto& LHS, const auto& RHS) {return LHS.GetVehicleComponentTick().PostPhysDeferredTickGroup > RHS.GetVehicleComponentTick().PostPhysDeferredTickGroup; });
+
+	GetComponents<UCANBusComponent>(CANDevs);
+}
+
+void ASodaVehicle::ReActivateVehicleComponents(bool bOnlyTopologyComponents)
+{
+	if (!HasActorBegunPlay())
+	{
+		checkf(true, TEXT("ReActivateVehicleComponents() can be called only after BeginPlay()"));
+		return;
+	}
+
+	FScopeLock ScopeLock(&PhysicMutex);
+
+	TArray<ISodaVehicleComponent*> Components = GetVehicleComponents();
+
+	TArray<TTuple< ISodaVehicleComponent*, bool>> ComponentsActive;
+	ComponentsActive.Reserve(Components.Num());
+	for (auto& It : Components)
+	{
+		if (!bOnlyTopologyComponents || It->GetVehicleComponentCommon().bIsTopologyComponent)
+		{
+			bool bIsNeedActivate =
+				(It->IsVehicleComponentActiveted() && It->GetDeferredTask() != EVehicleComponentDeferredTask::Deactivate) ||
+				It->GetDeferredTask() == EVehicleComponentDeferredTask::Activate;
+			ComponentsActive.Add(MakeTuple(It, bIsNeedActivate));
+			if (It->IsVehicleComponentActiveted())
+			{
+				It->OnDeactivateVehicleComponent();
+			}
+		}
+	}
+
+	ReRegistreVehicleComponents();
+	
+	for (auto& It : ComponentsActive)
+	{
+		if (It.Get<1>()) It.Get<0>()->OnPreActivateVehicleComponent();
+	}
+
+	for (auto& It : ComponentsActive)
+	{
+		if (It.Get<1>()) It.Get<0>()->OnActivateVehicleComponent();
+	}
+
+	bNotifyNeedReActivateComponents = false;
+}
+
+bool ASodaVehicle::ReActivateVehicleComponentsIfNeeded()
+{
+	if (bNotifyNeedReActivateComponents)
+	{
+		ReActivateVehicleComponents(true);
+		return true;
+	}
+	return false;
+}
+
+void ASodaVehicle::UpdateProperties()
+{
+	if (VehicleWidget1)
+	{
+		VehicleWidget1->RemoveFromParent();
+		VehicleWidget1 = nullptr;
+	}
+
+	if (VehicleWidget2)
+	{
+		VehicleWidget2->RemoveFromParent();
+		VehicleWidget2 = nullptr;
+	}
+
+	const bool bIsControledByPlayer = !!Cast<APlayerController>(GetController());
+
+	if (bShowVehicleWidget1 && VehicleWidgetClass1)
+	{
+		VehicleWidget1 = NewObject<UVehicleWidget>(this, VehicleWidgetClass1);
+		VehicleWidget1->Vehcile = this;
+		if(bIsControledByPlayer) VehicleWidget1->AddToViewport(0);
+	}
+
+	if (bShowVehicleWidget2 && VehicleWidgetClass2)
+	{
+		VehicleWidget2 = NewObject<UVehicleWidget>(this, VehicleWidgetClass2);
+		VehicleWidget2->Vehcile = this;
+		if(bIsControledByPlayer) VehicleWidget1->AddToViewport(0);
+	}
+
+	USodaStatics::TagActor(this, true, EActorTagMethod::ForceCustomLabel, SegmObjectLabel);
+}
+
+void ASodaVehicle::PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp & Timestamp)
+{
+	for (auto& Component : PreTickedVehicleComponens)
+	{
+		if (Component->IsTickAllowed())
+		{
+			Component->PrePhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+		}
+	}
+}
+
+void ASodaVehicle::PostPhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	for (auto& Component : PostTickedVehicleComponens)
+	{
+		if (Component->IsTickAllowed())
+		{
+			Component->PostPhysicSimulation(DeltaTime, VehicleKinematic, Timestamp);
+		}
+	}
+	PhysBodyKinematicCashed = VehicleKinematic;
+
+	if (Dataset)
+	{
+		Dataset->BeginRow();
+		for (auto& Component : VehicleComponensForDataset)
+		{
+			Component->OnPushDataset(*Dataset);
+		}
+		OnPushDataset(*Dataset);
+		Dataset->EndRow();
+	}
+}
+
+void ASodaVehicle::PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp)
+{
+	for (auto& Component : PostTickedDeferredVehicleComponens)
+	{
+		if (Component->IsTickAllowed())
+		{
+			Component->PostPhysicSimulationDeferred(DeltaTime, VehicleKinematic, Timestamp);
+		}
+	}
+}
+
+bool ASodaVehicle::SaveToJson(const FString& FileName, bool bRebase)
+{
+	FJsonActorArchive Ar;
+	if (Ar.SerializeActor(this, true))
+	{
+		if (Ar.SaveToFile(FileName))
+		{
+			if (bRebase)
+			{
+				if (FPaths::IsSamePath(FPaths::GetPath(FileName), GetDefaultVehiclesFolder()))
+				{
+					SaveAddress.Set(EVehicleSaveSource::JsonLocal, FPaths::GetBaseFilename(FileName));
+				}
+				else
+				{
+					SaveAddress.Set(EVehicleSaveSource::JsonExternal, FileName);
+				}
+			}
+			ClearDirty();
+			UE_LOG(LogSoda, Log, TEXT("ASodaVehicle::SaveToJson(). Save vehicle to: %s"), *FileName);
+			return true;
+		}
+		else
+		{
+			UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToJson(). Can't save vehicle to: %s"), *FileName);
+			return false;
+		}
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToJson(). Serialize vehicle failed"));
+		return false;
+	}
+}
+
+bool ASodaVehicle::SaveToDB(const FString& VehicleName, bool bRebase)
+{
+	FJsonActorArchive Ar;
+	FString JsonString;
+	if (Ar.SerializeActor(this, true))
+	{
+		if (Ar.SaveToString(JsonString))
+		{
+			UE_LOG(LogSoda, Log, TEXT("ASodaVehicle::SaveToDB(). Save vehicle"));
+			
+		}
+		else
+		{
+			UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToDB(). Can't save vehicle"));
+			return false;
+		}
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToDB(). Serialize vehicle failed"));
+		return false;
+	}
+
+	if (soda::FDBGateway::Instance().SaveVehicleData(VehicleName, bsoncxx::from_json(bsoncxx::stdx::string_view{ TCHAR_TO_UTF8(*JsonString) })))
+	{
+		ClearDirty();
+
+		if (bRebase)
+		{
+			SaveAddress.Set(EVehicleSaveSource::DB, VehicleName);
+		}
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+
+}
+
+bool ASodaVehicle::SaveToBin(const FString& FileName, bool bRebase)
+{
+	USaveGameActor* SaveGameData = NewObject< USaveGameActor >();
+	if (!SaveGameData->SerializeActor(const_cast<ASodaVehicle*>(this), false))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToBin(). Serialize vehicle failed"));
+		return false;
+	}
+
+	TArray<uint8> BytesData;
+	if (UGameplayStatics::SaveGameToMemory(SaveGameData, BytesData))
+	{
+		if (FFileHelper::SaveArrayToFile(BytesData, *FileName))
+		{
+			if (bRebase)
+			{
+				if (FPaths::IsSamePath(FPaths::GetPath(FileName), GetDefaultVehiclesFolder()))
+				{
+					SaveAddress.Set(EVehicleSaveSource::BinLocal, FPaths::GetBaseFilename(FileName));
+				}
+				else
+				{
+					SaveAddress.Set(EVehicleSaveSource::BinExternal, FileName);
+				}
+			}
+			ClearDirty();
+			UE_LOG(LogSoda, Log, TEXT("ASodaVehicle::SaveToBin(). Save vehicle to: %s"), *FileName);
+			return true;
+		}
+		else
+		{
+			UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToBin(). Can't save vehicle to: %s"), *FileName);
+			return false;
+		}
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToBin(). Faild to save vehicle to memory"), *FileName);
+		return false;
+	}
+	
+}
+
+bool ASodaVehicle::SaveToSlot(const FString& SlotName, bool bRebase)
+{
+	USaveGameActor* SaveGameData = NewObject< USaveGameActor >();
+	if (!SaveGameData->SerializeActor(const_cast<ASodaVehicle*>(this), false))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToSlot(). Serialize vehicle failed"));
+		return false;
+	}
+
+	if (UGameplayStatics::SaveGameToSlot(SaveGameData, SlotName, 0))
+	{
+		if (bRebase)
+		{
+			SaveAddress.Set(EVehicleSaveSource::Slot, SlotName);
+		}
+		ClearDirty();
+		UE_LOG(LogSoda, Log, TEXT("ASodaVehicle::SaveToSlot(). Save vehicle to: %s"), *SlotName);
+		return true;
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SaveToSlot(). Can't save vehicle to: %s"), *SlotName);
+		return false;
+	}
+}
+
+bool ASodaVehicle::SaveToAddress(const FVechicleSaveAddress& Address, bool bRebase)
+{
+	if (Address.Location.Len() == 0)
+	{
+		return false;
+	}
+
+	switch (Address.Source)
+	{
+	case EVehicleSaveSource::BinExternal:
+		return SaveToBin(Address.Location, bRebase);
+
+	case EVehicleSaveSource::BinLocal:
+		return SaveToBin(GetDefaultVehiclesFolder() / FPaths::GetBaseFilename(Address.Location) + TEXT(".bin"), bRebase);
+
+	case EVehicleSaveSource::Slot:
+		return SaveToSlot(Address.Location, bRebase);
+
+	case EVehicleSaveSource::JsonLocal:
+		return SaveToJson(GetDefaultVehiclesFolder() / FPaths::GetBaseFilename(Address.Location) + TEXT(".json"), bRebase);
+
+	case EVehicleSaveSource::JsonExternal:
+		return SaveToJson(Address.Location, bRebase);
+
+	case EVehicleSaveSource::DB:
+		return SaveToDB(Address.Location, bRebase);
+
+	case EVehicleSaveSource::NoSave:
+	case EVehicleSaveSource::BinLevel:
+	default:
+		return false;
+	}
+}
+
+bool ASodaVehicle::Resave()
+{
+	return SaveToAddress(SaveAddress, false);
+}
+
+FString ASodaVehicle::GetDefaultVehiclesFolder()
+{
+	//return IPluginManager::Get().FindPlugin(TEXT("UnrealSoda"))->GetBaseDir() / TEXT("Vehicles");
+	return FPaths::ProjectSavedDir() / TEXT("SodaVehicles");
+}
+
+bool ASodaVehicle::DeleteVehicleSave(const FVechicleSaveAddress& Address)
+{
+	IPlatformFile& FileManager = FPlatformFileManager::Get().GetPlatformFile();
+
+	switch (Address.Source)
+	{
+	case EVehicleSaveSource::JsonExternal:
+	case EVehicleSaveSource::BinExternal:
+		return FileManager.DeleteFile(*Address.Location);
+
+	case EVehicleSaveSource::BinLocal:
+		return FileManager.DeleteFile(*(GetDefaultVehiclesFolder() / Address.Location + TEXT(".bin")));
+
+	case EVehicleSaveSource::JsonLocal:
+		return FileManager.DeleteFile(*(GetDefaultVehiclesFolder() / Address.Location + TEXT(".json")));
+
+	case EVehicleSaveSource::Slot:
+		return UGameplayStatics::DeleteGameInSlot(Address.Location, 0);
+
+	case EVehicleSaveSource::DB:
+		return soda::FDBGateway::Instance().DeleteVehicleData(Address.Location);
+
+	case EVehicleSaveSource::NoSave:
+	case EVehicleSaveSource::BinLevel:
+	default:
+		return false;
+	}
+}
+
+void ASodaVehicle::GetSavedVehiclesLocal(TArray<FVechicleSaveAddress>& Addresses)
+{
+	FString VehiclesDir = GetDefaultVehiclesFolder();
+
+	TArray<FString> Files;
+	IFileManager::Get().FindFiles(Files, *VehiclesDir);
+
+	for (auto& File : Files)
+	{
+		FString Ext = FPaths::GetExtension(File, false).ToLower();
+		Addresses.Add(FVechicleSaveAddress(EVehicleSaveSource::JsonLocal, FPaths::GetBaseFilename(File)));
+	}
+}
+
+bool ASodaVehicle::GetSavedVehiclesDB(TArray<FVechicleSaveAddress>& Addresses)
+{
+	return soda::FDBGateway::Instance().LoadVehiclesList(Addresses);
+}
+
+ASodaVehicle* ASodaVehicle::FindVehicleByAddress(const UWorld* World, const FVechicleSaveAddress& Address)
+{
+	check(World);
+	for (TActorIterator<ASodaVehicle> It(World); It; ++It)
+	{
+		if (It->SaveAddress == Address) return *It;
+	}
+	return nullptr;
+}
+
+ASodaVehicle* ASodaVehicle::SpawnVehicleFromJsonArchive(UWorld* World, const TSharedPtr<FJsonActorArchive> & Ar, const FVechicleSaveAddress& Address, const FVector& Location, const FRotator& Rotation, bool Posses, FName DesireName, bool bApplyOffset)
+{
+	UClass* VahicleClass = Ar->GetActorClass();
+
+	if (!VahicleClass || !VahicleClass->IsChildOf<ASodaVehicle>())
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromJsonArchive(); Vehicle class faild"));
+		return nullptr;
+	}
+
+	FVector Offset = FVector::ZeroVector;
+	if (bApplyOffset)
+	{
+		const FSodaActorDescriptor& Desc = USodaGameModeComponent::Get()->GetSodaActorDescriptor(VahicleClass);
+		Offset = Desc.SpawnOffset;
+	}
+
+	FActorSpawnParameters SpawnInfo;
+	SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
+	SpawnInfo.bDeferConstruction = true;
+	SpawnInfo.Name = DesireName.IsNone() ? NAME_None : FEditorUtils::MakeUniqueObjectName(World->GetCurrentLevel(), VahicleClass, DesireName);
+	FTransform SpawnTransform(Rotation, Location + Offset, FVector(1.0f, 1.0f, 1.0f));
+	ASodaVehicle* NewVehicle = Cast<ASodaVehicle>(World->SpawnActor(VahicleClass, &SpawnTransform, SpawnInfo));
+
+	NewVehicle->JsonAr = Ar;
+
+	if (NewVehicle == nullptr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromJsonArchive(); Can't spawn new vehicle"));
+		return nullptr;
+	}
+
+	if (!Ar->DeserializeActor(NewVehicle, false))
+	{
+		NewVehicle->Destroy();
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromJsonArchive(); Can't deserialize vehicle"));
+		return nullptr;
+	}
+
+	NewVehicle->SetSaveAddress(Address);
+	NewVehicle->FinishSpawning(SpawnTransform);
+
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->NotifyLevelIsChanged();
+	}
+
+	APlayerController* PlayerController = World->GetFirstPlayerController();
+	if (PlayerController != nullptr && Posses)
+	{
+		PlayerController->Possess(NewVehicle);
+	}
+
+	return NewVehicle;
+}
+
+ASodaVehicle* ASodaVehicle::SpawnVehicleFromJsonFile(const UObject* WorldContextObject, const FString& FileName, const FVector& Location, const FRotator& Rotation, bool Posses, FName DesireName, bool bApplyOffset)
+{
+	UWorld* World = USodaStatics::GetGameWorld(WorldContextObject);
+	check(World);
+
+	TSharedPtr<FJsonActorArchive> Ar = MakeShared<FJsonActorArchive>();
+	if (!Ar->LoadFromFile(FileName))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromJsonFile(); Can't read file "));
+		return nullptr;
+	}
+
+	FVechicleSaveAddress Address = 
+		FPaths::IsSamePath(FPaths::GetPath(FileName), GetDefaultVehiclesFolder()) ?
+		FVechicleSaveAddress(EVehicleSaveSource::JsonLocal, FPaths::GetBaseFilename(FileName)) :
+		FVechicleSaveAddress(EVehicleSaveSource::JsonExternal, FileName);
+	
+	ASodaVehicle* NewVehicle = SpawnVehicleFromJsonArchive(World, Ar, Address, Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	if (NewVehicle)
+	{
+		UE_LOG(LogSoda, Log, TEXT("Spawned vehicle from JSON: %s"), *FileName);
+	}
+
+	return NewVehicle;
+}
+
+ASodaVehicle* ASodaVehicle::SpawnVehicleFromDB(const UObject* WorldContextObject, const FString& VehicleName, const FVector& Location, const FRotator& Rotation, bool Posses, FName DesireName, bool bApplyOffset)
+{
+	bsoncxx::document::view Data = soda::FDBGateway::Instance().LoadVehicleData(VehicleName);
+	if (Data.empty())
+	{
+		return nullptr;
+	}
+	
+	FString JsonString = FString(bsoncxx::to_json(Data).c_str());
+	
+	UWorld* World = USodaStatics::GetGameWorld(WorldContextObject);
+	check(World);
+
+	TSharedPtr<FJsonActorArchive> Ar = MakeShared<FJsonActorArchive>();
+	if (!Ar->LoadFromString(JsonString))
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromDB(); Can't read file "));
+		return nullptr;
+	}
+
+	ASodaVehicle* NewVehicle = SpawnVehicleFromJsonArchive(World, Ar, FVechicleSaveAddress(EVehicleSaveSource::DB, VehicleName), Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	if (NewVehicle)
+	{
+		UE_LOG(LogSoda, Log, TEXT("Spawned vehicle from DB: %s"), *VehicleName);
+	}
+
+	return NewVehicle;
+}
+
+ASodaVehicle* ASodaVehicle::SpawnVehicleFromBin(const UObject* WorldContextObject, const FString& SlotOrFileName, bool IsSlot, const FVector& Location, const FRotator& Rotation, bool Posses, FName DesireName, bool bApplyOffset)
+{
+	UWorld* World = USodaStatics::GetGameWorld(WorldContextObject);
+	check(World);
+
+	USaveGameActor* SaveGameData = nullptr;
+	if (IsSlot)
+	{
+		SaveGameData = Cast<USaveGameActor>(UGameplayStatics::LoadGameFromSlot(SlotOrFileName, 0));
+	}
+	else
+	{
+		TArray<uint8> ObjectBytes;
+		if (FFileHelper::LoadFileToArray(ObjectBytes, *SlotOrFileName))
+		{
+			SaveGameData = Cast<USaveGameActor>(UGameplayStatics::LoadGameFromMemory(ObjectBytes));
+		}
+	}
+
+	if (!SaveGameData)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromBin(): Can't open %s"), *SlotOrFileName);
+		return nullptr;
+	}
+
+	UClass* Class = SaveGameData->GetActorRecord().Class.Get();
+	if (!Class)
+	{
+		Class = LoadObject<UClass>(nullptr, *SaveGameData->GetActorRecord().Class.ToString());
+	}
+
+	if (!Class)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromBin(): Can't find class %s"), *SaveGameData->GetActorRecord().Class.ToString());
+		return nullptr;
+	}
+
+	FVector Offset = FVector::ZeroVector;
+	if (bApplyOffset)
+	{
+		const FSodaActorDescriptor& Desc = USodaGameModeComponent::Get()->GetSodaActorDescriptor(Class);
+		Offset = Desc.SpawnOffset;
+	}
+
+	FActorSpawnParameters SpawnInfo;
+	SpawnInfo.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AdjustIfPossibleButAlwaysSpawn;
+	SpawnInfo.bDeferConstruction = true;
+	SpawnInfo.Name = DesireName.IsNone() ? NAME_None : FEditorUtils::MakeUniqueObjectName(World->GetCurrentLevel(), Class, DesireName);
+	FTransform SpawnTransform(Rotation, Location + Offset, FVector(1.0f, 1.0f, 1.0f));
+	ASodaVehicle* NewVehicle = Cast<ASodaVehicle>(World->SpawnActor(Class, &SpawnTransform, SpawnInfo));
+
+	if (NewVehicle == nullptr)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromBin(); Can't spawn new vehicle"));
+		return nullptr;
+	}
+
+
+	if (!SaveGameData->DeserializeActor(NewVehicle, false))
+	{
+		NewVehicle->Destroy();
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::SpawnVehicleFromBin(); Can't deserialize vehicle"));
+		return nullptr;
+	}
+
+	if (IsSlot)
+	{
+		NewVehicle->SetSaveAddress(FVechicleSaveAddress(EVehicleSaveSource::Slot, SlotOrFileName));
+	}
+	else
+	{
+		if (FPaths::IsSamePath(FPaths::GetPath(SlotOrFileName), GetDefaultVehiclesFolder()))
+		{
+			NewVehicle->SetSaveAddress(FVechicleSaveAddress(EVehicleSaveSource::BinLocal, FPaths::GetBaseFilename(SlotOrFileName)));
+		}
+		else
+		{
+			NewVehicle->SetSaveAddress(FVechicleSaveAddress(EVehicleSaveSource::BinExternal, SlotOrFileName));
+		}
+		
+	}
+
+	NewVehicle->FinishSpawning(SpawnTransform);
+
+	if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+	{
+		GameMode->NotifyLevelIsChanged();
+	}
+
+	APlayerController* PlayerController = World->GetFirstPlayerController();
+	if (PlayerController != nullptr && Posses)
+	{
+		PlayerController->Possess(NewVehicle);
+	}
+
+	UE_LOG(LogSoda, Log, TEXT("Spawned vehicle from bin: %s"), *SlotOrFileName);
+
+	return NewVehicle;
+}
+
+ASodaVehicle* ASodaVehicle::SpawnVehicleFormAddress(const UObject* WorldContextObject, const FVechicleSaveAddress& Address, const FVector& Location, const FRotator& Rotation, bool Posses, FName DesireName, bool bApplyOffset)
+{
+	if (Address.Location.Len() == 0)
+	{
+		return nullptr;
+	}
+
+	switch (Address.Source)
+	{
+	case EVehicleSaveSource::BinExternal:
+		return SpawnVehicleFromBin(WorldContextObject, Address.Location, false, Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	case EVehicleSaveSource::BinLocal:
+		return SpawnVehicleFromBin(WorldContextObject, GetDefaultVehiclesFolder() / Address.Location + TEXT(".bin"), false, Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	case EVehicleSaveSource::Slot:
+		return SpawnVehicleFromBin(WorldContextObject, Address.Location, true, Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	case EVehicleSaveSource::JsonExternal:
+		return SpawnVehicleFromJsonFile(WorldContextObject, Address.Location, Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	case EVehicleSaveSource::JsonLocal:
+		return SpawnVehicleFromJsonFile(WorldContextObject, GetDefaultVehiclesFolder() / Address.Location + TEXT(".json"), Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	case EVehicleSaveSource::DB:
+		return SpawnVehicleFromDB(WorldContextObject, Address.Location, Location, Rotation, Posses, DesireName, bApplyOffset);
+
+	case EVehicleSaveSource::NoSave:
+	case EVehicleSaveSource::BinLevel:
+	default:
+		return nullptr;
+	}
+}
+
+TArray<ISodaVehicleComponent*> ASodaVehicle::GetVehicleComponents() const
+{
+	TArray<ISodaVehicleComponent*> Components;
+	for (UActorComponent* Component : GetComponents())
+	{
+		if (ISodaVehicleComponent* VehicleComponent = Cast<ISodaVehicleComponent>(Component))
+		{
+			Components.Add(VehicleComponent);
+		}
+	}
+	
+	return Components;
+}
+
+FString ASodaVehicle::ExportTo(const FString& ExporterName)
+{
+	if (auto Exporter = SodaApp.GetVehicleExporters().Find(ExporterName))
+	{
+		FString Ret;
+		if (Exporter->Get()->ExportToString(this, Ret))
+		{
+			return Ret;
+		}
+		else
+		{
+			UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::ExportTo(); Faild to export to ExporterName: %\"%s\""), *ExporterName);
+			return "";
+		}
+	}
+	else
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::ExportTo(); Can't find ExporterName: \"%s\""), *ExporterName);
+		return "";
+	}
+}
+
+void ASodaVehicle::RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
+{
+	ISodaActor::RuntimePostEditChangeProperty(PropertyChangedEvent);
+
+	if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, TEXT("ReactivateActor")))
+	{
+		UpdateProperties();
+		ReActivateVehicleComponents(true);
+	}
+}
+
+void ASodaVehicle::RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent)
+{
+	ISodaActor::RuntimePostEditChangeChainProperty(PropertyChangedEvent);
+
+	if (FRuntimeMetaData::HasMetaData(PropertyChangedEvent.Property, TEXT("ReactivateActor")))
+	{
+		UpdateProperties();
+		ReActivateVehicleComponents(true);
+	}
+}
+
+bool ASodaVehicle::OnSetPinnedActor(bool bIsPinnedActor)
+{
+	USodaGameModeComponent* GameMode = USodaGameModeComponent::GetChecked();
+	if (GameMode->LevelState && GameMode->LevelState->ActorFactory && GameMode->LevelState->ActorFactory->CheckActorIsExist(this))
+	{
+		if (bIsPinnedActor)
+		{
+			GameMode->OpenWindow(FString::Printf(TEXT("Pin \"%s\" Vehicle"), *GetName()), SNew(soda::SVehcileManagerWindow, this));
+		}
+		else
+		{
+			SaveAddress.Reset(); 
+		}
+	}
+	return true;
+}
+
+bool ASodaVehicle::IsPinnedActor() const
+{
+	return SaveAddress.Source == EVehicleSaveSource::JsonLocal || SaveAddress.Source == EVehicleSaveSource::DB;
+}
+
+FString ASodaVehicle::GetPinnedActorName() const
+{
+	return SaveAddress.ToVehicleName();
+}
+
+bool ASodaVehicle::SavePinnedActor()
+{
+	if (SaveAddress.Source == EVehicleSaveSource::JsonLocal || SaveAddress.Source == EVehicleSaveSource::DB)
+	{
+		return Resave();
+	}
+	return false;
+}
+
+AActor* ASodaVehicle::LoadPinnedActor(UWorld* World, const FTransform& Transform, const FString& SlotName, bool bForceCreate, FName DesireName) const
+{
+	FVechicleSaveAddress Addr;
+	if (Addr.SetFromUrl(SlotName))
+	{
+		return SpawnVehicleFormAddress(World, Addr, Transform.GetTranslation(), Transform.GetRotation().Rotator(), false, DesireName, false);
+	}
+	return nullptr;
+}
+
+FString ASodaVehicle::GetPinnedActorSlotName() const
+{
+	return SaveAddress.ToUrl();
+}
+
+void ASodaVehicle::ScenarioBegin()
+{
+	ISodaActor::ScenarioBegin();
+
+	FScopeLock ScopeLock(&PhysicMutex);
+
+	VehicleComponensForDataset.Empty();
+
+	/*
+	for (auto& Component : GetVehicleComponents())
+	{
+		if ((Component->GetVehicleComponentCommon().Activation == EVehicleComponentActivation::OnStartScenario) && !Component->IsVehicleComponentActiveted())
+		{
+			Component->ActivateVehicleComponent();
+		}
+	}*/
+
+	for (auto& Component : GetVehicleComponents())
+	{
+		if ((Component->GetVehicleComponentCommon().Activation == EVehicleComponentActivation::OnStartScenario) && !Component->IsVehicleComponentActiveted())
+		{
+			Component->SetDeferredTask(EVehicleComponentDeferredTask::Activate);
+		}
+	}
+	ReActivateVehicleComponents(false);
+
+
+	if (bRecordDataset && soda::FDBGateway::Instance().GetStatus() == soda::EDBGatewayStatus::Connected && soda::FDBGateway::Instance().IsDatasetRecording())
+	{
+		soda::FBsonDocument Doc;
+		GenerateDatasetDescription(Doc);
+
+		for (auto& Component : GetVehicleComponents())
+		{
+			if ((Component->GetVehicleComponentCommon().Activation == EVehicleComponentActivation::OnStartScenario) && !Component->IsVehicleComponentActiveted())
+			{
+				Component->GenerateDatasetDescription(Doc);
+			}
+		}
+
+		Dataset = soda::FDBGateway::Instance().CreateActorDataset(GetName(), "ego", GetClass()->GetName(), *Doc);
+		if (Dataset)
+		{
+			for (auto& Component : GetVehicleComponents())
+			{
+				if (Component->GetVehicleComponentCommon().bWriteDataset)
+				{
+					VehicleComponensForDataset.Add(Component);
+				}
+			}
+		}
+		else
+		{
+			SodaApp.GetGameModeChecked()->ScenarioStop(EScenarioStopReason::InnerError);
+			SodaApp.GetGameModeChecked()->ShowMessageBox(soda::EMessageBoxType::OK, "Scenarip stoped", "Can't create dataset for \"" + GetName() + "\"");
+		}
+	}
+
+	for (auto& Component : GetVehicleComponents())
+	{
+		Component->ScenarioBegin();
+	}
+}
+
+void ASodaVehicle::ScenarioEnd()
+{
+	ISodaActor::ScenarioEnd();
+
+	for (auto& Component : GetVehicleComponents())
+	{
+		if ((Component->GetVehicleComponentCommon().Activation == EVehicleComponentActivation::OnStartScenario) && Component->IsVehicleComponentActiveted())
+		{
+			Component->SetDeferredTask(EVehicleComponentDeferredTask::Deactivate);
+		}
+		Component->ScenarioEnd();
+	}
+	ReActivateVehicleComponents(false);
+
+	if (Dataset)
+	{
+		Dataset->PushAsync();
+		Dataset.Reset();
+	}
+	VehicleComponensForDataset.Empty();
+}
+
+void ASodaVehicle::OnPushDataset(soda::FActorDatasetData& InDataset) const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	const FVehicleSimData& SimData = GetSimData();
+
+	FVector Location = SimData.VehicleKinematic.Curr.GlobalPose.GetLocation();
+	FRotator Rotation = SimData.VehicleKinematic.Curr.GlobalPose.GetRotation().Rotator();
+	FVector Vel = SimData.VehicleKinematic.Curr.GetLocalVelocity();
+	FVector Acc = SimData.VehicleKinematic.Curr.GetLocalAcceleration();
+	FVector AngVel = SimData.VehicleKinematic.Curr.AngularVelocity;
+
+	try
+	{
+		InDataset.GetRowDoc()
+			<< "sim_ts" << std::int64_t(soda::RawTimestamp<std::chrono::microseconds>(SimData.SimulatedTimestamp))
+			<< "render_ts" << std::int64_t(soda::RawTimestamp<std::chrono::microseconds>(SimData.RenderTimestamp))
+			<< "step" << SimData.SimulatedStep
+			<< "loc" << open_array << Location.X << Location.Y << Location.Z << close_array
+			<< "rot" << open_array << Rotation.Pitch << Rotation.Yaw << Rotation.Roll << close_array
+			<< "vel" << open_array << Vel.X << Vel.Y << Vel.Z << close_array
+			<< "acc" << open_array << Acc.X << Acc.Y << Acc.Z << close_array
+			<< "ang_vel" << open_array << AngVel.X << AngVel.Y << AngVel.Z << close_array;
+	}
+	catch (const std::system_error& e)
+	{
+		UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::OnPushDataset(); %s"), UTF8_TO_TCHAR(e.what()));
+	}
+}
+
+void ASodaVehicle::GenerateDatasetDescription(soda::FBsonDocument& Doc) const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	const FExtent& Extent = GetVehicleExtent();
+	*Doc
+		<< "extents" << open_document
+		<< "forward" << Extent.Forward
+		<< "backward" << Extent.Backward
+		<< "left" << Extent.Left
+		<< "right" << Extent.Right
+		<< "up" << Extent.Up
+		<< "down" << Extent.Down
+		<< close_document;
+}
+
+TSharedPtr<SWidget> ASodaVehicle::GenerateToolBar()
+{
+	FUniformToolBarBuilder ToolbarBuilder(TSharedPtr<const FUICommandList>(), FMultiBoxCustomization::None);
+	ToolbarBuilder.SetStyle(&FSodaStyle::Get(), "PaletteToolBar");
+	ToolbarBuilder.BeginSection(NAME_None);
+
+	ToolbarBuilder.AddToolBarButton(
+		FUIAction(
+			FExecuteAction::CreateLambda([this] 
+			{
+				if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+				{
+					if (SaveAddress.Source != EVehicleSaveSource::NoSave &&
+						SaveAddress.Source == EVehicleSaveSource::BinLevel)
+					{
+						GameMode->OpenWindow("Save Vehicle As", SNew(soda::SSaveVehicleRequestWindow, this));
+					}
+					else
+					{
+						GameMode->OpenWindow("Save New Vehicle As", SNew(soda::SVehcileManagerWindow, this));
+					}
+				}
+			})),
+		NAME_None, 
+		FText::FromString("Save"),
+		FText::FromString("Save vehicle to JSON format"), 
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaVehicleBar.Save"),
+		EUserInterfaceActionType::Button
+	);
+
+	ToolbarBuilder.AddToolBarButton(
+		FUIAction(
+			FExecuteAction::CreateLambda([this] 
+			{
+				if (USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+				{
+					GameMode->OpenWindow("Export Vehicle As", SNew(soda::SExportVehicleWindow, this));
+				}
+			})),
+		NAME_None, 
+		FText::FromString("Export"),
+		FText::FromString("Export vehicle to custom formats"), 
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaVehicleBar.Export"),
+		EUserInterfaceActionType::Button
+	);
+
+	ToolbarBuilder.AddToolBarButton(
+		FUIAction(
+			FExecuteAction::CreateLambda([this] 
+			{
+				IDesktopPlatform* DesktopPlatform = FDesktopPlatformModule::Get();
+				if (!DesktopPlatform)
+				{
+					UE_LOG(LogSoda, Error, TEXT("ASodaVehicle::ImportFromJSONAs() Can't get the IDesktopPlatform ref"));
+					return;
+				}
+
+				const FString FileTypes = TEXT("Soda Vehicles (*.json)|*.json");
+
+				TArray<FString> OpenFilenames;
+				int32 FilterIndex = -1;
+				if (!DesktopPlatform->OpenFileDialog(nullptr, TEXT("Import Vehicle from JSON"), GetDefaultVehiclesFolder(), TEXT(""), FileTypes, EFileDialogFlags::None, OpenFilenames, FilterIndex) || OpenFilenames.Num() <= 0)
+				{
+					return;
+				}
+
+				RespawnVehcileFromAddress(FVechicleSaveAddress(EVehicleSaveSource::JsonExternal, OpenFilenames[0]), GetActorLocation() + FVector(0, 0, 50), FRotator(0.f, GetActorRotation().Yaw, 0.f), true);
+			})),
+		NAME_None, 
+		FText::FromString("Import"),
+		FText::FromString("Import Vehicle from JSON"), 
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaVehicleBar.Import"),
+		EUserInterfaceActionType::Button
+	);
+
+	ToolbarBuilder.AddToolBarButton(
+		FUIAction(
+			FExecuteAction::CreateLambda([this] 
+			{
+				if(USodaGameModeComponent* GameMode = USodaGameModeComponent::Get())
+				{
+					GameMode->PushToolBox(SNew(soda::SVehicleComponentsToolBox, this));
+				}
+			})),
+		NAME_None, 
+		FText::FromString("Components"),
+		FText::FromString("Open Vehicle Components"), 
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaVehicleBar.Components"),
+		EUserInterfaceActionType::Button
+	);
+
+	ToolbarBuilder.AddToolBarButton(
+		FUIAction(
+			FExecuteAction::CreateLambda([this] 
+			{
+				RespawnVehcile(FVector(0, 0, 20), FRotator::ZeroRotator, true, GetClass());
+			})),
+		NAME_None, 
+		FText::FromString("Reset"),
+		FText::FromString("Recreate vehicle"), 
+		FSlateIcon(FSodaStyle::Get().GetStyleSetName(), "SodaVehicleBar.Reset"),
+		EUserInterfaceActionType::Button
+	);
+
+	ToolbarBuilder.EndSection();
+
+	return
+		SNew(SBorder)
+		.BorderImage(FAppStyle::GetBrush("WhiteBrush"))
+		.BorderBackgroundColor(FStyleColors::Panel)
+		.Padding(3)
+		[
+			ToolbarBuilder.MakeWidget()
+		];
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Vehicles/SodaVehicleWheel.cpp b/Source/UnrealSoda/Private/Vehicles/SodaVehicleWheel.cpp
new file mode 100644
index 0000000..b8bec67
--- /dev/null
+++ b/Source/UnrealSoda/Private/Vehicles/SodaVehicleWheel.cpp
@@ -0,0 +1,86 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Vehicles/SodaVehicleWheel.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+
+#include "Engine/Canvas.h"
+
+USodaVehicleWheelComponent::USodaVehicleWheelComponent(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	GUI.Category = TEXT("Wheels");
+	GUI.IcanName = TEXT("SodaIcons.Tire");
+	GUI.ComponentNameOverride = TEXT("Wheel");
+	GUI.bIsPresentInAddMenu = true;
+	//Common.UniqueVehiceComponentClass = ;
+	Common.bIsTopologyComponent = true;
+	Common.Activation = EVehicleComponentActivation::OnStartScenario;
+}
+
+/*
+void USodaVehicleWheelComponent::OnRegistreVehicleComponent()
+{
+
+}
+*/
+
+void USodaVehicleWheelComponent::DrawDebug(UCanvas* Canvas, float& YL, float& YPos)
+{
+	Super::DrawDebug(Canvas, YL, YPos);
+
+	if (Common.bDrawDebugCanvas)
+	{
+		UFont* RenderFont = GEngine->GetSmallFont();
+		Canvas->SetDrawColor(FColor::White);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("ReqTorq:%.1fH/m, ReqBrake:%.1fH/m, ReqSteer:%.1fdeg"), ReqTorq, ReqBrakeTorque, ReqSteer / M_PI * 180.0), 16, YPos);
+		YPos += Canvas->DrawText(RenderFont, FString::Printf(TEXT("Ang Vel:%.1frad/s, Slip:[%.1f, %.1f], Sus Offset: %.1fcm"), AngularVelocity, Slip.X, Slip.Y, SuspensionOffset), 16, YPos);
+		
+	}
+}
+
+FVector USodaVehicleWheelComponent::GetWheelLocalVelocity() const
+{
+	FTransform Transform(
+		FRotator(0, Steer / M_PI * 180, 0),
+		GetWheelLocation(false, false),
+		FVector(1));
+	return GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GetLocalVelocityAtLocalPose(Transform);
+}
+
+FVector USodaVehicleWheelComponent::GetWheelLocation( bool bWithSuspensionOffset, bool bInWorldSpase) const
+{
+	FVector Location = RestingLocation;
+	if (bWithSuspensionOffset)
+	{
+		Location += FVector(0, 0, SuspensionOffset);
+	}
+
+	if (bInWorldSpase)
+	{
+		return GetWheeledVehicle()->GetSimData().VehicleKinematic.Curr.GlobalPose.InverseTransformPositionNoScale(Location);
+	}
+	else
+	{
+		return Location;
+	}
+}
+
+void USodaVehicleWheelComponent::PassTorque(float InTorque) 
+{ 
+	ReqTorq = InTorque; 
+	if (bVerboseLog)
+	{
+		UE_LOG(LogSoda, Log, TEXT("USodaVehicleWheelComponent::PassTorque(); InTorque: %f"), InTorque);
+	}
+}
+
+float USodaVehicleWheelComponent::ResolveAngularVelocity() const 
+{ 
+	if (bVerboseLog)
+	{
+		UE_LOG(LogSoda, Log, TEXT("USodaVehicleWheelComponent::ResolveAngularVelocity(); AngularVelocity: %f"), AngularVelocity);
+	}
+	return  AngularVelocity; 
+}
+
+
diff --git a/Source/UnrealSoda/Private/Vehicles/SodaWheeledVehicle.cpp b/Source/UnrealSoda/Private/Vehicles/SodaWheeledVehicle.cpp
new file mode 100644
index 0000000..8676957
--- /dev/null
+++ b/Source/UnrealSoda/Private/Vehicles/SodaWheeledVehicle.cpp
@@ -0,0 +1,481 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "GameFramework/SpringArmComponent.h"
+#include "Camera/CameraComponent.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Soda/UnrealSoda.h"
+#include "Serialization/BufferArchive.h"
+#include "Misc/FileHelper.h"
+#include "HAL/PlatformFileManager.h"
+#include "Serialization/MemoryReader.h"
+#include "Kismet/GameplayStatics.h"
+#include "GameFramework/PawnMovementComponent.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "DisplayDebugHelpers.h"
+#include "SodaJoystick.h"
+#include "Soda/SodaGameMode.h"
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleEngineComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleSteeringComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleDifferentialComponent.h"
+#include "Soda/VehicleComponents/Mechanicles/VehicleGearBoxComponent.h"
+#include "VehicleUtility.h"
+#include "Engine/Canvas.h"
+#include "Soda/DBGateway.h"
+#include "Soda/SodaApp.h"
+#include "Soda/SodaUserSettings.h"
+
+/******************************************************************************************
+ * ASodaWheeledVehicle
+ * ****************************************************************************************/
+
+ASodaWheeledVehicle::ASodaWheeledVehicle(const FObjectInitializer& ObjectInitializer)
+	: Super(ObjectInitializer)
+{
+	PrimaryActorTick.TickGroup = TG_PostPhysics;
+	PrimaryActorTick.bCanEverTick = true;
+
+	RootComponent = Mesh = CreateDefaultSubobject< USkeletalMeshComponent >(TEXT("VehicleMesh"));
+	Mesh->SetCollisionProfileName(UCollisionProfile::Vehicle_ProfileName);
+	Mesh->SetSimulatePhysics(false);
+	Mesh->SetNotifyRigidBodyCollision(true);
+	Mesh->SetUseCCD(true);
+	//Mesh->bBlendPhysics = true;
+	Mesh->SetGenerateOverlapEvents(true);
+	Mesh->SetCanEverAffectNavigation(false);
+
+
+	SpringArm = CreateDefaultSubobject< USpringArmComponent >(TEXT("SpringArm"));
+	SpringArm->SetupAttachment(Mesh);
+	SpringArm->TargetArmLength = 700;
+
+	FollowCamera = CreateDefaultSubobject< UCameraComponent >(TEXT("FollowCamera"));
+	FollowCamera->SetupAttachment(SpringArm, USpringArmComponent::SocketName);
+	FollowCamera->bUsePawnControlRotation = false;
+}
+
+void ASodaWheeledVehicle::SetDefaultMeshProfile()
+{
+	Mesh->SetSimulatePhysics(false);
+	Mesh->SetEnableGravity(true);
+	Mesh->SetNotifyRigidBodyCollision(true);
+	Mesh->SetUseCCD(true);
+	//Mesh->bBlendPhysics = true;
+	Mesh->SetGenerateOverlapEvents(true);
+	Mesh->SetCanEverAffectNavigation(false);
+	Mesh->SetCollisionResponseToChannels(DefCollisionResponseToChannel);
+	Mesh->SetCollisionObjectType(DefCollisionObjectType);
+}
+
+void ASodaWheeledVehicle::BeginPlay() 
+{
+	Super::BeginPlay();
+
+	DefCollisionResponseToChannel = Mesh->GetCollisionResponseToChannels();
+	DefCollisionObjectType = Mesh->GetCollisionObjectType();
+
+	class UCustomSpringArmComponent : public USpringArmComponent
+	{
+		public:
+			void ResetLag()
+			{
+				UpdateDesiredArmLocation(false, false, false, 0.0);
+			}
+	};
+
+	((UCustomSpringArmComponent*)SpringArm)->ResetLag();
+
+	SavedSpringArmLength = SpringArm->TargetArmLength;
+
+}
+
+bool ASodaWheeledVehicle::DrawDebug(class UCanvas* Canvas, float& YL, float& YPos)
+{
+	if (!Super::DrawDebug(Canvas, YL, YPos))
+	{
+		return false;
+	}
+
+	UFont* RenderFont = GEngine->GetSmallFont();
+	static FColor SubCaption(170, 170, 170);
+
+	TArray<UActorComponent*> VehicleComponents = GetComponentsByInterface(USodaVehicleComponent::StaticClass());
+	for (auto& It : VehicleComponents)
+	{
+		if (ISodaVehicleComponent* Component = Cast<ISodaVehicleComponent>(It))
+		{
+			Component->DrawDebug(Canvas, YL, YPos);
+		}
+	}
+
+	return true;
+}
+
+const FVehicleSimData& ASodaWheeledVehicle::GetSimData() const
+{
+	return GetWheeledComponentInterface() ? GetWheeledComponentInterface()->GetSimData() : FVehicleSimData::Zero; 
+}
+
+USodaVehicleWheelComponent* ASodaWheeledVehicle::GetWheel4WD(E4WDWheelIndex Ind) const
+{ 
+	if (Is4WDVehicle() && Ind != E4WDWheelIndex::None)
+	{
+		return Wheels4WD[int(Ind)];
+	}
+	else
+	{
+		return nullptr;
+	}
+}
+
+void ASodaWheeledVehicle::TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction)
+{
+	Super::TickActor(DeltaTime, TickType, ThisTickFunction);
+
+	APlayerController* PlayerController = Cast< APlayerController >(GetController());
+
+	if (ActiveVehicleInput && ActiveVehicleInput->HealthIsWorkable() && GetWheeledComponentInterface())
+	{
+		ActiveVehicleInput->UpdateInputStates(DeltaTime, Chaos::CmSToKmH(GetWheeledComponentInterface()->GetSimData().VehicleKinematic.GetForwardSpeed()), PlayerController);
+		/*
+		UE_LOG(LogSoda, Log, TEXT("%sms; Steering: %.1f; Throttle: %.1f, Brake: %.1f"), 
+			*soda::ToString<std::chrono::milliseconds>(std::chrono::system_clock::now()),
+			ActiveVehicleInput->GetSteeringInput() * 100,
+			ActiveVehicleInput->GetThrottleInput() * 100,
+			ActiveVehicleInput->GetBrakeInput() * 100
+		);
+		*/
+	}
+
+	if (PlayerController)
+	{
+		USodaUserSettings* Settings = SodaApp.GetSodaUserSettings();
+
+		bool bIsLeftCtrlDown = PlayerController->IsInputKeyDown(EKeys::LeftControl);
+
+		if (bIsLeftCtrlDown && PlayerController->WasInputKeyJustPressed(Settings->ZoomUpKeyInput))
+		{
+			++Zoom;
+		}
+
+		if (bIsLeftCtrlDown && PlayerController->WasInputKeyJustPressed(Settings->ZoomDownKeyInput))
+		{
+			if (Zoom > 1) --Zoom;
+		}
+
+		const float MouseSpeed = 50;
+		const float KeySpeed = 50;
+
+		float X, Y;
+		PlayerController->GetInputMouseDelta(X, Y);
+		float Yaw = SpringArm->GetRelativeRotation().Yaw + X * DeltaTime * MouseSpeed;
+		float Pitch = FMath::Clamp(SpringArm->GetRelativeRotation().Pitch + Y * DeltaTime * MouseSpeed, -60.f, 10.f);
+
+		if (PlayerController->IsInputKeyDown(EKeys::Up))
+		{
+			Pitch += DeltaTime * KeySpeed;
+		}
+
+		if (PlayerController->IsInputKeyDown(EKeys::Down))
+		{
+			Pitch -= DeltaTime * KeySpeed;
+		}
+
+		if (PlayerController->IsInputKeyDown(EKeys::Left))
+		{
+			Yaw -= DeltaTime * KeySpeed;
+		}
+
+		if (PlayerController->IsInputKeyDown(EKeys::Right))
+		{
+			Yaw += DeltaTime * KeySpeed;
+		}
+
+		SpringArm->SetRelativeRotation(FRotator(Pitch, Yaw, 0));
+		SpringArm->TargetArmLength = SavedSpringArmLength + Zoom * Zoom * 100;
+	}
+}
+
+UPawnMovementComponent* ASodaWheeledVehicle::GetMovementComponent() const
+{
+	return Cast<UPawnMovementComponent>(WheeledComponentInterface);
+}
+
+float ASodaWheeledVehicle::GetForwardSpeed() const
+{
+	if (HasActorBegunPlay() && GetWheeledComponentInterface())
+	{
+		return GetWheeledComponentInterface()->GetSimData().VehicleKinematic.GetForwardSpeed();
+	}
+	else
+	{
+		return 0;
+	}
+}
+
+void ASodaWheeledVehicle::ReRegistreVehicleComponents()
+{
+	Super::ReRegistreVehicleComponents();
+
+	GetComponents<USodaVehicleWheelComponent>(Wheels);
+	GetComponents<UVehicleInputComponent>(VehicleInputs);
+	GetComponents<UVehicleEngineBaseComponent>(VehicleEngines);
+	GetComponents<UVehicleDriverComponent>(VehicleDrivers);
+	GetComponents<UVehicleGearBoxBaseComponent>(GearBoxes);
+	GetComponents<UVehicleSteeringRackBaseComponent>(VehicleSteeringRacks);
+	GetComponents<UVehicleHandBrakeBaseComponent>(VehicleHandBrakes);
+	GetComponents<UVehicleDifferentialBaseComponent>(VehicleDifferentials);
+
+	Wheels4WD.Empty();
+	if (Wheels.Num() == 4)
+	{
+		auto Add4WDWheel = [this](E4WDWheelIndex Index)
+		{
+			if (USodaVehicleWheelComponent** Wheel = Wheels.FindByPredicate([this, Index](const USodaVehicleWheelComponent* Wheel) { return Wheel->WheelIndex4WD == Index; }))
+			{
+				Wheels4WD.Add(*Wheel);
+			}
+		};
+
+		Add4WDWheel(E4WDWheelIndex::FL);
+		Add4WDWheel(E4WDWheelIndex::FR);
+		Add4WDWheel(E4WDWheelIndex::RL);
+		Add4WDWheel(E4WDWheelIndex::RR);
+		if (Wheels4WD.Num() != 4)
+		{
+			Wheels4WD.Empty();
+		}
+	}
+
+	if (Mesh)
+	{
+		for (auto& It : Wheels)
+		{
+			int Ind = Mesh->GetBoneIndex(It->BoneName);
+			if (Ind != INDEX_NONE)
+			{
+				It->RestingLocation = Mesh->GetBoneLocation(It->BoneName, EBoneSpaces::ComponentSpace);
+				It->RestingRotation = Mesh->GetBoneQuaternion(It->BoneName, EBoneSpaces::ComponentSpace).Rotator();
+			}
+			else
+			{
+				UE_LOG(LogSoda, Error, TEXT("ASodaWheeledVehicle::ReRegistreVehicleComponents(); Can't find vehicle bone name: %s"), *It->BoneName.ToString());
+			}
+		}
+	}
+
+	SetDefaultMeshProfile();
+
+	WheeledComponentInterface = nullptr;
+}
+
+void ASodaWheeledVehicle::SetActiveVehicleInput(UVehicleInputComponent* InVehicleInput)
+{
+	if (InVehicleInput)
+	{
+		InVehicleInput->ActivateVehicleComponent();
+	}
+}
+
+UVehicleInputComponent* ASodaWheeledVehicle::SetActiveVehicleInputByName(FName VehicleInputName)
+{
+	for (auto& Input : VehicleInputs)
+	{
+		if (Input->GetFName() == VehicleInputName)
+		{
+			SetActiveVehicleInput(Input);
+			return Input;
+		}
+	}
+
+	return nullptr;
+}
+
+UVehicleInputComponent* ASodaWheeledVehicle::SetActiveVehicleInputByType(EVehicleInputType Type)
+{
+	for (auto& Input : VehicleInputs)
+	{
+		if (Input->InputType == Type)
+		{
+			SetActiveVehicleInput(Input);
+			return Input;
+		}
+	}
+
+	return nullptr;
+}
+
+float ASodaWheeledVehicle::GetEnginesLoad() const
+{
+	float Load = 0;
+	for (size_t i = 0; i < VehicleEngines.Num(); ++i)
+	{
+		Load += VehicleEngines[i]->GetEngineLoad();
+	}
+	return Load / VehicleEngines.Num();
+}
+
+float ASodaWheeledVehicle::GetReqSteer() const
+{
+	if (Is4WDVehicle())
+	{
+		return (GetWheel4WD(E4WDWheelIndex::FL)->ReqSteer + GetWheel4WD(E4WDWheelIndex::FR)->ReqSteer) / 2.0;
+	}
+	else
+	{
+		return 0; // TODO
+	}
+}
+
+float ASodaWheeledVehicle::GetSteer() const
+{
+	if (Is4WDVehicle())
+	{
+		return (GetWheel4WD(E4WDWheelIndex::FL)->Steer + GetWheel4WD(E4WDWheelIndex::FR)->Steer) / 2.0;
+	}
+	else
+	{
+		return 0; // TODO
+	}
+}
+
+FWheeledVehicleState ASodaWheeledVehicle::GetVehicleState() const
+{
+	FWheeledVehicleState Ret;
+
+	if (GetWheeledComponentInterface())
+	{
+		const FPhysBodyKinematic& VehicleKinematic = GetSimData().VehicleKinematic;
+
+		Ret.Position = VehicleKinematic.Curr.GlobalPose.GetTranslation();
+		Ret.Rotation = VehicleKinematic.Curr.GlobalPose.Rotator();
+		Ret.Velocity = VehicleKinematic.Curr.GetLocalVelocity();
+		Ret.AngularVelocity = VehicleKinematic.Curr.AngularVelocity;
+		Ret.Acc = VehicleKinematic.GetLocalAcc();
+
+		if (Is4WDVehicle())
+		{
+			auto WheelDataConv = [](const USodaVehicleWheelComponent& In, FWheeledVehicleWheelState& Out)
+			{
+				Out.AngularVelocity = In.AngularVelocity;
+				Out.Torq = In.ReqTorq;
+				Out.BrakeTorq = In.ReqBrakeTorque;
+				Out.Steer = In.Steer;
+			};
+
+			WheelDataConv(*GetWheel4WD(E4WDWheelIndex::FL), Ret.WheelsFL);
+			WheelDataConv(*GetWheel4WD(E4WDWheelIndex::FR), Ret.WheelsFR);
+			WheelDataConv(*GetWheel4WD(E4WDWheelIndex::RL), Ret.WheelsRL);
+			WheelDataConv(*GetWheel4WD(E4WDWheelIndex::RR), Ret.WheelsRR);
+		}
+	}
+
+	return Ret;
+}
+
+void ASodaWheeledVehicle::ScenarioBegin()
+{
+	Super::ScenarioBegin();
+}
+
+void ASodaWheeledVehicle::ScenarioEnd() 
+{
+	Super::ScenarioEnd();
+}
+
+const FSodaActorDescriptor* ASodaWheeledVehicle::GenerateActorDescriptor() const
+{
+	return nullptr;
+}
+
+void ASodaWheeledVehicle::OnPushDataset(soda::FActorDatasetData& InDataset) const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	Super::OnPushDataset(InDataset);
+
+	InDataset.GetRowDoc()
+		<< "load" << GetEnginesLoad();
+
+	if (UVehicleInputComponent* Input = GetActiveVehicleInput())
+	{
+		InDataset.GetRowDoc() << "inputs" << open_document
+			<< "break" << Input->GetBrakeInput()
+			<< "steer" << Input->GetSteeringInput()
+			<< "throttle" << Input->GetThrottleInput()
+			<< "gear" << int(Input->GetGearInput())
+		<< close_document;
+	}
+
+	if (GetWheeledComponentInterface())
+	{
+		bsoncxx::builder::stream::array WheelsArray;
+		for (int i = 0; i < Wheels.Num(); ++i)
+		{
+			const auto& Wheel = Wheels[i];
+			WheelsArray << open_document
+				<< "4wd_ind" << int(Wheel->WheelIndex4WD)
+				<< "ang_vel" << Wheel->ResolveAngularVelocity()
+				<< "req_torq" << Wheel->ReqTorq
+				<< "req_brake_torq" << Wheel->ReqBrakeTorque
+				<< "steer" << Wheel->Steer
+				<< "sus" << Wheel->SuspensionOffset
+				<< "long_slip" << Wheel->Slip.X
+				<< "lat_slip" << Wheel->Slip.Y
+			<< close_document;
+		}
+
+		InDataset.GetRowDoc() << "wheels" << WheelsArray;
+	}
+}
+
+void ASodaWheeledVehicle::GenerateDatasetDescription(soda::FBsonDocument& Doc) const
+{
+	using bsoncxx::builder::stream::document;
+	using bsoncxx::builder::stream::finalize;
+	using bsoncxx::builder::stream::open_document;
+	using bsoncxx::builder::stream::close_document;
+	using bsoncxx::builder::stream::open_array;
+	using bsoncxx::builder::stream::close_array;
+
+	if (GetWheeledComponentInterface())
+	{
+		(*Doc)
+			<< "track_width" << GetWheeledComponentInterface()->GetTrackWidth()
+			<< "wheel_base_width" << GetWheeledComponentInterface()->GetWheelBaseWidth()
+			<< "mass" << GetWheeledComponentInterface()->GetVehicleMass();
+
+		bsoncxx::builder::stream::array WheelsArray;
+		for (int i = 0; i < Wheels.Num(); ++i)
+		{
+			const auto& Wheel = Wheels[i];
+			WheelsArray << open_document
+				<< "4wd_ind" << int(Wheel->WheelIndex4WD)
+				<< "radius" << Wheel->Radius
+				<< "location" << open_array << Wheel->RestingLocation.X << Wheel->RestingLocation.Y << Wheel->RestingLocation.Z << close_array
+			<< close_document;
+		}
+		(*Doc) << "wheels" << WheelsArray;
+	}
+}
+
+FVector ASodaWheeledVehicle::GetVelocity() const
+{
+	if (WheeledComponentInterface)
+	{
+		return WheeledComponentInterface->GetSimData().VehicleKinematic.Curr.GlobalVelocityOfCenterMass;
+	}
+	else
+	{
+		return Super::GetVelocity();
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Private/Vehicles/VehicleBaseTypes.cpp b/Source/UnrealSoda/Private/Vehicles/VehicleBaseTypes.cpp
new file mode 100644
index 0000000..8d4d524
--- /dev/null
+++ b/Source/UnrealSoda/Private/Vehicles/VehicleBaseTypes.cpp
@@ -0,0 +1,3 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "Soda/Vehicles/VehicleBaseTypes.h"
diff --git a/Source/UnrealSoda/Public/Soda/Actors/GhostPedestrian.h b/Source/UnrealSoda/Public/Soda/Actors/GhostPedestrian.h
new file mode 100644
index 0000000..dac6ecf
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/GhostPedestrian.h
@@ -0,0 +1,158 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Soda/Misc/TrajectoryPlaner.h"
+#include "Soda/ISodaActor.h"
+#include <vector>
+#include "GhostPedestrian.generated.h"
+
+
+class ANavigationRouteEditable;
+
+namespace soda
+{
+	class FActorDatasetData;
+	struct FBsonDocument;
+}
+
+/**
+ * AGhostPedestrian 
+ * This is an agent for scenarios "pedestrian". In the current implementation, 
+ * it is able to simply walk along the ANavigationRoute
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API AGhostPedestrian :
+	public AActor,
+	public ISodaActor
+{
+GENERATED_BODY()
+
+public:
+	UPROPERTY(Category = GhostPedestrian, EditAnywhere, BlueprintReadOnly)
+	class USkeletalMeshComponent* Mesh;
+
+	UPROPERTY(Category = GhostPedestrian, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	FVector RouteFollowOffset;
+
+	UPROPERTY(EditAnywhere, Category = TrajectoryPlaner, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	FTrajectoryPlaner TrajectoryPlaner;
+
+	UPROPERTY(EditAnywhere, Category = InitialRoute, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	TSoftObjectPtr<ANavigationRouteEditable> InitialRoute;
+
+	UPROPERTY(EditAnywhere, Category = InitialRoute, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float InitialRouteOffset = 0;
+
+	UPROPERTY(EditAnywhere, Category = InitialRoute, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bJoinToInitialRoute = true;
+
+	UPROPERTY(EditAnywhere, Category = Debug, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebugRoute = false;
+
+	UPROPERTY(EditAnywhere, Category = GhostPedestrian, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	FRotator RotationOffset;
+
+	/** [cm/s] */
+	UPROPERTY(EditAnywhere, Category = GhostPedestrian, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float Velocity = 60;
+
+	/** [cm/s] */
+	UPROPERTY(EditAnywhere, Category = GhostPedestrian, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float Acceleration = 100;
+
+	UPROPERTY(EditAnywhere, Category = Collision, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bCheckCollision = true;
+
+	/** [cm] */
+	UPROPERTY(EditAnywhere, Category = Collision, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float TraceLookAhead = 200;
+
+	UPROPERTY(EditAnywhere, Category = Collision, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float TraceUpOffes = 150;
+
+	UPROPERTY(EditAnywhere, Category = Collision, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float TraceCapsuleRadius = 40;
+		
+	UPROPERTY(EditAnywhere, Category = Collision, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float TraceCapsuleHalfHeigh = 20;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Dataset, SaveGame, meta = (EditInRuntime))
+	bool bRecordDataset = true;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian, meta = (ScenarioAction))
+	void GoToLeftRoute(float StaticOffset = 500, float VelocityToOffset = 0);
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian, meta = (ScenarioAction))
+	void GoToRightRoute(float StaticOffset = 500, float VelocityToOffset = 0);
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian, meta = (ScenarioAction))
+	void GoToRoute(TSoftObjectPtr<ANavigationRoute> Route, float StaticOffset = 500, float VelocityToOffset = 0);
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian, meta = (CallInRuntime, ScenarioAction))
+	void StartMoving();
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian, meta = (CallInRuntime, ScenarioAction))
+	void StopMoving();
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian)
+	bool IsLinkedToRoute() const;
+
+	UFUNCTION(BlueprintImplementableEvent, meta=(DisplayName = "Start Moving"))
+	void ReceiveStartMoving();
+
+	UFUNCTION(BlueprintImplementableEvent, meta=(DisplayName = "Stop Moving"))
+	void ReceiveStopMoving();
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian)
+	bool IsMoving() const { return bIsMoving;}
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian)
+	float GetCurrentVelocity() const { return CurrentVelocity;}
+
+	UFUNCTION(BlueprintCallable, Category = GhostPedestrian)
+	float GetCurrentSplineOffset() const { return CurrentSplineOffset;}
+
+public:
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor * GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	virtual void ScenarioBegin() override;
+	virtual void ScenarioEnd() override;
+	virtual void InputWidgetDelta(const USceneComponent* WidgetTargetComponent, FTransform& NewWidgetTransform) override;
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+
+public:
+	AGhostPedestrian();
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+	virtual FVector GetVelocity() const override;
+
+protected:
+	void UpdateJoinCurve();
+	FTransform AdjustTransform(const FTransform& Transform);
+	bool CheckCollision(const FTransform& Transform);
+
+	virtual void GenerateDatasetDescription(soda::FBsonDocument& Doc) const;
+	virtual void OnPushDataset() const;
+
+	FTransform InitTransform;
+	bool bIsMoving = false;
+	float CurrentVelocity = 0;
+	float CurrentSplineOffset = 0;
+
+	FGuid SplineGuid;
+
+	TArray<FVector> JoiningCurvePoints;
+
+	TSharedPtr<soda::FActorDatasetData> Dataset;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/AnimNode_GhostWheelController.h b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/AnimNode_GhostWheelController.h
new file mode 100644
index 0000000..d2a850c
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/AnimNode_GhostWheelController.h
@@ -0,0 +1,46 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "BoneContainer.h"
+#include "BonePose.h"
+#include "Soda/Actors/GhostVehicle/GhostVehicleAnimationInstance.h"
+#include "BoneControllers/AnimNode_SkeletalControlBase.h"
+#include "AnimNode_WheelController.generated.h"
+
+/**
+ *	Simple controller that replaces or adds to the translation/rotation of a single bone.
+ */
+USTRUCT()
+struct UNREALSODA_API FAnimNode_GhostWheelController : public FAnimNode_SkeletalControlBase
+{
+	GENERATED_USTRUCT_BODY()
+
+	FAnimNode_GhostWheelController();
+
+	// FAnimNode_Base interface
+	virtual void GatherDebugData(FNodeDebugData& DebugData) override;
+	// End of FAnimNode_Base interface
+
+	// FAnimNode_SkeletalControlBase interface
+	virtual void EvaluateSkeletalControl_AnyThread(FComponentSpacePoseContext& Output, TArray<FBoneTransform>& OutBoneTransforms) override;
+	virtual bool IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones) override;
+	virtual void Initialize_AnyThread(const FAnimationInitializeContext& Context) override;
+	// End of FAnimNode_SkeletalControlBase interface
+
+private:
+	// FAnimNode_SkeletalControlBase interface
+	virtual void InitializeBoneReferences(const FBoneContainer& RequiredBones) override;
+	// End of FAnimNode_SkeletalControlBase interface
+
+	struct FWheelLookupData
+	{
+		int32 WheelIndex;
+		FBoneReference BoneReference;
+	};
+
+	TArray<FWheelLookupData> Wheels;
+	const FGhostVehicleAnimationInstanceProxy* AnimInstanceProxy;	//TODO: we only cache this to use in eval where it's safe. Should change API to pass proxy into eval
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.h b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.h
new file mode 100644
index 0000000..f5a0ed1
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/AnimNode_StageCoachGhostWheelController.h
@@ -0,0 +1,63 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "BoneContainer.h"
+#include "BonePose.h"
+#include "Soda/Actors/GhostVehicle/GhostVehicleAnimationInstance.h"
+#include "BoneControllers/AnimNode_SkeletalControlBase.h"
+#include "AnimNode_StageCoachWheelController.generated.h"
+
+/**
+ *	Simple controller that replaces or adds to the translation/rotation of a single bone.
+ */
+USTRUCT()
+struct UNREALSODA_API FAnimNode_StageCoachGhostWheelController : public FAnimNode_SkeletalControlBase
+{
+	GENERATED_USTRUCT_BODY()
+
+	// Number of spokes visible on wheel
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	int WheelSpokeCount;
+
+	// Wheel max rotation speed in degrees/second
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	float MaxAngularVelocity;
+
+	// Camera shutter speed in frames/second
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	float ShutterSpeed;
+
+	// Blend effect degrees/second
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Alpha, meta = (PinShownByDefault))
+	float StageCoachBlend;
+
+
+	FAnimNode_StageCoachGhostWheelController();
+
+	// FAnimNode_Base interface
+	virtual void GatherDebugData(FNodeDebugData& DebugData) override;
+	// End of FAnimNode_Base interface
+
+	// FAnimNode_SkeletalControlBase interface
+	virtual void EvaluateSkeletalControl_AnyThread(FComponentSpacePoseContext& Output, TArray<FBoneTransform>& OutBoneTransforms) override;
+	virtual bool IsValidToEvaluate(const USkeleton* Skeleton, const FBoneContainer& RequiredBones) override;
+	virtual void Initialize_AnyThread(const FAnimationInitializeContext& Context) override;
+	// End of FAnimNode_SkeletalControlBase interface
+
+private:
+	// FAnimNode_SkeletalControlBase interface
+	virtual void InitializeBoneReferences(const FBoneContainer& RequiredBones) override;
+	// End of FAnimNode_SkeletalControlBase interface
+
+	struct FWheelLookupData
+	{
+		int32 WheelIndex;
+		FBoneReference BoneReference;
+	};
+
+	TArray<FWheelLookupData> Wheels;
+	FGhostVehicleAnimationInstanceProxy* AnimInstanceProxy;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/GhostVehicle.h b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/GhostVehicle.h
new file mode 100644
index 0000000..11c472c
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/GhostVehicle.h
@@ -0,0 +1,224 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Soda/Misc/TrajectoryPlaner.h"
+#include "Soda/ISodaActor.h"
+#include <vector>
+#include "GhostVehicle.generated.h"
+
+
+namespace SpeedProfile
+{
+	class FSpeedProfile;
+	struct FVelocityProfile;
+}
+
+class ANavigationRouteEditable;
+
+namespace soda
+{
+	class FActorDatasetData;
+	struct FBsonDocument;
+}
+
+USTRUCT(BlueprintType)
+struct FGhostVehicleWheel
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = WheelSetup)
+	FName BoneName = NAME_None;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = WheelSetup)
+	bool bApplySteer = false;
+	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = WheelSetup)
+	float Radius = 30;
+
+	FVector Location;
+	float RotationAngularVelocit = 0;
+	float RotationAngle = 0;
+	float SteerAngle = 0;
+	float SuspensionOffset = 0;
+	FHitResult Hit;
+
+	float GetRotationAngularVelocity() const { return RotationAngularVelocit; }
+	float GetRotationAngle() const { return RotationAngle; }
+	float GetSteerAngle()  const { return SteerAngle; }
+	float GetSuspensionOffset() const { return SuspensionOffset; }
+};
+
+/**
+ * AGhostVehicle
+ * This is an agent for scenarios "wheeled vehicle". In the current implementation,
+ * it is able to simply walk along the ANavigationRoute
+ * TODO: Support Suspension Offset
+ * TODO: Add dumping for pitch, roll, Z
+ * TODO: Fix bug of determinate init spline offset when moving vehice by the widget
+ */
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API AGhostVehicle : 
+	public AActor,
+	public ISodaActor
+{
+GENERATED_BODY()
+
+public:
+	UPROPERTY(VisibleAnywhere, Category = GhostVehicle,  BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
+	class USkeletalMeshComponent* Mesh;
+
+	UPROPERTY(EditAnywhere, Category = GhostVehicle, BlueprintReadOnly)
+	TArray<FGhostVehicleWheel> Wheels;
+
+	// [deg/s]
+	UPROPERTY(EditAnywhere, Category = GhostVehicle, BlueprintReadOnly)
+	float SteeringAnimMaxSpeed = 30;
+
+	// [cm]
+	UPROPERTY(EditAnywhere, Category = GhostVehicle, BlueprintReadOnly)
+	float RayCastDepth = 500;
+
+	UPROPERTY(EditAnywhere, Category = GhostVehicle, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	TSet<FString> AllowedRouteTags;
+
+	/** [km/h] */
+	UPROPERTY(EditAnywhere, Category = GhostVehicle, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float InitVelocity = 0;
+
+	/** [km/h] */
+	UPROPERTY(EditAnywhere, Category = VehicleDynamics, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float VehicleMaxVelocity = 55.0;
+
+	/** [kg] */
+	UPROPERTY(EditAnywhere, Category = VehicleDynamics, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float VehicleMass = 1196;
+
+	/** [W] */
+	UPROPERTY(EditAnywhere, Category = VehicleDynamics, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float VehicleMaxPower = 270000.0;
+
+	/** [Nm/s] */
+	UPROPERTY(EditAnywhere, Category = VehicleDynamics, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float VehicleMaxTorque = 2500.0;
+
+	/** [km/h] */
+	UPROPERTY(EditAnywhere, Category = VehicleLimits, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float LimitMaxVelocity = 42;
+
+	UPROPERTY(EditAnywhere, Category = VehicleLimits, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float LimitMu = 0.85;
+
+	/** [m/s] */
+	UPROPERTY(EditAnywhere, Category = VehicleLimits, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float LimitMaxAcceleration = 5;
+
+	/** [m/s] */
+	UPROPERTY(EditAnywhere, Category = VehicleLimits, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float LimitMaxDeceleration = 5;
+
+	UPROPERTY(EditAnywhere, Category = VehicleLimits, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bIsAggressive = false;
+
+	UPROPERTY(EditAnywhere, Category = TrajectoryPlaner, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	FTrajectoryPlaner TrajectoryPlaner;
+
+	UPROPERTY(EditAnywhere, Category = InitialRoute, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	TSoftObjectPtr<ANavigationRouteEditable> InitialRoute;
+
+	UPROPERTY(EditAnywhere, Category = InitialRoute, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float InitialRouteOffset = 0;
+
+	UPROPERTY(EditAnywhere, Category = InitialRoute, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bJoinToInitialRoute = true;
+
+	UPROPERTY(EditAnywhere, Category = Debug, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebugRoute = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Dataset, SaveGame, meta = (EditInRuntime))
+	bool bRecordDataset = true;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle, meta = (ScenarioAction))
+	void GoToLeftRoute(float StaticOffset = 500, float VelocityToOffset = 0);
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle, meta = (ScenarioAction))
+	void GoToRightRoute(float StaticOffset = 500, float VelocityToOffset = 0);
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle, meta = (ScenarioAction))
+	void GoToRoute(TSoftObjectPtr<ANavigationRoute> Route, float StaticOffset = 500, float VelocityToOffset = 0);
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle, meta = (CallInRuntime, ScenarioAction))
+	void StartMoving();
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle, meta = (CallInRuntime, ScenarioAction))
+	void StopMoving();
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle)
+	bool IsLinkedToRoute() const;
+
+	UFUNCTION(BlueprintImplementableEvent, meta=(DisplayName = "Start Moving"))
+	void ReceiveStartMoving();
+
+	UFUNCTION(BlueprintImplementableEvent, meta=(DisplayName = "Stop Moving"))
+	void ReceiveStopMoving();
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle)
+	bool IsMoving() const { return bIsMoving;}
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle)
+	float GetCurrentVelocity() const { return CurrentVelocity;}
+
+	UFUNCTION(BlueprintCallable, Category = GhostVehicle)
+	float GetCurrentSplineOffset() const { return CurrentSplineOffset;}
+	
+public:
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor * GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	virtual void ScenarioBegin() override;
+	virtual void ScenarioEnd() override;
+	virtual void InputWidgetDelta(const USceneComponent* WidgetTargetComponent, FTransform& NewWidgetTransform) override;
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+
+public:
+	AGhostVehicle();
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+	virtual FVector GetVelocity() const override;
+
+protected:
+	void CalculateSpeedProfile();
+	void UpdateJoinCurve();
+
+	virtual void GenerateDatasetDescription(soda::FBsonDocument& Doc) const;
+	virtual void OnPushDataset() const;
+
+	FTransform InitTransform;
+	bool bIsMoving = false;
+	double CurrentVelocity = 0;
+	double CurrentAcc = 0;
+	double CurrentSplineOffset = 0;
+	double BaseLength = 0;
+	float VehicleRWheel = 35; 
+	FVector RealAxesOffset;
+
+	FGuid SplineGuid;
+
+	TSharedPtr<SpeedProfile::FSpeedProfile> SpeedProfile;
+	std::vector<double> Velocities;
+	std::vector<double> Accelerations;
+
+	TArray<FVector> JoiningCurvePoints;
+
+	TSharedPtr<soda::FActorDatasetData> Dataset;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/GhostVehicleAnimationInstance.h b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/GhostVehicleAnimationInstance.h
new file mode 100644
index 0000000..5ea433d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/GhostVehicle/GhostVehicleAnimationInstance.h
@@ -0,0 +1,107 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "Animation/AnimInstance.h"
+#include "Animation/AnimInstanceProxy.h"
+#include "GhostVehicleAnimationInstance.generated.h"
+
+class AGhostVehicle;
+
+struct FGhostWheelAnimationData
+{
+	FName BoneName;
+	FRotator RotOffset;
+	FVector LocOffset;
+};
+
+/** Proxy override for this UAnimInstance-derived class */
+USTRUCT()
+struct UNREALSODA_API FGhostVehicleAnimationInstanceProxy : public FAnimInstanceProxy
+{
+	GENERATED_BODY()
+
+	FGhostVehicleAnimationInstanceProxy()
+		: FAnimInstanceProxy()
+		, WheelSpokeCount(0)
+		, MaxAngularVelocity(256.f)
+		, ShutterSpeed(30.f)
+		, StageCoachBlend(730.f)
+	{
+	}
+
+	FGhostVehicleAnimationInstanceProxy(UAnimInstance* Instance)
+		: FAnimInstanceProxy(Instance)
+		, WheelSpokeCount(0)
+		, MaxAngularVelocity(256.f)
+		, ShutterSpeed(30.f)
+		, StageCoachBlend(730.f)
+	{
+	}
+
+public:
+
+	void SetVehicle(const AGhostVehicle * GhostVehicle);
+
+	/** FAnimInstanceProxy interface begin*/
+	virtual void PreUpdate(UAnimInstance* InAnimInstance, float DeltaSeconds) override;
+	/** FAnimInstanceProxy interface end*/
+
+	const TArray<FGhostWheelAnimationData>& GetWheelAnimData() const
+	{
+		return WheelInstances;
+	}
+
+	void SetStageCoachEffectParams(int InWheelSpokeCount, float InMaxAngularVelocity, float InShutterSpeed, float InStageCoachBlend)
+	{
+		WheelSpokeCount = InWheelSpokeCount;
+		MaxAngularVelocity = InMaxAngularVelocity;
+		ShutterSpeed = InShutterSpeed;
+		StageCoachBlend = InStageCoachBlend;
+	}
+
+private:
+	TArray<FGhostWheelAnimationData> WheelInstances;
+
+	int WheelSpokeCount;			// Number of spokes visible on wheel
+	float MaxAngularVelocity;		// Wheel max rotation speed in degrees/second
+	float ShutterSpeed;				// Camera shutter speed in frames/second
+	float StageCoachBlend;			// Blend effect degrees/second
+
+};
+
+UCLASS(transient)
+class UNREALSODA_API UGhostVehicleAnimationInstance : public UAnimInstance
+{
+	GENERATED_UCLASS_BODY()
+
+	UFUNCTION(BlueprintCallable, Category = "Animation")
+	const AGhostVehicle* GetVehicle() const;
+
+public:
+	TArray<TArray<FGhostWheelAnimationData>> WheelData;
+
+public:
+	void SetVehicle(const AGhostVehicle* InGhostVehicle)
+	{
+		GhostVehicle = InGhostVehicle;
+		AnimInstanceProxy.SetVehicle(InGhostVehicle);
+	}
+
+
+private:
+	/** UAnimInstance interface begin*/
+	virtual void NativeInitializeAnimation() override;
+	virtual FAnimInstanceProxy* CreateAnimInstanceProxy() override;
+	virtual void DestroyAnimInstanceProxy(FAnimInstanceProxy* InProxy) override;
+	/** UAnimInstance interface end*/
+
+	FGhostVehicleAnimationInstanceProxy AnimInstanceProxy;
+
+	UPROPERTY(transient)
+	TObjectPtr<const AGhostVehicle> GhostVehicle;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Actors/NavigationRoute.h b/Source/UnrealSoda/Public/Soda/Actors/NavigationRoute.h
new file mode 100644
index 0000000..67dc39a
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/NavigationRoute.h
@@ -0,0 +1,239 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BoxComponent.h"
+#include "Components/SplineComponent.h"
+#include "Components/StaticMeshComponent.h"
+#include "Soda/ISodaActor.h"
+#include "NavigationRoute.generated.h"
+
+class USodaRandomEngine;
+class UProceduralMeshComponent;
+
+UCLASS(meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API URouteSplineComponent : public USplineComponent
+{
+	GENERATED_BODY()
+
+public:
+	virtual void UpdateSpline() override
+	{
+		Super::UpdateSpline();
+		SplineUpdateGuid = FGuid::NewGuid();
+	}
+	const FGuid& GetSplineGuid() const { return SplineUpdateGuid; }
+
+protected:
+	FGuid SplineUpdateGuid;
+};
+
+/**
+ * ANavigationRoute
+ * This is a spline along which some other actors can move. First of all, these are AGhostVehicle, AGhostPedestrian, ASodaVehicle.
+ * TODO: Finish Predecessor & Successor logic. Abilty to connect routes throw UI
+ */
+UCLASS()
+class UNREALSODA_API ANavigationRoute : public AActor
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere)
+	UBoxComponent* TriggerVolume;
+
+	UPROPERTY(BlueprintReadOnly, Category = NavigationRoute, EditAnywhere)
+	UProceduralMeshComponent* ProceduralMesh; 
+
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere)
+	URouteSplineComponent* Spline;
+
+public:
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	bool bAllowForPedestrians = true;
+
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	bool bAllowForVehicles = true;
+
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	bool bDriveBackvard = false;
+
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	float Probability = 1.0;
+
+	/** Tags can be used to determine which traffic participants can use a given route and which cannot */
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	TSet<FString> RouteTags;
+
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	FLinearColor BaseColor {0.0, 0.115909, 0.322917, 1.0};
+
+	UPROPERTY(EditAnywhere, Category = Connections, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	TSoftObjectPtr<ANavigationRoute> LeftRoute;
+
+	UPROPERTY(EditAnywhere, Category = Connections, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	TSoftObjectPtr<ANavigationRoute>  RightRoute;
+
+	UPROPERTY(EditAnywhere, Category = Connections, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	TSoftObjectPtr<ANavigationRoute> PredecessorRoute;
+
+	UPROPERTY(EditAnywhere, Category = Connections, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	TSoftObjectPtr<ANavigationRoute> SuccessorRoute;
+
+public:
+	UFUNCTION(Category = NavigationRoute, BlueprintCallable)
+	bool SetRoutePoints(const TArray< FVector >& RoutePoints, bool bUpdateMesh=true);
+
+	UFUNCTION(Category = NavigationRoute, BlueprintCallable)
+	const URouteSplineComponent* GetSpline() const { return Spline; }
+
+	UFUNCTION(Category = NavigationRoute, BlueprintCallable)
+	bool IsRouteTagsAllowed(const TSet<FString>& AllowedRouteTags) const;
+
+	//UFUNCTION(Category = NavigationRoute, BlueprintCallable)
+	//TArray<ANavigationRoute *> GetPredecessors() const { return Predecessors; }
+
+	//UFUNCTION(Category = NavigationRoute, BlueprintCallable)
+	//TArray<ANavigationRoute *> GetSuccessors() const { return  Successors;}
+
+	//UFUNCTION(Category = NavigationRoute, BlueprintCallable)
+	//ANavigationRoute* GetRandomSuccessor() const;
+
+	UFUNCTION(Category = NavigationRoute, BlueprintCallable, CallInEditor, meta = (CallInRuntime))
+	void UpdateViewMesh();
+
+	UFUNCTION(Category = NavigationRoute, BlueprintCallable, CallInEditor, meta = (CallInRuntime))
+	void FitActorPosition();
+
+	UFUNCTION(Category = NavigationRoute, BlueprintCallable)
+	bool UpdateProcedureMeshSegment(int SegmentIndex);
+
+public:
+	ANavigationRoute(const FObjectInitializer& ObjectInitializer);
+
+	// TODO: not implemented yet
+	static void UpdateRouteNetwork(const ANavigationRoute* Initiator, bool bIsInitiatorPredecessor);
+
+	void PropagetUpdatePredecessorRoute();
+	void PropagetUpdateSuccessorRoute();
+
+protected:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(EEndPlayReason::Type EndPlayReason) override;
+	virtual void Tick(float DeltaTime) override;
+	virtual void Serialize(FArchive& Ar) override;
+
+protected:
+	//UPROPERTY()
+	//TArray<ANavigationRoute*> Predecessors;
+
+	//UPROPERTY()
+	//TArray<ANavigationRoute*> Successors;
+
+	UPROPERTY()
+	USodaRandomEngine* RandomEngine = nullptr;
+
+	UPROPERTY()
+	UMaterialInterface* MatProcMesh;
+
+	UPROPERTY()
+	UMaterialInstanceDynamic* MatProcMeshDyn = nullptr;
+};
+
+/**
+ * URoutePlannerEditableNode
+ */
+UCLASS()
+class UNREALSODA_API URoutePlannerEditableNode : public UStaticMeshComponent
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(Category = RoutePlannerEditableNode, EditAnywhere, BlueprintReadWrite)
+	FLinearColor BaseColor;
+
+	UPROPERTY(Category = RoutePlannerEditableNode, EditAnywhere, BlueprintReadWrite)
+	FLinearColor HoverColor;
+
+public:
+	int PointIndex = -1;
+
+public:
+	URoutePlannerEditableNode(const FObjectInitializer& ObjectInitializer);
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+
+	void LightNode(bool bLight);
+
+protected:
+	UPROPERTY()
+	UMaterialInstanceDynamic* MatDyn;
+
+	bool bIsHover = false;
+};
+
+/**
+ * ANavigationRouteEditable
+ * This is version of ANavigationRoute, but avalible for editing in the Scenario Editor Mode
+ * TODO: Save route to dataset
+ */
+UCLASS()
+class UNREALSODA_API ANavigationRouteEditable : 
+	public ANavigationRoute,
+	public ISodaActor
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(BlueprintReadWrite, Category = NavigationRoute, EditAnywhere)
+	FLinearColor SelectColor {0.208333, 0.103773, 0.0,1.0};
+
+	UPROPERTY(EditAnywhere, Category = Scenario, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bHideInScenario = false;
+
+public:
+	void UpdateNodes();
+
+public:
+	/* Override from ISodaActor */
+	virtual void SetActorHiddenInScenario(bool bInHiddenInScenario) override { bHideInScenario = bInHiddenInScenario; }
+	virtual bool GetActorHiddenInScenario() const override { return bHideInScenario; }
+	virtual void OnSelect_Implementation(const UPrimitiveComponent* PrimComponent) override;
+	virtual void OnUnselect_Implementation() override;
+	virtual void OnHover_Implementation() override;
+	virtual void OnUnhover_Implementation() override;
+	virtual void OnComponentHover_Implementation(const UPrimitiveComponent* PrimComponent) override;
+	virtual void OnComponentUnhover_Implementation(const UPrimitiveComponent* PrimComponent) override;
+	virtual const FSodaActorDescriptor * GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	virtual bool ShowSelectBox() const override { return false; }
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+
+public:
+	ANavigationRouteEditable(const FObjectInitializer& ObjectInitializer);
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(EEndPlayReason::Type EndPlayReason) override;
+	virtual void Tick(float DeltaTime) override;
+
+protected:
+	UPROPERTY()
+	TArray<URoutePlannerEditableNode *> EditableNodes;
+
+	UPROPERTY()
+	URoutePlannerEditableNode * PreviewNode = nullptr;
+
+	UPROPERTY()
+	URoutePlannerEditableNode * SelectedNode = nullptr;
+
+	UPROPERTY()
+	URoutePlannerEditableNode * HoverNode = nullptr;
+
+	bool bIsSelected = false;
+	bool bIsUnfreezeNotified = false;
+
+	static bool TraceForMousePosition(const APlayerController * PlayerController, TArray<struct FHitResult>& HitResults);
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/NoiseBox.h b/Source/UnrealSoda/Public/Soda/Actors/NoiseBox.h
new file mode 100644
index 0000000..03b252e
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/NoiseBox.h
@@ -0,0 +1,82 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Components/ArrowComponent.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "NoiseBox.generated.h"
+
+/**
+ * ANoiseBox
+ * This is a trigger inside of which new FImuNoiseParams will be assigned to any UImuSensorComponent.
+ * When the sensor leaves the trigger, the previous values ??will be returned to it.
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ANoiseBox : 
+	public AActor,
+	public ISodaActor
+{
+GENERATED_BODY()
+
+public:
+	UPROPERTY(Category = NoiseBox, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBillboardComponent *SpriteComponent;
+
+	UPROPERTY(Category = NoiseBox, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBoxComponent* TriggerVolume;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = NoiseBox, SaveGame, meta = (EditInRuntime))
+	TMap< FString, FImuNoiseParams > NoisePresets;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = NoiseBox, SaveGame, meta = (EditInRuntime))
+	FString DefaultProfileName;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = NoiseBox, SaveGame, meta = (EditInRuntime))
+	FImuNoiseParams DefaultNoiseParams;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = NoiseBox, SaveGame, meta = (EditInRuntime))
+	FVector Extent = FVector(40.0f, 40.0f, 40.0f);
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Scenario, SaveGame, meta = (EditInRuntime))
+	bool bActiveOnlyIfScenario = true;
+
+	UPROPERTY(EditAnywhere, Category = Scenario, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bHideInScenario = false;
+	
+public:
+	ANoiseBox();
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+
+	UFUNCTION(BlueprintCallable, Category = NoiseBox, meta = (CallInRuntime))
+	void UpdateDefaultNoiseParams();
+
+protected:
+	UFUNCTION()
+	virtual void OnBeginOverlap(UPrimitiveComponent* OverlappedComp, AActor* Other, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex, bool bFromSweep, const FHitResult& SweepResult);
+
+	UFUNCTION()
+	virtual void OnEndOverlap(UPrimitiveComponent* OverlappedComp, AActor* Other, UPrimitiveComponent* OtherComp, int32 OtherBodyIndex);
+
+//#if WITH_EDITOR
+//	void PostEditChangeProperty(struct FPropertyChangedEvent& PropertyChangedEvent);
+//#endif
+
+protected:
+	virtual void SetActorHiddenInScenario(bool bInHiddenInScenario) override { bHideInScenario = bInHiddenInScenario; }
+	virtual bool GetActorHiddenInScenario() const override { return bHideInScenario; }
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	//virtual void ScenarioBegin() override;
+	//virtual void ScenarioEnd() override;
+
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/OpenDriveTool.h b/Source/UnrealSoda/Public/Soda/Actors/OpenDriveTool.h
new file mode 100644
index 0000000..ac86b68
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/OpenDriveTool.h
@@ -0,0 +1,170 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Components/SceneComponent.h"
+#include "CoreMinimal.h"
+#include "ProceduralMeshComponent.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Soda/Actors/NavigationRoute.h"
+#include "Soda/IToolActor.h"
+#include "Soda/SodaTypes.h"
+#include "OpenDriveTool.generated.h"
+
+namespace opendrive
+{
+	struct OpenDriveData;
+};
+
+USTRUCT(BlueprintType, Blueprintable)
+struct FOpenDriveRoadMarkProfile
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, Category = RoadMarkProfile, meta = (EditInRuntime))
+	FString MarkType;
+
+	UPROPERTY(EditAnywhere, Category = RoadMarkProfile, meta = (EditInRuntime))
+	ESegmObjectLabel Label;
+
+	UPROPERTY(EditAnywhere, Category = RoadMarkProfile, meta = (EditInRuntime))
+	FColor Color;
+
+	UPROPERTY(EditAnywhere, Category = RoadMarkProfile, meta = (EditInRuntime))
+	float Width;
+
+	UPROPERTY(BlueprintReadOnly, Category = Sensor)
+	UMaterialInstanceDynamic* Material = nullptr;
+
+	FOpenDriveRoadMarkProfile();
+	FOpenDriveRoadMarkProfile(const FString & MarakType, ESegmObjectLabel Label, const FColor & Color, float Width);
+};
+
+/**
+ * AOpenDriveTool
+ * Used for procedural generation of elements at a level based on the OpenDrive file format.
+ * Allows to generate road markings and ANavigationRoute(s).
+ * Can be useful for generating road markings for semantic segmentation for cameras.
+ * TODO: Generate NavigationRoute with branches
+ * TODO: Generate NavigationRoute with directions
+ */
+UCLASS()
+class UNREALSODA_API AOpenDriveTool : 
+	public AActor,
+	public IToolActor
+{
+GENERATED_BODY()
+
+protected:
+	UBillboardComponent *SpriteComponent;
+	UTexture2D *SpriteTexture;
+
+public:
+	UPROPERTY(Category = "GenerateMarks", EditAnywhere)
+	bool bAllowGenerateMarksInEditor = false;
+
+	/** [cm] */
+	UPROPERTY(Category = "GenerateMarks", BlueprintReadWrite, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	float MarkAccuracy = 100;
+
+	/** [cm] */
+	UPROPERTY(Category = "GenerateMarks", BlueprintReadWrite, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	float MarkHeight = 3;
+
+	UPROPERTY(Category = "GenerateMarks", BlueprintReadWrite, EditAnywhere, SaveGame, meta = (EditInRuntime))
+	bool bMarkOptimizeMesh = true;
+
+	UPROPERTY(Category = "GenerateMarks", BlueprintReadWrite, EditAnywhere)
+	bool bMarkDrawDebug = false;
+
+	UPROPERTY(Category = "GenerateMarks", EditAnywhere, SaveGame, meta = (EditInRuntime))
+	bool bMarkGenerateOnBeginPlay = false;
+
+	UPROPERTY(Category = "GenerateMarks", EditAnywhere, SaveGame, meta = (EditInRuntime))
+	TArray<FOpenDriveRoadMarkProfile> MarkProfile;
+
+	UPROPERTY(Category = "GenerateMarks", EditAnywhere)
+	UMaterialInterface* MarkMaterial;
+
+	UPROPERTY(Category = "GenerateMarks", BlueprintReadOnly, Transient)
+	TArray<UProceduralMeshComponent*> MarkMeshes;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Dataset, SaveGame, meta = (EditInRuntime))
+	bool bRecordDataset = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Dataset, SaveGame, meta = (EditInRuntime))
+	bool bStoreLanesMarks = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Dataset, SaveGame, meta = (EditInRuntime))
+	bool bStoreXDOR = false;
+
+public:
+	/** [cm] */
+	UPROPERTY(Category = "GenerateRoutes", BlueprintReadWrite, EditAnywhere)
+	float RouteAccuracy = 300;
+
+	/** [cm] */
+	UPROPERTY(Category = "GenerateRoutes", BlueprintReadWrite, EditAnywhere)
+	float RoutesHeight = 100;
+
+	UPROPERTY(Category = "GenerateRoutes", BlueprintReadOnly, Transient)
+	TArray<ANavigationRoute*> Routes;
+
+public:
+	UFUNCTION(Category = "GenerateMarks", CallInEditor, meta = (CallInRuntime, DisplayName = "Build Road Marks"))
+	void BuildRoadMarks_Editor() { BuildRoadMarks(); }
+
+	UFUNCTION(Category = "GenerateMarks", BlueprintCallable, CallInEditor)
+	void DrawDebugMarks() const;
+
+	UFUNCTION(Category = "GenerateRoutes", CallInEditor, meta = (DisplayName = "Build Routes"))
+	void BuildRoutes_Editor() { BuildRoutes(); }
+
+	UFUNCTION(Category = "GenerateMarks", BlueprintCallable)
+	bool BuildRoadMarks();
+
+	UFUNCTION(Category = "GenerateRoutes", BlueprintCallable)
+	bool BuildRoutes();
+
+	UFUNCTION(Category = "GenerateMarks", BlueprintCallable, CallInEditor, meta = (CallInRuntime))
+	void ClearMarkings();
+
+	UFUNCTION(Category = "GenerateRoutes", BlueprintCallable, CallInEditor)
+	void ClearRoutes();
+
+public:
+	AOpenDriveTool(const FObjectInitializer &ObjectInitializer);
+	bool FindAndLoadXDOR(bool bForceReload);
+
+public:
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor * GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	virtual void ScenarioBegin() override;
+	virtual void ScenarioEnd() override;
+
+public:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+	virtual void OnConstruction(const FTransform& Transform) override;
+	virtual void Serialize(FArchive& Ar) override { Super::Serialize(Ar); ToolActorSerialize(Ar); }
+
+#if WITH_EDITOR
+	void PostEditChangeProperty(struct FPropertyChangedEvent &PropertyChangedEvent);
+
+#endif // WITH_EDITOR
+
+protected:
+	FOpenDriveRoadMarkProfile* FindMarkProfile(const FString& MarakType);
+	FString FindXDORFile();
+
+protected:
+	TArray<TArray<FVector>> DebugMarkLines;
+	TSharedPtr<opendrive::OpenDriveData> OpenDriveData;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/PathViewer.h b/Source/UnrealSoda/Public/Soda/Actors/PathViewer.h
new file mode 100644
index 0000000..43adefe
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/PathViewer.h
@@ -0,0 +1,83 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Sockets.h"
+#include "SocketSubsystem.h"
+#include "Common/UdpSocketReceiver.h"
+#include "Common/UdpSocketBuilder.h"
+#include "Interfaces/IPv4/IPv4Address.h"
+#include "Interfaces/IPv4/IPv4Endpoint.h"
+#include "DrawDebugHelpers.h"
+#include "Soda/IToolActor.h"
+#include <vector>
+#include <mutex>
+#include "PathViewer.generated.h"
+
+/**
+ * APathViewer (experemental)
+ * Used to visualize routes obtained from AD/ADS algorithms over the UDP protocol.
+ * UDP protocol format: |double(Lon0),double(Lat0)|double(Lon1),double(Lat1)|double(Lon2),double(Lat2)|...|
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API APathViewer : 
+	public AActor,
+	public IToolActor
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, Category = PathViewer, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	int Port = 20000;
+
+	UPROPERTY(EditAnywhere, Category = PathViewer, SaveGame)
+	FColor Color;
+
+	UPROPERTY(EditAnywhere, Category = PathViewer, SaveGame, meta = (EditInRuntime))
+	float Thickness = 10.0f;
+
+	UPROPERTY(EditAnywhere, Category = PathViewer, SaveGame, meta = (EditInRuntime))
+	bool bIsLanLong = false;
+
+    /** X = inX * ScaleX + DX*/
+	UPROPERTY(EditAnywhere, Category = PathViewer, meta=(EditCondition="!bIsLanLong"), SaveGame, meta = (EditInRuntime))
+	float ScaleX = 100.0;
+
+    /** Y = inY * ScaleY + DY*/
+	UPROPERTY(EditAnywhere, Category = PathViewer, meta=(EditCondition="!bIsLanLong"), SaveGame, meta = (EditInRuntime))
+	float ScaleY = -100.0;
+
+    /** X = inX * ScaleX + DX*/
+	UPROPERTY(EditAnywhere, Category = PathViewer, meta=(EditCondition="!bIsLanLong"), SaveGame, meta = (EditInRuntime))
+	float DX = 0.0;
+
+    /** Y = inY * ScaleY + DY*/
+	UPROPERTY(EditAnywhere, Category = PathViewer, meta=(EditCondition="!bIsLanLong"), SaveGame, meta = (EditInRuntime))
+	float DY = 0.0;
+
+public:
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor * GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+
+public:
+	APathViewer();
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+	virtual void Serialize(FArchive& Ar) override { Super::Serialize(Ar); ToolActorSerialize(Ar); }
+
+private:
+	FSocket* ListenSocket = nullptr;
+	FUdpSocketReceiver* UDPReceiver = nullptr;
+	std::vector< double > Buf;
+	std::vector< double > DrawBuf;
+	std::mutex mutex;
+
+	bool bIsPinnedActor = true;
+
+	void Recv(const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt);
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/RefPoint.h b/Source/UnrealSoda/Public/Soda/Actors/RefPoint.h
new file mode 100644
index 0000000..399fbcc
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/RefPoint.h
@@ -0,0 +1,97 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "ProceduralMeshComponent.h"
+#include "Materials/MaterialInstanceDynamic.h"
+#include "Engine/EngineTypes.h"
+#include "Components/TextRenderComponent.h"
+#include "Soda/ISodaActor.h"
+#include "RefPoint.generated.h"
+
+
+/**
+ * ARefPoint
+ * This ISodaActor allows to define a correspondance between the UE origin and an actual geographic location on a planet.
+ * It is mainly used by GPS sensors to convert coordinates from local to geographic.
+ * TODO: Try to use AGeoReferencingSystem insted ARefPoint
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ARefPoint : 
+	public AActor,
+	public ISodaActor
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RefPoint, meta = (EditInRuntime))
+	double Latitude = 59.995;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RefPoint, meta = (EditInRuntime))
+	double Longitude = 30.13;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RefPoint, meta = (EditInRuntime))
+	double Altitude = 10.0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Visibility, SaveGame, meta = (EditInRuntime))
+	bool bDrawAxis = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Visibility, SaveGame, meta = (EditInRuntime))
+	bool bDrawOverTop = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Visibility, SaveGame, meta = (EditInRuntime))
+	bool bScreenAutoScale = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Visibility, SaveGame, meta = (EditInRuntime))
+	float ScreenSize = 0.001f;
+
+	UPROPERTY(EditAnywhere, Category = Scenario, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bHideInScenario = false;
+
+	UFUNCTION(BlueprintCallable, CallInEditor, Category = RefPoint, meta = (CallInRuntime))
+	void UpdateGlobalRefPoint();
+
+public:
+	ARefPoint();
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+
+
+public:
+	/* Override from ISodaActor */
+	virtual void SetActorHiddenInScenario(bool bInHiddenInScenario) override { bHideInScenario = bInHiddenInScenario; }
+	virtual bool GetActorHiddenInScenario() const override { return bHideInScenario; }
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor * GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	virtual bool ShowSelectBox() const override { return false; }
+
+protected:
+	UPROPERTY()
+	UProceduralMeshComponent * Shaft;
+
+	UPROPERTY()
+	UMaterialInterface* MatDense;
+
+	UPROPERTY()
+	UMaterialInterface* MatOpacity;
+
+	UPROPERTY()
+	UMaterialInterface* MatText;
+
+	UPROPERTY(Transient)
+	UTextRenderComponent* TextRenderNorth;
+
+	UPROPERTY(Transient)
+	UTextRenderComponent* TextRenderSouth;
+
+	UPROPERTY(Transient)
+	UTextRenderComponent* TextRenderWest;
+
+	UPROPERTY(Transient)
+	UTextRenderComponent* TextRenderEast;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/ScenarioTriggerActors.h b/Source/UnrealSoda/Public/Soda/Actors/ScenarioTriggerActors.h
new file mode 100644
index 0000000..3920c91
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/ScenarioTriggerActors.h
@@ -0,0 +1,117 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/ObjectMacros.h"
+#include "GameFramework/Actor.h"
+#include "Soda/ISodaActor.h"
+#include "ScenarioTriggerActors.generated.h"
+
+class UBillboardComponent;
+class UShapeComponent;
+
+/** An actor used to generate collision events (begin/end overlap) in the level. */
+UCLASS(ClassGroup=Soda, abstract, ConversionRoot)
+class UNREALSODA_API AScenarioTriggerBase : 
+	public AActor,
+	public ISodaActor
+{
+	GENERATED_UCLASS_BODY()
+
+private:
+	/** Shape component used for collision */
+	UPROPERTY(Category = TriggerBase, VisibleAnywhere, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
+	TObjectPtr<UShapeComponent> CollisionComponent;
+
+	/** Billboard used to see the trigger in the editor */
+	UPROPERTY(Category = TriggerBase, BlueprintReadOnly, meta = (AllowPrivateAccess = "true"))
+	TObjectPtr<UBillboardComponent> SpriteComponent;
+
+public:
+	UPROPERTY(EditAnywhere, Category = Scenario, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bHideInScenario = false;
+
+public:
+	/** Returns CollisionComponent subobject **/
+	UShapeComponent* GetCollisionComponent() const { return CollisionComponent; }
+
+	/** Returns SpriteComponent subobject **/
+	UBillboardComponent* GetSpriteComponent() const { return SpriteComponent; }
+
+public: 
+	virtual void SetActorHiddenInScenario(bool bInHiddenInScenario) override { bHideInScenario = bInHiddenInScenario; }
+	virtual bool GetActorHiddenInScenario() const override { return bHideInScenario; }
+};
+
+/** A sphere shaped trigger, used to generate overlap events in the level */
+UCLASS()
+class UNREALSODA_API AScenarioTriggerSphere : public AScenarioTriggerBase
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	UPROPERTY(Category = Trigger, EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SphereRadius = 40;
+
+public:
+	virtual void BeginPlay() override;
+
+	//virtual void EditorApplyScale(const FVector& DeltaScale, const FVector* PivotLocation, bool bAltDown, bool bShiftDown, bool bCtrlDown) override;
+
+	/* Override from ISodaActor */
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+};
+
+/** A capsule shaped trigger, used to generate overlap events in the level */
+UCLASS()
+class UNREALSODA_API AScenarioTriggerCapsule : public AScenarioTriggerBase
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(Category = Trigger, EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float CapsuleRadius = 40.0f;
+
+	UPROPERTY(Category = Trigger, EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float CapsuleHalfHeight = 80.0f;
+
+public:
+	virtual void BeginPlay() override;
+
+	//virtual void EditorApplyScale(const FVector& DeltaScale, const FVector* PivotLocation, bool bAltDown, bool bShiftDown, bool bCtrlDown) override;
+
+	/* Override from ISodaActor */
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+};
+
+/** A box shaped trigger, used to generate overlap events in the level */
+UCLASS()
+class UNREALSODA_API AScenarioTriggerBox : public AScenarioTriggerBase
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(Category = Trigger, EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FVector Extent = FVector(40.0f, 40.0f, 40.0f);
+
+public:
+	virtual void BeginPlay() override;
+
+	//virtual void EditorApplyScale(const FVector& DeltaScale, const FVector* PivotLocation, bool bAltDown, bool bShiftDown, bool bCtrlDown) override;
+
+	/* Override from ISodaActor */
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+};
+
+
+
+
+
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Actors/SensorHolder.h b/Source/UnrealSoda/Public/Soda/Actors/SensorHolder.h
new file mode 100644
index 0000000..e38b58a
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/SensorHolder.h
@@ -0,0 +1,71 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Components/ArrowComponent.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "SensorHolder.generated.h"
+
+class USensorComponent;
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ASensorHolder : 
+	public AActor,
+	public ISodaActor
+{
+GENERATED_BODY()
+
+public:
+	UPROPERTY(Category = SensorHolder, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBillboardComponent *SpriteComponent;
+
+	UPROPERTY(Category = SensorHolder, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UArrowComponent *ArrowComponent;
+
+	UPROPERTY(Category = SpawnPoint, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBoxComponent* TriggerVolume;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SensorHolder, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	TSubclassOf<USensorComponent> SensorClass;
+
+	UPROPERTY(EditAnywhere, Category = Scenario, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bHideInScenario = false;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = RouteBuilder)
+	USensorComponent * GetSensor() { return SensorComponent; }
+
+	UFUNCTION(BlueprintCallable, Category = RouteBuilder)
+	virtual void RecreateSensor();
+
+	UFUNCTION()
+	void OnSelected();
+
+	UFUNCTION()
+	void OnUnselected();
+
+public:
+	ASensorHolder();
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void Serialize(FArchive& Ar) override;
+
+public:
+	/* Override from ISodaActor */
+	virtual void SetActorHiddenInScenario(bool bInHiddenInScenario) override { bHideInScenario = bInHiddenInScenario; }
+	virtual bool GetActorHiddenInScenario() const override { return bHideInScenario; }
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+
+protected:
+	UPROPERTY()
+	USensorComponent* SensorComponent = nullptr;
+
+	FComponentRecord ComponentRecord;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Actors/SpawnPoint.h b/Source/UnrealSoda/Public/Soda/Actors/SpawnPoint.h
new file mode 100644
index 0000000..7a97aec
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/SpawnPoint.h
@@ -0,0 +1,81 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Components/ArrowComponent.h"
+#include "Soda/ISodaActor.h"
+#include "SpawnPoint.generated.h"
+
+
+ /**
+  * ASpawnPoint
+  */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ASpawnPoint : 
+	public AActor,
+	public ISodaActor
+{
+GENERATED_BODY()
+
+public:
+	UPROPERTY(Category = SpawnPoint, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBillboardComponent *SpriteComponent;
+
+	UPROPERTY(Category = SpawnPoint, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UArrowComponent *ArrowComponent;
+
+	UPROPERTY(Category = SpawnPoint, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBoxComponent* TriggerVolume;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SpawnPoint, SaveGame, meta = (EditInRuntime))
+	TSubclassOf<USodaActor> ActorClass;
+
+	UPROPERTY(EditAnywhere, Category = Scenario, SaveGame, meta = (EditInRuntime))
+	bool bIsActivePoint = true;
+
+	/** if ActorClass is ASodaWheeledVehicle wether to set it to AI mode  */
+	UPROPERTY(EditAnywhere, Category = Scenario, SaveGame, meta = (EditInRuntime))
+	bool bSetVehicleToAIMode = false;
+
+	UPROPERTY(EditAnywhere, Category = Scenario, SaveGame, meta = (EditInRuntime))
+	float VehicleAISpeed = 60;
+
+	UPROPERTY(EditAnywhere, Category = Scenario, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bHideInScenario = false;
+
+public:
+	UFUNCTION(BlueprintImplementableEvent, Category = EditorModeWidget)
+	void OnActorSpawned(AActor * Actor);
+
+public:
+	UFUNCTION(BlueprintCallable, Category = RouteBuilder)
+	AActor * GetSpawnedActor() { return SpawnedActor;  }
+	
+public:
+	ASpawnPoint();
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void PostInitializeComponents() override;
+#if WITH_EDITOR
+	void PostEditChangeProperty(struct FPropertyChangedEvent &PropertyChangedEvent);
+#endif // WITH_EDITOR
+
+public:
+	/* Override from ISodaActor */
+	virtual void SetActorHiddenInScenario(bool bInHiddenInScenario) override { bHideInScenario = bInHiddenInScenario; }
+	virtual bool GetActorHiddenInScenario() const override { return bHideInScenario; }
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	virtual void ScenarioBegin() override;
+	virtual void ScenarioEnd() override;
+
+protected:
+	UPROPERTY()
+	AActor * SpawnedActor = nullptr;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/TileScanner.h b/Source/UnrealSoda/Public/Soda/Actors/TileScanner.h
new file mode 100644
index 0000000..ec16fac
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/TileScanner.h
@@ -0,0 +1,57 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/UnrealSoda.h"
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Components/ArrowComponent.h"
+#include "Soda/IToolActor.h"
+#include "TileScanner.generated.h"
+
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ATileScanner : 
+	public AActor,
+	public IToolActor
+{
+GENERATED_BODY()
+
+public:
+	UPROPERTY(Transient, BlueprintReadOnly, Category = TileScanner)
+	class USceneCaptureComponent2D* CaptureComponent;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = TileScanner)
+	float OrthoWidth = 10000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = TileScanner)
+	float ZeroLevel = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = TileScanner)
+	int TileSize = 1024;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = TileScanner)
+	int LeftCount = 5;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = TileScanner)
+	int RightCount = 5;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = TileScanner)
+	int UpCount = 5;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = TileScanner)
+	int DownCount = 5;
+
+public:
+	ATileScanner();
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void Serialize(FArchive& Ar) override { Super::Serialize(Ar); ToolActorSerialize(Ar); }
+
+	UFUNCTION(BlueprintCallable, Category = Screenshot)
+	void Scan();
+
+	UFUNCTION(BlueprintCallable, Category = Screenshot)
+	void MakeScreenshot(const FString& InFileName);
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Actors/TrackBuilder.h b/Source/UnrealSoda/Public/Soda/Actors/TrackBuilder.h
new file mode 100644
index 0000000..4d0f96b
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/TrackBuilder.h
@@ -0,0 +1,252 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "ProceduralMeshComponent.h"
+#include "Soda/Actors/NavigationRoute.h"
+#include "Soda/IToolActor.h"
+#include "TrackBuilder.generated.h"
+
+class FJsonObject;
+
+/**
+ * ATrackBuilder (Experimental)
+ * Procedural generation of racing tracks based on a JSON custom format.
+ * Dev notes: If the tool turns out to be useful, need to think about a way to create JSON tracks from Google maps.
+ * TODO: Need to check the functionality after switching to a new triangulation algorithm.
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ATrackBuilder : 
+	public AActor,
+	public IToolActor
+{
+	GENERATED_BODY()
+
+public:
+	ATrackBuilder();
+
+	/** JSON file path to open in editor */
+	UPROPERTY(EditAnywhere, Category = LoadJsonTrack)
+	FString FileName;
+
+	/** Whether to import altitude from JSON file */
+	UPROPERTY(EditAnywhere, Category = LoadJsonTrack, SaveGame, meta = (EditInRuntime))
+	bool bImportAltitude = false;
+
+	UPROPERTY(EditAnywhere, Category = LoadJsonTrack, SaveGame, meta = (EditInRuntime))
+	bool bRelax = false;
+
+	UPROPERTY(EditAnywhere, Category = LoadJsonTrack, SaveGame, meta = (EditInRuntime))
+	float RelaxSpeed = 0.5;
+
+	UPROPERTY(EditAnywhere, Category = LoadJsonTrack, SaveGame, meta = (EditInRuntime))
+	float RelaxIterations = 10;
+
+	UPROPERTY(EditAnywhere, Category = LoadJsonTrack, SaveGame, meta = (EditInRuntime))
+	float RelaxTargetAngel = 100;
+
+	UPROPERTY(EditAnywhere, Category = LoadJsonTrack, SaveGame, meta = (EditInRuntime))
+	bool bIsClosedTrack = true;
+
+	/** The minimum distance between any two vertices of generated track[cm] or -1 if not used*/
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	float TrackMinSegmentLength = 100;
+
+	/** Whether to generate borders (right and left indent  of the track) */
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	bool bWithBorder = true;
+
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	float BorderWidth = 150.0;
+
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	float TrackElevation = 10;
+
+	/** The track is divided into segments. TrackSegmentStep - how many vertices of the center line should be included in one segment. */
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	int TrackSegmentStep  = 50;
+
+	/** How many segments to build. If -1 then build all segments. */
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	int TrackBuildSegmentCount  = -1;
+
+	/** Multiplier of V texture coordinates. */
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	float TrackTexScaleV = 0.0008;
+
+	/** Part of U texture (0...1) that will be allocated to the border.  */
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	float TrackTexBorderPartU = 0.1;
+
+	/** Generate track with center line. */
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	bool bTrackWithCenterLine = true;
+
+	UPROPERTY(EditAnywhere, Category = TrackBuilder)
+	class UMaterialInterface* TrackMaterial = nullptr;
+
+	/** Generate track mesh during OnBegin. */
+	UPROPERTY(EditAnywhere, Category = TrackBuilder, SaveGame, meta = (EditInRuntime))
+	bool bGenerateTrackOnBeginPlay = true;
+
+	/** The minimum distance between any two vertices of generated route[cm] or -1 if not used*/
+	UPROPERTY(EditAnywhere, Category = RoutesBuilder, SaveGame, meta = (EditInRuntime))
+	float RouteMinSegmentLength = 500;
+
+	/** Generate routes  during OnBegin. */
+	UPROPERTY(EditAnywhere, Category = RoutesBuilder, SaveGame, meta = (EditInRuntime))
+	bool bGenerateLineRoutesOnBeginPlay = true;
+
+	UPROPERTY(EditAnywhere, Category = RoutesBuilder, SaveGame, meta = (EditInRuntime))
+	bool bGenerateRaceRouteOnBeginPlay = false;
+
+	UPROPERTY(EditAnywhere, Category = RoutesBuilder, SaveGame, meta = (EditInRuntime))
+	int NumRouteLanes = 1;
+
+	UPROPERTY(EditAnywhere, Category = RoutesBuilder, SaveGame, meta = (EditInRuntime))
+	FVector RouteOffset;
+
+	UPROPERTY(EditAnywhere, Category = MarkingsBuilder, SaveGame, meta = (EditInRuntime))
+	float MarkingsMinSegmentLength = 30;
+
+	UPROPERTY(EditAnywhere, Category = MarkingsBuilder, SaveGame, meta = (EditInRuntime))
+	float MarkingsWidth = 20;
+	
+	UPROPERTY(EditAnywhere, Category = MarkingsBuilder, SaveGame, meta = (EditInRuntime))
+	float MarkingsTexScaleV = 0.004;
+		
+	UPROPERTY(EditAnywhere, Category = MarkingsBuilder, SaveGame, meta = (EditInRuntime))
+	int MarkingsStep = 200;
+
+	/** Generate markings  during OnBegin. */
+	UPROPERTY(EditAnywhere, Category = MarkingsBuilder, SaveGame, meta = (EditInRuntime))
+	bool bGeneratMarkingsOnBeginPlay = true;
+
+	UPROPERTY(EditAnywhere, Category = MarkingsBuilder)
+	class UMaterialInterface* MarkingsMaterial = nullptr;
+
+	UPROPERTY(EditAnywhere, Category = StartPoint)
+	class UMaterialInterface* DecalMaterial = nullptr;
+
+	UPROPERTY(EditAnywhere, Category = StartPoint)
+	float StartLineOffset = 300;
+
+	UPROPERTY(EditAnywhere, Category = StartPoint)
+	float StartLineWidth = 50;
+
+	/** Generate start line during OnBegin. */
+	UPROPERTY(EditAnywhere, Category = StartPoint)
+	bool bGeneratStartLineOnBeginPlay = true;
+
+public:
+	UPROPERTY(BlueprintReadOnly, Category = TrackBuilder, SaveGame)
+	TArray<FVector> OutsidePoints;
+
+	UPROPERTY(BlueprintReadOnly, Category = TrackBuilder, SaveGame)
+	TArray<FVector> InsidePoints;
+
+	UPROPERTY(BlueprintReadOnly, Category = TrackBuilder, SaveGame)
+	TArray<FVector> CentrePoints;
+
+	UPROPERTY(BlueprintReadOnly, Category = TrackBuilder, SaveGame)
+	TArray<FVector> RacingPoints;
+
+	UPROPERTY(BlueprintReadOnly, Category = TrackBuilder, SaveGame)
+	bool bIsClockwise2D = false;
+
+	UPROPERTY(BlueprintReadOnly, Category = RefPoint, SaveGame)
+	bool bRefPointIsOk = false;
+
+	UPROPERTY(BlueprintReadOnly, Category = LoadJsonTrack, SaveGame)
+	bool bJSONLoaded = false;
+
+	UPROPERTY(BlueprintReadOnly, Category = LoadJsonTrack, SaveGame)
+	FString LoadedFileName;
+
+	UPROPERTY(BlueprintReadOnly, Category = TrackBuilder, Transient)
+	TArray<UProceduralMeshComponent*> TrackMeshes;
+
+	UPROPERTY(BlueprintReadOnly, Category = MarkingsBuilder, Transient)
+	TArray<UProceduralMeshComponent*> MarkingMeshes;
+
+	UPROPERTY(Category = RoutesBuilder, BlueprintReadOnly, Transient)
+	TArray<ANavigationRoute*> Routes;
+
+	UPROPERTY(Category = StartPint, BlueprintReadOnly, Transient)
+	UDecalComponent * StartLineDecal = nullptr;
+
+	UPROPERTY(SaveGame)
+	double RefPointLon = 0;
+
+	UPROPERTY(SaveGame)
+	double RefPointLat = 0;
+
+	UPROPERTY(SaveGame)
+	double RefPointAlt = 0;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = LoadJsonTrack)
+	bool LoadJson(const FString& InFileName);
+
+	UFUNCTION(CallInEditor, Category = LoadJsonTrack, meta = (DisplayName="Load JSON", CallInRuntime))
+	void LoadJson_Editor();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = LoadJsonTrack, meta = (CallInRuntime))
+	void UnloadJson();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = LoadJsonTrack, meta = (CallInRuntime))
+	void GenerateAll();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = TrackBuilder, meta = (CallInRuntime))
+	void GenerateTrack();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = TrackBuilder, meta = (CallInRuntime))
+	void ClearTrack();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = RoutesBuilder, meta = (CallInRuntime))
+	void GenerateLineRoutes();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = RoutesBuilder, meta = (CallInRuntime))
+	void GenerateRaceRoute();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = RoutesBuilder, meta = (CallInRuntime))
+	void ClearRoutes();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = MarkingsBuilder, meta = (CallInRuntime))
+	void GenerateMarkings();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = MarkingsBuilder, meta = (CallInRuntime))
+	void ClearMarkings();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = RefPoint, meta = (CallInRuntime))
+	void UpdateGlobalRefpoint();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = StartPoint, meta = (CallInRuntime))
+	void UpdateActorsFactory();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = StartPoint, meta = (CallInRuntime))
+	void GenerateStartLine();
+
+	UFUNCTION(CallInEditor, BlueprintCallable, Category = StartPoint, meta = (CallInRuntime))
+	void ClearStartLine();
+
+public:
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+
+public:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+	virtual void OnConstruction(const FTransform& Transform) override;
+	virtual void Serialize(FArchive& Ar) override { Super::Serialize(Ar); ToolActorSerialize(Ar); }
+
+protected:
+	static bool JSONReadLine(const TSharedPtr<FJsonObject>& JSON, const FString& FieldName, TArray<FVector>& OutPoints, bool ImportAltitude);
+	bool GenerateMarkingsInner(const TArray<FVector>& Points);
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/V2VBox.h b/Source/UnrealSoda/Public/Soda/Actors/V2VBox.h
new file mode 100644
index 0000000..227d68a
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/V2VBox.h
@@ -0,0 +1,60 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/BillboardComponent.h"
+#include "Components/ArrowComponent.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/VehicleComponents/Others/V2V.h"
+#include "V2VBox.generated.h"
+
+
+ /**
+  * ANoiseBox
+  */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API AV2VBox :
+	public AActor,
+	public ISodaActor
+{
+GENERATED_BODY()
+
+public:
+	UPROPERTY(Category = Default, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBillboardComponent *SpriteComponent;
+
+	UPROPERTY(Category = Default, VisibleDefaultsOnly, BlueprintReadOnly)
+	class UBoxComponent* TriggerVolume;
+
+	/** Please add a variable description */
+	UPROPERTY(Category = Default, VisibleAnywhere, BlueprintReadOnly)
+	UV2VTransmitterComponent* V2VTransmitter;
+
+	UPROPERTY(Category = V2VBox, EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FVector Extent = FVector(40.0f, 40.0f, 40.0f);
+
+	UPROPERTY(Category = V2VBox, EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	int ID = 0;
+
+	UPROPERTY(EditAnywhere, Category = Scenario, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bHideInScenario = false;
+
+public:
+	AV2VBox();
+
+	virtual void BeginPlay() override;
+
+public:
+	/* Override from ISodaActor */
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual void SetActorHiddenInScenario(bool bInHiddenInScenario) override { bHideInScenario = bInHiddenInScenario; }
+	virtual bool GetActorHiddenInScenario() const override { return bHideInScenario; }
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+	//virtual void ScenarioBegin() override;
+	//virtual void ScenarioEnd() override;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/V2XViewer.h b/Source/UnrealSoda/Public/Soda/Actors/V2XViewer.h
new file mode 100644
index 0000000..b1bd7b3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/V2XViewer.h
@@ -0,0 +1,117 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Soda/Misc/Time.h"
+#include "Sockets.h"
+#include "SocketSubsystem.h"
+#include "Common/UdpSocketReceiver.h"
+#include "Common/UdpSocketBuilder.h"
+#include "Interfaces/IPv4/IPv4Address.h"
+#include "Interfaces/IPv4/IPv4Endpoint.h"
+#include "SodaSimProto/V2X.hpp"
+#include "Soda/IToolActor.h"
+#include <mutex>
+#include "V2XViewer.generated.h"
+
+class UInstancedStaticMeshComponent;
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API AV2XViewer : 
+	public AActor,
+	public IToolActor
+{
+	GENERATED_BODY()
+
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer)
+	UInstancedStaticMeshComponent* BoxStaticMeshesObstacle;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer)
+	UInstancedStaticMeshComponent* BoxStaticMeshesCollectable;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer)
+	UInstancedStaticMeshComponent* BoxStaticMeshesUndef;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	int Port = 3003;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, SaveGame, meta = (EditInRuntime))
+	float Thickness = 10.0f;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, SaveGame, meta = (EditInRuntime))
+	bool bUseCustomRefPoint = false;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, meta=(EditCondition="bUseCustomRefPoint"), SaveGame, meta = (EditInRuntime, ReactivateActor))
+	double Latitude = 59.995;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, meta=(EditCondition="bUseCustomRefPoint"), SaveGame, meta = (EditInRuntime, ReactivateActor))
+	double Longitude = 30.13;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, meta=(EditCondition="bUseCustomRefPoint"), SaveGame, meta = (EditInRuntime, ReactivateActor))
+	double Altitude = 10.0;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, meta=(EditCondition="bUseCustomRefPoint"), SaveGame, meta = (EditInRuntime, ReactivateActor))
+	FVector Shift;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	bool bUseDefaultHeight = true;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, meta=(EditCondition="bUseDefaultHeight"), SaveGame, meta = (EditInRuntime, ReactivateActor))
+	float DefaultHeight = 100.f;
+	
+	UPROPERTY(EditInstanceOnly, Category = V2XViewer, SaveGame)
+	TArray<AActor*> HiddenActors;
+
+	UPROPERTY(EditInstanceOnly, Category = V2XViewer, SaveGame)
+	TArray<AActor*> ShowOnlyActors;
+
+	//UPROPERTY(EditInstanceOnly, Category=V2XViewer, SaveGame)
+	//TSubclassOf<AActor> ShowOnlyActorsClass;
+
+	//UPROPERTY(EditInstanceOnly, Category=V2XViewer, SaveGame)
+	//TSubclassOf<AActor> HiddenActorsClass;
+
+	UPROPERTY(EditAnywhere, Category = V2XViewer, SaveGame, meta = (EditInRuntime))
+	bool bShowLog = false;
+
+public:
+	/* Override from ISodaActor */
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+
+public:
+	AV2XViewer();
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+	virtual void Serialize(FArchive& Ar) override { Super::Serialize(Ar); ToolActorSerialize(Ar); }
+
+private:
+	FVector OrignShift;
+	struct FV2XObject
+	{
+		TTimestamp Timestamp;
+		bool Traced = false;
+		bool TracedValid = false;
+		FVector Pos;
+		FRotator Rot;
+		FVector Extent;
+		soda::V2XRenderObject Data;
+	};
+
+	FSocket* ListenSocket = nullptr;
+	FUdpSocketReceiver* UDPReceiver = nullptr;
+	TMap<uint32_t, FV2XObject> V2XObjects;
+	std::mutex Mutex;
+	void Recv(const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt);
+	void SetUpBatchedSceneQuery(int NumRays);
+
+	TArray<FVector> BatchStart;
+	TArray<FVector> BatchEnd;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Actors/WeatherSystem.h b/Source/UnrealSoda/Public/Soda/Actors/WeatherSystem.h
new file mode 100644
index 0000000..6c30951
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Actors/WeatherSystem.h
@@ -0,0 +1,91 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/SkyLight.h"
+#include "Engine/ExponentialHeightFog.h"
+#include "Engine/DirectionalLight.h"
+#include "GameFramework/Actor.h"
+#include "Soda/ISodaActor.h"
+#include "WeatherSystem.generated.h"
+
+DEFINE_LOG_CATEGORY_STATIC(WEATHER, Log, All);
+
+class UMaterialInstanceDynamic;
+class AVolumetricCloud;
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API AWeatherSystem : 
+	public AActor,
+	public ISodaActor
+{
+	GENERATED_BODY()
+
+public:
+	AWeatherSystem();
+	virtual void BeginPlay() override;
+	virtual void PreInitializeComponents() override;
+	virtual void Serialize(FArchive& Ar) override;
+	
+	/* Update weather in level*/
+	UFUNCTION(BlueprintCallable, Category = Weather, meta = (CallInRuntime))
+	void UpdateWeather();
+
+public:
+	UPROPERTY(EditAnywhere, Category = Weather)
+	ADirectionalLight * Sun;
+
+	UPROPERTY(EditAnywhere, Category = Weather)
+	ASkyLight * SkyLight;
+
+	UPROPERTY(EditAnywhere, Category = Weather)
+	AExponentialHeightFog * ExponentialHeightFog;
+
+	UPROPERTY(EditAnywhere, Category = Weather)
+	AVolumetricCloud * VolumetricClouds;
+
+	UPROPERTY(EditAnywhere, Category = Weather)
+	UClass* FogClass;
+
+	UPROPERTY(EditAnywhere, Category = Weather)
+	UClass* RoadPlannerClass;
+
+	UPROPERTY(EditAnywhere, Category = Weather, SaveGame, meta = (EditInRuntime))
+	float DayTime = 12.f;
+
+	// Enable fog on UPS_Depot map roads
+	UPROPERTY(EditAnywhere, Category = Weather, SaveGame, meta = (EditInRuntime))
+	bool RoadsFog = false;
+
+	// Enable all user placed LocalFog actors
+	UPROPERTY(EditAnywhere, Category = Weather, SaveGame, meta = (EditInRuntime))
+	bool LocalFog = true;
+
+	// Overall Mist Dencity, percent (0.0 - 100.0]
+	UPROPERTY(EditAnywhere, Category = Weather, SaveGame, meta = (EditInRuntime))
+	float OverallMistDensity = 2.f;
+
+	UPROPERTY(EditAnywhere, Category = Weather, SaveGame, meta = (EditInRuntime))
+	bool EnableVolumetricClouds = false;
+
+	// Defines clouds opacity, percent [0 - 100]
+	UPROPERTY(EditAnywhere, Category = Weather, SaveGame, meta = (EditInRuntime))
+	float VolumetricCloudsDencity = 20.f;
+
+	// Clouds Layout, [1.0 - 5.0]
+	// 1 - Overcast,
+	// 5 - Cumulus clouds
+	UPROPERTY(EditAnywhere, Category = Weather, SaveGame, meta = (EditInRuntime))
+	float VolumetricCloudsLayout = 3.f;
+
+public:
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+
+private:
+	UMaterialInstanceDynamic* CloudsDynamicMaterial = nullptr;
+};
diff --git a/Source/UnrealSoda/Public/Soda/DBC/Common.h b/Source/UnrealSoda/Public/Soda/DBC/Common.h
new file mode 100644
index 0000000..c42e941
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/DBC/Common.h
@@ -0,0 +1,117 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "HAL/UnrealMemory.h"
+#include "Soda/Misc/Time.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include <float.h>
+#include <chrono>
+
+#define INT_DEFAULT (1000U)
+#define CANID_EXTENDED_FLAG ((uint32_t)0x80000000U)
+#define CANID_MASK          ((uint32_t)0x7fffffffU)
+#define CAN_DOUBLE_SIGNAL_LENGTH (9)
+
+namespace dbc
+{
+
+class FMessageSerializator;
+class FCANMessage;
+
+enum ECanFrameFlags : uint8
+{
+	CF_STANDARD = 0x00U,  // Frame is a CAN Standard Frame (11-bit identifier)
+	CF_RTR      = 0x01U,  // Frame is a CAN Remote-Transfer-Request Frame
+	CF_EXTENDED = 0x02U,  // Frame is a CAN Extended Frame (29-bit identifier)
+	CF_FD       = 0x04U,  // Frame represents s FD frame in terms of CiA Specs
+	CF_BRS      = 0x08U,  // Frame represents a FD bit rate switch (CAN data at a higher bit rate)
+	CF_ESI      = 0x10U,  // Frame represents a FD error state indicator(CAN FD transmitter was error active)
+	CF_ERRFRAME = 0x40U  // Frame represents an error frame
+};
+
+struct UNREALSODA_API FCanFrame
+{
+	uint32_t ID;
+	uint8_t Length;
+	uint8 Flags; // ECanFrameFlags
+	uint8_t Data[64];
+
+	FCanFrame() {}
+	FCanFrame(uint32_t InID, uint8_t InLength, const uint8_t * InData) :
+		ID(InID),
+		Length(InLength)
+	{
+		check(InLength <= 64);
+		FMemory::Memcpy(Data, InData, InLength);
+	}
+};
+
+DECLARE_MULTICAST_DELEGATE_ThreeParams( FCanMsgDelegate, TTimestamp, FCANMessage*, uint32);
+DECLARE_DELEGATE_OneParam(FCanDelegate, FCanFrame &);
+
+class UNREALSODA_API FCANMessage
+{
+public:
+	FCANMessage(int64 CANID) 
+		: RegistredCANID(CANID)
+	{}
+	virtual ~FCANMessage() {}
+
+	virtual const FString& GetName() const = 0;
+	virtual const FString& GetNamespace() const = 0;
+	virtual const uint32_t GetPGN() const { return 0; }
+	virtual const uint32_t GetID() const = 0;
+	virtual const uint8_t GetLength() const = 0; 	/** In bytes */
+	virtual const uint32_t GetInterval() const = 0;
+
+	virtual int64 GetRegistredCANID() const { return RegistredCANID; }
+	virtual bool IsAlife(const TTimestamp& Timestamp) const { return (Timestamp - RecvTimestamp) < Timeout; }
+
+	virtual void OnPreSend() {}
+	virtual void OnAfterRecv() {}
+
+public:
+	int64 RegistredCANID;
+	FCanFrame Frame;
+	TSharedPtr<dbc::FMessageSerializator> Serializer;
+	TTimestamp RecvTimestamp;
+	TTimestamp SendTimestamp;
+	std::chrono::nanoseconds Timeout{ 500000000ll };
+	//FCanDelegate OnPreSend;
+	//FCanDelegate OnAfterSerialize;
+};
+
+class UNREALSODA_API FCANMessageDynamic : public FCANMessage
+{
+public:
+	FCANMessageDynamic(int64 CANID, TSharedPtr<dbc::FMessageSerializator> Serializer);
+
+	virtual const FString& GetName() const;
+	virtual const FString& GetNamespace() const;
+	//virtual const uint32_t GetPGN() const { return 0; }
+	virtual const uint32_t GetID() const;
+	virtual const uint8_t GetLength() const; 	/** In bytes */
+	virtual const uint32_t GetInterval() const;
+
+	virtual void OnAfterRecv() override;
+	virtual void OnPreSend() override;
+};
+
+class UNREALSODA_API FCANMessageStatic : public FCANMessage
+{
+public:
+	FCANMessageStatic(int64 CANID)
+		: FCANMessage(CANID)
+	{}
+
+	virtual bool Dser(uint32_t length, const void* in) = 0;
+	virtual bool Ser(uint32_t length, void* out) const = 0;
+
+	virtual void OnAfterRecv() override;
+	virtual void OnPreSend() override;
+};
+
+} // namespace dbc
diff --git a/Source/UnrealSoda/Public/Soda/DBC/Helpers.h b/Source/UnrealSoda/Public/Soda/DBC/Helpers.h
new file mode 100644
index 0000000..3f59dea
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/DBC/Helpers.h
@@ -0,0 +1,266 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Containers/UnrealString.h"
+#include "Kismet/KismetStringLibrary.h"
+#include "Soda/DBC/Common.h"
+#include "Soda/DBC/Serialization.h"
+#include "Soda/VehicleComponents/CANBus.h"
+#include <vector>
+#include <functional>
+
+class UCANBusComponent;
+
+#define DEFINE_DBC_MSG_STRUCT(MessageName, ...) \
+    struct F ## MessageName: public dbc::FCANMessageDynamicWrapper { \
+        F ## MessageName(dbc::FMessageMap * MessageMap, TAttribute<int64> Address, ECanFrameDir Dir, ECanFrameType Type) \
+            : dbc::FCANMessageDynamicWrapper(MessageMap, #MessageName, Address, bIsRecv, bIsJ1939) { \
+            Signals = {__VA_ARGS__};\
+            InitSignales(TEXT(#__VA_ARGS__)); \
+        } \
+        dbc::FSignalGetSet __VA_ARGS__; \
+    }; 
+
+#define DEFINE_DBC_MSG_DYNAMIC(MessageName, Addr, Dir, Type, ...) \
+    DEFINE_DBC_MSG_STRUCT(MessageName, __VA_ARGS__) \
+    F ## MessageName MessageName{this, TAttribute<int64>::CreateLambda([&](){ return (Addr); }), Dir, Type};
+
+#define DEFINE_DBC_MSG_STATIC(Namespace, MessageType, CANID, Dir, Type) \
+    dbc::FCANMessageStaticWrapper< Namespace::F ## MessageType > MessageType{this, TAttribute<int64>::CreateLambda([&](){ return (CANID); }), Dir, Type};
+
+enum ECanFrameDir
+{
+    Input,
+    Output
+};
+
+enum ECanFrameType
+{
+    Std,
+    J1939
+};
+
+namespace dbc
+{
+struct FCANMessageWrapper;
+
+/**
+ * FMessageMap
+ */
+class UNREALSODA_API FMessageMap
+{
+    friend FCANMessageWrapper;
+
+public:
+    FMessageMap() = default;
+    ~FMessageMap();
+
+    bool RegisterMessages(UCANBusComponent* CANBus);
+    void UnregisterMessages();
+
+    TArray<FCANMessageWrapper*> Messages;
+    UCANBusComponent* CANBus = nullptr; // Don't use TWeakObjectPtr, becouse it is slow
+};
+
+/**
+ * FSignalGetSet 
+ * Helper for FCANMessageWrapper
+ */
+class UNREALSODA_API FSignalGetSet
+{
+public:
+    void Initialize(const FString& InSignalName) { SignalName = InSignalName; }
+
+    void Register(dbc::FCANMessageDynamic& Msg);
+
+    /*
+    void SetRaw(uint64 Val) { Signal->Encode(Val, CanFrame->Data); }
+
+    uint64 GetRaw() { return Signal->Decode(CanFrame->Data); }
+
+    template<typename T>
+    void Set(T Val)
+    {
+        Signal->Encode(Signal->PhysToRaw(static_cast<T>(Val)), CanFrame->Data);
+    }
+     
+    template<typename T>
+    T Get()
+    {
+        return static_cast<T>(Signal->RawToPhys(Signal->Decode(CanFrame->Data)));
+    }
+    */
+
+protected:
+    //dbc::FSignal* Signal = nullptr; 
+    TSharedPtr<dbcppp::ISignal> Signal;
+    dbc::FCanFrame* CanFrame = nullptr;
+    FString SignalName;
+};
+
+/**
+ * FCANMessageWrapper
+ * Common message wrapper
+ */
+struct UNREALSODA_API FCANMessageWrapper
+{
+    FCANMessageWrapper(dbc::FMessageMap* MessageMap, TAttribute<int64> Address, ECanFrameDir Dir, ECanFrameType Type);
+    virtual ~FCANMessageWrapper();
+
+    virtual void Destroy();
+
+    int64 GetAddress() const { return Address.Get(); }
+    ECanFrameDir GetDir() const { return CanFrameDir; }
+    ECanFrameType GetType() const { return CanFrameType; }
+
+    virtual bool RegisterMessage() = 0;
+    virtual void UnregisterMessage() = 0;
+    virtual bool SendMessage() = 0;
+
+protected:
+    dbc::FMessageMap* MessageMap;
+    TAttribute<int64> Address;
+    ECanFrameDir CanFrameDir;
+    ECanFrameType CanFrameType;
+};
+
+/**
+ * FCANMessageDynamicWrapper
+ * Message wrapper for FCANMessageDynamic
+ * WARNING!!! The implementation isn't finished
+ * TODO: finish implementation
+ */
+struct UNREALSODA_API FCANMessageDynamicWrapper: public FCANMessageWrapper
+{
+    FCANMessageDynamicWrapper(dbc::FMessageMap* MessageMap, const FString& MessageName, TAttribute<int64> Address, ECanFrameDir Dir, ECanFrameType Type)
+        : FCANMessageWrapper(MessageMap, Address, Dir, Type)
+        , MessageName(MessageName)
+    {}
+    virtual ~FCANMessageDynamicWrapper() { UnregisterMessage(); }
+
+    virtual bool RegisterMessage() override;
+    virtual void UnregisterMessage() override;
+    virtual bool SendMessage() override;
+
+    TSharedPtr<dbc::FCANMessageDynamic> Msg;
+
+protected:
+    FString MessageName;
+    std::vector<std::reference_wrapper<FSignalGetSet>> Signals;
+    void InitSignales(const FString& SignalsName);
+};
+
+/**
+ * FCANMessageStaticWrapper
+ * Message wrapper for the code generated DBC ser/des
+ */
+template<class T>
+struct FCANMessageStaticWrapper : public FCANMessageWrapper
+{
+    FCANMessageStaticWrapper(dbc::FMessageMap* MessageMap, TAttribute<int64> Address, ECanFrameDir Dir, ECanFrameType Type)
+        : FCANMessageWrapper(MessageMap, Address, Dir, Type)
+    {}
+    virtual ~FCANMessageStaticWrapper() { UnregisterMessage(); }
+
+    T* operator->() const
+    {
+        return Msg.Get();
+    }
+
+    virtual bool RegisterMessage() override
+    {
+        if (IsValid(MessageMap->CANBus) && MessageMap)
+        {
+            if (GetType() == ECanFrameType::J1939)
+            {
+                if (GetDir() == ECanFrameDir::Input)
+                {
+                    Msg = MessageMap->CANBus->RegRecvMsgJ1939<T>(GetAddress());
+                }
+                else
+                {
+                    Msg = MessageMap->CANBus->RegSendMsgJ1939<T>(GetAddress());
+                }
+            }
+            else
+            {
+                if (GetDir() == ECanFrameDir::Input)
+                {
+                    Msg = MessageMap->CANBus->RegRecvMsg<T>(GetAddress());
+                }
+                else
+                {
+                    Msg = MessageMap->CANBus->RegSendMsg<T>(GetAddress());
+                }
+            }
+        }
+
+        return Msg.IsValid();
+    }
+
+    virtual void UnregisterMessage() override
+    {
+        if (MessageMap)
+        {
+            if (IsValid(MessageMap->CANBus))
+            {
+                if (GetDir() == ECanFrameDir::Input)
+                {
+                    MessageMap->CANBus->UnregRecvMsg(Msg->GetRegistredCANID());
+                }
+                else
+                {
+                    MessageMap->CANBus->UnregSendMsg(Msg->GetRegistredCANID());
+                }
+            }
+        }
+    }
+
+    virtual bool SendMessage() override
+    {
+        if (GetDir() == ECanFrameDir::Output && MessageMap)
+        {
+            Msg->OnPreSend();
+            MessageMap->CANBus->SendFrame(Msg->Frame);
+            return true;
+        }
+        return false;
+    }
+
+    template<typename FunctorType>
+    bool SendMessage(FunctorType&& OnAfterSer)
+    {
+        if (GetDir() == ECanFrameDir::Output && MessageMap)
+        {
+            Msg->OnPreSend();
+            OnAfterSer(Msg->Frame);
+            MessageMap->CANBus->SendFrame(Msg->Frame);
+            return true;
+        }
+        return false;
+    }
+
+    template<typename FunctorType, typename... VarTypes>
+    bool SendMessage(FunctorType&& OnAfterSer, VarTypes... Vars)
+    {
+        if (GetDir() == ECanFrameDir::Output && MessageMap)
+        {
+            Msg->OnPreSend();
+            OnAfterSer(Msg->Frame, Vars...);
+            MessageMap->CANBus->SendFrame(Msg->Frame);
+            return true;
+        }
+        return false;
+    }
+
+    TSharedPtr<T> Msg;
+};
+
+} // namespace dbc
+
+
+
+
+
diff --git a/Source/UnrealSoda/Public/Soda/DBC/Private.h b/Source/UnrealSoda/Public/Soda/DBC/Private.h
new file mode 100644
index 0000000..4d779d2
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/DBC/Private.h
@@ -0,0 +1,154 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <inttypes.h>
+#include <string.h>
+#include <math.h>
+
+#define J1939_MASK_8        0xFFU
+#define J1939_FLAG_8_ERR    0xFEU
+#define J1939_FLAG_8_NA     0xFFU
+#define J1939_VALUE_8_ERR   0xFEU
+#define J1939_VALUE_8_NA    0xFFU
+
+#define J1939_MASK_10       0x3FFU
+#define J1939_FLAG_10_ERR   0x3FEU
+#define J1939_FLAG_10_NA    0x3FFU
+#define J1939_VALUE_10_ERR  0x3FEU
+#define J1939_VALUE_10_NA   0x3FFU
+
+#define J1939_MASK_11       0x7FFU
+#define J1939_FLAG_11_ERR   0x7FEU
+#define J1939_FLAG_11_NA    0x7FFU
+#define J1939_VALUE_11_ERR  0x7FEU
+#define J1939_VALUE_11_NA   0x7FFU
+
+#define J1939_MASK_12       0xFFFU
+#define J1939_FLAG_12_ERR   0xFFEU
+#define J1939_FLAG_12_NA    0xFFFU
+#define J1939_VALUE_12_ERR  0xFFEU
+#define J1939_VALUE_12_NA   0xFFFU
+
+#define J1939_MASK_13       0x1FFFU
+#define J1939_FLAG_13_ERR   0x1FFEU
+#define J1939_FLAG_13_NA    0x1FFFU
+#define J1939_VALUE_13_ERR  0x1FFEU
+#define J1939_VALUE_13_NA   0x1FFFU
+
+#define J1939_MASK_16       0xFF00U
+#define J1939_FLAG_16_ERR   0xFE00U
+#define J1939_FLAG_16_NA    0xFF00U
+#define J1939_VALUE_16_ERR  0xFEFFU
+#define J1939_VALUE_16_NA   0xFFFFU
+
+#define J1939_MASK_24       0xFF0000U
+#define J1939_FLAG_24_ERR   0xFE0000U
+#define J1939_FLAG_24_NA    0xFF0000U
+#define J1939_VALUE_24_ERR  0xFEFFFFU
+#define J1939_VALUE_24_NA   0xFFFFFFU
+
+#define J1939_MASK_32       0xFF000000U
+#define J1939_FLAG_32_ERR   0xFE000000U
+#define J1939_FLAG_32_NA    0xFF000000U
+#define J1939_VALUE_32_ERR  0xFEFFFFFFU
+#define J1939_VALUE_32_NA   0xFFFFFFFFU
+
+#define J1939_MASK_64       0xFF00000000000000LLU
+#define J1939_FLAG_64_ERR   0xFE00000000000000LLU
+#define J1939_FLAG_64_NA    0xFF00000000000000LLU
+#define J1939_VALUE_64_ERR  0xFEFFFFFFFFFFFFFFLLU
+#define J1939_VALUE_64_NA   0xFFFFFFFFFFFFFFFFLLU
+
+#define BIT_ONE 1
+#define BIT_ZERO 0
+
+#define TO_BOOL(X) ((X)?true:false)
+
+#define CHECK_STRUCT_SIZE(expected_size, struct_size) static_assert(expected_size <= struct_size, "Invalid structure size " #expected_size " == " #struct_size);
+
+#if defined(__GLIBC__)
+#  include <endian.h>
+#  if __BYTE_ORDER == __LITTLE_ENDIAN
+#    define INTEL_ORDER 1
+#  endif
+#endif
+
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32)
+#  define INTEL_ORDER 1
+#endif
+
+
+#ifndef INTEL_ORDER
+#  error Wrong byte order!
+#endif
+
+namespace Utils
+{
+	/*
+	 * The maximum size of the bit's field (BitLength) is 56 bits.
+	 */
+
+	inline void SetBits56(void* Dest, const void* Src, size_t BitOffset, size_t BitLength)
+	{
+		uint8_t Off = BitOffset % 8;
+		uint64_t Mask = ((0xFFFFFFFFFFFFFFFF >> (64 - BitLength))) << Off;
+		uint64_t& Ref = *(uint64_t*)&((uint8_t*)Dest)[BitOffset / 8];
+		Ref &= ~Mask;
+		Ref |= ((*(uint64_t*)Src) << Off) & Mask;
+	}
+
+	/*
+	* The maximum size of the bit's field (BitLength) is 56 bits.
+	*/
+	template<class T>
+	inline T GetBits56(const void* Src, size_t BitOffset, size_t BitLength)
+	{
+		uint8_t Off = BitOffset % 8;
+		uint64_t Mask = 0xFFFFFFFFFFFFFFFF >> (64 - BitLength);
+		uint64_t Tmp = ((*(uint64_t*)&((uint8_t*)Src)[BitOffset / 8]) >> Off) & Mask;
+		return *(T*)&Tmp;
+	}
+
+	inline void SetBits(void* Dest, const void* Src, size_t BitOffset, size_t BitLength)
+	{
+		if (BitOffset % 8 == 0 && BitLength % 8 == 0)
+		{
+			FMemory::Memcpy(&((uint8_t*)Dest)[BitOffset / 8], Src, BitLength / 8);
+			return;
+		}
+
+		if (BitLength > 56)
+		{
+			check(BitLength <= 64);
+			SetBits56(Dest, Src, BitOffset, 56);
+			SetBits56(Dest, &((uint8_t*)Src)[7], BitOffset + 56, BitLength - 56);
+		}
+		else
+		{
+			SetBits56(Dest, Src, BitOffset, BitLength);
+		}
+	}
+
+	template<class T>
+	inline T GetBits(const void* Src, size_t BitOffset, size_t BitLength)
+	{
+		if (BitOffset % 8 == 0 && BitLength % 8 == 0)
+		{
+			T Ret{};
+			FMemory::Memcpy(&Ret, &((uint8_t*)Src)[BitOffset / 8], BitLength / 8);
+			return Ret;
+		}
+
+		if (BitLength > 56)
+		{
+			check(BitLength <= 64);
+			uint64_t Tmp = GetBits56<uint64_t>(Src, BitOffset, 56) | (GetBits56<uint64_t>(Src, BitOffset + 56, BitLength - 56) << 56);
+			return *(T*)&Tmp;
+		}
+		else
+		{
+			return GetBits56<T>(Src, BitOffset, BitLength);
+		}
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/DBC/Serialization.h b/Source/UnrealSoda/Public/Soda/DBC/Serialization.h
new file mode 100644
index 0000000..7190f3f
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/DBC/Serialization.h
@@ -0,0 +1,259 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Containers/UnrealString.h"
+#include <variant>
+#include  <memory>
+
+namespace dbcppp
+{
+    class ISignal;
+    class IMessage;
+    class IAttribute;
+    class IAttributeDefinition;
+    class ISignalMultiplexerValue;
+    class IValueEncodingDescription;
+    class ISignalGroup;
+}
+
+namespace dbc
+{
+/*
+class FSignal;
+class FMessageSerializator;
+class FAttribute;
+class FAttributeDefinition;
+class FSignalMultiplexerValue;
+class FValueEncodingDescription;
+class FSignalGroup;
+
+ //---------------------------------------------------------------------------------------
+class FSignalMultiplexerValue
+{
+public:
+    struct FRange
+    {
+        std::size_t from;
+        std::size_t to;
+    };
+        
+    const FString& GetSwitchName() const;
+    const FRange& GetValueRanges(std::size_t i) const;
+    uint64_t GetNumValueRanges() const;
+
+    //DBCPPP_MAKE_ITERABLE(ISignalMultiplexerValue, ValueRanges, Range);
+
+    //bool operator==(const ISignalMultiplexerValue& rhs) const = 0;
+    //bool operator!=(const ISignalMultiplexerValue& rhs) const = 0;
+
+protected:
+    TSharedPtr<dbcppp::ISignalMultiplexerValue> SignalMultiplexerValueImpl;
+};
+
+//---------------------------------------------------------------------------------------
+class FValueEncodingDescription
+{
+public:
+    int64_t Value() const;
+    const FString& Description() const;
+
+    //bool operator==(const IValueEncodingDescription& rhs) const = 0;
+    //bool operator!=(const IValueEncodingDescription& rhs) const = 0;
+
+protected:
+    TSharedPtr<dbcppp::IValueEncodingDescription> ValueEncodingDescriptionImpl;
+};
+
+
+//---------------------------------------------------------------------------------------
+class FAttributeDefinition
+{
+public:
+    enum class EObjectType
+    {
+        Network,
+        Node,
+        Message,
+        Signal,
+        EnvironmentVariable,
+    };
+    struct ValueTypeInt
+    {
+        int64_t minimum;
+        int64_t maximum;
+    };
+    struct ValueTypeHex
+    {
+        int64_t minimum;
+        int64_t maximum;
+    };
+    struct ValueTypeFloat
+    {
+        double minimum;
+        double maximum;
+    };
+    struct ValueTypeString
+    {
+    };
+    struct ValueTypeEnum
+    {
+        std::vector<FString> values;
+    };
+    using value_type_t = std::variant<ValueTypeInt, ValueTypeHex, ValueTypeFloat, ValueTypeString, ValueTypeEnum>;
+
+    EObjectType ObjectType() const;
+    const FString& Name() const;
+    const value_type_t& ValueType() const;
+
+    //bool operator==(const IAttributeDefinition& rhs) const = 0;
+    //bool operator!=(const IAttributeDefinition& rhs) const = 0;
+
+protected:
+    TSharedPtr<dbcppp::IAttributeDefinition> AttributeDefinitionImpl;
+};
+
+//---------------------------------------------------------------------------------------
+class FSignal
+{
+public:
+    enum class EErrorCode : uint64_t
+    {
+        NoError,
+        MaschinesFloatEncodingNotSupported = 1,
+        MaschinesDoubleEncodingNotSupported = 2,
+        SignalExceedsMessageSize = 4,
+        WrongBitSizeForExtendedDataType = 8
+    };
+
+    enum class EMultiplexer
+    {
+        NoMux, MuxSwitch, MuxValue
+    };
+
+    enum class EByteOrder
+    {
+        BigEndian = 0,
+        LittleEndian = 1
+    };
+
+    enum class EValueType
+    {
+        Signed, Unsigned
+    };
+
+    enum class EExtendedValueType
+    {
+        Integer, Float, Double
+    };
+
+    const FString& Name() const;
+    EMultiplexer MultiplexerIndicator() const;
+    uint64_t MultiplexerSwitchValue() const;
+    uint64_t StartBit() const;
+    uint64_t BitSize() const;
+    EByteOrder ByteOrder() const;
+    EValueType ValueType() const;
+    double Factor() const;
+    double Offset() const;
+    double Minimum() const;
+    double Maximum() const;
+    const FString& Unit() const;
+    const FString& Receivers_Get(std::size_t i) const;
+    uint64_t Receivers_Size() const;
+    const FValueEncodingDescription& ValueEncodingDescriptions_Get(std::size_t i) const;
+    uint64_t ValueEncodingDescriptions_Size() const;
+    const FAttribute& AttributeValues_Get(std::size_t i) const;
+    uint64_t AttributeValues_Size() const;
+    const FString& Comment() const;
+    EExtendedValueType ExtendedValueType() const;
+    const FSignalMultiplexerValue& SignalMultiplexerValues_Get(std::size_t i) const;
+    uint64_t SignalMultiplexerValues_Size() const;
+
+    bool Error(EErrorCode code) const;
+
+    //bool operator==(const FSignal& rhs) const;
+    //bool operator!=(const FSignal& rhs) const;
+
+    inline uint64_t Decode(const void* bytes) const noexcept;
+    inline void Encode(uint64_t raw, void* buffer) const noexcept;
+
+    inline double RawToPhys(uint64_t raw) const noexcept;
+    inline uint64_t PhysToRaw(double phys) const noexcept;
+
+protected:
+    TSharedPtr<dbcppp::ISignal> SignalImpl;
+};
+
+//---------------------------------------------------------------------------------------
+class FSignalGroup
+{
+    uint64_t MessageId() const;
+    const FString& Name() const;
+    uint64_t Repetitions() const;
+    const FString& SignalNames_Get(std::size_t i) const;
+    uint64_t SignalNames_Size() const;
+
+    //DBCPPP_MAKE_ITERABLE(ISignalGroup, SignalNames, std::string);
+
+    //bool operator==(const ISignalGroup& rhs) const = 0;
+    //bool operator!=(const ISignalGroup& rhs) const = 0;
+
+protected:
+    TSharedPtr<dbcppp::ISignalGroup> SignalGroupImpl;
+};
+
+//---------------------------------------------------------------------------------------
+class FAttribute
+{
+    using hex_value_t = int64_t;
+    using value_t = std::variant<int64_t, double, FString>;
+
+    const FString& Name() const;
+    FAttributeDefinition::EObjectType ObjectType() const;
+    const value_t& Value() const;
+
+    //bool operator==(const FAttribute& rhs) const = 0;
+    //bool operator!=(const FAttribute& rhs) const = 0;
+
+protected:
+    TSharedPtr<dbcppp::IAttribute> AttributeImpl;
+};
+*/
+
+//---------------------------------------------------------------------------------------
+class FMessageSerializator
+{
+public:
+
+    FMessageSerializator(std::unique_ptr<dbcppp::IMessage> Impl);
+
+    uint64_t GetID() const;
+    const FString& GetName() const { return Name; }
+	const int64 GetMessageSize() const;
+    //const FString& GetTransmitter() const;
+    //const FString& GetMessageTransmitters(std::size_t i) const;
+    //uint64_t MessageTransmittersSize() const;
+    //const FSignal& GetSignals(std::size_t i) const;
+    //uint64_t GetNumSignals() const;
+    //const FAttribute& GetAttributeValues(std::size_t i) const;
+    //uint64_t GetNumAttributeValues() const;
+    const FString& GetComment() const { return Comment; }
+    //const FSignalGroup& GetSignalGroups(std::size_t i) const;
+    uint64_t GetNumSignalGroups() const;
+    //const FSignal* GetMuxSignal() const;
+
+    //bool operator==(const FMessageSerializator& message) const = 0;
+    //bool operator!=(const FMessageSerializator& message) const = 0;
+
+protected:
+    std::unique_ptr<dbcppp::IMessage> MessageImpl;
+
+    FString Name;
+    FString Comment;
+};
+
+bool LoadDBC(const FString& FileName, TMap<FString, TSharedPtr<dbc::FMessageSerializator>> & Map);
+
+}
diff --git a/Source/UnrealSoda/Public/Soda/DBGateway.h b/Source/UnrealSoda/Public/Soda/DBGateway.h
new file mode 100644
index 0000000..8737772
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/DBGateway.h
@@ -0,0 +1,136 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/SodaTypes.h"
+#include "Containers/Queue.h"
+#include "Soda/Misc/AsyncTaskManager.h"
+#include "bsoncxx/builder/stream/array.hpp"
+#include "bsoncxx/builder/stream/document.hpp"
+
+struct FVechicleSaveAddress;
+struct FLevelStateSlotDescription;
+
+namespace soda
+{
+
+enum class EDBGatewayStatus
+{
+	Connected,
+	Disabled,
+	Faild,
+	Connecting
+};
+
+/**
+ * Helper struct to hide the Bson defenitions
+ */
+struct FBsonDocument
+{
+	bsoncxx::builder::stream::document Document;
+
+	bsoncxx::builder::stream::document& operator *()
+	{
+		return Document;
+	}
+
+	bsoncxx::builder::stream::document& operator->()
+	{
+		return Document;
+	}
+};
+
+class FActorDatasetData;
+
+/**
+ * FDBGateway
+ */
+class FDBGateway
+{
+public:
+	static FDBGateway& Instance();
+	virtual ~FDBGateway() {}
+
+	virtual void Configure(const FString& URL, const FString& DatabaseName, bool bSync) = 0;
+	virtual void Disable() = 0;
+
+	static FString ScenarioStopReasonToString(EScenarioStopReason Reason);
+
+public:
+	EDBGatewayStatus GetStatus() const { return Status; }
+	bool IsConnected() const { return Status == EDBGatewayStatus::Connected; }
+	const FString& GetDatabaseName() const { return DatabaseName; }
+	const FString& GetLastError() const { return LastError; }
+	void SetLastError(const FString& InLastError) { LastError = InLastError; }
+
+public:
+	virtual bool BeginRecordDataset() = 0;
+	/** bImmediately - don't wait until all datasets are written to the DB */
+	virtual void EndRecordDataset(EScenarioStopReason Reasone, bool bImmediately = false) = 0;
+	bool IsDatasetRecording() const { return bIsDatasetRecording; }
+	int64 GetDatasetID() const { return  DatasetID; }
+	const FString& GetDatasetCollectionName() const { return DatasetCollectionName; }
+	virtual TSharedPtr<FActorDatasetData> CreateActorDataset(const FString& ActorName, const FString& ActorType, const FString & ActorClassName, const bsoncxx::builder::stream::document& Description) = 0;
+	void ClearDatasetsQueue();
+	int GetDasetesQueueNum() const;
+	void StallDatasetRecording();
+	bool IsDatasetRecordingStalled() const { return bIsDatasetRecordingStalled; }
+
+public:
+	virtual bool SaveVehicleData(const FString& VehicleName, const bsoncxx::document::value& Data) = 0;
+	virtual bsoncxx::document::view LoadVehicleData(const FString& VehicleName) = 0;
+	virtual bool DeleteVehicleData(const FString& VehicleName) = 0;
+	virtual bool LoadVehiclesList(TArray<FVechicleSaveAddress>& Addresses) = 0;
+
+public:
+	/** return ScenarioID or -1 if error */
+	virtual int64 SaveLevelData(const FLevelStateSlotDescription& Slot, const TArray<uint8>& ObjectBytes) = 0;
+	virtual bool LoadLevelData(int64 ScenarioID, TArray<uint8>& OutObjectBytes) = 0;
+	virtual bool DeleteLevelData(int64 ScenarioID) = 0;
+	virtual bool LoadLevelList(const FString& LevelName, bool bSortByDateTime, TArray<FLevelStateSlotDescription>& OutSlots) = 0;
+
+protected:
+	FDBGateway() {}
+	FString DatasetCollectionName;
+	FString DatabaseName;
+	EDBGatewayStatus Status = EDBGatewayStatus::Disabled;
+	bool bIsDatasetRecording = false;
+	int64 DatasetID = -1;
+	TArray<TSharedPtr<FActorDatasetData>> Datasets;
+	mutable FCriticalSection DatasetsLock;
+	FString LastError = "";
+	bool bIsDatasetRecordingStalled = false;
+};
+
+/**
+ * FActorDatasetData
+ */
+class FActorDatasetData
+{
+public:
+	FActorDatasetData(const FString& ActorName);
+	bsoncxx::builder::stream::document& GetRowDoc() { return RowDoc; }
+	void BeginRow();
+	void EndRow();
+	void PushAsync();
+	bool QueueIsEmpty() const { return DocQueue.IsEmpty(); }
+	TSharedPtr<bsoncxx::builder::stream::document> Dequeue();
+	void SetIsInvalidate() { bIsInvalidate = true; }
+	bool IsInvalidate() const { return bIsInvalidate; }
+	int GetQueueNum() const { return QueueNum; }
+
+protected:
+	TQueue<TSharedPtr<bsoncxx::builder::stream::document>> DocQueue;
+	bsoncxx::builder::stream::array CurrentArray;
+	bsoncxx::builder::stream::document RowDoc;
+	int DocPart = 0;
+	int DocsPerPart = 0;
+	FString ActorName;
+	FString DatasetCollectionName;
+	FString DatabaseName;
+	const int MaxDocsPerPart = 10000;
+	bool bIsInvalidate = false;
+	int QueueNum = 0;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/DBGatewayMongo.h b/Source/UnrealSoda/Public/Soda/DBGatewayMongo.h
new file mode 100644
index 0000000..48fbabe
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/DBGatewayMongo.h
@@ -0,0 +1,62 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/DBGateway.h"
+#include "mongocxx/instance.hpp"
+#include "mongocxx/pool.hpp"
+
+namespace soda
+{
+
+/**
+ * FDBGatewayMongo
+ */
+class FDBGatewayMongo : public FDBGateway
+{
+	friend FDBGateway;
+
+public:
+	virtual void Configure(const FString& URL, const FString& DatabaseName, bool bSync) override;
+	virtual void Disable() override;
+	virtual ~FDBGatewayMongo();
+
+public:
+	mongocxx::pool::entry GetConnection();
+	bsoncxx::stdx::optional<mongocxx::pool::entry> TryGetConnection();
+	bsoncxx::stdx::optional<mongocxx::pool::entry>& GetGameThreadClient() { return GameThreadClient; }
+	bsoncxx::stdx::optional<mongocxx::pool::entry>& GetMongoThreadClient() { return MongoThreadClient; }
+	TFuture<bool> AsyncTask(TUniqueFunction < bool()> Function, bool bSync = false);
+
+public:
+	virtual bool BeginRecordDataset() override;
+	virtual void EndRecordDataset(EScenarioStopReason Reasone, bool bImmediately = false) override;
+	virtual TSharedPtr<FActorDatasetData> CreateActorDataset(const FString& ActorName, const FString& ActorType, const FString& ActorClassName, const bsoncxx::builder::stream::document& Description) override;
+
+public:
+	virtual bool SaveVehicleData(const FString& VehicleName, const bsoncxx::document::value& Data) override;
+	virtual bsoncxx::document::view LoadVehicleData(const FString& VehicleName) override;
+	virtual bool DeleteVehicleData(const FString& VehicleName) override;
+	virtual bool LoadVehiclesList(TArray<FVechicleSaveAddress>& Addresses) override;
+
+public:
+	/** return ScenarioID or -1 if error */
+	virtual int64 SaveLevelData(const FLevelStateSlotDescription& Slot, const TArray<uint8>& ObjectBytes) override;
+	virtual bool LoadLevelData(int64 ScenarioID, TArray<uint8>& OutObjectBytes) override;
+	virtual bool DeleteLevelData(int64 ScenarioID) override;
+	virtual bool LoadLevelList(const FString& LevelName, bool bSortByDateTime, TArray<FLevelStateSlotDescription>& OutSlots) override;
+
+protected:
+	FDBGatewayMongo();
+	void Disable_MongoThread();
+	void Tick_MongoThread();
+
+	TUniquePtr<mongocxx::instance> Inst;
+	TUniquePtr<mongocxx::pool> Pool;
+	bsoncxx::stdx::optional<mongocxx::pool::entry> GameThreadClient;
+	bsoncxx::stdx::optional<mongocxx::pool::entry> MongoThreadClient;
+	soda::FAsyncTaskManager MongoTaskManager;
+	FRunnableThread* MongoTaskManagerThread = nullptr;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Editor/SodaSelection.h b/Source/UnrealSoda/Public/Soda/Editor/SodaSelection.h
new file mode 100644
index 0000000..dc6017a
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Editor/SodaSelection.h
@@ -0,0 +1,63 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "UObject/Object.h"
+#include "InputCoreTypes.h"
+#include "UnrealClient.h"
+#include "SodaSelection.generated.h"
+
+struct HActor;
+class AActor;
+class FViewport;
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API USodaSelection : public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual bool InputKey(const FInputKeyEventArgs& InEventArgs);
+	virtual bool InputAxis(FViewport* Viewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples = 1, bool bGamepad = false);
+	virtual void Tick(FViewport* Viewport);
+
+	UFUNCTION(BlueprintCallable, Category=SodaEditor)
+	virtual bool SelectActor(const AActor* Actor, const UPrimitiveComponent* PrimComponent);
+
+	UFUNCTION(BlueprintCallable, Category=SodaEditor)
+	virtual void UnselectActor();
+
+	UFUNCTION(BlueprintCallable, Category=SodaEditor)
+	virtual AActor* GetSelectedActor();
+
+	UFUNCTION(BlueprintCallable, Category=SodaEditor)
+	virtual AActor* GetHoveredActor();
+
+	UFUNCTION(BlueprintCallable, Category=SodaEditor)
+	void DrawDebugBoxes();
+
+	void RetargetWidgetForSelectedActor();
+
+	void FreeseSelectedActor();
+	void UnfreeseSelectedActor();
+
+protected:
+
+	static AActor * GetSodaActorUnderCursor(FViewport* Viewport);
+
+	UPROPERTY()
+	const AActor * SelectedActor = nullptr;
+
+	UPROPERTY()
+	const AActor* HoveredActor = nullptr;
+
+	//UPROPERTY()
+	//const AActor* PressedActor = nullptr;
+
+	//UPROPERTY()
+	//UPrimitiveComponent* HoverPrimitive = nullptr;
+
+	bool bIsTraking = false;
+	FVector2D MouseDelta;
+	bool bIsSelectedActorFreezed = false;
+};
diff --git a/Source/UnrealSoda/Public/Soda/ISodaActor.h b/Source/UnrealSoda/Public/Soda/ISodaActor.h
new file mode 100644
index 0000000..7fd679d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ISodaActor.h
@@ -0,0 +1,159 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "IEditableObject.h"
+#include "ISodaActor.generated.h"
+
+namespace FEditorUtils
+{
+	struct FViewportClick;
+}
+
+class SWidget;
+class USodaGameViewportClient;
+
+/**
+ * FSodaActorDescriptor
+ */
+
+USTRUCT()
+struct FSodaActorDescriptor
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, Category = "Soda Actor Descriptor")
+	FString DisplayName;
+
+	UPROPERTY(EditAnywhere, Category = "Soda Actor Descriptor")
+	FString Category = TEXT("Default");
+
+	UPROPERTY(EditAnywhere, Category = "Soda Actor Descriptor")
+	FString SubCategory;
+
+	UPROPERTY(EditAnywhere, Category = "Soda Actor Descriptor")
+	FName Icon = TEXT("ClassIcon.Actor");
+
+	UPROPERTY(EditAnywhere, Category = "Soda Actor Descriptor")
+	bool bAllowTransform = false;
+
+	UPROPERTY(EditAnywhere, Category = "Soda Actor Descriptor")
+	bool bAllowSpawn = false;
+
+	UPROPERTY(EditAnywhere, Category = "Soda Actor Descriptor")
+	FVector SpawnOffset;
+};
+
+/**
+ * USodaActor
+ * The "Pinned Actor" means the actor SaveGame serialization will be carried over between different levels
+ */
+UINTERFACE(BlueprintType, Blueprintable, meta=(RuntimeMetaData))
+class UNREALSODA_API USodaActor: public UEditableObject
+{
+	GENERATED_BODY()
+};
+
+class UNREALSODA_API ISodaActor: public IEditableObject
+{
+	GENERATED_BODY()
+
+public:
+	/** Called  when the actor was selected in the viewport */
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Soda Actor")
+	void OnSelect(const UPrimitiveComponent* PrimComponent);
+
+	/** Called  when the actor was unselected in the viewport */
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Soda Actor")
+	void OnUnselect();
+
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Soda Actor")
+	void OnHover();
+
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Soda Actor")
+	void OnUnhover();
+
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Soda Actor")
+	void OnComponentHover(const UPrimitiveComponent* PrimComponent);
+
+	UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category = "Soda Actor")
+	void OnComponentUnhover(const UPrimitiveComponent* PrimComponent);
+
+	UFUNCTION(BlueprintImplementableEvent, meta=(DisplayName = "ScenarioBegin"))
+	void ReceiveScenarioBegin();
+
+	UFUNCTION(BlueprintImplementableEvent, meta=(DisplayName = "ScenarioEnd"))
+	void ReceiveScenarioEnd();
+
+	/** Get actor descriptor for viewport. Called from the CDO object */
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const { return nullptr; }
+
+	/** Try to pin/unpin actor. Typically this method invokes UI elements. Retrun true if alloes pin/unpin actor */
+	virtual bool OnSetPinnedActor(bool bIsPinnedActor) { return false; }
+
+	/** Is actor pinned? */
+	virtual bool IsPinnedActor() const { return false; }
+
+	/** Try save pinned actor */
+	virtual bool SavePinnedActor() { return false; }
+
+	/** Spawn new pinned actor from SlotName. Can be called from the CDO object */
+	virtual AActor* LoadPinnedActor(UWorld* World, const FTransform & Transform, const FString& SlotName, bool bForceCreate, FName DesireName = NAME_None) const { return nullptr; }
+
+	/** Evry pinned actor have its own unique name for save */
+	virtual FString GetPinnedActorSlotName() const { return ""; }
+
+	/** Evry pinned actor have its own unique name for UI. This is usually a shorter name of GetPinnedActorSlotName() */
+	virtual FString GetPinnedActorName() const { return ""; }
+
+	/** Rename pinned actor slot name */
+	virtual bool RenamePinnedActor(const FString& NewSlotName) { return false; }
+
+	/** Actor has been modified and needs to be saved */
+	virtual bool IsDirty() { return bIsDirty; }
+
+	/** Set the "dirty flag" */
+	virtual void MarkAsDirty();
+
+	/** Clear the "dirty flag" */
+	virtual void ClearDirty() { bIsDirty = false; }
+
+	/** Called when the scenario begun */
+	virtual void ScenarioBegin();
+
+	/** Called when the scenario ended */
+	virtual void ScenarioEnd();
+
+	virtual AActor* AsActor();
+	virtual const AActor* AsActor() const;
+
+	virtual bool ShowSelectBox() const { return true; }
+
+	virtual void SetActorHiddenInScenario(bool bHiddenInScenario) {}
+	virtual bool GetActorHiddenInScenario() const { return false; }
+
+	// TODO: may by add these in the future
+	//virtual void DrawVisualization(USodaGameViewportClient* ViewportClient, const FSceneView* View, FPrimitiveDrawInterface* PDI) {}
+	//virtual bool HandleClick(USodaGameViewportClient* ViewportClient, UActorComponent* ActorComponent, const FEditorUtils::FViewportClick& Click) { return false; }
+	//virtual bool GetWidgetLocation(const USodaGameViewportClient* ViewportClient, FVector& OutLocation) const { return false; }
+	//virtual bool GetCustomInputCoordinateSystem(const USodaGameViewportClient* ViewportClient, FMatrix& OutMatrix) const { return false; }
+	//virtual bool HandleInputDelta(USodaGameViewportClient* ViewportClient, FViewport* Viewport, FVector& DeltaTranslate, FRotator& DeltaRotate, FVector& DeltaScale) { return false; }
+	//virtual bool HandleInputKey(USodaGameViewportClient* ViewportClient, FViewport* Viewport, FKey Key, EInputEvent Event) { return false; }
+	//virtual void StartEditing() {}
+	//virtual void EndEditing() {}
+	//virtual TSharedPtr<SWidget> GenerateContextMenu() const { return SNullWidget::NullWidget; }
+	virtual void InputWidgetDelta(const USceneComponent* WidgetTargetComponent, FTransform & NewWidgetTransform) {}
+
+public:
+	/* Override from IEditableObject */
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	//virtual void RuntimePreEditChange(FProperty* PropertyAboutToChange) override;
+	//virtual void RuntimePreEditChange(FEditPropertyChain& PropertyAboutToChange) override;
+
+protected:
+	bool bIsDirty = false;
+
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/ISodaVehicleComponent.h b/Source/UnrealSoda/Public/Soda/ISodaVehicleComponent.h
new file mode 100644
index 0000000..df1b39d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ISodaVehicleComponent.h
@@ -0,0 +1,330 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Interface.h"
+#include "Templates/SubclassOf.h"
+#include "Soda/SodaTypes.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "Soda/Misc/PhysBodyKinematic.h"
+#include "Soda/Misc/Time.h"
+#include "IEditableObject.h"
+#include "ISodaVehicleComponent.generated.h"
+
+class SWidget;
+class FSceneView;
+class FPrimitiveDrawInterface;
+class UCanvas;
+class ASodaVehicle;
+class UActorComponent;
+
+namespace soda
+{
+	class FActorDatasetData;
+	struct FBsonDocument;
+}
+
+enum class EVehicleComponentDeferredTask
+{
+	None,
+	Activate,
+	Deactivate
+};
+
+UENUM(BlueprintType)
+enum class EVehicleComponentActivation : uint8
+{
+	None,
+	OnBeginPlay,
+	OnStartScenario
+};
+
+/**
+ * FVehicleComponentGUI
+ * Setting for generate the GUI
+ */
+USTRUCT(BlueprintType)
+struct FVehicleComponentGUI
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = GUI)
+	FString Category = TEXT("Default");
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = GUI)
+	FString ComponentNameOverride = TEXT("");
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = GUI)
+	bool bIsPresentInAddMenu = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = GUI)
+	bool bIsSubComponent = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = GUI)
+	FName IcanName = TEXT("SodaIcons.Soda");
+
+	UPROPERTY(BlueprintReadOnly, Category = GUI, SaveGame)
+	int Order = 0;
+
+	UPROPERTY(BlueprintReadOnly, Category = GUI, SaveGame)
+	bool bIsDeleted = false;
+};
+
+/**
+ * FVehicleComponentCommon
+ */
+USTRUCT(BlueprintType)
+struct FVehicleComponentCommon
+{
+	GENERATED_USTRUCT_BODY()
+
+	/** if true component will activated after BeginPlay() */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleComponent, SaveGame)
+	EVehicleComponentActivation Activation = EVehicleComponentActivation::None;
+
+	/**
+	  * The Topology Component means that other vehicle components may depend on this component.
+	  * This means that if this component is added, removed, renamed or activated, all other components of the vehicle will be reactivated.
+	  */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent)
+	bool bIsTopologyComponent = false;
+
+	/** 
+	 * Component will update on frequency FPS/Divider.
+	 * FPSDivider:
+	 * 1 - process every tick
+	 * 2 - process 1st tick; 2nd - skip
+	 * 3 - process 1st tick; 2nd, 3rd - skip
+	 * 4 - process 1st tick; 2nd, 3rd, 4th - skip
+	 * ...
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleComponent, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int RealtimeTickDivider = 1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleComponent, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int NonRealtimeTickDivider = 3;
+
+	/** 
+	  * Whether to write a dataset for this component. Valid only if this component supports dataset writing.
+	  * See USodaVehicleComponent::OnPushDataset().
+	  */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = VehicleComponent)
+	bool bWriteDataset = false;
+
+	/** Whether to allow this sensor to display any debug information. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebugCanvas = false;
+
+	/** Only one component of this class can be active */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = VehicleComponent)
+	UClass * UniqueVehiceComponentClass = nullptr;
+
+	/** Any parent allowed (not only ASodaVehicle)*/
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = VehicleComponent)
+	bool bAnyParentAllowed = false;
+};
+
+/**
+ * FVehicleComponentTick
+ */
+USTRUCT(BlueprintType)
+struct FVehicleComponentTick
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent)
+	bool bAllowVehiclePrePhysTick = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent)
+	bool bAllowVehiclePostPhysTick = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent)
+	bool bAllowVehiclePostDeferredPhysTick = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent)
+	EVehicleComponentPrePhysTickGroup PrePhysTickGroup = EVehicleComponentPrePhysTickGroup::TickGroup0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent)
+	EVehicleComponentPostPhysTickGroup PostPhysTickGroup = EVehicleComponentPostPhysTickGroup::TickGroup0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent)
+	EVehicleComponentPostDeferredPhysTickGroup PostPhysDeferredTickGroup = EVehicleComponentPostDeferredPhysTickGroup::TickGroup0;
+};
+
+/**
+ * USodaVehicleComponent
+ */
+UINTERFACE(BlueprintType, meta = (CannotImplementInterfaceInBlueprint, RuntimeMetaData))
+class UNREALSODA_API USodaVehicleComponent : public UEditableObject
+{
+	GENERATED_BODY()
+};
+
+class UNREALSODA_API ISodaVehicleComponent : public IEditableObject
+{
+	friend ASodaVehicle;
+
+	GENERATED_BODY()
+
+public:
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual UActorComponent* AsActorComponent() = 0;
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual FVehicleComponentGUI & GetVehicleComponentGUI() = 0;
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual FVehicleComponentCommon& GetVehicleComponentCommon() = 0;
+
+	virtual const FVehicleComponentGUI & GetVehicleComponentGUI() const = 0;
+	virtual const FVehicleComponentCommon& GetVehicleComponentCommon() const = 0;
+
+	/** Get a pointer to the vehicle on which this component is located. */
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual ASodaVehicle * GetVehicle() const = 0;
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual bool DoesVehicleSupport(TSubclassOf<ASodaVehicle> VehicleClass) const { return true; }
+
+	/** Returns whether the VehicleComponent is active or not */
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual bool IsVehicleComponentActiveted() const { return bIsVehicleComponentActiveted; }
+
+	/** The component can be activated only after BeginPlay() */
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent, meta=(ScenarioAction))
+	virtual void ActivateVehicleComponent();
+
+	/** If component is activated then it will be automatically deactivated before EndPlay() */
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent, meta = (ScenarioAction))
+	virtual void DeactivateVehicleComponent();
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent, meta = (ScenarioAction))
+	virtual void Toggle();
+
+	/** This description will be displayed in the UI (Vehicle Components List) */
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual void GetRemark(FString & Info) const { Info = ""; }
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual EVehicleComponentHealth GetHealth() const { return  Health; }
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual void SetHealth(EVehicleComponentHealth NewHealth, const FString & AddMessage="");
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual bool IsVehicleComponentInitializing() const { return false; }
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual void AddDebugMessage(EVehicleComponentHealth MessageHealth, const FString& Message);
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual bool HealthIsWorkable() const { return !IsVehicleComponentInitializing() && (GetHealth() == EVehicleComponentHealth::Ok || GetHealth() == EVehicleComponentHealth::Warning); }
+
+	/** Returns whether this component was instanced from a component/subobject template */
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual bool IsDefaultComponent();
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual void RemoveVehicleComponent();
+
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual bool RenameVehicleComponent(const FString & NewName);
+
+	/** Is component should tick on current frame according to FpsDivider */
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	virtual bool IsTickOnCurrentFrame() const;
+
+	virtual void MarkAsDirty();
+
+	/**
+	 * Draw on the debug canvase
+	 */
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos);
+
+	virtual void ScenarioBegin() {}
+
+	virtual void ScenarioEnd() {}
+
+	virtual void DrawSelection(const FSceneView* View, FPrimitiveDrawInterface* PDI);
+
+	EVehicleComponentDeferredTask GetDeferredTask() const { return DeferredTask; }
+	void SetDeferredTask(EVehicleComponentDeferredTask Task) { DeferredTask = Task; }
+
+	bool IsVehicleComponentSelected() const;
+
+protected:
+	/* Override from IEditableObject */
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+
+protected:
+	virtual void OnRegistreVehicleComponent() {}
+	virtual void OnPreActivateVehicleComponent() {}
+	virtual bool OnActivateVehicleComponent();
+	virtual void OnDeactivateVehicleComponent();
+
+	/** 
+	 * Callen during scenario playing if the datset is recording for this vehicle.
+	 * This function called in the vehicle physic thread.
+	 */
+	virtual void OnPushDataset(soda::FActorDatasetData& Dataset) const {}
+
+	/**
+	 * Callen after ScenarioPlay()
+	 * Here you can fill in the descriptor that will be written to the database
+	 */
+	virtual void GenerateDatasetDescription(soda::FBsonDocument& Doc) const {}
+
+
+private:
+	EVehicleComponentHealth Health = EVehicleComponentHealth::Disabled;
+	EVehicleComponentDeferredTask DeferredTask = EVehicleComponentDeferredTask::None;
+	bool bIsVehicleComponentActiveted = false;
+	int TickDivider = 1;
+	TArray <FString> DebugCanvasErrorMessages;
+	TArray <FString> DebugCanvasWarningMessages;
+};
+
+
+/**
+ * UVehicleTickablObject
+ */
+UINTERFACE(meta = (CannotImplementInterfaceInBlueprint, RuntimeMetaData))
+class UNREALSODA_API UVehicleTickablObject : public UInterface
+{
+	GENERATED_BODY()
+};
+
+class UNREALSODA_API IVehicleTickablObject
+{
+	GENERATED_BODY()
+
+public:
+
+	virtual FVehicleComponentTick& GetVehicleComponentTick() = 0;
+
+	const virtual FVehicleComponentTick& GetVehicleComponentTick() const = 0;
+
+	virtual bool IsTickAllowed() const { return true; }
+
+
+	/**
+	 * Called just before stimulation step.
+	 * For some implementations it can be called not in real time (For example, for PhysX Vehicle model when calculating sub-steps).
+	 */
+	virtual void PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) {}
+
+	/**
+	 * Called just after stimulation step .
+	 * For some implementations it can be called not in real time (For example, for PhysX Vehicle model when calculating sub-steps).
+	 */
+	virtual void PostPhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) {}
+
+	/**
+	  * Called just after PostPhysicSimulation().
+	  * This function call must correspond to real time.
+	  */
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) {}
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/IToolActor.h b/Source/UnrealSoda/Public/Soda/IToolActor.h
new file mode 100644
index 0000000..67939c3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/IToolActor.h
@@ -0,0 +1,73 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/ISodaActor.h"
+#include "UObject/Interface.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "IToolActor.generated.h"
+
+
+/**
+ * UPinnedToolActorsSaveGame
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UPinnedToolActorsSaveGame : public USaveGame
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(BlueprintReadOnly, Category = ToolActorsSaveGame, SaveGame)
+	UClass* Class;
+
+	TMap<FString, FActorRecord> ActorRecords;
+
+	virtual void Serialize(FArchive& Ar) override
+	{
+		Super::Serialize(Ar);
+		Ar << ActorRecords;
+	}
+};
+
+/**
+ * IToolActor
+ * IToolActor implement the "Pinned Actor" logic inherited from "ISodaActor":
+ *   - Using binary serialization 
+ *   - UGameplayStatics::SaveGameToSlot() and UGameplayStatics::LoadGameFromSlot() for save/load
+ *   - One binary savegame slot (see UPinnedToolActorsSaveGame) for all pinned actor records for one actor class
+ *   - SPinToolActorWindow implements UI for IToolActor
+ */
+UINTERFACE(BlueprintType, Blueprintable, meta = (RuntimeMetaData))
+class UNREALSODA_API UToolActor : public USodaActor
+{
+	GENERATED_BODY()
+};
+
+class UNREALSODA_API IToolActor : public ISodaActor
+{
+	GENERATED_BODY()
+
+public:
+	virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	virtual bool IsPinnedActor() const override;
+	virtual bool SavePinnedActor() override;
+	virtual AActor* LoadPinnedActor(UWorld* World, const FTransform& Transform, const FString& SlotName, bool bForceCreate, FName DesireName = NAME_None) const override;
+	virtual FString GetPinnedActorSlotName() const override;
+	virtual FString GetPinnedActorName() const override;
+
+	/** It is necessary to call this method in any descendants in the Serialize(FArchive& Ar) method */
+	virtual void ToolActorSerialize(FArchive& Ar); 
+
+public:
+	virtual bool PinActor(const FString& SlotName);
+	virtual void UnpinActor();
+	virtual bool DeserializePinnedActor(const FString& SlotName);
+	virtual UPinnedToolActorsSaveGame* GetSaveGame() const; //May be called in the CDO object
+	virtual IToolActor* FindPinnedActorBySlotName(const UWorld * World, const FString& SlotName) const; // May be called in the CDO object 
+	virtual bool DeleteSlot(const UWorld* World, const FString& SlotName) const; // May be called in the CDO object 
+	virtual bool SaveAll() const;
+
+protected:
+	FString ToolActorSlotName;
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/LevelState.h b/Source/UnrealSoda/Public/Soda/LevelState.h
new file mode 100644
index 0000000..1e889c7
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/LevelState.h
@@ -0,0 +1,187 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/SaveGame.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "Soda/Misc/LLConverter.h"
+#include "IEditableObject.h"
+#include "LevelState.generated.h"
+
+class ASodaActorFactory;
+class ASodaVehicle;
+
+UENUM(BlueprintType)
+enum class ELeveSlotSource : uint8
+{
+	NoSlot,
+	Local,
+	Remote,
+	NewSlot
+};
+
+/*
+ * FLevelStateSlotDescription
+ */
+USTRUCT(BlueprintType)
+struct FLevelStateSlotDescription
+{
+	GENERATED_BODY()
+
+	/** Valid only if SlotSource ==  Local */
+	UPROPERTY(BlueprintReadOnly, Category = LevelStateSlotDescription)
+	int SlotIndex = -1;
+
+	/** Valid only if SlotSource ==  Remote */
+	UPROPERTY(BlueprintReadOnly, Category = LevelStateSlotDescription)
+	int64 ScenarioID = -1;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelStateSlotDescription)
+	FString Description;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelStateSlotDescription)
+	FDateTime DateTime;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelStateSlotDescription)
+	FString LevelName;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelStateSlotDescription)
+	ELeveSlotSource SlotSource = ELeveSlotSource::NoSlot;
+};
+
+/*
+ * ULevelSaveGame
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ULevelSaveGame : public USaveGame
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(BlueprintReadOnly, Category = LevelSaveGame, SaveGame)
+	FString Description;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelSaveGame, SaveGame)
+	FDateTime DateTime;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelSaveGame, SaveGame)
+	FString LevelName;
+
+	FActorRecord LevelDataRecord;
+
+public:
+	virtual void Serialize(FArchive& Ar) override;
+};
+
+/*
+ * ALevelState
+ */
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ALevelState : 
+	public AActor,
+	public IEditableObject
+{
+	GENERATED_BODY()
+
+public:
+	ALevelState();
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = LevelState)
+	TArray<AActor*> AdditionalActorsForSerialize;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = LevelState)
+	TSubclassOf<ASodaActorFactory> DefaultActorFactoryClass;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelSaveGame)
+	FLevelStateSlotDescription Slot;
+
+	UPROPERTY(BlueprintReadOnly, Category = LevelState)
+	ASodaActorFactory * ActorFactory = nullptr;
+
+protected:
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, SaveGame, Category = LevelState, meta = (EditInRuntime))
+	FLLConverter LLConverter;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	bool SaveLevelRemotlyAs(int64 ScenarioID, const FString& Description);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	bool SaveLevelLocallyAs(int SlotIndex, const FString& Description);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	bool ReSaveLevel();
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static bool ReloadLevelEmpty(const UObject* WorldContextObject);
+
+	/**
+	 * SlotIndex == -1 -  Find & open last saved slot
+	 */
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static bool ReloadLevelFromSlotLocally(const UObject* WorldContextObject, int SlotIndex = -1); 
+
+	/**
+	 * SlotIndex == -1 -  Find & open last saved slot
+	 */
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static bool ReloadLevelFromSlotRemotly(const UObject* WorldContextObject, int64 ScenarioID = -1);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static ALevelState* CreateOrLoad(const UObject* WorldContextObject, UClass * DefaultClass);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static bool DeleteLevelLocally(const UObject* WorldContextObject, int SlotIndex);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static bool DeleteLevelRemotly(const UObject* WorldContextObject, int64 ScenarioID);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static bool GetLevelSlotsLocally(const UObject* WorldContextObject, TArray<FLevelStateSlotDescription> & Slots, bool bSortByDateTime = false);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	static bool GetLevelSlotsRemotly(const UObject* WorldContextObject, TArray<FLevelStateSlotDescription> & Slots, bool bSortByDateTime = false);
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	void FinishLoadLevel();
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	virtual bool IsDirty() { return bIsDirty; }
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	virtual void MarkAsDirty() { bIsDirty = true; }
+
+	UFUNCTION(BlueprintCallable, Category = LevelState)
+	virtual void ClearLevel();
+
+	const FLLConverter& GetLLConverter() const { return LLConverter; }
+	void SetGeoReference(double Lat, double Lon, double Alt, const FVector& OrignShift = FVector{ 0, 0, 0 }, float OrignDYaw = 0);
+
+	static ALevelState* Get();
+	static ALevelState* GetChecked();
+
+	virtual ULevelSaveGame* CreateSaveGame(bool bSerializePinnedActorsAsUnpinned);
+
+public:
+	virtual void Serialize(FArchive& Ar) override;
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	//virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+
+public:
+	FActorRecord SpectatorActorRecord;
+	FActorRecord ActorFactoryRecord;
+	TArray<FActorRecord> AdditionalActorRecords;
+
+protected:
+	static FString GetLocalSaveSlotName(const UObject* WorldContextObject, int SlotIndex);
+	/* SlotIndex == -1 - load last saved slot */
+	static ULevelSaveGame* LoadSaveGameLocally(const UObject* WorldContextObject, int & SlotIndex);
+	/* SlotIndex == -1 - load last saved slot */
+	static ULevelSaveGame* LoadSaveGameRemotly(const UObject* WorldContextObject, int64 & ScenarioID);
+
+	static FLevelStateSlotDescription StaticSlot;
+
+protected:
+	bool bIsDirty = false;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Misc/AsyncTaskManager.h b/Source/UnrealSoda/Public/Soda/Misc/AsyncTaskManager.h
new file mode 100644
index 0000000..7df7a19
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/AsyncTaskManager.h
@@ -0,0 +1,182 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "HAL/PlatformTime.h"
+#include "HAL/PlatformProcess.h"
+#include "HAL/Runnable.h"
+#include "HAL/ThreadSafeBool.h"
+#include "HAL/Event.h"
+#include "Async/Future.h"
+#include "Misc/SingleThreadRunnable.h"
+#include "Templates/SharedPointer.h"
+
+namespace soda 
+{
+
+class FAsyncTaskManager;
+
+/* ************************************************************************************
+ * FAsyncTask
+ *************************************************************************************/
+class FAsyncTask
+{
+public:
+
+	FAsyncTask()
+	{
+		StartTime = FPlatformTime::Seconds();
+	}
+
+	double GetElapsedTime()
+	{
+		return FPlatformTime::Seconds() - StartTime;
+	}
+
+	virtual ~FAsyncTask() {}
+	virtual FString ToString() const = 0;
+	virtual void Initialize() {}
+	virtual bool IsDone() const = 0;
+	virtual bool WasSuccessful() const = 0;
+	virtual void Tick() = 0;
+
+protected:
+	double StartTime;
+};
+
+/* ************************************************************************************
+ * FDoubleBufferAsyncTask
+ *************************************************************************************/
+template <class T>
+class FDoubleBufferAsyncTask : public FAsyncTask
+{
+public:
+	FDoubleBufferAsyncTask()
+	{
+		FrontTask = MakeShareable(new T());
+		BackTask = MakeShareable(new T());
+	}
+
+	virtual FString ToString() const override { return BackTask->ToString(); }
+	virtual bool IsDone() const override { return bIsDone; }
+	void Start() { bIsDone = false; }
+	void Finish() { bIsDone = true; }
+	virtual bool WasSuccessful() const override { return true; }
+
+	virtual void Tick() override
+	{
+		if (!BackTask->IsDone())
+		{
+			BackTask->Tick();
+		}
+
+		if (BackTask->IsDone() && !FrontTask->IsDone())
+		{
+			FScopeLock ScopeLock(&TasksLock);
+			std::swap(FrontTask, BackTask);
+		}
+
+		if (!BackTask->IsDone())
+		{
+			BackTask->Tick();
+		}
+	}
+
+	TSharedRef <T> LockFrontTask()
+	{
+		TasksLock.Lock();
+		return FrontTask.ToSharedRef();
+	}
+
+	void UnlockFrontTask() { TasksLock.Unlock(); }
+
+
+protected:
+	FCriticalSection TasksLock;
+	TSharedPtr<T> FrontTask;
+	TSharedPtr<T> BackTask;
+	bool bIsDone = false;
+};
+
+/* ************************************************************************************
+ * FAsyncTaskManager
+ *************************************************************************************/
+
+class UNREALSODA_API FAsyncTaskManager : public FRunnable, FSingleThreadRunnable 
+{
+public:
+
+	FAsyncTaskManager(uint32 InPollingInterval = 50):
+		PollingInterval(InPollingInterval)
+	{}
+	virtual ~FAsyncTaskManager() 
+	{}
+
+	virtual bool Init() override;
+	virtual uint32 Run() override;
+	virtual void Stop() override;
+	virtual void Exit() override;
+	virtual class FSingleThreadRunnable* GetSingleThreadInterface() override { return this; }
+
+	template<class T>
+	bool AddTask(TSharedPtr <T>& NewTask)
+	{
+		TSharedPtr<FAsyncTask> TaskCast = StaticCastSharedPtr<FAsyncTask>(NewTask);
+		if (TaskCast)
+		{
+			NewTask->Initialize();
+			FScopeLock ScopeLock(&TasksLock);
+			TaskQueue.Add(TaskCast);
+			return true;
+		}
+		return false;
+	}
+
+	template<class T>
+	bool RemoteTask(TSharedPtr <T>& Task, bool Sync = true)
+	{
+		TSharedPtr<FAsyncTask> TaskCast = StaticCastSharedPtr<FAsyncTask>(Task);
+		int Removed = 0;
+		if (Sync)
+		{
+			FScopeLock ScopeLock(&TickLock);
+			Removed = TaskQueue.Remove(TaskCast);
+		}
+		else
+		{
+			FScopeLock ScopeLock(&TasksLock);
+			Removed = TaskQueue.Remove(TaskCast);
+		}
+		/*
+		if (Removed < 1)
+		{
+			UE_LOG(LogSoda, Warning, TEXT("FAsyncTaskManager::RemoteTask() Can't find task for remove"));
+		}
+		*/
+
+		return Removed > 0;
+	}
+
+	void Trigger() { WorkEvent->Trigger(); }
+
+	void ClearQueue();
+
+	FCriticalSection TasksLock;
+	FCriticalSection TickLock;
+
+protected:
+	virtual void Tick() override;
+
+	FEvent* WorkEvent = nullptr;
+	uint32 PollingInterval;
+	FThreadSafeBool bRequestingExit = false;
+	TArray< TSharedPtr <FAsyncTask>> TaskQueue; // TODO: Use TQueue without TasksLock
+};
+
+UNREALSODA_API TSharedPtr<FAsyncTask> AsyncTaskLoop(FAsyncTaskManager& AsyncTaskManager, TUniqueFunction < void()> Function);
+UNREALSODA_API TFuture<bool> AsyncTask(FAsyncTaskManager& AsyncTaskManager, TUniqueFunction < bool()> Function, bool bSync = false);
+
+} // namespace soda
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Misc/AutosarCRC.h b/Source/UnrealSoda/Public/Soda/Misc/AutosarCRC.h
new file mode 100644
index 0000000..ee4e890
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/AutosarCRC.h
@@ -0,0 +1,33 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+
+/**
+ * @brief Calculate 8-bit SAE J1850 CRC
+ * @areqby SWS_Crc_00030
+ * @areqby SWS_Crc_00032
+ * @param[in] DataPtr Pointer to start address of data block to be calculated.
+ * @param[in] Length Length of data block to be calculated in bytes.
+ * @param[in] StartValue8 Start value when the algorithm starts.
+ * @param[in] IsFirstCall FALSE: Crc_StartValue8 is interpreted to be the return value of the previous function call. TRUE: start from initial value, ignore Crc_StartValue8.
+ * @return For definitions for return values, see SWS_E2E_00047.
+ * @retval 8-bit SAE J1850 CRC
+ */
+uint8_t UNREALSODA_API CalculateCRC8 (const uint8_t* DataPtr, uint32_t Length, uint8_t StartValue8, bool IsFirstCall);
+
+/**
+ * @brief Calculate 16-bit CCITT-FALSE CRC
+ * @areqby SWS_Crc_00015
+ * @param[in] DataPtr Pointer to start address of data block to be calculated.
+ * @param[in] Length Length of data block to be calculated in bytes.
+ * @param[in] StartValue16 Start value when the algorithm starts.
+ * @param[in] IsFirstCall FALSE: Crc_StartValue16 is interpreted to be the return value of the previous function call. TRUE: start from initial value, ignore Crc_StartValue8.
+ * @return For definitions for return values, see SWS_E2E_00047.
+ * @retval 16-bit CCITT-FALSE CRC
+ */
+uint16_t UNREALSODA_API CalculateCRC16 (const uint8_t* DataPtr, uint32_t Length, uint16_t StartValue16, bool IsFirstCall);
diff --git a/Source/UnrealSoda/Public/Soda/Misc/AutosarCRC2.h b/Source/UnrealSoda/Public/Soda/Misc/AutosarCRC2.h
new file mode 100644
index 0000000..fef5609
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/AutosarCRC2.h
@@ -0,0 +1,20 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+/**
+ * @brief Calculate 8-bit SAE J1850 CRC
+ * @areqby SWS_Crc_00030
+ * @areqby SWS_Crc_00032
+ * @param[in] DataPtr Pointer to start address of data block to be calculated.
+ * @param[in] Length Length of data block to be calculated in bytes.
+ * @param[in] StartValue8 Start value when the algorithm starts.
+ * @param[in] IsFirstCall FALSE: Crc_StartValue8 is interpreted to be the return value of the previous function call. TRUE: start from initial value, ignore Crc_StartValue8.
+ * @return For definitions for return values, see SWS_E2E_00047.
+ * @retval 8-bit SAE J1850 CRC
+ */
+uint8_t UNREALSODA_API CalculateCRC8_2(const uint8_t* DataPtr, uint32_t Length, uint8_t StartValue8, bool IsFirstCall);
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/BitStream.hpp b/Source/UnrealSoda/Public/Soda/Misc/BitStream.hpp
new file mode 100644
index 0000000..71d54f4
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/BitStream.hpp
@@ -0,0 +1,177 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "HAL/UnrealMemory.h"
+
+class FBitStream
+{
+public:
+	TArray<uint8> Buf;
+
+	inline void SetOffset(size_t BitOffsetIn)
+	{
+		Offset = BitOffsetIn;
+	}
+
+	inline size_t GetOffset() const
+	{
+		return Offset;
+	}
+
+	template<class T>
+	inline void SetBits(T Data, size_t BitLengthIn)
+	{
+		SetBits(&Data, BitLengthIn);
+	}
+
+	template<class T>
+	inline void SetBits(T* Data, size_t BitLengthIn)
+	{
+		if (BitLengthIn > 56)
+		{
+			check(BitLengthIn <= 64);
+			SetBits56(Data, Offset, 56);
+			SetBits56(&((uint8*)Data)[7], Offset, BitLengthIn - 56);
+		}
+		else
+		{
+			SetBits56(Data, Offset, BitLengthIn);
+		}
+	}
+
+	template<class T>
+	inline void SetBytes(T* Data, size_t Num)
+	{
+		check(Offset % 8 == 0);
+		Buf.SetNum(Offset / 8 + Num + 1, false);
+		FMemory::Memcpy(&Buf[Offset / 8], Data, Num);
+		Offset += Num * 8;
+	}
+
+	template<class T>
+	inline void SetBytes(T Data, size_t Num)
+	{
+		SetBytes(&Data, Num);
+	}
+
+	template<class T>
+	inline T GetBits(size_t BitLengthIn)
+	{
+		if (BitLengthIn > 56)
+		{
+			check(BitLengthIn <= 64);
+			uint64 Tmp = GetBits56<uint64>(Offset, 56) | (GetBits56<uint64>(Offset, BitLengthIn - 56) << 56);
+			return *(T*)&Tmp;
+		}
+		else
+		{
+			return GetBits56<T>(Offset, BitLengthIn);
+		}
+	}
+
+	inline void GetBytes(void* Dst, size_t Num)
+	{
+		check(Offset % 8 == 0);
+		FMemory::Memcpy(Dst, &Buf[Offset / 8], Num);
+		Offset += Num * 8;
+	}
+
+	template<class T>
+	inline T GetBytes(size_t Num)
+	{
+		check(Offset % 8 == 0);
+		T Ret = 0;
+		FMemory::Memcpy(&Ret, &Buf[Offset / 8], Num);
+		Offset += Num * 8;
+		return Ret;
+	}
+
+	/*
+	* The maximum size of the bit's field (BitLengthIn) is 56 bits.
+	*/
+	inline void SetBits56(void* Data, size_t BitOffsetIn, size_t BitLengthIn)
+	{
+		check(BitLengthIn <= 56);
+		Buf.SetNum((BitOffsetIn + BitLengthIn) / 8 + 1, false);
+		uint8 Off = BitOffsetIn % 8;
+		uint64 Mask = 0xFFFFFFFFFFFFFFFF >> (64 - BitLengthIn - Off);
+		uint64& Ref = *(uint64*)&Buf[BitOffsetIn / 8];
+		Ref &= Mask; //Clear;
+		Ref |= ((*(uint64*)Data) << Off) & Mask;
+		Offset = BitOffsetIn + BitLengthIn;
+	}
+
+	/*
+	* The maximum size of the bit's field (BitLengthIn) is 56 bits.
+	*/
+	template<class T>
+	inline T GetBits56(size_t BitOffsetIn, size_t BitLengthIn)
+	{
+		check(BitLengthIn <= 56);
+		uint8 Off = BitOffsetIn % 8;
+		uint64 Mask = 0xFFFFFFFFFFFFFFFF >> (64 - BitLengthIn);
+		uint64 Tmp = ((*(uint64*)&Buf[BitOffsetIn / 8]) >> Off)& Mask;
+		Offset = BitOffsetIn + BitLengthIn;
+		return *(T*)&Tmp;
+	}
+
+protected:
+	volatile size_t Offset = 0;
+/*
+public:
+
+	static bool CompareBits(void* A, void* B, size_t Len)
+	{
+		for (uint64 i = 0; i < Len; ++i)
+		{
+			if (((*(uint64*)A) & (1ull << i)) != ((*(uint64*)B) & (1ull << i))) return false;
+		}
+
+		return true;
+	}
+
+	static void BitTest()
+	{
+		FBitStream Stream;
+		const int BitsNum = 64;
+		uint64 Randbuf[BitsNum * 4];
+
+		for (int i = 0; i < BitsNum; ++i)
+		{
+			Randbuf[i * 4 + 0] = 0xFFFFFFFFFFFFFFFF;
+			Randbuf[i * 4 + 1] = 0X55AA55AA55AA55AA;
+			Randbuf[i * 4 + 2] = 0XAA55AA55AA55AA55;
+			Randbuf[i * 4 + 3] = 0x123456789ABCDEF0;
+		}
+
+		for (int i = 0; i < BitsNum; ++i)
+		{
+			Stream.SetBits(&Randbuf[i * 4 + 0], i + 1);
+			Stream.SetBits(&Randbuf[i * 4 + 1], i + 1);
+			Stream.SetBits(&Randbuf[i * 4 + 2], i + 1);
+			Stream.SetBits(&Randbuf[i * 4 + 3], i + 1);
+		}
+
+		Stream.SetOffset(0);
+
+		for (int i = 0; i < BitsNum; ++i)
+		{
+			uint64 Val = Stream.GetBits<uint64>(i + 1);
+			UE_LOG(LogSoda, Warning, TEXT("BitTest[%i]: %i; 0x%llx  0x%llx"), i, CompareBits(&Val, &Randbuf[i * 4 + 0], i + 1), Val, Randbuf[i * 4 + 0]);
+
+			Val = Stream.GetBits<uint64>(i + 1);
+			UE_LOG(LogSoda, Warning, TEXT("BitTest[%i]: %i; 0x%llx  0x%llx"), i, CompareBits(&Val, &Randbuf[i * 4 + 1], i + 1), Val, Randbuf[i * 4 + 1]);
+
+			Val = Stream.GetBits<uint64>(i + 1);
+			UE_LOG(LogSoda, Warning, TEXT("BitTest[%i]: %i; 0x%llx  0x%llx"), i, CompareBits(&Val, &Randbuf[i * 4 + 2], i + 1), Val, Randbuf[i * 4 + 2]);
+
+			Val = Stream.GetBits<uint64>(i + 1);
+			UE_LOG(LogSoda, Warning, TEXT("BitTest[%i]: %i; 0x%llx  0x%llx"), i, CompareBits(&Val, &Randbuf[i * 4 + 3], i + 1), Val, Randbuf[i * 4 + 3]);
+		}
+	}
+*/
+};
+
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Misc/DatasetBluprintTools.h b/Source/UnrealSoda/Public/Soda/Misc/DatasetBluprintTools.h
new file mode 100644
index 0000000..1331f5c
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/DatasetBluprintTools.h
@@ -0,0 +1,35 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "UObject/Class.h"
+#include "Soda/SodaApp.h"
+#include "Soda/DBGateway.h"
+#include "JsonObjectWrapper.h"
+#include "DatasetBluprintTools.generated.h"
+
+/**
+ * Helper class to allow create dataset record for any actor from blueprint. It is slow implementation, not recomended use it.
+ * TODO: fast implementation
+ */
+UCLASS(BlueprintType)
+class UNREALSODA_API UDatasetRecorder : public UObject
+{
+	GENERATED_BODY()
+
+protected:
+
+	UFUNCTION(BlueprintCallable, Category = "Dataset Recorder")
+	bool BeginRecord(const FString& ActorDatasetName, const FString& DatasetType, const FJsonObjectWrapper & Descriptor);
+
+	UFUNCTION(BlueprintCallable, Category = "Dataset Recorder")
+	void EndRecord();
+
+	UFUNCTION(BlueprintCallable, Category = "Dataset Recorder")
+	bool TickDataset(const FJsonObjectWrapper& DatasetTickData);
+
+	UFUNCTION(BlueprintCallable, Category = "Dataset Recorder")
+	bool IsRecording() const { return Dataset.IsValid(); }
+
+protected:
+	TSharedPtr<soda::FActorDatasetData> Dataset;
+
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/EditorUtils.h b/Source/UnrealSoda/Public/Soda/Misc/EditorUtils.h
new file mode 100644
index 0000000..1af5cdc
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/EditorUtils.h
@@ -0,0 +1,111 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "HAL/Platform.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "InputCoreTypes.h"
+#include "Engine/EngineBaseTypes.h"
+
+class UGameViewportClient;
+class USodaGameViewportClient;
+class FSceneView;
+class ULocalPlayer;
+
+namespace FEditorUtils
+{
+
+struct FActorPositionTraceResult
+{
+	/** Enum representing the state of this result */
+	enum ResultState
+	{
+		/** The trace found a valid hit target */
+		HitSuccess,
+		/** The trace found no valid targets, so chose a default position */
+		Default,
+		/** The trace failed entirely */
+		Failed,
+	};
+
+	/** Constructor */
+	FActorPositionTraceResult() : State(Failed), Location(0.f), SurfaceNormal(0.f, 0.f, 1.f) {}
+
+	/** The state of this result */
+	ResultState	State;
+
+	/** The location of the preferred trace hit */
+	FVector		Location;
+
+	/** The surface normal of the trace hit */
+	FVector		SurfaceNormal;
+
+	/** Pointer to the actor that was hit, if any. nullptr otherwise */
+	TWeakObjectPtr<AActor>	HitActor;
+};
+
+struct UNREALSODA_API FViewportCursorLocation
+{
+public:
+	FViewportCursorLocation(const FSceneView* View, USodaGameViewportClient* InViewportClient, int32 X, int32 Y);
+	virtual ~FViewportCursorLocation() {}
+
+	const FVector& GetOrigin()			const { return Origin; }
+	const FVector& GetDirection()		const { return Direction; }
+	const FIntPoint& GetCursorPos()		const { return CursorPos; }
+	//ELevelViewportType	GetViewportType()	const { return LVT_Perspective; }
+	USodaGameViewportClient* GetViewportClient()	const { return ViewportClient; }
+
+private:
+	FVector	Origin;
+	FVector	Direction;
+	FIntPoint CursorPos;
+	USodaGameViewportClient* ViewportClient;
+};
+
+struct UNREALSODA_API FViewportClick : public FViewportCursorLocation
+{
+public:
+	FViewportClick(const FSceneView* View, USodaGameViewportClient* ViewportClient, FKey InKey, EInputEvent InEvent, int32 X, int32 Y)
+		: FViewportCursorLocation(View, ViewportClient, X, Y)
+		, Key(InKey), Event(InEvent)
+	{
+		//ControlDown = ViewportClient->IsCtrlPressed();
+		//ShiftDown = ViewportClient->IsShiftPressed();
+		//AltDown = ViewportClient->IsAltPressed();
+	}
+	virtual ~FViewportClick() {}
+
+	/** @return The 2D screenspace cursor position of the mouse when it was clicked. */
+	const FIntPoint& GetClickPos()	const { return GetCursorPos(); }
+	const FKey& GetKey() const { return Key; }
+	EInputEvent	GetEvent() const { return Event; }
+
+	//virtual bool	IsControlDown()	const { return ControlDown; }
+	//virtual bool	IsShiftDown()	const { return ShiftDown; }
+	//virtual bool	IsAltDown()		const { return AltDown; }
+
+private:
+	FKey Key;
+	EInputEvent	Event;
+	//bool ControlDown, ShiftDown, AltDown;
+};
+
+bool DeprojectScreenToWorld(const ULocalPlayer* LocalPlayer, const FVector2D& ScreenPos, FVector& out_WorldOrigin, FVector& out_WorldDirection);
+
+void DeprojectScreenToWorld(const FVector2D& ScreenPos, const FIntRect& ViewRect, const FMatrix& InvViewProjMatrix, FVector& out_WorldOrigin, FVector& out_WorldDirection);
+
+bool DeprojectScreenToWorld(const UWorld* InWorld, const FVector2D& ScreenPos, FVector& out_WorldOrigin, FVector& out_WorldDirection);
+
+FActorPositionTraceResult TraceWorldForPosition(const UWorld* InWorld, const FVector& RayStart, const FVector& RayEnd, const TArray<AActor*>* IgnoreActors = nullptr);
+
+FActorPositionTraceResult TraceWorldForPosition(const UWorld* InWorld, const FVector2D& ScreenPos, const TArray<AActor*>* IgnoreActors = nullptr);
+
+bool AbsoluteToScreenPosition(const UGameViewportClient* ViewportClient, const FVector2D& AbsoluteCoordinate, FVector2D& OutScreenPos);
+
+FName MakeUniqueObjectName(UObject* Parent, const UClass* Class, FName InBaseName = NAME_None);
+
+AActor* FindOuterActor(const UObject* InObject);
+
+} // FEditorUtils
diff --git a/Source/UnrealSoda/Public/Soda/Misc/Extent.h b/Source/UnrealSoda/Public/Soda/Misc/Extent.h
new file mode 100644
index 0000000..553f631
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/Extent.h
@@ -0,0 +1,69 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Extent.generated.h"
+
+/**
+ * FExtent 
+ * 3D object extent struct. Similarly FBox struct
+ */
+USTRUCT( BlueprintType)
+struct FExtent
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Extent, SaveGame)
+	float Forward = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Extent, SaveGame)
+	float Backward = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Extent, SaveGame)
+	float Left = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Extent, SaveGame)
+	float Right = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Extent, SaveGame)
+	float Up = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Extent, SaveGame)
+	float Down = 0;
+
+	FExtent() {};
+	inline FExtent(const FBox& Box)
+	{
+		if (Box.IsValid)
+		{
+			Forward = Box.Max.X;
+			Backward = -Box.Min.X;
+			Left = -Box.Min.Y;
+			Right = Box.Max.Y;
+			Up = Box.Max.Z;
+			Down = -Box.Min.Z;
+		}
+	}
+
+	inline FBox ToBox() const
+	{
+		FBox Box;
+		Box.Max.X = Forward;
+		Box.Min.X = -Backward;
+		Box.Min.Y = -Left;
+		Box.Max.Y = Right;
+		Box.Max.Z = Up;
+		Box.Min.Z = -Down;
+		return Box;
+	}
+
+	inline FBoxSphereBounds ToBoxSphereBounds() const
+	{
+		FBox Box = ToBox();
+		FBoxSphereBounds SphereBounds;
+		Box.GetCenterAndExtents(SphereBounds.Origin, SphereBounds.BoxExtent);
+		SphereBounds.SphereRadius = SphereBounds.BoxExtent.Size();
+		return SphereBounds;
+	}
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/ExtraWindow.h b/Source/UnrealSoda/Public/Soda/Misc/ExtraWindow.h
new file mode 100644
index 0000000..952f17d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/ExtraWindow.h
@@ -0,0 +1,33 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/TextureRenderTarget2D.h"
+#include "GameFramework/Actor.h"
+#include "Widgets/SPanel.h"
+#include "ExtraWindow.generated.h"
+
+/** Struct for opening extra window. */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable)
+class UNREALSODA_API UExtraWindow : public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	~UExtraWindow();
+
+	TSharedPtr<SWindow> ExtraWindow;
+
+	// Close window
+	void Close();
+
+	// Calls on window closed event
+	void OnWindowClosed(const TSharedRef<SWindow>& Window);
+
+	// Open camera window
+	void OpenCameraWindow(class UTextureRenderTarget2D* NewTextureTarget);
+
+	// Open widget window
+	void OpenWidgetWindow(class TSharedRef <SWidget> NewWidget);
+};
diff --git a/Source/UnrealSoda/Public/Soda/Misc/GroundScaner.h b/Source/UnrealSoda/Public/Soda/Misc/GroundScaner.h
new file mode 100644
index 0000000..809e8b8
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/GroundScaner.h
@@ -0,0 +1,74 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/EngineTypes.h"
+#include "CollisionQueryParams.h"
+#include "Soda/Misc/PhysBodyKinematic.h"
+#include <mutex>
+#include <deque>
+#include "GroundScaner.generated.h"
+
+UCLASS()
+class UNREALSODA_API UGroundScaner : public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	float WheelBase = 338.f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	float TrackWidth = 200.f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	float Border = 100.f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	float ScanHeight = 400.f;
+
+	// [Cm]
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	int MeshStepX = 30;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	int MeshStepY = 30;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	int RenderTimeHistorySize = 30;
+
+	// [Seconds]
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	float RenderTimeExtra = 0.01;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GroundScaner, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebug = false;
+
+	ECollisionChannel CollisionChannel = ECollisionChannel::ECC_Visibility;
+	FCollisionQueryParams CollisionQueryParams {};
+	FCollisionResponseParams CollisionResponseParams = FCollisionResponseParams::DefaultResponseParam;
+	FCollisionObjectQueryParams CollisionObjectQueryParams = FCollisionObjectQueryParams::DefaultObjectQueryParam;
+
+public:
+	virtual void BeginDestroy() override;
+	struct FMapEl
+	{
+		FVector Value;
+		bool Valid = false;
+	};
+
+	bool Scan(const FPhysBodyKinematic & VehicleKinematic, float DeltaTime);
+	bool Scan(const FVector& Position, const FVector& Size, float Yaw);
+	bool GetHeight(float X, float Y, float & Height);
+	const TArray<FMapEl>& GetMap() const { return  Map; }
+
+private:
+	TArray<FMapEl> Map;
+	TArray<FMapEl> TmpMap;
+	int X0;
+	int Y0;
+	int Width;
+	int Length;
+	float Timestamp;
+	std::deque<float> DtStat;
+	std::mutex Mutex;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Misc/JsonArchive.h b/Source/UnrealSoda/Public/Soda/Misc/JsonArchive.h
new file mode 100644
index 0000000..b4ac672
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/JsonArchive.h
@@ -0,0 +1,94 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "JsonObjectConverter.h"
+#include "Templates/SharedPointer.h"
+#include "JsonArchive.generated.h"
+
+class UActorComponent;
+
+USTRUCT()
+struct UNREALSODA_API FJsonArchive
+{
+	GENERATED_BODY()
+
+	FJsonArchive();
+	virtual ~FJsonArchive() {}
+
+	bool LoadFromString(const FString& JsonString);
+	bool SaveToString(FString& JsonString);
+
+	bool LoadFromFile(const FString& FileName);
+	bool SaveToFile(const FString& FileName);
+
+	virtual bool PostLoad() { return true; }
+
+
+	/**
+	* Helper function for serialization UObject to FJsonObject
+	*/
+	TSharedPtr<FJsonObject> UObjectToJsonObject(const UObject * InStruct);
+
+	/**
+	* Helper function for deserialization FJsonObject to UObject
+	* @param bTransform - if OutObject is AActor or USceneComponent then will be set the object location, rotation and scale
+	*/
+	bool JsonObjectToUObject(const TSharedRef<FJsonObject>& JsonObject, UObject* OutObject, bool bTransform = true);
+	
+	/**
+	* Helper function for detect UClass from JSON object
+	*/
+	UClass* GetObjectClass(const TSharedPtr<FJsonObject> & Object);
+
+	/**
+	* Helper function for get object name from JSON object
+	*/
+	FString GetObjectName(const TSharedPtr<FJsonObject>& Object);
+
+	bool DeserializeObject(UObject* Object);
+	bool SerializeObject(const UObject* Object);
+
+	TSharedPtr<FJsonObject> RootJsonObject;
+
+protected:
+	TSharedRef<FJsonValue> ClassToJsonValue(const UClass* Class);
+	TSharedRef<FJsonValue> VectorToJsonValue(const FVector & Vector);
+	TSharedRef<FJsonValue> RotatorToJsonValue(const FRotator& Rotator);
+
+	UClass* JsonValueToClass(const TSharedPtr<FJsonValue>& Value);
+	FVector JsonValueToVector(const TSharedPtr<FJsonValue> & Value);
+	FRotator JsonValueToRotator(const TSharedPtr<FJsonValue>& Value);
+
+private:
+	UPROPERTY()
+	UClass * ClassHelper = nullptr;
+
+	UPROPERTY()
+	FVector VectorHelper;
+
+	UPROPERTY()
+	FRotator RotatorHelper;
+};
+
+USTRUCT()
+struct UNREALSODA_API FJsonActorArchive : public FJsonArchive
+{
+	GENERATED_BODY()
+
+	FJsonActorArchive();
+	virtual ~FJsonActorArchive() {}
+
+	UClass* GetActorClass() { return GetObjectClass(RootJsonObject); }
+	FString GetActorName() { return GetObjectName(RootJsonObject); }
+
+	bool DeserializeActor(AActor* OutActor, bool bWithComponents);
+	bool SerializeActor(const AActor* OutActor, bool bWithComponents);
+
+	bool DeserializeComponent(UActorComponent* ActorComponent);
+	bool SerializeActorComponent(const UActorComponent* ActorComponent);
+
+	virtual bool PostLoad() override;
+
+	TSharedPtr<FJsonObject> Components;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/JsonUtils.hpp b/Source/UnrealSoda/Public/Soda/Misc/JsonUtils.hpp
new file mode 100644
index 0000000..f0e137f
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/JsonUtils.hpp
@@ -0,0 +1,64 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+FORCEINLINE TSharedRef<FJsonObject>  MakeVectorJsonObject(const FVector& Vector)
+{
+	TSharedPtr<FJsonObject> VectorJson = MakeShareable(new FJsonObject());
+	VectorJson->SetNumberField("x", Vector.X);
+	VectorJson->SetNumberField("y", Vector.Y);
+	VectorJson->SetNumberField("z", Vector.Z);
+	return VectorJson.ToSharedRef();
+}
+
+FORCEINLINE TSharedRef<FJsonObject>  MakeRotatorJsonObject(const FRotator& Rotator)
+{
+	TSharedPtr<FJsonObject> RotaotrJson = MakeShareable(new FJsonObject());
+	RotaotrJson->SetNumberField("yaw", Rotator.Yaw);
+	RotaotrJson->SetNumberField("pitch", Rotator.Pitch);
+	RotaotrJson->SetNumberField("roll", Rotator.Roll);
+	return RotaotrJson.ToSharedRef();
+}
+
+FORCEINLINE bool JsonObjectToVector(const TSharedPtr< FJsonObject >& Object, FVector& Vector)
+{
+	double X = 0, Y = 0, Z = 0;
+	if (Object->TryGetNumberField("x", X) && Object->TryGetNumberField("y", Y) && Object->TryGetNumberField("z", Z))
+	{
+		Vector = FVector(X, Y, Z);
+		return true;
+	}
+
+	return false;
+}
+
+FORCEINLINE bool JsonObjectToRotator(const TSharedPtr< FJsonObject >& Object, FRotator& Rotator)
+{
+	double Pitch = 0, Yaw = 0, Roll = 0;
+	if (Object->TryGetNumberField("yaw", Yaw) && Object->TryGetNumberField("pitch", Pitch) && Object->TryGetNumberField("roll", Roll))
+	{
+		Rotator = FRotator(Pitch, Yaw, Roll);
+		return true;
+	}
+
+	return false;
+}
+
+class FJsonValueNumberSetter : public FJsonValueNumber
+{
+public:
+	void SetValue(double Val) { Value = Val; }
+};
+
+class FJsonValueStringSetter : public FJsonValueString
+{
+public:
+	void SetValue(const FString& Val) { Value = Val; }
+};
+
+class FJsonValueBooleanSetter : public FJsonValueBoolean
+{
+public:
+	void SetValue(bool Val) { Value = Val; }
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/Misc/LLConverter.h b/Source/UnrealSoda/Public/Soda/Misc/LLConverter.h
new file mode 100644
index 0000000..4353580
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/LLConverter.h
@@ -0,0 +1,86 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Math/Vector.h"
+#include "Math/Rotator.h"
+#include "LLConverter.generated.h"
+
+
+#define DEFAULT_LAT 59.995
+#define DEFAULT_LON 30.13
+#define DEFAULT_ALT 10.0
+
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FLLConverter
+{
+	GENERATED_USTRUCT_BODY()
+
+public:
+	FLLConverter();
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = LLConverter, SaveGame, meta = (EditInRuntime))
+	double OrignLat = DEFAULT_LAT; // y
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = LLConverter, SaveGame, meta = (EditInRuntime))
+	double OrignLon = DEFAULT_LON; // x
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = LLConverter, SaveGame, meta = (EditInRuntime))
+	double OrignAltitude = DEFAULT_ALT; //z
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = LLConverter, SaveGame, meta = (EditInRuntime))
+	FVector OrignShift {0, 0, 0};
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = LLConverter, SaveGame, meta = (EditInRuntime))
+	float OrignDYaw = 0;
+
+	void Init();
+
+	void LLA2UE(FVector & Postion, double Lon, double Lat, double Alt) const;
+	void UE2LLA(const FVector & Postion, double & Lon, double & Lat, double & Alt) const;
+
+	FRotator ConvertRotationForward(const FRotator & InRot) const;
+	FRotator ConvertRotationBackward(const FRotator& InRot) const;
+
+	FVector ConvertDirForward(const FVector& InVec) const;
+	FVector ConvertDirBackward(const FVector& InVec) const;
+
+protected:
+	double orig_lambda;
+	double orig_phi;
+	double orig_s;
+	double orig_N;
+
+	double orig_sin_lambda;
+	double orig_cos_lambda;
+	double orig_cos_phi;
+	double orig_sin_phi;
+
+	double x0;
+	double y0;
+	double z0;
+
+	/* 
+	Converts WGS-84 Geodetic point (lat, lon, h) to the Earth-Centered Earth-Fixed (ECEF) coordinates (x, y, z).
+	*/
+	void GeodeticToEcef(double lat, double lon, double h, double & x, double & y, double & z) const;
+
+	/*
+	Converts the Earth-Centered Earth-Fixed (ECEF) coordinates (x, y, z) to (WGS-84) Geodetic point (lat, lon, h).
+	*/
+	void EcefToGeodetic(double x, double y, double z, double & lat, double & lon, double & h) const;
+
+	/* 
+	Converts the Earth-Centered Earth-Fixed (ECEF) coordinates (x, y, z) to East-North-Up coordinates in a 
+	Local Tangent Plane that is centered at the  (WGS-84) Geodetic point (orign_lat, orign_lon, orign_altitude). 
+	*/
+	void EcefToEnu(double x, double y, double z, double & xEast, double & yNorth, double & zUp) const;
+
+	/*
+	Inverse of EcefToEnu. Converts East-North-Up coordinates (xEast, yNorth, zUp) in a Local Tangent Plane 
+	that is centered at the (WGS-84) Geodetic point (orign_lat, orign_lon, orign_altitude) 
+	to the Earth-Centered Earth-Fixed (ECEF) coordinates (x, y, z).
+	*/
+	void EnuToEcef(double xEast, double yNorth, double zUp, double & x, double & y, double & z) const;
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/Misc/MathUtils.hpp b/Source/UnrealSoda/Public/Soda/Misc/MathUtils.hpp
new file mode 100644
index 0000000..f1d3fb2
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/MathUtils.hpp
@@ -0,0 +1,212 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <math.h>
+#include <cmath>
+
+#include "Math/Color.h"
+#include "Math/Vector.h"
+#include "Math/Matrix.h"
+#include "Math/RotationMatrix.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+#define ANG2RPM (30.0 / M_PI)
+
+inline float Rgba2Float(void* BGRA8Ptr, int DestStride, int row, int col)
+{
+	unsigned char* sBuf = &((unsigned char*)BGRA8Ptr)[row * DestStride + col * 4];
+	return (float(sBuf[0]) / 65025.0 +  //B
+		float(sBuf[1]) / 255.0 +	//G
+		float(sBuf[2]) / 1.0 +		//R
+		float(sBuf[3]) / 16581375.0 //A
+		) / 255.0;
+}
+
+inline float Rgba2Float(FColor Pixel)
+{
+	return (float(Pixel.B) / 65025.0 + 
+		float(Pixel.G) / 255.0 +
+		float(Pixel.R) / 1.0 +
+		float(Pixel.A) / 16581375.0
+		) / 255.0;
+}
+
+inline float NormAngRad(float a)
+{
+	return (a > M_PI) ? (a - 2.0 * M_PI) : ((a < -M_PI) ? (a + 2 * M_PI) : a);
+}
+
+inline float NormAngDeg(float a)
+{
+	return (a > 180.f) ? (a - 360.f) : ((a < -180.f) ? (a + 360.f) : a);
+}
+
+inline FVector NormAngRad(const FVector& v)
+{
+	return FVector(
+		(v.X > M_PI) ? (v.X - 2.0 * M_PI) : ((v.X < -M_PI) ? (v.X + 2 * M_PI) : v.X),
+		(v.Y > M_PI) ? (v.Y - 2.0 * M_PI) : ((v.Y < -M_PI) ? (v.Y + 2 * M_PI) : v.Y),
+		(v.Z > M_PI) ? (v.Z - 2.0 * M_PI) : ((v.Z < -M_PI) ? (v.Z + 2 * M_PI) : v.Z)
+	);
+}
+
+inline FVector NormAngDeg(const FVector& v)
+{
+	return FVector(
+		(v.X > M_PI) ? (v.X - 360.f) : ((v.X < -180.f) ? (v.X + 360.f) : v.X),
+		(v.Y > M_PI) ? (v.Y - 360.f) : ((v.Y < -180.f) ? (v.Y + 360.f) : v.Y),
+		(v.Z > M_PI) ? (v.Z - 360.f) : ((v.Z < -180.f) ? (v.Z + 360.f) : v.Z)
+	);
+}
+
+inline int Floor(float a)
+{
+	return (a >= 0) ? (a + 0.5) : (a - 0.5);
+}
+
+inline float Sqr(float a)
+{
+	return a * a;
+}
+
+/**
+ * See https://helloacm.com/cc-function-to-compute-the-bilinear-interpolation/
+ * */
+inline float BilinearInterpolation(float q11, float q12, float q21, float q22, float x1, float x2, float y1, float y2, float x, float y)
+{
+	float x2x1, y2y1, x2x, y2y, yy1, xx1;
+	x2x1 = x2 - x1;
+	y2y1 = y2 - y1;
+	x2x = x2 - x;
+	y2y = y2 - y;
+	yy1 = y - y1;
+	xx1 = x - x1;
+	return 1.0 / (x2x1 * y2y1) * (q11 * x2x * y2y + q21 * xx1 * y2y + q12 * x2x * yy1 + q22 * xx1 * yy1);
+}
+
+inline bool Intersection(const FVector2D& Pt11, const FVector2D& Pt12, const FVector2D& Pt21, const FVector2D& Pt22, FVector2D* Intersection)
+{
+	FVector2D dir1 = Pt12 - Pt11;
+	FVector2D dir2 = Pt22 - Pt21;
+
+	float a1 = -dir1.Y;
+	float b1 = +dir1.X;
+	float d1 = -(a1 * Pt11.X + b1 * Pt11.Y);
+
+	float a2 = -dir2.Y;
+	float b2 = +dir2.X;
+	float d2 = -(a2 * Pt21.X + b2 * Pt21.Y);
+
+	float seg1_line2_start = a2 * Pt11.X + b2 * Pt11.Y + d2;
+	float seg1_line2_end = a2 * Pt12.X + b2 * Pt12.Y + d2;
+
+	float seg2_line1_start = a1 * Pt21.X + b1 * Pt21.Y + d1;
+	float seg2_line1_end = a1 * Pt22.X + b1 * Pt22.Y + d1;
+
+
+	if (seg1_line2_start * seg1_line2_end >= 0 || seg2_line1_start * seg2_line1_end >= 0)
+		return false;
+
+	float u = seg1_line2_start / (seg1_line2_start - seg1_line2_end);
+	if (Intersection)*Intersection = Pt11 + u * dir1;
+
+	return true;
+}
+
+template<typename VectorType>
+bool IsClockwise2D(const TArray<VectorType>& Polyline)
+{
+	float Area = 0;
+	for (int i = 0; i < (Polyline.Num()); i++)
+	{
+		int j = (i + 1) % Polyline.Num();
+		Area += Polyline[i].X * Polyline[j].Y;
+		Area -= Polyline[j].X * Polyline[i].Y;
+	}
+	return (Area < 0);
+}
+
+template<typename VectorType>
+bool IsClockwise2D(const TArray<VectorType>& Cloud, const TArray<int32>& Hull)
+{
+	float Area = 0;
+	for (int i = 0; i < (Hull.Num()); i++)
+	{
+		int j = (i + 1) % Hull.Num();
+		Area += Cloud[Hull[i]].X * Cloud[Hull[j]].Y;
+		Area -= Cloud[Hull[j]].X * Cloud[Hull[i]].Y;
+	}
+	return (Area < 0);
+}
+
+inline int FindNearestPoint2D(const FVector& Point, const TArray<FVector>& Points)
+{
+	FVector2D Point2D(Point);
+	check(Points.Num() > 0);
+	int Ret = 0;
+	float MinLength = (FVector2D(Points[0]) - Point2D).Size();
+	for (int i = 1; i < Points.Num(); ++i)
+	{
+		float Length = (FVector2D(Points[i]) - Point2D).Size();
+		if (Length < MinLength)
+		{
+			MinLength = Length;
+			Ret = i;
+		}
+	}
+	return Ret;
+}
+
+template <class T>
+inline static T CubicInterpolate(const T& p0, const T& p1, const T& p2, const T& p3, double x)
+{
+	return p1 + 0.5 * x * (p2 - p0 + x * (2.0 * p0 - 5.0 * p1 + 4.0 * p2 - p3 + x * (3.0 * (p1 - p2) + p3 - p0)));
+}
+
+inline static FVector ComputeNormal2D(const FVector& Pt0, const FVector& Pt1, const FVector& Pt2)
+{
+	return FRotationMatrix(((Pt2 - Pt1).GetSafeNormal() + (Pt1 - Pt0).GetSafeNormal()).GetSafeNormal2D().Rotation()).GetScaledAxis(EAxis::Y);
+}
+
+inline float ZeroThreshold(float F, float Threshold)
+{
+	if (F > Threshold || F < -Threshold)
+	{
+		return ((F >= 0) ? (F - Threshold) : (F + Threshold)) / (1.0 - Threshold);
+	}
+	else
+	{
+		return  0;
+	}
+}
+
+inline float Distance2D(float X1, float Y1, float X2, float Y2)
+{
+	return std::sqrt(Sqr(X1 - X2) + Sqr(Y1 - Y2));
+}
+
+inline FQuat QExp(const FVector & V)
+{
+	double Vn = V.Size();
+	if (Vn <= SMALL_NUMBER) 
+		return FQuat(0., 0., 0., 1.);
+	FVector H = V * std::sin(Vn / 2.) / Vn;
+	return FQuat(H.X, H.Y, H.Z, std::cos(Vn / 2.));
+}
+
+inline FVector QLog(const FQuat& Q)
+{
+	FVector V(Q.X, Q.Y, Q.Z);
+	double Vn = V.Size();
+	if (Vn < SMALL_NUMBER)
+		return FVector::ZeroVector;
+	double Psi = 2.0 * asin(Vn);
+	if (Q.W < 0.0)
+		Psi *= -1.0;
+	V *= Psi / Vn;
+	return V;
+}
diff --git a/Source/UnrealSoda/Public/Soda/Misc/MeshGenerationUtils.h b/Source/UnrealSoda/Public/Soda/Misc/MeshGenerationUtils.h
new file mode 100644
index 0000000..1b2ae69
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/MeshGenerationUtils.h
@@ -0,0 +1,42 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "ProceduralMeshComponent.h"
+
+namespace FMeshGenerationUtils
+{
+	/**
+	* Generate FOV mesh based on 2D (UVs) map. The UVs map is projection of sensor rays on the forward plane;  
+	* Each UVs point corresponds to a direction vector (Cloud). Size of UVs == size of Cloud.
+	* This type of mesh generation is ideal for sensors such as lidars, cameras and radars.
+	*/
+	bool UNREALSODA_API GenerateFOVMesh2D(const TArray<FVector>& Cloud, const TArray<FVector2D>& UVs, const TArray<int32> & Hull, TArray<FDynamicMeshVertex> & OutVertices, TArray<uint32> & OutIndices);
+
+	/**
+	* Generate convex hull FOV mesh based on the cloud of points.
+	*/
+	bool UNREALSODA_API GenerateConvexHullMesh3D(const TArray<FVector>& Cloud, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices);
+
+	bool UNREALSODA_API GenerateSimpleFOVMesh(float HFOV, float VFOV, uint32 HSize, uint32 VSize, float Length, float HRot, float VRot, TArray<FDynamicMeshVertex>& OutVertices, TArray<uint32>& OutIndices);
+
+	FBox UNREALSODA_API CalcFOVBounds(float HFOV, float VFOV, float ViewDistance);
+
+	/**
+	* Generate a hull for a matrix like this:
+	* 0  1  2  3
+	* 4  5  6  7
+	* 8  9  10 11
+	* Output hull indexes: 0, 1, 2, 3, 7, 11, 10, 9, 8, 4
+	*/
+	inline void GenerateHullInexes(int Colls, int Rows, TArray <int32>& Hull)
+	{
+		Hull.Empty();
+		for (int u = 0; u < Colls; ++u) Hull.Add(u);
+		for (int v = Colls * 2 - 1; v < Colls * Rows; v = v + Colls)  Hull.Add(v);
+		for (int u = Rows * Colls - 2; u >= Colls * Rows - Colls; --u) Hull.Add(u);
+		for (int v = Colls * (Rows - 2); v > 0; v = v - Colls)  Hull.Add(v);
+	}
+
+}
diff --git a/Source/UnrealSoda/Public/Soda/Misc/PhysBodyKinematic.h b/Source/UnrealSoda/Public/Soda/Misc/PhysBodyKinematic.h
new file mode 100644
index 0000000..06ee681
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/PhysBodyKinematic.h
@@ -0,0 +1,174 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Math/Transform.h"
+#include "Soda/Misc/MathUtils.hpp"
+
+struct UNREALSODA_API FPhysBodyKinematic
+{
+	struct FState
+	{
+		FVector GlobalVelocityOfCenterMass = FVector(0.f);	// [cm/s]
+		FVector GlobalAcceleration = FVector(0.f);			// [cm/c2]
+		FVector AngularVelocity = FVector(0.f);				// [rad/s]
+		FTransform GlobalPose;								// Center of rear axis [cm]
+		FVector CenterOfMassLocal = FVector(0.f);			// Offset from rear axis [cm]
+
+		inline FVector GetGlobalVelocityAtLocalPoint(const FVector& Point) const
+		{
+			return GlobalVelocityOfCenterMass + GlobalPose.Rotator().RotateVector((AngularVelocity ^ (Point - CenterOfMassLocal)));
+		}
+
+		inline FVector GetGlobaVelocityAtGlobalPoint(const FVector& Point) const
+		{
+			return GlobalVelocityOfCenterMass + (AngularVelocity ^ (Point - GlobalPose.TransformPosition(CenterOfMassLocal)));
+		}
+
+		inline FVector GetLocalVelocity() const
+		{
+			return GlobalPose.Rotator().UnrotateVector(GlobalVelocityOfCenterMass);
+		}
+
+		inline FVector GetLocalAcceleration() const
+		{
+			return GlobalPose.Rotator().UnrotateVector(GlobalAcceleration);
+		}
+
+		inline FVector GetLocalVelocityAtLocalPose(const FTransform& LocalPose) const
+		{
+			FTransform WorldPose = LocalPose * GlobalPose;
+			return  WorldPose.Rotator().UnrotateVector(GetGlobalVelocityAtLocalPoint(LocalPose.GetTranslation()));
+		}
+
+		inline FVector GetLocalVelocityAtLocalPoint(const FVector& Point) const
+		{
+			return  GlobalPose.Rotator().UnrotateVector(GetGlobalVelocityAtLocalPoint(Point));
+		}
+
+		inline void EstimatePoseInternal(float InDeltatime, FTransform& WorldPose) const
+		{
+			FVector NewLocationOfCenterMass =
+				GlobalPose.TransformPosition(CenterOfMassLocal) +
+				GlobalVelocityOfCenterMass * InDeltatime + GlobalAcceleration * InDeltatime * InDeltatime / 2;
+
+			//TODO: Use: NewRotatation = GlobalPose.GetRotation() * QExp(AngularVelocity * DeltaTime); NewRotatation.Normalize();
+			FRotator NewRotatation =
+				GlobalPose.Rotator() +
+				FRotator(AngularVelocity.Y * InDeltatime / M_PI * 180.0, AngularVelocity.Z * InDeltatime / M_PI * 180.0, AngularVelocity.X * InDeltatime / M_PI * 180.0);
+
+			WorldPose = FTransform(
+				NewRotatation,
+				NewLocationOfCenterMass - NewRotatation.RotateVector(CenterOfMassLocal),
+				FVector(1.0));
+		}
+	};
+
+	inline void Push(float InDeltatime)
+	{
+		Deltatime = InDeltatime;
+		Prev = Curr;
+	}
+
+	inline void Push(float InDeltatime, const FState& NewState)
+	{
+		Deltatime = InDeltatime;
+		Prev = Curr;
+		Curr = NewState;
+	}
+
+	inline void ComputeGlobalVelocityOfCenterMass()
+	{
+		Curr.GlobalVelocityOfCenterMass = (Curr.GlobalPose.TransformPosition(Curr.CenterOfMassLocal) - Prev.GlobalPose.TransformPosition(Prev.CenterOfMassLocal)) / Deltatime;
+	}
+
+	inline void ComputeGlobalAcceleration()
+	{
+		Curr.GlobalAcceleration = (Curr.GlobalVelocityOfCenterMass - Prev.GlobalVelocityOfCenterMass) / Deltatime;
+	}
+
+	inline void ComputeAngularVelocity()
+	{
+		Curr.AngularVelocity = QLog((Prev.GlobalPose.GetRotation().Inverse() * Curr.GlobalPose.GetRotation()).GetNormalized()) / Deltatime;
+	}
+
+	inline FVector GetLocalAcc(float Gravity = -980.f) const
+	{
+		FVector LocalVel = Curr.GetLocalVelocity();
+		return Curr.GlobalPose.Rotator().UnrotateVector(FVector(0.f, 0.f, Gravity)) +
+			(Curr.AngularVelocity ^ LocalVel) +
+			(Prev.GetLocalVelocity() - LocalVel) / Deltatime;
+	}
+
+	inline float GetForwardSpeed() const
+	{
+		return Curr.GetLocalVelocity().X;
+	}
+
+	inline void CalcIMU(const FTransform& LocalPose, FTransform& WorldPose, FVector& WorldVel, FVector& LocalAcc, FVector& Gyro, float Gravity = -980.f) const
+	{
+		WorldPose = LocalPose * Curr.GlobalPose;
+		WorldVel = Curr.GetGlobalVelocityAtLocalPoint(LocalPose.GetTranslation());
+		Gyro = LocalPose.Rotator().RotateVector(Curr.AngularVelocity);
+
+	// Two methods of computing of the LocalAcc. Which is batter?
+#if 1
+		FVector LocalVel = WorldPose.Rotator().UnrotateVector(WorldVel);
+		FVector PreLocalVel = Prev.GetLocalVelocityAtLocalPose(LocalPose);
+		FVector dVdt = (PreLocalVel - LocalVel) / Deltatime;
+		LocalAcc = WorldPose.Rotator().UnrotateVector(FVector(0.f, 0.f, Gravity)) - (Curr.AngularVelocity ^ LocalVel) + dVdt;
+#else
+		FVector PreWorldVel = Prev.GetGlobalVelocityAtLocalPoint(LocalPose.GetTranslation());
+		LocalAcc = WorldPose.Rotator().UnrotateVector(FVector(0.f, 0.f, Gravity) + (PreWorldVel - WorldVel) / Deltatime);
+#endif
+	}
+
+	/** Simple pose estimation based on Curr pose, velocity and acceleration*/
+	inline virtual void EstimatePose(float InDeltatime, FTransform& WorldPose) const
+	{
+		Curr.EstimatePoseInternal(InDeltatime, WorldPose);
+	}
+public:
+
+	FState Curr, Prev;
+	float Deltatime = 1.f;
+};
+
+struct UNREALSODA_API FPhysBodyKinematicLerpEstm : public FPhysBodyKinematic
+{
+	inline void Push(float Deltatime_, const FState& NewState)
+	{
+		FTransform Pose;
+		EstimatePose(Deltatime_, Pose);
+		Estm = NewState;
+		Estm.GlobalPose = Pose;	
+
+		FPhysBodyKinematic::Push(Deltatime_, NewState);
+	}
+
+	/** Pose estimation based on interpolation from prev estimated pose to new estimated pose. Provides smooth motion without teleportations on push. Call Push with CalcEstmPose=true*/
+	inline virtual void EstimatePose(float InDeltatime, FTransform& WorldPose) const
+	{
+		if (InDeltatime < Deltatime)
+		{
+			float Alpha = InDeltatime / Deltatime;
+			FTransform PoseByEstm, PoseByCurr;
+			Estm.EstimatePoseInternal(InDeltatime, PoseByEstm);
+			Curr.EstimatePoseInternal(InDeltatime, PoseByCurr);
+			FTransform LerpPose(
+				FMath::Lerp(PoseByEstm.GetRotation(), PoseByCurr.GetRotation(), Alpha),
+				FMath::Lerp(
+					PoseByEstm.GetTranslation(),
+					PoseByCurr.GetTranslation(),
+					Alpha),
+				FVector(1.0));
+			WorldPose = LerpPose;
+		}
+		else
+		{
+			Curr.EstimatePoseInternal(InDeltatime, WorldPose);
+		}
+	}
+
+	FState Estm;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Misc/PixelReader.h b/Source/UnrealSoda/Public/Soda/Misc/PixelReader.h
new file mode 100644
index 0000000..1a47dce
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/PixelReader.h
@@ -0,0 +1,35 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Math/Color.h"
+
+
+class UTextureRenderTarget2D;
+class FRHICommandListImmediate;
+class FRHITexture;
+
+ /**
+  * FCameraPixelReader
+  */
+class UNREALSODA_API FCameraPixelReader
+{
+public:
+	void BeginRead(
+		UTextureRenderTarget2D& RenderTarget,
+		FRHICommandListImmediate& InRHICmdList,
+		TArrayView<FColor>& OutPixels, uint32& OutWidth);
+
+	void EndRead();
+
+	static void ReadPixels(
+		UTextureRenderTarget2D& RenderTarget,
+		FRHICommandListImmediate& InRHICmdList,
+		TArray<FColor>& OutPixels,
+		uint32& OutWidth);
+
+private:
+	TArray<FColor> Pixels;
+	FRHITexture* Texture;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/PrecisionTimer.hpp b/Source/UnrealSoda/Public/Soda/Misc/PrecisionTimer.hpp
new file mode 100644
index 0000000..77c4032
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/PrecisionTimer.hpp
@@ -0,0 +1,77 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <thread>
+#include <chrono>
+
+DECLARE_DELEGATE_TwoParams(FPrecisionTimerDelegate, const std::chrono::nanoseconds &, const  std::chrono::nanoseconds &);
+
+class FPrecisionTimer
+{
+public:
+	virtual ~FPrecisionTimer()
+	{
+		TimerStop();
+	}
+
+	template <class _Rep1, class _Period1, class _Rep2, class _Period2>
+	void TimerStart(const std::chrono::duration<_Rep1, _Period1>& Deltatime, const std::chrono::duration<_Rep2, _Period2> & StartupDelay)
+	{
+		if (!TimerThread.joinable())
+		{
+			bIsTimerThreadWorking = true;
+			TimerThread = std::thread([this, Deltatime, StartupDelay]() {
+				std::this_thread::sleep_for(StartupDelay);
+				auto SleepUntil = std::chrono::high_resolution_clock::now();
+				while (bIsTimerThreadWorking)
+				{
+					SleepUntil += Deltatime;
+					auto Elapsed = std::chrono::high_resolution_clock::now() - SleepUntil;
+					if (Elapsed > std::chrono::nanoseconds::zero())
+					{
+						Elapsed = std::chrono::nanoseconds(
+							int64(double(std::chrono::duration_cast<std::chrono::nanoseconds>(Elapsed).count()) * RealtimeSmoothFactor));
+						SleepUntil += Elapsed;
+					}
+					else
+					{
+						std::this_thread::sleep_until(SleepUntil);
+					}
+					TimerTick(Deltatime, Elapsed);
+				}
+			});
+		}
+	}
+
+	void TimerStop()
+	{
+		bIsTimerThreadWorking = false;
+		if (TimerThread.joinable())
+			TimerThread.join();
+	}
+
+	bool IsTimerWorking() const
+	{
+		return bIsTimerThreadWorking;
+	}
+
+	bool IsJoinable() const
+	{
+		return TimerThread.joinable();
+	}
+
+	virtual void TimerTick(const std::chrono::nanoseconds & Deltatime, const std::chrono::nanoseconds & Elapsed)
+	{
+		TimerDelegate.ExecuteIfBound(Deltatime, Elapsed);
+	}
+
+
+	FPrecisionTimerDelegate TimerDelegate;
+	double RealtimeSmoothFactor = 1.0;
+
+private:
+	std::thread TimerThread;
+	bool bIsTimerThreadWorking;
+	std::chrono::high_resolution_clock::time_point PrevTimePoint;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/SensorSceneProxy.h b/Source/UnrealSoda/Public/Soda/Misc/SensorSceneProxy.h
new file mode 100644
index 0000000..c386da0
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/SensorSceneProxy.h
@@ -0,0 +1,46 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "VertexFactory.h"
+#include "PrimitiveSceneProxy.h"
+#include "LocalVertexFactory.h"
+#include "DynamicMeshBuilder.h"
+//#include "PrimitiveViewRelevance.h"
+//#include "Engine/Engine.h"
+//#include "MaterialShared.h"
+//#include "Materials/Material.h"
+
+
+struct FSensoFOVProxy;
+
+class UNREALSODA_API FSensorSceneProxy final : public FPrimitiveSceneProxy
+{
+
+public:
+	FSensorSceneProxy(USensorComponent* Component);
+	FSensorSceneProxy(const USensorComponent& Component) = delete;
+	virtual ~FSensorSceneProxy() {}
+
+	virtual void GetDynamicMeshElements(const TArray<const FSceneView*>& Views, const FSceneViewFamily& ViewFamily, uint32 VisibilityMap, FMeshElementCollector& Collector) const override;
+	virtual FPrimitiveViewRelevance GetViewRelevance(const FSceneView* View) const override;
+	virtual bool CanBeOccluded() const override;
+	virtual void OnTransformChanged() override;
+	virtual uint32 GetMemoryFootprint(void) const override { return(sizeof(*this) + GetAllocatedSize()); }
+	virtual SIZE_T GetTypeHash() const override
+	{
+		static size_t UniquePointer;
+		return reinterpret_cast<size_t>(&UniquePointer);
+	}
+
+	uint32 GetAllocatedSize(void) const { return(FPrimitiveSceneProxy::GetAllocatedSize()); }
+
+private:
+	USensorComponent* Sensor = nullptr;
+	UMaterialInterface* Material;
+	TArray<TSharedPtr<FSensoFOVProxy>> FOVProxies;
+	FMaterialRelevance MaterialRelevance;
+	FMaterialRenderProxy* MaterialRenderProxy = nullptr;
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/Misc/SerializationHelpers.h b/Source/UnrealSoda/Public/Soda/Misc/SerializationHelpers.h
new file mode 100644
index 0000000..74a86d6
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/SerializationHelpers.h
@@ -0,0 +1,172 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/LevelScriptActor.h"
+#include "Engine/LevelStreaming.h"
+#include "GameFramework/SaveGame.h"
+#include "Serialization/ObjectAndNameAsStringProxyArchive.h"
+#include "Soda/Misc/EditorUtils.h"
+#include "Soda/UnrealSoda.h"
+#include "Engine/World.h"
+#include "Engine/Level.h"
+#include "SerializationHelpers.generated.h"
+
+USTRUCT()
+struct UNREALSODA_API FBaseRecord
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY()
+	FName Name;
+
+	virtual void Serialize(FArchive &Ar)
+	{
+		Ar << Name;
+	}
+
+	friend FArchive &operator<<(FArchive &Ar, FBaseRecord &Record) 
+	{
+		Record.Serialize(Ar);
+		return Ar;
+	}
+
+	virtual FString ToString() const
+	{
+		return FString::Printf(TEXT("RecordName=(%s)"), *Name.ToString());
+	}
+
+	virtual ~FBaseRecord() {}
+};
+
+USTRUCT()
+struct UNREALSODA_API FObjectRecord : public FBaseRecord
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY()
+	TSoftClassPtr<UObject> Class;
+
+	UPROPERTY()
+	TArray<uint8> Data;
+
+	virtual void Serialize(FArchive &Ar) override;
+
+	bool IsRecordValid() const { return !Name.IsNone() && !Class.IsNull() && Data.Num() > 0; }
+
+	FORCEINLINE bool operator == (const UObject *Other) const 
+	{
+		return Name == Other->GetFName() && Class == Other->GetClass();
+	}
+
+	virtual bool SerializeObject(UObject* Object);
+	virtual bool DeserializeObject(UObject* Object);
+
+	virtual FString ToString() const override
+	{
+		return FString::Printf(TEXT("RecordName=(%s), Class=(%s)"), *Name.ToString(), *Class.ToString());
+	}
+};
+
+USTRUCT()
+struct UNREALSODA_API FComponentRecord : public FObjectRecord
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY()
+	FTransform Transform;
+
+	bool SerializeComponent(UActorComponent* Component);
+	bool DeserializeComponent(UActorComponent* Component);
+
+	virtual void Serialize(FArchive &Ar) override;
+};
+
+USTRUCT()
+struct UNREALSODA_API FActorRecord : public FObjectRecord
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY()
+	FTransform Transform;
+
+	UPROPERTY()
+	TArray<FComponentRecord> ComponentRecords;
+
+	bool SerializeComponent(UActorComponent* Component);
+	bool DeserializeComponent(UActorComponent* Component);
+
+	bool SerializeActor(AActor* Actor, bool bWithComponents);
+	bool DeserializeActor(AActor* Actor, bool bWithComponents, bool bSetTransform = false);
+
+	virtual void Serialize(FArchive &Ar) override;
+
+	template<typename ActorType>
+	ActorType* SpawnActor(UWorld* World, bool WithComponents, const FTransform & InTransform, ESpawnActorCollisionHandlingMethod CollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::DontSpawnIfColliding)
+	{
+		if (!IsRecordValid()) return nullptr;
+
+		UClass* ActorClass = Class.Get();
+		if (!ActorClass)
+		{
+			ActorClass = LoadObject<UClass>(nullptr, *Class.ToString());
+		}
+
+		if (!ActorClass)
+		{
+			UE_LOG(LogSoda, Error, TEXT("FActorRecord::SpawnActor(); Can't find \"%s\" class"), *Class.ToString());
+			return nullptr;
+		}
+
+		FActorSpawnParameters SpawnInfo;
+		SpawnInfo.SpawnCollisionHandlingOverride = CollisionHandlingOverride;
+		SpawnInfo.bDeferConstruction = true;
+		SpawnInfo.Name = Name.IsNone() ? NAME_None : FEditorUtils::MakeUniqueObjectName(World->GetCurrentLevel(), ActorClass, Name);
+		ActorType * NewActor =  Cast<ActorType>(World->SpawnActor(ActorClass, &InTransform, SpawnInfo));
+		if (!IsValid(NewActor))
+		{
+			return nullptr;
+		}
+
+		if (!DeserializeActor(NewActor, WithComponents))
+		{
+			NewActor->Destroy();
+			return nullptr;
+		}
+		NewActor->FinishSpawning(InTransform);
+		return IsValid(NewActor) ? NewActor : nullptr;
+	}
+
+	template<typename ActorType>
+	ActorType* SpawnActor(UWorld* World, bool WithComponents, ESpawnActorCollisionHandlingMethod CollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::DontSpawnIfColliding)
+	{
+		return SpawnActor<ActorType>(World, WithComponents, Transform, CollisionHandlingOverride);
+	}
+};
+
+UCLASS(ClassGroup = Soda, hideCategories = ("Activation", "Actor Tick", "Actor", "Input", "Rendering", "Replication", "Socket", "Thumbnail"))
+class UNREALSODA_API USaveGameActor : public USaveGame 
+{
+	GENERATED_BODY()
+
+public:
+	USaveGameActor() : Super() {}
+
+	UFUNCTION(BlueprintCallable, Category = SaveActor)
+	bool SerializeActor(AActor* Actor, bool bWithComponents);
+
+	UFUNCTION(BlueprintCallable, Category = SaveActor)
+	bool DeserializeActor(AActor* Actor, bool bWithComponents);
+
+	UFUNCTION(BlueprintCallable, Category = SaveActor)
+	bool SerializeComponent(UActorComponent* Component);
+
+	UFUNCTION(BlueprintCallable, Category = SaveActor)
+	bool DeserializeComponent(UActorComponent* Component);
+
+	FActorRecord& GetActorRecord() { return ActorRecord; }
+
+	virtual void Serialize(FArchive &Ar) override;
+
+	FActorRecord ActorRecord;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Misc/SodaPhysicsInterface.h b/Source/UnrealSoda/Public/Soda/Misc/SodaPhysicsInterface.h
new file mode 100644
index 0000000..ad1e0af
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/SodaPhysicsInterface.h
@@ -0,0 +1,17 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/World.h"
+#include "Collision.h"
+
+
+struct FSodaPhysicsInterface
+{
+	static UNREALSODA_API bool RaycastSingleScope(const UWorld* World, TArray<struct FHitResult>& OutHit, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams = FCollisionObjectQueryParams::DefaultObjectQueryParam);
+	static UNREALSODA_API bool RaycastMultiScope(const UWorld* World, TArray<TArray<struct FHitResult>>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams = FCollisionObjectQueryParams::DefaultObjectQueryParam);
+
+	static UNREALSODA_API bool GeomSweepSingleScope(const UWorld* World, const struct FCollisionShape& CollisionShape, const FQuat& Rot, TArray<struct FHitResult>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const struct FCollisionQueryParams& Params, const struct FCollisionResponseParams& ResponseParams, const struct FCollisionObjectQueryParams& ObjectParams = FCollisionObjectQueryParams::DefaultObjectQueryParam);
+	static UNREALSODA_API bool GeomSweepMultiScope(const UWorld* World, const FPhysicsGeometryCollection& InGeom, const FQuat& InGeomRot, TArray<TArray<struct FHitResult>>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const FCollisionQueryParams& Params, const FCollisionResponseParams& ResponseParams, const FCollisionObjectQueryParams& ObjectParams = FCollisionObjectQueryParams::DefaultObjectQueryParam);
+	static UNREALSODA_API bool GeomSweepMultiScope(const UWorld* World, const FCollisionShape& InGeom, const FQuat& InGeomRot, TArray<TArray<struct FHitResult>>& OutHits, const TArray<FVector>& Start, const TArray<FVector>& End, ECollisionChannel TraceChannel, const FCollisionQueryParams& Params, const FCollisionResponseParams& ResponseParams, const FCollisionObjectQueryParams& ObjectParams = FCollisionObjectQueryParams::DefaultObjectQueryParam);
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/SodaRandomEngine.h b/Source/UnrealSoda/Public/Soda/Misc/SodaRandomEngine.h
new file mode 100644
index 0000000..10af70f
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/SodaRandomEngine.h
@@ -0,0 +1,153 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <random>
+
+#include "SodaRandomEngine.generated.h"
+
+UCLASS(Blueprintable, BlueprintType)
+class UNREALSODA_API USodaRandomEngine : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	// ===========================================================================
+	/// @name Generate Ids
+	// ===========================================================================
+	/// @{
+
+	/// Generate a non-deterministic random id.
+	static uint64 GenerateRandomId();
+
+	/// @}
+	// ===========================================================================
+	/// @name Seed
+	// ===========================================================================
+	/// @{
+
+	/// Generate a non-deterministic random seed.
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	static int32 GenerateRandomSeed();
+
+	/// Generate a seed derived from previous seed.
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	int32 GenerateSeed();
+
+	/// Seed the random engine.
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	void Seed(int32 InSeed)
+	{
+		Engine.seed(InSeed);
+	}
+
+	/// @}
+	// ===========================================================================
+	/// @name Uniform distribution
+	// ===========================================================================
+	/// @{
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	float GetUniformFloat()
+	{
+		return std::uniform_real_distribution< float >()(Engine);
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	float GetUniformFloatInRange(float Minimum, float Maximum)
+	{
+		return std::uniform_real_distribution< float >(Minimum, Maximum)(Engine);
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	int32 GetUniformIntInRange(int32 Minimum, int32 Maximum)
+	{
+		return std::uniform_int_distribution< int32 >(Minimum, Maximum)(Engine);
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	bool GetUniformBool()
+	{
+		return (GetUniformIntInRange(0, 1) == 1);
+	}
+
+	/// @}
+	// ===========================================================================
+	/// @name Other distributions
+	// ===========================================================================
+	/// @{
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	bool GetBernoulliDistribution(float P)
+	{
+		return std::bernoulli_distribution(P)(Engine);
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	int32 GetBinomialDistribution(int32 T, float P)
+	{
+		return std::binomial_distribution< int32 >(T, P)(Engine);
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	int32 GetPoissonDistribution(float Mean)
+	{
+		return std::poisson_distribution< int32 >(Mean)(Engine);
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	float GetExponentialDistribution(float Lambda)
+	{
+		return std::exponential_distribution< float >(Lambda)(Engine);
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	float GetNormalDistribution(float Mean, float StandardDeviation)
+	{
+		return std::normal_distribution< float >(Mean, StandardDeviation)(Engine);
+	}
+
+	/// @}
+	// ===========================================================================
+	/// @name Sampling distributions
+	// ===========================================================================
+	/// @{
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	bool GetBoolWithWeight(float Weight)
+	{
+		return (Weight >= GetUniformFloat());
+	}
+
+	UFUNCTION(Category = "Traffic Routes", BlueprintCallable)
+	int32 GetIntWithWeight(const TArray< float >& Weights)
+	{
+		return std::discrete_distribution< int32 >(
+			Weights.GetData(),
+			Weights.GetData() + Weights.Num())(Engine);
+	}
+
+	/// @}
+	// ===========================================================================
+	/// @name Elements in TArray
+	// ===========================================================================
+	/// @{
+
+	template < typename T >
+	auto& PickOne(const TArray< T >& Array)
+	{
+		check(Array.Num() > 0);
+		return Array[GetUniformIntInRange(0, Array.Num() - 1)];
+	}
+
+	template < typename T >
+	void Shuffle(TArray< T >& Array)
+	{
+		std::shuffle(Array.GetData(), Array.GetData() + Array.Num(), Engine);
+	}
+
+	/// @}
+
+private:
+	std::minstd_rand Engine;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Misc/SpinLock.hpp b/Source/UnrealSoda/Public/Soda/Misc/SpinLock.hpp
new file mode 100644
index 0000000..316f7df
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/SpinLock.hpp
@@ -0,0 +1,273 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#ifndef _UTIL_LOCK_SPINLOCK_H_
+#define _UTIL_LOCK_SPINLOCK_H_
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+# pragma once
+#endif
+
+#if defined(__clang__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1 ) ) && __cplusplus >= 201103L
+    #include <atomic>
+    #define __UTIL_LOCK_SPINLOCK_ATOMIC_STD
+#elif defined(_MSC_VER) && (_MSC_VER >= 1700) && defined(_HAS_CPP0X) && _HAS_CPP0X
+    #include <atomic>
+    #define __UTIL_LOCK_SPINLOCK_ATOMIC_STD
+#elif defined(__GNUC__) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4) && (__cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__))
+    #include <atomic>
+    #define __UTIL_LOCK_SPINLOCK_ATOMIC_STD
+#endif
+
+
+/**
+ * ==============================================
+ * ======            asm pause             ======
+ * ==============================================
+ */
+#if defined(_MSC_VER)
+    #include <windows.h> // YieldProcessor
+
+    /*
+     * See: http://msdn.microsoft.com/en-us/library/windows/desktop/ms687419(v=vs.85).aspx
+     * Not for intel c++ compiler, so ignore http://software.intel.com/en-us/forums/topic/296168
+     */
+    #define __UTIL_LOCK_SPIN_LOCK_PAUSE() YieldProcessor()
+
+#elif defined(__GNUC__) || defined(__clang__)
+    #if defined(__i386__) || defined(__x86_64__)
+        /**
+         * See: Intel(R) 64 and IA-32 Architectures Software Developer's Manual V2
+         * PAUSE-Spin Loop Hint, 4-57
+         * http://www.intel.com/content/www/us/en/architecture-and-technology/64-ia-32-architectures-software-developer-instruction-set-reference-manual-325383.html?wapkw=instruction+set+reference
+         */
+        #define __UTIL_LOCK_SPIN_LOCK_PAUSE() __asm__ __volatile__("pause")
+    #elif defined(__ia64__) || defined(__ia64)
+        /**
+         * See: Intel(R) Itanium(R) Architecture Developer's Manual, Vol.3
+         * hint - Performance Hint, 3:145
+         * http://www.intel.com/content/www/us/en/processors/itanium/itanium-architecture-vol-3-manual.html
+         */
+        #define __UTIL_LOCK_SPIN_LOCK_PAUSE() __asm__ __volatile__ ("hint @pause")
+    #elif defined(__arm__) && !defined(__ANDROID__)
+        /**
+         * See: ARM Architecture Reference Manuals (YIELD)
+         * http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.subset.architecture.reference/index.html
+         */
+        #define __UTIL_LOCK_SPIN_LOCK_PAUSE() __asm__ __volatile__ ("yield")
+    #endif
+
+#endif /*compilers*/
+
+// set pause do nothing
+#if !defined(__UTIL_LOCK_SPIN_LOCK_PAUSE)
+    #define __UTIL_LOCK_SPIN_LOCK_PAUSE()
+#endif/*!defined(CAPO_SPIN_LOCK_PAUSE)*/
+
+
+/**
+ * ==============================================
+ * ======            cpu yield             ======
+ * ==============================================
+ */
+#if defined(_MSC_VER)
+    #define __UTIL_LOCK_SPIN_LOCK_CPU_YIELD() SwitchToThread()
+    
+#elif defined(__linux__) || defined(__unix__)
+    #include <sched.h>
+    #define __UTIL_LOCK_SPIN_LOCK_CPU_YIELD() sched_yield()
+#endif
+
+#ifndef __UTIL_LOCK_SPIN_LOCK_CPU_YIELD
+    #define __UTIL_LOCK_SPIN_LOCK_CPU_YIELD() __UTIL_LOCK_SPIN_LOCK_PAUSE()
+#endif
+
+/**
+ * ==============================================
+ * ======           thread yield           ======
+ * ==============================================
+ */
+#if defined(__UTIL_LOCK_SPINLOCK_ATOMIC_STD)
+    #include <thread>
+    #include <chrono>
+    #define __UTIL_LOCK_SPIN_LOCK_THREAD_YIELD() ::std::this_thread::yield()
+    #define __UTIL_LOCK_SPIN_LOCK_THREAD_SLEEP() ::std::this_thread::sleep_for(::std::chrono::milliseconds(1))
+#elif defined(_MSC_VER)
+    #define __UTIL_LOCK_SPIN_LOCK_THREAD_YIELD() Sleep(0)
+    #define __UTIL_LOCK_SPIN_LOCK_THREAD_SLEEP() Sleep(1)
+#endif
+
+#ifndef __UTIL_LOCK_SPIN_LOCK_THREAD_YIELD
+    #define __UTIL_LOCK_SPIN_LOCK_THREAD_YIELD()
+    #define __UTIL_LOCK_SPIN_LOCK_THREAD_SLEEP() __UTIL_LOCK_SPIN_LOCK_CPU_YIELD()
+#endif
+
+/**
+ * ==============================================
+ * ======           spin lock wait         ======
+ * ==============================================
+ * @note
+ *   1. busy-wait
+ *   2. asm pause
+ *   3. thread give up cpu time slice but will not switch to another process
+ *   4. thread give up cpu time slice (may switch to another process)
+ *   5. sleep (will switch to another process when necessary)
+ */
+ 
+#define __UTIL_LOCK_SPIN_LOCK_WAIT(x) \
+{ \
+    unsigned char try_lock_times = static_cast<unsigned char>(x); \
+    if (try_lock_times < 4) {} \
+    else if (try_lock_times < 16) { __UTIL_LOCK_SPIN_LOCK_PAUSE(); } \
+    else if (try_lock_times < 32) { __UTIL_LOCK_SPIN_LOCK_THREAD_YIELD(); } \
+    else if (try_lock_times < 64) { __UTIL_LOCK_SPIN_LOCK_CPU_YIELD(); } \
+    else { __UTIL_LOCK_SPIN_LOCK_THREAD_SLEEP(); } \
+}
+    
+    
+#ifdef __UTIL_LOCK_SPINLOCK_ATOMIC_STD
+class SpinLock
+{
+private:
+    typedef enum {Unlocked = 0, Locked = 1} LockState;
+    ::std::atomic_uint m_enStatus;
+
+public:
+    SpinLock() {
+        m_enStatus.store(Unlocked);
+    }
+
+    void Lock()
+    {
+        unsigned char try_times = 0;
+        while (m_enStatus.exchange(static_cast<unsigned int>(Locked), ::std::memory_order_acq_rel) == Locked)
+            __UTIL_LOCK_SPIN_LOCK_WAIT(try_times ++); /* busy-wait */
+    }
+
+    void Unlock()
+    {
+        m_enStatus.store(static_cast<unsigned int>(Unlocked), ::std::memory_order_release);
+    }
+
+    bool IsLocked()
+    {
+        return m_enStatus.load(::std::memory_order_acquire) == Locked;
+    }
+
+    bool TryLock()
+    {
+        return m_enStatus.exchange(static_cast<unsigned int>(Locked), ::std::memory_order_acq_rel) == Unlocked;
+    }
+          
+    bool TryUnlock()
+    {
+        return m_enStatus.exchange(static_cast<unsigned int>(Unlocked), ::std::memory_order_acq_rel) == Locked;
+    }
+
+};
+#else
+
+#if defined(__clang__)
+    #if !defined(__GCC_ATOMIC_INT_LOCK_FREE) && (!defined(__GNUC__) || __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1))
+        #error Clang version is too old
+    #endif
+    #if defined(__GCC_ATOMIC_INT_LOCK_FREE)
+        #define __UTIL_LOCK_SPINLOCK_ATOMIC_GCC_ATOMIC 1
+    #else
+        #define __UTIL_LOCK_SPINLOCK_ATOMIC_GCC 1
+    #endif
+#elif defined(_MSC_VER)
+    #include <WinBase.h>
+    #define __UTIL_LOCK_SPINLOCK_ATOMIC_MSVC 1
+            
+#elif defined(__GNUC__) || defined(__clang__) || defined(__clang__) || defined(__INTEL_COMPILER)
+    #if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1))
+        #error GCC version must be greater or equal than 4.1
+    #endif
+            
+    #if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1100
+        #error Intel Compiler version must be greater or equal than 11.0
+    #endif
+            
+    #if defined(__GCC_ATOMIC_INT_LOCK_FREE)
+        #define __UTIL_LOCK_SPINLOCK_ATOMIC_GCC_ATOMIC 1
+    #else
+        #define __UTIL_LOCK_SPINLOCK_ATOMIC_GCC 1
+    #endif
+#else
+    #error Currently only gcc, msvc, intel compiler & llvm-clang are supported
+#endif
+
+class SpinLock
+{
+private:
+    typedef enum {Unlocked = 0, Locked = 1} LockState;
+    volatile unsigned int m_enStatus;
+
+public:
+    SpinLock() : m_enStatus(Unlocked) {}
+
+    void Lock()
+    {
+        unsigned char try_times = 0;
+    #ifdef __UTIL_LOCK_SPINLOCK_ATOMIC_MSVC
+        while(InterlockedExchange(&m_enStatus, Locked) == Locked)
+            __UTIL_LOCK_SPIN_LOCK_WAIT(try_times ++); /* busy-wait */
+    #elif defined(__UTIL_LOCK_SPINLOCK_ATOMIC_GCC_ATOMIC)
+        while (__atomic_exchange_n(&m_enStatus, Locked, __ATOMIC_ACQ_REL) == Locked)
+            __UTIL_LOCK_SPIN_LOCK_WAIT(try_times ++); /* busy-wait */
+    #else
+        while(__sync_lock_test_and_set(&m_enStatus, Locked) == Locked)
+            __UTIL_LOCK_SPIN_LOCK_WAIT(try_times ++); /* busy-wait */
+    #endif
+    }
+
+    void Unlock()
+    {
+    #ifdef __UTIL_LOCK_SPINLOCK_ATOMIC_MSVC
+        InterlockedExchange(&m_enStatus, Unlocked);
+    #elif defined(__UTIL_LOCK_SPINLOCK_ATOMIC_GCC_ATOMIC)
+        __atomic_store_n(&m_enStatus, Unlocked, __ATOMIC_RELEASE);
+    #else
+        __sync_lock_release(&m_enStatus, Unlocked);
+    #endif
+    }
+
+    bool IsLocked()
+    {
+    #ifdef __UTIL_LOCK_SPINLOCK_ATOMIC_MSVC
+        return InterlockedExchangeAdd(&m_enStatus, 0) == Locked;
+    #elif defined(__UTIL_LOCK_SPINLOCK_ATOMIC_GCC_ATOMIC)
+        return __atomic_load_n(&m_enStatus, __ATOMIC_ACQUIRE) == Locked;
+    #else
+        return __sync_add_and_fetch(&m_enStatus, 0) == Locked;
+    #endif
+    }
+
+    bool TryLock()
+    {
+
+    #ifdef __UTIL_LOCK_SPINLOCK_ATOMIC_MSVC
+        return InterlockedExchange(&m_enStatus, Locked) == Unlocked;
+    #elif defined(__UTIL_LOCK_SPINLOCK_ATOMIC_GCC_ATOMIC)
+        return __atomic_exchange_n(&m_enStatus, Locked, __ATOMIC_ACQ_REL) == Unlocked;
+    #else
+        return __sync_bool_compare_and_swap(&m_enStatus, Unlocked, Locked);
+    #endif
+    }
+          
+    bool TryUnlock()
+    {
+    #ifdef __UTIL_LOCK_SPINLOCK_ATOMIC_MSVC
+        return InterlockedExchange(&m_enStatus, Unlocked) == Locked;
+    #elif defined(__UTIL_LOCK_SPINLOCK_ATOMIC_GCC_ATOMIC)
+        return __atomic_exchange_n(&m_enStatus, Unlocked, __ATOMIC_ACQ_REL) == Locked;
+    #else
+        return __sync_bool_compare_and_swap(&m_enStatus, Locked, Unlocked);
+    #endif
+    }
+
+};
+
+#endif
+
+#endif /* SPINLOCK_H_ */
diff --git a/Source/UnrealSoda/Public/Soda/Misc/TelemetryGraph.h b/Source/UnrealSoda/Public/Soda/Misc/TelemetryGraph.h
new file mode 100644
index 0000000..a9bcda7
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/TelemetryGraph.h
@@ -0,0 +1,50 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include <deque>
+
+//#include "TelemetryGraph.generated.h"
+
+class UCanvas;
+
+struct UNREALSODA_API FTelemetryGraph
+{
+	void Init(const FString & InTitle, int InWidth, int InHeight, float InMinY, float InMaxY, int InNumSamples, const TArray<FColor>& Colors = { {255, 255, 0, 128} });
+	void AddPoint(float Value, int Ind = 0);
+	float Draw(UCanvas* InCanvas, float & XPos, float YPos);
+
+protected:
+	FString Title;
+	int Width = 100;
+	int Height = 100;
+	float MinY = 0;
+	float MaxY = 1;
+	int NumSamples = 300;
+	TArray<FColor> Colors = { {255, 255, 0, 128} };
+	TArray<std::deque<float>> Points;
+};
+
+struct UNREALSODA_API FTelemetryGraphGrid
+{
+	struct UNREALSODA_API FCell
+	{
+		FString Caption = "";
+		bool Visible = false;
+		int OffsetX = 0;
+		FTelemetryGraph Graph;
+	};
+
+	void InitGrid(int Rows, int Cols, int InCellWidth = 100, int InCellHeight = 100, int InNumSamples = 300);
+	FCell& InitCell(int Row, int Col, float MinY, float MaxY, const FString& Title = "", const FString& RowTitle = "", const TArray<FColor>& Colors = {{255, 255, 0, 128}}, int OffsetX = 0);
+	void AddPoint(int Row, int Col, float Value, int Ind = 0);
+	float Draw(UCanvas* InCanvas, float & XPos, float YPos);
+
+protected:
+	int CellWidth = 100; 
+	int CellHeight = 100; 
+	int NumSamples = 300;
+
+	TArray<TArray<FCell>> Grid;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/Time.h b/Source/UnrealSoda/Public/Soda/Misc/Time.h
new file mode 100644
index 0000000..b868229
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/Time.h
@@ -0,0 +1,51 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include <chrono>
+#include <string>
+
+typedef std::chrono::time_point<std::chrono::system_clock> TTimestamp;
+
+namespace soda 
+{
+	template <
+		typename Clock = std::chrono::system_clock,
+		typename Units = std::chrono::nanoseconds
+	>
+	inline auto ChronoTimestamp(typename Clock::rep u) noexcept
+	{
+		using namespace std::chrono;
+		using TPoint = time_point<Clock>;
+		using TDuration = typename Clock::duration;
+		return TPoint(duration_cast<TDuration>(Units(u)));
+	}
+	template < typename Units = std::chrono::milliseconds, typename TimePoint = std::chrono::system_clock::time_point >
+	inline auto RawTimestamp(TimePoint time)
+	{
+		return std::chrono::duration_cast<Units>(time.time_since_epoch()).count();
+	}
+
+	template < typename Clock = std::chrono::system_clock, typename Units = std::chrono::milliseconds >
+	inline auto NowRaw()
+	{
+		return RawTimestamp< Units >(Clock::now());
+	}
+	template < typename Clock = std::chrono::system_clock>
+	inline auto Now()
+	{
+		return Clock::now();
+	}
+
+	inline FString ToString(int64 Value)
+	{
+		return std::to_string(Value).c_str();
+	}
+
+	template < typename Units = std::chrono::milliseconds >
+	inline FString ToString(const TTimestamp& Timestamp)
+	{
+		return soda::ToString(int64(soda::RawTimestamp<Units>(Timestamp)));
+	}
+}
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/TrajectoryPlaner.h b/Source/UnrealSoda/Public/Soda/Misc/TrajectoryPlaner.h
new file mode 100644
index 0000000..fcd9d8b
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/TrajectoryPlaner.h
@@ -0,0 +1,104 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "UObject/Class.h"
+#include "Components/SplineComponent.h"
+#include "TrajectoryPlaner.generated.h"
+
+class ANavigationRoute;
+class USplineComponent;
+class UBoxComponent;
+
+USTRUCT(BlueprintType, Blueprintable)
+struct FTrajectoryPlaner
+{
+	GENERATED_USTRUCT_BODY()
+
+public:
+	/** Min distance between different target points*/
+	UPROPERTY(EditAnywhere, Category = TrajectoryPlaner, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float SamePointsDelta = 30.0f;
+
+	UPROPERTY(EditAnywhere, Category = TrajectoryPlaner, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	bool bAutoSweep = false;
+
+	UPROPERTY(EditAnywhere, Category = WayOutLine, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float WayOutOffset = 2000;
+
+	UPROPERTY(EditAnywhere, Category = WayOutLine, BlueprintReadOnly, SaveGame, meta = (EditInRuntime))
+	float WayOutTangentSize = 2000;
+
+public:
+	~FTrajectoryPlaner();
+
+	struct FWayPoint
+	{
+		FWayPoint() {}
+		FWayPoint(const FVector& InLocation, ANavigationRoute* InRoute = nullptr);
+		FVector Location;
+		TWeakObjectPtr<ANavigationRoute> OwndedRoute;
+	};
+
+	void Init(UWorld * World);
+	void Deinit();
+
+	bool AddRouteBySpline(const USplineComponent* SplineRoute, float StartOffse = 0, ANavigationRoute* OwnedRoute = nullptr, bool bNewDriveBackvard = false, bool bOverwriteCurrent = true, bool bUpdateSpline = true);
+	bool AddRouteByWaypoints(const TArray< FVector >& Locations, ANavigationRoute* OwnedRoute = nullptr, bool bNewDriveBackvard = false, bool bOverwriteCurrent = true, bool bUpdateSpline = true);
+	bool AddRouteByTransfoms(const FTransform& StartTransform, const FTransform& EndTransform, ANavigationRoute* OwnedRoute = nullptr, bool bNewDriveBackvard = false, bool bOverwriteCurrent = true, bool bUpdateSpline = true);
+	bool UpdateTarjectory(const UWorld* World, const FTransform& Transform, float PreloadDistance, const TSet<FString> & AllowedRouteTags = TSet<FString>());
+	void UpdateSpline();
+
+	void DrawRoute(const UObject* WorldContextObject) const;
+
+	//bool GoToNearesRoute(const UWorld* World, const FTransform& Transform);
+	bool GoToLeftRoute(const UWorld* World, const FTransform& Transform, float Offset);
+	bool GoToRightRoute(const UWorld* World, const FTransform& Transform, float Offset);
+	bool GoToRoute(const UWorld* World, const FTransform& Transform, float Offset, ANavigationRoute* Route);
+
+	void Reset();
+
+	float GetDistanceAlongSpline() const { return RouteSpline->GetDistanceAlongSplineAtSplineInputKey(CurrentSplineKey); }
+	void SetSplineOffset(float SplineOffset) { CurrentSplineKey = RouteSpline->SplineCurves.ReparamTable.Eval(SplineOffset, 0.0f); }
+
+	float GetCurrentSplineKey() const { return CurrentSplineKey; }
+	void SetCurrentSplineKey(float Key);
+
+	const FWayPoint* GetCurrentWayPoint() const;
+	const TArray< FWayPoint >& GetWayPoints() const { return WayPoints; }
+	int GetWayPointsNum() const { return WayPoints.Num(); }
+	const USplineComponent * GetRouteSpline() const { return RouteSpline; }
+	bool  IsEnded() const { return (WayPoints.Num() - CurrentSplineKey) < 0.01; }
+
+	FVector::FReal GetCurvatureAtKey(float Param) const;
+
+public:
+	/**
+	 * FindNearestRoute
+	 * @param MaxCodirAng      Maximum angle between tangent to spline and ForwardVector
+	 * @param MaxDistance      Maximum distance between the closest point on the spline and the Location
+	 * @param MaxDistanceToEnd Maximum distance between the closest point on the spline and end of the spline
+	 */
+	static USplineComponent* FindNearestRoute(
+		const UWorld* World, 
+		const FTransform& Transform,
+		float MaxCodirAng = 90,
+		float MaxDistance = 200,
+		float MaxDistanceToEnd = 200,
+		ANavigationRoute** OutRoutePlanner = nullptr,
+		float* OutSplineOffest = nullptr);
+
+	static ANavigationRoute* FindRoutePlannerOverlapedByActor(const AActor* Actor);
+	static ANavigationRoute* FindRoutePlannerOverlapedByPoint(const UObject* WorldContextObject, const FVector& TargetLocation, bool bDriveBackvardFilter, const TSet<FString>& AllowedRouteTags = TSet<FString>());
+	static bool IsPointInsideBox(const FVector& Point, const UBoxComponent* BoxComponent, float Border = 100);
+
+protected:
+	float CurrentSplineKey = 0;
+
+	TArray< FWayPoint > WayPoints;
+	//bool bDriveBackvard;
+
+	UPROPERTY()
+	USplineComponent * RouteSpline = nullptr;
+
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Misc/WatingQueue.h b/Source/UnrealSoda/Public/Soda/Misc/WatingQueue.h
new file mode 100644
index 0000000..ef8b1eb
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Misc/WatingQueue.h
@@ -0,0 +1,66 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include <mutex>
+#include <condition_variable>
+#include <deque>
+
+template < class T >
+class UNREALSODA_API TWatingQueue
+{
+
+public:
+	void Push(const T& el)
+	{
+		std::unique_lock< std::mutex > lock(Mutex);
+		Queue.push_back(el);
+		Cv.notify_one();
+	}
+
+	template< class... Args >
+	void EmplacePush(Args&&... args)
+	{
+		std::unique_lock< std::mutex > lock(Mutex);
+		Queue.emplace_back(args...);
+		Cv.notify_one();
+	}
+
+	bool PopFront(T& Data, uint32 Timeout)
+	{
+		std::unique_lock< std::mutex > lock(Mutex);
+		auto now = std::chrono::system_clock::now();
+		while (!Queue.size())
+		{
+			if (Cv.wait_until(lock, now + std::chrono::milliseconds(Timeout)) == std::cv_status::timeout) return false;
+		}
+		Data = Queue.front();
+		Queue.pop_front();
+		return true;
+	}
+
+	bool PopBack(T& Data, uint32 Timeout)
+	{
+		std::unique_lock< std::mutex > lock(Mutex);
+		auto now = std::chrono::system_clock::now();
+		while (!Queue.size())
+		{
+			if (Cv.wait_until(lock, now + std::chrono::milliseconds(Timeout)) == std::cv_status::timeout) return false;
+		}
+		Data = Queue.back();
+		Queue.pop_back();
+		return true;
+	}
+
+	std::size_t Size() const
+	{
+		std::unique_lock< std::mutex > lock(Mutex);
+		return Queue.size();
+	}
+
+	mutable std::mutex Mutex;
+	std::deque< T > Queue;
+
+private:
+	std::condition_variable Cv;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioAction.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioAction.h
new file mode 100644
index 0000000..977be1f
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioAction.h
@@ -0,0 +1,57 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Soda/ISodaActor.h"
+#include "ScenarioAction.generated.h"
+
+class USodaGameModeComponent;
+class UScenarioActionBlock;
+class SScenarioActionEditor;
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API AScenarioAction : public AActor, public ISodaActor
+{
+	GENERATED_BODY()
+
+public:
+
+	//UPROPERTY()
+	//TArray<UScenarioInitialization> ScenarioInitializations;
+
+	UPROPERTY()
+	TArray<UScenarioActionBlock*> ScenarioBlocks;
+
+	//UPROPERTY()
+	//TArray<UScenarioFinalization> ScenarioFinalization;
+
+public:
+	UScenarioActionBlock* CreateNewBlock();
+	bool RemoveBlock(UScenarioActionBlock* Block);
+
+	void CloseEditorWindow();
+
+public:
+	/* Override from ISodaActor */
+	virtual void ScenarioBegin() override;
+	virtual void ScenarioEnd() override;
+	virtual TSharedPtr<SWidget> GenerateToolBar() override;
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+
+
+
+public:
+	AScenarioAction();
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void Tick(float DeltaTime) override;
+	virtual void Serialize(FArchive& Ar) override;
+
+protected:
+	TSharedPtr<SScenarioActionEditor> ScenarioActionEditor;
+};
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionBlock.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionBlock.h
new file mode 100644
index 0000000..65c8032
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionBlock.h
@@ -0,0 +1,105 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Array.h"
+#include "Containers/ArrayView.h"
+#include "CoreMinimal.h"
+#include "CoreTypes.h"
+#include "HAL/Platform.h"
+#include "Internationalization/Text.h"
+#include "Math/Color.h"
+#include "Misc/AssertionMacros.h"
+#include "Misc/EnumClassFlags.h"
+#include "Misc/Guid.h"
+#include "Misc/InlineValue.h"
+#include "Templates/SubclassOf.h"
+#include "UObject/NameTypes.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/UObjectGlobals.h"
+#include "UObject/UnrealNames.h"
+#include "UObject/UnrealType.h"
+#include "Widgets/Views/ITableRow.h"
+
+
+#include "ScenarioActionBlock.generated.h"
+
+class AScenarioAction;
+class UScenarioActionCondition;
+class UScenarioActionNode;
+class SScenarioActionEditor;
+class UScenarioActionEvent;
+
+UENUM()
+enum class EScenarioActionBlockMode: uint8
+{
+	SingleExecute,
+	MultipleExecute
+};
+
+USTRUCT()
+struct FScenarioConditionRow
+{
+	GENERATED_BODY()
+
+	UPROPERTY()
+	TArray<UScenarioActionCondition*> ScenarioConditiones;
+
+	UScenarioActionCondition* operator[](int i) { return ScenarioConditiones[i]; }
+	const UScenarioActionCondition* operator[](int i) const { return ScenarioConditiones[i]; }
+};
+
+/**
+ * UScenarioActionBlock
+ */
+UCLASS()
+class UNREALSODA_API UScenarioActionBlock: public UObject
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionBlock(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioActionBlock() {};
+
+	virtual void Serialize(FArchive& Ar) override;
+
+	bool ExecuteBlock();
+	void ExecuteActions();
+	bool ExecuteConditionMatrix();
+
+	void SetDisplayName(FName InDisplayName) { DisplayName = InDisplayName; }
+	FName GetDisplayName() const { return DisplayName; }
+
+	void SetActionBlockMode(EScenarioActionBlockMode Mode) { ActionBlockMode = Mode; }
+	EScenarioActionBlockMode GetActionBlockMode() const { return ActionBlockMode; }
+
+	void ResetExexuteCounter() { ExexuteCounter = 0; }
+
+	void OnEvent() { ExecuteBlock(); }
+
+public:
+	UPROPERTY()
+	TWeakObjectPtr<AScenarioAction> OwnedScenario;
+
+	UPROPERTY(SaveGame)
+	FName DisplayName;
+
+	UPROPERTY()
+	TArray<UScenarioActionEvent*> Events;
+
+	/**
+	 *  The Condition Matrix;
+	 *  Rows - "OR"
+	 *  Cols - "AND"
+	 */
+	UPROPERTY()
+	TArray<FScenarioConditionRow> ConditionMatrix;
+
+	UPROPERTY()
+	TArray<UScenarioActionNode*> ActionRootNodes;
+
+	UPROPERTY(SaveGame)
+	EScenarioActionBlockMode ActionBlockMode;
+
+	int ExexuteCounter = 0;
+};
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionCondition.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionCondition.h
new file mode 100644
index 0000000..432b5c4
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionCondition.h
@@ -0,0 +1,82 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Array.h"
+#include "Containers/ArrayView.h"
+#include "CoreMinimal.h"
+#include "CoreTypes.h"
+#include "HAL/Platform.h"
+#include "Internationalization/Text.h"
+#include "Math/Color.h"
+#include "Misc/AssertionMacros.h"
+#include "Misc/EnumClassFlags.h"
+#include "Misc/Guid.h"
+#include "Misc/InlineValue.h"
+#include "Templates/SubclassOf.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/NameTypes.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/UObjectGlobals.h"
+#include "UObject/UnrealNames.h"
+#include "UObject/UnrealType.h"
+#include "Widgets/Views/ITableRow.h"
+#include "Widgets/SNullWidget.h"
+#include "ScenarioActionCondition.generated.h"
+
+class FStructOnScope;
+
+/**
+ * UScenarioActionCondition
+ */
+UCLASS(abstract)
+class UNREALSODA_API UScenarioActionCondition : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionCondition(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioActionCondition() {};
+
+public:
+	virtual bool Execute() { return false; }
+	virtual TSharedRef< SWidget > MakeWidget() { return SNullWidget::NullWidget; }
+	virtual FText GetDisplayName() const { return DisplayName; }
+	
+protected:
+	FText DisplayName;
+};
+
+
+/**
+ * UScenarioActionConditionFunction
+ */
+UCLASS()
+class UNREALSODA_API UScenarioActionConditionFunction : public UScenarioActionCondition
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionConditionFunction(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioActionConditionFunction() {};
+
+	virtual void Serialize(FArchive& Ar) override;
+
+public:
+	virtual bool Execute();
+	virtual TSharedRef< SWidget > MakeWidget() override;
+
+public:
+	void SetFunction(UFunction* Function, UClass * OwnerClass);
+	UFunction* GetFunction() { return Function.Get(); }
+	const UFunction* GetFunction() const { return Function.Get(); }
+
+protected:
+	TSharedPtr<FStructOnScope> StructOnScope;
+
+	UPROPERTY(SaveGame)
+	TSoftObjectPtr<UFunction> Function;
+
+	UPROPERTY(SaveGame)
+	TSoftClassPtr<UClass> FunctionOwner;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionConditionFunctionLibrary.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionConditionFunctionLibrary.h
new file mode 100644
index 0000000..a457569
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionConditionFunctionLibrary.h
@@ -0,0 +1,47 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Kismet/BlueprintFunctionLibrary.h"
+#include "ScenarioActionConditionFunctionLibrary.generated.h"
+
+class ASodaVehicle;
+
+UCLASS()
+class UNREALSODA_API UScenarioActionConditionFunctionLibraryBase : public UBlueprintFunctionLibrary
+{
+	GENERATED_UCLASS_BODY()
+};
+
+
+UCLASS(meta=(RuntimeMetaData))
+class UNREALSODA_API UScenarioActionConditionFunctionLibrary : public UScenarioActionConditionFunctionLibraryBase
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UFUNCTION(BlueprintCallable, Category = Test)
+	static bool TestFunction1();
+
+	UFUNCTION(BlueprintCallable, Category = Test)
+	static bool TestFunction2(bool Param1);
+
+	UFUNCTION(BlueprintCallable, Category = Test)
+	static bool TestFunction3(bool Param1, int Param2, const FString & Param3);
+
+	UFUNCTION(BlueprintCallable, Category = Test)
+	static bool TestFunction4(const FVector & Param1, const FRotator & Param2);
+
+
+
+	static bool AtScenarioTime(float Time);
+	static bool ReachPosition(ASodaVehicle * Vehicle, FVector2D & Position, float Width, float Delay);
+	static bool ReltiveDistance(AActor* FromActor, AActor* ToActor, float Distance, float Delay); // Add: LessThan/GreaterThan; Position/ClosesPoint; Longotude/Euclidean
+	static bool RelativeSpeed(AActor* FromActor, AActor* ToActor, float Speed, float Delay); // Add: LessThan/GreaterThan
+	static bool StandStill(AActor* Actor, float Duration, float SpeedTolerance, float Delay);
+	// static bool TrafficLightState(ATrafficLight* TrafficLight, State, float Delay);
+
+
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionEvent.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionEvent.h
new file mode 100644
index 0000000..eeb4556
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionEvent.h
@@ -0,0 +1,35 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Templates/SharedPointer.h"
+#include "ScenarioActionEvent.generated.h"
+
+class SWidget;
+
+/**
+ * UScenarioActionEvent
+ */
+UCLASS(abstract, meta = (RuntimeMetaData))
+class UNREALSODA_API UScenarioActionEvent : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionEvent(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioActionEvent() {};
+
+public:
+	virtual TSharedRef< SWidget > MakeWidget();
+	virtual FText GetDisplayName() const { return DisplayName; }
+
+	virtual void Tick(float DeltaTime) {}
+	virtual void ScenarioBegin() {}
+	virtual void ScenarioEnd() {}
+
+	FSimpleDelegate EventDelegate;
+	
+protected:
+	FText DisplayName;
+};
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionEventLibrary.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionEventLibrary.h
new file mode 100644
index 0000000..dcd6fb1
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionEventLibrary.h
@@ -0,0 +1,208 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "ScenarioActionEvent.h"
+#include "ScenarioActionEventLibrary.generated.h"
+
+class ASodaVehicle;
+class AScenarioTriggerBase;
+
+UENUM()
+enum class EScenarioEventConditional: uint8
+{
+	LessThan,
+	GreaterThan
+};
+
+UENUM()
+enum class EScenarioEventOverlapEstimation : uint8
+{
+	Position,
+	ClosesPoint
+};
+
+UENUM()
+enum class EScenarioEventDistanceEstimation : uint8
+{
+	Longotude,
+	Euclidean
+};
+
+/**
+ * UEventAtScenarioBegin
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventAtScenarioBegin : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventAtScenarioBegin(const FObjectInitializer& InInitializer);
+	virtual void ScenarioBegin() override { EventDelegate.ExecuteIfBound(); }
+};
+
+/**
+ * UEventAtScenarioEnd
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventAtScenarioEnd : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventAtScenarioEnd(const FObjectInitializer& InInitializer);
+	virtual void ScenarioEnd() override { EventDelegate.ExecuteIfBound(); }
+};
+
+/**
+ * UEventAtScenarioTick
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventAtScenarioTick : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventAtScenarioTick(const FObjectInitializer& InInitializer);
+	virtual void Tick(float DeltaTime) override { EventDelegate.ExecuteIfBound(); }
+};
+
+/**
+ * UEventAtScenarioTime
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventAtScenarioTime : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventAtScenarioTime(const FObjectInitializer& InInitializer);
+	virtual void ScenarioBegin() override;
+	virtual void Tick(float DeltaTime) override;
+
+public:
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	float ScenarioTime;
+
+protected:
+	float CurrentTime;
+};
+
+/**
+ * UEventOverlapTrigger
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventOverlapTrigger : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventOverlapTrigger(const FObjectInitializer& InInitializer);
+	virtual void Tick(float DeltaTime) override;
+
+public:
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta=(ScenarioAction))
+	TSoftObjectPtr<AActor> Actor;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	TSoftObjectPtr<AScenarioTriggerBase> Trigger;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	EScenarioEventOverlapEstimation OverlapEstimation;
+
+
+	//float Delay;
+};
+
+/**
+ * UEventRelativeDistance
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventRelativeDistance : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventRelativeDistance(const FObjectInitializer& InInitializer);
+	virtual void ScenarioBegin() override;
+	virtual void Tick(float DeltaTime) override;
+
+public:
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	TSoftObjectPtr<AActor> FromActor;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	TSoftObjectPtr<AActor> ToActor;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	float Distance;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	EScenarioEventConditional Conditional;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	EScenarioEventOverlapEstimation OverlapEstimation;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	EScenarioEventDistanceEstimation DistanceEstimation;
+
+	//float Delay;
+
+protected:
+	FBox FromActorExtent;
+	FBox ToActorExtent;
+};
+
+/**
+ * UEventRelativeSpeed
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventRelativeSpeed : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventRelativeSpeed(const FObjectInitializer& InInitializer);
+	virtual void Tick(float DeltaTime) override;
+
+public:
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	TSoftObjectPtr<AActor> FromActor;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	TSoftObjectPtr<AActor> ToActor;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	float Speed;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	EScenarioEventConditional Conditional;
+
+	//float Delay; 
+};
+
+/**
+ * UEventStandStill
+ */
+UCLASS(meta = (RuntimeMetaData))
+class UNREALSODA_API UEventStandStill : public UScenarioActionEvent
+{
+	GENERATED_BODY()
+
+public:
+	UEventStandStill(const FObjectInitializer& InInitializer);
+	virtual void Tick(float DeltaTime) override;
+
+public:
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	AActor* Actor;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	float Duration;
+
+	UPROPERTY(EditAnywhere, Category = Event, SaveGame, meta = (ScenarioAction))
+	float SpeedTolerance;
+
+	//float Delay;
+};
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionFunctionLibrary.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionFunctionLibrary.h
new file mode 100644
index 0000000..8c4fa1f
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionFunctionLibrary.h
@@ -0,0 +1,36 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Kismet/BlueprintFunctionLibrary.h"
+#include "ScenarioActionFunctionLibrary.generated.h"
+
+
+
+UCLASS()
+class UNREALSODA_API UScenarioActionFunctionLibraryBase : public UBlueprintFunctionLibrary
+{
+	GENERATED_UCLASS_BODY()
+};
+
+
+UCLASS(meta=(RuntimeMetaData))
+class UNREALSODA_API UScenarioActionFunctionLibrary : public UScenarioActionFunctionLibraryBase
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool TestFunction1();
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool TestFunction2(bool Param1);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool TestFunction3(bool Param1, int Param2, const FString & Param3);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool TestFunction4(const FVector & Param1, const FRotator & Param2);
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionNode.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionNode.h
new file mode 100644
index 0000000..97ddf5d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionNode.h
@@ -0,0 +1,315 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Containers/Array.h"
+#include "Containers/ArrayView.h"
+#include "CoreMinimal.h"
+#include "CoreTypes.h"
+#include "UObject/WeakFieldPtr.h"
+#include "HAL/Platform.h"
+#include "Internationalization/Text.h"
+#include "Math/Color.h"
+#include "Misc/AssertionMacros.h"
+#include "Misc/EnumClassFlags.h"
+#include "Misc/Guid.h"
+#include "Misc/InlineValue.h"
+#include "Templates/SubclassOf.h"
+#include "UObject/NameTypes.h"
+#include "UObject/ObjectMacros.h"
+#include "UObject/UObjectGlobals.h"
+#include "UObject/UnrealNames.h"
+#include "UObject/UnrealType.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+#include "Widgets/Views/ITableRow.h"
+#include "Widgets/SNullWidget.h"
+#include "UObject/SoftObjectPtr.h"
+#include "ScenarioActionNode.generated.h"
+
+class STableViewBase;
+class SScenarioActionEditor;
+class SScenarioActionTree;
+class FStructOnScope;
+class UActorComponent;
+class AActor;
+
+/**
+ * UScenarioActionNode
+ */
+UCLASS(abstract)
+class UNREALSODA_API UScenarioActionNode : public UObject
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionNode(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioActionNode() {};
+
+public:
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree) PURE_VIRTUAL(UScenarioActionNode::MakeRowWidget, return TSharedPtr< ITableRow >().ToSharedRef(); );
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() { return SNullWidget::NullWidget; }
+	virtual TArray< TWeakObjectPtr<UScenarioActionNode> >& GetChildren() { return WeakChildren; }
+	virtual void AddChildrenNode(UScenarioActionNode* Node, bool bSaveHardRef = true);
+	virtual UScenarioActionNode* GetParentNode() const { return ParenNode.Get(); }
+	virtual bool RemoveChildrenNode(UScenarioActionNode* Node);
+	virtual bool RemoveThisNode();
+	virtual bool IsNodeValid() const { return false; }
+	virtual bool ShouldSerializeChildren() const { return false; };
+	virtual bool IsTransitentActionNode() const { return false; };
+	virtual void Execute();
+
+	template <typename T> 
+	T* GetParentNode() { return Cast<T>(GetParentNode()); }
+
+	template <typename T>
+	T* GetParentNodeChecked() { return CastChecked<T>(GetParentNode()); }
+
+public:
+	virtual void Serialize(FArchive& Ar) override;
+	
+public:
+
+	/**
+	 * Get the track row's display name.
+	 *
+	 * @return Display name text.
+	 */
+	//virtual FText GetRowDisplayName(int32 RowIndex) const { return FText::FromString(TEXT("Unnamed Track")); }
+
+	/**
+	 * Get the track's display tooltip text to be shown on the track's name.
+	 *
+	 * @return Display tooltip text.
+	 */
+	//virtual FText GetDisplayNameToolTipText() const { return FText::GetEmpty(); }
+
+
+	/**
+	 * Get this folder's desired sorting order
+	 */
+	int32 GetSortingOrder() const
+	{
+		return SortingOrder;
+	}
+
+	/**
+	 * Set this folder's desired sorting order.
+	 *
+	 * @param InSortingOrder The higher the value the further down the list the folder will be.
+	 */
+	void SetSortingOrder(const int32 InSortingOrder)
+	{
+		SortingOrder = InSortingOrder;
+	}
+
+protected:
+	/** This folder's desired sorting order */
+	UPROPERTY()
+	int32 SortingOrder = -1;
+
+	UPROPERTY()
+	TArray <UScenarioActionNode*> Children;
+
+	TArray <TWeakObjectPtr<UScenarioActionNode>> WeakChildren;
+
+	TWeakObjectPtr<UScenarioActionNode> ParenNode;
+};
+
+/**
+ * UScenarioObjectNode
+ */
+UCLASS()
+class UScenarioObjectNode : public UScenarioActionNode
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioObjectNode(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioObjectNode() {}
+
+public:
+	virtual bool IsNodeValid() const override;
+	virtual bool ShouldSerializeChildren() const { return true; }
+	virtual void Execute() override;
+
+public:
+	virtual void Serialize(FArchive& Ar) override;
+
+public:
+	void InitializeNode(UObject* InObject);
+	UObject * GetObject() const { return Object.Get(); }
+	TSharedPtr<FStructOnScope> GetStructOnScope() { return StructOnScope; }
+	void CaptureProperty(FProperty* Property) { check(Property); CapturedProperties.Add(Property); }
+	const TSet<TWeakFieldPtr<FProperty>> & GetCapturedProperties() const { return CapturedProperties; };
+	TSet<TWeakFieldPtr<FProperty>>& GetCapturedProperties() { return CapturedProperties; };
+
+protected:
+	UPROPERTY(SaveGame)
+	TSoftObjectPtr<UObject> Object;
+
+	TSharedPtr<FStructOnScope> StructOnScope;
+
+	TSet<TWeakFieldPtr<FProperty>> CapturedProperties;
+
+	TWeakObjectPtr<UScenarioActionPropertyNode> ChildPropertyNode;
+};
+
+/**
+ * UScenarioActionActorNode
+ */
+UCLASS()
+class UScenarioActionActorNode : public UScenarioObjectNode
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionActorNode(const FObjectInitializer& InInitializer)
+		: UScenarioObjectNode(InInitializer) {}
+	virtual ~UScenarioActionActorNode() {}
+
+public:
+	virtual void Serialize(FArchive& Ar) override;
+
+public:
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)  override;
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override { return SNullWidget::NullWidget; }
+	virtual bool IsNodeValid() const override;
+
+public:
+	void InitializeNode(AActor* InActor);
+	AActor* GetActor() const;
+
+protected:
+	UPROPERTY(SaveGame)
+	TSoftObjectPtr<AActor> Actor;
+};
+
+/**
+ * UScenarioActionComponentNode
+ */
+UCLASS()
+class UScenarioActionComponentNode : public UScenarioObjectNode
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionComponentNode(const FObjectInitializer& InInitializer)
+		: UScenarioObjectNode(InInitializer) {}
+	virtual ~UScenarioActionComponentNode() {}
+
+public:
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)  override;
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override { return SNullWidget::NullWidget; }
+	virtual bool IsNodeValid() const override;
+
+public:
+	void InitializeNode(UActorComponent* InActorComponent);
+	UActorComponent* GetActorComponent() const;
+
+protected:
+	UPROPERTY(SaveGame)
+	TSoftObjectPtr<UActorComponent> ActorComponent;
+};
+
+/**
+ * UScenarioActionPropertyNode
+ */
+UCLASS()
+class UScenarioActionPropertyNode : public UScenarioActionNode
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionPropertyNode(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioActionPropertyNode() {}
+
+public:
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree) override;
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override { return SNullWidget::NullWidget; }
+	virtual bool IsNodeValid() const override;
+	virtual bool IsTransitentActionNode() const { return true; }
+
+public:
+	void UpdateChildBodyNode();
+	
+	UScenarioActionPropertyBodyNode* GetChildBodyNode() const { return ChildBodyNode.Get(); }
+
+protected:
+	TWeakObjectPtr<UScenarioActionPropertyBodyNode> ChildBodyNode;
+};
+
+/**
+ * UScenarioActionPropertyBodyNode
+ */
+UCLASS()
+class UScenarioActionPropertyBodyNode : public UScenarioActionNode
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionPropertyBodyNode(const FObjectInitializer& InInitializer)
+		: UScenarioActionNode(InInitializer) {}
+	virtual ~UScenarioActionPropertyBodyNode() {}
+
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree) override;
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override { return SNullWidget::NullWidget; }
+	virtual bool IsNodeValid() const override;
+	virtual bool IsTransitentActionNode() const { return true; }
+};
+
+/**
+ * UScenarioActionFunctionNode
+ */
+UCLASS()
+class UScenarioActionFunctionNode : public UScenarioActionNode
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionFunctionNode(const FObjectInitializer& InInitializer);
+	virtual ~UScenarioActionFunctionNode() {}
+
+public:
+	virtual void Serialize(FArchive& Ar) override;
+
+public:
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)  override;
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override { return SNullWidget::NullWidget; }
+	virtual bool IsNodeValid() const override { return StructOnScope.IsValid(); }
+	virtual void Execute();
+
+public:
+	void InitializeNode(UObject* FunctionOwner, UFunction* Function);
+	TSharedPtr<FStructOnScope> GetStructOnScope() const { return StructOnScope; }
+
+protected:
+	TSharedPtr<FStructOnScope> StructOnScope;
+
+	UPROPERTY(SaveGame)
+	TSoftObjectPtr<UFunction> Function;
+
+	UPROPERTY(SaveGame)
+	TSoftObjectPtr<UObject> FunctionOwner;
+};
+
+/**
+ * UScenarioActionFunctionBodyNode
+ */
+UCLASS()
+class UScenarioActionFunctionBodyNode : public UScenarioActionNode
+{
+	GENERATED_BODY()
+
+public:
+	UScenarioActionFunctionBodyNode(const FObjectInitializer& InInitializer)
+		: UScenarioActionNode(InInitializer) {}
+	virtual ~UScenarioActionFunctionBodyNode() {}
+
+public:
+	virtual TSharedRef< ITableRow > MakeRowWidget(const TSharedRef< STableViewBase >& OwnerTable, const TSharedRef<SScenarioActionTree>& Tree)  override;
+	virtual TSharedPtr<SWidget> OnContextMenuOpening() override { return SNullWidget::NullWidget; }
+	virtual bool IsNodeValid() const override;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionUtils.h b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionUtils.h
new file mode 100644
index 0000000..8994ce3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/ScenarioAction/ScenarioActionUtils.h
@@ -0,0 +1,31 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Templates/SharedPointer.h"
+
+class AActor;
+class UActorComponent;
+class UFunction;
+class UClass;
+class UStruct;
+
+namespace FScenarioActionUtils
+{
+
+void GetComponentsByCategory(AActor* Actor, TMap<FString, TArray<UActorComponent*>>& Out);
+
+void GetScenarioFunctionsByCategory(UClass* Class, TMap<FString, TArray<UFunction*>> & Out);
+
+void GetScenarioPropertiesByCategory(UClass* Class, TMap<FString, TArray<FProperty*>>& Out);
+
+void GetScenarioActionFunctionsByCategory(TMap<FString, TArray<UFunction*>>& Out);
+
+void GetScenarioConditionFunctionsByCategory(TMap<FString, TArray<UFunction*>>& Out);
+
+void GetScenarioActionEvents(TMap<FString, TArray<UClass*>>& Out);
+
+bool SerializeUStruct(FArchive& Ar, UStruct* Function, uint8* StructMemory, bool bForceSaveGame);
+
+} // FScenarioActionUtils
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/SodaActorFactory.h b/Source/UnrealSoda/Public/Soda/SodaActorFactory.h
new file mode 100644
index 0000000..cc7a18f
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaActorFactory.h
@@ -0,0 +1,87 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Actor.h"
+#include "Components/ArrowComponent.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "Soda/SodaTypes.h"
+#include "SodaActorFactory.generated.h"
+
+struct FPinnedActorRecord
+{
+	TSoftClassPtr<AActor> Class;
+	FString SlotName;
+	FTransform Transform;
+	FName DesireName;
+
+	friend FArchive& operator<<(FArchive& Ar, FPinnedActorRecord& Record)
+	{
+		Ar << Record.Class;
+		Ar << Record.SlotName;
+		Ar << Record.Transform;
+		Ar << Record.DesireName;
+		return Ar;
+	}
+
+	inline FString ToString() const
+	{
+		return FString::Printf(TEXT("SlotName=(%s), DesireName=(%s), Class=(%s)"), *SlotName, *DesireName.ToString(), *Class.ToString());
+	}
+};
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ASodaActorFactory : public AActor
+{
+	GENERATED_BODY()
+
+public:
+	/** Called if any actor was addwd or removed or renamed */
+	DECLARE_MULTICAST_DELEGATE(FInvalidateEvent);
+	FInvalidateEvent OnInvalidateDelegate;
+
+public:
+	/** ActorClass must be ISodaActor interface */
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	AActor * SpawnActor(TSubclassOf<AActor> ActorClass , FTransform Transform);
+
+	/** Actor must be ISodaActor interface */
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	void AddActor(AActor * Actor);
+
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	bool CheckActorIsExist(const AActor* Actor) const { return SpawnedActors.Find(const_cast<AActor*>(Actor)) != INDEX_NONE; }
+
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	const TArray<AActor*> & GetActors() const { return SpawnedActors; }
+
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	void RemoveAllActors();
+
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	void SpawnAllSavedActors(bool bSaved=true, bool bPinned=true);
+
+	/** NewActor and PreviewActor must be ISodaActor interface */
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	bool ReplaceActor(AActor * NewActor, AActor * PreviewActor, bool bPushActorIfNotFound);
+
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	bool RenameActor(AActor* Actor, const FString& NewName);
+
+	UFUNCTION(BlueprintCallable, Category = ActorFactory)
+	bool RemoveActor(AActor* Actor, bool bAndDestroy = true);
+
+	void SetSerializePinnedActorsAsUnpinned(bool bVal) { bSerializePinnedActorsAsUnpinned = bVal; }
+
+public:
+	virtual void Serialize(FArchive& Ar) override;
+
+protected:
+	TArray<FActorRecord> LoadedActorRecords;
+	TArray<FPinnedActorRecord> LoadedPinnedActors;
+
+	UPROPERTY()
+	TArray<AActor*> SpawnedActors;
+
+	bool bSerializePinnedActorsAsUnpinned = false;
+};
diff --git a/Source/UnrealSoda/Public/Soda/SodaApp.h b/Source/UnrealSoda/Public/Soda/SodaApp.h
new file mode 100644
index 0000000..c2f870d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaApp.h
@@ -0,0 +1,138 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreGlobals.h"
+#if PLATFORM_WINDOWS
+#include "Windows/AllowWindowsPlatformTypes.h"
+#endif
+#include <zmq.hpp>
+#if PLATFORM_WINDOWS
+#include "Windows/HideWindowsPlatformTypes.h"
+#endif
+#include "Engine/EngineBaseTypes.h"
+#include "GameFramework/WorldSettings.h"
+#include "Soda/Misc/LLConverter.h"
+#include "Soda/Misc/AsyncTaskManager.h"
+#include "Soda/Misc/MathUtils.hpp"
+#include "Soda/Misc/Time.h"
+#include "Soda/Vehicles/ISodaVehicleExporter.h"
+#include "JsonObjectWrapper.h"
+#include <cmath>
+
+class IHttpRouter;
+class USodaGameModeComponent;
+class USodaUserSettings;
+
+
+namespace dbc
+{
+	class FMessageSerializator;
+}
+
+namespace soda
+{
+	class FOutputLogHistory;
+}
+
+class UNREALSODA_API FSodaApp
+{
+public:
+	FSodaApp();
+	~FSodaApp();
+
+	void Initialize();
+	void Release();
+	bool IsInitialized() const { return bInitialized; }
+
+public:
+	inline zmq::context_t* GetZmqContext() { return ZmqCtx; }
+	inline TTimestamp GetSimulationTimestamp() const { return SimulationTimestamp; }
+	inline TTimestamp GetRealtimeTimestamp() const { return RealtimeTimestamp; }
+
+	void SetSynchronousMode(bool bEnable, double DeltaSeconds);
+	void NotifyInitGame(USodaGameModeComponent* InGameMode);
+	void NotifyEndGame();
+	inline bool IsSynchronousMode() const { return bSynchronousMode; }
+	inline int GetFrameIndex() const { return FrameIndex; }
+
+	/** One tick simulation in the synchronous mode */
+	bool SynchTick(int64& TimestampMs, int& FramIndex);
+
+	TSharedPtr<IHttpRouter> & GetHttpRouter() { return HttpRouter; }
+
+	USodaGameModeComponent* GetGameMode() const;
+	USodaGameModeComponent* GetGameModeChecked() const;
+
+	const USodaUserSettings* GetSodaUserSettings() const;
+	USodaUserSettings* GetSodaUserSettings();
+
+	TSharedPtr<dbc::FMessageSerializator> FindDBCSerializator(const FString& MessageName, const FString& Namespace = FString());
+	bool RegisterDBC(const FString& Namespace, const FString& FileName);
+
+	void RegisterVehicleExporter(TSharedPtr<ISodaVehicleExporter> Exporter);
+	void UnregisterVehicleExporter(const FString& ExporteName);
+	const TMap<FString, TSharedPtr<ISodaVehicleExporter>>& GetVehicleExporters() const { return VehicleExporters; }
+
+	TSharedPtr<soda::FOutputLogHistory> GetOutputLogHistory() { return OutputLogHistory; }
+
+public:
+	soda::FAsyncTaskManager CamTaskManager;
+	soda::FAsyncTaskManager EthTaskManager;
+
+protected:
+	// TODO: User ThreadPool insted
+	FRunnableThread* CamTaskManagerThread = nullptr;
+
+	// TODO: User ThreadPool insted
+	FRunnableThread* EthTaskManagerThread = nullptr;
+
+	FDelegateHandle OnPreTickHandle;
+	FDelegateHandle OnPostTickHandle;
+
+	FDelegateHandle OnHttpServerStartedHandle;
+	FDelegateHandle OnHttpServerStoppedHandle;
+	
+	void OnPreTick(UWorld* World, ELevelTick TickType, float DeltaSeconds);
+	void OnPostTick(UWorld* World, ELevelTick TickType, float DeltaSeconds);
+
+	void OnHttpServerStarted(uint32 Port);
+	void OnHttpServerStopped();
+
+	void SetGameMode(USodaGameModeComponent* InGameMode);
+	void ResetGameMode();
+
+	void CreateSodaUserSettings();
+
+	zmq::context_t* ZmqCtx = nullptr;
+
+	// Current GameWorld
+	UWorld* GameWorld = nullptr;
+
+	//TArray<TSharedPtr<FSyncClient>> SyncClients;
+	bool bSynchronousMode = false;
+	float FixedDeltaSeconds = 0;
+	int TickCuesReceived = 0;
+	int FrameIndex = 0;
+	TTimestamp RealtimeTimestamp;
+	TTimestamp SimulationTimestamp;
+	double TotalTime = 0;
+
+	bool bWaitTick = false;
+
+	/* HTTP */
+	TSharedPtr<IHttpRouter> HttpRouter;
+
+	TWeakObjectPtr<USodaGameModeComponent> GameMode;
+	bool bInitialized = false;
+
+	TWeakObjectPtr<USodaUserSettings> SodaUserSettings;
+
+	TMap<FString, TMap<FString, TSharedPtr<dbc::FMessageSerializator>>> DBCPool;
+
+	TMap<FString, TSharedPtr<ISodaVehicleExporter>> VehicleExporters;
+
+	TSharedPtr<soda::FOutputLogHistory> OutputLogHistory;
+};
+
+extern UNREALSODA_API class FSodaApp SodaApp;
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/SodaDelegates.h b/Source/UnrealSoda/Public/Soda/SodaDelegates.h
new file mode 100644
index 0000000..b96bb93
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaDelegates.h
@@ -0,0 +1,14 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#include "SodaDelegates.generated.h"
+
+class UNREALSODA_API FSodaDelegates
+{
+
+public:
+	DECLARE_MULTICAST_DELEGATE_TwoParams(FActorSelectionEvent, AActor* /*Actor*/, bool /*bIsSelected*/);
+	DECLARE_MULTICAST_DELEGATE_OneParam(FActorRemovedEvent, AActor* /*Actor*/);
+	DECLARE_MULTICAST_DELEGATE_ThreeParama(FActorRenamedEvent, AActor* /*Actor*/, const FString & /*PreviousName*/, const FString& /*NewName*/);
+
+
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/SodaGameMode.h b/Source/UnrealSoda/Public/Soda/SodaGameMode.h
new file mode 100644
index 0000000..b1c9450
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaGameMode.h
@@ -0,0 +1,169 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/SaveGame.h"
+#include "Blueprint/UserWidget.h"
+#include "Soda/SodaTypes.h"
+#include "Soda/ISodaActor.h"
+#include "SodaGameMode.generated.h"
+
+#define GPS_EPOCH_OFFSET 315964800
+#define GPS_LEAP_SECONDS_OFFSET 17
+
+class ASodaVehicle;
+class ALevelState;
+class ASodaActorFactory;
+class UPinnedToolActorsSaveGame;
+
+namespace soda
+{
+	class SSodaViewport;
+	class SMenuWindowContent;
+	class SMessageBox;
+	class SMenuWindow;
+	class SToolBox;
+	class SWaitingPanel;
+	enum class EMessageBoxType : uint8;
+	enum class EUIMode : uint8;
+}
+
+
+/*
+ * USodaGameModeComponent
+ * USodaGameModeComponent must be added to the AGameMode to support UnrealSoda plugin
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API USodaGameModeComponent : public UActorComponent
+{
+	GENERATED_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = SodaGameMode)
+	TSubclassOf <ASodalSpectator> SpectatorClass;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = SodaGameMode)
+	TSubclassOf <ALevelState> DefaultLevelStateClass;
+
+	UPROPERTY(BlueprintReadOnly, Category = SodaGameMode)
+	ASodaVehicle* UnpossesVehicle = nullptr;
+
+	UPROPERTY(BlueprintReadOnly, Category = SodaGameMode)
+	ALevelState * LevelState = nullptr;
+
+	UPROPERTY(BlueprintReadWrite, Transient, DuplicateTransient, Category = SodaGameMode)
+	ASodalSpectator* SpectatorActor = nullptr;
+
+	UPROPERTY(BlueprintReadWrite, Category = SodaGameMode)
+	TMap<UClass*, UPinnedToolActorsSaveGame*> PinnedToolActorsSaveGame;
+
+	UPROPERTY(BlueprintReadOnly, Category = SodaGameMode)
+	USodaGameViewportClient* ViewportClient = nullptr;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = DB)
+	virtual void UpdateDBGateway(bool bSync);
+
+	UFUNCTION(BlueprintCallable, Category = DB, meta = (CallInRuntime))
+	virtual void ReconnectDBGateway() { UpdateDBGateway(false); }
+
+
+	void PushToolBox(TSharedRef<soda::SToolBox> Widget, bool InstedPrev = false);
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	bool PopToolBox();
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	bool CloseWindow(bool bCloseAllWindows = false);
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	void SetSpectatorMode(bool bSpectatorMode);
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	ASodaVehicle* GetActiveVehicle();
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	void SetActiveVehicle(ASodaVehicle * Vehicle);
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	ASodalSpectator* GetSpectatorActor() const { return SpectatorActor; }
+
+	UFUNCTION(BlueprintCallable, Category = Scenario)
+	void ScenarioPlay();
+
+	UFUNCTION(BlueprintCallable, Category = Scenario)
+	void ScenarioStop(EScenarioStopReason Reason);
+
+	/** Valid only during scenario playing. -1 means no dataset recording in this scenario */
+	UFUNCTION(BlueprintCallable, Category = Scenario)
+	int64 GetScenarioID() const;
+
+	UFUNCTION(BlueprintCallable, Category = Scenario)
+	bool IsScenarioRunning() { return bIsScenarioRunning; }
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	void RequestQuit(bool bForce = false);
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	void RequestRestartLevel(bool bForce = false);
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	void NotifyLevelIsChanged();
+
+	UFUNCTION(BlueprintCallable, Category = SodaGameMode)
+	ASodaActorFactory * GetActorFactory();
+
+	const FSodaActorDescriptor& GetSodaActorDescriptor(TSoftClassPtr<AActor> Class) const;
+	const TMap<TSoftClassPtr<AActor>, FSodaActorDescriptor> & GetSodaActorDescriptors() const;
+
+	TSharedPtr<soda::SMessageBox> ShowMessageBox(soda::EMessageBoxType Type, const FString& Caption, const FString& Text);
+	TSharedPtr<soda::SMenuWindow> OpenWindow(const FString& Caption, TSharedRef<soda::SMenuWindowContent> Content);
+	bool CloseWindow(soda::SMenuWindow * Wnd);
+
+	TSharedPtr<soda::SWaitingPanel> ShowWaitingPanel(const FString& Caption, const FString& SubCaption);
+	bool CloseWaitingPanel(soda::SWaitingPanel * WaitingPanel);
+	bool CloseWaitingPanel(bool bCloseAll = false);
+
+	soda::SSodaViewport* GetSodaViewport() const { return SodaViewport.Get(); }
+	
+public:
+	static USodaGameModeComponent* Get();
+	static USodaGameModeComponent* GetChecked();
+
+public:
+	USodaGameModeComponent();
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	//virtual void InitializeComponent() override;
+	//virtual void UninitializeComponent() override;
+	virtual void OnComponentCreated() override;
+	virtual void OnComponentDestroyed(bool bDestroyingHierarchy) override;
+
+protected:
+	virtual void InitGame(AGameModeBase* GameMode);
+	virtual void PreEndGame(UWorld* world);
+	virtual bool OnWindowCloseRequested();
+	void OnPostGarbageCollect(float Delay);
+
+protected:
+
+	bool bIsScenarioRunning = false;
+	FDelegateHandle InitGameHandle;
+	FDelegateHandle PreEndGameHandle;
+	FTimerHandle TimerHandle;
+	TMap<TSoftClassPtr<AActor>, FSodaActorDescriptor> SodaActorDescriptors;
+	TSharedPtr<soda::SSodaViewport> SodaViewport;
+
+	struct FScenarioLevelSavedData
+	{
+		TArray<uint8> Memory;
+		TArray<FString> ActorsDirty;
+		soda::EUIMode Mode;
+		FString SelectedActor;
+		FString PossesdActor;
+	} 
+	ScenarioLevelSavedData;
+};
diff --git a/Source/UnrealSoda/Public/Soda/SodaGameViewportClient.h b/Source/UnrealSoda/Public/Soda/SodaGameViewportClient.h
new file mode 100644
index 0000000..86b2aa7
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaGameViewportClient.h
@@ -0,0 +1,122 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/GameViewportClient.h"
+#include "Soda/SodaTypes.h"
+#include "SceneManagement.h"
+#include "Soda/UI/SSodaViewport.h"
+#include "SodaGameViewportClient.generated.h"
+
+class ASodaWidget;
+class USodaSelection;
+class APreviewActor;
+
+DECLARE_DELEGATE_RetVal_OneParam(AActor*, FSpawnCastomActorDelegate, const FTransform&);
+
+enum class EEditorMouseCaptureMode
+{
+	Default,
+	Dragging,
+	Capture
+};
+
+
+/**
+* USodaGameViewportClient
+*/
+UCLASS(Within = Engine, transient, config = Engine)
+class UNREALSODA_API USodaGameViewportClient : public UGameViewportClient, public FViewElementDrawer
+{
+	friend ASodaWidget;
+
+	GENERATED_BODY()
+
+public:
+	UPROPERTY()
+	USodaSelection * Selection;
+
+public:
+	/* override UGameViewportClient */
+	virtual void Init(struct FWorldContext& WorldContext, UGameInstance* OwningGameInstance, bool bCreateNewAudioDevice = true) override;
+	virtual void Draw(FViewport* InViewport, FCanvas* SceneCanvas) override;
+	virtual void FinalizeViews(class FSceneViewFamily* ViewFamily, const TMap<ULocalPlayer*, FSceneView*>& PlayerViewMap) override;
+	virtual EMouseCursor::Type GetCursor(FViewport* Viewport, int32 X, int32 Y) override;
+	virtual void Tick(float DeltaTime) override;
+	virtual bool InputKey(const FInputKeyEventArgs& InEventArgs) override;
+	virtual bool InputAxis(FViewport* Viewport, FInputDeviceId InputDevice, FKey Key, float Delta, float DeltaTime, int32 NumSamples = 1, bool bGamepad = false) override;
+	virtual EMouseCaptureMode GetMouseCaptureMode() const override;
+	virtual bool LockDuringCapture() override;
+	virtual bool ShouldAlwaysLockMouse() override;
+	virtual bool HideCursorDuringCapture() const override;
+
+public:
+	/* override FViewElementDrawer */
+	virtual void Draw(const FSceneView* View, FPrimitiveDrawInterface* PDI) override;
+
+public:
+	virtual void InitUI(const TWeakPtr<soda::SSodaViewport>& SodaViewportWidget);
+	virtual void Invalidate();
+	virtual soda::EUIMode GetGameMode() const;
+	TSharedPtr < soda::SSodaViewport> GetSodaViewport() const { return SodaViewport.Pin(); }
+
+	virtual soda::EWidgetMode GetWidgetMode() const;
+	virtual void SetWidgetMode(soda::EWidgetMode WidgetMode);
+	virtual soda::ECoordSystem GetWidgetCoordSystemSpace() const;
+	virtual FMatrix GetLocalCoordinateSystem() const;
+	virtual void SetWidgetCoordSystemSpace(soda::ECoordSystem CoordSystem);
+	virtual void SetWidgetTarget(USceneComponent * WidgetTargetComponent);
+	virtual USceneComponent* GetWidgetTarget() const { return WidgetTargetComponent; }
+
+	void DrawBoundingBox(const FSceneView* View, FPrimitiveDrawInterface* PDI, const AActor* Actor, const FLinearColor& InColor);
+
+	virtual bool UpdateDropPreviewActor(int32 MouseX, int32 MouseY);
+	virtual void DestroyDropPreviewActor();
+	virtual bool HasDropPreviewActor() const;
+	virtual bool DropActorAtCoordinates(int32 MouseX, int32 MouseY, UClass* ActorClass, AActor** OutNewActor, bool bAddToSodaFactory);
+	virtual bool DropActorAtCoordinates(int32 MouseX, int32 MouseY, const FSpawnCastomActorDelegate & SpawnDelegate, AActor** OutNewActor, bool bAddToSodaFactory);
+	virtual bool DropPreviewActorAtCoordinates(int32 MouseX, int32 MouseY);
+
+	void SetEditorMouseCaptureMode(EEditorMouseCaptureMode InMode) { EditorMouseCaptureMode = InMode; }
+	EEditorMouseCaptureMode GetEditorMouseCaptureMode() const { return EditorMouseCaptureMode; }
+
+protected:
+	virtual FVector GetWidgetLocation() const;
+	virtual FMatrix GetWidgetCoordSystem() const;
+	virtual void SetCurrentWidgetAxis(EAxisList::Type AxisList);
+	virtual EAxisList::Type GetCurrentWidgetAxis() const;
+	virtual void TryStartTracking(const int32 InX, const int32 InY);
+	virtual void StopTracking();
+	virtual bool InputWidgetDelta(FViewport* InViewport, EAxisList::Type CurrentAxis, FVector& Drag, FRotator& Rot, FVector& Scale);
+	virtual void CheckAxisUnderCursor();
+	virtual void UpdateMouseDelta();
+	virtual bool IsDragging() const;
+	void DrawAxes(FViewport* InViewport, FCanvas* Canvas, const FRotator* InRotation, EAxisList::Type InAxis);
+
+protected:
+	FVector Start;
+	FVector End;
+
+	uint32 CachedMouseX = 0;
+	uint32 CachedMouseY = 0;
+
+	bool bIsWidgetDragging = false;
+
+	EEditorMouseCaptureMode EditorMouseCaptureMode = EEditorMouseCaptureMode::Default;
+	bool bEditorCaptureModeDragging = false;
+
+	soda::EWidgetMode TrackingWidgetMode;
+	EAxisList::Type  CurrentAxis;
+	soda::ECoordSystem CoordSystem;
+
+	UPROPERTY()
+	TObjectPtr<ASodaWidget> Widget;
+
+	UPROPERTY()
+	TObjectPtr<USceneComponent> WidgetTargetComponent = nullptr;
+
+	UPROPERTY()
+	TObjectPtr<APreviewActor> DropPreviewActor;
+
+	TWeakPtr<soda::SSodaViewport> SodaViewport;
+};
diff --git a/Source/UnrealSoda/Public/Soda/SodaHUD.h b/Source/UnrealSoda/Public/Soda/SodaHUD.h
new file mode 100644
index 0000000..f736206
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaHUD.h
@@ -0,0 +1,23 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "GameFramework/HUD.h"
+#include "SodaHUD.generated.h"
+
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ASodaHUD : public AHUD
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	bool bDrawVehicleDebugPanel = true;
+
+public:
+	virtual void DrawHUD() override;
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	
+};
diff --git a/Source/UnrealSoda/Public/Soda/SodaLibraryPrimaryAsset.h b/Source/UnrealSoda/Public/Soda/SodaLibraryPrimaryAsset.h
new file mode 100644
index 0000000..73c9346
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaLibraryPrimaryAsset.h
@@ -0,0 +1,49 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Engine/DataAsset.h"
+#include "Engine/AssetManagerTypes.h"
+#include "Engine/EngineTypes.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/SodaApp.h"
+#include "SodaLibraryPrimaryAsset.generated.h"
+
+class UActorComponent;
+class AActor;
+
+/*
+USTRUCT(BlueprintType)
+struct FActorGroundTruthRecord
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ActorGroundTruth)
+	TSubclassOf<AActor> Class;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ActorGroundTruth, BlueprintAssignable)
+	FOnGenerateActorGroundTruth OnGenerate;
+
+};
+*/
+
+UCLASS()
+class UNREALSODA_API USodaLibraryPrimaryAsset : public UPrimaryDataAsset
+{
+	GENERATED_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, Category = "SodaLibraryPrimaryAsset", meta = (AssetBundles = "SodaActors"))
+	TMap<TSoftClassPtr<AActor>, FSodaActorDescriptor> SodaActors;
+
+	UPROPERTY(EditAnywhere, Category = "SodaLibraryPrimaryAsset", meta = (AssetBundles = "VehicleComponents"))
+	TArray<TSoftClassPtr<UActorComponent>> VehicleComponents;
+
+	//UPROPERTY(EditAnywhere, Category = "SodaLibraryPrimaryAsset", meta = (AssetBundles = "ActorGroundTruth"))
+	//TArray<FActorGroundTruthRecord> ActorGroundTruthExporter;
+
+	virtual FPrimaryAssetId GetPrimaryAssetId() const override
+	{
+		return FPrimaryAssetId(FName("SodaLibraryPrimaryAsset"), FPackageName::GetShortFName(GetOutermost()->GetName()));
+	}
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/SodaSpectator.h b/Source/UnrealSoda/Public/Soda/SodaSpectator.h
new file mode 100644
index 0000000..910557b
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaSpectator.h
@@ -0,0 +1,60 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "GameFramework/Pawn.h"
+#include "Soda/SodaTypes.h"
+#include "SodaSpectator.generated.h"
+
+class UCameraComponent;
+
+UCLASS(ClassGroup = Soda, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ASodalSpectator : public APawn
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(Category=SodaSpectator, VisibleDefaultsOnly, BlueprintReadOnly)
+	UCameraComponent* CameraComponent;
+
+	/** cm/s */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SodaSpectator)
+	TArray<float> SpeedProfile;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SodaSpectator)
+	float MouseSpeed = 50;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SodaSpectator)
+	float KeySpeed = 30;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SodaSpectator)
+	bool bAllowMove = true;
+
+public:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void Tick(float DeltaTime) override;
+
+	virtual void MoveRight(float Val);
+	virtual void MoveForward(float Val);
+	virtual void MoveUp_World(float Val);
+
+public:
+	UFUNCTION(BlueprintCallable, Category=SodaSpectator)
+	virtual void SetSpeedProfile(int Ind);
+
+	UFUNCTION(BlueprintCallable, Category=SodaSpectator)
+	virtual int GetSpeedProfile() const { return CurrentSpeedProfile; }
+
+	UFUNCTION(BlueprintCallable, Category=SodaSpectator)
+	virtual void SetMode(ESodaSpectatorMode Mode);
+	
+	UFUNCTION(BlueprintCallable, Category=SodaSpectator)
+	virtual ESodaSpectatorMode GetMode() const { return Mode; }
+
+protected:
+	float Speed;
+	int CurrentSpeedProfile;
+	ESodaSpectatorMode Mode;
+};
diff --git a/Source/UnrealSoda/Public/Soda/SodaStatics.h b/Source/UnrealSoda/Public/Soda/SodaStatics.h
new file mode 100644
index 0000000..7da766c
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaStatics.h
@@ -0,0 +1,224 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Kismet/BlueprintFunctionLibrary.h"
+#include "Soda/SodaTypes.h"
+#include "Soda/Misc/Extent.h"
+#include "Engine/EngineTypes.h"
+#include "SodaStatics.generated.h"
+
+class UProceduralMeshComponent;
+class USodaGameModeComponent;
+
+UENUM(BlueprintType)
+enum class ETriangulationPlane : uint8
+{
+	XY,
+	XZ,
+	YZ
+};
+
+UENUM(BlueprintType)
+enum class EActorTagMethod : uint8
+{
+	Auto,
+	ByPrimitivePath,
+	ForceCurrentStencilValue,
+	ForceCustomLabel
+};
+
+UCLASS(Category=Soda)
+class UNREALSODA_API USodaStatics : public UBlueprintFunctionLibrary
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	/** Try to find the Game World */
+	static UWorld * GetGameWorld(const UObject* WorldContextObject=nullptr);
+
+	UFUNCTION(BlueprintPure, Category = "Soda")
+	static USodaGameModeComponent* GetSodaGameMode();
+
+	/**Get current level name */
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static FName GetLevelName(const UObject* WorldContextObject);
+
+	/** Get all maps for project */
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static TArray<FString> GetAllMapPaths();
+
+	/**
+	 * Travel to another level
+	 *
+	 * @param	LevelName			the level to open
+	 * @param	Options				a string of options to use for the travel URL
+	 */
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool OpenLevel(const UObject* WorldContextObject, FName LevelPath, FString Options = FString(TEXT("")));
+
+	/** Set the tag of an actor.
+	If bTagForSemanticSegmentation true, activate the custom depth pass. This
+	pass is necessary for rendering the semantic segmentation. However, it may
+	add a performance penalty since occlusion doesn't seem to be applied to
+	objects having this value active. */
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static void TagActor(AActor *Actor, bool bTagForSemanticSegmentation, EActorTagMethod TagMethod = EActorTagMethod::Auto, ESegmObjectLabel CustomLabel = ESegmObjectLabel::None);
+
+	/** Set the tag of every actor in level.
+	If bTagForSemanticSegmentation true, activate the custom depth pass. This
+	pass is necessary for rendering the semantic segmentation. However, it may
+	add a performance penalty since occlusion doesn't seem to be applied to
+	objects having this value active. */
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static void TagActorsInLevel(UObject * WorldContextObject, bool bTagForSemanticSegmentation);
+
+
+	/** Retrieve the tag of an already tagged component. */
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static ESegmObjectLabel GetTagOfTaggedComponent(UPrimitiveComponent *Component);
+
+	/** Retrieve the tags of an already tagged actor. ESegmObjectLabel::None is
+	not added to the array. */
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static void GetTagsOfTaggedActor(AActor *Actor, TSet<ESegmObjectLabel> &Tags);
+
+	/** Return true if @a Component has been tagged with the given @a Tag. */
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool MatchComponent(UPrimitiveComponent *Component, ESegmObjectLabel Tag)
+	{
+		if(!Component) return false;
+		return (Tag == GetTagOfTaggedComponent(Component));
+	}
+	UFUNCTION(BlueprintCallable, Category=Soda)
+  	static FString GetTagAsString(ESegmObjectLabel Tag);
+
+	/** Add V2V component to all vehicles in level.
+	*/
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static void AddV2VComponentToAllVehiclesInLevel(UObject* WorldContextObject, TSubclassOf<AActor> VehicleClass);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool WriteStringToFile(const FString & FileName, const FString & StringToWrite, bool AllowOwerWriting = true);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool ReadStringFromFile(FString& Result, const FString & FileName);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool SavePathToFile(USplineComponent * SplineComponent, float Distance, const FString & FileName, bool bIsLatLong);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+  	static FString GetUnrealSodaVersion();
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static FString Int64ToString(int64 Value);
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static void GetAllSubclassOfClass(const UClass * Class, TArray<UClass*> & SubClasses);
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static UObject * GetDefaultObject(const UClass * Class);
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static UActorComponent* FindDefaultComponentByClass(
+		const TSubclassOf<AActor> InActorClass,
+		const TSubclassOf<UActorComponent> InComponentClass);
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static bool DelaunayTriangulation(
+		const TArray<FVector>& OutsidePolyline,
+		const TArray<FVector>& HolePolyline,
+		const TArray<FVector>& AdditionalPoints,
+		TArray<int32>& OutTriangles,
+		TArray<FVector>& OutVertices,
+		ETriangulationPlane Plane = ETriangulationPlane::XY,
+		bool bFlip = false);
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static FName GetSensorShortName(FName FullName);
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static float FindSplineInputKeyClosestToWorldLocationFast(const FVector& WorldLocation, int32& StartSegment, USplineComponent* Spline);
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static bool IsBlueprintClass(const UClass* Class) { return Class && Class->HasAnyClassFlags(EClassFlags::CLASS_CompiledFromBlueprint); }
+
+	UFUNCTION(BlueprintCallable, Category = "Soda")
+	static float DrawProgress(
+		UCanvas* Canvas,
+		float XPos,
+		float YPos,
+		float Width,
+		float Height,
+		float Value,
+		float Min,
+		float Max,
+		bool bAlingCenter = false,
+		const FString& TextValue = ""
+	);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static FBox ExtentToBox(const FExtent& Extent) { return Extent.ToBox(); }
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static FBoxSphereBounds ExtentToBoxSphereBounds(const FExtent& Extent) { return Extent.ToBoxSphereBounds(); }
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static void SetFKeyByName(FString& Name, FKey& Key);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static void GetActorLocalBounds(AActor* Actor, FBox& LocalBounds);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static float GetDistanceAlongSpline(float InputKey, USplineComponent* InSplineComponent);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool GetShowFPS(UObject* WorldContextObject);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool SetShowFPS(UObject* WorldContextObject, bool ShowFps);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool DeleteFile(const FString& FileName);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static UObject* GetSubobjectByName(const UObject* Parent, FName ObjectName);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static TArray<UObject*> FindAllObjectsByClass(UObject* WorldContextObject, const UClass* Class);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static AActor * FindActoByName(UObject* WorldContextObject, FName Name);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static void SetSynchronousMode(bool bEnable, float DeltaSeconds);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool IsSynchronousMode();
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static int GetFrameIndex();
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool SynchTick(int64& Timestamp, int& FramIndex);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static bool UploadVehicleJSON(const FString & JSONStr, const FString & VehicleName);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static UProceduralMeshComponent* GenerateRoadLine(
+		UProceduralMeshComponent* LaneMesh,
+		int SectionID,
+		const USplineComponent* SplineComponent,
+		//float Offset,
+		float Width,
+		float LineLen,
+		float LineGap
+		//float Start,
+		//float End
+	);
+
+	UFUNCTION(BlueprintCallable, Category=Soda)
+	static FBox CalculateActorExtent(const AActor* Actor);
+};
diff --git a/Source/UnrealSoda/Public/Soda/SodaTypes.h b/Source/UnrealSoda/Public/Soda/SodaTypes.h
new file mode 100644
index 0000000..b255239
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaTypes.h
@@ -0,0 +1,144 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Interface.h"
+#include "SodaTypes.generated.h"
+
+#define G_ACC 9.8337
+
+namespace soda
+{
+	enum EWidgetMode
+	{
+		WM_None = -1,
+		WM_Translate,
+		WM_Rotate,
+		WM_Scale,
+		WM_Max,
+	};
+
+	enum ECoordSystem
+	{
+		COORD_None = -1,
+		COORD_World,
+		COORD_Local,
+		COORD_Max,
+	};
+}
+
+/**
+ * ESegmObjectLabel 
+ */
+UENUM(BlueprintType)
+enum class ESegmObjectLabel : uint8
+{
+	/* Carla's types*/
+	None = 0,
+	Buildings = 1,
+	Fences = 2,
+	Other = 3,
+	Pedestrians = 4,
+	Poles = 5,
+	RoadLines = 6, //Road line type isn't defined
+	Roads = 7,
+	Sidewalks = 8,
+	TrafficSigns = 12,
+	Vegetation = 9,
+	Vehicles = 10,
+	Walls = 11,
+
+	/* Soda's types*/
+	RoadLines_Solid = 32,
+	RoadLines_Dashed = 33,
+	RoadLines_Crosswalk = 34,
+	RoadLines_ZigZag = 35,
+	RoadLines_DoubleSide = 36,
+	RoadLines_Stop = 37,
+	RoadLines_DoubleDashed = 38,
+	RoadLines_Nondrivable = 39,
+};
+
+/**
+ * EVehicleComponentHealth
+ */
+UENUM(BlueprintType)
+enum class EVehicleComponentHealth : uint8
+{
+	Undefined,
+	Disabled,
+	Ok,
+	Warning,
+	Error,
+};
+
+/**
+ * ESodaSpectatorMode
+ */
+UENUM(BlueprintType)
+enum class ESodaSpectatorMode : uint8
+{
+	Perspective,
+	OrthographicFree,
+	Top,
+	Bottom,
+	Left,
+	Right,
+	Front,
+	Back
+};
+
+/**
+ * EScenarioStopReason
+ */
+UENUM(BlueprintType)
+enum class EScenarioStopReason : uint8
+{
+	UserRequest,
+	ScenarioStopTrigger,
+	QuitApplication,
+	InnerError,
+};
+
+/**
+ * FSubobjectReference 
+ */
+USTRUCT(BlueprintType)
+struct  FSubobjectReference
+{
+	GENERATED_USTRUCT_BODY()
+
+	FSubobjectReference()
+	{}
+
+	FSubobjectReference(const FString & PathToSubobject):
+		PathToSubobject(PathToSubobject)
+	{}
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, SaveGame, Category = SubobjectReference)
+	FString PathToSubobject;
+
+	template< class T >
+	T* GetObject(AActor* OwningActor) const
+	{
+		if (OwningActor)
+		{
+			return FindObject<T>(OwningActor, *PathToSubobject);
+		}
+		return nullptr;
+	}
+
+	bool operator== (const FSubobjectReference& Other) const
+	{
+		return PathToSubobject == Other.PathToSubobject;
+	}
+};
+
+UENUM(BlueprintType)
+enum class EFOVRenderingStrategy: uint8
+{
+	Never,
+	OnSelect,
+	Ever
+};
diff --git a/Source/UnrealSoda/Public/Soda/SodaUserSettings.h b/Source/UnrealSoda/Public/Soda/SodaUserSettings.h
new file mode 100644
index 0000000..466365b
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/SodaUserSettings.h
@@ -0,0 +1,142 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "InputCoreTypes.h"
+#include "SodaUserSettings.generated.h"
+
+#define GPS_EPOCH_OFFSET 315964800
+
+UCLASS(ClassGroup = Soda, config = SodaUserSettings, configdonotcheckdefaults)
+class UNREALSODA_API USodaUserSettings : public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey ThrottleKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey SteeringLeftKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey SteeringRigtKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey BrakeKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey NeutralGearKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey DriveGearKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey ReverseGearKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey ParkGearKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey ChangeModeKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey SafeStopKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey ZoomUpKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey ZoomDownKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey HeadlightsKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey HornKeyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey KeyCruiseControl;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleKeyInput, meta = (EditInRuntime))
+	FKey KeySpeedLimiter;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleJoyInput, meta = (EditInRuntime))
+	FKey ThrottleJoyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleJoyInput, meta = (EditInRuntime))
+	FKey SteeringJoyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleJoyInput, meta = (EditInRuntime))
+	FKey BrakeJoyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleJoyInput, meta = (EditInRuntime))
+	FKey NeutralGearJoyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleJoyInput, meta = (EditInRuntime))
+	FKey DriveGearJoyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleJoyInput, meta = (EditInRuntime))
+	FKey ReverseGearJoyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = VehicleJoyInput, meta = (EditInRuntime))
+	FKey ParkGearJoyInput;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = UI, meta = (EditInRuntime))
+	float DPIScale;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = UI, meta = (EditInRuntime))
+	float VehicleDebugAreaWidth;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = DB, meta = (EditInRuntime))
+	FString MongoURL;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = DB, meta = (EditInRuntime))
+	FString DatabaseName;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = DB, meta = (EditInRuntime))
+	bool bRecordDataset;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = DB, meta = (EditInRuntime))
+	bool bAutoConnect;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Common, meta = (EditInRuntime))
+	bool bTagActorsAtBeginPlay;
+
+	/** [s] */
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Advanced, meta = (EditInRuntime))
+	int GPSLeapOffset;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Advanced, meta = (EditInRuntime))
+	TEnumAsByte<ECollisionChannel>  SelectTraceChannel = ECollisionChannel::ECC_GameTraceChannel16;
+
+	UPROPERTY(config, EditAnywhere, BlueprintReadWrite, Category = Advanced, meta = (EditInRuntime))
+	TEnumAsByte<ECollisionChannel>  RadarCollisionChannel = ECollisionChannel::ECC_GameTraceChannel11;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = UI)
+	float GetDPIScale() { return FMath::Clamp(DPIScale, 0.3f, 3.0f); }
+
+	/** [s] */
+	UFUNCTION(BlueprintCallable, Category = GPS)
+	int GetGPSTimestempOffset() { return GPSLeapOffset - GPS_EPOCH_OFFSET; }
+
+public:
+	/** Loads the user settings from persistent storage */
+	UFUNCTION(BlueprintCallable, Category=Settings)
+	virtual void LoadSettings(bool bForceReload = false);
+
+	/** Save the user settings to persistent storage (automatically happens as part of ApplySettings) */
+	UFUNCTION(BlueprintCallable, Category=Settings)
+	virtual void SaveSettings();
+
+	UFUNCTION(BlueprintCallable, Category=Settings)
+	virtual void SetToDefaults();
+
+	/** Loads the user .ini settings into GConfig */
+	static void LoadConfigIni(bool bForceReload = false);
+
+protected:
+	static FString SodaUserSettingsIni;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Transport/GenericCameraPublisher.h b/Source/UnrealSoda/Public/Soda/Transport/GenericCameraPublisher.h
new file mode 100644
index 0000000..f84bd71
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/GenericCameraPublisher.h
@@ -0,0 +1,101 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/Misc/AsyncTaskManager.h"
+#include "SodaSimProto/Camera.hpp"
+#include "Soda/SodaTypes.h"
+#include "Soda/Misc/Time.h"
+#include "GenericCameraPublisher.generated.h"
+
+#define CV_8U 0
+#define CV_8S 1
+#define CV_16U 2
+#define CV_16S 3
+#define CV_32S 4
+#define CV_32F 5
+#define CV_64F 6
+
+namespace zmq
+{
+	class socket_t;
+}
+
+class FCameraFrontBackAsyncTask;
+
+UENUM(BlueprintType)
+enum class ECameraSensorShader : uint8
+{
+	ColorBGR8 = 0,
+	Depth8 = 2,
+	DepthFloat32 = 3,
+	Depth16 = 4,
+	SegmBGR8 = 5,
+	Segm8 = 6,
+	HdrRGB8 = 7,
+	CFA = 8, // Color Filter Array. See https://en.wikipedia.org/wiki/Color_filter_array
+};
+
+struct FCameraFrame
+{
+	uint32 Height = 0;
+	uint32 Width = 0; 
+	float MaxDepthDistance = 0;
+	int64 Index = 0;
+	TTimestamp Timestamp ;
+	uint32 ImageStride = 0; // Input image width in pixels
+	ECameraSensorShader OutFormat = ECameraSensorShader::ColorBGR8;
+};
+
+/***********************************************************************************************
+	UCameraPublisher
+***********************************************************************************************/
+UCLASS(abstract, ClassGroup = Soda)
+class UNREALSODA_API UCameraPublisher : public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	virtual bool Advertise() { return false; }
+	virtual void Shutdown() {}
+	virtual void Publish(const void* ImgBGRA8Ptr, const FCameraFrame& CameraFrame) {}
+	virtual void Publish(const void* DataPtr, uint32 Size) {}
+	virtual void Publish(const soda::TensorMsgHeader& Header, const void* ImageDataPtr, uint32 Size) {}
+	virtual bool IsInitializing() const { return false; }
+	virtual bool IsWorking() const { return false; }
+	virtual TArray<FColor>& LockFrontBuffer(const FCameraFrame& CameraFrame) { static TArray<FColor> Dummy; return Dummy; }
+	virtual void UnlockFrontBuffer() {}
+	virtual ~UCameraPublisher() {}
+
+};
+
+
+/***********************************************************************************************
+    FGenericCameraPublisher
+***********************************************************************************************/
+UCLASS(ClassGroup = Soda, BlueprintType)
+class UNREALSODA_API UGenericCameraPublisher : public UCameraPublisher
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = GenericPublisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString ZmqAddress = "tcp://*:9999";
+
+	virtual bool Advertise() override;
+	virtual void Shutdown() override;
+	virtual void Publish(const void* ImgBGRA8Ptr, const FCameraFrame & CameraFrame) override;
+	virtual void Publish(const void * DataPtr, uint32 Size) override;
+	virtual void Publish(const soda::TensorMsgHeader& Header, const void* ImageDataPtr, uint32 Size) override;
+	virtual TArray<FColor> & LockFrontBuffer(const FCameraFrame& CameraFrame) override;
+	virtual void UnlockFrontBuffer() override;
+	virtual bool IsWorking() const { return bIsWorking; }
+
+protected:
+	zmq::socket_t* SockPub = nullptr;
+	TSharedPtr <FCameraFrontBackAsyncTask> AsyncTask;
+	bool bIsWorking = false;
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/Transport/GenericLidarPublisher.h b/Source/UnrealSoda/Public/Soda/Transport/GenericLidarPublisher.h
new file mode 100644
index 0000000..9d0fcb3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/GenericLidarPublisher.h
@@ -0,0 +1,60 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "SodaSimProto/Lidar.hpp"
+#include "Soda/Misc/Time.h"
+#include "Runtime/Sockets/Public/IPAddress.h"
+#include "SocketSubsystem.h"
+#include "Sockets.h"
+#include "GenericLidarPublisher.generated.h"
+
+class FLidarFrontBackAsyncTask;
+class FLidarAsyncTask;
+struct FLidarFrame;
+
+/***********************************************************************************************
+    FGenericLidarPublisher
+***********************************************************************************************/
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FGenericLidarPublisher
+{
+	GENERATED_BODY()
+
+	friend FLidarFrontBackAsyncTask;
+	friend FLidarAsyncTask;
+
+	FGenericLidarPublisher();
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Port = 8001;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString Address = "239.0.0.230";
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime))
+	int PointsPerDatagram = 2000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime))
+	int DeviceID = 0;
+
+	void Advertise();
+	void Shutdown();
+
+	void Publish(TTimestamp Timestamp, std::vector<soda::LidarScanPoint>& Points, bool bAsync = true);
+	bool IsAdvertised() { return !!Socket; }
+
+	
+protected:
+	TSharedPtr< FSocket > Socket;
+	TSharedPtr< FInternetAddr > Addr;
+	TSharedPtr <FLidarFrontBackAsyncTask> AsyncTask;
+	soda::LidarScan Scan;
+	uint32 ScanID = 0;
+
+	void PublishSync(const FLidarFrame& LidarFrame, std::vector<soda::LidarScanPoint>& Points);
+	void PublishSync(const soda::LidarScan& Scan);
+};
+
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Transport/GenericRadarPublisher.h b/Source/UnrealSoda/Public/Soda/Transport/GenericRadarPublisher.h
new file mode 100644
index 0000000..6bb82b3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/GenericRadarPublisher.h
@@ -0,0 +1,37 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "SodaSimProto/Radar.hpp"
+#include "Runtime/Sockets/Public/IPAddress.h"
+#include "SocketSubsystem.h"
+#include "Sockets.h"
+#include "PublisherCommon.h"
+#include "GenericRadarPublisher.generated.h"
+
+/***********************************************************************************************
+    FGenericRadarPublisher
+***********************************************************************************************/
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FGenericRadarPublisher
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Port = 8001;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString Address = "239.0.0.230";
+
+	void Advertise();
+	void Shutdown();
+	void Publish(const soda::RadarScan & Scan, bool bAsync = false);
+	bool IsAdvertised() { return !!Socket; }
+
+protected:
+	TSharedPtr< FSocket > Socket;
+	TSharedPtr< FInternetAddr > Addr;
+	TSharedPtr <soda::FUDPFrontBackAsyncTask> AsyncTask;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Transport/GenericUltrasoncPublisher.h b/Source/UnrealSoda/Public/Soda/Transport/GenericUltrasoncPublisher.h
new file mode 100644
index 0000000..47f4bc3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/GenericUltrasoncPublisher.h
@@ -0,0 +1,41 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "SodaSimProto/Ultrasonic.hpp"
+#include "Runtime/Sockets/Public/IPAddress.h"
+#include "SocketSubsystem.h"
+#include "Sockets.h"
+#include "PublisherCommon.h"
+#include "GenericUltrasoncPublisher.generated.h"
+
+
+/***********************************************************************************************
+	FGenericUltrasoncPublisher
+***********************************************************************************************/
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FGenericUltrasoncPublisher
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Port = 8500;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bIsBroadcast = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString Address = "239.0.0.230";
+
+	void Advertise();
+	void Shutdown();
+	void Publish(const soda::UltrasonicsHub& Scan, bool bAsync = true);
+	bool IsAdvertised() { return !!Socket; }
+
+protected:
+	TSharedPtr< FSocket > Socket;
+	TSharedPtr< FInternetAddr > Addr;
+	TSharedPtr <soda::FUDPFrontBackAsyncTask> AsyncTask;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Transport/GenericV2XPublisher.h b/Source/UnrealSoda/Public/Soda/Transport/GenericV2XPublisher.h
new file mode 100644
index 0000000..911d5da
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/GenericV2XPublisher.h
@@ -0,0 +1,35 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "PublisherCommon.h"
+#include "SodaSimProto/V2X.hpp"
+#include "GenericV2XPublisher.generated.h"
+
+
+/***********************************************************************************************
+    FGenericV2XPublisher
+***********************************************************************************************/
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FGenericV2XPublisher
+{
+	GENERATED_BODY()
+
+	FGenericV2XPublisher();
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Port = 5000;
+
+	void Advertise();
+	void Shutdown();
+	void Publish(const soda::V2VSimulatedObject& Msg, bool bAsync = true);
+	void Publish(const soda::V2XRenderObject& Msg, bool bAsync = true);
+	bool IsAdvertised() { return !!Socket; }
+
+protected:
+	TSharedPtr< FSocket > Socket;
+	TSharedPtr< FInternetAddr > Addr;
+	TSharedPtr <soda::FUDPFrontBackAsyncTask> AsyncTask;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Transport/GenericVehicleStatePublisher.h b/Source/UnrealSoda/Public/Soda/Transport/GenericVehicleStatePublisher.h
new file mode 100644
index 0000000..763b541
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/GenericVehicleStatePublisher.h
@@ -0,0 +1,45 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SodaSimProto/VehicleState.hpp"
+#include "Soda/Misc/BitStream.hpp"
+#include "Runtime/Sockets/Public/IPAddress.h"
+#include "SocketSubsystem.h"
+#include "Sockets.h"
+#include "PublisherCommon.h"
+#include "GenericVehicleStatePublisher.generated.h"
+
+
+/***********************************************************************************************
+    FGenericLidarPublisher
+***********************************************************************************************/
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FGenericVehicleStatePublisher
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Port = 7078;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bIsBroadcast = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString Address = "127.0.0.1";
+
+	void Advertise();
+	void Shutdown();
+	void Publish(const soda::GenericVehicleState& Msg, bool bAsync = true);
+	bool IsAdvertised() { return !!Socket; }
+
+protected:
+	TSharedPtr< FSocket > Socket;
+	TSharedPtr< FInternetAddr > Addr;
+	int chan_index = 0;
+	TSharedPtr <soda::FUDPFrontBackAsyncTask> AsyncTask;
+	FBitStream BitStream;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Transport/OXTSPublisher.h b/Source/UnrealSoda/Public/Soda/Transport/OXTSPublisher.h
new file mode 100644
index 0000000..7b81cd9
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/OXTSPublisher.h
@@ -0,0 +1,50 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "SodaSimProto/OXTS.hpp"
+#include "Soda/Misc/BitStream.hpp"
+#include "Runtime/Sockets/Public/IPAddress.h"
+#include "SocketSubsystem.h"
+#include "Sockets.h"
+#include "PublisherCommon.h"
+#include "OXTSPublisher.generated.h"
+
+
+/***********************************************************************************************
+    FGenericLidarPublisher
+***********************************************************************************************/
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FOXTSPublisher
+{
+	GENERATED_BODY()
+
+	FOXTSPublisher();
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Port = 8000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bIsBroadcast = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString Address = "127.0.0.1";
+
+	void Advertise();
+	void Shutdown();
+	void Publish(const soda::OxtsPacket & Msg, bool bAsync = true);
+	bool IsAdvertised() { return !!Socket; }
+	int GetChanID() { return chan_index; }
+
+	static std::uint8_t Checksum(soda::OxtsPacket const& Packet, std::size_t Start, std::size_t End) noexcept;
+
+protected:
+	TSharedPtr< FSocket > Socket;
+	TSharedPtr< FInternetAddr > Addr;
+	int chan_index = 0;
+	TSharedPtr <soda::FUDPFrontBackAsyncTask> AsyncTask;
+	FBitStream BitStream;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/Transport/PublisherCommon.h b/Source/UnrealSoda/Public/Soda/Transport/PublisherCommon.h
new file mode 100644
index 0000000..0f2ac71
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/PublisherCommon.h
@@ -0,0 +1,52 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/Misc/AsyncTaskManager.h"
+#include "Templates/SharedPointer.h"
+//#include "PublisherCommon.generated.h"
+
+class FSocket;
+class FInternetAddr;
+
+/***********************************************************************************************
+	FUDPAsyncTask
+***********************************************************************************************/
+
+namespace soda
+{
+
+class UNREALSODA_API FUDPAsyncTask : public soda::FAsyncTask
+{
+public:
+	virtual ~FUDPAsyncTask() {}
+	virtual FString ToString() const override { return "FUDPAsyncTask"; }
+	virtual void Initialize() override { bIsDone = false; }
+	virtual bool IsDone() const override { return bIsDone; }
+	virtual bool WasSuccessful() const override { return true; }
+	virtual void Tick() override;
+
+public:
+	TSharedPtr< FSocket > Socket;
+	TSharedPtr< FInternetAddr > Addr;
+	TArray<uint8> Buf;
+
+protected:
+	bool bIsDone = true;
+};
+
+/***********************************************************************************************
+	FUDPFrontBackAsyncTask
+***********************************************************************************************/
+class UNREALSODA_API FUDPFrontBackAsyncTask : public soda::FDoubleBufferAsyncTask<FUDPAsyncTask>
+{
+public:
+	FUDPFrontBackAsyncTask(TSharedPtr< FSocket >& Socket, TSharedPtr< FInternetAddr >& Addr);
+	
+	virtual ~FUDPFrontBackAsyncTask() {}
+	virtual FString ToString() const override { return "FUDPFrontBackAsyncTask"; }
+	bool Publish(const void* Buf, int Len);
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Transport/XCP.h b/Source/UnrealSoda/Public/Soda/Transport/XCP.h
new file mode 100644
index 0000000..f634308
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Transport/XCP.h
@@ -0,0 +1,239 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/CANBus.h"
+#include "Soda/Misc/WatingQueue.h"
+
+namespace xcp
+{
+
+/**
+ * Common XCP packet. 
+ * Support only 8 byte data length.
+ */
+struct UNREALSODA_API FPacket
+{
+	FPacket() {}
+	FPacket(uint8 CMD);
+	FPacket(uint8 CMD, const uint8* InData, uint8 InLength);
+	FPacket(const uint8* InData, uint8 InLength);
+	FString ToString() const;
+
+	uint8_t Length = 0;
+	uint8_t Data[8];
+};
+
+/**
+ * EConnResourceParameterBits
+ */
+enum class EConnResourceParameterBits : uint8
+{
+	CAL_PG = 0x1,	//Calibration and Paging: 0 = not available , 1 = avilable
+	DAQ = 0x4,	//DAQ list supported: 0 = not avaliable, 1 = available
+	STIM = 0x8,	//STIM - Data stimulation of a daq list: 0 = not available, 1 = available
+	PGM = 0x10,	//Programming: 0 = flash programming not available, 1 = available
+};
+
+/**
+ * EConnCommModeBasicBits
+ */
+enum class EConnCommModeBasicBits : uint8
+{
+	BYTE_ORDER_ = 0x1,	//Byte order for multibyte parameters. 0 = Little endian (Intel format), 1 = Big Endian (Motorola format)
+	ADDRESS_GRANULARITY_0 = 0x2,	//The address granularity indicates the size of an element 
+	ADDRESS_GRANULARITY_1 = 0x4,	//The address granularity indicates the size of an element: 00-byte, 01-word, 10-DWORD, 11-reserved
+	ADDRESS_GRANULARITY_BOTH = 0x6,
+	SLAVE_BLOCK_MODE = 0x40, //Inidicates if slave block mode is available
+	OPTIONAL_ = 0x80, //The OPTIONAL flag indicates whether additional information on supported types of 	Communication mode is available.The master can get that additional information with GET_COMM_MODE_INFO.
+};
+
+/**
+ * ECurrentSessionStatusBits
+ */
+enum class ECurrentSessionStatusBits : uint8
+{
+	STORE_CAL_REQ = 0x01, //Pending request to store data into non-volatile memory
+	STORE_DAQ_REQ = 0x04, //Pending request to save daq list into non-volatile memory
+	CLEAR_DAQ_REQ = 0x08, //pending request to clear all daq list in non-volatile memory
+	DAQ_RUNNING = 0x40, //at least one daq list has been started and is in running mode
+	RESUME = 0x80, //slave is in resume mode
+};
+
+/**
+ * ECurrentResourceProtectionBits
+ * The given resorce is protected with Seed&key. If a resource is protected, an attempt to exectue a command on it 
+ * before a successful GET_SEED/UNLOCK sequence will result in ERR_ACCESS_LOCKED 
+ */
+enum class ECurrentResourceProtectionBits : uint8
+{
+	CAL_PG = 0x01,
+	DAQ = 0x04,
+	STIM = 0x08,
+	PGM = 0x10,
+};
+
+/**
+ * FConnectionInfo
+ */
+struct FConnectionInfo
+{ 
+	uint8 Resource; //See EConnResourceParameterBits
+	uint8 CommModeBasic; //See EConnCommModeBasicBits
+	uint8 MaxCto;
+	uint16 MaxDto;
+	uint8 ProtocolLayerVersion;
+	uint8 TransportLayerVersion;
+};
+
+struct FConnectionStatus
+{
+	uint8 GetCurrentSessionStatus; //See ECurrentSessionStatusBits
+	uint8 GetCurrentResourceProtection; //See ECurrentResourceProtectionBits
+	uint8 GetStateNumber;
+	uint16 GetSessionConfigurationId;
+};
+
+/**
+ * FBaseTransport
+ */
+class UNREALSODA_API FBaseTransport
+{
+public:
+	bool bIsDebug = false;
+	int Timeout = 500; //[ms]
+	TWatingQueue<FPacket> ResQueue;
+
+protected:
+	TTimestamp RecvTimestamp;
+	//int CounterSend = 0;
+	int CounterReceived = -1;
+
+public:
+	FBaseTransport()
+	{
+	}
+
+	virtual ~FBaseTransport()
+	{
+	}
+
+	virtual bool Send(const FPacket& Packet) = 0;
+	virtual bool Request(const FPacket& SendPacket, FPacket & RecvPacket);
+	virtual bool Request(const FPacket& SendPacket);
+	virtual bool IsValid() const = 0;
+
+protected:
+	virtual void ProcessResponse(const FPacket& Packet, int Counter, TTimestamp InRecvTimestamp);
+};
+
+/**
+ * FCANTransport
+ */
+class UNREALSODA_API FCANTransport: public FBaseTransport
+{
+public:
+	TWeakObjectPtr<UCANBusComponent> CANDevObj;
+	UCANBusComponent* CANBus = nullptr;
+	uint32_t CAN_ID_MASTER = 0x9950F1FD;
+	uint32_t CAN_ID_SLAVE = 0x9951FDF1;
+	bool bIsJ1939 = true;
+
+public:
+	FCANTransport(UCANBusComponent* InCANDev);
+	virtual bool Send(const FPacket& Packet) override;
+	virtual bool IsValid() const override { return ::IsValid(CANDevObj.Get()); }
+
+protected:
+	void DataReceived(TTimestamp Timestamp, const dbc::FCanFrame& CanFrame);
+};
+
+/**
+ * FMaster
+ */
+class UNREALSODA_API FMaster
+{
+public:
+	TSharedPtr<FBaseTransport> Transport = nullptr;
+
+public:
+	FMaster(const TSharedPtr<FBaseTransport>& InTransport);
+	virtual ~FMaster();
+
+	/**
+	 * Build up connection to an XCP slave.
+	 * Before the actual XCP traffic starts a connection is required.
+	 * Every XCP slave supports at most one connection,
+	 * more attempts to connect are silently ignored.
+	 */
+	bool Connect(uint8 mode = 0x00);
+
+	/**
+	 * Releases the connection to the XCP slave.
+	 * Thereafter, no further communication with the slave is possible
+	 * If DISCONNECT is currently not possible, ERR_CMD_BUSY will be returned.
+	 */
+	bool Disconnect();
+
+	/** Synchronize command execution after timeout conditions. */
+	bool Synch();
+
+	/**
+	 * Set Memory Transfer Address in slave.
+	 * The MTA is used by : meth:`buildChecksum`, : meth : `upload`, : meth : `download`, : meth : `downloadNext`,
+	 * : meth : `downloadMax`, : meth : `modifyBits`, : meth : `programClear`, : meth : `program`, : meth : `programNext`
+	 * and :meth:`programMax`.
+	 */
+	bool SetMta(uint32 Address, uint8 AddressExt = 0x00);
+
+	/** 
+	 * Transfer data from master to slave.
+	 * Adress is set via : meth:`setMta`
+	 */
+	bool Download(const uint8* Data, uint8 Length);
+
+
+	/**
+	 * Transfer data from slave to master.
+	 * Adress is set via : meth:`setMta` (Some services like : meth:`getID` also set the MTA).
+	 */
+	bool Upload(uint8* Data, uint8 Length);
+
+	/**
+	 * Get current status information of the slave device.
+	 * This includes the status of the resource protection, pending store
+	 * requests and the general status of data acquisition and stimulation.
+	 */
+	bool GetStatus(FConnectionStatus & ConnectionStatus);
+
+	/**
+	 * Get FConnectionInfo structure. Valid if only connected.
+	 */
+	const FConnectionInfo& GetConnectionInfo() const { return ConnectionInfo; }
+
+protected:
+	bool bIsLittleEndian = true;
+	bool bIsConnected = false;
+	FConnectionInfo ConnectionInfo;
+	uint16 WordSwap(uint16 In) const;
+	uint32 DwordSwap(uint32 In) const;
+};
+
+inline uint16 Swap16(uint16 Val)
+{
+	return (Val >> 8) | (Val << 8);
+}
+
+inline uint32 Swap32(uint32 Val) {
+	Val = ((Val << 8) & 0xFF00FF00) | ((Val >> 8) & 0xFF00FF);
+	return (Val << 16) | (Val >> 16);
+}
+
+inline uint64 Swap64(uint64 Val) {
+	Val = ((Val & 0x00000000FFFFFFFFull) << 32) | ((Val & 0xFFFFFFFF00000000ull) >> 32);
+	Val = ((Val & 0x0000FFFF0000FFFFull) << 16) | ((Val & 0xFFFF0000FFFF0000ull) >> 16);
+	Val = ((Val & 0x00FF00FF00FF00FFull) << 8) | ((Val & 0xFF00FF00FF00FF00ull) >> 8);
+	return Val;
+}
+
+} //xcp
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SActorList.h b/Source/UnrealSoda/Public/Soda/UI/SActorList.h
new file mode 100644
index 0000000..d1d8894
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SActorList.h
@@ -0,0 +1,72 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/Views/SListView.h"
+#include "RuntimePropertyEditor/PropertyCustomizationHelpers.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class USodaGameViewportClient;
+class ASodaActorFactory;
+class SSearchBox;
+class SInlineEditableTextBlock;
+class AActor;
+
+namespace soda
+{
+
+class SActorListRow;
+
+class SActorList: public SCompoundWidget
+{
+	friend SActorListRow;
+
+public:
+
+	SLATE_BEGIN_ARGS(SActorList)
+		: _OnSelectionChanged()
+		, _ActorFilter()
+		, _bInteractiveMode(true)
+	{}
+	SLATE_EVENT(SListView<TWeakObjectPtr<AActor>>::FOnSelectionChanged, OnSelectionChanged)
+	SLATE_ARGUMENT(FOnShouldFilterActor, ActorFilter)
+	SLATE_ATTRIBUTE(bool, bInteractiveMode)
+	SLATE_END_ARGS()
+	
+
+	void Construct(const FArguments& Args, USodaGameViewportClient* ViewportClient);
+	virtual ~SActorList();
+
+	void RebuilActorList();
+	AActor* GetSelectedActor() const;
+
+protected:
+	virtual void Tick(const FGeometry& AllottedGeometry, const double CurrentTime, const float DeltaTime) override;
+
+protected:
+	void OnRenameActor(AActor* SelectedActor);
+	void OnDeleteActor(AActor* SelectedActor);
+	void OnPossesActor(APawn* SelectedActor);
+	void OnSelectionChanged(TWeakObjectPtr<AActor> Actor, ESelectInfo::Type SelectInfo);
+
+	TSharedRef< ITableRow > MakeRowWidget(TWeakObjectPtr<AActor> Actor, const TSharedRef< STableViewBase >& OwnerTable);
+	TSharedPtr<SWidget> OnMenuOpening();
+	FReply OnPinClicked(TWeakObjectPtr<AActor> Actor);
+
+protected:
+	bool bIsInteractiveMode = true;
+	TSharedPtr<SListView<TWeakObjectPtr<AActor>>> TreeView;
+	TSharedPtr<SSearchBox> SearchBox;
+	TArray<TWeakObjectPtr<AActor>> ActorList;
+	TWeakObjectPtr<USodaGameViewportClient> ViewportClient;
+	TWeakObjectPtr<ASodaActorFactory> ActorFactory;
+	TWeakObjectPtr<AActor> SelectedItem;
+	TWeakPtr<SInlineEditableTextBlock> RequestedEditeTextBox;
+	SListView<TWeakObjectPtr<AActor>>::FOnSelectionChanged OnSelectionChangedDelegate;
+	FDelegateHandle InvalidateDelegateHandle;
+	FOnShouldFilterActor ActorFilter;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SMenuWindow.h b/Source/UnrealSoda/Public/Soda/UI/SMenuWindow.h
new file mode 100644
index 0000000..0bdaae1
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SMenuWindow.h
@@ -0,0 +1,79 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SResetScaleBox.h"
+
+namespace soda
+{
+
+class SMenuWindowContent;
+
+/**
+ * SMenuWindow
+ */
+class UNREALSODA_API SMenuWindow : public SResetScaleBox
+{
+public:
+	SLATE_BEGIN_ARGS(SMenuWindow)
+	{}
+		SLATE_ARGUMENT(TSharedPtr<SMenuWindowContent>, Content);
+		SLATE_ATTRIBUTE(FText, Caption)
+	SLATE_END_ARGS()
+	
+	SMenuWindow();
+	virtual ~SMenuWindow();
+
+	void Construct( const FArguments& InArgs );
+
+	virtual bool CloseWindow();
+
+protected:
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override { return FReply::Handled(); }
+	virtual FReply OnMouseButtonUp(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override { return FReply::Handled(); }
+	virtual FReply OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override { return FReply::Handled(); }
+	virtual FReply OnMouseWheel(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override { return FReply::Handled(); }
+};
+
+/**
+ * SMenuWindowContent
+ */
+class UNREALSODA_API SMenuWindowContent : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SMenuWindowContent)
+	{}
+		SLATE_DEFAULT_SLOT(FArguments, Content)
+	SLATE_END_ARGS()
+	
+	//SMenuWindowContent() {}
+	//virtual ~SMenuWindowContent() {}
+
+	void Construct( const FArguments& InArgs )
+	{
+		ChildSlot
+		[
+			InArgs._Content.Widget
+		];
+	}
+
+	void SetParentMenuWindow(TSharedPtr<SMenuWindow> InParentMenuWindow)
+	{
+		ParentMenuWindow = InParentMenuWindow;
+	}
+
+	bool CloseWindow()
+	{
+		if (ParentMenuWindow.IsValid())
+		{
+			return ParentMenuWindow.Pin()->CloseWindow();
+		}
+		return false;
+	}
+
+private:
+	TWeakPtr<SMenuWindow> ParentMenuWindow = nullptr;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SMessageBox.h b/Source/UnrealSoda/Public/Soda/UI/SMessageBox.h
new file mode 100644
index 0000000..cd5bfab
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SMessageBox.h
@@ -0,0 +1,52 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "SMenuWindow.h"
+
+namespace soda
+{
+
+enum class  EMessageBoxType : uint8
+{
+	OK = 0,
+	OK_CANCEL = 1,
+	YES_NO = 2,
+	YES_NO_CANCEL = 3
+};
+
+enum class  EMessageBoxButton : uint8
+{
+	OK = 0,
+	CANCEL = 1,
+	YES = 2,
+	NO = 3
+};
+
+DECLARE_DELEGATE_OneParam(FOnMessageBox, EMessageBoxButton);
+
+class  SMessageBox: public SMenuWindow
+{
+public:
+	SLATE_BEGIN_ARGS(SMessageBox)
+	{}
+		SLATE_ATTRIBUTE(FText, Caption)
+		SLATE_ATTRIBUTE(FText, TextContent)
+		SLATE_ATTRIBUTE(EMessageBoxType, Type)
+		SLATE_EVENT(FOnMessageBox, OnMessageBox)
+		SLATE_EVENT(FSimpleDelegate, OnClose)
+	SLATE_END_ARGS()
+	
+	SMessageBox();
+	virtual ~SMessageBox();
+
+	void Construct( const FArguments& InArgs );
+	void SetOnMessageBox(FOnMessageBox InOnMessageBox);
+
+protected:
+	void ExecuteOnMessageBox(EMessageBoxButton Button);
+	FOnMessageBox OnMessageBox;
+
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SResetScaleBox.h b/Source/UnrealSoda/Public/Soda/UI/SResetScaleBox.h
new file mode 100644
index 0000000..30eae84
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SResetScaleBox.h
@@ -0,0 +1,22 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Widgets/SCompoundWidget.h"
+
+namespace soda
+{
+
+class  SResetScaleBox : public SCompoundWidget
+{
+public:
+	SResetScaleBox();
+	virtual float GetRelativeLayoutScale(int32 ChildIndex, float LayoutScaleMultiplier) const override;
+	virtual void OnArrangeChildren(const FGeometry& AllottedGeometry, FArrangedChildren& ArrangedChildren) const override;
+	virtual FVector2D ComputeDesiredSize(float) const override;
+
+protected:
+	mutable float CashedScale = 1;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SSodaViewport.h b/Source/UnrealSoda/Public/Soda/UI/SSodaViewport.h
new file mode 100644
index 0000000..2a0fa09
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SSodaViewport.h
@@ -0,0 +1,168 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Layout/Visibility.h"
+#include "Styling/SlateColor.h"
+#include "Input/Reply.h"
+#include "Widgets/SOverlay.h"
+#include "Widgets/SViewport.h"
+#include "Widgets/Input/SButton.h"
+#include "Soda/SodaTypes.h"
+#include "Engine/GameViewportClient.h"
+#include "Soda/UI/SResetScaleBox.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+class FUICommandList;
+class USodaGameViewportClient;
+class STooltipPresenter;
+class FUICommandInfo;
+class SSplitter;
+
+
+namespace soda
+{
+class SMenuWindowContent;
+class SMessageBox;
+class SMenuWindow;
+class SToolBox;
+class SWaitingPanel;
+class SOutputLog;
+enum class EMessageBoxType : uint8;
+
+enum class EUIMode : uint8
+{
+	Free,
+	Editing
+};
+
+class SToolBox;
+
+class  SSodaViewport : public SResetScaleBox
+{
+public:
+	SLATE_BEGIN_ARGS(SSodaViewport)
+	{ }
+	SLATE_END_ARGS()
+	
+	SSodaViewport();
+	virtual ~SSodaViewport();
+
+	void Construct( const FArguments& InArgs, UWorld * World);
+
+	void SetUIMode(EUIMode InMode);
+	EUIMode GetUIMode() const;
+
+	virtual void SetToolBoxWidget(TSharedRef<SToolBox> Widget);
+	virtual void RemoveToolBoxWidget();
+
+	void PushToolBox(TSharedRef<soda::SToolBox> Widget, bool InstedPrev = false);
+	bool PopToolBox();
+
+	TSharedPtr<soda::SMessageBox> ShowMessageBox(soda::EMessageBoxType Type, const FString& Caption, const FString& Text);
+	TSharedPtr<soda::SMenuWindow> OpenWindow(const FString& Caption, TSharedRef<soda::SMenuWindowContent> Content);
+	bool CloseWindow(soda::SMenuWindow* Wnd);
+	bool CloseWindow(bool bCloseAllWindows = false);
+
+	TSharedPtr<soda::SWaitingPanel> ShowWaitingPanel(const FString& Caption, const FString& SubCaption);
+	bool CloseWaitingPanel(soda::SWaitingPanel* WaitingPanel);
+	bool CloseWaitingPanel(bool bCloseAll = false);
+
+	void BackMenu();
+
+	/**
+	 * Adds a widget to the Slate viewport's overlay (i.e for in game UI or tools) at the specified Z-order
+	 *
+	 * @param  ViewportContent	The widget to add.  Must be valid.
+	 * @param  ZOrder  The Z-order index for this widget.  Larger values will cause the widget to appear on top of widgets with lower values.
+	 */
+	virtual void AddViewportWidgetContent(TSharedRef<class SWidget> ViewportContent, const int32 ZOrder = 0);
+
+	/**
+	 * Removes a previously-added widget from the Slate viewport
+	 *
+	 * @param	ViewportContent  The widget to remove.  Must be valid.
+	 */
+	virtual void RemoveViewportWidgetContent(TSharedRef<class SWidget> ViewportContent);
+
+	const TSharedPtr<FUICommandList> GetCommandList() const { return CommandList; }
+	UWorld* GetWorld() const { return World.Get(); }
+	FViewport* GetViewport() const { return Viewport; }
+	USodaGameViewportClient* GetViewportClient() const { return ViewportClient.Get(); }
+
+public:
+	virtual TSharedPtr<SWidget> MakeViewportToolbar();
+	virtual void BindCommands();
+	
+	void OnToggleStats();
+	virtual void ToggleStatCommand(FString CommandName);
+	virtual bool IsStatCommandVisible(FString CommandName) const;
+
+	void OnToggleAllStatCommands(bool bVisible);
+
+	bool IsWidgetModeActive(soda::EWidgetMode Mode) const;
+	bool CanSetWidgetMode(soda::EWidgetMode NewMode) const;
+
+	bool IsCoordSystemActive(soda::ECoordSystem CoordSystem) const;
+	void OnCycleCoordinateSystem();
+
+	void SetViewportType(ESodaSpectatorMode Mode);
+	bool IsActiveViewportType(ESodaSpectatorMode Mode);
+
+	bool IsLogVisible() const;
+	void SetLogVisible(bool bVisible);
+
+	void OnToggleStats() const;
+	void ToggleStatCommand(FString CommandName) const;
+	void BindStatCommand(const TSharedPtr<FUICommandInfo> InMenuItem, const FString& InCommandName);
+
+protected:
+	//~ Begin SWidget overrides
+	virtual FReply OnKeyDown(const FGeometry& MyGeometry, const FKeyEvent& InKeyEvent) override;
+	//virtual bool SupportsKeyboardFocus() const override;
+	//virtual FReply OnFocusReceived(const FGeometry& MyGeometry, const FFocusEvent& InFocusEvent) override;
+	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override;
+	virtual void OnDragEnter(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
+	virtual void OnDragLeave(const FDragDropEvent& DragDropEvent) override;
+	virtual FReply OnDragOver(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
+	virtual FReply OnDrop(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent) override;
+	virtual bool OnVisualizeTooltip(const TSharedPtr<SWidget>& TooltipContent) override;
+	//~ End SWidget overrides
+
+	//virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+
+	/** An internal handler for dagging dropable objects into the viewport. */
+	bool HandleDragObjects(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent);
+
+	/** An internal handler for dropping objects into the viewport.
+	 *	@param DragDropEvent		The drag event.
+	 *	@param bCreateDropPreview	If true, a drop preview actor will be spawned instead of a normal actor.
+	 */
+	bool HandlePlaceDraggedObjects(const FGeometry& MyGeometry, const FDragDropEvent& DragDropEvent, bool bCreateDropPreview);
+
+protected:	
+	float ToolBoxSize = 0.33;
+	mutable float CashedScale = 1;
+	EUIMode UIMode = EUIMode::Free;
+
+	/** Commandlist used in the viewport (Maps commands to viewport specific actions) */
+	TSharedPtr<FUICommandList> CommandList;
+	
+	TObjectPtr<UWorld> World = nullptr;
+	FViewport* Viewport = nullptr;
+	TWeakObjectPtr<USodaGameViewportClient> ViewportClient;
+
+	TSharedPtr<SSplitter> MajorSplitter;
+	TSharedPtr<SSplitter> MinorSplitter;
+	TSharedPtr<STooltipPresenter> TooltipPresenter;
+	TSharedPtr<SOverlay> ViewportOverlayWidget;
+	TSharedPtr<soda::SOutputLog> OutputLog;
+
+	TArray<TSharedPtr<soda::SToolBox>> StackToolBox;
+	TArray<TSharedPtr<soda::SMenuWindow>> OpenedWindows;
+	TArray<TSharedPtr<soda::SWaitingPanel>> WaitingPanels;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SToolBox.h b/Source/UnrealSoda/Public/Soda/UI/SToolBox.h
new file mode 100644
index 0000000..335c2aa
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SToolBox.h
@@ -0,0 +1,36 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Widgets/SCompoundWidget.h"
+
+namespace soda
+{
+
+
+class UNREALSODA_API SToolBox : public SCompoundWidget
+{
+public:
+	
+	SLATE_BEGIN_ARGS(SToolBox)
+	{}
+		SLATE_DEFAULT_SLOT(FArguments, Content)
+		SLATE_ATTRIBUTE(FText, Caption)
+	SLATE_END_ARGS()
+	
+	//SToolBox();
+	//virtual ~SToolBox();
+
+	void Construct( const FArguments& InArgs );
+
+	const FText& GetCaption() const { return Caption; }
+
+	virtual void OnPush() {};
+	virtual void OnPop() {};
+	
+protected:
+	FText Caption;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SVehicleComponentsList.h b/Source/UnrealSoda/Public/Soda/UI/SVehicleComponentsList.h
new file mode 100644
index 0000000..f9841e5
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SVehicleComponentsList.h
@@ -0,0 +1,65 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "Widgets/SCompoundWidget.h"
+#include "Widgets/Views/STreeView.h"
+#include "Templates/SharedPointer.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Templates/SharedPointer.h"
+#include "UObject/WeakObjectPtrTemplates.h"
+
+//class UVehicleComponent;
+class ASodaVehicle;
+class ITableRow;
+class STableViewBase;
+class SSearchBox;
+class SInlineEditableTextBlock;
+
+namespace soda
+{
+class IComponentsBarTreeNode;
+
+class  SVehicleComponentsList : public SCompoundWidget
+{
+public:
+	SLATE_BEGIN_ARGS(SVehicleComponentsList)
+	{ }
+	SLATE_END_ARGS()
+
+	virtual ~SVehicleComponentsList() override;
+
+	void Construct( const FArguments& InArgs, ASodaVehicle* Vehicle, bool bInteractiveMode);
+	void RebuildNodes();
+	void SetVehicle(ASodaVehicle* InVehicle) { Vehicle = InVehicle; }
+	void RequestSelectRow(ISodaVehicleComponent* VehicleComponent) { RequestedSelecteComponent = VehicleComponent; }
+	void RequestEditeTextBox(TWeakPtr<SInlineEditableTextBlock> EditableTextBlock) { RequestedEditeTextBox = EditableTextBlock; }
+	const TSharedPtr<STreeView<TSharedRef<IComponentsBarTreeNode>>>& GetTreeView() const { return TreeView; }
+
+protected:
+	virtual FReply OnMouseButtonDown(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) override;
+	virtual void Tick(const FGeometry& AllottedGeometry, const double InCurrentTime, const float InDeltaTime) override;
+
+protected:
+	TSharedRef< ITableRow > MakeRowWidget(TSharedRef<IComponentsBarTreeNode> Item, const TSharedRef< STableViewBase >& OwnerTable);
+	void OnSelectionChanged(TSharedPtr<IComponentsBarTreeNode> Component, ESelectInfo::Type SelectInfo);
+	TSharedPtr<SWidget> OnContextMenuOpening();
+	void OnGetChildren(TSharedRef<IComponentsBarTreeNode> InTreeNode, TArray< TSharedRef<IComponentsBarTreeNode> >& OutChildren);
+	void OnDoubleClick(TSharedRef<IComponentsBarTreeNode> Component);
+	TSharedRef<SWidget> MakeComponentDetailsBar(ISodaVehicleComponent* VehicleComponent);
+	UActorComponent* OnComponentClassSelected(TSubclassOf<UActorComponent> Component, UObject* Object);
+
+protected:
+	bool bInteractiveMode = false;
+	TArray<TSharedRef<IComponentsBarTreeNode>> RootNodes;
+	TSharedPtr<STreeView<TSharedRef<IComponentsBarTreeNode>>> TreeView;
+	TSharedPtr<SSearchBox> SearchBox;
+	TWeakObjectPtr<ASodaVehicle> Vehicle;
+	TWeakInterfacePtr<ISodaVehicleComponent> RequestedSelecteComponent;
+	TWeakPtr<SInlineEditableTextBlock> RequestedEditeTextBox;
+	TWeakInterfacePtr<ISodaVehicleComponent> LastSelectdComponen;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SWaitingPanel.h b/Source/UnrealSoda/Public/Soda/UI/SWaitingPanel.h
new file mode 100644
index 0000000..b7812e4
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SWaitingPanel.h
@@ -0,0 +1,29 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/UI/SResetScaleBox.h"
+
+namespace soda
+{
+
+
+/**
+ * SWaitingPanel
+ */
+class UNREALSODA_API SWaitingPanel : public SResetScaleBox
+{
+public:
+	SLATE_BEGIN_ARGS(SWaitingPanel)
+	{}
+		SLATE_ATTRIBUTE(FText, Caption)
+		SLATE_ATTRIBUTE(FText, SubCaption)
+	SLATE_END_ARGS()
+
+	void Construct( const FArguments& InArgs );
+
+	virtual bool CloseWindow();
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UI/SodaViewportCommands.h b/Source/UnrealSoda/Public/Soda/UI/SodaViewportCommands.h
new file mode 100644
index 0000000..1ea6c95
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UI/SodaViewportCommands.h
@@ -0,0 +1,141 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once 
+
+#include "CoreMinimal.h"
+#include "Engine/EngineBaseTypes.h"
+#include "Widgets/SWidget.h"
+#include "Framework/Commands/Commands.h"
+#include "SodaStyleSet.h"
+#include "Engine/TextureStreamingTypes.h"
+
+class FUICommandList;
+
+
+namespace soda
+{
+/**
+ * Class containing commands for editor viewport actions common to all viewports
+ */
+class UNREALSODA_API FSodalViewportCommands : public TCommands<FSodalViewportCommands>
+{
+public:
+	FSodalViewportCommands();
+	virtual ~FSodalViewportCommands();
+
+	struct FShowMenuCommand
+	{
+		TSharedPtr<FUICommandInfo> ShowMenuItem;
+		FText LabelOverride;
+
+		FShowMenuCommand(TSharedPtr<FUICommandInfo> InShowMenuItem, const FText& InLabelOverride)
+			: ShowMenuItem(InShowMenuItem)
+			, LabelOverride(InLabelOverride)
+		{
+		}
+
+		FShowMenuCommand(TSharedPtr<FUICommandInfo> InShowMenuItem)
+			: ShowMenuItem(InShowMenuItem)
+		{
+		}
+	};
+
+	/** Hides all Stats categories  */
+	TSharedPtr< FUICommandInfo > HideAllStats;
+
+	/** A map of stat categories and the commands that belong in them */
+	TMap< FString, TArray< FShowMenuCommand > > ShowStatCatCommands;
+
+	/** Delegate we fire every time a new stat has been had a command added */
+	DECLARE_EVENT_TwoParams(FSodalViewportCommands, FOnNewStatCommandAdded, const TSharedPtr<FUICommandInfo>, const FString&);
+	static FOnNewStatCommandAdded NewStatCommandDelegate;
+
+	/** Restart Level*/
+	TSharedPtr< FUICommandInfo > RestartLevel;
+
+	/** New Level*/
+	TSharedPtr< FUICommandInfo > ClearLevel;
+	
+	/** Changes the viewport to perspective view */
+	TSharedPtr< FUICommandInfo > Perspective;
+
+	/** Changes the viewport to orthographic free view */
+	TSharedPtr< FUICommandInfo > OrthographicFree;
+
+	/** Changes the viewport to top view */
+	TSharedPtr< FUICommandInfo > Top;
+
+	/** Changes the viewport to bottom view */
+	TSharedPtr< FUICommandInfo > Bottom;
+
+	/** Changes the viewport to left view */
+	TSharedPtr< FUICommandInfo > Left;
+
+	/** Changes the viewport to right view */
+	TSharedPtr< FUICommandInfo > Right;
+
+	/** Changes the viewport to front view */
+	TSharedPtr< FUICommandInfo > Front;
+
+	/** Changes the viewport to back view */
+	TSharedPtr< FUICommandInfo > Back;
+
+	/** Rotate through viewport view options */
+	TSharedPtr< FUICommandInfo > Next;
+
+	/** Toggles showing stats in the viewport */
+	TSharedPtr< FUICommandInfo > ToggleStats;
+
+	/** Toggles showing fps in the viewport */
+	TSharedPtr< FUICommandInfo > ToggleFPS;
+
+	/** Toggles showing debug vehicle panel */
+	TSharedPtr< FUICommandInfo > ToggleVehiclePanel;
+
+	/** Toggles showing debug vehicle panel */
+	TSharedPtr< FUICommandInfo > ToggleFullScreen;
+
+	/** Select Mode */
+	TSharedPtr< FUICommandInfo > SelectMode;
+
+	/** Translate Mode */
+	TSharedPtr< FUICommandInfo > TranslateMode;
+
+	/** Rotate Mode */
+	TSharedPtr< FUICommandInfo > RotateMode;
+
+	/** Scale Mode */
+	TSharedPtr< FUICommandInfo > ScaleMode;
+
+	/** World relative coordinate system */
+	TSharedPtr< FUICommandInfo > RelativeCoordinateSystem_World;
+
+	/** Local relative coordinate system */
+	TSharedPtr< FUICommandInfo > RelativeCoordinateSystem_Local;
+
+	TSharedPtr< FUICommandInfo > CycleTransformGizmos;
+	TSharedPtr< FUICommandInfo > CycleTransformGizmoCoordSystem;
+
+	TSharedPtr< FUICommandInfo > RecordDataset;
+	TSharedPtr< FUICommandInfo > AutoConnectDB;
+
+
+	TSharedPtr< FUICommandInfo > ToggleSpectatorMode;
+	TSharedPtr< FUICommandInfo > PossesNextVehicle;
+	TSharedPtr< FUICommandInfo > BackMenu;
+	TSharedPtr< FUICommandInfo > BackMenuEditor;
+	TSharedPtr< FUICommandInfo > TagActors;
+	TSharedPtr< FUICommandInfo > Exit;
+
+public:
+	/** Registers our commands with the binding system */
+	virtual void RegisterCommands() override;
+
+private:
+	/** Registers additional commands as they are loaded */
+	void HandleNewStatGroup(const TArray<FStatNameAndInfo>& NameAndInfos);
+	void HandleNewStat(const FName& InStatName, const FName& InStatCategory, const FText& InStatDescription);
+	int32 FindStatIndex(const TArray< FShowMenuCommand >* ShowStatCommands, const FString& InCommandName) const;
+};
+
+} // namespace soda
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UnrealSoda.h b/Source/UnrealSoda/Public/Soda/UnrealSoda.h
new file mode 100644
index 0000000..be011be
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UnrealSoda.h
@@ -0,0 +1,19 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Modules/ModuleManager.h"
+
+# pragma warning(disable:4996)
+
+class UNREALSODA_API FUnrealSodaModule : public IModuleInterface
+{
+public:
+	virtual void StartupModule() override;
+	virtual void ShutdownModule() override;
+
+private:
+	TArray<void*> LoadedDlls;
+};
+
+UNREALSODA_API DECLARE_LOG_CATEGORY_EXTERN(LogSoda, Log, All);
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/UnrealSodaVersion.h b/Source/UnrealSoda/Public/Soda/UnrealSodaVersion.h
new file mode 100644
index 0000000..d6a1bca
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/UnrealSodaVersion.h
@@ -0,0 +1,27 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Runtime/Launch/Resources/Version.h"
+
+#define UNREALSODA_MAJOR_VERSION	1
+#define UNREALSODA_MINOR_VERSION	0
+#define UNREALSODA_PATCH_VERSION	0
+
+#if defined(UNREALSODA_PIPLINE_VERSION)
+#define UNREALSODA_VERSION_STRING \
+	VERSION_STRINGIFY(UNREALSODA_MAJOR_VERSION) \
+	VERSION_TEXT(".") \
+	VERSION_STRINGIFY(UNREALSODA_MINOR_VERSION) \
+	VERSION_TEXT(".") \
+	VERSION_STRINGIFY(UNREALSODA_PATCH_VERSION) \
+	VERSION_TEXT("-") \
+	VERSION_STRINGIFY(UNREALSODA_PIPLINE_VERSION)
+#else
+#define UNREALSODA_VERSION_STRING \
+	VERSION_STRINGIFY(UNREALSODA_MAJOR_VERSION) \
+	VERSION_TEXT(".") \
+	VERSION_STRINGIFY(UNREALSODA_MINOR_VERSION) \
+	VERSION_TEXT(".") \
+	VERSION_STRINGIFY(UNREALSODA_PATCH_VERSION)
+#endif
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/CANBus.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/CANBus.h
new file mode 100644
index 0000000..de68cf3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/CANBus.h
@@ -0,0 +1,105 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleBaseComponent.h"
+#include "Soda/DBC/Common.h"
+#include "Soda/SodaTypes.h"
+#include <unordered_map>
+#include "CANBus.generated.h"
+
+#define CANID_DEFAULT -1
+
+DECLARE_MULTICAST_DELEGATE_TwoParams(FCanDevRecvFrameDelegate, TTimestamp, const dbc::FCanFrame &);
+
+class UCANDevComponent;
+
+/**
+ * UCANBusComponent
+ * CAN bus or network imitation
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable)
+class UNREALSODA_API UCANBusComponent : public UVehicleBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Whether to put the sent frame to the receive queue. 
+	 * This can be useful if multiple components communicate with each other via this bus.
+	 * Beware, setting this flag will require more performance from the vehicle simulation thread, 
+	 * as all messages sent to this bus will be deserialized on the vehicle simulation thread.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = CANBus, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	bool bLoopFrames = false; 
+
+	FCanDevRecvFrameDelegate RecvDelegate;
+
+public:
+	virtual bool ProcessRecvMessage(const TTimestamp& Timestamp, const dbc::FCanFrame& CanFrame);
+	virtual int SendFrame(const dbc::FCanFrame& CanFrame);
+	virtual void RegisterCanDev(UCANDevComponent* CANDev);
+
+public:
+	virtual void OnPreActivateVehicleComponent() override;
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+public:
+	TSharedPtr<dbc::FCANMessage> RegRecvMsg(const FString & MessageName, int64 CAN_ID = CANID_DEFAULT);
+	TSharedPtr<dbc::FCANMessage> RegSendMsg(const FString& MessageName, int64 CAN_ID = CANID_DEFAULT);
+	TSharedPtr<dbc::FCANMessage> RegRecvMsgJ1939(const FString& MessageName, uint8 SourceAddress = 0xFE);
+	TSharedPtr<dbc::FCANMessage> RegSendMsgJ1939(const FString& MessageName, uint8 SourceAddress = 0xFE);
+
+	template<typename T>
+	TSharedPtr<T> RegRecvMsg(int64 CAN_ID = CANID_DEFAULT)
+	{
+		CAN_ID = (CAN_ID == CANID_DEFAULT ? T::Default_CANID : CAN_ID);
+		auto Msg = MakeShared<T>(CAN_ID);
+		RecvMessages[CAN_ID] = Msg;
+		return Msg;
+	}
+
+	template<typename T>
+	TSharedPtr<T> RegSendMsg(int64 CAN_ID = CANID_DEFAULT)
+	{
+		CAN_ID = (CAN_ID == CANID_DEFAULT ? T::Default_CANID : CAN_ID);
+		auto Msg = MakeShared<T>(CAN_ID);
+		SendMessages[CAN_ID] = Msg;
+		return Msg;
+	}
+
+	template<typename T>
+	TSharedPtr<T> RegRecvMsgJ1939(uint8 SourceAddress = 0xFE)
+	{
+		auto Msg = RegRecvMsg<T>(T::Default_CANID & 0x3FFFF00 | SourceAddress);
+		return Msg;
+	}
+
+	template<typename T>
+	TSharedPtr<T> RegSendMsgJ1939(uint8 SourceAddress = 0xFE)
+	{
+		auto Msg = RegSendMsg<T>(T::Default_CANID & 0x3FFFF00 | SourceAddress);
+		return Msg;
+	}
+
+	void UnregRecvMsg(int64 CAN_ID);
+	void UnregSendMsg(int64 CAN_ID);
+	void UnregRecvMsgJ1939(const FString& MessageName, uint8 SourceAddress = 0xFE);
+	void UnregSendMsgJ1939(const FString& MessageName, uint8 SourceAddress = 0xFE);
+
+public:
+	virtual void GetRemark(FString& Info) const override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+protected:
+	UPROPERTY()
+	TSet<UCANDevComponent*> RegistredCANDev;
+
+	int PkgSent = 0;
+	int PkgSentErr = 0;
+	int PkgReceived = 0;
+	int PkgDecoded = 0;
+
+	std::unordered_map<std::uint64_t, TSharedPtr<dbc::FCANMessage>> RecvMessages;
+	std::unordered_map<std::uint64_t, TSharedPtr<dbc::FCANMessage>> SendMessages;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/CANDev.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/CANDev.h
new file mode 100644
index 0000000..17a5aef
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/CANDev.h
@@ -0,0 +1,68 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleBaseComponent.h"
+#include "Soda/DBC/Common.h"
+#include "Soda/SodaTypes.h"
+#include <unordered_map>
+#include "CANDev.generated.h"
+
+#define CANID_DEFAULT -1
+
+DECLARE_MULTICAST_DELEGATE_TwoParams(FCanDevRecvFrameDelegate, TTimestamp, const dbc::FCanFrame &);
+
+class UCANBusComponent;
+
+/** ECanBitRates */
+UENUM(BlueprintType)
+enum class ECanBitRates : uint8
+{
+	CAN_BITRATE_1M,
+	CAN_BITRATE_500K,
+	CAN_BITRATE_250K,
+	CAN_BITRATE_125K,
+	CAN_BITRATE_100K,
+	CAN_BITRATE_62K,
+	CAN_BITRATE_50K,
+};
+
+/** ECANMode */
+UENUM(BlueprintType)
+enum class ECANMode : uint8
+{
+	Standart,
+	FD
+};
+
+/**
+ * UCANDevComponent
+ * Abstract CAN device 
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable)
+class UNREALSODA_API UCANDevComponent : public UVehicleBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateActorr, AllowedClasses = "/Script/SodaSim.CANBusComponent"))
+	FSubobjectReference LinkToCANBus;
+
+public:
+	virtual bool IsCANFDSupported() const { return false; }
+	virtual void ProcessRecvMessage(const TTimestamp& Timestamp, const dbc::FCanFrame& CanFrame);
+	virtual int SendFrame(const dbc::FCanFrame& CanFrame);
+
+public:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+public:
+	virtual void GetRemark(FString& Info) const override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+protected:
+	UPROPERTY();
+	UCANBusComponent* CANBus;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Drivers/VehicleDriverGenericComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Drivers/VehicleDriverGenericComponent.h
new file mode 100644
index 0000000..0d58a6c
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Drivers/VehicleDriverGenericComponent.h
@@ -0,0 +1,110 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "Soda/Transport/GenericVehicleStatePublisher.h"
+#include "Sockets.h"
+#include "SocketSubsystem.h"
+#include "Common/UdpSocketReceiver.h"
+#include "Common/UdpSocketBuilder.h"
+#include "Interfaces/IPv4/IPv4Address.h"
+#include "Interfaces/IPv4/IPv4Endpoint.h"
+#include "VehicleDriverGenericComponent.generated.h"
+
+class UVehicleBrakeSystemBaseComponent;
+class UVehicleEngineBaseComponent;
+class UVehicleSteeringRackBaseComponent;
+class UVehicleHandBrakeBaseComponent;
+class UVehicleGearBoxBaseComponent;
+
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleDriverGenericComponent : public UVehicleDriverComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateComponent, AllowedClasses = "/Script/SodaSim.VehicleEngineBaseComponent"))
+	FSubobjectReference LinkToEngine { TEXT("Engine") };
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateComponent, AllowedClasses = "/Script/SodaSim.VehicleSteeringRackBaseComponent"))
+	FSubobjectReference LinkToSteering { TEXT("SteeringRack") };
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateComponent, AllowedClasses = "/Script/SodaSim.VehicleBrakeSystemBaseComponent"))
+	FSubobjectReference LinkToBrakeSystem { TEXT("BrakeSystem") };
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateComponent, AllowedClasses = "/Script/SodaSim.VehicleHandBrakeBaseComponent"))
+	FSubobjectReference LinkToHandBrake { TEXT("HandBrake") };
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateComponent, AllowedClasses = "/Script/SodaSim.VehicleGearBoxBaseComponent"))
+	FSubobjectReference LinkToGearBox { TEXT("GearBox") };
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleDriver, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int RecvPort = 7077;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleDriver, SaveGame, meta = (EditInRuntime))
+	FGenericVehicleStatePublisher Publisher;
+
+public:
+	UPROPERTY(BlueprintReadOnly, Category = VehicleDriver)
+	UVehicleBrakeSystemBaseComponent * BrakeSystem = nullptr;
+
+	UPROPERTY(BlueprintReadOnly, Category = VehicleDriver)
+	UVehicleEngineBaseComponent * Engine = nullptr;
+
+	UPROPERTY(BlueprintReadOnly, Category = VehicleDriver)
+	UVehicleSteeringRackBaseComponent * SteeringRack = nullptr;
+
+	UPROPERTY(BlueprintReadOnly, Category = VehicleDriver)
+	UVehicleHandBrakeBaseComponent * HandBrake = nullptr;
+
+	UPROPERTY(BlueprintReadOnly, Category = VehicleDriver)
+	UVehicleGearBoxBaseComponent * GearBox = nullptr;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleDriver)
+	FTransform IMURelativePosition;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleDriver)
+	float EngineToWheelsRatio = 1.f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleDriver)
+	float VehicleWheelRadius = 35.0f;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void DrawDebug(UCanvas *Canvas, float &YL, float &YPos) override;
+	virtual void PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+
+public:
+	virtual ENGear GetGear() const override { return Gear; }
+	virtual bool IsADPing() const override { return bVapiPing; }
+	virtual ESodaVehicleDriveMode GetDriveMode() const override;
+
+	//virtual bool IsEnabledLeftTurningLights() const { return false; }
+	//virtual bool IsEnabledRightTurningLights() const { return false; }
+	//virtual bool IsEnabledBrakeLight() const;
+	//virtual bool IsEnabledHeadlights() const { return false; }
+	//virtual bool IsEnabledDaytimeRunningLights() const { return false; }
+	//virtual bool IsEnabledReversLights() const;
+	//virtual bool IsEnabledHorn() const { return false; }
+	//virtual FColor GetLED() const;
+
+protected:
+	void Shutdown();
+	void Recv(const FArrayReaderPtr &ArrayReaderPtr, const FIPv4Endpoint &EndPt);
+
+protected:
+	FSocket *ListenSocket = nullptr;
+	FUdpSocketReceiver *UDPReceiver = nullptr;
+
+	FSocket *SendSocket = nullptr;
+	TSharedPtr<FInternetAddr> SendSocketAddr = nullptr;
+
+	soda::GenericVehicleControl MsgIn;
+
+	bool bVapiPing = false;
+	bool bIsADMode = false;
+	ENGear Gear = ENGear::Park;
+	TTimestamp RecvTimestamp;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h
new file mode 100644
index 0000000..a8bec86
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputAIComponent.h
@@ -0,0 +1,271 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Components/BoxComponent.h"
+#include "Soda/UnrealSoda.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "VehicleInputAIComponent.generated.h"
+
+class ASodaWheeledVehicle;
+class ANavigationRoute;
+
+/**
+* Soda PID controller
+*/
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FSodaPID
+{
+	GENERATED_BODY()
+
+	/** PID FeedForward Coef*/
+	UPROPERTY(EditAnywhere, Category = "AI PID controller", BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float FFCoef = 0.035f;
+
+	/** PID Proportional Coef*/
+	UPROPERTY(EditAnywhere, Category = "AI PID controller", BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float PropCoef = 0.03f;
+
+	/** PID Integral Coef*/
+	UPROPERTY(EditAnywhere, Category = "AI PID controller", BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float IntegrCoef = 0;
+
+	/** PID Derivative Coef*/
+	UPROPERTY(EditAnywhere, Category = "AI PID controller", BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float DiffCoef = 0.003;
+
+	/** In case of low fps (under LowFPS limit) multiply proportional error on Coef to reduce oscillations*/
+	UPROPERTY(EditAnywhere, Category = "AI PID controller", BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float LowFPSCoef = 0.2f;
+
+	/**If time step per Tick exceeds limit - use LowFPSCoef [s]*/
+	UPROPERTY(EditAnywhere, Category = "AI PID controller", BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float LowFpsDtLimit = 0.05f;
+
+	/**Put PID debug info to log*/
+	UPROPERTY(EditAnywhere, Category = "AI PID controller", BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bDebugOutput = false;
+
+	float CalculatePID(float FFVal, float Error, float Time)
+	{
+		float Diff = (Error - PrevVal) / Time;
+		Integrator += Error * Time;
+		PrevVal = Error;
+		if (Time > LowFpsDtLimit)
+			Error *= LowFPSCoef;
+		float Res = FFCoef * FFVal + PropCoef * Error + IntegrCoef * Integrator + DiffCoef * Diff;
+		if (bDebugOutput)
+		{
+			UE_LOG(LogSoda, Log, TEXT("PID: FFVal=%f, Error=%f, Integ=%f, Diff=%f, (FF+Prop+Integ+Diff)=(%f+%f+%f+%f=%f)"), FFVal, Error, Integrator, Diff, FFCoef * FFVal, PropCoef * Error, IntegrCoef * Integrator, DiffCoef * Diff, Res);
+		}
+
+		return Res;
+	}
+
+protected:
+	float Integrator = 0;
+	float PrevVal = 0;
+};
+
+/** 
+* Wheeled vehicle controller with optional AI.
+*/
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleInputAIComponent : public UVehicleInputComponent
+{
+	GENERATED_BODY()
+
+public:
+	/** Rate at which input throttle can rise and fall */
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FInputRate ThrottleInputRate;
+
+	/** Rate at which input brake can rise and fall */
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FInputRate BrakeInputRate;
+
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FInputRate SteerInputRate;
+
+	/** Target driving speed [km/h] */
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SpeedLimit = 50.0f;
+
+	/** [0..1] */
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float ThrottlePedalLimit = 1.0f;
+
+	/** Minimum travel speed for extreamly curved routes [km/h]*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SpeedSlow = 10.0f;
+
+	//TODO: 
+	/** Maximum speed to drive thru RourePlanner junctions [km/h]*/
+	//UPROPERTY(Category = "Traffic Routes", EditAnywhere, SaveGame, meta = (EditInRuntime))
+	//float SpeedJunction = 25.0f;
+
+	/** Maximum breaking acceleration avalible [m/s2] */
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float MaxBreakingAcceleration = 3.0;
+
+	/** Breaking Applying Lag [s] */
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float BreakingApplyingLag = 1.5f;
+
+	/** Curvatre Smoothing Coef */
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float CurvatreSmoothingCoef = 0.4f;
+
+	/** Slowing down in curvature coef*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SpeedToCurvatureCoef = 100.f;
+
+	/** Slowing down by lattitude error coef*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SideErrorSpeedCoef = 0.00005f;
+
+	/** Throttle Proportional Coef*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float ThrottlePropCoef = 0.05f;
+
+	/** Point of calculation route spline directonal error longitudal forvarding offset*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float ForwardingDistanceDir = 200.0f;
+
+	/** Point of calculation route spline lattitude error longitudal forvarding offset*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float ForwardingDistanceLoc = 200.0f;
+
+	/**  Steering calculation:  Direction Error To Location Error Ratio Coef [ from 0.0 to 1.0 ]
+	(0.0 - Use only Dir error, 1.0 - use only loc error)*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SteerDirToLocErrorCoef = 0.5f;
+
+	/** Min distance between different target points*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SamePointsDelta = 30.0f;
+
+	/** Steering calculation: Reduce Dir error by multiplying on Coef on Low speed*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float SteeringDirErrorReducingAtLowSpeedCoef = 0.33f;
+
+	/** Speed rate coefficient. Use 0.0 to 1.0 values to slow down all driving speeds accordingly*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float Rate = 1.0f;
+
+	/** Distance to obstacle to stop (m)*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float ObstacleStopDistance = 10.0f;
+
+	/** Consider route segment as strait if point deviations not exceeds given limit (cm)*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float RouteSectionPointMaxSideDeviation = 10.f;
+
+	/** Steering PID controller*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FSodaPID SteeringPID;
+
+	/** Use Raycast to detect obstacles*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bUseRayCast = true;
+
+	/** Use Actors positions to detect obstacles*/
+	UPROPERTY(Category = "AI controller", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bUseActorsPositionChecking = false;
+
+	/** Put debug output to log*/
+	UPROPERTY(Category = "Debug", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bDebugOutputLog = false;
+	
+	/** Draw current route*/
+	UPROPERTY(Category = "Debug", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bDrawCurrentRoute = false;
+
+	/** Draw Debug Information*/
+	UPROPERTY(Category = "Debug", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bDrawTargetLocations = false;
+
+	/** Capturing and updating the route every tick, even if the current input control is not active */
+	UPROPERTY(Category = "Debug", EditAnywhere, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	bool bForceUpdateInputStates = false;
+
+public:
+	UVehicleInputAIComponent(const FObjectInitializer& ObjectInitializer);
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+public:
+	virtual void CopyInputStates(UVehicleInputComponent* Previous) override;
+	virtual float GetSteeringInput() const override { return SteeringInput; }
+	virtual float GetThrottleInput() const override { return ThrottleInput;  }
+	virtual float GetBrakeInput() const override { return BrakeInput;  }
+	virtual ENGear GetGearInput() const override { return  GearInput; }
+	virtual void UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController) override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+public:
+	/** Get current speed limit in [km/h] */
+	UFUNCTION(Category = "AI controller", BlueprintCallable)
+	float GetSpeedLimit() const { return SpeedLimit; }
+
+	/** Set vehicle's speed limit in [km/h] */
+	UFUNCTION(Category = "AI controller", BlueprintCallable)
+	void SetSpeedLimit(float InSpeedLimit) { SpeedLimit = InSpeedLimit; }
+
+	/** Set a fixed route to follow if autopilot is enabled. */
+	UFUNCTION(Category = "AI controller", BlueprintCallable)
+	void SetFixedRouteByWaypoints(const TArray< FVector >& Locations, bool bNewDriveBackvard = false, bool bOverwriteCurrent = true);
+
+	UFUNCTION(Category = "AI controller", BlueprintCallable)
+	bool SetFixedRouteBySpline(const USplineComponent* SplineRoute, bool bNewDriveBackvard = false, bool bOverwriteCurrent = true, float StartOffse = 0);
+
+	UFUNCTION(Category = "AI controller", BlueprintCallable)
+	float GetSideError() const { return SideError; }
+
+	UFUNCTION(Category = "AI controller", BlueprintCallable)
+	float GetObstacleDistance() const { return CurrentObstacleDistance; }
+
+private:
+	void ResetAutopilot();
+	bool TryToStartRandomRoute();
+	bool TryToAppendRandomRoute();
+	bool TryToFindNearestRoute();
+	void UpdateInputStatesInner(float DeltaTime);
+	float CalcStreeringValue(float DeltaTime); // Returns steering value.
+	float CalcSpeedValue(float ObstacleDistance = -1.f); // Returns target speed value.
+	float ThrottleStop(float Speed) { return ThrottleMove(Speed, 0); } // Returns throttle value.
+	float ThrottleMove(float CurSpeed, float TargetSpeed); // Returns throttle value.
+	float RayCast(const FVector& Start, const FVector& End);
+	float CheckIntersectionWithOtherActors(const FVector& Start, const FVector& End, const TArray<AActor*> ActorsToCheck);
+	float GetDistanceToObstacle();
+	float GetSlowingDistance() const;
+	bool IsPointInsideBox(FVector point, UBoxComponent* boxComponent) const;
+	void DrawCurrentRoute();
+	bool AssignRoute(const ANavigationRoute* RoutePlanner);
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+private:
+	UPROPERTY()
+	USplineComponent* RouteSpline;
+
+	TArray< FVector > TargetLocations;
+	float SideError = 0;
+	float CurrentObstacleDistance = 0;
+	bool bDriveBackvard = false;
+	int32 CurrentSplineSegment = -1;
+
+	float SteeringInput = 0.f;
+	float ThrottleInput = 0.f;
+	float BrakeInput = 0.f;
+	ENGear GearInput = ENGear::Drive;
+
+	float Throttle = 0.f;
+	float Steering = 0.f;
+	ENGear Gear = ENGear::Drive;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputExternalComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputExternalComponent.h
new file mode 100644
index 0000000..a01416d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputExternalComponent.h
@@ -0,0 +1,60 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "VehicleInputExternalComponent.generated.h"
+
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleInputExternalComponent : public UVehicleInputComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Rate at which input throttle can rise and fall */
+	UPROPERTY(Category = VehicleInputExternal, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FInputRate ThrottleInputRate;
+
+	/** Rate at which input brake can rise and fall */
+	UPROPERTY(Category = VehicleInputExternal, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FInputRate BrakeInputRate;
+
+	UPROPERTY(Category = VehicleInputExternal, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	FInputRate SteerInputRate;
+
+	UPROPERTY(BlueprintReadWrite, Category = VehicleInputExternal, meta = (EditInRuntime))
+	float SteeringInputTarget = 0;
+
+	UPROPERTY(BlueprintReadWrite, Category = VehicleInputExternal, meta = (EditInRuntime))
+	float ThrottleInputTarget = 0;
+
+	UPROPERTY(BlueprintReadWrite, Category = VehicleInputExternal, meta = (EditInRuntime))
+	float BrakeInputTarget = 0;
+
+	UPROPERTY(BlueprintReadWrite, Category = VehicleInputExternal, meta = (EditInRuntime))
+	ENGear GearInput = ENGear::Park;
+
+public:
+	virtual void CopyInputStates(UVehicleInputComponent* Previous) override;
+	virtual float GetSteeringInput() const override { return SteeringInput; }
+	virtual float GetThrottleInput() const override { return GetCruiseControlModulatedThrottleInput(ThrottleInput); }
+	virtual float GetBrakeInput() const override { return BrakeInput; }
+	virtual ENGear GetGearInput() const override { return  GearInput; }
+	//virtual float GetDriverInputSteerTension() const override { return 0; }
+	virtual void UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController) override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual void SetSteeringInput(float Value) override { SteeringInputTarget = Value; }
+	virtual void SetThrottleInput(float Value) override { ThrottleInputTarget = Value; }
+	virtual void SetBrakeInput(float Value) override { BrakeInputTarget = Value; }
+	virtual void SetGearInput(ENGear Value) override { GearInput = Value; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+protected:
+	float SteeringInput = 0;
+	float ThrottleInput = 0;
+	float BrakeInput = 0;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputJoyComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputJoyComponent.h
new file mode 100644
index 0000000..d790a88
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputJoyComponent.h
@@ -0,0 +1,150 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Curves/CurveFloat.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "VehicleInputJoyComponent.generated.h"
+
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleInputJoyComponent : public UVehicleInputComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateComponent, AllowedClasses = "/Script/SodaSim.VehicleSteeringRackBaseComponent"))
+	FSubobjectReference LinkToSteering { TEXT("SteeringRack") };
+
+	/** In the dead zone the break input will be zero. [0..1] */
+	UPROPERTY(EditAnywhere, Category = VehicleJoyInput, SaveGame, meta = (EditInRuntime))
+	float InputBrakeDeadzone = 0.02f;
+
+	/** 
+	 * Сontinue driving at a low speed when the accelerator pedal is released.
+	 * This is an imitation of the behavior of a real automatic transmission.
+	 */
+	UPROPERTY(EditAnywhere, Category = VehicleJoyInput, SaveGame, meta = (EditInRuntime))
+	bool bCreepMode = false;
+
+	/** Vehicle speed when the accelerator pedal is released and bCreepMode is enabled [km/h] */
+	UPROPERTY(EditAnywhere, Category = VehicleJoyInput, SaveGame, meta = (EditInRuntime))
+	float CreepSpeed = 7.f;
+
+	/** Maximum throttle input available for creep mode [0..1] */
+	UPROPERTY(EditAnywhere, Category = VehicleJoyInput)
+	float MaxCreepThrottle = 0.2f;
+
+	/** Enable the effect of returning the steering wheel to the center position in relation to vehicle speed. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	bool bFeedbackAutocenterEnabled = true; 
+
+	/**  Enable the effect of the resistance roation of stering wheel in relation to stering wheel angular velocity. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	bool bFeedbackResistionEnabled = true; 
+
+	/**  Enable the effect of the rotation of the wheel to match the position of the wheels and steering wheel. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	bool bFeedbackDiffEnabled = true;
+
+	/** Multiplier for bFeedbackAutocenterEnabled. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	float FeedbackAutocenterCoeff = 2.0;
+
+	/** Multipliert for bFeedbackDiffEnabled. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	float FeedbackDiffCoeff = 1.0;
+
+	/** Multiplier for bFeedbackResistionEnabled. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	float FeedbackResistionCoeff = 0.0;
+
+	/** 
+	 * Time axis (X axis) - vehicle speed [km/h]
+	 * Value axis (Y axis) - normalized value (force) [0..1] of the force that will be applied at the steering wheel to return it to center position.
+	 */
+	UPROPERTY(EditAnywhere, Category = SteeringWheelFeedback)
+	FRuntimeFloatCurve FeedbackAutocenterCurve;
+
+	/** 
+	 * Time axis (X axis) - difference beetween steering wheel and front vehicle wheels [deg].
+	 * Value axis (Y axis) - normalized value (force) [0..1] of the force to rotate steering wheels.
+	 */
+	UPROPERTY(EditAnywhere, Category = SteeringWheelFeedback)
+	FRuntimeFloatCurve FeedbackDiffCurve;
+
+	/** 
+	 * Time axis (X axis) - steering wheel rotation speed [nozmalized_value/s].
+	 * Value axis (Y axis) - normalized value (force) [0..1] of the rotational resistance force.
+	 */
+	UPROPERTY(EditAnywhere, Category = SteeringWheelFeedback)
+	FRuntimeFloatCurve FeedbackResistionCurve;
+
+	/** Сommon filter [0..1] for feedback effect */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime, UIMin = 0, ClampMin = 0, UIMax = 1, ClampMax = 1))
+	float FeedbackFilter = 0.3;
+
+	/** Multiplier for calculated normalized force of user (driver) has attached to the steering wheel. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	float CalcDriverForceCompensationCoeff = 1.5;
+
+	/** Area in which the driver (user) force applied to the steering wheel considered as 0. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringWheelFeedback, SaveGame, meta = (EditInRuntime))
+	float CalcDriverForceCompensationDeadZone = 0.4;
+
+	/** Show the steering wheel feedback effect (for steering wheel joystic) debug values on the debug canvas. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bShowFeedback = false;
+
+	/** Enable bump feedback effect  */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = BumpEffect, SaveGame, meta = (EditInRuntime))
+	bool bEnableBumpEffect = false;
+
+	/** Threshold front wheel suspension offset changing speed to activete bump feedback effect  */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = BumpEffect, SaveGame, meta = (EditInRuntime))
+	float BumpEffectThreshold = 150.f;
+
+	/** Coef to calculate force for bump feedback effect  */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = BumpEffect, SaveGame, meta = (EditInRuntime))
+	float BumpEffectForceCoef = 30;
+
+public:
+	UFUNCTION(Category = "VehicleJoyInput", BlueprintCallable, CallInEditor, meta = (CallInRuntime))
+	void ReinitDevice();
+
+public:
+	virtual void CopyInputStates(UVehicleInputComponent* Previous) override;
+	virtual float GetSteeringInput() const override { return SteeringInput; }
+	virtual float GetThrottleInput() const override { return ThrottleInput;  }
+	virtual float GetBrakeInput() const override { return BrakeInput;  }
+	virtual ENGear GetGearInput() const override { return  GearInput; }
+	virtual float GetDriverInputSteerTension() const override { return FeedbackDriverSteerTension; }
+	virtual void SetADMode(bool bIsADMode) { bFeedbackAutocenterEnabled = !bIsADMode; }
+	virtual void UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController) override;
+	virtual void SetHapticAutocenter(bool Enable) { bFeedbackAutocenterEnabled = Enable; }
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual void SetGearInput(ENGear Value) override { GearInput = Value; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+protected:
+	ISodaJoystickPlugin * Joy = nullptr;
+
+	float MaxSteer = 0;
+
+	float SteeringInput = 0.f;
+	float ThrottleInput = 0.f;
+	float BrakeInput = 0.f;
+	ENGear GearInput = ENGear::Drive;
+
+	float FeedbackDiffFactor = 0.f;
+	float FeedbackResistionFactor = 0.f;
+	float FeedbackAutocenterFactor = 0.f;
+	float FeedbackFullFactor = 0.f;
+	float FeedbackDriverSteerTension = 0.f;
+
+	float FrontWheelPrevSuspensionOffset[2] = { 0.f, 0.f };
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputKeyboardComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputKeyboardComponent.h
new file mode 100644
index 0000000..3931132
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Inputs/VehicleInputKeyboardComponent.h
@@ -0,0 +1,83 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Curves/CurveFloat.h"
+#include "Soda/VehicleComponents/VehicleInputComponent.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "VehicleInputKeyboardComponent.generated.h"
+
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleInputKeyboardComponent : public UVehicleInputComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Rate at which input throttle can rise and fall */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	FInputRate ThrottleInputRate;
+
+	/** Rate at which input brake can rise and fall */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	FInputRate BrakeInputRate;
+
+	/** Max steer angle (-1..1) versus forward speed (km/h)  */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	FRuntimeFloatCurve InputMaxSteerPerSpeedCurve;
+
+	/** Steering speed rate (steering(-1..1)/s) versus forward speed (km/h) */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	FRuntimeFloatCurve InputSteeringSpeedCurve;
+
+	/** Trunc the maximum input steering value [0..1] */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	float InputSteeringLimit = 1;
+
+	/** Trunc the maximum input throttle value [0..1] */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	float InputThrottleLimit = 1;
+
+	/** Trunc the maximum input brake value [0..1] */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	float InputBrakeLimit = 1;
+
+	/** Automatic gear shifting when driving from the keyboard */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput, SaveGame, meta = (EditInRuntime))
+	bool bAutoGearBox = true;
+
+	/** Shift time if bAutoGearBox is enbled (sec) */
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	float AutoGearChangeTime = 0.2;
+
+	UPROPERTY(EditAnywhere, Category = VehicleKeyInput)
+	bool bShowControlInput = false;
+
+public:
+	virtual void CopyInputStates(UVehicleInputComponent* Previous) override;
+	virtual float GetSteeringInput() const override;
+	virtual float GetThrottleInput() const override;
+	virtual float GetBrakeInput() const override;
+	virtual ENGear GetGearInput() const override { return  GearInput; }
+	virtual float GetDriverInputSteerTension() const override { return FeedbackDriverSteerTension; }
+	virtual void UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController) override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual void SetGearInput(ENGear Value) override { GearInput = Value; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+protected:
+	float SteeringInput = 0.f;
+	float ThrottleInput = 0.f;
+	float BrakeInput = 0.f;
+	ENGear GearInput = ENGear::Drive;
+
+	float RawThrottleInput = 0.f;
+	float RawSteeringInput = 0.f;
+	float RawBrakeInput = 0.f;
+
+	FInputRate SteerRate;
+	float AutoGearBrakeTimeCounter = 0.f;
+	float FeedbackDriverSteerTension = 0.f;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.h
new file mode 100644
index 0000000..7a9c505
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleBrakeSystemComponent.h
@@ -0,0 +1,197 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "VehicleBrakeSystemComponent.generated.h"
+
+class USodaVehicleWheelComponent;
+
+/**
+ * UWheelBrake
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable)
+class UWheelBrake: public UObject
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(Transient)
+	USodaVehicleWheelComponent * ConnectedWheel = nullptr;
+
+	/** [Bar] */
+	UFUNCTION(BlueprintCallable, Category = WheelBrake)
+	virtual void RequestByPressure(float InBar, double DeltaTime) {};
+
+	/** [H/m] */
+	UFUNCTION(BlueprintCallable, Category = WheelBrake)
+	virtual void RequestByTorque(float InTorque, double DeltaTime) {};
+
+	/** [0..1] */
+	UFUNCTION(BlueprintCallable, Category = WheelBrake)
+	virtual void RequestByRatio(float InRatio, double DeltaTime) {}
+
+	/** [H] */
+	UFUNCTION(BlueprintCallable, Category = WheelBrake)
+	virtual float GetTorque() const { return 0; }
+
+	/** [Bar] */
+	UFUNCTION(BlueprintCallable, Category = WheelBrake)
+	virtual float GetPressure() const { return 0; }
+
+	/** [0..1] */
+	UFUNCTION(BlueprintCallable, Category = WheelBrake)
+	virtual float GetLoad() const { return 0; }
+};
+
+/**
+ * UVehicleBrakeSystemBaseComponent
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleBrakeSystemBaseComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Acceleratio in [m/c^2] */
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual void RequestByAcceleration(float InAcceleration, double DeltaTime) {}
+
+	/** Force in [H] */
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual void RequestByForce(float InForce, double DeltaTime) {}
+
+	/** Torque in [H/m] */
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual void RequestByTorque(float InTorque, double DeltaTime) {}
+
+	/** [0..1] */
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual void RequestByRatio(float InRatio, double DeltaTime) {}
+
+	/** [Bar] */
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual void RequestByPressure(float InBar, double DeltaTime) {}
+
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual UWheelBrake* GetWheel(int Ind) const { return nullptr; }
+
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual UWheelBrake* GetWheel4WD(E4WDWheelIndex Ind) const { return nullptr; }
+
+	UFUNCTION(BlueprintCallable, Category = BrakeSystem)
+	virtual float ComputeFullTorqByRatio(float InRatio) { return 0; }
+};
+
+/**
+ * FWheelBrakeSetup
+ */
+USTRUCT(BlueprintType, Blueprintable)
+struct FWheelBrakeSetup
+{
+	GENERATED_BODY();
+
+	/** Coefficient of adhesion of a pad to a brake disc */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = BrakeSetup, SaveGame, meta = (EditInRuntime))
+	float PadFricCoeff = 0.34125; 
+	
+	/** Number of pistons */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = BrakeSetup, SaveGame, meta = (EditInRuntime))
+	int ClpPistNo = 1; 
+
+	/** Applied piston surface area */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = BrakeSetup, SaveGame, meta = (EditInRuntime))
+	float PistAr = 0.005002; 
+
+	/** Effective brake disc radius */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = BrakeSetup, SaveGame, meta = (EditInRuntime))
+	float EfcRd = 0.175; 
+
+	/** What part of the total braking request will be applied  on this wheel  */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = BrakeSetup, SaveGame, meta = (EditInRuntime))
+	float BrakeDist = 0.25;
+
+	/** Possible max brake torque [H/m] */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = BrakeSetup, SaveGame, meta = (EditInRuntime))
+	float MaxTorque = 1500.0f;
+
+	UPROPERTY(EditAnywhere, Category = BrakeSetup, SaveGame, meta = (EditInRuntime, ReactivateActor, AllowedClasses = "/Script/SodaSim.SodaVehicleWheelComponent"))
+	FSubobjectReference ConnectedWheel;
+};
+
+/**
+ * UWheelBrakeSimple
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UWheelBrakeSimple: public UWheelBrake
+{
+	friend UVehicleBrakeSystemSimpleComponent;
+
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual void RequestByPressure(float InBar, double DeltaTime) override;
+	virtual void RequestByTorque(float InTorque, double DeltaTime) override;
+	virtual void RequestByRatio(float InRatio, double DeltaTime) override;
+	virtual float GetTorque() const override;
+	virtual float GetPressure() const override;
+	virtual float GetLoad() const override;
+
+protected:
+	UPROPERTY()
+	UVehicleBrakeSystemSimpleComponent* BrakeSystem = nullptr;
+	FWheelBrakeSetup BrakeSetup;
+
+	float CurrentBar = 0;
+	float CurrentTorque = 0;
+};
+
+
+/**
+ * UVehicleBrakeSystemBaseComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleBrakeSystemSimpleComponent : public UVehicleBrakeSystemBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	/** [Nm/s] */
+	UPROPERTY(EditAnywhere, Category = BrakeSystem, SaveGame, meta = (EditInRuntime))
+	FInputRate MechanicalBrakeRate {3000, 3000};
+
+	UPROPERTY(EditAnywhere, Category = BrakeSystem, meta = (EditInRuntime))
+	TArray<FWheelBrakeSetup> WheelBrakesSetup;
+
+	/** Allow set brake from default the UVhicleInputComponent */
+	UPROPERTY(EditAnywhere, Category = BrakeSystem, SaveGame, meta = (EditInRuntime))
+	bool bAcceptPedalFromVehicleInput = true;
+
+public:
+	virtual void RequestByAcceleration(float InAcceleration, double DeltaTime) override;
+	virtual void RequestByForce(float InForce, double DeltaTime) override;
+	virtual void RequestByRatio(float InRatio, double DeltaTime) override;
+	virtual void RequestByPressure(float InBar, double DeltaTime) override;
+	virtual UWheelBrake* GetWheel(int Ind) const override { return WheelBrakes[Ind]; }
+	virtual UWheelBrake* GetWheel4WD(E4WDWheelIndex Ind) const override;
+	virtual float ComputeFullTorqByRatio(float InRatio) override;
+
+public:
+	virtual void InitializeComponent() override;
+	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual void PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+
+protected:
+	UPROPERTY()
+	TArray<UWheelBrakeSimple*> WheelBrakes;
+
+	UPROPERTY()
+	TArray<TWeakObjectPtr<UWheelBrakeSimple>> WheelBrakes4WD;
+
+	float PedalPos = 0;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleDifferentialComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleDifferentialComponent.h
new file mode 100644
index 0000000..514b3b1
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleDifferentialComponent.h
@@ -0,0 +1,69 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "VehicleDifferentialComponent.generated.h"
+
+
+/**
+ * UVehicleDifferentialBaseComponent
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleDifferentialBaseComponent  : public UWheeledVehicleComponent, public ITorqueTransmission
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual void PassTorque(float InTorque) {}
+	virtual float ResolveAngularVelocity() const { return 0; }
+	virtual float FindWheelRadius() const { return 0; }
+	virtual float FindToWheelRatio() const { return 1; }
+};
+
+/**
+ * EVehicleDifferentialType
+ */
+UENUM(BlueprintType)
+enum class  EVehicleDifferentialType : uint8
+{
+	/** Connect engines to front wheels */
+	Open_FrontDrive,
+
+	/** Connect engines to rear wheels */
+	Open_RearDrive,
+};
+
+/**
+ * UVehicleDifferentialSimpleComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleDifferentialSimpleComponent : public UVehicleDifferentialBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Differential, SaveGame, meta = (EditInRuntime))
+	EVehicleDifferentialType DifferentialType;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Differential, SaveGame, meta = (EditInRuntime))
+	float Ratio = 1.0;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+public:
+	virtual void PassTorque(float InTorque) override;
+	virtual float ResolveAngularVelocity() const override;
+	virtual float FindWheelRadius() const override;
+	virtual float FindToWheelRatio() const override { return Ratio; }
+
+protected:
+	mutable float DebugInTorq = 0;
+	mutable float DebugOutTorq = 0;
+	mutable float DebugInAngularVelocity = 0;
+	mutable float DebugOutAngularVelocity = 0;
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleEngineComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleEngineComponent.h
new file mode 100644
index 0000000..d6f58c8
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleEngineComponent.h
@@ -0,0 +1,119 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Curves/CurveFloat.h"
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "VehicleEngineComponent.generated.h"
+
+/**
+ * UVehicleEngineBaseComponent
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleEngineBaseComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	/** 
+	 * Name of the vehicle component to which need to connect the engine shaft (wheel, gearbox, transmission, etc).
+	 * Default wheels name: WheelFL, WheelFR, WheelRL, WheelRR.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateActorr, AllowedClasses = "TorqueTransmission"))
+	FSubobjectReference LinkToTorqueTransmission { TEXT("Differential") };
+
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Engine, SaveGame, meta = (EditInRuntime))
+	float Ratio = 1.0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bVerboseLog = false;
+
+public:
+	UPROPERTY(BlueprintReadOnly, Category = Engin)
+	TScriptInterface<ITorqueTransmission> OutputTorqueTransmission;
+
+public:
+	/** Request torque [N*m] for engine */
+	UFUNCTION(BlueprintCallable, Category = Engine, meta = (ScenarioAction))
+	virtual void RequestByTorque(float InTorque) {}
+
+	UFUNCTION(BlueprintCallable, Category = Engine, meta = (ScenarioAction))
+	virtual void RequestByRatio(float InRatio) { RequestByTorque(GetMaxTorque() * InRatio); }
+
+	/** Get current angular velocity [Rad/s] on the shaft  */
+	UFUNCTION(BlueprintCallable, Category = Engine)
+	virtual float ResolveAngularVelocity() const  { return 0; }
+
+	/** Possible maximum possible engine torque [N*m] for current RPM. */
+	UFUNCTION(BlueprintCallable, Category = Engine)
+	virtual float GetMaxTorque() const { return 0; }
+
+	/** Get current engine torque [N*m] */
+	UFUNCTION(BlueprintCallable, Category = Engine)
+	virtual float GetTorque() const { return 0; }
+
+	/** [0...1] */
+	virtual float GetEngineLoad() { return std::fabsf( GetTorque() / GetMaxTorque()); }
+
+	/** Try to find wheel(s) radius to which set this torque [cm] */
+	virtual float FindWheelRadius() const;
+
+	/** Try to find ratio beetwen this transmission and connected wheel(s) */
+	virtual float FindToWheelRatio() const;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+};
+
+/**
+ * UVehicleEngineSimpleComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleEngineSimpleComponent : public UVehicleEngineBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Torque [N*m] at a given RPM */
+	UPROPERTY(EditAnywhere, Category = VehicleEngine)
+	FRuntimeFloatCurve TorqueCurve;
+
+	/** Muliplayer for TorqueCurve. Result engine torque = TorqueCurve(RPM) * TorqueCurveMultiplier. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Engine, SaveGame, meta = (EditInRuntime))
+	float TorqueCurveMultiplier = 1.f;
+
+	/** Allow set engine torque from default the UVhicleInputComponent */
+	UPROPERTY(EditAnywhere, Category = VehicleEngine, SaveGame, meta = (EditInRuntime))
+	bool bAcceptPedalFromVehicleInput = true;
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+public:
+	virtual void RequestByTorque(float InTorque) override;
+	virtual float ResolveAngularVelocity() const override { return AngularVelocity; }
+	virtual float GetMaxTorque() const override { return MaxTorq; }
+	virtual float GetTorque() const override { return ActualTorque; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+public:
+	//void GetComponenUIÑomment(FString& Info) override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual void PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp & Timestamp) override;
+	virtual void PostPhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+
+protected:
+	float AngularVelocity = 0.f;
+	float MaxTorq = 0.f;
+	float RequestedTorque = 0.f;
+	float ActualTorque = 0.0f;
+	float PedalPos = 0;
+};
+
+
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleGearBoxComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleGearBoxComponent.h
new file mode 100644
index 0000000..91e39c4
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleGearBoxComponent.h
@@ -0,0 +1,96 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "VehicleGearBoxComponent.generated.h"
+
+
+
+/**
+ * UVehicleGearBoxBaseComponent
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleGearBoxBaseComponent  : 
+	public UWheeledVehicleComponent, 
+	public ITorqueTransmission
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UFUNCTION(Category = GearBox, BlueprintCallable)
+	virtual FString GetGearChar() const { return TEXT("?"); }
+
+	UFUNCTION(Category = GearBox, BlueprintCallable)
+	virtual void SetGear(ENGear Gear) {}
+
+	UFUNCTION(Category = GearBox, BlueprintCallable)
+	virtual ENGear GetGear() const { return ENGear::Neutral; }
+
+public:
+	virtual void PassTorque(float InTorque) {}
+	virtual float ResolveAngularVelocity() const { return 0; }
+	virtual float FindWheelRadius() const { return 0; }
+	virtual float FindToWheelRatio() const { return 1; }
+};
+
+
+/**
+ * UVehicleGearBoxSimpleComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleGearBoxSimpleComponent : public UVehicleGearBoxBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateActor, AllowedClasses = "/Script/SodaSim.TorqueTransmission"))
+	FSubobjectReference LinkToTorqueTransmission { TEXT("Differential") };
+
+	/** Allow set brake from default the UVhicleInputComponent */
+	UPROPERTY(EditAnywhere, Category = GearBox, SaveGame, meta = (EditInRuntime))
+	bool bAcceptGearFromVehicleInput = true;
+
+	/** Drive gear ratio */
+	UPROPERTY(EditAnywhere, Category = GearBox, SaveGame, meta = (EditInRuntime))
+	float DGearRatio = 1;
+
+	/** Reverse gear ratio */
+	UPROPERTY(EditAnywhere, Category = GearBox, SaveGame, meta = (EditInRuntime))
+	float RGearRatio = 1;
+
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+public:
+	virtual void PassTorque(float InTorque) override;
+	virtual float ResolveAngularVelocity() const override;
+	virtual float FindWheelRadius() const override;
+	virtual float FindToWheelRatio() const override;
+
+public:
+	virtual FString GetGearChar() const override;
+
+public:
+	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+public:
+	virtual void SetGear(ENGear Gear) override;
+	virtual ENGear GetGear() const override { return Gear; };
+
+protected:
+	float Ratio = 0;
+	ENGear Gear = ENGear::Park;
+
+	UPROPERTY()
+	TScriptInterface<ITorqueTransmission> OutputTorqueTransmission;
+
+	mutable float DebugInTorq = 0;
+	mutable float DebugOutTorq = 0;
+	mutable float DebugInAngularVelocity = 0;
+	mutable float DebugOutAngularVelocity = 0;
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.h
new file mode 100644
index 0000000..4680d16
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleHandBrakeComponent.h
@@ -0,0 +1,56 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "VehicleHandBrakeComponent.generated.h"
+
+/**
+ * UVehicleHandBrakeBaseComponent
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleHandBrakeBaseComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual void RequestByRatio(float InRatio) {}
+};
+
+
+UENUM(BlueprintType)
+enum class EHandBrakeMode : uint8
+{
+	FrontWheels,
+	RearWheels,
+	FourWheel
+};
+
+/**
+ * UVehicleHandBrakeSimpleComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleHandBrakeSimpleComponent : public UVehicleHandBrakeBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, Category = HandBrake)
+	FInputRate MechanicalBrakeRate;
+
+	UPROPERTY(EditAnywhere, Category = HandBrake)
+	EHandBrakeMode HandBrakeMode = EHandBrakeMode::RearWheels;
+
+	UPROPERTY(EditAnywhere, Category = HandBrake)
+	float MaxHandBrakeTorque = 3000;
+
+public:
+	virtual void RequestByRatio(float InRatio) override;
+
+protected:
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+protected:
+	float CurrentRatio = 0;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleSteeringComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleSteeringComponent.h
new file mode 100644
index 0000000..d21917a
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Mechanicles/VehicleSteeringComponent.h
@@ -0,0 +1,79 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "Curves/CurveFloat.h"
+#include "VehicleSteeringComponent.generated.h"
+
+/**
+ * UVehicleSteeringRackComponent
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleSteeringRackBaseComponent  : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	/** [Rad] */
+	UFUNCTION(BlueprintCallable, Category = SteeringRack, meta = (ScenarioAction))
+	virtual void RequestByAngle(float InAngle) { }
+
+	/** [-1..1] */
+	UFUNCTION(BlueprintCallable, Category = SteeringRack, meta = (ScenarioAction))
+	virtual void RequestByRatio(float InRatio) { RequestByAngle(GetMaxSteer() * InRatio); }
+
+	/** [Rad] */
+	UFUNCTION(BlueprintCallable, Category = SteeringRack)
+	virtual float GetCurrentSteer() const { return 0; }
+
+	/** [Rad] */
+	UFUNCTION(BlueprintCallable, Category = SteeringRack)
+	virtual float GetMaxSteer() const { return 0; }
+};
+
+/**
+ * UVehicleSteeringRackSimpleComponent
+*/
+
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleSteeringRackSimpleComponent : public UVehicleSteeringRackBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SteeringRack, SaveGame, meta = (EditInRuntime))
+	float MaxSteerAngle = 30;
+
+	/** Steering speed [deg/s] versus forward speed [km/h] */
+	UPROPERTY(EditAnywhere, Category = SteeringRack)
+	FRuntimeFloatCurve SteeringCurve;
+
+	/** Allow set brake from default the UVhicleInputComponent */
+	UPROPERTY(EditAnywhere, Category = BrakeSystem, SaveGame, meta = (EditInRuntime))
+	bool bAcceptSteerFromVehicleInput = true;
+
+public:
+	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+public:
+	virtual void RequestByAngle(float InAngle) override { TargetSteerAng = InAngle; }
+	virtual float GetCurrentSteer() const override { return CurrentSteerAng; }
+	virtual float GetMaxSteer() const override { return MaxSteerAngle / 180 * M_PI; }
+
+public:
+	virtual void PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+	virtual void UpdateSteer(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp);
+
+protected:
+	float CurrentSteerAng = 0;
+	float TargetSteerAng = 0;
+	float SteerInputRatio = 0;
+};
+
+
+
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/CsvLogger.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/CsvLogger.h
new file mode 100644
index 0000000..e7324eb
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/CsvLogger.h
@@ -0,0 +1,51 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "InputCoreTypes.h"
+#include <fstream>
+#include "CsvLogger.generated.h"
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UCSVLoggerComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float Period = 0.1f; // (sec) Logging period
+
+	UPROPERTY(BlueprintReadWrite, Category = Sensor, meta = (EditInRuntime))
+	bool bAddTimeMarkToNextTick = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	FString CvsFileNameBase = "log";
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	FKey ToggleKeyInput = FKey("EIGHT");
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	FKey PutTimeMarkKeyInput = FKey("NINE");
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame)
+	int CvsFileNameIndex = 0;
+
+	std::int64_t TimeTravelled = 0; // (ms)
+	float DistanceTravelled; // (m)
+
+	FVector PrevLocaion;
+	FVector StartLocation;
+	std::int64_t PrevTimestamp = 0;
+	std::int64_t PrevLoggedTimeMark= 0;
+
+	std::ofstream CsvOutFile;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/OdometryTest.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/OdometryTest.h
new file mode 100644
index 0000000..6c67cb7
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/OdometryTest.h
@@ -0,0 +1,85 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "Soda/Misc/ExtraWindow.h"
+#include "Soda/Misc/TelemetryGraph.h"
+#include "OdometryTest.generated.h"
+
+class UCanvasRenderTarget2D;
+
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FOdometryData
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = OdometryData)
+	FVector OdometryPose;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = OdometryData)
+	FRotator OdometryRotation;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = OdometryData)
+	FVector OdometryVelocity;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = OdometryData)
+	FVector ActualPose;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = OdometryData)
+	FRotator ActualRotation;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = OdometryData)
+	FVector ActualVelocity;
+};
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UOdometryTestComponent : public UImuSensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = OdometryTest, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bInitPositionFromZero = false;
+
+protected:
+	UPROPERTY(BlueprintReadOnly, Category = OdometryTest)
+	UExtraWindow* GraphWindow = nullptr;
+
+	UPROPERTY(BlueprintReadOnly, Category = OdometryTest)
+	UCanvasRenderTarget2D* CanvasRenderTarget2D = nullptr;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = OdometryTest)
+	FOdometryData GetOdometry() const;
+
+	UFUNCTION(BlueprintCallable, Category = Debug, meta = (CallInRuntime))
+	virtual void ShowGraphs();
+
+public:
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString & Info) const override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+
+public:
+	UOdometryTestComponent();
+
+private:
+	FTelemetryGraphGrid TelemetryGrid;
+
+	bool bIsFirstTick = false;
+	FVector P;
+	FQuat Q;
+	FVector V;
+
+	FTransform WorldPose;
+	FVector WorldVel;
+	FVector LocalAcc;
+	FVector Gyro;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/V2V.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/V2V.h
new file mode 100644
index 0000000..80b1211
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/V2V.h
@@ -0,0 +1,100 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleBaseComponent.h"
+#include "Soda/Transport/GenericV2XPublisher.h"
+#include "V2V.generated.h"
+
+class FSocket;
+class FInternetAddr;
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UV2VTransmitterComponent : public UVehicleBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual void BeginPlay() override;
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString& Info) const override;
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox2;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox3;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox4;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox5;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox6;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	FVector BoundingBox7;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	int ID = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	bool bAssignUniqueIdAtStartup = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	bool bAutoCalculateBoundingBox = true;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = V2V)
+	void AssignUniqueId() { ID = ++IDsCounter; }
+
+	bool FillV2VMsg(soda::V2VSimulatedObject& msg, bool RecalculateBoundingBox, bool DrawDebug = false);
+	bool FillV2VMsg(soda::V2XRenderObject& msg, bool RecalculateBoundingBox, bool DrawDebug = false);
+
+	void CalculateBoundingBox();
+
+protected:
+	static int IDsCounter;
+};
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UV2VReceiverComponent : public UVehicleBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FGenericV2XPublisher Publisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	float Radius = 100; // [m]
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	bool bRecalculateBoundingBoxEveryTick = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime))
+	bool bLogMessages = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = V2V, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bUseNewProtocol = false;
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString & Info) const override;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/WheelsRendering.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/WheelsRendering.h
new file mode 100644
index 0000000..c3d7e68
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/WheelsRendering.h
@@ -0,0 +1,57 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "VehicleAnimationInstance.h"
+#include "WheelsRendering.generated.h"
+
+class ASodaWheeledVehicle;
+
+/**
+ * UWheelsAnimationComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UWheelsRenderingComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Custom static wheel mesh  */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelsRendering)
+	UStaticMesh *FrontWheelMesh;
+
+	/** Custom static wheel mesh  */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelsRendering)
+	UStaticMesh *RearWheelMesh;
+
+	/** Flip wheel mesh  */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelsRendering, SaveGame, meta = (EditInRuntime))
+	bool bFlipWheelsMesh;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelsRendering, SaveGame, meta = (EditInRuntime))
+	bool bStagecoachEffect = false;
+
+	/** Custom static wheel mesh components */
+	UPROPERTY(transient, duplicatetransient, BlueprintReadOnly, Category = WheelsRendering)
+	TArray<UStaticMeshComponent *> WheelMesheComponents;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelsRendering, SaveGame, meta = (EditInRuntime))
+	float ShutterSpeed = 30.0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelsRendering, SaveGame, meta = (EditInRuntime))
+	float MaxAngularVelocity = 256.f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelsRendering, SaveGame, meta = (EditInRuntime))
+	int WheelSpokeCount = 5;
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+protected:
+	TArray<FWheelAnimationData> WheelsAnimationData;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/WheelsSkidEffect.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/WheelsSkidEffect.h
new file mode 100644
index 0000000..07f6fc2
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Others/WheelsSkidEffect.h
@@ -0,0 +1,54 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "VehicleAnimationInstance.h"
+#include "WheelsSkidEffect.generated.h"
+
+class ASodaWheeledVehicle;
+class UParticleSystemComponent;
+
+/**
+ * UWheelsAnimationComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UWheelsSkidEffectComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Mark emitter template for skid effect. */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = SlipEffect)
+	UParticleSystem* MarkEmitterTemplate = nullptr;
+
+	/** Smoke emitter template for skid effect */
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = SlipEffect)
+	UParticleSystem* SmokeEmitterTemplate = nullptr;
+
+	/** Enable skid effect. It can affect on performance. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SlipEffect, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bEnableSkidEffect = false;
+
+	/** Skid effect velocity threshold [cm/s]*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SlipEffect, SaveGame, meta = (EditInRuntime))
+	float SkidEffectTreshold = 27.7778 * 10; //27.7778 - 1 km/h
+
+	/** Skid effect smoke particale rate = SlipVelocity[cm/s] * SkidSmokeRateMultiplier  */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SlipEffect, SaveGame, meta = (EditInRuntime))
+	float SkidSmokeRateMultiplier = 0.5;
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+protected:
+	UPROPERTY(Transient)
+	TArray<UParticleSystemComponent*> MarkParticleSystem;
+
+	UPROPERTY(Transient)
+	TArray<UParticleSystemComponent*> SmokeParticleSystem;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/CameraBaseSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/CameraBaseSensor.h
new file mode 100644
index 0000000..7b9f1b1
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/CameraBaseSensor.h
@@ -0,0 +1,233 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Engine/SceneCapture2D.h"
+#include "Soda/Transport/GenericCameraPublisher.h"
+#include "Soda/Misc/PixelReader.h"
+#include "CameraBaseSensor.generated.h"
+
+class UExtraWindow;
+
+/**
+ * FCameraIntrinsics
+ */
+class FCameraIntrinsics
+{
+public:
+	double K1 = 0;
+	double K2 = 0;
+	double K3 = 0;
+	double K4 = 0;
+
+	double Cx = 0.5;
+	double Cy = 0.5;
+	double Fx = 1;
+	double Fy = 1;
+};
+
+/**
+ * FCameraPostProcessMaterals
+ */
+USTRUCT()
+struct FCameraPostProcessMaterals
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY()
+	class UMaterialInterface* DepthAbs;
+
+	UPROPERTY()
+	class UMaterialInterface* DepthAbsEnc;
+
+	UPROPERTY()
+	class UMaterialInterface* DepthNorm;
+
+	UPROPERTY()
+	class UMaterialInterface* DepthNormEnc;
+
+	UPROPERTY()
+	class UMaterialInterface* Segm;
+
+	UPROPERTY()
+	class UMaterialInterface* SegmColor;
+
+	UPROPERTY()
+	class UMaterialInterface* CFA;
+};
+
+
+/**
+ * UCameraBaseSensorComponent
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UCameraBaseSensorComponent : public USensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	/** Controls what primitives get rendered into the scene capture. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SceneCapture)
+	ESceneCapturePrimitiveRenderMode PrimitiveRenderMode;
+
+	/** The actors to hide in the scene capture. */
+	UPROPERTY(EditInstanceOnly, BlueprintReadWrite, Category=SceneCapture)
+	TArray<AActor*> HiddenActors;
+
+	/** The only actors to be rendered by this scene capture, if PrimitiveRenderMode is set to UseShowOnlyList.*/
+	UPROPERTY(EditInstanceOnly, BlueprintReadWrite, Category=SceneCapture)
+	TArray<AActor*> ShowOnlyActors;
+	
+	/** Whether to persist the rendering state even if bCaptureEveryFrame==false.  This allows velocities for Motion Blur and Temporal AA to be computed. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SceneCapture)
+	bool bAlwaysPersistRenderingState = false;
+
+	/** Scales the distance used by LOD. Set to values greater than 1 to cause the scene capture to use lower LODs than the main view to speed up the scene capture pass. */
+	UPROPERTY(EditAnywhere, Category=PlanarReflection, meta=(UIMin = ".1", UIMax = "10"), AdvancedDisplay)
+	float LODDistanceFactor = 1.0f;
+
+	/** if > 0, sets a maximum render distance override.  Can be used to cull distant objects from a reflection if the reflecting plane is in an enclosed area like a hallway or room */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SceneCapture, meta=(UIMin = "100", UIMax = "10000"))
+	float MaxViewDistanceOverride = -1;
+
+	/** ShowFlags for the SceneCapture's ViewFamily, to control rendering settings for this view. Hidden but accessible through details customization */
+	UPROPERTY(EditAnywhere, interp, Category=SceneCapture)
+	TArray<struct FEngineShowFlagsSetting> ShowFlagSettings;
+
+	// TODO: Make this a UStruct to set directly?
+	/** Settings stored here read from the strings and int values in the ShowFlagSettings array */
+	FEngineShowFlags ShowFlags;
+
+	/** When enabled, the scene capture will composite into the render target instead of overwriting its contents. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category=SceneCapture)
+	TEnumAsByte<enum ESceneCaptureCompositeMode> CompositeMode;
+
+	UPROPERTY(interp, Category=PostProcessVolume, meta=(ShowOnlyInnerProperties))
+	struct FPostProcessSettings PostProcessSettings;
+
+	/** Range (0.0, 1.0) where 0 indicates no effect, 1 indicates full effect. */
+	UPROPERTY(interp, Category=PostProcessVolume, BlueprintReadWrite, meta=(UIMin = "0.0", UIMax = "1.0"))
+	float PostProcessBlendWeight = 1.0f;
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publishing, SaveGame, meta = (EditInRuntime))
+	TSubclassOf<UCameraPublisher> CameraPublisherClass;
+
+	UPROPERTY(EditAnywhere, Instanced, Category=Publishing, SaveGame, meta = (EditInRuntime))
+	TObjectPtr<UCameraPublisher> CameraPublisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	ECameraSensorShader Format = ECameraSensorShader::ColorBGR8;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	int Width = 800;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	int Height = 800;
+
+	/** [m] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float MaxDepthDistance = 200.0;	
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bUseCustomAutoExposure = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float AutoExposureMinBrightness;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float AutoExposureMaxBrightness;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float AutoExposureBias;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bForceLinearGamma = false;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	//bool bDrawDebugText = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bLogTick = false;
+
+	/** {0} - will be replaced by datatime format - yyyy.mm.dd-hh.mm.ss */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Screenshot, SaveGame, meta = (EditInRuntime))
+	FString DefaultSavePath = "{0}.png";
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	FSensorFOVRenderer FOVSetup;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = CEF, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FLinearColor CFA_0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = CEF, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FLinearColor CFA_1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = CEF, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FLinearColor CFA_2;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = CEF, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FLinearColor CFA_3;
+
+	UPROPERTY(BlueprintReadOnly, Category = CameraSensor)
+	UExtraWindow* CameraWindow;
+
+	UPROPERTY(Transient)
+	UTexture2D* CFATexture;
+
+	UPROPERTY()
+	FCameraPostProcessMaterals CameraPostProcessMaterals;
+
+public:
+	UFUNCTION(Category = CameraSensor, meta = (CallInRuntime))
+	virtual void SaveCameraIntrinsicsAs() const;
+
+	UFUNCTION(BlueprintCallable, Category = Screenshot, meta = (ScenarioAction))
+	virtual void MakeScreenshot(const FString& InFileName);
+
+	UFUNCTION(BlueprintCallable, Category = Screenshot, meta = (CallInRuntime, ScenarioAction))
+	virtual void MakeScreenshotToDefault();
+
+	UFUNCTION(BlueprintCallable, Category = Debug, meta = (CallInRuntime))
+	virtual void ShowRenderTarget();
+
+	virtual FCameraIntrinsics GetCameraIntrinsics() const;
+
+	static bool IsColorFormat(ECameraSensorShader Fromat);
+
+	virtual float GetHFOV() const { check(0); return 0; }
+	virtual float GetVFOV() const { check(0); return 0; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString & Info) const override;
+	virtual UTextureRenderTarget2D* GetRenderTarget2DTexture() override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual bool IsVehicleComponentInitializing() const; 
+	virtual bool NeedRenderSensorFOV() const;
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	virtual void Serialize(FArchive& Ar) override;
+	virtual FBoxSphereBounds CalcBounds(const FTransform& LocalToWorld) const override;
+#if WITH_EDITOR
+	virtual void PostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual void PostInitProperties() override;
+#endif
+	
+protected:
+	virtual USceneCaptureComponent2D* GetSceneCaptureComponent2D() { check(0); return nullptr; }
+
+	virtual void RefreshPublisherClass();
+
+	FCameraPixelReader PixelReader;
+	FRenderCommandFence RenderFence;
+
+	FCameraFrame CameraFrame;
+	FString ComponentDesc;
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/CameraSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/CameraSensor.h
new file mode 100644
index 0000000..e90cd61
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/CameraSensor.h
@@ -0,0 +1,45 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/CameraBaseSensor.h"
+#include "CameraSensor.generated.h"
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UCameraSensorComponent : public UCameraBaseSensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Capture priority within the frame to sort scene capture on GPU to resolve interdependencies between multiple capture components. Highest come first. */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category=SceneCapture)
+	int32 CaptureSortPriority = 1;
+
+	/** Camera field of view (in degrees). */
+	UPROPERTY(interp, EditAnywhere, BlueprintReadWrite, Category=CameraSensor, SaveGame, meta=(DisplayName = "Field of View", UIMin = "5.0", UIMax = "170", ClampMin = "0.001", ClampMax = "360.0",EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float FOVAngle = 90.0f;
+
+	UPROPERTY(Transient, BlueprintReadOnly, Category = CameraSensor)
+	class USceneCaptureComponent2D* CaptureComponent;
+
+	UPROPERTY(BlueprintReadOnly, Category = CameraSensor)
+	UMaterialInstanceDynamic * PostProcessMat;
+
+	virtual float GetHFOV() const { return FOVAngle; }
+	virtual float GetVFOV() const { return FOVAngle / Width * Height; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) override;
+
+protected:
+	virtual USceneCaptureComponent2D* GetSceneCaptureComponent2D() { return CaptureComponent; }
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual void Clean();
+};
+
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/FisheyeCameraSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/FisheyeCameraSensor.h
new file mode 100644
index 0000000..f2158c3
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/FisheyeCameraSensor.h
@@ -0,0 +1,246 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/CameraBaseSensor.h"
+#include "GameFramework/SaveGame.h"
+#include <future>
+#include "FisheyeCameraSensor.generated.h"
+
+UENUM(BlueprintType)
+enum class  EFisheyeConstructMode : uint8
+{
+	OneFace,
+	TowFaces,
+	ThreeFaces,
+	ThreeFacesLine,
+	FourFaces,
+	FiveFaces
+};
+
+
+class FFisheyeCameraModel: public FCameraIntrinsics
+{
+public:
+	bool ProjectUV2XYZ(const FVector2D& UV, FVector& Normal) const;
+	void ProjectXYZ2UV(const FVector& Point, FVector2D& UV) const;
+
+protected:
+	double R_D(double Theta) const;
+	double R_D_Deriv(double Theta) const;
+	double Kb_Compute_Theta_Nl(double Theta) const;
+
+	const double Eps = 1e-6;
+	const int N_Iter_Max = 10;
+};
+
+USTRUCT()
+struct UNREALSODA_API FFisheyeSide
+{
+	GENERATED_USTRUCT_BODY()
+
+	FFisheyeSide(){}
+
+	FFisheyeSide(const FQuat& InCamRotator, float InFOV, int InWidth, int InHeight):
+		CamRotator(InCamRotator), FOV(InFOV), Width(InWidth), Height(InHeight) {}
+
+	UPROPERTY(Transient)
+	UTexture2D* UVTexture = nullptr;
+
+	UPROPERTY(Transient)
+	USceneCaptureComponent2D * SceneCapture = nullptr;
+
+	FQuat CamRotator; 
+	float FOV;
+	int Width;
+	int Height;
+};
+
+
+UCLASS()
+class UNREALSODA_API USceneCaptureDeferredComponent2D : public USceneCaptureComponent2D
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	void UpdateSceneCaptureContents(FSceneInterface* Scene) override;
+    UWorld * CustomWorld = nullptr;
+};
+
+/**
+ * UFisheyeCameraSensorComponent
+ * TODO: Make easy way to parametrisation of Fisheye projection construction  for user 
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UFisheyeCameraSensorComponent : public UCameraBaseSensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CameraSensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float BloomIntensity = 1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	EFisheyeConstructMode FisheyeConstructMode = EFisheyeConstructMode::ThreeFacesLine;
+
+	/** Intrinsics Distorion Vector D[0] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsD0 = -0.0326545688;
+
+	/** Intrinsics Distorion Vector D[1] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsD1 = -0.0225569828;
+
+	/** Intrinsics Distorion Vector D[2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsD2 = 0.009552358147;
+
+	/** Intrinsics Distorion Vector D[3] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsD3 = -0.00172665024;
+
+	/** Intrinsics Camera Matrix K[0][2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsCX = 960;
+
+	/** Intrinsics Camera Matrix K[1][2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsCY = 604;
+
+	/** Intrinsics Camera Matrix K[0][0] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsFX = 690;
+
+	/** Intrinsics Camera Matrix K[1][1] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float IntrinsicsFY = 690;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	float CenterFaceFOV = 65;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	float LeftRightFaceFOV = 65;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	float UpDownFaceFOV = 90;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	int CenterFaceTexWidth = 850;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	int CenterFaceTexHeight = 2000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	int LeftRightFaceTexWidth = 850;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	int LeftRightFaceTexHeight = 2000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	int UpDownFaceTexWidth = 512;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	int UpDownFaceTexHeight = 512;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	bool bUseCustomProjectRotation = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	FRotator CustomProjectRotation;
+
+	/** A temporary file used to save the current projection map for loading in the future if the sensor is reactivated.
+	  * This is useful for speeding up sensor initialization
+	  */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	bool bStoreTempProjMap = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime))
+	bool bDrawEdges = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FisheyeProjection, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float MaxFOV = 190;
+
+	/**
+	 * Effected only if the Format != HdrRGB8
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = DrawDebugRings, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebugRings = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = DrawDebugRings, SaveGame)
+	TArray< float > DebugRings;	
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = DrawDebugRings, SaveGame, meta = (EditInRuntime))
+	float NewDebugRings = 60;
+
+	UPROPERTY(interp, Category= FisheyePostProcess, meta=(ShowOnlyInnerProperties))
+	struct FPostProcessSettings FisheyePostProcessSettings;
+
+	UPROPERTY(BlueprintReadOnly, Category = CameraSensor)
+	UMaterialInstanceDynamic * PostProcessMat;
+
+	UPROPERTY(Transient, BlueprintReadOnly, Category = CameraSensor)
+	class USceneCaptureDeferredComponent2D* CaptureComponent;
+
+	UPROPERTY(Transient)
+	UMaterialInstanceDynamic* MaterialDyn = nullptr;
+
+	UWorld* CustomWorld = nullptr;
+
+public:
+	UFUNCTION(Category = FisheyeProjection, meta = (CallInRuntime))
+	void RecalculateProjection();
+
+	virtual FCameraIntrinsics GetCameraIntrinsics() const override { return FisheyeModel; }
+
+	UFUNCTION(Category = DrawDebugRings, meta = (CallInRuntime))
+	void AddRing() { DebugRings.Add(NewDebugRings); }
+
+	UFUNCTION(Category = DrawDebugRings, meta = (CallInRuntime))
+	void ClearRings() { DebugRings.Empty(); }
+
+	virtual void MakeScreenshot(const FString& InFileName) override;
+
+
+public:
+	UFisheyeCameraSensorComponent();
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual bool IsVehicleComponentInitializing() const { return Super::IsVehicleComponentInitializing() || bIsProjectionInitializing; }
+	virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) override;
+
+protected:
+	virtual USceneCaptureComponent2D* GetSceneCaptureComponent2D() { return CaptureComponent; }
+	virtual float GetHFOV() const { return MaxFOV; }
+	virtual float GetVFOV() const { return MaxFOV / Width * Height; }
+
+protected:
+	void ComputeProjectionMap(TArray<FVector>& ProjMap) const;
+	bool ApplyProjectionMap(const TArray<FVector>& ProjMap);
+	void Clean();
+
+	UPROPERTY()
+	TArray<FFisheyeSide> FisheyeSides;
+
+	UPROPERTY(Transient)
+	UStaticMeshComponent* Mesh = nullptr;
+
+	UPROPERTY(Transient)
+	TArray<UMaterialInterface*> SqureMaterials;
+
+	UPROPERTY(Transient)
+	class UStaticMesh* StaticMeshSqure = nullptr;
+
+	FQuat CommonQuat;
+
+	FString TmpFileName;
+
+	FFisheyeCameraModel FisheyeModel;
+
+	bool bIsProjectionInitializing = false;
+	std::future<void> InitializeProjectionFuture;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/GenericVehicleState.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/GenericVehicleState.h
new file mode 100644
index 0000000..94f7184
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/GenericVehicleState.h
@@ -0,0 +1,42 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "Soda/Transport/GenericVehicleStatePublisher.h"
+#include "GenericVehicleState.generated.h"
+
+class UVehicleDriverComponent;
+class ASodaWheeledVehicle;
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UGenericVehicleStateComponent : public UImuSensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	FGenericVehicleStatePublisher Publisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Link, SaveGame, meta = (EditInRuntime, ReactivateComponent, AllowedClasses = "/Script/SodaSim.VehicleDriverComponent"))
+	FSubobjectReference LinkToVehicleDriver { TEXT("VehicleDriver") };
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString& Info) const override;
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+	
+protected:
+	bool bIs4WDVehicle = false;
+
+	UPROPERTY(BlueprintReadOnly, Category = Link)
+	UVehicleDriverComponent * VehicleDriver = nullptr;
+
+	UPROPERTY(BlueprintReadOnly, Category = Link)
+	ASodaWheeledVehicle * WheeledVehicle = nullptr;
+
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/GpsDSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/GpsDSensor.h
new file mode 100644
index 0000000..b82f884
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/GpsDSensor.h
@@ -0,0 +1,120 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "Runtime/Sockets/Public/IPAddress.h"
+#include "SocketSubsystem.h"
+#include "Sockets.h"
+#include "Common/TcpListener.h"
+#include <mutex>
+#include "GpsDSensor.generated.h"
+
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FGpsDConnection
+{
+	GENERATED_BODY()
+
+	FGpsDConnection()
+	{
+		ConnectionSocket = 0;
+		ConnectionAddress = ISocketSubsystem::Get(PLATFORM_SOCKETSUBSYSTEM)->CreateInternetAddr();
+	};
+
+	FGpsDConnection(FSocket* NewSocket, TSharedPtr< FInternetAddr > NewAddress)
+	{
+		ConnectionSocket = NewSocket;
+		ConnectionAddress = NewAddress;
+	};
+
+	FSocket* ConnectionSocket;
+	TSharedPtr< FInternetAddr > ConnectionAddress;
+
+	bool WatcherMode = false;
+	bool WatcherJson = false;
+
+	FString RequestNameBuffer;
+	FString RequestJsonBuffer;
+
+	bool SocketDead = false;
+
+	bool ParseAsJson = false;
+};
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UGpsDSensorComponent : public UImuSensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int TcpPort = 2947;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Publisher, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString Address = "0.0.0.0";
+
+	UPROPERTY(EditAnywhere, Category = Publisher, SaveGame, meta = (EditInRuntime))
+	bool bBaseDebugOutput = false;
+	
+	UPROPERTY(EditAnywhere, Category = Publisher, SaveGame, meta = (EditInRuntime))
+	bool bLogTcpDebugOutput = false;
+
+	/** Watcher mode send period [sec] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float WatcherModePeriod = 0.1f;
+
+	/** Send SKY data in the Watcher Mode */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool bWatcherModeSKY = true;
+
+	/** Send TPV data in the Watcher Mode */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool bWatcherModeTPV = true;
+
+	/** Send ATT data in the Watcher Mode */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool bWatcherModeATT = true;
+
+	/** Send IMU data in the Watcher Mode */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool bWatcherModeIMU = false; 
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	FString DeviceName = "Simulator_GPSD";
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+
+protected:
+	void Shutdown();
+	bool OnConnected(FSocket* ClientSocket, const FIPv4Endpoint& ClientEndpoint);
+
+	void SendTPV(FGpsDConnection& Connection);
+	void SendATT_IMU(FGpsDConnection& Connection, bool bIsATT);
+	void SendSKY(FGpsDConnection& Connection);
+	void SendVersion(FGpsDConnection& Connection);
+	void SendWatch(FGpsDConnection& Connection);
+	void SendDevices(FGpsDConnection& Connection);
+	bool Send(FGpsDConnection& Connection, const FString& Data);
+	void SPrintfFormatedTime(int64_t Timestamp, char* Buffer);
+
+	FSocket* TcpServerSocket = 0;
+	FTcpListener * TcpListener;
+	TArray<FGpsDConnection> Connections;
+	TTimestamp Timestamp;
+	double Lon = 0;
+	double Lat = 0;
+	double Alt = 0;
+	FTransform WorldPose;
+	FVector WorldVel;
+	FVector LocalAcc;
+	FRotator WorldRot;
+	FVector WorldLoc;
+	FVector Gyro;
+	FPhysBodyKinematic CurVehicleKinematic;
+	TTimestamp PrevSendTimeMark;
+	std::mutex Mutex;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/ImuOxtsSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/ImuOxtsSensor.h
new file mode 100644
index 0000000..ce6a824
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/ImuOxtsSensor.h
@@ -0,0 +1,50 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "Soda/Transport/OXTSPublisher.h"
+#include "ImuOxtsSensor.generated.h"
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UImuOxtsSensorComponent : public UImuSensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FOXTSPublisher Publisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int SatellitesNumber = 10;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int OXTS_PositionMode = 6;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int OXTS_VelocityMode = 6;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int OXTS_OrientationMode = 6;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int OXTS_HeadingQuality = 3;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int DifferentialCorrectionsAge = 50;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString & Info) const override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+
+public:
+	UImuOxtsSensorComponent();
+
+private:
+	int Index = 0;
+	soda::OxtsPacket Msg;
+
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/ImuSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/ImuSensor.h
new file mode 100644
index 0000000..d3d6afe
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/ImuSensor.h
@@ -0,0 +1,233 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/Misc/PhysBodyKinematic.h"
+#include "ComponentReregisterContext.h"
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include <fstream>
+#include <iostream>
+#include <random>
+#include "ImuSensor.generated.h"
+
+
+/**
+ * IMU noise generation helper
+ */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FNoiser
+{
+	GENERATED_BODY()
+
+	/** Standard deviation */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime))
+	float StdDev = 0;
+
+	/** Constan bias */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime))
+	float ConstBias = 0;
+
+	/** Gauss-Markov bias standard deviation */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime))
+	float GMBiasStdDev = 0;
+
+	/** Period for the Gauss-Markov process [s] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime))
+	float DeltaTime = 0.01;
+
+	/** Time constant for Gauss-Markov process [s] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime))
+	float TimeConstant = 400;
+
+	FNoiser()
+		: Generator(std::random_device{}()),
+		Dist(0.f, 1.f) 
+	{};
+
+	/** Initialize inner constants */
+	void Init()
+	{
+		float Mu = 1.f / TimeConstant;
+		F = std::exp(-Mu * DeltaTime);
+		SqrtDeltaTime = std::sqrt(DeltaTime);
+		Z = 0;
+	}
+
+	/** Setep and get accumulative noize */
+	float Step()
+	{
+		Z = F * Z + Dist(Generator) * GMBiasStdDev * SqrtDeltaTime;
+		return ConstBias + StdDev * Dist(Generator) + Z;
+	}
+
+	float GetAccuracy() const
+	{
+		return ConstBias + StdDev + GMBiasStdDev;
+	}
+
+protected:
+	float Z = 0;
+	float F = 0;
+	float SqrtDeltaTime = 0;
+	std::default_random_engine Generator;
+	std::normal_distribution< float > Dist;
+};
+
+/**
+ * IMU noise generation helper
+ */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FNoiserVector
+{
+	GENERATED_BODY()
+
+	/** Standard deviation */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FVector StdDev;
+
+	/** Constan bias */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FVector ConstBias;
+
+	/** Gauss-Markov bias standard deviation */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FVector GMBiasStdDev;
+
+	/** Period for the Gauss-Markov process [s] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float DeltaTime = 0.01;
+
+	/** Time constant for Gauss-Markov process */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noiser, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float TimeConstant = 400;
+
+	FNoiserVector()
+		: Generator(std::random_device{}()),
+		Dist(0.f, 1.f)
+	{};
+
+	/** Update inner constants */
+	void UpdateParameters()
+	{
+		float Mu = 1.f / TimeConstant;
+		F = std::exp(-Mu * DeltaTime);
+		SqrtDeltaTime = std::sqrt(DeltaTime);
+		Z = FVector(0);
+	}
+
+	/** Setep and get accumulative noize */
+	FVector Step()
+	{
+		Z = F * Z + FVector(Dist(Generator), Dist(Generator), Dist(Generator)) * GMBiasStdDev * SqrtDeltaTime;
+		return ConstBias + StdDev * FVector(Dist(Generator), Dist(Generator), Dist(Generator)) + Z;
+	}
+
+	FVector GetAccuracy() const
+	{
+		return ConstBias + StdDev + GMBiasStdDev;
+	}
+
+protected:
+	FVector Z;
+	float F;
+	float SqrtDeltaTime = 0;
+	std::default_random_engine Generator;
+	std::normal_distribution< float > Dist;
+};
+
+/**
+ * FImuNoiseParams
+ */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FImuNoiseParams
+{
+	GENERATED_BODY()
+
+	/** [m] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ImuNoiseParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FNoiserVector Location;
+
+	/** Y - Pitch, Z - Yaw, RotNoize.X - Roll, [deg] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ImuNoiseParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FNoiserVector Rotation;
+
+	/** [m/s^2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ImuNoiseParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FNoiserVector Acceleration;
+
+	/** [rad/s] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ImuNoiseParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FNoiserVector Gyro;
+
+	/** [m/s] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ImuNoiseParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FNoiserVector Velocity;
+
+	FImuNoiseParams()
+	{}
+
+	void UpdateParameters()
+	{
+		Location.UpdateParameters();
+		Rotation.UpdateParameters();
+		Acceleration.UpdateParameters();
+		Gyro.UpdateParameters();
+		Velocity.UpdateParameters();
+	}
+};
+
+/**
+ * Base abstract class for all IMU sensors
+ */
+UCLASS(Abstract, ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UImuSensorComponent : public USensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Whether to save debugging information of this sensor to a file */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bSaveCSV = false;
+
+	/** File path for bSavePath. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FString CSVPath = "/tmp/imu_path.csv";
+
+	/** Enabling IMU niose simulation */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool bImuNoiseEnabled = false;
+
+	/** Base IMU noise params */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Noise, SaveGame, meta = (EditInRuntime))
+	FImuNoiseParams NoiseParams;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	void SetImuNoiseParams(const FImuNoiseParams & NewImuNoiseParams);
+
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	void RestoreBaseImuNoiseParams();
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp) override;
+
+public:
+	UImuSensorComponent();
+	void WriteCsvLog(
+		const FVector& WorldLoc,
+		const FRotator & WorldRot,
+		const FVector& WorldVel,
+		const FVector& LocalAcc,
+		const FVector& Gyro,
+		double Lon,
+		double Lat,
+		double Alt,
+		const TTimestamp& Timestamp);
+
+protected:
+	std::ofstream OutFile;
+	FImuNoiseParams StoredParams;
+	bool bIsStoredParams = false;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarDepthSensor2D.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarDepthSensor2D.h
new file mode 100644
index 0000000..5e859fc
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarDepthSensor2D.h
@@ -0,0 +1,127 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/LidarDepthSensorCube.h"
+#include "LidarDepthSensor2D.generated.h"
+
+class UExtraWindow;
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ULidarDepthSensor2DComponent : public USensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY()
+	USceneCaptureComponent2D*  SceneCaptureComponent2D;
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FGenericLidarPublisher PointCloudPublisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	TObjectPtr<UGenericCameraPublisher> DepthMapPublisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bPublishDepthMap = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Channels = 64;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Step = 250;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float FOV_VerticalMin = -15;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float FOV_VerticalMax = 15;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float FOV_Horizontal = 64;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float DistanseMin = 50; // cm
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float DistanseMax = 20000; // cm
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	FSensorFOVRenderer FOVSetup;
+
+	UPROPERTY(EditAnywhere, Category = Sensor)
+	TArray< AActor* > HiddenActors;
+
+	UPROPERTY(EditAnywhere, Category = Sensor)
+	TArray< AActor* > ShowOnlyActors;
+
+	UPROPERTY(EditAnywhere, Category = PlanarReflection, meta = (UIMin = ".1", UIMax = "10"), AdvancedDisplay)
+	float LODDistanceFactor = 1;
+
+	UPROPERTY(EditAnywhere, Category = Sensor, AdvancedDisplay, SaveGame, meta = (EditInRuntime))
+	float DepthMapNorm = 200.0;
+
+	UPROPERTY(EditAnywhere, Category = Sensor, meta = (UIMin = "100", UIMax = "10000"))
+	float MaxViewDistanceOverride = -1;
+
+	UPROPERTY(EditAnywhere, Category = Sensor)
+	int32 CaptureSortPriority = 1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Width = 1920;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Height = 1208;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float FOVAngle = 65;
+
+	UPROPERTY(interp, Category = Sensor, meta = (ShowOnlyInnerProperties))
+	FPostProcessSettings LidarPostProcessSettings;
+
+	UPROPERTY(EditAnywhere, Category = Sensor, AdvancedDisplay, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	ELidarInterpolation Interpolation = ELidarInterpolation::Min;
+
+	UPROPERTY(BlueprintReadOnly, Category = Sensor)
+	UExtraWindow* CameraWindow;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString & Info) const override;
+	virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) override;
+	virtual bool NeedRenderSensorFOV() const;
+	virtual FBoxSphereBounds CalcBounds(const FTransform& LocalToWorld) const override;
+
+	UFUNCTION(BlueprintCallable, Category = Sensor, meta = (ScenarioAction))
+	void SetPrecipitation(float Probability);
+
+	UFUNCTION(BlueprintCallable, Category = Sensor, meta = (ScenarioAction))
+	void SetNoize(float Probability, float MaxDistance);
+
+	UFUNCTION(BlueprintCallable, Category = Sensor, meta = (ScenarioAction))
+	void SetDepthMapMaxView(float Distance);
+
+	UFUNCTION(BlueprintCallable, Category = Debug, meta = (CallInRuntime))
+	virtual void ShowRenderTarget();
+
+public:
+	ULidarDepthSensor2DComponent();
+	virtual void BeginPlay() override;
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+	virtual UTextureRenderTarget2D* GetRenderTarget2DTexture() override;
+
+protected:
+	FCameraPixelReader PixelReader;
+	FRenderCommandFence RenderFence;
+	std::vector< float > Map;
+	UMaterialInstanceDynamic* DepthMaterialDyn = NULL;
+
+	TArray<FVector2D> UVs;
+	TArray<FVector> LidarRays;
+
+	FCameraFrame CameraFrame;
+	std::vector<soda::LidarScanPoint> Points;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarDepthSensorCube.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarDepthSensorCube.h
new file mode 100644
index 0000000..63bef36
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarDepthSensorCube.h
@@ -0,0 +1,148 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/CameraSensor.h"
+#include "Engine/Scene.h"
+#include "Soda/Transport/GenericLidarPublisher.h"
+#include "LidarDepthSensorCube.generated.h"
+
+UENUM(BlueprintType)
+enum class ELidarInterpolation : uint8
+{
+	Bilinear,
+	Min,
+	Nearest
+};
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ULidarDepthSensorCubeComponent : public USensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY()
+	TArray< USceneCaptureComponent2D* >  SceneCaptureComponent2D;
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FGenericLidarPublisher PointCloudPublisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	TObjectPtr<UGenericCameraPublisher> DepthMapPublisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool PublishDepthMap = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float Period = 0.1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int Channels = 64;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int StepToFace = 250;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//float FOV_HorizontMin = 0;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//float FOV_HorizontMax = 360;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float FOV_VerticalMin = -15;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float FOV_VerticalMax = 15;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float DistanseMin = 50;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float DistanseMax = 12000;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//float AbsorptionCoefficient = 0.005;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//float ReflectionCoefficient = 0.8;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//float LaserIntensity = 100000;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//float SensorSize = 0.01;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//float SeaLevel = 10140.0;
+
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	//int FacePublish = 0;
+
+	UPROPERTY(interp, Category = Sensor, meta = (ShowOnlyInnerProperties))
+	FPostProcessSettings LidarPostProcessSettings;
+
+	UPROPERTY(EditAnywhere, Category = Sensor)
+	TArray< AActor* > HiddenActors;
+
+	UPROPERTY(EditAnywhere, Category = Sensor)
+	TArray< AActor* > ShowOnlyActors;
+
+	/*
+	UPROPERTY(EditAnywhere, Category=Sensor)
+	bool bCaptureEveryFrame = true;
+
+	UPROPERTY(EditAnywhere, Category=Sensor)
+	bool bCaptureOnMovement = true;
+	*/
+
+	UPROPERTY(EditAnywhere, Category = PlanarReflection, meta = (UIMin = ".1", UIMax = "10"), AdvancedDisplay)
+	float LODDistanceFactor = 1;
+
+	UPROPERTY(EditAnywhere, Category = Sensor, meta = (UIMin = "100", UIMax = "10000"))
+	float MaxViewDistanceOverride = -1;
+
+	UPROPERTY(EditAnywhere, Category = Sensor)
+	int32 CaptureSortPriority = 1;
+
+	UPROPERTY(EditAnywhere, Category = Sensor, AdvancedDisplay)
+	int Size = 512;
+
+	UPROPERTY(EditAnywhere, Category = Sensor, AdvancedDisplay)
+	ELidarInterpolation Interpolation = ELidarInterpolation::Min;
+
+	//UPROPERTY(EditAnywhere, Category = Sensor, AdvancedDisplay)
+	//bool ShowDebug = false;
+
+	UPROPERTY(EditAnywhere, Category = Sensor, AdvancedDisplay)
+	float DepthMapNorm = 200.0;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString & Info) const override;
+	//virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) override; // TODO
+	//virtual bool NeedRenderSensorFOV() const; // TODO
+
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	void SetPrecipitation(float Probability);
+
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	void SetNoize(float Probability, float MaxDistance);
+
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	void SetDepthMapMaxView(float Distance);
+
+public:
+	ULidarDepthSensorCubeComponent();
+	virtual void BeginPlay() override;
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+private:
+	FCameraPixelReader PixelReader;
+	FRenderCommandFence RenderFence;
+	int FaceReady;
+	std::vector< float > Map;
+	UMaterialInstanceDynamic* DepthMaterialDyn = NULL;
+	FCameraFrame CameraFrame;
+	std::vector<soda::LidarScanPoint> Points;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarRayTraceSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarRayTraceSensor.h
new file mode 100644
index 0000000..c0e8f44
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/LidarRayTraceSensor.h
@@ -0,0 +1,103 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Soda/Transport/GenericLidarPublisher.h"
+#include "LidarRayTraceSensor.generated.h"
+
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API ULidarRayTraceSensorComponent : public USensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FGenericLidarPublisher PointCloudPublisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float Period = 0.1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int Channels = 3;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int Step = 100;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float FOV_HorizontMin = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float FOV_HorizontMax = 360;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float FOV_VerticalMin = -15;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float FOV_VerticalMax = 15;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float DistanseMin = 50;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float DistanseMax = 10000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float AbsorptionCoefficient = 0.005;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float ReflectionCoefficient = 0.8;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float LaserIntensity = 100000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float SensorSize = 0.01;
+
+	//UPROPERTY(EditAnywhere, Category = Sensor)
+	//float SeaLevel = 10140.0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool DrawTracedRays = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool DrawNotTracedRays = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	TArray< AActor* > IgnoreActors;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool EnabledGroundFilter = false;
+
+	/** Distance to ground (cm)*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float DistanceToGround = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bLogTick = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool PublishAbsoluteCoordinates = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	FSensorFOVRenderer FOVSetup;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString & Info) const override;
+	virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) override;
+	virtual bool NeedRenderSensorFOV() const;
+	virtual FBoxSphereBounds CalcBounds(const FTransform& LocalToWorld) const override;
+
+public:
+	ULidarRayTraceSensorComponent();
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+
+protected:
+	std::vector<soda::LidarScanPoint> Points;
+
+	TArray<FVector> BatchStart;
+	TArray<FVector> BatchEnd;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/RadarBaseSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/RadarBaseSensor.h
new file mode 100644
index 0000000..37cf559
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/RadarBaseSensor.h
@@ -0,0 +1,333 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Soda/SodaTypes.h"
+#include "RadarBaseSensor.generated.h"
+
+DECLARE_LOG_CATEGORY_EXTERN(SodaRadar, Log, All);
+
+class URadarBaseSensorComponent;
+
+/**
+ * ERadarMode
+ */
+UENUM(BlueprintType)
+enum class ERadarMode : uint8
+{
+	ClusterMode,
+	ObjectMode
+};
+
+/**
+ * FRadarParams
+ */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FRadarParams
+{
+	GENERATED_BODY()
+
+	/** Just tag */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime))
+	FString Tag;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	bool bEnabled = true;
+
+	/** Full horizontal FOV (deg) */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float FOV_HorizontMax = 60;
+
+	/** Horizontal FOV of maximum distance */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float FOV_HorizontFullDist = 45;
+
+	/** Vertical FOV */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float FOV_Vertical = 20;
+
+	/** Minimum distance, m */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float DistanseMin = 0.2f;
+
+	/** Maximum distance, m */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float DistanseMax = 70;
+
+	/** Maximum distance on full horizontal FOV, m */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent, UpdateFOVRendering))
+	float DistanseOnMaxAngle = 40;
+
+	/** Best horizontal resolution, deg */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float HorizontalBestResolution = 1.0f;
+
+	/** Horizontal resolution on full distance FOV angle, deg */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float HorizontalResolutionFullDistAngle = 4.5f;
+
+	/** Horizontal resolution on maximum angle FOV, deg */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float HorizontalResolutionMaxAngle = 12.3f;
+
+	/** Minimum detecting signal RCS */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarParams, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float MinSignalCoef = 0.002f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bShowDebugCapsules = false;
+
+	/** [0..1] 0 - near, 1 - far */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	float DebugCapsulesRang = 0.0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	FSensorFOVRenderer FOVSetup { EFOVRenderingStrategy::OnSelect, FLinearColor(1.0, 0.8, 0.0, 1), 700 };
+
+	int GetBeamsNum() const { return 2 * FOV_HorizontMax / HorizontalBestResolution; }
+	float GetBeamWidth() const;
+	float GetBeamHeight() const;
+	float GetResolutionForAngle(float Angle) const;
+	float GetRayLength(float HorizontAng) const;
+};
+
+/**
+ * FRadarObjectCatagory
+ */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FRadarObjectCatagory
+{
+	GENERATED_BODY()
+
+	FRadarObjectCatagory() {}
+
+	FRadarObjectCatagory(float RCS_, bool Blocking_) : RCS(RCS_), Blocking(Blocking_) {}
+
+	/** Radar cross-section */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float RCS = 1.0f;
+
+	/** Is object blocks radio wave */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool Blocking = false;
+};
+
+/**
+ * FRadarCluster
+ */
+struct UNREALSODA_API FRadarCluster
+{
+	/** Cluster center azimuth */
+	float Azimuth;
+
+	/** Cluster main distance */
+	float Distance;
+
+	/** Cluster total RCS */
+	float RCS;
+
+	/** Cluster Lateral velocity */
+	float Lat;
+
+	/** Cluster Longitudal velocity */
+	float Lon;
+
+	/** Cluster position in UE worldspace */
+	FVector HitPosition;
+
+	/** Cluster hits array */
+	TArray<const FHitResult*> Hits;
+};
+
+/**
+ * FRadarHit
+ */
+struct UNREALSODA_API FRadarHit
+{
+	const FHitResult* Hit;
+	float Azimuth;
+	float RCS;
+	FVector HitPosition; // [cm]
+	FVector LocalHitPosition; // [cm]
+	FVector VelRelToRadar; // [m/s]
+	float Resolution;
+	ESegmObjectLabel ObjectCategory;
+	float Distance;
+	FTransform SensorView;
+};
+
+/**
+ * FRadarClusters
+ */
+struct UNREALSODA_API FRadarClusters
+{
+	float MaxDistDiff = 100.0f; //Cluster distance deep
+	TArray<FRadarCluster> Clusters; //Clusters array
+
+	void Clear() { Clusters.Empty(); }
+	void AddHit(const FRadarHit & Hit, const URadarBaseSensorComponent& Radar);
+};
+
+/**
+ * FTrackingObjectData
+ */
+struct UNREALSODA_API FTrackingObjectData
+{
+	uint8 RadarObjectId = 0; // Radar tracking object id
+	FVector2D PrevVelocity = FVector2D(0.f); //Previous relative Velocity
+	FVector2D Acceleration = FVector2D(0.f); //Object relative Acceleration
+	TTimestamp PrevUpdatedTimestamp{};
+	int ProbabilityCounter = 0;
+	int64 LifeCyclesCounter = 0;
+
+	static const int kProbabilityCounterMax = 10; // TODO: Use Deltatime insted ProbabilityCounter/kProbabilityCounterMax
+};
+
+/**
+ * FRadarObject
+ */
+struct UNREALSODA_API FRadarObject
+{
+public:
+	float RCS = 0;
+	float Lat = 0; //Lateral velocity [m/s]
+	float Lon = 0; //Longitudal velocity [m/s]
+	ESegmObjectLabel ObjectCategory;
+	uint32 ObjectActorId = 0;
+	AActor* ObjectActor = 0;
+	FBox LocalBounds;
+	uint8 RadarObjectId;
+	TArray<const FHitResult*> Hits;
+	FTrackingObjectData TrackingData;
+	FVector BoundCenterActorLocal;
+	bool bUpdated = false;
+
+	float CachedDistance = 0;
+	float CachedAzimuth = 0;
+	FVector CachedObjectPoint;
+
+	float GetDistance() const { return CachedDistance; }
+	float GetAzimuth() const { return CachedAzimuth; }
+	FVector GetObjectPoint() const { return CachedObjectPoint; }
+};
+
+/**
+ * FRadarObjects
+ */
+struct UNREALSODA_API FRadarObjects
+{
+	/** Maximun objects number */
+	int ObjectsMaxNum = 50;
+
+	/** Object Ids map */
+	TMap<uint32, FRadarObject> Objects;
+	
+	void ResetScan();
+	void FinishScan(const URadarBaseSensorComponent& Radar);
+	void AddHit(const FRadarHit& Hit, const URadarBaseSensorComponent & Radar);
+	uint8 GetFreeRadarObjectId();
+	uint8 GetRadarObjectIdForActorId(uint32 ActorId);
+	void SortObjectsByDistance(TArray<FRadarObject* > & SortedObjects);
+};
+
+/**
+ * URadarBaseSensorComponent
+ * TODO: Separate the ClusterMode and the ObjectMode to differnts objects
+ * TDDO: Pull out the ObjectCategories and all ***RCS properties to some global object
+ * TODO: New FOVRendarare based on the real FRadarParams
+ * TODO: Insted of using coliders it is may be batter to use the overlaping geometry (radar FOV mesh and another mesheas)
+ */
+UCLASS(Abstract, ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API URadarBaseSensorComponent : public USensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Data send period*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarCommon, SaveGame, meta = (EditInRuntime))
+	float Period = 0.07f;
+
+	/** Objects categories */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarCommon)
+	TMap<ESegmObjectLabel, FRadarObjectCatagory> ObjectCategories;
+
+	/** RCS of Buildings object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float BuildingsRCS = 0.005;
+
+	/** RCS of Fences object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float FencesRCS = 0.2;
+
+	/** RCS of Pedestrians object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float PedestriansRCS = 1.0;
+
+	/** RCS of Poles object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float PolesRCS = 0.4;
+
+	/** RCS of TrafficSigns object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float TrafficSignsRCS = 0.5;
+
+	/** RCS of Vegetation object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float VegetationRCS = 0.1;
+
+	/** RCS of Vehicles object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float VehiclesRCS = 3.0;
+
+	/** RCS of  Walls object category */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ObjectRCS, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float WallsRCS = 0.05;
+
+	/** Show debug points */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebugPoints = false;
+
+	/** Show debug clusters RCS, hits num and distance */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebugLabels = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bDebugLog = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	float RCSObjectModeMultiplier = 6;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = RadarCommon)
+	virtual ERadarMode GetRadarMode() const { return ERadarMode::ObjectMode; }
+
+public:
+	URadarBaseSensorComponent();
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction *ThisTickFunction) override;
+	virtual FBoxSphereBounds CalcBounds(const FTransform& LocalToWorld) const override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString& Info) const override {};
+	virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) override;
+	virtual bool NeedRenderSensorFOV() const;
+
+protected:
+	virtual bool AddFOVMesh(const FRadarParams & Params, TArray<FSensorFOVMesh>& OutMeshes);
+	virtual void ProcessRadarBeams(const FRadarParams & Params);
+	virtual const TArray<FRadarParams>& GetRadarParams() const { static TArray<FRadarParams> Params; return Params; }
+	virtual void ProcessHit(const FHitResult* Hit, const FRadarParams * Params);
+	virtual void PublishResults() {};
+	virtual void ShowDebudPoints();
+
+protected:
+	uint16 MeasurementCounter = 0;
+	FRadarClusters Clusters;
+	FRadarObjects Objects;
+
+	TTimestamp PrevTickTime;
+	TArray<FVector> BatchStart;
+	TArray<FVector> BatchEnd;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/RadarGenericSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/RadarGenericSensor.h
new file mode 100644
index 0000000..a82d497
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/RadarGenericSensor.h
@@ -0,0 +1,41 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/Sensors/RadarBaseSensor.h"
+#include "Soda/Transport/GenericRadarPublisher.h"
+#include "RadarGenericSensor.generated.h"
+
+/**
+ * UGeneralRadarSensorComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UGeneralRadarSensorComponent : public URadarBaseSensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Generic radar UDP publisher*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FGenericRadarPublisher PointCloudPublisher;
+
+	/** Parametres of radar near beam */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = RadarCommon, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	TArray<FRadarParams> RadarParams;
+
+	UGeneralRadarSensorComponent();
+
+protected:
+	virtual bool OnActivateVehicleComponent() override; 
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString& Info) const override;
+
+	virtual ERadarMode GetRadarMode() const override { return ERadarMode::ClusterMode; }
+
+protected:
+	virtual void PublishResults() override;
+	virtual const TArray<FRadarParams>& GetRadarParams() const override { return RadarParams; }
+
+protected:
+	soda::RadarScan Scan;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/UltrasonicSensor.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/UltrasonicSensor.h
new file mode 100644
index 0000000..5abccf6
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/Sensors/UltrasonicSensor.h
@@ -0,0 +1,171 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleSensorComponent.h"
+#include "Soda/Transport/GenericUltrasoncPublisher.h"
+#include "UltrasonicSensor.generated.h"
+
+class UUltrasonicSensorHubComponent;
+
+ /**
+  * FUltrasonicEcho
+  */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FUltrasonicEcho
+{
+	GENERATED_BODY()
+
+	inline static bool DistancePredicate(const FUltrasonicEcho& Eh1, const FUltrasonicEcho& Eh2)
+	{
+		return (Eh1.BeginDistance < Eh2.BeginDistance);
+	}
+
+	inline static bool ReturnPowerPredicate(const FUltrasonicEcho& Eh1, const FUltrasonicEcho& Eh2)
+	{
+		return (Eh1.ReturnPower > Eh2.ReturnPower);
+	}
+
+	/** Echo begin distance */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	float BeginDistance;
+
+	/** Echo end distance */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	float EndDistance;
+
+	/** Echo total return signal power */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	float ReturnPower;
+
+	/** Echo position in UE worldspace */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	FVector EchoPosition;
+
+	/** Echo hits array */
+	TArray<FHitResult*> Hits;
+};
+
+/**
+ * FUltrasonicEchos
+ */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FUltrasonicEchos
+{
+	GENERATED_BODY()
+
+	/** Maximun echos number */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	int EchosMaxNum = 3;
+
+	/** Echos array */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor)
+	TArray<FUltrasonicEcho> Echos;
+
+	void Clear() { Echos.Empty(); }
+	void AddHit(FHitResult* HitResult, float Distance, float Power, float MinDistGap);
+	void RemoveExcessEchos();
+};
+
+/**
+ * UUltrasonicSensorComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UUltrasonicSensorComponent : public USensorComponent
+{
+	friend UUltrasonicSensorHubComponent;
+
+	GENERATED_UCLASS_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int Rows = 25;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	int Step = 50;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering, UpdateFOVRendering))
+	float FOV_Horizont = 120;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering, UpdateFOVRendering))
+	float FOV_Vertical = 60;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering, UpdateFOVRendering))
+	float DistanseMin = 20;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, UpdateFOVRendering, UpdateFOVRendering))
+	float DistanseMax = 300;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	FSensorFOVRenderer FOVSetup;
+
+	virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) override;
+	virtual bool NeedRenderSensorFOV() const;
+	virtual FBoxSphereBounds CalcBounds(const FTransform& LocalToWorld) const override;
+
+protected:
+	float CosFovVertical = 0;
+	float CosFovHorizontal = 0;
+};
+
+/**
+ * UUltrasonicSensorHubComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UUltrasonicSensorHubComponent : public USensorComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FGenericUltrasoncPublisher PointCloudPublisher;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float SensorThreshold = 0.3f;
+
+	/** Echo distance min gap */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float MinDistGap = 25.0f;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool DrawTracedRays = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool DrawNotTracedRays = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool DrawEchos = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	bool EnabledGroundFilter = false;
+
+	/** Distance to ground (cm)*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Sensor, SaveGame, meta = (EditInRuntime))
+	float DistanceToGround = 25;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bLogTick = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bLogEchos = false;
+
+public:
+	virtual void TickComponent(float DeltaTime, ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void GetRemark(FString& Info) const override;
+
+protected:
+	TInlineComponentArray<UUltrasonicSensorComponent*> Sensors;
+	TArray < FUltrasonicEchos > EchoCollections;
+	int CurrentTransmitter = 0;
+	soda::UltrasonicsHub Scan;
+
+	TArray<FVector> BatchStart;
+	TArray<FVector> BatchEnd;
+};
+
+
+
+
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleBaseComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleBaseComponent.h
new file mode 100644
index 0000000..4c9498c
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleBaseComponent.h
@@ -0,0 +1,67 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Components/PrimitiveComponent.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "VehicleBaseComponent.generated.h"
+
+class ASodaVehicle;
+class USodaGameModeComponent;
+class ALevelState;
+/**
+ * UVehicleBaseComponent
+ */
+UCLASS(Abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleBaseComponent : 
+	public UPrimitiveComponent,
+	public ISodaVehicleComponent,
+	public IVehicleTickablObject
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Setting for generate the GUI */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent, SaveGame)
+	FVehicleComponentGUI GUI;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent, SaveGame, meta = (EditInRuntime))
+	FVehicleComponentCommon Common;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent, SaveGame)
+	FVehicleComponentTick TickData;
+
+public:
+	/* Override ISodaVehicleComponent */
+	virtual UActorComponent* AsActorComponent() override { return this; }
+	virtual ASodaVehicle* GetVehicle() const override { return Vehicle; }
+	virtual bool IsTickAllowed() const override { return HealthIsWorkable(); }
+
+	virtual FVehicleComponentGUI& GetVehicleComponentGUI() override { return GUI; }
+	virtual FVehicleComponentCommon& GetVehicleComponentCommon() override { return Common; }
+	virtual FVehicleComponentTick& GetVehicleComponentTick() override { return TickData; }
+
+	virtual const FVehicleComponentGUI& GetVehicleComponentGUI() const override { return GUI; }
+	virtual const FVehicleComponentCommon& GetVehicleComponentCommon() const override { return Common; }
+	virtual const FVehicleComponentTick& GetVehicleComponentTick() const override { return TickData; }
+
+public:
+	/* Override AActorComponent */
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+	virtual void BeginPlay() override;
+	virtual void EndPlay(EEndPlayReason::Type EndPlayReason) override;
+
+	USodaGameModeComponent* GetGameMode() const { return GameMode; }
+	ALevelState* GetLevelState() const { return LevelState; }
+
+private:
+	UPROPERTY()
+	ASodaVehicle* Vehicle = nullptr;
+
+	UPROPERTY()
+	USodaGameModeComponent* GameMode = nullptr;
+
+	UPROPERTY()
+	ALevelState* LevelState = nullptr;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleDriverComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleDriverComponent.h
new file mode 100644
index 0000000..6fec39a
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleDriverComponent.h
@@ -0,0 +1,97 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "Soda/Misc/PhysBodyKinematic.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "VehicleDriverComponent.generated.h"
+
+class ISodaJoystickPlugin;
+class IWheeledVehicleMovementInterface;
+class ASodaWheeledVehicle;
+
+
+/**
+ * Current vehicle drive mode
+ */
+UENUM(BlueprintType)
+enum class  ESodaVehicleDriveMode : uint8
+{
+	/** The vehicle is under a driver (human) control. See manual control sourse in the ESodaVehicleInputSource. */
+	Manual = 0,
+
+	/** The vehicle is under AD (autonomous driving) control. */
+	AD = 1,
+
+	/** The vehicle is under (autonomous driving) control, but something was wrong. */
+	SafeStop = 2,
+
+	/** The vehicle is under a driver (human) control, but it is ready to switch to AD control. */
+	ReadyToAD = 3,
+};
+
+
+/** 
+ * Convert ESodaVehicleDriveMode to string 
+ */
+FString ToString(ESodaVehicleDriveMode Mode);
+
+
+/**
+ * UVehicleDriverComponent is a prototipe of the Vehicle Driver Unit Controller.
+ * UVehicleDriverComponent takes control from the driver's controls (steering wheel, gears, pedals, various buttons, etc.)  - 
+ * usually this the VehicleInputComponent, but it can be anything. 
+ * And must transfer control to various actuators (engines, steering rack, breaking system and more).
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleDriverComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+	/** if true IsADPing() always equal true. That is, if there is no ping with VAPI, sefstop will not be set*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bIsVehicleDriveDebugMode = false;
+
+public:
+	/** This function should be overloaded in inheritors. */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsEnabledLeftTurningLights() const { return false; }
+
+	/** This function should be overloaded in inheritors. */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsEnabledRightTurningLights() const { return false; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsEnabledBrakeLight() const;
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsEnabledHeadlights() const { return false; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsEnabledDaytimeRunningLights() const { return false; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsEnabledReversLights() const;
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsEnabledHorn() const { return false; }
+
+	/** Is there a connection with the AD control unit. */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsADPing() const { return false; }
+
+	/** AD unit issued a warning. */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool IsADWarning() const { return false; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual ESodaVehicleDriveMode GetDriveMode() const;
+
+	/** Vehicle external LED. The color of the LED indicates the various statuses/warnings/errors of AD unit. */
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual FColor GetLED() const;
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual ENGear GetGear() const { return ENGear::Park; }
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleInputComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleInputComponent.h
new file mode 100644
index 0000000..efbe34d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleInputComponent.h
@@ -0,0 +1,123 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "VehicleInputComponent.generated.h"
+
+class ISodaJoystickPlugin;
+class IWheeledVehicleMovementInterface;
+class ASodaWheeledVehicle;
+
+/**
+ * Cruise Control / Speed Limiter mode
+ */
+UENUM(BlueprintType)
+enum class  ECruiseControlMode : uint8
+{
+	/** Cruise Control / Speed Limiter off */
+	Off = 0,
+
+	/** Cruise Control Active. */
+	CruiseControlActive = 1,
+
+	/** Speed Limiter Active */
+	SpeedLimiterActive = 2,
+};
+
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UVehicleInputComponent : public UWheeledVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInput)
+	EVehicleInputType InputType = EVehicleInputType::Other;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleInput, meta = (EditInRuntime))
+	bool bADModeInput = false;
+
+	/** External request to enable the safe stop mode. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleInput, meta = (EditInRuntime))
+	bool bSafeStopInput = false;
+
+	/** External request to enable the daytime running lights. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleInput, meta = (EditInRuntime))
+	bool bEnabledDaytimeRunningLightsInput = false;
+
+	/** External request to enable the revers lights. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleInput, meta = (EditInRuntime))
+	bool bEnabledHeadlightsInput = false;
+
+	/** External request to enable the horn. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleInput, meta = (EditInRuntime))
+	bool bEnabledHornInput = false;
+
+	/** Cruise Control / Speed Limiter mode */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CruiseControl, meta = (EditInRuntime))
+	ECruiseControlMode CruiseControlMode = ECruiseControlMode::Off;
+
+	/** Cruise Control / Speed Limiter terget speed [km/h] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CruiseControl, meta = (EditInRuntime))
+	float CruiseControlTargetSpeed = 0.f;
+
+	/** Maximum throttle input available for Cruse Control input [0..1] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CruiseControl, SaveGame, meta = (EditInRuntime))
+	float MaxCruiseControlThrottle = 0.7f;
+
+	/** Cruse Control Proportional Coef */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CruiseControl, SaveGame, meta = (EditInRuntime))
+	float CruiseControlPropCoef = 1.f;
+
+	/** Cruise Control / Speed Limiter Throttle Input */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CruiseControl)
+	float CCThrottleInput = 0.f;
+
+public:
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual float GetSteeringInput() const { return 0; }
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual float GetThrottleInput() const { return 0; }
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual float GetBrakeInput() const { return 0; }
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual ENGear GetGearInput() const { return  ENGear::Park; }
+
+	/** Get normailzed torque (-1...1) which the user (driver) has attached to the steering wheel. */
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual float GetDriverInputSteerTension() const { return 0; }
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual void SetHapticAutocenter(bool Enable) {}
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput, meta = (ScenarioAction))
+	virtual void SetADMode(bool bIsADMode) {}
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput)
+	virtual float GetCruiseControlModulatedThrottleInput(float ThrottleInput) const;
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput, meta = (ScenarioAction))
+	virtual void SetSteeringInput(float Value);
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput, meta = (ScenarioAction))
+	virtual void SetThrottleInput(float Value);
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput, meta = (ScenarioAction))
+	virtual void SetBrakeInput(float Value);
+
+	UFUNCTION(BlueprintCallable, Category = VehicleInput, meta = (ScenarioAction))
+	virtual void SetGearInput(ENGear Value);
+
+public:
+	virtual void CopyInputStates(UVehicleInputComponent* PreviousInput) {}
+	virtual void UpdateInputStates(float DeltaTime, float ForwardSpeed, const APlayerController* PlayerController);
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleSensorComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleSensorComponent.h
new file mode 100644
index 0000000..d954d43
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/VehicleSensorComponent.h
@@ -0,0 +1,75 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleBaseComponent.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "VehicleSensorComponent.generated.h"
+
+/**
+ * An auxiliary structure that describes the settings for rendering the FOV for a sensor.
+ */
+
+USTRUCT(BlueprintType)
+struct FSensorFOVRenderer
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	EFOVRenderingStrategy FOVRenderingStrategy = EFOVRenderingStrategy::OnSelect;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	FLinearColor Color = FLinearColor(0.13, 1.0, 0.3, 0.5);
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = FOVRenderer, SaveGame, meta = (EditInRuntime, UpdateFOVRendering))
+	float MaxViewDistance = 200;
+};
+
+struct FSensorFOVMesh
+{
+	TArray<FDynamicMeshVertex> Vertices;
+	TArray<uint32> Indices;
+};
+
+/**
+ * Base abstract class for all sensors and equipment that can be placed on the vehicle.
+ */
+UCLASS(Abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API USensorComponent : public UVehicleBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	virtual void HideActorComponentsFromSensorView(AActor* Actor);
+
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	virtual void HideComponentFromSensorView(UPrimitiveComponent* PrimitiveComponent);
+
+	/** 
+	 * If this sensor has the ability to display any data to UTextureRenderTarget2D, then you can override this function.
+	 * For example, a camera sensor can render display rgb image, and a lidar sensor can display a depth map here.
+	 * The user from the UI will be able to see this texture.
+	 */
+	UFUNCTION(BlueprintCallable, Category = Sensor)
+	virtual UTextureRenderTarget2D* GetRenderTarget2DTexture() { return nullptr; }
+
+	virtual bool GenerateFOVMesh(TArray<FSensorFOVMesh>& Meshes) { return false; }
+	virtual UMaterialInterface* GetSensorFOVMaterial() const { return SensorFOVMaterial; }
+	virtual bool NeedRenderSensorFOV() const { return false; }
+
+public:
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual FPrimitiveSceneProxy* CreateSceneProxy() override;
+	virtual void GetUsedMaterials(TArray<UMaterialInterface*>& OutMaterials, bool bGetDebugMaterials = false) const override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+
+protected:
+	UPROPERTY()
+	UMaterialInterface* SensorFOVMaterial;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleComponent.h
new file mode 100644
index 0000000..9b0fc10
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleComponent.h
@@ -0,0 +1,39 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/VehicleBaseComponent.h"
+#include "WheeledVehicleComponent.generated.h"
+
+class ASodaWheeledVehicle;
+class IWheeledVehicleMovementInterface;
+
+/**
+ * UWheeledVehicleComponent
+ */
+UCLASS(Abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UWheeledVehicleComponent : public UVehicleBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UFUNCTION(BlueprintCallable, Category = VehicleComponent)
+	ASodaWheeledVehicle* GetWheeledVehicle() const { return WheeledVehicle; }
+
+	virtual class IWheeledVehicleMovementInterface* GetWheeledComponentInterface() { return WheeledComponentInterface; }
+	virtual class IWheeledVehicleMovementInterface* GetWheeledComponentInterface() const { return WheeledComponentInterface; }
+
+public:
+	virtual void InitializeComponent() override;
+	virtual void BeginPlay() override;
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void OnPushDataset(soda::FActorDatasetData& Dataset) const override;
+
+private:
+	UPROPERTY()
+	ASodaWheeledVehicle* WheeledVehicle = nullptr;
+	IWheeledVehicleMovementInterface* WheeledComponentInterface = nullptr;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovementBaseComponent.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovementBaseComponent.h
new file mode 100644
index 0000000..102ce41
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovementBaseComponent.h
@@ -0,0 +1,55 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/PawnMovementComponent.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "WheeledVehicleMovementBaseComponent.generated.h"
+
+class ASodaWheeledVehicle;
+
+/**
+ * UWheeledVehicleMovementBaseComponent
+ * This is just template for implement the IWheeledVehicleMovementInterface component
+ */
+UCLASS(abstract, ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UWheeledVehicleMovementBaseComponent :
+	public UPawnMovementComponent,
+	public IWheeledVehicleMovementInterface,
+	public ISodaVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent, SaveGame)
+	FVehicleComponentGUI GUI;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent, SaveGame)
+	FVehicleComponentCommon Common;
+
+	virtual void InitializeComponent() override;
+
+public:
+	/* Override ISodaVehicleComponent */
+	virtual UActorComponent* AsActorComponent() override { return this; }
+	virtual ASodaVehicle* GetVehicle() const override;
+
+	virtual FVehicleComponentGUI& GetVehicleComponentGUI() override { return GUI; }
+	virtual FVehicleComponentCommon& GetVehicleComponentCommon() override { return Common; }
+
+	virtual const FVehicleComponentGUI& GetVehicleComponentGUI() const override { return GUI; }
+	virtual const FVehicleComponentCommon& GetVehicleComponentCommon() const override { return Common; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+
+public:
+	/* Override IWheeledVehicleMovementInterface */
+	virtual ASodaWheeledVehicle* GetWheeledVehicle() const override { return WheeledVehicle; }
+
+protected:
+	UPROPERTY()
+	ASodaWheeledVehicle* WheeledVehicle = nullptr;
+};
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/NCOMWheeledVehicleMovement.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/NCOMWheeledVehicleMovement.h
new file mode 100644
index 0000000..a5d048d
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/NCOMWheeledVehicleMovement.h
@@ -0,0 +1,105 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/PawnMovementComponent.h"
+#include "Soda/VehicleComponents/WheeledVehicleMovementBaseComponent.h"
+#include "Curves/CurveFloat.h"
+#include "Soda/Misc/BitStream.hpp"
+#include <thread>
+#include <mutex>
+#include "Sockets.h"
+#include "SocketSubsystem.h"
+#include "Common/UdpSocketReceiver.h"
+#include "Common/UdpSocketBuilder.h"
+#include "Interfaces/IPv4/IPv4Address.h"
+#include "Interfaces/IPv4/IPv4Endpoint.h"
+#include "SodaSimProto/OXTS.hpp"
+#include "NCOMWheeledVehicleMovement.generated.h"
+
+class ALevelState;
+
+/**
+ * The VIL (Vehicle in the Loop) mode.
+ */
+UCLASS(ClassGroup = Soda,BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UNCOMWheeledVehicleMovement : public UWheeledVehicleMovementBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = NCOM, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int NCOMPort = 8000;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = NCOM, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FVector NCOMOffest;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = NCOM, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FRotator NCOMRotation;
+
+	/** Vehicle mass in kg */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float Mass = 1196.0;
+
+	/** Wheels radius in cm */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float FrontWheelRadius = 35;
+
+	/** Wheels radius in cm */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float RearWheelRadius = 35;
+
+	/** Center of Mass */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FVector CenterOfMass;
+
+	UPROPERTY()
+	ALevelState * LevelState = nullptr;
+
+public:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+
+protected:
+	/* Overrides from  ISodaVehicleComponent */
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void OnPreActivateVehicleComponent() override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+public:
+	/* Overrides from  IWheeledVehicleMovementInterface  */
+	virtual float GetVehicleMass() const override { return Mass; }
+	virtual const FVehicleSimData& GetSimData() const { return VehicleSimData; }
+	virtual bool SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation);
+
+public:
+	UFUNCTION(Category = NCOM, meta = (CallInRuntime))
+	void ResetPosition();
+
+protected:
+	FVehicleSimData VehicleSimData;
+	FTransform InitTransform;
+	std::mutex Mutex;
+
+	soda::OxtsPacket OXTSPacket;
+	FBitStream BitStream;
+	FSocket* ListenSocket = nullptr;
+	FUdpSocketReceiver* UDPReceiver = nullptr;
+	TTimestamp LastPacketTimestamp;
+	float LastDeltatime = 0.01;
+	bool bIsConnected = false;
+	bool bIsOXTSDataValid = false;
+	void Recv(const FArrayReaderPtr& ArrayReaderPtr, const FIPv4Endpoint& EndPt);
+
+	int OXTS_SatellitesNumber = 0;
+	int OXTS_PositionMode = 0;
+	int OXTS_VelocityMode = 0;
+	int OXTS_OrientationMode = 0;
+	int OXTS_GPSMinutes = 0;
+	int OXTS_Miliseconds = 0;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/Soda2DWheeledVehicleMovement.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/Soda2DWheeledVehicleMovement.h
new file mode 100644
index 0000000..d2e7c20
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/Soda2DWheeledVehicleMovement.h
@@ -0,0 +1,250 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/PawnMovementComponent.h"
+#include "Soda/VehicleComponents/WheeledVehicleMovementBaseComponent.h"
+#include "Curves/CurveFloat.h"
+#include "Components/SkinnedMeshComponent.h"
+#include "Components/SkeletalMeshComponent.h"
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "Soda/Misc/TelemetryGraph.h"
+#include "Soda/Misc/GroundScaner.h"
+#include "Soda/Misc/PrecisionTimer.hpp"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include <thread>
+#include <mutex>
+
+#include "Soda2DWheeledVehicleMovement.generated.h"
+
+class DynamicCar;
+
+USTRUCT(BlueprintType, Blueprintable)
+struct FSodaVehicleWheel2WDSetup
+{
+	GENERATED_USTRUCT_BODY()
+
+	/** [cm] */
+	UPROPERTY(EditAnywhere, Category = WheelSetup)
+	float SuspensionFall = 5;
+
+	/** [cm] */
+	UPROPERTY(EditAnywhere, Category = WheelSetup)
+	float SuspensionRise = 5;
+
+	/** Suspension  distribution [0..1]*/
+	UPROPERTY(EditAnywhere, Category = WheelSetup)
+	float SuspensionDist = 0.25;
+
+	UPROPERTY(EditAnywhere, Category = WheelSetup)
+	float DampingRiseFactor = 0.1;
+
+	UPROPERTY(EditAnywhere, Category = WheelSetup)
+	float DampingFallFactor = 0.03;
+};
+
+
+
+/**
+ * The USoda2DWheeledVehicleMovementComponent provides a physical vehicle simulation in 2D space.
+ * The physics model is calculated only for two wheels (front and rear), but then transferred to the 4-wheel model.
+ * Also USoda2DWheeledVehicleMovementComponent simulates a simple four-wheel suspension for the bicycle model.
+ */
+UCLASS(ClassGroup = Soda,BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API USoda2DWheeledVehicleMovementComponent : public UWheeledVehicleMovementBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Vehicle mass in kg */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float Mass = 1196.0;
+
+	/** Moment of inertia (Roll, Pitch, Yaw) for car [kg * m^2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	FVector MomentOfInertia{600.0f, 800.0f, 1260.0f};
+
+	/** Track Width [m]*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float TrackWidth = 2;
+
+	/** Distance from CG to forward wheel [m] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float A = 1.7;
+
+	/** Distance from CG to rear wheel [m] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float B = 1.168;
+
+	/** High of CG [m] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float CGvert = 0.4;
+
+	/** Friction coefficient */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float Friction = 1.0;
+
+	/** Wheels radius [m]*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float FrontWheelRadius = 0.31;
+
+	/** Wheels radius [m]*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float RearWheelRadius = 0.35;
+
+	/** Rear wheels stiffness of tyres in lateral direction */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float RearWheelLatStiff = 240000.0;
+
+	/** Forward wheels stiffness of tyres in lateral direction */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float ForwardWheelLatStiff = 226000.0;
+
+	/** Rear wheels stiffness of tyres in longitudal direction */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float RearWheelLonStiff = 284000.0;
+
+	/** Forward wheels stiffness of tyres in longitudal direction */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float ForwardWheelLonStiff = 376000.0;
+
+	/** Rolling resistance [N] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float DragRollingResistance = 600.0;
+
+	/** Rolling resistance [N*s/m] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float DragRollingResistanceSpeedDepended = 0.0;
+
+	/** Coefficient of aero drag */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float DragCxx = 1.0;
+
+	/** Moment of inertia of front train [kg * m^2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float MomentOfInertiaFrontTrain = 1.42;
+
+	/** Moment of inertia of rear train [kg * m^2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = ModelSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float MomentOfInertiaRearTrain = 2.06;
+
+	/** [cm/s^2] */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = SuspensionSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	float Gravity = 980.f;
+
+	/** Wheels setup [FL, FR, RL, RR]*/
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = SuspensionSetup)
+	TArray<FSodaVehicleWheel2WDSetup> WheelSetups;
+
+	UPROPERTY(EditAnywhere, Instanced, Category = SuspensionSetup, meta = (EditInRuntime))
+	TObjectPtr<UGroundScaner> GroundScaner = nullptr;
+
+	UPROPERTY(EditAnywhere, Category = SuspensionSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bUseGroundScaner = true;
+
+	UPROPERTY(EditAnywhere, Category = SuspensionSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bDisableCollisions = false;
+
+	UPROPERTY(EditAnywhere, Category = SuspensionSetup, SaveGame, meta = (EditInRuntime))
+	float GlobalDampingFactor = 0.3;
+
+	/** Time of integration in msec*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime))
+	int TimeStep = 10;
+
+	/** If 1 then drag forces being taked into account*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int FlDragTaking = 1;
+
+	/** 0 || 1 || 2 ; 2 is default value (combined slip mode)*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int FlLongCirc = 3;
+
+	/** 1 for static case of loads on rear and forward wheel*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int FlStaticLoad = 0;
+
+	/** 1 for Runge Kutta integration; 0 for Local Grid Refinement (more expensive) */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int FlRunKut = 0;
+
+	/** sampling for integration on [t,t+dt] interval */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int NSteps = 10;
+
+	/** Lawes for actuators;*/
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int FlActLow = 2;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int ImplicitSolver = 1;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int NumImpLonlinIt = 4;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = CalculationSetup, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	int CorrImplStep = 0;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bDrawTelemetry = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime, ReactivateComponent))
+	bool bLogPhysStemp = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Vehicle, SaveGame, meta = (EditInRuntime))
+	float ModelStartUpDelay = 0.5;
+	
+public:
+	struct FWheelData
+	{
+		float ToGround = 0; /** [cm] */
+		float ToGroundVelocity = 0;
+		float SpringForce = 0; /** [kg*cm/s^2] */
+		float DampingForce = 0; /** [kg*cm/s^2] */
+	};
+
+	FWheelData WheelsData[4];
+
+public:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+
+public:
+	virtual void UpdateSimulation(const std::chrono::nanoseconds& Deltatime, const std::chrono::nanoseconds& Elapsed);
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+protected:
+	/* Overrides from  ISodaVehicleComponent  */
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void OnPreActivateVehicleComponent() override;
+
+public:
+	/* Overrides from  IWheeledVehicleMovementInterface  */
+	virtual float GetVehicleMass() const override { return Mass; }
+	virtual const FVehicleSimData& GetSimData() const { return VehicleSimData; }
+	virtual bool SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation);
+
+protected:
+	FVehicleSimData VehicleSimData;
+
+	TSharedPtr<DynamicCar> DynCar;
+	FPrecisionTimer PrecisionTimer;
+
+	float ZDotDot =  0;
+	float PitchDotDot = 0;
+	float RollDotDot = 0;
+
+	float ZDot = 0;
+	float PitchDot = 0;
+	float RollDot = 0;
+
+	FVector Euler;
+	
+	FTelemetryGraphGrid TelemetryGrid;
+
+	bool bSynchronousMode = false;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/SodaChaosWheeledVehicleMovement.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/SodaChaosWheeledVehicleMovement.h
new file mode 100644
index 0000000..3bdff40
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/SodaChaosWheeledVehicleMovement.h
@@ -0,0 +1,148 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Curves/CurveFloat.h"
+#include "Soda/VehicleComponents/VehicleDriverComponent.h"
+#include "Soda/VehicleComponents/Sensors/ImuSensor.h"
+#include "ChaosWheeledVehicleMovementComponent.h"
+#include "VehicleAnimationInstance.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "Soda/Vehicles/IWheeledVehicleMovementInterface.h"
+#include "Soda/Vehicles/SodaWheeledVehicle.h"
+#include "SodaChaosWheeledVehicleMovement.generated.h"
+
+class USodaChaosWheeledVehicleMovementComponent;
+
+
+USTRUCT()
+struct UNREALSODA_API FSodaChaosWheelSetup
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, Category = WheelSetup)
+	FSubobjectReference ConnectedSodaWheel;
+
+	UPROPERTY(EditAnywhere, Category = WheelSetup, meta = (EditCondition = "bOverrideRadius"))
+	float OverrideRadius = 25;
+
+	UPROPERTY(EditAnywhere, Category = WheelSetup)
+	bool bOverrideRadius = false;
+
+	UPROPERTY()
+	USodaVehicleWheelComponent* SodaWheel = nullptr;
+
+	FSodaChaosWheelSetup() {}
+};
+
+/**
+ *  USodaChaosWheeledVehicleSimulation
+ */
+class UNREALSODA_API USodaChaosWheeledVehicleSimulation : public UChaosWheeledVehicleSimulation
+{
+	friend USodaChaosWheeledVehicleMovementComponent;
+
+public:
+	USodaChaosWheeledVehicleSimulation(ASodaWheeledVehicle* WheeledVehicleIn, USodaChaosWheeledVehicleMovementComponent* InWheeledVehicleComponent);
+	
+	virtual void Init(TUniquePtr<Chaos::FSimpleWheeledVehicle>& PVehicleIn) override;
+	virtual void UpdateSimulation(float DeltaTime, const FChaosVehicleAsyncInput& InputData, Chaos::FRigidBodyHandle_Internal* Handle) override;
+	virtual void ProcessSteering(const FControlInputs& ControlInputs) override {}
+	virtual void ProcessMechanicalSimulation(float DeltaTime)  override {}
+	virtual void ApplyInput(const FControlInputs& ControlInputs, float DeltaTime) override { UChaosVehicleSimulation::ApplyInput(ControlInputs, DeltaTime); }
+
+protected:
+	ASodaWheeledVehicle* WheeledVehicle = nullptr;
+	USodaChaosWheeledVehicleMovementComponent* WheeledVehicleComponent = nullptr;
+
+	FVehicleSimData VehicleSimData;
+};
+
+/**
+ *  USodaChaosWheeledVehicleMovementComponent
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent), hidecategories = (MechanicalSetup, SteeringSetup))
+class UNREALSODA_API USodaChaosWheeledVehicleMovementComponent : 
+	public UChaosWheeledVehicleMovementComponent, 
+	public IWheeledVehicleMovementInterface,
+	public ISodaVehicleComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bShowWheelSates;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bShowWheelGraph;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bDrawDebugLines;
+
+	/** Login some debug states to the console. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bLogPhysStemp = false;
+
+	UPROPERTY(EditAnywhere, Category = WheelSetup, EditFixedSize)
+	TArray<FSodaChaosWheelSetup> SodaWheelSetups;
+
+public:
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent, SaveGame)
+	FVehicleComponentGUI GUI;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleComponent, SaveGame, meta = (EditInRuntime))
+	FVehicleComponentCommon Common;
+
+public:
+#if WITH_EDITOR
+	virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void PostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual void PostEditUndo() override;
+	virtual void PostInitProperties() override;
+#endif
+
+public:
+	/** Override ISodaVehicleComponent */
+	virtual UActorComponent* AsActorComponent() override { return this; }
+	virtual ASodaVehicle* GetVehicle() const override { return WheeledVehicle; }
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+
+	virtual FVehicleComponentGUI& GetVehicleComponentGUI() override { return GUI; }
+	virtual FVehicleComponentCommon& GetVehicleComponentCommon() override { return Common; }
+
+	virtual const FVehicleComponentGUI& GetVehicleComponentGUI() const override { return GUI; }
+	virtual const FVehicleComponentCommon& GetVehicleComponentCommon() const override { return Common; }
+
+protected:
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void OnPreActivateVehicleComponent() override;
+
+public:
+	/** Override IWheeledVehicleMovementInterface */
+	virtual const FVehicleSimData& GetSimData() const;
+	virtual bool SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation);
+	virtual ASodaWheeledVehicle* GetWheeledVehicle() const override { return WheeledVehicle; }
+	virtual float GetVehicleMass() const  override { return Mass; }
+
+public:
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction *ThisTickFunction) override;
+	virtual bool ShouldCreatePhysicsState() const override;
+
+public:
+	virtual TUniquePtr<Chaos::FSimpleWheeledVehicle> CreatePhysicsVehicle() override;
+	virtual void ProcessSleeping(const FControlInputs& ControlInputs) override;
+
+public:
+	UPROPERTY()
+	ASodaWheeledVehicle* WheeledVehicle = nullptr;
+	bool bSynchronousMode = false;
+
+protected:
+	TWeakPtr<USodaChaosWheeledVehicleSimulation> ArrialVehicleSimulationPT;
+	bool bAllowCreatePhysicsState = false;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/StaticWheeledVehicleMovement.h b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/StaticWheeledVehicleMovement.h
new file mode 100644
index 0000000..b6b71e0
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/VehicleComponents/WheeledVehicleMovements/StaticWheeledVehicleMovement.h
@@ -0,0 +1,40 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleMovementBaseComponent.h"
+#include "StaticWheeledVehicleMovement.generated.h"
+
+class USodaGameModeComponent;
+
+/**
+ * The UStaticWheeledVehicleMovementComponent
+ */
+UCLASS(ClassGroup = Soda,BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API UStaticWheeledVehicleMovementComponent : public UWheeledVehicleMovementBaseComponent
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickComponent(float DeltaTime, enum ELevelTick TickType, FActorComponentTickFunction* ThisTickFunction) override;
+	virtual void InitializeComponent() override;
+	virtual void UninitializeComponent() override;
+
+protected:
+	/* Overrides from  ISodaVehicleComponent */
+	virtual bool OnActivateVehicleComponent() override;
+	virtual void OnDeactivateVehicleComponent() override;
+	virtual void OnPreActivateVehicleComponent() override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override {}
+
+public:
+	/*  Overrides from  IWheeledVehicleMovementInterface  */
+	virtual float GetVehicleMass() const override { return 1500; }
+	virtual const FVehicleSimData& GetSimData() const { return VehicleSimData; }
+	virtual bool SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation);
+
+protected:
+	FVehicleSimData VehicleSimData;
+};
\ No newline at end of file
diff --git a/Source/UnrealSoda/Public/Soda/Vehicles/GazeboVehicle.h b/Source/UnrealSoda/Public/Soda/Vehicles/GazeboVehicle.h
new file mode 100644
index 0000000..76bebf0
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Vehicles/GazeboVehicle.h
@@ -0,0 +1,101 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/Vehicles/SodaVehicle.h"
+#include "SodaSimProto/Gazebo.hpp"
+#if PLATFORM_WINDOWS
+#include "Windows/AllowWindowsPlatformTypes.h"
+#endif
+#include <zmq.hpp>
+#if PLATFORM_WINDOWS
+#include "Windows/HideWindowsPlatformTypes.h"
+#endif
+#include "GazeboVehicle.generated.h"
+
+class AGazeboPawn;
+
+/*
+namespace zmq
+{
+	class socket_t;
+	class context_t;
+}
+*/
+
+USTRUCT()
+struct FSecondaryTickFunction : public FTickFunction
+{
+	GENERATED_USTRUCT_BODY()
+
+	class AGazeboPawn* Target;
+
+	UNREALSODA_API virtual void ExecuteTick(float DeltaTime, ELevelTick TickType, ENamedThreads::Type CurrentThread, const FGraphEventRef& MyCompletionGraphEvent) override;
+	UNREALSODA_API virtual FString DiagnosticMessage() override;
+};
+
+template <>
+struct TStructOpsTypeTraits< FSecondaryTickFunction > : public TStructOpsTypeTraitsBase2< FSecondaryTickFunction >
+{
+	enum
+	{
+		WithCopy = false
+	};
+};
+
+/**
+ * AGazeboPawn
+ * DEPRICATED
+ * TODO: Remove it
+ */
+UCLASS(ClassGroup = (Gazebo), meta = (BlueprintSpawnableComponent))
+class UNREALSODA_API AGazeboPawn : public ASodaVehicle
+{
+	GENERATED_BODY()
+
+	UPROPERTY(EditAnywhere, Category = Gazebo)
+	FString CollisionPublisherAddr = "tcp://*:5559";
+
+	UPROPERTY(EditAnywhere, Category = Gazebo)
+	FString ModelStateSubAddr = "tcp://127.0.0.1:5558";
+
+	UPROPERTY(EditAnywhere, Category = Gazebo)
+	bool DebugOut = true;
+
+	UPROPERTY(EditDefaultsOnly, Category = "Tick")
+	FSecondaryTickFunction SecondaryActorTick;
+
+public:
+	UPROPERTY(BlueprintReadOnly, Category = Gazebo)
+	TArray< float > GazeboJoints;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Gazebo")
+	UPrimitiveComponent* Model = 0;
+
+public:
+	AGazeboPawn();
+	~AGazeboPawn();
+
+public:
+	virtual void NotifyHit(class UPrimitiveComponent* MyComp, class AActor* Other, class UPrimitiveComponent* OtherComp, bool bSelfMoved, FVector HitLocation,
+						   FVector HitNormal, FVector NormalImpulse, const FHitResult& Hit) override;
+
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction);
+	virtual void PostInitProperties() override;
+	virtual void PostInitializeComponents() override;
+
+	void TickActor2(float DeltaTime, enum ELevelTick TickType, FSecondaryTickFunction& ThisTickFunction);
+
+private:
+	/*
+	zmq::context_t* Ctx;
+	zmq::socket_t* SockSub;
+	zmq::socket_t* SockPub;
+	*/
+
+	soda::ModelState StateMsg;
+	soda::ModelCollision CollisionMsg;
+	std::vector< unsigned char > SendBuf;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Vehicles/ISodaVehicleExporter.h b/Source/UnrealSoda/Public/Soda/Vehicles/ISodaVehicleExporter.h
new file mode 100644
index 0000000..1f1f4d4
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Vehicles/ISodaVehicleExporter.h
@@ -0,0 +1,14 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+#include "Containers/UnrealString.h"
+
+class ASodaVehicle;
+
+class ISodaVehicleExporter
+{
+public:
+	virtual bool ExportToString(const ASodaVehicle* Vehicle, FString& String) = 0;
+	virtual const FString & GetExporterName() const = 0;
+	virtual const FString& GetFileTypes() const = 0;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Vehicles/IWheeledVehicleMovementInterface.h b/Source/UnrealSoda/Public/Soda/Vehicles/IWheeledVehicleMovementInterface.h
new file mode 100644
index 0000000..dc2c650
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Vehicles/IWheeledVehicleMovementInterface.h
@@ -0,0 +1,73 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Soda/Misc/PhysBodyKinematic.h"
+#include "Soda/Misc/Time.h"
+#include "Soda/Vehicles/VehicleBaseTypes.h"
+#include "IWheeledVehicleMovementInterface.generated.h"
+
+class ASodaWheeledVehicle;
+class USodaVehicleWheelComponent;
+
+/**
+ * The IWheeledVehicleMovementInterface provides only tire and suspension physical simulation. 
+ * It does not include simulation of braking and steering systems, diffs, transmissions, motors, etc.
+ * The IWheeledVehicleMovementInterface must provide to call of PrePhysicSimulation, PostPhysicSimulation, VehicleIsReady delegates.
+ * Also the IWheeledVehicleMovementInterface must perform requested values (ReqTorq, ReqBrakeTorque, ReqSteer) from USodaVehicleWheelComponent for each wheel 
+ * and update valuse of VehicleKinematic and USodaVehicleWheelComponent.
+ */
+
+UINTERFACE(BlueprintType, meta = (CannotImplementInterfaceInBlueprint))
+class UNREALSODA_API UWheeledVehicleMovementInterface : public UInterface
+{
+	GENERATED_BODY()
+};
+
+class UNREALSODA_API IWheeledVehicleMovementInterface
+{
+	GENERATED_BODY()
+
+public:
+	virtual ASodaWheeledVehicle* GetWheeledVehicle() const { check(0); return nullptr; }
+
+	virtual float GetVehicleMass() const { check(0); return 0; }
+
+	virtual const FVehicleSimData& GetSimData() const { check(0); return FVehicleSimData::Zero; }
+
+	/**
+	 * Must be called just before stimulation step.
+	 * For some implementations it can be called not in real time (For example, for PhysX Vehicle model when calculating the sub-steps).
+	 */
+	virtual void PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp);
+
+	/**
+	 * Must be called just after stimulation step .
+	 * For some implementations it can be called not in real time (For example, for PhysX Vehicle model when calculating the sub-steps).
+	 */
+	virtual void PostPhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp);
+
+	/**
+	  * Must be called just after PostPhysicSimulation().
+	  * This function call must correspond to real time.
+	  */
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp);
+
+	/** Set vehicle world location. */
+	virtual bool SetVehiclePosition(const FVector& NewLocation, const FRotator& NewRotation) { return false; }
+
+	/** Compute distance between front left and rear left wheels. */
+	virtual float GetWheelBaseWidth() const;
+
+	/** Compute distance between front left and front right wheels. */
+	virtual float GetTrackWidth() const;
+
+protected:
+	virtual void OnSetActiveMovement();
+
+	//virtual bool StartSimulation() = 0;
+	//virtual bool StopSimulation() = 0;
+	//virtual bool IsSimulate() = 0;
+	//virtual bool CanSimulate() = 0;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Vehicles/SodaVehicle.h b/Source/UnrealSoda/Public/Soda/Vehicles/SodaVehicle.h
new file mode 100644
index 0000000..04a08e8
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Vehicles/SodaVehicle.h
@@ -0,0 +1,385 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "GameFramework/Pawn.h"
+#include "Blueprint/UserWidget.h"
+#include "UObject/WeakInterfacePtr.h"
+#include "Soda/Misc/JsonArchive.h"
+#include "Soda/Misc/PhysBodyKinematic.h"
+#include "Soda/Misc/SerializationHelpers.h"
+#include "Soda/Misc/Extent.h"
+#include "Soda/SodaTypes.h"
+#include "VehicleBaseTypes.h"
+#include "Soda/ISodaActor.h"
+#include "Soda/ISodaVehicleComponent.h"
+#include "SodaVehicle.generated.h"
+
+DECLARE_STATS_GROUP(TEXT("SodaVehicle"), STATGROUP_SodaVehicle, STATGROUP_Advanced);
+
+class UCANBusComponent;
+
+UENUM(BlueprintType)
+enum class EVehicleSaveSource : uint8
+{
+	NoSave,
+
+	/** The vehicles is saved to an binary file format in external location. */
+	BinExternal,  
+
+	/** The vehicles is saved to an binary file format in the local storage. */
+	BinLocal,
+
+	/** The vehicles is saved to an separate save game slot. */
+	Slot, 
+
+	/** The vehicle is saved as part of the binary level save game. */
+	BinLevel, 
+
+	/** The vehicles is saved to an JSON file format in external location. */
+	JsonExternal,
+
+	/** The vehicles is saved to an JSON file format in local storage. */
+	JsonLocal, 
+
+	/** The vehicle is saved to the MongoDB. */
+	DB,
+};
+
+USTRUCT(BlueprintType)
+struct FVechicleSaveAddress
+{
+	GENERATED_BODY()
+
+	FVechicleSaveAddress() {}
+	FVechicleSaveAddress(EVehicleSaveSource InSource, const FString& InLocation)
+		: Source(InSource)
+		, Location(InLocation)
+	{}
+
+	UPROPERTY(BlueprintReadOnly, SaveGame, Category = VechicleSaveAddress)
+	EVehicleSaveSource Source = EVehicleSaveSource::NoSave;
+
+	/** Location of the save data provided by the Source */
+	UPROPERTY(BlueprintReadOnly, SaveGame, Category = VechicleSaveAddress)
+	FString Location;
+
+	FORCEINLINE bool operator ==(const FVechicleSaveAddress& Other) const
+	{
+		return Source != EVehicleSaveSource::NoSave && Source != EVehicleSaveSource::BinLevel && Source == Other.Source && Location == Other.Location;
+	}
+
+	FString ToVehicleName() const ;
+
+	FORCEINLINE void Set(EVehicleSaveSource InSource, const FString& InLocation)
+	{
+		Source = InSource;
+		Location = InLocation;
+	}
+	
+	bool SetFromUrl(const FString & Url);
+
+	FORCEINLINE void Reset()
+	{
+		Source = EVehicleSaveSource::NoSave;
+		Location.Reset();
+	}
+
+	FString ToUrl() const;
+
+};
+
+/**
+ * UVehicleWidget is the abstract user widget for ASodaVehicle.
+ * Usually using as gauge widget for vehicle.
+ */
+UCLASS(Abstract, editinlinenew, BlueprintType, Blueprintable)
+class UNREALSODA_API UVehicleWidget : public UUserWidget
+{
+	GENERATED_BODY()
+
+	friend class SObjectWidget;
+
+public:
+	UVehicleWidget(const FObjectInitializer& ObjectInitializer)
+		: Super(ObjectInitializer)
+	{}
+
+	UPROPERTY(Transient, BlueprintReadOnly, Category = VehicleWidget)
+	ASodaVehicle* Vehcile;
+};
+
+/**
+ * ASodaVehicle is the base soda's vehicle pawn actor.
+ * ASodaVehicle is abstracted from the  vehicle type. It may be 2WD, 4WD, nWD, flying and other type vehicles.
+ * ASodaVehicle povides binary, JSON and YAMAL serialization, vehicle widget, vehicle debug canvas
+ * and ability to manage of vehicle's sensors.
+ */
+UCLASS(abstract, config = Game, BlueprintType)
+class UNREALSODA_API ASodaVehicle : 
+	public APawn, 
+	public ISodaActor
+{
+	GENERATED_UCLASS_BODY()
+
+	/** Show vehicle widget created form VehicleWidgetClass1. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleWidget, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	bool bShowVehicleWidget1 = true;
+
+	/** Show vehicle widget created form VehicleWidgetClass2. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleWidget, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	bool bShowVehicleWidget2 = true;
+
+	/** Usually Vehicle Widget Class is the speed gauge widget, but it may be anything. */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleWidget)
+	TSubclassOf<UVehicleWidget> VehicleWidgetClass1;
+
+	/** Second Vehicle Widget */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleWidget)
+	TSubclassOf<UVehicleWidget> VehicleWidgetClass2;
+
+	/** 
+	 * If true then speed units is rpm else km/h.
+	 * This is not used in the ASodaVehicle class, but it can be uesed in the UVehicleWidget.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleWidget, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	bool bVehicleWidgetUnitsRPM = true;
+
+	/** 
+	 * A recommendation for the vehicle UVehicleWidget to have the UVehicleWidget display the required speedometer scale.
+	 * This is not used in the ASodaVehicle class, but it can be uesed in the UVehicleWidget.
+	 */
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = VehicleWidget, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	bool bIsVehicleWidgetHighSpeed = true;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Vehicle, SaveGame, meta = (EditInRuntime, ReactivateActor))
+	ESegmObjectLabel SegmObjectLabel = ESegmObjectLabel::Vehicles;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bShowPhysBodyKinematic = false;
+
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Dataset, SaveGame, meta = (EditInRuntime))
+	bool bRecordDataset = true;
+
+public:
+	/** Widget created form VehicleWidgetClass. */
+	UPROPERTY(Transient, BlueprintReadOnly, Category = VehicleWidget)
+	UVehicleWidget* VehicleWidget1;
+
+	/** Widget created form VehicleWidgetClass2. */
+	UPROPERTY(Transient, BlueprintReadOnly, Category = VehicleWidget)
+	UVehicleWidget* VehicleWidget2;
+
+	/** Mutex for vehicle physical thread */
+	FCriticalSection PhysicMutex;
+
+public:
+	UFUNCTION(Category = "Save & Load")
+	const FVechicleSaveAddress& GetSaveAddress() const { return SaveAddress; }
+
+	UFUNCTION(Category = "Save & Load")
+	void SetSaveAddress(const FVechicleSaveAddress& Address) { SaveAddress = Address; }
+
+	/** Export snesors to registread ISodaVehicleExporter format */
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	virtual FString ExportTo(const FString & ExporterName);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	virtual bool SaveToJson(const FString& FileName, bool bRebase);
+	
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	virtual bool SaveToBin(const FString& FileName, bool bRebase);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	virtual bool SaveToSlot(const FString& SlotName, bool bRebase);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	virtual bool SaveToDB(const FString& VehicleName, bool bRebase);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	virtual bool SaveToAddress(const FVechicleSaveAddress& SaveAddress, bool bRebase);
+
+	/** If vehicle is already saved then will be resaved  */
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	virtual bool Resave();
+
+	static ASodaVehicle* SpawnVehicleFromJsonArchive(UWorld* World, const TSharedPtr<FJsonActorArchive> & Ar, const FVechicleSaveAddress & Address, const FVector& Location, const FRotator& Rotation, bool Posses = true, FName DesireName = NAME_None, bool bApplyOffset = false);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static ASodaVehicle * SpawnVehicleFromJsonFile(const UObject* WorldContextObject, const FString& FileName, const FVector& Location, const FRotator & Rotation, bool Posses = true, FName DesireName = NAME_None, bool bApplyOffset = false);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static ASodaVehicle * SpawnVehicleFromDB(const UObject* WorldContextObject, const FString& VehicleName, const FVector& Location, const FRotator & Rotation, bool Posses = true, FName DesireName = NAME_None, bool bApplyOffset = false);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static ASodaVehicle * SpawnVehicleFromBin(const UObject* WorldContextObject, const FString& SlotOrFileName, bool IsSlot, const FVector& Location, const FRotator & Rotation, bool Posses = true, FName DesireName = NAME_None, bool bApplyOffset = false);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static ASodaVehicle * SpawnVehicleFormAddress(const UObject* WorldContextObject, const FVechicleSaveAddress& Address, const FVector& Location, const FRotator & Rotation, bool Posses = true, FName DesireName = NAME_None, bool bApplyOffset = false);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static void GetSavedVehiclesLocal(TArray<FVechicleSaveAddress>& Addresses);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static bool GetSavedVehiclesDB(TArray<FVechicleSaveAddress>& Addresses);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static FString GetDefaultVehiclesFolder();
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static ASodaVehicle* FindVehicleByAddress(const UWorld* World, const FVechicleSaveAddress & Address);
+
+	UFUNCTION(BlueprintCallable, Category = "Save & Load")
+	static bool DeleteVehicleSave(const FVechicleSaveAddress & Address);
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual UActorComponent* FindVehicleComponentByName(const FString & ComponentName) const;
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual UActorComponent* FindComponentByName(const FString & ComponentName) const;
+
+	/** UActorComponent is ISodaVehicleComponent interface */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual UActorComponent* AddVehicleComponent(TSubclassOf<UActorComponent> Class, FName Name);
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool RemoveVehicleComponentByName(FName Name);
+
+	/** 
+	 * Resapwn this vehicle.
+	 * @param[in] IsOffset - Is Location & Rotation world or local space?
+	 * @param[in] NewVehicleClass - change vehicle class. The NewVehicleClass must be inherited from ASodaVehicle. 
+	 *							    If nullptr then the vehicle class will not be changed and all vehicles params will be moved to the returned vehicle.
+	 */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual ASodaVehicle * RespawnVehcile(FVector Location = FVector(0, 0, 20), FRotator Rotation = FRotator(0, 0, 0), bool IsOffset = true, const UClass* NewVehicleClass = nullptr);
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual ASodaVehicle* RespawnVehcileFromAddress(const FVechicleSaveAddress & Address, FVector Location = FVector(0, 0, 20), FRotator Rotation = FRotator(0, 0, 0), bool IsOffset = true);
+
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual void ReActivateVehicleComponents(bool bOnlyTopologyComponents);
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual bool ReActivateVehicleComponentsIfNeeded();
+
+	/** Get vehicle extent calculated and store in the CalculateVehicleExtent(). */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual const FExtent & GetVehicleExtent() const { return VehicelExtent; }
+
+	virtual const FVehicleSimData & GetSimData() const { return FVehicleSimData::Zero; }
+
+	/** Get vehicle forward speed. Must be overridden. */
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual float GetForwardSpeed() const { return 0; }
+
+	/** Draw vehicle left debug panel to the Canvas. */
+	virtual bool DrawDebug(class UCanvas* Canvas, float& YL, float& YPos);
+
+	template<class T>
+	T * FindComponentByName(FName ComponentName) const
+	{
+		TArray<T*> Components;
+		GetComponents<T>(Components);
+		for (auto& Component : Components)
+		{
+			if (Component->GetFName() == ComponentName)
+			{
+				return Component;
+			}
+		}
+		return nullptr;
+	}
+
+	TArray<ISodaVehicleComponent*> GetVehicleComponents() const;
+
+	virtual TArray<ISodaVehicleComponent*> GetVehicleComponentsSorted(const FString& GUICategory = "", bool bNormalizeIfNecessary = true);
+
+
+	//TODO: Add CanCreateVehicle() logic
+	//virtual bool CanCreateVehicle() const;
+
+	void NotifyNeedReActivateComponents() { bNotifyNeedReActivateComponents = true; }
+	bool DoNeedReActivateComponents() const { return bNotifyNeedReActivateComponents; }
+
+public:
+	/**
+	 * Called just before stimulation step. 
+	 * For some implementations it can be called not in real time (For example, for PhysX Vehicle model when calculating sub-steps). 
+	 */
+	virtual void PrePhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp);
+
+	/** 
+	 * Called just after stimulation step .
+	 * For some implementations it can be called not in real time (For example, for PhysX Vehicle model when calculating sub-steps). 
+	 */
+	virtual void PostPhysicSimulation(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp);
+
+	/** 
+	 * Called just after PostPhysicSimulation().
+	 * This function call must correspond to real time.
+	 */
+	virtual void PostPhysicSimulationDeferred(float DeltaTime, const FPhysBodyKinematic& VehicleKinematic, const TTimestamp& Timestamp);
+
+	/**
+	 * Called during scenario playing if the datset is recording for this vehicle.
+	 */
+	virtual void OnPushDataset(soda::FActorDatasetData& Dataset) const;
+
+	virtual void GenerateDatasetDescription(soda::FBsonDocument& Doc) const;
+
+public:
+	/* Override from IEditableObject */
+	virtual void RuntimePostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
+	virtual void RuntimePostEditChangeChainProperty(FPropertyChangedChainEvent& PropertyChangedEvent) override;
+	virtual TSharedPtr<SWidget> GenerateToolBar();
+
+public:
+	/* Override from ISodaActor */
+	virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	virtual bool IsPinnedActor() const override;
+	virtual bool SavePinnedActor() override;
+	virtual AActor* LoadPinnedActor(UWorld* World, const FTransform& Transform, const FString& SlotName, bool bForceCreate, FName DesireName = NAME_None) const override;
+	virtual FString GetPinnedActorName() const override;
+	virtual FString GetPinnedActorSlotName() const override;
+	virtual void ScenarioBegin() override;
+	virtual void ScenarioEnd() override;
+
+public:
+	virtual void PreInitializeComponents() override;
+	virtual void BeginPlay() override;
+	virtual void EndPlay(const EEndPlayReason::Type EndPlayReason) override;
+	virtual void PossessedBy(AController* NewController) override;
+	virtual void UnPossessed() override;
+	virtual void Serialize(FArchive& Ar) override;
+
+protected:
+	virtual void ReRegistreVehicleComponents();
+	virtual void UpdateProperties();
+
+protected:
+	UPROPERTY(SaveGame)
+	TArray<FString> VehicleCategoriesSorted;
+
+	UPROPERTY(SaveGame)
+	TArray<FString> VehicleComponentsSortedNames;
+
+	UPROPERTY(SaveGame)
+	FVechicleSaveAddress SaveAddress;
+
+	TArray<IVehicleTickablObject*> PreTickedVehicleComponens;
+	TArray<IVehicleTickablObject*> PostTickedVehicleComponens;
+	TArray<IVehicleTickablObject*> PostTickedDeferredVehicleComponens;
+	TArray<ISodaVehicleComponent*> VehicleComponensForDataset;
+
+	UPROPERTY(Transient)
+	TArray<UCANBusComponent*> CANDevs;
+	TArray<FComponentRecord> ComponentRecords;
+	TSharedPtr<FJsonActorArchive> JsonAr;
+	FExtent VehicelExtent;
+
+	bool bNotifyNeedReActivateComponents = false;
+	FPhysBodyKinematic PhysBodyKinematicCashed;
+	TSharedPtr<soda::FActorDatasetData> Dataset;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Vehicles/SodaVehicleWheel.h b/Source/UnrealSoda/Public/Soda/Vehicles/SodaVehicleWheel.h
new file mode 100644
index 0000000..3496b89
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Vehicles/SodaVehicleWheel.h
@@ -0,0 +1,124 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "Soda/VehicleComponents/WheeledVehicleComponent.h"
+#include "GameFramework/PawnMovementComponent.h"
+#include "SodaVehicleWheel.generated.h"
+
+/**
+ * Wheeled vehicle wheel indexes
+ */
+UENUM(BlueprintType)
+enum class  E4WDWheelIndex: uint8
+{
+	/** Front left */
+	FL = 0,
+
+	/** Front right */
+	FR = 1,
+
+	/** Rear left */
+	RL = 2,
+
+	/** Rear right */
+	RR = 3,
+
+	/** Current vehicle isn't 4WD */
+	None = 0xFF,
+};
+
+
+/**
+ * USodaVehicleWheelComponent object
+ */
+UCLASS(ClassGroup = Soda, BlueprintType, Blueprintable, meta = (BlueprintSpawnableComponent))   
+class UNREALSODA_API USodaVehicleWheelComponent 
+	: public UWheeledVehicleComponent
+	, public ITorqueTransmission
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	/** Bone name on mesh to create wheel at */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelSetup)
+	FName BoneName = NAME_None;
+
+	/** if current vehicle is 4WD, this is index of current wheel */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelSetup)
+	E4WDWheelIndex WheelIndex4WD = E4WDWheelIndex::None;
+
+	/** Additional offset to give the wheels for this axle */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheelSetup)
+	FVector AdditionalOffset;
+
+	/** Initially wheel position [Cm]*/
+	UPROPERTY(BlueprintReadOnly, Category = WheelSetup)
+	FVector RestingLocation;
+
+	/** Initially wheel rotation [Deg]*/
+	UPROPERTY(BlueprintReadOnly, Category = WheelSetup)
+	FRotator RestingRotation;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Debug, SaveGame, meta = (EditInRuntime))
+	bool bVerboseLog = false;
+
+public:
+	/** Requested wheel torque [H/m] */
+	UPROPERTY(Category = VehicleWheel, BlueprintReadWrite)
+	float ReqTorq = 0;		  
+
+	/** Requested wheel brake torque [H/m] */
+	UPROPERTY(Category = VehicleWheel, BlueprintReadWrite)
+	float ReqBrakeTorque = 0; 
+
+	/** Requested wheel steering  [Rad] */
+	UPROPERTY(Category = VehicleWheel, BlueprintReadWrite)
+	float ReqSteer = 0;		
+
+public:
+	/** Current wheel steering [Rad] */
+	UPROPERTY(Category = VehicleWheel, BlueprintReadOnly)
+	float Steer = 0;		
+
+    /** [Rad] */
+	UPROPERTY(BlueprintReadOnly, Category = BlueprintReadOnly)
+	float Pitch = 0;
+
+	/** Current wheel angular velocity  [Rad/s] */
+	UPROPERTY(Category = VehicleWheel, BlueprintReadOnly)
+	float AngularVelocity = 0; 
+
+	/** Current longitude & lateral wheel slip */
+	UPROPERTY(Category = VehicleWheel, BlueprintReadOnly)
+	FVector2D Slip;
+
+	/** Current suspension z - offset in [cm] */
+	UPROPERTY(Category = VehicleWheel, BlueprintReadOnly)
+	float SuspensionOffset = 0;
+
+public:
+	/** Wheel radius [Cm]*/
+	UPROPERTY(Category = VehicleWheel, BlueprintReadOnly)
+	float Radius = 0;
+
+
+public:
+	/** Compute wheel postion in local or global space. */
+	virtual FVector GetWheelLocation(bool bWithSuspensionOffset = true, bool bInWorldSpace = false) const;
+
+	/** Compute vecloty of the  wheel center in the wheel bone coordinate system. */
+	virtual FVector GetWheelLocalVelocity() const;
+
+
+public:
+	/* Override ITorqueTransmission*/
+	virtual void PassTorque(float InTorque) override;
+	virtual float ResolveAngularVelocity() const override;
+	virtual float FindWheelRadius() const override { return Radius; }
+	virtual float FindToWheelRatio() const override { return 1.0; }
+
+public:
+	//virtual void OnRegistreVehicleComponent() override;
+	virtual void DrawDebug(UCanvas* Canvas, float& YL, float& YPos) override;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Vehicles/SodaWheeledVehicle.h b/Source/UnrealSoda/Public/Soda/Vehicles/SodaWheeledVehicle.h
new file mode 100644
index 0000000..137f493
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Vehicles/SodaWheeledVehicle.h
@@ -0,0 +1,171 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "SodaVehicle.h"
+#include "SodaVehicleWheel.h"
+#include "GameFramework/PawnMovementComponent.h"
+#include "SodaWheeledVehicle.generated.h"
+
+class ASodaWheeledVehicle;
+class IWheeledVehicleMovementInterface;
+class UVehicleDriverComponent;
+class UVehicleBrakeSystemBaseComponent;
+class UVehicleEngineBaseComponent;
+class UVehicleSteeringRackBaseComponent;
+class UVehicleHandBrakeBaseComponent;
+class UVehicleDifferentialBaseComponent;
+class UVehicleGearBoxBaseComponent;
+
+/**
+ * The ASodaWheeledVehicle Vehicle provides the template to implement a 4WD vehicle model.
+ * ISodaWheeledVehicleSimulationInterface is responsible for tire and suspension modeling.
+ */
+UCLASS(abstract, config = Game, BlueprintType, Blueprintable)
+class UNREALSODA_API ASodaWheeledVehicle : public ASodaVehicle
+{
+	GENERATED_UCLASS_BODY()
+
+public:
+	//UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Scenario, SaveGame, meta = (EditInRuntime))
+	//bool bReinitPositionIfStop = false;
+
+	/** Vehicle body mesh component */
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Vehicle)
+	class USkeletalMeshComponent* Mesh = nullptr;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Vehicle)
+	class USpringArmComponent* SpringArm = nullptr;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = Vehicle)
+	class UCameraComponent* FollowCamera = nullptr;
+
+	/**  Pointer to VehicleMovement created from VehicleMovementClass. */
+	UPROPERTY(BlueprintReadOnly, Category = Vehicle, meta = (AllowPrivateAccess = "true"))
+	class UPawnMovementComponent *VehicleMovement = nullptr;
+
+
+public:
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual UVehicleInputComponent* GetActiveVehicleInput() const { return ActiveVehicleInput; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual void SetActiveVehicleInput(UVehicleInputComponent* InVehicleInput);
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle, meta = (ScenarioAction))
+	virtual UVehicleInputComponent* SetActiveVehicleInputByName(FName VehicleInputName);
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual UVehicleInputComponent* SetActiveVehicleInputByType(EVehicleInputType Type);
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual class UVehicleDriverComponent* GetVehicleDriver() { return VehicleDrivers.Num() ? VehicleDrivers[0] : nullptr; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual class UVehicleGearBoxBaseComponent* GetGearBoxe() { return GearBoxes.Num() ? GearBoxes[0] : nullptr; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual float GetEnginesLoad() const;
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual FWheeledVehicleState GetVehicleState() const;
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual USodaVehicleWheelComponent* GetWheel4WD(E4WDWheelIndex Ind) const;
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual const TArray<USodaVehicleWheelComponent*>& GetWheels() const { return Wheels; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	virtual const TArray<USodaVehicleWheelComponent*>& GetWheels4WD() const { return Wheels4WD; }
+
+	UFUNCTION(BlueprintCallable, Category = Vehicle)
+	bool Is4WDVehicle() const { return Wheels4WD.Num() == 4; }
+
+	/** Compute the steering request as the arithmetic average of the steering request of the two front wheels. */
+	virtual float GetReqSteer() const;
+
+	/** Compute the actual steering as the arithmetic average of the actual steering of the two front wheels. */
+	virtual float GetSteer() const;
+
+public:
+	virtual class USkeletalMeshComponent* GetMesh() const { return Mesh; }
+	virtual IWheeledVehicleMovementInterface* GetWheeledComponentInterface() { return WheeledComponentInterface; }
+	virtual IWheeledVehicleMovementInterface* GetWheeledComponentInterface() const { return WheeledComponentInterface; }
+
+public:
+	virtual bool DrawDebug(class UCanvas* Canvas, float& YL, float& YPos) override;
+	virtual const FVehicleSimData& GetSimData() const override;
+	virtual float GetForwardSpeed() const override;
+	virtual void ScenarioBegin() override;
+	virtual void ScenarioEnd() override;
+	virtual void OnPushDataset(soda::FActorDatasetData& Dataset) const override;
+	virtual void GenerateDatasetDescription(soda::FBsonDocument& Doc) const override;
+
+public:
+	virtual void TickActor(float DeltaTime, enum ELevelTick TickType, FActorTickFunction& ThisTickFunction) override;
+	virtual void BeginPlay() override;
+	virtual UPawnMovementComponent* GetMovementComponent() const;
+	virtual FVector GetVelocity() const override;
+
+public:
+	/* Override from ISodaActor */
+	//virtual void OnSelect_Implementation() override;
+	//virtual void OnUnselect_Implementation() override;
+	virtual const FSodaActorDescriptor* GenerateActorDescriptor() const override;
+	//virtual bool OnSetPinnedActor(bool bIsPinnedActor) override;
+	//virtual bool IsPinnedActor() const override;
+
+protected:
+	virtual void ReRegistreVehicleComponents() override;
+	virtual void SetDefaultMeshProfile();
+
+protected:
+	friend IWheeledVehicleMovementInterface;
+	virtual void OnSetActiveMovement(IWheeledVehicleMovementInterface* InWheeledComponentInterface) { WheeledComponentInterface = InWheeledComponentInterface;}
+
+	friend UVehicleInputComponent;
+	void OnSetActiveVehicleInput(UVehicleInputComponent* InVehicleInput) { ActiveVehicleInput = InVehicleInput; }
+
+protected:
+	IWheeledVehicleMovementInterface* WheeledComponentInterface = nullptr;
+	float SavedSpringArmLength = 0;
+
+	UPROPERTY(Transient)
+	UVehicleInputComponent * ActiveVehicleInput = nullptr;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleInputComponent*> VehicleInputs;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleDriverComponent*> VehicleDrivers;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleGearBoxBaseComponent*> GearBoxes;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleBrakeSystemBaseComponent*> VehicleBrakeSystems;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleEngineBaseComponent*> VehicleEngines;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleSteeringRackBaseComponent*> VehicleSteeringRacks;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleHandBrakeBaseComponent*> VehicleHandBrakes;
+
+	UPROPERTY(Transient)
+	TArray<UVehicleDifferentialBaseComponent*> VehicleDifferentials;
+
+	UPROPERTY(Transient)
+	TArray<USodaVehicleWheelComponent*> Wheels;
+
+	UPROPERTY(Transient)
+	TArray<USodaVehicleWheelComponent*> Wheels4WD;
+
+	int Zoom = 0;
+
+	FCollisionResponseContainer DefCollisionResponseToChannel;
+	ECollisionChannel DefCollisionObjectType;
+};
diff --git a/Source/UnrealSoda/Public/Soda/Vehicles/VehicleBaseTypes.h b/Source/UnrealSoda/Public/Soda/Vehicles/VehicleBaseTypes.h
new file mode 100644
index 0000000..7e9f1d6
--- /dev/null
+++ b/Source/UnrealSoda/Public/Soda/Vehicles/VehicleBaseTypes.h
@@ -0,0 +1,248 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "UObject/Interface.h"
+#include "Soda/Misc/PhysBodyKinematic.h"
+#include "Soda/Misc/Time.h"
+#include "VehicleBaseTypes.generated.h"
+
+
+/**
+ * Gears for electric vehicles
+ */
+UENUM(BlueprintType)
+enum class ENGear : uint8
+{
+	Neutral = 0,
+	Drive = 1,
+	Reverse = 2,
+	Park = 3,
+};
+
+UENUM(BlueprintType)
+enum class  EVehicleInputType : uint8
+{
+	Other = 0,
+	Keyboard = 1,
+	Joy = 2,
+	External = 3,
+	AI = 4
+};
+
+/**
+ * Helper structure that allows to change any value of a variable over time depending on speed (RiseRate and FallRate)
+ */
+USTRUCT(BlueprintType)
+struct UNREALSODA_API FInputRate
+{
+	GENERATED_USTRUCT_BODY()
+
+	/** Rate at which the input value rises */
+	UPROPERTY(EditAnywhere, Category = VehicleInputRate, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float RiseRate;
+
+	/** Rate at which the input value falls */
+	UPROPERTY(EditAnywhere, Category = VehicleInputRate, BlueprintReadWrite, SaveGame, meta = (EditInRuntime))
+	float FallRate;
+
+	FInputRate() : RiseRate(5.0f), FallRate(5.0f) {}
+	FInputRate(float RiseRate, float FallRate) : RiseRate(RiseRate), FallRate(FallRate) {}
+
+	/** Change an output value using max rise and fall rates */
+	float InterpInputValue(float DeltaTime, float CurrentValue, float NewValue) const
+	{
+		const float DeltaValue = NewValue - CurrentValue;
+
+		// We are "rising" when DeltaValue has the same sign as CurrentValue (i.e. delta causes an absolute magnitude gain)
+		// OR we were at 0 before, and our delta is no longer 0.
+		const bool bRising = ((DeltaValue > 0.0f) == (CurrentValue > 0.0f)) ||
+							 ((DeltaValue != 0.f) && (CurrentValue == 0.f));
+
+		const float MaxDeltaValue = DeltaTime * (bRising ? RiseRate : FallRate);
+		const float ClampedDeltaValue = FMath::Clamp(DeltaValue, -MaxDeltaValue, MaxDeltaValue);
+		return CurrentValue + ClampedDeltaValue;
+	}
+};
+
+
+UENUM(BlueprintType)
+enum class EVehicleComponentPrePhysTickGroup : uint8
+{
+	/** Reserved */
+	TickGroup0 = 0,
+
+	/** Recomended for the drive control simulation */
+	TickGroup1,
+
+	/** Reserved */
+	TickGroup2,
+
+	/** Recomended for the motors simulation  */
+	TickGroup3,
+
+	/** Reserved */
+	TickGroup4,
+
+	/** Recomended for the gear box simulation */
+	TickGroup5,
+
+	/** Reserved */
+	TickGroup6,
+
+	/** Recomended for the brake, steering, differential  simulation  */
+	TickGroup7,
+
+	/** Reserved */
+	TickGroup8
+};
+
+UENUM(BlueprintType)
+enum class EVehicleComponentPostPhysTickGroup : uint8
+{
+	/** Reserved */
+	TickGroup0 = 0,
+
+	/** Recomended for the brake, steering, differential  simulation  */
+	TickGroup1,
+
+	/** Reserved */
+	TickGroup2,
+
+	/** Recomended for the gear box simulation */
+	TickGroup3,
+
+	/** Reserved */
+	TickGroup4,
+
+	/** Recomended for the motors simulation  */
+	TickGroup5,
+
+	/** Reserved */
+	TickGroup6,
+
+	/** Recomended for the drive control simulation */
+	TickGroup7,
+
+	/** Reserved */
+	TickGroup8
+};
+
+UENUM(BlueprintType)
+enum class EVehicleComponentPostDeferredPhysTickGroup : uint8
+{
+	TickGroup0 = 0,
+	TickGroup1,
+	TickGroup2,
+	TickGroup3,
+	TickGroup4,
+	TickGroup5,
+	TickGroup6,
+	TickGroup7,
+	TickGroup8
+};
+
+UINTERFACE(Blueprintable)
+class UTorqueTransmission : public UInterface
+{
+	GENERATED_BODY()
+};
+
+class UNREALSODA_API ITorqueTransmission
+{
+	GENERATED_BODY()
+public:
+	/** [N/m] */
+	virtual void PassTorque(float InTorque) = 0;
+
+	/** [Rad/s] */
+	virtual float ResolveAngularVelocity() const = 0;
+
+	/** Try to find wheel(s) radius to which set this torque [cm] */
+	virtual float FindWheelRadius() const = 0;
+
+	/** Try to find ratio beetwen this transmission and connected wheel(s) */
+	virtual float FindToWheelRatio() const = 0;
+};
+
+USTRUCT(BlueprintType)
+struct FWheeledVehicleWheelState
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	float AngularVelocity;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	float Torq;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	float BrakeTorq;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	float Steer;
+};
+
+USTRUCT(BlueprintType)
+struct FWheeledVehicleState
+{
+	GENERATED_USTRUCT_BODY()
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = WheeledVehicleState)
+	FVector Position;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FRotator Rotation;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FVector Velocity;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FVector AngularVelocity;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FVector Acc;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FWheeledVehicleWheelState WheelsFL;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FWheeledVehicleWheelState WheelsFR;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FWheeledVehicleWheelState WheelsRL;
+
+	UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = VehicleInputRate)
+	FWheeledVehicleWheelState WheelsRR;
+};
+
+struct FVehicleSimData
+{
+	/** Actual Vehicle kinematic structure. */
+	FPhysBodyKinematic VehicleKinematic;
+
+	/** Actual simulation step number. */
+	int SimulatedStep = 0;
+
+	/** SimulatedStep for current game frame. */
+	int RenderStep = 0;
+
+	/** Actual simulation unix time stemp for current game frame. */
+	TTimestamp SimulatedTimestamp{};
+
+	/** SimulatedTimestamp for current game frame. */
+	TTimestamp RenderTimestamp{};
+
+	static FVehicleSimData Zero;
+};
+
+
+inline float GearToRatio(ENGear Gear)
+{
+	static float GearRatios[] = { 0, 1, -1, 0 };
+	check((uint8)Gear < 5);
+	return GearRatios[int(Gear)];
+}
+
+
diff --git a/Source/UnrealSoda/UnrealSoda.Build.cs b/Source/UnrealSoda/UnrealSoda.Build.cs
new file mode 100644
index 0000000..4edb06e
--- /dev/null
+++ b/Source/UnrealSoda/UnrealSoda.Build.cs
@@ -0,0 +1,119 @@
+// © 2023 SODA.AUTO UK LTD. All Rights Reserved.
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using UnrealBuildTool;
+
+public class UnrealSoda : ModuleRules
+{
+    public UnrealSoda(ReadOnlyTargetRules Target) : base(Target)
+	{
+		PrivateIncludePaths.AddRange(
+			new string[] 
+			{
+				EngineDirectory + "/Source/Runtime/Sockets/Private",
+				ModuleDirectory + "/Private/ThirdParty",
+				ModuleDirectory + "/Private/ThirdParty/opendrive_reader/include",
+				ModuleDirectory + "/Private/ThirdParty/pugixml",
+            }
+		);
+
+		PublicDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"Core",
+				"CoreUObject",
+				"Engine",
+				"InputCore",
+				"Sockets", 
+				"Networking",
+                "HTTP",
+				"Json",
+				"JsonUtilities",
+				"libWebSockets",
+				"UMG",
+				"SodaStyle",
+				"SodaJoystick",
+				"libZmq",
+                "dbcppp",
+                "Projects",
+				"ProceduralMeshComponent",
+				"ImageWriteQueue",
+				"ChaosVehicles",
+				"ChaosVehiclesCore",
+				"RuntimeEditor",
+				"Slate",
+				"SlateCore",
+				"ToolMenus",
+				"TypedElementFramework",
+				"TypedElementRuntime",
+                "SodaSimProto",
+                "AnimGraphRuntime",
+            }
+		);
+
+		PrivateDependencyModuleNames.AddRange(
+			new string[]
+			{
+				"RHI",
+				"RenderCore",
+				"Projects",
+				"Slate",
+				"SlateCore",
+				"HTTPServer",
+				"WebRemoteControl",
+				"RemoteControlCommon",
+				"DesktopPlatform",
+				"ToolWidgets",
+				"mongodb_cpp",
+                "mongodb_c",
+                "Boost",
+                "Eigen",
+                "ApplicationCore",
+                "PROJ",
+                "GeometryAlgorithms"
+            } 
+		);
+
+		RuntimeDependencies.Add(Path.Combine(PluginDirectory, "Content/Slate/..."));
+		RuntimeDependencies.Add("$(TargetOutputDir)/../../Scripts/...", Path.Combine( PluginDirectory, "Scripts/..."));
+		//RuntimeDependencies.Add("$(TargetOutputDir)/../../ReleaseNotes", Path.Combine( PluginDirectory, "ReleaseNotes"));
+		//RuntimeDependencies.Add("$(TargetOutputDir)/../../Install/...", Path.Combine( PluginDirectory, "Install/..."));
+        //RuntimeDependencies.Add("$(TargetOutputDir)/../../VERSION", Path.Combine(PluginDirectory, "VERSION"));
+        //RuntimeDependencies.Add(Path.Combine(PluginDirectory, "Scripts/..."));
+        //RuntimeDependencies.Add(Path.Combine(PluginDirectory, "ReleaseNotes"));
+        //RuntimeDependencies.Add(Path.Combine(PluginDirectory, "Install/..."));
+
+        AddEngineThirdPartyPrivateStaticDependencies(Target, "Eigen");
+
+        bEnableExceptions = true;
+		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
+		bEnableUndefinedIdentifierWarnings = false;
+		SetupModulePhysicsSupport(Target);
+		//bUsePrecompiled = true;
+		bUseUnity = false;
+
+        // The Shipping configuration isn't supported yet
+        /*
+        if (Target.Configuration != UnrealTargetConfiguration.Shipping)
+		{
+			PrecompileForTargets = PrecompileTargetsType.Any;
+		}
+		else 
+		{
+            PrecompileForTargets = PrecompileTargetsType.None;
+        }
+		*/
+
+        if (Target.Configuration == UnrealTargetConfiguration.Shipping)
+        {
+            throw new NullReferenceException("The Shipping configuration isn't supported yet");
+        }
+
+        if (!Directory.Exists(ModuleDirectory + "/Private"))
+        {
+            bUsePrecompiled = true;
+        }
+    }
+}